projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0b6c770)
sys-devel/automake: bump to EAPI5. Rework APIVERSION and pkgvdatadir.
authorBenda Xu <heroxbd@gentoo.org>
Thu, 19 May 2016 02:56:36 +0000 (11:56 +0900)
committerBenda Xu <heroxbd@gentoo.org>
Thu, 19 May 2016 02:57:15 +0000 (11:57 +0900)
  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 patch | blob | history
sys-devel/automake/automake-1.11.6-r2.ebuild patch | blob | history
sys-devel/automake/automake-1.12.6-r1.ebuild patch | blob | history
sys-devel/automake/automake-1.12.6.ebuild patch | blob | history
sys-devel/automake/automake-1.13.4-r1.ebuild patch | blob | history
sys-devel/automake/automake-1.13.4.ebuild patch | blob | history
sys-devel/automake/automake-1.14.1-r1.ebuild patch | blob | history
sys-devel/automake/automake-1.14.1.ebuild patch | blob | history
sys-devel/automake/automake-1.15-r1.ebuild patch | blob | history
sys-devel/automake/automake-1.15-r2.ebuild patch | blob | history
sys-devel/automake/automake-1.15.ebuild patch | blob | history

diff --git a/sys-devel/automake/automake-1.11.6-r1.ebuild b/sys-devel/automake/automake-1.11.6-r1.ebuild
index d44e76d09f0239af0a62454f7b3dd7dc6fde2eac..ffbf60d78c6738b5f2ce2cfb5e143784312c58c8 100644 (file)
--- 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 2dd5d8a1b1e21a1326c028de162b9021d5ef2a87..0a179c2dd362934f482f3b202e7109db70d069ca 100644 (file)
--- 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 390ff803f2b63cda94f8c67c481295b547803a28..81eabe05b501f0c9f3a72ef50b7a2004537a077c 100644 (file)
--- 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 d95ffe38d0e0431aceaae3903487a60a1400eb46..e0eeedc1944542218f3d98cf0bcdf377e81956fe 100644 (file)
--- 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 95b445cf65cec3c47510f946dbb4b85ee2ecab8d..ea2349cbecffd08797bdf7df90b36fa82001c7bc 100644 (file)
--- 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 d70d98f5e65a8ff2239678e60ca772ec4e5db3cb..dda4afaaa4150573e2af01c2921baa773a946cc9 100644 (file)
--- 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 ed83e19cb3209685d1511d801f72473c27108ec1..23087e5480f76fb39112f9102dc8ccd4bd9c2071 100644 (file)
--- 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 bf80fd99e37fc12505e9d12933a9d0cbf998ac36..ffc58058a78d8e0e5b7d3dbd5fa6595139a9531a 100644 (file)
--- 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 ed83e19cb3209685d1511d801f72473c27108ec1..23087e5480f76fb39112f9102dc8ccd4bd9c2071 100644 (file)
--- 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 754d52c1f867216a50870f56f56376466f8f203f..24668c53d4859549d3d89f1760f9f67f71e55eda 100644 (file)
--- 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 bf80fd99e37fc12505e9d12933a9d0cbf998ac36..ffc58058a78d8e0e5b7d3dbd5fa6595139a9531a 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.