Block python-exec:2 since snakeoil requires dev-python/sphinx wrapped the old way.

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

4 files changed, 31 insertions, 15 deletions

diff --git a/dev-python/snakeoil/ChangeLog b/dev-python/snakeoil/ChangeLog
index a0f847518bf8..e5624b7a8ef5 100644
--- a/dev-python/snakeoil/ChangeLog
+++ b/dev-python/snakeoil/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/snakeoil
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/ChangeLog,v 1.60 2013/08/27 22:19:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/ChangeLog,v 1.61 2013/09/26 09:16:33 mgorny Exp $
+
+  26 Sep 2013; Michał Górny <mgorny@gentoo.org> snakeoil-0.5.2.ebuild,
+  snakeoil-9999.ebuild:
+  Block python-exec:2 since snakeoil requires dev-python/sphinx wrapped the old
+  way.
 
   27 Aug 2013; Tim Harder <radhermit@gentoo.org> snakeoil-9999.ebuild:
   Convert to distutils-r1 (patch by mgorny).
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 737b91c094e1..ae03d03927c0 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -2,18 +2,26 @@
 Hash: SHA256
 
 DIST snakeoil-0.5.2.tar.bz2 151814 SHA256 ede87f5dcfc29c6b5ec0ead3e07533b0ed1b3779c79e5d37e542d193a947b5e9 SHA512 c071af6a17912ca64edb8e760c1d5f31a47a206054ff3120562785764c18d9d7045f13447db3c7ba8b33f053941f8dd8d2640733e4e6f85afbac020a65632121 WHIRLPOOL 8d03669e6dc4a2422f87a71e20ec81343a3df0f3a399f712ae6b5a0599ff3caf34986eb7db1c0d2d42818e74710b5aa2f31447db89a8f5e9ed6b04548dd73fb1
-EBUILD snakeoil-0.5.2.ebuild 1487 SHA256 c3a4412cef1e09831fdd59cb69b7481d8d13195103f86c21ec828da1ad1f5086 SHA512 7fde923d2afdb6446ce6b3f0cca4364aa82e94654ff8aec25e680c8bd2c1dc5640db317d9e361bf6cad0320fac1d7509aa4c3d3657d5bb07a5233bdfd1717cc8 WHIRLPOOL 9cd74cd4dfe2c0446dbcf46a5d7fef84162253bda5a5938e29c07136203189542112c7516c8d1e28efa63909cddcc14fa5a43598fd524c2c3e9e9d7fe8400c86
-EBUILD snakeoil-9999.ebuild 665 SHA256 a4a2bd6901e812bcc5b2a0eca1b9e3b1883ddd7b8b9c147fcecd7856a3229f39 SHA512 7f2cbe8d3b773237fdf4a4949a1380f2783707043a6a1543535357e1a61d3535a4d283312372c8159c0c6bd6f8e16b2164f59acf2f1923f98918e7d0bd3e2117 WHIRLPOOL 1a69ee0fdd22b6de01d0708cd38d1fdbfa82035ecfd300f7ef060168ea0004f86413bcf39d760a229fca8c28e0befcc66a8509ac02434786e14ae599fd5de0d8
-MISC ChangeLog 9785 SHA256 c1833171c362333d4d3fd3174721edd6163a78437315fa0137f5949e15824bb0 SHA512 322f40f53206e8fd73d41d63a9d1e85fa353e13241beb03b5e69e41b2d5c3ba4cabc9c7bae51ccb3c3a1931c474290a7f523be9ce89bd18b02b2cdb548eb96f1 WHIRLPOOL f736a498389d0fde658500067638c109ed86ee64d805528398f64887aee60c116b9ac89a86ad8834e3f367c1b3e28c35b430c479f65dff7489090df1a29cd4da
+EBUILD snakeoil-0.5.2.ebuild 1522 SHA256 5d9ed61cea828b8286ab81a52d208b1639746e99d4474b3f32b09c561ff22331 SHA512 1d4433a779f98abeb6c6078c414924fd731377ddcdb471b6e0f76769957de70444bc4db6f3834daa061ededfd359c2e42489768896125fc28c7b4e567f9d58dc WHIRLPOOL a071008f05ec7cbf18cdbb85793dc098182e62c51418b9f2ffebbc7e4a3a51baab5e7dabbdc72bef0b8ab2a8fe4591591325aa02917ba74e0afd1f79a5749eab
+EBUILD snakeoil-9999.ebuild 691 SHA256 1c47c1a995eb870c93e50c2b88e97e1f734b62b281f0f01d25e751e367d00936 SHA512 eae4bbf4b386a88b8bd214fab354e89539b585cba2583bad9cad8286fc1383706df8312e64ebd22bdd8ca6f290892de9d0c3ee651d48194426b58073e4cb197b WHIRLPOOL a65d5495e2553dcfb2071c0ade1e954fd82eec4ed8482d693801edbc9c64bf0b7edb0d48e57f3bcd5ec50ef0069d767875ad0511eccbbd49546a96b485ede9f3
+MISC ChangeLog 9967 SHA256 b69fde296a576221c60a57efc5d72197f109d4678c6898ba46c9bf93680eff64 SHA512 39d1099da539177105299084359f0a9b4fbf6ef4b997b90ed85bb13ad9ab29b079a9bc3cf8cf3c0fae5e42f13d2be9c412880cc358eb85c55ccefdc546127f51 WHIRLPOOL dff00d2aedc76f8051fdf13d15e1e2341ee5395fbead6f92164fb97ae0df0bf069b5fe135f28f3b9f36de74caf062ace7b3e6f319de61b19e108eee625203b4c
 MISC metadata.xml 402 SHA256 cd3cf5ec7c3fea385f3babab51cb7188fc818295490cf307492ccf23eb8d7bae SHA512 05269a9377d239ed364f388a7e76f5128841e6a74c82b5643e01c0d465bb389e933a00199cc1e91c497e927226917e1a2f54378233b65bd650448eb9e96a5542 WHIRLPOOL 99f467af29066178c13b6626a1f95e264a2eca4a07fd07b0142b24fdf943271702562c32cceeef2d78f4530602f0e23ab5e6d2801ea4d08f2f95509a108ebfeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSHSYMAAoJEEqz6FtPBkyjBRgH/3ORtMDVfaVcz5IthzoBAL0z
