From 5cbfd2a911e2034ba497c2d814e2fc40a9d01446 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 20 Oct 2011 10:14:49 -0400 Subject: [PATCH] sys-devel/automake-wrapper: import ebuild from upstream We have a keyword desync between the arches with version 4 and 5, so pull in the latest upstream version 5 ebuild with all our arches stabilized. For amd64/x86, there shouldn't be anything different. BUG=None TEST=`emerge automake-wrapper` works TEST=build_packages works for arm-generic/amd64-generic/x86-alex Change-Id: Idc8b88ad543f807dfd5b7d86472a9344695b627a Reviewed-on: http://gerrit.chromium.org/gerrit/10414 Reviewed-by: Matt Tennant Commit-Ready: Mike Frysinger Tested-by: Mike Frysinger --- .../automake-wrapper-4.ebuild | 29 ----------- .../automake-wrapper-5.ebuild | 37 ++++++++++++++ .../{am-wrapper-4.sh => am-wrapper-5.sh} | 51 +++++++++---------- 3 files changed, 60 insertions(+), 57 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-5.ebuild rename sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/files/{am-wrapper-4.sh => am-wrapper-5.sh} (74%) diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-4.ebuild deleted file mode 100644 index 834f1ae4e6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-4.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-4.ebuild,v 1.9 2010/05/31 19:18:14 josejx Exp $ - -inherit multilib - -DESCRIPTION="wrapper for automake to manage multiple automake versions" -HOMEPAGE="http://www.gentoo.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-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_install() { - exeinto /usr/$(get_libdir)/misc - newexe "${FILESDIR}"/am-wrapper-${PV}.sh am-wrapper.sh || die - - keepdir /usr/share/aclocal - - dodir /usr/bin - local x= - for x in aclocal automake ; do - dosym ../$(get_libdir)/misc/am-wrapper.sh /usr/bin/${x} - done -} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-5.ebuild new file mode 100644 index 0000000000..e6385a33d9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/automake-wrapper-5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-5.ebuild,v 1.6 2011/10/20 14:11:50 vapier Exp $ + +inherit multilib + +DESCRIPTION="wrapper for automake to manage multiple automake versions" +HOMEPAGE="http://www.gentoo.org/" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-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 "${T}"/ + # usr/bin/aclocal: bad substitution -> /bin/sh != POSIX shell + if use prefix ; then + sed -i -e '1c\#!'"${EPREFIX}"'/bin/sh' "${T}"/am-wrapper-${PV}.sh || die + fi +} + +src_install() { + exeinto /usr/$(get_libdir)/misc + newexe "${T}"/am-wrapper-${PV}.sh am-wrapper.sh || die + + keepdir /usr/share/aclocal + + dodir /usr/bin + local x= + for x in aclocal automake ; do + dosym ../$(get_libdir)/misc/am-wrapper.sh /usr/bin/${x} + done +} diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/files/am-wrapper-4.sh b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/files/am-wrapper-5.sh similarity index 74% rename from sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/files/am-wrapper-4.sh rename to sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/files/am-wrapper-5.sh index 2b222ce29f..dbf6df6b9e 100755 --- a/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/files/am-wrapper-4.sh +++ b/sdk_container/src/third_party/portage-stable/sys-devel/automake-wrapper/files/am-wrapper-5.sh @@ -1,7 +1,7 @@ -#!/usr/bin/env bash -# Copyright 1999-2006 Gentoo Foundation +#!/bin/sh +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-4.sh,v 1.2 2010/02/24 08:08:28 mduft Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-5.sh,v 1.1 2010/03/07 15:45:40 vapier Exp $ # Based on the am-wrapper.pl script provided by MandrakeSoft # Rewritten in bash by Gregorio Guidi @@ -46,9 +46,11 @@ # -or- # - 'aclocal.m4' contain AM_AUTOMAKE_VERSION, specifying the use of 1.4 +warn() { printf "am-wrapper: $*\n" 1>&2; } +err() { warn "$@"; exit 1; } + if [ "${0##*/}" = "am-wrapper.sh" ] ; then - echo "Don't call this script directly." >&2 - exit 1 + err "Don't call this script directly" fi vers="1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4" @@ -59,17 +61,14 @@ vers="1.11 1.10 1.9 1.8 1.7 1.6 1.5 1.4" # binary="" for v in ${vers} ; do - eval binary_${v/./_}="${0}-${v}" - if [ -z "${binary}" ] && [ -x "${0}-${v}" ] ; then binary="${0}-${v}" fi done if [ -z "${binary}" ] ; then - echo "am-wrapper: Unable to locate any usuable version of automake." >&2 - echo " I tried these versions: ${vers}" >&2 - echo " With a base name of '${0}'." >&2 - exit 1 + err "Unable to locate any usuable version of automake.\n" \ + "\tI tried these versions: ${vers}\n" \ + "\tWith a base name of '${0}'." fi # @@ -79,15 +78,14 @@ fi if [ -n "${WANT_AUTOMAKE}" ] ; then for v in ${vers} x ; do if [ "${v}" = "x" ] ; then - echo "am-wrapper: warning: invalid WANT_AUTOMAKE '${WANT_AUTOMAKE}'; ignoring." >&2 + warn "warning: invalid WANT_AUTOMAKE '${WANT_AUTOMAKE}'; ignoring." unset WANT_AUTOMAKE break fi for wx in ${WANT_AUTOMAKE} ; do if [ "${wx}" = "${v}" ] ; then - binary="binary_${v/./_}" - binary="${!binary}" + binary="${0}-${v}" v="x" fi done @@ -117,11 +115,11 @@ if [ -z "${WANT_AUTOMAKE}" ] ; then fi for v in ${vers} ; do - if [ "${confversion_mf}" = "${v}" ] \ - || [ "${confversion_ac}" = "${v}" ] \ - || [ "${confversion_am}" = "${v}" ] ; then - binary="binary_${v/./_}" - binary="${!binary}" + if [ "${confversion_mf}" = "${v}" ] || \ + [ "${confversion_ac}" = "${v}" ] || \ + [ "${confversion_am}" = "${v}" ] + then + binary="${0}-${v}" break fi done @@ -129,17 +127,16 @@ fi if [ "${WANT_AMWRAPPER_DEBUG}" ] ; then if [ "${WANT_AUTOMAKE}" ] ; then - echo "am-wrapper: DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}" >&2 + warn "DEBUG: WANT_AUTOMAKE is set to ${WANT_AUTOMAKE}" fi - echo "am-wrapper: DEBUG: will execute <$binary>" >&2 + warn "DEBUG: will execute <$binary>" fi # # for further consistency # for v in ${vers} ; do - mybin="binary_${v/./_}" - if [ "${binary}" = "${!mybin}" ] ; then + if [ "${binary}" = "${0}-${v}" ] ; then export WANT_AUTOMAKE="${v}" fi done @@ -148,12 +145,10 @@ done # Now try to run the binary # if [ ! -x "${binary}" ] ; then - echo "am-wrapper: $binary is missing or not executable." >&2 - echo " Please try emerging the correct version of automake." >&2 - exit 1 + err "$binary is missing or not executable.\n" \ + "\tPlease try emerging the correct version of automake." fi exec "$binary" "$@" -echo "am-wrapper: was unable to exec $binary !?" >&2 -exit 1 +err "was unable to exec $binary !?"