gentoo resync : 09.07.2022

8 files changed, 48 insertions, 70 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 83360a5a8c10..f5be6a0eb592 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/gkrellm-countdown/Manifest b/x11-plugins/gkrellm-countdown/Manifest
index 30b0a130bb48..d990818f856e 100644
--- a/x11-plugins/gkrellm-countdown/Manifest
+++ b/x11-plugins/gkrellm-countdown/Manifest
@@ -2,5 +2,5 @@ AUX gkrellm-countdown-0.1.2-r2-pkgconfig.patch 476 BLAKE2B 7c55e464e84285c9a60c7
 AUX gkrellm-countdown-makefile.patch 1005 BLAKE2B 80711f28134b9241e5844a30e84a1bf634c9c75a880c1a5dfdad32e427b7e50d802c049a424086d6bed05d50a5bd5b8d39e31265c900d7bcdc5111a95301b6b7 SHA512 ae7ed8c952698b8cf23f99ce18abff865ed0168df42a3b9db54326131dbbbc982ef3490b93fb0e76b05cbb746b34fe43fb98a7b0d18e459e773b723a80bc8178
 DIST gkrellm-countdown-0.1.2.tar.gz 12482 BLAKE2B eb619cc1da6ef90f843ab2a30e24da63d90988e85b4d48e2425f9c69a77ee64e7eaa674a7bed79da202633037aa56d5dd1f3b1c3ac9895172eed11af4b507dc0 SHA512 974a885ed56ffa95d2b5972fd309721e0043e8798fc1289fbb34bfd0320ec78db7a0572f8e43eee922b2823a2aa80789b8d24fdf106074e683b218e731b6de71
 EBUILD gkrellm-countdown-0.1.2-r1.ebuild 575 BLAKE2B b87e4ff7307adc9a3e022ddfb3dfcb856107d75f33a4985133f1af3618664cf00aeec9bf018096f14c86771c42ac0dc56298b462b28737d4973e5f52a129518c SHA512 36d6c163872f5397c88e184ffbdfe4c9b9e86aa7e63f5f479e66d8fe9b66af2a859802f6850c6cc955ec02c9a49837cb1621857b287ff899757d87c237209520
-EBUILD gkrellm-countdown-0.1.2-r2.ebuild 660 BLAKE2B 9c6dda06ae935b993a547459a6b3a38760e0c9c55fbecf5f7941409353b4198a88a65b5db97dc047be29be83db97585b120bb7cd90a0ab0e740106ad93ba3aff SHA512 0b2b7ab84864381ba2a33bda6db5435bd57942625c95e31b7a8eb31fc957cbd5f1b58185e2028f1bf4f326ed5cee6d1aca821d0707adcd5551df340a7c01a7b6
+EBUILD gkrellm-countdown-0.1.2-r2.ebuild 661 BLAKE2B af2ebc12d5f527dd97204f806a0582c6d4d1dba5991b8fd38c502b417fae4764876818fded673aa917cb58cbc69f6ac268acaca7fd020ee061210760e21c4b29 SHA512 2c15caa6b77ecc76c86a340ac8bcccdfe9ccae867017fc3630f7f906996736300560ad48c9c6448cf650e2b02cad7547604e203816de0710198b0e8ef8388e08
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
index 29c9fb53247e..e67c4488f863 100644
--- a/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
+++ b/x11-plugins/gkrellm-countdown/gkrellm-countdown-0.1.2-r2.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="app-admin/gkrellm:2[X]"
 DEPEND="${RDEPEND}"
-BDPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-makefile.patch
diff --git a/x11-plugins/vicious/Manifest b/x11-plugins/vicious/Manifest
index 29cf84fdfd08..be47a2a44883 100644
--- a/x11-plugins/vicious/Manifest
+++ b/x11-plugins/vicious/Manifest
@@ -1,5 +1,3 @@
-DIST vicious-2.5.0.tar.gz 67557 BLAKE2B ffbc1b3c0e32b554cc367a51e5e17130e1b9f7fed2e8505aaa1845719ecd6d465d43ba839ac3a9b73a87e43ff3144c2074f3750d5f67b516d033a74144e9e12f SHA512 deb21587d1d7f2e6e4dd77c74abbfa337acf6c99ef9bebc0e505f1508afc6e3b03f043a639f866fcda0191447c103d3fba51376682201482fb669a263321dee5
 DIST vicious-2.5.1.tar.gz 68635 BLAKE2B fa952f878140e76a44bde98ab928fe2a01a12f0e931a4f8ee366acba584661a0e42b150d4f69bfaaf7c58c68d57d2e261d8b586fb1abbd329d9f30fe90c2e21d SHA512 63de92a4e7d666d5737bfc0f50857c48f40818e5f1cf81ba672284db764c68d151f73afd6507b7392b38ae91cf1d18104284618430d15dd8837c56a0283571fe
