gentoo resync : 17.12.2017

18 files changed, 10 insertions, 309 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 89345c01507d..9121a18e5616 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index ae5451ae4e38..aa0a23e217df 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -5,6 +5,6 @@ AUX conserver.initd 1055 BLAKE2B a515ff3c81c1e66b53f49d28db082d2a9eb3cd69a60f73b
 AUX conserver.initd-r1 1088 BLAKE2B 2ab26bafddf29f24488b147c2a90dca6e482361af96fc008df0029581a0308f380db36b7985ac8fdfc1884e0eeb897d3e84fed9ed3341e2b9ba35c9393850200 SHA512 332e59313f066a8e313f65b0f04c4a7f464cb77f9ac2b3ab5beb24b5fee393d9036b9f80a1c9cc0f6ba43a5c3519801aea6d61f96bed861d5caa3130ab4ff1e3
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.1.18.tar.gz 323247 BLAKE2B 48176ba8be648df16ddb18c1a760af8069f7d926d2e0767e3b7ef903276d6104cfa9464a6ebdce009720fe5118862d89cf5371e104d17b967e11fe8e8968e8f9 SHA512 a8029aef5fd84f93eb3ae56ba7f751d79a6065c012bfd805e050f8c9edf09fd660c272d3f3ce0a47cfb17678574babbecad63f8bfd50ad4fdccdbabc2249435f
-EBUILD conserver-8.1.18-r1.ebuild 2297 BLAKE2B e28ba005976076ab545c70ab81d6c54f386db8aa83c59ba3dedcda6e39a8279a6b75e82a13b616a589fb80764784b30e8da0b6833188aa3197b368e1a6978c66 SHA512 1e9b8ad6a9731ab5d723d3122bd0d183090df5b216fc2cfb2bba82cdd0af6226019062206510c197dc1e42746093e4c847e949e3ecb65521e400191cd74924ac
+EBUILD conserver-8.1.18-r1.ebuild 2295 BLAKE2B 12fa9d3f0521ed32178e4897d88467b6fa96189ae893ae3cfbfa7052f5840c31f36e1c9161a6b61b3598ddc96258cfc44c3b02dab7f0f8777efc9909e0b98207 SHA512 313f09acf336e2e9d7acf2447f0b9545741835a9e32b70db716b1136542b7cfb8ac6a03182e5d2d4f421b700e99e3b8dab393f857a5317f857f5dca3661230e0
 EBUILD conserver-8.1.18.ebuild 2230 BLAKE2B 2aa79efe824e6fbaa8fba254016187842699ca9aa119c693e25ba071d670065ef3ac8aa0f6363275b11703210d8d5baf6dd6ecef053de236f3ef48353f9d4e96 SHA512 a77a9c4550d25b134033f7d549528f58438f06012d2ecc8564dde521ed4dca880b7fd9ad75b43e0061988574a43c395e7760bb3b10e9709bdae54cfbf9311dc1
 MISC metadata.xml 1247 BLAKE2B c404870bc8f1d87848d3243cfe7b23509a3975a22a45d43e55b94218a2e6dd8b529116e17c3c1b3183d86446ffbeecc9ee7cb7849635f0b9cb55e2fefce26c0a SHA512 a5d15b8c926b8f073c1c70bfe591d118880f58157e4e128d9f048f96898905bf0a49ea6710f8684d169d5e128a80bde242b9c1d787de59dba4449816d0e30e54
diff --git a/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 6ae29a021914..33156624841e 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.conserver.com/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="kerberos libressl pam ssl tcpd debug"
 
 DEPEND="ssl? (
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index 5ba12b0b039c..4cda3638a41b 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,3 +1,3 @@
 DIST OpenDoas-6.0.tar.gz 28482 BLAKE2B 8d35a12f18609c9dd7746ff8ce7c39d16d7c5e595a05c0f1b91211d757029ae78311573228178f95ef92624f7a49d6ca1d1d0efd264104d66e1d20a8aa623241 SHA512 2bf5e00895a45d87785e7a494a1506844afd843ef5375e0b0e3795ebc24712bb941c6feeb87e426e41a240d40aca9b4c099f77220745bb7142a7a4b303441f60
