Backport the Python fixes from gnome overlay.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 43 insertions, 41 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 9d877639554c..8440efd73b40 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/gedit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.374 2014/11/24 10:06:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.375 2014/12/01 11:32:48 mgorny Exp $
+
+  01 Dec 2014; Michał Górny <mgorny@gentoo.org> gedit-3.12.2-r1.ebuild:
+  Backport the Python fixes from gnome overlay.
 
   24 Nov 2014; Pacho Ramos <pacho@gentoo.org> gedit-3.12.2-r1.ebuild:
   Support python 3.4
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index db044b76ab1c..7ea80d64c8c1 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -2,14 +2,26 @@
 Hash: SHA256
 
 DIST gedit-3.12.2.tar.xz 2850716 SHA256 75460b112bed459a0f9db60e7fb0b9e6341dc8e5c20088d929597ba030d7b653 SHA512 8b15c7293a68727e478e67801a65d779a753e8751edd9808e15f5cee8a7c8509ca6ce03127334f84f60fde164daa6f1f031d236daee57ef8323b45f26dba70ac WHIRLPOOL 72c9fe02428986a514af3da43755aba6aa6fe4fb455293317da2a44552eb847941b66fd045e9e412c101860b7cbc7e0251b1eadd03ff9b1908882757657d40b9
-EBUILD gedit-3.12.2-r1.ebuild 3254 SHA256 fb378cbbc355c9a80ad66aa470d5152acd96e309583e79ca3f42c8e5afff58cf SHA512 ae86542903c90742813da5e917ef6f113b8861b7c79a3369e479ca01d6a4a3f9d8e634231e7c3fa59346cb43b658222ddb79ce17752a122a0759de77639c49fe WHIRLPOOL a8548ede36108aefb4cabaef27e39d15c0a5686b464035a786d37add0a519cc391c9667e60d6c35718af8bb5ed4fe5f7b14947fddea5e0c7e717dfc289918940
+EBUILD gedit-3.12.2-r1.ebuild 2910 SHA256 cd9d8b901031e6ba28835df74a2d1214f72620c12801d29efd7d622940717942 SHA512 6e4c4cdcccd43a48b3c38354eb66959d6e5c4c53d52c6fdb80f70c303884306a3c2fdbb106d4a9e2e51a99e6a41005ac67489d138b49402181d6c43f29602df7 WHIRLPOOL 21793238289d973e5071a5786821f532db065a441f51983762cb6f2c65f7b9ba3075bc1306577b3a3463fa39dde9da00337a1f5c8da49f17608a778ba0cd9bd3
 EBUILD gedit-3.12.2.ebuild 2512 SHA256 e1ca6908f58292b1921f95b842d05dc35a32263b1881466859e282e4543783ed SHA512 09bbb4b2a56e4d0d0e6d3f61eae9a2aaaba7ecb76b9252095f9b487d6acf44e37d5ab7a30fb758d159bbe339d1d7e1c1bc50ee47c731998c42a6cdc6d0cdf8d8 WHIRLPOOL cac6d845124a52d400a2301d96b64a688f336e2a7f3617978b9afd25a754caf539ef5626b8a3d92160736d84154ddf755ef1014bc5ba152cc35007f22bdb92e4
