From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D4961138262 for ; Thu, 19 May 2016 02:57:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5E9C921C03C; Thu, 19 May 2016 02:57:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D12D621C03C for ; Thu, 19 May 2016 02:57:47 +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 3E58D340A67 for ; Thu, 19 May 2016 02:57:46 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 57C8F964 for ; Thu, 19 May 2016 02:57:42 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1463626635.3b1ee209046b554b13e61e6f6056c2b072d5d684.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/automake/automake-1.11.6-r1.ebuild sys-devel/automake/automake-1.11.6-r2.ebuild sys-devel/automake/automake-1.12.6-r1.ebuild sys-devel/automake/automake-1.12.6.ebuild sys-devel/automake/automake-1.13.4-r1.ebuild sys-devel/automake/automake-1.13.4.ebuild sys-devel/automake/automake-1.14.1-r1.ebuild sys-devel/automake/automake-1.14.1.ebuild sys-devel/automake/automake-1.15-r1.ebuild sys-devel/automake/automake-1.15-r2.ebuild sys-devel/automake/automake-1.15.ebuild X-VCS-Directories: sys-devel/automake/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 3b1ee209046b554b13e61e6f6056c2b072d5d684 X-VCS-Branch: master Date: Thu, 19 May 2016 02:57:42 +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: 686b28a7-11eb-4515-959d-ed668689c165 X-Archives-Hash: 5bf4a4a3b9865b5985bf4c7ed9a53f70 commit: 3b1ee209046b554b13e61e6f6056c2b072d5d684 Author: Benda Xu gentoo org> AuthorDate: Thu May 19 02:56:36 2016 +0000 Commit: Benda XU gentoo org> CommitDate: Thu May 19 02:57:15 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b1ee209 sys-devel/automake: bump to EAPI5. Rework APIVERSION and pkgvdatadir. Patch configure to leverage defaults of src_compile and src_install. pkgvdatadir now implicitly respects EPREFIX. Bug: 582734 Package-Manager: portage-2.2.28 sys-devel/automake/automake-1.11.6-r1.ebuild | 11 +++++------ sys-devel/automake/automake-1.11.6-r2.ebuild | 11 +++++------ sys-devel/automake/automake-1.12.6-r1.ebuild | 15 +++++---------- sys-devel/automake/automake-1.12.6.ebuild | 15 +++++---------- sys-devel/automake/automake-1.13.4-r1.ebuild | 15 +++++---------- sys-devel/automake/automake-1.13.4.ebuild | 15 +++++---------- sys-devel/automake/automake-1.14.1-r1.ebuild | 15 +++++---------- sys-devel/automake/automake-1.14.1.ebuild | 15 +++++---------- sys-devel/automake/automake-1.15-r1.ebuild | 15 +++++---------- sys-devel/automake/automake-1.15-r2.ebuild | 15 +++++---------- sys-devel/automake/automake-1.15.ebuild | 15 +++++---------- 11 files changed, 55 insertions(+), 102 deletions(-) diff --git a/sys-devel/automake/automake-1.11.6-r1.ebuild b/sys-devel/automake/automake-1.11.6-r1.ebuild index d44e76d..ffbf60d 100644 --- a/sys-devel/automake/automake-1.11.6-r1.ebuild +++ b/sys-devel/automake/automake-1.11.6-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils @@ -27,6 +27,7 @@ src_prepare() { export WANT_AUTOCONF=2.5 epatch "${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453 chmod a+rx tests/*.test + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { @@ -34,7 +35,7 @@ src_configure() { } src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default local x for x in aclocal automake; do @@ -72,10 +73,8 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default slot_info_pages - dodoc NEWS README THANKS TODO AUTHORS ChangeLog rm \ "${ED}"/usr/bin/{aclocal,automake} \ diff --git a/sys-devel/automake/automake-1.11.6-r2.ebuild b/sys-devel/automake/automake-1.11.6-r2.ebuild index 2dd5d8a..0a179c2 100644 --- a/sys-devel/automake/automake-1.11.6-r2.ebuild +++ b/sys-devel/automake/automake-1.11.6-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils @@ -29,6 +29,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch chmod a+rx tests/*.test export HELP2MAN=true + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { @@ -36,7 +37,7 @@ src_configure() { } src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default local x for x in aclocal automake; do @@ -74,10 +75,8 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default slot_info_pages - dodoc NEWS README THANKS TODO AUTHORS ChangeLog rm \ "${ED}"/usr/bin/{aclocal,automake} \ diff --git a/sys-devel/automake/automake-1.12.6-r1.ebuild b/sys-devel/automake/automake-1.12.6-r1.ebuild index 390ff80..81eabe0 100644 --- a/sys-devel/automake/automake-1.12.6-r1.ebuild +++ b/sys-devel/automake/automake-1.12.6-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils @@ -26,16 +26,13 @@ DEPEND="${RDEPEND} src_prepare() { export WANT_AUTOCONF=2.5 epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { econf --docdir="\$(datarootdir)/doc/${PF}" } -src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" -} - # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { @@ -66,13 +63,11 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default + slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die - dodoc AUTHORS ChangeLog NEWS README THANKS - rm \ "${ED}"/usr/bin/{aclocal,automake} \ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die diff --git a/sys-devel/automake/automake-1.12.6.ebuild b/sys-devel/automake/automake-1.12.6.ebuild index d95ffe3..e0eeedc 100644 --- a/sys-devel/automake/automake-1.12.6.ebuild +++ b/sys-devel/automake/automake-1.12.6.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils @@ -25,16 +25,13 @@ DEPEND="${RDEPEND} src_prepare() { export WANT_AUTOCONF=2.5 + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { econf --docdir="\$(datarootdir)/doc/${PF}" } -src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" -} - # slot the info pages. do this w/out munging the source so we don't have # to depend on texinfo to regen things. #464146 (among others) slot_info_pages() { @@ -65,13 +62,11 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default + slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die - dodoc AUTHORS ChangeLog NEWS README THANKS - rm \ "${ED}"/usr/bin/{aclocal,automake} \ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die diff --git a/sys-devel/automake/automake-1.13.4-r1.ebuild b/sys-devel/automake/automake-1.13.4-r1.ebuild index 95b445c..ea2349c 100644 --- a/sys-devel/automake/automake-1.13.4-r1.ebuild +++ b/sys-devel/automake/automake-1.13.4-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils @@ -27,16 +27,13 @@ src_prepare() { export WANT_AUTOCONF=2.5 epatch "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch epatch "${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket.patch + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { econf --docdir="\$(datarootdir)/doc/${PF}" } -src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" -} - src_test() { emake check } @@ -71,13 +68,11 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default + slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die - dodoc AUTHORS ChangeLog NEWS README THANKS - rm \ "${ED}"/usr/bin/{aclocal,automake} \ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die diff --git a/sys-devel/automake/automake-1.13.4.ebuild b/sys-devel/automake/automake-1.13.4.ebuild index d70d98f..dda4afa 100644 --- a/sys-devel/automake/automake-1.13.4.ebuild +++ b/sys-devel/automake/automake-1.13.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils @@ -26,16 +26,13 @@ DEPEND="${RDEPEND} src_prepare() { export WANT_AUTOCONF=2.5 epatch "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { econf --docdir="\$(datarootdir)/doc/${PF}" } -src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" -} - src_test() { emake check } @@ -70,13 +67,11 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default + slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die - dodoc AUTHORS ChangeLog NEWS README THANKS - rm \ "${ED}"/usr/bin/{aclocal,automake} \ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die diff --git a/sys-devel/automake/automake-1.14.1-r1.ebuild b/sys-devel/automake/automake-1.14.1-r1.ebuild index ed83e19..23087e5 100644 --- a/sys-devel/automake/automake-1.14.1-r1.ebuild +++ b/sys-devel/automake/automake-1.14.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils versionator @@ -39,16 +39,13 @@ S="${WORKDIR}/${MY_P}" src_prepare() { export WANT_AUTOCONF=2.5 epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { econf --docdir="\$(datarootdir)/doc/${PF}" } -src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" -} - src_test() { emake check } @@ -83,13 +80,11 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default + slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die - dodoc AUTHORS ChangeLog NEWS README THANKS - rm \ "${ED}"/usr/bin/{aclocal,automake} \ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die diff --git a/sys-devel/automake/automake-1.14.1.ebuild b/sys-devel/automake/automake-1.14.1.ebuild index bf80fd9..ffc5805 100644 --- a/sys-devel/automake/automake-1.14.1.ebuild +++ b/sys-devel/automake/automake-1.14.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils versionator @@ -38,16 +38,13 @@ S="${WORKDIR}/${MY_P}" src_prepare() { export WANT_AUTOCONF=2.5 + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { econf --docdir="\$(datarootdir)/doc/${PF}" } -src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" -} - src_test() { emake check } @@ -82,13 +79,11 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default + slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die - dodoc AUTHORS ChangeLog NEWS README THANKS - rm \ "${ED}"/usr/bin/{aclocal,automake} \ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die diff --git a/sys-devel/automake/automake-1.15-r1.ebuild b/sys-devel/automake/automake-1.15-r1.ebuild index ed83e19..23087e5 100644 --- a/sys-devel/automake/automake-1.15-r1.ebuild +++ b/sys-devel/automake/automake-1.15-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils versionator @@ -39,16 +39,13 @@ S="${WORKDIR}/${MY_P}" src_prepare() { export WANT_AUTOCONF=2.5 epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { econf --docdir="\$(datarootdir)/doc/${PF}" } -src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" -} - src_test() { emake check } @@ -83,13 +80,11 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default + slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die - dodoc AUTHORS ChangeLog NEWS README THANKS - rm \ "${ED}"/usr/bin/{aclocal,automake} \ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die diff --git a/sys-devel/automake/automake-1.15-r2.ebuild b/sys-devel/automake/automake-1.15-r2.ebuild index 754d52c..24668c5 100644 --- a/sys-devel/automake/automake-1.15-r2.ebuild +++ b/sys-devel/automake/automake-1.15-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils versionator @@ -40,16 +40,13 @@ src_prepare() { export WANT_AUTOCONF=2.5 epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch epatch "${FILESDIR}"/${PN}-1.15-mdate-tz.patch #520818 #574492 + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { econf --docdir="\$(datarootdir)/doc/${PF}" } -src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" -} - src_test() { emake check } @@ -84,13 +81,11 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default + slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die - dodoc AUTHORS ChangeLog NEWS README THANKS - rm \ "${ED}"/usr/bin/{aclocal,automake} \ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die diff --git a/sys-devel/automake/automake-1.15.ebuild b/sys-devel/automake/automake-1.15.ebuild index bf80fd9..ffc5805 100644 --- a/sys-devel/automake/automake-1.15.ebuild +++ b/sys-devel/automake/automake-1.15.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="4" +EAPI="5" inherit eutils versionator @@ -38,16 +38,13 @@ S="${WORKDIR}/${MY_P}" src_prepare() { export WANT_AUTOCONF=2.5 + sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die } src_configure() { econf --docdir="\$(datarootdir)/doc/${PF}" } -src_compile() { - emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" -} - src_test() { emake check } @@ -82,13 +79,11 @@ slot_info_pages() { } src_install() { - emake DESTDIR="${D}" install \ - APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" + default + slot_info_pages rm "${ED}"/usr/share/aclocal/README || die rmdir "${ED}"/usr/share/aclocal || die - dodoc AUTHORS ChangeLog NEWS README THANKS - rm \ "${ED}"/usr/bin/{aclocal,automake} \ "${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die