gentoo resync : 11.07.2019

29 files changed, 637 insertions, 295 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index c0988a75052c..cadd0fa475ae 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/dnetc/Manifest b/app-misc/dnetc/Manifest
index 66908906ca69..29bc98f12234 100644
--- a/app-misc/dnetc/Manifest
+++ b/app-misc/dnetc/Manifest
@@ -2,12 +2,10 @@ AUX dnetc.confd 403 BLAKE2B e33eef2035a74a459202842a84164be35995232049ab8d1d2e47
 AUX dnetc.initd 2013 BLAKE2B 2da278fa7d03c7d23a9a64f218f911c4eddb9141519b488dae5d8f2123136f9d328fbcf2ff9fe61cdccb53c940f38b389b81911fe108d7a58d77b58f09f147aa SHA512 c3f23a7913331c318042517a517e29679a585bbf92f4da91aada528cbfe60f068959b2b7804658b14597734ddea23c6f2881cd8a150be8f5d4bf69c873214d29
 DIST dnetc517-linux-amd64.tar.gz 645416 BLAKE2B a6181c82e7bdb8995930b3c93c88dd588f707ea6429e4f7f27961928129423be571f0c63e7aa5d5d9a8e5e3687a8bd54e6dc6835f5317273aa3f99ee863e8320 SHA512 b22b59af2352a95156ea4b584f48d82e4b64080130d922bbb1797b2c62f7c401ec1263f2f0bd57103134f8fc76ef41a7e09d7da083ef0b46c44be4239005c21b
 DIST dnetc517-linux-x86-elf-uclibc.tar.gz 676398 BLAKE2B 9edfa3f11b837841b362dd81bdd9a39882b6bd45942f11f6c8ebde4966351a0ea4c003eb27a36c2fe187034571d48a5d851d5931dc6121196f2097a22f9a1c30 SHA512 7b56fa8c6819fd7060612c13c8fb17ca1e949abbca965b7599bb072751acd1d0e95f1a90fb67172c6d406b54e0c52549582489802e538670bdb6d12f8354e2a7
-DIST dnetc519b-linux-amd64.tar.gz 648333 BLAKE2B 54d787d5e9a98563bba1a0cc62f70900f0fa39becf6f48a66ae888e0ce0f1f2c64a79fc6c6b3fae724ed244e3f0286dc0f266332d851347b982bffcd1807696f SHA512 ea7899772ee8c5fbfbe96b6ec69b1a3237fe5ae96b17bb7e11e387fb833b471f3cce8809cf3c9987dfe33c7ca7082db560c36898094ace3e547077b7a5afc324
 DIST dnetc521-linux-amd64.tar.gz 679350 BLAKE2B 401b83a893111a4b2d07ace93fc642b30ccd41a0273672e496b91d998ce6d38faa08a7ec13ca172d20bf785d010249b87c562b706783c6d3fe3610ef02b214ed SHA512 c5c4d6da4fd1cb6a648553718e708c8d14023d1824298f8070cdc887cbf9559e77c10908d8d9929bc0b48e2215a02c3376c4cf767ad807816abf3eba96650b1d
 DIST dnetc521-linux-arm64.tar.gz 629291 BLAKE2B 12554db6c175b828e9e74864955db7e6f54b21408edc6b32a669d52d17465ed45d7985486855a330b295778656579582f208c0e5ecc34f6a2ea195c2ab1fab68 SHA512 cc9c8b76b9d3ada1ed586132c3cc340d2ada55a28d151fb62013aac44dbf13b764dd80498bce1db36536df366497cdc2aa55e761d92cfdd050b701a23336ad80
 DIST dnetc521-linux-ppc-uclibc.tar.gz 718697 BLAKE2B 15f8438531b8074c8a56b86500c55b95eb33c62e4271023bab98601fadd3bc3d2afd1ae8562cadf8d724943515032c97a78084ddd12ef30c388456333ec60893 SHA512 31ad8999d262f0820275773f3387b0a9531ffaab662fa557cad504ed48d7e764d43ae198559b44ef9fe00a0a417e1780b327d2f1c4b7951ff760eb54393742e4
 DIST dnetc521-linux-x86-elf-uclibc.tar.gz 744639 BLAKE2B 71a317c724b91f17c1e67da63d5da2e04479572c6e8c9e9df16c9a0cf5f1d56622a7d20bd791f46b7baa3147fd18c60c312b16cc311bad2e609945620a843f16 SHA512 9178b0d42989302b82d8c62f978e819f5b30bd6acff60501e947038e655096bed3e3382015b50d53f0f3fa819be22ffbba21419a5175a01dbc449030387629fc
 EBUILD dnetc-2.9108.517.ebuild 2682 BLAKE2B cf6f8b44cebb407442779860387614e2ec2616ab8239e1abd30e82868820a93d9ed7887204451d5735af313f004716740cd71503de50d14aa94af66a3abb0c51 SHA512 7134f249034c68baaca4f2cc9987de67faa938c3cbdea5bd969d7ec98dec9404c775832445cbf6b1febec356c5ce08bd284100902abbccd821d6bc1fedd04f25
-EBUILD dnetc-2.9110.519b.ebuild 2661 BLAKE2B 70ef6708883a4ec973154da412677587cbefd62c30a86f78e9dc621cb3b04514fc7bbf8d4b39ea3f887189ddf6a585f9f5f30cb25208d89bd1fd48259747f97c SHA512 f178fe2c9be2673e7d66b86faa0365546815113738af3a880642e8d90e89696e8e68e5c1248ddb7e067ffc030eff1f480784d869a04681972ac3aadaaf4577f5
 EBUILD dnetc-2.9112.521.ebuild 2841 BLAKE2B 754543e36fa91647171a35ef3a0b005556ad0620dee6635b166e2b9021642ec161901acf7d482b83dc8129818ac85e17df71986719a42bcd8b43fc8cf2fc975b SHA512 6a51831dfb313642ae48171b398dcc3a85ad3d111f2a2e893ec901c14f40e55f798a5f3c1027d490267369f181f41e83537cbeba0ac696c6cd921c89e4dc117c
 MISC metadata.xml 357 BLAKE2B 10b84b6b4353d0dae2f48deae6622ca345c7723641b97ddd5e58e7ce7bbe438a065f3ac528a946bd99e089a45a8c2274417a51b05170d116a3fbd6e4bbb921a2 SHA512 6986582029e81ab7b8eec22c707c03c1996d0837ca9b4e7a0c31782be3f9c59a7d89c53980fdac00bb2a49555a774933704ac3fe390785840d072ac7ac9ac33d
