Resolving bug 145167, moved symlink creation into src_install and omitted *-cc links

Package-Manager: portage-2.1.1_pre3-r3

9 files changed, 129 insertions, 23 deletions

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
index fd6da75ee782..1042a4cbf17d 100644
--- a/dev-util/ccache/ChangeLog
+++ b/dev-util/ccache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/ccache
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.44 2006/06/09 23:54:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ChangeLog,v 1.45 2006/09/13 10:21:39 lisa Exp $
+
+*ccache-2.4-r3 (13 Sep 2006)
+
+  13 Sep 2006; Lisa Seelye <lisa@gentoo.org> +ccache-2.4-r3.ebuild:
+  Move (shadow) symlinks creation into src_install. Moved Zach Welch created
+  multiline helper into five lines. Ha. This also should resolve bug 145167
 
 *ccache-2.4-r2 (09 Jun 2006)
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index dc1060ce7f16..7f879f0c1aa5 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -10,9 +10,9 @@ AUX ccache-config 1554 RMD160 cbcb9cf3b2313002e2a3336fb39e161c61d350a6 SHA1 919e
 MD5 3a5de45f5094320a0ce4eb5201506042 files/ccache-config 1554
 RMD160 cbcb9cf3b2313002e2a3336fb39e161c61d350a6 files/ccache-config 1554
 SHA256 da4a731fdcebe82fee0e5946cde131d35f528b69ec81bb0901f3b56441c485bb files/ccache-config 1554
-DIST ccache-2.2.tar.gz 81666
-DIST ccache-2.3.tar.gz 84386
-DIST ccache-2.4.tar.gz 86363
+DIST ccache-2.2.tar.gz 81666 RMD160 b11b73da75dda1330046c840e211b5c23b83ac79 SHA1 0b232e1629ced7814193a0969d7fc54802dc2f78 SHA256 3bd9b69f7129bcb5b40ed1fb9851ac1a0b21edb7cbc41a1f76db30867fbd8c41
+DIST ccache-2.3.tar.gz 84386 RMD160 dc922891110a47271c8fa46f35b6bbd4d67dbfa7 SHA1 eb8ece3cd1b57752b5503b1e65d9bbe302533407 SHA256 7d88dbae69cb3490360b05b4040e4640509eec55ea87de15f4c659a24345cfef
+DIST ccache-2.4.tar.gz 86363 RMD160 43a0647c7faf659121a53a92ec45d245b8140124 SHA1 9833ec13de9b90d5409e60d679ac681115ef465e SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0
 EBUILD ccache-2.2.ebuild 2111 RMD160 bbf65573f1abbe68ea7bf6d2cb6ee334bccff59d SHA1 a800d21c4c972dfbfcccbebb0bc653a045535f22 SHA256 9b68e8f2c16c32f7a320919026b19a02dc622471fbb5bd180e8c90950cd299aa
 MD5 da9c02e7e8e50fefb7fc259354d004fa ccache-2.2.ebuild 2111
 RMD160 bbf65573f1abbe68ea7bf6d2cb6ee334bccff59d ccache-2.2.ebuild 2111
@@ -29,30 +29,37 @@ 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.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 5548 RMD160 a5782cc7507b8338458189876dc998e2c4ce5329 SHA1 b63006663763aeb2e0b5fe7495af715697102d13 SHA256 db2cdb7e1c6ed869675def79915fa4a45d8c30698f3154b9b31b4aa58bb2660f
-MD5 5714ac0e5a0e7be938482171c9bc7a9d ChangeLog 5548
-RMD160 a5782cc7507b8338458189876dc998e2c4ce5329 ChangeLog 5548
-SHA256 db2cdb7e1c6ed869675def79915fa4a45d8c30698f3154b9b31b4aa58bb2660f ChangeLog 5548
+MISC ChangeLog 5797 RMD160 e3fbb57473ae7043e708d00b0314ee552bb2f944 SHA1 4b54521989a632efdd3da3f5bf93ccba4b5931c5 SHA256 337ad0fb76b6a11b85074ce74bc92bcb2a2c3242f699ac39a64188700a6bc133
+MD5 7d9a0503e7410c1b8986dfab9e6feb9b ChangeLog 5797
+RMD160 e3fbb57473ae7043e708d00b0314ee552bb2f944 ChangeLog 5797
+SHA256 337ad0fb76b6a11b85074ce74bc92bcb2a2c3242f699ac39a64188700a6bc133 ChangeLog 5797
 MISC metadata.xml 386 RMD160 ce4575786bca697d8f590d466ac4ffbeaed873cb SHA1 c1c307ca690b90b14ef22dfeb2f467dd4076ccd7 SHA256 c15bee3a15e41c52b133ef6b2ec2fb16ba668d25f5c890d1ab3efa89a9043518
 MD5 0e91c81450afb11a7d06d7543dddcd57 metadata.xml 386
 RMD160 ce4575786bca697d8f590d466ac4ffbeaed873cb metadata.xml 386
 SHA256 c15bee3a15e41c52b133ef6b2ec2fb16ba668d25f5c890d1ab3efa89a9043518 metadata.xml 386
