diff options
| -rw-r--r-- | dev-util/ccache/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/ccache/ccache-3.1.7.ebuild | 19 | ||||
| -rw-r--r-- | dev-util/ccache/files/ccache-3.1.7-no-perl.patch | 15 |
3 files changed, 31 insertions, 9 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/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 |