fix bug #191426 and bug #195216

Package-Manager: portage-2.1.3.16

5 files changed, 197 insertions, 8 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index af45db6e748d..bc52814e23be 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.265 2007/09/25 20:32:21 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.266 2007/11/05 22:27:52 eva Exp $
+
+*gnome-vfs-2.20.0-r1 (05 Nov 2007)
+
+  05 Nov 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-vfs-2.20.0-automagic-deps.patch, +gnome-vfs-2.20.0-r1.ebuild:
+  fix automagic dependencies wrt to bug #191426
 
 *gnome-vfs-2.20.0 (25 Sep 2007)
 
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index d4fc1dbd87bb..34f68e5eb49d 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -33,6 +33,10 @@ AUX gnome-vfs-2.18.1-drop-gtk-doc-check.patch 856 RMD160 373f6eddf1385f98ae2b542
 MD5 8baa9af4bd2aad66e8e0d9e4e04eb9bf files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch 856
 RMD160 373f6eddf1385f98ae2b5423c7994e1aa01c1354 files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch 856
 SHA256 f001773ae69346a5e09746f308bda8f4f2c2383ee889d69b342367bee288db5b files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch 856
+AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 RMD160 91c4b7b771548b6645a1bf1764cff9af7947da43 SHA1 da27fcb4652a8f3a9e042a916371bbf03f03ad71 SHA256 478f55fe5e38714a22854351d46a031cacf1c003855865a8bdd1c2f1ececb5c5
+MD5 904f5ff2687d237bfb7e4447a6f6ddbf files/gnome-vfs-2.20.0-automagic-deps.patch 2008
+RMD160 91c4b7b771548b6645a1bf1764cff9af7947da43 files/gnome-vfs-2.20.0-automagic-deps.patch 2008
+SHA256 478f55fe5e38714a22854351d46a031cacf1c003855865a8bdd1c2f1ececb5c5 files/gnome-vfs-2.20.0-automagic-deps.patch 2008
 DIST gnome-vfs-2.14.2.tar.bz2 1816194 RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 SHA1 ffd2e5f229495f55587d8499e5f2b8b8a76e5448 SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7
 DIST gnome-vfs-2.16.3.tar.bz2 1900424 RMD160 9600bb4f4630d48600c1469fa5077d8e969a10cc SHA1 a4c97179e2c4abf8cfcf236e56f7d328feaef89b SHA256 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777
 DIST gnome-vfs-2.18.1.tar.bz2 1916897 RMD160 ff2fc7a7c47b85a03d65964a8ad1d7d585698f3d SHA1 e939fe4fe2e75516ae6c4d476f8fb44f59ec8bdc SHA256 098d920cb7d4a50e245deaafabfd8e06b86c88771d56be567597c09c09207f5e
@@ -53,14 +57,18 @@ EBUILD gnome-vfs-2.18.1.ebuild 2446 RMD160 388fc637cdd96d6d41f1a62f7a88e64c2ec41
 MD5 ca163bbcc9b9b014c066d785a49c0bca gnome-vfs-2.18.1.ebuild 2446
 RMD160 388fc637cdd96d6d41f1a62f7a88e64c2ec41ba4 gnome-vfs-2.18.1.ebuild 2446
 SHA256 2abcd2948f8e57a49e710336f4917df277ca480c4f25b46019e433645581483a gnome-vfs-2.18.1.ebuild 2446
+EBUILD gnome-vfs-2.20.0-r1.ebuild 2652 RMD160 fff996583db466f0121090b8a1eb3263eeff1f22 SHA1 887f263807d586d72fa8623eace958cdff1bb7a3 SHA256 d387fe1cf1ccad98ddce1e0e31f496b6de4397c3e14b15c931f40eb22fb85e97
+MD5 156b154fc8205aef23f05b2f60b2c721 gnome-vfs-2.20.0-r1.ebuild 2652
+RMD160 fff996583db466f0121090b8a1eb3263eeff1f22 gnome-vfs-2.20.0-r1.ebuild 2652
+SHA256 d387fe1cf1ccad98ddce1e0e31f496b6de4397c3e14b15c931f40eb22fb85e97 gnome-vfs-2.20.0-r1.ebuild 2652
 EBUILD gnome-vfs-2.20.0.ebuild 2428 RMD160 07f1b63cac415072a84a92e8dfaa319ef83412f5 SHA1 440578d1712d8d6ac923b8fa450932dbc6418e50 SHA256 7da07037c015587d73e011e16b6091ab4c7179455f396c2d33e7e71613d4ca54
 MD5 eb1772a7030c091be771375d6264723b gnome-vfs-2.20.0.ebuild 2428
 RMD160 07f1b63cac415072a84a92e8dfaa319ef83412f5 gnome-vfs-2.20.0.ebuild 2428
 SHA256 7da07037c015587d73e011e16b6091ab4c7179455f396c2d33e7e71613d4ca54 gnome-vfs-2.20.0.ebuild 2428
