commit:     9c2b67ce6a0213ca15ed79de502a87c6d2b28a28
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 01:42:13 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 22:49:22 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=9c2b67ce

mate-extra/mate-system-monitor: Drop old, sync with Gentoo

Package-Manager: Portage-2.3.82, Repoman-2.3.18
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 mate-extra/mate-system-monitor/Manifest            |  8 +--
 .../mate-system-monitor-1.12.2.ebuild              | 53 ------------------
 .../mate-system-monitor-1.14.0.ebuild              | 52 ------------------
 .../mate-system-monitor-1.16.0.ebuild              | 52 ------------------
 .../mate-system-monitor-1.22.0.ebuild              | 62 +++++++++++++++++++++
 ....1.ebuild => mate-system-monitor-1.22.1.ebuild} | 43 +++++++++------
 ....1.ebuild => mate-system-monitor-1.22.2.ebuild} | 43 +++++++++------
 .../mate-system-monitor-1.24.0.ebuild              | 64 ++++++++++++++++++++++
 .../mate-system-monitor-9999.ebuild                | 55 +++++++++++--------
 mate-extra/mate-system-monitor/metadata.xml        |  3 -
 10 files changed, 215 insertions(+), 220 deletions(-)

diff --git a/mate-extra/mate-system-monitor/Manifest 
b/mate-extra/mate-system-monitor/Manifest
index 608ed23..4124e20 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,4 +1,4 @@
-DIST mate-system-monitor-1.12.2.tar.xz 2114504 BLAKE2B 
ceec8177fa020cf739f132d9970a2f56029d12eb767853b3dce671d483fa661ade6d2190e68fdfc7250fd1cbf03ac5b9845a5337a27a75027ebe664ef756038b
 SHA512 
f001d36b7a343cba68bf76094abad4e07cc89537c71dba873bb5ffc61045f440a319e3db8d5ee55ff301f52dbdad8b275ca71a4ab6c5fbe34d75c2e65edd7c23
-DIST mate-system-monitor-1.14.0.tar.xz 2135464 BLAKE2B 
e390fcfa7d41aaf2b407f0a4e22acf1c9f3eaccfb1a13d8137cc56964751126c94569cf16427409118f86a8125147f27e59a8db05b20349c7ab18065451fa31d
 SHA512 
f19fa0241228be8ec8600db43e71495750039288292ba5714489a84acb3e5cc9f4c87d39a63d29a0fc6f907af6ecc319382cd4276ae2de1125bba059d5b24be5
-DIST mate-system-monitor-1.16.0.tar.xz 2120984 BLAKE2B 
560a811774ffe8ee46876fb7618ff373dc810f0e6e068fef1265dba72c71b4ff808228be5b25c8f22d278e46be074b0a176d6722a3ce0dc3886311b35ed4ef11
 SHA512 
6ee8e1d1a3af5e3b295c2cca74b3e6bdf8a09eb6aa7d63f13db006829c2df25b580b72cc8d6e34e2844b243999cd4f059a42aa67a88c60825defdb7880150796
-DIST mate-system-monitor-1.18.1.tar.xz 2159100 BLAKE2B 
babac7ad0dc3a3bccf5c6d4567bee0c95aad1f5fffdb1d6d566316f4712a345e7083c8032c19b6615a9f9d06fbbe8b89357407b897206f3131294b7d2305b45d
 SHA512 
47dd2ba46cd6fbd1beef2e6f0a93332c7142f701d18f6894b4986134c557f63f3e2bed382af17cc5bf45693b556a91ccab36fde940126fdceb5834d4cea08356
+DIST mate-system-monitor-1.22.0.tar.xz 2190688 BLAKE2B 
83ab7dfbc0033f094896c663790c1200e71a498d3a813a82c94593e6c6434942b2afd0fa1c3067452a46e0e1829a9239f1c145a315b9de2c2853c9f4f50618ef
 SHA512 
6f97f934626b49320ea0dbb4e14743c4f33b12a85671b69465f689765f3003f00e51685b616e34a482c3ec0ca09ca4e13cbdb2e3eb4719c0d1fc7b25b24436a7
+DIST mate-system-monitor-1.22.1.tar.xz 2202544 BLAKE2B 
37eb2d265aedb259fd3f97aae64f76b7061eda6f4713137d4a9de9cdb078ce2176039c4a6cb7f9f63367c186df3bc181693b9526500f81fe0c9c52dc2e05e7a2
 SHA512 
