gentoo resync : 30.06.2018

22 files changed, 213 insertions, 32 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 3ab1d2e2da2f..df465afd3942 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/bfm/Manifest b/x11-plugins/bfm/Manifest
index 1822110a6075..a570fbe96834 100644
--- a/x11-plugins/bfm/Manifest
+++ b/x11-plugins/bfm/Manifest
@@ -1,4 +1,5 @@
-AUX bfm-0.6.4-makefile.patch 1768 BLAKE2B b80f120aa2bc6a304c30817b514c0e1218c1e46e1c8c1d6dd6ae39aa7105d963e4edd4b8ac4c81bbf63783e3cfc0a6b6eea87e211b9868454ae64f6267e2702e SHA512 5974e404a440973995409c44b2434304bf42955395e7b3bc0069151cb79cc8da0ad8f7f7d39641b58102b596e217c89d26d022277459e060fbf74e621a2a7128
+AUX bfm-0.6.4-makefile.patch 1767 BLAKE2B 684136ca5d6efea77304fe735d8ae740c9d72c4aafed1f9ac9194320c800142902c2641c119a1c99aad753ed2032f63ff479888a3004ff37691b92e3fbb43428 SHA512 f5d1353e2ba61377ab03db53640df497eaa1287500d7eecb3b9b1e25f65a7ff9c73d04e48fd2395e5a0636b8db3750396d05f547be661834ee7d65f5fe7bf2b4
 DIST bfm-0.6.4.tar.gz 59288 BLAKE2B b70d98a944e2e6daaf694dc90a0f8cebc01afd8e11c46fde614e2b2affbe0e331cc15a308837fe987238182a3b4b631bb0d8f8d7f50b84c8705e113425cec7ec SHA512 1a039ef7448c610d2629b50bcac082e7d70eb755aa43e79e6b0868448f92aea5078548273c5f278fac878433cdcd9492589fb1612108807a4fd2afb0e07612a4
 EBUILD bfm-0.6.4-r2.ebuild 985 BLAKE2B 757d3a92839c1c33be79889b5e752a1dc24c93c24bf0125f3bdd9b362a806c35fba340ed33899e3610db05637c4f2a389231564ae13027870345c2f4b8c51338 SHA512 c7bdb388203ce8e8129049f50fa7a466a9d29eacf07535474c4a71829708148684b116b4a19a3a6d4fbb94445dc4f3d86a1df7652c525aa1164f1a97e4a6c909
+EBUILD bfm-0.6.4-r3.ebuild 958 BLAKE2B 79c1e8f31ef8706b40a12b80e7657e0ebd99e98ef3871297883ee9716dda24c41209ed64a74d37e2238756b63407629487f418bb60faf258a11ba50e93d77770 SHA512 d790a90e185f476e1ce314fe449f80f017b3e7deede7012a1f1715fdc2e834e216c8088793fd057dc0e5e72570156080de07a58b9f068f731881f039dd5c4257
 MISC metadata.xml 348 BLAKE2B 97496aab8db3d8075f89e58745d4f988cc33fe4570ade80f97a5bfcda4ddad4be5f2de4fb695eb0b1a6f66af36986ec609bee10ee34fbef7a244489d6ed2e5c3 SHA512 fe0a9044c9c8d839007a04e0ed0012da1d22df3435f237620d49b0d1efa4bce533b116f15e6fa34d1c494d65729d0667ac29a2e06a4b2009ba24510b97f4f93f
diff --git a/x11-plugins/bfm/bfm-0.6.4-r3.ebuild b/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
new file mode 100644
index 000000000000..825865105964
--- /dev/null
+++ b/x11-plugins/bfm/bfm-0.6.4-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="a dockapp and gkrellm plug-in combining timecop's bubblemon and wmfishtime"
+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"
+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 )"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+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/files/bfm-0.6.4-makefile.patch b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
index 773372e1020c..21c183c12079 100644
--- a/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
+++ b/x11-plugins/bfm/files/bfm-0.6.4-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2015-01-20 10:56:34.791157688 +0100
-+++ Makefile	2015-01-20 10:56:48.135154215 +0100
+--- a/Makefile	2015-01-20 10:56:34.791157688 +0100
++++ b/Makefile	2015-01-20 10:56:48.135154215 +0100
 @@ -26,21 +26,21 @@
  EXTRA += $(WMAN)
  