-MD5 0dfb58c5d312454e0c766c14f3d76dad files/digest-ccache-2.2 61
-RMD160 32493dec39d23033b85a270640191fa4c0a09c59 files/digest-ccache-2.2 61
-SHA256 2cdd9d2b57361f048c6f6ede6d2d3a184bc3e394b4b64608643c897d3a2e6cae files/digest-ccache-2.2 61
-MD5 6bbfd5ad2a75fbaf4b4a5e42fc61270a files/digest-ccache-2.3 61
-RMD160 6f463f8641c204dfc8cdec336117c3106d51092d files/digest-ccache-2.3 61
-SHA256 48a6b2e85ab08a73607aa3e6a95f0b83edf0da2bb925559765b4f3881d17b45e files/digest-ccache-2.3 61
-MD5 4ec9394758a87717466629023c2872fd files/digest-ccache-2.4 61
-RMD160 fc35cc78e2493f7411ce0a199eb4a15f5883355e files/digest-ccache-2.4 61
-SHA256 75468a54e0477e55f5800e2572807e21542fa6467730633c177345835c27175d files/digest-ccache-2.4 61
-MD5 4ec9394758a87717466629023c2872fd files/digest-ccache-2.4-r1 61
-RMD160 fc35cc78e2493f7411ce0a199eb4a15f5883355e files/digest-ccache-2.4-r1 61
-SHA256 75468a54e0477e55f5800e2572807e21542fa6467730633c177345835c27175d files/digest-ccache-2.4-r1 61
-MD5 4ec9394758a87717466629023c2872fd files/digest-ccache-2.4-r2 61
-RMD160 fc35cc78e2493f7411ce0a199eb4a15f5883355e files/digest-ccache-2.4-r2 61
-SHA256 75468a54e0477e55f5800e2572807e21542fa6467730633c177345835c27175d files/digest-ccache-2.4-r2 61
+MD5 7c6bf9a502af6108b537f2e83241f5ba files/digest-ccache-2.2 229
+RMD160 4b06a08fdc200d00ae6bad1d445167bc461b45a9 files/digest-ccache-2.2 229
+SHA256 20db3675f6a304161e399beee4b7cc1122b77c101391b83ccff7f11e8b0a8406 files/digest-ccache-2.2 229
+MD5 93d1bbf3374ce1d7d09dd5206ff0400f files/digest-ccache-2.3 229
+RMD160 6369793bc94bb35209bd3ee783b722a66bebacd2 files/digest-ccache-2.3 229
+SHA256 dfe4337214878bbd3e05d28a6443d43bb0edb3b41fc452c5eaa7dcb2b812aadd files/digest-ccache-2.3 229
+MD5 27bad4926cc94284b9b073c90dac85aa files/digest-ccache-2.4 229
+RMD160 24aecd7bc84d836a161fc80f52e9c1aa3fe55e08 files/digest-ccache-2.4 229
+SHA256 0c93b8a649be25d52071810b71684c206ad16fdfaebc1b1f8edf7681b620e35c files/digest-ccache-2.4 229
+MD5 27bad4926cc94284b9b073c90dac85aa files/digest-ccache-2.4-r1 229
+RMD160 24aecd7bc84d836a161fc80f52e9c1aa3fe55e08 files/digest-ccache-2.4-r1 229
+SHA256 0c93b8a649be25d52071810b71684c206ad16fdfaebc1b1f8edf7681b620e35c files/digest-ccache-2.4-r1 229
+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
diff --git a/dev-util/ccache/ccache-2.4-r3.ebuild b/dev-util/ccache/ccache-2.4-r3.ebuild
new file mode 100644
index 000000000000..0786740e33cc
--- /dev/null
+++ b/dev-util/ccache/ccache-2.4-r3.ebuild
@@ -0,0 +1,80 @@
+# 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.2 b/dev-util/ccache/files/digest-ccache-2.2
index 0d99f4079869..01040468c321 100644
--- a/dev-util/ccache/files/digest-ccache-2.2
+++ b/dev-util/ccache/files/digest-ccache-2.2
@@ -1 +1,3 @@
 MD5 3b98afe5e966ccd37f4d2b102d6ac8ac ccache-2.2.tar.gz 81666