ce5c514c333b85d6dd94b9fa212b51ed78212781da9719f730c50fc61fcf433e1a7df1d2665fe90e9529fba08207df59858b66f982bcd070845f62b22f8bd82f
+DIST mate-system-monitor-1.22.2.tar.xz 2209852 BLAKE2B 
d5437596454e767cdbb32e7de062d5a9c6f55edce45f9439cfd555e9455f7cf935a4d15fcd8f19494feab1faae4e0ee07f469b6650d2da03372f9e2bea3ed8ac
 SHA512 
47ccb38e27906c4de0cc18abc9d43ffc3b2c8f2f33b3f4cea3e47fd82c48870f03927fab39d323b61b9b871614b24bb2bc258d1c547650cdfb6b8eef65cb0de3
+DIST mate-system-monitor-1.24.0.tar.xz 2437396 BLAKE2B 
78c8774ee1832772b2cda06bca051c91e10e882b841373e3f30575ab1d05cc2b799962d964be4cc8416f9747e44031e579410d9851bb82d6a13f6023f1a30b2a
 SHA512 
430a2bf81f447143ba53cecb1c2659903cd957e313f6690adea363e9a8deccfd4ad64ebd8ce18dfb31a67fa7b51cbe087ffed7b5dcba5dd03b1010ec41b4d282

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild
deleted file mode 100644
index a640204..0000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.12.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-       KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 systemd"
-
-RDEPEND="
-       >=dev-cpp/glibmm-2.26:2
-       >=dev-libs/dbus-glib-0.70:0
-       >=dev-libs/glib-2.36:2
-       dev-libs/libsigc++:2
-       >=dev-libs/libxml2-2:2
-       >=gnome-base/libgtop-2.23.1:2=
-       >=gnome-base/librsvg-2.35:2
-       >=sys-apps/dbus-0.7:0
-       x11-libs/cairo:0
-       x11-libs/gdk-pixbuf:2
-       virtual/libintl:0
-       !gtk3? (
-               >=dev-cpp/gtkmm-2.22:2.4
-               >=x11-libs/gtk+-2.20:2
-               >=x11-libs/libwnck-2.5:1
-       )
-       gtk3? (
-               >=dev-cpp/gtkmm-3.0:3.0
-               >=x11-libs/gtk+-3.0:3
-               >=x11-libs/libwnck-2.91:3
-       )
-       systemd? ( sys-apps/systemd )"
-
-DEPEND="${RDEPEND}
-       app-text/yelp-tools:0
-       >=dev-util/intltool-0.50.1:*
-       sys-devel/gettext:*
-       >=sys-devel/autoconf-2.63:*
-       virtual/pkgconfig:*"
-
-src_configure() {
-       mate_src_configure \
-               --with-gtk=$(usex gtk3 3.0 2.0) \
-               $(use_enable systemd)
-}

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
deleted file mode 100644
index 5fb7d32..0000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.14.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-       KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="systemd"
-
-COMMON_DEPEND="
-       >=dev-cpp/glibmm-2.26:2
-       >=dev-cpp/gtkmm-3.8:3.0
-       >=dev-libs/glib-2.36:2
-       dev-libs/libsigc++:2
-       >=dev-libs/libxml2-2:2
-       >=gnome-base/libgtop-2.23.1:2=
-       >=gnome-base/librsvg-2.35:2
-       x11-libs/cairo:0
-       x11-libs/gdk-pixbuf:2
-       >=x11-libs/gtk+-3.14:3
-       >=x11-libs/libwnck-3.0:3
-       virtual/libintl:0
-       systemd? ( sys-apps/systemd )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-       app-text/yelp-tools:0
-       >=dev-util/intltool-0.50.1:*
-       sys-devel/gettext:*
-       >=sys-devel/autoconf-2.63:*
-       virtual/pkgconfig:*"
-
-src_configure() {
-       mate_src_configure \
-               $(use_enable systemd)
-}
-
-pkg_postinst() {
-       mate_pkg_postinst
-
-       einfo "${PN} may run commands with escalated privileges using"
-       einfo "x11-libs/gksu."
-}

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild
deleted file mode 100644
index 5fb7d32..0000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-       KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="systemd"
-
-COMMON_DEPEND="
-       >=dev-cpp/glibmm-2.26:2
-       >=dev-cpp/gtkmm-3.8:3.0
-       >=dev-libs/glib-2.36:2
-       dev-libs/libsigc++:2
-       >=dev-libs/libxml2-2:2
-       >=gnome-base/libgtop-2.23.1:2=
-       >=gnome-base/librsvg-2.35:2
-       x11-libs/cairo:0
-       x11-libs/gdk-pixbuf:2
-       >=x11-libs/gtk+-3.14:3
-       >=x11-libs/libwnck-3.0:3
-       virtual/libintl:0
-       systemd? ( sys-apps/systemd )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-       app-text/yelp-tools:0
-       >=dev-util/intltool-0.50.1:*
-       sys-devel/gettext:*
-       >=sys-devel/autoconf-2.63:*
-       virtual/pkgconfig:*"
-
-src_configure() {
-       mate_src_configure \
-               $(use_enable systemd)
-}
-
-pkg_postinst() {
-       mate_pkg_postinst
-
-       einfo "${PN} may run commands with escalated privileges using"
-       einfo "x11-libs/gksu."
-}

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
new file mode 100644
index 0000000..07ef770
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+       KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
+
+DESCRIPTION="The MATE System Monitor"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="elogind systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+COMMON_DEPEND="
+       >=dev-cpp/glibmm-2.26:2
+       >=dev-cpp/gtkmm-3.8:3.0
+       >=dev-libs/glib-2.50:2
+       dev-libs/libsigc++:2
+       >=dev-libs/libxml2-2:2
+       >=gnome-base/libgtop-2.23.1:2=
+       >=gnome-base/librsvg-2.35:2
+       x11-libs/cairo
+       x11-libs/gdk-pixbuf:2
+       >=x11-libs/gtk+-3.22:3
+       >=x11-libs/libwnck-3.0:3
+       virtual/libintl
+       elogind? ( sys-auth/elogind )
+       systemd? ( sys-apps/systemd )"
+
+RDEPEND="${COMMON_DEPEND}
+       >=sys-auth/polkit-0.97:0"
+
+DEPEND="${COMMON_DEPEND}
+       app-text/yelp-tools
+       >=dev-util/intltool-0.50.1:*
+       sys-devel/gettext:*
+       >=sys-devel/autoconf-2.63:*
+       virtual/pkgconfig:*"
+
+src_configure() {
+       local myconf=()
+
+       if use elogind || use systemd; then
+               myconf+=( --enable-systemd )
+               if use elogind; then
+                       myconf+=(
+                               SYSTEMD_CFLAGS=`pkg-config --cflags 
"libelogind" 2>/dev/null`
+                               SYSTEMD_LIBS=`pkg-config --libs "libelogind" 
2>/dev/null`
+                       )
+               fi
+       else
+               myconf+=( --disable-systemd )
+       fi
+
+       mate_src_configure "${myconf[@]}"
+}

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.1.ebuild
similarity index 52%
copy from mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild
copy to mate-extra/mate-system-monitor/mate-system-monitor-1.22.1.ebuild
index 5b13f79..1cc3673 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,44 +10,53 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
+IUSE="elogind systemd"
 
