gentoo resync : 02.08.2019

37 files changed, 542 insertions, 217 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index dcdef56938ed..388418bc4340 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 431a48a7598a..e3c7ca921255 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -4,6 +4,7 @@ AUX elasticsearch.conf.3 2196 BLAKE2B e711aa58eca0df5857fa48a4dc21f5dd144977f3cd
 AUX elasticsearch.init.2 1830 BLAKE2B 57dea653c636c7ccb40fa6ab777f0713b245bf9d344b39de23aaaad753c229196cb81acd01c4ac1c9ae29c166b1dbfa38e829d60172106dbc384aeb6e21a544e SHA512 babc54a225f1ea5c98a6c2e0a680635a5af30305a869e35db65f5f6ddeb00577b3011f83b3190567646b7d67a314710c83212a233dc31a0fb78691eb1358b96a
 AUX elasticsearch.init.5 2050 BLAKE2B 51908266d476c0fe21ceeb01e4fb9aede5ef70944025a26dbbaea582253e32442a938e39842371397b15c70ecfc9ae4abc8f549f75c3fdf55e1d09e16c25f871 SHA512 127f050a322ba2fd1ca92352ccfc9e3abf5e768b0c1b6e6fbb73633f4aa8fb3dbc8c9118428ed56070e91e2141edda2cd488185a272f0d0022e88ca32172cd7f
 AUX elasticsearch.init.6 2102 BLAKE2B e49581ac65b20feb24711674a2f5f46bc67d65cd8e5128f1d0868a84db36b0067b13ae39ea3f57d0b4c8ebfd91fb3d769088c29dacf8436beb66fe98cea0b03e SHA512 52116a49c9bce9ebe57316f96f3b6eff3a6bd544b930845d5fb9b74fc5f40535a0e50d71f8c7e602fbe8935ec35692b763a5255ad43afac5f7ac8ac00ba2bd30
+AUX elasticsearch.init.7 2158 BLAKE2B 934840e6013bca18282ceb6566bfe4fa9480a72a458bf1fc0566f4651e9e749ee9ff90f3bac2fd1cb75c5f7a3e91842a751af00b6245292600ad56060318a8ec SHA512 b847b089c18ec10892c395017a15f1f6e5af42055b11252219c832877f3f5d6c78988af85eeaf671fdfd9a7155ce19ea8e16f70bfe86c4453ea0174908eec520
 AUX elasticsearch.service 1718 BLAKE2B 1d3df50f9b521a897f6f57c411265ce3d5da849c23a6d5274959739531ec1f1373f59adb9d0ac94318eefbe90cf10218b67aa47530bdd162ed306354fb9cf2db SHA512 98530c01f41a2d98254033a1a292075abc6086e0608062dfbe28385e4f57da390a9c43521bfce72193c2b710e58e590f08f514257b8150140dbb9ade40ef5470
 AUX elasticsearch.service.3 1527 BLAKE2B 7f7bee9019de2814cdce1e4a66932a0a2a915cddce2d5d2bfde2263bf088001ba1dff9bbbc8eaafb4e1d9012176fbeb4964dcd6f25f6e49935bdda90cec52f6d SHA512 adcc3147ce8d52f64fa21e7cb377ba88d4ea32254eaea03c68d45296bac46d7ff084b93469ca9dbabe013bf8bd183a96a219117b68fb91648b595206b60cebbc
 AUX elasticsearch.service.conf 235 BLAKE2B 23ada111be21dff12323edbe981883cb1ed275b6c7a9f55e77fdcec1919d374818683403a2a7a7c2c2839db2b8afcd66f7667d5080ecb52cade853a400f972a6 SHA512 b300dbc1b3c341ebbcac68385c651133427f342dc0351501b47730b392cc176b7b8dc53877affc6ab384d2834d246a3d0c63b6015dddf2c90d4bcf41cee9968c
@@ -15,15 +16,18 @@ DIST elasticsearch-6.7.1.tar.gz 148542786 BLAKE2B 4a9acd16788e6d84acfac09ee24341
 DIST elasticsearch-6.8.1.tar.gz 148584086 BLAKE2B dacc3fdf142fc46ede2a5891f95f69a1200632c46b57eb03f948437a39ef92538da7d3e64afd52c4acae478e6758b355729f8cbf8ceb91aa3d34353ff434fed4 SHA512 1d484287e9b67b16c28f1a4d2267e7ceb5a4438a18b26b3a46d4a176bb3f2f6fcadcbda617a7a91418293880d38c027266cb81a4e8893a28adee9fa693b2318b
 DIST elasticsearch-7.0.0-no-jdk-linux-x86_64.tar.gz 149074223 BLAKE2B 3c210b81de8882f99be45adc811c3867acb276978d3c788db5cb00ec0eacd0f096933849dfa066160ca2ec05e3fa2962329b200614db9927e4424602da53508f SHA512 b499aeab6a3f883547974b36221fd808a9da70ae0622856582287dcf729c3a2acfb1faef2727b17be97f64d8bb56ac5cdbae6d63f2a146027153f170ae6d91fc
 DIST elasticsearch-7.2.0-no-jdk-linux-x86_64.tar.gz 138948007 BLAKE2B 0e03779669f6113eac1561a3a907d8a3286ac7c7229e0ff7ad46ede4f22a2829f8d2ffafb319427f789fb95cca6669c59f8d840ec83625889bcdd6ada91be1d5 SHA512 b49a6d6b7361c499b1d9a9118746229113eaf4b88c1ad755c1ae8fd713428db4bc296cd75f3df58a239b09d6a8281f670f69c320839ef000596c776141cb1ce6
+DIST elasticsearch-7.2.1-no-jdk-linux-x86_64.tar.gz 138949755 BLAKE2B 3c77cec89a93c6b5d213afc326ef84df7d77c052914b387dc4ba35276d8f9814689d5305a131e1c647ece31277533e882b1170ad03eb3869f8443471223db066 SHA512 d2827be0b06361ab08f558dc88f76c614fb6a243a6d845749b3d23dff4078ffa58cc1b3407b84197d0f027ea9af5475fad8e3a503fc573ba31756bdd16a589d9
 DIST elasticsearch-oss-6.6.1.tar.gz 34492424 BLAKE2B 9a63aeb86ec3bebbe685804b262316726cb93b42693f9ba8937cac65c7ec186f0bb470893568234a0b7cc8b58f0c91d2af94eb16c3d016e7533231eba32fdbb0 SHA512 0e536ff760673dd740f790f1b0c01d984bf989a4a9ad3c4fe998de4f824330ce0d5ea18f04421a8648af719aabd25a4393f90182079186e48cef539b5621914c
 DIST elasticsearch-oss-6.7.1.tar.gz 68421385 BLAKE2B cf14f3babfc5dbe9de4c9e47c15b797ab7c73236936257043c435751a0d86348e34ee73d2a6785a9e1391edc1e00f9a56f922c368ef72a5d349175ee4735d43b SHA512 4865ebd3403593048b3f922769d6d09eb1d53a42cf206cdcba7c30e330b39d9bd57f9f0979a23fcf0ca7636d84ce85de210fdf655447fab7ecebb35bffdd3323
 DIST elasticsearch-oss-6.8.1.tar.gz 68419519 BLAKE2B cf34c4cf095b4271d067802df8130d66167e5f01fd0231361ce3e7f5e1023b39e6fbc325cc575f2c353a30b011127934b7b7a04f9a48998f88d27ce8a5560bf4 SHA512 cbcc81b8dd3a7a63c6e6574405417821c5dcd1a0b5df813818d39353fa29ea28e443db64b1a1938a1ffb23aa17d706e3edb6a46fdb24992b92f918d8d4f0c08a
 DIST elasticsearch-oss-7.0.0-no-jdk-linux-x86_64.tar.gz 68788144 BLAKE2B 29206b277dc9997b155b54217f485c314a7efa35777bcb81908ce900e134e62d7ef14629cfeebcd3ebb724b76fe5380085ae6b50df46bdfddf5f657a0d2da3eb SHA512 ec9381d9310145b80fb2b8cdd7b7953ea7b2b45a66bf8435d8a982aed0eeb59f734f3936b4b40ec4530e106878d25c2f63d4ea7a734b12f1c8d86b39f7894963
 DIST elasticsearch-oss-7.2.0-no-jdk-linux-x86_64.tar.gz 68964879 BLAKE2B 6bebff074d9a22abaf1a7b669d9a47254a658f4954b2e27d4251860a0b8cd29f4bbc3baf217d7fb90c492d5dabce802b1e4d359531202e677ffcfd573b51b343 SHA512 a538c82dc177a66004912ce20b1b50ee1270e45b56879b4f0b7e2d4bfa00d9fe5c113b5e4927cb6f5669f8a1f2f4953c4bb12dc4a10510af4658bbcbcaba3cbc
