ext3grep: fix build with e2fsprogs

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

5 files changed, 65 insertions, 14 deletions

diff --git a/sys-fs/ext3grep/ChangeLog b/sys-fs/ext3grep/ChangeLog
index ce5c3564f2cf..8d5a85847870 100644
--- a/sys-fs/ext3grep/ChangeLog
+++ b/sys-fs/ext3grep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/ext3grep
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ChangeLog,v 1.4 2010/07/08 05:13:10 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ChangeLog,v 1.5 2012/02/26 17:51:44 hanno Exp $
+
+  26 Feb 2012; Hanno Boeck <hanno@gentoo.org> ext3grep-0.10.2.ebuild,
+  +files/ext3grep-0.10.2-new-e2fsprogs.diff:
+  Fix build with latest e2fsprogs.
 
   08 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
   ext3grep-0.10.2.ebuild:
diff --git a/sys-fs/ext3grep/Manifest b/sys-fs/ext3grep/Manifest
index 12d6665119d1..0963700c1897 100644
--- a/sys-fs/ext3grep/Manifest
+++ b/sys-fs/ext3grep/Manifest
@@ -2,18 +2,27 @@
 Hash: SHA256
 
 AUX ext3grep-0.10.1-gcc44.patch 7824 RMD160 a7df93348ba6ca963d67d0def1ece75ded34670b SHA1 bb4ebc1be30d1f6157404ed7144562f895a17867 SHA256 44162b8e0cb8d29c45afad37a125dc831b186923ec631f4698cb4dd7054c5e72
+AUX ext3grep-0.10.2-new-e2fsprogs.diff 1478 RMD160 f8a4a1e25514904023dc74e6de9312562376bdb5 SHA1 31ad05d1aac90596e0118a26ac87a59020f1c400 SHA256 86407fe3bb74218d32dce0a8f4c4f21b3158a115111b3b225072d77ac4475a47
 DIST ext3grep-0.10.1.tar.gz 230939 RMD160 87fdc06cb98ab877d75e7d250dafb83df5c298ca SHA1 fbeb23d8416ed7a5642cba8acbab858d49b0e4a7 SHA256 162f038385a0166e29660e2a759e37f242eaeb7ccd5e6868c8804c71bcc2e3c0
 DIST ext3grep-0.10.2.tar.gz 236364 RMD160 f0745458c5ff131835cef9da7407def7ba0bc73a SHA1 7fec39d612f0a55122450f3a4c82599b122ae353 SHA256 586f3e939d2ffd782f6f006b81a3df2dc477c6da03f21edb8860c5c4f7198f3e
