gentoo resync : 20.10.2021

10 files changed, 75 insertions, 461 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 06d976b13431..a78e8ea0fe54 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index 75042b4590d5..1e933cb92812 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -1,11 +1,5 @@
-AUX wordnet-3.0-fix-indexing-bug-314799.patch 732 BLAKE2B bb6d4453f9119a134c0b108984cc67a056a8f9a9cc4ed9c357e8eb7e68761e70680950475118198d6f9487ab7f14e5776798dff32d86e65e4db591e461595dbf SHA512 697a6279223270dad6a8f3834020560b6cde07edea62e3f4238c0b288b2cb875d294bf0101cf9c79f0e1d086116d90309ca851a926318a48f5cd02058062f149
-AUX wordnet-3.0-format-security.patch 1443 BLAKE2B 21e79d7341cd119598730d317c664406915cdb2aaf572e482061be913fcb85a372214eae71b93a2a31022c6b5638cf3bc8a2b2b719b975d15143c9487f443332 SHA512 5567b1d5e041ed39a38e40e253dc94e22a3a7c6b690bc452716b26c2932b94eeb065e00354e2c8f1dc77d53713fd2e69e44a498a8664e867de2df07f2f36c170
-AUX wordnet-3.0-src_stubs_c.patch 438 BLAKE2B de2bbb812e01d6c63912ae414a02e8f4c0caa697cf4ade90d605e10dce7afd8907ff65b3af0585ca100650264615ad9bbc2008098fec51969c406b563f1c783d SHA512 82bf6705b26bd0455a2a556abd9cd01cde7c7f738f3f4f5cbf49eefe5c301c7022e908208cce2617e0b95f78464beeab21c7af4131c3472fe4e2ba4650533359
-AUX wordnet-3.0-tcl8.6.patch 4974 BLAKE2B f26cdf66b00bbf2a5185642fbe140ee6294e6910e78d7230a7f4f4c7324a207537df8a5a32ba33c1166e332d4afcce621704f9186ac1adb362883d716ac8da22 SHA512 2dafc6a6cd332d387fa15b63a7c5cad222e611906582232f7bd6f2522773336e7b632775e73fcd1a8587bd95eabaf70ec1c9ea4b8a81a7c147360a836be0a90c
 DIST WordNet-3.0.tar.gz 11537227 BLAKE2B 358bdc3178f35f4f269ad9d0a5245396811f8678a020ab1ddf9978eef733bb91450f331d03734f585121b1532bb67ca97e765b13cb3f37018cd29df558201c5d SHA512 d39c008cec41de8f1b2aeacb4ad818f9997a13b30a992fda100b6dcc9c11c253530b00a1909b55ff7b564bafc33f7763c1ce9b0a6ae3e591695db2083e9ead7a
 DIST wn3.1.dict.tar.gz 16358468 BLAKE2B f3df09f39ea29fce3378122f1a93d713acb8be39e6798695b8cc412a3ae6e644cfcf906426d4091d9849be60620367d3de541ec6dd0d8016b8f0cf39a7bad346 SHA512 16dca17a87026d8a0b7b4758219cd21a869c3ef3da23ce7875924546f2eacac4c2f376cb271b798b2c458fe8c078fb43d681356e3d9beef40f4bd88d3579394f
