From c5283d322accc6097afec74eab24550829788bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Mar 2018 04:19:44 +0000 Subject: gentoo resync : 23.03.2018 --- dev-perl/WordNet-QueryData/Manifest | 4 ++ .../WordNet-QueryData-1.490.0-r2.ebuild | 22 ++++++++++ .../files/WordNet-QueryData-1.49-harness.patch | 31 ++++++++++++++ .../files/WordNet-QueryData-1.49-paths.patch | 48 ++++++++++++++++++++++ .../files/WordNet-QueryData-1.49-test-counts.patch | 43 +++++++++++++++++++ 5 files changed, 148 insertions(+) create mode 100644 dev-perl/WordNet-QueryData/WordNet-QueryData-1.490.0-r2.ebuild create mode 100644 dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-harness.patch create mode 100644 dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-paths.patch create mode 100644 dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-test-counts.patch (limited to 'dev-perl/WordNet-QueryData') diff --git a/dev-perl/WordNet-QueryData/Manifest b/dev-perl/WordNet-QueryData/Manifest index d00988c92664..389f3449cfac 100644 --- a/dev-perl/WordNet-QueryData/Manifest +++ b/dev-perl/WordNet-QueryData/Manifest @@ -1,3 +1,7 @@ +AUX WordNet-QueryData-1.49-harness.patch 727 BLAKE2B 42c113b3a276b901dbd7bda9da4e4624d90a23abbfafd0e996f8dd78d2f2f79d3f92315401334532731fe8bea137754488147b235922dcb492156e6688df0847 SHA512 1ccc645814b5a7069556c54d998628db10271573325dc3ecdb36b03c2370abac24e458bd3e3e9cb5772c720c8958a6f71376b0f50e8b796b28de640782f45429 +AUX WordNet-QueryData-1.49-paths.patch 2946 BLAKE2B 56711b3ecf7a7a60945f53f8b15c3e7b5a12ca2d788333c4d567ae0c6b7e26e70a7de5971a1545ca6688bc104a78ae561eacefc21aeb2194388f0ead48d14975 SHA512 7fbac21430a8bb1961c053412b04c84b381c27e9048945c9dcff4abdc9daaa2d23eae8cf05592cd7e60a87625aa7a98272e4bacc71623c2984f98a2cff9156fa +AUX WordNet-QueryData-1.49-test-counts.patch 1429 BLAKE2B 9669d22d69c1f7b29a5a64457454118a83383bceb5e158ce0f49562473791521d95b85eec2088412594a802d7dc49c797489734af78679aed8e073e3aa6c06da SHA512 41cb61cc29b609235fac60180e8ba36d799092c2e2965b1368a0b8b289459fdc30a7f93fc7faf5bcfd814b9e2fec4b2aa3f5bb773f593497858088ebbbc56134 DIST WordNet-QueryData-1.49.tar.gz 19656 BLAKE2B 290a214539a689e43d0fbad88af8195af95c54378eece4b2913cbfc8950af7041748dc5c8a2ad2f47770f5fb5b95cd6708a9cff93f91b32aa6c424dcc382655b SHA512 41a092f762da0048367648b1c3bcdfb311b7241329ebfb0569b5bd3d5918304d34319c74e9bf8c60ce7316d084c434bfcc54963e21c4ab0999ab0ba022dcb192 EBUILD WordNet-QueryData-1.490.0-r1.ebuild 392 BLAKE2B f1c92c18245e368953ea09c2aab0d68b3236f765d8f579eacfd88a16ba12879ee4efbb5899a0bbd926c9db3d2256396ac87af58ba33acffd5a2ef05ff9ff35bc SHA512 61ed8a51fe79e149a234614b45e97903560675ba722a50fcb0dc0a7db58855708eda16a6c6cd5f933eea2f05297dc642e86707cf76df8440df12803ba4156eb4 +EBUILD WordNet-QueryData-1.490.0-r2.ebuild 454 BLAKE2B 8d9f2dacc8b0d56c4202e23a7a4796c73a8b9707f6aeb4b1d905c9406050f381e57265bdf35b837db15141bc2cc87a7b6ef7331260b29aba6c1764a2bbded217 SHA512 10086ccffa13f3d75960e734f187dc7e354c4bd487d273fc24b07c807e5524eb3925a3a67c23d339bdc8296d4b353ff0ea7fca5b07b0198d849d9920febf8540 MISC metadata.xml 406 BLAKE2B 90a8c384d90f0317cdfd74a4ffff47ebe1f173d1e9168d4265777c73dfcc5496351d9e24b2a7f91c0af386eb784e8c5d39158042bc36b719767155ef61f8bd30 SHA512 ba2d95b787c43d07c10a921ebb32bc666d026d4431e5d621f03d6627f02b0620268e30be62e364aeeb62496bed7760853238fc032b1fb3bd87c27945aa9e8183 diff --git a/dev-perl/WordNet-QueryData/WordNet-QueryData-1.490.0-r2.ebuild b/dev-perl/WordNet-QueryData/WordNet-QueryData-1.490.0-r2.ebuild new file mode 100644 index 000000000000..c6ffadef6406 --- /dev/null +++ b/dev-perl/WordNet-QueryData/WordNet-QueryData-1.490.0-r2.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DIST_AUTHOR=JRENNIE +DIST_VERSION=1.49 +inherit perl-module + +DESCRIPTION="Direct perl interface to WordNet database" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="app-dicts/wordnet" +RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-1.49-paths.patch" + "${FILESDIR}/${PN}-1.49-test-counts.patch" + "${FILESDIR}/${PN}-1.49-harness.patch" +) diff --git a/dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-harness.patch b/dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-harness.patch new file mode 100644 index 000000000000..c0e4a7ba791e --- /dev/null +++ b/dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-harness.patch @@ -0,0 +1,31 @@ +From a29056d2dca8cfb27750e391a95dd2f612a02a87 Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Wed, 21 Mar 2018 22:28:11 +1300 +Subject: Reorganize into proper test structure to make harness work + +--- + MANIFEST | 2 +- + test.pl => t/wnqd.t | 0 + 2 files changed, 1 insertion(+), 1 deletion(-) + rename test.pl => t/wnqd.t (100%) + +diff --git a/MANIFEST b/MANIFEST +index 6b05bf0..3c8aeaa 100644 +--- a/MANIFEST ++++ b/MANIFEST +@@ -1,7 +1,7 @@ + ChangeLog + Makefile.PL + README +-test.pl ++t/wnqd.t + QueryData.pm + MANIFEST + META.yml Module meta-data (added by MakeMaker) +diff --git a/test.pl b/t/wnqd.t +similarity index 100% +rename from test.pl +rename to t/wnqd.t +-- +2.16.2 + diff --git a/dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-paths.patch b/dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-paths.patch new file mode 100644 index 000000000000..72cb934ae019 --- /dev/null +++ b/dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-paths.patch @@ -0,0 +1,48 @@ +From 4efc840a9f8041c3d08de8e06d5b5386fca94e4a Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Wed, 21 Mar 2018 22:15:30 +1300 +Subject: Use system wordnet path instead of usr/local + +--- + Makefile.PL | 2 +- + QueryData.pm | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index d192f6d..1932c8f 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -5,7 +5,7 @@ use ExtUtils::MakeMaker; + # $wnHomePC). These need to be synchronized. I need to import those + # variables from QueryData.pm. + +-die "*** Please set the WNHOME environment variable to the location of your\n*** WordNet installation. QueryData.pm will not work otherwise.\n*** Alternatively, you can make the installation in the default\n*** location, C:\\Program Files\\WordNet\\3.0 on Windows, or /usr/local/WordNet-3.0 on unix.\n" unless exists $ENV{WNHOME} or exists $ENV{WNSEARCHDIR} or -d "C:\\Program Files\\WordNet\\3.0" or -d "/usr/local/WordNet-3.0"; ++die "*** Please set the WNHOME environment variable to the location of your\n*** WordNet installation. QueryData.pm will not work otherwise.\n*** Alternatively, you can make the installation in the default\n*** location, C:\\Program Files\\WordNet\\3.0 on Windows, or /usr/share/wordnet on unix.\n" unless exists $ENV{WNHOME} or exists $ENV{WNSEARCHDIR} or -d "C:\\Program Files\\WordNet\\3.0" or -d "/usr/share/wordnet"; + + WriteMakefile( + 'dist' => { 'COMPRESS' => 'gzip', 'SUFFIX' => '.gz', }, +diff --git a/QueryData.pm b/QueryData.pm +index ee27ee6..fc6168a 100644 +--- a/QueryData.pm ++++ b/QueryData.pm +@@ -201,7 +201,7 @@ my @excFile = ("", "noun.exc", "verb.exc", "adj.exc", "adv.exc"); + my @indexFile = ("", "index.noun", "index.verb", "index.adj", "index.adv"); + my @dataFile = ("", "data.noun", "data.verb", "data.adj", "data.adv"); + +-my $wnHomeUnix = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "/usr/local/WordNet-3.0"; ++my $wnHomeUnix = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "/usr/share/wordnet"; + my $wnHomePC = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "C:\\Program Files\\WordNet\\3.0"; + my $wnPrefixUnix = defined($ENV{"WNSEARCHDIR"}) ? $ENV{"WNSEARCHDIR"} : "$wnHomeUnix/dict"; + my $wnPrefixPC = defined($ENV{"WNSEARCHDIR"}) ? $ENV{"WNSEARCHDIR"} : "$wnHomePC\\dict"; +@@ -1113,7 +1113,7 @@ QueryData knows about two environment variables, WNHOME and + WNSEARCHDIR. If WNSEARCHDIR is set, QueryData looks for WordNet data + files there. Otherwise, QueryData looks for WordNet data files in + WNHOME/dict (WNHOME\dict on a PC). If WNHOME is not set, it defaults +-to "/usr/local/WordNet-3.0" on Unix and "C:\Program Files\WordNet\3.0" ++to "/usr/share/wordnet" on Unix and "C:\Program Files\WordNet\3.0" + on a PC. Normally, all you have to do is to set the WNHOME variable + to the location where you unpacked your WordNet distribution. The + database files are normally unpacked to the "dict" subdirectory. +-- +2.16.2 + diff --git a/dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-test-counts.patch b/dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-test-counts.patch new file mode 100644 index 000000000000..e06c872e0128 --- /dev/null +++ b/dev-perl/WordNet-QueryData/files/WordNet-QueryData-1.49-test-counts.patch @@ -0,0 +1,43 @@ +From fe7f10589ee4da4a834e1f6355bb203de644920e Mon Sep 17 00:00:00 2001 +From: Kent Fredric +Date: Wed, 21 Mar 2018 22:24:09 +1300 +Subject: Remove tests dependent on specific counts of dictionary terms + +This was never going to be portable against newer wordnet data releases +--- + test.pl | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/test.pl b/test.pl +index 537aa7b..386c66c 100644 +--- a/test.pl ++++ b/test.pl +@@ -5,7 +5,8 @@ + # $Id: test.pl,v 1.40 2007/05/07 01:08:31 jrennie Exp $ + + my $i = 1; +-BEGIN { ++BEGIN { ++ print "1..103\n"; + $| = 1; + } + END { print "not ok 1\n" unless $loaded; } +@@ -162,14 +163,9 @@ $foo[1] == 2 + ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n"; + ($wn->querySense('acropetal#a#1', 'dmnc'))[0] eq 'botany#n#2' + ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n"; +-scalar $wn->offset("0#n#1") == 13742358 +- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n"; + +-scalar $wn->listAllWords("noun") == 117798 +- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n"; +-$wn->offset("child#n#1") == 9917593 +- ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n"; + my ($foo) = $wn->querySense ("cat#n#1", "glos"); + ($foo eq "feline mammal usually having thick soft fur and no ability to roar: domestic cats; wildcats ") ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n"; + + } ++print "0..$i\n"; +-- +2.16.2 + -- cgit v1.2.3