vapier      14/11/15 06:07:49

  Modified:             automake-1.7.9-r2.ebuild automake-1.6.3-r1.ebuild
                        automake-1.9.6-r3.ebuild automake-1.4_p6-r1.ebuild
                        automake-1.5-r1.ebuild automake-1.11.6.ebuild
                        automake-1.8.5-r4.ebuild automake-1.10.3.ebuild
                        automake-1.14.1.ebuild automake-1.12.6.ebuild
                        automake-9999.ebuild automake-1.13.4.ebuild
                        ChangeLog
  Log:
  Update to EAPI=4 and unify behavior across versions.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
D2E96200)

Revision  Changes    Path
1.12                 sys-devel/automake/automake-1.7.9-r2.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild?r1=1.11&r2=1.12

Index: automake-1.7.9-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- automake-1.7.9-r2.ebuild    17 Jan 2014 04:23:14 -0000      1.11
+++ automake-1.7.9-r2.ebuild    15 Nov 2014 06:07:49 -0000      1.12
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild,v 1.11 
2014/01/17 04:23:14 vapier Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.7.9-r2.ebuild,v 1.12 
2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,26 +11,25 @@
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.59-r6
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
+       export WANT_AUTOCONF=2.5
        epatch "${FILESDIR}"/${P}-infopage-namechange.patch
        epatch "${FILESDIR}"/${P}-test-fixes.patch
        epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
        epatch "${FILESDIR}"/${P}-libtool-2.patch #257544
        epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
        epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-       export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -61,15 +62,13 @@
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
+       default
        slot_info_pages
        rm -f "${D}"/usr/bin/{aclocal,automake}
 
-       dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
-       local x=
+       local x
        for x in guess sub ; do
                dosym ../gnuconfig/config.${x} 
/usr/share/${PN}-${SLOT}/config.${x}
        done



1.12                 sys-devel/automake/automake-1.6.3-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild?r1=1.11&r2=1.12

Index: automake-1.6.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- automake-1.6.3-r1.ebuild    17 Jan 2014 04:23:14 -0000      1.11
+++ automake-1.6.3-r1.ebuild    15 Nov 2014 06:07:49 -0000      1.12
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild,v 1.11 
2014/01/17 04:23:14 vapier Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.6.3-r1.ebuild,v 1.12 
2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,23 +11,22 @@
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.59-r6
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
+       export WANT_AUTOCONF=2.5
        epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
        epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
        epatch "${FILESDIR}"/${PN}-1.5-CVE-2009-4029.patch #295357
-       export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -58,15 +59,13 @@
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
+       default
        slot_info_pages
        rm -f "${D}"/usr/bin/{aclocal,automake}
 
-       dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
-       local x=
+       local x
        for x in guess sub ; do
                dosym ../gnuconfig/config.${x} 
/usr/share/${PN}-${SLOT}/config.${x}
        done



1.13                 sys-devel/automake/automake-1.9.6-r3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild?r1=1.12&r2=1.13

Index: automake-1.9.6-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- automake-1.9.6-r3.ebuild    17 Jan 2014 04:23:14 -0000      1.12
+++ automake-1.9.6-r3.ebuild    15 Nov 2014 06:07:49 -0000      1.13
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild,v 1.12 
2014/01/17 04:23:14 vapier Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.9.6-r3.ebuild,v 1.13 
2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,21 +11,21 @@
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.59-r6
+       >=sys-devel/autoconf-2.69
        >=sys-apps/texinfo-4.7
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
        sys-apps/help2man"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
+       export WANT_AUTOCONF=2.5
        epatch "${FILESDIR}"/${PN}-1.9.6-infopage-namechange.patch
        epatch "${FILESDIR}"/${P}-include-dir-prefix.patch #107435
        epatch "${FILESDIR}"/${P}-ignore-comments.patch #126388
@@ -31,7 +33,6 @@
        epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
        epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
        epatch "${FILESDIR}"/${PN}-1.8.5-CVE-2009-4029.patch #295357
