From b2be182d49eea46686b5cf2680d457df61e89dc4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 30 Jun 2018 08:49:38 +0100 Subject: gentoo resync : 30.06.2018 --- dev-python/pip/Manifest | 4 ++ .../files/pip-10.0.1-disable-system-install.patch | 18 ++++++++ .../files/pip-10.0.1-disable-version-check.patch | 19 +++++++++ dev-python/pip/pip-10.0.1.ebuild | 48 ++++++++++++++++++++++ 4 files changed, 89 insertions(+) create mode 100644 dev-python/pip/files/pip-10.0.1-disable-system-install.patch create mode 100644 dev-python/pip/files/pip-10.0.1-disable-version-check.patch create mode 100644 dev-python/pip/pip-10.0.1.ebuild (limited to 'dev-python/pip') diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 1f1b7bc49c0d..9a9d65ad4380 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,10 +1,14 @@ +AUX pip-10.0.1-disable-system-install.patch 769 BLAKE2B 9e722c95f01a184bbc48df6979cde15d748311e5ee5d83e5d18659cffd7520145bb24af891ba0f760dcec4c17b17d31adf211f1a4f938598d1fec44be56e6891 SHA512 6b0d49d398940f2614b2a892be2169a6c2c2d26d7d700271df3819c71c284646cceac9dce4e907662690e17bc0ca372b6251e02f520bf3e60994b26725403029 +AUX pip-10.0.1-disable-version-check.patch 850 BLAKE2B 4ec0e8e0b172c51cdfa2df6ee934df8e25a03885ef7976c2f7cc844728e0359a1d5081296680576ea5780a15b639b3809063e663374ee11e252cd95bd9e876ae SHA512 b489eaf4fe17042807dd92ce77b016fcd032dd79bd5c766bdf9be38d2958e32400bdb5950ff2c400abac42d2a0a17803f5a2cfdc1161906c95c1d34a8bc83f8a AUX pip-6.0.2-disable-version-check.patch 465 BLAKE2B e3ae94267a8d0caf425d22968f6e640063eaca0d2c475d130d1d2f7281d6ef541c0c36c3871c67fd4947f54a4ca18cc9a9c0fa347a3960727483b3a3bcd46ed9 SHA512 fd3413fea4649aa6a34ff7a23e7442267dc07307aeb25398e4620d108ab144703db7431e2a158612d9ee67e448d1d66db7e8103364aa6635844672bea16c7d28 AUX pip-7.1.2-unbundle.patch 1496 BLAKE2B f0bb71125270bbcfe1fe544b81130951c6ccdb97f676b3be5c7831efdedae5edbc47669836565b269af287910cd23cbc193037b39ac09dcaff5dceee542c32e7 SHA512 c0daf49d9a596a188fd54751b8ee7333f1c3187657b677a6f61ab9820483b388c3475b5fecb887115aaa34208070a15b56a8eb5e0a4639c3732840cf17a6f16a AUX pip-8.0.0-unbundle.patch 1985 BLAKE2B dca355b40941ef5f805a4b247d75dc9d2ad560c7fd9752be2ca1d428522e83a4c318d3d361d2960fce79051df2ea9180a48c23e4af3048fe31ac535cd0cb8db9 SHA512 3b5f96160623eb2fad9c5978fc6512b21d48d5b91cb09c9d43deaee6de3c843af137a5df11c83b0d8395625482162d8cf40748b072692b305d6ab1220f3fb0c6 AUX pip-9.0.1-disable-version-check.patch 1031 BLAKE2B 148e528aab19de021f193ac56d758c803e0875b618ee32e948eb103eb6b05eb56e2ecf5ed4dbe39893f5c44ddee17122fdd686f433f5ce89044b2c02291e0ba1 SHA512 8b5764d3ecdbfc871bdf051b41d9610d5028bc3b95a4bf990db46325d10e5d559449ec97ab052686148d6ab6abfa630fb38101c726b6648d19fa94ac593b0a28 AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9859fddc1cfd134ac21be42b9fd93d84118354fa23a2f4b0ec9c67024f571ba7035665302671420221b52f3fc89f24b1af3 SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231 +DIST pip-10.0.1.tar.gz 1246072 BLAKE2B e08607be43e1d7b9c7bbc12dff73bc3170953f48f8f7439a0b27b9d540f23eb3bca7873211a5f1448b5cedd6e8e12983af6fa4666bba3ac4700059d170036733 SHA512 983cce8375ff0304263209c69be16e5be7a58af340b8c3ffddd64fcea130b2f8f8a98305ab31e9c3eed9a0d039c73777c88bde3bf2ea1e184fa3e0a2faa97fd4 DIST pip-7.1.2.tar.gz 1049170 BLAKE2B 1461abba4cb80a9a4e806675ca2d996dedeeb8fb38f05b618f98f400475405da018ea6e75663c21b7b7eb5091408d602a3127afeea9a4bd29f075e5eb8042ad0 SHA512 78082afe6b559bf87f91ae9b6d304cfbfce00206e09be42fdae9d449a55cd8d968df6873e834191d0b0e6baae29e72eb3eee42386ff7c5dc9c29b6c28b754449 DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25 +EBUILD pip-10.0.1.ebuild 1373 BLAKE2B 2eae86d891da493950bb1361207eecb2eb43812fda1b1740f14b40c986c62cd31dd4476ccef0c6c0da0f6df1424a2833dbf97050bad65bc30a7265f8568b4813 SHA512 0410d35d1eb37d6b72d15e6fc824b817cdff232c5742c0abec2e591a7a693531f7c13277f9facbf7a9e10cb5f5580ef04b3d6feb7d0088267978f87de96e9bee EBUILD pip-7.1.2.ebuild 1954 BLAKE2B 2184816bd4e57b368ff1263d76d28c9a7fd191477050482823136c64bfb17c27324ebb0ca3975c6ecc8728de2b5cdcac9379ae8d569786c2859d9aa530d1be38 SHA512 d8a43060130717e744e23c98160fad30073c381ee3c9eeaae97cd9ec09d51f28d988415648ca9fc62771d2f44671b0f33c82dfc794739c1c45d063426c2a82ce EBUILD pip-9.0.1-r1.ebuild 2336 BLAKE2B b0f124285dba096dce9151ad1818429c67c37d7e1ef919d1293c2fd1b19b85e4b56e0f4a228c8d627dda776eceaa26f0c47a7a71e71f71bd9cb8e45523e5e5ff SHA512 74934b66b094369a35ec4bde39ef12b64edc2a8256947ff418f6a01d59d248fef2fc90a7b15c804817d2ae9fcb10a3908aa41884befad5d63cc48806b75738dc EBUILD pip-9.0.1-r2.ebuild 2491 BLAKE2B bd84c826290e1c46b821da2126ee36c60025f60c0b2c33fc45d61cc3b7ae9e4588b90906fbffd8173fadc0a44b5ccdd1084d7ffe95919b0a01fe1af0194762a5 SHA512 adb1f526753d2a08fde8e1d89f56b5fe03928f31168a8a8e8cebc6bef9efa8378c266299ef96240b83619f78062c3ed49fcf572aa90c62ca8146fe929b282250 diff --git a/dev-python/pip/files/pip-10.0.1-disable-system-install.patch b/dev-python/pip/files/pip-10.0.1-disable-system-install.patch new file mode 100644 index 000000000000..776d395b7b94 --- /dev/null +++ b/dev-python/pip/files/pip-10.0.1-disable-system-install.patch @@ -0,0 +1,18 @@ +install: Raise an error to avoid breaking python-exec + +Running pip without --target, --root, or --user will result in packages +being installed systemwide. This has a tendency to break python-exec if +setuptools gets installed or upgraded. + +--- pip-10.0.1/src/pip/_internal/commands/install.py ++++ pip-10.0.1/src/pip/_internal/commands/install.py +@@ -202,6 +202,9 @@ + if options.upgrade: + upgrade_strategy = options.upgrade_strategy + ++ if not options.use_user_site and not options.target_dir and not options.root_path: ++ raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec") ++ + if options.build_dir: + options.build_dir = os.path.abspath(options.build_dir) + diff --git a/dev-python/pip/files/pip-10.0.1-disable-version-check.patch b/dev-python/pip/files/pip-10.0.1-disable-version-check.patch new file mode 100644 index 000000000000..ad146dc1507f --- /dev/null +++ b/dev-python/pip/files/pip-10.0.1-disable-version-check.patch @@ -0,0 +1,19 @@ +Don't check for new versions of pip. + +--- pip-10.0.1/src/pip/_internal/basecommand.py ++++ pip-10.0.1/src/pip/_internal/basecommand.py +@@ -255,14 +255,6 @@ + + return UNKNOWN_ERROR + finally: +- # Check if we're using the latest version of pip available +- if (not options.disable_pip_version_check and not +- getattr(options, "no_index", False)): +- with self._build_session( +- options, +- retries=0, +- timeout=min(5, options.timeout)) as session: +- pip_version_check(session, options) + # Avoid leaking loggers + for handler in set(logging.root.handlers) - original_root_handlers: + # this method benefit from the Logger class internal lock diff --git a/dev-python/pip/pip-10.0.1.ebuild b/dev-python/pip/pip-10.0.1.ebuild new file mode 100644 index 000000000000..1c8ccb3f9a7f --- /dev/null +++ b/dev-python/pip/pip-10.0.1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} ) +PYTHON_REQ_USE="ssl(+),threads(+)" + +inherit eutils bash-completion-r1 distutils-r1 + +DESCRIPTION="Installs python packages -- replacement for easy_install" +HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +SLOT="0" +IUSE="-vanilla" + +# required test data isn't bundled with the tarball +RESTRICT="test" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND}" + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/${PN}-10.0.1-disable-version-check.patch" + ) + if ! use vanilla; then + PATCHES+=( "${FILESDIR}/pip-10.0.1-disable-system-install.patch" ) + fi + distutils-r1_python_prepare_all +} + +python_install_all() { + local DOCS=( AUTHORS.txt docs/*.rst ) + distutils-r1_python_install_all + + COMPLETION="${T}"/completion.tmp + + "${PYTHON}" -m pip completion --bash > "${COMPLETION}" || die + newbashcomp "${COMPLETION}" ${PN} + + "${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die + insinto /usr/share/zsh/site-functions + newins "${COMPLETION}" _pip +} -- cgit v1.2.3