Fix Python support, use python-single-r1 since the package links to a specific version of Python.

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

4 files changed, 37 insertions, 25 deletions

diff --git a/app-editors/vim-qt/ChangeLog b/app-editors/vim-qt/ChangeLog
index 552fb65c85e0..56bfac12fd6e 100644
--- a/app-editors/vim-qt/ChangeLog
+++ b/app-editors/vim-qt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/vim-qt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.4 2013/09/05 18:18:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.5 2013/10/16 12:20:28 mgorny Exp $
+
+*vim-qt-20130201-r1 (16 Oct 2013)
+*vim-qt-20130220-r1 (16 Oct 2013)
+
+  16 Oct 2013; Michał Górny <mgorny@gentoo.org> +vim-qt-20130201-r1.ebuild,
+  +vim-qt-20130220-r1.ebuild, -vim-qt-20130201.ebuild, -vim-qt-20130220.ebuild:
+  Fix Python support, use python-single-r1 since the package links to a specific
+  version of Python.
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> vim-qt-20130201.ebuild,
   vim-qt-20130220.ebuild:
diff --git a/app-editors/vim-qt/Manifest b/app-editors/vim-qt/Manifest
index 74cbc174704f..902bd111ca3a 100644
--- a/app-editors/vim-qt/Manifest
+++ b/app-editors/vim-qt/Manifest
@@ -3,26 +3,26 @@ Hash: SHA256
 
 DIST vim-qt-20130201.tar.gz 11620051 SHA256 676bc4a98d25fd80a3e4a3fdf60db26b1417e8a87eacbd8f03c464c4e68a2639 SHA512 9e9c3b16968b800598f47e9e9c81e8c7e13acf720c933883e704aa390980aa47bda2727714caf1aad27228e5a0e3b4eb0ecd19fc56961b49cc07936a272f6463 WHIRLPOOL 6acd6e6e8d889124cad94dfb8be01a2a64402cdaaee6fcfbd3e822e5a2692d4c326b42916a10937c4bfda3cb1c1cba629d1610f24fb9766b5fd2b0c6013a2895
 DIST vim-qt-20130220.tar.gz 11621543 SHA256 95870899f1dbefe5108ed8cbe7c462cf918954ee5dbf542cd626336488aa7d05 SHA512 05ad7cd0b109285a845653e27aa7a84f6fce1ee0a8ba63b6a8976fb65f5d1f502339aaea4c739626534b7fd936f68d8ccfd15b44c70cbefd0bd041122b647fdd WHIRLPOOL 90fb2b3852071e5df6b5f3d9337d116f3162a854b75f23e4245fd6b0af6c328db900c68414bf16d334e50339c3d894dc5229be0be452bc0b112ee54c95300698
-EBUILD vim-qt-20130201.ebuild 2134 SHA256 55461bfa29ac191933032af04212152a1127929b2545276fd38fc11de7f17358 SHA512 184553d87055e185bb7d56af632e6243446ea9052bbe985b2f789300860b9426ac100b13b7267114db0904c411f10e50e9f6ae2194b8edb31c662e43f8ff8e23 WHIRLPOOL 4ff953fab9716518859e251415956f66260b3e7a8789399150d514a861000fc5d735f203f00a326a9d4e7d2bd79ef2209320ac972b02de195f59aae243bee01b
-EBUILD vim-qt-20130220.ebuild 2134 SHA256 98218ba6ff6d7114126ced41090a96af7a1d517c1e0d6cbde580988cda261abe SHA512 05ee3a0f16216a0640985c9f4d375f11f2fce6f353337cc839ff28f85d2566efb3230cfd7907db0ca587f4dafa0cd9889e3103b224df4ccf8cbf7207082b306f WHIRLPOOL 67474faee17133e6d38482c6e0daddf7e9d6e61c21f4a63faef50378d1ea7bbec39565e30a4b73d9f2fb2a65d27e5a27ba6408674f8f19abcbfb9a7783a32825
-MISC ChangeLog 784 SHA256 bed8f7de5dbf35bc22bb8a72e2aea5eebf61e6925ddbbb6907a8749afee7845b SHA512 bb432a0dc95a13c6afb0f6b249e22379749d3adb097e2382ff69dd95aee5febe95db6d9dd4b33aee51ba2ca737599ab17da0d5e4e09c493b6fdcf862c0a50300 WHIRLPOOL 603c447c189af3eac9531bedcbfc45a0c854d877afb0ec13704f6cee3a69207a9fcd2dfd246558a107d9875a32ada66083cd99cde43b2b8cf48247ef47f44028
+EBUILD vim-qt-20130201-r1.ebuild 2194 SHA256 9ea111cab253a060be126582cc99f5cf2fa7f6b1e6430690aa1c195fdf8916ce SHA512 c768776b763fb297a9bbed70a3a5019587db09e4ef8a50bfbf8a4fec485c969d1d70d502f6308dfd4dfafb618b8de10daf332480a1bda10e27f8d63878718bd6 WHIRLPOOL ce7a4fdccd52a4555c863f08334416df7a0b112444c0f688e70f4c8d9cf6d8ad87f8582b2caa2f9d4eefcf6364693168dd67fb4cbbc587f29e6f5b6d1491ac9b
+EBUILD vim-qt-20130220-r1.ebuild 2194 SHA256 e30e007da48b8e0594462fba22889f3ea2e23dc3958b03a7f907c3434c4a8de0 SHA512 a9d8c133179bb7cf946489acc699f9f17bc1310e8ecd7ab981a6be6ddc41601ebbd4671512a5124f475d3340fa1466bdefec694e7a0dabca0fb5d670cbd021db WHIRLPOOL 6a9b584849f3bada222305a5588b95b56752ad37cfeb976042bd7539612f0ed39c97485465218083105d5ea8890fac080c7326b7a3a9995addbb153ef95cc88e
+MISC ChangeLog 1114 SHA256 9f2ad8316fbea8759f5457c0203e09476e56e78ea0637fa452bd899161197312 SHA512 2b16a595f00308085dffd3b041eafbe723298b1dba943f2c48838bb38dbf7ba0b1ec3a675524d204dd398b6bd77ecdce15b0e2f91849b57194e1bf9de93edfaa WHIRLPOOL 1d33db6db356a4c57e6a09a2935f88856029b93b0d3c7dad8a9dcac5184af75fc3207d4d56fa7863b38dc52b5725d1aa8307b985fead267ea987bb62c414c0d4
 MISC metadata.xml 157 SHA256 a2ffc792d4df94c3f8088e329c4bf74804540c2797f3e24ab0030acbdfd4b535 SHA512 9f259ee8df00db96dd396c6c886624c53728c3e26f28071cc1f9a286798271cdfac3485a081d308c93ff3067cb6568f9ea55ca164334abeee776491307244213 WHIRLPOOL bcb16b3d9ab21125e5581aed1225d2b399015d76bc7c6f9deae53e2e38fffdc47e0b5aae9bd632e85db242a37b4de5aa05d6f97c087cad085df9390530a0a597
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKMr6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJSXoSaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyQ0P/0wMf6sQDz9XYq2T9syGdJJi
-syn0yn7GIHfFH1GQ/vJEumZOGBWWXJg6uqDHht1SL6R6We7pmLBUgNujtRwiuDAn
-9hTT5xjFVsRynWe9Y2wYK0o0LksukL7Pgxks2VBJNzOS73Zua7VFAOaCYIRuATnd
-WlZs+dlfLagaMVGQPx2scgAFrCsjHhNEDZlReHaeZUsKGaGQZ2zbXTW/YxCl/vSZ
-wPMT4Crv1moxFVo26f+vQ5SalCwIN/ziAEDE/NWrB3Y7IapDXH4ukSzfirE/ylou
-3FqGJOYpbm3qhJmjkSKoKcLdEBeEtxC8D+MPoieuzlTis9OX59u2y+wzoPIbIY6D
-6ouqc66/BwQtqpBsFcHWZGI5D9nKkRWL6QnirHEyZxHLv30h2t0RmsPpcbLluUZz
-HYoSeby3EX6zKrFCnNNc8qjCAQ8u+Cuk4vksKkF3oS5iv3bElxFkMXF3Dh0JjM+f
-gsP3M46Lc46x9kaBsRw5zyNeDDwKB6FF64rblJht5p9BgQk9FCqJIrS7nUYqdWE4
-I3oaSdJrs3r62rc/asfOSMrFSJudUrCAdCR+XyhkBEMNSCG9QgGEKNCueOPkkR19
-9OYlb/5CxepDjfbEzFJejNUz4o3jSbfQ4Pv4mciuZI+mkAtvJcj9weC+0FyHU6e1
-OjKsKdjbZ5Z5KHCGdvO3
-=U+1m
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyQoP/iqDorYQbza6w7/ibWXlRI9F
+oSTcSX9AEqxGxRQOGYNRQp19P8CjAbjo/BMzGhH6/yRYbbBz4iDBT6rmvm4FKydc
+qHvgIUVmj01vyaEfgrs0+THCq8amTY6vJ6ZgLxqiOQd9QbdAFhBCbS/0q2hxXaRz
+Bepb6ZW2s41rHFdcjp5nrl40ss5EarY2IL7/vykqQwKVGbV/iwoH5rXlgzKxDshH
+S2lRlOP8Mh5qzVRTM+MVp4T0GJ9o51ey7MOVfp4ryNORZntiRDDgxLsPeUNIuYxX
+wUZbjdu4fxW2UmZxHIVl38r5jEBzyiQ7kPwqeMboumCwAWo9S5Op7INwITg3ZIBl
+KToW6bYnoAukJBgUunpOMQ0fyJvcJdPm+l5zuZBvZPav8TLYeyHeyYLxwmbIfQSQ
+NLTbDM4Xwm42Alq6OYk46KFYQJmZMOEtsERbsMD2o8n7gwN5upEXo9wZG/unKTHl
+Qw7K1FYHMJ5TxlxHRWwUJE4K3zUJwDrYTFjJNCnWFQG+tMiFWUspnvn94X5f7if3
+bCJay9rsB2COXolYX7LJ8Po+9x6/eoFe/i/ObBVb3pLB2WpCoVhwm/2WkviwqHIp
+UZpduVqRXRF/nTxQLbiuLufKaEWSUjT3iJcXY9LMZdZAdilvcdpRyXVLgF/NAoUw
++HVoS6RpDm4kCx/Trbii
+=DGRD
 -----END PGP SIGNATURE-----
