Version bump, drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 66 insertions, 147 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 727ac0c6cfef..5f9d338e745b 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.189 2013/04/09 16:42:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.190 2013/09/28 19:49:31 pacho Exp $
+
+*glade-3.8.4 (28 Sep 2013)
+
+  28 Sep 2013; Pacho Ramos <pacho@gentoo.org> +glade-3.8.4.ebuild,
+  -glade-3.12.1.ebuild, -glade-3.8.2.ebuild:
+  Version bump, drop old
 
   09 Apr 2013; Agostino Sarubbo <ago@gentoo.org> glade-3.12.2.ebuild,
   glade-3.8.3.ebuild:
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 28638c5d5481..3d371f321b7f 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,34 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX glade-3.12.1-doc-version.patch 1416 SHA256 224a3aca9c9bcd190798a702f603a186155784d207720606ec2c89cc5152bb48 SHA512 1a630851cf12df54ce68feeb71343f1e7e56df25d8c1c31192307e4f19124a88293428362f35f59ca37cc116c26ce32e8c521415b93e47112f3d513b3afc9e56 WHIRLPOOL 7e860b824ef0aea4de6382dbf35acc1fb562eadcf46b27b04b1612b56fd968e73c9c5a5d862694a7aa100db084d2366575bdb12dfc32c0a4794ca6d91d672122
 AUX glade-3.14.1-doc-version.patch 853 SHA256 6fb39133bf00abd38f56b3a79cbd8b714a922cca231db59cd8dcb00693604fdf SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf WHIRLPOOL 2f5315144afc183db4599134a23ebab098df1708474180c27aaf4143cf5db5a70260bbfed756d00f54a35f37b6379134cb24f6567edaaff0a9bae72b19433f99
-DIST glade-3.12.1.tar.xz 2458268 SHA256 27e89fb743adb9996c418aa70cde8ce3c0769103f3691cc8011e6c6846600e76 SHA512 9cb560f8c2605bb8f3debad9986db078ecc1bd0493f070365b07cd28c97504664fbe4c94c2ce361e73163a185909f15b91cef2a4d32cac12efe8ec951470d77c WHIRLPOOL 9959d9293f9b4c6078007eef3dcddc62305dfbe79a98d8c02b73b5f0e464a9ce670747fcd9120bdda6bb96cd88c29bf13bc150e9d3240c5aebd2c66272891fa1
 DIST glade-3.12.2.tar.xz 2455892 SHA256 8a60ea06528a5994ee2c214faeb834d3dcbffcef2e14d77d55d0e883de8eb3a3 SHA512 000c43b8f74c916f0ee87be0fd4e99eacbd356066b21397004079f6f7241332ec3144477afc8dd39db001bcd6bd2b76edb57b9689d87041bd505912e8a597d5b WHIRLPOOL ca419a59f636771a3558d7c47192acc823fd0ed4628ec721c11df78e841c74196a172c0fb849d25900dbb24b54fa1ac1a561ffa82c9b0d4eaef318a3cd2727cf
 DIST glade-3.14.2.tar.xz 2480480 SHA256 d2e6b5a20cfdbc0a5ed49122ac7b4e3a10ba140ccfcaba60082e6e2b52a62ac6 SHA512 479665d3afbb7a699b6952d48d5fa9897f35d6c405e9d0288ce5a40f4f631b226eb234ebd7645df0d3bc3695d035ba860cf778faa471d7635e01f1b3b707bb5a WHIRLPOOL 48d358d2d4f364351ad2cc2923f489206b23a4d1cb17f3dfc3272234cebfff9fef1a2c5bb2ab6b3370b33c7983962aedf27655a7e6402d3e6250c65c85922742
