summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-04-26 12:37:11 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-04-26 12:52:19 +0200
commit14f137cd0a9f2495e0013adbbfe71946fc42550d (patch)
tree4ed30e919b468ce6c58a4d5eaec10e82745c11ff /sys-devel
parentmedia-libs/libwebp: Bump to version 1.0.0. Removed old. (diff)
downloadgentoo-14f137cd0a9f2495e0013adbbfe71946fc42550d.tar.gz
gentoo-14f137cd0a9f2495e0013adbbfe71946fc42550d.tar.bz2
gentoo-14f137cd0a9f2495e0013adbbfe71946fc42550d.zip
sys-devel/autoconf-wrapper: Don't use bashisms.
Closes: https://bugs.gentoo.org/650152 Package-Manager: Portage-2.3.31, Repoman-2.3.9
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild (renamed from sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild)8
-rw-r--r--sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh4
2 files changed, 7 insertions, 5 deletions
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
index f98d5b23afd..b1847c7e75a 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
inherit multilib
DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
@@ -12,15 +14,15 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-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"
IUSE=""
-S=${WORKDIR}
+S="${WORKDIR}"
src_install() {
exeinto /usr/$(get_libdir)/misc
- newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh || die
+ newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh
dodir /usr/bin
local x=
for x in auto{conf,header,m4te,reconf,scan,update} ifnames ; do
- dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x} || die
+ dosym ../$(get_libdir)/misc/ac-wrapper.sh /usr/bin/${x}
done
}
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh
index d4324cf7302..d984b4ac337 100644
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# Based on the ac-wrapper.pl script provided by MandrakeSoft
@@ -155,7 +155,7 @@ if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
# is set to an older version, let's do some sanity checks.
case "${WANT_AUTOMAKE}" in
1.[456])
- acfiles=$(ls ac{local,include}.m4 configure.{in,ac} 2>/dev/null)
+ acfiles=$(ls aclocal.m4 acinclude.m4 configure.in configure.ac 2>/dev/null)
[ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles})
[ -z "${confversion}" ] && [ -r "configure" ] \