gentoo resync : 01.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-01 03:04:39 +0000
commit: 407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree: 844bea44d85dc7218f54970af1c42cc9d55c3f1a /x11-plugins
parent: 89c6c06b8c42107dd231687a1012354e7d3039fc (diff)
81 files changed, 331 insertions, 828 deletions
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 14b657327ece..e6c4e6a96b11 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/bfm/Manifest b/x11-plugins/bfm/Manifest
index 978de3926839..c9e3575adb2c 100644
--- a/x11-plugins/bfm/Manifest
+++ b/x11-plugins/bfm/Manifest
@@ -1,5 +1,4 @@
 AUX bfm-0.6.4-makefile.patch 1772 BLAKE2B 75c5f755af8e87665f926b5d5c099a43edc934192135f3cf31cd722d9bf9f22659f44d4490170c3f4251b58a259715aba4edc516d51a03c10df6ab15d9903d19 SHA512 9b419e95357d6d70fd8c6dc6c36823351906bddc80815e08e991e5fd32a4bd68ee70937679fd244df8facfe1dd3bbe9ccfbc96c6fe301d04b7ab8da9815afae6
-DIST bfm-0.6.4.tar.bz2 50634 SHA256 e5afb9eaebb67428c441c1eb0a98e5ad1aae46d2dcfe36567f9151c763ca04f9 SHA512 4255e31d1e04bbcd007be7a616184f97b2fb73711c2070859919666685848d75d5641396f206a6a6d70c656cbf8e97357aed3d663dc6d63ed1e7eb426d13f81c WHIRLPOOL 44b73dfe07d30f83aadd9e919dcdc004e60583e00d28df4b6c202db746b571c34cfb0c854536672338e614c61cc9e789b2adc0877bfd45d975b997a7d60f07f2
-EBUILD bfm-0.6.4-r1.ebuild 1245 BLAKE2B af6c41817b8fdca7a19f5e7ed1bd5f3540ab9529402c99abeb3e16bc3fe98b403b50ec9f6373a71241e77d2de9fb4845aa60bb640d2873a97bb54d658e8e43ea SHA512 6ed66cf3e45d72acd79ae5f94c00d8109e11ecfe82924f84bf701fe0b9c4ff17fd2858b1d5593a50773e722edf3aa4d6d02701fc2482e99f2592699d66001926
-EBUILD bfm-0.6.4-r2.ebuild 964 BLAKE2B e38c728e7fd62b933fc3e4383fed034827809a370b947715f0969b79af1364eea2780b3f142c11f3a9bfac20e2c06be71930bd9b95b2c1e2846c1efb4c0ec511 SHA512 6d4b8cd180a3a54c1570431dbd3c9f9dd8fc8181d1ab0f3f4f7e4c0de8d36abcd778a02672ad1c90a89104ad18a33668aa578fb190178725aeee7fdb7153eff1
+DIST bfm-0.6.4.tar.gz 59288 BLAKE2B b70d98a944e2e6daaf694dc90a0f8cebc01afd8e11c46fde614e2b2affbe0e331cc15a308837fe987238182a3b4b631bb0d8f8d7f50b84c8705e113425cec7ec SHA512 1a039ef7448c610d2629b50bcac082e7d70eb755aa43e79e6b0868448f92aea5078548273c5f278fac878433cdcd9492589fb1612108807a4fd2afb0e07612a4
+EBUILD bfm-0.6.4-r2.ebuild 985 BLAKE2B 757d3a92839c1c33be79889b5e752a1dc24c93c24bf0125f3bdd9b362a806c35fba340ed33899e3610db05637c4f2a389231564ae13027870345c2f4b8c51338 SHA512 c7bdb388203ce8e8129049f50fa7a466a9d29eacf07535474c4a71829708148684b116b4a19a3a6d4fbb94445dc4f3d86a1df7652c525aa1164f1a97e4a6c909
 MISC metadata.xml 348 BLAKE2B 97496aab8db3d8075f89e58745d4f988cc33fe4570ade80f97a5bfcda4ddad4be5f2de4fb695eb0b1a6f66af36986ec609bee10ee34fbef7a244489d6ed2e5c3 SHA512 fe0a9044c9c8d839007a04e0ed0012da1d22df3435f237620d49b0d1efa4bce533b116f15e6fa34d1c494d65729d0667ac29a2e06a4b2009ba24510b97f4f93f
