diff options
Diffstat (limited to 'sys-devel/autoconf-wrapper')
4 files changed, 44 insertions, 13 deletions
diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog index 3fa492c122aa..c1a0e86231dd 100644 --- a/sys-devel/autoconf-wrapper/ChangeLog +++ b/sys-devel/autoconf-wrapper/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/autoconf-wrapper # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.38 2006/11/05 08:44:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.39 2006/11/05 10:24:37 vapier Exp $ + +*autoconf-wrapper-4-r1 (05 Nov 2006) + + 05 Nov 2006; Mike Frysinger <vapier@gentoo.org> files/ac-wrapper-4.sh, + +autoconf-wrapper-4-r1.ebuild: + Fix up SLOT/VER collision as pointed out by Alexis Ballier. *autoconf-wrapper-4 (05 Nov 2006) diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-4-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-4-r1.ebuild new file mode 100644 index 000000000000..ee46b37cfad4 --- /dev/null +++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-4-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-4-r1.ebuild,v 1.1 2006/11/05 10:24:37 vapier Exp $ + +inherit multilib + +DESCRIPTION="wrapper for autoconf to manage multiple autoconf 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}"/ac-wrapper-${PV}.sh ac-wrapper.sh || die + + 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 + done +} diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh index 37b94930e223..993fbb512180 100755 --- a/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh +++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-4.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/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.1 2006/11/05 08:44:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-4.sh,v 1.2 2006/11/05 10:24:37 vapier Exp $ # Based on the ac-wrapper.pl script provided by MandrakeSoft # Rewritten in bash by Gregorio Guidi @@ -35,10 +35,7 @@ vers="2.60:2.5 2.59:2.5 2.13:2.1" binary="" for v in ${vers} ; do - auto_ver=${v%:*} # aka 2.60 - want_ver=${v#*:} # aka 2.5 - eval binary_${want_ver/./_}="${0}-${auto_ver}" - + auto_ver=${v%:*} if [ -z "${binary}" ] && [ -x "${0}-${auto_ver}" ] ; then binary="${0}-${auto_ver}" fi @@ -62,14 +59,15 @@ if [ -n "${WANT_AUTOCONF}" ] ; then break fi + auto_ver=${v%:*} want_ver=${v#*:} for wx in ${WANT_AUTOCONF} ; do - if [ "${wx}" = "${want_ver}" ] ; then - binary="binary_${want_ver/./_}" - binary="${!binary}" - break + if [ "${wx}" = "${want_ver}" ] && [ -x "${0}-${auto_ver}" ] ; then + binary="${0}-${auto_ver}" + v="x" fi done + [ "${v}" = "x" ] && break done fi @@ -125,7 +123,7 @@ if [[ ${WANT_AUTOCONF} != "2.5" ]] && [[ -n ${WANT_AUTOMAKE} ]] ; then && confversion=$(generated_version configure) if [[ ${confversion} == "2.1" && ! -f "configure.ac" ]] ; then - binary="${binary_2_1}" + binary="${0}-2.13" fi esac fi @@ -141,9 +139,9 @@ fi # for further consistency # for v in ${vers} ; do + auto_ver=${v%:*} want_ver=${v#*:} - mybin="binary_${want_ver/./_}" - if [ "${binary}" = "${!mybin}" ] ; then + if [ "${binary}" = "${0}-${auto_ver}" ] ; then export WANT_AUTOMAKE="${want_ver}" fi done diff --git a/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-4-r1 b/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-4-r1 new file mode 100644 index 000000000000..e69de29bb2d1 --- /dev/null +++ b/sys-devel/autoconf-wrapper/files/digest-autoconf-wrapper-4-r1 |