fix repoman warnings and fix bug #196803

(Portage version: 2.1.3.16)

6 files changed, 140 insertions, 8 deletions

diff --git a/dev-libs/link-grammar/ChangeLog b/dev-libs/link-grammar/ChangeLog
index 3fdab24633f0..b0ffa1fadecd 100644
--- a/dev-libs/link-grammar/ChangeLog
+++ b/dev-libs/link-grammar/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-libs/link-grammar
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/ChangeLog,v 1.17 2007/08/15 10:33:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/ChangeLog,v 1.18 2007/11/04 22:57:47 eva Exp $
+
+  04 Nov 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  link-grammar-4.2.2.ebuild, link-grammar-4.2.4.ebuild:
+  fix repoman warnings
+
+*link-grammar-4.2.4-r1 (04 Nov 2007)
+
+  04 Nov 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/link-grammar-4.2.4-tokenize.patch, +link-grammar-4.2.4-r1.ebuild:
+  fix bug #196803
 
 *link-grammar-4.2.4 (15 Aug 2007)
 
diff --git a/dev-libs/link-grammar/files/digest-link-grammar-4.2.4-r1 b/dev-libs/link-grammar/files/digest-link-grammar-4.2.4-r1
new file mode 100644
index 000000000000..c0256384417a
--- /dev/null
+++ b/dev-libs/link-grammar/files/digest-link-grammar-4.2.4-r1
@@ -0,0 +1,3 @@
+MD5 56ed2a55cc6d2c8ec013b75bd0bcc01b link-grammar-4.2.4.tar.gz 741007
+RMD160 40cdb470201a3c935c53670534613e1fdddf7c3c link-grammar-4.2.4.tar.gz 741007
+SHA256 e28cf49636d83c8faf487718c913d8fc9d01a54c1c63dc9cd995f4e669a4a740 link-grammar-4.2.4.tar.gz 741007
diff --git a/dev-libs/link-grammar/files/link-grammar-4.2.4-tokenize.patch b/dev-libs/link-grammar/files/link-grammar-4.2.4-tokenize.patch
new file mode 100644
index 000000000000..34a9eb0a1c8f
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-4.2.4-tokenize.patch
@@ -0,0 +1,83 @@
+Index: tokenize.c
+===================================================================
+RCS file: /cvsroot/link-grammar/link-grammar/tokenize.c,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -b -B -r1.3 -r1.4
+--- link-grammar/link-grammar/tokenize.c	16 Aug 2006 17:07:02 -0000	1.3
++++ link-grammar/link-grammar/tokenize.c	27 Oct 2007 19:03:40 -0000	1.4
+@@ -172,7 +172,8 @@
+     used in a sentence.
+ */
+ 
+-
++#undef	MIN
++#define MIN(a, b)  (((a) < (b)) ? (a) : (b))
+ 
+ static int separate_word(Sentence sent, char *w, char *wend, int is_first_word, int quote_found) {
+     /* w points to a string, wend points to the char one after the end.  The
+@@ -256,8 +257,8 @@
+ 
+     for (n_r_stripped = 0; n_r_stripped < MAX_STRIP; n_r_stripped++) {
+ 
+-	strncpy(word, w, wend-w);
+-	word[wend-w] = '\0';
++	strncpy(word, w, MIN(wend-w, MAX_WORD));
++	word[MIN(wend-w, MAX_WORD)] = '\0';
+ 	if (wend == w) break;  /* it will work without this */
+ 	
+ 	if (boolean_dictionary_lookup(sent->dict, word) || is_initials_word(word)) break;
+@@ -285,8 +286,8 @@
+     /* Now we strip off suffixes...w points to the remaining word, "wend" to the end of the word. */
+ 
+     s_stripped = -1;
+-    strncpy(word, w, wend-w);
+-    word[wend-w] = '\0';
++    strncpy(word, w, MIN(wend-w, MAX_WORD));
++    word[MIN(wend-w, MAX_WORD)] = '\0';
+     word_is_in_dict=0;
+ 
+     if (boolean_dictionary_lookup(sent->dict, word) || is_initials_word(word)) word_is_in_dict=1;
+@@ -309,16 +310,16 @@
+ 
+ 	if(s_ok==1 || i==s_strippable) {
+ 	  
+-	  strncpy(newword, w, (wend-len)-w);
+-	  newword[(wend-len)-w] = '\0';
++	  strncpy(newword, w, MIN((wend-len)-w, MAX_WORD));
++	  newword[MIN((wend-len)-w, MAX_WORD)] = '\0';
+ 
+ 	  /* Check if the remainder is in the dictionary; for the no-suffix case, it won't be */	  
+ 	  if (boolean_dictionary_lookup(sent->dict, newword)) {
+ 	    if(verbosity>1) if(i< s_strippable) printf("Splitting word into two: %s-%s\n", newword, suffix[i]); 
+ 	    s_stripped = i;
+ 	    wend -= len;
+-	    strncpy(word, w, wend-w);
+-	    word[wend-w] = '\0';
++	    strncpy(word, w, MIN(wend-w, MAX_WORD));
++	    word[MIN(wend-w, MAX_WORD)] = '\0';
+ 	    break;
+ 	  }
+ 
+@@ -326,16 +327,16 @@
+ 	  else {
+ 	    for (j=0; j<p_strippable; j++) {
+ 	      if (strncmp(w, prefix[j], strlen(prefix[j])) == 0) {
+-		strncpy(newword, w+strlen(prefix[j]), (wend-len)-(w+strlen(prefix[j])));
+-		newword[(wend-len)-(w+strlen(prefix[j]))]='\0';
++		strncpy(newword, w+strlen(prefix[j]), MIN((wend-len)-(w+strlen(prefix[j])), MAX_WORD));
++		newword[MIN((wend-len)-(w+strlen(prefix[j])), MAX_WORD)]='\0';
+ 		if(boolean_dictionary_lookup(sent->dict, newword)) {
+ 		  if(verbosity>1) if(i < s_strippable) printf("Splitting word into three: %s-%s-%s\n", prefix[j], newword, suffix[i]); 
+ 		  if (!issue_sentence_word(sent, prefix[j])) return FALSE;
+ 		  if(i < s_strippable) s_stripped = i;
+ 		  wend -= len;
+ 		  w += strlen(prefix[j]);
+-		  strncpy(word, w, wend-w);
+-		word[wend-w] = '\0';
++		  strncpy(word, w, MIN(wend-w, MAX_WORD));
++		  word[MIN(wend-w, MAX_WORD)] = '\0';
+ 		break;
+ 		}
+ 	      }
+
diff --git a/dev-libs/link-grammar/link-grammar-4.2.2.ebuild b/dev-libs/link-grammar/link-grammar-4.2.2.ebuild
index f3c436e16311..64a8b732b9c6 100644
--- a/dev-libs/link-grammar/link-grammar-4.2.2.ebuild
+++ b/dev-libs/link-grammar/link-grammar-4.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/link-grammar-4.2.2.ebuild,v 1.9 2007/07/12 02:25:34 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/link-grammar-4.2.2.ebuild,v 1.10 2007/11/04 22:57:47 eva Exp $
 
 DESCRIPTION=" The Link Grammar Parser is a syntactic parser of English, based on
 link grammar, an original theory of English syntax."
@@ -21,6 +21,6 @@ src_configure() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc LICENSE README
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc README
 }
diff --git a/dev-libs/link-grammar/link-grammar-4.2.4-r1.ebuild b/dev-libs/link-grammar/link-grammar-4.2.4-r1.ebuild
new file mode 100644
index 000000000000..8b2a2d8aadb7
--- /dev/null
+++ b/dev-libs/link-grammar/link-grammar-4.2.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/link-grammar-4.2.4-r1.ebuild,v 1.1 2007/11/04 22:57:47 eva Exp $
+
+inherit eutils
+
+DESCRIPTION="The Link Grammar Parser is a syntactic parser of English, based on
+link grammar, an original theory of English syntax."
+HOMEPAGE="http://bobo.link.cs.cmu.edu/link/"
+SRC_URI="http://www.abisource.com/downloads/link-grammar/${PV}/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+#broken make files :-/
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix bug #196803
+	epatch "${FILESDIR}"/${P}-tokenize.c
+}
+
+src_compile() {
+	econf || die "configure failed"
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc README
+}
diff --git a/dev-libs/link-grammar/link-grammar-4.2.4.ebuild b/dev-libs/link-grammar/link-grammar-4.2.4.ebuild
index 43e248c13733..e66b4425c486 100644
--- a/dev-libs/link-grammar/link-grammar-4.2.4.ebuild
+++ b/dev-libs/link-grammar/link-grammar-4.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/link-grammar-4.2.4.ebuild,v 1.1 2007/08/15 10:33:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/link-grammar-4.2.4.ebuild,v 1.2 2007/11/04 22:57:47 eva Exp $
 
 DESCRIPTION=" The Link Grammar Parser is a syntactic parser of English, based on
 link grammar, an original theory of English syntax."
@@ -21,6 +21,6 @@ src_configure() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc LICENSE README
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc README
 }