Really allow multiple python targets for python plugins and install gi overrides in the right place (bug #524018, thanks to Alexander Tsoy). Drop old.

Package-Manager: portage-2.2.14_rc1/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 55 insertions, 28 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index 3801ca3839c4..4431a4293975 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,14 @@
 # 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.371 2014/07/23 15:13:11 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.372 2014/09/29 14:31:01 tetromino Exp $
+
+*gedit-3.12.2-r1 (29 Sep 2014)
+
+  29 Sep 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gedit-3.12.1.ebuild, +gedit-3.12.2-r1.ebuild:
+  Really allow multiple python targets for python plugins and install gi
+  overrides in the right place (bug #524018, thanks to Alexander Tsoy). Drop
+  old.
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gedit-3.12.2.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 92139d8596ad..a5aa5b6eb589 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -5,28 +5,21 @@ AUX gedit-2.30.2-tests-skip.patch 1402 SHA256 faf11f3817052dd76aa9d34af938c4cd81
 AUX gedit-2.30.4-underlinking.patch 491 SHA256 88b5f78173b17e874b71cd42f2a61c82900efae5d506fe8ecf6286c50b2e0cd0 SHA512 483cd11f82697de45efca711f24c0d417d918b59d802561fecc83af8f33a4c3de6c01bc4c723a8e8363fecfed1c5c2baaa42b2e9496aa6836b1e160dc790f18f WHIRLPOOL 796bd41ed11be9d5459bb5204b0b9ecd9cd47b1861b02fb45006dfd7004bc48e422ac918ad6ed05c12317a65cf96c4e46fe5709508b4b3a947d3a2907ea23f51
 DIST gedit-2.30.4.tar.bz2 4705692 SHA256 a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c SHA512 31d96a86d4d207fe83aa1c8b8faadd82c2c6eeca019f2df4fdf75a8678233e76edf7a09f32dba6350ab9fc003029cbb585608d864632e1d13c42650d1894b5e1 WHIRLPOOL fe5183f33992d6ec1ce8365321f829828d6c9606b42a6872e323351ac4bee0c488fb5ed06dda8e1aac4a09be3dbad7196e48d9cccf5d0f1c6dd759224051eca6
 DIST gedit-3.10.4.tar.xz 3086320 SHA256 40dc10b6e26fd8523087e7321a20a063f4c1e586dffd7ce8ee78eead11359f9e SHA512 36fe1a309594338e6b0f8285eb8789386724e0a9c9f5f3ff898d138c0949c04ce693896f4e4766666e3afe795dea46caf0403ff82570dfd60e6dc5ccb99642d4 WHIRLPOOL 73c40ae9c73fd31a8dd5468924a338c4e8055c021a9f8800555f781e5bf9d71cfbb9c57666127e52ed3311933a7d0402ca3844b1d8bac439274cf88889c5953d
-DIST gedit-3.12.1.tar.xz 2892392 SHA256 8e3edc62102934a8be708b0fdf27b86368fa9ede885628283bf8e91b26bbb67f SHA512 68d6ccff930c89415105fdeb888c9a5e7e64a7468741e71b31773640ac818f1d79dda9ba9d7734b0c2cd0f57e383de468351d26a09f6c2eb2ad11981fa743b91 WHIRLPOOL 10ce6fbc264d2cb0056c1d8688062d68eee5005fe1bb7b86c270cd1c1238378ff2c20863c43a0994274f7e6669d75801127de7bf2517e748dc764bb787a12c38
 DIST gedit-3.12.2.tar.xz 2850716 SHA256 75460b112bed459a0f9db60e7fb0b9e6341dc8e5c20088d929597ba030d7b653 SHA512 8b15c7293a68727e478e67801a65d779a753e8751edd9808e15f5cee8a7c8509ca6ce03127334f84f60fde164daa6f1f031d236daee57ef8323b45f26dba70ac WHIRLPOOL 72c9fe02428986a514af3da43755aba6aa6fe4fb455293317da2a44552eb847941b66fd045e9e412c101860b7cbc7e0251b1eadd03ff9b1908882757657d40b9
 EBUILD gedit-2.30.4.ebuild 2139 SHA256 d8892e29f599a1f1914b6cc86e1ae89f4afe3087bebff87a3cd74cd8e07a4433 SHA512 05ba413cb9bcca13a00cdc30c5c91d5b20e1028bfe76506139a0ba914e0378bb3b55c68794d3d77aec5f891b73e06fe3032d477133639cb4748e0be30df44513 WHIRLPOOL b85b15c9915ca26e840dc8a2849d1be9245fc47cf14d78d9a12dea3c3e5bcb3ae8e0c47068b128329af74238c5b6c072042435970488583c35b2052c2347c44d
 EBUILD gedit-3.10.4.ebuild 2360 SHA256 1f4ded66ad7c630bb69bc33d954d17192340a36ffc9abe61a754040b6cee5974 SHA512 0908fdebb395a661784fcf5ac80f84df40d2690a92e1924ed0eaa2c7cf38bcc652a89f3b270483f9cae89a4d28398df57139c93ddc28635156b3e5f49f494d3c WHIRLPOOL 88de54facb28bdbe754c490b96954bbc6ceb1dac16054b68822b3b0aef5ec9a7db8b6352343d9c58b1c027b07e64d347b70adbbdabb9bddec0ecf57fea214590
-EBUILD gedit-3.12.1.ebuild 2508 SHA256 5ec920142be2d9c1223a0813db70c85c85c4d9957dfd59a144f48186a0fc2b88 SHA512 5f746008073a6bc657bec353de54b096cffd2f5c331403bb44587813d7c963bf1dd5018782cdcfc8487e1f8f5692c191b344b699aaf8675278c951dde404293f WHIRLPOOL fb8a940a7c7317a592a8f4632b1a609ae1fe170998ecc091d308519096b525db37607c3da6c450c0554ddf3b1d4b2ab80998323a50987fb9da590014c4a8e0af
+EBUILD gedit-3.12.2-r1.ebuild 3256 SHA256 98c5857e1ba1c6d7145674b04da6d838e1cca0c7fdf104239abd7239226c8a07 SHA512 41baeebfce3f64da4b096fb2e23d7cea49214abfebe530d7de8bd51b33addb28810280880b286e99cc79f8384f563498a37c816a9d2e56e97d456baff5bb969e WHIRLPOOL 46dff965cdbd6f3af7f6837a015584f258cc5d96eca177cc401ab19027b9a36f5543616b4257703f9eb5b1169d0aa339696cba4e08fbe7f34ed3bb4a7f153f22
 EBUILD gedit-3.12.2.ebuild 2512 SHA256 e1ca6908f58292b1921f95b842d05dc35a32263b1881466859e282e4543783ed SHA512 09bbb4b2a56e4d0d0e6d3f61eae9a2aaaba7ecb76b9252095f9b487d6acf44e37d5ab7a30fb758d159bbe339d1d7e1c1bc50ee47c731998c42a6cdc6d0cdf8d8 WHIRLPOOL cac6d845124a52d400a2301d96b64a688f336e2a7f3617978b9afd25a754caf539ef5626b8a3d92160736d84154ddf755ef1014bc5ba152cc35007f22bdb92e4
-MISC ChangeLog 46867 SHA256 6dd45dfa019f7895534505abfae4e8f9fd89fa828aeb1a43947cd9de1f68998f SHA512 8c7b17dff9a408dfc75bd7dcbedf2c424172d4a21ca32c7ca8d24f87a3fd83a327859af10c7ceec90855fe495c4da1d18f31e4b6da5480548aab72635912ad81 WHIRLPOOL 377768e3dfc6150a1493aa3e7b1aa7dde33edddee178e6a7fa0d01dd48f43fad71f5fa4a993bb50423867d8523d2b97d0ad08f56c66d2208c4f5180a446129e2
+MISC ChangeLog 47171 SHA256 dd2c154908719ac4f13624de7d0c44dd6a19e9cd3683ad0edf8a1cf66f59f7ca SHA512 d7fd35636a38b9fb71f4a775e1a41caa70819fb6588c83ac5477002837cf44cab4a5733bca77e3696fa44a03db2c236f37a62a3d580d5cd7ce4d081a6187bdf7 WHIRLPOOL 96e0fc326f47101e3e6f3c9a42fd9073473ccce92ee0126852c540544dc1a9c8d3002e50bcb29ef5812701637150f556f47871ed7252e0981a03d63b8dd35e3d
 MISC metadata.xml 276 SHA256 8dec58657a80b4973306f2f6d5da03a819b949c3f8e93b3065eafda55f1f8465 SHA512 9c1f48389dedc905b448e4085b9fec8f37ef777aacf14e18541e39680ccf83a968c7ee8fea8b9ede61704ac174380c7cc56858182fb6f59a589ab1d70b8eea7d WHIRLPOOL 902de8d338629274e1ec7a7a6b13316e88f09847d5158a92fdc3337e33c26dcda79ff8bf425dc0de42657ba14769478335249d13cba2342f8adb247a1f40e905
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9EIAAoJELp701BxlEWfn4MP/2fuqpNRKovHrsiienBbrqQW
-XWoOp9siZRlwZl7EVthjut3J8RJpJ/7Ne5Hc2jk+RrP5Ni5YGm79bYcx1rjkpbcq
-CwwUgnmq1GzQ5+DfYKbrEyrAn+z6XSBLHBGKPgUUQGzBkjepDNzz1eYbLSZR97nO
-9NY6dWW5A9EBo58+Ffgx5XrfvB6Ij1kx8go71+Y3qaztNrk0u7RfyvXz3V6Jzfdy
-SM7StMarecWX32LaASuTvZ0fwJZ+OjqG3dncP8sk1v+cQapklFIZtLBkd4QCjQW8
-+/15WiOgqEcaHQsYJw0gkNINGE+PIaxIVQ9qNUpi2ngFrnxZP5O3V/AdeF8Ec3TS
-ADfLWL8wqwKnio4xm0tCe5IVL8HPXnhp2a+C/Ob5V9szWAtWT45XiujV5u71H+nJ
-g3MCCWpjCIB0XJ7TlX/Ak7aCjN2QvLFGUDyy8Prj7My0rwSHZwTbGdriiWOcXa+T
-oxFRHXOaOkHC1QGkg8ISx8//SQvd0FveZw7E8uBSfxhzJaG/h48MvmqBjE2mSVXM
-TxxSL1SOBBmDRpRqzXJgO3llif1+0hEFkj1TVkpN5Eozi3YASuGSWZcGkzQ2XX0U
-X7a5WDLjTk39YuPsriG663uCK7L/8CNNxfDLollpjSu0NS/JwVUZwA47VMQ/VRkt
-9oF4QSC4AZm4qlz7sSL3
-=nanc
+iQEcBAEBCAAGBQJUKW1UAAoJEJ0WA1zPCt1hqfAIAJD3hbIKdiFc4m1C+EADMK0j
+TYon8oXFbddmU9Nvv77O3mor9LT2Uirb8Vz/Lr1vS1sPrPfCwwfz5TYkuaTIL8m/
+9BUt3wmDdVVYD81YBwcVLUeSctD+Z/J2DeRm/535AlD2V19MHAc33tTgH40caDVX
+Mu99Z6M1n3BLf1YjeVEbiIbo78zxajhyXn8lcnvn0OMopcrBQMFTnyAEhtORDB1O
+OZMP9J2AKTaIxFGSVaNMHC/9S5eBQpBozuYtSW0oJgelhEq+iMJ/YIQJCO0/NnN6
+ALvL9z/8jyNuWVCNqqBtFRkyzr3H/zoLitVwnO+cGbc0DhZBBiB8QCW7bj49EEo=
+=ipYU
 -----END PGP SIGNATURE-----
diff --git a/app-editors/gedit/gedit-3.12.1.ebuild b/app-editors/gedit/gedit-3.12.2-r1.ebuild
index 768c7942198c..75578bf83aa9 100644
--- a/app-editors/gedit/gedit-3.12.1.ebuild
+++ b/app-editors/gedit/gedit-3.12.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.1 2014/04/27 15:30:11 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v 1.1 2014/09/29 14:31:01 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{2,3} )
 inherit eutils gnome2 multilib python-r1 virtualx
 
 DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Gedit"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
 
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
@@ -50,6 +50,7 @@ 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
@@ -72,15 +73,28 @@ src_prepare() {
 
 src_configure() {
 	DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
-	gnome2_src_configure \
-		--disable-deprecations \
-		--enable-updater \
-		--enable-gvfs-metadata \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_enable spell) \
-		$(use_enable zeitgeist) \
-		ITSTOOL=$(type -P true)
+
+	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
 }
 
 src_test() {
@@ -90,3 +104,15 @@ src_test() {
 	unset DBUS_SESSION_BUS_ADDRESS
 	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
 }
+
+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
+}