[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/, gnome-base/gnome-vfs/files/, profiles/

2022-05-28 Thread Matt Turner 
commit: ba6b3b6ee55d9f205df88e33b637dfa946dd4029
Author: Matt Turner  gentoo  org>
AuthorDate: Sun May 29 01:37:44 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun May 29 01:37:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6b3b6e

gnome-base/gnome-vfs: Remove

Signed-off-by: Matt Turner  gentoo.org>

 gnome-base/gnome-vfs/Manifest  |   1 -
 .../gnome-vfs/files/gnome-vfs-2.12.0-afs.patch |  12 --
 .../files/gnome-vfs-2.15.2-headers-define.patch|  19 ---
 .../files/gnome-vfs-2.16.0-no-dbus-crash.patch |  12 --
 .../files/gnome-vfs-2.20.0-automagic-deps.patch|  68 -
 .../files/gnome-vfs-2.20.1-automagic-deps.patch|  19 ---
 .../files/gnome-vfs-2.24.0-uuid-mount.patch|  77 --
 .../files/gnome-vfs-2.24.4-automake-1.13.patch |  30 
 .../gnome-vfs-2.24.4-build-tests-asneeded.patch|  25 
 ...nome-vfs-2.24.4-disable-test-async-cancel.patch |  24 
 .../files/gnome-vfs-2.24.4-gnutls27.patch  |  68 -
 .../files/gnome-vfs-2.24.4-gnutls34.patch  |  38 -
 .../files/gnome-vfs-2.24.4-home_dir_fakeroot.patch | 155 -
 .../files/gnome-vfs-2.24.4-openssl-1.1.patch   |  26 
 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild| 141 ---
 gnome-base/gnome-vfs/metadata.xml  |   8 --
 profiles/package.mask  |   5 -
 17 files changed, 728 deletions(-)

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
deleted file mode 100644
index 66d8544c7d33..
--- a/gnome-base/gnome-vfs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 
696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b6f3c56839add737b802aba0e7ac
 SHA512 
db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch 
b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
deleted file mode 100644
index cdc88c24b6a3..
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c 
gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c
 gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c   2005-08-23 
01:34:36.0 +0800
-+++ gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c   
2005-09-18 20:30:47.0 +0800
-@@ -35,7 +35,7 @@
- 
- static struct FSInfo fs_data[] = {
-   { "affs" , N_("AFFS Volume"), 0},
--  { "afs"  , N_("AFS Network Volume"), 0 },
-+  { "afs"  , N_("AFS Network Volume"), 1 },
-   { "auto" , N_("Auto-detected Volume"), 0 },
-   { "cd9660"   , N_("CD-ROM Drive"), 0 },
-   { "cdda" , N_("CD Digital Audio"), 0 },

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch 
b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
deleted file mode 100644
index 9d6e9978242f..
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 a/configure.in
-+++ b/configure.in
-@@ -191,6 +191,16 @@
- 
- AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h 
sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)
- 
-+AC_CHECK_HEADERS([pwd.h])
-+if test "$ac_cv_header_pwd_h" = "yes"; then
-+  AC_DEFINE(HAVE_PWD_H, [1], [pwd.h present])
-+fi
-+
-+AC_CHECK_HEADERS([grp.h])
-+if test "$ac_cv_header_grp_h" = "yes"; then
-+  AC_DEFINE(HAVE_GRP_H, [1], [grp.h present])
-+fi
-+
- dnl
- dnl file system type member in statfs struct
- dnl

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch 
b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
deleted file mode 100644
index 6905060a4f71..
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN 
gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c 
gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c
 gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c
2006-07-07 04:46:39.0 -0400
-+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c 
2006-09-21 11:22:49.0 -0400
-@@ -236,6 +236,8 @@
- gnome_vfs_volume_monitor_client_init (GnomeVFSVolumeMonitorClient 
*volume_monitor_client)
- {
-   setup_dbus_connection (volume_monitor_client);
-+  if (!volume_monitor_client->dbus_conn)
-+  return;
-   read_drives_from_daemon (volume_monitor_client);
-   read_volumes_from_daemon (volume_monitor_client);
- }

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2021-05-02 Thread Mikle Kolyada 
commit: 8730c87e75f88283916e2230dd1d4f72f12e3732
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 15:02:20 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 15:07:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8730c87e

gnome-base/gnome-vfs: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index aba99abca80..896aa98ef1f 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/;
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
+IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
 
 RDEPEND="
>=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
@@ -33,8 +33,7 @@ RDEPEND="
>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
!gnome-extra/gnome-vfs-sftp )
!gnutls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+   >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
!gnome-extra/gnome-vfs-sftp ) )
zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
 "

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/files/, gnome-base/gnome-vfs/

