gentoo resync : 19.03.2019

22 files changed, 125 insertions, 343 deletions

diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index faeb57b7838f..3f120b301623 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/e16-epplets/Manifest b/x11-plugins/e16-epplets/Manifest
new file mode 100644
index 000000000000..9c1d464d30d5
--- /dev/null
+++ b/x11-plugins/e16-epplets/Manifest
@@ -0,0 +1,3 @@
+DIST e16-epplets-0.16.tar.xz 800796 BLAKE2B 70785fce2949bb5e3b0f950436e63246b576dc2dc13ac392e2d884f913e0f22e68b428b416e20807adfb47ca7a148bb3242efff6dbeac8c734ed645ff3f1c705 SHA512 2cc90dee741a50f54665078db6197d7736d5423419439e640d5170057b80111458dbf4b7c9a92898e96654b1af4a986e5cedb88a565616e70ed0fba6ec82cd9b
+EBUILD e16-epplets-0.16.ebuild 978 BLAKE2B 5bd2796dfccee27f17ed41d8a7cd18b17bcfcba3cb6cfe11276441881355de7af88ffc05b9f8359561f6abf8e79fda489e02b3d276dffd86ca494b23045a3fa1 SHA512 319df8d1e78a3c808d5edf6fd3bc47c64d6a0a9ad02f530d5fc4e1595242438fb581ffc5af1064e2eee505dfb1f72d4eb9a170b4b771acb051037e6320a9335c
+MISC metadata.xml 947 BLAKE2B e8ebeb56e1f7cfb9215352c5eabeb2fd75fd558f0ad0006ea7aea5ae7af8510a55727b9a0d31ac0b24d033f2b40091978c25ce931eac12eac944ef3cb7b1adb0 SHA512 64c6ffcab76449ec17c6d36994de2fb95468dfef6fb0d65811feb6a38cf1aa0d080353b782f57dffc6e3cb619d2bbbb847170a6c52578e7ad8e1d87e3f15a3d4
diff --git a/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild b/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
new file mode 100644
index 000000000000..130edb033503
--- /dev/null
+++ b/x11-plugins/e16-epplets/e16-epplets-0.16.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Enlightenment DR16 epplets"
+HOMEPAGE="https://www.enlightenment.org https://sourceforge.net/projects/enlightenment/"
+SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2+ BSD public-domain"
+SLOT="0"
+IUSE="cdaudio libgtop opengl"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+CDEPEND="
+	cdaudio? ( media-libs/libcdaudio )
+	libgtop? ( gnome-base/libgtop )
+	opengl? ( media-libs/glu media-libs/mesa )
+	>=media-libs/imlib2-1.2.0
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-wm/e16
+"
+RDEPEND="${CDEPEND}
+	!x11-plugins/epplets
+"
+DEPEND="${CDEPEND}
+	x11-base/xorg-proto
+"
+
+src_configure() {
+	local myconf=(
+		$(use_enable cdaudio)
+		$(use_enable opengl glx)
+		$(use_with libgtop)
+		--disable-esd
+		--disable-static
+		--disable-werror
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}"/usr -name '*.la' -delete || die
+}
diff --git a/x11-plugins/e16-epplets/metadata.xml b/x11-plugins/e16-epplets/metadata.xml
new file mode 100644
index 000000000000..8f913313833b
--- /dev/null
+++ b/x11-plugins/e16-epplets/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <use>
+    <flag name="cdaudio">Enable CD Audio support using <pkg>media-libs/libcdaudio</pkg></flag>
+    <flag name="libgtop">Use <pkg>gnome-base/libgtop</pkg> to obtain system load information</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">enlightenment</remote-id>
+  </upstream>
+  <longdescription>
+    Epplets are small, handy Enlightenment applets, similar to "dockapps"
+    or "applets" for other packages.  The epplets package contains the
+    base epplet API library and header files, as well as the core set of
+    epplets, including CPU monitors, clocks, a mail checker, mixers, a
+    slideshow, a URL grabber, a panel-like toolbar, and more.
+  </longdescription>
+</pkgmetadata>
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 7254c915071a..48f72c6909c7 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -5,5 +5,5 @@ DIST pidgin-sipe-1.23.3.tar.gz 1298459 BLAKE2B e15ad7658771fc0d7f5320f6b145e67a6
 EBUILD pidgin-sipe-1.22.0.ebuild 1341 BLAKE2B ed5be88ca89073860f316078ec1133c2320513fc15e07d694b0c364959ab1b445d4b356a626d54a5b746d154619991669728bac87cb322380a43ec9749a73dc4 SHA512 eff9f421b21e3f108ba85c8f6f3ba22420c262cd1df01f3a5c6ffce5a56bd2c79e4641279dab12c54fc40a6733868a105835f8fecac3440a179c3e8aa519e46f
 EBUILD pidgin-sipe-1.23.0.ebuild 1344 BLAKE2B 3a1721aa32f475098613ad9e9bc7f2fbc763bafd792f56241255a645b71fc9fcdb980a476f72349e5d73f23cba7398bb89f56d0345cc6f8d4c0d98a09a6ad272 SHA512 3079263ade25f09405f42d95c5c0a22cb5444593d7343573549c68fb0893444621704bdf4182c437d9aba9a09a7dcc3dc611abf3f7c337202d513ce5d47f9cc6
 EBUILD pidgin-sipe-1.23.2.ebuild 1344 BLAKE2B a520f0994c19a8c38f75c300f78029c54869c3721992bccf0da594fa228ae57af3632ee02fddf2be9ab8789d592fa28ae1b6210d72ab31cf3d15f4d92a888e82 SHA512 aef0f86051cd40690b06c9111dd4717d850e12f4664d1568359e7c2d2e648010c755d493de8408d143f22a08823b9501c56b4c9978b55eee5d5ea620a4252ef3
