gentoo resync : 19.07.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-07-19 22:05:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-07-19 22:05:27 +0100
commit: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch)
tree: ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /app-misc
parent: dd762ff83c330186ee2ede002e08b2f780cddd51 (diff)
48 files changed, 225 insertions, 1165 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 4e004e4c9df7..dcdef56938ed 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/bgrep/Manifest b/app-misc/bgrep/Manifest
index 9ff1ecbd68b7..8add1859be5c 100644
--- a/app-misc/bgrep/Manifest
+++ b/app-misc/bgrep/Manifest
@@ -1,3 +1,3 @@
 DIST tmbinc-bgrep-49b098b.tar.gz 3386 BLAKE2B 3c98e849689cf5b9131a52578bef8735f7ff8d0a8a8b7c1c3e048487d3e40c9c34e902e737e3fa0d40e0e640ffc1a7cedb49b1b45d04263c7c987625cd02726f SHA512 18a0161fe23a04d36bbfe67712a90b3d30c4cca95fed023773b0a1eda5fc1c284996d9669eec256a9aacc7019297f96c3d4fe69c240595bcdcc3a8b7c1bea990
 EBUILD bgrep-0_p20110121-r1.ebuild 808 BLAKE2B 98a07f22d204e446637044b18602131109ecea3461aba61a32c0353fda032efb879567018b3941e6022b6e095f95c0ab14b9c0ea1bcbea1cca3c58507c1e6ee1 SHA512 e8730552f2254833d720425a0c6030348ff5326d0456dfe3a7c920bae0b903b1869f1aea87c698e762dbe9c2ba985473fbe4689f3f93c5df083e93a848d39041
-MISC metadata.xml 220 BLAKE2B 3266a815602daa2a9da84d288e47e3328b40c967d40a801ac459539c015dbbaabe39c76945bcfe08b6499b05a2f775ea3b3094dccfeed7b62b4644f26ea4185f SHA512 be16f2417515008d47237f4a9de2584a23d02c4f7805b7b14887032db3ea5a9f6b1d6eabef07e415307f18ac4a1c08565a068a55cab9167532c0080395f207bd
+MISC metadata.xml 247 BLAKE2B 4dd4124b036016fe5a8788cc1d59340e0490958026874cb3dc532f8dcd493845417b21140d2c258ed0158b6d7f5391c6d714b77bc9a0ab199fbb6d1111411186 SHA512 1e996ebfddd8be6fac44c0a28fc7b4c961e4f9916433adf3e790f3cf8e900e6e1d72a11f4540213580fc5eec50528e45d7da6d4ad1f9e8eb764be2263154ea28
diff --git a/app-misc/bgrep/metadata.xml b/app-misc/bgrep/metadata.xml
index 961705194bb8..cf3127a88ddc 100644
--- a/app-misc/bgrep/metadata.xml
+++ b/app-misc/bgrep/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="github">tmbinc/bgrep</remote-id>
   </upstream>
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 40518a109fcb..53003c2571db 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,11 +1,6 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
-DIST ca-certificates_20180409.tar.xz 246908 BLAKE2B b553d4347f1a5b88fe59c7269dee617f61cde54d4df1a3aa4b3a7e9aa4b2ee81415e5c421352505ca4b2e0e480b053ccb04024bddfb51450d298d8fdd0567c36 SHA512 e0742da19416d367618547107cc0f1cc045d5ba62c30fb7238e0e36ec0d19ea48e2ffdee2c68a9f06954025c58db9a5376f149e221ede95a3a029cda39d86a53
 DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
-DIST nss-3.37.tar.gz 23027581 BLAKE2B 0ce7190a029321d5620dc8b9aedf1f4252c53dbef57149afbad432b6bc4b590db026505d23f5c766827d5c0179ab931b8a0435a2e9785eff3db515ed7211e512 SHA512 ad5175f126705f57092ac80421ac005bcc32bb18a4a44a527df25994fa90b3bc18af08506683564f619a22076f71232e2b3c9e6e25d6312d0bfed63684139103
-DIST nss-3.42.1.tar.gz 23416408 BLAKE2B 9c008ce599f3cc4de50af3a32f680e16058a42df7a844aa8f151c729a1c783177d8410b0aa2ea9887f5e69a359d84b655b78808fd817b8ccdeae458d9c7b4488 SHA512 468e1d4ea9d2b832c7b8975443ee6fe2790b39cbbd9f8e3d8428a43f47cce0e81d5ca21e3566701b75bcd4af09110c0134e204b2850d30ecfd6347ec27e6e265
 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20180409.3.37.ebuild 5671 BLAKE2B 78f124e09911dc0e18ba39fee62c6257944f1661b8c7e9fe8ee50e14461b2be16c9ae8304145bea5cada7cc3b9e57b9eb187b4ea7bed4ce6fa32dcafbd9edc2e SHA512 79878c972db6601263db990afc34f33c62dfd195d8d3eae121932a7881a354d399532575da90f8194d66acb807567cc0b06f4382a84428f989431af6a015c47c
-EBUILD ca-certificates-20190110.3.42.1.ebuild 5807 BLAKE2B da51295223a2123378e3a42d39922aedcd1064ca750a9443ab3638d17f4fcc6e27e8e67188c9cc4ed02451ff78728879ed392261132abecf521e00e287a8e558 SHA512 3dcf54cbe5d8261baa2e406a43146bb1115243871db1fd2877dfa1284b6351e9f6251925d989ec1f37ee9e8c26d9d77d9336b037856efb3b1d430679a9e8c5a6
-EBUILD ca-certificates-20190110.3.43.ebuild 5814 BLAKE2B 371227f8d9a52dadc54b9784df5f41e2dc8b5eb7b689d21178db98e83a6d998139240f061cef7a773862923747f6ad4ed8cdfdd3549d2dc93368c1f261e1625c SHA512 b6a8715a8d98e7b9afdb8f46a2b1af05bfba9a478e39f91c35c7820894e060fec2fefc7071a28afd242448f7c842b27ea8b1ca6482cb1c0f424a42be2266310b
+EBUILD ca-certificates-20190110.3.43.ebuild 5801 BLAKE2B d9a1fd8cb67217cf94907d09487c5cc8a7dd38937d730941ece8a1696a0b4e9a48e3a376120a63fbbbe8699529f85ebf256fb81f2b71f4bf9874336f3b1108cd SHA512 4e725eef53be374b30be3e6c00e6b91a4d4b7879689c08d3aa6ec8c9f622e5e84674915661fd72f7559d4d8d6085d8913b1c4caf077fdc1cb914ad63309fd2f7
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild b/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
deleted file mode 100644
index 520f0435104f..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20180409.3.37.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit eapi7-ver
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	${PRECOMPILED} || default
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}"
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin
-		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null
-			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org
-			mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-	echo "# Automatically generated by ${CATEGORY}/${PF}"
-	echo "# $(date -u)"
-	echo "# Do not edit."
-	cd "${c}"
-	find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ca-certificates
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild
deleted file mode 100644
index db441817372a..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.42.1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit eapi7-ver
-
-	DEB_VER=$(ver_cut 1)
-	NSS_VER=$(ver_cut 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE=""
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	${PRECOMPILED} || default
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}" || die
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin || die
-		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
-			usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null || die
-		fi
-	fi
-
-	default
-	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		-e 's/openssl rehash/c_rehash/' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs \
-			etc/ca-certificates/update.d \
-			"${c}"/mozilla \
-			|| die
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CAcert_Inc..crt \
-				"${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	(
-		echo "# Automatically generated by ${CATEGORY}/${PF}"
-		echo "# $(date -u)"
-		echo "# Do not edit."
-		cd "${c}" || die
-		find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ${PN}-${DEB_VER} || die
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
index c0e17c48779d..ef37fa527af2 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/cbview/Manifest b/app-misc/cbview/Manifest
index 62614505ac7c..4a02ca7ba92b 100644
--- a/app-misc/cbview/Manifest
+++ b/app-misc/cbview/Manifest
@@ -1,3 +1,3 @@
 DIST cbview-0.06.tar.gz 16351 BLAKE2B 5e343eb00250d470b7e64d717b06ea1d048aace755ada2348c656443759a12c6912b7f766f066d0b2c2e7b6926ccb46472051f636646dddc288f64b66e752684 SHA512 4a680243a8c31fafad8826d1ead6d21fcce3642beef9ed82b19a7a75d78e7af32cd8d7800de15bd2b9a59241f81a295b7da8f7a80fa482b41fb589a274bfea06