diff --git a/app-editors/vim-qt/vim-qt-20130201.ebuild b/app-editors/vim-qt/vim-qt-20130201-r1.ebuild
index 4d26c04d5f0c..c07d68823d44 100644
--- a/app-editors/vim-qt/vim-qt-20130201.ebuild
+++ b/app-editors/vim-qt/vim-qt-20130201-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130201.ebuild,v 1.3 2013/09/05 18:18:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130201-r1.ebuild,v 1.1 2013/10/16 12:20:28 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
-inherit eutils fdo-mime flag-o-matic python-any-r1
+inherit eutils fdo-mime flag-o-matic python-single-r1
 
 DESCRIPTION="Qt GUI version of the Vim text editor"
 HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home"
@@ -40,9 +40,11 @@ RDEPEND="app-admin/eselect-vi
 	ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )"
 DEPEND="${RDEPEND}"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 pkg_setup() {
 	export LC_COLLATE="C" # prevent locale brokenness bug #82186
-	use python && python-any-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/app-editors/vim-qt/vim-qt-20130220.ebuild b/app-editors/vim-qt/vim-qt-20130220-r1.ebuild
index bd247cfe2659..840a3125767e 100644
--- a/app-editors/vim-qt/vim-qt-20130220.ebuild
+++ b/app-editors/vim-qt/vim-qt-20130220-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130220.ebuild,v 1.3 2013/09/05 18:18:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130220-r1.ebuild,v 1.1 2013/10/16 12:20:28 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 PYTHON_REQ_USE="threads"
-inherit eutils fdo-mime flag-o-matic python-any-r1
+inherit eutils fdo-mime flag-o-matic python-single-r1
 
 DESCRIPTION="Qt GUI version of the Vim text editor"
 HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home"
@@ -40,9 +40,11 @@ RDEPEND="app-admin/eselect-vi
 	ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )"
 DEPEND="${RDEPEND}"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 pkg_setup() {
 	export LC_COLLATE="C" # prevent locale brokenness bug #82186
-	use python && python-any-r1_pkg_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {