Sync with portage [Wed Mar 7 08:26:37 MSK 2018].

app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild

@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 COMMON_DEPEND="

app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild

@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X +introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure

app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"

app-admin/puppetdb/Manifest

@@ -1,4 +1,2 @@
-DIST puppetdb-4.4.0.tar.gz 23629723 BLAKE2B 03f78df8598216b213843c7277818ae443217d69bf2dca3f79c408e8b75d6ce5f4315b77cb801f3af877e6533dd71cfa8f420b52504aa0b0e4986f4d84f5caba SHA512 2caaa2b39146b42388b03ecd830d386efcc25774dfe9b6e1bd25fd6f1820902364dda7526c2e019657d18371be4afdb84a165d9bec1078a6c3621bc80241a5a2
-DIST puppetdb-5.0.1.tar.gz 24055687 BLAKE2B 8769009e85c632b4dbf1015eebe7305acff28a0803f046b3be5d6100f8be39850f5a0f9bee565a2c8d1428c2a7715551805f31633d823aa8ac66e577a8efc910 SHA512 0e08e27a2004b6cf07704a77d931ad30326559e3fd6504c9a839f468c8379c49407214187bf47f960fd3b5cdba9ec162c69e67e7ed7125c4137a77ed076e42f1
 DIST puppetdb-5.1.3.tar.gz 24157962 BLAKE2B 750159e8c83cfdc820040bb6837c83309d96da519a84fdf6aadd394473993f128edbd76b7a5b0e2591f75d52c9fdf942e84545ff97b8a7d29ac3ae3520d04ea1 SHA512 153e6cba59fb824fd9bca802ea4f0e05e6c6d69d6ef47566079bdf1ac26f7bc13fa893b633f9506494d2189ef160b6b3c23fcb340e76df41089228c047c566e0
 DIST puppetdb-5.1.4.tar.gz 25425088 BLAKE2B daa4788676d85d3a51d2b572aa9bf88b50fa1a35c92d175b44c532e7d82c3f19b734d885411174a8929a772b25a405738a08dca009a1369bfcb69a456e819f96 SHA512 2a34a6188bc474742e6b9cba5f0df1d5bcecd176f2874e12dbbf9c2fa8706b2d9276baece09f7a593eb6ab7cccd6b8804e15d67cb99cedcf7f6226fd59e82308

app-admin/puppetdb/puppetdb-4.4.0.ebuild

@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/export
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/import
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}

app-admin/puppetdb/puppetdb-5.0.1.ebuild

@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib systemd user
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.7.0"
-DEPEND+=""
-
-pkg_setup() {
-	enewgroup puppetdb
-	enewuser puppetdb -1 -1 /opt/puppetlabs/server/data/puppetdb "puppetdb"
-}
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	systemd_newtmpfilesd ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}

app-admin/puppetdb/puppetdb-5.1.4.ebuild

@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.7.0"
 DEPEND+=""

app-admin/puppetserver/puppetserver-5.1.5.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

app-admin/rsyslog/Manifest

@@ -8,7 +8,7 @@ DIST rsyslog-8.29.0.tar.gz 2447907 BLAKE2B dd3a34e4c1b4edc989d58369933b94b11d89c
 DIST rsyslog-8.30.0.tar.gz 2468224 BLAKE2B 3c5c94661abc2e34d688ca08d6dea0d2bcca9f287f45328a0d1b240bcb1b9223800207ce8759da823fa3acd974fcc70f01565f95fbcec108f8f71c7cb14a2409 SHA512 90e172d08ba7548252fc9744f71259dadf5a40afef405516e7b1601620913ca4b2ffc4859b16f369b9c1974ea10f4e41bc2d987e3d6bf9aabeb979f7de6aefe0
 DIST rsyslog-8.31.0.tar.gz 2498675 BLAKE2B 8b80394ea3919dba29a431f3c5c1fc337a9e60a886a3c258c3895eb4341a941d8af6370ceb0d2e212934f64ab38c7238e99f40e1dc27e648bd4b75e158586a28 SHA512 aab888dda8df3ad7ff404767a58539cdc0bb92d0e537b703cf5833555688dd6d8223889b8d70bf8c594339a51831b57df7a65b397d8b40cded608dfb007befe7
 DIST rsyslog-8.32.0.tar.gz 2478990 BLAKE2B 21bfc93b55da107bec2eddb89cb42d76990ced2675caeb6e73183a109f9bc8293bde43f202bb56007f9ea4e49de385b004c158059cb13e8d3d376bf050ca445a SHA512 eea85d77bf3624fbad6f0838fa2a4af7c14d853c8f120f14cf697cdfda7f7e0692dab684d2ddd07fe44a0bcd50cf91baf69af1bb63dc9d60e19146f1150155ac
-DIST rsyslog-8.33.0.tar.gz 2487783 BLAKE2B 2bb38007ee911ee3198818968053fd2ed97cd962d0761c4bc9be571d95eda9bdfd63dae4b8b724dbb5d87cbcbacfdeff5ed2529342af9678b064f2e2b1422cc6 SHA512 b0fd0c5976325bee9b29534c6f6dfad2f70d22e2fc4a7d5f28563116b7360290c7e31aa77ee5ecdf25e726b45d03899b00e4d653d0954284b88e8be918e0f333
+DIST rsyslog-8.33.1.tar.gz 2494338 BLAKE2B 680ad2c062386e4e3e6c6e1a83cf0001d63da305edae9df527d1079a2fa13b8715e3cbfa211ca908e0005f1762becfd88369a7cd1488134564980137f0e98d86 SHA512 c4b426409e89463a8e8f7f9d0267f2fa1df1a84e947ce7bf91255db88b4cad5b7e607c476ba2db0543af069c44cdbb35330e0839696bf83668200e8ac009c6a0
 DIST rsyslog-docs-8.19.0.tar.gz 4271094 BLAKE2B c866f66fc1ae9ef8c227a2e03bab4a815e408ccaafe9da97f8b6b6f6b89bb33d0c8a9e004552d5a1287a19bc8f3677517259a4f9bcebffbbeff506d80454945b SHA512 120f229a641119649fc897948fb0934039a95d0ef63e68b10ab635620d84988d794fd5dc33617353028e786513a86b3a1cd0c4fef9c755dab5bedd8e0246532e
 DIST rsyslog-docs-8.24.0.tar.gz 4344877 BLAKE2B a3d9ea90580c3e24e3c40c07f871740cdf33ad4206627586bfb42523a758cbd18f5303f35f2fa036e492dece9a83d9c151b60023aed99f63c42ed8f9bf7da9f1 SHA512 b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
 DIST rsyslog-docs-8.25.0.tar.gz 4359583 BLAKE2B 349e057d3c94ca6fc92753459f8fca011927e82a787cc50685ebe1c5a40a624e4f74764b04cf00f5c250cd65eb6e2862d7225790cc029cd7256c072d63db1726 SHA512 e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71
@@ -19,4 +19,4 @@ DIST rsyslog-docs-8.29.0.tar.gz 4473644 BLAKE2B 18fc4aea0551f1ad770cd882aaf51242
 DIST rsyslog-docs-8.30.0.tar.gz 4487378 BLAKE2B 7d39fc7642ec2122f254dd6660a13efa4b214ee669fe5772b4d68a8ce94ed5ac3ca2500c23b5752924b5befca2a66c228b6f2bb48c7b9f72a2a4b98e2a14810b SHA512 8068bb9bb8408447bff49730e9aac105eab1bd610592dd524e7639b668b2d05a4836d3a9862622445a0bb8d8b140db67c861dad6ec207d11049ac368e363684d
 DIST rsyslog-docs-8.31.0.tar.gz 4484950 BLAKE2B 8ee4346a095942133bb473509f275c625fdb4a1aa81293a15604bdb95670ff0676677fe5481be3bc2ea7097b2c8de7fd3b0eb8033701522b372bffe44325a10a SHA512 51a63fa520d8176e183afa44ccf889374810dddfd5fdb363ed06b134bfbe0d1a94085e4836cf3bb2a07cb83564bbb87cef3763ac9429a5efc50aff276542defa
 DIST rsyslog-docs-8.32.0.tar.gz 5368254 BLAKE2B 6d1efb191698bb1cfb03660167e5dcf9eea8f2fd2e459c350cd55aa24afcc5fb44d2bc0ef5590c6951326fbd0215aecbd59a6122e88ff449f566b37d1ee00d56 SHA512 e64eba3c40eab35e266826fb7e183418f38eb008f2a21ddf2c523d1e42aacaa20f882a561e5df67a979463048b58232fa82759645a21dc6962f6836ac8f57bce
