3 files changed, 16 insertions, 79 deletions
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index ca29ec5ba9c9..f55efd53a562 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -1,46 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Makefile.in.am-2.4.2-xmlcatalog.patch 1331 RMD160 d47a94fb8ef65dbb6974936e0284fc691dc9c54f SHA1 c8bf1cf951f32de6b2f05176cf197e3d4b0ca6f9 SHA256 e1bb6b353fcacb54948ecbb3886dfa8a9a199370bef53cf38868bf744f02f0a0
 MD5 f9bf50cb0d304288f8fe07db3385bdeb files/Makefile.in.am-2.4.2-xmlcatalog.patch 1331
 RMD160 d47a94fb8ef65dbb6974936e0284fc691dc9c54f files/Makefile.in.am-2.4.2-xmlcatalog.patch 1331
 SHA256 e1bb6b353fcacb54948ecbb3886dfa8a9a199370bef53cf38868bf744f02f0a0 files/Makefile.in.am-2.4.2-xmlcatalog.patch 1331
-DIST libglade-0.17.tar.gz 418921
-DIST libglade-2.5.0.tar.bz2 317558
+DIST libglade-0.17.tar.gz 418921 RMD160 d401764bbb5c8b6af9b9c1fbd6e9c6b3483f27c8 SHA1 66dbb90ffcfe80c551d2f3a296729ceab527cbc0 SHA256 d65a4909298e6ac33210f513b50d9ea8e0b201742566a218f31d4f685133a48c
 DIST libglade-2.5.1.tar.bz2 317524 RMD160 9d8b8720453b9764833facc5ca0abab6f4c9fa41 SHA1 bef71a09cd5d23ae82736f1552131aa8959c2f36 SHA256 15e4c95402caa3c97394189a6b1b693eced23d80e292fcca12585317434adc2e
+DIST libglade-2.6.0.tar.bz2 319004 RMD160 4aac5a50cc1672e03684648c190185f35397604d SHA1 5d6bd9a194676173c3efb76538d54d89bbeaf5fa SHA256 6533dcc2e29895a41288543855159035133980ea627121ab867cb9352f620dcf
 EBUILD libglade-0.17-r6.ebuild 1518 RMD160 82aafb9fd0a155dbaf843458c4312d6fe21c722d SHA1 b987fa9186b72a41856e298dc365be8e198b271e SHA256 bfdae8fe759697aed47f41216fb6eb59f5c3c025ef9a1889df359f0c5138f9c8
 MD5 f47baad5df40e8ebd1a1d1b80123a112 libglade-0.17-r6.ebuild 1518
 RMD160 82aafb9fd0a155dbaf843458c4312d6fe21c722d libglade-0.17-r6.ebuild 1518
 SHA256 bfdae8fe759697aed47f41216fb6eb59f5c3c025ef9a1889df359f0c5138f9c8 libglade-0.17-r6.ebuild 1518
-EBUILD libglade-2.5.0.ebuild 1332 RMD160 6eed4871cedc1afeea037f87ea83fd5ed2c839c3 SHA1 12f8180536198668a987c26cbebbf2f131bd14d0 SHA256 6d4d6da5103cd6d930364835b95e73863e4e096a921511983c7413f88ab2db5a
-MD5 b5bf107c697994ff5c72cf95d89f49ac libglade-2.5.0.ebuild 1332
-RMD160 6eed4871cedc1afeea037f87ea83fd5ed2c839c3 libglade-2.5.0.ebuild 1332
-SHA256 6d4d6da5103cd6d930364835b95e73863e4e096a921511983c7413f88ab2db5a libglade-2.5.0.ebuild 1332
 EBUILD libglade-2.5.1.ebuild 1347 RMD160 71fee369e05315cfe3126e82d7c2ec4a2a0f82fb SHA1 b29aba85a932098ed07744a11b630926c940d336 SHA256 6f9876f41b903b39eed254c64b973df0d7d48dcb419e1feb7fb143f39203078e
 MD5 d61a77e188e7ce31ef0703a17f59200c libglade-2.5.1.ebuild 1347
 RMD160 71fee369e05315cfe3126e82d7c2ec4a2a0f82fb libglade-2.5.1.ebuild 1347
 SHA256 6f9876f41b903b39eed254c64b973df0d7d48dcb419e1feb7fb143f39203078e libglade-2.5.1.ebuild 1347
