[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Nicolas Bock]

commit:     fb553cb1f000d9246eb154719c8028f06af08a3c
Author:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 11:53:35 2015 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 11:54:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb553cb1

app-admin/testdisk: Fix incorrect slot-operators.

This addresses Bug 555058. I would like to thank the reporter
<josef.95 <AT> freenet.de> for noticing this problem and providing a first patch,
and <kensington <AT> gentoo.org> for taking the time to address slot operators and
their correct use in great detail.

Package-Manager: portage-2.2.20.1

 app-admin/testdisk/testdisk-6.14-r2.ebuild | 83 ++++++++++++++++++++++++++++++
 app-admin/testdisk/testdisk-7.0-r3.ebuild  | 82 +++++++++++++++++++++++++++++
 2 files changed, 165 insertions(+)

diff --git a/app-admin/testdisk/testdisk-6.14-r2.ebuild b/app-admin/testdisk/testdisk-6.14-r2.ebuild
new file mode 100644
index 0000000..067ea20
--- /dev/null
+++ b/app-admin/testdisk/testdisk-6.14-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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: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
+			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}/fix_rare_crash-6.14.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.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
new file mode 100644
index 0000000..b70f9bf
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~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: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
+			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=( )
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Robin H. Johnson]

commit:     848aa515a49e0a0f827613f08c515c797add806a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 01:40:00 2015 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 01:40:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=848aa515

app-admin/testdisk: cleanup per bug 548258

X-Gentoo-Bug: 548258
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 app-admin/testdisk/Manifest                |  3 --
 app-admin/testdisk/testdisk-6.12.ebuild    | 59 ---------------------
 app-admin/testdisk/testdisk-6.13.ebuild    | 59 ---------------------
 app-admin/testdisk/testdisk-6.14-r1.ebuild | 83 ------------------------------
 app-admin/testdisk/testdisk-6.14-r2.ebuild | 83 ------------------------------
 app-admin/testdisk/testdisk-6.14.ebuild    | 60 ---------------------
 6 files changed, 347 deletions(-)

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 945fff0..2f2df7b 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,4 +1 @@
-DIST testdisk-6.12.tar.bz2 554633 SHA256 bdfbe679146518a1321d64f512d6ec8980ac3a9f2296ef27a46c7743d0f9ea16 SHA512 5cd17d1ad851515dcd1f3ef5dfb7435aff2f89e2b0467e84552809d203688a47731e23a602dc10355861414eb2d8c6b9edd48225ccc6229ab59810803a59da4c WHIRLPOOL f667fa6e61990cd6c6532301e461fc1cdcd9303a96566cc501dc1945fd9328b234b8c3f5a760a839a9d4b026da29d03c3189fa9afc58b7f7efa6e96b15008a49
-DIST testdisk-6.13.tar.bz2 560696 SHA256 48275ccddfc9445b6c3e6e181728dae9e49bd25b824a6b5670d58f1f88cdf220 SHA512 30889b8afed5b0fac93ce028e8c95bfa3e14b72d39cc4f86659edcce0b8820c5ce0c2b7e1d09f23f0da977b5d1cb275551069a87b109d05538e63e9b76200442 WHIRLPOOL b9bcf93df5b42a26b4206969ee968122f194338a28c6a500e540e3cafec2ae84d0734624c58b3581fc9ac71f2ea1038f2997e3f91278d6eed18abf786cd31200
-DIST testdisk-6.14.tar.bz2 620077 SHA256 a597c3ebc375acdf0ff60f44ed8935a301132aae78ec00f64f091637d055326c SHA512 f479c7863e1a39bf747a0b73b37eba1016e4762373b9b68747fed6141aa8faa7703c89dddc975df18904759292cd7d333ca0619eacb3c1eea76790a917e95774 WHIRLPOOL def7c9506747c68e5fb786ab0725c8ca2e15ccd53fc7f336d77f72067a6a6094c716c57ec3652a8386bf176b40e2fb1504925c6734bc3037799a4bbef3c8e67d
 DIST testdisk-7.0.tar.bz2 676990 SHA256 00bb3b6b22e6aba88580eeb887037aef026968c21a87b5f906c6652cbee3442d SHA512 b1ebe1d2fca453660a17623b70c06e0195cb5f07056fb7bc683d575c034fb71dfb793582c804dcff0ca57789a6de84bbf13b1a554353811660996e42199102e2 WHIRLPOOL 9ef3ed733f13477435123089cbd6168c189591284aa72dc9636470b35a21a32222d6871916b43e3c2ba4ac6da85979d6ec249b22c2573b77db7b2bcc280b85f1

