commit: 4cb97c422a7c5b43f901f5cb9f5beaab2728858b Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Sat Aug 12 21:59:25 2017 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Sat Aug 12 21:59:25 2017 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4cb97c42
gnome-extra/gnome-system-monitor: sync with gentoo repository Package-Manager: Portage-2.3.6, Repoman-2.3.3 Manifest-Sign-Key: 0x5A56C8CD0C13248A .../gnome-system-monitor-3.20.0.ebuild | 41 ---------------------- .../gnome-system-monitor-9999.ebuild | 27 +++++--------- 2 files changed, 9 insertions(+), 59 deletions(-) diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.0.ebuild deleted file mode 100644 index 29da6de4..00000000 --- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="The Gnome System Monitor" -HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"; - -LICENSE="GPL-2" -SLOT="0" -IUSE="systemd X" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -RDEPEND=" - >=dev-libs/glib-2.37.3:2 - >=gnome-base/libgtop-2.28.2:2= - >=x11-libs/gtk+-3.12:3[X(+)] - >=dev-cpp/gtkmm-3.3.18:3.0 - >=dev-cpp/glibmm-2.34:2 - >=dev-libs/libxml2-2.0:2 - >=gnome-base/librsvg-2.35:2 - 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 -" - -src_configure() { - gnome2_src_configure \ - $(use_enable systemd) \ - $(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 d75cf12b..cd34242f 100644 --- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild +++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-9999.ebuild @@ -1,10 +1,7 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" +EAPI=6 inherit gnome2 if [[ ${PV} = 9999 ]]; then inherit gnome2-live @@ -15,7 +12,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"; LICENSE="GPL-2" SLOT="0" -IUSE="systemd +X" +IUSE="systemd X" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else @@ -25,9 +22,9 @@ fi RDEPEND=" >=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= - >=x11-libs/gtk+-3.12:3[X(+)] + >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 - >=dev-cpp/glibmm-2.34:2 + >=dev-cpp/glibmm-2.46:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) @@ -35,21 +32,15 @@ RDEPEND=" " # eautoreconf requires gnome-base/gnome-common DEPEND="${RDEPEND} - >=app-text/gnome-doc-utils-0.20 + app-text/yelp-tools >=dev-util/intltool-0.41.0 virtual/pkgconfig " -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools" -fi - src_configure() { - local myconf="" - [[ ${PV} != 9999 ]] && myconf="ITSTOOL=$(type -P true)" + # XXX: appdata is deprecated by appstream-glib, upstream must upgrade gnome2_src_configure \ $(use_enable systemd) \ - $(use_enable X wnck) \ - ${myconf} + $(use_enable X broken-wnck) \ + APPDATA_VALIDATE="$(type -P true)" }
