public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-wrapper/files/, sys-devel/automake-wrapper/
@ 2015-12-16 22:52 Mike Frysinger
  0 siblings, 0 replies; 4+ messages in thread
From: Mike Frysinger @ 2015-12-16 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     e7c14360e27d860bec3a80ba9c92bfb025c4b3e9
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 16 21:56:23 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 22:52:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7c14360

sys-devel/automake-wrapper: drop versions <10

 .../automake-wrapper/automake-wrapper-9.ebuild     |  29 ----
 sys-devel/automake-wrapper/files/am-wrapper-9.sh   | 187 ---------------------
 2 files changed, 216 deletions(-)

diff --git a/sys-devel/automake-wrapper/automake-wrapper-9.ebuild b/sys-devel/automake-wrapper/automake-wrapper-9.ebuild
deleted file mode 100644
index 3424bd4..0000000
--- a/sys-devel/automake-wrapper/automake-wrapper-9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="wrapper for automake to manage multiple automake versions"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${FILESDIR}"/am-wrapper-${PV}.sh "${S}"/
-	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
-	if use prefix ; then
-		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' "${S}"/am-wrapper-${PV}.sh || die
-	fi
-}
-
-src_install() {
-	newbin "${S}"/am-wrapper-${PV}.sh automake || die
-	dosym automake /usr/bin/aclocal
-
-	keepdir /usr/share/aclocal
-}

diff --git a/sys-devel/automake-wrapper/files/am-wrapper-9.sh b/sys-devel/automake-wrapper/files/am-wrapper-9.sh
deleted file mode 100644
index 6342625..0000000
--- a/sys-devel/automake-wrapper/files/am-wrapper-9.sh
+++ /dev/null
@@ -1,187 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Executes the correct automake version.
-#
-# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions):
-#  - attempt to find an installed version using those
-#  - if magic keyword 'latest' is found, pick the latest version that exists
-#  - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below)
-# If WANT_AUTOMAKE is not set:
-#  - Try to detect the version of automake used to generate things (look at
-#    Makefile.in and aclocal.m4 and any other useful file)
-#  - If detected version is not found, warn and proceed as if blank slate
-#  - Try to locate the latest version of automake that exists and run it
-
-(set -o posix) 2>/dev/null && set -o posix
-
-_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; }
-warn() { _stderr "warning: $*"; }
-err() { _stderr "error: $*"; 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 ! 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_AUTOMAKE;
-# Start with last known versions to speed up lookup process.
-#
-LAST_KNOWN_AUTOMAKE_VER="14"
-vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`)
-
-#
-# Helper to scan for a usable program based on version.
-#
-binary=
-all_vers=
-find_binary() {
-	local v
-	all_vers="${all_vers} $*" # For error messages.
-	for v ; do
-		if [ -x "${full_argv0}-${v}" ] ; then
-			binary="${full_argv0}-${v}"
-			binary_ver=${v}
-			return 0
-		fi
-	done
-	return 1
-}
-
-#
-# Try and find a usable automake version.  First check the WANT_AUTOMAKE
-# setting (whitespace delimited list), then fallback to the latest.
-#
-find_latest() {
-	if ! find_binary ${vers} ; then
-		# Brute force it.
-		find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`)
-	fi
-}
-for wx in ${WANT_AUTOMAKE:-latest} ; do
-	if [ "${wx}" = "latest" ] ; then
-		find_latest && break
-	else
-		find_binary ${wx} && break
-	fi
-done
-
-if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
-	warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring"
-	unset WANT_AUTOMAKE
-	find_latest
-fi
-
-if [ -z "${binary}" ] ; then
-	err "Unable to locate any usuable version of automake.\n" \
-	    "\tI tried these versions:${all_vers}\n" \
-	    "\tWith a base name of '${full_argv0}'."
-fi
-
-#
-# autodetect helpers
-#
-do_awk() {
-	local file=$1 ; shift
-	local v=$(awk -v regex="$*" '{
-		if (ret = match($0, regex)) {
-			s = substr($0, ret, RLENGTH)
-			ret = match(s, "[0-9]\\.[0-9]+")
-			print substr(s, ret, RLENGTH)
-			exit
-		}
-		}' "${file}")
-	case " ${auto_vers} " in
-	*" ${v} "*) ;;
-	*) auto_vers="${auto_vers:+${auto_vers} }${v}" ;;
-	esac
-}
-
-#
-# autodetect routine
-#
-if [ -z "${WANT_AUTOMAKE}" ] ; then
-	auto_vers=
-	if [ -r "Makefile.in" ] ; then
-		do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+'
-	fi
-	if [ -r "aclocal.m4" ] ; then
-		do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+'
-		do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?[0-9]\\.[0-9]+[^)]*\\]?\\)'
-	fi
-	# We don't need to set $binary here as it has already been setup for us
-	# earlier to the latest available version.
-	if [ -n "${auto_vers}" ] ; then
-		if ! find_binary ${auto_vers} ; then
-			warn "auto-detected versions not found (${auto_vers}); falling back to latest available"
-		fi
-	fi
-fi
-
-if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then
-	if [ -n "${WANT_AUTOMAKE}" ] ; then
-		warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}"
-	fi
-	warn "DEBUG: will execute <${binary}>"
-fi
-
-#
-# for further consistency
-#
-export WANT_AUTOMAKE="${binary_ver}"
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${binary}" ] ; then
-	# this shouldn't happen
-	err "${binary} is missing or not executable.\n" \
-	    "\tPlease try installing the correct version of automake."
-fi
-
-exec "${binary}" "$@"
-# The shell will error out if `exec` failed.


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-wrapper/files/, sys-devel/automake-wrapper/
@ 2018-02-26 17:49 Thomas Deutschmann
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2018-02-26 17:49 UTC (permalink / raw
  To: gentoo-commits

commit:     1c995dec8c8361c4c52b83a06b2cfc20c2d7213d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 17:48:37 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 17:49:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c995dec

sys-devel/automake-wrapper: Bump to v11

Add sys-devel/automake-1.16 support.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../automake-wrapper/automake-wrapper-11.ebuild    |  36 ++++
 sys-devel/automake-wrapper/files/am-wrapper-11.sh  | 186 +++++++++++++++++++++
 2 files changed, 222 insertions(+)

diff --git a/sys-devel/automake-wrapper/automake-wrapper-11.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
new file mode 100644
index 00000000000..71a6ff489ca
--- /dev/null
+++ b/sys-devel/automake-wrapper/automake-wrapper-11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="wrapper for automake to manage multiple automake versions"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+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}
+
+src_unpack() {
+	cp "${FILESDIR}"/am-wrapper-${PV}.sh "${S}"/ || die
+}
+
+src_prepare() {
+	default
+
+	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
+	if use prefix ; then
+		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' \
+			"${S}"/am-wrapper-${PV}.sh || die
+	fi
+}
+
+src_install() {
+	newbin "${S}"/am-wrapper-${PV}.sh automake
+	dosym automake /usr/bin/aclocal
+
+	keepdir /usr/share/aclocal
+}

