gentoo resync : 06.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-06 18:23:20 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-06 18:23:20 +0000
commit: d37b97a25b8b10f748eead6574b01f893f140b01 (patch)
tree: 13e2a142a31cd193a39c63042a64cab29a1f7ae9 /x11-plugins
parent: a833e3f4a431b8eea751b7420e127787f9c92117 (diff)
55 files changed, 240 insertions, 744 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index e6c4e6a96b11..7f4e12a962f7 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/wmapm/Manifest b/x11-plugins/wmapm/Manifest
index 78c0f42ccfbe..46c7ed483983 100644
--- a/x11-plugins/wmapm/Manifest
+++ b/x11-plugins/wmapm/Manifest
@@ -1,3 +1,3 @@
-DIST wmapm-3.1.tar.gz 28321 SHA256 5ba382c2ba301e45faa1d53a3e2582afe37fe039bfd3a7080d8c3930f4608184 SHA512 478edf6b48d4c44017f5f2d50efc7e757b33b14d283dfa062dcf2084c9bffe1e7624651dfd22236a98ca9aa49306849cabd1a1fd09d1d3f709e715cf0fa2f84e WHIRLPOOL cb1781ac5e7d58286066a731141e4f1852301dea0730e22704038081d854fdfd01ba5627f0069fe06a8ba4ddc56fd544f77940ec7c7f508c12640c96c420a9f1
-EBUILD wmapm-3.1-r1.ebuild 837 BLAKE2B bbc7ddd47cdd78f556a101b8e53707b2b62a42196964c8fd1e624c39f9092ec53679e10649603095dd02ad7ae95bac89f8b3940b786b819bc18a450b68450b9a SHA512 fd59959217b2aa4ba26a13e431993b4de5194a386653ff48fd60c62a46336c00aa6654312d58ecc878986e490f03a7db3d50a3a57374a9e35ab947cb231bc003
+DIST wmapm-3.1.tar.gz 28321 BLAKE2B 13373f675bb2561c6034268d4afab12bfb6b5ef99da7fd975842392519a8f87726455e807baecc29f15403a0c711228be8513125def3b32b36683dd386b91f54 SHA512 478edf6b48d4c44017f5f2d50efc7e757b33b14d283dfa062dcf2084c9bffe1e7624651dfd22236a98ca9aa49306849cabd1a1fd09d1d3f709e715cf0fa2f84e
+EBUILD wmapm-3.1-r1.ebuild 802 BLAKE2B 21a1750ccb06bb2926acabe64024dcfa964eb0e7a813c349793577b83b853a1b1fb54d5fa4d20b61fb09e7147de710889d9d859eec333d8fd61f43d4cac12683 SHA512 eb2c852ce570ee1b6f9d456a2c60fee38ed2d5a9958b8b2f51c528b5af4aeae90d5b1ae80330d12a9e933b414a13821ceeb644811f5fda4d6b92b98caaccd850
 MISC metadata.xml 586 BLAKE2B 1cab619da94bf64d9919cad5164f23e03fbb7b1a503e6012a7c99701291dbc9e842df5f28327cb67135bd86f3ea4c6c4f622610eb45dd3cb004b2610baead1f1 SHA512 e0ccbf5129fce75fcfb4ead8ab9d90403a12647541517f1ca62e75f029d63e0e50c805714189d411eaf146d559c011ce194c6f3e79904e14222496e9d3d4b0ad
diff --git a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
index 71928663a0b1..1abd7fbbcfa8 100644
--- a/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
+++ b/x11-plugins/wmapm/wmapm-3.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 DESCRIPTION="WindowMaker DockApp: Battery/Power status monitor for laptops"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/25/${P}.tar.gz"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/18"
+HOMEPAGE="http://www.dockapps.net/wmapm"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmapmload/Manifest b/x11-plugins/wmapmload/Manifest
index 631c060eae38..fe8d43786aff 100644
--- a/x11-plugins/wmapmload/Manifest
+++ b/x11-plugins/wmapmload/Manifest
@@ -1,3 +1,4 @@
-DIST wmapmload-0.3.4.tar.gz 91667 SHA256 a545ebf0b4fd6d34f074cbddc7c0fb2c4f1f068d86053acb79895bf565ce2df9 SHA512 8e7e879c9f7bd4ac976c63ebc50232c0123621118c22c96803ced86ee4d0f934a75369cc5949e5b11402db02f57b527a32e5c5db16a8002cccdc0a2a4dc3904d WHIRLPOOL 166d513a01441c558c83ef4b917f4f0ffbf3688097b74879ff018bf6a8d08855c5b7e99a05f0d1fb7fdcb375accae92ea961508a4d491d0097a879dff0dd6468
+DIST wmapmload-0.3.4.tar.gz 91667 BLAKE2B 09fc05c918456d7e6654980181124da3caee3e9e1585501a4baa1d6f9d3eff0e5bb9a4173dc73bcdb3e4cf2072abf06b4da6019da20ceea8ecec1d544943acfc SHA512 8e7e879c9f7bd4ac976c63ebc50232c0123621118c22c96803ced86ee4d0f934a75369cc5949e5b11402db02f57b527a32e5c5db16a8002cccdc0a2a4dc3904d
+EBUILD wmapmload-0.3.4-r1.ebuild 456 BLAKE2B afa699a15b2255e8419083c6e7856851ef9853a1a765a1cb47a23b1e6b2fc9c14ed98d4f84d6ea16aff53ca7e6bd44c73e16b7bcd05cfb941e2735c76646c9b1 SHA512 15011d76b95f80e4d6c29612fe4426a8b7f2b449f8679bcddb9ffff6aa62dd49f6f02dd5ff57d6b771f4ef42bcefbbfe72f5bdef71b91ea127e123284e3aa4e0
 EBUILD wmapmload-0.3.4.ebuild 556 BLAKE2B fb90ecd9f87fba4071e72a3e9f3c8807b5538e8122217d708c1eb7c0bf3dc4e0a41711244a32ec8103c029513aed4e84ab8d8d4472ba6c236267af765d31978c SHA512 ef09f10e5f7a1d355d4e237d59d4bebe2515dbc30a12c315536c78c2a9f1efc36796d08aeae8d8cff89f74f99ea5033f76a04d0fbf5c5398edf66937a9fa0aac
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild b/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..df853cec2229
--- /dev/null
+++ b/x11-plugins/wmapmload/wmapmload-0.3.4-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="dockapp that monitors your apm battery status"
+HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
+SRC_URI="http://tnemeth.free.fr/projets/programmes/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
diff --git a/x11-plugins/wmcalc/Manifest b/x11-plugins/wmcalc/Manifest
index ab00496a3242..39481f834be9 100644
--- a/x11-plugins/wmcalc/Manifest
+++ b/x11-plugins/wmcalc/Manifest
@@ -1,8 +1,3 @@
-AUX wmcalc.man 4751 BLAKE2B 5bd6e34a49d385ac0c0af1b700f00e4f6173bd71563e0d9a857450b3d1862fbdf2b1ff1f79d0204aa23f87d8db6f863e0df6070f234d041e8445078233bb7f3f SHA512 df384bdd6e30f76c6d9c45066e0b49b503d13be587f6e385d2024f5850d66385fdbbb29a06ed9c2da718a2c74e29880f3402d79e25488fd35a6898623e395ad0
-DIST wmcalc-0.4.tar.gz 42694 SHA256 944b69ce2e5489dc0ec78fc02d4da26af2102a18300eb3607c3a5de4b97a384a SHA512 2a7ff3c2cb50dec2a5961a16832f09571d2096849a16d8d97b21a8b2dbce98e7061b974d8ffdcfd555e25e63fa76690e3af794006f74bb4d44b3f0acd8a19fbe WHIRLPOOL 38dd6d2d4eb49425099b6976fb71b7edbdae8be9f2dbf92effdb312b7c2d54e3398fc3a61e1f44f4f698d9af349f062ffd3d18b7aeebefacd14921356fcdb7e6
-DIST wmcalc-0.5.tar.gz 43834 SHA256 da08429c045ad4434158c852b3db97be06bcef2c42bafac2749821cf0b015e35 SHA512 750f7e74ff60ed61a18e96ca6ed6347be77bc559384911f701a214e5db19d15178eb0a68b7abd0f91369287910b39e0a7d18f24adedf045d9d536e9b084b53f3 WHIRLPOOL 1d2ba999fde06bda49c06cd65ba1f5f0682a700e10d1854ce8aacaed96507067217dce70c533ce074351270973c17870479a12d6319f4ad7750483d6d627fd0e
-DIST wmcalc-0.6.tar.gz 45386 SHA256 32c0e4ae02600f1b7ea3c88ac385c099cf5ee80e10b097d654a016f433b9a36a SHA512 00be5e0ef62c9a47b4f09d640826f144eed3226e8a1471df4e80b54cd0f7d7bb9ff3fbac94355529646673ebe665f9226aca7dd51581d6c6775e2dc5a913501b WHIRLPOOL 353a9cc8d9d9ed4eba157a918552e8a1fa3d4ef8f0584e2a0f13dcbd81959ffb3d0713030eb44f8b7dddbd18dc708290e509be65b9e2e047383ff498bc10b201
-EBUILD wmcalc-0.4.ebuild 990 BLAKE2B bf7235b7ea22fc06fab2048188440e06294678cec70b407908fc2de2b91fddb3b182012cfc48cf33b62a6e042f9a448f2ee6e6906fd5ee4b5ec47f4211711349 SHA512 64ee40e6bfec176af67127fdc9fdae6001581302fe27855e0518691b4ac5a01c9199a646626173eb237b3811dea37e03a741b8af5e7b787ad48384d1fbb70f23
-EBUILD wmcalc-0.5.ebuild 707 BLAKE2B 5f58a9dd83dba46a33562a4da1bae8dd06aa3f8e9be347e1ceb28f4490e05580a88e6d31ca1daa57fcc91b3817d460cb483ebbee26e4eeac00062a5c1080eee7 SHA512 dd7900654aa0501397d12a5e2d6e80304b8cf573d4e5de73a76d440a2ef742ecb010b3cc86bc40711c5d1d80ec45150c93a9c4e1a82ad39ae4ce975d25379019
-EBUILD wmcalc-0.6.ebuild 604 BLAKE2B 811990ab0e1980839d54125a0016d8c26f5f07a205cde96dca62a2ba7ee852c398aed1bbbac8c4ed25d3a8cf153eee79b6ea3e799d715681d4e46e241405ce12 SHA512 1d460a36de92ff152996df2b28a8a760ede5347f1f267920f3dc4b522efb51a9fc44ab78707f00fe78ce7b541badd313aeea5ca64ed697776580a4dd091059b2
+DIST wmcalc-0.6.tar.gz 44250 BLAKE2B ddcc90bb9d8cf203e1c24b73ff5556d7d11265eaaa93d70908c4e300cbd91bf7fbdca87b67bbd07d7e95439c5326c4853c60d80cfc3401507968fb80b2dd3bb7 SHA512 bdde94f44462733bfede021329b44f21d377fe8a6089c1c457d71f35481b8a01918d92aa79f60d47c791ddf8ee2a9abdb4185ab30584afba558a289a3e786841
+EBUILD wmcalc-0.6.ebuild 652 BLAKE2B 9f207f66f9d1863c71f71b00c86141f02360db136c005f5e46a6bb7b30b6f44cf664fb71ab7d4f053ba7cfbf0ecc018ac31a634a1a0fe57cc405a4be3de372a0 SHA512 a4c7a74378a1573ba81f46dd008523ec6e0b08bf43de9dedb008193a61cb73454ad96d7eb827a9c2cf824cc51bb44b36bfe17c716ee9ae2e15d54f0f2e942332
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcalc/files/wmcalc.man b/x11-plugins/wmcalc/files/wmcalc.man
deleted file mode 100644
index 4485d57c3fcf..000000000000
--- a/x11-plugins/wmcalc/files/wmcalc.man
+++ /dev/null
@@ -1,117 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH WMCALC 1 "September 20, 2001"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-wmcalc \- dockable calculator application
-.SH SYNOPSIS
-.B wmcalc
-[-g \fIgeometry\fP] [-d \fIdisplay\fP] [-v] [-f \fIconfigfile\fP] [-h]
-
-.SH DESCRIPTION
-This manual page documents briefly the
-.B wmcalc
-command.
-This manual page was written for the Gentoo Linux distribution
-because the original program does not have a manual page.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBwmcalc\fP is a program designed to act as a simple calculator offering basic operations like addition, subtraction, multiplication, division, square and squareroot.  It is different from other calculator programs, however in that it is designed to take up very little desktop space.  As such, it can be left running on the desktop at all times.  It is intended to placed in the WindowMaker dock, or in Wharf under Afterstep, though it should run as well under any window manager. 
-
-
-Buttons are defined as:
-.nf
- ____________________  
-|       x00          |  x = 1 for Left Mouse Button
-| 0 1 2 3 4 5 6 7 8 9|  x = 2 for Middle Mouse Button
-|--------------------|  x = 3 for Right Mouse Button 
-|x01 x02 x03 x04 x05 |                
-|x06 x07 x08 x09 x10 |  Note: the numbers 0..9 are the
-|x11 x12 x13 x14 x15 |         indicators for memory cells  
-|x16 x17 x18 x19 x20 |         0..9 respectively
- -------------------- 
-.fi
-.TP
-Button Functions:
-.TP
-.B 100
-Reinitialize the calculator. (100 = Left Mouse Button on Display)
-.TP
-.B 200
-Clear all the memory registers (0..10)
-.TP
-.B 300
-Clear the current number being entered only
-.TP
-.B x11
-Start a program defined by CalcStart variable in config file
-.TP
-.B 1yy
-Perform function shown on button
-.TP
-.B 2yy
-Recall number from memory location [0-9] to display for calculation if yy = 2,3,4, 7,8,9, 12, 13, 14, 17 otherwise, can run a user-defined function (not implemented)
-.TP
-.B 3yy
-Store Displayed number in memory location [0-9] if yy = 2,3,4, 7,8,9, 12,13,14, 17 otherwise, can run a user-defined function (not implemented)
-.TP
-.B 1xx
-Hopefully the other functions are obvious from their button graphics.
-
-
-.SH OPTIONS
-.TP
-.B \-g <geometry>
-Window Geometry - ie: 64x64+10+10
-.TP
-.B \-d  <display>
-Display -  ie: 127.0.0.1:0.0
-.TP
-.B \-f  <filename>
-Full path to configuration file.
-.TP
-.B \-v
-Verbose Mode. 
-.TP
-.B \-h
-Help.
-.SH FILES
-.TP
-.I /etc/wmbutton.conf
-system wide wmbutton configuration file which will be used for all users who start wmcalc the first time.
-.TP
-.I ~/.wmcalc
-The configuration file (.wmcalc) is written by wmcalc whenever the user requests to store a number to memory. This file is automatically created the first time a user launches wmcalc with /etc/wmcalc.conf as template. As a part of this process, a file is written to /tmp. If /tmp is not accessible, it tries in the user's home directory, as defined by the environment variable HOME. This file is erased as soon as it is written over the main configuration file.
-.SH CONFIGURATION
-.TP
-The configuration file is case sensitive. A # starts a comment, and lines consisting entirely of whitespace are ignored. The syntax is simply:
-.TP
-.B <variable> <content>
-Where <variable> and <content> need to be seperated by a Tab \\t and \fBnot\fP spaces.
-.TP
-\fBmem0 - mem9\fP Calculator Memory Locations. These must all exist, though they may be in any order.
-.TP
-\fBCalcStart\fP The CalcStart variable is intended to allow the user to start a larger calculator for more complicated needs.  Everything after the tab '\\t' character is sent unmodified in a system() call, so anything you can type at the command prompt may be put here.
-.TP
-\fBImagChar\fP The ImagChar variable allows the user to choose between 'i' and 'j' to represent the sqrt(-1).
-
-.SH AUTHOR
-wmcalc was written by Edward H. Flora <ehflora@access1.net>, and is licensed under the terms of the GNU  General Public License.
-.TP
-This manual page was written by Gordon Fraser <gordon@freakzone.net>, for the Debian GNU/Linux system (but may be used by others).
-
diff --git a/x11-plugins/wmcalc/wmcalc-0.4.ebuild b/x11-plugins/wmcalc/wmcalc-0.4.ebuild
deleted file mode 100644
index 1ac5879a3c7b..000000000000
--- a/x11-plugins/wmcalc/wmcalc-0.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="A WindowMaker DockApp calculator"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/130"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 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}"
-	sed -e "s:gcc:$(tc-getCC):g" \
-		-e "s:-O2:${CFLAGS}:g" -i Makefile
-
-	#Honour Gentoo LDFLAGS, see bug #337434
-	sed -e "s:-o \${TARGET}:\$(LDFLAGS) -o \${TARGET}:" -i Makefile
-}
-
-src_compile() {
-	emake INCLUDES="-I/usr/include/X11" \
-		LIBINC="-L/usr/$(get_libdir)" \
-		|| die "emake failed."
-}
-
-src_install() {
-	dodir /etc /usr/bin
-
-	emake DESTDIR="${D}" PREFIX="/usr" install \
-		|| die "emake install failed."
-
-	dodoc README
-	newman "${FILESDIR}"/wmcalc.man wmcalc.1
-}
diff --git a/x11-plugins/wmcalc/wmcalc-0.5.ebuild b/x11-plugins/wmcalc/wmcalc-0.5.ebuild
deleted file mode 100644
index 31a94d093b46..000000000000
--- a/x11-plugins/wmcalc/wmcalc-0.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="A WindowMaker DockApp calculator"
-HOMEPAGE="http://www.dockapps.net/wmcalc"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S=${WORKDIR}/dockapps
-
-src_prepare() {
-	sed -e "/\$(INSTALL_DIR)/s/\/man1//" -i Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	dodoc README
-}
diff --git a/x11-plugins/wmcalc/wmcalc-0.6.ebuild b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
index 31d47e540fc7..cce461c7828d 100644
--- a/x11-plugins/wmcalc/wmcalc-0.6.ebuild
+++ b/x11-plugins/wmcalc/wmcalc-0.6.ebuild
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A WindowMaker DockApp calculator"
 HOMEPAGE="http://www.dockapps.net/wmcalc"