diff --git a/x11-plugins/bfm/bfm-0.6.4-r1.ebuild b/x11-plugins/bfm/bfm-0.6.4-r1.ebuild
deleted file mode 100644
index 7c79d6369157..000000000000
--- a/x11-plugins/bfm/bfm-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit multilib toolchain-funcs
-
-DESCRIPTION="a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime"
-HOMEPAGE="http://www.jnrowe.ukfsn.org/projects/bfm.html"
-SRC_URI="http://www.jnrowe.ukfsn.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux"
-IUSE="gkrellm"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gkrellm? ( >=app-admin/gkrellm-2 )"
-
-src_prepare() {
-	sed -i \
-		-e 's:CFLAGS =:CFLAGS +=:' \
-		-e 's:LDFLAGS =:LDFLAGS +=:' \
-		-e 's:strip:true:' \
-		-e 's:$(CFLAGS) -o $(BUBBLEFISHYMON):$(CFLAGS) $(SRCS) -o $(BUBBLEFISHYMON):' \
-		-e 's:$(LIBS) $(GTK2_LIBS) $(SRCS):$(LIBS) $(GTK2_LIBS):' \
-		-e 's:-o $(BUBBLEFISHYMON):$(GENTOO_LDFLAGS) -o $(BUBBLEFISHYMON):' \
-		Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" GENTOO_LDFLAGS="${LDFLAGS}"
-	use gkrellm && emake gkrellm CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin bubblefishymon
-
-	doman doc/*.1
-	dodoc ChangeLog* README* doc/*.sample
-
-	if use gkrellm; then
-		insinto /usr/$(get_libdir)/gkrellm2/plugins
-		doins gkrellm-bfm.so
-	fi
-}
diff --git a/x11-plugins/bfm/bfm-0.6.4-r2.ebuild b/x11-plugins/bfm/bfm-0.6.4-r2.ebuild
index 0c803374a220..21af78bf45a4 100644
--- a/x11-plugins/bfm/bfm-0.6.4-r2.ebuild
+++ b/x11-plugins/bfm/bfm-0.6.4-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime"
-HOMEPAGE="http://www.jnrowe.ukfsn.org/projects/bfm.html"
-SRC_URI="http://www.jnrowe.ukfsn.org/files/${P}.tar.bz2"
+HOMEPAGE="https://github.com/JNRowe-retired/bfm"
+SRC_URI="https://github.com/JNRowe-retired/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index 47c103878743..aa2168661fce 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -3,4 +3,4 @@ AUX docker-1.5-makefile_rename.patch 1485 BLAKE2B 9eb850af5f9d28aeddccf8823e5598
 DIST docker-1.5.tar.gz 14863 SHA256 47629578e89d96d1541c91d040aec4316f03ad6d01dc3eecb8f82a33445c1e4e SHA512 71b47156c31e5db5620612d3444eb298489fb33da296742c10543838e65677daa1b81bb054e6a7f57b9e2adef47406c32040983cb09988d93778a555e72cd861 WHIRLPOOL 2b8fbb60a901f97e71dc31cb876ee42f5b3ff6fe898f4d01b54e98d61352090d561b00fde16f081736ab9882d70281b49102c95a29211e1f0bec1a2f55bd75e1
 EBUILD docker-1.5-r1.ebuild 787 BLAKE2B 17c7e90de7035a4debc6bdbbc0bcf3262f3a1f7463d51a9a0b8b3f14ddd9e52d3ab451b699a83b4258cd605e2a2931807deea3c64ffcdabd80f179344753638d SHA512 4435130417c3a40cfcc82e605e72b42c4f9befdc9be4d9bd0025007fbfcdd1b55cae22c55f56cd913978de1907525d291f3d0ad3614dd367973b9c143d0a51f9
 EBUILD docker-1.5.ebuild 761 BLAKE2B 90645028f5cb5c26c4ebbf4c39975eeb40b610e23dd929511a1780fb37441d3aeec737e2bfba7ea3af11efb4f793a147555fa8f847662eba705e5065a3e11fd9 SHA512 3b16029fd96cb99155baebf684fdbf9e1640e737dedd53de90cf28c12d67198dd173d0810ac1fb8e21cabe8a1483be31e9307fdfe098702ab3a3583b227333bf
-MISC metadata.xml 348 BLAKE2B 1dba279539ef318ddc495aac0243fa6e6d7f46624023623a7c9e3a8330ef22e441211c59b3fd3c3fe790f18ca424d4c22f0878adaac184c9eeb37a160d4c9b55 SHA512 2aaec4451c836c176509bdef56e7a3670286fe1b261366d29e04369d884fd5ee2a23e1882a1b39a40edb42c16871195782e6a9177d1392a46ddced2bc01b211e
+MISC metadata.xml 353 BLAKE2B daba7749ff12a604d50b655d91edc03ea4b2259e871f42275ac69b9ce2587ecb6f98f0bd33d664f5b1029bbef88e4575b3a35b102df0999dd8e6d456382a5b96 SHA512 4a9684de4ffe83fb609b3c36e721cf0033814ab4f5d664725d1af8caa9c77e095c03d61c33dd7a0f9458a37c184bd8606235f74cbbc6f5c25665681a6e5c0fb3
diff --git a/x11-plugins/docker/metadata.xml b/x11-plugins/docker/metadata.xml
index 775ce9559c30..c691b64fc49f 100644
--- a/x11-plugins/docker/metadata.xml
+++ b/x11-plugins/docker/metadata.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>voyageur@gentoo.org</email>
-	<name>Bernard Cafarelli</name>
-</maintainer>
-
-<longdescription>
-  Openbox app which acts as a system tray for KDE and GNOME2.
-</longdescription>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<longdescription>
+		Openbox app which acts as a system tray for KDE and GNOME2.
+	</longdescription>
 </pkgmetadata>
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index b11622698f57..f97af3a14104 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,10 +1,11 @@
-DIST enigmail-1.9.6.1.tar.gz 1745021 SHA256 3874331e981aed864443d3c965d856e003fd84f73e5a89fd5004ced9dc29b96f SHA512 e6ab69734a39a4953e0167e07b06f0d5c83fb42956515392319a1cd9d665ca274f6a12b4141e2dfa373ef074f0526f3d7330a48d29d600fc38f724d26518ff84 WHIRLPOOL e89b0e5857564cc2f7ebf3ab46b110c6bbb1b16e7c0e045750119fd02e693b9bd9667c2932e7a65f9c8fb2c7c835ed048f6df2613d12b25d961894f47f67cf48
-DIST enigmail-1.9.8.1.tar.gz 1776673 SHA256 4bcf2da00d96a67921b24dbec9f43930cba41112a2cd241b0952eb573c648a4d SHA512 af280040e96eb69529e723e52e65621e42743c974b0ed42598e73458004f0a59688da7257d2b556e95a56c4cad3ac48f527d4d9a7a54c9c92eaff132257e0cfd WHIRLPOOL 077c61b996c2ec45ecc3a037b61d167acda2ebdbde6536e2f2f2e180a064c9e540e09b48417454aa48f02af5f4c58c88f4ba456e6c5f113cfe474f2b82798ac0
-DIST enigmail-1.9.8.2.tar.gz 1776792 SHA256 5add4f6ff771cb8652e64eabd6dbb6c12cc305cbc713d3df8d342eb11b49857f SHA512 4db069752a8251f4989ab9736600b83f005a066f99b2830add088514d0afec69871c998c148535e5dc212d3635c35990a90161a47c18398805e1c51497263431 WHIRLPOOL 7ccd83eb26079cf67b36316b8e9c62e776be0af14aed14d49dcb12b6c794d2615bf34d1e634b4f243fb3a2370dfaa1a7cf7c5bfb30a1fe6dd356ce47c9b031af
+DIST enigmail-1.9.6.1.tar.gz 1745021 BLAKE2B 0fdc1e2e3f16491759cb360593e2132524150b34bb30234d520802f30aef8869367ac9a6e9fe75722ac2aa9a60dbf4ffb71293a07f8d460ea3672e78a8cb6772 SHA512 e6ab69734a39a4953e0167e07b06f0d5c83fb42956515392319a1cd9d665ca274f6a12b4141e2dfa373ef074f0526f3d7330a48d29d600fc38f724d26518ff84
+DIST enigmail-1.9.8.1.tar.gz 1776673 BLAKE2B 9a8251ced15ee4feeceafc3ee261f877886783428224dcb1616e411864f70f6fd822503ba82ebe9fe61462cb25baabda6c5cf65ff8738a53719b7e212eca8e78 SHA512 af280040e96eb69529e723e52e65621e42743c974b0ed42598e73458004f0a59688da7257d2b556e95a56c4cad3ac48f527d4d9a7a54c9c92eaff132257e0cfd
+DIST enigmail-1.9.8.2.tar.gz 1776792 BLAKE2B 901bc4d735c461e1fad39bc7f2a613eac6c087af5053f7d15ee80fdef790c4a022cffd8972dbd2570d39e9f51ac29db287ed6c04745f36f07b93312401262cc5 SHA512 4db069752a8251f4989ab9736600b83f005a066f99b2830add088514d0afec69871c998c148535e5dc212d3635c35990a90161a47c18398805e1c51497263431
 DIST enigmail-1.9.8.3.tar.gz 1776756 SHA256 53d6b29061058d81a76db51c73d3bfa92425530e92f92b940ba2eca6b3dbfc38 SHA512 d8c08b1824352353c7596750b801604f7216bc5a138563b1fbd5fb890901e9c7c03cb2df099c9158d6bf3125fa17c900f65fb21bc40a8ced67a6812cdc0e02d9 WHIRLPOOL 97441938834ae60261adc4c621e9d3f567a645e4785818218b1112956a514ed11466f7caa46eb1dcad4e31fb4ac4ab685fe8be717f1087e3cc866ec2081a2145
 EBUILD enigmail-1.9.6.1-r1.ebuild 1302 BLAKE2B 2d553c9ca2a117f39c2aea293a57f61371c13100147ad85b24217ebd7c75d779bfa3c1d5a6c5d69683e02416c308ca56ae985bd61f2d5d633d5805fdd1bfcf6f SHA512 a62356a3ea2dc1d7befb86548f41e47d89a0f838088c0467879a4b2304695bbee52ce5dc4478323b266cfe747c4ac86eeb971a8125a091232948d2d2d5a6bea7
 EBUILD enigmail-1.9.8.1.ebuild 1302 BLAKE2B 2d553c9ca2a117f39c2aea293a57f61371c13100147ad85b24217ebd7c75d779bfa3c1d5a6c5d69683e02416c308ca56ae985bd61f2d5d633d5805fdd1bfcf6f SHA512 a62356a3ea2dc1d7befb86548f41e47d89a0f838088c0467879a4b2304695bbee52ce5dc4478323b266cfe747c4ac86eeb971a8125a091232948d2d2d5a6bea7
 EBUILD enigmail-1.9.8.2.ebuild 1306 BLAKE2B 9f835cf1b1f4c9fea8ffb1e146ef1ffab92310e4ff4a3ff2c15abee6795abea636256596eccd8e355eea1215c68083ab34deb951285bfc3875014142af79c8f4 SHA512 97c14d79f519aba74d595ab4df7a65fcff86ad27cc2027def749fec4f04c5a46a6f513cb005dc23c71fb7dca729662b0eaaa1366efba2c202beb728f725e7402
+EBUILD enigmail-1.9.8.3-r1.ebuild 1926 BLAKE2B 644f2d380d1f4874d95a5f2486a3c8b48ce69a6c1996ca294196bd99adb9be9fa67c5f5989bcfed7e02a9dfb8712f907501c1908bf011d523dab1b76662361d1 SHA512 c0928b04123e35cb055dab5456fead52f942ccc41897219b98c9c414d2786b9f17ad7de96cd7961231d5d71dffaaf9cc9becd2c1ab4a082e76b652d5444d67a5
 EBUILD enigmail-1.9.8.3.ebuild 1306 BLAKE2B 9f835cf1b1f4c9fea8ffb1e146ef1ffab92310e4ff4a3ff2c15abee6795abea636256596eccd8e355eea1215c68083ab34deb951285bfc3875014142af79c8f4 SHA512 97c14d79f519aba74d595ab4df7a65fcff86ad27cc2027def749fec4f04c5a46a6f513cb005dc23c71fb7dca729662b0eaaa1366efba2c202beb728f725e7402
-EBUILD enigmail-9999.ebuild 1370 BLAKE2B 5a7474e7673ea07656b717ce0b131e6ad303d3af7c97f3f328a97e540afd6ff218b74ee367d25af20899cc168cdd17dc50c5727d26cf230d78b1f86807b45f7e SHA512 a148f3a6b2c83fd6bc005b8a54c5d37c7a10e5717b4f2d26e995bf2749078afff98d8ef42c381eee668759c649c88f6d5647d6aded9d3e8fad92b31cb8461a2e
+EBUILD enigmail-9999.ebuild 1915 BLAKE2B ccff9cc03869ccc02a313a3f96cdf25081424b295e03dca6f6a69449da99013708efc20fd5141e61cff2b68640d466a6141a60df51b29803c4ac11a47eebdcd6 SHA512 4b8c948bf8aef1eb2d2a422ee66d8ad0df4a0ef312ca7c16dbe12654b0bcc504e3882bbd258e5630a0e51977f14028b059940b47fb464bb7534daf47d6270374
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild b/x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild
new file mode 100644
index 000000000000..f51f9c93aaa3
--- /dev/null
+++ b/x11-plugins/enigmail/enigmail-1.9.8.3-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="Mozilla extension to provide GPG support in mail clients"
+HOMEPAGE="http://www.enigmail.net/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="MPL-2.0 GPL-3"
+IUSE=""
+SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
+
+RDEPEND="|| (
+		( >=app-crypt/gnupg-2.0
+			|| (
+				app-crypt/pinentry[gtk(-)]
+				app-crypt/pinentry[qt4(-)]
+				app-crypt/pinentry[qt5(-)]
+			)
+		)
+		=app-crypt/gnupg-1.4*
+	)
+	!<mail-client/thunderbird-52.5.0
+	!<www-client/seamonkey-2.49.5.0_p0
+	"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-arch/zip
+	dev-lang/perl
+	"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	emake ipc public ui package lang
+	emake xpi
+
+}
+
+src_install() {
+	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
+}
+
+pkg_postinst() {
+	local peimpl=$(eselect --brief --colour=no pinentry show)
+	case "${peimpl}" in
+	*gtk*|*qt*) ;;
+	*)	ewarn "The pinentry front-end currently selected is not one supported by thunderbird."
+		ewarn "You may be prompted for your password in an inaccessible shell!!"
+		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
+		;;
+	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog ""
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
+}
diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index edffcc2deb93..ec95bc9fb44a 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -44,8 +44,18 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/share/${PN}
-	doins -r build/dist/{chrome,components,defaults,modules,wrappers,chrome.manifest,install.rdf}
+	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
+
+	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
+
+	# thunderbird
+	insinto "/usr/share/mozilla/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+	doins build/"${emid}.xpi"
+
+	# seamonkey
+	insinto "/usr/share/mozilla/extensions/{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+	doins build/"${emid}.xpi"
 }
 
 pkg_postinst() {
@@ -57,4 +67,9 @@ pkg_postinst() {
 		ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end"
 		;;
 	esac
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "Please restart thunderbird and/or seamonkey in order for them to use"
+		elog "the newly installed version of enigmail."
+	fi
 }
diff --git a/x11-plugins/fsviewer/Manifest b/x11-plugins/fsviewer/Manifest
index ac8fb9fb0b13..8885319f357a 100644
--- a/x11-plugins/fsviewer/Manifest
+++ b/x11-plugins/fsviewer/Manifest
@@ -2,8 +2,6 @@ AUX fsviewer-0.2.6-configure.patch 696 BLAKE2B 9e4266e78f161f1a416becac9023ff5a7
 AUX fsviewer-0.2.6-fix_title_bar.patch 2963 BLAKE2B b776fd1e04ae203186a428169d0d8cac9be621d3089983bc3598862386680b6e614d851eb8dffd7db8380251af5c8722a2417ee880dd5bf1201922d5a3bf009c SHA512 cddf339433cb1e3f0db282234a2c115b9de23cb1ca4500745dcb624186b8c918bad3ac415f2132be05cfef9d1fd879471e1aa5b904b83b3caae7b548935c7f97
 AUX fsviewer-0.2.6-gcc5.patch 301 BLAKE2B b3c427a897b554548e62fbedc9fca134440d727aec146e161e84b498538b9c122b04b448fe079761cb6d4764d9253826612ac337c900b8d778cabdcaed145d37 SHA512 ccb76e22192e174700f06e45e73a2e357e865049c7fc9b6f23bff90e424d78cc13a16dfc220b0d5d4a602055e81c9577e76fb080a2ec0743b45ea93afb689407
 AUX fsviewer-0.2.6-wmaker-0.95_support.patch 1624 BLAKE2B 4351d0d079aa8e153f84cede3ea4b9f495f567bdc747db26eb0d8c2992b96677d49f4f176665307a8c7a89e7f3586e062064c3c9d5bd1408d8f5e33262bb9914 SHA512 d9cde107c34f13e4041d8c20d98e2051acf7c518f60454b891b4fe3a83995eb65e4db51f1699911f480fe09ea1d938750f620a85a9b71bc6f5f48affbe3c4dd9
-DIST fsviewer-app-0.2.6.tar.bz2 785422 SHA256 18f964da350bf617a76ccca6411000862394bca09f7616b5b019d6a760bfa57b SHA512 47c10a049120db8e5b095fdcc82033b66a4413f8f7e88959f0190b568324e85c8362486e0419b9c098e62e19e38dd8f2f56c6f0d1e7829afafd21a4837b4859b WHIRLPOOL b3304d65687dd1444787caadfd31164cd67535adad99e5d8d6c6b221187130d44653276ffb3048961db87d2e877f76adf25b635a9c8fa98b427224ce2e012e76
-EBUILD fsviewer-0.2.6-r1.ebuild 1012 BLAKE2B 07cc3244b6e924d70acd8bd0ae34c2196e4c9af1eb5746ac29688ba80c86f8a0bc9116c2e2441b2fa5feb38266ba65bd67178210420a8c9b3796b3826c24524e SHA512 50af34780ce4b83c4c887e516ab891d33b2025a0588de1269b157026b3688d8fe407d757953049bf5e8e6277fc47e859e02796899d626eba2daf83fb7efed4fd
-EBUILD fsviewer-0.2.6-r2.ebuild 1033 BLAKE2B f39f5fedea759c3c9ecade75617adb80a6731dcaa3ddb68761d94b5522eaccfa115fe64c7ad896d9bc559092255f967ed3f823a5ab38f02364a6ba300fb7072b SHA512 33f8980d00b94fa90ca1378a2ab0294cf2e2a7796dd3e93deef969e6088623e17722d50c54632de74f1cc092a18ee803ef4c2e965c5f6ae8b16b0dda0e648a39
-EBUILD fsviewer-0.2.6.ebuild 919 BLAKE2B 8f6c77116f483164436a8e2a764f0267a786a1e21755a22c4f5f103bdf4501c8bd38c38176ce0f0b6d1d6241403dc0d9ed2c6858265cac0207d7b22a26394680 SHA512 7d91da240527915724038de499f3a13cecce9648dab92afa41b49009746bc5db40e870e85d8267d6cf067f7cc2a8a51494d99b5a57d3b8b4b0aa2ddd65e490e8
+DIST fsviewer-app-0.2.6.tar.bz2 785422 BLAKE2B cd9650fec13cbe6082c7b6cf30db75d179a870673908a02ee5fcf5439bbbb5e86815b634dd536552197c6dc20d3866f3168a49978a0c9c5ec5b3c49543a19a0c SHA512 47c10a049120db8e5b095fdcc82033b66a4413f8f7e88959f0190b568324e85c8362486e0419b9c098e62e19e38dd8f2f56c6f0d1e7829afafd21a4837b4859b
+EBUILD fsviewer-0.2.6-r2.ebuild 1019 BLAKE2B f37d58a5555d096696a012ec04e8f353aa32172723b897f60e7e9abdb901d7df0ad17472b8f69f6169baad77c55c718924d8c736094f34f754c8a4a5e8feed56 SHA512 4029c0c6df716624198bf346dd36e495face7d0c05c10b462c4f5e1f5f07b1443eaba557680099e2dc1aa52769c8df073f6367843faab55aec21b171349a955f
 MISC metadata.xml 252 BLAKE2B f7125c07f7cb9fe1a8d301f198091320ba83ef3547e579b9825298715066ba3506be216900b5317106da011f95df9411b99b100f14f741832ab500fda6acb788 SHA512 6a56c24e3731dd9512fa264d3dce1fe36ace891a17394c483586e0be1fffd153e901228d3ee9c471a226b04cec27d3f78ed2de491e46238de4b06538dab7e724
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r1.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r1.ebuild
deleted file mode 100644
index 31bd54604bf4..000000000000
--- a/x11-plugins/fsviewer/fsviewer-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib
-
-MY_P=${PN}-app-${PV}
-
-DESCRIPTION="A file system viewer for Window Maker"
-HOMEPAGE="http://www.bayernline.de/~gscholz/linux/fsviewer/"
-SRC_URI="http://www.bayernline.de/~gscholz/linux/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="nls"
-
-RDEPEND=">=x11-wm/windowmaker-0.95.2
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
-	epatch "${FILESDIR}"/${P}-fix_title_bar.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-appspath=/usr/$(get_libdir)/GNUstep
-}
-
-src_install() {
-	default
-	dosym /usr/$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
-}
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
index 582ddf81f70a..3e682aad1fd3 100644
--- a/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
+++ b/x11-plugins/fsviewer/fsviewer-0.2.6-r2.ebuild
@@ -7,8 +7,8 @@ inherit autotools multilib
 MY_P=${PN}-app-${PV}
 
 DESCRIPTION="A file system viewer for Window Maker"
-HOMEPAGE="http://www.bayernline.de/~gscholz/linux/fsviewer/"
-SRC_URI="http://www.bayernline.de/~gscholz/linux/${PN}/${MY_P}.tar.bz2"
+HOMEPAGE="http://wie-im-flug.net/linux/fsviewer/index.html"
+SRC_URI="http://wie-im-flug.net/linux/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -46,5 +46,5 @@ src_configure() {
 
 src_install() {
 	default
-	dosym /usr/$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
+	dosym ../$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
 }
diff --git a/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild b/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild
deleted file mode 100644
index a7a568e38208..000000000000
--- a/x11-plugins/fsviewer/fsviewer-0.2.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib
-
-MY_P=${PN}-app-${PV}
-
-DESCRIPTION="A file system viewer for Window Maker"
-HOMEPAGE="http://www.bayernline.de/~gscholz/linux/fsviewer/"
-SRC_URI="http://www.bayernline.de/~gscholz/linux/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND=">=x11-wm/windowmaker-0.95.2
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-wmaker-0.95_support.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-appspath=/usr/$(get_libdir)/GNUstep
-}
-
-src_install() {
-	default
-	dosym /usr/$(get_libdir)/GNUstep/FSViewer.app/FSViewer /usr/bin/FSViewer
-}
diff --git a/x11-plugins/pidgin-bot-sentry/Manifest b/x11-plugins/pidgin-bot-sentry/Manifest
index 135c02d7cd72..83304783fe9c 100644
--- a/x11-plugins/pidgin-bot-sentry/Manifest
+++ b/x11-plugins/pidgin-bot-sentry/Manifest
@@ -1,3 +1,3 @@
 DIST bot-sentry-1.3.0.tar.bz2 280673 SHA256 e65581328a508a82cd32d246f4037ea3b044eafd223c3c967947f847db28e736 SHA512 ec665eee2f9b64eccabd10116cb1d1e4be046bc9a6132cb815373be915d265b29b33d41298047f82f920f5daac70a966169ecb201450ba47d76d090c581ee788 WHIRLPOOL 1a52d09188c5838f352b87b09066d563c9ad37e6d38145ebb32178a62b3ba69395f067cca785b5ec70c0458e642872e2f6ae511967481bc19ef0f9d93e5adcfc
 EBUILD pidgin-bot-sentry-1.3.0.ebuild 655 BLAKE2B f1a0097f8f908317452e8787c34945c1fb572d5174645053f63daf1198e93b709629c4997e69aabb1578902b2426c62ef8a105e39ec510f5affa3e5e3ac5af76 SHA512 fb5b61b2dcf0a4f116bc703c1c8fea09ea86a94ae04f3de888764e16b3a6e1981193416ed00cadad6add27553d8abb2e47dd42558f6903dfb32cd5764ea94f8c
-MISC metadata.xml 639 BLAKE2B 5bb0db13e43fdb5079174e741378e7b05f4edcfafe1a5659714b91c1a5b042d8146ec45b19ea4ce428671c8183629294a180a4dd988cb7681f59c054a0fa7046 SHA512 90febd229b516ad4504d865ba317666fa5fa2981cc3404c58c08cc331787e4980b134c29915604382a8b8495ea33a38b1cd42c4a7fb8e6841d25e95b0c5f8e34
+MISC metadata.xml 632 BLAKE2B e050f74b9e54fcc3e43f6f8ccf6db556bf9835dcaa1ccd4109272a491379a607eae353e623e6fa90b9c0d628971028a39c7081fa5482744828acd0acc697f410 SHA512 04ea684e516bbe941f75cbb6b0687a780aa26a02c1b759c1790cdb94d4a58fbf8d26a437a45f857e2b984fa2bffa4270f867e8768fead87e4442bd23dc21504a
diff --git a/x11-plugins/pidgin-bot-sentry/metadata.xml b/x11-plugins/pidgin-bot-sentry/metadata.xml
index 0171dd0ebc91..fedb7369b097 100644
--- a/x11-plugins/pidgin-bot-sentry/metadata.xml
+++ b/x11-plugins/pidgin-bot-sentry/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <longdescription lang="en">
-	Bot Sentry is a Pidgin (libpurple) plugin to prevent Instant Message (IM)
-	spam. It allows you to ignore IMs unless the sender is in your Buddy List,
-	the sender is in your Allow List, or the sender correctly answers a question
-	you have predefined. 
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">pidgin-bs</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		Bot Sentry is a Pidgin (libpurple) plugin to prevent Instant Message (IM)
+		spam. It allows you to ignore IMs unless the sender is in your Buddy List,
+		the sender is in your Allow List, or the sender correctly answers a question
+		you have predefined.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pidgin-bs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/wmMatrix/Manifest b/x11-plugins/wmMatrix/Manifest
index e65507a6aeb0..93d6b1b443e2 100644
--- a/x11-plugins/wmMatrix/Manifest
+++ b/x11-plugins/wmMatrix/Manifest
@@ -1,4 +1,4 @@
 AUX wmMatrix-0.2-makefile.patch 867 BLAKE2B ae3ee0f850c5e9c24050728b8eb488b7fa24ee9e9faf36a2b6e3469d783dc3c1e868698a0db341ee750a88396712741e3a44bca6b40ab32a7ae1c275b4cb3af1 SHA512 cc41c9fda2f50356b5ce5ef5ce06fc707167d797b44ac42abac36da593d321fac28280f2e1011f4f3676e071e6ac00769ce99f449d5b00f4a882a59b2f061042
-DIST wmMatrix-0.2.tar.gz 225343 SHA256 ce7b18b1046985237388846332234fd5aaae7b6ba2476ba465e4e57208b75053 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c WHIRLPOOL 49290e6aa357a32e414509aa806f2b51664fb93f980fe6f86b0c85195b6b071d2239c86c21b8ac86b4834a7a82520f40acd8e902e91dd5522107b7c30cf97831
-EBUILD wmMatrix-0.2-r1.ebuild 931 BLAKE2B 40f913d486ab2c4d1b40fea129f211a58d1eb7ea31c0364f75687379c9ce1ad8cc43631bc58467c2b5fa3d459418f75290dd83e1be688b1c8c9332d1fb7507ee SHA512 0ebde33d028c8b1f392c63670dcbc3d441ad47d32c33c2441adba3ba12db1b26b2d13211cde97b383ac67644080cf4ec107a1e39f416b9ac65043659b82eb520
+DIST wmMatrix-0.2.tar.gz 225343 BLAKE2B 4d649ac8e9691a75c7e9a32266074a5624ef83e4f91a6474bfef67df1e3d5b653b63b5909a5bb5460312b36ea661404aa843e2d7ba56a39e43b9a815e734d121 SHA512 4cc65c90e5279645163833f6c8a57bce0d81428c1e5106a98dd74c1b0d693f2dfd3b230e49f9ce710ecc8073477750db94dd9b3c2b96ee026ef0c666f4bc3c4c
+EBUILD wmMatrix-0.2-r1.ebuild 899 BLAKE2B b88f1adfccb8e133ee578149668734ef3a4dab8d7349fbd17029beac630339da5b4929585426e0e3ed75df7c721a81919d97c371ba157d65a32a03c9c0660f9e SHA512 088c8570bca47024aa9e3ae25d8b66a678b23ebb8721cbfda7098c0a5547d7fa21b8f8c87d7300d14a5ebc188a0f8fee18f97dd45c3adfbb2988bab522377b36
 MISC metadata.xml 399 BLAKE2B 6bfd19f3c2d730bf940451fc81183a61fc8ec623a7d50d5873b0209a66a0c529fe1a04e41f87ccb63f3dcf8fd4c53b188fc16c200c2dd11b6be0ec348626d036 SHA512 88cc0fb5ea844bfe955eb9af1d8d10e333ddce44e27bb10d8cc538c2a662b990ec001e25d86475f26720b76eea8fcbd70885593744395f0e99f33ee6352770c3
diff --git a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
index 7599c92c13b9..6ab6d1bf039e 100644
--- a/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
+++ b/x11-plugins/wmMatrix/wmMatrix-0.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils toolchain-funcs multilib
 
 DESCRIPTION="WMaker DockApp: Slightly modified version of Jamie Zawinski's xmatrix screenhack"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/17/${P}.tar.gz"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/10"
+HOMEPAGE="http://www.dockapps.net/wmmatrix"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 CDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmSun/Manifest b/x11-plugins/wmSun/Manifest
index b7b9b1663804..bf392fcfb1c0 100644
--- a/x11-plugins/wmSun/Manifest
+++ b/x11-plugins/wmSun/Manifest
@@ -1,6 +1,3 @@
-AUX wmSun-1.03-makefile.patch 1127 BLAKE2B 3fd017e4a0e7635b742f3ac3a3355e8fca3afe528c094e119e07403415687b31b879a1d6200bc3e99c7240c47264adceb42dc7c559babffc6d2d642b16312dae SHA512 2d27a68c67a4d8bc121db0870cc5373b8499be9cc0a20e50e8065658570b470c4c0362f8a1f254e76eeb7b2ae98275946f1b46d9470f4fd3389c4f914363ca8e
-DIST wmSun-1.03.tar.gz 49744 SHA256 a46e11680d4625589d4d91030e17916c02405451e60d366340668a01597c4ea2 SHA512 d12eb1ed1e409bb9470d9e504f2b1a8319cba7724ac0ce09d0f9a4faa7967b4a546d614a6b20ccfe67929799cd93e7c9ddda5011b40923e4dda817c33482ed53 WHIRLPOOL 1e81176b48f79ec44548478a4a5474103a774dae3cf471abdb4cc82c9186079837e7123a7992dd08ffe62783270702993ac46db9cb2c5a556b72c009a744010a
 DIST wmsun-1.05.tar.gz 20680 SHA256 c70429aa8c201f3135bcea1c6ab441d3441bda399d8766824b9e506e9c85db69 SHA512 baa610db04ba67ca09112765e28c0fa945a98a61b642925dbaaa56a5b3e7da7424d8dd15097dcec932e3b603219d1f8806c0e50c025370226a157791f16911da WHIRLPOOL 2002a90c39369fec6a5567e32c4445d50f9fc5b5b07b70a2de6bb7f720ea68480249587346a519316dc96925b794273d9662f72815d7ab04cc8e748e5bc3244c
-EBUILD wmSun-1.03-r1.ebuild 892 BLAKE2B f92327e0e9a0c89017d80b3ae911f5eb6f06892fb68b4c44f77cbba12b43b26552021f65b66dac114472a03610d9254b69ac1f9becae21033968bc8ea267bd87 SHA512 692ef9402d67f60a456fc5b76870399374d3e762085cded0f60d76bccf96617c8566687d38035bf7c344049b74dbd49e33339ec39dbdc5e581a440bee52cbf51
 EBUILD wmSun-1.05.ebuild 719 BLAKE2B dbe35ac44ede77cf9ce57ace2180f7710c4f0399404a7c48ce4649e0386a796a857fa6594910222012a35587558525c4826740d86894f40c34737da0047f69c4 SHA512 bc8b51eb4912b9c81b678df8f8c7a9e3d2ea68ad279547d7b416dd40d8ece1bf517ffdff522f174216a61be83664858acd3e7538b799fc0e91b7bf76692e2f68
 MISC metadata.xml 498 BLAKE2B 5b9cf3d5fc309ce34ff85551823b360a8bab9af01b39896d8c305837dfcbe64b4ada8f2bd61245870bffeec9d64bd7f70db1c16b6676af3996df64ab59898de5 SHA512 e94d3712d961ae49fdb73b15a70270915cfcdaacf95acb7176c35d64ba6b186d6144d55f4c6e1eed36d33656ed82ced988ece1a38f08a5b08658db063d1ce3df
diff --git a/x11-plugins/wmSun/files/wmSun-1.03-makefile.patch b/x11-plugins/wmSun/files/wmSun-1.03-makefile.patch
deleted file mode 100644
index c12f6771e4db..000000000000
--- a/x11-plugins/wmSun/files/wmSun-1.03-makefile.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- Makefile.orig	1999-01-06 03:28:39.000000000 +0100
-+++ Makefile	2008-01-28 14:58:36.000000000 +0100
-@@ -1,8 +1,9 @@
--CC     = gcc
--CFLAGS = -O2 -Wall
--INCDIR = -I/usr/X11R6/include/X11
--DESTDIR= /usr/X11R6
--LIBDIR = -L/usr/X11R6/lib
-+CC     ?= gcc
-+CFLAGS += -Wall
-+INCDIR = -I/usr/include/X11
-+PREFIX = /usr
-+LIBDIR ?= /usr/lib
-+MANDIR = $(PREFIX)/share/man
- 
- 
- 
-@@ -22,14 +23,14 @@
- 
- 
- .c.o:
--	$(CC) $(COPTS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-+	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
- 
- 
- all:	wmSun.o wmSun
- 
- wmSun.o: wmSun_master.xpm wmSun_mask.xbm 
- wmSun:	$(OBJS) 
--	$(CC) $(COPTS) $(SYSTEM) -lm -o wmSun $^ $(INCDIR) $(LIBDIR) $(LIBS)
-+	$(CC) $(CFLAGS) -o wmSun $^ $(INCDIR) -L$(LIBDIR) $(LDFLAGS) $(LIBS) -lm
- 
- clean:
- 	for i in $(OBJS) ; do \
-@@ -38,6 +39,8 @@
- 	rm -f wmSun
- 
- install:: wmSun
--	install -s -m 0755 wmSun $(DESTDIR)/bin
--	install    -m 0644 wmSun.1 $(DESTDIR)/man/man1 
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install -m 0755 wmSun $(DESTDIR)$(PREFIX)/bin
-+	install -d $(DESTDIR)$(MANDIR)/man1
-+	install    -m 0644 wmSun.1 $(DESTDIR)$(MANDIR)/man1 
- 
diff --git a/x11-plugins/wmSun/wmSun-1.03-r1.ebuild b/x11-plugins/wmSun/wmSun-1.03-r1.ebuild
deleted file mode 100644
index f3fdc46d24bd..000000000000
--- a/x11-plugins/wmSun/wmSun-1.03-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="dockapp which displays the rise/set time of the sun"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/16"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/23/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-S="${WORKDIR}/${P}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake clean || die "make clean failed"
-	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)" || die "parallel make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README ../{BUGS,TODO}
-}
diff --git a/x11-plugins/wmail/Manifest b/x11-plugins/wmail/Manifest
index 11a1645d82ee..757fc44c28da 100644
--- a/x11-plugins/wmail/Manifest
+++ b/x11-plugins/wmail/Manifest
@@ -1,5 +1,5 @@
 AUX wmail-2.0.maildir-parse-from.patch 325 BLAKE2B 5f20b7f90a0cd09a4f49f7dee36399d8c9a1a7624a6f326a4f21f20f4f541d59f4fcdb2e53cf94908a15f8eee6aab640b45c9b5d8d01aeaed737d15e692e57b6 SHA512 fd5dab53aebf8e1e50c740b09fcb66eb74a9146b7c589b76c09544f90e28d134912617ff96fceaf297e650da4f0f08ec9c3363abd64f29ae1cf5f014b8dc4862
 AUX wmail-2.0.support-libdockapp-0.5.0.patch 1026 BLAKE2B 5156ae7d5ae67aa36dbab6ab394aa5fd7c9aea89401a2a7a724ce1f1e6bc1862ba97f6df820ef65655e827a9bfe966e245158ab6ba0e24e9ce0ed4f881a1c035 SHA512 672f97466c02161e000432fb0bd9507240a4a4d2ddf109ad342c7a25fab4ff5e0ef35fafac4440c9becc63f829a752c1ecaedd59304274f66523aa1019391770
-DIST wmail-2.0.tar.gz 46468 SHA256 edcf77bf6a638b96dbd78efe4802d260a68385ab2deb6d6774e325ea0cd3d245 SHA512 62ca761619af006221ac64003246b8d7b0dacee65cd4dd6a5c31e6fc152f9f97646ceb7e757bd81333a792c73280479591dc24bb29f9da2023f2927ec2827039 WHIRLPOOL e10e5a06570de6eb725045ed2e72d07db39791433b0d454b6796cb452170add4aa9781eea3bc73fe53294d4e5f6e58dfcde019c830f154a9235dce16f1656c91
-EBUILD wmail-2.0-r4.ebuild 1102 BLAKE2B 40ad1f3c7f4518db7eb04f11490516590b10b0c03fd333f2a1266b90addcdf1a6e1fc7bbb66f6ecb6bb45fdce51155dad07949579167a25c61fc6704cd8c2f71 SHA512 961d4df4466739a5b4bb5ad9c3c6386168bc723e7aba934014db28774b8fd6e52a25b89a7708279b416c8a97d1c105a0109a153ff6e2f5801e6223469e443d89
+DIST wmail-2.0.tar.gz 46468 BLAKE2B 316743065f72e14339e4c7d9bc1d394d0f5ccfa5772efd94856bef184fa3a60a1892c510f07655dacbf0b470492e085e413dcb29e3ec166c5d1a1f03d388636e SHA512 62ca761619af006221ac64003246b8d7b0dacee65cd4dd6a5c31e6fc152f9f97646ceb7e757bd81333a792c73280479591dc24bb29f9da2023f2927ec2827039
+EBUILD wmail-2.0-r4.ebuild 1068 BLAKE2B 9b0493b083ad4edd4141fe58fd1be26bea12d14b4355f9fb284a4851d683f4bae765fa8b3ef677ac08d0ac552c587baffe2f0cf6f9c57ec00bb2554024602bac SHA512 56326c4198f4dc26380632208f4305c81eedad4b8709d57b3cbb2ee314f29936c2e794dba571d1b7a66ca7f7b87038acb52969e3c045e7c6843e2f28ace22779
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmail/wmail-2.0-r4.ebuild b/x11-plugins/wmail/wmail-2.0-r4.ebuild
index 05aa49412753..945197456b8a 100644
--- a/x11-plugins/wmail/wmail-2.0-r4.ebuild
+++ b/x11-plugins/wmail/wmail-2.0-r4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="Window Maker dock application showing incoming mail"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/70"
-SRC_URI="http://www.minet.uni-jena.de/~topical/sveng/wmail/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmail"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmamixer/Manifest b/x11-plugins/wmamixer/Manifest
new file mode 100644
index 000000000000..274930114a5c
--- /dev/null
+++ b/x11-plugins/wmamixer/Manifest
@@ -0,0 +1,3 @@
+DIST wmamixer-0.2.tar.gz 93067 BLAKE2B 9e888b9b3214eee6c8e59da564e36e8f7c1e55df711ebeaaf73300b27b934840994177d003f2be14f40b5e30321c572e82888e030534ccc7cbe0ff12109231d4 SHA512 94f971ac59134f926b637c6c4ef80be1e082b9b81d2e744b921562140e610e958233645c0ee12310086f1aaa3bbb20622c6c92666dac51df3a963e725374583c
+EBUILD wmamixer-0.2.ebuild 686 BLAKE2B 69a6eb27ab1200acacf2442933db287e09ec709ef947272c176208f82512f99c34290d4faf974931dffa199bc511785cc81bfd4bc502c62b1196f614bf6c4d37 SHA512 a3c72164687ffb7098ce4c34c906fa418a5085a327421d0b0c142b66ad2e75998ad55b731ffcc10f3e772278b6562815c194d2aaf801898566829ad22d1f91b0
+MISC metadata.xml 474 BLAKE2B b04cb3956e9f0b9043bf692a6d61024c8986ff04217f8bc9ce0fa15f7db50522798085eb5f4fe828dd9dd8c5baa11bf3ad658bc9cbd703b7e9cee3ab31320357 SHA512 2ef950ff6ffc4ec050aaa62f0da4589043a2b56df7f4e9c80bac8614e5817872dd08bacdb15b584f90a0b790812cbf3a6ebc343ffc65ffeb0cae081266891283
diff --git a/x11-plugins/wmamixer/metadata.xml b/x11-plugins/wmamixer/metadata.xml
new file mode 100644
index 000000000000..c8826bfc6573
--- /dev/null
+++ b/x11-plugins/wmamixer/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
+</maintainer>
+
+<longdescription>
+Wmamixer is a fork of wmsmixer and is an ALSA mixer dockapp for Window Maker.
+
+The code for the ALSA part was taken and adapted from amixer and alsamixer programs from alsa-utils package.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-plugins/wmamixer/wmamixer-0.2.ebuild b/x11-plugins/wmamixer/wmamixer-0.2.ebuild
new file mode 100644
index 000000000000..a684fbdad792
--- /dev/null
+++ b/x11-plugins/wmamixer/wmamixer-0.2.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="ALSA mixer dockapp, fork of wmsmixer"
+HOMEPAGE="https://github.com/gryf/wmamixer"
+SRC_URI="https://github.com/gryf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXpm
+	x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
+
+DOCS=( README.rst )
+src_compile() {
+	$(tc-getCC) ${CFLAGS} -c -o wmamixer.o wmamixer.c
+	$(tc-getCC) ${LDFLAGS} -o wmamixer wmamixer.o -lm -lXpm -lXext -lX11 -lasound
+}
+
+src_install() {
+	dobin wmamixer
+	einstalldocs
+}
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
index 8eb824acf684..dd99ca9679ca 100644
--- a/x11-plugins/wmblob/Manifest
+++ b/x11-plugins/wmblob/Manifest
@@ -1,3 +1,5 @@
-DIST wmblob_1.0.3.orig.tar.gz 180039 SHA256 d26850fe15e444817ed9996663427bd933a74d4e5591008a5a7c39d21e2583b2 SHA512 0af749349928cb2a2dc0e51b7e299305e51ddfdf42b320d7462acf5e3d6c92674d6c54fdace6fc3a1c5256540887ae50da9b82218753d3f954f4c7d69a5703fc WHIRLPOOL 2c5391af1172fb7e453fd617d70853f50b8b5a5c6918cd6c4162174caad93ce0ee4357644a74d1a52984f54ac68641c088f483de41326622e3f9d09d4bd7f6be
-EBUILD wmblob-1.0.3.ebuild 731 BLAKE2B 76df086bc7fdcf5ffc51ae129dfac3db905561208278ac14ecf4ca95504c1a70b1395fe5f240b4d7b22330e9e3571732b5d52b723d8d8eb08905f51a0a5b96c1 SHA512 fafd468d2d99c618e70129e54e1910a7d20f389af506c5645da7cc38d9bdc6d07421fe98d7c77198aecbf5d5a476071103a589886ad84dfbf06fe4effd8eaf97
+DIST wmblob-1.0.3.tar.bz2 160657 BLAKE2B e36f7b8c6dd38466da490bd85d03ff2f378caced8d5908b00422428223aaa1fc3754bfd35dcacb2f162b0d44c8c04b509cf5c00d678d687e5b90cad886ce98a6 SHA512 4d8c7e30218d9ec7dc965c69e69b0fb5839c468f695ec2cc9fd9bb0b8fbc89b1386122e11b75906169bb16d13dae16cd8287c5bcf8bd28ccbbad4d4f057b3414
+DIST wmblob-1.0.4.tar.bz2 179284 BLAKE2B 79025a4d80c05bd8f9d1a962762680e24ae0eb09c8bf961833f4f4c59b086ecc8563ef71c28678c969da75f1f074c691c9fd6a6919358886e64f7fcb814611a3 SHA512 d325711e6c6c865a97386793a7c3f0e0833044001ccc336f2a4e9974799e5ff00936b0d90a0dc4a3280ba27a8d1f97239ba51d61e6e5b104e7cf82c8aeed5ec1
+EBUILD wmblob-1.0.3.ebuild 745 BLAKE2B 6610ad4bac52fd5b10461c513aeeeedb90a0a872cf68c8348a9e4f4be82e8ddfa5baa85aee9aca229b47b6c229d3754bf0df92ebfe9caa432b98a4f8e92e2a6d SHA512 3ecadf3b6c06025fb110b136c4be35e0420e408e220f31fcde83934d1193f2dece629c2aff1213d04cf57085294c8ffb2b663b788b3d450815a5c00b69326f36
+EBUILD wmblob-1.0.4.ebuild 738 BLAKE2B c81a5da95ee998723bfa557c350095a040bbf99142c61ae264b50e3860b5d7c02e9b82da59bbdce8132d93054a1c51e9ba558d13c5cc3d7eb88fc7cc2d7469bf SHA512 515fdda67a225b2c8af2260d9906bb0aecad09bb7c2f0387b7aaef7cb36bbfba55794772eae8e200a8809bcf1786e593435657708c596d1eeff22298351ca122
 MISC metadata.xml 326 BLAKE2B 1da63467b87683bcbb2e3e8a74094449c20b94c5a891a59fa154cb9f0ad21ee89c4bacec8b19bbc74d3ce687f18740eb972a0051e7fbb6794e3b1ef30a83ecb2 SHA512 73f3d392f88613008cd221ee98c5836f324127237cd3e64681b90f7067c3d60ed1b52855e79aada62cd70157fe78cb2c7f7d93c6cc81c58498b8b6734f2dc420
diff --git a/x11-plugins/wmblob/wmblob-1.0.3.ebuild b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
index fe7b4768397e..188ec7aa803f 100644
--- a/x11-plugins/wmblob/wmblob-1.0.3.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools multilib
 
 DESCRIPTION="a fancy but useless dockapp with moving blobs"
-HOMEPAGE="http://freshmeat.net/projects/wmblob"
-SRC_URI="mirror://debian/pool/main/w/${PN}/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="https://github.com/bbidulock/wmblob"
+SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmblob/wmblob-1.0.4.ebuild b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
new file mode 100644
index 000000000000..a1a61a71f9fd
--- /dev/null
+++ b/x11-plugins/wmblob/wmblob-1.0.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools multilib
+
+DESCRIPTION="a fancy but useless dockapp with moving blobs"
+HOMEPAGE="https://github.com/bbidulock/wmblob"
+SRC_URI="https://github.com/bbidulock/wmblob/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-libs/libXt"
+
+DOCS="AUTHORS ChangeLog NEWS README doc/how_it_works"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:-O2:${CFLAGS}:g" \
+		-e "s:\$x_libraries:/usr/$(get_libdir):" \
+		configure.ac || die
+
+	eautoreconf
+}
diff --git a/x11-plugins/wmcms/Manifest b/x11-plugins/wmcms/Manifest
index 303ceac7af30..d55822ecf456 100644
--- a/x11-plugins/wmcms/Manifest
+++ b/x11-plugins/wmcms/Manifest
@@ -1,4 +1,4 @@
 AUX wmcms-0.3.5-s4t4n.patch 8562 BLAKE2B d1b99dc03a8dd0fd2f1e5d387ee8b763a0b1633199c20ab231fa8496a253f9124ad7508bd66cf742660b7aa9ddca16b5eaa887f08ddb4e8de0dd10b7cf490370 SHA512 ad25dead5271907845ae96efec52844de1005f31ddbf4d2e43996633ef8c54c89f9137421b019079462227a16052df950c7f589d112815c8b02b435f863e8b09
-DIST wmcms-0.3.5.tar.bz2 18920 SHA256 9b47672b3fa5a2474fe26dabb0e95030a4792766ce6577391ab1cd784f21d09b SHA512 f2852f8b81e1eac0396ca0964590fdf2560b97b5ee5266288641487ddfe77879e552c5e77e42f398ecf974a9030dd147ad64eedf7f7c32af53d69be31c8598fd WHIRLPOOL 5271e3a7c42745ea8f0b2a27dcba8d717e9b3e9243a862975d1f6b6f8430a0a92a80d3eaa0695ad8ba620a4b9d32c5a692c6178780ebde1168ff30bc5b478a84
-EBUILD wmcms-0.3.5-r2.ebuild 737 BLAKE2B 7dc46197919c128a3e02021c8074c911470a3177aad5402d41b352e5bf45e21e601768288f16863e980831c30fc353fa017cc63d9959f1e679edf2ddae0e8c98 SHA512 bff3367b118587288fe102efe521174dad468e7174de0610ef2fabae90621c0ed3123f508c6c887f58d8a66c3123ba79453c2dce1a6d4c38882be7c890185efa
+DIST wmcms-0.3.5.tar.gz 19855 BLAKE2B ac97dc403e6adeebc85b386ae7c78a8537c33858950f41059aadb750909b22fabef5bed3114e9552b381d3fb9d603e90236c88a614ee168a46214f64b9ca50f5 SHA512 ef57e6b278c14163de0792e6af8be40ef721020594fb2871aad34543471869ecf468210c173861a93b4f22e1dfca8f1e4254aec6508adfdf143f3a0f1a49f549
+EBUILD wmcms-0.3.5-r2.ebuild 726 BLAKE2B 4ccad87575754d0d19d036e9fd0478bd3b31175f8edaf5f8bd97dd170da14229f33ba0a97abd5e0c973ae6161cbe956a725af6432e9dd54297baad52b3c66c8c SHA512 063a46cf1bbefa3c9d894c13328d6d83e2fe0c121a5af5c05d5bac1384b443047995605d0c38f6b69d932749e3b82f49a697970866ce37c93fda753f768e4294
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmcms/wmcms-0.3.5-r2.ebuild b/x11-plugins/wmcms/wmcms-0.3.5-r2.ebuild
index 6c1a11c25e70..39876e15b96a 100644
--- a/x11-plugins/wmcms/wmcms-0.3.5-r2.ebuild
+++ b/x11-plugins/wmcms/wmcms-0.3.5-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils
 
 DESCRIPTION="WindowMaker CPU and Memory Usage Monitor Dock App"
-SRC_URI="http://orbita.starmedia.com/~neofpo/files/${P}.tar.bz2"
-HOMEPAGE="http://orbita.starmedia.com/~neofpo/wmcms.html"
+HOMEPAGE="http://www.geocities.ws/neofpo/wmcms.html"
+SRC_URI="http://www.geocities.ws/neofpo/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmdots/Manifest b/x11-plugins/wmdots/Manifest
index 79f6a0e85eba..b8773e5d14fe 100644
--- a/x11-plugins/wmdots/Manifest
+++ b/x11-plugins/wmdots/Manifest
@@ -1,4 +1,4 @@
 AUX wmdots-0.2_beta-stringh.patch 325 BLAKE2B fdd3cc86c6eab458926bdb1a33f6050c36716e9840e2d20b60e4835a4895cd3083760c0f01953ab9470691b23fda40e7001f135dfa994d16aee3253205d6e741 SHA512 b2da0950f0b74f6a25bb57d5fd27e315e5e4a1cca41c5cf413bbcf5a7d50ff5312a8d2903a646b2ba7c79007b8804e6518fb9a14b25fdd1028104d7800726f60
-DIST wmdots-0.2beta.tar.gz 94933 SHA256 c25be89d9f0ae840dff68034663524591f9e33fc7bba0c7b264f39ca08fc8c9e SHA512 2e9d42c4086f240ece0a29cb6131bad2d499bb7f08e8a444cf72ce1a9813f9919f9d47c4dd5ae015e6c2e76601f1e7ab421a67daed1cefed45dcb06e4cbd8488 WHIRLPOOL 34369a5801969d4d67f9e0d35f7d949cf559447c8ed50fb35ddfcba1636b8f20972cda0f888a1d254fae4a428f40436edb31dc05050b3953ad81e224da9cb147
-EBUILD wmdots-0.2_beta.ebuild 960 BLAKE2B 045bbfaa84f4ebe89211a723491a55168debe8c4863b2ff3bee1576d2222299c2ebdd59eb594386386ab9e90807b9ebf58c3534201132e421b59a03e1e8725c1 SHA512 e0c5d318885b9aa5c5685b25dfbfd4b04743b040eef05cbbe247812b8c6e3369bd8f4e6ad0760b23fd382233b4917885d94eb0ffd73e09ddf8713cbb9af233c0
+DIST wmdots-0.2beta.tar.gz 94933 BLAKE2B 76a722b60989855b47dcf08539299c7bdf57485595d0f452d8ec10ef57f350810396bda396757c266dda8cb1db9bb3f1823b0f9759b1cb85c7e1ff469f5d2a60 SHA512 2e9d42c4086f240ece0a29cb6131bad2d499bb7f08e8a444cf72ce1a9813f9919f9d47c4dd5ae015e6c2e76601f1e7ab421a67daed1cefed45dcb06e4cbd8488
+EBUILD wmdots-0.2_beta.ebuild 923 BLAKE2B 6b9b69d33fe43e054a610e63978de3a5d5600659e73b5155c7a58c9e1892acfdc40601dca51679f53d50844ea8a494136497a0f896513f58e81b9fc5ca96420c SHA512 95b17d22a3c3bce99c2c8f28ea6d6c7b1d64f3e9edfc9cee82a5397f65c6c5f9ec0100bfb701bf98a5154af45940457596f79240ef74ca634ebc0d13cf0dd511
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild b/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
index e302138c1552..51612dd19952 100644
--- a/x11-plugins/wmdots/wmdots-0.2_beta.ebuild
+++ b/x11-plugins/wmdots/wmdots-0.2_beta.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="multishape 3d rotating dots"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/116"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/153/${P/_/}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmdots"
+SRC_URI="http://www.dockapps.net/download/${P/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest
index 0f5a44e96a5f..9e27f2b2baaa 100644
--- a/x11-plugins/wmfire/Manifest
+++ b/x11-plugins/wmfire/Manifest
@@ -1,6 +1,6 @@
 AUX wmfire-1.2.3-stringh.patch 352 BLAKE2B 59523193d0adc31509fa41020ba945dd095cf648d75ff600b088657a82c9167fe1bd5464c9ffdb7bad650dd5605e7072375da562a8ed7307b576eb468d149b30 SHA512 bd0e66712cb88eb61dc4348d3f08775b6673598cb8e74a8d4c2cc437c6c9a515b1bd1568edda70d6b60f6e88da6eabe38c5bf800571ccc72c493bf367a435a94
 AUX wmfire-1.2.4-lastprocessor_SMP.patch 3890 BLAKE2B 5b53fd87f6dfce827e5d2403c32e303a7b8dc5d663e93223c6dee6c5bec70f7ad3c07e2261edac7330886eb907bbda72e2635ca3a308d5e0f63b701f31e90976 SHA512 2d0bdc693e53c9c8669f1277134629c3fb506f6c20d67121aef7a624878d56db7a5afa227aaca7c669d0f8ad999ceeadd48380a3f8e9d061ddb853d09f0eb539
 AUX wmfire-1.2.4-no_display.patch 561 BLAKE2B 0ad1727683f143fc6f9f986d61074d875e38f0c289145eb8dd3a77de28ef6bb379bc2424e3f6ee83244556975ab772ba1b068e3cf3c3a927a04ab1f68cffc0e0 SHA512 260aca5113d220afc5e4fa461ca891fec3e88d2c14040139f32a1849ead906eb6d313519392e45c3a22b4728b9ce1269254edbb3fc05488e3e4534bf56e1edb1
-DIST wmfire-1.2.4.tar.gz 91144 SHA256 e38b508519faf132273a9eaf75db56f1b14a5912667dd6843fc902d4a0ca2f80 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b WHIRLPOOL 0b2ea82d4af5408b8ec6c0724f766f86958ba5758306bdb17a940580cbbf699150874e8f15bcaeccc642d70ed825fe8aa6377479fdff62c2ffd75849746e589c
-EBUILD wmfire-1.2.4-r2.ebuild 918 BLAKE2B 81b23be2a38d1b7a3eef51d4235ac704464fdf65906e934239ad8e5163041d60374289a3a0f713e2653b5738fb0e7cbb88889008a532c4e1dc47cea92b1912eb SHA512 3bad3a719e9a82283a5f7fbdeb13cd3cd06a3ac5a3e6787b054e32f9a4dc914d0e1be231132c29444e6f5cc596812e51d1ff9614717c99754a617aa1ff42a476
+DIST wmfire-1.2.4.tar.gz 91144 BLAKE2B b51595dfbafefb26cfb28c729683e01e8eee5683c0379bc831fd5c9172576c4375b3262da9a167ce157a67317e15d25179d6fba067c70d04ebe3e362fc3db315 SHA512 391a76c5f7292751591becebdb6267c29270e24cf9faff7e748431ffa51e74806a7b407a6493f9d4cfdc7865e4d8e8b803567b0a54caddb9b42f82160938c82b
+EBUILD wmfire-1.2.4-r2.ebuild 918 BLAKE2B f625b4be7ceaea1932bd4248c710f25d44994331900170f576c69d5f44255f197b7f81b4d43e0d86c9c324459871b65299ee2b7d3ec9753783b865dba8e2f488 SHA512 93ba885ddb78741601311d0be8863c0afd4607a8ef56f4a9ee1ae9763aea1663302e54f3cab83eade6c20f07ff052932aa052740c0e55ccb988c13e8625e489c
 MISC metadata.xml 573 BLAKE2B c75563b4bec05cc6903b69585a1d456d81ba429a99109e841ec3c0ab51327ad91c323c1ef4321b47e56cf5e9ccbff257f7efc6f042afd8715d5224143fe2ac9d SHA512 fcc7884a474831f97f318d07eb4732842e00b570e9f74374fb99eff8071e26b10ad2862df8150ae532069194514085c6e1e85b1d256468ce80d2760eac438502
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
index b471cbf67420..94ff738a9e47 100644
--- a/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
+++ b/x11-plugins/wmfire/wmfire-1.2.4-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 inherit autotools eutils
 
 DESCRIPTION="Load monitoring dockapp displaying dancing flame"
-HOMEPAGE="http://www.swanson.ukfsn.org/#wmfire"
-SRC_URI="http://www.swanson.ukfsn.org/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.improbability.net/#wmfire"
+SRC_URI="http://www.improbability.net/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmfortune/Manifest b/x11-plugins/wmfortune/Manifest
index b2dfe9e79858..55e205799c08 100644
--- a/x11-plugins/wmfortune/Manifest
+++ b/x11-plugins/wmfortune/Manifest
@@ -1,4 +1,4 @@
 AUX wmfortune-0.241-stringh.patch 382 BLAKE2B e8772171211d5ce4ee56d18a340a86ab42675ccaf6448462f58de87e916350ca10cfb1a0f2f8e3b96f56e22c9927f354575603a68069bc97bd1c5f1802dbdc33 SHA512 ff03a7473f3dcb45a882f3298d04830253f9d2b88466b2e8201f0c2bd96fce979c70c184446e35b665b41a173c7fb494423001b7a7208c4d5c7d993fd928d0b0
-DIST wmfortune-0.241.tar.gz 23406 SHA256 b149067b7e3521f7e03354b12754baaf9c5556af4d286bbd6d169b1db9f6dba0 SHA512 d5640090c2f2ba788ab9367b70d948d4f1d846174714e2415e81500f5fef6c3e7e81b12575274bdb3a760fa3e2e9ab499880713a923add136089969b394f9409 WHIRLPOOL 1bbfec73e9858e78aa627409c7df08b51edf0b36bfcf7f4cfbe8a5c862400585054eb60761962677cd3002edcf775d2296cf90fadad7e2537346902a69ae487c
-EBUILD wmfortune-0.241.ebuild 898 BLAKE2B b034e512666ea19613680349db486e9e3b3e61dfee0dc98bd5bdcf1e97b2ac8debbbca77a7fae4e47b4c4f9d6116d7a439c14fbe394119e55437af5de552b704 SHA512 35e3a20531e2ec44adfbfe1066b204c07e0c1131481cfb9fee53cac1c746e2a781090cc8ce346fd02be2355c6142c7c04bfdcf7fb1da34306fc0ac3eb08874d0
+DIST wmfortune-0.241.tar.gz 23406 BLAKE2B 2a104d4f5d9ca1865618b95c2d6e4bb49cb841325442f58712c4bca1d971b9ef6512d509e80753b8a96e7978d5198b3a4f6fc2d54c6182b439b4d30cbe73d6df SHA512 d5640090c2f2ba788ab9367b70d948d4f1d846174714e2415e81500f5fef6c3e7e81b12575274bdb3a760fa3e2e9ab499880713a923add136089969b394f9409
+EBUILD wmfortune-0.241.ebuild 866 BLAKE2B d9d1409828b42e64151d87a87f96c5e0357af95035dde92e4a1d3a691680978bf2171b76570d929b59a3bea5a9e09ea3174750bedcf387ec3619ab073ec83a55 SHA512 d9867adc2ef6b0bb16fc2e859bab693f4fbfe866acc1582b85681163cb3c57173197ae13b4f7dee3358ae5c89fa246188b2d98c223e70190e08f5e6477b26866
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmfortune/wmfortune-0.241.ebuild b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
index 1a84d48c9638..1b31d0ad97bf 100644
--- a/x11-plugins/wmfortune/wmfortune-0.241.ebuild
+++ b/x11-plugins/wmfortune/wmfortune-0.241.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 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 dockapp showing fortune-mod messages"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/90"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/128/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmfortune"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
diff --git a/x11-plugins/wmfsm/Manifest b/x11-plugins/wmfsm/Manifest
index b837386b7a76..3352cc5e4bce 100644
--- a/x11-plugins/wmfsm/Manifest
+++ b/x11-plugins/wmfsm/Manifest
@@ -1,7 +1,3 @@
-AUX wmfsm-0.34.linux-fs.patch 598 BLAKE2B 853ce639499fc88c98efa2dcbdafcd66e4f3fa6f88602a3d264a030b57a4180a6d2e92fc1193b80f16122172589cbfd368b4caf2ae6bcae57937ba8df1bbee8f SHA512 4240970988a458e777e8d82d8843dea44ee04b026969f67159c6db572da098ead2e97de58c2c667669badc7ecf90a76b8a75cc88ddf0a24f0a6bf7a3d4553244
-DIST wmfsm-0.34.tar.gz 105220 SHA256 8f2ac20fceb96cd2508aff2996e5c9896946345ec77b676190f46386b1ee571b SHA512 bf215d199e616c3f3d35d2556f208d76c9d5587e267d0dea3cdc48bc6b73c9216a35f5c683aa9cbfb425c01ff23e85c2a2f435fd87c82c8b26baa63dd7b03f08 WHIRLPOOL 5729efa3ed6896b40121f4f0911799861413f3e4483eec7c550609d9114b2aa3d2f9292d0a40d0cf35ce64034baf327573784854994fbdda3463c83f1624d696
 DIST wmfsm-0.36.tar.gz 20456 SHA256 81b84d66f9dcc681401b997a3bf927dc7f4280e884202d0cc7570a2317460f99 SHA512 d5d148f67f226e38a8b3c2475cdae9d93cb545ca79afe93060137b36f09a328db82b4561a6dd76abe7f5d59e944e8c8ed0f85ab1ff1727c659195c88d1d7406b WHIRLPOOL fcac308c30e7c7f94c2d9fb8e0215d548a6c48327badef19934fa697cbcf93b54a02c296a23b4ea48541c3e0a889836f0cb834948acf7ce2a2e4be9fec77f20c
-EBUILD wmfsm-0.34-r1.ebuild 670 BLAKE2B fabf813f222242e2d15406eca98d345004cfed319a2609d89557b27f1f1a314f0c9afb940dd6d0aeee6fcd8588f9758023ba7f64c65a3dc85719b7c387833a72 SHA512 8edbfeb5d8060b7e5f3856c083f870150c33f7192a44f721e09b9600413df5d6af116e183cbc0b0d28c3a095af3f8593fef40c320ddd96dd8ab09888578498ca
-EBUILD wmfsm-0.34-r2.ebuild 723 BLAKE2B f46e22e9b5b2b520b5077eff3f4314cce8ba7e108191b2cfd95f9fba1824ddeb86b1089a66c0aedccccfee6f9e7f5f5952fd44f54bdd6a84b3c5740e3173353e SHA512 0e7a8e6274b9de0e1c2d2481ff2213f4f921d046b02545ca2c539f3bbdb86960bab30b4bfc6c6e1dec1b662654a1b95b60b8035fd682d4070b68eb68703200bf
 EBUILD wmfsm-0.36.ebuild 688 BLAKE2B 6dd3c198e4dc61481ce78b1da153aeda9268035d7fa99bab99b5504b31489df93e7fc4712c2462b75df266c04b41e239554a70a6c3f4da0a6c4869357e9255ad SHA512 4c82f5fe2e438531a2cab73b1ee6f2940a00f994812a4316adb289f140590bbbd11537d17abfa7457f6682df85a06069d3988e00b569184132ffdab52995d351
 MISC metadata.xml 423 BLAKE2B f8e13f183c54fd207cc333f9ed10f1d02e30c1e02a8fc1b1ed5ed4d5031e2cb3646b5a4d922b4617add3d523a8b0e5f473f065777216372d287a44cefd6549b1 SHA512 aef12ee2b0434ebf22869050ac6060f6effef07c5743f2b9e8a48705b7d9c09b149473b985d419f21a4b20dc86eb59eb2b0aaf617a1395d0ce7070d5763a3cf3
diff --git a/x11-plugins/wmfsm/files/wmfsm-0.34.linux-fs.patch b/x11-plugins/wmfsm/files/wmfsm-0.34.linux-fs.patch
deleted file mode 100644
index 51ea67314775..000000000000
--- a/x11-plugins/wmfsm/files/wmfsm-0.34.linux-fs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wmfsm/wmfsm.c	2002-07-13 06:06:35.000000000 +0200
-+++ wmfsm/wmfsm.c	2004-07-17 12:31:19.686338920 +0200
-@@ -509,7 +509,7 @@
- #if defined IRIX64 || defined(SunOS)
- 			   strcmp(fstype, "hwgfs") && strcmp(fstype, "autofs") && strcmp(fstype, "proc") && strcmp(fstype, "fd") && !strstr(options, "ignore")
- #elif defined linux
--			   strcmp(fstype, "proc") && strcmp(fstype, "shm")
-+			   strcmp(fstype, "proc") && strcmp(fstype, "tmpfs") && strcmp(fstype, "devfs") && strcmp(fstype, "ramfs") && strcmp(fstype, "sysfs") && strcmp(fstype, "devpts") && strcmp(fstype, "usbfs")
- #else
- 			   1
- #endif
diff --git a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild b/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
deleted file mode 100644
index 4f830254b327..000000000000
--- a/x11-plugins/wmfsm/wmfsm-0.34-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-IUSE=""
-DESCRIPTION="dockapp for monitoring filesystem usage"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/100"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"/wmfsm
-	epatch "${FILESDIR}"/${P}.linux-fs.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog
-}
diff --git a/x11-plugins/wmfsm/wmfsm-0.34-r2.ebuild b/x11-plugins/wmfsm/wmfsm-0.34-r2.ebuild
deleted file mode 100644
index 33626ddfa0e7..000000000000
--- a/x11-plugins/wmfsm/wmfsm-0.34-r2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-IUSE=""
-DESCRIPTION="dockapp for monitoring filesystem usage"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/100"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.linux-fs.patch
-	sed -e "/^X11LIBS/s/-I$x_includes //" -i configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog
-}
diff --git a/x11-plugins/wmgrabimage/Manifest b/x11-plugins/wmgrabimage/Manifest
index 055faeaa2076..fa45816c0f14 100644
--- a/x11-plugins/wmgrabimage/Manifest
+++ b/x11-plugins/wmgrabimage/Manifest
@@ -1,5 +1,5 @@
 AUX wmgrabimage-noman.patch 296 BLAKE2B fd055cac17460696c688b8e078a9759047cb02e84d6efda95d87d9c67e61b3fc618b172240b0632f4f02ecb99c0ed4392cc1982a869ace5b18e8bf38036c6850 SHA512 201cd10897b1862dbfbc07fc381e34f86cb4b7660f543617bdd83bbacca57b996c20ce20b85c83b98862f0a7771d5a836bbc9c68b74a34538af4d139c5f71aa5
 AUX wmgrabimage.desktop 165 BLAKE2B 8faac723c7263861d7c348c33310882b39e4ca864e275d139a970d1377f4531c939dfffb569e29dcb952468e0d0dac61477125b77c4b6adb0ed3c1e76aaf227e SHA512 3d08f5a93d1ff356adb86b8636f092bf89fee18e238b8cbd2f7739239e996dd524f5fddc3821bf24f8c7271f1d9c7cd67300d58e31814a117697cfd9f3fd1458
-DIST wmGrabImage-0.72.tgz 19902 SHA256 06d7511c02e870700880efaee260afcce97f5f59209dcd0471fdb1a43f23d22c SHA512 64909db71d141ccf849eacbb100072a53770601fdf23949f76a45d1d25f5015ebb8f3a3da99e8f311977967d44a6db6596c2bcbe961fb8e313e41cad4960c92e WHIRLPOOL a2d3cb44dca38cb794738c26a77143c37d25f19734492f09911e8e3777c1ec4b5d6e3d8af051b1468a91f9b9ab4de52fad8cfdbcdf24fc9c50583b7a75e332ca
-EBUILD wmgrabimage-0.72-r1.ebuild 1195 BLAKE2B 2c546a3c0861f69b28c89130a8c10e61c68f65a7e79daa3d456d7f80f6faa8fcade8fb65acf7c4785565abb198e1bcc1de014c22b47b56af7aa663b74dc74899 SHA512 83af511a981c8a847646d4ca89ebf589af69c3fb1883a10c668fa3f6729a3d46ebf72e11298c39a82bf39a944996b9190f0de45dc9a01da84ea0af37ff990e92
+DIST wmGrabImage-0.72.tgz 19902 BLAKE2B d9000c03e4f9a3584f356c18fd4e4767ccc235708e0d3554fd6a0defa6108de3f52a90825b4ed7d334b545340ec9e463e67aae89062f5b0e2622c9e6d851a796 SHA512 64909db71d141ccf849eacbb100072a53770601fdf23949f76a45d1d25f5015ebb8f3a3da99e8f311977967d44a6db6596c2bcbe961fb8e313e41cad4960c92e
+EBUILD wmgrabimage-0.72-r1.ebuild 1177 BLAKE2B 84cd4bfbdabe0937eb0fa52e68327ecf77baf94c1c29014d1cf0faf53f741bc98f926ecb1fc0d13c8919433c05960cb3d4e55905dd70ee05ef2c72a75db92374 SHA512 c17ae3c1ffd14b0d120075a942dc38e94160c1558d6291b33eaef8eb988757a7ac179ae37e6dc653c7515fa9a1ff350cbd9d6db4c0f80bb0c35eb441d12887ec
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
index 16630b9e9e23..294e2a028122 100644
--- a/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
+++ b/x11-plugins/wmgrabimage/wmgrabimage-0.72-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 
-MY_P=${PN/grabi/GrabI}
+MY_PN=${PN/grabi/GrabI}
 
 DESCRIPTION="wmGrabImage grabs an image from the WWW and displays it"
-SRC_URI="http://dockapps.windowmaker.org/files/12/19/${MY_P}-${PV}.tgz"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/12"
+HOMEPAGE="http://www.dockapps.net/wmgrabimage"
+SRC_URI="http://www.dockapps.net/download/${MY_PN}-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	>=sys-apps/sed-4.1.5-r1"
 
-S=${WORKDIR}/${MY_P}-${PV}/${MY_P}
+S=${WORKDIR}/${MY_PN}-${PV}/${MY_PN}
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-plugins/wminet/Manifest b/x11-plugins/wminet/Manifest
index 2306a5552287..355b39ee8b57 100644
--- a/x11-plugins/wminet/Manifest
+++ b/x11-plugins/wminet/Manifest
@@ -1,5 +1,4 @@
 AUX wminet-3.0.0-list.patch 7026 BLAKE2B 4a4011cbb4e74caee67a6974967a69189702510a7319679c3f2b039c1039f9a62338d0abf960aae598fc06c49c5bc349e3d86b3b445ca45a7592b14926f7c8c2 SHA512 9c51ab9ed8f00648f7f24d070657c9126b26e19a4dbda8dac8d127030858f2a9eb385443fcd452560974bad6ccb986962087bd60fe78c5c1cc6ba43c91313b96
-DIST wminet-3.0.0.tar.gz 47576 SHA256 013e0e290d790da577da5439b07a691eadf421b87a21b5f9f61e1e80b9783461 SHA512 594d4a2019e424b27e717d3ffd64071f7888b40bf9b31332a877e71d85c0eb89f65490268276def30f530f187f3796a14c5e412af8cb461311e3f1e0a6478e51 WHIRLPOOL fb79e6613f59686e35426bedbde3426dca39a2c4ef7700e508f499a9dd6a29b6f32fd631abd29796ad9064cec3d7d53406c43040c0d63de7e74e154f6573bcb5
-EBUILD wminet-3.0.0-r1.ebuild 719 BLAKE2B 86a3b61479285a244ed3fea9138095e9d769935a2b97a4049748ba39e5778f082c86741b3756d6cf274ec46f88ad6db582645e23fecd510ab34957abbb52ec53 SHA512 78614d17edd91ed692fbf520a0f02e03b20e8251fdcf2eef443b4fb48cdd9e784eda4689571a8e720179e94789d92a6ccf2386f092a72d843b2b5f1d47ee8198
-EBUILD wminet-3.0.0.ebuild 708 BLAKE2B a07ac9ebd290ab01b9daf367b6f8a9ba539a81d86e3d0296cca4fa36826d05ad7581c8032dc040685ff9db86908f2fdee75a3b4eb037ea8c477723eefe1cecaf SHA512 ed4359c137867668cd63619b6c0866bba2280158bab7cfb6e5f681569d8217ba844e6cca6d6ba74d1495a0026a1feb068b3c6293e3921101058f98658df7a380
+DIST wminet-3.0.0.tar.gz 47576 BLAKE2B 318a180998f815e4ac274b98fdc14914f2d69eac1a5bf6c4382b0f8b01594d56dece8f168a069fd45cb6be373f1c3507aa0a0e5fd27ab571ee21912d0c02e5e6 SHA512 594d4a2019e424b27e717d3ffd64071f7888b40bf9b31332a877e71d85c0eb89f65490268276def30f530f187f3796a14c5e412af8cb461311e3f1e0a6478e51
+EBUILD wminet-3.0.0-r1.ebuild 720 BLAKE2B 40bb47e193bc317fc28e39e9e8f1d24d70fe702a686f6e55501ad509af5ec9ec0ee6b90ef5e6572fe78da220ee1f429354d4eca998167d74784d48be65465d53 SHA512 5b6279aa7f1778d01bb8c3536ab9c9215ff66e54c3d21fbbf589feadbc120e232b9fe84963ebd5728fe09d479036bc58c2dbad9028d1dd85abfe38d254afbe12
 MISC metadata.xml 455 BLAKE2B b17f992bf7af49680eff6c95cde64caa3dce145e40c385fa03bce4a4075793eb946e79fd80f56d88c006149915ccc68499f538eff59b2888b617f47d638e332f SHA512 c27ab04917d6dc1e914f77ae4c215fb9c9f8f0062357ba8f4c197a5ee879335ba196f4249eca2b036717d4eb896c7802ba274fbf39288559012e4992140f70d7
diff --git a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild b/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
index 7d01177f2512..aa8802b5c5b7 100644
--- a/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
+++ b/x11-plugins/wminet/wminet-3.0.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="dockapp for monitoring internet connections to and from your computer"
-HOMEPAGE="http://www.swanson.ukfsn.org/#wminet"
-SRC_URI="http://www.swanson.ukfsn.org/wmdock/${P}.tar.gz"
+HOMEPAGE="http://www.improbability.net/#wminet"
+SRC_URI="http://www.improbability.net/wmdock//${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wminet/wminet-3.0.0.ebuild b/x11-plugins/wminet/wminet-3.0.0.ebuild
deleted file mode 100644
index a2200cb360fa..000000000000
--- a/x11-plugins/wminet/wminet-3.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit toolchain-funcs
-
-DESCRIPTION="dockapp for monitoring internet connections to and from your computer"
-HOMEPAGE="http://www.swanson.ukfsn.org/#wminet"
-SRC_URI="http://www.swanson.ukfsn.org/wmdock/${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"
-
-src_compile() {
-	tc-export CC
-	econf
-	emake LDFLAGS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README wminetrc
-}
diff --git a/x11-plugins/wmlaptop/Manifest b/x11-plugins/wmlaptop/Manifest
index 712ec1b66742..6564d3ade0af 100644
--- a/x11-plugins/wmlaptop/Manifest
+++ b/x11-plugins/wmlaptop/Manifest
@@ -1,8 +1,6 @@
 AUX wmlaptop-ACPI-detection.patch 983 BLAKE2B 3d58e9af032290209f2f7637d4516eea3fa00ef5f1f9d48217662b0737725249a001c300fa19fbead2cbea1c3c0dc5cb927ba643dcddacfd187245b46ed35ac0 SHA512 7dc6704fb5d6ae6f4576f6acbf2d7b9a1c1bc310f3617277f0b254bd96e962242c72489a2dbffba81f6d9dfb3d1d84b8c4ec44fac381f7b5078345a010474c18
 AUX wmlaptop-Makefile.patch 738 BLAKE2B 405b23ce3891106cb17cfed48a65eac1eb13c7a2baa6e5f15f5f55926bc8b56ac578637f862b73b3adbc101f48dbb29d5289380559e15aed136e8b3a75d5d3f4 SHA512 cb0bf56ae9040655979003ec8430c775bc4059c7416c386a761145aed7a62026ac39f4af4a72964cb42df95e441d236ab77fd931c7e10ebe1bf815631716481f
 AUX wmlaptop.desktop 158 BLAKE2B a12d5d5542920134877b4c270d4638fabf4a7feab641f70070e56b50a98301b68bc440341924f0114f05bdd66127860d256be55187b4550836624ecaa6f63530 SHA512 8a5e58a8419a3d6ec46164a57cd3af2b62fe0e5ad66b60a62bc9b5ec417b5869e60be6793e480ae6f8c9f4053b8aa3ca027ee8f64c4f45a627e3c761779a6c9e
-DIST wmlaptop-1.3.tar.bz2 54575 SHA256 5ce0ad86ebbf1e8167d0e7eb020389393cf08bd3c849dba9fce383d95a55281f SHA512 3653b49b0da5165f86fd6b681a021082f188ec66ef536ac31b72b2f04801a50466f5eacb706aca311cc02e046048a1adc29c55effd1e4ad5c5cdb6c6a85933de WHIRLPOOL 0a0c7f92b46c247e89a2b4dd332704eaa752aab4c784f5f2ec6fca6c7d11dfb2ed9b359871f5ce05ef6e1a2736381f73244df231171529022ea1bd31ae94f911
-DIST wmlaptop-1.4.tar.gz 77023 SHA256 3a6a2900489555606e2dd411963c659edb43613877de85c67dab14f0c8a47c2c SHA512 6f9ef6a04e556c811b2470ba9c1a57cde0047e8ac4936b84f5313f0f05a8809ac441e9a8e871fbb93dd29ae1deb9044ba7a16847e9c16ad80fdbda21e1a6ac58 WHIRLPOOL fd0e68985acf3db2576862518ff8b25710bb6c5be2fb5b0b2abd4fdaa56de08dd62c9cb77f996784310692c0647d34083ca56059ab312b01fbff1d0453a24512
-EBUILD wmlaptop-1.3.ebuild 905 BLAKE2B 5457bb49aa9baf143b0feb3a0e7031de741bf1e16fe88f8d33a8b377c6df692b5569121dc3c873ccb3f31e9a5c6da3094ed661bbb2e90fdb476209d689a6ea5b SHA512 2902f0403376fd0580aa2bc05c6c825e55b13d0cbfdb5f8c54fae3cbf79c8880aa0748f9b5a4ab8ed1c2fe877959212f10cbe867edb532cc722d683996bac403
-EBUILD wmlaptop-1.4.ebuild 905 BLAKE2B 9f59f7c3741aed843aedd125ff8b2051ea348c13db837b088d29df94048baa5c1c758d59a2d14c41cdb9c00e5f035b6b678e25800703f3f8a0b2158b4a670bf8 SHA512 66cd14d1bf9705f8b8e254787d00023e2e38d0ccce8d1d6cb196bebf8299d9fad7ae0b75fe111cc908fba5caf6ecde7a32cc3a903c86fd5214e0128c0ec42b86
+DIST wmlaptop-1.4.tar.gz 77023 BLAKE2B 6365bc98a580d943fa7a159546d290bb3ea93a83a1d1445982dfb6313b0b97f4ef21aa5c5ec8442969ffe2e2911d208d0b54e2d341d835d1e3ce00da13a352fd SHA512 6f9ef6a04e556c811b2470ba9c1a57cde0047e8ac4936b84f5313f0f05a8809ac441e9a8e871fbb93dd29ae1deb9044ba7a16847e9c16ad80fdbda21e1a6ac58
+EBUILD wmlaptop-1.4.ebuild 864 BLAKE2B b1f3cffb6b73a8959daf061132c2d1ff3f353f03ac0d7069af2a50e36a0d68fc9e48ad61c90a88df3cd0695993c95ed989b83760690b7ed77bc626313aa19dce SHA512 951b7d463dc0fd609f34430cc57d63ed82acbbb404aecb51b81bb0a41e362edb8118ad64f4b9cc6648981092a84c17fa1672915e0b4577f5af1f7089649c2dae
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
deleted file mode 100644
index e8517da66a09..000000000000
--- a/x11-plugins/wmlaptop/wmlaptop-1.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-IUSE=""
-
-MY_P="${P}"
-S="${WORKDIR}/${MY_P}/src"
-
-DESCRIPTION="Dockapp for laptop users"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/474/${P}.tar.bz2"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/227"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	>=sys-apps/sed-4.1.5-r1"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc x86"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-Makefile.patch
-	epatch "${FILESDIR}"/${PN}-ACPI-detection.patch
-}
-
-src_compile() {
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	einstall INSTALLDIR="${D}/usr/bin" || die "Installation failed"
-
-	dodoc ../AUTHORS ../README ../README.IT ../THANKS
-
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild b/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
index 5de91232ce7e..c4442cd52cca 100644
--- a/x11-plugins/wmlaptop/wmlaptop-1.4.ebuild
+++ b/x11-plugins/wmlaptop/wmlaptop-1.4.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}"
 S="${WORKDIR}/${MY_P}/src"
 
 DESCRIPTION="Dockapp for laptop users"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/509/${P}.tar.gz"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/227"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="http://wmlaptop.sourceforge.net"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmmand/Manifest b/x11-plugins/wmmand/Manifest
index 57dea52df3b3..4353e1cdadc3 100644
--- a/x11-plugins/wmmand/Manifest
+++ b/x11-plugins/wmmand/Manifest
@@ -1,3 +1,3 @@
 DIST wmMand-1.3.2.tar.bz2 41268 SHA256 c12127e8bc0b0d70c3fbaabaf1d6e2322c673a9e001ab4448804e7a0d39bcfea SHA512 03a06c114371bf98037ac8859010fcbd20ec675fdd563b655c1be58a384a48f59d36bcb795759e45dba798af765ae179df1bf591d2ee7fe245069af06c8b5587 WHIRLPOOL bdf9b2f2502ed55fb6471710929aea95fd6559a06e24468bb7528a9861f353dad5ed0f6a99f305e177977dcf416bf8825dc3b94370f600ce13c8479554316516
-EBUILD wmmand-1.3.2-r1.ebuild 808 BLAKE2B e7954234ed7a244cc5e0fff6b772affac75a8e682a865855bef94630bce5521c276e7d3561770dea062ea880904065d1e0c433bd0b4fab17555f0b46200cb5a7 SHA512 c6de5c438ef71ea8863e53f01487c6468595be20379843d65abf9da9d6b077fa2e6bf8cbba74f8c3d8fc4808ab20702c5ac72c8797d132169d5bd437d583b346
+EBUILD wmmand-1.3.2-r1.ebuild 804 BLAKE2B 80af5d57355805724add1e6b29eb47f44b4b49312379f948a78e28ae1fa1a177739776370f5eb41fc82c894912d54ed675f869268eda37298f106563e88ec838 SHA512 385c413138b6069faacec8ca5550a52dce284aed9c3a3f4f7be55c484776d31cba57bdde14dcb71819413fb6f1b7c8fad16300274c0d9f309557b30e2e57abb8
 MISC metadata.xml 328 BLAKE2B 2cafb02a6d098593306f48c13f5ed3d9c47028536aaef04558d65049c47f4b1469c29c19bd75580e42a2bb1a0f3ef083cd561451e442dab9d8d48944ecce9445 SHA512 40eb06ee0f23923822f16f7c14b0c608db8d1266ca3b58b30313f81a1cc82da4987f22d4f32dbd85b6ee0c152bce40108b4168402098792338ac05da68e9cdf8
diff --git a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
index 933b07c185b1..ca06b0cbe563 100644
--- a/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
+++ b/x11-plugins/wmmand/wmmand-1.3.2-r1.ebuild
@@ -7,7 +7,7 @@ inherit eutils toolchain-funcs
 MY_P=wmMand-${PV}
 
 DESCRIPTION="a dockable mandelbrot browser"
-HOMEPAGE="http://ciotog.homelinux.net/software/wmMand/"
+HOMEPAGE="https://sourceforge.net/projects/wmmand/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/x11-plugins/wmmemload/Manifest b/x11-plugins/wmmemload/Manifest
index 2d71462514b2..6db683a009d8 100644
--- a/x11-plugins/wmmemload/Manifest
+++ b/x11-plugins/wmmemload/Manifest
@@ -1,9 +1,3 @@
-AUX wmmemload-kernel-3-support.patch 555 BLAKE2B 532ffab6fdaab3d06601f7734318dcd61813b47129cd0a626eeb46bbf14b1fc26b3bd5e34a3db3d6e005a80f7fc0111c54b417633194247fb0eacff48a4b20d1 SHA512 690f4faf726689feeb65c3de1de53c7f3bd8a5d4c29bfa8f4c1c593c705d3b70465d5883c0e8649f037d741b94bbaf1b71f19f9a3e101d3ae3b57bde0c38c9f0
-DIST wmmemload-0.1.6.tar.gz 141606 SHA256 207a6e0f69d2aa56054c34a3b0f7643014f2b9609ea28ad10d25901c8d34171b SHA512 0587441fc0a14db6481f56b5b5a205029f4f5fd794a9e323289217be09605dd3c7af32afc2427896a08d508c0c920e71201e60036fd185df2df62c8cbb352696 WHIRLPOOL 7c1a524f22002de11039bcd51d8fcb4fb43b83388a55486ab207c37965c28784719bddd89bbf09bb1adb026bfc0292d37f849a2de80a2f83f16c13bb74832772
-DIST wmmemload-0.1.7.tar.gz 23030 SHA256 dd08ac0c91ac20c174afa53ffd4b4773cca2804e5238caaaa90f5f8c524dd50f SHA512 d84108c23436b92b00818aaa59f14f5fc425a1509044d008820cd335e312ca271867b6be03a7f0f8b904691894a2f47e976048e3be46c0bd24b6b64478233c8d WHIRLPOOL d1dbbda1a632e61e566a364c7cc747fb24740acfa519f44d0b6afcce5b80238cf2943abd65a90558d1421eedab9b0463739addfbba3623c09f0802d82739f796
 DIST wmmemload-0.1.8.tar.gz 23114 SHA256 b405b9f84fbb8d9b0c165d8af1db6557bf8ecd85ccb5a010d2202ffde126e0a0 SHA512 7139e92e15371ff493784c0677d6697074d85c5f4457d0c5caa146bf1aef481a4afc31a4b70bf8ec0edcc90390c18e16daa8efff7d418f96c137c72f7c7819f9 WHIRLPOOL 689825b0a713284f049f1af88dd651b8905dea3ddf3854dabf4cea78dc672ce795b49109dd4636b146b432cbb92010d23b6dad68c45d0163424ad6356ef50f6b
-EBUILD wmmemload-0.1.6-r1.ebuild 725 BLAKE2B d914f55ea7e948a535c51e307135c5820a7a88f7555ee9057952d93aa265ab26a6239d54ff66eca5da438fbc5ecb2b8f26b46fd5c2abc60323cc60d2b53cff47 SHA512 5fb6ce4014841b2e448beb323683c3219f4fca15d55fd7e3e64605eb6cee72c9264bd185fefc885b0dbf00f57fe9010b5d2d19baedc26ae50a3a0a541678c116
-EBUILD wmmemload-0.1.6.ebuild 677 BLAKE2B 54d757e9b833084f20cf61844fcc7a23454aa246f43bf0c2501c8400a31fce9a44c967ed978ebdace1c3e3e15c79a6fe70219513965384969d16410c0cf5e26b SHA512 7456528ba79886a98322e8a9e89d6c376cff5f1167661244fba788819ee675f29545164f9c8273513585513e47eeeccb7ad975c39e62c61c8fb132aaf2a12486
-EBUILD wmmemload-0.1.7.ebuild 670 BLAKE2B e13568883e4b3760a8ceade65ceab9561d4a78a82d5a3e0d2b47b15c922de1f2990bcc13821df386cb62e9ded4deaae8d7705ac6b56556e697c51fc47586dad5 SHA512 8f423ccda949187b222f48f1188f3c0bed6e9ad41336edae7525fc337b61a97dd717dcd8bfd5e4d2d4ef198eed17f91360d2b5545edc1bfd878304b9d62605ce
 EBUILD wmmemload-0.1.8.ebuild 665 BLAKE2B cc929323b1a7e1866bf8dfa3998b6ad27e4e76a032ee761c7ba769b4c206c5568f102a821d4e053b2145ca1b450ee5d2ff5ff06147404fdedcf2150c90e2c18b SHA512 601a2424fddf1f61c39def95bce340782727bf046cd1aba90d75c4d38db682440881a71707da3ec197b460b200fa95b1789567fd39a80c89900c8cac9042cc85
 MISC metadata.xml 428 BLAKE2B 42e4fa840c3d15800b5a4fbbadfdb824b0885f50dc83a01b06c9bb0b5db3e2b8b81557abda856ff2e6a46993c7dfb8f712afcfef1595d6debe45993a51ea2386 SHA512 ddd7223a4e535dc0f919347778fb1ad9edc1a183ff9cc85b5dcc5820454021d38ba57d230c6825055252d007c0b63e20b2b374100748ecc6e18cbceaf51adb37
diff --git a/x11-plugins/wmmemload/files/wmmemload-kernel-3-support.patch b/x11-plugins/wmmemload/files/wmmemload-kernel-3-support.patch
deleted file mode 100644
index 601991175323..000000000000
--- a/x11-plugins/wmmemload/files/wmmemload-kernel-3-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- wmmemload-0.1.6/src/mem_linux.c	       2003-11-03 22:06:39.000000000 +0000
-+++ wmmemload-0.1.6/src/mem_linux.c	       2011-11-12 11:05:13.000000000 +0000
-@@ -49,8 +49,9 @@
- 
-    /* new format ? (kernel >= 2.5.1pre?) */
-    /* see linux/fs/proc/proc_misc.c */
--   if (version >= 2 && patchlevel >= 5 && sublevel >= 1 || \
--       version >= 2 && patchlevel >= 6 && sublevel >= 0)
-+   if (version == 2 && patchlevel >= 5 && sublevel >= 1 || \
-+       version == 2 && patchlevel >= 6 && sublevel >= 0 || \
-+       version >2 )
-       isnewformat = 1;
- }
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.6-r1.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.6-r1.ebuild
deleted file mode 100644
index afdb61ed55f2..000000000000
--- a/x11-plugins/wmmemload/wmmemload-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="dockapp that displays memory and swap space usage"
-HOMEPAGE="http://www.markstaggs.net/wmmemload"
-SRC_URI="http://markstaggs.net/${PN}-download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-libs/libICE
-	x11-libs/libXt"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-kernel-3-support.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog THANKS
-}
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild
deleted file mode 100644
index a11ed9f1a599..000000000000
--- a/x11-plugins/wmmemload/wmmemload-0.1.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit autotools
-
-DESCRIPTION="dockapp that displays memory and swap space usage"
-HOMEPAGE="http://www.markstaggs.net/wmmemload"
-SRC_URI="http://markstaggs.net/${PN}-download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-libs/libICE
-	x11-libs/libXt"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog THANKS
-}
diff --git a/x11-plugins/wmmemload/wmmemload-0.1.7.ebuild b/x11-plugins/wmmemload/wmmemload-0.1.7.ebuild
deleted file mode 100644
index 9840263417c7..000000000000
--- a/x11-plugins/wmmemload/wmmemload-0.1.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="dockapp that displays memory and swap space usage"
-HOMEPAGE="http://www.dockapps.net/wmmemload"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto
-	x11-libs/libICE
-	x11-libs/libXt"
-
-S=${WORKDIR}/dockapps
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog THANKS
-}
diff --git a/x11-plugins/wmmp3/Manifest b/x11-plugins/wmmp3/Manifest
index ab24f3df5916..e021ec99d4fc 100644
--- a/x11-plugins/wmmp3/Manifest
+++ b/x11-plugins/wmmp3/Manifest
@@ -1,4 +1,4 @@
 AUX wmmp3-0.12-x_includes_n_libraries.patch 582 BLAKE2B 59f4b5a5ca18d4396994a6cf793843a908d5ad4a8d8f1dfb9bcc065b0d2be0fb4932d62105ecc466bba0c6bcbc795582fe2975e5fb76c225f79916f539dc9e28 SHA512 70edb6f72a7cb0ade0166cdd99842318bcdee5b222337cd253208a657babe8b975c0d3bbfca493f9853f8695e10376d596481981b27561e731625ec8015c3264