diff --git a/sys-devel/automake-wrapper/files/am-wrapper-11.sh b/sys-devel/automake-wrapper/files/am-wrapper-11.sh
new file mode 100644
index 00000000000..290762680d2
--- /dev/null
+++ b/sys-devel/automake-wrapper/files/am-wrapper-11.sh
@@ -0,0 +1,186 @@
+#!/bin/sh
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Executes the correct automake version.
+#
+# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions):
+#  - attempt to find an installed version using those
+#  - if magic keyword 'latest' is found, pick the latest version that exists
+#  - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below)
+# If WANT_AUTOMAKE is not set:
+#  - Try to detect the version of automake used to generate things (look at
+#    Makefile.in and aclocal.m4 and any other useful file)
+#  - If detected version is not found, warn and proceed as if blank slate
+#  - Try to locate the latest version of automake that exists and run it
+
+(set -o posix) 2>/dev/null && set -o posix
+
+_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; }
+warn() { _stderr "warning: $*"; }
+err() { _stderr "error: $*"; 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 ! 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_AUTOMAKE;
+# Start with last known versions to speed up lookup process.
+#
+LAST_KNOWN_AUTOMAKE_VER="16"
+vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`)
+
+#
+# Helper to scan for a usable program based on version.
+#
+binary=
+all_vers=
+find_binary() {
+	local v
+	all_vers="${all_vers} $*" # For error messages.
+	for v ; do
+		if [ -x "${full_argv0}-${v}" ] ; then
+			binary="${full_argv0}-${v}"
+			binary_ver=${v}
+			return 0
+		fi
+	done
+	return 1
+}
+
+#
+# Try and find a usable automake version.  First check the WANT_AUTOMAKE
+# setting (whitespace delimited list), then fallback to the latest.
+#
+find_latest() {
+	if ! find_binary ${vers} ; then
+		# Brute force it.
+		find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`)
+	fi
+}
+for wx in ${WANT_AUTOMAKE:-latest} ; do
+	if [ "${wx}" = "latest" ] ; then
+		find_latest && break
+	else
+		find_binary ${wx} && break
+	fi
+done
+
+if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
+	warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring"
+	unset WANT_AUTOMAKE
+	find_latest
+fi
+
+if [ -z "${binary}" ] ; then
+	err "Unable to locate any usuable version of automake.\n" \
+	    "\tI tried these versions:${all_vers}\n" \
+	    "\tWith a base name of '${full_argv0}'."
+fi
+
+#
+# autodetect helpers
+#
+do_awk() {
+	local file=$1 ; shift
+	local v=$(awk -v regex="$*" '{
+		if (ret = match($0, regex)) {
+			s = substr($0, ret, RLENGTH)
+			ret = match(s, "[0-9]\\.[0-9]+")
+			print substr(s, ret, RLENGTH)
+			exit
+		}
+		}' "${file}")
+	case " ${auto_vers} " in
+	*" ${v} "*) ;;
+	*) auto_vers="${auto_vers:+${auto_vers} }${v}" ;;
+	esac
+}
+
+#
+# autodetect routine
+#
+if [ -z "${WANT_AUTOMAKE}" ] ; then
+	auto_vers=
+	if [ -r "Makefile.in" ] ; then
+		do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+'
+	fi
+	if [ -r "aclocal.m4" ] ; then
+		do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+'
+		do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?[0-9]\\.[0-9]+[^)]*\\]?\\)'
+	fi
+	# We don't need to set $binary here as it has already been setup for us
+	# earlier to the latest available version.
+	if [ -n "${auto_vers}" ] ; then
+		if ! find_binary ${auto_vers} ; then
+			warn "auto-detected versions not found (${auto_vers}); falling back to latest available"
+		fi
+	fi
+fi
+
+if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then
+	if [ -n "${WANT_AUTOMAKE}" ] ; then
+		warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}"
+	fi
+	warn "DEBUG: will execute <${binary}>"
+fi
+
+#
+# for further consistency
+#
+export WANT_AUTOMAKE="${binary_ver}"
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${binary}" ] ; then
+	# this shouldn't happen
+	err "${binary} is missing or not executable.\n" \
+	    "\tPlease try installing the correct version of automake."
+fi
+
+exec "${binary}" "$@"
+# The shell will error out if `exec` failed.


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-wrapper/files/, sys-devel/automake-wrapper/
@ 2020-09-24 15:45 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2020-09-24 15:45 UTC (permalink / raw
  To: gentoo-commits

commit:     f94b3ed4cc3bc13c9350339556293f7a87b4e9b0
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 15:45:24 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 15:45:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94b3ed4

sys-devel/automake-wrapper: Removed old

Closes: https://bugs.gentoo.org/740924
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../automake-wrapper/automake-wrapper-10.ebuild    |  34 ----
 sys-devel/automake-wrapper/files/am-wrapper-10.sh  | 186 ---------------------
 2 files changed, 220 deletions(-)

diff --git a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild b/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
deleted file mode 100644
index 14c1563cc18..00000000000
--- a/sys-devel/automake-wrapper/automake-wrapper-10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="wrapper for automake to manage multiple automake versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${FILESDIR}"/am-wrapper-${PV}.sh "${S}"/ || die
-}
-
-src_prepare() {
-	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
-	if use prefix ; then
-		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' \
-			"${S}"/am-wrapper-${PV}.sh || die
-	fi
-}
-
-src_install() {
-	newbin "${S}"/am-wrapper-${PV}.sh automake
-	dosym automake /usr/bin/aclocal
-
-	keepdir /usr/share/aclocal
-}