2021-04-04 Thread Andreas Sturmlechner 
commit: ed699c8184f70d7ca5e3acd33fb9d700daa54e1b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 30 19:28:20 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  4 13:51:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed699c81

gnome-base/gnome-vfs: EAPI-7 bump, drop eutils, drop obsolete sed

Use GNOME2_EAUTORECONF="yes"
The only sed match was already dropped by gnome-vfs-2.24.4-automake-1.13.patch.

The same files are installed in the same locations and tests pass.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/gnome-vfs-2.15.2-headers-define.patch|  4 +--
 .../files/gnome-vfs-2.20.0-automagic-deps.patch|  4 +--
 .../files/gnome-vfs-2.20.1-automagic-deps.patch|  4 +--
 .../files/gnome-vfs-2.24.4-openssl-1.1.patch   |  4 +--
 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild| 30 +++---
 5 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch 
b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
index f74db8edb1c..9d6e9978242 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
@@ -1,5 +1,5 @@
 configure.in   2006-06-13 00:36:14.0 -0500
-+++ configure.in   2006-06-13 00:54:15.0 -0500
+--- a/configure.in
 b/configure.in
 @@ -191,6 +191,16 @@
  
  AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h 
sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch 
b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
index 876148b891f..18d900ac12c 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
@@ -1,7 +1,7 @@
 Index: configure.in
 ===
 configure.in   (révision 5413)
-+++ configure.in   (copie de travail)
+--- a/configure.in
 b/configure.in
 @@ -448,9 +448,13 @@
  dnl GSSAPI
  dnl Check for Kerberos installation

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch 
b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
index 11ac34c0721..63be9f95b9d 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
@@ -1,5 +1,5 @@
 configure.in.  2007-11-30 04:15:01.0 +0100
-+++ configure.in   2007-11-30 04:16:21.0 +0100
+--- a/configure.in
 b/configure.in
 @@ -1102,6 +1102,7 @@
AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
[],[enable_acl=yes])

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch 
b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
index 14207f28d19..cb1886ef4a2 100644
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
@@ -4,8 +4,8 @@ struct SSL is opaque in openssl-1.1; and the SSL_free() man page
 says that one should not free members of it manually (in both
 the openssl-1.0 and openssl-1.1 man pages).
 
 libgnomevfs/gnome-vfs-ssl.c.orig   2010-02-09 12:16:14.0 +
-+++ libgnomevfs/gnome-vfs-ssl.c
+--- a/libgnomevfs/gnome-vfs-ssl.c
 b/libgnomevfs/gnome-vfs-ssl.c
 @@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
}
}

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index ace27c50d46..aba99abca80 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
+EAPI=7
 
-inherit autotools eutils gnome2 multilib-minimal virtualx
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_EAUTORECONF="yes"
+inherit gnome2 multilib-minimal virtualx
 
 DESCRIPTION="Gnome Virtual Filesystem"
 HOMEPAGE="https://www.gnome.org/;
@@ -39,7 +38,8 @@ RDEPEND="
!gnome-extra/gnome-vfs-sftp ) )
zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
dev-util/glib-utils
sys-devel/gettext
gnome-base/gnome-common
@@ -48,6 +48,8 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.13
 "
 
