gentoo resync : 16.09.2020

3 files changed, 12 insertions, 10 deletions

diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index bc54229776ec..beaa2dfa6a01 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -9,6 +9,6 @@ AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a186645274
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
-EBUILD dictd-1.12.1-r2.ebuild 2841 BLAKE2B ecabe4a1e6053fcafe80206a3a172d75a4344a47941bb7ac197ec0599acc26b94dddc9232b4065537b95519e358f94d63a264fc517fbd32a33bf1f58c77b523e SHA512 d9b9d95e77b9b1e3b2938fe1c4b10f158a73a44962a53074455e0ea394351b7b5817eb7f1cd81b41ec5080a557a315278053884a69efa9c0ac7786a57222a3e2
-EBUILD dictd-1.13.0.ebuild 2915 BLAKE2B 81d1435efea188ca0ab4d1b44f33711ed2f28d2ef5dc8186d8fd1b46a4646123337e4563de57978733401a71f5174b69a3d6bb675bb9a61c1cc6f9491c375574 SHA512 dcb00df8f8cde9bff0a0c74f0aed03f8e68beb526da98a806e6ce5af81241840273b95815c6aae1c5dd19d870a891b338f22796221f8164a343fbd74f3d78d81
+EBUILD dictd-1.12.1-r2.ebuild 2870 BLAKE2B abfafae14c450faae4ddab7e6067140bf5ffae2fc44c89d22af9055cc0f087dd94ccf70013f423c0874279a3814a288b965d3d566af34b0c923f5885eb81dfb8 SHA512 4b4caa9de69e126ed84b9d00cf086c327ea47a059bfd3fc7e6f541b15153f73d5c9afb87de75da186d36b8226666e6284ae64b6981352273a6b58ee8b729a66a
+EBUILD dictd-1.13.0.ebuild 2956 BLAKE2B 05bf8ae9ec53ed9b4d2255f6fb3cc544534cc4662d6342eb2d69d28aaf3b2ebcad4c886f0e7a8e4783dd187e6915bbf48e1e26271a5d7b36eb9bea88396fbcc3 SHA512 f579cc49468d91b85d87c58464e0ea02e7aaeb37e18d76fc627891908306762588a460716b5bb3586c0c02380c587fb082aa0a61ec1741a25538b7e89e347bec
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.12.1-r2.ebuild b/app-text/dictd/dictd-1.12.1-r2.ebuild
index 4da9d8dbf3ae..4feb9c4a5c76 100644
--- a/app-text/dictd/dictd-1.12.1-r2.ebuild
+++ b/app-text/dictd/dictd-1.12.1-r2.ebuild
@@ -13,6 +13,7 @@ SLOT="0"
 LICENSE="GPL-2 ISOC-rfc"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="dbi judy minimal test"
+RESTRICT="!test? ( test )"
 
 # <gawk-3.1.6 makes tests fail.
 RDEPEND="
@@ -78,9 +79,9 @@ src_test() {
 
 src_install() {
 	if use minimal; then
-		emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt
+		emake DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
 	else
-		emake DESTDIR="${D}" install
+		emake DESTDIR="${ED}" install
 
 		dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt}
 		dodoc doc/{security.doc,toc.ms}
diff --git a/app-text/dictd/dictd-1.13.0.ebuild b/app-text/dictd/dictd-1.13.0.ebuild
index 6f994838112e..79c142175876 100644
--- a/app-text/dictd/dictd-1.13.0.ebuild
+++ b/app-text/dictd/dictd-1.13.0.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit readme.gentoo-r1 systemd user
 
 DESCRIPTION="Dictionary Client/Server for the DICT protocol"
@@ -13,6 +14,7 @@ SLOT="0"
 LICENSE="GPL-2 ISOC-rfc"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="dbi judy minimal test"
+RESTRICT="!test? ( test )"
 
 # <gawk-3.1.6 makes tests fail.
 RDEPEND="
@@ -22,9 +24,7 @@ RDEPEND="
 	dbi? ( dev-db/libdbi )
 	judy? ( dev-libs/judy )
 "
-DEPEND="
-	${RDEPEND}
-"
+DEPEND="${RDEPEND}"
 BDEPEND="
 	>=sys-apps/gawk-3.1.6
 	virtual/yacc
@@ -39,6 +39,7 @@ DOC_CONTENTS="
 	\nIf you are running systemd, you will need to review the instructions
 	explained in /etc/dict/dictd.conf comments.
 "
+
 PATCHES=(
 	"${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
 	"${FILESDIR}"/dictd-1.12.0-build.patch
@@ -78,15 +79,15 @@ src_test() {
 	if [[ ${EUID} -eq 0 ]]; then
 		# If dictd is run as root user (-userpriv) it drops its privileges to
 		# dictd user and group. Give dictd group write access to test directory.
-		chown :dictd "${WORKDIR}" "${S}/test"
-		chmod 770 "${WORKDIR}" "${S}/test"
+		chown :dictd "${WORKDIR}" "${S}/test" || die
+		chmod 770 "${WORKDIR}" "${S}/test" || die
 	fi
 	emake test
 }
 
 src_install() {
 	if use minimal; then
-		emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt
+		emake DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
 	else
 		default