-EBUILD doas-6.0.ebuild 761 BLAKE2B 3948971a6ea62d4459862c0bcf16a704b3c8e5b5aa61e1ff94162adccc402711d32d64163e9781eb13843fb83d1871aa5d03ce522676e4925b056185a6e35ac9 SHA512 13231d84919f3f3b4b157637a122428556cc95096531761a99f8e76d993538e1f3a90f2ed1bf05ddd583283b9b266e0d9541185a999495d46040e256d1c4a0de
+EBUILD doas-6.0.ebuild 760 BLAKE2B 2d04b25a4e44ca9b1e4ab1617a4a418b7ee3fc85e0567238288457b8d41db56eccb96104328b1293520ed1490ecb4a9147be8e754df1b967c12ccaa58967b2b1 SHA512 ad68334d6e0496cef6f35f976b478e4247182bda49d8a17171f709e706857370dab1de2b570d6d4839f7c71b5f48a5ea6bb220731a61a076acf317e5ec87b3c4
 MISC metadata.xml 435 BLAKE2B 63f345e2db83040c0cd34cce3dbc5f1f53495f3dc6c4b54ef9b09085eb32708a81dbe1e36f8702649cad0f2bae6f3affa4d95a5e996df5d66d6d0425136c09b6 SHA512 87342e8a10501960ff97fe359c4caa697269db4d95e5e008705aa23467b164a25c6cb8c7158530c39cd19a1840192815c3e336b09ce71938bc56dbd2819b18ec
diff --git a/app-admin/doas/doas-6.0.ebuild b/app-admin/doas/doas-6.0.ebuild
index e07d93c03e03..4a32035bdb82 100644
--- a/app-admin/doas/doas-6.0.ebuild
+++ b/app-admin/doas/doas-6.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="amd64 ~arm"
 IUSE="pam"
 
 RDEPEND="pam? ( virtual/pam )"
diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index f3ac105584bd..5a3f88fc2b47 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1,7 +1,5 @@
 AUX keepass-2.36-xsl-path-detection.patch 1446 BLAKE2B 15c9d15b44b0748bc114ff45dadb5824f369a454a1126cb61293d55f86f9f01fb659932729dbc205a522aab32343dd87b74662927d60edc50750af602a959cc9 SHA512 6e1279363bf355be8846c012840271525dcbeccfaa9dc9d1bc4b39068ed58dae4fc421fed4f0fd5d0d2311436d35648f04539fa122066222cb15a66c3383ceae
 AUX keepass.xml 275 BLAKE2B 8e64d7e60b0808b9505387caf97c9198d14ead3510c72d3a62cb747a2f09a64f63360f95df12043a97262fde8fd1b6882fe86d07d4ec483cf30788391be8f940 SHA512 a6055604ff4ff9e905012b5f8448540ea3b3fa8527ce1fd247fe4e5329e6861e5e7a01ea5ed907c41c073d81ee02452392ea0b0d61bf1119dadd300911a450fb
-DIST KeePass-2.36-Source.zip 5063221 BLAKE2B 75c16a482ff0a4c3a6d4f83e423d2eaae83c767875a53f693c0aa3bcd1cfbdfa46325c28ba957fe85fba3b5b9f8a0a2fd93ba0738051c9229ddea12685854a1b SHA512 16d51ed6bc437172765f69d1d67862afe7219a0898d13b4609198bbd7b5107620f1be418f5ea6ba23a5e3c7ca12d45ba3f0f3778c516eea6b2b953bc291cfe41
 DIST KeePass-2.37-Source.zip 5080663 BLAKE2B bf74c93eb732d607fe87dc29d3e429b37f1052b258e980127ce1f687423a790bfe298f06c1c459888c60b066a45053447fbaed730e3d38cd6b6dd48d53fbdc34 SHA512 d094793a3216181ae375fb1343a809a20c358786bdf369c0171e5b7ca17a74bada314875cf410d84efaa4fa2b13e199de9be3c60f5f4e2c189241e4fffec8ad8
