Updating liguros repov21.1.3

9 files changed, 74 insertions, 148 deletions

diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest
index e6d51bb8110b..c2397c7cef90 100644
--- a/x11-plugins/vicious/Manifest
+++ b/x11-plugins/vicious/Manifest
@@ -1,2 +1,2 @@
 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
diff --git a/x11-plugins/vicious/metadata.xml b/x11-plugins/vicious/metadata.xml
index 4e133ef87e4d..7dd3a078b502 100644
--- a/x11-plugins/vicious/metadata.xml
+++ b/x11-plugins/vicious/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<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>
 	<origin>gentoo-staging</origin>
 </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
+}
diff --git a/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch b/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch
deleted file mode 100644
index 2320f17143de..000000000000
--- a/x11-plugins/wmbiff/files/wmbiff-0.4.35-fno-common.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur wmbiff-0.4.35.orig/wmbiff/wmbiff.c wmbiff-0.4.35/wmbiff/wmbiff.c
---- wmbiff-0.4.35.orig/wmbiff/wmbiff.c	2019-07-23 15:58:58.000000000 +0200
-+++ wmbiff-0.4.35/wmbiff/wmbiff.c	2020-03-08 12:25:32.766264038 +0100
-@@ -104,6 +104,8 @@
- 
- Cursor busy_cursor, ready_cursor;
- 
-+Display *display;
-+
- static __inline /*@out@ */ void *
- malloc_ordie(size_t len)
- {
-diff -Naur wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h wmbiff-0.4.35/wmgeneral/wmgeneral.h
---- wmbiff-0.4.35.orig/wmgeneral/wmgeneral.h	2019-07-23 15:57:57.000000000 +0200
-+++ wmbiff-0.4.35/wmgeneral/wmgeneral.h	2020-03-08 12:25:16.223256712 +0100
-@@ -36,7 +36,7 @@
-  /* Global variable */
- /*******************/
- 
--Display *display;
-+extern Display *display;
- 
-   /***********************/
-  /* Function Prototypes */
diff --git a/x11-plugins/wmcoincoin/Manifest b/x11-plugins/wmcoincoin/Manifest
index 83dc8187dd21..1810371208fd 100644
--- a/x11-plugins/wmcoincoin/Manifest
+++ b/x11-plugins/wmcoincoin/Manifest
@@ -1,2 +1 @@
-DIST wmcoincoin-2.6.2_p20140602.tar.gz 972358 BLAKE2B a30acaa7b20e88c1d2f4b5329f02321d6a7431bf22379e9d8074b48c1953bcd411b011097546b905f406e21f5de3e9057923109f0e63136cc19d5b5bdfbc47ef SHA512 ddf1b24d9c9021e9cb02817e80f3327074ef7d09ba7d8033d5d0c8b39a25106a1d54d32f211d31a910e2175d98bbda940f309cc137edd1b02b5a656891e89b2c
 DIST wmcoincoin-2.6.3.tar.gz 973973 BLAKE2B 4dcbb79ddb23c47fb891fde56137bb385ccf841eb54ce7a34cf060d4924d859a5a2ac40d504a26e763f1fe075796e09ec6a00a0080d214add2469db6b2f3a4d4 SHA512 daffd94387a03e780250877ae43e5431a7c0710862dd9fab04efc254e02e648215fa9c301bf1ed6d1a9ca5182a2a88d10ea4c385d92752d047492e6e9ad01d2d
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
deleted file mode 100644
index 0d0caa16bffb..000000000000
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.2_p20140602.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="a dockapp for browsing dacode news and board sites"
-HOMEPAGE="https://hules.free.fr/wmcoincoin"
-# Grab matching tag and Debian patches
-SRC_URI="https://github.com/d-torrance/${PN}/archive/debian/${PV/_p/+}-1.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls xinerama"
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/imlib2
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libX11
-	x11-libs/libXft
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	x11-libs/libXt
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-debian-${PV/_p/-}-1
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	EPATCH_SOURCE="${S}/debian/patches" EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama)
-}
diff --git a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
index ab96aa7eae23..e20acdfa4417 100644
--- a/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
+++ b/x11-plugins/wmcoincoin/wmcoincoin-2.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://hules.free.fr/${PN}/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls xinerama"
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild b/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
deleted file mode 100644
index 16e0b8b4f366..000000000000
--- a/x11-plugins/wmmaiload/wmmaiload-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="dockapp that monitors one or more mailboxes"
-HOMEPAGE="https://tnemeth.free.fr/projets/dockapps.html"
-SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.2.1-checkthread.patch )
-src_prepare() {
-	sed -i -e "s/-lssl/\0 -lcrypto/" wmmaiload/Init.make || die
-	sed -e "s/SSLv2_client_method/SSLv23_client_method/" \
-		-i wmmaiload/ssl.c || die
-
-	default
-}
-
-src_configure() {
-	# The ./configure script is not autoconf based, therefore don't use econf:
-	./configure -p /usr || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		DEBUG_LDFLAGS="" \
-		LDFLAGS="${LDFLAGS}" \
-		DEBUG_CFLAGS=""
-}
-
-src_install() {
-	dobin ${PN}/${PN} ${PN}-config/${PN}-config
-	doman doc/*.1
-	dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO doc/sample.${PN}rc
-}