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

Package-Manager: portage-2.2.0_alpha21/cvs/Linux x86_64

4 files changed, 32 insertions, 21 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/Manifest b/gnome-extra/gnome-user-share/Manifest
index 62157ee43a16..de6a0d7fe0be 100644
--- a/gnome-extra/gnome-user-share/Manifest
+++ b/gnome-extra/gnome-user-share/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
 
 DIST gnome-user-share-2.30.0.tar.bz2 944583 RMD160 183320310031bdc7c65da45a3a8882673ec2aff2 SHA1 56c7a2a77065039bd0e10f3c497b0be7deba4c6d SHA256 75f5424d7062c8ee82c2a65f6c952a04aca92070134de4a69c9e2e5ec50d4163
 DIST gnome-user-share-2.30.1.tar.bz2 959747 RMD160 f54ba99544bbf3f8a71486462837f99afb24de97 SHA1 1051de28334991f270b4abb67a2e7ddb01bc80ea SHA256 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe
-EBUILD gnome-user-share-2.30.0.ebuild 1389 RMD160 e0e220b9f9d9df152b5c804469c23a266c416d20 SHA1 dd01ab28a9172aebc7c9ad405cdf9dd1641d7b67 SHA256 20123980cf613a0d9a8f6e444475616ccf8bf511c03a7d626e593d3a2ff80ef7
-EBUILD gnome-user-share-2.30.1.ebuild 1408 RMD160 f0cf401e981cd3b2af7e4c6f0a36334fef4eab0c SHA1 d29d07d9703194929dd8a30f4f4ef5da5e5d756a SHA256 f70e6c402d7694095c7f1859a40483b2e52d7eb2d70e9faf2472a1b929cfb324
-MISC ChangeLog 2005 RMD160 55a4c7a39d44cea78550a1ff351ac75938750214 SHA1 2e1f0c65f9b852dc13b739d3d0c9e3c598d91119 SHA256 294dcd5d9ee60062acff7cdf09342e8378804cb7dde78c14b714c0f66d7afc0e
+EBUILD gnome-user-share-2.30.0.ebuild 1407 RMD160 d94f55861667dfd1689e6ea631b4e00ddf4e3868 SHA1 7c0e8464696abd40baa358b839bebade954a7692 SHA256 72a8f4b7ad53b56b7063185bd586cd32a247a0e2585822113cd6a5f43605c11f
+EBUILD gnome-user-share-2.30.1.ebuild 1537 RMD160 f29b873b920171fc067adb6019a821bf107695e8 SHA1 386e2c3fd1fdf0786b3604202d796a745a40ae83 SHA256 0896044a709941a8dcafff428bfc34b694ebb5e58fc4f0dce390928631621244
+MISC ChangeLog 2218 RMD160 66477cbb02712f61f6ef77d3b681c5ae75557732 SHA1 97aec775f1d7187a7b5582560453beeb134d9232 SHA256 9db1e774512270428eb3c94032ab751109bc504f18ef15fa18c51be16617d3b0
 MISC metadata.xml 306 RMD160 1b5f520dd385288193c3cfa5f2977f5c8cd36246 SHA1 b7b6d50b01bbe9ab5d9159239b89332186063335 SHA256 185c811ac4adbf390d2d997eaba05f7a5115bc35e1b1baa5e75165a9afe1cb18
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyiPHIACgkQ1fmVwcYIWAZYOACfQdevLcRgGPWDSJdL/5YPeSET
-9iAAoKLuqAzFEQF2r8Cm7bAmRxPKWGxh
-=PP5s
+iEYEARECAAYFAk1RxqkACgkQ1fmVwcYIWAZTgACgz/5lGa6fjKV4lZ5K2szLdezq
+C1sAoLzyMw+Po+wNRyexEdBmYK8nU2oC
+=poQP
 -----END PGP SIGNATURE-----
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
+}