Version bump, drop old, samba-4 ebuilds have a different name for 'client'

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 14 insertions, 55 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 5d0679ad191f..77d90d0dc87f 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.227 2013/10/17 20:37:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.228 2013/11/14 21:55:55 pacho Exp $
+
+*gvfs-1.16.4 (14 Nov 2013)
+
+  14 Nov 2013; Pacho Ramos <pacho@gentoo.org> +gvfs-1.16.4.ebuild,
+  -files/gvfs-1.16.0-expose-archive-backend.patch, -gvfs-1.16.3.ebuild:
+  Version bump, drop old, samba-4 ebuilds have a different name for 'client'
 
   17 Oct 2013; Markus Meier <maekke@gentoo.org> gvfs-1.14.2.ebuild:
   arm stable, bug #476364
diff --git a/gnome-base/gvfs/files/gvfs-1.16.0-expose-archive-backend.patch b/gnome-base/gvfs/files/gvfs-1.16.0-expose-archive-backend.patch
deleted file mode 100644
index 5f50a4f420ac..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.16.0-expose-archive-backend.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up gvfs-1.3.2/Makefile.am.archive-integration gvfs-1.3.2/Makefile.am
---- gvfs-1.3.2/Makefile.am.archive-integration	2009-06-25 19:55:39.000000000 -0400
-+++ gvfs-1.3.2/Makefile.am	2009-07-13 22:51:52.480693853 -0400
-@@ -1,5 +1,19 @@
- NULL =
- 
-+@INTLTOOL_DESKTOP_RULE@
-+
-+desktop_in_files = mount-archive.desktop.in
-+
-+mount-archive.desktop.in: mount-archive.desktop.in.in
-+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-+
-+desktopdir       = $(datadir)/applications
-+if HAVE_ARCHIVE
-+desktop_DATA     = mount-archive.desktop
-+else
-+desktop_DATA     =
-+endif
-+
- SUBDIRS = \
- 	common \
- 	metadata \
-@@ -19,6 +33,8 @@ EXTRA_DIST = \
- 	gvfs.doap		\
- 	README.commits		\
- 	MAINTAINERS		\
-+	mount-archive.desktop.in.in	\
-+	$(desktop_in_files)	\
- 	m4			\
- 	$(NULL)
- 
-diff -up /dev/null gvfs-1.3.2/mount-archive.desktop.in.in
---- /dev/null	2009-07-13 16:21:55.049012465 -0400
-+++ gvfs-1.3.2/mount-archive.desktop.in.in	2009-07-13 22:39:14.844931097 -0400
-@@ -0,0 +1,13 @@
-+[Desktop Entry]
-+_Name=Archive Mounter
-+Exec=@libexecdir@/gvfsd-archive file=%u
-+X-Gnome-Vfs-System=gio
-+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;application/x-xz-compressed-tar;
-+Terminal=false
-+StartupNotify=false
-+Type=Application
-+NoDisplay=true
-+X-GNOME-Bugzilla-Bugzilla=GNOME
-+X-GNOME-Bugzilla-Product=gvfs
-+X-GNOME-Bugzilla-Component=archive-backend
-+X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/gnome-base/gvfs/gvfs-1.16.3.ebuild b/gnome-base/gvfs/gvfs-1.16.4.ebuild
index c38156e39a56..3e6f420f7107 100644
--- a/gnome-base/gvfs/gvfs-1.16.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.16.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.3.ebuild,v 1.5 2013/08/30 22:43:40 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.16.4.ebuild,v 1.1 2013/11/14 21:55:55 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -43,10 +43,10 @@ RDEPEND="
 	gtk? ( >=x11-libs/gtk+-3.0:3 )
 	http? ( >=net-libs/libsoup-gnome-2.34.0:2.4 )
 	ios? (
-		>=app-pda/libimobiledevice-1.1.0:=
+		>=app-pda/libimobiledevice-1.1.5:=
 		>=app-pda/libplist-1:= )
 	mtp? ( >=media-libs/libmtp-1.1.5 )
-	samba? ( >=net-fs/samba-3.4.6[smbclient] )
+	samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4.0.0[client] ) )
 	systemd? ( sys-apps/systemd )
 	udev? (
 		cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
@@ -72,9 +72,11 @@ DEPEND="${RDEPEND}
 # https://bugzilla.gnome.org/700162
 RESTRICT="test"
 
-REQUIRED_USE="cdda? ( udev )
+REQUIRED_USE="
+	cdda? ( udev )
 	udisks? ( udev )
-	systemd? ( udisks )"
+	systemd? ( udisks )
+"
 
 src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits