Bug #355131: version bump, bugfixes only.

Package-Manager: portage-2.2.0_alpha23/cvs/Linux x86_64

3 files changed, 73 insertions, 3 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 2ba1c995e764..26bba343c1e6 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/testdisk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.38 2010/01/22 16:39:07 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.39 2011/02/16 00:09:43 robbat2 Exp $
+
+*testdisk-6.11.3 (16 Feb 2011)
+
+  16 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> +testdisk-6.11.3.ebuild:
+  Bug #355131: version bump, bugfixes only.
 
   22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   testdisk-6.11-r1.ebuild:
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 3c3422d65d93..600e946ae547 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,13 +1,15 @@
 AUX testdisk-6.11-exif_bound_checking-v2.patch 5379 RMD160 165ae6d65f885aa0996b113baceeedf290fa24b8 SHA1 48f20be4c7da37b5e6f6d859d1d59a3457bedf23 SHA256 6e31b22483aeabc8e8911825a8cc1fe04d594d8ad05ff43364c262ea44b36ef7
 AUX testdisk-6.8-jpeg.patch 906 RMD160 f7bd8d37075b56e9ecaf9d1229ac7158e903c903 SHA1 be62fb01f9e5f362175d504e128e9119f267e71f SHA256 d65b14f780b07d0f84cad44fd25d8f82ebf9b45ea0229b19c721cbdf53d7e1a8
 DIST testdisk-6.10.tar.bz2 1474157 RMD160 4280290ad49de525c59e92983256c7694541d622 SHA1 21104146148ab98ba2a5a757398336a2345eca36 SHA256 539e7ec274126a827dfa4df751d71d15e03cf66c3fa73aac8f552d486c779593
+DIST testdisk-6.11.3.tar.bz2 3460249 RMD160 4be84ba9de88f40329b2da49dae527dd6aa603fd SHA1 7ffb0528a9dbc4ecad662a998dd7cfa56df124a2 SHA256 203c2d39dea6e3a4b1a39c3f9d60fecf2f3525310da4c20ec854127892c950b9
 DIST testdisk-6.11.tar.bz2 1553183 RMD160 0021601688ec779debd0a225305845b42605aaf9 SHA1 6d25ceaed5a7f5e35466b0ad75a4bca104f66532 SHA256 1d49183063f811ab968658235252cfc3b623faa6188b8e4d6ff8c20e79564075
 DIST testdisk-6.5.tar.bz2 628884 RMD160 df1778147b8b19719b90240b74674c3f438a9cac SHA1 b0c9db078588695879ca2dea55d24fec2d6d12b2 SHA256 dc898056087de5f453fadcba9770af76a1b0f0acff87b13adbb7c2d71b21c2ef
 DIST testdisk-6.8-ntfsprogs2.patch.bz2 8751 RMD160 465a4b34f2f6f9f114c98011c07f15b7b8ab26fb SHA1 2405aaaed4bce405600046adf6e83dec6c4126a9 SHA256 6e30a089825b5271499be816de4b907bf62f790655c9c34bec49ddd9699d182a
 DIST testdisk-6.8.tar.bz2 768698 RMD160 e9fd360e126cbce21c3a17711ea02dc33206cceb SHA1 7e461905fcd275edf019a87ac18bcb4401a2b379 SHA256 390a8c9d537105b8839e7dec60873b59c0a971f31be539c331f29be8d98cd833
 EBUILD testdisk-6.10.ebuild 2040 RMD160 3df60a2758f2be2000496b82c94f56b4285dd983 SHA1 c2b204027ff19fc136d430916a687c3855ef896f SHA256 4f9f89a529ed1e92a2b3f86dfebcbcb1c57ed0cf37adf4bb60720a14e446e5c3
 EBUILD testdisk-6.11-r1.ebuild 2112 RMD160 7bb4e1474b78f53344db1147c0270f91639701ad SHA1 6301d3b211c6ea66134822850231f1bfe3c171be SHA256 566b4565b29038077b9cfb66f1f2acd4dc7ad36ab5a93d1143a6b02861624800
+EBUILD testdisk-6.11.3.ebuild 2130 RMD160 37ff913804fbdd9fc01d38766f275401b68c8de0 SHA1 67d72beb28638283f2466bb0f86c4b1ae03deeec SHA256 fdd0c298f39ca7d81484893fda5ad8664cf142d70b952366f2d2ec66196b8584
 EBUILD testdisk-6.5.ebuild 1884 RMD160 c46783e1a4bec218740583ccfa59ac8dacbd459c SHA1 c420cbc0c874a0902a0a8ad772632144a12580fd SHA256 333ff0be16200c147ba9d09293e2b2be36da139b6dece1305a2ef87ccbb3fed4
 EBUILD testdisk-6.8-r1.ebuild 2088 RMD160 5c7e5de36d763ff069ae1e6f9ad0cd25a0c729a4 SHA1 e5669b0104059e91cfa001a1efc9dec78b40aaa5 SHA256 0f8f07eeb68c4326b93d897aa41eb0d56a589cb017944bb0a1d42662473d2b65
-MISC ChangeLog 6713 RMD160 5f83b047c4625d90c0b6a4335e8e3b64c5216b76 SHA1 040298de91cfaaeea502e9a5973388d84c1007d4 SHA256 f4bde4b63acd6cbaba7ba88875f37a4e1dda13f84f69a4a543f95f1e40445cea
+MISC ChangeLog 6866 RMD160 291a5354f5c4cf6aef99f67e8528005e393bee85 SHA1 3b6b2f799fe6bd8e7fbf2199fadff462d39935f8 SHA256 e25ca6748d3d7cc3d880bcb607b915500aa68f9c7e1d668ae7d0d138d94b4302
 MISC metadata.xml 553 RMD160 f90665db935e735c1592a12100b645e13395b704 SHA1 4aa0bcef1ccd4f850fb830e40c6f81f7ade8b43d SHA256 109df2f0217ee40fae4245875a5d6820128378a15066cf5e4a422720cafba406
diff --git a/app-admin/testdisk/testdisk-6.11.3.ebuild b/app-admin/testdisk/testdisk-6.11.3.ebuild
new file mode 100644
index 000000000000..c956b9f3d75a
--- /dev/null
+++ b/app-admin/testdisk/testdisk-6.11.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/testdisk-6.11.3.ebuild,v 1.1 2011/02/16 00:09:43 robbat2 Exp $
+
+EAPI=2
+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"
+#SRC_URI="http://www.cgsecurity.org/${P}-WIP.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:0 )
+	  	ntfs? ( >=sys-fs/ntfsprogs-2.0.0 )
+	  	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
+	  	>=sys-fs/e2fsprogs-1.35
+		sys-libs/zlib"
+RDEPEND="!static? ( ${DEPEND} )"
+
+#S=${WORKDIR}/${P}-WIP
+
+# merged upstream
+#src_prepare() {
+#	epatch "${FILESDIR}"/${P}-exif_bound_checking-v2.patch
+#}
+
+src_configure() {
+	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
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	[ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF}
+}