[gentoo-commits] gentoo-x86 commit in app-admin/testdisk: testdisk-7.0-r2.ebuild testdisk-6.14-r1.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in app-admin/testdisk: testdisk-7.0-r2.ebuild testdisk-6.14-r1.ebuild ChangeLog

[Nicolas Bock (nicolasbock)]

nicolasbock    15/04/24 15:24:10

  Modified:             testdisk-7.0-r2.ebuild ChangeLog
  Added:                testdisk-6.14-r1.ebuild
  Log:
  app-admin/testdisk: Updated testdisk-6.14.
  
  Added patch suggested by jospezial (Comment 5 of Bug 537932).
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key AC91CA52)

Revision  Changes    Path
1.3                  app-admin/testdisk/testdisk-7.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-7.0-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-7.0-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-7.0-r2.ebuild?r1=1.2&r2=1.3

Index: testdisk-7.0-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testdisk-7.0-r2.ebuild	21 Apr 2015 16:27:26 -0000	1.2
+++ testdisk-7.0-r2.ebuild	24 Apr 2015 15:24:10 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0-r2.ebuild,v 1.2 2015/04/21 16:27:26 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-7.0-r2.ebuild,v 1.3 2015/04/24 15:24:10 nicolasbock Exp $
 
 EAPI=5
 
@@ -43,7 +43,6 @@
 			)"
 RDEPEND="!static? ( ${DEPEND} )"
 
-PATCHES=( "${FILESDIR}/install-gentoo.patch" )
 DOCS=( )
 AUTOTOOLS_AUTORECONF=1
 BUILD_DIR="${S}"
@@ -61,8 +60,8 @@
 	use reiserfs || myconf+=" --without-reiserfs"
 	use ntfs || myconf+=" --without-ntfs --without-ntfs3g"
 	use jpeg || myconf+=" --without-jpeg"
-	use qt4 || myconf+=" --disable-qt"
 	use ewf || myconf+=" --without-ewf"
+	myconf+=$(usex qt4 " --enable-qt" " --disable-qt")
 
 	econf \
 		--docdir "${ROOT}/usr/share/doc/${P}" \



1.61                 app-admin/testdisk/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/ChangeLog?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/ChangeLog?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/ChangeLog?r1=1.60&r2=1.61

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ChangeLog	21 Apr 2015 16:27:26 -0000	1.60
+++ ChangeLog	24 Apr 2015 15:24:10 -0000	1.61
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/testdisk
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.60 2015/04/21 16:27:26 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.61 2015/04/24 15:24:10 nicolasbock Exp $
+
+*testdisk-6.14-r1 (24 Apr 2015)
+
+  24 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org>
+  +files/fix_rare_crash-6.14.patch, +testdisk-6.14-r1.ebuild,
+  testdisk-7.0-r2.ebuild:
+  app-admin/testdisk: Updated testdisk-6.14.  Added patch suggested by jospezial
+  (Comment 5 of Bug 537932).
 
   21 Apr 2015; Nicolas Bock <nicolasbock@gentoo.org> metadata.xml,
   testdisk-7.0-r2.ebuild:



1.1                  app-admin/testdisk/testdisk-6.14-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-6.14-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/testdisk/testdisk-6.14-r1.ebuild?rev=1.1&content-type=text/plain

Index: testdisk-6.14-r1.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.14-r1.ebuild,v 1.1 2015/04/24 15:24:10 nicolasbock Exp $

EAPI=5

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 ~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[static-libs]
			jpeg? ( virtual/jpeg:*[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
			jpeg? ( virtual/jpeg:* )
			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.0.1:* )
			)"
RDEPEND="!static? ( ${DEPEND} )"

PATCHES=(
	"${FILESDIR}/fix_rare_crash-6.14.patch"
	)
DOCS=( )
AUTOTOOLS_AUTORECONF=1
BUILD_DIR="${S}"

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
}