gentoo resync : 17.12.2017

12 files changed, 42 insertions, 64 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index d676d41c2f40..e09979063760 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest
index 6bcfb6679d66..3dd75879cd08 100644
--- a/app-emulation/e-uae/Manifest
+++ b/app-emulation/e-uae/Manifest
@@ -1,5 +1,5 @@
 AUX e-uae-0.8.29_rc4-high-cpu-usage.patch 399 BLAKE2B 0b8d1126bafe49ecf1ca03c23efe51287a8b8b565084560caae054f2997d61c86f248e2bca3b511bf6e283fed8c47639d5ea266a147acc77cbb4b1cabc3b7f94 SHA512 a0d6dbe9dedbabb7700e2199d62814732a0d6f09be7758aa70565ba4d4cc1a86d848e3a9b5c743871a0052ee1b19b03615ee38a174634c7a339d218bab350b18
 DIST e-uae-0.8.29-WIP4.tar.bz2 1122718 BLAKE2B 4120e7d14e4ee1a8be04839680c30dc57286524a68eb8036a8f48a0724c3581884045c2ad11bb8409a88b2f43bd132b92083e1e1cc088c5b4768f3b6dfdef458 SHA512 63d5c60ca017ba7ffaba32c4d7edceba0410b773066cc58e226c8cc2c92152eb3689698b0affe478cc63c996c731fbbf56d9028dfd000394d904f193f860473f
 EBUILD e-uae-0.8.29_rc4-r2.ebuild 4262 BLAKE2B a0cac4a45221baf189d94a7195c56ee1f27dc84cb665ec97d75d49162ce3863bca72dc989b987626e5464f28be395dfcd80de229e53d20f3e610cd8f362b48e2 SHA512 36d9ea8f03060b6f8ab1a8cd6171b718b6e8e7acf46a32075ca21fce2e114cfe2a80ddb1a524b03cd3d6e1d8c421203af515442f07ed6896307564ff914acd49
-EBUILD e-uae-0.8.29_rc4-r3.ebuild 4186 BLAKE2B ac04a4848f2328b0cb4cf6126f76730759e7602d72ab0b75b4b945d7b3821d0f9057c47e4c129a36f0bee52385db99bb8960c1f8f575b3fe157948558b37e86e SHA512 2fc6df3a4e4780cc610bc978ff8a0b9efb9873ec9d620d82953c56b2ba8d7cbdb2c4bfe9ee5f9b1c2dfbab94d68561bf692cdfb25b7713c5739859b78300bb16
+EBUILD e-uae-0.8.29_rc4-r3.ebuild 4185 BLAKE2B 1e59421bdcac3a9a08601feadbcd401f7b625b84b1a75821501d21d8c2410b78423b8cc1bfc48e36a51661f46fc563651e5c4389f1eb90f174486f7894c66546 SHA512 feb662e50ffd86c592c0c00b1b93fa8548d8c8b4a507e18f9f949ba9e10d8b554efd95d333b31c64cbb6efff61c455bae15a82d1f9582f1be4d075c1419f9f65
 MISC metadata.xml 465 BLAKE2B ddab23755d4ac531a0963f024bd4aff9b727f94a3aed47184a32a7e6f6c0b6b9d441c74cccd29028e831c9f290c8539a263317cc0e0d23928932a2f68c576429 SHA512 d66cf721c85633855983c22d2fd18e75635afe1fdd987b12a35f23caf1acb241398815ae643682864d3cd5099983b9b9c7581828ccd4668aca9d5b56fe9a8a00
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
index 4e6d90e26e80..d9078de33c1e 100644
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r3.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="X dga ncurses sdl alsa oss sdl-sound capslib"
 
 # Note: opposed to ./configure --help zlib support required! Check