-DIST wmmp3-0.12.tar.gz 43977 SHA256 babbb158f83befd0e8eab9d794c8353ea536a477cb8b3e500be389cf658941c3 SHA512 6cc06f109d6ab6c69ed3b8175010a2f38053138291f02e59780fc7394c35cc629ddd6b982bd5069e20a3cb81d81b3d08b9e10d1f7984f783f22c9b012c933740 WHIRLPOOL c8199106c502c5c2bea9f5e2c981bd96720bce607d3714c8a91b289d1c708b76a4315338c6cbec0a8340bdca3d1e9ebb1b2d3214a90e58140864eca1aa155a31
-EBUILD wmmp3-0.12.ebuild 945 BLAKE2B b0d04c418eecc038de6e7b88de7f266b9a1aa57f8b4feeedc0465488e5f4ffd25b64988f271183818c1c6cc955583d822544a42431f2cdc82c2ec27f21feb5f1 SHA512 b06472d4cf22e98eea326e562145ca3dc274c3cb2d63a9ca92de768bd87ab27aa7b5bdda59adaadcd122f31bd4f204791b7ec238ea7fb3d16e470609117da89c
+DIST wmmp3-0.12.tar.gz 43977 BLAKE2B bde74194020e65dfea27e94f5a4e937e0811da12c3af28b8d7902c3d08adc27499cd5414ee4826e6f5b25709bf784e6b27d1df07e8079953ec2a602b332b17bf SHA512 6cc06f109d6ab6c69ed3b8175010a2f38053138291f02e59780fc7394c35cc629ddd6b982bd5069e20a3cb81d81b3d08b9e10d1f7984f783f22c9b012c933740
+EBUILD wmmp3-0.12.ebuild 909 BLAKE2B 16a0ec8d1e87ac76f5a2113c63f42e2d947994b67c40519c99f7de8f1948746762c9018301dce6a3c33927cce00fdac00932090d4f33d869279ca23414de3e24 SHA512 19f58c49ef78dca3f5c872ab5b2823f02b851380fa3b0d433df66061945b8a9597eb0bfe0c1274bda8f02e0232b55c2005fb9b7ebf19113fe7fc06251d22a7be
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmp3/wmmp3-0.12.ebuild b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
index 7afeb68a8f38..9fba02a88ff8 100644
--- a/x11-plugins/wmmp3/wmmp3-0.12.ebuild
+++ b/x11-plugins/wmmp3/wmmp3-0.12.ebuild
@@ -1,17 +1,16 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 
-IUSE=""
-
 DESCRIPTION="Mp3 player dock app for WindowMaker; frontend to mpg123"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/60"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/91/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmmp3"
