[gentoo-commits] repo/gentoo:master commit in: app-forensics/aide/

["Mikle Kolyada" <zlogene@gentoo.org>]

commit:     d54182448a57c38c7a2abfcb72f9391a8c334799
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 15:47:20 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> 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 <zlogene <AT> 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)