gentoo resync : 04.05.2021

14 files changed, 114 insertions, 333 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index f4182d3c401c..84cddb3cd9ed 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/afflib/Manifest b/app-forensics/afflib/Manifest
index 1dba9d36f230..8a749a47940b 100644
--- a/app-forensics/afflib/Manifest
+++ b/app-forensics/afflib/Manifest
@@ -1,4 +1,4 @@
 AUX afflib-3.7.19-search-path.patch 1132 BLAKE2B 8314c7591277658c704f0e82105ecb2af7e70761aaab1e9329aa72f400a4b3774e2ba3ccc6e271b4a1be78b0935cbac058acb3e5dbc8e16123e9d3f21b4ef018 SHA512 80551435c89a7dbacfbce5c9d73a47e89d31600511abffab9a8235b60b0b398bc26d10a144676c99e5f11b680a994a2ffc8eab3409a332f708f5cdd5782985fb
 DIST afflib-3.7.19.tar.gz 540165 BLAKE2B dea0998741121d2c1ae0e42ced9652ec46816282128469af75e0a32f9e4e2d09ac4afb4888ee7925366a03a867932f2446bfcd3800ab4dc021939ab6c38c797b SHA512 6e0df7477bf7dbd3814099d94e3fce122e0cf9b714a425521b7458f4eedc6e8b8e7283fd37926b7c992cdf21d3adec620df29a79a6a5311bf1d1b5d4930768bc
-EBUILD afflib-3.7.19.ebuild 1676 BLAKE2B 3d5f0d99111c758cff46c519b1449b34d80202450a0efd853e5bc0a3a4e35a7585afc5910e1ee7efdfdbaae7cf1475415120983d8ee03c5e5427918b94197076 SHA512 8ffaeb4d59489d74d1d1e91b0a21de63f55edcdaf48864c2592c7b48a0f019315125be492bc588531ba8946556444d544dbf807a7cb36151a7f16bbb17f43673
+EBUILD afflib-3.7.19.ebuild 1617 BLAKE2B 6c0235a91a60aebd4702f3cadaf469fc6ed4ab24f978713a2dcf7f760844a6edbfedc3f7039406d0fe9e02576d97273d6c0af9a9c8ef2ffe3989f2d8e3bcb8c0 SHA512 429a1fd7f7c98df71b34df5c7e22bb7ed983b1032cdb0d8c0d41d9e6d31fafcb1ef38de116443715ed05e256d3b978f7590913ed7b177c1dfc7425df4a725d9c
 MISC metadata.xml 429 BLAKE2B 64f4ca1a2220e6b7dedc1b9886c271e2cdc96013d63f2262ae7510f5189ec69fefc0b616dbe94d4cd21cf9cef13809ebec12c99e18415fb97691dec08a8da04f SHA512 172d0b4a9759b0bd5153e1cecf1a2c1b3f0927528fbc76941fe19c77f6960455628af22823c81b156b8575cacfe58d525950bafcdb31aca752752274ec989191
diff --git a/app-forensics/afflib/afflib-3.7.19.ebuild b/app-forensics/afflib/afflib-3.7.19.ebuild
index 8f02ebfba0ea..a9cfa61c34b8 100644
--- a/app-forensics/afflib/afflib-3.7.19.ebuild
+++ b/app-forensics/afflib/afflib-3.7.19.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ppc x86 ~x64-macos"
-IUSE="fuse libressl ncurses python qemu readline s3 static-libs threads"
+IUSE="fuse ncurses python qemu readline s3 static-libs threads"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # Tests don't play well with sandbox
 RESTRICT="test"
@@ -27,8 +27,7 @@ RDEPEND="
 	dev-libs/expat
 	sys-libs/zlib:0=
 	fuse? ( sys-fs/fuse:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:0=
 	ncurses? ( sys-libs/ncurses:0= )
 	python? (
 		${PYTHON_DEPS}
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index dc487d798031..25a2f1275e75 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,14 +1,9 @@
-AUX aide-0.16-add-missing-include.patch 512 BLAKE2B c3c25bbad549f8d2864b4ce91f33ee424ba4e64d40c967be23721324f017642557319d12aea980930882a10dbc39c17b0359de31e5cf5b7a1f9ef6a0b6088148 SHA512 084be3c787a19f57bf140cd809df61edfd16a8798a1344adeee0aba0f4207c1e4a9c47c4c6d7606650e20cc202747208c0f0c00c21c0b68e1b739fb9d269da68
 AUX aide-0.16-fix-LIBS-LDFLAGS-mixing.patch 874 BLAKE2B e61f6b269dcc3679d68714c315cfff8e8feb4146028abc33e780cb7429c4466c78b7e50c427fb78ffdc310335450a012f7a08b6ecd5aaf562b8ab18565c5f927 SHA512 930967c1c7be54d10beb26e4281083a0f7cf500a5f161cf2af6c0a7b377e9bce092942a3a88c6cbb080e3eab500ec8a7bec1ff295f774ef70146240837961a8f
 AUX aide-0.16-fix-acl-configure-option.patch 728 BLAKE2B a4edf60d7ffbae5f624645dd48f6cce0da6bd228d2b8aa04b08b1a2270fb9fb420175270a694ea225b2ccca6a1e4524001b042e12eb671b9758653c83893a7ee SHA512 65b93cd01ebfe6696e35872bc012126794e5e1e5756c2ce041d9a914722806f6079274b0fbb64bc795488f530c33106deba204ee2982a5a8d485b7cd88382497
-AUX aide-0.16-support-attr-2.4.48.patch 907 BLAKE2B 9d5c2c13a59c8ea1489e5353a2715926b7c0de2292050de166ea7959955a733487d68d047c23382370ccf2e91ea25dd5e4ffc6c55f47768e58da25775843133b SHA512 ea12a1aadc8ac8720dd5495318a0706f720422cdd0a7e7f6d794db4291b9a735468b7a1783922a1e489b738436a5d6e324d3ec66dc40b9b2b09d08ce4b3409e0
 AUX aide-0.16.2_p20200614_define_hash_use_gcrypt.patch 1174 BLAKE2B 694c7859a43f814f1b9ab18c0e0fa458bdbc6ebc0fb1d076cf51839cf48c341f13b84ae08c2ef419a62b53ffe12879fa2b230f546e57c89a5816fd4d2bff902b SHA512 ec31e674141feb03fbe4eb94c82f2c7b366bd31c4d845818650303c7e971ff9c814de8112c818da9de78bb32ca087f75ff313f35d18301775915ecc8b9975e52
-AUX aide.conf 2713 BLAKE2B c6868a81450bb3e66d73a60df258e0c6e1166fb0126a0664cf78db021fb4c32049d92032f8ba92b0c08b58e0267ccafcc6e948daed69a856db2703991776f977 SHA512 cf6c17ab40b0bf9a0fb21ce015c6c35a8f7a595fdeb7d67e793424ed5243660a56cb33c1169038f4b116463cb055a48232f33db8ed497181be4e084449632b28
 AUX aide.conf-r1 3194 BLAKE2B a911d5623adb4122cae21494c5e7542adbfa787bda78f840e1385219adfec19c5a3079b34e16f2c8e9afbe8554b6fc2ae291f7bdd1728b8ac77c7b16135260ae SHA512 24f6af48767e4edd69c4b806c418501583f03574f05bbf87e98659ba36b64acf8e95a772ce690175071127910248a9c6761392ca889cfee235a475341d3a7a77
 AUX aide.cron 5997 BLAKE2B 2273eb902b9ba8fc5e999375d0dfa59e2c5c56a919bf3bd06e7b638213332b34c4a1240c717c2189f787dc249847f7115e2a21ac139b5db1df2151ade9f5a154 SHA512 0931c1b9185e0b9a563c3589858b0ba20716344f29d6d1fc7226498f3c744af1d3c3fd72824f101f9b3e08710f443c9fdad312e28c0bcb93665d1dcb076f4b47
 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 3217 BLAKE2B 584426773393f8bcf477bf01e8bc5a5e3bc4c2570dd7e2c7a6c1f1360a0e88c7db45c9bd5d79a6fe2bd95df172b99c7dab9adfc2f1f8ba94f28d94da83efd19b SHA512 2fcb2cedc8fd85654d00fb96ad66e009417e65cefa1d23f316993305389fd3f7bc49c7a5ba768cc97bfe9b39fde3ad47dfa8c159376954f23f5ce2d99dc35e14
-EBUILD aide-0.16.2_p20200614.ebuild 3838 BLAKE2B b4d62f2d763151c53367e512bdc769f6befa959ef29a701709de6b4ba666a48abd3e2ea8079f8d45d6063cba82b17fa6f72e50ecb37570acc8cdbbb335aaefc8 SHA512 8608ff464885243b68dac665a028decd55c5a3d61c4b0c2465edc1d5289a0479c29128770ea089fe5eb60b9dd7310702658a5c241361c73c6c54468c63be71e0
+EBUILD aide-0.16.2_p20200614.ebuild 3836 BLAKE2B 29ac2e585bbeaf41772fd1518232b68c069e7d2aefa2c01039d2d6ddc7e90b59f4cdfb1708b7f47e49e33d609bf65b3d6539d17dea483ebf0e8ecd7a30e87bea SHA512 11f6f63d4f617e28aed443f874a2dfbf4e6636ae95fae6cf28472f1deab105dcb0e30c8ca1005a1065867c7a303b0f53080857a3b1a06ebbcb981981f9dd9d9e
 MISC metadata.xml 625 BLAKE2B cbea6e2630056b936f6deac53cd688f51cc014bbef024f1fff0d0cc48363e434ca080b56461907a3844d8d07a5837298b55c09734a582c25f281fbf67857b215 SHA512 e77cdd24332e19b825d4135c1aa9a5f5ea6bf1bda882675958d968d4df4300bc3957d02f18f37dc9387e046ae7de51cf268a88f29cd83a9ec838edd25a55463d
diff --git a/app-forensics/aide/aide-0.16-r1.ebuild b/app-forensics/aide/aide-0.16-r1.ebuild
deleted file mode 100644
index 56e81d587271..000000000000
--- a/app-forensics/aide/aide-0.16-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools readme.gentoo-r1
-
-DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
-HOMEPAGE="http://aide.sourceforge.net/"
-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 xattr zlib"
-
-COMMON_DEPEND="
-	!mhash? (
-		dev-libs/libgcrypt:0=
-		dev-libs/libgpg-error
-	)
-	mhash? ( app-crypt/mhash )
-	dev-libs/libpcre
-	acl? ( virtual/acl )
-	audit? ( sys-process/audit )
-	curl? ( net-misc/curl )
-	e2fs? ( sys-fs/e2fsprogs )
-	postgres? ( dev-db/postgresql:= )
-	prelink? ( dev-libs/elfutils )
-	selinux? ( sys-libs/libselinux )
-	xattr? ( sys-apps/attr )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	prelink? ( sys-devel/prelink )
-	selinux? ( sec-policy/selinux-aide )
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	postgres? ( !mhash )
-"
-
-HTML_DOCS=( doc/manual.html )
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-Example configuration file was installed at '${EPREFIX}/etc/aide/aide.conf'.
-Please edit it to meet your needs. Refer to aide.conf(5) manual page
-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}/${P}-add-missing-include.patch"
-	"${FILESDIR}/${P}-fix-LIBS-LDFLAGS-mixing.patch"
-	"${FILESDIR}/${P}-fix-acl-configure-option.patch"
-	"${FILESDIR}/${P}-support-attr-2.4.48.patch"
-)
-
-src_prepare() {
-	default_src_prepare
-	sed -i -e 's| -Werror||g' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}/etc/${PN}"
-		--with-confighmactype="sha512"		# Override default weak MD5 hash.
-		--with-dbhmackey="sha512"			# Override default weak MD5 hash.
-		# Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
-		# This doesn't affect anything because there are no localizations yet.
-		--without-locale
-		--disable-static
-		$(use_with zlib)
-		$(use_with curl)
-		$(use_with acl posix-acl)
-		$(use_with selinux)
-		$(use_with prelink prelink "${EPREFIX}/usr/sbin/prelink")
-		$(use_with xattr)
-		$(use_with e2fs e2fsattrs)
-		$(use_with mhash mhash)
-		$(use_with !mhash gcrypt)
-		$(use_with postgres psql)
-		$(use_with audit)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default_src_install
-	readme.gentoo_create_doc
-
-	insinto /etc/${PN}
-	doins "${FILESDIR}"/aide.conf
-
-	dosbin "${FILESDIR}"/aideinit
-	dodoc "${FILESDIR}"/aide.cron
-
-	keepdir /var/{lib,log}/${PN}
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	if use postgres; then
-		elog
-		elog "Due to a bad assumption by aide, you must issue the following"
-		elog "command after the database initialization (aide --init ...):"
-		elog
-		elog 'psql -c "update pg_index set indisunique=false from pg_class \\ '
-		elog "  where pg_class.relname='TABLE_pkey' and \ "
-		elog '  pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
-		elog
-		elog "where TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
-		elog "in your aide.conf."
-		elog
-	fi
-}
diff --git a/app-forensics/aide/aide-0.16.2_p20200614.ebuild b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
index 4daf1f2b555d..1089cf44d87c 100644
--- a/app-forensics/aide/aide-0.16.2_p20200614.ebuild
+++ b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aide/aide/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="acl audit curl e2fs mhash postgres prelink selinux xattr zlib"
 
 REQUIRED_USE="
diff --git a/app-forensics/aide/files/aide-0.16-add-missing-include.patch b/app-forensics/aide/files/aide-0.16-add-missing-include.patch
deleted file mode 100644
index 75f0403c968e..000000000000
--- a/app-forensics/aide/files/aide-0.16-add-missing-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 1cbb888d55388d6bb88141c946bd6993b3e9872f
-Author: Ilya Tumaykin <itumaykin@gmail.com>
-Date:   Tue May 23 17:24:29 2017 +0300
-
-db: add missing include
-
-url_fclose() function used in this file is defined in fopen.h.
-See https://sourceforge.net/p/aide/bugs/99/
-
-diff --git a/src/db.c b/src/db.c
-index dd133d4..858240d 100644
---- a/src/db.c
-+++ b/src/db.c
-@@ -28,6 +28,10 @@
- #include "db_disk.h"
- #include "md.h"
-
-+#ifdef WITH_CURL
-+#include "fopen.h"
-+#endif
-+
- #ifdef WITH_PSQL
- #include "db_sql.h"
- #endif
diff --git a/app-forensics/aide/files/aide-0.16-support-attr-2.4.48.patch b/app-forensics/aide/files/aide-0.16-support-attr-2.4.48.patch
deleted file mode 100644
index 8acb6e5b56b0..000000000000
--- a/app-forensics/aide/files/aide-0.16-support-attr-2.4.48.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix build against attr >= 2.4.48
-
-Drop obsolete attr/xattr.h include as did attr upstream in attr-2.4.48.
-See http://git.savannah.nongnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38
-
-ENOATTR definition was moved to attr/attributes.h, thus include it.
-attr < 2.4.48 keeps ENOATTR definition in attr/xattr.h, so define it
-manually if necessary in order to preserve backwards compatibility.
-
-Bug: https://bugs.gentoo.org/648966
-Upstream-bug: https://sourceforge.net/p/aide/patches/23/
-
-diff --git a/include/db_config.h b/include/db_config.h
-index e92fe1c..7e5ff0d 100644
---- a/include/db_config.h
-+++ b/include/db_config.h
-@@ -62,7 +62,10 @@ typedef struct acl_type {
-
- #ifdef WITH_XATTR /* Do generic user Xattrs. */
- #include <sys/xattr.h>
--#include <attr/xattr.h>
-+#include <attr/attributes.h>
-+#ifndef ENOATTR
-+# define ENOATTR ENODATA
-+#endif
- #endif
-
- typedef struct xattr_node 
diff --git a/app-forensics/aide/files/aide.conf b/app-forensics/aide/files/aide.conf
deleted file mode 100644
index cef1813db9f8..000000000000
--- a/app-forensics/aide/files/aide.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-# AIDE conf
-
-database=file:/var/lib/aide/aide.db
-database_out=file:/var/lib/aide/aide.db.new
-
-# Change this to "no" or remove it to not gzip output
-# (only useful on systems with few CPU cycles to spare)
-gzip_dbout=yes
-
-# Here are all the things we can check - these are the default rules 
-#
-#p:      permissions
-#i:      inode
-#n:      number of links
-#u:      user
-#g:      group
-#s:      size
-#b:      block count
-#m:      mtime
-#a:      atime
-#c:      ctime
-#S:      check for growing size
-#md5:    md5 checksum
-#sha1:   sha1 checksum
-#rmd160: rmd160 checksum
-#tiger:  tiger checksum
-#R:      p+i+n+u+g+s+m+c+md5
-#L:      p+i+n+u+g
-#E:      Empty group
-#>:      Growing logfile p+u+g+i+n+S
-#haval:         haval checksum
-#gost:          gost checksum
-#crc32:         crc32 checksum
-
-# Defines formerly set here have been moved to /etc/default/aide.
-
-# Custom rules
-Binlib = p+i+n+u+g+s+b+m+c+md5+sha1
-ConfFiles = p+i+n+u+g+s+b+m+c+md5+sha1
-Logs = p+i+n+u+g+S
-Devices = p+i+n+u+g+s+b+c+md5+sha1
-Databases = p+n+u+g
-StaticDir = p+i+n+u+g
-ManPages = p+i+n+u+g+s+b+m+c+md5+sha1
-
-# Next decide what directories/files you want in the database
-
-# Kernel, system map, etc.
-=/boot$ Binlib
-# Binaries
-/bin Binlib
-/sbin Binlib
-/usr/bin Binlib
-/usr/sbin Binlib
-/usr/local/bin Binlib
-/usr/local/sbin Binlib
-#/usr/games Binlib
-# Libraries
-/lib Binlib
-/usr/lib Binlib
-/usr/local/lib Binlib
-# Log files
-=/var/log$ StaticDir
-#!/var/log/ksymoops
-/var/log/aide/aide.log(.[0-9])?(.gz)? Databases
-/var/log/aide/error.log(.[0-9])?(.gz)? Databases
-#/var/log/setuid.changes(.[0-9])?(.gz)? Databases
-!/var/log/aide
-/var/log Logs
-# Devices
-!/dev/pts
-# If you get spurious warnings about being unable to mmap() /dev/cpu/mtrr,
-# you may uncomment this to get rid of them. They're harmless but sometimes
-# annoying.
-#!/dev/cpu/mtrr
-#!/dev/xconsole
-/dev Devices
-# Other miscellaneous files
-/var/run$ StaticDir
-!/var/run
-# Test only the directory when dealing with /proc
-/proc$ StaticDir
-!/proc
-
-# You can look through these examples to get further ideas
-
-# MD5 sum files - especially useful with debsums -g
-#/var/lib/dpkg/info/([^\.]+).md5sums u+g+s+m+md5+sha1
-
-# Check crontabs
-#/var/spool/anacron/cron.daily Databases
-#/var/spool/anacron/cron.monthly Databases
-#/var/spool/anacron/cron.weekly Databases
-#/var/spool/cron Databases
-#/var/spool/cron/crontabs Databases
-
-# manpages can be trojaned, especially depending on *roff implementation
-#/usr/man ManPages
-#/usr/share/man ManPages
-#/usr/local/man ManPages
-
-# docs
-#/usr/doc ManPages
-#/usr/share/doc ManPages
-
-# check users' home directories
-#/home Binlib
-
-# check sources for modifications
-#/usr/src L
-#/usr/local/src L
-
-# Check headers for same
-#/usr/include L
-#/usr/local/include L
diff --git a/app-forensics/ovaldi/Manifest b/app-forensics/ovaldi/Manifest
index 31ca851de7d5..0eba74209447 100644
--- a/app-forensics/ovaldi/Manifest
+++ b/app-forensics/ovaldi/Manifest
@@ -1,5 +1,6 @@
-AUX ovaldi-5.10.1.7-disable-acl.patch 1231 BLAKE2B 2f434497f12b52be3f18a4a35dc9b22dc6c93c5c3db9c0a46ef4a85753c6262f553b9c4aabddf55ff534f99f43b7667f65e758111a570e4102ca1a27cc03ce15 SHA512 e71a2899b0eb0a9abd6ba2a3a00ef67d6480597defa3390cfd4706e801aa6383c7a6ff5e02e4472b5a707bab35f398b6b9d00377adbd82673b6cf5c9961370a8
-AUX ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch 834 BLAKE2B 8e4cc626d97ee2f80c40913b09550693437ac6cc9b3ad0491962b8c3b78cd6e060ba4c5c0f3bc18be10348ec31fcd9e0e35108bb80425764a7d4f75412b8f0b0 SHA512 f05a797252a2006384f450afd2c0c2b8cd894abc2409b21a3df9cec57af39ff81dc2b007b0e3c460e3ce85855a1b37fe18b5a4b79408969019332300d0c1ed47
+AUX ovaldi-5.10.1.7-disable-acl.patch 1159 BLAKE2B e7c477fdfa53bc0ed8866d39c58b1ed1e28789db1b663b4b2c22e99d2a41474f2f684581b81dd4123ad5f2d49b45acbaff82da38d3d61881f01b5d202684a089 SHA512 85dcd92468641294f132ffbdd4cc23bfcb4a96fd6db52322cf1abca086617b83798323e6bd2e4447467530a2c8f8b681ffabef3f193ea7a09cdbca93e33d2f6e
+AUX ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch 762 BLAKE2B 3d1018ee87b8a15ec2b8b487a8e5eb9bfa17be265e3ec1c84a17b877ccaa38605127539e410772c23474395db984427780d4bb28ebb5223c1785f1cd7b161c58 SHA512 b597ee411d478758f5d5de0bb486b75190cf7ac2a9297c407016f66bc28ddbd6692b25c83adaed0abf9931c86909c61fbff7a834f82e5f0bd0068a04659f8f36
+AUX ovaldi-5.10.1.7-gcc11.patch 2378 BLAKE2B 8e0256c20f50748840457e16b5e9e1150917c7015b72873007db90a6294b31b485776bfcb8c44eae9bfe23a774e8a5c4ba7aa6fa6d3ef98a8080354d5d0b0df0 SHA512 41932b423992f4cb698db2af7fed0ecf21c77986eee2d284b631dcb89175e040850ba52fa91218a39b468f7eab0ac336327d5b31e5bcf0b5d4a1d58e3b2e0e9c
 DIST ovaldi-5.10.1.7-src.tar.bz2 20391784 BLAKE2B 7e2c719f0819f967c6aee533bb881c29ffac756461460d73e3231f1cffd254d88a26e716f0334d023daa7fa6f9c314bf7a42b6c13e2a90daa558e589d135479c SHA512 22c373436889b03ffb5d479bd322703bbd8b5b335f116a3b38a3d206ddaaf3115961ab89597c3907b6e5d745eb302a042c135c73cde0eaae10e51f5d6e3e55ec
-EBUILD ovaldi-5.10.1.7.ebuild 2916 BLAKE2B d1c7d381477c84ba07ea021298ebc684fe96f7a937f7451bef627f9e8c1d6a2feacb632a3357071b06d718f49de9130917c73c1ee731c83a5b270c96d93d66c3 SHA512 42daad2522fd1e723670ccbce842a291536985405c58d4b1885ac0f948973c2225e75ac83b3a564bfe67846c1fedf2f1f2ff4ee73c18136d1614ac55d81fad03
+EBUILD ovaldi-5.10.1.7.ebuild 3022 BLAKE2B bc1edf77501d106025ac90fc4c7f57f9395447957801a0275eaac13fe11bf7babfab96564e95f6dad63c6285aa26c2baa85dab475cf0052b1e512cdd772ecf9f SHA512 a59ba2fd5c0d1ff00102288f29ece3fd4106862e01e2f208b4093cc92afcd47e833c1e3bc5b0363a7f636ff407625f4ffb2e238b81cb6281afb836b406f35012
 MISC metadata.xml 243 BLAKE2B 72d65d0abc045838e84adb103b2ce4ae4ec3bfc3f4e9843f3f10aadc5f20f6a13b9997d491bcc69cadfa6db8e2b6640f127db6406b734883292c27a8180a61f1 SHA512 36f385a96e0808f3d6a13c7f1376b62754012dc345671d1404460b74f58e33356cbfef5b8d61cf7c0801c9afd45b1b801d87e2e540a5c0f508b41ca5a7591b97
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch
index 6d6fbf60178e..0a8b5fa6a188 100644
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable-acl.patch
@@ -1,5 +1,5 @@
---- src/probes/unix/FileProbe.cpp.old	2014-10-08 09:15:37.000000000 +0200
-+++ src/probes/unix/FileProbe.cpp	2014-10-08 09:15:55.000000000 +0200
+--- a/src/probes/unix/FileProbe.cpp
++++ b/src/probes/unix/FileProbe.cpp
 @@ -386,18 +386,8 @@
  	   6) If a file has an ACL, the value will be 'true'.
  	*/
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch
index 11d369022b03..9f0a0e05e401 100644
--- a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-disable_RetrieveSelinuxDomainLabel.patch
@@ -1,5 +1,5 @@
---- src/probes/unix/Process58Probe.cpp.old	2014-10-08 08:56:37.000000000 +0200
-+++ src/probes/unix/Process58Probe.cpp	2014-10-08 08:57:58.000000000 +0200
+--- a/src/probes/unix/Process58Probe.cpp
++++ b/src/probes/unix/Process58Probe.cpp
 @@ -743,26 +743,8 @@
  }
  
diff --git a/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch
new file mode 100644
index 000000000000..1c71f7016d77
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.10.1.7-gcc11.patch
@@ -0,0 +1,72 @@
+--- a/src/AbsProbe.cpp
++++ b/src/AbsProbe.cpp
+@@ -52,7 +52,7 @@
+ 	// use const wherever it makes sense, to ensure const-correctness??
+ 	// Or maybe I should have implemented operator<() for items and
+ 	// used the default std::less template...?
+-	typedef set<Item*, std::less<const Item*> > ItemCache;
++	typedef set<Item*, std::less<Item*> > ItemCache;
+ 	ItemCache globalItemCache;
+ }
+ 
+--- a/src/ErrnoException.h
++++ b/src/ErrnoException.h
+@@ -49,10 +49,10 @@
+ 		SetErrorMessage(syscall+": "+std::strerror(errnoVal));
+ 	}
+ 
+-	virtual ~ErrnoException() throw () {
++	virtual ~ErrnoException() {
+ 	}
+ 
+-	virtual const char* what() const throw() {
++	virtual const char* what() const noexcept {
+ 		return errorMessage.c_str();
+ 	}
+ };
+--- a/src/OutOfMemoryException.h
++++ b/src/OutOfMemoryException.h
+@@ -47,10 +47,10 @@
+ 		: Exception(msg, severity, cause) {
+ 	}
+ 
+-	virtual ~OutOfMemoryException() throw () {
++	virtual ~OutOfMemoryException() {
+ 	}
+ 
+-	virtual const char* what() const throw() {
++	virtual const char* what() const noexcept {
+ 		return errorMessage.c_str();
+ 	}
+ };
+--- a/src/probes/unix/RunLevelProbe.cpp
++++ b/src/probes/unix/RunLevelProbe.cpp
+@@ -125,7 +125,7 @@
+ 
+ 
+ void
+-RunLevelProbe::_verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const throw( ProbeException ) {
++RunLevelProbe::_verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const {
+   
+   // check datatypes - only allow string
+   if( service_name->GetDatatype() != OvalEnum::DATATYPE_STRING ){
+--- a/src/probes/unix/RunLevelProbe.h
++++ b/src/probes/unix/RunLevelProbe.h
+@@ -76,7 +76,7 @@
+  */
+ struct ltrunlevel_item_comparator
+ {
+-  bool operator() ( const runlevel_item &r1, const runlevel_item &r2 )
++  bool operator() ( const runlevel_item &r1, const runlevel_item &r2 ) const
+   {
+     return r1.service_name.compare(r2.service_name) < 0;
+   }
+@@ -115,7 +115,7 @@
+       @param runlevel the runlevel runlevel_object entity
+       @throws ProbeException if invalid operations or datatypes are encountered
+     */
+-    void          _verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const throw( ProbeException );
++    void          _verifyRunlevelObjectAttr( ObjectEntity * service_name, ObjectEntity * runlevel ) const;
+ 
+     /**
+       Checks to see if the given filename is either "." or ".."
diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild
index 5241a7f739bd..2007c6737d5a 100644
--- a/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild
+++ b/app-forensics/ovaldi/ovaldi-5.10.1.7.ebuild
@@ -1,34 +1,32 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit epatch toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Free implementation of OVAL"
 HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
+S="${WORKDIR}/${P}-src"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="acl ldap selinux"
 
-CDEPEND="dev-libs/libgcrypt:0
-	dev-libs/libpcre
-	dev-libs/xalan-c
-	dev-libs/xerces-c
-	sys-apps/util-linux
+DEPEND="
+	dev-libs/libgcrypt:=
+	dev-libs/libpcre:=
+	dev-libs/xalan-c:=
+	dev-libs/xerces-c:=
+	sys-apps/util-linux:=
 	sys-libs/libcap
-	acl? ( sys-apps/acl )
+	acl? ( sys-apps/acl:= )
 	ldap? ( net-nds/openldap )"
-DEPEND="${CDEPEND}
-	sys-apps/sed"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	selinux? ( sys-libs/libselinux )"
 
-S="${WORKDIR}/${P}-src"
-
 src_prepare() {
 	if ! use ldap ; then
 		einfo "Disabling LDAP probes"
@@ -42,7 +40,7 @@ src_prepare() {
 
 	if ! use acl ; then
 		sed -i 's,.*libacl,//&,' src/probes/unix/FileProbe.h || die
-		epatch "${FILESDIR}"/${P}-disable-acl.patch
+		eapply "${FILESDIR}"/${P}-disable-acl.patch
 		sed -i 's, -lacl , ,' project/linux/Makefile || die
 	fi
 
@@ -58,7 +56,7 @@ src_prepare() {
 		rm src/probes/linux/SelinuxSecurityContextProbe.cpp || die
 		rm src/probes/linux/SelinuxBooleanProbe.cpp || die
 		rm src/probes/linux/SelinuxBooleanProbe.h || die
-		epatch "${FILESDIR}"/${P}-disable_RetrieveSelinuxDomainLabel.patch
+		eapply "${FILESDIR}"/${P}-disable_RetrieveSelinuxDomainLabel.patch
 		sed -i 's,.*selinux.*,//&,' src/linux/ProbeFactory.cpp || die
 		sed -i 's,.*Selinux.*,//&,' src/linux/ProbeFactory.cpp || die
 		sed -i 's,.*selinux.*.h.*,//&,' src/probes/unix/Process58Probe.cpp || die
@@ -70,11 +68,19 @@ src_prepare() {
 	sed -i 's,#include <unistd.h>,&\n#include <stdlib.h>,' src/linux/NetworkInterfaces.cpp || die
 	sed -i 's,#include <unistd.h>,&\n#include <stdlib.h>,' src/linux/SystemInfo.cpp || die
 
-	# respect CXXFLAGS and CXX
-	sed -i -e '/^CPPFLAGS/s/$(INCDIRS)/$(CXXFLAGS) \0/' project/linux/Makefile || die
+	# respect CXX, CXXFLAGS and LDFLAGS
+	sed -e '/^CPPFLAGS/s/$(INCDIRS)/$(CXXFLAGS) \0/' \
+		-e 's/$(CXX) $^/$(CXX) $(LDFLAGS) $^/g' \
+		-i project/linux/Makefile || die
 
 	# no such library on linux
 	sed -i 's,-lxalanMsg,,' project/linux/Makefile || die
+
+	eapply "${FILESDIR}"/${P}-gcc11.patch
+	eapply_user
+}
+
+src_configure() {
 	tc-export CXX
 }
 
@@ -85,9 +91,11 @@ src_compile() {
 src_install() {
 	# no make install in Makefile
 	dosbin project/linux/Release/ovaldi project/linux/ovaldi.sh
-	dodir /var/log/${PN}
-	insinto /usr/share/${PN}
-	doins xml/*
+	dodir /var/log/ovaldi
+
+	insinto /usr/share/ovaldi
+	doins -r xml/.
+
 	dodoc docs/{README.txt,version.txt}
 	doman docs/ovaldi.1
 }