commit: 01b153d645b1ad62bdfa417b12c8c4d15e55aa0b Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Wed Feb 1 09:05:36 2017 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Wed Feb 1 09:05:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b153d6
dev-util/quilt: add Prefix fixes Package-Manager: portage-2.3.3 dev-util/quilt/quilt-0.63.ebuild | 23 ++++++++++++++++------- dev-util/quilt/quilt-9999.ebuild | 15 ++++++++++++--- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dev-util/quilt/quilt-0.63.ebuild b/dev-util/quilt/quilt-0.63.ebuild index 519ba67..c21b110 100644 --- 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 bd98e70..7990a88 100644 --- 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
