fix tail -1 stuff in distcc-config files

13 files changed, 58 insertions, 54 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 0368245131d1..24db8a22724c 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/distcc
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.87 2003/12/25 04:37:00 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.88 2004/01/05 23:23:10 robbat2 Exp $
+
+  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> files/2.10/distcc-config,
+  files/2.11/distcc-config, files/2.8/distcc-config, files/2.9/distcc-config:
+  fix tail -1 stuff in distcc-config files
 
 *distcc-2.12 (24 Dec 2003)
 
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 95cf9fce5acb..b9316b3926dd 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,34 +1,34 @@
-MD5 ba434fcebbfbd2db6cdbd7527edd2080 distcc-2.11.2.ebuild 4052
-MD5 16bbbf9b6b111668ff00046829e6b917 distcc-2.11.2-r1.ebuild 4051
-MD5 50800c649c3587e5f0dfef810410abb6 distcc-2.8-r2.ebuild 3365
+MD5 964b6f5d28d88a2820135b24d204dd0b distcc-2.8-r2.ebuild 3364
+MD5 dfd23198dcd2050c42db2b3f38d06121 distcc-2.5-r1.ebuild 3213
+MD5 0c054543fc71732a78f55cc1ff4c6d01 distcc-2.11.1.ebuild 3929
+MD5 823d879cbb3cb59c483d5cf9d4fbc7a5 distcc-2.9.ebuild 3453
+MD5 885f8701c44cdc0c3a81a98dd4d910a3 distcc-2.11.2-r1.ebuild 4053
+MD5 13e912d5cfaf90a7ad266a542516c0af ChangeLog 15944
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
-MD5 650133eb96d46226369dd4c127bb71c1 ChangeLog 15741
-MD5 6d0efb7bb3a7e30546d91844510da07d distcc-2.5-r1.ebuild 3215
-MD5 730d7f375b2a94bce7d91191789c4dc5 distcc-2.9.ebuild 3455
-MD5 a1b583a4f17172ee9b85bfaecb7dee21 distcc-2.11.1.ebuild 3927
-MD5 b42d1ceddfceb681c333b29d97dfc335 distcc-2.12.ebuild 4333
+MD5 4d08c66d48c5e4280d90f371bfb30eb5 distcc-2.11.2.ebuild 4050
+MD5 c46b5b034880d721045e9d1b2792b625 distcc-2.12.ebuild 4335
 MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2-r1 66
-MD5 86e7b8c5c35c5e34e2adfe2c55369f7a files/digest-distcc-2.11.1 66
-MD5 56fd1ac60c1b8402e1632da62f32a890 files/digest-distcc-2.8-r2 63
+MD5 ade4e8cda892045944e204fc2c3df8bd files/digest-distcc-2.9 63
 MD5 e4ec138a5d62b2103b8c785dd87ea75e files/setuid-2.12-order-fix.gz 405
+MD5 86e7b8c5c35c5e34e2adfe2c55369f7a files/digest-distcc-2.11.1 66
+MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2 66
 MD5 e1ecfcc1aad7c385cf3c41966277cda7 files/digest-distcc-2.5-r1 63
-MD5 ade4e8cda892045944e204fc2c3df8bd files/digest-distcc-2.9 63
+MD5 56fd1ac60c1b8402e1632da62f32a890 files/digest-distcc-2.8-r2 63
 MD5 f2d4b9a0fb28df4a0391de1120186655 files/digest-distcc-2.12 64
-MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2 66
-MD5 3828773f8d6cb9c7c4f2aa801e79b90c files/2.11.1p/distcc-config 4931
-MD5 606dd55609a04a0f21b9875259148332 files/2.11.1p/init 633
-MD5 66c4af6f8dd87d270e5da50341ca6e14 files/2.11.1p/conf 658
-MD5 9e01d7b626696716500bbf56c68a5680 files/2.8/distcc-config 7559
+MD5 8e40ddd77c63e1c307157ef9bd282e98 files/2.8/conf 591
+MD5 387502143e5c27668445df30035fddf3 files/2.8/init 624
 MD5 ee4f0fde9d5e6fe88bf7f513cf12920c files/2.8/001_fix_tempfile.patch.gz 251