-EBUILD keepass-2.36.ebuild 3036 BLAKE2B a1abedf46c4471659192b6b0aea80799ecc5318230305ca3a50721907a5366a2b5c52c5f6ec4ca4f08fdafe091bc648ac10f3099632238daee9dee619429ae57 SHA512 d4320aae524fe146ece9b319d5e94382197012e3f38f18a7213c5b6b82ff4d68f0bb36a1eb57cb978c7d6ce04339cefdb4e751127c53d470ed27c086e8389174
-EBUILD keepass-2.37.ebuild 3038 BLAKE2B ed4c3e3b0f82606497670d3c1fefc9ba0504a37580c570717d697140fa6a05011acb369b60735c58e9e16a36dacd19b6b4cbc925ee3075c3db7758ae60a3e4c7 SHA512 65b39e26f54deb365bb6783615e7560ac858bf4b0b66f680699844ed4ff46b4ff26007cb19dbabcf2bf761865b9e950e2de38d09e531962e0b6f5ebfa54b7a13
+EBUILD keepass-2.37.ebuild 3036 BLAKE2B a1abedf46c4471659192b6b0aea80799ecc5318230305ca3a50721907a5366a2b5c52c5f6ec4ca4f08fdafe091bc648ac10f3099632238daee9dee619429ae57 SHA512 d4320aae524fe146ece9b319d5e94382197012e3f38f18a7213c5b6b82ff4d68f0bb36a1eb57cb978c7d6ce04339cefdb4e751127c53d470ed27c086e8389174
 MISC metadata.xml 791 BLAKE2B 5372f9ae70aaca07a660beeddb0a6a07f8fcc2f7a5d0d66ac4ed6b05a1f4ee0e21f14a29b2b3adf548e91d6187ec2ccf8047b307aaef03ec3d3a6936b0120d60 SHA512 fb4fe73e3a2f4d36f36ecae7b9c13dc48db967cced94f0741bd6a2ae91d2a1d502ef9d2c9ace534c866268829d430f91a79f1e7ead89d03cbdfd4a94b89df861
diff --git a/app-admin/keepass/keepass-2.36.ebuild b/app-admin/keepass/keepass-2.36.ebuild
deleted file mode 100644
index 6f098aaf79a0..000000000000
--- a/app-admin/keepass/keepass-2.36.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils xdg-utils
-
-MY_PN="KeePass"
-DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
-HOMEPAGE="http://keepass.info/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="aot"
-
-COMMON_DEPEND="dev-lang/mono"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-dotnet/libgdiplus[cairo]
-"
-
-S="${WORKDIR}"
-PATCHES=( "${FILESDIR}/${PN}-2.36-xsl-path-detection.patch" )
-
-src_prepare() {
-	# KeePass looks for some XSL files in the same folder as the executable,
-	# we prefer to have it in /usr/share/KeePass. Apply patch using base function.
-	# This XSL file will not be upstreamed since the KeePass creator said that
-	# including this patch would break the Portable USB version of KeePass
-	# (which keeps/looks for xsl files in its own folder)
-	default
-
-	# Switch into build dir so the mono prepration script works correctly
-	cd Build || die
-	source PrepMonoDev.sh || die
-	cd ../ || die
-}
-
-src_compile() {
-	# Build with Release target
-	xbuild /target:KeePass /property:Configuration=Release || die
-
-	# Run Ahead Of Time compiler on the binary
-	if use aot; then
-		cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
-		mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
-	fi
-}
-
-src_install() {
-	# Wrapper script to launch mono
-	make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
-
-	# Some XSL files
-	insinto "/usr/share/${PN}/XSL"
-	doins Ext/XSL/*
-
-	insinto "/usr/$(get_libdir)/${PN}/"
-	exeinto "/usr/$(get_libdir)/${PN}/"
-
-	doins Ext/KeePass.exe.config
-
-	# Default configuration, simply says to use user-specific configuration
-	doins Ext/KeePass.config.xml
-
-	# The actual executable
-	doexe Build/KeePass/Release/KeePass.exe
-
-	# Copy the AOT compilation result
-	if use aot; then
-		doexe Build/KeePass/Release/KeePass.exe.so
-	fi
-
-	# Prepare the icons
-	newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
-	newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
-
-	# Create a desktop entry and associate it with the KeePass mime type
-	make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
-
-	# MIME descriptor for .kdbx files
-	insinto /usr/share/mime/packages/
-	doins "${FILESDIR}/${PN}.xml"
-
-	# sed, because patching this really sucks
-	sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! has_version x11-misc/xdotool ; then
-		elog "Optional dependencies:"
-		elog "	x11-misc/xdotool (enables autotype/autofill)"
-	fi
-
-	elog "Some systems may experience issues with copy and paste operations."
-	elog "If you encounter this, please install x11-misc/xsel."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-admin/keepass/keepass-2.37.ebuild b/app-admin/keepass/keepass-2.37.ebuild
index 4cdca74eeb1a..6f098aaf79a0 100644
--- a/app-admin/keepass/keepass-2.37.ebuild
+++ b/app-admin/keepass/keepass-2.37.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="aot"
 
 COMMON_DEPEND="dev-lang/mono"
diff --git a/app-admin/keepassx/Manifest b/app-admin/keepassx/Manifest
deleted file mode 100644
index 180a1477310e..000000000000
--- a/app-admin/keepassx/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX keepassx-0.4.3-gcc47.patch 424 BLAKE2B 13ad7abd4ad58f0d37fe7b0606f81b2177031ddde1e292364ce7a09b67cfa9126055b883d9121c54c08b22e490f20dd3e4f9a97fbff2c2c7eff0e7f8ae0caced SHA512 89e08c9e3584f50c642fe0fa5517e84d18bb10022696b24f543cbf776bc7e4327bbdb89a94f86efbbd7ad40777885d3e34b380a22b3c2a8e941f1ebf8f3801d8
-DIST keepassx-0.4.4.tar.gz 1371560 BLAKE2B b3fa9fa0c693e52a9f0c03a6eba2719d7b2d86d48c9173e996dec8eddc7be5596b1e59ae24d2e567c42335a5a3158c758d6a5052eb479988f6b7aec6fe6c3266 SHA512 2fc93d77f5576a0cce6514b39ee9b319efaa72b475762438eed5601c5e3edb7693a5fbb9c1e741be1e5d3a08849bc54b0cff90fe3a86cf240129febc0cc703d8
-DIST keepassx-2.0.2.tar.gz 1532353 BLAKE2B eb73699bf18f3885917ec0147465c27c754d5d26cfaafa4ad7bc93744395015f98bfde05953bbe9ea9a7529f8421c5bc9df9ac59b5c3356fb47504fe4646b3f8 SHA512 3f661d3b5807c5acafc65310ecd8bd4d0bcd51a0c919e219bba616cb3f54434f8f81ba533ab5ccec00d454838355ff048f4ffbc308442fad4f973d1766b95072
-DIST keepassx-2.0.3.tar.gz 1540235 BLAKE2B 3c5c7176eac3581b8c4dcfe5ad38c1d79ce83e6a662ce6b9b01e82e15fc3353d3f96377d6de332b46531ca49e11979f7ef058989e5adb341a77e79c44aadcc53 SHA512 bf1a4ffa49fc4a6b7a27e6292981c9c13920712b4cd86759a99976f7e0593a243ea14575c57d664ba7e55d2449b5d83bc3d43a64a9a6972335e52234da79d773
-EBUILD keepassx-0.4.4.ebuild 929 BLAKE2B 24c850a88598b64f798ef7b10a59ddc3fd048fe4ba8de6159ad52b0b6560ab780aaf956c0fe897d9abf1cc60e8c981309cc7293aa0f525ee3436b878344ba134 SHA512 a8f253848c07ed309a898239a2338f36cf38b278458fc1953e00d865c5d7e245b7cde23b6ba88e91ad91041712d640f268009b14230b2b7614a546e0384155c0
-EBUILD keepassx-2.0.2-r1.ebuild 1041 BLAKE2B 6cda312bbeb7c87c357d0be98bee5dd5d5f608169e3459647b50e657e3adf36bd2da7d5232c076630a6de5f4339c21b5b6560130a4f503f013674ba31265c177 SHA512 c017a2bbdc7c7269def7f8b3a2ccaaaf4b8e92dbb7611246c9702fcc730234ba20390b96722cba064fbb7c4801aaab0a73271ab604e566ef9a6659ebf4e41330
-EBUILD keepassx-2.0.3.ebuild 1044 BLAKE2B e2c0890eb5d87481444f7085a6631bc1aa670aa25db03fa90632d3497afdc466cdc573cd69ef3f87edfc97aea67aac945790101da7632cfe98a2835d4b50b286 SHA512 e699b6bef16ef35a4003c21924b019b17db34c969276c94218765234a3a8d6702a88c4fdea48963b9ec50094a27d199768c751fe6f02fdf123665fff6b8d6386
-MISC metadata.xml 637 BLAKE2B 8133a3d945b30a7ae461300fbb74ddb22021fcc27fee70177489f9f19e3ecfd95b7ac37046de1976b0480ab56e3f01c0757fd3be863d052df9d354443512fad0 SHA512 16222209755e19e17fb7a887ef3c1b04e5e819307d614239aeb4ed6716245dc0d41f49e3dccb485c1f651ffe7275f6940bdd7c8018a3e1a7baefe3b9ddb8316e
diff --git a/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch b/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch
deleted file mode 100644
index d5d0d8bd0882..000000000000
--- a/app-admin/keepassx/files/keepassx-0.4.3-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur keepassx-0.4.3/src/lib/random.cpp keepassx-0.4.3.new/src/lib/random.cpp
---- keepassx-0.4.3/src/lib/random.cpp	2009-06-28 16:22:31.000000000 +0200
-+++ keepassx-0.4.3.new/src/lib/random.cpp	2012-04-19 00:20:15.757415510 +0200
-@@ -19,6 +19,7 @@
-  ***************************************************************************/
- 
- #include "random.h"
-+#include <unistd.h>
- 
- 
- #if defined(Q_WS_X11) || defined(Q_WS_MAC)
diff --git a/app-admin/keepassx/keepassx-0.4.4.ebuild b/app-admin/keepassx/keepassx-0.4.4.ebuild
deleted file mode 100644
index af2a1b3d2f09..000000000000
--- a/app-admin/keepassx/keepassx-0.4.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit qt4-r2
-
-DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
-HOMEPAGE="http://www.keepassx.org/"
-SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug pch"
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtxmlpatterns:4
-	>=x11-libs/libXtst-1.1.0"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.4.3-gcc47.patch )
-
-src_configure() {
-	local conf_pch
-	use pch && conf_pch="PRECOMPILED=1" || conf_pch="PRECOMPILED=0"
-
-	eqmake4 ${PN}.pro -recursive \
-		PREFIX="${ED}/usr" \
-		"${conf_pch}"
-}
-
-src_compile() {
-	# workaround compile failure due to distcc, bug #214327
-	PATH=${PATH/\/usr\/lib\/distcc\/bin:}
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc changelog
-}
diff --git a/app-admin/keepassx/keepassx-2.0.2-r1.ebuild b/app-admin/keepassx/keepassx-2.0.2-r1.ebuild
deleted file mode 100644
index 8baf1a36ba4e..000000000000
--- a/app-admin/keepassx/keepassx-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot xdg
-
-DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
-HOMEPAGE="http://www.keepassx.org/"
-SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(CHANGELOG)
-
-src_prepare() {
-	xdg_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_TESTS="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	xdg_pkg_preinst
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_pkg_postrm
-}
diff --git a/app-admin/keepassx/keepassx-2.0.3.ebuild b/app-admin/keepassx/keepassx-2.0.3.ebuild
deleted file mode 100644
index 3abb492c1956..000000000000
--- a/app-admin/keepassx/keepassx-2.0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils vcs-snapshot xdg
-
-DESCRIPTION="Qt password manager compatible with its Win32 and Pocket PC versions"
-HOMEPAGE="http://www.keepassx.org/"
-SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="
-	dev-libs/libgcrypt:0=
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"
-
-DOCS=(CHANGELOG)
-
-src_prepare() {
-	xdg_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_TESTS="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	xdg_pkg_preinst
-}
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_pkg_postrm
-}
diff --git a/app-admin/keepassx/metadata.xml b/app-admin/keepassx/metadata.xml
deleted file mode 100644
index ecd1212a4fde..000000000000
--- a/app-admin/keepassx/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <longdescription>
-    KeePassX provides a safe location for your passwords and similar
-    data.  It encrypts its databasee with AES either by passphrase or a key
-    file, compatible with a PDA and Windows version.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">keepassx/keepassx</remote-id>
-    <remote-id type="sourceforge">keepassx</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index caafd074e111..3f5c1d6a98e0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,8 @@
 DIST keepassxc-2.1.4.tar.gz 3345520 BLAKE2B d599321a412abc05ad0a911b8fe4d14e840d491e59d3f33172a5e6b10812fe8e00d03f23abcc9637be1b8c16b5c7ec640bbc2af63059dc0dd25c99f0bdacfce9 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8
