Sync with portage [Tue Jun 23 23:57:05 MSK 2020].

app-backup/dar/metadata.xml

@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 Backup directory tree and files.
 Full featured archiver with support for differential backups, slices,
 compression, ATTR/ACL support. DAR also supports Pipes for remote
 operations, including with ssh.
-</longdescription>
+	</longdescription>
 	<use>
 		<flag name="dar32">Enables --enable-mode=32 option, which replace infinite
 		by 32 bit integers</flag>

app-editors/e3/files/e3-2.8.2-makefile.patch

@@ -30,7 +30,7 @@
  	cat e3.asm | sed -f e3_32to64.sed  >e3.tmp
  	$(ASSEMBLER64)
 -	ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
-+	$(LD) -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
++	$(LD) -o e3 e3.o
  ifneq	($(DEBUG),true)
  	strip e3
  endif

app-editors/hteditor/hteditor-2.1.0-r1.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_P=${P/editor}
 
@@ -39,6 +39,12 @@ PATCHES=(
 src_prepare() {
 	default
 	eautoreconf
+
+	# Many literals are concatenated with macro definitions.
+	# Instead of patching them all let's pick old c++ standard
+	# and port to c++11 upstream.
+	# https://bugs.gentoo.org/729252
+	append-cxxflags -std=c++98
 }
 
 src_configure() {

app-editors/jasspa-microemacs/files/20091011-cc-detect.patch

@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/729258
+
+--- me091011-orig/src/build
++++ me091011/src/build
+@@ -158,12 +158,8 @@
+         exit 1
+     fi
+ 
+-    # use cc by default if available
+     if [ -r $MAKEBAS.mak ] ; then
+-        # try to detect cc, if found use it in preference
+-        if [ "`type cc | cut -b 1-5`" = "cc is" ] ; then
+-            MAKEFILE=$MAKEBAS.mak
+-        fi
++        MAKEFILE=$MAKEBAS.mak
+         # Special rules for sun, if cc is /usr/ucb then this is a dummy.
+         if [ $PLATFORM = "SunOS" ] ; then 
+             WHATCC=`/usr/bin/which cc`
+@@ -173,12 +169,8 @@
+         fi                      
+     fi
+     if [ -z "$MAKEFILE" ] ; then
+-        # failed to find cc, try gcc
+         if [ -r $MAKEBAS.gmk ] ; then
+-            # try to detect gcc, if found use it in preference
+-            if [ "`type gcc | cut -b 1-6`" = "gcc is" ] ; then
+-                MAKEFILE=$MAKEBAS.gmk
+-            fi
++            MAKEFILE=$MAKEBAS.gmk
+         fi
+     fi
+     if [ -z "$MAKEFILE" ] ; then

app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r3.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,6 +37,7 @@ S="${WORKDIR}/me${PV:2}"
 PATCHES=(
 	"${FILESDIR}"/${PV}-ncurses.patch
 	"${FILESDIR}"/${PV}-linux3.patch
+	"${FILESDIR}"/${PV}-cc-detect.patch
 )
 
 src_unpack() {

app-editors/teco/files/teco-void-functions.patch

@@ -0,0 +1,536 @@
+https://bugs.gentoo.org/729254
+
+--- teco-orig/te_chario.c
++++ teco/te_chario.c
+@@ -24,6 +24,8 @@
+ #define SIGINTMASK 2
+ #endif
+ 
++void crlf(), type_char();
++
+ int lf_sw;                                  /* nonzero: make up a LF following an entered CR */
+ int ttyflags;                               /* flags for (stdin) file descriptor */
+ #ifndef _POSIX_SOURCE
+@@ -44,6 +46,7 @@
+ /* operation; normal mode is none of the above.  TTY_OFF and TTY_ON do this     */
+ /* absolutely; TTY_SUSP and TTY_RESUME use saved signal status.                 */
+ 
++void
+ setup_tty(arg)
+     int arg;
+     {
+@@ -213,6 +216,7 @@
+ #ifdef _POSIX_SOURCE
+ sigset_t  oldmask;
+ 
++void
+ block_inter(func)
+     int func;
+     {
+@@ -313,6 +317,7 @@
+ 
+ /* type a crlf */
+ 
++void
+ crlf()
+     {
+     type_char(CR);
+@@ -340,6 +345,7 @@
+ 
+ /* routine to type one character */
+ 
++void
+ type_char(c)
+     char c;
+     {
+--- teco-orig/te_defs.h
++++ teco/te_defs.h
+@@ -320,7 +320,7 @@
+ extern char mapch[], mapch_l[];         /* char mapping tables              */
+ extern unsigned char spec_chars[];      /* special character table          */
+ 
+-extern char skipto(), find_endcond(), getcmdc(), getcmdc0();    /* routines that return chars */
++extern char skipto(), getcmdc(), getcmdc0();    /* routines that return chars */
+ 
+ extern FILE *eisw;                      /* indirect command file pointer    */
+ extern FILE *fopen();
+--- teco-orig/te_exec0.c
++++ teco/te_exec0.c
+@@ -8,6 +8,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ 
++void
+ exec_cmdstr()
+     {
+     char c;
+--- teco-orig/te_exec1.c
++++ teco/te_exec1.c
+@@ -6,6 +6,7 @@
+ /* version for multiple buffers  04/13/89 15.55                             */
+ #include "te_defs.h"
+ 
++void
+ exec_cmds1()
+     {
+     char command;                   /* command character */
+--- teco-orig/te_exec2.c
++++ teco/te_exec2.c
+@@ -12,6 +12,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
++void do_en_next(), set_var(), write_file(), write_stream();
++void kill_output(), pop_iteration(), find_enditer(), find_endcond();
++
+ struct qh oldcstring;                       /* hold command string during ei */
+ 
+ /* file stuff for input/output files */
+@@ -26,6 +29,7 @@
+ 
+ /* process E commands */
+ 
++void
+ do_e()
+     {
+     char c;                         /* temps */
+@@ -567,6 +571,7 @@
+ 
+ /* routine to get next file spec from "EN" list into filespec buffer */
+ 
++void
+ do_en_next()
+     {
+     char c;
+@@ -669,6 +674,7 @@
+ 
+ /* fetch or set variable */
+ 
++void
+ set_var(arg)
+     int *arg;           /* argument is pointer to variable */
+     {
+@@ -764,6 +770,7 @@
+ /* arguments are qp to start of text, number of characters, */
+ /* and an "append FF" switch                                */
+ 
++void
+ write_file(wbuff, nchars, ffsw)
+     struct qp *wbuff;
+     int nchars, ffsw;
+@@ -779,6 +786,7 @@
+ /* Unix processes.  Arguments wbuff, nchars as above; file  */
+ /* is stream pointer, crlf_sw zero converts CRLF to LF      */
+ 
++void
+ write_stream(file, wbuff, nchars, crlf_sw)
+     FILE *file;
+     struct qp *wbuff;
+@@ -809,6 +817,7 @@
+ 
+ /* routine to kill output file: argument is pointer to an output file structure */
+ 
++void
+ kill_output(outptr)
+     struct outfiledata *outptr;
+     {
+@@ -825,6 +834,7 @@
+ 
+ char panic_name[] = "TECO_SAVED.tmp";           /* name of file created to save buffer */
+ 
++void
+ panic()
+     {
+     if (!outfile->fd && pbuff->z) outfile->fd = fopen(panic_name, "w"); /* if buffer nonempty and no file open, make one */
+@@ -838,6 +848,7 @@
+ 
+ /* do "F" commands */
+ 
++void
+ do_f()
+     {
+     struct buffcell *delete_p;
+@@ -954,6 +965,7 @@
+ /* pop iteration: if arg nonzero, exit unconditionally */
+ /* else check exit conditions and exit or reiterate */
+ 
++void
+ pop_iteration(arg)
+     int arg;
+     {
+@@ -973,6 +985,7 @@
+ 
+ /* find end of iteration - read over arbitrary <> and one > */
+ 
++void
+ find_enditer()
+     {
+     register int icnt;
+@@ -988,7 +1001,8 @@
+ 
+ 
+ /* find end of conditional */
+-char find_endcond(arg)
++void
++find_endcond(arg)
+     char arg;
+     {
+     register int icnt;
+--- teco-orig/te_main.c
++++ teco/te_main.c
+@@ -44,6 +44,8 @@
+ 
+ #include "te_defs.h"
+ 
++void cleanup(), print_string(), save_args(), read_startup(), get_term_par();
++
+ main(argc, argv)
+     int argc;           /* arg count */
+     char *argv[];       /* array of string pointers */
+@@ -103,6 +105,7 @@
+ 
+ /* reset screen state, keyboard state; remove open output files */
+ 
++void
+ cleanup()
+     {
+     window(WIN_OFF);            /* restore screen */
+@@ -115,6 +118,7 @@
+ /* print string for error message */
+ /* argument is subscript of a qreg qh, prints text from that buffer */
+ 
++void
+ print_string(arg)
+     int arg;
+     {
+@@ -137,6 +141,7 @@
+ 
+ /* copy invocation command line to a text buffer */
+ 
++void
+ save_args(argc, argv, q)
+     int argc;
+     char *argv[];
+@@ -171,6 +176,7 @@
+ 
+ char startup_name[] = "/.tecorc";       /* name of startup file */
+ 
++void
+ read_startup()
+     {
+     char *hp, *getenv();
+@@ -192,6 +198,7 @@
+ 
+ /* routine to get terminal height and width from termcap */
+ 
++void
+ get_term_par()
+     {
+     char tbuff[1024];   /* termcap buffer */
+--- teco-orig/te_rdcmd.c
++++ teco/te_rdcmd.c
+@@ -6,6 +6,7 @@
+ /* version for multiple buffers  04/13/89 10.22                             */
+ #include "te_defs.h"
+ 
++void retype_cmdstr();
+ int ccount;             /* count of chars read in */
+ 
+ int read_cmdstr()
+@@ -227,6 +228,7 @@
+ 
+ /* retype command string: entirely (arg = '*') or most recent line (arg = ' ') */
+ 
++void
+ retype_cmdstr(c)
+     char c;
+     {
+--- teco-orig/te_subs.c
++++ teco/te_subs.c
+@@ -17,6 +17,7 @@
+ /*    n is the returned number of chars moved   */
+ /* max is the maximum number of chars to move   */
+ 
++void
+ movenchars(from, to, n)
+     struct qp *from, *to;       /* address of buffer pointers */
+     register int n;             /* number of characters */
+@@ -69,6 +70,7 @@
+ 	}
+     }
+ 
++void
+ moveuntil(from, to, c, n, max, trace)
+     struct qp *from, *to;       /* address of buffer pointers   */
+     register char c;            /* match char that ends move    */
+@@ -249,6 +251,7 @@
+ /* leaves bb pointing to end of that text */
+ /* insert2() copies rest of buffer */
+ 
++void
+ insert1()
+     {
+     int nchars;             /* number of chars in cell */
+@@ -269,6 +272,7 @@
+ 
+ 
+ 
++void
+ insert2(count)              /* count is the number of chars added */
+     int count;
+     {
+@@ -289,6 +293,7 @@
+ /* subroutine to delete n characters starting at dot    */
+ /* argument is number of characters                     */
+ 
++void
+ delete1(nchars)
+     int nchars;
+     {
+@@ -314,6 +319,7 @@
+ 
+ struct qh obuff;        /* tag string buffer */
+ 
++void
+ do_o()
+     {
+     int i, j;           /* i used as start of tag, j as end */
+@@ -460,6 +466,7 @@
+ 
+ /* find number of characters to next matching (, [, or {  (like '%' in vi) */
+ 
++void
+ do_ctlp()
+     {
+     int i, l;
+--- teco-orig/te_utils.c
++++ teco/te_utils.c
+@@ -37,6 +37,7 @@
+ 
+ 
+ /* free a list of buffcells */
++void
+ free_blist(p)
+     struct buffcell *p;
+     {
+@@ -51,6 +52,7 @@
+     }
+ 
+ /* free a list of buffcells to the "delayed free" list */
++void
+ dly_free_blist(p)
+     struct buffcell *p;
+     {
+@@ -92,6 +94,7 @@
+ 
+ 
+ /* free a list of cells */
++void
+ free_dlist(p)
+     struct qp *p;
+     {
+@@ -107,6 +110,7 @@
+ 
+ /* build a buffer:  called with address of a qh */
+ /* if no buffer there, get a cell and link it in */
++void
+ make_buffer(p)
+     struct qh *p;
+     {
+@@ -178,6 +182,7 @@
+ 
+ /* set up a pointer to a particular text buffer position */
+ 
++void
+ set_pointer(pos, ptr)   /* first arg is position, 2nd is addr of pointer */
+     int pos;
+     struct qp *ptr;
+--- teco-orig/te_window.c
++++ teco/te_window.c
+@@ -21,6 +21,10 @@
+ #define MAX 0x7fffffff          /* maximum positive integer, for "last modified" location */
+ #define W_MARK 0200             /* "this loc is special" in screen image */
+ 
++void window(), window0(), window1_both(), window1(), window1_abs();
++void window1_inc(), window1_after(), w_rmcurs(), window2(), vtm();
++void w_makecurs(), w_type(), w_init(), w_separators(), w_move();
++void w_scroll(), w_ebol();
+ 
+ /* image of current window */
+ 
+@@ -74,6 +78,7 @@
+ /* routine to perform simple scope operations */
+ /* (an attempt to concentrate VT-100 specific things in one place) */
+ 
++void
+ vt(func)
+     int func;
+     {
+@@ -132,6 +137,7 @@
+ int win_max[]  = { 4,  W_MAX_H, W_MAX_V, 1, MAX, 12, -1,  20,   20, -1, -1 } ;  /* max values */
+ int win_data[] = { 4,  132,     24,      0, 0,    0,  0,   0,    0,  0,  0 } ;  /* window parameters    */
+ 
++void
+ do_window(ref_flag)
+     int ref_flag;                   /* nonzero forces "refresh" operation */
+     {
+@@ -196,6 +202,7 @@
+ /* routine to update screen size with numbers obtained from environment */
+ /* (called by main program's initialization)                            */
+ 
++void
+ set_term_par(lines, cols)
+     int lines, cols;
+     {
+@@ -215,6 +222,7 @@
+ /* WIN_LINE:    does WIN_REFR unless that wouldn't do anything, in which case       */
+ /*              it does effective 1EV output                                        */
+ 
++void
+ window(arg)
+     int arg;
+     {
+@@ -288,6 +296,7 @@
+ /* used for ev, es, and <BS> or <LF> as immediate commands                  */
+ /* starting char position is in w_p1; argument is number of lines           */
+ 
++void
+ window0(num)
+     int num;
+     {
+@@ -364,6 +373,7 @@
+ 
+ struct bh *old_pbuff;
+ 
++void
+ window1_both()
+     {
+     pw0 = &win_1;
+@@ -396,6 +406,7 @@
+ /* if scroll mode is enabled, the VT100 screen is split and only the upper part */
+ /* is used by this routine; else the whole screen is used.                      */
+ 
++void
+ window1()
+     {
+     int i, j, m, lflag;
+@@ -500,6 +511,7 @@
+ 
+ /* routine to redraw screen absolutely */
+ 
++void
+ window1_abs()
+     {
+     int i, j;
+@@ -531,6 +543,7 @@
+ 
+ /* redraw screen incrementally */
+ 
++void
+ window1_inc(wd)
+     int wd;                     /* argument is earliest change */
+     {
+@@ -559,6 +572,7 @@
+ 
+ /* routine to move window downwards: scroll up or redraw as appropriate */
+ 
++void
+ window1_after()
+     {
+     int i, lflag;
+@@ -591,6 +605,7 @@
+ 
+ /* routine to remove the existing cursor */
+ 
++void
+ w_rmcurs()
+     {
+     register struct w_data *pw = pw0;
+@@ -609,6 +624,7 @@
+ /* called with w_p1 at starting char, curr_y, curr_x at starting coordinate         */
+ /* rewrites to end of screen if arg = 0, or only until line with cursor if arg = 1  */
+ 
++void
+ window2(arg)
+     int arg;
+     {
+@@ -794,6 +810,7 @@
+ 
+ /* routine to move cursor to current location and then call vt */
+ 
++void
+ vtm(arg)
+     int arg;
+     {
+@@ -807,6 +824,7 @@
+ /* routine to set reverse video and save cursor location */
+ /* first argument is char at cursor, 2nd is value for curs_crflag */
+ 
++void
+ w_makecurs(wc, crflag)
+     char wc;
+     short crflag;
+@@ -851,6 +869,7 @@
+ /* routine to type one character:  arguments are char and a */
+ /* "mark" bit.  If mark is set, the char is always retyped  */
+ 
++void
+ w_type(c, m)
+     char c;
+     int m;
+@@ -875,6 +894,7 @@
+ 
+ /* initialize display image */
+ 
++void
+ w_init()
+     {
+     short i, j;
+@@ -907,6 +927,7 @@
+ 
+ /* write separator lines between windows on screen */
+ 
++void
+ w_separators()
+     {
+     int i;
+@@ -929,6 +950,7 @@
+ /* put character followed by appropriate number of nulls for "other control function" */
+ /* if argument is 0, output filler chars only */
+ 
++void
+ putchar_d(c)
+     char c;
+     {
+@@ -942,6 +964,7 @@
+ 
+ /* put out appropriate number of filler chars for display function that scrolls (LF, etc.) */
+ 
++void
+ scroll_dly()
+     {
+     int i;
+@@ -952,6 +975,7 @@
+ /* move terminal cursor to stated y, x position */
+ /* uses incremental moves or absolute cursor position, whichever is shorter */
+ 
++void
+ w_move(y, x)
+     short y, x;
+     {
+@@ -993,6 +1017,7 @@
+ 
+ /* scroll screen: argument is count: + up, - down */
+ 
++void
+ w_scroll(count)
+     int count;
+     {
+@@ -1025,6 +1050,7 @@
+ /* clear line to left of curr_x */
+ /* if some chars nonblank, does erase from start of line */
+ 
++void
+ w_ebol()
+     {
+     short i, j;

app-editors/teco/teco-36_p19940820.ebuild

@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-gcc4.patch
 	"${FILESDIR}"/${PN}-warnings.patch
 	"${FILESDIR}"/${PN}-no-common.patch
+	"${FILESDIR}"/${PN}-void-functions.patch
 )
 
 src_prepare() {

app-emulation/lxd/files/lxd-4.0.1-clang.patch

@@ -0,0 +1,76 @@
+From c7ce94825871ea5d0946e92762e981354628b8ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber@ubuntu.com>
+Date: Mon, 22 Jun 2020 22:17:02 -0400
+Subject: [PATCH] lxd: Fix building with clang
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes #7573
+
+Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
+---
+ lxd/main_forksyscall.go |  8 --------
+ lxd/seccomp/seccomp.go  | 16 ++++++++--------
+ 2 files changed, 8 insertions(+), 16 deletions(-)
+
+diff --git a/lxd/main_forksyscall.go b/lxd/main_forksyscall.go
+index a304405c2e..14895b6ce0 100644
+--- a/lxd/main_forksyscall.go
++++ b/lxd/main_forksyscall.go
+@@ -34,12 +34,6 @@ extern void attach_userns_fd(int ns_fd);
+ extern int pidfd_nsfd(int pidfd, pid_t pid);
+ extern bool setnsat(int ns_fd, const char *ns);
+ 
+-static inline bool same_fsinfo(struct stat *s1, struct stat *s2,
+-			       struct statfs *sfs1, struct statfs *sfs2)
+-{
+-	return ((sfs1->f_type == sfs2->f_type) && (s1->st_dev == s2->st_dev));
+-}
+-
+ static bool chdirchroot_in_mntns(int cwd_fd, int root_fd)
+ {
+ 	ssize_t len;
+@@ -209,8 +203,6 @@ const char *ns_names[] = { "user", "pid", "uts", "ipc", "net", "cgroup", NULL };
+ 
+ static bool change_creds(int ns_fd, cap_t caps, uid_t nsuid, gid_t nsgid, uid_t nsfsuid, gid_t nsfsgid)
+ {
+-	__do_close int fd = -EBADF;
+-
+ 	if (prctl(PR_SET_KEEPCAPS, 1))
+ 		return false;
+ 
+diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
+index 8945fd9197..025efb3141 100644
+--- a/lxd/seccomp/seccomp.go
++++ b/lxd/seccomp/seccomp.go
+@@ -91,21 +91,21 @@ static int device_allowed(dev_t dev, mode_t mode)
+ {
+ 	switch (mode & S_IFMT) {
+ 	case S_IFCHR:
+-		if ((dev == makedev(0, 0))) // whiteout
++		if (dev == makedev(0, 0)) // whiteout
+ 			return 0;
+-		else if ((dev == makedev(5, 1))) // /dev/console
++		else if (dev == makedev(5, 1)) // /dev/console
+ 			return 0;
+-		else if ((dev == makedev(1, 7))) // /dev/full
++		else if (dev == makedev(1, 7)) // /dev/full
+ 			return 0;
+-		else if ((dev == makedev(1, 3))) // /dev/null
++		else if (dev == makedev(1, 3)) // /dev/null
+ 			return 0;
+-		else if ((dev == makedev(1, 8))) // /dev/random
++		else if (dev == makedev(1, 8)) // /dev/random
+ 			return 0;
+-		else if ((dev == makedev(5, 0))) // /dev/tty
++		else if (dev == makedev(5, 0)) // /dev/tty
+ 			return 0;
+-		else if ((dev == makedev(1, 9))) // /dev/urandom
++		else if (dev == makedev(1, 9)) // /dev/urandom
+ 			return 0;
+-		else if ((dev == makedev(1, 5))) // /dev/zero
++		else if (dev == makedev(1, 5)) // /dev/zero
+ 			return 0;
+ 	}
+ 

app-emulation/lxd/lxd-4.0.1.ebuild

@@ -67,6 +67,8 @@ QA_PREBUILT="/usr/lib/lxd/libdqlite.so.0.0.1
 EGO_PN="github.com/lxc/lxd"
 GOPATH="${S}/_dist" # this seems to reset every now and then, though
 
+PATCHES=( "${FILESDIR}"/lxd-4.0.1-clang.patch )
+
 common_op() {
 	local i
 	for i in dqlite raft; do

app-emulation/x48/files/x48-0.6.4-static.patch

@@ -0,0 +1,12 @@
+diff -Naur x48-0.6.4.orig/src/emulate.c x48-0.6.4/src/emulate.c
+--- x48-0.6.4.orig/src/emulate.c	2011-11-15 04:03:40.000000000 +0100
++++ x48-0.6.4/src/emulate.c	2020-06-23 21:30:30.895538239 +0200
+@@ -695,7 +695,7 @@
+   }
+ }
+ 
+-inline int
++static inline int
+ #ifdef __FunctionProto__
+ decode_8_thru_f(int op1)
+ #else

app-emulation/x48/files/x48-0.6.4-void_return.patch

@@ -0,0 +1,24 @@
+diff -Naur x48-0.6.4.orig/src/debugger.c x48-0.6.4/src/debugger.c
+--- x48-0.6.4.orig/src/debugger.c	2011-11-15 04:03:40.000000000 +0100
++++ x48-0.6.4/src/debugger.c	2020-06-23 21:33:16.071667987 +0200
+@@ -1528,7 +1528,7 @@
+   struct se *se_next;
+ };
+ 
+-char *
++void
+ #ifdef __FunctionProto__
+ get_stack (void)
+ #else
+diff -Naur x48-0.6.4.orig/src/x48_x11.c x48-0.6.4/src/x48_x11.c
+--- x48-0.6.4.orig/src/x48_x11.c	2011-11-15 04:03:40.000000000 +0100
++++ x48-0.6.4/src/x48_x11.c	2020-06-23 21:33:32.132680745 +0200
+@@ -3833,7 +3833,7 @@
+ 
+ int last_button = -1;
+ 
+-extern char *get_stack(void);
++extern void get_stack(void);
+ 
+ int
+ #ifdef __FunctionProto__

app-emulation/x48/x48-0.6.4-r2.ebuild

@@ -22,15 +22,15 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-libs/libXt"
 
-src_unpack() {
-	mkdir -p "${S}"
-	cd "${S}"
-	unpack ${A}
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-static.patch
+	"${FILESDIR}"/${P}-void_return.patch
+	)
+
+S=${WORKDIR}
 
 src_prepare() {
 	default
-	sed -i '698s/inline/static inline/' src/emulate.c || die
 	eautoreconf
 }
 

app-forensics/honggfuzz/honggfuzz-2.2-r1.ebuild

@@ -33,6 +33,12 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0-no-werror.patch
 )
 
+pkg_pretend() {
+	if tc-is-clang; then
+		die "${P} does not work on clang due to incomplete -fblock support: https://bugs.gentoo.org/729256. Please try gcc."
+	fi
+}
+
 src_prepare() {
 	default
 	tc-export AR CC

app-misc/beep/Manifest

@@ -1,2 +1 @@
-DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
 DIST beep-1.4.9.tar.gz 83154 BLAKE2B 073169ccb4919c17c0291951834fea682c87021f18562629013293432292750f6d6b3235e8882fa9cf26c9e055e1283cfa629c2e88e0f87a301b238c38380498 SHA512 46e6066cb4d9ad4a0c55a03bf5a2163426648ce3831fe1f7bafa2f02d0e407b50c52e58cc2b123c346df96e92b73d2458b473c3fb001d9a0d1470b7cf38cc35b

app-misc/beep/beep-1.3-r3.ebuild

@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="The advanced PC speaker beeper"
-HOMEPAGE="http://www.johnath.com/beep"
-SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
-IUSE="suid"
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-	"${FILESDIR}/${P}-CVE-2018-0492.patch"
-)
-
-pkg_setup() {
-	tc-export CC
-}
-
-src_install() {
-	dobin beep
-	if use suid; then
-		fowners :audio /usr/bin/beep
-		fperms 4710 /usr/bin/beep
-	else
-		fperms 0711 /usr/bin/beep
-	fi
-	unpack "./${PN}.1.gz"
-	doman "${PN}.1"
-	einstalldocs
-}

app-misc/beep/beep-1.4.9.ebuild

@@ -48,7 +48,7 @@ src_install() {
 	dobin beep
 	doman "${PN}.1"
 
-	if use suid ; then
+	if use suid; then
 		fowners :audio /usr/bin/beep
 		fperms 4710 /usr/bin/beep
 	else

app-text/recode/files/recode-3.6-recode.texi.patch

@@ -0,0 +1,11 @@
+--- a/doc/recode.texi	2020-06-23 07:43:20.959074594 -0000
++++ a/doc/recode.texi	2020-06-23 07:43:32.262338563 -0000
+@@ -3713,7 +3713,7 @@
+ between HTML and various other charsets.
+ 
+ Here is a list of those HTML variants which @code{recode} supports.
+-Some notes have been provided by François Yergeau @email{yergeau@@alis.com}.
++Some notes have been provided by Francois Yergeau @email{yergeau@@alis.com}.
+ 
+ @table @code
+ @item XML-standalone

app-text/recode/recode-3.6_p20-r1.ebuild

@@ -35,8 +35,9 @@ src_prepare() {
 
 	rm "${WORKDIR}"/debian/patches/series || die
 	epatch \
+		"${FILESDIR}/${MY_P}-recode.texi.patch" \
 		"${FILESDIR}/${MY_P}-gettextfix.diff" \
-		"${FILESDIR}"/${MY_P}-as-if.patch \
+		"${FILESDIR}/${MY_P}-as-if.patch" \
 		"${WORKDIR}"/debian/patches/*
 	sed -i '1i#include <stdlib.h>' src/argmatch.c || die
 

dev-cpp/waylandpp/files/waylandpp-0.2.7-fix-std-runtime_error.patch

@@ -0,0 +1,25 @@
+From 695c0881101435a57d24c84d04cbcb79eec49903 Mon Sep 17 00:00:00 2001
+From: Rechi <Rechi@users.noreply.github.com>
+Date: Sat, 18 Jan 2020 23:37:46 +0100
+Subject: [PATCH] [fix] add missing stdexcept include after 2d834a6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+fixes error: ‘runtime_error’ is not a member of ‘std’
+---
+ include/wayland-util.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/wayland-util.hpp b/include/wayland-util.hpp
+index 9cf5d04..1609651 100644
+--- a/include/wayland-util.hpp
++++ b/include/wayland-util.hpp
+@@ -28,6 +28,7 @@
+ 
+ #include <algorithm>
+ #include <memory>
++#include <stdexcept>
+ #include <string>
+ #include <typeinfo>
+ #include <utility>

dev-cpp/waylandpp/waylandpp-0.2.7.ebuild

@@ -32,6 +32,10 @@ DEPEND="${RDEPEND}
 	)
 	"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-std-runtime_error.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCUMENTATION=$(usex doc)

dev-db/redis/redis-5.0.8.ebuild

@@ -10,7 +10,7 @@ HOMEPAGE="https://redis.io"
 SRC_URI="http://download.redis.io/releases/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+jemalloc tcmalloc luajit test"
 RESTRICT="!test? ( test )"
 SLOT="0"

dev-erlang/eimp/Manifest

@@ -1,3 +1,4 @@
 DIST eimp-1.0.12.tar.gz 3476420 BLAKE2B 147b910aa65fd28a73799353df6ff653dc815c5fc4ad878e8611748d79bd19fbf453bb24604ecde8669d24bcba2ac843a0d127e26086f4c9cf889104d176372f SHA512 512570da35e398094bbe7c3eb68b769b6510dd8a52897f23a425600782463c3dd7d2fdca67bb97de1cb86d29cf3c50076e56fadd10a79bb466d56c7672f98795
 DIST eimp-1.0.14.tar.gz 3476416 BLAKE2B a2aa13cf128133cfb504b2879e02ab8b60ea617deaf12eca4bb7aa65063ecb092bc6284dd92084477aedbd7ca274c2a1ce92f0a7271cb1237fa1cd29ef8a19cc SHA512 4f5f8c8c54dfcb6df0cfbdd2ab67c940c701c0dfea11c5cf4c689458d514897ab32733e6d3f606e5f8aa111983dd6a6db950ed0b36c0607e712a27606d8f9ce4
+DIST eimp-1.0.15.tar.gz 3476420 BLAKE2B 09836d8fcb4ff653da37f3be52ae2f2ec930e88d49e774d4915202fe96bab2eb3374786e294ceafe0e97bade804fb70945011ef6d8c8d655fc8a480468c7aee1 SHA512 53038a71c5bb834cd22d1c6cffaf2fbeb09317f2faf69156f6e908f8e70f5322f19ae18ab27ea881dacc4b28c2795529c7e747a83c8ded9037487c2665ad0c41
 DIST eimp-1.0.9.tar.gz 3471343 BLAKE2B 672e14cda50917a431d5bb29ef127c6bdf026234a5aeb66777540cd59167b48cfa1f264fdd631ef09c33a5ec9817d6d13c9763eecc5b076431976700f3af0ea7 SHA512 a86bf4927cf1da8004f140861a86d358c953a4871af34aa4768877f2b0618918c5a95d557e8535ce1615e272bfc3c9f27275ad4e5f5365c91a4a381ac2463977

dev-erlang/eimp/eimp-1.0.15.ebuild

@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang Image Manipulation Process"
+HOMEPAGE="https://github.com/processone/eimp"
+SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-lang/erlang-17.1
+	>=dev-erlang/p1_utils-1.0.19
+	media-libs/gd[png,jpeg,webp]"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+
+src_test() {
+	mkdir -p .eunit/priv/bin || die
+	cp priv/bin/eimp .eunit/priv/bin/ || die
+	rebar_src_test
+}

dev-erlang/jose/Manifest

@@ -1 +1,2 @@
+DIST erlang-jose-1.10.1.tar.gz 279187 BLAKE2B 18b606e5a2fd93b96a26b989a52235af08bd925eb610a9010b4ff930c1feb50bf8143456bd6b4743b53342948185eb5e4d4df760f774fc4bce1dc6a11fb2acf6 SHA512 2887a1d43e212516b32a0a690d5a94e6a797b4802b21fa0a51cc4830790f56625575db38af8fb1c0f4cf4694740c6149eb75989cfbd51867af69c1b23b7ba8ee
 DIST erlang-jose-1.9.0.tar.gz 258407 BLAKE2B c6036e743b062cd18518537ffee03cc138f55f3973a2ab538410d362757747e2c8880a899326d494914068f36ffaf2bb902e83ba7899c3256d6cfc7b89f07156 SHA512 59f7123fe589c8e9bf0bab5a21089301d6b3a1c35316b9f530386bd0d9de8da8f5f956769ea6b1166c545a51d119668ed18db57e8adfa02e6f4327b01168db68

dev-erlang/jose/jose-1.10.1.ebuild

@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="JSON Object Signing and Encryption (JOSE) for Erlang and Elixir"
+HOMEPAGE="https://github.com/potatosalad/erlang-jose"
+SRC_URI="https://github.com/potatosalad/erlang-jose/archive/${PV}.tar.gz
+	-> erlang-${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-19.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( ALGORITHMS.md CHANGELOG.md README.md examples/KEY-GENERATION.md )
+
+# TODO: jose has test suite, but it require lots of dependencies. It may not be
+# TODO: urgent, but it would be nice to have those sooner or later.
+RESTRICT=test
+
+S="${WORKDIR}/erlang-${P}"
+
+src_prepare() {
+	# disable warnings_as_errors for erlang 23 compatibiltiy
+	# https://github.com/potatosalad/erlang-jose/issues/87
+	sed -i -e 's|warnings_as_errors||g' \
+		-e 's|debug_info,|debug_info|g' rebar.config
+	rebar_src_prepare
+}

dev-erlang/p1_utils/Manifest

@@ -1,3 +1,4 @@
 DIST p1_utils-1.0.13.tar.gz 56548 BLAKE2B a92aa78960673f2a52b5247dc48ea94e73e018f1a9504b57c15ebfb3b12eb9b6b5dd4e706782f4200cd35f07d3193c4cf07eff462bc74b4714d1e3da4d97077d SHA512 eb4fa41a46973c300b752efa273554e293c19235c3649166f1cb52d9512d0bfa3f032053a35ca10aec1d6594f352c386720ecb193233cebea226f45e0c0add34
 DIST p1_utils-1.0.16.tar.gz 63418 BLAKE2B f7384737ba2c758ef25aedf9b1ddbe870c858172db5ed37dd146eeda0640cd589f9176f946e6c53d04d1f3d5c711d9c58e3fdd66245b603e94d9b04ce72ba086 SHA512 f7e2ae20771cb7405092b194af4f63c5d25d5f7a245ee343994ce626d5e80626f94af1bf3ec75c3d102d10c8b64238e3f90437ec6a932d8fd22877f9d4764b6a
 DIST p1_utils-1.0.18.tar.gz 63459 BLAKE2B 6b08dd1dfd68a473e014cbf5ef98f74c92ab14b3e78d2dc31e5cf9b88e1f81c18a4850aaab46ff5d43b3200b9b93004cbc05ac633f1d92756edb4f5b28fe1d8c SHA512 e7719c090ece0b86ee674eaff28bf20402542730d7f25771f95a6c53e5ee727d82b856fa9d83857979cd1991f80620d4a6255231b6e0de332607f9b6a3d571a9
+DIST p1_utils-1.0.19.tar.gz 63649 BLAKE2B 0fe55dc6fdd436b5e77ad02bba923afe17cbac71374aee53a752739a93bb1d07c1ad85327e7c198cc442722a57928b750efd6d35f4a30cacb923045dd39e57c5 SHA512 bcc4b2abcd7d783d307e53b154da22bb548be05dd0636e455485423e8ab74acf097f1b3be58989dcdd5cc178746777b3062c332e73d2d9e4771973aa6e523376

dev-erlang/p1_utils/p1_utils-1.0.19.ebuild

@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit rebar
+
+DESCRIPTION="Erlang utility modules from ProcessOne"
+HOMEPAGE="https://github.com/processone/p1_utils"
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=dev-lang/erlang-17.1:="
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )

dev-java/java-config/Manifest

@@ -1,2 +1,2 @@
 DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-DIST java-config-2.3.tar.gz 26586 BLAKE2B 00fbc9bd606cb87bfde9f72837a062de540465a0299393016fc34543b89cf381a85b68ec5a884c0f76fe6b3188aa27498ed93e858187f2e51f6a23a2dcea7b67 SHA512 06e7c1ffe3fa0b903c5444ddcb9f72052773870c6543122440089a24bf0d8ec6c475e5f72a7ee9c3790432fdfeb786976af28e8aa7d18484168af16f5bb1b2ea
+DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4

dev-java/java-config/java-config-2.3.1.ebuild

@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # jython depends on java-config, so don't add it or things will break
 PYTHON_COMPAT=( python3_{6,7,8} )

dev-lang/mozart/Manifest

@@ -2,5 +2,5 @@ DIST mozart-1.4.0-gentoo-patchset-5.tar.gz 24700 BLAKE2B c3b14bd7d8a762b84a098a9
 DIST mozart-1.4.0-gentoo-patchset-6.tar.gz 25878 BLAKE2B 831fa3accc587c769ab40ae4289e45ca28171af572095b7c3b93b69e82ff4bcaeb425d68c7a76aa9b2724b610ba21020647b6d1e3aa525ce58edbc9446d88791 SHA512 5a292bcc81c8062ebd5a948b224e8131302fc61b60303b8e3257ed20e751d0a874303611aeba6d1aacddbf92ec611428e49c2c17bc1dff5e182d0198afe655bf
 DIST mozart-1.4.0.20080704-doc.tar.gz 4085020 BLAKE2B 33eaf57c91dd62d9aa79651095aa5d095086d76dfa16bd5f520962229338c00556fcf3ac01eca1769c687f990110e95fa887d56391346af780d55166708338a1 SHA512 25f8f4b603ae7f4ef054a79a2baa4e10074f8a95f762b75fd88480526fb073b5b4874c269d116a960017a9e7ef989dd9f41853b0ff76e08b2cad2de2090c2eb4
 DIST mozart-1.4.0.20080704-src.tar.gz 11848201 BLAKE2B 0ceeb7dbd3f6858d1a4fee76f2a99eeb3127a07fd31b6760748ac8b8b638c36caaa873154be6481c3dc4b5196ef04cb0c10be421bd87dc3bc4e6b29357622d8d SHA512 f1114662c8c603cc2ac530d4ea1d22a0581f6e1b4d5cb57ccf899b8051ea48dbcf2fa2b62173359a754367a5456a7cb121a208d6a246248207599b0470525229
-DIST mozart-2.0.1-gentoo-patchset-0.tar.gz 10888 BLAKE2B 2b41560021bec70bb60cfb4439b5db13a6e7ac7d7b1b7e1be6fd584f5e7de566db40f67fccec66f53a39150b1985a4e41a45cbd41aa8b77ff740fd60ce708f05 SHA512 082187494ef4c7a5655bde22d9b6df9c37fada5512cae2f15440dd298229e48777d1de4a2461f127279fa8f36da9900c78c6927fbde03bfa4d2006200923e33e
+DIST mozart-2.0.1-gentoo-patchset-1.tar.gz 39069 BLAKE2B 7490d13665314b3a998fb21bd8a342f262d92a395c3b0bbfa9a7813c044220c82ac02eb0103409127862c9bb4e4c44765b1228a7bdea2cb247492c94264f4fe0 SHA512 ce3cdb8ffebd95d6065439432905ad68b9cd8b86f58478092ab55df7ae7c72498a3e29bda462f3305aff6c99d010c45d786f905e2e906550ee61656ba122bbc6
 DIST mozart-2.0.1.tar.gz 2281261 BLAKE2B 7f071e9ec130a0b482b299f4dac15d64f632702d6ecf55b7af0993087064e533b4de80f77520a725f69f68648a9ce763c8c8826bb24e52af49eda8c3ccfba0b5 SHA512 a72a6fa68296d06af72327fd11310b3be152e5ad9a56f1fc4200ac7b89cd177e9a23a38c6721e1885d4f2ed0870065e919fb9fe3c9a2833fcd8e4ac0fd43aeb4

dev-lang/mozart/mozart-2.0.1.ebuild

@@ -5,7 +5,7 @@ EAPI=7
 
 inherit cmake-utils java-pkg-2 java-ant-2
 
-PATCHSET_VER="0"
+PATCHSET_VER="1"
 
 DESCRIPTION="Advanced development platform for intelligent, distributed applications"
 HOMEPAGE="http://mozart2.org/"
@@ -28,8 +28,8 @@ DEPEND="${RDEPEND}
 	dev-java/ant-core
 	>=virtual/jdk-1.8:=
 	|| (
-		dev-lang/scala
-		dev-lang/scala-bin
+		dev-lang/scala:2.12
+		dev-lang/scala-bin:0
 	)
 	test? ( dev-cpp/gtest:= )"
 
@@ -60,7 +60,7 @@ src_configure() {
 
 src_compile() {
 	if has_version "dev-lang/scala"; then
-		EANT_GENTOO_CLASSPATH="scala"
+		EANT_GENTOO_CLASSPATH="scala:2.12"
 	else
 		EANT_GENTOO_CLASSPATH="scala-bin"
 	fi

dev-lang/vala/vala-0.40.23.ebuild

@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.40"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 

dev-lang/vala/vala-0.46.10.ebuild

@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.46"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 

dev-lang/vala/vala-0.48.6.ebuild

@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.48"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~x86-linux"
 IUSE="test valadoc"
 RESTRICT="!test? ( test )"
 

dev-libs/boost/boost-1.73.0.ebuild

@@ -32,6 +32,7 @@ RESTRICT="test"
 RDEPEND="
 	!app-admin/eselect-boost
 	!dev-libs/boost-numpy
+	!<dev-libs/leatherman-1.12.0-r1
 	bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
 	icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
 	!icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )

dev-libs/popt/Manifest

@@ -1 +1,2 @@
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
+DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5

dev-libs/popt/popt-1.18.ebuild

@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal libtool
+
+DESCRIPTION="Parse Options - Command line parser"
+HOMEPAGE="https://github.com/rpm-software-management/popt"
+SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	default
+	sed -i -e 's:lt-test1:test1:' tests/testit.sh || die
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	dodoc CHANGES README
+	find "${ED}" -type f -name "*.la" -delete || die
+}

dev-libs/vala-common/vala-common-0.48.6.ebuild

@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=""

dev-ml/llvm-ocaml/llvm-ocaml-10.0.1.9999.ebuild

@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -38,24 +38,11 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -89,7 +76,7 @@ src_configure() {
 	)
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844

dev-ml/llvm-ocaml/llvm-ocaml-10.0.1_rc1.ebuild

@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-any-r1
+inherit cmake llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -38,24 +38,11 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -89,7 +76,7 @@ src_configure() {
 	)
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844

dev-ml/llvm-ocaml/llvm-ocaml-11.0.0.9999.ebuild

@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-any-r1
+inherit cmake-utils llvm llvm.org python-any-r1
 
 DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
@@ -38,24 +38,11 @@ BDEPEND="
 	test? ( dev-ml/ounit )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-any-r1_pkg_setup
 }
 
-src_prepare() {
-	# Python is needed to run tests using lit
-	python_setup
-
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake-utils_src_prepare
-}
-
 src_configure() {
 	local libdir=$(get_libdir)
 	local mycmakeargs=(
@@ -89,7 +76,7 @@ src_configure() {
 	)
 
 	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844

dev-python/clang-python/clang-python-10.0.1.9999.ebuild

@@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }

dev-python/clang-python/clang-python-10.0.1_rc1.ebuild

@@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }

dev-python/clang-python/clang-python-11.0.0.9999.ebuild

@@ -27,11 +27,6 @@ RDEPEND="
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	cd "${WORKDIR}" || die
-	default
-}
-
 python_test() {
 	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
 }

dev-python/lit/lit-10.0.1.9999.ebuild

@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@@ -34,6 +34,6 @@ src_prepare() {
 
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }

dev-python/lit/lit-10.0.1_rc1.ebuild

@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@@ -34,6 +34,6 @@ src_prepare() {
 
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }

dev-python/lit/lit-11.0.0.9999.ebuild

@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6..9} )
 
-inherit distutils-r1 llvm.org multiprocessing
+inherit distutils-r1 llvm.org
 
 DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
 HOMEPAGE="https://llvm.org/"
@@ -34,6 +34,6 @@ src_prepare() {
 
 python_test() {
 	local -x LIT_PRESERVES_TMP=1
-	./lit.py -j "${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" \
-		-vv tests || die
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
 }

dev-python/mypy/mypy-0.781.ebuild

@@ -27,8 +27,12 @@ IUSE="doc test"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/flake8[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}] )
+			>=dev-python/pytest-3.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-xdist-1.18[${PYTHON_USEDEP}]
+			>=dev-python/pytest-cov-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/psutil-5.4.0[${PYTHON_USEDEP}]
+			>=dev-python/lxml-4.1.1[${PYTHON_USEDEP}]
+			>=dev-python/py-1.5.2[${PYTHON_USEDEP}] )
 	doc? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]

dev-python/oslo-config/Manifest

@@ -1,2 +1,2 @@
 DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
-DIST oslo-config-8.0.2.tar.gz 148224 BLAKE2B 5f3bc55857a01429063a0c7afbce041f48952ca1db7bd732e83d40d68f86951db9bcdb79a80926c5b7ec747fde574817cc6a562c217b441b0bb61381d70ca4b6 SHA512 675ec0602cc8850e7a25733d24ead104a85541f09983924d90b829687fde22c5fe3947a67e0b8a024927b3fd40973cc7c144b26ba751cd86650ca210686ea8e5
+DIST oslo-config-8.0.3.tar.gz 147691 BLAKE2B 9af2a1ff399b52261561d268f6b9cc673629af572faadc736e851826ccf84ea8fcb8b8846b62f85671934f5214f289301157da7197dd5a15ad6e9ec1792bdb31 SHA512 09c49b0917d20c74e59efd6b8cca0394f98c337b075f916ae21f6072ce6f28a90a701a3f63f0737e4b3161cf4795fdb2be9b01091fd00828990cbc715683b0f4

dev-python/oslo-messaging/Manifest

@@ -1,2 +1,3 @@
 DIST oslo.messaging-10.2.0.tar.gz 255431 BLAKE2B 971f24845b4d0440fb600b459b4a41c94220e387cbe2ef16a5c93d72e0582116702254c4d8106f5f3f3a3435b1c5bfaceffbb1c6ed3e671f7c269fb6d5ca3cb3 SHA512 404aed31f2808de744d7fd141257aca3d2db2b65645eebfffa7edb364e50803621af98886dc60b46042e525a7a98a12f3208ba472dcf805524cd0defdd441060
 DIST oslo.messaging-12.1.0.tar.gz 253854 BLAKE2B 6db26884f69be59cecd904b8ca0edc44a7f4e6a50ada154f28bf3a2a431896345ea7981ad7b195c12abe3f4d78d259c036e18e5544d2564e04d373c7cf2575b0 SHA512 1649f3520b6785eb5bf0f68cf174c1f60f32675ab6fa1400997704e97df7b24dcd63de751ab2313b839619b4eb250612ea32996c6c3c9956f7145010ca38cba2
+DIST oslo.messaging-12.1.1.tar.gz 255540 BLAKE2B 54ab60244090d3602de9395ea4f6ffa4bfa78783642aecaf7bb37db62c1a5cb63d69c612d2d1085ef96611429a8c7b337ac1849d93ed857a2cb51bbae6265ed2 SHA512 0f55f2c21dfd5f83efbf53f8c0cfa65d8572166662a183998c896c61475a38c47ae6e2376c5a153049d2f91e3321d6a75accf4de4ef11b4ec8626b448c0637a9

dev-python/oslo-messaging/oslo-messaging-12.1.1.ebuild

@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Messaging API for RPC and notifications over different messaging transports"
+HOMEPAGE="https://pypi.org/project/oslo.messaging/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.messaging/oslo.messaging-${PV}.tar.gz"
+S="${WORKDIR}/oslo.messaging-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/futurist-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.37.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-2.5.2[${PYTHON_USEDEP}]
+	>=dev-python/kombu-4.6.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}

dev-python/ovs/Manifest

@@ -1,3 +1,2 @@
-DIST ovs-2.10.0.tar.gz 98548 BLAKE2B 9ab3ea02dbfab1622106ead1e19a96b279d73ee758fbdcfadcb50526b8652a80443c817513b0df92b78a6e788d7215386f18c5e9e59d71536cf481eac8b3a264 SHA512 9b7de41aceb2f3c08df765b97c5149cd66579f361b427b3bb6c24ab20cf922de688a82a99b1d98778311f15b37c73be2769a95b01c96db4fed122e272aab2adf
 DIST ovs-2.11.0.tar.gz 98933 BLAKE2B 8735cd4db64291790327fc1e8b144b76e4804472a99990488d57686c9eaf51ec1ee4cc0d4e1b0c3aaf979b547936c77cdb6f7656b0b16e16df45fe0d9b8c5f8d SHA512 104d9f783a1ff0bfe93fc17235c7a9d595fab5007ee3bb490ef064f7893756fdc4c7306c0b03f4c2fb5179efbb038ed163ca4de8c9c417426c6e157c0f17c39b
 DIST ovs-2.13.0.tar.gz 100450 BLAKE2B 943486bf0aad0e8e9eac96c85aeccb32fd36c60689623acc76175eafc286f4689142d6ea6953224e0a4ea8e4437c56738cb5b113286114de0898bf783cd49668 SHA512 7ec8980257ae87d24dbabc5900cf81253490bcfa0431f96b79280603da04a972fc536055bf532d2b251e03e007b49b34e8118b0f323e5fee05c116824d68562c

dev-python/ovs/metadata.xml

@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Openvsywitch python bindings
-	</longdescription>
 	<upstream>
 		<remote-id type="github">openvswitch/ovs</remote-id>
 		<remote-id type="pypi">ovs</remote-id>

dev-python/ovs/ovs-2.10.0-r1.ebuild

@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="OVS bindings for python."
-HOMEPAGE="https://github.com/openvswitch/ovs/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"

dev-python/ovs/ovs-2.13.0.ebuild

@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}

dev-python/stevedore/Manifest

@@ -1,4 +1,2 @@
 DIST stevedore-1.31.0.tar.gz 505482 BLAKE2B c69ecf61b32ab996f23aa913a9f226f64164b94e9420da8b7dd5a8ba568a228bd2f536052ab9378167fd2fe2e0d8d7b42515580a966eeffb5beeaf55dbba69ad SHA512 07b641b63766eddd094690acad81c1417a9721d785f81ca11da0ec2afed455d1beedfea5be4dcfd833d9379d650b193e26207ec0411d274bdf399ea2acd321a0
-DIST stevedore-1.32.0.tar.gz 510344 BLAKE2B 96de6598245e88900ba0f0bd69b976425fc5be2c783f32c551ebb2536dc5fde7fab18121947f3f9caa4d7d822372ad502d272285cc66368bfc39c566821a0160 SHA512 98c66b9ac827f69737cc2522029108831380b4bf4c633786d9819b52be930f6116ce5bfab58e724a2efad147830fcb6353409322fc5e01617d35d1c8aafb0259
-DIST stevedore-2.0.0.tar.gz 508206 BLAKE2B c8e8d1044d1af4e2d0366cd836c36783f49a97c54761070d0af3d7c31b7a3bbdc8d98dfadf2425b73b30d7a37b3bb5ca3cde71a6eea76513f9c565aa7c94511d SHA512 10b091749b638330703c256e8614a9519059edcaf109944a0ca04bda5c5fde0d9ab473dc8293cde809867dbd1c2a23cd96d0faaa1f7d802ad68aa0a5aa972a0e
 DIST stevedore-2.0.1.tar.gz 505248 BLAKE2B 2fee9467b70aa605ca89060e839a2c00deec571f15f014cb8118710e9221fef65ec15172d727dbafb5d5e2adf15ce0e94919804e2ec7ee72ae9e47afe2a6b88f SHA512 1efe46983975b1a0f176f847874c68dd91538fc3c029facbbf0f96891894176e0eeaf28c19e674baa9e9dae024deabae0555c846e36211a9be6cbba5e2ecd710

dev-python/stevedore/stevedore-1.32.0.ebuild

@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}

dev-python/stevedore/stevedore-2.0.0.ebuild

@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Manage dynamic plugins for Python applications"
-HOMEPAGE="https://github.com/openstack/stevedore https://pypi.org/project/stevedore/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests unittest
-distutils_enable_sphinx 'doc/source' \
-	'>=dev-python/openstackdocstheme-1.18.1' \
-	'>=dev-python/reno-2.5.0' \
-	'>=dev-python/sphinx-2.0.0'
-
-python_prepare_all() {
-	# Delete spurious data in requirements.txt
-	sed -e '/^pbr/d' -i requirements.txt || die
-	distutils-r1_python_prepare_all
-}

dev-python/stevedore/stevedore-2.0.1.ebuild

@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]

dev-util/android-sdk-update-manager/metadata.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>rich0@gentoo.org</email>
-</maintainer>
+        <!-- maintainer-needed -->
 </pkgmetadata>

dev-util/lldb/lldb-10.0.1.9999.ebuild

@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -43,21 +42,11 @@ BDEPEND="
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure

dev-util/lldb/lldb-10.0.1_rc1.ebuild

@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -43,21 +42,11 @@ BDEPEND="
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure

dev-util/lldb/lldb-11.0.0.9999.ebuild

@@ -4,8 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm llvm.org multiprocessing python-single-r1 \
-	toolchain-funcs
+inherit cmake llvm llvm.org python-single-r1 toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
@@ -43,21 +42,11 @@ BDEPEND="
 		sys-devel/lld )
 	${PYTHON_DEPS}"
 
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
 pkg_setup() {
 	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
 }
 
-src_prepare() {
-	# cmake eclasses suck by forcing ${S} here
-	CMAKE_USE_DIR=${S} \
-	S=${WORKDIR} \
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -87,7 +76,7 @@ src_configure() {
 
 		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
 		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+		-DLLVM_LIT_ARGS="$(get_lit_flags)"
 	)
 
 	cmake_src_configure

eclass/llvm.org.eclass

@@ -63,6 +63,8 @@ fi
 [[ ${PV} == ${_LLVM_MASTER_MAJOR}.* && ${_LLVM_SOURCE_TYPE} == tar ]] &&
 	die "${ECLASS}: Release ebuild for master branch?!"
 
+inherit multiprocessing
+
 
 # == control variables ==
 
@@ -167,6 +169,11 @@ llvm.org_set_globals() {
 		fi
 	fi
 
+	# === useful defaults for cmake-based packages ===
+
+	# least intrusive of all
+	CMAKE_BUILD_TYPE=RelWithDebInfo
+
 	_LLVM_ORG_SET_GLOBALS_CALLED=1
 }
 
@@ -174,6 +181,9 @@ llvm.org_set_globals() {
 # == phase functions ==
 
 EXPORT_FUNCTIONS src_unpack
+if ver_test -ge 10.0.1_rc; then
+	EXPORT_FUNCTIONS src_prepare
+fi
 
 # @FUNCTION: llvm.org_src_unpack
 # @DESCRIPTION:
@@ -217,3 +227,41 @@ llvm.org_src_unpack() {
 		fi
 	fi
 }
+
+# @FUNCTION: llvm.org_src_prepare
+# @DESCRIPTION:
+# Call appropriate src_prepare (cmake or default) depending on inherited
+# eclasses.  Make sure that PATCHES and user patches are applied in top
+# ${WORKDIR}, so that patches straight from llvm-project repository
+# work correctly with -p1.
+llvm.org_src_prepare() {
+	if declare -f cmake_src_prepare >/dev/null; then
+		# cmake eclasses force ${S} for default_src_prepare
+		# but use ${CMAKE_USE_DIR} for everything else
+		CMAKE_USE_DIR=${S} \
+		S=${WORKDIR} \
+		cmake_src_prepare
+	else
+		pushd "${WORKDIR}" >/dev/null || die
+		default_src_prepare
+		popd >/dev/null || die
+	fi
+}
+
+
+# == helper functions ==
+
+# @ECLASS-VARIABLE: LIT_JOBS
+# @USER_VARIABLE
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# Number of test jobs to run simultaneously.  If unset, defaults
+# to '-j' in MAKEOPTS.  If that is not found, default to nproc.
+
+# @FUNCTION: get_lit_flags
+# @DESCRIPTION:
+# Get the standard recommended lit flags for running tests, in CMake
+# list form (;-separated).
+get_lit_flags() {
+	echo "-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+}

games-board/gnuchess/Manifest

@@ -1,3 +1 @@
-DIST gnuchess-6.2.4.tar.gz 757985 BLAKE2B bbb83a9fe7a7ace155b869deebdb67474d6c23538e7852167e846d5570bcd878634b0b2576f3ee33407913976103c637d3b024a8b81f290325c88c84d573d85c SHA512 53546d3319cd6a7bc70be5cc11c29cf33c71b747de2244a7d8d4aff6b00318ad35ee0e27058b40a265c62ef02c188d2e34cba9bbf439306220796e7332904d42
-DIST gnuchess-6.2.5.tar.gz 782359 BLAKE2B d9ae979023ea6265e89a25223935df3847adfc52d46df2a9fe96700081f613f7817b4add22e3a63aa4e035adea9c1f4856cb1e9b80d751c3ee63818b5924c388 SHA512 f3f65a85eb4c93f6f10c7058bde7ee7f4a48c2f465b24a7cc0d5bcafe4df186b434ce23bf8c032d012efffba39c6c3c60ada484ff22d87114ce2be5dd0da6835
 DIST gnuchess-6.2.7.tar.gz 802863 BLAKE2B 2fea825cdf0e629b3c2e9965d16f432edff81ceac8e7fbfd99b7be93f7281f813b10b91a62b3823acbf8967af538b04d2d87f93abde4a580e659e1fbdc5966e9 SHA512 1ed9e9344fbfc8e78504290a44e2710acab53f211c4349cafb7b64cc9a1fa923fbef4b4cbe3dd96438049b1da21415db3eb81fe663a94551c30105207086e343

games-board/gnuchess/gnuchess-6.2.4.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
-SRC_URI="mirror://gnu/chess/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-src_configure() {
-	strip-flags # bug #199097
-	econf --without-readline # bug 491088
-}

games-board/gnuchess/gnuchess-6.2.5.ebuild

@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
-SRC_URI="mirror://gnu/chess/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-src_configure() {
-	strip-flags # bug #199097
-	econf --without-readline # bug 491088
-}

games-board/gnugo/files/gnugo-3.9.1-autotools.patch

@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -151,6 +151,7 @@
+ 
+ AC_PROG_CPP
+ AC_PROG_RANLIB
++AM_PROG_AR
+ 
+ dnl required since we use SUBDIRS in Makefile.am
+ AC_PROG_MAKE_SET

games-board/gnugo/files/gnugo-3.9.1-fno-common.patch

@@ -0,0 +1,25 @@
+--- a/engine/globals.c
++++ b/engine/globals.c
+@@ -136,6 +136,9 @@
+ 				 * move generation is enabled.
+ 				 */
+ 
++int meaningless_white_moves[BOARDMAX];
++int meaningless_black_moves[BOARDMAX];
++
+ float best_move_values[10];
+ int   best_moves[10];
+ float white_score;
+--- a/engine/liberty.h
++++ b/engine/liberty.h
+@@ -859,8 +859,8 @@
+ extern struct worm_data worm[BOARDMAX];
+ 
+ /* Unconditionally meaningless moves. */
+-int meaningless_black_moves[BOARDMAX];
+-int meaningless_white_moves[BOARDMAX];
++extern int meaningless_black_moves[BOARDMAX];
++extern int meaningless_white_moves[BOARDMAX];
+ 
+ /* Surround cache (see surround.c) */
+ 

games-board/gnugo/gnugo-3.9.1-r1.ebuild

@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A Go-playing program"
-HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0="
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-invalid-move.patch
-}
-
-src_configure() {
-	egamesconf \
-		$(use_with readline) \
-		--enable-cache-size=32
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}

games-board/gnugo/gnugo-3.9.1-r2.ebuild

@@ -1,7 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A Go-playing program"
 HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
@@ -14,15 +16,22 @@ IUSE="readline"
 
 RDEPEND="
 	readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0=
-"
+	>=sys-libs/ncurses-5.2-r3:0="
 DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-invalid-move.patch
 	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_with readline) \

kde-frameworks/plasma/files/plasma-5.71.0-access-expandedView.item.patch

@@ -0,0 +1,29 @@
+From 7f9e189d87c040a952533713ff48d32872e0eadd Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 7 Jun 2020 08:46:39 -0600
+Subject: [PATCH] Add property to access the ExpandableListItem loader's item
+
+---
+ .../plasmaextracomponents/qml/ExpandableListItem.qml        | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+index d9d0662ee..ed21ab8e4 100644
+--- a/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
++++ b/src/declarativeimports/plasmaextracomponents/qml/ExpandableListItem.qml
+@@ -261,6 +261,12 @@ Item {
+      */
+     property var customExpandedViewContent: actionsListComponent
+ 
++    /*
++     * The actual instance of the custom view content, if loaded
++     * @since 5.72
++     */
++    property alias customExpandedViewContentItem: expandedView.item
++
+     /*
+      * isBusy: bool
+      * Whether or not to display a busy indicator on the list item. Set to true
+-- 
+2.27.0
+

kde-frameworks/plasma/files/plasma-5.71.0-introduce-PlaceholderMessage.patch

@@ -0,0 +1,280 @@
+From e1475e090747088288b05279633d19f12ae257aa Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Fri, 19 Jun 2020 22:45:19 +0000
+Subject: [PATCH] Introduce PlaceholderMessage
+
+This is a clone of the Kirigami component that we can use in Plasma
+applets until we arrive at a solution for styling QQC2 items using the
+Plasma style (https://phabricator.kde.org/T13256).
+
+See dependent patches:
+- plasma-workspace: https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/73
+- bluedevil: https://invent.kde.org/plasma/bluedevil/-/merge_requests/1
+- print-manager: https://invent.kde.org/utilities/print-manager/-/merge_requests/1
+- plasma-vault: https://invent.kde.org/plasma/plasma-vault/-/merge_requests/3
+
+Merge request: https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
+---
+ .../qml/PlaceholderMessage.qml                | 237 ++++++++++++++++++
+ .../plasmaextracomponents/qml/qmldir          |   1 +
+ 2 files changed, 238 insertions(+)
+ create mode 100644 src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
+
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
+new file mode 100644
+index 000000000..958399a8f
+--- /dev/null
++++ b/src/declarativeimports/plasmaextracomponents/qml/PlaceholderMessage.qml
+@@ -0,0 +1,237 @@
++/*
++ *   Copyright 2020 Nate Graham <nate@kde.org>
++ *
++ *   This program is free software; you can redistribute it and/or modify
++ *   it under the terms of the GNU Library General Public License as
++ *   published by the Free Software Foundation; either version 2, or
++ *   (at your option) any later version.
++ *
++ *   This program is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *   GNU Library General Public License for more details
++ *
++ *   You should have received a copy of the GNU Library General Public
++ *   License along with this program; if not, write to the
++ *   Free Software Foundation, Inc.,
++ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
++ */
++
++import QtQuick 2.0
++import QtQuick.Layouts 1.12
++import QtQuick.Controls 2.12 as QQC2
++
++import org.kde.plasma.core 2.0 as PlasmaCore
++import org.kde.plasma.components 3.0 as PlasmaComponents3
++import org.kde.plasma.extras 2.0 as PlasmaExtras
++
++/**
++ * A placeholder message indicating that a list view is empty. The message
++ * comprises a label with lightened text, an optional icon above the text, and
++ * an optional button below the text which can be used to easily show the user
++ * what to do next to add content to the view.
++ *
++ * The top-level component is a ColumnLayout, so additional components items can
++ * simply be added as child items and they will be positioned sanely.
++ *
++ * Example usage:
++ *
++ * @code{.qml}
++ ** Shows how to use PlaceholderMessage to implement a "this view is empty" message
++ * import QtQuick 2.12
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ * ListView {
++ *     id: listView
++ *     model: [...]
++ *     delegate: [...]
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: listView.count == 0
++ *
++ *         text: "There are no items in this list"
++ *     }
++ * }
++ * @endcode
++ * @code{.qml}
++ ** Shows how to use PlaceholderMessage to implement a "here's how to proceed" message
++ * import QtQuick 2.12
++ * import QtQuick.Controls 2.12 as QQC2
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ * ListView {
++ *     id: listView
++ *     model: [...]
++ *     delegate: [...]
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: listView.count == 0
++ *
++ *         text: "Add an item to proceed"
++ *
++ *         helpfulAction: QQC2.Action {
++ *             icon.name: "list-add"
++ *             text: "Add item..."
++ *             onTriggered: {
++ *                 [...]
++ *             }
++ *         }
++ *     }
++ *     [...]
++ * }
++ * @endcode
++ * @code{.qml}
++ ** Shows how to use PlaceholderMessage to implement a "there was a problem here" message
++ * import org.kde.plasma.components 3.0 as PlasmaComponents3
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ * PlasmaComponents3.Page {
++ *     id: root
++ *     readonly property bool networkConnected: [...]
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: root.networkConnected
++ *
++ *         icon.name: "network-disconnect"
++ *         text: "Network disconnected; unable to load content"
++ *     }
++ * }
++ * @endcode
++ * @code{.qml}
++ * import org.kde.plasma.components 3.0 as PlasmaComponents3
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ ** Shows how to use PlaceholderMessage to implement a loading indicator
++ * PlasmaComponents3.Page {
++ *     id: root
++ *     readonly property bool loading: [...]
++ *     readonly property int completionStatus: [...]
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: root.loading
++ *
++ *         icon.name: "my-awesome-app-icon"
++ *         text: "Loading this awesome app"
++ *
++ *         PlasmaComponents3.ProgressBar {
++ *             Layout.preferredWidth: units.gridUnit * 20
++ *             value: root.completionStatus
++ *             from: 0
++ *             to: 100
++ *         }
++ *     }
++ * }
++ * @endcode
++ * @code{.qml}
++ * import QtQuick.Controls 2.12 as QQC2
++ * import org.kde.plasma.components 3.0 as PlasmaComponents3
++ * import org.kde.plasma.extras 2.0 as PlasmaExtras
++ *
++ ** Shows how to use PlaceholderMessage to implement a "Here's what you do next" button
++ * PlasmaComponents3.Page {
++ *     id: root
++ *
++ *     PlasmaExtras.PlaceholderMessage {
++ *         anchors.centerIn: parent
++ *         width: parent.width - (units.largeSpacing * 4)
++ *
++ *         visible: root.loading
++ *
++ *         helpfulAction: QQC2.Action {
++ *             icon.name: "list-add"
++ *             text: "Add item..."
++ *             onTriggered: {
++ *                 [...]
++ *             }
++ *         }
++ *     }
++ * }
++ * @endcode
++ * @since 5.72
++ */
++ColumnLayout {
++    id: root
++
++    /**
++     * text: string
++     * The text to show as a placeholder label
++     *
++     * Optional. Not setting any text is useful when you only want to display
++     * an icon, action button, and/or other custom content
++     *
++     * @since 5.72
++     */
++    property alias text: label.text
++
++    /**
++     * iconName: string
++     * The icon to show above the text label.
++     *
++     * Optional
++     * Falls back to `undefined` if the specified icon is not valid or cannot
++     * be loaded.
++     *
++     * @since 5.72
++     * @see Icon::source
++     */
++    property string iconName: string
++
++    /**
++     * helpfulAction: QtQuickControls2 Action
++     * An action that helps the user proceed. Typically used to guide the user
++     * to the next step for adding content or items to an empty view.
++     *
++     * Optional
++     *
++     * @since 5.72
++     */
++    property alias helpfulAction: actionButton.action
++
++    spacing: units.largeSpacing
++
++    PlasmaCore.IconItem {
++        visible: source != undefined
++        opacity: 0.5
++
++        Layout.alignment: Qt.AlignHCenter
++        Layout.preferredWidth: units.iconSizes.huge
++        Layout.preferredHeight: units.iconSizes.huge
++
++        source: root.iconName || null
++    }
++
++    PlasmaExtras.Heading {
++        id: label
++
++        visible: text.length > 0
++        opacity: 0.5
++
++        Layout.fillWidth: true
++        Layout.alignment: Qt.AlignHCenter
++        horizontalAlignment: Qt.AlignHCenter
++
++        level: 2
++
++        wrapMode: Text.WordWrap
++    }
++
++    PlasmaComponents3.Button {
++        id: actionButton
++
++        Layout.alignment: Qt.AlignHCenter
++
++        visible: action && action.enabled
++    }
++}
+diff --git a/src/declarativeimports/plasmaextracomponents/qml/qmldir b/src/declarativeimports/plasmaextracomponents/qml/qmldir
+index 4ba4ed7b7..6eb4af8a9 100644
+--- a/src/declarativeimports/plasmaextracomponents/qml/qmldir
++++ b/src/declarativeimports/plasmaextracomponents/qml/qmldir
+@@ -7,6 +7,7 @@ ExpandableListItem 2.0 ExpandableListItem.qml
+ Heading 2.0 Heading.qml
+ Paragraph 2.0 Paragraph.qml
+ PageRow 2.0 PageRow.qml
++PlaceholderMessage 2.0 PlaceholderMessage.qml
+ ScrollArea 2.0 ScrollArea.qml
+ Title 2.0 Title.qml
+ DescriptiveLabel 2.0 DescriptiveLabel.qml
+-- 
+2.27.0
+

kde-frameworks/plasma/plasma-5.71.0-r1.ebuild

@@ -61,6 +61,11 @@ DEPEND="${RDEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-access-expandedView.item.patch # KDE-bug #423093
+	"${FILESDIR}"/${P}-introduce-PlaceholderMessage.patch # KDE-bug #422684
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2-only OpenGL)

kde-plasma/bluedevil/Manifest

@@ -1,2 +1,2 @@
 DIST bluedevil-5.18.5.tar.xz 168016 BLAKE2B 06460bd1b40f70b7b6f3641ee3921819ee7c2137af906afb8ebc5a9ea3b3161bb8494b930eae95a18ec6aa8ce6191500421499a944fd9dbc9041a9a48a3a1492 SHA512 4e5e55626d02a7ae820a43e760397e3b221749cd940569d180a67adba141f9afce418f1cb07c9fb1e607757461317a76343b5c6b86b3940a96711be9b4b66323
-DIST bluedevil-5.19.1.tar.xz 168712 BLAKE2B c9e97919fef9e7034648df8cd04afbbc98b2f7e8791d01abdea054289e2e79473eb208a7f453351558ef01fa6bc6078bc168e02e82262eb2883ebc3de10ce2b6 SHA512 bcc4e3c8d9ce84e8938fcfba8aeec4a5eca4349a4bf4281445a7614c4a0846779b9faf9be38df6364111c0320f45f7770111bc3b15da908bf895f0f3779b3fd5
+DIST bluedevil-5.19.2.tar.xz 168344 BLAKE2B 9c61edf820366bbc56908d21cf3f8746d75b4718db387886ce5a8a8bebf6dfacf13c8b3a6d4d9ffd168c279afdf955c6b6bc973621372a497682eeea63b4b410 SHA512 827dc9ecc04ee8d385ff2c3eee2e8dce47551cd73ac82c2e8a050c596df2ea2657dcff3632f4bc2c7a1d993d61544ec3e42c307dd9f2bd06032cf265b51ed868

kde-plasma/bluedevil/bluedevil-5.19.2.ebuild

@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KFMIN=5.70.0
+KFMIN=5.71.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.14.2
 inherit ecm kde.org
@@ -38,3 +38,7 @@ DEPEND="
 RDEPEND="${DEPEND}
 	>=kde-plasma/kde-cli-tools-${PVCUT}:5
 "
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+)

kde-plasma/bluedevil/files/bluedevil-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch

@@ -0,0 +1,57 @@
+From 161c1b92bced7996e92026ff9ae503593f6590f6 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Sun, 14 Jun 2020 09:10:38 -0600
+Subject: [PATCH] Port applet to use PlasmaExtras.PlaceholderMessage
+
+The Kirigami version uses QQC2 elements which don't respect the plasma
+theme and color scheme, leading to thing slooking out of place
+especially when using a dark color theme or scheme.
+
+Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
+---
+ CMakeLists.txt                                        | 6 ------
+ src/applet/package/contents/ui/FullRepresentation.qml | 4 +---
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9067851..5ddce978 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,12 +33,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ find_package(KDED ${KF5_MIN_VERSION} REQUIRED)
+ find_package(SharedMimeInfo REQUIRED)
+ 
+-find_package(KF5Kirigami2 ${KF5_MIN_VERSION} CONFIG)
+-set_package_properties(KF5Kirigami2 PROPERTIES
+-    DESCRIPTION "A QtQuick based components set"
+-    TYPE RUNTIME
+-)
+-
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+diff --git a/src/applet/package/contents/ui/FullRepresentation.qml b/src/applet/package/contents/ui/FullRepresentation.qml
+index 5bd32f15..e77bf295 100644
+--- a/src/applet/package/contents/ui/FullRepresentation.qml
++++ b/src/applet/package/contents/ui/FullRepresentation.qml
+@@ -27,8 +27,6 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.plasma.components 3.0 as PlasmaComponents3
+ import org.kde.plasma.private.bluetooth 1.0 as PlasmaBt
+ 
+-import org.kde.kirigami 2.12 as Kirigami
+-
+ PlasmaComponents3.Page {
+ 
+     Action {
+@@ -99,7 +97,7 @@ PlasmaComponents3.Page {
+         // Not inside the ListView because we want the listview to be hidden
+         // when Bluetooth is disabled, yet still show an "Enable Bluetooth"
+         // message
+-        Kirigami.PlaceholderMessage {
++        PlasmaExtras.PlaceholderMessage {
+             anchors.centerIn: parent
+             anchors.left: parent.left
+             anchors.right: parent.right
+-- 
+2.27.0
+

kde-plasma/breeze-grub/Manifest

@@ -1,2 +1,2 @@
 DIST breeze-grub-5.18.5.tar.xz 3138804 BLAKE2B 236f590f19df0a8faf28bef3dfc0a555434902ff284a978576d67e0f7f2076f42d3cca8283d3b979cc3d7afddd1b50a2cde09dd3a23056798d7a6ad7c6db9635 SHA512 969154c602cbd7b334dd48550eb53cbffce16b355aaf971c6b5b372ac43b42aba507bc0e972f0de0051f34b75c80ac295b4f3ef8e64d5762b56a7d0a8d216d69
-DIST breeze-grub-5.19.1.tar.xz 3155772 BLAKE2B 0af9d473bc6c6b76d634aa9e96dbec96b0e3b0ce23659313ee761d15a21b6fa401dc0c1b25a5827770ffa2948d15fc4af8a06274412e99b08cf1b5006c875939 SHA512 798cf5baf5d5fcd59dedbf1b4080b7394fb0cc468d65568ea579d774c655f4910f6c932cb07a8accaa2843a37bf2803c8a3f0bc5115622ecb1639ab96355bed0
+DIST breeze-grub-5.19.2.tar.xz 3148832 BLAKE2B 7913d0ee2199a9813fd11e70981fd98a1cc2bcec0e66cdc565c3197274bf821398a080227a24e3a486128bc3b1a30f0f90ee60148725fc1c61bcfae0b7aa242d SHA512 21018bb07d667a9565c48c2aec624feb21372ce5abb98ac0ef907b20fcee56b1f0730c683393973449f7fcbbeb177b479ee4291cd0a54904eba7f14019c39f6d