Fix calls to head and tail to use -n and not -[0-9].

6 files changed, 114 insertions, 25 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index de61262aaebf..d563c2552540 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.76 2003/07/20 03:13:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.77 2003/07/21 21:26:31 azarah Exp $
+
+  21 Jul 2003; Martin Schlemmer <azarah@gentoo.org> qt-3.1.2-r3.ebuild,
+  qt-3.1.2-r4.ebuild, qt-3.1.2-r5.ebuild,
+  files/qt-3.1.2-coreutils-fixup.patch:
+  Fix calls to head and tail to use -n and not -[0-9].
 
   19 Jul 2003; Seemant Kulleen <seemant@gentoo.org> qt-3.1.2-r5.ebuild:
   korean patch only needs to be applied on use cjk -- and this didn't need a
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 94e0b89912c9..8c556b52ad28 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,32 +1,33 @@
-MD5 e81d2182a929c891d3c3b0b465e7ac3c qt-3.1.2-r3.ebuild 5027
+MD5 803774f27630de0989ac09521f1edbae ChangeLog 12880
 MD5 0a5904be76bb25b35a03f3a5502aec90 qt-2.3.2-r1.ebuild 2323
-MD5 c263d19a10907603cda98fe7ad229cbd qt-3.1.2-r5.ebuild 5132
-MD5 d8f9c7d8ddb12f1a412670d497215015 qt-3.2.0_beta2.ebuild 4497
 MD5 c0200496fd1c371b27238e33e95fbe9e qt-3.0.5-r2.ebuild 3983
+MD5 c31bb1b07af43f08f17f8c9ad1470cce qt-3.2.0_beta1.ebuild 4497
+MD5 d8f9c7d8ddb12f1a412670d497215015 qt-3.2.0_beta2.ebuild 4497
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 84c6ec3404652a299f4935be57424e33 qt-3.1.2-r4.ebuild 5174
+MD5 fe6690bfdb04cfe87a69fa54d9ae6bcc qt-3.1.2-r5.ebuild 5234
 MD5 774f04a75d56c8b4da7772786d16b843 qt-3.1.0-r3.ebuild 4846
-MD5 703ba8038e5b2979c00d10ffffb3313d qt-3.1.2-r4.ebuild 5072
 MD5 3666aed2bc53e3d5cedf5fc6e424ed50 qt-3.1.1-r2.ebuild 4666
-MD5 fac8b013730d36df8b48d71ba8effc88 ChangeLog 12671
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 c31bb1b07af43f08f17f8c9ad1470cce qt-3.2.0_beta1.ebuild 4497
+MD5 a227a0d8d3b70058ccd857cd5b7f1a66 qt-3.1.2-r3.ebuild 5126
+MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
 MD5 2d5b68b38185a30a28ffb2b652258cb8 files/45qt3 83
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 7a287bc7609ad2420f70af6d4c58302f files/50qt2 63
-MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
+MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
 MD5 75f50432ffd304d181e2799f7cdba228 files/digest-qt-3.2.0_beta1 74
-MD5 0de4098994a7001bb679af6df6932f90 files/digest-qt-3.2.0_beta2 74
-MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
 MD5 c8a8d41028d22397dcc86041f1856a79 files/digest-qt-3.0.5-r2 71
-MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r3 72
-MD5 cfa73af7c2f2661be4ea9f3c9347db84 files/digest-qt-3.1.1-r2 72
-MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
+MD5 0de4098994a7001bb679af6df6932f90 files/digest-qt-3.2.0_beta2 74
+MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
+MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
+MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r4 72
 MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r5 72
-MD5 1da4214f7cf90d34592e0453f47b4758 files/designer.diff 380
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
-MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16
+MD5 52e7df9b93f281c262716caac4cb7705 files/digest-qt-3.1.0-r3 72
+MD5 cfa73af7c2f2661be4ea9f3c9347db84 files/digest-qt-3.1.1-r2 72
 MD5 e9b2e2fbde862abb62cdfa78e62a35b6 files/qt-3.1.2-qmlined.diff 320
