Use python-r1 to avoid issues with python-single-r1 when depending on libpeas.

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

3 files changed, 26 insertions, 13 deletions

diff --git a/media-gfx/eog-plugins/ChangeLog b/media-gfx/eog-plugins/ChangeLog
index a3d569844426..49c0eb435ed8 100644
--- a/media-gfx/eog-plugins/ChangeLog
+++ b/media-gfx/eog-plugins/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/eog-plugins
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/ChangeLog,v 1.20 2014/11/25 15:17:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/ChangeLog,v 1.21 2014/12/01 12:48:42 mgorny Exp $
+
+  01 Dec 2014; Michał Górny <mgorny@gentoo.org> eog-plugins-3.12.1-r1.ebuild:
+  Use python-r1 to avoid issues with python-single-r1 when depending on libpeas.
 
 *eog-plugins-3.12.1-r1 (25 Nov 2014)
 
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 6cfd08bdd091..59fb687d3522 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -4,14 +4,26 @@ Hash: SHA256
 DIST eog-plugins-3.10.1.tar.xz 349376 SHA256 d5b32c49dbf1e0b6cf56c9fdc6c19186c92e98d92b71aa98805491e2bb2f8e12 SHA512 eff81af98a8227bfd23de93c4b79fbb0e3723560737744a9c18210670457e62661abb55ad0f8e6a1df5b3f1d9a3b1705db3701981e26d0a8035b79365f7a9292 WHIRLPOOL a7d429d231b039da298fa10ed2701c0be93e19584af734cb732cd4b12b9ad28e6778b370c1726f33b89d124744a585849737ec2ff9da7ad38d32b97c4ff434ec
 DIST eog-plugins-3.12.1.tar.xz 351844 SHA256 5b9a6854d5411e75aadb9d44694bbe02a35f5a79a23da5c1bb4feb6bacf56f1c SHA512 aefd1036e44afaf5e27f5caa0416e073747932c8f9ae31a291f36a0ccffd09890097bb0b1896be0b974d228c55f3f5116dca4db864208c49debfc9af759ff7e9 WHIRLPOOL 78965967df26bdc2d68768cd9b4adced95b7d3ef11684dba41ba49a7cc294fa3eed4f8c21a95d5bcdd0f27586746a096857ca7f3c8798a45f69b8f6c08d7390d
 EBUILD eog-plugins-3.10.1.ebuild 1755 SHA256 ed6d15b56dff3bd591f4694d52030d19d119fb4216ba498b33c4658728ea78dc SHA512 90efaeb48181e05b8b003e07cbd2774d661fcb3408e5cfa5754647504851b4717a3e59c5de8850328c47cfbbb2f84f19d50fd45f06fb0c78fc51c5ad381be0f7 WHIRLPOOL b44dfb1d510a2ae4a09b8242fda502d7debbec1889914ecb88d84de4833dce0a4a0b46235141b6758adc6933ddaf7afe37b19feb0c43ca09981844da6ee8445f
-EBUILD eog-plugins-3.12.1-r1.ebuild 1867 SHA256 410b075b7ed021528364d90fe6fd156b266341128f35f6d2c2101458560be5d0 SHA512 c92c30745f01bc43b114267ac4ae8d9d3189fc89699392fbc35f17c5b4b72285d57e6bd1795bc90749c8bc471e6f1415f9aebf9e1aded14da3669af393e1468f WHIRLPOOL c1cb606384a209f73a1c70d088334de3cbf84ca6d9841585d0ebe6552abd6b39a2ea268c4445e21fe31e4de35259cfac9babf874c95d0bcd6bb56ea0017fa3fe
+EBUILD eog-plugins-3.12.1-r1.ebuild 1797 SHA256 17de76085bb6957faa2c78384912202fea27f1445b3990bbee916c7cf2ad9522 SHA512 03aecc34ec63b557683e5f6a4c34efc002e58291d5cf94ec57952f6e3938f79c4676b3fd769389ff97c06da342bde4080cd889c3c462b9ff2fc46a95dc0edd44 WHIRLPOOL b085a923900877a6719cd14abd952d61e60f2a870d0cb5f71f0b1da231b9346c8a623a9623b43e03d68a9fd3e26e262c43789bb57a84b2483f36130f0d37f738
 EBUILD eog-plugins-3.12.1.ebuild 1882 SHA256 72c764adb4d8eb7b7802a412964f50f6474872f73dbdb70f51b0f617ae7e2447 SHA512 d0afc762dc04c79fc7830ce3bd92c20a2674d823460dd6c79a2abcb66202299fe1b4060a1b041b3ee592767d058fd84f70424b3c2fe6cf9fe0f777e2e48fdbe6 WHIRLPOOL de9852c7e001f4429d49f734dd613d09df0ed73f7f86aa1ba08873bff33c273abf33cf6e48cbd2bae8509fa81909402669f524747791d9723551eb36c5826852