-       export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -64,7 +65,7 @@
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
+       default
        slot_info_pages
 
        local x
@@ -74,8 +75,6 @@
                rm -f "${D}"/usr/bin/${x}
        done
 
-       dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
        for x in guess sub ; do



1.12                 sys-devel/automake/automake-1.4_p6-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild?rev=1.12&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild?rev=1.12&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild?r1=1.11&r2=1.12

Index: automake-1.4_p6-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- automake-1.4_p6-r1.ebuild   17 Jan 2014 04:23:15 -0000      1.11
+++ automake-1.4_p6-r1.ebuild   15 Nov 2014 06:07:49 -0000      1.12
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild,v 1.11 
2014/01/17 04:23:15 vapier Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild,v 1.12 
2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -10,28 +12,27 @@
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND="dev-lang/perl
-       sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.59-r6
+RDEPEND="dev-lang/perl
+       >=sys-devel/automake-wrapper-9
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
+       export WANT_AUTOCONF=2.5
        epatch "${FILESDIR}"/${PN}-1.4-nls-nuisances.patch #121151
        epatch "${FILESDIR}"/${PN}-1.4-libtoolize.patch
        epatch "${FILESDIR}"/${PN}-1.4-subdirs-89656.patch
        epatch "${FILESDIR}"/${PN}-1.4-ansi2knr-stdlib.patch
        epatch "${FILESDIR}"/${PN}-1.4-CVE-2009-4029.patch #295357
        sed -i 's:error\.test::' tests/Makefile.in #79529