-MD5 953be971128fb1a5ad7d9893f657e13c files/qt-3.1.2-korean-xim.patch 4285
-MD5 e4b92fbf81b7fc94c5d337e1675476d7 files/qt-x11-free-3.0.5-ko_input.patch 12682
-MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65
+MD5 001400cb2710d783deb4380ca6056bc2 files/qsocket-3.1.2.diff 3136
+MD5 f197d87f2b33685cadba08c9cf2d08ee files/digest-qt-3.1.2-r3 72
+MD5 c6dc1b6fadcb4897d4c7b0a768c2d196 files/qt-3.1.2-r3-qsocket.diff 447
 MD5 bf7aed227565288222ea889c81b1e363 files/qt-3.1.2-qlistview-dnd.diff 469
-MD5 39f840d6723a7e898394bc84efb224a2 files/qt-3.1.0-minimized.diff 272
+MD5 953be971128fb1a5ad7d9893f657e13c files/qt-3.1.2-korean-xim.patch 4285
+MD5 04fdd1779f4aca06b809528a2d0bad7a files/qt-3.1.2-coreutils-fixup.patch 4203
diff --git a/x11-libs/qt/files/qt-3.1.2-coreutils-fixup.patch b/x11-libs/qt/files/qt-3.1.2-coreutils-fixup.patch
new file mode 100644
index 000000000000..1b6994361b15
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.1.2-coreutils-fixup.patch
@@ -0,0 +1,77 @@
+diff -urN qt-x11-free-3.1.2/config.tests/x11/xfreetype.test qt-x11-free-3.1.2.coreutils/config.tests/x11/xfreetype.test
+--- qt-x11-free-3.1.2/config.tests/x11/xfreetype.test	2002-12-24 10:11:13.000000000 +0200
++++ qt-x11-free-3.1.2.coreutils/config.tests/x11/xfreetype.test	2003-07-21 22:33:09.000000000 +0200
+@@ -84,8 +84,8 @@
+ 
+ # detect major version of Xft
+ if [ "$XFT" = "yes" ]; then
+-    XFT_MAJOR=`grep XFT_MAJOR $XFT_H | head -1 | awk '{ print \$3 }'`
+-    XFT_MINOR=`grep XFT_MINOR $XFT_H | head -1 | awk '{ print \$3 }'`
++    XFT_MAJOR=`grep XFT_MAJOR $XFT_H | head -n 1 | awk '{ print \$3 }'`
++    XFT_MINOR=`grep XFT_MINOR $XFT_H | head -n 1 | awk '{ print \$3 }'`
+     [ "$VERBOSE" = "yes" ] && echo "  Found Xft version $XFT_MAJOR.$XFT_MINOR"
+     if [ "$XFT_MAJOR" = "2" ]; then
+         XFT2=yes
+diff -urN qt-x11-free-3.1.2/src/3rdparty/libmng/aclocal.m4 qt-x11-free-3.1.2.coreutils/src/3rdparty/libmng/aclocal.m4
+--- qt-x11-free-3.1.2/src/3rdparty/libmng/aclocal.m4	2002-11-07 17:55:25.000000000 +0200
++++ qt-x11-free-3.1.2.coreutils/src/3rdparty/libmng/aclocal.m4	2003-07-21 22:33:09.000000000 +0200
+@@ -1607,7 +1607,7 @@
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+ 	cp $export_symbols $output_objdir/$soname-def;
+       else
+ 	echo EXPORTS > $output_objdir/$soname-def;
+@@ -3546,7 +3546,7 @@
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   case "$host_os" in
+   rhapsody* | darwin1.[[012]])
+-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
++    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n 1`
+     ;;
+   *) # Darwin 1.3 on
+     lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+diff -urN qt-x11-free-3.1.2/src/3rdparty/libmng/config.guess qt-x11-free-3.1.2.coreutils/src/3rdparty/libmng/config.guess
+--- qt-x11-free-3.1.2/src/3rdparty/libmng/config.guess	2002-11-07 17:55:25.000000000 +0200
++++ qt-x11-free-3.1.2.coreutils/src/3rdparty/libmng/config.guess	2003-07-21 22:33:09.000000000 +0200
+@@ -319,7 +319,7 @@
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun*:*:4.2BSD:*)
+-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++	UNAME_RELEASE=`(head -n 1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+@@ -506,7 +506,7 @@
+ 	fi
+ 	exit 0 ;;
+     *:AIX:*:[45])
+-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
++	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -n 1 | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+diff -urN qt-x11-free-3.1.2/src/3rdparty/libmng/configure qt-x11-free-3.1.2.coreutils/src/3rdparty/libmng/configure
+--- qt-x11-free-3.1.2/src/3rdparty/libmng/configure	2002-11-07 17:55:25.000000000 +0200
++++ qt-x11-free-3.1.2.coreutils/src/3rdparty/libmng/configure	2003-07-21 22:33:09.000000000 +0200
+@@ -1956,7 +1956,7 @@
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   case "$host_os" in
+   rhapsody* | darwin1.[012])
+-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
++    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n 1`
+     ;;
+   *) # Darwin 1.3 on
+     lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+@@ -3433,7 +3433,7 @@
+     # If the export-symbols file already is a .def file (1st line
+     # is EXPORTS), use it as is.
+     # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
+ 	cp $export_symbols $output_objdir/$soname-def;
+       else
+ 	echo EXPORTS > $output_objdir/$soname-def;
diff --git a/x11-libs/qt/qt-3.1.2-r3.ebuild b/x11-libs/qt/qt-3.1.2-r3.ebuild
index 6ad1bb7eca51..5ecdbe293451 100644
--- a/x11-libs/qt/qt-3.1.2-r3.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r3.ebuild,v 1.7 2003/07/16 16:04:22 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r3.ebuild,v 1.8 2003/07/21 21:26:31 azarah Exp $
 
 inherit eutils
 
@@ -57,6 +57,8 @@ src_unpack() {
 	epatch ${FILESDIR}/designer.diff
 	epatch ${FILESDIR}/${P}-qmlined.diff
 	epatch ${FILESDIR}/${P}-r3-qsocket.diff
+	# Fix issues with coreutils's head and tail commands
+	epatch ${FILESDIR}/${P}-coreutils-fixup.patch
 	
 	cp configure configure.orig
 	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
diff --git a/x11-libs/qt/qt-3.1.2-r4.ebuild b/x11-libs/qt/qt-3.1.2-r4.ebuild
index 22b2a5d8a67e..1a297dae12ef 100644
--- a/x11-libs/qt/qt-3.1.2-r4.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r4.ebuild,v 1.1 2003/07/11 09:19:09 brain Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r4.ebuild,v 1.2 2003/07/21 21:26:31 azarah Exp $
 
 inherit eutils
 
@@ -58,6 +58,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-qmlined.diff
 	epatch ${FILESDIR}/${P}-r3-qsocket.diff
 	epatch ${FILESDIR}/${P}-qlistview-dnd.diff
+	# Fix issues with coreutils's head and tail commands
+	epatch ${FILESDIR}/${P}-coreutils-fixup.patch
 	
 	cp configure configure.orig
 	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
diff --git a/x11-libs/qt/qt-3.1.2-r5.ebuild b/x11-libs/qt/qt-3.1.2-r5.ebuild
index c7311721aea9..a0dd0d08518f 100644
--- a/x11-libs/qt/qt-3.1.2-r5.ebuild
+++ b/x11-libs/qt/qt-3.1.2-r5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r5.ebuild,v 1.2 2003/07/20 03:13:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.1.2-r5.ebuild,v 1.3 2003/07/21 21:26:31 azarah Exp $
 
 inherit eutils
 
 IUSE="cups nas postgres opengl mysql odbc gif cjk"
 
-S=${WORKDIR}/qt-x11-free-${PV}
+S="${WORKDIR}/qt-x11-free-${PV}"
 
 DESCRIPTION="QT version ${PV}"
 SLOT="3"
@@ -58,6 +58,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-qmlined.diff
 	epatch ${FILESDIR}/${P}-r3-qsocket.diff
 	epatch ${FILESDIR}/${P}-qlistview-dnd.diff
+	# Fix issues with coreutils's head and tail commands
+	epatch ${FILESDIR}/${P}-coreutils-fixup.patch
 
 	use cjk && epatch ${FILESDIR}/${P}-korean-xim.patch