Version bump.

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

3 files changed, 72 insertions, 2 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 892be1495b14..abe8b253ffe6 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/testdisk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.40 2011/02/25 18:13:56 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.41 2011/07/03 23:58:06 robbat2 Exp $
+
+*testdisk-6.12 (03 Jul 2011)
+
+  03 Jul 2011; Robin H. Johnson <robbat2@gentoo.org> +testdisk-6.12.ebuild:
+  Version bump.
 
   25 Feb 2011; Kevin McCarthy <signals@gentoo.org> testdisk-6.5.ebuild,
   testdisk-6.8-r1.ebuild, testdisk-6.10.ebuild, testdisk-6.11-r1.ebuild,
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 08dc1002cb8b..4a29537d953b 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -3,13 +3,15 @@ AUX testdisk-6.8-jpeg.patch 906 RMD160 f7bd8d37075b56e9ecaf9d1229ac7158e903c903
 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.12.tar.bz2 554633 RMD160 f33a4aeb15124cd34e3d81b17e9b2c81561272f8 SHA1 ccb0e36dc338bb28e00491a6a7dab5ae2d3ac937 SHA256 bdfbe679146518a1321d64f512d6ec8980ac3a9f2296ef27a46c7743d0f9ea16
 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 2033 RMD160 a57e88550edc192321bb407e6eb1b80c4419e31d SHA1 55f1c741a82347af6e3649d6da3e360a3cd91b5c SHA256 7bbccf1db29a29fab0f727c36e0778287c53707db74b3b561097b255c99f70d2
 EBUILD testdisk-6.11-r1.ebuild 2105 RMD160 0a024695e66816a15ff57b68d70bd050298d8a23 SHA1 fb661d10127e62c870e4308242c3091e7b2cc18a SHA256 7f241f20011f418f186155474c7a6644798e8583ee1c899586774806b0b14c7f
 EBUILD testdisk-6.11.3.ebuild 2125 RMD160 5a710a932cf4a7a2af2112566d85f97a3bbe5320 SHA1 d9be497a733f9c8c121d2793f106119048ac6f86 SHA256 56bf179b38683d78e444e1921301d7496a2ed390c49bae24f30d174fc031bb2c
+EBUILD testdisk-6.12.ebuild 2144 RMD160 0db5c607d0c06c533740e5bb8dbfe57458b63fab SHA1 f414040e71f7283d2129c71be1b2d94220e7ba81 SHA256 c069d0de7c424dc2e55e2e1c5559896f8f15248fa0ae14dcebd795c5d6428dc1
 EBUILD testdisk-6.5.ebuild 1877 RMD160 f6e88e42c20d79984504c92ea41e8bc963668912 SHA1 192d7c5c61cb110d2246cea9b9e34e615805b14a SHA256 c60ab30109b65dabc267bc0ff37cc21dec6796b095c45f8a9cc44b35886e573e
 EBUILD testdisk-6.8-r1.ebuild 2086 RMD160 4208a5a0c7c0f52ea53d4e756eaea1fcd9e07c3e SHA1 e97379e71c9805bb226e197eb080a3be4a6019af SHA256 a5d5fd26796273d57b8c3f97ca098510658465df2a50652e91d4eed7c480c0ce
-MISC ChangeLog 7092 RMD160 5213f2db1e7276d38831b17fbed8ac31c54970c1 SHA1 6580d203f7a436d7e28d5ce0d08fcec56f2186f7 SHA256 de8ddce10b0e9bb313ba9fa92274bedcca2a85b9c40ab5d47ee997f23d626bd8
+MISC ChangeLog 7215 RMD160 1d8c7d9a9f93a79e0786345e815263eb1be3cfe7 SHA1 4eeff1d00be6f6aff11ab79a8c2b55e96947da90 SHA256 55d9d0e22c5267d9a7311db1f71c5f2e19decbec1bf5b1feef6c7dc67a47ebc2
 MISC metadata.xml 553 RMD160 f90665db935e735c1592a12100b645e13395b704 SHA1 4aa0bcef1ccd4f850fb830e40c6f81f7ade8b43d SHA256 109df2f0217ee40fae4245875a5d6820128378a15066cf5e4a422720cafba406
diff --git a/app-admin/testdisk/testdisk-6.12.ebuild b/app-admin/testdisk/testdisk-6.12.ebuild
new file mode 100644
index 000000000000..f2c21d0d5be2
--- /dev/null
+++ b/app-admin/testdisk/testdisk-6.12.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.12.ebuild,v 1.1 2011/07/03 23:58:06 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? ( virtual/jpeg )
+	  	ntfs? ( || ( >=sys-fs/ntfsprogs-2.0.0 sys-fs/ntfs3g ) )
+	  	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}
+}