fix the libIDLConf-file so that gnome-config --cflags libIDL returns the correct cflags.

8 files changed, 16 insertions, 110 deletions

diff --git a/gnome-base/ORBit/ORBit-0.5.10-r1.ebuild b/gnome-base/ORBit/ORBit-0.5.10-r1.ebuild
deleted file mode 100644
index 0363200b2217..000000000000
--- a/gnome-base/ORBit/ORBit-0.5.10-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.10-r1.ebuild,v 1.2 2001/10/07 22:15:58 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A high-performance, lightweight CORBA ORB aiming for CORBA 2.2 compliance"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.labs.redhat.com/orbit/"
-
-DEPEND="virtual/glibc 
-	nls? ( sys-devel/gettext )
-	>=sys-apps/tcp-wrappers-7.6
-	>=dev-libs/glib-1.2.8"
-
-RDEPEND="virtual/glibc 
-	>=dev-libs/glib-1.2.8"
-
-
-src_compile() {
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-        	    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
-		    $myconf || die
-
-	make || die # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/var/lib					\
-    	     install || die
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS TODO
-	dodoc docs/*.txt docs/IDEA1
-
-	docinto idl
-	cd libIDL
-	dodoc AUTHORS BUGS COPYING NEWS README*
-
-	docinto popt
-	cd ../popt
-	dodoc CHANGES COPYING README
-}
-
-
-
diff --git a/gnome-base/ORBit/ORBit-0.5.11.ebuild b/gnome-base/ORBit/ORBit-0.5.11.ebuild
deleted file mode 100644
index 466cf5460fcd..000000000000
--- a/gnome-base/ORBit/ORBit-0.5.11.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.11.ebuild,v 1.1 2001/10/25 14:58:40 hallski Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="A high-performance, lightweight CORBA ORB aiming for CORBA 2.2 compliance"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz"
-HOMEPAGE="http://www.labs.redhat.com/orbit/"
-
-DEPEND="virtual/glibc 
-	nls? ( sys-devel/gettext )
-	>=sys-apps/tcp-wrappers-7.6
-	>=dev-libs/glib-1.2.8"
-
-RDEPEND="virtual/glibc 
-	>=dev-libs/glib-1.2.8"
-
-
-src_compile() {
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST} 					\
-		    --prefix=/usr					\
-        	    --sysconfdir=/etc					\
-		    --localstatedir=/var/lib				\
-		    $myconf || die
-
-	make || die # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {
-	make prefix=${D}/usr						\
-	     sysconfdir=${D}/etc					\
-	     localstatedir=${D}/var/lib					\
-    	     install || die
-
-	dodoc AUTHORS COPYING* ChangeLog README NEWS TODO
-	dodoc docs/*.txt docs/IDEA1
-
-	docinto idl
-	cd libIDL
-	dodoc AUTHORS BUGS COPYING NEWS README*
-
-	docinto popt
-	cd ../popt
-	dodoc CHANGES COPYING README
-}
-
-
-
diff --git a/gnome-base/ORBit/ORBit-0.5.12.ebuild b/gnome-base/ORBit/ORBit-0.5.12-r1.ebuild
index dd770d5b1dd4..94ac842e15a3 100644
--- a/gnome-base/ORBit/ORBit-0.5.12.ebuild
+++ b/gnome-base/ORBit/ORBit-0.5.12-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.12.ebuild,v 1.1 2001/11/03 01:45:56 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.12-r1.ebuild,v 1.1 2001/11/10 02:16:54 hallski Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A high-performance, lightweight CORBA ORB aiming for CORBA 2.2 compliance"
@@ -47,6 +47,9 @@ src_install() {
 	docinto popt
 	cd ../popt
 	dodoc CHANGES COPYING README
+
+	cd ${D}/usr/lib
+	patch -p0 < ${FILESDIR}/libIDLConf.sh-gentoo.diff
 }
 
 
diff --git a/gnome-base/ORBit/files/digest-ORBit-0.5.10-r1 b/gnome-base/ORBit/files/digest-ORBit-0.5.10-r1
deleted file mode 100644
index 23f1bd9bf728..000000000000
--- a/gnome-base/ORBit/files/digest-ORBit-0.5.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 84e818d9f6fa4f389b9ea82aa00e8f6c ORBit-0.5.10.tar.gz 1290240
diff --git a/gnome-base/ORBit/files/digest-ORBit-0.5.11 b/gnome-base/ORBit/files/digest-ORBit-0.5.11
deleted file mode 100644
index c85fa0455371..000000000000
--- a/gnome-base/ORBit/files/digest-ORBit-0.5.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca00cc90206c5e389929b1d5a3ce24d1 ORBit-0.5.11.tar.gz 1290240
diff --git a/gnome-base/ORBit/files/digest-ORBit-0.5.12 b/gnome-base/ORBit/files/digest-ORBit-0.5.12
deleted file mode 100644
index 4b08ca67bb4f..000000000000
--- a/gnome-base/ORBit/files/digest-ORBit-0.5.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ab66859c937a940da6bad2c84161c6aa ORBit-0.5.12.tar.gz 1294336
diff --git a/gnome-base/ORBit/files/digest-ORBit-0.5.12-r1 b/gnome-base/ORBit/files/digest-ORBit-0.5.12-r1
new file mode 100644
index 000000000000..3f5580148cc6
--- /dev/null
+++ b/gnome-base/ORBit/files/digest-ORBit-0.5.12-r1
@@ -0,0 +1 @@
+MD5 ab66859c937a940da6bad2c84161c6aa ORBit-0.5.12.tar.gz 1290240
diff --git a/gnome-base/ORBit/files/libIDLConf.sh-gentoo.diff b/gnome-base/ORBit/files/libIDLConf.sh-gentoo.diff
new file mode 100644
index 000000000000..f4b390a2654b
--- /dev/null
+++ b/gnome-base/ORBit/files/libIDLConf.sh-gentoo.diff
@@ -0,0 +1,11 @@
+--- libIDLConf.sh.old	Sat Nov 10 03:01:02 2001
++++ libIDLConf.sh	Sat Nov 10 03:00:07 2001
+@@ -1,7 +1,7 @@
+ #
+ # Configuration file for using the libIDL library in GNOME applications
+ #
+-LIBIDL_INCLUDEDIR="-I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include"
++LIBIDL_INCLUDEDIR="-I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/include/libIDL-1.0"
+ LIBIDL_LIBDIR="-L/usr/lib"
+ LIBIDL_LIBS="-lIDL -L/usr/lib -lglib"
+ MODULE_VERSION="libIDL-0.6.8"