From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 153081382C5 for ; Thu, 26 Apr 2018 10:52:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A5FEE08ED; Thu, 26 Apr 2018 10:52:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41BD3E08ED for ; Thu, 26 Apr 2018 10:52:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0B24335C77 for ; Thu, 26 Apr 2018 10:52:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BE2629D for ; Thu, 26 Apr 2018 10:52:26 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1524739939.14f137cd0a9f2495e0013adbbfe71946fc42550d.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf-wrapper/, sys-devel/autoconf-wrapper/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh X-VCS-Directories: sys-devel/autoconf-wrapper/ sys-devel/autoconf-wrapper/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 14f137cd0a9f2495e0013adbbfe71946fc42550d X-VCS-Branch: master Date: Thu, 26 Apr 2018 10:52:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2cc26e44-5b4c-42e9-b97c-fd87de6d8793 X-Archives-Hash: 0a575e21a292a68f780e6cd43dc161ec commit: 14f137cd0a9f2495e0013adbbfe71946fc42550d Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 26 10:37:11 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 26 10:52:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f137cd sys-devel/autoconf-wrapper: Don't use bashisms. Closes: https://bugs.gentoo.org/650152 Package-Manager: Portage-2.3.31, Repoman-2.3.9 .../{autoconf-wrapper-13.ebuild => autoconf-wrapper-13-r1.ebuild} | 8 +++++--- sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh | 4 ++-- 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 similarity index 83% rename from sys-devel/autoconf-wrapper/autoconf-wrapper-13.ebuild rename to 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" ] \