gentoo resync : 16.02.1018

27 files changed, 36 insertions, 520 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index bc6533537f55..d1f3ba9cc154 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ccze/Manifest b/app-admin/ccze/Manifest
index 9dcc28d841a1..022bc203e783 100644
--- a/app-admin/ccze/Manifest
+++ b/app-admin/ccze/Manifest
@@ -3,6 +3,5 @@ AUX ccze-fbsd.patch 531 BLAKE2B ef16b94b4c1a94a3385b3b21c6c1fc51a463769de06f65cb
 AUX ccze-ldflags.patch 424 BLAKE2B a769c1c617b7f421a0cac4cdb3141169eca8a0e23fd384b4bac702a2f84c15643e2a780eed2b706540a88b8c881227592caf588d1278148dbf8cec8e55dd3847 SHA512 7dff2e235acc665abcc3ed35744776e60a336b45cafbd80e3f4707f61d3746821e63949e73c32ee4fc5ca43b5639a816c42bb5e0b08912a7c617744dff39ec07
 AUX ccze-segfault.patch 660 BLAKE2B 863fa14c8ded2df423b0ff5cd9936ccb390b11d3b0dfa396d515e9a85e411c9f9f7f3ba76f04c4ba04ccc19cc43594f4d304b54cb2155ef44ef08c9c00d4b691 SHA512 e8ebdbc8293b4d765d683bbdd222c0af3aaf0668ea8376ed830efac3cdb4a99dfc75dda6e59b95e7a36b7ab4fc521a9a1937e4ab9a48218acc76d2b02844b900
 DIST ccze-0.2.1.tar.gz 139795 BLAKE2B 112e3968ca00bdb9ebda91b30a697f4422935755b3bf33d47c0a8800f3d05e371a4ca4db0ef52f10e5cba1c537ee3f666479103dc88a30f270c76268fece5cb6 SHA512 1704da8d4c97a3403a57d7841db8a6e4ba6116e401f91d9ecf1b1371cc18b40641e5665c9414740d6a523874be6b6527f5c0d4f3a3796c7b96ed83192146b2b7
-EBUILD ccze-0.2.1-r3.ebuild 946 BLAKE2B a10072f19126232ed62677066e2acb0805a34492a902ad8cb5e0d03a1f39647b8572fc7444d116be0ebe5a01b199926921d0c7db8d15bc4327debda761c4470e SHA512 2aba3653cce66c2a95a960b0cbdcd7cf24e60b6340fe2f5b03cd2d0fe98fd5f52be1ae6691b184b594d6377f442b136fb0b95459fb4b2634658c62ca3c5a1b59
-EBUILD ccze-0.2.1-r4.ebuild 935 BLAKE2B 8de555e2a3e49bf935e8ca65e816c8346decd026e704353b5b597677df35cfec1587e704cf4b45bb141fb043e72f4cab1727c98aa79371e9911b8f333c14d80b SHA512 52283bdd30f196c27b6c8b041f7b7060e52741dc914520a00e483a16a0dfdf8044672b55d139eee9587b37ea2397585d8846d58a7042b53689ae121cd002937c
+EBUILD ccze-0.2.1-r4.ebuild 934 BLAKE2B 044fe28bf9d82531a8e6594f092f1c1f8877f4261c2705a1dfb5f4fc5f6f80c94c61ab83c837d806dc1a6a1f83dd3222024d017205b80fed75dc7a266bdbe7c8 SHA512 63dac9b987a313e87f4553d00c1a88e17c7f849d7ad207a0f3324227623aa2de2195dc1736bbbaa7fb9f9d1423ce02f87630b377c6cf3f09fc4f0931d99cd07e
 MISC metadata.xml 492 BLAKE2B a2658f32b8d62f60965cb71d66e3bc90c4d0aa03d4e53bca596de964c63bcd0b157b9e407ca91f789457731bf62d0d4b504376917acdf2f95b76a63bc513c29e SHA512 96d871b02eee0348e6d62f01bd25deca9044248f0f495be24fc8cadd30c16ef933a285e250f58d58b47f64eec8f964de2ef243617f66266a655cb83f02acd8d8
diff --git a/app-admin/ccze/ccze-0.2.1-r3.ebuild b/app-admin/ccze/ccze-0.2.1-r3.ebuild
deleted file mode 100644
index 94fa5efed7b1..000000000000
--- a/app-admin/ccze/ccze-0.2.1-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit fixheadtails autotools eutils toolchain-funcs
-
-DESCRIPTION="A flexible and fast logfile colorizer"
-HOMEPAGE="https://dev.gentoo.org/~joker/ccze/ccze.txt"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-libs/libpcre
-	sys-libs/ncurses:0="
-
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog ChangeLog-0.1 NEWS THANKS README FAQ )
-
-src_prepare() {
-
-	epatch "${FILESDIR}"/ccze-fbsd.patch
-	epatch "${FILESDIR}"/ccze-segfault.patch
-	epatch "${FILESDIR}"/ccze-ldflags.patch
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-
-	# GCC 4.x fixes
-	sed -e 's/-Wswitch -Wmulticharacter/-Wswitch/' \
-	    -i src/Makefile.in || die
-	sed -e '/AC_CHECK_TYPE(error_t, int)/d' \
-	    -i configure.ac || die
-
-	eautoreconf
-
-	ht_fix_file Rules.mk.in
-
-	tc-export CC
-}
diff --git a/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild
index 5386743c1020..a84298b4a5dc 100644
--- a/app-admin/ccze/ccze-0.2.1-r4.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r4.ebuild
@@ -13,7 +13,7 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="dev-libs/libpcre
diff --git a/app-admin/clustershell/Manifest b/app-admin/clustershell/Manifest
index 8599ad260b02..294bff02da5e 100644
--- a/app-admin/clustershell/Manifest
+++ b/app-admin/clustershell/Manifest
@@ -1,6 +1,3 @@
-DIST clustershell-1.6.tar.gz 950548 BLAKE2B e6b2eb236537b23e86f0942b56db3bab7d970870febe76b7dd80719f90d5cd8ac5c0b059695110f966fc3423b77c289c0b951e8c329f33905175004ee811b723 SHA512 d94979bf5b5ead406f49e4ba691cf8541c03398913eb2fb9da724f50ba8b47059b76ddb6058dc5aaea86bbc8588b4d9c75cc34a8a7a94dcfa184ca73250c3b02
 DIST clustershell-1.7.3.tar.gz 345447 BLAKE2B 45bf059670a71724d8614f9b084c5e865daa1fb8dd2268e572d1a30b4d69259162fda8ee22eb2cc22261773c4e34849d345147de76c1628422f6c326b746724d SHA512 acb8e8a5b4a576ee93fbe23a8d903bab813f4182b50d9cd752b3684c743e611d3ee3fcfde31818c0a92495a3ee7640094d4568a03fdbf543e398a1b741a978d4
