[gentoo-commits] gentoo-x86 commit in app-admin/testdisk: testdisk-6.8-r1.ebuild ChangeLog testdisk-6.5.ebuild testdisk-6.9.ebuild testdisk-6.8.ebuild testdisk-6.6.ebuild testdisk-6.7-r1.ebuild

[Daniel Black (dragonheart)]

dragonheart    08/04/01 23:54:25

  Modified:             testdisk-6.8-r1.ebuild ChangeLog
                        testdisk-6.5.ebuild
  Added:                testdisk-6.9.ebuild
  Removed:              testdisk-6.8.ebuild testdisk-6.6.ebuild
                        testdisk-6.7-r1.ebuild
  Log:
  fixed compile of 6.8 with USE=-jpeg as per bug #201710 thanks to Florian Philipp for the bug report and Christophe GRENIER for the fix. Version bump to 6.9 as per bug #212094. + QA fixes
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.3                  app-admin/testdisk/testdisk-6.8-r1.ebuild

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

Index: testdisk-6.8-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.8-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- testdisk-6.8-r1.ebuild	10 Feb 2008 14:17:26 -0000	1.2
+++ testdisk-6.8-r1.ebuild	1 Apr 2008 23:54:25 -0000	1.3
@@ -1,10 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.8-r1.ebuild,v 1.2 2008/02/10 14:17:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.8-r1.ebuild,v 1.3 2008/04/01 23:54:25 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
-DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others. Also includes PhotoRec to recover pictures from digital camera memory."
+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"
@@ -23,7 +23,8 @@
 src_unpack() {
 	unpack ${A}
 
-	epatch "${FILESDIR}"/${P}-ntfsprogs2.patch
+	epatch "${DISTDIR}"/${P}-ntfsprogs2.patch.bz2
+	epatch "${FILESDIR}"/${P}-jpeg.patch
 }
 
 src_compile() {



1.30                 app-admin/testdisk/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/ChangeLog?r1=1.29&r2=1.30

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog	10 Feb 2008 14:17:26 -0000	1.29
+++ ChangeLog	1 Apr 2008 23:54:25 -0000	1.30
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/testdisk
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.29 2008/02/10 14:17:26 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.30 2008/04/01 23:54:25 dragonheart Exp $
+
+*testdisk-6.9 (01 Apr 2008)
+
+  01 Apr 2008; Daniel Black <dragonheart@g.o>
+  +files/testdisk-6.8-jpeg.patch, -files/testdisk-6.8-ntfsprogs2.patch,
+  testdisk-6.5.ebuild, -testdisk-6.6.ebuild, -testdisk-6.7-r1.ebuild,
+  -testdisk-6.8.ebuild, testdisk-6.8-r1.ebuild, +testdisk-6.9.ebuild:
+  fixed compile of 6.8 with USE=-jpeg as per bug #201710 thanks to Florian
+  Philipp for the bug report and Christophe GRENIER for the fix. Version bump
+  to 6.9 as per bug #212094. + QA fixes
 
   10 Feb 2008; Markus Meier <maekke@g.o> testdisk-6.8-r1.ebuild:
   x86 stable, bug #208918



1.5                  app-admin/testdisk/testdisk-6.5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/testdisk-6.5.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/testdisk-6.5.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/testdisk-6.5.ebuild?r1=1.4&r2=1.5

Index: testdisk-6.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- testdisk-6.5.ebuild	13 Jul 2007 06:07:38 -0000	1.4
+++ testdisk-6.5.ebuild	1 Apr 2008 23:54:25 -0000	1.5
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.5.ebuild,v 1.4 2007/07/13 06:07:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.5.ebuild,v 1.5 2008/04/01 23:54:25 dragonheart Exp $
 
-DESCRIPTION="Multi-platform tool to check and undelete partition, supports reiserfs, ntfs, fat32, ext2/3 and many others. Also includes PhotoRec to recover pictures from digital camera memory."
+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"
@@ -30,13 +30,13 @@
 	econf ${myconf} || die
 
 	# perform safety checks for NTFS and REISERFS
-	if useq ntfs && egrep -q 'undef HAVE_LIBNTFS\>' ${S}/config.h ; then
+	if useq ntfs && egrep -q 'undef HAVE_LIBNTFS\>' "${S}"/config.h ; then
 		die "Failed to find NTFS library."
 	fi
-	if useq reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' ${S}/config.h ; then
+	if useq reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
 		die "Failed to find reiserfs library."
 	fi
-	if useq jpeg && egrep -q 'undef HAVE_LIBJPEG\>' ${S}/config.h ; then
+	if useq jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
 		die "Failed to find jpeg library."
 	fi
 
@@ -49,5 +49,5 @@
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	[ "$PF" != "$P" ] && mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
+	[ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF}
 }



1.1                  app-admin/testdisk/testdisk-6.9.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/testdisk-6.9.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/testdisk/testdisk-6.9.ebuild?rev=1.1&content-type=text/plain

Index: testdisk-6.9.ebuild
===================================================================
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.9.ebuild,v 1.1 2008/04/01 23:54:25 dragonheart Exp $

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="static reiserfs ntfs jpeg"
# 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? ( media-libs/jpeg )
	  	ntfs? ( >=sys-fs/ntfsprogs-2.0.0 )
	  	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
	  	>=sys-fs/e2fsprogs-1.35"
RDEPEND="!static? ( ${DEPEND} )"

src_compile() {
	local myconf="--without-ewf --enable-sudo"
	# --with-foo are broken, any use of --with/--without disable the
	# functionality.
	# The following variation must be used.
	use reiserfs || myconf="${myconf} --without-reiserfs"
	use ntfs || myconf="${myconf} --without-ntfs"
	use jpeg || myconf="${myconf} --without-jpeg"

	# 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

	econf ${myconf} || die

	# perform safety checks for NTFS and REISERFS
	if useq ntfs && egrep -q 'undef HAVE_LIBNTFS\>' "${S}"/config.h ; then
		die "Failed to find NTFS library."
	fi
	if useq reiserfs && egrep -q 'undef HAVE_LIBREISERFS\>' "${S}"/config.h ; then
		die "Failed to find reiserfs library."
	fi
	if useq jpeg && egrep -q 'undef HAVE_LIBJPEG\>' "${S}"/config.h ; then
		die "Failed to find jpeg library."
	fi

	emake || die
}

src_install() {
	emake DESTDIR="${D}" install || die
	[ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF}
}



-- 
gentoo-commits@l.g.o mailing list