Do not reference Python sitedir when Python is disabled, bug #531968.

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

4 files changed, 36 insertions, 14 deletions

diff --git a/app-editors/gedit/ChangeLog b/app-editors/gedit/ChangeLog
index c43d7e34680c..ede777d8a98b 100644
--- a/app-editors/gedit/ChangeLog
+++ b/app-editors/gedit/ChangeLog
@@ -1,6 +1,10 @@
 # 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.378 2014/12/19 13:33:36 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/ChangeLog,v 1.379 2015/01/02 22:20:34 mgorny Exp $
+
+  02 Jan 2015; Michał Górny <mgorny@gentoo.org> gedit-3.12.2-r1.ebuild,
+  gedit-3.14.2.ebuild:
+  Do not reference Python sitedir when Python is disabled, bug #531968.
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> gedit-3.12.2-r1.ebuild:
   amd64 stable, bug 529964
diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 00f03d16ef20..9f2565a01533 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -3,15 +3,27 @@ Hash: SHA256
 
 DIST gedit-3.12.2.tar.xz 2850716 SHA256 75460b112bed459a0f9db60e7fb0b9e6341dc8e5c20088d929597ba030d7b653 SHA512 8b15c7293a68727e478e67801a65d779a753e8751edd9808e15f5cee8a7c8509ca6ce03127334f84f60fde164daa6f1f031d236daee57ef8323b45f26dba70ac WHIRLPOOL 72c9fe02428986a514af3da43755aba6aa6fe4fb455293317da2a44552eb847941b66fd045e9e412c101860b7cbc7e0251b1eadd03ff9b1908882757657d40b9
 DIST gedit-3.14.2.tar.xz 2884188 SHA256 e5174147180721485c4c3791628bfdc8452efbed120c6b6b2e4210299caf71c0 SHA512 cc926fc18843955db7181ea12f75b9f43239b540dcd5cc0575c1545fa3ed5749d480098e9fcff9d7523e110ad6943b18a3f8a41d689525f7062f33a3c873ada0 WHIRLPOOL 6c13773140e785b501b428f152a3a46885b4f75e9ea4034e1c5766968f5a292c28f2932dbf1b6a014f99398ccf6fd48221520220fe3c3a7d87521c9d0917408f
-EBUILD gedit-3.12.2-r1.ebuild 2907 SHA256 e58572a24d3bf07a53eb09e2833d104593074994833083446a2602533a36e9f9 SHA512 1a853fc3a1fd07cab3694b4bfa5e8d2be90640dc1961b9c11ddfd6aaba2d50c37f889fccc13ca04677d5f621db86fc85748f365ee18e0dd78c0ecfab22cfd68b WHIRLPOOL eca2965ffd172bf74ecbccbe6214cb3a467a2af22b4d556073cb897a8e47d064c240ba4670e405594d5bed726e83cb1d923eb7b522e83b4a4bf8c624a737bf19
+EBUILD gedit-3.12.2-r1.ebuild 2962 SHA256 5b65f8ab71775102e8d5fe9f3b22b9901b38fbbe86b24cf4785c2758a7d66a56 SHA512 2f01a255014bc44b18c58e4c3060a788119756eabad5f491b5e11a8d090aa1fed01b7c141976f533d1b65756df3fa243437718eece39e6b0b89e1ddf2c41b291 WHIRLPOOL e97630ba38b91d646dbee88ba7ac6c0d18e12c21994c80d2a8ba05f87ab28473e19d55f75c5ff4f3d8b058d043e77ed61b95db99bc066438a7e77d23a6071c84
 EBUILD gedit-3.12.2.ebuild 2512 SHA256 e1ca6908f58292b1921f95b842d05dc35a32263b1881466859e282e4543783ed SHA512 09bbb4b2a56e4d0d0e6d3f61eae9a2aaaba7ecb76b9252095f9b487d6acf44e37d5ab7a30fb758d159bbe339d1d7e1c1bc50ee47c731998c42a6cdc6d0cdf8d8 WHIRLPOOL cac6d845124a52d400a2301d96b64a688f336e2a7f3617978b9afd25a754caf539ef5626b8a3d92160736d84154ddf755ef1014bc5ba152cc35007f22bdb92e4