diff --git a/x11-plugins/bubblemon/Manifest b/x11-plugins/bubblemon/Manifest
index 31d349c96a09..d70058722630 100644
--- a/x11-plugins/bubblemon/Manifest
+++ b/x11-plugins/bubblemon/Manifest
@@ -1,6 +1,7 @@
-AUX bubblemon-1.46-asneeded.patch 509 BLAKE2B de70f1c68c900db48a2c567c296a1b27d7e0fd6ff1e42fc843e9b6d1dbd3b06b5db96a64ae382f11ec9e10b32d86d16d3779750ef93025bbbe643f93e8eade46 SHA512 66fc827caeb502f24fdd1da09c3530bfc54d862fb8ecb65d67ddf32c47512ad54276c64420fcea663c66a967ec3ef3eafbd058542270fcc5f6516ef343b674ed
-AUX bubblemon-1.46-gtk.patch 3027 BLAKE2B d4b69d4485c76538e101085ca77329605c38fb359a9daa55c00b171b93f99abd326987da7b2ac6817035716dbaa26e770fa91c067d3ff5b870442a2affcc4c9a SHA512 02d49c26cd7795589de217fac7161733579063fb87e448c7405e20119f57adf557b671fa4bf9603647ce3170d28a20e227ee63c17a4787e44d281d3a7eff9c41
-AUX bubblemon-1.46-no_display.patch 720 BLAKE2B 982139bca9a4a1fdedb2a25f63fa80c9d48cffc5681a7577a0779a0fe2f95112b63c6ac4fb594810ea4f7333b80e1a8746075255f5907f331c7a84565d085980 SHA512 2358c336f1795d02d2e0c143c1622e1fcdd24e4d499152013394cc654dd2d61c0f5f50beab967b1be3e362ccf1aeceea4663a82d696e821eb82a63d2738f5aad
+AUX bubblemon-1.46-asneeded.patch 513 BLAKE2B 28d10b30be6936c0e6df4ce208e3e480a363a590e7cfc61d59ced4d61adabb68d79e84ad68c97a754e10f065eb76c1850785142914dcb28f55cab2410fd3d005 SHA512 2c4585a344ea613ebb4b9aa804d3596b2aac1b44d016a07e7e1631f58fd600022ebe0abc6ab6a0612d69ff71a2a7482d3a2b9e16827ce9511a1744c04a92ae4f
+AUX bubblemon-1.46-gtk.patch 3035 BLAKE2B 409edca6249903ab0e5bf241a9282cc3fedf68ffbab4734e3f180c7ec5b97f123868a919d324c1bf6a9f3dffb25de28660ec7b6f0fb0b8c1d43459b622b625e8 SHA512 2b9b8a62983af72e87720c5ede8f81c73be978753ad7d130d57ea44675c2114dae9399c139a35d4a8a6738d7b35b5fbbf3ab2ec90a4b4b05fb2bf8be3d4d65ed
+AUX bubblemon-1.46-no_display.patch 724 BLAKE2B 964793bc692ec4737e563c828c9a50fe9f71390b21d465dbfe63ecee342341b94da9de7d54f1f93cf831ef654c759afd2db7049474713c051cd36393ddf0ff83 SHA512 d00d43b8d7ba870fee5406b495d6577062e4bebd9864dfbf5a29a691dd85d65fab7956c4750e16aa06a4c85ec5f030c9ce22d2f12e77b816d0a80f7e61b06349
 DIST bubblemon-dockapp-1.46.tar.gz 40001 BLAKE2B 1b4bfb91d19d4e2cd653e7df258b248d0e101b431b5ce79900520d75ad39bd006ef583d148afecc1ba1b3f6ace44387f0f1ddf9ad803b47a9bf6481202353bca SHA512 c3d42f82ea7fb837839787a184a6198d7b092451e629562c90735a22166e75f55e8e1af1026e0314a4f06ff68bc48a22157e62bd19e54a4e38b4c12228396fa3
 EBUILD bubblemon-1.46-r2.ebuild 954 BLAKE2B 7e9dc43979c430ea55bbe1cc4cbbbd6c8062c11c973ea45e65b2f90052cb37cbf5110b915769b22595ac4fdcdeb290df026010b7c74fcb4ef5986070b9b985a7 SHA512 b2af344c0fe6957e2e176ad6dcd89887db1ddf4c33484c274280a990b49ea5c5edbf1efb51b37a263b6bbdfa8261c901438af8de2d3ebf5f42754e64c4bfb608
