Fix building with current e2fsprogs wrt #425820 by Diego Elio Pettenò

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 63 insertions, 1 deletions

diff --git a/sys-fs/davl/ChangeLog b/sys-fs/davl/ChangeLog
index 942f8bb7d8c3..f0ee691dd92e 100644
--- a/sys-fs/davl/ChangeLog
+++ b/sys-fs/davl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/davl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/davl/ChangeLog,v 1.7 2014/05/12 09:32:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/davl/ChangeLog,v 1.8 2014/05/12 09:50:09 ssuominen Exp $
+
+*davl-1.2.4-r1 (12 May 2014)
+
+  12 May 2014; Samuli Suominen <ssuominen@gentoo.org> +davl-1.2.4-r1.ebuild,
+  +files/davl-1.2.4-fragment.patch:
+  Fix building with current e2fsprogs wrt #425820 by Diego Elio Pettenò
 
   12 May 2014; Samuli Suominen <ssuominen@gentoo.org> davl-1.2.4.ebuild:
   Convert from EAPI1 to EAPI5 and respect CC from environment instead of using
diff --git a/sys-fs/davl/davl-1.2.4-r1.ebuild b/sys-fs/davl/davl-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..4fa90cc32953
--- /dev/null
+++ b/sys-fs/davl/davl-1.2.4-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/davl/davl-1.2.4-r1.ebuild,v 1.1 2014/05/12 09:50:09 ssuominen Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Visualizes the fragmentation status of ext2/3 filesystems"
+HOMEPAGE="http://davl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6:2"
+DEPEND="${RDEPEND}
+	>=sys-fs/e2fsprogs-1.38
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.2.1-asneeded.patch \
+		"${FILESDIR}"/${P}-fragment.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin src/{cdavl/cdavl,gdavl/gdavl}
+	dodoc README
+	doman doc/*.8
+}
diff --git a/sys-fs/davl/files/davl-1.2.4-fragment.patch b/sys-fs/davl/files/davl-1.2.4-fragment.patch
new file mode 100644
index 000000000000..2b5e9338700c
--- /dev/null
+++ b/sys-fs/davl/files/davl-1.2.4-fragment.patch
@@ -0,0 +1,20 @@
+cdavl.c:101:53: error: ‘struct ext2_super_block’ has no member named ‘s_log_frag_size’
+cdavl.c:105:53: error: ‘struct ext2_super_block’ has no member named ‘s_frags_per_group’
+
+http://bugs.gentoo.org/425820
+
+--- src/cdavl/cdavl.c
++++ src/cdavl/cdavl.c
+@@ -98,9 +98,11 @@
+ 	PRINT4("s_free_inodes_count:      ", le32_to_cpu(sb->s_free_inodes_count));
+ 	PRINT4("s_first_data_block:       ", le32_to_cpu(sb->s_first_data_block));
+ 	PRINT4("s_log_block_size:         ", le32_to_cpu(sb->s_log_block_size));
++	#if 0
+ 	PRINT4("s_log_frag_size:          ", le32_to_cpu(sb->s_log_frag_size));
+-	PRINT4("s_blocks_per_group:       ", le32_to_cpu(sb->s_blocks_per_group));
+ 	PRINT4("s_frags_per_group:        ", le32_to_cpu(sb->s_frags_per_group));
++	#endif
++	PRINT4("s_blocks_per_group:       ", le32_to_cpu(sb->s_blocks_per_group));
+ 	PRINT4("s_inodes_per_group:       ", le32_to_cpu(sb->s_inodes_per_group));
+ 	PRINT4("s_mtime:                  ", le32_to_cpu(sb->s_mtime));
+ 	PRINT4("s_wtime:                  ", le32_to_cpu(sb->s_wtime));