Version bump and remove old.

Package-Manager: portage-2.2.0_alpha195/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 58 insertions, 69 deletions

diff --git a/dev-python/pip/ChangeLog b/dev-python/pip/ChangeLog
index cf4392817bb2..26876a6e49a0 100644
--- a/dev-python/pip/ChangeLog
+++ b/dev-python/pip/ChangeLog
@@ -1,6 +1,12 @@
 # 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.20 2013/07/24 14:47:16 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pip/ChangeLog,v 1.21 2013/08/08 05:44:12 radhermit Exp $
+
+*pip-1.4.1 (08 Aug 2013)
+
+  08 Aug 2013; Tim Harder <radhermit@gentoo.org> -pip-1.2.1.ebuild,
+  +pip-1.4.1.ebuild, -files/pip-1.0.1-unversioned.patch:
+  Version bump and remove old.
 
   24 Jul 2013; Dirkjan Ochtman <djc@gentoo.org> pip-1.4.ebuild:
   Fix pip docs (bug 478008).
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 40fbffbe6846..33d2f27d3c76 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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
+DIST pip-1.4.1.tar.gz 445199 SHA256 4e7a06554711a624c35d0c646f63674b7f6bfc7f80221bf1eb1f631bd890d04e SHA512 8ddeafa90f58c976c3af6493ee8c92f1592b85df9ba23b9d89f5d2d343975ccc94eff92a53f0753322169208f0522fca1c34be324ae1eb06a5298b67a801afee WHIRLPOOL d5f9156d1b480c66438dff723ba4bdd10a782bf412b1e2763aaf3c4d1b5f8e30e7441247757311c454b2c6566d2834bddb81d7ae084c7404e53e4b6c66c5e2f7
 DIST pip-1.4.tar.gz 443790 SHA256 1fd43cbf07d95ddcecbb795c97a1674b3ddb711bb4a67661284a5aa765aa1b97 SHA512 0577f30404e6221714a699ab7a361956a2af0356013807c99a20eae9a838f462aea778770c79a40b6a7d962cdc3eedc887322025c76185ec357a27811bac92ae WHIRLPOOL 92c9ca5d654e2be29ab9df55855e3aa3e2ad0358f460e851b766e787b02b2f3b68462cb319514c14a6f707bb723e6feb85f9ea5456b508b4f45f77a375fe9c24
-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
+EBUILD pip-1.4.1.ebuild 1207 SHA256 84219dae85c0c98e526aafe112d131971b7b24c201052d714258fa50a6ac473b SHA512 81e2734d706b5c54c34afd9c577e2382b7e0ef10c0052af1200d25a0acb60531bcfb9f3b9e700c46be68a579aeb71e671fa9b44ed95691a6cf0ee3e9861f26db WHIRLPOOL 0121892e342fe5458b2d950f7bdd75e28f29a4f865204e5721b546c38f30432b6fdd4aef48fe38b0a6c7ee8b8c503047497defb20f082c8561c09c7b8898a38b
 EBUILD pip-1.4.ebuild 1290 SHA256 30c7b11d6e76069c138fff19fd649a4b0da03a58a5f74f205a4faf871e95136d SHA512 73b4bfd96c4c543b98b13a0c422c31021a392f08aa26b59cc9698d433ef764e2b9177e01adad006dfe2a0eff8b624f2bc3e4801329cc747c88f1dee747ef4c1a WHIRLPOOL 955ab61c3c5159be83b684587735a20fc6617d972ad63d32a761b44d05a4e92dd0595c1618b29449107e056e4cdcf2b758868af3254cda4cfbbda29c1ce56140
-MISC ChangeLog 2587 SHA256 2a8c877dd83e6eaa55e62febc8005e796be44f46de7b8f5dc9aa9985435b8def SHA512 37352c3db0ec888bd5ef421e3b733f07fa82820eaad8cd438ee56574d96d042b4dd9b3bf7fbe5d8e716245d254ced32334f5829b8e3f526d112d52a516490bf2 WHIRLPOOL f21930cb8096f2be46b9523ebb9bfef93ff9b236b1135d3f6546f25923ed103df8b3486760bec2a0f994c898a222d819a0b17ec7dacaaa799441a7943b226f57
+MISC ChangeLog 2776 SHA256 005096f675e05e6f1a82986d0251e0af1204f5095cb39aacdfbf68a1d759cce5 SHA512 4159693e149af2e748375a0d204482f33edabb7a500f04c8fc8352b8c2ef05df5ad603290c9904a35f66322373165fb87385361befed020bf4418401f802624b WHIRLPOOL 03d5d973acd96305b0e9960e3c43ddf3d50aee48bf4c0fad1d8b3dd7a2a5e0d2a01c5fade21818c05e1c6e646138a779d2f3a368a4491b2a5f7bd98260e910c5
 MISC metadata.xml 226 SHA256 be59b97e420abdbddf3e1ca0d5aee7edbac606423b6196f351e06f2f0278a1d6 SHA512 a44d1c871128742ad906119f133a116ed498f55ab5236c7206941b9e6759f6d46290138241510cc7bc212a2f468436aea4a1e05359903d9bfdfeeb490e2d263b WHIRLPOOL f6c2715d2f7badae8432be7968e50df8f684bbad75905740b50b75e6a0096e7506458234e1d169c9ad9faf76225718207f67ed01cf85fbbac536ad89d39a1140
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHv6Q4ACgkQxeMuLWsGW/tqxwCcCQxJU3v0YQwiaxwDPIhQ0zzS
-rB0An2F4cHdBnOGoiFydLyxRMQdzli1a
-=gDcT
+iQEcBAEBCAAGBQJSAzA5AAoJEEqz6FtPBkyjdNgIAIyZEPk049X2aZ+QYFyp3fib
+ttMXznx0pD9ed19+MwnI4tFDcuqGiFLxBxQvjKTMFzSaAN5amIYYGMUfdUwv4zqe
+lracRIeUNpFAmL19XJiY339kVjNRuL8aQyj77pyilT2hl8uV4YBkkL8UdS97f3jt
+Mu6M64f2wfOfWznV9r04pAT+pFA52GIZerMdYzGimp1tuYtbQDlQHeqesIzAGsv/
+vAgq9Xfh97dxHsf//D9RK0vbLJlODuHTyKBGzVQqbtLUXv6JuIuKxVjGftZB0x8W
+xA4XtZh7uH/OlxV9y38LbO56+Upoiq+TinS+crc629rB3oQ1/Z0crys87WmypOw=
+=mMvD
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pip/files/pip-1.0.1-unversioned.patch b/dev-python/pip/files/pip-1.0.1-unversioned.patch
deleted file mode 100644
index a479813bac2c..000000000000
--- a/dev-python/pip/files/pip-1.0.1-unversioned.patch
+++ /dev/null
@@ -1,14 +0,0 @@
- setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/setup.py
-+++ b/setup.py
-@@ -48,7 +48,7 @@ setup(name="pip",
-           'https://github.com/pypa/virtualenv/tarball/master#egg=virtualenv-1.5.2.post2',
-           ],
-       packages=['pip', 'pip.commands', 'pip.vcs'],
--      entry_points=dict(console_scripts=['pip=pip:main', 'pip-%s=pip:main' % sys.version[:3]]),
-+      entry_points=dict(console_scripts=['pip=pip:main']),
-       test_suite='nose.collector',
-       tests_require=['nose', 'virtualenv==1.5.2.post2', 'scripttest==1.1.1', 'mock'],
-       zip_safe=False)
diff --git a/dev-python/pip/pip-1.2.1.ebuild b/dev-python/pip/pip-1.2.1.ebuild
deleted file mode 100644
index 2ac002799591..000000000000
--- a/dev-python/pip/pip-1.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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.4 2013/05/03 19:35:01 robbat2 Exp $
-
-EAPI="4"
-PYTHON_DEPEND="*"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit bash-completion-r1 distutils eutils
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="zsh-completion"
-
-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
-# the default tarball from pypi, and have a couple failures anyway
-RESTRICT="test"
-
-DOCS="AUTHORS.txt docs/*.txt"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.0.1-unversioned.patch
-	distutils_src_prepare
-}
-
-src_install() {
-	distutils_src_install
-	COMPLETION="${T}/completion.tmp"
-
-	"$(PYTHON -f)" pip/runner.py completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	if use zsh-completion ; then
-		"$(PYTHON -f)" pip/runner.py completion --zsh > "${COMPLETION}" || die
-		insinto /usr/share/zsh/site-functions
-		newins "${COMPLETION}" _pip
-	fi
-}
diff --git a/dev-python/pip/pip-1.4.1.ebuild b/dev-python/pip/pip-1.4.1.ebuild
new file mode 100644
index 000000000000..0549076703f0
--- /dev/null
+++ b/dev-python/pip/pip-1.4.1.ebuild
@@ -0,0 +1,41 @@
+# 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.4.1.ebuild,v 1.1 2013/08/08 05:44:12 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="http://www.pip-installer.org/ http://pypi.python.org/pypi/pip/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="zsh-completion"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+# required test data isn't bundled with the tarball
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.3.1-unversioned.patch )
+
+python_install_all() {
+	local DOCS=( AUTHORS.txt docs/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	${EPYTHON} pip/runner.py completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	if use zsh-completion ; then
+		${EPYTHON} pip/runner.py completion --zsh > "${COMPLETION}" || die
+		insinto /usr/share/zsh/site-functions
+		newins "${COMPLETION}" _pip
+	fi
+}