(#139352) Version bump (Marcus Furlong, Patrick Avery, Sergey Okhapkin, me).

(Portage version: 2.1.2_pre2-r5)

5 files changed, 70 insertions, 51 deletions

diff --git a/sys-devel/icecream/files/0.7.14-conf.d-verbosity.patch b/sys-devel/icecream/files/0.7.14-conf.d-verbosity.patch
new file mode 100644
index 000000000000..b2f6ad732f0d
--- /dev/null
+++ b/sys-devel/icecream/files/0.7.14-conf.d-verbosity.patch
@@ -0,0 +1,19 @@
+diff -urN icecream.orig/suse/sysconfig.icecream icecream/suse/sysconfig.icecream
+--- icecream.orig/suse/sysconfig.icecream	2004-08-30 10:01:30.000000000 +0100
++++ icecream/suse/sysconfig.icecream	2006-08-12 16:05:09.000000000 +0100
+@@ -39,6 +39,15 @@
+ #
+ ## Type: string
+ ## Path: Applications/icecream
++## Defaut: -v
++#
++# icecream's level of verbosity ([-v[v[v]]])
++#
++ICECREAM_VERBOSITY="-v"
++
++#
++## Type: string
++## Path: Applications/icecream
+ ## Defaut: ""
+ #
+ # Identification for the network the scheduler and daemon run on. 
diff --git a/sys-devel/icecream/files/0.7.14-dont-create-symlinks.patch b/sys-devel/icecream/files/0.7.14-dont-create-symlinks.patch
new file mode 100644
index 000000000000..3fc4fdc87eeb
--- /dev/null
+++ b/sys-devel/icecream/files/0.7.14-dont-create-symlinks.patch
@@ -0,0 +1,14 @@
+diff -urN icecream/client/Makefile.am icecream.new/client/Makefile.am
+--- icecream/client/Makefile.am	2004-08-30 09:00:56.000000000 +0100
++++ icecream.new/client/Makefile.am	2006-05-31 19:29:02.000000000 +0100
+@@ -15,10 +15,6 @@
+ 
+ install-exec-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
+-	for link in g++ gcc c++ cc; do \
+-	  rm -f $(DESTDIR)$(bindir)/$$link ;\
+-	  $(LN_S) icecc $(DESTDIR)$(bindir)/$$link ;\
+-	done
+ 
+ uninstall-local:
+ 	for link in g++ gcc c++ cc; do \
diff --git a/sys-devel/icecream/files/digest-icecream-0.7.14 b/sys-devel/icecream/files/digest-icecream-0.7.14
new file mode 100644
index 000000000000..3507102803a1
--- /dev/null
+++ b/sys-devel/icecream/files/digest-icecream-0.7.14
@@ -0,0 +1,3 @@
+MD5 8d167d48bc7854b6277a105cafbf2b49 icecc-0.7.14.tar.bz2 147404
+RMD160 424930cad2c68141742b3c5b30a53134cbc2124f icecc-0.7.14.tar.bz2 147404
+SHA256 eb61bf5cdbcbba66e4b11d765111cc97df27589ddadd5478d95796f6e63c5001 icecc-0.7.14.tar.bz2 147404
diff --git a/sys-devel/icecream/files/icecream b/sys-devel/icecream/files/icecream
index cb831ded5a1b..cae25eb28a4f 100644
--- a/sys-devel/icecream/files/icecream
+++ b/sys-devel/icecream/files/icecream
@@ -8,43 +8,26 @@ depend() {
 
 start() {
 
-	netname=
-	if test -n "$ICECREAM_NETNAME"; then
-		netname="-n $ICECREAM_NETNAME"
-	fi
-	if test "$ICECREAM_RUN_SCHEDULER" == "yes"; then
-		logfile=""
-		if test -z "$ICECREAM_SCHEDULER_LOG_FILE"; then
-			ICECREAM_SCHEDULER_LOG_FILE="/var/log/icecc_scheduler"
-		fi
-		logfile="-l $ICECREAM_SCHEDULER_LOG_FILE"
-		: > $ICECREAM_SCHEDULER_LOG_FILE
-		chown icecream:icecream $ICECREAM_SCHEDULER_LOG_FILE
-		
+	local basedir=${ICECREAM_BASEDIR:-"/var/cache/icecream"}
+	local netname=${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"}
+	local logfile=${ICECREAM_LOG_FILE:+"-l ${ICECREAM_LOG_FILE}"}
+	local nice=${ICECREAM_NICE_LEVEL:+"--nice ${ICECREAM_NICE_LEVEL}"}
+	local scheduler=${ICECREAM_SCHEDULER_HOST:+"-s ${ICECREAM_SCHEDULER_HOST}"}
+	local maxjobs=${ICECREAM_MAX_JOBS:+"-m ${ICECREAM_MAX_JOBS}"}
+	local verbosity=${ICECREAM_VERBOSITY:-"-v"}
+	
+	if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
+		local slogfile=${ICECREAM_SCHEDULER_LOG_FILE:-"/var/log/icecc_scheduler"}
+		touch ${slogfile} && chown icecream:icecream ${slogfile}
+		slogfile=${slogfile:+"-l ${slogfile}"}
 		ebegin "Starting Distributed Compiler Scheduler"
-	        start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/scheduler -- -d $logfile $netname
+		start-stop-daemon -u icecream --start --quiet --exec /usr/sbin/scheduler -- -d ${slogfile} ${netname} ${verbosity}
 		eend ${?}
-        fi
-	logfile=""
-	if test -n "$ICECREAM_LOG_FILE"; then
-		logfile="-l $ICECREAM_LOG_FILE"
-		: > $ICECREAM_LOG_FILE
-		chown icecream:icecream $ICECREAM_LOG_FILE
-	fi
-	nice=
-	if test -n "$ICECREAM_NICE_LEVEL"; then
-		nice="--nice $ICECREAM_NICE_LEVEL"
-	fi
-	scheduler=
-	if test -n "$ICECREAM_SCHEDULER_HOST"; then
-		scheduler="-s $ICECREAM_SCHEDULER_HOST"
-	fi
-	maxjobs=
-	if test -n "$ICECREAM_MAX_JOBS"; then
-		maxjobs="-m $ICECREAM_MAX_JOBS"
 	fi
+
+	[[ ! -d ${basedir} ]] && mkdir -p ${basedir} && chown icecream:icecream ${basedir}
 	ebegin "Starting Distributed Compiler Daemon"
-	start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d $logfile $nice $scheduler $netname -u icecream -b "$ICECREAM_BASEDIR" $maxjobs
+	start-stop-daemon --start --quiet --exec /usr/sbin/iceccd -- -d ${logfile} ${nice} ${scheduler} ${netname} -u icecream -b "${basedir}" ${maxjobs} ${verbosity}
 	eend ${?}
 }
 
@@ -52,7 +35,7 @@ stop() {
 	ebegin "Stopping Distributed Compiler Daemon"
 	start-stop-daemon --stop --quiet --name iceccd
 	eend ${?}
-	if test "$ICECREAM_RUN_SCHEDULER" == "yes"; then
+	if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
 		ebegin "Stopping Distributed Compiler Scheduler"
 		start-stop-daemon --stop --quiet --name scheduler
 		eend ${?}
diff --git a/sys-devel/icecream/files/icecream-config b/sys-devel/icecream/files/icecream-config
index fefc1c65f4a8..d520072090f0 100644
--- a/sys-devel/icecream/files/icecream-config
+++ b/sys-devel/icecream/files/icecream-config
@@ -6,49 +6,49 @@
 # 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 to make ccache-config
+# it was cloned from the distcc-config script to make ccache-config
 # and then modified by Marcus Furlong to configure icecream too.
 # 
 # Additional features to come; this provides a starting point
 
 # this should be getopt'd someday (override with ICEC_QUIET=1)
-ICEC_VERBOSE=1
+ICECC_VERBOSE=1
 
-icec_echo() {
-	[ -z "${ICEC_QUIET}" -a -n "${ICEC_VERBOSE}" ] && echo "$*"
+icecc_echo() {
+	[ -z "${ICECC_QUIET}" -a -n "${ICECC_VERBOSE}" ] && echo "$*"
 }
 
 ###
 # the following functions manage the icecream symlinks
 #  they allow the user or other scripts (namely gcc-config) to
-#  automatically update iceceam's links when upgrading toolchains
+#  automatically update icecream's links when upgrading toolchains
 #
-icec_remove_link() {
-	local t="/usr/lib/icecream/bin/${1}"
+icecc_remove_link() {
+	local t="/usr/lib/icecc/bin/${1}"
 	if [ -L ${t} ]; then
-		icec_echo "Removing ${t}..."
+		icecc_echo "Removing ${t}..."
 		rm -f "${t}"
 	fi
 }
-icec_install_link() {
+icecc_install_link() {
 	# Search the PATH for the specified compiler
-	#  then create shadow link in /usr/lib/icecream/bin to icecc
+	#  then create shadow link in /usr/lib/icecc/bin to icecc
 	
 	if [ -n "$(type -p ${1})" ]; then 
 		# first be sure any old link is removed
-		ICEC_QUIET=1 icec_remove_link "${1}"
+		ICECC_QUIET=1 icecc_remove_link "${1}"
 
 		# then create the new link
-		local t="/usr/lib/icecream/bin/${1}"
-		icec_echo "Creating icecream shadow link: ${t}..."
+		local t="/usr/lib/icecc/bin/${1}"
+		icecc_echo "Creating icecream shadow link: ${t}..."
 		ln -s /usr/bin/icecc "${t}"
 	fi
 }
-icec_links() {
+icecc_links() {
 	local a
 	for a in gcc cc c++ g++ ; do
 		[ -n "${2}" ] && a="${2}-${a}"
-		eval "icec_${1}_link" "${a}"
+		eval "icecc_${1}_link" "${a}"
 	done
 }
 
@@ -57,10 +57,10 @@ icec_links() {
 
 case "${1}" in
 	--install-links )
-		icec_links install "${2}"
+		icecc_links install "${2}"
 		;;
 	--remove-links )
-		icec_links remove "${2}"
+		icecc_links remove "${2}"
 		;;
 	* )
 		echo "usage: ${0} {--install-links|--remove-links} [ CHOST ]"