gentoo resync : 06.12.2017

4 files changed, 26 insertions, 44 deletions

diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index e2418c112b0f..e26c18aa4f85 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,7 +1,7 @@
 AUX fix-wmix-3.1-version-number.patch 277 BLAKE2B 344d33c8cfd6dc439390269e47bde9729fdebd2fe3d25f95839e73e409e864195abbbcc1fd696a242c8c7226dca90c8cd8b391e62c5d3bbc55a9bb07e4358a09 SHA512 0673934f4fa85cb88d995eaf37a79e64bb06b4909a332fe6a52b9991bb5825cfef65cc0a74471a9f5b232e9ed9fda3a7135a1790f297c66a47851dddeca8f29c
 AUX wmix.1 1969 BLAKE2B 9599e110ef1efcfb1582749cc58355f5d055920f5d1d0834073bd161af65cea300c100a9cd64ef65906842858da0e4539527a0c448616228280f7b283bf2a29a SHA512 3937513506295543cef1a12a0a739f4923e2fe6500436433969351547493b712c891ac41ccf627a325eaf03c8552cbe6cac0cedc3ba3548a26c138f4eec084d6
-DIST wmix-3.1.tar.gz 21344 SHA256 4b2a042768a685ed8d30e6a7ed6bd4e13022665c9d772545654c89ec1437e322 SHA512 ee612df2b6c8b6137811776d91552ec1c4a2e3e93f683da709ac4e6d139ce43dbd76be9d750c8955b933ad5910fa2efd2d0cd3afda1b026948065362fd158f3d WHIRLPOOL 8f5643cf501311d6b6bfb496dc5f78a8ee86cd411ef4ec5071cab905dabb167ace67cb0acd273edc76699f46bb8948303c1071f5acdebc7f829b838fe259c8d9
-DIST wmix-3.2.tar.gz 33504 SHA256 6912949cfa654aa2721cfcda7cf6544f631ec1f987ec2495524c2279fcb41014 SHA512 8382ab849aeacfc88d28cd094c0d9a3218f8aa26b763d9fb4fd8b9837c275a835cc3e29df0659c244fa94b884ebc36b571fe824eaa785a736e630dc2e0081417 WHIRLPOOL 2d23a2833de8c78063a3becb3931d238cab690a2b5f0620c88528cf14a9a33c1960106933a136a3289c406773387f849c6f172ed52fde92f192e6099b977b937
-EBUILD wmix-3.1-r1.ebuild 803 BLAKE2B 3406a90bd73b0ddbbf33fea8c52f31dfe47693d99c3f5ed82d80d9f0e8a3e5a6ec6b1e54fbf2e46e72be570727231402faf591d39afe5c43db5aaec10a502b54 SHA512 a8721e2065047f2fd1edef6f9cf4427c8178c788c4315a1306abcb65b6de83a2375cd9bb661b664268ed50cb5a66fce43597ccc693e095046475a7267f0342ab
-EBUILD wmix-3.2.ebuild 700 BLAKE2B c1405bd86b5eae9a19dde3a86b5c123e0bc6ad251409816fcac32391308171ea2fa49d02e6fcfa71ec6ffcbd5e83e00094433004367b1b69ad4cbaf9862aea38 SHA512 6932cbe55d67e60cbf03db11339b0a901e73ccf4f9331134b452a529518fab5c875f8cd0425a8a85cecfb5e3d4f02aad4b9a4184341e20043ee0bfb5238aa3a0
+DIST wmix-3.2.tar.gz 33504 BLAKE2B cafc6d4d1d52094edc459db8ab82b46ea0a216ca8035a2882be7ab2dba6945c155a73c2fc3601e9697076f8cf032b7943617680fd70ef889590a9976c2b147a8 SHA512 8382ab849aeacfc88d28cd094c0d9a3218f8aa26b763d9fb4fd8b9837c275a835cc3e29df0659c244fa94b884ebc36b571fe824eaa785a736e630dc2e0081417
+DIST wmix-3.3.tar.gz 118037 BLAKE2B b219f607ea31132b7753ba7e92e7ff3ce1ddbb992a3f0295ca68001ee81c55ed347196b2d864058f09763e6cf438865060a768c466f3f647474382a9434f76e8 SHA512 5bca1ca70ba8e76e66d70dd01e2198d85d7ac57a5180740c453f349458ba38291bbb7a87697a25c36b79722a1ada5edd1ff3f1c9021998cdf33d248a1f554d4e
+EBUILD wmix-3.2.ebuild 669 BLAKE2B 568b56b6737621a8030f9d00b9cfd8100aad4615f5fa9665b81f9d1bdbc45d31292b497a85e763ea44915655749e20c404834007572714ad4f57354879c3bc1d SHA512 c151de7d0e8bbbff9f4e1d1e9bdd088c1a063f4eca3fb67fb41f1af20d70e1684cacd474f484e0afa73ad43e67274810115000f4ebf32ffe2b0f0919ddbad32a
+EBUILD wmix-3.3.ebuild 448 BLAKE2B a8a7c86f17640d4b1b9d1c13edc34e05d34c6c02274ad23df1e8cc5a2bc20e41710f605168d4ab5096f03610c4d53b6cc5779080bd0aec22804b12fae0f56038 SHA512 c67368b6ff535c721d5380dab72b340511a5e4556c0c171cc756b7dbdfc1313a2edd38d45471c6eddf5319fe6da0dd827d73467fb74ea3392af75faf70cf28e9
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmix/wmix-3.1-r1.ebuild b/x11-plugins/wmix/wmix-3.1-r1.ebuild
deleted file mode 100644
index 6ab73bed47b6..000000000000
--- a/x11-plugins/wmix/wmix-3.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Dockapp mixer for OSS or ALSA"
-HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${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-proto/xproto
-	x11-proto/xextproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/fix-wmix-3.1-version-number.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	doman "${FILESDIR}"/${PN}.1
-	dodoc AUTHORS BUGS NEWS README sample.wmixrc
-}
diff --git a/x11-plugins/wmix/wmix-3.2.ebuild b/x11-plugins/wmix/wmix-3.2.ebuild
index 83ccc09bcae6..e5428112def9 100644
--- a/x11-plugins/wmix/wmix-3.2.ebuild
+++ b/x11-plugins/wmix/wmix-3.2.ebuild
@@ -6,7 +6,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="Dockapp mixer for OSS or ALSA"
 HOMEPAGE="http://www.dockapps.net/wmix"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,8 +17,7 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-proto/xproto"
 
 S=${WORKDIR}/dockapps
 
diff --git a/x11-plugins/wmix/wmix-3.3.ebuild b/x11-plugins/wmix/wmix-3.3.ebuild
new file mode 100644
index 000000000000..a5e13b90b376
--- /dev/null
+++ b/x11-plugins/wmix/wmix-3.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Dockapp mixer for OSS or ALSA"
+HOMEPAGE="http://www.dockapps.net/wmix"
+SRC_URI="http://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-proto/xproto"