-       export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -66,8 +67,7 @@
 src_install() {
        emake install DESTDIR="${D}" \
                pkgdatadir=/usr/share/automake-${SLOT} \
-               m4datadir=/usr/share/aclocal-${SLOT} \
-               || die
+               m4datadir=/usr/share/aclocal-${SLOT}
        slot_info_pages
        rm -f "${D}"/usr/bin/{aclocal,automake}
        dosym automake-${SLOT} /usr/share/automake



1.16                 sys-devel/automake/automake-1.5-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild?rev=1.16&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild?rev=1.16&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild?r1=1.15&r2=1.16

Index: automake-1.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- automake-1.5-r1.ebuild      17 Jan 2014 04:23:15 -0000      1.15
+++ automake-1.5-r1.ebuild      15 Nov 2014 06:07:49 -0000      1.16
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild,v 
1.15 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.5-r1.ebuild,v 
1.16 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,26 +11,25 @@
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
-DEPEND="dev-lang/perl
+RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.59-r6
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
+       export WANT_AUTOCONF=2.5
        epatch "${FILESDIR}"/automake-1.4-nls-nuisances.patch #121151
        epatch "${FILESDIR}"/${P}-target_hook.patch
        epatch "${FILESDIR}"/${P}-slot.patch
        epatch "${FILESDIR}"/${P}-test-fixes.patch #79505
        epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
        epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-       export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -61,17 +62,15 @@
 }
 
 src_install() {
-       emake install DESTDIR="${D}" || die "make install failed"
+       default
        slot_info_pages
 
-       local x=
+       local x
        for x in aclocal automake ; do
                mv "${D}"/usr/bin/${x}{,-${SLOT}} || die "rename ${x}"
                mv "${D}"/usr/share/${x}{,-${SLOT}} || die "move ${x}"
        done
 
-       dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
        for x in guess sub ; do



1.11                 sys-devel/automake/automake-1.11.6.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild?rev=1.11&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild?rev=1.11&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild?r1=1.10&r2=1.11

Index: automake-1.11.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- automake-1.11.6.ebuild      17 Jan 2014 04:23:15 -0000      1.10
+++ automake-1.11.6.ebuild      15 Nov 2014 06:07:49 -0000      1.11
@@ -1,50 +1,39 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild,v 
1.10 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.11.6.ebuild,v 
1.11 2014/11/15 06:07:49 vapier Exp $
 
-inherit eutils versionator unpacker
+EAPI="4"
 
-if [[ ${PV/_beta} == ${PV} ]]; then
-       MY_P=${P}
-       SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-               ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz";
-else
-       MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
-       MY_P="${PN}-${MY_PV}"
-
-       # Alpha/beta releases are not distributed on the usual mirrors.
-       SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz";
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://www.gnu.org/software/automake/";
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.62
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
        sys-apps/help2man"
 
-src_unpack() {
-       unpacker_src_unpack
-       cd "${S}"
-       chmod a+rx tests/*.test
+src_prepare() {
        export WANT_AUTOCONF=2.5
+       chmod a+rx tests/*.test
+}
+
+src_configure() {
+       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
 }
 
 src_compile() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-       emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+       emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 
        local x
        for x in aclocal automake; do
@@ -83,13 +72,13 @@
 
 src_install() {
        emake DESTDIR="${D}" install \
-               APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || 
die
+               APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
        dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
        rm \
                "${D}"/usr/bin/{aclocal,automake} \
-               "${D}"/usr/share/man/man1/{aclocal,automake}.1
+               "${D}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version



1.13                 sys-devel/automake/automake-1.8.5-r4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild?r1=1.12&r2=1.13

Index: automake-1.8.5-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- automake-1.8.5-r4.ebuild    17 Jan 2014 04:23:15 -0000      1.12
+++ automake-1.8.5-r4.ebuild    15 Nov 2014 06:07:49 -0000      1.13
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild,v 1.12 
2014/01/17 04:23:15 vapier Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.8.5-r4.ebuild,v 1.13 
2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,26 +11,25 @@
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:3}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.59-r6
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
+src_prepare() {
+       export WANT_AUTOCONF=2.5
        epatch "${FILESDIR}"/${PN}-1.8.2-infopage-namechange.patch
        epatch "${FILESDIR}"/${P}-test-fixes.patch #159557
        epatch "${FILESDIR}"/${PN}-1.9.6-aclocal7-test-sleep.patch #197366
        epatch "${FILESDIR}"/${PN}-1.9.6-subst-test.patch #222225
        epatch "${FILESDIR}"/${PN}-1.10-ccnoco-ldflags.patch #203914
        epatch "${FILESDIR}"/${P}-CVE-2009-4029.patch #295357
-       export WANT_AUTOCONF=2.5
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -61,15 +62,13 @@
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
+       default
        slot_info_pages
        rm -f "${D}"/usr/bin/{aclocal,automake}
 
-       dodoc NEWS README THANKS TODO AUTHORS ChangeLog
-
        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
-       local x=
+       local x
        for x in guess sub ; do
                dosym ../gnuconfig/config.${x} 
/usr/share/${PN}-${SLOT}/config.${x}
        done



1.13                 sys-devel/automake/automake-1.10.3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild?r1=1.12&r2=1.13

Index: automake-1.10.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- automake-1.10.3.ebuild      17 Jan 2014 04:23:15 -0000      1.12
+++ automake-1.10.3.ebuild      15 Nov 2014 06:07:49 -0000      1.13
@@ -1,6 +1,8 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild,v 
1.12 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.10.3.ebuild,v 
1.13 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
 inherit eutils
 
@@ -9,27 +11,25 @@
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.60
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
        sys-apps/help2man"
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       chmod a+rx tests/*.test
+src_prepare() {
        export WANT_AUTOCONF=2.5
+       chmod a+rx tests/*.test
 }
 
-src_compile() {
-       econf --docdir=/usr/share/doc/${PF} || die
-       emake || die
+src_configure() {
+       econf --docdir=/usr/share/doc/${PF}
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -62,9 +62,8 @@
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
+       default
        slot_info_pages
-       dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
        # SLOT the docs and junk
        local x



1.4                  sys-devel/automake/automake-1.14.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.14.1.ebuild?rev=1.4&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.14.1.ebuild?rev=1.4&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.14.1.ebuild?r1=1.3&r2=1.4

Index: automake-1.14.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.14.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- automake-1.14.1.ebuild      17 Jan 2014 04:23:15 -0000      1.3
+++ automake-1.14.1.ebuild      15 Nov 2014 06:07:49 -0000      1.4
@@ -1,8 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.14.1.ebuild,v 
1.3 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.14.1.ebuild,v 
1.4 2014/11/15 06:07:49 vapier Exp $
 
-inherit eutils versionator unpacker
+EAPI="4"
+
+inherit eutils versionator
 
 if [[ ${PV/_beta} == ${PV} ]]; then
        MY_P=${P}
@@ -27,26 +29,27 @@
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.62
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
        sys-apps/help2man"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-       unpacker_src_unpack
-       cd "${S}"
+src_prepare() {
        export WANT_AUTOCONF=2.5
 }
 
+src_configure() {
+       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+}
+
 src_compile() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-       emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+       emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 }
 
 src_test() {
-       emake check || die
+       emake check
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -80,7 +83,7 @@
 
 src_install() {
        emake DESTDIR="${D}" install \
-               APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || 
die
+               APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
        rm "${D}"/usr/share/aclocal/README || die
        rmdir "${D}"/usr/share/aclocal || die



1.20                 sys-devel/automake/automake-1.12.6.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.12.6.ebuild?rev=1.20&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.12.6.ebuild?rev=1.20&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.12.6.ebuild?r1=1.19&r2=1.20

Index: automake-1.12.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.6.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- automake-1.12.6.ebuild      17 Jan 2014 04:23:15 -0000      1.19
+++ automake-1.12.6.ebuild      15 Nov 2014 06:07:49 -0000      1.20
@@ -1,23 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.6.ebuild,v 
1.19 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.12.6.ebuild,v 
1.20 2014/11/15 06:07:49 vapier Exp $
 
-inherit eutils versionator unpacker
+EAPI="4"
 
-if [[ ${PV/_beta} == ${PV} ]]; then
-       MY_P=${P}
-       SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-               ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz";
-else
-       MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
-       MY_P="${PN}-${MY_PV}"
-
-       # Alpha/beta releases are not distributed on the usual mirrors.
-       SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz";
-fi
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://www.gnu.org/software/automake/";
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
@@ -27,22 +18,21 @@
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.62
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
        sys-apps/help2man"
 
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-       unpacker_src_unpack
-       cd "${S}"
+src_prepare() {
        export WANT_AUTOCONF=2.5
 }
 
+src_configure() {
+       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+}
+
 src_compile() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-       emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+       emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -76,7 +66,7 @@
 
 src_install() {
        emake DESTDIR="${D}" install \
-               APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || 
die
+               APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
        rm "${D}"/usr/share/aclocal/README || die
        rmdir "${D}"/usr/share/aclocal || die



1.10                 sys-devel/automake/automake-9999.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-9999.ebuild?rev=1.10&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-9999.ebuild?rev=1.10&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-9999.ebuild?r1=1.9&r2=1.10

Index: automake-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- automake-9999.ebuild        24 Dec 2013 06:48:21 -0000      1.9
+++ automake-9999.ebuild        15 Nov 2014 06:07:49 -0000      1.10
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-9999.ebuild,v 
1.9 2013/12/24 06:48:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-9999.ebuild,v 
1.10 2014/11/15 06:07:49 vapier Exp $
+
+EAPI="4"
 
-EAPI="2"
 EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
        http://git.savannah.gnu.org/r/${PN}.git";
 
@@ -13,13 +14,14 @@
 SRC_URI=""
 
 LICENSE="GPL-3"
+# Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
 KEYWORDS=""
 IUSE=""
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.60
+       >=sys-devel/autoconf-2.69
        >=sys-apps/texinfo-4.7
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
@@ -29,13 +31,17 @@
        export WANT_AUTOCONF=2.5
        # Don't try wrapping the autotools this thing runs as it tends
        # to be a bit esoteric, and the script does `set -e` itself.
-       ./bootstrap
+       ./bootstrap.sh
 }
 
 src_configure() {
        econf --docdir=/usr/share/doc/${PF}
 }
 
+src_test() {
+       emake check
+}
+
 # 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,9 +72,8 @@
 }
 
 src_install() {
-       emake DESTDIR="${D}" install || die
+       default
        slot_info_pages
-       dodoc NEWS README THANKS TODO AUTHORS ChangeLog
 
        # SLOT the docs and junk
        local x



1.15                 sys-devel/automake/automake-1.13.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild?rev=1.15&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild?rev=1.15&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild?r1=1.14&r2=1.15

Index: automake-1.13.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- automake-1.13.4.ebuild      17 Jan 2014 04:23:15 -0000      1.14
+++ automake-1.13.4.ebuild      15 Nov 2014 06:07:49 -0000      1.15
@@ -1,23 +1,14 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild,v 
1.14 2014/01/17 04:23:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.13.4.ebuild,v 
1.15 2014/11/15 06:07:49 vapier Exp $
 
-inherit eutils versionator unpacker
+EAPI="4"
 
-if [[ ${PV/_beta} == ${PV} ]]; then
-       MY_P=${P}
-       SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-               ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz";
-else
-       MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
-       MY_P="${PN}-${MY_PV}"
-
-       # Alpha/beta releases are not distributed on the usual mirrors.
-       SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz";
-fi
+inherit eutils
 
 DESCRIPTION="Used to generate Makefile.in from Makefile.am"
 HOMEPAGE="http://www.gnu.org/software/automake/";
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
@@ -27,27 +18,26 @@
 
 RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
-       >=sys-devel/autoconf-2.62
+       >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
        sys-apps/help2man"
 
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-       unpacker_src_unpack
-       cd "${S}"
+src_prepare() {
        export WANT_AUTOCONF=2.5
        epatch "${FILESDIR}"/${PN}-1.13-dyn-ithreads.patch
 }
 
+src_configure() {
+       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true
+}
+
 src_compile() {
-       econf --docdir=/usr/share/doc/${PF} HELP2MAN=true || die
-       emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || die
+       emake APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
 }
 
 src_test() {
-       emake check || die
+       emake check
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
@@ -81,7 +71,7 @@
 
 src_install() {
        emake DESTDIR="${D}" install \
-               APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}" || 
die
+               APIVERSION="${SLOT}" pkgvdatadir="/usr/share/${PN}-${SLOT}"
        slot_info_pages
        rm "${D}"/usr/share/aclocal/README || die
        rmdir "${D}"/usr/share/aclocal || die



1.214                sys-devel/automake/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/ChangeLog?rev=1.214&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/ChangeLog?rev=1.214&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/ChangeLog?r1=1.213&r2=1.214

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- ChangeLog   15 Nov 2014 04:27:29 -0000      1.213
+++ ChangeLog   15 Nov 2014 06:07:49 -0000      1.214
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/automake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.213 
2014/11/15 04:27:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.214 
2014/11/15 06:07:49 vapier Exp $
+
+  15 Nov 2014; Mike Frysinger <[email protected]> automake-1.10.3.ebuild,
+  automake-1.11.6.ebuild, automake-1.12.6.ebuild, automake-1.13.4.ebuild,
+  automake-1.14.1.ebuild, automake-1.4_p6-r1.ebuild, automake-1.5-r1.ebuild,
+  automake-1.6.3-r1.ebuild, automake-1.7.9-r2.ebuild, automake-1.8.5-r4.ebuild,
+  automake-1.9.6-r3.ebuild, automake-9999.ebuild:
+  Update to EAPI=4 and unify behavior across versions.
 
   15 Nov 2014; Mike Frysinger <[email protected]> -automake-1.13.1.ebuild,
   -automake-1.13.2.ebuild, -automake-1.13.3.ebuild, -automake-1.14.ebuild:




Reply via email to