merge of '3a7743fc01171dc57c6955f1ffe9b6701dc58576'

     and 'a495e9cb4d40b047ae63d8cd7818e278baad8881'

7 files changed, 28 insertions, 88 deletions

diff --git a/packages/aircrack/aircrack-ng_0.9.1.bb b/packages/aircrack/aircrack-ng_0.9.1.bb
deleted file mode 100644
index 116ee599e3..0000000000
--- a/packages/aircrack/aircrack-ng_0.9.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
-HOMEPAGE = "http://www.aircrack-ng.org/"
-SECTION = "console/network"
-LICENSE = "GPLv2"
-PR = "r2"
-
-SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
-
-do_install() {
-        install -d ${D}/${sbindir}
-	install -d ${D}/${bindir}
-        install -m 0755 airodump-ng       ${D}/${sbindir}
-        install -m 0755 aircrack-ng       ${D}/${bindir}
-        install -m 0755 aireplay-ng       ${D}/${sbindir}
-        install -m 0755 airdecap-ng       ${D}/${bindir}
-        install -m 0755 packetforge-ng    ${D}/${bindir}
-        install -m 0755 airmon-ng         ${D}/${sbindir}
-        install -m 0755 ivstools          ${D}/${bindir}
-	install -m 0755 kstats		  ${D}/${bindir}
-	install -m 0755 airtun-ng	  ${D}/${sbindir}
-	install -m 0755 makeivs 	  ${D}/${bindir}
-}
diff --git a/packages/aircrack/aircrack-ng_0.9.3.bb b/packages/aircrack/aircrack-ng_0.9.3.bb
new file mode 100644
index 0000000000..1452a64bc1
--- /dev/null
+++ b/packages/aircrack/aircrack-ng_0.9.3.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Aircrack-ng is a set of tools for wep key statistical cracking"
+HOMEPAGE = "http://www.aircrack-ng.org/"
+SECTION = "console/network"
+LICENSE = "GPLv2"
+PR = "r0"
+
+SRC_URI = "http://download.aircrack-ng.org/aircrack-ng-${PV}.tar.gz"
+
+SBINFILES = "airodump-ng aireplay-ng airmon-ng airtun-ng"
+BINFILES = "aircrack-ng airdecap-ng packetforge-ng ivstools kstats makeivs"
+
+do_install() {
+	install -d ${D}/${sbindir}
+	for i in ${SBINFILES}; do
+		install -m 0755 $i ${D}/${sbindir}
+	done
+
+	install -d ${D}/${bindir}
+	for i in ${BINFILES}; do
+		install -m 0755 $i ${D}/${bindir}
+	done
+}
diff --git a/packages/libol/libol_0.3.16.bb b/packages/libol/libol_0.3.16.bb
deleted file mode 100644
index 1e4a1e9408..0000000000
--- a/packages/libol/libol_0.3.16.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-PR = "r5"
-
-SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${P}.tar.gz"
-
-S = "${WORKDIR}/${PN}-${PV}"
-inherit autotools
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/libol
-	install -m 0755 ${S}/libol-config ${STAGING_BINDIR_CROSS}
-	install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}
-	ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
-	install ${S}/src/*.h ${STAGING_INCDIR}/libol/
-}
-
diff --git a/packages/libol/libol_0.3.18.bb b/packages/libol/libol_0.3.18.bb
index 0b6518c43e..7dc48f92df 100644
--- a/packages/libol/libol_0.3.18.bb
+++ b/packages/libol/libol_0.3.18.bb
@@ -1,14 +1,12 @@
-PR = "r7"
+DESCRIPTION = "A tiny C support library"
+SECTION = "libs"
+LICENSE = "GPL"
+PR = "r8"
 
 SRC_URI = "http://www.balabit.com/downloads/files/libol/0.3/${P}.tar.gz"
 
-S = "${WORKDIR}/${PN}-${PV}"
-
 inherit autotools binconfig
 
 do_stage() {
-        install -d ${STAGING_INCDIR}/libol
-        install -m 0755 ${S}/src/.libs/libol.so.0.0.0 ${STAGING_LIBDIR}/
-        ln -fs ${STAGING_LIBDIR}/libol.so.0.0.0 ${STAGING_LIBDIR}/libol.so.0
-        install ${S}/src/*.h ${STAGING_INCDIR}/libol/
+	autotools_stage_all
 }
diff --git a/packages/starling/starling_0.1.bb b/packages/starling/starling_0.1.bb
deleted file mode 100644
index fab79342ac..0000000000
--- a/packages/starling/starling_0.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-LICENSE = "GPL"
-SECTION = "gpe/multimedia"
-PRIORITY = "optional"
-PR = "r1"
-
-inherit gpe autotools
-
-DESCRIPTION = "Starling audio player for GPE"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
-RDEPENDS = "esd \
-	gst-plugin-audioconvert \
-	gst-plugin-esd \
-	gst-plugin-typefindfunctions \
-        gst-plugin-decodebin \
-	gst-plugin-volume"
-
-RRECOMMENDS = "gst-plugin-mad \
-	gst-plugin-modplug \
-	gst-plugin-ivorbis \
-	gst-plugin-tcp"
-
-SRC_URI = "http://handhelds.org/~skyhusker/${P}.tar.bz2"
diff --git a/packages/starling/starling_0.2.bb b/packages/starling/starling_0.2.bb
deleted file mode 100644
index 32cd1b9025..0000000000
--- a/packages/starling/starling_0.2.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "Starling audio player for GPE"
-SECTION = "gpe/multimedia"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad sqlite libsoup gnutls"
-
-RDEPENDS = "esd \
-        gst-plugin-audioconvert \
-        gst-plugin-esd \
-        gst-plugin-typefindfunctions \
-        gst-plugin-decodebin \
-        gst-plugin-volume"
-RRECOMMENDS = "gst-plugin-mad \
-        gst-plugin-modplug \
-        gst-plugin-ivorbis \
-        gst-plugin-tcp"
-
-GPE_TARBALL_SUFFIX = "bz2"
-
-inherit gpe autotools
-
diff --git a/packages/starling/starling_svn.bb b/packages/starling/starling_svn.bb
index 67d98dbd60..7969cd84f0 100644
--- a/packages/starling/starling_svn.bb
+++ b/packages/starling/starling_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Starling audio player for GPE"
 SECTION = "gpe/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
+DEPENDS = "gtk+ gstreamer gst-plugins-good gst-plugins-bad esound sqlite libsoup"
 RDEPENDS = "esd \
         gst-plugin-audioconvert \
         gst-plugin-esd \