Pull in gnome-user-share on arches that have it keyworded (#50617). Drop old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 20 insertions, 10 deletions

diff --git a/gnome-base/gnome-extra-apps/ChangeLog b/gnome-base/gnome-extra-apps/ChangeLog
index f3031c404aeb..0e3838810e6e 100644
--- a/gnome-base/gnome-extra-apps/ChangeLog
+++ b/gnome-base/gnome-extra-apps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-extra-apps
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/ChangeLog,v 1.26 2014/03/09 11:58:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/ChangeLog,v 1.27 2014/04/20 15:05:46 pacho Exp $
+
+*gnome-extra-apps-3.10.0-r1 (20 Apr 2014)
+
+  20 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  +gnome-extra-apps-3.10.0-r1.ebuild, -gnome-extra-apps-3.8.0-r1.ebuild:
+  Pull in gnome-user-share on arches that have it keyworded (#50617). Drop old.
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> gnome-extra-apps-3.10.0.ebuild:
   x86 stable, bug 499954
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.8.0-r1.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild
index c9c46584e0df..287ad6608240 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.8.0-r1.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.8.0-r1.ebuild,v 1.6 2013/12/08 18:29:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild,v 1.1 2014/04/20 15:05:46 pacho Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ IUSE="+games +shotwell +tracker"
 
 # when unmasking for an arch
 # double check none of the deps are still masked !
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3
@@ -20,24 +20,24 @@ KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 RDEPEND="
 	>=gnome-base/gnome-core-libs-${PV}
 
-	>=app-admin/gnome-system-log-${PV}
+	>=app-admin/gnome-system-log-3.9.90
 	>=app-arch/file-roller-${PV}
-	>=app-dicts/gnome-dictionary-3.6.0
+	>=app-dicts/gnome-dictionary-${PV}
 	>=gnome-extra/gconf-editor-3
 	>=gnome-extra/gnome-calculator-${PV}
 	>=gnome-extra/gnome-power-manager-${PV}
 	>=gnome-extra/gnome-search-tool-3.6
 	>=gnome-extra/gnome-system-monitor-${PV}
-	>=gnome-extra/gnome-tweak-tool-3.7.4
+	>=gnome-extra/gnome-tweak-tool-${PV}
 	>=gnome-extra/gucharmap-${PV}:2.90
-	>=gnome-extra/nautilus-sendto-${PV}
+	>=gnome-extra/nautilus-sendto-3.8
 	>=gnome-extra/sushi-${PV}
 	>=mail-client/evolution-${PV}
 	>=media-gfx/gnome-font-viewer-${PV}
 	>=media-gfx/gnome-screenshot-${PV}
 	>=media-sound/sound-juicer-3.5.0
 	>=media-video/cheese-${PV}
-	>=net-analyzer/gnome-nettool-3.2
+	>=net-analyzer/gnome-nettool-3.8
 	>=net-misc/vinagre-${PV}
 	>=net-misc/vino-${PV}
 	>=sys-apps/baobab-${PV}
@@ -60,12 +60,16 @@ RDEPEND="
 		>=games-puzzle/lightsoff-${PV}
 		>=games-puzzle/quadrapassel-${PV}
 		>=games-puzzle/swell-foop-${PV} )
-	shotwell? ( >=media-gfx/shotwell-0.14 )
+	shotwell? ( >=media-gfx/shotwell-0.15 )
 	tracker? (
 		>=app-misc/tracker-0.16
 		>=gnome-extra/gnome-documents-${PV} )
+
+	amd64? ( >=gnome-extra/gnome-user-share-${PV} )
+	x86? ( >=gnome-extra/gnome-user-share-${PV} )
 "
 # Note: bug-buddy is broken with GNOME 3
 # Note: aisleriot-3.4 is masked for guile-2
+# Note: we want to pull in gnome-user-share, but it's only available for amd64/x86, bug #506176
 DEPEND=""
 S=${WORKDIR}