-MISC ChangeLog 47453 SHA256 259c94f40dd73f106ec684d192462fe394fa1e4fb0c7c21117af055afdbf9036 SHA512 969b86d77e5b9fe6ea8567508592ce9765b53d721e36cdea6d91d4c253ec6662b5dc50707cc0d02e73636c25815a535ead2d09a33d8b2a92c4bae64800f5906a WHIRLPOOL 61dea30b71782da337184f462f9f6f028debf24a8f57d720a5ce749a6a21df0bde9b3e9a592ce18d842709da630159aa63aed4a823fb9a7b45c1383e395d8c66
+MISC ChangeLog 47577 SHA256 ccad09d9a4b6d2c077bd2ee3dfd3607168f42abf6f7d8285c7c8de580bd763ea SHA512 7054c4c68e7e26e35e729bf2034388dc8addbca2879b13edda5ac382e3b71c8797dab79f611cf647b432663549b57f2e4fb194d8d16c2e5c26514d7702d17aae WHIRLPOOL b4e9d1402f52f2b10f4a29d2b1beddf4661af8a700a9acc6706ed8bd9dfcf115b8b0daa51e1779876cbf12bd55118c95fcf5c819f56fb633bbd43b36b8b4d031
 MISC metadata.xml 276 SHA256 8dec58657a80b4973306f2f6d5da03a819b949c3f8e93b3065eafda55f1f8465 SHA512 9c1f48389dedc905b448e4085b9fec8f37ef777aacf14e18541e39680ccf83a968c7ee8fea8b9ede61704ac174380c7cc56858182fb6f59a589ab1d70b8eea7d WHIRLPOOL 902de8d338629274e1ec7a7a6b13316e88f09847d5158a92fdc3337e33c26dcda79ff8bf425dc0de42657ba14769478335249d13cba2342f8adb247a1f40e905
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRzAxgACgkQCaWpQKGI+9T5rwCgiH/G3tbl34lOvC7+VXv0RHzR
-S5IAn1Qy7p5jnnVH4Kxd3HgVVZyn92ky
-=bzeB
+iQJ8BAEBCABmBQJUfFHkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOqJoQALxJNJEmud5t9gzSkaJaDFzi
+tHl+YzkpjVtvO3fHs/aZDKUAJUIQZjMIeC+0DM1Rki4CYkpOCQdYwdpcu5faGL2R
+xuPfYwLU79q2TjswFiFeag2dGEXFvzBBzeGDnVFjH4mZbH/m0myfgZLQNIDt23mU
+aO2UxTMQlkJRmmAb5vK8gUgOm8F8Wism0ewuPhYRMtxG9/cYdVaPp29TjW3mlAqU
+g0qiTrpLKvPnG915mfQEMu2dv/QcOUoGPS64AA6Gtztnq7UNr/Ch6jCYw3SujWgr
+a+VMmRsTEFNtNMfEaGO/BxCmkr+KFVzmZoWxm8OEqyoiL6rxpx3npe3Xp2imWHmt
+PERWr6cG4M/xTaMcBD6h45JZQl7wgNcPdBCMFKzA2zfMEMyw6eKyr7EnCnHQRCtg
+eSZRY5vxCvoSA+1oRcXbMoOyMO7rdjIqwEvWDaJ5HGbGDF9LJ6UygeOLLjFT/HqM
+ld0d0ky84YgXmM8NvHdGpq4sHmjrtGHSX5TeoIwQ+x7oJAYKHQLqHx8lbOq2yI2B
+ONijr+UUNQ1r6duyXoL2C+kvMM/3VUbgf8t2Lf1MWKgRDnTI9lNbUDIO0Lcs9+ye
+2vfizF0mJVbUm1zfgf6HIkAnYZlHa8NA2fAzz1tUbVMGE0DUUnKjsQ8YcYxGjOkl
+nOfkQZ4ziljdkwT3lQ4M
+=nsNN
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/gedit-3.12.2-r1.ebuild b/app-editors/gedit/gedit-3.12.2-r1.ebuild
index 1ab5756b9353..58d11027c17d 100644
--- a/app-editors/gedit/gedit-3.12.2-r1.ebuild
+++ b/app-editors/gedit/gedit-3.12.2-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v 1.2 2014/11/24 10:06:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v 1.3 2014/12/01 11:32:48 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
-PYTHON_COMPAT=( python3_{2,3,4} )
+PYTHON_COMPAT=( python3_{3,4} )
 
 inherit eutils gnome2 multilib python-r1 virtualx
 
@@ -16,7 +16,9 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 
 IUSE="+introspection +python spell zeitgeist"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# python-single-r1 would request disabling PYTHON_TARGETS on libpeas
+# we need to fix that
+REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
 
@@ -42,7 +44,8 @@ COMMON_DEPEND="
 		>=x11-libs/gtk+-3:3[introspection]
 		>=x11-libs/gtksourceview-3.6:3.0[introspection]
 		dev-python/pycairo[${PYTHON_USEDEP}]
-		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] )
+		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
+		dev-libs/libpeas[${PYTHON_USEDEP}] )
 	spell? (
 		>=app-text/enchant-1.2:=
 		>=app-text/iso-codes-0.35 )
@@ -50,7 +53,6 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/gnome-icon-theme-symbolic
-	python? ( dev-libs/libpeas[${PYTHON_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
@@ -63,6 +65,10 @@ DEPEND="${COMMON_DEPEND}
 "
 # yelp-tools, gnome-common needed to eautoreconf
 
+pkg_setup() {
+	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
+}
+
 src_prepare() {
 	# FIXME: Not able to set some metadata
 	sed -e '/g_test_add_func/d' \
@@ -74,27 +80,15 @@ src_prepare() {
 src_configure() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 
-	gedit_configure() {
-		ECONF_SOURCE=${S} \
-		gnome2_src_configure \
-			--disable-deprecations \
-			--enable-updater \
-			--enable-gvfs-metadata \
-			$(use_enable introspection) \
-			$(use_enable spell) \
-			$(use_enable zeitgeist) \
-			ITSTOOL=$(type -P true) \
-			"$@"
-	}
-
-	gedit_py_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir gedit_configure --enable-python
-	}
-
-	# run gedit_py_configure first to avoid out-of-source build for C code
-	use python && python_parallel_foreach_impl gedit_py_configure
-	gedit_configure --disable-python
+	gnome2_src_configure \
+		--disable-deprecations \
+		--enable-updater \
+		--enable-gvfs-metadata \
+		$(use_enable introspection) \
+		$(use_enable spell) \
+		$(use_enable python) \
+		$(use_enable zeitgeist) \
+		ITSTOOL=$(type -P true)
 }
 
 src_test() {
@@ -106,13 +100,6 @@ src_test() {
 }
 
 src_install() {
-	gedit_py_install() {
-		pushd "${BUILD_DIR}" > /dev/null || die
-		# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-		emake DESTDIR="${D}" top_builddir="${S}" pyoverridesdir="$(python_get_sitedir)/gi/overrides" install
-		popd > /dev/null
-	}
-
-	gnome2_src_install
-	use python && python_foreach_impl gedit_py_install
+	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
+	gnome2_src_install pyoverridesdir="$(python_get_sitedir)/gi/overrides"
 }