-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"
@@ -19,6 +19,9 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+# Specific to this tarball
+S=${WORKDIR}/dockapps-43ddcdf
+
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
diff --git a/x11-plugins/wmcdplay/Manifest b/x11-plugins/wmcdplay/Manifest
index 028e73355440..edc1d4870cde 100644
--- a/x11-plugins/wmcdplay/Manifest
+++ b/x11-plugins/wmcdplay/Manifest
@@ -2,8 +2,8 @@ AUX wmcdplay-ComplexProgramTargetNoMan.patch 212 BLAKE2B 208b970f3644572305d5025
 AUX wmcdplay-c++.patch 264 BLAKE2B 663a5700f8028720a7e698cf152b4b8b529bdd5d78e67df21e16abb096a0fd2cd952810db6f97e6881c337a2483005c23c41b5a668bb342cccdd15688c999da4 SHA512 60871d84776ed0f5f39b227fb7d8b8eeffc1a7a8bd17766dac44cf33908ef1e46df5fc04c20f7eb622b62357f5160234dec713c370395e72504344268ee66c86
 AUX wmcdplay-xpmdir.patch 271 BLAKE2B 1826482d05b36892d0e2b29ed2e9117b44e46017356eb0cc43b067f80f69989db2e244b668298a83be0310cdb33e67f31864acd7dc25a9f1ba69ab5d307d28f8 SHA512 808b90eb7ba8ced2ba5e003027fd1d50ae3013c08bb731cb8008e4f2b99a25c06d33bb8c96ece488f76f7caa3354f4d08e98f973f80ec6f156d05bb47d05c748
 AUX wmcdplay.desktop 178 BLAKE2B 74f1f10064d6e3e1738bb21b135ba479ce2bec97e084d4d3b402b823abbeb6db9b0590c2e12c427661518f099c478f7de35b161d788d01359053bed88224d69c SHA512 54e48ca979d5348e58b7b7057665dab9ff1429be534ea2dee970900c14b853ba9616487ff27500bf4a28145ca2b8809b4d6fffebbc99ac684238fa708a946293
-DIST wmcdplay-1.0-beta1.tgz 31919 SHA256 20f0421b0e7ad6eb413b839ca940dd6e3409a37194f27e5534511f5a6b09039a SHA512 bf771e7b8e46096514dd2060230238cb6875ee36e473b8339650026276b97a83ee6862bcbf55ae8c06e55a5f7070d856e9158154a59778199de96b9f8e5116e0 WHIRLPOOL 3221411c66c3590bc6b76e02bc8461b81b44fd1ba118d0de116d948ada48bce20cf61078cd409f67b504106033cd6cc8a90a2bdf8ff30398e25c98cb3256bbd3
-DIST wmcdplay-1.1.tar.gz 32079 SHA256 5d1cfdcf96a1877d4120109c25b7a9068fb76703e418f73f4cc3696920e51833 SHA512 bf655b7e4ce986b3085410b2a8f3646db0376478f37bec0828fc6f8ed60627037e331ed122f1ebbcb010b7d9b7659a7bc6e636c66f47ec654091daac3a463e14 WHIRLPOOL ddaa2177ef6c6aa5cd6dcd985eba7069ef63ef5d9fe9ee332022e2c1433ce946c9329e188585cd8270c6196469332835146e89a34627e0dff78b63e26b482e07
-EBUILD wmcdplay-1.0_beta1.ebuild 985 BLAKE2B 1a7b4d2a6c791c67420ae3619e7e3b58ac91d4d0322ba215b31f7215cbdba39fcd2e43178c61826d5f174df332a0d336ad3376d8dda0b8dc7bcb296f4f5462e2 SHA512 9cade38113758312337f294c20c375adc29ae4c7d9769af7e39468b73a0316ee6a1e320fa96c00e8c9590b1541f4f13232da1b5e5b730b06f128a5930e5d9d94
-EBUILD wmcdplay-1.1.ebuild 615 BLAKE2B 9f16dab0a7e19d0e09155fa0efdf428f0c646ec684583d93a6a1c4ec47062ad6cb9a6959cfb37bada1688ff3a917e298c1aa380c3d637ff3d05a97bfadd6c69a SHA512 07b80794e35aa0b58f44c773091a0ef9f637199d81b658bc61030840c93b6f8f44a81d293b78c6890a24c25d8c69a059d060b1a662d7bb5ef855fb89b941f01f
+DIST wmcdplay-1.0-beta1.tgz 31919 BLAKE2B 4c2654a13670a892e159c3ad5f1460e8228d76226eccc3e76f09120efa0a9ea6766a69ee40277789b568041b276e2173c624ab548ca2d527ac29179bc49fd81c SHA512 bf771e7b8e46096514dd2060230238cb6875ee36e473b8339650026276b97a83ee6862bcbf55ae8c06e55a5f7070d856e9158154a59778199de96b9f8e5116e0
+DIST wmcdplay-1.1.tar.gz 32082 BLAKE2B 5fd8f57aca1d3d53d34a31f9814c132a98241b848ac04e69c367065ea291add5f025598b7b03c44033024d20e24271690cdb38830e56d3795f6232b02f1d81c6 SHA512 db657ee2cf0a1a7e323e1a6fbf2ec70251005b84fb18808661cd44a50b4203786e56e90329d81957d2496a6e79d76e9d87620680186c85e476b7f94d8f234133
+EBUILD wmcdplay-1.0_beta1.ebuild 1011 BLAKE2B f20e4487e3295cab454d3f328e63441951dd88bcfca0a9563daccfb0dae0fe48eb8c3d299feee23d79296a18fc45240bbfc7562fb20ea24f0b8081a03c556445 SHA512 261cc31a14530a3a264e24d6b8ecab9005a144062089545f5e558570b3977b003d93c92035251fb89a8a4a53912dfbde2deb197f1655f12c13dc6dc78bedfcba
+EBUILD wmcdplay-1.1.ebuild 605 BLAKE2B 4b0b694e15e5a6fafcf5ec640cf34f953cadeac9b3594fe657af3744e83c2492e8b49483025e4d21100a2a28cf0f9396870f58290506fb186e56a64fef31c970 SHA512 be5b360e6f48738c75418b037c353e7c757e9f99ed284b3bdedcc94ad69c7990becc8fc94b50e43e4f4b70545a5ec8c672ce4059dc00d1a4bcc173ee666e2016
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
index a0f8ba62ec79..24b643589436 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
@@ -9,8 +9,8 @@ MY_P=${P/_beta/-beta}
 S=${WORKDIR}/${PN}
 
 DESCRIPTION="CD player applet for WindowMaker"
-SRC_URI="mirror://gentoo/${MY_P}.tgz"
-HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="http://www.dockapps.net/download/${MY_P}.tgz"
+HOMEPAGE="http://www.dockapps.net/wmcdplay"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild b/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
index cddd11861374..6a6a46593211 100644
--- a/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
+++ b/x11-plugins/wmcdplay/wmcdplay-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="CD player applet for WindowMaker"
 HOMEPAGE="http://www.dockapps.net/wmcdplay"
-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"
diff --git a/x11-plugins/wmclock/Manifest b/x11-plugins/wmclock/Manifest
index 68b257934fc9..dd6544ead5bf 100644
--- a/x11-plugins/wmclock/Manifest
+++ b/x11-plugins/wmclock/Manifest
@@ -1,5 +1,5 @@
-DIST wmclock-1.0.13.tar.gz 45740 SHA256 53a0166d565661d917743bfa3f77cb084e0d6c0ea369f81e17f4a6709e9e9e42 SHA512 b7d202798767705157a2a5199344f645aa44201d3a3b6b4eb7a6213ebb10074cea68554d8d4ff9862eabfa2a94e88e453d36c22c451de74e9cac656c4d8af63c WHIRLPOOL ed8447ad66d62271aabdff08a81a5d5f5352ac3d6d79bfaa538df270cdec104d5bf26148c320ffcc83a38579abac411ed06fb880ad34b4b29d8ca0f70320162b
-DIST wmclock-1.0.16.tar.gz 37434 SHA256 85269486b48f6a3b6089aa495cb2dc255f71e989257ddcab47b7736604dbcbb5 SHA512 e27f7f89a7193852d4173b00f69cc319e781d083ec45935271878b729a280f5dfca3e4c3366342f3b40f29a5529b259095aab8e0af6043ae8c9dbd63a4f7f658 WHIRLPOOL e1f7cda9de19a0758928be8b7f068338e1d329d324d68c4b5edd57aea8f4c6009686d8b935a8fce8b48711f64b109d604eb0ac3e5d1597b0b0daa3b74c7b87e9
+DIST wmclock-1.0.13.tar.gz 45740 BLAKE2B ccc1c9f6fc49af57556dd5e44acba6ad8b89451525eaa9e8174a8dcf8e09e1941cf258df8b116291fa953e323b5668b508467faf66d027ec6ca9dd794be642e7 SHA512 b7d202798767705157a2a5199344f645aa44201d3a3b6b4eb7a6213ebb10074cea68554d8d4ff9862eabfa2a94e88e453d36c22c451de74e9cac656c4d8af63c
+DIST wmclock-1.0.16.tar.gz 35448 BLAKE2B 2a6ee148664b10850a31bb7f20f68b8f2d0c7e1e9d353f6823e9280b40ab7e43ebf1e824428e233d03608217a2cdb7f7463480530ca89d5bd7278ffeabf2de80 SHA512 1325a3a25d03a04e5321bf99bbd6ffac0e08f9f2a635425689458cf74219a9338d60d832143031639f75575dfc63fd307a15e651f90345887cf95de90cc8fbe0
 EBUILD wmclock-1.0.13.ebuild 766 BLAKE2B e3e75b16826fcbf75c94e6ba0b881b8b3cdfcf1c7df6a2e7d506ef2d970a89443d5bcc9895fd1dc458808a4a5124ef4f157718c2c936b61a598e59019f063d4a SHA512 6a0818e5d1e2b76ba3e8405813f711773eae340e8a45dce647c2bc4ec046d74bd73a4785bb500ba5dbd37f66e9caa6c8b31dd35c123179de70f6e1dd3a27bee6
-EBUILD wmclock-1.0.16.ebuild 527 BLAKE2B 7ccb8432dc6134f21204fa8514d7fc00441cc9d0b20fd52636acd9a7e6ffc8d9ca5567545e3c517eb1a3aa05cb55fa376c0be7f624e4c3cba711b5d4c3e02611 SHA512 3aa87d3e3bc305d2450fb74565249d34167f1cce2e67ffe83b93ee92bce0969dc6474bef4f72ee18ff0ff3617fe3d1d5e6448c18648dfb7c2f9bab208b847590
+EBUILD wmclock-1.0.16.ebuild 581 BLAKE2B 47ae627ef31d01c6e76ccb1f8e8757d64b0d27571533ca0f508cbbc8aea8d8a2f48c401fc961318e85a95a05ae9008a020ce088dfff4106f6aa5a68bf99ab485 SHA512 9d09a336c4e828ebce318c290cf8bd3ebaee1c44664fd52d495818a2dd68745c30722fd0496c48a0a93c4a1d001703ad6a3cd050147782de06bd43158e75a1d7
 MISC metadata.xml 688 BLAKE2B 227ee0b283753824b8e06e77fe0905eb26142adf58a7b376519281dc67e19ff15956baaab9af4b375a550782b281525187332b38ab128d4192a76926ed240e8d SHA512 a11af53f6a28b0791ab43350e677a07b587b6bbe65bc1e5495277ae12d4cbc89417e6757b5561dd55e123fe7f83e7202adec0fc3dfa2a2887ee0c5f817d5b112
diff --git a/x11-plugins/wmclock/wmclock-1.0.16.ebuild b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
index b96082aeb663..1a0619d748c7 100644
--- a/x11-plugins/wmclock/wmclock-1.0.16.ebuild
+++ b/x11-plugins/wmclock/wmclock-1.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="a dockapp that displays time and date (same style as NEXTSTEP(tm) OS)"
 HOMEPAGE="http://www.dockapps.net/wmclock"
-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"
@@ -19,6 +19,9 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+# Specific path for this version
+S=${WORKDIR}/dockapps-daaf3aa
+
 src_prepare() {
 	eautoreconf
 }
diff --git a/x11-plugins/wmcp/Manifest b/x11-plugins/wmcp/Manifest
index 4e2a46aab917..f9912a2f6043 100644
--- a/x11-plugins/wmcp/Manifest
+++ b/x11-plugins/wmcp/Manifest
@@ -1,5 +1,5 @@
 AUX wmcp-1.2.8-gcc33.patch 2397 BLAKE2B faf1538bdd47573478ce79c71a9e273348ecccfe472f709cc39ffc4085aa13f3bbebe0046e8ded77bc7e17102c891e64a81bb737e451154dd613d3e30b9ba737 SHA512 92155c2213425ebab4938c00f9b9164b247c7e3437d332d7bd479dc5eec6394d63cfb3383f98f9508ae8c12d18dec862875a5b2da69bf7b8f97f30b72a29c716
 AUX wmcp-1.2.8-stdlibh.patch 321 BLAKE2B d32f57cdd8617ed1d511d0e2b3deca1513106bfa69b07a92b8485deaa356bb71e0b19d12e601193d8ac91bf186c8f3529e7679fd8f94f5a8e19abe297ec09ab8 SHA512 1fbc0c1a26539a989de20e4abc90663e52fa65cb4279e93e22f30b7bd818f6993eca69f5a6926e2d1d2fe76bdc9be1c5e556569dc2b335d6b308cd22c4726f11
-DIST wmcp-1.2.8.tar.gz 8673 SHA256 2ecaee806442057d515c760ac58353c4b4cec41252a22e223a5b079776d55d31 SHA512 ac8db45800573810389d8103b5086966bd6bd5b03620338e736e05633fca570639d94e1ceaf24f882619f7de048c70e5ba9996849e0062407e32a74d971a3b01 WHIRLPOOL 3c8c3d3df005faf86a6bb1e07b43ffb55acbeb1b74990df6e549f9edbf66458dac27848d4e173cce78e18b11c4b23c97a9a152a687f3bef19aef5f9a42c5126a
-EBUILD wmcp-1.2.8.ebuild 1027 BLAKE2B fcc8d89064c085e4b5e512edf09d9c363adc9831263ffbf2de07bf2c7fa45829fdc49b148b0f36a9270a9cb1198583186d2440259a01eb22d09dc82f615cd033 SHA512 49e5d3fbae35632e5fa3e20a94abfff1fc527be56b155bbba5092990191b2e468ca94580fbcc8c2807e05ae5a279c6d58a59299850b739b5b5087ff5ffb09108
+DIST wmcp-1.2.8.tar.gz 8673 BLAKE2B 28cad145f6c41829a740cbcef043fe54d940019ea42cbc6aebbc6b8022cf15c642f1c1dbbc0e34721442d4c3974224b498e436b5eae4ea30c766b2512f58939d SHA512 ac8db45800573810389d8103b5086966bd6bd5b03620338e736e05633fca570639d94e1ceaf24f882619f7de048c70e5ba9996849e0062407e32a74d971a3b01
+EBUILD wmcp-1.2.8.ebuild 989 BLAKE2B 1a575942f5c87c6fd6f0bc6d8783bac3b660001b71b133164b68685c90e1c4de141e70cbeefceea3065de94b4a6562fc9ba8a51c86922c685ea8c7ec11193d8a SHA512 b4fc141f05dee75537c0d1d0bd46fb229f0b9c59f5d319ac95daab2187d8867a324963a0c8f41b8f642843b112d4103cd3a449fe1c94440540fd4eae320b47cc
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcp/wmcp-1.2.8.ebuild b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
index 089bfcb95a56..bf63bfa8e28d 100644
--- a/x11-plugins/wmcp/wmcp-1.2.8.ebuild
+++ b/x11-plugins/wmcp/wmcp-1.2.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A pager dockapp"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/158"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/213/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmcp"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmcube/Manifest b/x11-plugins/wmcube/Manifest
index 9d29a803fb38..dc5d33d026ae 100644
--- a/x11-plugins/wmcube/Manifest
+++ b/x11-plugins/wmcube/Manifest
@@ -1,4 +1,6 @@
 AUX wmcube-0.98-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
-DIST wmcube-0.98.tar.gz 38305 SHA256 5111d7bfacc7ffa26419dbc22542a0a0e1d33e5795882d1799b216abd73df24b SHA512 137e31b3de175bcbe593c420b79804a8904436923747e0db338258e87e08ed6dc4748c29910c68e01e072850fb0f0ca6d1979fee22d6e8edc76c500a5cd84230 WHIRLPOOL e86e330aa73fca437005acc87ae72262e6c1bf2dacfdcfe01b7711ed8315258bbfe6433982474ab394b7e76745de4cbdc87ec6eb2ddbd87bda9101616a43555d
+DIST wmcube-0.98.tar.gz 38305 BLAKE2B ceb2f4211ba2f0459242183e3023e3e4203cfc6295f01ce2945ab384f8fb14bdfa7b2cc64fae6c20a96a52d2a22716299ffe117243d4a41ba0c153212127cc57 SHA512 137e31b3de175bcbe593c420b79804a8904436923747e0db338258e87e08ed6dc4748c29910c68e01e072850fb0f0ca6d1979fee22d6e8edc76c500a5cd84230
+DIST wmcube-1.0.2.tar 378880 BLAKE2B fc6d41f8895d9a0eefe1a5efe930d71b24268bd496b5add169b332a26441b68e26a03e6ad70c0593675a19b99eb6fbdb0e9b16ca7f55f068b37af15b29ab4e24 SHA512 88e0cd489f6dda2ba7905896cc507ca32c4c30010c8ab864a5a06ce1c0df7cf0d9d24d21071d1b3e86bfd364bb5379c6cb9d67baa767c3c47973fc82f95d7ae0
 EBUILD wmcube-0.98.ebuild 908 BLAKE2B ab604f531a0adb1b1ded5575eeab04d3206a7ab2d0582ac8b8d9b461312d39f14d966d04e132721a1fe1b1a603812f4a44096132ccbe5b6ed01a6a037d909b50 SHA512 fa296d46439830013e48743c835504b83c00dde1a343c3d2b53ed47155119ad793c81affbf1f25c2e21eccd3b881e2962c39a3f7e0a5f02e28f629b2bf826cd2
+EBUILD wmcube-1.0.2.ebuild 790 BLAKE2B 0b34ac7d19477e0445dae266f5d9e2fa9a6c8c74ef0842605fdbb5ca64f471564feaac0aa5b7b02a71a7eecc35a14951af9fecce616d701371428ee99c024fb2 SHA512 c069fa4bf6c058e4c7cc731b61d751769e6f3eab23a684114221cbe5b806d5d580880722d92e2ac29842d39a6c4d561ca840fdc5ded61e5fe64664ebdc15a65a
 MISC metadata.xml 417 BLAKE2B 7d594431bb0c67d7275c73e53e6958ff415beaf1ec79b82bbf887b3ac16d17e13e8319f467c17bd376b04130959767be65e6112bd7032b853502b8d9dd07817e SHA512 370036b0e1a6a62c3251f22f687277a6ad684b02e423db1b2879fc08267db8c4b6de7e0e35de500b836dd1156d717bf3100e3de4027477473e30aeb1adf339ba
