remove old revisions, drop bluetooth use flag on version to stabilize but keep the feature in r1.

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

6 files changed, 14 insertions, 123 deletions

diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog
index 7e4759adc7c7..f26617a40883 100644
--- a/gnome-base/gvfs/ChangeLog
+++ b/gnome-base/gvfs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2008/06/30 22:07:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.14 2008/07/26 22:35:03 eva Exp $
+
+  26 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> -gvfs-0.2.1.ebuild,
+  -gvfs-0.2.2.ebuild, gvfs-0.2.3.ebuild, -gvfs-0.2.4.ebuild,
+  gvfs-0.2.5.ebuild, +gvfs-0.2.5.ebuild:
+  remove old revisions, drop bluetooth use flag on version to stabilize but
+  keep the feature in r1.
 
 *gvfs-0.2.5 (30 Jun 2008)
 
diff --git a/gnome-base/gvfs/gvfs-0.2.1.ebuild b/gnome-base/gvfs/gvfs-0.2.1.ebuild
deleted file mode 100644
index 28b00a7f3574..000000000000
--- a/gnome-base/gvfs/gvfs-0.2.1.ebuild
+++ /dev/null
@@ -1,55 +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.1.ebuild,v 1.5 2008/04/21 17:08:49 welp Exp $
-
-inherit autotools gnome2
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~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="--enable-http
-			$(use_enable avahi)
-			$(use_enable bluetooth obexftp)
-			$(use_enable doc gtk-doc)
-			$(use_enable cdda)
-			$(use_enable fuse)
-			$(use_enable gnome gconf)
-			$(use_enable gphoto2)
-			$(use_enable hal)
-			$(use_enable gnome-keyring keyring)
-			$(use_enable samba)"
-}
diff --git a/gnome-base/gvfs/gvfs-0.2.2.ebuild b/gnome-base/gvfs/gvfs-0.2.2.ebuild
deleted file mode 100644
index a980af42f746..000000000000
--- a/gnome-base/gvfs/gvfs-0.2.2.ebuild
+++ /dev/null
@@ -1,55 +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.2.ebuild,v 1.4 2008/04/21 17:08:49 welp Exp $
-
-inherit autotools gnome2
-
-DESCRIPTION="GNOME Virtual Filesystem Layer"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~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)"
-}
diff --git a/gnome-base/gvfs/gvfs-0.2.3.ebuild b/gnome-base/gvfs/gvfs-0.2.3.ebuild
index 07290d0e2c54..cf1f0ed053af 100644
--- a/gnome-base/gvfs/gvfs-0.2.3.ebuild
+++ b/gnome-base/gvfs/gvfs-0.2.3.ebuild
@@ -1,8 +1,8 @@
 # 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.7 2008/06/01 10:59:14 nixnut Exp $
+# $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 autotools gnome2 eutils
+inherit gnome2 eutils
 
 DESCRIPTION="GNOME Virtual Filesystem Layer"
 HOMEPAGE="http://www.gnome.org"
diff --git a/gnome-base/gvfs/gvfs-0.2.4.ebuild b/gnome-base/gvfs/gvfs-0.2.5-r1.ebuild
index ef6295fc042f..356b44454443 100644
--- a/gnome-base/gvfs/gvfs-0.2.4.ebuild
+++ b/gnome-base/gvfs/gvfs-0.2.5-r1.ebuild
@@ -1,8 +1,8 @@
 # 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.4.ebuild,v 1.1 2008/05/27 22:54:52 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5-r1.ebuild,v 1.1 2008/07/26 22:35:03 eva Exp $
 
-inherit autotools gnome2 eutils
+inherit gnome2 eutils
 
 DESCRIPTION="GNOME Virtual Filesystem Layer"
 HOMEPAGE="http://www.gnome.org"
diff --git a/gnome-base/gvfs/gvfs-0.2.5.ebuild b/gnome-base/gvfs/gvfs-0.2.5.ebuild
index f2dbfccb3ee7..4a6d674d2d78 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.1 2008/06/30 22:07:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5.ebuild,v 1.2 2008/07/26 22:35:03 eva Exp $
 
 inherit gnome2 eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-IUSE="avahi bluetooth cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
+IUSE="avahi cdda doc fuse gnome gphoto2 hal gnome-keyring samba"
 
 RDEPEND=">=dev-libs/glib-2.16
 		 >=sys-apps/dbus-1.0
@@ -25,11 +25,6 @@ RDEPEND=">=dev-libs/glib-2.16
 		 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 )"
@@ -43,8 +38,8 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 pkg_setup() {
 	G2CONF="${G2CONF}
 			--enable-http
+			--disable-obexftp
 			$(use_enable avahi)
-			$(use_enable bluetooth obexftp)
 			$(use_enable cdda)
 			$(use_enable fuse)
 			$(use_enable gnome gconf)