-DIST keepassxc-2.2.1.tar.gz 3880551 BLAKE2B 9580e263865d186d1f6ad81152ba406ed8ef3d7c9356141392b5b2cd3bc42af57eef7db01028694471097546c621896f2024ba029e10bb2da99bb5f22360d773 SHA512 bce2a0d6d3ad32bb507afac22670b34c37f5e36de6a30bb7c9b5a523c12bad59d95a414b90608451660fb9ce224279c7658e1892f2b99c673908449cc86e5595
 DIST keepassxc-2.2.2.tar.gz 3885990 BLAKE2B 2eb70217a4b73daac3f8eaf797c2c5c5dc6b2d8b7a76a91f45a036da034335937f3f21e48590d8493dcaa4f6079897440338650f14e75fa1884585d36d946bb4 SHA512 73a167a79af56d4b6dbef7ce4050ca599f2c107a5c8af3b9e28241504572988b2d8b258135b7a34dfceae5a18cbda26b97ed513bbde14fe3d38e3f41b882d34b
+DIST keepassxc-2.2.4.tar.gz 3895421 BLAKE2B 0de35f394dae8cf8d70f75d73783965826cc03ac9f0921afa547d02e61cb04be167891d92aa0db09f007c47e96a5a7e5793772c50de14bf65a7f80a603ca6611 SHA512 f3308138d63b65a8b384a52f4723507be921d7bbf19031724886fcd12266bf2683326f5531c8f665b0e98ff63cd97251694199ef748191e59a5a8cceb3710025
 EBUILD keepassxc-2.1.4-r1.ebuild 1540 BLAKE2B f16a6d6a45eca3926735ce4857c8007c421594e1e41a1d87feb75ce6234b92760a9221cd81734f5a8e1a55fef4f36f6faa0acba0b786dfd7c81d9f3f2c9f280c SHA512 7dcda961fda3b3166b2e38a878e2b2782e604c3373b67c358347746fccfa781082ce1c3417aeb8c1b76b8fc5ae94b38bff1442fc2477267b4a5096afdf1803ea