diff --git a/app-misc/dnetc/dnetc-2.9110.519b.ebuild b/app-misc/dnetc/dnetc-2.9110.519b.ebuild
deleted file mode 100644
index 86d49250521a..000000000000
--- a/app-misc/dnetc/dnetc-2.9110.519b.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit user
-
-MAJ_PV=${PV:0:6}
-MIN_PV=${PV:7:9}
-
-DESCRIPTION="distributed.net client"
-HOMEPAGE="http://www.distributed.net"
-#SRC_URI_x86="x86? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-x86-elf-uclibc.tar.gz )"
-SRC_URI_amd64="amd64? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-amd64.tar.gz )"
-#SRC_URI_ppc="ppc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-ppc-uclibc.tar.gz )"
-#SRC_URI_sparc="sparc? ( http://http.distributed.net/pub/dcti/v${MAJ_PV}/dnetc${MIN_PV}-linux-sparc-v7.tar.gz )"
-SRC_URI="${SRC_URI_amd64} ${SRC_URI_ppc} ${SRC_URI_x86} ${SRC_URI_sparc}"
-
-LICENSE="distributed.net GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86" # ppc,x86 not available for this version
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND=""
-RDEPEND="net-dns/bind-tools"
-
-QA_PREBUILT="opt/distributed.net/dnetc"
-
-getS() {
-	case $ARCH in
-		amd64) suffix=amd64 ;;
-		x86)   suffix=x86-elf-uclibc ;;
-		ppc)   suffix=ppc-elf-uclibc ;;
-	esac
-	echo dnetc${MIN_PV:0:3}-linux-${suffix}
-}
-
-src_prepare() {
-	export S="${WORKDIR}/$(getS)"
-	cd "${S}"
-	[[ -x dnetc ]] || die "Name of dnetc directory/binary for this platform undefined"
-}
-
-src_install() {
-	export S="${WORKDIR}/$(getS)"
-	cd "${S}"
-	exeinto /opt/distributed.net
-	doexe dnetc
-
-	doman dnetc.1
-	dodoc docs/CHANGES.txt docs/dnetc.txt docs/readme.*
-
-	newinitd "${FILESDIR}"/dnetc.initd dnetc
-	newconfd "${FILESDIR}"/dnetc.confd dnetc
-
-	keepdir /var/spool/dnetc
-}
-
-pkg_preinst() {
-	if [ -e /opt/distributed.net/dnetc ] && [ -e /etc/init.d/dnetc ]; then
-		einfo "flushing old buffers"
-		source /etc/conf.d/dnetc
-
-		if [ -e /opt/distributed.net/dnetc.ini ]; then
-			# use ini file
-			/opt/distributed.net/dnetc -quiet -ini /opt/distributed.net/dnetc.ini -flush
-		elif [ ! -e /opt/distributed.net/dnetc.ini ] && [ ! -z ${EMAIL} ]; then
-			# email adress from config
-			/opt/distributed.net/dnetc -quiet -flush -e ${EMAIL}
-		fi
-
-		einfo "removing old buffer files"
-		rm -f /opt/distributed.net/buff*
-	fi
-
-	enewgroup dnetc
-	enewuser dnetc -1 -1 /opt/distributed.net dnetc
-}
-
-pkg_postinst() {
-	chown -Rf dnetc:dnetc /opt/distributed.net
-	chmod 0555 /opt/distributed.net/dnetc
-
-	elog "To run distributed.net client in the background at boot:"
-	elog "   rc-update add dnetc default"
-	elog ""
-	elog "Either configure your email address in /etc/conf.d/dnetc"
-	elog "or create the configuration file /opt/distributed.net/dnetc.ini"
-}
-
-pkg_postrm() {
-	if [ -d /opt/distributed.net ]; then
-		elog "All files has not been removed from /opt/distributed.net"
-	fi
-}
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index b906fbf94db1..e7afe4f77566 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -12,12 +12,18 @@ AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a735
 DIST elasticsearch-5.6.16.tar.gz 33894983 BLAKE2B f96e78f1f28d8106948c91a0d31ea3d41b538fb0fd8534e2f52be651cf22986c76eae67c58c8ef10fef218d1646b1b4b5aa0a3625520e62e482063420775e92e SHA512 cc831e50ce311366484c47cf9fead9bd6562035132e6fd29508e78776dd71846c713d8d1e7a0a99338df46cad124149fb5d767e0ae0bbbed0b50153e234f2631
 DIST elasticsearch-6.6.1.tar.gz 114126547 BLAKE2B b335b224af0c241cbdf83f81feec103274d9cdd9ee7f9c3c5a788cbfc4d7a24b3a345aa14853e378796f733c151f7f21b5b081b2071b56f40f0f068ef6b07939 SHA512 3f8619ae6a10a34c57d8bc0c2ba3851b79a494ea05a3d02119a6e12d2c6cb6a651e73b43adfd674b7fb16664b709b643d4be9ba0785dbcc6d7a7cc41da7b669f
 DIST elasticsearch-6.7.1.tar.gz 148542786 BLAKE2B 4a9acd16788e6d84acfac09ee2434135fdef85d0bec5baa873f7bfd7cb6d340932d6b67b13a8f5095dc04d1981a029ab7f87d90c2b4a796eb198e9b8c531db9d SHA512 dcd3a6beae8b4a2322144058871074f193974565341da5703ec991947c2749ee67e87202e937148f653594f5fd33fdbb8adc891a200d4e03d8363575992eb9ec
+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-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
 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 2570 BLAKE2B 34f783dfea91989cb241fa8f1e94c209509bc87d9d63c754507d23aeb3b10d1dc97819764505227982b4721eb73280f9dc01b59034bcdbbc31fea0b454a1ab2f SHA512 59a97e54612b663302de40f5a94c7ee03c046f9642ea2d3966a53723c11e0b224a125443983bbf31eb9ffbbb372f90fdfbbd1239f283b3268af590c029da42bc
 MISC metadata.xml 567 BLAKE2B 3123e01d77b67569afb2bb4908b38c702ebe1d308ea236b8ebba11709bc421af27ec29d72398a3af0aaefb39a2a2f34e27bffbbd1b3306dbc299e49bfd48cd35 SHA512 74669ea5437ad23c604c82a734973d58a31d78f0f4a2b7e2db655d884bf017d32ea25e451517601b35d406789e661ed2e173752bc232a03c3564e971c5a83a0c