-EBUILD clustershell-1.6-r1.ebuild 953 BLAKE2B 29d90f4d32e0dde737806c2d7a59c6891b0d3734ceda694f369ab9685a42f9a922d1f7541aa41f8fbb56428ea329dc36fa50143cc8ab83aa5d3955cb8f6f7030 SHA512 cd8694812a01006f3f66a797bad01037e22d28a581c286fa0d22fb1ad44bf13ee3c44278d1c575b609854094aac2f928df62a38d82661157935ce96c15ad9269
-EBUILD clustershell-1.6.ebuild 886 BLAKE2B f9bb4cbafde98c9c7e6bc217ec8b77664f9fdf2e92a51d4314a31ff945ca467e199a5bb63712b598a390eeae4780bc6032b5db3392500bf7d670688035cdf68c SHA512 4a87ed707eb37cee226e8e8e432e9445398903cf4df8d2a66447383b60ce481e048de427b8d7fc8c5d27742ea6a8c526d444581dbe43e26b35eb5a1a703ddff5
-EBUILD clustershell-1.7.3.ebuild 1178 BLAKE2B f34c186c9d67313ecd36c3f30e738d49cbd06b40a0554742963bbcf57b3a63b391d713e48b3e98b42122c5afbd6ea71ebf35512852ef5f8472e03fdf967e8339 SHA512 acb24ccfff54f345d031380cf344db5a8e27b31ec294b299d226d71547df80b1bcc2670ee30f55e1bffaf1e204f7d3b30ad5a482731bad2f847ea162c4f0e4e7
+EBUILD clustershell-1.7.3.ebuild 1173 BLAKE2B ea5a8fc3b8a07552fc295e4c3bac4e24d00959fb30020efe17801400cb6ebf052bc3eaf9e8707f9e47a33a846f04539bce353ee5d6998ff760efff7fb81d2fc2 SHA512 0cd208f2643fc69d7fb3851cfd7ab4ffe5cfee310fbdb8579db2509303f57c53b45a7dee32972d4c1511b6866d93633237d44da0f5818c2840cd908e336e8d8d
 MISC metadata.xml 257 BLAKE2B ab7ed946089a6a737244d144e97b9ab34ee6bf812bb341a994d1a3552d15c20186311322905354baa6353bed45b2248709e801558bc4c64a207a204f7e374e92 SHA512 a24cf6411331ed58ac1395d5f10e85530bbe2f7d9ca09121ac8e3ed3b518ad8b31ad50adb903404b41749c089bda33aa34bd28d8ba0da0b1f1b36620674e77be
diff --git a/app-admin/clustershell/clustershell-1.6-r1.ebuild b/app-admin/clustershell/clustershell-1.6-r1.ebuild
deleted file mode 100644
index faa5e3e63f9c..000000000000
--- a/app-admin/clustershell/clustershell-1.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: test phase
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit distutils-r1
-
-DESCRIPTION="Python framework for efficient cluster administration"
-HOMEPAGE="https://cea-hpc.github.com/clustershell/"
-SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc libressl"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	if use doc ; then
-		local i
-		for i in $(ls -I man "${S}"/doc) ; do
-			dodoc -r doc/${i}
-		done
-	fi
-
-	doman doc/man/man*/*
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Some default system-wide config files have been installed into"
-	einfo "/etc/${PN}"
-	einfo
-}
diff --git a/app-admin/clustershell/clustershell-1.6.ebuild b/app-admin/clustershell/clustershell-1.6.ebuild
deleted file mode 100644
index 6a13780d51c7..000000000000
--- a/app-admin/clustershell/clustershell-1.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: test phase
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-inherit distutils-r1
-
-DESCRIPTION="Python framework for efficient cluster administration"
-HOMEPAGE="https://cea-hpc.github.com/clustershell/"
-SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-C"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/openssl"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	if use doc ; then
-		local i
-		for i in $(ls -I man "${S}"/doc) ; do
-			dodoc -r doc/${i}
-		done
-	fi
-
-	doman doc/man/man*/*
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-pkg_postinst() {
-	einfo
-	einfo "Some default system-wide config files have been installed into"
-	einfo "/etc/${PN}"
-	einfo
-}
diff --git a/app-admin/clustershell/clustershell-1.7.3.ebuild b/app-admin/clustershell/clustershell-1.7.3.ebuild
index 3756006e28cf..7c96600098cc 100644
--- a/app-admin/clustershell/clustershell-1.7.3.ebuild
+++ b/app-admin/clustershell/clustershell-1.7.3.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
 
 # TODO: test phase
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/cea-hpc/clustershell/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc libressl test"
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-admin/drush/Manifest b/app-admin/drush/Manifest
index 65e2a6cec52f..ff06ebe45903 100644
--- a/app-admin/drush/Manifest
+++ b/app-admin/drush/Manifest
@@ -1,5 +1,4 @@
 AUX update-bash-completion-script-for-2.1.patch 1332 BLAKE2B a54fa2cab268542a37f1020012cf7744106966419d2ba8415a2e2ead882feb3f3dc9bd9b1ab17f8592e5d021855f5361b05304efcc810362224935069ef1b897 SHA512 2e19a6be652684c1b1a2a9d6605c1404272391950408cd6ae964b2bdd9f95b1e59deec5111c1eaa563a92837ea394fcb2315a3032b2ab02996509b98eb7d1cf0
 DIST drush-6.7.0.tar.gz 511581 BLAKE2B d3a589e3de35afe120d790f96ffa7e88b530da1e1d04815b1dea2f05cd081ad7dc6f4b39fa6f19b5620b9913b952ab289ec538f1b7c0c0f298d3cd0129eb7026 SHA512 203870190dd8987ad3da71f7625476c1f94bc75513447a740fd8c16268fb9705bcbc3b2bffc49a44045998e3fa49fd5ee9d4c0634a1fb39605ba8e10b7373fa5