-IUSE="systemd"
+REQUIRED_USE="?? ( elogind systemd )"
 
 COMMON_DEPEND="
        >=dev-cpp/glibmm-2.26:2
        >=dev-cpp/gtkmm-3.8:3.0
-       >=dev-libs/glib-2.36:2
+       >=dev-libs/glib-2.50:2
        dev-libs/libsigc++:2
        >=dev-libs/libxml2-2:2
        >=gnome-base/libgtop-2.23.1:2=
        >=gnome-base/librsvg-2.35:2
-       x11-libs/cairo:0
+       x11-libs/cairo
        x11-libs/gdk-pixbuf:2
-       >=x11-libs/gtk+-3.14:3
+       >=x11-libs/gtk+-3.22:3
        >=x11-libs/libwnck-3.0:3
-       virtual/libintl:0
+       virtual/libintl
+       elogind? ( sys-auth/elogind )
        systemd? ( sys-apps/systemd )"
 
 RDEPEND="${COMMON_DEPEND}
        >=sys-auth/polkit-0.97:0"
 
 DEPEND="${COMMON_DEPEND}
-       app-text/yelp-tools:0
+       app-text/yelp-tools
        >=dev-util/intltool-0.50.1:*
        sys-devel/gettext:*
        >=sys-devel/autoconf-2.63:*
        virtual/pkgconfig:*"
 
 src_configure() {
-       mate_src_configure \
-               $(use_enable systemd)
-}
-
-pkg_postinst() {
-       mate_pkg_postinst
-
-       einfo "${PN} may run commands with escalated privileges using"
-       einfo "x11-libs/gksu."
+       local myconf=()
+
+       if use elogind || use systemd; then
+               myconf+=( --enable-systemd )
+               if use elogind; then
+                       myconf+=(
+                               SYSTEMD_CFLAGS=`pkg-config --cflags 
"libelogind" 2>/dev/null`
+                               SYSTEMD_LIBS=`pkg-config --libs "libelogind" 
2>/dev/null`
+                       )
+               fi
+       else
+               myconf+=( --disable-systemd )
+       fi
+
+       mate_src_configure "${myconf[@]}"
 }

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.2.ebuild
similarity index 52%
rename from mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild
rename to mate-extra/mate-system-monitor/mate-system-monitor-1.22.2.ebuild
index 5b13f79..1cc3673 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,44 +10,53 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
+IUSE="elogind systemd"
 
