vapier      14/11/15 06:21:57

  Modified:             automake-1.4_p6-r1.ebuild ChangeLog
  Added:                automake-1.8.5-r5.ebuild automake-1.6.3-r2.ebuild
                        automake-1.7.9-r3.ebuild automake-1.9.6-r4.ebuild
                        automake-1.5-r2.ebuild
  Removed:              automake-1.7.9-r2.ebuild automake-1.8.5-r4.ebuild
                        automake-1.9.6-r3.ebuild automake-1.6.3-r1.ebuild
                        automake-1.5-r1.ebuild
  Log:
  Backport fix from upstream for warnings when using perl-5.11+.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --force, signed 
Manifest commit with key D2E96200)

Revision  Changes    Path
1.13                 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.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild?r1=1.12&r2=1.13

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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- automake-1.4_p6-r1.ebuild   15 Nov 2014 06:07:49 -0000      1.12
+++ automake-1.4_p6-r1.ebuild   15 Nov 2014 06:21:57 -0000      1.13
@@ -1,6 +1,6 @@
 # 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.12 
2014/11/15 06:07:49 vapier Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sys-devel/automake/automake-1.4_p6-r1.ebuild,v 1.13 
2014/11/15 06:21:57 vapier Exp $
 
 EAPI="4"
 
@@ -32,6 +32,7 @@
        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
+       epatch "${FILESDIR}"/${PN}-1.4-perl-5.11.patch
        sed -i 's:error\.test::' tests/Makefile.in #79529
 }
 



1.215                sys-devel/automake/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- ChangeLog   15 Nov 2014 06:07:49 -0000      1.214
+++ ChangeLog   15 Nov 2014 06:21:57 -0000      1.215
@@ -1,6 +1,22 @@
 # 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.214 
2014/11/15 06:07:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake/ChangeLog,v 1.215 
2014/11/15 06:21:57 vapier Exp $
+
+*automake-1.8.5-r5 (15 Nov 2014)
+*automake-1.5-r2 (15 Nov 2014)
+*automake-1.7.9-r3 (15 Nov 2014)
+*automake-1.9.6-r4 (15 Nov 2014)
+*automake-1.6.3-r2 (15 Nov 2014)
+
+  15 Nov 2014; Mike Frysinger <[email protected]> +automake-1.5-r2.ebuild,
+  +automake-1.6.3-r2.ebuild, +automake-1.7.9-r3.ebuild,
+  +automake-1.8.5-r5.ebuild, +automake-1.9.6-r4.ebuild,
+  +files/automake-1.4-perl-5.11.patch, +files/automake-1.5-perl-5.11.patch,
+  +files/automake-1.8-perl-5.11.patch, -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-1.4_p6-r1.ebuild:
+  Backport fix from upstream for warnings when using perl-5.11+.
 
   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,



1.1                  sys-devel/automake/automake-1.8.5-r5.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.8.5-r5.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.8.5-r5.ebuild?rev=1.1&content-type=text/plain

Index: automake-1.8.5-r5.ebuild
===================================================================
# 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-r5.ebuild,v 1.1 
2014/11/15 06:21:57 vapier Exp $

EAPI="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.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.69
        sys-devel/gnuconfig"
DEPEND="${RDEPEND}"

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
        epatch "${FILESDIR}"/${PN}-1.8-perl-5.11.patch
}

# 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() {
        pushd "${D}"/usr/share/info >/dev/null
        rm -f dir

        # Rewrite all the references to other pages.
        # before: * aclocal-invocation: (automake)aclocal Invocation.   
Generating aclocal.m4.
        # after:  * aclocal-invocation v1.13: (automake-1.13)aclocal 
