gentoo auto-resync : 30:03:2024 - 19:13:59

4 files changed, 3 insertions, 148 deletions

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 15b4e44b27cc..7e9c6149ae51 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,6 +1,3 @@
-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
-EBUILD testdisk-7.2.ebuild 2722 BLAKE2B 1a6bd0716daa06eaecac1552d9f968cfd8d4c156340c1b5251d25567d32da61c0d532ba688f0eb41c9a91161ad9038fdc8452421a6ffb2575b7c80d0abee3839 SHA512 7ac326be1d9d6d8ac261f578c602ba6a758c39fdb4aeab30359cf037d12474dbb3a8fc8706436e6610fcfe2fa8561b5602343da03f9624e91b5eaf26f0993925
+EBUILD testdisk-7.2.ebuild 2720 BLAKE2B 203daafeedbcd35c8e38083b1cc90df170a9e774b0400d47424d6ffed7f1151b3c443ffd0813911deef386863dfd38f12ef29e9cfef7a67e906be35988ec6ba0 SHA512 70e0bf4334da27251c5ad688f02b6100e35e418c74120429a645719cd78214f1c20b0bd6166e4c479ec43966b5f4f0e4664b6decd5ccf681650de838c6ed784f
 MISC metadata.xml 698 BLAKE2B c594b2322501214086fc8505094d104b1cba10338e8e2d1831eaa6e13fa12406b0e7e374dc0c4b72c93b7c10fb4709d39d8790274b5b38ff326d7ea99d42ec70 SHA512 bbd13b1109ddbcbd8c676886c432b8fe5ed276a93de6e829ab8d708c84b8ea50e9846a717b3d9a9b6c5d400971f8d79b049285a1bf999c81e50fb4d820ebc7e4
diff --git a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch b/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
deleted file mode 100644
index 4ef379f0021f..000000000000
--- a/app-admin/testdisk/files/testdisk-7.1-backport-ntfs-3g-ioctl-prototype.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 2b0a0fcde875a89e2beffbe5c43c7518f682b482 Mon Sep 17 00:00:00 2001
-From: Christophe Grenier <grenier@cgsecurity.org>
-Date: Wed, 6 Apr 2022 07:43:45 +0200
-Subject: [PATCH] src/ntfs_io.c: fix ntfs_device_testdisk_io_ioctl() prototype
- for ntfs-3g
-
----
-Gentoo note: link to upstream commit:
-https://git.cgsecurity.org/cgit/testdisk/commit/?id=2b0a0fcde875a89e2beffbe5c43c7518f682b482
-
- src/ntfs_io.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/ntfs_io.c b/src/ntfs_io.c
-index 5ca494a5..fa056724 100644
---- a/src/ntfs_io.c
-+++ b/src/ntfs_io.c
-@@ -159,6 +159,7 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_device *dev, struct stat *bu
- 	return -1;
- }
- 
-+#ifdef HAVE_LIBNTFS
- static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
- 		void *argp)
- {
-@@ -168,6 +169,17 @@ static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
- #endif
- 	return -1;
- }
-+#else
-+static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, unsigned long request,
-+		void *argp)
-+{
-+	log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n");
-+#ifdef ENOTSUP
-+	errno = ENOTSUP;
-+#endif
-+	return -1;
-+}
-+#endif
- 
- /**
-  * Device operations for working with unix style devices and files.
--- 
-2.37.4
-
diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
deleted file mode 100644
index 100c4ccc7787..000000000000
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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 zlib"
-
-REQUIRED_USE="static? ( !gui )"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
-	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="!static? ( ${DEPEND} )"
-BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
-
-DOCS=()
-
-PATCHES=(
-	"${FILESDIR}"/${P}-backport-ntfs-3g-ioctl-prototype.patch
-)
-
-src_configure() {
-	export MOC="$(qt5_get_bindir)/moc"
-	export PATH="$(qt5_get_bindir):${PATH}"
-
-	local myconf=(
-		--enable-sudo
-		--without-ntfs
-		$(use_with ewf)
-		$(use_with jpeg)
-		$(use_with ntfs ntfs3g)
-		$(use_enable gui qt)
-		$(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
-}
diff --git a/app-admin/testdisk/testdisk-7.2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild
index e30e7c0a8b9f..ea419d0652ee 100644
--- a/app-admin/testdisk/testdisk-7.2.ebuild
+++ b/app-admin/testdisk/testdisk-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="ewf jpeg ntfs gui reiserfs static +sudo zlib"
 
 REQUIRED_USE="static? ( !gui )"