Add missing glib-2 dependency (bug #514332), EAPI bump and fix -Waddress warnings.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x1A5D023975B0583D!)

3 files changed, 74 insertions, 3 deletions

diff --git a/net-fs/wdfs/ChangeLog b/net-fs/wdfs/ChangeLog
index 85f7f0cd0565..2d9abbe52fd8 100644
--- a/net-fs/wdfs/ChangeLog
+++ b/net-fs/wdfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/wdfs
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/wdfs/ChangeLog,v 1.8 2010/06/22 20:05:53 arfrever Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/wdfs/ChangeLog,v 1.9 2014/07/04 15:32:37 dev-zero Exp $
+
+*wdfs-1.4.2-r1 (04 Jul 2014)
+
+  04 Jul 2014; Tiziano Müller <dev-zero@gentoo.org>
+  +files/wdfs-1.4.2-fix-Waddress.patch, +wdfs-1.4.2-r1.ebuild:
+  Add missing glib-2 dependency (bug #514332), EAPI bump and fix -Waddress
+  warnings.
 
   22 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   wdfs-1.4.2.ebuild:
@@ -29,4 +36,3 @@
   30 Jun 2007; Josh Glover <jmglov@gentoo.org> +metadata.xml,
   +wdfs-1.4.2.ebuild:
   This package was submitted by Tiziano Müller in bug #110716
-
diff --git a/net-fs/wdfs/files/wdfs-1.4.2-fix-Waddress.patch b/net-fs/wdfs/files/wdfs-1.4.2-fix-Waddress.patch
new file mode 100644
index 000000000000..0f35776bdebc
--- /dev/null
+++ b/net-fs/wdfs/files/wdfs-1.4.2-fix-Waddress.patch
@@ -0,0 +1,40 @@
+diff --git a/src/wdfs-main.c b/src/wdfs-main.c
+index 9bd5244..a9917b7 100644
+--- a/src/wdfs-main.c
++++ b/src/wdfs-main.c
+@@ -697,7 +697,7 @@ static int wdfs_open(const char *localpath, struct fuse_file_info *fi)
+ 			">> %s() by PID %d\n", __func__, fuse_get_context()->pid);
+ 	}
+ 
+-	assert(localpath &&  &fi);
++	assert(localpath && fi);
+ 
+ 	struct open_file *file = g_new0(struct open_file, 1);
+ 	file->modified = false;
+@@ -763,7 +763,7 @@ static int wdfs_read(
+ 	if (wdfs.debug == true)
+ 		print_debug_infos(__func__, localpath);
+ 
+-	assert(localpath && buf &&  &fi);
++	assert(localpath && buf && fi);
+ 
+ 	struct open_file *file = (struct open_file*)(uintptr_t)fi->fh;
+ 
+@@ -785,7 +785,7 @@ static int wdfs_write(
+ 	if (wdfs.debug == true)
+ 		print_debug_infos(__func__, localpath);
+ 
+-	assert(localpath && buf &&  &fi);
++	assert(localpath && buf && fi);
+ 
+ 	/* data below svn_basedir is read-only */
+ 	if (wdfs.svn_mode == true && g_str_has_prefix(localpath, svn_basedir))
+@@ -961,7 +961,7 @@ static int wdfs_ftruncate(
+ 	if (wdfs.debug == true)
+ 		print_debug_infos(__func__, localpath);
+ 
+-	assert(localpath &&  &fi);
++	assert(localpath && fi);
+ 
+ 	/* data below svn_basedir is read-only */
+ 	if (wdfs.svn_mode == true && g_str_has_prefix(localpath, svn_basedir))
diff --git a/net-fs/wdfs/wdfs-1.4.2-r1.ebuild b/net-fs/wdfs/wdfs-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..0cf426255588
--- /dev/null
+++ b/net-fs/wdfs/wdfs-1.4.2-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/wdfs/wdfs-1.4.2-r1.ebuild,v 1.1 2014/07/04 15:32:37 dev-zero Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="WebDAV filesystem with special features for accessing subversion repositories"
+HOMEPAGE="http://noedler.de/projekte/wdfs/"
+SRC_URI="http://noedler.de/projekte/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=net-libs/neon-0.24.7
+	 >=sys-fs/fuse-2.5
+	 dev-libs/glib:2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-Waddress.patch"
+}