Invocation.   Generating aclocal.m4.
        local p pages=( *.info ) args=()
        for p in "${pages[@]/%.info}" ; do
                args+=(
                        -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: 
(${p})| v${SLOT}&|"
                        -e "s:(${p}):(${p}-${SLOT}):g"
                )
        done
        sed -i "${args[@]}" * || die

        # Rewrite all the file references, and rename them in the process.
        local f d
        for f in * ; do
                d=${f/.info/-${SLOT}.info}
                mv "${f}" "${d}" || die
                sed -i -e "s:${f}:${d}:g" * || die
        done

        popd >/dev/null
}

src_install() {
        default
        slot_info_pages
        rm -f "${D}"/usr/bin/{aclocal,automake}

        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
        local x
        for x in guess sub ; do
                dosym ../gnuconfig/config.${x} 
/usr/share/${PN}-${SLOT}/config.${x}
        done
}



1.1                  sys-devel/automake/automake-1.6.3-r2.ebuild

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

Index: automake-1.6.3-r2.ebuild
===================================================================
# 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-r2.ebuild,v 1.1 
2014/11/15 06:21:57 vapier Exp $

EAPI="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.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.69
        sys-devel/gnuconfig"
DEPEND="${RDEPEND}"

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
        epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch
}

# 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() {
        pushd "${D}"/usr/share/info >/dev/null
        rm -f dir

        # Rewrite all the references to other pages.
        # before: * aclocal-invocation: (automake)aclocal Invocation.   
Generating aclocal.m4.
        # after:  * aclocal-invocation v1.13: (automake-1.13)aclocal 
Invocation.   Generating aclocal.m4.
        local p pages=( *.info ) args=()
        for p in "${pages[@]/%.info}" ; do
                args+=(
                        -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: 
(${p})| v${SLOT}&|"
                        -e "s:(${p}):(${p}-${SLOT}):g"
                )
        done
        sed -i "${args[@]}" * || die

        # Rewrite all the file references, and rename them in the process.
        local f d
        for f in * ; do
                d=${f/.info/-${SLOT}.info}
                mv "${f}" "${d}" || die
                sed -i -e "s:${f}:${d}:g" * || die
        done

        popd >/dev/null
}

src_install() {
        default
        slot_info_pages
        rm -f "${D}"/usr/bin/{aclocal,automake}

        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
        local x
        for x in guess sub ; do
                dosym ../gnuconfig/config.${x} 
/usr/share/${PN}-${SLOT}/config.${x}
        done
}



1.1                  sys-devel/automake/automake-1.7.9-r3.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.7.9-r3.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.7.9-r3.ebuild?rev=1.1&content-type=text/plain

Index: automake-1.7.9-r3.ebuild
===================================================================
# 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-r3.ebuild,v 1.1 
2014/11/15 06:21:57 vapier Exp $

EAPI="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.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.69
        sys-devel/gnuconfig"
DEPEND="${RDEPEND}"

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
        epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch
}

# 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() {
        pushd "${D}"/usr/share/info >/dev/null
        rm -f dir

        # Rewrite all the references to other pages.
        # before: * aclocal-invocation: (automake)aclocal Invocation.   
Generating aclocal.m4.
        # after:  * aclocal-invocation v1.13: (automake-1.13)aclocal 
Invocation.   Generating aclocal.m4.
        local p pages=( *.info ) args=()
        for p in "${pages[@]/%.info}" ; do
                args+=(
                        -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: 
(${p})| v${SLOT}&|"
                        -e "s:(${p}):(${p}-${SLOT}):g"
                )
        done
        sed -i "${args[@]}" * || die

        # Rewrite all the file references, and rename them in the process.
        local f d
        for f in * ; do
                d=${f/.info/-${SLOT}.info}
                mv "${f}" "${d}" || die
                sed -i -e "s:${f}:${d}:g" * || die
        done

        popd >/dev/null
}

src_install() {
        default
        slot_info_pages
        rm -f "${D}"/usr/bin/{aclocal,automake}

        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
        local x
        for x in guess sub ; do
                dosym ../gnuconfig/config.${x} 
/usr/share/${PN}-${SLOT}/config.${x}
        done
}



