* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf-wrapper/files/, sys-devel/autoconf-wrapper/
@ 2020-12-09 14:18 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2020-12-09 14:18 UTC (permalink / raw
To: gentoo-commits
commit: d57c7d656058750ae6b0a9dc53c1aaafac735698
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 13:55:47 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 14:17:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57c7d65
sys-devel/autoconf-wrapper: Bump to version 14. Removed old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../{autoconf-wrapper-14_pre3.ebuild => autoconf-wrapper-14.ebuild} | 0
.../autoconf-wrapper/files/{ac-wrapper-14_pre3.sh => ac-wrapper-14.sh} | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre3.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild
similarity index 100%
rename from sys-devel/autoconf-wrapper/autoconf-wrapper-14_pre3.ebuild
rename to sys-devel/autoconf-wrapper/autoconf-wrapper-14.ebuild
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre3.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-14.sh
similarity index 99%
rename from sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre3.sh
rename to sys-devel/autoconf-wrapper/files/ac-wrapper-14.sh
index 177d2c641f1..b3e72c847d7 100644
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-14_pre3.sh
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-14.sh
@@ -79,7 +79,7 @@ fi
# Start at last known unstable/stable versions to speed up lookup process.
#
if [ -z "${KNOWN_AUTOCONF}" ] ; then
- KNOWN_AUTOCONF="2.70_beta4:2.5 2.69:2.5"
+ KNOWN_AUTOCONF="2.70:2.5 2.69:2.5"
fi
vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf-wrapper/files/, sys-devel/autoconf-wrapper/
@ 2021-01-28 23:49 Lars Wendler
0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2021-01-28 23:49 UTC (permalink / raw
To: gentoo-commits
commit: bff583ede76fd4f7ab5b21399ff72bfce15634aa
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 28 23:42:11 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 28 23:49:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff583ed
sys-devel/autoconf-wrapper: Bump to version 15
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../autoconf-wrapper/autoconf-wrapper-15.ebuild | 29 +++
sys-devel/autoconf-wrapper/files/ac-wrapper-15.sh | 203 +++++++++++++++++++++
2 files changed, 232 insertions(+)
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-15.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-15.ebuild
new file mode 100644
index 00000000000..68d956726bb
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-15.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+[[ "${PV}" == *_pre* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+ exeinto /usr/$(get_libdir)/misc
+ 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}
+ done
+}
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-15.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-15.sh
new file mode 100644
index 00000000000..e5eda0e53f1
--- /dev/null
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-15.sh
@@ -0,0 +1,203 @@
+#!/bin/sh
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Based on the ac-wrapper.pl script provided by MandrakeSoft
+# Rewritten in bash by Gregorio Guidi
+#
+# Executes the correct autoconf version.
+#
+# - defaults to newest version available (hopefully autoconf-2.60)
+# - runs autoconf 2.13 if:
+# - envvar WANT_AUTOCONF is set to `2.1'
+# -or-
+# - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher)
+# -or-
+# - `configure' is already present and was generated by autoconf 2.13
+
+warn() { printf "ac-wrapper: $*\n" 1>&2; }
+err() { warn "$@"; exit 1; }
+unset IFS
+which() {
+ local p
+ IFS=: # we don't use IFS anywhere, so don't bother saving/restoring
+ for p in ${PATH} ; do
+ p="${p}/$1"
+ [ -e "${p}" ] && echo "${p}" && return 0
+ done
+ unset IFS
+ return 1
+}
+
+#
+# Sanitize argv[0] since it isn't always a full path #385201
+#
+argv0=${0##*/}
+case ${0} in
+ ${argv0})
+ # find it in PATH
+ if ! full_argv0=$(which "${argv0}") ; then
+ err "could not locate ${argv0}; file a bug"
+ fi
+ ;;
+ *)
+ # re-use full/relative paths
+ full_argv0=$0
+ ;;
+esac
+
+if [ "${argv0}" = "ac-wrapper.sh" ] ; then
+ err "Don't call this script directly"
+fi
+
+if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${argv0}" = "autom4te" ] ; then
+ err "Autoconf 2.13 doesn't contain autom4te.\n" \
+ " Either unset WANT_AUTOCONF or don't execute anything\n" \
+ " that would use autom4te."
+fi
+
+if ! seq 0 0 2>/dev/null 1>&2 ; then #338518
+ seq() {
+ local f l i
+ case $# in
+ 1) f=1 i=1 l=$1;;
+ 2) f=$1 i=1 l=$2;;
+ 3) f=$1 i=$2 l=$3;;
+ esac
+ while :; do
+ [ $l -lt $f -a $i -gt 0 ] && break
+ [ $f -lt $l -a $i -lt 0 ] && break
+ echo $f
+ : $(( f += i ))
+ done
+ return 0
+ }
+fi
+
+#
+# Set up bindings between actual version and WANT_AUTOCONF;
+# Start at last known unstable/stable versions to speed up lookup process.
+#
+if [ -z "${KNOWN_AUTOCONF}" ] ; then
+ KNOWN_AUTOCONF="2.71:2.5 2.70:2.5 2.69:2.5"
+fi
+vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
+
+binary=""
+for v in ${vers} ; do
+ auto_ver=${v%:*}
+ if [ -z "${binary}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
+ binary="${full_argv0}-${auto_ver}"
+ break
+ fi
+done
+if [ -z "${binary}" ] ; then
+ err "Unable to locate any usuable version of autoconf.\n" \
+ "\tI tried these versions: ${vers}\n" \
+ "\tWith a base name of '${full_argv0}'."
+fi
+
+#
+# Check the WANT_AUTOCONF setting. We accept a whitespace delimited
+# list of autoconf versions.
+#
+if [ -n "${WANT_AUTOCONF}" ] ; then
+ for v in ${vers} x ; do
+ if [ "${v}" = "x" ] ; then
+ warn "warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring."
+ unset WANT_AUTOCONF
+ break
+ fi
+
+ auto_ver=${v%:*}
+ want_ver=${v#*:}
+ for wx in ${WANT_AUTOCONF} ; do
+ if [ -x "${full_argv0}-${wx}" ] ; then
+ binary="${full_argv0}-${wx}"
+ v="x"
+ elif [ "${wx}" = "${want_ver}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
+ binary="${full_argv0}-${auto_ver}"
+ v="x"
+ fi
+ done
+ [ "${v}" = "x" ] && break
+ done
+fi
+
+#
+# autodetect helpers
+#
+acprereq_version() {
+ sed -n -r \
+ -e '/^\s*(#|dnl)/d' \
+ -e '/AC_PREREQ/s:.*AC_PREREQ\s*\(\[?\s*([0-9.]+)\s*\]?\):\1:p' \
+ "$@" |
+ LC_ALL=C sort -n -t . |
+ tail -1
+}
+
+generated_version() {
+ local re='^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9.]+).*'
+ sed -n -r "/${re}/{s:${re}:\3:;p;q}" "$@"
+}
+
+#
+# autodetect routine
+#
+if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then
+ err "Since configure.ac is present, aclocal always use\n" \
+ "\tautoconf 2.59+, which conflicts with your choice and\n" \
+ "\tcauses error. You have two options:\n" \
+ "\t1. Try execute command again after removing configure.ac\n" \
+ "\t2. Don't set WANT_AUTOCONF"
+fi
+
+if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
+ # Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE
+ # is set to an older version, let's do some sanity checks.
+ case "${WANT_AUTOMAKE}" in
+ 1.[456])
+ acfiles=$(ls aclocal.m4 acinclude.m4 configure.in configure.ac 2>/dev/null)
+ [ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles})
+
+ [ -z "${confversion}" ] && [ -r "configure" ] \
+ && confversion=$(generated_version configure)
+
+ if [ "${confversion}" = "2.1" ] && [ ! -f "configure.ac" ] ; then
+ binary="${full_argv0}-2.13"
+ fi
+ esac
+fi
+
+if [ -n "${WANT_ACWRAPPER_DEBUG}" ] ; then
+ if [ -n "${WANT_AUTOCONF}" ] ; then
+ warn "DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}"
+ fi
+ warn "DEBUG: will execute <${binary}>"
+fi
+
+#
+# for further consistency
+#
+if [ -z "${WANT_AUTOCONF}" ] ; then
+ for v in ${vers} ; do
+ auto_ver=${v%:*}
+ want_ver=${v#*:}
+ if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then
+ export WANT_AUTOCONF="${want_ver}"
+ break
+ fi
+ done
+fi
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${binary}" ] ; then
+ # this shouldn't happen
+ err "${binary} is missing or not executable.\n" \
+ "\tPlease try emerging the correct version of autoconf."
+fi
+
+exec "${binary}" "$@"
+# The shell will error out if `exec` failed.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf-wrapper/files/, sys-devel/autoconf-wrapper/
@ 2021-09-04 17:35 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2021-09-04 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 0b65ba7ebb0a0ccd40a9fd4755c2fae920559a78
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 17:34:16 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 4 17:34:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b65ba7e
sys-devel/autoconf-wrapper: drop 13-r1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../autoconf-wrapper/autoconf-wrapper-13-r1.ebuild | 24 ---
sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh | 201 ---------------------
2 files changed, 225 deletions(-)
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
deleted file mode 100644
index a8d5e9b781a..00000000000
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-13-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="wrapper for autoconf to manage multiple autoconf versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-S="${WORKDIR}"
-
-src_install() {
- exeinto /usr/$(get_libdir)/misc
- 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}
- done
-}
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh
deleted file mode 100644
index d984b4ac337..00000000000
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-13.sh
+++ /dev/null
@@ -1,201 +0,0 @@
-#!/bin/sh
-# 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
-# Rewritten in bash by Gregorio Guidi
-#
-# Executes the correct autoconf version.
-#
-# - defaults to newest version available (hopefully autoconf-2.60)
-# - runs autoconf 2.13 if:
-# - envvar WANT_AUTOCONF is set to `2.1'
-# -or-
-# - `ac{local,include}.m4' or `configure.{in,ac}' have AC_PREREQ(2.1) (not higher)
-# -or-
-# - `configure' is already present and was generated by autoconf 2.13
-
-warn() { printf "ac-wrapper: $*\n" 1>&2; }
-err() { warn "$@"; exit 1; }
-unset IFS
-which() {
- local p
- IFS=: # we don't use IFS anywhere, so don't bother saving/restoring
- for p in ${PATH} ; do
- p="${p}/$1"
- [ -e "${p}" ] && echo "${p}" && return 0
- done
- unset IFS
- return 1
-}
-
-#
-# Sanitize argv[0] since it isn't always a full path #385201
-#
-argv0=${0##*/}
-case ${0} in
- ${argv0})
- # find it in PATH
- if ! full_argv0=$(which "${argv0}") ; then
- err "could not locate ${argv0}; file a bug"
- fi
- ;;
- *)
- # re-use full/relative paths
- full_argv0=$0
- ;;
-esac
-
-if [ "${argv0}" = "ac-wrapper.sh" ] ; then
- err "Don't call this script directly"
-fi
-
-if [ "${WANT_AUTOCONF}" = "2.1" ] && [ "${argv0}" = "autom4te" ] ; then
- err "Autoconf 2.13 doesn't contain autom4te.\n" \
- " Either unset WANT_AUTOCONF or don't execute anything\n" \
- " that would use autom4te."
-fi
-
-if ! seq 0 0 2>/dev/null 1>&2 ; then #338518
- seq() {
- local f l i
- case $# in
- 1) f=1 i=1 l=$1;;
- 2) f=$1 i=1 l=$2;;
- 3) f=$1 i=$2 l=$3;;
- esac
- while :; do
- [ $l -lt $f -a $i -gt 0 ] && break
- [ $f -lt $l -a $i -lt 0 ] && break
- echo $f
- : $(( f += i ))
- done
- return 0
- }
-fi
-
-#
-# Set up bindings between actual version and WANT_AUTOCONF;
-# Start at last known unstable/stable versions to speed up lookup process.
-#
-KNOWN_AUTOCONF="2.69:2.5 2.68:2.5"
-vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1"
-
-binary=""
-for v in ${vers} ; do
- auto_ver=${v%:*}
- if [ -z "${binary}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
- binary="${full_argv0}-${auto_ver}"
- break
- fi
-done
-if [ -z "${binary}" ] ; then
- err "Unable to locate any usuable version of autoconf.\n" \
- "\tI tried these versions: ${vers}\n" \
- "\tWith a base name of '${full_argv0}'."
-fi
-
-#
-# Check the WANT_AUTOCONF setting. We accept a whitespace delimited
-# list of autoconf versions.
-#
-if [ -n "${WANT_AUTOCONF}" ] ; then
- for v in ${vers} x ; do
- if [ "${v}" = "x" ] ; then
- warn "warning: invalid WANT_AUTOCONF '${WANT_AUTOCONF}'; ignoring."
- unset WANT_AUTOCONF
- break
- fi
-
- auto_ver=${v%:*}
- want_ver=${v#*:}
- for wx in ${WANT_AUTOCONF} ; do
- if [ -x "${full_argv0}-${wx}" ] ; then
- binary="${full_argv0}-${wx}"
- v="x"
- elif [ "${wx}" = "${want_ver}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then
- binary="${full_argv0}-${auto_ver}"
- v="x"
- fi
- done
- [ "${v}" = "x" ] && break
- done
-fi
-
-#
-# autodetect helpers
-#
-acprereq_version() {
- sed -n -r \
- -e '/^\s*(#|dnl)/d' \
- -e '/AC_PREREQ/s:.*AC_PREREQ\s*\(\[?\s*([0-9.]+)\s*\]?\):\1:p' \
- "$@" |
- LC_ALL=C sort -n -t . |
- tail -1
-}
-
-generated_version() {
- local re='^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9.]+).*'
- sed -n -r "/${re}/{s:${re}:\3:;p;q}" "$@"
-}
-
-#
-# autodetect routine
-#
-if [ "${WANT_AUTOCONF}" = "2.1" ] && [ -f "configure.ac" ] ; then
- err "Since configure.ac is present, aclocal always use\n" \
- "\tautoconf 2.59+, which conflicts with your choice and\n" \
- "\tcauses error. You have two options:\n" \
- "\t1. Try execute command again after removing configure.ac\n" \
- "\t2. Don't set WANT_AUTOCONF"
-fi
-
-if [ "${WANT_AUTOCONF:-2.1}" = "2.1" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
- # Automake-1.7 and better require autoconf-2.5x so if WANT_AUTOMAKE
- # is set to an older version, let's do some sanity checks.
- case "${WANT_AUTOMAKE}" in
- 1.[456])
- acfiles=$(ls aclocal.m4 acinclude.m4 configure.in configure.ac 2>/dev/null)
- [ -n "${acfiles}" ] && confversion=$(acprereq_version ${acfiles})
-
- [ -z "${confversion}" ] && [ -r "configure" ] \
- && confversion=$(generated_version configure)
-
- if [ "${confversion}" = "2.1" ] && [ ! -f "configure.ac" ] ; then
- binary="${full_argv0}-2.13"
- fi
- esac
-fi
-
-if [ -n "${WANT_ACWRAPPER_DEBUG}" ] ; then
- if [ -n "${WANT_AUTOCONF}" ] ; then
- warn "DEBUG: WANT_AUTOCONF is set to ${WANT_AUTOCONF}"
- fi
- warn "DEBUG: will execute <${binary}>"
-fi
-
-#
-# for further consistency
-#
-if [ -z "${WANT_AUTOCONF}" ] ; then
- for v in ${vers} ; do
- auto_ver=${v%:*}
- want_ver=${v#*:}
- if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then
- export WANT_AUTOCONF="${want_ver}"
- break
- fi
- done
-fi
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${binary}" ] ; then
- # this shouldn't happen
- err "${binary} is missing or not executable.\n" \
- "\tPlease try emerging the correct version of autoconf."
-fi
-
-exec "${binary}" "$@"
-# The shell will error out if `exec` failed.
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-04 17:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-04 17:35 [gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf-wrapper/files/, sys-devel/autoconf-wrapper/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2021-01-28 23:49 Lars Wendler
2020-12-09 14:18 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox