commit: ddd2b717fc95fefacf0febe6f71ab4cfa06fdaa8 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Mar 30 14:28:27 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Mar 30 14:28:27 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddd2b717
app-admin/testdisk: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-admin/testdisk/Manifest | 1 - ...disk-7.1-backport-ntfs-3g-ioctl-prototype.patch | 46 ----------- app-admin/testdisk/testdisk-7.1-r2.ebuild | 96 ---------------------- 3 files changed, 143 deletions(-) diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index 99ef2a164156..bef94bf92ce7 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -1,2 +1 @@ -DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5 DIST testdisk-7.2.tar.bz2 855781 BLAKE2B 224fae052fa9264ee83fdf6804159c77257b9db4c96ff36c7cb1dc184ec4a9f0955f0d817de24ef1e5fe69e7ef1a20c140e73fc130fb092e6df3b02df2845239 SHA512 f99dd1c8f547c3d06e5459ba072438192a49d76c569de7915994beb269645092522d8136a212999382f88ca1d29c50f6482306d47197dc0994d168bcd4141f26 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 <gren...@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 -}
