Version bump for Gnome 3.10, drop old

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

4 files changed, 106 insertions, 67 deletions

diff --git a/dev-libs/libpeas/ChangeLog b/dev-libs/libpeas/ChangeLog
index 45c3065de33f..fa571a861ff4 100644
--- a/dev-libs/libpeas/ChangeLog
+++ b/dev-libs/libpeas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libpeas
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.23 2013/12/08 18:04:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/ChangeLog,v 1.24 2013/12/24 15:56:52 pacho Exp $
+
+*libpeas-1.9.0 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +libpeas-1.9.0.ebuild,
+  -libpeas-1.6.2-r1.ebuild:
+  Version bump for Gnome 3.10, drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> libpeas-1.8.1.ebuild:
   x86 stable, bug #478252
diff --git a/dev-libs/libpeas/Manifest b/dev-libs/libpeas/Manifest
index ed46647332ed..08afb68de61d 100644
--- a/dev-libs/libpeas/Manifest
+++ b/dev-libs/libpeas/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libpeas-1.6.2.tar.xz 525540 SHA256 26fb143ce4e89eb809f96113cd010d33fd337833bd70ab3b29c567f19376a65f SHA512 d8c21bb808f8cdd440fc5dfb2e5376b0935a4d6599eb3951fd03d700aa212688c0fecd112adefede9911be9db9b9dff4e1e866f032a79153bd0e750b5fdbdd25 WHIRLPOOL 9b876c43880d4548777b6ad1325caf6b84ed33fac7843b166769805b2be37cccc2ae33f9274faaaefe122910e48228ae7961e083fc1e26ba4d2864d0ebec0934
 DIST libpeas-1.8.1.tar.xz 530948 SHA256 ff0e7cd1f0da5dc1289efdd4662a06188f8f0fb088eac67abe05ffa66ba7751d SHA512 e5e63e16cb368fd6538fbdb6761e24b7befb8e54f8a55ebe96b72b70d8050bfc49e70d93558c9b96fe3846c5bb9af585f9bb8c235d124222ae5c986ea5ceb80b WHIRLPOOL 6e79b5bff3e073c2e5875c3e37b73c3cc39b34c0af1cd579a991a8c6fc696492268aa0e128eff003ed14fce06cf40f268f126d24f2b2c1cc130f5b9434b2badc
-EBUILD libpeas-1.6.2-r1.ebuild 1747 SHA256 a945f0fc6b3065f2c88facec52de5dbf825050068b9b4e73fb88e7b482260785 SHA512 3414ed010a8af140247261cf060121120e182cec60f39c1e2fdb3885688c6d682da63ffaa6c8ef3cbd4a08ae918fcd74346454cb54fb662d55c3462061daf10b WHIRLPOOL 8e3f8f6cb9d85785d76ecfa5a3f0f9a93d507aee32c59bd3e6675d38158ef6b672136711312eed761407c1940aa452e1787bd3ade51a8b5b86781428ce4f29b4
+DIST libpeas-1.9.0.tar.xz 532364 SHA256 008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d SHA512 d00b0d78a8ee3807a3c9d48259fdfaf2e60042c385c3cccc0bcd61f76415fd9225e4ef737d48a1a0afb2c12e8418bdd3e1ceaac927a083f3180faf8acbbe79b0 WHIRLPOOL edf4555b11c3a2e522a39180068cca1811125e9761e14f7315ac97c29e39fa40c5bf1e4d3d14f3650af788baa452fc3067fc31647626cfcc471c0c729421c7cf
 EBUILD libpeas-1.8.1.ebuild 2621 SHA256 55d4bddae0c30037836fbfdc8f11638057d1c3b956b7aacc9875ac4cc2fcd352 SHA512 353e79e652692bb7566a8544aa3937b260f7522d7e4e42a74c2998f3d76e98b47e3b316763c497c04eec069ecaea439f3b8201a6968023f8fa641fec8ba8c594 WHIRLPOOL fa47c3cc93eec385a1f3951a3d424f561781a58b3428e75f56e610cad99a15c7054b45961d02c0b15e142441d31f8a3a38b486264811c48bb8280f999add6a7e