-EBUILD drush-6.7.0-r1.ebuild 1716 BLAKE2B 6323bd830e199edbcf39a74b6ddaf0b38816678c43a6245565db2999236f496209859f88074920a86a8647ff653e3d603c032cd4cd79ca37efe893546d0baf83 SHA512 b766666dfce86612ae691db158f0ca340025cfca28e5d8ca55020bdc762cf0ccb73cb41d37318c962974df40695b3d8fab5fef6c9f1bd4a453806d0c79d7aab8
-EBUILD drush-6.7.0.ebuild 1705 BLAKE2B b53cf220834579345e124bc469aced5fafb5d609090db5c545436859d8107543807699440f39577ea95921a47c14e64d512ce90867945b07f0bae65e78f5de19 SHA512 1c6bd5d2c9af395751d9deefb08fcd35dbe38be0c7d9df2e5db68d6aa9a732dbb326da1b6d2f9b548a16c14120b2f7c6d59ed810c53f4f75c24ff02827da97f0
+EBUILD drush-6.7.0-r1.ebuild 1711 BLAKE2B 8ad6c7143bec3f610501d56a72c589e72177ef2efa8c079afda7789e44ae424463ee372cca082467a5da12889e35468ec8805bffbeca71a70ee34b9843bd0910 SHA512 b300dcccbdccf48c1f6b03c15def89d116fdf06b4704851b5e5723c1535e4db3508717c9bb61b11ca37406e8a430aa8d34718b3e64ef05a99d046f9a9340d3c3
 MISC metadata.xml 531 BLAKE2B f28505f228108046c5a667d98863fe5b77e3ff8a994d3613a34bcc6666d041451c419a0f43b6792c376e2a0749dcf5dfd42e83781ad2db6b1ba6f084bee00b1a SHA512 27cfde1e0c618050f645abf589511ccf87675ac00da8eb147b6a38d1e48d0d688fef2310ec015d394a202b56b3f09aca32b6d6c9bedaab98e469139349472aa4
diff --git a/app-admin/drush/drush-6.7.0-r1.ebuild b/app-admin/drush/drush-6.7.0-r1.ebuild
index 41d92ea52559..dfe5917b1f25 100644
--- a/app-admin/drush/drush-6.7.0-r1.ebuild
+++ b/app-admin/drush/drush-6.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 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/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-admin/drush/drush-6.7.0.ebuild b/app-admin/drush/drush-6.7.0.ebuild
deleted file mode 100644
index 9052c38c745c..000000000000
--- a/app-admin/drush/drush-6.7.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="Command line shell and scripting interface for Drupal"
-HOMEPAGE="https://github.com/drush-ops/drush"
-SRC_URI="https://github.com/drush-ops/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php[cli,ctype,json,simplexml]
-	dev-php/PEAR-Console_Table"
-
-src_prepare() {
-	# Fix the bash completion script, check the patch for Gentoo/upstream
-	# bug numbers.
-	epatch "${FILESDIR}/update-bash-completion-script-for-2.1.patch"
-
-	# dodoc compresses all of the documentation, so we fix the filenames
-	# in a few places.
-
-	# First, the README location in bootstrap.inc.
-	sed -i -e \
-		"s!/share/doc/drush!/share/doc/${PF}!" \
-		-e "s!README\.md!\0.bz2!g" \
-		includes/bootstrap.inc || die
-
-	# Next, the list of documentation in docs.drush.inc. Note that
-	# html files don't get compressed.
-	sed -i \
-		-e "s!\.bashrc'!.bashrc.bz2'!" \
-		-e "s!\.inc'!.inc.bz2'!" \
-		-e "s!\.ini'!.ini.bz2'!" \
-		-e "s!\.md'!.md.bz2'!" \
-		-e "s!\.php'!.php.bz2'!" \
-		-e "s!\.script'!.script.bz2'!" \
-		-e "s!\.txt'!.txt.bz2'!" \
-		commands/core/docs.drush.inc || die
-}
-
-src_install() {
-	# Always install the examples; they're referenced within the source
-	# code and too difficult to exorcise.
-	dodoc -r README.md docs examples
-
-	insinto /usr/share/drush
-	doins -r classes commands includes lib misc
-	doins drush_logo-black.png drush.info drush.php
-
-	exeinto /usr/share/drush
-	doexe drush
-	dosym ../share/drush/drush /usr/bin/drush
-
-	keepdir /etc/drush
-	newbashcomp drush.complete.sh drush
-}
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index e79aa1a45c2f..3445b4fce6e2 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -15,5 +15,5 @@ DIST hddtemp-0.3-beta15.tar.bz2 256372 BLAKE2B 1c928234c36172c387a002190045cd050
 DIST hddtemp-20080531.db.bz2 5627 BLAKE2B b973a981ee55033c8ba190efd9dc8586589292ef1f2b00542be7db2be64df812847665abefc7517f7c71dc70df153766570f62b69fc4891e758e82200ff8d589 SHA512 cd03cc300aece4f7427fde1b58840643c8e41e6c0ce30b418a62bf44b268f249ef3dc4f5f4bcbc9cc0cfe0346c18d4f1da22451c87efc3d46faebcb81a1fe059
 DIST hddtemp_0.3-beta15-53.diff.gz 52845 BLAKE2B ae4ef1f98ff39a39bdb49b2752f6f442c6ebe8ea6b0e8e743cc3ab9ef39d07abe8970648b841b3974cd814fdef72bc59cfe93c4b4d1cf2a85de1a0d94c4409b9 SHA512 1006ffa92f9973eb1da6444f8e8eed681e641efd17a52954b0e6c5041ecae13108af4ed89534ec4f2799685f96191769d3b168dbbb96085dc801150c7c547511
 EBUILD hddtemp-0.3_beta15-r26.ebuild 2972 BLAKE2B f273cee116ed77f85fdedaab31f82c6a7bd109b306a9d56745767050cc65ed79c2b28875f934b02fbdde87db6e8e1185605525f1562d930d3b5eadf8bc4edd0c SHA512 64c30191b0103c410b9d8461c283738a56ccdc09b7fd2f9d8ee3f4e05f1a16768d2e94fe74f7638e1ed8c3852976a19fe9f3766581c49ed884f686495eca1bf5