-IUSE="systemd"
+REQUIRED_USE="?? ( elogind systemd )"
 
 COMMON_DEPEND="
        >=dev-cpp/glibmm-2.26:2
        >=dev-cpp/gtkmm-3.8:3.0
-       >=dev-libs/glib-2.36:2
+       >=dev-libs/glib-2.50:2
        dev-libs/libsigc++:2
        >=dev-libs/libxml2-2:2
        >=gnome-base/libgtop-2.23.1:2=
        >=gnome-base/librsvg-2.35:2
-       x11-libs/cairo:0
+       x11-libs/cairo
        x11-libs/gdk-pixbuf:2
-       >=x11-libs/gtk+-3.14:3
+       >=x11-libs/gtk+-3.22:3
        >=x11-libs/libwnck-3.0:3
-       virtual/libintl:0
+       virtual/libintl
+       elogind? ( sys-auth/elogind )
        systemd? ( sys-apps/systemd )"
 
 RDEPEND="${COMMON_DEPEND}
        >=sys-auth/polkit-0.97:0"
 
 DEPEND="${COMMON_DEPEND}
-       app-text/yelp-tools:0
+       app-text/yelp-tools
        >=dev-util/intltool-0.50.1:*
        sys-devel/gettext:*
        >=sys-devel/autoconf-2.63:*
        virtual/pkgconfig:*"
 
 src_configure() {
-       mate_src_configure \
-               $(use_enable systemd)
-}
-
-pkg_postinst() {
-       mate_pkg_postinst
-
-       einfo "${PN} may run commands with escalated privileges using"
-       einfo "x11-libs/gksu."
+       local myconf=()
+
+       if use elogind || use systemd; then
+               myconf+=( --enable-systemd )
+               if use elogind; then
+                       myconf+=(
+                               SYSTEMD_CFLAGS=`pkg-config --cflags 
"libelogind" 2>/dev/null`
+                               SYSTEMD_LIBS=`pkg-config --libs "libelogind" 
2>/dev/null`
+                       )
+               fi
+       else
+               myconf+=( --disable-systemd )
+       fi
+
+       mate_src_configure "${myconf[@]}"
 }

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
new file mode 100644
index 0000000..99d44d1
--- /dev/null
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.24.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The MATE System Monitor"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="elogind systemd"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+COMMON_DEPEND="
+       >=dev-cpp/glibmm-2.26:2
+       >=dev-cpp/gtkmm-3.8:3.0
+       >=dev-libs/glib-2.56:2
+       dev-libs/libsigc++:2
+       >=dev-libs/libxml2-2:2
+       >=gnome-base/libgtop-2.37.2:2=
+       >=gnome-base/librsvg-2.35:2
+       x11-libs/cairo
+       x11-libs/gdk-pixbuf:2
+       >=x11-libs/gtk+-3.22:3
+       >=x11-libs/libwnck-3.0:3
+       elogind? ( sys-auth/elogind )
+       systemd? ( sys-apps/systemd )
+"
+
+RDEPEND="${COMMON_DEPEND}
+       >=sys-auth/polkit-0.97:0
+       virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+       app-text/yelp-tools
+       >=sys-devel/gettext-0.19.8:*
+       >=sys-devel/autoconf-2.63:*
+       virtual/pkgconfig:*
+"
+
+src_configure() {
+       local myconf=()
+
+       if use elogind || use systemd; then
+               myconf+=( --enable-systemd )
+               if use elogind; then
+                       myconf+=(
+                               SYSTEMD_CFLAGS=`pkg-config --cflags 
"libelogind" 2>/dev/null`
+                               SYSTEMD_LIBS=`pkg-config --libs "libelogind" 
2>/dev/null`
+                       )
+               fi
+       else
+               myconf+=( --disable-systemd )
+       fi
+
+       mate_src_configure "${myconf[@]}"
+}

diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-9999.ebuild 
b/mate-extra/mate-system-monitor/mate-system-monitor-9999.ebuild
index 1c33c5f..99d44d1 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-9999.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,48 +6,59 @@ EAPI=6
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-       KEYWORDS="~amd64 ~arm ~x86"
+       KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
+
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
+IUSE="elogind systemd"
 
-IUSE="systemd"
+REQUIRED_USE="?? ( elogind systemd )"
 
 COMMON_DEPEND="
        >=dev-cpp/glibmm-2.26:2
        >=dev-cpp/gtkmm-3.8:3.0
-       >=dev-libs/glib-2.36:2
+       >=dev-libs/glib-2.56:2
        dev-libs/libsigc++:2
        >=dev-libs/libxml2-2:2
-       >=gnome-base/libgtop-2.23.1:2=
+       >=gnome-base/libgtop-2.37.2:2=
        >=gnome-base/librsvg-2.35:2
-       x11-libs/cairo:0
+       x11-libs/cairo
        x11-libs/gdk-pixbuf:2
-       >=x11-libs/gtk+-3.14:3
+       >=x11-libs/gtk+-3.22:3
        >=x11-libs/libwnck-3.0:3
-       virtual/libintl:0
-       systemd? ( sys-apps/systemd )"
+       elogind? ( sys-auth/elogind )
+       systemd? ( sys-apps/systemd )
+"
 
 RDEPEND="${COMMON_DEPEND}
-       >=sys-auth/polkit-0.97:0"
+       >=sys-auth/polkit-0.97:0
+       virtual/libintl
+"
 
 DEPEND="${COMMON_DEPEND}
-       app-text/yelp-tools:0
-       >=dev-util/intltool-0.50.1:*
-       sys-devel/gettext:*
+       app-text/yelp-tools
+       >=sys-devel/gettext-0.19.8:*
        >=sys-devel/autoconf-2.63:*
-       virtual/pkgconfig:*"
+       virtual/pkgconfig:*
+"
 
 src_configure() {
-       mate_src_configure \
-               $(use_enable systemd)
-}
+       local myconf=()
 
-pkg_postinst() {
-       mate_pkg_postinst
+       if use elogind || use systemd; then
+               myconf+=( --enable-systemd )
+               if use elogind; then
+                       myconf+=(
+                               SYSTEMD_CFLAGS=`pkg-config --cflags 
"libelogind" 2>/dev/null`
+                               SYSTEMD_LIBS=`pkg-config --libs "libelogind" 
2>/dev/null`
+                       )
+               fi
+       else
+               myconf+=( --disable-systemd )
+       fi
 
-       einfo "${PN} may run commands with escalated privileges using"
-       einfo "x11-libs/gksu."
+       mate_src_configure "${myconf[@]}"
 }

diff --git a/mate-extra/mate-system-monitor/metadata.xml 
b/mate-extra/mate-system-monitor/metadata.xml
index abf6a9f..4e0e9ce 100644
--- a/mate-extra/mate-system-monitor/metadata.xml
+++ b/mate-extra/mate-system-monitor/metadata.xml
@@ -5,9 +5,6 @@
                <email>m...@gentoo.org</email>
                <name>Gentoo MATE Desktop</name>
        </maintainer>
-       <use>
-               <flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-       </use>
        <upstream>
                <remote-id 
type="github">mate-desktop/mate-system-monitor</remote-id>
        </upstream>

Reply via email to