-EBUILD pidgin-sipe-1.23.3.ebuild 1341 BLAKE2B fdb4fa0e034937e928257c5d54e37f30f110c7ec3d48206ee8bbe38e24033aa6cd6e314ab64a368f6df360e8eee19e0e4ea686e1f40bce1053ab83c63baebc45 SHA512 10f3780382fcfb2d292e35ae857edb2c5bf9c44b15ac221e4841b49ad51d34385cd74b75e7d59016762f6754ab87902fd09f88e1062102ef3f401c4daf6893a0
+EBUILD pidgin-sipe-1.23.3.ebuild 1339 BLAKE2B 6de8452d55f045ed0340663915734c83b010b965533d644c14305fc26471dfe005555d24881203692ff920eedaccfd0e841ed90c2e58a7ebbbbc21739568fc7b SHA512 d93ec9a9b02fbe093d0f3e607627eec09944cd6a7bc8528403c493bf71d1cbb6f5f57e4635d1f206f78a05f743fc79da8d4303b983bfe84245f7135ec839a816
 MISC metadata.xml 862 BLAKE2B a48a0574208ea31609e18d48b4676763e509d97e28f562bc7a103d99183ee75184b8d674245e24b19e0d1adcda6b8091fbfc1c7e3cdb42569094fb9aeb02e932 SHA512 ff38f1be40af0b781cb545c216873eff77f07f0142b1c3db8a1ce2ca43b53fa9f2ce6a9b4940ff8843f26bb5f024d2ed8d3917762cf74b4820550bb704cc4b14
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild
index dfeeb6f126f2..3e128eb9dcfd 100644
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild
+++ b/x11-plugins/pidgin-sipe/pidgin-sipe-1.23.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="dbus debug kerberos ocs2005-message-hack openssl telepathy voice"
 
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index 4694a284db84..362846fd0cca 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -2,7 +2,9 @@ AUX wmbiff-0.4.27-invalid-strncpy.patch 816 BLAKE2B 8c9dec1bb64014c4d99dcfe0214f
 DIST wmbiff-0.4.28.tar.gz 111398 BLAKE2B 39ba4dbf50639b02c8969ae72b696fa83353ec3dcd46802f8333eb597f068d3d0d209f39a352a8f53830695c19c897b7d6f970c5362c2910128b80b0cdb24d32 SHA512 a17fd4b4c3de09a907b7ffccc50f4560a7fddd5cb4dd01c72460806dc55259ba0b587d75f7505171a2a833f6735ddc4ded0a484d4227bfd552cc7343d79d7720
 DIST wmbiff-0.4.30.tar.gz 269315 BLAKE2B 11690bcb54b33320c433a191dbbaa769efd490cf5efdbf3cd30ce46c59542092a91fb42ac19afa7718321d99764f8df1c0021795bc6ec1c94304dd46d253b50f SHA512 10b5a6673763a48694cb9cd87f5972c09b0fc50acedde7658133830a06dea8c98ffb9943591cbef802330862d7ccf7a7322d7e9e25ee82209b5a0e40a22353b4
 DIST wmbiff-0.4.31.tar.gz 269883 BLAKE2B 45ecdd6116fa30d2aa71aace18fbf9c6d2ee755188a56a7cc067697ed4a55d7b7ad24b4430d8f36d5c6dad17a152186a12c78cd49d1c86004a0a21ebb56f8d7e SHA512 768207887e92edc4a36f02d6b048cc393e75f9ccabca86f54368fafbd822bb6de5258890395da3f3e7a4f4f951628d15796d38e315b1176c6a3e084d10c167cc