+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
diff --git a/x11-plugins/wmmsg/Manifest b/x11-plugins/wmmsg/Manifest
index ec3ccc76de16..936eb7c67ec7 100644
--- a/x11-plugins/wmmsg/Manifest
+++ b/x11-plugins/wmmsg/Manifest
@@ -2,7 +2,5 @@ AUX wmmsg-1.0.1-alt-desktop.patch 528 BLAKE2B 74f0057bdceeaf4888761d224d770398f9
 AUX wmmsg-1.0.1-list.patch 3607 BLAKE2B 592b21d2f953bfccd89585c19add8ce7c8a071456c5bc5a605a0c675ee7586d4b1aae4f76da2113b4e0b153b2c217a40c68542d87d44cd6a5d99f8e23f5a6ee7 SHA512 db901202fcb415cb37995ec05388f6be9f35f71ec5b45309426cbc47bf68188c68c297ce296d176a10252d987c2ca07f6fd79545e27602559de78edd88b9f28c
 AUX wmmsg-1.0.1-use_gtk2.patch 1994 BLAKE2B 925f12969e4455bb3d62255cb253c46f0f9377545eb4ae814ad746eeacd170e1903ac827646580fb4fb7671298be97b1a8d607804dfea1a7a269ea16f2db057f SHA512 85c3ba7778c41682e463c13547b78e474ff717ef292495037c9db58073416edc133083f30ce0ea1a2509ea545a48a1b1f5dc634e2d1cf79a4f0a8d0df74f6d50
 DIST wmmsg-1.0.1.tar.gz 322551 SHA256 06ddd1e4bf010617cf41cc877aa744ab74bad7992d9e95a95df5157bd633b850 SHA512 6897a6cb48d88536bf9bde4ae824ddeba7953618666aca24202d9d21865d63c9d0d28a306b8f249da8052715be706a02de12c90c14718b1b3bd41d3803dd6abe WHIRLPOOL 25648ab5f296c64493f538aec8554e1de67d5b4e8c031d737ac8fb74b1d6b64471af9056aa13d8b66afbedc677aed58bf96034498a0959dcca2c37cb2de7bbfc
-EBUILD wmmsg-1.0.1-r1.ebuild 707 BLAKE2B 50c189bd611770dae6d9a9c386540efb37ab25765974b960ba6f76ad7dc52c19ec2a2432fc5b1c9dcdf5291efa6cafb03c04110faf7b29d82a8e7bdebc1e10fd SHA512 6d2f5591226266bb1010d1694dbf3d759b3b43ccad4f85f691f7bf498c21aaaa2649f0c6867f3b7b697998d204a9f1ed255c007ca5561a39ca11374caaeb27c0
 EBUILD wmmsg-1.0.1-r2.ebuild 709 BLAKE2B 1a40b120e99cd8992dd86c7f42c3f2ac5af666752d03bae8e907e8b762631cd9f4de58e7419628fee1508973a0f5128eb39348d3042af8d11a33fcfb2ede66e1 SHA512 79c3bff775a3b41b0a15b7613ad2fdf324adee2721055c1dc0bcd8a9b27424bdec378e5b802a27ed25de704ce815d3f15de6e328cd4f9b049cfb2a25945e753b
-EBUILD wmmsg-1.0.1.ebuild 627 BLAKE2B c1008b48b9c5c14364c4c9ea8cf617168b9f70cd495b2dfbd0eacce818dffd88ba2f118aa85d9678c03f281d28456b827da1eed3dc7be373fdd93fbda3539c69 SHA512 a9cab7876cd8941cbc22dc2adabaea1908050d77c1681dd0d21c4534fb83e143a3a88b4fbc6966b052412f0e6f69b4fc6c9cc8294f08686a7ba0753cca79b9ab
 MISC metadata.xml 573 BLAKE2B 07c7f2cd92752a499fcd330f9d27f23e2a9301899732a1e756e56a91ca9e5e38397167113c1d0e103f50dbdfd64865f62ee6c1ac944fcaa1df6fdf29468f36b1 SHA512 5e981d74ab3374dd1363805666abd6217712b2031088d4ae0401eb9f2a999f6a545e8ceb8a8031b131d5719f8e76d707a958f96098b7b5cde6b4225acafa20a6