-EBUILD cbview-0.06-r1.ebuild 540 BLAKE2B 1c9d7c3f3a918b5743961a31afa0f3236c2a88e507141d04b93b5683d215e10b62f9dd1da8a640c5608dbbee25e84da11596aea70db9a5b6aeaf68c08dc3ce57 SHA512 0fea9e78cb782cceaa4b3bddd7fa699b09f254613ae73fb0904ada2011041aed03313fbe36e04a911845eaf06c286b20777f6ec38984c09f9a6f74fd22029036
+EBUILD cbview-0.06-r1.ebuild 537 BLAKE2B f1916cc5465b3a6870ea0625fcd7fdba2e9499233fc05860b8bd3881ded7623a117511270b4e2ede6de22a800fe73e0490b31dbf4c8fe51a738be5f07a53953b SHA512 c8aeadefc65a9c3423d3c5f38ebddfc2f344e328b78c05770cea1f11faee5b979891d428d05cd819d34168b690e539164d8e64891815cdf0a98b1b655dfddc2e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cbview/cbview-0.06-r1.ebuild b/app-misc/cbview/cbview-0.06-r1.ebuild
index 286374eacc42..8a9d8e740af2 100644
--- a/app-misc/cbview/cbview-0.06-r1.ebuild
+++ b/app-misc/cbview/cbview-0.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://elvine.org/code/cbview/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 6bd8516fb40a..6c19b1a0d15e 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -4,4 +4,4 @@ DIST datefudge_1.17.tar.gz 12606 BLAKE2B 5aef2bab1b434f66bb761dc6858984c4b555aff
 DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
 EBUILD datefudge-1.17.ebuild 972 BLAKE2B de096b081d3d0f8050ae187b7206caed8385c4f024b6254cf7953cef65de367effac0b933d0514446058bd59cbae873cdba4e2c0d46974f3d469dc8719a24a74 SHA512 5490d0eeed9d1c2ac6a1f2aff174f8b5411876983bbcf1e8194f8d882617563d3a2ffac14e5e0b4d4a72727ea0b85b08c5461a90366626f264667fb049e67b86
 EBUILD datefudge-1.22.ebuild 1011 BLAKE2B 4054e31fb2d326c829659adce961be253c41c39c835e12dc6f5073e0fa8664f1738479dddbae7dc4ea3674068f170a20459c086ceb6e55b38ec5b308ba274cfc SHA512 bb12d1583f021703bf2f7567808c72c92124788751bd12fff40613dca2bec9964a717dc4188cc78d86254bfcd383fe3e9b194e89d11ef3c6da8ef124588dfb67
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/app-misc/datefudge/metadata.xml b/app-misc/datefudge/metadata.xml
index 097975e3adc2..c1744fe7fc5b 100644
--- a/app-misc/datefudge/metadata.xml
+++ b/app-misc/datefudge/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
 </pkgmetadata>
diff --git a/app-misc/ddcutil/Manifest b/app-misc/ddcutil/Manifest
index c56c68d6a03f..8ec04ff8bf1b 100644
--- a/app-misc/ddcutil/Manifest
+++ b/app-misc/ddcutil/Manifest
@@ -1,9 +1,5 @@
-AUX ddcutil-0.8.6-remove-pedantic-cflag.patch 3848 BLAKE2B f02ad02606aaef927823b7e50c319e4c4cc9a1a31836f3674ce5c7b140a5852fc62d1103c3ae2bb366f75176140c892ebb8381c3675ea3454493c8d2dcf7db17 SHA512 4f946476545a8af53a71d024d2765b26fbb871e04905c62e280ec4855bd1ebe2b0093660e3d9e384a106b512f783ca58cd0de78d40ffba1dae283026dd60bb9a
-DIST ddcutil-0.8.4.tar.gz 558405 BLAKE2B 4bb93d6b9b28a17ef182c1f39e3b6351070c5541fd8eefccde2a6d771e28a8c656abe1e00a58ee935290cba79af09b1c2d6b611532827455b5ec83532bbb46c4 SHA512 e7bf78295a008607ef520e055873acc0bac6d94b850a6ea1f7d4a4ea9e080d23b4b7d82e5725a220ff120ab1523aa320265ba22671982625c10088521c72a14c
-DIST ddcutil-0.8.6.tar.gz 613272 BLAKE2B ce7072a819c5a2aa125ae8f6d5550cf0a516714f0635672015a0c24c9e525d34139c903ce7791955e0b30b8d4c66e94453eed60f8d8d024caccb49204d6fb853 SHA512 4ec473a37dc135700f4ce06634e6aa303199f4d743fba02c04ca509d0c31d45f59da7c6cd9818efc1fd8bc20dae518c5656fc8a38e9f00057677b1e997434fb0
 DIST ddcutil-0.9.1.tar.gz 656853 BLAKE2B e4f11253176587cb5ee3c9647a01ab04d5a92ce4ca7a4098378318fc069e635e43c3716ace316498f64ceaaa00aa90db3b5f409b74b8d7089a7c25254c0e360d SHA512 b2d5866606a4bc081d89180e910822f2a2a653a2782e3df582536ddc86c7d3dc02309dbb41f8d566f6ebdc5d82d3aa11792a04c28b3d83552b024dfd59891fda
-EBUILD ddcutil-0.8.4.ebuild 2948 BLAKE2B 17189cad5f87ec5f58dfbf9ff4b65edb2acc61a21b5ed7189d48a1e97794e2b2fe4f9493a91e01295200d5a5afb124d2a7bdd6f3eb4ff3d3cc474347a3bad833 SHA512 1a557b9d80cbb683ada7621876be9ad6b5f72d7227a28f292811d4c6460aba95a107dd58e9952d2c139255b1b530c04d5e4f7f09175b7871a0bd3ac593cacfb5
-EBUILD ddcutil-0.8.6-r1.ebuild 2729 BLAKE2B 0fd422fd07caeb03c144e31767ed77e707a6f25c63872e06030d12715bde8d39d9425d2e4fe5f2e5a97aad073b9d8e445f97d60e18c80d52e4aae7fb8399812e SHA512 e3dc3ff5d24f50147670e36cc68aa6ee96e2d79329a023ff7c6624b3de090018812f0a4e25cb39f5200eb7a420e3906afa6fe089d505dcd08806c1d75fbfe03a
-EBUILD ddcutil-0.8.6.ebuild 2671 BLAKE2B 7d1b0e7df93a63bb795c03a985950e1da7f16f36db76bdb2602d31fd014a3016956cf6bccfe98ef48eefc321ab62ed24b6bf26f2d6cac92198486f4819ed486e SHA512 1d0837c24c04c25b64bc4b9da0a528b65ad8a04adce135507d11b26dc8183e9be0e66243de3338298a613527e8e6e581e648f2f0783788d943e160e170db1404
+DIST ddcutil-0.9.5.tar.gz 681534 BLAKE2B 6746c239738d4f8eb7fe56323816fadee9b8fa9ad2b66a8242782e0b2688182c0140b40b9eddb3b54ad32c7ff7d1f0cf9a28c5477a48d90cc39431ed82f5d443 SHA512 6249ebdbb398ad5a6c32f3891be8bf5328114b1ed08afd75adf4b67f10a40f19451e188ce5cd88b3153a18f317e394146a34258a7d2298f126be227d7e1c25e8
 EBUILD ddcutil-0.9.1.ebuild 2680 BLAKE2B 1d5a6ec7d867528aa82ea1c401a7b9f5e4e70da6f2f616ae9781851e0a1f320b266ca3b436631103c0e0f104dce55f55cafe131f910cb921e25522484b0946c0 SHA512 6da340c08a14dee704b9a6af2d889f55155414f16afaf3ba63669beaa090865f4049d2a938fcd6d76c45f947fe5a72cc01e1ff7df8aac70b6bd62dc52b3a4b5b
+EBUILD ddcutil-0.9.5.ebuild 2768 BLAKE2B a76c3a6fb9a40dc46b1be36447683ef7bbc8819274d416e089bab8c525dd37bf4c5f27f58ea6290e7828b9a8388e6221a297c05308aa240776f1bb92747fa692 SHA512 f76301be0f85eb21c1c26cb09cc066b000c9ea0ac10d21a031f10f864f9e06fb042550140fc609c2058fdb5f85f46119204db56412ce8a39d20f4490a1287af4
 MISC metadata.xml 1293 BLAKE2B 185066701c363efd3520b07a9ea0cd70f94f0adfc10ea4d3cc624904c6bd66ea925bac4ccb53afa22bb7bb24b843e019fcf62e11a26c934ef16729a50f2a7117 SHA512 cb5e342c412ab146f28e75944a47d91b73b7148234c2f25966fe24993c595bff47c5e5b87bec82e07401b41338837d5425ca32f02cfee4df20d176954abb66d3
