From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RGPgn-0001on-Hr for garchives@archives.gentoo.org; Wed, 19 Oct 2011 06:31:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A551121C025; Wed, 19 Oct 2011 06:31:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5157021C025 for ; Wed, 19 Oct 2011 06:31:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D56F1B4006 for ; Wed, 19 Oct 2011 06:31:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 304F080051 for ; Wed, 19 Oct 2011 06:31:35 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <066f0ea86b91e79d896f4eaffa7b4055612dd80d.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/, gnome-base/gvfs/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gvfs/files/gvfs-1.10.1-G_DISABLE_DEPRECATED.patch gnome-base/gvfs/gvfs-1.10.1.ebuild gnome-base/gvfs/gvfs-9999.ebuild X-VCS-Directories: gnome-base/gvfs/ gnome-base/gvfs/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 066f0ea86b91e79d896f4eaffa7b4055612dd80d Date: Wed, 19 Oct 2011 06:31:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 28a28c34ce7aa1c2e6256d81d3368d5e commit: 066f0ea86b91e79d896f4eaffa7b4055612dd80d Author: Alexandre Rostovtsev gmail com> AuthorDate: Wed Oct 19 05:35:58 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Wed Oct 19 05:38:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D066f0ea8 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 -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 =3D -I$(top_srcdir) \ - -I$(top_srcdir)/metadata \ - -I$(top_srcdir)/common \ - $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ -- -DG_LOG_DOMAIN=3D\"GVFS\" -DG_DISABLE_DEPRECATED \ -+ -DG_LOG_DOMAIN=3D\"GVFS\" \ - -DGVFS_MODULE_DIR=3D\"$(libdir)/gvfs/modules\" \ - -DGVFS_LOCALEDIR=3D\""$(localedir)"\" \ - -DDBUS_API_SUBJECT_TO_CHANGE -@@ -74,7 +74,7 @@ gvfs_fuse_daemon_CFLAGS =3D \ - -I$(top_srcdir) \ - -I$(top_srcdir)/common \ - $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(FUSE_CFLAGS) \ -- -UG_LOG_DOMAIN -DG_LOG_DOMAIN=3D\"GVFS-FUSE\" -DG_DISABLE_DEPRE= CATED \ -+ -UG_LOG_DOMAIN -DG_LOG_DOMAIN=3D\"GVFS-FUSE\" \ - -DDBUS_API_SUBJECT_TO_CHANGE -=20 - gvfs_fuse_daemon_LDADD =3D \ -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=3Dlibgvfscommon.la - INCLUDES =3D -I$(top_srcdir) -I$(top_srcdir)/gvfs \ - -I$(top_srcdir)/daemon \ - $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(BLURAY_CFLAGS) \ -- -DG_LOG_DOMAIN=3D\"GVFS\" -DG_DISABLE_DEPRECATED \ -+ -DG_LOG_DOMAIN=3D\"GVFS\" \ - -DDBUS_API_SUBJECT_TO_CHANGE -=20 - libgvfscommon_la_SOURCES =3D \ -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 =3D \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ - -DLIBEXEC_DIR=3D\"$(libexecdir)/\" \ - -DMOUNTABLE_DIR=3D\"$(mountdir)/\" \ -- -DGVFS_LOCALEDIR=3D\""$(localedir)"\" \ -- -DG_DISABLE_DEPRECATED -+ -DGVFS_LOCALEDIR=3D\""$(localedir)"\" -=20 - noinst_LTLIBRARIES=3Dlibdaemon.la -=20 -@@ -496,7 +495,7 @@ gvfsd_afp_browse_CPPFLAGS =3D \ - gvfsd_afp_browse_LDADD =3D \ - $(libraries) \ - $(LIBGCRYPT_LIBS) --=09 -+ - gvfsd_afp_SOURCES =3D \ - 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 =3D -I$(top_srcdir) -I$(top_srcdir)/common \ - $(LIBXML_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ - $(UDEV_CFLAGS) \ - -DGVFS_LOCALEDIR=3D\""$(localedir)"\" \ -- -DG_LOG_DOMAIN=3D\"GVFS\" -DG_DISABLE_DEPRECATED \ -+ -DG_LOG_DOMAIN=3D\"GVFS\" \ - -DDBUS_API_SUBJECT_TO_CHANGE -=20 - libmetadata_la_SOURCES =3D \ -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 =3D \ - $(WARN_CFLAGS) \ - -DGIO_MODULE_DIR=3D\"$(GIO_MODULE_DIR)\" \ - -DGVFS_LOCALEDIR=3D\"$(localedir)\" \ -- -DG_DISABLE_DEPRECATED \ - $(NULL) -=20 - gvfs_afc_volume_monitor_LDADD =3D \ -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 =3D \ - $(DBUS_CFLAGS) \ - -DGIO_MODULE_DIR=3D\"$(GIO_MODULE_DIR)\" \ - -DGVFS_LOCALEDIR=3D\""$(localedir)"\" \ -- -DG_DISABLE_DEPRECATED \ - -DGDU_API_IS_SUBJECT_TO_CHANGE \ - $(NULL) -=20 -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 =3D \ - $(GPHOTO2_CFLAGS) \ - -DGIO_MODULE_DIR=3D\"$(GIO_MODULE_DIR)\" \ - -DGVFS_LOCALEDIR=3D\""$(localedir)"\" \ -- -DG_DISABLE_DEPRECATED \ - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ - $(NULL) -=20 -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 =3D \ - $(HAL_CFLAGS) \ - -DGIO_MODULE_DIR=3D\"$(GIO_MODULE_DIR)\" \ - -DGVFS_LOCALEDIR=3D\""$(localedir)"\" \ -- -DG_DISABLE_DEPRECATED \ - $(NULL) -=20 - gvfs_hal_volume_monitor_LDFLAGS =3D \ -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 =3D \ - -DGIO_MODULE_DIR=3D\"$(GIO_MODULE_DIR)\" \ - -DREMOTE_VOLUME_MONITORS_DIR=3D\"$(remote_volume_monitorsdir)\" \ - -DGVFS_LOCALEDIR=3D\""$(localedir)"\" \ -- -DG_DISABLE_DEPRECATED \ - $(NULL) -=20 - libgioremote_volume_monitor_la_LDFLAGS =3D \ -@@ -53,7 +52,6 @@ libgvfsproxyvolumemonitordaemon_noin_la_CFLAGS =3D \ - $(GDU_CFLAGS) \ - -DG_LOG_DOMAIN=3D\"GVFS-RemoteVolumeMonitorDaemon\" \ - -DGVFS_LOCALEDIR=3D\""$(localedir)"\" \ -- -DG_DISABLE_DEPRECATED \ - $(NULL) -=20 - libgvfsproxyvolumemonitordaemon_noin_la_LIBADD =3D \ -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 =3D \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(GLIB_CFLAGS) \ -- -DGVFS_LOCALEDIR=3D\""$(localedir)"\" \ -- -DG_DISABLE_DEPRECATED -+ -DGVFS_LOCALEDIR=3D\""$(localedir)"\" -=20 - libraries =3D \ - $(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 =3D - AM_CFLAGS =3D \ - -I$(top_srcdir) \ - -I$(top_builddir) \ -- $(GLIB_CFLAGS) \ -- -DG_DISABLE_DEPRECATED -+ $(GLIB_CFLAGS) -=20 - AM_LDFLAGS =3D \ - $(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=3D"4" -GCONF_DEBUG=3D"no" -GNOME2_LA_PUNT=3D"yes" - -inherit autotools bash-completion-r1 gnome2 eutils -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION=3D"GNOME Virtual Filesystem Layer" -HOMEPAGE=3D"http://www.gnome.org" - -LICENSE=3D"LGPL-2" -SLOT=3D"0" -if [[ ${PV} =3D 9999 ]]; then - KEYWORDS=3D"" - DOCS=3D"AUTHORS ChangeLog.pre-1-2 NEWS README TODO" -else - KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 = ~x86-fbsd" - DOCS=3D"AUTHORS ChangeLog ChangeLog.pre-1-2 NEWS README TODO" -fi -IUSE=3D"afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyri= ng gphoto2 +http ios prefix samba +udev" - -RDEPEND=3D">=3Ddev-libs/glib-2.29.14 - sys-apps/dbus - dev-libs/libxml2 - net-misc/openssh - !prefix? ( >=3Dsys-fs/udev-164-r2 ) - afp? ( >=3Ddev-libs/libgcrypt-1.2.2 ) - archive? ( app-arch/libarchive ) - avahi? ( >=3Dnet-dns/avahi-0.6 ) - bluetooth? ( - >=3Dapp-mobilephone/obex-data-server-0.4.5 - dev-libs/dbus-glib - net-wireless/bluez - dev-libs/expat ) - bluray? ( media-libs/libbluray ) - fuse? ( >=3Dsys-fs/fuse-2.8.0 ) - gdu? ( >=3Dsys-apps/gnome-disk-utility-3.0.2 ) - gnome-keyring? ( >=3Dgnome-base/gnome-keyring-1.0 ) - gphoto2? ( >=3Dmedia-libs/libgphoto2-2.4.7 ) - ios? ( - >=3Dapp-pda/libimobiledevice-1.1.0 - >=3Dapp-pda/libplist-1 ) - udev? ( - cdda? ( >=3Ddev-libs/libcdio-0.78.2[-minimal] ) - || ( >=3Dsys-fs/udev-171[gudev] >=3Dsys-fs/udev-145[extras] ) ) - http? ( >=3Dnet-libs/libsoup-gnome-2.26.0 ) - samba? ( || ( >=3Dnet-fs/samba-3.4.6[smbclient] - <=3Dnet-fs/samba-3.3 ) )" -DEPEND=3D"${RDEPEND} - >=3Ddev-util/intltool-0.40 - dev-util/pkgconfig - dev-util/gtk-doc-am - doc? ( >=3Ddev-util/gtk-doc-1 )" - -REQUIRED_USE=3D"cdda? ( udev )" - -pkg_setup() { - G2CONF=3D"${G2CONF} - --disable-bash-completion - --disable-hal - --disable-schemas-compile - --with-dbus-service-dir=3D/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 config= uration" - 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=3D">=3Ddev-libs/glib-2.29.14 cdda? ( >=3Ddev-libs/libcdio-0.78.2[-minimal] ) || ( >=3Dsys-fs/udev-171[gudev] >=3Dsys-fs/udev-145[extras] ) ) http? ( >=3Dnet-libs/libsoup-gnome-2.26.0 ) - samba? ( || ( >=3Dnet-fs/samba-3.4.6[smbclient] - <=3Dnet-fs/samba-3.3 ) )" + samba? ( >=3Dnet-fs/samba-3.4.6[smbclient] )" DEPEND=3D"${RDEPEND} >=3Ddev-util/intltool-0.40 dev-util/pkgconfig @@ -101,10 +100,7 @@ src_prepare() { sed -i -e 's/burn.mount/ /' daemon/Makefile.am || die fi =20 - # 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 } =20 src_install() {