diff options
-rw-r--r-- | app-dicts/wordnet/ChangeLog | 12 | ||||
-rw-r--r-- | app-dicts/wordnet/Manifest | 34 | ||||
-rw-r--r-- | app-dicts/wordnet/files/digest-wordnet-3.0 | 3 | ||||
-rw-r--r-- | app-dicts/wordnet/files/wordnet-3.0-dict-location.patch | 31 | ||||
-rw-r--r-- | app-dicts/wordnet/files/wordnet-3.0-docs-path.patch | 41 | ||||
-rw-r--r-- | app-dicts/wordnet/files/wordnet-3.0-shared-lib.patch | 25 | ||||
-rw-r--r-- | app-dicts/wordnet/wordnet-3.0.ebuild | 60 |
7 files changed, 198 insertions, 8 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/Manifest b/app-dicts/wordnet/Manifest index 5a31559f0fb4..182cb516cc5a 100644 --- a/app-dicts/wordnet/Manifest +++ b/app-dicts/wordnet/Manifest @@ -17,8 +17,21 @@ AUX wordnet-2.0-macos.patch 287 RMD160 ba7da541e7ac1593357137d366994c4d59b74247 MD5 6c0a2d852702e5e23085ce1cbe80c665 files/wordnet-2.0-macos.patch 287 RMD160 ba7da541e7ac1593357137d366994c4d59b74247 files/wordnet-2.0-macos.patch 287 SHA256 ea40115b75aa6cff62bacf4265709020d96ea04ea8d4b6575d9abd4e633ba7a7 files/wordnet-2.0-macos.patch 287 +AUX wordnet-3.0-dict-location.patch 1542 RMD160 77ffb69ae4c11aa14c15cdedaa7c7a545ef0e2c8 SHA1 e73ba30129d54621ca1c45a6df975b57e693b7f7 SHA256 8eaae12a77610e10003d26ac6e10b394bbaab2aefc56ceb843e4f65d65b125c2 +MD5 9031f2842f79e50ee553469f82b918ce files/wordnet-3.0-dict-location.patch 1542 +RMD160 77ffb69ae4c11aa14c15cdedaa7c7a545ef0e2c8 files/wordnet-3.0-dict-location.patch 1542 +SHA256 8eaae12a77610e10003d26ac6e10b394bbaab2aefc56ceb843e4f65d65b125c2 files/wordnet-3.0-dict-location.patch 1542 +AUX wordnet-3.0-docs-path.patch 2832 RMD160 491b73b758f44e75e5677bbeb4941d22fea9e939 SHA1 c919b4be1b003b1acbe5bb40f88713d792bb4e8c SHA256 26130edeadc7c6993faa8a1471c5cac87c533d3e1c927eb5d59716f5b47a808d +MD5 06eb855d06c6160cb61f9f27b904ef9c files/wordnet-3.0-docs-path.patch 2832 +RMD160 491b73b758f44e75e5677bbeb4941d22fea9e939 files/wordnet-3.0-docs-path.patch 2832 +SHA256 26130edeadc7c6993faa8a1471c5cac87c533d3e1c927eb5d59716f5b47a808d files/wordnet-3.0-docs-path.patch 2832 +AUX wordnet-3.0-shared-lib.patch 921 RMD160 983a16ff89636b5127a88538ebc1d12f5557bd1f SHA1 c52955cfb94a72648885aabe30616cd7762135b1 SHA256 bcca076ec3581a88f7a221dd419e0e69e88d896018776cde5d56019a020d9cc1 +MD5 6e4e647cf09655281a1baee140cf13f2 files/wordnet-3.0-shared-lib.patch 921 +RMD160 983a16ff89636b5127a88538ebc1d12f5557bd1f files/wordnet-3.0-shared-lib.patch 921 +SHA256 bcca076ec3581a88f7a221dd419e0e69e88d896018776cde5d56019a020d9cc1 files/wordnet-3.0-shared-lib.patch 921 DIST WordNet-2.0.tar.gz 12847598 RMD160 4176dd842a216c6942362ea1fef08e2e223b356f SHA1 be33dbcda5a6cb6851b331365efa012525a9d05f SHA256 081ad1b47b9489b25532fe2e546244480a03932792c218596b848d6f8d2c42bb DIST WordNet-2.1.tar.gz 11441476 RMD160 9d50ce11a91bf93973ce121d6e3bfc46a61346db SHA1 8a88c32c919f24813ed9a207b871a4a604e6f0af SHA256 8ed7ec24377d114c6db326a6f114d6e22afb85cc37f7f1386831b6d8f114784d +DIST WordNet-3.0.tar.gz 11537227 RMD160 7dc7a7417753004170e6fd4a503b232c028f35ee SHA1 16986e6bf695fc752c201c080333dadd919fe3ed SHA256 b4d8b1feeb22defe686cf1c5062d723bd854997614da9547fa135e5137843531 EBUILD wordnet-2.0.ebuild 974 RMD160 dddf938a62f88bbed6c9631d4fbb97b71a649aaf SHA1 7694ddee5739e79c70fa1d7fdfb58b75e22c55b4 SHA256 161e394a3f2298160f401397f3dbf5d32377438ebee090b5b66b95e15b2ac3ec MD5 57ae138b49bd6669dba36d98602bbb4e wordnet-2.0.ebuild 974 RMD160 dddf938a62f88bbed6c9631d4fbb97b71a649aaf wordnet-2.0.ebuild 974 @@ -27,10 +40,14 @@ EBUILD wordnet-2.1.ebuild 1200 RMD160 f2f7998c8ea53ee338cd0cbaad5f7270db35b76c S MD5 1bc2fd438da99524809d229e1bb72539 wordnet-2.1.ebuild 1200 RMD160 f2f7998c8ea53ee338cd0cbaad5f7270db35b76c wordnet-2.1.ebuild 1200 SHA256 dbe297dad66f537b31d9311fa66d23c1c6bc09a38674b3d1c3079cf8e70d70ce wordnet-2.1.ebuild 1200 -MISC ChangeLog 1797 RMD160 787f029343abdd91c6b55b397326edb3a98a458f SHA1 e84be453f2d346a392557b8bc940f88a28c5e9fe SHA256 aca378c3241d4d1c8658ba43c4573754e52a96d40d2960e0cec6436feeface7c -MD5 4a0a50814d828373ae04bc396af2ad51 ChangeLog 1797 -RMD160 787f029343abdd91c6b55b397326edb3a98a458f ChangeLog 1797 -SHA256 aca378c3241d4d1c8658ba43c4573754e52a96d40d2960e0cec6436feeface7c ChangeLog 1797 +EBUILD wordnet-3.0.ebuild 1822 RMD160 e82343440fbb7c94db0a0de81507b727463c0e32 SHA1 ebd1e38d09351e19704578e3e629061b64924c6a SHA256 c7f1e340ca4b629e5dbd1d569b4d57397207e05bf4cf6e2ddf1fa3edbc9b3490 +MD5 7f0139cf9abc9b022efeb9ac7fb4f4a7 wordnet-3.0.ebuild 1822 +RMD160 e82343440fbb7c94db0a0de81507b727463c0e32 wordnet-3.0.ebuild 1822 +SHA256 c7f1e340ca4b629e5dbd1d569b4d57397207e05bf4cf6e2ddf1fa3edbc9b3490 wordnet-3.0.ebuild 1822 +MISC ChangeLog 2216 RMD160 cf6bb2ff492feb93ec35370eff4b0482d89c502c SHA1 f9509372843b4a50cddf88349401098fa2f07244 SHA256 b96cfc6e877c90139176eaa038bc7b278a8296b0e36e1048d61e1093a855246b +MD5 c69f51354999589b2231a6ff63d648d7 ChangeLog 2216 +RMD160 cf6bb2ff492feb93ec35370eff4b0482d89c502c ChangeLog 2216 +SHA256 b96cfc6e877c90139176eaa038bc7b278a8296b0e36e1048d61e1093a855246b ChangeLog 2216 MISC metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 SHA1 0d9e341c4b61e23adc1f3806989a0236b83257a0 SHA256 9629e7723cb4708c1910c25510cd14da2729d34eed4ebfc1563df4a1ed5e1b22 MD5 eb03775ece62e57725480e782cd84ee8 metadata.xml 162 RMD160 853d3c463af1132de9d434e4bdca16fd81a21eb0 metadata.xml 162 @@ -41,10 +58,13 @@ SHA256 36e2e7039a139af7f7efd30cddf104aaba36b78ec4fce78700717fde725feb3c files/di MD5 80fa5f94d2161e88b5c5c64f758b8707 files/digest-wordnet-2.1 241 RMD160 34c57ecd2a68e33a9bb1fe5cac21fc723df7c918 files/digest-wordnet-2.1 241 SHA256 47f5fde94693b31a4007cb5b213504f81f06ff39305a6a425de81acf8a5f189a files/digest-wordnet-2.1 241 +MD5 52890d1e3f4197f7d62fdbdd719f04b6 files/digest-wordnet-3.0 241 +RMD160 77e35c0f9dd634647aa862ad629886038858f460 files/digest-wordnet-3.0 241 +SHA256 aab0b53a406e1ff606e2ab90eb4b36289c0273fb9ce3cf2956d474deffd95781 files/digest-wordnet-3.0 241 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.5 (GNU/Linux) -iD8DBQFGtONKCkvF58q80IkRAs2UAJ9CJ1Wn6ISuPyVpEl9H0pPvJzL7bQCfUP3J -Z+H3pPIWqhvPM7p2TdXYxtM= -=fee8 +iD8DBQFGtSbUCkvF58q80IkRAlhQAJ4oREdEPWkFWFdN0vHyfWTM16QUcwCgkTzx +gkV6T+AC+vyVW8THgaLf8Ak= +=J48Q -----END PGP SIGNATURE----- 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" +} |