From 486680eea259b7239fd724e51096a7d5c90a446f Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Tue, 18 Mar 2008 08:29:52 +0000
Subject: libidl: upgrade to 0.8.10, close oebug 3961. unify

---
 packages/libidl/libidl-native_0.8.10.bb |  5 +++++
 packages/libidl/libidl-native_0.8.6.bb  |  5 -----
 packages/libidl/libidl.inc              | 16 ++++++++++++++++
 packages/libidl/libidl_0.8.10.bb        |  8 ++++++++
 packages/libidl/libidl_0.8.2.bb         | 11 ++---------
 packages/libidl/libidl_0.8.3.bb         | 18 ++++--------------
 packages/libidl/libidl_0.8.6.bb         | 18 ------------------
 7 files changed, 35 insertions(+), 46 deletions(-)
 create mode 100644 packages/libidl/libidl-native_0.8.10.bb
 delete mode 100644 packages/libidl/libidl-native_0.8.6.bb
 create mode 100644 packages/libidl/libidl.inc
 create mode 100644 packages/libidl/libidl_0.8.10.bb
 delete mode 100644 packages/libidl/libidl_0.8.6.bb

diff --git a/packages/libidl/libidl-native_0.8.10.bb b/packages/libidl/libidl-native_0.8.10.bb
new file mode 100644
index 0000000000..ce59fd4b86
--- /dev/null
+++ b/packages/libidl/libidl-native_0.8.10.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+require libidl_${PV}.bb
+inherit native
+
+DEPENDS = "glib-2.0-native"
diff --git a/packages/libidl/libidl-native_0.8.6.bb b/packages/libidl/libidl-native_0.8.6.bb
deleted file mode 100644
index ce59fd4b86..0000000000
--- a/packages/libidl/libidl-native_0.8.6.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-SECTION = "libs"
-require libidl_${PV}.bb
-inherit native
-
-DEPENDS = "glib-2.0-native"
diff --git a/packages/libidl/libidl.inc b/packages/libidl/libidl.inc
new file mode 100644
index 0000000000..e032575bb5
--- /dev/null
+++ b/packages/libidl/libidl.inc
@@ -0,0 +1,16 @@
+DESCRIPTION = "Library for parsing CORBA IDL files"
+SECTION = "x11/gnome/libs"
+LICENSE = "LGPL"
+
+inherit autotools pkgconfig
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
+
+S = "${WORKDIR}/libIDL-${PV}"
+
+do_stage() {
+	autotools_stage_all
+}
+
+FILES_${PN} = "${libdir}/*.so.*"
+FILES_${PN}-dev += " ${bindir}"
diff --git a/packages/libidl/libidl_0.8.10.bb b/packages/libidl/libidl_0.8.10.bb
new file mode 100644
index 0000000000..c6664acb23
--- /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 8a5b683d1e..b451ada539 100644
--- 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 5f788a91d8..c4586f94f8 100644
--- 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}"
diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb
deleted file mode 100644
index 2f44147711..0000000000
--- a/packages/libidl/libidl_0.8.6.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Library for parsing CORBA IDL files"
-SECTION = "x11/gnome/libs"
-LICENSE = "LGPL"
-DEPENDS = "glib-2.0 libidl-native"
-PR = "r3"
-
-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
-
-do_stage() {
-	autotools_stage_all
-}
-
-FILES_${PN} = "${libdir}/*.so.*"
-FILES_${PN}-dev += " ${bindir}"
-- 
cgit v1.2.3