Correctly handle python dependencies, bug #496326 by nzqr.

Package-Manager: portage-2.2.7/cvs/Linux i686
Manifest-Sign-Key: 0x30427902

4 files changed, 46 insertions, 22 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index edbe6a599c38..c9c1805406b7 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1005 2013/12/20 01:51:27 floppym Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.1006 2014/01/03 07:32:47 phajdan.jr Exp $
+
+  02 Jan 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-32.0.1700.68.ebuild, chromium-33.0.1750.3.ebuild:
+  Correctly handle python dependencies, bug #496326 by nzqr.
 
 *chromium-32.0.1700.68 (20 Dec 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6092f7090cde..640091ea0635 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -30,16 +30,16 @@ DIST chromium-33.0.1750.3-lite.tar.xz 163176204 SHA256 129bd30a2907f249067761bd2
 DIST chromium-33.0.1750.3-testdata.tar.xz 112420944 SHA256 580fa9b73d2c15b0aadd44fe2af8380e3706468eb1d919ba43a31e47e946c704 SHA512 b5227c4eb0aa67de620bc82ea047356eff57b82e3cb9f3fa9874797eb1912d80205ec9aa15ce4e6234564ce7442ec9171473c2af713c9f3d8cd2fbfbf1d84c54 WHIRLPOOL 4d68aa6a87aa06c0c97bebc740871de182ceda3cc04ad55aca2e7f75bafca4f4356bdcd73f764dc559790bbc80fa97af484bcde91ebcd9c7fa99774bab7ae2bf
 EBUILD chromium-31.0.1650.63.ebuild 17359 SHA256 3bb96818b58cc8d7fc74caedad64ac77cb13a8d857d0db5921fa7515286a8432 SHA512 742b7150bdbf682724f1369a5dadd402beadb1f4c662b7523b2b67b3be3ec790ee8e0c6c95a8508e7dd5158948ea629da3b1c01beb932ed8a82c9d87eb9cab35 WHIRLPOOL 4e9ea60de3974a19e2a9b633111bc84dbb3db89f754832d4ec941a8075e9fe7686ce70a7b2d4fd34564b401038d4f6a20fa1450958fdb778558872610c596463
 EBUILD chromium-32.0.1700.55.ebuild 18582 SHA256 752ff56de444ecf8f2b7654bcc2c2e0afedf2e82c56ff45c9e845059eb56bc01 SHA512 840a0fcb623825ad68c13382074baa75d56fd659da8998d3357540801eb2381fd87768ddbf5c454d32138742ea0ad20e8bbb3899929e55559c1f9456a8b90da2 WHIRLPOOL 3147b1d2f24e1a4491210085bc54d51d87ffa616bb1a21880bb73ae3826318d5232c0292a2eff9ad2905efe348484f780fd9853b43d08e987d39758556ea4864
-EBUILD chromium-32.0.1700.68.ebuild 18582 SHA256 c3b359e7fd701bafa7692bdf96b9762dd52ff48a298dc9ef6e5a2dd5608e7ad2 SHA512 94bfe08edfdfb205d0b6569e9c66d0ddbfaf1f694ca15ac1eb723018ac336f5d4e70de30e447f5f23fcd68871e424d96eeb69984cfec0110b84e08eb7e587944 WHIRLPOOL 61161463a462a0637133a93f1794610f6a89f40157d1f4cf176c63812c316ccd2255d70b63ded9fca2965a7bd81c477b8b41be7770db0ea8619f83cf8a390be9
+EBUILD chromium-32.0.1700.68.ebuild 19052 SHA256 0a907b0b736398fd1e489a3ca5077e63c3e07f2d069c9c0519036f3fecaf987d SHA512 5e3ec62647bedb1becb65f070ea53b1820820d1c994ae06831986fab89cab3f49dda225e6bb6ac1fd46c6594559a55c1900ddd60986384663ded0da601077124 WHIRLPOOL 8f220317042df50cf69bc0fa5b461aba915711881b26d764a679076c14338f733d6860642fc93cc3ac59090781397d0ed573db68f28dfb5136c9f6bc4362fe30
 EBUILD chromium-33.0.1734.0.ebuild 19053 SHA256 0abaeee2e40e5837435f4efb5dafaee7ce328571a2f6dbd2ea650ceb7bf7b6e4 SHA512 934f0f4b78beadab2574d0bb5f8e12d21a221bc269e63b166ccc897675638e325f423afa84621926a3d7a818bb293e115e126819f609cf3fa4c3e3ca69dd1a4b WHIRLPOOL f6d0075619bb955e1ca38dd948853b1d8dc4a2066db3ef6ca7874055b5665c3d4c8a443a804eb124386d8d68cd284acc623a08b33727c043fb9cf2126d5ce6c0
-EBUILD chromium-33.0.1750.3.ebuild 19048 SHA256 bbb71873097e0c4edd2c772c4ee203faab1afaa47ef6817e9d08c2558a6d6c6e SHA512 94e02fce0320a319de65c117bc25178f58c9d2fcee12ecd8f55103dea682047548f958dbf63903545b1fdf621d256355ad2d200f2375583e5e5fb5b75a38cbb9 WHIRLPOOL 7de928843edfce325543989c14b9fbd42556eea0c54fd7a715e4d788639b42156c33cf6543bf3bbff5a559cccca086c7c49cab5a4340c51c3386632064c972a2
-MISC ChangeLog 93412 SHA256 bbb5de144fdd05c113369820d18a772e98881f06ffb5d62037c03e17f0c4f8fc SHA512 dbef0f946c5f3146a960f757ea8afe3f68b32afe795e105cf2cbab60757d527cbb66094587360f573c1c7b2fd5074a1976c0bc0b2fe032a24b5a70a493211351 WHIRLPOOL 2393be3b38957543025c055e0bcfabb569f5dbdd06b5f23fde1fac1512cc8c2c7690ab6abd21d964ba7353ff3e5758528fdd942d41e852a2b9fc6b5a87fea666
+EBUILD chromium-33.0.1750.3.ebuild 19515 SHA256 1f23dacaa13c696574b55750f2e2b5c578a4578de607de3cabc3b3d9b79074de SHA512 1fcf06bcf44581926029c7c95218b16dfe8283487915e1d0c04b2d360461a943a516c9cc5e7794e5553675280412e30bf0c795a24b6e9b6973e91c62a0413375 WHIRLPOOL 13fb251f29aba17ab2778b9ce6705dffa008a1efae3568ae4a1b6a0600584e82994e601a254295c113730c4412b649fb19683954f9778cfe7332ef9f6e3f0b71
+MISC ChangeLog 93593 SHA256 c0155bd9615323ce2167e83b5fdcad27f6e31507c6f8378699c055711737ae0a SHA512 8f0f36e502140eba8c223a663eb8cd53e843b6f306e5a4ebd01a744774507d47ef7df8853d70c0775043b297152e6dff78fc09590a83ad7ce5baf98e07a2a86e WHIRLPOOL 459d4154f3b0f77b41c411d9a4b61c201661f3b161acc8b251fcb3ac8e189951f8be2d93d18dcc6af70e80490b86745de89e999e5877a2d6db17ba6d38b13fb6
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 786 SHA256 12e03b633076f7fdf1fb7b3a3a2c10c0a4210566511101d6df5e18d962680c6d SHA512 cc2fdf94c85a24d528d921890d1828341b173b5b2daba820b1ddcf973890ee950e2fe9e096d81106196e9ca761908141b0aac88330b68b536a8b39bf29c1c868 WHIRLPOOL 101c01d630f4460c1f23ea9e2334e9509839cc2c968af254f40489680dffd59942e21f6040fc4d127abc6cae82ece031bbbb3f08b325a8e8835f80c322c2948c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKzoqEACgkQC77qH+pIQ6QOuwEAuRkS6jFSrVImHan5opVOCRPd
-C+jqZqOmKOwgjSQW8gEA/10Dr2js4LGgI3lZ3IuCfn4t+sxbWkoxCJ9h56Vgs1BP
-=9QgM
+iEYEAREIAAYFAlLGZ6YACgkQuUQtlDBCeQLWgACbBntbUeIOQhCwXHfjPa9kBHnJ
+ingAn3u+F/DSTZbfwMSwe/w1UcWg9ibR
+=DFe9
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-32.0.1700.68.ebuild b/www-client/chromium/chromium-32.0.1700.68.ebuild
index 5c53cd32f121..6e495249d683 100644
--- a/www-client/chromium/chromium-32.0.1700.68.ebuild
+++ b/www-client/chromium/chromium-32.0.1700.68.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.68.ebuild,v 1.1 2013/12/20 01:51:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-32.0.1700.68.ebuild,v 1.2 2014/01/03 07:32:47 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -71,15 +71,11 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	kerberos? ( virtual/krb5 )
 	selinux? ( sec-policy/selinux-chromium )"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	!arm? (
 		dev-lang/yasm
 	)
 	dev-lang/perl
 	dev-perl/JSON
-	>=dev-python/jinja-2.7
-	dev-python/ply
-	dev-python/simplejson
 	>=dev-util/gperf-3.0.3
 	dev-util/ninja
 	sys-apps/hwids
@@ -88,7 +84,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? (
 		dev-libs/openssl:0
-		dev-python/pyftpdlib
 	)"
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND+="
@@ -97,6 +92,21 @@ RDEPEND+="
 	virtual/ttf-fonts
 	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
 
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
+')"
+python_check_deps() {
+	has_version ">=dev-python/jinja-2.7[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
+		{ ! use test || has_version "dev-python/pyftpdlib[${PYTHON_USEDEP}]"; }
+}
+
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
 fi
diff --git a/www-client/chromium/chromium-33.0.1750.3.ebuild b/www-client/chromium/chromium-33.0.1750.3.ebuild
index d3af8b63d2b3..fa75b3026480 100644
--- a/www-client/chromium/chromium-33.0.1750.3.ebuild
+++ b/www-client/chromium/chromium-33.0.1750.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1750.3.ebuild,v 1.1 2013/12/18 12:24:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-33.0.1750.3.ebuild,v 1.2 2014/01/03 07:32:47 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -71,15 +71,11 @@ RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
 	kerberos? ( virtual/krb5 )
 	selinux? ( sec-policy/selinux-chromium )"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	!arm? (
 		dev-lang/yasm
 	)
 	dev-lang/perl
 	dev-perl/JSON
-	>=dev-python/jinja-2.7
-	dev-python/ply
-	dev-python/simplejson
 	>=dev-util/gperf-3.0.3
 	dev-util/ninja
 	sys-apps/hwids
@@ -88,7 +84,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	test? (
 		dev-libs/openssl:0
-		dev-python/pyftpdlib
 	)"
 # For nvidia-drivers blocker, see bug #413637 .
 RDEPEND+="
@@ -97,6 +92,21 @@ RDEPEND+="
 	virtual/ttf-fonts
 	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
 
+# Python dependencies. The DEPEND part needs to be kept in sync
+# with python_check_deps.
+DEPEND+=" $(python_gen_any_dep '
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/ply[${PYTHON_USEDEP}]
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	test? ( dev-python/pyftpdlib[${PYTHON_USEDEP}] )
+')"
+python_check_deps() {
+	has_version ">=dev-python/jinja-2.7[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/simplejson[${PYTHON_USEDEP}]" && \
+		{ ! use test || has_version "dev-python/pyftpdlib[${PYTHON_USEDEP}]"; }
+}
+
 if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
 	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
 fi