Update to EAPI=4, and avoid perl requirement in tests #421609 by Leon Schoorl.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 54 insertions, 11 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index c9fa61899e80..5a2cb45c3fba 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/ccache
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.95 2012/06/07 22:15:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.96 2012/06/24 03:28:03 vapier Exp $
+
+  24 Jun 2012; Mike Frysinger <vapier@gentoo.org>
+  +files/ccache-3.1.7-no-perl.patch, ccache-3.1.7.ebuild:
+  Update to EAPI=4, and avoid perl requirement in tests #421609 by Leon Schoorl.
 
   07 Jun 2012; Brent Baude <ranger@gentoo.org> ccache-3.1.7.ebuild:
   Marking ccache-3.1.7 ppc for bug 418945
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 991c86b525b0..60dd490a97c2 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ccache-2.4-profile.patch 1069 RMD160 9eaf92f401202a06ee0d0f468a2ff6e728456a24 SHA1 9177ae6bb8c7a95079a045eff3b7d0a1f33f427e SHA256 7cd6e8fcd2fc90aac484ff83c1181c82eca4ec3e2d568c10025f67ac751a6794
 AUX ccache-2.4-respectflags.patch 403 RMD160 19efa0fcb27eba9fe7ec086b8d6e261e4485f275 SHA1 27fbedc4ee219ee6f9b2c17ef8fa30dd91a024f5 SHA256 f7006cc34ecc8315b023d4533273d47a7a34958e7037242811a58ee8570efbd5
 AUX ccache-2.4-utimes.patch 3267 RMD160 57bf223bbc1da41e3955cf017aa5d472cf93b19f SHA1 e9d63db657ef4273e8c27ddf6ae6deb8127540d1 SHA256 72f617b329a68c9db57180a9940689a48acee771067392a2d68b8abf8cdf891a
 AUX ccache-2.4-xrealloc.patch 742 RMD160 7d800bfc937c00b51a073705815ae6ff5d4add8d SHA1 bfbf2e090a72c91417090b6dc030649b39969a16 SHA256 119c8fb7f3ec725444e416e42d690fdf81470213a837274bc5375f659942147c
+AUX ccache-3.1.7-no-perl.patch 400 RMD160 ad66e72ce640cd5055fc29985f21edfe4b0af449 SHA1 c2dac57af8be68209adda398e4f1767f02b2aa92 SHA256 5784419b79e89bda1bf0a8d053c26c9d798dc88ef0756f19c0b0d40f93c3aef8
 AUX ccache-config 2094 RMD160 f4b08a64acf4c334611fbc6ea39682f51b391ccf SHA1 f22d37d8b169599f6edce231377302a52dbf0d9d SHA256 c330108e2b5d364a4b5f63518d38af4a0e2d47fb7626ae85f8341ca222f04995
 DIST ccache-2.4.tar.gz 86363 RMD160 43a0647c7faf659121a53a92ec45d245b8140124 SHA1 9833ec13de9b90d5409e60d679ac681115ef465e SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0
 DIST ccache-3.1.1.tar.gz 324042 RMD160 2996b6821c656640af95d1a95651b02d08dcd034 SHA1 41e385066bcaf87416aafa17115aef8523751bff SHA256 eb0b37e25ecfdf1262e0da7fc5f01d986923589803c230dcb7213ecbead3aed1
@@ -21,6 +25,23 @@ EBUILD ccache-3.1.3.ebuild 1841 RMD160 00bf2370ea5c603bb37f0ca2c58bfd841b7e3a81
 EBUILD ccache-3.1.4.ebuild 1841 RMD160 48b01ada1218e8634f9cba3433767f2f4573aacf SHA1 d6e6d4b70080bc7b220e4ce56dc076daa8ac3438 SHA256 004fabbe69d64efed9335e121dac60058ab57a09269c162b46204c4121826c3e
 EBUILD ccache-3.1.5.ebuild 1841 RMD160 ab54d113184dddcdab1a1c5b89e6fee516e40110 SHA1 76b03a9be755b66afe894a7609ab66c10f196a54 SHA256 831bcc798698934d8d1dee38e8a9170721a85861f449b00eba94acc74b8e505c
 EBUILD ccache-3.1.6.ebuild 1829 RMD160 c754f0530d2228fa467e3bc0851ae616b4d598c5 SHA1 e501d1ca2d1be4d098fd8aede6fe96de00e8e181 SHA256 289838680ac3fd1b477882273318ac78101ea8806724053f543f4ebe6f965a4d
