From beb3915f729a98c102d26d8f103297b52edb591c Mon Sep 17 00:00:00 2001 From: Martin Väth Date: Sat, 22 May 2010 17:10:31 +0200 Subject: Bump ccache. Relax squash_dir dependency --- dev-util/ccache/ChangeLog | 6 +++ dev-util/ccache/Manifest | 6 +-- dev-util/ccache/ccache-3.0_pre0.ebuild | 84 -------------------------------- dev-util/ccache/ccache-3.0_pre1.ebuild | 89 ++++++++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 87 deletions(-) delete mode 100644 dev-util/ccache/ccache-3.0_pre0.ebuild create mode 100644 dev-util/ccache/ccache-3.0_pre1.ebuild (limited to 'dev-util/ccache') diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog index e57de7e2..317908ca 100644 --- a/dev-util/ccache/ChangeLog +++ b/dev-util/ccache/ChangeLog @@ -2,6 +2,12 @@ # Copyright 2002-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header $ +*ccache-3.0-pre1 (22 May 2010) + + 22 May 2010; Martin Väth + revbump; remove old. + Add zlib dependency. Put CCACHE_COMPRESS=true into env.d + 07 Apr 2010; Martin Väth Add RESTRICT="mirror" diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest index 0f7212c5..c7ff8030 100644 --- a/dev-util/ccache/Manifest +++ b/dev-util/ccache/Manifest @@ -1,5 +1,5 @@ AUX ccache-config 1627 RMD160 b5e6a9f509130abd657fd6ec297d7fcbdb094f9d SHA1 698c3235f0685e03f346e4b155897862560974ee SHA256 d438b7d266e17bf95d6c45e619ea8d9040217e70f34eac5cf6fae010f25bb72f -DIST ccache-3.0pre0.tar.bz2 179291 RMD160 f3001bdb9a29aae874772a80cea2455c4fd5a275 SHA1 26bc8c67f0d7177cf6171cd3fdcd137dc8a67337 SHA256 dbdcbc9f10be423667f030a3a2bbd26b70ebb4821fcbd6547f6c9f9bb06d2b8f -EBUILD ccache-3.0_pre0.ebuild 2478 RMD160 56b030f198e1a623fde48dec36ac9ac19aa4e99a SHA1 8f037f481db647b7f860c44e6e0eca27da8cbd73 SHA256 6bdc9b780f4d9a37cf7853ca6744d941d568852c2628129f0101083300dc057a -MISC ChangeLog 367 RMD160 2345a0c579678d2a4bb4e03f1a6a2b3eef176761 SHA1 d3deaec4feadacaffe30bc6832f091588193f120 SHA256 d709342f0b9ff070fa328b1e5bc9df7950bf85cacc01bdf105dbcbf44ee47ebe +DIST ccache-3.0pre1.tar.bz2 204331 RMD160 1e49880638dbe40544261964f829e5faf1278fd4 SHA1 7dd193bd92469162ab65ff53a78ad577e8f58813 SHA256 2c4c1f6b2b96e54b0702af0f1189fb903858a721a4534b8cc62e74ff320be073 +EBUILD ccache-3.0_pre1.ebuild 2606 RMD160 0034a073319bff6c5c9b14322de1bf7b5f035a5c SHA1 35adada58885ea38ab57e8654ff36a59e7886e15 SHA256 937e9609e6f14df51b34c923951d8aee836cff8c88dde811f5ae3fc4d7e68345 +MISC ChangeLog 546 RMD160 8faa491d5d6503e8884368463362a7dde30a7ce5 SHA1 f9d9d2cd953751f20c90df03b031bdce36adc767 SHA256 84cb11e247e3831eb86121ff6b01bdc7c71bffe929d0d99b54d21d45e96abf52 MISC metadata.xml 444 RMD160 99f5113ff8f7ebb2f7ce3e33f855bc6846b8664e SHA1 fde0b5c2db7a88911d98a24052f39c1c525b872f SHA256 4ced2aa742fbd03c11aef10aecd4c62d93fd7f2036a69626d14eb762ae2c131d diff --git a/dev-util/ccache/ccache-3.0_pre0.ebuild b/dev-util/ccache/ccache-3.0_pre0.ebuild deleted file mode 100644 index 8d0b12a2..00000000 --- a/dev-util/ccache/ccache-3.0_pre0.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header $ - -inherit multilib -RESTRICT="mirror" - -DESCRIPTION="fast compiler cache" -HOMEPAGE="http://ccache.samba.org/" -MY_P="${P/_/}" -SRC_URI="http://samba.org/ftp/ccache/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# Note: this version is designed to be auto-detected and used if -# you happen to have Portage 2.0.X+ installed. - -do_links() { - insinto /usr/$(get_libdir)/ccache/bin - for a in ${CHOST}-{gcc,g++,c++} gcc c++ g++; do - dosym /usr/bin/ccache /usr/$(get_libdir)/ccache/bin/${a} - done -} - -src_install() { - dobin ccache || die - doman ccache.1 - dodoc README - - diropts -m0755 - dodir /usr/$(get_libdir)/ccache/bin - keepdir /usr/$(get_libdir)/ccache/bin - - dobin "${FILESDIR}"/ccache-config || die - - diropts -m0700 - dodir /root/.ccache - keepdir /root/.ccache -} - -pkg_preinst() { - # Do NOT duplicate this in your ebuilds or phear of the wrath!!! - 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_postinst() { - # nuke broken symlinks from previous versions that shouldn't exist - for i in cc ${CHOST}-cc ; do - [[ -L "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}" ]] && \ - rm -rf "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}" - done - [[ -d "${ROOT}/usr/$(get_libdir)/ccache.backup" ]] && \ - rm -fr "${ROOT}/usr/$(get_libdir)/ccache.backup" - - 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 "Portage 2.0.46-r11+ will automatically take advantage of ccache with" - elog "no additional steps. If this is your first install of ccache, type" - elog "something like this to set a maximum cache size of 2GB:" - elog "# ccache -M 2G" - elog - elog "If you are upgrading from an older version than 3.x you should run" - elog "# CCACHE_DIR=\"${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}\" ccache -C" - - case "${PORTAGE_TMPDIR}/portage/*" in - "${CCACHE_BASEDIR:-none}"/*) :;; - *) - ewarn "To make optimal use of the new direct mode, please set" - ewarn " CCACHE_BASEDIR=\"\${PORTAGE_TMPDIR}/portage\"" - ewarn "in your /etc/make.conf";; - esac -} diff --git a/dev-util/ccache/ccache-3.0_pre1.ebuild b/dev-util/ccache/ccache-3.0_pre1.ebuild new file mode 100644 index 00000000..3a5a6f6c --- /dev/null +++ b/dev-util/ccache/ccache-3.0_pre1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header $ + +inherit multilib +RESTRICT="mirror" + +DESCRIPTION="fast compiler cache" +HOMEPAGE="http://ccache.samba.org/" +MY_P="${P/_/}" +SRC_URI="http://samba.org/ftp/ccache/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="sys-libs/zlib" +DEPEND="${RDEPEND}" + +# Note: this version is designed to be auto-detected and used if +# you happen to have Portage 2.0.X+ installed. + +do_links() { + insinto /usr/$(get_libdir)/ccache/bin + for a in ${CHOST}-{gcc,g++,c++} gcc c++ g++; do + dosym /usr/bin/ccache /usr/$(get_libdir)/ccache/bin/${a} + done +} + +src_install() { + echo "CCACHE_COMPRESS=true" >"${S}/99ccache" + doenvd "${S}/99ccache" + dobin ccache || die + doman ccache.1 + dodoc README.txt NEWS.txt + + diropts -m0755 + dodir /usr/$(get_libdir)/ccache/bin + keepdir /usr/$(get_libdir)/ccache/bin + + dobin "${FILESDIR}"/ccache-config || die + + diropts -m0700 + dodir /root/.ccache + keepdir /root/.ccache +} + +pkg_preinst() { + # Do NOT duplicate this in your ebuilds or phear of the wrath!!! + 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_postinst() { + # nuke broken symlinks from previous versions that shouldn't exist + for i in cc ${CHOST}-cc ; do + [[ -L "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}" ]] && \ + rm -rf "${ROOT}/usr/$(get_libdir)/ccache/bin/${i}" + done + [[ -d "${ROOT}/usr/$(get_libdir)/ccache.backup" ]] && \ + rm -fr "${ROOT}/usr/$(get_libdir)/ccache.backup" + + 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 "Portage 2.0.46-r11+ will automatically take advantage of ccache with" + elog "no additional steps. If this is your first install of ccache, type" + elog "something like this to set a maximum cache size of 2GB:" + elog "# ccache -M 2G" + elog + elog "If you are upgrading from an older version than 3.x you should run" + elog "# CCACHE_DIR=\"${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}\" ccache -C" + + case "${PORTAGE_TMPDIR}/portage/*" in + "${CCACHE_BASEDIR:-none}"/*) :;; + *) + ewarn "To make optimal use of the new direct mode, please set" + ewarn " CCACHE_BASEDIR=\"\${PORTAGE_TMPDIR}/portage\"" + ewarn "in your /etc/make.conf";; + esac +} -- cgit v1.2.3-65-gdbad