+EBUILD bubblemon-1.46-r3.ebuild 928 BLAKE2B c40857652504c02667de72ca00c4c2ccbac7140ca7952b77141356397881a1f49b9874f30442863241aa6bdbea17e1528f5c6bac0f30930d9b46b35c8ea42fb5 SHA512 82259af3e8c644e9fd4a81856972dabbd32b2b9732cebe579b0651df6afb2171a346cbf59842c7feb6d3decc92b69b840660e9f2b50b2e9a07862e08f9ab8aff
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
new file mode 100644
index 000000000000..7650a4f7fe6c
--- /dev/null
+++ b/x11-plugins/bubblemon/bubblemon-1.46-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A fun monitoring applet for your desktop, complete with swimming duck"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${PN}-dockapp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-dockapp-${PV}
+
+PATCHES=( "${FILESDIR}"/${P}-gtk.patch
+	"${FILESDIR}"/${P}-asneeded.patch
+	"${FILESDIR}"/${P}-no_display.patch )
+
+src_compile() {
+	tc-export CC
+	emake GENTOO_CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin bubblemon
+	dodoc ChangeLog README doc/Xdefaults.sample
+
+	insinto /usr/share/${PN}
+	doins misc/*.{xcf,wav}
+	exeinto /usr/share/${PN}
+	doexe misc/wakwak.sh
+}
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
index 3988f3796964..15f323fc471d 100644
--- a/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -32,14 +32,12 @@
  OBJS = bubblemon.o
  BUBBLEMON = bubblemon
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
index 3383c9f5baed..5a57624061c2 100644
--- a/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch
@@ -1,5 +1,5 @@
---- bubblemon.c
-+++ bubblemon.c
+--- a/bubblemon.c
++++ b/bubblemon.c
 @@ -58,6 +58,7 @@
  #include <gdk/gdk.h>
  #include <gdk/gdkx.h>
@@ -33,8 +33,8 @@
  #ifdef KDE_DOCKAPP
      /* makes the dockapp visible inside KDE wm */
      gdk_window_show(bm.iconwin);
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -11,30 +11,49 @@
  
  # no user serviceable parts below
diff --git a/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch b/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
index f50d4f50d5ec..3d52cbb43c06 100644
--- a/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
+++ b/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/310399
 
---- bubblemon.c
-+++ bubblemon.c
+--- a/bubblemon.c
++++ b/bubblemon.c
 @@ -44,7 +44,7 @@
   */
  #define _GNU_SOURCE
diff --git a/x11-plugins/cputnik/Manifest b/x11-plugins/cputnik/Manifest
index 45eb33dbbd04..96068d73a478 100644
--- a/x11-plugins/cputnik/Manifest
+++ b/x11-plugins/cputnik/Manifest
@@ -1,4 +1,5 @@
-AUX cputnik-0.2.0-makefile.patch 710 BLAKE2B b3b8e0f003fd3ef538b3e5efa49362323e7cc0751324e16b57c11b369b9969f31a796e0f734799fc4c6d738b47b356f333831d39e721423fa40e0c73a316ff83 SHA512 aad5f90f1e8717b539048ee8e0ba1260b7342c8a4f8e9b077b58e1c12b7f057c8f17bb17e94e3afd145dd4aeec746ccc94d339daef302b173f8a17baf565a9aa
+AUX cputnik-0.2.0-makefile.patch 709 BLAKE2B d40b5743f8bedf589d18e020374a38daf10563542c5e9f93514013880dceb16629c7ee83737ecdb6ff7dbde189697bebe6679b931e4cf5996245f2049a811f31 SHA512 4aff01e83540a7c08e777be8726b07fdb9d34798da957c85b9c27c87760854db335ed9f45b1dd250f63ae16c1e96c59615db79ca818f7233822103695458744d
 DIST cputnik-0.2.0.tar.gz 17850 BLAKE2B 90824218a349d9b6cdf592cafe8dd29674f975a190a19a3dd6b941383d47f4fc492af339cbbb88240499363a1048b2564855d5a17caeaf53437fe34bf0d55ee1 SHA512 829d9d63f82a2d41c0160be575b3fb7840a5c295c6dd16702240a6aa104e557bff83936c46243e850edf918b41ddc22fd123dab7f5ffd6492302d60c374df55f
+EBUILD cputnik-0.2.0-r1.ebuild 639 BLAKE2B e14579a06a92c54d14521990de0e5f042057f06c26dbd0e0dc13fe975fa09bc8533abe2de66715a1278e51ae433271c1c8ed88547daa67b10f80a5de599c6b0a SHA512 cbdf01a2abc604c2a27856b7ff07006828733fedfbda5fab8fa71dbb564f2cf4d6438a65db911384f3a412fd7e441ebfc9e0aec916aa253de23dc919dffc7344
 EBUILD cputnik-0.2.0.ebuild 733 BLAKE2B de4d82cd0be22b3bc3c3774e4e5adaaf3a396c49b81459cc1aca84607c04f30caa9b440dea0131a7edfa47df1b0bed96cc09050fc219a7f2d5b203da397c406c SHA512 4c2f93045d322ac64265c244ecc28595fa23373f94ddc6a8fdb014f3ab49afd2a8af5bccba0dd84bcae73798e85d5f72972320e2e3c680558553ac2563a7afb7
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..5c123773ab90
--- /dev/null
+++ b/x11-plugins/cputnik/cputnik-0.2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="cputnik is a simple cpu monitor dockapp"
+HOMEPAGE="https://www.dockapps.net/cputnik"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin cputnik
+	dodoc ../{AUTHORS,NEWS,README}
+}
diff --git a/x11-plugins/cputnik/files/cputnik-0.2.0-makefile.patch b/x11-plugins/cputnik/files/cputnik-0.2.0-makefile.patch
index 1eb1279b3bb3..b0c39ef2898b 100644
--- a/x11-plugins/cputnik/files/cputnik-0.2.0-makefile.patch
+++ b/x11-plugins/cputnik/files/cputnik-0.2.0-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2005-03-26 22:29:48.000000000 +0100
-+++ Makefile	2008-01-27 19:43:33.000000000 +0100
+--- a/Makefile	2005-03-26 22:29:48.000000000 +0100
++++ b/Makefile	2008-01-27 19:43:33.000000000 +0100
 @@ -1,15 +1,15 @@
  
 -CFLAGS			= -Wall -Os
