diff options
Diffstat (limited to 'app-admin/eselect')
| -rw-r--r-- | app-admin/eselect/ChangeLog | 10 | ||||
| -rw-r--r-- | app-admin/eselect/eselect-1.3.2-r1.ebuild (renamed from app-admin/eselect/eselect-1.3.2.ebuild) | 8 | ||||
| -rw-r--r-- | app-admin/eselect/files/eselect-1.3.2-eroot.patch | 11 |
3 files changed, 26 insertions, 3 deletions
diff --git a/app-admin/eselect/ChangeLog b/app-admin/eselect/ChangeLog index 2581b7311001..1cce4aaf651e 100644 --- a/app-admin/eselect/ChangeLog +++ b/app-admin/eselect/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-admin/eselect # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.208 2012/09/13 17:11:50 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/ChangeLog,v 1.209 2012/09/14 21:22:34 ulm Exp $ + +*eselect-1.3.2-r1 (14 Sep 2012) + + 14 Sep 2012; Ulrich Müller <ulm@gentoo.org> -eselect-1.3.2.ebuild, + +eselect-1.3.2-r1.ebuild, +files/eselect-1.3.2-eroot.patch: + Remove trailing backslash from ROOT only if EPREFIX is set. This guarantees + that EROOT is equal to ROOT for empty EPREFIX, which is assumed by at least + one external module. See also bug 434956. *eselect-1.3.2 (13 Sep 2012) diff --git a/app-admin/eselect/eselect-1.3.2.ebuild b/app-admin/eselect/eselect-1.3.2-r1.ebuild index 3bb334a94213..84f37080ca4c 100644 --- a/app-admin/eselect/eselect-1.3.2.ebuild +++ b/app-admin/eselect/eselect-1.3.2-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.2.ebuild,v 1.1 2012/09/13 17:11:50 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.2-r1.ebuild,v 1.1 2012/09/14 21:22:34 ulm Exp $ EAPI=3 -inherit bash-completion-r1 +inherit eutils bash-completion-r1 DESCRIPTION="Gentoo's multi-purpose configuration and management tool" HOMEPAGE="http://www.gentoo.org/proj/en/eselect/" @@ -33,6 +33,10 @@ RDEPEND="!app-admin/eselect-news #PDEPEND="emacs? ( app-emacs/gentoo-syntax ) # vim-syntax? ( app-vim/eselect-syntax )" +src_prepare() { + epatch "${FILESDIR}/${P}-eroot.patch" +} + src_compile() { emake || die diff --git a/app-admin/eselect/files/eselect-1.3.2-eroot.patch b/app-admin/eselect/files/eselect-1.3.2-eroot.patch new file mode 100644 index 000000000000..81e5bb65e8a8 --- /dev/null +++ b/app-admin/eselect/files/eselect-1.3.2-eroot.patch @@ -0,0 +1,11 @@ +--- a/bin/eselect.in ++++ b/bin/eselect.in +@@ -43,7 +43,7 @@ + + # Support variables for Gentoo Prefix + EPREFIX="@EPREFIX@" +-EROOT="${ROOT%/}${EPREFIX}" ++EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}" + + # Remove all alias definitions. Unset functions and variables that are + # known to cause trouble. |