From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A45AE13835B for ; Fri, 26 Mar 2021 15:55:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9343E0849; Fri, 26 Mar 2021 15:55:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9279E0844 for ; Fri, 26 Mar 2021 15:55:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A583F335D60 for ; Fri, 26 Mar 2021 15:55:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 36412637 for ; Fri, 26 Mar 2021 15:55:01 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1616774092.c649f015a4ce38f29dd9a109cce3a68bb2b61da4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/ulogd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/ulogd/ulogd-2.0.7-r2.ebuild X-VCS-Directories: app-admin/ulogd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c649f015a4ce38f29dd9a109cce3a68bb2b61da4 X-VCS-Branch: master Date: Fri, 26 Mar 2021 15:55:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 03d961bc-0056-4389-ad76-1cc3b9c44d7b X-Archives-Hash: 0495552040907a07a7aa9562dac474da commit: c649f015a4ce38f29dd9a109cce3a68bb2b61da4 Author: Sam James gentoo org> AuthorDate: Fri Mar 26 15:49:42 2021 +0000 Commit: Sam James gentoo 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 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