diff --git a/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild
deleted file mode 100644
index ad4fa1fe3800..000000000000
--- a/x11-plugins/wmmsg/wmmsg-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="universal visual notification dockapp"
-HOMEPAGE="http://swapspace.net/~matt/wmmsg"
-SRC_URI="http://swapspace.net/~matt/wmmsg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/imlib2
-	x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-DOCS="AUTHORS ChangeLog README wmmsgrc"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-use_gtk2.patch \
-		"${FILESDIR}"/${P}-alt-desktop.patch \
-		"${FILESDIR}"/${P}-list.patch
-
-	eautoreconf
-}
diff --git a/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild b/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild
deleted file mode 100644
index 7d2b2096b4df..000000000000
--- a/x11-plugins/wmmsg/wmmsg-1.0.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="universal visual notification dockapp"
-HOMEPAGE="http://swapspace.net/~matt/wmmsg"
-SRC_URI="http://swapspace.net/~matt/wmmsg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/imlib2
-	x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-libs/libXt"
-
-DOCS="AUTHORS ChangeLog README wmmsgrc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-use_gtk2.patch
-
-	eautoreconf
-}
diff --git a/x11-plugins/wmnet/Manifest b/x11-plugins/wmnet/Manifest
index 864ab95b4d90..8b406396d983 100644
--- a/x11-plugins/wmnet/Manifest
+++ b/x11-plugins/wmnet/Manifest
@@ -1,4 +1,4 @@
-DIST wmnet-1.06-misc.patch.bz2 11327 SHA256 d1faab4600efa1d6a6973dfc05d451fb0fabf417a58f32bc1d4f21a0d7d7cbc9 SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3 WHIRLPOOL 84fa13179e317f1c491c5bf18a4a3ca0ed3944ce90c566c13ba4a9abb1f79b4537a9f7c30f404711c92b4f74fd0f403f723657fe9c2259d4c2194f11ec973cac
-DIST wmnet-1.06.tar.gz 27506 SHA256 79c6ef93126d2a4928818391c0aa20638d47cd9dca12d999e774591f9b2d365d SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a WHIRLPOOL 068ac75bead3de56a33913b63c270bbe4ae7483601e769c8bba13c4c0dbf204cbc992c579395def4cf01ff0acf5f8067238a9cedeca49d9080758e7a6b3f6cdf
-EBUILD wmnet-1.06-r1.ebuild 837 BLAKE2B 8ec103b5b0d0a41b02126d8a0868c15d0344837aa130bd8d47aa85e02f5657b72805c78d6bf4eb5ff44a8ffead598b7114d08555f697776251663c708177c75f SHA512 1977accf9c9447a4a73e2e464530b55b25e233ba14f94624f5329b25b1c695c0b200677105c5aea3d9f157c0cd54fc73cc621e7b6e34bc2543f0c09b55f596d6
+DIST wmnet-1.06-misc.patch.bz2 11327 BLAKE2B c03f25270c37e9a54731547a51c00983df802b5f4278d02b7051571de45bd326bb5eda330bbba8e09be6bcb4b3afca111956d6506e73c13f955afd40b9c967ea SHA512 34d08676cfa9415c1cc182b148364143589b13c6b060c55b4047fa417146b1939b84fa5e32fc86da92cd92c10a5f5f0abb602c9ba943ed077bc6529c0dbf0ea3
+DIST wmnet-1.06.tar.gz 27506 BLAKE2B 9cd5cb626406238e5dc20ff58f26b13389c5b8bff9569e3cc8fc4f083422d213702fc387521bffc003339ef4e0c6223f5cfcec8617ba3e71b516786c6950cdf8 SHA512 1e62db5e7e3b843d47459fcfa9cc932ba3df8f8498d1b24dcb77602a334d528b90e9c93886b8b330ac7bd5baa4ad1cd3bc94e96c14a841fba8bb9172f624e10a
+EBUILD wmnet-1.06-r1.ebuild 812 BLAKE2B bce8e9474a44538c7ab4000462885830c49273642be4ddb51ef52cb712492034858a662fa87b7597d394780b3fd8efff526f84e2acae2f039a3c8dce47f7f89c SHA512 410731a9c938b5ecee54fa241285d6a083b400c2a19b02ca8787740f005beee5151b283ade36c676179ae4c8984e4b3f3272ffd191b83b73d7e14bfea3d8069b
 MISC metadata.xml 780 BLAKE2B 254fdfced5817ebf8e2594d8cdf77828066acd2b27c17bb8050dd7cb6d4ce848de69485064fab61473b3313b19bcd6b30fbad2cf0cdaca2cac72f802d1d1ac5e SHA512 c9382651f9b9aca829c4cbbb5d27451351f56b7ed9138ede20646c591a54711d3170b45b6c021ca7ca728e6bd22ae421ce8eb18d09a65ad69d37f3cff260b860
