diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
deleted file mode 100644
index 2a977ec6d..000000000
--- a/app-admin/testdisk/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
diff --git a/app-admin/testdisk/files/testdisk-7.1_pre20180322-tinfow.patch b/app-admin/testdisk/files/testdisk-7.1_pre20180322-tinfow.patch
deleted file mode 100644
index ac59aaf03..000000000
--- a/app-admin/testdisk/files/testdisk-7.1_pre20180322-tinfow.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Support libtinfow, avoiding a crash.
-bug: https://bugs.gentoo.org/654866
-by: Sławomir Nizio <slawomir.nizio@sabayon.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -545,20 +545,26 @@ if test "x$with_ncurses" != "xno"; then
-    testdisk_LDADD="$testdisk_LDADD -l${ncurses_lib}"
-    photorec_LDADD="$photorec_LDADD -l${ncurses_lib}"
-  fi
--  AC_CHECK_LIB(tinfo,keypad,[
-+
-+ if test "${ncurses_lib}" = "ncursesw"; then
-+  AC_CHECK_LIB(tinfow,keypad, [ tinfo_lib="tinfow" ])
-+ else
-+  AC_CHECK_LIB(tinfo,keypad, [ tinfo_lib="tinfo" ])
-+ fi
-+ if test "${tinfo_lib}" != ""; then
-       AC_DEFINE([HAVE_TINFO],1,[Define to 1 if you have the tinfo library (-ltinfo).])
--# if lib${ncurses_lib}.a is present, try to use libtinfo.a
-- if test "${ncurses_lib_dir}" != "" -a -e "${ncurses_lib_dir}/lib${ncurses_lib}.a";
-- then
--   if test -e "${ncurses_lib_dir}/libtinfo.a"; then
--     testdisk_LDADD="$testdisk_LDADD ${ncurses_lib_dir}/libtinfo.a"
--     photorec_LDADD="$photorec_LDADD ${ncurses_lib_dir}/libtinfo.a"
-+   # if lib${ncurses_lib}.a is present, try to use libtinfo.a
-+   if test "${ncurses_lib_dir}" != "" -a -e "${ncurses_lib_dir}/lib${ncurses_lib}.a";
-+   then
-+     if test -e "${ncurses_lib_dir}/lib${tinfo_lib}.a"; then
-+       testdisk_LDADD="$testdisk_LDADD ${ncurses_lib_dir}/lib${tinfo_lib}.a"
-+       photorec_LDADD="$photorec_LDADD ${ncurses_lib_dir}/lib${tinfo_lib}.a"
-+     fi
-+   else
-+     testdisk_LDADD="$testdisk_LDADD -l${tinfo_lib}"
-+     photorec_LDADD="$photorec_LDADD -l${tinfo_lib}"
-    fi
-- else
--   testdisk_LDADD="$testdisk_LDADD -ltinfo"
--   photorec_LDADD="$photorec_LDADD -ltinfo"
-  fi
--      ])
-   if test "$use_ncmouse" = "true";
-   then
-     ac_save_LIBS="$LIBS"
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
deleted file mode 100644
index 0421c7e47..000000000
--- a/app-admin/testdisk/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<use>
-		<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>
-	</use>
-</pkgmetadata>
diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
deleted file mode 100644
index 83c33dfdc..000000000
--- a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1
-inherit autotools flag-o-matic
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tinfow.patch"
-)
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-COMMON_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:= ) )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="!static? ( ${COMMON_DEPEND} )"
-
-DOCS=( )
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--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 "${myeconfargs[@]}"
-
-	# perform safety checks for NTFS, REISERFS and JPEG
-	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
-		die "Failed to find either NTFS or NTFS-3G library."
-	fi
-	if use reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
-		die "Failed to find reiserfs library."
-	fi
-	if use jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
-		die "Failed to find jpeg library."
-	fi
-}