Fix unslotted python-exec deps in vardb when >=python-exec-2.0-r1 is installed.

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

4 files changed, 85 insertions, 22 deletions

diff --git a/dev-python/python-exec/ChangeLog b/dev-python/python-exec/ChangeLog
index 9c94c9475f92..155cf184b78b 100644
--- a/dev-python/python-exec/ChangeLog
+++ b/dev-python/python-exec/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/python-exec
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/ChangeLog,v 1.52 2013/09/29 14:47:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/ChangeLog,v 1.53 2013/10/03 21:07:20 mgorny Exp $
+
+*python-exec-2.0-r1 (03 Oct 2013)
+
+  03 Oct 2013; Michał Górny <mgorny@gentoo.org> +python-exec-2.0-r1.ebuild,
+  -python-exec-2.0.ebuild, python-exec-2.9999.ebuild:
+  Fix unslotted python-exec deps in vardb when >=python-exec-2.0-r1 is
+  installed.
 
   29 Sep 2013; Michał Górny <mgorny@gentoo.org> -python-exec-0.2.ebuild,
   -python-exec-0.3.ebuild:
diff --git a/dev-python/python-exec/Manifest b/dev-python/python-exec/Manifest
index 00e2fd58e811..92dc4f150e83 100644
--- a/dev-python/python-exec/Manifest
+++ b/dev-python/python-exec/Manifest
@@ -5,26 +5,26 @@ DIST python-exec-0.3.1.tar.bz2 74441 SHA256 460837775167108419b9497353a6f832fc8a
 DIST python-exec-2.0.tar.bz2 80777 SHA256 e8a2cf2bbaef012010f23b477d183b17d6021562beff3ede5c7e724a7ee00672 SHA512 ad77f46448461323c15d97f42ebb0a1f44d53397e42a89fdc600dbcc1ccf95a280252011c0b02d71125ca8095bb388d5b3e7e6cb3b93a1cee578a2b1b08b4594 WHIRLPOOL e483fc6eb6d7dd10bbd685c2f3cf9daa0f4165204a2b191c1ae685e8b3e6c7faec929a0bcee647dd94e6b2731f8c1950d0e02334ea8b587aa05cfbe644091367
 EBUILD python-exec-0.3.1.ebuild 1088 SHA256 f76f577167aa049d36d99dfb8975938753c5d9b33c221768757359ebe95a0024 SHA512 97c8077874c8be68cdc619a55c707c69b686c2543cb3761023acfeea4968e38ee193b3634e04742fbb08e336208ee883918a75e3b1caf3d9c1733109ae2cf596 WHIRLPOOL 3a9d900ab1ff8c641744f89c535f953aa593f9dcb7224f5db9ba8a566b48b8450aae1a6a108373c8e3c6c047bfe43a4f761088d6cf2bd4dd28afad3b76526063
 EBUILD python-exec-0.9999.ebuild 1249 SHA256 0eb86834ce4b6cfa0b38544537aad9b13e2a0f7aea3ddedd5183fba927dea36e SHA512 a163ecf33228e6d4f64a44fdcca0f340028ed0e17cc6a511a77d60676a76e3527cf78ed939307fbd4d96fcbc0e17d39be6db7c4371e4cc3d38db6d8e714e63da WHIRLPOOL 50bb7255a75b90431569f0c7afd97497c1b7572e453599c4368f45aa21c8f18d351d0df00b469ce5ad4f3af42ba369fd5eccd668f7009265bc15222c971fefca