-EBUILD ext3grep-0.10.1.ebuild 800 RMD160 0c5d9b438d45aaf4e4c32295331cbf4500129118 SHA1 8f880026809497cc959510e5f3c69069ebbe925a SHA256 94b36b6675bbb52a2c166685f39be98a59dd3b210477c3f36075231ae401da38
-EBUILD ext3grep-0.10.2.ebuild 733 RMD160 82df6f42a10587c82b77248fc7a7916ef37a4e66 SHA1 97fc0d04d79e394a6355f1fcde6079cf3e5de7b9 SHA256 259708939be733297ebfd215f4d6ddaf2fa498fb283f481e43a5450af2283e60
-MISC ChangeLog 768 RMD160 59a9df1df13ddb1f0baacc08d6b90235e60b9d23 SHA1 9b5bdf428ebc465b15fc1fbfa2e4706636e69120 SHA256 de2a86b833e7e398a1e379d46d39f0b7bc73f42d3675604914e479286bb09c59
+EBUILD ext3grep-0.10.1.ebuild 798 RMD160 70fe687ae739e2dc51f357b78e3071422a184344 SHA1 03ad72bfce708cadcdf873d4ed784eae1ee5a56e SHA256 25ed4cc6f506e60850a5e3455e9352e089553c48d87c94d1cb115711452ae3c3
+EBUILD ext3grep-0.10.2.ebuild 884 RMD160 549cd03328718432881fabef7f86fbc3306eccae SHA1 82dd54d20ceee7b8f723f254a24b35e527bd56a8 SHA256 362d5a1ebd3e5cf65f01c284753350139a2bfc843f1b2ca7db8eb3088a809bee
+MISC ChangeLog 915 RMD160 a393c933dfe2446d7099f44d59c696d49982eeef SHA1 2f9761959b14e054776683dfc80ae92936c4622e SHA256 f4dfec7155a9d4ace8eb90ee299b1f2b9255054ef1810f887f6dcb1bb3b61192
 MISC metadata.xml 196 RMD160 38d93373061ffec39f901f9710573fe2eb6224fc SHA1 9f792f2f8c83cd88b49c8d7e989604a2b21cff6e SHA256 e8ef5daeda229c876fcf81068b64452d16ca1674618ee72fe8c294f6ead29445
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59s3QACgkQfXuS5UK5QB3K1AP/Uxw8Q0sfVru+JXTyfG9BUIVZ
-SWJangM8jpBfL1wM/eLmv4B9ZpLD7rt8HsMsDpqAHzCg8f03t/EmWaXr36hUXZJD
-LHUBg0qcLGjPP9Dwp6FtIKhru5LlHr/9Yu0DqPuSDIee2oxY6EmP85GJR+E/Kvx7
-ISTaZJkLExPEi5VDpD4=
-=OnTm
+iQIcBAEBCAAGBQJPSnE9AAoJEKWIAHK7tR5CJrgP/3/RNILmFFIKEHVi1fRLU5zL
+iHR7PLLpdJHVZpDDaB8J8avAm8TvvkUHYXAScgN3zI1aw17lyIFG6YRVoh8SaWb3
+OFGNH+N6XW1CMuODFQgqsws/aNkod1bx4EimjvD79KxqtnpHnTrvcathMtiKiX0w
+9qJCMpfhAARS7nocHaqvkZKY51bvVeNmPyBo61cOzpcnTiZESriKiBm/pzlz0cjQ
+z+onHWVqljGEtuoBU0scUb2WbBYdG14ZdjdTNOlUKabSfi2Ar475DO9tkZX4KYTF
+kW+sXLDFWb8KvPPeddBBLxTxD7q24gNEagrmWxknpX/tiJIZ5y0r8AIUM03OIhdm
+5Co+3G8q6eFcpEvnWOS4qNGYHrX4A84Il98r1TwzNGo0bVsMxjanvWl/TcC+rogW
+UfCUyr+sdMXcDFFyhhBwjCBoIEJGvsOHVOvxeS7lN1OGCp+zM7rQXbHtKSurdpFP
+DZT5MK6o9w7yjYnJV0PUq3E3dq//Y8pb3svUs7Hwk5yyMPzwfiX8sMF/S3cxAbEE
+iJsX3ZCX50LrBy8h9G/7UtjGWtv8p2Rno5slfc6G89t3zq4zFaDYNR04GtDAbN/S
+v3PWk7SWHS3KmgnTXXQA3WOCdLHGDaiOkxibX1636eokHpp3sAVZKhKjHecLGm/h
+r1SQdWcbKfr+rjpWFNSG
+=GzGc
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/ext3grep/ext3grep-0.10.1.ebuild b/sys-fs/ext3grep/ext3grep-0.10.1.ebuild
index edba8d013d45..8c8ca16fbd6c 100644
--- a/sys-fs/ext3grep/ext3grep-0.10.1.ebuild
+++ b/sys-fs/ext3grep/ext3grep-0.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ext3grep-0.10.1.ebuild,v 1.3 2009/09/23 20:50:19 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ext3grep-0.10.1.ebuild,v 1.4 2012/02/26 17:51:44 hanno Exp $
 
 inherit eutils
 
diff --git a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
index a5875e1ce596..04293ffeaee0 100644
--- a/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
+++ b/sys-fs/ext3grep/ext3grep-0.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ext3grep-0.10.2.ebuild,v 1.2 2010/07/08 05:13:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ext3grep/ext3grep-0.10.2.ebuild,v 1.3 2012/02/26 17:51:44 hanno Exp $
 
 EAPI=3
 inherit eutils
@@ -16,6 +16,10 @@ IUSE="debug pch"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.10.1-gcc44.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() {
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; }