diff --git a/app-misc/elasticsearch/elasticsearch-6.8.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.8.1.ebuild
new file mode 100644
index 000000000000..fa7c0272257f
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-6.8.1.ebuild
@@ -0,0 +1,91 @@
+# 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}.tar.gz )
+	!x-pack? ( https://artifacts.elastic.co/downloads/${PN}/${PN}-oss-${PV}.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:1.8"
+
+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 bin/*.{bat,exe} LICENSE.txt NOTICE.txt || die
+	rmdir logs || die
+
+	if use x-pack; then
+		rm bin/x-pack/*.bat || die
+		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
+	fi
+}
+
+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.6" ${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/elasticsearch-7.2.0.ebuild b/app-misc/elasticsearch/elasticsearch-7.2.0.ebuild
new file mode 100644
index 000000000000..8d3ce3b93b46
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-7.2.0.ebuild
@@ -0,0 +1,90 @@
+# 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
+
+	if use x-pack; then
+		rm -r modules/x-pack-ml/platform/{darwin,windows}-x86_64 || die
+	fi
+}
+
+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.6" ${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/gentoo-elections/Manifest b/app-misc/gentoo-elections/Manifest
new file mode 100644
index 000000000000..b4568ff8218f
--- /dev/null
+++ b/app-misc/gentoo-elections/Manifest
@@ -0,0 +1,3 @@
+DIST elections-20e84ba8cc3b328fccdc15219540443315ef4c20.tar.bz2 80881 BLAKE2B 4009834986ea6cbff84dd0b250af95fa79c45c35bbf54a6a36543383a7cd5d18294070e51d499f74ad3e8de6a1ab8c17813838b8e57c2268e6736e53523951e9 SHA512 c8b4203707713a11564b93598d8bdcfcc3b9bfdc35b664ccc52d1eb8f81f9539cdcef619687cd1ab18b2c8ba9008685641482395c2a5badb4c19ece0c02e8824
+EBUILD gentoo-elections-0_p20190710.ebuild 799 BLAKE2B b87f646436002ba43a5035cf81fc24581d97fcc6eb822ab6ec583e0578c1543994fb02d7d63c3c010ebc189892d9e21601b00a02411a2796cafab97524d4f773 SHA512 31d94958f01f0950f8199859271a5d6a061f379fdea6dac1d51df386a5a0e4fd53febc744d8e4e85c6834b5b52d892b0f70c275fa93f84cc1a91143d23b95630
+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
new file mode 100644
index 000000000000..719ceb3fa342
--- /dev/null
+++ b/app-misc/gentoo-elections/gentoo-elections-0_p20190710.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="elections-20e84ba8cc3b328fccdc15219540443315ef4c20"
+DESCRIPTION="Gentoo election control data and scripts"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elections.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/elections.git/snapshot/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Carp-Always
+	virtual/perl-Data-Dumper
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	virtual/perl-Scalar-List-Utils"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# delete obsolete, broken symlinks
+	find completed -name Votify.pm -delete || die
+}
+
+src_install() {
+	insinto /usr/lib/gentoo-elections
+	doins -r completed countify Votify.pm
+}
diff --git a/app-misc/gentoo-elections/metadata.xml b/app-misc/gentoo-elections/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-misc/gentoo-elections/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 7d08b66c3403..c7a76b42b3de 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -1,9 +1,7 @@
+AUX 2.5.3-optional-vapi.patch 2135 BLAKE2B 0e2d2620fb1fbe287eef4f9d749d77c75452bf0d12fdcfd4f5cebe9d35118cb22ff6366562a0a1a9b07bfd452ac35580d563c498d4d77474dcf6613b24da5d80 SHA512 254fcffb4500031100c802e751cf84d2ca85b8a890cee7aa3b538dd9d5374cda560eaad262c5efd4ba7c2503d4130a958adeb77eba66162627708d2448096338
 AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
-AUX geoclue-2.5.3-optional-vapi.patch 1753 BLAKE2B ad8add41e90baa8cfd9bc30b419b5fb4cd85b248d0a08460dbacc53d1047c0b3a90b5d826bb5bb3b3a4aa43eff535ec613be3c3642e274d8822b7d133ed6ca69 SHA512 671434a0c74712c987e39eca7cee628d7304dee5aa1eb05ea1c4a78e7ce20fabdcc3d4c6a6ee1881975d71d5c60730ff83501dcd868476a5f99e37f098c29a51
 DIST geoclue-2.4.13.tar.bz2 108691 BLAKE2B 5ffc2aca51ad0943931c526da69225e3a0d9b0c850ea688a350c47696b83775dc078e928af8cb0996741386a41ab5ec1ac129676d7e3b4c8584b3720dd370c1e SHA512 ed9c295bbdc22836a548ca4d5014d109af214464d1dd2a00f1ec493a751d949930d9fa512e915c7d65b34c8706c3bf73e06dd5e170846edee9e764d144960e78
-DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
 DIST geoclue-2.5.3.tar.bz2 85084 BLAKE2B 3f61c16dcb4d0de95499865d83df4bd9b393d9d2f204b70029fb753666caab0e74468ae14f37ed78475d623caae9553e0e69b62765afebc6730212428d377aff SHA512 b4188f1b055f84ce0c58e497896a328d09838073b867598a0ca026c741e4464ae7ee54e53e9f02addd818152dce4a21eb5f83a3245e7ce1a93eec5671d0a9ee9
-EBUILD geoclue-2.4.13.ebuild 1677 BLAKE2B 53723734bc0f5a1f1c21f664f8fa9ac7b9b27c9f02c6684d3aaf3a152f831742d028066069ece13a125a88281d6b7f35bba7544b2bf36b221852915376fad585 SHA512 ff0ade63322336de7a4950a56c47cc3e7dde3758270b771526d3fb6f08bf0771ca31d28fa2cb27149fe5563e87bf54c6356f6d359d5df0c4f8960619c48b426d
-EBUILD geoclue-2.4.8.ebuild 1592 BLAKE2B 0f3d58e79786d2b0e80905d9bf236e6f6d90e1fb6a98051c319abb89d8723097a4690545468a191bac46bf9317962bee5012dc67d6f5fd00722d084d63ad718f SHA512 ed5f5259c3913294d0b9698b6f7b536c34b546401c7fc004705d1a534cd3fffffe879958274e59152769b082329fce822167652f4640e1b5cf19b5096e0e372d
-EBUILD geoclue-2.5.3-r1.ebuild 1884 BLAKE2B 01475ac73c6cb9e09960bf5208da9019f985c6400dfa68713ba78febd181649e613a20e5f300034125fbe63a8a88d6ec59f5d5d4aaa95563ba06ceff4d8d1447 SHA512 282b459e44f3956c7ef5576b0a1fa59f2f82d7cd50e866a9022fe55bc94769386de764d727998b0f8bc5b6bafdc0df8349cba65a44612b706dcfe8e90a65ad74
+EBUILD geoclue-2.4.13.ebuild 1676 BLAKE2B f4cddd032f3d5f3503e9e1e729faca949544f7a094cd9ff2d52b1bfc47a90cc85116b6cd5a590851a7ed31afbb29dccf5733bc58288616d10f69db90a058d1d7 SHA512 902a1922ce0ad6c3e9ebd0bd1d034605de6652c8d9ac40271d6593f5cf9af2db8c41a3901e31d5d56f2857446126fd46fc0fb06fc04d644221d6afce46dd3d97
+EBUILD geoclue-2.5.3-r2.ebuild 1760 BLAKE2B eb321054f2f9bfc0e75a1b9dd6fe62d813883711c5d27e22184a58c54dc2ec14ee74f44f8514e6cae053183a13843f587fd92e3283aa6027d940164b9971028d SHA512 09845c4e258a94a3a4cd28eddd8a95a2c56d38a53001a14453fec3677c81bc624296b1b7c0f688a1538bde292ece070f249a96b0832c38c8c7eb483a3de1c56b
 MISC metadata.xml 522 BLAKE2B 8a0c7c99c984e6aa1a2360deffb947c126e52681dd207afc5b75eae4731492f28199a74cc4febec4265e4497320b9213521a528c5ec8339efa2c0490c8769e27 SHA512 719b3b64c6bce05a9b02818748a96081ab73c4124296266c545306014862f38124d9f20578938af4b99eb416c053070fa5c801d7823a87fe845f6d1ca99536ec
diff --git a/app-misc/geoclue/files/2.5.3-optional-vapi.patch b/app-misc/geoclue/files/2.5.3-optional-vapi.patch
new file mode 100644
index 000000000000..d451d6ea6d03
--- /dev/null
+++ b/app-misc/geoclue/files/2.5.3-optional-vapi.patch
@@ -0,0 +1,52 @@
+From 3598b8b9c1a6ef4a31e2c179a6be3e3a69cce357 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 7 Jul 2019 15:57:03 +0300
+Subject: [PATCH] meson: Make vapi generation optional and remove explicit
+ vapigen check
+
+meson gnome.generate_vapi properly handles VAPIGEN and other vala
+environment variables. It is counter-productive to check for an
+unversioned vapigen, as that breaks versioned VAPIGEN usages.
+---
+ libgeoclue/meson.build | 3 +--
+ meson_options.txt      | 3 +++
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build
+index e228ec3..d053bc1 100644
+--- a/libgeoclue/meson.build
++++ b/libgeoclue/meson.build
+@@ -58,7 +58,6 @@ libgeoclue_dep = declare_dependency(link_with: libgeoclue,
+                                     sources: [ libgeoclue_sources, libgeoclue_headers ])
+ 
+ gir = find_program('g-ir-scanner', required: false)
+-vapigen = find_program('vapigen', required: false)
+ enable_gir = get_option('introspection')
+ pkg_requirements = ['glib-2.0', 'gio-2.0', 'gio-unix-2.0']
+ gir_sources = [ libgeoclue_sources,
+@@ -78,7 +77,7 @@ if gir.found() and enable_gir
+                                install: true,
+                                header: 'geoclue.h',
+                                extra_args: [ '--quiet' ])
+-  if vapigen.found()
++  if get_option('vapi')
+     gnome.generate_vapi('libgeoclue-' + gclue_api_version,
+                         sources: geo_gir[0],
+                         packages: pkg_requirements,
+diff --git a/meson_options.txt b/meson_options.txt
+index 83bc60e..3a832d5 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -4,6 +4,9 @@ option('libgeoclue',
+ option('introspection',
+         type: 'boolean', value: true,
+         description: 'Enable convenience library introspection generation')
++option('vapi',
++       type: 'boolean', value: true,
++       description: 'Generate vapi data for convenience library (requires vapigen and introspection)')
+ option('gtk-doc',
+        type: 'boolean', value: true,
+        description: 'Whether to generate the API reference for Geocode-GLib')
+-- 
+2.20.1
+
diff --git a/app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch b/app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch
deleted file mode 100644
index 874488decace..000000000000
--- a/app-misc/geoclue/files/geoclue-2.5.3-optional-vapi.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 56c7ca99dcadbf3e80ff2a9baf3e174f278b6a71 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhan@gentoo.org>
-Date: Wed, 19 Jun 2019 01:16:16 -0400
-Subject: [PATCH] optinal vala
-
----
- libgeoclue/meson.build | 5 +++--
- meson_options.txt      | 3 +++
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build
-index e228ec3..e78a3e8 100644
---- a/libgeoclue/meson.build
-+++ b/libgeoclue/meson.build
-@@ -58,7 +58,8 @@ libgeoclue_dep = declare_dependency(link_with: libgeoclue,
-                                     sources: [ libgeoclue_sources, libgeoclue_headers ])
- 
- gir = find_program('g-ir-scanner', required: false)
--vapigen = find_program('vapigen', required: false)
-+vapigen_req = get_option('vapigen')
-+vapigen = find_program('vapigen-ver', required: false)
- enable_gir = get_option('introspection')
- pkg_requirements = ['glib-2.0', 'gio-2.0', 'gio-unix-2.0']
- gir_sources = [ libgeoclue_sources,
-@@ -78,7 +79,7 @@ if gir.found() and enable_gir
-                                install: true,
-                                header: 'geoclue.h',
-                                extra_args: [ '--quiet' ])
--  if vapigen.found()
-+  if vapigen.found() and vapigen_req
-     gnome.generate_vapi('libgeoclue-' + gclue_api_version,
-                         sources: geo_gir[0],
-                         packages: pkg_requirements,
-diff --git a/meson_options.txt b/meson_options.txt
-index 83bc60e..8611f6c 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,6 @@
-+option('vapigen',
-+       type: 'boolean', value: false,
-+       description: 'Enable vala?')
- option('libgeoclue',
-         type: 'boolean', value: true,
-         description: 'Enable convenience library')
--- 
-2.21.0
-
diff --git a/app-misc/geoclue/geoclue-2.4.13.ebuild b/app-misc/geoclue/geoclue-2.4.13.ebuild
index ead1b7a079ee..edf0b2a0f2b9 100644
--- a/app-misc/geoclue/geoclue-2.4.13.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.b
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="+introspection modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/geoclue/geoclue-2.4.8.ebuild b/app-misc/geoclue/geoclue-2.4.8.ebuild
deleted file mode 100644
index da7047d77a4e..000000000000
--- a/app-misc/geoclue/geoclue-2.4.8.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit gnome2 systemd user versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
-SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd"
-IUSE="+introspection +modemmanager zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.34:2
-	>=dev-libs/json-glib-0.14
-	>=net-libs/libsoup-2.42:2.4
-	sys-apps/dbus
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	modemmanager? ( >=net-misc/modemmanager-1.6 )
-	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
-	!<sci-geosciences/geocode-glib-3.10.0
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug only affects CFLAGS
-	gnome2_src_configure \
-		--enable-backend \
-		--with-dbus-service-user=geoclue \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_enable introspection) \
-		$(use_enable modemmanager 3g-source) \
-		$(use_enable modemmanager cdma-source) \
-		$(use_enable modemmanager modem-gps-source) \
-		$(use_enable zeroconf nmea-source)
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-	gnome2_pkg_preinst
-}
diff --git a/app-misc/geoclue/geoclue-2.5.3-r1.ebuild b/app-misc/geoclue/geoclue-2.5.3-r1.ebuild
deleted file mode 100644
index b4c7c3071852..000000000000
--- a/app-misc/geoclue/geoclue-2.5.3-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.32"
-
-inherit gnome.org meson systemd vala user xdg
-
-DESCRIPTION="A geoinformation D-Bus service"
-HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
-SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
-#todo maybe add a use flat for libgeoclue
-IUSE="+introspection gtk-doc modemmanager vala zeroconf"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.14
-	>=net-libs/libsoup-2.42:2.4
-	sys-apps/dbus
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	modemmanager? ( >=net-misc/modemmanager-1.6 )
-	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
-	!<sci-geosciences/geocode-glib-3.10.0
-	x11-libs/libnotify
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-1
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? (  $(vala_depend) )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-optional-vapi.patch
-
-	vala_src_prepare
-	sed -i -e "s:'vapigen-ver':'vapigen-$(vala_best_api_version)':" libgeoclue/meson.build || die
-	xdg_src_prepare
-}
-
-src_configure() {
-	# debug only affects CFLAGS
-	local emesonargs=(
-		$(meson_use gtk-doc)
-		$(meson_use vala vapigen)
-		-Ddbus-srv-user=geoclue \
-		-Denable-backend=true \
-		-Dlibgeoclue=true \
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" \
-		-Ddemo-agent=false \
-		$(meson_use introspection) \
-		$(meson_use modemmanager 3g-source) \
-		$(meson_use modemmanager cdma-source) \
-		$(meson_use modemmanager modem-gps-source) \
-		$(meson_use zeroconf nmea-source)
-	)
-	meson_src_configure
-}
-
-pkg_preinst() {
-	enewgroup geoclue
-	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
-}
diff --git a/app-misc/geoclue/geoclue-2.5.3-r2.ebuild b/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
new file mode 100644
index 000000000000..73bd1075be74
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.5.3-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit meson systemd vala user xdg
+
+DESCRIPTION="A location information D-Bus service"
+HOMEPAGE="https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"
+SRC_URI="https://gitlab.freedesktop.org/geoclue/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="+introspection gtk-doc modemmanager vala zeroconf"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/json-glib-0.14.0
+	>=net-libs/libsoup-2.42.0:2.4
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	modemmanager? ( >=net-misc/modemmanager-1.6 )
+	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}
+	sys-apps/dbus
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-optional-vapi.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dlibgeoclue=true
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+		$(meson_use gtk-doc)
+		$(meson_use modemmanager 3g-source)
+		$(meson_use modemmanager cdma-source)
+		$(meson_use modemmanager modem-gps-source)
+		$(meson_use zeroconf nmea-source)
+		-Denable-backend=true
+		-Ddemo-agent=true
+		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
+		-Ddbus-srv-user=geoclue
+	)
+	meson_src_configure
+}
+
+pkg_preinst() {
+	enewgroup geoclue
+	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+}
diff --git a/app-misc/lcd4linux/Manifest b/app-misc/lcd4linux/Manifest
index dc4736849d72..325da21ca114 100644
--- a/app-misc/lcd4linux/Manifest
+++ b/app-misc/lcd4linux/Manifest
@@ -1,5 +1,7 @@
 AUX lcd4linux-r1.initd 775 BLAKE2B f1b4ee44d147e1ea191658edc2b7502acfc8d5a82e5b1af2deb74457cb3b20b32477d055cd24b7587019b711dfe55c7bb5dadd43d5a1d76d320e3ff6a2c19021 SHA512 471517952391880f3bcf85e21de56523ee40578fcf75b4e7256554498bbb691e8bbfe4add509d32dc99b409d7b7b3abd608a60326d883a43cb114b279a217213
+AUX lcd4linux-r2.initd 746 BLAKE2B a4e7ce0f6780fab205777c13c1e0dbe6d7d6a8b40c45995d248fd1553f4e967b59fba9e6a4c56a777e013693b743c7939b382dbe9bb1c3d856ca9ec23e1661be SHA512 8cc10e236dcf045f6da955fcbdfd1ecedf24cbe8a31dbb39c7b8830007de790e38b6af31549fa552cb35e63ed4ef75738b4b40f672ce05c72d28ec95c2580142
 DIST lcd4linux-0.11.0_pre20170527.tar.bz2 478823 BLAKE2B 7b332e7262781dd0dc954a0576890dda78ecbeab9dc003d1d5b84a643ad522d57e32a04a2aa6fbe13b18e4699d07d88412e19c81739fafdf98ba327b151061a9 SHA512 c131b9cb04bb0ff4dc46c1e3ab8f5dcda309bbef89bcb670508f9afe7c515d6ccfe79a03782be4f4b2ba4aaf977cd13c0059805e5b7230216e39ee3421b0f143
 EBUILD lcd4linux-0.11.0_pre20170527-r1.ebuild 5594 BLAKE2B 7833584b733ca61b452ae4786d29f0b10f1cbf463a1f845ff32a8a8b9977fc196adabb6a6d9335cda10231868d6e5ea79ec862509927bd2ac371cb97e92d4ab8 SHA512 6c44114cc4067457ef452fb5f9d80463056786ab36c467e9c13c98aecb98bce3cd1fa270a71d769006370640e3d3b9ede29368f600435cac5f5c74d455e38809
+EBUILD lcd4linux-0.11.0_pre20170527-r2.ebuild 5594 BLAKE2B 8c7741943295bab61cae7e2ec667b4c4c936248df0bba28ddea5b89bbe27b38312916db62c44a5f40e0918cfe5d209d0afec89ac2db50d4e6a9571e519c63422 SHA512 2ba802b021471bd0a36fa1a3b255dfabe7f93ed876a11d448597cdbd9fafb72f95a0d68a694ab00b8766cb53941be75eb17d5b8d4dd67eb035c8bad95971ab46
 EBUILD lcd4linux-0.11.0_pre20170527.ebuild 5550 BLAKE2B d9488943d12768363e4fe26511e203856de5a7aa61d79c5668f3b39a7bd72b0b07486b90d2e15c277de8ef04a1b828ff6e77cfe6b8eee14a5a7af5c735ceb3cc SHA512 63191fa94067bf27955c830e24fe13c49b9217ef9eedbbd62fc1f0399c7242062696d076dbaff98fb9a0b33fab297fc94069ebae6610c0ad39467980d75f350c
 MISC metadata.xml 3555 BLAKE2B 507770da472d7befe06269d3b8ed52ca258467acb8d18892f47db3a630742c66f48f55f069c160ef0c889bc0fd31fbdd41b81fc6574ff4a51eea247373b8e25e SHA512 618885236669c7b9c28114d01f2f2f8c05638eb4eb85aca3d311d180cf82af01255f143ccdc0db2e890d42d2cb7fa3223638fcf4985d80322c95101e6c00e9fe
diff --git a/app-misc/lcd4linux/files/lcd4linux-r2.initd b/app-misc/lcd4linux/files/lcd4linux-r2.initd
new file mode 100644
index 000000000000..abed325fcfb9
--- /dev/null
+++ b/app-misc/lcd4linux/files/lcd4linux-r2.initd
@@ -0,0 +1,28 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "lcd4linux" ]; then
+	config="/etc/lcd4linux/lcd4linux.conf"
+	name="LCD4Linux"
+	pidfile="/run/lcd4linux.pid"
+else
+	config="/etc/lcd4linux/lcd4linux.${SVCNAME#lcd4linux.}.conf"
+	name="LCD4Linux (${SVCNAME#lcd4linux.})"
+	pidfile="/run/lcd4linux.${SVCNAME#lcd4linux.}.pid"
+fi
+
+command="/usr/bin/lcd4linux"
+command_args="-f ${config} -p ${pidfile}"
+command_group="root"
+command_user="root"
+
+start_pre() {
+	if [ ! -f "${config}" ]; then
+		eerror "Please create ${config} before starting LCD4Linux!"
+		return 1
+	else
+		checkpath -f -m 600 -o "${command_user}:${command_group}" -q "${config}"
+		return 0
+	fi
+}
diff --git a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r2.ebuild b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r2.ebuild
new file mode 100644
index 000000000000..b13ecafe8c15
--- /dev/null
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic python-single-r1
+
+DESCRIPTION="A small program that grabs information and displays it on an external LCD"
+HOMEPAGE="https://lcd4linux.bulix.org/"
+SRC_URI="https://www.bl4ckb0x.de/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dmalloc outb"
+REQUIRED_USE="
+	?? ( lcd_devices_hd44780 lcd_devices_hd44780-i2c )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+# Define the list of valid lcd devices.
+# Some drivers were removed from this list:
+# - lcdlinux: It's an ancient driver, which needs app-misc/lcd-linux, that made it never to the portage tree.
+# - lcdlinux: Besides, app-misc/lcd-linux won't compile on a modern linux kernel.
+# - st2205: It's needs dev-libs/libst2205,  which made it never to the portage tree and is quite outdated.
+IUSE_LCD_DEVICES=(
+	ASTUSB BeckmannEgle BWCT CrystalFontz Curses Cwlinux D4D DPF EA232graphic EFN FutabaVFD
+	FW8888 G15 GLCD2USB HD44780 HD44780-I2C IRLCD LCD2USB LCDTerm LEDMatrix LPH7508 LUIse LW_ABP M50530
+	MatrixOrbital MatrixOrbitalGX MilfordInstruments MDM166A Newhaven Noritake NULL Pertelian PHAnderson
+	PICGraphic picoLCD picoLCDGraphic PNG PPM RouterBoard Sample SamsungSPF serdisplib ShuttleVFD
+	SimpleLCD T6963 TeakLCM Trefon ULA200 USBHUB USBLCD VNC WincorNixdorf X11
+)
+
+# Define the list of valid lcd4linux plugins.
+# Some plugins were removed from this list:
+# - imon: Uses telmond, which is only available on a fli4l router or an eisfair server.
+# - ppp: It has been replaced by the netdev plugin.
+# - seti: SETI@home software was replaced by sci-misc/boinc, which is not compatible.
+# - xmms: XMMS software was replaced by media-sound/xmms2, which is not compatible.
+IUSE_LCD4LINUX_PLUGINS=(
+	apm asterisk button_exec cpuinfo dbus diskstats dvb exec event
+	fifo file gps hddtemp huawei i2c_sensors iconv isdn kvv
+	loadavg meminfo mpd mpris_dbus mysql netdev netinfo pop3
+	proc_stat python qnaplog raspi sample statfs uname uptime
+	w1retap wireless
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
+REQUIRED_USE+=" || ( "
+for LCD_DEVICE in "${IUSE_LCD_DEVICES[@]}"; do
+	LCD_DEVICE=${LCD_DEVICE,,}
+	IUSE+=" lcd_devices_${LCD_DEVICE} "
+	REQUIRED_USE+=" lcd_devices_${LCD_DEVICE} "
+done
+REQUIRED_USE+=" ) "
+unset LCD_DEVICE
+
+# Add supported plugins from 'IUSE_LCD4LINUX_PLUGINS' to 'IUSE' and 'REQUIRED_USE'
+IUSE+=" ${IUSE_LCD4LINUX_PLUGINS[*]} "
+REQUIRED_USE+=" || ( ${IUSE_LCD4LINUX_PLUGINS[*]} ) "
+
+# Define dependencies for all drivers in 'IUSE_LCD_DEVICES'
+DEPEND_LCD_DEVICES="
+	lcd_devices_astusb? ( virtual/libusb:0= )
+	lcd_devices_bwct? ( virtual/libusb:0= )
+	lcd_devices_curses? ( sys-libs/ncurses:0= )
+	lcd_devices_dpf? ( virtual/libusb:0= )
+	lcd_devices_g15? ( virtual/libusb:0= )
+	lcd_devices_glcd2usb? ( virtual/libusb:0= )
+	lcd_devices_irlcd? ( virtual/libusb:0= )
+	lcd_devices_lcd2usb? ( virtual/libusb:0= )
+	lcd_devices_ledmatrix? ( virtual/libusb:0= )
+	lcd_devices_luise? (
+		dev-libs/luise-bin
+		virtual/libusb:0=
+	)
+	lcd_devices_matrixorbitalgx? ( virtual/libusb:0= )
+	lcd_devices_mdm166a? ( virtual/libusb:0= )
+	lcd_devices_picolcd? ( virtual/libusb:0= )
+	lcd_devices_picolcdgraphic? ( virtual/libusb:0= )
+	lcd_devices_png? (
+		media-libs/gd[png]
+		media-libs/libpng:0=
+	)
+	lcd_devices_ppm? ( media-libs/gd )
+	lcd_devices_samsungspf? ( virtual/libusb:0= )
+	lcd_devices_serdisplib? ( dev-libs/serdisplib )
+	lcd_devices_shuttlevfd? ( virtual/libusb:0= )
+	lcd_devices_trefon? ( virtual/libusb:0= )
+	lcd_devices_ula200? (
+		dev-embedded/libftdi:1=
+		virtual/libusb:0=
+	)
+	lcd_devices_usbhub? ( virtual/libusb:0= )
+	lcd_devices_usblcd? ( virtual/libusb:0= )
+	lcd_devices_vnc? ( net-libs/libvncserver )
+	lcd_devices_x11? ( x11-libs/libX11 )
+"
+
+# Define dependencies for all plugins in 'IUSE_LCD4LINUX_PLUGINS'
+DEPEND_LCD4LINUX_PLUGINS="
+	asterisk? ( net-misc/asterisk )
+	dbus? ( sys-apps/dbus )
+	gps? ( dev-libs/nmeap )
+	hddtemp? ( app-admin/hddtemp )
+	iconv? ( virtual/libiconv )
+	mpd? ( media-libs/libmpd )
+	mpris_dbus? ( sys-apps/dbus )
+	mysql? (
+		|| (
+			dev-db/mariadb-connector-c
+			dev-db/mysql-connector-c
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	wireless? (
+		|| (
+			net-wireless/iw
+			net-wireless/wireless-tools
+		)
+	)
+"
+
+RDEPEND="
+	dmalloc? ( dev-libs/dmalloc )
+	${DEPEND_LCD_DEVICES}
+	${DEPEND_LCD4LINUX_PLUGINS}"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in "${IUSE_LCD_DEVICES[@]}"; do
+		if use "lcd_devices_${lcd_device,,}"; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	# Enable all users enabled lcd4linux plugins
+	local myeconfargs_lcd4linux_plugins
+	for lcd4linux_plugin in "${IUSE_LCD4LINUX_PLUGINS[@]}"; do
+		if use "${lcd4linux_plugin}"; then
+			myeconfargs_lcd4linux_plugins+=",${lcd4linux_plugin}"
+		fi
+	done
+
+	local myeconfargs=(
+		--disable-rpath
+		$(use_with dmalloc)
+		$(use_with outb)
+		$(use_with python)
+		$(use_with lcd_devices_x11 x)
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+		--with-plugins="${myeconfargs_lcd4linux_plugins#,}"
+		--x-include="/usr/include"
+		--x-libraries="/usr/$(get_libdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install sample config, and must have 600, as lcd4linux checks this.
+	insinto	/etc/lcd4linux
+	insopts -m 0600
+	doins lcd4linux.conf.sample
+
+	newinitd "${FILESDIR}/lcd4linux-r2.initd" lcd4linux
+}
diff --git a/app-misc/ledit/Manifest b/app-misc/ledit/Manifest
index 7fbee6313fc6..0dc2c9d007fb 100644
--- a/app-misc/ledit/Manifest
+++ b/app-misc/ledit/Manifest
@@ -1,3 +1,3 @@
 DIST ledit-2.03.tgz 24319 BLAKE2B d0a9dfbcb21b54075b61db34035291eaf3df4a337ea9fcf24b8b163d8a45c00b667dd311f39765dc904cbae1ec34e8773dea4c7ec6753796e768a8ee4cbbb927 SHA512 94281ea31d02c046db73bed42a1835826f063ff5d1ff4c374356e37fdf6b1a018f95a6372ece0eec53193aaf2e95c234c509ac178541bfe48dbc6f223f34f661
-EBUILD ledit-2.03.ebuild 872 BLAKE2B 6ecd27a40859d364f3e5e94747d4d040d06daa800d314a106d3ba4a8b63529845861b8358b44f731accbfa9f10003e1bea8dfd3f5c6dddd7810f89587083184a SHA512 6bcc0b182738fc40b2f54f18d7c1ec039aea53e34a59dff5e3d69e665b68c27e7593823b45a87c620348d0abd5ab5574983023a596f0f7c8b5a813282ba05c5b
+EBUILD ledit-2.03.ebuild 747 BLAKE2B 0fc8354c5ddd5b3cbb4645d3a81ea18708248137fa9dd27a9b09f9c7222493e2c9a1ecd789ad9880223bf1b2e9b2d04f7684c8f7086a6da566a981b13745132c SHA512 5f154b0a64c994e9993f367618f45158a541cbea5086aa1ef95efbefff9b3124be690d7562cf5ad00b835829dffc8b290deeb9c6c602bb8045b84c7fb94c8462
 MISC metadata.xml 253 BLAKE2B c787c1044c3f674eb5d2d7a0e830965ad53c7a2c8cdfcd95bece6b0557e35237f62afe28464ebe4c88468cd1fd543627349fd41a0aa760fceed1a7d52386eda2 SHA512 9285e04d22e8e41631e6de00e0ba02842cf0e772cd17a1d7ba3864e50eeea50abb06077ea4f9ac920eab3d520bfe28d389b3d04d5c3529af23a68ca68b6857d4
diff --git a/app-misc/ledit/ledit-2.03.ebuild b/app-misc/ledit/ledit-2.03.ebuild
index caec36f62406..4810b328c9a0 100644
--- a/app-misc/ledit/ledit-2.03.ebuild
+++ b/app-misc/ledit/ledit-2.03.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,15 +18,12 @@ RDEPEND="${DEPEND}"
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+RESTRICT="!ocamlopt? ( strip )"
 
 src_compile() {
 	emake -j1 all
 	if use ocamlopt; then
 		emake -j1 ledit.opt
-	else
-		# If using bytecode we dont want to strip the binary as it would remove the
-		# bytecode and only leave ocamlrun...
-		export STRIP_MASK="*/bin/*"
 	fi
 }
 
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index f03fd0f36bc8..74eeb57e3494 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -12,7 +12,7 @@ EBUILD screen-4.4.0.ebuild 3969 BLAKE2B 9777dcbd9eaadba0a16fc019e5af58740eb10181
 EBUILD screen-4.5.1.ebuild 4116 BLAKE2B 46e39151346890b58663aa75b214a99b96bbfb06bdf9c03cf3c8f99aeea7cf38659fc14e8412bedbab3f32e2c2bdbf70a89cecd1f9708e451b904bfdfde7dc93 SHA512 5b674abdaf9001196c0190359254718f87902cc05b2170a51a3bcca2d5f7c654d78cd98945f3bf15e4374f8c32a4b800f971b3ed4079247d032e39d595c92cea
 EBUILD screen-4.6.0.ebuild 4064 BLAKE2B 6091efb4d2f52bd5c2e128623b86e9ba731afba4e850118225fa8b911814b1e68f3882464a6d29d26effc3067d2417a649db4b4791322e5b122ea26b50e230b0 SHA512 72ccce15b6b5c9407ae311ba6308b03f88eecba8b88b160a1b02430f45e4154754c1c9682e456afda2ed08ff204f60b74668f28db3c8eac33c0576d73c4630a0
 EBUILD screen-4.6.1.ebuild 4167 BLAKE2B 8e05fde741adaaaab0d3aa8a67a5da5d9d9a074ef761790ea23922771e3661ef5863dbaaefc594e7642fc084008f5fd17fc5ab5b0988788aaa3216cd7bcddbee SHA512 9c5688deee107cf15df84b363f783754b4cb4e5e57bf1f362597cdbf04238086a92b68d9e9b1e31e245220df8f6e2ec28919316dc845b56efc50035a771b1fc9
-EBUILD screen-4.6.2-r1.ebuild 4208 BLAKE2B 3c340b61e540df74ab8a8563ba1e70d21cd04030f0d19b662631d1156b7bcff181d3594da1649c72d4841ba45b469cad9e107b71d2e7293396f02313c69bddba SHA512 ee4b7477501baff3ea5d3735c117dfa6f5e3edcd9f43f917a5f6b471eb081338f9f3d20f3f2c34b784fe1616f5d124c072d394fc87134a527d14d308f6a9f21d
+EBUILD screen-4.6.2-r1.ebuild 4215 BLAKE2B 73e4c692b3f9434eef54feb71b1d162a689821c20ce19f4a36312737b92f273278e9c4e8fbdb6322cb57a88a3d4132145302fed8b47d9b3f1c3688c0bb0b5f89 SHA512 fb99d0723356ea2c8dfdd2ff77a345322ba41aa8bd05064441bfa8da3f1e1e9c609d2a9816f781b88deb77bd478f65efc7a946ac388b5327cf1ca2ceae216fe2
 EBUILD screen-4.6.2.ebuild 4216 BLAKE2B cba3196d9686f6141b748ce488da66b15cf2a238df269f296e906a5b0f4757e5c68596e3d709ccf5c4608026e796fa8b0dfb652cc7bf2aae313145b315ce10ec SHA512 768286ed5deb2c591d1a1c221f5a66f372915dbefdb17d1c2f3a2a6859e7b309010eba036334b541313bf6769ca3669fdc22c9013869a6e3a0380ccb743d2d29
-EBUILD screen-9999.ebuild 3986 BLAKE2B e40e9ca5125c3e788e9e8346bfbc124d94b28bc6a2f3cc13f2d12313efc883371c5e4bfe13ff77d0f4e2ff5c23a06d043501a8be35b8b40ea7972bc2d445bebc SHA512 e522598323cc369af7cd5e3876fbece8beb92c1d65a3075ced97753d951f30e4a4134e9e88a0d42bc7f32b1977f3fd08aaeab2b4b2d9bade370e8346181d17fa
+EBUILD screen-9999.ebuild 3993 BLAKE2B 0038fb3524378b7c672630820a2be775b5dfb83078af2e15bac10c03e31b518fc2d080be04fbb522afe5c7b3f4bc862d2e70e151be2e44f019614c5080a407ef SHA512 33e579357624287f8646469ad04aaff1049988b7affdf82b2e3511d76401ab9007f6554d7fa905c5c3df4095ff4bc2981cb6387cd939f3308ad6d5778e8300ab
 MISC metadata.xml 1836 BLAKE2B c91b439cb8e6301a8e7ac000f58616a6a383180671dc721b3ab74d74c826a85ec9f3e5d0d70a450a3a46430b47eb6dfff329a0d2489f4dee861ea1575f08e9c5 SHA512 39618ae8527cf9744132eb2a0aefe5f0b4a400784288661e74b670b149bf729001c950408b765a6cec0330c0517063732c7e4b15270a2a2a5d971d2e0475f21d
diff --git a/app-misc/screen/screen-4.6.2-r1.ebuild b/app-misc/screen/screen-4.6.2-r1.ebuild
index 5c29400df81f..7d14914a8680 100644
--- a/app-misc/screen/screen-4.6.2-r1.ebuild
+++ b/app-misc/screen/screen-4.6.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/screen/screen-9999.ebuild b/app-misc/screen/screen-9999.ebuild
index 92a319ff1fa5..3bf613acb96f 100644
--- a/app-misc/screen/screen-9999.ebuild
+++ b/app-misc/screen/screen-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/screen.git"
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index cbc10616fe49..1a9ffa3f5e17 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,3 +1,3 @@
 DIST sl-5.02.tar.gz 5353 BLAKE2B dd8513bf22cf209fe69e28b4f3de5b11db6cdb8afe375fd32ef40c7b21b2ec39dbf2d71a260c13fd440219fb1209957beb1026d065628af45f6f2ebd0437956e SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
-EBUILD sl-5.02.ebuild 877 BLAKE2B ccf1acc3170f6c46f76bdd10f2e10c618d453b099ba43fc18225373b1e47be9c73d5416fef9c481b892cf653356dc36d084a2de7b300e958cc0c472ac9b7bf62 SHA512 f3866e623999c20a2d160a6b14c43c36d0a835370fc25a14cc8c2e6dc312091dff9bfec2f0e49880e338b361de92b15b461a74a1b3964f6bc214647a7705996f
+EBUILD sl-5.02.ebuild 881 BLAKE2B 1a6b15f9fac397f14656b2f03ed0bae9c67993c135fe516346912091ac94446cd504fdd32f9baff58d085e4521957fe2d6f39fbc0227e0d201ebd30821dbf2c5 SHA512 527ea26d67b11ce6f18231aa321a69967427e598f5780f7717c55c10802dd087fb9291ba68a4d9e63932a23906776163da267162d700a661cb0db4c04ec79d01
 MISC metadata.xml 607 BLAKE2B 340be599aa5fc6dbf2f9848c0514b15dde7fa7daf94006c97b39fa693002157472b6b653fc40de67bd8e6fe0f1c2798769790f5a7ebaccff63e4035b7a8255eb SHA512 7f3cdb880453bbea4ae1cc7932e640331ec88693dfac15ab059e6579648834a958e20e8d1396c1beab386247c95724abad199ec7cd607e5fd66c4fd519bb4a5c
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 223474eab81f..0ec822115ca5 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Toyoda"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~riscv sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="l10n_ja"
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/app-misc/votrify/Manifest b/app-misc/votrify/Manifest
new file mode 100644
index 000000000000..167f60bd5d36
--- /dev/null
+++ b/app-misc/votrify/Manifest
@@ -0,0 +1,3 @@
+DIST votrify-1.tar.gz 6936 BLAKE2B 7c9a5668842c5b1783e5c8b2341d42aa21257b96a82210c16e44bee8f71b690c7dba5acf48a39beff0189106db1fe141ef1ec30d68f25573a19a53c12618d346 SHA512 14fdb4ee185d96f416b47df7b29175cebc6e003aca7c1faf927b258f7dbe39b7ed69c4defb25900c6856b6e9abde3b03a69ca02152755d8532708b6cfb7f51a0
+EBUILD votrify-1.ebuild 922 BLAKE2B c5432dc33657da9ba22fdaad4b19d1e2d601e3b9e8b54198d0552d29cb857d7d73ee8034e7691cfbdf4217bb38c5b4a9a6e07da67fa5d0f59eb20408712f9109 SHA512 e43e607cb3bf8e8aa62dab8e96a7da93f1b874760125e8486af376f831e565bae66c9b7c97e3087b3c9811b9e7c52ec03610e7c8da18ba803788978f455373a4
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-misc/votrify/metadata.xml b/app-misc/votrify/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-misc/votrify/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>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/votrify/votrify-1.ebuild b/app-misc/votrify/votrify-1.ebuild
new file mode 100644
index 000000000000..f067073ac0cc
--- /dev/null
+++ b/app-misc/votrify/votrify-1.ebuild
@@ -0,0 +1,36 @@
+# 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
+}