diff --git a/app-admin/testdisk/testdisk-6.12.ebuild b/app-admin/testdisk/testdisk-6.12.ebuild
deleted file mode 100644
index 5a33676..0000000
--- a/app-admin/testdisk/testdisk-6.12.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit 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 ppc x86"
-IUSE="jpeg ntfs reiserfs static"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
-		>=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"
-RDEPEND="!static? ( ${DEPEND} )"
-
-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"
-	use jpeg || myconf+=" --without-jpeg"
-
-	econf \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--without-ewf \
-		--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-6.13.ebuild b/app-admin/testdisk/testdisk-6.13.ebuild
deleted file mode 100644
index fd2eafa..0000000
--- a/app-admin/testdisk/testdisk-6.13.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit 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 ~ppc ~x86"
-IUSE="jpeg ntfs reiserfs static"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
-		>=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"
-RDEPEND="!static? ( ${DEPEND} )"
-
-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"
-	use jpeg || myconf+=" --without-jpeg"
-
-	econf \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--without-ewf \
-		--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-6.14-r1.ebuild b/app-admin/testdisk/testdisk-6.14-r1.ebuild
deleted file mode 100644
index b38dab5..0000000
--- a/app-admin/testdisk/testdisk-6.14-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~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} )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( )
-PATCHES=( "${FILESDIR}/fix_rare_crash-6.14.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-6.14-r2.ebuild b/app-admin/testdisk/testdisk-6.14-r2.ebuild
deleted file mode 100644
index 067ea20..0000000
--- a/app-admin/testdisk/testdisk-6.14-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~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: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
-			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}/fix_rare_crash-6.14.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-6.14.ebuild b/app-admin/testdisk/testdisk-6.14.ebuild
deleted file mode 100644
index 425b384..0000000
--- a/app-admin/testdisk/testdisk-6.14.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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="jpeg ntfs reiserfs static"
-
-# WARNING: reiserfs support does NOT work with reiserfsprogs
-# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-DEPEND="
-		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"
-RDEPEND="!static? ( ${DEPEND} )"
-
-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"
-	use jpeg || myconf+=" --without-jpeg"
-
-	econf \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		--without-ewf \
-		--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
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Patrick McLean]

commit:     a6b509ee9f2e2a6b4547e2557cf6badd24542b05
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 21:47:03 2015 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 21:48:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6b509ee

app-admin/testdisk: clean up version 7.0-r1

Package-Manager: portage-2.2.26

 app-admin/testdisk/testdisk-7.0-r1.ebuild | 78 -------------------------------
 1 file changed, 78 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.0-r1.ebuild b/app-admin/testdisk/testdisk-7.0-r1.ebuild
deleted file mode 100644
index 6b9540c..0000000
--- a/app-admin/testdisk/testdisk-7.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~ppc ~x86"
-IUSE="jpeg ntfs reiserfs static"
-
-# 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-2013.1.13[static-libs] )
-			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
-			>=sys-fs/e2fsprogs-1.35[static-libs]
-			sys-libs/zlib[static-libs]
-			)
-		!static? (
-			sys-apps/util-linux
-			>=sys-libs/ncurses-5.2
-			jpeg? ( virtual/jpeg:* )
-			ntfs? ( <=sys-fs/ntfs3g-2013.1.13 )
-			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-			>=sys-fs/e2fsprogs-1.35
-			sys-libs/zlib
-			)"
-RDEPEND="!static? ( ${DEPEND} )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( )
-PATCHES=( "${FILESDIR}/install-gentoo.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"
-
-	econf \
-		--docdir "${ROOT}/usr/share/doc/${P}" \
-		--disable-qt \
-		--without-ewf \
-		--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
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Patrick McLean]

commit:     e8c05d243c141c5c2f94bd4180505a692c3eb878
Author:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 21:46:24 2015 +0000
Commit:     Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 21:48:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c05d24

app-admin/testdisk: clean up version 7.0

Package-Manager: portage-2.2.26
RepoMan-Options: --force

 app-admin/testdisk/testdisk-7.0.ebuild | 77 ----------------------------------
 1 file changed, 77 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.0.ebuild b/app-admin/testdisk/testdisk-7.0.ebuild
