diff --git a/Manifest.files.gz b/Manifest.files.gz
index 6b32ba6a00af..fa1af98ac452 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 57f2725ad7c5..69a136eab960 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 3070677970b8..33325242c614 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -2,6 +2,7 @@ DIST rsyslog-8.1901.0.tar.gz 2750872 BLAKE2B 8bc07bd0c73cf309b5fb853e3bc66e555de
 DIST rsyslog-8.1903.0.tar.gz 2786605 BLAKE2B 2c60450b5f5a54f3d4fe4f9f51c81145cdebb1b0e1dd4b76f2ad23803c8bb417affbdcc9b4a0d8ccb65b0e98f5cb5cf187ce219be3e44e44c5bd253cae5f95dc SHA512 0f698c264a4afba56467b341c094be7357fba08a6ee7a24bb1b053c06da04e83eb1832ee46b68ea21f8f4de841cd97aaadc46e78bb4adfe23604c9fe95103fa9
 DIST rsyslog-8.1904.0.tar.gz 2902708 BLAKE2B 515d5e32c2dc6cdd8dd51fc595ad775503438603f28828e9f1a427b184a5a61de32af2ee90334b7d56a9404106d74da47386a18a370278d5a16422a6bb09f556 SHA512 cccb48f06508d7e7c2dd788903f4d7ddb3020cdf6079aea1d52387c56b920f10b08957a79b5d420ccdb54cae50d1da6e5eb80cde9498bceaeda4f6ce37f694fd
 DIST rsyslog-8.1905.0.tar.gz 2911703 BLAKE2B 5767ff2e5f1104522bde2178ecadfacac3d0754fd746754b7b29509aea45c40b17cb37d0323e6b1116fc95f2e7b1f43277ef9c96695bdf89805f9ba90944f608 SHA512 e014d48c213723317b8d07e3083e32a480e2b896eccc0dc7a491798cf56fcc1e341acba64ab44c1d935e964082c405f2f1135bd420d821e163c148e736332d0b
+DIST rsyslog-8.1907.0.tar.gz 2926855 BLAKE2B 65c674e53bfa960e3fe5c7f41a304cf8736fe72e2391895dde9fdc17fabeb2f92fccab48965d5e1689a5852136a43a3355f89c9fa9d1d1974335ce80204bb4ac SHA512 2aa3f6106e48fa63c6d4389f83e7a3212817c626d04881682236055792cf5c9d8a941638c9a508c470b6a24c934ef5cb0eda65ea25179d98831afbe2a27c1519
 DIST rsyslog-8.38.0.tar.gz 2721798 BLAKE2B 578bc9eefce4893a9c1eb54ee7360cd9fa51b3c87ffe07a0fd5b122987f991835f603417243084de0b59286e993ad1c84237e61c44bc18457b3660668421101b SHA512 9dc3bdc4ef01c2af433478e182704694cb50849d811d476a03e4ce03b3c5aecfb506e7f1c1e51fadcd63da60b067d8011b92b8c9354a688fe66f7b6ffd8f9254
 DIST rsyslog-8.39.0.tar.gz 2721560 BLAKE2B 0680cb31d0a07e5676a5c5626e46fa174b8df08ceec49b514624ff8ffeb750bbf199f73af1d89b9dfad121a292084d75b0a1218fb33138f1d7a149fd730cb3d9 SHA512 f46ead433f703df4af6ddc4bbb178ea145d7d2a35ee7749c32b9889f299ba20c83ed76c246530608198e84fef1f2bf10097344c31d5df38b9e0ae47cf4bee479
 DIST rsyslog-8.40.0.tar.gz 2726022 BLAKE2B 33f7f2018200a20b01dbfabeeab592aa09d530edd313bb13f16c47cf3f67aebd9c465af3f1e468ca3d352cd83e4f4eee567c6fd54bbaee1723bee56f4631b440 SHA512 3d5d4f92e37ad9bf3767d5d7fc87fcb7956656f676a9495c78abd12fe9072ec8763b50543b198308a71d5d919721fb9b84b6725dd83a9d9b8a1639d81382c0dd
@@ -9,6 +10,7 @@ DIST rsyslog-doc-8.1901.0.tar.gz 7768575 BLAKE2B 40bc8b038fd0210d0cac01704624d87
 DIST rsyslog-doc-8.1903.0.tar.gz 7816457 BLAKE2B 0628a5e7f0a2c8229470f6b05c22fa0d01de12eace4f895e17a47e7003bf078be5f3b2df15cd13a4cf53384d285b558b0936308cb58e7c7e71796ca99447da3e SHA512 b42f950499798fd2bbf9e2ac2da074781955cc552628edcd928f25943b6b80d5f2e1a2eab3b8fb0fa2f6278f2b4366f096c3e976a91223e545b4306479ca4f5d
 DIST rsyslog-doc-8.1904.0.tar.gz 8042650 BLAKE2B 585fe5c63eee1fb46f94dcd3d529045b3900e08c291e0e71ed9bf32a6200e6c7283820b262bd56e9aeb74cc227ecd518caafec5a8f87c1d8523d5d7fd95030aa SHA512 da0ff00fbe71756b3c27fd8b94e88611452c3ba611e583862556393faaaa596ca8f32f694ad40a3e1df67385d9f9ca80db6a58f5d2e336fe95639dd7cd0de828
 DIST rsyslog-doc-8.1905.0.tar.gz 8054440 BLAKE2B 76f832fcbb41d405240f7bce4796edf4a56da5ff809ed846edbbb1b780a35837a8d061519dbec2e7afbe46a71f617d5f92f431f45f6723c055bab2fdf0df28fb SHA512 7b468aaa79a2098746bc5592f2c03270aaacb07dd06fd3be7a8c62bfe531b266e27265d873290f9a6bfb26135a4a6c49be96177a3449ff7dba54f1193c452ad3
+DIST rsyslog-doc-8.1907.0.tar.gz 8071764 BLAKE2B 90c18a93bb2f2c9158a4696245c44c36ab4c40597d1eb8df8af257f57aa17e71436bd60792c4f982ebc15395abacd53281046e4ae6df65c306f815e6599fb8bc SHA512 72dcddef6e36a92d2bdcf54072fff7516b6c731f43a53ef8f5d4ebdbe46bc7aeb63bbc3e739a6e5897602ea7705c4bdd8f57aa10796955ed772a6c7cf552c5e5
 DIST rsyslog-doc-8.38.0.tar.gz 7662314 BLAKE2B 57a121950a3f6630e4736a1ff998e93b543389107d146ddb148ecd2702bb208d21a7f4d77f2fd958f2a56e092341fc6a24ed1cc80a910cb1adb54c65b5b2da04 SHA512 e28a09ae2fcddc711d2cfd31207c9862192598e49964a47b41fc8fa3ae5b1e08b7e2589fb5af859d58d4bf028574eb56cac6514401aa56cb482fa1166863e6a5
 DIST rsyslog-doc-8.39.0.tar.gz 7674833 BLAKE2B 1526e0637c3ab9846f447dcea48efbfd17aa517c2fc875c46ac190428db6aa2a0f81f8aaed6e5b0b6991a5c13f45bc818be76c0fe4444c0eb45628ebf48b4956 SHA512 a6d09d384616a264fdf6e09fa0f61bd82a42340bac426d93119e11158f293dd58f894623aca30f2137e51bf701531f07938d014c9b8ec97d0a796447de3089de
 DIST rsyslog-doc-8.40.0.tar.gz 7709769 BLAKE2B cda3bbd005120e7100bb36cf4c0f99d3a037525c5451ead5957f4dfe06eaceeba8fb2e266f53203bee6fae97898774ee17862a52ca1dae99aeb3534bbfadcd60 SHA512 2e2f37336948984a8cf0e098eb46e61fe4de6366d63a98204ecd558f4e21b7c1f222659f7bdecdd22e0a61d34c442b4734dbe72a72e8716c768a900b954d473f
diff --git a/app-admin/rsyslog/rsyslog-8.1907.0.ebuild b/app-admin/rsyslog/rsyslog-8.1907.0.ebuild
new file mode 100644
index 000000000000..fcb04c2146f0
--- /dev/null
+++ b/app-admin/rsyslog/rsyslog-8.1907.0.ebuild
@@ -0,0 +1,462 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools eutils linux-info python-any-r1 systemd
+
+DESCRIPTION="An enhanced multi-threaded syslogd with database support and more"
+HOMEPAGE="https://www.rsyslog.com/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rsyslog/${PN}.git"
+
+	DOC_REPO_URI="https://github.com/rsyslog/${PN}-doc.git"
+
+	inherit git-r3
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+
+	SRC_URI="
+		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz
+		doc? ( https://www.rsyslog.com/files/download/${PN}/${PN}-doc-${PV}.tar.gz )
+	"
+fi
+
+LICENSE="GPL-3 LGPL-3 Apache-2.0"
+SLOT="0"
+IUSE="curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup"
+IUSE+=" mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres"
+IUSE+=" rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libfastjson-0.99.8:=
+	>=dev-libs/libestr-0.1.9
+	>=sys-libs/zlib-1.2.5
+	curl? ( >=net-misc/curl-7.35.0 )
+	dbi? ( >=dev-db/libdbi-0.8.3 )
+	elasticsearch? ( >=net-misc/curl-7.35.0 )
+	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= )
+	jemalloc? ( >=dev-libs/jemalloc-3.3.1:= )
+	kafka? ( >=dev-libs/librdkafka-0.9.0.99:= )
+	kerberos? ( virtual/krb5 )
+	kubernetes? ( >=net-misc/curl-7.35.0 )
+	mdblookup? ( dev-libs/libmaxminddb:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= )
+	mysql? ( virtual/libmysqlclient:= )
+	normalize? (
+		>=dev-libs/liblognorm-2.0.3:=
+	)
+	clickhouse? ( >=net-misc/curl-7.35.0 )
+	omhttpfs? ( >=net-misc/curl-7.35.0 )
+	omudpspoof? ( >=net-libs/libnet-1.1.6 )
+	postgres? ( >=dev-db/postgresql-8.4.20:= )
+	rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	relp? ( >=dev-libs/librelp-1.2.17:= )
+	rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] )
+	rfc5424hmac? (
+		!libressl? ( >=dev-libs/openssl-0.9.8y:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-2.12.23:0= )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
+	systemd? ( >=sys-apps/systemd-234 )
+	uuid? ( sys-apps/util-linux:0= )
+	xxhash? ( dev-libs/xxhash:= )
+	zeromq? (
+		>=net-libs/czmq-3.0.2
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2015.02.24
+	virtual/pkgconfig
+	elibc_musl? ( sys-libs/queue-standalone )
+	test? (
+		>=dev-libs/liblogging-1.0.1[stdlog]
+		jemalloc? ( <sys-libs/libfaketime-0.9.7 )
+		!jemalloc? ( sys-libs/libfaketime )
+		${PYTHON_DEPS}
+	)"
+
+REQUIRED_USE="
+	kubernetes? ( normalize )
+	ssl? ( || ( gnutls openssl ) )
+"
+
+if [[ ${PV} == "9999" ]]; then
+	DEPEND+=" doc? ( >=dev-python/sphinx-1.1.3-r7 )"
+	DEPEND+=" >=sys-devel/flex-2.5.39-r1"
+	DEPEND+=" >=sys-devel/bison-2.4.3"
+	DEPEND+=" >=dev-python/docutils-0.12"
+fi
+
+CONFIG_CHECK="~INOTIFY_USER"
+WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]]; then
+		git-r3_fetch
+		git-r3_checkout
+	else
+		unpack ${P}.tar.gz
+	fi
+
+	if use doc; then
+		if [[ ${PV} == "9999" ]]; then
+			local _EGIT_BRANCH=
+			if [[ -n "${EGIT_BRANCH}" ]]; then
+				# Cannot use rsyslog commits/branches for documentation repository
+				_EGIT_BRANCH=${EGIT_BRANCH}
+				unset EGIT_BRANCH
+			fi
+
+			git-r3_fetch "${DOC_REPO_URI}"
+			git-r3_checkout "${DOC_REPO_URI}" "${S}"/docs
+
+			if [[ -n "${_EGIT_BRANCH}" ]]; then
+				# Restore previous EGIT_BRANCH information
+				EGIT_BRANCH=${_EGIT_BRANCH}
+			fi
+		else
+			cd "${S}" || die "Cannot change dir into '${S}'"
+			mkdir docs || die "Failed to create docs directory"
+			cd docs || die "Failed to change dir into '${S}/docs'"
+			unpack ${PN}-doc-${PV}.tar.gz
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# https://github.com/rsyslog/rsyslog/issues/3626
+	sed -i \
+		-e '\|^#!/bin/bash$|a exit 77' \
+		tests/mmkubernetes-cache-expir*.sh \
+		|| die "Failed to disabled known test failure mmkubernetes-cache-expir*.sh"
+
+	eautoreconf
+}
+
+src_configure() {
+	# Maintainer notes:
+	# * Guardtime support is missing because libgt isn't yet available
+	#   in portage.
+	# * Hadoop's HDFS file system output module is currently not
+	#   supported in Gentoo because nobody is able to test it
+	#   (JAVA dependency).
+	# * dev-libs/hiredis doesn't provide pkg-config (see #504614,
+	#   upstream PR 129 and 136) so we need to export HIREDIS_*
+	#   variables because rsyslog's build system depends on pkg-config.
+
+	if use redis; then
+		export HIREDIS_LIBS="-L${EPREFIX}/usr/$(get_libdir) -lhiredis"
+		export HIREDIS_CFLAGS="-I${EPREFIX}/usr/include"
+	fi
+
+	local myeconfargs=(
+		--disable-debug-symbols
+		--disable-generate-man-pages
+		--without-valgrind-testbench
+		--disable-liblogging-stdlog
+		$(use_enable test testbench)
+		$(use_enable test libfaketime)
+		$(use_enable test extended-tests)
+		# Input Plugins without depedencies
+		--enable-imdiag
+		--enable-imfile
+		--enable-impstats
+		--enable-imptcp
+		# Message Modificiation Plugins without depedencies
+		--enable-mmanon
+		--enable-mmaudit
+		--enable-mmcount
+		--enable-mmfields
+		--enable-mmjsonparse
+		--enable-mmpstrucdata
+		--enable-mmrm1stspace
+		--enable-mmsequence
+		--enable-mmutf8fix
+		# Output Modification Plugins without dependencies
+		--enable-mail
+		--enable-omprog
+		--enable-omruleset
+		--enable-omstdout
+		--enable-omuxsock
+		# Misc
+		--enable-fmhash
+		$(use_enable xxhash fmhash-xxhash)
+		--enable-pmaixforwardedfrom
+		--enable-pmciscoios
+		--enable-pmcisconames
+		--enable-pmlastmsg
+		$(use_enable normalize pmnormalize)
+		--enable-pmnull
+		--enable-pmpanngfw
+		--enable-pmsnare
+		# DB
+		$(use_enable dbi libdbi)
+		$(use_enable mongodb ommongodb)
+		$(use_enable mysql)
+		$(use_enable postgres pgsql)
+		$(use_enable redis omhiredis)
+		# Debug
+		$(use_enable debug)
+		$(use_enable debug diagtools)
+		$(use_enable debug valgrind)
+		# Misc
+		$(use_enable clickhouse)
+		$(use_enable curl fmhttp)
+		$(use_enable elasticsearch)
+		$(use_enable gcrypt libgcrypt)
+		$(use_enable jemalloc)
+		$(use_enable kafka imkafka)
+		$(use_enable kafka omkafka)
+		$(use_enable kerberos gssapi-krb5)
+		$(use_enable kubernetes mmkubernetes)
+		$(use_enable normalize mmnormalize)
+		$(use_enable mdblookup mmdblookup)
+		$(use_enable omhttp)
+		$(use_enable omhttpfs)
+		$(use_enable omudpspoof)
+		$(use_enable rabbitmq omrabbitmq)
+		$(use_enable relp)
+		$(use_enable rfc3195)
+		$(use_enable rfc5424hmac mmrfc5424addhmac)
+		$(use_enable snmp)
+		$(use_enable snmp mmsnmptrapd)
+		$(use_enable gnutls)
+		$(use_enable openssl)
+		$(use_enable systemd imjournal)
+		$(use_enable systemd omjournal)
+		$(use_enable usertools)
+		$(use_enable uuid)
+		$(use_enable zeromq imczmq)
+		$(use_enable zeromq omczmq)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc && [[ "${PV}" == "9999" ]]; then
+		einfo "Building documentation ..."
+		local doc_dir="${S}/docs"
+		cd "${doc_dir}" || die "Cannot chdir into \"${doc_dir}\"!"
+		sphinx-build -b html source build || die "Building documentation failed!"
+	fi
+}
+
+src_test() {
+	local _has_increased_ulimit=
+
+	# Sometimes tests aren't executable (i.e. when added via patch)
+	einfo "Adjusting permissions of test scripts ..."
+	find "${S}"/tests -type f -name '*.sh' \! -perm -111 -exec chmod a+x '{}' \; || \
+		die "Failed to adjust test scripts permission"
+
+	if ulimit -n 3072; then
+		_has_increased_ulimit="true"
+	fi
+
+	if ! emake --jobs 1 check; then
+		eerror "Test suite failed! :("
+
+		if [[ -z "${_has_increased_ulimit}" ]]; then
+			eerror "Probably because open file limit couldn't be set to 3072."
+		fi
+
+		if has userpriv ${FEATURES}; then
+			eerror "Please try to reproduce the test suite failure with FEATURES=-userpriv " \
+				"before you submit a bug report."
+		fi
+
+	fi
+}
+
+src_install() {
+	local DOCS=(
+		AUTHORS
+		ChangeLog
+		"${FILESDIR}"/README.gentoo
+	)
+
+	use doc && local HTML_DOCS=( "${S}/docs/build/." )
+
+	default
+
+	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+
+	keepdir /var/empty/dev
+	keepdir /var/spool/${PN}
+	keepdir /etc/ssl/${PN}
+	keepdir /etc/${PN}.d
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf" ${PN}.conf
+
+	insinto /etc/rsyslog.d/
+	newins "${FILESDIR}/50-default-r1.conf" 50-default.conf
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}-r1.logrotate" ${PN}
+
+	if use mysql; then
+		insinto /usr/share/doc/${PF}/scripts/mysql
+		doins plugins/ommysql/createDB.sql
+	fi
+
+	if use postgres; then
+		insinto /usr/share/doc/${PF}/scripts/pgsql
+		doins plugins/ompgsql/createDB.sql
+	fi
+
+	prune_libtool_files --modules
+}
+
+pkg_postinst() {
+	local advertise_readme=0
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		advertise_readme=1
+
+		if use mysql || use postgres; then
+			echo
+			elog "Sample SQL scripts for MySQL & PostgreSQL have been installed to:"
+			elog "  /usr/share/doc/${PF}/scripts"
+		fi
+
+		if use ssl; then
+			echo
+			elog "To create a default CA and certificates for your server and clients, run:"
+			elog "  emerge --config =${PF}"
+			elog "on your logging server. You can run it several times,"
+			elog "once for each logging client. The client certificates will be signed"
+			elog "using the CA certificate generated during the first run."
+		fi
+	fi
+
+	if [[ ${advertise_readme} -gt 0 ]]; then
+		# We need to show the README file location
+
+		echo ""
+		elog "Please read"
+		elog ""
+		elog "  ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
+		elog ""
+		elog "for more details."
+	fi
+}
+
+pkg_config() {
+	if ! use ssl ; then
+		einfo "There is nothing to configure for rsyslog unless you"
+		einfo "used USE=ssl to build it."
+		return 0
+	fi
+
+	# Make sure the certificates directory exists
+	local CERTDIR="${EROOT}/etc/ssl/${PN}"
+	if [[ ! -d "${CERTDIR}" ]]; then
+		mkdir "${CERTDIR}" || die
+	fi
+	einfo "Your certificates will be stored in ${CERTDIR}"
+
+	# Create a default CA if needed
+	if [[ ! -f "${CERTDIR}/${PN}_ca.cert.pem" ]]; then
+		einfo "No CA key and certificate found in ${CERTDIR}, creating them for you..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_ca.privkey.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = Portage automated CA
+		ca
+		cert_signing_key
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-self-signed \
+			--load-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--outfile "${CERTDIR}/${PN}_ca.cert.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_ca.privkey.pem"
+
+		# Create the server certificate
+		echo
+		einfon "Please type the Common Name of the SERVER you wish to create a certificate for: "
+		read -r CN
+
+		einfo "Creating private key and certificate for server ${CN}..."
+		certtool --generate-privkey \
+			--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+		cat > "${T}/${PF}.$$" <<- _EOF
+		cn = ${CN}
+		tls_www_server
+		dns_name = ${CN}
+		expiration_days = 3650
+		_EOF
+
+		certtool --generate-certificate \
+			--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+			--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+			--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+			--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+			--template "${T}/${PF}.$$" &>/dev/null
+		chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	else
+		einfo "Found existing ${CERTDIR}/${PN}_ca.cert.pem, skipping CA and SERVER creation."
+	fi
+
+	# Create a client certificate
+	echo
+	einfon "Please type the Common Name of the CLIENT you wish to create a certificate for: "
+	read -r CN
+
+	einfo "Creating private key and certificate for client ${CN}..."
+	certtool --generate-privkey \
+		--outfile "${CERTDIR}/${PN}_${CN}.key.pem" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.key.pem"
+
+	cat > "${T}/${PF}.$$" <<- _EOF
+	cn = ${CN}
+	tls_www_client
+	dns_name = ${CN}
+	expiration_days = 3650
+	_EOF
+
+	certtool --generate-certificate \
+		--outfile "${CERTDIR}/${PN}_${CN}.cert.pem" \
+		--load-privkey "${CERTDIR}/${PN}_${CN}.key.pem" \
+		--load-ca-certificate "${CERTDIR}/${PN}_ca.cert.pem" \
+		--load-ca-privkey "${CERTDIR}/${PN}_ca.privkey.pem" \
+		--template "${T}/${PF}.$$" &>/dev/null
+	chmod 400 "${CERTDIR}/${PN}_${CN}.cert.pem"
+
+	rm -f "${T}/${PF}.$$"
+
+	echo
+	einfo "Here is the documentation on how to encrypt your log traffic:"
+	einfo " https://www.rsyslog.com/doc/rsyslog_tls.html"
+}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 85ae979592cb..645b2a4c7fda 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest
index 5f7fad31d093..b6e92fd684f9 100644
--- a/app-editors/ghex/Manifest
+++ b/app-editors/ghex/Manifest
@@ -1 +1,2 @@
 DIST ghex-3.18.3.tar.xz 1630720 BLAKE2B dacca0b015dd73dca9ea7a5303de8b6ef981c7e4fd93dfdbb0782ac61f073381fef7d5a1dcb8a88f2d31319fd9583ac6f556ed6856b5ba7d3449bbf2af2c991f SHA512 e03b154a22db000a5994c68bb72280113e69e7ef210f86ab2c6578e77daabf50bac8eb620ffaad5a7eb776d23383478cbdc7fb317fa336cef55173f858519023
+DIST ghex-3.18.4.tar.xz 1420268 BLAKE2B 70a3027a2c228481ecbc6ae44c0a707c9858453e3af7bfc268b6e32a8496722cf117c1b2ce4dd798795a429dccd24e1fa9cb9d1a8c9c8fb5998243369f76ccc4 SHA512 6121a5986ee7d7f96bf7f401e155f8aa37f076af455bc68e43d1b5b02b63bc9aed3eba5209511d1b659eb4c9093ab5d9601c14a5e868d979e92a6d0ca0cf9ce2
diff --git a/app-editors/ghex/ghex-3.18.4.ebuild b/app-editors/ghex/ghex-3.18.4.ebuild
new file mode 100644
index 000000000000..da61e4d52281
--- /dev/null
+++ b/app-editors/ghex/ghex-3.18.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson xdg
+DESCRIPTION="GNOME hexadecimal editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/atk-1
+	>=dev-libs/glib-2.31.10:2
+	>=x11-libs/gtk+-3.3.8:3
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.17
+	app-text/yelp-tools
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index fe40c9b79941..e2c340c4b0dd 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 0665f4ecf0a4..8e43ccfa5657 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1 +1,2 @@
 DIST lyx-2.3.0.tar.xz 15676680 BLAKE2B 4b09f4c3979f51a8b30825c07fe3b24f080bfc8f42d54e94809e342087b683ca24edcb835994583b28d5b9c13868736f850d6c88b229e2d7f6f6bc0fd64c722c SHA512 77366d365f600069564b6d508ba2169744bbc7bc4dc9cb7e9d5f44941796dd7a027ca9ad08f5a67fd6863cbd1f6308ce5233b6e8685ebc6cf78ed19eef84ccb5
