dev-util/quilt: add Prefix fixes

Package-Manager: portage-2.3.3

diff --git a/dev-util/quilt/quilt-0.63.ebuild b/dev-util/quilt/quilt-0.63.ebuild
index 519ba671a6fb9d833e77537b59d6efcc4a9c271b..c21b11099d852d22c97dac831ce1d89233c64950 100644 (file)
--- a/dev-util/quilt/quilt-0.63.ebuild
+++ b/dev-util/quilt/quilt-0.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,12 +12,14 @@ SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="emacs graphviz"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
 
 RDEPEND="sys-apps/ed
        dev-util/diffstat
        graphviz? ( media-gfx/graphviz )
+       elibc_Darwin? ( app-misc/getopt )
+       elibc_SunOS? ( app-misc/getopt )
        >=sys-apps/coreutils-8.5"
 
 PDEPEND="emacs? ( app-emacs/quilt-el )"
@@ -47,18 +49,25 @@ src_prepare() {
        use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
 }
 
+src_configure() {
+       local myconf=""
+       [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
+               myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
+       econf ${myconf}
+}
+
 src_install() {
        emake BUILD_ROOT="${D}" install || die "make install failed"
 
-       rm -rf "${D}"/usr/share/doc/${P}
+       rm -rf "${ED}"/usr/share/doc/${P}
        dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf
 
-       rm -rf "${D}"/etc/bash_completion.d
+       rm -rf "${ED}"/etc/bash_completion.d
        newbashcomp bash_completion ${PN}
 
        # Remove the compat symlinks
-       rm -rf "${D}"/usr/share/quilt/compat
+       rm -rf "${ED}"/usr/share/quilt/compat
 
        # Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-       rm -rf "${D}"/usr/share/emacs
+       rm -rf "${ED}"/usr/share/emacs
 }

diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild
index bd98e706f7f07a66e577a1f4b656fff860df4a65..7990a886d546ea83bf5c01cea7bc989c67c3e011 100644 (file)
--- a/dev-util/quilt/quilt-9999.ebuild
+++ b/dev-util/quilt/quilt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,13 +17,15 @@ HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
 LICENSE="GPL-2"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="graphviz"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="graphviz elibc_Darwin elibc_SunOS"
 
 RDEPEND="
        dev-util/diffstat
        mail-mta/sendmail
        sys-apps/ed
+       elibc_Darwin? ( app-misc/getopt )
+       elibc_SunOS? ( app-misc/getopt )
        >=sys-apps/coreutils-8.5
        graphviz? ( media-gfx/graphviz )
 "
@@ -36,6 +38,13 @@ src_prepare() {
        rm -rf test/delete.test
 }
 
+src_configure() {
+       local myconf=""
+       [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
+               myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
+       econf ${myconf}
+}
+
 src_install() {
        emake BUILD_ROOT="${ED}" install