[patch] Workaround to build build distcc with >=portage-2.1.9

distcc-3.1-r4.ebuild.patch (text/plain), 1.49 KB, created by Stanislav Cymbalov on 2010-09-10 13:12:24 UTC

--- /usr/portage/sys-devel/distcc/distcc-3.1-r4.ebuild	2009-10-20 01:36:54.000000000 +0400
+++ distcc-3.1-r4.ebuild	2010-09-10 16:28:26.283795175 +0400
@@ -36,9 +36,9 @@
 	selinux? ( sec-policy/selinux-distcc )
 	xinetd? ( sys-apps/xinetd )"
 
-DISTCC_LOG=""
-DCCC_PATH="/usr/$(get_libdir)/distcc/bin"
-DISTCC_VERBOSE="0"
+DISTCCLOG=""
+DCCCPATH="/usr/$(get_libdir)/distcc/bin"
+DISTCCVERBOSE="0"
 
 pkg_setup() {
 	enewuser distcc 240 -1 -1 daemon
@@ -53,7 +53,7 @@
 	# bug #258364
 	epatch "${FILESDIR}/${P}-python.patch"
 
-	sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die
+	sed -i -e "/PATH/s:\$distcc_location:${DCCCPATH}:" pump.in || die
 
 	# Bugs #120001, #167844 and probably more. See patch for description.
 	use hardened && epatch "${FILESDIR}/distcc-hardened.patch"
@@ -94,18 +94,18 @@
 
 	cat > "${T}/02distcc" <<-EOF
 	# This file is managed by distcc-config; use it to change these settings.
-	DISTCC_LOG="${DISTCC_LOG}"
-	DCCC_PATH="${DCCC_PATH}"
-	DISTCC_VERBOSE="${DISTCC_VERBOSE}"
+	DISTCC_LOG="${DISTCCLOG}"
+	DCCC_PATH="${DCCCPATH}"
+	DISTCC_VERBOSE="${DISTCCVERBOSE}"
 	EOF
 	doenvd "${T}/02distcc"
 
 	# create the masquerade directory
-	dodir "${DCCC_PATH}"
+	dodir "${DCCCPATH}"
 	for f in cc c++ gcc g++; do
-		dosym /usr/bin/distcc "${DCCC_PATH}/${f}"
+		dosym /usr/bin/distcc "${DCCCPATH}/${f}"
 		if [ "${f}" != "cc" ]; then
-			dosym /usr/bin/distcc "${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}"
+			dosym /usr/bin/distcc "${DCCCPATH}/${CTARGET:-${CHOST}}-${f}"
 		fi
 	done