7 files changed, 112 insertions, 5 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b9bd3a221c35..b38eab898d03 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/logcheck/Manifest b/app-admin/logcheck/Manifest
index deb106ea5cc1..63331183138d 100644
--- a/app-admin/logcheck/Manifest
+++ b/app-admin/logcheck/Manifest
@@ -1,4 +1,4 @@
-AUX logcheck-r3.cron 353 BLAKE2B ad9e0ad6017787830c4414cc7e5133d38e1ea334a8ab090038d2aa636eb1c20c1f823e70c5f59fd013ecad4e66c8f0283498a2389d5589356d0674a840b45977 SHA512 c1d75f2cc2d0fd8e0db3e190653276dfd84093a755aa2b6bd1a73d08652f9696ca15aa6265337eede5f29b8353742857dc4904bbfae2a6a7591af2a26ebc389d
+AUX logcheck-r4.cron 354 BLAKE2B db4d2b80d93c290e165a49277412163b2ba491b83722b60e2221ae78207f301d7ffa160607c4c8a447a2ee36c59826aa98f58ff313574f0fa6e41a95b16e40f2 SHA512 59b8d4fe3ae8ac0c21ef536c404ebb9c50b9c273c2edcd4be95a29d803101b5bb1a64bc7eb8eeaa814e2df53ad72d4ea6c2387e7509b3c585af5f35f836acf17
 AUX logcheck.cron 334 BLAKE2B d7c2fbaf80f841af46080d0855d64ac3bcf649930cd8e715d02109b35022326c3a0ce6c966c0d406163324a7abe51c7b3a1b9701136d8bd83889d9b040608a7b SHA512 9e8b70d3c0e04e060af08d1c1497930d56fe0044b0bfbceeeb0a5b43e14d9bbd5e737591a2d47a1993f0430a2533ba3e3e49167922151e89d6e3f4b74f13ca15
 AUX logcheck.cron.d 47 BLAKE2B 2a8f0c8ba851038d4f2162ea4afbada31c57da397a30ad26bb29e2fa0d335edb6fb3ecf4a88a6028aada63ef2867eeb1454f3adde9bd5137ea70f31792a22b24 SHA512 f97a28de107afb899c0762949ee09a6840544fa6f83381e52ed905554c408c80270ab2620cf74c67a0a1cec14515f2d8e2a7dd1ff302c8add64b174aa8898482
 AUX logcheck.service 210 BLAKE2B 9a523099c54580b141b17933bb833f386ed49ed5534374db6ceb6dd1d50762a4b1beb598f5e8674da4574e69504a46aee7f889196510aeaf46b3e7a1c38f6b33 SHA512 4590ed0d08b2fd695382a9236f186de07216013ed7e1be1a417d3c4ea59180b840d8bf5cba7ea321d61ffe7254699213ec13aabb6426bcd320dc9890c7d824f2
@@ -6,5 +6,5 @@ AUX logcheck.timer 140 BLAKE2B eef8f5fb279b417c4ecbbd849a4e01aabf77744deab5fdd57
 AUX logcheck.tmpfiles 72 BLAKE2B 025613bfed9705108c89566cb298ea4ae9754bc8c3d34d5aded2fad7fb74c20d437bb1e83cc4aa6f816a8e0035fab26ec6a307922cd1852b6f45af3c2d6c0b21 SHA512 738ae50af504709931fe7e4bdbf4024f095e489bd674d83a63565a07eea4f13945ff8d303d432eb891a1af74ed3711e88e0fce06d846de49e8c1eb7f4911f31d
 DIST logcheck-1.4.3.tar.gz 168176 BLAKE2B f319a644afa0de5533e37b288456f35bdc47daa6c76c413dc916d05f162b24467f70d73bba97eb9cdbc162973e9495daa48263d9f04a2f0151f7ddc5b66a6a37 SHA512 c853493d693dd44f477561596be4de1ad74c4b4380f83f86d6204e0de59c7edccdc4c8d6ec53a96f6eefa4d1995910e9e395c7573b0e2ee8f75d632abb104e09
 EBUILD logcheck-1.4.3-r2.ebuild 2408 BLAKE2B 39206de6d101724fd662fa332f7c5c1ce03c3372e8471c3a14408d62d7d291a5736bd815fc98156bcef7b282e6a68b9078197a3a5d09fc6fab4c984f7aa06ed6 SHA512 d93f3db062b16d9c6aeaf8c513f6b07533eac707597eb627c1a1f46558988e5a3b0eac12d9b6ca314e78cddc1ad88339046900e6bdb1c5e1152de3e0577c03ea