+DOCS=( "${S}"/{AUTHORS,ChangeLog,HACKING,NEWS,README,TODO} )
+
 PATCHES=(
# Allow the Trash on afs filesystems (#106118)
"${FILESDIR}"/${PN}-2.12.0-afs.patch
@@

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2021-01-06 Thread Fabian Groffen 
commit: 4ecc4f507f8b1e08bc2864110d7b7f311e78b61a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 23:03:47 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 23:03:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ecc4f50

gnome-base/gnome-vfs: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index 2d74d7c5001..ace27c50d46 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux 
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2019-09-23 Thread Mart Raudsepp 
commit: 8cd9dcb4dadf854b005817ea779c15b27b3e66ce
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Sep 23 06:29:21 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Sep 23 09:22:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd9dcb4

gnome-base/gnome-vfs: require avahi[dbus] for USE=zeroconf

For some reason avahi can be built without avahi-client library with
USE=-dbus, but avahi-client is required here.

Bug: https://bugs.gentoo.org/695384
Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index 6d393236a8b..8195abdc226 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -37,7 +37,7 @@ RDEPEND="
!libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
!gnome-extra/gnome-vfs-sftp ) )
-   zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+   zeroconf? ( >=net-dns/avahi-0.6.31-r2[dbus,${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
dev-util/glib-utils

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2018-11-25 Thread Mart Raudsepp 
commit: 964631e201461209fc42c17a7805ecf28c4cd979
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Nov 25 13:52:01 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Nov 25 13:58:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=964631e2

gnome-base/gnome-vfs: add explicit build dep on glib-utils

There's also a warning about GNOME_COMMON_INIT, but appears
harmless, so not taking the time to remove the call from
configure.in, as gnome-vfs is a last rites candidate anyways.

Closes: https://bugs.gentoo.org/667972
Signed-off-by: Mart Raudsepp  gentoo.org>
Package-Manager: Portage-2.3.52, Repoman-2.3.11

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index ad3dca34e33..6d393236a8b 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -40,6 +40,7 @@ RDEPEND="
zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
+   dev-util/glib-utils
sys-devel/gettext
gnome-base/gnome-common
>=dev-util/intltool-0.40

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/, gnome-base/gnome-vfs/files/

2018-10-24 Thread Lars Wendler 
commit: ac43ef9f87e64583606d6654b1ede19a16d3abdd
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Oct 24 13:07:38 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Oct 24 13:08:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac43ef9f

gnome-base/gnome-vfs: Fixed build with openssl-1.1

Closes: https://bugs.gentoo.org/592540
Signed-off-by: Lars Wendler  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../files/gnome-vfs-2.24.4-openssl-1.1.patch   | 26 
 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild| 35 +-
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch 
b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
new file mode 100644
index 000..14207f28d19
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-openssl-1.1.patch
@@ -0,0 +1,26 @@
+$NetBSD: patch-libgnomevfs_gnome-vfs-ssl.c,v 1.1 2018/02/16 13:18:26 wiz Exp $
+
+struct SSL is opaque in openssl-1.1; and the SSL_free() man page
+says that one should not free members of it manually (in both
+the openssl-1.0 and openssl-1.1 man pages).
+
+--- libgnomevfs/gnome-vfs-ssl.c.orig   2010-02-09 12:16:14.0 +
 libgnomevfs/gnome-vfs-ssl.c
+@@ -400,9 +400,6 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
+   }
+   }
+ 
+-if (ssl->private->ssl->ctx)
+-SSL_CTX_free (ssl->private->ssl->ctx);
+-
+ SSL_free (ssl->private->ssl);
+   g_free (ssl->private);
+   g_free (ssl);
+@@ -705,7 +702,6 @@ gnome_vfs_ssl_destroy (GnomeVFSSSL *ssl,
+   }
+   }
+   
+-  SSL_CTX_free (ssl->private->ssl->ctx);
+   SSL_free (ssl->private->ssl);
+   close (ssl->private->sockfd);
+   if (ssl->private->timeout)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index 7b788c1a09d..ad3dca34e33 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -47,43 +47,50 @@ DEPEND="${RDEPEND}
>=dev-util/gtk-doc-am-1.13
 "
 