diff --git a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
index eb5be2cb6e0a..4e523d9525db 100644
--- a/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
+++ b/x11-plugins/wmnet/wmnet-1.06-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 
 IUSE=""
 DESCRIPTION="WMnet is a dock.app network monitor"
-SRC_URI="http://www.digitalkaos.net/linux/wmnet/download/${P}.tar.gz
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz
 	mirror://gentoo/${P}-misc.patch.bz2"
-HOMEPAGE="http://www.digitalkaos.net/linux/wmnet/"
+HOMEPAGE="http://www.dockapps.net/wmnet"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext"
diff --git a/x11-plugins/wmnetload/Manifest b/x11-plugins/wmnetload/Manifest
index 82435d934e0f..a32bb8ca8021 100644
--- a/x11-plugins/wmnetload/Manifest
+++ b/x11-plugins/wmnetload/Manifest
@@ -1,4 +1,4 @@
 AUX wmnetload-1.3-r4-configure.patch 2196 BLAKE2B f8b4d5abff853be3fd36956410f6aa7a0a865c159dcff935ac41eb2736fdec2682b556536949f6f18550d19788ecac4eb4d64f3aa0ceab66759d25bbb0700951 SHA512 f07fe3c2b807ab278dcea59010223dfc1233562d468db01515618b57113bcdededc8adf822fbb5d3bb4b432fae53dde7c3ffac8f63101c713f944f78441b6262
-DIST wmnetload-1.3.tar.gz 105588 SHA256 c2dcfb5075dd56fbdba9e92abc7854bd01c2652fc914490f9f7df07625275e64 SHA512 67f28100fefea54a21f82be3acde9a457779b2dd1eb1c2f0c074c0a956a8f7b43a6c7ed39b97f8bdd1f51adfc1c21d197c1a7dfd84d8aeb562e46d58fd06b3f7 WHIRLPOOL 185a55e2fae71791a22da969ec25baebde7e4981d05ab2091e168e4977980c4ee98a8161da3035b5c66c09d1aad057e89e4a37269fe5f601d8cad675f7dbf309
-EBUILD wmnetload-1.3-r4.ebuild 639 BLAKE2B 64fde46a991e7d62ac6d39dfba772ecc7f11049365b17ec8c32c70eb82fb32e5bb36eede355eb001419a6b39be940532b8ddc0966d4c548cf6392a9cef433691 SHA512 067f249607914b10b300248f0108af18365c24cec10d24db4288e0e7db4f56621b2b25b48a573495e45a1369e1c784ff94b124b3acdf0aa717fffd03409ed111
+DIST wmnetload-1.3.tar.gz 105588 BLAKE2B 21c56ef3d6b9e13f9e7d7a1eeb4ad79693134a74d7b864a45f76e174a8f8fef46efc0444bce9a5422d698b8b966768914fe6fb9fb4eda29c8e0dd6f6892daf40 SHA512 67f28100fefea54a21f82be3acde9a457779b2dd1eb1c2f0c074c0a956a8f7b43a6c7ed39b97f8bdd1f51adfc1c21d197c1a7dfd84d8aeb562e46d58fd06b3f7
+EBUILD wmnetload-1.3-r4.ebuild 677 BLAKE2B d7f408e0ffeaae318a63013b1f59b6f9752162a95459a337136fb607dd3adbeac65c697fe04e32089de61fa7d93911518654edc2d85696bde3cbb41b7666b9ab SHA512 a13c44e346aad411d67c5a38371763da007ab3e6192034a46a94aaf5d4ec9955cea8d3b8b68277b97b2a0785036299f42417dc07a684af77ed9b2a623d714cbf
 MISC metadata.xml 765 BLAKE2B ca52535f76a401dd5aeac1e60071cec39a170f64fbd24b98c524f661196a704b43680dc10a89065cc3849cdb4df54a1ca1b127ef7b949ec545ab1a0d7d3a7a71 SHA512 f5013ffcc43b6be22185f551ced0aac94a947fa487eef715ad75add3f12ecdeda39ea94eaaae4e67b5afb6f3117ffc2a5f5778809c4f9f3478fa49a54194a998
diff --git a/x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild b/x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild
index cf1f2d1bbaae..5f77eb525054 100644
--- a/x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild
+++ b/x11-plugins/wmnetload/wmnetload-1.3-r4.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools eutils
 
 DESCRIPTION="Network interface monitor dockapp"
-HOMEPAGE="http://freshmeat.net/projects/wmnetload/"
-SRC_URI="ftp://truffula.com/pub/${P}.tar.gz"
+HOMEPAGE="https://github.com/bbidulock/wmnetload"
+SRC_URI="https://github.com/bbidulock/wmnetload/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmpinboard/Manifest b/x11-plugins/wmpinboard/Manifest
index 1b53ccad571d..4a868fd24ccf 100644
--- a/x11-plugins/wmpinboard/Manifest
+++ b/x11-plugins/wmpinboard/Manifest
@@ -1,4 +1,6 @@
 AUX wmpinboard-1.0-segfault.patch 320 BLAKE2B 16061622af33f12fb19f027a003a2f7a05c203005a101603bed4cda2112d7a9fd3b9c9a95c1ea9d79075256890abd9c7ac82ff769ff6aaa2de2e52436e4008a0 SHA512 2dffff646c53dce2815bfd145434b393c1735c66bf5abf9e8c7a476b4adc99143dd02cfff835c232ef549882499793b92ebd5bdc2a76f388478111d791c6bfea
-DIST wmpinboard-1.0.tar.gz 133290 SHA256 a0268bf1c6c0c9c7ac4167031970e17a298f0ab5a85bf6ef166ae454f205137c SHA512 486509e50e58c14866932a89706d98ebc4391af608acd95670b190eebe9069d254e11834e291ee2bc3c9e3e77e75ece7ab3f73dc7f097dfba5ca25fc888773fd WHIRLPOOL ce61f41de1aee421f3c41782773865e8b6da9b5d078ba19d6fc36761c95c9951e03ef289b684d77b09327c4b2d9b9f645cf0e98b408f7860f5052432002ff8ff
-EBUILD wmpinboard-1.0.ebuild 669 BLAKE2B 7150696ed0ad6c71e3b45a2272ffec4e6d86a795b70452b0ec6ef265fc01605e8addd0de78a3f92a43f07970c15e0036c80281b73f776a0f8573aa61371f1351 SHA512 bf7541d074fc3afe4dca88f449a25d082fd104ed9e3453bbb4b59e14cdb1e88c55b88bffb08dba2c26fa9246580ab402d6b120e23b579d9b95efa6ffa43252a7
+DIST wmpinboard-1.0.1.tar.gz 195782 BLAKE2B f88368b61645c91958d81161e9f5e8523d09b7ef825476afebb2b4318c8cf04f11319b3eaf9b152fe97a4dea2dac6147e9b70eb70cd9cddbc1f45960df6529e5 SHA512 5728aa8a040ba81a814a0851f5bed2d5fbf933b400bdafd2b92deef8eb35d62a050293bdb98d71c6a8db058223e5ae64de932dcf971fd244aea8f48f8832aa36
+DIST wmpinboard-1.0.tar.gz 133290 BLAKE2B 06ed6c09d12556adf8af9a69c86ae6e60450cc6dfd3e9d0b45bf8650c057fdf54434280b36822965d5f0c0586956a84098285aa0a976090a83fd9077ada481a0 SHA512 486509e50e58c14866932a89706d98ebc4391af608acd95670b190eebe9069d254e11834e291ee2bc3c9e3e77e75ece7ab3f73dc7f097dfba5ca25fc888773fd
+EBUILD wmpinboard-1.0.1.ebuild 495 BLAKE2B 5579b7f84e09907042027e7bf810a3cf34bdd589d405026755373fb58878aa30ca51835210c4744a71c2d35e5dc5316fe65187ffda4c389f16b18fd28727609a SHA512 7419e448c4174f5d82063663f10aabfa7a0ffb39888d2a34b3cc3f2a6c8a5a1716a41b8841c644a04b44b7f7f8ca61e8f17e451144831adcc04c805aed57562d
+EBUILD wmpinboard-1.0.ebuild 669 BLAKE2B 5e959d6b1a4371f61583e5e440628dd9bdd4419f88a3021d8840f256c1e9c9398dcc5088c232a3f22b892d3c039a0fd39afaede204e77ad9ca7641631814ce2d SHA512 19b0bc413300ac13f231b9d30b9c9c49d4adea096448b8a9beef2b5e995ad6dccbca5811a4b2b7f9ac50ac73485f9c657e4c439bc846f1110086e51e902565cc
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
new file mode 100644
index 000000000000..884ccdd4b4cc
--- /dev/null
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Window Maker dock applet resembling a miniature pinboard"
+HOMEPAGE="https://github.com/bbidulock/wmpinboard"
+SRC_URI="https://github.com/bbidulock/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~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/wmpinboard/wmpinboard-1.0.ebuild b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
index c61c4996c8b4..1a8d9d0105c0 100644
--- a/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
+++ b/x11-plugins/wmpinboard/wmpinboard-1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 
 IUSE=""
 DESCRIPTION="Window Maker dock applet resembling a miniature pinboard"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/131/${P}.tar.gz"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/93"
+SRC_URI="https://github.com/bbidulock/${PN}/releases/download/${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/bbidulock/wmpinboard"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
diff --git a/x11-plugins/wmsmixer/Manifest b/x11-plugins/wmsmixer/Manifest
index 41cd3700f502..3e5a3f4e2e51 100644
--- a/x11-plugins/wmsmixer/Manifest
+++ b/x11-plugins/wmsmixer/Manifest
@@ -1,3 +1,3 @@
-DIST wmsmixer-0.5.1.tar.gz 33350 SHA256 eee60a40ba92e4c2c9a038c6e51cd3bd62b24b38a096d091dc60dfd26f0c5daa SHA512 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299 WHIRLPOOL 0cf89b38c4473fa8e162cc52021f5e50c1a9da80e6c6146a271f10f2b82049cc1da33e3850b36ca47e020c80af7d8393baaf3bdeaf3070b02361340e475ea949
-EBUILD wmsmixer-0.5.1.ebuild 807 BLAKE2B 498c0328425561e4adc57bcb2dfebb4abd13c23495436c13046ad0f271b021051cafb126d59156e7becd1b3a457c3147e4d782302dd2f1872a5ad41d662a0092 SHA512 356087d5765d8e76be0952ba27fe7a9ea42da979c5647c4869b981cccca74d0b134d0c0c91134f5822b8a2282a7cf904ac60088bf10d92672cc2d8d43416da1f
+DIST wmsmixer-0.5.1.tar.gz 33350 BLAKE2B 9f80e0680834b0c8537baececa1a80708ef249db3b58cd77d8d5ab2d13a96959d55f016b38bc5975f8c3decf7569a3a356e5c09cb27c2b5a662dc2fe00766962 SHA512 2731645addb9888b30cbfcaa1f9609c036855d3ee864628535fc5a0dd4c005d01b111bac3dd7f9d11f4794f55f22be65564ccafe598f098b13abdfa9277da299
+EBUILD wmsmixer-0.5.1.ebuild 774 BLAKE2B 5675a7986a846aaf21044bbfa31c9711409a893b4657cac8e0aa2924bc766448fa400fa11a1dfcc1ba1700785b36954692d3f7ceb715cfc3da101837945c9dff SHA512 45aea9d1306267111782541f314c9b04b002a0511493df413084734736944d0ac03a6b4ac1b9e06b4a66a925134032b6dc72e3a8456b6aae0493d72def51d544
 MISC metadata.xml 464 BLAKE2B cda6cb18a92e65299fcbd76d3cb5c22755d17c16d4d634db82dbee0a7421c0023159ac479369e9bd7c448b1e72b53d3b28ec393190c92d09856ff86c7f2fc3cd SHA512 ff0c18c9f0dd4c316c9e82b22a18d15a08d68b58e63420d96da5ae0e70872e2946e0c767f8b5c80951aedce5057a5e8bacafacdcff84416e7eb529c8746c186d
diff --git a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild b/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
index 167672d34733..1313463d65a6 100644
--- a/x11-plugins/wmsmixer/wmsmixer-0.5.1.ebuild
+++ b/x11-plugins/wmsmixer/wmsmixer-0.5.1.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
 IUSE=""
 DESCRIPTION="fork of wmmixer adding scrollwheel support and other features"
-HOMEPAGE="http://dockapps.windowmaker.org/file.php/id/63"
-SRC_URI="http://dockapps.windowmaker.org/download.php/id/268/${P}.tar.gz"
+HOMEPAGE="http://www.dockapps.net/wmsmixer"
+SRC_URI="http://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmswallow/Manifest b/x11-plugins/wmswallow/Manifest
index 9cceb7ab1431..92a4a54d1db7 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 SHA256 7d7a3dc64b89eeb388bb2f66815fc94cb551d0899f0e41d204f367109a2cda02 SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc WHIRLPOOL 1d6d6e19075b9a8daba03f99ef04357fc48bdb71e2373386f29a2636611ae20b56398b1871c8b163d069fbb4ee07c98cf1b27fd6bd5178a7756a011cd4d44be8
-EBUILD wmswallow-0.6.1-r1.ebuild 847 BLAKE2B 39ffdbfdd34a4f364280325ba9d83acbc4ec815569d2ad41b7912f91d4a88e108a4c75b9be190dab574289fcd2a894d9336842f0068da42ade2968d507d963e2 SHA512 ceb105cd6f980ebae86ebeed677572db5029c0c9d5ace9ba6022cf0c1bba57601db8f64b8942d3fbb750f7947f8295ab836660d6477b9aa9fd35298a337e431b
+DIST wmswallow.tar.Z 28567 BLAKE2B 3fb5c39fd07c4cce329f0b60abea72d0c42203bedd36f55994bc16f36412843aef81bc985a6acb9cea0b279f900f84ffc99bc088b5343e2997f6d3951bca4bba SHA512 24ef61a4084bda49afd6a7168600d99c60fe85daab6d16733fd208a905966433ca3d031a1d991676f3e73cb8a3a552c49fe69cfb4e1271e7c9a09d9247c21cdc
+EBUILD wmswallow-0.6.1-r1.ebuild 800 BLAKE2B 0bdc241c66b2cceb64d96da99d4b1380753ccbd6911b3a22257884dd7469def5dd45e704046068333aba0136d63db156cfa819885f79e1071c1b198e8aae2db5 SHA512 3970b8deca08ec1e85acbf465558c1f4d17cd977c1bb1b861692cb019bdfde63c153f90fd5352a97c41b1f92cb092fcbcc244e6bf56e349049d281555d2468ff
 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 cb3f20011291..8652e66d653c 100644
--- a/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
+++ b/x11-plugins/wmswallow/wmswallow-0.6.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="A dock applet to make any application dockable"
-HOMEPAGE="http://burse.uni-hamburg.de/~friedel/software/wmswallow.html"
-SRC_URI="http://burse.uni-hamburg.de/~friedel/software/wmswallow/${PN}.tar.Z"
+HOMEPAGE="http://www.dockapps.net/wmswallow"
+SRC_URI="http://www.dockapps.net/downloaduuu/${PN}.tar.Z"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmsystray/Manifest b/x11-plugins/wmsystray/Manifest
index 0aa8c60bb7c5..4e86098019f8 100644
--- a/x11-plugins/wmsystray/Manifest
+++ b/x11-plugins/wmsystray/Manifest
@@ -1,6 +1,6 @@
 AUX wmsystray-0.1.1-Makefile.patch 1551 BLAKE2B b58ebdc03508d47d1eb6c58913493bbf86912bfff9f32268abc41f7e7dbe9c86c85299da9e0a2c9fd2932b8155718ca6df52981d7035ea23a3bb8b5938ba3111 SHA512 0ebe1530db6770556def85a99075e9bea40fc9cffa1d0a43838651d0158c50960222ee830f8c8089f271537fec5869c6975fe17283443c9f9edbdf9da1a1c1b1
 AUX wmsystray-0.1.1-gcc-3.4.patch 270 BLAKE2B 080549d7d8293c80b82b14be801f05d98e22de00fa3535e8768527c18607010918d6cbfa885e07c035601a6f8d3dafc65574b94e845a5b3dc8d1d63a5e75a761 SHA512 018db13c7eddd35080ddddc8ae146a5a129785561dc5a75ed4eac9bd7376b77a8a9c413a2e5cf4fb6d26ce454ed52b9afd206e812c3cf01dc46d88678bd60c92
 AUX wmsystray.desktop 185 BLAKE2B 5d4f524ddcc939ef335a043fad6c136e03f2a2cc7fdcc9a4703e210ad301d5e101f8c03caa6c5a069ca805ca44abdf6e56a18fcb8e98596f80f469482b8927e5 SHA512 f7a2c0391257d76c9024f2804de067b07f3669fbba6fd0af6471297f4c0fb876ecfdd7cd6b931187d657d6558ff27d01766c299048f7c16c4d4eed5c4586213b
