From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 25 Aug 2020 10:45:55 +0100
Subject: gentoo resync : 25.08.2020

---
 app-text/dictd/Manifest                            |   8 +-
 app-text/dictd/dictd-1.12.1-r2.ebuild              |   3 +-
 app-text/dictd/dictd-1.13.0.ebuild                 | 117 +++++++++++++++++++++
 app-text/dictd/files/1.10.11/site.info             |   2 +-
 .../files/dictd-1.10.11-colorit-nopp-fix.patch     |   5 +-
 5 files changed, 127 insertions(+), 8 deletions(-)
 create mode 100644 app-text/dictd/dictd-1.13.0.ebuild

(limited to 'app-text/dictd')

diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index c868375e9be7..bc54229776ec 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -3,10 +3,12 @@ AUX 1.10.11/dict.conf 243 BLAKE2B 707e17e8373ded07ff36a304a17e33d22544a2b497118b
 AUX 1.10.11/dictd.conf 781 BLAKE2B 1cb0a3548125923d2fabfa296863135472b93ca6c34cd4b2d8eebf7f9c0d6e7df9ec652eed4f3a2ee138834ada12a58cdc315d0607cd2bba05315a6dac6db6bf SHA512 60c7ade9e3c160c69b87405962b0e92f6beb3941fecdbbb90c2343f1db1cc800bd26f1a670435641859e6bc864aa8ace58749c07dd106c3afd7eea81601445c3
 AUX 1.10.11/dictd.confd 207 BLAKE2B f7d9815d41490f85a977d3dcfa9dc7330e48b76102f4cf90c18204f780287c7681ba9c7a4dc4e04d9007d18e89f2dbe6c29595ea9f685bb6a14c774f2485a85f SHA512 16e31e250bce84cfa25d5d187f736053773889afd248248fac61aac115df2938fbe6f30049c143f2c290b60652947125763adaffdfcd71260853d574c0434348
 AUX 1.10.11/dictd.initd 1982 BLAKE2B ea63cda1512c1e65a463193cb17a2610053909aebdfb5c572720572f9aa77a00adb632d22a8e775bd0fd8c397331b2f79dda43c214d44d0166b374a9f5dcdc7e SHA512 7b8907dbc9f40f81b8431e691506142954643e6539ca6bb486f629fb929f60da8a7e52066e46374478f805dc1b6e84931f3b4a6a2f8f7d34f56a8664c5f4a0ab
-AUX 1.10.11/site.info 235 BLAKE2B 561d838293b3894d6e7a34348d7181ce3f38a093441ec3029e97524d219bac315927a0ab67f6dff94150d03e851a15b578aee4141d2f3c8d68792ae8f7a794bd SHA512 74bb341f049acd7d502d9117ae1321bedc499958ba377c02a2591880cc45d451409fd99a76ec3ddcf1846f6d124ef5ae1da40c5c001b67e94c68a895c2dcfd79
-AUX dictd-1.10.11-colorit-nopp-fix.patch 323 BLAKE2B e99dea0a194532be7239fab52da9c1bae0557ed3d7a32c4ffa07d5c0298346bfb17b3d2711ac7a5d755f82493b3c4cbde60d1af7f6d4dc31fc9866dbf77a36a8 SHA512 af4a35954d4c38e7e33d23a05dccba4dc7ffb5b4905cb34487718a664f8c52c3cebb17296367fb9f8b203137bbc00fef62d2f452446fb589f914ff8862bbc1e7
+AUX 1.10.11/site.info 235 BLAKE2B 423c81fc16eafaa8d0a0f04eb478fb390ef075638b3ffd6ddcae0a6f8685758ff741c52585d76fa56713893931376845b68fa33dcb90191268bf81301c686b00 SHA512 62e63fd9c0b939647381831fa82762f324059c440111918791abbb03f03459d1411065d30f71c8b30da666f84e720960e3f49977a17c849aae4d6c5845e38a5f
+AUX dictd-1.10.11-colorit-nopp-fix.patch 244 BLAKE2B d93eddba872d67b2b5ce0ab9e4dbbcd2271f484d91e23bfba9e8f287669f5323006b3209b41ca9a0926e672c66d867db5f048b5b3fcf314ed29b1d7617b65eec SHA512 f7e8e84bd6132e19e778066b6adcd34ffb17e009d3f6abd9177a6aa5ad0c2c7e8afc03f5cadc18b6ec509a3118ccf3b515f971330f45baed36534b65415f8ca7
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
-EBUILD dictd-1.12.1-r2.ebuild 2803 BLAKE2B 432b62db8548e23b0ee3321ad4d6d1faef7bb304eecd2c88539991ac2ed9f905632843c9e4e1936460fe13d9ffbf0d094f9db13ee8acc921767597c5eb3e3131 SHA512 e020c8ad1645e983b5d537d06974f90e33fd179dad13baf98b98711bf6df4d13c40a89897e0ec5d70514d3c38f933b9748eee6fbfd289aad5898d7ee47cc609d
+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
 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 62f818c4f28b..4da9d8dbf3ae 100644
