summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-04-26 08:23:54 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-04-26 17:36:13 +0200
commit6ecedda792b9f73ce6ff096dcde5a1732b84470f (patch)
tree7945c87db543e32849608a5dfc55366166a52674
parentsys-kernel/vanilla-sources: Automated version bump to {4.14.37,4.16.5} - remo... (diff)
downloadgentoo-6ecedda792b9f73ce6ff096dcde5a1732b84470f.tar.gz
gentoo-6ecedda792b9f73ce6ff096dcde5a1732b84470f.tar.bz2
gentoo-6ecedda792b9f73ce6ff096dcde5a1732b84470f.zip
app-admin/testdisk: Drop old Qt4-based
Bug: https://bugs.gentoo.org/639974 Package-Manager: Portage-2.3.31, Repoman-2.3.9
-rw-r--r--app-admin/testdisk/Manifest1
-rw-r--r--app-admin/testdisk/files/testdisk-7.0-qtbindir.patch27
-rw-r--r--app-admin/testdisk/testdisk-7.0-r3.ebuild83
3 files changed, 0 insertions, 111 deletions
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 5a9d30a3529..2a977ec6d5e 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,2 +1 @@
-DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2
DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc
diff --git a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch b/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
deleted file mode 100644
index cb99e503829..00000000000
--- a/app-admin/testdisk/files/testdisk-7.0-qtbindir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure.ac 2015-04-18 11:04:47.000000000 +0200
-+++ b/configure.ac 2017-12-04 20:34:51.804861863 +0100
-@@ -854,17 +854,14 @@
-
- if test "$use_qt" = "true";
- then
-- PKG_CHECK_MODULES(QTGUI, [QtGui >= 4.0.1],,use_qt=false)
-- AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
-- if test x$MOC = x ; then
-- AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
-+ PKG_CHECK_MODULES([QTGUI], [QtCore >= 4.8.0 QtGui], [
-+ QT_PATH="$( eval $PKG_CONFIG --variable=libdir QtCore )/bin"
-+ AC_PATH_PROGS([MOC], [moc-qt4 moc], [moc], [$QT_PATH])
-+ AC_PATH_PROGS([RCC], [rcc-qt4 rcc], [rcc], [$QT_PATH])
-+ ], [
-+ AC_MSG_ERROR([Qt4 not found])
- use_qt=false
-- fi
-- AC_CHECK_TOOLS(RCC,[rcc-qt4 rcc],)
-- if test x$RCC = x ; then
-- AC_MSG_WARN(Could not find a rcc-qt4 or rcc tool in your PATH.)
-- use_qt=false
-- fi
-+ ])
- qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
- qphotorec_CXXFLAGS="$qphotorec_CXXFLAGS $QTGUI_CFLAGS"
- fi
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
deleted file mode 100644
index d8f6f196102..00000000000
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-
-inherit autotools-utils eutils flag-o-matic
-
-DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
-HOMEPAGE="http://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
-IUSE="ewf jpeg ntfs reiserfs static qt4"
-
-REQUIRED_USE="static? ( !qt4 )"
-
-# 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-libs/ncurses-5.2: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] )
- >=sys-fs/e2fsprogs-1.35[static-libs]
- sys-libs/zlib[static-libs]
- !arm? ( ewf? ( app-forensics/libewf:=[static-libs] ) )
- )
- !static? (
- sys-apps/util-linux
- >=sys-libs/ncurses-5.2:0=
- jpeg? ( virtual/jpeg:0 )
- ntfs? ( sys-fs/ntfs3g )
- reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
- >=sys-fs/e2fsprogs-1.35
- sys-libs/zlib
- !arm? ( ewf? ( app-forensics/libewf:= ) )
- qt4? ( dev-qt/qtgui:4 )
- )"
-RDEPEND="!static? ( ${DEPEND} )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( )
-
-PATCHES=( "${FILESDIR}/${P}-qtbindir.patch" )
-
-src_configure() {
- local myconf
-
- # this is 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
-
- # --with-foo are broken, any use of --with/--without disable the
- # functionality.
- # The following variation must be used.
- use reiserfs || myconf+=" --without-reiserfs"
- use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
- use jpeg || myconf+=" --without-jpeg"
- use ewf || myconf+=" --without-ewf"
- myconf+=$(usex qt4 " --enable-qt" " --disable-qt")
-
- econf \
- --docdir "${ROOT}/usr/share/doc/${P}" \
- --enable-sudo \
- ${myconf}
-
- # 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
-}