Update multiload-ng. Drop GTK2 and awn. Fix build.

1.5.2 won't compile, so only retain 9999

Signed-off-by: haarp <main.haarp@gmail.com>

3 files changed, 18 insertions, 57 deletions

diff --git a/x11-plugins/multiload-ng/Manifest b/x11-plugins/multiload-ng/Manifest
index 4a7cfab..f16e734 100644
--- a/x11-plugins/multiload-ng/Manifest
+++ b/x11-plugins/multiload-ng/Manifest
@@ -1,5 +1,3 @@
 AUX fix-sysfs-nvme-dm.patch 3562 BLAKE2B 160e6cb24b88207c5ac269b59076d5020bb5a3d83495b67ca43bb693d1e286e643903df2c7b25d205149291a05da3c25c092485bbebed82e8ea7523125a33018 SHA512 1f1c914f1704cfd6fa07d998e4b694fbe49fa567d4f0f99f9a33441121ba3def324acee854b6c560493640589d2eff960f49b9166346c768f9f856a604dc74c1
-DIST multiload-ng-1.5.2.tar.gz 183474 BLAKE2B 7614b0337f26316ca08c7b3218af28b65685e4a784b5922ebee4b1f5b66ea79f5ad6e05f6b1ecd6d495e32379f7bba41502ba496d5afb41ed9a68d1d16c2132b SHA512 648e14fab39a80cdffadf41fab335b946dd115b1a565e16a44a95c3121eaf3d93bec37c6b41db84a11669530500a4b1088dc6fdbcb18900ea995499b77e54140
-EBUILD multiload-ng-1.5.2.ebuild 2021 BLAKE2B 9f27fea24f0ec132c001e4d56038bbe2f8191296f6af7e05ffbd178c2a43212cfd53ce8f728b98d5f685b4a2e630902905f9d8132de37cc39175955c825c1c34 SHA512 f7814cd1d984ac9551bb92045f96051db1270da9b74a0a2a7c26ddd5a60f16881c25dfdac11c9f5fbf4cdce36ab282cc9ea161b44495f7606e643fb53920c52b
-EBUILD multiload-ng-9999.ebuild 2021 BLAKE2B 9f27fea24f0ec132c001e4d56038bbe2f8191296f6af7e05ffbd178c2a43212cfd53ce8f728b98d5f685b4a2e630902905f9d8132de37cc39175955c825c1c34 SHA512 f7814cd1d984ac9551bb92045f96051db1270da9b74a0a2a7c26ddd5a60f16881c25dfdac11c9f5fbf4cdce36ab282cc9ea161b44495f7606e643fb53920c52b
+EBUILD multiload-ng-9999.ebuild 1331 BLAKE2B 7c272ddb7fadb549e80383fd5585d0bbde41c9ea84da20c3747386623d0d2bd46c7e449c8b32db5083ca4dce62986aee46f302b1c4a467035184ae9ddc54a638 SHA512 c1c1e2ee166fe6797a835a1281225e5a835e10ef9f8762e26e035f64a4d68da655fda74b401a2673a9549682b0b565f2b4e3674bc4ab9fd46ca5dd87d05ac902
 MISC metadata.xml 1849 BLAKE2B ef267417c2342f42faf5f85266277abca6c8942175cfc1a2ee33795a86ee02f6bc1169cb6cc86f796bbf2c24567f851b0804169ece7f54934e4f22823063cd00 SHA512 85df7f37729020430d8609cf56247fee924c477779c6b535db9ab9e861d928b9a5820515a2d1003cbbe81f8f4e77a50e2e42dcfe37990784a2c301ba0d97079b
diff --git a/x11-plugins/multiload-ng/multiload-ng-1.5.2.ebuild b/x11-plugins/multiload-ng/multiload-ng-1.5.2.ebuild
deleted file mode 120000
index 01033f4..0000000
--- a/x11-plugins/multiload-ng/multiload-ng-1.5.2.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-multiload-ng-9999.ebuild
\ No newline at end of file
diff --git a/x11-plugins/multiload-ng/multiload-ng-9999.ebuild b/x11-plugins/multiload-ng/multiload-ng-9999.ebuild
index 33e1c2c..fb1b90c 100644
--- a/x11-plugins/multiload-ng/multiload-ng-9999.ebuild
+++ b/x11-plugins/multiload-ng/multiload-ng-9999.ebuild
@@ -1,57 +1,30 @@
-# Copyright 1999-2020 Gentoo authors
+# Copyright 1999-2022 Gentoo authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools eutils
+EAPI=8
+inherit autotools git-r3
 
-DESCRIPTION="Modern graphical system monitor for XFCE/MATE/LXDE (GNOME applet fork)"
+DESCRIPTION="Modern graphical system monitor for any panel"
 HOMEPAGE="https://udda.github.io/multiload-ng/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/udda/multiload-ng.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/udda/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
+EGIT_REPO_URI="https://github.com/udda/multiload-ng.git"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="autostart awn debug gtk2 +gtk3 indicator lxde mate +standalone systray xfce"
+IUSE="autostart awn debug indicator lxde mate +standalone systray xfce"
 
-LANGS=" de es fr it lt ru zh_CN"
+LANGS="de es fr it lt ru zh_CN"
 IUSE="${IUSE} ${LANGS// / linguas_}"
 
 RDEPEND="
-	gtk2? ( >=x11-libs/gtk+-2.20:2 )
-	gtk3? ( x11-libs/gtk+:3 )
+	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(-)] )
-	)
+	indicator? ( >=dev-libs/libappindicator-0.4.92:3 )
+	lxde? ( >=lxde-base/lxpanel-0.5.8 )
+	mate? ( >=mate-base/mate-panel-1.7.0 )
 	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
-		)
+		>=xfce-base/libxfce4util-4.12.0
+		>=xfce-base/xfce4-panel-4.12.0
 	)"
 
 DEPEND="${RDEPEND}
@@ -59,35 +32,26 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-REQUIRED_USE="
-	^^ ( gtk2 gtk3 )
-	|| ( awn indicator lxde mate standalone systray xfce )
-	awn? ( gtk2 )"
+REQUIRED_USE="|| ( indicator lxde mate standalone systray xfce )"
 
 DOCS=( AUTHORS Changelog.md CONTRIBUTING.md README.md )
 
 src_prepare() {
 	eapply "${FILESDIR}/fix-sysfs-nvme-dm.patch"
 	eapply_user
-
 	eautoreconf
 }
 
 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)
+		$(use_with xfce xfce4)\
+		--with-gtk=3.0 --disable-deprecations
 }