-DIST wordnet-3.0-patchset-1.tar.bz2 8076 BLAKE2B 20684bd96814db6e0bf2d9aeb455def682fc38566d6abd3832bf0f7eae3b65b63e8b16aa21656bb81c1696bec0d179028ea8bb4687e5566a6d679bc55e300b9c SHA512 17668d736dd6dfe83e4d5d328729cbcdfb4dbca9a9707651534169bd2ce6fc2238d5c820d63330c51c20ab9b2964b56a609f58242b05dabbcfdfc0da61c048cb
-EBUILD wordnet-3.0-r4.ebuild 2099 BLAKE2B 7b936c3a1fe97bdd0223e06e5199b879aed52346542b50f774f15b8c633e2a237e3d0f8c0e191f0491bdf39e3f167f58c8c6df29d4a8b1c78be0cf88fc7421b2 SHA512 1ec886133b23f931052faee2a0a059f380879524f36f035676f4ac123ea0215386520ddfe1266fc030dea285c41e2f727dd0c0630458bfd8f85dc5d4b141062c
-EBUILD wordnet-3.0-r5.ebuild 2149 BLAKE2B 3860850921c4f54b21c92540870204210bba2a74ee9feeb05dd39c7cfe8b02ea7f46e24a0a73c6715d0c0e59af8454544dcec6e4b620a4941f5acf71b5de3398 SHA512 4685d889a731157f4a9254e713e1138539715289d1b50ae74cbdf63fc8205e36772c1abb5013173e5dcc955c21a2f1d1504e8337cffc73817473855abfcce78f
-EBUILD wordnet-3.1.ebuild 2771 BLAKE2B 095bcb04229fdff461d1198b2cd46a5eb15be069a4799721b4c82cc93d9b3db3e68881c753a3cefa0f38899e9d19593573558f9340e4b047922279129ab5c157 SHA512 5ac6e0691a3798e3094ea864c6d4112f604c0f94de702178d80932eb31843b5344cad42fdf599d5dc72574e839f9e80241c3c23eec15fe67b40b16eb4fcd8359
+DIST wordnet-3.0-patchset-2.tar.xz 8788 BLAKE2B 3e34b7f5f1011556fb9b53fc987fb3a0fd6818d68d8e71a35ee8d955071251648386c4a361bb902340c5ca899c993363721ee9acbea2eea1386e22502789be2d SHA512 2b72f12134cb60a1db98384650f13cd57012162908c0a37aa232ad0a04a249ce25cce76332dab08c5280d6f29fd58d5c874d5e8d6e00ef55523012d7faa09fcf
+EBUILD wordnet-3.1-r1.ebuild 2139 BLAKE2B ae6be8f280a5b0a41410d8e0aa6912b18665bc0900f6f184c8e993247ed312b93bfe1246aef098c1f17aa5908be49bc323ecc7d0247a44ca318bc852398f337a SHA512 2bca624a98035bee8ed2e4ee13135cd77ff569409a7db463b359e5ae28e38c12ed01cabced46a3e52a830839b333dc3da51affe3223337718d71e8ec0beac21a
 MISC metadata.xml 389 BLAKE2B 43d6aca669a34a791eea459cb4e2906b573e09bc03d6e79ca9432c15ebf89286a28378ac20a28467bbc6f6bf629ed20ea4e608a09762be8a677c0e3b7134d6f4 SHA512 562aa5c687da46765c959bf235ab0dcd5ef6edb9f105d46c50853dac8685a68ae8e9507662c0fddb2af155ced2aad54fa4230f467c48ffc2ed2fb72c98144297
