commit: c649f015a4ce38f29dd9a109cce3a68bb2b61da4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 26 15:49:42 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 26 15:54:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c649f015
app-admin/ulogd: misc fixups post merge (BDEPEND primarily)
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/ulogd/ulogd-2.0.7-r2.ebuild | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/app-admin/ulogd/ulogd-2.0.7-r2.ebuild
b/app-admin/ulogd/ulogd-2.0.7-r2.ebuild
index 0ff372b22af..60719dfcd00 100644
--- a/app-admin/ulogd/ulogd-2.0.7-r2.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.7-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres selinux sqlite ulog"
-COMMON_DEPEND="
+DEPEND="
|| ( net-firewall/iptables net-firewall/nftables )
>=net-libs/libnfnetlink-1.0.1
dbi? ( dev-db/libdbi )
@@ -30,21 +30,20 @@ COMMON_DEPEND="
postgres? ( dev-db/postgresql:= )
sqlite? ( dev-db/sqlite:3 )
"
-
-DEPEND="${COMMON_DEPEND}
+RDEPEND="
+ ${DEPEND}
acct-user/ulogd
acct-group/ulogd
- doc? (
- app-text/linuxdoc-tools
- app-text/texlive-core
- dev-texlive/texlive-fontsrecommended
- virtual/latex-base
- )
-"
-
-RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-ulogd )
"
+BDEPEND="
+ doc? (
+ app-text/linuxdoc-tools
+ app-text/texlive-core
+ dev-texlive/texlive-fontsrecommended
+ virtual/latex-base
+ )
+"
DISABLE_AUTOFORMATTING=1
DOC_CONTENTS="
@@ -68,7 +67,7 @@ pkg_setup() {
}
src_prepare() {
- default_src_prepare
+ default
# Change default settings to:
# - keep log files in /var/log/ulogd instead of /var/log;
@@ -110,7 +109,7 @@ src_install() {
use doc && HTML_DOCS=( doc/${PN}.html )
default_src_install
- find "${D}" -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
readme.gentoo_create_doc
doman ${PN}.8