-EBUILD python-exec-2.0.ebuild 1099 SHA256 ede20f97efae27e67de791d46381e248ae5f527a75db33484fa005da56b3c54e SHA512 ffb165ffda39e924ce742806c1343e22897d33af5c2b7a162bb0fc88260a4701dce3ede014dd2547ad7550f4fc179507465fddbbfbc527f049e50dd0a34c0655 WHIRLPOOL c57ef1d6b74fe444e5e2ccfe9cee5ce9ebb7e9974f0dc7c332f94ee98cd1b09dcd033d28ee92b64b39dfac391a07dbb2096bfd317753ad24bb2788cee6728861
-EBUILD python-exec-2.9999.ebuild 1276 SHA256 5445f2e2a1c34e7e2723df540d832a0fe7d92d5ce88a24d89f74f45279fb0026 SHA512 af2dbfef7f8948598dccac64e68a0a41c834fe71a8c078bd39ee7c0af2efbd86298d322b869ba8132a4435e0ff1172fc0c955a7b8ccbd8050c2edadc5f1b2a6a WHIRLPOOL 141a014c0280ee327baa1a641afd56be9eb9051c7fa9f4ab39546916d7df6aee0d71fa0a84d5ed1e1190a08604b5e8b3dec5eabe8b521057f43f738c49792025
-MISC ChangeLog 6808 SHA256 79d200322b0f2a0418d3a5c317a1bf4c0ac703e2d2b9ef410a8dea0bcfc8f3e0 SHA512 865def4d63da60ba4f0b37c27c5e51d066d8d81794d9eab93e78623a53554341e0a3c00fa6e462d0aaf4ca6247161b3b4e6b64accd7ae063284e6385688f4e4a WHIRLPOOL 02a56ebce5d2fc0f2c928611f71aeb753e146f312e5bbf8577da44bd929dd75cbd15e4874f4e1626f2d9a1cd3c71157f17177140de0085f906f833e102d15786
+EBUILD python-exec-2.0-r1.ebuild 1721 SHA256 28076a7088d7ee5edf2093665e234a05b014f901fbd856c1412fe90297cc4abd SHA512 0d704386b4e2c0853a721b356437b64040088aae7c0207c8363b2cacd93563c691a482461907d1f17617e3c84e8760bb3b8f87707cc7acec11b37bb17ff59905 WHIRLPOOL 3069c0c219dcfbe49f642997d9f7a8be458affb4ef8739c621efd078d47ee330a636a3a82c08fabc5a7901bbc8489ba52360d7a056a33753e9354e4b37d63fbf
+EBUILD python-exec-2.9999.ebuild 1895 SHA256 853c3380998f887c0cce805bee4ce5f4f69098e9ad62c719dd5cf63469ece334 SHA512 3287ac9edc7c3bb78314c40485c1115eeee7a959d3b2ff0374bd37ed37fcccd6125fc6d610a461224f7ea812b18da04285afe69ffb56c398b65eef36c5e73192 WHIRLPOOL 1e29e25e374780da202bacfec8b13cbc8f912d22bf752963401120f01b9ef55aaed0250976e4ee540240c8fe050bac97ffeb1fe8f441e9369c83ca50f6b544b4
+MISC ChangeLog 7060 SHA256 5fe2cb5490a572d91ab3c91198dba407d80ee082f4fdc41f01a173b0278c5659 SHA512 ec7a7629d5f01777293d9ec516831d426587e716c000453b7498ae8b47c86482c1ff8f087a41169424da7e84138459b692027e73f13d3fe3bdbb47c45f5dd54c WHIRLPOOL a67a5d8dec3072dc1a7ab6576f8c929b5acf632f4f5bd78f4631ef00eab46fcf29cf9a94e8844ed76a772e2138b6be61d635b9407b773b7bfde231072354fb50
 MISC metadata.xml 369 SHA256 8b6dcc8bc5a5198e3df4c844ebf07234f8c9eb1ff4e10fa7bccc07a0e5dc7517 SHA512 8cc3738e0fd501a4b374d9e18f5676c78d285549c88061aab63697011f43163275751341dc1199aa9a0e4eb3bc9c8e436df261ede8bcf2f759aab096a53d04e0 WHIRLPOOL c99edc69d860d148ebd3d004131e448a957a1f6a3cb3f32b51e94bed79eee6060e41f0de18edc6dd63b83f507f25ab6f0105e593d7d14b1050106aaa3b45e342
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSSD2eXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSTdzAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOJ7sQAMsYNMOVdFJDY59TFBFKyASS
-HQXjkqKaD4ce1lOH5WPoMkyFrXP3u6dORuVtsX6BNxV96B/a9lqnZsZEtU62wgjV
-ITHJJ7aEJn/5eJouK1dj8a7HspLnSfIT4HTp8x7RriE478YcCX7tpJDTaHSYKjfc
-mcERewy0GJuVrR8fn5sMowFIOyQrOsESZ7fWiWfY9I7k8yBvPTg+S65tD+dqhlJG
-UC3utFiAY1sOAezN3LgNZirV0Hn66ko51fwoQdE401MhhV4ht8XLgWxpK1pS2lAM
-FccW1aQiphduKwGP7UeV9yEUq5FX3nx8c7nxDXL2skZw+RqrUAJGFJvEHRJqUnw5
-spYb4YtJuQ3hpnQfk5emupbNRg9YTiR2FH1mGvWlCpI0hRD8x5QX/cGXd8nP2RD1
-bxMul5ohrjIaHpYuP61MUcMXDzJYKLJPJoTuyIkUgKB0u6Uz/L2JizmvSL0VqPhm
-1xCr1kaX7qjm4P75+6/68Z7jCLXqUlNb6MU1itP87oTvOhfDMOikl0TImx9nerrH
-j+FcHP8oVgB+JciDWyMvm0eFCtZQpK3Dmg01PWAf9JgstDd135FSx3nL1YKU7SQd
-dDeGkFCt81ZyGhFvU5JNrsW7LCe/o1sIQvK63jc1nGdncRDFRb2XJfpZgTRhaDMo
-BxWCLA4mggKKMH5ET8MM
-=dwuS
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7HQP/R0tLK8g3Yic1AS49vK1yGpj
+OztM5ZDKxnpMfTYdPaMcLEojNo/UoT0K7O68XvxQhCln6hS3Ejgc9jd3C2xU+TGU
+d7AYPUsXR9MkLRNt+MP540co0EVj6v93FjpKC+bQZ//pydwV56FsPAgRHH0lKYf0
+2LnlTV/2SNprLKqCIAw+A9gNObhrnWpdt8ggXomjafQSFNMg3IV+njLClod6bXCr
+dSuneUm4n/pYrk8s3Ngb6QN0Xa4ilIpJbDP2iUotRRaP21+MrsNNEd8qGfk5LZDG
+uQfiD4s+PAqXhXsn6QKJXXprgIrZ4OuyWiiSeHJgNz76EgW/kagscpJVYGRycO6N
+p+jJScCitaUX4YHAMOZT+YJJTtjaC3Ca7aaPriOFdCOPYW+WRHxJVwKhCQNFKosj
+/cl8J388F8AtVU/5P36kWI1J2pMfPj4NjlWJrcFV6uyZeNzd97daE7JLdQxkmeMk
+LXrIBdLZdrhrC98AjkRDtruRO9PhdVI/Vfk2GudVETvartJeezUyEJIVoCozcjtm
+zQfUxhi1378HmLRt4yeCfUhsFSKcr6NPOvPwApgTlVPwVsgdUDl343jseDxszDPZ
+HelElkTOd63vGGI42k7cxewzQUHw2+/3EDUsZ1IT14EpdsxLzVIHMvnbSOm7GXn6
+kWKx3cf5rwJ3aOvpCkle
+=c4qZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-exec/python-exec-2.0.ebuild b/dev-python/python-exec/python-exec-2.0-r1.ebuild
index 9d887e19fee2..2a1620b7faa3 100644
--- a/dev-python/python-exec/python-exec-2.0.ebuild
+++ b/dev-python/python-exec/python-exec-2.0-r1.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/python-exec/python-exec-2.0.ebuild,v 1.1 2013/09/17 16:05:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-2.0-r1.ebuild,v 1.1 2013/10/03 21:07:20 mgorny Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ EAPI=5
 inherit python-utils-r1
 PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
 
