commit: faa03fe3fae5266bba43bd04317e7122b4459a58
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 09:43:03 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 09:43:03 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=faa03fe3
app-admin/eselect: Import changes from live ebuild
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
app-admin/eselect/ChangeLog | 6 ++++++
.../{eselect-1.4.5-r100.ebuild => eselect-1.4.5-r101.ebuild} | 12 +++++-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index c52d547..1a907f9 100644
--- a/app-admin/eselect/ChangeLog
+++ b/app-admin/eselect/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+*eselect-1.4.5-r101 (17 Aug 2015)
+
+ 17 Aug 2015; Justin Lecher <[email protected]> +eselect-1.4.5-r101.ebuild,
+ -eselect-1.4.5-r100.ebuild:
+ app-admin/eselect: Import changes from live ebuild
+
14 Aug 2015; Justin Lecher <[email protected]>
files/eselect-1.4.5-alternatives.patch:
app-admin/eselect: Update Patch
diff --git a/app-admin/eselect/eselect-1.4.5-r100.ebuild
b/app-admin/eselect/eselect-1.4.5-r101.ebuild
similarity index 90%
rename from app-admin/eselect/eselect-1.4.5-r100.ebuild
rename to app-admin/eselect/eselect-1.4.5-r101.ebuild
index 0d013e2..e37ea64 100644
--- a/app-admin/eselect/eselect-1.4.5-r100.ebuild
+++ b/app-admin/eselect/eselect-1.4.5-r101.ebuild
@@ -50,16 +50,14 @@ src_install() {
# needed by news module
keepdir /var/lib/gentoo/news
- if ! use prefix; then
+ if use prefix; then
+ sed -i \
+
"s:ALTERNATIVESDIR_ROOTLESS=\"${EPREFIX}:ALTERNATIVESDIR_ROOTLESS=\":" \
+ "${ED}"/usr/share/eselect/libs/alternatives-common.bash
|| die
+ else
fowners root:portage /var/lib/gentoo/news
fperms g+w /var/lib/gentoo/news
fi
-
- # band aid for prefix
- if use prefix; then
- cd "${ED}"/usr/share/eselect/libs || die
- sed -i
"s:ALTERNATIVESDIR_ROOTLESS=\"${EPREFIX}:ALTERNATIVESDIR_ROOTLESS=\":"
alternatives.bash || die
- fi
}
pkg_postinst() {
