Bump zram-init. Update ccache with latest gentoo patches

8 files changed, 53 insertions, 51 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index 8fb51920..c159fb2b 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Oct 2013; Martin Väth <martin@mvath.de>:
+  Add latest changes from the Gentoo tree (support also icc, fix tests)
+
   14 Sep 2013; Martin Väth <martin@mvath.de>:
   Bump to git-r3.eclass
 
diff --git a/dev-util/ccache/ccache-99999999.ebuild b/dev-util/ccache/ccache-99999999.ebuild
index 3581944e..03d450c7 100644
--- a/dev-util/ccache/ccache-99999999.ebuild
+++ b/dev-util/ccache/ccache-99999999.ebuild
@@ -24,10 +24,11 @@ DEPEND="${RDEPEND}
 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
-	epatch "${FILESDIR}"/ccache-clang.patch
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-2 > ccache-config || die
 	epatch_user
 	eautoreconf
 }
@@ -37,21 +38,28 @@ src_install() {
 	dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt
 
 	dobin ccache-config
-	rm -rfv -- "${D}/root"
+#	rm -rfv -- "${D}/root"
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
+		"${EROOT}"/usr/bin/ccache-config --remove-links
+		"${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
+	fi
 }
 
 pkg_postinst() {
-	"${ROOT}"/usr/bin/ccache-config --install-links
-	"${ROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+	"${EROOT}"/usr/bin/ccache-config --install-links
+	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
 
 	# nuke broken symlinks from previous versions that shouldn't exist
-	rm -f "${ROOT}/usr/$(get_libdir)/ccache/bin/${CHOST}-cc"
-	[[ -d "${ROOT}/usr/$(get_libdir)/ccache.backup" ]] && \
-		rm -rf "${ROOT}/usr/$(get_libdir)/ccache.backup"
+	rm -f "${EROOT}/usr/$(get_libdir)/ccache/bin/${CHOST}-cc"
+	[[ -d "${EROOT}/usr/$(get_libdir)/ccache.backup" ]] && \
+		rm -rf "${EROOT}/usr/$(get_libdir)/ccache.backup"
 
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		elog "To use ccache with **non-Portage** C compiling, add"
-		elog "/usr/$(get_libdir)/ccache/bin to the beginning of your path, before /usr/bin."
+		elog "${EPREFIX}/usr/$(get_libdir)/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin."
 		elog "Portage 2.0.46-r11+ will automatically take advantage of ccache with"
 		elog "no additional steps."
 		elog
@@ -63,4 +71,7 @@ pkg_postinst() {
 		elog "all of your caches like so:"
 		elog "# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C"
 	fi
+	if has_version "<${CATEGORY}/${PN}-3.1.9-r2" ; then
+		elog "ccache now supports sys-devel/clang and dev-lang/icc, too!"
+	fi
 }
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 00000000..5abd15e1
--- /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
diff --git a/dev-util/ccache/files/ccache-clang.patch b/dev-util/ccache/files/ccache-clang.patch
deleted file mode 100644
index 8c766b30..00000000
--- a/dev-util/ccache/files/ccache-clang.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 1/ccache-config
-+++ 1/ccache-config
-@@ -66,15 +66,17 @@
- }
- cc_links() {
- 	local a
--	for a in gcc cc c++ g++ ; do
--		if [ -n "${2}" ] ; then
--			# gcc-config doesnt install ${CHOST}-cc, so until
--			# it does, don't install a ccache symlink for it
--			[ "${a}" = "cc" ] && continue
--			a="${2}-${a}"
--		fi
--		eval "cc_${1}_link" "${a}"
--	done
-+	if [ -z "${2}" ] ; then
-+		# gcc-config doesn't install ${CHOST}-cc, so until
-+		# it does, don't install a ccache symlink for it
-+		for a in cc clang clang++
-+		do	eval "cc_${1}_link" "${a}"
-+		done
-+	else
-+		for a in gcc c++ g++
-+		do	eval "cc_${1}_link" "${2}-${a}"
-+		done
-+	fi
- }
- 
- ###
diff --git a/dev-util/ccache/files/ccache-config b/dev-util/ccache/files/ccache-config-2
index 8c1bcb2d..e00e7b6c 100644
--- a/dev-util/ccache/files/ccache-config
+++ b/dev-util/ccache/files/ccache-config-2
@@ -2,7 +2,8 @@
 #
 # ccache-config - helper script for ccache and its ebuild
 #
