Add missing nautilus dependency, drop unneeded la files. Pin gtk+ dependency to slot 2.

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

3 files changed, 25 insertions, 14 deletions

diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog
index 0b4a5b1e03d1..bb9005b79ce4 100644
--- a/gnome-extra/gnome-user-share/ChangeLog
+++ b/gnome-extra/gnome-user-share/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gnome-user-share
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.10 2010/09/28 19:05:16 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.11 2011/02/08 22:41:35 eva Exp $
+
+  08 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-user-share-2.30.0.ebuild, gnome-user-share-2.30.1.ebuild:
+  Add missing nautilus dependency, drop unneeded la files. Pin gtk+ dependency
+  to slot 2.
 
 *gnome-user-share-2.30.1 (28 Sep 2010)
 
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild
index 6065684938d8..ab7283371b3c 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild,v 1.3 2010/08/01 12:04:48 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.0.ebuild,v 1.4 2011/02/08 22:41:35 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Personal file sharing for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -20,11 +20,12 @@ IUSE=""
 # FIXME: gnome-bluetooth is a hard-dep
 # bluetooth is pure runtime dep (dbus)
 RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.14
+	>=x11-libs/gtk+-2.14:2
 	>=app-mobilephone/obex-data-server-0.4
 	>=dev-libs/dbus-glib-0.70
 	dev-libs/libunique
 	>=gnome-base/gconf-2.10
+	>=gnome-base/nautilus-2
 	media-libs/libcanberra[gtk]
 	>=net-wireless/gnome-bluetooth-2.27.7.2:2
 	>=net-wireless/bluez-4.18
@@ -39,9 +40,8 @@ DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	app-text/docbook-xml-dtd:4.1.2"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		--with-httpd=apache2
 		--with-modules-path=/usr/lib/apache2/modules/"
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
index 0da37cf91376..5ffed83911cf 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild,v 1.1 2010/09/28 19:05:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild,v 1.2 2011/02/08 22:41:35 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2 multilib
+inherit gnome2 multilib
 
 DESCRIPTION="Personal file sharing for the GNOME desktop"
 HOMEPAGE="http://www.gnome.org/"
@@ -20,11 +20,12 @@ IUSE=""
 # FIXME: gnome-bluetooth is a hard-dep
 # bluetooth is pure runtime dep (dbus)
 RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.14
+	>=x11-libs/gtk+-2.14:2
 	>=app-mobilephone/obex-data-server-0.4
 	>=dev-libs/dbus-glib-0.70
 	dev-libs/libunique
 	>=gnome-base/gconf-2.10
+	>=gnome-base/nautilus-2
 	media-libs/libcanberra[gtk]
 	>=net-wireless/gnome-bluetooth-2.27.7.2:2
 	>=net-wireless/bluez-4.18
@@ -39,10 +40,15 @@ DEPEND="${RDEPEND}
 	app-text/gnome-doc-utils
 	app-text/docbook-xml-dtd:4.1.2"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		--with-httpd=apache2
 		--with-modules-path=/usr/$(get_libdir)/apache2/modules/"
 }
+
+src_install() {
+	gnome2_src_install
+	# nautilus does not need la files
+	find "${ED}" -name "*.la" -delete
+}