From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-684324-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id C80341387FD
for <garchives@archives.gentoo.org>; Sun, 6 Apr 2014 18:22:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E0078E0AE1;
Sun, 6 Apr 2014 18:22:55 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 3A03FE0AE1
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Apr 2014 18:22:55 +0000 (UTC)
Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 40DD633FECA
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Apr 2014 18:22:54 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by spoonbill.gentoo.org (Postfix) with ESMTP id 079FE188F5
for <gentoo-commits@lists.gentoo.org>; Sun, 6 Apr 2014 18:22:53 +0000 (UTC)
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" <eva@gentoo.org>
Message-ID: <1396808291.c8f11f4bc2178188bdda14c7723dee09a0882d8a.eva@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-system-monitor/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.0.ebuild gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
X-VCS-Directories: gnome-extra/gnome-system-monitor/
X-VCS-Committer: eva
X-VCS-Committer-Name: Gilles Dartiguelongue
X-VCS-Revision: c8f11f4bc2178188bdda14c7723dee09a0882d8a
X-VCS-Branch: master
Date: Sun, 6 Apr 2014 18:22:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 03b949cf-d807-48ce-be5f-61257c8fdc3e
X-Archives-Hash: 3b00457889e132033ff6dfb8624c3c76
commit: c8f11f4bc2178188bdda14c7723dee09a0882d8a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 6 18:09:20 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 6 18:18:11 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=c8f11f4b
gnome-extra/gnome-system-monitor: 3.10.2 → 3.12.0
---
...9.ebuild => gnome-system-monitor-3.12.0.ebuild} | 22 ++++------------------
.../gnome-system-monitor-9999.ebuild | 4 ++--
2 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.0.ebuild
similarity index 66%
copy from gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
copy to gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.0.ebuild
index 6787a58..abd3e2d 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -6,9 +6,6 @@ EAPI="5"
GCONF_DEBUG="no"
inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="The Gnome System Monitor"
HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
@@ -16,11 +13,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
LICENSE="GPL-2"
SLOT="0"
IUSE="systemd +X"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
RDEPEND="
>=dev-libs/glib-2.37.3:2
@@ -32,7 +25,7 @@ RDEPEND="
>=dev-libs/libxml2-2.0:2
>=gnome-base/librsvg-2.35:2
- systemd? ( >=sys-apps/systemd-38 )
+ systemd? ( >=sys-apps/systemd-38:0= )
X? ( >=x11-libs/libwnck-2.91.0:3 )
"
DEPEND="${RDEPEND}
@@ -43,16 +36,9 @@ DEPEND="${RDEPEND}
systemd? ( !=sys-apps/systemd-43* )
"
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- app-text/yelp-tools"
-fi
-
src_configure() {
- local myconf=""
- [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)"
gnome2_src_configure \
$(use_enable systemd) \
$(use_enable X wnck) \
- ${myconf}
+ ITSTOOL=$(type -P true)
}
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 6787a58..9514133 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -32,7 +32,7 @@ RDEPEND="
>=dev-libs/libxml2-2.0:2
>=gnome-base/librsvg-2.35:2
- systemd? ( >=sys-apps/systemd-38 )
+ systemd? ( >=sys-apps/systemd-38:0= )
X? ( >=x11-libs/libwnck-2.91.0:3 )
"
DEPEND="${RDEPEND}