-EBUILD logcheck-1.4.3-r3.ebuild 2575 BLAKE2B 31733361c20091130f9397d109c8addaee79bf3037f6813a30fbac5edd2e26a4ca0a3004cc0dbb5b4e1101760d0975642a2caf91a754d0aa046032a478e4454b SHA512 7e912ed2c9d2a0a5b8224a76301b3ff892bc474b025bdaa720ee46bf1d8923ab765363910a0eefb3024f78685d5813fc9223cb3990fdc29319f39aedc27323ca
+EBUILD logcheck-1.4.3-r4.ebuild 2575 BLAKE2B 0a22695e2e49e203d41708349c6fe49fe05b359925c2173624fea9f5b949c99161a58ddfc430dc4c9eaf31cc2485bde68b3fbd1f3a2a19def690e397e53270cd SHA512 ef85af0f71adecf5e0f945ba57f7f1ccd0f8c7d54fedc49e51938c52299bf07634e6a3eda25069aa919cb7bcb807808be7af937b4e9040b95a738f8fca441be5
 MISC metadata.xml 1473 BLAKE2B 2604b73278294910db47dbf0731553125548286e2dd82bc3d733564a67f6fef6d522d2ad0be50104778d09fc20751dcc1532fd929157e23d409b999df376084e SHA512 b25aaaf6aedddf70c9d3c098f72f50b5beca2d7e1044627b76d762df69c4b0494b2e72c8a5647323afcbc0abbac8478331004808841d5d42590bb0657d1d732b
diff --git a/app-admin/logcheck/files/logcheck-r3.cron b/app-admin/logcheck/files/logcheck-r4.cron
index 2ae64f767871..1a8809ffe154 100644
--- a/app-admin/logcheck/files/logcheck-r3.cron
+++ b/app-admin/logcheck/files/logcheck-r4.cron
@@ -8,4 +8,4 @@ if [ ! -d /var/lock/logcheck ]; then
 	mkdir -p /var/lock/logcheck
 	chown logcheck:logcheck /var/lock/logcheck
 fi