-EBUILD hddtemp-0.3_beta15-r27.ebuild 2991 BLAKE2B 556468d34208d67522e78fdddad3b5318667ed9748cce1c92e866c64328093c4792bed972e85b4fc21e7b6a3764156a7dd71586d901b365d7e95701e24589fc1 SHA512 d858e3a4bdcbb7f977ade669fe7a6bc6742beab7dbae8ed2da94bea5d1fc935cab1b78faa9d7f5992f483cae287a3c024007e838e14abe95774000fbaf980bb4
+EBUILD hddtemp-0.3_beta15-r27.ebuild 2990 BLAKE2B a3093ed1cf842ad8507a47ddc8682e5d4c4de85c3175a24511a57cd7177b23483c8f4b5507f5cdd1e7d791196a52c70b04459605918b44789dffe69dbe177321 SHA512 945b92e2b1db392d778379e35aff1964ba7e0e8af3caa1bc5a05a9acc50002fb299e25319230bc5cec79f173b7591af632233db5b40d18b8c068ac1e36b530ba
 MISC metadata.xml 260 BLAKE2B 41040f0f9342dec7a3993d99bd9fb49f624c8fc8a0be036b3c2e3f2f20d4182d23c5b98a5451f5d2d6906d749b7756b7ec10b1e135bfa7b1633234ebdae1370a SHA512 480d8cf7f249c083d64b11e13bd93b42856531860afa935a9265bfcf9491fbd3997a9b9d8e90630daba103402fc9aa08c63ef18091cd6ee68310c0a8f3c38af3
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
index 68a009f85906..452d3013ada1 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r27.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="alpha ~amd64 arm ~arm64 hppa ia64 ppc ~ppc64 sparc x86"
 IUSE="network-cron nls selinux"
 
 DEPEND=""
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 8b7fabe13e8b..0a9d3d2682f7 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,4 +1,4 @@
 AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
-DIST passwordsafe-1.06_beta.tar.gz 14295034 BLAKE2B 83f480eee16938e396fa01797f67f5bc61984414b7f38b91404caea3dd6b3d31ba0e2ce4d198da048dff9cf1b5c8ba04e8bb9c93351fc21552bbc05a3b9ba486 SHA512 2a5be46e0e90f98c519bf9137f32298672359d1bfeb081a71d67251b35da6c1157e18c35a2c84321ed3fa077cb15ebf9cee763ba13b201ce02965d6642bb246c
-EBUILD passwordsafe-1.06_beta-r1.ebuild 2087 BLAKE2B 51442c27c4fd34a344c5161253104425fe87eaa4084aeb45c2833b9b00498ed584cc8e4387585d52363f3942e2a8403374ce9e3fbc8caca2c0016413f5075d94 SHA512 c944d9a70a6a112c93ac76feb9a225ac49ba712188c2900dfc437f1dc3a5902055fb449c202129d2080d5a546cbd9092b85a0bb919b3742bd0143ef55b0bd43d
-MISC metadata.xml 778 BLAKE2B 5387ae1a60b8de35a2a845146c8016d8677e2b7381d9f1f2f7eb8c18b794969f2d1448b591885b978c7641a7b9ebf751c660fffe8780fbcd5089111c88918674 SHA512 29e765d326b3c165c0a649da8ba5e6be57a0dfdaa12a5b25ba8bac44c868638a24a6a9c8bbb27638d7f215841548577658e139d9abee0f3c61d1e96c3dffdacf
+DIST passwordsafe-1.07_beta.tar.gz 14385043 BLAKE2B aaac006fa381487e281c9c7385569002743f809007bb542f9dcb503a5d5678c6456cc604b20ce01de46b647819fd0f08017a2c9eecf932d1c52efd416670448f SHA512 229599e684963d3a9f6ad724292d4f723bb8395742d5037b1b67d059a2258a65b52e56ecdafa44b420e69f7c861d46c20b73e98974dc29151c22ceb84eb40934
+EBUILD passwordsafe-1.07_beta.ebuild 2252 BLAKE2B 0f000127aa0a2565878b847eec2329018b8bf4f53a9dc367d4d1c5f708c86792247c18c338f6bcaf96c4c84c68addfeec1ae60992b564d5e2c941c419710df53 SHA512 bd85b61a2f17b9eea2626d03ed50308ffe01cecadf3d4b1d653d11a45754ffc1ba57f3ba768b1b991af1865edddd747d55a8db7c43b17c0a285468e4b4d12388
+MISC metadata.xml 859 BLAKE2B ebc13e88724302e4f2142d47f49f2c44e7f50c07d4219e06416c0173d5dcef313de1a9c6e71175da3c76e3377737b7369ade779f9ff94ff7d9921acaf4c69267 SHA512 14f66e229196c8c49843a17bd3f55181e0a77b6cfa223b1a776809380cb49c245ac1d61990f42967bb83be02c4dc68fa489a2485c6c52ffec7f5a8386d6db3f0
diff --git a/app-admin/passwordsafe/metadata.xml b/app-admin/passwordsafe/metadata.xml
index cd092820b048..caf84c81f265 100644
--- a/app-admin/passwordsafe/metadata.xml
+++ b/app-admin/passwordsafe/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="qr">Enable QR code password display</flag>
 		<flag name="yubikey">Enable support for Yubikey</flag>
 		<flag name="xml">Enable XML import support</flag>
