dev-lang/python: depend on virtual/pkgconfig, fix quotes

3 files changed, 22 insertions, 21 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index ae2fe8d2..67c430e5 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -1,17 +1,18 @@
-AUX linux2.patch 606 RMD160 0cca6f619a98e6090d01f4a80c2178c323416a47 SHA1 8fc817c8da2f74d3ccc93d84a1bc713ed26c00e2 SHA256 a178120a3022ecb14044c82eff7e828f6d060b6885acacd4a4d8569fde372fd7
-AUX pydoc.conf 330 RMD160 0cd619ec251597e0fcadc05bfd249915e73baa17 SHA1 a56100d45378c554b9822f6ed512a6cb7841ef50 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1
-AUX pydoc.init 679 RMD160 79ccfb6179974f4a4f35238c122b9640753e7e43 SHA1 e7bb706ae4ef94d28874677c4f92b82d08d7999a SHA256 8f6c1753a28462fa61d22a927debed7ec3994b3617d728932357e739ede6516f
-AUX python-2.4.4-test-cross.patch 977 RMD160 8fdcd45dc202993988f7a1c2b3d918068883b99e SHA1 96f25777150ba05765282a43f08da6b6fab3cb73 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6
-AUX python-2.5-cross-printf.patch 903 RMD160 8dc0ee148120aaf7667624bdb5574bb6af5d2a00 SHA1 596e05be8cde43e4cdd87c8ed06ebb40828f7cea SHA256 1e91e5123d74d89aa8fc9dc60d98516b785f851e43da9b634ae535130e24e780
-AUX python-2.6-chflags-cross.patch 1716 RMD160 b0ec772a41a24d51f4c7430b19bcc6251cd6be87 SHA1 4745cd53cef503c41c50573ad97f40eb89fd4bcd SHA256 7c36689db47720052069725036983c2fb6959f425e3777aae55976b2788d463f
-AUX python-2.6-test-cross.patch 914 RMD160 1f421b5565d39a24b887e85cbecaf3857741f756 SHA1 9c05fbe28aac6373f24317db5c277bc4549dde0c SHA256 8264f6ffe5aedcce67bea00b0346e5416a5486da2229bf82fe748d87ec65c4de
-AUX python-2.7.1-BJA-cross.diff 1355 RMD160 90c8e6d8433052e893c2f5cb5e3dea3b3bf5f5d5 SHA1 3cd7d1351c9b4439745038b97b04cd6cee310f79 SHA256 69bd7fb750ca6b4b7b9f24795ef7572507d91e859eab66163ef8cc1a523aa1c1
-AUX python-3.1.3-BJA-cross.diff 931 RMD160 050586946dbbfc8357e0270055677d3c425c22f9 SHA1 93659614d7505ba40a01c9f41b03fd429c7b498c SHA256 a55958807d2d226921e299bba899cc566186e66cf2d1d6a64bdf701c0898ece7
-AUX python-3.2-soname_typo.patch 1724 RMD160 1b112382152731768b655279145c7caa31d1094f SHA1 808fdab3b1d1664fc20c67dce008e7ea48134a4e SHA256 776366c3cc67c7d66883846acee8cc1b795c25f6e35e927793be8c54162491e2
-AUX python-config-2.4-r1 1624 RMD160 e4e6893c9e8414289c0c70c0f4be58835911e376 SHA1 addf9a6eb81e636364264a6abb3d96f01ea0cf90 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f
-DIST Python-2.7.1.tar.bz2 11722546 RMD160 3ce59305f6cd3fb320a53771d0ea01ec0687005f SHA1 fbe1894322ff91b80726e269c97454f4129fc2a3 SHA256 80e387bcf57eae8ce26726753584fd63e060ec11682d1145af921e85fd612292
-DIST Python-3.1.3.tar.bz2 9875464 RMD160 730f3b8eb1a41f1b7c469fc81be734bb802cb9f9 SHA1 aeadf1eb7f450aab77a8972c042bc5f49bcf2288 SHA256 77f6f41a51be4ca85d83670405c8281dd1237bb00d8be8a7560cb3ccdf5558cb
-DIST python-gentoo-patches-2.7.1-r1.tar.bz2 13384 RMD160 d79de2520244a8b9c5de61c9bc591a4e538a7736 SHA1 72a0b75ab891ee20041a65dc2642ee6cf40642be SHA256 cc9b4239a3276c6fd447e3bb3ab8a2f94fbc49e08bb5b20ba5f05b4becda2bf8
-DIST python-gentoo-patches-3.1.3-r1.tar.bz2 13730 RMD160 73f922d850e464e589c7a3cfb8f755d36167d156 SHA1 9228b63c980b80dd7e8dd9e0276c29af18692e33 SHA256 f23056436b298ed0ff9823b52902aaaa63eae0c4585a4a19e47571685127631e
-EBUILD python-2.7.1-r1.ebuild 11161 RMD160 95a90a182be0ae83ec5508a38732faefd6cbf9cb SHA1 dc5bd6196095d4c0335d6c16ef7999ef85d6dbb6 SHA256 59458c10f433c602e36ec6b2e913c891c7ebd643a1dd996fda202920db1f6fcd
-EBUILD python-3.1.3-r1.ebuild 9838 RMD160 bf62cbba7a999e356c2642f1032687dcc396267e SHA1 a76b0f6e9b81c548c880f7f45fe96e7abdeea22d SHA256 508cb80e100775885f9caff5770eee8e448b18e0487c8c1aa5d2c473aae4921f
+AUX linux2.patch 606 SHA256 a178120a3022ecb14044c82eff7e828f6d060b6885acacd4a4d8569fde372fd7 WHIRLPOOL 82e2d6622e76fa487725265fdb654be5ed68fea8d069563d1beede396b18e2a017ff0c435cab92d4a7a9e56b1e4c781133d8bfb2ffc9ff830dd89dfeb7c44357
+AUX pydoc.conf 330 SHA256 a45ebba2de5f2b0e963db4101507203d095c5ff667ae5002c4897a9c87786fa1 WHIRLPOOL d957424a7d56121e9216178f3a6fa9a8b25fcf315accd964ede7ea365b8f5876e379f6728588983db478091027488b0659fc9b80e4553c4e8333b25dd1211867
+AUX pydoc.init 679 SHA256 8f6c1753a28462fa61d22a927debed7ec3994b3617d728932357e739ede6516f WHIRLPOOL e5c471022714771b428d0ce00f1a15dce6d9df2f71e343e1366c15887f0dc37ac3b6a658380b2806fc8d4d4cf1406cf64edf5205ab34db71e62f2941874e5fba
+AUX python-2.4.4-test-cross.patch 977 SHA256 ff2a131776d560d188ec5069e17fea3eb09c26fdd02124ae5ff34d791c9fd9f6 WHIRLPOOL 25780561d85ca2ec81084f531d2441464fe42585e70604265ecdae42606fa514a14e395b4b886fd3b94251eac48ce73cb43504053b0ea4974e4aa74ae7015a25
+AUX python-2.5-cross-printf.patch 903 SHA256 1e91e5123d74d89aa8fc9dc60d98516b785f851e43da9b634ae535130e24e780 WHIRLPOOL 083d4e5fb4b3fd15ddf88ebc516407d634d891d55049bde086b2b7351ce565ce6563b5e90b8f2a70f37b52159bf9fe3e870c94e44dc2003ea75953760293457e
+AUX python-2.6-chflags-cross.patch 1716 SHA256 7c36689db47720052069725036983c2fb6959f425e3777aae55976b2788d463f WHIRLPOOL ab38e28ee9141b213b6ac77a4e421ac5bd95fbe4a644d1b49627a5953ac23cbfd1b99efbdaba12d5eb9a5dc4dc6bd26d41c0f063c350a312f287b6b850eae3bb
+AUX python-2.6-test-cross.patch 914 SHA256 8264f6ffe5aedcce67bea00b0346e5416a5486da2229bf82fe748d87ec65c4de WHIRLPOOL 273b52e9f1a46d2a6105d3ea28b051d3e717ef08cc6e5b09f7ae84333ffd990e985c27a1073acaf4f7b6fc9d3f5b08a6faf84c43c19708cf182a0caca7a71698
+AUX python-2.7.1-BJA-cross.diff 1355 SHA256 69bd7fb750ca6b4b7b9f24795ef7572507d91e859eab66163ef8cc1a523aa1c1 WHIRLPOOL 55e005095e068044320ecc4856ea92fc0d21cbfd8b404caae4891d893bcda3e0d4e3c874ed228295010e6e0b1df13ea7f7b9f8776e664310e3decc6ce9504a8d
+AUX python-3.1.3-BJA-cross.diff 931 SHA256 a55958807d2d226921e299bba899cc566186e66cf2d1d6a64bdf701c0898ece7 WHIRLPOOL b4857c0988592ad6bde7d5ea834b6a20ef9982a0c3f96e45e3e74f95c23951af4312825b9aa4705d47bc9d3130699e59e638ff6f2bc1ef46e06840b017461609
+AUX python-3.2-soname_typo.patch 1724 SHA256 776366c3cc67c7d66883846acee8cc1b795c25f6e35e927793be8c54162491e2 WHIRLPOOL 63ee4f4c6ca16d33787044e6e73abeebf2cdd4ac23819aa75a9997e82c5d2920320fadc228c499d7c5e7fd85c7b091c7094bbda44bf6417026aa9c4b9bfbba67
+AUX python-config-2.4-r1 1624 SHA256 923a9e896f99cca5aa4ccbb02f981c6e26a2b1aa42326de2359d3c884bde2a9f WHIRLPOOL f2fe759b05ac0eb3b8dd196b0c68b8b8e0145ab79659eb4a45adee1bf7ae7260f457ae6192b9792990babd59cb98cceec05a8d93a50a3203517fe49ec30f5e0e
+DIST Python-2.7.1.tar.bz2 11722546 SHA256 80e387bcf57eae8ce26726753584fd63e060ec11682d1145af921e85fd612292
+DIST Python-3.1.3.tar.bz2 9875464 SHA256 77f6f41a51be4ca85d83670405c8281dd1237bb00d8be8a7560cb3ccdf5558cb
+DIST python-gentoo-patches-2.7.1-r1.tar.bz2 13384 SHA256 cc9b4239a3276c6fd447e3bb3ab8a2f94fbc49e08bb5b20ba5f05b4becda2bf8
+DIST python-gentoo-patches-3.1.3-r1.tar.bz2 13730 SHA256 f23056436b298ed0ff9823b52902aaaa63eae0c4585a4a19e47571685127631e
+EBUILD python-2.7.1-r1.ebuild 11162 SHA256 99e005f7edc447aaa9278fda4079a66ce0f04d4e1eb824648b234ac7916a160c WHIRLPOOL f074e35df6f3d3632a79c3d6a9a1ba98301ba865778596e36f25c1eeda961ff94fdbef9955fc606f0681aab27e4595a826ee23990b12d19b01c66d0c50058c6a
+EBUILD python-3.1.3-r1.ebuild 9839 SHA256 2b0e1f6f5698362dc9fcf467696f0f7571edd3c0baaa2b0f6efaf180d01ee441 WHIRLPOOL 17a919a49548a4b4940c880e1e6900b9be83ae49fde8b29dab348f453cd74cfd1c998dd31d4e16f1bf8010540a632779222398b662f048b2496383a3559abf00
+MISC metadata.xml 646 SHA256 1a7d28445660381ad5989180cfe129cf6ae58c080cf489c504d96eed437d57a7 WHIRLPOOL 51e5c8521020b00a16a2a8cba2dea477ff1d08594e047a09e8865d9697c1660fe8310f2639867960022e2e72757998cc30864d8d8f1e420012f4a13159aff9e9
diff --git a/dev-lang/python/python-2.7.1-r1.ebuild b/dev-lang/python/python-2.7.1-r1.ebuild
index 4003f137..c2d99e5d 100644
--- a/dev-lang/python/python-2.7.1-r1.ebuild
+++ b/dev-lang/python/python-2.7.1-r1.ebuild
@@ -62,7 +62,7 @@ RDEPEND=">=app-admin/eselect-python-20091230
 		!!<sys-apps/portage-2.1.9"
 DEPEND="${RDEPEND}
 		$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