diff --git a/app-emulation/kompose/Manifest b/app-emulation/kompose/Manifest
index 2eb306f5174e..19d8e28417f2 100644
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@@ -1,7 +1,5 @@
-DIST kompose-1.3.0.tar.gz 5166961 BLAKE2B e0ca1645ada0f423b01611e7c2b204b18b3b24d4709eea1ffc5e1092570c5ca3d3c609af5aa157a88fb987f65133be768e2965f272c23be6bc648bb3f62885ec SHA512 394cc35022d6c9f3e70cc8ff567f403fad84b54c71a0c7da856313162bf41223d7dff59abff372f7726404dec04283deb5e0c0960f966471f86607140eddb4d4
-DIST kompose-1.4.0.tar.gz 5183071 BLAKE2B 67a5ac97c4cec0f05e7683671837fc5d7cb868b4fac34908a40b2f427afbb5e36b04602e566996ae9372524fbb97cd1e4349a783e7e0c17c0c52db5d42fc027c SHA512 49d18e0c82d6195752e786d71ec67a388e6c64244dbc0376a7a41b1d31791a833d7a392c19487129d4047d102f1ec423d1531b0626003958c3375f2a0bf22686
 DIST kompose-1.5.0.tar.gz 5184512 BLAKE2B e9b1f7d778e0128add41218c5cef8dc4e0272e85d1345948b73c3529ff6d7e17b05e8a821812e3a5f12f076d5c6c0411fa50be86ebaac54a300b263f705d10a1 SHA512 2b366ed84b5368ab8c8921a989462931edf8f4fe751e3f0ee18f1d6fd6f5bce1534e962e92d7c0d3474ed1c87f8c40b8e2e4eb1d63892ac84a41be79e527a6a1
-EBUILD kompose-1.3.0.ebuild 886 BLAKE2B e9b67ff919dcccdb7688e4c715d1d9ce23612dab3baf7716a407afd343e420094aac2f4fd3a462a2b95f9c312f18acd2b3249b8314ef0d8f667fdf439431bfae SHA512 824599363b466e73ecdfc4ce9877e16b788c1650e330b8173203e047225ed0882c17f855e069d86447482fffa7d374b9d25f826c6f32ce61f75dfc1bf90d836a
-EBUILD kompose-1.4.0.ebuild 889 BLAKE2B 6974b342a2646a2b86cdc96020a922830ebc2d8e5e664ae25cd2f4584380002d36ecf6f9ebe1b64eb38ac8de3506bd9340625e8b2f9545396406b3c413cdd36c SHA512 5010ab56cc77f0490ae10901ae24ee10fb66cf3e0c1a6c5e25a35e77b3603e3146b627ce81b29de80403771ef83159770ad6a308a6939198cccf38ad6529beae
+DIST kompose-1.6.0.tar.gz 5227025 BLAKE2B e24e5d142db7a1e55c8e2c05db2a7717a6bc178c3ed73ec2732fb10ae39c90dd2da41ce604fc590e8888ef1b92d5ba68821f66f54e2285d90c2bc9e3af3f1da0 SHA512 57e8b3530ad260d0ed6a679119c559f616c45d407db8929797dbf321e32917bc236ac41e1042f65aa8460026d54cb03180e8b8264dadb6fe05ec6d21293140a3
 EBUILD kompose-1.5.0.ebuild 889 BLAKE2B 2b06310bd56dbab18a9a8e8391fb9e3a992dda295f3c4c55e16b2933591b1c20a2ac544080990c3abf09b4d3191c6f8279898025d89475c9364ed2f86ff056bc SHA512 84fa902004e779a8bf0e3bac6d75233a62b12968774d580f4d68b10183f7a024e6e8a4f8d3f563eb6edeccb9e1c975e239b37f1f7ef2c7b893df080ed0b9c3f2
+EBUILD kompose-1.6.0.ebuild 889 BLAKE2B c3dbaa96f72b9bcecfe6bab9ce40c33ab61dc588bae8db80374d0383c7b746d36b15afd5094b67783ef950659cd15d6a3e92e74d111c6cbc702bc156a7d802d3 SHA512 6201ae62bd4bbd69e844e9c4d691414cce1e3fb4792a96813fd4e7060aa987fd23235e40eae20f70b0b96189d6a010957212c1d266bfb59e62f85df3d9bd24ef
 MISC metadata.xml 328 BLAKE2B ad1e8cb1083ed13de1f3f341fdbe9bba7ba3ab4364c8c36c9e3b63f63688da6926fc6bebc9f72aada52dfac1a4834b11cb27eee04aaaae484192b8ed74214aa6 SHA512 e2091ec84a909ad6c2453bd832817461e39b7c355c28bd99c19d9e85dc4a621606c34066f596a68585c3762b6b156455ca012495c5c336b9ba929d163b923042