-src_prepare() {
+PATCHES=(
# Allow the Trash on afs filesystems (#106118)
-   epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+   "${FILESDIR}"/${PN}-2.12.0-afs.patch
 
# Fix compiling with headers missing
-   epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+   "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
 
# Fix for crashes running programs via sudo
-   epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+   "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
 
# Fix automagic dependencies, upstream bug #493475
-   epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
-   epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
+   "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+   "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
 
# Fix to identify ${HOME} (#200897)
# thanks to debian folks
-   epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
+   "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
 
# Configure with gnutls-2.7, bug #253729
# Fix building with gnutls-2.12, bug #388895
-   epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
+   "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
 
# Prevent duplicated volumes, bug #193083
-   epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
+   "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
 
# Do not build tests with FEATURES="-test", bug #226221
-   epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
+   "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
 
# Disable broken test, bug #285706
-   epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
+   "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
 
# Fix for automake-1.13 compatibility, #466944
-   epatch "${FILESDIR}"/${P}-automake-1.13.patch
+   "${FILESDIR}"/${P}-automake-1.13.patch
 
# Fix gnutls-3.4+ compatibility, #560084
# always use system defaults (patch from Arch Linux)
-   epatch "${FILESDIR}"/${P}-gnutls34.patch
+   "${FILESDIR}"/${P}-gnutls34.patch
+
+   # Fix build with openssl-1.1 #592540
+   "${FILESDIR}"/${PN}-2.24.4-openssl-1.1.patch
+)
+
+src_prepare() {
+   epatch "${PATCHES[@]}"
 
sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2018-06-13 Thread Lars Wendler 
commit: c12c4bc28a5824813906a5511742e4270b9f8d74
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun 13 16:19:44 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 13 16:21:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c12c4bc2

gnome-base/gnome-vfs: Added sub-slot dep to ssl packages.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index 5944120e1d8..7b788c1a09d 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -34,8 +34,8 @@ RDEPEND="
>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
!gnome-extra/gnome-vfs-sftp )
!gnutls? (
-   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
!gnome-extra/gnome-vfs-sftp ) )
zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 "

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2017-07-02 Thread Alexis Ballier 
commit: 511f871da9ffd76b16f9ba62b3413a5bb4bc09a1
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun Jul  2 16:46:28 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Jul  2 16:47:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511f871d

gnome-base/gnome-vfs: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index 6f3e50148b8..b46ee33df2a 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2016-12-06 Thread Markus Meier 
commit: d34b57bea625f5e504d7de73fd07b85fe0235db8
Author: Markus Meier  gentoo  org>
AuthorDate: Tue Dec  6 20:29:49 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Tue Dec  6 20:29:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d34b57be

gnome-base/gnome-vfs: arm stable, bug #587010

Package-Manager: portage-2.3.2
RepoMan-Options: --include-arches="arm"

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
index d687ac5..913590b 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2016-10-02 Thread Pacho Ramos 
commit: fbca7fb56913582e4e048ba6339bb36a8743588c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct  2 11:26:01 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct  2 12:36:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbca7fb5

gnome-base/gnome-vfs: Drop old

