Revision bump.

	- redid xmalloc patch
	- fix syntax error message (bug #143272)
	- fix multiple Makefile problems
	- cleanup and QA
Package-Manager: portage-2.1.4

7 files changed, 125 insertions, 33 deletions

diff --git a/app-office/sc/ChangeLog b/app-office/sc/ChangeLog
index 2aa6d5daca6e..10e23dec7c7f 100644
--- a/app-office/sc/ChangeLog
+++ b/app-office/sc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-office/sc
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.16 2007/05/15 09:45:54 bangert Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.17 2008/01/17 21:02:38 dirtyepic Exp $
+
+*sc-7.16-r1 (17 Jan 2008)
+
+  17 Jan 2008; Ryan Hill <dirtyepic@gentoo.org> -files/sc-7.12-amd64.patch,
+  files/sc-7.16-amd64.patch, +files/sc-7.16-lex-syntax.patch,
+  +sc-7.16-r1.ebuild:
+  Revision bump.
+  	- redid xmalloc patch
+  	- fix syntax error message (bug #143272)
+  	- fix multiple Makefile problems
+  	- cleanup and QA
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/app-office/sc/Manifest b/app-office/sc/Manifest
index 47855b4dfcff..5e988927f4cc 100644
--- a/app-office/sc/Manifest
+++ b/app-office/sc/Manifest
@@ -1,20 +1,27 @@
-AUX sc-7.12-amd64.patch 309 RMD160 3ae0e23601a50246cf1381d6f628d8f65f728cab SHA1 6c56e39db72b84a7f77a28311d3772d7f4031730 SHA256 bedabd5ea1951309b4815a58deb0e7f4e5b3834935e6d835755420d2ea42aade
-MD5 b80148293ba40aff64b004432edf0e21 files/sc-7.12-amd64.patch 309
-RMD160 3ae0e23601a50246cf1381d6f628d8f65f728cab files/sc-7.12-amd64.patch 309
-SHA256 bedabd5ea1951309b4815a58deb0e7f4e5b3834935e6d835755420d2ea42aade files/sc-7.12-amd64.patch 309
-AUX sc-7.16-amd64.patch 309 RMD160 3ae0e23601a50246cf1381d6f628d8f65f728cab SHA1 6c56e39db72b84a7f77a28311d3772d7f4031730 SHA256 bedabd5ea1951309b4815a58deb0e7f4e5b3834935e6d835755420d2ea42aade
-MD5 b80148293ba40aff64b004432edf0e21 files/sc-7.16-amd64.patch 309
-RMD160 3ae0e23601a50246cf1381d6f628d8f65f728cab files/sc-7.16-amd64.patch 309
-SHA256 bedabd5ea1951309b4815a58deb0e7f4e5b3834935e6d835755420d2ea42aade files/sc-7.16-amd64.patch 309
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sc-7.16-amd64.patch 484 RMD160 d2fb70219f8e8ef1c7bb19b15b3a1edb58680c5c SHA1 97d196e3d1493c61e46f67968504a9452118265c SHA256 0cdc2d63c04e233f0c4b1fba6e2b4acb7008d28f585b2dd44016697026595652
+MD5 0f535685e5e776b1a6ef7cf37785dc48 files/sc-7.16-amd64.patch 484
+RMD160 d2fb70219f8e8ef1c7bb19b15b3a1edb58680c5c files/sc-7.16-amd64.patch 484
+SHA256 0cdc2d63c04e233f0c4b1fba6e2b4acb7008d28f585b2dd44016697026595652 files/sc-7.16-amd64.patch 484
+AUX sc-7.16-lex-syntax.patch 340 RMD160 9d79d5ad664195613f3e806ef96fba7071df9ed7 SHA1 faaaae61b6a43a67b36082c2a1a1367942c8bf7b SHA256 d4d1e066920813b5e5dd69830d9bad0c8ab1a5767799453e5a2cfe5e2ff252d6
+MD5 6ec362f870bc9d20cb6020ce095950b4 files/sc-7.16-lex-syntax.patch 340
+RMD160 9d79d5ad664195613f3e806ef96fba7071df9ed7 files/sc-7.16-lex-syntax.patch 340
+SHA256 d4d1e066920813b5e5dd69830d9bad0c8ab1a5767799453e5a2cfe5e2ff252d6 files/sc-7.16-lex-syntax.patch 340
 DIST sc-7.16.tar.gz 210809 RMD160 bcaffd292bc3d0868e5be870fee743c6b3294377 SHA1 33c77561fbbecc7fa3cf0d62ce244172edd0de3d SHA256 1997a00b6d82d189b65f6fd2a856a34992abc99e50d9ec463bbf1afb750d1765
+EBUILD sc-7.16-r1.ebuild 1421 RMD160 328f80277310ae4a3b636fb3376c195a26e8d8a9 SHA1 70764b0f393e03dd093358b197de47e44f68f53c SHA256 f92a6bad92286c71b32ac9fd1d4063b5b895465fccb6c6522aa225cb84c3b22d
+MD5 df9240c75eadcb5b181852bf7440a16f sc-7.16-r1.ebuild 1421
+RMD160 328f80277310ae4a3b636fb3376c195a26e8d8a9 sc-7.16-r1.ebuild 1421
+SHA256 f92a6bad92286c71b32ac9fd1d4063b5b895465fccb6c6522aa225cb84c3b22d sc-7.16-r1.ebuild 1421
 EBUILD sc-7.16.ebuild 1065 RMD160 89daa66d300aba056a46e29faf6ca3ea18d2ca30 SHA1 1d72aed66671aba8512b990688b812b3dfea113d SHA256 a002ce32d9afe5f38ca442217eb43bf7fe29e9791544c42c3bb88dd1a85cd53f
 MD5 76e1fe14bf021d9240cafc785a91ddd6 sc-7.16.ebuild 1065
 RMD160 89daa66d300aba056a46e29faf6ca3ea18d2ca30 sc-7.16.ebuild 1065
 SHA256 a002ce32d9afe5f38ca442217eb43bf7fe29e9791544c42c3bb88dd1a85cd53f sc-7.16.ebuild 1065
-MISC ChangeLog 1983 RMD160 6a10e4bec17ec529b1ea58cd37cf6d7f2e30f87f SHA1 9a2f87a1510205941f173a4a51c3303098ae6672 SHA256 9574010b1e6d758f6e98ce6245b31cd5eb7ec698f644976185428f4172b37939
-MD5 6cb7bdba4233bc08616d299f875bc348 ChangeLog 1983
-RMD160 6a10e4bec17ec529b1ea58cd37cf6d7f2e30f87f ChangeLog 1983
-SHA256 9574010b1e6d758f6e98ce6245b31cd5eb7ec698f644976185428f4172b37939 ChangeLog 1983
+MISC ChangeLog 2315 RMD160 65c57fb2ab7964f218511183e3d3726c6aa6efef SHA1 8e41162e619f8cf7000a0b11779495d18a97e59a SHA256 adac56c68b1014c1b298e04f12c2240c47003c578c0847908535e6045042c81b
+MD5 516b53e82f04e06b9a004c02636a7dd3 ChangeLog 2315
+RMD160 65c57fb2ab7964f218511183e3d3726c6aa6efef ChangeLog 2315
+SHA256 adac56c68b1014c1b298e04f12c2240c47003c578c0847908535e6045042c81b ChangeLog 2315
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
 MD5 ed8349e980407e49b724e04ee5a9a2ed metadata.xml 231
 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c metadata.xml 231
@@ -22,3 +29,13 @@ SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a metadata
 MD5 ebf09534854e369c9c8bb9ea05e5e808 files/digest-sc-7.16 223
 RMD160 1e4ae15858bc66dd456a3431331071aac8c6e997 files/digest-sc-7.16 223
 SHA256 5e8894b12642149f586fa717fcb15646f33fb28c4142c72cd61c5082d82d8773 files/digest-sc-7.16 223
+MD5 ebf09534854e369c9c8bb9ea05e5e808 files/digest-sc-7.16-r1 223
+RMD160 1e4ae15858bc66dd456a3431331071aac8c6e997 files/digest-sc-7.16-r1 223
+SHA256 5e8894b12642149f586fa717fcb15646f33fb28c4142c72cd61c5082d82d8773 files/digest-sc-7.16-r1 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHj8J7iqiDRvmkBmIRAhvzAJwIyenovuuR4tq751ULs3PDIG7b9QCg2TU7
+Lg1yAlJR2ESFj1XG4+ucH0E=
+=V4Mv
+-----END PGP SIGNATURE-----
diff --git a/app-office/sc/files/digest-sc-7.16-r1 b/app-office/sc/files/digest-sc-7.16-r1
new file mode 100644
index 000000000000..24d27d5c75f0
--- /dev/null
+++ b/app-office/sc/files/digest-sc-7.16-r1
@@ -0,0 +1,3 @@
+MD5 1db636e9b2dc7cd73c40aeece6852d47 sc-7.16.tar.gz 210809
+RMD160 bcaffd292bc3d0868e5be870fee743c6b3294377 sc-7.16.tar.gz 210809
+SHA256 1997a00b6d82d189b65f6fd2a856a34992abc99e50d9ec463bbf1afb750d1765 sc-7.16.tar.gz 210809
diff --git a/app-office/sc/files/sc-7.12-amd64.patch b/app-office/sc/files/sc-7.12-amd64.patch
deleted file mode 100644
index 2133ed42e325..000000000000
--- a/app-office/sc/files/sc-7.12-amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xmalloc.c.orig	2004-07-11 22:34:48.681076912 +0200
-+++ xmalloc.c	2004-07-11 22:34:57.150789320 +0200
-@@ -6,8 +6,8 @@
- #include <curses.h>
- #include "sc.h"
- 
--extern char	*malloc();
--extern char	*realloc();
-+extern void	*malloc(size_t size);
-+extern void	*realloc();
- extern void	free();
- void		fatal();
- 
diff --git a/app-office/sc/files/sc-7.16-amd64.patch b/app-office/sc/files/sc-7.16-amd64.patch
index 2133ed42e325..266eff0986df 100644
--- a/app-office/sc/files/sc-7.16-amd64.patch
+++ b/app-office/sc/files/sc-7.16-amd64.patch
@@ -1,13 +1,24 @@
---- xmalloc.c.orig	2004-07-11 22:34:48.681076912 +0200
-+++ xmalloc.c	2004-07-11 22:34:57.150789320 +0200
-@@ -6,8 +6,8 @@
+diff -Naur sc-7.16-orig/xmalloc.c sc-7.16/xmalloc.c
+--- sc-7.16-orig/xmalloc.c	2002-04-25 17:37:58.000000000 -0600
++++ sc-7.16/xmalloc.c	2008-01-17 14:41:31.000000000 -0600
+@@ -3,19 +3,12 @@
+  * $Revision: 7.16 $
+  */
+ 
++#include <stdlib.h>
  #include <curses.h>
  #include "sc.h"
  
 -extern char	*malloc();
 -extern char	*realloc();
-+extern void	*malloc(size_t size);
-+extern void	*realloc();
- extern void	free();
+-extern void	free();
  void		fatal();
  
+-#ifdef SYSV3
+-extern void	free();
+-extern void	exit();
+-#endif
+-
+ #define	MAGIC	(double)1234567890.12344
+ 
+ char *
diff --git a/app-office/sc/files/sc-7.16-lex-syntax.patch b/app-office/sc/files/sc-7.16-lex-syntax.patch
new file mode 100644
index 000000000000..1c72c13df2a3
--- /dev/null
+++ b/app-office/sc/files/sc-7.16-lex-syntax.patch
@@ -0,0 +1,12 @@
+diff -Naur sc-7.16-orig/lex.c sc-7.16/lex.c
+--- sc-7.16-orig/lex.c	2002-08-20 16:44:26.000000000 -0600
++++ sc-7.16/lex.c	2008-01-17 14:56:27.000000000 -0600
+@@ -107,7 +107,7 @@
+ yylex()
+ {
+     char *p = line + linelim;
+-    int ret;
++    int ret = 0;
+     static int isfunc = 0;
+     static bool isgoto = 0;
+     static bool colstate = 0;
diff --git a/app-office/sc/sc-7.16-r1.ebuild b/app-office/sc/sc-7.16-r1.ebuild
new file mode 100644
index 000000000000..aac0dd7754e4
--- /dev/null
+++ b/app-office/sc/sc-7.16-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild,v 1.1 2008/01/17 21:02:38 dirtyepic Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="sc is a free curses-based spreadsheet program that uses key bindings similar to vi and less."
+SRC_URI="ftp://ibiblio.org/pub/Linux/apps/financial/spreadsheet/${P}.tar.gz"
+HOMEPAGE="http://ibiblio.org/pub/Linux/apps/financial/spreadsheet/"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i	-e "/^prefix=/ s:/usr:${D}/usr:" \
+			-e "/^MANDIR=/ s:${prefix}/man:${prefix}/share/man:" \
+			-e "/^LIBDIR=/ s:${prefix}/lib:${prefix}/$(get_libdir):" \
+			-e "/^CC=/ s:gcc:$(tc-getCC):" \
+			-e "/^CFLAGS/ s:=-DSYSV3 -O2 -pipe:+=-DSYSV3:" \
+			-e "/strip/ s:^:#:g" \
+			Makefile
+
+	epatch "${FILESDIR}"/${P}-amd64.patch
+	epatch "${FILESDIR}"/${P}-lex-syntax.patch
+}
+
+src_compile() {
+	# no autoconf
+	emake prefix="${D}"/usr || die "emake failed"
+}
+
+src_install () {
+	# yes the makefile is so dumb it can't even make it's own dirs
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)/sc
+	dodir /usr/share/man/man1
+	emake install || die
+
+	sed -i "s:${D}::g" sc.1
+	doman sc.1 psc.1
+
+	dodoc CHANGES README sc.doc psc.doc tutorial.sc
+	dodoc VMS_NOTES ${P}.lsm TODO SC.MACROS
+}