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 19141138359 for ; Sun, 20 Sep 2020 15:58:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F66FE0909; Sun, 20 Sep 2020 15:58:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 11932E0909 for ; Sun, 20 Sep 2020 15:58:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B38C3340D41 for ; Sun, 20 Sep 2020 15:58:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28F672EE for ; Sun, 20 Sep 2020 15:58:36 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1600617475.d54182448a57c38c7a2abfcb72f9391a8c334799.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-forensics/aide/aide-0.16-r1.ebuild app-forensics/aide/aide-0.16.2_p20200614.ebuild X-VCS-Directories: app-forensics/aide/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: d54182448a57c38c7a2abfcb72f9391a8c334799 X-VCS-Branch: master Date: Sun, 20 Sep 2020 15:58:36 +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: 99a586aa-612a-4cb6-9ff7-9631a7f1afe7 X-Archives-Hash: 34d590f7ba892a4d246f8a1212989864 commit: d54182448a57c38c7a2abfcb72f9391a8c334799 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Sep 20 15:47:20 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sun Sep 20 15:57:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5418244 app-forensics/aide: Disable static builds Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Mikle Kolyada gentoo.org> app-forensics/aide/aide-0.16-r1.ebuild | 23 ++++------------------- app-forensics/aide/aide-0.16.2_p20200614.ebuild | 24 +++++------------------- 2 files changed, 9 insertions(+), 38 deletions(-) diff --git a/app-forensics/aide/aide-0.16-r1.ebuild b/app-forensics/aide/aide-0.16-r1.ebuild index 6f56d6e6be9..56e81d58727 100644 --- a/app-forensics/aide/aide-0.16-r1.ebuild +++ b/app-forensics/aide/aide-0.16-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/aide/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="acl audit curl e2fs mhash postgres prelink selinux static xattr zlib" +IUSE="acl audit curl e2fs mhash postgres prelink selinux xattr zlib" COMMON_DEPEND=" !mhash? ( @@ -32,7 +32,7 @@ COMMON_DEPEND=" zlib? ( sys-libs/zlib ) " RDEPEND=" - !static? ( ${COMMON_DEPEND} ) + ${COMMON_DEPEND} prelink? ( sys-devel/prelink ) selinux? ( sec-policy/selinux-aide ) " @@ -40,25 +40,10 @@ DEPEND="${COMMON_DEPEND} sys-devel/bison sys-devel/flex virtual/pkgconfig - static? ( - !mhash? ( - dev-libs/libgcrypt:0[static-libs] - dev-libs/libgpg-error[static-libs] - ) - mhash? ( app-crypt/mhash[static-libs] ) - dev-libs/libpcre[static-libs] - acl? ( virtual/acl[static-libs] ) - e2fs? ( sys-fs/e2fsprogs[static-libs] ) - prelink? ( dev-libs/elfutils[static-libs] ) - selinux? ( sys-libs/libselinux[static-libs] ) - xattr? ( sys-apps/attr[static-libs] ) - zlib? ( sys-libs/zlib[static-libs] ) - ) " REQUIRED_USE=" postgres? ( !mhash ) - static? ( !audit !curl !postgres ) " HTML_DOCS=( doc/manual.html ) @@ -94,7 +79,7 @@ src_configure() { # Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/ # This doesn't affect anything because there are no localizations yet. --without-locale - $(use_enable static) + --disable-static $(use_with zlib) $(use_with curl) $(use_with acl posix-acl) diff --git a/app-forensics/aide/aide-0.16.2_p20200614.ebuild b/app-forensics/aide/aide-0.16.2_p20200614.ebuild index 794fd0db7d7..92bf4b34c62 100644 --- a/app-forensics/aide/aide-0.16.2_p20200614.ebuild +++ b/app-forensics/aide/aide-0.16.2_p20200614.ebuild @@ -14,11 +14,11 @@ SRC_URI="https://github.com/aide/aide/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="acl audit curl e2fs mhash postgres prelink selinux static xattr zlib" +IUSE="acl audit curl e2fs mhash postgres prelink selinux xattr zlib" REQUIRED_USE=" postgres? ( !mhash ) - static? ( !audit !curl !postgres )" + " COMMON_DEPEND=" dev-libs/libpcre @@ -38,24 +38,10 @@ COMMON_DEPEND=" zlib? ( sys-libs/zlib )" RDEPEND=" - !static? ( ${COMMON_DEPEND} ) + ${COMMON_DEPEND} selinux? ( sec-policy/selinux-aide )" -DEPEND="${COMMON_DEPEND} - static? ( - dev-libs/libpcre[static-libs] - acl? ( >=virtual/acl-0-r1[static-libs] ) - e2fs? ( sys-fs/e2fsprogs[static-libs] ) - !mhash? ( - dev-libs/libgcrypt:0[static-libs] - dev-libs/libgpg-error[static-libs] - ) - mhash? ( app-crypt/mhash[static-libs] ) - prelink? ( dev-libs/elfutils[static-libs] ) - selinux? ( sys-libs/libselinux[static-libs] ) - xattr? ( sys-apps/attr[static-libs] ) - zlib? ( sys-libs/zlib[static-libs] ) - )" +DEPEND="${COMMON_DEPEND}" BDEPEND=" sys-devel/bison @@ -110,7 +96,7 @@ src_configure() { # Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/ # This doesn't affect anything because there are no localizations yet. --without-locale - $(use_enable static) + --disable-static $(use_with zlib) $(use_with curl) $(use_with acl posix-acl)