gentoo resync : 18.12.2020

4 files changed, 2 insertions, 63 deletions

diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index ae22999b1da1..6123ce3075c3 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,9 +1,5 @@
 AUX wmix-3.4-gcc-10.patch 3584 BLAKE2B 4026aa39e88ea33625e37995607845b710c5150b8a3afc5d6142bf127cd17216a9843a6e5ce1913e5698bd6488ce1d009abfee20e25a9818c770dacbd55031ce SHA512 b79b3bfc92682e49ad2d45d97c21bb1d97d40db42de242049a6567507b9766e37a7f5f438ebe16b09b29ddca18391dfee8bba67888b817f71e1b9ce1da57f2f6
 AUX wmix.1 1969 BLAKE2B 9599e110ef1efcfb1582749cc58355f5d055920f5d1d0834073bd161af65cea300c100a9cd64ef65906842858da0e4539527a0c448616228280f7b283bf2a29a SHA512 3937513506295543cef1a12a0a739f4923e2fe6500436433969351547493b712c891ac41ccf627a325eaf03c8552cbe6cac0cedc3ba3548a26c138f4eec084d6
-DIST wmix-3.2.tar.gz 33504 BLAKE2B cafc6d4d1d52094edc459db8ab82b46ea0a216ca8035a2882be7ab2dba6945c155a73c2fc3601e9697076f8cf032b7943617680fd70ef889590a9976c2b147a8 SHA512 8382ab849aeacfc88d28cd094c0d9a3218f8aa26b763d9fb4fd8b9837c275a835cc3e29df0659c244fa94b884ebc36b571fe824eaa785a736e630dc2e0081417
-DIST wmix-3.4.tar.gz 116220 BLAKE2B 01aac1603c34298d9b4aa45ec3425ec52e75965634f6c64ae554c44b95a9bea08021527519fe15729f103d2b8aa93757d6dbabbc2223b35cbb37520554fdfa2b SHA512 791e0f22c73d48fd97ce59a0a8d740a2647626fd6d5f172238ae41abac700fb40d7cd95e28463199fd20d14eae3807428949b78c095ee5bd0a347c26aaed1e75
 DIST wmix-3.5.tar.gz 118052 BLAKE2B 54461c59d46a2ccf7f81aaf422b9e9fadf260001621396543deb996cb346a1dea5d100b38517b79974acc4d429d6a2f4fcde10e88d114e9f6978d1c0bb599d2e SHA512 ca702368cd5db55958e5f25c9703bf6659987534795fe58fd1ade426220f468ae3979e98ed1a00ffa162b094e53e37974d626a6bc48e2f6099c8c6eaa1f3dfd6
-EBUILD wmix-3.2.ebuild 674 BLAKE2B d7c082f0d5e54415ea880d0ddc08695fdecc7bb4db3916dad02069579cd7aa1101c5f2b2764e3f5a498a9e99e45d4d13758f43e3ed9e1a26bf2b72ca92616b57 SHA512 74e06a9c9b2007284e8688192c60880557208aeab1c23bd0f45ea1470b6f24a0588166ecd24ed1d3660679dca0a2ae808cf7e35ef2b37049d2ae804e1e1cf444
-EBUILD wmix-3.4.ebuild 536 BLAKE2B 940782ea3a564f33dc211a4e880a74801081d1304372c713712ab7a6e609746a382f901aff04d71994e85ab867d0f40d3a8370a76dc45365f6f535c4272fd540 SHA512 b6c13bae7f0b28fe25f37a1fbe162387fe6883e38f9c74f65ef0dbbe6ecb6e1f9045ca8d73110ad8ee33f16779f513078e3fee572fdbf66da5f4a1913b5c6db9
-EBUILD wmix-3.5.ebuild 465 BLAKE2B 02456642bd0df0a9a600774a4e1f70dbe42297406be6bac10a412d28dc6e12d2aaf1063c4ee494f57095820d8ba949e28c090ffdd2e427f50beb48aa708469e1 SHA512 d396802d7ffc74cc7ecbc0d40f205fb9bceb9406e2035ca256e33a69a89528b1df20862975f3e3446b9d8a7ef30624a8c375e138dda480f6baef5a57e91d3a47
+EBUILD wmix-3.5.ebuild 464 BLAKE2B 9b62dfdefe3e991b5f1a22a3a917efea9a4bbd62ce2b70b7f5f892ec3b71367f4ee0da61e78553746f12a861641a8175369b59aec668f23ec50a8227df1281d5 SHA512 b0db10b4390d024a7a4fb222bd0bd3e14c3b13281950b43230279a4e4b06e9d334a4cd95c58ee4ec72b7f9c67199cc00465b04109a089f9588e83cdbdd9f408b
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmix/wmix-3.2.ebuild b/x11-plugins/wmix/wmix-3.2.ebuild
deleted file mode 100644
index 6164f74253cb..000000000000
--- a/x11-plugins/wmix/wmix-3.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Dockapp mixer for OSS or ALSA"
-HOMEPAGE="https://www.dockapps.net/wmix"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/dockapps
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	doman "${FILESDIR}"/${PN}.1
-	dodoc AUTHORS BUGS NEWS README sample.wmixrc
-}
diff --git a/x11-plugins/wmix/wmix-3.4.ebuild b/x11-plugins/wmix/wmix-3.4.ebuild
deleted file mode 100644
index 5f69dde7b3ac..000000000000
--- a/x11-plugins/wmix/wmix-3.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Dockapp mixer for OSS or ALSA"
-HOMEPAGE="https://www.dockapps.net/wmix"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc-10.patch )
diff --git a/x11-plugins/wmix/wmix-3.5.ebuild b/x11-plugins/wmix/wmix-3.5.ebuild
index 1853696d8c69..c0b6a38e180f 100644
--- a/x11-plugins/wmix/wmix-3.5.ebuild
+++ b/x11-plugins/wmix/wmix-3.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND="media-libs/alsa-lib