old

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

3 files changed, 14 insertions, 62 deletions

diff --git a/app-admin/testdisk/ChangeLog b/app-admin/testdisk/ChangeLog
index 23111e359498..381d19e5c080 100644
--- a/app-admin/testdisk/ChangeLog
+++ b/app-admin/testdisk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-admin/testdisk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.46 2012/01/05 22:17:53 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/testdisk/ChangeLog,v 1.47 2012/03/11 18:34:50 ssuominen Exp $
+
+  11 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> -testdisk-6.5.ebuild:
+  old
 
   05 Jan 2012; Michael Weber <xmw@gentoo.org> testdisk-6.12.ebuild:
   ppc stable (bug 332417)
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 0f123bd2596a..e8a0c8ff7b8e 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST testdisk-6.12.tar.bz2 554633 RMD160 f33a4aeb15124cd34e3d81b17e9b2c81561272f8 SHA1 ccb0e36dc338bb28e00491a6a7dab5ae2d3ac937 SHA256 bdfbe679146518a1321d64f512d6ec8980ac3a9f2296ef27a46c7743d0f9ea16
 DIST testdisk-6.13.tar.bz2 560696 RMD160 9ff09fdcc53a02240b4e22365193eac14a7d5e13 SHA1 b08ace0257e3e437b6fc140360d75807ca4d46ae SHA256 48275ccddfc9445b6c3e6e181728dae9e49bd25b824a6b5670d58f1f88cdf220
-DIST testdisk-6.5.tar.bz2 628884 RMD160 df1778147b8b19719b90240b74674c3f438a9cac SHA1 b0c9db078588695879ca2dea55d24fec2d6d12b2 SHA256 dc898056087de5f453fadcba9770af76a1b0f0acff87b13adbb7c2d71b21c2ef
 EBUILD testdisk-6.12.ebuild 1885 RMD160 600e5796eb6b1ca6072827bce7e7e24372684786 SHA1 a5b05565b398a8786bed1e158fd840bc03379a3e SHA256 c1e6368a075a496c83b47b7a56683791de65f59449ab7a4a1d2f7faa18070823
 EBUILD testdisk-6.13.ebuild 1892 RMD160 d850d3941aaab945b08a4e9a185b9012a09b4a3e SHA1 c0771841d4f4b6e322870ffb76c7541520520bb7 SHA256 dafeecaf282d44820822d14c487894e7015c28b0ce5b76dd2b02c7abe672dec9
-EBUILD testdisk-6.5.ebuild 1876 RMD160 6522bae95b6e3f4823e547c8aafc16f9e5c8e690 SHA1 f8f3c808e60d8174032b02a4fff3cf386d9886ff SHA256 7619c50c9a855f8204aeb280b20228b0c99607ec51e13a16b4a9347d6d31f3c4
-MISC ChangeLog 8166 RMD160 cc35b559692ba830fbfba133ad2ac8650d10e7db SHA1 effe4b512364f3b062dadb2423c2eeebed25a17f SHA256 f2ba4f42d7e36bd1de6b7444d8b6580226de5caeca12b7310143f68cf7f4f85b
+MISC ChangeLog 8255 RMD160 96f793b271ed3d90a58be9b069a8f80e1219c5cf SHA1 92f1f4ae735a7b876060c7145393089196369f0a SHA256 774e2dbb9305516d16236fb14936bcbb891cd99458f5e5d19a5ca3ec57b12677
 MISC metadata.xml 553 RMD160 f90665db935e735c1592a12100b645e13395b704 SHA1 4aa0bcef1ccd4f850fb830e40c6f81f7ade8b43d SHA256 109df2f0217ee40fae4245875a5d6820128378a15066cf5e4a422720cafba406
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8GIZQACgkQknrdDGLu8JC02AEAhsXOR1cNc7hY2sHcclE9uHgp
-nK3d9EKjNa6Xqlmbm3wA/j9fqHSxPHk2pNTNP9rslrlCQocY5KWiOu+G9d7Z5PLy
-=acE2
+iQEcBAEBAgAGBQJPXO9LAAoJEEdUh39IaPFN+sQH/3EkFgWNL5B5zitpAoRrtxIa
+bYdS6VYw+rGA9DhtNgKSEnjXQGJHVOS1fkzcy8YwHbuS+8Xy13kH2hTKLWhSHYen
+8pIogAaPMtzE47affyzBUZ9oAh4sK1+9ZENQZcAglPIhGArnHLT33l/qk77DJfCZ
+hmFAzcDmqdVcEhrKuEENymDvZ24Ba9zWQOXHoui5BLP6asbU2zD4L6AA/ME/7icd
+GLXS5A6otr0vJ1djRD431OZrI3kzHsPBCxFpaSRl0T5pGAwU4g+1mJ5VLB/WXDMI
+KkHiaCiXbq7uWmSTuF3xJ8QOVNYbuZxgH9oGttNr929LTYNeaovg9Z0qjqFCoVE=
+=Yzj7
 -----END PGP SIGNATURE-----
diff --git a/app-admin/testdisk/testdisk-6.5.ebuild b/app-admin/testdisk/testdisk-6.5.ebuild
deleted file mode 100644
index 793b816388b7..000000000000
--- a/app-admin/testdisk/testdisk-6.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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.5.ebuild,v 1.7 2011/07/08 10:16:50 ssuominen Exp $
-
-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? ( virtual/jpeg )
-	  	ntfs? ( >=sys-fs/ntfsprogs-1.9.4 )
-	  	reiserfs? ( >=sys-fs/progsreiserfs-0.3.1_rc8 )
-	  	>=sys-fs/e2fsprogs-1.35"
-RDEPEND="!static? ( ${DEPEND} )"
-
-src_compile() {
-	local myconf
-	# --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"
-
-	econf ${myconf} || die
-
-	# perform safety checks for NTFS and REISERFS
-	if use ntfs && egrep -q 'undef HAVE_LIBNTFS\>' "${S}"/config.h ; then
-		die "Failed to find NTFS 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
-
-	# 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
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	[ "$PF" != "$P" ] && mv "${D}"/usr/share/doc/${P} "${D}"/usr/share/doc/${PF}
-}