gentoo resync : 29.12.2022

5 files changed, 285 insertions, 0 deletions

diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index cfd6eb6fcca4..52e605f5cdf2 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -6,7 +6,11 @@ AUX 1.10.11/dictd.initd 1984 BLAKE2B caae914f98ea3e8d6e6df9de8e72c70b39c1340f85f
 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-1.13.0-lex.patch 483 BLAKE2B 354204f57951b0870ed430754ef3ddb4a86296180d5b8fda9638074e225e1ca22b1f96e9e05bbf9394d8707138edea762d8eca66f1de791f82884e39830f0e18 SHA512 def5a8ffd8c7f5a0318d7f012ec49c5f9589f68e6a47472f5cfb31f04e0dd739635f78d5ee0ccadaa0970e0134d4a5a65bc0ac069e9036358983fdf6e43e1bd1
+AUX dictd-1.13.0-libtool.patch 1127 BLAKE2B 7d4a567378ed95d657ccb4ef8bcab398acd5c6e3ebe84b1420583c5149d77ebd19f60525710f2d4c30072662f7bf8d2c6878c640e55a40ca4cbee10e80ecabe1 SHA512 df15178fb32954fea341b6ed9298e7a4abcf78907fdbb5c30176d221ee14c4e6a3df51af18602bb7a6def485c0df8e88d4efd63dad2627e8d996b4fb126535fc
+AUX dictd-1.13.0-version.patch 1552 BLAKE2B 4feb49c424b42963fdde075a2afbb981a1ca222afa14f7be8000ce885c0a760e5374198d77eb20a18a77b7a8e1501bf2ddc65c622d4f13eb271f43cc72f9e59c SHA512 68215aeb6140e856e2b135c5a2052b17906e55fd94b9014eab8b15a4c8417d8fa1cbe41153847ea585558985765949549ee32d10e8e342c3cc13d3275d0d3f6f
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
 EBUILD dictd-1.13.0-r3.ebuild 3178 BLAKE2B 68a96bf2106fcb22f974480c172d88e960baacf71a24fb7b08c6eb43988394664c2a3ddcb6335b1e99f18143e5cd9e8fdbab15574f26cc67ce14af0a7473fe70 SHA512 970e137463c52938419c9147654da72ab91b604cd5548b449a61428b4c24b18c4f46aa70997c08397ceb3a682d8efd223e92f3f924e915ad1f6ccae47d417356
+EBUILD dictd-1.13.0-r5.ebuild 3292 BLAKE2B 097b24ef8962e2593cd4078920d411aeefb94585c3b20dbf39156c13fc5cf75c0882c0a7b4ed590e9af9c4ec0fb15a2a574df4d0777397299e2d56968a8cb07c SHA512 dc226a1dc87351381ea61080dc16cd8847bd46045b0502a9412c5dfc970bcf34e9235d40f354493da577ce1b631e397aa59cf1584934f50da742bd504a252f87
 MISC metadata.xml 485 BLAKE2B 93a8e21c6d8d2cd4660347b82669638689e4e0f15dcd8ee4323fcf7ec6faa65547449fd0c0f697e5793a566dc9413055998c92de568c6f00c9ee60973f28b6ff SHA512 9b028d0441c1753c77a9166e21cdd45bede983d877288092f5b52e6a610795360308889fc31e40a3b1c91a298d93bd3cfb957b34436a9a23ccc224f7207752a2