-MD5 a985e7680ba7958cb9a170c8e2019e8e files/2.8/init 625
-MD5 41f782125d594b7249fcd1fc6c306b02 files/2.8/conf 592
+MD5 173b6744535a9beaa33b3abf4022ea4d files/2.8/distcc-config 7563
+MD5 1084c9eff3d06a5a188ed873a418f097 files/2.9/conf 591
+MD5 c12414aee901150c15f0213cbc25b6fa files/2.9/init 624
+MD5 0dd566804e7e174d5e4d547cc6b1e7c4 files/2.9/distcc-config 7563
 MD5 ced4e94d8c61a8f175d62a39478e7afc files/2.9/001_fix_tmpdir.patch.gz 248
-MD5 63dd07135a46fcef934e3fa4c926d5f7 files/2.9/distcc-config 7559
-MD5 c400119892789344a9702d466476ddbd files/2.9/init 625
-MD5 05483b8174e619ee439b905cca85c7ad files/2.9/conf 592
-MD5 034d45b94b38d1410759852e4551373d files/2.11/distcc-config 7567
-MD5 c8ff220b60c105fcede2c72f274995db files/2.11/init 630
-MD5 e40dfa1f21a9a2301faaff21cf76e7d8 files/2.11/conf 655
-MD5 3375d451fca8db4a3280b16679bc5858 files/2.10/distcc-config 7560
-MD5 813a6a43167076da271ef55188a77826 files/2.10/init 630
-MD5 d69d2e510421afc34c73a9cb50c5fb0d files/2.10/conf 655
+MD5 34d75eb454050fae1f728d603b5de297 files/2.10/conf 654
+MD5 12d3c3df8ec6bb8f43d0834e593dbce0 files/2.10/init 629
+MD5 151ff6006f2968d7bc17b1aad7da1751 files/2.10/distcc-config 7564
+MD5 b7376992cdf5798bfa778f69db482be0 files/2.11/conf 654
+MD5 fcb29c87d2e82f3b6c7793f489578573 files/2.11/init 629
+MD5 1ea34748cbdae22ba037b0573def4770 files/2.11/distcc-config 7571
+MD5 d58e37daf6a679aa5bf162b8af654e94 files/2.11.1p/conf 657
+MD5 a979210831a78612025e64208c97fc82 files/2.11.1p/init 632
+MD5 ac83e0243a295f9bc1c3e9569782752e files/2.11.1p/distcc-config 4928
diff --git a/sys-devel/distcc/distcc-2.11.1.ebuild b/sys-devel/distcc/distcc-2.11.1.ebuild
index 95601c58e697..9e98700466f6 100644
--- a/sys-devel/distcc/distcc-2.11.1.ebuild
+++ b/sys-devel/distcc/distcc-2.11.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.1.ebuild,v 1.4 2003/11/04 03:31:22 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.1.ebuild,v 1.5 2004/01/05 23:23:10 robbat2 Exp $
 
 inherit eutils gcc flag-o-matic
 [ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
diff --git a/sys-devel/distcc/distcc-2.11.2-r1.ebuild b/sys-devel/distcc/distcc-2.11.2-r1.ebuild
index 353a62f16dfc..5e5565f1ca1d 100644
--- a/sys-devel/distcc/distcc-2.11.2-r1.ebuild
+++ b/sys-devel/distcc/distcc-2.11.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.2-r1.ebuild,v 1.1 2003/11/21 17:52:44 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.2-r1.ebuild,v 1.2 2004/01/05 23:23:10 robbat2 Exp $
 
 inherit eutils gcc flag-o-matic
 [ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
diff --git a/sys-devel/distcc/distcc-2.11.2.ebuild b/sys-devel/distcc/distcc-2.11.2.ebuild
index d88d68c88b97..bd037356e7f0 100644
--- a/sys-devel/distcc/distcc-2.11.2.ebuild
+++ b/sys-devel/distcc/distcc-2.11.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.2.ebuild,v 1.2 2003/10/24 16:24:07 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.2.ebuild,v 1.3 2004/01/05 23:23:10 robbat2 Exp $
 
 inherit eutils gcc flag-o-matic
 [ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
diff --git a/sys-devel/distcc/distcc-2.12.ebuild b/sys-devel/distcc/distcc-2.12.ebuild
index be96a50e773a..de53b92eeafc 100644
--- a/sys-devel/distcc/distcc-2.12.ebuild
+++ b/sys-devel/distcc/distcc-2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.12.ebuild,v 1.1 2003/12/25 04:37:00 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.12.ebuild,v 1.2 2004/01/05 23:23:10 robbat2 Exp $
 
 inherit eutils gcc flag-o-matic
 [ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
diff --git a/sys-devel/distcc/distcc-2.5-r1.ebuild b/sys-devel/distcc/distcc-2.5-r1.ebuild
index 1c89bcdfdf06..2634cecbf16a 100644
--- a/sys-devel/distcc/distcc-2.5-r1.ebuild
+++ b/sys-devel/distcc/distcc-2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.5-r1.ebuild,v 1.6 2003/10/24 16:24:07 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.5-r1.ebuild,v 1.7 2004/01/05 23:23:10 robbat2 Exp $
 
 inherit eutils
 
diff --git a/sys-devel/distcc/distcc-2.8-r2.ebuild b/sys-devel/distcc/distcc-2.8-r2.ebuild
index b1fbecdae748..21222784f034 100644
--- a/sys-devel/distcc/distcc-2.8-r2.ebuild
+++ b/sys-devel/distcc/distcc-2.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.8-r2.ebuild,v 1.9 2003/10/24 16:24:07 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.8-r2.ebuild,v 1.10 2004/01/05 23:23:10 robbat2 Exp $
 
 inherit eutils gcc flag-o-matic
 [ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
diff --git a/sys-devel/distcc/distcc-2.9.ebuild b/sys-devel/distcc/distcc-2.9.ebuild
index 76c950459d77..cbcc7eca8e3f 100644
--- a/sys-devel/distcc/distcc-2.9.ebuild
+++ b/sys-devel/distcc/distcc-2.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.9.ebuild,v 1.7 2003/10/24 16:24:07 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.9.ebuild,v 1.8 2004/01/05 23:23:10 robbat2 Exp $
 
 inherit eutils gcc flag-o-matic
 [ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
diff --git a/sys-devel/distcc/files/2.10/distcc-config b/sys-devel/distcc/files/2.10/distcc-config
index 5a8f5fe668c0..ce075c379144 100644
--- a/sys-devel/distcc/files/2.10/distcc-config
+++ b/sys-devel/distcc/files/2.10/distcc-config
@@ -8,7 +8,7 @@
 # This script developed by Zachary T Welch at Superlucidity Services, LLC
 #  based on ideas from irc discussion and the clear need for this support
 # 
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.10/distcc-config,v 1.2 2003/09/15 04:46:59 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.10/distcc-config,v 1.3 2004/01/05 23:23:10 robbat2 Exp $
 # Changelog
 # 
 # 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc.
@@ -135,7 +135,7 @@ dccc_show_env() {
 }
 
 dccc_test_env() {
-	dccc_show_env | grep "$1" | tail -1 | sed -e "s,${1}=,,"
+	dccc_show_env | grep "$1" | tail -n1 | sed -e "s,${1}=,,"
 }
 
 dccc_load_defaults() {
@@ -175,7 +175,7 @@ dccc_regen_env() {
 dccc_get_env() {
 	if [ -f ${DCCC_ENV_FILE} ]; then
 		local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \
-			grep -v '^#' | tail -1)"
+			grep -v '^#' | tail -n1)"
 		echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,'
 	elif [ -n "${2}" ]; then
 		echo "${2}"
diff --git a/sys-devel/distcc/files/2.11/distcc-config b/sys-devel/distcc/files/2.11/distcc-config
index 3f0e143f9cd6..84f2af5ee1de 100644
--- a/sys-devel/distcc/files/2.11/distcc-config
+++ b/sys-devel/distcc/files/2.11/distcc-config
@@ -8,7 +8,7 @@
 # This script developed by Zachary T Welch at Superlucidity Services, LLC
 #  based on ideas from irc discussion and the clear need for this support
 # 
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11/distcc-config,v 1.2 2003/12/06 17:31:04 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11/distcc-config,v 1.3 2004/01/05 23:23:10 robbat2 Exp $
 # Changelog
 # 
 # 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc.
@@ -135,7 +135,7 @@ dccc_show_env() {
 }
 
 dccc_test_env() {
-	dccc_show_env | grep "$1" | tail -1 | sed -e "s,${1}=,,"
+	dccc_show_env | grep "$1" | tail -n1 | sed -e "s,${1}=,,"
 }
 
 dccc_load_defaults() {
@@ -175,7 +175,7 @@ dccc_regen_env() {
 dccc_get_env() {
 	if [ -f ${DCCC_ENV_FILE} ]; then
 		local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \
-			grep -v '^#' | tail -1)"
+			grep -v '^#' | tail -n1)"
 		echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,'
 	elif [ -n "${2}" ]; then
 		echo "${2}"
diff --git a/sys-devel/distcc/files/2.8/distcc-config b/sys-devel/distcc/files/2.8/distcc-config
index 53e44397663e..089323320f03 100644
--- a/sys-devel/distcc/files/2.8/distcc-config
+++ b/sys-devel/distcc/files/2.8/distcc-config
@@ -8,7 +8,7 @@
 # This script developed by Zachary T Welch at Superlucidity Services, LLC
 #  based on ideas from irc discussion and the clear need for this support
 # 
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.8/distcc-config,v 1.2 2003/07/21 19:06:34 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.8/distcc-config,v 1.3 2004/01/05 23:23:10 robbat2 Exp $
 # Changelog
 # 
 # 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc.
@@ -135,7 +135,7 @@ dccc_show_env() {
 }
 
 dccc_test_env() {
-	dccc_show_env | grep "$1" | tail -1 | sed -e "s,${1}=,,"
+	dccc_show_env | grep "$1" | tail -n1 | sed -e "s,${1}=,,"
 }
 
 dccc_load_defaults() {
@@ -175,7 +175,7 @@ dccc_regen_env() {
 dccc_get_env() {
 	if [ -f ${DCCC_ENV_FILE} ]; then
 		local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \
-			grep -v '^#' | tail -1)"
+			grep -v '^#' | tail -n1)"
 		echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,'
 	elif [ -n "${2}" ]; then
 		echo "${2}"
diff --git a/sys-devel/distcc/files/2.9/distcc-config b/sys-devel/distcc/files/2.9/distcc-config
index af49a5d09d20..bf999702033b 100644
--- a/sys-devel/distcc/files/2.9/distcc-config
+++ b/sys-devel/distcc/files/2.9/distcc-config
@@ -8,7 +8,7 @@
 # This script developed by Zachary T Welch at Superlucidity Services, LLC
 #  based on ideas from irc discussion and the clear need for this support
 # 
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.9/distcc-config,v 1.1 2003/07/21 18:58:27 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.9/distcc-config,v 1.2 2004/01/05 23:23:10 robbat2 Exp $
 # Changelog
 # 
 # 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc.
@@ -135,7 +135,7 @@ dccc_show_env() {
 }
 
 dccc_test_env() {
-	dccc_show_env | grep "$1" | tail -1 | sed -e "s,${1}=,,"
+	dccc_show_env | grep "$1" | tail -n1 | sed -e "s,${1}=,,"
 }
 
 dccc_load_defaults() {
@@ -175,7 +175,7 @@ dccc_regen_env() {
 dccc_get_env() {
 	if [ -f ${DCCC_ENV_FILE} ]; then
 		local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \
-			grep -v '^#' | tail -1)"
+			grep -v '^#' | tail -n1)"
 		echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,'
 	elif [ -n "${2}" ]; then
 		echo "${2}"