-MISC ChangeLog 10218 RMD160 8de9d1e9ece8a6b8a100c8a9e031241ab1b30245 SHA1 89594f548462b7e1e44913785a638327b1579a61 SHA256 6002cb475bfdd03692ebd39ad206efeb7443aa3d604ab05442959765503f07ed
-MD5 c6220983fa50aab7738b8e91f3239d1f ChangeLog 10218
-RMD160 8de9d1e9ece8a6b8a100c8a9e031241ab1b30245 ChangeLog 10218
-SHA256 6002cb475bfdd03692ebd39ad206efeb7443aa3d604ab05442959765503f07ed ChangeLog 10218
+EBUILD libglade-2.6.0.ebuild 1379 RMD160 7f05693e1f74aaf3b3c191d69f302a64e7b16729 SHA1 2b5f6a4abc7b431abdbface570ed5dc7db7a9fc0 SHA256 bd297b563ceaa363394578023402ce3ea103aafb65a0c8f5711cf0fcbabbb207
+MD5 3220adcda8fe82723e52da3d19b766fc libglade-2.6.0.ebuild 1379
+RMD160 7f05693e1f74aaf3b3c191d69f302a64e7b16729 libglade-2.6.0.ebuild 1379
+SHA256 bd297b563ceaa363394578023402ce3ea103aafb65a0c8f5711cf0fcbabbb207 libglade-2.6.0.ebuild 1379
+MISC ChangeLog 10346 RMD160 f12cf1607f6f23e3d3b8054d7f42bc0f26697d8c SHA1 4f6c83979734a0b4db8ed28d1ad5a09f1f1866ce SHA256 ca86b48540a4477eb3fd495b99eebf7aba52f3b4ebb146be4a64b1e695521dc4
+MD5 620127a119e67c5153e99ddc5d46525f ChangeLog 10346
+RMD160 f12cf1607f6f23e3d3b8054d7f42bc0f26697d8c ChangeLog 10346
+SHA256 ca86b48540a4477eb3fd495b99eebf7aba52f3b4ebb146be4a64b1e695521dc4 ChangeLog 10346
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 6876e5db1b80846b82a289a82b44408b files/digest-libglade-0.17-r6 65
-RMD160 a3c4c096ce8262cb5e6468041ef91c2824d98638 files/digest-libglade-0.17-r6 65
-SHA256 1e936225044c3c751cda5128a6871661efab982163eebce75ea06c5bb0d8c946 files/digest-libglade-0.17-r6 65
-MD5 225998fcdfb3607e5908dfb6178d849b files/digest-libglade-2.5.0 67
-RMD160 c5b5879d9178ea421f724a67bf95dc18101a0e5c files/digest-libglade-2.5.0 67
-SHA256 7b447b5c9c029e335118ba38f4c2d5ed9ffdb65c5b74a70c3471dbfa9bb0f7c3 files/digest-libglade-2.5.0 67
+MD5 667d7076e87f153969ec4346d73d3059 files/digest-libglade-0.17-r6 241
+RMD160 b8d5c9113162fe48aadb1ee1f4d120a829b5355f files/digest-libglade-0.17-r6 241
+SHA256 b7597aa8c981ccc92e29bc70c175f846077cc3a86320a9bf733049540fc1f3cb files/digest-libglade-0.17-r6 241
 MD5 1ec184aab2978e6e1d6c9316e0ee00b7 files/digest-libglade-2.5.1 247
 RMD160 a60550020948a44c151fa2ea459a0e9d9d9fd727 files/digest-libglade-2.5.1 247
 SHA256 f9b7ce7aa92d35b343979170a2f21164e0f59f2e3f7f677aaff7b9593e8b655e files/digest-libglade-2.5.1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD4DBQFEvG47AiZjviIA2XgRAteLAJURJUusZ34HlM8wP/yxAyuT1DjaAJ9vKvd2
-yJd2AgVGMGk3h0w7ZBn/qQ==
-=9QgV
------END PGP SIGNATURE-----
+MD5 6919bbb5cc04c1d1e9129d29f9792829 files/digest-libglade-2.6.0 247
+RMD160 3ce75f2d00c2086c3bfd83bcc8a718de48cf3878 files/digest-libglade-2.6.0 247
+SHA256 d023ee5cad606c05573fd63ab36943fcf31550cccd12a74276ae8c3011ce535b files/digest-libglade-2.6.0 247
diff --git a/gnome-base/libglade/files/digest-libglade-2.5.0 b/gnome-base/libglade/files/digest-libglade-2.5.0
deleted file mode 100644
index 5573d615899f..000000000000
--- a/gnome-base/libglade/files/digest-libglade-2.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d7c71151771e4d1c4067ec739ce5f71 libglade-2.5.0.tar.bz2 317558
diff --git a/gnome-base/libglade/libglade-2.5.0.ebuild b/gnome-base/libglade/libglade-2.5.0.ebuild
deleted file mode 100644
index 31a7c800e6ba..000000000000
--- a/gnome-base/libglade/libglade-2.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.5.0.ebuild,v 1.12 2006/07/05 05:40:18 vapier Exp $
-
-# FIXME : catalog stuff
-inherit gnome2 eutils
-
-DESCRIPTION="GLADE is a interface builder"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2.5
-	>=x11-libs/gtk+-2.5
-	>=dev-libs/atk-1
-	>=dev-libs/libxml2-2.4.10
-	>=dev-lang/python-2.0-r7"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_compile() {
-	# patch to stop make install installing the xml catalog
-	# because we do it ourselves in postinst()
-	epatch "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch
-
-	gnome2_src_compile
-}
-
-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
-}