+DIST wmbiff-0.4.33.tar.gz 266114 BLAKE2B 06e5e454a2f8e78203dec66cc274d983e8ec1c0dc7bb82db4ec3c42a8671f0f7a399b79fc94f45e595dcd6fe56c87426dce3900f8fc0f12fbc704ad196390dc7 SHA512 9b88b5929e9234d17bfa5022eb95cbca1720c724827e078dbd44c0bcff77f386b7692a6576b3a96bb1f5fab602c274b3335c71543e5ad053c1cc476d114f818c
 EBUILD wmbiff-0.4.28.ebuild 825 BLAKE2B 3e27116ec3256f882303581d48c4911aee3f360e581bb58c5da55244e94edc89a978333cd2654b2d49d2e8e141df6b05a236456c5768bb5fd5f7f0c8156518d6 SHA512 cf73dca2d7798577fed2e223f25e66261915220d198edc90884181c7d71c9b6b909e29aee41a7a9a5e284221048b4dc29b97388bba9e3a117cdad73adf2cf283
 EBUILD wmbiff-0.4.30.ebuild 805 BLAKE2B 2d671c601fdce049993792b717c5a42fd37f0cb62dceba28598682c445c9aa1b7a946fe77e30fd30aa3e19d7a7aa1d0383ab46ecc474a309ef37911fcccc8fdc SHA512 879f2ab466cbaf97e59085e9c421e1269f8bc493bd5de3b68a9de07149b620550efe20a402361f43258c8f59faa4dda4b3b79d13d4abc6d93d228e7e06fd034f
 EBUILD wmbiff-0.4.31.ebuild 805 BLAKE2B 2d671c601fdce049993792b717c5a42fd37f0cb62dceba28598682c445c9aa1b7a946fe77e30fd30aa3e19d7a7aa1d0383ab46ecc474a309ef37911fcccc8fdc SHA512 879f2ab466cbaf97e59085e9c421e1269f8bc493bd5de3b68a9de07149b620550efe20a402361f43258c8f59faa4dda4b3b79d13d4abc6d93d228e7e06fd034f
+EBUILD wmbiff-0.4.33.ebuild 811 BLAKE2B 8f730e206919070bf7051b095cdb18b917c2783ed7615c7c8d98c6e97465c11f7b14e77b748f92a21982f8ea2c9d4e85c5c5e967f0de1099fc515279b46038cb SHA512 39b794b52cc9dbbb10a22e91d1aaf3d6cd17ba86e3f9bda86834d9cb29c147efddd23dcce6438eab16beecb5376eca3680b6d430998c6f40543c452799a788c2
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.33.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.33.ebuild
new file mode 100644
index 000000000000..4c3609d57973
--- /dev/null
+++ b/x11-plugins/wmbiff/wmbiff-0.4.33.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils
+
+DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
+HOMEPAGE="https://www.dockapps.net/wmbiff"
+SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="crypt"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	crypt? (
+		>=dev-libs/libgcrypt-1.2.1:0
+		>=net-libs/gnutls-2.2.0
+		)"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
+
+DOCS="ChangeLog FAQ NEWS README TODO wmbiff/sample.wmbiffrc"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${PN}-0.4.27-invalid-strncpy.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable crypt crypto)
+}
diff --git a/x11-plugins/wmmon/Manifest b/x11-plugins/wmmon/Manifest
index bca78ae7cc78..05da7a687115 100644
--- a/x11-plugins/wmmon/Manifest
+++ b/x11-plugins/wmmon/Manifest
@@ -1,9 +1,3 @@
-AUX wmmon-1.2_beta1-Makefile.patch 420 BLAKE2B 73ed3308728a6e6aa5021aafa0a4493dc6e76134e831c74460886b4082e53639a4f460ef228bf7271b5d5f88871c170ba4a9c3932fc8cbe201c70ce2305e4514 SHA512 6c8e3a0b82a2eee7a88b493682ce479f58f68e95643adc9c40e9d1404cdb034ebd27100c83296340ddc489bac4d586354619093912d0f096aea1611a7149dfe8
-AUX wmmon-1.2_beta1-list.patch 2918 BLAKE2B 393e76edcefa54d814229cc2d8d21556d7437580c1a226d454470175de6ad1e9a688555aabdc60aaa328d578b4d04b300e64ae431efe9d7680400118d52116d5 SHA512 2a6da4a9b676ea51bbcc400b3255f3c10240db13fd6da46921f6c91d5529ecf50120e195b815e58a1b0a8bad81a944e8da3cba261a69579f36165f35ad23f144
-DIST wmmon-1.2b1.tar.bz2 25610 BLAKE2B fcaf37c869e5cfc9c105c1924f66a03a726239ef5a6c473a312a8d8e4bd34203fa71d6ded607894b0feae1f4a352c365828dba284c629c81dea0973b05ad98b8 SHA512 359ff4024cdc606d3520445d31b9e59c79a957b081bf46dfabde7c970aecab8d640f789f34c1599e18e15e50a077248e06600151d7c1e66ef028215d6d88ff1f
-DIST wmmon-1.3.tar.gz 107622 BLAKE2B 41eabaf506882f9e230ffd5bcb2c28325b49a1594423f9e950941b5f3a343ceee19bd22c91a29d62a4eaeee920fba19caf1fcb7656db646cb464a9ec6d1a1890 SHA512 2308bf5ef9aa9f93979e63ea7d405e304a1a7ea55b966affc200239829f3cd2b7039fe96e42fcf59b52dddd5a72b3f8f64d8397853c3847356733644045e5529
 DIST wmmon-1.4.tar.gz 107477 BLAKE2B 973dedb994c0e688dbdcefde12d186e1d3712164adeb454e97367c6592e223dd61f01ddc7c5258bc387619ed185f049439b8692a18a1bd28bccafda986359e36 SHA512 ca5a0d8278d6fda4ae1be2e76e17ad7e550e91398dba1c5aa09b501c4e17b8d4f597bcaa0c9ea844d3a307a5c60d6d28e44cbffd54fe44c92be0386450f25951
-EBUILD wmmon-1.2_beta1.ebuild 817 BLAKE2B 5b272cbc06e424bac9c34494beff05ca07ef4dc19dcb0eb5c47cc49a5102dce2c4431239b980a9df7ce64b32ad37f210b72a890274b7942aaacf478c0833f3e5 SHA512 98d26f284e648c498cf73bdfef784182fb20227c204f72b9756b792107509f3bb92eaa26133dfb17930cb574d9e297ebb56b307ca2e29cfd35de1ab04544f782
-EBUILD wmmon-1.3.ebuild 468 BLAKE2B 5e32fcf3f25ff1e82216a5cfad7c7ce8cc4c23371e6f5bac9c31edc943e32587176c9bbe15999450ebb668f7cbd0c6b995d2833c5f9e99bf73836a430d0ababc SHA512 57b3ccc7fb4e80916d6f1f765a09e90825b0dbe69674021b4d3d0d5cbb91c8b3d5a67ed118e00e4389602b61ca0e34d233c140fc63998226c6a3bd8bb4337928
-EBUILD wmmon-1.4.ebuild 468 BLAKE2B 5e32fcf3f25ff1e82216a5cfad7c7ce8cc4c23371e6f5bac9c31edc943e32587176c9bbe15999450ebb668f7cbd0c6b995d2833c5f9e99bf73836a430d0ababc SHA512 57b3ccc7fb4e80916d6f1f765a09e90825b0dbe69674021b4d3d0d5cbb91c8b3d5a67ed118e00e4389602b61ca0e34d233c140fc63998226c6a3bd8bb4337928
+EBUILD wmmon-1.4.ebuild 463 BLAKE2B 4d20a4c3bb53610afb93a8d631c12b4f0cdb7a5a47a0032db3d0b479768c998d1e64a09e6458097d2f199dcafc918c69add64fcfac2f3a634790638a4f255a13 SHA512 914ed70cbe311f30f4caae861259de94d3b8488d674ada92a831143669a9bddb25e299bf068b6db91eef059e1bc3a492e4acb457526f02f4d50d900cdaa5479a
 MISC metadata.xml 249 BLAKE2B ba223d81d4cf6b9ca1ba3a63e356bec0d9aa6f4cdf2ad3b29a6c97a6e5bad854154f8b9e6fc3d65d155c93daa706d03c84395b53951e3e326ffc19c8d0df0eb5 SHA512 1a1312bb0e9f74f1e3852218d8fd4817fbad3bc65633cecbe8735607bc33c1e05b414c2628ff3f6e24dfc4a3999de7191f6cdadd2161b03cf614d5b6f24fab8d
