gentoo resync : 22.01.2021

4 files changed, 72 insertions, 33 deletions

diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest
index cb6d1af0ba60..318ba09a97cf 100644
--- a/x11-plugins/vicious/Manifest
+++ b/x11-plugins/vicious/Manifest
@@ -1,5 +1,5 @@
 DIST vicious-2.3.1.tar.gz 47484 BLAKE2B 2ef6e51507faf7477800091c738e65184439caba9b79004b53f3a479f1370ca64046bc1664c6b746d8ab71370b36f29095406439e2a8fab7524e6bb190350fb7 SHA512 9e89d36d708a7ccdff206451dfb98db8455a16f9d2254167a446af91fadc2103a5274442f38ddf1eb919da23480b6790639cdbbde4a08bffc1cf9221622064c9
-DIST vicious-2.3.3.tar.gz 50564 BLAKE2B f472b9e1514c9f731734e6512496da6ebb516a190225035811333ca7a275509828b8b4078d72856b5a488eeaee612e3070406138f1abd9de61aaa0f01ca370b9 SHA512 2549fa168a8c8cebcb9ecf1eafbc7658213b6a5487839e8acbc2aaed18f0d0b8081550ee7beb93770ae7e600158e12b99b9e1c29af8a8807bb200cc1cdf75807
+DIST vicious-2.5.0.tar.gz 67557 BLAKE2B ffbc1b3c0e32b554cc367a51e5e17130e1b9f7fed2e8505aaa1845719ecd6d465d43ba839ac3a9b73a87e43ff3144c2074f3750d5f67b516d033a74144e9e12f SHA512 deb21587d1d7f2e6e4dd77c74abbfa337acf6c99ef9bebc0e505f1508afc6e3b03f043a639f866fcda0191447c103d3fba51376682201482fb669a263321dee5
 EBUILD vicious-2.3.1.ebuild 670 BLAKE2B a96e57a97480303b302d1c387de5f9ee8d86173af0c1ccbc3b100a8292a6bbe0b0e679f930eb881b66d655640bf10b3d95052e468181d1baf31e68cda6a3ae4c SHA512 0a1ae727bca18f54e06a4df1cea575328a10604dc85046e1f1ec242eeb22e4d57544ecc2bc6c349b538b1cead65840f75a2797aa41ee70595a33f5c3810d13d0
-EBUILD vicious-2.3.3.ebuild 669 BLAKE2B aa05171e4521066dac77d884ef9ddc719bf2475a2932c6cd1da4ea9440bb41204f569785ca8e9034b31fdb5f3b5ffc1d8162ebb027d9ffb5355f69c59bfab5f6 SHA512 11cb386ea966f246e768cc0490b6406e67e018d2961f9607f845891a385f358ff58a012ffeabf2118c86377b8390b9c5e2cbe67202b40c950aa40edc29f86fa7
-MISC metadata.xml 383 BLAKE2B 91e0094887c3d3ea1e60d96006a87a6fc30fbb58ad329575ce323268a95e7c0d963981c2aa2a5fb10146912e8decc2939e92419a2084af4315e3ce18d3948dbd SHA512 106a9e2d26d2949596de091c1de5cf86d113fca6868b883292d3b254044b3321deefe6f671542b041d500714006ac0c78abf4c6b45eb94c3cb64b7b39144f22d
+EBUILD vicious-2.5.0.ebuild 2267 BLAKE2B d1bc5ce6e86510954ccf86fea58e75e15e9f59f3ecf414f902fe1b9cf40de084b32a2fb56b7bdd13f62a8485b30d37a629b2d8382bd699c1cbe1fc24c2f7722a SHA512 5b7e40b7fbfe4e58b60c26bdee583783b36dfc349f65c460c7ceda87b037367faa6fc9262e7bb05918987bd7c0ebb34d82beecea7365659b1a938feea5a1ec37
+MISC metadata.xml 467 BLAKE2B e2275dacd87f47bbca44c35c04695410193e190a0c478d359f2834d4f1a07e24f887dfddd91efc844a453ec15286e638efda98a31eca6e0539861d3f2cd6b39c SHA512 20b743701dabb4a037d6720a4d6ebc29d1abecffc60cf191b6b799c87192dbdac3e11b68d5cfb3b9b6f1a275e50bd1ce8d2d6eb1a157f6b68f83416652ce2122
diff --git a/x11-plugins/vicious/metadata.xml b/x11-plugins/vicious/metadata.xml
index 2af1ac6d48e5..1618c3ef94e3 100644
--- a/x11-plugins/vicious/metadata.xml
+++ b/x11-plugins/vicious/metadata.xml
@@ -2,10 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<use>
 		<flag name="contrib">Install extra widgets, some for less common hardware, some contributed by Vicious users.</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">vicious-widgets/vicious</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/vicious/vicious-2.3.3.ebuild b/x11-plugins/vicious/vicious-2.3.3.ebuild
