gentoo resync : 17.06.2021

9 files changed, 35 insertions, 47 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index ae8073e3a78b..1fa58c12b4f3 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/dictd-vera/Manifest b/app-dicts/dictd-vera/Manifest
index 2854d83ba3f0..91eae2b47fd6 100644
--- a/app-dicts/dictd-vera/Manifest
+++ b/app-dicts/dictd-vera/Manifest
@@ -1,5 +1,4 @@
 AUX dictd-vera-1.24-U+D7.patch 359 BLAKE2B 42895ad91dc2a0c8e154cf27bbbd74d0b27129bc73672dfabd305a60ed4d2c7acc11affbfd13a3b34ce0e728e4fbfa8181020d878710f730ee63125da731a089 SHA512 c0b9828c1f2639bca664bbd29729ce90b5db0a16bda713205c8be75bbd0d0ef2ba9cb8fc3b486d13ff7da37d129f34b81a99c360d23863f84857c233778acd11
 DIST vera-1.24.tar.gz 240378 BLAKE2B f35df71c4fc9b95a9abba83cf49f9a70db03f1353f7d4e2b4e1db1a2f6ae41dc88f0f61b28e5405e76a97a7305f8a8bf6414b19a8067f113e2fd6bb54e57de43 SHA512 1727c91b0b60dc579e8f634375488a145921cf419bf3213118f90af031c48ed3d3408609d0a8a41135a3f6c6e9fa579b412981883325ae0dd9f0f72f56da5cd9
-EBUILD dictd-vera-1.24-r1.ebuild 766 BLAKE2B 50da3696293e9472a6d01b14c7e2941b5c399ff2154b89a3462d18d167d6fd4ce3bf29407cc030fe6b3d5940bad67eab7239670ea736e98d2991b3a84b3a64f2 SHA512 2b1dbbf2dd99146d9bc71c343a1d7e946b92c1fe25505e3f3ca5341b831ff5ef81fbad4c8f72684af659f591d669a4eec8f0741985a8256546cc363abca7a043
-EBUILD dictd-vera-1.24.ebuild 759 BLAKE2B 7440e1a1e1b9fe7dd86f0a65425385884b2c8675c2ac46879fed706d9bb518c8bfe3207a62f276e1c52b0af6d049322fa163c7dce059a280342feeea26b2d482 SHA512 112cf141b37c6521d31cd2f79a9e24ca6b08f2084304912257f6040c8a3b2bade9f9ac4624829c8517c0019347a668b67b75cddc832df4360245cf0899fbdc37
+EBUILD dictd-vera-1.24-r1.ebuild 761 BLAKE2B 6b3e2f2c3c57387af94ca6ef92e51e5bd6196a9f891f0f8aecf90a5e2445380760efc85bdcfd5a3522bcbe3f5c3dc8ed8324cbbf2fc8ea6a23d6e21957f53172 SHA512 e41636f47801944ddacef6b9d44de8cb34b408d6d1febfe784c0b9d3354008144aa5e36d7d62cb9b4687d892f65a3ff0a65143fff1d5c0ef36968e19acdc0c38
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild b/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild
index 57e23417d5eb..5877fb139913 100644
--- a/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild
+++ b/app-dicts/dictd-vera/dictd-vera-1.24-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
 S="${WORKDIR}/vera-${PV}"
 SLOT="0"
 LICENSE="FDL-1.3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 
 DEPEND=">=app-text/dictd-1.5.5"
 RDEPEND="${DEPEND}"
diff --git a/app-dicts/dictd-vera/dictd-vera-1.24.ebuild b/app-dicts/dictd-vera/dictd-vera-1.24.ebuild
deleted file mode 100644
index 8e3e3a677a39..000000000000
--- a/app-dicts/dictd-vera/dictd-vera-1.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="V.E.R.A. -- Virtual Entity of Relevant Acronyms for dict"
-HOMEPAGE="http://home.snafu.de/ohei/vera/vueber-e.html"
-SRC_URI="mirror://gnu/vera/vera-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="FDL-1.3"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-DEPEND=">=app-text/dictd-1.5.5"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/vera-${PV}
-PATCHES=(
-	"${FILESDIR}"/${P}-U+D7.patch
-)
-
-src_compile() {
-	cat vera.[0-9a-z] | dictfmt -f -u http://home.snafu.de/ohei \
-		-s "V.E.R.A. -- Virtual Entity of Relevant Acronyms" \
-		vera || die
-	dictzip -v vera.dict || die
-}
-
-src_install() {
-	insinto /usr/lib/dict
-	doins vera.dict.dz
-	doins vera.index
-
-	dodoc changelog README
-}
diff --git a/app-dicts/dictd-wn/Manifest b/app-dicts/dictd-wn/Manifest
index 51f41a45ae2f..cfa799267ad6 100644
--- a/app-dicts/dictd-wn/Manifest
+++ b/app-dicts/dictd-wn/Manifest
@@ -1,3 +1,3 @@
 DIST dict-wn_3.0-33_all.deb 10610306 BLAKE2B 9d9aeff72582e4ee3ede5e8b3872515cfe0acb1e17a14cecd7d492a36fe5e509515048e7c2978cf453abdbfb19dac89b496b78e2b8fc25e2924c8ea818e8713a SHA512 94a72c4fc8d8864abfb4372742f82534977d9472ef3751e58dd017e4ee78db0d541614c54a47634c9d1fbc25eec136f6dc5146845e971f87447ff091ac0278cb