-		dev-util/pkgconfig
+		virtual/pkgconfig
 		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] && echo "doc? ( dev-python/sphinx )")
 		!sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )
@@ -117,7 +117,7 @@ src_prepare() {
 
 	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
 
-	epatch ${FILESDIR}/${P}-BJA-cross.diff
+	epatch "${FILESDIR}/${P}-BJA-cross.diff"
 
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
 		Lib/distutils/command/install.py \
diff --git a/dev-lang/python/python-3.1.3-r1.ebuild b/dev-lang/python/python-3.1.3-r1.ebuild
index 7cbd6a94..c8b75505 100644
--- a/dev-lang/python/python-3.1.3-r1.ebuild
+++ b/dev-lang/python/python-3.1.3-r1.ebuild
@@ -52,7 +52,7 @@ RDEPEND=">=app-admin/eselect-python-20091230
 		)"
 DEPEND="${RDEPEND}
 		$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
-		dev-util/pkgconfig
+		virtual/pkgconfig
 		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] && echo "doc? ( dev-python/sphinx )")
 		!sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )
@@ -101,7 +101,7 @@ src_prepare() {
 
 	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
 
-	epatch ${FILESDIR}/${P}-BJA-cross.diff
+	epatch "${FILESDIR}/${P}-BJA-cross.diff"
 
 	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
 		Lib/distutils/command/install.py \