gentoo resync : 24.03.2019

30 files changed, 403 insertions, 238 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4fcf0595f19c..a151fd264ff3 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 0f31967794c7..8c85058b2eae 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,16 +1,12 @@
 DIST ansible-2.5.14.tar.gz 10119785 BLAKE2B 6e771aafc16053185ee6d275d6d41f64aa3f0d6dffbe721a66b548b97e84d78916e03827d592b961f9a4e0bb03fae09320731a4b8fdb814126cecdfb51f9f136 SHA512 9635b1c4bc9a93a24f4bb2894c9fed63803cecb01c5562559e3b808791d1007b26aa0aade4aa05fd4bae0f7d01216588d4e2e0bf4c5fb6cdf677d9b40e9e2de8
-DIST ansible-2.6.13.tar.gz 10730575 BLAKE2B 2442925421996731be59db7ca18994f9c158f0b1247554bc8252d76d6c8fe8574e4ec2e62d71d7de075a9b109c43620232c78d91dcb3aa8d574752862de4d156 SHA512 7592214bc5c0c4283c99d7a422d44a54f424afe848b40fa2c0b0a4b556361a6290b459d8bdb575ec323e4e96bbad7abc939cdb5664839bb13f5de3d054ffb880
 DIST ansible-2.6.14.tar.gz 10732165 BLAKE2B c753860a521c37357c7a5042391957680865416c036fcaf3920a65e291dc3ed3a52e94ad5b99acdb0d2c919e3be68b8462e462a935497dfe83b406adf4e63dad SHA512 ee532c0d61ab03a0937e89bfa7565f27f1905987784f31895e8ac6e4a8ecf76ca9f30201d278a68a995b8fc27151712dba2e79c13269a472d923355e36072e4e
 DIST ansible-2.6.15.tar.gz 10734433 BLAKE2B 9c48d9de348a11a57b364921af26154b5a2106d0bfa2d7d341c06e2408b3f71d30b3cc2f5e4df1bb21eb6eebd39a4d297ce8d697d68826378d4e786a4acb4e25 SHA512 14951db33ed2124b3379adf1114a9c980f63668c18a79d436658d8ddc1bbbd38f26682520319bd0e399d6ced518ece0f01da5a6991003e8b30adf78f20c6d1e8
-DIST ansible-2.7.7.tar.gz 11809560 BLAKE2B 3960e4dcd166fb77ddcb6bbae03b20fe679b76aee3db118ddd4642ab7b837a66929bd4ec76c071c53eba7ece47aaf8a52ceb34ea092d3e3db8355839575b684c SHA512 41e007ccc5b22eaa1a7aa9c16f8d012268cbd1055b5c10a204134b7707ab7bf205aab04efccda9fb5497034896542d29ba253ad4ea09b4755b665bada22b4c54
 DIST ansible-2.7.8.tar.gz 11812884 BLAKE2B 867ed7072efc4effafd637ac0353bd722269046cae8ddb794eea8c6cf9d739bc567f2a5323a589c21a74bbb57565ef153fb8c52798c17809a42400abe72ce65c SHA512 f3501ce8b642f83fe3d5e21cdfa26bce8611e92bc6e68e40b3a7ff2443c7d8ee0b2175981c92a5e83f9ce8c5d7d75aac95106a237bb9325c66319d96a790009a
 DIST ansible-2.7.9.tar.gz 11830476 BLAKE2B 7688ce9f74b0ab1fafd0e31dce90d995a9d8ca90bbe436f2d4ee9d005069b6e1b2c4dd679c2430a6873233da54ae06d3ebf08736681ec2e59e5b3ddafa6bb1e2 SHA512 4d39c7d4eb97264ce8f92812fb986b24af0c663efa6d8cd1d9a4cb25731d55e7518e503c04764e62d0458916b601baaa7acc623f9f83ce8b93e7f22900e29a53
 EBUILD ansible-2.5.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
-EBUILD ansible-2.6.13.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
-EBUILD ansible-2.6.14.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
+EBUILD ansible-2.6.14.ebuild 1621 BLAKE2B f171fcbbeb00d59b77ef3d8b5dfcfa7c8819ffcf68cb99043de3916e47a469603b728715e6d006f44e6a32283727a1d04214085d6ab1e32dcbc079ca1353b5c5 SHA512 172e7af8d1ad44f41bcb0f6e919b6e4ea0a8e096943e43df2f6b5383c3f13c0727c288c47e2d4869b5a74637a980f1750b5dbc903c0a726041ed857e5f6d26ff
 EBUILD ansible-2.6.15.ebuild 1623 BLAKE2B 203df11aa81c78c98490b436317733203c9633da656d3b2a661df7a32269f57c46498d08aeef304a7c651585f0562b62f117e7c62e911b31eb325e1a14d8dcdc SHA512 3559db4b6b2ebf5d24c578506ebfa36d377e1bb508a36169c02ef35168c311393c917adbdf2c70b27bd93b58276d36806c974cba0f9443a4b9aabd6c07be6e58