-MISC ChangeLog 2975 SHA256 313179c85dcdc311fc30978c3f394c9f5f94d962297062f64bcd9ce472e43543 SHA512 f3406fdd0d6ab3e923ce75b3ba11af827a339517dbe684231ae50de46737535843d41cc2838f1a99eb25b468e10443d13151a819234ad1c733b860fc841a4439 WHIRLPOOL 967883d79c48860d7abf5dfe1fe675341d58090f40096da1d9d8bc3bc47b1fec8e63c648ecba99a8c3a60f2f8630944f6e181ae137ece22fa0d3108d29004e91
+MISC ChangeLog 3138 SHA256 1d70dc8949a5cc5f46549a4d120bd334540e63ef2c2461be5f2092abfd035ad3 SHA512 d7868b3167527498f1a845c1a257e04ec8c8a1fca8f0567c2efaff3378c7dfa080adc7960a3befa7ee4d5cf44b13ca0ac1b29040560da39d0a71cae86cc1ccab WHIRLPOOL f2fdde302fc3e44037e2153587fb78d50179e226ef12f583806ccf49a6ed7a94c6f5d58346100939b5565087889cffd167364d9bc685ff64ed3fc6102b5f280a
 MISC metadata.xml 392 SHA256 05a1968f0920b51d3abd11acb3f11ba6d2badd66482016bcf777d34c825781db SHA512 e5af450d68431727fdf1536b4d58f6960e012e28cabad7cdf98b18c55db7fed6386b2b2916476e5a3cb3fa2fb2dcfe47ab870e2f14b5bf2555d0ef6978c61a62 WHIRLPOOL 515a4f54ec4e17503543e2559a5b5487d27532b23ed048e611cb0e578c2026ae763799f46e1a80be001cf4e1fabcb5ac09811deb42182ff10a88b39c170d9d7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR0nYYACgkQCaWpQKGI+9QbjgCfRhp583PzwZX8hzBVlCY/dV9Z
-udEAn23hkTdBv6aPKgMHPKiGPR7M4rVw
-=ryD2
+iQJ8BAEBCABmBQJUfGOrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOuM0P/i/i1rQ1kc9g1Uwx0cqotUue
+ibSf44ZlXn/RIV1zSzVA5LCVQo8iMKfIA0mFMn2Y8t743NiCahy/6wBN0yT8i+4u
+v6kM577cBf2RWFjfRSFm0vhIJi27tJG4HmmrqF8Gji93OiFPkPLjhYbP/BtkpmdF
+WL3wTDCjwiDSaVPL5SosnxKQ7R49Vc9RnkgZDQSQk87hr1vKy4QZY2dMR3DtbbcF
+36Hj63FBtW8GZxsnqRGzFBXRNVa571gJLlCz8zYo6dJpOhKD4/sLzb2OQqfs58JQ
+zmmACGHNk1o5+1Dcab/s5q/ofLDci/K736lm2sVD1mQQ0dIy9n97PV2oL1G0IiVu
+ndFtwqvdUDKDeOwepwmfB2FNIrsG/e5dAvZejHsp22nlWnL6EuaZML0vPDzUJyxO
+rktpb+usYJoUGUTVV8DAc31F5rMd9hEMXO0EjC8ooMRueOgTq2sdhNhbu3ICDbeq
+JgreOWmJ3bFgsKyhG/M6hfJRrcBe4c+GVZqfFhgHCAW+Ow9Rfuavz8lVtfSpj3i2
+w2y2s0xweuahlGa0eJwp3iCTnTii7iLq/bYic8lk/qcvTWI8OIfiaUTyl1L/Aydy
+7Hts1eCpfjCZ0U5ZqzVixscBmaGk2KMP0H6xyNAlbQUWeqGkpiljzTNhPl8BzPqu
+yGx/bEV2UYhVY590IF5g
+=1GWt
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild b/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild
index f6f5be125659..3fa1793ccd9e 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild,v 1.1 2014/11/25 15:17:25 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog-plugins/eog-plugins-3.12.1-r1.ebuild,v 1.2 2014/12/01 12:48:42 mgorny Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_2,3_3,3_4} )
+PYTHON_COMPAT=( python{3_3,3_4} )
 
-inherit gnome2 python-single-r1
+inherit gnome2 python-r1
 
 DESCRIPTION="Eye of GNOME plugins"
 HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
@@ -16,12 +16,10 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+exif +flickr map +picasa +python"
-# Let people emerge this by default, bug #472932
-IUSE+=" +python_single_target_python3_3"
 
 REQUIRED_USE="
 	map? ( exif )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+	python? ( ^^ ( $(python_gen_useflags '*') ) )"
 
 RDEPEND="
 	>=dev-libs/glib-2.32:2
@@ -51,7 +49,7 @@ DEPEND="${RDEPEND}
 "
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	use python && [[ ${MERGE_TYPE} == binary ]] && python_setup
 }
 
 src_configure() {