gentoo auto-resync : 05:03:2023 - 23:52:45

3 files changed, 2 insertions, 94 deletions

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 117d7f723915..8fa9d1753f84 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,5 +1,4 @@
 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
-EBUILD testdisk-7.1-r1.ebuild 2354 BLAKE2B afc950294c018dbff1423bbfa67e07a9ba6de3166629d8c09bbaafd878071658c9e462d8cf9cdbc5fd85bfdf994050527d164dceee9c7c9f395f1d6d1d2162d6 SHA512 9f878e51186866e6b8d5621e629f020218f24544b611733fb581925fb8fa916cde3ffbf42a29dd5a77e4224e88a0be1029eaaaaf84ec716ebcbc7eb5ed5e4a64
-EBUILD testdisk-7.1-r2.ebuild 2487 BLAKE2B ee5dcbaced5760bec08a8956a90537c724fbe252111fc2a415652fec7790e29ee2926cd8b47ec2ed5ee3fa81d85f76ce90725b50a71d5e70996773f072708c0f SHA512 d37a02399c2001fbef952e4b3c4ec3fb56a26b48cd5e88bb8e6f95f81345f73c4cde29b84553807801f0cd1fd8f7adf9cbce602d1e9280a3f026c14fb9aaa08b
+EBUILD testdisk-7.1-r2.ebuild 2486 BLAKE2B c4b0af4bbf0aa9d42a1e5fa2687c4863403e12ff92b49880094d6fd1113e57bf4b3919400ed48800f4e4a95060841b6fb45c8fe7b98866894eb09028d769fb3a SHA512 542cc7c3878e99d46f42e193a7c18285bcdc0a229e707ee8c7ad8d9c98cd04b68f6376a613ef2648a93a9f6f894c7edc2d2a51c393897cb43e7be01f821c9a9b
 MISC metadata.xml 640 BLAKE2B 2c906cdb19a874657ac6f51ea5ec0035b27b0644e73faac95b9234a888a991bc8d9026252a0bf1bd32841295519fe2a966f77101396ca8071dd96c3f742bfd24 SHA512 8996a1f5afaaf7cf18f088d342b717d43316737e92c7b891c63613f9698e4b60bcdc6c65d3d87e4ce4da129b40993e3a60c75544dd5503e9d104d2652460b58c
diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
deleted file mode 100644
index 502a73ebc76e..000000000000
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 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 ~hppa ~ppc ~ppc64 ~riscv x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-# 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? ( virtual/jpeg:0[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? ( virtual/jpeg:0 )
-		ntfs? ( sys-fs/ntfs3g:= )
-		qt5? (
-			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="qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS=()
-
-src_configure() {
-	export PATH="$(qt5_get_bindir):${PATH}"
-
-	local myconf=(
-		--enable-sudo
-		--without-ntfs
-		$(use_with ewf)
-		$(use_with jpeg)
-		$(use_with ntfs ntfs3g)
-		$(use_enable qt5 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.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
index 746af9681ff3..b280e54ecc04 100644
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="ewf jpeg ntfs gui reiserfs static zlib"
 
 REQUIRED_USE="static? ( !gui )"