gentoo resync : 19.03.2019

6 files changed, 3 insertions, 212 deletions

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:=