patch for new coreutils syntax, thanks to: Stefan Knoblich <stkn@gentoo.org> in bug #31835

4 files changed, 31 insertions, 12 deletions

diff --git a/app-shells/pdksh/ChangeLog b/app-shells/pdksh/ChangeLog
index 806e5d64be2f..d9efe96477ad 100644
--- a/app-shells/pdksh/ChangeLog
+++ b/app-shells/pdksh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/pdksh
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/pdksh/ChangeLog,v 1.11 2003/05/29 09:54:44 scandium Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/pdksh/ChangeLog,v 1.12 2004/01/04 17:47:50 seemant Exp $
+
+  04 Jan 2004; Seemant Kulleen <seemant@gentoo.org> pdksh-5.2.14-r4.ebuild,
+  files/pdksh-5.2.14-coreutils-posix-fix.patch:
+  patch for new coreutils syntax, thanks to: Stefan Knoblich <stkn@gentoo.org>
+  in bug #31835
 
   29 May 2003; Rainer Groesslinger <scandium@gentoo.org>
   pdksh-5.2.14-r4.ebuild:
diff --git a/app-shells/pdksh/Manifest b/app-shells/pdksh/Manifest
index 7aa9c5fe117b..896bd9d68b17 100644
--- a/app-shells/pdksh/Manifest
+++ b/app-shells/pdksh/Manifest
@@ -1,3 +1,4 @@
-MD5 58e2189a585064080191a83415b50d97 ChangeLog 1949
-MD5 8ad2bfa47edc6882248822b9de137705 pdksh-5.2.14-r4.ebuild 920
+MD5 c566a163e24651ba4b7936e62d67dba5 pdksh-5.2.14-r4.ebuild 1032
+MD5 245dfccd2ef4518a5bf9966f5035571b ChangeLog 2168
 MD5 e00717e9bd2d8dacd3133f594a131e54 files/digest-pdksh-5.2.14-r4 129
+MD5 2cf77b988d3a4d99a847a3829c964847 files/pdksh-5.2.14-coreutils-posix-fix.patch 439
diff --git a/app-shells/pdksh/files/pdksh-5.2.14-coreutils-posix-fix.patch b/app-shells/pdksh/files/pdksh-5.2.14-coreutils-posix-fix.patch
new file mode 100644
index 000000000000..63fec06dd824
--- /dev/null
+++ b/app-shells/pdksh/files/pdksh-5.2.14-coreutils-posix-fix.patch
@@ -0,0 +1,11 @@
+--- pdksh-5.2.14-ori/siglist.sh	1996-09-18 18:52:41.000000000 +0200
++++ pdksh-5.2.14/siglist.sh	2003-10-23 20:25:56.000000000 +0200
+@@ -23,7 +23,7 @@
+ 	{ QwErTy SIG\1 , "\1", "\2" },\
+ #endif/') > $in
+ $CPP $in  > $out
+-sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort +2n +0n |
++sed -n 's/{ QwErTy/{/p' < $out | awk '{print NR, $0}' | sort -n -k 3,3 -k 1,1 |
+     sed 's/^[0-9]* //' |
+     awk 'BEGIN { last=0; nsigs=0; }
+ 	{
diff --git a/app-shells/pdksh/pdksh-5.2.14-r4.ebuild b/app-shells/pdksh/pdksh-5.2.14-r4.ebuild
index ccdc4753d3a8..c2fceb6fae5f 100644
--- a/app-shells/pdksh/pdksh-5.2.14-r4.ebuild
+++ b/app-shells/pdksh/pdksh-5.2.14-r4.ebuild
@@ -1,26 +1,30 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/pdksh/pdksh-5.2.14-r4.ebuild,v 1.15 2003/09/19 00:47:22 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/pdksh/pdksh-5.2.14-r4.ebuild,v 1.16 2004/01/04 17:47:50 seemant Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The Public Domain Korn Shell"
-SRC_URI="ftp://ftp.cs.mun.ca/pub/pdksh/${P}.tar.gz
-	 ftp://ftp.cs.mun.ca/pub/pdksh/${P}-patches.1"
 HOMEPAGE="http://www.cs.mun.ca/~michael/pdksh/"
-KEYWORDS="x86 ppc sparc alpha ia64"
+SRC_URI="ftp://ftp.cs.mun.ca/pub/pdksh/${P}.tar.gz
+	ftp://ftp.cs.mun.ca/pub/pdksh/${P}-patches.1"
+
 SLOT="0"
 LICENSE="as-is"
+KEYWORDS="x86 ppc sparc alpha ~hppa ~mips ~arm ~amd64 ia64 ~ppc64"
 
-DEPEND=">=sys-libs/glibc-2.1.3"
+DEPEND=">=sys-libs/glibc-2.1.3
+	sys-apps/coreutils"
 
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
-	patch -p2 < ${DISTDIR}/${P}-patches.1
+	epatch ${DISTDIR}/${P}-patches.1
+	epatch ${FILESDIR}/${P}-coreutils-posix-fix.patch
 }
 
 src_compile() {
-
 	echo 'ksh_cv_dev_fd=${ksh_cv_dev_fd=yes}' > config.cache
 
 	./configure \
@@ -31,7 +35,6 @@ src_compile() {
 }
 
 src_install() {
-
 	into /
 	dobin ksh
 	into usr
@@ -39,5 +42,4 @@ src_install() {
 	dodoc BUG-REPORTS ChangeLog* CONTRIBUTORS LEGAL NEWS NOTES PROJECTS README
 	docinto etc
 	dodoc etc/*
-
 }