diff --git a/sys-devel/automake-wrapper/files/am-wrapper-10.sh b/sys-devel/automake-wrapper/files/am-wrapper-10.sh
deleted file mode 100644
index 235474fbf3d..00000000000
--- a/sys-devel/automake-wrapper/files/am-wrapper-10.sh
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Executes the correct automake version.
-#
-# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions):
-#  - attempt to find an installed version using those
-#  - if magic keyword 'latest' is found, pick the latest version that exists
-#  - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below)
-# If WANT_AUTOMAKE is not set:
-#  - Try to detect the version of automake used to generate things (look at
-#    Makefile.in and aclocal.m4 and any other useful file)
-#  - If detected version is not found, warn and proceed as if blank slate
-#  - Try to locate the latest version of automake that exists and run it
-
-(set -o posix) 2>/dev/null && set -o posix
-
-_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; }
-warn() { _stderr "warning: $*"; }
-err() { _stderr "error: $*"; 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 ! 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_AUTOMAKE;
-# Start with last known versions to speed up lookup process.
-#
-LAST_KNOWN_AUTOMAKE_VER="15"
-vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`)
-
-#
-# Helper to scan for a usable program based on version.
-#
-binary=
-all_vers=
-find_binary() {
-	local v
-	all_vers="${all_vers} $*" # For error messages.
-	for v ; do
-		if [ -x "${full_argv0}-${v}" ] ; then
-			binary="${full_argv0}-${v}"
-			binary_ver=${v}
-			return 0
-		fi
-	done
-	return 1
-}
-
-#
-# Try and find a usable automake version.  First check the WANT_AUTOMAKE
-# setting (whitespace delimited list), then fallback to the latest.
-#
-find_latest() {
-	if ! find_binary ${vers} ; then
-		# Brute force it.
-		find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`)
-	fi
-}
-for wx in ${WANT_AUTOMAKE:-latest} ; do
-	if [ "${wx}" = "latest" ] ; then
-		find_latest && break
-	else
-		find_binary ${wx} && break
-	fi
-done
-
-if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
-	warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring"
-	unset WANT_AUTOMAKE
-	find_latest
-fi
-
-if [ -z "${binary}" ] ; then
-	err "Unable to locate any usuable version of automake.\n" \
-	    "\tI tried these versions:${all_vers}\n" \
-	    "\tWith a base name of '${full_argv0}'."
-fi
-
-#
-# autodetect helpers
-#
-do_awk() {
-	local file=$1 ; shift
-	local v=$(awk -v regex="$*" '{
-		if (ret = match($0, regex)) {
-			s = substr($0, ret, RLENGTH)
-			ret = match(s, "[0-9]\\.[0-9]+")
-			print substr(s, ret, RLENGTH)
-			exit
-		}
-		}' "${file}")
-	case " ${auto_vers} " in
-	*" ${v} "*) ;;
-	*) auto_vers="${auto_vers:+${auto_vers} }${v}" ;;
-	esac
-}
-
-#
-# autodetect routine
-#
-if [ -z "${WANT_AUTOMAKE}" ] ; then
-	auto_vers=
-	if [ -r "Makefile.in" ] ; then
-		do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+'
-	fi
-	if [ -r "aclocal.m4" ] ; then
-		do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+'
-		do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?[0-9]\\.[0-9]+[^)]*\\]?\\)'
-	fi
-	# We don't need to set $binary here as it has already been setup for us
-	# earlier to the latest available version.
-	if [ -n "${auto_vers}" ] ; then
-		if ! find_binary ${auto_vers} ; then
-			warn "auto-detected versions not found (${auto_vers}); falling back to latest available"
-		fi
-	fi
-fi
-
-if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then
-	if [ -n "${WANT_AUTOMAKE}" ] ; then
-		warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}"
-	fi
-	warn "DEBUG: will execute <${binary}>"
-fi
-
-#
-# for further consistency
-#
-export WANT_AUTOMAKE="${binary_ver}"
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${binary}" ] ; then
-	# this shouldn't happen
-	err "${binary} is missing or not executable.\n" \
-	    "\tPlease try installing the correct version of automake."
-fi
-
-exec "${binary}" "$@"
-# The shell will error out if `exec` failed.


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-wrapper/files/, sys-devel/automake-wrapper/
@ 2023-03-26  4:07 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-03-26  4:07 UTC (permalink / raw
  To: gentoo-commits

commit:     f6b6f84e45b5b7837f450f65c14b4324c5561e15
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 04:03:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 04:03:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b6f84e

sys-devel/automake-wrapper: drop 11-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../automake-wrapper/automake-wrapper-11-r1.ebuild |  32 ----
 sys-devel/automake-wrapper/files/am-wrapper-11.sh  | 186 ---------------------
 2 files changed, 218 deletions(-)

diff --git a/sys-devel/automake-wrapper/automake-wrapper-11-r1.ebuild b/sys-devel/automake-wrapper/automake-wrapper-11-r1.ebuild
deleted file mode 100644
index e65eb87b26c7..000000000000
--- a/sys-devel/automake-wrapper/automake-wrapper-11-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="wrapper for automake to manage multiple automake versions"
-HOMEPAGE="https://gitweb.gentoo.org/proj/autotools-wrappers.git"
-S="${WORKDIR}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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"
-
-src_unpack() {
-	cp "${FILESDIR}"/am-wrapper-${PV}.sh "${S}"/ || die
-}
-
-src_prepare() {
-	default
-
-	# usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell
-	if use prefix ; then
-		sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' am-wrapper-${PV}.sh || die
-	fi
-}
-
-src_install() {
-	newbin am-wrapper-${PV}.sh automake
-	dosym automake /usr/bin/aclocal
-
-	keepdir /usr/share/aclocal
-}

diff --git a/sys-devel/automake-wrapper/files/am-wrapper-11.sh b/sys-devel/automake-wrapper/files/am-wrapper-11.sh
deleted file mode 100644
index 290762680d22..000000000000
--- a/sys-devel/automake-wrapper/files/am-wrapper-11.sh
+++ /dev/null
@@ -1,186 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Executes the correct automake version.
-#
-# If WANT_AUTOMAKE is set (can be a whitespace delimited list of versions):
-#  - attempt to find an installed version using those
-#  - if magic keyword 'latest' is found, pick the latest version that exists
-#  - if nothing found, warn, and proceed as if WANT_AUTOMAKE was not set (below)
-# If WANT_AUTOMAKE is not set:
-#  - Try to detect the version of automake used to generate things (look at
-#    Makefile.in and aclocal.m4 and any other useful file)
-#  - If detected version is not found, warn and proceed as if blank slate
-#  - Try to locate the latest version of automake that exists and run it
-
-(set -o posix) 2>/dev/null && set -o posix
-
-_stderr() { printf 'am-wrapper: %s: %b\n' "${argv0}" "$*" 1>&2; }
-warn() { _stderr "warning: $*"; }
-err() { _stderr "error: $*"; 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 ! 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_AUTOMAKE;
-# Start with last known versions to speed up lookup process.
-#
-LAST_KNOWN_AUTOMAKE_VER="16"
-vers=$(printf '1.%s ' `seq ${LAST_KNOWN_AUTOMAKE_VER} -1 4`)
-
-#
-# Helper to scan for a usable program based on version.
-#
-binary=
-all_vers=
-find_binary() {
-	local v
-	all_vers="${all_vers} $*" # For error messages.
-	for v ; do
-		if [ -x "${full_argv0}-${v}" ] ; then
-			binary="${full_argv0}-${v}"
-			binary_ver=${v}
-			return 0
-		fi
-	done
-	return 1
-}
-
-#
-# Try and find a usable automake version.  First check the WANT_AUTOMAKE
-# setting (whitespace delimited list), then fallback to the latest.
-#
-find_latest() {
-	if ! find_binary ${vers} ; then
-		# Brute force it.
-		find_binary $(printf '1.%s ' `seq 99 -1 ${LAST_KNOWN_AUTOMAKE_VER}`)
-	fi
-}
-for wx in ${WANT_AUTOMAKE:-latest} ; do
-	if [ "${wx}" = "latest" ] ; then
-		find_latest && break
-	else
-		find_binary ${wx} && break
-	fi
-done
-
-if [ -z "${binary}" ] && [ -n "${WANT_AUTOMAKE}" ] ; then
-	warn "could not locate installed version for WANT_AUTOMAKE='${WANT_AUTOMAKE}'; ignoring"
-	unset WANT_AUTOMAKE
-	find_latest
-fi
-
-if [ -z "${binary}" ] ; then
-	err "Unable to locate any usuable version of automake.\n" \
-	    "\tI tried these versions:${all_vers}\n" \
-	    "\tWith a base name of '${full_argv0}'."
-fi
-
-#
-# autodetect helpers
-#
-do_awk() {
-	local file=$1 ; shift
-	local v=$(awk -v regex="$*" '{
-		if (ret = match($0, regex)) {
-			s = substr($0, ret, RLENGTH)
-			ret = match(s, "[0-9]\\.[0-9]+")
-			print substr(s, ret, RLENGTH)
-			exit
-		}
-		}' "${file}")
-	case " ${auto_vers} " in
-	*" ${v} "*) ;;
-	*) auto_vers="${auto_vers:+${auto_vers} }${v}" ;;
-	esac
-}
-
-#
-# autodetect routine
-#
-if [ -z "${WANT_AUTOMAKE}" ] ; then
-	auto_vers=
-	if [ -r "Makefile.in" ] ; then
-		do_awk Makefile.in '^# Makefile.in generated (automatically )?by automake [0-9]\\.[0-9]+'
-	fi
-	if [ -r "aclocal.m4" ] ; then
-		do_awk aclocal.m4 'generated automatically by aclocal [0-9]\\.[0-9]+'
-		do_awk aclocal.m4 '[[:space:]]*\\[?AM_AUTOMAKE_VERSION\\(\\[?[0-9]\\.[0-9]+[^)]*\\]?\\)'
-	fi
-	# We don't need to set $binary here as it has already been setup for us
-	# earlier to the latest available version.
-	if [ -n "${auto_vers}" ] ; then
-		if ! find_binary ${auto_vers} ; then
-			warn "auto-detected versions not found (${auto_vers}); falling back to latest available"
-		fi
-	fi
-fi
-
-if [ -n "${WANT_AMWRAPPER_DEBUG}" ] ; then
-	if [ -n "${WANT_AUTOMAKE}" ] ; then
-		warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}"
-	fi
-	warn "DEBUG: will execute <${binary}>"
-fi
-
-#
-# for further consistency
-#
-export WANT_AUTOMAKE="${binary_ver}"
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${binary}" ] ; then
-	# this shouldn't happen
-	err "${binary} is missing or not executable.\n" \
-	    "\tPlease try installing the correct version of automake."
-fi
-
-exec "${binary}" "$@"
-# The shell will error out if `exec` failed.


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2023-03-26  4:07 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-26 17:49 [gentoo-commits] repo/gentoo:master commit in: sys-devel/automake-wrapper/files/, sys-devel/automake-wrapper/ Thomas Deutschmann
  -- strict thread matches above, loose matches on Subject: below --
2023-03-26  4:07 Sam James
2020-09-24 15:45 Lars Wendler
2015-12-16 22:52 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox