gentoo auto-resync : 07:02:2023 - 03:23:23

2 files changed, 24 insertions, 22 deletions

diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index ff4f66bc2825..bb6a7e3493ec 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -5,6 +5,7 @@ AUX aide.conf-r2 3277 BLAKE2B 9792a13c590d9c72d94f1a24ef700c4ff77f3c672fd3e67589
 AUX aide.cron-r2 5681 BLAKE2B 517f7a0a01bb6eb104d6f758191990c4da518fd15af9f88a5521e4b958d558ddb84d0fa9c7b089a62f8b11cd8b2df52c138f49d6b4f276eab2f70a0262f6d5f0 SHA512 104e7025f193d2e2cf93d18a52d66059c7a539d7d2c6f3f514f2cca4252260e1668cf18c6acfaf5069038a9f97f0052a38ea32fb75c0af7e2b2920a819e96922
 AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce47326f41fd84880331a86ec71dcf7ee4e2ac2a11bf979ce66eff73dd2e8a2072e9eb7e8aab SHA512 a6bce52432251458b977fb363d5801206c273fb9404c55f7bcb82b9d5a65aa19d1660d61d457c9af87f1a8fada95e2f8203489b1876b2b2a259e6374e15cdc57
 DIST aide-0.17.4.tar.gz 331783 BLAKE2B 584a385d0a0e80edf0b89eef202431adfea7fe8ba04c774e49dfb7230e766e19a48572e9d6c80386668572e459db9770b04978df484bd49c7de6433657500e13 SHA512 b6dba54fd204e1899d47b0b4139786cbeaa51c388027e2cfc1bb839297a70ae8ad6f37429594a730fac8007d62b4ba5b61a4aa22edbc55cbe986ccfaf5197f31
-EBUILD aide-0.17.4-r2.ebuild 2532 BLAKE2B 9d02b8517ae88aa70b12666fce8b954e640af0d9fd1624d66fdcb8f79cf9db3edabfc73e42a3690d020f0fa1a6ea170d86ac6f4ef7735b9d3ee4fa800edaf637 SHA512 875abd09af1bebc2a25c652667b8f1b0f21f8f78fbabbc65842f9680723714327031cdc28034fe15e48c65fb9237965d7daf3d1c5d2b5a3e6921eacff628263d
+DIST aide-0.18.tar.gz 375922 BLAKE2B 03c961682fd25581831ca0715e57546b5595057115a456778ac0846fd1f23622600a061e2d8524f7381dfa6d43cefcdaa52d00eed2639dd60c7f3501efe8b474 SHA512 99d8140523ebe1d80b5d73c20bf13b8559aa22f08a9df485c15daeba7f5448c27d86ed310f2e7963076958dbe1fc2e4636807ca073dd0a6568b4eb8af2a38f4b
 EBUILD aide-0.17.4-r4.ebuild 2515 BLAKE2B 202941531fa273db05abc704a617313c993a9fbbd66f8af26505ea11b227258e922e0be9e508ed99cc4557af3ee9827355e6eee309411c8119209a811cf864e2 SHA512 66281a42979112dc1719c4c1f3f57b77ffc1a8a8038fd17bfdb452817e64835ae7833f1cbaa2d7c4a2c563a568a1861257aca1e26f069261a7f390ee5dcc3888
+EBUILD aide-0.18.ebuild 2373 BLAKE2B cbe9420df3f870c12f079792cc717486c85ddf66169d511e565e9e91b12ba1c63267c2bab983201168fc942534b4f7cc3afb1750314b152405f28aa7b555eb26 SHA512 5f06e1e3ca2a3595e1fd8e15a2c14a6b5b3c2eb3752f0a5f7e34863c705e9fb53967c354563119d79f48caf63ddeac06920799f629de08335b4cb3b37713a966
 MISC metadata.xml 567 BLAKE2B a3b852325f904e2fbf4a95b67a49ba259583e78f01194bb2dd79851cbd77bd35b5bc786e74c72892adf264471a9a93ae609611252f7e2f1a630dbe1463a80b33 SHA512 c7e14ed38ffa394bd611cb831e509a5f8897c6d394bc78b6ae5074141188ca7bb8aa9efe425930c6db5fade44505fc60f212b0e86bf187622ac8c7443e7a5272
diff --git a/app-forensics/aide/aide-0.17.4-r2.ebuild b/app-forensics/aide/aide-0.18.ebuild
index 3d53fb0f79ba..7378603a57e9 100644
--- a/app-forensics/aide/aide-0.17.4-r2.ebuild
+++ b/app-forensics/aide/aide-0.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools readme.gentoo-r1
+inherit readme.gentoo-r1
 
 DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
 HOMEPAGE="https://aide.github.io/ https://github.com/aide/aide"
@@ -11,27 +11,33 @@ SRC_URI="https://github.com/aide/aide/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="acl audit curl e2fs mhash selinux xattr zlib"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="acl audit curl e2fs mhash selinux xattr"
 
-DEPEND="dev-libs/libpcre
+DEPEND="
+	dev-libs/libpcre2
+	sys-libs/zlib
 	acl? ( virtual/acl )
 	audit? ( sys-process/audit )
 	curl? ( net-misc/curl )
 	e2fs? ( sys-fs/e2fsprogs )
 	!mhash? (
-		dev-libs/libgcrypt:0=
+		dev-libs/libgcrypt:=
 		dev-libs/libgpg-error
 	)
 	mhash? ( app-crypt/mhash )
 	selinux? ( sys-libs/libselinux )
 	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-aide )"
-BDEPEND="sys-devel/bison
+"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-aide )
+"
+BDEPEND="
+	sys-devel/bison
 	sys-devel/flex
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DISABLE_AUTOFORMATTING=1
 DOC_CONTENTS="
@@ -42,11 +48,6 @@ for more information.
 A helper script, aideinit, was installed and can be used to make AIDE
 management easier. Please run 'aideinit --help' for more information."
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.16-fix-acl-configure-option.patch
-	"${FILESDIR}"/${PN}-0.17.4-bashism.patch
-)
-
 src_prepare() {
 	default
 
@@ -56,12 +57,13 @@ src_prepare() {
 	if [[ ${PV} == *_p* ]] ; then
 		echo "m4_define([AIDE_VERSION], [${PV}])" > version.m4 || die
 	fi
-
-	# Can be dropped once Bashism patch is gone
-	eautoreconf
 }
 
 src_configure() {
+	# Needs Bison, flex
+	unset YACC
+	export LEX=flex
+
 	local myeconfargs=(
 		--sysconfdir="${EPREFIX}"/etc/${PN}
 
@@ -72,8 +74,7 @@ src_configure() {
 		# This doesn't affect anything because there are no localizations yet.
 		--without-locale
 
-		--without-prelink
-		$(use_with zlib)
+		--with-zlib
 		$(use_with curl)
 		$(use_with acl posix-acl)
 		$(use_with selinux)