diff --git a/x11-plugins/docker/Manifest b/x11-plugins/docker/Manifest
index 9a2c576c160b..4e82681f9100 100644
--- a/x11-plugins/docker/Manifest
+++ b/x11-plugins/docker/Manifest
@@ -1,6 +1,7 @@
 AUX docker-1.5-makefile.patch 1437 BLAKE2B 2b21739cfed306b73d4e7041eaffbc5456118d70f828a36b6519f4d2cabd62ad8ffcc0842707b378b2046a1b367685fc1162f6e0865c45ff8b5ad46fd347324f SHA512 c48a8926b49d34fe7c794380d63c240e60d1df7c3d38c2e3ad8762593f36b478f6e90ce2acd4028491f2ad6b615cca3d81be503e60361ca607bef0f617645834
-AUX docker-1.5-makefile_rename.patch 1485 BLAKE2B 9eb850af5f9d28aeddccf8823e55983b334c953df956f28fef45eb9a18934887871ae5b5f8c987d4bada689a00a64e12e4e4d45003b9e7f7b73802a8ab73bcce SHA512 17652b5ea6051264288bdb02dd5936b490a39ed1ce37d6ae00cc41b6b5ebc66fd1532bb60d35182db08776b948ff944cbc7a5ec5d9b067d73afd29827a19f7af
+AUX docker-1.5-makefile_rename.patch 1484 BLAKE2B e5543ba0aa9557f76164f271b01ce1252ccdcbcb633b605c5250b698bbcf7b3e07476d1c474b716db75bfcda3f98dc29e820dfe581a578faa54db5502575c821 SHA512 6299d1bdea793d68212b65525b9b0f0548bdc379b7cd020c2f3d384fe629df42e2be4c29c3a26d06aa7f03abab83e82a33e9aba7edbe34dd1896604a2695622d
 DIST docker-1.5.tar.gz 14863 BLAKE2B 258e0a8a4fbf5246480bb833bf8eca83a983d256b70b02f41123c3788a1381e93a793332b8e857a03bc8afd27aba2201825d290d1d3f3b42decac5fe9b1f06e6 SHA512 71b47156c31e5db5620612d3444eb298489fb33da296742c10543838e65677daa1b81bb054e6a7f57b9e2adef47406c32040983cb09988d93778a555e72cd861
