* [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
@ 2011-10-18 7:37 Alexandre Restovtsev
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-10-18 7:37 UTC (permalink / raw
To: gentoo-commits
commit: 1a74dca7732bf4739c68e6ce278dd039458369c1
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Oct 17 23:00:42 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Oct 17 23:11:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1a74dca7
gnome-base/gvfs: 1.10.0 → 1.10.1
Version bump, fixes a possible crash on unmount. Add upstream patch to
purge G_DISABLE_DEPRECATED from makefiles (note that due to
blank-line-in-automake-files issue, sedding would be rather
inconvenient).
---
.../files/gvfs-1.10.1-G_DISABLE_DEPRECATED.patch | 177 ++++++++++++++++++++
.../{gvfs-1.10.0.ebuild => gvfs-1.10.1.ebuild} | 5 +-
2 files changed, 181 insertions(+), 1 deletions(-)
diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-G_DISABLE_DEPRECATED.patch b/gnome-base/gvfs/files/gvfs-1.10.1-G_DISABLE_DEPRECATED.patch
new file mode 100644
index 0000000..46aa250
--- /dev/null
+++ b/gnome-base/gvfs/files/gvfs-1.10.1-G_DISABLE_DEPRECATED.patch
@@ -0,0 +1,177 @@
+From 36f5ca6c59024363169f82642596e791b3733cd6 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 12 Oct 2011 13:44:31 +0000
+Subject: Purge hardcoded -DG_DISABLE_DEPRECATED
+
+Especially now that deprecations are proper gcc warnings, no need
+to hardcode this.
+---
+diff --git a/client/Makefile.am b/client/Makefile.am
+index 925300b..a81db1d 100644
+--- a/client/Makefile.am
++++ b/client/Makefile.am
+@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir) \
+ -I$(top_srcdir)/metadata \
+ -I$(top_srcdir)/common \
+ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
++ -DG_LOG_DOMAIN=\"GVFS\" \
+ -DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+ -DDBUS_API_SUBJECT_TO_CHANGE
+@@ -74,7 +74,7 @@ gvfs_fuse_daemon_CFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/common \
+ $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
+- -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
++ -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
+ -DDBUS_API_SUBJECT_TO_CHANGE
+
+ gvfs_fuse_daemon_LDADD = \
+diff --git a/common/Makefile.am b/common/Makefile.am
+index fefd441..5d5a54e 100644
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES=libgvfscommon.la
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
+ -I$(top_srcdir)/daemon \
+ $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(BLURAY_CFLAGS) \
+- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
++ -DG_LOG_DOMAIN=\"GVFS\" \
+ -DDBUS_API_SUBJECT_TO_CHANGE
+
+ libgvfscommon_la_SOURCES = \
+diff --git a/daemon/Makefile.am b/daemon/Makefile.am
+index 6ca840b..b19ee89 100644
+--- a/daemon/Makefile.am
++++ b/daemon/Makefile.am
+@@ -16,8 +16,7 @@ INCLUDES = \
+ -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
+ -DLIBEXEC_DIR=\"$(libexecdir)/\" \
+ -DMOUNTABLE_DIR=\"$(mountdir)/\" \
+- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED
++ -DGVFS_LOCALEDIR=\""$(localedir)"\"
+
+ noinst_LTLIBRARIES=libdaemon.la
+
+@@ -496,7 +495,7 @@ gvfsd_afp_browse_CPPFLAGS = \
+ gvfsd_afp_browse_LDADD = \
+ $(libraries) \
+ $(LIBGCRYPT_LIBS)
+-
++
+ gvfsd_afp_SOURCES = \
+ gvfsbackendafp.c gvfsbackendafp.h \
+ daemon-main.c daemon-main.h \
+diff --git a/metadata/Makefile.am b/metadata/Makefile.am
+index becf13e..d3f25be 100644
+--- a/metadata/Makefile.am
++++ b/metadata/Makefile.am
+@@ -23,7 +23,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/common \
+ $(LIBXML_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
+ $(UDEV_CFLAGS) \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
++ -DG_LOG_DOMAIN=\"GVFS\" \
+ -DDBUS_API_SUBJECT_TO_CHANGE
+
+ libmetadata_la_SOURCES = \
+diff --git a/monitor/afc/Makefile.am b/monitor/afc/Makefile.am
+index a823080..e524481 100644
+--- a/monitor/afc/Makefile.am
++++ b/monitor/afc/Makefile.am
+@@ -19,7 +19,6 @@ gvfs_afc_volume_monitor_CFLAGS = \
+ $(WARN_CFLAGS) \
+ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\"$(localedir)\" \
+- -DG_DISABLE_DEPRECATED \
+ $(NULL)
+
+ gvfs_afc_volume_monitor_LDADD = \
+diff --git a/monitor/gdu/Makefile.am b/monitor/gdu/Makefile.am
+index c9c9195..4945445 100644
+--- a/monitor/gdu/Makefile.am
++++ b/monitor/gdu/Makefile.am
+@@ -22,7 +22,6 @@ gvfs_gdu_volume_monitor_CFLAGS = \
+ $(DBUS_CFLAGS) \
+ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ -DGDU_API_IS_SUBJECT_TO_CHANGE \
+ $(NULL)
+
+diff --git a/monitor/gphoto2/Makefile.am b/monitor/gphoto2/Makefile.am
+index 80fc424..10b25a7 100644
+--- a/monitor/gphoto2/Makefile.am
++++ b/monitor/gphoto2/Makefile.am
+@@ -39,7 +39,6 @@ gvfs_gphoto2_volume_monitor_CFLAGS = \
+ $(GPHOTO2_CFLAGS) \
+ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
+ $(NULL)
+
+diff --git a/monitor/hal/Makefile.am b/monitor/hal/Makefile.am
+index 2fd3e6a..da8fc7b 100644
+--- a/monitor/hal/Makefile.am
++++ b/monitor/hal/Makefile.am
+@@ -33,7 +33,6 @@ gvfs_hal_volume_monitor_CFLAGS = \
+ $(HAL_CFLAGS) \
+ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ $(NULL)
+
+ gvfs_hal_volume_monitor_LDFLAGS = \
+diff --git a/monitor/proxy/Makefile.am b/monitor/proxy/Makefile.am
+index 86a1efe..bd3b451 100644
+--- a/monitor/proxy/Makefile.am
++++ b/monitor/proxy/Makefile.am
+@@ -25,7 +25,6 @@ libgioremote_volume_monitor_la_CFLAGS = \
+ -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
+ -DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ $(NULL)
+
+ libgioremote_volume_monitor_la_LDFLAGS = \
+@@ -53,7 +52,6 @@ libgvfsproxyvolumemonitordaemon_noin_la_CFLAGS = \
+ $(GDU_CFLAGS) \
+ -DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\" \
+ -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED \
+ $(NULL)
+
+ libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
+diff --git a/programs/Makefile.am b/programs/Makefile.am
+index 532f347..f99eaef 100644
+--- a/programs/Makefile.am
++++ b/programs/Makefile.am
+@@ -4,8 +4,7 @@ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ $(GLIB_CFLAGS) \
+- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
+- -DG_DISABLE_DEPRECATED
++ -DGVFS_LOCALEDIR=\""$(localedir)"\"
+
+ libraries = \
+ $(GLIB_LIBS)
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 70c0cb7..fb6c4b2 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -3,8 +3,7 @@ NULL =
+ AM_CFLAGS = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+- $(GLIB_CFLAGS) \
+- -DG_DISABLE_DEPRECATED
++ $(GLIB_CFLAGS)
+
+ AM_LDFLAGS = \
+ $(GLIB_LIBS)
+--
+cgit v0.9.0.2
diff --git a/gnome-base/gvfs/gvfs-1.10.0.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
similarity index 94%
rename from gnome-base/gvfs/gvfs-1.10.0.ebuild
rename to gnome-base/gvfs/gvfs-1.10.1.ebuild
index 60546e0..3934ab2 100644
--- a/gnome-base/gvfs/gvfs-1.10.0.ebuild
+++ b/gnome-base/gvfs/gvfs-1.10.1.ebuild
@@ -105,7 +105,10 @@ src_prepare() {
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
fi
- { use gphoto2 || use archive || use prefix; } && eautoreconf
+ # Drop G_DISABLE_DEPRECATED (fixed in git master); requires eautoreconf
+ epatch "${FILESDIR}/${PN}-1.10.1-G_DISABLE_DEPRECATED.patch"
+ eautoreconf
+ #{ use gphoto2 || use archive || use prefix; } && eautoreconf
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
@ 2011-10-19 6:31 Alexandre Restovtsev
0 siblings, 0 replies; 4+ messages in thread
From: Alexandre Restovtsev @ 2011-10-19 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 066f0ea86b91e79d896f4eaffa7b4055612dd80d
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Oct 19 05:35:58 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Oct 19 05:38:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=066f0ea8
gnome-base/gvfs: gvfs-1.10.1 moved to gx86
Also, sync live ebuild with changes in gx86.
---
.../files/gvfs-1.10.1-G_DISABLE_DEPRECATED.patch | 177 --------------------
gnome-base/gvfs/gvfs-1.10.1.ebuild | 120 -------------
gnome-base/gvfs/gvfs-9999.ebuild | 8 +-
3 files changed, 2 insertions(+), 303 deletions(-)
diff --git a/gnome-base/gvfs/files/gvfs-1.10.1-G_DISABLE_DEPRECATED.patch b/gnome-base/gvfs/files/gvfs-1.10.1-G_DISABLE_DEPRECATED.patch
deleted file mode 100644
index 46aa250..0000000
--- a/gnome-base/gvfs/files/gvfs-1.10.1-G_DISABLE_DEPRECATED.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From 36f5ca6c59024363169f82642596e791b3733cd6 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 12 Oct 2011 13:44:31 +0000
-Subject: Purge hardcoded -DG_DISABLE_DEPRECATED
-
-Especially now that deprecations are proper gcc warnings, no need
-to hardcode this.
----
-diff --git a/client/Makefile.am b/client/Makefile.am
-index 925300b..a81db1d 100644
---- a/client/Makefile.am
-+++ b/client/Makefile.am
-@@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir) \
- -I$(top_srcdir)/metadata \
- -I$(top_srcdir)/common \
- $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
-- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
-+ -DG_LOG_DOMAIN=\"GVFS\" \
- -DGVFS_MODULE_DIR=\"$(libdir)/gvfs/modules\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
- -DDBUS_API_SUBJECT_TO_CHANGE
-@@ -74,7 +74,7 @@ gvfs_fuse_daemon_CFLAGS = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/common \
- $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \
-- -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" -DG_DISABLE_DEPRECATED \
-+ -UG_LOG_DOMAIN -DG_LOG_DOMAIN=\"GVFS-FUSE\" \
- -DDBUS_API_SUBJECT_TO_CHANGE
-
- gvfs_fuse_daemon_LDADD = \
-diff --git a/common/Makefile.am b/common/Makefile.am
-index fefd441..5d5a54e 100644
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -5,7 +5,7 @@ lib_LTLIBRARIES=libgvfscommon.la
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gvfs \
- -I$(top_srcdir)/daemon \
- $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(BLURAY_CFLAGS) \
-- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
-+ -DG_LOG_DOMAIN=\"GVFS\" \
- -DDBUS_API_SUBJECT_TO_CHANGE
-
- libgvfscommon_la_SOURCES = \
-diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 6ca840b..b19ee89 100644
---- a/daemon/Makefile.am
-+++ b/daemon/Makefile.am
-@@ -16,8 +16,7 @@ INCLUDES = \
- -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
- -DLIBEXEC_DIR=\"$(libexecdir)/\" \
- -DMOUNTABLE_DIR=\"$(mountdir)/\" \
-- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED
-+ -DGVFS_LOCALEDIR=\""$(localedir)"\"
-
- noinst_LTLIBRARIES=libdaemon.la
-
-@@ -496,7 +495,7 @@ gvfsd_afp_browse_CPPFLAGS = \
- gvfsd_afp_browse_LDADD = \
- $(libraries) \
- $(LIBGCRYPT_LIBS)
--
-+
- gvfsd_afp_SOURCES = \
- gvfsbackendafp.c gvfsbackendafp.h \
- daemon-main.c daemon-main.h \
-diff --git a/metadata/Makefile.am b/metadata/Makefile.am
-index becf13e..d3f25be 100644
---- a/metadata/Makefile.am
-+++ b/metadata/Makefile.am
-@@ -23,7 +23,7 @@ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/common \
- $(LIBXML_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \
- $(UDEV_CFLAGS) \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_LOG_DOMAIN=\"GVFS\" -DG_DISABLE_DEPRECATED \
-+ -DG_LOG_DOMAIN=\"GVFS\" \
- -DDBUS_API_SUBJECT_TO_CHANGE
-
- libmetadata_la_SOURCES = \
-diff --git a/monitor/afc/Makefile.am b/monitor/afc/Makefile.am
-index a823080..e524481 100644
---- a/monitor/afc/Makefile.am
-+++ b/monitor/afc/Makefile.am
-@@ -19,7 +19,6 @@ gvfs_afc_volume_monitor_CFLAGS = \
- $(WARN_CFLAGS) \
- -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
- -DGVFS_LOCALEDIR=\"$(localedir)\" \
-- -DG_DISABLE_DEPRECATED \
- $(NULL)
-
- gvfs_afc_volume_monitor_LDADD = \
-diff --git a/monitor/gdu/Makefile.am b/monitor/gdu/Makefile.am
-index c9c9195..4945445 100644
---- a/monitor/gdu/Makefile.am
-+++ b/monitor/gdu/Makefile.am
-@@ -22,7 +22,6 @@ gvfs_gdu_volume_monitor_CFLAGS = \
- $(DBUS_CFLAGS) \
- -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED \
- -DGDU_API_IS_SUBJECT_TO_CHANGE \
- $(NULL)
-
-diff --git a/monitor/gphoto2/Makefile.am b/monitor/gphoto2/Makefile.am
-index 80fc424..10b25a7 100644
---- a/monitor/gphoto2/Makefile.am
-+++ b/monitor/gphoto2/Makefile.am
-@@ -39,7 +39,6 @@ gvfs_gphoto2_volume_monitor_CFLAGS = \
- $(GPHOTO2_CFLAGS) \
- -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED \
- -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \
- $(NULL)
-
-diff --git a/monitor/hal/Makefile.am b/monitor/hal/Makefile.am
-index 2fd3e6a..da8fc7b 100644
---- a/monitor/hal/Makefile.am
-+++ b/monitor/hal/Makefile.am
-@@ -33,7 +33,6 @@ gvfs_hal_volume_monitor_CFLAGS = \
- $(HAL_CFLAGS) \
- -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED \
- $(NULL)
-
- gvfs_hal_volume_monitor_LDFLAGS = \
-diff --git a/monitor/proxy/Makefile.am b/monitor/proxy/Makefile.am
-index 86a1efe..bd3b451 100644
---- a/monitor/proxy/Makefile.am
-+++ b/monitor/proxy/Makefile.am
-@@ -25,7 +25,6 @@ libgioremote_volume_monitor_la_CFLAGS = \
- -DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\" \
- -DREMOTE_VOLUME_MONITORS_DIR=\"$(remote_volume_monitorsdir)\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED \
- $(NULL)
-
- libgioremote_volume_monitor_la_LDFLAGS = \
-@@ -53,7 +52,6 @@ libgvfsproxyvolumemonitordaemon_noin_la_CFLAGS = \
- $(GDU_CFLAGS) \
- -DG_LOG_DOMAIN=\"GVFS-RemoteVolumeMonitorDaemon\" \
- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED \
- $(NULL)
-
- libgvfsproxyvolumemonitordaemon_noin_la_LIBADD = \
-diff --git a/programs/Makefile.am b/programs/Makefile.am
-index 532f347..f99eaef 100644
---- a/programs/Makefile.am
-+++ b/programs/Makefile.am
-@@ -4,8 +4,7 @@ INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- $(GLIB_CFLAGS) \
-- -DGVFS_LOCALEDIR=\""$(localedir)"\" \
-- -DG_DISABLE_DEPRECATED
-+ -DGVFS_LOCALEDIR=\""$(localedir)"\"
-
- libraries = \
- $(GLIB_LIBS)
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 70c0cb7..fb6c4b2 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -3,8 +3,7 @@ NULL =
- AM_CFLAGS = \
- -I$(top_srcdir) \
- -I$(top_builddir) \
-- $(GLIB_CFLAGS) \
-- -DG_DISABLE_DEPRECATED
-+ $(GLIB_CFLAGS)
-
- AM_LDFLAGS = \
- $(GLIB_LIBS)
---
-cgit v0.9.0.2
diff --git a/gnome-base/gvfs/gvfs-1.10.1.ebuild b/gnome-base/gvfs/gvfs-1.10.1.ebuild
deleted file mode 100644
index a0ec60b..0000000
--- a/gnome-base/gvfs/gvfs-1.10.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-1.6.4-r1.ebuild,v 1.1 2010/10/05 08:49:12 pacho Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 gnome2 eutils
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
- DOCS="AUTHORS ChangeLog.pre-1-2 NEWS README TODO"
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
- DOCS="AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO"
-fi
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios prefix samba +udev"
-
-RDEPEND=">=dev-libs/glib-2.29.14
- sys-apps/dbus
- dev-libs/libxml2
- net-misc/openssh
- !prefix? ( >=sys-fs/udev-164-r2 )
- afp? ( >=dev-libs/libgcrypt-1.2.2 )
- archive? ( app-arch/libarchive )
- avahi? ( >=net-dns/avahi-0.6 )
- bluetooth? (
- >=app-mobilephone/obex-data-server-0.4.5
- dev-libs/dbus-glib
- net-wireless/bluez
- dev-libs/expat )
- bluray? ( media-libs/libbluray )
- fuse? ( >=sys-fs/fuse-2.8.0 )
- gdu? ( >=sys-apps/gnome-disk-utility-3.0.2 )
- gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
- gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
- ios? (
- >=app-pda/libimobiledevice-1.1.0
- >=app-pda/libplist-1 )
- udev? (
- cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
- || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
- http? ( >=net-libs/libsoup-gnome-2.26.0 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
- <=net-fs/samba-3.3 ) )"
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40
- dev-util/pkgconfig
- dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1 )"
-
-REQUIRED_USE="cdda? ( udev )"
-
-pkg_setup() {
- G2CONF="${G2CONF}
- --disable-bash-completion
- --disable-hal
- --disable-schemas-compile
- --with-dbus-service-dir=/usr/share/dbus-1/services
- $(use_enable afp)
- $(use_enable archive)
- $(use_enable avahi)
- $(use_enable bluetooth obexftp)
- $(use_enable bluray)
- $(use_enable cdda)
- $(use_enable fuse)
- $(use_enable gdu)
- $(use_enable gphoto2)
- $(use_enable ios afc)
- $(use_enable udev gudev)
- $(use_enable http)
- $(use_enable gnome-keyring keyring)
- $(use_enable samba)
- $(use_enable !prefix udev)"
-}
-
-src_prepare() {
- gnome2_src_prepare
-
- # Conditional patching purely to avoid eautoreconf
- use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.patch"
-
- if use archive; then
- epatch "${FILESDIR}/${PN}-1.2.2-expose-archive-backend.patch"
- echo "mount-archive.desktop.in" >> po/POTFILES.in
- echo "mount-archive.desktop.in.in" >> po/POTFILES.in
- fi
-
- if use prefix; then
- sed -i -e 's/gvfsd-burn/ /' daemon/Makefile.am || die
- sed -i -e 's/burn.mount.in/ /' daemon/Makefile.am || die
- sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
- fi
-
- # Drop G_DISABLE_DEPRECATED (fixed in git master); requires eautoreconf
- epatch "${FILESDIR}/${PN}-1.10.1-G_DISABLE_DEPRECATED.patch"
- eautoreconf
- #{ use gphoto2 || use archive || use prefix; } && eautoreconf
-}
-
-src_install() {
- gnome2_src_install
- newbashcomp programs/gvfs-bash-completion.sh ${PN}
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- ewarn "In order to use the new gvfs services, please reload dbus configuration"
- ewarn "You may need to log out and log back in for some changes to take effect"
-}
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index a0ec60b..4a01819 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -50,8 +50,7 @@ RDEPEND=">=dev-libs/glib-2.29.14
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) )
http? ( >=net-libs/libsoup-gnome-2.26.0 )
- samba? ( || ( >=net-fs/samba-3.4.6[smbclient]
- <=net-fs/samba-3.3 ) )"
+ samba? ( >=net-fs/samba-3.4.6[smbclient] )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
dev-util/pkgconfig
@@ -101,10 +100,7 @@ src_prepare() {
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
fi
- # Drop G_DISABLE_DEPRECATED (fixed in git master); requires eautoreconf
- epatch "${FILESDIR}/${PN}-1.10.1-G_DISABLE_DEPRECATED.patch"
- eautoreconf
- #{ use gphoto2 || use archive || use prefix; } && eautoreconf
+ { use gphoto2 || use archive || use prefix; } && eautoreconf
}
src_install() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
@ 2012-09-05 15:48 Nirbheek Chauhan
0 siblings, 0 replies; 4+ messages in thread
From: Nirbheek Chauhan @ 2012-09-05 15:48 UTC (permalink / raw
To: gentoo-commits
commit: 11096ecb7383074ce9ba932caf62202f48f17af2
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 3 20:18:27 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Sep 5 15:48:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=11096ecb
Add gnome-base/gvfs-1.13.8
---
.../files/gvfs-1.2.2-gphoto2-stricter-checks.patch | 28 -------------
.../gvfs/{gvfs-9999.ebuild => gvfs-1.13.8.ebuild} | 41 +++++++++++---------
gnome-base/gvfs/gvfs-9999.ebuild | 41 +++++++++++---------
3 files changed, 46 insertions(+), 64 deletions(-)
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch b/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
deleted file mode 100644
index 78fecb7..0000000
--- a/gnome-base/gvfs/files/gvfs-1.2.2-gphoto2-stricter-checks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Gentoo bug 264941
-Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=578027
----
-diff -urNp gvfs-1.2.2/configure.ac gvfs-1.2.2-new/configure.ac
---- gvfs-1.2.2/configure.ac 2009-04-03 13:00:54.000000000 +0530
-+++ gvfs-1.2.2-new/configure.ac 2009-05-04 22:53:24.000000000 +0530
-@@ -307,12 +307,20 @@ if test "x$enable_gphoto2" != "xno" -a "
- ;;
- esac
-
-+ if test "x$enable_gphoto2" = "xyes" -a "x$msg_gphoto2" != "xyes"; then
-+ AC_MSG_ERROR([gphoto2 support requested but not available])
-+ fi
-+
- if test "x$msg_gphoto2" = "xyes"; then
- if test "x$use_gphoto2" = "xyes"; then
- PKG_CHECK_MODULES(GPHOTO2, libgphoto2 >= 2.4.0)
- AC_DEFINE(HAVE_GPHOTO2, 1, [Define to 1 if gphoto2 is available])
- else
-- AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+ if test "x$enable_gphoto2" = "xyes"; then
-+ AC_MSG_ERROR([Cannot build with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+ else
-+ AC_MSG_WARN([Not building with gphoto2 support. Need OS tweaks in hal volume monitor.])
-+ fi
- msg_gphoto2=no
- fi
- fi
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-1.13.8.ebuild
similarity index 77%
copy from gnome-base/gvfs/gvfs-9999.ebuild
copy to gnome-base/gvfs/gvfs-1.13.8.ebuild
index f747506..9d4665f 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-1.13.8.ebuild
@@ -2,13 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
inherit autotools bash-completion-r1 eutils gnome2
-
-[[ ${PV} = 9999 ]] && inherit gnome2-live
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
DESCRIPTION="GNOME Virtual Filesystem Layer"
HOMEPAGE="http://www.gnome.org"
@@ -20,18 +21,20 @@ if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
DOCS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
fi
SRC_URI="${SRC_URI}
http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks"
+IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2
++gtk +http ios samba +udev udisks"
-RDEPEND=">=dev-libs/glib-2.31.0:2
+# Can use libgphoto-2.5.0 as well. Automagic detection.
+RDEPEND=">=dev-libs/glib-2.33.12:2
sys-apps/dbus
- dev-libs/libxml2
+ dev-libs/libxml2:2
net-misc/openssh
afp? ( >=dev-libs/libgcrypt-1.2.2 )
archive? ( app-arch/libarchive )
@@ -47,31 +50,36 @@ RDEPEND=">=dev-libs/glib-2.31.0:2
>=gnome-base/libgdu-3.0.2
=sys-apps/gnome-disk-utility-3.0.2-r300
=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
- gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
- gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+ gnome-keyring? ( app-crypt/libsecret )
+ gphoto2? ( >=media-libs/libgphoto2-2.4.0 )
+ gtk? ( >=x11-libs/gtk+-3.0:3 )
ios? (
>=app-pda/libimobiledevice-1.1.0
>=app-pda/libplist-1 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
- udisks? ( >=sys-fs/udisks-1.90:2 )
+ udisks? ( >=sys-fs/udisks-1.97:2 )
http? ( >=net-libs/libsoup-gnome-2.26.0 )
samba? ( >=net-fs/samba-3.4.6[smbclient] )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
virtual/pkgconfig
dev-util/gtk-doc-am
+ dev-libs/libxslt
doc? ( >=dev-util/gtk-doc-1 )"
REQUIRED_USE="cdda? ( udev )"
pkg_setup() {
+ # --enable-documentation installs man pages
G2CONF="${G2CONF}
--disable-bash-completion
--disable-hal
--disable-schemas-compile
- --with-dbus-service-dir=/usr/share/dbus-1/services
+ --disable-libsystemd-login
+ --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
+ --enable-documentation
$(use_enable afp)
$(use_enable archive)
$(use_enable avahi)
@@ -91,9 +99,6 @@ pkg_setup() {
}
src_prepare() {
- # Conditional patching purely to avoid eautoreconf
- use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
-
if use archive; then
epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
echo mount-archive.desktop.in >> po/POTFILES.in
@@ -106,7 +111,7 @@ src_prepare() {
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
fi
- if use gphoto2 || use archive || ! use udev; then
+ if use archive || ! use udev; then
# libgcrypt.m4 needed for eautoreconf, bug #399043
mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
@@ -118,5 +123,5 @@ src_prepare() {
src_install() {
gnome2_src_install
- newbashcomp programs/gvfs-bash-completion.sh ${PN}
+ dobashcomp programs/completion/gvfs
}
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index f747506..9d4665f 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -2,13 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=4
-GCONF_DEBUG=no
-GNOME2_LA_PUNT=yes
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
inherit autotools bash-completion-r1 eutils gnome2
-
-[[ ${PV} = 9999 ]] && inherit gnome2-live
+if [[ ${PV} = 9999 ]]; then
+ inherit gnome2-live
+fi
DESCRIPTION="GNOME Virtual Filesystem Layer"
HOMEPAGE="http://www.gnome.org"
@@ -20,18 +21,20 @@ if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
DOCS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
fi
SRC_URI="${SRC_URI}
http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 +http ios samba +udev udisks"
+IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2
++gtk +http ios samba +udev udisks"
-RDEPEND=">=dev-libs/glib-2.31.0:2
+# Can use libgphoto-2.5.0 as well. Automagic detection.
+RDEPEND=">=dev-libs/glib-2.33.12:2
sys-apps/dbus
- dev-libs/libxml2
+ dev-libs/libxml2:2
net-misc/openssh
afp? ( >=dev-libs/libgcrypt-1.2.2 )
archive? ( app-arch/libarchive )
@@ -47,31 +50,36 @@ RDEPEND=">=dev-libs/glib-2.31.0:2
>=gnome-base/libgdu-3.0.2
=sys-apps/gnome-disk-utility-3.0.2-r300
=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
- gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
- gphoto2? ( >=media-libs/libgphoto2-2.4.7 )
+ gnome-keyring? ( app-crypt/libsecret )
+ gphoto2? ( >=media-libs/libgphoto2-2.4.0 )
+ gtk? ( >=x11-libs/gtk+-3.0:3 )
ios? (
>=app-pda/libimobiledevice-1.1.0
>=app-pda/libplist-1 )
udev? (
cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] )
|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-164-r2[extras] ) )
- udisks? ( >=sys-fs/udisks-1.90:2 )
+ udisks? ( >=sys-fs/udisks-1.97:2 )
http? ( >=net-libs/libsoup-gnome-2.26.0 )
samba? ( >=net-fs/samba-3.4.6[smbclient] )"
DEPEND="${RDEPEND}
>=dev-util/intltool-0.40
virtual/pkgconfig
dev-util/gtk-doc-am
+ dev-libs/libxslt
doc? ( >=dev-util/gtk-doc-1 )"
REQUIRED_USE="cdda? ( udev )"
pkg_setup() {
+ # --enable-documentation installs man pages
G2CONF="${G2CONF}
--disable-bash-completion
--disable-hal
--disable-schemas-compile
- --with-dbus-service-dir=/usr/share/dbus-1/services
+ --disable-libsystemd-login
+ --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
+ --enable-documentation
$(use_enable afp)
$(use_enable archive)
$(use_enable avahi)
@@ -91,9 +99,6 @@ pkg_setup() {
}
src_prepare() {
- # Conditional patching purely to avoid eautoreconf
- use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks.patch
-
if use archive; then
epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
echo mount-archive.desktop.in >> po/POTFILES.in
@@ -106,7 +111,7 @@ src_prepare() {
sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die
fi
- if use gphoto2 || use archive || ! use udev; then
+ if use archive || ! use udev; then
# libgcrypt.m4 needed for eautoreconf, bug #399043
mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
@@ -118,5 +123,5 @@ src_prepare() {
src_install() {
gnome2_src_install
- newbashcomp programs/gvfs-bash-completion.sh ${PN}
+ dobashcomp programs/completion/gvfs
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/
@ 2013-12-12 23:20 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-12 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 9a6224388382bf401a987ff59d7ea793c8f46356
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 21:42:58 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 23:20:45 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9a622438
gnome-base/gvfs: 1.16.4 → 1.18.3
Rename gnome-keyring use flag since the dependency is now on libsecret.
---
.../files/gvfs-1.2.2-expose-archive-backend.patch | 56 --------
gnome-base/gvfs/gvfs-1.15.4.ebuild | 144 ---------------------
gnome-base/gvfs/gvfs-1.18.3.ebuild | 129 ++++++++++++++++++
gnome-base/gvfs/gvfs-9999.ebuild | 130 +++++++++----------
gnome-base/gvfs/metadata.xml | 1 +
5 files changed, 192 insertions(+), 268 deletions(-)
diff --git a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch b/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch
deleted file mode 100644
index 86222e5..0000000
--- a/gnome-base/gvfs/files/gvfs-1.2.2-expose-archive-backend.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream bug: http://bugzilla.gnome.org/show_bug.cgi?id=567235 (Fedora)
-Our bug: http://bugs.gentoo.org/show_bug.cgi?id=249829
-----
-Index: mount-archive.desktop.in.in
-===================================================================
---- mount-archive.desktop.in.in (revision 0)
-+++ mount-archive.desktop.in.in (revision 0)
-@@ -0,0 +1,14 @@
-+[Desktop Entry]
-+Encoding=UTF-8
-+_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;
-+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@
-Index: Makefile.am
-===================================================================
---- Makefile.am.orig 2008-07-22 15:35:49.000000000 +0200
-+++ Makefile.am 2008-07-22 17:56:59.417180064 +0200
-@@ -1,5 +1,20 @@
- 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 \
- client \
-@@ -15,6 +30,8 @@
-
- EXTRA_DIST = \
- MAINTAINERS \
-+ mount-archive.desktop.in.in \
-+ $(desktop_in_files) \
- $(NULL)
-
- DISTCLEANFILES = \
diff --git a/gnome-base/gvfs/gvfs-1.15.4.ebuild b/gnome-base/gvfs/gvfs-1.15.4.ebuild
deleted file mode 100644
index 89d79e8..0000000
--- a/gnome-base/gvfs/gvfs-1.15.4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
- DOCS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
- DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
-fi
-
-SRC_URI="${SRC_URI}
- http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gnome-online-accounts gdu
-gnome-keyring gphoto2 gtk +http ios +mtp samba systemd +udev udisks"
-REQUIRED_USE="systemd? ( udisks )"
-
-# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND=">=dev-libs/glib-2.35.0:2
- sys-apps/dbus
- dev-libs/libxml2:2
- net-misc/openssh
- afp? ( >=dev-libs/libgcrypt-1.2.2:= )
- archive? ( app-arch/libarchive:= )
- avahi? ( >=net-dns/avahi-0.6 )
- bluetooth? (
- >=app-mobilephone/obex-data-server-0.4.5
- dev-libs/dbus-glib
- net-wireless/bluez
- dev-libs/expat )
- bluray? ( media-libs/libbluray )
- fuse? ( >=sys-fs/fuse-2.8.0 )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
- gdu? ( || (
- >=gnome-base/libgdu-3.0.2
- =sys-apps/gnome-disk-utility-3.0.2-r300
- =sys-apps/gnome-disk-utility-3.0.2-r200 ) )
- gnome-keyring? ( app-crypt/libsecret )
- gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
- gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( >=net-libs/libsoup-gnome-2.34.0 )
- ios? (
- >=app-pda/libimobiledevice-1.1.0
- >=app-pda/libplist-1 )
- mtp? ( >=media-libs/libmtp-1.1.5 )
- samba? ( >=net-fs/samba-3.4.6[smbclient] )
- systemd? ( sys-apps/systemd )
- udev? (
- cdda? ( || ( dev-libs/libcdio-paranoia dev-libs/libcdio[-minimal] ) )
- virtual/udev[gudev] )
- udisks? ( >=sys-fs/udisks-1.97:2 )"
-DEPEND="${RDEPEND}
- dev-libs/libxslt
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1 )"
-
-REQUIRED_USE="cdda? ( udev )"
-
-src_prepare() {
- # Replace me with correct patch, see #452400
- if has_version dev-libs/libcdio-paranoia; then
- sed -i \
- -e '/#include/s:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
- daemon/gvfsbackendcdda.c || die
- fi
-
- if use archive; then
- epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
- echo mount-archive.desktop.in >> po/POTFILES.in
- echo mount-archive.desktop.in.in >> po/POTFILES.in
- fi
-
- if ! use udev; then
- sed -e 's/gvfsd-burn/ /' \
- -e 's/burn.mount.in/ /' \
- -e 's/burn.mount/ /' \
- -i daemon/Makefile.am || die
- fi
-
- if use archive || ! use udev; then
- # libgcrypt.m4 needed for eautoreconf, bug #399043
- mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
-
- [[ ${PV} = 9999 ]] || AT_M4DIR=. eautoreconf
- fi
-
- gnome2_src_prepare
-}
-
-src_configure() {
- # --enable-documentation installs man pages
- G2CONF="${G2CONF}
- --disable-bash-completion
- --disable-hal
- --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
- --enable-documentation
- $(use_enable afp)
- $(use_enable archive)
- $(use_enable avahi)
- $(use_enable bluetooth obexftp)
- $(use_enable bluray)
- $(use_enable cdda)
- $(use_enable doc gtk-doc)
- $(use_enable fuse)
- $(use_enable gdu)
- $(use_enable gnome-online-accounts goa)
- $(use_enable gphoto2)
- $(use_enable gtk)
- $(use_enable ios afc)
- $(use_enable udev)
- $(use_enable udev gudev)
- $(use_enable http)
- $(use_enable gnome-keyring keyring)
- $(use_enable mtp libmtp)
- $(use_enable samba)
- $(use_enable systemd libsystemd-login)
- $(use_enable udisks udisks2)"
- gnome2_src_configure
-}
-
-src_install() {
- gnome2_src_install
- dobashcomp programs/completion/gvfs
-}
diff --git a/gnome-base/gvfs/gvfs-1.18.3.ebuild b/gnome-base/gvfs/gvfs-1.18.3.ebuild
new file mode 100644
index 0000000..05316a0
--- /dev/null
+++ b/gnome-base/gvfs/gvfs-1.18.3.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://git.gnome.org/browse/gvfs"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+
+IUSE="afp archive avahi bluetooth bluray cdda fuse gdu gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks"
+REQUIRED_USE="
+ cdda? ( udev )
+ udisks? ( udev )
+ systemd? ( udisks )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+
+# Can use libgphoto-2.5.0 as well. Automagic detection.
+RDEPEND="
+ >=dev-libs/glib-2.37:2
+ sys-apps/dbus
+ dev-libs/libxml2:2
+ net-misc/openssh
+ afp? ( >=dev-libs/libgcrypt-1.2.2:= )
+ archive? ( app-arch/libarchive:= )
+ avahi? ( >=net-dns/avahi-0.6 )
+ bluetooth? (
+ >=app-mobilephone/obex-data-server-0.4.5
+ dev-libs/dbus-glib
+ net-wireless/bluez
+ dev-libs/expat )
+ bluray? ( media-libs/libbluray )
+ fuse? ( >=sys-fs/fuse-2.8.0 )
+ gdu? ( || (
+ >=gnome-base/libgdu-3.0.2
+ =sys-apps/gnome-disk-utility-3.0.2-r300
+ =sys-apps/gnome-disk-utility-3.0.2-r200 ) )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
+ gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
+ gtk? ( >=x11-libs/gtk+-3.0:3 )
+ http? ( >=net-libs/libsoup-gnome-2.34:2.4 )
+ ios? (
+ >=app-pda/libimobiledevice-1.1.5:=
+ >=app-pda/libplist-1:= )
+ libsecret? ( app-crypt/libsecret )
+ mtp? ( >=media-libs/libmtp-1.1.6 )
+ samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
+ systemd? ( sys-apps/systemd )
+ udev? (
+ cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+ virtual/udev[gudev] )
+ udisks? ( >=sys-fs/udisks-1.97:2 )
+"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ dev-util/gdbus-codegen
+ dev-util/gtk-doc-am
+ test? (
+ >=dev-python/twisted-core-12.3.0
+ || (
+ net-analyzer/netcat
+ net-analyzer/netcat6 ) )
+ !udev? ( >=dev-libs/libgcrypt-1.2.2 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
+
+# Tests with multiple failures, this is being handled upstream at:
+# https://bugzilla.gnome.org/700162
+RESTRICT="test"
+
+src_prepare() {
+ DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
+
+ if ! use udev; then
+ sed -e 's/gvfsd-burn/ /' \
+ -e 's/burn.mount.in/ /' \
+ -e 's/burn.mount/ /' \
+ -i daemon/Makefile.am || die
+
+ eautoreconf
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # --enable-documentation installs man pages
+ gnome2_src_configure \
+ --disable-bash-completion \
+ --disable-hal \
+ --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+ --enable-documentation \
+ $(use_enable afp) \
+ $(use_enable archive) \
+ $(use_enable avahi) \
+ $(use_enable bluetooth obexftp) \
+ $(use_enable bluray) \
+ $(use_enable cdda) \
+ $(use_enable fuse) \
+ $(use_enable gdu) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable gphoto2) \
+ $(use_enable gtk) \
+ $(use_enable ios afc) \
+ $(use_enable mtp libmtp) \
+ $(use_enable udev) \
+ $(use_enable udev gudev) \
+ $(use_enable http) \
+ $(use_enable libsecret keyring) \
+ $(use_enable samba) \
+ $(use_enable systemd libsystemd-login) \
+ $(use_enable udisks udisks2)
+}
+
+src_install() {
+ gnome2_src_install
+ dobashcomp programs/completion/gvfs
+}
diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999.ebuild
index 89d79e8..e0b79e3 100644
--- a/gnome-base/gvfs/gvfs-9999.ebuild
+++ b/gnome-base/gvfs/gvfs-9999.ebuild
@@ -11,29 +11,31 @@ if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
+DESCRIPTION="Virtual filesystem implementation for gio"
+HOMEPAGE="https://git.gnome.org/browse/gvfs"
LICENSE="LGPL-2+"
SLOT="0"
+IUSE="afp archive avahi bluetooth bluray cdda fuse gdu gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks"
+REQUIRED_USE="
+ cdda? ( udev )
+ udisks? ( udev )
+ systemd? ( udisks )
+"
+
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
DOCS=""
+ IUSE="${IUSE} doc"
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre-1.2 README.commits
fi
-SRC_URI="${SRC_URI}
- http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-
-IUSE="afp archive avahi bluetooth bluray cdda doc fuse gnome-online-accounts gdu
-gnome-keyring gphoto2 gtk +http ios +mtp samba systemd +udev udisks"
-REQUIRED_USE="systemd? ( udisks )"
-
# Can use libgphoto-2.5.0 as well. Automagic detection.
-RDEPEND=">=dev-libs/glib-2.35.0:2
+RDEPEND="
+ >=dev-libs/glib-2.37:2
sys-apps/dbus
dev-libs/libxml2:2
net-misc/openssh
@@ -47,61 +49,55 @@ RDEPEND=">=dev-libs/glib-2.35.0:2
dev-libs/expat )
bluray? ( media-libs/libbluray )
fuse? ( >=sys-fs/fuse-2.8.0 )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
gdu? ( || (
>=gnome-base/libgdu-3.0.2
=sys-apps/gnome-disk-utility-3.0.2-r300
=sys-apps/gnome-disk-utility-3.0.2-r200 ) )
- gnome-keyring? ( app-crypt/libsecret )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1 )
gphoto2? ( >=media-libs/libgphoto2-2.4.7:= )
gtk? ( >=x11-libs/gtk+-3.0:3 )
- http? ( >=net-libs/libsoup-gnome-2.34.0 )
+ http? ( >=net-libs/libsoup-gnome-2.34:2.4 )
ios? (
- >=app-pda/libimobiledevice-1.1.0
- >=app-pda/libplist-1 )
- mtp? ( >=media-libs/libmtp-1.1.5 )
- samba? ( >=net-fs/samba-3.4.6[smbclient] )
+ >=app-pda/libimobiledevice-1.1.5:=
+ >=app-pda/libplist-1:= )
+ libsecret? ( app-crypt/libsecret )
+ mtp? ( >=media-libs/libmtp-1.1.6 )
+ samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) )
systemd? ( sys-apps/systemd )
udev? (
- cdda? ( || ( dev-libs/libcdio-paranoia dev-libs/libcdio[-minimal] ) )
+ cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
virtual/udev[gudev] )
- udisks? ( >=sys-fs/udisks-1.97:2 )"
+ udisks? ( >=sys-fs/udisks-1.97:2 )
+"
DEPEND="${RDEPEND}
dev-libs/libxslt
>=dev-util/intltool-0.40
virtual/pkgconfig
dev-util/gdbus-codegen
dev-util/gtk-doc-am
- doc? ( >=dev-util/gtk-doc-1 )"
+ test? (
+ >=dev-python/twisted-core-12.3.0
+ || (
+ net-analyzer/netcat
+ net-analyzer/netcat6 ) )
+ !udev? ( >=dev-libs/libgcrypt-1.2.2 )
+"
+# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
+# test dependencies needed per https://bugzilla.gnome.org/700162
-REQUIRED_USE="cdda? ( udev )"
+if [[ ${PV} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ doc? ( >=dev-util/gtk-doc-1 )"
+fi
src_prepare() {
- # Replace me with correct patch, see #452400
- if has_version dev-libs/libcdio-paranoia; then
- sed -i \
- -e '/#include/s:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
- daemon/gvfsbackendcdda.c || die
- fi
-
- if use archive; then
- epatch "${FILESDIR}"/${PN}-1.2.2-expose-archive-backend.patch
- echo mount-archive.desktop.in >> po/POTFILES.in
- echo mount-archive.desktop.in.in >> po/POTFILES.in
- fi
-
if ! use udev; then
sed -e 's/gvfsd-burn/ /' \
-e 's/burn.mount.in/ /' \
-e 's/burn.mount/ /' \
-i daemon/Makefile.am || die
- fi
-
- if use archive || ! use udev; then
- # libgcrypt.m4 needed for eautoreconf, bug #399043
- mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die
- [[ ${PV} = 9999 ]] || AT_M4DIR=. eautoreconf
+ [[ ${PV} = 9999 ]] || eautoreconf
fi
gnome2_src_prepare
@@ -109,33 +105,31 @@ src_prepare() {
src_configure() {
# --enable-documentation installs man pages
- G2CONF="${G2CONF}
- --disable-bash-completion
- --disable-hal
- --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services
- --enable-documentation
- $(use_enable afp)
- $(use_enable archive)
- $(use_enable avahi)
- $(use_enable bluetooth obexftp)
- $(use_enable bluray)
- $(use_enable cdda)
- $(use_enable doc gtk-doc)
- $(use_enable fuse)
- $(use_enable gdu)
- $(use_enable gnome-online-accounts goa)
- $(use_enable gphoto2)
- $(use_enable gtk)
- $(use_enable ios afc)
- $(use_enable udev)
- $(use_enable udev gudev)
- $(use_enable http)
- $(use_enable gnome-keyring keyring)
- $(use_enable mtp libmtp)
- $(use_enable samba)
- $(use_enable systemd libsystemd-login)
- $(use_enable udisks udisks2)"
- gnome2_src_configure
+ gnome2_src_configure \
+ --disable-bash-completion \
+ --disable-hal \
+ --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
+ --enable-documentation \
+ $(use_enable afp) \
+ $(use_enable archive) \
+ $(use_enable avahi) \
+ $(use_enable bluetooth obexftp) \
+ $(use_enable bluray) \
+ $(use_enable cdda) \
+ $(use_enable fuse) \
+ $(use_enable gdu) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable gphoto2) \
+ $(use_enable gtk) \
+ $(use_enable ios afc) \
+ $(use_enable mtp libmtp) \
+ $(use_enable udev) \
+ $(use_enable udev gudev) \
+ $(use_enable http) \
+ $(use_enable libsecret keyring) \
+ $(use_enable samba) \
+ $(use_enable systemd libsystemd-login) \
+ $(use_enable udisks udisks2)
}
src_install() {
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 5bdb749..c484217 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -19,6 +19,7 @@ applications not using gio to access the gvfs filesystems.
application access</flag>
<flag name="gdu">Enable <pkg>sys-apps/gnome-disk-utility</pkg> integration</flag>
<flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
+ <flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to store login credentials.</flag>
<flag name="udev">Enable udev base replacement code for cdda feature</flag>
<flag name="udisks">Enable volume monitoring using <pkg>sys-fs/udisks</pkg></flag>
</use>
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-12 23:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-12 23:20 [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2012-09-05 15:48 Nirbheek Chauhan
2011-10-19 6:31 Alexandre Restovtsev
2011-10-18 7:37 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox