fix SRC_URIs 'n cleanup

9 files changed, 12 insertions, 159 deletions

diff --git a/gnome-base/libglade/ChangeLog b/gnome-base/libglade/ChangeLog
index 0febc4632632..d2510bd5a2b0 100644
--- a/gnome-base/libglade/ChangeLog
+++ b/gnome-base/libglade/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-base/libglade
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.26 2003/09/10 05:40:02 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.27 2003/09/28 21:59:12 foser Exp $
+
+  28 Sep 2003; foser <foser@gentoo.org> libglade-*.ebuild :
+  Removed SRC_URIs in favour of gnome.org eclass handling (#29831)
 
   10 Sep 2003; Mike Gardiner <obz@gentoo.org> libglade-2.0.1.ebuild,
   files/Makefile.in.am-xmlcatalog.patch:
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 69ff56d839f3..bdd1a3ed3bd0 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -1,12 +1,7 @@
-MD5 19d333e5456bcb6b9a973037c50a8717 ChangeLog 4357
-MD5 ea3320317ec7d39249c7024522b8ba17 libglade-0.17-r6.ebuild 1449
-MD5 e640da1a8e06d1615f91b71f4f277006 libglade-2.0.0-r1.ebuild 1441
-MD5 074df3a0eb918bbd306667960daf9a55 libglade-2.0.0.ebuild 1870
-MD5 0ec8160db2ae441ced3aa7de4b421e63 libglade-2.0.1.ebuild 1469
+MD5 20e948a64f7dd26116f05a185577fb6b libglade-2.0.1.ebuild 1413
+MD5 639da20ddcfcc82d35133924e6031d37 libglade-0.17-r6.ebuild 1457
+MD5 d30c3f52d9d61bdaf2d13b172f5e64d8 ChangeLog 4487
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 27fc8beb290edf4dc9fcdc7327a2d5d5 files/Makefile.in-0.patch 446
-MD5 6876e5db1b80846b82a289a82b44408b files/digest-libglade-0.17-r6 65
-MD5 eedbc07c448a767187689677aa16a8c0 files/digest-libglade-2.0.0 67
-MD5 eedbc07c448a767187689677aa16a8c0 files/digest-libglade-2.0.0-r1 67
 MD5 77fafb164d53dc862957a5bd2b7511e4 files/digest-libglade-2.0.1 67
+MD5 6876e5db1b80846b82a289a82b44408b files/digest-libglade-0.17-r6 65
 MD5 ba2eb9b8a5caed325917e267ef33d8ac files/Makefile.in.am-xmlcatalog.patch 958
diff --git a/gnome-base/libglade/files/Makefile.in-0.patch b/gnome-base/libglade/files/Makefile.in-0.patch
deleted file mode 100644
index dda32908395d..000000000000
--- a/gnome-base/libglade/files/Makefile.in-0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	Sat Mar  2 08:18:24 2002
-+++ Makefile.in	Sat Mar  2 08:18:44 2002
-@@ -603,7 +603,7 @@
- 
- 
- install-data-local:
--	-xmlcatalog --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
-+#	-xmlcatalog --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
- uninstall-local:
- 	-xmlcatalog --noout --del $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
- 
diff --git a/gnome-base/libglade/files/digest-libglade-2.0.0 b/gnome-base/libglade/files/digest-libglade-2.0.0
deleted file mode 100644
index 2ab55a73f011..000000000000
--- a/gnome-base/libglade/files/digest-libglade-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f56880824523fe24381c03a411dea6a libglade-2.0.0.tar.bz2 264041
diff --git a/gnome-base/libglade/files/digest-libglade-2.0.0-r1 b/gnome-base/libglade/files/digest-libglade-2.0.0-r1
deleted file mode 100644
index 2ab55a73f011..000000000000
--- a/gnome-base/libglade/files/digest-libglade-2.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3f56880824523fe24381c03a411dea6a libglade-2.0.0.tar.bz2 264041
diff --git a/gnome-base/libglade/libglade-0.17-r6.ebuild b/gnome-base/libglade/libglade-0.17-r6.ebuild
index 0d341358b4b3..150cd630912f 100644
--- a/gnome-base/libglade/libglade-0.17-r6.ebuild
+++ b/gnome-base/libglade/libglade-0.17-r6.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-0.17-r6.ebuild,v 1.17 2003/09/06 23:51:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-0.17-r6.ebuild,v 1.18 2003/09/28 21:59:12 foser Exp $
 
 IUSE="nls bonobo"
 
 #provide Xmake and Xemake
 
-inherit libtool virtualx
+inherit libtool virtualx gnome.org
 
 S=${WORKDIR}/${P}
 DESCRIPTION="libglade allows programs to load their UIs from an XMLS description at tuntime."
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.gz"
+#SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://developer.gnome.org/doc/API/libglade/libglade.html"
 
 KEYWORDS="x86 ppc sparc alpha hppa amd64"
diff --git a/gnome-base/libglade/libglade-2.0.0-r1.ebuild b/gnome-base/libglade/libglade-2.0.0-r1.ebuild
deleted file mode 100644
index 8d49180a3e52..000000000000
--- a/gnome-base/libglade/libglade-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,60 +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/libglade/libglade-2.0.0-r1.ebuild,v 1.11 2003/09/06 23:51:37 msterret Exp $
-
-IUSE="doc"
-
-
-inherit gnome2
-
-LICENSE="LGPL-2.1"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GLADE is a interface builder"
-SRC_URI="mirror://gnome/2.0.0/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-KEYWORDS="x86 ppc sparc alpha"
-SLOT="2.0"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=x11-libs/gtk+-2.0.3
-	>=dev-libs/atk-1.0.0
-	>=dev-libs/expat-1.95
-	dev-python/pyxml
-	>=dev-lang/python-2.0-r7
-	>=sys-devel/gettext-0.10.40
-	>=dev-libs/libxml2-2.4.17"
-
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	app-text/docbook-xml-dtd"
-
-src_compile() {
-	## patch for xml stuff
-	patch -p0 < ${FILESDIR}/Makefile.in-0.patch
-	gnome2_src_configure
-	emake || die "die a horrible death"
-}
-DOCS="ABOUT-NLS AUTHORS COPYING  ChangeLog INSTALL NEWS README"
-
-
-src_install() {
-	dodir /etc/xml
-	gnome2_src_install
-}
-
-
-pkg_postinst() {
-		echo ">>> Updating XML catalog"
-		/usr/bin/xmlcatalog --noout --add "system" \
-			"http://glade.gnome.org/glade-2.0.dtd" \
-			/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-		gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	echo ">>> removing entries from the XML catalog"
-	/usr/bin/xmlcatalog --noout --del \
-		/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-}
diff --git a/gnome-base/libglade/libglade-2.0.0.ebuild b/gnome-base/libglade/libglade-2.0.0.ebuild
deleted file mode 100644
index 4f4eac0af326..000000000000
--- a/gnome-base/libglade/libglade-2.0.0.ebuild
+++ /dev/null
@@ -1,71 +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/libglade/libglade-2.0.0.ebuild,v 1.12 2003/09/11 01:15:30 msterret Exp $
-
-inherit flag-o-matic
-# Do _NOT_ strip symbols in the build!
-RESTRICT="nostrip"
-append-flags -g
-
-DESCRIPTION="GLADE is a interface builder"
-HOMEPAGE="http://www.gnome.org/"
-SRC_URI="http://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="2.0"
-KEYWORDS="x86 ppc sparc"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=x11-libs/gtk+-2.0.3
-	>=dev-libs/atk-1.0.0
-	>=dev-libs/expat-1.95
-	dev-python/pyxml
-	>=dev-lang/python-2.0-r7
-	>=sys-devel/gettext-0.10.40
-	>=dev-libs/libxml2-2.4.17"
-DEPEND=">=dev-util/pkgconfig-0.12.0
-	${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	app-text/docbook-xml-dtd"
-
-src_compile() {
-	local myconf
-	use doc && myconf="--enable-gtk-doc" || myconf="--disable-gtk-doc"
-
-	## patch for xml stuff
-	patch -p0 < ${FILESDIR}/Makefile.in-0.patch
-	libtoolize --copy --force
-	./configure --host=${CHOST} \
-			--prefix=/usr \
-			--sysconfdir=/etc \
-			--infodir=/usr/share/info \
-			--mandir=/usr/share/man \
-			--enable-debug=yes ${myconf} || die "configure this"
-
-	emake || die "die a horrible death"
-}
-
-src_install() {
-	dodir /etc/xml
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		infodir=${D}/usr/share/info \
-		mandir=${D}/usr/share/man \
-		install || die
-
-	dodoc ABOUT-NLS AUTHORS COPYING  ChangeLog INSTALL NEWS README
-}
-
-pkg_postinst() {
-	echo ">>> Updating XML catalog"
-	/usr/bin/xmlcatalog --noout --add "system" \
-		"http://glade.gnome.org/glade-2.0.dtd" \
-		/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-}
-
-pkg_postrm() {
-	echo ">>> removing entries from the XML catalog"
-	/usr/bin/xmlcatalog --noout --del \
-		/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-}
diff --git a/gnome-base/libglade/libglade-2.0.1.ebuild b/gnome-base/libglade/libglade-2.0.1.ebuild
index db1341a00e70..db34ea3221c5 100644
--- a/gnome-base/libglade/libglade-2.0.1.ebuild
+++ b/gnome-base/libglade/libglade-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.0.1.ebuild,v 1.14 2003/09/10 05:40:02 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.0.1.ebuild,v 1.15 2003/09/28 21:59:12 foser Exp $
 
 IUSE="doc nls"
 
@@ -11,7 +11,6 @@ LICENSE="LGPL-2.1"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GLADE is a interface builder"
-SRC_URI="mirror://gnome/2.0.1/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
 KEYWORDS="x86 ppc sparc alpha hppa amd64"
 SLOT="2.0"