[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-system-monitor/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     b5583f6d698a654538938e7ccd6e70d671872c31
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 18:03:41 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 18:03:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b5583f6d

gnome-extra/gnome-system-monitor: moved to gx86

    * Sync live ebuild with gx86 changes.
    * Add metadata.xml.

---
 .../gnome-system-monitor-3.6.1.ebuild              |   56 --------------------
 .../gnome-system-monitor-9999.ebuild               |   12 ++--
 gnome-extra/gnome-system-monitor/metadata.xml      |    9 +++
 3 files changed, 15 insertions(+), 62 deletions(-)

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 b14b9dc..0000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.6.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="systemd"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
-
-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.0:3[X(+)]
-	>=x11-themes/gnome-icon-theme-2.31
-	>=dev-cpp/gtkmm-2.99:3.0
-	>=dev-cpp/glibmm-2.27:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.35:2
-
-	systemd? ( >=sys-apps/systemd-38 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.41.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.20
-
-	systemd? ( !=sys-apps/systemd-43* )"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools"
-fi
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		$(use_enable systemd)"
-	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-	gnome2_src_configure
-}

diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
index b14b9dc..b30ac5b 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -32,14 +32,16 @@ RDEPEND=">=dev-libs/glib-2.28:2
 	>=dev-libs/libxml2-2.0:2
 	>=gnome-base/librsvg-2.35:2
 
-	systemd? ( >=sys-apps/systemd-38 )"
+	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
-	>=app-text/gnome-doc-utils-0.20
 
-	systemd? ( !=sys-apps/systemd-43* )"
+	systemd? ( !=sys-apps/systemd-43* )
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
@@ -47,9 +49,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
-		--disable-schemas-compile
 		$(use_enable systemd)"
 	[[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
 	gnome2_src_configure

diff --git a/gnome-extra/gnome-system-monitor/metadata.xml b/gnome-extra/gnome-system-monitor/metadata.xml
new file mode 100644
index 0000000..845f00d
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <use>
+    <flag name="systemd">Display <pkg>sys-apps/systemd</pkg> metadata, e.g.
+		unit names, for running processes</flag>
+  </use>
+</pkgmetadata>