Version bump, remove old.

Package-Manager: portage-2.1.10.51/cvs/Linux x86_64

4 files changed, 19 insertions, 89 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index c36e0db5a86d..ef156846d0e8 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.153 2012/03/25 16:14:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.154 2012/03/27 08:33:13 pacho Exp $
+
+*glade-3.8.2 (27 Mar 2012)
+
+  27 Mar 2012; Pacho Ramos <pacho@gentoo.org> +glade-3.8.2.ebuild,
+  -glade-3.10.0-r1.ebuild, -glade-3.8.0.ebuild:
+  Version bump, remove old.
 
   25 Mar 2012; Raúl Porcel <armin76@gentoo.org> glade-3.8.1.ebuild,
   glade-3.10.2.ebuild:
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 2dc6e81bfb81..7bd63fd71a03 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,21 +2,19 @@
 Hash: SHA1
 
 DIST glade-2.12.2.tar.bz2 1785723 RMD160 6035749c249492279794d508d3558a8aac17b6f0 SHA1 a43d89b147296244ba4b2efc67e8772d5155afff SHA256 50712d1e5cb369ee1399e9c78ac410e3e69c7582ac9bf1e11d27a7348d3d0a58
-DIST glade-3.10.0.tar.bz2 2805591 RMD160 ad6feed2f572181e28ef024d34ca9a392b68ce22 SHA1 f4738485223ad4ddda9951d5fce11af2a7349c9a SHA256 7e6a1423f1697d8b40618d0b01f0ebff572ccb80f5818a36af0971c5d1d94253
 DIST glade-3.10.2.tar.xz 2380304 RMD160 f4e2da16fbecbad1191841cbc0ad5e2d3dec1365 SHA1 830791d47884dced1278336fe27cb59bea1f3db4 SHA256 0f59ffbd7e1e595396593fedcdb85c51fd01ed05d5ef7c6f724f3a0bcf24d5c4
-DIST glade3-3.8.0.tar.bz2 2694485 RMD160 0b6ca19876f857a2518b5d29b909dc6f5a2e0f37 SHA1 1d3d2410ab5f57b27fc754c97d24cbc4bc4470a2 SHA256 ad3f726ccd34d210dbec9cc2787cab91f7b4c4b9e7518c00bc72b6d52c9858bb
 DIST glade3-3.8.1.tar.xz 2318896 RMD160 4386391b11d4f67db08922e44a79474bc3d68449 SHA1 5105952ba58257299ae6bd81bb9a8c2b66567365 SHA256 4ca469d51ce1ce9ac84fae7b0cab0707700330454058b180f796f92881243cd1
+DIST glade3-3.8.2.tar.xz 2316028 RMD160 da6f5cad40c304cfb5c8f36f6eb0dbfb60cc30d0 SHA1 bdc2320bf226b52a55496e2823880be5762081b8 SHA256 f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d388b19
 EBUILD glade-2.12.2-r1.ebuild 900 RMD160 5deb118f347fdd89cabe27ac4aa26489d7f26b43 SHA1 c792f634678e236533079db14188d60137db9545 SHA256 0e37da6dae2172ed3edc66efa0ffcf906e99661377f9c76408cde556abe98f86
-EBUILD glade-3.10.0-r1.ebuild 2091 RMD160 43833810febf1b9b51fb74820041b821cef37fb6 SHA1 0dc971546a8c0ba67c38ba762684a1adafd0b906 SHA256 e893ca264843fd02f376f2b8c4538e5a3c4a457fc73c5297b81be9ba04fd9455
 EBUILD glade-3.10.2.ebuild 2088 RMD160 71457944780ff8ab7e1c501415f25ba41e8f0c1b SHA1 d63d89f42bad3d712c05f05ac4909b8ddfe592d6 SHA256 3909469a04566bec12b9a056f5836187c8f017dd72a8175882d34696e925120e
-EBUILD glade-3.8.0.ebuild 1364 RMD160 5871338db2986a7fd66d2a0f832ad39efcb45a29 SHA1 38c00d9b4256957a3886d3f8fd9dc447b514c6df SHA256 5ccfc1af90379445bd0bbf477940ffe323750e80b131db7eaf7f802e3c851dc4
 EBUILD glade-3.8.1.ebuild 1273 RMD160 3fddea65f716627e533ecea240dbc335f9f7453b SHA1 9847f878bdc49ab44e38cf3ef3610aa6b2096970 SHA256 5896582880fb047f914f8931ffe52f4b3a0bf408a5f31951dc47cdb9ee4971ce