--- a/app-text/dictd/dictd-1.12.1-r2.ebuild
+++ b/app-text/dictd/dictd-1.12.1-r2.ebuild
@@ -12,7 +12,7 @@ SLOT="0"
 # We install rfc so - ISOC-rfc
 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"
+IUSE="dbi judy minimal test"
 
 # <gawk-3.1.6 makes tests fail.
 RDEPEND="
@@ -25,6 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=sys-apps/gawk-3.1.6
 	virtual/yacc
+	test? ( !~sys-apps/gawk-4.2.1 )
 "
 
 DOC_CONTENTS="
diff --git a/app-text/dictd/dictd-1.13.0.ebuild b/app-text/dictd/dictd-1.13.0.ebuild
new file mode 100644
index 000000000000..6f994838112e
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 Gentoo Authors
+# 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"
+HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+SLOT="0"
+# We install rfc so - ISOC-rfc
+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"
+
+# <gawk-3.1.6 makes tests fail.
+RDEPEND="
+	>=sys-apps/coreutils-6.10
+	dev-libs/libmaa
+	sys-libs/zlib
+	dbi? ( dev-db/libdbi )
+	judy? ( dev-libs/judy )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	>=sys-apps/gawk-3.1.6
+	virtual/yacc
+	test? ( !~sys-apps/gawk-4.2.1 )
+"
+
+DOC_CONTENTS="
+	To start and use ${PN} you need to emerge at least one dictionary from
+	the app-dicts category with the package name starting with 'dictd-'.
+	To install all available dictionaries, emerge app-dicts/dictd-dicts.
+	${PN} will NOT start without at least one dictionary.\n
+	\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
+)
+
+pkg_setup() {
+	enewgroup dictd # used in src_test()
+	enewuser dictd -1 -1 -1 dictd
+}
+
+src_prepare() {
+	default
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		sed -i -e 's:libtool:glibtool:g' Makefile.in || die
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_with dbi plugin-dbi) \
+		$(use_with judy plugin-judy) \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--sysconfdir="${EPREFIX}"/etc/dict
+}
+
+src_compile() {
+	if use minimal; then
+		emake dictfmt dictzip dictzip
+	else
+		emake
+	fi
+}
+
+src_test() {
+	use minimal && return 0 # All tests are for dictd which we don't build...
+	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"
+	fi
+	emake test
+}
+
+src_install() {
+	if use minimal; then
+		emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt
+	else
+		default
+
+		dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt}
+		dodoc doc/{security.doc,toc.ms}
+		dodoc -r examples
+
+		# conf files. For dict.conf see below.
+		insinto /etc/dict
+		for f in dictd.conf site.info colorit.conf; do
+			doins "${FILESDIR}/1.10.11/${f}"
+		done
+
+		# startups for dictd
+		newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
+		newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
+		systemd_dounit "${FILESDIR}"/${PN}.service
+	fi
+
+	find "${ED}" -name '*.la' -o -name '*.a' -delete || die
+
+	insinto /etc/dict
+	doins "${FILESDIR}"/1.10.11/dict.conf
+
+	dodoc ANNOUNCE NEWS README TODO
+
+	readme.gentoo_create_doc
+}
diff --git a/app-text/dictd/files/1.10.11/site.info b/app-text/dictd/files/1.10.11/site.info
index 23bfdeb61102..c896c1e0e875 100644
--- a/app-text/dictd/files/1.10.11/site.info
+++ b/app-text/dictd/files/1.10.11/site.info
@@ -1,6 +1,6 @@
 Welcome to your dictionary server dictd!
 
 This is an example site information file.  It should contain information
-about any restricted databases and how users can obtain access.  If may
+about any restricted databases and how users can obtain access.  It may
 also contain other random data as you see fit.
 
diff --git a/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
index 4643a10d2de4..841193b1982b 100644
--- a/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
+++ b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
@@ -1,6 +1,5 @@
-=== modified file 'colorit.in'
---- colorit.in	2009-03-02 08:52:14 +0000
-+++ colorit.in	2009-03-02 08:52:48 +0000
+--- a/colorit.in
++++ b/colorit.in
 @@ -167,7 +167,7 @@
  
      function process_config (){
-- 
cgit v1.2.3