Version bump, remove old.

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

5 files changed, 142 insertions, 68 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 71387a534e50..daff836bcad3 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.139 2011/10/14 19:06:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.140 2011/10/16 00:12:26 pacho Exp $
+
+*glade-3.10.2 (16 Oct 2011)
+*glade-3.8.1 (16 Oct 2011)
+
+  16 Oct 2011; Pacho Ramos <pacho@gentoo.org> -glade-3.6.7.ebuild,
+  +glade-3.8.1.ebuild, +glade-3.10.2.ebuild:
+  Version bump, remove old.
 
   14 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> glade-3.10.0-r1.ebuild:
   amd64 stable wrt #385699
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 4ded212ae4ce..e0d829e0e172 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -3,22 +3,20 @@ 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 glade3-3.6.7.tar.bz2 2244221 RMD160 ab8487a8914b31ba2cb22bf0261b6ad39b0d1629 SHA1 7621d5ae486ed42c35bb1d147b5693428481e733 SHA256 117905d5b52781e0ffa861e38f47acda0e6bff992c5015408be74a7669769f81
+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
 EBUILD glade-2.12.2-r1.ebuild 900 RMD160 5deb118f347fdd89cabe27ac4aa26489d7f26b43 SHA1 c792f634678e236533079db14188d60137db9545 SHA256 0e37da6dae2172ed3edc66efa0ffcf906e99661377f9c76408cde556abe98f86
 EBUILD glade-3.10.0-r1.ebuild 2099 RMD160 828b7b6b707b3f10bd4e1c86da6d90231941fd98 SHA1 839d53500d64f5c843410fe745d318ceb9d373a4 SHA256 92a3b9033787d0c5c521797145d17a2072779f3a5565189e0f4344aef7996e48
-EBUILD glade-3.6.7.ebuild 1338 RMD160 577d26f40d92361ff2460c33c34a0d2ce953400a SHA1 b39ff4d2c8a878cf07563e6a46a8735fe64d5813 SHA256 4609783c92c20ef1e865a6d469611bb42c83d89b35a8d2cfa7e6c307efbc18fe
+EBUILD glade-3.10.2.ebuild 2093 RMD160 ae1441ce897075aeea7f3b2f115cd97aeb6e4848 SHA1 00547e80f971ba0dcf51e35999e27a55996e3913 SHA256 20cb01a480d775b68852e7190ec4cd87918cacd2020663d3429a76f3a22a7d71
 EBUILD glade-3.8.0.ebuild 1364 RMD160 5871338db2986a7fd66d2a0f832ad39efcb45a29 SHA1 38c00d9b4256957a3886d3f8fd9dc447b514c6df SHA256 5ccfc1af90379445bd0bbf477940ffe323750e80b131db7eaf7f802e3c851dc4
-MISC ChangeLog 17700 RMD160 4ebb0a78bdd224174981ee74b0791f9dfb2c6900 SHA1 fae6f7b6412bffdcbf76156b4b706d72dff19366 SHA256 e26c9c2bd7ae9f3e4d347ae32bab0bc0787840b9b2e76011ca35bfa674c98854
+EBUILD glade-3.8.1.ebuild 1280 RMD160 57bad0e8dc86bf259ed5c635fa1982a7370b9876 SHA1 e0b0042799ab0c87537f4b3237477e2474400a80 SHA256 acd86e7d8e73dfc656da1c267b625d7481c3de10bee7939ebf11e3e77c938a65
+MISC ChangeLog 17893 RMD160 cc60652c4fe834f06f78aaf08b89aab24cd199d2 SHA1 060a360cfadfd8af4a10d8782adcd9ac75564e24 SHA256 33b1fceec38669cbd07b32bc7ff3cc0b03e4df5b3cfc1e82f36c8c22b3776165
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOmIgvAAoJEEdUh39IaPFNBoYIAIC6h/UlrmlSB0cqTYaOpxG4
-+xf5XwZYwNryhVKqq33eE1QAqitl/mtFK2fl6gy9jVnqAK1KU7kkdGMyGo5GAsDp
-o1q2k18nLezST7bXZO5QKWd01ZCq9eu0/asajLc5VnOmCEY0POyTiO7yvbpWx45H
-ia/wk/VmhSKf9BjM74QCvgTlRfyROfNYjgjDX50WjmrgQaRaMuHH1uddR2GDQVTA
-KahmS8Ov9beZBhOpu6gKRsfURTmqoBneWgm3s/xMBc/2DguxKSg6co3OK2QQWM2p
-61VKI5CFaLklcfNWQjZ4XGIhjPyvueULrF65ArRk4qiVw3zvlydchEReRnS81Ho=
-=VtD6
+iEYEARECAAYFAk6aIXEACgkQCaWpQKGI+9SejQCfVbsCog/nKYWweR0KulrYoNi6
+sS8An189FFgurF+MgoppdMig///rOzvC
+=cOky
 -----END PGP SIGNATURE-----
diff --git a/dev-util/glade/glade-3.10.2.ebuild b/dev-util/glade/glade-3.10.2.ebuild
new file mode 100644
index 000000000000..9022831354b6
--- /dev/null
+++ b/dev-util/glade/glade-3.10.2.ebuild
@@ -0,0 +1,70 @@
+# 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.2.ebuild,v 1.1 2011/10/16 00:12:26 pacho Exp $
+
+EAPI="4"
+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 )
+"
+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.6.7.ebuild b/dev-util/glade/glade-3.6.7.ebuild
deleted file mode 100644
index 52aee8ca5f59..000000000000
--- a/dev-util/glade/glade-3.6.7.ebuild
+++ /dev/null
@@ -1,56 +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.6.7.ebuild,v 1.11 2011/03/16 10:23:49 nirbheek Exp $
-
-EAPI="2"
-
-inherit gnome2
-
-MY_PN="glade3"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="GNOME GUI Builder"
-HOMEPAGE="http://glade.gnome.org/"
-SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc gnome python"
-
-RDEPEND=">=dev-libs/glib-2.8.0:2
-	>=x11-libs/gtk+-2.14.0:2
-	>=dev-libs/libxml2-2.4:2
-	gnome?	(
-		>=gnome-base/libgnomeui-2.0
-		>=gnome-base/libbonoboui-2.0 )
-	python? ( >=dev-python/pygtk-2.10.0:2 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	sys-devel/gettext
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.9
-	app-text/docbook-xml-dtd:4.1.2
-	doc? ( >=dev-util/gtk-doc-1.9 )
-"
-
-S="${WORKDIR}/${MY_P}"
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-libtool-lock
-		--disable-scrollkeeper
-		$(use_enable gnome)
-		$(use_enable python)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed 1 failed"
-}
diff --git a/dev-util/glade/glade-3.8.1.ebuild b/dev-util/glade/glade-3.8.1.ebuild
new file mode 100644
index 000000000000..34320b94943d
--- /dev/null
+++ b/dev-util/glade/glade-3.8.1.ebuild
@@ -0,0 +1,55 @@
+# 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.8.1.ebuild,v 1.1 2011/10/16 00:12:26 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="glade3"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="GNOME GUI Builder"
+HOMEPAGE="http://glade.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="3"
+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.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/intltool-0.35
+	>=dev-util/pkgconfig-0.19
+	sys-devel/gettext
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.9
+	app-text/docbook-xml-dtd:4.1.2
+	doc? ( >=dev-util/gtk-doc-1.9 )
+"
+
+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
+}