+RMD160 b11b73da75dda1330046c840e211b5c23b83ac79 ccache-2.2.tar.gz 81666
+SHA256 3bd9b69f7129bcb5b40ed1fb9851ac1a0b21edb7cbc41a1f76db30867fbd8c41 ccache-2.2.tar.gz 81666
diff --git a/dev-util/ccache/files/digest-ccache-2.3 b/dev-util/ccache/files/digest-ccache-2.3
index 48ff2f2d8862..3fe390cb0e62 100644
--- a/dev-util/ccache/files/digest-ccache-2.3
+++ b/dev-util/ccache/files/digest-ccache-2.3
@@ -1 +1,3 @@
 MD5 5e4afc0b170bf282d1813aeaf3d577d2 ccache-2.3.tar.gz 84386
+RMD160 dc922891110a47271c8fa46f35b6bbd4d67dbfa7 ccache-2.3.tar.gz 84386
+SHA256 7d88dbae69cb3490360b05b4040e4640509eec55ea87de15f4c659a24345cfef ccache-2.3.tar.gz 84386
diff --git a/dev-util/ccache/files/digest-ccache-2.4 b/dev-util/ccache/files/digest-ccache-2.4
index 309204b80d28..3615329bad9d 100644
--- a/dev-util/ccache/files/digest-ccache-2.4
+++ b/dev-util/ccache/files/digest-ccache-2.4
@@ -1 +1,3 @@
 MD5 73c1ed1e767c1752dd0f548ec1e66ce7 ccache-2.4.tar.gz 86363
+RMD160 43a0647c7faf659121a53a92ec45d245b8140124 ccache-2.4.tar.gz 86363
+SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0 ccache-2.4.tar.gz 86363
diff --git a/dev-util/ccache/files/digest-ccache-2.4-r1 b/dev-util/ccache/files/digest-ccache-2.4-r1
index 309204b80d28..3615329bad9d 100644
--- a/dev-util/ccache/files/digest-ccache-2.4-r1
+++ b/dev-util/ccache/files/digest-ccache-2.4-r1
@@ -1 +1,3 @@
 MD5 73c1ed1e767c1752dd0f548ec1e66ce7 ccache-2.4.tar.gz 86363
+RMD160 43a0647c7faf659121a53a92ec45d245b8140124 ccache-2.4.tar.gz 86363
+SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0 ccache-2.4.tar.gz 86363
diff --git a/dev-util/ccache/files/digest-ccache-2.4-r2 b/dev-util/ccache/files/digest-ccache-2.4-r2
index 309204b80d28..3615329bad9d 100644
--- a/dev-util/ccache/files/digest-ccache-2.4-r2
+++ b/dev-util/ccache/files/digest-ccache-2.4-r2
@@ -1 +1,3 @@
 MD5 73c1ed1e767c1752dd0f548ec1e66ce7 ccache-2.4.tar.gz 86363
+RMD160 43a0647c7faf659121a53a92ec45d245b8140124 ccache-2.4.tar.gz 86363
+SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0 ccache-2.4.tar.gz 86363
diff --git a/dev-util/ccache/files/digest-ccache-2.4-r3 b/dev-util/ccache/files/digest-ccache-2.4-r3
new file mode 100644
index 000000000000..3615329bad9d
--- /dev/null
+++ b/dev-util/ccache/files/digest-ccache-2.4-r3
@@ -0,0 +1,3 @@
+MD5 73c1ed1e767c1752dd0f548ec1e66ce7 ccache-2.4.tar.gz 86363
+RMD160 43a0647c7faf659121a53a92ec45d245b8140124 ccache-2.4.tar.gz 86363
+SHA256 435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0 ccache-2.4.tar.gz 86363