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

(Portage version: 2.1.1_pre3-r3)

8 files changed, 100 insertions, 1 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/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