-MISC ChangeLog 34099 RMD160 681f30c7212d236c542a865bb154830af5a9f084 SHA1 8c8476ad6796338aa791667669ffb47cf8c4c139 SHA256 51de1bab21f5727119c9ae18061345048824e88dc4f76de0647b6cb2ca717634
-MD5 27140ab1b03c0b1780e32506a0b28c55 ChangeLog 34099
-RMD160 681f30c7212d236c542a865bb154830af5a9f084 ChangeLog 34099
-SHA256 51de1bab21f5727119c9ae18061345048824e88dc4f76de0647b6cb2ca717634 ChangeLog 34099
+MISC ChangeLog 34314 RMD160 0e3693f752b0df0cb4d75d5848eaf4d0ae715f5c SHA1 4cb8878ee383e6e72fcbaef602d8d1ed860a13d3 SHA256 6f108b08c0a2e387ab19418f8191ee639b27ba1f0ec52c39a9cd1585843da2a8
+MD5 99acc2c667efb1fba2f9d25918c47359 ChangeLog 34314
+RMD160 0e3693f752b0df0cb4d75d5848eaf4d0ae715f5c ChangeLog 34314
+SHA256 6f108b08c0a2e387ab19418f8191ee639b27ba1f0ec52c39a9cd1585843da2a8 ChangeLog 34314
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -80,10 +88,13 @@ SHA256 b2720a70fba484df557c141fb4c3db683b4842d7dbac9b95ec518df94f78a54b files/di
 MD5 b241c2264ee1b8220cd02e45d945ece3 files/digest-gnome-vfs-2.20.0 256
 RMD160 c8961e1410e1692a241e6c2a7bf8b7f6b1c97e83 files/digest-gnome-vfs-2.20.0 256
 SHA256 a9e1e8dfa683fe87d149f3ddf19cfe8bf301b1f86cd5a9f010481d3d20a04f9b files/digest-gnome-vfs-2.20.0 256