-# Copyright 2003-2010 Superlucidity Services, LLC
+# Copyright 2003-2013 Superlucidity Services, LLC
+# Copyright 2013 Gentoo Foundation
 # This program licensed under the GNU GPL version 2.
 #
 # This script developed by Zachary T Welch at Superlucidity Services, LLC
@@ -10,7 +11,9 @@
 #
 # Additional features to come; this provides a starting point
 
-. /etc/init.d/functions.sh 2>/dev/null || {
+EPREFIX=''
+
+. "${EPREFIX}"/etc/init.d/functions.sh 2>/dev/null || {
 	ebegin() { echo " * $* ..."; }
 	eend() {
 		local r=${1:-$?}
@@ -37,7 +40,7 @@ c_eend()   { c_quiet || eend "$@" ; }
 #  automatically update ccache's links when upgrading toolchains
 #
 cc_path() {
-	echo ${ROOT%/}/usr/${LIBDIR}/ccache/bin/$1
+	echo ${ROOT%/}${EPREFIX}/usr/${LIBDIR}/ccache/bin/$1
 }
 cc_remove_link() {
 	local t=$(cc_path "$1")
@@ -60,20 +63,14 @@ cc_install_link() {
 		# then create the new link
 		local t=$(cc_path "$1")
 		c_ebegin "Creating ccache shadow link ${t}"
-		mkdir -p -m 0755 "${t%/*}" && ln -s /usr/bin/ccache "${t}"
+		mkdir -p -m 0755 "${t%/*}" && ln -s "${EPREFIX}"/usr/bin/ccache "${t}"
 		c_eend
 	fi
 }
 cc_links() {
 	local a
-	for a in gcc cc c++ g++ ; do
-		if [ -n "${2}" ] ; then
-			# gcc-config doesnt install ${CHOST}-cc, so until
-			# it does, don't install a ccache symlink for it
-			[ "${a}" = "cc" ] && continue
-			a="${2}-${a}"
-		fi
-		eval "cc_${1}_link" "${a}"
+	for a in gcc cc c++ g++ icc icpc clang clang++ ; do
+		eval "cc_${1}_link" "${2}${2:+-}${a}"
 	done
 }
 
diff --git a/sys-block/zram-init/ChangeLog b/sys-block/zram-init/ChangeLog
index b68896a4..100d2fcd 100644
--- a/sys-block/zram-init/ChangeLog
+++ b/sys-block/zram-init/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zram-init-2.5.ebuild (07 Oct 2013)
+
+  07 Oct 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild.
+
 *zram-init-2.4.ebuild (06 Oct 2013)
 
   06 Oct 2013; Martin Väth <martin@mvath.de>:
diff --git a/sys-block/zram-init/Manifest b/sys-block/zram-init/Manifest
index 7842778e..8eeaf0fa 100644
--- a/sys-block/zram-init/Manifest
+++ b/sys-block/zram-init/Manifest
@@ -1 +1 @@
-DIST zram-init-2.4.tar.gz 4220 SHA256 9cb4f7247c80ea4f2b0b2dc503133465bd9beae4aec476213c8fadddef180f57 SHA512 d8478cc3ab80df9d92ff79e8da571d1fcab9b417c313c5e7a0ea3c75b6282a411ba80fdab7d5dac0770188286afd62bd5cbba9029d29153212374744e9497575 WHIRLPOOL 531f6691c8086cd8e3b969f0dff983af45e6debe39742b5cb5384ddf6ef382167e80ef8e265a4722331d78c0cecf275eee3c31d03f80636cc1f20f10dedbd9af
+DIST zram-init-2.5.tar.gz 4802 SHA256 e9770e611a47b9826ed215720674cafdabe6b7612d6fc4b6b448732429cc9a06 SHA512 501fb29aa68d21e054505076bf8b6a46843413d3f169d6c82e042fb4dbd8507c82d11471b742a2f322fc7dd40e3434a0e2406aa0ce0d01bf3e1732372747a33d WHIRLPOOL cb5e422e45a1f5617056c819414e92578a4e5b37f71d168d2cd8e590f0da559078200a831a03dc1b17aa548aeb2e1d37a5b9224206cf72fd0ef653d9ec613ac6
diff --git a/sys-block/zram-init/zram-init-2.4.ebuild b/sys-block/zram-init/zram-init-2.5.ebuild
index e47e141e..e47e141e 100644
--- a/sys-block/zram-init/zram-init-2.4.ebuild
+++ b/sys-block/zram-init/zram-init-2.5.ebuild