diff --git a/app-text/dictd/dictd-1.13.0-r5.ebuild b/app-text/dictd/dictd-1.13.0-r5.ebuild
new file mode 100644
index 000000000000..77f5dd081635
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.0-r5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd
+
+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"
+
+LICENSE="GPL-1+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="dbi judy minimal test"
+RESTRICT="!test? ( test )"
+
+# <gawk-3.1.6 makes tests fail.
+RDEPEND="
+	acct-group/dictd
+	acct-user/dictd
+	>=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
+	sys-devel/flex
+	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
+	"${FILESDIR}"/dictd-1.13.0-lex.patch
+	"${FILESDIR}"/dictd-1.13.0-libtool.patch # 818535
+	"${FILESDIR}"/dictd-1.13.0-version.patch # 852884
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+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() {
+	# -j1 for bug #743292
+
+	if use minimal; then
+		emake -j1 dictfmt dictzip dictzip
+	else
+		emake -j1
+	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" || die
+		chmod 770 "${WORKDIR}" "${S}/test" || die
+	fi
+
+	emake -j1 test
+}
+
+src_install() {
+	if use minimal; then
+		emake -j1 DESTDIR="${ED}" install.dictzip install.dict install.dictfmt
+	else
+		default
+
+		# Don't install rfc2229.txt because it is non-free
+		dodoc doc/{dicf.ms,rfc.ms,rfc.sh}
+		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
+}
+
+pkg_postinst() {
+	if has_version sys-apps/systemd; then
+		ewarn "The default location for dicts has changed! If you've modified your"
+		ewarn "systemd units locally to point into /usr/lib/dict, please update it"
+		ewarn "to point at /usr/share/dict now."
+	fi
+}
diff --git a/app-text/dictd/files/dictd-1.13.0-lex.patch b/app-text/dictd/files/dictd-1.13.0-lex.patch
new file mode 100644
index 000000000000..c69758c4805d
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-lex.patch
@@ -0,0 +1,28 @@
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 09:10:18 -0700
+Subject: [PATCH] build: Fix implicit function declarations
+
+--- a/clientparse.y
++++ b/clientparse.y
+@@ -24,6 +24,9 @@
+ #define YYERROR_VERBOSE
+ 
+ static dictServer *s;
++
++int yylex();
++void yyerror(const char *s);
+ %}
+ 
+ %union {
+--- a/servparse.y
++++ b/servparse.y
+@@ -30,6 +30,9 @@
+ 
+ static dictDatabase *db;
+ 
++int yylex();
++void yyerror(const char *s);
++
+ static int string2bool (const char *str)
+ {
+    if (
diff --git a/app-text/dictd/files/dictd-1.13.0-libtool.patch b/app-text/dictd/files/dictd-1.13.0-libtool.patch
new file mode 100644
index 000000000000..f687a182f60f
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-libtool.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/818535
+
+From: orbea <orbea@riseup.net>
+Date: Fri, 17 Jun 2022 16:18:40 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -28,6 +28,7 @@ endif
+ 
+ .SUFFIXES:	
+ 
++top_builddir=	@top_builddir@
+ srcdir=		@srcdir@
+ VPATH=		@srcdir@:.
+ prefix=		@prefix@
+--- a/configure.in
++++ b/configure.in
+@@ -35,6 +35,8 @@ AC_INIT([dict],[VERSION],[dict-beta@dict.org])
+ AC_CONFIG_SRCDIR([dictd.c])
+ AC_CONFIG_HEADER(config.h)
+ 
++LT_INIT
++
+ echo Configuring for dict
+ echo .
+ 
+@@ -70,13 +72,10 @@ echo Checking for programs
+ 
+ AC_PROG_AWK
+ AC_PROG_INSTALL
+-AC_PROG_RANLIB
+ AC_PROG_MAKE_SET
+ AC_PROG_YACC
+ AC_PROG_LEX
+ 
+-AC_CHECK_PROG(LIBTOOL,libtool,libtool)
+-
+ AC_CHECK_PROGS(NROFF,gnroff nroff)
+ AC_CHECK_PROGS(TROFF,groff troff)
+ AC_CHECK_PROGS(COL,col cat)
+@@ -188,7 +187,6 @@ AC_SUBST(DICT_VERSION)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+ AC_SUBST(allsubdirs)
+-AC_SUBST(LIBTOOL)
+ 
+ AC_SUBST(PLUGINS)
+ 
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -28,6 +28,7 @@ endif
+ 
+ .SUFFIXES:	
+ 
++top_builddir=	@top_builddir@
+ srcdir=		@srcdir@
+ VPATH=		@srcdir@
+ prefix=		@prefix@
diff --git a/app-text/dictd/files/dictd-1.13.0-version.patch b/app-text/dictd/files/dictd-1.13.0-version.patch
new file mode 100644
index 000000000000..fee60efe22da
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-version.patch
@@ -0,0 +1,65 @@
+https://bugs.gentoo.org/852884
+
+From: orbea <orbea@riseup.net>
+Date: Sat, 18 Jun 2022 10:00:21 -0700
+Subject: [PATCH] configure: Set version directly in AC_INIT
+
+This avoids a command not found error in config.status.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -20,7 +20,7 @@
+ 
+ # Add a _letter_ if you change the version number and release your own version.
+ # Numbers are for the original author(s) only.
+-DICT_VERSION=@DICT_VERSION@
++DICT_VERSION=@PACKAGE_VERSION@
+ 
+ ifneq (,)
+ This makefile requires GNU Make.
+--- a/configure.in
++++ b/configure.in
+@@ -23,14 +23,10 @@ dnl     CFLAGS and LDFLAGS should be settable on the make commandline
+ dnl             for optimization and stripping.
+ dnl     LIBOBJS is an automatically-generated list of extra objects we need
+ 
+-
+-define(VERSION, 1.13.0)
+-
+-
+ AC_PREREQ(2.53)
+ AC_REVISION($Revision: 1.144 $)
+ 
+-AC_INIT([dict],[VERSION],[dict-beta@dict.org])
++AC_INIT([dict],[1.13.0],[dict-beta@dict.org])
+ 
+ AC_CONFIG_SRCDIR([dictd.c])
+ AC_CONFIG_HEADER(config.h)
+@@ -40,8 +36,6 @@ LT_INIT
+ echo Configuring for dict
+ echo .
+ 
+-DICT_VERSION=VERSION
+-
+ AC_CANONICAL_HOST
+ 
+ AC_PROG_CC
+@@ -183,7 +177,6 @@ SBINDIR=`eval3 $sbindir`
+ LIBEXECDIR=`eval3 $libexecdir`
+ DATADIR=`eval3 $datadir`
+ 
+-AC_SUBST(DICT_VERSION)
+ AC_SUBST(USE_PLUGIN)
+ AC_SUBST(EXEEXT)
+ AC_SUBST(allsubdirs)
+--- a/dictdplugin-config.in
++++ b/dictdplugin-config.in
+@@ -24,7 +24,7 @@ while test $# -ne 0; do
+ 	    usage
+ 	    exit;;
+ 	--version)
+-	    echo @DICT_VERSION@
++	    echo @PACKAGE_VERSION@
+ 	    exit;;
+ 	--libs)
+ 	    echo -L@libdir@