gentoo resync : 23.09.2020

3 files changed, 11 insertions, 40 deletions

diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index 49e6fb9c1918..9f5487274e8d 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -9,6 +9,6 @@ AUX aide.cron 5997 BLAKE2B 2273eb902b9ba8fc5e999375d0dfa59e2c5c56a919bf3bd06e7b6
 AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce47326f41fd84880331a86ec71dcf7ee4e2ac2a11bf979ce66eff73dd2e8a2072e9eb7e8aab SHA512 a6bce52432251458b977fb363d5801206c273fb9404c55f7bcb82b9d5a65aa19d1660d61d457c9af87f1a8fada95e2f8203489b1876b2b2a259e6374e15cdc57
 DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc101f64767788eeac3a250ceb584a2c5958ef8a5481b89eeb720e21af07da8f3576fb46d8ee9966fd2361354a35a7eaa6e SHA512 f5f83b8401465471043c60aeb6314f7bcab24c9f962f6ce550445bec8d866a5c8c00eba9e9f157f1223cde58631de139533c7de64fb3c861a5d8e7b5e367e106
 DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
-EBUILD aide-0.16-r1.ebuild 3710 BLAKE2B 0be0b1ecc9c7bec42d475c2ccdf79b942572777af15addd5a524affd8dfd329f21ecb2b7fa18238270a9c67cf520127496056f6a7c3dba2682ca064024e3d8af SHA512 5acfa1daa419af465a3c1f2f305f4edddf38e095d18849565d7a41ba55a98c40d3f86bdf6888d48c9f05fd2d71a27086a3577bd78e9ef80947cfb0ebccc11b04
-EBUILD aide-0.16.2_p20200614.ebuild 4326 BLAKE2B bcd8d1f30b15da37fbf5eddacf177d81ad0468ade3a2772d8654df707a86b489193cea15a176be6559226f256d8722743de61d994b9232de90da021a402db7d9 SHA512 0bf37916431339fd506fb1a6cdc03de4bd45e1554e02752c8348898ed71e9bbbd9df6b6835e81d28d81c49b7dedeae098412c1de36a9ea7cbaceba1bf79282a8
+EBUILD aide-0.16-r1.ebuild 3217 BLAKE2B 584426773393f8bcf477bf01e8bc5a5e3bc4c2570dd7e2c7a6c1f1360a0e88c7db45c9bd5d79a6fe2bd95df172b99c7dab9adfc2f1f8ba94f28d94da83efd19b SHA512 2fcb2cedc8fd85654d00fb96ad66e009417e65cefa1d23f316993305389fd3f7bc49c7a5ba768cc97bfe9b39fde3ad47dfa8c159376954f23f5ce2d99dc35e14
+EBUILD aide-0.16.2_p20200614.ebuild 3831 BLAKE2B 237a0779d9b3274bb7a77b4b38cafc785e719c3f43ba5b5402ed9f65f85dd7f056e57a9b0be395f28960efe1206aa1e58a65fc995cb986539df52f60b41e1700 SHA512 495edc76f33905d2ec5feee96e562c6fa23abf92584e01e5b097e1ad3aeaaec3ab6f197c5fc1f7b2954aea8b7636f854cc8f650940ce64eec8d6622a005db540
 MISC metadata.xml 819 BLAKE2B ea807e78f806beaf63b28b99d5dd95054e247333612d35ea6004bf4720699d4c5a503ca893e0df172086935dd927c6e165410df74c51949108ee6d2fa5766af9 SHA512 22792dd087461ca8b147db6a03a5198127f19ea8473ce5691d9630e36655365a9dde4377f6d62e0457b65a634e23c0b2852db9dadc7d00c3fcec4a84e21b3054
diff --git a/app-forensics/aide/aide-0.16-r1.ebuild b/app-forensics/aide/aide-0.16-r1.ebuild
index 6f56d6e6be9c..56e81d587271 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 794fd0db7d74..92bf4b34c623 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)