deleted file mode 100644
index c2c69f9..0000000
--- a/app-admin/testdisk/testdisk-7.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 ~ppc x86"
-IUSE="jpeg ntfs reiserfs static"
-
-# 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-2013.1.13[static-libs] )
-			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8[static-libs] )
-			>=sys-fs/e2fsprogs-1.35[static-libs]
-			sys-libs/zlib[static-libs]
-			)
-		!static? (
-			sys-apps/util-linux
-			>=sys-libs/ncurses-5.2
-			jpeg? ( virtual/jpeg:* )
-			ntfs? ( <=sys-fs/ntfs3g-2013.1.13 )
-			reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-			>=sys-fs/e2fsprogs-1.35
-			sys-libs/zlib
-			)"
-RDEPEND="!static? ( ${DEPEND} )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( )
-PATCHES=( "${FILESDIR}/install-gentoo.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"
-
-	econf \
-		--disable-qt \
-		--without-ewf \
-		--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
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Agostino Sarubbo]

commit:     e2206ce2d1bc161f1d1cfef7ad22c48ecbf8efcf
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 16:39:25 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 16:39:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2206ce2

app-admin/testdisk: amd64 stable wrt bug #576014

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
index b70f9bf..09e4199 100644
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="ewf jpeg ntfs reiserfs static qt4"
 
 REQUIRED_USE="static? ( !qt4 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michael Palimaka]

commit:     698a8af95cb1bf1cb9b6672c4ae6548dc39f2b38
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 10:19:14 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 10:20:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=698a8af9

app-admin/testdisk: remove old

Package-Manager: portage-2.3.0

 app-admin/testdisk/testdisk-7.0-r2.ebuild | 82 -------------------------------
 1 file changed, 82 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.0-r2.ebuild b/app-admin/testdisk/testdisk-7.0-r2.ebuild
deleted file mode 100644
index 4c8b40f..0000000
--- a/app-admin/testdisk/testdisk-7.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 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} )"
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DOCS=( )
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Jeroen Roovers]

commit:     f0c9a256545e98e74d084d25ae3915caded47c21
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 15:00:53 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 15:01:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c9a256

app-admin/testdisk: Mark ~hppa too.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 app-admin/testdisk/testdisk-7.0-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
index a07125a692..9ca63fa3eb 100644
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
 IUSE="ewf jpeg ntfs reiserfs static qt4"
 
 REQUIRED_USE="static? ( !qt4 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     91504aa81e402ba01d7da5b4006500c892b94103
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 17:30:23 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 17:37:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91504aa8

app-admin/testdisk: Remove forensics@ project, #626500

 app-admin/testdisk/metadata.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index 3c5d5f26d18..0a84374e027 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -2,17 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer type="person">
-        <email>robbat2@gentoo.org</email>
+		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
-		<description>Primary maintainer</description>
     </maintainer>
-	<maintainer type="project">
-        <email>forensics@gentoo.org</email>
-        <name>Gentoo Forensics Project</name>
-    </maintainer>
-	<use>
+    <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>
+    </use>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Andreas Sturmlechner]

commit:     c581a15c5ea12c7160969b8ba7065e2c5bf463a2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 12:59:41 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 13:07:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c581a15c

app-admin/testdisk: Add 7.1_pre20180322 Qt5-based snapshot

Bug: https://bugs.gentoo.org/639974
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-admin/testdisk/Manifest                        |  1 +
 app-admin/testdisk/testdisk-7.1_pre20180322.ebuild | 89 ++++++++++++++++++++++
 2 files changed, 90 insertions(+)

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index aaf4fce8fb0..5a9d30a3529 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1 +1,2 @@
 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/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
new file mode 100644
index 00000000000..7ea7b9df550
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+COMMIT=9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1
+inherit autotools-utils 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 ~hppa ~ppc ~x86"
+IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
+
+REQUIRED_USE="static? ( !qt5 )"
+
+# 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} )"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=( )
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sudo
+		--docdir="${ROOT}/usr/share/doc/${P}"
+		$(use_with ewf)
+		$(use_with jpeg)
+		$(use_with ntfs)
+		$(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
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Andreas Sturmlechner]

commit:     6597e61e1ab587f96357adc7367dd6125c6ede9f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 13:14:01 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 13:07:23 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6597e61e

app-admin/testdisk: EAPI 6 bump

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-admin/testdisk/testdisk-7.1_pre20180322.ebuild | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
index 7ea7b9df550..f0091bc8cff 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
 COMMIT=9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1
-inherit autotools-utils flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
@@ -52,15 +51,18 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="!static? ( ${COMMON_DEPEND} )"
 
-AUTOTOOLS_IN_SOURCE_BUILD=1
 DOCS=( )
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	local myeconfargs=(
 		--enable-sudo
-		--docdir="${ROOT}/usr/share/doc/${P}"
 		$(use_with ewf)
 		$(use_with jpeg)
 		$(use_with ntfs)

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Andreas Sturmlechner]

