Remove duplication between ebuild/wrapper.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 9 insertions, 14 deletions

diff --git a/sys-devel/autoconf-wrapper/ChangeLog b/sys-devel/autoconf-wrapper/ChangeLog
index be494c08e9d0..0225ff80b8ef 100644
--- a/sys-devel/autoconf-wrapper/ChangeLog
+++ b/sys-devel/autoconf-wrapper/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/autoconf-wrapper
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.76 2010/08/06 23:05:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/ChangeLog,v 1.77 2010/08/07 20:43:35 vapier Exp $
+
+  07 Aug 2010; Mike Frysinger <vapier@gentoo.org> autoconf-wrapper-9-r1.ebuild,
+  files/ac-wrapper-9.sh:
+  Remove duplication between ebuild/wrapper.
 
 *autoconf-wrapper-9-r1 (06 Aug 2010)
 
diff --git a/sys-devel/autoconf-wrapper/autoconf-wrapper-9-r1.ebuild b/sys-devel/autoconf-wrapper/autoconf-wrapper-9-r1.ebuild
index 07ceefa85f9c..2287bb8ed01f 100644
--- a/sys-devel/autoconf-wrapper/autoconf-wrapper-9-r1.ebuild
+++ b/sys-devel/autoconf-wrapper/autoconf-wrapper-9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-9-r1.ebuild,v 1.1 2010/08/06 23:05:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/autoconf-wrapper-9-r1.ebuild,v 1.2 2010/08/07 20:43:35 vapier Exp $
 
 inherit multilib
 
@@ -15,18 +15,9 @@ IUSE=""
 
 S=${WORKDIR}
 
-SUPPORTED_AC_VERSIONS="2.67:2.5 2.66:2.5 2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
-
-src_compile() {
-	sed -e "/vers=/s|\".*\"|\"${SUPPORTED_AC_VERSIONS}\"|" \
-		"${FILESDIR}"/ac-wrapper-${PV}.sh \
-		> "${T}"/ac-wrapper.sh \
-		|| die "ac-wrapper sed failed"
-}
-
 src_install() {
 	exeinto /usr/$(get_libdir)/misc
-	doexe "${T}"/ac-wrapper.sh || die
+	newexe "${FILESDIR}"/ac-wrapper-${PV}.sh ac-wrapper.sh || die
 
 	dodir /usr/bin
 	local x=
diff --git a/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh b/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh
index 8d876534e484..6947e353a1a4 100755
--- a/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh
+++ b/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh
@@ -1,7 +1,7 @@
 #!/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/autoconf-wrapper/files/ac-wrapper-9.sh,v 1.1 2010/07/03 17:58:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-9.sh,v 1.2 2010/08/07 20:43:35 vapier Exp $
 
 # Based on the ac-wrapper.pl script provided by MandrakeSoft
 # Rewritten in bash by Gregorio Guidi
@@ -32,7 +32,7 @@ fi
 #
 # Set up bindings between actual version and WANT_AUTOCONF
 #
-vers="2.66:2.5 2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
+vers="2.67:2.5 2.66:2.5 2.65:2.5 2.64:2.5 2.63:2.5 2.62:2.5 2.61:2.5 2.60:2.5 2.59:2.5 2.13:2.1"
 
 binary=""
 for v in ${vers} ; do