diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-11-05 10:22:00 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-11-05 10:22:00 +0000 |
| commit | 497907eccad871caf658761805666b9c8564f3df (patch) | |
| tree | 15e2999d236bf0b86b06cad6efde986923fc3c1d /sys-devel | |
| parent | version bump to 1.12.6; 1.11.15 is broken; cleanup (diff) | |
| download | gentoo-2-497907eccad871caf658761805666b9c8564f3df.tar.gz gentoo-2-497907eccad871caf658761805666b9c8564f3df.tar.bz2 gentoo-2-497907eccad871caf658761805666b9c8564f3df.zip | |
Make sure we break out of new loop as reported by Alexis Ballier.
(Portage version: 2.1.2_rc1-r2)
Diffstat (limited to 'sys-devel')
4 files changed, 42 insertions, 3 deletions
diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog index fd22773fb23b..bdb3bc7fe297 100644 --- a/sys-devel/automake-wrapper/ChangeLog +++ b/sys-devel/automake-wrapper/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/automake-wrapper # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.17 2006/11/05 08:11:18 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.18 2006/11/05 10:22:00 vapier Exp $ + +*automake-wrapper-3-r1 (05 Nov 2006) + + 05 Nov 2006; Mike Frysinger <vapier@gentoo.org> files/am-wrapper-3.sh, + +automake-wrapper-3-r1.ebuild: + Make sure we break out of new loop as reported by Alexis Ballier. *automake-wrapper-3 (05 Nov 2006) diff --git a/sys-devel/automake-wrapper/automake-wrapper-3-r1.ebuild b/sys-devel/automake-wrapper/automake-wrapper-3-r1.ebuild new file mode 100644 index 000000000000..3bc808748a07 --- /dev/null +++ b/sys-devel/automake-wrapper/automake-wrapper-3-r1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/automake-wrapper-3-r1.ebuild,v 1.1 2006/11/05 10:22:00 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 ~sparc-fbsd ~x86 ~x86-fbsd" +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/sys-devel/automake-wrapper/files/am-wrapper-3.sh b/sys-devel/automake-wrapper/files/am-wrapper-3.sh index ff8cde7b22c5..5596468e64ea 100755 --- a/sys-devel/automake-wrapper/files/am-wrapper-3.sh +++ b/sys-devel/automake-wrapper/files/am-wrapper-3.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2006 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-3.sh,v 1.2 2006/11/05 08:22:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-3.sh,v 1.3 2006/11/05 10:22:00 vapier Exp $ # Based on the am-wrapper.pl script provided by MandrakeSoft # Rewritten in bash by Gregorio Guidi @@ -88,12 +88,16 @@ if [ -n "${WANT_AUTOMAKE}" ] ; then if [ "${wx}" = "${v}" ] ; then binary="binary_${v/./_}" binary="${!binary}" - break + v="x" fi done + [ "${v}" = "x" ] && break done fi +# +# autodetect helpers +# do_awk() { local file=$1 ; shift local arg=$1 ; shift diff --git a/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1 b/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1 |