commit:     edafdeca212a24a1f04087ddd72496d2e8ef27b9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 15:40:24 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 15:40:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edafdeca

app-admin/testdisk: Fix USE=ntfs

Reported-by: Frank Krömmelbein <kroemmelbein <AT> gmx.de>
Closes: https://bugs.gentoo.org/651150
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-admin/testdisk/testdisk-7.1_pre20180322.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
index f0091bc8cff..02a968ba376 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
@@ -63,9 +63,9 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-sudo
+ 		--without-ntfs
 		$(use_with ewf)
 		$(use_with jpeg)
-		$(use_with ntfs)
 		$(use_with ntfs ntfs3g)
 		$(use_enable qt5 qt)
 		$(use_with reiserfs)

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Andreas Sturmlechner]

commit:     1e75de92a995f37c480f83b027c206cece28db0e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 16:27:19 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 16:27:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e75de92

app-admin/testdisk: Whitespace cleanup

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-admin/testdisk/testdisk-7.1_pre20180322.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
index 02a968ba376..4aa4e9621ca 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
@@ -63,7 +63,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-sudo
- 		--without-ntfs
+		--without-ntfs
 		$(use_with ewf)
 		$(use_with jpeg)
 		$(use_with ntfs ntfs3g)

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Aaron Bauman]

commit:     374e3602b00a2f4cf3e511b1fab14a206a613725
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 21 23:03:20 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 21 23:03:20 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=374e3602

app-admin/testdisk: amd64 stable wrt bug #639974

Bug: https://bugs.gentoo.org/639974
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 app-admin/testdisk/testdisk-7.1_pre20180322.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
index 4aa4e9621ca..01b29321c4f 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 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Matt Turner]

commit:     060570cb0523b0eb8e659e7e5bb20250138954c1
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 05:34:58 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 05:34:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=060570cb

app-admin/testdisk: Drop to ~ppc, bug 639974

 app-admin/testdisk/testdisk-7.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
index 01eab5bb496..d8f6f196102 100644
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
 IUSE="ewf jpeg ntfs reiserfs static qt4"
 
 REQUIRED_USE="static? ( !qt4 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Richard Farina]

commit:     203715a77cd87c186822f01643861737a55d170a
Author:     Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 20:39:40 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 20:53:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203715a7

app-admin/testdisk: fix qa warning and subslot dep on ntfs3g

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --force

 ...pre20180322.ebuild => testdisk-7.1_pre20180322-r1.ebuild} | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
similarity index 93%
rename from app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
rename to app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
index 5cebad4ea17..b7dc995f76b 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180322.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 COMMIT=9eb2aa12ce051d8d3d31e6b440389d5abf5efaf1
-inherit autotools flag-o-matic
+inherit autotools flag-o-matic gnome2-utils
 
 DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 		sys-fs/e2fsprogs[static-libs]
 		sys-libs/ncurses:0[static-libs]
 		jpeg? ( virtual/jpeg:0[static-libs] )
-		ntfs? ( sys-fs/ntfs3g[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] ) )
@@ -89,3 +89,11 @@ src_configure() {
 		die "Failed to find jpeg library."
 	fi
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     661fb2d44de4f77afc239eb9761030958c2690cc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  5 17:56:39 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct  5 18:01:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=661fb2d4

app-admin/testdisk: Bump to 7.1_pre20180922 snapshot

Bug: https://bugs.gentoo.org/654866
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/Manifest                        |  1 +
 app-admin/testdisk/testdisk-7.1_pre20180922.ebuild | 99 ++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 2a977ec6d5e..99dba768e84 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1 +1,2 @@
+DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
 DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
new file mode 100644
index 00000000000..f5f2f95d5e0
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_COMMIT=6837474129968d7de13d91e5454bd824c9136e73
+inherit autotools flag-o-matic gnome2-utils
+
+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}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
+
+REQUIRED_USE="static? ( !qt5 )"
+
+# 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}-${EGIT_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
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     deb5e0273f8ca487797bb56a73f151995043353b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  5 17:58:52 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Oct  5 18:01:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb5e027

app-admin/testdisk: Add myself as co-maintainer

This is important piece of software, two maintainers are safer than one
;-).

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index 0421c7e4767..4c1e67e367e 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -5,6 +5,10 @@
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<use>
 		<flag name="ntfs">Include the ability to read NTFS filesystems</flag>
 		<flag name="reiserfs">Include reiserfs reading ability</flag>

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Thomas Deutschmann]