+		<flag name="xvkbd">Install <pkg>x11-misc/xvkbd</pkg> on-screen keyboard</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">pwsafe/pwsafe</remote-id>
diff --git a/app-admin/passwordsafe/passwordsafe-1.06_beta-r1.ebuild b/app-admin/passwordsafe/passwordsafe-1.07_beta.ebuild
index 1a344e260218..97a528cdd457 100644
--- a/app-admin/passwordsafe/passwordsafe-1.06_beta-r1.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.07_beta.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,17 +15,22 @@ SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="minimal test qr yubikey +xml"
+IUSE="libressl minimal test qr yubikey +xml xvkbd"
 
-RDEPEND="xml? ( dev-libs/xerces-c )
+COMMON_DEPEND="xml? ( dev-libs/xerces-c )
 	qr? ( media-gfx/qrencode )
+	net-misc/curl
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	sys-apps/util-linux
 	x11-libs/libXt
 	x11-libs/libXtst
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	!minimal? ( !!app-misc/pwsafe )
 	yubikey? ( sys-auth/ykpers )"
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	xvkbd? ( x11-misc/xvkbd )"
+DEPEND="${COMMON_DEPEND}
 	app-arch/zip
 	sys-devel/gettext
 	test? ( dev-cpp/gtest )"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 986c3718453b..4edea61f971d 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -11,16 +11,12 @@ AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8f
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c788f1b01a3e62ba90e477b754601d2c085228e084363ff20ee39728b02ebe8ca83e17f7c79dddae1c3968aef4e320 SHA512 ff7accf70b1d4de7282cf3b41246151c49c4758a41ace56a470e4723749638027011cf170747e66fa5812280e1612e754e12d92dd35fa6c93171f7187bb9cfa2
 DIST puppet-5.5.10.tar.gz 3064457 BLAKE2B 04cac9cebc03343b8c6fcf762f681f63bce4ebe27b6e7e727d06b14f0013a6c4b0ed7ff793e01b170931a881a921b4a2f107a5e37d1ac9394046f8611a7adaaf SHA512 70a5684289fc576853bf908adff44c1b1ce4b37d71236e7d7a8d140fa0e3cdd46a4b570cc7e493a3f47641f6be0c3b736ab04a178c30cce4244abe686378bf4b
-DIST puppet-5.5.8.tar.gz 3056987 BLAKE2B cfb0599f5a9a6f254b0e853ece390dcc4fb3e8cd40956955b81e9dd9ae3c3c39c18a0f5f010b269c8c21f1b288f50c354e4c40cd0cbd3ad3128dd95c3c7d0cca SHA512 2ed960c0fcd4f6b0a7eacfffd8bc3ca88387bade0ce5ac6cbb247752f18927959286b1238c146d3d2bda7f8bee171fc502b44b129c4778feafbda90d993ee816
-DIST puppet-6.0.4.tar.gz 2804651 BLAKE2B d2e685938b57ec896446a658d6a115f999b2254064711ceb6a139da3c5ffe488ba2dbd2da39b3a6c889027d971f44ff4fc99f87ceec95cc8b79eefc86f43f614 SHA512 fcfc0a9e1a707945c89e3080c1795511fd28143576886552d8e3635d62f526d0b3f9ed2a400ecc0084b63906246cb86e176b288ac049d01d0f9cf47fc65fe332
 DIST puppet-6.0.5.tar.gz 2811469 BLAKE2B de25af69b387a02b68fbb31ae13a9fa4aea8f25dcef32bead662e708060909b2f10813c1e889372a9167cb7a10b084679c20b5fa8312d2e06e2b53ebd573082a SHA512 0b34a27a0c21d24cf22e442b495dcfc49ac8b78e40f83eb9eb7f8b82b29350be436a63c6c9c9e969fc3d16096ccb927ca3c4d11e64e51d1e50150001d015bdbc
 DIST puppet-6.1.0.tar.gz 2818606 BLAKE2B 4fb6b26e5c3711262ff2210c9a4e9a9df0f47f4a989526a79cc36f56fa939fd4e54e41f3afef818aacd4630daf559f1ded7e2f6e3cc258a005a848b4d49b64ae SHA512 b82d5f5b045e23543a26949d9faa7ced78f1413e7699d124dd43a56b8558232d6f151a9fdbe52e1959900eb8fff7d7e873fa7ce986206419a27a7627a56f91f6
 DIST puppet-6.2.0.tar.gz 2821615 BLAKE2B 88b8ec856cfc6dacba5dfe44da7abce56a351f514057d3c916ecb5f4188703713cf7981984c2a59cb8073da93eab91a815dc2f52ee4f621c9a412897e9387d5e SHA512 91540169d3c9c1715e78b416961f4f3957a01b0908c3b675fa75226361fb8161730ca47ed98a2e958d8841fd50086c75489c5ee53b41f933392f399d502bad9b
 EBUILD puppet-4.10.12.ebuild 5623 BLAKE2B 5653e7a7ff00a41e59acc42da38a47f78c25e2befdf034a7697d6cc37b1b0c7236a7f0fe6a8b0f224b08905d2fd74e20e8fb43e67e7dd1c3afc5ebaf3fe357f3 SHA512 4ea6f32bd809bb4e8ac90b2cb6205cc464dc9ea3cb97fbe3e14deb6890a04e9095f3d9896a99663ecd0d57a80df16b283ad8c55f8d0f11d1bc4eecc477a245be
-EBUILD puppet-5.5.10.ebuild 3826 BLAKE2B 5c607670362e772e049e9c4789895145076fe3666abb893d4f5a862ce644c0434146f3bba0e4d84264c6796abc3c534f48ca3d3f7d34bdcb489b7b0a0f8981c4 SHA512 30546929c45f9eb178bdac4eca613ede8bf6ebdd677b1046b785ac540081dc98c8bab9f19782c815066e2daf591a882258f7af7dba4d240087eefda62992cdad
-EBUILD puppet-5.5.8.ebuild 3824 BLAKE2B 907719041ed40a583a9edc42a0e8cef3a3e9d6853bf0c9199f488d86aa04aca729eb9fc23c7ec13ada04c0c9b834763b7f2f342a3820140af2b904bfb989f2dd SHA512 5ef99a7afc0c99be4df265be02f107705236824226c7a681e8ccf96a566364025c1407d78ec99a0ae9a2c6de4988d730d4b0721ac293caa02106f1ad962c1d90
-EBUILD puppet-6.0.4.ebuild 3655 BLAKE2B ff22ce68512cbccbc58d07d2331c96382f512f926fe5e7e98d410d30bb053f54ac5502588d7caa965d3e2377a63967d5ada26e74a4a312f3db6c70564dd63a2b SHA512 d48c942a3205aa72ddb6b44afb46b86bde21ead50d58c9c5ab33b8f7d4a4f62f8d57932d022a0baedc903c753b19e2ee75dbde68dd261f4ede034747e4784cc0
-EBUILD puppet-6.0.5.ebuild 3657 BLAKE2B 348472cfdac195d18c5fb0f0430c64f9c8a91c5e912cdba02c2e229d66894f9c748fafdca0a5c77a7b8a861ae8ce8dd31fbbf37f1ae6ba3599707baad503034d SHA512 1ca964aa0fd78fdf7459383e5d1bad770c60908757ff0216e240268ad02142a18e91eb57562841819df459716052cf4187f4fae7b2186cc5eeb6f7152f1c0bc4
+EBUILD puppet-5.5.10.ebuild 3824 BLAKE2B de47036b3db77506272ada8f0ec8af05a69a98e75e9d8c78ee767ba82b2762d639bc7ef2d7b51b19622766bc6cbcceef43890c2aaa25a91dc6841b3ab7507bc7 SHA512 2b0069346f7b4891d8158a9c1a3a7d6190d2e4854988bbfab4cec1815cb797be0a70a13748cd974097f56a3073c00eec8e6a1f25dfad987e622634077c15565d
+EBUILD puppet-6.0.5.ebuild 3655 BLAKE2B 6589c4e2d07056f8949e942e54edb401842377263462f7c0bbdc66c907dc038bac06296b6479c22919d0a4740f0f61e443623823ff6517759d4188f576ec01e5 SHA512 221ea214e4222aff478bd3777e468d1cb377b23cd0008d9fc25cba7f5a1114e7d3f475e7161d1d0300d49b472e26a1be4686f5c9a90aaed23ec36d42466aa3f3
 EBUILD puppet-6.1.0.ebuild 3655 BLAKE2B 6589c4e2d07056f8949e942e54edb401842377263462f7c0bbdc66c907dc038bac06296b6479c22919d0a4740f0f61e443623823ff6517759d4188f576ec01e5 SHA512 221ea214e4222aff478bd3777e468d1cb377b23cd0008d9fc25cba7f5a1114e7d3f475e7161d1d0300d49b472e26a1be4686f5c9a90aaed23ec36d42466aa3f3
 EBUILD puppet-6.2.0.ebuild 3657 BLAKE2B 348472cfdac195d18c5fb0f0430c64f9c8a91c5e912cdba02c2e229d66894f9c748fafdca0a5c77a7b8a861ae8ce8dd31fbbf37f1ae6ba3599707baad503034d SHA512 1ca964aa0fd78fdf7459383e5d1bad770c60908757ff0216e240268ad02142a18e91eb57562841819df459716052cf4187f4fae7b2186cc5eeb6f7152f1c0bc4
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-5.5.10.ebuild b/app-admin/puppet/puppet-5.5.10.ebuild
index 7f380bcc3fac..e4dc9ec05260 100644
--- a/app-admin/puppet/puppet-5.5.10.ebuild
+++ b/app-admin/puppet/puppet-5.5.10.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppet/puppet-5.5.8.ebuild b/app-admin/puppet/puppet-5.5.8.ebuild
deleted file mode 100644
index e49d432b2e3d..000000000000
--- a/app-admin/puppet/puppet-5.5.8.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
-	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-
-	for v in ${REPLACING_VERSIONS}; do
-		if [ "$(ver_cut 1 "$v")" -eq "4" ]; then
-			elog
-			elog "Please see the following url for the release notes for puppet-5"
-			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
-			elog
-		fi
-	done
-}
diff --git a/app-admin/puppet/puppet-6.0.4.ebuild b/app-admin/puppet/puppet-6.0.4.ebuild
deleted file mode 100644
index 2f3f37b0634b..000000000000
--- a/app-admin/puppet/puppet-6.0.4.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit eutils user ruby-fakegem eapi7-ver
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/lib/puppet puppet
-}
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-6.0.5.ebuild b/app-admin/puppet/puppet-6.0.5.ebuild
index 1d12aee25d2c..87692a87fff7 100644
--- a/app-admin/puppet/puppet-6.0.5.ebuild
+++ b/app-admin/puppet/puppet-6.0.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 954cd435ef9f..d1e298c5f445 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -5,11 +5,11 @@ AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927
 DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
 DIST sysstat-12.0.2.tar.xz 602408 BLAKE2B a3c27bf4f7ec74feab9bcd797027429c266dcef7041175d7be185f2f49e57a57b443423116ac9b8b89a312afb796748de3a7af749681c7273a5331f171676665 SHA512 c55c3fb8210f006f70e56c8ef5fe013ad1a9247125e69302f920592288725f76ba268c142f1da6ef078a3cdf75e471921ff41aa8b59b8edff57d3bc5345d36e9
 DIST sysstat-12.0.3.tar.xz 603064 BLAKE2B 79666c16d7a18aa058f2b8c5e81a16e11a01ba94c809a924d4be6a37cdd67f8755a0112e7f227ceb35b1a4847348de0e6ec34ef3da62c2ea81fceb1590e292ea SHA512 b6f7d27981898faabf4349eb889a767e655ed797aa3f7fac3bdc99968bdb15ed2a7aa04acda610a014022bdc2aa7e603b1c413e0eb8d734db04675fcaa4561ca