-1/GC2WnpJi+TwShuWvZJ32+RQZG59PInesC85t4YdI8UXSTtZxIyBku/tLf1KXZn
-aaQndR53QVhq90jaUCGl2ISqu/kioZv5KWHuQ0az3nnReiJXC7FN5eAL7NYqo9yl
-dWAGTVo0pDpmQN4rOqMa6GNqAfquy7axkUDnV59idYusgT/GiR+bE4cV5NWx8FOd
-jys4dLf4Lup9+nOQVTYxv+JFiVDaD8rUksijnlC2229XJOLQd+24V5CCTyqhdGLq
-GfYA+PSjNghsmZxwYchVwo5bZVPkKqdzrsWB5LxhgkWcqcqhEST1FvH5o9h6ois=
-=r1eX
+iQJ8BAEBCABmBQJSQ/ugXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOR/gQAIhCgJiyroLW5W29S8TclNKt
+SUsi23GfXkerRwk8Ato2YpxY8IA1VAwmI4FJfqAQNj0L6tS+i/wAYROD4s3Mg0sr
+HKhVuKonD3cYVpkXl0zUOXv2k9xvkCm4uMPC97v4wbr5vlsKDJSvEpCo0G7bV9zs
+k5cf3zb3SKQ4kpeE9AK2VUwqgntpqAzl9Vb3Jl9c88s38xBlLxyZlXyMYn5p8xHd
+pZ54nEWFkGJyRn6n9oT+sCZbMAY0XwrPb3pfKt0FxvWDJVYh0pj8yimFrtsiHkuT
++3bUpjRPD/lfgVjrIE/UUX0FRhydQBOy6e0Wp/6JeqbiuK6iI7zWepuYOWcr+1pr
+JTzCsYh12E9WNhBdrKh2rVEtcXQrBkjV6Hfc+ANVsocSCY6vZ3yusIzWjOWUfnSB
+ZwXpn4XH3zxDXvWdLn44vk1qYdumKEast1ahi2YmNWNT4GniAewOmQU7K4r7Wu7S
+4wd4eF3ob8p8E91cu8nepvl9l148HbKWIaqNiG1Cc9tk7am00lTkCzQVvuyN9L1P
++AUIzuUamCJr8JrkiDfKQCFVkWGpkhH04OojT+bgWgTcPLqmfF9BVL3bAL0z0GUQ
+HkGw85ib52s29WC8Wffrtg05eSxWEq1BcOmEGrz2uV62WngCt6kJGpJfN6X4qHJv
+8vCQ3EyK5GChHqYKJ7G5
+=whor
 -----END PGP SIGNATURE-----
diff --git a/dev-python/snakeoil/snakeoil-0.5.2.ebuild b/dev-python/snakeoil/snakeoil-0.5.2.ebuild
index ea046b0b94a5..79b6fb76a137 100644
--- a/dev-python/snakeoil/snakeoil-0.5.2.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-0.5.2.ebuild,v 1.1 2012/10/18 12:14:59 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-0.5.2.ebuild,v 1.2 2013/09/26 09:16:33 mgorny Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -19,6 +19,8 @@ IUSE=""
 
 DOCS="AUTHORS NEWS"
 
+RDEPEND="!dev-python/python-exec:2"
+
 pkg_setup() {
 	# disable snakeoil 2to3 caching
 	unset PY2TO3_CACHEDIR
diff --git a/dev-python/snakeoil/snakeoil-9999.ebuild b/dev-python/snakeoil/snakeoil-9999.ebuild
index 02dd39065179..90a678efef05 100644
--- a/dev-python/snakeoil/snakeoil-9999.ebuild
+++ b/dev-python/snakeoil/snakeoil-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-9999.ebuild,v 1.4 2013/08/27 22:19:53 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snakeoil/snakeoil-9999.ebuild,v 1.5 2013/09/26 09:16:33 mgorny Exp $
 
 EAPI=4
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -16,7 +16,8 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND="!<sys-apps/pkgcore-0.4.7.8"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}
+	!dev-python/python-exec:2"
 
 python_configure_all() {
 	# disable snakeoil 2to3 caching