diff options
| -rw-r--r-- | app-dicts/wordnet/ChangeLog | 7 | ||||
| -rw-r--r-- | app-dicts/wordnet/Manifest | 33 | ||||
| -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 |
5 files changed, 21 insertions, 116 deletions
diff --git a/app-dicts/wordnet/ChangeLog b/app-dicts/wordnet/ChangeLog index 817d3daf7c37..62abbcc0aa75 100644 --- a/app-dicts/wordnet/ChangeLog +++ b/app-dicts/wordnet/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-dicts/wordnet # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.33 2015/03/29 09:28:57 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-dicts/wordnet/ChangeLog,v 1.34 2015/03/29 09:31:05 jlec Exp $ + + 29 Mar 2015; Justin Lecher <jlec@gentoo.org> + -files/wordnet-3.0-dict-location.patch, -files/wordnet-3.0-docs-path.patch, + -files/wordnet-3.0-shared-lib.patch: + Drop obsolete patches 29 Mar 2015; Justin Lecher <jlec@gentoo.org> -wordnet-3.0-r3.ebuild: Drop old diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest index 59983be6fb47..1b7d716b2612 100644 --- a/app-dicts/wordnet/Manifest +++ b/app-dicts/wordnet/Manifest @@ -1,33 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -AUX wordnet-3.0-dict-location.patch 1542 SHA256 8eaae12a77610e10003d26ac6e10b394bbaab2aefc56ceb843e4f65d65b125c2 SHA512 4ebcf63d0492744aa7b0e061362a5fa386e7c3b36a9451b1235e813c56259f7ef52b1e7028ebd95ba4414c67cc8c26aae11e62109e2ffa682c09c37b28596f1c WHIRLPOOL 78607a0861b9281a14c4d65eb176da47a1a2e43bb8f39ce2a8b6038fbe37ff16604b9aa0f01ae3fe3626b8f50d011c1290c8f345ed66a2e54264ccceca576ecf -AUX wordnet-3.0-docs-path.patch 2832 SHA256 26130edeadc7c6993faa8a1471c5cac87c533d3e1c927eb5d59716f5b47a808d SHA512 10dec6da3f6853bdf0b6cbbcf47540ae2d682007d145eaab81fd5e532f8ff96067957b5225f82302114adb806f0a2d8a7bf0a8ae95a091473059c96028d7d1a1 WHIRLPOOL 6e6c3d8268a7dc3e08b3d9ee20681f9ab947cd3341868c150a2a2cc53e1d7b94b20667c0fdb1f181e8e6a6a6928b63ae749f22d788fe17ab9e44dd59fc855c5d AUX wordnet-3.0-format-security.patch 1443 SHA256 d5b8f4f338487e0a15a99ba6c193b3cbfa12d428c825b3c47cb30a23df5b5ad8 SHA512 5567b1d5e041ed39a38e40e253dc94e22a3a7c6b690bc452716b26c2932b94eeb065e00354e2c8f1dc77d53713fd2e69e44a498a8664e867de2df07f2f36c170 WHIRLPOOL 638e8b6b82673d01c7a01a6ab922d998f8d0f23bc7bf4a920c41a75fbf85efb1508b52ae15863128341c6766b99d052c114a7c68f723641c94b3fee4a6e2a2fd -AUX wordnet-3.0-shared-lib.patch 921 SHA256 bcca076ec3581a88f7a221dd419e0e69e88d896018776cde5d56019a020d9cc1 SHA512 a06ca1a855a5cfd74f2dad2c90c09eb463bbc20992f17626aefacc0e7d6b435a93c56002735267c57911cae6af50bdfbacc3966c96ee129099d65dcb53782359 WHIRLPOOL 8a5c66e6c2ddb5f3c4ccef76748cb5c6753a269dce2feabef9097dd4305f248b08746cd64d344e962dfcb19d6a8ee6414d85d837542df32799852d012e2b01e1 AUX wordnet-3.0-src_stubs_c.patch 438 SHA256 3d6e248b1211aaf48af19aa128b7f7754c379b0b421df9b1d11ac61cb0295426 SHA512 82bf6705b26bd0455a2a556abd9cd01cde7c7f738f3f4f5cbf49eefe5c301c7022e908208cce2617e0b95f78464beeab21c7af4131c3472fe4e2ba4650533359 WHIRLPOOL afc5a400e494cc1f8f38aa9cb79342c3324b9419a4302b4c1608be9685e40868bd2f46a7de2a3b09ed396093ad93684757e284b65b627c01208da383748d11a7 AUX wordnet-3.0-tcl8.6.patch 4974 SHA256 97d551b2a7766de8c9f113f94e768a52d450e07c974dbac20bf7ea8df04b35d3 SHA512 2dafc6a6cd332d387fa15b63a7c5cad222e611906582232f7bd6f2522773336e7b632775e73fcd1a8587bd95eabaf70ec1c9ea4b8a81a7c147360a836be0a90c WHIRLPOOL 5416b325ec5abac95d5b0802b8994e6e5d2db8b2b28241155402fca21e88f373785d94cd57506485fa6c890d0a0ee99d9cf2ca9f887720be0a7ae1e80e2d6a8b DIST WordNet-3.0.tar.gz 11537227 SHA256 b4d8b1feeb22defe686cf1c5062d723bd854997614da9547fa135e5137843531 SHA512 d39c008cec41de8f1b2aeacb4ad818f9997a13b30a992fda100b6dcc9c11c253530b00a1909b55ff7b564bafc33f7763c1ce9b0a6ae3e591695db2083e9ead7a WHIRLPOOL cfba84209b4366b1ab381957f82cc2a32039d073baf8fbd44252c829c9291be76f05b214e014157f3ec03a354aaec68a14e20103dde37d11f13b846056aa90f4 DIST wordnet-3.0-patchset-1.tar.bz2 8076 SHA256 d8333b107f53e188981e9ec0e1e53890c8bd7155924ae140c777c3f443d8aba7 SHA512 17668d736dd6dfe83e4d5d328729cbcdfb4dbca9a9707651534169bd2ce6fc2238d5c820d63330c51c20ab9b2964b56a609f58242b05dabbcfdfc0da61c048cb WHIRLPOOL 30e3820c2679148206bc14d5acf8eb7a2bde422f13ce2e9b0a90145e510667d70b1c1ef5d3486c85eddf6492c72b2243672683164f917f8ff5910370e30bd0f8 EBUILD wordnet-3.0-r4.ebuild 2222 SHA256 d49f366cb8333bdb6e1e09342c010025691686dde0ab20fd47ad3b69d1b02f2f SHA512 ae6ce0e134f360a7b1b8a3342127d842a33a04b2de118fe31f1be56c457ed82b5bd799bd087ab8b807f38b3f6260aa40691c0e28f5049def87c3b3a4a46419a7 WHIRLPOOL 6030c7cebccf9b1433baaa787cdaeb55f5f6a969ba41e5a8d06a94196eefbd64e5721fbc214fa60fc1e47af8c9bbfef62b922a29f14e7a6d272ab4f2538604ab -MISC ChangeLog 5516 SHA256 d0564e6cd7d312e513caf00bfa30431ec33dbb016dab833319062210ad0669ea SHA512 575e0041c514b3d7b798b6ec8ae4f0306aac885e5ab9152cd478866ea75bb594f384882699bce959d42c2a84c4eb2cc91d7095018172ec3a3531f6e496899256 WHIRLPOOL 85c8234cc798398f910edc95ed99cdd6fd8ab9804e97e6e9e48a0a347bdfc651b8ca04ac8d978d6bee080acb2caf6641f55575810fd60be447093694230e4a44 +MISC ChangeLog 5705 SHA256 2b481b09d7bfc2d43a2b07e615f6506e70cd2ecce60e43822c0920f874f0ace3 SHA512 2392e3ea669c7a839cfb5d77fbd199bfc8ac52b66946153d11db5afaee3a88d3258fb8c900018cf4467d80a5bb01475731a86c6c9c4f2acfdb5f4db714c8fc9c WHIRLPOOL df4f9c1cf11bfb9d75f9b5aa4418dead42eb52840a5c1968a7a78a506e9fb168dc308ffd46b13e3f8e1ab910333548b9e2bcb08e0af850327a7becaffeef3790 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJVF8XaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJVF8ZaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirMO0P/R1YlflkujOY3U7dUYulSVfg -NA6imOTY24sojTqMby7lxNr3WwulC/wVrrOwnm+HCr+14atYBmYKfNM0ICJF9C5S -X97YjlRPR0ZDFpnxOfx9CK52hW7qI7NwGRMMvyG935WIiGKiL+jqQ8Nk/rdM3cA7 -0kSn+KLH7/lNo/ORcg8abZb6hsZuOs/NRRYQbfQaYEcg06ESE5Fs7G7ESZ2+y+9Y -NcpqSpI6PBiAoQ22N/uUtZXaO488Cyp5vzvHDzbkThUvX/3UyhtCrYeX7Y9OgWs5 -o8mwTi2jKBqpm5RncRADwS46byCgOX8zWf6Xzpyc20uhHEvC+22xDetnegmidjIA -Y7NxRs1/QC/wLLBQVCQEKvyVG+3+BLYXn5yUijJ1Mn3XiSLa21JW99XdfSpsi0WH -Iurz/INJ1qWeTcscBrsH8cY0fwbQCqnpykZw5rFOpy63WG4fWgUTFkjDmHOF4D7r -K+8JmFwWzJFC5Z8+AEkypmf/6Ktuh1GKwV6XrguF8Y+k4xBuVfH8vsKMVw4L6dWr -gK0ZcNTp82GNcbNk/p9q9gJgOz/DjXKtyq6htl6AD8foqEDvU9I941jggC0X6cSg -rX1yBgoBmhaqYYwOJLL8XFGswxRkwyz9Vm4HhFFtu3J3alwWuGe72TWN27O2zqO+ -YN+th8bw0MU9FXKvIKMs -=uPcC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirHm4P/3+GxPy9m/xYKZUdb+fnf3zF +NSdVaHutyg+hURDvORL/LahzXdu/O/KoQAfkRXpyXZJkyFlpCyZyUeKfv4CS+2/5 +qTO8kU42avMGBV/9X6fHqeckEQdS88BzG+Dkv28IuDVN9VSMk1b2vCCyutMoiLpx +aPCQiLrA/vmPt+50X2njzb/GOqV6sITzCN/ROPG9dJtHeV010exxkUY+MWidyH6j +vb/S1ob1Qq/yN0J5OTevmQIfwYblnB0mC6rl45Dx9drNE0kuhjt9z9L78gUPrdeo +l9XgcMfrg5nE3A7xj7l3tPT+d6Tx0bRBKVx64kD+AY4ZhkkHQ8UjzYL62Mn9xCJG +r3qT+b41rSVcjN8kGLz9eSjkDMk+BYEtXGO5elRUdT08HK7AoFXrAO2ausazzciO +EHRwSa0ZNzVeToi7E16RnpmHKwXJXkFYUJKD2LGBx/bnfinlWIrnSwBfY1TinjFe +r8mV5BzWuGvMQoIAyTDDBuDSTSP18ie84kpyTtEdM3fsqjyCVhHT5hIeiLUCCkMF +kfs1LXBgkJi1EJU5uwTatBT5w0TwPIGiAbhso4abQeENyeCLe7s99w5m1XlEN52F +z28+WTKnxnXVymn+AMp8tTxLdLVOQPo9d4iBNkdZgsFVIs0pPQ1/prEXJru+gBCR +2c409C/9xp44hWOoABm8 +=kXio -----END PGP SIGNATURE----- diff --git a/app-dicts/wordnet/files/wordnet-3.0-dict-location.patch b/app-dicts/wordnet/files/wordnet-3.0-dict-location.patch deleted file mode 100644 index bafb9bb47a78..000000000000 --- a/app-dicts/wordnet/files/wordnet-3.0-dict-location.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 55ce18c6b96d..000000000000 --- a/app-dicts/wordnet/files/wordnet-3.0-docs-path.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index 2198146800fb..000000000000 --- a/app-dicts/wordnet/files/wordnet-3.0-shared-lib.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 |