Package-Manager: portage-2.3.1

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild | 158 
 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild | 146 --
 2 files changed, 304 deletions(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild
deleted file mode 100644
index 22ebfd5..
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r2.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="https://www.gnome.org/;
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
-IUSE="acl avahi doc fam gnutls ipv6 kerberos samba ssl"
-
-RDEPEND=">=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
-   >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
-   >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-   >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-   gnome-base/gnome-mime-data
-   >=x11-misc/shared-mime-info-0.14
-   >=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
-   acl? (
-   >=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
-   >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-   avahi? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-   fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-   samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-   ssl? (
-   gnutls? (
-   >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-   !gnome-extra/gnome-vfs-sftp )
-   !gnutls? (
-   >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}]
-   !gnome-extra/gnome-vfs-sftp ) )
-"
-DEPEND="${RDEPEND}
-   sys-devel/gettext
-   gnome-base/gnome-common
-   >=dev-util/intltool-0.40
-   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-   >=dev-util/gtk-doc-am-1.13
-   doc? ( >=dev-util/gtk-doc-1 )"
-RDEPEND="${RDEPEND}
-   abi_x86_32? (
-   !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
-   !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-   )"
-
-src_prepare() {
-   # Allow the Trash on afs filesystems (#106118)
-   epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
-
-   # Fix compiling with headers missing
-   epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
-
-   # Fix for crashes running programs via sudo
-   epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
-
-   # Fix automagic dependencies, upstream bug #493475
-   epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
-   epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
-
-   # Fix to identify ${HOME} (#200897)
-   # thanks to debian folks
-   epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
-
-   # Configure with gnutls-2.7, bug #253729
-   # Fix building with gnutls-2.12, bug #388895
-   epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
-
-   # Prevent duplicated volumes, bug #193083
-   epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
-
-   # Do not build tests with FEATURES="-test", bug #226221
-   epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
-
-   # Disable broken test, bug #285706
-   epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
-
-   # Fix for automake-1.13 compatibility, #466944
-   epatch "${FILESDIR}"/${P}-automake-1.13.patch
-
-   # Fix deprecated API disabling in used libraries - this is not 
future-proof, bug 212163
-   # upstream bug #519632
-   sed -i -e '/DISABLE_DEPRECATED/d' \
-   daemon/Makefile.am daemon/Makefile.in \
-   libgnomevfs/Makefile.am libgnomevfs/Makefile.in \
-   modules/Makefile.am modules/Makefile.in \
-   test/Makefile.am test/Makefile.in || die
-   sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' \
-   programs/Makefile.am programs/Makefile.in || die
-
-   sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-
-   eautoreconf
-
-   gnome2_src_prepare
-}
-
-multilib_src_configure() {
-   local myconf=(
-   --disable-schemas-install
-   --disable-static
-

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/files/, gnome-base/gnome-vfs/

2016-06-11 Thread Michał Górny 
commit: 3ed0516c7dc1c1162f1924e00965d4f3f931f021
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Jun 11 20:16:00 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Jun 11 20:22:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ed0516c

gnome-base/gnome-vfs: Fix gnutls-3.4+ compatibility, #560084

 .../files/gnome-vfs-2.24.4-gnutls34.patch  |  38 ++
 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild| 151 +
 2 files changed, 189 insertions(+)

diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch 
b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
new file mode 100644
index 000..78942f0
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
@@ -0,0 +1,38 @@
+diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 
gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
+--- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c  2010-02-09 
14:16:14.0 +0200
 gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c   2015-04-14 
00:01:51.272451668 +0300
+@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand
+ #endif
+ }
+ 
+-#ifdef HAVE_GNUTLS
+-static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
+-static const int cipher_priority[] = 
+-  {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
+-   GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
+-static const int comp_priority[] =
+-  {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0};
+-static const int kx_priority[] =
+-  {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0};
+-static const int mac_priority[] =
+-  {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
+-
+-#endif
+-
+-
+ /**
+  * gnome_vfs_ssl_create_from_fd:
+  * @handle_return: pointer to a #GnomeVFSSSL struct, which will
+@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
+   gnutls_transport_set_ptr (ssl->private->tlsstate, 
+ GINT_TO_POINTER (fd));
+ 
+-  gnutls_protocol_set_priority (ssl->private->tlsstate, 
protocol_priority);
+-  gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority);
+-  gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority);
+-  gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority);
+-  gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority);
++  gnutls_set_default_priority (ssl->private->tlsstate);
+ 
+   gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE,
+ssl->private->xcred);

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
new file mode 100644
index 000..177eff7
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="https://www.gnome.org/;
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
+IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
+
+RDEPEND="
+   >=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
+   >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
+   >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+   >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+   gnome-base/gnome-mime-data
+   >=x11-misc/shared-mime-info-0.14
+   >=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
+   acl? (
+   >=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
+   >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+   !gnome-extra/gnome-vfs-sftp )
+   !gnutls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   !gnome-extra/gnome-vfs-sftp ) )
+   zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+   abi_x86_32? (
+   !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
+   !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+   )
+"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   gnome-base/gnome-common
+   >=dev-util/intltool-0.40
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+   >=dev-util/gtk-doc-am-1.13
+"
+
+src_prepare() {
+   # Allow the Trash on afs filesystems

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2015-11-19 Thread Agostino Sarubbo 
commit: 967375e83e9ca4f817ec1eb605e266dc9d561e64
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Nov 19 10:03:35 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Nov 19 10:03:35 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967375e8

gnome-base/gnome-vfs: arm stable wrt bug #565086

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="arm"

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
index f516cb3..faba33c 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2015-11-18 Thread Agostino Sarubbo 
commit: c37b2f19ac871e40bc83611d2db624851e72b5ce
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 18 09:08:18 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 18 09:08:18 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37b2f19

gnome-base/gnome-vfs: alpha stable wrt bug #565086

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="alpha"

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
index 1e5f148..f516cb3 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2015-11-16 Thread Agostino Sarubbo 
commit: 47fe7eea4a0dba726c43d38360bace0bb7a55d5f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Nov 16 14:07:02 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Nov 16 14:07:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47fe7eea

gnome-base/gnome-vfs: ia64 stable wrt bug #565086

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ia64"

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
index 6a8ba68..1e5f148 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2015-11-14 Thread Agostino Sarubbo 
commit: cf5de2ff9fac3c74b2f7de6bf708837aee1bd769
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Nov 14 10:27:43 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Nov 14 10:27:43 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf5de2ff

gnome-base/gnome-vfs: sparc stable wrt bug #565086

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="sparc"

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
index cd4fba0..6a8ba68 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2015-11-13 Thread Agostino Sarubbo 
commit: 587d3d36f3eb3e9d49fc53b0efa66709201748ed
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 13 09:11:14 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 13 09:12:02 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=587d3d36

gnome-base/gnome-vfs: ppc64 stable wrt bug #565086

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc64"

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
index 06e3c93..cd4fba0 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2015-10-18 Thread Mikle Kolyada 
commit: baebfc584057a9556c2afd5b66e55fa0a2e4b964
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Oct 18 11:01:47 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Oct 18 11:26:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baebfc58

gnome-base/gnome-vfs: sparc stable wrt bug #551826

Package-Manager: portage-2.2.20.1

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
index 01fe8e1..7cf5107 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2015-10-04 Thread Julian Ospald 
commit: 9822893bb1a99dc8e943d64b7067fa4cff897837
Author: Julian Ospald  gentoo  org>
AuthorDate: Sun Oct  4 19:21:46 2015 +
Commit: Julian Ospald  gentoo  org>
CommitDate: Sun Oct  4 19:21:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9822893b

gnome-base/gnome-vfs: add libressl support

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild | 147 
 1 file changed, 147 insertions(+)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
new file mode 100644
index 000..48d052b
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="https://www.gnome.org/;
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
+IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
+
+RDEPEND="
+   >=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
+   >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
+   >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+   >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+   gnome-base/gnome-mime-data
+   >=x11-misc/shared-mime-info-0.14
+   >=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
+   acl? (
+   >=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
+   >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+   !gnome-extra/gnome-vfs-sftp )
+   !gnutls? (
+   !libressl? ( 
>=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
+   libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+   !gnome-extra/gnome-vfs-sftp ) )
+   zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+   abi_x86_32? (
+   !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
+   !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+   )
+"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   gnome-base/gnome-common
+   >=dev-util/intltool-0.40
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+   >=dev-util/gtk-doc-am-1.13
+"
+
+src_prepare() {
+   # Allow the Trash on afs filesystems (#106118)
+   epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+
+   # Fix compiling with headers missing
+   epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+
+   # Fix for crashes running programs via sudo
+   epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+
+   # Fix automagic dependencies, upstream bug #493475
+   epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+   epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
+
+   # Fix to identify ${HOME} (#200897)
+   # thanks to debian folks
+   epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
+
+   # Configure with gnutls-2.7, bug #253729
+   # Fix building with gnutls-2.12, bug #388895
+   epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
+
+   # Prevent duplicated volumes, bug #193083
+   epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
+
+   # Do not build tests with FEATURES="-test", bug #226221
+   epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
+
+   # Disable broken test, bug #285706
+   epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
+
+   # Fix for automake-1.13 compatibility, #466944
+   epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
+   sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+
+   eautoreconf
+   gnome2_src_prepare
+}
+
+multilib_src_configure() {
+   local myconf=(
+   --disable-schemas-install
+   --disable-static
+   --disable-cdda
+   --disable-fam
+   --disable-hal
+   --disable-howl
+   $(use_enable acl)
+   $(use_enable gnutls)
+   $(use_enable ipv6)
+   $(use_enable kerberos krb5)
+   $(use_enable samba)
+   $(use_enable ssl openssl)
+   $(use_enable zeroconf avahi)
+   # Useless ? --enable-http-neon
+
+   # fix path to krb5-config
+   KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
+   )
+
+   # this works because of the order of configure parsing
+   # so

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2015-10-03 Thread Markus Meier 
commit: def8b49d76615038a5a3d4e48211c1dada50b0c2
Author: Markus Meier  gentoo  org>
AuthorDate: Sat Oct  3 08:35:50 2015 +
Commit: Markus Meier  gentoo  org>
CommitDate: Sat Oct  3 08:36:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=def8b49d

gnome-base/gnome-vfs: arm stable, bug #551826

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="arm"

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
index a96a3bf..01fe8e1 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gnome.org/;
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="alpha ~amd64 ~arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
+KEYWORDS="alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd 
~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris 
~x86-solaris"
 IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-vfs/

2015-09-05 Thread Pacho Ramos 
commit: 6107cdda313eddb079ae151c4d48463b387b0346
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep  5 18:04:49 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep  5 18:05:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6107cdda

gnome-base/gnome-vfs: Disable fam support (#559492), update to new gnome team 
policies.

Package-Manager: portage-2.2.20.1

 gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild | 146 
 1 file changed, 146 insertions(+)

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild 
b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
new file mode 100644
index 000..32fddc0
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r3.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib-minimal virtualx
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="https://www.gnome.org/;
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos 
~sparc-solaris ~x86-solaris"
+IUSE="acl gnutls ipv6 kerberos samba ssl zeroconf"
+
+RDEPEND="
+   >=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
+   >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
+   >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+   >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+   gnome-base/gnome-mime-data
+   >=x11-misc/shared-mime-info-0.14
+   >=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
+   acl? (
+   >=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
+   >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+   kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+   samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
+   ssl? (
+   gnutls? (
+   >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
+   !gnome-extra/gnome-vfs-sftp )
+   !gnutls? (
+   >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}]
+   !gnome-extra/gnome-vfs-sftp ) )
+   zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+   abi_x86_32? (
+   !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1
+   !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+   )
+"
+DEPEND="${RDEPEND}
+   sys-devel/gettext
+   gnome-base/gnome-common
+   >=dev-util/intltool-0.40
+   >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+   >=dev-util/gtk-doc-am-1.13
+"
+
+src_prepare() {
+   # Allow the Trash on afs filesystems (#106118)
+   epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
+
+   # Fix compiling with headers missing
+   epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
+
+   # Fix for crashes running programs via sudo
+   epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
+
+   # Fix automagic dependencies, upstream bug #493475
+   epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
+   epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
+
+   # Fix to identify ${HOME} (#200897)
+   # thanks to debian folks
+   epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
+
+   # Configure with gnutls-2.7, bug #253729
+   # Fix building with gnutls-2.12, bug #388895
+   epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
+
+   # Prevent duplicated volumes, bug #193083
+   epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
+
+   # Do not build tests with FEATURES="-test", bug #226221
+   epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
+
+   # Disable broken test, bug #285706
+   epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
+
+   # Fix for automake-1.13 compatibility, #466944
+   epatch "${FILESDIR}"/${P}-automake-1.13.patch
+
+   sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+
+   eautoreconf
+   gnome2_src_prepare
+}
+
+multilib_src_configure() {
+   local myconf=(
+   --disable-schemas-install
+   --disable-static
+   --disable-cdda
+   --disable-fam
+   --disable-hal
+   --disable-howl
+   $(use_enable acl)
+   $(use_enable gnutls)
+   $(use_enable ipv6)
+   $(use_enable kerberos krb5)
+   $(use_enable samba)
+   $(use_enable ssl openssl)
+   $(use_enable zeroconf avahi)
+   # Useless ? --enable-http-neon
+
+   # fix path to krb5-config
+   KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
+   )
+
+   # this works because of the order of configure parsing
+   # so should always be behind