-/sbin/runuser -u logcheck --nice -n10 /usr/sbin/logcheck "$@"
+/sbin/runuser -u logcheck -- nice -n10 /usr/sbin/logcheck "$@"
diff --git a/app-admin/logcheck/logcheck-1.4.3-r3.ebuild b/app-admin/logcheck/logcheck-1.4.3-r4.ebuild
index 7e6a9a120e1c..0cd2197b813f 100644
--- a/app-admin/logcheck/logcheck-1.4.3-r3.ebuild
+++ b/app-admin/logcheck/logcheck-1.4.3-r4.ebuild
@@ -67,7 +67,7 @@ src_install() {
 
 	if use cron; then
 		exeinto /etc/cron.hourly
-		newexe "${FILESDIR}"/"${PN}"-r3.cron ${PN}
+		newexe "${FILESDIR}"/"${PN}"-r4.cron ${PN}
 		insinto /etc/cron.d
 		newins "${FILESDIR}"/${PN}.cron.d ${PN}
 		DOC_CONTENTS="${DOC_CONTENTS}\n
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 37039c221031..15b4e44b27cc 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,4 +1,6 @@
 AUX testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch 1268 BLAKE2B 9c57329b3576cef7f23177fe07d45cd49a449b4353a9abd3a3196a9ec2896a05e900b1d7785d087f4587642d786efb36ea655d8b2c35833c8736014fbdad9cfb SHA512 7325ff2d83350512acf2e0b3f2269cdc4a92f775eafeae62c0b337fa4f31dac0c4f56d9ed7397fbd8a29d7679eb259401ca934d48c51438bfc4e3d0e0bcf7e00
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
+DIST testdisk-7.2.tar.bz2 855781 BLAKE2B 224fae052fa9264ee83fdf6804159c77257b9db4c96ff36c7cb1dc184ec4a9f0955f0d817de24ef1e5fe69e7ef1a20c140e73fc130fb092e6df3b02df2845239 SHA512 f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26
 EBUILD testdisk-7.1-r2.ebuild 2493 BLAKE2B c356cecde0aca3b623792c28734b7692315bda99bd186f65eb620a17b4116c9314979e747932657086976caf38932746de8493aea44840e060ece38410e6f366 SHA512 abbbe19c071a2faf9075a483eea9625f074f680975a8ddf5e47e93e3080e8b4d5dd5f87ca0062cc9cddb25245ebefe8a939a94560d5cebcea33b8e3121ec2cac
-MISC metadata.xml 640 BLAKE2B 2c906cdb19a874657ac6f51ea5ec0035b27b0644e73faac95b9234a888a991bc8d9026252a0bf1bd32841295519fe2a966f77101396ca8071dd96c3f742bfd24 SHA512 8996a1f5afaaf7cf18f088d342b717d43316737e92c7b891c63613f9698e4b60bcdc6c65d3d87e4ce4da129b40993e3a60c75544dd5503e9d104d2652460b58c
+EBUILD testdisk-7.2.ebuild 2722 BLAKE2B 1a6bd0716daa06eaecac1552d9f968cfd8d4c156340c1b5251d25567d32da61c0d532ba688f0eb41c9a91161ad9038fdc8452421a6ffb2575b7c80d0abee3839 SHA512 7ac326be1d9d6d8ac261f578c602ba6a758c39fdb4aeab30359cf037d12474dbb3a8fc8706436e6610fcfe2fa8561b5602343da03f9624e91b5eaf26f0993925
+MISC metadata.xml 698 BLAKE2B c594b2322501214086fc8505094d104b1cba10338e8e2d1831eaa6e13fa12406b0e7e374dc0c4b72c93b7c10fb4709d39d8790274b5b38ff326d7ea99d42ec70 SHA512 bbd13b1109ddbcbd8c676886c432b8fe5ed276a93de6e829ab8d708c84b8ea50e9846a717b3d9a9b6c5d400971f8d79b049285a1bf999c81e50fb4d820ebc7e4
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index adbd9697dcd6..0cde64481bdc 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="ntfs">Include the ability to read NTFS filesystems</flag>
 		<flag name="reiserfs">Include reiserfs reading ability</flag>
 		<flag name="ewf">Include ewf library</flag>
+		<flag name="sudo">Enable sudo helper integration</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">cgsecurity/testdisk</remote-id>
diff --git a/app-admin/testdisk/testdisk-7.2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild
new file mode 100644
index 000000000000..e30e7c0a8b9f
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg-utils
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="ewf jpeg ntfs gui reiserfs static +sudo zlib"
+
+REQUIRED_USE="static? ( !gui )"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	'ntfs_mbstoucs' # configure script checking NTFS, has fallbacks
+)
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+# sudo is detected during configure for extra functionality, see bug #892904
+DEPEND="
+	sudo? ( app-admin/sudo )
+	static? (
+		sys-apps/util-linux[static-libs]
+		sys-fs/e2fsprogs[static-libs]
+		sys-libs/ncurses:0[static-libs]
+		jpeg? ( media-libs/libjpeg-turbo:=[static-libs] )
+		ntfs? ( sys-fs/ntfs3g[static-libs] )
+		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
+		zlib? ( sys-libs/zlib[static-libs] )
+		!arm? ( ewf? ( app-forensics/libewf[static-libs] ) )
+	)
+	!static? (
+		sys-apps/util-linux
+		sys-fs/e2fsprogs
+		sys-libs/ncurses:0=
+		jpeg? ( media-libs/libjpeg-turbo:= )
+		ntfs? ( sys-fs/ntfs3g:= )
+		gui? (
+			dev-qt/qtcore:5
+			dev-qt/qtgui:5
+			dev-qt/qtwidgets:5
+		)
+		reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+		zlib? ( sys-libs/zlib )
+		!arm? ( ewf? ( app-forensics/libewf:= ) )
+	)
+"
+RDEPEND="
+	sudo? ( app-admin/sudo )
+	!static? ( ${DEPEND} )
+"
+BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
+
+DOCS=()
+
+PATCHES=(
+)
+
+src_configure() {
+	export MOC="$(qt5_get_bindir)/moc"
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local myconf=(
+		--without-ntfs # old NTFS implementation, use ntfs-3g instead.
+		$(use_with ewf)
+		$(use_with jpeg)
+		$(use_with ntfs ntfs3g)
+		$(use_enable gui qt)
+		$(use_enable sudo)
+		$(use_with reiserfs)
+		$(use_with zlib)
+	)
+
+	# this static method is the same used by upstream for their 'static' make
+	# target, but better, as it doesn't break.
+	use static && append-ldflags -static
+
+	econf "${myconf[@]}"
+
+	# perform safety checks for NTFS, REISERFS and JPEG
+	if use ntfs && ! grep -E -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+		die "Failed to find either NTFS or NTFS-3G library."
+	fi
+	if use reiserfs && grep -E -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+		die "Failed to find reiserfs library."
+	fi
+	if use jpeg && grep -E -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
+		die "Failed to find jpeg library."
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}