| 1 |
commit: 5f4e15d766417cd8b494ae1fa948562fb0b0289f |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 14 23:29:58 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 14 23:29:58 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f4e15d7 |
| 7 |
|
| 8 |
app-text/dictd: Fix MissingTestRestrict |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
app-text/dictd/dictd-1.12.1-r2.ebuild | 5 +++-- |
| 14 |
app-text/dictd/dictd-1.13.0.ebuild | 13 +++++++------ |
| 15 |
2 files changed, 10 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-text/dictd/dictd-1.12.1-r2.ebuild b/app-text/dictd/dictd-1.12.1-r2.ebuild |
| 18 |
index 4da9d8dbf3a..4feb9c4a5c7 100644 |
| 19 |
--- a/app-text/dictd/dictd-1.12.1-r2.ebuild |
| 20 |
+++ b/app-text/dictd/dictd-1.12.1-r2.ebuild |
| 21 |
@@ -13,6 +13,7 @@ SLOT="0" |
| 22 |
LICENSE="GPL-2 ISOC-rfc" |
| 23 |
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" |
| 24 |
IUSE="dbi judy minimal test" |
| 25 |
+RESTRICT="!test? ( test )" |
| 26 |
|
| 27 |
# <gawk-3.1.6 makes tests fail. |
| 28 |
RDEPEND=" |
| 29 |
@@ -78,9 +79,9 @@ src_test() { |
| 30 |
|
| 31 |
src_install() { |
| 32 |
if use minimal; then |
| 33 |
- emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt |
| 34 |
+ emake DESTDIR="${ED}" install.dictzip install.dict install.dictfmt |
| 35 |
else |
| 36 |
- emake DESTDIR="${D}" install |
| 37 |
+ emake DESTDIR="${ED}" install |
| 38 |
|
| 39 |
dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt} |
| 40 |
dodoc doc/{security.doc,toc.ms} |
| 41 |
|
| 42 |
diff --git a/app-text/dictd/dictd-1.13.0.ebuild b/app-text/dictd/dictd-1.13.0.ebuild |
| 43 |
index 6f994838112..79c14217587 100644 |
| 44 |
--- a/app-text/dictd/dictd-1.13.0.ebuild |
| 45 |
+++ b/app-text/dictd/dictd-1.13.0.ebuild |
| 46 |
@@ -2,6 +2,7 @@ |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
|
| 49 |
EAPI=7 |
| 50 |
+ |
| 51 |
inherit readme.gentoo-r1 systemd user |
| 52 |
|
| 53 |
DESCRIPTION="Dictionary Client/Server for the DICT protocol" |
| 54 |
@@ -13,6 +14,7 @@ SLOT="0" |
| 55 |
LICENSE="GPL-2 ISOC-rfc" |
| 56 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" |
| 57 |
IUSE="dbi judy minimal test" |
| 58 |
+RESTRICT="!test? ( test )" |
| 59 |
|
| 60 |
# <gawk-3.1.6 makes tests fail. |
| 61 |
RDEPEND=" |
| 62 |
@@ -22,9 +24,7 @@ RDEPEND=" |
| 63 |
dbi? ( dev-db/libdbi ) |
| 64 |
judy? ( dev-libs/judy ) |
| 65 |
" |
| 66 |
-DEPEND=" |
| 67 |
- ${RDEPEND} |
| 68 |
-" |
| 69 |
+DEPEND="${RDEPEND}" |
| 70 |
BDEPEND=" |
| 71 |
>=sys-apps/gawk-3.1.6 |
| 72 |
virtual/yacc |
| 73 |
@@ -39,6 +39,7 @@ DOC_CONTENTS=" |
| 74 |
\nIf you are running systemd, you will need to review the instructions |
| 75 |
explained in /etc/dict/dictd.conf comments. |
| 76 |
" |
| 77 |
+ |
| 78 |
PATCHES=( |
| 79 |
"${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch |
| 80 |
"${FILESDIR}"/dictd-1.12.0-build.patch |
| 81 |
@@ -78,15 +79,15 @@ src_test() { |
| 82 |
if [[ ${EUID} -eq 0 ]]; then |
| 83 |
# If dictd is run as root user (-userpriv) it drops its privileges to |
| 84 |
# dictd user and group. Give dictd group write access to test directory. |
| 85 |
- chown :dictd "${WORKDIR}" "${S}/test" |
| 86 |
- chmod 770 "${WORKDIR}" "${S}/test" |
| 87 |
+ chown :dictd "${WORKDIR}" "${S}/test" || die |
| 88 |
+ chmod 770 "${WORKDIR}" "${S}/test" || die |
| 89 |
fi |
| 90 |
emake test |
| 91 |
} |
| 92 |
|
| 93 |
src_install() { |
| 94 |
if use minimal; then |
| 95 |
- emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt |
| 96 |
+ emake DESTDIR="${ED}" install.dictzip install.dict install.dictfmt |
| 97 |
else |
| 98 |
default |
Archives