-EBUILD docker-1.5-r1.ebuild 787 BLAKE2B 17c7e90de7035a4debc6bdbbc0bcf3262f3a1f7463d51a9a0b8b3f14ddd9e52d3ab451b699a83b4258cd605e2a2931807deea3c64ffcdabd80f179344753638d SHA512 4435130417c3a40cfcc82e605e72b42c4f9befdc9be4d9bd0025007fbfcdd1b55cae22c55f56cd913978de1907525d291f3d0ad3614dd367973b9c143d0a51f9
-EBUILD docker-1.5.ebuild 769 BLAKE2B 38998e4e03e105ad1fbdd094d8cb0784e7d4f6fe2768897eb9c8ca644a4d788fa7f0c5a9338d171a6fa94c97c5c7144cd1bec91172907cd8a921707981105e25 SHA512 13cc5b076c0725cd789c3bd5cbf8e36560e9444aae56ff75f452648c94263561f51e28cf514ec99f72c03ec15575e4d52303b7956c3b59cd6836de4559717a44
+EBUILD docker-1.5-r1.ebuild 789 BLAKE2B 6b47f8794d0e65bcc924c9c587285cdb8a882108fc13ad731c42b731e99abd1e9a11b784e61f8fbfa1ee4e2baad234b620a4617e215c45664ca8a038de1ef0e9 SHA512 9a3c449bacb800e4c08c9a8a9f799e913d332aad5a4bb30f68223679590b8f8f8259f79b37957299c3e5e6a728de4cfca47f6eb52ca364c00de1560d84eae7e5
+EBUILD docker-1.5-r2.ebuild 705 BLAKE2B d94ef35cde47f5e5fdd383370d0792dff0d19bd7786ee2a0873f956f6f41dda6e32ab998cfdd1d039930bc50632d51831820033434ae53929a6cb03d5b802ec0 SHA512 50a345bea26672c61a2e7ee48a7a89dcf9fe003b68f8be4d9225a95f7c5eb8f9d9c9d751552c31cb871b15d14146213dba03d8f4d37fd753c0586cf649099ce1
+EBUILD docker-1.5.ebuild 771 BLAKE2B 42795ce2e264a5368340781f97a31e52a0be2c76ef448555fd3e41a9201ddb5d00615adc0001a952210a0f4562c740eb8d07d03a012c9b92f8ea4242876632e2 SHA512 d47992ff6c593309d4962e26df3f58eb8f482a4c33e055e374e19c02e774f9b6d145da650b53eed9cbecc15df8894e0a9f0b78840b7ae89b58fbc77535a2bc4f
 MISC metadata.xml 353 BLAKE2B daba7749ff12a604d50b655d91edc03ea4b2259e871f42275ac69b9ce2587ecb6f98f0bd33d664f5b1029bbef88e4575b3a35b102df0999dd8e6d456382a5b96 SHA512 4a9684de4ffe83fb609b3c36e721cf0033814ab4f5d664725d1af8caa9c77e095c03d61c33dd7a0f9458a37c184bd8606235f74cbbc6f5c25665681a6e5c0fb3