diff --git a/app-misc/ddcutil/ddcutil-0.8.4.ebuild b/app-misc/ddcutil/ddcutil-0.8.4.ebuild
deleted file mode 100644
index 2da920970975..000000000000
--- a/app-misc/ddcutil/ddcutil-0.8.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info udev user
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="http://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# Binary drivers need special instructions compared to the open source counterparts.
-# If a user switches drivers, they will need to set different use flags for
-# Xorg or Wayland or Mesa, so this will trigger the rebuild against
-# the different drivers.
-# Remove ATI/AMD driver since it's masked for removal.
-# Will most likely need to set this for AMDGPU when in portage.
-IUSE="usb-monitor user-permissions video_cards_nvidia"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="x11-libs/libXrandr
-	 x11-libs/libX11
-	 dev-libs/glib:2
-	 sys-apps/i2c-tools
-	 virtual/udev
-	 usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Bug 607818.
-	replace-flags -O3 -O2
-
-	# Python API is still very experimental.
-	local myeconfargs=(
-		$(use_enable usb-monitor usb)
-		--disable-swig
-		--enable-lib
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		enewgroup i2c
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			enewgroup video
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild b/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
deleted file mode 100644
index a1402f71b646..000000000000
--- a/app-misc/ddcutil/ddcutil-0.8.6-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info udev user
-
-DESCRIPTION="Program for querying and changing monitor settings"
-HOMEPAGE="http://www.ddcutil.com/"
-SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
-REQUIRED_USE="drm? ( X )"
-
-RDEPEND="dev-libs/glib:2
-	sys-apps/i2c-tools
-	virtual/udev
-	drm? ( x11-libs/libdrm )
-	usb-monitor? (
-		dev-libs/hidapi
-		virtual/libusb:1
-		sys-apps/usbutils
-	)
-	X? (
-		x11-libs/libXrandr
-		x11-libs/libX11
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( ${FILESDIR}/${P}-remove-pedantic-cflag.patch )
-
-pkg_pretend() {
-	# This program needs /dev/ic2-* devices to communicate with the monitor.
-	CONFIG_CHECK="~I2C_CHARDEV"
-	ERROR_I2C_CHARDEV="You must enable I2C_CHARDEV in your kernel to continue"
-	if use usb-monitor; then
-		CONFIG_CHECK+=" ~HIDRAW ~USB_HIDDEV"
-		ERROR_HIDRAW="HIDRAW is needed to support USB monitors"
-		ERROR_I2C_CHARDEV="USB_HIDDEV is needed to support USB monitors"
-	fi
-
-	# Now do the actual checks setup above
-	check_extra_config
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Bug 607818.
-	replace-flags -O3 -O2
-
-	local myeconfargs=(
-		$(use_enable drm)
-		$(use_enable usb-monitor usb)
-		$(use_enable X x11)
-		--enable-lib
-		--disable-cffi
-		--disable-cython
-		--disable-swig
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if use user-permissions; then
-		udev_dorules data/etc/udev/rules.d/45-ddcutil-i2c.rules
-		if use usb-monitor; then
-			udev_dorules data/etc/udev/rules.d/45-ddcutil-usb.rules
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if use user-permissions; then
-		enewgroup i2c
-		einfo "To allow non-root users access to the /dev/i2c-* devices, add those"
-		einfo "users to the i2c group: usermod -aG i2c user"
-		einfo "Restart the computer or reload the i2c-dev module to activate"
-		einfo "the new udev rule."
-		einfo "For more information read: http://www.ddcutil.com/i2c_permissions/"
-
-		if use usb-monitor; then
-			enewgroup video
-			einfo "To allow non-root users access to USB monitors, add those users"
-			einfo "to the video group: usermod -aG video user"
-			einfo "Restart the computer, reload the hiddev and hidraw modules, or replug"
-			einfo "the monitor to activate the new udev rule."
-			einfo "For more information read: http://www.ddcutil.com/usb/"
-		fi
-
-		udev_reload
-	fi
-
-	if use video_cards_nvidia; then
-		ewarn "Please read the following webpage on proper usage with the nVidia "
-		ewarn "binary drivers, or it may not work: http://www.ddcutil.com/nvidia/"
-	fi
-}
diff --git a/app-misc/ddcutil/ddcutil-0.8.6.ebuild b/app-misc/ddcutil/ddcutil-0.9.5.ebuild
index 6444e7739e03..0e1d5aff6930 100644
--- a/app-misc/ddcutil/ddcutil-0.8.6.ebuild
+++ b/app-misc/ddcutil/ddcutil-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rockowitz/ddcutil/archive/v${PV}.tar.gz -> ${P}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="drm usb-monitor user-permissions video_cards_nvidia X"
 REQUIRED_USE="drm? ( X )"
 
@@ -49,6 +49,7 @@ pkg_pretend() {
 src_prepare() {
 	default
 	eautoreconf
+	sed -i -e "s#usr/local/bin#usr/bin#" data/etc/udev/rules.d/45-ddcutil-usb.rules || die
 }
 
 src_configure() {
diff --git a/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch b/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
deleted file mode 100644
index e20cc36459ec..000000000000
--- a/app-misc/ddcutil/files/ddcutil-0.8.6-remove-pedantic-cflag.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -urN a/src/app_sysenv/Makefile.am b/src/app_sysenv/Makefile.am
---- a/src/app_sysenv/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/app_sysenv/Makefile.am	2018-01-28 20:16:44.143484825 +0000
-@@ -15,8 +15,8 @@
- 
- 
- AM_CFLAGS = -Wall 
--AM_CFLAGS += -Werror
--AM_CFLAGS += -Wpedantic
-+#AM_CFLAGS += -Werror
-+#AM_CFLAGS += -Wpedantic
- 
- if ENABLE_CALLGRAPH_COND
- AM_CFLAGS += -fdump-rtl-expand
-diff -urN a/src/base/Makefile.am b/src/base/Makefile.am
---- a/src/base/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/base/Makefile.am	2018-01-28 20:21:31.124936834 +0000
-@@ -4,7 +4,7 @@
-   -I$(top_srcdir)/src/public
- 
- AM_CFLAGS = -Wall 
--AM_CFLAGS += -Werror
-+#AM_CFLAGS += -Werror
- # AM_CFLAGS += -Wpedantic
- 
- if ENABLE_CALLGRAPH_COND
-diff -urN a/src/cmdline/Makefile.am b/src/cmdline/Makefile.am
---- a/src/cmdline/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/cmdline/Makefile.am	2018-01-28 20:20:32.178848976 +0000
-@@ -4,7 +4,7 @@
-   -I$(top_srcdir)/src/public
- 
- AM_CFLAGS  = -Wall 
--AM_CFLAGS += -Werror
-+#AM_CFLAGS += -Werror
- # flags g_option parser structs in cmd_parser_goption.c
- # AM_CFLAGS += -Wpedantic
- 
-diff -urN a/src/ddc/Makefile.am b/src/ddc/Makefile.am
---- a/src/ddc/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/ddc/Makefile.am	2018-01-28 20:18:09.643626498 +0000
-@@ -11,8 +11,8 @@
- 
- 
- AM_CFLAGS = -Wall 
--AM_CFLAGS += -Werror
--AM_CFLAGS += -Wpedantic
-+#AM_CFLAGS += -Werror
-+#AM_CFLAGS += -Wpedantic
- 
- if ENABLE_CALLGRAPH_COND
- AM_CFLAGS += -fdump-rtl-expand
-diff -urN a/src/i2c/Makefile.am b/src/i2c/Makefile.am
---- a/src/i2c/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/i2c/Makefile.am	2018-01-28 20:17:30.271562118 +0000
-@@ -4,8 +4,8 @@
-   -I$(top_srcdir)/src/public
- 
- AM_CFLAGS = -Wall 
--AM_CFLAGS += -Werror
--AM_CFLAGS += -Wpedantic
-+#AM_CFLAGS += -Werror
-+#AM_CFLAGS += -Wpedantic
- 
- if ENABLE_CALLGRAPH_COND
- AM_CFLAGS += -fdump-rtl-expand
-diff -urN a/src/sample_clients/Makefile.am b/src/sample_clients/Makefile.am
---- a/src/sample_clients/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/sample_clients/Makefile.am	2018-01-28 20:19:57.230795822 +0000
-@@ -7,7 +7,7 @@
- -I$(top_srcdir)/src
- 
- AM_CFLAGS = -Wall -fPIC
--AM_CFLAGS += -Werror
-+#AM_CFLAGS += -Werror
- 
- check_PROGRAMS =
- if ENABLE_SHARED_LIB_COND
-diff -urN a/src/test/Makefile.am b/src/test/Makefile.am
---- a/src/test/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/test/Makefile.am	2018-01-28 20:19:03.509712410 +0000
-@@ -12,7 +12,7 @@
- 
- 
- 
--AM_CFLAGS = -Wall -Werror
-+AM_CFLAGS = -Wall
- 
- if ENABLE_CALLGRAPH_COND
- AM_CFLAGS += -fdump-rtl-expand
-diff -urN a/src/usb/Makefile.am b/src/usb/Makefile.am
---- a/src/usb/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/usb/Makefile.am	2018-01-28 20:18:26.146653076 +0000
-@@ -5,7 +5,7 @@
- -I$(top_srcdir)/src/public 
- 
- AM_CFLAGS  = -Wall 
--AM_CFLAGS += -Wpedantic
-+#AM_CFLAGS += -Wpedantic
- 
- if ENABLE_CALLGRAPH_COND
- AM_CFLAGS += -fdump-rtl-expand
-diff -urN a/src/util/Makefile.am b/src/util/Makefile.am
---- a/src/util/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/util/Makefile.am	2018-01-28 20:21:07.245901502 +0000
-@@ -3,7 +3,7 @@
-   $(LIBDRM_CFLAGS)
- 
- AM_CFLAGS = -Wall 
--AM_CFLAGS += -Werror
-+#AM_CFLAGS += -Werror
- # -pedantic issues warnings re code that doesn't conform to ISO C
- #  Alas, -m modifier on sscanf is a POSIX extension, not ISO C
- #  In combination with -Werror, causes device_util.c to fail compilation
-diff -urN a/src/vcp/Makefile.am b/src/vcp/Makefile.am
---- a/src/vcp/Makefile.am	2018-01-20 06:40:55.000000000 +0000
-+++ b/src/vcp/Makefile.am	2018-01-28 20:19:28.024750741 +0000
-@@ -4,7 +4,7 @@
-   -I$(top_srcdir)/src/public
- 
- AM_CFLAGS  = -Wall 
--AM_CFLAGS += -Werror
-+#AM_CFLAGS += -Werror
- # vcp_feature_codes.c requires extensive changes if -Wpedantic
- # AM_CFLAGS += -Wpedantic
- 
diff --git a/app-misc/egads/Manifest b/app-misc/egads/Manifest
index 2a9d5d6d4df8..529c00a362ef 100644
--- a/app-misc/egads/Manifest
+++ b/app-misc/egads/Manifest
@@ -1,4 +1,4 @@
 DIST egads-0.9.5.tar.gz 302708 BLAKE2B d9d08f08d09b4e5dc3f49f9c0fa14f9ed9a96f74576bcfbada9c9490c544711c05e84266e208a251c74d44ccbc453e3dbb8ce7bd5e3171a401cfc91d04e70c20 SHA512 b3138d31165f25c4b4b83b72eeee5fd0ea80e2d89a1a67f1d6d40c82afd849ef76ebdb5e71165eb80c00c971dd0bb4e9660fcb70ffedb7e14a003be90ce91e7b
 EBUILD egads-0.9.5-r1.ebuild 1013 BLAKE2B 8f27b783b53c6082b6d18e7a276042761f6a549eba2e3a626c2f1867d2cef7c2216342152acd6f108c3858ebe8c7b27dd28db372335793dcfe674d54a2cf058c SHA512 5f2c413108bb0442bbba029299bc29fb26a1b648daa1070f810526e61769c9f9bd8d371b8baf43cd84d0516128f175ef03638892597fb279ec1a5c44c1091eb3
-EBUILD egads-0.9.5.ebuild 1056 BLAKE2B 449f25653cd8845e447225efae54cb8c8d804d746ebf3e98cc4c9844d64e85f73e965abe2fc6bd6c7a65947f67fc88c11f1a75b979b31297ea17841d56f8f649 SHA512 7a301f1d8837e972adb342cee703d71463bc7130296f92b6d6cebbb437c0a3dde8ea7098e843ac2225b241ea53c75b2ba4afbb0558b8425acc633333239f6a50
+EBUILD egads-0.9.5.ebuild 1053 BLAKE2B 7a5adc5173ea61428091aeb001df7304b741c102c08f4c1982c23eccfa2ac7225048fbdf4a07819299fff53670237e1d93bdf98bbb86496efe0318e0397e637c SHA512 50c4e616310d2e2c8004c71d303a4b4d3902038fa42d42479111af1e70a8decd0ed54b05e78105a0219f3f00f7904dfc32b86d7aec4aa3a3edeff540c3396f18
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-misc/egads/egads-0.9.5.ebuild b/app-misc/egads/egads-0.9.5.ebuild
index d5b679a67010..e6296724932f 100644
--- a/app-misc/egads/egads-0.9.5.ebuild
+++ b/app-misc/egads/egads-0.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -11,7 +11,7 @@ SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~ppc x86 ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index e7afe4f77566..431a48a7598a 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -25,5 +25,5 @@ EBUILD elasticsearch-6.6.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355ad
 EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.8.1.ebuild 2579 BLAKE2B 8581c232ba6a291994a61ef4c9406bfaf0fb6590fee36c60cab0d319a8a0472e2899fc2e136ab4267c1b6d6d52d601d4d4cb7fd5090ae05e46b63856dd986974 SHA512 956ab4ca9d9d5643ea3045cb15d6e98c6de74fe4bed56b4e44cca9a5b9073ad3d04fb24c8b7c04bb0dcee7f0a5baa9a44aea8e00999857fe51437e42bd6015a1
 EBUILD elasticsearch-7.0.0.ebuild 2570 BLAKE2B 34f783dfea91989cb241fa8f1e94c209509bc87d9d63c754507d23aeb3b10d1dc97819764505227982b4721eb73280f9dc01b59034bcdbbc31fea0b454a1ab2f SHA512 59a97e54612b663302de40f5a94c7ee03c046f9642ea2d3966a53723c11e0b224a125443983bbf31eb9ffbbb372f90fdfbbd1239f283b3268af590c029da42bc
-EBUILD elasticsearch-7.2.0.ebuild 2570 BLAKE2B 34f783dfea91989cb241fa8f1e94c209509bc87d9d63c754507d23aeb3b10d1dc97819764505227982b4721eb73280f9dc01b59034bcdbbc31fea0b454a1ab2f SHA512 59a97e54612b663302de40f5a94c7ee03c046f9642ea2d3966a53723c11e0b224a125443983bbf31eb9ffbbb372f90fdfbbd1239f283b3268af590c029da42bc
+EBUILD elasticsearch-7.2.0.ebuild 2478 BLAKE2B 152933e675b5d159de07e31592f883d16206201b844056c3e27ba69b27769700ff0891938e017deb0600d3be08b1d172d2856b482b7a98887f648ef54f151e49 SHA512 de5df3dae8215eb3fa3cb2306a0da5b87e3dd4135b8cbf663fd297d6b8e074b643b4c611f34da5ac87fce7658b46efc7803ff92f97b44cd88ae6af5d98fd5e8c
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-7.2.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.2.0.ebuild
index 8d3ce3b93b46..c4dd0389607b 100644
--- a/app-misc/elasticsearch/elasticsearch-7.2.0.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-7.2.0.ebuild
@@ -28,10 +28,6 @@ src_prepare() {
 
 	rm LICENSE.txt NOTICE.txt || die
 	rmdir logs || die
-
-	if use x-pack; then
-		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
-	fi
 }
 
 src_install() {
diff --git a/app-misc/getopt/Manifest b/app-misc/getopt/Manifest
index ae3a16152b2d..095c9ca4bf7f 100644
--- a/app-misc/getopt/Manifest
+++ b/app-misc/getopt/Manifest
@@ -3,6 +3,6 @@ AUX getopt-1.1.5-libintl.patch 352 BLAKE2B 39cb63285b1124a2c8577bd52128e04e0e86b
 AUX getopt-1.1.5-setlocale.patch 323 BLAKE2B ee68f23549c402bdb91cd4475ee0b1d30d8254d5161874eb029ce7536b3679fe5f323590c86d28af2dec9c2c6ba8ac95b0a3ac6103cda13fe8349629c13c872c SHA512 1ceb4353355cd1af697b5d46bd58b092b8792a2add97fb8498bfa6e036487e8c811333b03d0461117f1c2c5e90a3f33cf773cb9b0732c753beb8d75345e6c36e
 AUX getopt-1.1.6-longrename.patch 3013 BLAKE2B 608ad737eaad184436a321797b5099bbe5a1436e812a40a2ee30aa7b80e86f360e9e3c18629ae96e5edd6d0090a74758b99699833052dee2db7e76bd055f2659 SHA512 7157f9bd2bc660519972898bd24f0f04f01196a54c44a3a3ba4b0fda0acfb9b13cabba7cfbd1e784e9f5b3c94f2955325f47933e5d6affcb1a0f740d933206b9
 DIST getopt-1.1.6.tar.gz 58926 BLAKE2B 839b9c1701c21425cbc6b68ab245eb693e0e575a0673f62e3cca8f6932485c1124f42710c0ebeb3c157ab89e56e02b251a99aca7a12723735c63f33443003007 SHA512 aa5476e729f33ddd3f32f38b2565da319fdfe034f11549218d5d9953e70dad764e0d9a82bb10efe4043c86ae87f944619b8a2f29a197f592bd855699961d8e10
-EBUILD getopt-1.1.6-r1.ebuild 1725 BLAKE2B cbd0ac71f36d1aa953ac893828e212c0b9606034c5a3e536587af1fb9320c46cb49c875ac423c07db052cf4fb88334e0636384d89326c6bc0d7bebe241080414 SHA512 f1c902aeff9f5204385f32827851b6f021237dd317e54eca372d362080b289952681b69e2e99c40ce05e35f7652d3bba2e818a2c921f81dc8492427d1bacb34c
+EBUILD getopt-1.1.6-r1.ebuild 1725 BLAKE2B 4afc4dbe9d363d2f7fb15075ec7cfe053a32979031a8ffa77888813b469c2d20cdc7b6bd67dd613ee3a3c3e9eb4bdb1bac98aee8a6d8609fcfd0833e86b44733 SHA512 d729a7d9af29ae0986bd25cfeffb414ca7f8b848ecf6118d192db679d53e000fe0d2d957b50716012d460710db912a6197ea7af1e6c8b7d6872e86f9b29f100c
 EBUILD getopt-1.1.6.ebuild 1819 BLAKE2B 953d9c9457a19cbd4b39643f1d092858034d486f88a8882a463b5cdc6fe1766cd4ea9136ca1902445ab583e90045392ddef9835182b8c82b6bec8a945b62e51d SHA512 7e938cd0e900fe6046f194dbea40d1051a33b1af6f243236b90d4d1d316a438cfe3124c08c699a4e1ffe6270fb2440154dec1462f02afb50026f1252232c20bf
 MISC metadata.xml 342 BLAKE2B 799fd88b4f38206d301039f579ea9b29920c98946ad0c5fdc57d2ae32d280843c5dfbd4db50d3f4cf7aee7f287d79361878d366ecc8b415406182639a3cffca0 SHA512 90fdb073ca1dcd23506cb421440ec9719517f4bbb6839f5944898a3368bd01aba189346c26a27928a777ef59b22256ea5046ed9180b5b2ff034afbc7b4374b05
diff --git a/app-misc/getopt/getopt-1.1.6-r1.ebuild b/app-misc/getopt/getopt-1.1.6-r1.ebuild
index 0acad8e55401..285656652b93 100644
--- a/app-misc/getopt/getopt-1.1.6-r1.ebuild
+++ b/app-misc/getopt/getopt-1.1.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://frodo.looijaard.name/system/files/software/getopt/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64-fbsd ~m68k-mint ~ppc-aix ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-cygwin ~x64-macos ~x64-solaris ~x86-fbsd ~x86-macos ~x86-solaris"
+KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index d4922e090389..65e5316ca9d4 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,10 +1,6 @@
 AUX gramps-4.2.8-uncompressed-docs.patch 1261 BLAKE2B 48ebdddf13e9f29f01a3f5456686fce3d93e89437264c96918b39800f95a0bf65ed05802a74c6061aa3a375d710fdfe484c8a8afffd4a6805487453f4ebc96b7 SHA512 422338a2b6aa7865c59c5238728be95e7852097a464d328fc5d75c93305c05a1a05dc077c0a20838d66d67984d1cb9d9482fc92763f022f08a88d2dc414c5b0d
-DIST gramps-4.2.5.tar.gz 18694912 BLAKE2B f91bc665ab4a970e7de193ba3bea4250e99b692cb92e76fae4a37cfa2c46280e6a45ff6712c7a68213735b6e7016f2caa3180971976c92aaa7e61d73ad2e3d5a SHA512 20a8ebff7ea2e3a80248830e55d58ebe0b5a350e1ac31efb3f2b900af38c134037bae91a58fb441be54f9fac8226555a3f5771cc358d3a4a92e89af911433b9c
 DIST gramps-4.2.8.tar.gz 18704769 BLAKE2B 795febcc2c93a0c9b72aceeba1ac4c4f10953c2bf3b23dd8d38f662a231e21967e6f263e14d2344ef2f422e170617b7b80be4fafc2cb20c4a659366836b0e641 SHA512 c814914eb3a650dd5753d83e492d91d5db11b55321f63bd460e4eb8d80a36dd727a3792a203e3061dfaa89fd13549f51809bb83cc65b2a494c1fb8f42dcb4b8f
-DIST gramps-5.0.0.tar.gz 16773759 BLAKE2B 603a73b448fd41e4d491ca681c0177112541ff780566756f26a2bca7614a4699b90006d321e7925dd936a32367ccfd9b4b93d6ce70af5b750de641b17dd9c2d8 SHA512 95d775fc48a8165b14431a76cd9e60a80df5db0256c98d953fd1a270849446748d8630e0b5ff1b823345fcc7992b48a7c9d577c81a28e10ba0a6177f2501b6e3
 DIST gramps-5.0.1.tar.gz 16718439 BLAKE2B 75b4a70275f7e6e181ba948df6fe44cbb9221436c2e860db8ef83bcc02b916aa3921ae09fa8ed18876f28551ed10b5047ae1aef0967b48532b54ad97c8af6d8a SHA512 68b905a8e59eedb620329b05bdd4cca842a79f885645140d31b637fc82ec7470892ebf0fd899aeb6a1205473f79e7f13d6c5e05b36da94b9049dcbb78e07aa76
-EBUILD gramps-4.2.5.ebuild 1329 BLAKE2B eb4941ffc03a82ad7a37945154859b9c3dc6e13af011ac089b6d25f592e03a257b9eb7ceb2af9f667a8c1dd93e3201b914c8198f0fb60b5e32183fbf4c49bc3f SHA512 fb77d8bd3d7a498319e685b4ce1fc0aedb7aa107fd6e3dc4aee6f835fe7dc5c4cf4aa8b5cd9c89dc9a64868af49ace3b9d792c1039328b6eb720fa45a79957de
 EBUILD gramps-4.2.8.ebuild 1601 BLAKE2B 45868269d9ba22e5a62f44cf3e87be2e50c1cababffed858e27fb828cb7c1ed4fe54cd955932ffe24921672e68d7ac67cdbbf6dc212dceaff88b779b19b390d7 SHA512 751c5b2fc03b4b890531d756ff8f3c09cf33eb63eb56c0af80412f58abb5f84f4d9a0ebabed06f50828665aaa19f47e8bae081436a9e02603486615f689a6ddf
-EBUILD gramps-5.0.0.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
-EBUILD gramps-5.0.1.ebuild 1992 BLAKE2B 00f8c8c35bed71c0c209dd8505d501ca77c6138bfd61c5843586b2d0374c2599ee9cba4b4ce1857bc9011a06f5e81242cb03c08ed2e905529b7435401e8efc50 SHA512 46f756b69e9c8f4d6832373e94a38c6d8f0fff07c75ed34142d64b0a3901d9a3d1747aa794e59f8c56539982f449dd894f6d8ff19e391fa0c52657d2e46ce784
+EBUILD gramps-5.0.1.ebuild 1990 BLAKE2B 8012d40f4b7a242b1b7bb925182806af27551f537c495e2da48f6b79af71948260719e2ea9bec01aeb62d499e57938fab418c0d2929b2a25a091b1b934132ca2 SHA512 278b9b856616bb6df57807ccdfb7c89d801ac8d0f4b5e8c8cae5d6aff29ad6ab0a2ac4d8bf9f46142a0af5a8bd3ff4f3c01d8303898643f279dab34a8484fc04
 MISC metadata.xml 5598 BLAKE2B ff887427b9bcb043e848c7e7b9fbcd3e4364f4a8672f94e35ae08644e0417d2c35292beca630731bf1a21f0c8bcc7075a7607c9fb35f3c3bd674bf199665b70e SHA512 42ac77766caef5c416c1c99dbeea7d3e8191f745f461147ba7ff04211339f961abe9cc4c609eb926799844bb0c83d9e58b33fd00ed4a4c71826ca7f48f8da264
diff --git a/app-misc/gramps/gramps-4.2.5.ebuild b/app-misc/gramps/gramps-4.2.5.ebuild
deleted file mode 100644
index 350c693e8837..000000000000
--- a/app-misc/gramps/gramps-4.2.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_5 )
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+reports exif geo spell"
-
-RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-"
-
-python_configure_all() {
-	mydistutilsargs=( --resourcepath=/usr/share )
-}
-
-python_prepare_all() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-misc/gramps/gramps-5.0.0.ebuild b/app-misc/gramps/gramps-5.0.0.ebuild
deleted file mode 100644
index 3ce0f03cb286..000000000000
--- a/app-misc/gramps/gramps-5.0.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-
-DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="Genealogical Research and Analysis Management Programming System"
-HOMEPAGE="https://gramps-project.org/"
-SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+rcs +reports exif geo postscript spell"
-
-RDEPEND="
-	dev-python/bsddb3[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
-	dev-python/pyicu[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	>x11-libs/gtk+-3.14.8:3[introspection]
-	x11-libs/pango[introspection]
-	x11-misc/xdg-utils
-	reports? ( media-gfx/graphviz[postscript?] )
-	exif? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
-	geo? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	spell? ( app-text/gtkspell:3[introspection] )
-	rcs? ( dev-vcs/rcs )
-"
-
-python_prepare_all() {
-	# Install documentation to the proper location. This can't be done
-	# easily with a patch because we substitute in the $PF variable,
-	# and that changes with every revision.
-	sed -i "s:share/doc/gramps:share/doc/${PF}:g" setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	mydistutilsargs=(
-		--resourcepath=/usr/share
-		--no-compress-manpages
-	)
-}
-
-python_test_all() {
-	# GRAMPS builds just fine out of tree but it confuses its test suite.
-	# The following might be an ugly hack but at least it lets the tests
-	# run properly until either I or upstream have come up with something
-	# better.
-	rm -rf "${S}/build" && ln -s "${BUILD_DIR}" "${S}"/build || \
-		die "Failed to symlink build directory to source directory"
-
-	esetup.py test
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-misc/gramps/gramps-5.0.1.ebuild b/app-misc/gramps/gramps-5.0.1.ebuild
index 3ce0f03cb286..858b7da41f7e 100644
--- a/app-misc/gramps/gramps-5.0.1.ebuild
+++ b/app-misc/gramps/gramps-5.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gramps-project/${PN}/archive/v${PV}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+rcs +reports exif geo postscript spell"
 
 RDEPEND="
diff --git a/app-misc/irtrans-irclient/Manifest b/app-misc/irtrans-irclient/Manifest
index 26988bad08de..8dc6492cf347 100644
--- a/app-misc/irtrans-irclient/Manifest
+++ b/app-misc/irtrans-irclient/Manifest
@@ -1,4 +1,4 @@
 DIST irclient-src-6.01.05.tar.gz 69814 BLAKE2B fb8d854fa9c00e57ff5f4002047c1733fb42e95d4055efb2c23bdbe381f901705973f54c155a65ddab1ca134d0c31b5e36eb90784a9e9986bbd5c8a2f4d4775d SHA512 47d76f66ce6422252624dd805fbff042bcd9443f04b656cb2b20267dbf42a57345a0ac5cda0204a44535088a06c1232d2dea6305ad3561c78a7330774c1e998e
 DIST irtrans-irclient-5.11.04-ip_assign-1.patch.bz2 5051 BLAKE2B 79b8fb9249c69e8a868771a288e5f0e7c4d6658d36f97ce1ac0c577dae5c810207780406bb7a87df3392eb795463b9c62c6ce7d99ef349111db99637ee8d2432 SHA512 9be72f7f6fcc24c9bda73cf5dd8a2c112c6cb82e2ef50d40c17b43d7dcb8f11bcf8bc0ebb914046b5429bce1b4936278ade936db6c916384fbd637a300f528cf
-EBUILD irtrans-irclient-6.01.05-r1.ebuild 1331 BLAKE2B 9709f86529fe6fece10be99747e312d0a2467588e32cef7391f70cfef0bfe892db88b12b0d4cdaf07853fe30c160658f5ef31a7c85d17b55ed75734ba7765ff1 SHA512 3754845152408964332914b5e4ade4a3f38d3eec9534c2f12a1e863f77ec26f5cf539f0e6aec3cd6e434e3cc65e74e5c05956a357159a317208433c16959f5f3
+EBUILD irtrans-irclient-6.01.05-r1.ebuild 1328 BLAKE2B 3a56233f675d8515eb09675b1e0253a9403d99986699de28f60972052c88a1f28001b4c757499013a38c1d04fc5dd2ae965d01adf3f07fad6354496e39f6f58c SHA512 9a9c609ef2ea621bb1a1cd53ff5751228d3531ca44256d37df88eb5bdea489c576c1542c5ae79fc02d6ba44759548a1c412322fb65ca1d100ad69e53c7b737a9
 MISC metadata.xml 460 BLAKE2B 8911eaf34bbdd8c9978c5d89582d1f0765ade9101da2102b02ab55f2f2c93384198c2fe79fcddb3ae8319bb32d0c8c973e69297a7830d7afafc454a7600dc145 SHA512 6067b6d98528ce0e9b0811ae31d949362173c43471d935197d2da5eeee5b4391cbd43b1bfbed8468c187d71c341f1eee247df0bfd3faf963104a67223501f75c
diff --git a/app-misc/irtrans-irclient/irtrans-irclient-6.01.05-r1.ebuild b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05-r1.ebuild
index ace60918ca5c..cd2c435b0b1e 100644
--- a/app-misc/irtrans-irclient/irtrans-irclient-6.01.05-r1.ebuild
+++ b/app-misc/irtrans-irclient/irtrans-irclient-6.01.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://www.irtrans.de/download/Client/irclient-src.tar.gz -> irclient-s
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/irtrans-irserver/Manifest b/app-misc/irtrans-irserver/Manifest
index 423b25a8dca1..3dbef59f2d36 100644
--- a/app-misc/irtrans-irserver/Manifest
+++ b/app-misc/irtrans-irserver/Manifest
@@ -3,5 +3,5 @@ AUX irtrans-server.initd 564 BLAKE2B 1ef6433ab6866ca5c3947737ec55a1a5bd129456aa3
 DIST irserver-6.09.04.tar.gz 665809 BLAKE2B 1f336e34a3a79490266a762520083c74f79d34b2b8603a9d4b8e29347346c658c1723608627590d39ebb66bebe9886a4052376ade81704db3b2c1cccf229b87e SHA512 d63f8bc79c2a5a8050c5ac21b086be3826f66102dc2f111bf8084b57756c6bcd84615d1675781b26520c34f7a3e08726dbc4ae94dd4f4afc446383597c433399
 DIST irserver-src-6.09.04.tar.gz 200481 BLAKE2B 7eaffd5bb335dfcbe6f0716af57aa898d2cce1a984a2f050081bd71a9c63d5d1e5949fdebdcbbbee05c337141d0efe5c6ebcb937726ff9506a766f69ed8d2f58 SHA512 09c38066e64404808856a89a8451e41a6eb8a51b98635b1515fc07050f25b4552b9cc912bd9612c6746ba67cd9b1bb45f3d4871dfa820c9e9bd810ede20f28d6
 EBUILD irtrans-irserver-6.09.04-r1.ebuild 1879 BLAKE2B b7b2863ab4fe59391803a06836d1f18c3c7107128d0d30addfe98740f9378a7ecf810f2566e855bd9590100b2f091221c2e4c7e50e07876e294e9c3adaf97fe4 SHA512 b60b4f6ce52a8c40e6057fa9efe9704be3eb87b37d1398922c1db7773d9aa5e65aca6988f5a652cb330aebb7da8a3a98390b90f5b040b382d9b47b571d17ead9
-EBUILD irtrans-irserver-6.09.04.ebuild 2006 BLAKE2B 0add7e689507a9288a13fd1e728635c202587a0d9e5c8a03396a338c32b7109d37e862da59afea77745856fdcd8933db4b7a5c4adb563c933d4045ef1134c3fb SHA512 8e9d565c322ef914c68f2dabbadfd7b4b3bc78f72e196e27a75b0d7b348602e2eaf93bcb343ccb7e35c1bd2ecff217eccb42dcb287e0c1ed69fe7350a7e7dcb3
+EBUILD irtrans-irserver-6.09.04.ebuild 2003 BLAKE2B 87a88bc13931589f4d09c88dc2670884278225562fa419f7552d5219a4bd8a1ad4ec4ad592dd094aaf143a9375b9bb562d85a48e4a7e4e1003a3eeecededeeb1 SHA512 e21da7b0e7bca442283282a7396a2c10ec61a20cb5f13083b1536be5c41cb6b0b1be3f0f42cbc6f44341055639576aab4004b406b56c47ee3b39e490019cbe11
 MISC metadata.xml 540 BLAKE2B 3355962a1d9d6d94c207254ee0f49639ac55cba6504a4ecae2470c0df4d09189c3d00f76c6dffc554d13ebaa6d154040152a3169da166232ef4f2308c968e160 SHA512 9c1297f57d16730eba72da496f870d67aae2cca6a4c49da99e2f6bd4721f13c9208599b2a1a50ed8409ebb26f772a9906c5f9969f6e2f1f262592b0af2fa4b58
diff --git a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
index fb45aecdd9ac..50d29ff2a79e 100644
--- a/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
+++ b/app-misc/irtrans-irserver/irtrans-irserver-6.09.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.disconnected-by-peer.at/irtrans/irserver-src-${PV}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="mono"
 
 RDEPEND="mono? ( >=dev-lang/mono-2.10.5 )"
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index 325da21ca114..6c65fac4ca8e 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -3,5 +3,6 @@ AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c459
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
 EBUILD lcd4linux-0.11.0_pre20170527-r1.ebuild 5594 BLAKE2B 7833584b733ca61b452ae4786d29f0b10f1cbf463a1f845ff32a8a8b9977fc196adabb6a6d9335cda10231868d6e5ea79ec862509927bd2ac371cb97e92d4ab8 SHA512 6c44114cc4067457ef452fb5f9d80463056786ab36c467e9c13c98aecb98bce3cd1fa270a71d769006370640e3d3b9ede29368f600435cac5f5c74d455e38809
 EBUILD lcd4linux-0.11.0_pre20170527-r2.ebuild 5594 BLAKE2B 8c7741943295bab61cae7e2ec667b4c4c936248df0bba28ddea5b89bbe27b38312916db62c44a5f40e0918cfe5d209d0afec89ac2db50d4e6a9571e519c63422 SHA512 2ba802b021471bd0a36fa1a3b255dfabe7f93ed876a11d448597cdbd9fafb72f95a0d68a694ab00b8766cb53941be75eb17d5b8d4dd67eb035c8bad95971ab46
+EBUILD lcd4linux-0.11.0_pre20170527-r3.ebuild 5552 BLAKE2B c24ce7b6a82ceb200a9067cb70b83f8fb085defd706bf60b92385ec1fb7b7967d90754296890b4e2fb319dbf6e3e066426b07f3f2e99b720f82460799bd129b3 SHA512 802bb7fbd25c02d0a87a35a6bf50e5cfc9fb49c3f9624feb776c1ae9f74a12802865b71e343d05be3a9559c2ef6d16520d3452392ace245451ecb28f35803f4a
 EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5550 BLAKE2B d9488943d12768363e4fe26511e203856de5a7aa61d79c5668f3b39a7bd72b0b07486b90d2e15c277de8ef04a1b828ff6e77cfe6b8eee14a5a7af5c735ceb3cc SHA512 63191fa94067bf27955c830e24fe13c49b9217ef9eedbbd62fc1f0399c7242062696d076dbaff98fb9a0b33fab297fc94069ebae6610c0ad39467980d75f350c
 MISC metadata.xml 3555 BLAKE2B 507770da472d7befe06269d3b8ed52ca258467acb8d18892f47db3a630742c66f48f55f069c160ef0c889bc0fd31fbdd41b81fc6574ff4a51eea247373b8e25e SHA512 618885236669c7b9c28114d01f2f2f8c05638eb4eb85aca3d311d180cf82af01255f143ccdc0db2e890d42d2cb7fa3223638fcf4985d80322c95101e6c00e9fe
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r3.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r3.ebuild
new file mode 100644
index 000000000000..75e8edadfc1f
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r3.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A small program that grabs information and displays it on an external LCD"
+HOMEPAGE="https://lcd4linux.bulix.org/"
+SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dmalloc outb"
+REQUIRED_USE="
+	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
+# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
+# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
+IUSE_LCD_DEVICES=(
+	ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
+	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
+	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
+	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
+	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11
+)
+
+# Define the list of valid lcd4linux plugins.
+# Some plugins were removed from this list:
+# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
+# - ppp: It has been replaced by the netdev plugin.
+# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
+# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
+IUSE_LCD4LINUX_PLUGINS=(
+	apm asterisk button_exec cpuinfo dbus diskstats dvb exec event
+	fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv
+	loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3
+	proc_stat python qnaplog raspi sample statfs uname uptime
+	w1retap wireless
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+	LCD_DEVICE=${LCD_DEVICE,,}
+	IUSE+=" lcd_devices_${LCD_DEVICE} "
+	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
+REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="
+	lcd_devices_astusb? ( virtual/libusb:0= )
+	lcd_devices_bwct? ( virtual/libusb:0= )
+	lcd_devices_curses? ( sys-libs/ncurses:0= )
+	lcd_devices_dpf? ( virtual/libusb:0= )
+	lcd_devices_g15? ( virtual/libusb:0= )
+	lcd_devices_glcd2usb? ( virtual/libusb:0= )
+	lcd_devices_irlcd? ( virtual/libusb:0= )
+	lcd_devices_lcd2usb? ( virtual/libusb:0= )
+	lcd_devices_ledmatrix? ( virtual/libusb:0= )
+	lcd_devices_luise? (
+		dev-libs/luise-bin
+		virtual/libusb:0=
+	)
+	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
+	lcd_devices_mdm166a? ( virtual/libusb:0= )
+	lcd_devices_picolcd? ( virtual/libusb:0= )
+	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
+	lcd_devices_png? (
+		media-libs/gd[png]
+		media-libs/libpng:0=
+	)
+	lcd_devices_ppm? ( media-libs/gd )
+	lcd_devices_samsungspf? ( virtual/libusb:0= )
+	lcd_devices_serdisplib? ( dev-libs/serdisplib )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_trefon? ( virtual/libusb:0= )
+	lcd_devices_ula200? (
+		dev-embedded/libftdi:1=
+		virtual/libusb:0=
+	)
+	lcd_devices_usbhub? ( virtual/libusb:0= )
+	lcd_devices_usblcd? ( virtual/libusb:0= )
+	lcd_devices_vnc? ( net-libs/libvncserver )
+	lcd_devices_x11? ( x11-libs/libX11 )
+"
+
+# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
+DEPEND_LCD4LINUX_PLUGINS="
+	asterisk? ( net-misc/asterisk )
+	dbus? ( sys-apps/dbus )
+	gps? ( dev-libs/nmeap )
+	hddtemp? ( app-admin/hddtemp )
+	iconv? ( virtual/libiconv )
+	mpd? ( media-libs/libmpd )
+	mpris_dbus? ( sys-apps/dbus )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	python? ( ${PYTHON_DEPS} )
+	wireless? (
+		|| (
+			net-wireless/iw
+			net-wireless/wireless-tools
+		)
+	)
+"
+
+RDEPEND="
+	dmalloc? ( dev-libs/dmalloc )
+	${DEPEND_LCD_DEVICES}
+	${DEPEND_LCD4LINUX_PLUGINS}"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+		if use "lcd_devices_${lcd_device,,}"; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	# Enable all users enabled lcd4linux plugins
+	local myeconfargs_lcd4linux_plugins
+	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
+		if use "${lcd4linux_plugin}"; then
+			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin}"
+		fi
+	done
+
+	local myeconfargs=(
+		--disable-rpath
+		$(use_with dmalloc)
+		$(use_with outb)
+		$(use_with python)
+		$(use_with lcd_devices_x11 x)
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
+		--x-include="/usr/include"
+		--x-libraries="/usr/$(get_libdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install sample config, and must have 600, as lcd4linux checks this.
+	insinto	/etc/lcd4linux
+	insopts -m 0600
+	doins lcd4linux.conf.sample
+
+	newinitd "${FILESDIR}/lcd4linux-r2.initd" lcd4linux
+}
diff --git a/app-misc/matew/Manifest b/app-misc/matew/Manifest
index d577de3c5859..2f79b17d577d 100644
--- a/app-misc/matew/Manifest
+++ b/app-misc/matew/Manifest
@@ -1,3 +1,3 @@
 DIST matew-1.9.tar.bz2 29690 BLAKE2B 4bdfca7952ca072d0b2d7749ca9b8a8160db5bb843c600b74439eab1cc38b4302440adfa2e168ba915b27ccd628f693ceca1c4e2976b1ee5346740116a18ea9d SHA512 3d4f37c16567cd93b7a699c4d5f01cd655b57b79aa865aed11cb8aab7afb6cc5dc2cba9aa59f72128efa179e08eb95b1226d068e3ae15aec063bb252d9fa77b9
-EBUILD matew-1.9.ebuild 911 BLAKE2B a02a8f2df7bd4c374804ff31f503ec2346c942bc0b628319d0a8163b3e0e4e2e8edc3c044c3eb8f61ff793078d08e6f45ae2eb5567b3bbca2bd2b607fca8f07e SHA512 05441d755fa2c558c4d8cb756e8db3688ff09740bb08f1e3dc6ee7fc6ac9fa86957737a0831c408310ace2bd9f55c780cf91e90fe599ab1ac4ca4993d6bbfe17
+EBUILD matew-1.9.ebuild 908 BLAKE2B 43ddbe027b66cb203fcdfbd0a8556d108829d226982dbd10af251fffc2d3c255fac0f34b20a47bf8f024d70212400810ac3ce0c4f93f2c79b784e0b51e27c5f8 SHA512 b2513332933e551d47a8ab214ab27a55601ffe0d0a3ff8c2c8cf31d4bedaa9f351d97a704794ba803a0d7c3cebe875ecee16ed19663465902fa6d738bc71b5a6
 MISC metadata.xml 325 BLAKE2B 98c366a68f5000ec12123f37448baf0f84f2c20ec3724090aaee26029f1bee73090837e446af84e5eec9598749e86a6a9cfb696961fd212f421153f840492908 SHA512 6e9710e9171b11accdf474198ff959c8bf47e8601f156f57885b59a8dd0f81312478ed104111af45578732763127704cfea3dd1ecc51008b26b4c3b8fad46eef
diff --git a/app-misc/matew/matew-1.9.ebuild b/app-misc/matew/matew-1.9.ebuild
index 7d27f1b42561..7cf650bad544 100644
--- a/app-misc/matew/matew-1.9.ebuild
+++ b/app-misc/matew/matew-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/matew/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/mencal/Manifest b/app-misc/mencal/Manifest
index 64ee1920cbd7..06871a039d12 100644
--- a/app-misc/mencal/Manifest
+++ b/app-misc/mencal/Manifest
@@ -1,3 +1,3 @@
 DIST mencal-3.0.tar.gz 19560 BLAKE2B 741628e02756cce02386f6439a015c9c1bf8801c1eaf136a761f2dc823b38d746d8e4af23e7c22ec0147f153130c11dd01912f477ffcdd75bf0141b1cdc23276 SHA512 0a99af941b9cea4923a90065813d8434c908d52e4ead1309114a28b565ca8b8e81cf132740be4ab88159b61628c22fba65cd8a74213b58d4db69a2f315d737eb
-EBUILD mencal-3.0.ebuild 505 BLAKE2B cb73b2191932c3b7e9491331f043d55003c8abcf961647745ac820ba4f4bd6d8996b1600a53cd719a1c454c16088c72f025a1d30efc86d11f9951702f0734120 SHA512 a197eed220ad36f06ad90574da47e019d5c92038ce83bd1056ff52182b7e92574dd66b16539b6c20dece2a5b56584df23a8170c307e42c3b430bab40b9261a7e
+EBUILD mencal-3.0.ebuild 502 BLAKE2B d59c58bb4753090fa358814b2d98074a5ce2679ff1673938012340300bbe7c0e6ba968f5a1a3c2ab0379f4f8208458e0b5083b347e58a0f180cf11d7a8307fcd SHA512 7675e6e34d3e4d5d33b1dac1d7ed2175a65f96e22ef71b7f63720f8d2e3b16b6af884168a13b33d9bcc558798e264c19173ac8d572010f2862f337f505c0159e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mencal/mencal-3.0.ebuild b/app-misc/mencal/mencal-3.0.ebuild
index 0e2e70652cbc..3caf6c1be637 100644
--- a/app-misc/mencal/mencal-3.0.ebuild
+++ b/app-misc/mencal/mencal-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.kyberdigi.cz/projects/mencal/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc ~mips alpha ~hppa ia64 ~ppc64 x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index d1b2b9bbbe19..f5c865bd20d8 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,9 +1,3 @@
-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
 DIST recoll-1.25.19.tar.gz 2845683 BLAKE2B 745eac2dd3208619e173abba78f1e03186cdb5deb363c30728184a9d826c698d8e088cc0420178754131792f0d933f395a4fdb209a4315888b733a1209644580 SHA512 d56aff810e335f8212b908118de8fe12fc8d8f8341ebc281244c00dfe2216e008c655f4d39955b6c71928a28ea0aea073036fed17be5b80e8443fe6dfbe374f6
-EBUILD recoll-1.24.1.ebuild 3612 BLAKE2B 31ea52b3cfe16cbe19ec0de2578fc7444e389cfe5e5a9adbc7a9bfe36fe29c919a6cdd317887d1c9ae727eb21afd1ff49d4a0fc1f9fc3223b49d0904c9372e07 SHA512 8034a2f4ae1802520f9a2358b00ee48d22b756679ed8fbb03bab047ffde344dba609c229d837d92da703068e8c8bc356160052c9a3a93a27ceb867daa78f1dcf
-EBUILD recoll-1.25.15.ebuild 3626 BLAKE2B 681a1633e7dd55f1f42fb24f13dc6b60eb424917b990a37b64552aea69d63c72096cb3b5f86e111b62e1de303bb920764a0b52919a443f73a5402fc8febcda02 SHA512 9e5b93883050837f03cce34a3be155916205bdbf86dd76267e751c1a594ebe03a6153c38bc3d1e4fe93bd6bc00133ee4c2072b669faf468b9befc4ef85b944f5
-EBUILD recoll-1.25.19.ebuild 3626 BLAKE2B 681a1633e7dd55f1f42fb24f13dc6b60eb424917b990a37b64552aea69d63c72096cb3b5f86e111b62e1de303bb920764a0b52919a443f73a5402fc8febcda02 SHA512 9e5b93883050837f03cce34a3be155916205bdbf86dd76267e751c1a594ebe03a6153c38bc3d1e4fe93bd6bc00133ee4c2072b669faf468b9befc4ef85b944f5
+EBUILD recoll-1.25.19.ebuild 3624 BLAKE2B 84ab7b3ae1b83e87aa38dd1036e6496ce48f07b20678caefdc9fb2dd1cd318d146e0819847cc7d685d417930afab3b91bbba737fc26750875b8ddf8362627eb7 SHA512 91e30895532e449d3e17d7730f461d0a7df44bd84158d2451696dd91028e6fcca95d244b3bb7a430238691056c300454a89d0626e71380e9fd92fbe5e88c77fa
 MISC metadata.xml 1382 BLAKE2B e0fe8843b74140663aa9eb968ee212ef0fd76bda4dd17b353b8382fcee917f9d47c82c9790ccae260e375d66ff1ef34049130ddab90d89e89819139848341e00 SHA512 b677720fb6be1b93e6fc26360bb4b9c4008bb2908db4cb8a4d10e84312f5b7e2a59a4e67ef2c5c7b410abdb11b80385efc6d2d604445048a9a9a29c97141223c
diff --git a/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch b/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch
deleted file mode 100644
index 146bc981b60c..000000000000
--- a/app-misc/recoll/files/recoll-1.24.1-qt-5.11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/qtgui/ssearch_w.cpp b/qtgui/ssearch_w.cpp
-index 2d0c97c..ca72af1 100644
---- a/qtgui/ssearch_w.cpp
-+++ b/qtgui/ssearch_w.cpp
-@@ -32,6 +32,7 @@
- #include <qevent.h>
- #include <QTimer>
- #include <QCompleter>
-+#include <QAbstractItemView>
- 
- #include "log.h"
- #include "guiutils.h"
-\ No newline at end of file
diff --git a/app-misc/recoll/files/recoll-python3.patch b/app-misc/recoll/files/recoll-python3.patch
deleted file mode 100644
index 6d6fbdf39618..000000000000
--- a/app-misc/recoll/files/recoll-python3.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/filters/recoll-we-move-files.py
-+++ b/filters/recoll-we-move-files.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/env python2
- # Copyright (C) 2017 J.F.Dockes
- #   This program is free software; you can redistribute it and/or modify
- #   it under the terms of the GNU General Public License as published by
-@@ -42,6 +42,8 @@ try:
- except:
-     import rclconfig
- 
-+from __future__ import print_function
-+
- verbosity = 0
- def logdeb(s):
-     if verbosity >= 4:
diff --git a/app-misc/recoll/recoll-1.24.1.ebuild b/app-misc/recoll/recoll-1.24.1.ebuild
deleted file mode 100644
index 3d326d8297b0..000000000000
--- a/app-misc/recoll/recoll-1.24.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_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 doc +inotify qt5 session +spell"
-REQUIRED_USE="session? ( inotify ) ${PYTHON_REQUIRED_USE}"
-
-CDEPEND="
-	dev-libs/xapian:=
-	sys-libs/zlib:=
-	virtual/libiconv
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwebkit:5
-	)
-	session? (
-		inotify? (
-			  x11-libs/libSM
-			  x11-libs/libICE
-			  x11-libs/libX11
-		)
-	)
-	spell? ( app-text/aspell )
-	${PYTHON_DEPS}
-"
-
-DEPEND="
-	${CDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-RDEPEND="
-	${CDEPEND}
-	app-arch/unzip
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-python3.patch # python3 patch
-	"${FILESDIR}"/${P}-qt-5.11.patch # bugs 663028, 660912
-)
-
-pkg_setup() {
-	if has_version "<app-misc/recoll-1.20"; then
-		einfo "Installing ${PV} over an 1.19 index is possible,"
-		einfo "but there have been small changes in the way"
-		einfo "compound words are indexed. So it is best to reset"
-		einfo "the index. The best method to reset the index is to"
-		einfo "quit all recoll programs and delete the index directory"
-		einfo "rm -rf ~/.recoll/xapiandb, then start recoll or recollindex."
-	fi
-	if use inotify; then
-		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"
-
-	econf \
-		$(use_enable camelcase) \
-		$(use_enable session x11mon) \
-		$(use_enable qt5 qtgui) \
-		$(use_enable qt5 webkit) \
-		$(use_with inotify) \
-		$(use_with spell aspell) \
-		--without-fam \
-		--enable-recollq
-}
-
-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() {
-	einfo "In order to extract the full functionality of "
-	einfo "recoll, the following packages should be installed "
-	einfo "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 "CHM files support"              dev-python/pychm
-	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/recoll/recoll-1.25.15.ebuild b/app-misc/recoll/recoll-1.25.15.ebuild
deleted file mode 100644
index 05fa308a893f..000000000000
--- a/app-misc/recoll/recoll-1.25.15.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# 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/recoll/recoll-1.25.19.ebuild b/app-misc/recoll/recoll-1.25.19.ebuild
index 05fa308a893f..fa65e8334460 100644
--- a/app-misc/recoll/recoll-1.25.19.ebuild
+++ b/app-misc/recoll/recoll-1.25.19.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="camelcase chm doc +inotify qt5 session +spell webengine"
 REQUIRED_USE="
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index 2bd47b08171d..b090fcd2215d 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -4,4 +4,4 @@ AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606c
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
 EBUILD tdfsb-0.0.10-r1.ebuild 914 BLAKE2B 025a6278b386ccd288c72ea6a95c06958efd21fb01ae3076ef64319f9cd3f61c7337293944716d9f465b89f19192151c81147dc915a08e9f11bcef2e287c7723 SHA512 2307b4ea3739fdaad830787048da9f0d3eca7e5885486dfa18145038f42359fe4ef0bff574abadb9cb62a14991d2500181cf43401d8bfefc0811adbe6e0323a4
 EBUILD tdfsb-0.0.10.ebuild 869 BLAKE2B 82a15208cf84421bbdb2cf277a1bfd405bbe3a60525f781ab752e2fdc1268dc71963f93bcdfa4f093a1410b9cb1ab8505189b50f8424669451ab70f453600e26 SHA512 55c1b31d3fb421f2f5ddf6655a209eaa37bb5b201c3190bf4cbf7021d15891c8e3e32d14cf4e3d1c618092dcdce586c398abaa2a159cebb7a88ca1f5b9064da1
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/app-misc/tdfsb/metadata.xml b/app-misc/tdfsb/metadata.xml
index 097975e3adc2..c1744fe7fc5b 100644
--- a/app-misc/tdfsb/metadata.xml
+++ b/app-misc/tdfsb/metadata.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
 </pkgmetadata>
diff --git a/app-misc/tmux-mem-cpu-load/Manifest b/app-misc/tmux-mem-cpu-load/Manifest
index 767a517465f5..3320574bfc54 100644
--- a/app-misc/tmux-mem-cpu-load/Manifest
+++ b/app-misc/tmux-mem-cpu-load/Manifest
@@ -1,4 +1,4 @@
 DIST tmux-mem-cpu-load-3.4.0.tar.gz 19483 BLAKE2B eeaabcd4447b326dbf77d3e5844971d2b466c93169993d4a16912bc4d0f777b07db1b0c2973dfaef9e0cd5b4f0dfd132043aed20170a1a7856d7a3c1f6a96ba8 SHA512 f963683faa86ff7b20a658787978ce3c4c36c41fabe297e18e4b1483e680d71a3b10c220dbae5c29bc7f7cb65e79839041b53c9aaee75a17bdc78bf0b76e8dc1
 EBUILD tmux-mem-cpu-load-3.4.0.ebuild 581 BLAKE2B 5572059462a46e64382b32562d9a33e603da0e68f9f42e8e6efd23b3d2fe6c4dde69538ed6e2a251c28f0bcbd5cf267b94afc2fa6315b020dc7cca6848eee750 SHA512 b31936ddf8d4af35aee77db6d533ea3da35756a32b44422c0cd387650eca952493462c35eb3905998429e564dc635ecfbc1b893341b42787c84cf256d88207ad
 EBUILD tmux-mem-cpu-load-9999.ebuild 572 BLAKE2B fb51d056e2ed67a413dcfe13a875d50f897722f204ff0a7502a21e982c6622554c4ca9daffd566c3369ec9d8eabfafffb5c95cb88ff960be4d2e35bf677bae94 SHA512 a1aad3db36b9dcf00bb35ed13c270bb4b168505c1ffbd7455217879e5de5052cb257ed5d9510725f6281f58f16f8c6a91bdafdc110246318aee34d6521876f44
-MISC metadata.xml 233 BLAKE2B e05b8f920dfe21c6d9317562a4a2254dd8064cdaf0ea234443cc2867d417d87ea06817f234423ad58b507204af8e7222e3930f379b9957db62123dc23e0c1b86 SHA512 51ddf069656109f26ff5d12f93672537e90f70a3df00f5ffc18f4b365bc41847e441dd7aad0c50e46fe84cdac5ca6dceca1bb96de365d508cfeef1dacbaa5a0e
+MISC metadata.xml 260 BLAKE2B 14a97b3ad387216977ac6c969bf7ca5dfba37ebf731889e28275e1553920b35c5c963397021e33b8a82453182340e606d3b1a1cbd3cf47d421b1f8560a56bb64 SHA512 6a63e890d5124eab87b5ef43039892d8a85f26f0022edc61671dbd5eabf8297c97fe6718e1ac895ac6bf85bc241dc11c0f4d71b16e42755311d7a25ab94d4dc9
diff --git a/app-misc/tmux-mem-cpu-load/metadata.xml b/app-misc/tmux-mem-cpu-load/metadata.xml
index 334124a3a6e2..2b020933e875 100644
--- a/app-misc/tmux-mem-cpu-load/metadata.xml
+++ b/app-misc/tmux-mem-cpu-load/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="github">thewtex/tmux-mem-cpu-load</remote-id>
   </upstream>
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index d9f289f7e4dc..b88b566840ac 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,5 +1,5 @@
 AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1228 BLAKE2B 0c971292f98b419f7d19829cecef6c791cd1532b251647553ae3a38518984fc697e3506c09a4f70e5ac14feca914db70ccdecf9f0848f25a4f2a345429289070 SHA512 3854598d34688ea6c42b72504209d8760b49cff414e84c6ba2a34e7431bccb391e99d2649774716ac3fe5daa0810cfe516964f362e4efdf37ce03a46ea173d27
+EBUILD vlock-2.2.3-r1.ebuild 1253 BLAKE2B 987f2e8cc073a7af816343c7eec1b45afc7b3e0ee88bf5dd0bda1a745eb9f2b79ab9f84967b53eeb7b271579d3705287bbe7c353ca3320c9f7068d7ecdf270cc SHA512 60ba867a8853437d276e4512a5b54cef5b5829183dcd98016bd465ff087ec27d1e86d2dd0c2fc4dd93622d46801b54e5cd34b9fcc4d24c74e0bae2ca877d7b43
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index a824254c0335..568813b05fde 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam test"
 
 RDEPEND="
+	!>=sys-apps/kbd-2.1.0[pam]
 	pam? ( sys-libs/pam )"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2019-07-19 22:05:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-07-19 22:05:27 +0100
commit	121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch)
tree	ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /app-misc
parent	dd762ff83c330186ee2ede002e08b2f780cddd51 (diff)