-MISC ChangeLog 3699 SHA256 2c66d39c6e4c1d005f0bca0ae0fdace088f4b1ea17c2366520f3f9a4ffbeed0b SHA512 f192e108cccfda8ee8873384cd155024c32269738f8f4e59cc38ed34b252531f73bfbd3139e78f539ee6ca2007fa8428e4042458d25b68c356db3cc933958e0c WHIRLPOOL b3c90923fc09b000de05aac7a9211ca7c7cc9e295d600368a9919d59bb2379f24f5f5b9e6d6c04529cb1927529810d745840a89af7a1d62442015ae73419744a
+EBUILD libpeas-1.9.0.ebuild 2624 SHA256 b9daec3f2dd0be4cd2260e635233092b720603cecc541bbce77755e67c7fa13f SHA512 6090a2512d6acbe376b7d495e4f29822d9be47ea0b667963e572d3c1dabafda4752a37cf8498517dc9ec51a46bf40fc64faf95e0b6a73047659b1534ad7ffaa7 WHIRLPOOL 79b90bfe47f3736208af84ad22d84ff46bfea1a304eae0c85b9fdb49f139e55c00db7ef2ab26cbe9e2891a2ced23ef0a0ef7a90b5372e8c0948e3506f7a63ef8
+MISC ChangeLog 3867 SHA256 ffc2217bd98dbb36f490712842a6e05d417da5f21fa959733b0fb5a964da3d04 SHA512 09b7c13751ae9bbc983cbddfb33fd0dbe59f45b35583d353430e5d81dcaf49c10d383079f83ded5236c6d75591cbafdf1e808cdfc0761897144cf3f5fdec045f WHIRLPOOL b85814d27887a40a7f1721b18d62abf94c17e6d170321b560eea908096152e2d71f38248afcb2b54eb02e6b857b80cd142df6b4461d083782450348e31867b2f
 MISC metadata.xml 531 SHA256 51dd5faefa5c4d563cd93744c74166cd21b2fbaba1ddb8b64239c25d53962c21 SHA512 237be10858c63fd7e3c335692ca2276b3b2062b52b30de2bcc99cfbcb0fb2d059cf8facebc65a1aecd0bf9a3092c51e1cc287d35cc13f52b5b5e8d11bdbf877c WHIRLPOOL 3375f4b5fad86a6ecc774b4071c7c637a01d58ee1305210c56a5d7f5dca0b76cd183f285348366b80c202c0f5b5c42d6bd7c5c7c3d6501a414a2481e142efb48
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKktLcACgkQCaWpQKGI+9R4zwCeLfr+FFaQeQF6N8NquJvRRDiu
-GRgAn3RJ/d/0ZsfipK8gv548WvulFfmF
-=qt9g
+iEYEAREIAAYFAlK5rsYACgkQCaWpQKGI+9QlcwCfQ1CuURhp2+B3u8MARye43Ykb
+1KYAniT85KIxfikkziHibIy/J8k4GFVI
+=O6QI
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild b/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild
deleted file mode 100644
index 3e2f458efbd0..000000000000
--- a/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.6.2-r1.ebuild,v 1.6 2013/02/02 22:26:12 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils gnome2 multilib python-single-r1 virtualx
-
-DESCRIPTION="A GObject plugins library"
-HOMEPAGE="http://developer.gnome.org/libpeas/stable/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="gjs +gtk glade +python seed"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-0.10.1
-	gjs? ( >=dev-libs/gjs-1.31.11 )
-	glade? ( >=dev-util/glade-3.9.1:3.10 )
-	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
-	seed? ( >=dev-libs/seed-2.91.91 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		$(use_enable gjs)
-		$(use_enable glade glade-catalog)
-		$(use_enable gtk)
-		$(use_enable python)
-		$(use_enable seed)
-		--disable-deprecation
-		--disable-static"
-	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
-	# What do we do about gdb, valgrind, gcov, etc?
-
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
-	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
-	# To reproduce:
-	# >>> from gi.repository import Gtk
-	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
-	# This should return True, it returns False for Xvfb
-	Xemake check
-}
diff --git a/dev-libs/libpeas/libpeas-1.9.0.ebuild b/dev-libs/libpeas/libpeas-1.9.0.ebuild
new file mode 100644
index 000000000000..614062fdd7a7
--- /dev/null
+++ b/dev-libs/libpeas/libpeas-1.9.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpeas/libpeas-1.9.0.ebuild,v 1.1 2013/12/24 15:56:52 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit eutils gnome2 multilib python-r1 virtualx
+
+DESCRIPTION="A GObject plugins library"
+HOMEPAGE="http://developer.gnome.org/libpeas/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="gjs +gtk glade +python seed"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/gobject-introspection-0.10.1
+	gjs? ( >=dev-libs/gjs-1.37.1 )
+	glade? ( >=dev-util/glade-3.9.1:3.10 )
+	gtk? ( >=x11-libs/gtk+-3:3[introspection] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0.0:3[${PYTHON_USEDEP}] )
+	seed? ( >=dev-libs/seed-2.91.91 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+
+if_use_python_python_foreach_impl() {
+	if use python; then
+		python_foreach_impl run_in_build_dir "$@"
+	else
+		"$@"
+	fi
+}
+
+src_prepare() {
+	use python && python_copy_sources
+	if_use_python_python_foreach_impl gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf="
+		$(use_enable gjs)
+		$(use_enable glade glade-catalog)
+		$(use_enable gtk)
+		$(use_enable seed)
+		--disable-deprecation
+		--disable-static"
+	# Wtf, --disable-gcov, --enable-gcov=no, --enable-gcov, all enable gcov
+	# What do we do about gdb, valgrind, gcov, etc?
+
+	configuration() {
+		local myconf="$@"
+		[[ ${EPYTHON} == python2* ]] && myconf+=" --enable-python2 --disable-python3 PYTHON2_CONFIG=/usr/bin/python-config-${EPYTHON#python}"
+		[[ ${EPYTHON} == python3* ]] && myconf+=" --enable-python3 --disable-python2 PYTHON3_CONFIG=/usr/bin/python-config-${EPYTHON#python}"
+		gnome2_src_configure ${myconf}
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir configuration ${myconf}
+	else
+		gnome2_src_configure ${myconf}
+	fi
+}
+
+src_compile() {
+	if_use_python_python_foreach_impl gnome2_src_compile
+}
+
+src_install() {
+	if_use_python_python_foreach_impl gnome2_src_install
+}
+
+src_test() {
+	# FIXME: Tests fail because of some bug involving Xvfb and Gtk.IconTheme
+	# DO NOT REPORT UPSTREAM, this is not a libpeas bug.
+	# To reproduce:
+	# >>> from gi.repository import Gtk
+	# >>> Gtk.IconTheme.get_default().has_icon("gtk-about")
+	# This should return True, it returns False for Xvfb
+	if_use_python_python_foreach_impl Xemake check
+}