diff --git a/x11-plugins/docker/docker-1.5-r1.ebuild b/x11-plugins/docker/docker-1.5-r1.ebuild
index e8e20671cf35..124debd82e1c 100644
--- a/x11-plugins/docker/docker-1.5-r1.ebuild
+++ b/x11-plugins/docker/docker-1.5-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
-HOMEPAGE="http://icculus.org/openbox/2/docker/"
-SRC_URI="http://icculus.org/openbox/2/${PN}/${P}.tar.gz"
+HOMEPAGE="https://icculus.org/openbox/2/docker/"
+SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-plugins/docker/docker-1.5-r2.ebuild b/x11-plugins/docker/docker-1.5-r2.ebuild
new file mode 100644
index 000000000000..8999156d944e
--- /dev/null
+++ b/x11-plugins/docker/docker-1.5-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
+HOMEPAGE="https://icculus.org/openbox/2/docker/"
+SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.0.4
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-makefile_rename.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+pkg_postinst() {
+	einfo "To avoid collision with app-emulation/docker, binary was renamed to wmdocker"
+}
diff --git a/x11-plugins/docker/docker-1.5.ebuild b/x11-plugins/docker/docker-1.5.ebuild
index 2efe733241e0..3059159f7eb4 100644
--- a/x11-plugins/docker/docker-1.5.ebuild
+++ b/x11-plugins/docker/docker-1.5.ebuild
@@ -6,8 +6,8 @@ EAPI=0
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Openbox app which acts as a system tray for KDE and GNOME2"
-HOMEPAGE="http://icculus.org/openbox/2/docker/"
-SRC_URI="http://icculus.org/openbox/2/${PN}/${P}.tar.gz"
+HOMEPAGE="https://icculus.org/openbox/2/docker/"
+SRC_URI="https://icculus.org/openbox/2/${PN}/${P}.tar.gz"
 
 RDEPEND=">=dev-libs/glib-2.0.4
 	x11-libs/libX11
diff --git a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
index 2e742661b11d..cf20a9135aa5 100644
--- a/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
+++ b/x11-plugins/docker/files/docker-1.5-makefile_rename.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2015-01-19 20:10:47.762522964 +0100
-+++ Makefile	2015-01-19 20:11:11.463545692 +0100
+--- a/Makefile	2015-01-19 20:10:47.762522964 +0100
++++ b/Makefile	2015-01-19 20:11:11.463545692 +0100
 @@ -5,12 +5,10 @@
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 1edb06f30562..c8e52f69ca33 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -3,7 +3,7 @@ DIST enigmail-1.9.9.tar.gz 1787556 BLAKE2B 729cf7e404b4cc5d964df476e627b476916cd
 DIST enigmail-2.0.5.tar.gz 2534693 BLAKE2B ad5984b74df2bd1c563f89a23136d9c9742aa7ba94d5683b9046f93eb11c5f729231497e5bb6e8c002c03feb55f2e2a07b43063bc63de3c7c578ea5b4b136fd1 SHA512 9edf78f38dbdb73f16190cc6b08eb02dcc199c41026003d19ce302a48fb4d9a6be6e765bbb7a8ef7f1bc3eea1065182437850da23c3ef5b89d1d5c66c602480b
 DIST enigmail-2.0.7.tar.gz 2537431 BLAKE2B 44088c12afaf285a8a1d735e02b54998af14b9990f1ab75b9f20a63c3b6fcd5b115bad18601876bd00d6910fa6da5d37e41c4b9a34102f5c1f4157bc7929d3bd SHA512 37572dbc2d5df549c3e1d5bbb8a78ce41af66072eabf4d340d98656e89be6fa1bd68fc2591827ec13cb0e32333f2e54f16b08f28dca5d7b576f9c16701f6f960
 EBUILD enigmail-1.9.9.ebuild 1922 BLAKE2B 91c9d28229704a6fc1b529a3b9948c3b4b32e097a2f9ec4d44e9e036ad2b7615314c1cf14120e536304cfb43c3ce0d71a6e327f92992c4f79b51ad484ffad6dd SHA512 b2e8dd3b86c1aaf37954c067bdaae67217f7446317817af837f9a2affd4c886d0e3d3b81b10f402105cd54a4534449a86ebe69673024367a34467fea400b6cba