-MISC ChangeLog 19507 RMD160 44264d3a60c7365e365d382a9081d01e60e8b0d4 SHA1 bf60dbc3096144a0d770621a66361ea3482cc463 SHA256 d773f03d189a6586aa6f8de8780242c9c243ce838675208ca7a3169d534876e9
+EBUILD glade-3.8.2.ebuild 1280 RMD160 f47fc3f8fed817c66264a9635dfb8c3d0b94b541 SHA1 ed61972fc411ad9bd89559ca72dd04895efae5ac SHA256 2a55b2e90d2a0fc640d45d8d16ac17e1d25268111247b68d06679340e850ec7a
+MISC ChangeLog 19677 RMD160 037ea5d4582ea38b7ea6e56bc891321002ffcbd3 SHA1 2447c75e809fd79374d2146d6f698e22c36394fd SHA256 b5dab0de962cd67ae3b2301fad6284aaa504b38c09962633efa7ad1fc0c03bee
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9vRH0ACgkQuQc30/atMkBQKgCfT8rt/GBgkWg18RlJDlyh3AjG
-QGMAn2qIlIetLQDuOgXz7mGm71qAsDgg
-=kmqK
+iEYEARECAAYFAk9xe08ACgkQCaWpQKGI+9RvTQCaA6QwTAXwOaLOWztJfiTavz9X
+1s4An0eh+a8g+6PalN2ODHZSaRowYDr2
+=crHq
 -----END PGP SIGNATURE-----
diff --git a/dev-util/glade/glade-3.10.0-r1.ebuild b/dev-util/glade/glade-3.10.0-r1.ebuild
deleted file mode 100644
index 03684791e487..000000000000
--- a/dev-util/glade/glade-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.10.0-r1.ebuild,v 1.7 2011/10/30 17:41:42 armin76 Exp $
-
-EAPI="2"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-
-inherit gnome2 versionator
-
-DESCRIPTION="GNOME GUI Builder"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="3.10"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc +introspection python"
-
-RDEPEND=">=x11-libs/gtk+-3.0.2:3
-	>=dev-libs/libxml2-2.4.0:2
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )
-	python? ( >=dev-python/pygobject-2.27.0:2 )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.41.0
-	>=dev-util/pkgconfig-0.19
-	>=sys-devel/gettext-0.17
-	>=app-text/gnome-doc-utils-0.18
-	app-text/docbook-xml-dtd:4.1.2
-	doc? ( >=dev-util/gtk-doc-1.13 )
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-static
-		--enable-libtool-lock
-		--disable-scrollkeeper
-		$(use_enable introspection)
-		$(use_enable python)"
-}
-
-src_prepare() {
-	# to avoid file collision with glade:3, rename GNOME help module from
-	# glade to glade-3.10, and gladeui documentation from gladeui to gladeui-2
-	local i
-	sed -e 's:DOC_MODULE = glade:DOC_MODULE = glade-3.10:' -i help/Makefile.in \
-		|| die "sed of help/Makefile.in failed"
-	sed -e 's:/glade.xml:/glade-3.10.xml:g' -i help/*/*.po \
-		|| die "sed of help .po files failed"
-	for i in help/*/glade.xml ; do
-		mv ${i} ${i/glade/glade-3.10} || die "mv ${i} failed"
-	done
-	sed -e 's:DOC_MODULE = gladeui:DOC_MODULE = gladeui-2:' -i doc/Makefile.in \
-		|| die "sed of doc/Makefile.in failed"
-	for i in doc/gladeui-* doc/gladeui.* ; do
-		mv ${i} ${i/gladeui/gladeui-2} || die "mv ${i} failed"
-	done
-
-	gnome2_src_prepare
-}
-
-src_install() {
-	# modify Name in .desktop file to avoid confusion with other slots
-	sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
-		-i data/glade.desktop || die "sed of data/glade.desktop failed"
-	gnome2_src_install
-}
diff --git a/dev-util/glade/glade-3.8.0.ebuild b/dev-util/glade/glade-3.8.2.ebuild
index 75bfbcf21fde..ec66eb07e05c 100644
--- a/dev-util/glade/glade-3.8.0.ebuild
+++ b/dev-util/glade/glade-3.8.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.0.ebuild,v 1.7 2011/10/06 18:40:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.2.ebuild,v 1.1 2012/03/27 08:33:13 pacho Exp $
 
-EAPI="2"
+EAPI="4"
+GCONF_DEBUG="yes"
 GNOME_ORG_MODULE="glade3"
 GNOME2_LA_PUNT="yes"
 
@@ -13,11 +14,11 @@ HOMEPAGE="http://glade.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc gnome python"
 
 RDEPEND=">=dev-libs/glib-2.8:2
-	>=x11-libs/gtk+-2.20:2
+	>=x11-libs/gtk+-2.24:2
 	>=dev-libs/libxml2-2.4:2
 	gnome?	(
 		>=gnome-base/libgnomeui-2
@@ -43,11 +44,6 @@ pkg_setup() {
 		$(use_enable python)"
 }
 
-src_install() {
-	gnome2_src_install
-	find "${ED}"/usr/$(get_libdir)/glade3/modules -name "*.la" -delete
-}
-
 pkg_preinst() {
 	gnome2_pkg_preinst
 	preserve_old_lib /usr/$(get_libdir)/libgladeui-1.so.9