Bump with compile fixes for #50000 #97795 #120724 #130740 hopefully

(Portage version: 2.1_pre10-r5)

7 files changed, 188 insertions, 2 deletions

diff --git a/app-shells/ksh/ChangeLog b/app-shells/ksh/ChangeLog
index d7a8ea2025cb..e3ea9131e11a 100644
--- a/app-shells/ksh/ChangeLog
+++ b/app-shells/ksh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-shells/ksh
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ChangeLog,v 1.25 2006/04/21 17:13:34 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ChangeLog,v 1.26 2006/05/12 03:00:40 cretin Exp $
+
+*ksh-93.20060214-r1 (12 May 2006)
+
+  12 May 2006; Stefan Jones <cretin@gentoo.org>
+  +files/ksh-20041225-gcc4.patch, +files/ksh-20050202-uname.patch,
+  +files/ksh-20060124-syntax.patch, +ksh-93.20060214-r1.ebuild:
+  Bump with compile fixes for #50000 #97795 #120724 #130740 hopefully
 
 *ksh-93.20060214 (21 Apr 2006)
 
diff --git a/app-shells/ksh/files/digest-ksh-93.20060214 b/app-shells/ksh/files/digest-ksh-93.20060214
index c107748612aa..9cad10307307 100644
--- a/app-shells/ksh/files/digest-ksh-93.20060214
+++ b/app-shells/ksh/files/digest-ksh-93.20060214
@@ -1,3 +1,9 @@
 MD5 375ede1f75db451f645a140ec41b9216 INIT.2006-02-14.tgz 317116
-MD5 76a13bdb10a35b5ff67208cf9042a8bf ast-ksh.2006-02-14.tgz 1575902
+RMD160 68649532a15c34dcb20d61a544c1594d030c5f3f INIT.2006-02-14.tgz 317116
+SHA256 3c8e8de02004ba198ec4238a4ccd3abf99e7cedde8ce8c9e83db564d6fdc272c INIT.2006-02-14.tgz 317116
 MD5 aeafd460e8079c3d038fb5049662d545 ast-ksh-locale.2006-02-14.tgz 592924
