commit: dfce7d26ecedd20a90a29080a041ea2eb24b71eb
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 18:41:49 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> 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