diff --git a/app-emulation/kompose/kompose-1.3.0.ebuild b/app-emulation/kompose/kompose-1.3.0.ebuild
deleted file mode 100644
index 11fd6fc9e7e1..000000000000
--- a/app-emulation/kompose/kompose-1.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/kubernetes/kompose"
-EGIT_COMMIT="v${PV}"
-COMPOSE_COMMIT="99f88ef"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tool to move from docker-compose to Kubernetes"
-HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-RESTRICT="test"
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
-}
diff --git a/app-emulation/kompose/kompose-1.4.0.ebuild b/app-emulation/kompose/kompose-1.6.0.ebuild
index 78305cc141cb..4e83fbfc8c99 100644
--- a/app-emulation/kompose/kompose-1.4.0.ebuild
+++ b/app-emulation/kompose/kompose-1.6.0.ebuild
@@ -6,7 +6,7 @@ inherit golang-build golang-vcs-snapshot
 
 EGO_PN="github.com/kubernetes/kompose"
 EGIT_COMMIT="v${PV}"
-COMPOSE_COMMIT="c7964e7"
+KOMPOSE_COMMIT="e4adfef"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 
@@ -21,7 +21,7 @@ RESTRICT="test"
 
 src_compile() {
 	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
+	GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_KOMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
 }
 
 src_install() {
diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest
index 4c75a6b92f6a..282198a3deb7 100644
--- a/app-emulation/lxc/Manifest
+++ b/app-emulation/lxc/Manifest
@@ -11,9 +11,9 @@ AUX lxc_at.service.4 265 BLAKE2B 4454528e69a5c986c23c0c4ccc10ebe03a0650e47cd3020
 DIST lxc-1.0.11.tar.gz 850645 BLAKE2B 1a8eff91d970d3160d5ca7338f4e4d68c722a277a804396e7c30b34dbf4aeccc0609982940bb660992880078167cdf3382a55af404b3e52ebe8cd8af104b1efc SHA512 5537e61a286cfce3c763b81eec625538c796ea1e8f5e94c5a28fc8964762c8c0efa7983a188d521bf3420a42569d7124e6587950bc90b79583fa42cc8e2f8f74
 DIST lxc-1.0.8.tar.gz 575127 BLAKE2B 246ac7a2b4306c52a741b2f763bcc81d9999fb27942ef93d6a786ed2ea010c646f5a2388407d26425387b8a819cacae927c8512995bf19b11d610e1887ea6470 SHA512 f552a4f48bb47d26c6b9ddaf8221a439c0848e3f54ec41b77d54717c21bddd56193941046cc96c699790e8265e762a926469c25ee687adcf7795f2906b1c260a
 DIST lxc-2.0.7.tar.gz 792557 BLAKE2B e5f1e6d8961938200e116527fab8ce341cf285826afdccac88f4bae65ffd649a406dac7555024557f38c4b415a59cd3b5fb255f1dbf015ce01d4975bed3b1c80 SHA512 eb48dc800ce43d2f4d46e0cecc4d0a714b3e22c6a4975776b54d17d1d20d5a1411e6b605215282f1f77286ddf22b61c80b86b83752191fc18023894ef7a1c44d
-DIST lxc-2.0.8.tar.gz 1308705 BLAKE2B 044e82e182f4ca325da237b888ff16b0469eb11ecdab2ed55f5e9372e84d816ec30edee28ef1473aaa7211a9d9aee0d26f45f169320551e45098da9de7a74104 SHA512 ed9fd47e92007f433695cffea659180866a5ac2778712f4eb13b6629bb18292589f5b674b734853ca196ba1f6d38bdbf3cc8a2bb28e25d3540b06b945fcf9096
+DIST lxc-2.0.9.tar.gz 1333044 BLAKE2B 44d405bf933923a020a6aadca9d84cfce04db72ac0ef1a727c83eca8121683419a2e74849f08fb4773010002928b424840fa9ec19ab619e420b1dfb5156de5c6 SHA512 c7c595fbc6163e500700b756ae30c96b70d41b9bf297a609622b5d5b8431171ed8db70fa8368c3b9650c86452820e9da7f329f9186ae75c24a7adb15d5826102
 EBUILD lxc-1.0.11.ebuild 5899 BLAKE2B 015dd027c8ac9e51f7f93a0fe6e82ac661229291794f15b6cac3d8d4e740988ff3ef3ae1c92ab621bd7a8a714a3a0f67d5278178d7b966536153d4f12d7eb424 SHA512 cd21008f2532dd23b9ecb79646cc87691d86417325d2511f42503c8c8e2b49bd5bfb62811d3267b30abf371233a4a5580fa81d4e1e3f677aa2c32ddd6d69f906
 EBUILD lxc-1.0.8.ebuild 5932 BLAKE2B f8f4843c5da5405e69ebee0b3c5e1d50057d15baa841f4b20edf8acc22cc6f761d1723fe1f9cac93b4129ce10ab5eec0c52c44172dd724f0f2c65d24e293e7e1 SHA512 6af1e114ecc64264eafb85e77fba744e4b8dfdf19c8d2b769959d642df237e29813f71bcf370ea75685cb728592c6b9f9a9637d0b4b00f13d40ee8c110045619
 EBUILD lxc-2.0.7.ebuild 6343 BLAKE2B 9b93d611f9ab364779579bbab92b0e11245f2df2bce41e2c0aa87dc3886278eda9d41466c8922cbc587bbb34933341e6afd26ed675df1571504629d2176c1814 SHA512 91312a9209a731026aa53f3d7bb73a0dc8f90f9fc37680cf56439067bd63aa3f35c60d2d320d5fae3d8469ea1a3fcd8e83ee5093ea4252643fd82e776ea5d58f
-EBUILD lxc-2.0.8.ebuild 6429 BLAKE2B ef98b1c497187a3fad6e991b6d6b356d6a2cfa9b32ec18324a9be28c54c8a5e19dad8cf143a47d8a7f9d261a96e4dbfee1a1b5b604fa71e82195edddda7339d1 SHA512 173af6b3482067cd483865eb0080a78bea4b9662c540a4c6f6614c20d886ca2eae961ad63024c86d7156703b04c976a30d9095844361c549cd0ebff3edfacebd
+EBUILD lxc-2.0.9.ebuild 6593 BLAKE2B b59cb2bb3245151d39374d2b67a654c5a9e38d8ce91036524bccdd04f57cba7bd51cce65220657e8926825de65a6e9c24e4a55849ced9322c5b446016103a668 SHA512 f29ee67be8a61990fcdd928a962aa0ae273260ee47bda932465d6b6dbf9eff0facdb43f006eec001558593945d9bbe24da9a013ed1f145dae6df958518125f5e
 MISC metadata.xml 811 BLAKE2B 433a5cbe39002614c88eae4829c998493e95cb0b8eeb0a9f546e08e33a82fe5edb384e9a9f747d1129e0cdb7b8a634bdf4a0b7cf385bc3d243dc83cab06b899c SHA512 fea5f647ca7eb616307378375af86051034e03170f6ce62e2219f78343797072902102515f93cc0f809558fbfbca88eb81e9f8d0fa621ae18381d39a12c31aa2
diff --git a/app-emulation/lxc/lxc-2.0.8.ebuild b/app-emulation/lxc/lxc-2.0.9.ebuild
index d22f583a5a46..da24efd32381 100644
--- a/app-emulation/lxc/lxc-2.0.8.ebuild
+++ b/app-emulation/lxc/lxc-2.0.9.ebuild
@@ -6,17 +6,16 @@ EAPI=6
 PYTHON_COMPAT=( python3_{4,5,6} )
 DISTUTILS_OPTIONAL=1
 
-inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd
-
+inherit autotools bash-completion-r1 distutils-r1 linux-info versionator flag-o-matic systemd readme.gentoo-r1
 DESCRIPTION="LinuX Containers userspace utilities"
 HOMEPAGE="https://linuxcontainers.org/"
 SRC_URI="https://linuxcontainers.org/downloads/lxc/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 LICENSE="LGPL-3"
 SLOT="0"
-IUSE="cgmanager doc examples lua python seccomp selinux"
+IUSE="cgmanager examples lua python seccomp selinux"
 
 RDEPEND="
 	net-libs/gnutls
@@ -28,11 +27,10 @@ RDEPEND="
 	selinux? ( sys-libs/libselinux )"
 
 DEPEND="${RDEPEND}
-	doc? ( app-text/docbook-sgml-utils )
+	app-text/docbook-sgml-utils
 	>=sys-kernel/linux-headers-3.2"
 
 RDEPEND="${RDEPEND}
-	sys-process/criu[selinux=]
 	sys-apps/util-linux
 	app-misc/pax-utils
 	virtual/awk"
@@ -123,6 +121,9 @@ src_configure() {
 	# /var/lib/lxc is probably more appropriate than
 	# /usr/lib/lxc.
 	# Note by holgersson: Why is apparmor disabled?
+
+	# --enable-doc is for manpages which is why we don't link it to a "doc"
+	# USE flag. We always want man pages.
 	econf \
 		--localstatedir=/var \
 		--bindir=/usr/bin \
@@ -133,8 +134,8 @@ src_configure() {
 		--with-runtime-path=/run \
 		--disable-apparmor \
 		--disable-werror \
+		--enable-doc \
 		$(use_enable cgmanager) \
-		$(use_enable doc) \
 		$(use_enable examples) \
 		$(use_enable lua) \
 		$(use_enable python) \
@@ -183,20 +184,29 @@ src_install() {
 	# Remember to compare our systemd unit file with the upstream one
 	# config/init/systemd/lxc.service.in
 	systemd_newunit "${FILESDIR}"/${PN}_at.service.4 "lxc@.service"
+
+	DOC_CONTENTS="
+	Starting from version ${PN}-1.1.0-r3, the default lxc path has been
+	moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc
+	please add the following to your /etc/lxc/lxc.conf
+
+	  lxc.lxcpath = /etc/lxc
+
+	For openrc, there is an init script provided with the package.
+	You _should_ only need to symlink /etc/init.d/lxc to
+	/etc/init.d/lxc.configname to start the container defined in
+	/etc/lxc/configname.conf.
+
+	Correspondingly, for systemd a service file lxc@.service is installed.
+	Enable and start lxc@configname in order to start the container defined
+	in /etc/lxc/configname.conf.
+
+	If you want checkpoint/restore functionality, please install criu
+	(sys-process/criu)."
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
-	elog ""
-	elog "Starting from version ${PN}-1.1.0-r3, the default lxc path has been"
-	elog "moved from /etc/lxc to /var/lib/lxc. If you still want to use /etc/lxc"
-	elog "please add the following to your /etc/lxc/default.conf"
-	elog "lxc.lxcpath = /etc/lxc"
-	elog ""
-	elog "There is an init script provided with the package now; no documentation"
-	elog "is currently available though, so please check out /etc/init.d/lxc ."
-	elog "You _should_ only need to symlink it to /etc/init.d/lxc.configname"
-	elog "to start the container defined into /etc/lxc/configname.conf ."
-	elog "For further information about LXC development see"
-	elog "http://blog.flameeyes.eu/tag/lxc" # remove once proper doc is available
-	elog ""
+	readme.gentoo_print_elog
 }
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index ea5a60044874..2f0d464c53b1 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -75,7 +75,7 @@ DIST github.com-syndtr-gocapability-e7cb7fa329f456b3855136a2642b197bad7366ba.tar
 DIST lxd-2.14.tar.gz 629982 BLAKE2B a55ec6c762e0a4769ec2be3d063a82d8f6b36af8d4997891d1b51fbf2eb181b5ee86dfbd9e494a0d7393a76062d8fcbbdc7aaefb9b37503357639f6fee4faf76 SHA512 a1b6d7eb055a29ba3c28f9184e6dbac5f279332a6445347bbf8f946ab23b0afb353ac146b379f22922fe678ce034c18dc9d5d2f2dd7704b8cce1730c29dfa9c3
 DIST lxd-2.18.tar.gz 725957 BLAKE2B f8d442e7b10d507e180c7be6d10517a29ac15fef44624a60fa94ddbe5d3c7d1406938d97756ad8ad301bcf2fd04e85e62041a7dec65b95c16b91a570330bcc04 SHA512 51116a41c4c13c85729e36047a9c36a997fb79abd383ecf2490be3160a39b90b05042aa0f4c979849c255b9630b03ed2c7acb92c26aed3c20aacce65ef0c70c5
 DIST lxd-2.19.tar.gz 756698 BLAKE2B 71c6d829735255cf6ac0e76db1157374bcc8f8138b1847eebe0b17fc38060572e860179d943e5538e6df13267c429da6c295357eebfa81f265a930fe43feb82b SHA512 18461bc5decacdb39ebf7839a376da9a02af428a324bd5642c2bc6f1bb2e5d5b3e03af1d4be333348b0f001f0ebb08e7d36bdcc1d2f928c6e588a8751c29e981
-EBUILD lxd-2.14-r1.ebuild 6692 BLAKE2B 18fb97ba06393a1f28e028382ced5f6193a4b574b5b5e37240cb6a2fd232ed64e487915b93e180e23fd0a90efc56a97c8f7713881bfc90367ad689e3085dfc68 SHA512 0ca104293f5d3555f9898bba38804f72053702708baf8a644d42e924f0d291a6a604291ed9db24e437c559d05829ac53a108c46f932cb34794cf034bf821d724
+EBUILD lxd-2.14-r1.ebuild 6691 BLAKE2B c265236884d81f69df91c4ecc6d08c90ed0120ac7ab4bc7eed2a3d1b1e51d5339df1bd674c72d1abcf1c3ab8a8b23552c448bea5c005cfe7a8dcd39187002d12 SHA512 0adeabbd88c7542e9f32f1135dc00e133d26f8f8be458f8ebb4f74606e6a63f9e515fafea67a98929f27753b5c800e5e387a0db8fbd5042f46587286b6c96f7e
 EBUILD lxd-2.18.ebuild 6471 BLAKE2B 26ef1758858b21af7faefc092ee430a26725c402b0326d4e4098ff18a2049f4dbef3f3952429c5fff04e77332537eda02b45907480ab564dc0d5f987e40f8db8 SHA512 a783705e98da19c3c59e2d9dbb3f7c1afb44116434276de45b7de13e4dfb171cbf982f0153b9ec40f030f8ca4d47f1aa92801a195cc0d858b3bc6ad0b3172e3f
 EBUILD lxd-2.19.ebuild 6605 BLAKE2B c39104cd32ac100377c6486219af4c7c8e448594501991f89314f9b6275a83080fa5adf956794efc3e36ab72205a42b8c642f04800f09a5995b3db4a391d4206 SHA512 45388ffb9cf442c6a0eb645f5302e48cce7aa721d6e016b953c730e63a1b2769cce2975f2edfb9162afaa196045363027e51bb09759428f0be0233d4260a7dff
 MISC metadata.xml 952 BLAKE2B 1d16ed30ed5222c36a5ccd6355ad5f036fad77152533d8c0fb66fd2a43ad34c8136cb8044f9b5d2c8806d08711b20f7dcd883db57fde229c869382775a5bddff SHA512 962339d8aff6dd9c44e7642449468ffff20dccbdc45bdb614199d576ed4595edac356dd216ebaac50290ca7383630ab8e5355eeb05a76d91ad542cab7cd8a456
diff --git a/app-emulation/lxd/lxd-2.14-r1.ebuild b/app-emulation/lxd/lxd-2.14-r1.ebuild
index 15057e1de13f..6229040f7ebc 100644
--- a/app-emulation/lxd/lxd-2.14-r1.ebuild
+++ b/app-emulation/lxd/lxd-2.14-r1.ebuild
@@ -38,7 +38,7 @@ EGO_VENDOR=(
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 PLOCALES="de el fr it ja nl ru sr sv tr"
 IUSE="+daemon nls test"
diff --git a/app-emulation/spim/Manifest b/app-emulation/spim/Manifest
index c64bc370ffa5..7b537e250197 100644
--- a/app-emulation/spim/Manifest
+++ b/app-emulation/spim/Manifest
@@ -2,5 +2,5 @@ AUX spim-8.0-r1-respect_env.patch 5058 BLAKE2B dabd459ef87e3c9db6304703d2067297f
 AUX xspim.svg 8364 BLAKE2B 0a2f13b78c87e821b6d669a750ea1be0003442f75c20c5387954c1e6c11f99f80b9e1a42ea88bc4e894011ff08cb8b40450674ec415d1be18eb63d5e2a9b0188 SHA512 1860705ef2677b5bd84b7cdf4daf3143033050e5ed014e22d63fc3bec48a0a296a9767fa7cbf7ab71f31c5cc712e40be0799a9c43b96c789273de7604d57c0d5
 DIST spim-8.0.tar.gz 355204 BLAKE2B c7da952df552c5e070c601e7c3d251f15988d377e1c9943730f6cf8eee1e3b64ec4a05b56d4bdbc181b811aa349e3b08fccf0b9ccfc3efe2c0e410580e70dd7f SHA512 c4eb66863a931b74d6c6ecd92860d16fd6369c85caecba1e71a1149e73e708502d1070f17a9beb6d0af1368db1ee5a85c040b596866a1236275cdd410a661adf
 EBUILD spim-8.0-r1.ebuild 1657 BLAKE2B 49409b65a0cb79baa5a09f3f359a7e2c6b9610e88c70e1d520d17877694b426bb7872b191d94c6b586bd3a42bdc3c5f992ff251afe9600251e69980a11526936 SHA512 659885a8a65cfe8e254f76e0c845ceb44966fd10b94585845f0a3b8e9f259606b98042d75af1f0d8bd0803469fce28b4176a3251c560dad1a895460e08cfe23b
-EBUILD spim-8.0-r2.ebuild 1571 BLAKE2B 2ca643699e6e9456a0ff691117a2c425fcf35c876029ad979e2e37911685ebb5c53055ec7edc3efee5390205d4b26b52f6dc5fdb09e893aa2157c3538a21e81d SHA512 51e615df2a9620031eef328402b5b455dc4ca2d53d701bbf1de05e1c13388b437669414724f73164bb718744f6d59a46f1105463738a4b29c77f603b39aec11a
+EBUILD spim-8.0-r2.ebuild 1570 BLAKE2B 6a03d3b73d84f3a7bbf2b97d31f24465e23762fcb43b30239b5448ed9effce184d7bd6fc5e2ffd0714e3c5be44f0051f219b69a940d443d466bf7e76cd2d1fda SHA512 743da7bb89dcadb1be9bdbdebc86b64594d8b37d666230809f3440fb2df2f547ba25c78cfd43f6cc0d828e4071905f4f7915d2d78f8f98fa9be3e3145051888f
 MISC metadata.xml 465 BLAKE2B a26e388f7a6a0610e0fb4d4c59b0d1a60c3934927f41e0d953dfab8cef1c9fc5da06902263ba29d984db1f0d1d3f636d503b8fe605571f4976e9bbd3e28cf4be SHA512 624df1312b5a85232c892f18eb39a62877c085d79461cf875b46a107eeaf5b99a9062e8f175a62c80565d42b26144ab2227d2f97b2d67fe16e66890e2843fe6c
diff --git a/app-emulation/spim/spim-8.0-r2.ebuild b/app-emulation/spim/spim-8.0-r2.ebuild
index 59443a28c924..c50eac72bf8a 100644
--- a/app-emulation/spim/spim-8.0-r2.ebuild
+++ b/app-emulation/spim/spim-8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.cs.wisc.edu/~larus/SPIM/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc X"
 
 RDEPEND="X? ( media-fonts/font-adobe-100dpi