+DIST lyx-2.3.3.tar.xz 15998188 BLAKE2B 491732d1e567dfc8372a7dc7810cfc46cbe7e3b6a67637f772adddcff96225e174fe8c3db4c7f9e663cf3423da8b4bf08f67679874c9aaf556973ad46159a6cc SHA512 7b42df9da9f2906f626d568222e559bb921d003674d70c805657488180856a77143b2a3d073686116c95034e84fe8f58ee1ff8a74d47a40bd5fda7564335a0c3
diff --git a/app-office/lyx/lyx-2.3.3.ebuild b/app-office/lyx/lyx-2.3.3.ebuild
new file mode 100644
index 000000000000..3054f51d728b
--- /dev/null
+++ b/app-office/lyx/lyx-2.3.3.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+MY_P="${P/_}"
+inherit desktop flag-o-matic font python-single-r1 qmake-utils toolchain-funcs xdg-utils
+
+DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
+HOMEPAGE="https://www.lyx.org/"
+SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${MY_P}.tar.xz
+	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/${MY_P}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+IUSE="aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/mythes
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-texlive/texlive-fontsextra
+	sys-apps/file
+	sys-libs/zlib
+	virtual/imagemagick-tools[png,svg?]
+	aspell? ( app-text/aspell )
+	cups? ( net-print/cups )
+	dia? ( app-office/dia )
+	docbook? ( app-text/sgmltools-lite )
+	dot? ( media-gfx/graphviz )
+	enchant? ( app-text/enchant )
+	gnumeric? ( app-office/gnumeric )
+	html? ( dev-tex/html2latex )
+	hunspell? ( app-text/hunspell )
+	l10n_he? ( dev-tex/culmus-latex )
+	latex? (
+		app-text/dvipng
+		app-text/ghostscript-gpl
+		app-text/ps2eps
+		app-text/texlive
+		dev-tex/chktex
+		dev-tex/dvipost
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-mathscience
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-plaingeneric
+		|| (
+			dev-tex/hevea
+			dev-tex/latex2html
+			dev-tex/tex4ht[java]
+			dev-tex/tth
+		)
+	)
+	rcs? ( dev-vcs/rcs )
+	rtf? (
+		app-text/unrtf
+		dev-tex/html2latex
+		dev-tex/latex2rtf
+	)
+	subversion? ( dev-vcs/subversion )
+	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qtconcurrent:5
+	nls? ( sys-devel/gettext )
+"
+
+DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3.0-python.patch )
+
+S="${WORKDIR}/${MY_P}"
+
+FONT_S="${S}/lib/fonts"
+FONT_SUFFIX="ttf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	font_pkg_setup
+}
+
+src_prepare() {
+	default
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
+}
+
+src_configure() {
+	tc-export CXX
+	#bug 221921
+	export VARTEXFONTS="${T}"/fonts
+
+	econf \
+		$(use_with aspell) \
+		$(use_enable debug) \
+		$(use_with enchant) \
+		$(use_with hunspell) \
+		$(use_enable monolithic-build) \
+		$(use_enable nls) \
+		--enable-qt5 \
+		--with-qt-dir=$(qt5_get_libdir)/qt5 \
+		--disable-stdlib-debug \
+		--without-included-boost \
+		--with-packaging=posix
+}
+
+src_install() {
+	default
+
+	if use l10n_he ; then
+		echo "\bind_file cua" > "${T}"/hebrew.bind || die
+		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind || die
+
+		insinto /usr/share/lyx/bind
+		doins "${T}"/hebrew.bind
+	fi
+
+	newicon -s 32 "development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
+	doicon -s 48 "lib/images/lyx.png"
+	doicon -s scalable "lib/images/lyx.svg"
+
+	# fix for bug 91108
+	if use latex ; then
+		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx
+	fi
+
+	# fonts needed for proper math display, see also bug #15629
+	font_src_install
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+
+	if use hunspell ; then
+		dosym ../myspell /usr/share/lyx/dicts
+		dosym ../myspell /usr/share/lyx/thes
+	fi
+}
+
+pkg_postinst() {
+	font_pkg_postinst
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	# fix for bug 91108
+	if use latex ; then
+		texhash
+	fi
+
+	# instructions for RTL support. See also bug 168331.
+	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
+		elog
+		elog "Enabling RTL support in LyX:"
+		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
+		elog "You must enable RTL support in LyX. To do so start LyX and go to"
+		elog "Tools->Preferences->Language settings->Language"
+		elog "and make sure the \"Right-to-left language support\" is checked"
+		elog
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	if use latex ; then
+		texhash
+	fi
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index a7998138535c..c9b859301d6d 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 13cff118abee..6b4568731267 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,3 +1,3 @@
 DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
-DIST portage-utils-0.80_pre20190620.tar.xz 1761544 BLAKE2B fe39bebe6ed7afb525b7a3dbcfb2668b29195d7da7128fffb42be313e79b3d68792203bdc7711fa1961b9a1520b72e01b154e3d948aed2861feb44f130995d75 SHA512 2fc877e04213af57ba4050e9830004a0552fea5ac052d625a5635c4383b492e2ae5dcf45b01c63711b6ca6c2574b65ec44b41acd33cd03886bfa5fcc27c7d043
+DIST portage-utils-0.80_pre20190714.tar.xz 1762284 BLAKE2B 5000db2ea6ba04f1206c4ed63c9b16bf1317c1cbdfb0e677ce0c1f1f252bbde36f2bf7dd19ff22635653b58f64bef794cc21da2e945a06fddd2e7f8aaab6c853 SHA512 1c1979b627edbf5d5ca40043dc897f955c18e57c91485426ea48cd8574e4dbba1687df796ba600aaa2cd03699c1bf6217acd513f4e4d9cd1991083e0d5cf49da
diff --git a/app-portage/portage-utils/metadata.xml b/app-portage/portage-utils/metadata.xml
index dac8feca7f1d..3aac9818b8b0 100644
--- a/app-portage/portage-utils/metadata.xml
+++ b/app-portage/portage-utils/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="qmanifest">Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing</flag>
+		<flag name="qtegrity">Build qtegrity applet, this adds additional dependencies for OpenSSL</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild b/app-portage/portage-utils/portage-utils-0.80_pre20190714.ebuild
similarity index 83%
rename from app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild
rename to app-portage/portage-utils/portage-utils-0.80_pre20190714.ebuild
index daaaf9474d2c..1c8161df1e84 100644
--- a/app-portage/portage-utils/portage-utils-0.80_pre20190620.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.80_pre20190714.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static openmp +qmanifest libressl"
+IUSE="nls static openmp +qmanifest +qtegrity libressl"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -43,6 +43,22 @@ RDEPEND="
 			app-crypt/gpgme:=
 		)
 	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+		!static? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
 "
 DEPEND="${RDEPEND}"
 
@@ -51,6 +67,7 @@ src_configure() {
 		--disable-maintainer-mode \
 		--with-eprefix="${EPREFIX}" \
 		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
 		$(use_enable openmp) \
 		$(use_enable static)
 }
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index ba0d7c726581..423703f19f3f 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static openmp +qmanifest libressl"
+IUSE="nls static openmp +qmanifest +qtegrity libressl"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3 autotools
@@ -43,6 +43,22 @@ RDEPEND="
 			app-crypt/gpgme:=
 		)
 	)
+	qtegrity? (
+		openmp? (
+			|| (
+				>=sys-devel/gcc-4.2:*[openmp]
+				sys-devel/clang-runtime:*[openmp]
+			)
+		)
+		static? (
+			!libressl? ( dev-libs/openssl:0=[static-libs] )
+			libressl? ( dev-libs/libressl:0=[static-libs] )
+		)
+		!static? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+	)
 "
 DEPEND="${RDEPEND}"
 
@@ -51,6 +67,7 @@ src_configure() {
 		--disable-maintainer-mode \
 		--with-eprefix="${EPREFIX}" \
 		$(use_enable qmanifest) \
+		$(use_enable qtegrity) \
 		$(use_enable openmp) \
 		$(use_enable static)
 }
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 942533665fd2..e89dca05d679 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index c18eed5a1c0a..4862d06720e1 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -1,2 +1,3 @@
 DIST tcsh-6.20.00.tar.gz 1001696 BLAKE2B dfebde21c70f236e1070a93621a331ce1a53efab4496c44f25b51e98e843a8d0e3ca503da46a4fc0177b57b682e3ecc07f8120cde25ecf466c8ff094df5f9463 SHA512 c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
+DIST tcsh-6.21.00.tar.gz 1001909 BLAKE2B 7f2be382a3a344d55e0785eace79377e20dd2cd2eb9e9533168fbb6286631cdcd35bdc06cd42d9439a29a7cd1a911416bfe6b0245065535aebdf5adb58d2c301 SHA512 d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
 DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 BLAKE2B 58924e623c75068cdc686be61755bdbcf8d0949a2141ac532ac089f80ff083b2c9f6767038b9fc52171a00ed82c558b83216327c87b41f51c3648343869cd5b6 SHA512 9903e9c3e2279abcac09a3235f3c5db9f42156c18137eb651ede195ca2b069f0b5bc6105fed33666b69796c4ebf03e4efe63cd9beba1898bac7297a2f74bfd3d
diff --git a/app-shells/tcsh/tcsh-6.21.00.ebuild b/app-shells/tcsh/tcsh-6.21.00.ebuild
new file mode 100644
index 000000000000..dadd2ea9de5a
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.21.00.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic autotools prefix
+
+CONFVER="1.9"
+
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
+HOMEPAGE="http://www.tcsh.org/"
+SRC_URI="
+	ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
+
+LICENSE="BSD"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls doc"
+RESTRICT="test"
+
+# we need gettext because we run autoconf (AM_ICONV)
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0=
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( dev-lang/perl )"
+
+CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.20.00-debian-dircolors.patch # bug #120792
+	"${FILESDIR}"/${PN}-6.18.01-aix.patch
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	eautoreconf
+
+	# fix gencat usage
+	sed \
+		-e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
+		-i nls/Makefile.in || die
+
+	# use sysmalloc (for larger alloc sets) on Darwin also
+	sed -i -e 's/__MACHTEN__/__MACH__/' config_f.h || die
+
+	# unify ECHO behaviour
+	echo "#undef ECHO_STYLE" >> config_f.h
+	echo "#define ECHO_STYLE      BOTH_ECHO" >> config_f.h
+
+	eprefixify "${CONFDIR}"/*
+	# activate the right default PATH
+	if [[ -z ${EPREFIX} ]] ; then
+		sed -i \
+			-e 's/^#MAIN//' -e '/^#PREFIX/d' \
+			"${CONFDIR}"/csh.login || die
+	else
+		sed -i \
+			-e 's/^#PREFIX//' -e '/^#MAIN/d' \
+			"${CONFDIR}"/csh.login || die
+	fi
+
+	eapply_user
+}
+
+src_configure() {
+	# make tcsh look and live along the lines of the prefix
+	append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
+	append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
+	append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
+	append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
+	append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
+
+	econf \
+		--prefix="${EPREFIX:-}" \
+		--datarootdir='${prefix}/usr/share' \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+
+	DOCS=( FAQ Fixes NewThings Ported README.md WishList Y2K )
+	if use doc ; then
+		perl tcsh.man2html tcsh.man || die
+		HTML_DOCS=( tcsh.html/*.html )
+	fi
+	einstalldocs
+
+	insinto /etc
+	doins \
+		"${CONFDIR}"/csh.cshrc \
+		"${CONFDIR}"/csh.login
+
+	# bug #119703: add csh -> tcsh symlink
+	dosym tcsh /bin/csh
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 1e25a7433ef5..205a6a3d35ed 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/sqlcl-bin/Manifest b/dev-db/sqlcl-bin/Manifest
index 39368202cd8f..ff4d614d9e4d 100644
--- a/dev-db/sqlcl-bin/Manifest
+++ b/dev-db/sqlcl-bin/Manifest
@@ -1 +1 @@
-DIST sqlcl-17.4.0.354.2224-no-jre.zip 19731560 BLAKE2B 0ee78a39e5be5d2c23a583cf3f4790897d79e1b082036d30a071fa629912e31c3fc3dbb0e873f4013ba6d41c27c8e1d99aff851922202983842cbf09cf1c6b0b SHA512 d03e949755fc3c99661d3b87dc4576fd4cb0edd33fa2b05818bbb26cd6d066d221ad6bcc0fc2f1453a80351b82e5698a193730cbabbf84a55607a118c39b4243
+DIST sqlcl-19.1.0.094.1619.zip 21886970 BLAKE2B adf3e70521eb38b1504a384512b2c92222121084e27e98952d0f493d74fff63d6f24c00e9f1ed025cccef3305cdc47acecde604575a63221b4fedf38fa6e1885 SHA512 1d04fc7e1a9229badafeea54489db5c6ee8b3d720d84687cbdf761232388e624ac66d0ae59de99e833ae36eb3d5287d1ea556d09aad855d75b674186c55ed9a8
diff --git a/dev-db/sqlcl-bin/sqlcl-bin-17.4.0.354.2224.ebuild b/dev-db/sqlcl-bin/sqlcl-bin-19.1.0.094.1619.ebuild
similarity index 54%
rename from dev-db/sqlcl-bin/sqlcl-bin-17.4.0.354.2224.ebuild
rename to dev-db/sqlcl-bin/sqlcl-bin-19.1.0.094.1619.ebuild
index 94a010ed64de..140d82c85266 100644
--- a/dev-db/sqlcl-bin/sqlcl-bin-17.4.0.354.2224.ebuild
+++ b/dev-db/sqlcl-bin/sqlcl-bin-19.1.0.094.1619.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="${PN/-bin}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Oracle SQLcl is the new SQL*Plus"
 HOMEPAGE="https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html"
-SRC_URI="${MY_P}-no-jre.zip"
+SRC_URI="${MY_P}.zip"
 RESTRICT="bindist fetch mirror"
 
 LICENSE="OTN"
@@ -23,26 +23,29 @@ RDEPEND="virtual/jre:1.8
 S="${WORKDIR}"
 
 pkg_nofetch() {
-	eerror "Please go to"
-	eerror "	${HOMEPAGE}"
-	eerror "and download"
-	eerror "	Command Line - SQLcl"
-	eerror "		${SRC_URI}"
-	eerror "and move it to DISTDIR directory."
+	einfo "Please go to"
+	einfo
+	einfo "	${HOMEPAGE}"
+	einfo
+	einfo "and download"
+	einfo
+	einfo "	Command Line - SQLcl"
+	einfo "		${SRC_URI}"
+	einfo
+	einfo "which must be placed in DISTDIR directory."
 }
 
 src_prepare() {
 	default
-	find ./ \( -iname "*.bat" -or -iname "*.exe" \) -exec rm {} + || die "remove files failed"
-	mv sqlcl/bin/sql sqlcl/bin/"${MY_PN}" || die "rename executable failed"
+	find ./ \( -iname "*.bat" -or -iname "*.exe" \) -delete || die "remove files failed"
 }
 
 src_install() {
 	exeinto "/opt/${MY_PN}/bin/"
-	doexe "${S}/${MY_PN}/bin/${MY_PN}"
+	newexe "${MY_PN}"/bin/sql sqlcl
 
 	insinto "/opt/${MY_PN}/lib/"
-	doins -r "${S}/${MY_PN}/lib/"*
+	doins -r "${MY_PN}"/lib/.
 
-	dosym "${ED%/}/opt/${MY_PN}/bin/${MY_PN}" "/opt/bin/${MY_PN}"
+	dosym "../${MY_PN}/bin/sqlcl" /opt/bin/sqlcl
 }
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 65163179bb68..abc3bedd6504 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/lazarus/Manifest b/dev-lang/lazarus/Manifest
index b69b39a19b0b..bc8f8481aefe 100644
--- a/dev-lang/lazarus/Manifest
+++ b/dev-lang/lazarus/Manifest
@@ -1,4 +1,5 @@
 DIST lazarus-1.0.12-0.tar.gz 47687878 BLAKE2B 7a230f8ad433fefd514d8fca128e1ad127ea2a232c2061080d4146b5276ef82bd442be6a522a5eb4a9221338e8d13cf9d3cc954f712dfbc521d8fd74b07389f7 SHA512 2a106c4bff2135ace815f789057f25fea1902edc972503e883547d7cc6d50b585ae54676cba734cce616064864ce535b3a4fcd7892763d15aafdf262dbe24293
-DIST lazarus-1.6.4-0.tar.gz 57180961 BLAKE2B 930beda6ad04999e749fe4b76a64ab00b0138c18b0f3aea0cbac089ecb3f419aa4165d06757d6ee2d3c6e43401f2be5e154947d07f892a6bc5f4bb8831bad62d SHA512 d7d498483ef9e1eebd0d8ca2325d1984cb1297837ebe2f9547e67f26fc049c2168e2feeac739b8403c08a8251040e9161c962d25951545384ffbdbb076fda2aa
 DIST lazarus-1.8.4-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a7722b02165a5bf287bfeed46f28e3b36c5abeac19bd7c6555250102dce169f7c9c213b634ce1b634c24dadc84171aed10 SHA512 f244b4e86410fdb2ffe8ccba7fcb51c270286172b6102f757118827cac3b652210a625d65dd6c017c1992983527792ed64334291ab0e0b824f187316452c56b5
 DIST lazarus-1.8.4.tar.gz 63130653 BLAKE2B f9b2ba9971f1a9a9c3b8d2004bd3516c12db5384bb6243ef275c2fc0d458634fba0c1c23e7ecd5c160c1204d6cc2b4ebc340ce8bb5cfdd9c531f8c36ae59d1e2 SHA512 82cdc3c32dddf8e67c0bed9292a9a924227bab50f22ca479f5e98ecccbf60dd66c7f886ecb8e2979d9d8fccc3d25462ee8c55fcab085aa4194b4704660e0b95d
+DIST lazarus-2.0.2-python.tar.gz 1060859 BLAKE2B 4d6f7dc275aacd0f70d9f7c85aba99a7722b02165a5bf287bfeed46f28e3b36c5abeac19bd7c6555250102dce169f7c9c213b634ce1b634c24dadc84171aed10 SHA512 f244b4e86410fdb2ffe8ccba7fcb51c270286172b6102f757118827cac3b652210a625d65dd6c017c1992983527792ed64334291ab0e0b824f187316452c56b5
+DIST lazarus-2.0.2.tar.gz 67092332 BLAKE2B 12fdca5b0d7c8bcad4f1c6a70c2ebb1d0974b0884cf89135be069744f01527fcd5b2a4b4c898cb500519ec3518025da453087954722cab43a60c1cdb164371d4 SHA512 0d2bf26afa3128104181fbe57b1adeaba3bb589b0a3b72598507825a3f08201d4480c6cff510a6f866dca4d49417fac3a2f68ca7e58fabe4f4e3bad97323c071
diff --git a/dev-lang/lazarus/lazarus-1.6.4.ebuild b/dev-lang/lazarus/lazarus-1.6.4.ebuild
deleted file mode 100644
index efe6c7dbbbf6..000000000000
--- a/dev-lang/lazarus/lazarus-1.6.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-FPCVER="3.0.0"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}-0.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}
-	!=gnome-base/librsvg-2.16.1"
-
-RESTRICT="strip" #269221
-
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-		#sed -i -e '/^-Xs/d' "${PPC_CONFIG_PATH}"/fpc.cfg || die
-	fi
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED%/}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
-}
diff --git a/dev-lang/lazarus/lazarus-1.8.4.ebuild b/dev-lang/lazarus/lazarus-1.8.4.ebuild
deleted file mode 100644
index 5a5cd58c19aa..000000000000
--- a/dev-lang/lazarus/lazarus-1.8.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-FPCVER="3.0.4"
-
-DESCRIPTION="Lazarus IDE is a feature rich visual programming environment emulating Delphi"
-HOMEPAGE="https://www.lazarus-ide.org/"
-SRC_URI="https://sourceforge.net/projects/${PN}/files/Lazarus%20Zip%20_%20GZip/Lazarus%20${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
-SLOT="0" # Note: Slotting Lazarus needs slotting fpc, see DEPEND.
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-
-DEPEND=">=dev-lang/fpc-${FPCVER}[source]
-	net-misc/rsync
-	x11-libs/gtk+:2
-	>=sys-devel/binutils-2.19.1-r1:="
-RDEPEND="${DEPEND}
-	!=gnome-base/librsvg-2.16.1"
-
-RESTRICT="strip" #269221
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.9.26-fpcsrc.patch )
-
-src_prepare() {
-	default
-	# Use default configuration (minus stripping) unless specifically requested otherwise
-	if ! test ${PPC_CONFIG_PATH+set} ; then
-		local FPCVER=$(fpc -iV)
-		export PPC_CONFIG_PATH="${WORKDIR}"
-		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
-			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
-	fi
-}
-
-src_compile() {
-	LCL_PLATFORM=gtk2 emake \
-		$(usex minimal "" "bigide") \
-		-j1
-}
-
-src_install() {
-	diropts -m0755
-	dodir /usr/share
-	# Using rsync to avoid unnecessary copies and cleaning...
-	# Note: *.o and *.ppu are needed
-	rsync -a \
-		--exclude="CVS"     --exclude=".cvsignore" \
-		--exclude="*.ppw"   --exclude="*.ppl" \
-		--exclude="*.ow"    --exclude="*.a"\
-		--exclude="*.rst"   --exclude=".#*" \
-		--exclude="*.~*"    --exclude="*.bak" \
-		--exclude="*.orig"  --exclude="*.rej" \
-		--exclude=".xvpics" --exclude="*.compiled" \
-		--exclude="killme*" --exclude=".gdb_hist*" \
-		--exclude="debian"  --exclude="COPYING*" \
-		--exclude="*.app" \
-		"${S}" "${ED%/}"/usr/share \
-		|| die "Unable to copy files!"
-
-	dosym ../share/lazarus/startlazarus /usr/bin/startlazarus
-	dosym ../share/lazarus/startlazarus /usr/bin/lazarus
-	dosym ../share/lazarus/lazbuild /usr/bin/lazbuild
-	use minimal || dosym ../share/lazarus/components/chmhelp/lhelp/lhelp /usr/bin/lhelp
-	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
-
-	make_desktop_entry startlazarus "Lazarus IDE" "lazarus" || die "Failed making desktop entry!"
-}
diff --git a/dev-lang/lazarus/lazarus-1.8.4-r1.ebuild b/dev-lang/lazarus/lazarus-2.0.2.ebuild
similarity index 76%
rename from dev-lang/lazarus/lazarus-1.8.4-r1.ebuild
rename to dev-lang/lazarus/lazarus-2.0.2.ebuild
index 4564a9467aa6..8724ffdb8bac 100644
--- a/dev-lang/lazarus/lazarus-1.8.4-r1.ebuild
+++ b/dev-lang/lazarus/lazarus-2.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit desktop
 
@@ -41,6 +41,11 @@ src_prepare() {
 		sed -e 's/^FPBIN=/#&/' /usr/lib/fpc/${FPCVER}/samplecfg |
 			sh -s /usr/lib/fpc/${FPCVER} "${PPC_CONFIG_PATH}" || die
 	fi
+	sed -i \
+		-e "s;SecondaryConfigPath:='/etc/lazarus';SecondaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');g" \
+		-e "s;PrimaryConfigPath:=ExpandFileNameUTF8('~/.lazarus');PrimaryConfigPath:='/etc/lazarus';g" \
+		ide/include/unix/lazbaseconf.inc \
+		|| die
 }
 
 src_compile() {
@@ -49,14 +54,17 @@ src_compile() {
 		-j1
 	if use python; then
 		addpredict ide/exttools.pas
-		./lazbuild -B --lazarusdir="." --pcp="with-packages" --build-ide= \
+		./lazbuild -B --lazarusdir="." --pcp="../lazarus-package-config" --build-ide= \
 			--add-package ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus/python4lazarus_package.lpk \
 			|| die
-		sed -i -e "s:${WORKDIR}/Python-for-Lazarus-${PYTHON_HASH}:/usr/share/lazarus/with-packages:g" \
-			with-packages/packagefiles.xml \
-			with-packages/idemake.cfg \
+		sed -i -e "s:${WORKDIR}/Python-for-Lazarus-${PYTHON_HASH}:/etc/lazarus:g" \
+			../lazarus-package-config/packagefiles.xml \
+			../lazarus-package-config/idemake.cfg \
 			../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus/lib/x86_64-linux/python4lazarus_package.compiled \
 			|| die
+		sed -i -e "s:${WORKDIR}/lazarus-package-config:/etc/lazarus:g" \
+			../lazarus-package-config/idemake.cfg \
+			|| die
 	fi
 }
 
@@ -86,8 +94,12 @@ src_install() {
 	dosym ../lazarus/images/ide_icon48x48.png /usr/share/pixmaps/lazarus.png
 
 	if use python; then
+		diropts -m0755
+		dodir /etc/lazarus
+		cp -rf ../lazarus-package-config/* \
+			"${ED%/}"/etc/lazarus || die
 		cp -rf ../Python-for-Lazarus-${PYTHON_HASH}/python4lazarus \
-			"${ED%/}"/usr/share/lazarus/with-packages || die
+			"${ED%/}"/etc/lazarus || die
 	fi
 
 	make_desktop_entry startlazarus "Lazarus IDE" "lazarus"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 16859f38f961..0cde4cd067b3 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -7,6 +7,7 @@ DIST Python-3.6.8.tar.xz 17212420 BLAKE2B e104b49a35492b622080ab81a446c0cdd1223e
 DIST Python-3.6.9.tar.xz 17212164 BLAKE2B ef33dbc1ea3bbeaf92092de867279d759e3a204ca4e8bf0e5c6a1adbb17a9220d8829245fa9f067ec6497a5789a4f60b8db8c727bb2bd8126df470921d552a53 SHA512 05de9c6f44d96a52bfce10ede4312de892573edaf8bece65926d19973a3a800d65eed7a857af945f69efcfb25efa3788e7a54016b03d80b611eb51c3ea074819
 DIST Python-3.7.2.tar.xz 17042320 BLAKE2B 79b06b7d38590b7ad00850a4323156bfee07c4cf8531cbc09d262c6eb38721e32b8b0591fc21017e56948dd81763e9061f118f204eda5b9cc0b84e7132b42979 SHA512 6cd2d6d8455558783b99d55985cd7b22d67b98f41a09b4fdd96f680a630a4e035220d2b903f8c59ed513aa5ffe6730fa947ddb55bb72ce36f0e945ef8af5d971
 DIST Python-3.7.3.tar.xz 17108364 BLAKE2B ac86ea442519a02f0afcb0d0ec70cb288ae28df63fc9f575ee4d8e03e6e31aff9ad2ff18ff5787d922727bd1c6f1a488f94541cd9787ac932d041c93847dea34 SHA512 6d9b7c0f1764e0f655a39430a3af6f7b5e3c9b7166c042e780677a54b17ad4ca6d0d9cba262c82b1b70bba8f7c28883dad4cc0d7cc194fc7d2c1b5f4f08a763a
+DIST Python-3.7.4.tar.xz 17131432 BLAKE2B e175f750f1fa610a19a40f382ae5e652de12c775cba41bf575868c0621a8e5c4060a15a5567c207b251de5304f8321191f5bc56388c253d42cf17c5654a88ebb SHA512 71f64668c259f3ed07bd4aa239dbba6cc1b6b0a84d50bbff160664845d7986f757e4d65fca327e62a2d12ba593742ca83a22f7cb6093aff8715ec916c2ba9416
 DIST python-gentoo-patches-2.7.15.tar.xz 16208 BLAKE2B 5739c2b3a236d48f8e33f0fe6515bfe7a8f99096f6223b402653988feac2513d37d26b6e40e5e049852f42657358170e468ca60097e0e2294e760787c12ad591 SHA512 687fd008d1d41b1e65ce5417f6f6aba84ffd42f7af44ef97c03a7806b28e6888f8df043a0c15187a8b229cc17642853e6feb25494db97f4d10f8a66f8ebcbcca
 DIST python-gentoo-patches-2.7.16.tar.xz 13904 BLAKE2B 218b46f8656f4a792dcd47eabca6d59a1558276b77676544991ee75914cd76dda84c36f43e72e477b850dd4cb52374d289f20dccd244a3b52ae5debaf3363432 SHA512 83f90545231c663a34c6925352a357a2b15997ac0362578a1893304c5070b5251922585ae8bc1bafb68d306bcddd4cdba4b6406648d473bd3e980eef65fe3ecd
 DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed10748348484d314183c3de3ec950d5ca5ce7048bb322c470f3f5bff2d63eb7f2ed99c0fe75c621df050273d9d118681b28926061d SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec
@@ -14,3 +15,4 @@ DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 7cf49ae22df53e855f2e99df51
 DIST python-gentoo-patches-3.6.8.tar.xz 11224 BLAKE2B 5fe38282bcf28df18e0bd37756c880ae191ea738dc92f1cf83f682cfdc52525b9c44287dc99191a73d75c90672ab501b56adf49515b35ff1fdee88c8dc07b175 SHA512 89e700663db25d6d78eee1d4bfdab686c5341a794062f3a63df3485ac0b58deb4b4885d24701f3ae138d06ca783be92e310e1100c6d633910c33732f3cb0d7df
 DIST python-gentoo-patches-3.7.2.tar.xz 9776 BLAKE2B fe451c3fb44a1ace4489d1bc68db9848b4227422fe9135659594248d057a8916e2abfe8e2677ef6efc9c962dbefe3ca7cd05cbd62b325d53eef6b05928f82017 SHA512 55e932624333b78b55e8981aaa7e7bfbddb635a61f594353a77a6bd5c2b57de31a4ee9ae04e072c4e2eb0fddd1c2702b4bd6133cf0a2c94ab35808df86550156
 DIST python-gentoo-patches-3.7.3-0.tar.xz 9800 BLAKE2B b3e1df06cc2c404f08d2da7ea7d44c3612c5b4f908c58d469084b4e78ee4c3024e57879b3f83027d980c9f5e065804e3e144ba734b1da357d3d073c22c14b02e SHA512 deeaf5fbd1d557d4c40c770c1bd772b835bf5ced1842b964fd8ad1aa652b706782301e8a860d6fd1909d90246a8f48a9aaf384d047fca594f96d6771c2901338
+DIST python-gentoo-patches-3.7.4-1.tar.xz 10100 BLAKE2B 63e8fada89b64b59ba083745626a1e8a07bec0cf93b7b6ab405c33a0f2932cbe497a331c52895a07f10434b230c438f27c9582efecdd57f3bad15d9aa604d157 SHA512 11b0e811a9890a1235c85426061b35f9964eba64cac0536f4c9e0498b1cc66eb005f14aed34eead735b43e91c2b5babced60e3310f5329231a1706871b95b547
diff --git a/dev-lang/python/python-3.7.4-r1.ebuild b/dev-lang/python/python-3.7.4-r1.ebuild
new file mode 100644
index 000000000000..35e893d37e6d
--- /dev/null
+++ b/dev-lang/python/python-3.7.4-r1.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WANT_LIBTOOL="none"
+
+inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
+
+MY_P="Python-${PV}"
+PATCHSET_VERSION="3.7.4-1"
+
+DESCRIPTION="An interpreted, interactive, object-oriented programming language"
+HOMEPAGE="https://www.python.org/"
+SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~floppym/python/python-gentoo-patches-${PATCHSET_VERSION}.tar.xz"
+
+LICENSE="PSF-2"
+SLOT="3.7/3.7m"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+RESTRICT="!test? ( test )"
+
+# Do not add a dependency on dev-lang/python to this ebuild.
+# If you need to apply a patch which requires python for bootstrapping, please
+# run the bootstrap code on your dev box and include the results in the
+# patchset. See bug 447752.
+
+RDEPEND="app-arch/bzip2:0=
+	app-arch/xz-utils:0=
+	sys-apps/util-linux:0=
+	>=sys-libs/zlib-1.1.3:0=
+	virtual/libffi:=
+	virtual/libintl
+	gdbm? ( sys-libs/gdbm:0=[berkdb] )
+	ncurses? ( >=sys-libs/ncurses-5.2:0= )
+	readline? ( >=sys-libs/readline-4.1:0= )
+	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tk? (
+		>=dev-lang/tcl-8.0:0=
+		>=dev-lang/tk-8.0:0=
+		dev-tcltk/blt:0=
+		dev-tcltk/tix
+	)
+	xml? ( >=dev-libs/expat-2.1:0= )
+	!!<sys-apps/sandbox-2.6-r1"
+# bluetooth requires headers from bluez
+DEPEND="${RDEPEND}
+	bluetooth? ( net-wireless/bluez )
+	test? ( app-arch/xz-utils[extra-filters(+)] )
+	virtual/pkgconfig
+	!sys-devel/gcc[libffi(-)]"
+RDEPEND+=" !build? ( app-misc/mime-types )"
+PDEPEND=">=app-eselect/eselect-python-20140125-r1"
+
+S="${WORKDIR}/${MY_P}"
+PYVER=${SLOT%/*}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	local PATCHES=(
+		"${WORKDIR}/patches"
+	)
+
+	default
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoreconf
+}
+
+src_configure() {
+	local disable
+	# disable automagic bluetooth headers detection
+	use bluetooth || export ac_cv_header_bluetooth_bluetooth_h=no
+	use gdbm     || disable+=" gdbm"
+	use ncurses  || disable+=" _curses _curses_panel"
+	use readline || disable+=" readline"
+	use sqlite   || disable+=" _sqlite3"
+	use ssl      || export PYTHON_DISABLE_SSL="1"
+	use tk       || disable+=" _tkinter"
+	use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+	export PYTHON_DISABLE_MODULES="${disable}"
+
+	if ! use xml; then
+		ewarn "You have configured Python without XML support."
+		ewarn "This is NOT a recommended configuration as you"
+		ewarn "may face problems parsing any XML documents."
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	use ncurses && append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable ipv6)
+		--infodir='${prefix}/share/info'
+		--mandir='${prefix}/share/man'
+		--with-computed-gotos
+		--with-dbmliborder="${dbmliborder}"
+		--with-libc=
+		--enable-loadable-sqlite-extensions
+		--without-ensurepip
+		--with-system-expat
+		--with-system-ffi
+	)
+
+	OPT="" econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Ensure sed works as expected
+	# https://bugs.gentoo.org/594768
+	local -x LC_ALL=C
+
+	emake CPPFLAGS= CFLAGS= LDFLAGS=
+
+	# Work around bug 329499. See also bug 413751 and 457194.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E python
+	else
+		pax-mark m python
+	fi
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Skip failing tests.
+	local skipped_tests="gdb"
+
+	for test in ${skipped_tests}; do
+		mv "${S}"/Lib/test/test_${test}.py "${T}"
+	done
+
+	# bug 660358
+	local -x COLUMNS=80
+
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="-u-network" CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
+	local result=$?
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}"/Lib/test
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}/usr/lib/python${PYVER}/test'"
+	elog "and run the tests separately."
+
+	if [[ ${result} -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	local libdir=${ED%/}/usr/lib/python${PYVER}
+
+	emake DESTDIR="${D}" altinstall
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${libdir}/config-${PYVER}"*/Makefile || die "sed failed"
+
+	# Fix collisions between different slots of Python.
+	rm -f "${ED%/}/usr/$(get_libdir)/libpython3.so"
+
+	# Cheap hack to get version with ABIFLAGS
+	local abiver=$(cd "${ED%/}/usr/include"; echo python*)
+	if [[ ${abiver} != python${PYVER} ]]; then
+		# Replace python3.X with a symlink to python3.Xm
+		rm "${ED%/}/usr/bin/python${PYVER}" || die
+		dosym "${abiver}" "/usr/bin/python${PYVER}"
+		# Create python3.X-config symlink
+		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
+		# Create python-3.5m.pc symlink
+		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
+	fi
+
+	# python seems to get rebuilt in src_install (bug 569908)
+	# Work around it for now.
+	if has_version dev-libs/libffi[pax_kernel]; then
+		pax-mark E "${ED%/}/usr/bin/${abiver}"
+	else
+		pax-mark m "${ED%/}/usr/bin/${abiver}"
+	fi
+
+	use sqlite || rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
+	use tk || rm -r "${ED%/}/usr/bin/idle${PYVER}" "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
+
+	use wininst || rm "${libdir}/distutils/command/"wininst-*.exe || die
+
+	dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		find "${S}"/Tools -name __pycache__ -print0 | xargs -0 rm -fr
+		doins -r "${S}"/Tools
+	fi
+	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
+	local libname=$(printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' | \
+		emake --no-print-directory -s -f - 2>/dev/null)
+	newins "${S}"/Tools/gdb/libpython.py "${libname}"-gdb.py
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${PYVER}:" \
+		-i "${ED%/}/etc/conf.d/pydoc-${PYVER}" "${ED%/}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
+
+	# for python-exec
+	local vars=( EPYTHON PYTHON_SITEDIR PYTHON_SCRIPTDIR )
+
+	# if not using a cross-compiler, use the fresh binary
+	if ! tc-is-cross-compiler; then
+		local -x PYTHON=./python
+		local -x LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${PWD}
+	else
+		vars=( PYTHON "${vars[@]}" )
+	fi
+
+	python_export "python${PYVER}" "${vars[@]}"
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_domodule epython.py
+
+	# python-exec wrapping support
+	local pymajor=${PYVER%.*}
+	mkdir -p "${D%/}${PYTHON_SCRIPTDIR}" || die
+	# python and pythonX
+	ln -s "../../../bin/${abiver}" "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}" || die
+	ln -s "python${pymajor}" "${D%/}${PYTHON_SCRIPTDIR}/python" || die
+	# python-config and pythonX-config
+	# note: we need to create a wrapper rather than symlinking it due
+	# to some random dirname(argv[0]) magic performed by python-config
+	cat > "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" <<-EOF || die
+		#!/bin/sh
+		exec "${abiver}-config" "\${@}"
+	EOF
+	chmod +x "${D%/}${PYTHON_SCRIPTDIR}/python${pymajor}-config" || die
+	ln -s "python${pymajor}-config" "${D%/}${PYTHON_SCRIPTDIR}/python-config" || die
+	# 2to3, pydoc, pyvenv
+	ln -s "../../../bin/2to3-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/2to3" || die
+	ln -s "../../../bin/pydoc${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pydoc" || die
+	ln -s "../../../bin/pyvenv-${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/pyvenv" || die
+	# idle
+	if use tk; then
+		ln -s "../../../bin/idle${PYVER}" "${D%/}${PYTHON_SCRIPTDIR}/idle" || die
+	fi
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${PYVER}" && ! has_version ">=${CATEGORY}/${PN}-${PYVER}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT%/}/usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT%/}/usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn
+		ewarn "Please adjust PYTHON_TARGETS (if so desired), and run emerge with the --newuse or --changed-use option to rebuild packages installing python modules."
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 19e1338d9cd2..18cb7f9fe10a 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index ed15ca2500f3..9928f29679a2 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -1 +1,2 @@
 DIST pigpio-67.tar.gz 369268 BLAKE2B a9d59369f5eed4b733e0e5c0e85013a132e55ff63a2393d79a3fb52d1fcb2513559d4dfeea84c4842d6281936b6e116bd81cd63e4542bbcffaf813ee356ee0d1 SHA512 9792f8402ee0dd204f4a975ab0513099a1fe3d398a28b766f412c08d7908e8e307de4cc92b2a2519b6484f15a043bd40008b7707486015c08bda5f97b1e7e00b
