Added "head -1"-patch from bug 84458, set conf-cc before compiling.

(Portage version: 2.0.51.22-r2)

4 files changed, 92 insertions, 13 deletions

diff --git a/net-mail/qtools/ChangeLog b/net-mail/qtools/ChangeLog
index 5c6f7d6596d0..f4ae13630d4b 100644
--- a/net-mail/qtools/ChangeLog
+++ b/net-mail/qtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/qtools
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qtools/ChangeLog,v 1.6 2004/12/29 03:29:09 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qtools/ChangeLog,v 1.7 2005/08/06 21:19:05 hansmi Exp $
+
+  06 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/qtools-0.56-head.patch, qtools-0.56.ebuild:
+  Added "head -1"-patch from bug 84458, set conf-cc before compiling.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-mail/qtools/Manifest b/net-mail/qtools/Manifest
index bf50191c584e..455133c7bd93 100644
--- a/net-mail/qtools/Manifest
+++ b/net-mail/qtools/Manifest
@@ -1,5 +1,7 @@
-MD5 a081235d8d578ac3dcec1d99d79ef892 ChangeLog 805
+MD5 b89c2a5a3b90764ae1274f0930f13c5c qtools-0.56.ebuild 1200
 MD5 e60e7e9ed6a2c7d3a2ebcee6a6af429e metadata.xml 277
-MD5 57b1e61108bc9862e829dd3714e32113 qtools-0.56.ebuild 1128
-MD5 d397de4ad57b3e6d89294df49fa4f3b1 files/digest-qtools-0.56 62
+MD5 a081235d8d578ac3dcec1d99d79ef892 ChangeLog 805
+MD5 1bdb1327dfd7a767c2d92bfbdfe3c425 .qtools-0.56.ebuild.swp 12288
 MD5 04a4c35d8c9cdf362be4a58d25a9aa4d files/qtools-0.56-errno.patch 291
+MD5 682bf64c6aac658ac3ea5c73d3b47063 files/qtools-0.56-head.patch 2129
+MD5 d397de4ad57b3e6d89294df49fa4f3b1 files/digest-qtools-0.56 62
diff --git a/net-mail/qtools/files/qtools-0.56-head.patch b/net-mail/qtools/files/qtools-0.56-head.patch
new file mode 100644
index 000000000000..5032a7791c9d
--- /dev/null
+++ b/net-mail/qtools/files/qtools-0.56-head.patch
@@ -0,0 +1,76 @@
+diff -ur qtools-0.56/Makefile ../../qtools-0.56.patched/Makefile
+--- qtools-0.56/Makefile	2001-11-08 14:07:57.000000000 +0100
++++ ../../qtools-0.56.patched/Makefile	2005-06-29 00:44:05.000000000 +0200
+@@ -13,7 +13,7 @@
+ load: warn-auto.sh conf-ld
+ 	( cat warn-auto.sh; \
+ 	echo 'main="$$1"; shift'; \
+-	echo exec "`head -1 conf-ld`" \
++	echo exec "`head -n 1 conf-ld`" \
+ 	'-o "$$main" "$$main".o $${1+"$$@"}' \
+ 	) > load
+ 	chmod 755 load
+@@ -27,7 +27,7 @@
+ 
+ compile: warn-auto.sh conf-cc
+ 	( cat warn-auto.sh; \
+-	echo exec "`head -1 conf-cc`" '-c $${1+"$$@"}' \
++	echo exec "`head -n 1 conf-cc`" '-c $${1+"$$@"}' \
+ 	) > compile
+ 	chmod 755 compile
+ 
+@@ -57,8 +57,8 @@
+ 
+ systype: find-systype.sh conf-cc conf-ld trycpp.c x86cpuid.c
+ 	( cat warn-auto.sh; \
+-	echo CC=\'`head -1 conf-cc`\'; \
+-	echo LD=\'`head -1 conf-ld`\'; \
++	echo CC=\'`head -n 1 conf-cc`\'; \
++	echo LD=\'`head -n 1 conf-ld`\'; \
+ 	cat find-systype.sh; \
+ 	) | sh > systype
+ 
+@@ -379,7 +379,7 @@
+ 
+ choose: warn-auto.sh choose.sh conf-home
+ 	cat warn-auto.sh choose.sh \
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+ 	> choose
+ 	chmod 755 choose
+ 
+@@ -529,7 +529,7 @@
+ 	./compile checkdomain.c
+ 
+ auto_qmail.c: auto-str conf-qmail
+-	./auto-str auto_qmail `head -1 conf-qmail` > auto_qmail.c
++	./auto-str auto_qmail `head -n 1 conf-qmail` > auto_qmail.c
+ 
+ filterto.o: compile \
+ filterto.c \
+@@ -660,7 +660,7 @@
+ 
+ rts: warn-auto.sh rts.sh conf-home
+ 	cat warn-auto.sh rts.sh \
+-	| sed s}HOME}"`head -1 conf-home`"}g \
++	| sed s}HOME}"`head -n 1 conf-home`"}g \
+ 	> rts
+ 	chmod 755 rts
+ 
+@@ -715,14 +715,14 @@
+ 	./compile auto_ezmlm.c
+ 
+ auto_ezmlm.c: auto-str conf-ezmlm
+-	./auto-str auto_ezmlm `head -1 conf-ezmlm` > auto_ezmlm.c
++	./auto-str auto_ezmlm `head -n 1 conf-ezmlm` > auto_ezmlm.c
+ 
+ auto_home.o: compile \
+ auto_home.c
+ 	./compile auto_home.c
+ 
+ auto_home.c: auto-str conf-home
+-	./auto-str auto_home `head -1 conf-home` > auto_home.c
++	./auto-str auto_home `head -n 1 conf-home` > auto_home.c
+ 
+ install: load install.o hier.o auto_home.o stralloc.a alloc.a strerr.a \
+ buffer.a open.a error.a str.a
diff --git a/net-mail/qtools/qtools-0.56.ebuild b/net-mail/qtools/qtools-0.56.ebuild
index a0b11a7c9415..59063d1b78e4 100644
--- a/net-mail/qtools/qtools-0.56.ebuild
+++ b/net-mail/qtools/qtools-0.56.ebuild
@@ -1,19 +1,14 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qtools/qtools-0.56.ebuild,v 1.7 2004/07/15 02:00:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qtools/qtools-0.56.ebuild,v 1.8 2005/08/06 21:19:05 hansmi Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Several utilities for use with qmail, typically as part of .qmail command processing"
-
 HOMEPAGE="http://www.superscript.com/qtools/intro.html"
-
 SRC_URI="http://www.superscript.com/qtools/${P}.tar.gz"
-
 LICENSE="as-is"
-
 SLOT="0"
-
 KEYWORDS="x86 ~mips ~hppa alpha ~ppc ~sparc"
 IUSE="static"
 
@@ -23,10 +18,12 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-errno.patch
+	epatch ${FILESDIR}/${P}-head.patch
 }
 
 src_compile() {
 	use static && LDFLAGS="${LDFLAGS} -static"
+	export CC="$(tc-getCC)"
 	echo "${CC} ${CFLAGS}" > conf-cc
 	echo "${CC} ${LDFLAGS}" > conf-ld
 	echo "/usr" > conf-home