Another attempt at bug 145167. Removing the stale wrappers in pkg_preinst.

(Portage version: 2.1.1)
 (Unsigned Manifest commit)

3 files changed, 11 insertions, 94 deletions

diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 7f879f0c1aa5..e8bd810b0b2e 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -29,18 +29,18 @@ EBUILD ccache-2.4-r2.ebuild 2174 RMD160 c16e692a6c7f5504866744f16dd08ad1919db797
 MD5 d8fc4b6cf11b073e96a430de6e308108 ccache-2.4-r2.ebuild 2174
 RMD160 c16e692a6c7f5504866744f16dd08ad1919db797 ccache-2.4-r2.ebuild 2174
 SHA256 3cc939d120fd394624046bb009a8f45bc37c77a78f4644c3b63021ec9afa3cce ccache-2.4-r2.ebuild 2174
-EBUILD ccache-2.4-r3.ebuild 2244 RMD160 c17b01dc3437d11c97d7ca7fbad3262443c4f25f SHA1 99f32502fca5ee89ac3d18bda95b2feafb7cc495 SHA256 dc892294975b4709a66b2a396702c35367051258942b90518a04a2e63eeab07c
-MD5 03ab505a292d70f99685dee3f65a31ed ccache-2.4-r3.ebuild 2244
-RMD160 c17b01dc3437d11c97d7ca7fbad3262443c4f25f ccache-2.4-r3.ebuild 2244
-SHA256 dc892294975b4709a66b2a396702c35367051258942b90518a04a2e63eeab07c ccache-2.4-r3.ebuild 2244
+EBUILD ccache-2.4-r4.ebuild 2250 RMD160 c22b72ee6f46c97bc036ce0dd4f79785861c26a3 SHA1 59205a234f93869c35f5035d0106ba465cc51be6 SHA256 c1fae7a31b44e079834952831fb390b05ab9a1cd56ff5a04fcdaadfd3f58ef83
+MD5 51698a43c3e7d5e13b5168a30db5c82c ccache-2.4-r4.ebuild 2250
+RMD160 c22b72ee6f46c97bc036ce0dd4f79785861c26a3 ccache-2.4-r4.ebuild 2250
+SHA256 c1fae7a31b44e079834952831fb390b05ab9a1cd56ff5a04fcdaadfd3f58ef83 ccache-2.4-r4.ebuild 2250
 EBUILD ccache-2.4.ebuild 2010 RMD160 73e8644470b7fd2b2c655060c2c9c39eec4ced15 SHA1 2635b77e89eb0869bd0cd0f9cbb1e836088ae815 SHA256 b8ea1fab4823e2f7d1617746f00a9a345aff12cf38a86ebcc4336f78d68f133e
 MD5 022d1231138f39cbb44c900cd8c32acd ccache-2.4.ebuild 2010
 RMD160 73e8644470b7fd2b2c655060c2c9c39eec4ced15 ccache-2.4.ebuild 2010
 SHA256 b8ea1fab4823e2f7d1617746f00a9a345aff12cf38a86ebcc4336f78d68f133e ccache-2.4.ebuild 2010
-MISC ChangeLog 5797 RMD160 e3fbb57473ae7043e708d00b0314ee552bb2f944 SHA1 4b54521989a632efdd3da3f5bf93ccba4b5931c5 SHA256 337ad0fb76b6a11b85074ce74bc92bcb2a2c3242f699ac39a64188700a6bc133
-MD5 7d9a0503e7410c1b8986dfab9e6feb9b ChangeLog 5797
-RMD160 e3fbb57473ae7043e708d00b0314ee552bb2f944 ChangeLog 5797
-SHA256 337ad0fb76b6a11b85074ce74bc92bcb2a2c3242f699ac39a64188700a6bc133 ChangeLog 5797
+MISC ChangeLog 5998 RMD160 2595838079f76d70474065222a346fc5d870b31a SHA1 7ed208a0d69d1a9dc73afd476e829c86e1f98217 SHA256 92605b83673696cc3f8146d1a65948ea61d5a4c3795ba8e8b8785f270c137e70
+MD5 1c0661849e05bb0cdb5406b8b2db83f6 ChangeLog 5998
+RMD160 2595838079f76d70474065222a346fc5d870b31a ChangeLog 5998
+SHA256 92605b83673696cc3f8146d1a65948ea61d5a4c3795ba8e8b8785f270c137e70 ChangeLog 5998
 MISC metadata.xml 386 RMD160 ce4575786bca697d8f590d466ac4ffbeaed873cb SHA1 c1c307ca690b90b14ef22dfeb2f467dd4076ccd7 SHA256 c15bee3a15e41c52b133ef6b2ec2fb16ba668d25f5c890d1ab3efa89a9043518
 MD5 0e91c81450afb11a7d06d7543dddcd57 metadata.xml 386
 RMD160 ce4575786bca697d8f590d466ac4ffbeaed873cb metadata.xml 386
