Fix building against recent e2fsprogs wrt #402633 by Richard Yao

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

4 files changed, 69 insertions, 9 deletions

diff --git a/sys-fs/extundelete/ChangeLog b/sys-fs/extundelete/ChangeLog
index 7583c1b79c01..45be78cfc05b 100644
--- a/sys-fs/extundelete/ChangeLog
+++ b/sys-fs/extundelete/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/extundelete
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/extundelete/ChangeLog,v 1.3 2011/06/19 13:59:20 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/extundelete/ChangeLog,v 1.4 2012/02/26 17:38:17 ssuominen Exp $
+
+*extundelete-0.2.0-r1 (26 Feb 2012)
+
+  26 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +extundelete-0.2.0-r1.ebuild, +files/extundelete-0.2.0-build.patch:
+  Fix building against recent e2fsprogs wrt #402633 by Richard Yao
 
   19 Jun 2011; Markus Meier <maekke@gentoo.org> extundelete-0.2.0.ebuild:
   x86 stable, bug #370789
diff --git a/sys-fs/extundelete/Manifest b/sys-fs/extundelete/Manifest
index 4fff8e538304..c217479c840a 100644
--- a/sys-fs/extundelete/Manifest
+++ b/sys-fs/extundelete/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX extundelete-0.2.0-build.patch 1083 RMD160 d18b178798d8df38d0c8ac5a00267102023aedd0 SHA1 6a05487cdc6ca7ab70f0061e0e6f7af6e869e784 SHA256 99bd56bed3e23b2d7facb05b9d869a906db4b04bd4c4fe4c074c35b93977c0c8
 DIST extundelete-0.2.0.tar.bz2 97851 RMD160 619cc4edf0f50e22008317bd0ff97a96ac2e0bea SHA1 f37fe490c002baed795ff01e9fa1659332811f0c SHA256 0f6a3004d8ddcafe63059a104c174f753c7fc95455081f3ff5aaf3b8c100f97b
+EBUILD extundelete-0.2.0-r1.ebuild 662 RMD160 1059d5ea4629490175afd1b7a18d041a6b9a4f6a SHA1 514e214724bd3882adea9d3aa74806ec557d59d1 SHA256 f20c72d7fb9ae7b37fd439be98da6bee4cb6f7b06f2fbe628cf2a504325927fe
 EBUILD extundelete-0.2.0.ebuild 680 RMD160 eaa632586e199def8378a4b5eefcacb36f982b28 SHA1 3041780894cbe629074e269aae1ea05564488962 SHA256 1a1edb8686315540c746d43dd29c586f7257673be18c6fd0eaf22d8776749d44
-MISC ChangeLog 593 RMD160 18673641ad8dfa47f8731057acba18f855613d7b SHA1 a9d2c6d1f8304f3ad6deef39e2721931bbbfe006 SHA256 aea9a9f8dc8573a0877825fad3545ab521fffc554763552eb4c6c0efbc2d4484
+MISC ChangeLog 825 RMD160 d1d88e14abfe1470cc0c6c424460ab5a2c22297f SHA1 e8900ef0e07581aa2951a533e73d69befa98cc33 SHA256 e98521c6a33fd63148b8c1e459fc44c8508b54ac5b50594b68ce84f7aad3f876
 MISC metadata.xml 243 RMD160 3b16a7e4ab8cc92ef91f0b9ef376a945c09b4872 SHA1 65c18273b1ab11556665b354ef96fd3a18c2d014 SHA256 d3e33171a7887443d3fe1cdcda61f2bfd9373ce3b9a1cc79a9d5bafeb743a8e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59s3QACgkQfXuS5UK5QB0yFwP+MosjDzAaJPfeEvLyggV7pCAD
-1Npmm7woYqd71dwjZ8tZbviLNIfhdKsWokSMcLqp3gX8EX56O1y6Alst9w7GjQ2A
-qAkqCmW3PHSSpPSqb/u2LhSls0ybFXnb8nJc7MHSDKkbVJm5gfY34+lOInOg9WAA
-Czl9dr4T6pkvpYZkCMg=
-=lDWp
+iQEcBAEBAgAGBQJPSm3yAAoJEEdUh39IaPFNT6wH/iTti635qUTy98Aa3yH+ZzNA
+zmDCFhKsFYzS8NtE+f0SBCA0QuTJqDmugiyUI/3Sv0172udsOVMv+lgaA3AUhkLY
+FRBaGHtK9S3t+LJiVRj5ZcwCPR3K6kpNrOheNP0MN75oO9Cc5m1QAzaKd9A4asHp
+C2qxI2zVJRZ+1/1Wgv46QXeGv5E52H3pfZmyD9cv4fuz3iI8shE1hCMsQ5rsLvo/
+CTa6uf9VN/rbOPM+k/l0dWreU4LO0Z1G+CC0APLDU1NT6GwDoCG7LDN8BOzoIW1p
+ukNKLcwEQH9nTsnO9GWweAdYUOv+/lQexe9isiqxpbGtVawhfjpSxCjL4djjrAY=
+=NKcs
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild b/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..c66571d10dad
--- /dev/null
+++ b/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/extundelete/extundelete-0.2.0-r1.ebuild,v 1.1 2012/02/26 17:38:17 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+_E2FS=1.42
+
+DESCRIPTION="A utility to undelete files from an ext3 or ext4 partition"
+HOMEPAGE="http://extundelete.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-fs/e2fsprogs-${_E2FS}
+	>=sys-libs/e2fsprogs-libs-${_E2FS}"
+DEPEND="${RDEPEND}"
+
+DOCS="README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
diff --git a/sys-fs/extundelete/files/extundelete-0.2.0-build.patch b/sys-fs/extundelete/files/extundelete-0.2.0-build.patch
new file mode 100644
index 000000000000..2bd56ef2bbdf
--- /dev/null
+++ b/sys-fs/extundelete/files/extundelete-0.2.0-build.patch
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/402633
+http://projects.archlinux.org/svntogit/community.git/tree/trunk/extundelete-build.patch?h=packages/extundelete
+
+--- src/extundelete.cc
++++ src/extundelete.cc
+@@ -943,3 +943,3 @@
+	{
+-		group_descriptor_table[n] = fs->group_desc[n];
++		group_descriptor_table[n] = *ext2fs_group_desc(fs, fs->group_desc, n);
+	}
+@@ -2613,3 +2613,4 @@
+	inode->osd2.linux2.l_i_gid_high = le16_to_cpu( (uint16_t *) &inodebuf[item*60] );
+-	inode->osd2.linux2.l_i_reserved2 = le32_to_cpu( (uint32_t *) &inodebuf[item*62] );
++	inode->osd2.linux2.l_i_checksum_lo = le16_to_cpu( (uint16_t *) &inodebuf[item*62] );
++	inode->osd2.linux2.l_i_reserved = le16_to_cpu( (uint16_t *) &inodebuf[item*63] );
+ }
+--- src/insertionops.cc
++++ src/insertionops.cc
+@@ -65,3 +65,3 @@
+   os << "# Blocks per group: " << s_block->s_blocks_per_group << std::endl;
+-  os << "# Fragments per group: " << s_block->s_frags_per_group << std::endl;
++  os << "# Fragments per group: " << s_block->s_clusters_per_group << std::endl;
+   os << "# Inodes per group: " << s_block->s_inodes_per_group << std::endl;