| 1 |
commit: 6445144178aa9c9c2b355ae83d5ed51b6d558b8e |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 3 07:41:35 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 3 07:41:35 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=64451441 |
| 7 |
|
| 8 |
app-admin/eselect: Update to latest alternatives patch |
| 9 |
|
| 10 |
Github: closes gentoo-science/sci#453 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.25 |
| 13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 14 |
|
| 15 |
...select-1.4.5-r102.ebuild => eselect-1.4.5-r103.ebuild} | 0 |
| 16 |
app-admin/eselect/files/eselect-1.4.5-alternatives.patch | 15 ++++++++------- |
| 17 |
2 files changed, 8 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-admin/eselect/eselect-1.4.5-r102.ebuild b/app-admin/eselect/eselect-1.4.5-r103.ebuild |
| 20 |
similarity index 100% |
| 21 |
rename from app-admin/eselect/eselect-1.4.5-r102.ebuild |
| 22 |
rename to app-admin/eselect/eselect-1.4.5-r103.ebuild |
| 23 |
|
| 24 |
diff --git a/app-admin/eselect/files/eselect-1.4.5-alternatives.patch b/app-admin/eselect/files/eselect-1.4.5-alternatives.patch |
| 25 |
index 8296aa1..699f17b 100644 |
| 26 |
--- a/app-admin/eselect/files/eselect-1.4.5-alternatives.patch |
| 27 |
+++ b/app-admin/eselect/files/eselect-1.4.5-alternatives.patch |
| 28 |
@@ -1,12 +1,12 @@ |
| 29 |
bin/Makefile.am | 1 + |
| 30 |
bin/eselect.in | 150 +++++++++++- |
| 31 |
libs/Makefile.am | 7 +- |
| 32 |
- libs/alternatives-common.bash.in | 509 +++++++++++++++++++++++++++++++++++++++ |
| 33 |
+ libs/alternatives-common.bash.in | 510 +++++++++++++++++++++++++++++++++++++++ |
| 34 |
libs/alternatives.bash.in | 316 ++++++++++++++++++++++++ |
| 35 |
modules/Makefile.am | 1 + |
| 36 |
modules/alternatives.eselect | 178 ++++++++++++++ |
| 37 |
modules/modules.eselect | 288 ++++++++++++++-------- |
| 38 |
- 8 files changed, 1342 insertions(+), 108 deletions(-) |
| 39 |
+ 8 files changed, 1343 insertions(+), 108 deletions(-) |
| 40 |
|
| 41 |
diff --git a/bin/Makefile.am b/bin/Makefile.am |
| 42 |
index 20902c1..ad08867 100644 |
| 43 |
@@ -251,10 +251,10 @@ index 027ef73..a5fe373 100644 |
| 44 |
@$(dosed) $< > $@ |
| 45 |
diff --git a/libs/alternatives-common.bash.in b/libs/alternatives-common.bash.in |
| 46 |
new file mode 100644 |
| 47 |
-index 0000000..024d41e |
| 48 |
+index 0000000..10d6616 |
| 49 |
--- /dev/null |
| 50 |
+++ b/libs/alternatives-common.bash.in |
| 51 |
-@@ -0,0 +1,509 @@ |
| 52 |
+@@ -0,0 +1,510 @@ |
| 53 |
+# Copyright (c) 2005-2015 Gentoo Foundation |
| 54 |
+# Copyright (c) 2008 Mike Kelly |
| 55 |
+# Copyright (c) 2009-2013 David Leverton |
| 56 |
@@ -277,7 +277,8 @@ index 0000000..024d41e |
| 57 |
+inherit config output path-manipulation tests |
| 58 |
+ |
| 59 |
+: "${ALTERNATIVESDIR_ROOTLESS:=@sysconfdir@/env.d/alternatives}" |
| 60 |
-+ALTERNATIVESDIR="${EROOT%/}${ALTERNATIVESDIR_ROOTLESS}" |
| 61 |
++: "${ALTERNATIVESDIR_ROOT:=${ROOT%/}}" |
| 62 |
++ALTERNATIVESDIR="${ALTERNATIVESDIR_ROOT}${ALTERNATIVESDIR_ROOTLESS}" |
| 63 |
+ |
| 64 |
+get_current_provider() { |
| 65 |
+ local dieprefix="Could not determine current provider for ${ALTERNATIVE}" |
| 66 |
@@ -467,7 +468,7 @@ index 0000000..024d41e |
| 67 |
+ old_i+=1 |
| 68 |
+ |
| 69 |
+ else |
| 70 |
-+ local target=${ALTERNATIVESDIR_ROOTLESS#/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*} |
| 71 |
++ local target=${ALTERNATIVESDIR_ROOTLESS#${EPREFIX}/}/${ALTERNATIVE}/_current${newsymlinks[new_i]} dir=${newsymlinks[new_i]%/*} |
| 72 |
+ while [[ -n ${dir} ]]; do |
| 73 |
+ target=../${target} |
| 74 |
+ dir=${dir%/*} |
| 75 |
@@ -563,7 +564,7 @@ index 0000000..024d41e |
| 76 |
+ if [[ ${src} != /* ]]; then |
| 77 |
+ die "Source path must be absolute, but got ${src}" |
| 78 |
+ else |
| 79 |
-+ local reltarget= dir=${provider_dir}${src%/*} |
| 80 |
++ local reltarget= dir=${provider_dir#${ALTERNATIVESDIR_ROOT}${EPREFIX}}${src%/*} |
| 81 |
+ while [[ -n ${dir} ]]; do |
| 82 |
+ reltarget+=../ |
| 83 |
+ dir=${dir%/*} |
Archives