-DIST sysstat-12.1.1.tar.xz 605396 BLAKE2B a75fc5c9d1ddea2817418629bc7929a58b22875b1af173558e97ca2c8eb431b3a489287dbae17072a327b36a762fc5193cc10787e2d4fa6340895b9647c1be11 SHA512 845adfb6e29bbf3a152496da1959d459b983ad50ad11f08a2887bf25339b988facbb7ca06693fc9df53c3d20d20662860176f589a8cfb70afcc8a825e0e5d122
 DIST sysstat-12.1.2.tar.xz 608304 BLAKE2B 18c259f4aa43cfd30e9ba62ad39712fef1b3c80ce79ddd8a5afc939d3cc99d94b994f78cea68fd751f3c12311442256f439a2483a817cc7cd0dcf03c952feba9 SHA512 622f1ed1949a156e4cc2451d246dc449afcf3ffc2414363ef14f8da8e1a307e3a28e5b4fd50813c3f6d810bcf112ed13ecc91edbcd0a8c3c626303f333785b83
+DIST sysstat-12.1.3.tar.xz 553880 BLAKE2B cc520d294fbd38385b2f248721a33b0dd7d7beca422dcd3cc00a2a010b98850d65ceb03e8949b12426c5dc3726cb06f0d63ae30d2792808814b5c5e6912d1a14 SHA512 f264efe377b61d5f62b1ad2c14115bd22ada3a25f726bb362c3cb1a6d45f370642783d547339dc118bf34c6f3d015bba19e88043b0753f8ec6c314778456b726
 EBUILD sysstat-11.4.0.ebuild 1944 BLAKE2B df7ad02ffc15d7a5e8861434a64f9ecb327f88f563a19e572655b88674c8971aeab7797c04382e6fe8e4e288aeea1bac50fc125415dc40fd953bffa76dbed42e SHA512 caaad246ebbee2a9f6bf9259034f3ccfcdadf7b201b2355645b626b1b2335a0d8d756a7b582d297bc32574c5be58111d59f9c3a9657fe519f093145764edf2c3
 EBUILD sysstat-12.0.2.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
 EBUILD sysstat-12.0.3.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
-EBUILD sysstat-12.1.1.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
 EBUILD sysstat-12.1.2.ebuild 1786 BLAKE2B 155d89a10b9c4e4870c62f8229ca2e530413e688c61c5d9e0d1dfa68633040a7a01c6c7713d34c93d52c6f8e01c82cb98dd1511f8cd2815cfd1d06935f12d0ee SHA512 5b480ae929e82e454d69126e51f0d45f9103288a90568e34413c39aa591c8e823c6d9acee55a26e86f7e4dd8f165e11af321b0b5053354cb92bdd876e5b0b7d7
+EBUILD sysstat-12.1.3.ebuild 1793 BLAKE2B 330c74093228846f82d0ea709f649508b01a1618d7493b60c6be5f34b0583fc7eb7798fc5b386c14bd21a2ee7698ce8b8c098bf00761eda8e55ca6df7d2c0b9d SHA512 7a2a46ecd3be1db6de32abdfcd0e13330b8c7e8a69a986246b0382197d847d36234d084fbbf6b00cec591bebf0741578c8c7b1385a76ef6322b4ee4272702803
 MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-12.1.1.ebuild b/app-admin/sysstat/sysstat-12.1.3.ebuild
index d5b74497593a..45e90330a0f9 100644
--- a/app-admin/sysstat/sysstat-12.1.1.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
+inherit eutils flag-o-matic multilib systemd toolchain-funcs
 
 DESCRIPTION="System performance tools for Linux"
 HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
diff --git a/app-admin/verynice/Manifest b/app-admin/verynice/Manifest
index 3b11eb91335b..df537ed92244 100644
--- a/app-admin/verynice/Manifest
+++ b/app-admin/verynice/Manifest
@@ -3,5 +3,5 @@ AUX verynice-1.1-build.patch 2529 BLAKE2B 5ec0b3c4b4c1a91d3f7076068bfd3a39128d89
 AUX verynice.service 158 BLAKE2B b71905d327904eb6a524e5d6b2dbc1606ffd0b5bbfad659c9d336ea41edbe8e6510966886cf814888bf8ec55cdd033299b1c91b7e7e3c3f455fa0f8a6ab8ddd3 SHA512 03a88cc405c8d6fa18f1e523e6987b1455011cf17ff38f1e937d523b33d88cae839f256811b487ec3141d8b396a15b8af778998d53bf55dd69f6a6a6dbc6a148
 DIST verynice-1.1.tar.gz 37576 BLAKE2B ac499b298858ada109f298bb2d37dc5fc7ecd17386994749a5a8a3612038eaa98d1f122ed990d9c8bd9e17a428b0a3b4c0c7f0df4a9f1c0441e3fe22fbeb1d07 SHA512 731fa22162bb4f48b943839ccf8ccdc769587e323da11e4a77ad14539a724ffbb89e5f4122e1ab36df3306c507afc958d1125160d34d9cbf55df4dc69e4a0139
 EBUILD verynice-1.1-r2.ebuild 780 BLAKE2B ead43a3cb913646f7269b253f0f5c37951411aec437408c446d47018966d8f313fb5402244a174ef4ffce2819350d4b9fe1c55bacebed6cc828b3937399c9db7 SHA512 72074cefa72a8f125a9669ad35a7b1c240ed8dd4e05110c957a4b7733cc521897714a7d0035639664eb63af52f9ffc96df0160498f75133a5e9e88ab650c7aac
