From 9dbc8b40f780f8c571f5b97405f1d0f68082a759 Mon Sep 17 00:00:00 2001 From: Rémi Cardona Date: Tue, 14 Oct 2008 08:59:42 +0000 Subject: gnome-base/gvfs: remove bluetooth for stabilization purposes (see bug #241340) and remove cruft (Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r2 x86_64, RepoMan options: --force) --- gnome-base/gvfs/ChangeLog | 7 ++- gnome-base/gvfs/gvfs-0.2.5-r2.ebuild | 82 ------------------------------------ gnome-base/gvfs/gvfs-0.2.5-r3.ebuild | 11 ++--- 3 files changed, 9 insertions(+), 91 deletions(-) delete mode 100644 gnome-base/gvfs/gvfs-0.2.5-r2.ebuild (limited to 'gnome-base') diff --git a/gnome-base/gvfs/ChangeLog b/gnome-base/gvfs/ChangeLog index d3e9668df235..fdbb744c11bb 100644 --- a/gnome-base/gvfs/ChangeLog +++ b/gnome-base/gvfs/ChangeLog @@ -1,6 +1,11 @@ # 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.28 2008/10/12 21:55:50 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/ChangeLog,v 1.29 2008/10/14 08:59:42 remi Exp $ + + 14 Oct 2008; Rémi Cardona -gvfs-0.2.5-r2.ebuild, + gvfs-0.2.5-r3.ebuild: + remove bluetooth for stabilization purposes (see bug #241340) and remove + cruft *gvfs-1.0.1 (12 Oct 2008) diff --git a/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild b/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild deleted file mode 100644 index 2afa5e8cc767..000000000000 --- a/gnome-base/gvfs/gvfs-0.2.5-r2.ebuild +++ /dev/null @@ -1,82 +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.5-r2.ebuild,v 1.3 2008/09/07 22:46:33 eva Exp $ - -inherit bash-completion gnome2 eutils autotools - -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 - --disable-bash-completion - --disable-archive - $(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 -} - -src_unpack() { - gnome2_src_unpack - - epatch "${FILESDIR}/${PN}-0.2.5-bash-completion.patch" - eautoreconf -} - -src_install() { - gnome2_src_install - use bash-completion && \ - dobashcompletion programs/gvfs-bash-completion.sh ${PN} -} - -pkg_postinst() { - gnome2_pkg_postinst - use bash-completion && bash-completion_pkg_postinst -} diff --git a/gnome-base/gvfs/gvfs-0.2.5-r3.ebuild b/gnome-base/gvfs/gvfs-0.2.5-r3.ebuild index 830e0964003c..5f637d54c1b3 100644 --- a/gnome-base/gvfs/gvfs-0.2.5-r3.ebuild +++ b/gnome-base/gvfs/gvfs-0.2.5-r3.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-r3.ebuild,v 1.2 2008/09/13 14:29:29 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gvfs/gvfs-0.2.5-r3.ebuild,v 1.3 2008/10/14 08:59:42 remi Exp $ inherit bash-completion gnome2 eutils autotools @@ -10,7 +10,7 @@ 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" +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 )" @@ -46,7 +41,7 @@ pkg_setup() { --disable-bash-completion --disable-archive $(use_enable avahi) - $(use_enable bluetooth obexftp) + --disable-obexftp $(use_enable cdda) $(use_enable fuse) $(use_enable gnome gconf) -- cgit v1.2.3-65-gdbad