-DIST glade3-3.8.2.tar.xz 2316028 SHA256 f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d388b19 SHA512 66e16ac22d903be7b3108a3af54086071731fd9f7893e22b0937d77cd4380c1cf2a8352850c2465a4e8bce7b3eaad10fab55b29a7e007b2b7a7ce300939aea55 WHIRLPOOL b42a3d297f11dbadab9d02b4826643a363e747063704ebc3db0f66c3ef1487f128ab543aa8df1b902341aafa813f62762861fcd00f0f0232fc183145858f6e1f
 DIST glade3-3.8.3.tar.xz 2306804 SHA256 84bb2d7f782f203e4aab923e47db8d22529229b13e59570945261611c63941d6 SHA512 9199c1852dba74b6591630c7b8c166edb10a653e801ec867c514313375e6a7912473b0be7db696ea5c89e06fa250bcd9c0b5602d39eba4e6e6a8cb397bf11974 WHIRLPOOL 4afa7792f272f940ec995081712b67c981f94ae9b6fabe15588a680e672b82ef228ba36ad0259a706f82a402bf0d1f3984f3c03c0cf3461521842700c2d80a5e
-EBUILD glade-3.12.1.ebuild 2112 SHA256 fae17c996a15a947b2152d319366d42bbe70420892833d407b5c2b7713e462a7 SHA512 2321624bae3525acdd5f0946389e03192d693e0c96c3fda35af6e3ad9e05179e19f7b39cb1947a136f7063e752134b0b2c8f913d2826928007701fb7c21f826e WHIRLPOOL ba83ff552826e78311498495ee746ad9f779073cae563c60b7139706448b8015b856f67d663c979783bc04c4bfe8b618a1d04ccbfeb27a58f5146d4acd03ca2c
+DIST glade3-3.8.4.tar.xz 2305876 SHA256 c7ae0775b96a400cf43be738b2f836663a505b1458255df9ce83a340057e3d08 SHA512 dead9b9788002eecca6f8413c999471b957a8c482d770a0a2288c207c86a69e0a011164114ea9d2da60641be9cb205e3f1be7838998566a585aa3b121d316ef5 WHIRLPOOL 0fc377d71367c084a32b5b77fdbdfb82a8c8192faa94a65660c461900fedb01fd68751cb4511af926f6dc18d3e4c0f4743e68207c725b133d61a6f066a30ffd9
 EBUILD glade-3.12.2.ebuild 2307 SHA256 8209c1bc28dea816f63338c7ee0ca9b34e12063b7e817259c9d82ce984ccee14 SHA512 157b34c0842b5a78f51bf7fc53ac2191c2ee5c2cc0d7f2f7462f9aba3dc0560c397105f7cc288f473754ea424141914fcf9e537b1a0e604bc77bda2b2b683ebc WHIRLPOOL 5993edd897eb477a8aed10d4c81c53fd6ca35c738db0b87956d3bba44215ad872c99343f090e35485106b9ce2771a3bf9daad22eb3e1410448400849aaafa6b9
 EBUILD glade-3.14.2.ebuild 2349 SHA256 6fe005756e4d27f4d19960e3d2980e27b2822b2aa89e1776750c1d94537ef579 SHA512 0a7ff2e0f2ea83e69143fd91fef0332ae200dcd5730e39fe21dc812d6104fa06e2c7ee7c91909e38db215c2b7a072055fafca24318773bc3dd22ff800266280c WHIRLPOOL b0ee8e94f443c376bc102e8e3d89d2a0c728554a80b7582a5ed5dbe2628c0b530528048dd40f6b58a4a39b7aa7517503b2f24b80bb32f4ce682b5120de308a42