+DIST elasticsearch-oss-7.2.1-no-jdk-linux-x86_64.tar.gz 68973563 BLAKE2B 5248a5e8443794134c55ef14d1b175ff931d599a45b4cbd0f187e864dd3d4b322f10df31672c0900417e84da0e83fd934234bba31dc116c5c3b6b9f14e9c62a6 SHA512 694aca59cc3e23bfcf41142d7bf3d3c75f6fcdb6d0a1b35157157cb2f4ac8152db1e424951e62ba1a2bd4a2d32a77bb9499085558b7e1580680c0de90fbc0902
 EBUILD elasticsearch-5.6.16.ebuild 1686 BLAKE2B 45ba9183eacdc9e25a9c640ea98a6c4bcaaa6894ac1fcf87874fa70205677a4a4991fe81b52934ab9b0e6243d967b653ded4c27ab157491eb6671e08855c3b31 SHA512 9198ef6590d77ca6817e504ee846a80aa2b2a0a440f57786fa63f3b2332480dc630207474c0e5d859dbb2c6a035f9db3a2f3a8ff965defba2fcb4c76ab4ca95d
 EBUILD elasticsearch-6.6.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.7.1.ebuild 2579 BLAKE2B 35aa006966938554dcea8f77202a355adde841a5faec231fda4615fb79f5968c89ea2519cd7f737071c37fab74b848e297e56951af23cc034dfc7839f4b65796 SHA512 fe8a12e1efb2b096b4ed7854d9da952af85797f8020bf843a01732040b07fefcf616fe50574f9faab2b89fa103a542b2cc83f44f9ebc42715dc81fe9c8a9c668
 EBUILD elasticsearch-6.8.1.ebuild 2579 BLAKE2B 8581c232ba6a291994a61ef4c9406bfaf0fb6590fee36c60cab0d319a8a0472e2899fc2e136ab4267c1b6d6d52d601d4d4cb7fd5090ae05e46b63856dd986974 SHA512 956ab4ca9d9d5643ea3045cb15d6e98c6de74fe4bed56b4e44cca9a5b9073ad3d04fb24c8b7c04bb0dcee7f0a5baa9a44aea8e00999857fe51437e42bd6015a1
 EBUILD elasticsearch-7.0.0.ebuild 2570 BLAKE2B 34f783dfea91989cb241fa8f1e94c209509bc87d9d63c754507d23aeb3b10d1dc97819764505227982b4721eb73280f9dc01b59034bcdbbc31fea0b454a1ab2f SHA512 59a97e54612b663302de40f5a94c7ee03c046f9642ea2d3966a53723c11e0b224a125443983bbf31eb9ffbbb372f90fdfbbd1239f283b3268af590c029da42bc
 EBUILD elasticsearch-7.2.0.ebuild 2478 BLAKE2B 152933e675b5d159de07e31592f883d16206201b844056c3e27ba69b27769700ff0891938e017deb0600d3be08b1d172d2856b482b7a98887f648ef54f151e49 SHA512 de5df3dae8215eb3fa3cb2306a0da5b87e3dd4135b8cbf663fd297d6b8e074b643b4c611f34da5ac87fce7658b46efc7803ff92f97b44cd88ae6af5d98fd5e8c