diff --git a/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch b/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch
deleted file mode 100644
index fafaa2c331d7..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-fix-indexing-bug-314799.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -p -u -r WordNet-3.0/lib/morph.c WordNet-3.0-mine/lib/morph.c
---- a/lib/morph.c	2010-04-12 13:53:04.000000000 +0200
-+++ b/lib/morph.c	2010-04-12 13:54:53.000000000 +0200
-@@ -375,14 +375,14 @@ static char *exc_lookup(char *word, int 
-     static char line[WORDBUF], *beglp, *endlp;
-     char *excline;
- 
--    if (exc_fps[pos] == NULL)
-+    if (exc_fps[pos-1] == NULL)
- 	return(NULL);
- 
-     /* first time through load line from exception file */
-     if(word != NULL){
-         if (strlen(word) > WORDBUF - 1)
-            return(NULL);
--	if ((excline = bin_search(word, exc_fps[pos])) != NULL) {
-+	if ((excline = bin_search(word, exc_fps[pos-1])) != NULL) {
- 	    strcpy(line, excline);
- 	    endlp = strchr(line,' ');
- 	} else
diff --git a/app-dicts/wordnet/files/wordnet-3.0-format-security.patch b/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
deleted file mode 100644
index b5d86dbbdd89..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-format-security.patch
+++ /dev/null
@@ -1,48 +0,0 @@
- lib/binsrch.c | 4 ++--
- src/wn.c      | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/binsrch.c b/lib/binsrch.c
-index 8b71216..9ac51a7 100644
---- a/lib/binsrch.c
-+++ b/lib/binsrch.c
-@@ -193,7 +193,7 @@ char *replace_line(char *new_line, char *searchkey, FILE *fp)
-     copyfile(fp, tfp);
-     if (fseek(fp, offset, 0) == -1)
- 	return(NULL);		/* could not seek to offset */
--    fprintf(fp, new_line);	/* write line */
-+    fprintf(fp, "%s", new_line);	/* write line */
-     rewind(tfp);
-     copyfile(tfp, fp);
- 
-@@ -220,7 +220,7 @@ char *insert_line(char *new_line, char *searchkey, FILE *fp)
-     copyfile(fp, tfp);
-     if (fseek(fp, offset, 0) == -1)
- 	return(NULL);		/* could not seek to offset */
--    fprintf(fp, new_line);	/* write line */
-+    fprintf(fp, "%s", new_line);	/* write line */
-     rewind(tfp);
-     copyfile(tfp, fp);
- 
-diff --git a/src/wn.c b/src/wn.c
-index 004e1e6..398632f 100644
---- a/src/wn.c
-+++ b/src/wn.c
-@@ -284,7 +284,7 @@ static void printsearches(char *word, int dbase, unsigned long search)
- 	    printf("\t");
- 	    printf(searchstr[j].template,
- 		   partchars[dbase], partchars[dbase]);
--	    printf(searchstr[j].helpstr);
-+	    printf("%s", searchstr[j].helpstr);
- 	    printf("\n");
- 	}
- }
-@@ -345,7 +345,7 @@ static int getoptidx(char *searchtype)
- 
- static int error_message(char *msg)
- {
--    fprintf(stderr, msg);
-+    fprintf(stderr, "%s", msg);
-     return(0);
- }
- 
diff --git a/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch b/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch
deleted file mode 100644
index 29c42dea9c35..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-src_stubs_c.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urNad wordnet-3.0/src/stubs.c.orig wordnet-3.0/src/stubs.c
---- wordnet-3.0/src/stubs.c.orig	2007-01-04 18:47:55.000000000 +0100
-+++ wordnet-3.0/src/stubs.c	2007-01-20 19:01:19.000000000 +0100
-@@ -14,7 +14,7 @@
- #include <tk.h>
- #include <wn.h>
- 
--static char *Id = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $";
-+static const char Id[] = "$Id: stubs.c,v 1.7 2005/04/29 19:01:57 wn Exp $";
- 
- static char resultbuf[SEARCHBUF];
- 
diff --git a/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch b/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
deleted file mode 100644
index 110ffc2110b8..000000000000
--- a/app-dicts/wordnet/files/wordnet-3.0-tcl8.6.patch
+++ /dev/null
@@ -1,133 +0,0 @@
- src/stubs.c | 33 +++++++++++++++++----------------
- 1 file changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/src/stubs.c b/src/stubs.c
-index 794485c..cec2c04 100644
---- a/src/stubs.c
-+++ b/src/stubs.c
-@@ -40,8 +40,8 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
-    char *morph;
-    int pos;
-    if (argc != 3) {
--      interp -> result = 
--         "usage: findvalidsearches searchword partofspeechnum";
-+      Tcl_SetResult(interp,
-+         "usage: findvalidsearches searchword partofspeechnum", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    pos = atoi (argv[2]);
-@@ -52,7 +52,7 @@ int wn_findvalidsearches (ClientData clientData, Tcl_Interp *interp,
-       } while ((morph = morphstr (NULL, pos)) != NULL);
-    }
-    sprintf (bitfieldstr, "%u", bitfield);
--   interp -> result = bitfieldstr;
-+   Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
-    return TCL_OK;
- }
- 
-@@ -69,13 +69,13 @@ int wn_bit (ClientData clientData, Tcl_Interp *interp,
-    static char bitfieldstr[32];
-    int whichbit;
-    if (argc != 2) {
--      interp -> result = "usage: bit bitnum";
-+      Tcl_SetResult(interp, "usage: bit bitnum", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    whichbit = atoi (argv[1]);
-    bitfield = bit (whichbit);
-    sprintf (bitfieldstr, "%u", bitfield);
--   interp -> result = bitfieldstr;
-+   Tcl_SetResult(interp, bitfieldstr, TCL_STATIC);
-    return TCL_OK;
- } 
- 
-@@ -89,8 +89,8 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
-    int pos, searchtype, sense;
-    char *morph;
-    if (argc != 5) {
--      interp -> result = 
--         "usage: search searchword partofspeechnum searchtypenum sensenum";
-+      Tcl_SetResult(interp,
-+         "usage: search searchword partofspeechnum searchtypenum sensenum", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    pos = atoi (argv[2]);
-@@ -102,7 +102,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
-          strcat (resultbuf, findtheinfo (morph, pos, searchtype, sense));
-       } while ((morph = morphstr (NULL, pos)) != NULL);
-    }
--   interp -> result = resultbuf;
-+   Tcl_SetResult(interp, resultbuf, TCL_STATIC);
-    return TCL_OK;
- }
- 
-@@ -114,7 +114,7 @@ int wn_search (ClientData clientData, Tcl_Interp *interp,
- int wn_glosses (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 2) {
--      interp -> result = "usage: glosses [1 | 0]";
-+      Tcl_SetResult(interp, "usage: glosses [1 | 0]", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    dflag = atoi (argv[1]);
-@@ -129,7 +129,7 @@ int wn_glosses (ClientData clientData, Tcl_Interp *interp,
- int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 2) {
--      interp -> result = "usage: fileinfo [1 | 0]";
-+      Tcl_SetResult(interp, "usage: fileinfo [1 | 0]", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    fileinfoflag = atoi (argv[1]);
-@@ -144,7 +144,7 @@ int wn_fileinfo (ClientData clientData, Tcl_Interp *interp,
- int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 2) {
--      interp -> result = "usage: byteoffset [1 | 0]";
-+      Tcl_SetResult(interp, "usage: byteoffset [1 | 0]", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    offsetflag = atoi (argv[1]);
-@@ -159,7 +159,7 @@ int wn_byteoffset (ClientData clientData, Tcl_Interp *interp,
- int wn_senseflag (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 2) {
--      interp -> result = "usage: senseflag [1 | 0]";
-+      Tcl_SetResult(interp, "usage: senseflag [1 | 0]", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    wnsnsflag = atoi (argv[1]);
-@@ -175,12 +175,13 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    int pos, searchtype;
-    if (argc != 3) {
--      interp -> result = "usage: contextualhelp partofspeechnum searchtypenum";
-+      Tcl_SetResult(interp,
-+            "usage: contextualhelp partofspeechnum searchtypenum", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    pos = atoi (argv[1]);
-    searchtype = atoi (argv[2]);
--   interp -> result = helptext[pos][searchtype];
-+   Tcl_SetResult(interp, helptext[pos][searchtype], TCL_STATIC);
-    return TCL_OK;
- }
- 
-@@ -190,7 +191,7 @@ int wn_contextualhelp (ClientData clientData, Tcl_Interp *interp,
- int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 1) {
--      interp -> result = "usage: reopendb";
-+      Tcl_SetResult(interp, "usage: reopendb", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    re_wninit ();
-@@ -204,7 +205,7 @@ int wn_reopendb (ClientData clientData, Tcl_Interp *interp,
- int wn_abortsearch (ClientData clientData, Tcl_Interp *interp,
-    int argc, char *argv[]) {
-    if (argc != 1) {
--      interp -> result = "usage: abortsearch";
-+      Tcl_SetResult(interp, "usage: abortsearch", TCL_STATIC);
-       return TCL_ERROR;
-    }
-    abortsearch = 1;
diff --git a/app-dicts/wordnet/wordnet-3.0-r4.ebuild b/app-dicts/wordnet/wordnet-3.0-r4.ebuild
deleted file mode 100644
index 8fc6f3f46f76..000000000000
--- a/app-dicts/wordnet/wordnet-3.0-r4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools epatch flag-o-matic multilib
-
-DESCRIPTION="A lexical database for the English language"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="
-	ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PV}/WordNet-${PV}.tar.gz
-	mirror://gentoo/${P}-patchset-1.tar.bz2"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-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:0=
-	dev-lang/tk:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-${PV}"
-
-PATCHES=(
-	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
-	"${WORKDIR}/${P}-dict-location.patch"
-	# Fixes bug 130024, make an additional shared lib
-	"${WORKDIR}/${P}-shared-lib.patch"
-	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
-	"${WORKDIR}/${P}-docs-path.patch"
-	"${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
-	"${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
-
-	"${FILESDIR}"/${P}-tcl8.6.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-src_stubs_c.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
-	if ! use doc; then
-		sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
-	fi
-
-	# Drop installation of OLD tk.h headers #255590
-	sed '/^SUBDIRS/d' -i include/Makefile.am || die
-	sed 's: include/tk/Makefile::' -i configure.ac || die
-	rm -rf include/tk/ || die
-
-	rm -f configure || die
-	eautoreconf
-	MAKEOPTS+=" -e"
-}
-
-src_configure() {
-	append-cppflags -DUNIX -I"${T}"/usr/include
-
-	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="${EPREFIX}/usr/share/wordnet" \
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/app-dicts/wordnet/wordnet-3.0-r5.ebuild b/app-dicts/wordnet/wordnet-3.0-r5.ebuild
deleted file mode 100644
index fc8af0edea2c..000000000000
--- a/app-dicts/wordnet/wordnet-3.0-r5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools epatch flag-o-matic
-
-DESCRIPTION="A lexical database for the English language"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="
-	http://wordnetcode.princeton.edu/${PV}/WordNet-${PV}.tar.gz
-	mirror://gentoo/${P}-patchset-1.tar.bz2"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-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:0=
-	dev-lang/tk:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-${PV}"
-
-PATCHES=(
-	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
-	"${WORKDIR}/${P}-dict-location.patch"
-	# Fixes bug 130024, make an additional shared lib
-	"${WORKDIR}/${P}-shared-lib.patch"
-	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
-	"${WORKDIR}/${P}-docs-path.patch"
-	"${WORKDIR}"/${P}-CVE-2008-3908.patch #211491
-	"${WORKDIR}"/${P}-CVE-2008-2149.patch #211491
-
-	"${FILESDIR}"/${P}-tcl8.6.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-src_stubs_c.patch
-	"${FILESDIR}"/${P}-fix-indexing-bug-314799.patch
-)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	eapply_user
-
-	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
-	if ! use doc; then
-		sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
-	fi
-
-	# Drop installation of OLD tk.h headers #255590
-	sed '/^SUBDIRS/d' -i include/Makefile.am || die
-	sed 's: include/tk/Makefile::' -i configure.ac || die
-	rm -rf include/tk/ || die
-
-	rm -f configure || die
-	eautoreconf
-	MAKEOPTS+=" -e"
-}
-
-src_configure() {
-	append-cppflags -DUNIX -I"${T}"/usr/include
-
-	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="${EPREFIX}/usr/share/wordnet" \
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
diff --git a/app-dicts/wordnet/wordnet-3.1-r1.ebuild b/app-dicts/wordnet/wordnet-3.1-r1.ebuild
new file mode 100644
index 000000000000..4601ea97c82f
--- /dev/null
+++ b/app-dicts/wordnet/wordnet-3.1-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="A lexical database for the English language"
+HOMEPAGE="https://wordnet.princeton.edu/"
+SRC_URI="
+	http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz
+	http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz
+	https://dev.gentoo.org/~soap/distfiles/${PN}-3.0-patchset-2.tar.xz"
+S="${WORKDIR}/WordNet-3.0"
+
+LICENSE="Princeton"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+
+# 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:0=
+	dev-lang/tk:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${WORKDIR}"/patches/${PN}-3.0-build-system.patch
+
+	"${WORKDIR}"/patches/${PN}-3.0-CVE-2008-3908.patch #211491
+	"${WORKDIR}"/patches/${PN}-3.0-tcl8.6.patch
+	"${WORKDIR}"/patches/${PN}-3.0-format-security.patch
+	"${WORKDIR}"/patches/${PN}-3.0-src_stubs_c.patch
+	"${WORKDIR}"/patches/${PN}-3.0-fix-indexing-bug-314799.patch
+	"${WORKDIR}"/patches/${PN}-3.0-CVE-2008-2149.patch #211491
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DUNIX -I"${T}"/usr/include
+
+	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-3.0 \
+	WNHOME="${EPREFIX}"/usr/share/wordnet \
+	econf \
+		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
+		--with-tk="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_install() {
+	default
+
+	# For clarification: WN is still on  version 3.0. Only the database files
+	# have been updated to 3.1 as a package for 3.1 does not currently exist.
+	rm -r "${ED}"/usr/share/wordnet/dict || die
+	insinto /usr/share/wordnet
+	doins -r "${WORKDIR}"/dict
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "The WordNet 3.1 ebuild has installed WordNet v3.0 with v3.1 database files instead."
+	elog "See https://wordnet.princeton.edu/download/current-version/ for more."
+}
diff --git a/app-dicts/wordnet/wordnet-3.1.ebuild b/app-dicts/wordnet/wordnet-3.1.ebuild
deleted file mode 100644
index ff31be0b663f..000000000000
--- a/app-dicts/wordnet/wordnet-3.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A lexical database for the English language"
-HOMEPAGE="https://wordnet.princeton.edu/"
-SRC_URI="
-	http://wordnetcode.princeton.edu/3.0/WordNet-3.0.tar.gz
-	mirror://gentoo/${PN}-3.0-patchset-1.tar.bz2
-	http://wordnetcode.princeton.edu/wn3.1.dict.tar.gz"
-LICENSE="Princeton"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-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:0=
-	dev-lang/tk:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/WordNet-3.0"
-
-PATCHES1=(
-	# Don't install into PREFIX/dict but PREFIX/share/wordnet/dict
-	"${WORKDIR}/"${PN}-3.0"-dict-location.patch"
-	# Fixes bug 130024, make an additional shared lib
-	"${WORKDIR}/"${PN}-3.0"-shared-lib.patch"
-	# Don't install the docs directly into PREFIX/doc but PREFIX/doc/PN
-	"${WORKDIR}/"${PN}-3.0"-docs-path.patch"
-	"${WORKDIR}"/"${PN}-3.0"-CVE-2008-3908.patch #211491
-
-	"${FILESDIR}"/"${PN}-3.0"-tcl8.6.patch
-	"${FILESDIR}"/"${PN}-3.0"-format-security.patch
-	"${FILESDIR}"/"${PN}-3.0"-src_stubs_c.patch
-	"${FILESDIR}"/"${PN}-3.0"-fix-indexing-bug-314799.patch
-)
-
-PATCHES0=(
-	"${WORKDIR}"/"${PN}-3.0"-CVE-2008-2149.patch #211491
-)
-
-src_prepare() {
-	eapply -p1 "${PATCHES1[@]}"
-	eapply -p0 "${PATCHES0[@]}"
-	eapply_user
-
-	# Don't install all the extra docs (html, pdf, ps) without doc USE flag.
-	if ! use doc; then
-		sed -i -e "s:SUBDIRS =.*:SUBDIRS = man:" doc/Makefile.am || die
-	fi
-
-	# Drop installation of OLD tk.h headers #255590
-	sed '/^SUBDIRS/d' -i include/Makefile.am || die
-	sed 's: include/tk/Makefile::' -i configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags -DUNIX -I"${T}"/usr/include
-
-	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-3.0" \
-	WNHOME="${EPREFIX}/usr/share/wordnet" \
-	econf \
-		--with-tcl="${EPREFIX}"/usr/$(get_libdir) \
-		--with-tk="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	emake -e
-}
-
-src_install() {
-	# For clarification, WN is still on  version 3.0. Only the database files
-	# have been updated to 3.1 as a package for 3.1 does not currently exist.
-	emake -e DESTDIR="${D}" install
-	einstalldocs
-	rm -r "${D}/usr/share/wordnet/dict" || die
-	mv "${WORKDIR}/dict" "${D}/usr/share/wordnet" || die
-}
-
-pkg_postinst() {
-	elog "The WordNet 3.1 ebuild has installed WordNet v3.0 with v3.1 database files instead."
-	elog "See https://wordnet.princeton.edu/download/current-version/ for more."
-}