commit:     01e9c011522ad7c1e52d904bba8e38fa8c04cc9b
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 19 17:51:55 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 17:52:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e9c011

app-admin/testdisk: x86 stable (bug #654866)

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1_pre20180922.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
index f5f2f95d5e0..2a885a7b4ac 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${EGIT_COMMIT}.tar
 
 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 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Mikle Kolyada]

commit:     dc7bab5353142aad6ba84bc73959cb23cf3523e6
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 20 17:52:31 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Oct 20 17:52:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc7bab53

app-admin/testdisk: amd64 stable wrt bug #654866

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 app-admin/testdisk/testdisk-7.1_pre20180922.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
index 2a885a7b4ac..9c65ee90ea0 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${EGIT_COMMIT}.tar
 
 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 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Sergei Trofimovich]

commit:     a9fb77d78348de5958379aa6cadfc7bfc6777be3
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 18 10:52:07 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 18 10:52:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9fb77d7

app-admin/testdisk: keyworded 7.1_pre20180922 for ppc64, bug #671192

Package-Manager: Portage-2.3.51, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1_pre20180922.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
index 9c65ee90ea0..91b33ce97ff 100644
--- a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
+++ b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.cgsecurity.org/cgit/${PN}/snapshot/${PN}-${EGIT_COMMIT}.tar
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     c9e5ce101a8b19f4a292d42cf538b39d0c0a821a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 07:12:29 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 07:12:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e5ce10

app-admin/testdisk: Drop old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/Manifest                        |  1 -
 .../testdisk/testdisk-7.1_pre20180322-r1.ebuild    | 99 ----------------------
 2 files changed, 100 deletions(-)

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 99dba768e84..ffb73cb5cbc 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,2 +1 @@
 DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
-DIST testdisk-7.1_pre20180322.tar.gz 632598 BLAKE2B 741610622c9afa2c41d14e8eb391cbe629a5f7ac102cf4cbf446b0c0d7330cb8482a17c1ce8470aa9d1b0578aac254cf17aa061e21dd831a803152514fab5422 SHA512 fbe699ccfbe31be636d71eda5d1fccb8efb16788bf664e048ee16344c3d3689961aaa7ef4c9123690db695bb7ae3439440bd775ab8b8455500232b2fc6048ebc

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
deleted file mode 100644
index b7dc995f76b..00000000000
--- a/app-admin/testdisk/testdisk-7.1_pre20180322-r1.ebuild
+++ /dev/null
@@ -1,99 +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 gnome2-utils
-
-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 ~hppa ~ppc x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-# 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
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     4aafb8723201540c9c2e7b67f22ab78da7df973f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 07:21:12 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 07:55:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aafb872

app-admin/testdisk: Bump to 7.1

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/Manifest            |  1 +
 app-admin/testdisk/testdisk-7.1.ebuild | 91 ++++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index ffb73cb5cbc..d9c8b57ebef 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1 +1,2 @@
 DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
+DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5

diff --git a/app-admin/testdisk/testdisk-7.1.ebuild b/app-admin/testdisk/testdisk-7.1.ebuild
new file mode 100644
index 00000000000..2b04d9dc8be
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic xdg-utils
+
+DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
+HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
+SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
+
+REQUIRED_USE="static? ( !qt5 )"
+
+# 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=()
+
+src_configure() {
+	local myconf=(
+		--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 "${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
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     ebd2a8498f60c8e227ddd99088d2fc71d58e8228
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 13 09:38:48 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 13 10:09:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd2a849

app-admin/testdisk: Use HTTPS

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1.ebuild b/app-admin/testdisk/testdisk-7.1.ebuild
index 2b04d9dc8be..cbd57b54dca 100644
--- a/app-admin/testdisk/testdisk-7.1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic xdg-utils
 
 DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
-SRC_URI="http://www.cgsecurity.org/${P}.tar.bz2"
+SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Agostino Sarubbo]

commit:     04ad0c14fd8d0f61c919436242c21d6a3e93bf4a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 10:41:10 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 10:41:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ad0c14

app-admin/testdisk: amd64 stable wrt bug #690866

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1.ebuild b/app-admin/testdisk/testdisk-7.1.ebuild
index cbd57b54dca..4c93b277ce5 100644
--- a/app-admin/testdisk/testdisk-7.1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Thomas Deutschmann]

commit:     7b5c6126167d9456582cfbfa9def46d537fe92ac
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 18:55:27 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 18:55:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b5c6126