-DIST wmsystray-0.1.1.tar.bz2 18261 SHA256 d24a9cb25f4394eecb6e9215b88dde0d9debf203fbf1e501fb02e3e0571c37f7 SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604 WHIRLPOOL 4b6032663f5cd4c236bce79cd77626a1e15cd057c96c27080587ae4f6cc506b8c10082e13a215bba0d673373d45d1f07f445802218aa7df2920469f2505fdeff
-EBUILD wmsystray-0.1.1.ebuild 1197 BLAKE2B 55b8542b934a44ae5733b15dd5f7be1f7b4a327c8b6dc29789a6cfa9cfca66e77f8c99c31a27394fbc1d07e998eb256c4733a42e9f843a200cfa577849b1296e SHA512 dc7130595f2338cd2183179f8a4b40a40fd0f686f7e5e31b2b70c250c4252a99a947122934c650a8555e0369e81fce9748cd8ab1c9bf263132eed6834ef03df9
+DIST wmsystray-0.1.1.tar.bz2 18261 BLAKE2B d232dcfd3077760d7990ec8e22249aafa9dacf415e71b6a662a1a32464e233cd5460f9b99d6e1c478ce69c6ad0e9973febfce2292992d5619792d4bf4dcc1d7c SHA512 a28d8cb6a3e74909a1467459f81a853dae2d74c28db166be15f398f00bc8066fbb1caa0e982fb3874279a7edd376ab892499e8981d2c2126eed591ef52f8d604
+EBUILD wmsystray-0.1.1.ebuild 1196 BLAKE2B c70b847bece897b14ee3f5edc54dad5dcbce8ba79c68865fbf85f199ee0659c861cc7f58af01bedf20f128bef80cae752b595708840e33088ce6e146de53d6c5 SHA512 b911699bd901e34690c8e7e3920cd8ebaf181a8ee776cd52eccb49826eacad985dead31d340b8889a1e47f5338f11c26bdbf38c4056a92c9ab33ad25a54f142e
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
index bb4e1db54854..cad9da31487e 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
 
 DESCRIPTION="Window Maker dock app that provides a system tray for GNOME/KDE applications"
-SRC_URI="http://kai.vm.bytemark.co.uk/~arashi/wmsystray/release/${P}.tar.bz2"
-HOMEPAGE="http://kai.vm.bytemark.co.uk/~arashi/wmsystray/"
+HOMEPAGE="https://github.com/bbidulock/wmsystray"
+SRC_URI="https://github.com/bbidulock/wmsystray/releases/download/${PV}/${P}.tar.bz2"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXpm"
diff --git a/x11-plugins/wmtime/Manifest b/x11-plugins/wmtime/Manifest
index f289637f1021..6064088ff71c 100644
--- a/x11-plugins/wmtime/Manifest
+++ b/x11-plugins/wmtime/Manifest
@@ -1,8 +1,3 @@
-DIST wmtime-1.2.tar.gz 23219 SHA256 ff39675d2c51e1d0774bdc181f27966fcf8f063bb0a4c8cfda9c83d9978a0b1a SHA512 d81be07012a9efd93a51219d6b63a76d88c8916af0b3ed990c3005621f643c70fadc31ebc8fef11c1605f303bc3e036c2014809c5368f4acaff8b7a1c1665c15 WHIRLPOOL 18067140573474c6b5ad3d01c00b353b55e6caee05cf474e0daf9483b9cab58df4d6dfcecbca53cc6015417f122f8ae920277359de682c7b9943ed09e8368b55
 DIST wmtime-1.4.tar.gz 19200 SHA256 6a112a2c7e22002b2c9d69479b95d4bae0ea29b310da71e612f540300c6def04 SHA512 46e35ffe41aaa55a651fa2a4002ab83fd45f901dc12ce1e0ed981666b9b620aa11666920f595fc3a782c54cc036491e0c676fb760a38cd6f6b24e264723b87fb WHIRLPOOL a8a300e5110ca0ae24d725c0c40d0b893047d5d450ba2d861898c7a47063efc9756fe2f32c7e5850d56f81653b07806a3ce6bf223d7dd01c8cc681eff06081ee
-DIST wmtime_1.0b2-9.diff.gz 8234 SHA256 189512286950bd5f8ab41d41c3ccbeee8811be95519ef9b03b12aeadded8312d SHA512 1ee089138bd4b94affbab8e089d5c59ab49d712be5f44132c69d0da44ae36ace879b51fe7c52174d0f60c7acdd2913ffeadcada55bbd166a0c7e74714711d76b WHIRLPOOL 57c49476424db9b9f0cb1d0c1faed54ead7540a42f52d7568208cd879ddfaa53812b6aac4e7ccdb0d356e88542cde16fa7be3f159e2ce7932d48c3dba1d060d7
-DIST wmtime_1.0b2.orig.tar.gz 20483 SHA256 a526b95a16b8451ee9a05b57d97251e3d9efd5e7b7143d3592767b87a3941375 SHA512 944f3238379dce8de8a0b91e642e7f9ae3e9866fdcbb99a0c73b9ee91c072ab9b89526814c8441e873b77c83557c3cd06cc7156ac8b31ab5098caf97657f2cff WHIRLPOOL 15979baae28ede82a696a8f51cb4318f675dae0533048cede7398632ca34b7138e6fe3a7e227ef30c7992e305a4bc5aeb8fc6c508986a39698004929aca78bbd
-EBUILD wmtime-1.0_beta2_p9.ebuild 1355 BLAKE2B b4db200593cc3bc8498980efcc7357156fa5b3235f358e252ef12a661451c30d73c606292659fa741f8b966330ee0c257753129dce48352867ef945c3ae91b1a SHA512 a03836204bcb0dee9c3ef307179189e77b0eca797bfc152ba7bc3d76dd4f9a3df29ee6b7aed5afa601bbbd624bceeb66c2701f5cacce4e161484b501647dc5f6
-EBUILD wmtime-1.2.ebuild 699 BLAKE2B ee87fc30d95f5a30e6d2d04723ed86b6904d6505df8807cf3a9dee3e1137f3f4e720789db328a72ab7d3ece54d77953bc568a26310aa1b76b55aa1c5ff1ac3ce SHA512 55caca9476a62d5f106aa1d88ab53c4489e5d294a518f0b60003d6fb65f70ddaa7a8e72bb01b1f56c179c01372d3ce4a5c7f1c1cde0407192359f8520a229dfe
 EBUILD wmtime-1.4.ebuild 705 BLAKE2B 2630df46eb04c6b88107114e69ea8cc3ab84a230db2e5f47fe3f38aebfbe99dcb40e6ba520540688e4b0b16d14d613dc830e4b3d1fa99f84539528865c0e90a5 SHA512 0186df8379057fe49b6779f3add89fa69ce2054a2990982f70c8ce3b931a7d718e15dc926b800a800be0130f6f276e85a2ec077a69036f22b9d7d87b646cd5dd
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmtime/wmtime-1.0_beta2_p9.ebuild b/x11-plugins/wmtime/wmtime-1.0_beta2_p9.ebuild
deleted file mode 100644
index 3a15f2b62dc6..000000000000
--- a/x11-plugins/wmtime/wmtime-1.0_beta2_p9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-MY_PL="$(get_version_component_range 3)"
-MY_PL="${MY_PL/beta/b}"
-MY_PV="${MY_PV}${MY_PL}"
-MY_PL="$(get_version_component_range 4)"
-MY_PL="${MY_PL/p/}"
-
-IUSE=""
-
-DESCRIPTION="applet which displays the date and time in a dockable tile"
-SRC_URI="http://ftp.debian.org/debian/pool/main/w/wmtime/wmtime_${MY_PV}.orig.tar.gz
-	http://ftp.debian.org/debian/pool/main/w/wmtime/wmtime_${MY_PV}-${MY_PL}.diff.gz"
-HOMEPAGE="https://packages.qa.debian.org/w/wmtime.html"
-
-SLOT="0"
-KEYWORDS="~amd64 x86"
-LICENSE="GPL-2"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/${PN}-${MY_PV}.orig/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-
-	# apply debian patch
-	epatch "${PN}_${MY_PV}-${MY_PL}.diff"
-
-	# honour Gentoo LDFLAGS, bug #335799
-	sed -i "s/-o wmtime/\$(LDFLAGS) -o wmtime/" "${S}/Makefile"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install () {
-	dobin wmtime
-	doman wmtime.1
-
-	cd ..
-	dodoc BUGS CHANGES HINTS README TODO
-
-	# install sample config file, too
-	dodoc debian/wmtimerc
-}
diff --git a/x11-plugins/wmtime/wmtime-1.2.ebuild b/x11-plugins/wmtime/wmtime-1.2.ebuild
deleted file mode 100644
index eae82c6c4ccc..000000000000
--- a/x11-plugins/wmtime/wmtime-1.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="applet which displays the date and time in a dockable tile"
-HOMEPAGE="http://www.dockapps.net/wmtime"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S=${WORKDIR}/dockapps
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install () {
-	emake DESTDIR="${D}" PREFIX=/usr install
-
-	dodoc BUGS CHANGES HINTS README TODO
-}
diff --git a/x11-plugins/wmtimer/Manifest b/x11-plugins/wmtimer/Manifest
index 59eead3cf925..69eb3c72d095 100644
--- a/x11-plugins/wmtimer/Manifest
+++ b/x11-plugins/wmtimer/Manifest
@@ -1,6 +1,5 @@
 AUX wmtimer-2.92-counter-fix.patch 717 BLAKE2B 44ca05c4f1343f802ee4444a39279e933f96972debc41a2e0d2d670bcbf12be3550b552f34e17a3c0f224913a4d7f605eb247fda0ea6b9b942506a8a603fe98f SHA512 c78820e8bca43649942c13c42ee944bab05e346e98ff405b49017cceb70241aa65f8a73dab2376194c399fabfb9ccd0a92fe5dae9dafd84d712f59a6be550076
 AUX wmtimer-2.92-list.patch 3323 BLAKE2B ac61e7129f7883d3046ff0be7b23c817decc76deafc5eb1de8953afe0a0aa418a11f857f684f185c29cb72760d1f0619d045e2a294b185ce544db72a5d5e49fa SHA512 f7001d64ea1097a79b6b3b7d5b64cfd930d06567f8734b55868a04370480e469e5dffecec38ca421550235f2b0f84217efbd8ab278e0d44cacf37c723c626dd7
-AUX wmtimer-counter-fix.patch 597 BLAKE2B 3d74ab72cb60a1cb16fa3214009cabbe7c665dd8ea0ffb50ea515858fe8ae750d033fba02ee2591792cd518ad7778ba46e3edcc8ccdf80353f2ef3aeb2864141 SHA512 dda0947bcb511fa030a9238ff9732388f3e74aa111c97f2aec4c5220a8bb76f05460583c9999e22c35d642f5996974c862e5045c9df3ca495472f6be0b6896d1
-DIST wmtimer-2.92.tar.gz 22091 SHA256 3726c0e0a0a95ce7c4c9dd8088b3f050d5268f70fef9341452f5449cef8c0cd4 SHA512 d00e2eff92c89b1a848d2319f62b2f060f4ced1299440aa20ca4288b5bdd16f7cff625907f6587514a1618fec74e5be34fb6c923cec51a663cd9efc86c6f0a07 WHIRLPOOL 203bd12691f1a6f9cda7966f6828adac653ae59f3c5878dbd9de15026e64d8a8025063d3bac4c8d35c5a45c2b77d52fcdafbe0f570cdf41f29c1bff8127bd582
-EBUILD wmtimer-2.92-r2.ebuild 1099 BLAKE2B 744a2e68a51c0e0bf3694a0d7c4be70101f91567f2874b473a758bd57b698ad6b7843744fe7f2ddfcf5fefef1a0a37f2c7fe4154b972d51191cd4bdfdd295ba4 SHA512 33f3a44680b4d299a27c138ccf72b20a95dcd3995cc5c8f7f8bf06a8a7eda85dd1fb40df816cbd71665ae167345dbb94da67e5ffdcc04cd710707c2d4d5df6c5
+DIST wmtimer-2.92.tar.gz 22091 BLAKE2B 7e8f598708a70168233aa4545fc9978fab9ea6891a02f618f1bdafa08bbc3ed077183c19f467c70637b07fa501f40bd2409bdb3e60034888296895b9ff3f35f1 SHA512 d00e2eff92c89b1a848d2319f62b2f060f4ced1299440aa20ca4288b5bdd16f7cff625907f6587514a1618fec74e5be34fb6c923cec51a663cd9efc86c6f0a07
+EBUILD wmtimer-2.92-r2.ebuild 1098 BLAKE2B f4096fb28c96cfcc91e15e6048b747ed41183b0d332ac9176071ac10eb146eecca7493f3768982beae55540ffa837a5eda6cf303f95f42d11356d6ab2a315daf SHA512 4b5cc50f8524d952ae8e46fd5a4613532972c83fdfaac8898091d05830dc5b1e3033e1edf9e9575691456343a44e7b401aef9f64393184081da38ff96df59a73
 MISC metadata.xml 589 BLAKE2B 5f3e4fced150616eb5e681ac4c6abfa712740e422e992b6bef6f8df31ba92086c508a100f4011fa09db052ba2d2649542874b68cc03e176938cda9519a2d7098 SHA512 dc1b93fd82bf9427f16bc44056278b8869d216769de5784b137d73196e059166e083c355b444e5435c959af64c1085af159a704e48646dd23dc8c28afd4f671b
diff --git a/x11-plugins/wmtimer/files/wmtimer-counter-fix.patch b/x11-plugins/wmtimer/files/wmtimer-counter-fix.patch
deleted file mode 100644
index 62f2a5a82795..000000000000
--- a/x11-plugins/wmtimer/files/wmtimer-counter-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- wmtimer.c.orig	2004-01-29 02:45:48.000000000 +0000
-+++ wmtimer.c	2008-10-17 20:49:05.000000000 +0100
-@@ -128,7 +128,8 @@
-     switch (mode)
-     {
-       case TIMER:
--	if (prevSec < thisTime->tm_sec) 
-+	if (   (prevSec < thisTime->tm_sec) 
-+        || ((prevSec == 59) && (thisTime->tm_sec == 0)))
- 	{
- 	  decrementTimer();
- 	  updateACT();
-@@ -138,7 +139,8 @@
- 	prevSec = thisTime->tm_sec;
- 	break;
-       case CHRONO:
--	if (prevSec < thisTime->tm_sec)
-+	if (   (prevSec < thisTime->tm_sec)
-+        || ((prevSec == 59) && (thisTime->tm_sec == 0)))
- 	{
- 	  incrementTimer();
- 	  updateACT();
diff --git a/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild b/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild
index 81c87ccf1d1f..361f2745af0f 100644
--- a/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild
+++ b/x11-plugins/wmtimer/wmtimer-2.92-r2.ebuild
@@ -2,12 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 inherit multilib toolchain-funcs
 
 DESCRIPTION="Dockable clock which can run in alarm, countdown timer or chronograph mode"
 HOMEPAGE="https://github.com/bbidulock/wmtimer"
-SRC_URI="https://github.com/bbidulock/wmtimer/releases/download/v${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/bbidulock/wmtimer/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/wmtop/Manifest b/x11-plugins/wmtop/Manifest
index d94104dc6e8e..17bc035b99f5 100644
--- a/x11-plugins/wmtop/Manifest
+++ b/x11-plugins/wmtop/Manifest
@@ -1,3 +1,3 @@
 DIST wmtop-0.85.tar.gz 21165 BLAKE2B d114391a987395ae2defcfe03bc4dc022b8d9e4163b310cb4294e34097d8b950fff44c09035265ed152a1a86d2aadd67dcca7a50cd1230c0cf5c49d2b2cb49c1 SHA512 0a251b1ae32fe8c9a09ed1aeb19315d2eab42a7b2264d637de57f2ca946af69f68fec43d921a21ea0cb25b5fa6e24206bf1321ce59dd0ed6c187a5327c7ec70a
-EBUILD wmtop-0.85.ebuild 546 BLAKE2B 45e0ceca04154730b0cd9a5d954007289fdad6e1e771c4388774c1e061f747be2cc42638d8b290e6dfdab28a715f4e021586899f1f505c07df87efa4b085115e SHA512 b0e07c9bec5a8e275f27d168f32ebdd9411ce7a2902d194f63e54e0cbfd6b117f74b9e35e3ac964fa2f6ea3ccc1cec04696f3ca6bb1c8e3c2d0111a8ad5fcad5
+EBUILD wmtop-0.85.ebuild 618 BLAKE2B 08f5b9b63fa1bf0706f61171044ba7091346cc6765841482a9c70b01b07842201f88145de3fa318bee95de309487057819b8adfe893e9b680ed7637fbc947a5b SHA512 ebbcf61a9c52ddb62fb173ee2957feb7ff785db1a5e0f27ae4681d0794458f7f534630a0c83fdcde70e00360fb9dfec986c3d922f7cec4456ac2e18cbc778b2f
 MISC metadata.xml 639 BLAKE2B 898fced3d3ae4a34468493471dc8ba5e470e2599a564c8273f5bdb6ba8757a76e20008be9d26411a89ef234d5e82fb663b593f0aa608ef62fd1ff25923ab4b0b SHA512 d902e2cbd1b3809ff8b89b896acbe611191f6c6ae2e7299c4b41b0e60364fc7c4de4f548b30f1091f163cfab4178af1c716387ffe12a2392002dbfa4bfd20154
diff --git a/x11-plugins/wmtop/wmtop-0.85.ebuild b/x11-plugins/wmtop/wmtop-0.85.ebuild
index 5242a13685cc..a9860141ef5d 100644
--- a/x11-plugins/wmtop/wmtop-0.85.ebuild
+++ b/x11-plugins/wmtop/wmtop-0.85.ebuild
@@ -20,6 +20,9 @@ RDEPEND=">=x11-libs/libdockapp-0.7:=
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
 
+# Incorrect path in this tarball version
+S=${WORKDIR}/dockapps-be3f170
+
 src_prepare() {
 	eapply_user
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-01 03:04:39 +0000
commit	407525b571b48cfd65e1ad7a02d250a927c967c9 (patch)
tree	844bea44d85dc7218f54970af1c42cc9d55c3f1a /x11-plugins
parent	89c6c06b8c42107dd231687a1012354e7d3039fc (diff)