Also pull sys-apps/gnome-disk-utility. Drop old.

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

3 files changed, 16 insertions, 79 deletions

diff --git a/gnome-base/gnome-extra-apps/ChangeLog b/gnome-base/gnome-extra-apps/ChangeLog
index 1d6025ee0a70..ad6eec5e9671 100644
--- a/gnome-base/gnome-extra-apps/ChangeLog
+++ b/gnome-base/gnome-extra-apps/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2014/07/23 15:16:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/ChangeLog,v 1.34 2014/08/31 14:09:01 pacho Exp $
+
+*gnome-extra-apps-3.12.0-r1 (31 Aug 2014)
+
+  31 Aug 2014; Pacho Ramos <pacho@gentoo.org>
+  +gnome-extra-apps-3.12.0-r1.ebuild, -gnome-extra-apps-3.10.0-r1.ebuild,
+  -gnome-extra-apps-3.10.0.ebuild:
+  Also pull sys-apps/gnome-disk-utility. Drop old.
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gnome-extra-apps-3.12.0.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0.ebuild
deleted file mode 100644
index 5d78b2392108..000000000000
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.10.0.ebuild,v 1.8 2014/07/04 13:09:51 klausman Exp $
-
-EAPI="5"
-
-DESCRIPTION="Sub-meta package for the applications of GNOME 3"
-HOMEPAGE="http://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+games +shotwell +tracker"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Note to developers:
-# This is a wrapper for the extra apps integrated with GNOME 3
-# New package
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}
-
-	>=app-admin/gnome-system-log-3.9.90
-	>=app-arch/file-roller-${PV}
-	>=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-${PV}
-	>=gnome-extra/gucharmap-${PV}:2.90
-	>=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.8
-	>=net-misc/vinagre-${PV}
-	>=net-misc/vino-${PV}
-	>=sys-apps/baobab-${PV}
-	>=www-client/epiphany-${PV}
-
-	games? (
-		>=games-arcade/gnome-nibbles-${PV}
-		>=games-arcade/gnome-robots-${PV}
-		>=games-board/aisleriot-3.2.3.2
-		>=games-board/four-in-a-row-${PV}
-		>=games-board/gnome-chess-${PV}
-		>=games-board/gnome-mahjongg-${PV}
-		>=games-board/gnome-mines-${PV}
-		>=games-board/iagno-${PV}
-		>=games-board/tali-${PV}
-		>=games-puzzle/five-or-more-${PV}
-		>=games-puzzle/gnome-klotski-${PV}
-		>=games-puzzle/gnome-sudoku-${PV}
-		>=games-puzzle/gnome-tetravex-${PV}
-		>=games-puzzle/lightsoff-${PV}
-		>=games-puzzle/quadrapassel-${PV}
-		>=games-puzzle/swell-foop-${PV} )
-	shotwell? ( >=media-gfx/shotwell-0.15 )
-	tracker? (
-		>=app-misc/tracker-0.16
-		>=gnome-extra/gnome-documents-${PV} )
-"
-# Note: bug-buddy is broken with GNOME 3
-# Note: aisleriot-3.4 is masked for guile-2
-DEPEND=""
-S=${WORKDIR}
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.12.0-r1.ebuild
index 6e84773955c1..94a1ccce95df 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.10.0-r1.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.12.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.10.0-r1.ebuild,v 1.4 2014/07/04 13:09:51 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-extra-apps/gnome-extra-apps-3.12.0-r1.ebuild,v 1.1 2014/08/31 14:09:01 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="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # Note to developers:
 # This is a wrapper for the extra apps integrated with GNOME 3
@@ -22,7 +22,7 @@ RDEPEND="
 
 	>=app-admin/gnome-system-log-3.9.90
 	>=app-arch/file-roller-${PV}
-	>=app-dicts/gnome-dictionary-${PV}
+	>=app-dicts/gnome-dictionary-3.10
 	>=gnome-extra/gconf-editor-3
 	>=gnome-extra/gnome-calculator-${PV}
 	>=gnome-extra/gnome-power-manager-${PV}
@@ -35,12 +35,13 @@ RDEPEND="
 	>=mail-client/evolution-${PV}
 	>=media-gfx/gnome-font-viewer-${PV}
 	>=media-gfx/gnome-screenshot-${PV}
-	>=media-sound/sound-juicer-3.5.0
+	>=media-sound/sound-juicer-3.11.90
 	>=media-video/cheese-${PV}
 	>=net-analyzer/gnome-nettool-3.8
 	>=net-misc/vinagre-${PV}
 	>=net-misc/vino-${PV}
 	>=sys-apps/baobab-${PV}
+	>=sys-apps/gnome-disk-utility-${PV}
 	>=www-client/epiphany-${PV}
 
 	games? (
@@ -62,11 +63,11 @@ RDEPEND="
 		>=games-puzzle/swell-foop-${PV} )
 	shotwell? ( >=media-gfx/shotwell-0.15 )
 	tracker? (
-		>=app-misc/tracker-0.16
+		>=app-misc/tracker-1
 		>=gnome-extra/gnome-documents-${PV} )
 
-	amd64? ( >=gnome-extra/gnome-user-share-${PV} )
-	x86? ( >=gnome-extra/gnome-user-share-${PV} )
+	amd64? ( >=gnome-extra/gnome-user-share-3.10.2 )
+	x86? ( >=gnome-extra/gnome-user-share-3.10.2 )
 "
 # Note: bug-buddy is broken with GNOME 3
 # Note: aisleriot-3.4 is masked for guile-2