-EBUILD gedit-3.14.2.ebuild 2826 SHA256 56be820f3d65286e562e40f6883833dd47b0efdc0ddc529b5f37a901a80cbca4 SHA512 13ffa5bbb4370cf265ec04c85f3753e7f06b07a8943f69937b15f9b3252178b04a6ce5cea4002609d08b49a8f3d64f342bdd3ee91e0b661f1824e66bd6a24a8a WHIRLPOOL 30c4fca44aa4c7260e86ad6387915c8a89a1a27a91a75892b6b0a277d823b51304038ac5cd32e5f97ec038f949aa118dc02c50f5673f5480f2f7b980c82e5b9e
-MISC ChangeLog 47907 SHA256 6bee7b8230c10d7ba1d87c7f752d0d4289b13ddc2c37bb57ef9b5ec41695079a SHA512 fd359aae12010fd9e4a73193c3f4e712b2c5b5c7eedcea2b91e67435c8b6cc9437491b3d6944fb540e9405bf28263fa01d7bbf8b903efd9ca9a2bd34aedf1d25 WHIRLPOOL 5f0258da657960a5b64cce968f9685172d61e5d29b135ddf0d975439a0f27363a76b279013e1ee3453710fe995b91c2c2758fe5bd2b6cb3e56c814959fc2f6ed
+EBUILD gedit-3.14.2.ebuild 2883 SHA256 966cfca18421c696028107690a9c5655fe4876b5c5b36d0972cd723762a7a6c8 SHA512 a048e77d0d4013d30e45470f37227db7b0081cbfe2debd685c1cfc75bfa9ae177b247debe8e92c8541824fe7c6ce860d256f9fb4d2ef1ee54d5b74396a840db0 WHIRLPOOL 2dc7b5258f435c188fa32075f44a435fac9cf033656913233cb7e6024c6877d52f61f6e2c4b631bfb617b4268acec57d509c23620accff8b34bb94536a0cb3bf
+MISC ChangeLog 48078 SHA256 3a71070118fee987ab0e202c1a7a988c8810c67c22cd9afb7c928c5a6fb0221e SHA512 441f471918e5fed4d7219af5e7b2c61ed923378420e68f819fac09013ff749366e7baf946d49cf15ea838982b012e3f4f21f08be91ca1c1472a9230f26be717f WHIRLPOOL cba1fe3da3abd5d1f6be2f46aaf3f31ccfab99d754978fbcdecfea4916bc7517cb98ec6a2b2ff8e9ddef5a01eb92ffc3c8460d387eccbc01636a945d60bc950b
 MISC metadata.xml 276 SHA256 8dec58657a80b4973306f2f6d5da03a819b949c3f8e93b3065eafda55f1f8465 SHA512 9c1f48389dedc905b448e4085b9fec8f37ef777aacf14e18541e39680ccf83a968c7ee8fea8b9ede61704ac174380c7cc56858182fb6f59a589ab1d70b8eea7d WHIRLPOOL 902de8d338629274e1ec7a7a6b13316e88f09847d5158a92fdc3337e33c26dcda79ff8bf425dc0de42657ba14769478335249d13cba2342f8adb247a1f40e905
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSUKTIACgkQCaWpQKGI+9RidACcDFxFnRcjzB6wY2xkRuoeFEvU
-fQUAniQ49lBdvB3G/eAaEkHQSctMxG27
-=wzwJ
+iQJ8BAEBCABmBQJUpxm3XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOBbMQAIpZXvblkrJ6KDeTP/+jgcMM
+HVNKzf7JBUrBwo8wsMlQ9W6//NXgWbGE6TVF94YKKb33PNDLakPKydVNxj/Yd42Q
+aP+MpRwVcOLzYZPvfLwQ4hOj+7wCgtXppTN8yzPsJJX3pYgVa1uKTQWShIH0sIIZ
++WRmpxVjofPlFfYgIoI1n7nH4bYKc/9BqRU1i1fsk6s0JH851gkJLkeNmGiVyMhh
+1fNyqWBsMUw2XC7ck1OwxRGxUqkE4MrJUISxOe6Dq8ZrmNGsJKrPazEnHbasYom6
+otNbrHDizwUaWFQMP8x1JqkcJ3JfBBlfGdHjAVARFT2bNfFU4k24jK4GkOzga3lk
+AUY1DfP9MGt5NYJTpC/s0LTEq5rBm62ffIO4FoEakBJHVik3lTQncI4PxKse4cAy
+oIFzAxvVRn43FYorqmXKikB1xR6lmBTgTkC2N4xXR9giBBCi2qBsc898LcTbQD+W
+5Dn0KJLnqPut95ZzYEpaWIXIrC4Yd1yFSU9az0giXJls/nW0kAlR7OrpGMt8HDm8
+BM36ECrlGLIi2erGye2qE2Ib+twb5t1uY2u8M9316J7dWl6UmyZoux9mLhh091px
+BFYUhY8AwPKlDYUihoqt4pZs4G2PyZOYz5BasAkpX2RRecENcK2pwkOk2GDEOGXB
+E+ijjhDjdByT7sizU4w7
+=/YDj
 -----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 9637f5a516d8..5679e14f4d87 100644
--- a/app-editors/gedit/gedit-3.12.2-r1.ebuild
+++ b/app-editors/gedit/gedit-3.12.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.5 2014/12/19 13:33:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.12.2-r1.ebuild,v 1.6 2015/01/02 22:20:34 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -100,6 +100,9 @@ src_test() {
 }
 
 src_install() {
+	local args=()
 	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-	gnome2_src_install pyoverridesdir="$(python_get_sitedir)/gi/overrides"
+	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
+
+	gnome2_src_install "${args[@]}"
 }
diff --git a/app-editors/gedit/gedit-3.14.2.ebuild b/app-editors/gedit/gedit-3.14.2.ebuild
index a55130282522..9e2ca105be25 100644
--- a/app-editors/gedit/gedit-3.14.2.ebuild
+++ b/app-editors/gedit/gedit-3.14.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.14.2.ebuild,v 1.1 2014/12/15 23:11:33 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit/gedit-3.14.2.ebuild,v 1.2 2015/01/02 22:20:34 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -99,6 +99,9 @@ src_test() {
 }
 
 src_install() {
+	local args=()
 	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
-	gnome2_src_install pyoverridesdir="$(python_get_sitedir)/gi/overrides"
+	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
+
+	gnome2_src_install "${args[@]}"
 }