[gentoo-commits] proj/sci:master commit in: dev-util/ccache/, dev-util/ccache/files/

[Christoph Junghans]

commit:     5b2dc2b166fd66e6b471c7e57da69a7259ce3fbc
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 27 21:43:54 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Thu Dec 27 21:43:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5b2dc2b1

added for testing

Package-Manager: portage-2.2.0_alpha149

---
 dev-util/ccache/ChangeLog                        |    9 ++
 dev-util/ccache/ccache-3.1.8-r1.ebuild           |   62 ++++++++++++++
 dev-util/ccache/files/ccache-3.1.7-no-perl.patch |   15 ++++
 dev-util/ccache/files/ccache-config-2            |   97 ++++++++++++++++++++++
 dev-util/ccache/metadata.xml                     |   16 ++++
 5 files changed, 199 insertions(+), 0 deletions(-)

diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog
new file mode 100644
index 0000000..ec8d7a7
--- /dev/null
+++ b/dev-util/ccache/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for dev-util/ccache
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*ccache-3.1.8-r1 (27 Dec 2012)
+
+  27 Dec 2012; Christoph Junghans <ottxor@g.o> +ccache-3.1.8-r1.ebuild,
+  +files/ccache-3.1.7-no-perl.patch, +files/ccache-config-2, +metadata.xml:
+  added for testing

diff --git a/dev-util/ccache/ccache-3.1.8-r1.ebuild b/dev-util/ccache/ccache-3.1.8-r1.ebuild
new file mode 100644
index 0000000..4cb9c24
--- /dev/null
+++ b/dev-util/ccache/ccache-3.1.8-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.8.ebuild,v 1.9 2012/12/17 17:51:11 ago Exp $
+
+EAPI="4"
+
+inherit multilib eutils
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="http://ccache.samba.org/"
+SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="clang icc"
+
+RDEPEND="sys-libs/zlib
+	clang? ( sys-devel/clang )
+	icc? ( dev-lang/icc )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+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):" \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-2 > ccache-config || die
+}
+
+src_install() {
+	default
+	dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt
+
+	dobin ccache-config
+}
+
+pkg_postinst() {
+	"${EROOT}"/usr/bin/ccache-config --install-links
+	"${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
+	use icc && "${EROOT}"/usr/bin/ccache-config --install-links icc
+	use clang && "${EROOT}"/usr/bin/ccache-config --install-links clang
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	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"
+
+	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 clear"
+	elog "all of your caches like so:"
+	elog "# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C"
+}

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 0000000..5abd15e
--- /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-config-2 b/dev-util/ccache/files/ccache-config-2
new file mode 100644
index 0000000..b0a111d
--- /dev/null
+++ b/dev-util/ccache/files/ccache-config-2
@@ -0,0 +1,97 @@
+#!/bin/sh
+#
+# ccache-config - helper script for ccache and its ebuild
+#
+# Copyright 2003-2012 Superlucidity Services, LLC
+# This program licensed under the GNU GPL version 2.
+#
+# This script developed by Zachary T Welch at Superlucidity Services, LLC
+#  it was cloned from the distcc-config script
+#
+# Additional features to come; this provides a starting point
+
+EPREFIX=''
+
+. "${EPREFIX}"/etc/init.d/functions.sh 2>/dev/null || {
+	ebegin() { echo " * $* ..."; }
+	eend() {
+		local r=${1:-$?}
+		[ ${r} -eq 0 ] && echo " [ OK ]" || echo " [ !! ]"
+		return $r
+	}
+}
+
+LIBDIR="lib"
+
+# this should be getopt'd someday (override with CC_QUIET=1)
+CC_VERBOSE=1
+unset _CC_QUIET
+c_quiet() {
+	[ -n "${CC_QUIET:-${_CC_QUIET}}" ] || [ -z "${CC_VERBOSE}" ]
+}
+
+c_ebegin() { c_quiet || ebegin "$@" ; }
+c_eend()   { c_quiet || eend "$@" ; }
+
+###
+# the following functions manage the ccache symlinks
+#  they allow the user or other scripts (namely gcc-config) to
+#  automatically update ccache's links when upgrading toolchains
+#
+cc_path() {
+	echo ${ROOT%/}${EPREFIX}/usr/${LIBDIR}/ccache/bin/$1
+}
+cc_remove_link() {
+	local t=$(cc_path "$1")
+	if [ -L ${t} ]; then
+		c_ebegin "Removing ${t}"
+		rm -f "${t}"
+		c_eend
+	fi
+}
+cc_install_link() {
+	# Search the PATH for the specified compiler
+	#  then create shadow link in /usr/lib/ccache/bin to ccache
+
+	if [ -n "$(type -p ${1})" ]; then
+		# first be sure any old link is removed
+		_CC_QUIET=1
+		cc_remove_link "${1}"
+		unset _CC_QUIET
+
+		# then create the new link
+		local t=$(cc_path "$1")
+		c_ebegin "Creating ccache shadow link ${t}"
+		mkdir -p -m 0755 "${t%/*}" && ln -s "${EPREFIX}"/usr/bin/ccache "${t}"
+		c_eend
+	fi
+}
+cc_links() {
+	local a compilers="gcc cc c++ g++" 
+	[ "${2}" = icc ] && compilers="icc icpc" && set -- "$1"
+	[ "${2}" = clang ] && compilers="clang " && set -- "$1"
+	for a in ${compilers} ; 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
+}
+
+###
+# main routine
+
+case "${1}" in
+	--install-links )
+		cc_links install "${2}"
+		;;
+	--remove-links )
+		cc_links remove "${2}"
+		;;
+	* )
+		echo "usage: ${0} {--install-links|--remove-links} [ CHOST|clang|icc ]"
+		;;
+esac

diff --git a/dev-util/ccache/metadata.xml b/dev-util/ccache/metadata.xml
new file mode 100644
index 0000000..399cfb0
--- /dev/null
+++ b/dev-util/ccache/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>toolchain</herd>
+	<maintainer>
+		<email>robbat2@g.o</email>
+	</maintainer>
+	<longdescription lang="en">
+		ccache acts as a caching pre-processor to C/C++ compilers, improving
+		compilation time when recompiling previously compiled source.
+	</longdescription>
+	<use>
+		<flag name='clang'>create links for <pkg>sys-devel/clang</pkg></flag>
+		<flag name='icc'>create links for <pkg>dev-lang/icc</pkg></flag>
+	</use>
+</pkgmetadata>