Version bump for Gnome 3.10

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

3 files changed, 14 insertions, 51 deletions

diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog
index 90ee46863f5b..b9927e4bbf85 100644
--- a/gnome-extra/gnome-system-monitor/ChangeLog
+++ b/gnome-extra/gnome-system-monitor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-system-monitor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.238 2013/12/08 18:51:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.239 2013/12/24 16:59:11 pacho Exp $
+
+*gnome-system-monitor-3.10.2 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +gnome-system-monitor-3.10.2.ebuild, -gnome-system-monitor-3.6.1.ebuild,
+  -gnome-system-monitor-3.8.2.1.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org>
   gnome-system-monitor-3.8.2.1-r1.ebuild:
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.8.2.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.2.ebuild
index 90c841223b1a..8a5b588be107 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.8.2.1.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.8.2.1.ebuild,v 1.2 2013/09/13 22:59:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.2.ebuild,v 1.1 2013/12/24 16:59:11 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -12,14 +12,13 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="systemd"
+IUSE="systemd +X"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/libwnck-2.91.0:3
+	>=dev-libs/glib-2.37.3:2
 	>=gnome-base/libgtop-2.28.2:2
-	>=x11-libs/gtk+-3.5.12:3[X(+)]
+	>=x11-libs/gtk+-3.9.5:3[X(+)]
 	>=x11-themes/gnome-icon-theme-2.31
 	>=dev-cpp/gtkmm-3.3.18:3.0
 	>=dev-cpp/glibmm-2.34:2
@@ -27,11 +26,11 @@ RDEPEND="
 	>=gnome-base/librsvg-2.35:2
 
 	systemd? ( >=sys-apps/systemd-38 )
+	X? ( >=x11-libs/libwnck-2.91.0:3 )
 "
 DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.20
 	>=dev-util/intltool-0.41.0
-	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 
 	systemd? ( !=sys-apps/systemd-43* )
@@ -40,5 +39,6 @@ DEPEND="${RDEPEND}
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable systemd) \
+		$(use_enable X wnck) \
 		ITSTOOL=$(type -P true)
 }
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.6.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.6.1.ebuild
deleted file mode 100644
index ed8155daed7a..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.6.1.ebuild,v 1.3 2013/09/13 22:59:16 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="systemd"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND=">=dev-libs/glib-2.28:2
-	>=x11-libs/libwnck-2.91.0:3
-	>=gnome-base/libgtop-2.28.2:2
-	>=x11-libs/gtk+-3:3[X(+)]
-	>=x11-themes/gnome-icon-theme-2.31
-	>=dev-cpp/gtkmm-3:3.0
-	>=dev-cpp/glibmm-2.34:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.35:2
-
-	systemd? ( >=sys-apps/systemd-38 )
-"
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.20
-	>=dev-util/intltool-0.41.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	systemd? ( !=sys-apps/systemd-43* )
-"
-
-src_configure() {
-	G2CONF="${G2CONF}
-		$(use_enable systemd)
-		ITSTOOL=$(type -P true)"
-	gnome2_src_configure
-}