-EBUILD ansible-2.7.7.ebuild 1628 BLAKE2B b64016e802f967ca82cd90cbbf01a78b27ad44491bfaff47c8268fd959d072131f12771caf7a2fd386ea87ac46ecf3161acd0aaaedd2067322309b822128d6bc SHA512 90f07c63159f015e507340951b8a1de5d959b99654c5380b63b71dcd819e79e24713fd8a2b61ca4b6eb59bb3f8146ae0df5acf78ffaec39bf4786097110e8f72
-EBUILD ansible-2.7.8.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
+EBUILD ansible-2.7.8.ebuild 1628 BLAKE2B b64016e802f967ca82cd90cbbf01a78b27ad44491bfaff47c8268fd959d072131f12771caf7a2fd386ea87ac46ecf3161acd0aaaedd2067322309b822128d6bc SHA512 90f07c63159f015e507340951b8a1de5d959b99654c5380b63b71dcd819e79e24713fd8a2b61ca4b6eb59bb3f8146ae0df5acf78ffaec39bf4786097110e8f72
 EBUILD ansible-2.7.9.ebuild 1630 BLAKE2B 5ebaf32d9389e349ec01a1436cf55db7826d013ef03ebc2b51e76a01a9eaabeae7044203f1ab6a12db4b307f87e9b8cff36f7b557042f93e5700fce6f931b2d9 SHA512 66fcbedd85309b41c2d00dcd329699438941fafbefd06c3fb167c465ba5cc88f0d0964ae2e18a9a3245cd766d1197a87af4b9a1c00035ee74d26dec66cbbe17a
 EBUILD ansible-9999.ebuild 1638 BLAKE2B 40aecbf314bb9e743fb7543c696a271842955853fe981bc4dc69293dcc9905e950a743a56398b0815e09107db801ba554b68ad9511ccb9e25dd3dec0f0b156d2 SHA512 814b1430d499d2e6f50879c41b1a51e07b5e5a79355deab730e26b9e9a28f9ac94e2a46b884a5e0e8ed4a12d7a74bbbdffc0a55b8e120b438c91aeb9e7ae718a
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.6.13.ebuild b/app-admin/ansible/ansible-2.6.13.ebuild
deleted file mode 100644
index 90340deaacc1..000000000000
--- a/app-admin/ansible/ansible-2.6.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.6.14.ebuild b/app-admin/ansible/ansible-2.6.14.ebuild
index 4bec3453ac7f..90340deaacc1 100644
--- a/app-admin/ansible/ansible-2.6.14.ebuild
+++ b/app-admin/ansible/ansible-2.6.14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/ansible/ansible-2.7.7.ebuild b/app-admin/ansible/ansible-2.7.7.ebuild
deleted file mode 100644
index be1e38fe59f9..000000000000
--- a/app-admin/ansible/ansible-2.7.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://ansible.com/"
-SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~x64-macos"
-IUSE="doc test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-# not included in release tarball
-RESTRICT="test"
-
-python_compile_all() {
-	if use doc; then
-		cd docs/docsite || die
-		export CPUS=4
-		emake -f Makefile.sphinx html
-	fi
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
-	distutils-r1_python_install_all
-
-	doman docs/man/man1/*.1
-	dodoc -r examples
-}
diff --git a/app-admin/ansible/ansible-2.7.8.ebuild b/app-admin/ansible/ansible-2.7.8.ebuild
index 1363dee05e63..be1e38fe59f9 100644
--- a/app-admin/ansible/ansible-2.7.8.ebuild
+++ b/app-admin/ansible/ansible-2.7.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm x86 ~x64-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index ef135dd3f04f..fe3aab8049c1 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -7,5 +7,5 @@ DIST httpd-2.4.38.tar.bz2 7035030 BLAKE2B 52d965b0eae3402c268f1c5f5fb669ad844086
 EBUILD apache-tools-2.2.34.ebuild 1977 BLAKE2B 792d6ea010621c815a13fa89db289cdb7d2f02cd4aecca6d032e21c2bd64af7c35a66ebe3b8102eb441d12a4b6b2ca6197e16f8479d72c82606b088b97dfc24a SHA512 4a71266da0e171579c5d9da9ed681ed5600d2d94ffb15761bbd7f28b60332158959156a65b27ac295869f647f624fe598bdf2e74aa3c7f8b16fef7cbb2dc9a52
 EBUILD apache-tools-2.4.27.ebuild 2653 BLAKE2B 00b1b5e96e7eab66981fc339faf6db5e40d05af2d819c92a5faff3ad2f60c566d0235cbf60ded1d5daa79cec7815534b96b53b8e8f00333d1a814058752dd011 SHA512 e23b494555f6685f482fcecc59b5e81147780bf399de740b91bc19de9197a3d6f9d32a701472ba6551a3039214adc2e0bfd4436e0b82edb388f26d4dc88bd110
 EBUILD apache-tools-2.4.34.ebuild 2576 BLAKE2B b1b1333404e015984c46451a024c53eb0e0b33e02391fa31f7fe04d925cf1093c5283e991cfc309cdef3eed5a1054d20a713f66b6c917149e9151698a91361eb SHA512 c46a40ccb2188261c45940d184329a08b5308a2a79f4fd78f1501ed87ea887edbcef1e2f38b5b620aed2f8d411f5b03cd903c786a53270bc1e4aaf8e0d2602d0
-EBUILD apache-tools-2.4.38.ebuild 2581 BLAKE2B f14ca0fa5ae9aa85357c009008ff9771dc95d59c8ab4dc453b5c0df21a4185e064df9038af558224921ebeb9a4b2a6f081663a3088712f05d6f52512c22ceaed SHA512 392c2b6267e49d5cf7d2ce267c433877c6d3989d7f76e6975fba5cce104bab75ede376eb52ea88bfd45e0399206b6cd77e3cdde1a1c2c86fb0978d782561e3f3
+EBUILD apache-tools-2.4.38.ebuild 2578 BLAKE2B bf062cf5a47dbe79d10ecfdeee1ec0844e8c00d7420ee53b31cf8a0e98247caee6d5099034423de96bd1fafc6a19fd50f8eb25eb0ccf8a8501b45770bee29906 SHA512 ef1b9b18933342be6e2db81bfee3efb729873301d36d5ada88ab6339147d760c3c88ab5d01c800a869fdbf393b8933d5098272aa6772791e8ccd7f09707ee547
 MISC metadata.xml 580 BLAKE2B 013a1f5cecbfa1086e720d341855be076e98b313f03ad99147bc692a5988fc6e0006545104cfe245798f88ab617c6e2c84928d0a73d127715dcb8ba352e8aa94 SHA512 611ed7b76b150a829902110a843a5a97622d2ec645850b6988c578496d716019e511830767a0c3dc300c69f02b5b933c806ea5598f6938b5d6b9d14b58985122
diff --git a/app-admin/apache-tools/apache-tools-2.4.38.ebuild b/app-admin/apache-tools/apache-tools-2.4.38.ebuild
index 91bc4fb75cac..5a40550a80fc 100644
--- a/app-admin/apache-tools/apache-tools-2.4.38.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.38.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
 IUSE="libressl ssl"
 RESTRICT="test"
 
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index e630c1c2776c..f83ac05c4722 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -9,6 +9,8 @@ AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
 DIST conserver-8.2.2.tar.gz 329048 BLAKE2B 0148a5b5b11fcc75a071b9759e129a94f1fe623df35e7549e967d0037ddb378447623070ce43429daf4868308be150f5ba318354e3181d94ccb1199655231373 SHA512 7c59dc59e59e3ee0172b2a52214cd8dd83383168fe0f145870d128b900a012cfa38c2f1ae85769c226d941ca1a764f93ec3bf353da896537ae1be5b6bc17e6c6
+DIST conserver-8.2.3.tar.gz 329825 BLAKE2B 94ceb427a18b38855ee3146e432be50248a518221d9779c833b3bf1190dedf800ff498ffdd88eafc7cea343b2f87f476738977021c85f19c869bf0a012f1da11 SHA512 35b387629973620aa25211d9532f940e17d7891aa7216776c315cb9fde09106b7388e7cef29f5a2ead8660fc35e2be2b14f38a51cd2b3198251b7e7e70a2254d
 EBUILD conserver-8.1.18-r1.ebuild 2288 BLAKE2B d25a03bd1d6ee27d983c15455bc4f3ae76ca663cba75b353cfef17480f91f49d2d310a038ea9f16334bb75ece843f948a619c0980c1aacd9457bf2a2dfe0f1aa SHA512 4b87330c9eb8c9e731ce56b49afc45ccc04fcbe877d374b51a37b351c582b465946178ac41e50605ef958ffd0c65693b8f21ae0f28a65c462b99332bb6059078
 EBUILD conserver-8.2.2.ebuild 2350 BLAKE2B 6b502331697cffa995ab8e1cdfb03d086b78fa936941051a73dada85eea5de33572a07032d6973a1c7664c5a402345de1e2a06bc31646f987117c85e4d749dd4 SHA512 898c71213ff0b60156bf07ef2541df6d5a17ece9a8145fd080ae1932c59919272d9294e027aea1a051e6aa41acae87cd43c3418fbc5c1653482510a134942684
+EBUILD conserver-8.2.3.ebuild 2260 BLAKE2B a24f9ab8fa57a72189246e786c22e149a53a4ce562ce935e2911b096ad52899658ad1abfc07e35e0e72e715bc73efd2c374400a8d5c45d22db8e3a81f4a4435d SHA512 57c2fc7b74cdf59541230e795471ba98a15761a7abad1474d49a5716717af7e64c4ef8315a5134dd36a04c87e8973f29031501c92403d2d2080b1839c8c12fd3
 MISC metadata.xml 1378 BLAKE2B 942f6b9d8fd616f089d0651fbdfc41de96033acf65f127cbfded2fb9c390fd9b86c037a62679ea27b18e4e618bf764d09277350e9fdbaadc914c18a6961618e2 SHA512 6b3e06cfa1013f71eb42c9c073df8c97d2b8fa6b935b637ba29096db88d75bab1bb192695ed4a5dad63d88341a366327f419cb357777c0abb09799c8bcc40970
diff --git a/app-admin/conserver/conserver-8.2.3.ebuild b/app-admin/conserver/conserver-8.2.3.ebuild
new file mode 100644
index 000000000000..3a8ca5f5f928
--- /dev/null
+++ b/app-admin/conserver/conserver-8.2.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools pam ssl-cert
+
+DESCRIPTION="Serial Console Manager"
+HOMEPAGE="https://www.conserver.com"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD BSD-with-attribution"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug ipv6 freeipmi kerberos libressl pam ssl test tcpd"
+
+DEPEND="debug? ( dev-libs/dmalloc:= )
+	freeipmi? ( sys-libs/freeipmi:= )
+	kerberos? (
+		virtual/krb5
+		net-libs/libgssglue
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	pam? ( virtual/pam )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}
+	pam? ( sys-auth/pambase )"
+
+DOCS=( CHANGES FAQ PROTOCOL README conserver/Sun-serial contrib/maketestcerts)
+
+src_prepare() {
+	default
+	sed -e '/^INSTALL_PROGRAM/s:-s::' \
+		-i {console,conserver,autologin,contrib/chat}/Makefile.in || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with debug dmalloc)
+		$(use_with ipv6)
+		$(use_with freeipmi)
+		$(use_with kerberos gssapi)
+		$(use_with ssl openssl)
+		$(use_with pam)
+		$(use_with tcpd libwrap)
+		--with-cffile=conserver/conserver.cf
+		--with-logfile=/var/log/conserver.log
+		--with-master=localhost
+		--with-pidfile=/run/conserver.pid
+		--with-port=7782
+		--with-pwdfile=conserver/conserver.passwd
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" exampledir="/usr/share/doc/${PF}/examples" install
+
+	keepdir /var/consoles
+	fowners daemon:daemon /var/consoles
+	fperms 700 /var/consoles
+
+	newinitd "${FILESDIR}"/conserver.initd-r1 conserver
+	newconfd "${FILESDIR}"/conserver.confd-r1 conserver
+
+	dodir /etc/conserver
+	fperms 700 /etc/conserver
+	insinto /etc/conserver
+	newins "${S}"/conserver.cf/conserver.cf conserver.cf.sample
+	newins "${S}"/conserver.cf/conserver.passwd conserver.passwd.sample
+
+	einstalldocs
+	docinto examples
+	dodoc -r conserver.cf/samples/.
+
+	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+}
+
+src_test() {
+	# hangs without -j1
+	emake -j1 test
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"/etc/ssl/conserver/conserver.key ]]; then
+			install_cert /etc/ssl/conserver/conserver
+		fi
+	fi
+}
diff --git a/app-admin/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
index 03efa0c28e3f..fcc889dfd5ab 100644
--- a/app-admin/gnome-abrt/Manifest
+++ b/app-admin/gnome-abrt/Manifest
@@ -1,4 +1,6 @@
 AUX 0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch 4329 BLAKE2B 408bd52cd8a7ae8ae60a938da810a2af35556111791f330887d7c6f9af1f27eb50a4efa4f646144fb3e2483398f7e4af21afb4b587f6068a5764004d0efdfca4 SHA512 e7c505da3355a721c38d043fd0dc7397f664d90f1c243203a5055dfeefde7b8aafe02a8bd3acb22ba32941740e4aab38873fa75178ee1d4776a2da182e6b2033
 DIST gnome-abrt-1.2.6.tar.gz 340308 BLAKE2B 5221fe43fd72fe8798f2c11275863e6936e616632641448c53dd24118d3b6b808fc373fe98b8775f1f1c58820c06195a665f6d417c95eaa7cc333cd7660b2d0b SHA512 12bcdeefa481b7caa04da046ee11d6adc9fd582b32f709d79a2d94cf61ca02643edd418cd9257c0f732a30aa5714fe83a282a4c794ff4260ddad038f7721ff2c
+DIST gnome-abrt-1.2.7.tar.gz 339961 BLAKE2B cdacc079c4661c364f13af3102e2231adbeaf4226ba937436f5ce3ae109f28b87c9424c6dfbc016b912599205386f92c32b036ca31adbea79b9a54d7f3a27c4a SHA512 57446b1c1c312f3a47ea3dd2a40ac1d4ec5392df3181eac73086675b65d45cad9a01fba5252d073970878ef97d7d272508bc5b86a56779543ffdc8d083fb5413
 EBUILD gnome-abrt-1.2.6.ebuild 1306 BLAKE2B 27f2fafdb5fea0dbda5679ec9dcc75826e7a7a54af261f66c66466b85ec3a6bf271f3d16b2e745cf4d2e2b87215bfbb1d11aec7b095cad69d2072e67faca41c4 SHA512 b8efc525446bd3148f7a7059388e6c2ef90005e0b79a5fe282b46b635824f71bcb9e26347a61b366ea594e1ab559cbdd6b003c572b4f93ae474372a87ebfe026
+EBUILD gnome-abrt-1.2.7.ebuild 1305 BLAKE2B 42e9162c76603f51bd26418689ce89560dbe756a0afa86d840d7aaf864141b3470a601726d85c35a8343e4a15504d91f41389256ff3ed002f3d217e6bb143e05 SHA512 c48eedd9c4148232f510d813acbe51679ddb1d637dba3937ed6bacf734ba34a95bb456f7152dedea3e93e63be0f5baa20dfff166db5c079a3d38b0155bf4164d
 MISC metadata.xml 333 BLAKE2B 7dfc442159eac1c4501c5bfaeec34615e2e8dd63b982759f30a0835143a1d5b661cce8e85868be70115c93c26f7ed70389b9f7ad6ae88f93b081f126c42beef3 SHA512 8c2e01101d19e3cd8ade5da1921864d2103eaa2f140c0eccb398e2567254d839311ba1384e25e0bea316345943c0649aee92aabb3ec2092d1a9e0728436fadc4
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
new file mode 100644
index 000000000000..a0fb1a7815e3
--- /dev/null
+++ b/app-admin/gnome-abrt/gnome-abrt-1.2.7.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit autotools python-r1
+
+DESCRIPTION="A utility for viewing problems that have occurred with the system"
+HOMEPAGE="https://github.com/abrt/gnome-abrt"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=x11-libs/gtk+-3.10.0:3
+	>=dev-libs/libreport-2.0.20[python,${PYTHON_USEDEP}]
+	>=app-admin/abrt-2.10.10-r1
+	>=dev-python/pygobject-3.29.1:3[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	>=dev-python/pyxdg-0.19[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	app-text/xmlto
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.17
+"
+
+src_prepare() {
+	default
+	./gen-version > gnome-abrt-version || die
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	myeconfargs=(
+		--localstatedir="${EPREFIX}/var"
+		--with-nopylint
+	)
+
+	python_foreach_impl run_in_build_dir econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index 74db5c3b08e0..9290cfac3dfe 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,9 @@
 AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
+AUX keepassxc-2.4.0-build_fix.patch 1419 BLAKE2B b5661c75008c9031598ee704b21e0581a6e3859addb9b4e642cca415b06f26cb7e6a984fb942f648f7d4082c17e198644230ddf711696971df6754cf4c6eb119 SHA512 3e659b5048089528c2055f9481119e66f655b2531a4347d4ca6e439bcc82566f2e658bdf4442e6c678d19811ca494533e7ce08e14dab3148c841084f2f5ab898
 AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4
 DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
-DIST keepassxc-2.4.0_beta2.tar.gz 4740311 BLAKE2B 071edbf9d985671d70c381bd4863a704af6ad172a22fcf23ee0e12c8ea2a723029626669ed37e2e2739e3a66106b00b4c73cdbaa8e43496d950363422d6df8cc SHA512 5db8eb11a6aa42632bf2642af121063cb0df32fa1cda1beaea7c18e07c65049d3fa9a1a76643bd97ded80b7e5b2d403e9cd414c808faffdf2cb7e75c7f0578b1
+DIST keepassxc-2.4.0.tar.gz 4790634 BLAKE2B 5298baf80c48f27da16274f815dc6d83031586e3fec20356569c4d7eb652ed68f22b849595c837e736b7b3adb7636bf1f50c89626a093eecf236e3a94d89f33b SHA512 a50e90389bb53ffca28d322958c01db09472bf5e3d21075ab09db7cc1ed2e8aa0ac9ff310d79c06da4f429aef0427e3706931ce5d4d02b54a52b0209ba5ab853
 EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f
-EBUILD keepassxc-2.4.0_beta2.ebuild 2034 BLAKE2B 490e10dc028abf7611b4b6d40a785883547d3c79bc6c7e4c12b228764f18fe6b1c3f6f5060318aad1f14a9b24f78dca6e7b3ebc37e0143697a404e3697b1b09a SHA512 200892601ad3c51c8b29aff2970dbc2e922e4a246e3e7176d2d5ef0ca52dc8fd650dc1809b666b31837081652f30e56493dc0087588bb42308659fa07956b1b2
-EBUILD keepassxc-9999.ebuild 1978 BLAKE2B 12c28125986700c0e190b07d689d48da7846d6106fb5866e49196902edb52d5fb94736bee4ce867994d3865fecbe6f5895359b0daf50337f719fb1cd9b08037d SHA512 6b05af40e41c9a73b99448a425071ec1bf013a3b1568b0ad744c16baddad15adb56e7fa243442200839d853d4b7762920b92f69c4cfcad95b7f63740d6b2dc4b
+EBUILD keepassxc-2.4.0.ebuild 2084 BLAKE2B 5054cd4e8ca4a263f67d504fbf75b8d1df998429952eb24f4b781b126ee70ed0bfce438274ce002a6ebd59b0136377c1ae9475feba94c6f940273df57e0b0473 SHA512 9b9e6e551498727e95b803431fcff20a5fecbb795ba7f6b5df9ae9b886e9f1139a8e4174ed0cb888c294cdf176e6dda0ba7f7fa5403de1f6961da30a03ee2fc6
+EBUILD keepassxc-9999.ebuild 1992 BLAKE2B 1936e110232387cf0f6a69354f4cc65f44c9e40d98b2a5cb81809ca45d11d733777dfa0c471142a53f16f1e32bd08d3c29b3259f81bfb2d1de01fffaeef54a78 SHA512 d38eefbc708f7bb1edc3310eea0998e22d91fcc0fd3bdce5fc6fa06a812dfa2fa939cd77a5dde81f8b87b835c2c8b2a30f56af4bb6cb7b627a327f3fd982ffd6
 MISC metadata.xml 891 BLAKE2B 0c279d26b8f00d816d92a8fdd428629cf92a0ee7c0789ac60c9b5ea9b491dbd495a09815785fa99427ae8f5701dff0da8a06065059b1a6f05f1cdadbdde88192 SHA512 ec6fe12b1b508784947b55bb562a9e99632481ce06289b4dd7325f0834789fa4df99a15792ab7e91bab169c89a0a5a4c99ccd3372f1a2ff84cece49c4acd1779
diff --git a/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch
new file mode 100644
index 000000000000..486c8e2dd9a3
--- /dev/null
+++ b/app-admin/keepassxc/files/keepassxc-2.4.0-build_fix.patch
@@ -0,0 +1,38 @@
+From ff43f3ff8a8a1630d10e7117c45048623d215616 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 20 Mar 2019 11:53:21 +0100
+Subject: [PATCH] src/gui/DatabaseWidget.cpp: Build fails without
+ WITH_XC_KEESHARE
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp: In member function ‘void DatabaseWidget::search(const QString&)’:
+/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: error: ‘m_shareLabel’ was not declared in this scope
+     m_shareLabel->setVisible(false);
+     ^~~~~~~~~~~~
+/var/tmp/portage/app-admin/keepassxc-2.4.0/work/keepassxc-2.4.0/src/gui/DatabaseWidget.cpp:1115:5: note: suggested alternative: ‘m_searchingLabel’
+     m_shareLabel->setVisible(false);
+     ^~~~~~~~~~~~
+     m_searchingLabel
+---
+ src/gui/DatabaseWidget.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
+index 8728c331..e4196734 100644
+--- a/src/gui/DatabaseWidget.cpp
++++ b/src/gui/DatabaseWidget.cpp
+@@ -1112,7 +1112,9 @@ void DatabaseWidget::search(const QString& searchtext)
+     }
+ 
+     m_searchingLabel->setVisible(true);
++#ifdef WITH_XC_KEESHARE
+     m_shareLabel->setVisible(false);
++#endif
+ 
+     emit searchModeActivated();
+ }
+-- 
+2.21.0
+
diff --git a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild b/app-admin/keepassxc/keepassxc-2.4.0.ebuild
index 4d05c7804c81..7330e781cb78 100644
--- a/app-admin/keepassxc/keepassxc-2.4.0_beta2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.0.ebuild
@@ -13,8 +13,8 @@ if [[ "${PV}" != 9999 ]] ; then
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
 		S="${WORKDIR}/${P/_/-}"
 	else
-		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
+		SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+		#SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
 		KEYWORDS="~amd64 ~x86"
 	fi
 else
@@ -33,7 +33,9 @@ RDEPEND="
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
+	media-gfx/qrencode:=
 	sys-libs/zlib
 	autotype? (
 		dev-qt/qtx11extras:5
@@ -59,6 +61,7 @@ PDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-dont_call_mandb.patch"
+	"${FILESDIR}/${P}-build_fix.patch"
 )
 
 src_prepare() {
@@ -74,12 +77,11 @@ src_configure() {
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_HTTP=OFF
 		-DWITH_XC_NETWORKING="$(usex network)"
 		-DWITH_XC_SSHAGENT=ON
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"
 	)
-	if [[ "${PV}" == *_beta* ]] ; then
+	if [[ "${PV}" != 9999 ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
 	cmake-utils_src_configure
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index b59c1684db72..cc894dcf5bd4 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -33,7 +33,9 @@ RDEPEND="
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
+	media-gfx/qrencode:=
 	sys-libs/zlib
 	autotype? (
 		dev-qt/qtx11extras:5
@@ -70,12 +72,11 @@ src_configure() {
 		-DWITH_TESTS="$(usex test)"
 		-DWITH_XC_AUTOTYPE="$(usex autotype)"
 		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_HTTP=OFF
 		-DWITH_XC_NETWORKING="$(usex network)"
 		-DWITH_XC_SSHAGENT=ON
 		-DWITH_XC_YUBIKEY="$(usex yubikey)"
 	)
-	if [[ "${PV}" == *_beta* ]] ; then
+	if [[ "${PV}" != 9999 ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
 	cmake-utils_src_configure
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 98c675ca08af..f9b8a8fd9f51 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -14,5 +14,5 @@ DIST puppet-agent_6.3.0-1stretch_i386.deb 19243158 BLAKE2B 52c36e54ecb2e1fcc9ef5
 EBUILD puppet-agent-5.5.7.ebuild 2478 BLAKE2B bc197abccc5e3ee2bf58c799e56437a818e56994309963561497e8eb70dce277e13d14c441b1cf4da0fc8f688af3163e87fa9044e4a3f48b71953666f65d7e40 SHA512 742a16a57da4578a0d4db4ebcf60487b6278070e3210c775d7c6b3bb0670d7cfae63c7cb661b327d3373f87bb8f348b81baefc872282e3a26717ba18485fee85
 EBUILD puppet-agent-5.5.8.ebuild 2480 BLAKE2B 2dc21f5294f4ab42011e2359caadaf207a16e7a2eb235cd33ea4300c41c5ecdd8df771c92eb350d7e5f7334b207b42540271f016c2cf2560f9d38bb41c3e3113 SHA512 b8f39ea59b87fdf1c6b83ec6cda1bdc66650c15287219060f42015928f2739dff8084fb7722462201abe950c8888667796f76bd83cda1bfa48795af8d472f202
 EBUILD puppet-agent-6.2.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
-EBUILD puppet-agent-6.3.0.ebuild 2177 BLAKE2B 84453f7cf7d5f5318eb7aef13050c331cdf903cd8306387db135ebcfcb2fad4645aee9429920482e5952f94f12338d4bb2f36b43ab69c6f325a8c5efb781899e SHA512 b11e26983e25c1c60ac0e279b512696048914cca0acef6041854a9b0fb5a50cefdfc5d146481ee71eabc6660a2a06d31a8c257d345ac89542be492387d528dce
+EBUILD puppet-agent-6.3.0.ebuild 2175 BLAKE2B ce8fa475cb041b92b115452b2ef528e26f2e10d7f42872ed79a912f7567d091a4a361cf8cca3e8fee200c9c00005a6c865e53b66baea9d3c6dc6c260ac1e3fb2 SHA512 1fd6e77b9954f73796c398fecd3b0f6374f6e7eae7a2ed927a7cc26cb5009a167bc6441b41fe5c8fb2d752194625837723d867051b403c543d7a81ecce18f843
 MISC metadata.xml 433 BLAKE2B fc93f68be51fe0b46ffe44204f1a786375b0377168fc254be5b4d6b6d9f2ac4caabeec37064741ba951ce10e96612c2c612904b49ea63d6c40a93492b1ab853f SHA512 ad0a7b8c9b0898bca444d604071a12099559ef2ea3179fc2f56ef9b4a89de6b0791e462e1dd8a3fdfb56e22aca53b7c6e6451bc31afe242c174841c2765a0402
diff --git a/app-admin/puppet-agent/puppet-agent-6.3.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.3.0.ebuild
index a72df734d6b1..c648209a4a7e 100644
--- a/app-admin/puppet-agent/puppet-agent-6.3.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-6.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index b1f401c24a2b..ee0e4a4915f6 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -16,5 +16,5 @@ DIST puppet-6.3.0.tar.gz 2831909 BLAKE2B ccf6353c0fc1fcdd4ac06e79bd8d91980162b8f
 EBUILD puppet-4.10.12.ebuild 5623 BLAKE2B 5653e7a7ff00a41e59acc42da38a47f78c25e2befdf034a7697d6cc37b1b0c7236a7f0fe6a8b0f224b08905d2fd74e20e8fb43e67e7dd1c3afc5ebaf3fe357f3 SHA512 4ea6f32bd809bb4e8ac90b2cb6205cc464dc9ea3cb97fbe3e14deb6890a04e9095f3d9896a99663ecd0d57a80df16b283ad8c55f8d0f11d1bc4eecc477a245be
 EBUILD puppet-5.5.10.ebuild 3824 BLAKE2B de47036b3db77506272ada8f0ec8af05a69a98e75e9d8c78ee767ba82b2762d639bc7ef2d7b51b19622766bc6cbcceef43890c2aaa25a91dc6841b3ab7507bc7 SHA512 2b0069346f7b4891d8158a9c1a3a7d6190d2e4854988bbfab4cec1815cb797be0a70a13748cd974097f56a3073c00eec8e6a1f25dfad987e622634077c15565d
 EBUILD puppet-6.2.0.ebuild 3655 BLAKE2B 6589c4e2d07056f8949e942e54edb401842377263462f7c0bbdc66c907dc038bac06296b6479c22919d0a4740f0f61e443623823ff6517759d4188f576ec01e5 SHA512 221ea214e4222aff478bd3777e468d1cb377b23cd0008d9fc25cba7f5a1114e7d3f475e7161d1d0300d49b472e26a1be4686f5c9a90aaed23ec36d42466aa3f3
-EBUILD puppet-6.3.0.ebuild 3657 BLAKE2B 348472cfdac195d18c5fb0f0430c64f9c8a91c5e912cdba02c2e229d66894f9c748fafdca0a5c77a7b8a861ae8ce8dd31fbbf37f1ae6ba3599707baad503034d SHA512 1ca964aa0fd78fdf7459383e5d1bad770c60908757ff0216e240268ad02142a18e91eb57562841819df459716052cf4187f4fae7b2186cc5eeb6f7152f1c0bc4
+EBUILD puppet-6.3.0.ebuild 3655 BLAKE2B 6589c4e2d07056f8949e942e54edb401842377263462f7c0bbdc66c907dc038bac06296b6479c22919d0a4740f0f61e443623823ff6517759d4188f576ec01e5 SHA512 221ea214e4222aff478bd3777e468d1cb377b23cd0008d9fc25cba7f5a1114e7d3f475e7161d1d0300d49b472e26a1be4686f5c9a90aaed23ec36d42466aa3f3
 MISC metadata.xml 1514 BLAKE2B 54902aeb644661563205d2200b71fdb6c0191839643968ae3249b1438996bc6b2846fbc4f9487dd83c28e9501407153fcc21255ad7ed6356aca3fb9121ab6abb SHA512 3ae8d47ac2a12085ec4adcb43d0428dc0b85fb561bbda39afd01ba7466417a24f9630d37c8461f99ec1aa3eb4f118cab0cb31703f486ab6d3a65798119277c64
diff --git a/app-admin/puppet/puppet-6.3.0.ebuild b/app-admin/puppet/puppet-6.3.0.ebuild
index 1d12aee25d2c..87692a87fff7 100644
--- a/app-admin/puppet/puppet-6.3.0.ebuild
+++ b/app-admin/puppet/puppet-6.3.0.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/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index e04f00e0034e..70c547cca032 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -6,5 +6,5 @@ DIST puppetserver-6.2.1.tar.gz 75683557 BLAKE2B 7320d7abdc9d5c59953f41773c7f5294
 EBUILD puppetserver-5.3.5-r1.ebuild 4894 BLAKE2B 23e8e5a9b5d544c5107e8c56b5fffe727a06883dfcd13cf55f519e70a77798424a217970c4c38c1c703466a2ac16fe0032b9ccb7e377db5c40bdebba238caa53 SHA512 f43549918d1bfe8a9ffd444bd9816e91cde25b4939432949f28e4be5bf7081175bf524cbb66e9c9aa177b9da1844cb58155b1340b301c282a721db036cb83443
 EBUILD puppetserver-5.3.7.ebuild 4893 BLAKE2B 802069d0b2e2f414ed43eade2f993c708c9769ea25bbfeb7a49ed40e6690039a10f3014f07292b3a95eb42b05597aaea385e386d986fefac2b42eb3de6b7f4c5 SHA512 77a1f8e429a109e1347e47ba13198b7bcea17ec6564e84d1bbd4bafe1652b74507b3086d0ccd47da4fa04dbbaa177c67d2a8a0fc1043938948a4b50598c74339
 EBUILD puppetserver-6.2.0.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
-EBUILD puppetserver-6.2.1.ebuild 5356 BLAKE2B 4ef4f776eaebfc8e127a2233321fd5377e103be0454cab7752be03c69f835f4dc80c87c9a51cfb6c2f229ddfbd034ab284bf8b362c0fe5ee4e1cdc7038ca512c SHA512 0c5c622cebbea427f97b8feb82b615c17d730747de09448aae1d083e078e428f3a97723664bda0c1abcc0b83a43f3270903ce028ffa85327042c7949bea31c6f
+EBUILD puppetserver-6.2.1.ebuild 5354 BLAKE2B c75b4c97ebd41fadf589e7ef752291425935af7d1f1528401f7dd1b2b670cc865570b8a610f1901eba1037bdaebb2d8dd2998380e001c046bcf54fe35b02153a SHA512 613533ffbcc1925f2ff040880d82f2a20c231d66697a49d6fc5fbf5a17528d3b3d1285918b83bf8ef4b4ee729656be610bb30f0bbefa827376f57da1fbd34950
 MISC metadata.xml 468 BLAKE2B eb3daaf61cea0ff7524b0034463c7bdbf2fa8c40277deb106f28fd8e1ab90964600e3922c10eb317ce826e2b9b7db5162ad1c2e6e76d4b0c01de486e6b5a89fe SHA512 0bf5e337ba3d5d3e4d84cc397ecf40d0c0ba298aa22c9d54a89381391a69a2374ce736443edacc67403490d2a4950a7c386fb4741b149d0eca700d115b0ac24c
diff --git a/app-admin/puppetserver/puppetserver-6.2.1.ebuild b/app-admin/puppetserver/puppetserver-6.2.1.ebuild
index 04fc3966a1c0..39165a39524b 100644
--- a/app-admin/puppetserver/puppetserver-6.2.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-6.2.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 57729a1a2ef0..8e76eb19eaea 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -30,10 +30,12 @@ DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f080
 DIST syslog-ng-3.17.2.tar.gz 9119227 BLAKE2B 3268a51c587e66579b30ee8d27397eeeb3ab52c7e1939ad26ad976be2670565a389fda9dbc3a25f80710f855788c85f58d47f6a3c297b8ff6efa01e0dca386fe SHA512 2b82ea047bab125d35ab0a90e933b8a282852c6b4a9a8adc3f2a0ddf392f24210ce1296d0cfb389f98e54e50090a3ded5a64c5a9529d2a90cbecbfafd620edd7
 DIST syslog-ng-3.18.1.tar.gz 4259746 BLAKE2B 3878a87bd195aadb0f9d024e1336e50268d69c00b438b5e3471f21bc4592ebd97980004c3624d9b92232b38068ebefa0c3317cb0d9b5dfeba37c479aeadc32e4 SHA512 2e6ea690f8762f3f37885118f023048c4cba59f58002c87fa1c469cb991b2ba707015b3e54c50f17c3d6e6251d798557406925a9159f4fa914331f281dc39e48
 DIST syslog-ng-3.19.1.tar.gz 4224779 BLAKE2B e938c91101c18951a5c921bea51631400bf579ebc840300c6d8411da9b8db69935d104bfe00525512ab0173b932a8e24e2fb102e17bc4ecf58b268e52ef5b41a SHA512 f625073bafa9378109d5be34591247766a62cb5a76e814f42bfbf03472e96ebe2833f19779812abfdd950a3498115f57b97c1427c280ee0dab21d3e2eb92ca57
+DIST syslog-ng-3.20.1.tar.gz 4312715 BLAKE2B df37ea15937d67823ddf25fb935be90fed2cb9b1a653d90bb447a3d674c250f6a7963a9bf4623685c5a19e11b928d02aec508d5f061135d67cd4b6d922795ed0 SHA512 19e3896a750ef68923950ca037846808f5d8bd24e64b41a024776a19654def83fce5d48b6e0805b1389494ad1435c5c7af9d79c1188454492f7228f5644ddc5c
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.13.2.ebuild 4701 BLAKE2B 4bc557a7545796a5c0c883ac3cee067396636e2292261db4f4c98c330e58b1d20e796f7214fd856d885f99fdc9f3db59ab59d3e1e0febda23ff97fdf9fedfc9c SHA512 f9ff35932c0e1af04ed237e9ded764ec1dc38d0cf952aeb1335d67b73f73262f8975cdb2f3908ee77252eef9d4ad3f6228025219bba9df263cd2b380c1c5df81
 EBUILD syslog-ng-3.17.2.ebuild 4922 BLAKE2B 560007f972492182a16701b89558923842ed5c1fa6c7e306abcc4dcc2b839b3b7404dd52214efdc5a1ac7fee0b280548e62b37b0d6a17ee0393f80aa5b0c7717 SHA512 bd08b6fff0e9022e846c7af360df41c2fbaf7d4342b0b7c099053e298b6588c535340c6b613bbc4dec0e9f7b8806b7dded125165cf0ca230733cd9e95b262599
 EBUILD syslog-ng-3.18.1.ebuild 4899 BLAKE2B d8820a1750256a9f5ee34ad3e7249a74cea84000ade2d3e1169106f336ffd3e3e1263db402350acc8693e88bf936aa13e5743ff1e1548cf744f40e2556625aa2 SHA512 3b5f475f9b596acecf905912c0d29b942d51a7d1ee3412adc1f46d658c5902bd7cb6504c6563c217e203fc9876e7253dbeefc8e5c8159c852c9a2fbad25c7d6d
 EBUILD syslog-ng-3.19.1.ebuild 4922 BLAKE2B e4f28cf97b9d63d341c632332e31020cd9bf035d05201defd12fb69b3b24a0fd14eb8db057a3d604e88dbb4b9105c78a9b99daa6d2ea80b2ab547bd909f7c1de SHA512 cf78ed7dd29b8b2a329b3146955690ba05f5b4f30f1747068f843485c9a937ddaf960132c5895ce2102c85bd5fbc46a25d8b181fc6116621aef5c03cfe3775c2
+EBUILD syslog-ng-3.20.1.ebuild 4940 BLAKE2B 2deab6224bca282b5f9f3c1380508c3eaad71600d3e55532aa12f25d23e14728019d1338a65a5d212262f4481703c61ac2ebab9db36b49c37d972b53b0a49510 SHA512 2962a7ee647136645d67b12253e23e257d547542daa8cbc86ed1c550e3eb7b4b913acf9f580ce4dc4cb4761cd7cd8ba6b11ff66e846bd048cee139f614771381
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1186 BLAKE2B 8fc7edd7e310b01dc6080332a62ed4ffc5d690d4082f800d8306232c138fac46f07ab7cebcbd40e91c2c41467880bbf61b4bbec0907e84f26cde51d24277f47c SHA512 5d8a62c83706e3bcb01b67e6873f7052c941518d566667e5b50aacdc8fcaf07a02c76ca3705369181795c2c62b5ea990cdb93501e1719d0693d597b5e6f8bee2
diff --git a/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
new file mode 100644
index 000000000000..be35011a8896
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.20.1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit autotools python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="amqp caps dbi geoip geoip2 http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# unit tests require https://github.com/Snaipe/Criterion with additional deps
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/glib-2.10.1:2
+	>=dev-libs/ivykis-0.42.3
+	>=dev-libs/libpcre-6.1:=
+	!dev-libs/eventlog
+	amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] )
+	caps? ( sys-libs/libcap )
+	dbi? ( >=dev-db/libdbi-0.9.0 )
+	geoip? ( >=dev-libs/geoip-1.5.0 )
+	geoip2? ( dev-libs/libmaxminddb:= )
+	http? ( net-misc/curl )
+	json? ( >=dev-libs/json-c-0.9:= )
+	mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( >=dev-libs/hiredis-0.11.0:= )
+	smtp? ( net-libs/libesmtp )
+	spoof-source? ( net-libs/libnet:1.1= )
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local f
+
+	use python && python_fix_shebang .
+
+	# remove bundled libs
+	rm -r lib/ivykis || die
+
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die
+	fi
+
+	# drop scl modules requiring http
+	if use !http; then
+		sed -i -r '/slack|telegram/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
+	fi
+
+	for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+		sed \
+			-e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+				"/etc/init.d/syslog-ng reload")#g" \
+			"${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	for f in syslog-ng.conf.gentoo.fbsd.in \
+			syslog-ng.conf.gentoo.hardened.in \
+			syslog-ng.conf.gentoo.in; do
+		sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+	done
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-docs
+		--disable-java
+		--disable-java-modules
+		--disable-riemann
+		--enable-manpages
+		--localstatedir=/var/lib/syslog-ng
+		--sysconfdir=/etc/syslog-ng
+		--with-embedded-crypto
+		--with-ivykis=system
+		--with-module-dir=/usr/$(get_libdir)/syslog-ng
+		--with-pidfile-dir=/var/run
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		$(use_enable amqp)
+		$(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+		$(use_enable caps linux-caps)
+		$(use_enable dbi sql)
+		$(use_enable geoip)
+		$(use_enable geoip2)
+		$(use_enable http)
+		$(use_enable ipv6)
+		$(use_enable json)
+		$(use_enable mongodb)
+		$(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+		$(use_enable pacct)
+		$(use_enable python)
+		$(use_enable redis)
+		$(use_enable smtp)
+		$(use_enable spoof-source)
+		$(use_enable systemd)
+		$(use_enable tcpd tcp-wrapper)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
+	insinto /etc/syslog-ng
+	if use userland_BSD ; then
+		newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+	else
+		newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${T}/syslog-ng.logrotate" syslog-ng
+
+	newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+	newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+	find "${D}" -name '*.la' -delete || die
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	# bug #355257
+	if ! has_version app-admin/logrotate ; then
+		elog "It is highly recommended that app-admin/logrotate be emerged to"
+		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
+		elog "for logrotate to use."
+	fi
+
+	if use systemd; then
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+	fi
+}
diff --git a/app-admin/webapp-config/Manifest b/app-admin/webapp-config/Manifest
index e044b9129cb1..741bbd24b843 100644
--- a/app-admin/webapp-config/Manifest
+++ b/app-admin/webapp-config/Manifest
@@ -9,6 +9,6 @@ DIST webapp-config-1.55.tar.bz2 72583 BLAKE2B be958dc991f0e1f6835d9c29350b7d97e3
 EBUILD webapp-config-1.52-r1.ebuild 1606 BLAKE2B 9f9f8643009e63730bc35ef404784d4883dfc396cf901d1cd13099c49bd8ccd5fea30603d2f8a2951dabcc5f4c9755a1cebde4457e4a26aed54bcce26530d4d8 SHA512 bff85d0cd35afc3fc99525ea34db8a6a49c0aa56b91ba4e8a6ad5dab9f5a34880b7f193166c0cdc40d37e51741306e091a080dfb363cc5d5401a315fce0d4d79
 EBUILD webapp-config-1.53-r2.ebuild 1690 BLAKE2B 07202fd26910ab49aeaeb12ccbacde118d19bbb99e748fa454add902b38fcbfe7b4444c668ffe3c0c7727f2915fb7fd687893d67c178d3f988d89f8deafee7b4 SHA512 3d4ba6d9bfae336fab02b3fcd5b5d11b7c28dbdaf2d32594e98ad79c321914af33cc9c761d7fb7b6b4f734e35f8d47734712d2866ca7981e4c4b296135638b46
 EBUILD webapp-config-1.54-r2.ebuild 1743 BLAKE2B 4fd352e2f29ba7289935662e424a9cbdc1e484b2021f027cb60c102aa790621535a8861e0a0f9dae07556ee303d1ffc109735c7e0db1beb2c7f0d0434ec04a55 SHA512 be5330d0ecd6d05d8a5a539baaffd1919079bbbf22eb508789ef306a0e9cdc513268a3ca19fde73ebc7182adff30b34813fe47d1226b8d66758fd6f2da8525d3
-EBUILD webapp-config-1.55-r1.ebuild 1749 BLAKE2B 858936e485482eae2d04f3baecc698aa4af9fa22027109e2cd930e16c0adea7621db2b0df21709b920b10a2207f53e8ff82276c05463bf65bc6075f1871f01ca SHA512 4bb2d185ac159bf870d32333d06cf31d5958c5692a983ae23b6fa6fcad2d358bf30ba4268942a9c5e04a9308b7ecb26b97df1d514a5fd6b10c229f8d4ac2aefb
-EBUILD webapp-config-9999.ebuild 1875 BLAKE2B 34626a203c536160711fdc2a90129c33d1223f1275dd5ab21564454c0ac50addb18a6688677936539f357a0fd56f1ec1f454090b43975c3d6b521d308e29bd31 SHA512 badc7e1f37c48da80e1550a8486fc537a644d06fdbaa5f598c2389c29383f096b109b7274827e1b99d23a4a0490761cbcea24e1d7fe2e170273676dc9cfa5b49
+EBUILD webapp-config-1.55-r1.ebuild 1753 BLAKE2B 267a9bfe7a893fb84139f23c1b4596b6b8c7b1ba93ff805c21c4c00943542f810245de041cade300b75e6058aaa45bbf5fb70082d3a80ffb8d740a891eb4fa80 SHA512 ef991e949a2e1aa214ddad92d3806adc8eebbcc592e3bcc7444877478985822e36e91da26349431dd63e14d3ab8dadedef5960e41d594dca67c4898e63821d0b
+EBUILD webapp-config-9999.ebuild 1879 BLAKE2B 3661e255a7b8b3eec9990c37099e27418f98bc0b314a0379fe1dd90a28bfd1750c6f2f196a3b742e22477cbf48c18b1cc794ad9018819480afb61e76973ef488 SHA512 a83ad8c1c696fd6794b98463d3c45fb255c2c09111873618f976f704eb09b8bb546bcb22c26ed40a153f563801afb9c0c241287a3880f2e99d453891a4ee501b
 MISC metadata.xml 549 BLAKE2B 44f2ec07f40387bd51440d500cacc4ff24cbb3d1ec2e1c9bec29119a589e4c4bb005723d861be2ab9c1929d74d209c10771de5500eedb56e44265969129201be SHA512 1c99c9b52ab10378a3716d3f6dd1d6f70f61ac6bcf0c8a934254b71376a429f601358ad1108292e03ab780bc6c53810fd8a484e42a4ad6f959fb1903ed591b7b
diff --git a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
index be1d9c659f8b..c70dc1eac209 100644
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1 prefix
 
diff --git a/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index 08cda6204783..6ce237b3e82c 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
 
 inherit distutils-r1 prefix
 
diff --git a/app-admin/yaala/Manifest b/app-admin/yaala/Manifest
index 9498fc6c5bf0..ce711583c960 100644
--- a/app-admin/yaala/Manifest
+++ b/app-admin/yaala/Manifest
@@ -1,5 +1,4 @@
 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 1623 BLAKE2B 606c3b8b9e69c8b4e4d2887ebcc38ed3523bafd6e87bbe2d7ea52523fd02fecafc0da548dd7a8f0b62fa102e3d6e3d38f5f5cf2b3316fad6290ffbead848658a SHA512 63ccbeedf296fbbea7423dddf5ae04b38855dadb341b8483aae17df9932489fe0b940680c3a43861e8843e296e155817bfc46dd9837fa1317b240a6fd80a7eec
-MISC metadata.xml 337 BLAKE2B b1435fe71f760cc4fd4b6bceee0d4675b7f7e7b89986544003cfb7bbf59851b02025a8b0839d446efbde8c8240bcbba782d8f88c9e0db59b227de91dc885043a SHA512 a24db5faa68733175428ecdfc9c333e5209cfdbaee9e40a23af29d188068d5400d14d60c7239d890d7e66f640c4a2023cabf9b6d131d2abe58f0e90b221119c6
+MISC metadata.xml 238 BLAKE2B fbb26a50a5cd4f4478d909e0aa54bc63c07c072ad947198f61296cd359913b0d7e34fcc3ca64b64db0ac82ed4930d27d7ff934f5134e0a1fc4f2b1eac8c02651 SHA512 af9c2c7ac7e822d72151c5fd3ab45d2f6d88284a6d3e4a845df488c1a2938084ae7baf1fb3d907292d4e672e6c1d6e636a6ea554316bf53e971e2c81a11a3e1b
diff --git a/app-admin/yaala/metadata.xml b/app-admin/yaala/metadata.xml
index 893290974a28..1f0914e3ecd6 100644
--- a/app-admin/yaala/metadata.xml
+++ b/app-admin/yaala/metadata.xml
@@ -5,7 +5,4 @@
   <longdescription>
     Yet Another Log Analyzer
   </longdescription>
-  <use>
-    <flag name="storable">Support for persistence of Perl data structures.</flag>
-  </use>
 </pkgmetadata>
diff --git a/app-admin/yaala/yaala-0.7.3-r1.ebuild b/app-admin/yaala/yaala-0.7.3-r1.ebuild
deleted file mode 100644
index e974cd81bf30..000000000000
--- a/app-admin/yaala/yaala-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="Yet Another Log Analyzer"
-HOMEPAGE="http://www.yaala.org/"
-SRC_URI="http://www.${PN}.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gd storable"
-
-RDEPEND="dev-lang/perl
-	gd? ( dev-perl/GDGraph )
-	storable? ( virtual/perl-Storable )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PF}-correct-paths.patch
-
-	sed -i "s:/var/lib/${PN}:/usr/bin:g" packaging/${PN}.cron || die 'Failed to correct path in cron file.'
-}
-
-src_install() {
-	dobin ${PN}
-
-	# Switch to ^y when we switch to EAPI=6.
-	local mod="Y${PN:1}"
-
-	exeinto /usr/lib64/perl5/vendor_perl/${mod}/
-	doexe lib/${mod}/*.pm
-
-	exeinto /usr/lib64/perl5/vendor_perl/${mod}/Data/
-	doexe lib/${mod}/Data/*.pm
-
-	exeinto /usr/lib64/perl5/vendor_perl/${mod}/Parser/
-	doexe lib/${mod}/Parser/*.pm
-
-	exeinto /usr/lib64/perl5/vendor_perl/${mod}/Report/
-	doexe lib/${mod}/Report/*.pm
-
-	dodoc AUTHORS CHANGELOG README{,.persistency,.selections}
-
-	insinto /usr/share/${PN}
-	doins -r reports
-	doins -r sample_configs
-
-	insinto /etc/${PN}
-	doins {,webserver.}config
-
-	insinto /etc/logrotate.d
-	doins packaging/${PN}.cron
-
-	if use storable ; then
-		dodir /var/lib/${PN}
-		keepdir /var/lib/${PN}
-		chmod 777 /var/lib/${PN}
-	fi
-}
-
-pkg_postinst() {
-	ewarn "It is required that you change the configuration files in /etc/${PN}"
-	ewarn "before you run \`yaala ...\`, otherwise it will refuse to execute because"
-	ewarn "Setup.pm checks whether the variable 'select' has been unquoted and set."
-	echo ""
-	elog "Example configuration files can be found in /usr/share/${PN}."
-}