+EBUILD elasticsearch-7.2.1.ebuild 2478 BLAKE2B 5e3b853ed335f7a691a664a3dc1b6e8307d09be38b97c7a632a4d857c059fded6e1f20ceadc6fc6afe99d7bbad3dfb2f041ade09d62e39733e62d87fd4cefed0 SHA512 c634e16b86ddbd3b3cb689c467aa992bb9a78179e93ef190547a8d55e511a30c47c3459df2d3dd55c865cd9ce96bb48497c683c1bd4875967a3a0838f8a09341
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-7.2.1.ebuild b/app-misc/elasticsearch/elasticsearch-7.2.1.ebuild
new file mode 100644
index 000000000000..37f142d87742
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd user
+
+DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
+HOMEPAGE="https://www.elastic.co/products/elasticsearch"
+SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${P}-no-jdk-linux-x86_64.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}-no-jdk-linux-x86_64.tar.gz )"
+LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain x-pack? ( Elastic )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="x-pack"
+
+RDEPEND="virtual/jre"
+
+QA_PRESTRIPPED="usr/share/elasticsearch/modules/x-pack-ml/platform/linux-x86_64/\(bin\|lib\)/.*"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
+}
+
+src_prepare() {
+	default
+
+	rm LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /etc/${PN}/scripts
+
+	insinto /etc/${PN}
+	doins -r config/.
+	rm -r config || die
+
+	fowners root:${PN} /etc/${PN}
+	fperms 2750 /etc/${PN}
+
+	insinto /usr/share/${PN}
+	doins -r .
+
+	exeinto /usr/share/${PN}/bin
+	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
+
+	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
+
+	if use x-pack; then
+		chmod +x "${ED}"/usr/share/${PN}/modules/x-pack-ml/platform/linux-x86_64/bin/* || die
+	fi
+
+	keepdir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+	dodir /usr/share/${PN}/plugins
+
+	insinto /etc/sysctl.d
+	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
+
+	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
+	newinitd "${FILESDIR}/${PN}.init.7" ${PN}
+
+	systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
+	systemd_newunit "${FILESDIR}"/${PN}.service.3 ${PN}.service
+}
+
+pkg_postinst() {
+	elog
+	elog "You may create multiple instances of ${PN} by"
+	elog "symlinking the init script:"
+	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
+	elog
+	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
+	elog "from /etc/${PN} into the configuration directory of the instance:"
+	elog "/etc/${PN}/instance"
+	elog
+	ewarn "Please make sure you have proper permissions on /etc/${PN}"
+	ewarn "prior to keystore generation or you may experience startup fails."
+	ewarn "chown root:${PN} /etc/${PN} && chmod 2750 /etc/${PN}"
+	ewarn "chown root:${PN} /etc/${PN}/${PN}.keystore && chmod 0660 /etc/${PN}/${PN}.keystore"
+}
diff --git a/app-misc/elasticsearch/files/elasticsearch.init.7 b/app-misc/elasticsearch/files/elasticsearch.init.7
new file mode 100644
index 000000000000..cac781c968d1
--- /dev/null
+++ b/app-misc/elasticsearch/files/elasticsearch.init.7
@@ -0,0 +1,71 @@
+#!/sbin/openrc-run
+
+name="Elasticsearch"
+description="Elasticsearch Server"
+
+ES_INSTANCE=${RC_SVCNAME#*.}
+
+if [ -n "${ES_INSTANCE}" ] && [ ${RC_SVCNAME} != "elasticsearch" ]; then
+	ES_BASE_PATH="/var/lib/elasticsearch/${ES_INSTANCE}"
+	CONF_DIR="/etc/elasticsearch/${ES_INSTANCE}"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/${ES_INSTANCE}"
+else
+	ES_BASE_PATH="/var/lib/elasticsearch/_default"
+	CONF_DIR="/etc/elasticsearch"
+	DEFAULT_LOG_DIR="/var/log/elasticsearch/_default"
+fi
+
+ES_HOME=${ES_HOME:="/usr/share/elasticsearch"}
+ES_USER=${ES_USER:="elasticsearch"}
+ES_GROUP=${ES_GROUP:="elasticsearch"}
+ES_STARTUP_SLEEP_TIME=${ES_STARTUP_TIME:=5}
+JAVA_HOME=${JAVA_HOME:=$(java-config -g JAVA_HOME)}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:=65536}
+MAX_MAP_COUNT=${MAX_MAP_COUNT:=262144}
+
+DATA_DIR=${DATA_DIR:="${ES_BASE_PATH}/data"}
+LOG_DIR=${LOG_DIR:="${DEFAULT_LOG_DIR}"}
+
+if [ -f "${CONF_DIR}/elasticsearch.in.sh" ]; then
+    ES_INCLUDE="${CONF_DIR}/elasticsearch.in.sh"
+fi
+
+export ES_INCLUDE
+export JAVA_HOME
+export JAVA_OPTS
+export ES_JVM_OPTIONS
+export ES_JAVA_OPTS
+export ES_STARTUP_SLEEP_TIME
+export ES_PATH_CONF="${CONF_DIR}"
+
+pidfile="/run/elasticsearch/${RC_SVCNAME}.pid"
+
+command="/usr/share/elasticsearch/bin/elasticsearch"
+command_args="-Epath.logs=${LOG_DIR} -Epath.data=${DATA_DIR}"
+command_args_background="--daemonize --pidfile=${pidfile}"
+command_user="${ES_USER}:${ES_GROUP}"
+required_files="${CONF_DIR}/elasticsearch.yml"
+retry="TERM/30/KILL/30"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	if [ -n "${MAX_MAP_COUNT}" -a -f /proc/sys/vm/max_map_count ]; then
+		sysctl -q -w vm.max_map_count=${MAX_MAP_COUNT}
+	fi
+
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/lib/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/var/log/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "/run/elasticsearch"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${ES_BASE_PATH}"
+	checkpath -d -o "${ES_USER}:${ES_GROUP}" -m750 "${LOG_DIR}"
+
+	# fails to start without keystore
+	if [ ! -f "${CONF_DIR}/elasticsearch.keystore" ]; then
+		"${ES_HOME}/bin/elasticsearch-keystore" create
+	else
+		"${ES_HOME}/bin/elasticsearch-keystore" upgrade
+	fi
+}
diff --git a/app-misc/evemu/Manifest b/app-misc/evemu/Manifest
index 936cc8482f96..4e2cb04fad9d 100644
--- a/app-misc/evemu/Manifest
+++ b/app-misc/evemu/Manifest
@@ -1,5 +1,5 @@
 DIST evemu-2.6.0.tar.xz 507032 BLAKE2B 189507f984e2ebfdf9ff7474d5854ed02f29cd2105684700e1cc2c5ae3c1e888bebd7e8e04e3a5003506bb9571d61785712d08fd90d6e828f2ba5e2ea763a064 SHA512 8dd3be18abc6e36a79b91e6099116048e4fd45a96531a5c2773c84618d6ba7089ee8734b51b9309462c393dc7c3a83d87438bcbdcd5876803165a4ea439aff83
 DIST evemu-2.7.0.tar.xz 509308 BLAKE2B 0fec24d4cbd57a2b8d9eb6c7e4734a069148e20dea819bf8409adc95928410bfdabc93dbe58faad1137fb086d4534668e2cbd77f939f9a44a9aee99835fa7d2d SHA512 a8b09717f84df440c230bb65d3d50d81ce6a722a7cdb281981792435ea591186c28dbec215a0314542e0e36bab06bb1800851bbe32cf2a0e7712adaeaceaeb76
 EBUILD evemu-2.6.0.ebuild 1028 BLAKE2B 2d149e4c9f50d184941d2564e53748cef34d5303d56cc5e778cc1f2a4d7c7f458b5f13c57488b961eedb6695bbf99b4ed304248099120d97873d33c260e18c43 SHA512 0af553fc116b596a2a521dfeab5771102461e2e600759fed72bcd0510af69e7929e0d84825aea2d15492c201df2b506959b242c2a06f2a6453556c70ecaa7a20
-EBUILD evemu-2.7.0.ebuild 1028 BLAKE2B 2d149e4c9f50d184941d2564e53748cef34d5303d56cc5e778cc1f2a4d7c7f458b5f13c57488b961eedb6695bbf99b4ed304248099120d97873d33c260e18c43 SHA512 0af553fc116b596a2a521dfeab5771102461e2e600759fed72bcd0510af69e7929e0d84825aea2d15492c201df2b506959b242c2a06f2a6453556c70ecaa7a20
+EBUILD evemu-2.7.0.ebuild 1035 BLAKE2B f1df8136472ecdb99d06c5f86543e9ae840c86316eeebb9f521c4e5f6fa4de608c7f1c365d21732f3f6a03cdd98a9bf5083b5f5c78f45f33a76d0e51a61f5ca9 SHA512 e7c7cafcf477a4dbaf222f0fec038c36bc296ad8ffcb73d1544a790b03f3d9bcabc722ef87021b47a4830f59a7520392ea67dbd7141b3ca9dbdaa6f44279f50b
 MISC metadata.xml 246 BLAKE2B a30d57a217fcd3c7c7d170b71f1ab806d11e9b520595802ebfb0123a82682d4fc045f033b164402ac51f939fef7cad737eb2012f62864298b6c5d23c69575519 SHA512 ca07e0609b698c2b53062b71008fee49b91af78fc2ef25997311e37985d79283d333f5b842257a16e7dee36ce34c07d405e1f93742f341f10ca70904e9f9a4e6
diff --git a/app-misc/evemu/evemu-2.7.0.ebuild b/app-misc/evemu/evemu-2.7.0.ebuild
index 8ac8d69567ec..68ce761f6232 100644
--- a/app-misc/evemu/evemu-2.7.0.ebuild
+++ b/app-misc/evemu/evemu-2.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit ltprune python-single-r1
 
diff --git a/app-misc/g810-led/Manifest b/app-misc/g810-led/Manifest
index 5d5cfe1d38e4..cf79bbeb786e 100644
--- a/app-misc/g810-led/Manifest
+++ b/app-misc/g810-led/Manifest
@@ -1,3 +1,3 @@
-DIST g810-led-0.3.5.tar.gz 34543 BLAKE2B 6f5a946beea269d684bccaab5102f53b638f5ef66557809e50783fc0ce0ec508f2c8486b1da59347d4fb7099d4fee06bf364cafee2fe74fee88cce7860638a8e SHA512 25ed0a65b6c08de19a86c460a78a4b5a06e6e70e312840f7940317d71a3fbea723ce0926500258afbd4bccc534117228b2e800a54388bb70e00431bf8ae1668c
-EBUILD g810-led-0.3.5.ebuild 1030 BLAKE2B d4e1cad7408ceb58c18e56906de4f9eb6245b31f5742cb3e692f16f4282d4bda92ea84148c71d8ffa7dc17d68a73e03aefad3da2b72fe86cdcdaa43e8fa5b18f SHA512 1f961c941a7b797de5b68b45b5237fabefcca53b841437dbc6d2adfefb0c744851bce2c891ffaa234236b407d0866ea1971368cc6931952b8888e2c8b3a6764a
+DIST g810-led-0.3.6.tar.gz 34544 BLAKE2B 142fd54d7721a1deebfb019b644a4c8ab0fd5e1662391075cea67a4c7b7145034101f14c22975bdf079ee5b8e56c4a73e18fe31ce5d7fcf20ff4b9c64ee85502 SHA512 5a1877ee135a662bc5eb15c1afe5370cfe9243b4479823e3492f0da8f407b1438e3d7e35bd9992eea8dcbd4d548c9acdb7e74f4c99efbd4e9e8e6ddae33f8a5b
+EBUILD g810-led-0.3.6.ebuild 1030 BLAKE2B d4e1cad7408ceb58c18e56906de4f9eb6245b31f5742cb3e692f16f4282d4bda92ea84148c71d8ffa7dc17d68a73e03aefad3da2b72fe86cdcdaa43e8fa5b18f SHA512 1f961c941a7b797de5b68b45b5237fabefcca53b841437dbc6d2adfefb0c744851bce2c891ffaa234236b407d0866ea1971368cc6931952b8888e2c8b3a6764a
 MISC metadata.xml 610 BLAKE2B dc374b0b903c17b3418871362fbfe6bd47704f2d9d7895ffbbdfa468f98e42708d385d844cd96b04b88646f5b71f4acfae659c99f7c2fc5bcdcfbdb4eef18303 SHA512 978a7c99bf4e5f7a79e04055871645438322b950b8274512bdca9563050449ad395e40ba479ba70914aaef60bd86c3b41aab05f070e79fd7dbc61c941cb59fb8
diff --git a/app-misc/g810-led/g810-led-0.3.5.ebuild b/app-misc/g810-led/g810-led-0.3.6.ebuild
index 2e51fcb5d4f2..2e51fcb5d4f2 100644
--- a/app-misc/g810-led/g810-led-0.3.5.ebuild
+++ b/app-misc/g810-led/g810-led-0.3.6.ebuild
diff --git a/app-misc/gentoo-elections/Manifest b/app-misc/gentoo-elections/Manifest
index b4568ff8218f..1d4048e968f8 100644
--- a/app-misc/gentoo-elections/Manifest
+++ b/app-misc/gentoo-elections/Manifest
@@ -1,3 +1,3 @@
 DIST elections-20e84ba8cc3b328fccdc15219540443315ef4c20.tar.bz2 80881 BLAKE2B 4009834986ea6cbff84dd0b250af95fa79c45c35bbf54a6a36543383a7cd5d18294070e51d499f74ad3e8de6a1ab8c17813838b8e57c2268e6736e53523951e9 SHA512 c8b4203707713a11564b93598d8bdcfcc3b9bfdc35b664ccc52d1eb8f81f9539cdcef619687cd1ab18b2c8ba9008685641482395c2a5badb4c19ece0c02e8824
-EBUILD gentoo-elections-0_p20190710.ebuild 799 BLAKE2B b87f646436002ba43a5035cf81fc24581d97fcc6eb822ab6ec583e0578c1543994fb02d7d63c3c010ebc189892d9e21601b00a02411a2796cafab97524d4f773 SHA512 31d94958f01f0950f8199859271a5d6a061f379fdea6dac1d51df386a5a0e4fd53febc744d8e4e85c6834b5b52d892b0f70c275fa93f84cc1a91143d23b95630
+EBUILD gentoo-elections-0_p20190710.ebuild 797 BLAKE2B 6510154a35b767b47d1f37768f73163e13df9347e251ac8ae1a6d9d56bd60163b733f1caff34929edb6f1e1dd286c89f5073630505d8d37c41da5780615c00c5 SHA512 4df1e609385ee4feff9cab6d0f83f9ffef0ff66665e6970fa20192b73ff65ced4d1446dcdbe3b607c9b807502861356b9bdf9a6d9a9bed371772843dc373995b
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-misc/gentoo-elections/gentoo-elections-0_p20190710.ebuild b/app-misc/gentoo-elections/gentoo-elections-0_p20190710.ebuild
index 719ceb3fa342..792f9c565ffa 100644
--- a/app-misc/gentoo-elections/gentoo-elections-0_p20190710.ebuild
+++ b/app-misc/gentoo-elections/gentoo-elections-0_p20190710.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/elections.git/snapshot/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/glcdprocdriver/Manifest b/app-misc/glcdprocdriver/Manifest
index 8ac5116c215d..4f544960eee0 100644
--- a/app-misc/glcdprocdriver/Manifest
+++ b/app-misc/glcdprocdriver/Manifest
@@ -1,5 +1,5 @@
 DIST GLCDprocDriver-0.1.2.tar.gz 21438 BLAKE2B a480d241ad1f7b88ef63a0d2934d59325a9d5739497313c8bcc3f720a071d5bf2804986715e4392fc4713fc3641ae23e5f54cb81cdf1d45db9397d985555260a SHA512 b39dc9d68225bde63a053f124260cec9a081da1d2df6d245be109c8017d60e0e495f056fbc7ee077633d3ac68aaf7cdbaf606e1726f383aa583775a75eea5433
 DIST glcdprocdriver-0.0.6.tar.bz2 17209 BLAKE2B 631918337227c43eac163d7353182852500c08db0d1d0f3d4145d9b57895a66eb8c47a16715c1c0e4c3ab044a0de5ed80c282fd57850cbb33636cf775b721a4f SHA512 c489b6e6d6a72306867adb94ed6a6cf6354c834a27fd2ab2ac733707954b18bf93dc56a868e167fcb183602c03ac648bb941699760817e414ab8e8592edb8b7e
 EBUILD glcdprocdriver-0.0.6.ebuild 745 BLAKE2B 770037eff2b660262de1969140ca7ed5f5ca6bf6f0c2ec4682a7d211839347e07c626939f05c7103d58ea9b821297ece5b2ffad90f5651c19ad7ac5833c239be SHA512 3a7a28e045eafddbfc97b935454a557ead15aed88f1b6d2f9eed50f1fc1655c28a59b9bc810257a3de5eb32086e823e5821278c60672ab80b3a6caa263c81a65
-EBUILD glcdprocdriver-0.1.2.ebuild 790 BLAKE2B 7b216deaa16a3f6ba54892428a84bf7cc24318ea24ef6a779b08c638dd66687c39699292cb9e79e2caa5ccd4e5e745ed04a09b5cb87e38403d1200fb8ca0d836 SHA512 df19ba42e5f4a9d467e06063084d10446e10c27d33935c5b72346722f0cf31daf6d45b9fe56d3998042e7e5004a48110340f604bed4cf6ab077af4deeb930abb
+EBUILD glcdprocdriver-0.1.2.ebuild 785 BLAKE2B 49dde053eaaf6f2d0ebaca1c086a2b5e046e737febc9512c25494a5626da3c25795380614ca6693f200d76bdb54f1e1c01f200185775c476852093b2b631ba66 SHA512 1540ac1fb89772d7905d241ffc85a8c80d0880ab0b919353bf742acb6823dabf671c2edb1c5d25a475ce62b7da7bf5d734217eff306a6d63a6c20eeafe458ab7
 MISC metadata.xml 1089 BLAKE2B c8d3e6cecf76a95e23b73b2411e68c0ad7174ce1dd497c50df74a7747bf6cc38267870522ba8eba50021f04c46365193516619f9b36aa6bab6b5fe6adc739241 SHA512 7d628191af503365b442deeb69fda18b451d34e87c903addec0cbdfc86c767522f11bfbd56ffa602c15cceb6355ab5844fba3390e5388cf333f5a458273efa4e
diff --git a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
index 6b396bfbad4a..3a914692acec 100644
--- a/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
+++ b/app-misc/glcdprocdriver/glcdprocdriver-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://lucianm.github.io/GLCDprocDriver
 	https://github.com/lucianm/GLCDprocDriver"
 SRC_URI="https://github.com/lucianm/${MY_PN}/archive/0.1.2.tar.gz -> ${MY_P}.tar.gz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 7f69bf29fedf..a90bac703bb3 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -3,5 +3,5 @@ AUX graphlcd-base-0.1.9-freetype_pkgconfig.patch 906 BLAKE2B 5df340c5e11055ca45e
 DIST graphlcd-base-0.1.9.tgz 130390 BLAKE2B e25180c3679f9625efce94de77842ca296ef3155278727e3c74a657b36b45d0d3c70ceae5eb4b452c5b86ba4f0869a9c80a559fc89cd767423fe8041b2c47334 SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
 EBUILD graphlcd-base-0.1.9.ebuild 1057 BLAKE2B 2d1925c6859ad5e99bb183ae9faaa0c3ed7b2d08ef5ae710b017b4af0912c7c5d2790f34b18cac36d00607c1eb0b81b2f72f4816b3dfc09c67dd68317b384872 SHA512 63d3ac21c5980b49fd5c86fcfad5fd26323ea483c560bc987af574fd09d2edaab6767591b5b9afea3896f90233fd54e94741e0596947ce04a5b4a4cc64dbe9a9
-EBUILD graphlcd-base-1.0.2.ebuild 2170 BLAKE2B 0a69218a5b16f9689af61b7308e56ed4f533d4b740b9f6fcf8ec3a8537cc228a449cd965ba5d9d32907bb92372fb88a2356044df6d44f4f99c39bfc415356101 SHA512 07c3011503e9b27d4324394206b5e3099111fd0ea9a8cb9ff80782ef134e54e0d5982ac4e9e16d380267d17ec72d2d84166dcf020696e0de52335046935c118a
+EBUILD graphlcd-base-1.0.2.ebuild 2168 BLAKE2B b014efa367280308ed4ee6012e0d0c1fa59389744ff5142caa7ed2ba73837b0f549750532e903f429f3357de980234613cbca0e1ec3bf0ab431bd736221133f3 SHA512 36df96a9274a58c1be0ff884b4ef9d8724959403e22af6f351f548171b1fe85a5e13228956643d73860af61a1e17d166570e8418dad339e0319befe475377137
 MISC metadata.xml 1077 BLAKE2B e0356b1628b9485ac746483a17cd3f8b026001676c605751f0a14b476a6f0ec37937cda4c8f6d7f4a627f7a23a68d5f5002714af5cbdfca8fa6c8ccfa43aae74 SHA512 f087452936369496699927c86029277c90cdb95504c637b118042c90726ac54b2518eab963c16b6a3deffa11ee7dcbcd2900f72af0d8a39dc0f261a4e5121fd4
diff --git a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
index dd906d2d8066..ed6379c3013a 100644
--- a/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-1.0.2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Contains the lowlevel lcd drivers for GraphLCD"
 HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
 SRC_URI="https://projects.vdr-developer.org/git/${PN}.git/snapshot/${P}.tar.bz2"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="fontconfig freetype g15 graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 19ed48635ad8..03f28f916399 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -1,6 +1,9 @@
+AUX mc-4.8.23-3933-iso9660-1.patch 2491 BLAKE2B 30e6db19f3251784dc99fc9fc8bc8961cc2dc2414942ad2fbd62ef7a2d9d6a58416787cd7811bcc33822c3a3407c65f86886117372a3f6828ad2eb83ca516c49 SHA512 3b5e6ee0422a860efd7ec3768746bf3b0a81b4f55d775ac165946ffa5f00507fb1a0d4344d213867088e7152c0f0c12b3bb583b1d247368300b7b9cf2d8f8dd6
+AUX mc-4.8.23-3933-iso9660-2.patch 825 BLAKE2B 6f10685889f42553d54d9473a26fd4644163012d8201fe9ac42e02e5d45ee6764ce7c75f7939bb676295c0ef5d9dd4b182bba3ad198ccb2f1b907f0808be0b97 SHA512 1c9c7c961d3a69081ce5835edd386c76c9b947c7b23467f9bfd8979942248ba4382c74dfe67f8615b92b0a18b3754405486bc9a27ac7014655a2ca2f733dce99
 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
 DIST mc-4.8.23.tar.xz 2552944 BLAKE2B f246f30d852f93ac96f81ec7a933a1bcd86ff3bfa040a0fa1cb32c14d781f77df34452e4dd94f0846e379d91a648cd417241e4660930a9c90defe58cb19d1cee SHA512 e51c7f926d296280a57a8ecb5f4b296a850022b7ab9beaba89f5cb7554d8fc3e13c73b8571f78c3162ee85df88f7f46d07c9c893156cda4d1377a01071cdd1c6
 EBUILD mc-4.8.22.ebuild 2856 BLAKE2B 4690f984d23c2397b1934708b3fe03b357e6422516bc59ed50ff9e7a32988e6019ab69cecd7618ef4e60725f30367e76da3a249b4d5b04b7bec4f0346aedb977 SHA512 0976c89075f0dd7cb3028b2855824b441a74cdd981064a892d2446347484e9fbbba236705ee99f7b2b7163e6dd0769d902da85dfb0ae05a66667a82c9c6e911d
+EBUILD mc-4.8.23-r1.ebuild 2961 BLAKE2B ee54e3c02f8149df44541d4c9c1427052c54589414f2ba8b5f1cf02420bbc86ff8c8a69529e15e0a19ffa66f346a3777cfa1dd666835a40432f6d852d721f9b4 SHA512 1be001eb1bb3e7beae9949cc653bff29f5a38b1af35e88dc51a98219fba1a026ecf920c8e5e0de5cf90b2139f518d1ab417eafabfcb31ed81b75a72a9fc2d526
 EBUILD mc-4.8.23.ebuild 2866 BLAKE2B 05678e4bd3e32278f6a09c65b028fa731997481af928798edc09dd780e7c373d04a92d7dd9a2ce5c6a999ebb11f15a3b5f63b20de31ae11a043f9f01f1491232 SHA512 630ff657da56cde5e2bcfdd3c26b24416515087f4f61246f7d6bfd384a8f8d479ab2d163bb66173d31db03c7bad0be18d9f1a1c1d0e4ddc1b6b4719aef84a579
-EBUILD mc-9999.ebuild 3113 BLAKE2B ec6b556a149078643e7dfd5a3fbd5bc43c174b1cfb5e2d05d578c7ac9dfe084347ee262100d5b2c6d5fe9bbc3feaed504e93252bbc01f8431d49d1794eb63425 SHA512 8693c20e841d2b3f83073a444cca6e8013046e1f7ac7007f12d11a384e2db691ac06930f782f3585e9d7441a964967b143b3bee740c6287d64ac2e04f6277c5e
+EBUILD mc-9999.ebuild 3111 BLAKE2B 31c178fdbef8bb48d7ca13c15f7e7e56bb3d3de730ee62bccd75a593d9ad313e5cc6fc6e5dbd60a116ab5770ddcb24d31bc67393b1868b2cb57ea99a8dfb174c SHA512 fc8bbce6e66c343e141fcd0ad6c3a6fd450db0ebc366450589bf24a27556a3e536653c7430b65f2e4766172f8aece01c0206fe8c00a0bfefe4f8676c269e7553
 MISC metadata.xml 916 BLAKE2B ebd4f95dda619c29e09fdb42087a52a5c1ff2dfa0d5a7ed5bea12776734247bb04d8e19333be9ea45345a3e520ac7504ea490501767111feacf9f933caf3661a SHA512 e8b3384dc473a15550dca185fce45d12019939170155665ce26e6ce2e0abf8e387501e6429c30eefe0e5f15a1b0b1b49d12e2cf5305ef6c08415bbddb48db9ec
diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch b/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
new file mode 100644
index 000000000000..be08e68b296c
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-3933-iso9660-1.patch
@@ -0,0 +1,85 @@
+From afdc9719f3e37921b621046f01f23fe6b705f059 Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Sun, 7 Jul 2019 14:44:10 +0300
+Subject: [PATCH 1/2] Ticket #3933: report iso9660  listing errors.
+
+Variation 1:
+
+Steps to reproduce:
+
+    * create empty .iso file (touch foo.iso)
+    * run 'mc' and press enter on empty .iso
+
+Expected result: some error about invalid file format (sililar to what
+F3 view would yield).
+Actual result: mc elters a file as if it would be empty valid file.
+
+Variation 2:
+Steps to reproduce:
+
+    * pick valid .iso file
+    * deinstall all helper tools that handle .sio (isoinfo, xorriso, etc.)
+    * run 'mc' and press enter on empty .iso
+
+Expected result: some error about invalid file format (sililar to what
+F3 view would yield)
+Actual result: mc enters a file as if it would be empty valid file
+
+Variation 2 is especially confusing for users as it does not hint them
+that they should install a tool to get it working. They just observe
+silently broken behaviour.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ src/vfs/extfs/helpers/iso9660.in | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in
+index 8c2240e8e..76273522e 100644
+--- a/src/vfs/extfs/helpers/iso9660.in
++++ b/src/vfs/extfs/helpers/iso9660.in
+@@ -93,6 +93,8 @@ xorriso_rm() {
+ 
+ # tested to comply with isoinfo 2.0's output
+ test_iso () {
++    which isoinfo 2>/dev/null || (echo "isoinfo not found" >&2;  return 1)
++
+     CHARSET=$(locale charmap 2>/dev/null)
+     if test -z "$CHARSET"; then
+         CHARSET=$(locale 2>/dev/null | @GREP@ LC_CTYPE | sed -n -e 's/.*\.\(.*\)"$/\1/p')
+@@ -119,6 +121,8 @@ test_iso () {
+ }
+ 
+ mcisofs_list () {
++    local lsl r
++
+     # left as a reminder to implement compressed image support =)
+     case "$1" in
+       *.lz)  MYCAT="lzip -dc";;
+@@ -133,7 +137,11 @@ mcisofs_list () {
+       *)     MYCAT="cat";;
+     esac
+ 
+-    $ISOINFO -l -i "$1" 2>/dev/null | @AWK@ -v SEMICOLON=$SEMICOLON '
++    lsl=$($ISOINFO -l -i "$1"  2>/dev/null)
++    r=$?
++    test $r -gt 0 && return $r
++
++    echo "$lsl" | @AWK@ -v SEMICOLON=$SEMICOLON '
+ BEGIN {
+   dir="";
+   # Pattern to match 8 first fields.
+@@ -183,8 +191,8 @@ shift
+ case "$cmd" in
+   list)
+     xorriso_list "$@" || {
+-        test_iso "$@";
+-        mcisofs_list "$@";
++        test_iso "$@" || exit 1
++        mcisofs_list "$@" || exit 1
+     }
+     exit 0
+     ;;
+-- 
+2.22.0
+
diff --git a/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch b/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
new file mode 100644
index 000000000000..173def62eb0b
--- /dev/null
+++ b/app-misc/mc/files/mc-4.8.23-3933-iso9660-2.patch
@@ -0,0 +1,29 @@
+From c1b6d29b95a373108e8d03ac629dcb03fcec854c Mon Sep 17 00:00:00 2001
+From: Andrew Borodin <aborodin@vmail.ru>
+Date: Sun, 7 Jul 2019 15:51:28 +0300
+Subject: [PATCH 2/2] iso9660: report errors in copyout in case of isoinfo
+ usage.
+
+Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
+---
+ src/vfs/extfs/helpers/iso9660.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vfs/extfs/helpers/iso9660.in b/src/vfs/extfs/helpers/iso9660.in
+index 76273522e..f9c6e50ef 100644
+--- a/src/vfs/extfs/helpers/iso9660.in
++++ b/src/vfs/extfs/helpers/iso9660.in
+@@ -222,8 +222,8 @@ case "$cmd" in
+     ;;
+   copyout)
+     xorriso_copyout "$@" || {
+-        test_iso "$@";
+-        mcisofs_copyout "$@";
++        test_iso "$@" || exit 1
++        mcisofs_copyout "$@" || exit 1
+     }
+     exit 0
+     ;;
+-- 
+2.22.0
+
diff --git a/app-misc/mc/mc-4.8.23-r1.ebuild b/app-misc/mc/mc-4.8.23-r1.ebuild
new file mode 100644
index 000000000000..322ccb31aed9
--- /dev/null
+++ b/app-misc/mc/mc-4.8.23-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=${P/_/-}
+
+DESCRIPTION="GNU Midnight Commander is a text based file manager"
+HOMEPAGE="https://www.midnight-commander.org"
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
+
+REQUIRED_USE="spell? ( edit )"
+
+RDEPEND=">=dev-libs/glib-2.26.0:2
+	gpm? ( sys-libs/gpm )
+	kernel_linux? ( sys-fs/e2fsprogs )
+	samba? ( net-fs/samba )
+	sftp? ( net-libs/libssh2 )
+	slang? ( >=sys-libs/slang-2 )
+	!slang? ( sys-libs/ncurses:0=[unicode?] )
+	spell? ( app-text/aspell )
+	X? ( x11-libs/libX11
+		x11-libs/libICE
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libSM )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( dev-libs/check )
+	"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-3933-iso9660-1.patch
+	"${FILESDIR}"/${P}-3933-iso9660-2.patch
+)
+
+pkg_pretend() {
+	if use slang && use unicode ; then
+		ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
+	fi
+}
+
+src_configure() {
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
+
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--enable-charset
+		--enable-vfs
+		--with-homedir=$(usex xdg 'XDG' '.mc')
+		--with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
+		$(use_enable kernel_linux vfs-undelfs)
+		# Today mclib does not expose any headers and is linked to
+		# single 'mc' binary. Thus there is no advantage of having
+		# a library. Let's avoid shared library altogether
+		# as it also conflicts with sci-libs/mc: bug #685938
+		--disable-mclib
+		$(use_enable nls)
+		$(use_enable samba vfs-smb)
+		$(use_enable sftp vfs-sftp)
+		$(use_enable spell aspell)
+		$(use_enable test tests)
+		$(use_with gpm gpm-mouse)
+		$(use_with X x)
+		$(use_with edit internal-edit)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# CK_FORK=no to avoid using fork() in check library
+	# as mc mocks fork() itself: bug #644462.
+	#
+	# VERBOSE=1 to make test failures contain detailed
+	# information.
+	CK_FORK=no emake check VERBOSE=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS README NEWS
+
+	# fix bug #334383
+	if use kernel_linux && [[ ${EUID} == 0 ]] ; then
+		fowners root:tty /usr/libexec/mc/cons.saver
+		fperms g+s /usr/libexec/mc/cons.saver
+	fi
+
+	if ! use xdg ; then
+		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
+			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+	fi
+}
+
+pkg_postinst() {
+	elog "To enable exiting to latest working directory,"
+	elog "put this into your ~/.bashrc:"
+	elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
+}
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild
index a8a30b230b1c..471af7fa7dca 100644
--- a/app-misc/mc/mc-9999.ebuild
+++ b/app-misc/mc/mc-9999.ebuild
@@ -107,7 +107,7 @@ src_install() {
 
 	if ! use xdg ; then
 		sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
-			-i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
+			-i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
 	fi
 }
 
diff --git a/app-misc/nnn/Manifest b/app-misc/nnn/Manifest
index b3dd772f9e72..0f4f1fbd2658 100644
--- a/app-misc/nnn/Manifest
+++ b/app-misc/nnn/Manifest
@@ -4,10 +4,12 @@ DIST nnn-2.1.tar.gz 48481 BLAKE2B cbf5dbcb2548e21996f3fa5b5399a56644d1e7aed6023c
 DIST nnn-2.2.tar.gz 50955 BLAKE2B 010b68c20e7ce4ccc8df65192d7be0a76cb5a84973093dc97bd853a7f525904157d59f5db96ab0dd690c7fd340a90e8aab222003d51ceb8de8febebe62ba1c49 SHA512 0144c9f9c29c2ff3818cf14532354e8182f872580ce7c5a06ab8595b4354edc3a4ede3afc667cd0561a3de4d2f34965a9c057f7ac9555d86feff83abaaca5793
 DIST nnn-2.3.tar.gz 56286 BLAKE2B cc1d79ccf467ba47fc4b50f335e7f2a9b1962555afacc4996c986c9b962950c1f645ce9b0f0e7555a842f429dfc80a24522613d5f447c5edff13111baa57df02 SHA512 416eb08a40534ff4b92b8757c75d8e599d2ea1cbfe7cdedaccac42fd819b1f15e3da839181b232036b1d63dd8bf7c82df801cb4c456e8917fbe47a9a25fae361
 DIST nnn-2.4.tar.gz 62510 BLAKE2B 40a445bcf840afd4dcd5c4e94d1ca3af9aad6a8b8c801d97420a4f5f237bbc41cc7157bc43cd3c9ce83b04af3dbd7c6ecf467cf690922cfe36cfeff5f87ef365 SHA512 b285b14bb73e81a8480b19be7adf0b6efebc632cae82cddf9f040e644dd07dfef4e5c27df2e318aaa21eb1ac4d9e20b6d89f66b8e9b481160bc49f1302806722
+DIST nnn-2.5.tar.gz 71811 BLAKE2B 9b9f926fbcb6ed89a971eaa53ebffdda1de4da29bb540807fb15eb1a9b468181783fc9db56b69105d0825f640d203a6615c4c804f4b45fbc30b854eecd146fcf SHA512 eb50b5368811a9b93caa385a94b2e6a63705bd0ba1db4dc9a3a628a42d11547d53095736e4afa6f73037064b2ef883fe9a60cb048279ba0dd9889503de7e5167
 EBUILD nnn-1.9.ebuild 862 BLAKE2B c46fdf2d4a9fb6a4be07b557f44ec28764c4d24f30299941a31f45700f4ab4c1a1ac726146415522b2987128d9bb05d5d8c3fb2c7ed2920ff434004dac3f6626 SHA512 127bec82201acccd3764898f10636c75eb9af9562dec651fed4fd1a0fa1d6b6ed385fee20fc09bad8b8947c775011c6e1021edfcdbcddcd2c7fb8fdeeb5fb0bc
 EBUILD nnn-2.0.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.1.ebuild 859 BLAKE2B 9be51882e9a909742c338fe184f16834fda7168937367c6a315ea1691149066842a2a842ebe15eb9b3c01a0796604ca35ca6f92148f35c752465fbfbbbecc003 SHA512 1cb7118bb1e70455f15c0afd549a0000fa3de460c21bb08bba3e904d64230a5ced8c579a1c837e5c7dc38a5adc916e8e0f9efbe6bce0d30a44226a1fd753c555
 EBUILD nnn-2.2.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 EBUILD nnn-2.3.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 EBUILD nnn-2.4.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
+EBUILD nnn-2.5.ebuild 859 BLAKE2B c80e2e35b8229aa34c8aff8bc0eab4f1fac367ac09956f88f8908b7dcb74a85225de3c959bbda5f3485f1609ae929c3decbf85d18bfafcda87c0613da9d78445 SHA512 c92c512bedf61c50592e3ce972eb0eb0d2e3c0309b57999a8f682cee0eb3b9210bb275daee76ac0672858cbaf23467f6cfcfb4be826d9a8a60d69ce47bd64f6b
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-misc/nnn/nnn-2.5.ebuild b/app-misc/nnn/nnn-2.5.ebuild
new file mode 100644
index 000000000000..8caa1e33b705
--- /dev/null
+++ b/app-misc/nnn/nnn-2.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 toolchain-funcs
+
+DESCRIPTION="The missing terminal file browser for X"
+HOMEPAGE="https://github.com/jarun/nnn"
+SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0="
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed -i -e '/strip/d' Makefile || die "sed failed"
+
+}
+
+src_install() {
+	emake PREFIX="/usr" DESTDIR="${D}" install
+
+	newbashcomp scripts/auto-completion/bash/nnn-completion.bash nnn
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins scripts/auto-completion/fish/nnn.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins scripts/auto-completion/zsh/_nnn
+
+	einstalldocs
+}
diff --git a/app-misc/rtlamr/Manifest b/app-misc/rtlamr/Manifest
new file mode 100644
index 000000000000..46eb4b02097f
--- /dev/null
+++ b/app-misc/rtlamr/Manifest
@@ -0,0 +1,3 @@
+DIST rtlamr-0.9.1.tar.gz 961802 BLAKE2B 164e3071871a52ab13cadf55f3ac79243625de01f054ff0777b45928f8fc2f29c9088a1935499ec9363efeef66ec07ae68e659aa82662d5198c0037bbf953cef SHA512 1219d408ca324a2bb8a3b412fa1c8c04c637560cda2d49e5b66de7c8082d01f0ccb6b3fb4db520a5bc9ef74285c74e0b160b3c7c9de6fdc05054c27f19d3bf15
+EBUILD rtlamr-0.9.1.ebuild 488 BLAKE2B b5f47f3f81dfcd5a0139fdad8556add30d25c1551f1c6a5f68d59f374d65bbee041b934427f244a0fad9978b44b4e8e1f9239a54e436491a606d083d30bfd181 SHA512 3f6efd48c4a59f0cff1e7f46f3df431fc9da55f78b48fa4226a46cc6bb7cb74cbf6e5055fcaf81e2b9f5920a9a9fda2a94a65f1c71ca45b1af571750ab0eb13f
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/app-misc/rtlamr/metadata.xml b/app-misc/rtlamr/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/app-misc/rtlamr/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/rtlamr/rtlamr-0.9.1.ebuild b/app-misc/rtlamr/rtlamr-0.9.1.ebuild
new file mode 100644
index 000000000000..79ac536bfedc
--- /dev/null
+++ b/app-misc/rtlamr/rtlamr-0.9.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/bemasher/rtlamr
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="software defined radio receiver for utility smart meters"
+HOMEPAGE="https://github.com/bemasher/rtlamr"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_install() {
+	dobin ${PN}
+	dodoc src/${EGO_PN}/*.md src/${EGO_PN}/*.csv
+}
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index f441fe3c3afd..9564203d2902 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -3,5 +3,5 @@ AUX 2.1.8-fix-library-symlinks.patch 2937 BLAKE2B f26621b37fbd3f4e58289b8182bf56
 AUX 2.1.8-prevent-stack-smashing.patch 1669 BLAKE2B 8c0e603f8c2aafe0cb2b381feaf5c7f87afdfde764f1940735617cbad12afc02e25df9b9a848a580d4e5b969cd0f55b889ba50f5618c33cb9f9e5966d82ea996 SHA512 0d7374605e6221f14877539db2e17d4536ce45adc25d76adfb78043d3d699a291a213aeccd4e0bc4338a10454bb93c47270cfc525b258bf2a1029e856c1b47a9
 AUX 2.1.8-test-fix.patch 1674 BLAKE2B 5e0ff6c8d8ece11ec49c818521fbb248c13e09b14860b33e93229f41db36779aebeb3b398fc3d4c590332280cd98e756787755c54b2a600e031abe45746fbe26 SHA512 588eacbe421355b252cb98d00ef67b0205b6c9437e58ff893da822732d338cf453583b0cde3b71940c5dd24d562b0aa32cd7c0f7bd978c382eddb77527adc3f2
 DIST tracker-2.1.8.tar.xz 2585924 BLAKE2B 8548f6a615c3357eb2f1a1656d81f50816cef2f59e23fe7bd2111eeade8b3e5c0a33abf1bc830a0baa9c1c1d74ee92d3e44da00cd6f65ab853ef04eb2f57a69e SHA512 447e519699bbb0c9802230629667a87ce39ec3f6bb9c605063319d5e6a019c95a76762fdc889b1a11280be08b8520f22f097f9c9779dcd7a6c7cf239b4da2696
-EBUILD tracker-2.1.8.ebuild 2815 BLAKE2B 3d92b83341efe24d2109e611dadbf8979fb315884f38dddd4b394f0a38c1b403bf8e99a2d836f3b0b8b4126b461582c53cff5cc8277203cf28d5197af9d3f8c5 SHA512 5c87a0318c60fcf792884622e2de37de8a0372e2942fa58dc4ef96339f69589b3fe9088ab733480040fb315e70176891af199ec01369ec7fe61ea8a9867f8124
+EBUILD tracker-2.1.8.ebuild 2843 BLAKE2B 85cb8f73d9ddb9044e4f755ff7613b1d17503ef1437fdfca5171e05c868ec7e2e4a58c9997b895b9ac3f52b55697583b86be4888ffc3bf8ce28fffe70fc4b6cf SHA512 dd969c28428448457191c233a0dfced6cb0e920ab11ae9d6cbf0e53a2691b8d9bcfe3f0d99e6d895b04bb62ae6d72e33e4b516e992c0fe763e0295cdc575a4ef
 MISC metadata.xml 497 BLAKE2B 8517491ae43f5a339d49b10ac0acf928e942e69e4ff56d679fefc4ea102c8026f88442d77ab01411c8fa3b13348b590c53dfcfc849750ce488b7254ae6983090 SHA512 2062034fb1b59354a7f1c154ed059c602beba4959a984a3bd3d0abcc7c0b8449186f7c2a44acf325c5bb142bc2dfed3321b0eb25c041dacd121c23cf0281fb96
diff --git a/app-misc/tracker/tracker-2.1.8.ebuild b/app-misc/tracker/tracker-2.1.8.ebuild
index 5ee135fd3cc5..3bce3d5c2174 100644
--- a/app-misc/tracker/tracker-2.1.8.ebuild
+++ b/app-misc/tracker/tracker-2.1.8.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python3_{5,6,7} )
+VALA_MAX_API_VERSION="0.42"
 
 inherit bash-completion-r1 eapi7-ver gnome.org linux-info meson python-any-r1 systemd vala xdg
 
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index b88b566840ac..6d796641bcf7 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,5 +1,5 @@
 AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1253 BLAKE2B 987f2e8cc073a7af816343c7eec1b45afc7b3e0ee88bf5dd0bda1a745eb9f2b79ab9f84967b53eeb7b271579d3705287bbe7c353ca3320c9f7068d7ecdf270cc SHA512 60ba867a8853437d276e4512a5b54cef5b5829183dcd98016bd465ff087ec27d1e86d2dd0c2fc4dd93622d46801b54e5cd34b9fcc4d24c74e0bae2ca877d7b43
+EBUILD vlock-2.2.3-r1.ebuild 1256 BLAKE2B 663b363de196b369935413efec92d76881365f044064852fc81bc36f2e605d8aa931e61c2219a27a05dac15748301e9d5c31870a576d2bdd4204302301eaddea SHA512 60318ace083a89c5d4fda06f72409c59a16db14f4ec9eb8a40f2d8750db5370e94342b4bffb6dd4a7d3187ea2b16ac3edfe2ae14c35eb5d2bb91b59ac639500c
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index 568813b05fde..6773bbd88fc0 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam test"
 
 RDEPEND="
-	!>=sys-apps/kbd-2.1.0[pam]
+	!>=sys-apps/kbd-2.0.4-r1[pam]
 	pam? ( sys-libs/pam )"
 
 DEPEND="
diff --git a/app-misc/votrify/Manifest b/app-misc/votrify/Manifest
index 85aaa6ad3b24..dcbe9324867f 100644
--- a/app-misc/votrify/Manifest
+++ b/app-misc/votrify/Manifest
@@ -1,11 +1,3 @@
-DIST votrify-1.tar.gz 6936 BLAKE2B 7c9a5668842c5b1783e5c8b2341d42aa21257b96a82210c16e44bee8f71b690c7dba5acf48a39beff0189106db1fe141ef1ec30d68f25573a19a53c12618d346 SHA512 14fdb4ee185d96f416b47df7b29175cebc6e003aca7c1faf927b258f7dbe39b7ed69c4defb25900c6856b6e9abde3b03a69ca02152755d8532708b6cfb7f51a0
-DIST votrify-2.tar.gz 9095 BLAKE2B 801c9ad89f93349ce6ad0d9421e9a968a511d9699454c91cc713dd3a133c4f87666de3bc3905041999a5090eb5794d6ceed89aabc997e6950d2b5a4b4bb185cc SHA512 8c3795520d6ee5d34c8aa649a24309e30da8843bcddbfc8ff0b822eab5529a621d9fa475dc6714a6de0ed1d229d3a949870666967448a23036d28af5e7da00ab
-DIST votrify-3.tar.gz 9153 BLAKE2B fdff14dd7332bd6688cb2d04d87e7cf0888aa881cac6a98961cc544182869b190ac8591545c773e7a14293ff0fac7efd646be3cc7f8d059a8e45b709051eae69 SHA512 bde636cb238e114814f1246f49c9b5f363d7c9255da4cf2f5da6cb8da19f1b970e0027b630f21b0166c73de770e5bc931b811c3326ccc790db6d1d873731ef9e
-DIST votrify-4.tar.gz 9184 BLAKE2B 78149b3e53a830c405de70b0dff301eb4467489a59af8de76fade98eeeacc9ae78cc229db23eef26355579a9944917074419e2f38eb59eb0cae6d314985d0383 SHA512 1639fd6b6e96fb767088fb4b3be4d2d09cb0f6a12bdd745d610b6853ff2f585f8100523e92ee75d7800fe54cb42a5c716bbefe57d85395627e8c67d75e45aae1
 DIST votrify-5.tar.gz 9192 BLAKE2B 5df0ccd0b5a843b384e002c2bd1001df06cb5bcf039f10c689abeda07f1a05c545a917b0a42bd78c06c537eacca58ef7b4c2920a0fe6809f4450d4c98ee2fade SHA512 3d441eb42f860e4e571541300a04c1a52a01abbe20f76615adc1c9764bafbff35faf0f1dbe9f9267ad3c4dc0e4cb4bc715b87e2104cdef8997e7918ab834bb5d
-EBUILD votrify-1.ebuild 922 BLAKE2B c5432dc33657da9ba22fdaad4b19d1e2d601e3b9e8b54198d0552d29cb857d7d73ee8034e7691cfbdf4217bb38c5b4a9a6e07da67fa5d0f59eb20408712f9109 SHA512 e43e607cb3bf8e8aa62dab8e96a7da93f1b874760125e8486af376f831e565bae66c9b7c97e3087b3c9811b9e7c52ec03610e7c8da18ba803788978f455373a4
-EBUILD votrify-2.ebuild 1304 BLAKE2B 03762baab61fe724840ea6c15bf5c30f38fac2fe501cdde9a5fdde696e516fbcedd5d342d0269b474f5cfdc62a8ac90155d4d4cc9bbd65a58ca60de62ba017b3 SHA512 2a47c5e98f3e5ee0e96935ab113fc4e375e93d38f595f7b3ec2c0efbe72b34e5be4a4008a97ad9739741c0089b37c384907e954e1c29e82d3228cee1d2763924
-EBUILD votrify-3.ebuild 1304 BLAKE2B 03762baab61fe724840ea6c15bf5c30f38fac2fe501cdde9a5fdde696e516fbcedd5d342d0269b474f5cfdc62a8ac90155d4d4cc9bbd65a58ca60de62ba017b3 SHA512 2a47c5e98f3e5ee0e96935ab113fc4e375e93d38f595f7b3ec2c0efbe72b34e5be4a4008a97ad9739741c0089b37c384907e954e1c29e82d3228cee1d2763924
-EBUILD votrify-4.ebuild 1304 BLAKE2B 03762baab61fe724840ea6c15bf5c30f38fac2fe501cdde9a5fdde696e516fbcedd5d342d0269b474f5cfdc62a8ac90155d4d4cc9bbd65a58ca60de62ba017b3 SHA512 2a47c5e98f3e5ee0e96935ab113fc4e375e93d38f595f7b3ec2c0efbe72b34e5be4a4008a97ad9739741c0089b37c384907e954e1c29e82d3228cee1d2763924
-EBUILD votrify-5.ebuild 1304 BLAKE2B 03762baab61fe724840ea6c15bf5c30f38fac2fe501cdde9a5fdde696e516fbcedd5d342d0269b474f5cfdc62a8ac90155d4d4cc9bbd65a58ca60de62ba017b3 SHA512 2a47c5e98f3e5ee0e96935ab113fc4e375e93d38f595f7b3ec2c0efbe72b34e5be4a4008a97ad9739741c0089b37c384907e954e1c29e82d3228cee1d2763924
+EBUILD votrify-5.ebuild 1354 BLAKE2B be732a8b947c533bc57653b1d60e8d980ccf2fb6734a7201086e735ba53b8ab82017f04630b41e19ba773426129e760720100fde0b20e3fd2fdabf99078aef9d SHA512 aa0f0325d0c16cb6dcaad7bbf94c688c3789ed3008f1a9770097ce1e09598effc1c1c33b436ab56c8cda2acfc1291f270a39508be1dcdb65141bc653dd51a34a
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-misc/votrify/votrify-1.ebuild b/app-misc/votrify/votrify-1.ebuild
deleted file mode 100644
index f067073ac0cc..000000000000
--- a/app-misc/votrify/votrify-1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool for community verification of Gentoo elections"
-HOMEPAGE="https://github.com/mgorny/votrify"
-SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/gentoo-elections"
-
-src_configure() {
-	# update default location for election scripts
-	sed -i -e "s^os.path.dirname(__file__)^'${EPREFIX}/usr/lib'^" \
-		make-confirmation.py || die
-
-	# update script names
-	sed -i -e 's:\(./\)\?\(make-confirmation\|verify-confirmations\).py:votrify-\2:g' \
-		README.rst || die
-
-	python_fix_shebang *.py
-}
-
-src_install() {
-	newbin make-confirmation.py votrify-make-confirmation
-	newbin verify-confirmations.py votrify-verify-confirmations
-	einstalldocs
-}
diff --git a/app-misc/votrify/votrify-2.ebuild b/app-misc/votrify/votrify-2.ebuild
deleted file mode 100644
index 278667874da3..000000000000
--- a/app-misc/votrify/votrify-2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool for community verification of Gentoo elections"
-HOMEPAGE="https://github.com/mgorny/votrify"
-SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/gentoo-elections"
-
-src_configure() {
-	# update default location for election scripts
-	sed -i -e "s^os.path.dirname(__file__)^'${EPREFIX}/usr/lib'^" \
-		votrify-make-confirmation || die
-
-	python_fix_shebang votrify-{make,verify}-*
-}
-
-make_wrappers() {
-	local election=${1}
-
-	newbin - "votrify-${election}-make" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-make.bash.in || die)
-	newbin - "votrify-${election}-verify" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-verify.bash.in || die)
-}
-
-src_install() {
-	dobin votrify-{make,verify}-*
-	make_wrappers council-201906
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "In order to interactively create confirmation for Council 2019 election:"
-	elog "  votrify-council-201906-make"
-	elog
-	elog "In order to verify the results for Council 2019 election:"
-	elog "  votrify-council-201906-verify"
-}
diff --git a/app-misc/votrify/votrify-3.ebuild b/app-misc/votrify/votrify-3.ebuild
deleted file mode 100644
index 278667874da3..000000000000
--- a/app-misc/votrify/votrify-3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool for community verification of Gentoo elections"
-HOMEPAGE="https://github.com/mgorny/votrify"
-SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/gentoo-elections"
-
-src_configure() {
-	# update default location for election scripts
-	sed -i -e "s^os.path.dirname(__file__)^'${EPREFIX}/usr/lib'^" \
-		votrify-make-confirmation || die
-
-	python_fix_shebang votrify-{make,verify}-*
-}
-
-make_wrappers() {
-	local election=${1}
-
-	newbin - "votrify-${election}-make" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-make.bash.in || die)
-	newbin - "votrify-${election}-verify" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-verify.bash.in || die)
-}
-
-src_install() {
-	dobin votrify-{make,verify}-*
-	make_wrappers council-201906
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "In order to interactively create confirmation for Council 2019 election:"
-	elog "  votrify-council-201906-make"
-	elog
-	elog "In order to verify the results for Council 2019 election:"
-	elog "  votrify-council-201906-verify"
-}
diff --git a/app-misc/votrify/votrify-4.ebuild b/app-misc/votrify/votrify-4.ebuild
deleted file mode 100644
index 278667874da3..000000000000
--- a/app-misc/votrify/votrify-4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit python-single-r1
-
-DESCRIPTION="Tool for community verification of Gentoo elections"
-HOMEPAGE="https://github.com/mgorny/votrify"
-SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-misc/gentoo-elections"
-
-src_configure() {
-	# update default location for election scripts
-	sed -i -e "s^os.path.dirname(__file__)^'${EPREFIX}/usr/lib'^" \
-		votrify-make-confirmation || die
-
-	python_fix_shebang votrify-{make,verify}-*
-}
-
-make_wrappers() {
-	local election=${1}
-
-	newbin - "votrify-${election}-make" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-make.bash.in || die)
-	newbin - "votrify-${election}-verify" \
-		< <(sed -e "s^@ELECTION@^${election}^" \
-			votrify-wrapper-verify.bash.in || die)
-}
-
-src_install() {
-	dobin votrify-{make,verify}-*
-	make_wrappers council-201906
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "In order to interactively create confirmation for Council 2019 election:"
-	elog "  votrify-council-201906-make"
-	elog
-	elog "In order to verify the results for Council 2019 election:"
-	elog "  votrify-council-201906-verify"
-}
diff --git a/app-misc/votrify/votrify-5.ebuild b/app-misc/votrify/votrify-5.ebuild
index 278667874da3..179f0affaf98 100644
--- a/app-misc/votrify/votrify-5.ebuild
+++ b/app-misc/votrify/votrify-5.ebuild
@@ -12,10 +12,12 @@ SRC_URI="https://github.com/mgorny/votrify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-RDEPEND="app-misc/gentoo-elections"
+RDEPEND="${PYTHON_DEPS}
+	app-misc/gentoo-elections"
 
 src_configure() {
 	# update default location for election scripts
diff --git a/app-misc/ytree/Manifest b/app-misc/ytree/Manifest
index a397e715fa58..acfbed791079 100644
--- a/app-misc/ytree/Manifest
+++ b/app-misc/ytree/Manifest
@@ -1,4 +1,6 @@
 AUX ytree-1.94-bindir.patch 433 BLAKE2B 3795483e588f1c308ab28a7a952a847d0bc16dbe12ebf96e49cf28018e51e6c4c31cab0b8e18af60ffbb814c747de2293b3c270dacb03d556bdfb6a2a1c3752f SHA512 b10a4a6c0bc8b06817a859498dad4ba789393d41f3f87ef457ce58bb4a209623c299ab81de229a1c03866632a749fff56c2933e35859ca22c6c7becaaa67110a
+AUX ytree-1.99-tinfo.patch 460 BLAKE2B 9471b3a8e935595c888e3a57e425e1f285cf3d6ab558f73690ce8ccc60dcf3ba2932dacb850b869241c8812822a1a867d70f91b78bf3cefe0ac1fb883caff1ea SHA512 37b4ff2d81c9f5821b927003261e1ce59cb1dd0e3920e7fc24930f9c3788d1cc4e7a98414e629cc4a2820936707f8e5c429cce87cfff5ff0e48f9d3efb11dab0
 DIST ytree-1.99pl1.tar.gz 122996 BLAKE2B 2e40cca19cf9c9c3726e877bd05158acb34f732d266c0a7d9d6a15c6c665eb4efa38694ceee81d1006e5eeb2fb5be92be8dc40c3b9aff52eed962491eec1f06a SHA512 3d2ffae5cccf973bb06ec64917dc8f5b69e0ab95910144c5058b166479334fc563807a813ef608678463a032a8d2234f1006b820baa04aa95e77b06888af81fc
+EBUILD ytree-1.99_p1-r1.ebuild 702 BLAKE2B dcb280f1f0e436a787273509f1141e34a1b6b425995231ebd021792bfd8b7fb71666d7f40996fef1e473adc3e6ea5a639d0d7726523518bb82e0df51eaa814c5 SHA512 2261faeafd3d3753f83f84907cf2e65ec4c02189dde87836b220de7f7300ca83792040221cbb558907512761c2bca10aabebfc0f6d0a1399f9fffd8bd16fa300
 EBUILD ytree-1.99_p1.ebuild 642 BLAKE2B b4dffbcb98eae5f27b36d51772c091c3faa26bf56a85a0564556425d8fa55a48cf026e7f694665d4cba7bfc5ceee378a43617f5b81175e1dd9e323ec4d18d5da SHA512 19c27f5f852bfa4dcdaf25163160a9af3710907a4ade674faad5698f3ac6484b6f2110078b9383ac79b9687898a7910ff10f347d0ad89ec46c86031cb8f62e4d
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-misc/ytree/files/ytree-1.99-tinfo.patch b/app-misc/ytree/files/ytree-1.99-tinfo.patch
new file mode 100644
index 000000000000..9656cce88d51
--- /dev/null
+++ b/app-misc/ytree/files/ytree-1.99-tinfo.patch
@@ -0,0 +1,15 @@
+Fix build sys-libs/ncurses[tinfo]
+
+Bug: https://bugs.gentoo.org/690348
+
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,7 @@
+ #CLOCK	    = -DCLOCK_SUPPORT # Experimental!
+ READLINE    = -DREADLINE_SUPPORT
+ CFLAGS      += -D_GNU_SOURCE $(COLOR) $(CLOCK) $(READLINE) $(ADD_CFLAGS)
+-LDFLAGS     += -lncurses -lreadline
++LDFLAGS     += `pkg-config --libs ncurses` -lreadline
+ 
+ ###########################
+ # LINUX with Wide character support (testet with ncurses 5.4)
diff --git a/app-misc/ytree/ytree-1.99_p1-r1.ebuild b/app-misc/ytree/ytree-1.99_p1-r1.ebuild
new file mode 100644
index 000000000000..2f5d5986175b
--- /dev/null
+++ b/app-misc/ytree/ytree-1.99_p1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-1.99pl1"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A curses-based file manager"
+HOMEPAGE="http://www.han.de/~werner/ytree.html"
+SRC_URI="http://www.han.de/~werner/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.94-bindir.patch"
+	"${FILESDIR}/${PN}-1.99-tinfo.patch"
+)
+
+DOCS=( CHANGES README THANKS ytree.conf )
+
+pkg_setup() {
+	tc-export CC
+}
+
+src_install() {
+	einstalldocs
+	dobin ${PN}
+	doman ${PN}.1
+}