Tweaked and updated multiload-ng with help from udda

4 files changed, 125 insertions, 57 deletions

diff --git a/x11-plugins/multiload-ng/Manifest b/x11-plugins/multiload-ng/Manifest
index 408d908..6cd7536 100644
--- a/x11-plugins/multiload-ng/Manifest
+++ b/x11-plugins/multiload-ng/Manifest
@@ -1,2 +1,3 @@
-DIST multiload-ng-1.2.0.tar.gz 84127 SHA256 7a9034d087476556dc936a2ffde223efbb35d42f7aa7d81ba09f8628f7a4cc47 SHA512 a82907346cc8fad35ab664c927c2c90616cd2f2bea635abef7d4210c5bfa57cc07d08286de8ca5add01ec41959a96f412c2e7eeff9257b6cd5307b223560e4d7 WHIRLPOOL bb72618e081e10094694b35561231974b804d3056245e044ffa8f244edf9e6d7eaa9bbb9df94862b97f724863a2faad583c686833e2951e3d83fafa1d32f74a7
-EBUILD multiload-ng-1.2.0.ebuild 1258 SHA256 79a7e6e0124e99948511f4074bb83e5799f28891eaf74ce8d80360278c2764b4 SHA512 0a56ff2d6dabca29b8aa0ab43b0350e405aef7ba7a75640d52ddec9fb28b0afc99418f541a6c78e3d2dcc71b8acfabc63e779219720fff98367ce494078be627 WHIRLPOOL cf60e83a065c660873241148916997e966764cedd0891b3c8ec6f4fb394c9e889a5eae4525f3d2a81bd324a2767776bf45a3f94649a300275627bce5698e3bc9
+DIST multiload-ng-1.5.2.tar.gz 183474 SHA256 ea77b84dc998c815f413a59d7e1461072abc19d97b64db6a0df4514fdc492d4a SHA512 648e14fab39a80cdffadf41fab335b946dd115b1a565e16a44a95c3121eaf3d93bec37c6b41db84a11669530500a4b1088dc6fdbcb18900ea995499b77e54140 WHIRLPOOL d90b51cca8eba2a64303b117daf2621356fdcd797d02239818b1124df1993edcfd6a99f23c2fd2f960181c98a76d8c3d486efaae6ae15d087fb0bfa86683b7fc
+EBUILD multiload-ng-1.5.2.ebuild 1864 SHA256 7295e7962572cde2bf4999bf614022cbd0ace7c5e9ac50569c16076ad49e0369 SHA512 d15d5fe714fbea955507e5dab45421c9e49274489a147978f89f1f74d82b1309e7019d1f6e4260c2805885c2b487e07d0d3ef3b5ae1cf5d4ccbfb09e000de8e7 WHIRLPOOL b86d9dff00937b4c10d51f112cd6a7b53c8924d658d94b501f0507b1033fe3789ecb6fe14f0cb148667a47ad4cd45a4d57b96c8fa984bce7acad3962ab4004e1
+MISC metadata.xml 2030 SHA256 be8acf5c1ca7c1b35cb55a400b7d519a71616f460f56c1e9730c92764d92979f SHA512 ba23109a79c7385f2c9312915a1518556066cfe2918fce41cba112d56783efe1f97678b296b78955dd58b336dcd3f8b9ac4efde6dcd45b539d3ce99c2e44504e WHIRLPOOL 3f9fa5fba37b9a5e127a883ad311f22c21fa393f9bd655c5327dbcd2e1d448dc015d5d3a46489806a72cc5d18651a3f6f8b575ac86ea6159cf8fba9ac265db1e
diff --git a/x11-plugins/multiload-ng/metadata.xml b/x11-plugins/multiload-ng/metadata.xml
new file mode 100644
index 0000000..788107a
--- /dev/null
+++ b/x11-plugins/multiload-ng/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" status="active">
+		<email>mr.udda@gmail.com</email>
+		<name>Mario Cianciolo</name>
+		<description>Developer of Multiload-ng</description>
+	</maintainer>
+	<longdescription>
+Multiload-ng is a modern graphical system monitor. It's a near-complete rewrite of the good old GNOME multiload applet.
+
+It runs on a variety of panels, including XFCE, MATE, LXDE, and others.
+There is also a system tray version, for panels without plugin support, and a standalone version, with its own window.
+
+Multiload-ng can be built with GTK2 and GTK3, so can be embedded within GTK2/GTK3 builds of all the aforementioned panels.
+	</longdescription>
+	<use>autostart awn debug gtk2 gtk3 indicator lxde mate standalone systray xfce
+		<flag name="autostart">Install autostart entries for suitable targets</flag>
+		<flag name="gtk2">Build against GTK+2 (check compatibility with your panel)</flag>
+		<flag name="gtk3">Build against GTK+3 (check compatibility with your panel)</flag>
+		<flag name="awn">Build plugin for <pkg>gnome-extra/avant-window-navigator</pkg> (experimental)</flag>
+		<flag name="indicator">Build plugin with <pkg>dev-libs/libappindicator</pkg> (Ubuntu Unity and others)</flag>
+		<flag name="lxde">Build plugin for <pkg>lxde-base/lxpanel</pkg></flag>
+		<flag name="mate">Build plugin for <pkg>mate-base/mate-panel</pkg></flag>
+		<flag name="xfce">Build plugin for <pkg>xfce-base/xfce4-panel</pkg></flag>
+		<flag name="standalone">Build application with standalone window</flag>
+		<flag name="systray">Build application for system tray</flag>
+	</use>
+	<upstream>
+		<doc>https://github.com/udda/multiload-ng/wiki</doc>
+		<doc>http://udda.github.io/multiload-ng</doc>
+		<bugs-to>mailto:mr.udda@gmail.com</bugs-to>
+		<changelog>https://github.com/udda/multiload-ng/blob/master/Changelog.md</changelog>
+		<remote-id type="github">udda/multiload-ng</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-plugins/multiload-ng/multiload-ng-1.2.0.ebuild b/x11-plugins/multiload-ng/multiload-ng-1.2.0.ebuild
deleted file mode 100644
index 2c1f2b5..0000000
--- a/x11-plugins/multiload-ng/multiload-ng-1.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Modern graphical system monitor for XFCE/MATE/LXDE (GNOME applet fork)"
-HOMEPAGE="https://udda.github.io/multiload-ng/"
-SRC_URI="https://github.com/udda/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="indicator lxpanel mate standalone +xfce_plugins_multiload-ng"
-
-RDEPEND=">=x11-libs/gtk+-2.14:2
-	x11-libs/cairo
-	>=gnome-base/libgtop-2.11.92
-	lxpanel? ( lxde-base/lxpanel )
-	mate? ( mate-base/mate-panel )
-	xfce_plugins_multiload-ng? (
-		>=xfce-base/libxfce4ui-4.10
-		>=xfce-base/libxfce4util-4.10
-		>=xfce-base/xfce4-panel-4.10
-	)"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( mate lxpanel standalone xfce_plugins_multiload-ng )"
-
-DOCS="AUTHORS README.md"
-
-S=${WORKDIR}/${P}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	# FIXME: currently configured for gtk2 only
-	econf \
-		--with-gtk=2.0 \
-		$(use_with indicator) \
-		$(use_with lxpanel) \
-		$(use_with mate) \
-		$(use_with standalone) \
-		$(use_with xfce_plugins_multiload-ng xfce4)
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/x11-plugins/multiload-ng/multiload-ng-1.5.2.ebuild b/x11-plugins/multiload-ng/multiload-ng-1.5.2.ebuild
new file mode 100644
index 0000000..0fc2729
--- /dev/null
+++ b/x11-plugins/multiload-ng/multiload-ng-1.5.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="Modern graphical system monitor for XFCE/MATE/LXDE (GNOME applet fork)"
+HOMEPAGE="https://udda.github.io/multiload-ng/"
+SRC_URI="https://github.com/udda/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autostart awn debug gtk2 +gtk3 indicator lxde mate +standalone systray xfce"
+
+LANGS="de es fr it lt ru zh_CN"
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+done
+
+RDEPEND="
+	gtk2? ( >=x11-libs/gtk+-2.20:2 )
+	gtk3? ( x11-libs/gtk+:3 )
+	x11-libs/cairo:=
+	awn? (
+		>=gnome-extra/avant-window-navigator-0.3.9
+		>=dev-cpp/glibmm-2.16.0:2
+		>=dev-cpp/gtkmm-2.20:2.4
+	)
+	indicator? (
+		gtk2? ( >=dev-libs/libappindicator-0.4.92:2 )
+		gtk3? ( >=dev-libs/libappindicator-0.4.92:3 )
+	)
+	lxde? (
+		>=lxde-base/lxpanel-0.5.8
+	)
+	mate? (
+		gtk2? ( >=mate-base/mate-panel-1.7.0 )
+		gtk3? ( >=mate-base/mate-panel-1.7.0[gtk3(-)] )
+	)
+	xfce? (
+		gtk2? (
+			>=xfce-base/libxfce4util-4.6.0
+			>=xfce-base/xfce4-panel-4.6.0
+		)
+		gtk3? (
+			>=xfce-base/libxfce4util-4.12.0
+			>=xfce-base/xfce4-panel-4.12.0
+		)
+	)"
+
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	^^ ( gtk2 gtk3 )
+	|| ( awn indicator lxde mate standalone systray xfce )
+	awn? ( gtk2 )"
+
+DOCS=( AUTHORS Changelog.md CONTRIBUTING.md README.md )
+
+src_prepare() {
+	eautoreconf
+	default
+}
+
+src_configure() {
+	if use gtk2; then
+		GTK_CONF="--with-gtk=2.0"
+	else
+		GTK_CONF="--with-gtk=3.0 --disable-deprecations"
+	fi
+	econf \
+		$(use_enable debug) \
+		$(use_enable autostart) \
+		$GTK_CONF \
+		$(use_with standalone) \
+		$(use_with awn) \
+		$(use_with indicator) \
+		$(use_with lxde lxpanel) \
+		$(use_with mate) \
+		$(use_with systray) \
+		$(use_with xfce xfce4)
+}