-EBUILD glade-3.8.2.ebuild 1301 SHA256 661a095618b8dd3da3e5578cb0b953e3962ef1ac0bb49319a599b6af8f636a9d SHA512 a9aca077e58d895a0377d43c26d23721c4aca65095ecc0998a2526b02770ddd695ac4afc197323124f7f23aabb86743a858d2c8ae4acd04acce50716263935f8 WHIRLPOOL be5305b462ab1952829dd88f2bafca1cdffe41286a0ff4f0f3a5497e21ad495abfb83cd9fb06c9dde7b80974aa0becca7e831da00c060245541d8c06c9014494
 EBUILD glade-3.8.3.ebuild 1478 SHA256 1c726cb00cad6015374b45f1c57c204e0ec471633037d9ce6dc769fa1f8b9c07 SHA512 fbd4d4a502b597d1bdc10dafdcb69e1493fc072b1d865edccfce8545cdbe2e279659d8760e2008282c46a4f1ce64a8a247d013848ea92c5dce8b2a6fdaddc9c0 WHIRLPOOL b7ff7874ec2f2327aab7c19195e5d7c8233ffb0f099c3f3000ff8b4a015dd150b07b255ec764aa1e85435ffe69e4de14540cba7bf23ca9f23365b53e805a14bb
-MISC ChangeLog 24215 SHA256 36eeb2b05c62131b7513b5c180c49b7e817a43a4d18ef4ca1ca041d1f8accb82 SHA512 e95f89595da7922dacc48cd519b2ba765a2a90acae56daeb0185f8a04191e02b9ec8be220e1817d2e1923509eae0e0af4f54f205d41bde0974f9ab1af1d8c32e WHIRLPOOL 5f9ab42c161385d43fa93f93b3a8ad34a6cb053e3cbb871e348c2a2de410a0a6f9bb56bedd0d009d77eb62e96b29f7630cdd1631e89c829ff92850e53494665b
+EBUILD glade-3.8.4.ebuild 1222 SHA256 7113190e3ed0b138cbd7811c504769acbd53d47571f2254b8c54f39ca54e934e SHA512 b1b52ffaa1c9abbb042e2319ebf1b956ad6e4c0a9ea55c5542ebfca20d6736e5446f519116cdd45e6b5e9277d64b9b8ad7d49699dc939b2c45e6d37025740ecb WHIRLPOOL 73b6b789670deef823f0767023058ccd441487892b670c9b435e21681a17695855d5abcbc327b8d5857f3bbc1208ef57ae45acf81df1dea98c902fa0c8a4a6bd
+MISC ChangeLog 24383 SHA256 c2683134766315a633f4dec5e9001c132f8f764aa75d54068ff00e9dd6441ee3 SHA512 25a685378a4e149cab7a39b20e76fdf6a1a32a0548e16954ee80e4fec405a64c0e3512aa04db81affffed10b3d5095a3838ccc36aa6ceec1e96e4fb02726bb00 WHIRLPOOL 06d44ec96800777802804ed0dd8481aa6ff899f6076958698bfccfa0f9f68bb7cc91755744dcb16c5e6323e961d95eba993101e8efeea42e5f241d766a62c4ce
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRZERmAAoJELp701BxlEWfRNQQAIesLEM4PwHtiP6mIJJ9TuoR
-bLOF/kFcQQaJgRn49gLZ8CsRRFWSJE7uyU+59mGhnu523p727WxZvlgPIakWL2fY
-BaSjjlVbR5hLTIE67F+HFSPw44TWdIDGbmJo8noFXovb23GgTsJQjnWURh9vJG9w
-1JoIXd+8NzZw/TOWRub4JY1DGM1J7tcvZfRdUtLAZgsCiihql7MD17/WgvubruV6
-QqhtRKMcaT+fsiHhWd7QZrfWLRwfoxZqFyoTnBdf2VbtSUaV3JpNnS16hHmI7uVi
-8/D1yu9br6EG+yy8rM+mCtcMyGVR1B3WN31i3L+JXljdvIT6/DgZkKX+ouY/VsZT
-7+K4REDTGdEmPXObURvVZFpFjlB4G0wvYvNoJ7xUo2eT/yH1T30+02Y8+B0tbG25
-sM1QWtFaSPYvA+gnNsFXzfzaxChw/qgKTMuDBi1rFRHvXFMKJyM3qIjYSVdYMTxW
-y4QU+IBTsX317joyy6jsqJtGBmnsdSSmbJ9702bbXBRTKIyGgfHW5Dv+QK3bq3C7
-RTH841RitdS+LhaAE67Zhey9mOr458u/aEWqqEQ/EGmbNWAC7z21R8zM1hvnU8+S
-bfSzuzbV6RxHpmbE/nvedJvooPLvNu8JvrYZDRm6PV9wH6NKLDzATDpM0Pk0OGIq
-xB4DR2kMeM0agGthGRw+
-=egAR
+iEYEAREIAAYFAlJHMswACgkQCaWpQKGI+9RWiACfQ6CbHGN3KMF40+9hRMaJ/179
+3lMAn3jegDPvealTMYiPUXzYqDmPUtFC
+=Rq+Z
 -----END PGP SIGNATURE-----