-EBUILD keepassxc-2.2.1-r1.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8
 EBUILD keepassxc-2.2.2.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8
+EBUILD keepassxc-2.2.4.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8
 EBUILD keepassxc-9999.ebuild 1544 BLAKE2B b0e6a6a0b5efeee5ca105a7ee9b8bbe674a9c1f0fc7a17a090c07a9287aba00c3c36f7bf8e41fb820d4056a92259151ba047ffa555a10df9639445f6d3083c84 SHA512 5695e22f30dc7e60c463ea4a0703111839345facb251e896526e4d5cb5d566516b939bc440c94e0a1b68272eeb458f47b8ddf1e529e5eb7037dca4b6698517a8
 MISC metadata.xml 819 BLAKE2B 2a55fa24065498759f3c37d00a0dd2b4782728029cfc6fdd0e140fa89d4c31b39cbd8c6445388733a6ba9c20009cd32132e31c056812281b4696a8551b1c71dd SHA512 b0607500bf25e7d4b504dd7fe0c03cf25f21cc32b79a0fe3a58d847f7ad2647c0452077ad8e16e1b2c63987ef68842b8d673fa0ebe657d918f27e0b163c8957d
diff --git a/app-admin/keepassxc/keepassxc-2.2.1-r1.ebuild b/app-admin/keepassxc/keepassxc-2.2.4.ebuild
index 15016b6c462e..15016b6c462e 100644
--- a/app-admin/keepassxc/keepassxc-2.2.1-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.2.4.ebuild
diff --git a/app-admin/packagekit-base/Manifest b/app-admin/packagekit-base/Manifest
index b02a57edc113..b37e75f77bd5 100644
--- a/app-admin/packagekit-base/Manifest
+++ b/app-admin/packagekit-base/Manifest
@@ -9,6 +9,6 @@ DIST PackageKit-1.1.7.tar.xz 1431648 BLAKE2B 0cc64e7ac38d6641a1fbd98ffad2e7920eb
 EBUILD packagekit-base-1.0.11.ebuild 2897 BLAKE2B 273c57376ea2e7a4ac18b78e1b3a2297e37186e921e0bf5dc33361a5db7aef447a417de105284a3fc181cc6b05a9c0f0b6abd172d127b90a74d6e157f8ec5561 SHA512 40f13d99bec2493be551c2bae8d34789f1155c57d5a01b5f5964f18e6124894ab31d72532d481d136175d37979752e8926d91b44bdc181d47856725c19727c33
 EBUILD packagekit-base-1.1.1.ebuild 3338 BLAKE2B 82a68620c4e6e9ff616dfce5b579eb3742e609e169b2cd3a133a8079f791e55efb85391a2b3e7af43ca12200d0a963fb3ef1701a3c6dc25f00ae064559172606 SHA512 95e673821d137a33e1622e1cad241bf9649ad1368ac4c27178643d40f39f3bc8408546f5f545dc325ca72be0586ee5dadc7f33af0c1d98acc7ec748eb305fc22
 EBUILD packagekit-base-1.1.4.ebuild 3372 BLAKE2B bac2e0a5ff37132fbf315e0958fec7237f0059191f0074169e1eaa53cda2338f408dff543325e859e6f20e0d8d900cf470e563196506fbc99af7cbcb2e4dcb36 SHA512 44ccfdf2114a4d2d0d90ce39e7b18ce8adebac5f423fda4661c0e848d39efd7a9dba12a54022e77e6171aa44037cb65b6a6c584346d1181c0ddfe18212354046