diff --git a/x11-plugins/wmcube/wmcube-1.0.2.ebuild b/x11-plugins/wmcube/wmcube-1.0.2.ebuild
new file mode 100644
index 000000000000..7acbd3c0c2f9
--- /dev/null
+++ b/x11-plugins/wmcube/wmcube-1.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp cpu monitor with spinning 3d objects"
+HOMEPAGE="http://linux-bsd-unix.strefa.pl/index.en.html"
+SRC_URI="http://linux-bsd-unix.strefa.pl/${P}.tar.gz -> ${P}.tar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+	"${WORKDIR}"/${P}/CHANGES
+	"${WORKDIR}"/${P}/README
+	)
+S="${WORKDIR}/${P}/wmcube"
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	einstalldocs
+	doman ${PN}.1
+
+	insinto /usr/share/${PN}
+	doins "${WORKDIR}"/${P}/3D-objects/*.wmc
+}
diff --git a/x11-plugins/wmdiskmon/Manifest b/x11-plugins/wmdiskmon/Manifest
index 6186cba626ec..f394742b1308 100644
--- a/x11-plugins/wmdiskmon/Manifest
+++ b/x11-plugins/wmdiskmon/Manifest
@@ -1,5 +1,3 @@
-DIST wmdiskmon-0.0.1.tar.gz 91956 SHA256 7b856e6a8fd8f1aa8e3b698e28e8abd82700a8101e7a5c36f5bcd80b275f57ce SHA512 5d2ef9d503400d01cd8e7785818744216803a7ea1bf486a5f3b0d5e3b91a279d6a1efd6e948bedbbc729d1574d6fdb3f6fff886267078693bcf1977f29060157 WHIRLPOOL ed24e1188682eb929f9c8821a658862e3f9bcb4f44a28b36eb30cd7698ab99c830db59367633880d4516c677b80b0925884d2f2bc00bad56df5d46f211f8a612
-DIST wmdiskmon-0.0.2.tar.gz 91996 SHA256 7f785aa2575c980bb2732fd69d53daeab6b2047b9e5dc3548d909145779fe06e SHA512 c39c298961129fc6951d27096c2993b0cafcba52b5898518fdb6f446b6fd6332db1df36bd1c812f1b1ab7fb0c59759f749176a675a29eb271a72430709ef550b WHIRLPOOL 32d797bce1c584fdf7b5a9687445139050a36c7698d516fbd940bd22966cdab9636ff20a77060cb4b06534632cba552c259d5b794003491c24528e242be399dd
-EBUILD wmdiskmon-0.0.1.ebuild 582 BLAKE2B 0df294cc3a253f5139297de55931434e5f0fb178409d23d5aead9f2778aa8d855f27b0637a532f5c0e0070a19341baa038a1161a980dce45a34682c515c9f257 SHA512 24401d7938585decba82bd1b9da8f81d1e93201d6d1aaed387bcf087708f5579799d1c29c856828fc5efedf85cc0dba2b0f80181b373e052ced2f646bf8dcf2e
+DIST wmdiskmon-0.0.2.tar.gz 91996 BLAKE2B ecf4b9ed151dc9bef1dd6e68f7b62af77774b6527d37b833527a45caf56cf7f58e70cb2b78e4e2c13cee063532fcc81418ce0b5e0f4c8b7d177cf03a11e21c0f SHA512 c39c298961129fc6951d27096c2993b0cafcba52b5898518fdb6f446b6fd6332db1df36bd1c812f1b1ab7fb0c59759f749176a675a29eb271a72430709ef550b
 EBUILD wmdiskmon-0.0.2.ebuild 561 BLAKE2B 846eaec3a038885e22cbb2edfa98285eba4a9ca2ea7e6a5f7437b7ca02ee5a996d1eb4a9b7ed79dab24ba78611f8fff483946f397c82183ae1c1b29b78e593d9 SHA512 29388616b9cb93875add337ea7682f3991f48738e8ee0f68d55e61fe79a6babab47bb7df6cb8b5a789a960e16a7b647e5114f8a2f40ddca8a951c9ed67518064
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild b/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild
deleted file mode 100644
index d18343753912..000000000000
--- a/x11-plugins/wmdiskmon/wmdiskmon-0.0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="a dockapp to display disk space usage"
-HOMEPAGE="http://tnemeth.free.fr/projets/dockapps.html"
-SRC_URI="http://tnemeth.free.fr/projets/programmes/${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/xextproto
-	x11-libs/libXt"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog THANKS TODO
-}
diff --git a/x11-plugins/wmget/Manifest b/x11-plugins/wmget/Manifest
index 446c62cfcaea..240e0135657d 100644
--- a/x11-plugins/wmget/Manifest
+++ b/x11-plugins/wmget/Manifest
@@ -1,5 +1,3 @@
-DIST wmget-0.6.0-src.tar.gz 41155 SHA256 738b8e22a75f3ed538e473a66908091a13f928f7b163caf2aa79e687f72c32a7 SHA512 18ce66925473eefc5e4e174450abb0505d3cf85f8d1d242faa5608d6c9dfd34464c771dcf2ee1da3df2f59241f7f0a4d63fc0f8783bfb454a82777a248179e88 WHIRLPOOL 02221e79ee67ab9c0b8493e4a0fa3af7ece46a46394b4579d93fc37159817d9d744049de9eeb1081a08c057562ccb4df2c3d67a50457280c29707fee5c5292d4
-DIST wmget-0.6.1.tar.gz 36624 SHA256 cf91bb3af17f7c16c8eddbf42ca60909dc21ba351d8968fd2a4dc8ae9757bf57 SHA512 b8c5725fb17be1bc7ce567125acfd22b6b49aac18f169893eb61a9429d618c80e4c8a68cdd288b7a75197bd1a3cc6dbf20efb75c52158b8897d61c20b07475b2 WHIRLPOOL ee025a9157a9b518652905b77dcfb8e6d79e111e82cccbbf4f3b443fbf08b310c0608590088d1dbc38681ecfdc917a1eb91ac4d66ba29f248d390c52c3d1580d
-EBUILD wmget-0.6.0.ebuild 973 BLAKE2B 3cb08e295e87a8ec165ddf4b27e56ae48822c5c7533d5df2e480a30626f62cf76269cf9595a599af4c53618bd70752af77d5ceecac046981bf2cc97972f7c505 SHA512 05c48139201e6ffec9d5c3c48932c8ce9d867dc0394cf160da3fbb15a43c0c374afce5eb5d6f670a0fd7b3f4def2ef8255aa29a4cb8a8668a9d2c15eac0dbb95
-EBUILD wmget-0.6.1.ebuild 532 BLAKE2B 25753c8441ad8e795c96691f98cb7e34dfbac7ada5beeb646ae11332dc6f8878641944c32c16d5e58783c482ef7e2add721ddd43435da2b2eb746760ee494a20 SHA512 a1149a1c087982e732c39438beb8213e0b98a8fe634791046f0032eef7214a9fa79dd3f9b83ec25fa38ea6ab0c7e31fa7bc957545eef1fcbe74d3ebce06b70d8
+DIST wmget-0.6.1.tar.gz 35538 BLAKE2B 5e7b8bd7504fc23a7ebca04b8628f9c847888ae9a9161f78446ca8976151344d4c2aec5fb422df9069f4c6a1480bb347ba19f7e5d3a7a9ca4e6dc4560bc810b9 SHA512 7e8db4610eb6d57181d10ed46e09aaba8b4f1672f1a8846dd97beb7eb6dd5bbac9a38ed7c33dc7ff7198001660500c2543402b000574d43ef3026682bf4d06e0
+EBUILD wmget-0.6.1.ebuild 580 BLAKE2B 4f0e2aeb23e3e825f89d86d94f7662ca9702183edd4fd63bc6e5ab9367b146ac8044b1742476e6bf0992588faa9240510c8f289b60788c9723b671347c8584b9 SHA512 5284aa957ce5001b93170c3e3b17fac5c3c7d4d5f29244813d21dc19cbde5d1b8e61fd4781224f3ae7c78e7c973407af83d77973faecf83e0469c9a67e2c7896
 MISC metadata.xml 520 BLAKE2B cadb06d4f215a2334ede099929e74ff6d84a3784189ef7a414503cb4b10103f2e8a6018c21c5cb8aae0e01a55b30baa5519ae944e4624ab9c66778d40f4c7534 SHA512 e7b294921f27518b774bcda274e497c2cd3bc752564d14f486e8bcfac659418776082a414418c3762dfcdede4823328f928d90fdd3dabe07879ae32c32f190a4
diff --git a/x11-plugins/wmget/wmget-0.6.0.ebuild b/x11-plugins/wmget/wmget-0.6.0.ebuild
deleted file mode 100644
index b3b9bc92b44e..000000000000
--- a/x11-plugins/wmget/wmget-0.6.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="a libcurl based dockapp for automated downloads"
-HOMEPAGE="http://amtrickey.net/wmget/"
-SRC_URI="http://amtrickey.net/download/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	>=net-misc/curl-7.9.7"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-S=${WORKDIR}/${PN}
-
-src_unpack() {
-	unpack ${A}
-
-	sed -i -e "s:ar rc:$(tc-getAR) rc:" "${S}"/dockapp/Makefile
-	sed -i 's/$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(DALIB) -o $@/$(CC) $(CFLAGS) $(OBJS) $(DALIB) $(LDFLAGS) -o $@ $(LIBS)/' "${S}"/Makefile
-	sed -i 's/LDFLAGS=/LIBS=/' "${S}"/Makefile
-}
-
-src_compile() {
-	emake -j1 CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	dobin ${PN}
-	doman ${PN}.1
-	dodoc NEWS README TODO
-}
diff --git a/x11-plugins/wmget/wmget-0.6.1.ebuild b/x11-plugins/wmget/wmget-0.6.1.ebuild
index 3017cebb7176..502bca71265e 100644
--- a/x11-plugins/wmget/wmget-0.6.1.ebuild
+++ b/x11-plugins/wmget/wmget-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="a libcurl based dockapp for automated downloads"
 HOMEPAGE="http://www.dockapps.net/wmget"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
@@ -20,6 +20,9 @@ RDEPEND="x11-libs/libX11
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+# Specific to this tarball
+S=${WORKDIR}/dockapps-5aaf842
+
 src_prepare() {
 	default
 
diff --git a/x11-plugins/wmgtemp/Manifest b/x11-plugins/wmgtemp/Manifest
index cd6cf3cd684a..c84f3d1714f2 100644
--- a/x11-plugins/wmgtemp/Manifest
+++ b/x11-plugins/wmgtemp/Manifest
@@ -1,6 +1,3 @@
-AUX wmgtemp-1.0-list.patch 2977 BLAKE2B 6b1d49d6a72620853dc2206361fe83fcb9699f0d91af05f578edb904357b56022aa223b3039f7ef2c2270ba324a9409bcfae08acee514fdc00fc528d937b7c24 SHA512 efce721b1c08960fcc545552cc7362b9b8b5794f3ef43a3fc0b23281c38e4274eb048530916a859ba1d55e7ee4c5c913d56450acd549ec8b63cbc98fabc353bc
-DIST wmgtemp-1.0.tar.bz2 21090 SHA256 3de2e15358695ce6b9c8f2d4aae33730b90085f31ff3cd7d01647d76370c45d4 SHA512 d174eda017131bee0b96c795acd7146835dfea89df61fb1e8cd3105566372caef817b1a9bb1d12691a69024df303d78a43ca720b3fb84473bfa19d863b53e7c4 WHIRLPOOL c88cefbd5c565daba8254616fd6236423301af7313df7fb4a14fa3f1b7799b17baf94b118707a627cb244470ad117b702efeed0822fcfa55fab8c0af2704dc16
 DIST wmgtemp-1.2.tar.gz 96949 SHA256 dabf70bfaa11c35ec630b1e5d7455570165c937bfe826a3b4d1278d21f0ff6cb SHA512 ab76eabb5459b6a8dde28c23b8c8d39587e7874daaf368afcbe7aabe57ce499285d4151b53afa8295991742c481ca18617e71107ae264c05ab28b24b67c00b9b WHIRLPOOL f96660d1f77e3a5d1e71b9bd4808b8aeca0d3a2747257d5306a5d0a9a6b7c3f78c1bd7447b406943dc25dfb4c7e544437c717d597cae589e0aa420c01f8ce562
-EBUILD wmgtemp-1.0-r1.ebuild 983 BLAKE2B 346ac7c35c2ce3e17538ab3d1c7307c05211db26693045584da60f61e6165a4c40175d9e7c6dde7a27df4aba8cba809c8deffbba4014ee7973cf84ddb2524637 SHA512 5c3ff69f60e378a35cfd621b5143b87d5b63db20796e1f560802e6453b547eb1117ec77f5fe7a8c8da9e8374de5763528b97e95e1c1b8dc4a41363b8dd190698
 EBUILD wmgtemp-1.2.ebuild 418 BLAKE2B 3dd5fb1966b2aea8647a0a01b75ac8cb43fd000a3cc3cb5104789c3121181caf1b230f2af14aee0d8cd21125e9dd33c8bce7d75b29c2bdc9140a539920d7beb0 SHA512 2144434bcde9e1d104cccc8aceac80b2371f19af0301e63ca3cbd9b886294421c84c079c35cbd2ee364f7d6c769b29742a157824af6a892f9301fbc4b76cd5c8
 MISC metadata.xml 739 BLAKE2B 791f77c670ef085fed4481719f4f56e7135b2bce849981d87e2d97ca6b9fa8d2c1a30c22baa9c4177404af70d1dbcecaa5b4d2587965d75bd4a014788b127434 SHA512 a8750419c79941025fbd79e72f9a0e646bb08cdfa341dd531b77c755f48f97c07574e095b57d9cba3fcbc27404c5f35b0ff52617828623e48cfcc42bbfba552f
diff --git a/x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch b/x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch
deleted file mode 100644
index 54a2eb2c2887..000000000000
--- a/x11-plugins/wmgtemp/files/wmgtemp-1.0-list.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur src/wmgeneral.orig/list.c src/wmgeneral/list.c
---- src/wmgeneral.orig/list.c	2016-01-04 13:10:41.091981064 +0100
-+++ src/wmgeneral/list.c	2016-01-04 13:10:56.428986326 +0100
-@@ -38,7 +38,7 @@
- 
- /* Return a cons cell produced from (head . tail) */
- 
--INLINE LinkedList* 
-+LinkedList* 
- list_cons(void* head, LinkedList* tail)
- {
-   LinkedList* cell;
-@@ -51,7 +51,7 @@
- 
- /* Return the length of a list, list_length(NULL) returns zero */
- 
--INLINE int
-+int
- list_length(LinkedList* list)
- {
-   int i = 0;
-@@ -66,7 +66,7 @@
- /* Return the Nth element of LIST, where N count from zero.  If N 
-    larger than the list length, NULL is returned  */
- 
--INLINE void*
-+void*
- list_nth(int index, LinkedList* list)
- {
-   while(index-- != 0)
-@@ -81,7 +81,7 @@
- 
- /* Remove the element at the head by replacing it by its successor */
- 
--INLINE void
-+void
- list_remove_head(LinkedList** list)
- {
-   if (!*list) return;  
-@@ -101,7 +101,7 @@
- 
- /* Remove the element with `car' set to ELEMENT */
- /*
--INLINE void
-+void
- list_remove_elem(LinkedList** list, void* elem)
- {
-   while (*list)
-@@ -112,7 +112,7 @@
-     }
- }*/
- 
--INLINE LinkedList *
-+LinkedList *
- list_remove_elem(LinkedList* list, void* elem)
- {
-     LinkedList *tmp;
-@@ -132,7 +132,7 @@
- 
- /* Return element that has ELEM as car */
- 
--INLINE LinkedList*
-+LinkedList*
- list_find(LinkedList* list, void* elem)
- {
-   while(list)
-@@ -146,7 +146,7 @@
- 
- /* Free list (backwards recursive) */
- 
--INLINE void
-+void
- list_free(LinkedList* list)
- {
-   if(list)
-@@ -158,7 +158,7 @@
- 
- /* Map FUNCTION over all elements in LIST */
- 
--INLINE void
-+void
- list_mapcar(LinkedList* list, void(*function)(void*))
- {
-   while(list)
-diff -Naur src/wmgeneral.orig/list.h src/wmgeneral/list.h
---- src/wmgeneral.orig/list.h	2016-01-04 13:10:41.091981064 +0100
-+++ src/wmgeneral/list.h	2016-01-04 13:10:42.883981679 +0100
-@@ -29,31 +29,25 @@
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
--# define INLINE
--#endif
--
- typedef struct LinkedList {
-   void *head;
-   struct LinkedList *tail;
- } LinkedList;
- 
--INLINE LinkedList* list_cons(void* head, LinkedList* tail);
-+LinkedList* list_cons(void* head, LinkedList* tail);
- 
--INLINE int list_length(LinkedList* list);
-+int list_length(LinkedList* list);
- 
--INLINE void* list_nth(int index, LinkedList* list);
-+void* list_nth(int index, LinkedList* list);
- 
--INLINE void list_remove_head(LinkedList** list);
-+void list_remove_head(LinkedList** list);
- 
--INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
-+LinkedList *list_remove_elem(LinkedList* list, void* elem);
- 
--INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
-+void list_mapcar(LinkedList* list, void(*function)(void*));
- 
--INLINE LinkedList*list_find(LinkedList* list, void* elem);
-+LinkedList*list_find(LinkedList* list, void* elem);
- 
--INLINE void list_free(LinkedList* list);
-+void list_free(LinkedList* list);
- 
- #endif
diff --git a/x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild b/x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild
deleted file mode 100644
index 0e7ce1d8bbf7..000000000000
--- a/x11-plugins/wmgtemp/wmgtemp-1.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="CPU and SYS temperature dockapp"
-HOMEPAGE="http://www.fluxcode.net"
-SRC_URI="http://www.fluxcode.net/${P}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	=sys-apps/lm_sensors-3*
-	>=sys-apps/sed-4"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-list.patch
-
-	sed -i -e "s:-Wall -g:\$(CFLAGS):" src/Makefile || die "sed failed."
-
-	#Honour Gentoo LDFLAGS, rationalizing Makefile - see bug #337411.
-	sed -i -e "s:LDFLAGS =:LIBS =:" src/Makefile || die "sed failed."
-	sed -i -e "s:\$(LDFLAGS) -o \$(BINARY):\$(LDFLAGS) -o \$(BINARY) \$(LIBS):" src/Makefile || die "sed failed."
-}
-
-src_compile() {
-	emake CC=$(tc-getCC)
-}
-
-src_install() {
-	dodoc BUGS CREDITS README TODO
-	dobin src/wmgtemp
-	doman wmgtemp.1
-}
diff --git a/x11-plugins/wmhdplop/Manifest b/x11-plugins/wmhdplop/Manifest
index 10aa179ba5fd..5d825d587242 100644
--- a/x11-plugins/wmhdplop/Manifest
+++ b/x11-plugins/wmhdplop/Manifest
@@ -2,7 +2,5 @@ AUX wmhdplop-0.9.10-cflags.patch 424 BLAKE2B 0831d43756a4cd2ad3a723fbdc027b83486
 AUX wmhdplop-0.9.10-sysmacros.patch 388 BLAKE2B bea15277921cfe403e6960771821db22e01455d1092534e76a1f988b99adb75537552e42e28bbbaafba9531d15f4dbb6f14434d384defc4cd56bab938ec1a01a SHA512 b914f815c65196221f88d75b0346063be3f283f8f55921e454529d7a3089121edbac6ba8e75bd759f2b4f0fcc5d1295a1084f751901c275a6aa501271e0831f3
 AUX wmhdplop-0.9.9-64bit.patch 3955 BLAKE2B 138a449cdc015e7763166b061232a6bcecceba4d2e60f503ec84d27aa330918dde7f589cbb9dc3c76b9afc9fe8e4f90d8c34e420707fcb99fd5bedf0a87b4b61 SHA512 11ad797cce7d04e389f7252cac2617aada7da68b412f3678eda2b7503d104ec2a66d4e297cec80501626b67c2ee0fee4799646f8421c450a0ffb70d68ebb9d94
 DIST wmhdplop-0.9.10.tar.gz 163491 SHA256 d77d362be720b3c245a931d538b99b30c140149a455a15abb612ea9592f2b79d SHA512 9bd79ab5c271e2fbd7d415a1ea20eda5412d7657d9ccfd4781a6d42b834107b65e110231718ad686355e76590cd39f556ebfc9b14e7a4048a68d62503df94f46 WHIRLPOOL df79e592c96da24e84603ce2cd1372dfdb4e952f6dfce4a9d0d5063408917c25d782ac5d487640a4311d0eb5c04c00f6f7686d8173d600ccd1e444f19b94bebf
-DIST wmhdplop-0.9.9.tar.gz 232684 SHA256 68f27918a8da4af2389544441eeee3a6fda3a875cd55603a3e04abedc1726553 SHA512 91c6860c775444aaf02c2138d94e2e21849bf6268a71633dc7575a7ec65220a62e1fc4a105d13ab1e5b305edb759a90dc0d104d35ed5245fb2df6646908b36db WHIRLPOOL f8cfb78d69a2ec85d03d8e0504a7675a29a1dd53e00d5791932e67c3b29894b967e7dcb08770195aca5f9f005e91fd94be3a35a77daeddda4ff88de7c1e3edaf
 EBUILD wmhdplop-0.9.10.ebuild 752 BLAKE2B 71039ebfb1bc8a782ac9368848daa41c30189b5cedd880a31067522928a4d6e0ed3c9145e6d0f844c645fe6e43ab7e743b7be80727dd90d2e0f4543c67ed502c SHA512 94adafb80633a868bfd15a9f5e9a00898277069c92c7b870a82ca256eaba31a1914cb15c33c970642ae86262822e3399485303a9f28b52ec53b0c9c23d34615d
-EBUILD wmhdplop-0.9.9-r2.ebuild 832 BLAKE2B fbc48f3726c08baec03bb9a6f30e8972c301e6b8864655eb46674ddd5f57499942732466e09e800d2df92930cf96c87ea8b648e45cc8a3e9c1f33b90aa695282 SHA512 0e473054d5e2144b110260481cbf786c931bcfcdd87b82309bab799d12ebef03b98599263ab47e07c610fd0b6be215ef603b316cfe030a12c53b0143c4a60be3
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmhdplop/wmhdplop-0.9.9-r2.ebuild b/x11-plugins/wmhdplop/wmhdplop-0.9.9-r2.ebuild
deleted file mode 100644
index 07e948e5e6ff..000000000000
--- a/x11-plugins/wmhdplop/wmhdplop-0.9.9-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils multilib
-
-DESCRIPTION="a dockapp for monitoring disk activities with fancy visuals"
-HOMEPAGE="http://hules.free.fr/wmhdplop"
-SRC_URI="http://hules.free.fr/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/imlib2[X]
-	x11-libs/libX11
-	x11-libs/libXext
-	media-fonts/corefonts
-	>=media-libs/freetype-2"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-64bit.patch
-	sed -i -e "s:-O3 -fomit-frame-pointer -ffast-math:${CFLAGS}:" "${S}"/configure
-}
-
-src_configure() {
-	econf --disable-gkrellm
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/x11-plugins/wmifinfo/Manifest b/x11-plugins/wmifinfo/Manifest
index 97925c855232..4eb92c6147cf 100644
--- a/x11-plugins/wmifinfo/Manifest
+++ b/x11-plugins/wmifinfo/Manifest
@@ -1,5 +1,3 @@
-DIST wmifinfo-0.09.tgz 16098 SHA256 d1ce49630cf716e17afa1d3fd5a0816f4ba092f2b1e84593784d084fd261d7df SHA512 74fdd3e1cf3fdb8ec38bf3027f1f57ddd0b766d42b83b49bbc357ac6b2dd97647a6c56aeece0e0732b288ce4975a1c8ac3a7c0b8d10f8af7f1fa0670144ea1b8 WHIRLPOOL 7b7c26f851171ec926beed1b6fadad1039083fcbe6eb97b86cba906aa5e21b99a0bdb6bf96befaec22d3c17d3cda81544715d554750d6d8b6f2d712b6e77687e
-DIST wmifinfo-0.10.tar.gz 17415 SHA256 3f990ccfbd24e01d9f2ca13a5881c6b122e5dd29b10c2778199fc6502ee4c2e3 SHA512 84c0a30eba12bb9e969bea1e7ac7a37c3172cc93f6bb87ee9a9ba0cba5d814ea3550f84626d329e648abe1d834b864fe9f050a411b6063e2c1745dfec1ee96d5 WHIRLPOOL 745bb4ee7bf9d60427e64500eeef577df27d37ac68566d1b07d3ecc93a6a2cc04a0e527dbb4670dcac0fdc9060d229982f48beff860f4ed938596865968487b6
-EBUILD wmifinfo-0.09.ebuild 695 BLAKE2B f4612953e1e6720d92924f075797a666c302d117f8e2644342c3babfc6ebeaf39103e28f0fe9d28aa667f6d3bf9198a712da9ffdbb3f0c2d943313c3e1bef2b3 SHA512 1609f021b07ad8c09758e74ee98fd60af4b5ff94810e7722e4317e715095077935ce51c7bdcddf51cdb6d0e292216780285ddc3e01f6e24a4f6606b966f9e360
-EBUILD wmifinfo-0.10.ebuild 687 BLAKE2B 4e0ef9e2e102c841f7d444ab2e59c3b17fb641f51deef8278dbbdd74ed487678800b30157bc0f4aaee5917c1c333e521f88f891543526c174af9c0d54d44d457 SHA512 bed2d83b09d1b00eb2c0850a32b5cd6605d182bf110392f4279b93402394552a7b0a230477ee0cb0ac8e7e5c87bdd6460b2323f7823630b62f8bb3fc079dbfd7
+DIST wmifinfo-0.10.tar.gz 17418 BLAKE2B 74debc88268e45779131ad6587733343e8be51cfa871ea368ca305a755008fb0a7e3faa332157e79ecea7553d3e523cce4bb9b4a650c2ee73dc1b6acb3db4ff9 SHA512 57731f482b950e968e760315b99ceb715c3aa101f77e5363ee08db231369c5addc4d9cf4da4a24f624313073bc67cd8742030956c5f866fb02c1b24b3cc4e965
+EBUILD wmifinfo-0.10.ebuild 677 BLAKE2B 25aebd3e947a284dd21adc6e6c0e241d83dac19232401ce16df7e4ee5368dd5de30fa398e5b3a42f1eec62f838b8c3e25db9c2cff1e8d5152eda29b7c8fe6e3d SHA512 139365bea45aaf809b18ea6485f325f21efcc0ce6419db1aa6374a452689b36d5e6250b37f29f6616b7459cd287c8cca8c7a36435f0b4d13d9141ed93602ca3f
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild
deleted file mode 100644
index ae092810dcf2..000000000000
--- a/x11-plugins/wmifinfo/wmifinfo-0.09.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="a dockapp for monitoring network interfaces"
-HOMEPAGE="http://zevv.nl/play/code/wmifinfo"
-SRC_URI="http://zevv.nl/play/code/${PN}/${P}.tgz"
-
-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}
-	sed -i -e "s:-O2:${CFLAGS}:" "${S}"/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LD="$(tc-getCC) ${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin ${PN} || die
-	dodoc README || die
-}
diff --git a/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild b/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
index e7d5b4361859..00e6b88af646 100644
--- a/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
+++ b/x11-plugins/wmifinfo/wmifinfo-0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="a dockapp for monitoring network interfaces"
 HOMEPAGE="http://www.dockapps.net/wmifinfo"
-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"
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"
diff --git a/x11-plugins/wmmixer/Manifest b/x11-plugins/wmmixer/Manifest
index 10531a8d8a4e..e812b64e51b0 100644
--- a/x11-plugins/wmmixer/Manifest
+++ b/x11-plugins/wmmixer/Manifest
@@ -1,6 +1,3 @@
-AUX wmmixer-1.7-respect_flags.patch 784 BLAKE2B a04c8ea53bfea47ffffe1e343ea70b6656c4503028ec901c93d4758b1d1a7e5c82b2c5cfd5814f44853d2e40e7bf03d3c0b142b7ee446d24902ebb82583cb503 SHA512 f785b537ece02f36d46d253895e808a6a9a114c44bd3c787441ab50b0c9854188d8422261fe4ba27410cb5579a746dbe7ca8aa612b6371b87d8c0c19b49efa90
 DIST wmmixer-1.8.tar.gz 102723 SHA256 bbcb1e3cecd7a97be79c25cf4338aa5ddf47360192324ad9bd947d4902011159 SHA512 3b5c7f27da6ed2cbf8d06c431584186799d17e72db663db6ffc488f777c31de0b13fcc3f665099925efab036a14e70da4bbbabaff6ffc12280698e91f555e276 WHIRLPOOL 1e7a30a0d6ab586760d8b50b72e5639567220bd5c1c85bf546c5c2738e93b1fde646a29badb97c75c404dbff05aa0fc5b5d3fe0c8f55f35da2e61a96dd06327c
-DIST wmmixer_1.7.orig.tar.gz 24916 SHA256 ee4ae77130dddeb8eb26d00fbbe879f09e1542d3cf8a3e713d8f8f8a91f4aecd SHA512 81e32a821df423aff4ee0eef8c1dbd7a8302f0f43f3a6cfec3fd71b26dfca536ae2f8e0313404976eb21c217724e074eed9bf40c67360f28e901d4265580a1e4 WHIRLPOOL 9baa5ae9c4b9b23836346539ef9fd70a494d45c0a583986b6572efe98e0ff036b67681da39f95fa344f7c3ab32dc8e1c24a6cdcf2f56c33157c828e367834b97
-EBUILD wmmixer-1.7.ebuild 717 BLAKE2B e64e054cb74cd9010b11d19a02369db296fca19598e344e57a5b0325b9f761a2a3ff87cd44b7eff6b4aa257441b22aab5dc88bbb63f34749092c1391896417c2 SHA512 7d6142cccefc11a3c510034167ead3b69b6f1d0f958d2ae052cb988fced90b4f8a09929da825038da860f9a62ec1c64a8e0a263bc721b65c7465244377b024ec
 EBUILD wmmixer-1.8.ebuild 429 BLAKE2B 2974f6e348dde50e6154d4f76039816d44b75997a2a6a838748707cd03f72dc96bacdfa779fa15b698aa53f5fe109d750ba59fe660b66df30358adaf20711c2d SHA512 ad4ee80a5c5ec2ba1ad941207f063d9c2a0dee01f663f3be9531074360f07eb202f3815428b4da75b0bd27cef039a1db6e28db9ab68e5b939569051ea30ee223
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch b/x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch
deleted file mode 100644
index feb03166dddd..000000000000
--- a/x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	2012-08-21 11:03:31.028266807 +0200
-+++ Makefile	2012-08-21 11:05:06.808876995 +0200
-@@ -1,19 +1,12 @@
- # $Id$
- 
--prefix      = /usr/local
-+prefix      = /usr
- exec_prefix = ${prefix}
- bindir      = ${exec_prefix}/bin
- mandir      = ${prefix}/share/man
- 
--DESTDIR     =
--
--CXX	    = g++
--CXXFLAGS    = -O -Wall
--EXTRA_LIBS  = -L/usr/X11R6/lib -lX11 -lXpm -lXext
--
--
--LD 	    = g++
--LDFLAGS     = -o $(EXECUTABLE) $(CXXFLAGS)
-+CXX	    ?= g++
-+LIBS        = -lX11 -lXpm -lXext
- 
- EXECUTABLE  = wmmixer
- OBJS	    = xhandler.o mixctl.o wmmixer.o exception.o
-@@ -26,7 +19,7 @@
- 	$(CXX) $(CXXFLAGS) -c -o $@ $<
- 
- $(EXECUTABLE): $(OBJS)
--	$(LD) $(LDFLAGS) $(OBJS) $(EXTRA_LIBDIRS) $(EXTRA_LIBS)
-+	$(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXECUTABLE)
- 
- all: $(EXECUTABLE)
- 
diff --git a/x11-plugins/wmmixer/wmmixer-1.7.ebuild b/x11-plugins/wmmixer/wmmixer-1.7.ebuild
deleted file mode 100644
index c2f78e5f1afc..000000000000
--- a/x11-plugins/wmmixer/wmmixer-1.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A mixer designed for WindowMaker"
-HOMEPAGE="https://packages.qa.debian.org/w/wmmixer.html"
-SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~mips ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-respect_flags.patch
-}
-
-src_compile() {
-	emake CXX=$(tc-getCXX)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc CHANGES home.wmmixer README
-}
diff --git a/x11-plugins/wmmon+smp/Manifest b/x11-plugins/wmmon+smp/Manifest
index 87059d73c564..e16f5d55afa0 100644
--- a/x11-plugins/wmmon+smp/Manifest
+++ b/x11-plugins/wmmon+smp/Manifest
@@ -1,4 +1,4 @@
 AUX wmmon+smp-1.0-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
 DIST wmmon+smp.tar.gz 15807 SHA256 d8d98323c3c5d091902ed52cae2c0ba9db34b6af11d75d67104c6d90e6b30f96 SHA512 9565815c30642a3d12a23960bf6123eafa9379d24a69b2a75794757e89a3b056669fc47a898a5e756871a74502dcab8b76abe5508f2c5474a1fbfc8bdd4e6a94 WHIRLPOOL 17fcf7b3cf678cda708339f8d4aefdc2c17d8341148dad12b6905622891e61395ba5ed1645f453c7910a30e358b44f9cf53a44cd75e1505db1c47efe5eca3304
-EBUILD wmmon+smp-1.0-r2.ebuild 837 BLAKE2B e05ad41d0769d902cc50c0d475edf0c731dc9f36624be57eb9bf1b227570271f9764ac7ccd8fd0b2a5e376dc5750596e1f75bdb3a7e27fc9b07d26e5ab54aa7b SHA512 de52a07506ba374f019608e74240da5a5621e5dfd48aa074dae6c36d6717613ce792c08d69d3f578cba5971e012d931433757d01440fe9d7352d524b43691da7
+EBUILD wmmon+smp-1.0-r2.ebuild 846 BLAKE2B fb44553127453ba07a3c6075f7badb6dea934ad9e669d7a5366c1260ae2d55c0c0277867aac15ce250ea9d92aca419b3257fb3b3b3989e56a16b7db45c22337b SHA512 9e2dedf5d440e158a6bf0d9e2d6c4a3ec4a993e8fcaf48d1b0b9a6639f46e575123b49205e0a0e7447beb8bf3d3b054953b1b8761e9b522aa9f1e6babc99f4c5
 MISC metadata.xml 533 BLAKE2B e0e0d04cd468503f8219f1fb6b0c30eb7272344f23e8477670372f3d5d347dc9e3558326bb90cfe79ec245f591cc28d5c20520f76f250a58f279a003385cbb90 SHA512 9ea486d5d5b12a67fb8b25ab2be9c67420f8f7903a00ebf414f3f85441b543775085c2c85cfb2c5eda28e264e9ac0878bdb670e7eb9646644bae0b803f90d67e
diff --git a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
index 5b540e83d26b..9dc5da613248 100644
--- a/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
+++ b/x11-plugins/wmmon+smp/wmmon+smp-1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Dockapp CPU monitor resembling Xosview, support for smp"
-SRC_URI="http://www.ne.jp/asahi/linux/timecop/wmmon+smp.tar.gz"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/wmmon+smp.tar.gz"
 HOMEPAGE="http://www.ne.jp/asahi/linux/timecop/"
 
 SLOT="0"
diff --git a/x11-plugins/wmpop3lb/Manifest b/x11-plugins/wmpop3lb/Manifest
index f3b9642214c5..eb70e426e927 100644
--- a/x11-plugins/wmpop3lb/Manifest
+++ b/x11-plugins/wmpop3lb/Manifest
@@ -1,5 +1,5 @@
 AUX wmpop3lb-2.4.2-fix-RECV-and-try-STAT-if-LAST-wont-work.patch 5673 BLAKE2B 89a914b8bb12752cf406f156333630249f0e050bca4e73d8e53e3bc1178f2c3693a12df75522e7c1f0ddc925bed89db5f74455dc7e6207e5919d55d073d72269 SHA512 a3c8d27d30a844737a8e66d20806e82c56c91d757f6d0eddcc75debc8ebd8db2c7d8f89ad528f52200bdac06088b68b69bc486e45c9488b83aca09cab2d06e33
 AUX wmpop3lb-2.4.2-list.patch 2945 BLAKE2B ea23505083bf75326c7b0dd06327dd9c87838ae75c9aaf0f60a4467652686c2da69e53eaf8945a393e05d800d62e09944bc53d4e84ecf5aa656c3c0783dfc8b9 SHA512 4b03e507984b1e2bb01d62970ba39a7469b997978c376505deccec65e936bcbb9be12140b702cd7c69b0cca79ef7f5e2680978cae0c80202a5c4028f32b7313a
-DIST wmpop3lb2.4.2.tar.gz 37391 SHA256 209b5ca409f226032b1200779e09f3d45a3522bc08eeb9f1b63e14bd04e780f3 SHA512 6d9d12261c457542ba45bbbb2f07ea9895a456d87c60187e2df0f0cc6e6da57fb498ea642346d113749b9529f1bebc623ec9dad48ee84e5016925b2440211e0f WHIRLPOOL e454e021c85ed00aaadedaeb205d2c7c65a28187a3d74b1939f021aa55a519162290fc4814058dfdcce2f04f1482d95e69b00aca5f8d621e65a18e86ad665033
-EBUILD wmpop3lb-2.4.2-r2.ebuild 1051 BLAKE2B abad2dcae3c5d920fb66381dade53166cc428075021763b7a523942506dfd9352764fc780b5b42ef468487fd483cd2c88a6b8f15bc278a15cfcef8a986bb7fa9 SHA512 94093c3e60b1f4ecd58b7fac1169241e24f7d9196403c9185e5117a54ea91b58273d5cba3e6fcb68c4e77fbdc4c7078a307f4146738799d3e2831ea6ebe691e2
+DIST wmpop3lb2.4.2.tar.gz 37391 BLAKE2B a9e1acaa35b965db90d5e272382629d02b127b19e9501a6e26094f204463a1f33023cdcf4b7910a045abd2e412c0a41cd3d67fb98378b164f2a3c3f0f457f8af SHA512 6d9d12261c457542ba45bbbb2f07ea9895a456d87c60187e2df0f0cc6e6da57fb498ea642346d113749b9529f1bebc623ec9dad48ee84e5016925b2440211e0f
+EBUILD wmpop3lb-2.4.2-r2.ebuild 1005 BLAKE2B 2b200fa71330cbb21ac37a3b9cb0ffc13ce8c88db3ae277f56e007102db6690166dd6dd0f90c1ff463b3146049b7d63c617960763974dd7fa6de8b47ffa0b7e5 SHA512 0cc6cc8188ec65ec9e6aa78f7991dcf7fd4bd39b83c259475996166adf576a4ec84619c3c825ff92b7a86bb9908c4ccf0da894cdb35fa4a337840896c4e02437
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
index 7a9b0fb776b4..178d3e125568 100644
--- a/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
+++ b/x11-plugins/wmpop3lb/wmpop3lb-2.4.2-r2.ebuild
@@ -1,27 +1,24 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
 inherit eutils
 
-IUSE=""
-
-MY_P=${PN}${PV}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="dockapp for checking up to 7 pop3 accounts"
-HOMEPAGE="http://wmpop3lb.jourdain.org"
-SRC_URI="http://lbj.free.fr/wmpop3/${MY_P}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmpop3lb"
+SRC_URI="http://www.dockapps.net/download/${P/-}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~sparc x86"
+IUSE=""
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	>=sys-apps/sed-4"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/-}
 
 src_prepare() {
 	#Honour Gentoo CFLAGS
diff --git a/x11-plugins/wmppp/Manifest b/x11-plugins/wmppp/Manifest
index ec90f3e00810..b4fd5c824d56 100644
--- a/x11-plugins/wmppp/Manifest
+++ b/x11-plugins/wmppp/Manifest
@@ -1,5 +1,3 @@
-DIST wmppp-1.3.0.tar.gz 31187 SHA256 ce9aba279d4e88e34d239e7f69ff7ad000626b9c4210f5bb9c46a4ec318e8c4f SHA512 20c45c316d28d6622fb5e1504af188a1f21446c654d4e998bd25434a944ea538371cfefc8c4ac02737233976212645d03cba288bf6a107e653740eeebffbd2a9 WHIRLPOOL 66f34a963e73b2905ec525d979a62c1b8bdca2516424dcc5fd50be8129527cd4dd821fa140b5ea52817b305186055edb8a4de9b1c9dce61347430014c16f1125
-DIST wmppp.app-1.3.2.tar.gz 26861 SHA256 677b109c72ec0a69c950dfd8da3674daf002e9c0cc6982c45af6c81a0bc38865 SHA512 92e9d8c3dea92907bcde0b7da9f599f2fe6354cb8c4f60969ac5d3e69a6ea0c8547388b6228f35a2e4bc2d5888ba89354aa18950e705cbd444798467255ea8fc WHIRLPOOL 0f408b2b1b10ae517a418331a48030207121dfce8a82d9b4b6cf49928257245cf282fb1af51adb927e610373743ea51a49189b3f07833c70413d26896a4684b6
-EBUILD wmppp-1.3.0.ebuild 781 BLAKE2B 77e0e4715c3f65c529b3c70fbceac7c749c137d161147c18023cd5375a6ca46ee572b6f5176bc047a2dec111dace546b94f7fda432d8d3db5100bd341554ec9e SHA512 5d770b510554294123fe2ea95f894057d617dc0f3991047d724e24475d9a39af76a9f0c267e70b8915fccdb762570476329d1d8ee0f15a4a8c9ba132620a3ef0
-EBUILD wmppp-1.3.2-r1.ebuild 731 BLAKE2B cffc6edfc74fb0494b80456a045b96bd9394220ed1367817a6c148b7b9d1975b10843dd00abf0c2e32ec13d4bcbf4dcc29d1dce221843f7f05a2aa29facf47ef SHA512 09305653438627adff10dde672f945e0bf0aeef6fb59a9c52b91c01dfc5fb59427274db164a007ed15d85e6eec86557fc3b1365c9ed6fe8051dd5cbedcee6db5
+DIST wmppp.app-1.3.2.tar.gz 26883 BLAKE2B 443144a0eca5653f1ee71b3fccea2ea00e079f224638d815609e20fd245d1f0fefe99a416ceed7f22a7e84f6da32d9ff0ca0d6259d9c047b6791e8343c209903 SHA512 d6fdf5b3016ff05cb6d251b7b9985ca9f13ba791dbd40d2109aa18076dc034f143d994f30bb6070e6152e50c0d51774c32dbe8f23062b798bd5f2c820f8b65c1
+EBUILD wmppp-1.3.2-r1.ebuild 736 BLAKE2B 2abf1c396439f6ea097622aa4dc2dc4bdd941589d0438b2dcfbd1f770dd6a3bcb3eea4a7a9087ccd6b2cc83a50002962ec18c9ca32d4cead430e5b8e8a59f7f0 SHA512 1d653f862ccb0c8b55e2f3b5b15931e9a442e5f519f52e63ea8045aa3ab647716d0398d138dc0aa4813c88bb701a5c4ec078f12661d2284472fb3c39cfbc5c82
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmppp/wmppp-1.3.0.ebuild b/x11-plugins/wmppp/wmppp-1.3.0.ebuild
deleted file mode 100644
index 524e23186c12..000000000000
--- a/x11-plugins/wmppp/wmppp-1.3.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-IUSE=""
-S=${WORKDIR}/wmppp.app/wmppp
-DESCRIPTION="Network monitoring dock.app"
-SRC_URI="http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/${P}.tar.gz"
-HOMEPAGE="http://windowmaker.mezaway.org/" #but this site has been dead for a while ;(
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc amd64 ppc"
-
-src_prepare() {
-	sed -ie 's/-o wmppp/\$(LDFLAGS) -o wmppp/' Makefile
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" all || die
-}
-
-src_install () {
-	dobin wmppp
-	exeinto /etc/ppp
-	doexe getmodemspeed
-	dodoc user.wmppprc
-	cd ..
-	dodoc BUGS CHANGES HINTS README TODO
-}
diff --git a/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild b/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
index e6b7189c309b..1da11e6e403e 100644
--- a/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
+++ b/x11-plugins/wmppp/wmppp-1.3.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 MY_P=${PN}.app-${PV}
 DESCRIPTION="PPP dial control and network load monitor with NeXTStep look"
 HOMEPAGE="http://www.dockapps.net/wmppp.app"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
+SRC_URI="http://www.dockapps.net/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,10 +18,10 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
+# Specific to this tarball
+S=${WORKDIR}/dockapps-7ec9002
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest
index 92a4a54d1db7..492ab09d4633 100644
--- a/x11-plugins/wmswallow/Manifest
+++ b/x11-plugins/wmswallow/Manifest
@@ -1,4 +1,4 @@
 AUX wmswallow-0.6.1-format-security.patch 498 BLAKE2B 3b53142b9664c567ebb4abc8d530b88912643e8cb169650b2f08c2d10da31853ffb6515d0b7f7311c8a181a780002e035da5bdde124db57192470f0c9ac25553 SHA512 9690c74b0f86ddc71ea4f7b190af8ec4d7634454a867654cae8cf2cc48560ab3182e8e3ce312db9eb6b858ef4ec0b9eb63f4c11e962cd17a3638d6d38fcf86cb
 DIST wmswallow.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc
-EBUILD wmswallow-0.6.1-r1.ebuild 800 BLAKE2B 0bdc241c66b2cceb64d96da99d4b1380753ccbd6911b3a22257884dd7469def5dd45e704046068333aba0136d63db156cfa819885f79e1071c1b198e8aae2db5 SHA512 3970b8deca08ec1e85acbf465558c1f4d17cd977c1bb1b861692cb019bdfde63c153f90fd5352a97c41b1f92cb092fcbcc244e6bf56e349049d281555d2468ff
+EBUILD wmswallow-0.6.1-r1.ebuild 797 BLAKE2B e9900b7f168589e9a112028bcbc309912435f6fa4836681d3d5461f9e25d3a0e6ea5e3ed9046be2b396b67ae3d20b51ddfa58b00b53482895a2f79f5efeabd4e SHA512 b4f76086702fe33d49d3650084d4c128f221d18a07488d0e793ac40eff4b86f7f32c23bbd6b92d399793ac6442c74390b6e1de3c311ef6066e173e2afdca4155
 MISC metadata.xml 644 BLAKE2B 28bbab4a2d177905c74f92f8c57bbe7d046ebcfafff891856d7361ae8c2982271d9f146b5cf5306070e48958eb110aa6855d0187051bb6d33ae4fb0798cbf967 SHA512 fc8f033978bedc4b9d080bc5d99dcd4200988b9751946fb855f182279a16913999c7372f6acb445818fb7fe336176dccd971b3709ee83a691966f6a35643de34
diff --git a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
index 8652e66d653c..eec1a0b98b9b 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
@@ -6,7 +6,7 @@ inherit eutils toolchain-funcs
 
 DESCRIPTION="A dock applet to make any application dockable"
 HOMEPAGE="http://www.dockapps.net/wmswallow"
-SRC_URI="http://www.dockapps.net/downloaduuu/${PN}.tar.Z"
+SRC_URI="http://www.dockapps.net/download/${PN}.tar.Z"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmsysmon/Manifest b/x11-plugins/wmsysmon/Manifest
index cf6b6d258f75..8ebc3bc12cac 100644
--- a/x11-plugins/wmsysmon/Manifest
+++ b/x11-plugins/wmsysmon/Manifest
@@ -1,5 +1,7 @@
 AUX wmsysmon-high-ints.patch 489 BLAKE2B f891c418f2b5e0e6bc48e6c136d637e4ae6b126c21539143c8354b67e9e400b785ec78d03d657fa1322e8a448fc404f62f9f0a6a445265b7ec61a2743fe503ef SHA512 314e509c4efb55402007533696291b9c543ffa4cbff84c3252ea9b9c7d6147c49241002bbef17fe28d0d00e4b64a4e5484f0f62d9b32ba4e9b2b5449026f94f5
-DIST wmsysmon-0.7.7-s4t4n.patch.bz2 8547 SHA256 b585793744c65ccc10c0b2b55c34f7c5cf0ac03b99526f50842ace99a1ce7245 SHA512 fbf43af697313c1f2c8c5d373b636b92b87140979c47037c214b2af8e0e94faa1df610e9fb94e677bfd6de94320e1e161ac1b1afbfb665fd7e86849ee93d8e1e WHIRLPOOL 33b3a7478db17d05155e8104c4f89f25defaaf4eadf00622725b39d95e879260f6e319271be7b89d30ee9cb3444d468166ee9a31e89ccd5f86f7d1cedd937170
-DIST wmsysmon-0.7.7.tar.gz 20866 SHA256 b50e3d834e799ff2b2a825c67534e049bed2af2c261d83b8afbbd4a9010d3e5c SHA512 6f472d132c7b5263c4b62e0972653ceee59743c4e292c0bdd95194e84373f4e7888311b40083691ab5b736c0ba292672d8eb306a220e95d356dd95b6b8519c0c WHIRLPOOL cf525c75b576aea805d41bf65315d6909964ff6067d95b79feb84e8617e05a140e6368dc1cd2596e7f7b92f2bb42207315c19b2ad826e44cabf3c1ea97bd25a5
+DIST wmsysmon-0.7.7-s4t4n.patch.bz2 8547 BLAKE2B 7c68524981336630b70a16e4e2935790dc246e40c7c16cedf2487e5145cebec797569042b5234b334988cec836878625ce631de4ff9cb8588e921a7d20c5d904 SHA512 fbf43af697313c1f2c8c5d373b636b92b87140979c47037c214b2af8e0e94faa1df610e9fb94e677bfd6de94320e1e161ac1b1afbfb665fd7e86849ee93d8e1e
+DIST wmsysmon-0.7.7.tar.gz 20866 BLAKE2B ddccccf05a5d54214336f58fe3c4cf8631da11098a2a8a42677b51e20414fbeb9dd4a8ec02c92cd8933635973470d56c2837b6ab41bb07348f39946f8b94dcfa SHA512 6f472d132c7b5263c4b62e0972653ceee59743c4e292c0bdd95194e84373f4e7888311b40083691ab5b736c0ba292672d8eb306a220e95d356dd95b6b8519c0c
+DIST wmsysmon-0.7.8.tar.gz 23533 BLAKE2B 830edc78222e8997c6ee23bdd9fcb28729e9b80d92b07f70a53d841065b7377f5c450024c511b4faa92043bd45aa0cc92e89ff900d7d4a53d3c9f4b57b4e6e7e SHA512 b1afd176851e8f89896e39b55d24d6efeb97eb5fdbb9c181cb030320445f1d8b22d31073edc615e6b47b91fd133b381f00b612901c8b312e7da404a4746bb97c
 EBUILD wmsysmon-0.7.7.ebuild 1130 BLAKE2B e1fd6516ec42907322d8970cde3182ed3c450ee1420ebe8648be1a5f348bd9d4b04aea31b4d0244fa85598ad78bc327e07134fa0d705956e9ffeebad5163c166 SHA512 84589ea18adad0a901a3ca02a0dafdb4088fa652979461210d2c1e22f983422b181b92246916234e3b139a1aee499354f9ddd334908010a169cee9d0082410c9
-MISC metadata.xml 363 BLAKE2B ed3321e1381636fb00c53abbd14a53cef146be1167763ec2a600ed8ab5f81e30142cb78b03783a5c59866983ff82d7625a39b205cefbce7c760aa1f6da07ed5f SHA512 1db6c08108c56b3664da8ad2b1c1f249f283fc654232ece02e32ac8b138996a17726f599114dcdfde7e753578228035c5bbe4dc9c8bf837476ec4202a846844a
+EBUILD wmsysmon-0.7.8.ebuild 669 BLAKE2B b5436d51b945c8f3f7aad49d3758fcfe90990f454631e0897e5651f1d4a668b7cf9a68de9c02a7dbcbb6de541857f0acf0e4eaf2dc62d5b8d213e50cf4c2f82a SHA512 8c6c58be81e81d3bcb0237ccd16a363c0d2b875f1da94bf5f1b45fe131b44f2e751ce066ebfec0ee320e24867ff3c627d33996b255f1be46a02e386f24cf4a82
+MISC metadata.xml 441 BLAKE2B c3d390d7ec7d2820d18f4e6e59d5c5cbe896eb3c382806cb91f08d1fb6fc14b3c1159056e6b0530d05c40063440fbc86ffcf25b7d09a88730371d95fce2384f6 SHA512 1d5973dfa2000bf13cdfd30750661eeecd1edfba8e15e3609fed7fd8d7b8f9f55ac2c591d39d6ddae65f71f5b4bb2f3c85e266227741d90d3ac6dd5c1029d3e9
diff --git a/x11-plugins/wmsysmon/metadata.xml b/x11-plugins/wmsysmon/metadata.xml
index 32d76dd54300..efaca79dc2c7 100644
--- a/x11-plugins/wmsysmon/metadata.xml
+++ b/x11-plugins/wmsysmon/metadata.xml
@@ -5,9 +5,11 @@
 	<email>voyageur@gentoo.org</email>
 	<name>Bernard Cafarelli</name>
 </maintainer>
-
 <use>
 	<flag name="high-ints">Enable support for monitoring 24 interrupts. Useful
 		on SMP machines</flag>
 </use>
+<upstream>
+	<remote-id type="github">voyageur/wmsysmon</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
new file mode 100644
index 000000000000..03c80f8de230
--- /dev/null
+++ b/x11-plugins/wmsysmon/wmsysmon-0.7.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp to monitor: CPU, Memory, Uptime, IRQs, Paging and Swap activity"
+HOMEPAGE="https://github.com/voyageur/wmsysmon"
+SRC_URI="https://github.com/voyageur/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+RDEPEND="${DEPEND}"
+
+DOCS=( ../ChangeLog ../README )
+S=${WORKDIR}/${P}/src
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	dobin wmsysmon
+	einstalldocs
+}
diff --git a/x11-plugins/wmtz/Manifest b/x11-plugins/wmtz/Manifest
index 971dcb843f10..921f5de40bd1 100644
--- a/x11-plugins/wmtz/Manifest
+++ b/x11-plugins/wmtz/Manifest
@@ -1,5 +1,7 @@
 AUX wmtz-0.7-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
 AUX wmtz-0.7.patch 1305 BLAKE2B 13b09b49fda781a04e73a29d56dc87e1aec8a71a4ea643d49797fb15c2b6eecd390d02885c9fbdb17e5614285ddc7831f4d1c75b9fb58976aefe4aeb78c05bff SHA512 4e04a1a95d39ebe9982d4f26acf827fbbeb953f4dcc695c5b39dcb46423bd9d58336838a3d8a28af142b9a5391625a6965ece158b735514adce4438afa662194
 DIST wmtz-0.7.tar.gz 26350 BLAKE2B c0cad5c7bbca9ddfb8168ef360385305e99298a076e5c317504f646dbf372e1b3af704960a0d3b8e528e3cf97414cc8e3b2cff3d4c37739c81744254411b03f3 SHA512 5de721231c7d7bcccc8a9b962069f4adad85158b39df2e77c6015ed3f24d4f8e43c90f91645e186d7f7c656bc6fb937b435925caff4e55abcfa0a8b0a9e75da0
+DIST wmtz-0.7_p20150816.tar.gz 19310 BLAKE2B 7f3bc0b077a9a667211cc588f1fb7c3d1d246256724a6cf5a17f028d2d334d02f898a798aca6fae11910868d312844bbe8ac5bfd190229f3ae829e97e50e2247 SHA512 60c9b66423332b155ce262d30026a5091c0379eb3257f547af1203d331968e9f334a533ed03832476512893d06cea857db9c044b30115978904510f9725e8455
 EBUILD wmtz-0.7.ebuild 960 BLAKE2B 24fc9eadac584e82d6e5346ada042b2cf4aa7e41a9a0e972cea5231110fe5c3e5eb5199abd480e76a79b1e751169c1c71b0ce654370e1b434b16e9418a97ef91 SHA512 af3b432709a7b10538e13462eb36716a55fada1694c5dd563c04ab40856fec305eeb1a24887028be281d1363ded280a0a78f61eb0ac429e3ef8ff639c3b6cc54
+EBUILD wmtz-0.7_p20150816.ebuild 912 BLAKE2B ec2fd1f2e3976ebb951c5d0d33febd7b686022c4deeb7bb5263c8b405a3e8c5eeedf4d7e85104d69cf3c63755142337630b163eec40bd1376637d3fffc0e2865 SHA512 8943948108030a3404018573cd1b4e195021f7a519dae0d27d5ceab2cb13dc56d05cc5c99aea46c3f43dab11a2d60c372ded5584a0b3ace12313df72f4c8e0e3
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild b/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild
new file mode 100644
index 000000000000..27ab7640558f
--- /dev/null
+++ b/x11-plugins/wmtz/wmtz-0.7_p20150816.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs
+
+DESCRIPTION="dockapp that shows the time in multiple timezones"
+HOMEPAGE="http://www.dockapps.net/wmtz"
+# http://www.dockapps.net/download/${P}.tar.gz
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	default
+	#Honour Gentoo LDFLAGS, see bug #337890.
+	sed -e "s/\$(FLAGS) -o wmtz/\$(LDFLAGS) -o wmtz/" -i Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" FLAGS="${CFLAGS}" \
+		LIBDIR="-L/usr/$(get_libdir)"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	insinto /etc
+	doins wmtzrc
+	dodoc ../{BUGS,CHANGES,README}
+}
diff --git a/x11-plugins/wmxkb/Manifest b/x11-plugins/wmxkb/Manifest
index 23959a26455c..e91e488ba908 100644
--- a/x11-plugins/wmxkb/Manifest
+++ b/x11-plugins/wmxkb/Manifest
@@ -1,3 +1,3 @@
-DIST wmxkb-1.2.2.tar.gz 196726 SHA256 26c3d7404543b5f6e5feedc4edde5217a0ba750852fb1a36297adaf77bff322f SHA512 4439c532cc2e0dbcbfd04664420fbdfdf65db47961d2b3374049bb78e20589478c2d3e07d01f1936ce7ace24f5da553546597fa7805c27bba45ac1dfc26d8f54 WHIRLPOOL 53dcf388f241a5bff2a1f20a304a6a5636a88ab7bf327b1424d34cdd25aed5bd38d3d1d1b346fb5244fef21071e904c06f3c94d82969a6cb4656d2970a5b42ed
-EBUILD wmxkb-1.2.2.ebuild 828 BLAKE2B 29be0808741162aae5fd489a0d0234763077e1cf314e6399e3b6a08e06accc5385da50cbf89cfbd9cb3c8637ad9aca19e74214495f49d6731dac287e7af35032 SHA512 8ee8b4c7a2fff01c1f14a1d337f249d527e654ba7071f2101507a55df1c35460ce8dea95271b09406d260c27f949d0fd493e1f9f0152cd75eb1216d95182c8a2
+DIST wmxkb-1.2.2.tar.gz 196726 BLAKE2B df0ae8275c82c4fb8965ef6761c82831edfccaf074fdc907ca4bf6b37fb853f6ccb31a05a76c0c392c8b9604a2f03af3bb1e7ed6918c2da09c2757ff93f8965d SHA512 4439c532cc2e0dbcbfd04664420fbdfdf65db47961d2b3374049bb78e20589478c2d3e07d01f1936ce7ace24f5da553546597fa7805c27bba45ac1dfc26d8f54
+EBUILD wmxkb-1.2.2.ebuild 837 BLAKE2B 6ee6c7d2cf72066c1ec83df5b3961bc60b058d317ae9ade2763a4d2d3d33caa46bc96494bf3d174290187313257e09720a946d5d91abc620b83e5688869262b7 SHA512 f0ea8900240e7664846a640289478450e9346eb586eb91d0403beed6ae8bd97c7f94f342079b9177a9acf90a51c44340de4b9e2ea8f5a8b04fc66c881ed2bd70
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
index 392e6c64abee..af99220d04e8 100644
--- a/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
+++ b/x11-plugins/wmxkb/wmxkb-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -6,7 +6,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Dockable keyboard layout switcher for Window Maker"
 HOMEPAGE="http://wmalms.tripod.com/#WMXKB"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="http://wmalms.tripod.com/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-06 18:23:20 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-06 18:23:20 +0000
commit	d37b97a25b8b10f748eead6574b01f893f140b01 (patch)
tree	13e2a142a31cd193a39c63042a64cab29a1f7ae9 /x11-plugins
parent	a833e3f4a431b8eea751b7420e127787f9c92117 (diff)