Move to stable.

(Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

3 files changed, 7 insertions, 133 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 73b71ff7ea06..3801d8e8c8a9 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.340 2011/03/22 19:13:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.341 2011/03/27 07:33:15 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gnome-vfs-2.24.4-r1.ebuild:
+  Move to stable.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gnome-vfs-2.24.4.ebuild:
   Marking gnome-vfs-2.24.4 ppc stable for bug 353436
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
index 7ed1292c0b7e..42f54f54a8ad 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.24.4-r1.ebuild,v 1.1 2011/02/24 19:19:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r1.ebuild,v 1.2 2011/03/27 07:33:15 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="acl avahi doc fam gnutls ipv6 kerberos samba ssl"
 
 RDEPEND=">=gnome-base/gconf-2
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4.ebuild
deleted file mode 100644
index 5a59005ff7e3..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2011 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.24.4.ebuild,v 1.8 2011/03/22 19:13:05 ranger Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="acl avahi doc fam gnutls hal ipv6 kerberos samba ssl"
-
-RDEPEND=">=gnome-base/gconf-2
-	>=dev-libs/glib-2.9.3
-	>=dev-libs/libxml2-2.6
-	app-arch/bzip2
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	>=dev-libs/dbus-glib-0.71
-	acl? (
-		sys-apps/acl
-		sys-apps/attr )
-	avahi? ( >=net-dns/avahi-0.6 )
-	kerberos? ( virtual/krb5 )
-	hal? ( >=sys-apps/hal-0.5.7 )
-	fam? ( virtual/fam )
-	samba? ( >=net-fs/samba-3 )
-	ssl? (
-		gnutls?	(
-			net-libs/gnutls
-			!gnome-extra/gnome-vfs-sftp )
-		!gnutls? (
-			>=dev-libs/openssl-0.9.5
-			!gnome-extra/gnome-vfs-sftp ) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	gnome-base/gnome-common
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/gtk-doc-am-1.13
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-install
-		--disable-static
-		--disable-cdda
-		--disable-howl
-		$(use_enable acl)
-		$(use_enable avahi)
-		$(use_enable fam)
-		$(use_enable gnutls)
-		$(use_enable hal)
-		$(use_enable ipv6)
-		$(use_enable kerberos krb5)
-		$(use_enable samba)
-		$(use_enable ssl openssl)"
-		# Useless ? --enable-http-neon
-
-	# this works because of the order of configure 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_prepare() {
-	gnome2_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
-	epatch "${FILESDIR}"/${PN}-2.24.0-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 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
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-}
-
-src_test() {
-	unset DISPLAY
-	# Fix bug #285706
-	unset XAUTHORITY
-	Xemake check || die "tests failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}/usr/$(get_libdir)/gnome-vfs-2.0/modules/" -name "*.la" -delete || die
-}