-inherit autotools-utils python-r1
+inherit autotools-utils python-r1 versionator
 
 DESCRIPTION="Python script wrapper"
 HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
@@ -33,3 +33,31 @@ src_configure() {
 
 	autotools-utils_src_configure
 }
+
+cleanup_vardb_deps() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		# if 2.0-r1+ was installed already, no need for cleaning up again.
+		if version_is_at_least 2.0-r1 ${v}; then
+			return 0
+		fi
+	done
+
+	local f files=()
+	for f in "${EROOT%/}"/var/db/pkg/*/*/*DEPEND; do
+		if grep -q 'dev-python/python-exec\[' "${f}"; then
+			files+=( "${f}" )
+		fi
+	done
+
+	if [[ ${files[@]} ]]; then
+		ebegin "Fixing unslotted python-exec dependencies in installed packages"
+		sed -i -e 's,dev-python/python-exec\[,dev-python/python-exec:0[,' \
+			"${files[@]}"
+		eend ${?}
+	fi
+}
+
+pkg_postinst() {
+	cleanup_vardb_deps
+}
diff --git a/dev-python/python-exec/python-exec-2.9999.ebuild b/dev-python/python-exec/python-exec-2.9999.ebuild
index 95eaeefa69ee..a5e071541ecc 100644
--- a/dev-python/python-exec/python-exec-2.9999.ebuild
+++ b/dev-python/python-exec/python-exec-2.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/python-exec/python-exec-2.9999.ebuild,v 1.1 2013/09/17 16:05:41 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-exec/python-exec-2.9999.ebuild,v 1.2 2013/10/03 21:07:20 mgorny Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ inherit git-2
 inherit python-utils-r1
 PYTHON_COMPAT=( "${_PYTHON_ALL_IMPLS[@]}" )
 
-inherit autotools-utils python-r1
+inherit autotools-utils python-r1 versionator
 
 DESCRIPTION="Python script wrapper"
 HOMEPAGE="https://bitbucket.org/mgorny/python-exec/"
@@ -46,3 +46,31 @@ src_configure() {
 
 	autotools-utils_src_configure
 }
+
+cleanup_vardb_deps() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		# if 2.0-r1+ was installed already, no need for cleaning up again.
+		if version_is_at_least 2.0-r1 ${v}; then
+			return 0
+		fi
+	done
+
+	local f files=()
+	for f in "${EROOT%/}"/var/db/pkg/*/*/*DEPEND; do
+		if grep -q 'dev-python/python-exec\[' "${f}"; then
+			files+=( "${f}" )
+		fi
+	done
+
+	if [[ ${files[@]} ]]; then
+		ebegin "Fixing unslotted python-exec dependencies in installed packages"
+		sed -i -e 's,dev-python/python-exec\[,dev-python/python-exec:0[,' \
+			"${files[@]}"
+		eend ${?}
+	fi
+}
+
+pkg_postinst() {
+	cleanup_vardb_deps
+}