-EBUILD packagekit-base-1.1.5-r2.ebuild 3771 BLAKE2B af4ee218467a98b0763ba1de22a50823f9dcf7e3d858a30a4020b254c4d301b649f58b348f11207383efa2d8404276dec0f9e283ff87a03566200848d46cc219 SHA512 fd7bc15c563f64e7167c3f1a86128a2dfd1acb947b84fd9fd41e9aa1b1856cff91729b003484d9c4dfa9c42def6f4ded15d0c0e579e9fe562d3d68491886877a
+EBUILD packagekit-base-1.1.5-r2.ebuild 3770 BLAKE2B 6af29c8828e992c1c143bcd775e30ce06540be9654c88f596d27e2c55e2c5a86d6c5264610147d541ff806fbdfcc7dc091b33868f15120b262065f5270900dbc SHA512 9f1a65e370ddc323d25af612ccdb9c6b8738a495dad6756567ec139a666ee13e9ba787d17afef30391c46081ce9c3d7338ad525c00c5efec6578e740e6d3e00b
 EBUILD packagekit-base-1.1.7.ebuild 3602 BLAKE2B 239db1c618891fdafda012b28715891f345a88ab90067af7f633e92b63aa42cc4098bd19f2d7a89c2661c0e249f7e6edc316352ded11f0f449c69102a876f770 SHA512 4404fdc19654085863ce153ad7abd1ecc7f6507a6c0cf02bc355942cce69f421a3079c4386334b13d0dba1f45f8843ae7483dfce2bef8485fc03e827d42b24eb
 MISC metadata.xml 860 BLAKE2B 03ddffc3bdd260e7ad8a2e47ccba37b9e381d543e7a0736d00deff87db86e2718af2b00e00092ef98b38b28456c995e1c70a8d190ff38c868a732dcd37300fe4 SHA512 db5ce7f7b361c9e742413bbb222fc3dfdd2747716e5d59a71dba5c14073a6bb18e1949d0247478a0652e6011af338e74ac790503773a2bc1d60693856b6f8650
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild
index 47c4f16e60bb..d528db6ecac2 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.5-r2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.freedesktop.org/software/${MY_PN}/releases/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0/18"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
 IUSE="connman cron command-not-found elogind +introspection networkmanager entropy systemd test vala"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}