| 1 |
commit: 01b153d645b1ad62bdfa417b12c8c4d15e55aa0b |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 1 09:05:36 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 09:05:44 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b153d6 |
| 7 |
|
| 8 |
dev-util/quilt: add Prefix fixes |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.3 |
| 11 |
|
| 12 |
dev-util/quilt/quilt-0.63.ebuild | 23 ++++++++++++++++------- |
| 13 |
dev-util/quilt/quilt-9999.ebuild | 15 ++++++++++++--- |
| 14 |
2 files changed, 28 insertions(+), 10 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/quilt/quilt-0.63.ebuild b/dev-util/quilt/quilt-0.63.ebuild |
| 17 |
index 519ba67..c21b110 100644 |
| 18 |
--- a/dev-util/quilt/quilt-0.63.ebuild |
| 19 |
+++ b/dev-util/quilt/quilt-0.63.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2014 Gentoo Foundation |
| 22 |
+# Copyright 1999-2017 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
@@ -12,12 +12,14 @@ SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz" |
| 27 |
|
| 28 |
LICENSE="GPL-2" |
| 29 |
SLOT="0" |
| 30 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 31 |
-IUSE="emacs graphviz" |
| 32 |
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris" |
| 33 |
+IUSE="emacs graphviz elibc_Darwin elibc_SunOS" |
| 34 |
|
| 35 |
RDEPEND="sys-apps/ed |
| 36 |
dev-util/diffstat |
| 37 |
graphviz? ( media-gfx/graphviz ) |
| 38 |
+ elibc_Darwin? ( app-misc/getopt ) |
| 39 |
+ elibc_SunOS? ( app-misc/getopt ) |
| 40 |
>=sys-apps/coreutils-8.5" |
| 41 |
|
| 42 |
PDEPEND="emacs? ( app-emacs/quilt-el )" |
| 43 |
@@ -47,18 +49,25 @@ src_prepare() { |
| 44 |
use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch" |
| 45 |
} |
| 46 |
|
| 47 |
+src_configure() { |
| 48 |
+ local myconf="" |
| 49 |
+ [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \ |
| 50 |
+ myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long" |
| 51 |
+ econf ${myconf} |
| 52 |
+} |
| 53 |
+ |
| 54 |
src_install() { |
| 55 |
emake BUILD_ROOT="${D}" install || die "make install failed" |
| 56 |
|
| 57 |
- rm -rf "${D}"/usr/share/doc/${P} |
| 58 |
+ rm -rf "${ED}"/usr/share/doc/${P} |
| 59 |
dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf |
| 60 |
|
| 61 |
- rm -rf "${D}"/etc/bash_completion.d |
| 62 |
+ rm -rf "${ED}"/etc/bash_completion.d |
| 63 |
newbashcomp bash_completion ${PN} |
| 64 |
|
| 65 |
# Remove the compat symlinks |
| 66 |
- rm -rf "${D}"/usr/share/quilt/compat |
| 67 |
+ rm -rf "${ED}"/usr/share/quilt/compat |
| 68 |
|
| 69 |
# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500 |
| 70 |
- rm -rf "${D}"/usr/share/emacs |
| 71 |
+ rm -rf "${ED}"/usr/share/emacs |
| 72 |
} |
| 73 |
|
| 74 |
diff --git a/dev-util/quilt/quilt-9999.ebuild b/dev-util/quilt/quilt-9999.ebuild |
| 75 |
index bd98e70..7990a88 100644 |
| 76 |
--- a/dev-util/quilt/quilt-9999.ebuild |
| 77 |
+++ b/dev-util/quilt/quilt-9999.ebuild |
| 78 |
@@ -1,4 +1,4 @@ |
| 79 |
-# Copyright 1999-2013 Gentoo Foundation |
| 80 |
+# Copyright 1999-2017 Gentoo Foundation |
| 81 |
# Distributed under the terms of the GNU General Public License v2 |
| 82 |
# $Id$ |
| 83 |
|
| 84 |
@@ -17,13 +17,15 @@ HOMEPAGE="https://savannah.nongnu.org/projects/quilt" |
| 85 |
LICENSE="GPL-2" |
| 86 |
SLOT="0" |
| 87 |
[[ ${PV} == 9999 ]] || \ |
| 88 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86" |
| 89 |
-IUSE="graphviz" |
| 90 |
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris" |
| 91 |
+IUSE="graphviz elibc_Darwin elibc_SunOS" |
| 92 |
|
| 93 |
RDEPEND=" |
| 94 |
dev-util/diffstat |
| 95 |
mail-mta/sendmail |
| 96 |
sys-apps/ed |
| 97 |
+ elibc_Darwin? ( app-misc/getopt ) |
| 98 |
+ elibc_SunOS? ( app-misc/getopt ) |
| 99 |
>=sys-apps/coreutils-8.5 |
| 100 |
graphviz? ( media-gfx/graphviz ) |
| 101 |
" |
| 102 |
@@ -36,6 +38,13 @@ src_prepare() { |
| 103 |
rm -rf test/delete.test |
| 104 |
} |
| 105 |
|
| 106 |
+src_configure() { |
| 107 |
+ local myconf="" |
| 108 |
+ [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \ |
| 109 |
+ myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long" |
| 110 |
+ econf ${myconf} |
| 111 |
+} |
| 112 |
+ |
| 113 |
src_install() { |
| 114 |
emake BUILD_ROOT="${ED}" install |
Archives