reinit the tree, so we can have metadata

6 files changed, 301 insertions, 0 deletions

diff --git a/sys-fs/ext3grep/Manifest b/sys-fs/ext3grep/Manifest
new file mode 100644
index 000000000000..d706b6b92182
--- /dev/null
+++ b/sys-fs/ext3grep/Manifest
@@ -0,0 +1,8 @@
+AUX ext3grep-0.10.1-gcc44.patch 7824 SHA256 44162b8e0cb8d29c45afad37a125dc831b186923ec631f4698cb4dd7054c5e72 SHA512 11404bb9f606a223f328068d7b42911a49df05a0bee68e88e15b58c66964357bab1888af4a3284f3ea7ed559753ac7c80d4db59c63b53ee52117b8c92aae5607 WHIRLPOOL 88af4ebc1e8e76a5f2bf2c896f0aa8ea5ba20a46a4167f711683622545aeab7fc0eeb68a980b1375bc851cb74231293e6fc95bf75fa9fb94abaffe44d443aa7e
+AUX ext3grep-0.10.2-include-unistd_h-for-sysconf.patch 267 SHA256 cf6e664b30df2d2bddf6e6b183b386854999e8f88ee2207e9465831d4b605fd1 SHA512 4675ec597a131f91d9452f10c2d163fa8fa0d883b3138e475992596778cfd80f0499d3dff4092f6bbf09b6e7653c8d35ff18ca98217c8856d1a85596621079ac WHIRLPOOL 7ba7c7a3020115e55178519e113d4b5af453e7768c2494a5f1f1472b17c6174a6eba883ca3c962015095aba29071e575c131012f62023295f4b9580e0c4363a7
+AUX ext3grep-0.10.2-new-e2fsprogs.diff 1478 SHA256 86407fe3bb74218d32dce0a8f4c4f21b3158a115111b3b225072d77ac4475a47 SHA512 f16b5ed428c7bd1bf453d331eb1c114a13a2ec7fdc19d61b9788c5f4f3e5d4d85c013c738e04dbea12967a678d81bddedb60e573ac97c801efffa3ef27774e19 WHIRLPOOL b52a977600bf29f82571a2b98f1c64a079ad19ed00d4fc82e3201a9743f8a5981d3040f77dfaa18eea097e93303313e15ee4917954ed3ab81ac3432bb6446242
+DIST ext3grep-0.10.2.tar.gz 236364 SHA256 586f3e939d2ffd782f6f006b81a3df2dc477c6da03f21edb8860c5c4f7198f3e SHA512 301a65c91d2342753a4588c40d496114067a18ceceb999f10fe3fc49c7d3a20c7836dba915575db352c89de7ff0ed3553cd8fbd2d1540109cb0ff7fa8f530b6f WHIRLPOOL ec56fae174c57c4736284f7f06628353b6c60490b1c9847fbade5808be50aa6a05aa427d8fa5d634c50dfdc196ef744b3dfc7e70955ea4122f2d84e7122259ae
+EBUILD ext3grep-0.10.2.ebuild 817 SHA256 3fe50e12c19d64076d3b619efa119d578c6c46fc45cf3dff0e250d8f1fce1602 SHA512 c748ed20bc31c81789c23653615a8f62608f6910500ab1f564d16a455b905f8274e2619a188724247ec445e51c24d8388bd164e429193f4bcf891590c308e70c WHIRLPOOL a56355fca9340a2321b30ce15a3f91ce5cf568aae9fb957b0ee229d73710d43c1d1d0282c01e9338b9d3c97fc119fd9807d552b3b6361655fe5c4c1ced2c27e2
+MISC ChangeLog 2643 SHA256 fc601db89683e3705ac782a2f23aa3e5c0162d1cac9969a6f08cd367b41517e7 SHA512 ab3474668b993cf08be9cd834fdfe325e83029f2ed2c72ff46ee9b23f374b5d20ca785ce1768fb3f01b08532ac298d242a556cf681c61550d4751d3b9ed5fb97 WHIRLPOOL 5edaaa36b4cbbd7e21a4a046e710ddc1b760bc7989c5e9c9d72df6d94097440c16b58228d667c66efb0cd1a5a496f6be1f7b271e2fcfcd5577951bc589ad13e1
+MISC ChangeLog-2015 1283 SHA256 b9cbab9d53c605a47da1815d0a633ffba929cace38a5e49b1af1213e615d70ef SHA512 feea111efd06173ede03fc5ef80557f55b2c453190f652914e33262b0c0135c6a266839b4c70bfe5e031437562f8e297710d1b026a74c360da0051e82886725d WHIRLPOOL 3bbdddf51619c100af903f8823bb478b35da08b0de84513b71e64856915e16a52c55732c850d1e67c22c202c6594555ec3c9794897a4527348961a289a519805
+MISC metadata.xml 294 SHA256 9ad6fdc9b0f17b573797b50ccfc7e25f602ca2d411ab0226314fb0eaff3b4229 SHA512 db238ab8c6f8c7c51748dc51b47d4f34553671e36792ca466b1dceaafd41293c65af7303bf060315a826bb995ea34445b5b016918556b2d3ff2fc09077a57ae5 WHIRLPOOL f4bf0d957ab4b0ab38b6c7ee7d237980f29bae872a52e395642dd128fb2074b5ed672ed13e22f32e7b774b4d57af2eecff453b65e6f5ad30d32ba157a20eee53
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
new file mode 100644
index 000000000000..88c27978d04d
--- /dev/null
+++ b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Recover deleted files on an ext3 file system"
+HOMEPAGE="https://code.google.com/p/ext3grep/"
+SRC_URI="https://ext3grep.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug pch"
+
+DOCS="NEWS README"
+
+RDEPEND=""
+DEPEND="sys-fs/e2fsprogs
+	virtual/os-headers
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.10.1-gcc44.patch \
+		"${FILESDIR}"/${P}-include-unistd_h-for-sysconf.patch
+
+	# Fix build against latest e2fsprogs, taken from
+	# https://code.google.com/p/ext3grep/issues/detail?id=34
+	epatch "${FILESDIR}"/${P}-new-e2fsprogs.diff
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable pch)
+}
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.1-gcc44.patch b/sys-fs/ext3grep/files/ext3grep-0.10.1-gcc44.patch
new file mode 100644
index 000000000000..a7a668c783b9
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.1-gcc44.patch
@@ -0,0 +1,197 @@
+diff -Naur ext3grep-0.10.1-orig/src/commandline.cc ext3grep-0.10.1/src/commandline.cc
+--- ext3grep-0.10.1-orig/src/commandline.cc	2008-12-14 16:25:53.000000000 +0100
++++ ext3grep-0.10.1/src/commandline.cc	2009-08-04 00:25:40.000000000 +0200
+@@ -32,6 +32,8 @@
+ #include "globals.h"
+ #include "restore.h"
+ #include "accept.h"
++#include <ctime>
++#include <limits>
+ 
+ // Commandline options.
+ bool commandline_superblock = false;
+diff -Naur ext3grep-0.10.1-orig/src/custom.cc ext3grep-0.10.1/src/custom.cc
+--- ext3grep-0.10.1-orig/src/custom.cc	2008-10-23 00:20:32.000000000 +0200
++++ ext3grep-0.10.1/src/custom.cc	2009-08-04 00:25:40.000000000 +0200
+@@ -42,6 +42,9 @@
+ #include "get_block.h"
+ #include "init_consts.h"
+ #include "print_inode_to.h"
++#include <sys/time.h>
++#include <cstring>
++#include <ctime>
+ 
+ // The first part of this file was written and used for custom job:
+ // recovering emails on a 40 GB partition that had no information
+diff -Naur ext3grep-0.10.1-orig/src/debug.h ext3grep-0.10.1/src/debug.h
+--- ext3grep-0.10.1-orig/src/debug.h	2008-06-27 17:01:19.000000000 +0200
++++ ext3grep-0.10.1/src/debug.h	2009-08-04 00:25:07.000000000 +0200
+@@ -31,6 +31,7 @@
+ 
+ #include <iostream>
+ #include <cstdlib>      // std::exit, EXIT_FAILURE
++#include <stdint.h>
+ 
+ #define AllocTag1(p)
+ #define AllocTag2(p, desc)
+diff -Naur ext3grep-0.10.1-orig/src/directories.cc ext3grep-0.10.1/src/directories.cc
+--- ext3grep-0.10.1-orig/src/directories.cc	2008-10-16 00:45:31.000000000 +0200
++++ ext3grep-0.10.1/src/directories.cc	2009-08-04 00:25:40.000000000 +0200
+@@ -33,6 +33,9 @@
+ #include "indirect_blocks.h"
+ #include "get_block.h"
+ #include "directories.h"
++#include <cstring>
++#include <ctime>
++#include <algorithm>
+ 
+ //-----------------------------------------------------------------------------
+ //
+diff -Naur ext3grep-0.10.1-orig/src/dir_inode_to_block.cc ext3grep-0.10.1/src/dir_inode_to_block.cc
+--- ext3grep-0.10.1-orig/src/dir_inode_to_block.cc	2008-06-28 15:40:06.000000000 +0200
++++ ext3grep-0.10.1/src/dir_inode_to_block.cc	2009-08-04 00:25:40.000000000 +0200
+@@ -40,6 +40,8 @@
+ #include "print_inode_to.h"
+ #include "directories.h"
+ #include "journal.h"
++#include <cstring>
++#include <limits>
+ 
+ //-----------------------------------------------------------------------------
+ //
+diff -Naur ext3grep-0.10.1-orig/src/histogram.cc ext3grep-0.10.1/src/histogram.cc
+--- ext3grep-0.10.1-orig/src/histogram.cc	2008-06-28 16:13:31.000000000 +0200
++++ ext3grep-0.10.1/src/histogram.cc	2009-08-04 00:25:40.000000000 +0200
+@@ -29,6 +29,7 @@
+ #endif
+ 
+ #include "commandline.h"
++#include <cstring>
+ 
+ //-----------------------------------------------------------------------------
+ //
+diff -Naur ext3grep-0.10.1-orig/src/indirect_blocks.cc ext3grep-0.10.1/src/indirect_blocks.cc
+--- ext3grep-0.10.1-orig/src/indirect_blocks.cc	2008-10-20 20:45:29.000000000 +0200
++++ ext3grep-0.10.1/src/indirect_blocks.cc	2009-08-04 00:25:40.000000000 +0200
+@@ -54,6 +54,7 @@
+ #include "forward_declarations.h"
+ #include "endian_conversion.h"
+ #include "superblock.h"
++#include <set>
+ 
+ //-----------------------------------------------------------------------------
+ //
+diff -Naur ext3grep-0.10.1-orig/src/init_directories.cc ext3grep-0.10.1/src/init_directories.cc
+--- ext3grep-0.10.1-orig/src/init_directories.cc	2008-06-29 21:08:31.000000000 +0200
++++ ext3grep-0.10.1/src/init_directories.cc	2009-08-04 00:25:40.000000000 +0200
+@@ -39,6 +39,7 @@
+ #include "get_block.h"
+ #include "journal.h"
+ #include "dir_inode_to_block.h"
++#include <limits>
+ 
+ all_directories_type all_directories;
+ inode_to_directory_type inode_to_directory;
+diff -Naur ext3grep-0.10.1-orig/src/init_files.cc ext3grep-0.10.1/src/init_files.cc
+--- ext3grep-0.10.1-orig/src/init_files.cc	2008-06-29 04:39:33.000000000 +0200
++++ ext3grep-0.10.1/src/init_files.cc	2009-08-04 00:25:40.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include "globals.h"
+ #include "forward_declarations.h"
+ #include "journal.h"
++#include <algorithm>
+ 
+ //-----------------------------------------------------------------------------
+ //
+diff -Naur ext3grep-0.10.1-orig/src/inode.cc ext3grep-0.10.1/src/inode.cc
+--- ext3grep-0.10.1-orig/src/inode.cc	2008-06-29 04:44:39.000000000 +0200
++++ ext3grep-0.10.1/src/inode.cc	2009-08-04 00:25:41.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include "globals.h"
+ #include "conversion.h"
+ #include "inode.h"
++#include <limits>
+ 
+ #if USE_MMAP
+ void inode_unmap(int group)
+diff -Naur ext3grep-0.10.1-orig/src/is_blockdetection.h ext3grep-0.10.1/src/is_blockdetection.h
+--- ext3grep-0.10.1-orig/src/is_blockdetection.h	2008-07-11 02:23:37.000000000 +0200
++++ ext3grep-0.10.1/src/is_blockdetection.h	2009-08-04 00:25:40.000000000 +0200
+@@ -31,6 +31,8 @@
+ 
+ #include "inode.h"	// Needed for InodePointer
+ 
++#include <cstring>
++
+ // Return type of is_directory.
+ enum is_directory_type {
+   isdir_no = 0,         // Block is not a directory.
+diff -Naur ext3grep-0.10.1-orig/src/journal.cc ext3grep-0.10.1/src/journal.cc
+--- ext3grep-0.10.1-orig/src/journal.cc	2008-10-18 03:06:35.000000000 +0200
++++ ext3grep-0.10.1/src/journal.cc	2009-08-04 00:25:40.000000000 +0200
+@@ -37,6 +37,8 @@
+ #include "indirect_blocks.h"
+ #include "get_block.h"
+ #include "commandline.h"
++#include <algorithm>
++#include <ctime>
+ 
+ //-----------------------------------------------------------------------------
+ //
+diff -Naur ext3grep-0.10.1-orig/src/last_undeleted_directory_inode_refering_to_block.cc ext3grep-0.10.1/src/last_undeleted_directory_inode_refering_to_block.cc
+--- ext3grep-0.10.1-orig/src/last_undeleted_directory_inode_refering_to_block.cc	2008-07-11 19:18:57.000000000 +0200
++++ ext3grep-0.10.1/src/last_undeleted_directory_inode_refering_to_block.cc	2009-08-04 00:25:41.000000000 +0200
+@@ -29,6 +29,7 @@
+ #include "is_blockdetection.h"
+ #include "inode_refers_to.h"
+ #include "journal.h"
++#include <limits>
+ 
+ // Return std::numeric_limits<int>::max() if the inode is still allocated
+ // and refering to the given block, otherwise return the Journal sequence
+diff -Naur ext3grep-0.10.1-orig/src/ostream_operators.cc ext3grep-0.10.1/src/ostream_operators.cc
+--- ext3grep-0.10.1-orig/src/ostream_operators.cc	2008-10-20 20:45:29.000000000 +0200
++++ ext3grep-0.10.1/src/ostream_operators.cc	2009-08-04 00:25:41.000000000 +0200
+@@ -31,6 +31,7 @@
+ #include "endian_conversion.h"
+ #include "superblock.h"
+ #include "globals.h"
++#include <ctime>
+ 
+ //-----------------------------------------------------------------------------
+ //
+diff -Naur ext3grep-0.10.1-orig/src/print_inode_to.cc ext3grep-0.10.1/src/print_inode_to.cc
+--- ext3grep-0.10.1-orig/src/print_inode_to.cc	2008-10-17 03:27:15.000000000 +0200
++++ ext3grep-0.10.1/src/print_inode_to.cc	2009-08-04 00:25:41.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include "FileMode.h"
+ #include "globals.h"
+ #include "print_symlink.h"
++#include <ctime>
+ 
+ void print_inode_to(std::ostream& os, Inode const& inode)
+ {
+diff -Naur ext3grep-0.10.1-orig/src/restore.cc ext3grep-0.10.1/src/restore.cc
+--- ext3grep-0.10.1-orig/src/restore.cc	2008-10-18 17:30:54.000000000 +0200
++++ ext3grep-0.10.1/src/restore.cc	2009-08-04 00:25:41.000000000 +0200
+@@ -44,6 +44,9 @@
+ #include "FileMode.h"
+ #include "indirect_blocks.h"
+ #include "print_symlink.h"
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <fcntl.h>
+ 
+ #ifdef CPPGRAPH
+ void iterate_over_all_blocks_of__with__restore_file_action(void) { restore_file_action(0, 0, NULL); }
+diff -Naur ext3grep-0.10.1-orig/src/show_journal_inodes.cc ext3grep-0.10.1/src/show_journal_inodes.cc
+--- ext3grep-0.10.1-orig/src/show_journal_inodes.cc	2008-10-18 03:06:35.000000000 +0200
++++ ext3grep-0.10.1/src/show_journal_inodes.cc	2009-08-04 00:25:41.000000000 +0200
+@@ -30,6 +30,7 @@
+ 
+ #include "journal.h"
+ #include "print_inode_to.h"
++#include <limits>
+ 
+ void show_journal_inodes(int inodenr)
+ {
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
new file mode 100644
index 000000000000..bf38c27e7095
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-include-unistd_h-for-sysconf.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/422789
+
+--- src/init_consts.cc
++++ src/init_consts.cc
+@@ -27,6 +27,10 @@
+ #include "debug.h"
+ #endif
+ 
++#if USE_MMAP
++#include <unistd.h> /* sysconf */
++#endif
++
+ #include "globals.h"
+ #include "superblock.h"
+ #include "forward_declarations.h"
diff --git a/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff
new file mode 100644
index 000000000000..45b54b807bd7
--- /dev/null
+++ b/sys-fs/ext3grep/files/ext3grep-0.10.2-new-e2fsprogs.diff
@@ -0,0 +1,34 @@
+diff -ur ext3grep-0.10.1/src/ext3.h ext3grep-0.10.1.new/src/ext3.h
+--- ext3grep-0.10.1/src/ext3.h	2008-04-09 11:20:31.000000000 +0000
++++ ext3grep-0.10.1.new/src/ext3.h	2011-12-10 07:00:50.000000000 +0000
+@@ -24,6 +24,17 @@
+ #ifndef EXT3_H
+ #define EXT3_H
+ 
++// this trickery needs to happen before ext2_fs is included so
++// bail out if it has already been included by another path
++#ifdef _LINUX_EXT2_FS_H
++  #error please include this file before any other includes of ext2fs/ext2_fs.h
++#endif
++
++// some versions of the ext2 headers call this s_frags_per_group and some
++// call it s_clusters_per_group, define one to the other so our code works 
++// with both
++#define s_clusters_per_group s_frags_per_group
++
+ // Use the header files from e2progs (http://e2fsprogs.sourceforge.net)
+ // We can use these headers and then everything named ext2 or ext3.
+ #include <ext2fs/ext2_fs.h>			// Definitions of ext2, ext3 and ext4.
+@@ -110,6 +121,12 @@
+     __u32 faddr(void) const { return i_faddr; }
+     __u16 uid_high(void) const { return i_uid_high; }
+     __u16 gid_high(void) const { return i_gid_high; }
++#ifndef i_reseved2
++    //i_reseved2 has been split into two fields in recent 
++    //versions of the headers, luckilly we can still access
++    //it in one peice through the hurd side of the union
++    #define i_reserved2 osd2.hurd2.h_i_author
++#endif
+     __u32 reserved2(void) const { return i_reserved2; }
+ 
+     void set_reserved2(__u32 val) { i_reserved2 = val; }
diff --git a/sys-fs/ext3grep/metadata.xml b/sys-fs/ext3grep/metadata.xml
new file mode 100644
index 000000000000..02fa89d149d1
--- /dev/null
+++ b/sys-fs/ext3grep/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hanno@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">ext3grep</remote-id>
+	</upstream>
+</pkgmetadata>