+RMD160 35054edf67a0d9808c1b465d35a0946e9726f8a5 ast-ksh-locale.2006-02-14.tgz 592924
+SHA256 b8a6ec19eb60de07dfb5a9782bdf059dba4421500db38e7c2080066c4d8d4032 ast-ksh-locale.2006-02-14.tgz 592924
+MD5 76a13bdb10a35b5ff67208cf9042a8bf ast-ksh.2006-02-14.tgz 1575902
+RMD160 e4ac75119e4678af2c90cb3a1a28805ad380e9dd ast-ksh.2006-02-14.tgz 1575902
+SHA256 f9720cc52f076c8f1754e909443edef7fd614460c57d29ed086d564d0e5816b4 ast-ksh.2006-02-14.tgz 1575902
diff --git a/app-shells/ksh/files/digest-ksh-93.20060214-r1 b/app-shells/ksh/files/digest-ksh-93.20060214-r1
new file mode 100644
index 000000000000..9cad10307307
--- /dev/null
+++ b/app-shells/ksh/files/digest-ksh-93.20060214-r1
@@ -0,0 +1,9 @@
+MD5 375ede1f75db451f645a140ec41b9216 INIT.2006-02-14.tgz 317116
+RMD160 68649532a15c34dcb20d61a544c1594d030c5f3f INIT.2006-02-14.tgz 317116
+SHA256 3c8e8de02004ba198ec4238a4ccd3abf99e7cedde8ce8c9e83db564d6fdc272c INIT.2006-02-14.tgz 317116
+MD5 aeafd460e8079c3d038fb5049662d545 ast-ksh-locale.2006-02-14.tgz 592924
+RMD160 35054edf67a0d9808c1b465d35a0946e9726f8a5 ast-ksh-locale.2006-02-14.tgz 592924
+SHA256 b8a6ec19eb60de07dfb5a9782bdf059dba4421500db38e7c2080066c4d8d4032 ast-ksh-locale.2006-02-14.tgz 592924
+MD5 76a13bdb10a35b5ff67208cf9042a8bf ast-ksh.2006-02-14.tgz 1575902
+RMD160 e4ac75119e4678af2c90cb3a1a28805ad380e9dd ast-ksh.2006-02-14.tgz 1575902
+SHA256 f9720cc52f076c8f1754e909443edef7fd614460c57d29ed086d564d0e5816b4 ast-ksh.2006-02-14.tgz 1575902
diff --git a/app-shells/ksh/files/ksh-20041225-gcc4.patch b/app-shells/ksh/files/ksh-20041225-gcc4.patch
new file mode 100644
index 000000000000..6158f42019d7
--- /dev/null
+++ b/app-shells/ksh/files/ksh-20041225-gcc4.patch
@@ -0,0 +1,11 @@
+--- ksh-20041225/src/lib/libast/sfio/sfstrtof.h.gcc4	2005-03-01 05:59:18.000000000 -0500
++++ ksh-20041225/src/lib/libast/sfio/sfstrtof.h	2005-03-01 06:00:18.000000000 -0500
+@@ -53,7 +53,7 @@
+ 
+ #if !defined(S2F_function)
+ #define S2F_function	_sfdscan
+-#define S2F_static	1
++#define S2F_static	-1
+ #define S2F_type	2
+ #define S2F_scan	1
+ #ifndef elementsof
diff --git a/app-shells/ksh/files/ksh-20050202-uname.patch b/app-shells/ksh/files/ksh-20050202-uname.patch
new file mode 100644
index 000000000000..bb66db600f3c
--- /dev/null
+++ b/app-shells/ksh/files/ksh-20050202-uname.patch
@@ -0,0 +1,19 @@
+--- ksh-20050202_new/src/lib/libcmd/uname.c.uname	2006-02-01 15:32:32.000000000 +0100
++++ ksh-20050202_new/src/lib/libcmd/uname.c	2006-02-01 15:48:37.000000000 +0100
+@@ -394,6 +394,16 @@
+ 		{
+ 			if (!*(s = astconf("PLATFORM", NiL, NiL)))
+ 				s = astconf("HW_NAME", NiL, NiL);
++            if (! *s && !*(s = astconf("ARCHITECTURE", NiL, NiL))) 
++            {
++                if (t = strchr(hosttype, '.'))
++                    t++;
++                else
++                    t = hosttype;
++                strncpy(s = buf, t, sizeof(buf) - 1);
++            }
++            if(strlen(s)==4 && s[0]=='i' && s[2]=='8' && s[3]=='6')
++                s[1]='3';
+ 			output(OPT_implementation, s, "implementation");
+ 		}
+ 		if (flags & OPT_extended_release)
diff --git a/app-shells/ksh/files/ksh-20060124-syntax.patch b/app-shells/ksh/files/ksh-20060124-syntax.patch
new file mode 100644
index 000000000000..7f92bee3a7e7
--- /dev/null
+++ b/app-shells/ksh/files/ksh-20060124-syntax.patch
@@ -0,0 +1,64 @@
+diff -urN ksh-20060124_old/src/lib/libast/Mamfile ksh-20060124_new/src/lib/libast/Mamfile
+--- ksh-20060124_old/src/lib/libast/Mamfile	2006-01-24 18:17:19.000000000 -0500
++++ ksh-20060124_new/src/lib/libast/Mamfile	2006-02-14 04:43:39.000000000 -0500
+@@ -6939,7 +6939,7 @@
+ make ${INSTALLROOT}/include/ast/fmtmsg.h
+ prev comp/fmtmsg.h
+ prev ast_lib.h
+-exec - case ${mam_cc_HOSTTYPE} in
++exec - case "${mam_cc_HOSTTYPE}" in
+ exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/fmtmsg.h > 1.${COTEMP}.x
+ exec - 	if	cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/fmtmsg.h 1.${COTEMP}.x
+ exec - 	then	rm -f 1.${COTEMP}.x
+@@ -6960,7 +6960,7 @@
+ make ${INSTALLROOT}/include/ast/libgen.h
+ prev comp/libgen.h
+ prev ast_lib.h
+-exec - case ${mam_cc_HOSTTYPE} in
++exec - case "${mam_cc_HOSTTYPE}" in
+ exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/libgen.h > 1.${COTEMP}.x
+ exec - 	if	cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/libgen.h 1.${COTEMP}.x
+ exec - 	then	rm -f 1.${COTEMP}.x
+@@ -6981,7 +6981,7 @@
+ make ${INSTALLROOT}/include/ast/syslog.h
+ prev comp/syslog.h
+ prev ast_lib.h
+-exec - case ${mam_cc_HOSTTYPE} in
++exec - case "${mam_cc_HOSTTYPE}" in
+ exec - win32.*)proto -p -s -l ${PACKAGEROOT}/lib/package/ast.lic '-o since=1985,author=gsf+dgk+kpv' comp/syslog.h > 1.${COTEMP}.x
+ exec - 	if	cmp 2>/dev/null -s ${INSTALLROOT}/include/ast/syslog.h 1.${COTEMP}.x
+ exec - 	then	rm -f 1.${COTEMP}.x
+--- ksh-20060124_new/src/lib/libast/features/stdio.rh1	2006-02-15 07:18:01.000000000 -0500
++++ ksh-20060124_new/src/lib/libast/features/stdio	2006-02-15 07:18:25.000000000 -0500
+@@ -269,7 +269,9 @@
+ 		printf("#define getw		_ast_getw\n");
+ 		printf("#define pclose		_ast_pclose\n");
+ 		printf("#define popen		_ast_popen\n");
++/*
+ 		printf("#define printf		_ast_printf\n");
++*/
+ 		printf("#define puts		_ast_puts\n");
+ 		printf("#define putw		_ast_putw\n");
+ 		printf("#define rewind		_ast_rewind\n");
+--- ksh-20060124/src/cmd/ksh93/Mamfile.iffedebug        2006-01-24 18:16:51.000000000 -0500
++++ ksh-20060124/src/cmd/ksh93/Mamfile  2006-02-14 09:54:18.000000000 -0500
+@@ -1356,7 +1356,7 @@
+ prev ${mam_libsecdb}
+ prev +lintl
+ prev ${mam_libdl}
+-exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libast}
++exec - ${CC} ${CCLDFLAGS} -L. -L../../../lib ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ksh pmain.o ${mam_libshell} ${mam_libast}
+ done ksh generated
+ make shcomp
+ make shcomp.o
+--- ksh-20060124/src/cmd/ksh93/Mamfile.rh1      2006-02-14 10:25:47.000000000 -0500
++++ ksh-20060124/src/cmd/ksh93/Mamfile  2006-02-14 10:26:32.000000000 -0500
+@@ -1403,7 +1403,7 @@
+ prev +lintl
+ prev ${mam_libdl}
+ setv CC.DLL -UCC.DLL
+-exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libast}
++exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} -L. -L../../../lib ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o suid_exec suid_exec.o ${mam_libast} ${mam_libast}
+ done suid_exec generated
+ make shell
+ prev libshell.a archive
diff --git a/app-shells/ksh/ksh-93.20060214-r1.ebuild b/app-shells/ksh/ksh-93.20060214-r1.ebuild
new file mode 100644
index 000000000000..1edf88a18ab4
--- /dev/null
+++ b/app-shells/ksh/ksh-93.20060214-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/ksh/ksh-93.20060214-r1.ebuild,v 1.1 2006/05/12 03:00:40 cretin Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+RELEASE="2006-02-14"
+DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
+HOMEPAGE="http://www.kornshell.com/"
+SRC_URI="nls? ( mirror://gentoo/ast-ksh-locale.${RELEASE}.tgz )
+	mirror://gentoo/INIT.${RELEASE}.tgz
+	mirror://gentoo/ast-ksh.${RELEASE}.tgz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~alpha ~arm ~s390 ~ia64 ~ppc ~amd64"
+IUSE="nls"
+
+DEPEND="virtual/libc !app-shells/pdksh"
+
+S=${WORKDIR}
+
+src_unpack() {
+	# the AT&T build tools look in here for packages.
+	mkdir -p ${S}/lib/package/tgz
+
+	# move the packages into place.
+	cp ${DISTDIR}/ast-ksh.${RELEASE}.tgz ${S}/lib/package/tgz/ || die
+
+	if use nls; then
+		cp ${DISTDIR}/ast-ksh-locale.${RELEASE}.tgz ${S}/lib/package/tgz/ || die
+	fi
+
+	# INIT provides the basic tools to start building.
+	unpack INIT.${RELEASE}.tgz
+
+	# `package read` will unpack any tarballs put in place.
+	${S}/bin/package read || die
+
+	epatch ${FILESDIR}/ksh-20041225-gcc4.patch
+	epatch ${FILESDIR}/ksh-20050202-uname.patch
+	epatch ${FILESDIR}/ksh-20060124-syntax.patch
+}
+
+src_compile() {
+	strip-flags; export CCFLAGS="${CFLAGS}"
+
+	cd ${S}; ./bin/package only make ast-ksh CC="$(tc-getCC)" || die
+
+	# install the optional locale data.
+	if use nls; then
+		cd ${S}; ./bin/package only make ast-ksh-locale CC="$(tc-getCC)"
+	fi
+}
+
+src_install() {
+	exeinto /bin
+	doexe ${S}/arch/linux.*/bin/ok/ksh || die
+
+	dosym /bin/ksh /bin/ksh93
+
+	newman ${S}/arch/linux.*/man/man1/sh.1 ksh.1
+	dodoc lib/package/LICENSES/ast
+	dohtml lib/package/ast-ksh.html
+
+	if use nls; then
+		dodir /usr/share
+		mv ${S}/share/lib/locale ${D}/usr/share
+	fi
+}