Patch to make it compile with gcc-2. Copyright date corrections..

6 files changed, 42 insertions, 16 deletions

diff --git a/app-text/scrollkeeper/ChangeLog b/app-text/scrollkeeper/ChangeLog
index 58891a6b8674..18b21691d323 100644
--- a/app-text/scrollkeeper/ChangeLog
+++ b/app-text/scrollkeeper/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for app-text/scrollkeeper
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.35 2004/02/10 21:23:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.36 2004/02/12 16:17:50 leonardop Exp $
 
+  12 Feb 2004; L. Boshell <leonardop@gentoo.org> scrollkeeper-0.3.14.ebuild,
+  files/scrollkeeper-0.3.14-gcc2_fix.patch :
+  Added patch to make it compile under gcc-2.
+  
   10 Feb 2004; foser <foser@gentoo.org> scrollkeeper-0.3.14.ebuild, metadata.xml :
   Dep on intltool-0.29 and up for XML-Parser dep (#41096)
   Add metadata.xml, add to gnome herd for now
diff --git a/app-text/scrollkeeper/Manifest b/app-text/scrollkeeper/Manifest
index 2f4ec30f5b9c..23d7725d7564 100644
--- a/app-text/scrollkeeper/Manifest
+++ b/app-text/scrollkeeper/Manifest
@@ -1,14 +1,15 @@
-MD5 0f1123276d459163033e0014b1522440 scrollkeeper-0.3.12.ebuild 2521
-MD5 4debd934debbc9fc9fe481258debcd8e scrollkeeper-0.3.14.ebuild 2376
-MD5 0e888739b4e4109228edfd674db1b658 scrollkeeper-0.3.11-r1.ebuild 2524
-MD5 7fb830ff0ae32392883aba6631671bb0 ChangeLog 5598
+MD5 0c2b40b25560ee02e45b6ca9cce3c3dd ChangeLog 5773
+MD5 45d53ac09d2d586a6ca9f24795db024e scrollkeeper-0.3.14.ebuild 2420
+MD5 2fdcdd3b8ceda527d2a6d8156d727a0e scrollkeeper-0.3.11-r1.ebuild 2525
+MD5 1ae1e0b446195342c56eaf034a38dc51 scrollkeeper-0.3.12.ebuild 2522
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 af95590364f9f045f5e2ea882d0c24f4 files/scrollkeeper-0.3.12-gentoo.diff 281
-MD5 6eb6de9d82c84fda0ce04033c692e2a6 files/digest-scrollkeeper-0.3.11-r1 71
-MD5 ea401a5b293493606c1947dcb84d24e4 files/scrollkeeper-0.3.10.diff 264
-MD5 ea401a5b293493606c1947dcb84d24e4 files/scrollkeeper-0.3.9.diff 264
+MD5 ca681d7dde4a4d560fa091cf7b7e0d85 files/digest-scrollkeeper-0.3.14 71
+MD5 d960e6f55f5e37c7429a733b43ae4129 files/digest-scrollkeeper-0.3.12 71
 MD5 af95590364f9f045f5e2ea882d0c24f4 files/scrollkeeper-0.3.14-gentoo.diff 281
+MD5 6eb6de9d82c84fda0ce04033c692e2a6 files/digest-scrollkeeper-0.3.11-r1 71
 MD5 ea401a5b293493606c1947dcb84d24e4 files/scrollkeeper-0.3.10-gentoo.diff 264
-MD5 d960e6f55f5e37c7429a733b43ae4129 files/digest-scrollkeeper-0.3.12 71
-MD5 ca681d7dde4a4d560fa091cf7b7e0d85 files/digest-scrollkeeper-0.3.14 71
+MD5 ea401a5b293493606c1947dcb84d24e4 files/scrollkeeper-0.3.10.diff 264
 MD5 32ed56fa752b41dacfcf315b96e37156 files/scrollkeeper-0.3.11-gentoo.diff 4741
+MD5 ea401a5b293493606c1947dcb84d24e4 files/scrollkeeper-0.3.9.diff 264
+MD5 af95590364f9f045f5e2ea882d0c24f4 files/scrollkeeper-0.3.12-gentoo.diff 281
+MD5 a1bbb6129b61f8b8c59a1fcedd8b2b3e files/scrollkeeper-0.3.14-gcc2_fix.patch 692
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gcc2_fix.patch b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gcc2_fix.patch
new file mode 100644
index 000000000000..94c440cc9ba7
--- /dev/null
+++ b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-gcc2_fix.patch
@@ -0,0 +1,20 @@
+diff -NurB scrollkeeper-0.3.14-orig/libs/install.c scrollkeeper-0.3.14/libs/install.c
+--- scrollkeeper-0.3.14-orig/libs/install.c	2004-02-12 09:34:02.000000000 -0500
++++ scrollkeeper-0.3.14/libs/install.c	2004-02-12 09:35:31.000000000 -0500
+@@ -499,6 +499,7 @@
+ 				    int id, int add_toc, char outputprefs, char **complete_cat_token)
+ {
+     xmlNodePtr node, new_node, s_node;
++    xmlChar *categorycode;
+ 
+     if (sect_node == NULL ||
+         cat_token == NULL)
+@@ -520,8 +521,6 @@
+     	if (xmlStrcmp(node->name, (xmlChar *)"sect"))
+ 	    continue;
+ 	
+-	xmlChar *categorycode;
+-	
+ 	categorycode = xmlGetProp(node, (xmlChar *)"categorycode");
+ 	if (categorycode == NULL)
+ 	    continue;
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild
index 0bc9313e30d7..20d2f6fdb78b 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild,v 1.12 2003/09/05 22:37:22 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.11-r1.ebuild,v 1.13 2004/02/12 16:17:50 leonardop Exp $
 
 IUSE="nls"
 
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild
index f293fb5c4468..3786cc3429d6 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild,v 1.13 2003/11/15 02:57:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.12.ebuild,v 1.14 2004/02/12 16:17:50 leonardop Exp $
 
 IUSE="nls"
 
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
index bee98b83f886..8996bc3bc201 100644
--- a/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild,v 1.5 2004/02/10 21:21:30 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.14.ebuild,v 1.6 2004/02/12 16:17:50 leonardop Exp $
 
 IUSE="nls"
 
@@ -30,6 +30,7 @@ src_unpack() {
 
 	cd ${S}
 	patch -p0< ${FILESDIR}/${P}-gentoo.diff || die
+	epatch ${FILESDIR}/${P}-gcc2_fix.patch
 }
 
 src_compile() {