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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 73 insertions, 9 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/Manifest b/sys-fs/davl/Manifest
index 5b63cf7c4fea..1f8b2db30426 100644
--- a/sys-fs/davl/Manifest
+++ b/sys-fs/davl/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA256
 
 AUX davl-1.2.1-asneeded.patch 1167 SHA256 0211d1eca5b36ad72b5d593c424cdfe4296bf01cb968f9940cf52087b07786d2 SHA512 478d8fb9fa56d8ef0e960178ee477d8c251ef4239b75c78032f2aa2042634be51788adcd9375a344a61be19eafbea7d435db3363be5d4b9f736140bf1bad559d WHIRLPOOL 3d58357282c29a05bf8cf75fd7d57529eb76bea72174b4671bf5e9947f0a8d57a882bf592d81358bb55917a9fef4dbfa0b11a0d7e9112a355908c2c2a1d6690a
+AUX davl-1.2.4-fragment.patch 1047 SHA256 0dca83071f7f69b11350273e909cf5c3dda0547ebbcfd4d657b762af00fd4dfa SHA512 c0dd2c927217388dc90924e4cb794a04a9655aff6e3936dc78efc1bcb7eb22858cef3419a67d9fcf034c3830459158e2fb4b7d0b4a6758b26f9841fb79da6e12 WHIRLPOOL 128514a72acc3f65b577998fd5e9da1dbe6fb12daf76d1d6c5b7da82d940cf66d73c15775fffefeba702cda868f3ac458cbe0e70aa5d33a6be639987a75d114b
 DIST davl-1.2.4.tar.bz2 47539 SHA256 d0a1b0a2528ff029374c5019b04140ca3a99baacb9576cbaa5ee4e87e6c34fb5 SHA512 71c33c0bfaca7c7557541517ec9e7b084e4d50e7504e02d412442566c6046c8a68fe4020e05a3e2da5c9309bd75ba06abba8f16fad96b476b5c961814d24d602 WHIRLPOOL 9378bbf5e47bce2afb8f7038914b535839da03b65e713072303b5efb23e035b792b82dae6233d0a9eb8730094294009d10f331c2099994019224ddbf6c71dbe4
+EBUILD davl-1.2.4-r1.ebuild 811 SHA256 e098cee2696b1ce8e033dd032b608cda4709dd1c7c4b436003bcbb7f6c695124 SHA512 e1e4179fd3e8019d3213c0461c69a0bc520ed7c40afdf3eab07f75b513d2c2e6922283a06d712eae8255f7a761f97bbeaeba1d3307da88fafeec059e161589ec WHIRLPOOL 5142dc2c4294b92ad68cb9a9566a31504cefdc4a87b628a5a722c93b707b9308e106eb09575b107cdbbd5b86375c40e8cad728651c8760e6df97fb92387fa0eb
 EBUILD davl-1.2.4.ebuild 747 SHA256 ee90cea0bb7f5f38996e0c341eca3a689c8be84b14b0fcd28442c5ab441e185b SHA512 be50904ca05b75c176ca4ba0629b6d3431263ca32b32a2a59cbdb4b1e7a06a0730380e63d4458dcfcfd571e1f60e03db23404e4c45634a7a913560c25282f4ba WHIRLPOOL 25ef9aed0c4ffcec6a95445ceedc33e50516f00ad98a688f28d54a38d6f9d457d4c829c55fa656735f780a4811e02139afee9c3d544d473fe40f485869e2c342
-MISC ChangeLog 1098 SHA256 6f16ff5357fe0acfb1e555389f5c11528a92021f5c5e215b6dd53fdca6b8a3bc SHA512 8ba54c8a71d5d4266bc886b25ddce51ba203caebe2569ba85169f260fbbf87c83d239f043b29e9f9122a5637c5eaf63c72022eff4a37162b8bf1debe4088ffc1 WHIRLPOOL 9e44d122f60b57c7666f00864e2bb949eb37d3271cdd13870c7bd3faaa637e87e235e6f77c1b618234582649bf84f6428cc2f03dc6ee9671e8f7db55f467d4bb
+MISC ChangeLog 1315 SHA256 0eb66a0f9ee7fff1e6648907e3b0ddfb6e8554056c7c5b770ec38c10cbe4c344 SHA512 466c6381b46e1c995476f5244520f183af1cc7cf69153e63107f4deed52e6a252b023f99df78b182bb203e450f4383ed0a691446f3013627bad15e0f2fabaff8 WHIRLPOOL b41a3e45abfc4bffdac3f48fa80461d388b83251e210ee89efe57abf40a2214f095fd0d5de4e92992c85a3cc9892cb9b25968a5d5bd3116621e08d0f1161220c
 MISC metadata.xml 202 SHA256 a91f0f0e6c4b102576ebedf4eda3ede427ca5833a25afe7ffdaf0c3a9cf3ff7d SHA512 7bd60a1358b7f4996a79819f923775de0223890702918f23ac6d255d818c2c92f0108c772c915e91e47ebdc4a1a2f92e991ee5426dd5c05b91a49600bd4c7aed WHIRLPOOL 841e5c3c4b55f2de8fb4bfe51b74e716309373adf3704c95ef96d923278dfe9bd5ac86e8b6f275f1ba2545e05959b0178c9fd19c02b6ce067eec6ff44a9fa5b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTcJTnAAoJEEdUh39IaPFNwGUH/jCYrGhLMcLLd+a2aTsKlI52
-csODfiTC26/YFgobsnn6WDd5vPlWwX2eePNNPU3+yDewj9ILiGkNAJQq/JFp7BWD
-iZQr3jcgKZE8o5xnsTkFG28F0FD0uUYe6YA+VGfy63w+LwnzG0RIYP4BzbuQbhEf
-KQBOznFi7XwdxuLJ3yCcOOdi7ozdF62Ujq9Tv1x/VHMWSGsm4GKSb1/ZNPSNW3d/
-R1vpvkEQFE/zz+ULko8ejOoluzox654QQo4Z+IjksYKt0c+bHBVvYk8S1dr0GI2u
-bQP1TkGG0t7odadol4Xuri6XrKUQ8D0+AR7hPj+NCkP6dZ/V/V+Xhx9jGOuj0mQ=
-=qrXz
+iQEcBAEBCAAGBQJTcJkaAAoJEEdUh39IaPFNHBQH/A7v+Rs8aD8a/heCqTO1M3fx
+ujMu0NOAZGW/gLgdkSbkxsN7c+AVU1nLkpxopl0yOn5TutSuL/5ooEZlccD5pPrH
+/wOEewp0i14LxCMJFb0XUTqyMSwyapHN0PrSpS3dzjKczI1u9V1CXOM2Na96Wmvh
+n8f6Jofa0nCGFt2/zRm5GgeZ/R8zOZ59R/wTuv6uhMcztiyb+IZDTDv7ikgJb8OF
+kFNaIb2/c+YaKI5G87XztUOncsaV/Q2dzPbk8HeHwayUMuqajymx6c73tJ6OPi2i
+jRKUWAqZyXIPzjG0bKC09gg1XILv4maO4uFA/AcnDZEwrpjl5dQXj4I7cjOWglc=
+=Pjy5
 -----END PGP SIGNATURE-----
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));