Needs to block the old versions of app-misc/pip before that tool was moved to /usr/bin/gpip in -r1.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64

4 files changed, 16 insertions, 29 deletions

diff --git a/dev-python/pip/ChangeLog b/dev-python/pip/ChangeLog
index 5937872a1dc7..a271b09bcecb 100644
--- a/dev-python/pip/ChangeLog
+++ b/dev-python/pip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pip
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/ChangeLog,v 1.17 2013/04/06 21:22:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/ChangeLog,v 1.18 2013/05/03 19:35:02 robbat2 Exp $
+
+  03 May 2013; Robin H. Johnson <robbat2@gentoo.org> pip-1.2.1.ebuild,
+  pip-1.3.1.ebuild:
+  Needs to block the old versions of app-misc/pip before that tool was moved to
+  /usr/bin/gpip in -r1.
 
   06 Apr 2013; Agostino Sarubbo <ago@gentoo.org> pip-1.3.1.ebuild:
   Stable for x86, wrt bug #462616
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index b103ddb43a5d..1d14c9b587dd 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX pip-1.0.1-unversioned.patch 597 SHA256 6ae4dd0b248344388d496cdd0e6506bc15e671fb7aae7fee8834284d2c5605ec SHA512 8525ffa27d6590cfae040ce8e18487cc7c045c4a0dbfcd1b6f5b2cf6454aa4ef9ab30956db0abcdb6b7b1e0bc0fcc28de87f2b5d78ffed9dcea7aa69586a7767 WHIRLPOOL 19ffe7278ee7a3cb447f3306a62294e1b0d7608f6c0b0995ad1ad8adb7a9db66b50a1c97e3e9f195557b7db8bdffe52824324d492c3d466976d7b12c27e7b785
 AUX pip-1.3.1-unversioned.patch 452 SHA256 1f2da23b1513de37b092450a2753a21ef56858ce0e0fdfc76c9586140ca947c4 SHA512 69eaa4102d688152a77283285a279c2f188bb2cc3a5e07c7522b6a8a384041b310cec6cdb4e1adac588a535ebc39dae7c020ccc9e1e8064a3504003d74d8858b WHIRLPOOL bdc00acad1fea2acb5ff157ce306df60af524a2a817651f1555cbf8495aa8db337df5f7e7e36e41d2506877cf9b13486366165967be404deb1d32c7915fa2069
 DIST pip-1.2.1.tar.gz 102413 SHA256 12a9302acfca62cdc7bc5d83386cac3e0581db61ac39acdb3a4e766a16b88eb1 SHA512 f24812adb1550beeee3e46ae27b5bd8fb7047b551ac248d4228324d2e5954faaa242e899af081d19e2702b4775a1f23f1097ea3dbfee6e0a61f6f65f3d1e7ca4 WHIRLPOOL e5471ca4940663b46bec0aa1a9bc0d8bfcb2b98a9c7497ddafde14a4162c33abd737ef1e34e43ab15273c6f18875af620c8fb41ed2bd9a7c623a2a9a77352051
 DIST pip-1.3.1.tar.gz 247594 SHA256 145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957 SHA512 b969797d4c93aabefa4b66e0ad3d2c3ccedd3324e68bb1fa81d383f1e867d24ce2fb91851b0470607312041e3c3c0224c920be2e77d6f9af01084146c65f308a WHIRLPOOL 8ec3bbafb70242152aaade9a61adacd57f79d9e19c1330c22b50dfbad3896e40d52f79fa18a2c0d2cb22e11c860295fa93beab0f4187872c989efa362ab3a2d1
-EBUILD pip-1.2.1.ebuild 1297 SHA256 0d1fb5567d62cf3afe845fffb74c17cdc6e2a59129d2b0cb7a4b62d24f13a4fb SHA512 06bfb528d0984a8dfcea63dada476e44256b7be3bfabff764a562598db9de8d03ef53b6c73ea746c7655e96706cd1b139e69366ad801733331c83ed03ce749d6 WHIRLPOOL ba53ee4730bfd70936e5021296a262e128fdaa741794c7135484bff82230f05acaced5e673c83bf65ea19b0cec4044b61780f91faae40471d283eb002a07dde9
-EBUILD pip-1.3.1.ebuild 1261 SHA256 9ca64919180af0f1e3cd2f3ab2bf5d70ae20f076df92a70c39ce450bb070f453 SHA512 2279801f851952d274c6ea49550c3eed0288ceeda5789dc9ca34e8628c47b6fb9d37e3af4a3e4658657e495cffe7bae9cf09ad61c39bfe5906a89c4aee821652 WHIRLPOOL 332ea550dc85d03a10d1ddc9dceed1f5d047e1b2127d71a5b5eee165aa316cacf468699fc16be0cd66ce93d649e574fb50407488bb5ea71f61d48f6d8f7cb8a6
-MISC ChangeLog 2180 SHA256 fe1fe76e5b95bcab9aa66d30ec81e958e1cc3fc948d97ab0eebe50bbc8fa379a SHA512 e5a28e3613a0c179db88a49a3a511b3141c9c9f1338bfe08c9e019e4d325b57edab7ba116b4d1f7017b7bd1e8cb664ca07b4fa9de4cfe2b2eae0cb9c085eb9bd WHIRLPOOL 2c0b7f12a66d951d7147ee2c9db38d8289bb5a55602f30435dd39a1ef5a29a0bf688e8dd88623b8b5ca5facd1e67ee5f8acd6826d18667ada007c1278f2ea5be
+EBUILD pip-1.2.1.ebuild 1323 SHA256 d0a32a277cca368cb8a94900721de643e17a4de9698f7deb131a6987d9dc86d8 SHA512 d259bfd8ea1de2cffd7f4f2ed94c667665b0031ae708aaac026ac47dc48e92d6c5405fe7a7b157bada6a7a6e6839cccb556dc02acf5eb72ca3e5c2656df685ee WHIRLPOOL 0010091e285d24e565fcdf7197973cac521e63960158e055b4802ab171ef72df579d2ad04063fbd5edf7c08168dde6c6a11c9b175b2e5990362ec824c3d6f3c0
+EBUILD pip-1.3.1.ebuild 1287 SHA256 d58cce216bff7d68d723360caad005ae4a0cfe7d3c3c9ef198b3cf62e0e21ae9 SHA512 075d65a9f975cfd26243cb2650c934e265b1c0667bd0ae9e7699576c1424d6ca773e9c56562f3d36ce47b9474b4858c6d4980143a9f6a647d035f2bc8717af98 WHIRLPOOL d5847663a65203d09ebde3768c80b21c0193e2fc80c0dc14fac3b82a885846a80f4a0c2e866bdaafd439c1e9c25b5e961543646d8a30a04160e59e68ec2aac56
+MISC ChangeLog 2380 SHA256 2820025b6b5d7e3c5f6c2be268803d6e906bdfe16a2ab6cf98f26404df197b91 SHA512 8349a530699f8ec2a759d7297de7de7fd0cb37f9674e07412d6427033196de1df74c28feff172bb550bb371c4300c2983b56aaa8802cb9d7158895cf3b2e7675 WHIRLPOOL 6dbdf67cf96ea390c3046cb5ea94b0256c15e8d31e90a2cadfbb47429de254a24a2047427d79f2d757758987f21cf900220284a95c8af21ae48dc78b6b7c4f71
 MISC metadata.xml 226 SHA256 be59b97e420abdbddf3e1ca0d5aee7edbac606423b6196f351e06f2f0278a1d6 SHA512 a44d1c871128742ad906119f133a116ed498f55ab5236c7206941b9e6759f6d46290138241510cc7bc212a2f468436aea4a1e05359903d9bfdfeeb490e2d263b WHIRLPOOL f6c2715d2f7badae8432be7968e50df8f684bbad75905740b50b75e6a0096e7506458234e1d169c9ad9faf76225718207f67ed01cf85fbbac536ad89d39a1140
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJRYJIOAAoJELp701BxlEWf3aQP+wZZH3IyZKZ7tcR1sfNtELuB
-7prSEASmfjaCIybtx1wfRqy5qxsb3xCVSL2oDFegRsCmHN6kd/m6QdkgtRWINooI
-nKfBomB4slWUVZirv9SPSPjjBXqo5AcQ1PgWfxsU3lfkOlZDPqj+l3zcVVRkbouG
-gBjTYyr2Cr+d497iHo30Yp8ALuYKN0hCGNstCunjbBe4id0reTxFZ2G8w5modMM+
-DSFQ46oyNXlzVdt5QTXcAOvm4x2gDQtA+AvwhP4u0IOZB7DoI3BbMWOw3uYh5bhq
-Uc+FEC0KmjZrp+kNCL/T9ZvLxjpQBRtrDC5IrZ5IfOLm/CG2KT8Hk3qaOVRCpDpd
-YCzKyGRdf8AFSVUR8jNkNCMhJmi8NKRvsVTjuJjNmAXdM1cOMdigye4FNCG4gPMx
-RmP6xMr8dGyCLVAvPybit1mF/ATJKrMxQQIUs+HMqzGI18Wi872Evl0WRmB47QbM
-RjBlBf1MSYCXuERwtGEu5RMn8zSIZ+i80lERgodSdiedgxWq//jxuQ1rjg39cHAS
-viUSOBR7jZhdAPKe1LKGv9qsC51JOyXue3N/01SEjxlA4ZBisjSKO7t01TcM/EYg
-exCGN38bztn9ghgCGf29S3CH/sRIXtwNgIbLV5N+QFM0zYNPozgfwYHFEmjJKIoc
-auqvxBoNfU39250Jy/U0
-=362j
------END PGP SIGNATURE-----
diff --git a/dev-python/pip/pip-1.2.1.ebuild b/dev-python/pip/pip-1.2.1.ebuild
index 9e51f363668e..2ac002799591 100644
--- a/dev-python/pip/pip-1.2.1.ebuild
+++ b/dev-python/pip/pip-1.2.1.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/pip/pip-1.2.1.ebuild,v 1.3 2012/10/30 17:03:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.2.1.ebuild,v 1.4 2013/05/03 19:35:01 robbat2 Exp $
 
 EAPI="4"
 PYTHON_DEPEND="*"
@@ -17,7 +17,8 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="zsh-completion"
 
-RDEPEND="dev-python/setuptools"
+RDEPEND="dev-python/setuptools
+		!<=app-misc/pip-1.2"
 DEPEND="${RDEPEND}"
 
 # Tests require a couple libraries not yet in the tree, aren't bundled with
diff --git a/dev-python/pip/pip-1.3.1.ebuild b/dev-python/pip/pip-1.3.1.ebuild
index 046d9a7d9221..b8daf41cd97a 100644
--- a/dev-python/pip/pip-1.3.1.ebuild
+++ b/dev-python/pip/pip-1.3.1.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/pip/pip-1.3.1.ebuild,v 1.3 2013/04/06 21:22:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/pip-1.3.1.ebuild,v 1.4 2013/05/03 19:35:01 robbat2 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@@ -16,7 +16,8 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="zsh-completion"
 
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		!<=app-misc/pip-1.2"
 DEPEND="${RDEPEND}"
 
 # required test data isn't bundled with the tarball