-EBUILD dictd-wn-3.0_p33.ebuild 515 BLAKE2B 2edeff1e507c48692a653f97d6b90bd952fde52586f66236c05a1b7bd9a01ccab8317f8f4c784ebd86a4fb2a2f59118413e9521f60e2f8f073a5d87a1851f113 SHA512 e7dcfbaec02f8f6261d9aae7ed6b8e51b538f372961f182e6e82f8902b31ecf8bafe92ba07c61aae9fa615289c18d780d642884d0a4d75d4c675738e85b074c1
+EBUILD dictd-wn-3.0_p33-r1.ebuild 515 BLAKE2B b57ceec29a0af7786cf996481b59782aef5dd491ba04b8f32f7eeefd39141a3c0c312a5ba7145b2cdabb67faf1771d61085c290de640d2e310dffc1029086b73 SHA512 3e60273685708f7bd5dc920cc971d5abd1a718868ff587ecb2844308fd7c3edb05254e0a4398a144cff3eadc86413405f683d397852960155805e6020efd0617
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild b/app-dicts/dictd-wn/dictd-wn-3.0_p33-r1.ebuild
index 3b7a66430c38..b07033c9b330 100644
--- a/app-dicts/dictd-wn/dictd-wn-3.0_p33.ebuild
+++ b/app-dicts/dictd-wn/dictd-wn-3.0_p33-r1.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit unpacker
 
 DESCRIPTION="WordNet for dict"
-HOMEPAGE="https://wordnet.princeton.edu/"
+HOMEPAGE="https://wordnet.princeton.edu"
 SRC_URI="mirror://debian/pool/main/w/wordnet/dict-wn_${PV/_p/-}_all.deb"
-
+S="${WORKDIR}"
 LICENSE="Princeton"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 
-DEPEND=">=app-text/dictd-1.5.5"
-
-S=${WORKDIR}
+RDEPEND=">=app-text/dictd-1.5.5"
 
 src_unpack() {
 	unpack_deb ${A}
 }
 
 src_install() {
-	insinto /usr/lib/dict
+	insinto /usr/share/dict
 	doins usr/share/dictd/{wn.dict.dz,wn.index}
 }
diff --git a/app-dicts/sword-KingComm/Manifest b/app-dicts/sword-KingComm/Manifest
new file mode 100644
index 000000000000..c341b7f87aaa
--- /dev/null
+++ b/app-dicts/sword-KingComm/Manifest
@@ -0,0 +1,3 @@
+DIST KingComm-1.0.zip 8402225 BLAKE2B 69481fd0bfaa87c32214004a18ba1ed5b034eef7c70c516da986011bafff5bc4176dc3da13b411d5648791f72a3d9ad8427bdf7a2eea4d6207d96783f52fafef SHA512 4e2449aed02a3a48fc401061137fed5c45ebfc82b7c8e385e43d4972a873ffd410434e3c5904acfbd0fe1b640bcd9804482eb014bf0535f81ecbba2d12b5898a
+EBUILD sword-KingComm-1.0.ebuild 352 BLAKE2B 83ebb30c6e42d5e36d162ebf2a8f69743d2caee8b066e424908a3d25dccb6acf2a9327acb8aa4fc1569315e414ae17e069135fedc01cbfaec98e486ee6b5768e SHA512 00873411a02ed495da905b1fc15bad6fd17d4d56c86657eedd43ba434dc5beadea5e333c885ba1fa014476aece596a7b87504f282dcd24d6634f2539bed93cb2
+MISC metadata.xml 269 BLAKE2B 94cfc62aa495a9b998e0dc1f729f5be1079587af1d233c0399f09e51f31bf112e42b89890cefbd0c38a9fb8e8083a69fe31ab201568237ba4bd7556ba7a57d91 SHA512 87dabbe6b0b86a154a72aa51061285df4fb3ee8e8e12b22618c0e079ed02598c76df70698ca581792469611603925d1fbaa125e2826a17960ab20faecf7af8a7
diff --git a/app-dicts/sword-KingComm/metadata.xml b/app-dicts/sword-KingComm/metadata.xml
new file mode 100644
index 000000000000..3827cb158fcc
--- /dev/null
+++ b/app-dicts/sword-KingComm/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-dicts/sword-KingComm/sword-KingComm-1.0.ebuild b/app-dicts/sword-KingComm/sword-KingComm-1.0.ebuild
new file mode 100644
index 000000000000..28e7a2d20e61
--- /dev/null
+++ b/app-dicts/sword-KingComm/sword-KingComm-1.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SWORD_MINIMUM_VERSION="1.5.9"
+
+inherit sword-module
+
+DESCRIPTION="Kingcomments, commentary on the whole Bible."
+HOMEPAGE="https://crosswire.org/sword/modules/ModInfo.jsp?modName=KingComm"
+LICENSE="free-noncomm"
+KEYWORDS="~amd64 ~ppc ~x86"