diff options
Diffstat (limited to 'app-admin/testdisk')
| -rw-r--r-- | app-admin/testdisk/Manifest | 5 | ||||
| -rw-r--r-- | app-admin/testdisk/files/testdisk-7.0-qtbindir.patch | 27 | ||||
| -rw-r--r-- | app-admin/testdisk/testdisk-7.0-r3.ebuild | 83 | ||||
| -rw-r--r-- | app-admin/testdisk/testdisk-7.1_pre20180322.ebuild | 2 |
4 files changed, 2 insertions, 115 deletions
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest index 20b8463f2c67..f4e22c95cde2 100644 --- a/app-admin/testdisk/Manifest +++ b/app-admin/testdisk/Manifest @@ -1,6 +1,3 @@ -AUX testdisk-7.0-qtbindir.patch 958 BLAKE2B 0d3ba4622cc6a83fe6b1fe65dd51203e05c936b7fc169fa5c070a3e77e799eac4f87068a6a6bbe9a3d6fbe25a8c6afae3a5251a72137eb4fdd4afb966e724a9e SHA512 c17dd97e058633cc3ca1f51d371bcce9d702dc2ffbd80eaad2aa1830d17c604702b23e4fb4d1516ab888f55899817e132be535d723c6b7275686d9513c6d6e31 -DIST testdisk-7.0.tar.bz2 676990 BLAKE2B deeeee290f05d4a992ff69c990cca8480c74e67ba2df0b523640833b968ed98dc9f44e5f33b2666daf07286dd8349b98171d6c65f7f3baae3d5cca159a5c9584 SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc -EBUILD testdisk-7.0-r3.ebuild 2495 BLAKE2B c697b2ec48c74b2ca7f5da94fd9a3c563ed587626cf1872f7a30ded729dd33f7c700da3142b8fd3513c1a6b17876893b9218dd44672f1f8b2b03fefeac73889c SHA512 0a3a0d78fc7437884e81b9842c0b1ac40c58c0eae43e27c1effa01c0e2ac350dab48ccd5316fac99c4468943d7ef05545341cdb74c3eb6f5b9a153eb9a23ce8f -EBUILD testdisk-7.1_pre20180322.ebuild 2408 BLAKE2B d068b15b4937388dbb44a847b25c5056c8dde7735c3341d2875d6269d5df7d2543a237c1dab0ac365bace8a7ad8bfa93a162a308e4c6ab00dfb5f91632e1af04 SHA512 c577d34667411e293b2397563ae05b489f7755f43dce2e10bf4c0d4b0a9d32d0f81fb58fb792dcfe2a8d12a77666b1dc9d774186c983a9f555b388ce8ddccf5d +EBUILD testdisk-7.1_pre20180322.ebuild 2407 BLAKE2B b04a9a6b1de0506ab81090ffcf1db9cb402a40ae9045ef7f8072d5c926c71937c2d9b58e4a8462b9eeaf4b419f6bd15c78738ba4887c65e9b0e7278e6b862c7f SHA512 8deaeab93f5f0f71d01326e41f9da0b7806331ef948b4df83190a8db8e251e6e62011f4850f3d473bbcd24afcccfa26371a720897d5fbf0bb13728af182ee60e MISC metadata.xml 447 BLAKE2B da97d4af9961ab42d914dd33abbf433e5974ed49efb2ac2c4ff6cfdd50735bddc48b9b9e15d86a3701d740c73ef9df31439599fdd1cb6a37a306ddcf1cdafc73 SHA512 f6e65d544043790ff6b654dce7e4995214fde5f5c5f35926e396721cc223c97f06a918d7d345e9f4f51c82437af41887a0cb442eb0c7172f839df3249eb58095 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 cb99e503829d..000000000000 --- 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 01eab5bb4960..000000000000 --- 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 -} diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild index 01b29321c4ff..5cebad4ea172 100644 --- a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild +++ b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${COMMIT}.tar.gz - LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86" +KEYWORDS="amd64 ~arm ~hppa ~ppc x86" IUSE="ewf jpeg ntfs qt5 reiserfs static zlib" REQUIRED_USE="static? ( !qt5 )" |