From ccaeb58aa22a63cb2180c3849d46fc6eeeecb1b8 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Wed, 17 Aug 2016 11:10:10 +0200 Subject: gnome-base/gvfs: Restore the old samba behavior allowing from samba-3 (#549576#c13) Package-Manager: portage-2.3.0 --- gnome-base/gvfs/gvfs-1.28.3-r1.ebuild | 125 ++++++++++++++++++++++++++++++++++ gnome-base/gvfs/gvfs-1.28.3.ebuild | 125 ---------------------------------- 2 files changed, 125 insertions(+), 125 deletions(-) create mode 100644 gnome-base/gvfs/gvfs-1.28.3-r1.ebuild delete mode 100644 gnome-base/gvfs/gvfs-1.28.3.ebuild (limited to 'gnome-base') diff --git a/gnome-base/gvfs/gvfs-1.28.3-r1.ebuild b/gnome-base/gvfs/gvfs-1.28.3-r1.ebuild new file mode 100644 index 000000000000..5656eda7d004 --- /dev/null +++ b/gnome-base/gvfs/gvfs-1.28.3-r1.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME2_LA_PUNT="yes" + +inherit autotools bash-completion-r1 eutils gnome2 + +DESCRIPTION="Virtual filesystem implementation for gio" +HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" + +LICENSE="LGPL-2+" +SLOT="0" + +IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf" +REQUIRED_USE=" + cdda? ( udev ) + google? ( gnome-online-accounts ) + mtp? ( udev ) + udisks? ( udev ) + systemd? ( udisks ) +" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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=" + app-crypt/gcr:= + >=dev-libs/glib-2.46.2:2 + sys-apps/dbus + dev-libs/libxml2:2 + net-misc/openssh + afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) + archive? ( app-arch/libarchive:= ) + bluray? ( media-libs/libbluray ) + fuse? ( >=sys-fs/fuse-2.8.0 ) + gnome-keyring? ( app-crypt/libsecret ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) + google? ( + >=dev-libs/libgdata-0.17.3:=[crypt,gnome-online-accounts] + >=net-libs/gnome-online-accounts-3.17.1:= ) + gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) + gtk? ( >=x11-libs/gtk+-3.0:3 ) + http? ( >=net-libs/libsoup-2.42:2.4 ) + ios? ( + >=app-pda/libimobiledevice-1.2:= + >=app-pda/libplist-1:= ) + mtp? ( >=media-libs/libmtp-1.1.6 ) + nfs? ( >=net-fs/libnfs-1.9.7 ) + samba? ( || ( >=net-fs/samba-3.4.6[smbclient] >=net-fs/samba-4[client] ) ) + systemd? ( sys-apps/systemd:0= ) + udev? ( + cdda? ( dev-libs/libcdio-paranoia ) + virtual/libgudev:= + virtual/libudev:= ) + udisks? ( >=sys-fs/udisks-1.97:2 ) + zeroconf? ( >=net-dns/avahi-0.6 ) +" +DEPEND="${RDEPEND} + app-text/docbook-xsl-stylesheets + 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:0 ) +" +# 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() { + if ! use udev; then + sed -e 's/gvfsd-burn/ /' \ + -e 's/burn.mount.in/ /' \ + -e 's/burn.mount/ /' \ + -i daemon/Makefile.am || die + + # Uncomment when eautoreconf stops being needed always + eautoreconf + fi + + gnome2_src_prepare +} + +src_configure() { + # --enable-documentation installs man pages + # --disable-obexftp, upstream bug #729945 + gnome2_src_configure \ + --enable-bash-completion \ + --with-bash-completion-dir="$(get_bashcompdir)" \ + --enable-gcr \ + --disable-gdu \ + --disable-hal \ + --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \ + --enable-documentation \ + $(use_enable afp) \ + $(use_enable archive) \ + $(use_enable bluray) \ + $(use_enable cdda) \ + $(use_enable fuse) \ + $(use_enable gnome-keyring keyring) \ + $(use_enable gnome-online-accounts goa) \ + $(use_enable google) \ + $(use_enable gphoto2) \ + $(use_enable gtk) \ + $(use_enable ios afc) \ + $(use_enable mtp libmtp) \ + $(use_enable nfs) \ + $(use_enable udev) \ + $(use_enable udev gudev) \ + $(use_enable http) \ + $(use_enable samba) \ + $(use_enable systemd libsystemd-login) \ + $(use_enable udisks udisks2) \ + $(use_enable zeroconf avahi) +} diff --git a/gnome-base/gvfs/gvfs-1.28.3.ebuild b/gnome-base/gvfs/gvfs-1.28.3.ebuild deleted file mode 100644 index 23471e9a2472..000000000000 --- a/gnome-base/gvfs/gvfs-1.28.3.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit autotools bash-completion-r1 eutils gnome2 - -DESCRIPTION="Virtual filesystem implementation for gio" -HOMEPAGE="https://wiki.gnome.org/Projects/gvfs" - -LICENSE="LGPL-2+" -SLOT="0" - -IUSE="afp archive bluray cdda fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs samba systemd test +udev udisks zeroconf" -REQUIRED_USE=" - cdda? ( udev ) - google? ( gnome-online-accounts ) - mtp? ( udev ) - udisks? ( udev ) - systemd? ( udisks ) -" -KEYWORDS="~amd64 ~arm ~arm64 ~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=" - app-crypt/gcr:= - >=dev-libs/glib-2.46.2:2 - sys-apps/dbus - dev-libs/libxml2:2 - net-misc/openssh - afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) - archive? ( app-arch/libarchive:= ) - bluray? ( media-libs/libbluray ) - fuse? ( >=sys-fs/fuse-2.8.0 ) - gnome-keyring? ( app-crypt/libsecret ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) - google? ( - >=dev-libs/libgdata-0.17.3:=[crypt,gnome-online-accounts] - >=net-libs/gnome-online-accounts-3.17.1:= ) - gphoto2? ( >=media-libs/libgphoto2-2.4.7:= ) - gtk? ( >=x11-libs/gtk+-3.0:3 ) - http? ( >=net-libs/libsoup-2.42:2.4 ) - ios? ( - >=app-pda/libimobiledevice-1.2:= - >=app-pda/libplist-1:= ) - mtp? ( >=media-libs/libmtp-1.1.6 ) - nfs? ( >=net-fs/libnfs-1.9.7 ) - samba? ( >=net-fs/samba-4[client] ) - systemd? ( sys-apps/systemd:0= ) - udev? ( - cdda? ( dev-libs/libcdio-paranoia ) - virtual/libgudev:= - virtual/libudev:= ) - udisks? ( >=sys-fs/udisks-1.97:2 ) - zeroconf? ( >=net-dns/avahi-0.6 ) -" -DEPEND="${RDEPEND} - app-text/docbook-xsl-stylesheets - 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:0 ) -" -# 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() { - if ! use udev; then - sed -e 's/gvfsd-burn/ /' \ - -e 's/burn.mount.in/ /' \ - -e 's/burn.mount/ /' \ - -i daemon/Makefile.am || die - - # Uncomment when eautoreconf stops being needed always - eautoreconf - fi - - gnome2_src_prepare -} - -src_configure() { - # --enable-documentation installs man pages - # --disable-obexftp, upstream bug #729945 - gnome2_src_configure \ - --enable-bash-completion \ - --with-bash-completion-dir="$(get_bashcompdir)" \ - --enable-gcr \ - --disable-gdu \ - --disable-hal \ - --with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \ - --enable-documentation \ - $(use_enable afp) \ - $(use_enable archive) \ - $(use_enable bluray) \ - $(use_enable cdda) \ - $(use_enable fuse) \ - $(use_enable gnome-keyring keyring) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable google) \ - $(use_enable gphoto2) \ - $(use_enable gtk) \ - $(use_enable ios afc) \ - $(use_enable mtp libmtp) \ - $(use_enable nfs) \ - $(use_enable udev) \ - $(use_enable udev gudev) \ - $(use_enable http) \ - $(use_enable samba) \ - $(use_enable systemd libsystemd-login) \ - $(use_enable udisks udisks2) \ - $(use_enable zeroconf avahi) -} -- cgit v1.2.3-65-gdbad