Version bump as per bug 164022. Largely re-written ebuild which fixes bugs 130024 as well. Dropped ppc-macos KEYWORD because they don't have tcl/tk available and filed bug 187771 about it.

(Portage version: 2.1.3.3)

6 files changed, 171 insertions, 1 deletions

diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog
index f9a04ad22211..f0d58c9c5b07 100644
--- a/app-dicts/wordnet/ChangeLog
+++ b/app-dicts/wordnet/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-dicts/wordnet
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.11 2007/08/04 20:36:12 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.12 2007/08/05 01:24:22 philantrop Exp $
+
+*wordnet-3.0 (05 Aug 2007)
+
+  05 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/wordnet-3.0-dict-location.patch,
+  +files/wordnet-3.0-docs-path.patch, +files/wordnet-3.0-shared-lib.patch,
+  +wordnet-3.0.ebuild:
+  Version bump as per bug 164022. Largely re-written ebuild which fixes bugs
+  130024 as well. Dropped ppc-macos KEYWORD because they don't have tcl/tk
+  available and filed bug 187771 about it.
 
   04 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> wordnet-2.0.ebuild,
   wordnet-2.1.ebuild:
diff --git a/app-dicts/wordnet/files/digest-wordnet-3.0 b/app-dicts/wordnet/files/digest-wordnet-3.0
new file mode 100644
index 000000000000..0cf35997b562
--- /dev/null
+++ b/app-dicts/wordnet/files/digest-wordnet-3.0
@@ -0,0 +1,3 @@
+MD5 da5e3a0aa7b2eb1c77e6901ea6171370 WordNet-3.0.tar.gz 11537227
+RMD160 7dc7a7417753004170e6fd4a503b232c028f35ee WordNet-3.0.tar.gz 11537227
+SHA256 b4d8b1feeb22defe686cf1c5062d723bd854997614da9547fa135e5137843531 WordNet-3.0.tar.gz 11537227
diff --git a/app-dicts/wordnet/files/wordnet-3.0-dict-location.patch b/app-dicts/wordnet/files/wordnet-3.0-dict-location.patch
new file mode 100644
index 000000000000..bafb9bb47a78
--- /dev/null
+++ b/app-dicts/wordnet/files/wordnet-3.0-dict-location.patch
@@ -0,0 +1,31 @@
+diff -Naur WordNet-3.0.orig/include/wn.h WordNet-3.0/include/wn.h
+--- WordNet-3.0.orig/include/wn.h	2007-01-03 22:51:35.000000000 +0100
++++ WordNet-3.0/include/wn.h	2007-08-04 22:58:44.000000000 +0200
+@@ -29,7 +29,7 @@
+ #else
+ #define DICTDIR         "/dict"
+ #ifndef DEFAULTPATH
+-#define DEFAULTPATH	"/usr/local/WordNet-3.0/dict"
++#define DEFAULTPATH	"/usr/share/wordnet/dict"
+ #endif
+ #define DATAFILE	"%s/data.%s"
+ #define INDEXFILE	"%s/index.%s"
+diff -Naur WordNet-3.0.orig/configure.ac WordNet-3.0/configure.ac
+--- WordNet-3.0.orig/configure.ac	2007-01-20 20:59:24.000000000 +0100
++++ WordNet-3.0/configure.ac	2007-08-04 23:21:09.000000000 +0200
+@@ -40,7 +40,7 @@
+ fi
+ AC_SUBST(ac_prefix)
+ AH_TEMPLATE([DEFAULTPATH],[The default search path for WordNet data files])
+-AC_DEFINE_UNQUOTED(DEFAULTPATH, ["$ac_prefix/dict"], [Default installation prefix.])
++AC_DEFINE_UNQUOTED(DEFAULTPATH, ["$ac_prefix/share/wordnet/dict"], [Default installation prefix.])
+ 
+ #AC_DEFINE_UNQUOTED(DEFAULTPATH,"${prefix}/dict")
+ 
+diff -Naur WordNet-3.0.orig/dict/Makefile.am WordNet-3.0/dict/Makefile.am
+--- WordNet-3.0.orig/dict/Makefile.am	2006-12-18 22:30:07.000000000 +0100
++++ WordNet-3.0/dict/Makefile.am	2007-08-04 23:32:46.000000000 +0200
+@@ -1,2 +1,2 @@
+-dictdir = $(prefix)/dict
++dictdir = $(prefix)/share/wordnet/dict
+ dict_DATA = adj.exc adv.exc cntlist cntlist.rev data.adj data.adv data.noun data.verb frames.vrb index.adj index.adv index.noun index.sense index.verb log.grind.3.0 noun.exc sentidx.vrb sents.vrb verb.Framestext verb.exc lexnames
diff --git a/app-dicts/wordnet/files/wordnet-3.0-docs-path.patch b/app-dicts/wordnet/files/wordnet-3.0-docs-path.patch
new file mode 100644
index 000000000000..55ce18c6b96d
--- /dev/null
+++ b/app-dicts/wordnet/files/wordnet-3.0-docs-path.patch
@@ -0,0 +1,41 @@
+diff -Naur WordNet-3.0.orig/doc/html/Makefile.am WordNet-3.0/doc/html/Makefile.am
+--- WordNet-3.0.orig/doc/html/Makefile.am	2006-12-14 23:59:43.000000000 +0100
++++ WordNet-3.0/doc/html/Makefile.am	2007-08-05 00:30:28.000000000 +0200
+@@ -1,2 +1,2 @@
+-htmldir = $(prefix)/doc/html
++htmldir = $(prefix)/share/doc/${P}/html
+ html_DATA = binsrch.3WN.html cntlist.5WN.html grind.1WN.html lexnames.5WN.html morph.3WN.html morphy.7WN.html senseidx.5WN.html uniqbeg.7WN.html wn.1WN.html wnb.1WN.html wndb.5WN.html wngloss.7WN.html wngroups.7WN.html wninput.5WN.html wnintro.1WN.html wnintro.3WN.html wnintro.5WN.html wnintro.7WN.html wnlicens.7WN.html wnpkgs.7WN.html wnsearch.3WN.html wnstats.7WN.html wnutil.3WN.html
+diff -Naur WordNet-3.0.orig/doc/pdf/Makefile.am WordNet-3.0/doc/pdf/Makefile.am
+--- WordNet-3.0.orig/doc/pdf/Makefile.am	2006-11-14 22:27:27.000000000 +0100
++++ WordNet-3.0/doc/pdf/Makefile.am	2007-08-05 00:33:16.000000000 +0200
+@@ -1,2 +1,2 @@
+-pdfdir=$(prefix)/doc/pdf
++pdfdir=$(prefix)/share/doc/${P}/pdf
+ pdf_DATA =binsrch.3.pdf cntlist.5.pdf grind.1.pdf lexnames.5.pdf morph.3.pdf morphy.7.pdf senseidx.5.pdf uniqbeg.7.pdf wn.1.pdf wnb.1.pdf wndb.5.pdf wngloss.7.pdf wngroups.7.pdf wninput.5.pdf wnintro.1.pdf wnintro.3.pdf wnintro.5.pdf wnintro.7.pdf wnlicens.7.pdf wnpkgs.7.pdf wnsearch.3.pdf wnstats.7.pdf wnutil.3.pdf
+diff -Naur WordNet-3.0.orig/doc/ps/Makefile.am WordNet-3.0/doc/ps/Makefile.am
+--- WordNet-3.0.orig/doc/ps/Makefile.am	2006-11-14 22:27:31.000000000 +0100
++++ WordNet-3.0/doc/ps/Makefile.am	2007-08-05 00:33:38.000000000 +0200
+@@ -1,2 +1,2 @@
+-psdir = $(prefix)/doc/ps
++psdir = $(prefix)/share/doc/${P}/ps
+ ps_DATA = binsrch.3.ps cntlist.5.ps grind.1.ps lexnames.5.ps morph.3.ps morphy.7.ps senseidx.5.ps uniqbeg.7.ps wn.1.ps wnb.1.ps wndb.5.ps wngloss.7.ps wngroups.7.ps wninput.5.ps wnintro.1.ps wnintro.3.ps wnintro.5.ps wnintro.7.ps wnlicens.7.ps wnpkgs.7.ps wnsearch.3.ps wnstats.7.ps wnutil.3.ps
+diff -Naur WordNet-3.0.orig/lib/wnres/Makefile.am WordNet-3.0/lib/wnres/Makefile.am
+--- WordNet-3.0.orig/lib/wnres/Makefile.am	2006-11-14 22:25:17.000000000 +0100
++++ WordNet-3.0/lib/wnres/Makefile.am	2007-08-05 02:01:24.000000000 +0200
+@@ -1,3 +1,3 @@
+ EXTRA_DIST = license.txt wn.xbm wnb.man wngloss.man
+-wnresdir = $(prefix)/lib/wnres
++wnresdir = $(prefix)/share/${PN}/wnres
+ wnres_DATA = license.txt wn.xbm wnb.man wngloss.man
+diff -Naur WordNet-3.0.orig/src/wnb WordNet-3.0/src/wnb
+--- WordNet-3.0.orig/src/wnb	2006-12-18 23:38:20.000000000 +0100
++++ WordNet-3.0/src/wnb	2007-08-05 02:21:47.000000000 +0200
+@@ -103,7 +103,7 @@
+ 
+ if {$tcl_platform(platform) == "unix"} {
+    if {[lsearch -exact [array names env] WNHOME] == -1} {
+-	set resourcedir "/usr/local/WordNet-3.0/lib/wnres"
++	set resourcedir "/usr/share/wordnet/wnres"
+    } else {
+ 	set resourcedir "$env(WNHOME)/lib/wnres"
+    }
diff --git a/app-dicts/wordnet/files/wordnet-3.0-shared-lib.patch b/app-dicts/wordnet/files/wordnet-3.0-shared-lib.patch
new file mode 100644
index 000000000000..2198146800fb
--- /dev/null
+++ b/app-dicts/wordnet/files/wordnet-3.0-shared-lib.patch
@@ -0,0 +1,25 @@
+diff -Naur WordNet-3.0.orig/configure.ac WordNet-3.0/configure.ac
+--- WordNet-3.0.orig/configure.ac	2007-08-04 23:57:09.000000000 +0200
++++ WordNet-3.0/configure.ac	2007-08-04 23:58:16.000000000 +0200
+@@ -10,6 +10,7 @@
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
++AC_PROG_LIBTOOL
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+diff -Naur WordNet-3.0.orig/lib/Makefile.am WordNet-3.0/lib/Makefile.am
+--- WordNet-3.0.orig/lib/Makefile.am	2007-01-20 21:53:39.000000000 +0100
++++ WordNet-3.0/lib/Makefile.am	2007-08-04 23:59:16.000000000 +0200
+@@ -1,5 +1,10 @@
+ lib_LIBRARIES = libWN.a
+ libWN_a_SOURCES = binsrch.c morph.c search.c wnglobal.c wnhelp.c wnrtl.c wnutil.c
+ libWN_a_CPPFLAGS = $(INCLUDES)
++
++lib_LTLIBRARIES = libWN.la
++libWN_la_SOURCES = binsrch.c morph.c search.c wnglobal.c wnhelp.c wnrtl.c wnutil.c
++libWN_la_CPPFLAGS = -fPIC $(INCLUDES)
++
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/include
+ SUBDIRS = wnres
diff --git a/app-dicts/wordnet/wordnet-3.0.ebuild b/app-dicts/wordnet/wordnet-3.0.ebuild
new file mode 100644
index 000000000000..2e86cd8ab9dd
--- /dev/null
+++ b/app-dicts/wordnet/wordnet-3.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/wordnet-3.0.ebuild,v 1.1 2007/08/05 01:24:22 philantrop Exp $
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="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"
+LICENSE="Princeton"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+# In contrast to what the configure script seems to imply, Tcl/Tk is NOT optional.
+# cf. bug 163478 for details. (Yes, it's about 2.1 but it's still the same here.)
+DEPEND="dev-lang/tcl
+		dev-lang/tk"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/WordNet-${PV}
+
+src_unpack() {
+	unpack ${A}
+	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
+	epatch "${FILESDIR}/${P}-dict-location.patch"
+	# Fixes bug 130024, make an additional shared lib
+	epatch "${FILESDIR}/${P}-shared-lib.patch"
+	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
+	epatch "${FILESDIR}/${P}-docs-path.patch"
+
+	cd "${S}"
+
+	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
+	use doc || sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am
+
+	rm -f configure
+	eautoreconf
+}
+
+src_compile() {
+	append-flags -DUNIX -I${T}/usr/include
+
+	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}" \
+	WNHOME="/usr/share/wordnet" \
+	econf || die "econf failed"
+	emake || die "emake Failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+
+	# We don't install COPYING because it's identical to LICENSE
+	dodoc AUTHORS ChangeLog INSTALL LICENSE README || die "dodoc failed"
+}