-EBUILD vicious-2.5.0.ebuild 2288 BLAKE2B 576843becc26c16e87d2fc743b520d4e6022ddb3769c80f89925913a27a71b7160a96828b5618eb06292c3f9bf88d08feb5f4f85f808252b5015a2e8859881a1 SHA512 4200bd3de2875e94092776ab32b2180679c335c319770a2c695677e83a179189cb541e4a33b23c911b5434cbda6629bf7a9674f8d9d5b9bc312d18617f5fb229
-EBUILD vicious-2.5.1.ebuild 2297 BLAKE2B bbe6480ede926414e834b4abcaa99148c7997249ff9135f2b9fc14cfefd979b4c9fa309c569cc59857c1bb42d23738101220d50c4665cd66a1aba18ae903e441 SHA512 d600533f7e47a305486730ee7a407fc0a435d93d9e05a5bde045bf298b9d13c8930eb1f376101549e14ee276ca36d460e15070d4703a8fbfade4cd22fdeb4dea
+EBUILD vicious-2.5.1.ebuild 2295 BLAKE2B 844ae18c7434ef399bacda6250b759d59a33ba42bec250ae29443c452fd4031d3cb512b675e4dad70ff1c375d361fd965cdc97f59de3a47c9542b9bf59858ccf SHA512 d1344f1233e0bed64f6915702d10f4ba67b454fec688b07a9461bdc68ee9bea673483ef497386ece4d41079e99c0f167a6bb705959bfbf61df4c103806def02e
 MISC metadata.xml 492 BLAKE2B 21caf589f9a40c2b9203b2a45a4f0b60c6ce52e78a8fec7173c1a8467cb92a4891c28e412324f5652d1fd17b3fb07780b800bac643c3476e5b2d962124f86066 SHA512 5882c4db0ceea18943171338a23ffe8b31431a63d255cac0ef3544a3a267699969f9a735b5cb30d834f053c4bd574cb5aaa45c991c1b919c986683d991aacdba
diff --git a/x11-plugins/vicious/vicious-2.5.0.ebuild b/x11-plugins/vicious/vicious-2.5.0.ebuild
deleted file mode 100644
index 31dbb976d373..000000000000
--- a/x11-plugins/vicious/vicious-2.5.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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 spawn.lua 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.
-	optfeature_header "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/vicious/vicious-2.5.1.ebuild b/x11-plugins/vicious/vicious-2.5.1.ebuild
index 83e8fe901cd2..be454b1fadb4 100644
--- a/x11-plugins/vicious/vicious-2.5.1.ebuild
+++ b/x11-plugins/vicious/vicious-2.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}-widgets/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~riscv x86"
 IUSE="contrib"
 
 RDEPEND="x11-wm/awesome"
diff --git a/x11-plugins/wmcp/Manifest b/x11-plugins/wmcp/Manifest
index d44a8f764506..dc16f7f4e971 100644
--- a/x11-plugins/wmcp/Manifest
+++ b/x11-plugins/wmcp/Manifest
@@ -2,4 +2,5 @@ AUX wmcp-1.2.8-gcc33.patch 2397 BLAKE2B faf1538bdd47573478ce79c71a9e273348ecccfe
 AUX wmcp-1.2.8-stdlibh.patch 321 BLAKE2B d32f57cdd8617ed1d511d0e2b3deca1513106bfa69b07a92b8485deaa356bb71e0b19d12e601193d8ac91bf186c8f3529e7679fd8f94f5a8e19abe297ec09ab8 SHA512 1fbc0c1a26539a989de20e4abc90663e52fa65cb4279e93e22f30b7bd818f6993eca69f5a6926e2d1d2fe76bdc9be1c5e556569dc2b335d6b308cd22c4726f11
 DIST wmcp-1.2.8.tar.gz 8673 BLAKE2B 28cad145f6c41829a740cbcef043fe54d940019ea42cbc6aebbc6b8022cf15c642f1c1dbbc0e34721442d4c3974224b498e436b5eae4ea30c766b2512f58939d SHA512 ac8db45800573810389d8103b5086966bd6bd5b03620338e736e05633fca570639d94e1ceaf24f882619f7de048c70e5ba9996849e0062407e32a74d971a3b01
 EBUILD wmcp-1.2.8-r1.ebuild 910 BLAKE2B 083ef6b3a652b095e9bb3494c047a45a18bdff3399eca7df0cffd97a5f336b90d5853b0d926f9fc4a8b9bab1742bf2fa00c2724d62cb671813545767b7532694 SHA512 b42de0d4f1524bd53f1c8fbdb0f0481f88de1b6d8fa9193f17046c0a5226fc73f82f9aed56a5d05be6079e5b4862ac595816a96c571c9188a64b1ee5b60fa144
+EBUILD wmcp-1.2.8-r2.ebuild 831 BLAKE2B 60f6d6dcc364788b3f22307b584ed49c6ee8510442d65c46a365fd08a6f5f6bb31b9faed53793bf767fc3dd069b58111e97e294e896a0711ef8b69680d5a8eb7 SHA512 4e45ef61c7432119d74c18659f430bb92285742103ff9e560f50288a9070afeecec4a30dec42d98cb6b652ea2be4eef6285d1309eba53a14cb46087ba8953d41
 MISC metadata.xml 250 BLAKE2B 3d69a837b82fe334630573d6bf123718a3eac254377bc2ca86a2268f210cbcef9922db631e91954bceacc28828b54ad567d0568a4df655545ac56a4a54151d76 SHA512 ee587c14474743ca118c5468d1cd04ce5e3533ea29550ae74a7d517f092c895fa18c7edc7e9ffe7757b62c214dda7abf5352ee838a6dbd7d1079d60d2762732f
diff --git a/x11-plugins/wmcp/wmcp-1.2.8-r2.ebuild b/x11-plugins/wmcp/wmcp-1.2.8-r2.ebuild
new file mode 100644
index 000000000000..ead6e103b837
--- /dev/null
+++ b/x11-plugins/wmcp/wmcp-1.2.8-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A pager dockapp"
+HOMEPAGE="https://www.dockapps.net/wmcp"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc33.patch
+	"${FILESDIR}"/${P}-stdlibh.patch
+	)
+src_prepare() {
+	default
+	sed -i \
+		-e "s:gcc -g -c:$(tc-getCC) -c:" \
+		-e "s:gcc -g -o:$(tc-getCC) ${LDFLAGS} -o:" \
+		Makefile || die
+}
+
+src_compile() {
+	emake INCLUDES="-I/usr/include/X11" \
+		LIBINC="-L/usr/$(get_libdir)" \
+		FLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin wmcp
+	dodoc README
+}