new version

Package-Manager: portage-2.1_pre3-r1

6 files changed, 74 insertions, 5 deletions

diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index f5f9c292bccb..55cb278c6eab 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for app-dicts/wordnet
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.6 2005/11/12 17:50:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.7 2006/02/05 22:42:25 arj Exp $
 
+*wordnet-2.1 (05 Feb 2006)
+
+  05 Feb 2006; Anders Rune Jensen <arj@gentoo.org> +wordnet-2.0.1.ebuild:
+  New version. Fixes #115306.
+	
   12 Nov 2005; Fabian Groffen <grobian@gentoo.org>
   +files/wordnet-2.0-macos.patch, wordnet-2.0.ebuild:
   Added patch supplied by dirk {dot] schoenberger |at: freenet.de to compile on
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index fadb4ba8404a..9566b8474bc9 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -1,6 +1,10 @@
-MD5 6773910be9415e12e50741b874e53746 wordnet-2.0.ebuild 973
-MD5 1d99fe4cfcc0daba6940b565c025f3d2 ChangeLog 1038
-MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
-MD5 6c0a2d852702e5e23085ce1cbe80c665 files/wordnet-2.0-macos.patch 287
+MD5 89780409817660a689a90c322bb0dbfc ChangeLog 1168
 MD5 295bc3b2d65fc6db177d69c4e54491a5 files/Makefiles.diff 2633
+MD5 9eca4827acad775a308ba0049b25cacb files/Wordnet-2.1-compile-fix.patch 374
+MD5 ff0e7f83534f662d00f4eb321dd2faaf files/Wordnet-2.1-dict-location.patch 452
 MD5 660184f847c527e0e6a1024bb0c44318 files/digest-wordnet-2.0 65
+MD5 d2082a718c2497ad684d3eef9d91cf6a files/digest-wordnet-2.1 65
+MD5 6c0a2d852702e5e23085ce1cbe80c665 files/wordnet-2.0-macos.patch 287
+MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162
+MD5 6773910be9415e12e50741b874e53746 wordnet-2.0.ebuild 973
+MD5 ba1120dd9182347657fdfe284595d396 wordnet-2.1.ebuild 1070
diff --git a/app-dicts/wordnet/files/Wordnet-2.1-compile-fix.patch b/app-dicts/wordnet/files/Wordnet-2.1-compile-fix.patch
new file mode 100644
index 000000000000..2236b3db748d
--- /dev/null
+++ b/app-dicts/wordnet/files/Wordnet-2.1-compile-fix.patch
@@ -0,0 +1,11 @@
+--- src/stubs.c~	2005-07-06 20:49:05.000000000 +0200
++++ src/stubs.c	2006-02-05 23:32:41.000000000 +0100
+@@ -14,7 +14,7 @@
+ #include <tk.h>
+ #include <wn.h>
+ 
+-static Id = "$Id: Wordnet-2.1-compile-fix.patch,v 1.1 2006/02/05 22:42:25 arj Exp $";
++//static Id = "$Id: Wordnet-2.1-compile-fix.patch,v 1.1 2006/02/05 22:42:25 arj Exp $";
+ 
+ static char resultbuf[SEARCHBUF];
+ 
diff --git a/app-dicts/wordnet/files/Wordnet-2.1-dict-location.patch b/app-dicts/wordnet/files/Wordnet-2.1-dict-location.patch
new file mode 100644
index 000000000000..a2f834a4da85
--- /dev/null
+++ b/app-dicts/wordnet/files/Wordnet-2.1-dict-location.patch
@@ -0,0 +1,11 @@
+--- WordNet-2.1/include/wn.h	2005-07-06 14:48:44.000000000 -0400
++++ /var/tmp/portage/wordnet-2.1/work/WordNet-2.1/include/wn.h	2006-01-09 19:31:15.000000000 -0500
+@@ -30,7 +30,7 @@
+ #define CNTLISTFILE     "%s\\cntlist.rev"
+ #else
+ #define DICTDIR         "/dict"
+-#define DEFAULTPATH	"/usr/local/WordNet-2.1/dict"
++#define DEFAULTPATH	"/usr/dict"
+ #define DATAFILE	"%s/data.%s"
+ #define INDEXFILE	"%s/index.%s"
+ #define SENSEIDXFILE	"%s/index.sense"
diff --git a/app-dicts/wordnet/files/digest-wordnet-2.1 b/app-dicts/wordnet/files/digest-wordnet-2.1
new file mode 100644
index 000000000000..1b59b4f65a79
--- /dev/null
+++ b/app-dicts/wordnet/files/digest-wordnet-2.1
@@ -0,0 +1 @@
+MD5 081aa25baaccac602cebb61f6cb949e7 WordNet-2.1.tar.gz 11441476
diff --git a/app-dicts/wordnet/wordnet-2.1.ebuild b/app-dicts/wordnet/wordnet-2.1.ebuild
new file mode 100644
index 000000000000..3e85e7400cc8
--- /dev/null
+++ b/app-dicts/wordnet/wordnet-2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-2.1.ebuild,v 1.1 2006/02/05 22:42:25 arj Exp $
+
+inherit eutils
+
+DESCRIPTION="WordNet : a lexical database for the English language"
+HOMEPAGE="http://wordnet.princeton.edu/"
+SRC_URI="ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz"
+DEPEND="tcltk? ( dev-lang/tk )"
+LICENSE="Princeton"
+IUSE="tcltk"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~x86"
+S=${WORKDIR}/WordNet-${PV}
+
+src_unpack() {
+	unpack $A
+	epatch $FILESDIR/Wordnet-2.1-dict-location.patch
+	cd "$S"
+	epatch $FILESDIR/Wordnet-2.1-compile-fix.patch
+}
+
+src_compile() {
+	MAKEOPTS="-e"
+	PLATFORM=linux WN_ROOT=${T}/usr \
+	WN_DICTDIR=${T}/usr/share/wordnet/dict \
+	WN_MANDIR=${T}/usr/share/man \
+	WN_DOCDIR=${T}/usr/share/doc/wordnet-${PV} \
+	CFLAGS="${CFLAGS} -DUNIX -I${T}/usr/include" \
+	econf || die "Configuration Failed"
+	emake || die "Make Failed"
+}
+
+src_install() {
+	emake install DESTDIR=${D} || die "Install Failed"
+}