[gentoo-commits] repo/gentoo:master commit in: dev-util/ctags/

[Fabian Groffen]

commit:     325cbba4bc6e0b361b8e70be75d075558719b39f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 14:48:56 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 14:48:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=325cbba4

dev-util/ctags: merge Prefix changes, bug #586998

Package-Manager: portage-2.2.28

 dev-util/ctags/ctags-5.8-r1.ebuild        | 10 +++++-----
 dev-util/ctags/ctags-5.8_p20140919.ebuild | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-util/ctags/ctags-5.8-r1.ebuild 
b/dev-util/ctags/ctags-5.8-r1.ebuild
index c2fb30b..d0dbce9 100644
--- a/dev-util/ctags/ctags-5.8-r1.ebuild
+++ b/dev-util/ctags/ctags-5.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 IUSE="ada"
 
 RDEPEND="app-eselect/eselect-ctags"
@@ -38,16 +38,16 @@ src_configure() {
                --with-posix-regex \
                --without-readlib \
                --disable-etags \
-               --enable-tmpdir=/tmp
+               --enable-tmpdir="${EPREFIX}"/tmp
 }
 
 src_install() {
-       emake prefix="${D}"/usr mandir="${D}"/usr/share/man install
+       emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
 
        # namepace collision with X/Emacs-provided /usr/bin/ctags -- we
        # rename ctags to exuberant-ctags (Mandrake does this also).
-       mv "${D}"/usr/bin/{ctags,exuberant-ctags} || die
-       mv "${D}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+       mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+       mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
 
        dodoc FAQ NEWS README
        dohtml EXTENDING.html ctags.html

diff --git a/dev-util/ctags/ctags-5.8_p20140919.ebuild 
b/dev-util/ctags/ctags-5.8_p20140919.ebuild
index fbb97bb..6be0df3 100644
--- a/dev-util/ctags/ctags-5.8_p20140919.ebuild
+++ b/dev-util/ctags/ctags-5.8_p20140919.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/universal-ctags/ctags/archive/9fce9dd0afd3dd261c6818
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 IUSE="ada"
 
 RDEPEND="app-eselect/eselect-ctags"
@@ -40,16 +40,16 @@ src_configure() {
                --with-posix-regex \
                --without-readlib \
                --disable-etags \
-               --enable-tmpdir=/tmp
+               --enable-tmpdir="${EPREFIX}"/tmp
 }
 
 src_install() {
-       emake prefix="${D}"/usr mandir="${D}"/usr/share/man install
+       emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
 
        # namepace collision with X/Emacs-provided /usr/bin/ctags -- we
        # rename ctags to exuberant-ctags (Mandrake does this also).
-       mv "${D}"/usr/bin/{ctags,exuberant-ctags} || die
-       mv "${D}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
+       mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
+       mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
 
        dodoc FAQ NEWS README EXTENDING.html
 }