* [gentoo-commits] repo/gentoo:master commit in: app-text/dictd/, app-text/dictd/files/
@ 2022-06-17 23:45 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-06-17 23:45 UTC (permalink / raw
To: gentoo-commits
commit: c560e10dafb0b60bc0a7a8cf2619e6c634aee2ee
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Jun 17 23:30:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 17 23:44:54 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c560e10d
app-text/dictd: Fix the build with rlibtool
The configure.in lacks LT_INIT which generates libtool and allows the
build to work with rlibtool which depends on this file to determine if
it should build shared or static libraries.
Closes: https://bugs.gentoo.org/818535
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/25948
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/dictd/dictd-1.13.0-r4.ebuild | 123 ++++++++++++++++++++++++
app-text/dictd/files/dictd-1.13.0-libtool.patch | 56 +++++++++++
2 files changed, 179 insertions(+)
diff --git a/app-text/dictd/dictd-1.13.0-r4.ebuild b/app-text/dictd/dictd-1.13.0-r4.ebuild
new file mode 100644
index 000000000000..a8aafc51843e
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.0-r4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 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-libtool.patch # 818535
+)
+
+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() {
+ 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" || die
+ chmod 770 "${WORKDIR}" "${S}/test" || die
+ fi
+ emake test
+}
+
+src_install() {
+ if use minimal; then
+ emake 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-libtool.patch b/app-text/dictd/files/dictd-1.13.0-libtool.patch
new file mode 100644
index 000000000000..808e72163c37
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.0-libtool.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/818535
+
+From ab4c1542d8103ef2a8dcfd8cc1ad624890258090 Mon Sep 17 00:00:00 2001
+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 .
+
+@@ -45,7 +47,7 @@ AC_CANONICAL_HOST
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_CXX
+-
++AC_PROG_LIBTOOL
+ AC_ISC_POSIX
+
+ REALCC="$CC"
+@@ -75,8 +77,6 @@ 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)
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -28,6 +28,7 @@ endif
+
+ .SUFFIXES:
+
++top_builddir= @top_builddir@
+ srcdir= @srcdir@
+ VPATH= @srcdir@
+ prefix= @prefix@
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/dictd/, app-text/dictd/files/
@ 2023-10-09 0:23 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-10-09 0:23 UTC (permalink / raw
To: gentoo-commits
commit: 1f891cc76e1580f4ce3fd09a3e2b121f278e1ff3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 9 00:05:43 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 9 00:22:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f891cc7
app-text/dictd: add 1.13.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-text/dictd/Manifest | 1 +
app-text/dictd/dictd-1.13.1.ebuild | 130 ++++++++++++++++++++++++
app-text/dictd/files/dictd-1.13.1-version.patch | 65 ++++++++++++
3 files changed, 196 insertions(+)
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 875e659dd7c0..5f213c8909a8 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -1 +1,2 @@
DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
+DIST dictd-1.13.1.tar.gz 395619 BLAKE2B 83caad8570e752575bf5fe39a41e4a7d564f3a255d4e4cb234661a56ed645dfb155bef8a89d4ecfebfefb2f03d4ab808c00f1c4eacaae883761e28817138526b SHA512 31a2e67feaa672e773b86d16ecb9f41fdcd2d5f907759cc110261af30147b3972a2c7d742b4d61b67eb3b8c84c08e179106b9a30e998a425c9b437ec933b03ea
diff --git a/app-text/dictd/dictd-1.13.1.ebuild b/app-text/dictd/dictd-1.13.1.ebuild
new file mode 100644
index 000000000000..80aabe281512
--- /dev/null
+++ b/app-text/dictd/dictd-1.13.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+IUSE="dbi judy minimal selinux test"
+RESTRICT="!test? ( test )"
+
+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}"
+# <gawk-3.1.6 makes tests fail.
+BDEPEND="
+ >=sys-apps/gawk-3.1.6
+ sys-devel/flex
+ app-alternatives/yacc
+"
+RDEPEND+=" selinux? ( sec-policy/selinux-dictd )"
+
+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 # bug #818535
+ "${FILESDIR}"/dictd-1.13.1-version.patch # bug #852884
+ "${FILESDIR}"/dictd-1.13.0-stack-smashing.patch # bug #908998
+)
+
+src_prepare() {
+ default
+
+ sed -i -e 's:configure.in:configure.ac:' Makefile.in || die
+ 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.1-version.patch b/app-text/dictd/files/dictd-1.13.1-version.patch
new file mode 100644
index 000000000000..c0ef4f1f594e
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.13.1-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.1)
+-
+-
+ AC_PREREQ(2.53)
+ AC_REVISION($Revision: 1.144 $)
+
+-AC_INIT([dict],[VERSION],[dict-beta@dict.org])
++AC_INIT([dict],[1.13.1],[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@
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/dictd/, app-text/dictd/files/
@ 2025-09-16 13:32 Petr Vaněk
0 siblings, 0 replies; 3+ messages in thread
From: Petr Vaněk @ 2025-09-16 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 79290f25a8bab787fc7fc08670b2f5a0b89a93d5
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 16 13:24:51 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Tue Sep 16 13:31:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79290f25
app-text/dictd: drop 1.13.1
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
app-text/dictd/Manifest | 1 -
app-text/dictd/dictd-1.13.1.ebuild | 131 ------------------------
app-text/dictd/files/dictd-1.13.0-lex.patch | 28 -----
app-text/dictd/files/dictd-1.13.0-libtool.patch | 59 -----------
app-text/dictd/files/dictd-1.13.1-version.patch | 65 ------------
5 files changed, 284 deletions(-)
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 6d9e4b666c9e..40a596414f68 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -1,2 +1 @@
-DIST dictd-1.13.1.tar.gz 395619 BLAKE2B 83caad8570e752575bf5fe39a41e4a7d564f3a255d4e4cb234661a56ed645dfb155bef8a89d4ecfebfefb2f03d4ab808c00f1c4eacaae883761e28817138526b SHA512 31a2e67feaa672e773b86d16ecb9f41fdcd2d5f907759cc110261af30147b3972a2c7d742b4d61b67eb3b8c84c08e179106b9a30e998a425c9b437ec933b03ea
DIST dictd-1.13.3.tar.gz 390047 BLAKE2B e7d27672c9e8770a062a0dfae2c8b011b57b906477eeb779a6a3104018b50c20edf6d951a5e2561489cf86ab14f52eff80fb3aa6ce39d4da1e3008820ce57968 SHA512 41091fa3c9ae5d9b6139ea765d20f1f9f801e25e97ffb5aba6bb7e9fbddb4c2b2018d25092b341af430a80c6051db1e35a9d93d5ee8f97760006053ed30f4d58
diff --git a/app-text/dictd/dictd-1.13.1.ebuild b/app-text/dictd/dictd-1.13.1.ebuild
deleted file mode 100644
index e91bce3e58e1..000000000000
--- a/app-text/dictd/dictd-1.13.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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="https://downloads.sourceforge.net/dict/${P}.tar.gz"
-
-LICENSE="GPL-1+ GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="dbi judy minimal selinux test"
-RESTRICT="!test? ( test )"
-
-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}"
-# <gawk-3.1.6 makes tests fail.
-BDEPEND="
- >=sys-apps/gawk-3.1.6
- app-alternatives/lex
- app-alternatives/yacc
-"
-RDEPEND+=" selinux? ( sec-policy/selinux-dictd )"
-
-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 # bug #818535
- "${FILESDIR}"/dictd-1.13.1-version.patch # bug #852884
- "${FILESDIR}"/dictd-1.13.0-stack-smashing.patch # bug #908998
-)
-
-src_prepare() {
- default
-
- sed -i -e 's:configure.in:configure.ac:' Makefile.in || die
- 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() {
- readme.gentoo_print_elog
- 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
deleted file mode 100644
index c69758c4805d..000000000000
--- a/app-text/dictd/files/dictd-1.13.0-lex.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index f687a182f60f..000000000000
--- a/app-text/dictd/files/dictd-1.13.0-libtool.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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.1-version.patch b/app-text/dictd/files/dictd-1.13.1-version.patch
deleted file mode 100644
index c0ef4f1f594e..000000000000
--- a/app-text/dictd/files/dictd-1.13.1-version.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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.1)
--
--
- AC_PREREQ(2.53)
- AC_REVISION($Revision: 1.144 $)
-
--AC_INIT([dict],[VERSION],[dict-beta@dict.org])
-+AC_INIT([dict],[1.13.1],[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@
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-09-16 13:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-17 23:45 [gentoo-commits] repo/gentoo:master commit in: app-text/dictd/, app-text/dictd/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-10-09 0:23 Sam James
2025-09-16 13:32 Petr Vaněk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox