gentoo resync : 16.04.2022

9 files changed, 47 insertions, 9 deletions

diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 68581c7a216c..88120067ebf2 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/libewf/Manifest b/app-forensics/libewf/Manifest
index 79391b7a1b6f..565600dfab61 100644
--- a/app-forensics/libewf/Manifest
+++ b/app-forensics/libewf/Manifest
@@ -1,3 +1,3 @@
 DIST libewf-experimental-20171104.tar.gz 2243405 BLAKE2B 86e69eba5313dadbfe2cc63639e96cf964b5d72e3c98299c0262547b2d900b7a8a4a5938435bdafac3890ee05ea0079ef68809086234ff486c985d557d2c4897 SHA512 610174971b8e09385f1f51c02e7be36e7a18d21f8b22ddeb7ba7d5c20e7df97591a70de3523b2d63bed8deb5a2a170a14e825f6a80aeb0937553ecae5925ee0b
-EBUILD libewf-20171104-r1.ebuild 1395 BLAKE2B 76d964775cb6354db05c5164a9c36d91456d0dd87e85372b13c8f785fd695b1c6dcfc41426aa35fbd4b7f11bd9971e85d723f4e0e4517ecfa28187b34f8f0827 SHA512 9af6fd70054f91553f548f20ab02eebfb83a92cd3b7da58dededa8be1f436d831d0fa52816b70960cba7c86787beaa2087322369c76d75c12e342554bdd5ff3a
+EBUILD libewf-20171104-r1.ebuild 1402 BLAKE2B 1e111b8da78cdfe92b392485982b60486653facd175cf9bab2e0775042759e8e2d0f18d249c7a6732739d64475bf170f85b93f10742dcda00712c67d62d2b5ef SHA512 9f84eab90f5a0dc8a9c4ff1d0f0bbd2a271e7c6988ab82638583c230ecf00bd50d9476425f8b6dbdd9bb1acc5404e690ec5c5c58c2eca85dbf0cc9c47ae1b6eb
 MISC metadata.xml 462 BLAKE2B f916e7c3b9bf12caefb813e4631bfbf57c6dbf5746115fc9ee872680e5664e3efdd423cd43acfd976dedbba20d9f47784dcd2c4bcd3ccd2afb1c2ca22340c5b9 SHA512 284bf1351b83e4fc07224ba93ea6215ce93ae3211103f4b597c100e1243f0860d6c06e5e2b1f0063941b57a0d90707821e7d0e17bd1d58422e5de2102316bcad
diff --git a/app-forensics/libewf/libewf-20171104-r1.ebuild b/app-forensics/libewf/libewf-20171104-r1.ebuild
index 224990a01d89..6e872b922cf9 100644
--- a/app-forensics/libewf/libewf-20171104-r1.ebuild
+++ b/app-forensics/libewf/libewf-20171104-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libyal/libewf/releases/download/${PV}/${PN}-experime
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 ~riscv x86"
 # upstream bug #2597171, pyewf has implicit declarations
 #IUSE="debug python unicode"
 IUSE="bfio bzip2 debug +fuse nls +ssl static-libs +uuid unicode zlib"
diff --git a/app-forensics/magicrescue/Manifest b/app-forensics/magicrescue/Manifest
index 6f7d8d5b7d1d..e57067d42ae5 100644
--- a/app-forensics/magicrescue/Manifest
+++ b/app-forensics/magicrescue/Manifest
@@ -1,5 +1,6 @@
 AUX magicrescue-1.1.10-ldflags.patch 1140 BLAKE2B 98deed569c8809e0e7a31c86cd29f1e79eaa2a2da986f2dcbce3591a1eba0e0aff43caf48db008a1c7c09e27d602e8c10a41889c7a89ad3696e9a5514449eec5 SHA512 abcb734fc4381408d8c4072e637a326a1b619defc244f70fb68608485a4a36ff4b4a206c296bb7dec0ae19fbe8030b88c9a6b528ca0f1934a0308f167ddd966d
 AUX magicrescue-1.1.10-remove_toolsdir.patch 4087 BLAKE2B ce13561cac085ca3c558d02fd9538ce9c3973a022fb3e51048ede5643e258d2a352425f5c3e1a164d209d2ecbb46a6c3c73da997c08a2d61f23fa764d8c526be SHA512 4b2a627475d3fff6b3a8c30dd883b3358043a429d05772bc4e1f658273a7c2a7beb29bc69978ac817074ba25827e4954a948076d77de73832eaf479e4bc1b8c8
 DIST magicrescue-1.1.10.tar.gz 227237 BLAKE2B a1584f4e6f4b6771783c565901775e181ba2e952e780565831e5d46245a4dd4670657cec7fb57b18d7dfc09954faec410da2dfe1b35130c23d22d8a6ccf0ab07 SHA512 54fc943a1f521563a3416040eb6b140e3ef79966b615ae0223be0558b810f9202c2d1e5ba0165c43a614caf78dbce1b0992775bef39e9611d2dc290e4582c29d
+EBUILD magicrescue-1.1.10-r2.ebuild 996 BLAKE2B c0a53477f47e3b0dbbb5308d8670e561cf80df8adc66a1fa450a0755d28b5fd7615333472d62f2118af8c3eb64e5f3f598d7b0bdde7a4d2a3ffaf6d5ee55da42 SHA512 95053ba5738fdc9505808bae77d7589ea3644306d499fc4d4e93d7740c9e91af0556998009f1d09d6b628d5662f966b77c494676fb4eef05c9b89f6503ebe356
 EBUILD magicrescue-1.1.10.ebuild 1016 BLAKE2B ffea7870e2181c79b931b9205e46dba6167a71496f97d81d0ea70b84a7ccb2ff0e279aed3e30bc60bc6fb384b9172232d991ea013bbe1c2523ff6390377ba23e SHA512 3c9586f388b1dfa77af4d5e35d89efb9cb178818e3319d44487c83431e0058da4982f58497abfb1fac245b47a74e1ced44e1cf43442bb8d50a6d79b47e6f805f
 MISC metadata.xml 750 BLAKE2B 2d31ceb3d7946f742beea0391f8da9fd3f725fb8f70e9bc307c925789ae0078093dcee5c3701a35a8deed15b3fb7e95fb55e48a5f87058e879437bf4389b953d SHA512 5feab26aca11abdb49fcce5a0ac0db39129bcda43a030f58618beadf9a3299616e91497a5bdf1c347dbb66ba19fd4f30b9cb89149351a086d55a3230a555910a
diff --git a/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild b/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild
new file mode 100644
index 000000000000..792a497947f0
--- /dev/null
+++ b/app-forensics/magicrescue/magicrescue-1.1.10-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Find deleted files in block devices"
+HOMEPAGE="https://github.com/jbj/magicrescue"
+SRC_URI="https://github.com/jbj/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="sys-libs/gdbm:="
+RDEPEND="${DEPEND}
+	!net-mail/safecat"
+# File collision with net-mail/safecat, bug #702004
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-remove_toolsdir.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e "\
+			s:\$(INSTALLDIR)/share/magicrescue/recipes:\$(INSTALLDIR)/share/doc/${PF}/recipes:;\
+			s:\$(INSTALLDIR)/man/man1:\$(INSTALLDIR)/share/man/man1:;\
+			s:\$(INSTALLDIR)/share/magicrescue/tools:\$(INSTALLDIR)/bin:" Makefile.in || die "could not mangle Makefile.in"
+}
+
+src_configure() {
+	tc-export CC
+
+	# Not autotools, just looks like it sometimes
+	./configure --prefix=/usr || die
+}
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index 1c6b7dd4c437..536d86676480 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -4,4 +4,4 @@ AUX rkhunter-1.4.cron 4002 BLAKE2B 4effc65dbff981fc90370dfae3c5e6b7d6d6f60e5aabc
 AUX rkhunter.bash-completion 2499 BLAKE2B 5cc845f3780e5b92acb84aad8141147b87245d554770282b91ba04771d7d8e727691872bdee129f25c7dd1a1440944e4b6959b9981c9c73683f1fddd479b225c SHA512 8fba540f5425169810b8baaf2e801638e3286aa93a69d4a96f5916e3bc9b632edaef6b509b8ca58f8047a7c7d4bb4bf348ad7923e855edce3dd0432725a944e7
 DIST rkhunter-1.4.6.tar.gz 302137 BLAKE2B 89c61386b57f743f4205f8c826eaa8a9dc9a0d413ac47efb26b6f93d8d642f619f35b7a4c021521b662547c02a16071b8980d158cfb9e081a64870558dbaeff0 SHA512 c51a21b6b66ed1f73a19d8ce04eaba35999eefcb666acc824989c3bf53ac56d24a33ac4fec290be942e33fe24674406b371eafff73f7e697b9e03ec031b37216
 EBUILD rkhunter-1.4.6-r1.ebuild 1421 BLAKE2B 01672b9f5175a07e82de80ea504bf2f417d5044d62734e0dd016ddb47275ab095002dc7bc40d17feda058f3d3cd1ded5db3fa526cfa900983fa95eb4df964dc3 SHA512 df67033f0f6398d4ef2da17801bed918d2decaf9271bc1a905001ef58b2a1b7307431483772d8e48b3c9b2fd03bd30f38e2430f4e3e27ce919b87d6ccc0b97cf
-MISC metadata.xml 332 BLAKE2B 87cb8f68933a9ad8385b1a1b9cefb15a2a93ba01433466550db12dffc89210d19f1f72d23c7f3d85913f9a704791f3ccf1924fbeb43f6e0462845178b03f7738 SHA512 f2b3fa491250a725ad5f66d201edef08d98e207515db19057c23fba42e6396d8a60ef6f90cc05fd9ceb06a45515cc529301172a6ff44cca3d0dabc8e9972fe4c
+MISC metadata.xml 218 BLAKE2B 0ce49a64748cd4ca9fea2da8bdf5ca011123c240069f4d1c29548a591a4b0da449814eefa820122203bfa2cc9f29c968f429470a2637960394170b8c003c3898 SHA512 16ccf29ca9a3634a03604d188ceb82a718a94b2b5b343ad9bc27c206dc5b4445201aa7b17d6d0f11367f23a124145650f90162fabdd7f161e02bafe1f8a1ab13
diff --git a/app-forensics/rkhunter/metadata.xml b/app-forensics/rkhunter/metadata.xml
index a2f63a17519c..921f63f4fe05 100644
--- a/app-forensics/rkhunter/metadata.xml
+++ b/app-forensics/rkhunter/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>kensington@gentoo.org</email>
-		<name>Michael Palimaka</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rkhunter</remote-id>
 	</upstream>
diff --git a/app-forensics/volatility3/Manifest b/app-forensics/volatility3/Manifest
index bfe4bbda5b75..4d943871dbfa 100644
--- a/app-forensics/volatility3/Manifest
+++ b/app-forensics/volatility3/Manifest
@@ -1,3 +1,3 @@
 DIST volatility3-2.0.1.tar.gz 427679 BLAKE2B eb9b4ebb885a8dd4de2769c666b503da4bef792389efbf487815808fd514cf84f7f10b5a12926cf398a4028e7b72a5b78892c4c92d3709fea37fe13a6f32af7d SHA512 752b3fc23b3668df4329f6dbefa2ff8eb2dd63bc6e22e18774096cebae93053567727e3dc6e5ecbf7a0731459c829c37cea8ac735564c62f96a4f652ad2b6cb9
 EBUILD volatility3-2.0.1.ebuild 1070 BLAKE2B 4e34bf20c94cbbaff69de8b371a4770564b026c406ef0e0df92b993edd243a79d3298c5b123888126aab9fa3ed7b042d09ab56f24b4768274a33a7c0cce3c773 SHA512 5a75000f80c3259da64f5392548dac7c48765c81ec6a2cca5269355881f245f0ee61295e2abf9f0fe6f17776b154476ececa7a729ac0750ea11c628004add1e6
-MISC metadata.xml 1304 BLAKE2B 2a972904591d4b6019a24839ac7d04a72332dd77e13beb7542c5dab31101ecdf1f4e69da5e72cdc41a5770360168df42edc745385f65d209e3161018c176a690 SHA512 0531a76f7bcb899e051ae30bf05b0f12e9fecab178837dd57907520ec94c6c96dceb7d6ac0d6aac2629ae559580f5e180409d55aecf8cca208c0ed89724590ff
+MISC metadata.xml 1353 BLAKE2B 6646bfc20fcabe361b50e05b55aa5f16d2b551706bb16d34477409611d10bd3ca398f487435bcc95e2f6c7eb2b2cf6b4104bae6bb6e5e603bc17c366631895d0 SHA512 b52a0032a4b6d5b9ba46dccf4cc7c4dc0f25afb9cb9051815366eda62de29fc67b78aea16b2835994ee5885f206868bf7311b7a1cf1646108441cee90c01bf3e
diff --git a/app-forensics/volatility3/metadata.xml b/app-forensics/volatility3/metadata.xml
index edbcd55f84f9..7d15cfc15fe6 100644
--- a/app-forensics/volatility3/metadata.xml
+++ b/app-forensics/volatility3/metadata.xml
@@ -25,5 +25,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">volatilityfoundation/volatility3</remote-id>
+		<remote-id type="pypi">volatility3</remote-id>
 	</upstream>
 </pkgmetadata>