-EBUILD verynice-1.1-r3.ebuild 725 BLAKE2B c6de124c19602df78e4228bea53dbebe1d9986f4fe896768daee630ddfcf2e4a74899fa28151f79954ef91844634a9f79a678c9dc3ec467559edf1f4ce1e889b SHA512 91b42cb64cb82b7d6ebe874ab65c1313df92cce98130d03989489029a3c96681ba9797673fd8cbff72fb5d31bbb467a6f25af78139d08e025728dcc948b62205
+EBUILD verynice-1.1-r3.ebuild 724 BLAKE2B 3a5112b843f44ad212cce1ed2ad407b01be366fb81380c133bfc011ff9843b4fbed8433ed8f0a2a4576b91f07f0ed75194faeb8365cdfa4d7615a120dff5595d SHA512 9340057fa98336a368bcbf336ca46f99b3826ed0dec56765242e1cfb5ce0fc12c2ea9ea0b481107911c2d9fff4ff0d0ef0da14391b70986ee73eed46cd1b142b
 MISC metadata.xml 318 BLAKE2B 1786ed2568f2f60dcaa875da07b616c2c77a1d4fe0151463db5542db66caef11931259da6bca4b437e125849caa3a3505ee607eca6c57b35ecfa75f45c82f370 SHA512 04cee3becd3a20c8f455969ea4c38d7a0843283bafded1af5310fe090159ad2ae0c804fc4893fa88138ad98aa3feda6991624c8a4942b245b64db5eebb3dcf46
diff --git a/app-admin/verynice/verynice-1.1-r3.ebuild b/app-admin/verynice/verynice-1.1-r3.ebuild
index e2793e7572cc..7eeb6b34a56a 100644
--- a/app-admin/verynice/verynice-1.1-r3.ebuild
+++ b/app-admin/verynice/verynice-1.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-admin/yaala/Manifest b/app-admin/yaala/Manifest
index cbd8ef690629..6084524247c2 100644
--- a/app-admin/yaala/Manifest
+++ b/app-admin/yaala/Manifest
@@ -1,5 +1,5 @@
 AUX yaala-0.7.3-r1-correct-paths.patch 1095 BLAKE2B 5c7a232836bd19ffa678db3c2d522f9d831535e3dc086e014fc45fe233ae9e20aa1a69359ccc2e913b1b2cd66ba29e053957ed32aabdb38948a57e55b485796e SHA512 c44bad33bf23ed089a4ddc2497cc5507c3c1927053c09ed64e39dad95400b0f0d1170da499c504240919262391f6424c5a830298e7c5a49542dd3424fabed8a7
 DIST yaala-0.7.3.tar.bz2 41528 BLAKE2B 527f691730cd50f60137bce014958423bea4bf007891ac0a6fa0888099da7678661612369d29b41683de81a25bc92163f0d9f413e5a11e9f86c273e0e866ca8e SHA512 30ad37c2c612f47472a840ea40aa924ffa59828455e7268dc29eb3d0276aab835b54396a29eabce88ef0e357523086b182ca1ec366b50851ecb8d2530f4eac01
 EBUILD yaala-0.7.3-r1.ebuild 1681 BLAKE2B 50fa29f2619f3b16d47d162ad2cd4ff89d035af12f5a58fe326855cff408ff4d2ac79dc1d400ef3dfccffe80ef71c588181655debc9f45cc49c87a13d290475c SHA512 babadaca079b88ab4a0f8c97b7dbacd36f716c3978fb81fdd8da3f0c441ed5bd05e03602d71f9dc4da2e4b7a4bdc2a3d397acd089d869627a9e6f44138841118
-EBUILD yaala-0.7.3-r2.ebuild 1629 BLAKE2B 2037c5addce578ebdbfb7cd1a2c74a1a01d751f0f6c2004a0bdffb9ccc28b901515e2feaf9caf91aa98fcdacd7cbe30883e8cb6ad256fb0bb95fa518b16d55b6 SHA512 776f8319d1ff37d5f64a9b64e8a181716260c8cd8cc69391eac41ac676c59b2e53da093de45d5fcb9f0af2693565c3905d7aefbf687df81497894a7242ec300a
+EBUILD yaala-0.7.3-r2.ebuild 1625 BLAKE2B d5cbb07e555f49bf7b53348a62602d0072ecc4a97207600d87d3286d7afecc4398070054e8e39f0ff4584512b0d98da3ec34bc3f899589c166e6db2735cf4805 SHA512 79e2b8715651de07c5f60252d70d7a36af232704c7f91a9fd9c879221d722de244ef47e6583af4bc2891bc1568750f77d8205554cf7401a7392bf8cf633eee6a
 MISC metadata.xml 337 BLAKE2B b1435fe71f760cc4fd4b6bceee0d4675b7f7e7b89986544003cfb7bbf59851b02025a8b0839d446efbde8c8240bcbba782d8f88c9e0db59b227de91dc885043a SHA512 a24db5faa68733175428ecdfc9c333e5209cfdbaee9e40a23af29d188068d5400d14d60c7239d890d7e66f640c4a2023cabf9b6d131d2abe58f0e90b221119c6
diff --git a/app-admin/yaala/yaala-0.7.3-r2.ebuild b/app-admin/yaala/yaala-0.7.3-r2.ebuild
index 9265cdda0f52..cee575e3fa22 100644
--- a/app-admin/yaala/yaala-0.7.3-r2.ebuild
+++ b/app-admin/yaala/yaala-0.7.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.${PN}.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="gd"
 
 RDEPEND="