diff --git a/dev-util/glade/glade-3.12.1.ebuild b/dev-util/glade/glade-3.12.1.ebuild
deleted file mode 100644
index 1ddda703ad45..000000000000
--- a/dev-util/glade/glade-3.12.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.12.1.ebuild,v 1.12 2012/12/17 06:03:07 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 versionator
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +introspection python"
-
-RDEPEND="dev-libs/atk[introspection?]
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2.4.0:2
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.4:3[introspection?]
-	x11-libs/pango[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )
-	python? ( >=dev-python/pygobject-2.90.4:3 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	>=app-text/gnome-doc-utils-0.18
-	app-text/scrollkeeper
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.41.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	dev-libs/gobject-introspection-common
-	gnome-base/gnome-common
-"
-# eautoreconf requires:
-#	dev-libs/gobject-introspection-common
-#	gnome-base/gnome-common
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-libtool-lock
-		--disable-scrollkeeper
-		$(use_enable introspection)
-		$(use_enable python)"
-}
-
-src_prepare() {
-	# To avoid file collison with other slots, rename help module.
-	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
-	epatch "${FILESDIR}/${P}-doc-version.patch"
-	eautoreconf
-	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"
-	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
-	sed -e 's:name="gladeui":name="gladeui-2":' \
-		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
-	gnome2_src_install
-}
diff --git a/dev-util/glade/glade-3.8.2.ebuild b/dev-util/glade/glade-3.8.2.ebuild
deleted file mode 100644
index 2bc4f5a8a0ec..000000000000
--- a/dev-util/glade/glade-3.8.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.2.ebuild,v 1.10 2012/12/17 06:03:07 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="glade3"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gnome python"
-
-RDEPEND=">=dev-libs/glib-2.8:2
-	>=x11-libs/gtk+-2.24:2
-	>=dev-libs/libxml2-2.4:2
-	gnome?	(
-		>=gnome-base/libgnomeui-2
-		>=gnome-base/libbonoboui-2 )
-	python? ( >=dev-python/pygtk-2.10:2 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9
-	app-text/docbook-xml-dtd:4.1.2
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
-	G2CONF="${G2CONF}
-		--enable-libtool-lock
-		--disable-scrollkeeper
-		$(use_enable gnome)
-		$(use_enable python)"
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgladeui-1.so.9
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	preserve_old_lib_notify /usr/$(get_libdir)/libgladeui-1.so.9
-}
diff --git a/dev-util/glade/glade-3.8.4.ebuild b/dev-util/glade/glade-3.8.4.ebuild
new file mode 100644
index 000000000000..eb8fc5533ac0
--- /dev/null
+++ b/dev-util/glade/glade-3.8.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.4.ebuild,v 1.1 2013/09/28 19:49:31 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="glade3"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="http://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3/11" # subslot = suffix of libgladeui-1.so
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="gnome python"
+
+RDEPEND="
+	>=dev-libs/glib-2.8:2
+	>=x11-libs/gtk+-2.24:2
+	>=dev-libs/libxml2-2.4:2
+	gnome?	(
+		>=gnome-base/libgnomeui-2
+		>=gnome-base/libbonoboui-2 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygtk-2.10:2 )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+	sys-devel/gettext
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.9
+	app-text/docbook-xml-dtd:4.1.2
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--enable-libtool-lock \
+		$(use_enable gnome) \
+		$(use_enable python)
+}