merge of '3ba01558b82d1bb3bf15860e3d01719651ff13c6'

     and '89809f216db3df7abbf2f0427e5fe3291e0b150e'

7 files changed, 33 insertions, 63 deletions

diff --git a/packages/aircrack/aircrack-ng_0.7.bb b/packages/aircrack/aircrack-ng_0.7.bb
index 3093c39955..bf5bd27d9d 100644
--- a/packages/aircrack/aircrack-ng_0.7.bb
+++ b/packages/aircrack/aircrack-ng_0.7.bb
@@ -2,10 +2,7 @@ SECTION = "console/network"
 DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
 HOMEPAGE = "http://www.aircrack-ng.org/"
 LICENSE = "GPLv2"
-MAINTAINER = "Zero_Chaos <sidhayn@gmail.com>"
-DEPENDS = ""
-RDEPENDS = ""
-PR="r2"
+PR = "r2"
 
 SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
 
diff --git a/packages/procps/procps.inc b/packages/procps/procps.inc
new file mode 100644
index 0000000000..ddc8030077
--- /dev/null
+++ b/packages/procps/procps.inc
@@ -0,0 +1,14 @@
+DESCRIPTION = "Procps is the package that has a bunch \
+of small useful utilities that give information \
+about processes using the /proc filesystem. The package \
+includes the programs ps, top, vmstat, w, kill, and skill."
+HOMEPAGE = "http://procps.sf.net"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "ncurses"
+
+SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
+           file://install.patch;patch=1"
+
+inherit autotools
diff --git a/packages/procps/procps_3.1.15.bb b/packages/procps/procps_3.1.15.bb
index 12d6a43fd2..01114e80dc 100644
--- a/packages/procps/procps_3.1.15.bb
+++ b/packages/procps/procps_3.1.15.bb
@@ -1,17 +1,6 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
+require procps.inc
 
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://procps_${PV}-2.diff;patch=1 \
-           file://install.patch;patch=1"
-
-inherit autotools
+SRC_URI += "file://procps_${PV}-2.diff;patch=1"
 
 EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
                 LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \
diff --git a/packages/procps/procps_3.2.1.bb b/packages/procps/procps_3.2.1.bb
index 3c0aaf547a..33df399c5f 100644
--- a/packages/procps/procps_3.2.1.bb
+++ b/packages/procps/procps_3.2.1.bb
@@ -1,18 +1,8 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
-PR = "r1"
+require procps.inc
 
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch;patch=1 \
-           file://pagesz-not-constant.patch;patch=1"
+PR = "r1"
 
-inherit autotools
+SRC_URI += "file://pagesz-not-constant.patch;patch=1"
 
 EXTRA_OEMAKE = "CFLAGS=-I${STAGING_INCDIR} \
                 LDFLAGS=-L${STAGING_LIBDIR} -Wl,--rpath-link,${STAGING_LIBDIR} \
diff --git a/packages/procps/procps_3.2.5.bb b/packages/procps/procps_3.2.5.bb
index 5101874a5b..de7524b2cb 100644
--- a/packages/procps/procps_3.2.5.bb
+++ b/packages/procps/procps_3.2.5.bb
@@ -1,21 +1,10 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
-PR = "r5"
-
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch;patch=1 \
-           file://procmodule.patch;patch=1 \
-           file://psmodule.patch;patch=1"
+require procps.inc
 
+PR = "r5"
 
+SRC_URI += "file://procmodule.patch;patch=1 \
+            file://psmodule.patch;patch=1"
 
-inherit autotools
 FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
 	 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
 	 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
diff --git a/packages/procps/procps_3.2.7.bb b/packages/procps/procps_3.2.7.bb
index 5101874a5b..de7524b2cb 100644
--- a/packages/procps/procps_3.2.7.bb
+++ b/packages/procps/procps_3.2.7.bb
@@ -1,21 +1,10 @@
-LICENSE = "GPL"
-DESCRIPTION = "Procps is the package that has a bunch \
-of small useful utilities that give information \
-about processes using the /proc filesystem. The package \
-includes the programs ps, top, vmstat, w, kill, and skill."
-SECTION = "base"
-PRIORITY = "optional"
-DEPENDS = "ncurses"
-PR = "r5"
-
-SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
-           file://install.patch;patch=1 \
-           file://procmodule.patch;patch=1 \
-           file://psmodule.patch;patch=1"
+require procps.inc
 
+PR = "r5"
 
+SRC_URI += "file://procmodule.patch;patch=1 \
+            file://psmodule.patch;patch=1"
 
-inherit autotools
 FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
 	 ${bindir}/free.${PN} ${bindir}/w ${bindir}/watch ${bindir}/pgrep ${bindir}/pmap ${bindir}/pwdx \
 	 ${bindir}/snice ${bindir}/vmstat ${bindir}/slabtop ${bindir}/pkill ${bindir}/skill ${bindir}/tload \
diff --git a/packages/rglueap/rglueap_0.1.bb b/packages/rglueap/rglueap_0.1.bb
index 2d6cd2c41b..c26bf31eaa 100644
--- a/packages/rglueap/rglueap_0.1.bb
+++ b/packages/rglueap/rglueap_0.1.bb
@@ -1,10 +1,12 @@
-DESCRIPTION = "Raw Glue AP"
-SECTION = "console/network"
+DESCRIPTION = "Raw Glue AP, wireless intrusion detection"
+AUTHOR = "Laurent Butti"
 HOMEPAGE = "http://rfakeap.tuxfamily.org/#Raw_Glue_AP"
+SECTION = "console/network"
+PRIORITY = "optional"
 LICENSE = "GPLv2"
 DEPENDS = "libpcap"
 
-SRC_URI = "http://rfakeap.tuxfamily.org/rglueap-${PV}.tar.gz"
+SRC_URI = "http://rfakeap.tuxfamily.org/${P}.tar.gz"
 
 LDFLAGS += "-lpcap"