aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-08-17 11:43:03 +0200
committerJustin Lecher <jlec@gentoo.org>2015-08-17 11:43:03 +0200
commitfaa03fe3fae5266bba43bd04317e7122b4459a58 (patch)
treea22cb2d42765e230de92a1e9bd69295ed41175ee /app-admin
parentConvert all $Header$ to $Id$ tags as it has be done in gentoo.git (diff)
downloadsci-faa03fe3fae5266bba43bd04317e7122b4459a58.tar.gz
sci-faa03fe3fae5266bba43bd04317e7122b4459a58.tar.bz2
sci-faa03fe3fae5266bba43bd04317e7122b4459a58.zip
app-admin/eselect: Import changes from live ebuild
Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/eselect/ChangeLog6
-rw-r--r--app-admin/eselect/eselect-1.4.5-r101.ebuild (renamed from app-admin/eselect/eselect-1.4.5-r100.ebuild)12
2 files changed, 11 insertions, 7 deletions
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog
index c52d547eb..1a907f951 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 <jlec@gentoo.org> +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 <jlec@gentoo.org>
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
index 0d013e214..e37ea64b7 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() {