commit: b2b44f7083b4ef85fe581f522eba2501f9d68e85 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Wed Dec 30 10:18:41 2015 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Wed Dec 30 10:24:03 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2b44f70
gnome-base/gvfs: Drop old Package-Manager: portage-2.2.26 gnome-base/gvfs/Manifest | 1 - .../gvfs/files/gvfs-1.22.4-fix-parallel.patch | 25 ----- gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch | 54 --------- gnome-base/gvfs/gvfs-1.22.4.ebuild | 124 --------------------- gnome-base/gvfs/gvfs-1.24.2.ebuild | 121 -------------------- 5 files changed, 325 deletions(-) diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest index a8e682e..1f559a5 100644 --- a/gnome-base/gvfs/Manifest +++ b/gnome-base/gvfs/Manifest @@ -1,3 +1,2 @@ -DIST gvfs-1.22.4.tar.xz 1598264 SHA256 57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484 SHA512 5485a46284b62f19f6c289a5e341f4f0a48c3b8b42cdc5e8b4f9070b1b33e781ada8a4fbb718f5305cdeaa287d122718ea2826a52cc4ebae090cbbc519e758d8 WHIRLPOOL f0b6514241616e64ad45d8ce163d2ba2ca293d60a2ab65210cff4f9338f7f37e0d8beb3ae367c73ab2ed8d046dc4788535c00f973fa05df1e2dde8c294509e9c DIST gvfs-1.24.2.tar.xz 1627808 SHA256 0949eaedd1df7175f8d7ee2700df8210d1f854b8ee37d963bc32ee7091eeb228 SHA512 4e5a3150ec4a57ca1229653fd2ce91840e8f7c372de8eb3cd9196b83a687c4336b6fd6fec3f6f6dca740ff1033906cce8f42377c45014f4ce7fd9c33bdcedc59 WHIRLPOOL c65c2402a77cb5de3180f9988b6f0c29af3d979863e32943bca70a30dda89197a0747ed18ebfffe6d70a06d790be195a749c7b34afbfd780c80273aacad9844f DIST gvfs-1.26.2.tar.xz 1680404 SHA256 695b6e0f3de5ac2cb4d188917edef3f13299328150a2413f1a7131d9b2d48d18 SHA512 0745b850d476311c5d1de357f902ff0c18f34be05fc2d047e1435b2ca3732ce6e2f95f9bd41ce100ed590939c45c6f7dcf8274799c7b552d80f56af7919df110 WHIRLPOOL 86116ac7878252e9078c1215198787a96c987e0ac0ef5e06bda24938ec142f7f073755bfa5409aee208ba516a6c36698798a4772d214c9897cbece0d50b6defb diff --git a/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch b/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch deleted file mode 100644 index 9e2ed66..0000000 --- a/gnome-base/gvfs/files/gvfs-1.22.4-fix-parallel.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 62c4c2af399dba0566ae69353f127472fa3e3364 Mon Sep 17 00:00:00 2001 -From: Ross Lagerwall <[email protected]> -Date: Mon, 16 Mar 2015 00:06:07 +0000 -Subject: completion: Fix parallel installation - -Use install-data-hook rather than install-data-local as -install-data-hook runs after the other install rules have run. This is -important for a parallel install so that the destination directory -already exists when the symlinks are created. - -diff --git a/programs/completion/Makefile.am b/programs/completion/Makefile.am -index 06833e5..971e4ee 100644 ---- a/programs/completion/Makefile.am -+++ b/programs/completion/Makefile.am -@@ -35,6 +35,6 @@ uninstall-symlinks: - rm -f $(DESTDIR)$(BASHCOMP_DIR)/$$file; \ - done - --install-data-local: install-symlinks -+install-data-hook: install-symlinks - - uninstall-local: uninstall-symlinks --- -cgit v0.10.2 - diff --git a/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch b/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch deleted file mode 100644 index 09b822f..0000000 --- a/gnome-base/gvfs/files/gvfs-1.24.2-g_warning.patch +++ /dev/null @@ -1,54 +0,0 @@ -From d663c85f0356d7800638c5eaa1a49e6c26bdfa33 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy <[email protected]> -Date: Fri, 27 Feb 2015 10:22:22 +0100 -Subject: afp: Change g_error to g_warning for read errors - -Use g_warning rather than g_error when a read error occurs to prevent -spurious crash reports since there are many different ways for a read -from the network to fail. - -[Cherry-picked from gnome-3-14/14369db2a8fc - Commit message written by Ross Lagerwall.] - -https://bugzilla.gnome.org/show_bug.cgi?id=710490 ---- - daemon/gvfsafpconnection.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/daemon/gvfsafpconnection.c b/daemon/gvfsafpconnection.c -index c8ccad7..abe1422 100644 ---- a/daemon/gvfsafpconnection.c -+++ b/daemon/gvfsafpconnection.c -@@ -1078,12 +1078,12 @@ read_data_cb (GObject *object, GAsyncResult *res, gpointer user_data) - g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED)) - { - g_message (_("Host closed connection")); -- exit(0); - } - else - { -- g_error ("FAIL!!! \"%s\"\n", err->message); -+ g_warning ("FAIL!!! \"%s\"\n", err->message); - } -+ exit (0); - } - - dispatch_reply (afp_connection); -@@ -1120,12 +1120,12 @@ read_dsi_header_cb (GObject *object, GAsyncResult *res, gpointer user_data) - g_error_matches (err, G_IO_ERROR, G_IO_ERROR_CONNECTION_CLOSED)) - { - g_message (_("Host closed connection")); -- exit(0); - } - else - { -- g_error ("FAIL!!! \"%s\"\n", err->message); -+ g_warning ("FAIL!!! \"%s\"\n", err->message); - } -+ exit (0); - } - - dsi_header = &priv->read_dsi_header; --- -cgit v0.11.2 - diff --git a/gnome-base/gvfs/gvfs-1.22.4.ebuild b/gnome-base/gvfs/gvfs-1.22.4.ebuild deleted file mode 100644 index b59111e..0000000 --- a/gnome-base/gvfs/gvfs-1.22.4.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp samba systemd test +udev udisks zeroconf" -REQUIRED_USE=" - cdda? ( udev ) - mtp? ( 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:0= ) - archive? ( app-arch/libarchive:= ) - bluray? ( media-libs/libbluray ) - fuse? ( >=sys-fs/fuse-2.8.0 ) - 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-2.42: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:0= ) - udev? ( - cdda? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) ) - 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() { - 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 - - # Uncomment when eautoreconf stops being needed always - #eautoreconf - fi - - # Fix parallel installation, bug #543812 (from 'master') - epatch "${FILESDIR}/${PN}-1.22.4-fix-parallel.patch" - - eautoreconf - 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)" \ - --disable-gdu \ - --disable-hal \ - --disable-obexftp \ - --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-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) \ - $(use_enable zeroconf avahi) -} diff --git a/gnome-base/gvfs/gvfs-1.24.2.ebuild b/gnome-base/gvfs/gvfs-1.24.2.ebuild deleted file mode 100644 index fc38b08..0000000 --- a/gnome-base/gvfs/gvfs-1.24.2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 bluray cdda fuse gnome-online-accounts gphoto2 gtk +http ios libsecret mtp nfs samba systemd test +udev udisks zeroconf" -REQUIRED_USE=" - cdda? ( udev ) - mtp? ( 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.43.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-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-2.42:2.4 ) - ios? ( - >=app-pda/libimobiledevice-1.1.5:= - >=app-pda/libplist-1:= ) - libsecret? ( app-crypt/libsecret ) - 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() { - 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 - - # 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)" \ - --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-online-accounts goa) \ - $(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 libsecret keyring) \ - $(use_enable samba) \ - $(use_enable systemd libsystemd-login) \ - $(use_enable udisks udisks2) \ - $(use_enable zeroconf avahi) -}
