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 1SMWtS-000093-UF for garchives@archives.gentoo.org; Tue, 24 Apr 2012 03:58:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7452BE0A62; Tue, 24 Apr 2012 03:58:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2CAEDE0A62 for ; Tue, 24 Apr 2012 03:58:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 24ACE1B4016 for ; Tue, 24 Apr 2012 03:58:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D95A7E5402 for ; Tue, 24 Apr 2012 03:58:08 +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: <1335239870.58d3d7c452d388448818cbb01be5ab19313f52e6.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gvfs/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gvfs/gvfs-9999.ebuild X-VCS-Directories: gnome-base/gvfs/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 58d3d7c452d388448818cbb01be5ab19313f52e6 X-VCS-Branch: master Date: Tue, 24 Apr 2012 03:58:08 +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: d874fa5c-e32f-4ef0-b0f1-7d7ec4bb608c X-Archives-Hash: 20c691e8b05b7e4847efda9a10ab72e0 commit: 58d3d7c452d388448818cbb01be5ab19313f52e6 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Tue Apr 24 03:57:50 2012 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Apr 24 03:57:50 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D58d3d7c4 gnome-base/gvfs: sync with gx86 --- gnome-base/gvfs/gvfs-9999.ebuild | 70 ++++++++++++++++++++------------= ----- 1 files changed, 38 insertions(+), 32 deletions(-) diff --git a/gnome-base/gvfs/gvfs-9999.ebuild b/gnome-base/gvfs/gvfs-9999= .ebuild index 4a01819..7759369 100644 --- a/gnome-base/gvfs/gvfs-9999.ebuild +++ b/gnome-base/gvfs/gvfs-9999.ebuild @@ -1,35 +1,38 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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 $ +# $Header: $ =20 -EAPI=3D"4" -GCONF_DEBUG=3D"no" -GNOME2_LA_PUNT=3D"yes" +EAPI=3D4 +GCONF_DEBUG=3Dno +GNOME2_LA_PUNT=3Dyes =20 -inherit autotools bash-completion-r1 gnome2 eutils -if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live -fi +inherit autotools bash-completion-r1 eutils gnome2 + +[[ ${PV} =3D 9999 ]] && inherit gnome2-live =20 DESCRIPTION=3D"GNOME Virtual Filesystem Layer" HOMEPAGE=3D"http://www.gnome.org" =20 LICENSE=3D"LGPL-2" SLOT=3D"0" + if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" - DOCS=3D"AUTHORS ChangeLog.pre-1-2 NEWS README TODO" + DOCS=3D"" 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" + DOCS=3D"AUTHORS ChangeLog NEWS MAINTAINERS README TODO" # ChangeLog.pre= -1.2 README.commits fi -IUSE=3D"afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyri= ng gphoto2 +http ios prefix samba +udev" =20 -RDEPEND=3D">=3Ddev-libs/glib-2.29.14 +SRC_URI=3D"${SRC_URI} + http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2" + +IUSE=3D"afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyri= ng gphoto2 +http ios samba +udev udisks" + +RDEPEND=3D">=3Ddev-libs/glib-2.31.0:2 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 ) @@ -40,7 +43,10 @@ RDEPEND=3D">=3Ddev-libs/glib-2.29.14 dev-libs/expat ) bluray? ( media-libs/libbluray ) fuse? ( >=3Dsys-fs/fuse-2.8.0 ) - gdu? ( >=3Dsys-apps/gnome-disk-utility-3.0.2 ) + gdu? ( || ( + >=3Dgnome-base/libgdu-3.0.2 + =3Dsys-apps/gnome-disk-utility-3.0.2-r300 + =3Dsys-apps/gnome-disk-utility-3.0.2-r200 ) ) gnome-keyring? ( >=3Dgnome-base/gnome-keyring-1.0 ) gphoto2? ( >=3Dmedia-libs/libgphoto2-2.4.7 ) ios? ( @@ -48,7 +54,8 @@ RDEPEND=3D">=3Ddev-libs/glib-2.29.14 >=3Dapp-pda/libplist-1 ) udev? ( cdda? ( >=3Ddev-libs/libcdio-0.78.2[-minimal] ) - || ( >=3Dsys-fs/udev-171[gudev] >=3Dsys-fs/udev-145[extras] ) ) + || ( >=3Dsys-fs/udev-171[gudev] >=3Dsys-fs/udev-164-r2[extras] ) ) + udisks? ( >=3Dsys-fs/udisks-1.90:2 ) http? ( >=3Dnet-libs/libsoup-gnome-2.26.0 ) samba? ( >=3Dnet-fs/samba-3.4.6[smbclient] )" DEPEND=3D"${RDEPEND} @@ -75,42 +82,41 @@ pkg_setup() { $(use_enable gdu) $(use_enable gphoto2) $(use_enable ios afc) + $(use_enable udev) $(use_enable udev gudev) $(use_enable http) $(use_enable gnome-keyring keyring) $(use_enable samba) - $(use_enable !prefix udev)" + $(use_enable udisks udisks2)" } =20 src_prepare() { - gnome2_src_prepare - # Conditional patching purely to avoid eautoreconf - use gphoto2 && epatch "${FILESDIR}/${PN}-1.2.2-gphoto2-stricter-checks.= patch" + use gphoto2 && epatch "${FILESDIR}"/${PN}-1.2.2-gphoto2-stricter-checks= .patch =20 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 + 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 =20 - if use prefix; then + if ! use udev; 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 =20 - { use gphoto2 || use archive || use prefix; } && eautoreconf + if use gphoto2 || use archive || ! use udev; then + # libgcrypt.m4 needed for eautoreconf, bug #399043 + mv "${WORKDIR}/libgcrypt.m4" "${S}"/ || die + + [[ ${PV} =3D 9999 ]] || AT_M4DIR=3D. eautoreconf + fi + + gnome2_src_prepare } =20 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" -}