Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/python-updater/files/
Date: Wed, 29 Jun 2016 07:41:19
Message-Id: 1467184385.e13f01d229eec16dc795016631f778e028679cf8.monsieurp@gentoo
1 commit: e13f01d229eec16dc795016631f778e028679cf8
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Jun 28 20:26:36 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 07:13:05 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13f01d2
7
8 app-admin/python-update: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/1789
11
12 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
13
14 .../files/python-updater-0.10-expand-aliases.patch | 11 -----------
15 ...hon-updater-0.10-only-alias-sed-if-exists.patch | 23 ----------------------
16 2 files changed, 34 deletions(-)
17
18 diff --git a/app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch b/app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch
19 deleted file mode 100644
20 index d48e221..0000000
21 --- a/app-admin/python-updater/files/python-updater-0.10-expand-aliases.patch
22 +++ /dev/null
23 @@ -1,11 +0,0 @@
24 ---- python-updater
25 -+++ python-updater
26 -@@ -67,6 +67,8 @@
27 - # Portage variables.
28 - PKG_DBDIR="/var/db/pkg"
29 -
30 -+shopt -s expand_aliases
31 -+
32 - # usage()
33 - # display usage
34 - usage() {
35
36 diff --git a/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch
37 deleted file mode 100644
38 index 20051f5..0000000
39 --- a/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch
40 +++ /dev/null
41 @@ -1,23 +0,0 @@
42 -Only alias sed to /usr/lib/portage/bin/ebuild-helpers/sed if the
43 -latter exists (which should be the case on prefix portages, but not on
44 -normal ones). Fixes fallout from bug #370935 on non-prefix portages.
45 -
46 ---- python-updater
47 -+++ python-updater
48 -@@ -488,8 +488,15 @@
49 - shift
50 - done
51 -
52 -+# On a prefix portage we need to use sed from ebuild-helpers/ instead
53 -+# of $PATH. On non-prefix portages ebuild-helpers/sed does not exist.
54 -+# Prepending ebuild-helpers/ to $PATH uses too many tools from there.
55 -+# So alias sed to ebuild-helpers/sed if it exists:
56 - if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
57 -- alias sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
58 -+ sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
59 -+ if [[ -x "${sed}" ]]; then
60 -+ alias sed="${sed}"
61 -+ fi
62 - fi
63 -
64 - if has_version "=dev-lang/python-2*"; then