diff --git a/x11-plugins/wmmon/files/wmmon-1.2_beta1-Makefile.patch b/x11-plugins/wmmon/files/wmmon-1.2_beta1-Makefile.patch
deleted file mode 100644
index c7633ad7388b..000000000000
--- a/x11-plugins/wmmon/files/wmmon-1.2_beta1-Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- wmmon/Makefile.orig	2012-03-29 13:17:39.380764054 +0200
-+++ wmmon/Makefile	2012-03-29 13:18:06.623931767 +0200
-@@ -6,14 +6,14 @@
- 		../wmgeneral/list.o
- 
- CFLAGS = -O2
--CC = cc $(CFLAGS)
-+CC = cc
- 
- 
- .c.o:
--	$(CC) -c -Wall $< -o $*.o
-+	$(CC) $(CFLAGS) -c -Wall $< -o $*.o
- 
- wmmon: $(OBJS)
--	$(CC) -o wmmon $^ $(LIBDIR) $(LIBS)
-+	$(CC) $(LDFLAGS) -o wmmon $^ $(LIBDIR) $(LIBS)
- 
- debug: CFLAGS = -g3 
- debug: wmmon
diff --git a/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch b/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch
deleted file mode 100644
index 1b1ac317669e..000000000000
--- a/x11-plugins/wmmon/files/wmmon-1.2_beta1-list.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c
---- wmgeneral.orig/list.c	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.c	2016-01-04 13:28:48.694343645 +0100
-@@ -38,7 +38,7 @@
- 
- /* Return a cons cell produced from (head . tail)
- 
--INLINE LinkedList* 
-+LinkedList* 
- list_cons(void* head, LinkedList* tail)
- {
-   LinkedList* cell;
-@@ -51,7 +51,7 @@
- 
- /* Return the length of a list, list_length(NULL) returns zero
- 
--INLINE int
-+int
- list_length(LinkedList* list)
- {
-   int i = 0;
-@@ -66,7 +66,7 @@
- /* Return the Nth element of LIST, where N count from zero.  If N 
-    larger than the list length, NULL is returned 
- 
--INLINE void*
-+void*
- list_nth(int index, LinkedList* list)
- {
-   while(index-- != 0)
-@@ -81,7 +81,7 @@
- 
- /* Remove the element at the head by replacing it by its successor
- 
--INLINE void
-+void
- list_remove_head(LinkedList** list)
- {
-   if (!*list) return;  
-@@ -101,7 +101,7 @@
- 
- /* Remove the element with `car' set to ELEMENT
- /*
--INLINE void
-+void
- list_remove_elem(LinkedList** list, void* elem)
- {
-   while (*list)
-@@ -112,7 +112,7 @@
-     }
- 
- 
--INLINE LinkedList *
-+LinkedList *
- list_remove_elem(LinkedList* list, void* elem)
- {
-     LinkedList *tmp;
-@@ -132,7 +132,7 @@
- 
- /* Return element that has ELEM as car
- 
--INLINE LinkedList*
-+LinkedList*
- list_find(LinkedList* list, void* elem)
- {
-   while(list)
-@@ -146,7 +146,7 @@
- 
- /* Free list (backwards recursive)
- 
--INLINE void
-+void
- list_free(LinkedList* list)
- {
-   if(list)
-@@ -158,7 +158,7 @@
- 
- /* Map FUNCTION over all elements in LIST
- 
--INLINE void
-+void
- list_mapcar(LinkedList* list, void(*function)(void*))
- {
-   while(list)
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h
---- wmgeneral.orig/list.h	2016-01-04 13:28:36.583339716 +0100
-+++ wmgeneral/list.h	2016-01-04 13:28:39.471340654 +0100
-@@ -29,31 +29,25 @@
- #ifndef __LIST_H_
- #define __LIST_H_
- 
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--# define INLINE inline
--#else
--# define INLINE
--#endif
--
- typedef struct LinkedList {
-   void *head;
-   struct LinkedList *tail;
- } LinkedList;
- 
--INLINE LinkedList* list_cons(void* head, LinkedList* tail);
-+LinkedList* list_cons(void* head, LinkedList* tail);
- 
--INLINE int list_length(LinkedList* list);
-+int list_length(LinkedList* list);
- 
--INLINE void* list_nth(int index, LinkedList* list);
-+void* list_nth(int index, LinkedList* list);
- 
--INLINE void list_remove_head(LinkedList** list);
-+void list_remove_head(LinkedList** list);
- 
--INLINE LinkedList *list_remove_elem(LinkedList* list, void* elem);
-+LinkedList *list_remove_elem(LinkedList* list, void* elem);
- 
--INLINE void list_mapcar(LinkedList* list, void(*function)(void*));
-+void list_mapcar(LinkedList* list, void(*function)(void*));
- 
--INLINE LinkedList*list_find(LinkedList* list, void* elem);
-+LinkedList*list_find(LinkedList* list, void* elem);
- 
--INLINE void list_free(LinkedList* list);
-+void list_free(LinkedList* list);
- 
- #endif
diff --git a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild b/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
deleted file mode 100644
index a0ba35afd5ac..000000000000
--- a/x11-plugins/wmmon/wmmon-1.2_beta1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
-HOMEPAGE="https://www.dockapps.net/wmmon"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P/_beta/b}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${P/_beta/b}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-list.patch
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -C ${PN}
-}
-
-src_install () {
-	dobin wmmon/wmmon
-	doman wmmon/wmmon.1
-	dodoc BUGS CHANGES HINTS README TODO
-}
diff --git a/x11-plugins/wmmon/wmmon-1.3.ebuild b/x11-plugins/wmmon/wmmon-1.3.ebuild
deleted file mode 100644
index 921742857e86..000000000000
--- a/x11-plugins/wmmon/wmmon-1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dockable system resources monitor applet for WindowMaker"
-HOMEPAGE="https://www.dockapps.net/wmmon"
-SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/libdockapp-0.7:=
-	x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-plugins/wmmon/wmmon-1.4.ebuild b/x11-plugins/wmmon/wmmon-1.4.ebuild
index 921742857e86..b52135abe045 100644
--- a/x11-plugins/wmmon/wmmon-1.4.ebuild
+++ b/x11-plugins/wmmon/wmmon-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://www.dockapps.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/libdockapp-0.7:=
diff --git a/x11-plugins/wmnd/Manifest b/x11-plugins/wmnd/Manifest
index 90d831a34142..b80595529d39 100644
--- a/x11-plugins/wmnd/Manifest
+++ b/x11-plugins/wmnd/Manifest
@@ -1,5 +1,3 @@
-DIST wmnd-0.4.16.tar.gz 188614 BLAKE2B 58e5098cbd06391909b28f491fc55a5977360c3bf14072f8ee9a665c957ea4a7b9043911def0c922c0d93f9436456e35fdf3d1b4d96f583f98f593d919a6b2c8 SHA512 dc18f5d912f6b82fde72f17d4a6785cb7380b46265c9b3e080bfc46b28678b2021e6a580b1eb88a61ab6574e29ce1021e0ac0c0d8ae9fbe7a5418982a5f17eb7
 DIST wmnd-0.4.17.tar.gz 191089 BLAKE2B 4a4703896297b86297c369d9058113382c6de13416839bd0922c3772cb3422e164cead318874bd62c77e5c35054df97fb4509388057adfe3642f58aef1de166b SHA512 09ecb0d21df2ca996dbe18b8711abb327200fd6c098e57bda19b960854bc9fae5c5c4f5d5a8cb306c21393983f602f591af87a0afdf009380d9a6ae1a2e81eb2
-EBUILD wmnd-0.4.16.ebuild 653 BLAKE2B 09b920f4bde56e72100a5e7742b450c3e0c61b1a64f282309c48ad8d2cf8150cc39f617b4dfcc3db1ffc65a4706e990e7ebb28e0b81d8c172985a152514f7e07 SHA512 6d35303cd3f86d5fee7ea46184f8fc47470b624c0a2d5b4660cf6816fb21578cfe7fd669d98a25679b609da55ee286f34323c8af12abc1c589daf0154356af7f
-EBUILD wmnd-0.4.17-r1.ebuild 564 BLAKE2B b4742e7e427f3a2dc91d1b6e6b8d6256f5ea1777e130b3f6ef3eabd80d78f283d01e25970c6256d13577ebc555a599f61ca333f6cdf9ec2d0a4bd853a90b26a6 SHA512 b46e781942bb6ca57c60457dd8cb76d376c46562a8557404501340b0f9d95948705c731f8f1cd20285b184cd3d2d79b658b3cc7dc48f9cad17324b36701b2aa8
+EBUILD wmnd-0.4.17-r1.ebuild 558 BLAKE2B 452d0a9ac9e0a00c5ae2c43d85cf075eeae277dd60b02c3b91263f44689dccc79202d9e37852f5f87299d5791bf6bbe13d776567f145e42f770068014c81691c SHA512 99efce871a62babb66c46059f7306c6788589c1977cc74471ebf1bff68e3124c6fa27084ff187309b077a5252112522e7e7e3408141e0f5f5f7906388f456765
 MISC metadata.xml 532 BLAKE2B 821edd22bfd2bb521096461087b405478d914636775d69e74b48df005bacc34deabcc066787304e61cfc64b825e180ec5f9ca5dd79202a2c0362242282711c96 SHA512 ed1640807b73b1738d6ee214485dfbb079f709196bc4f23ddde6305c3b33920d818a2b5dd76447b61850ab688bf39ee1a947e9ddb6d8bbf55cf8259331c9babb
diff --git a/x11-plugins/wmnd/wmnd-0.4.16.ebuild b/x11-plugins/wmnd/wmnd-0.4.16.ebuild
deleted file mode 100644
index 6af55d7703f3..000000000000
--- a/x11-plugins/wmnd/wmnd-0.4.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="WindowMaker Network Devices (dockapp)"
-HOMEPAGE="https://www.thregr.org/~wavexx/software/wmnd/"
-SRC_URI="https://www.thregr.org/~wavexx/software/wmnd/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="snmp"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXt
-	x11-libs/libXpm
-	snmp? ( >=net-analyzer/net-snmp-5.2.1 )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README AUTHORS ChangeLog NEWS TODO
-}
diff --git a/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild b/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
index 2ff4dd22db88..7080166ba275 100644
--- a/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
+++ b/x11-plugins/wmnd/wmnd-0.4.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.thregr.org/~wavexx/software/wmnd/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="snmp"
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-plugins/wmweather+/Manifest b/x11-plugins/wmweather+/Manifest
index 3cafec77a37c..d1c89b23b39d 100644
--- a/x11-plugins/wmweather+/Manifest
+++ b/x11-plugins/wmweather+/Manifest
@@ -1,9 +1,3 @@
-DIST wmweather+-2.13.tar.gz 195094 BLAKE2B fadf138519eec015cb0e8c9a0c02d5cf0752162645b26781cc6af449853164ea42619c99df496c0bdbd334eb12340fa1b996b1ac1d3f2719f1fccf0c4c2e4230 SHA512 ed92a5434658da795385ef8420357647dd359ca46d6347dc21648062b911b3393d5e84262c92dc18ec1add4ffcb81e02cb3f6863816662112595e03bc74688c2
-DIST wmweather+-2.15.tar.gz 209258 BLAKE2B 4c7a2194eaf4694ce9d1d8acd6515642bffb0f267f0801a5e0b3760a2d37f59ddaf5668da2722c48c7e382d00ff4ad6daf193eb06c93c4e8ad6bcb2716f580bd SHA512 9096a337d50586e9d5fdb28a0cd6e882fd58cace1e148cb0e2c14239f2f5121a5cdad5ed63a1c8cd2c3f1907c4aee772cea3f55656437a7ee319226efbf6f82a
-DIST wmweather+-2.16.tar.gz 210953 BLAKE2B a57191584d1756fd690efb70f825b94b77a7f7476593a42a530347a319ac0de0d886684cd663bd2633ccb7d6b6014e9cc6e7370739ae97de65b13073b35fce18 SHA512 b156d65c69ef67b4116f68f975adb3e36c948715b32ca1efea800ec8a407f3f3065079236a1e28d5282a98c1421f98f4b9dc93a81e59198ec2aec010079528dd
 DIST wmweather+-2.17.tar.gz 212763 BLAKE2B e810ecaf6858bba0cb3bdb32517f5c1cbaa552ed071b1ce6dfca33b41ad75c5272616c9be78930f47ee3980d2ab8c51a29caaec627c5e608e9c2790d940cfe65 SHA512 45622513792698f1adf4a686506913146e2a24c9ff39fda1129132aae864528184aa122b525e00b079f416fd131c1369ff95e430c4c63877bdc166c982f841eb
-EBUILD wmweather+-2.13.ebuild 745 BLAKE2B 30fedfc795957e6fae487fe7d12dac84e844ee0c09f3bebf077e4e7ea85ca7dc1e2be9414744ecca2c96e79e59b407fe26ebb9aef85ac4baa2c2c7be482d28f3 SHA512 0f7d3f0564694795c981faf11702fc600286d9b492fa6887e8d38f5d3f93975902e273817cf5d943721640cab373067ea92fb84996d6ed00bd516c3f279777c1
-EBUILD wmweather+-2.15.ebuild 748 BLAKE2B 14bfc6ac6017c791d693c82a9f24ca2f1c806e9919aa78530b76c42584783e8797077cea8a773dd558098fa891339b82f43bd565ef4aa4a622f0fe22ba1a24e0 SHA512 815c6cd5aec2a1d0575fe11a99ab20eb142391cc054c14e35a5d352d6bec97d6a92a904e41fc26de4f77af446faff56ef746c0bc22b746c23e14d7d63f419976
-EBUILD wmweather+-2.16.ebuild 555 BLAKE2B d1ce3a88a34149821b9f388ac72c93ddb73752ba9d47d5a35cfdad918320ed0108568a99e4629cf705333ee03e9753c4a0909a2999a89922f4a9e2bc73604060 SHA512 8bffadd7a9aa56d98f6a24118ab875b35abfd7826cd8f91f675754b5d24b95c4dfb871b82206b4fbc0a1fe1a63306e592eb954cfda68132c0336b2735779ea83
-EBUILD wmweather+-2.17.ebuild 555 BLAKE2B d1ce3a88a34149821b9f388ac72c93ddb73752ba9d47d5a35cfdad918320ed0108568a99e4629cf705333ee03e9753c4a0909a2999a89922f4a9e2bc73604060 SHA512 8bffadd7a9aa56d98f6a24118ab875b35abfd7826cd8f91f675754b5d24b95c4dfb871b82206b4fbc0a1fe1a63306e592eb954cfda68132c0336b2735779ea83
+EBUILD wmweather+-2.17.ebuild 549 BLAKE2B 2e30b43bdcc79ef3519d0f97368adbe731d0bd31519a6c827d96b4686fda9ecf500b86757d26e7b598525c63d93b41bb37e194acee708ed7b6e434a740c2385e SHA512 209a9ed57f9ab3c5f3461aae23a6c5f5e2da6d44acc87a71382b2ff2fc7307e97be7522074b6a4cb198154ec7c56e7a187db374b8ff9b16b11cc1286431e1f70
 MISC metadata.xml 335 BLAKE2B 76f6e54fde3b2c75610062a4ed18b7953a1a8c0ddeac50e9f58a3276927e929087cf2559ad4ed55814831d9014502bcee83a5bacc781d2e0fbdf5a98dffbd8d9 SHA512 8cddf721129500148c51b172e42ee2f56a7ae234a15c7567bd37f738ca776110b88c690ae802e3192a4451be48c9ced9af73a111eec20f788f62ee4464505209
diff --git a/x11-plugins/wmweather+/wmweather+-2.13.ebuild b/x11-plugins/wmweather+/wmweather+-2.13.ebuild
deleted file mode 100644
index 363b166badeb..000000000000
--- a/x11-plugins/wmweather+/wmweather+-2.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit flag-o-matic
-
-DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts"
-HOMEPAGE="https://www.sourceforge.net/projects/wmweatherplus/"
-SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~mips ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
-	>=net-misc/curl-7.17.1
-	x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-wm/windowmaker"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	append-flags "-fno-optimize-sibling-calls"
-	econf
-}
-
-src_install() {
-	dobin wmweather+
-	dodoc ChangeLog HINTS README example.conf
-	doman wmweather+.1
-}
diff --git a/x11-plugins/wmweather+/wmweather+-2.15.ebuild b/x11-plugins/wmweather+/wmweather+-2.15.ebuild
deleted file mode 100644
index 0f0ff41c4c20..000000000000
--- a/x11-plugins/wmweather+/wmweather+-2.15.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic
-
-DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts"
-HOMEPAGE="https://www.sourceforge.net/projects/wmweatherplus/"
-SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
-	>=net-misc/curl-7.17.1
-	x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-wm/windowmaker"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	append-flags "-fno-optimize-sibling-calls"
-	econf
-}
-
-src_install() {
-	dobin wmweather+
-	dodoc ChangeLog HINTS README example.conf
-	doman wmweather+.1
-}
diff --git a/x11-plugins/wmweather+/wmweather+-2.16.ebuild b/x11-plugins/wmweather+/wmweather+-2.16.ebuild
deleted file mode 100644
index e5a57ede9f1f..000000000000
--- a/x11-plugins/wmweather+/wmweather+-2.16.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A dockapp for displaying data collected from METAR, AVN, ETA, and MRF forecasts"
-HOMEPAGE="https://www.sourceforge.net/projects/wmweatherplus/"
-SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
-	>=net-misc/curl-7.17.1
-	x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-wm/windowmaker"
-RDEPEND="${DEPEND}"
diff --git a/x11-plugins/wmweather+/wmweather+-2.17.ebuild b/x11-plugins/wmweather+/wmweather+-2.17.ebuild
index e5a57ede9f1f..49e62aa1ecf9 100644
--- a/x11-plugins/wmweather+/wmweather+-2.17.ebuild
+++ b/x11-plugins/wmweather+/wmweather+-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/wmweatherplus/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/libpcre