libidl: upgrade to 0.8.10, close oebug 3961. unify

diff --git a/packages/libidl/libidl-native_0.8.6.bb b/packages/libidl/libidl-native_0.8.10.bb
similarity index 100%
rename from packages/libidl/libidl-native_0.8.6.bb
rename to packages/libidl/libidl-native_0.8.10.bb

diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl.inc
similarity index 73%
rename from packages/libidl/libidl_0.8.6.bb
rename to packages/libidl/libidl.inc
index 2f44147..e032575 100644 (file)
--- a/packages/libidl/libidl_0.8.6.bb
+++ b/packages/libidl/libidl.inc
@@ -1,14 +1,12 @@
 DESCRIPTION = "Library for parsing CORBA IDL files"
 SECTION = "x11/gnome/libs"
 LICENSE = "LGPL"
-DEPENDS = "glib-2.0 libidl-native"
-PR = "r3"
+
+inherit autotools pkgconfig
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
-S = "${WORKDIR}/libIDL-${PV}"
 
-BINCONFIG_GLOB = "*-config-2"
-inherit autotools pkgconfig binconfig
+S = "${WORKDIR}/libIDL-${PV}"
 
 do_stage() {
        autotools_stage_all

diff --git a/packages/libidl/libidl_0.8.10.bb b/packages/libidl/libidl_0.8.10.bb
new file mode 100644 (file)
index 0000000..c6664ac
--- /dev/null
+++ b/packages/libidl/libidl_0.8.10.bb
@@ -0,0 +1,8 @@
+require libidl.inc
+
+DEPENDS = "glib-2.0 libidl-native"
+
+PR = "r0"
+
+BINCONFIG_GLOB = "*-config-2"
+inherit autotools pkgconfig binconfig

diff --git a/packages/libidl/libidl_0.8.2.bb b/packages/libidl/libidl_0.8.2.bb
index 8a5b683..b451ada 100644 (file)
--- a/packages/libidl/libidl_0.8.2.bb
+++ b/packages/libidl/libidl_0.8.2.bb
@@ -1,10 +1,3 @@
-SECTION = "x11/gnome/libs"
-LICENSE = "LGPL"
-SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-0.8.2.tar.bz2"
-S = "${WORKDIR}/libIDL-${PV}"
+require libidl.inc
 
-inherit autotools  pkgconfig
-
-do_stage () {
-       autotools_stage_all
-}
+PR = "r1"

diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb
index 5f788a9..c4586f9 100644 (file)
--- a/packages/libidl/libidl_0.8.3.bb
+++ b/packages/libidl/libidl_0.8.3.bb
@@ -1,20 +1,13 @@
-DESCRIPTION = "Library for parsing CORBA IDL files"
-SECTION = "x11/gnome/libs"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0"
-PR = "r2"
+require libidl.inc
 
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
-S = "${WORKDIR}/libIDL-${PV}"
+DEPENDS = "glib-2.0"
 
-inherit autotools pkgconfig
+PR = "r3"
 
 # Firefox uses the libIDL-config-2 script instead of pkgconfig (for some
 # strange reason - so we do some sed fu to fix the path there
 
-do_stage() {
-       autotools_stage_all
-
+do_stage_prepend() {
        cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
        cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
 
@@ -22,6 +15,3 @@ do_stage() {
                mv ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR_CROSS}/libIDL-config-2
        fi
 }
-
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += " ${bindir}"