From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B5D3B139085 for ; Wed, 1 Feb 2017 09:05:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7522A21C06B; Wed, 1 Feb 2017 09:05:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 42E1B21C06B for ; Wed, 1 Feb 2017 09:05:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D457E340A23 for ; Wed, 1 Feb 2017 09:05:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 467FA3D0A for ; Wed, 1 Feb 2017 09:05:48 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1485939944.01b153d645b1ad62bdfa417b12c8c4d15e55aa0b.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/quilt/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/quilt/quilt-0.63.ebuild dev-util/quilt/quilt-9999.ebuild X-VCS-Directories: dev-util/quilt/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 01b153d645b1ad62bdfa417b12c8c4d15e55aa0b X-VCS-Branch: master Date: Wed, 1 Feb 2017 09:05:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 484cfe9b-73e7-4cd8-b40a-8ed35623479c X-Archives-Hash: 4c0c1afb77105be823045b50edc7c17d commit: 01b153d645b1ad62bdfa417b12c8c4d15e55aa0b Author: Fabian Groffen gentoo org> AuthorDate: Wed Feb 1 09:05:36 2017 +0000 Commit: Fabian Groffen gentoo 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