app-admin/testdisk: x86 stable (bug #690866)

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1.ebuild b/app-admin/testdisk/testdisk-7.1.ebuild
index 4c93b277ce5..c76b3239eb3 100644
--- a/app-admin/testdisk/testdisk-7.1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     dcfe8a4b0d708e1066999c5baa127b8622caa985
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 10:54:34 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 11:05:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfe8a4b

app-admin/testdisk: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/Manifest                        |  1 -
 app-admin/testdisk/testdisk-7.1_pre20180922.ebuild | 99 ----------------------
 2 files changed, 100 deletions(-)

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index d9c8b57ebef..eb6decb0177 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,2 +1 @@
-DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5

diff --git a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild b/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
deleted file mode 100644
index 91b33ce97ff..00000000000
--- a/app-admin/testdisk/testdisk-7.1_pre20180922.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_COMMIT=6837474129968d7de13d91e5454bd824c9136e73
-inherit autotools flag-o-matic gnome2-utils
-
-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}-${EGIT_COMMIT}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-# 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}-${EGIT_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
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     a140b45cb75a645c719f35a7bf05466dbf7db531
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  8 07:41:47 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar  8 07:42:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a140b45c

app-admin/testdisk: Fix building without qtchooser

Closes: https://bugs.gentoo.org/774102
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1.ebuild b/app-admin/testdisk/testdisk-7.1.ebuild
index c76b3239eb3..07e3dfe84f2 100644
--- a/app-admin/testdisk/testdisk-7.1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic xdg-utils
+inherit autotools flag-o-matic qmake-utils xdg-utils
 
 DESCRIPTION="Checks and undeletes partitions + PhotoRec, signature based recovery tool"
 HOMEPAGE="https://www.cgsecurity.org/wiki/TestDisk"
@@ -53,6 +53,8 @@ RDEPEND="!static? ( ${COMMON_DEPEND} )"
 DOCS=()
 
 src_configure() {
+	export PATH="$(qt5_get_bindir):${PATH}"
+
 	local myconf=(
 		--enable-sudo
 		--without-ntfs

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[David Seifert]

commit:     fb8dd48e81fdee6d6f982aa66b9ac84fc401846d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  1 09:38:16 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep  1 09:38:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb8dd48e

app-admin/testdisk: fix subslot op on sys-fs/ntfs3g

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-admin/testdisk/{testdisk-7.1.ebuild => testdisk-7.1-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
similarity index 94%
rename from app-admin/testdisk/testdisk-7.1.ebuild
rename to app-admin/testdisk/testdisk-7.1-r1.ebuild
index 07e3dfe84f2..5dc76cce23a 100644
--- a/app-admin/testdisk/testdisk-7.1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r1.ebuild
@@ -24,17 +24,17 @@ COMMON_DEPEND="
 		sys-fs/e2fsprogs[static-libs]
 		sys-libs/ncurses:0[static-libs]
 		jpeg? ( virtual/jpeg:0[static-libs] )
-		ntfs? ( sys-fs/ntfs3g:=[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] ) )
+		!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 )
+		ntfs? ( sys-fs/ntfs3g:= )
 		qt5? (
 			dev-qt/qtcore:5
 			dev-qt/qtgui:5

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Sam James]

commit:     36ceddd9f89e4c724a1b6534c577c4d19dcbc099
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 23:07:21 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 23:07:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36ceddd9

app-admin/testdisk: fix UnusedInherits (autotools)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
index 5dc76cce23a2..49c3412c0a54 100644
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic qmake-utils xdg-utils
+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"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Marek Szuba]

commit:     fea037d67d487120a9eda7ab83ef1f6e90d35275
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 22:12:28 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 22:13:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fea037d6

app-admin/testdisk: keyword 7.1-r1 for ~riscv

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
index 49c3412c0a54..2532bfd25503 100644
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Sam James]

commit:     ab09010cb0757f4c06d211a81f24f51ceceb917e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 06:51:56 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 15 01:00:08 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab09010c

app-admin/testdisk: egrep -> grep -E

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
index 2532bfd25503..6ac500bd0a2a 100644
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r1.ebuild
@@ -73,13 +73,13 @@ src_configure() {
 	econf "${myconf[@]}"
 
 	# perform safety checks for NTFS, REISERFS and JPEG
-	if use ntfs && ! egrep -q '^#define HAVE_LIBNTFS(3G)? 1$' "${S}"/config.h ; then
+	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 && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
+	if use reiserfs && grep -E -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
+	if use jpeg && grep -E -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
 		die "Failed to find jpeg library."
 	fi
 }

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Andreas Sturmlechner]

commit:     5d3de4036f6e6ddf9764432e00f8038b68b64f00
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 16:48:58 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Aug  8 09:40:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3de403