-DIST rsyslog-docs-8.33.0.tar.gz 6770247 BLAKE2B e850ed0cc0c61c1d97c488b37034a0ce56d6fb41f324c4de4c56cbd13a5157ad35fa34062cc883ffdf1ad2d08b764490dbfd04c03571a3e549f28adba97e46e9 SHA512 fd1e21ce5b7e69058273e9232b682541faee21554fb83e3c1c6f4b88cc21ce00e56e199eb0e0a554b1290fbc456f989f65632cf94653005e0c25e311dedb6733
+DIST rsyslog-docs-8.33.1.tar.gz 6770438 BLAKE2B e076688d7559c16986241149c00f6df603e2c90771222f4f91dc944fbdeace3dbc6e47fc82602f852a7407e064fe31df0a1c2940d521ae6ae21f5663518bfeb7 SHA512 fcc8ffee372c0b0dc2ab1b76dcf68a66ce820996cf2d46a2b5c6fd40e6fad5ef3c33da97a2e88956751597c20cf0c4a9b6537c22db0b3b46d1a734a9d9f95df5

app-admin/rsyslog/files/8-stable/rsyslog-8.33.0-missing-files.patch

@@ -1,80 +0,0 @@
-https://github.com/rsyslog/rsyslog/issues/2493
-
---- /dev/null
-+++ b/tests/omstdout-basic.sh
-@@ -0,0 +1,27 @@
-+#!/bin/bash
-+# add 2016-11-22 by Pascal Withopf, released under ASL 2.0
-+. $srcdir/diag.sh init
-+. $srcdir/diag.sh generate-conf
-+. $srcdir/diag.sh add-conf '
-+module(load="../plugins/imtcp/.libs/imtcp")
-+module(load="../plugins/omstdout/.libs/omstdout")
-+input(type="imtcp" port="13514")
-+
-+template(name="outfmt" type="string" string="-%msg%-\n")
-+action(type="omstdout" template="outfmt")
-+
-+'
-+. $srcdir/diag.sh startup > rsyslog.out.log
-+. $srcdir/diag.sh tcpflood -m1
-+. $srcdir/diag.sh shutdown-when-empty
-+. $srcdir/diag.sh wait-shutdowna
-+
-+grep "msgnum:00000000:" rsyslog.out.log > /dev/null
-+if [ $? -ne 0 ]; then
-+        echo
-+        echo "FAIL: expected message not found. rsyslog.out.log is:"
-+        cat rsyslog.out.log
-+        . $srcdir/diag.sh error-exit 1
-+fi
-+
-+. $srcdir/diag.sh exit
---- /dev/null
-+++ b/tests/template-const-jsonf.sh
-@@ -0,0 +1,18 @@
-+#!/bin/bash
-+# added 2018-02-10 by Rainer Gerhards; Released under ASL 2.0
-+. $srcdir/diag.sh init
-+. $srcdir/diag.sh generate-conf
-+. $srcdir/diag.sh add-conf '
-+template(name="outfmt" type="list") {
-+	 constant(outname="@version" value="1" format="jsonf")
-+	 constant(value="\n")
-+}
-+
-+local4.* action(type="omfile" file="rsyslog.out.log" template="outfmt")
-+'
-+. $srcdir/diag.sh startup
-+. $srcdir/diag.sh injectmsg 0 1
-+. $srcdir/diag.sh shutdown-when-empty
-+. $srcdir/diag.sh wait-shutdown
-+. $srcdir/diag.sh content-cmp '"@version": "1"'
-+. $srcdir/diag.sh exit
---- /dev/null
-+++ b/tests/template-pure-json.sh
-@@ -0,0 +1,18 @@
-+#!/bin/bash
-+# added 2018-02-10 by Rainer Gerhards; Released under ASL 2.0
-+. $srcdir/diag.sh init
-+. $srcdir/diag.sh generate-conf
-+. $srcdir/diag.sh add-conf '
-+template(name="outfmt" type="list" option.jsonf="on") {
-+	 property(outname="message" name="msg" format="jsonf")
-+	 constant(outname="@version" value="1" format="jsonf")
-+}
-+
-+local4.* action(type="omfile" file="rsyslog.out.log" template="outfmt")
-+'
-+. $srcdir/diag.sh startup
-+. $srcdir/diag.sh injectmsg 0 1
-+. $srcdir/diag.sh shutdown-when-empty
-+. $srcdir/diag.sh wait-shutdown
-+. $srcdir/diag.sh content-cmp '{"message":" msgnum:00000000:", "@version": "1"}'
-+. $srcdir/diag.sh exit
---- /dev/null
-+++ b/tests/testsuites/include-std-omfile-action.conf
-@@ -0,0 +1,3 @@
-+# this include provides our standard omfile action. It is primarily
-+# used for include() tests, but may have other uses as well.
-+action(type="omfile" template="outfmt" file="rsyslog.out.log")

app-admin/rsyslog/rsyslog-8.33.0.ebuild → app-admin/rsyslog/rsyslog-8.33.1.ebuild

@@ -47,8 +47,6 @@ else
 		http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-${MY_PV}.tar.gz -> ${MY_FILENAME}
 		doc? ( http://www.rsyslog.com/files/download/${PN}/${MY_URL_PREFIX}${PN}-doc-${MY_PV}.tar.gz -> ${MY_FILENAME_DOCS} )
 	"
-
-	PATCHES=( "${FILESDIR}"/8-stable/${P}-missing-files.patch )
 fi
 
 LICENSE="GPL-3 LGPL-3 Apache-2.0"

app-arch/brotli/brotli-1.0.3-r1.ebuild

@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL="1"
+
+inherit cmake-utils distutils-r1 eapi7-ver
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli"
+
+SLOT="0/$(ver_cut 1)"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	cmake-utils_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test(){
+	esetup.py test || die
+}
+
+src_test() {
+	cmake-utils_src_test
+	use python && distutils-r1_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+	use python && distutils-r1_src_install
+}

app-arch/brotli/brotli-9999.ebuild

@@ -6,12 +6,12 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
 DISTUTILS_OPTIONAL="1"
 
-inherit cmake-utils distutils-r1
+inherit cmake-utils distutils-r1 eapi7-ver
 
 DESCRIPTION="Generic-purpose lossless compression algorithm"
 HOMEPAGE="https://github.com/google/brotli"
 
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1)"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}"

app-arch/pax/pax-20161104.ebuild

@@ -10,7 +10,7 @@ SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND="
 	dev-libs/libbsd

app-arch/unadf/unadf-0.7.12-r1.ebuild

@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://lclevy.free.fr/${MY_PN}/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="static-libs"
 
 S="${WORKDIR}/${MY_PN}-${PV}"

app-doc/linuxfromscratch/Manifest

@@ -7,4 +7,10 @@ DIST LFS-BOOK-8.0-systemd.pdf 1607946 BLAKE2B ed0f135dc4cef005ad868e54c2012d2bf4
 DIST LFS-BOOK-8.0-systemd.tar.bz2 191320 BLAKE2B eb5128da135817661f51abd25f27ef6dae69a47cfdd90975064b5cc84cebdc4f6268a01d4b82250df22ce8b07ec3f170868969ea6a4afd8388b316b10e82bf08 SHA512 c1af69d352e9fda05dad001d9d33db4775d06a3845789432f137349358548c5474aab4a743ff53fd61d0a74b308abbfc5bd4fd0787c40e5d784848874563305c
 DIST LFS-BOOK-8.0.pdf 1754957 BLAKE2B f51bc01a4c4f2b7f8f54bf5c3d080793246253c74ea0758b3bc9b5eb9b9c5d9bfdc72f1ef9e90f2948ff02e3fe54dd6a14366e36891e662dbfb09eccc7b0797f SHA512 0dc930f87d41b4fe1af812f1a9f1eb7f746aa9b796eb8850b478de7829e3a6b9afb2753c6abaa75d24a7a38e4a7bf1a593ff541e6a01d2cd764828f3e9f96994
 DIST LFS-BOOK-8.0.tar.bz2 217569 BLAKE2B a187945ed752239214d0bfaf0bd6ca885f0fa04fc4a0f06e20498c9e081d9d3565b61ea457ce265d8c4fc39f97bba9fd6a745f120e83e4a6d0e9349511e69967 SHA512 f4cbe7ebb05350238b188a71f6be700bf21cb7f428c7feb4f38eb84e536b9b419e9e3699e268f307b1a9fcbb8e951a2e48cff898e2db3ebf96ec1ad28131f932
+DIST LFS-BOOK-8.2-NOCHUNKS.html 2170878 BLAKE2B 6979866b91c1145f464e70680bc9b70dc36ccd255dffb11121435ee7aadb63c695cc504498434bc233a58130a52f5fb81b5ac9f46f63e4e5c80cb773b1018efe SHA512 e71e604ec64fb89661731cab556fff1cc3a56678222429663cb7b30f1785af15de025f2c6dcf9edbea68f272c82aa0140e7caea191f8e6e6a33c18fd5ffd6918
+DIST LFS-BOOK-8.2-systemd-NOCHUNKS.html 2050914 BLAKE2B 8e3b34dfcc0281cead5b3a34a3553e6cec516ab75fd45a044b0583a2770546712a5f6e72b7a853ba1d594bb0a1732c7f6cdbf1d8c4d26327d379fcfe2566840d SHA512 885658900dac346d01a871e7ec6a540b94789a3ac3897002bd092aef9eea364d2611ea92d7ab473975d694b237b3b6ae449926db691bb6c595e838d9288087b0
+DIST LFS-BOOK-8.2-systemd.pdf 1670861 BLAKE2B d2f9ffcaecc1a6ecd1ca38d7ed0d643d858d4ff6fe778d0de4021fd93052ed663c287890f14a8a2e271007903f1ab2643cdbc3644428a27bec7eeeecd11c1736 SHA512 6b1936eda3e0d107e1afc8216198264b2fb8dc1ef422255a269bf5e75e52cdd397036a1bd428cac37bceeb28e36915beb218c799911a4a309e70d23cafb6535a
+DIST LFS-BOOK-8.2-systemd.tar.bz2 201088 BLAKE2B 807639ca7a8f7ec287996de7d33198643cfdbae53453e2a725163c3b53bfb581a0318c9b82699957c4f8e5dec314b106e16c05ee5fce29352490773231e9ebc8 SHA512 1d650c6e0334b58d2a44e63211d74fdd1c5c0a55bc818e9b9c796efb60c63f7b27aa57d667eb75990a6682a0871927ac136b08deb69826064b42e7476c164b43
+DIST LFS-BOOK-8.2.pdf 1811466 BLAKE2B 3107ac22d67fafe10b053585e1b1401d31511e77572d5ec2e4441a2ac3be577be9b6df5a0e7cd400f30cafb354d1e0a99f491f87b706fb41f9b9b7172145cb06 SHA512 13f41ec1568e4d84015614a3d492a046d7dcfc2f6616983e6a15500b9e0ec1519ac3d77bd1e74eb942beb225dcaf53168c63f4599a8b5c4bb8cbb518a0cb909d
+DIST LFS-BOOK-8.2.tar.bz2 224525 BLAKE2B 7453bc4b6cf6b86a6adda0c95d7ce1cdc91df8b2230e313e530a731f6d5fe6b4ca6ab1d9aaff092dd66d44bd3b97f3e27e23c9eeed67abf790c8abedc6ee48a8 SHA512 3c6f4db9b4c48af9a74c28628c38fe6ab912093ec2641e37a9f2270fee97cd7469a3d10291ac2a002515d9b81bed2586594666a9c97746d3a9ecc7b004e213fd
 DIST lfs-bootscripts-20150222.tar.bz2 31584 BLAKE2B 662b8ab8f9e2cce47cb1d69bb43bb9a31935f8f4e146df218a92c741c5e694312ee0553648bf7c55d29fc157741ad8a2b17cdef3d3405ceeb1245be36352a5f1 SHA512 983da1da3ee1c3456c195b887c2bfab0ff0b338ee7f6cacba9faf6f416f8d92129ee92a0bc4402f64fea8fa647a386c439a81725fe0a30a68e337c0f0aea0916

app-doc/linuxfromscratch/linuxfromscratch-8.2.ebuild

@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_SRC="http://www.linuxfromscratch.org/lfs/downloads/${PV}"
+BOOTSCRIPT_PV="20150222"
+
+DESCRIPTION="LFS documents building a Linux system entirely from source"
+HOMEPAGE="http://www.linuxfromscratch.org/lfs"
+SRC_URI="
+	${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
+	${MY_SRC}/lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
+	${MY_SRC}-systemd/LFS-BOOK-${PV}-systemd.tar.bz2
+	htmlsingle? (
+		${MY_SRC}/LFS-BOOK-${PV}-NOCHUNKS.html
+		${MY_SRC}-systemd/LFS-BOOK-${PV}-systemd-NOCHUNKS.html
+	)
+	pdf? (
+		${MY_SRC}/LFS-BOOK-${PV}.pdf
+		${MY_SRC}-systemd/LFS-BOOK-${PV}-systemd.pdf
+	)
+"
+
+LICENSE="CC-BY-NC-SA-2.5 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="htmlsingle pdf"
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack LFS-BOOK-${PV}{,-systemd}.tar.bz2 \
+		lfs-bootscripts-${BOOTSCRIPT_PV}.tar.bz2
+
+	if use htmlsingle; then
+		cp "${DISTDIR}"/LFS-BOOK-${PV}{,-systemd}-NOCHUNKS.html "${S}" || die
+	fi
+
+	if use pdf; then
+		cp "${DISTDIR}"/LFS-BOOK-${PV}{,-systemd}.pdf "${S}" || die
+	fi
+}
+
+src_install() {
+	dodoc -r *
+	docompress -x /usr/share/doc/${PF}
+}

app-editors/bluefish/metadata.xml

@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sdnick484@gmail.com</email>
-		<name>Nick Andrade</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-<use>
+<!-- maintainer-needed -->
+	<use>
 	<flag name="gtk2">Enable GTK2 instead of GTK3 even if GTK3 is available</flag>
 	<flag name="gtk3">Enable GTK3 interface (default)</flag>
 	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>

app-portage/repoman/repoman-2.3.6.ebuild

@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"

app-text/iso-codes/iso-codes-3.76.ebuild

@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""

app-text/texi2html/texi2html-5.0-r1.ebuild

@@ -1,8 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
 
+inherit prefix
+
 DESCRIPTION="Perl script that converts Texinfo to HTML"
 HOMEPAGE="http://www.nongnu.org/texi2html/"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
@@ -28,6 +30,10 @@ src_prepare() {
 	# On FreeBSD this script is used instead of GNU install but it comes without
 	# executable pemissions... Fix it!
 	chmod +x install-sh || die
+
+	if use prefix; then
+		hprefixify $(find . -name '*.pl' | xargs)
+	fi
 }
 
 src_configure() {

dev-cpp/glibmm/glibmm-2.52.1.ebuild

@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
 
 LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc debug test"
 
 RDEPEND="

dev-db/percona-toolkit/Manifest

@@ -2,3 +2,4 @@ DIST percona-toolkit-2.2.11.tar.gz 1389718 BLAKE2B 3d8c1207cda30aefc710ab5329aa9
 DIST percona-toolkit-2.2.17.tar.gz 1420968 BLAKE2B 886634cb4f1ed196595c0ebe9d2d53bea898a41d81e6881173949181fbdbc752be671a22344e4e5b142d22e724e86389bf2885273a67222feb28511e1de429b0 SHA512 a6ac84db9fc77b57fffd4f18b1e6c147fa39821a8b8db128af15bac6884a2937f973aa59adb05b738c3a15d9006c71db49276207c5b321acbefd8bd3a6130b76
 DIST percona-toolkit-2.2.19.tar.gz 1425623 BLAKE2B fe9b363ec924b1af9110ea7e7dab70ad4471ddf30868391f9e02a2f6d5a5698a2cb0238dd1cca81428adcac2f21262f10ea2da272ffd881dee1b8b88be1405e0 SHA512 8da35e2ee4d81465131623e5b423c2c49c0bf0faf01862952dd5ca72c2ffea64fabcaf88dda883e633e23de8ae4a6c75a095a751708bac6a8136fc8daaae2383
 DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679
+DIST percona-toolkit-3.0.7.tar.gz 79294306 BLAKE2B e3a556c823d355e5af504210dfb360e6fcf217ca6bfb7ba729e83e66cfdd09231c09d05fb51df1eac6bee0c6615620ac96ffce47c4f0473394d9c008ce8bdabe SHA512 e5a23ce6f4fd74f0956187679810de23a9d60f8073609289d641411c9f397f49b02c05cbcd0a68d78992849f17b70fb3ae411ac967e25c7be45f95ec374414fe

dev-db/percona-toolkit/files/percona-toolkit-3.0.7-fix-package-name.patch

@@ -0,0 +1,13 @@
+diff --git a/Makefile.PL b/Makefile.PL
+index a2136634..2a0f587b 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -1,7 +1,7 @@
+ use ExtUtils::MakeMaker;
+ 
+ WriteMakefile(
+-    NAME      => 'percona-toolkit',
++    NAME      => 'Percona::Toolkit',
+     VERSION   => '3.0.7',
+     EXE_FILES => [ <bin/*> ],
+     MAN1PODS  => {

dev-db/percona-toolkit/files/percona-toolkit-3.0.7-no-versioncheck.patch

@@ -0,0 +1,216 @@
+diff --git a/bin/pt-archiver b/bin/pt-archiver
+index bde24c7e..8f18f49c 100755
+--- a/bin/pt-archiver
++++ b/bin/pt-archiver
+@@ -8151,7 +8151,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-config-diff b/bin/pt-config-diff
+index cfbfd83f..4f7c1932 100755
+--- a/bin/pt-config-diff
++++ b/bin/pt-config-diff
+@@ -5713,7 +5713,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
+index 7acc0b07..ae8b1c2c 100755
+--- a/bin/pt-deadlock-logger
++++ b/bin/pt-deadlock-logger
+@@ -5498,7 +5498,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-diskstats b/bin/pt-diskstats
+index 64e73457..8eac85e8 100755
+--- a/bin/pt-diskstats
++++ b/bin/pt-diskstats
+@@ -5557,7 +5557,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
+index c8808198..1c89b04f 100755
+--- a/bin/pt-duplicate-key-checker
++++ b/bin/pt-duplicate-key-checker
+@@ -5565,7 +5565,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-find b/bin/pt-find
+index bdf03ee0..b72b3c4c 100755
+--- a/bin/pt-find
++++ b/bin/pt-find
+@@ -4551,7 +4551,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
+index 75afca17..dce96c79 100755
+--- a/bin/pt-fk-error-logger
++++ b/bin/pt-fk-error-logger
+@@ -4485,7 +4485,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
+index 5d39e46d..6f8c7bca 100755
+--- a/bin/pt-heartbeat
++++ b/bin/pt-heartbeat
+@@ -7127,7 +7127,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-index-usage b/bin/pt-index-usage
+index 0fa6e008..c9d62436 100755
+--- a/bin/pt-index-usage
++++ b/bin/pt-index-usage
+@@ -7495,7 +7495,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-kill b/bin/pt-kill
+index 65d627b3..b5afcef0 100755
+--- a/bin/pt-kill
++++ b/bin/pt-kill
+@@ -7936,7 +7936,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
+index c43ddad6..524f060e 100755
+--- a/bin/pt-online-schema-change
++++ b/bin/pt-online-schema-change
+@@ -12661,7 +12661,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-query-digest b/bin/pt-query-digest
+index a4501819..ee3e2b7b 100755
+--- a/bin/pt-query-digest
++++ b/bin/pt-query-digest
+@@ -16541,7 +16541,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
+index 0b7b9294..a6aa0afe 100755
+--- a/bin/pt-slave-delay
++++ b/bin/pt-slave-delay
+@@ -4788,7 +4788,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
+index b3bf79e5..4eaaf8f9 100755
+--- a/bin/pt-slave-restart
++++ b/bin/pt-slave-restart
+@@ -5938,7 +5938,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
+index 1ac4e500..981ca3d6 100755
+--- a/bin/pt-table-checksum
++++ b/bin/pt-table-checksum
+@@ -13653,7 +13653,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-table-sync b/bin/pt-table-sync
+index dedd789b..f4b9f367 100755
+--- a/bin/pt-table-sync
++++ b/bin/pt-table-sync
+@@ -12774,7 +12774,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-upgrade b/bin/pt-upgrade
+index 78ed0d82..d64c02ce 100755
+--- a/bin/pt-upgrade
++++ b/bin/pt-upgrade
+@@ -11206,7 +11206,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
+index 66d001f8..d7cbf247 100755
+--- a/bin/pt-variable-advisor
++++ b/bin/pt-variable-advisor
+@@ -6058,7 +6058,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 

dev-db/percona-toolkit/percona-toolkit-3.0.7.ebuild

@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit perl-module
+
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Role-Tiny
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/perl-Digest-MD5
+	virtual/perl-IO-Compress
+	virtual/perl-File-Temp
+	virtual/perl-File-Spec
+	virtual/perl-Scalar-List-Utils
+	dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+# Bug #501904 - CVE-2014-2029
+# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+PATCHES=(
+	"${FILESDIR}/${P}-fix-package-name.patch"
+	"${FILESDIR}/${P}-no-versioncheck.patch"
+)

dev-db/phpmyadmin/phpmyadmin-4.7.7-r1.ebuild

@@ -14,7 +14,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
 SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="setup"
 
 RDEPEND="

dev-db/postgresql/postgresql-10.2.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT=$(get_major_version)
 

dev-db/postgresql/postgresql-9.3.21.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 

dev-db/postgresql/postgresql-9.4.16.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 

dev-db/postgresql/postgresql-9.5.11.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 

dev-db/postgresql/postgresql-9.6.7.ebuild

@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
 		systemd user versionator
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
 
 SLOT="$(get_version_component_range 1-2)"
 

dev-embedded/arduino-builder/Manifest

@@ -0,0 +1,4 @@
+DIST arduino-builder-1.3.25.tar.gz 206905 BLAKE2B 6770b89607c1563b68a79d34e6e214586106c63a4b3c854b4f85a4b9eb2fc24ce5d4a97c29b0c05c19b6834e103f3c3c574bd8cefed0eb684d8aab7e4c71ee7f SHA512 3740530800f8a3cfe1fe20a91579e6b632b76c2c4ace68c7b178a2d234032d5887abee3d0360c3039f2fec912a0d5cabe948bf930a7d9ea23221625456ad5357
+DIST github.com-go-errors-errors-a41850380601eeb43f4350f7d17c6bbd8944aaf8.tar.gz 7835 BLAKE2B f4092b4ef5ebf996cb3c20183868dbdd154ea7cf02a4fd5a3375a3193e9ccacad08f0b6681b456786524b729ffb8c0b5c8af6ceec630eec22326d0fe1e00eb22 SHA512 b1d5e7c6f30f94f8a41b10d32b7f4ce7de8394f74ede6c14fb1f267a0514b24bc3bc7659c3baf6eacf424cea8451e7e57f5f72acc568342e90a447bd02f3e262
+DIST github.com-jstemmer-go-junit-report-833f8ea2b99d36d5f018698333834f3df200a0c2.tar.gz 6901 BLAKE2B 6138ac40810ad000a4336ffbca3bc5c1d0e96854c7918fb2aad9f7b2596ac66f285ac8c519e30b6e97cdb0009b31ab73b83ff2e1db2f464c2d88f2c1045a6bd9 SHA512 00f38f51c5f761b5a3e60a6e6b602f1246a746f081f2d8946d01387234270544692c6af54d0e69919c1af8aa753f848eeecc4421f2ddf881f21522ccf5545d75
+DIST github.com-stretchr-testify-1661650f989674e3e5bcdcb805536e5d31481526.tar.gz 81099 BLAKE2B 592a7c114b01bc5b1982135f310aa8619c2888ac36ccb5d876a38655a13f7dc4d468a7a42a44cf9cf69fc7bd6769a9ba010b48089d5ce866dcd564e20487e04a SHA512 f10255b0f47237c7583626a3bb213ca67d0db92c2a1531cc31dac089cdb13139b01647809503313a26f3e53a64a98cebc3bf9c4e1bd1ed975d9b81aa516ab5af

dev-embedded/arduino-builder/arduino-builder-1.3.25.ebuild

@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="arduino.cc/arduino-builder/..."
+
+EGO_VENDOR=(
+	"github.com/go-errors/errors a41850380601eeb43f4350f7d17c6bbd8944aaf8"
+	"github.com/jstemmer/go-junit-report 833f8ea2b99d36d5f018698333834f3df200a0c2"
+	"github.com/stretchr/testify 1661650f989674e3e5bcdcb805536e5d31481526"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="A command line tool for compiling Arduino sketches"
+HOMEPAGE="https://github.com/arduino/arduino-builder"
+SRC_URI="https://github.com/arduino/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-devel/crossdev
+	dev-embedded/avrdude
+	dev-embedded/arduino-ctags"
+
+DEPEND=">=dev-lang/go-1.9.2"
+
+src_unpack() {
+	golang-vcs-snapshot_src_unpack
+}
+
+src_prepare() {
+	# As we know, golang packages have to be compiled from namespace-aware paths which is the whole
+	# point of the EGO_PN dance. arduino-builder goes a step further by re-creating its own
+	# namespace inside its source package, messing up with our build process which can't find
+	# packages. Also, our source package contains multiple namespaces which further messes with
+	# messes with our vendoring process (each namespace needs its own vendor directory).
+	# We do the following to try to work around this mess. It looks like upstream reworked this
+	# in its master branch so we should be able to remove this in the upcoming major release.
+
+	local deeppath="${S}/src/${EGO_PN%/...}"
+	for pkgname in builder properties timeutils; do
+		ln -s "${deeppath}/src/arduino.cc/${pkgname}" "${S}/src/arduino.cc/${pkgname}"
+	done
+	ln -s "${deeppath}/vendor/github.com" "${S}/src/github.com"
+
+	# path paths so that they point to system ctags and avrdude
+	eapply "${FILESDIR}/arduino-builder-1.3.25-platform-paths.patch"
+
+	default
+}
+
+src_install() {
+	# we unfortunately have to copy/paste the contents of golang-build_src_install() here because
+	# we *don't* want to call golang_install_pkgs() which installs all static libraries we've
+	# built. All we want is to install the final executable.
+
+	set -- env GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" \
+		go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}"
+	echo "$@"
+	"$@" || die
+
+	# END OF COPY/PASTE
+
+	dobin bin/arduino-builder
+
+	# In addition to the binary, we also want to install these two files below. They are needed by
+	# the dev-embedded/arduino which copies those files in its "hardware" folder.
+	insinto "/usr/share/${PN}"
+	cd "src/arduino.cc/builder/hardware" || die
+	doins "platform.txt"
+	doins "platform.keys.rewrite.txt"
+}
+
+pkg_postinst() {
+	[ ! -x /usr/bin/avr-gcc ] && ewarn "Missing avr-gcc; you need to crossdev -s4 avr"
+}

dev-embedded/arduino-builder/files/arduino-builder-1.3.25-platform-paths.patch

@@ -0,0 +1,19 @@
+diff --git a/src/arduino.cc/builder/hardware/platform.txt b/src/arduino.cc/builder/hardware/platform.txt
+index ca8df1f..17ce03f 100644
+--- a/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
++++ b/src/arduino.cc/arduino-builder/src/arduino.cc/builder/hardware/platform.txt
+@@ -1,11 +1,11 @@
+ # ctags
+ # ------------------------------
+-tools.ctags.path={runtime.tools.ctags.path}
+-tools.ctags.cmd.path={path}/ctags
++tools.ctags.path=/usr/bin
++tools.ctags.cmd.path={path}/arduino-ctags
+ tools.ctags.pattern="{cmd.path}" -u --language-force=c++ -f - --c++-kinds=svpf --fields=KSTtzns --line-directives "{source_file}"
+ 
+ # additional entries
+-tools.avrdude.path={runtime.tools.avrdude.path}
++tools.avrdude.path=/usr/bin
+ 
+ preproc.macros.flags=-w -x c++ -E -CC
+ #preproc.macros.compatibility_flags={build.mbed_api_include} {build.nRF51822_api_include} {build.ble_api_include} {compiler.libsam.c.flags} {compiler.arm.cmsis.path} {build.variant_system_include}

dev-embedded/arduino-builder/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">arduino/arduino-builder</remote-id>
+	</upstream>
+</pkgmetadata>

dev-embedded/arduino-ctags/Manifest

@@ -0,0 +1 @@
+DIST arduino-ctags-20161123.tar.gz 490200 BLAKE2B f51b18a0db420124c5fed2b320c16d9eeb96fce6d0f118cf43a8177f88400daaeb83437c3993353c16b73781961c7476e782e66891582f4b3dc5301c73da64dc SHA512 ae5bde92c3dd0b9a179bc1df998f20312c4ab8b2c9c1840dbe543d23fb4531b9e5524f1399d9922ed9b2de4582bdb74635f7ec576a42c808d152c3fbb84f9687

dev-embedded/arduino-ctags/arduino-ctags-20161123.ebuild

@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMITHASH="abc8fca7499f44c725122881cd380a88c37abe0e"
+
+DESCRIPTION="Arduino private fork of dev-util/ctags"
+HOMEPAGE="https://github.com/arduino/ctags"
+SRC_URI="https://github.com/arduino/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/ctags-${COMMITHASH}"
+
+src_configure() {
+	econf \
+		--disable-readlib \
+		--disable-etags \
+		--enable-tmpdir="${EPREFIX}"/tmp
+}
+
+src_install() {
+	# This package compiles into a "ctags" executable, but don't want to clash into
+	# actually legitimate ctags implementations.
+	mv ctags arduino-ctags
+	dobin arduino-ctags
+}

dev-embedded/arduino-ctags/metadata.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">arduino/ctags</remote-id>
+	</upstream>
+	<longdescription>
+		Arduino's build process includes a preprocessing phase that involves ctags,
+		but not any version of ctags, *Arduino's* ctags, a private fork that
+		Arduino maintains. We can't use dev-util/ctags because it causes Arduino
+		to produce corrupt executables.
+	</longdescription>
+</pkgmetadata>

dev-embedded/arduino-listserialportsc/Manifest

@@ -0,0 +1 @@
+DIST arduino-listserialportsc-1.4.0.tar.gz 5448 BLAKE2B a1b5256c9e9ece7ec4de8b1481b6e20769fe07fd94b73d099922074ff20d251896d992aba1e3680dc7e667ff2897fec05812a07273efe097cf5387a5f0207554 SHA512 0e8bbf1e49fa8705a6d3c28b44043f8d13589b7ebdac245db79ed3826bf56028778fdf721af3cf756cc8ea19e7a2f7e5f19421a105211cf0cd35041ec718c2bb

dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild

@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 toolchain-funcs
+
+DESCRIPTION="Arduino helper library to list serial ports"
+HOMEPAGE="https://github.com/arduino/listSerialPortsC"
+SRC_URI="https://github.com/arduino/listSerialPortsC/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-libs/libserialport-0.1.1"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/listSerialPortsC-${PV}"
+
+src_compile() {
+	CC=$(tc-getCC)
+	${CC} -Wall -O2 ${CPPFLAGS} ${CFLAGS} -c -o main.o main.c
+	${CC} ${CFLAGS} ${LDFLAGS} main.o -lserialport -o listSerialC
+
+	${CC} \
+		-Wall -O2 ${CPPFLAGS} ${CFLAGS} -fPIC \
+		-I$(java-config-2 -o)/include \
+		-I$(java-config-2 -o)/include/linux \
+		-o jnilib.o -c jnilib.c
+
+	${CC} \
+		${CFLAGS} ${LDFLAGS} \
+		-shared -Wl,-soname,liblistSerialsj.so \
+		jnilib.o -lserialport -o liblistSerialsj.so.${PV}
+}
+
+src_install() {
+	dobin listSerialC
+	dolib liblistSerialsj.so.${PV}
+	dosym liblistSerialsj.so.${PV} /usr/$(get_libdir)/liblistSerialsj.so
+}

dev-embedded/arduino-listserialportsc/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">arduino/listSerialPortsC</remote-id>
+	</upstream>
+</pkgmetadata>

dev-embedded/arduino/Manifest

@@ -1,3 +1,22 @@
 DIST arduino-1.0.5-src.tar.gz 40526292 BLAKE2B 3844d5f644af94adbb8fb6fa2f80640ae823d2455d0c2e175bc614a281ce5ece0bd111ecd3661d8ab2f2017781b8b1753b215b705090e449be0525b5ec009a4b SHA512 0401bf6051a48d343f9e4e822446a846b2c6446c68949efe5daf5f5445114312eecb9c99a4565ab2e2f80831aaa32122ecc21f81c8a97136704482cd0f1f1c00
+DIST arduino-1.8.5-Adafruit_CircuitPlayground-1.6.8.zip 404619 BLAKE2B 993ec1282cc711b814db99fe1e4b50a2a6e6559722872e8fbcbb42e022c0e3611e10a4a0285468f82241eb5e15c0f91ff49ae9f2e0190d80a674cba51c93eae6 SHA512 0f0d32841bb6987edfc0e9aa0af8d0f7cf68dd33bf07ff0ec4cdd0d9733bb092b97a4810d7a0828e1d38fb25ec58e8fd3c023f70dffa3b1397386a902c932491
+DIST arduino-1.8.5-Bridge-1.6.3.zip 64717 BLAKE2B cb20da7b1db33ad89bd5fcadd01035592b664a7aaa98c27463fad643deba0b1d7e48b341f75f2564716f5b32e800b96934202c683b9a68c628d5af01662c9b7e SHA512 6836580af17b9fbc1ce39821c2e3891bb2f240904a30e66110a03837a24979093ad88819dc333fa5b47ceff6f6ef17552004356bc71200a2e7b09d2182e91fc5
+DIST arduino-1.8.5-Edison_help_files-1.6.2.zip 3321743 BLAKE2B 5d760ba329741cac27253fb439cf98381c0c0d7327f0c22f61cffc23c48d655278280185e5a7f6c85f3d182cacad4626eb9fe6cc2aaf7d2965bb377e2f39bbaa SHA512 63d4005036b43f09347814433578e8c75a7af5caa0923516deab146ef0867af4e60aad0c9d5d47870dcec0ddb4e5396363e4312425f95a8d8da8725f77da8f3a
+DIST arduino-1.8.5-Esplora-1.0.4.zip 22985 BLAKE2B 799936d5d57b2f054e0f7daf421e9e8657b0867c8b417f28afbd3630d2a5ec08b844b855a3b003d649856713372b32861e36dc97c9bbe865c6a1ff05eac4a7ab SHA512 10665b20d907d586bbe22345799e989b835aaa188040b269ed2925a7b4990c6fb368f0e5afd6c4bed265f2baafc815839ff7c53b5da4940e5338090f39e9c13b
+DIST arduino-1.8.5-Firmata-2.5.6.zip 194883 BLAKE2B b4df63b0417fddf8e71d55373d387650afe47de59d526a0cf546b159c83f8bdeb6fc10f62cec9e7e2755e77b357708d96550071045166b7d5ac1e29ecad34506 SHA512 95ec24ebc6033d4c54ab47f306df8d6d9ab0a666ab0f0123edf8e48cbd66e8c78ccbbd4ff1a4acc0ab16f83dd04957727386ed6d8034284ceec70a0462894526
+DIST arduino-1.8.5-Galileo_help_files-1.6.2.zip 4352077 BLAKE2B 16b99a57535ed77cdd69bb60dbb17085edfb2454b81a1b55b46310aa75e797bf784e39fb4642daf281ff92d9ade6f002cf359f98b95fc5225f66e63d189305fa SHA512 411fcfad9e9877078de62c02accd66ed5e44daf2979cad38c12962c22d73412d084670db77d5b50b3a32f35977961943e90d85ac80484f926468aa994f8b107b
+DIST arduino-1.8.5-Keyboard-1.0.1.zip 5802 BLAKE2B 2fc6d86d54c28d5c1ec5656188ddc159bd0725a966d782e908f9d9bc18a4fb8aadbc09e182e47e80bd08978537bf92b94acd7f5b68c4eb524f6ec71f5a1a0feb SHA512 583328acb8e771b59f3e5bed02892740bcd840baafe63f12850e2c43ae7d05ad31bcc19c5e591e73ab29165952d2a7669bbd07b234dd3abd4c38ea54baf22eec
+DIST arduino-1.8.5-LiquidCrystal-1.0.7.zip 19035 BLAKE2B 051048c871adc34697a12b95dc178e759895fd118a1a341d123155c2807434c6c5b5327e8e9c040b2916a0f06a81e7b27879692bd5813dfe0b2040497aa5002c SHA512 352cbffeaced5e52d1e2b8f118681ce435425bf87c0d1b6c384d11127f371ebcf4a026a0d0320fc324285f959d76b6a28cadba8e038e337d020beca847fcd985
+DIST arduino-1.8.5-Mouse-1.0.1.zip 4093 BLAKE2B 6c071c0bbbea6233ddb0a8573d0c8fbf45e0e83454522eb3040006da2db6baab86bfc3003e833a10807f25b81dfa1aac091256c5e55b882f7633c15bc9122b9a SHA512 be0edd798cafa327752c2d2906193be81bcd214a0f406aca646c043ee527e1c398bde8636b35710b4d02074f01c398147fe2bab7108626d80b4181c0c40aa313
+DIST arduino-1.8.5-RobotIRremote-2.0.0.zip 22611 BLAKE2B 8e2c0bd5356116ad6773f85ec364704f4c6cfd13dce89ded762b2603d68abf0854c66e32a2f0fad470ee433b7431f7c0a878f5f1fd763a770d936264d212b248 SHA512 ad38f813825137f60610d168d6352c871da6d8a39b4378764d82a997719c07c5c314816d8384e205599fc5da198465ed334a8794e7d477d55685eb8f7672acd4
+DIST arduino-1.8.5-Robot_Control-1.0.4.zip 119715 BLAKE2B dd73fc1608b96fbc52f484ffdb7a0a40659f5b7b24546a922b742d9d9c5ff9b82fed58f352485a5b988a7ceaf3259e5aa387d198eacb17d987a3ea6b1d7449ac SHA512 45f710dfc8084f9fcf1608a67978f72885aff06e2bbbcb2613f4e337df8621b0f952383a71a55198618b145df378a94321bd5be83929be897fdd95b6bb69cfe0
+DIST arduino-1.8.5-Robot_Motor-1.0.3.zip 15106 BLAKE2B 0ece114be5c11c1e77c6a2ee524e8cac957852948cba253edec5a0d471341e059ab111310aa21715527e19de800d309fe15b98d1fa326d538cfafe585f280304 SHA512 92d108cc2ddb64e2580fab2cb3a157efb76c5204256332527c3fff67ebb8e520621cdc178738132d4e9ee9e2bcde99968b8f9d3c97c10f7d153792e57cfad111
+DIST arduino-1.8.5-SD-1.1.1.zip 60981 BLAKE2B ef6f3a7d06d76ff203fd238c91aecfa3135b3e6777d982342b11126e118ca7934228b1bd06bcbd7215bef823658c13f9d361e874c5c2ecee811457abb74c15e7 SHA512 b24c2ac276cb531043665b835a1d372294a34ddc2dda12c117b26e4ff33e31975b880e878b17d5798dc18f106091c3b60b6546a672267cf8937c4b0245a85342
+DIST arduino-1.8.5-Servo-1.1.2.zip 27659 BLAKE2B f8eb68547078fe0ba6da88cb3eacdd25440b7c48a52499951111309b5ca331f4608130a74300a063b24c5e8870a1d003c5179b0e0468bde2791326ba141a1d7d SHA512 ade1d725c071e97dc027bc654a1c4b79d3cd6c75bf45bac9c3dfed394451b1661c2488217562515fbb8e29698c7df66e30f8178cea40c7f82056546aa857e348
+DIST arduino-1.8.5-SpacebrewYun-1.0.1.zip 12100 BLAKE2B 1dd4a244cb22f2d03804694db0c7d8dbbeedac58263e80a127060eecf9980146ffca8776123b71b16068f95fb42a16940226eb4239f8a1147ec9e0a76a195e3a SHA512 ec9f499db57d3f86e8615b1a56ae61781add99e9fe4c38ba9faa85d2f7d61090e345a63e8ba4a189c62650631ea5be5cbf22dfb39920a63873408a55c40ac133
+DIST arduino-1.8.5-Temboo-1.2.1.zip 187499 BLAKE2B 4f26317b21492697fa3bbce1fe2cdb34793bd5a1b1ca139dde286185f6403bfd5807e47ac8cd4fd3a6d33791e4bd00dcfb40d430ea2791c233940d489ebbee04 SHA512 4ce89b50cb93f85416b35dc218ad4d5fe0768032d146780d82f1d5d834a24dd831ecc4f1bcfa26d740643a3a7f297cdcec4d19bbf1216482d592d44dcbe2f27c
+DIST arduino-1.8.5-WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip 703748 BLAKE2B be9a0e2ac5a890121a0ef59700ee9a001711d7357d1c9aedfac7ca8593ed6bdef32219a88003846d4a793a532a3ebb47cde28dbe4c93dbeef8567ad6fb36bf00 SHA512 f107e5ee544450cc7cabfc7eb43462d374a59446418b5ce3a9f3eb545b03fe6383f42e79eb6919fb4b6e621902cbb84f4fa7119f23b51aa770ebd020ffffdee9
+DIST arduino-1.8.5-reference-1.6.6-3.zip 7004842 BLAKE2B 49d0d41fb499c15f06c8cb8d8211e5039ee9843a6629f305762b262a5bf199e4bbe7fea4716b7734403dc7e83ce35a963035b3a2c0d6a198a4218e7472b18d74 SHA512 65962322b6dcb15da6c119d47c382052d1183772c855b8e8fcdd108b54e730e2374d93741737f3b51e57288a0e8842a6a7f79dce4377ea3630293e6c3e7e8b73
+DIST arduino-1.8.5.tar.gz 48219839 BLAKE2B b031ccd601c42adce0ef06b69bd6103996d7a2a29a4640ab2518bb607e17d90524e1f7dc9861c096df90b0f0a439c5ee8867912b53cb925309dd7e0f6ddf3b54 SHA512 f01b0401edc7ea5d58cb475776b816d05f289060613dd452ca71ecaf4a3a95c5e9ddb5f2cf06d3c165e9e0540c895f9eaea896a7974c88834de569944c4adbd2
 DIST arduino-icons.tar.bz2 58775 BLAKE2B 20f230394a8d725eaf7300f66105b09b31eb96aad8798f325d9e5eec6a1aec8319deb561d1b76d47d08dc6663ec11b6b991e057b88d6619c16a80cf0e10959e1 SHA512 b750e79d6117f5df619f2b765dad6e64f0ba4aa3314b0b6e00801577e3ea1f15951ba15efe7a00f5317285a19ac29ac41c78b71342f45cd164c794a42bafcdd9
 DIST arduino-src-1.0.5.tar.gz 235284641 BLAKE2B 7e7ed1305be468dff5ee32238e51b56c214bb993531c67a5ed178a267b5ff8b0f5303aa2a539b64ac40b20278d0206513c3b26f74dd9120058d97fabbbafef27 SHA512 0a40203b8a31c4d9288500962ada7f5083c280a84d8c56ab7da2d1326e1c02a908a96db589ab10bafc115abefe010bf23f6994c08e43c86a4ac10c2d4ab93ec2

dev-embedded/arduino/arduino-1.8.5.ebuild

@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-ant-2 gnome2-utils
+
+DESCRIPTION="An open-source AVR electronics prototyping platform"
+HOMEPAGE="http://arduino.cc/"
+
+ARDUINO_LIBRARIES=(
+	"Firmata 2.5.6"
+	"Bridge 1.6.3"
+	"Robot_Control 1.0.4"
+	"Robot_Motor 1.0.3"
+	"RobotIRremote 2.0.0"
+	"SpacebrewYun 1.0.1"
+	"Temboo 1.2.1"
+	"Esplora 1.0.4"
+	"Mouse 1.0.1"
+	"Keyboard 1.0.1"
+	"SD 1.1.1"
+	"Servo 1.1.2"
+	"LiquidCrystal 1.0.7"
+	"Adafruit_CircuitPlayground 1.6.8 https://github.com/Adafruit/Adafruit_CircuitPlayground/archive/1.6.8.zip"
+	"WiFi101-Updater-ArduinoIDE-Plugin 0.9.1 https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.9.1/WiFi101-Updater-ArduinoIDE-Plugin-0.9.1.zip build/shared/"
+)
+
+for lib in "${ARDUINO_LIBRARIES[@]}"; do
+	lib=( $lib )
+	default_url="https://github.com/arduino-libraries/${lib[0]}/archive/${lib[1]}.zip"
+	url=${lib[2]:-$default_url}
+	ARDUINO_LIBRARIES_URI+=" ${url} -> ${P}-${lib[0]}-${lib[1]}.zip"
+done
+
+ARDUINO_DOCS=(
+	"reference-1.6.6-3"
+	"Galileo_help_files-1.6.2"
+	"Edison_help_files-1.6.2"
+)
+
+for docname in "${ARDUINO_DOCS[@]}"; do
+	ARDUINO_DOCS_URI+=" https://downloads.arduino.cc/${docname}.zip -> ${P}-${docname}.zip"
+done
+
+SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${ARDUINO_LIBRARIES_URI}
+	doc? (
+		${ARDUINO_DOCS_URI}
+	)"
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# bincheck RESTRICT is needed because firmware that ships with arduino contains code that makes
+# scanelf bark. It's also why we need a separate package for arduino-listserialportsc because if
+# we install it in the context of this package, we will get QA notices telling us we're doing a
+# bad thing.
+RESTRICT="strip binchecks"
+IUSE="doc"
+
+CDEPEND="dev-embedded/arduino-builder"
+
+RDEPEND="${CDEPEND}
+	>=dev-util/astyle-3.1[java]
+	dev-embedded/arduino-listserialportsc
+	>=virtual/jre-1.8"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.8"
+
+EANT_BUILD_TARGET="build"
+# don't run the default "javadoc" target, we don't have one.
+EANT_DOC_TARGET=""
+EANT_BUILD_XML="build/build.xml"
+EANT_EXTRA_ARGS="-Dno_arduino_builder=1 -Dlocal_sources=1"
+
+S="${WORKDIR}/Arduino-${PV}"
+SHARE="/usr/share/${PN}"
+
+src_unpack() {
+	# We don't want to unpack libraries, just move zip files into the work dir
+	unpack `echo ${A} | cut -d ' ' -f1`
+	local lib
+	for lib in "${ARDUINO_LIBRARIES[@]}"; do
+		lib=( $lib )
+		local destfolder=${lib[3]:-build/}
+		cp "${DISTDIR}/${P}-${lib[0]}-${lib[1]}.zip" "${S}/${destfolder}/${lib[0]}-${lib[1]}.zip"
+	done
+	if use doc; then
+		local docname
+		for docname in "${ARDUINO_DOCS[@]}"; do
+			cp "${DISTDIR}/${P}-${docname}.zip" "${S}/build/shared/${docname}.zip"
+		done
+	fi
+}
+
+src_prepare() {
+	# We need to disable astyle/listserialportsc and toolchain (avr-gcc, avrdude) bundling.
+	eapply "${FILESDIR}/${PN}-1.8.5-build.xml.patch"
+
+	# We need to replace relative paths for toolchain executable by paths to system ones.
+	eapply "${FILESDIR}/${PN}-1.8.5-avr-platform.txt.patch"
+
+	# We need to load system astyle/listserialportsc instead of bundled ones.
+	eapply "${FILESDIR}/${PN}-1.8.5-lib-loading.patch"
+	default
+}
+
+src_compile() {
+	if ! use doc; then
+		EANT_EXTRA_ARGS+=" -Dno_docs=1"
+	fi
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	cd "${S}"/build/linux/work || die
+
+	java-pkg_dojar lib/*.jar
+	java-pkg_dolauncher ${PN} \
+		--pwd "${SHARE}" \
+		--main "processing.app.Base" \
+		--java_args "-DAPP_DIR=${SHARE}"
+
+	# Install libraries
+	insinto "${SHARE}"
+
+	doins -r examples hardware lib libraries tools
+
+	# In upstream's build process, we copy these fiels below from the bundled arduino-builder.
+	# Here we do the same thing, but from the system arduino-builder.
+	dosym "${EPREFIX}/usr/share/arduino-builder/platform.txt" "${SHARE}/hardware/platform.txt"
+	dosym "${EPREFIX}/usr/share/arduino-builder/platform.keys.rewrite.txt" "${SHARE}/hardware/platform.keys.rewrite.txt"
+	dosym "${EPREFIX}/usr/bin/arduino-builder" "${SHARE}/arduino-builder"
+
+	# hardware/tools/avr needs to exist or arduino-builder will
+	# complain about missing required -tools arg
+	dodir "${SHARE}/hardware/tools/avr"
+
+	if use doc; then
+		HTML_DOCS=( reference )
+		einstalldocs
+
+		# arduino expects its doc in its "main" directory. symlink it.
+		dosym "${EPREFIX}/usr/share/doc/${P}/html/reference" "${SHARE}/reference"
+	fi
+
+	# Install menu and icons
+	domenu "${FILESDIR}/${PN}.desktop"
+	cd lib/icons || die
+	local icondir
+	for icondir in *; do
+		# icondir name is something like "24x24" we want the "24" part
+		local iconsize=`cut -dx -f1 <<< "${icondir}"`
+		newicon -s $iconsize \
+			"${icondir}/apps/arduino.png" \
+			"${PN}.png"
+	done
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	[[ ! -x /usr/bin/avr-g++ ]] && ewarn "Missing avr-g++; you need to crossdev -s4 avr"
+}

dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch

@@ -0,0 +1,26 @@
+diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
+index f7fb447c1..8ae8b73d9 100644
+--- a/hardware/arduino/avr/platform.txt
++++ b/hardware/arduino/avr/platform.txt
+@@ -18,7 +18,7 @@ compiler.warning_flags.more=-Wall
+ compiler.warning_flags.all=-Wall -Wextra
+ 
+ # Default "compiler.path" is correct, change only if you want to override the initial value
+-compiler.path={runtime.tools.avr-gcc.path}/bin/
++compiler.path=/usr/bin/
+ compiler.c.cmd=avr-gcc
+ compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
+ compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections
+@@ -91,9 +91,9 @@ recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {
+ # AVR Uploader/Programmers tools
+ # ------------------------------
+ 
+-tools.avrdude.path={runtime.tools.avrdude.path}
+-tools.avrdude.cmd.path={path}/bin/avrdude
+-tools.avrdude.config.path={path}/etc/avrdude.conf
++tools.avrdude.path=/usr
++tools.avrdude.cmd.path=/usr/bin/avrdude
++tools.avrdude.config.path=/etc/avrdude.conf
+ 
+ tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
+ 

dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch

@@ -0,0 +1,31 @@
+diff --git a/build/build.xml b/build/build.xml
+index d95f8def6..13ba60286 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -641,7 +641,7 @@
+     </chmod>
+   </target>
+ 
+-  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
++  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch" if="never">
+     <antcall target="unzip">
+       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
+       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+@@ -666,7 +666,7 @@
+ 
+   </target>
+ 
+-  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
++  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM" if="never">
+     <antcall target="unzip">
+       <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
+       <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+@@ -1186,7 +1186,7 @@
+ 	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
+   </target>
+ 
+-  <target name="avr-toolchain-bundle" unless="light_bundle">
++  <target name="avr-toolchain-bundle" if="never">
+     <!-- Unzip AVR tools -->
+     <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/>
+ 

dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch

@@ -0,0 +1,26 @@
+diff --git a/app/src/cc/arduino/packages/formatter/AStyleInterface.java b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
+index 4224bf164..fa92506ba 100644
+--- a/app/src/cc/arduino/packages/formatter/AStyleInterface.java
++++ b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
+@@ -41,7 +41,7 @@ public class AStyleInterface {
+       loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
+       loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
+     }
+-    loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
++    System.loadLibrary("astylej");
+   }
+ 
+   private static void loadLib(File lib) {
+diff --git a/arduino-core/src/processing/app/Platform.java b/arduino-core/src/processing/app/Platform.java
+index 28a7ba0f5..8a943a8ac 100644
+--- a/arduino-core/src/processing/app/Platform.java
++++ b/arduino-core/src/processing/app/Platform.java
+@@ -154,7 +154,7 @@ public class Platform {
+   }
+ 
+   static {
+-    loadLib(new File(BaseNoGui.getContentFile("lib"), System.mapLibraryName("listSerialsj")));
++    System.loadLibrary("listSerialsj");
+   }
+ 
+   private static void loadLib(File lib) {

dev-embedded/arduino/metadata.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>embedded@gentoo.org</email>
 		<name>Embedded Gentoo</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">arduino/Arduino</remote-id>
+	</upstream>
 </pkgmetadata>

dev-lang/go/go-1.9.4.ebuild

@@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is

dev-lang/vala/vala-0.36.7.ebuild

@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.36"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="

dev-libs/atk/atk-2.24.0.ebuild

@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="