disable libarchive support, fix bug #234366.

(Portage version: 2.2_rc8/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

5 files changed, 11 insertions, 66 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index fcb1f6daa031..db07d9391596 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gvfs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.23 2008/09/01 12:22:51 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.24 2008/09/07 22:46:33 eva Exp $
+
+  07 Sep 2008; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-0.2.3.ebuild,
+  gvfs-0.2.5.ebuild, gvfs-0.2.5-r1.ebuild, gvfs-0.2.5-r2.ebuild:
+  disable libarchive support, fix bug #234366.
 
   01 Sep 2008; Rémi Cardona <remi@gentoo.org> gvfs-0.2.5-r2.ebuild:
   better bash completion code (same as in the gnome overlay)
diff --git a/gnome-base/gvfs/gvfs-0.2.3.ebuild b/gnome-base/gvfs/gvfs-0.2.3.ebuild
deleted file mode 100644
index cf1f0ed053af..000000000000
--- a/gnome-base/gvfs/gvfs-0.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.3.ebuild,v 1.8 2008/07/26 22:35:03 eva Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
-
-RDEPEND=">=dev-libs/glib-2.16
-		 >=sys-apps/dbus-1.0
-		 >=net-libs/libsoup-2.4
-		 dev-libs/libxml2
-		 net-misc/openssh
-		 avahi? ( >=net-dns/avahi-0.6 )
-		 cdda?  (
-					>=sys-apps/hal-0.5.10
-					>=dev-libs/libcdio-0.78.2
-				)
-		 fuse? ( sys-fs/fuse )
-		 gnome? ( >=gnome-base/gconf-2.0 )
-		 hal? ( >=sys-apps/hal-0.5.10 )
-		 bluetooth? (
-			dev-libs/dbus-glib
-			>=net-wireless/bluez-libs-3.12
-			dev-libs/expat
-			)
-		 gphoto2? ( >=media-libs/libgphoto2-2.4 )
-		 gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 )
-		 samba? ( >=net-fs/samba-3 )"
-DEPEND="${RDEPEND}
-		>=dev-util/intltool-0.35
-		>=dev-util/pkgconfig-0.19
-		doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-			--enable-http
-			$(use_enable avahi)
-			$(use_enable bluetooth obexftp)
-			$(use_enable cdda)
-			$(use_enable fuse)
-			$(use_enable gnome gconf)
-			$(use_enable gphoto2)
-			$(use_enable hal)
-			$(use_enable gnome-keyring keyring)
-			$(use_enable samba)"
-
-	if use cdda && built_with_use dev-libs/libcdio minimal; then
-		ewarn
-		ewarn "CDDA support in gvfs requires dev-libs/libcdio to be built"
-		ewarn "without the minimal USE flag."
-		die "Please re-emerge dev-libs/libcdio without the minimal USE flag"
-	fi
-}
diff --git a/gnome-base/gvfs/gvfs-0.2.5-r1.ebuild b/gnome-base/gvfs/gvfs-0.2.5-r1.ebuild
index f4dc70b02fb7..53cbb9bc0c19 100644
--- a/gnome-base/gvfs/gvfs-0.2.5-r1.ebuild
+++ b/gnome-base/gvfs/gvfs-0.2.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5-r1.ebuild,v 1.3 2008/07/30 22:12:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5-r1.ebuild,v 1.4 2008/09/07 22:46:33 eva Exp $
 
 inherit gnome2 eutils
 
@@ -43,6 +43,7 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 pkg_setup() {
 	G2CONF="${G2CONF}
 			--enable-http
+			--disable-archive
 			$(use_enable avahi)
 			$(use_enable bluetooth obexftp)
 			$(use_enable cdda)
diff --git a/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild b/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild
index 662bdec6acbf..2afa5e8cc767 100644
--- a/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild
+++ b/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild,v 1.2 2008/09/01 12:22:51 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild,v 1.3 2008/09/07 22:46:33 eva Exp $
 
 inherit bash-completion gnome2 eutils autotools
 
@@ -44,6 +44,7 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 			--enable-http
 			--disable-bash-completion
+			--disable-archive
 			$(use_enable avahi)
 			$(use_enable bluetooth obexftp)
 			$(use_enable cdda)
diff --git a/gnome-base/gvfs/gvfs-0.2.5.ebuild b/gnome-base/gvfs/gvfs-0.2.5.ebuild
index 23f2581725b8..47be9014e306 100644
--- a/gnome-base/gvfs/gvfs-0.2.5.ebuild
+++ b/gnome-base/gvfs/gvfs-0.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5.ebuild,v 1.5 2008/08/12 13:34:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5.ebuild,v 1.6 2008/09/07 22:46:33 eva Exp $
 
 inherit gnome2 eutils
 
@@ -39,6 +39,7 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 			--enable-http
 			--disable-obexftp
+			--disable-archive
 			$(use_enable avahi)
 			$(use_enable cdda)
 			$(use_enable fuse)