-EBUILD enigmail-2.0.5-r1.ebuild 2240 BLAKE2B 7a9cba65cf9cc571d6052e0bcdb474915614f2bfbc0a24c85df56979290fe7d51d96d9baa7d3faead6d20b21877021a93eac0b05971f02b97ee468632f6541b6 SHA512 72e9eccc842581b7b3c6827f57059919624535a804b265704f37b074dfcd853049a0384b91fa94f9fe3a1494defc8fabc3d64ef357e9c44ebe829e42d43bb40a
+EBUILD enigmail-2.0.5-r1.ebuild 2238 BLAKE2B 9516c87fd4eac167cddc7a56aeaedbe6b6246073f5ff0aa0fdaf8f3fdc4269145acc4047fd5a237bc920311900cd231022666e14c56fbc06add0e02d7d9df492 SHA512 f2a995dcc145b558ea642c7eaa05f6bc71bec1b5e20ef9d871357495c16c11da2b445c3cf3f57d1592bca3e414f27178c44f37258ca04560057cea47226efbef
 EBUILD enigmail-2.0.7.ebuild 2176 BLAKE2B 941c7f06bb44515c26c920ba15fe6c7babb041a01c84ac747c72c1bb3ec0e652a92a6277b16912724ef39250553ee7853f3d96883224b3ebb0552b2e38b56c76 SHA512 4fa175b4ad4412c7e3f18fcbb8d5dcb4cce5605dec07dd39e62e6ff1399d9f805d228ba9d0de083f66ac8802d0af8b2b5e6189e7baafc378cb418504fdfa6376
 EBUILD enigmail-9999.ebuild 2105 BLAKE2B 47053af959ddf2b745ad0aa620b8e1666905e5bb0ca60cb7fe8cfe02eb8160cbbc981940a78a0ddb0c01e1e7a557465f243eea15c44d6ff7e613f03695d58076 SHA512 4c7c4051d47d1692cd8eff3cd1d32027cbc6608257faf2fe437483df9676b70c320cb5546acd632142d8de0c612c6a6281d5eb6d151eeac494c7c1b359060a3e
 MISC metadata.xml 250 BLAKE2B 9e6643b2a0b90fc083246090047db38d3b9a3b71db8542051307b7e87394135d3337e1ea54b83a0c7474661a0fd07d950385b44cbed6ee95f6e6ad718bd0b062 SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b
diff --git a/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
index 60cce5b8c71e..6b528c6bff44 100644
--- a/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
+++ b/x11-plugins/enigmail/enigmail-2.0.5-r1.ebuild
@@ -21,7 +21,7 @@ else
 		SRC_URI="http://www.enigmail.net/download/beta/${P/_/-}.tar.gz"
 	else
 		SRC_URI="http://www.enigmail.net/download/source/${P}.tar.gz"
-		KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+		KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 	fi
 	PATCHES=( "${FILESDIR}"/${P}-fix-missing-missingMdcError.patch )
 	S="${WORKDIR}/${PN}"
