From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AAFA4138010 for ; Tue, 25 Sep 2012 16:00:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 32A1421C1BC; Tue, 25 Sep 2012 16:00:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DDD6F21C1BC for ; Tue, 25 Sep 2012 15:59:59 +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 24EBB33D70D for ; Tue, 25 Sep 2012 15:59:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D8E5EE5444 for ; Tue, 25 Sep 2012 15:59:57 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1348588656.06595b144380f5e35800ec54a61608860d336b36.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-1.13.9.ebuild gnome-base/gvfs/gvfs-9999.ebuild X-VCS-Directories: gnome-base/gvfs/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 06595b144380f5e35800ec54a61608860d336b36 X-VCS-Branch: master Date: Tue, 25 Sep 2012 15:59:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a07a2bab-f07f-4071-933f-5881f8af590b X-Archives-Hash: ae64f70feceae4160520a71aab2c2b25 commit: 06595b144380f5e35800ec54a61608860d336b36 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Tue Sep 25 15:57:36 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Tue Sep 25 15:57:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=06595b14 gnome-base/gvfs: 1.14.0 now in gx86 Sync live ebuild with gx86, enable libsystemd-login support." --- gnome-base/gvfs/gvfs-1.13.9.ebuild | 127 ------------------------------------ gnome-base/gvfs/gvfs-9999.ebuild | 20 +++--- 2 files changed, 11 insertions(+), 136 deletions(-) diff --git a/gnome-base/gvfs/gvfs-1.13.9.ebuild b/gnome-base/gvfs/gvfs-1.13.9.ebuild deleted file mode 100644 index 9d4665f..0000000 --- a/gnome-base/gvfs/gvfs-1.13.9.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -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 gdu gnome-keyring gphoto2 -+gtk +http ios samba +udev udisks" - -# Can use libgphoto-2.5.0 as well. Automagic detection. -RDEPEND=">=dev-libs/glib-2.33.12: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-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.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 - --disable-libsystemd-login - --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 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 udisks udisks2)" -} - -src_prepare() { - 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 -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 - - 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_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 9d4665f..d227ad3 100644 --- a/gnome-base/gvfs/gvfs-9999.ebuild +++ b/gnome-base/gvfs/gvfs-9999.ebuild @@ -14,7 +14,7 @@ fi DESCRIPTION="GNOME Virtual Filesystem Layer" HOMEPAGE="http://www.gnome.org" -LICENSE="LGPL-2" +LICENSE="LGPL-2+" SLOT="0" if [[ ${PV} = 9999 ]]; then @@ -28,8 +28,8 @@ 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 -+gtk +http ios samba +udev udisks" +IUSE="afp archive avahi bluetooth bluray cdda doc fuse gdu gnome-keyring gphoto2 gtk +http ios samba systemd +udev udisks" +REQUIRED_USE="systemd? ( udisks )" # Can use libgphoto-2.5.0 as well. Automagic detection. RDEPEND=">=dev-libs/glib-2.33.12:2 @@ -51,22 +51,23 @@ RDEPEND=">=dev-libs/glib-2.33.12: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.0 ) + gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) gtk? ( >=x11-libs/gtk+-3.0:3 ) + http? ( >=net-libs/libsoup-gnome-2.26.0 ) ios? ( >=app-pda/libimobiledevice-1.1.0 >=app-pda/libplist-1 ) + samba? ( >=net-fs/samba-3.4.6[smbclient] ) + systemd? ( sys-apps/systemd ) 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.97:2 ) - http? ( >=net-libs/libsoup-gnome-2.26.0 ) - samba? ( >=net-fs/samba-3.4.6[smbclient] )" + udisks? ( >=sys-fs/udisks-1.97:2[systemd?] )" DEPEND="${RDEPEND} + dev-libs/libxslt >=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 )" @@ -77,7 +78,6 @@ pkg_setup() { --disable-bash-completion --disable-hal --disable-schemas-compile - --disable-libsystemd-login --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services --enable-documentation $(use_enable afp) @@ -89,12 +89,14 @@ pkg_setup() { $(use_enable fuse) $(use_enable gdu) $(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 samba) + $(use_enable systemd libsystemd-login) $(use_enable udisks udisks2)" }