use gnome.org eclass for SRC_URI

6 files changed, 13 insertions, 85 deletions

diff --git a/gnome-base/ORBit/ChangeLog b/gnome-base/ORBit/ChangeLog
index fa2eb0702d4d..840f76a66ea5 100644
--- a/gnome-base/ORBit/ChangeLog
+++ b/gnome-base/ORBit/ChangeLog
@@ -1,7 +1,9 @@
 # ChangeLog for gnome-base/ORBit
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ChangeLog,v 1.17 2003/07/04 05:30:23 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ChangeLog,v 1.18 2003/10/28 10:16:06 foser Exp $
 
+  28 Oct 2003; foser <foser@gentoo.org> ORBit-0.5.{6,7}.ebuild :
+  Fix SRC_URI by using gnome.org eclass (#32103)
 
 *ORBit-0.5.17 (05 Aug 2002)
 
diff --git a/gnome-base/ORBit/Manifest b/gnome-base/ORBit/Manifest
index f98f64fc5848..d555ba833b37 100644
--- a/gnome-base/ORBit/Manifest
+++ b/gnome-base/ORBit/Manifest
@@ -1,10 +1,8 @@
-MD5 60aac9997f441ab4739b53ae40ea318a ChangeLog 2352
-MD5 6bbc00330d1a3b585229e555bf57ab98 ORBit-0.5.14-r2.ebuild 1559
-MD5 6f57485d6dbfe05387ea28b23a35f71f ORBit-0.5.16.ebuild 1561
-MD5 850d380136a3a494259efaebdc54e451 ORBit-0.5.17.ebuild 1495
+MD5 1d60b73fdaa44f598a191ebc7a36fb0c ORBit-0.5.16.ebuild 1485
+MD5 2a6a5d4e8ff00759dabce8743f7bc9cc ChangeLog 2465
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 065f9b49e71102bb054f825206b824fe files/alloca.diff 334
-MD5 2a3acded1669a2b9de179a9229097e55 files/digest-ORBit-0.5.14-r2 65
+MD5 01cf7fa3f243aa6129267dbb60f6410f ORBit-0.5.17.ebuild 1413
 MD5 32d8c91c3a81fc3081891cb85734aad9 files/digest-ORBit-0.5.16 66
 MD5 51bfc1efb763de186ee1b1f1e594891a files/digest-ORBit-0.5.17 66
+MD5 065f9b49e71102bb054f825206b824fe files/alloca.diff 334
 MD5 54d4643035be77ed8362225823cd7b60 files/libIDLConf.sh-gentoo.diff 462
diff --git a/gnome-base/ORBit/ORBit-0.5.14-r2.ebuild b/gnome-base/ORBit/ORBit-0.5.14-r2.ebuild
deleted file mode 100644
index 0745ad9ecd69..000000000000
--- a/gnome-base/ORBit/ORBit-0.5.14-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.14-r2.ebuild,v 1.11 2003/09/06 23:51:37 msterret Exp $
-
-IUSE="nls"
-
-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*"
-
-RDEPEND="virtual/glibc
-	=dev-libs/glib-1.2*"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-src_compile() {
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	# Libtoolize to fix "relink bug" in older libtool's distributed
-	# with packages.
-	libtoolize --copy --force
-	cd popt
-	libtoolize --copy --force
-	cd ../libIDL
-	libtoolize --copy --force
-	cd ${S}
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--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 \
-		infodir=${D}/usr/share/info \
-		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
-
-	cd ${D}/usr/lib
-	patch -p0 < ${FILESDIR}/libIDLConf.sh-gentoo.diff
-}
-
diff --git a/gnome-base/ORBit/ORBit-0.5.16.ebuild b/gnome-base/ORBit/ORBit-0.5.16.ebuild
index da81c631bd20..92dc1bf0916c 100644
--- a/gnome-base/ORBit/ORBit-0.5.16.ebuild
+++ b/gnome-base/ORBit/ORBit-0.5.16.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.16.ebuild,v 1.10 2003/09/06 23:51:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.16.ebuild,v 1.11 2003/10/28 10:16:06 foser Exp $
+
+inherit gnome.org
 
 IUSE="nls"
 
-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.bz2"
 HOMEPAGE="http://www.labs.redhat.com/orbit/"
 
 DEPEND="virtual/glibc
diff --git a/gnome-base/ORBit/ORBit-0.5.17.ebuild b/gnome-base/ORBit/ORBit-0.5.17.ebuild
index c4f4675cacb2..ac112cd1d778 100644
--- a/gnome-base/ORBit/ORBit-0.5.17.ebuild
+++ b/gnome-base/ORBit/ORBit-0.5.17.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.17.ebuild,v 1.15 2003/09/06 23:51:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/ORBit/ORBit-0.5.17.ebuild,v 1.16 2003/10/28 10:16:06 foser Exp $
 
-IUSE="nls"
+inherit gnome.org libtool
 
-inherit libtool
+IUSE="nls"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A high-performance, lightweight CORBA ORB aiming for CORBA 2.2 compliance"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/0.5/${P}.tar.bz2"
 HOMEPAGE="http://www.labs.redhat.com/orbit/"
 
 DEPEND="virtual/glibc
diff --git a/gnome-base/ORBit/files/digest-ORBit-0.5.14-r2 b/gnome-base/ORBit/files/digest-ORBit-0.5.14-r2
deleted file mode 100644
index 7160a98a2936..000000000000
--- a/gnome-base/ORBit/files/digest-ORBit-0.5.14-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 03d2b86a5ecad95fa0dced110b19fff6 ORBit-0.5.14.tar.gz 1336536