gentoo resync : 18.05.2019

40 files changed, 598 insertions, 560 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index abcafdef7742..8854aa5ca7ef 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bfm/Manifest b/app-misc/bfm/Manifest
deleted file mode 100644
index 00bb0aae2a3a..000000000000
--- a/app-misc/bfm/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.2-r2-build.xml 2020 BLAKE2B 7432c22c7d0ba7b4297455724d365e95ebbc1f0470c06b83539c93275e1cbe281ada6be7cf3578a783782be4911be2bc094a5d36d1343c1e355d4d5e024964bf SHA512 422208eb70459b94b6d5eb831c5796cfe178b2042dd6aee4fc0c1ed15949b46eac5e817460ba3391fbaad7f287e6260f6ed436e49d84ab41fac2453518aae6a4
-AUX 1.2-r2-package.patch 10235 BLAKE2B f767f00a81b8ffe5c831604f2ecc7b6c0b7f3bb86ff22925c4a8e5c2fc2010947c1f5775cb5da857fd66f5d6bd70f5a9c031c1ae59ddfe89ebdd9b9eb2ca5919 SHA512 9b754c0dac3f7f8763acc80ae9fe618dca32df319dc2b928ec856debc4f539f6f39fa6dde92eb871dcccb9197f7aecbac6b65b7705d476c0b73e6611e979dbce
-DIST bfm-1.2.tar.gz 193924 BLAKE2B 8d398188333519b581a8eb4e38fc123672ba0a68077347f4049e5f0ec9dc06010b5e6003500452dad71deb67fe97e5ea896ec9ab425eca82022a12e03320b3ec SHA512 39a9a250a8f3cf3b148c31a9fa5a89ac9a5873884dc1a98840b2f21879b30bd7cc6cc5dd9c5f7e657090a56276dbef2a72594e095aec8c05f3e003f89e91daee
-EBUILD bfm-1.2-r2.ebuild 1342 BLAKE2B ba316b23f2aa3d0885c791decef0ceadbf15e56933a6ab4f0cd2a322b946576fb9bae58eda0a34798f44a0abcf49452ce0e1d7d23070adda6490a944a1320a18 SHA512 847c1da49ca1d39301a46fc522f8c1c2143cff3ba613413a3aba8c624908aef2401931285b1a003be73bcd7610f6b94bd9a84351fd1fbb74718e952167f5d677
-MISC metadata.xml 550 BLAKE2B df05e7ad2cc4aca624ad2a377fd7e555cb6c5c600b2860558628746ae6361649b0dcdb4e76a4740a4b37e3bfa91b2debbd8019db1a87caa804bee552461e9283 SHA512 755c28c22ed330af89b04ee96ed3912016dc473813b8730bca2eea7548c4e9f4953a7f645512e46627b4e9a6bddb243fe8e41a4a489325a4bd13209b4d83cfdd
diff --git a/app-misc/bfm/bfm-1.2-r2.ebuild b/app-misc/bfm/bfm-1.2-r2.ebuild
deleted file mode 100644
index b28cee6a8636..000000000000
--- a/app-misc/bfm/bfm-1.2-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="File manager and first person shooter written in Java3D, shoot to remove files"
-HOMEPAGE="http://bfm.webhop.net"
-SRC_URI="http://bfm.webhop.net/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-CDEPEND="dev-java/sun-java3d-bin:0"
-
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	${CDEPEND}"
-
-java_prepare() {
-	cp "${FILESDIR}"/${PVR}-build.xml ./build.xml || die
-
-	mkdir lib || die
-	pushd lib
-		java-pkg_jar-from sun-java3d-bin
-	popd
-
-	epatch "${FILESDIR}"/${PVR}-package.patch
-
-	mkdir -p net/webhop/bfm || die
-	mv src/* net/webhop/bfm/ || die
-}
-
-EANT_DOC_TARGET="docs"
-
-src_install() {
-	local java3d="sun-java3d-bin"
-
-	java-pkg_dojar dist/${PN}.jar
-	java-pkg_dolauncher ${PN} --main net.webhop.bfm.Bfm
-
-	insinto /etc/bfm
-	doins "${S}/bfm.conf"
-
-	if use doc; then
-		dodoc README ChangeLog bindings NEWS
-		java-pkg_dohtml -r docs/*
-	fi
-
-	use source && java-pkg_dosrc src/*
-}
-
-pkg_postinst() {
-	elog "A system wide config file has been installed to /etc/bfm/bfm.conf"
-	elog "Copy the file to ~/.bfm/bfm.conf to set local settings"
-	echo
-	ewarn "Be sure to run bfm in safe mode if you don't want to delete files"
-}
diff --git a/app-misc/bfm/files/1.2-r2-build.xml b/app-misc/bfm/files/1.2-r2-build.xml
deleted file mode 100644
index 3c056688129d..000000000000
--- a/app-misc/bfm/files/1.2-r2-build.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="bfm" default="jar">
-	<!-- some properties -->
-	<property name="src.dir" value="net" />
-	<property name="build.dir" value="build" />
-	<property name="docs.dir" value="docs" />
-	<property name="dist.dir" value="dist" />
-	<property name="lib.dir" value="lib" />
-	<property name="jarfile" value="${dist.dir}/${ant.project.name}.jar" />
-	<property name="target.jdk" value="1.4" />
-
-	<!-- init -->
-	<target name="init">
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${docs.dir}" />
-	</target>	
-
-	<!-- classpath -->
-	<path id="refcp">
-                <fileset dir="${lib.dir}">
-                        <include name="**/*.jar" />
-                </fileset>
-        </path>
-	
-	<!-- compile everything -->
-	<target name="compile" depends="init">
-		<mkdir dir="${build.dir}" />
-		<javac srcdir="${src.dir}" 
-			destdir="${build.dir}"
-			source="${target.jdk}"
-			target="${target.jdk}"
-			classpathref="refcp" />
-
-		<copy todir="${build.dir}">
-			<fileset file="${src.dir}/webhop/bfm/data" />
-		</copy>
-		<copy todir="${build.dir}/net/webhop/bfm/data">
-			<fileset dir="${src.dir}/webhop/bfm/data" />
-		</copy>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar" depends="compile">
-		<jar jarfile="${jarfile}" basedir="${build.dir}"
-			manifest="${src.dir}/webhop/bfm/data/manifest" />
-	</target>
-	
-	<!-- generate javadocs -->
-	<target name="docs" depends="init">
-		<javadoc sourcepath="."
-			packagenames="*"
-       		destdir="${docs.dir}"
-       		author="true"
-       		version="true"
-       		use="true"
-       		windowtitle="${ant.project.name} API" />
-	</target>
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${docs.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-
-        <!-- zip the sources -->
-        <target name="sourcezip">
-		<zip destfile="${dist.dir}/${ant.project.name}-src.zip">
-                        <zipfileset dir="${src.dir}" />
-                </zip>
-        </target>
-
-</project>
diff --git a/app-misc/bfm/files/1.2-r2-package.patch b/app-misc/bfm/files/1.2-r2-package.patch
deleted file mode 100644
index 7b3db3a4415d..000000000000
--- a/app-misc/bfm/files/1.2-r2-package.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-diff -urN a/src/Bfm.java b/src/Bfm.java
---- a/src/Bfm.java	2005-02-22 03:07:39.000000000 +0100
-+++ b/src/Bfm.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import java.awt.*;

- import javax.swing.*;

- import com.sun.j3d.utils.universe.*;

-diff -urN a/src/Blood.java b/src/Blood.java
---- a/src/Blood.java	2005-01-08 23:45:41.000000000 +0100
-+++ b/src/Blood.java	2013-06-10 08:37:16.978094948 +0200
-@@ -26,6 +26,8 @@
-     A big thank to Andrew for letting us use his code!
- */
- 
-+package net.webhop.bfm;
-+
- import javax.media.j3d.*;
- import javax.vecmath.*;
- import com.sun.j3d.utils.image.*;
-diff -urN a/src/DroppedDynamite.java b/src/DroppedDynamite.java
---- a/src/DroppedDynamite.java	2004-12-31 14:23:44.000000000 +0100
-+++ b/src/DroppedDynamite.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

- import javax.vecmath.*;

-diff -urN a/src/Dynamite.java b/src/Dynamite.java
---- a/src/Dynamite.java	2005-02-18 21:24:29.000000000 +0100
-+++ b/src/Dynamite.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

- import javax.vecmath.*;

-diff -urN a/src/Explotion.java b/src/Explotion.java
---- a/src/Explotion.java	2005-02-20 23:55:12.000000000 +0100
-+++ b/src/Explotion.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+package net.webhop.bfm;
-+
- import com.sun.j3d.utils.geometry.*;
- import javax.media.j3d.*;
- import javax.vecmath.*;
-diff -urN a/src/FSDefault.java b/src/FSDefault.java
---- a/src/FSDefault.java	2005-01-04 16:02:08.000000000 +0100
-+++ b/src/FSDefault.java	2013-06-10 08:37:16.978094948 +0200
-@@ -20,6 +20,8 @@
- /* FS stands for FileShape but is actually an transformgroup

- 	 containing the visuall shape of the FileObjet*/

- 

-+package net.webhop.bfm;

-+

- import java.awt.*;

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

-diff -urN a/src/FSDocument.java b/src/FSDocument.java
---- a/src/FSDocument.java	2005-01-04 16:02:08.000000000 +0100
-+++ b/src/FSDocument.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import java.awt.*;

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

-diff -urN a/src/FSPicture.java b/src/FSPicture.java
---- a/src/FSPicture.java	2005-02-22 02:29:54.000000000 +0100
-+++ b/src/FSPicture.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import java.awt.*;

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

-diff -urN a/src/FSVideo.java b/src/FSVideo.java
---- a/src/FSVideo.java	2005-01-04 16:02:08.000000000 +0100
-+++ b/src/FSVideo.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import java.awt.*;

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

-diff -urN a/src/FileObject.java b/src/FileObject.java
---- a/src/FileObject.java	2005-02-20 23:55:12.000000000 +0100
-+++ b/src/FileObject.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import java.awt.*;

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

-diff -urN a/src/GrapplingHook.java b/src/GrapplingHook.java
---- a/src/GrapplingHook.java	2005-01-03 06:03:50.000000000 +0100
-+++ b/src/GrapplingHook.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

- import javax.vecmath.*;

-diff -urN a/src/Hud.java b/src/Hud.java
---- a/src/Hud.java	2005-02-21 19:14:18.000000000 +0100
-+++ b/src/Hud.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+package net.webhop.bfm;
-+
- import com.sun.j3d.utils.geometry.*;
- import java.awt.*;
- import javax.media.j3d.*;
-diff -urN a/src/OpenDialog.java b/src/OpenDialog.java
---- a/src/OpenDialog.java	2005-02-21 18:36:44.000000000 +0100
-+++ b/src/OpenDialog.java	2013-06-10 08:37:16.978094948 +0200
-@@ -16,6 +16,9 @@
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-+
-+package net.webhop.bfm;
-+
- import javax.swing.plaf.*;
- import java.awt.*;
- import java.awt.event.*;
-diff -urN a/src/Pattern.java b/src/Pattern.java
---- a/src/Pattern.java	2004-12-31 14:22:27.000000000 +0100
-+++ b/src/Pattern.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+package net.webhop.bfm;
-+
- import javax.vecmath.*;
- 
- public abstract class Pattern {
-diff -urN a/src/PatternCircle.java b/src/PatternCircle.java
---- a/src/PatternCircle.java	2004-12-31 14:22:27.000000000 +0100
-+++ b/src/PatternCircle.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+package net.webhop.bfm;
-+
- import javax.vecmath.*;
- 
- public class PatternCircle extends Pattern {
-diff -urN a/src/PhysicsHandler.java b/src/PhysicsHandler.java
---- a/src/PhysicsHandler.java	2005-02-21 18:36:44.000000000 +0100
-+++ b/src/PhysicsHandler.java	2013-06-10 08:37:16.978094948 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import javax.media.j3d.*;

- import javax.vecmath.*;

- import java.io.*;

-diff -urN a/src/Player.java b/src/Player.java
---- a/src/Player.java	2005-02-21 18:30:54.000000000 +0100
-+++ b/src/Player.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+package net.webhop.bfm;
-+
- import com.sun.j3d.utils.universe.*; 
- import javax.media.j3d.*;
- import javax.vecmath.*;
-diff -urN a/src/Rocket.java b/src/Rocket.java
---- a/src/Rocket.java	2004-12-31 14:22:27.000000000 +0100
-+++ b/src/Rocket.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

- import javax.vecmath.*;

-diff -urN a/src/RocketLauncher.java b/src/RocketLauncher.java
---- a/src/RocketLauncher.java	2005-01-08 01:22:40.000000000 +0100
-+++ b/src/RocketLauncher.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

- import javax.vecmath.*;

-diff -urN a/src/Room.java b/src/Room.java
---- a/src/Room.java	2005-02-20 23:55:12.000000000 +0100
-+++ b/src/Room.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import javax.media.j3d.*;

- import javax.vecmath.*;

- import java.io.*;

-diff -urN a/src/RoomObject.java b/src/RoomObject.java
---- a/src/RoomObject.java	2005-02-20 23:55:12.000000000 +0100
-+++ b/src/RoomObject.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+package net.webhop.bfm;
-+
- import javax.media.j3d.*;
- 
- public abstract class RoomObject extends BranchGroup {
-diff -urN a/src/Shotgun.java b/src/Shotgun.java
---- a/src/Shotgun.java	2005-01-08 01:22:40.000000000 +0100
-+++ b/src/Shotgun.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

- import javax.vecmath.*;

-diff -urN a/src/SniperRifle.java b/src/SniperRifle.java
---- a/src/SniperRifle.java	2005-02-20 18:16:14.000000000 +0100
-+++ b/src/SniperRifle.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

- import javax.vecmath.*;

-diff -urN a/src/Spear.java b/src/Spear.java
---- a/src/Spear.java	2005-01-03 02:00:41.000000000 +0100
-+++ b/src/Spear.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

- import javax.vecmath.*;

-diff -urN a/src/Wall.java b/src/Wall.java
---- a/src/Wall.java	2005-01-03 20:40:55.000000000 +0100
-+++ b/src/Wall.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- */

- 

-+package net.webhop.bfm;

-+

- import java.awt.*;

- import com.sun.j3d.utils.geometry.*;

- import javax.media.j3d.*;

-diff -urN a/src/Weapon.java b/src/Weapon.java
---- a/src/Weapon.java	2005-02-21 18:36:44.000000000 +0100
-+++ b/src/Weapon.java	2013-06-10 08:37:16.974761615 +0200
-@@ -17,6 +17,8 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
-+package net.webhop.bfm;
-+
- import javax.media.j3d.*;
- import javax.vecmath.*;
- import com.sun.j3d.utils.picking.*;
diff --git a/app-misc/bfm/metadata.xml b/app-misc/bfm/metadata.xml
deleted file mode 100644
index 46e235531ce3..000000000000
--- a/app-misc/bfm/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-
-<longdescription>
-	BFM, the Brutal File Manager is a combined file manager and first
-	person shooter game. The basic idea is to represent different folders
-	on your computer as rooms in a 3D environment. Then, armed to your
-	teeths you go through these rooms and delete files by shooting at them.
-</longdescription>
-
-</pkgmetadata>
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index cb1ab93c2fe8..17c59e1e387e 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,4 +1,7 @@
+AUX ckb-0.4.0-modprobe.patch 3049 BLAKE2B a144c5f7c3f1e8871fa4074f5cd36ba9b6664ba1047c8fc2b8a4b32b1b717ebe430b4a761c50b022684eafabcaed6c9af2f8dcc1ff91da53dc475e7fffab42e8 SHA512 7979cb591fa3190667cfd73e4d2e8b8a7fa894e07138f2bf7da841df3f739cbb2ced1f57c90383f0376a721b3fa02b56650845e01970ecee0e2000460f75dd22
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
 DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
+DIST ckb-0.4.0.tar.gz 838586 BLAKE2B 42d786d1934cce6bb082ba4c9f7081401153fa2bd209f290659cfd42787ef69fad9ad86c35df973f1934a03699a1472aa2a1ceb8ef70f46316558e764e5cd88c SHA512 81058d1e31e7328dac1b3a83cb443b9d9f29593e872d189766c1dfe8b502965fd9ea7a962423e94d5053c99d8dd8c50bd98638c11631a2ca586fb9ade700284f
 EBUILD ckb-0.2.9-r1.ebuild 1188 BLAKE2B 31bd8b6247e0f3615b9f2a770e60651ebc3962390c1fb73c39138269acfd9daf30845c70a04c123a358fe52bef07933c618e748076a28bc3b7b79375374779bd SHA512 18531d54b89558b00ada031fd161f96f56105ace63b300db85aa699408184668aab56a9b21fec7c214df232525c5bbe28097aefe3bf7f1b63c650ffa0068f644
-MISC metadata.xml 241 BLAKE2B 53b81bd5f392373de9734e1bf97c56251d03f1e8fd925dc2a85ac14aef11ced9bcfaad9e469e7a1548edc92e5562b4ed631d699e1398d314320eed76446a8ead SHA512 dad8f3d5c83cf60831c21d441b8d9a1bf4941c2c5b56697ab55ade147394f83db181f3de21f5c35d8f70eb1ed80e55633489551bdb53ef27146447763b156d4c
+EBUILD ckb-0.4.0.ebuild 929 BLAKE2B b29439748d07eaf2de1b48f473df25edeea66e460fa3770d024a13b8f3fe51d2586a7eb2944bc4d4560b6eb68c93182f5a8b15147b498d9fd4c12e7773a14d1f SHA512 79751bab8d45a33cbcadb17043623516a2ccd8dad6977e05d62564ecf2b19d7d387bda283b216c90a3207f9f84dcfbce431f49853266be294403e4593eedaea3
+MISC metadata.xml 319 BLAKE2B 413fd0ee948a3bf39044251e819bbf2e10c2896b857b8079a23fe46d8639ddcc7c1c7289c8d3a6f8b9a82cb05e65b38298fabe4359c27497a7aced8fa97d276f SHA512 a878c93cd07a39758b418d7884df552a6741805d148959487d0b0114fb6e5476a718b637b02526310b810e153b0e027abafef14d4e3fd981e1ba1ba88bb1fda2
diff --git a/app-misc/ckb/ckb-0.4.0.ebuild b/app-misc/ckb/ckb-0.4.0.ebuild
new file mode 100644
index 000000000000..a0ae03736993
--- /dev/null
+++ b/app-misc/ckb/ckb-0.4.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop cmake-utils systemd
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	>=dev-libs/quazip-0.7.2[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	virtual/libudev:=
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${P}-modprobe.patch" )
+S="${WORKDIR}/${PN}-next-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_UPDATER=yes
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-misc/ckb/files/ckb-0.4.0-modprobe.patch b/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
new file mode 100644
index 000000000000..31dc3303b328
--- /dev/null
+++ b/app-misc/ckb/files/ckb-0.4.0-modprobe.patch
@@ -0,0 +1,72 @@
+---
+ src/daemon/input_linux.c | 21 ++++++++++++++-------
+ src/gui/mainwindow.cpp   | 14 ++++++++------
+ 2 files changed, 22 insertions(+), 13 deletions(-)
+
+diff --git a/src/daemon/input_linux.c b/src/daemon/input_linux.c
+index 0391243e..8489f5b5 100644
+--- a/src/daemon/input_linux.c
++++ b/src/daemon/input_linux.c
+@@ -55,13 +55,20 @@ int uinputopen(struct uinput_user_dev* indev, int mouse){
+ ///
+ /// Some tips on using [uinput_user_dev in](http://thiemonge.org/getting-started-with-uinput)
+ int os_inputopen(usbdevice* kb){
+-    /// First check whether the uinput module is loaded by the kernel.
+-    ///
+-    // Load the uinput module (if it's not loaded already)
+-    if(system("modprobe uinput") != 0) {
+-        ckb_fatal("Failed to load uinput module\n");
+-        return 1;
++    /// Let's see if uinput is already available
++    int fd = open("/dev/uinput", O_RDWR);
++    if(fd < 0){
++        fd = open("/dev/input/uinput", O_RDWR);
++    }
++
++    // If not available, load the module
++    if(fd < 0){
++        if(system("modprobe uinput") != 0) {
++            ckb_fatal("Failed to load uinput module\n");
++            return 1;
++        }
+     }
++    close(fd);
+ 
+     if(IS_SINGLE_EP(kb)) {
+         kb->uinput_kb = 0;
+@@ -79,7 +86,7 @@ int os_inputopen(usbdevice* kb){
+     indev.id.product = kb->product;
+     indev.id.version = kb->fwversion;
+     // Open keyboard
+-    int fd = uinputopen(&indev, 0);
++    fd = uinputopen(&indev, 0);
+     kb->uinput_kb = fd;
+     if(fd <= 0)
+         return 0;
+diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
+index 968764e7..1eb95bda 100644
+--- a/src/gui/mainwindow.cpp
++++ b/src/gui/mainwindow.cpp
+@@ -282,14 +282,16 @@ void MainWindow::updateVersion(){
+         if(kextstatOut.isEmpty())
+             daemonWarning.append(tr("<br /><b>Warning:</b> System Extension by \"Fumihiko Takayama\" is not allowed in Security & Privacy. Please allow it and then unplug and replug your devices."));
+ #elif defined(Q_OS_LINUX)
+-            QProcess modprobe;
+-            modprobe.start("modprobe", QStringList("uinput"));
++            if(!(QFileInfo("/dev/uinput").exists() || QFileInfo("/dev/input/uinput").exists())){
++                QProcess modprobe;
++                modprobe.start("modprobe", QStringList("uinput"));
+ 
+-            if(!modprobe.waitForFinished())
+-                qDebug() << "Modprobe error";
++                if(!modprobe.waitForFinished())
++                    qDebug() << "Modprobe error";
+ 
+-            if(modprobe.exitCode())
+-                daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
++                if(modprobe.exitCode())
++                    daemonWarning.append(tr("<br /><b>Warning:</b> The uinput module could not be loaded. If this issue persists after rebooting, compile a kernel with CONFIG_INPUT_UINPUT=y."));
++            }
+ #endif
+         settingsWidget->setStatus(tr("No devices connected") + daemonWarning);
+     }
diff --git a/app-misc/ckb/metadata.xml b/app-misc/ckb/metadata.xml
index 2a82acaed1c4..dd1c6d1b01c8 100644
--- a/app-misc/ckb/metadata.xml
+++ b/app-misc/ckb/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ccMSC/ckb</remote-id>
 	</upstream>
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index c5d6b20f0735..b906fbf94db1 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -19,5 +19,5 @@ DIST elasticsearch-oss-7.0.0-no-jdk-linux-x86_64.tar.gz 68788144 BLAKE2B 29206b2
 EBUILD elasticsearch-5.6.16.ebuild 1686 BLAKE2B 45ba9183eacdc9e25a9c640ea98a6c4bcaaa6894ac1fcf87874fa70205677a4a4991fe81b52934ab9b0e6243d967b653ded4c27ab157491eb6671e08855c3b31 SHA512 9198ef6590d77ca6817e504ee846a80aa2b2a0a440f57786fa63f3b2332480dc630207474c0e5d859dbb2c6a035f9db3a2f3a8ff965defba2fcb4c76ab4ca95d
 EBUILD elasticsearch-6.6.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
-EBUILD elasticsearch-7.0.0.ebuild 2599 BLAKE2B 4fdab7d1b5e22f1d803c06642392a05adfa8c201dcd83964c23e3a10acea796cba12fc5aaac7aad3078ffd01c0f6c49afa967ab3485ed10731d5f304d99d8f25 SHA512 6ff2036c226f3b74cbf8c487dd8fdf8cf52e870bda3cbf43da5565a43cece9770a41ef72f018026a66f769b05bc4d18e9def22a9e8c091ea9fc0a045ffa84460
+EBUILD elasticsearch-7.0.0.ebuild 2570 BLAKE2B 34f783dfea91989cb241fa8f1e94c209509bc87d9d63c754507d23aeb3b10d1dc97819764505227982b4721eb73280f9dc01b59034bcdbbc31fea0b454a1ab2f SHA512 59a97e54612b663302de40f5a94c7ee03c046f9642ea2d3966a53723c11e0b224a125443983bbf31eb9ffbbb372f90fdfbbd1239f283b3268af590c029da42bc
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-7.0.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.0.0.ebuild
index 1d757551fca1..8d3ce3b93b46 100644
--- a/app-misc/elasticsearch/elasticsearch-7.0.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.0.0.ebuild
@@ -30,7 +30,6 @@ src_prepare() {
 	rmdir logs || die
 
 	if use x-pack; then
-		rm bin/x-pack/*.bat || die
 		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
 	fi
 }
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index ff8939b14f02..109afd75a908 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -3,5 +3,5 @@ AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5ad
 AUX fhem.service 208 BLAKE2B b577fd84a166ef87f2aaf58f2fc6758d070b4181f3254e236aa376322ad4bd4b0c7e04aa9205fbc235fc39f9e8f27d17a6ae36a732058d9a7ca97154ac61398d SHA512 3f2baf5e2238074ce65e1eacfadd8f2ffd582c26e50ab03d3ac18a03acbe6b5aa85bb1258e405dae81b51f9c5554a2ee872f72dc4e929df88f7fa5681916171b
 AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
 DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
-EBUILD fhem-5.9.ebuild 2358 BLAKE2B f8d9ab44b50c779d5ffccc60317f6a69bd7e4ff0519d1bf43c3cd1703b80df58241f5dfd8c68631be954b6f98b1c85cce105c3fe8710696a2b4c453e9f33db24 SHA512 c9ec203f928fc697a5c4de2427d03d03994034fa22dab87611584f03672c741328e20be35de1cbcff40c8991ee9e4797ff04b9057c4e21dda5251030f9cb7d76
+EBUILD fhem-5.9.ebuild 2357 BLAKE2B 34b77071183e346285896e9f608c364939d8b1056fbb295af41998057d45d998e10c55dfb39746510e85cf3a2901d1f628033ca4f0f4b6567dfe50b2f0ba712a SHA512 b365555c87e53a4370e655dc37e3e590a7ef7a72aa239aa4b243b6c193d2823e49cb2e5976d8109949e781a420316e528e1efc2412a7703e394de7c08d9c9493
 MISC metadata.xml 767 BLAKE2B 16319027b755dc2d63c9176681196af9da38d9c5002ca75554f824bca03c67303cee0f1b15f9583d8264eb87c25373704569ac629258c81ed999882500f04014 SHA512 ba31d04179d2f12b1ba803a4cb589ca17b35b33013b78804fb89a716644bcad9fdb71795b36a6519e90b125164b7fe5d6744f0e1e519fc129a7197bd722c6ae4
diff --git a/app-misc/fhem/fhem-5.9.ebuild b/app-misc/fhem/fhem-5.9.ebuild
index 63431ab1f506..e84340e0b59c 100644
--- a/app-misc/fhem/fhem-5.9.ebuild
+++ b/app-misc/fhem/fhem-5.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A GPL'd perl server for house automation"
 HOMEPAGE="https://www.fhem.de/"
 SRC_URI="https://www.fhem.de/${P}.tar.gz"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="doc"
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 9bfa36554bc9..73c2c001174d 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,6 +1,6 @@
 AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
-EBUILD geoclue-2.4.13.ebuild 1682 BLAKE2B 96815c2ca11afecb006e9fc617828b9182943fd6521934a6c47031402653996a9257366828503247838a569aa6d11e7faff3df756820863f6ff41d54bfbd5dbc SHA512 f2be75fae7d6400c7973cded35c6c61e4d6e3958d44e1bcb374ca7ea3e9394315c40319d50f5999713affb52a36a5f99b9a90e57bb07e4a36a2ad4706914e668
+EBUILD geoclue-2.4.13.ebuild 1680 BLAKE2B fc4061d14d801ee9159f8de3410beb9605c2890fd0e452bb671f0eb0bcd0afbbc44314625aa4cdab7fc81c3313339305c319cf3f4b3a51bb30c1581783c8f934 SHA512 9b91396080a9f842322d2f7d803f46a7505db21cbd47aa55ea69ea5443f54711b1e2366dc0cd9b7a887ec18486148c2d1b33c98b38f1ac97a32bfd1f3ea73c70
 EBUILD geoclue-2.4.8.ebuild 1592 BLAKE2B 0f3d58e79786d2b0e80905d9bf236e6f6d90e1fb6a98051c319abb89d8723097a4690545468a191bac46bf9317962bee5012dc67d6f5fd00722d084d63ad718f SHA512 ed5f5259c3913294d0b9698b6f7b536c34b546401c7fc004705d1a534cd3fffffe879958274e59152769b082329fce822167652f4640e1b5cf19b5096e0e372d
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
index 153c7db03815..ec4cdcdc95dd 100644
--- a/app-misc/geoclue/geoclue-2.4.13.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="+introspection modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest
index 7d337a070581..ba5ca69625ec 100644
--- a/app-misc/gnote/Manifest
+++ b/app-misc/gnote/Manifest
@@ -1,5 +1,5 @@
 DIST gnote-3.24.1.tar.xz 3310012 BLAKE2B b6167dbb2461e574e4f21b2f227eb9a3c89708ddd15a561146faa044130e5c9ccc6d64b4923c30726160ee35d4ab5a0ae04b1593e74af2fa6566582af9bc1f18 SHA512 759fb2984312a3e3d5aed9b79f2309021b69df57b820d34814a5d3d9b5c9201abc6e50d83bf64f30974991d779b0b85e599435a24ee1326b867a2a4be8e0f37e
 DIST gnote-3.30.0.tar.xz 4017364 BLAKE2B e53240162d4814a0f004863ca5d309dce0b428d8ce4f7e8dc64c0ce683a830ebedc4809191e55818dba98de7d968413ae080f86367abacf3e4f3a404bbd62157 SHA512 7c1348b9fdbc84ea8cc74e214de50b594a1585031a40406ba73a8635362ef1769a37dbce79347188983970debf72d3c0f81523739a48bf27823f0233cc6cfd2b
 EBUILD gnote-3.24.1.ebuild 1547 BLAKE2B 8a0e15ea352c054b0d777386d798334f921e5778c462822e932a5f21f0442b7bd71738f4ebc91ada4f6eb58c60af5d4876bc0265d0d283fcbe925cc4c8ce2bd7 SHA512 6144bccd5cd942f967729912371ff82622874cde18bfda99f905322a9fa16d3e52d0d973d17d4b2da5c92d93ada3eadd19f9f90db57bdddfa2b03cbeb12aff7d
-EBUILD gnote-3.30.0.ebuild 1608 BLAKE2B ae94df56146ca758d6bd06b52acde7d38b4a956ad8fbe90970ba1085471ddf0e587583336c09b20db7552fd9a19b19848d13e9d5203c9d7a4a8bfd1f7a0a78f2 SHA512 23fd26fcee15af1cbbce35b3dacafd0990a6e42d478c7b870e985511a301c5f312fbaab10b45b91a81e8362ac7885aafdbe990fa69da54b3d2b00bed234c5760
+EBUILD gnote-3.30.0.ebuild 1606 BLAKE2B 74048690188d8e0c430082d90bde2b84b224437b0eb1cf5ba6ef094523fc985205ad1fbc6b5f0d9a5190f662180e1feed1ef9f27512bdadac4cffa00702035b1 SHA512 fc3688fa697ba4fc36b2140e31951cfae2b69092161bee5ec3e333bcae7b1167798c2a4b6796e469da5fa9ace62419bd20e5882f12f5dbb9464fec459019a0fd
 MISC metadata.xml 342 BLAKE2B 51d98560833845aa6d1f2b9f4c85021fd317434efcd81ba31d106c7b4945acd23cfefc2de2a601ffef3d330adcf93ec0377f69107fa37771d80f7dff056d32ff SHA512 c68c058e279222cc9293a5b97fbf450f95a940a70a32b1adcac3e6276783d2bcc545f39895e92e7bd62c9ac5dc98139dc9800513c2a828895ba1fcf023227d21
diff --git a/app-misc/gnote/gnote-3.30.0.ebuild b/app-misc/gnote/gnote-3.30.0.ebuild
index c5ce78a1cb5c..a1955b0552a3 100644
--- a/app-misc/gnote/gnote-3.30.0.ebuild
+++ b/app-misc/gnote/gnote-3.30.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
 
 LICENSE="GPL-3+ FDL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 # Automagic:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 2cb9f74bdc03..ad085342d8d7 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,10 +1,12 @@
 AUX irexec-confd 280 BLAKE2B ad6663659c459811710a257cf357ddd5efbd17c09201c6e3ecc68d680004e8212e76365e09984b6c422fb5fa9603245c7443d1b71bb6064a2ed35734ab6dd630 SHA512 2b33e1044086d11fd6e1f9a204ce925182a3a2b92ef4399610e01702f9c2c8fbc87cae52961123297171eef3d40468ac17437b4281b26a5f3b256c9cebc612ac
 AUX irexec-initd-0.9.4a-r2 681 BLAKE2B d2bf21ab1fe275bf5afea31a890c1de3300e836879b76c1c33bb40a59d9ad2b33285745a4d0a78f8bc2f589ba44e6fde31c7d07a02d9751e4b13b23975b1d9aa SHA512 0514712ce1a3e147e1c798319f90663baab7509299e2eb35551a716cf208e42b225f8539968bba1bd15270006fb728ff2f458015fb07bf325df8b0e095f5a206
+AUX lirc-0.10.1-unsafe-load.patch 2070 BLAKE2B 765e558f7d10081628b2516b6ae6c5ef3d7511fe6953032693c3e02b8d76b287d51ca71fefa4e789c159de6117cc4f741e1fae889550ae053759b6519d45ec71 SHA512 9a39a57b3855360133b6276afa08eed21064850bc7e0039ec1f6f7594859349b2489344e68ea2317371f264d48e63aebf0191ac3983fb0245d0b24a297d27753
 AUX lircd-0.8.6-r2 1204 BLAKE2B ae4082b6f063d3100865bb3e974d9ebec8f04e08dae8c296c30152f69700924b8850c85687a5cedb3895f52c1e7a576b0855a52e350462a0552da64cd3a7e6a4 SHA512 482fccd204671f6258822029b9eb9a1e22abf02e382b3814f924f171fd1168d46560f52a90727f3de60c27a78158173a4e0c3e848d45e489471c27851c907c05
 AUX lircd.conf.4 699 BLAKE2B 573b16d756f6df55c399fd77027ebb1e6bec1f28106d1a1d4cb028ab3694350a959486d33b82502a258492882e2fdfcb8f8e5220998ee4e1a503618ec247b30b SHA512 1fb1778f4cc72fc9c11b13a704b3abe80bcce5b3770b69b6b6bea8571e5293adad8c6968779b812e611b67734462c9a577cc71c6b16da3a5bfe31b8007300a62
 AUX lircmd-0.10.0.conf 57 BLAKE2B 8c39aac91bf5ac603a1495bb7e27b74ee5f09e55e35297aae75b17ed1bb858a57aa1f524d096ec2744f0d543b719f13e80a467869b7ac86e560cc396a24b0648 SHA512 6a69c7600024f00947dc35e3c6cebf7524fcf5f2a1e799fe70590fef2070c1049c4e6177711821f4e7b13972fd6f535591b48bb1006acd44fa650591b3265ace
 AUX lircmd-0.9.4a-r2 382 BLAKE2B 14e6f7822d8878a9047fc26cb0927ae61c70092788133a387be62a9e54b3d4f3c78734f5dd0a54ddb04dd2b48ba270177ca7af777ac80ba8bacdcbe3f9ce2d62 SHA512 c744553b6246e62845ee61e18d78d97e7242969d0bb5478072bd9072ce0a02486306b577ca64c1c569c9b136e3231a4f0663c94114879827329a769e5f36413d
 AUX modprobed.lirc 549 BLAKE2B f58dcefff1becd48edaddab0d48e46f361b99de714bc8d3ae0d72f49fc8699fe9b9c7d8818a94eb7b40a5a653bfc8ca61ec11374c49ecebd1ef235d4ed8b8c08 SHA512 a64cac97e21ab53c247d8dd3e518b3caee5eeb9c3558727eba8a04684894c6be1695ce681e71d559474f4e78bbb39130d97f843eae18e56b3d3eb70f1fbefc63
 DIST lirc-0.10.1.tar.bz2 2523226 BLAKE2B 47b7ee87de8f64f7f829af519c0d296a85cf91790148927e850965177d4984bb994a0ad122cb59c3db508813d0824ffec45126e794abd08174a052361cea53e5 SHA512 31c0b6ee169b302b99994a2a3fa0ebcae0e01cb83c02fe02acf1de5ba8cf77a091a0221c7d8104448c30930adafe654cd08afb7d0df6b5b7ec2d47df26e5df9d
-EBUILD lirc-0.10.1.ebuild 3723 BLAKE2B 250623ead65ca83bd7f7547dbf29fd48d40effbbb8f9ad5672ff911bc09834c25442279b4f0e29ac3c1c5a8df9be2a9533269dfb870f8b9b88ee6d5daeb628e5 SHA512 6d96c077bab6629dd10ffbb8eeed0c7ccad0e2079baf2c05d7c8c59bd079ff7f9e931257501d25b7307caee9852cd3e322e11b4dcf2f337a07d87d398216afa0
+EBUILD lirc-0.10.1-r1.ebuild 3778 BLAKE2B dbc9eed9df7d5244b371d9e6126cc5ae2cde41b2b061b3aa4b02a5268896bb5fb2109987bba0e8931f3dae4114bc01420e70bf5297c575dd2905cf8139054177 SHA512 2198cc38a1a99ef124603cb9a007143f706a69a5e96fd183d44d301631e199868c2cfc9b18a0f9e7c6054a6bfad6e13a10b85d3041d98a6b850cb46e7541d927
+EBUILD lirc-0.10.1.ebuild 3726 BLAKE2B 7054ad4a9a02d499e4460c9178f24eead6da0efa148e680e96c0a261899a05e63fc77221f270e448e2a3269a538b1a92f58b90592193f569ee1b29499b7e68d3 SHA512 db8f02c0931238d4d8d73a2217076d31d4b609dcd874a246005633d98ec655ac51d818e4007a673d19db279d3a1995609c6d3e0ac0cbb4a28242432ab1ae351e
 MISC metadata.xml 969 BLAKE2B 6dabf8921994f06c7f9e39e2049c0ac86b5e5523c554eec3c061151627512f6f17d14eeb00256585dd9fd323f4293f74175ace6bd87846ba461a72ab6e7caef4 SHA512 fc510d070b7b97d28159b77a7540b38e8558efd8a780dffe8755e3bcea7bbd601211f19733c217ce670407c523b6c5daac2c9aedde2ddeecb81dda8472c48fb6
diff --git a/app-misc/lirc/files/lirc-0.10.1-unsafe-load.patch b/app-misc/lirc/files/lirc-0.10.1-unsafe-load.patch
new file mode 100644
index 000000000000..7758ebb6e899
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.10.1-unsafe-load.patch
@@ -0,0 +1,52 @@
+https://sourceforge.net/p/lirc/git/merge-requests/39/
+
+commit 8fab503abb3fdababb1875fdc2373afe8534770e
+Author: Craig Andrews <candrews@integralblue.com>
+Date:   Sat May 11 11:39:44 2019 -0400
+
+    Use pyyaml safe_load instead of load
+    
+    Using load on untrusted user input could lead to arbitrary code execution.
+    Therefore, upstream has disabled load, requiring the use of either
+    safe_load or full_load
+    See https://github.com/yaml/pyyaml/issues/265
+
+diff --git a/python-pkg/lirc/database.py b/python-pkg/lirc/database.py
+index d464c2ab..bd567181 100644
+--- a/python-pkg/lirc/database.py
++++ b/python-pkg/lirc/database.py
+@@ -66,7 +66,7 @@ def _load_kerneldrivers(configdir):
+     '''
+ 
+     with open(os.path.join(configdir, "kernel-drivers.yaml")) as f:
+-        cf = yaml.load(f.read())
++        cf = yaml.safe_load(f.read())
+     drivers = cf['drivers'].copy()
+     for driver in cf['drivers']:
+         if driver == 'default':
+@@ -132,14 +132,14 @@ class Database(object):
+             yamlpath = configdir
+         db = {}
+         with open(os.path.join(yamlpath, "confs_by_driver.yaml")) as f:
+-            cf = yaml.load(f.read())
++            cf = yaml.safe_load(f.read())
+         db['lircd_by_driver'] = cf['lircd_by_driver'].copy()
+         db['lircmd_by_driver'] = cf['lircmd_by_driver'].copy()
+ 
+         db['kernel-drivers'] = _load_kerneldrivers(configdir)
+         db['drivers'] = db['kernel-drivers'].copy()
+         with open(os.path.join(yamlpath, "drivers.yaml")) as f:
+-            cf = yaml.load(f.read())
++            cf = yaml.safe_load(f.read())
+         db['drivers'].update(cf['drivers'].copy())
+         for key, d in db['drivers'].items():
+             d['id'] = key
+@@ -158,7 +158,7 @@ class Database(object):
+         configs = {}
+         for path in glob.glob(configdir + '/*.conf'):
+             with open(path) as f:
+-                cf = yaml.load(f.read())
++                cf = yaml.safe_load(f.read())
+             configs[cf['config']['id']] = cf['config']
+         db['configs'] = configs
+         self.db = db
diff --git a/app-misc/lirc/lirc-0.10.1-r1.ebuild b/app-misc/lirc/lirc-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..b3bd462cb514
--- /dev/null
+++ b/app-misc/lirc/lirc-0.10.1-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
+
+DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
+HOMEPAGE="http://www.lirc.org/"
+
+LIRC_DRIVER_DEVICE="/dev/lirc0"
+
+MY_P=${PN}-${PV/_/-}
+
+if [[ "${PV/_pre/}" = "${PV}" ]]; then
+	SRC_URI="mirror://sourceforge/lirc/${MY_P}.tar.bz2"
+else
+	SRC_URI="http://www.lirc.org/software/snapshots/${MY_P}.tar.bz2"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	gtk? ( X )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	audio? (
+		>media-libs/portaudio-18
+		media-libs/alsa-lib
+	)
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	ftdi? ( dev-embedded/libftdi:0 )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:0 )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libxslt
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( app-doc/doxygen )
+	sys-apps/kmod
+	sys-kernel/linux-headers
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	gtk? (
+		x11-libs/vte[introspection]
+		dev-python/pygobject[${PYTHON_USEDEP}]
+	)
+	inputlirc? ( app-misc/inputlircd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-unsafe-load.patch"
+)
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	use uinput && CONFIG_CHECK="~INPUT_UINPUT"
+	python-single-r1_pkg_setup
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	xdg_environment_reset
+	econf \
+		--localstatedir="${EPREFIX}/var" \
+		$(use_enable static-libs static) \
+		$(use_enable devinput) \
+		$(use_enable uinput) \
+		$(use_with X x)
+}
+
+src_install() {
+	default
+
+	if use !gtk ; then
+		# lirc-setup requires gtk
+		rm "${ED%/}"/usr/bin/lirc-setup || die
+	fi
+
+	newinitd "${FILESDIR}"/lircd-0.8.6-r2 lircd
+	newinitd "${FILESDIR}"/lircmd-0.9.4a-r2 lircmd
+	newconfd "${FILESDIR}"/lircd.conf.4 lircd
+	newconfd "${FILESDIR}"/lircmd-0.10.0.conf lircmd
+
+	insinto /etc/modprobe.d/
+	newins "${FILESDIR}"/modprobed.lirc lirc.conf
+
+	newinitd "${FILESDIR}"/irexec-initd-0.9.4a-r2 irexec
+	newconfd "${FILESDIR}"/irexec-confd irexec
+
+	keepdir /etc/lirc
+	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+		newdoc "${ED%/}"/etc/lirc/lircd.conf lircd.conf.example
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	# Avoid QA notice
+	rm -d "${ED%/}"/var/run/lirc || die
+	rm -d "${ED%/}"/var/run || die
+}
+
+pkg_preinst() {
+	local dir="${EROOT%/}/etc/modprobe.d"
+	if [[ -a "${dir}"/lirc && ! -a "${dir}"/lirc.conf ]]; then
+		elog "Renaming ${dir}/lirc to lirc.conf"
+		mv -f "${dir}/lirc" "${dir}/lirc.conf" || die
+	fi
+
+	# copy the first file that can be found
+	if [[ -f "${EROOT%/}"/etc/lirc/lircd.conf ]]; then
+		cp "${EROOT%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	elif [[ -f "${EROOT%/}"/etc/lircd.conf ]]; then
+		cp "${EROOT%/}"/etc/lircd.conf "${T}"/lircd.conf || die
+		MOVE_OLD_LIRCD_CONF=1
+	elif [[ -f "${ED%/}"/etc/lirc/lircd.conf ]]; then
+		cp "${ED%/}"/etc/lirc/lircd.conf "${T}"/lircd.conf || die
+	fi
+
+	# stop portage from touching the config file
+	if [[ -e "${ED%/}"/etc/lirc/lircd.conf ]]; then
+		rm -f "${ED%/}"/etc/lirc/lircd.conf || die
+	fi
+}
+
+pkg_postinst() {
+	# copy config file to new location
+	# without portage knowing about it
+	# so it will not delete it on unmerge or ever touch it again
+	if [[ -e "${T}"/lircd.conf ]]; then
+		cp "${T}"/lircd.conf "${EROOT%/}"/etc/lirc/lircd.conf || die
+		if [[ "$MOVE_OLD_LIRCD_CONF" = "1" ]]; then
+			elog "Moved /etc/lircd.conf to /etc/lirc/lircd.conf"
+			rm -f "${EROOT%/}"/etc/lircd.conf || die
+		fi
+	fi
+
+	einfo "The new default location for lircd.conf is inside of"
+	einfo "${EROOT%/}/etc/lirc/ directory"
+}
diff --git a/app-misc/lirc/lirc-0.10.1.ebuild b/app-misc/lirc/lirc-0.10.1.ebuild
index c35abf0e0422..60b8ec018130 100644
--- a/app-misc/lirc/lirc-0.10.1.ebuild
+++ b/app-misc/lirc/lirc-0.10.1.ebuild
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 		>media-libs/portaudio-18
 		media-libs/alsa-lib
 	)
-	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5[${PYTHON_USEDEP}]
 	ftdi? ( dev-embedded/libftdi:0 )
 	systemd? ( sys-apps/systemd )
 	usb? ( virtual/libusb:0 )
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 6683872a652f..5e355b44a066 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,4 +1,4 @@
 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
-EBUILD mc-4.8.22.ebuild 2636 BLAKE2B 635a57b5283e933974203bb812a58486468002c32eee42fc3db781b39d39375d21070e65eafc54ab240bb8f351869615b317d58dbd300094b735ddb990385a0f SHA512 29924f83e1d5ca88b01ec5c27755cb53ffbf950a573b7a34ae14989d02f56a581e7772a1c406bdb551ee689598e51c49e652438b1ae2239e9ecea95472320350
-EBUILD mc-9999.ebuild 2893 BLAKE2B 64978ade6c20ddf9babc40628bfd6ab1232e82ae2e2f508825d06c49f13a45d90dee7836849cd59fdc22b09bdb6d07f503af1bae46bdec1151b658a56fced071 SHA512 f8f59a611a500853882dd2baa0249d65a99c8ccdd042b756f9543219090485a152533acc412a08d25c4dc0ecde04b249664427a1ae5a0334eae9a8627dd1b29b
-MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
+EBUILD mc-4.8.22.ebuild 2856 BLAKE2B 4690f984d23c2397b1934708b3fe03b357e6422516bc59ed50ff9e7a32988e6019ab69cecd7618ef4e60725f30367e76da3a249b4d5b04b7bec4f0346aedb977 SHA512 0976c89075f0dd7cb3028b2855824b441a74cdd981064a892d2446347484e9fbbba236705ee99f7b2b7163e6dd0769d902da85dfb0ae05a66667a82c9c6e911d
+EBUILD mc-9999.ebuild 3113 BLAKE2B ec6b556a149078643e7dfd5a3fbd5bc43c174b1cfb5e2d05d578c7ac9dfe084347ee262100d5b2c6d5fe9bbc3feaed504e93252bbc01f8431d49d1794eb63425 SHA512 8693c20e841d2b3f83073a444cca6e8013046e1f7ac7007f12d11a384e2db691ac06930f782f3585e9d7441a964967b143b3bee740c6287d64ac2e04f6277c5e
+MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild
index f8cbc5a2c392..1e7d94b10815 100644
--- a/app-misc/mc/mc-4.8.22.ebuild
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
 
@@ -57,7 +57,11 @@ src_configure() {
 		--with-homedir=$(usex xdg 'XDG' '.mc')
 		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
 		$(use_enable kernel_linux vfs-undelfs)
-		$(use_enable mclib)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
 		$(use_enable nls)
 		$(use_enable samba vfs-smb)
 		$(use_enable sftp vfs-sftp)
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index d27af1106ec4..a8a30b230b1c 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.midnight-commander.org"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
 
@@ -70,7 +70,11 @@ src_configure() {
 		--with-homedir=$(usex xdg 'XDG' '.mc')
 		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
 		$(use_enable kernel_linux vfs-undelfs)
-		$(use_enable mclib)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
 		$(use_enable nls)
 		$(use_enable samba vfs-smb)
 		$(use_enable sftp vfs-sftp)
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index 35fa1001c11e..5c99ff657dde 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/metadata.xml
@@ -15,7 +15,6 @@
   </maintainer>
   <use>
     <flag name="edit">Compile and install the mcedit application</flag>
-    <flag name="mclib">Compile and install the libmc.so shared library</flag>
     <flag name="sftp">Add support for sftp (uses <pkg>net-libs/libssh2</pkg> for it).</flag>
     <flag name="slang">Use <pkg>sys-libs/slang</pkg> instead of <pkg>sys-libs/ncurses</pkg>.</flag>
     <flag name="xdg">Toggles mc's config dir location. Enable for $XDG_CONFIG_HOME/mc, disable for $HOME/.mc</flag>
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index bd8e7978fea6..1a5bf6856fa6 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,6 +1,4 @@
-DIST neofetch-5.0.0.tar.gz 110526 BLAKE2B 7149321c051021644407d28b232631c8149d21f1b8463b3a4470d1baaf88494f3a88026c606ac539938933333da5671f4a14b6ce029268ba01a16e85d4a30c33 SHA512 7872e646a0d784d0c9d851d16cb1ef03926d07f67ec9573b673b2a82fd9a1ffbb7bbcb0ca0e67c299dd210947396a8c36dacb98d8a61c3ea72b5a438995e7de6
 DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
-EBUILD neofetch-5.0.0.ebuild 698 BLAKE2B 71422cd78067ef24294890b0df2b5e658403d32dc2cbc1e451c9c235bdc179c11acf362d80168ece7b0aac2926e7c7fe91a0e21f173c462689035b260472e274 SHA512 5b584d0085c16606b7322121cee1b6f3805993bc7ea667659f2eb91ea1ec72e6ad00d5feb64460ff08dd1bdd2cf40d4c3f1a1eb30b9dbf0919e39024ab4381c7
-EBUILD neofetch-6.0.0.ebuild 650 BLAKE2B 7e971826bfbf4a4be3158d758f433f03c86002d551c4e299e860ddb65d2fe622b5cc54625c37383eaf2518deb826738eba86adfe29fc6bdaa4684a0aafb013bb SHA512 414a7188fc376faca0adfd0a4c5cadc4829b81eaa56ef89f52c860eae0eb1275cbcace080cf06e8fd9f1153ae71cef91593567be15580b27ea5e59841d2359f7
+EBUILD neofetch-6.0.0.ebuild 649 BLAKE2B babedb2052e50e2d89c03d23c9031692b7db74339a1fb2f23d55d91bddae11cdac4fffc1516d107017a14f40429381d247436a955556c89b1c492078d7e38dfa SHA512 f1002ccf79cc53cf6c9036767bb2825e52d37a49107ce6b2921ff20abae48694eec473ec9701d692b375793af3414edc4ef22922adbe3bdefb9e92e02673b3fe
 EBUILD neofetch-9999.ebuild 651 BLAKE2B 734b213276d74a8cd6d4fee9d828b79c37c0d0f48f551e6545c2a3305464239b51b9495418941e815e8c5bcdde649dacf01e6dbcdbd6002d03b4af4df3348970 SHA512 28a81439ca17c4e52d06fa7718d101983f1bdb016402e32f96c61a8429f10bac315409e30857c2b4a5aae64138321e40e30a2b132421f5cf976b4b4bf69a7ef3
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-5.0.0.ebuild b/app-misc/neofetch/neofetch-5.0.0.ebuild
deleted file mode 100644
index 028fbe1249cc..000000000000
--- a/app-misc/neofetch/neofetch-5.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 mips x86 ~amd64-fbsd"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
-fi
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		media-gfx/imagemagick
-		media-libs/imlib2
-		www-client/w3m[imlib]
-		x11-apps/xprop
-		x11-apps/xrandr
-		x11-apps/xwininfo
-	)"
-
-src_install() {
-	emake DESTDIR="${ED}" install
-}
diff --git a/app-misc/neofetch/neofetch-6.0.0.ebuild b/app-misc/neofetch/neofetch-6.0.0.ebuild
index b1d4eb92438a..7e6422e1f5c0 100644
--- a/app-misc/neofetch/neofetch-6.0.0.ebuild
+++ b/app-misc/neofetch/neofetch-6.0.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~mips ~x86 ~amd64-fbsd"
+	KEYWORDS="amd64 ~mips x86 ~amd64-fbsd"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 17bc17e15d8a..2f951e905319 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,5 +1,7 @@
 AUX recoll-1.24.1-qt-5.11.patch 290 BLAKE2B b68f02b9fce837cbfdc54c63787546608db2823c73a36809ceb4ef611f63b0be3528bbbab3f966e4481b09f314968ee22e6e74e5f86a65944dc7e6cd6420cf7b SHA512 51f2cfaeb1a6b62a012867d04d4ec4ca726f6d10e4dfb30d006588b02507d20f3d2a14c011b90a55df334b306ac4351aa5c81532d86822acb16a31b5eac3285b
 AUX recoll-python3.patch 473 BLAKE2B 78b15249de8b20a46e3331d90c52cc8987278d4c508480ceab35ee878c9467f796b209dca5eb0ed5637019718a5e0dc7a2888283b149041ffcedfc175419509c SHA512 50cd8bea004e2ee3a7b861b3b9bc981d5dc0656421894dc8f47777516f290aaaba4300eff52d01d496c873d0f135bfb39f2606a41e95a3dc4edd0a1195614774
 DIST recoll-1.24.1.tar.gz 2644672 BLAKE2B e5bce2231e075fe9a2bfad7d0d1068906e625106b09247dc5baffaf92957db111dd6be90c658266b8b9940d885b3495769c68ce66247d00568df24c1b5222226 SHA512 60bf57d2718a21dbd578fa1dc73a542fc7ab2152c4c5bb763885b19c14d080340587cb8c01f82f1ca7d1cb63a03edf03b4501f3ef63f06ab6506356c4a0a095c
+DIST recoll-1.25.15.tar.gz 2843434 BLAKE2B 7facf6040560ab11b7a3d99b583020bdd4757157236a23430381c9d6932de558917f5dd1faf0f1ca87be3386307b5346ec66bb82637edd42035fd7be61ee9b39 SHA512 acd5349e1a1edd6ca22f819b0cfe76161fedb0bde8b4a86e679e78d68d090481a11a8d1980764d008074846b5033481c766e624da1322ab318b52c9c9c57104c
 EBUILD recoll-1.24.1.ebuild 3612 BLAKE2B 31ea52b3cfe16cbe19ec0de2578fc7444e389cfe5e5a9adbc7a9bfe36fe29c919a6cdd317887d1c9ae727eb21afd1ff49d4a0fc1f9fc3223b49d0904c9372e07 SHA512 8034a2f4ae1802520f9a2358b00ee48d22b756679ed8fbb03bab047ffde344dba609c229d837d92da703068e8c8bc356160052c9a3a93a27ceb867daa78f1dcf
-MISC metadata.xml 1204 BLAKE2B a27afe4b6f800a38fa63956a750e4ddcd8ac2e9a785df910f660fce03357a77b37752e405be6d76fad74ce6f90d8564912499f397eb819535859ddc259cbc7a3 SHA512 581c483f1d64131cb7a83e9a899b5286f03cbacc3f011c5fcdb3236b56e2b22e1a0fa880b34bb107874fe03fde7f82767805bb7e2d0aa46367e8d5dca0037ea5
+EBUILD recoll-1.25.15.ebuild 3626 BLAKE2B 681a1633e7dd55f1f42fb24f13dc6b60eb424917b990a37b64552aea69d63c72096cb3b5f86e111b62e1de303bb920764a0b52919a443f73a5402fc8febcda02 SHA512 9e5b93883050837f03cce34a3be155916205bdbf86dd76267e751c1a594ebe03a6153c38bc3d1e4fe93bd6bc00133ee4c2072b669faf468b9befc4ef85b944f5
+MISC metadata.xml 1382 BLAKE2B e0fe8843b74140663aa9eb968ee212ef0fd76bda4dd17b353b8382fcee917f9d47c82c9790ccae260e375d66ff1ef34049130ddab90d89e89819139848341e00 SHA512 b677720fb6be1b93e6fc26360bb4b9c4008bb2908db4cb8a4d10e84312f5b7e2a59a4e67ef2c5c7b410abdb11b80385efc6d2d604445048a9a9a29c97141223c
diff --git a/app-misc/recoll/metadata.xml b/app-misc/recoll/metadata.xml
index 1e89b50bb67b..80572eb1e414 100644
--- a/app-misc/recoll/metadata.xml
+++ b/app-misc/recoll/metadata.xml
@@ -18,8 +18,10 @@
 	</upstream>
 	<use>
 		<flag name="camelcase">Enable indexing for camelCase sentences and words</flag>
+		<flag name="chm">Enable CHM file support via <pkg>dev-python/pychm</pkg></flag>
 		<flag name="inotify">Use the Linux Kernel notification subsystem for monitoring file alterations in realtime</flag>
 		<flag name="session">Stop monitoring file alterations when X11 session terminates</flag>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for fancy result list display</flag>
 	</use>
 	<longdescription lang="en">
 		Recoll is a desktop full-text search tool. It can search most document
diff --git a/app-misc/recoll/recoll-1.25.15.ebuild b/app-misc/recoll/recoll-1.25.15.ebuild
new file mode 100644
index 000000000000..05fa308a893f
--- /dev/null
+++ b/app-misc/recoll/recoll-1.25.15.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit eutils linux-info python-single-r1 qmake-utils
+
+DESCRIPTION="A personal full text search package"
+HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
+SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="camelcase chm doc +inotify qt5 session +spell webengine"
+REQUIRED_USE="
+	session? ( inotify )
+	webengine? ( qt5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+DEPEND="
+	dev-libs/xapian:=
+	sys-libs/zlib:=
+	virtual/libiconv
+	chm? (
+		dev-libs/chmlib
+		dev-python/pychm
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		webengine? ( dev-qt/qtwebengine:5[widgets] )
+	)
+	session? (
+		inotify? (
+			x11-libs/libSM
+			x11-libs/libICE
+			x11-libs/libX11
+		)
+	)
+	spell? ( app-text/aspell )
+	${PYTHON_DEPS}
+"
+
+BDEPEND="
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+RDEPEND="
+	${DEPEND}
+	app-arch/unzip
+"
+
+pkg_pretend() {
+	if has_version "<app-misc/recoll-1.20"; then
+		elog "Installing ${PV} over an 1.19 index is possible,"
+		elog "but there have been small changes in the way"
+		elog "compound words are indexed. So it is best to reset"
+		elog "the index. The best method to reset the index is to"
+		elog "quit all recoll programs and delete the index directory"
+		elog "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
+	fi
+}
+
+pkg_setup() {
+	if use inotify; then
+		local CONFIG_CHECK="~INOTIFY_USER"
+		check_extra_config
+	fi
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	python_fix_shebang filters
+}
+
+src_configure() {
+	use qt5 && export QMAKE="$(qt5_get_bindir)/qmake"
+
+	local myeconfargs=(
+		$(use_enable camelcase)
+		$(use_enable chm python-chm)
+		$(use_enable session x11mon)
+		$(use_enable qt5 qtgui)
+		$(use_enable webengine)
+		$(use_with inotify)
+		$(use_with spell aspell)
+		--disable-webkit
+		--without-fam
+		--enable-recollq
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake STRIP="$(type -P true)" DESTDIR="${D}" install
+
+	# html docs should be placed in /usr/share/doc/${PN}/html
+	use doc && dodoc -r "${ED}"/usr/share/recoll/doc/.
+	rm -r "${ED}/usr/share/recoll/doc" || die
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	elog "In order to extract the full functionality of "
+	elog "recoll, the following packages should be installed "
+	elog "to get the corresponding document support."
+
+	optfeature "XML based documents support"    "dev-libs/libxslt[python] dev-libs/libxml2[python]"
+	optfeature "PDF files support"              app-text/poppler
+	optfeature "PDF files with OCR support"     app-text/tesseract
+	optfeature "MS Word files support"          app-text/antiword
+	optfeature "Wordperfect files support"      "app-text/libwpd[tools]"
+	optfeature "Lyx files support"              app-office/lyx
+	optfeature "GNU Info files support"         sys-apps/texinfo
+	optfeature "RAR archives support"           dev-python/rarfile
+	optfeature "7zip archives support"          dev-python/pylzma
+	optfeature "iCalendar files support"        dev-python/icalendar
+	optfeature "Postscript files support"       app-text/pstotext
+	optfeature "RTF files support"              app-text/unrtf
+	optfeature "TeX files support"              dev-text/detex
+	optfeature "DVI files support"              virtual/tex-base
+	optfeature "DJVU files support"             app-text/djvu
+	optfeature "tags in audio files support"    media-libs/mutagen
+	optfeature "tags in image files support"    media-libs/exiftool
+	optfeature "Midi karaoke files support"     dev-python/chardet
+}
diff --git a/app-misc/tmuxp/Manifest b/app-misc/tmuxp/Manifest
new file mode 100644
index 000000000000..76b389ba15b8
--- /dev/null
+++ b/app-misc/tmuxp/Manifest
@@ -0,0 +1,3 @@
+DIST tmuxp-1.5.1.tar.gz 67536 BLAKE2B f96aa7c779b2c71f7467683acb1a218da3bbc2808040eb6030ee5b9873fc842c57f811ee4aee9796cab329aa46e9c639700b465c07b91be221780bb9c3a9e271 SHA512 f2b9a7429911083ff090ccd3bd4f0d56db7dc2dac9420a2e0db3eddc33df2f55e2d288a065c407b1d9dccf2a71f820075639efde7fd6109408587f661eef0941
+EBUILD tmuxp-1.5.1.ebuild 892 BLAKE2B 468cdcc2f3799bba0ace9c2c34685c1441dc680dcea0a84ba65fd15fb642ab4f00612851d0d57bea7fa8aeaa71bb65db74d4d542a265d84fb53b5b734c7f2d85 SHA512 b659ad7c362c5d4f0b77a5ea68e7a622de6eff6bff931709712fe79b1cd3df963ff1f904410ff72068655bf2a6b0fd60fc6b4fe5cb7a8b9337b43451a7bd6f0f
+MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/app-misc/tmuxp/metadata.xml b/app-misc/tmuxp/metadata.xml
new file mode 100644
index 000000000000..56cae167d372
--- /dev/null
+++ b/app-misc/tmuxp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-misc/tmuxp/tmuxp-1.5.1.ebuild b/app-misc/tmuxp/tmuxp-1.5.1.ebuild
new file mode 100644
index 000000000000..c29c3a629500
--- /dev/null
+++ b/app-misc/tmuxp/tmuxp-1.5.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit distutils-r1
+
+DESCRIPTION="tmux session manager. built on libtmux"
+HOMEPAGE="https://tmuxp.git-pull.com"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="test? (
+		>=dev-python/pytest-4.1.1[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+	)"
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${BDEPEND}
+	dev-python/kaptan[${PYTHON_USEDEP}]
+	dev-python/libtmux[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.9[${PYTHON_USEDEP}]"
+
+# tests currently failing, reported upstream
+# https://github.com/tmux-python/tmuxp/issues/486
+RESTRICT="test"
+
+python_test() {
+	SHELL="/bin/bash" py.test -v || die
+}
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index d7191967ed22..4162c901dab1 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -3,5 +3,5 @@ AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bc
 DIST uptimed-0.4.0.tar.gz 55026 BLAKE2B 9f66f3cda4181c01e686896a8560ecab7bb7f3ed9cdaeaee840a589137188d8629ba414e436a99b212d386b8d3319ce88ccb8867c78335b015ed65a179154621 SHA512 918cd9e065d5005daf5062f14dffb725cb6d6764aa571fd45d63de3f7349b910cbae0dedc832f9bfb52a42caea90e8aec8390685baaf0718fec827240e517900
 DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
 EBUILD uptimed-0.4.0-r1.ebuild 1665 BLAKE2B cfe1181127c603e3ae41b73147e6e86498a11ed7f0f1c688821bb9fc442abf1dcd2e7a2edb87aab66fdbbcb28aae33b3acf442cb9dd2bc5c3bee1f1bfdce3481 SHA512 ce1d9b90d71a2cb49084499e22994d75e4461480f1f939f26f1fb75b2453749d2afbc55b5d8a96e6cf7b3f5d7ae4249f175a3198580e0ecc53ba566eec9c1ad9
-EBUILD uptimed-0.4.1-r1.ebuild 1583 BLAKE2B 60762388d28a8b1b1503c6308c9bfe3d7fd988ac94e3e699c597859770e5e1e406d69732d73a9ef526fcdc5e8ca73e302066b16b6b718bdeadece581d127ba72 SHA512 6824c09401d48b62fcee0cbaa5d3533f4b008934ca31c69227721fef858163abf847df503ba10a0ada2d049f51173b413cba130f89d11f729b5b62503ce5f66f
+EBUILD uptimed-0.4.1-r1.ebuild 1581 BLAKE2B 1e3d06682282172a0cfbc8e40a81ccdebfe559b7a1d31f58db8b46924491ffdab2c9a928eb7b3006d58689cacf0ca84b45c231f933b20842bec94bdbed4d2078 SHA512 6454399030808f349752f563dc9d35ad64eede2365b5a5933a2d1c1f0a100568cc54e5c627c481f118c77db19836d6e92309344d587aef635be5474e3611bb49
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
index 181b263161fc..90366a4a5786 100644
--- a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="static-libs"
 
 pkg_setup() {
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 07c8400c18d4..c17f47a3fbf8 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -1,5 +1,5 @@
-DIST yq-2.3.4.tar.gz 5657 BLAKE2B d7e6a37ed157ff2a23b648a54cf729cda1413a627f1169ba938ae89d4bd175270cdc5fa39ca5ea3c31d55d562439296bcce391cb22cd2faccc5f545f2577a12d SHA512 ea530d3f501a8697474b1b77644fdf439326e49fbae158a862e58fba6f939ee5f3ba50f82cc5e990b1ed05c4e7aa9c205635290e6d2507d46e53b68ee467d5e1
 DIST yq-2.7.1.tar.gz 13794 BLAKE2B 87fe4961974ab41fc14efb7b85c3db5c13577593253eb236c445f59e4034ce5211173cbdd1680e8b83394068ebcc99962f9f3b7c1cd36a4554aa2769b0a5ce66 SHA512 ad76f6102cdb7b0cc82d57c8120dfe10221b7d7456c4c3dd6e5ed0630d9ab178099f4ee8bfc075f15eb4b35aaef4237fcb0ef01a769a612632b4ef774da2b50a
-EBUILD yq-2.3.4.ebuild 632 BLAKE2B a81bf03443f6db49a3f85b36b08caaa23e16dcfc6b523d5ba4024ee1e076d2227a0b13d0273b6153a04994ccf41dcdb425de1529bba784f6747aa42e482c6b1b SHA512 b915870a0d8dc5f631c1163cc72be7f8058e62007a1d98923269970fd641a876629e5a0d5824d058b0ce45c9873094f34a40333e9c5869ea30a97d0ffffa41bd
+DIST yq-2.7.2.tar.gz 14010 BLAKE2B ec01d25c5ad1ca5fb38b2a4b412306d0ddf157a6a6fdbf2b55452a487bade60ebdd1bddba231e8f0d8db60994c44322c85918221cc64ea346e36d38ca73c185f SHA512 0671d0f5d5dbd7eee42efef7b8469d2177c2459144afc679bcf1f04165ba1e4ae0e396d9a3fa9ecb3db373671152fa51c835ca6fd2622fa8a243b21bfa547e43
 EBUILD yq-2.7.1-r1.ebuild 1013 BLAKE2B f39627b1837f831abef226a3aab6af871152cc91127cbdb655b77007c9a961b396f94bf0a0a2069a1d279cdf82c64ea5e6192f406c589457c2481be80a6288de SHA512 7f50f7e0a789c4f9535446017c0e204ec1640ea3635d7b79194702b24e6f53082bc4822fd2194883384b0d02a0990d3da3c6331d3ff980dd3d4b91a4195fcff3
+EBUILD yq-2.7.2.ebuild 1015 BLAKE2B b43d4715abfd258f23250c3e4a7a2abac1b9ae18df4a30b192fced01937493cba60c6603d612ec0036b1c298850783b9f09d244d602a3a6aa3eff2507236ade4 SHA512 a13faa51953d299c5bf44a3723d61947f40724a37327d797d2aeff1ab129ac5e3ffb6c1dbdd4fd3ba4fea366c425827dfa0a2829cff5d5b73c1fe369c0ab7d6d
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.3.4.ebuild b/app-misc/yq/yq-2.3.4.ebuild
deleted file mode 100644
index 9936af814da0..000000000000
--- a/app-misc/yq/yq-2.3.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/jq
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	./test/test.py || die
-}
diff --git a/app-misc/yq/yq-2.7.2.ebuild b/app-misc/yq/yq-2.7.2.ebuild
new file mode 100644
index 000000000000..7dc084a4b39b
--- /dev/null
+++ b/app-misc/yq/yq-2.7.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="app-misc/jq
+	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	sed -e 's:unittest.main():unittest.main(verbosity=2):' \
+		-i test/test.py || die
+}
+
+python_test() {
+	./test/test.py || die "tests failed under ${EPYTHON}"
+}