From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 50EFE59CAA for ; Wed, 30 Mar 2016 20:09:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72207E0852; Wed, 30 Mar 2016 20:08:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BAEC0E0850 for ; Wed, 30 Mar 2016 20:08:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6728A340A60 for ; Wed, 30 Mar 2016 20:08:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2732D86C for ; Wed, 30 Mar 2016 20:08:53 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1459363309.dfce7d26ecedd20a90a29080a041ea2eb24b71eb.tranquility@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.20.0.ebuild gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild X-VCS-Directories: gnome-extra/gnome-system-monitor/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: dfce7d26ecedd20a90a29080a041ea2eb24b71eb X-VCS-Branch: master Date: Wed, 30 Mar 2016 20:08:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b9aa57c1-367e-4736-a34f-e148536854ad X-Archives-Hash: 97c7be8a82ddce87c30f6b51a9390ae5 commit: dfce7d26ecedd20a90a29080a041ea2eb24b71eb Author: Ole Reifschneider gentoo org> AuthorDate: Wed Mar 30 18:41:49 2016 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Wed Mar 30 18:41:49 2016 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=dfce7d26 gnome-extra/gnome-system-monitor: Bump version to 3.20.0 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE9E568677E8B4D42 ...9.ebuild => gnome-system-monitor-3.20.0.ebuild} | 30 +++++----------------- .../gnome-system-monitor-9999.ebuild | 8 +++--- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.0.ebuild similarity index 57% copy from gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild copy to gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.0.ebuild index 2c82ba0..29da6de 100644 --- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild +++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,21 +6,14 @@ 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/" LICENSE="GPL-2" SLOT="0" -IUSE="systemd +X" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -fi +IUSE="systemd X" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" RDEPEND=" >=dev-libs/glib-2.37.3:2 @@ -30,28 +23,19 @@ RDEPEND=" >=dev-cpp/glibmm-2.34:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 - - systemd? ( >=sys-apps/systemd-38:0= ) + systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 ) " +# eautoreconf requires gnome-base/gnome-common DEPEND="${RDEPEND} >=app-text/gnome-doc-utils-0.20 >=dev-util/intltool-0.41.0 + dev-util/itstool virtual/pkgconfig - - 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} + $(use_enable X wnck) } 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 2c82ba0..d75cf12 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-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -30,16 +30,14 @@ RDEPEND=" >=dev-cpp/glibmm-2.34:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 - - systemd? ( >=sys-apps/systemd-38:0= ) + systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 ) " +# eautoreconf requires gnome-base/gnome-common DEPEND="${RDEPEND} >=app-text/gnome-doc-utils-0.20 >=dev-util/intltool-0.41.0 virtual/pkgconfig - - systemd? ( !=sys-apps/systemd-43* ) " if [[ ${PV} = 9999 ]]; then