@@ -60,6 +60,6 @@ SHA256 0c93b8a649be25d52071810b71684c206ad16fdfaebc1b1f8edf7681b620e35c files/di
 MD5 27bad4926cc94284b9b073c90dac85aa files/digest-ccache-2.4-r2 229
 RMD160 24aecd7bc84d836a161fc80f52e9c1aa3fe55e08 files/digest-ccache-2.4-r2 229
 SHA256 0c93b8a649be25d52071810b71684c206ad16fdfaebc1b1f8edf7681b620e35c files/digest-ccache-2.4-r2 229
-MD5 27bad4926cc94284b9b073c90dac85aa files/digest-ccache-2.4-r3 229
-RMD160 24aecd7bc84d836a161fc80f52e9c1aa3fe55e08 files/digest-ccache-2.4-r3 229
-SHA256 0c93b8a649be25d52071810b71684c206ad16fdfaebc1b1f8edf7681b620e35c files/digest-ccache-2.4-r3 229
+MD5 27bad4926cc94284b9b073c90dac85aa files/digest-ccache-2.4-r4 229
+RMD160 24aecd7bc84d836a161fc80f52e9c1aa3fe55e08 files/digest-ccache-2.4-r4 229
+SHA256 0c93b8a649be25d52071810b71684c206ad16fdfaebc1b1f8edf7681b620e35c files/digest-ccache-2.4-r4 229
diff --git a/dev-util/ccache/ccache-2.4-r3.ebuild b/dev-util/ccache/ccache-2.4-r3.ebuild
deleted file mode 100644
index 0786740e33cc..000000000000
--- a/dev-util/ccache/ccache-2.4-r3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-2.4-r3.ebuild,v 1.1 2006/09/13 10:21:39 lisa Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="http://ccache.samba.org/"
-SRC_URI="http://samba.org/ftp/ccache/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-# Note: this version is designed to be auto-detected and used if
-# you happen to have Portage 2.0.X+ installed.
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/ccache-2.4-respectflags.patch
-	epatch ${FILESDIR}/ccache-2.4-utimes.patch
-	eautoconf
-}
-
-do_links() {
-	insinto /usr/lib/ccache/bin
-	for a in ${CHOST}-{gcc,g++,c++} gcc c++ g++; do
-	  dosym /usr/bin/${a} /usr/lib/ccache/bin/${a}
-	done
-}
-
-
-src_install() {
-	dobin ccache || die
-	doman ccache.1
-	dodoc README
-	dohtml web/*.html
-
-	diropts -m0755
-	dodir /usr/lib/ccache/bin
-	keepdir /usr/lib/ccache/bin
-
-	exeinto /usr/bin
-	doexe ${FILESDIR}/ccache-config
-
-	diropts -m0700
-	if use ppc-macos; then
-		dodir /var/root/.ccache
-		keepdir /var/root/.ccache
-	else
-		dodir /root/.ccache
-		keepdir /root/.ccache
-	fi
-	if [[ ${ROOT} = "/" ]] ; then
-	  einfo "Scanning for compiler front-ends..."
-	  do_links
-	else
-	  ewarn "Install is incomplete; you must run the following commands:"
-	  ewarn " # ccache-config --install-links"
-	  ewarn " # ccache-config --install-links ${CHOST}"
-	 ewarn "after booting or chrooting to ${ROOT} to complete installation."
-	fi
-}
-
-pkg_preinst() {
-	# Portage doesn't handle replacing a non-empty dir with a file!
-	[[ -e ${ROOT}/usr/bin/ccache ]] && rm -r "${ROOT}"/usr/bin/ccache
-	[[ -e ${ROOT}/usr/bin/ccache.backup ]] && rm -r "${ROOT}"/usr/bin/ccache.backup
-}
-
-pkg_postinst() {
-	einfo "To use ccache with **non-Portage** C compiling, add"
-	einfo "/usr/lib/ccache/bin to the beginning of your path, before /usr/bin."
-	einfo "Portage 2.0.46-r11+ will automatically take advantage of ccache with"
-	einfo "no additional steps.  If this is your first install of ccache, type"
-	einfo "something like this to set a maximum cache size of 2GB:"
-	einfo "# ccache -M 2G"
-}
diff --git a/dev-util/ccache/files/digest-ccache-2.4-r3 b/dev-util/ccache/files/digest-ccache-2.4-r3
deleted file mode 100644
index 3615329bad9d..000000000000
--- a/dev-util/ccache/files/digest-ccache-2.4-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 73c1ed1e767c1752dd0f548ec1e66ce7 ccache-2.4.tar.gz 86363
-RMD160 43a0647c7faf659121a53a92ec45d245b8140124 ccache-2.4.tar.gz 86363
-SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0 ccache-2.4.tar.gz 86363