commit: 698a23d83720989123978eb212b387bc5fe96e4a Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Jan 4 04:28:30 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Jan 4 04:28:30 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=698a23d8
dev-python/pip: disable systemwide installs Bug: https://bugs.gentoo.org/553762 Package-Manager: Portage-2.3.3_p13, Repoman-2.3.1_p6 .../pip/files/pip-disable-system-install.patch | 29 ++++++++++++++++++++++ .../pip/{pip-9.0.1.ebuild => pip-9.0.1-r1.ebuild} | 12 ++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dev-python/pip/files/pip-disable-system-install.patch b/dev-python/pip/files/pip-disable-system-install.patch new file mode 100644 index 00000000..9e57245 --- /dev/null +++ b/dev-python/pip/files/pip-disable-system-install.patch @@ -0,0 +1,29 @@ +From 847553da616edabede18c69ba640a32b719b45a8 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <flop...@gentoo.org> +Date: Tue, 27 Oct 2015 12:20:44 -0400 +Subject: [PATCH] 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/commands/install.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pip/commands/install.py b/pip/commands/install.py +index 46cd9f2..36b72f2 100644 +--- a/pip/commands/install.py ++++ b/pip/commands/install.py +@@ -204,6 +204,9 @@ class InstallCommand(RequirementCommand): + ) + options.ignore_installed = True + ++ 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) + +-- +2.6.2 + diff --git a/dev-python/pip/pip-9.0.1.ebuild b/dev-python/pip/pip-9.0.1-r1.ebuild similarity index 93% rename from dev-python/pip/pip-9.0.1.ebuild rename to dev-python/pip/pip-9.0.1-r1.ebuild index 8cd1b05..4affc43 100644 --- a/dev-python/pip/pip-9.0.1.ebuild +++ b/dev-python/pip/pip-9.0.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -58,12 +58,10 @@ RESTRICT="test" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="${DEPEND}" -src_prepare() { - epatch "${FILESDIR}"/${PN}-9.0.1-disable-version-check.patch - - distutils-r1_src_prepare - eapply_user -} +PATCHES=( + "${FILESDIR}/pip-disable-system-install.patch" + "${FILESDIR}/${PN}-9.0.1-disable-version-check.patch" +) python_install_all() { local DOCS=( AUTHORS.txt docs/*.rst )