-EBUILD ccache-3.1.7.ebuild 1836 RMD160 d7478bdcb1baa4a261f4d7e1102d916039c6b0b8 SHA1 a67864fcdcae31d8b202098511f23a27e60442f0 SHA256 4fdc6dee0822f3a7802ae64157019f9d3ca054c2f315ecac354d9f967507caca
-MISC ChangeLog 12341 RMD160 afad4241f103a5ff501f63bed258336ae60d56f7 SHA1 9318fb758d24ac359cc1cf46528e30779f31b06a SHA256 614f1189065e8bf1771393583561605aacc10036e7ffa348e6a3861b1d4d7f9e
+EBUILD ccache-3.1.7.ebuild 1874 RMD160 48403a8f1dcad7cb55814e4359e23b75a78c17b4 SHA1 4b666a98cb23d79b1a4f93a1c550602a4f6fa3c7 SHA256 1aa2e574c606842957f9d04d82e50d805926619970346985e24c39f2412818d5
+MISC ChangeLog 12531 RMD160 1d6fbed5daa93ba566f04c8440729326f1e70eb9 SHA1 057c3a5ee500f15796433db8d03ca0c7b9740b5c SHA256 ac0eb2c022c845621f9d18ea68db344d0f03d9c5074a4702947b6119dd57963b
 MISC metadata.xml 412 RMD160 964ade3959d81af2c5a0a88758db6ed87d80dba5 SHA1 0a38f42c23434ad993bf2d9bfd0b73552c50eb5b SHA256 c54d1b5f225e3a82754a2550d3875b7211249572a9372abdeff5fccda469aada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJP5olsAAoJELEHsLL7fEFWsAEP+gNVPVmSfcL2ZYDWGpjcAC71
+CPkDakmqb8JuG5egXKft8mVJMnbsyRsavyz6ej+bUMx83X/rs6UMXWbdYCIzgIbR
+2A3y54kdrpfMk5rsjKQwBlhwltMpXFUv0pnSYCZzQy5ED5YkmK1W0TOLAV6P2Q03
+K5MSxXF/ApTy6h/cPPiGkua06Iu/mturZlI7Cgqb2D4eCbjGxUic/A5qj6dvjyVd
+OO3Gk5jvnHCcV3NBiWs7QV+fT49b6DO8Cu6S/MDFdWZeia3bWbK1XWtsgjaMIgmb
+ruAuhMbARIc1QWIjOFp8j37kEYH5Qx6azqX/RLYHJR9t4mFC6Tsn0GN7pN7jYBkt
+X4d9zVFYO9aNjqFwEm/SBQJ1Jn1Vy4Xey0Pib9KdGaV+TaUQTqaGJ6PK9LxsfiQu
+j20agZzl0A6CGPDMCIr27L+vx4w+tHVHqV3Q9IoTBZ3DhOJwyi7d5GF80SSVr2DH
+6F+CrUyHGm+OkZP/3w2fLbll51Oh+aHeVfVqw84FFTlr65Ig1HU/k1hHMTmvh+IF
+mlqZxE2GEc52NDWQI3+OURNOLSW3dVWbFQ1eT+KVf5CuhuWBQArcfP42+UdDVxbh
++QDQizUCN6w2o49/p/LSgwcnYEaUBiAoRdO0XbnSIK/8+tttqgMcmHW416gqJpt4
+mAZGDNlh/LPPvZuyLxXD
+=tLjz
+-----END PGP SIGNATURE-----
diff --git a/dev-util/ccache/ccache-3.1.7.ebuild b/dev-util/ccache/ccache-3.1.7.ebuild
index 84a7f8a2af7b..ebe31ca83bdc 100644
--- a/dev-util/ccache/ccache-3.1.7.ebuild
+++ b/dev-util/ccache/ccache-3.1.7.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.7.ebuild,v 1.6 2012/06/07 22:15:47 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.7.ebuild,v 1.7 2012/06/24 03:28:03 vapier Exp $
 
-inherit multilib
+EAPI="4"
+
+inherit multilib eutils
 
 DESCRIPTION="fast compiler cache"
 HOMEPAGE="http://ccache.samba.org/"
@@ -16,19 +18,20 @@ IUSE=""
 RDEPEND="sys-libs/zlib"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	# make sure we always use system zlib
 	rm -rf zlib
+	epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609
+	sed \
+		-e "/^LIBDIR=/s:lib:$(get_libdir):" \
+		"${FILESDIR}"/ccache-config > ccache-config || die
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	default
 	dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt
 
-	dobin "${FILESDIR}"/ccache-config || die
-	dosed "/^LIBDIR=/s:lib:$(get_libdir):" /usr/bin/ccache-config
+	dobin ccache-config
 
 	diropts -m0700
 	dodir /root/.ccache
diff --git a/dev-util/ccache/files/ccache-3.1.7-no-perl.patch b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
new file mode 100644
index 000000000000..5abd15e1aaff
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.1.7-no-perl.patch
@@ -0,0 +1,15 @@
+avoid weak perl usage in tests
+
+https://bugs.gentoo.org/421609
+
+--- a/test.sh
++++ b/test.sh
+@@ -1466,7 +1466,7 @@
+     mkdir -p $dir
+     i=0
+     while [ $i -lt 10 ]; do
+-        perl -e 'print "A" x 4017' >$dir/result$i-4017.o
++        printf '%4017s' '' | tr ' ' 'A' >$dir/result$i-4017.o
+         touch $dir/result$i-4017.stderr
+         touch $dir/result$i-4017.d
+         if [ $i -gt 5 ]; then