deleted file mode 100644
index 4934c0636f0d..000000000000
--- a/x11-plugins/vicious/vicious-2.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Modular widget library for x11-wm/awesome"
-HOMEPAGE="https://github.com/Mic92/vicious"
-SRC_URI="https://github.com/Mic92/vicious/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="contrib"
-
-DEPEND=""
-RDEPEND="x11-wm/awesome"
-
-src_install() {
-	insinto /usr/share/awesome/lib/vicious
-	doins -r widgets helpers.lua init.lua
-	dodoc Changes.md README.md TODO
-
-	if use contrib; then
-		insinto /usr/share/awesome/lib/vicious/contrib
-		doins contrib/*.lua
-		newdoc contrib/README.md README.contrib
-	fi
-}
diff --git a/x11-plugins/vicious/vicious-2.5.0.ebuild b/x11-plugins/vicious/vicious-2.5.0.ebuild
new file mode 100644
index 000000000000..32f7e2f8ca29
--- /dev/null
+++ b/x11-plugins/vicious/vicious-2.5.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+DESCRIPTION="Modular widget library for x11-wm/awesome"
+HOMEPAGE="https://github.com/vicious-widgets/vicious"
+SRC_URI="https://github.com/${PN}-widgets/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="contrib"
+
+RDEPEND="x11-wm/awesome"
+
+src_install() {
+	insinto /usr/share/awesome/lib/vicious
+	doins -r widgets helpers.lua init.lua
+
+	if use contrib; then
+		insinto /usr/share/awesome/lib/vicious/contrib
+		doins contrib/*.lua
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Note that as of 2.5.0 this list may or may not be incomplete  - it has been produced
+	# only by searching for occurrences of vicious.spawn (the recommended way of calling
+	# external helpers because it supports async) and popen (still used by many contrib widgets).
+	# Moreover, dependencies of all non-Linux widgets have been excluded on purpose.
+	elog "These widgets need some dependencies:"
+	optfeature "cmus" "media-sound/cmus"
+	optfeature "fs" "sys-apps/coreutils" # df
+	optfeature "gmail" "net-misc/curl"
+	optfeature "hddtemp" "net-misc/curl[telnet] app-admin/hddtemp"
+	optfeature "hwmontemp" "sys-apps/grep"
+	optfeature "mdir" "sys-apps/findutils"
+	optfeature "mpd" "net-misc/curl[telnet] media-sound/mpd"
+	optfeature "notmuch" "net-mail/notmuch"
+	optfeature "volume" "media-sound/alsa-utils" # amixer
+	optfeature "weather" "net-misc/curl"
+	optfeature "wifi" "net-wireless/wireless-tools"
+	optfeature "wifiiw" "net-wireless/iw"
+	if use contrib; then
+		optfeature "contrib/btc" "net-misc/curl"
+		optfeature "contrib/buildbot" "net-misc/curl"
+		optfeature "contrib/countfiles" "sys-apps/findutils"
+		optfeature "contrib/mpc" "media-sound/mpc"
+		optfeature "contrib/openweather" "net-misc/curl"
+		optfeature "contrib/netcfg" "sys-apps/coreutils" # ls
+		optfeature "contrib/nvinf" "x11-drivers/nvidia-drivers" # nvidia-settings
+		# ossvol needs 'ossmix' - not packaged?
+		optfeature "contrib/pulse" "media-sound/pulseaudio" # pacmd
+		optfeature "contrib/rss" "net-misc/curl"
+		optfeature "contrib/sensors" "sys-apps/lm-sensors"
+		optfeature "contrib/wpa" "net-wireless/wpa_supplicant" # wpa-cli
+	fi
+	elog
+}