From 565193ae54cfbf09e592ed5607b3775986d93c53 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 4 Aug 2017 17:17:17 +0200 Subject: sys-devel/autoconf: Revbump to add another perl-5.26 fix (bug #625576). Package-Manager: Portage-2.3.6, Repoman-2.3.3 --- sys-devel/autoconf/autoconf-2.69-r3.ebuild | 44 --------------------- sys-devel/autoconf/autoconf-2.69-r4.ebuild | 46 ++++++++++++++++++++++ .../autoconf/files/autoconf-2.69-perl-5.26-2.patch | 30 ++++++++++++++ 3 files changed, 76 insertions(+), 44 deletions(-) delete mode 100644 sys-devel/autoconf/autoconf-2.69-r3.ebuild create mode 100644 sys-devel/autoconf/autoconf-2.69-r4.ebuild create mode 100644 sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch diff --git a/sys-devel/autoconf/autoconf-2.69-r3.ebuild b/sys-devel/autoconf/autoconf-2.69-r3.ebuild deleted file mode 100644 index 54b5079415c2..000000000000 --- a/sys-devel/autoconf/autoconf-2.69-r3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git - http://git.savannah.gnu.org/r/${PN}.git" - # We need all the tags in order to figure out the right version. - # The git-r3 eclass doesn't support that, so have to stick to 2. - inherit git-2 -else - SRC_URI="mirror://gnu/${PN}/${P}.tar.xz - ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -inherit toolchain-autoconf - -DESCRIPTION="Used to create autoconfiguration files" -HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" - -LICENSE="GPL-3" -SLOT="${PV}" -IUSE="emacs" - -DEPEND=">=sys-devel/m4-1.4.16 - >=dev-lang/perl-5.6" -RDEPEND="${DEPEND} - !~sys-devel/${P}:2.5 - >=sys-devel/autoconf-wrapper-13" -[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3" -PDEPEND="emacs? ( app-emacs/autoconf-mode )" - -src_prepare() { - # usr/bin/libtool is provided by binutils-apple, need gnu libtool - [[ ${CHOST} == *-darwin* ]] && \ - PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch ) - PATCHES+=( - "${FILESDIR}"/${PN}-2.69-perl-5.26.patch - "${FILESDIR}"/${P}-fix-libtool-test.patch - ) - toolchain-autoconf_src_prepare -} diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild new file mode 100644 index 000000000000..eac252939367 --- /dev/null +++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git + http://git.savannah.gnu.org/r/${PN}.git" + # We need all the tags in order to figure out the right version. + # The git-r3 eclass doesn't support that, so have to stick to 2. + inherit git-r3 +else + SRC_URI="mirror://gnu/${PN}/${P}.tar.xz + ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +inherit toolchain-autoconf + +DESCRIPTION="Used to create autoconfiguration files" +HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html" + +LICENSE="GPL-3" +SLOT="${PV}" +IUSE="emacs" + +DEPEND=">=sys-devel/m4-1.4.16 + >=dev-lang/perl-5.6" +RDEPEND="${DEPEND} + !~sys-devel/${P}:2.5 + >=sys-devel/autoconf-wrapper-13" +[[ ${PV} == "9999" ]] && DEPEND+=" >=sys-apps/texinfo-4.3" +PDEPEND="emacs? ( app-emacs/autoconf-mode )" + +src_prepare() { + # usr/bin/libtool is provided by binutils-apple, need gnu libtool + [[ ${CHOST} == *-darwin* ]] && \ + PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch ) + PATCHES+=( + "${FILESDIR}"/${PN}-2.69-perl-5.26.patch + "${FILESDIR}"/${P}-fix-libtool-test.patch + "${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch + ) + toolchain-autoconf_src_prepare + eapply_user +} diff --git a/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch new file mode 100644 index 000000000000..6becf807c43e --- /dev/null +++ b/sys-devel/autoconf/files/autoconf-2.69-perl-5.26-2.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/625576 + +--- autoconf-2.69/bin/autoheader.in ++++ autoconf-2.69/bin/autoheader.in +@@ -173,6 +173,12 @@ + # Source what the traces are trying to tell us. + verb "$me: running $autoconf to trace from $ARGV[0]"; + my $quoted_tmp = shell_quote ($tmp); ++my $perl_tmp; ++if ( $tmp =~ /^\// ) { ++ $perl_tmp=$tmp; ++} else { ++ $perl_tmp="./".$tmp; ++} + xsystem ("$autoconf" + # If you change this list, update the + # `Autoheader-preselections' section of autom4te.in. +@@ -182,9 +188,9 @@ + . " " . shell_quote ($ARGV[0]) . " >$quoted_tmp/traces.pl"); + + local (%verbatim, %symbol); +-debug "$me: \`do'ing $tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; +-do "$tmp/traces.pl"; +-warn "couldn't parse $tmp/traces.pl: $@" if $@; ++debug "$me: \`do'ing $perl_tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; ++do "$perl_tmp/traces.pl"; ++warn "couldn't parse $perl_tmp/traces.pl: $@" if $@; + unless ($config_h) + { + error "error: AC_CONFIG_HEADERS not found in $ARGV[0]"; -- cgit v1.2.3-65-gdbad