app-admin/testdisk: Move dev-qt/linguist-tools:5 to BDEPEND

Bug: https://bugs.gentoo.org/544938
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1-r1.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
index 6ac500bd0a2a..502a73ebc76e 100644
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r1.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="static? ( !qt5 )"
 
 # WARNING: reiserfs support does NOT work with reiserfsprogs
 # you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
-COMMON_DEPEND="
+DEPEND="
 	static? (
 		sys-apps/util-linux[static-libs]
 		sys-fs/e2fsprogs[static-libs]
@@ -45,10 +45,8 @@ COMMON_DEPEND="
 		!arm? ( ewf? ( app-forensics/libewf:= ) )
 	)
 "
-DEPEND="${COMMON_DEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-RDEPEND="!static? ( ${COMMON_DEPEND} )"
+RDEPEND="!static? ( ${DEPEND} )"
+BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
 
 DOCS=()
 

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Sam James]

commit:     5ed17a7dc441d65b871b6df87b86a5b09a03cff6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 05:17:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 05:17:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed17a7d

app-admin/testdisk: use USE=gui

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1-r2.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
index 7019d9e38484..a891080e0dcc 100644
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild
@@ -12,9 +12,9 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
+IUSE="ewf jpeg ntfs gui reiserfs static zlib"
 
-REQUIRED_USE="static? ( !qt5 )"
+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).
@@ -35,7 +35,7 @@ DEPEND="
 		sys-libs/ncurses:0=
 		jpeg? ( media-libs/libjpeg-turbo:= )
 		ntfs? ( sys-fs/ntfs3g:= )
-		qt5? (
+		gui? (
 			dev-qt/qtcore:5
 			dev-qt/qtgui:5
 			dev-qt/qtwidgets:5
@@ -46,7 +46,7 @@ DEPEND="
 	)
 "
 RDEPEND="!static? ( ${DEPEND} )"
-BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
+BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
 
 DOCS=()
 
@@ -64,7 +64,7 @@ src_configure() {
 		$(use_with ewf)
 		$(use_with jpeg)
 		$(use_with ntfs ntfs3g)
-		$(use_enable qt5 qt)
+		$(use_enable gui qt)
 		$(use_with reiserfs)
 		$(use_with zlib)
 	)

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Sam James]

commit:     e975a506af77d1d33f94449670464ea3f5369765
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 05:17:38 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 05:17:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e975a506

app-admin/testdisk: add github upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/testdisk/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index 89a6073cc7db..adbd9697dcd6 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -14,4 +14,7 @@
 		<flag name="reiserfs">Include reiserfs reading ability</flag>
 		<flag name="ewf">Include ewf library</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">cgsecurity/testdisk</remote-id>
+	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Sam James]

commit:     c2a3f08d67f9c49c4c9ec83110ef618efd8bff09
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 05:15:34 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 05:15:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2a3f08d

app-admin/testdisk: set MOC explicitly

The PATH line has been there for a while but let's explicitly set MOC to be safe as
toralf filed it after.

Bug: https://bugs.gentoo.org/875509
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
index 8753298f1237..7019d9e38484 100644
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild
@@ -55,6 +55,7 @@ PATCHES=(
 )
 
 src_configure() {
+	export MOC="$(qt5_get_bindir)/moc"
 	export PATH="$(qt5_get_bindir):${PATH}"
 
 	local myconf=(

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Arthur Zamarin]

commit:     e8e4542f6ec31f39e4abd7019715bd1526e49d40
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 12:20:03 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 12:20:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e4542f

app-admin/testdisk: Stabilize 7.1-r2 amd64, #893046

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
index a891080e0dcc..746af9681ff3 100644
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
 IUSE="ewf jpeg ntfs gui reiserfs static zlib"
 
 REQUIRED_USE="static? ( !gui )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Arthur Zamarin]

commit:     da665fe931e3e9b8991a81cdc85603fbcc632b9d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 11:31:51 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 11:31:51 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da665fe9

app-admin/testdisk: Stabilize 7.1-r2 x86, #893046

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.1-r2.ebuild b/app-admin/testdisk/testdisk-7.1-r2.ebuild
index 746af9681ff3..b280e54ecc04 100644
--- a/app-admin/testdisk/testdisk-7.1-r2.ebuild
+++ b/app-admin/testdisk/testdisk-7.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="ewf jpeg ntfs gui reiserfs static zlib"
 
 REQUIRED_USE="static? ( !gui )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     df9ef8e369a5ef5c3357933373cb9238dd36d589
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  4 14:38:31 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar  4 14:44:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9ef8e3

app-admin/testdisk: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.1-r1.ebuild | 91 -------------------------------
 1 file changed, 91 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.1-r1.ebuild b/app-admin/testdisk/testdisk-7.1-r1.ebuild
deleted file mode 100644
index 502a73ebc76e..000000000000
--- a/app-admin/testdisk/testdisk-7.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 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 ~hppa ~ppc ~ppc64 ~riscv x86"
-IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
-
-REQUIRED_USE="static? ( !qt5 )"
-
-# 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? ( 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:= ) )
-	)
-"
-RDEPEND="!static? ( ${DEPEND} )"
-BDEPEND="qt5? ( dev-qt/linguist-tools:5 )"
-
-DOCS=()
-
-src_configure() {
-	export PATH="$(qt5_get_bindir):${PATH}"
-
-	local myconf=(
-		--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 "${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
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Robin H. Johnson]

commit:     a2573c506caae02d4cdd45c7480e8ada4f463069
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 18:26:10 2024 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 18:33:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2573c50

app-admin/testdisk: bump

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Closes: https://bugs.gentoo.org/900116
Closes: https://bugs.gentoo.org/892904

 app-admin/testdisk/Manifest            |   1 +
 app-admin/testdisk/metadata.xml        |   1 +
 app-admin/testdisk/testdisk-7.2.ebuild | 104 +++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+)

diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index eb6decb01775..99ef2a164156 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1 +1,2 @@
 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/metadata.xml b/app-admin/testdisk/metadata.xml
index adbd9697dcd6..0cde64481bdc 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -13,6 +13,7 @@
 		<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>
+		<flag name="sudo">Enable sudo helper integration</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">cgsecurity/testdisk</remote-id>

diff --git a/app-admin/testdisk/testdisk-7.2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild
new file mode 100644
index 000000000000..e30e7c0a8b9f
--- /dev/null
+++ b/app-admin/testdisk/testdisk-7.2.ebuild
@@ -0,0 +1,104 @@
+# 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 +sudo zlib"
+
+REQUIRED_USE="static? ( !gui )"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	'ntfs_mbstoucs' # configure script checking NTFS, has fallbacks
+)
+
+# WARNING: reiserfs support does NOT work with reiserfsprogs
+# you MUST use progsreiserfs-0.3.1_rc8 (the last version ever released).
+# sudo is detected during configure for extra functionality, see bug #892904
+DEPEND="
+	sudo? ( app-admin/sudo )
+	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="
+	sudo? ( app-admin/sudo )
+	!static? ( ${DEPEND} )
+"
+BDEPEND="gui? ( dev-qt/linguist-tools:5 )"
+
+DOCS=()
+
+PATCHES=(
+)
+
+src_configure() {
+	export MOC="$(qt5_get_bindir)/moc"
+	export PATH="$(qt5_get_bindir):${PATH}"
+
+	local myconf=(
+		--without-ntfs # old NTFS implementation, use ntfs-3g instead.
+		$(use_with ewf)
+		$(use_with jpeg)
+		$(use_with ntfs ntfs3g)
+		$(use_enable gui qt)
+		$(use_enable sudo)
+		$(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
+}

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     70465bbdb24510c2244418727707fe32d26160a0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 14:14:32 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 14:14:32 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70465bbd

app-admin/testdisk: Stabilize 7.2 x86, #928166

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/testdisk/testdisk-7.2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild
index e30e7c0a8b9f..ccf2949b7727 100644
--- a/app-admin/testdisk/testdisk-7.2.ebuild
+++ b/app-admin/testdisk/testdisk-7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="ewf jpeg ntfs gui reiserfs static +sudo zlib"
 
 REQUIRED_USE="static? ( !gui )"

[gentoo-commits] repo/gentoo:master commit in: app-admin/testdisk/

[Michał Górny]

commit:     caeedbcb18799cb77f8e1f19a0e0bc17df8559a1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 14:28:01 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 14:28:01 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caeedbcb

app-admin/testdisk: Stabilize 7.2 amd64, #928166

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/testdisk/testdisk-7.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-admin/testdisk/testdisk-7.2.ebuild b/app-admin/testdisk/testdisk-7.2.ebuild
index ccf2949b7727..ea419d0652ee 100644
--- a/app-admin/testdisk/testdisk-7.2.ebuild
+++ b/app-admin/testdisk/testdisk-7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="ewf jpeg ntfs gui reiserfs static +sudo zlib"
 
 REQUIRED_USE="static? ( !gui )"