diff --git a/x11-plugins/wmDownload/Manifest b/x11-plugins/wmDownload/Manifest
index 24bb22edec35..648f58105062 100644
--- a/x11-plugins/wmDownload/Manifest
+++ b/x11-plugins/wmDownload/Manifest
@@ -1,4 +1,5 @@
-AUX wmDownload-0.1.2a-makefile.patch 802 BLAKE2B abeef6feafe56b8cbee6f0adc1913a07bc593e426c546320674beba554d9265460e6bde8b9af05a7e2da661a264f4ede86956e3ccc1ee4f43760244162500568 SHA512 fec1f86f3d861cb1a84dc137619dd866118b210a350472479db0afac52a615ccc92c75a89d8a49422917e624ef1c24825812a802ece7874b5897348f880820e6
+AUX wmDownload-0.1.2a-makefile.patch 801 BLAKE2B 6e54b6619150b239a418cc2f356690fc3f36e51f5ffda5c28b6b9d4af31caf741d1f27c6de3a032bdeb765477333022d4bd57aa01f511be08dd10b04074ee0c1 SHA512 e54e8ff7e5710cc2f888a6042c5e7886b71d5ab45b041c3e001bc5304abdaf0c2e125110ddfbf7d0c5116a47f86c24b7cf05e5e94ecdf2206f58e16f390b5683
 DIST wmDownload-0.1.2a.tar.gz 11449 BLAKE2B abbb01eec5dc9dc2932d4e7857b850ba64b564618e6643282b9659623444062d785bcde41ddfc0684d02cee6ca62df847a341ecdab8d48de9dc751d906563a0a SHA512 95bc3f7c9be344d88146fd0b2407afe43f5975bbf2158fc54c9d9200a7f09b53af3a8cae790b2e26f8e34792317a28524422e0d4f96e0e603e05af92d6354752
 EBUILD wmDownload-0.1.2a-r2.ebuild 838 BLAKE2B a76302d60d88d959bf25d59b8f24067cd26831cc78f07101c3dfa5c13d7e4a0bac56663709f9259efb8f42ac3b821db4d8d740ea5903dfa83eacb2a6b413260e SHA512 06510619884567e67a24ee64d45cdff2aa4b1611a8a9dbba3215a6338cd345cb972cef2519e9ee42e0e7faaa3bd0a859180f20b2f1a1f104e2181c0830b01354
+EBUILD wmDownload-0.1.2a-r3.ebuild 788 BLAKE2B eb04793763e54b942fdacaf3fe9c0b800f08892f0d84da7d9457404a90864069a776e53f304cc87ac5275b16b880f1e49ac176cc5a0920c4cdc936a3d9738764 SHA512 53af863e6069ca53a6b4f81359c9ba65d8c931b696648dbea0ecc3c7674f3762d3a54ff35dff30fc67994d210146becbceac6ab29cc01c7c76d97b6af2e7a31a
 MISC metadata.xml 530 BLAKE2B 83a0108c3b8ef4c522f380c9444d8a7d8e71b58f7dca15a2abed6c0faea8b9f1a5a73a30ca9a93621449df2b2ed735fc532a491052593f888742e949adda9356 SHA512 8e325e295e99b9d11cd1c9b45fed8c0aa4d507a89a7529b70004355c4e4cae4b69544fecb2edf7630af1cca3ae6d8038e4ba14b90b6a49170a0ec26f4e2fcab5
diff --git a/x11-plugins/wmDownload/files/wmDownload-0.1.2a-makefile.patch b/x11-plugins/wmDownload/files/wmDownload-0.1.2a-makefile.patch
index 7dfdabc9cd76..67fe981d0c4d 100644
--- a/x11-plugins/wmDownload/files/wmDownload-0.1.2a-makefile.patch
+++ b/x11-plugins/wmDownload/files/wmDownload-0.1.2a-makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2000-04-14 15:39:52.000000000 +0200
-+++ Makefile	2008-01-27 23:07:51.000000000 +0100
+--- a/Makefile	2000-04-14 15:39:52.000000000 +0200
++++ b/Makefile	2008-01-27 23:07:51.000000000 +0100
 @@ -1,17 +1,17 @@
 -CC     = gcc
 -CFLAGS = -O2 -Wall -fomit-frame-pointer -s
diff --git a/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild b/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild
new file mode 100644
index 000000000000..ca74298aa724
--- /dev/null
+++ b/x11-plugins/wmDownload/wmDownload-0.1.2a-r3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="dockapp that displays how much data you've received on each eth and ppp device"
+SRC_URI="mirror://sourceforge/wmdownload/${P}.tar.gz"
+HOMEPAGE="http://wmdownload.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/libdockapp-0.7:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+DOCS=( CHANGELOG CREDITS HINTS README TODO )
+
+src_prepare() {
+	sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}