+DIST pigpio-68.tar.gz 371251 BLAKE2B c0118854d18ce158a3d5c96380289cc8bc68f35f72ce28f207dfbb827f97f538acd82cec2af11590e59985b77ef08834d55b3ac7578e1f6b6d1a0b5d5d594632 SHA512 125364eab9dd33c39fda148c6018679ac91b099914d7f0c6362f61566a9c957065189ace03ad4668b29f25d4d542b81d42c0befe0712867b48977b755dc03edc
diff --git a/dev-libs/pigpio/pigpio-68.ebuild b/dev-libs/pigpio/pigpio-68.ebuild
new file mode 100644
index 000000000000..ab323e84a88e
--- /dev/null
+++ b/dev-libs/pigpio/pigpio-68.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1 systemd toolchain-funcs
+
+DESCRIPTION="A library for the Raspberry which allows control of the GPIOs"
+HOMEPAGE="http://abyz.me.uk/rpi/pigpio/index.html"
+SRC_URI="https://github.com/joan2937/pigpio/archive/V${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Unlicense"
+SLOT="0"
+KEYWORDS="~arm"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-67-makefile.patch"
+	eapply_user
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=:
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \
+		libdir="$(get_libdir)" prefix="${EPREFIX}/usr" \
+		mandir="${EPREFIX}/usr/share/man" install
+	einstalldocs
+	newinitd "${FILESDIR}"/pigpiod.initd pigpiod
+	newconfd "${FILESDIR}"/pigpiod.confd pigpiod
+	systemd_newunit "${FILESDIR}"/pigpiod.systemd pigpiod.service
+	use python && distutils-r1_src_install
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c517bc0f988a..8a54ab2452d1 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index f074805f8543..e25cc85de842 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,2 +1,2 @@
 DIST PyQtWebEngine_gpl-5.12.1.tar.gz 42474 BLAKE2B 6cb333d8e429ae6b9f8c20a7486754767639693351605e85c0226ab3f1f065a549d40d69669d91f501fdf2c30346304a547e36b416d275a8bfe4ea621c0633b7 SHA512 2bcb0e4da51de9cfb5128e03c03ada77f2d4b99b0885da910584717681b96759ce4301c325cbbf43602d46746e2d37d81ed62f77dd63b33359fd5fae74d7f010
-DIST PyQtWebEngine_gpl-5.13.0.tar.gz 43939 BLAKE2B 151bfb9b7a619fe581078ce9fd42f54377673fc8873719577cddc40a7254c37b794c31baef0086897f9ed3d7914add0ac5c930dadde916ddc11e37cee428a279 SHA512 2dedffb7bde073922b357118d4bbd0327b81baaba3c69c6cf85f57401b5998bac56e01f2f7b39268b4a1e13c0b34ed116564d7f4f5975d1075d4242b1b06c065
+DIST PyQtWebEngine_gpl-5.13.1.dev1907131806.tar.gz 43891 BLAKE2B e1c8885ecf910338caf81554d2a0d06f4292ed35d567c98f932c2e9e75aa0b946c0fb6fae0b1b16ec3247061cd8d4d585492a6c5ca41dd016797e538e8ce3757 SHA512 a704a1e7ea1a97a29b741eeb6d06312e459857d88284fd788af9395cefde895a0f48310d90101e1cde6c4f445a76887d8a203f0a8050906637d97c487fb963ed
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.0.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1_pre1907131806.ebuild
similarity index 100%
rename from dev-python/PyQtWebEngine/PyQtWebEngine-5.13.0.ebuild
rename to dev-python/PyQtWebEngine/PyQtWebEngine-5.13.1_pre1907131806.ebuild
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index c6bd07bff8de..b2876d3e081a 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest
index 7d1227e178cd..78d9ede9162e 100644
--- a/media-video/totem/Manifest
+++ b/media-video/totem/Manifest
@@ -1 +1,2 @@
 DIST totem-3.30.0.tar.xz 3275852 BLAKE2B 9a5f97229a8aa6f7665c6d3e79dff48cfcce3caeab69510361ef3e9e1a107f7a56c66a5ae89ba3ae0a77d4b0ae8a16ac1f61e77278c82bf768e50009420110d0 SHA512 9d2e0a9e89358eea03404afd9353d18fa23afee7a34612912411ef10d4fb0b26ee02db002e6f8e05f68a333202d419f1e1a35188da23f87189e3093dac655742
+DIST totem-3.32.1.tar.xz 2154892 BLAKE2B ff9ec2facbada0f72ae82bbb35d03e82b574be02d7c1f1d4c4dd3262e2b302d3430ba953cd9f4b4e1d1e5151f9b5987986c7ea387a7f5d6667eb931d41805659 SHA512 31a3e3ac7628b992da3cf99570d013eb8b972e28465db30a9ec68291f8e19ab498d89df6275228367a7e3e43121bcebda2654f2b0461a9d1d561cf46e0029f67
diff --git a/media-video/totem/files/3.32.1-control-plugins.patch b/media-video/totem/files/3.32.1-control-plugins.patch
new file mode 100644
index 000000000000..2abcd75bac59
--- /dev/null
+++ b/media-video/totem/files/3.32.1-control-plugins.patch
@@ -0,0 +1,124 @@
+From 4944c498633f913c07a2680563a64d47c233630d Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour <sobhan@gentoo.org>
+Date: Sun, 14 Jul 2019 20:18:45 -0400
+Subject: [PATCH] 3.32.1 control plugins
+
+update From 5bdfac8a4a34e3edec05439fa3cd5544e0515e24 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Sun, 10 Jun 2018 10:09:16 +0200
+Subject: [PATCH] Allow full control over which plugins are built
+---
+ meson_options.txt       | 24 +++++++++++++++++++++++-
+ src/plugins/meson.build | 30 +++++++++++++++++++++---------
+ 2 files changed, 44 insertions(+), 10 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index e1c5909..085380e 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -1,5 +1,27 @@
+ option('enable-easy-codec-installation', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Whether to enable easy codec installation support for GStreamer')
+ option('enable-python', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable python support')
+-option('with-plugins', type: 'combo', choices: ['all', 'none', 'auto'], value: 'auto', description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
++option('with-plugins', type: 'array', choices: [
++  'all',
++  'auto',
++  'apple-trailers',
++  'autoload-subtitles',
++  'brasero-disc-recorder',
++  'dbusservice',
++  'im-status',
++  'lirc',
++  'media-player-keys',
++  'opensubtitles',
++  'properties',
++  'pythonconsole',
++  'recent',
++  'rotation',
++  'samplepython',
++  'save-file',
++  'screensaver',
++  'screenshot',
++  'skipto',
++  'variable-rate',
++  'vimeo',
++], value: ['auto'], description: 'Which Totem plugins to compile (default: auto; "all", "none" and "auto" are valid)')
+ option('enable-gtk-doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
+ option('enable-introspection', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable GObject Introspection (depends on GObject)')
+diff --git a/src/plugins/meson.build b/src/plugins/meson.build
+index 552cc22..cddda3f 100644
+--- a/src/plugins/meson.build
++++ b/src/plugins/meson.build
+@@ -37,8 +37,8 @@ allowed_plugins = [
+ plugins = []
+ 
+ plugins_option = get_option('with-plugins')
+-if plugins_option != 'none'
+-  plugins += [
++if plugins_option.length() > 0
++  foreach plugin: [
+     'apple-trailers',
+     'autoload-subtitles',
+     'im-status',
+@@ -53,15 +53,22 @@ if plugins_option != 'none'
+     'variable-rate',
+     'vimeo'
+   ]
++    if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin)
++      plugins += plugin
++    endif
++  endforeach
++  
++  if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('lirc')
++    lirc_dep = dependency('lirc', required: false)
++  else
++    lirc_dep = disabler()
++  endif
+ 
+-  plugin_error = (plugins_option == 'all')
+-
+-  lirc_dep = dependency('lirc', required: false)
+   if lirc_dep.found() and cc.has_function('lirc_init', dependencies: lirc_dep) and cc.has_header('lirc/lirc_client.h')
+     plugins += 'lirc'
+   else
+     str = 'you need lirc_client installed for the lirc plugin'
+-    if plugin_error
++    if plugins_option.contains('all') or plugins_option.contains('lirc')
+       error(str)
+     endif
+     message(str)
+@@ -70,23 +77,28 @@ if plugins_option != 'none'
+   libxml_req_version = '>= 2.6.0'
+   libxml_dep = dependency('libxml-2.0', version: libxml_req_version, required: false)
+   gtk_x11_dep = dependency('gtk+-x11-3.0', version: gtk_req_version, required: false)
+-  if libxml_dep.found() and gtk_x11_dep.found()
++  if libxml_dep.found() and gtk_x11_dep.found() and (plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains('brasero-disc-recorder'))
+     plugins += 'brasero-disc-recorder'
+   else
+     str = 'you need libxml-2.0 ' + libxml_req_version + ' and gtk+-x11-3.0 to use the brasero-disc-recorder plugin'
+-    if plugin_error
++    if plugins_option.contains('all') or plugins_option.contains('brasero-disc-recorder')
+       error(str)
+     endif
+     message(str)
+   endif
+ 
+   if have_python
+-    plugins += [
++    foreach plugin: [
+       'dbusservice',
+       'opensubtitles',
+       'pythonconsole',
+       'samplepython'
+     ]
++      if plugins_option.contains('all') or plugins_option.contains('auto') or plugins_option.contains(plugin)
++        plugins += plugin
++      endif
++    endforeach
++
+   endif
+ endif
+ 
+-- 
+2.22.0
+
diff --git a/media-video/totem/totem-3.32.1.ebuild b/media-video/totem/totem-3.32.1.ebuild
new file mode 100644
index 000000000000..1046a2c110e9
--- /dev/null
+++ b/media-video/totem/totem-3.32.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_REQ_USE="threads"
+
+inherit gnome.org gnome2-utils meson xdg python-single-r1
+
+DESCRIPTION="Media player for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Videos"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="cdr gtk-doc +introspection lirc nautilus +python test"
+# see bug #359379
+REQUIRED_USE="
+	python? ( introspection ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+# FIXME:
+# Runtime dependency on gnome-session-2.91
+COMMON_DEPEND="
+	>=dev-libs/glib-2.43.4:2
+	>=x11-libs/gtk+-3.19.4:3[X,introspection?]
+	>=media-libs/gstreamer-1.6.0:1.0
+	>=media-libs/gst-plugins-base-1.6.0:1.0[X,pango]
+	>=media-libs/gst-plugins-good-1.6.0:1.0
+	>=media-libs/grilo-0.3.0:0.3[playlist]
+	>=dev-libs/libpeas-1.1.0[gtk]
+	>=dev-libs/totem-pl-parser-3.10.1:0=[introspection?]
+	>=media-libs/clutter-1.17.3:1.0[gtk]
+	>=media-libs/clutter-gst-2.99.2:3.0
+	>=media-libs/clutter-gtk-1.8.1:1.0
+	gnome-base/gnome-desktop:3=
+	gnome-base/gsettings-desktop-schemas
+	x11-libs/libX11
+	>=x11-libs/cairo-1.14
+	x11-libs/gdk-pixbuf:2
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+
+	cdr? ( >=dev-libs/libxml2-2.6:2 )
+	lirc? ( app-misc/lirc )
+	nautilus? ( >=gnome-base/nautilus-2.91.3 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/grilo-plugins:0.3
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-1.1.0[python,${PYTHON_USEDEP}]
+		dev-python/dbus-python[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-lang/perl
+	app-text/docbook-xml-dtd:4.5
+	gtk-doc? ( >=dev-util/gtk-doc-1.14 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+# perl for pod2man
+# docbook-xml-dtd is needed for user doc
+# Prevent dev-python/pylint dep, bug #482538
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-control-plugins.patch # Do not force all plugins
+	"${FILESDIR}"/3.26-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue)
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	xdg_src_prepare
+}
+
+src_configure() {
+	# Disabled: sample-python, zeitgeist-dp
+	# brasero-disc-recorder and gromit require gtk+[X], but totem itself does
+	# for now still too, so no point in optionality based on that yet.
+	local plugins="apple-trailers,autoload-subtitles"
+	plugins+=",im-status,media-player-keys"
+	plugins+=",properties,recent,screensaver,screenshot"
+	plugins+=",skipto,variable-rate,vimeo,rotation"
+	use cdr && plugins+=",brasero-disc-recorder"
+	use lirc && plugins+=",lirc"
+	use nautilus && plugins+=",save-file"
+	use python && plugins+=",dbusservice,pythonconsole,opensubtitles"
+
+	local emesonargs=(
+		-Denable-easy-codec-installation=yes
+		-Denable-python=$(usex python yes no)
+		-Dwith-plugins=${plugins}
+		$(meson_use gtk-doc enable-gtk-doc)
+		-Denable-introspection=$(usex introspection yes no)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use python ; then
+		python_optimize "${ED}"usr/$(get_libdir)/totem/plugins/
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1060c80025f1..352e6db9fd1d 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e542dc842f07..9d1ad4731812 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 14 Jul 2019 15:08:56 +0000
+Mon, 15 Jul 2019 05:08:54 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e542dc842f07..9d1ad4731812 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 14 Jul 2019 15:08:56 +0000
+Mon, 15 Jul 2019 05:08:54 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3ddc77512464..b68cf4ed4a27 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 0e4c2d84983a..a98b1cb50fd7 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/rsyslog-8.1907.0 b/metadata/md5-cache/app-admin/rsyslog-8.1907.0
new file mode 100644
index 000000000000..c8adfbe8d4cf
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rsyslog-8.1907.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test unpack
+DEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 ) >=sys-devel/autoconf-archive-2015.02.24 virtual/pkgconfig elibc_musl? ( sys-libs/queue-standalone ) test? ( >=dev-libs/liblogging-1.0.1[stdlog] jemalloc? ( <sys-libs/libfaketime-0.9.7 ) !jemalloc? ( sys-libs/libfaketime ) || ( dev-lang/python:3.7 dev-lang/python:3.6 dev-lang/python:3.5 >=dev-lang/python-2.7.5-r2:2.7 ) ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=An enhanced multi-threaded syslogd with database support and more
+EAPI=6
+HOMEPAGE=https://www.rsyslog.com/
+IUSE=curl dbi debug doc elasticsearch +gcrypt gnutls jemalloc kafka kerberos kubernetes libressl mdblookup mongodb mysql normalize clickhouse omhttp omhttpfs omudpspoof openssl postgres rabbitmq redis relp rfc3195 rfc5424hmac snmp ssl systemd test usertools +uuid xxhash zeromq kernel_linux
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~x86
+LICENSE=GPL-3 LGPL-3 Apache-2.0
+RDEPEND=>=dev-libs/libfastjson-0.99.8:= >=dev-libs/libestr-0.1.9 >=sys-libs/zlib-1.2.5 curl? ( >=net-misc/curl-7.35.0 ) dbi? ( >=dev-db/libdbi-0.8.3 ) elasticsearch? ( >=net-misc/curl-7.35.0 ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:= ) jemalloc? ( >=dev-libs/jemalloc-3.3.1:= ) kafka? ( >=dev-libs/librdkafka-0.9.0.99:= ) kerberos? ( virtual/krb5 ) kubernetes? ( >=net-misc/curl-7.35.0 ) mdblookup? ( dev-libs/libmaxminddb:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.1.10:= ) mysql? ( virtual/libmysqlclient:= ) normalize? ( >=dev-libs/liblognorm-2.0.3:= ) clickhouse? ( >=net-misc/curl-7.35.0 ) omhttpfs? ( >=net-misc/curl-7.35.0 ) omudpspoof? ( >=net-libs/libnet-1.1.6 ) postgres? ( >=dev-db/postgresql-8.4.20:= ) rabbitmq? ( >=net-libs/rabbitmq-c-0.3.0:= ) redis? ( >=dev-libs/hiredis-0.11.0:= ) relp? ( >=dev-libs/librelp-1.2.17:= ) rfc3195? ( >=dev-libs/liblogging-1.0.1:=[rfc3195] ) rfc5424hmac? ( !libressl? ( >=dev-libs/openssl-0.9.8y:0= ) libressl? ( dev-libs/libressl:= ) ) snmp? ( >=net-analyzer/net-snmp-5.7.2 ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23:0= ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) systemd? ( >=sys-apps/systemd-234 ) uuid? ( sys-apps/util-linux:0= ) xxhash? ( dev-libs/xxhash:= ) zeromq? ( >=net-libs/czmq-3.0.2 )
+REQUIRED_USE=kubernetes? ( normalize ) ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.rsyslog.com/files/download/rsyslog/rsyslog-8.1907.0.tar.gz doc? ( https://www.rsyslog.com/files/download/rsyslog/rsyslog-doc-8.1907.0.tar.gz )
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=048f8240d77ee80afe41261dfcedef5e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 1bb3b98c34e9..c8d8906682ad 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/ghex-3.18.4 b/metadata/md5-cache/app-editors/ghex-3.18.4
new file mode 100644
index 000000000000..b88fb9b170c2
--- /dev/null
+++ b/metadata/md5-cache/app-editors/ghex-3.18.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3 >=sys-devel/gettext-0.17 app-text/yelp-tools virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME hexadecimal editor
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Ghex
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/atk-1 >=dev-libs/glib-2.31.10:2 >=x11-libs/gtk+-3.3.8:3
+SLOT=2
+SRC_URI=mirror://gnome/sources/ghex/3.18/ghex-3.18.4.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=dad2b992ef74352ddcbd6ad3ba30145d
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 1ce356f99c75..70d04dea8eb9 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/lyx-2.3.3 b/metadata/md5-cache/app-office/lyx-2.3.3
new file mode 100644
index 000000000000..83055bb0d75b
--- /dev/null
+++ b/metadata/md5-cache/app-office/lyx-2.3.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) ) virtual/pkgconfig dev-qt/qtconcurrent:5 nls? ( sys-devel/gettext ) X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
+DESCRIPTION=WYSIWYM frontend for LaTeX, DocBook, etc.
+EAPI=6
+HOMEPAGE=https://www.lyx.org/
+IUSE=aspell cups debug docbook dia dot enchant gnumeric html +hunspell +latex monolithic-build nls rcs rtf subversion svg l10n_he X python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/mythes dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-texlive/texlive-fontsextra sys-apps/file sys-libs/zlib virtual/imagemagick-tools[png,svg?] aspell? ( app-text/aspell ) cups? ( net-print/cups ) dia? ( app-office/dia ) docbook? ( app-text/sgmltools-lite ) dot? ( media-gfx/graphviz ) enchant? ( app-text/enchant ) gnumeric? ( app-office/gnumeric ) html? ( dev-tex/html2latex ) hunspell? ( app-text/hunspell ) l10n_he? ( dev-tex/culmus-latex ) latex? ( app-text/dvipng app-text/ghostscript-gpl app-text/ps2eps app-text/texlive dev-tex/chktex dev-tex/dvipost dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-plaingeneric || ( dev-tex/hevea dev-tex/latex2html dev-tex/tex4ht[java] dev-tex/tth ) ) rcs? ( dev-vcs/rcs ) rtf? ( app-text/unrtf dev-tex/html2latex dev-tex/latex2rtf ) subversion? ( dev-vcs/subversion ) svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-2.3.3.tar.xz ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.3/lyx-2.3.3.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	font	641b5065e2f20fe6e35ec386d8826107	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=433b850460b73509ad07579d32b6923d
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index fad07414ca20..8468c18efd55 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.80_pre20190620 b/metadata/md5-cache/app-portage/portage-utils-0.80_pre20190714
similarity index 67%
rename from metadata/md5-cache/app-portage/portage-utils-0.80_pre20190620
rename to metadata/md5-cache/app-portage/portage-utils-0.80_pre20190714
index acf5e52138d1..175fc3fe5b04 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.80_pre20190620
+++ b/metadata/md5-cache/app-portage/portage-utils-0.80_pre20190714
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure postinst
-DEPEND=static? ( dev-libs/iniparser:0[static-libs] ) !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) )
+DEPEND=static? ( dev-libs/iniparser:0[static-libs] ) !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 DESCRIPTION=Small and fast Portage helper tools written in C
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
-IUSE=nls static openmp +qmanifest libressl
+IUSE=nls static openmp +qmanifest +qtegrity libressl
 KEYWORDS=~amd64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=static? ( dev-libs/iniparser:0[static-libs] ) !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) )
+RDEPEND=static? ( dev-libs/iniparser:0[static-libs] ) !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.80_pre20190620.tar.xz
-_md5_=53a45488195b76d16617e06300816144
+SRC_URI=https://dev.gentoo.org/~grobian/distfiles/portage-utils-0.80_pre20190714.tar.xz
+_md5_=a6a66657f205ee42f3fa702b75ff333e
diff --git a/metadata/md5-cache/app-portage/portage-utils-9999 b/metadata/md5-cache/app-portage/portage-utils-9999
index e92e8bff85ac..26ebc568cc2a 100644
--- a/metadata/md5-cache/app-portage/portage-utils-9999
+++ b/metadata/md5-cache/app-portage/portage-utils-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure unpack
-DEPEND=static? ( dev-libs/iniparser:0[static-libs] ) !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=static? ( dev-libs/iniparser:0[static-libs] ) !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Small and fast Portage helper tools written in C
 EAPI=6
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
-IUSE=nls static openmp +qmanifest libressl
+IUSE=nls static openmp +qmanifest +qtegrity libressl
 LICENSE=GPL-2
-RDEPEND=static? ( dev-libs/iniparser:0[static-libs] ) !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) )
+RDEPEND=static? ( dev-libs/iniparser:0[static-libs] ) !static? ( dev-libs/iniparser:0 ) qmanifest? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( app-crypt/libb2:=[static-libs] !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) sys-libs/zlib:=[static-libs] app-crypt/gpgme:=[static-libs] ) !static? ( app-crypt/libb2:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-libs/zlib:= app-crypt/gpgme:= ) ) qtegrity? ( openmp? ( || ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] ) ) static? ( !libressl? ( dev-libs/openssl:0=[static-libs] ) libressl? ( dev-libs/libressl:0=[static-libs] ) ) !static? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ee89e450b74311705ac4ee083bef97ed
+_md5_=f79ba86700302752e8ea36d0744e77b3
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index a364b5effdef..e4e7c526e842 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/tcsh-6.21.00 b/metadata/md5-cache/app-shells/tcsh-6.21.00
new file mode 100644
index 000000000000..6a9c92394a15
--- /dev/null
+++ b/metadata/md5-cache/app-shells/tcsh-6.21.00
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=sys-libs/ncurses-5.1:0= virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Enhanced version of the Berkeley C shell (csh)
+EAPI=6
+HOMEPAGE=http://www.tcsh.org/
+IUSE=nls doc
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=>=sys-libs/ncurses-5.1:0= virtual/libiconv
+RESTRICT=test
+SLOT=0
+SRC_URI=ftp://ftp.astron.com/pub/tcsh/tcsh-6.21.00.tar.gz https://dev.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7a6666154e0fd15fa2df40524be4a2c1
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 9671ce40c3b8..469c4b9d272e 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/sqlcl-bin-17.4.0.354.2224 b/metadata/md5-cache/dev-db/sqlcl-bin-19.1.0.094.1619
similarity index 78%
rename from metadata/md5-cache/dev-db/sqlcl-bin-17.4.0.354.2224
rename to metadata/md5-cache/dev-db/sqlcl-bin-19.1.0.094.1619
index 008586a83d2a..f75c48562c3b 100644
--- a/metadata/md5-cache/dev-db/sqlcl-bin-17.4.0.354.2224
+++ b/metadata/md5-cache/dev-db/sqlcl-bin-19.1.0.094.1619
@@ -1,11 +1,11 @@
 DEFINED_PHASES=install nofetch prepare
 DESCRIPTION=Oracle SQLcl is the new SQL*Plus
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/index.html
 KEYWORDS=~amd64 ~x86
 LICENSE=OTN
 RDEPEND=virtual/jre:1.8 dev-java/java-config:2 dev-db/oracle-instantclient
 RESTRICT=bindist fetch mirror
 SLOT=0
-SRC_URI=sqlcl-17.4.0.354.2224-no-jre.zip
-_md5_=ff975289fb76e9be233adeefd6d704b3
+SRC_URI=sqlcl-19.1.0.094.1619.zip
+_md5_=c2fcb564a338bd733c75e180bf986eb4
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 867e84244fb2..11141beb3391 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.6.4 b/metadata/md5-cache/dev-lang/lazarus-1.6.4
deleted file mode 100644
index e45641f8d368..000000000000
--- a/metadata/md5-cache/dev-lang/lazarus-1.6.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/fpc-3.0.0[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:=
-DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
-EAPI=6
-HOMEPAGE=https://www.lazarus-ide.org/
-IUSE=minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/fpc-3.0.0[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:= !=gnome-base/librsvg-2.16.1
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%201.6.4/lazarus-1.6.4-0.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=31c83c56bf0ff81bec1a0c6a39431298
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.8.4 b/metadata/md5-cache/dev-lang/lazarus-1.8.4
deleted file mode 100644
index efb3d6fc851b..000000000000
--- a/metadata/md5-cache/dev-lang/lazarus-1.8.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-lang/fpc-3.0.4[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:=
-DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
-EAPI=6
-HOMEPAGE=https://www.lazarus-ide.org/
-IUSE=minimal
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/fpc-3.0.4[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:= !=gnome-base/librsvg-2.16.1
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%201.8.4/lazarus-1.8.4.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d
-_md5_=6fc881bd90fa2e91b003e0d9de476101
diff --git a/metadata/md5-cache/dev-lang/lazarus-1.8.4-r1 b/metadata/md5-cache/dev-lang/lazarus-2.0.2
similarity index 79%
rename from metadata/md5-cache/dev-lang/lazarus-1.8.4-r1
rename to metadata/md5-cache/dev-lang/lazarus-2.0.2
index 1b7084a97e5e..765766ed004f 100644
--- a/metadata/md5-cache/dev-lang/lazarus-1.8.4-r1
+++ b/metadata/md5-cache/dev-lang/lazarus-2.0.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install prepare
 DEPEND=>=dev-lang/fpc-3.0.4[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:=
 DESCRIPTION=Lazarus IDE is a feature rich visual programming environment emulating Delphi
-EAPI=6
+EAPI=7
 HOMEPAGE=https://www.lazarus-ide.org/
 IUSE=minimal python
 KEYWORDS=~amd64 ~x86
@@ -9,6 +9,6 @@ LICENSE=GPL-2 LGPL-2.1-with-linking-exception
 RDEPEND=>=dev-lang/fpc-3.0.4[source] net-misc/rsync x11-libs/gtk+:2 >=sys-devel/binutils-2.19.1-r1:=
 RESTRICT=strip
 SLOT=0
-SRC_URI=python? ( https://github.com/Alexey-T/Python-for-Lazarus/archive/586eec1a5ea609ef9df2bf586be06825d9fbd50f.tar.gz -> lazarus-1.8.4-python.tar.gz ) https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%201.8.4/lazarus-1.8.4.tar.gz
+SRC_URI=python? ( https://github.com/Alexey-T/Python-for-Lazarus/archive/586eec1a5ea609ef9df2bf586be06825d9fbd50f.tar.gz -> lazarus-2.0.2-python.tar.gz ) https://sourceforge.net/projects/lazarus/files/Lazarus%20Zip%20_%20GZip/Lazarus%202.0.2/lazarus-2.0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d
-_md5_=e55d83d420e2d950bdc0a99ffc58a7f7
+_md5_=139b26b7faaab2325107cc6d7cfe2ec6
diff --git a/metadata/md5-cache/dev-lang/python-3.7.4-r1 b/metadata/md5-cache/dev-lang/python-3.7.4-r1
new file mode 100644
index 000000000000..6a42f2517345
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.7.4-r1
@@ -0,0 +1,16 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] ) virtual/pkgconfig !sys-devel/gcc[libffi(-)]
+DESCRIPTION=An interpreted, interactive, object-oriented programming language
+EAPI=7
+HOMEPAGE=https://www.python.org/
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=PSF-2
+PDEPEND=>=app-eselect/eselect-python-20140125-r1
+RDEPEND=app-arch/bzip2:0= app-arch/xz-utils:0= sys-apps/util-linux:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi:= virtual/libintl gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= ) readline? ( >=sys-libs/readline-4.1:0= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:0= ) !!<sys-apps/sandbox-2.6-r1 !build? ( app-misc/mime-types )
+RESTRICT=!test? ( test )
+SLOT=3.7/3.7m
+SRC_URI=https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-3.7.4-1.tar.xz
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	pax-utils	db85a3c508cf82c45f24b2723791cc93	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=7fe85dda57abbe8a61a91dc382fb0e42
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ecea571aef84..e6eed306a1a9 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/pigpio-68 b/metadata/md5-cache/dev-libs/pigpio-68
new file mode 100644
index 000000000000..a8242c65082f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pigpio-68
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library for the Raspberry which allows control of the GPIOs
+EAPI=7
+HOMEPAGE=http://abyz.me.uk/rpi/pigpio/index.html
+IUSE=python python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~arm
+LICENSE=Unlicense
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/joan2937/pigpio/archive/V68.tar.gz -> pigpio-68.tar.gz
+_eclasses_=distutils-r1	30044897f9a75ab6414bdb19aa3c07d4	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=08a0a1175de05cb55082b85f53ff17d4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index a236915d9865..a4e3baff8058 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/PyQtWebEngine-5.13.0 b/metadata/md5-cache/dev-python/PyQtWebEngine-5.13.1_pre1907131806
similarity index 96%
rename from metadata/md5-cache/dev-python/PyQtWebEngine-5.13.0
rename to metadata/md5-cache/dev-python/PyQtWebEngine-5.13.1_pre1907131806
index b4aec4e689bb..741278844b5c 100644
--- a/metadata/md5-cache/dev-python/PyQtWebEngine-5.13.0
+++ b/metadata/md5-cache/dev-python/PyQtWebEngine-5.13.1_pre1907131806
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyQt5-5.13[gui,network,printsupport,webchannel,widgets,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/PyQt5-sip-4.19.14:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-qt/qtcore:5 dev-qt/qtwebengine:5[widgets]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
-SRC_URI=https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/5.13.0/PyQtWebEngine_gpl-5.13.0.tar.gz
+SRC_URI=https://dev.gentoo.org/~pesa/distfiles/PyQtWebEngine_gpl-5.13.1.dev1907131806.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-r1	ce1cd23cfdc1848e8e32743efe34f299	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
 _md5_=ecffc0b3e06969d8ae8f53659a8c3bd3
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 2bcba80ed608..2d04a8086c70 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/totem-3.32.1 b/metadata/md5-cache/media-video/totem-3.32.1
new file mode 100644
index 000000000000..8d07aadad408
--- /dev/null
+++ b/metadata/md5-cache/media-video/totem-3.32.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[X,introspection?] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[X,pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas x11-libs/libX11 >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) cdr? ( >=dev-libs/libxml2-2.6:2 ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-2.90.3:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) dev-lang/perl app-text/docbook-xml-dtd:4.5 gtk-doc? ( >=dev-util/gtk-doc-1.14 ) dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig x11-base/xorg-proto app-arch/xz-utils >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Media player for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Videos
+IUSE=cdr gtk-doc +introspection lirc nautilus +python test python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.19.4:3[X,introspection?] >=media-libs/gstreamer-1.6.0:1.0 >=media-libs/gst-plugins-base-1.6.0:1.0[X,pango] >=media-libs/gst-plugins-good-1.6.0:1.0 >=media-libs/grilo-0.3.0:0.3[playlist] >=dev-libs/libpeas-1.1.0[gtk] >=dev-libs/totem-pl-parser-3.10.1:0=[introspection?] >=media-libs/clutter-1.17.3:1.0[gtk] >=media-libs/clutter-gst-2.99.2:3.0 >=media-libs/clutter-gtk-1.8.1:1.0 gnome-base/gnome-desktop:3= gnome-base/gsettings-desktop-schemas x11-libs/libX11 >=x11-libs/cairo-1.14 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-1.54:= ) cdr? ( >=dev-libs/libxml2-2.6:2 ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.91.3 ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5[threads] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-2.90.3:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) media-plugins/grilo-plugins:0.3 media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-taglib:1.0 x11-themes/adwaita-icon-theme python? ( >=dev-libs/libpeas-1.1.0[python,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] )
+REQUIRED_USE=python? ( introspection ^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/totem/3.32/totem-3.32.1.tar.xz
+_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	532371cfcba45b2ab0d2950547c97d95	ltprune	2729691420b6deeda2a90b1f1183fb55	meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	3a0fc81f484bfdbd9c2b7448015a36e4	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=6538fb8c5398a697acdff3daff7fe4b0
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index fadcf371e65d..953e83e4ecd4 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/chaosreader-0.94-r1 b/metadata/md5-cache/net-analyzer/chaosreader-0.94-r1
deleted file mode 100644
index 70c5156a90c0..000000000000
--- a/metadata/md5-cache/net-analyzer/chaosreader-0.94-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/perl-5.8.0
-DESCRIPTION=Trace TCP/UDP/... sessions and fetch application data.
-EAPI=4
-HOMEPAGE=http://chaosreader.sourceforge.net https://github.com/brendangregg/Chaosreader
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2+
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~spock/portage/distfiles/chaosreader-0.94.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48b3dce066f0c6ba9bdcc85223f27255
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index d7366a42de06..5cfc8be13dd0 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.25.1 b/metadata/md5-cache/net-im/signal-desktop-bin-1.25.3
similarity index 94%
rename from metadata/md5-cache/net-im/signal-desktop-bin-1.25.1
rename to metadata/md5-cache/net-im/signal-desktop-bin-1.25.3
index 5702110e0910..6d699885c325 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.25.1
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.25.3
@@ -6,6 +6,6 @@ KEYWORDS=-* ~amd64
 LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
 RDEPEND=dev-libs/nss media-libs/mesa net-print/cups x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.25.1_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.25.3_amd64.deb
 _eclasses_=pax-utils	db85a3c508cf82c45f24b2723791cc93	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	14d00d009167652b1fa363e55effe213
 _md5_=c4f9a0893bb4826869527d5a1809c489
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 2eaef33d6f0a..359872434101 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.15 b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.15
new file mode 100644
index 000000000000..033b94eaa633
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/gtk-gnutella-1.1.15
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
+DESCRIPTION=A GTK+ Gnutella client
+EAPI=7
+HOMEPAGE=http://gtk-gnutella.sourceforge.net/
+IUSE=nls dbus ssl +gtk
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/binutils-libs:= dev-libs/glib:2 sys-libs/zlib gtk? ( >=x11-libs/gtk+-2.2.1:2 ) dbus? ( >=sys-apps/dbus-0.35.2 ) ssl? ( >=net-libs/gnutls-2.2.5 ) nls? ( >=sys-devel/gettext-0.11.5 )
+SLOT=0
+SRC_URI=mirror://sourceforge/gtk-gnutella/gtk-gnutella-1.1.15.tar.xz
+_eclasses_=eutils	6e6c2737b59a4b982de6fb3ecefd87f8	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=b7f3127bed63491bdfe43c665aa4b4b4
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index e0eb6d6a0684..55e4036be030 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/cvc4-1.7 b/metadata/md5-cache/sci-mathematics/cvc4-1.7
new file mode 100644
index 000000000000..9e79dac9c64a
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/cvc4-1.7
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/antlr-c dev-java/antlr:3 dev-libs/boost cln? ( sci-libs/cln ) !cln? ( dev-libs/gmp:= )
+DESCRIPTION=automatic theorem prover for satisfiability modulo theories (SMT) problems
+EAPI=7
+HOMEPAGE=http://cvc4.cs.stanford.edu/web/
+IUSE=+cln
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/antlr-c dev-java/antlr:3 dev-libs/boost cln? ( sci-libs/cln ) !cln? ( dev-libs/gmp:= )
+SLOT=0
+SRC_URI=https://github.com/CVC4/CVC4/archive/1.7.tar.gz -> cvc4-1.7.tar.gz
+_eclasses_=cmake-utils	91d6ef31dc426240577497cacbf2508c	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xdg-utils	14d00d009167652b1fa363e55effe213
+_md5_=82486370c23811227d5b0692e47d7c53
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 9918bec27ff2..ef5bdb1f5bcf 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/guix-1.0.0-r1 b/metadata/md5-cache/sys-apps/guix-1.0.0-r1
new file mode 100644
index 000000000000..e149fc0d2c76
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/guix-1.0.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2.2:=[regex,networking,threads] dev-scheme/bytestructures dev-scheme/guile-gcrypt >=dev-scheme/guile-git-0.2.0 dev-scheme/guile-json dev-scheme/guile-sqlite3 net-libs/gnutls[guile] sys-libs/zlib app-arch/bzip2 dev-db/sqlite
+DESCRIPTION=GNU package manager (nix sibling)
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/guix/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt:0= >=dev-scheme/guile-2.2:=[regex,networking,threads] dev-scheme/bytestructures dev-scheme/guile-gcrypt >=dev-scheme/guile-git-0.2.0 dev-scheme/guile-json dev-scheme/guile-sqlite3 net-libs/gnutls[guile] sys-libs/zlib app-arch/bzip2 dev-db/sqlite
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/guix/guix-1.0.0.tar.gz mirror://gnu-alpha/guix/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz -> guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/armhf-linux/20150101/guile-2.0.11.tar.xz -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/i686-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/mips64el-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap mirror://gnu-alpha/guix/bootstrap/x86_64-linux/20131110/guile-2.0.9.tar.xz -> guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	user	e68863263b1e8611dacf381bec5c8b2b
+_md5_=3cd63b4290644038ffbfa4fb7c3ea31a
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 74e77fb871bd..0adce405bc8d 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1 b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
index 51178427fbfa..7d3576fe27c6 100644
--- a/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
+++ b/metadata/md5-cache/sys-cluster/torque-6.0.4-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat sys-libs/ncurses:* !!sys-cluster/slurm >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat sys-libs/ncurses:* !!sys-cluster/slurm >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Resource manager and queuing system based on OpenPBS
 EAPI=6
 HOMEPAGE=http://www.adaptivecomputing.com/products/open-source/torque
 IUSE=autorun cgroups cpusets +crypt doc drmaa kernel_linux libressl munge nvidia quickcommit server +syslog tk kernel_linux
 KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=torque-2.5
-RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
+RDEPEND=sys-libs/zlib sys-libs/readline:0= dev-libs/libxml2 >=dev-libs/boost-1.41 cpusets? ( sys-apps/hwloc ) munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk:0= dev-lang/tcl:0= ) syslog? ( virtual/logger ) !!games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh ) !dev-libs/uthash
 SLOT=0
 SRC_URI=https://github.com/adaptivecomputing/torque/archive/6a0b37f85c7d644e9217cbab1542792d646f59a6.tar.gz -> torque-6.0.4-gh-20170829.tar.gz
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	953c3b1c472dcadbf62098a9301327f2	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c6a08e16c521f63c2d05d3ed6e9d7f3b
+_md5_=f03bb5ec9bef01e75eecb38ab32094c6
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 48fc79009349..175ab009743b 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta2 b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta2
new file mode 100644
index 000000000000..1aba13779366
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/genkernel-4.0.0_beta2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DESCRIPTION=Gentoo automatic kernel building scripts
+EAPI=7
+HOMEPAGE=https://www.gentoo.org
+IUSE=ibm +firmware
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 sys-apps/sandbox firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
+SLOT=0
+SRC_URI=mirror://gentoo/genkernel-4.0.0_beta2.tar.xz mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.1.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 mirror://kernel/linux/utils/cryptsetup/v2.1/cryptsetup-2.1.0.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.2/e2fsprogs-1.45.2.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.185.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.0.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.0.tar.gz -> zstd-1.4.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8ea5087f277bac59a7cc54f792d14487
diff --git a/metadata/md5-cache/sys-kernel/genkernel-9999 b/metadata/md5-cache/sys-kernel/genkernel-9999
index 33693a5ef18a..3faaa3c9f8c5 100644
--- a/metadata/md5-cache/sys-kernel/genkernel-9999
+++ b/metadata/md5-cache/sys-kernel/genkernel-9999
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile install postinst prepare pretend unpack
-DEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) app-text/asciidoc >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=app-text/asciidoc
 DESCRIPTION=Gentoo automatic kernel building scripts
-EAPI=5
+EAPI=7
 HOMEPAGE=https://www.gentoo.org
-IUSE=cryptsetup ibm +firmware selinux
+IUSE=ibm +firmware
 LICENSE=GPL-2
-RDEPEND=sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) cryptsetup? ( sys-fs/cryptsetup ) app-arch/cpio >=app-misc/pax-utils-1.2.2 sys-apps/util-linux[static-libs(+)] firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
+RDEPEND=app-arch/cpio >=app-misc/pax-utils-1.2.2 sys-apps/sandbox firmware? ( sys-kernel/linux-firmware ) !<sys-apps/openrc-0.9.9
 SLOT=0
-SRC_URI=https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz ftp://sourceware.org/pub/lvm2/LVM2.2.02.183.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.183.tgz https://busybox.net/downloads/busybox-1.30.1.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://github.com/open-iscsi/open-isns/archive/v0.99.tar.gz -> open-isns-0.99.tar.gz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://debian/pool/main/liba/libaio/libaio_0.3.110.orig.tar.gz -> libaio-0.3.110.tar.gz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=553c6f07136b0a24c8d23e1ccb2bcd61
+SRC_URI=mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.1.1.tar.xz https://www.busybox.net/downloads/busybox-1.31.0.tar.bz2 mirror://kernel/linux/utils/cryptsetup/v2.1/cryptsetup-2.1.0.tar.xz https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 https://matt.ucc.asn.au/dropbear/releases/dropbear-2019.78.tar.bz2 https://dev.gentoo.org/~blueness/eudev/eudev-3.2.8.tar.gz mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v1.45.2/e2fsprogs-1.45.2.tar.xz https://github.com/libfuse/libfuse/releases/download/fuse-2.9.9/fuse-2.9.9.tar.gz mirror://gnupg/gnupg/gnupg-1.4.23.tar.bz2 https://github.com/open-iscsi/open-iscsi/archive/2.0.875.tar.gz -> open-iscsi-2.0.875.tar.gz https://s3.amazonaws.com/json-c_releases/releases/json-c-0.13.1.tar.gz https://releases.pagure.org/libaio/libaio-0.3.112.tar.gz mirror://gnupg/libgcrypt/libgcrypt-1.8.4.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.36.tar.bz2 https://mirrors.kernel.org/sourceware/lvm2/LVM2.2.02.185.tgz https://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz mirror://kernel/linux/utils/raid/mdadm/mdadm-4.1.tar.xz https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.8.0;sf=tgz -> multipath-tools-0.8.0.tar.gz http://ftp.rpm.org/mirror/popt/popt-1.16.tar.gz https://github.com/strace/strace/releases/download/v5.2/strace-5.2.tar.xz https://github.com/rpodgorny/unionfs-fuse/archive/v2.0.tar.gz -> unionfs-fuse-2.0.tar.gz https://lttng.org/files/urcu/userspace-rcu-0.10.2.tar.bz2 mirror://kernel/linux/utils/util-linux/v2.34/util-linux-2.34.tar.xz mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-5.0.0.tar.xz https://zlib.net/zlib-1.2.11.tar.gz https://github.com/facebook/zstd/archive/v1.4.0.tar.gz -> zstd-1.4.0.tar.gz
+_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	0d4635eeb5a96cd5315597a47eba25c9	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=8ea5087f277bac59a7cc54f792d14487
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.59 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.59
new file mode 100644
index 000000000000..dd1850c62f76
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.59
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.19.59
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.19.tar.xz mirror://gentoo/genpatches-4.19-59.base.tar.xz mirror://gentoo/genpatches-4.19-59.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.19-59.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=70a25153a06810e0dbc5afb5b8f15c5b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.18 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.18
new file mode 100644
index 000000000000..0a5e08ca2e37
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.1.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.1 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.1.18
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.1.tar.xz mirror://gentoo/genpatches-5.1-18.base.tar.xz mirror://gentoo/genpatches-5.1-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.1-18.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=c9c065d75394000074068bf776075a33
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.1
new file mode 100644
index 000000000000..0ec0ec67487f
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.2 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=5.2.1
+SRC_URI=mirror://kernel/linux/kernel/v5.x/linux-5.2.tar.xz mirror://gentoo/genpatches-5.2-2.base.tar.xz mirror://gentoo/genpatches-5.2-2.extras.tar.xz experimental? ( mirror://gentoo/genpatches-5.2-2.experimental.tar.xz )
+_eclasses_=eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	estack	43ddf5aaffa7a8d0482df54d25a66a1f	kernel-2	12a17088d0306f0e3d3c97d58534409e	multilib	1d91b03d42ab6308b5f4f6b598ed110e	python-any-r1	4900ae970f827a22d33d41bd8b8f9ace	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=66610594ee63ca46306cbbd073ab8b61
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index b5e306fb7f71..4fdb931e4767 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/surfraw-2.2.9-r1 b/metadata/md5-cache/www-client/surfraw-2.2.9-r1
deleted file mode 100644
index e0143a4b5de9..000000000000
--- a/metadata/md5-cache/www-client/surfraw-2.2.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare
-DESCRIPTION=A fast unix command line interface to WWW
-EAPI=5
-HOMEPAGE=http://surfraw.alioth.debian.org/
-KEYWORDS=amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=public-domain
-RDEPEND=dev-lang/perl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://surfraw.alioth.debian.org/dist/surfraw-2.2.9.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66fcaf07ca3056043bec60171aa2d637
diff --git a/metadata/md5-cache/www-client/surfraw-2.3.0 b/metadata/md5-cache/www-client/surfraw-2.3.0
deleted file mode 100644
index c0b40b912c30..000000000000
--- a/metadata/md5-cache/www-client/surfraw-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst
-DESCRIPTION=A fast unix command line interface to WWW
-EAPI=6
-HOMEPAGE=http://surfraw.alioth.debian.org/ https://gitlab.com/surfraw/Surfraw
-KEYWORDS=amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=public-domain
-RDEPEND=dev-lang/perl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://surfraw.alioth.debian.org/dist/surfraw-2.3.0.tar.gz
-_eclasses_=bash-completion-r1	47a7402d95930413ce25ba8d857339bb	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=97b9dfe6b3584c4a4f51404136519907
diff --git a/metadata/md5-cache/www-client/surfraw-2.3.0-r1 b/metadata/md5-cache/www-client/surfraw-2.3.0-r1
new file mode 100644
index 000000000000..3739954003d5
--- /dev/null
+++ b/metadata/md5-cache/www-client/surfraw-2.3.0-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst preinst prepare
+DESCRIPTION=A fast unix command line interface to WWW
+EAPI=7
+HOMEPAGE=https://gitlab.com/surfraw/Surfraw
+KEYWORDS=amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=public-domain
+RDEPEND=dev-lang/perl
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gitlab.com/surfraw/Surfraw/-/archive/surfraw-2.3.0/Surfraw-surfraw-2.3.0.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
+_md5_=697e6e84a5c2ebd85e921f3c6f968e48
diff --git a/metadata/md5-cache/www-client/surfraw-99999 b/metadata/md5-cache/www-client/surfraw-99999
index 410bf4e3d051..0a8c35765756 100644
--- a/metadata/md5-cache/www-client/surfraw-99999
+++ b/metadata/md5-cache/www-client/surfraw-99999
@@ -2,10 +2,10 @@ BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || (
 DEFINED_PHASES=configure install prepare unpack
 DESCRIPTION=A fast unix command line interface to WWW
 EAPI=7
-HOMEPAGE=http://surfraw.alioth.debian.org/ https://gitlab.com/surfraw/Surfraw
+HOMEPAGE=https://gitlab.com/surfraw/Surfraw
 LICENSE=public-domain
 RDEPEND=dev-lang/perl
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	bash-completion-r1	47a7402d95930413ce25ba8d857339bb	git-r3	0d4635eeb5a96cd5315597a47eba25c9	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=778262c14b9e66efb793c8b73340559a
+_md5_=0b4c9d99e886cb8cef619cb1bb4a9561
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index 569a0fe26572..5039972b92fe 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23
deleted file mode 100644
index b11350149572..000000000000
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=sys-apps/kmod:= sys-libs/libunwind:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 alsa? ( media-libs/alsa-lib:= ) chamelium? ( dev-libs/xmlrpc-c ) glib? ( dev-libs/glib:2 ) gsl? ( sci-libs/gsl ) valgrind? ( dev-util/valgrind ) video_cards_intel? ( sys-libs/zlib:= ) xrandr? ( >=x11-libs/libXrandr-1.3 ) amd64? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) x86? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) amd64? ( x11-base/xorg-proto >=dev-util/peg-0.1.18 ) x86? ( x11-base/xorg-proto >=dev-util/peg-0.1.18 ) doc? ( >=dev-util/gtk-doc-1.25-r1 ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Intel GPU userland tools
-EAPI=6
-HOMEPAGE=https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools
-IUSE=alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sys-apps/kmod:= sys-libs/libunwind:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 alsa? ( media-libs/alsa-lib:= ) chamelium? ( dev-libs/xmlrpc-c ) glib? ( dev-libs/glib:2 ) gsl? ( sci-libs/gsl ) valgrind? ( dev-util/valgrind ) video_cards_intel? ( sys-libs/zlib:= ) xrandr? ( >=x11-libs/libXrandr-1.3 ) amd64? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) x86? ( xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) )
-REQUIRED_USE=chamelium? ( glib gsl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.23.tar.xz
-_eclasses_=meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=ab09217547e8e8145bcdd03fa0409efd
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23-r1 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23-r1
deleted file mode 100644
index 79451272f906..000000000000
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.23-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 chamelium? ( dev-libs/xmlrpc-c sci-libs/gsl x11-libs/pixman ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) sound? ( sci-libs/gsl media-libs/alsa-lib:= ) valgrind? ( dev-util/valgrind ) doc? ( >=dev-util/gtk-doc-1.25-r1 ) man? ( dev-python/docutils ) overlay? ( >=dev-util/peg-0.1.18 x11-base/xorg-proto ) video_cards_intel? ( sys-devel/bison sys-devel/flex ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=Intel GPU userland tools
-EAPI=6
-HOMEPAGE=https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools
-IUSE=chamelium doc libressl man overlay sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 chamelium? ( dev-libs/xmlrpc-c sci-libs/gsl x11-libs/pixman ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) sound? ( sci-libs/gsl media-libs/alsa-lib:= ) valgrind? ( dev-util/valgrind )
-REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.23.tar.xz
-_eclasses_=meson	2fbe03e3b496f82fd941bcdb9d351c91	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	08e17157a6807add7db1f8d01e7e391f	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529
-_md5_=3b1235dfd020b74f4a2deabfe9376b9f
diff --git a/metadata/md5-cache/x11-apps/luit-1.1.1 b/metadata/md5-cache/x11-apps/luit-1.1.1
deleted file mode 100644
index 25d48fa5b89f..000000000000
--- a/metadata/md5-cache/x11-apps/luit-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig
-DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
-EAPI=4
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/luit
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=sys-libs/zlib x11-libs/libX11 x11-libs/libfontenc
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/luit-1.1.1.tar.bz2
-_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	autotools-utils	696393cddf6200db17a31641f597b403	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xorg-2	4d854e511b91b4119fc0e8e227cfcd98
-_md5_=bb802ce20719c738e40a63d1971df110
diff --git a/metadata/md5-cache/x11-apps/luit-20190106 b/metadata/md5-cache/x11-apps/luit-20190106
index d9e12c867958..7e4250e2b768 100644
--- a/metadata/md5-cache/x11-apps/luit-20190106
+++ b/metadata/md5-cache/x11-apps/luit-20190106
@@ -4,9 +4,9 @@ DEPEND=sys-libs/zlib virtual/libiconv
 DESCRIPTION=Locale and ISO 2022 support for Unicode terminals
 EAPI=7
 HOMEPAGE=https://invisible-island.net/luit/
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/luit/luit-20190106.tgz
-_md5_=e9bd9bf3038ee077d2a04b26af21ec56
+_md5_=2fa7d5dbfb2cc7f209c89393a4ca9ec2
diff --git a/metadata/md5-cache/x11-apps/setxkbmap-1.3.2 b/metadata/md5-cache/x11-apps/setxkbmap-1.3.2
new file mode 100644
index 000000000000..851a728ec728
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/setxkbmap-1.3.2
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/libxkbfile x11-libs/libX11 x11-base/xorg-proto
+DESCRIPTION=Controls the keyboard layout of a running X server
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/setxkbmap
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=x11-libs/libxkbfile x11-libs/libX11 x11-misc/xkeyboard-config
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/setxkbmap-1.3.2.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xorg-3	9ac2b7a3cc6952c4f23a29369febbba1
+_md5_=b99296d3359457bb5e9c14227aa5242e
diff --git a/metadata/md5-cache/x11-apps/xbacklight-1.2.3 b/metadata/md5-cache/x11-apps/xbacklight-1.2.3
new file mode 100644
index 000000000000..f02cb3e2afb1
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xbacklight-1.2.3
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/libxcb >=x11-libs/xcb-util-0.3.8
+DESCRIPTION=Sets backlight level using the RandR 1.2 BACKLIGHT output property
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xbacklight
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=MIT
+RDEPEND=x11-libs/libxcb >=x11-libs/xcb-util-0.3.8
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xbacklight-1.2.3.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xorg-3	9ac2b7a3cc6952c4f23a29369febbba1
+_md5_=93499bb2d5322df787e4a0783e8fea0c
diff --git a/metadata/md5-cache/x11-apps/xbiff-1.0.4 b/metadata/md5-cache/x11-apps/xbiff-1.0.4
new file mode 100644
index 000000000000..b34d6ebc2b03
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xbiff-1.0.4
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext x11-base/xorg-proto
+DESCRIPTION=mailbox flag for X
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xbiff
+KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXext
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xbiff-1.0.4.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xorg-3	9ac2b7a3cc6952c4f23a29369febbba1
+_md5_=e886d63bc013a62d9287442d0b94db3b
diff --git a/metadata/md5-cache/x11-apps/xclock-1.0.9 b/metadata/md5-cache/x11-apps/xclock-1.0.9
new file mode 100644
index 000000000000..16f1588098f9
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xclock-1.0.9
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw x11-base/xorg-proto
+DESCRIPTION=analog / digital clock for X
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xclock
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXrender x11-libs/libXft x11-libs/libxkbfile x11-libs/libXaw
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xclock-1.0.9.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xorg-3	9ac2b7a3cc6952c4f23a29369febbba1
+_md5_=48f83129c98284a3b0a0306185047fbf
diff --git a/metadata/md5-cache/x11-apps/xman-1.1.5 b/metadata/md5-cache/x11-apps/xman-1.1.5
new file mode 100644
index 000000000000..0174263b8742
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xman-1.1.5
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-base/xorg-proto
+DESCRIPTION=Manual page display program for the X Window System
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xman
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xman-1.1.5.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xorg-3	9ac2b7a3cc6952c4f23a29369febbba1
+_md5_=98f8487da45e202ca583e1e20a5acfb7
diff --git a/metadata/md5-cache/x11-apps/xwininfo-1.1.5 b/metadata/md5-cache/x11-apps/xwininfo-1.1.5
new file mode 100644
index 000000000000..be714ccf54b5
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xwininfo-1.1.5
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=>=x11-libs/libxcb-1.6 x11-base/xorg-proto x11-libs/libX11
+DESCRIPTION=window information utility for X
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xwininfo
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=>=x11-libs/libxcb-1.6
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/app/xwininfo-1.1.5.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xorg-3	9ac2b7a3cc6952c4f23a29369febbba1
+_md5_=7fd4f9f54507c813bd48dd24b2497520
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 201883f42486..8865c431f1fd 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.10 b/metadata/md5-cache/x11-libs/libICE-1.0.10
new file mode 100644
index 000000000000..4954e87afda5
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.10
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-base/xorg-proto x11-libs/xtrans
+DESCRIPTION=X.Org Inter-Client Exchange library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libICE
+IUSE=ipv6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MIT
+RDEPEND=x11-base/xorg-proto x11-libs/xtrans elibc_glibc? ( dev-libs/libbsd )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libICE-1.0.10.tar.bz2
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	flag-o-matic	7ba73aee7fe4462b3a745e3645ab92ca	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	40fe59465edacd730c644ec2bc197809	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multilib-build	0d0c25170069d06d0eb233154229af97	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	8c7f9d80beedd16f2e5a7f612c609529	xorg-3	9ac2b7a3cc6952c4f23a29369febbba1
+_md5_=f4ae85fd85e39323c1ccc51bca04aa1d
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index e542dc842f07..9d1ad4731812 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 14 Jul 2019 15:08:56 +0000
+Mon, 15 Jul 2019 05:08:54 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 5fe97812bd08..be973084ec0b 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -3104,11 +3104,6 @@
     <name>Gentoo Developer Recruiters</name>
     <url>https://wiki.gentoo.org/wiki/Project:Recruiters</url>
     <description>The Recruiters subproject provides a central location for information about developer recruitment and recruiter policy.</description>
-    <member>
-      <email>amynka@gentoo.org</email>
-      <name>Amy Liffey</name>
-      <role>Recruiter</role>
-    </member>
     <member is-lead="1">
       <email>zlogene@gentoo.org</email>
       <name>Mikle Kolyada</name>
@@ -3787,11 +3782,6 @@
     <name>Undertakers</name>
     <url>https://wiki.gentoo.org/wiki/Project:Undertakers</url>
     <description>The Community Relations Undertakers project handles developer retirement, both when developers announce their retirement as well as due to developer inactivity.</description>
-    <member>
-      <email>amynka@gentoo.org</email>
-      <name>Amy Liffey</name>
-      <role>Member</role>
-    </member>
     <member is-lead="1">
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
diff --git a/metadata/timestamp b/metadata/timestamp
index a9e9b2680f18..1e3144609c58 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jul 14 15:08:56 UTC 2019
+Mon Jul 15 05:08:54 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5cf66c41d4d7..d14f0518f82c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 14 Jul 2019 15:30:01 +0000
+Mon, 15 Jul 2019 05:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index db7073a1f25d..aaa34f3caaca 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-1228c926d9f0dbe5e63ac31bd66a50987994ed5d 1563113916 2019-07-14T14:18:36+00:00
+e43515ea069bc4dfe94fe1043b91c9730162bc8b 1563160442 2019-07-15T03:14:02+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2cbaa66d4034..4cdfe94f855d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1563116701 Sun 14 Jul 2019 03:05:01 PM UTC
+1563167101 Mon 15 Jul 2019 05:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e542dc842f07..9d1ad4731812 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 14 Jul 2019 15:08:56 +0000
+Mon, 15 Jul 2019 05:08:54 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 4125eff59d47..b38285add2f1 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index a52d4d09f5f7..2261157cb9cf 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -1,2 +1 @@
-DIST chaosreader-0.94.bz2 41039 BLAKE2B 664ac7de3ea15dcc2942f7d9ffa4a7ffd2066a521345877127594ece197cab8d49d2f3441335c012dc09041543cda31c723d021ae86a512b4d578f958acc3afc SHA512 f2c2b31e6f7fc27c5cb59a43ce9cdea67de520c79f6354c9a0f627c098d73f4666461fb4f3c393a0a9ac36105979fe36b08035c4404371db2f573dd534e1adad
 DIST chaosreader-0.96.tar.gz 99124 BLAKE2B 04e9dd45543033bb3d15264fcc9168b7e2cec6f304f10142df36c363e841afc91659d7956bbb60b05cc6ab4e8fd519adaf9a2e69be2efc129fd2f38ca0d99f1f SHA512 46ba4a66152403e150e652bf6fa08af98cd3d709ea2cb834a32411ca5dde5f94a7e972404626787e604c1449c29ab5f335673b305ab83856c0dfff7cbf2f4de4
diff --git a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
deleted file mode 100644
index 1b7d356fcb14..000000000000
--- a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data."
-HOMEPAGE="http://chaosreader.sourceforge.net
-	https://github.com/brendangregg/Chaosreader"
-SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
-SLOT="0"
-
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-LICENSE="GPL-2+"
-
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.8.0"
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/chaosreader-0.94-zombies.patch
-	epatch "${FILESDIR}"/chaosreader-0.94-chunkcheck.patch
-	epatch "${FILESDIR}"/chaosreader-0.94-darwin.patch
-	epatch "${FILESDIR}"/chaosreader-0.94-divisionbyzero.patch
-	epatch "${FILESDIR}"/chaosreader-0.94-oldmultiline.patch
-}
-
-src_install() {
-	newbin ${P} chaosreader
-}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 718ed233a150..277af245a42a 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 901979082092..41ea40780c1d 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_1.25.1_amd64.deb 75926260 BLAKE2B 949fe86fe311b607645d4c6630fc4b63f258554101b262d0ab01b768a9daf5864b61c740f29673580236e903e5f33ffa451888973495f1957d9a01238b0bfffa SHA512 fe816d38d179b978a2b50a040eb0b2beb4a99b4e6cfc1eff872eaee5a0c0e9ab9f5293594bdd168444f3aaf02dd2f84ab0e8a683b0ba54588f46bde7d557c4ef
+DIST signal-desktop_1.25.3_amd64.deb 93829666 BLAKE2B 33a6bc00994fb8fb8b58702be83d8401728077e65f5c4284664b5a4b00275d524baf4265143ccc5d6a081f5c8e1d9ffa41c8534312fc07eea72d20597ba9f123 SHA512 9eb811fc5b8b09407055212d8eab0bf549917fdf1d2e65058fc47ad093e6940daac6ae437acd6b8ce00d83696879a04d3acd64fddeae9d3e7561633e38d676c4
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.25.1.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.25.3.ebuild
similarity index 100%
rename from net-im/signal-desktop-bin/signal-desktop-bin-1.25.1.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-1.25.3.ebuild
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 449ea9607ec1..2cc7766f0388 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index c5848da4c376..7cdeaf267a39 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,2 +1,3 @@
 DIST gtk-gnutella-1.1.13.tar.xz 19207704 BLAKE2B 4a11fd3f8bd7554e78a75b51b818e2e863edc328d07d0da4fce07e9a6eca7307dd66082dc70caf96e9e85d1d68ee1ef253a47ffb58cc9f33358a5d71b10782cb SHA512 14ff19a3f0bf55101570b4268cdd422defd2ccd112d80e9bafe2f6eb019b94c3c72763e67e2853d4446e68943355093c1279c6d67c101ca6d9b7f05ddd9ac7e0
 DIST gtk-gnutella-1.1.14.tar.xz 19372716 BLAKE2B b9caf1eaa79ca9c9e4d6a036f438eabbbab59a2d94a5227aee17ef9e9551af8185c3049247ee2e53ed913cbb46fafc6841d84346928490b380e16ccf5d27cc4e SHA512 cf8d76a5d531ad26e6155aedc2099f86ff91f96c4587bd6910e844fb6d19d35b48e3d1c4df45b7c68b34f4afcf2ce507943d73a33d923a97f6c43dd9c9ce10c9
+DIST gtk-gnutella-1.1.15.tar.xz 19606508 BLAKE2B 3c699f2c5e8b6962265c9fc9bc6720d740c447afb33bef8968e8c8f1f7ec8b88ec3381419cdcee8e2ec8f4e10be2c6e5707d5f89365f347a33990fffd0f18395 SHA512 6b2bee08fba463b66890c8c5d7f7815a8cc4106824e598bed8cffe4601b1e591fc14903ce8d587815257f795c854d459b3a4fa7cc90de2fbc109daef025e5968
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
new file mode 100644
index 000000000000..05775beef84c
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# eutils: strip-linguas
+inherit eutils toolchain-funcs
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+RDEPEND="
+	sys-libs/binutils-libs:=
+	dev-libs/glib:2
+	sys-libs/zlib
+	gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+	dbus? ( >=sys-apps/dbus-0.35.2 )
+	ssl? ( >=net-libs/gnutls-2.2.5 )
+	nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	strip-linguas -i po
+
+	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+	for ling in ${LINGUAS}; do
+		echo $ling >> po/LINGUAS
+	done
+
+	default
+}
+
+src_configure() {
+	# There is no option to turn off optimization through the build.sh
+	# script.
+	sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
+
+	# The build script does not support the equivalent --enable
+	# options so we must construct the configuration by hand.
+
+	local myconf
+
+	if ! use nls; then
+		myconf="${myconf} --disable-nls"
+	fi
+
+	if ! use dbus; then
+		myconf="${myconf} --disable-dbus"
+	fi
+
+	if ! use ssl; then
+		myconf="${myconf} --disable-gnutls"
+	fi
+
+	if use gtk; then
+		myconf="${myconf} --gtk2"
+	else
+		myconf="${myconf} --topless"
+	fi
+
+	./build.sh \
+		--configure-only \
+		--prefix="/usr" \
+		--cc=$(tc-getCC) \
+		${myconf}
+}
+
+src_compile() {
+	# Build system is not parallel-safe, bug 500760
+	emake -j1
+}
+
+src_install() {
+	dodir /usr/bin
+	emake INSTALL_PREFIX="${D}" install || die "Install failed"
+	dodoc AUTHORS ChangeLog README TODO
+
+	# Touch the symbols file into the future to avoid warnings from
+	# gtk-gnutella later on, since we will most likely strip the binary.
+	touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index ef457dd9ab82..b63258d80422 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 3836323b9d8f..8195d7a1092e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Sobhan Mohammadpour <sobhan@gentoo.org> (2019-07-14)
+# Masked for testing
+>=media-video/totem-3.32.1
+
+# Kent Fredric <kentnl@gentoo.org> (2019-07-14)
+# Broken since 2007, Upstream not seen since 2004.
+# Removal after 2019-08-13
+# Bug #635792
+dev-libs/libvorbis-perl
+
 # David Seifert <soap@gentoo.org> (2019-07-14)
 # Unmaintained, removed from Debian and other distros, tons of CVEs,
 # unreachable upstream, removal in 30 days
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index abb042d59098..6e160c01043a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1211,6 +1211,7 @@ app-portage/layman:subversion - Support dev-vcs/subversion based overlays
 app-portage/layman:sync-plugin-portage - Install the sys-apps/portage sync module
 app-portage/pfl:network-cron - Adds a cron job which does a weekly submit of the package database
 app-portage/portage-utils:qmanifest - Build qmanifest applet, this adds additional dependencies for GPG, OpenSSL and BLAKE2B hashing
+app-portage/portage-utils:qtegrity - Build qtegrity applet, this adds additional dependencies for OpenSSL
 app-portage/tatt:templates - Install template scripts to be used with tatt
 app-shells/autojump:ipython - Add support for dev-python/ipython
 app-shells/bash:bashlogger - Log ALL commands typed into bash; should ONLY be used in restricted environments such as honeypots
@@ -9050,12 +9051,10 @@ www-servers/xsp:net45 - use .NET 4.5 Framework
 x11-apps/copyq:webkit - enables the application to use advanced HTML rendering and fetching remote images and other data
 x11-apps/igt-gpu-tools:X - Enable intel-gpu-overlay xlib/cairo backend
 x11-apps/igt-gpu-tools:chamelium - Enables support for building Chamelium tests
-x11-apps/igt-gpu-tools:glib - Support reading config files via glib helpers
 x11-apps/igt-gpu-tools:man - Build and install man pages
 x11-apps/igt-gpu-tools:overlay - Build the intel-gpu-overlay utility
 x11-apps/igt-gpu-tools:runner - Build the test runner
 x11-apps/igt-gpu-tools:valgrind - Support valgrind annotations
-x11-apps/igt-gpu-tools:xrandr - Enable support for the X RandR extension
 x11-apps/igt-gpu-tools:xv - Enable intel-gpu-overlay xv backend
 x11-apps/mesa-progs:egl - Build EGL utilities
 x11-apps/mesa-progs:gles2 - Build OpenGL ES 2 utilities
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index c84a9677de2a..f9090c52aa6e 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/cvc4/Manifest b/sci-mathematics/cvc4/Manifest
index 2b268f2188b7..daaafcc4d443 100644
--- a/sci-mathematics/cvc4/Manifest
+++ b/sci-mathematics/cvc4/Manifest
@@ -1 +1,2 @@
 DIST cvc4-1.6.tar.gz 7815893 BLAKE2B 626e0dd49f911384e64d7e8ecf635aa12dad32830b2032bdcb96afd1a17c3566f56df51f75e9193cf365b562855733d0ea4ff3311ac99fc86e928a956298d2ad SHA512 0887b3f74a4b9e51e634591c7cf39d730110ca5d930149bab4816a49e383eeea8ccadf8474d22f5529cc03ddd045acacf8a2b92434b882adf352f4de4075fcd4
+DIST cvc4-1.7.tar.gz 6969953 BLAKE2B 3a64db14a734e0314fb7d7b8dbed79e067c9bbf1723343dac1e9c47b3f09811b1a32ff0116412667bd0afefda2489c6c1679bf109710402a67bee0d91b62dd94 SHA512 b91dfac7ddf979a3474f562eb98f2d6f17a53efa38c1be5502429309a0c059e1f2b0d85ee95e5aee17d35f34c825f01f879ec4aaf26025b1fcac835c33a867c6
diff --git a/sci-mathematics/cvc4/cvc4-1.7.ebuild b/sci-mathematics/cvc4/cvc4-1.7.ebuild
new file mode 100644
index 000000000000..0b192f127391
--- /dev/null
+++ b/sci-mathematics/cvc4/cvc4-1.7.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="automatic theorem prover for satisfiability modulo theories (SMT) problems"
+HOMEPAGE="http://cvc4.cs.stanford.edu/web/"
+SRC_URI="https://github.com/CVC4/CVC4/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cln"
+
+RDEPEND="dev-libs/antlr-c
+	dev-java/antlr:3
+	dev-libs/boost
+	cln? ( sci-libs/cln )
+	!cln? ( dev-libs/gmp:= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/CVC4-${PV}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_configure() {
+	CMAKE_MAKEFILE_GENERATOR=emake
+	local mycmakeargs=(
+		-DANTLR_BINARY=/usr/bin/antlr3
+		-DENABLE_GPL=ON
+		-DUSE_CLN="$(usex cln ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" \
+		examples \
+		boilerplate \
+		ouroborous \
+		reset_assertions \
+		sep_log_api \
+		smt2_compliance \
+		two_smt_engines \
+		statistics
+	cmake-utils_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}"/usr/{lib,$(get_libdir)}
+}
diff --git a/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch b/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
new file mode 100644
index 000000000000..849b4a8a4292
--- /dev/null
+++ b/sci-mathematics/cvc4/files/cvc4-1.7-gentoo.patch
@@ -0,0 +1,35 @@
+--- a/CMakeLists.txt	2019-07-09 14:47:12.552425226 +0200
++++ b/CMakeLists.txt	2019-07-09 14:50:02.595001358 +0200
+@@ -143,7 +143,7 @@
+ 
+ # Note: Module CodeCoverage requires the name of the debug build to conform
+ #       to cmake standards (first letter uppercase).
+-set(BUILD_TYPES Production Debug Testing Competition)
++set(BUILD_TYPES Production Debug Testing Competition Gentoo)
+ 
+ if(ENABLE_ASAN)
+ #_cmake_modify_IGNORE   set(CMAKE_BUILD_TYPE Debug)
+@@ -166,12 +166,10 @@
+ endif()
+ 
+ message(STATUS "Building ${CMAKE_BUILD_TYPE} build")
+-include(Config${CMAKE_BUILD_TYPE})
+ 
+ #-----------------------------------------------------------------------------#
+ # Compiler flags
+ 
+-add_check_c_cxx_flag("-O${OPTIMIZATION_LEVEL}")
+ add_check_c_cxx_flag("-Wall")
+ add_check_c_flag("-fexceptions")
+ add_check_c_cxx_flag("-Wno-deprecated")
+--- a/test/regress/CMakeLists.txt	2019-07-14 09:49:38.429990489 +0200
++++ b/test/regress/CMakeLists.txt	2019-07-14 09:50:28.854234838 +0200
+@@ -1810,7 +1810,7 @@
+   regress4/C880mul.miter.shuffled-as.sat03-348.smt
+   regress4/NEQ016_size5.smt
+   regress4/bug143.smt
+-  regress4/comb2.shuffled-as.sat03-420.smt
++  #regress4/comb2.shuffled-as.sat03-420.smt
+   regress4/hole10.cvc
+   regress4/instance_1151.smt
+ )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4c2cefb527a9..d036fd5db65f 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/guix/guix-1.0.0-r1.ebuild b/sys-apps/guix/guix-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..475d3bba8b83
--- /dev/null
+++ b/sys-apps/guix/guix-1.0.0-r1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1 systemd user
+
+DESCRIPTION="GNU package manager (nix sibling)"
+HOMEPAGE="https://www.gnu.org/software/guix/"
+
+# taken from gnu/local.mk and gnu/packages/bootstrap.scm
+BOOT_GUILE=(
+	"aarch64-linux  20170217 guile-2.0.14.tar.xz"
+	"armhf-linux    20150101 guile-2.0.11.tar.xz"
+	"i686-linux     20131110 guile-2.0.9.tar.xz"
+	"mips64el-linux 20131110 guile-2.0.9.tar.xz"
+	"x86_64-linux   20131110 guile-2.0.9.tar.xz"
+)
+
+binary_src_uris() {
+	local system_date_guilep uri
+	for system_date_guilep in "${BOOT_GUILE[@]}"; do
+		# $1              $2       $3
+		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
+		set -- ${system_date_guilep}
+		uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3"
+		# ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap
+		echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap"
+	done
+}
+
+# copy bootstrap binaries from DISTDIR to ${S}
+copy_boot_guile_binaries() {
+	local system_date_guilep
+	for system_date_guilep in "${BOOT_GUILE[@]}"; do
+		# $1              $2       $3
+		# "armhf-linux    20150101 guile-2.0.11.tar.xz"
+		set -- ${system_date_guilep}
+		cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die
+	done
+}
+
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	$(binary_src_uris)"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # complains about size of config.log and refuses to start tests
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	>=dev-scheme/guile-2.2:=[regex,networking,threads]
+	dev-scheme/bytestructures
+	dev-scheme/guile-gcrypt
+	>=dev-scheme/guile-git-0.2.0
+	dev-scheme/guile-json
+	dev-scheme/guile-sqlite3
+	net-libs/gnutls[guile]
+	sys-libs/zlib
+	app-arch/bzip2
+	dev-db/sqlite
+"
+
+DEPEND="${RDEPEND}
+"
+
+PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch)
+
+QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*"
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS="Quick start user guide on Gentoo:
+
+[as root] allow binary substitution to be downloaded (optional)
+	# guix archive --authorize < /usr/share/guix/ci.guix.info.pub
+[as root] enable guix-daemon service:
+	[systemd] # systemctl enable guix-daemon
+	[openrc]  # rc-update add guix-daemon
+[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile
+[as a user] install guix packages:
+	\$ guix package -i hello
+[as a user] configure environment:
+	Somewhere in .bash_profile you might want to set
+	export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale
+
+Next steps:
+	guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html
+"
+
+pkg_setup() {
+	enewgroup guixbuild
+	for i in {1..10}; do
+		# we list 'guixbuild' twice to
+		# both assign a primary group for user
+		# and add a user to /etc/group
+		enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild
+	done
+}
+
+src_prepare() {
+	copy_boot_guile_binaries
+
+	default
+	# build system is very eager to run automake itself: bug #625166
+	eautoreconf
+
+	# guile is trying to avoid recompilation by checking if file
+	#     /usr/lib64/guile/2.2/site-ccache/guix/modules.go
+	# is newer than
+	#     guix/modules.scm
+	# In case it is instead of using 'guix/modules.scm' guile
+	# loads system one (from potentially older version of guix).
+	# To work it around we bump last modification timestamp of
+	# '*.scm' files.
+	find "${S}" -name "*.scm" -exec touch {} + || die
+
+	# Gentoo stores systemd unit files in lib, never in lib64: bug #689772
+	sed -i nix/local.mk \
+		-e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die
+}
+
+src_configure() {
+	# to be compatible with guix from /gnu/store
+	econf \
+		--localstatedir="${EPREFIX}"/var
+}
+
+src_compile() {
+	# guile occasionally fails with 'bad address'
+	emake -j1
+}
+
+src_install() {
+	# TODO: emacs highlighter
+	default
+
+	readme.gentoo_create_doc
+
+	keepdir                /etc/guix
+	# TODO: will need a tweak for prefix
+	keepdir                /gnu/store
+	fowners root:guixbuild /gnu/store
+	fperms 1775            /gnu/store
+
+	keepdir                /var/guix/profiles/per-user
+	fperms 1777            /var/guix/profiles/per-user
+
+	newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 132ee151fe85..468235f158c2 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/torque/torque-6.0.4-r1.ebuild b/sys-cluster/torque/torque-6.0.4-r1.ebuild
index 4cfac4df5ce4..bc520dc0ace3 100644
--- a/sys-cluster/torque/torque-6.0.4-r1.ebuild
+++ b/sys-cluster/torque/torque-6.0.4-r1.ebuild
@@ -19,8 +19,6 @@ DEPEND_COMMON="
 	sys-libs/readline:0=
 	dev-libs/libxml2
 	>=dev-libs/boost-1.41
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
 	cpusets? ( sys-apps/hwloc )
 	munge? ( sys-auth/munge )
 	nvidia? ( >=x11-drivers/nvidia-drivers-275 )
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 44e957aa52fb..2fb60c83e8a7 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 4922687f9069..31234b476724 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,11 +1,16 @@
 DIST LVM2.2.02.173.tgz 2363504 BLAKE2B a516bc9b68b7b7529f4436d8849ca741eb3ca1b5ac2eb2fb2915507935bdd28b5e234e74c1bce827e5761f57b5936510d08107e0dc1c320190f952c706f128d3 SHA512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e
-DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9 SHA512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7
+DIST LVM2.2.02.185.tgz 2386328 BLAKE2B d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506 SHA512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf
 DIST LVM2.2.02.88.tgz 1029151 BLAKE2B e3ce91b6c43155a66b79cf25da3973abb19decde3acc37d28daf80d14b1bd574f7d31fbcee4b397f0a146b2e221599079e521d0ac21932ff58b7c9d4fdf93501 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b
+DIST btrfs-progs-v5.1.1.tar.xz 2041940 BLAKE2B ca032cf17e78e5892788b677b5a0fead7cf1108fd464facb48e713b259c8c75f8b7714377f75e7b9e595c7c8fa5927fa37d11f43f51e4d898698f9fc5d26a808 SHA512 0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd
 DIST busybox-1.20.2.tar.bz2 2186738 BLAKE2B 3efa01ee81a9f3af0ccbcf28b1a24e817a28012d27a27c714b3f13fe4a73200af66fb93dcd9adc65de3e3abb26757939ff3d3ba620af08101c27c5f3550e7501 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd
 DIST busybox-1.26.0.tar.bz2 2143958 BLAKE2B 3a4a227a4308d9d5e00c00fc5e90ee9a1d6345574bdb571cd8b4adab63dcdad3ff7edf30154bb8f8f31a3a658c85641af0f7875d4d533d56bb7c79f28980ebe6 SHA512 9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
 DIST busybox-1.27.2.tar.bz2 2216527 BLAKE2B 77b8fa325b9ba691c0ac944537efdf5d87011b1a87c1c244588136f78055be9f2a71c77eea5edf1d20cfe50e59b15527511b14160930c946ed4e82c9608cb991 SHA512 d99e86b652562ebe1a5d50e1ba3877a1d1612997c17cb8d8e4212da181211a9b741a881cb051f14cb3ee8aea40226cf2cde80a076baed265d3bc0a4e96a5031c
-DIST busybox-1.30.1.tar.bz2 7793781 BLAKE2B 429f6bd48cb6ede81f956d450cf05b799dce9dbd61593b6dd787f353c2de3734d576ddfec644fa5ab6c61895400c32e3cb28c939b06eaa33eef105c8f8f13d8f SHA512 c18b3d06356d4708b4b0e89d23500d2fe494da9f6aac09c0c19a2e5145ba2bfe8261088eae6562c900996b50c5a9c20459f908069267898c8f86fe3b0b7bd80b
+DIST busybox-1.31.0.tar.bz2 2427873 BLAKE2B 7fff2ac2c39232f9dbd8ea4af55539e9eb7ab2ddabf2f53534f57cabe00a6096643415275dcfa2730f970994282776f9ce661e99e681989449473182ffe820e1 SHA512 cd58f0b2b6e3bb1b771fcf3d15f420518fb9b10086a45cfb1d7f136ac035be89eec28f9350e42b3fc38454d8bef9190eae0376497487c73785e8fde44c793730
+DIST cryptsetup-2.1.0.tar.xz 10662576 BLAKE2B c79b24c986d5925aed31eddf8f271c3d0f12c89b3f99f953cfa39fe0d9dca2ab3dd2f6ea22141aca0148d6d533d197378b011561075ca26a14ca2e90500a1689 SHA512 f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928
 DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 BLAKE2B 290c5bb7f1b12ac48627d8afcc346327b2fcce31b1015d5974c956d94f607b297e383158cd8741f03a770cdeb3f42c3e6341ebfcbc2220e122d89c2603eee512 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e
+DIST dropbear-2019.78.tar.bz2 2708659 BLAKE2B 212b173cfea8655b43a8d93422dd4d3e0d669a67681cb17d6494b6083e6e4c58d21d52850c0cdf414617ee3dcaa071e376d0b5b156b6856cee2e4fe111550f7d SHA512 f667ba8dae17ea89c118642b566f2c134c71bfd0b8bacea5cf7ec87d75ac79bd7cd1864a8788367a89d30ee35427d389ef6416375adff6e83caae30ff3e0549f
+DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
+DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
 DIST fuse-2.8.6.tar.gz 505334 BLAKE2B c44533625ead8acc5a16f61064635492c54aa91780018e3895baf18abe3ca00c9ec7f6606183a4f986037201db79697c07d03adf57c5a87e7888b8823d83aa8a SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST genkernel-3.4.52.3.tar.xz 282976 BLAKE2B 69eb6a964c5c20ee32ea6143b576a85090dfb50c011c641ae8415fba1cb99e7f239f4ba7fdc450b7c0eb93a248610c47e751f3993b8fff6e51b9602c37145af9 SHA512 a68b0149b9a69f59ab3e8d772f35f12643b9500c0c684d4824ca1f3c669b0ea01989a55643cd5b413f35d6fff284cd5ede7183971e202b3788caeb399259191f
@@ -19,15 +24,27 @@ DIST genkernel-3.5.2.4.tar.xz 318152 BLAKE2B 101bd8011b73699a3d8410fcb93adca2417
 DIST genkernel-3.5.2.5.tar.xz 318652 BLAKE2B 9b0e1b07f61b54edc1d263cc679b36d7e9062fd1e7cf11fc9442cf60b217274bc73425150ca963b6a91cd504d7817a852fa5bf4ad7634ff8d1ec3b43748ded41 SHA512 096aa77f4a52afefcef81ff6c7eb281e539af304854572389e38bbdd735ca723c7a5f2f7163fa9f387e3a2a78a2ba117260f1c8396ed4e51e12a91ad0fb0ff90
 DIST genkernel-3.5.3.2.tar.xz 320644 BLAKE2B 14eaf05aab02287c3dbb98f1a596e73bcbea39ceb2c8e44c5bdbb77b656958cee666f4353a2401bad531c2a7a98ee11b2531b251c19edc86db517cf3cc2869ec SHA512 1bee8ebdb8c2c30e90e0a1c573ad09b0eb79da54f0829859305eb50ffab95e69aa219ce82d4969140dea3d8788d66d3490fc03d38e190b533666e9278c7f96a6
 DIST genkernel-3.5.3.3.tar.xz 331180 BLAKE2B 0f83b973505ccb0a92ae24e92509710bf96991f36ca55975ffefdf1bd3e835bd72bb413688468a05e6a5fff2ec16e64816f8ccfe2530c9f1e9169d19a86a2231 SHA512 9170731f59a1476aa597549ac55feb3583bed249e50d1697292571caf25c5ca746a1db9e811f2009d55aea21d739ef0ab3e385acd81504bbbccc8f7346205d71
+DIST genkernel-4.0.0_beta2.tar.xz 377908 BLAKE2B bcbc8032be8e87d70b6d9728284c3fc0061492a43130c40d18a4a19458ca237205bed569bd8235b2764e89d3c9fcfc9fab63e932c7d0ebf52dac702974dc6b0f SHA512 a78e447660059019f90afdad31de7a886b4745ad8ab3d70ff312bb3e7709382158dcc939e24f92c0382b00f481914f52c4e3b91b48639d459d749aad5038a549
 DIST gnupg-1.4.11.tar.bz2 3407075 BLAKE2B 85d35d2e4da65d54add1010ea0486b943b328785e28c4efcaa2b65daafd53410a355d1df79ae45c5f7767d2eb7ff1f0b9637f417e65b084d2c760a281abd317a SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae
 DIST gnupg-1.4.22.tar.bz2 3746546 BLAKE2B 9a2d37eeab10f2a7353804098e865ad45db846696a00a47f5bebf47145f79e0d2bf9c01c0195e2fe79af07946a3feac0d4589656c3e698a3a548ff1dd74ce759 SHA512 c03acac0fa55761470bb085d78a44e2b99ebb187e8396cbb031a184b1e40bef2a40c91da07755d1a20610a3daa6aa1eefea2d12a0dbd5a79a45466166419c708
 DIST gnupg-1.4.23.tar.bz2 3749353 BLAKE2B ec5e6bef0c7bb2a65813d7852cebeaa24c4855f9d9d9e802070da50b89fff56b747682933aa766dd130f849efcfe28f7aa74f3153405429bcf3845ef29c6dd6e SHA512 78dc52a2010202a4afc8814b29fda657a6c9fe230d5e7db11ae040edd2b0ca819e1baa4dbd6c0d04d36cd353df484e83f52d17759d2891c2cf7025c0b5d36612
-DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
+DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2222348df7c006902390f74a4cf100aab1ce6ac8a361a278dd917c114a278de5b3445817f3a40ae287478add46 SHA512 e984db2a42b9c95b52c798b2e8dd1b79951a8dcba27370af30c43b9549fbb00008dbcf052a535c528209aaee38e6d1f760168b706905ae72f3e704ed20f8a1a1
+DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
+DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
+DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
+DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 DIST mdadm-3.1.5.tar.bz2 292709 BLAKE2B a21fb41c6fd9f332e358339537cffd520788140976bf37fece072ee15eb512b1455e3a927abca0a4315e59659d3d114e407bb98a0ca8e6e559e1d1b83be4abbf SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d
 DIST mdadm-4.0.tar.xz 430780 BLAKE2B f08a67452398c864d73c78e2a7258d89c5c81b83dd136d4cd7e31e46b22d75ff67ecf553dc22f55dca418409daded51a399728dfdbd36039e828cad3233774e6 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
+DIST multipath-tools-0.8.0.tar.gz 447076 BLAKE2B 10a93a2654decd2377414188013d2141e34288fe119fa7c54047d95b825ef9ae64b20de1067d3f37a904b58be587997842f7a62088701fe1c1e6a078283b56e4 SHA512 8b6081109e535d0e392233bcedda930bc6d4b529ebe23bc45b276026311bc997e3cf8b39c1a86e4962c464faa69512202c0f6fb3d1f06c6445f8141853ad1bc4
 DIST open-iscsi-2.0-872.tar.gz 900081 BLAKE2B 6a4911347c55c1c4906350247ae7d92c2aee9627e1ab01cb5d705b02614b6c585ea042fef85a425b8f177645741f8d36e3efb40a57536bb79dbc5cdb6fe7998c SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0
 DIST open-iscsi-2.0.875.tar.gz 635121 BLAKE2B 34a7083087c53ed0e59d293d26efe166b09c5ea18b6022869cc9ff3d2edb2fb8b69e2c1ce6c9011bd20fc590b02dafd6d7c13d8bfa1eae6408c4bace13992e5e SHA512 1709011d7d12d3dd9278a0d775af064d5f7da37357f35d6d5c5b3aa8ec16385c28b201b1261f4581dbbbbca3d815015ed8696e1694aa19f3231132f90d1e5b36
-DIST open-isns-0.99.tar.gz 282831 BLAKE2B 7140daf08fda894bcbed3e25b122909ad0ed86b4f3db2e42a23b97480dea554194d2a33a3ebdf4e2017a57c2023dd8589f2e2fcfa60470cc3a6a3fbfb0d0ccbc SHA512 90a2297535c5e939f83c761173ce5f5f88e68adc31e41e833b23d07b6dc6959572ae7184db0084b861918199a877b251ebae4b4a7456fdd8c93400dc8457adc9
+DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
+DIST strace-5.2.tar.xz 1515544 BLAKE2B 919a689741eabd843a43fdb557953ee6095a4d1abea808d7c35049b93afd338e0df7c69014486dfb88d22dd7cdb2f74b939ed55f08e85cdb9793d8150d08bde0 SHA512 41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35
 DIST unionfs-fuse-0.24.tar.bz2 30381 BLAKE2B c3886d7b0cbd4ac62712d7d94bf9544481200e4354539b29770a88974ea3298b0f594cecfc6f7accff3595004ad1453075b947a2633b5300a3684fedba4995e5 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
+DIST userspace-rcu-0.10.2.tar.bz2 503833 BLAKE2B 17e2102e096903f301d1a08d606cf98e28a413ef26a3dc8fa6f400ba74aa14aabdef5e28d4fed5fb01cee33b0bd5de9fb0682523aaa50c6053fd3471711a02e7 SHA512 47413b4a593d19185ee3d455e5744042c060cb50008dac25e9135c5cd2250ef5129a419258b18c665c8c794ad3b09234fdd70a106c72d8fc64631172b13d0e22
+DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
+DIST xfsprogs-5.0.0.tar.xz 1218476 BLAKE2B ef6eaab43531f696f739972c362e31c3304baaecb3485b45c16441a8bf7f1da7f47cd74a21660ba2c2bb45858a2b13b7af41c94671135f6a32a36eb745c024a0 SHA512 cebe3d2ea80676a99cc7f9cc014894398fbe3bdaf237829e9c7aa0404558c1ab16f2055acb5afd8234b2bc8475117bcef3c7500c553adb12bbaf3262bd077d18
+DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
+DIST zstd-1.4.0.tar.gz 1898741 BLAKE2B 1b92a055712bb47c3d56c51f3ddddeaba00f9b746f7e47a2fa1a0afdf9798ff90f0ec734880a5d03644d47deb0e55f75c2cd3cbdab1a146dba5f49d4efeb2ae0 SHA512 8614934e25eb1e82b554c483bc9d2d055f51344697295e83b22a8d726321b12068cfa7f7d2a9fe28a2de7c9edda59733826277efc7046e13674d6f7f02af5671
diff --git a/sys-kernel/genkernel/files/genkernel-4.bash b/sys-kernel/genkernel/files/genkernel-4.bash
new file mode 100644
index 000000000000..631fc8b30e47
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.bash
@@ -0,0 +1,74 @@
+# genkernel (8) completion
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+# Written by Aron Griffis <agriffis@gentoo.org>
+
+_genkernel()
+{
+    declare cur prev genkernel_help actions params
+    COMPREPLY=()
+    cur=${COMP_WORDS[COMP_CWORD]}
+    prev=${COMP_WORDS[COMP_CWORD-1]}
+
+    # extract initial list of params/actions from genkernel --help
+    genkernel_help=$(command genkernel --help)
+    actions=( $(<<<"$genkernel_help" sed -n \
+	'/^Available Actions:/,/^$/s/^[[:space:]]\+\([^[:space:]]\+\).*/\1/p') )
+    params=( $(<<<"$genkernel_help" egrep -oe '--[^[:space:]]{2,}') )
+
+    # attempt to complete the current parameter based on the list
+    COMPREPLY=($(compgen -W "${params[*]/=*/=} ${actions[*]}" -- "$cur"))
+
+    # if we don't have a rhs to complete
+    if [[ ${#COMPREPLY[@]} -gt 1 ]]; then
+	return
+    elif [[ ${#COMPREPLY[@]} -eq 0 && $cur != --*=* ]]; then
+	return
+    elif [[ ${#COMPREPLY[@]} -eq 1 && $COMPREPLY != --*= ]]; then
+	# using nospace completion, add an explicit space
+	COMPREPLY="${COMPREPLY} "
+	return
+    fi
+
+    # we have a unique lhs and need to complete the rhs
+    declare args lhs rhs
+    if [[ ${#COMPREPLY[@]} -eq 1 ]]; then
+	lhs=$COMPREPLY
+    else
+	lhs=${cur%%=*}=
+	rhs=${cur#*=}
+    fi
+
+    # genkernel's help gives clues as to what belongs on the rhs.
+    # extract the clue for the current parameter
+    args=" ${params[*]} "
+    args="${args##* $lhs}"
+    args="${args%% *}"
+
+    # generate a list of completions for the argument; this replaces args with
+    # an array of results
+    args=( $(case $args in
+	('<0-5>') compgen -W "$(echo {1..5})" -- "$rhs" ;;
+	('<outfile>'|'<file>') compgen -A file -o plusdirs -- "$rhs" ;;
+	('<archive>') compgen -G '*.tar.xz' -G '*.tbz2' -G '*.tar.bz2' -o plusdirs -- "$rhs" ;;
+	('<dir>'|'<path>') compgen -A directory -S / -- "$rhs" ;;
+
+	(*) compgen -o bashdefault -- "$rhs" ;; # punt
+    esac) )
+
+    # we're using nospace completion to prevent spaces after paths that aren't
+    # "done" yet.  So do some hacking to the args to add spaces after
+    # non-directories.
+    declare slash=/
+    args=( "${args[@]/%/ }" )			# add space to all
+    args=( "${args[@]/%$slash /$slash}" )	# remove space from dirs
+
+    # recreate COMPREPLY
+    if [[ $cur == "$lhs"* ]]; then
+	COMPREPLY=( "${args[@]}" )
+    elif [[ ${#args[@]} -gt 0 ]]; then
+	COMPREPLY=( "${args[@]/#/$lhs}" )
+    fi
+}
+
+complete -o nospace -F _genkernel genkernel
diff --git a/sys-kernel/genkernel/genkernel-4.0.0_beta2.ebuild b/sys-kernel/genkernel/genkernel-4.0.0_beta2.ebuild
new file mode 100644
index 000000000000..c1e47a03889b
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-4.0.0_beta2.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+EAPI="7"
+
+inherit bash-completion-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BTRFS_PROGS="5.1.1"
+VERSION_BUSYBOX="1.31.0"
+VERSION_CRYPTSETUP="2.1.0"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2019.78"
+VERSION_EUDEV="3.2.8"
+VERSION_E2FSPROGS="1.45.2"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_ISCSI="2.0.875"
+VERSION_JSON_C="0.13.1"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.8.4"
+VERSION_LIBGPGERROR="1.36"
+VERSION_LVM="2.02.185"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_MULTIPATH_TOOLS="0.8.0"
+VERSION_POPT="1.16"
+VERSION_STRACE="5.2"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_USERSPACE_RCU="0.10.2"
+VERSION_UTIL_LINUX="2.34"
+VERSION_XFSPROGS="5.0.0"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.4.0"
+
+RH_HOME="ftp://sourceware.org/pub"
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="https://busybox.net/downloads"
+
+COMMON_URI="
+	mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://kernel/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${VERSION_MULTIPATH_TOOLS};sf=tgz -> multipath-tools-${VERSION_MULTIPATH_TOOLS}.tar.gz
+	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
+	mirror://kernel/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+	SRC_URI="${COMMON_URI}"
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz
+		${COMMON_URI}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm +firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	app-arch/cpio
+	>=app-misc/pax-utils-1.2.2
+	sys-apps/sandbox
+	firmware? ( sys-kernel/linux-firmware )
+	!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999* ]] ; then
+		einfo "Updating version tag"
+		GK_V="$(git describe --tags | sed 's:^v::')-git"
+		sed "/^GK_V/s,=.*,='${GK_V}',g" -i "${S}"/genkernel
+		einfo "Producing ChangeLog from Git history..."
+		pushd "${S}/.git" >/dev/null || die
+		git log > "${S}"/ChangeLog || die
+		popd >/dev/null || die
+	fi
+
+	# Update software.sh
+	sed -i \
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
+		"${S}"/defaults/software.sh \
+		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]] ; then
+		emake
+	fi
+}
+
+src_install() {
+	insinto /etc
+	doins "${S}"/genkernel.conf
+
+	doman genkernel.8
+	dodoc AUTHORS ChangeLog README TODO
+	dobin genkernel
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	if use ibm ; then
+		cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
+	else
+		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
+	fi
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/*
+
+	fperms +x /usr/share/genkernel/gen_worker.sh
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+
+	pushd "${DISTDIR}" &>/dev/null || die
+	insinto /usr/share/genkernel/distfiles
+	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
+}
+
+pkg_postinst() {
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT%/}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd "${gk_config}" 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+	fi
+}
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 767e288dba98..c1e47a03889b 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -4,40 +4,73 @@
 # genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
 
-EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
-
-inherit bash-completion-r1 epatch estack
-
-VERSION_BUSYBOX='1.30.1' # warning, be sure to bump patches
-VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
-VERSION_LIBAIO='0.3.110' # warning, be sure to bump patches
-VERSION_MDADM='4.1' # warning, be sure to bump patches
-VERSION_FUSE='2.9.9' # warning, be sure to bump patches
-VERSION_ISCSI='2.0.875' # warning, be sure to bump patches
-VERSION_ISCSI_ISNS='0.99' # warning, be sure to bump patches
-VERSION_LVM='2.02.183' # warning, be sure to bump patches
-VERSION_UNIONFS_FUSE='2.0'
-VERSION_GPG='1.4.23'
+EAPI="7"
+
+inherit bash-completion-r1
+
+# Whenever you bump a GKPKG, check if you have to move
+# or add new patches!
+VERSION_BTRFS_PROGS="5.1.1"
+VERSION_BUSYBOX="1.31.0"
+VERSION_CRYPTSETUP="2.1.0"
+VERSION_DMRAID="1.0.0.rc16-3"
+VERSION_DROPBEAR="2019.78"
+VERSION_EUDEV="3.2.8"
+VERSION_E2FSPROGS="1.45.2"
+VERSION_FUSE="2.9.9"
+VERSION_GPG="1.4.23"
+VERSION_ISCSI="2.0.875"
+VERSION_JSON_C="0.13.1"
+VERSION_LIBAIO="0.3.112"
+VERSION_LIBGCRYPT="1.8.4"
+VERSION_LIBGPGERROR="1.36"
+VERSION_LVM="2.02.185"
+VERSION_LZO="2.10"
+VERSION_MDADM="4.1"
+VERSION_MULTIPATH_TOOLS="0.8.0"
+VERSION_POPT="1.16"
+VERSION_STRACE="5.2"
+VERSION_UNIONFS_FUSE="2.0"
+VERSION_USERSPACE_RCU="0.10.2"
+VERSION_UTIL_LINUX="2.34"
+VERSION_XFSPROGS="5.0.0"
+VERSION_ZLIB="1.2.11"
+VERSION_ZSTD="1.4.0"
 
 RH_HOME="ftp://sourceware.org/pub"
 DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src"
 BB_HOME="https://busybox.net/downloads"
 
-COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
-		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
-		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
-		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
-		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
-		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
-		https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
-		https://github.com/open-iscsi/open-isns/archive/v${VERSION_ISCSI_ISNS}.tar.gz -> open-isns-${VERSION_ISCSI_ISNS}.tar.gz
-		https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
-		mirror://debian/pool/main/liba/libaio/libaio_${VERSION_LIBAIO}.orig.tar.gz -> libaio-${VERSION_LIBAIO}.tar.gz
-		https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
-		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
-
-if [[ ${PV} == 9999* ]]
-then
+COMMON_URI="
+	mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${VERSION_BTRFS_PROGS}.tar.xz
+	https://www.busybox.net/downloads/busybox-${VERSION_BUSYBOX}.tar.bz2
+	mirror://kernel/linux/utils/cryptsetup/v$(ver_cut 1-2 ${VERSION_CRYPTSETUP})/cryptsetup-${VERSION_CRYPTSETUP}.tar.xz
+	https://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	https://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2
+	https://dev.gentoo.org/~blueness/eudev/eudev-${VERSION_EUDEV}.tar.gz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${VERSION_E2FSPROGS}/e2fsprogs-${VERSION_E2FSPROGS}.tar.xz
+	https://github.com/libfuse/libfuse/releases/download/fuse-${VERSION_FUSE}/fuse-${VERSION_FUSE}.tar.gz
+	mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+	https://github.com/open-iscsi/open-iscsi/archive/${VERSION_ISCSI}.tar.gz -> open-iscsi-${VERSION_ISCSI}.tar.gz
+	https://s3.amazonaws.com/json-c_releases/releases/json-c-${VERSION_JSON_C}.tar.gz
+	https://releases.pagure.org/libaio/libaio-${VERSION_LIBAIO}.tar.gz
+	mirror://gnupg/libgcrypt/libgcrypt-${VERSION_LIBGCRYPT}.tar.bz2
+	mirror://gnupg/libgpg-error/libgpg-error-${VERSION_LIBGPGERROR}.tar.bz2
+	https://mirrors.kernel.org/sourceware/lvm2/LVM2.${VERSION_LVM}.tgz
+	https://www.oberhumer.com/opensource/lzo/download/lzo-${VERSION_LZO}.tar.gz
+	mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.xz
+	https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${VERSION_MULTIPATH_TOOLS};sf=tgz -> multipath-tools-${VERSION_MULTIPATH_TOOLS}.tar.gz
+	http://ftp.rpm.org/mirror/popt/popt-${VERSION_POPT}.tar.gz
+	https://github.com/strace/strace/releases/download/v${VERSION_STRACE}/strace-${VERSION_STRACE}.tar.xz
+	https://github.com/rpodgorny/unionfs-fuse/archive/v${VERSION_UNIONFS_FUSE}.tar.gz -> unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.gz
+	https://lttng.org/files/urcu/userspace-rcu-${VERSION_USERSPACE_RCU}.tar.bz2
+	mirror://kernel/linux/utils/util-linux/v${VERSION_UTIL_LINUX:0:4}/util-linux-${VERSION_UTIL_LINUX}.tar.xz
+	mirror://kernel/linux/utils/fs/xfs/xfsprogs/xfsprogs-${VERSION_XFSPROGS}.tar.xz
+	https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz
+	https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz
+"
+
+if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 	inherit git-r3
 	S="${WORKDIR}/${P}"
@@ -54,15 +87,13 @@ HOMEPAGE="https://www.gentoo.org"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="cryptsetup ibm +firmware selinux"
+IUSE="ibm +firmware"
 
-DEPEND="sys-fs/e2fsprogs
-	selinux? ( sys-libs/libselinux )"
+DEPEND=""
 RDEPEND="${DEPEND}
-	cryptsetup? ( sys-fs/cryptsetup )
 	app-arch/cpio
 	>=app-misc/pax-utils-1.2.2
-	sys-apps/util-linux[static-libs(+)]
+	sys-apps/sandbox
 	firmware? ( sys-kernel/linux-firmware )
 	!<sys-apps/openrc-0.9.9"
 # pax-utils is used for lddtree
@@ -71,17 +102,9 @@ if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND} app-text/asciidoc"
 fi
 
-pkg_pretend() {
-	if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
-		ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
-		ewarn "Please set flag 'cryptsetup' for this very package if you would like"
-		ewarn "to have genkernel create an initramfs with LUKS support."
-		ewarn "Sorry for the inconvenience."
-		echo
-	fi
-}
-
 src_prepare() {
+	default
+
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
 		GK_V="$(git describe --tags | sed 's:^v::')-git"
@@ -91,30 +114,41 @@ src_prepare() {
 		git log > "${S}"/ChangeLog || die
 		popd >/dev/null || die
 	fi
-	if use selinux ; then
-		sed -i 's/###//g' "${S}"/gen_compile.sh || die
-	fi
 
 	# Update software.sh
 	sed -i \
-		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-		-e "s:VERSION_ISCSI_ISNS:$VERSION_ISCSI_ISNS:" \
-		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-		-e "s:VERSION_LIBAIO:$VERSION_LIBAIO:" \
-		-e "s:VERSION_LVM:$VERSION_LVM:" \
-		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		-e "s:VERSION_BTRFS_PROGS:${VERSION_BTRFS_PROGS}:"\
+		-e "s:VERSION_BUSYBOX:${VERSION_BUSYBOX}:"\
+		-e "s:VERSION_CRYPTSETUP:${VERSION_CRYPTSETUP}:"\
+		-e "s:VERSION_DMRAID:${VERSION_DMRAID}:"\
+		-e "s:VERSION_DROPBEAR:${VERSION_DROPBEAR}:"\
+		-e "s:VERSION_EUDEV:${VERSION_EUDEV}:"\
+		-e "s:VERSION_E2FSPROGS:${VERSION_E2FSPROGS}:"\
+		-e "s:VERSION_FUSE:${VERSION_FUSE}:"\
+		-e "s:VERSION_GPG:${VERSION_GPG}:"\
+		-e "s:VERSION_ISCSI:${VERSION_ISCSI}:"\
+		-e "s:VERSION_JSON_C:${VERSION_JSON_C}:"\
+		-e "s:VERSION_LIBAIO:${VERSION_LIBAIO}:"\
+		-e "s:VERSION_LIBGCRYPT:${VERSION_LIBGCRYPT}:"\
+		-e "s:VERSION_LIBGPGERROR:${VERSION_LIBGPGERROR}:"\
+		-e "s:VERSION_LVM:${VERSION_LVM}:"\
+		-e "s:VERSION_LZO:${VERSION_LZO}:"\
+		-e "s:VERSION_MDADM:${VERSION_MDADM}:"\
+		-e "s:VERSION_MULTIPATH_TOOLS:${VERSION_MULTIPATH_TOOLS}:"\
+		-e "s:VERSION_POPT:${VERSION_POPT}:"\
+		-e "s:VERSION_STRACE:${VERSION_STRACE}:"\
+		-e "s:VERSION_UNIONFS_FUSE:${VERSION_UNIONFS_FUSE}:"\
+		-e "s:VERSION_USERSPACE_RCU:${VERSION_USERSPACE_RCU}:"\
+		-e "s:VERSION_UTIL_LINUX:${VERSION_UTIL_LINUX}:"\
+		-e "s:VERSION_XFSPROGS:${VERSION_XFSPROGS}:"\
+		-e "s:VERSION_ZLIB:${VERSION_ZLIB}:"\
+		-e "s:VERSION_ZSTD:${VERSION_ZSTD}:"\
 		"${S}"/defaults/software.sh \
 		|| die "Could not adjust versions"
-
-	epatch_user
 }
 
 src_compile() {
-	if [[ ${PV} == 9999* ]]; then
+	if [[ ${PV} == 9999* ]] ; then
 		emake
 	fi
 }
@@ -133,31 +167,58 @@ src_install() {
 	else
 		cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
 	fi
+
 	insinto /usr/share/genkernel
 	doins -r "${S}"/*
 
-	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	fperms +x /usr/share/genkernel/gen_worker.sh
+
+	newbashcomp "${FILESDIR}"/genkernel-4.bash "${PN}"
 	insinto /etc
 	doins "${FILESDIR}"/initramfs.mounts
 
-	cd "${DISTDIR}"
+	pushd "${DISTDIR}" &>/dev/null || die
 	insinto /usr/share/genkernel/distfiles
 	doins ${A/${P}.tar.xz/}
+	popd &>/dev/null || die
 }
 
 pkg_postinst() {
-	echo
-	elog 'Documentation is available in the genkernel manual page'
-	elog 'as well as the following URL:'
-	echo
-	elog 'https://wiki.gentoo.org/wiki/Genkernel'
-	echo
-	ewarn "This package is known to not work with reiser4.  If you are running"
-	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
-	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
-	ewarn "broken in this regard.  Try using a sane filesystem like ext4."
-	echo
-	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
-	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
-	echo
+	# Wiki is out of date
+	#echo
+	#elog 'Documentation is available in the genkernel manual page'
+	#elog 'as well as the following URL:'
+	#echo
+	#elog 'https://wiki.gentoo.org/wiki/Genkernel'
+	#echo
+
+	local replacing_version
+	for replacing_version in ${REPLACING_VERSIONS} ; do
+		if ver_test "${replacing_version}" -lt 4 ; then
+			# This is an upgrade which requires user review
+
+			ewarn ""
+			ewarn "Genkernel v4.x is a new major release which touches"
+			ewarn "nearly everything. Be careful, read updated manpage"
+			ewarn "and pay special attention to program output regarding"
+			ewarn "changed kernel command-line parameters!"
+
+			# Show this elog only once
+			break
+		fi
+	done
+
+	# Show special warning for users depending on remote unlock capabilities
+	local gk_config="${EROOT%/}/etc/genkernel.conf"
+	if [[ -f "${gk_config}" ]] ; then
+		if grep -q -E "^SSH=[\"\']?yes" "${gk_config}" 2>/dev/null ; then
+			if ! grep -q dosshd "${gk_config}" 2>/dev/null ; then
+				ewarn ""
+				ewarn "IMPORTANT: SSH is currently enabled in your genkernel config"
+				ewarn "file (${gk_config}). However, 'dosshd' is missing from current"
+				ewarn "kernel command-line. You MUST add 'dosshd' to keep sshd enabled"
+				ewarn "in genkernel v4+ initramfs!"
+			fi
+		fi
+	fi
 }
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 5a2d09782afe..f353b3b033e2 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -37,6 +37,9 @@ DIST genpatches-4.19-57.extras.tar.xz 17476 BLAKE2B 6ba89592e66f964600d509d1ed4e
 DIST genpatches-4.19-58.base.tar.xz 1570788 BLAKE2B 7ad1ef9686f73d20d12e959559ddabee341499e86f4e758b759dd2a41dbe540ba4c7991a97d1221fc68bbea00279fe74c6276d99bbc628064c540521443c9d7e SHA512 320ecf54804a1554675712a44be62d29ffef649877056796dba80cf070afec5f94e2568e73c7e41876ff693600a8d610f9ee5201e7f3be922a04805e339218bb
 DIST genpatches-4.19-58.experimental.tar.xz 5808 BLAKE2B 6c322d97517cf36bf0b6fd8f63ca0d68ad4339d58b73c38362a03f08e06fd07edfcf20806c482470df20cb0ca7506341c92017ff5a82063f4e5075880490eb94 SHA512 06f91fdc324fadd546cf21ef3b0608a3905ac3616e29e58c6535a7eac1d76b5b5c35ec3ae87d3e49d6affa38a866ad15325a4690f36fc989d5ecdc86d0af8c9b
 DIST genpatches-4.19-58.extras.tar.xz 17480 BLAKE2B 2576d9f4eea1e2aef2e82ce61243bb4d11eddebadac655653bc0a114e214c0ca63cc74c8c5e1f0e6a10a1adaeecf56f2bf7ea73f623a20a5494e27ec47f4f77c SHA512 f81c831be07ab50b136f760d1d0884235b249a03c992d576e99b929f4de788a3f50f938c2e160a759b94ce210c52e9c13da58a36fa2444be805cad2b956d3e86
+DIST genpatches-4.19-59.base.tar.xz 1601324 BLAKE2B fce4ab3f074c4500ee235651356d19be92cb7e4cfb7cea34ad47768cb21aa4b95ffc43cbf851db1803fe2fdd2f03af196107702b22223904e3d5362fdc75288d SHA512 abe3bec83e02d5e023c6b0432190e266e9f3b312d869656bf3b97464e8aa0e4a9cd269991b93971298c7de41665aeacffb4b779e0c182969f0767cd0094c93f3
+DIST genpatches-4.19-59.experimental.tar.xz 5808 BLAKE2B 19a0d8277a6e2ce5ffb9f0d6ca21ca34b827ab3ebc33691c2a76aa902afd47c53e079ec3af1935677a2fad11606d7e51c114d580a79d0beb0e667461c593a3fa SHA512 721bd04c3cb53573d202e3b3d096fc794185069137cc4dc0813bfeb184d74d0a1f478a1134cbe0db51286c9471214dc19f00d9039ba3ef47b8d56d1333d16294
+DIST genpatches-4.19-59.extras.tar.xz 17476 BLAKE2B defe44fcd90cb69087096d918b3aa3490300ec95765c03a8aca0517771992bc7ea28291eae2e3be604c63cb57e879a6d9224c962787b6884ea95cceb00adbc20 SHA512 03d53531e2ab8e78d48af14b287c33efd3003332af87a0421b296a74523e787f43cfb3a2feacd57c380a1394b7e4c8730b43e038f276ebe3d87b7b7b5f41e4f6
 DIST genpatches-4.4-182.base.tar.xz 2903380 BLAKE2B 8c6690f7fc6230ba815139489c2b9a22da50a9b42b24ba76f6a96aaa26d086dce144651f1a7a8726bda8b249f3b04b820458e267a9b02868be14628562c65056 SHA512 e3df4cbc9847e21c31735a1bc3f5daf3c71eff1c31121edc1a35589994ef966426127ed8e2c9928da0dd5ea05176086a9da8e1dcd1f964918021ecdf3504be15
 DIST genpatches-4.4-182.experimental.tar.xz 83276 BLAKE2B c4b2faf90504d611d1086e47485d497daf178ccee0d94f762e7dfcedd65545a9a8ad8b2520351e2fdef2ce7bd88a634db0109eaf43e03a86248932df7e886f8b SHA512 25714a52915033a78938f084e34d7af2be8ab98bbfdb6d0df1ec3cda09d9acc5fbba71fd97cbd6ca4b369401189f0ea33cf9685a77b05dc12713bc2d672de8ba
 DIST genpatches-4.4-182.extras.tar.xz 16468 BLAKE2B 83f02850ca1b0eefa6313424df54dd896bb73cd615e626fd59bcaf5f807e5ed8f43031e7591481637ff550ff2b562ca75893739d015dd94930a29de3795ed385 SHA512 339bd7003839098e8ce09b9a6f374662d9c899cb631a710ec2612ef3af5b8cd4fed54ba147d6b0f9488ad7fdaa1ea3acb6ebf7cb460e89ab89c1ec4718059416
@@ -82,9 +85,15 @@ DIST genpatches-5.1-16.extras.tar.xz 1720 BLAKE2B 5f9a60d596b2fe1c3bcc7ec1f27176
 DIST genpatches-5.1-17.base.tar.xz 480152 BLAKE2B 017e8f7716f156293cafdb31dd8a5c94d6188f3abb6d218598f01a058a2284e4e6f9474a41b7ded32725de2e31096ced6f0f5dfdcc9bf0d075faf6dd824521c7 SHA512 6cadc6669818cecf8620d3a61f4c972cf716d74cef9b2814d01b7cb90b282de5acfe4239a8f764d11b07d8491ab3e0311caaa3f715555a2095f1d2cc1e0c6f71
 DIST genpatches-5.1-17.experimental.tar.xz 5808 BLAKE2B fd84cd3a8eef6b21e488e2cf171828052e76facb133015cf81fe2923db7207b1f7265de088cfcb0ad391c6527805eac7402552f9a799174016cfb1f5ba85c464 SHA512 59604b562154940a30a1ea95e67a79a44254400e20fcbbb4feaba48a69e1f6c16c0a51860ac8750f6bae7b6f081ac0d68ee98df8356b19327fcecc1ad84d8f37
 DIST genpatches-5.1-17.extras.tar.xz 1724 BLAKE2B e5c02746b0961cc5c5b0624f790983c1913c2d70f64e0850665ab61ba550c0399f85e90d0cb17180db0a551f7bd477d15239010d80332f04044fbdd48d496e8c SHA512 27836f8e58b4e2ff7909b90de3cf9686912f0760e4831caee68e7fdb50b7b1c7301b5bbb14067c286d789d9fbb4943584566b0c9a60887a3ba73db597ec0957d
+DIST genpatches-5.1-18.base.tar.xz 527772 BLAKE2B 483013f62087515ee8800deb218b01a05a8dbd3d46a675ffcc6166ee507367c4686057ff610005fa5b532f8298574087b1b4b648012c24c396f602d35f10c261 SHA512 4f89f6572f37a84f3aeed4314b8df83efcabbeef4f51aa863f31472d9921d08bfc760d5d26b4af91986c02fc0c37923991b8630c82079b433360a39a6693281e
+DIST genpatches-5.1-18.experimental.tar.xz 5800 BLAKE2B 8db3022c36e64d5f6c9563f0363dc30b1bd5e9556d32c090481b71f94a17d6644bfd89b3ff110eefdec4f73771576e7ae4d45d747c6e3caf1c0992b56156623f SHA512 a98beebf0a0a317ba5c28cf54be317290a6c77ce48b9c14711a43c996eb4f2d43bde70d790f5fed92347b9e144651dc21e60193edbc7f141ccfdd90ecdddd243
+DIST genpatches-5.1-18.extras.tar.xz 1724 BLAKE2B 35b1f50584b7220d0809c6eedeb9ef1b0e68b86c73bb486ddfc8e52cd7198a30b537a4f6623e0753b9a0725d2551116eaeb3bff24e3255571be3882f5bfd16da SHA512 910a2bc75daa63078f2f41d59b6fff15c42ebdc66113f530a2c616aafe818b19420d9069f81384a4faa30905cec9218264f6320b979d672703749a24ca8f71f7
 DIST genpatches-5.2-1.base.tar.xz 4564 BLAKE2B a1cf9d0b529fb29a07b689af0d1f65baac3f2b660f5401b31279a966b163ee3116121458cdacaf771e738145a2529df6f1d34d98006b8e615f105f7b496adb45 SHA512 eb96e3090080ceb83c8a06bf1c6aef1e1a2b198ab8dae621b9124afabdc723e3e878004d54ee6d22c50f2d924525261494ee8f4c8db02bbd89bc17e35c1b7d62
 DIST genpatches-5.2-1.experimental.tar.xz 5392 BLAKE2B 956a17ca2314d7d78317f0a49621dc9949a4787fa9f22c66672008e8854eae48265d0f0975482b8d9307545e56a791a0c83f825a4d5bcc0fa96eb201fd02331d SHA512 7a551add3a2a7df12d4d4efdc35ca7214067e540bc74a9115f05c4f127bdfe5434f0e99166e78c2d6791c44938eead46e4dbac4f47f98742a094a7d69a696559
 DIST genpatches-5.2-1.extras.tar.xz 1724 BLAKE2B 01fb9ba93bbf8bb81c36abc51c06383ae1a51051e8e2c6fbf2089bc61a0f353e713fd2e09f1609459bb57fce54c91a3a376a753132677f0550dcec628ccca9b6 SHA512 7dcc433cae296b666a7d12b05ee4f470f5f1c4ab978c8045000649dc285b2c45559e8be199d107d8fc9e8155895bd6c1c1f3d03776e9ab8a7562d5c110139f79
+DIST genpatches-5.2-2.base.tar.xz 38780 BLAKE2B d487063c9d63840f77ce4056d3f13481da9a7e9e1bac18700eda8efb9f382c099e230efb7f272da73aa5e66222e8894b302396b1269e98b007abb17eb614783f SHA512 90e8b4d0b6720b21a9e29ec359f1555c349b864ec514de76b18bb2b6acfc7dd131215775703debe19b04a03523515d812d27086c66d51d0b54d5d95c4c293089
+DIST genpatches-5.2-2.experimental.tar.xz 5392 BLAKE2B 68ece0bb603ee701056cc1f2b07385c80745e001c96b5d47eeefa176593e2cee1c3f6336119869c85d40c03c720e84b7a812509555e116d7a977c3dcd7121a7d SHA512 1d9de3850e72d42d23afd9fc33436b9e607f4e2d2e9a014ed23d219bc8928c8eb832fe4f934ad4f406041ae95c55892fce150c0615ee652122fb0cd2bd3ab4a9
+DIST genpatches-5.2-2.extras.tar.xz 1724 BLAKE2B 0f9ca90c150ee2a79231ee1f0ea474d9902e8549ca3ddcba6f1738ae2de0fa4fc03e0626e3af38ade802524eadb48dcdcb2a0d818b26847a8dbab7bab5aebbe5 SHA512 acc050264a69e6b9c730eb35c490b988da0c9a52bc5393a221e4cceb9b8fa6819da7f84464738662519167dfe083b4c9324b68457d18ddfbfc0a4255200501e6
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-4.4.tar.xz 87295988 BLAKE2B f260f1858994f5d481fd078c86e51bddbc958f7c5d1586f60dced772e1b1107ecf3aae0558c3e6f39c36f7d3aa1e6cd1e5c64ec9d6f2218f47b98413da6466fb SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.59.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.59.ebuild
new file mode 100644
index 000000000000..5da4d7b6bc77
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.59.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="59"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.1.18.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.1.18.ebuild
new file mode 100644
index 000000000000..d3f4d0f22756
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.1.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="18"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.2.1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.2.1.ebuild
new file mode 100644
index 000000000000..48674ed75d98
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.2.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="2"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 92623669f045..da7b4acc9a8f 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index ee68fecec4b9..27355ded652c 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,2 +1 @@
-DIST surfraw-2.2.9.tar.gz 200042 BLAKE2B c360da9826b6473a1159e67a19e9e12eaf4697b5be4373088169eb6ee1b85f126854f8594c5de8fd0517b7020947be42a5678d1ed7bd798f0925c53a68728c15 SHA512 81ddfc5300f5f052e09187144f39c0e1f0d6a0df9ad82d4457b60498278061ac6736a8236bd2b3516f6ad885d22c8616372b354f11b2dbb46ef4f3790456f016
-DIST surfraw-2.3.0.tar.gz 205557 BLAKE2B 35ca2b46f14fc123fd014682a413c6f22e8c9f05d85e8e76660e099536fda8648446757d467afbe8807c91ec1628c568854ebfda48953e9499a018c30f2bc5ee SHA512 51cdfb68bab701bce635a64ab3d5af669b2330c895180d01cca1c6f3c4005972ba4c573b693df59a2cc4fdb97d4fd11224bae500bbd4a17c3ab446de5241c9a0
+DIST Surfraw-surfraw-2.3.0.tar.bz2 114065 BLAKE2B 91105b225737fe8f3a016e8c723421a2386c48f0c245b6ed119e4cc0f1032c9362e83a062134d0fef8b1cb14f58af07d3d9abe72c4efef9e79c6eb4c93bab25c SHA512 43f0dd2b48a045a47e73e8ef8058e0590a0409367e8378a086497ef912c58317614ba318b006913803529a51a641858a58c1f9f6a2f93dcdea9a45a26484af02
diff --git a/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch b/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch
deleted file mode 100644
index e43b24e46710..000000000000
--- a/www-client/surfraw/files/surfraw-2.2.6-gentoo_pkg_tools.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-  Needs a little more thought, or some method which would allow for an upstream
-push without affecting the non-Gentoo users.
-
---- i/surfraw-bash-completion.IN
-+++ w/surfraw-bash-completion.IN
-@@ -4,6 +4,22 @@
- # installing the bash-completion package which sets this explicitly.
- shopt -s extglob
- 
-+_srpkgname()
-+{
-+	local pd
-+	local dir=$(sed -n -e '/^PORTDIR=/ { s/^[^=]\+="\?\([^"]\+\|\S\+\).*/\1/p ; q }' \
-+		/etc/make.{conf,globals})/*
-+	local cur="$1"
-+
-+	COMPREPLY=($(compgen -W "$(
-+	    for pd in $dir
-+		do
-+			[ ! -d ${pd} ] && continue
-+			builtin cd ${pd}
-+			echo *
-+		done)" -- ${cur})
-+	)
-+}
- _surfraw() 
- {       COMPREPLY=()
- 	local cur=${COMP_WORDS[COMP_CWORD]}
-@@ -20,7 +36,7 @@ _surfraw()
- 	then    COMPREPLY=( $( compgen -W "$elvi" -- $cur ) )
- 		# "sr go<tab>" for google
- 	elif    [[ $prev == @(alioth|deb@(bugs|contents|packages|pts|sec)|freshmeat|fsfdir|sourceforge) ]]
--	then    COMPREPLY=( $(apt-cache --generate pkgnames $cur) )
-+	then    _srpkgname ${cur}
- 		# "sr debbugs 4<tab>" to check 44bsd-rdist bugs...
- 	elif    [[ -x /usr/bin/look ]] # in bsdmainutils, "important"
- 	then	COMPREPLY=( $(/usr/bin/look ${cur:-''}) )
diff --git a/www-client/surfraw/files/surfraw-2.2.9-completion.patch b/www-client/surfraw/files/surfraw-2.2.9-completion.patch
deleted file mode 100644
index 0fb759f864b5..000000000000
--- a/www-client/surfraw/files/surfraw-2.2.9-completion.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/surfraw-bash-completion.IN
-+++ b/surfraw-bash-completion.IN
-@@ -45,5 +45,5 @@
- 	fi
- 	return 0
- }
--# test first in case removed-but-unpurged
--type -p surfraw >/dev/null 2>&1 && complete -F _surfraw surfraw sr
-+
-+complete -F _surfraw surfraw sr
diff --git a/www-client/surfraw/surfraw-2.2.9-r1.ebuild b/www-client/surfraw/surfraw-2.2.9-r1.ebuild
deleted file mode 100644
index 35112168912b..000000000000
--- a/www-client/surfraw/surfraw-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="A fast unix command line interface to WWW"
-HOMEPAGE="http://surfraw.alioth.debian.org/"
-SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-RESTRICT="test"
-RDEPEND="dev-lang/perl"
-
-DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO)
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.2.6-gentoo_pkg_tools.patch \
-		"${FILESDIR}"/${PN}-2.2.9-completion.patch
-}
-
-src_configure() {
-	econf --with-elvidir='$(datadir)'/surfraw
-}
-
-src_install() {
-	default
-
-	newbashcomp surfraw-bash-completion ${PN}
-	bashcomp_alias ${PN} sr
-
-	docinto examples
-	dodoc examples/README
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/uzbl_load_url_from_surfraw
-}
-
-pkg_preinst() {
-	has_version "=${CATEGORY}/${PN}-1.0.7"
-	upgrade_from_1_0_7=$?
-}
-
-pkg_postinst() {
-	local moves f
-
-	einfo
-	einfo "You can get a list of installed elvi by just typing 'surfraw' or"
-	einfo "the abbreviated 'sr'."
-	einfo
-	einfo "You can try some searches, for example:"
-	einfo "$ sr ask why is jeeves gay? "
-	einfo "$ sr google -results=100 RMS, GNU, which is sinner, which is sin?"
-	einfo "$ sr rhyme -method=perfect Julian"
-	einfo
-	einfo "The system configuration file is /etc/surfraw.conf"
-	einfo
-	einfo "Users can specify preferences in '~/.surfraw.conf'  e.g."
-	einfo "SURFRAW_graphical_browser=mozilla"
-	einfo "SURFRAW_text_browser=w3m"
-	einfo "SURFRAW_graphical=no"
-	einfo
-	einfo "surfraw works with any graphical and/or text WWW browser"
-	einfo
-	if [[ $upgrade_from_1_0_7 = 0 ]] ; then
-		ewarn "surfraw usage has changed slightly since version 1.0.7, elvi are now called"
-		ewarn "using the 'sr' wrapper script as described above.  If you wish to return to"
-		ewarn "the old behaviour you can add /usr/share/surfraw to your \$PATH"
-	fi
-	# This file was always autogenerated, and is no longer needed.
-	if [ -f "${EROOT}"/etc/surfraw_elvi.list ]; then
-		rm -f "${EROOT}"/etc/surfraw_elvi.list
-	fi
-
-	# Config file location changes in v2.2.6
-	for f in /etc/surfraw.{bookmarks,conf}; do
-		if [ -f "${EROOT}"${f} ]; then
-			ewarn "${f} has moved to /etc/xdg/config/surfraw/${f##*.} in v2.2.6."
-			moves=1
-		fi
-	done
-	if [ "${moves}" == 1 ]; then
-		ewarn "You must manually move, and update, the config files listed"
-		ewarn "above for surfraw v2.2.6 and above to use them."
-	fi
-}
diff --git a/www-client/surfraw/surfraw-2.3.0.ebuild b/www-client/surfraw/surfraw-2.3.0-r1.ebuild
similarity index 86%
rename from www-client/surfraw/surfraw-2.3.0.ebuild
rename to www-client/surfraw/surfraw-2.3.0-r1.ebuild
index 040d94a4264c..019e41cc99b6 100644
--- a/www-client/surfraw/surfraw-2.3.0.ebuild
+++ b/www-client/surfraw/surfraw-2.3.0-r1.ebuild
@@ -1,25 +1,32 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit bash-completion-r1 eutils
+EAPI=7
+inherit autotools bash-completion-r1
 
 DESCRIPTION="A fast unix command line interface to WWW"
-HOMEPAGE="http://surfraw.alioth.debian.org/ https://gitlab.com/surfraw/Surfraw"
-SRC_URI="http://${PN}.alioth.debian.org/dist/${P}.tar.gz"
-
+HOMEPAGE="https://gitlab.com/surfraw/Surfraw"
+SRC_URI="${HOMEPAGE}/-/archive/${P}/${PN^}-${P}.tar.bz2"
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 hppa ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-RESTRICT="test"
+KEYWORDS="amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
 RDEPEND="
 	dev-lang/perl
 "
-
-DOCS=(AUTHORS ChangeLog HACKING NEWS README TODO)
+RESTRICT="test"
+DOCS=(
+	AUTHORS ChangeLog HACKING NEWS README TODO
+)
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.0-completion.patch
 )
+S=${WORKDIR}/${PN^}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	econf --with-elvidir='$(datadir)'/surfraw
diff --git a/www-client/surfraw/surfraw-99999.ebuild b/www-client/surfraw/surfraw-99999.ebuild
index bc760e5d6112..cf8930db4683 100644
--- a/www-client/surfraw/surfraw-99999.ebuild
+++ b/www-client/surfraw/surfraw-99999.ebuild
@@ -7,7 +7,6 @@ inherit autotools bash-completion-r1 git-r3
 DESCRIPTION="A fast unix command line interface to WWW"
 LICENSE="public-domain"
 HOMEPAGE="
-	http://surfraw.alioth.debian.org/
 	https://gitlab.com/surfraw/Surfraw
 "
 EGIT_REPO_URI="https://gitlab.com/surfraw/Surfraw.git"
diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 1257390e7d33..6950735ac797 100644
Binary files a/x11-apps/Manifest.gz and b/x11-apps/Manifest.gz differ
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index 159cb663eae9..da385bc220c9 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,2 +1 @@
-DIST igt-gpu-tools-1.23.tar.xz 1045716 BLAKE2B f5e55ce9b682f2a9f2c6ab73c1e8e933ebea09b343f3af02df50b5bdce3e2ac313b1f92709c6de0d9fc7ffe2e2c9dfa95d2918ae9bd561cc285cff30fe59c6fd SHA512 8697265a978359e28983f483bf95819844597fc2080923d15d0587f6d648081af27e8ea318873e20103bbf8446b9f1005c6bc90a6276d3169837abd181f96839
 DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild
deleted file mode 100644
index dd0926bf9fb1..000000000000
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="Intel GPU userland tools"
-
-HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
-fi
-LICENSE="MIT"
-SLOT="0"
-IUSE="chamelium doc libressl man overlay sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
-REQUIRED_USE="
-	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
-	overlay? (
-		video_cards_intel
-		|| ( X xv )
-	)
-"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/glib:2
-	sys-apps/kmod:=
-	sys-libs/libunwind:=
-	sys-libs/zlib:=
-	sys-process/procps:=
-	virtual/libudev:=
-	>=x11-libs/cairo-1.12.0[X?]
-	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
-	>=x11-libs/libpciaccess-0.10
-	chamelium? (
-		dev-libs/xmlrpc-c
-		sci-libs/gsl
-		x11-libs/pixman
-	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	overlay? (
-		>=x11-libs/libXrandr-1.3
-		xv? (
-			x11-libs/libX11
-			x11-libs/libXext
-			x11-libs/libXv
-		)
-	)
-	sound? (
-		sci-libs/gsl
-		media-libs/alsa-lib:=
-	)
-	valgrind? ( dev-util/valgrind )
-	"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-util/gtk-doc-1.25-r1 )
-	man? ( dev-python/docutils )
-	overlay? (
-		>=dev-util/peg-0.1.18
-		x11-base/xorg-proto
-	)
-	video_cards_intel? (
-		sys-devel/bison
-		sys-devel/flex
-	)
-"
-
-src_prepare() {
-	sed -e "s/rst2man/rst2man.py/" -i man/rst2man.sh
-	sed -e "s/find_program('rst2man'/find_program('rst2man.py'/" -i man/meson.build
-	default_src_prepare
-}
-
-src_configure() {
-	local gpus=""
-	use video_cards_amdgpu  && gpus+="amdgpu,"
-	use video_cards_intel   && gpus+="intel,"
-	use video_cards_nouveau && gpus+="nouveau,"
-
-	local overlay_backends=""
-	use overlay && use xv && overlay_backends+="xv,"
-	use overlay && use X && overlay_backends+="x,"
-
-	local emesonargs=(
-		-Dbuild_audio=$(usex sound true false)
-		-Dbuild_chamelium=$(usex chamelium true false)
-		-Dbuild_docs=$(usex doc true false)
-		-Dbuild_man=$(usex man true false)
-		-Dbuild_overlay=$(usex overlay true false)
-		-Dbuild_tests=$(usex doc true false) # Test build is required for docs
-		-Doverlay_backends=${overlay_backends%?}
-		-Dwith_libdrm=${gpus%?}
-		-Dwith_valgrind=$(usex valgrind true false)
-	)
-	meson_src_configure
-}
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23.ebuild
deleted file mode 100644
index 65bdd0b60689..000000000000
--- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="Intel GPU userland tools"
-
-HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
-fi
-LICENSE="MIT"
-SLOT="0"
-IUSE="alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv"
-REQUIRED_USE="chamelium? ( glib gsl )"
-RESTRICT="test"
-
-X86_RDEPEND="
-	xv? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXv
-	)"
-X86_DEPEND="x11-base/xorg-proto
-	>=dev-util/peg-0.1.18"
-RDEPEND="sys-apps/kmod:=
-	sys-libs/libunwind:=
-	sys-process/procps:=
-	virtual/libudev:=
-	>=x11-libs/cairo-1.12.0[X?]
-	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
-	>=x11-libs/libpciaccess-0.10
-	alsa? ( media-libs/alsa-lib:= )
-	chamelium? ( dev-libs/xmlrpc-c )
-	glib? ( dev-libs/glib:2 )
-	gsl? ( sci-libs/gsl )
-	valgrind? ( dev-util/valgrind )
-	video_cards_intel? ( sys-libs/zlib:= )
-	xrandr? ( >=x11-libs/libXrandr-1.3 )
-	amd64? ( ${X86_RDEPEND} )
-	x86? ( ${X86_RDEPEND} )"
-DEPEND="${RDEPEND}
-	amd64? ( ${X86_DEPEND} )
-	x86? ( ${X86_DEPEND} )
-	doc? ( >=dev-util/gtk-doc-1.25-r1 )"
diff --git a/x11-apps/igt-gpu-tools/metadata.xml b/x11-apps/igt-gpu-tools/metadata.xml
index d1c1f29fe122..887359bbc727 100644
--- a/x11-apps/igt-gpu-tools/metadata.xml
+++ b/x11-apps/igt-gpu-tools/metadata.xml
@@ -7,12 +7,10 @@
 </maintainer>
 <use>
  <flag name="chamelium">Enables support for building Chamelium tests</flag>
- <flag name="glib">Support reading config files via glib helpers</flag>
  <flag name="man">Build and install man pages</flag>
  <flag name="overlay">Build the intel-gpu-overlay utility</flag>
  <flag name="runner">Build the test runner</flag>
  <flag name="valgrind">Support valgrind annotations</flag>
- <flag name="xrandr">Enable support for the X RandR extension</flag>
  <flag name="xv">Enable intel-gpu-overlay xv backend</flag>
  <flag name="X">Enable intel-gpu-overlay xlib/cairo backend</flag>
 </use>
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index 5fbf559899fc..f14c33907f23 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,2 +1 @@
-DIST luit-1.1.1.tar.bz2 140044 BLAKE2B 5abf18955b753182198b4ebfa981e34b57707c578f1093f855e201b69b04b6a70fe189c0dcda43338a07d47f892eb3acb8278aba0e739d00e3cf164806d56ca4 SHA512 e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6
 DIST luit-20190106.tgz 190866 BLAKE2B 44098a00cade37aacdd7e67e1dae68157b652458b8a059de3dc56be9cc79ffba2ba861d403ab65de640853e0aec38c7d8d67febb5b6ae852a25430d2988c3661 SHA512 4324ff2793635e12e7fc0df2d7c5cdeb6241591105d0cfaf40a0da06a08764f08c5ef5f6fc19bc0e5d1f4b34b90e14b7aa393a0e613f5e096c6f91c90988215b
diff --git a/x11-apps/luit/luit-1.1.1.ebuild b/x11-apps/luit/luit-1.1.1.ebuild
deleted file mode 100644
index bfcede57b261..000000000000
--- a/x11-apps/luit/luit-1.1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-XORG_EAUTORECONF=yes
-
-inherit xorg-2
-
-DESCRIPTION="Locale and ISO 2022 support for Unicode terminals"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libfontenc"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# posix_openpt() call needs POSIX 2004, bug #415949
-	sed -i 's/-D_XOPEN_SOURCE=500/-D_XOPEN_SOURCE=600/' configure.ac || die
-	xorg-2_src_prepare
-}
diff --git a/x11-apps/luit/luit-20190106.ebuild b/x11-apps/luit/luit-20190106.ebuild
index ac60b6326599..196b8c2d2a79 100644
--- a/x11-apps/luit/luit-20190106.ebuild
+++ b/x11-apps/luit/luit-20190106.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${P}.tgz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-libs/zlib
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 96299833a16b..c8272271dbc4 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1 +1,2 @@
 DIST setxkbmap-1.3.1.tar.bz2 133817 BLAKE2B f58f63623afd69275ef25cc33237176c2d1814fa124d7a5dade6ad3cf60b5ee5a8434857cfdb9b17c6f6c6cfce4dbf861a6c6bc232d9e12989acce7be285c63b SHA512 5ddc2fc40ddc5a35815606998d3f111e3c2b8d915bf609462c703f9f691a0b3a6477ee98837c0a28f11dd3f0a30f17a3bcdfa38d4ca45140e521c74d043ecdee
+DIST setxkbmap-1.3.2.tar.bz2 136253 BLAKE2B 0c7ee234ec39546812ed2cf4f57f20f8c5078a3193ad39ce948660ca870ef0b625a8bb7e90e9a9e8b567d6d023f45f62856a6e1b44d8bfd04a1c0fe1a6d9830f SHA512 bfa8015dee0d8d3fdbbd89afbd71c8606ce168d6edca8521d5ed05a00fecbea39bc4bfcce84b71458bdeb34c60bd80a5df27e0691ccee3966443ecdc937faf38
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
new file mode 100644
index 000000000000..1309a17bb4ae
--- /dev/null
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Controls the keyboard layout of a running X server"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+COMMON_DEPEND="
+	x11-libs/libxkbfile
+	x11-libs/libX11"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto"
+RDEPEND="${COMMON_DEPEND}
+	x11-misc/xkeyboard-config"
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
index 32a92304cb6a..25b6fbc53c7c 100644
--- a/x11-apps/xbacklight/Manifest
+++ b/x11-apps/xbacklight/Manifest
@@ -1,2 +1,3 @@
 DIST xbacklight-1.2.1.tar.bz2 117607 BLAKE2B 286be7b9f6d0e50ba20bae86aaaa211a7d611df055e3298e8676b52c36168db67e153c13e242089db52b1c7ed2c6872dfe8dd63a7f97b81644269832276bf636 SHA512 9a0afebea2fe155ab7d1ad00ef27566daeb7dc4fd47523511f1b8e8ac30977f938a08783bc0c7443fe92ebff1c17c68c78d44db08b32768d7831128130e0637d
 DIST xbacklight-1.2.2.tar.bz2 124058 BLAKE2B 4ad7b0eaab29bada40ba6b79a538d5dbf6c584226c51004e1488733b5b33a7c3905d21cb5f275010f301241da3eb644b0e66e20a07fe271152905568008c5af7 SHA512 4dca70ef8e3494b19ea126c46395807cddc007b2b09a133810daeb77ae27fa36ac4eec7813828248fc195abe27f59700cfa58ee65ef3a020a51f73e5107678ec
+DIST xbacklight-1.2.3.tar.bz2 124611 BLAKE2B 19355773b2b2bc491cb3682d9d02fed462d30ed21742dfb9f7398ec39e85bde4fdd1b60bc8b4ac2a2d32410016186c1f1e5d45904fb19358bcc16eee69242dbf SHA512 717c87ce24634892fc4ac54fc59dcc0a5bc8f206aaf1d13410f95f7e4fe6e3dbc7ff8d951bcd8ea8c5e955357a00fea6ceadd4559e60b1a632e40f71290e12c7
diff --git a/x11-apps/xbacklight/xbacklight-1.2.3.ebuild b/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
new file mode 100644
index 000000000000..9808d1c4e6be
--- /dev/null
+++ b/x11-apps/xbacklight/xbacklight-1.2.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libxcb
+	>=x11-libs/xcb-util-0.3.8"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xbiff/Manifest b/x11-apps/xbiff/Manifest
index 9d2ad6adeb9e..73cce0d40daa 100644
--- a/x11-apps/xbiff/Manifest
+++ b/x11-apps/xbiff/Manifest
@@ -1 +1,2 @@
 DIST xbiff-1.0.3.tar.bz2 116043 BLAKE2B 9ed9c77e8017e36170087a5d45bc1b68383b9cb0b32c8a951050ee00bf6ccbffc868626e8c362fec5ed28c6c4a5a06010d9a975b45b51300bfbc27a9112edfc8 SHA512 e9fa72817cae5fd6c052a4a59fcd6c696ae9d3f5fd8eecb0e9b0d8994258201cf5f4ae99845dd03e3da56e378eb214658e4450c9291a29399d9ece8af3b9f9e9
+DIST xbiff-1.0.4.tar.bz2 133455 BLAKE2B ce79afefbd394b32fd543b64e966276cddc551bfacdf25e80a3463e65eb538469e252d105aeddb60a16227c30a5abfa996af89718d77e075f85b70d71e45710f SHA512 0fb920a08640ec59f23d8a8a47bd244565dfbaff7a21c38a8a2abe1edb5eacabc970b5dbdc409163fc444fde5b75a2dc4e0114312938efec5b77228f3bf785ac
diff --git a/x11-apps/xbiff/xbiff-1.0.4.ebuild b/x11-apps/xbiff/xbiff-1.0.4.ebuild
new file mode 100644
index 000000000000..11f26b5a5b5a
--- /dev/null
+++ b/x11-apps/xbiff/xbiff-1.0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="mailbox flag for X"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXmu
+	x11-libs/libX11
+	x11-misc/xbitmaps
+	x11-libs/libXext"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index d9b8c5abc0d5..4d16d4fff154 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1 +1,2 @@
 DIST xclock-1.0.8.tar.bz2 172030 BLAKE2B aced446898a2cc181a0e57260841f194f67dc0fad42fdb6371e2bdd8d11dfb0418d9cbf4e3e51a4df21f2646c74ca5ee2887bfbbc62571cbc84b551f3793396f SHA512 1272221ace3657505bae1b22f181e9ecbf1710900c89a860c8ceae47ae31ca5e75b6557c37dc0a881a0a24c9597b9a07f46200926feb1013f1e2e995111a7646
+DIST xclock-1.0.9.tar.bz2 175372 BLAKE2B 6e19535a357f1ed162de1ae5c403cfde6be03a3be6bebd8b338472473c8da71e00a3e6c52e7b43315735bc41345490a6dacf1b934458d4c11fec09072e2f9b00 SHA512 fcbac0b4ab1cea4ae0751ce1c0c6302048e5d98d459873c7580e4ca786ec49fa27f73e5831bdfe135abb5cfeabe886456276e9d01351ea7905c606f40f84522d
diff --git a/x11-apps/xclock/xclock-1.0.9.ebuild b/x11-apps/xclock/xclock-1.0.9.ebuild
new file mode 100644
index 000000000000..fc3b9ac18cc5
--- /dev/null
+++ b/x11-apps/xclock/xclock-1.0.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="analog / digital clock for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXft
+	x11-libs/libxkbfile
+	x11-libs/libXaw"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index a7d812c1b289..18051faad91d 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1 +1,2 @@
 DIST xman-1.1.4.tar.bz2 188259 BLAKE2B 3be982bfc9cad53b47dfe87e85d2fdafca4d0e9336c05eaf80665a79a1c420941226da9a3acfbdf7eb7c9d299085d78cb392d67c6859e28f07a304c6f935931b SHA512 785e973eb15b0300de08aace24f3604dfee61421c7f64ea4cde2e280480bf5d3ad797ab8208668dc023a375494f8db7534fbcaa1c1ef16e79464fdd017b5da68
+DIST xman-1.1.5.tar.bz2 193676 BLAKE2B b49e78b0127844e2ee8c0343392af940e592ee6958b4f1af217696da9ab1cd880331dec2af2f7eb5084cf44d40a041c730f571e5fb476e74924552e1316614ae SHA512 f6b2be424a79f298bf1a81edce4172572195c9efc9454e5b7b7046f344ed08154c77ccaa763ccdf3f1a30b64aa4802783bf813ee637437ccb1fba434fc5d4400
diff --git a/x11-apps/xman/xman-1.1.5.ebuild b/x11-apps/xman/xman-1.1.5.ebuild
new file mode 100644
index 000000000000..699bcab04ade
--- /dev/null
+++ b/x11-apps/xman/xman-1.1.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="Manual page display program for the X Window System"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+	x11-libs/libXt
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index 74838e2aa522..f18de36be423 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,2 +1,3 @@
 DIST xwininfo-1.1.3.tar.bz2 157512 BLAKE2B eba1f98cf8aa8afc68a5bc0f538e1e0588a38bd0022ba0a2bf6da7e2cbcd4459111aed37f88b8d46054f8c3e52e435d0c95a8f7c9b1247580dde812a3bd3715c SHA512 b4c3c72de157d33e309694be96dcafabb3240c1883fb3caf44843cba8b90fe09496eb4ab061eba9107115d76ca59a8ec660e11ff968e422ab35cd5e1749ca466
 DIST xwininfo-1.1.4.tar.bz2 169159 BLAKE2B 4bdf7321eba8e2cd078c3220e3135ca1b044461ab90b8daa350beed1feb53f02dd9dd4c1192be6dd6b9ef2a9dc028c4a9c464f3124590e6195aca7547ed61830 SHA512 d3ab103a0a311e08d1eabc4346750c21eb7d2fbcdc27cab0989a2624b9cd488911614fcf9832603353450114b1231a8f8262cab16e090a0d458d83ec7b6b959b
+DIST xwininfo-1.1.5.tar.bz2 172496 BLAKE2B ad657a96b74190981ecd2d946d1b81fcd0515a481f0d6d880d790b8e1eb4bf7e85bdd9a74b631acb88c2254839afde7f6ee79647af66c357c8ef4199aac51f02 SHA512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6
diff --git a/x11-apps/xwininfo/xwininfo-1.1.5.ebuild b/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
new file mode 100644
index 000000000000..6011d84ec039
--- /dev/null
+++ b/x11-apps/xwininfo/xwininfo-1.1.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+DESCRIPTION="window information utility for X"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libxcb-1.6"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-libs/libX11"
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 5664e8af5bbf..490dd8bb5fdf 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
index f1733d590a79..09f64b4db983 100644
--- a/x11-libs/libICE/Manifest
+++ b/x11-libs/libICE/Manifest
@@ -1 +1,2 @@
+DIST libICE-1.0.10.tar.bz2 393116 BLAKE2B 2089cbddab679f8565f0b7bf0313616b71f33cd403aea2cb84032a247c1e1d01de343058c31be73214bd6dea7fc167fa6a0f81704c960bc279d904bdf4bf804f SHA512 2f1ef2c32c833c71894a08fa7e7ed53f301f6c7bd22485d71c12884d8e8b36b99f362ec886349dcc84d08edc81c8b2cea035320831d64974edeba021b433c468
 DIST libICE-1.0.9.tar.bz2 384921 BLAKE2B 701122d9ef6bfa9077f63b35131dc4603964dbb0b7f58bd54ca49e25be24265142d39da4e1f7c72fdf4945dfb358f7b061acb848dfb0c1bcac5973c9fc728a26 SHA512 daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
new file mode 100644
index 000000000000..fcf1112fea93
--- /dev/null
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_MULTILIB=yes
+inherit xorg-3
+
+DESCRIPTION="X.Org Inter-Client Exchange library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="ipv6"
+
+DEPEND="x11-base/xorg-proto
+	x11-libs/xtrans"
+RDEPEND="${DEPEND}
+	elibc_glibc? ( dev-libs/libbsd )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+		--disable-docs
+		--disable-specs
+		--without-fop
+	)
+}