Remove duplication between ebuild/wrapper.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 17 insertions, 23 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/Manifest b/sys-devel/autoconf-wrapper/Manifest
index 805cb456384e..24b8b94e33a4 100644
--- a/sys-devel/autoconf-wrapper/Manifest
+++ b/sys-devel/autoconf-wrapper/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX ac-wrapper-7.sh 4325 RMD160 e52f8df68baa9503f6e18ea4048cae5704d5a6bd SHA1 4d581cd816b7c3bef77b54e3990f91ba11ff3767 SHA256 1f126a3fcd45fec152b6fcc77f71a682bd12586ee9c457a4c5c27d184f4c29b6
 AUX ac-wrapper-8.sh 4132 RMD160 f68600c5bb48cc7a103efed83f66261fce2475fc SHA1 9626122a8395a4f68259441dd6f65db6b3f5b5c9 SHA256 42dbd01eb411bbe58c590ad63d3e406860ab090cf5c971aeeaa7764f66f20a2d
-AUX ac-wrapper-9.sh 4141 RMD160 694067c056411f8e47fec4116ae8887a097b70ed SHA1 8e2deb858365f4e411e7c1b14e4c47f9cdf34f46 SHA256 41f44396482977f20f2fbc5446ec123c2e662bb780efc671acf3a6431a92e2eb
+AUX ac-wrapper-9.sh 4150 RMD160 aee7a4d7dc8d05f01b306444ef14956743dc11b0 SHA1 40c32c83ed22656f63ecb75ee7013cac99dfc337 SHA256 91ce1047aec2f4ab3f748b91635202b4684985e77cce712573161f8729e04f9b
 EBUILD autoconf-wrapper-7.ebuild 794 RMD160 f0a96dbfa8447595cffafa305be80a1dd960a88b SHA1 9796574b6b8b7e6448fd5c4cba28fd9c6fae972a SHA256 13dc42cb33f3296f33b6b12470dc9b35da57272c890026852187da84a13beb41
 EBUILD autoconf-wrapper-8.ebuild 1005 RMD160 89c9a05568aa6f677c56ff66dfbe702f4ed7f464 SHA1 8547f3ef1d2ba34b66cef34cc73ba67455eb9fd0 SHA256 9abffe402d5753068757cb98b05025d989ee356897f8dd3bc03d48b1e24c98df
-EBUILD autoconf-wrapper-9-r1.ebuild 1282 RMD160 fcb669bc04d72da2d342c6ffb959681e4fcba603 SHA1 3362efe095e8d78c1ce1d72095b4d2bc93442310 SHA256 a354707c0eb04eacb93e56fadacf59167cafa71ecab30d95a6c6df1cb3ee5f18
-EBUILD autoconf-wrapper-9.ebuild 1014 RMD160 e1461e5a34b8d0f36da4e584615a004b90398fa1 SHA1 c53b071a2e37787b5aea6cce38a6f6a5af3bed0e SHA256 a8ceb3fdf09d8d5e4e2e55d95b71e90f54d80f2ed3ed5e1f9c0b6a365a97e76b
-MISC ChangeLog 10197 RMD160 f805740c4377e3d280cd37b895314231f852384d SHA1 3f1a9a21c320c33ba8301b7a0322548d1ee70676 SHA256 775881a2c6cc1696dffcdc6dbcc75b9c0073b0b98953f8d812a04d2fb281155b
+EBUILD autoconf-wrapper-9-r1.ebuild 1017 RMD160 44bdafb5432ebd53319b831525840089dadff73f SHA1 5b3eecaaeea1373d9085daca9af20577b1d945b2 SHA256 a04d1437b20a431a32a068443b458a4575cffebad1e8dd5f90b796026e495a7d
+MISC ChangeLog 10345 RMD160 a2ddf47ec9d351fa9842ef5579c82f86b188a0fd SHA1 0ebbcb3fc19a0ce3b2e355a62ce293224e7d4599 SHA256 8940547e0ec1bfb038fa2bcc45e1fa8653d121284ebd017b7919df4a8c490705
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkxclXgACgkQAiZjviIA2XhcWwCfa6QPf2+FnGnqzc4gd7zTB5l+
-BNAAoIVf/IA00A/vdyqsqP39RL7c/HjE
-=mc0J
+iF4EAREIAAYFAkxdxbwACgkQTwhj9JtAlp6RuwD/VxKsKUZgVbA9/8j1pDiFGKnc
+1o96bddQNMdZrFVq/QMA/jxnFgcF0H+h0aj6jgAk5ELk7Ke9KcbM7MQJbISRZfA8
+=kKCe
 -----END PGP SIGNATURE-----
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