summaryrefslogtreecommitdiff
path: root/sys-devel/autoconf-wrapper
diff options
context:
space:
mode:
Diffstat (limited to 'sys-devel/autoconf-wrapper')
-rw-r--r--sys-devel/autoconf-wrapper/Manifest4
-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
3 files changed, 9 insertions, 7 deletions
diff --git a/sys-devel/autoconf-wrapper/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 2860d1ab6490..c0b37395496b 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,3 +1,3 @@
-AUX ac-wrapper-13.sh 5044 BLAKE2B 9768e43716ce9f9e32efd8126447a135fad58b08bea919aceb76faa9374a5b2f9c736afb694e9baaaa210da6adf0ab95b615c3e888fd7ac2d8c2b62a7abe4f55 SHA512 06fa8f1a812eac11ccf4a90ceba882a1bd6f2724c7ea9f8a9ad95d6c4009d7389a06ce6ddfed928a981112309cb2c1ea4358fb17b7f81e3ac0f4be25a37bb7d9
-EBUILD autoconf-wrapper-13.ebuild 832 BLAKE2B 621b163c9cd517d6d4fae7994fbbb4d859c73f9200a3ea92db39c132dc29cd7654562fe4da9bb044cbb10dc6a071c3cc72349a41c1dcc9bd51f661ad1f2017f4 SHA512 b8a8db90c8c64b0347fa3b1ad615b122f0adc3615551216944449125fdea7465c2c9e74eb2b1e427c2e92699480c4eb9a917b574a9249e6b1b715b9b572cf630
+AUX ac-wrapper-13.sh 5055 BLAKE2B 66fd728f347cdb873007e51113225608b3dae87c5979ba512a5e65a3185d8278502cdbaa60675b33643e0f9f459cf3956967f8e07b198d442139abb06a75f597 SHA512 0bbe9a992cff140bd60161404f1d1f6a9da6c79b1e9909000092f5e1159e457edee3fcefcb8fcaf47cedd9a7074505c4a61bc25107277d248150cdde5f11c5b7
+EBUILD autoconf-wrapper-13-r1.ebuild 828 BLAKE2B 911f5b016723361b42b211b71abb455d7033fd14db4e6ea7d1d5948df0b39d2111f166c0710a018d03fbe49cddf86eb5908f17990c510ec6c8cad14c7cccb297 SHA512 58e5e49b48a2ce652cdd1778e0f7b9474d043742de0a826e501e213cc8c7747b5a2a3a931b2ff9cb14cc1eb8ebf4b0160bda2b0696cc87f9525b8cf15b28094f
MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
index f98d5b23afdd..b1847c7e75a5 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 d4324cf73022..d984b4ac3371 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" ] \