1.1                  sys-devel/automake/automake-1.9.6-r4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.9.6-r4.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/automake/automake-1.9.6-r4.ebuild?rev=1.1&content-type=text/plain

Index: automake-1.9.6-r4.ebuild
===================================================================
# 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-r4.ebuild,v 1.1 
2014/11/15 06:21:57 vapier Exp $

EAPI="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.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.69
        >=sys-apps/texinfo-4.7
        sys-devel/gnuconfig"
DEPEND="${RDEPEND}
        sys-apps/help2man"

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
        epatch "${FILESDIR}"/${P}-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}"/${PN}-1.8.5-CVE-2009-4029.patch #295357
        epatch "${FILESDIR}"/${PN}-1.8-perl-5.11.patch
}

# 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() {
        pushd "${D}"/usr/share/info >/dev/null
        rm -f dir

        # Rewrite all the references to other pages.
        # before: * aclocal-invocation: (automake)aclocal Invocation.   
Generating aclocal.m4.
        # after:  * aclocal-invocation v1.13: (automake-1.13)aclocal 
Invocation.   Generating aclocal.m4.
        local p pages=( *.info ) args=()
        for p in "${pages[@]/%.info}" ; do
                args+=(
                        -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: 
(${p})| v${SLOT}&|"
                        -e "s:(${p}):(${p}-${SLOT}):g"
                )
        done
        sed -i "${args[@]}" * || die

        # Rewrite all the file references, and rename them in the process.
        local f d
        for f in * ; do
                d=${f/.info/-${SLOT}.info}
                mv "${f}" "${d}" || die
                sed -i -e "s:${f}:${d}:g" * || die
        done

        popd >/dev/null
}

src_install() {
        default
        slot_info_pages

        local x
        for x in aclocal automake ; do
                help2man "perl -Ilib ${x}" > ${x}-${SLOT}.1
                doman ${x}-${SLOT}.1
                rm -f "${D}"/usr/bin/${x}
        done

        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
        for x in guess sub ; do
                dosym ../gnuconfig/config.${x} 
/usr/share/${PN}-${SLOT}/config.${x}
        done
}



1.1                  sys-devel/automake/automake-1.5-r2.ebuild

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

Index: automake-1.5-r2.ebuild
===================================================================
# 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-r2.ebuild,v 
1.1 2014/11/15 06:21:57 vapier Exp $

EAPI="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.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=""

RDEPEND="dev-lang/perl
        >=sys-devel/automake-wrapper-9
        >=sys-devel/autoconf-2.69
        sys-devel/gnuconfig"
DEPEND="${RDEPEND}"

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
        epatch "${FILESDIR}"/${PN}-1.5-perl-5.11.patch
}

# 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() {
        pushd "${D}"/usr/share/info >/dev/null
        rm -f dir

        # Rewrite all the references to other pages.
        # before: * aclocal-invocation: (automake)aclocal Invocation.   
Generating aclocal.m4.
        # after:  * aclocal-invocation v1.13: (automake-1.13)aclocal 
Invocation.   Generating aclocal.m4.
        local p pages=( *.info ) args=()
        for p in "${pages[@]/%.info}" ; do
                args+=(
                        -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: 
(${p})| v${SLOT}&|"
                        -e "s:(${p}):(${p}-${SLOT}):g"
                )
        done
        sed -i "${args[@]}" * || die

        # Rewrite all the file references, and rename them in the process.
        local f d
        for f in * ; do
                d=${f/.info/-${SLOT}.info}
                mv "${f}" "${d}" || die
                sed -i -e "s:${f}:${d}:g" * || die
        done

        popd >/dev/null
}

src_install() {
        default
        slot_info_pages

        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

        # remove all config.guess and config.sub files replacing them
        # w/a symlink to a specific gnuconfig version
        for x in guess sub ; do
                dosym ../gnuconfig/config.${x} 
/usr/share/${PN}-${SLOT}/config.${x}
        done
}




Reply via email to