gentoo resync : 28.04.2019

16 files changed, 19 insertions, 454 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 09ccd340f79b..0b02f866c279 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
deleted file mode 100644
index 61a5667c43bd..000000000000
--- a/x11-wm/afterstep/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX afterstep 29 BLAKE2B 9bd4a8ece18d1192c4b36c18c4ec8920069f8e7b82f0812bef902657bf0029137dc6a0f5bdaf1c5dd3102dd3c70697410a8edfb094292fbed375633ae59d2f88 SHA512 194b2af81df48b4c87704bee1db1d01c4cfac3a529f76d8d073fb1358aa95eb9e84a9c2a7da12983a64d61b63e2689b93a79b778007bb8bcdfad8574086ba852
-AUX afterstep-2.2.12-gcc5.patch 9374 BLAKE2B c80a928feb81c3cb53322add051c28fed30cca8bb54813ba1655fc7991e308086ada771ce87db0567c31274594060bfb986c0a805424f5d02d5f73de65605bdc SHA512 81f0998409d9d45f8a25d66cd1c0ae07d23f6ed40f77f56241aae9085d0098510058807f24310c557825ebd67a513cb0c67ff0430cb2f33d2e355e6482c2b491
-DIST AfterStep-2.2.12.tar.bz2 6132233 BLAKE2B 44a597f55bd500f4bb34f499cc5f6f6a011b421d27fc118775fb9f3ff64d9553f5cb9e62aabcc8d0461ef53351e318ed0b6c0385654c40b2cc94d098e2040b05 SHA512 5cac6ce74b24cbcc5b8e8a6f7cc9308e110f0d09597af1fa0a8730d5f5111932a23332629bc4d372fc8d9583a514d97e35f747b17decf8d4ebfe5e3f20cdbbee
-EBUILD afterstep-2.2.12.ebuild 3419 BLAKE2B e70b05658c1af1afb98c1f200e0b37613e76ce810ab3e3aeb7b3edbaa41514a98456dd9d9cd9291c5417f68a94171c07e2c9d538e7112062a5b5aec3e96ac07f SHA512 ab1f6a40cdcb9a8d476d353f8c1746cf617083f9d09796cd08dda0b5c5f126e5ec56391690d67985ef8c570af5ef612cc4a38081da06586f39036b55dae57c69
-MISC metadata.xml 245 BLAKE2B 6621b0f12423f517bfd4000262c79e57c5f68cd2ce8e47f1d9518998a4f273b6db6f7125d163dbbb09636a46e39e0203675438a7e54f88e644480c88a54d71c5 SHA512 9e09ae84ab10dd84251f53e570c7d5bef4a7e3cbfcbba3548d8e3f2a00545b69fb3d01a5905c0d95826b6d0bef822c5c20158c0e70314be191d1d47456aa9a43
diff --git a/x11-wm/afterstep/afterstep-2.2.12.ebuild b/x11-wm/afterstep/afterstep-2.2.12.ebuild
deleted file mode 100644
index 522dd4266352..000000000000
--- a/x11-wm/afterstep/afterstep-2.2.12.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A feature rich NeXTish window manager"
-HOMEPAGE="http://www.afterstep.org/"
-SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2
-	mirror://sourceforge/${PN}/AfterStep-${PV}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="alsa debug dbus gif gtk jpeg cpu_flags_x86_mmx nls png svg tiff xinerama"
-
-RDEPEND="
-	media-libs/freetype
-	sys-libs/readline:0=
-	x11-libs/libICE
-	x11-libs/libXext
-	x11-libs/libSM
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXrender
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( sys-apps/dbus )
-	jpeg? ( virtual/jpeg:= )
-	gif? ( >=media-libs/giflib-4.1.0 )
-	gtk? ( x11-libs/gtk+:2 )
-	png? ( media-libs/libpng:0= )
-	svg? ( gnome-base/librsvg:2 )
-	tiff? ( media-libs/tiff:0 )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	!!media-libs/libafterimage
-"
-
-S="${WORKDIR}/${PN}-devel-${PV}"
-
-src_prepare() {
-	sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die
-	sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die
-	sed -i -e '/STRIP_BINARIES/s:-s::' autoconf/configure.in || die #252119
-	sed -i -e '/--with-builtin-gif/s/$with_gif/no/' autoconf/configure.in || die #253259
-	sed -i -e 's/install.bin install.alternative/install.bin/' src/afterstep/Makefile.in || die #568694
-	epatch "${FILESDIR}"/${P}-gcc5.patch #574184
-
-	pushd autoconf >/dev/null
-	eautoreconf
-	cp autoconf/config.h.in ./ || die
-	cp configure ../ || die
-	popd >/dev/null
-
-	pushd libAfterBase >/dev/null
-	eautoreconf
-	popd >/dev/null
-}
-
-src_configure() {
-	local myconf
-
-	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
-		--enable-audit --enable-trace --enable-trace-x"
-
-	# Explanation of configure options
-	# ================================
-	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
-	# --with-xpm - Contained in xfree
-	# --disable-availability - So we can use complete paths for menuitems
-	# --enable-ascp - The AfterStep ControlPanel is abandoned
-	# LDCONFIG - bug #265841
-
-	LDCONFIG=/bin/true econf \
-		$(use_enable alsa) \
-		$(use_enable cpu_flags_x86_mmx mmx-optimization) \
-		$(use_enable nls i18n) \
-		$(use_enable xinerama) \
-		$(use_with dbus dbus1) \
-		$(use_with gif) \
-		$(use_with gtk) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff) \
-		$(use_with svg) \
-		--with-helpcommand="xterm -e man" \
-		--disable-availability \
-		--disable-staticlibs \
-		--enable-ascp=no \
-		${myconf}
-}
-
-src_compile() {
-	# gcc: ../libAfterConf/libAfterConf.a: No such file or directory
-	# make[1]: *** [PrintDesktopEntries] Error 1
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Create a symlink from MonitorWharf to Wharf
-	rm "${D}"/usr/bin/MonitorWharf
-	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
-
-	# Handle the documentation
-	dodoc ChangeLog INSTALL NEW* README* TEAM
-	cp -pPR TODO "${D}"/usr/share/doc/${PF}/
-	dodir /usr/share/doc/${PF}/html
-	cp -pPR doc/* "${D}"/usr/share/doc/${PF}/html
-	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
-
-	insinto /usr/share/xsessions
-	newins AfterStep.desktop.final AfterStep.desktop
-
-	# For desktop managers like GDM or KDE
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/${PN}
-}
diff --git a/x11-wm/afterstep/files/afterstep b/x11-wm/afterstep/files/afterstep
deleted file mode 100644
index 22bc4441ea42..000000000000
--- a/x11-wm/afterstep/files/afterstep
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/afterstep
diff --git a/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch b/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch
deleted file mode 100644
index 9447bcf990d9..000000000000
--- a/x11-wm/afterstep/files/afterstep-2.2.12-gcc5.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From: Robert Luberda <robert@debian.org>
-Date: Sun, 22 Mar 2015 16:35:31 +0100
-Subject: 44 Fix build with gcc 5
-
-Remove `inline' keywords from header files, and fix implicit
-declaration warnings to make the code compile with gcc 5, which
-have the c99 standard enabled by default.
-
-Bug-Debian: https://bugs.debian.org/777768
----
- libAfterBase/asvector.h     | 2 +-
- libAfterBase/output.h       | 2 +-
- libAfterBase/parse.h        | 2 +-
- libAfterConf/Feel.c         | 2 ++
- libAfterStep/colorscheme.c  | 2 +-
- libAfterStep/event.c        | 2 +-
- libAfterStep/functions.h    | 2 +-
- libAfterStep/mylook.h       | 8 ++++----
- libAfterStep/session.h      | 2 +-
- src/WinList2/WinList.c      | 2 +-
- src/afterstep/asinternals.h | 9 +++++++--
- src/afterstep/events.c      | 1 +
- src/afterstep/menuitem.c    | 2 ++
- 13 files changed, 24 insertions(+), 14 deletions(-)
-
-diff --git a/libAfterBase/asvector.h b/libAfterBase/asvector.h
-index 242bbb8..ec83231 100644
---- a/libAfterBase/asvector.h
-+++ b/libAfterBase/asvector.h
-@@ -38,7 +38,7 @@ ASVector *append_vector( ASVector *v, void * data, size_t size );
- /* returns index on success, -1 on failure */
- int vector_insert_elem( ASVector *v, void *data, size_t size, void *sibling, int before );
- int vector_relocate_elem (ASVector *v, unsigned int index, unsigned int new_index);
--inline size_t vector_find_data (ASVector *v, void *data );
-+size_t vector_find_data (ASVector *v, void *data );
- int vector_find_elem( ASVector *v, void *data );
- /* returns 1 on success, 0 on failure */
- int vector_remove_elem( ASVector *v, void *data );
-diff --git a/libAfterBase/output.h b/libAfterBase/output.h
-index fd186a7..ef21919 100644
---- a/libAfterBase/output.h
-+++ b/libAfterBase/output.h
-@@ -56,7 +56,7 @@ Bool show_debug( const char *file, const char *func, int line, const char *msg_f
- 
- 
- void nonGNUC_debugout( const char *format, ...);
--inline void nonGNUC_debugout_stub( const char *format, ...);
-+void nonGNUC_debugout_stub( const char *format, ...);
- /* may be used below in case compilation problems occur.
-  * Please submit a bug report if usage of any of the following generates errors on
-  * your compiler . Thanks!!! */
-diff --git a/libAfterBase/parse.h b/libAfterBase/parse.h
-index 193fbba..e4db499 100644
---- a/libAfterBase/parse.h
-+++ b/libAfterBase/parse.h
-@@ -73,7 +73,7 @@ format_geometry ( int x, int y, unsigned int width, unsigned int height, int fla
- 
- double parse_math(const char* str, char** endptr, double size);
- 
--inline int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
-+int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
- char *string_from_int (int param);
- char *hex_to_buffer_reverse(void *data, size_t bytes, char* buffer);
- char *hex_to_buffer(void *data, size_t bytes, char* buffer);
-diff --git a/libAfterConf/Feel.c b/libAfterConf/Feel.c
-index 0f2224b..787964d 100644
---- a/libAfterConf/Feel.c
-+++ b/libAfterConf/Feel.c
-@@ -29,6 +29,8 @@
- 
- #include "afterconf.h"
- 
-+#include <X11/XKBlib.h>
-+
- 
- flag_options_xref WindowBoxFlagsXref[] = {
- 	{ASA_Virtual, WINDOWBOX_Virtual_ID, 0}
-diff --git a/libAfterStep/colorscheme.c b/libAfterStep/colorscheme.c
-index 6cdeb56..5b93107 100644
---- a/libAfterStep/colorscheme.c
-+++ b/libAfterStep/colorscheme.c
-@@ -162,7 +162,7 @@ static inline ARGB32 MAKE_ARGB32_SHADE100 (CARD32 a, int s100)
- 	return MAKE_ARGB32_GREY8 (a, s8);
- }
- 
--inline void
-+static inline void
- make_mono_grad_argb (ARGB32 * grad, ARGB32 base_alpha16, int shade100,
- 										 int *val_ret)
- {
-diff --git a/libAfterStep/event.c b/libAfterStep/event.c
-index a27759b..8c7a449 100644
---- a/libAfterStep/event.c
-+++ b/libAfterStep/event.c
-@@ -202,7 +202,7 @@ void sync_event_queue (Bool forget)
- /****************************************************************************
-  * Records the time of the last processed event. Used in XSetInputFocus
-  ****************************************************************************/
--inline Time stash_event_time (XEvent * xevent)
-+static inline Time stash_event_time (XEvent * xevent)
- {
- 	if (xevent->type < LASTEvent) {
- 		register Time *ptime =
-diff --git a/libAfterStep/functions.h b/libAfterStep/functions.h
-index fb565f1..a50f4e3 100644
---- a/libAfterStep/functions.h
-+++ b/libAfterStep/functions.h
-@@ -314,7 +314,7 @@ FunctionCode change_func_code (const char *func_name, FunctionCode new_code);
- void init_func_data (FunctionData * data);
- void copy_func_data (FunctionData * dst, FunctionData * src);
- void dup_func_data (FunctionData * dst, FunctionData * src);
--inline FunctionData *create_named_function( int func, char *name);
-+FunctionData *create_named_function( int func, char *name);
- void set_func_val (FunctionData * data, int arg, int value);
- int free_func_data (FunctionData * data);
- void destroy_func_data( FunctionData **pdata );
-diff --git a/libAfterStep/mylook.h b/libAfterStep/mylook.h
-index 7bff0b8..a002aa8 100644
---- a/libAfterStep/mylook.h
-+++ b/libAfterStep/mylook.h
-@@ -397,7 +397,7 @@ void myback_delete( MyBackground **myback, ASImageManager *imman );
- MyDesktopConfig *create_mydeskconfig( int desk, char *data );
- void init_deskconfigs_list( MyLook *look );
- void mydeskconfig_delete( MyDesktopConfig **dc );
--inline MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc );
-+MyDesktopConfig *add_deskconfig_to_list( ASHashTable *list, MyDesktopConfig *dc );
- MyDesktopConfig *add_deskconfig( MyLook *look, MyDesktopConfig *dc );
- 
- ARGB32 get_random_tint_color();
-@@ -411,9 +411,9 @@ void mylook_set_font_size_var (MyLook * look);
- 
- 
- struct MyStyle *mylook_get_style(MyLook *look, const char *name);
--inline MyBackground  *mylook_get_desk_back(MyLook *look, long desk);
--inline MyBackground  *mylook_get_back(MyLook *look, char *name);
--inline MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
-+MyBackground  *mylook_get_desk_back(MyLook *look, long desk);
-+MyBackground  *mylook_get_back(MyLook *look, char *name);
-+MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
- 
- 
- 
-diff --git a/libAfterStep/session.h b/libAfterStep/session.h
-index 536e225..73945d8 100644
---- a/libAfterStep/session.h
-+++ b/libAfterStep/session.h
-@@ -49,7 +49,7 @@ void 	   destroy_assession (ASSession * session);
- void       update_default_session ( ASSession *session, int func);
- 
- void 	   set_session_override(ASSession * session, const char *overriding_file, int function );
--inline const char *get_session_override(ASSession * session, int function );
-+const char *get_session_override(ASSession * session, int function );
- 
- void 	   change_default_session (ASSession * session, const char *new_val, int function);
- void 	   change_desk_session (ASSession * session, int desk, const char *new_val, int function);
-diff --git a/src/WinList2/WinList.c b/src/WinList2/WinList.c
-index 6db35ac..6c98f38 100644
---- a/src/WinList2/WinList.c
-+++ b/src/WinList2/WinList.c
-@@ -976,7 +976,7 @@ moveresize_main_canvas( int width, int height )
- void
- postponed_rearrange_winlist( void *vdata )
- {
--    Bool dont_resize_main_canvas  = (Bool)vdata ;   
-+    Bool dont_resize_main_canvas  = vdata != NULL;
-     rearrange_winlist_window( dont_resize_main_canvas );    
- }
- 
-diff --git a/src/afterstep/asinternals.h b/src/afterstep/asinternals.h
-index 81b3249..9f75fd8 100644
---- a/src/afterstep/asinternals.h
-+++ b/src/afterstep/asinternals.h
-@@ -575,6 +575,7 @@ void asdbus_shutdown();
- void asdbus_process_messages ();
- 
- char *asdbus_RegisterSMClient(const char *sm_client_id);
-+void asdbus_UnregisterSMClient (const char *sm_client_path);
- void asdbus_Notify(const char *summary, const char *body, int timeout);
- 
- typedef enum {
-@@ -585,6 +586,10 @@ typedef enum {
- 
- Bool asdbus_GetCanLogout ();
- Bool asdbus_Logout (ASDbusLogoutMode mode, int timeout);
-+Bool asdbus_GetCanSuspend ();
-+Bool asdbus_Suspend (int timeout);
-+Bool asdbus_GetCanHibernate ();
-+Bool asdbus_Hibernate (int timeout);
- Bool asdbus_GetCanShutdown ();
- Bool asdbus_Shutdown (int timeout);
- Bool get_gnome_autosave ();
-@@ -689,8 +694,8 @@ void ParsePopupEntry (char *tline, FILE * fd, char **junk, int *junk2);
- 
- 
- /*************************** misc.c *********************************/
--inline void ungrab_window_buttons( Window w );
--inline void ungrab_window_keys (Window w );
-+void ungrab_window_buttons( Window w );
-+void ungrab_window_keys (Window w );
- void MyXGrabButton ( unsigned button, unsigned modifiers,
- 				Window grab_window, Bool owner_events, unsigned event_mask,
- 				int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor);
-diff --git a/src/afterstep/events.c b/src/afterstep/events.c
-index 5588ffb..19e5441 100644
---- a/src/afterstep/events.c
-+++ b/src/afterstep/events.c
-@@ -46,6 +46,7 @@
- #include "../../libAfterStep/moveresize.h"
- 
- #include <X11/keysym.h>
-+#include <X11/XKBlib.h>
- #ifdef XSHMIMAGE
- # include <sys/ipc.h>
- # include <sys/shm.h>
-diff --git a/src/afterstep/menuitem.c b/src/afterstep/menuitem.c
-index 1adcb65..8a35186 100644
---- a/src/afterstep/menuitem.c
-+++ b/src/afterstep/menuitem.c
-@@ -55,6 +55,8 @@
- 
- #include "dirtree.h"
- 
-+#include <X11/XKBlib.h>
-+
- /***************************************************************************/
- /*                      Menu functions                                     */
- /***************************************************************************/
diff --git a/x11-wm/afterstep/metadata.xml b/x11-wm/afterstep/metadata.xml
deleted file mode 100644
index ffe0e9223de5..000000000000
--- a/x11-wm/afterstep/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">afterstep</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index aeca4a22a54d..a1408d649d74 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -2,9 +2,9 @@ AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80
 AUX icewm-1.3.10-menu.patch 821 BLAKE2B 2274136f91b891c971a84f80c3ace49f4c3e5245ae0de83408219575a25dc1cb42523459a923634ab25565fdafe1b5320b955adbb1de4b3fda3c7613ba93d7ad SHA512 15ad0cd80fa358ef823ad747b873afab7ce07114590cba90710b91daa6421a8b8030c7ce7bd8af245c85983d75583c2701de85809de3059fe3e838e2f88f016e
 AUX icewm-1.3.8-uclibc.patch 1830 BLAKE2B 36037fcdadb7d70d1cc4125170c05e9800a2acca930148eeb091d084a4aca7f4813f452e3565aece03aca7d441755e958cd75a83c875f684beec335355ee7a16 SHA512 ed3abce7aabb21e5fb516f02a6860d140b2d74f288daf8a7edd14f8d70cd377f5bcf9b4172da4c8ca30b176c79e7500ba2c253004ca59a1ab6e9258b6b8a6f2e
 DIST icewm-1.4.2.tar.gz 1709850 BLAKE2B 1a9dde495345f1601b3ae901b3e98554b60a9b9a8e94b7079f3c766971eb31bde5a3cd3972f5c96d86b5e02e413811df2a0689efc15a461bca39a70842f3df69 SHA512 c01661a7b07b4f42a32b20ecc9e45fb1e9c84c27d33105ec165e75aa9ac84129d55e992cac0d53fb10298bae28bc93ef07f68e874c1c2fccd9adecceb987a872
-DIST icewm-1.5.2.tar.xz 1662664 BLAKE2B 612cf919a685a50844b0085d63855a7fdbbd322cb9792fe250420566b1188efc390cfe79fef40386d9328b896f60ba94cc7cc7d87b78866433e2234666ec4206 SHA512 f2a542d162e984dcc6f7b8e3fc2dbd7df46510f961431b4c3b6651351f7b236ef4724a07ce01dfa163b08c9a130e7ee3ed62e1c5b1f364340998d31290323614
 DIST icewm-1.5.3.tar.xz 1679384 BLAKE2B 6a855e6305083815173ed16f043ee6da3041b0b8ee537e5ac217dc6aca1d5a9b4303b7cf81ea4cd857fed55b64bd0842f6e2e7cacdf19d9c7abfb50df93a73d9 SHA512 3fb7bb3002687fc3105c61f062600015cf59173e054e3dc3dc1af4ec960991790bbb5b4ba842e9c67c8f73fb8189ae76772f3df58fd679884c85239e6d93a3cb
+DIST icewm-1.5.4.tar.xz 1689668 BLAKE2B 19779e0b80da89ca5cdce3525a0f612b126e0e3d4c7569fe249ca78af7cc8ad16162361699d0a068f3394a2105f2afc1f7f644a02c7ad883469a9fa8c1fbf416 SHA512 7b5743872d328f937b49e2b79f7d6c0b8404326ef7e7a3b529c80138b36e8c2b30db79593125a8be76abe40282c779f79ca64b504f980ef2c87052448bdc076e
 EBUILD icewm-1.4.2.ebuild 2438 BLAKE2B de1cc5ef5cf186aa332ebcef371fb562875469b8bbb0f96fe01fb2ac35c5f8272a1eb8ca385ea86210846e79a70eb4dec8911ab8297dc2fe414e7d3ea49e8652 SHA512 6d834977adb9680101d45e2a4cd665cc69f694d1419d1d9133e8ece382d0cfa55299039b12fab2585cf46f1853baa57c252f7f7cea39b3a72c47f7a100cb7894
-EBUILD icewm-1.5.2.ebuild 2330 BLAKE2B 50ff95ef83e3f79b07852e366ea2eb0c7e117430f36f323ea4c8bd7d7bddc1bd21f0b7a6963a3a3b1efe15a552b25b2097f19e2fdae9202af9beec4e2128e100 SHA512 95bcf5aff97247a47b17b5a8b66817da7804de834b09d2e3b5b108a9885d3bd5776a76e6644d40da849e674839f6f71af54b15e3187638ee669aedee0bfef4a1
 EBUILD icewm-1.5.3.ebuild 2343 BLAKE2B 3419d63e8de1b43c5d0560e7d1ad524bdbc7e005bd83c4d0c15b64dec959dcdbbd75c81b28d0396f93f0dc4dac9fff192f0ed52f4879e69330bd71c8e41513cf SHA512 d5d5c3e9d024aad9066fde6ba81fd5fe53dc1cf07f9128cb03bedea1bf1ed9b888d9a6473aac58e9372c4c8045792c1b5334f2dab7b550a3a35221456291485b
+EBUILD icewm-1.5.4.ebuild 2343 BLAKE2B 3419d63e8de1b43c5d0560e7d1ad524bdbc7e005bd83c4d0c15b64dec959dcdbbd75c81b28d0396f93f0dc4dac9fff192f0ed52f4879e69330bd71c8e41513cf SHA512 d5d5c3e9d024aad9066fde6ba81fd5fe53dc1cf07f9128cb03bedea1bf1ed9b888d9a6473aac58e9372c4c8045792c1b5334f2dab7b550a3a35221456291485b
 MISC metadata.xml 671 BLAKE2B f58cf53a373b1ba887cf376f5fc676b6d533348f186550a55961ac3d77a1867d8302759a83f69a3c8d757d16dcd2b0e4e7fdf52f485575d92a9d3b93fab3c463 SHA512 ea3df07996cdff6f369609a827cb4b23a6d2e3858fabc7fd9e85e382db7a53e0ca3dbe4ca50359c333b93372671e7c8753d2e7f40d1dfe6cd06c4714acf4ab9e
diff --git a/x11-wm/icewm/icewm-1.5.2.ebuild b/x11-wm/icewm/icewm-1.5.4.ebuild
index abaa3c67fdf2..1fb78abeecfd 100644
--- a/x11-wm/icewm/icewm-1.5.2.ebuild
+++ b/x11-wm/icewm/icewm-1.5.4.ebuild
@@ -45,13 +45,16 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	app-text/asciidoc
 	gnome-base/librsvg
 	x11-base/xorg-proto
-	nls? ( >=sys-devel/gettext-0.19.6 )
 	truetype? ( >=media-libs/freetype-2.0.9 )
 "
 
+BDEPEND="
+	app-text/asciidoc
+	nls? ( >=sys-devel/gettext-0.19.6 )
+"
+
 src_prepare() {
 	# Fix bug #486710 - TODO: Still needed?
 	#use uclibc && PATCHES+=( "${FILESDIR}/${PN}-1.3.8-uclibc.patch" )
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 161a813b26a3..2b16cedcd6fe 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,3 @@
-DIST marco-1.18.2.tar.xz 1255492 BLAKE2B 034ad26789f894d7fa829e48ed39d11925e304dd8f6c3c74b14972a332b63782d1a8c4cb5b81b20f4d8bc12a74d053bf587ed72e3c1dca8b4fddd567dd6551ef SHA512 f18cd8d46c2ad6e6d86e6e110fb588ea8c6c301c6ffc1ee72ce80984125be5cbdeb20bf4a7fe8d1d1a60b93c7cb32de8dbd00532462c5637b747068f96e79129
 DIST marco-1.22.0.tar.xz 1406400 BLAKE2B 4c3ebf92111e2d211f80e3cf65e9eab661a8157e51021b5178f621113d739efda45eb15af4e87479587b530c773a7f7bd4c3bf85ffb053da9bf0ee3529073dd7 SHA512 0935ca1532fde882e21ebbc67b41afe80e15e8519b413b9b8bde351196be347a8dcac2e092da818ec0bc700216e38211f192a891eafec8ac7d9bf63d3a42328d
-EBUILD marco-1.18.2.ebuild 1415 BLAKE2B 66a7ff62f82a0c175317f6ad8c45a9673af56f1189a73a65ab1d9300edad4cee9913d0c3393686d2c67300f47a5c6f5d869e81040a9c216f1ac03cde8f3b2c7e SHA512 8e55470bb754512e57a949b07702381969005bd7ddeb0a5a26c654a88cb748466e04f8c2a9a37a38fce7fdc7b5697c047c4f5346b1020b4e94c6a709a553a3dd
-EBUILD marco-1.22.0.ebuild 1407 BLAKE2B 90cfc05d7e6acc2dfdbf15f719c91e9aa0a5166bb9a1215a4ac3f08ad76568036c6ec0f0f618bdde174953d545971735f81bccd518d2ce18ec573f696a5aa452 SHA512 cded5ce667a2eae6b7a51d3463272716d2a06de7aaed9a162c41b6e2f966712f2af9651270ba50dd070884158ee08a2452b7c9daad8d18c91d432c3dde837a50
+EBUILD marco-1.22.0.ebuild 1405 BLAKE2B 32af147cdcf6b7d6d4b9cb687624f15f73255e5922e371386ff51df96e544c50bf96e396dcb0be565a3dcbc8b0426c7d01ce1b54da2fa204647f1b8c9adf5042 SHA512 f475ee831c03fa06a6c0717b065ff62e98dfacce4bbff364ce585cbd886ce04567dcf9f90598c9012f15caa198f85bc35717a7f10cd4b25c2b1796ac4b25c183
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.18.2.ebuild b/x11-wm/marco/marco-1.18.2.ebuild
deleted file mode 100644
index a4abca44a716..000000000000
--- a/x11-wm/marco/marco-1.18.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra:0[gtk3]
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.17.0"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-src_configure() {
-	mate_src_configure \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc {,doc/}*.txt
-}
diff --git a/x11-wm/marco/marco-1.22.0.ebuild b/x11-wm/marco/marco-1.22.0.ebuild
index 32d7d2c46302..72fb645f0b0c 100644
--- a/x11-wm/marco/marco-1.22.0.ebuild
+++ b/x11-wm/marco/marco-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE default window manager"
diff --git a/x11-wm/qtile/Manifest b/x11-wm/qtile/Manifest
index 6021cb4ac9bb..16539ef7cbbb 100644
--- a/x11-wm/qtile/Manifest
+++ b/x11-wm/qtile/Manifest
@@ -3,8 +3,8 @@ AUX qtile-session 1854 BLAKE2B 260c39642f805f9b94e59ab25d9e8d6e53abcb9fbed76f334
 DIST qtile-0.10.6.tar.gz 328892 BLAKE2B 3a4887808b87b0cbe4410d2bac8af4664873d2aa9b8c782f8c026ae78ba586b6e02d9a50ee42434afa916e9fe9041a7a15a68f9026ee7d95a0edec2594515cfa SHA512 39eef26358e1220ca766b030733396206df68677e3f23d6847d375f479952a4e2d47e0c3e59fab2e5046e899bad91d107a913bb25458fb66859dec3fa8c0e956
 DIST qtile-0.12.0.tar.gz 447139 BLAKE2B c1bea9ba8b36ccf14b7e55b4a2cbc05714ecffef33d992e9bf1683e6f8c416d481cf9d141bbf0fe62df65aeb3555290647d072dd45f507b08e0d523f992a1671 SHA512 a94237c40775524e16aebdd8555d0ed0623c248b65aee32851145e8a6cc54ce4d46ee5cf4c4f583e468de4557a565c4281660219e4b2ee1b73fb483567e1a5b2
 DIST qtile-0.13.0.tar.gz 468271 BLAKE2B e5e95b5bc56a06469e903f025946e6d0ea7b36501d017dd1470950c04a3ae1b35ec56b2a3c12f52daee75ae7b009c26285f49c0fa1ec5dda4993b2cf2da8a40c SHA512 06e6b32952c77c6b44872d5a52e0d196d5bb23c38da5d8acc2bba571f4d5fbadd8a7311f47e9301fb72a45c92b0255a90911edd12442392206da311fb7ada286
-EBUILD qtile-0.10.6.ebuild 1354 BLAKE2B 1dc08d6e4baa03f5c2416eba26fe5d398cd77e6d3db0feeabbb49fae7d700e1f280e085b8ef20c5d03878bf6974a48c837464b5e52554d11f11fc1520790858d SHA512 5949738009c1fc7f7baa658d314c2cf17b43d1e4338df0772ae2c8d6d8b687a7f7b434029222eb2c675f8b32d35693521115d585d4bf146484d6f5cec7880e53
-EBUILD qtile-0.12.0.ebuild 1709 BLAKE2B 8d0b2f784803827d007513195b012dd30176fd7e7fc4c4ad544c0672233ca0e88acf6e16b03334c053ca425c3a629f602d25f619039934998a312f2ef64f7246 SHA512 f80dd9f4a4a7cf30965c5810039ad7deb31498aa6cda14e87ca2a6089b4eca369ac7bbaa13a72fd74cf9e0a50159e02ed76d616fb8703f44459c6c13e63f6b00
-EBUILD qtile-0.13.0.ebuild 1709 BLAKE2B 1b7982c34b030a8613d8a1a97263c06500e628c3e7d6b5783399003feeb043e1eba078b79740aaae43f8221990efd8233a177496f2105b91a059fb8f3e650537 SHA512 cc9b8d0e2243dfe1f90068ea18c957e396b2368d8a81995d036795a95858433c4cf59a8f7fa6e3c421fbcda6dfbf92f54c089647fd154591ac315e78758b646c
-EBUILD qtile-9999.ebuild 1709 BLAKE2B 8b1e5b7ec8ae40d3302536d275c8da67109f5f8bfa74dd2f61ec344646506239feeb9a90cfd4f6499aff67ac6da0b79ef33f36714561641cd2a11f991a7dcab5 SHA512 f99fde824a15a5b2c80f22c3665d3576bad2803e04b2992ee43589556670116143fd66e4ca6dbafd791bbb0e5c90ad422800a49433d10b353c0ede775a8b13e8
+EBUILD qtile-0.10.6.ebuild 1347 BLAKE2B 2ba496381dc3c2a10618fe512eb7157f4c8311aad2541e842ee4582247093fdc556b0063aacc2fcff9abadbc1f0c386ca53a68dda8ecfe6d8a7fe494de5ae64b SHA512 276345657748675f88dfd3a090e910845a4ae909644dff2b9122a3078318a300f76fba653ba37149f14fcf78838cbe61fc16273765d6e2453c4c83113a1ede1b
+EBUILD qtile-0.12.0.ebuild 1702 BLAKE2B 548703fbc6a43470b35a8622917b5d5600324ad2ff941640ef4d6523bfc297e313eab9e1b06f8931d477860fb07473f020d3dc1307459812d8984d0f068800c8 SHA512 24eedbd9999715d680cbdd59538dc4a9c3f9737449eccc1282e911142d51fc67189699ca735e524e54b553ed78a3b58ccfcaffeeed076f6e0c1ff43996fb2c10
+EBUILD qtile-0.13.0.ebuild 1705 BLAKE2B 9c03ba341d125c69278f790fdb0df063e3fba9f9b97462d1a549b705843a30db6fe7c65c1368dd4cf1c0a5ef1c2d4e6bcc937f96e20b2153d3555d1ab5292828 SHA512 dbc30163e830bf421681893bf725cc994c993ffb2a1f2b904ae503f445ddd73335c3266d05b7f881af60deabdb8f576108b19f50b5d47a06957deadf15e109a7
+EBUILD qtile-9999.ebuild 1705 BLAKE2B 3a9cbae556132f29ce0dd03caaccdb4c564cc1ae61115376ca3766711cc1f92d8b941fa44571fda2d7f91d37a0ca9188717394c4d0ab605e9e4419630daa553a SHA512 ee4c74b71e344af8d128244f3b1aa07aa10af2b5d98aaac15b6b8fb6fe5f6585764aa46b1416487a71584e3dd77585b2312248b11d329cc7d284984459b17570
 MISC metadata.xml 322 BLAKE2B bdbe4a68aa5f64ac0c4a045653920863b757b661b1966cbedead7b9bc48f0436cf96e30d5e615b265daa57e21b92959f4b38a8bc16c1123c2c2af6709ff981ab SHA512 2722b020cfc1260e907fccc5055ea5556435bd603fe362fbe0ceb0b3074ee20baf6ecc04d2afd6bd9c7b949d0ce0cc06f5c9234f77963374916924d6d7249564
diff --git a/x11-wm/qtile/qtile-0.10.6.ebuild b/x11-wm/qtile/qtile-0.10.6.ebuild
index 4133132c10db..efb619558064 100644
--- a/x11-wm/qtile/qtile-0.10.6.ebuild
+++ b/x11-wm/qtile/qtile-0.10.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 inherit distutils-r1 virtualx
 
diff --git a/x11-wm/qtile/qtile-0.12.0.ebuild b/x11-wm/qtile/qtile-0.12.0.ebuild
index 5ba9a0932049..04b9c94bf4b3 100644
--- a/x11-wm/qtile/qtile-0.12.0.ebuild
+++ b/x11-wm/qtile/qtile-0.12.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 virtualx
 
diff --git a/x11-wm/qtile/qtile-0.13.0.ebuild b/x11-wm/qtile/qtile-0.13.0.ebuild
index a3b40e8192aa..50512cc747ca 100644
--- a/x11-wm/qtile/qtile-0.13.0.ebuild
+++ b/x11-wm/qtile/qtile-0.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 virtualx
 
diff --git a/x11-wm/qtile/qtile-9999.ebuild b/x11-wm/qtile/qtile-9999.ebuild
index 94b5c125cf7c..cc30645b5f15 100644
--- a/x11-wm/qtile/qtile-9999.ebuild
+++ b/x11-wm/qtile/qtile-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1 virtualx