+MD5 b241c2264ee1b8220cd02e45d945ece3 files/digest-gnome-vfs-2.20.0-r1 256
+RMD160 c8961e1410e1692a241e6c2a7bf8b7f6b1c97e83 files/digest-gnome-vfs-2.20.0-r1 256
+SHA256 a9e1e8dfa683fe87d149f3ddf19cfe8bf301b1f86cd5a9f010481d3d20a04f9b files/digest-gnome-vfs-2.20.0-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG+XBdomPajV0RnrERAsMgAJ92JvtMiQZeGltzzJDTplrU28p1WgCeMlF/
-lUQ6zDOGXpxwOfwqPz+dkh8=
-=GdGD
+iD8DBQFHL5j01fmVwcYIWAYRAiI/AJ9pWRl40YQC3W0Kd1KS10WmXIcUBACfUh7Q
+e6uXGhMfdWX/PrD51GVeLh8=
+=qfhw
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.20.0-r1 b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.20.0-r1
new file mode 100644
index 000000000000..d3bf2ba280ca
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/digest-gnome-vfs-2.20.0-r1
@@ -0,0 +1,3 @@
+MD5 b9fe0a066d0e693e74a000e55338235b gnome-vfs-2.20.0.tar.bz2 1918358
+RMD160 880e1c1afcb0c22131adfad4e5a5aa3605c136bb gnome-vfs-2.20.0.tar.bz2 1918358
+SHA256 cd95ec5a4808799f033dcb9daf37ed38436c594d4014e5804967fa9e5893e91f gnome-vfs-2.20.0.tar.bz2 1918358
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
new file mode 100644
index 000000000000..876148b891f4
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
@@ -0,0 +1,68 @@
+Index: configure.in
+===================================================================
+--- configure.in	(révision 5413)
++++ configure.in	(copie de travail)
+@@ -448,9 +448,13 @@
+ dnl GSSAPI
+ dnl Check for Kerberos installation
+ have_gssapi=no
++
++AC_ARG_ENABLE(krb5,
++	      AS_HELP_STRING([--enable-krb5],[Enable Kerberos 5 support]),
++	      [],[enable_krb5=yes])
+ AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
+-					   
+-if test "x$KRB5_CONFIG" != "xnone"; then
++
++if test "x$KRB5_CONFIG" != "xnone" -a "x$enable_krb5" = "xyes"; then
+    GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
+    GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
+    
+@@ -481,8 +485,12 @@
+      break
+    ])
+    LIBS="$saved_LIBS" 
+-   CPPFLAGS="$saved_CPPFLAGS" 
+-fi   
++   CPPFLAGS="$saved_CPPFLAGS"
++fi
++
++if test "x$KRB5_CONFIG" = "xnone" -a "x$enable_krb5" = "xyes"; then
++	AC_MSG_ERROR([*** kerberos 5 support enabled but krb5-config not found ***])
++fi
+ AC_SUBST(GSSAPI_LIBS)
+ AC_SUBST(GSSAPI_CFLAGS)
+ 	   
+@@ -1077,9 +1085,13 @@
+ dnl =====================
+ dnl ACL checks
+ dnl =====================
+-acl_backends=""
++acl_backends="none"
+ ACL_LIBS=""
+ 
++AC_ARG_ENABLE(acl,
++	    AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
++	    [],[enable_acl=yes])
++
+ AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
+ AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
+ AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
+@@ -1102,7 +1114,7 @@
+ gvfs_cv_HAVE_POSIX_ACLS=yes, gvfs_cv_HAVE_POSIX_ACLS=no)
+ 		LIBS=$acl_LIBS])
+ 
+-if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" ; then
++if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
+     have_solaris_acl_support=yes
+     acl_backends="solaris"
+ 
+@@ -1110,7 +1122,7 @@
+     AC_CHECK_HEADERS([pwd.h grp.h])
+ fi
+ 
+-if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" ; then
++if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
+     have_posix_acl_support=yes
+     acl_backends="posix"
+ 
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.20.0-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.20.0-r1.ebuild
new file mode 100644
index 000000000000..0c95e5e21232
--- /dev/null
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.20.0-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.20.0-r1.ebuild,v 1.1 2007/11/05 22:27:52 eva Exp $
+
+WANT_AUTOMAKE=1.8
+inherit eutils gnome2 autotools
+
+DESCRIPTION="Gnome Virtual Filesystem"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl avahi doc gnutls hal ipv6 kerberos samba ssl"
+
+RDEPEND=">=gnome-base/gconf-2
+	>=dev-libs/glib-2.9.3
+	>=dev-libs/libxml2-2.6
+	>=net-misc/neon-0.25.3
+	app-arch/bzip2
+	virtual/fam
+	gnome-base/gnome-mime-data
+	>=x11-misc/shared-mime-info-0.14
+	>=dev-libs/dbus-glib-0.71
+	samba? ( >=net-fs/samba-3 )
+	gnutls?	(
+				net-libs/gnutls
+				!gnome-extra/gnome-vfs-sftp
+			)
+	ssl?	(
+		!gnutls?	(
+				>=dev-libs/openssl-0.9.5
+				!gnome-extra/gnome-vfs-sftp
+				)
+		)
+	hal?	(
+				>=sys-apps/hal-0.5.7
+			)
+	avahi? ( >=net-dns/avahi-0.6 )
+	kerberos? ( virtual/krb5 )
+	acl? (
+		sys-apps/acl
+		sys-apps/attr
+	)"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	gnome-base/gnome-common
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
+PDEPEND="hal? ( >=gnome-base/gnome-mount-0.4 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
+
+pkg_setup() {
+	if use hal ; then
+		G2CONF="--with-hal-mount=/usr/bin/gnome-mount \
+				--with-hal-umount=/usr/bin/gnome-umount \
+				--with-hal-eject=/usr/bin/gnome-eject"
+	fi
+
+	G2CONF="${G2CONF}                 \
+		--disable-schemas-install     \
+		--disable-cdda                \
+		--disable-howl                \
+		--enable-http-neon            \
+		$(use_enable ssl openssl)     \
+		$(use_enable gnutls)          \
+		$(use_enable samba)           \
+		$(use_enable ipv6)            \
+		$(use_enable hal)             \
+		$(use_enable avahi)			  \
+		$(use_enable kerberos krb5)	  \
+		$(use_enable acl)"
+
+	# this works because of the order of conifgure parsing
+	# so should always be behind the use_enable options
+	# foser <foser@gentoo.org 19 Apr 2004
+	use gnutls && use ssl && G2CONF="${G2CONF} --disable-openssl"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# 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
+	epatch "${FILESDIR}"/${P}-automagic-deps.patch
+
+	use doc || epatch "${FILESDIR}/${PN}-2.18.1-drop-gtk-doc-check.patch"
+
+	eautoreconf
+	intltoolize --force
+}