Sync with portage [Sun Mar 11 16:08:38 MSK 2018].

6 years ago · b478977d7d
parent c3ed8d9eb1
commit b478977d7d
5995 changed files with 20994 additions and 22333 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/aws-as-tools/Manifest
+++ b/app-admin/aws-as-tools/Manifest
@ -1 +0,0 @@
-DIST AutoScaling-1.0.49.1.zip 12387808 BLAKE2B 7f43b3544b05f1adc196c28b7c2fc5c26ea84cb3d3bd7cf098d8413b98aac5d2908177ee5567aad6dbea96d1abbf60794c4450423de768c280a33cb4efdbbd1e SHA512 aefc4dfc970757062ca972c5d532485c9e28ceb771b6fa0a4fb2fe25460bd67e3023bcefde57f9852340b6015e7ab2771c49beb0826e1394710ea7eea94948ed
--- a/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
+++ b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The API tools serve as the client interface to the Auto Scaling web service"
-HOMEPAGE="http://aws.amazon.com/developertools/2535"
-# SRC_URI="http://ec2-downloads.s3.amazonaws.com/AutoScaling-2011-01-01.zip"
-SRC_URI="mirror://sabayon/app-admin/AutoScaling-1.0.49.1.zip"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}/AutoScaling-${PV}"
-
-src_prepare() {
-	default
-
-	find . -name '*.cmd' -delete || die
-	rm bin/{as-cmd,service}-2009-05-15 || die
-}
-
-src_install() {
-	insinto /opt/${PN}/lib
-	doins -r lib/.
-
-	exeinto /opt/${PN}/bin
-	doexe bin/*
-
-	cat > "${T}"/99${PN} <<- EOF || die
-		AWS_AUTO_SCALING_HOME=/opt/${PN}
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-	EOF
-	doenvd "${T}"/99${PN}
-
-	dodoc "THIRDPARTYLICENSE.TXT"
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-
-	elog
-	elog "You need to put the following in your ~/.bashrc replacing the"
-	elog "values with the full path to your AWS credentials file."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}
--- a/app-admin/aws-as-tools/metadata.xml
+++ b/app-admin/aws-as-tools/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>sergey.zhuga@gmail.com</email>
-    <name>Sergey Zhuga</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
--- a/app-admin/aws-cw-tools/Manifest
+++ b/app-admin/aws-cw-tools/Manifest
@ -1 +0,0 @@
-DIST CloudWatch-1.0.12.1.zip 6156651 BLAKE2B 140dc28fa44423824f180f34ab05918068e941f31de3081c0ee7ae462ee8d63f26c4fdc838a9e677638a34609a215f52b83572980e488d34557d39d610c434e7 SHA512 881a428a2861b86196a691f24a3471058426f049170d16f067d7cc319712beb161c80041e9ae89339d5298ffbf2869c04509fbe4620cd60cc74658c8d3ab11ec
--- a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
+++ b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The API tools serve as the client interface to the Amazon CloudWatch web service"
-HOMEPAGE="http://aws.amazon.com/developertools/2534"
-# SRC_URI="http://ec2-downloads.s3.amazonaws.com/CloudWatch-2010-08-01.zip"
-SRC_URI="mirror://sabayon/${CATEGORY}/CloudWatch-${PV}.zip"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}/CloudWatch-${PV}"
-
-src_prepare() {
-	default
-	find . -name '*.cmd' -delete || die
-}
-
-src_install() {
-	insinto /opt/${PN}/lib
-	doins -r lib/.
-
-	exeinto /opt/${PN}/bin
-	doexe bin/*
-
-	dodir /etc/env.d
-	cat - > "${T}"/99${PN} <<- EOF || die
-		AWS_CLOUDWATCH_HOME=/opt/${PN}
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-	EOF
-	doenvd "${T}"/99${PN}
-
-	dodoc "THIRDPARTYLICENSE.TXT"
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-
-	elog
-	elog "You need to put the following in your ~/.bashrc replacing the"
-	elog "values with the full path to your AWS credentials file."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}
--- a/app-admin/aws-cw-tools/metadata.xml
+++ b/app-admin/aws-cw-tools/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>sergey.zhuga@gmail.com</email>
-    <name>Sergey Zhuga</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
--- a/app-admin/aws-iam-tools/Manifest
+++ b/app-admin/aws-iam-tools/Manifest
@ -1 +0,0 @@
-DIST IAMCli-1.3.0.zip 3957057 BLAKE2B b2e429c2fb3169e23d6e6fc4c4b33594f2814bf976d1c584551008561b71977a3ee4abafd50bd3e52592e918624da01b83527557d2079772d083fbe96ee52eb5 SHA512 5012ece2d0569545848d83cf879b4d05f7f955f22bbc31b86f3993e4f5ee48de3099369fddf7f2b2d98f89e56c8c329e427a1f7dca0afa728ea9593c1b36497c
--- a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
+++ b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Command Line Interface for the AWS Identity and Access Management Service"
-HOMEPAGE="http://aws.amazon.com/developertools/AWS-Identity-and-Access-Management/4143"
-SRC_URI="mirror://sabayon/${CATEGORY}/IAMCli-${PV}.zip"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}/IAMCli-${PV}"
-
-src_prepare() {
-	default
-	find . -name '*.cmd' -delete || die
-}
-
-src_install() {
-	insinto /opt/${PN}/lib
-	doins -r lib/.
-
-	exeinto /opt/${PN}/bin
-	doexe bin/*
-
-	cat > "${T}"/99${PN} <<- EOF || die
-		AWS_IAM_HOME=/opt/${PN}
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-	EOF
-	doenvd "${T}"/99${PN}
-
-	dodoc LICENSE.txt
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-
-	elog
-	elog "You need to put the following in your ~/.bashrc replacing the"
-	elog "values with the full path to your AWS credentials file."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}
--- a/app-admin/aws-iam-tools/metadata.xml
+++ b/app-admin/aws-iam-tools/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>sergey.zhuga@gmail.com</email>
-    <name>Sergey Zhuga</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
--- a/app-admin/aws-rds-tools/Manifest
+++ b/app-admin/aws-rds-tools/Manifest
@ -1 +0,0 @@
-DIST RDSCli-1.6.001.zip 6291974 BLAKE2B bdb7f9bce07e920b144cce15e6b05f9d98aeab4cbb33c181914d8584c5e24f70ef486e3d2b677e166ad9f936a2d15758ba55cc26f7fc129ed907989c2d3424a8 SHA512 29eb31064cc9b067bdc625e9777dd1cc77bdbd01a167c91c396d52f89fd9617496e2383fe343a17abb0d8029e47eb87f8ae7e60c0dd5a89cee485dbe45a05963
--- a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
+++ b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="The Command Line Toolkit for the Amazon Relational Database Service"
-HOMEPAGE="http://aws.amazon.com/developertools/2928"
-SRC_URI="mirror://sabayon/${CATEGORY}/RDSCli-${PV}.zip"
-
-LICENSE="Amazon"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND="virtual/jre"
-
-S="${WORKDIR}/RDSCli-${PV}"
-
-src_prepare() {
-	default
-	find . -name '*.cmd' -delete || die
-}
-
-src_install() {
-	insinto /opt/${PN}/lib
-	doins -r lib/.
-
-	exeinto /opt/${PN}/bin
-	doexe bin/*
-
-	cat > "${T}"/99${PN} <<- EOF || die
-		AWS_RDS_HOME=/opt/${PN}
-		PATH=/opt/${PN}/bin
-		ROOTPATH=/opt/${PN}/bin
-	EOF
-	doenvd "${T}"/99${PN}
-
-	dodoc THIRDPARTYLICENSE.TXT
-}
-
-pkg_postinst() {
-	ewarn "Remember to run: env-update && source /etc/profile if you plan"
-	ewarn "to use these tools in a shell before logging out (or restarting"
-	ewarn "your login manager)"
-
-	elog
-	elog "You need to put the following in your ~/.bashrc replacing the"
-	elog "values with the full path to your AWS credentials file."
-	elog
-	elog "  export AWS_CREDENTIAL_FILE=/path/and_filename_of_credential_file"
-	elog
-	elog "It should contains two lines: the first line lists the AWS Account's"
-	elog "AWS Access Key ID, and the second line lists the AWS Account's"
-	elog "Secret Access Key. For example:"
-	elog
-	elog "  AWSAccessKeyId=AKIAIOSFODNN7EXAMPLE"
-	elog "  AWSSecretKey=wJalrXUtnFEMI/K7MDENG/bPxRfiCYzEXAMPLEKEY"
-}
--- a/app-admin/aws-rds-tools/metadata.xml
+++ b/app-admin/aws-rds-tools/metadata.xml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>sergey.zhuga@gmail.com</email>
-    <name>Sergey Zhuga</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-</pkgmetadata>
--- a/app-admin/bind_exporter/Manifest
+++ b/app-admin/bind_exporter/Manifest
@ -0,0 +1 @@
+DIST bind_exporter-0.2.0_p20180307.tar.gz 873965 BLAKE2B e59cbd2ccbd13dd60b673c6816e2d4c151e85ed159daa272996081814f7f276bc686b5d6a94db59e41085d57a12974bd2dcb8ef7696dba3940de705dfc800f25 SHA512 63331f877d988a41b86c0204569a1cd19cbfa176be9e811ef8fa5509d0af4a2f7dda0b27f9ba3b0f3df985f7c075f4535225298ce8808f97497d8bfa3b41256d
--- a/app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild
+++ b/app-admin/bind_exporter/bind_exporter-0.2.0_p20180307.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/digitalocean/bind_exporter"
+EXPORTER_COMMIT="38ef3a6caa68e8c42a08e72d51e90b00333e6894"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EXPORTER_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Elasticsearch stats exporter for Prometheus"
+HOMEPAGE="https://github.com/digitalocean/bind_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/${PN}
+	dodoc {README,CHANGELOG}.md
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
+
+pkg_postinst() {
+	elog "Make sure BIND was built with libxml2 support. You can check with the"
+	elog "following command: named -V | grep libxml2."
+	elog "Configure BIND to open a statistics channel. It's recommended to run"
+	elog "the bind_exporter next to BIND, so it's only necessary to open a port"
+	elog "locally."
+	elog ""
+	elog "statistics-channels {"
+	elog "inet 127.0.0.1 port 8053 allow { 127.0.0.1; };"
+	elog "};"
+}
--- a/app-admin/bind_exporter/files/bind_exporter.confd
+++ b/app-admin/bind_exporter/files/bind_exporter.confd
@ -0,0 +1,2 @@
+# arguments for prometheus bind exporter
+command_args=""
--- a/app-admin/bind_exporter/files/bind_exporter.initd
+++ b/app-admin/bind_exporter/files/bind_exporter.initd
@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus bind exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/bind_exporter"
+command_args="${command_args:-}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
--- a/app-admin/bind_exporter/metadata.xml
+++ b/app-admin/bind_exporter/metadata.xml
@ -2,11 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">specto</remote-id>
-		<remote-id type="sourceforge">specto</remote-id>
+		<remote-id type="github">digitalocean/bind_exporter</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-admin/equo/metadata.xml
+++ b/app-admin/equo/metadata.xml
@ -5,8 +5,4 @@
 		<email>mudler@gentoo.org</email>
 		<name>Ettore Di Giacinto</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
 </pkgmetadata>
--- a/app-admin/jinit/Manifest
+++ b/app-admin/jinit/Manifest
@ -1 +0,0 @@
-DIST jinit-0.1.12.tar.gz 110745 BLAKE2B 411f02a45726b20045de7ce6e40627c0652ae778631e3bb1de37182839b316efaccb84b4270a3dc15258d3eb479ff3fcc1a99cd7f313a615d06326154c61cd78 SHA512 3428ba2c9bc57f6a1e30d75b9c2b86f597753fdb29e5c748986a3bf90b8189f35b88591dffb8f861b728e7ce08e78c6c5f1780147bfdb5b6a1d5f2128d34db5d
--- a/app-admin/jinit/files/jinit-0.1.12-gcc43.patch
+++ b/app-admin/jinit/files/jinit-0.1.12-gcc43.patch
@ -1,10 +0,0 @@
--- org/jinit-0.1.12/init_ipc/User.hh	2003-04-29 23:35:53.000000000 +0200
-+++ jinit-0.1.12/init_ipc/User.hh	2009-01-04 11:19:16.000000000 +0100
-@@ -13,6 +13,7 @@
- #include <errno.h>
- #include <time.h>
- #include <err.h>
-+#include <cstdlib>
- 
- #include "init_ipc/sysvq.hh"
- #include "need/error.hh"
--- a/app-admin/jinit/jinit-0.1.12-r1.ebuild
+++ b/app-admin/jinit/jinit-0.1.12-r1.ebuild
@ -1,33 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils
-
-DESCRIPTION="An alternative to sysvinit which supports the need(8) concept"
-HOMEPAGE="http://john.fremlin.de/programs/linux/jinit/"
-SRC_URI="http://john.fremlin.de/programs/linux/jinit/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "failed emake install"
-	emake prefix="${D}"/usr/share/doc/${PF}/example-setup install-initscripts \
-		|| die "failed installing example setup"
-	mv "${D}"/usr/sbin "${D}"/ || die
-	mv "${D}"/sbin/init "${D}"/sbin/jinit || die
-	mv "${D}"/sbin/shutdown "${D}"/sbin/jinit-shutdown || die
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-}
--- a/app-admin/jinit/metadata.xml
+++ b/app-admin/jinit/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@ -1,2 +1,3 @@
 DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
+DIST logrotate-3.14.0.tar.gz 215413 BLAKE2B 7914188922d81b1f8b6c4e493fae71d23bc9e65ebfcb190ebb4287c875af53204cbecb51c2731a3dc57530a30c685c3a626074265d9a2462714ff6ff077ea5ca SHA512 5f584d9be01737960eaffcf43746270a5395486d2161577a9ee3e757cb4dfe5a207c8b1d097181dd413560d76ecc0e3d526f87d1b123a52dc3e5e49d529a5fb5
 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
--- a/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch
+++ b/app-admin/logrotate/files/logrotate-3.14.0-ignore-hidden.patch
@ -0,0 +1,14 @@
+diff -Nuar a/config.c b/config.c
+--- a/config.c	2018-03-09 17:47:08.000000000 +0100
+++ b/config.c	2018-03-09 19:47:42.274696766 +0100
+@@ -440,7 +440,9 @@
+ 	int i;
+ 
+ 	/* Check if fname is '.' or '..'; if so, return false */
+-	if (fname[0] == '.' && (!fname[1] || (fname[1] == '.' && !fname[2])))
+    /* Don't include 'hidden' files either; this breaks Gentoo
+       portage config file management http://bugs.gentoo.org/87683 */
+    if (fname[0] == '.')
+ 		return 0;
+ 
+ 	/* Check if fname is ending in a taboo-extension; if so, return false */
--- a/app-admin/logrotate/logrotate-3.14.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.14.0.ebuild
@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acl +cron selinux"
+
+CDEPEND="
+	>=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+
+DEPEND="${CDEPEND}
+	>=sys-apps/sed-4"
+
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="/var/lib/misc/logrotate.status"
+OLDSTATEFILE="/var/lib/logrotate.status"
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}"
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ignore-hidden.patch"
+)
+
+src_prepare() {
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
+	eapply_user
+}
+
+src_configure() {
+	econf $(use_with acl) $(use_with selinux) --with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	insinto /usr
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md examples/logrotate-default
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+	move_old_state_file
+	elog "If you are running systemd you might need to run:"
+	elog "systemd-tmpfiles --create /usr/lib/tmpfiles.d/logrotate.conf"
+	elog "in order to create the new location of the logrotate state file"
+	elog
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
--- a/app-admin/matter/metadata.xml
+++ b/app-admin/matter/metadata.xml
@ -5,10 +5,6 @@
 		<email>mudler@gentoo.org</email>
 		<name>Ettore Di Giacinto</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
 	<use>
 		<flag name="entropy">Add Entropy support</flag>
 	</use>
--- a/app-admin/nginx-vts-exporter/Manifest
+++ b/app-admin/nginx-vts-exporter/Manifest
@ -0,0 +1 @@
+DIST nginx-vts-exporter-0.10.0.tar.gz 149620 BLAKE2B 6856240886d1a7082c901535954193798e8636ef744a5960441726cb12a5510706f7b8c1757e9f719c756d0beabc355cde8ec626c9bd4f14f7ff84894d0cc6da SHA512 bdd3993b3fee24d3332db720df2880493eeb0724cd5b099ccdd5fe6456df1b344132e4e585271999df355fb2042954cb3d452e6dc0b92dead288e94dd71f627c
--- a/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd
+++ b/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.confd
@ -0,0 +1,2 @@
+# arguments for prometheus nginx virtual host traffic stats exporter
+command_args="-nginx.scrape_uri=http://localhost/status/format/json"
--- a/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.initd
+++ b/app-admin/nginx-vts-exporter/files/nginx-vts-exporter.initd
@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Prometheus nginx virtual host traffic status exporter"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-${RC_SVCNAME}}
+group=${group:-${RC_SVCNAME}}
+
+command="/usr/bin/nginx-vts-exporter"
+command_args="${command_args:--nginx.scrape_uri=http://localhost/status/format/json}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
+	--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
--- a/app-admin/nginx-vts-exporter/metadata.xml
+++ b/app-admin/nginx-vts-exporter/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="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hnlq715/nginx-vts-exporter</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild
+++ b/app-admin/nginx-vts-exporter/nginx-vts-exporter-0.10.0.ebuild
@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/hnlq715/nginx-vts-exporter"
+EXPORTER_COMMIT="f5b3491cd0a8cc2df7088470f2727b0ae39a2700"
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Nginx virtual host traffic stats exporter for Prometheus"
+HOMEPAGE="https://github.com/hnlq715/nginx-vts-exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix bin || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin bin/${PN}
+	dodoc README.md
+	popd || die
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
--- a/app-admin/packagekit-base/metadata.xml
+++ b/app-admin/packagekit-base/metadata.xml
@ -5,10 +5,6 @@
 		<email>mudler@gentoo.org</email>
 		<name>Ettore Di Giacinto</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
--- a/app-admin/packagekit-gtk/metadata.xml
+++ b/app-admin/packagekit-gtk/metadata.xml
@ -5,10 +5,6 @@
 		<email>mudler@gentoo.org</email>
 		<name>Ettore Di Giacinto</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
--- a/app-admin/packagekit-qt/metadata.xml
+++ b/app-admin/packagekit-qt/metadata.xml
@ -5,10 +5,6 @@
 		<email>mudler@gentoo.org</email>
 		<name>Ettore Di Giacinto</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
--- a/app-admin/packagekit/metadata.xml
+++ b/app-admin/packagekit/metadata.xml
@ -5,10 +5,6 @@
 		<email>mudler@gentoo.org</email>
 		<name>Ettore Di Giacinto</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>lxnay@gentoo.org</email>
-		<name>Fabio Erculiani</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
--- a/app-admin/procinfo/Manifest
+++ b/app-admin/procinfo/Manifest
@ -1 +0,0 @@
-DIST procinfo-18.tar.gz 24365 BLAKE2B 7da2f2afe014dc5b991244c0f2eff631db87ed00942a38dcbd1f5080df0bc7c2fb30fd5c7af14a180dfc2ce0562b2a26633451e0a3a17a577cd15a5f281f0118 SHA512 12c4d7983f5d6531be6d4df39f5f1e1ee2ea2394a6eb8fb8df0573f0085499e4b7d43355bfa549a24ddf1ecb09bbfa7b038cef9c483620c74ad5cedc219e35fa
--- a/app-admin/procinfo/files/cpu-usage-fix.patch
+++ b/app-admin/procinfo/files/cpu-usage-fix.patch
@ -1,31 +0,0 @@
--- procinfo.c~	2005-01-31 20:52:29.250918264 +0200
-+++ procinfo-18/procinfo.c	2005-01-31 20:48:55.907351416 +0200
-@@ -402,26 +402,8 @@
-     }
- 
-     elapsed = new.uptime;
-
-/* XXX Is this stuff still relevant/true? */
-
-#ifdef __i386__		/* IRQ 0 is timer tick on i386's... */
-    if (nr_irqs) {
-	if (fs && old.uptime)
-	    elapsed = DIFF (intr[0]);
-    } else
-#endif
-#ifdef __sparc__	/* IRQ 10 is timer tick on sparc's... */
-    if (nr_irqs) {
-	if (fs && old.uptime)
-	    elapsed = DIFF (intr[10]);
-    } else
-#endif
-    {
-	/* This won't be exact... */
-	if (fs && old.uptime)
-	    elapsed = DIFF (uptime);
-    }
-+    if (fs && old.uptime)
-+	elapsed = DIFF (uptime);
- 
-     printf ("user  : %s %s",
- 	    hms (bDIFF (cpu_user)), perc (bDIFF (cpu_user), elapsed, nr_cpus));
--- a/app-admin/procinfo/files/kernel-2.6.patch
+++ b/app-admin/procinfo/files/kernel-2.6.patch
@ -1,296 +0,0 @@
-diff -ruN procinfo-18/procinfo.c procinfo-19/procinfo.c
--- procinfo-18/procinfo.c	2001-02-25 11:29:16.000000000 +0000
-+++ procinfo-19/procinfo.c	2004-06-17 10:28:33.767925439 +0100
-@@ -5,9 +5,10 @@
-   Displays general info from /proc.
- 
-   Date:        1995-07-08 05:30:34
-  Last Change: 2001-02-25 00:27:21
-+  Last Change: 2004-06-17 11:28:13
- 
-   Copyright (c) 1994-2001 svm@kozmix.cistron.nl
-+  Copyright (c) 2004 procinfo@meisel.cc (upgrades for 2.6 kernel)
- 
-   This software is released under the GNU Public Licence. See the file
-   `COPYING' for details. Since you're probably running Linux I'm sure
-@@ -26,6 +27,7 @@
- #include <string.h>
- #include <termios.h>
- #include <termcap.h>
-+#include <ctype.h>
- #include <time.h>
- #include <unistd.h>
- #include <sys/param.h>	/* for HZ -- should be in <time.h> ? */
-@@ -72,9 +74,9 @@
- int nr_irqs = 0;
- int nr_cpus = 0;
- 
-FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp,
-+FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp, *diskstatsfp,
-     *devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
-    *versionfp, *cpuinfofp;
-+    *versionfp, *cpuinfofp, *vmstatfp;
- 
- char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
- 
-@@ -89,9 +91,13 @@
- {
-     unsigned long elapsed;
-     char loadavg[32];
-    int i;
-+    int i, havetwosix = 0, lastdisk;
-     static int have_m_c = -1;	/* Do we have cache info? */
-     static int have_m_l = -1;	/* Do we have new-style-one-datum-per-line? */
-+    char devicename[10];
-+    char *last;
-+    unsigned int q,w,a,s,d,f,g,h,j,k,l,y,x;
-+    int disk_counter = 0, ret;
- 
- 
- /**** /proc/uptime ****/
-@@ -237,6 +243,50 @@
- 
-     printf ("Bootup: %s    Load average: %s\n\n", booted, loadavg);
- 
-+/**** /proc/vmstat ... 2.6.x kernel only ****/
-+	if (vmstatfp) {
-+		havetwosix = 1;
-+		fseek (vmstatfp, 0L, SEEK_SET);
-+		while (fgets (line, sizeof (line), vmstatfp)) {
-+			char *type = strtok (line, " ");
-+			if (ISSTR ("pgpgin")) {
-+				new.pgin = VAL;
-+			} else if (ISSTR ("pgpgout")) {
-+				new.pgout = VAL;
-+			} else if (ISSTR ("pgactivate")) {
-+				new.pgac = VAL;
-+			} else if (ISSTR ("pgdeactivate")) {
-+				new.pgdeac = VAL;
-+			} else if (ISSTR ("pgfault")) {
-+				new.pgfault = VAL;
-+			} else if (ISSTR ("pswpin")) {
-+				new.swin = VAL;
-+			} else if (ISSTR ("pswpout")) {
-+				new.swout = VAL;
-+			}
-+		}
-+	}
-+
-+/**** /proc/diskstats ... 2.6.x kernel only ****/
-+   if (diskstatsfp) {
-+	havetwosix = 1;
-+	fseek (diskstatsfp, 0L, SEEK_SET);
-+	while (fgets (line, sizeof (line), diskstatsfp)) {
-+	   char *type = strtok (line, "\n");
-+		   ret = sscanf (type, "%d%d%s%d%d%d%d%d%d%d%d%d%d%d", &q, &w, devicename, &a, &s, &d, &f, &g, &h, &j, &k, &l, &y, &x);
-+		   if (ret != 14) /* Everything with less than 14 elements is not a disk device */
-+			   continue;
-+         last = devicename+strlen(devicename)-1;
-+         if (isalpha(*last)) {/* Is the last char is a number ignore it .. like fd0 */
-+            if (++disk_counter > 7) /* 7 disks is all we have room for */
-+               continue;
-+            else {
-+               new.disk_r[disk_counter-1] = a;
-+               new.disk_w[disk_counter-1] = g;
-+            }
-+         }
-+      }
-+   }
- 
- /**** /proc/stat ****/
- 
-@@ -249,6 +299,9 @@
- 	    new.cpu_nice = VAL;
- 	    new.cpu_sys = VAL;
- 	    new.cpu_idle = VAL;
-+	    new.cpu_iowait = VAL;
-+	    new.cpu_hirq = VAL;
-+	    new.cpu_sirq = VAL;
- 	    /*
- 	     * according to bug #1959, sometimes the cpu_idle
- 	     * seems to go backwards(!) on SMP boxes.  This may
-@@ -262,34 +315,54 @@
- 	    new.disk[1] = VAL;
- 	    new.disk[2] = VAL;
- 	    new.disk[3] = VAL;
-+	    new.disk[4] = VAL;
-+	    new.disk[5] = VAL;
-+	    new.disk[6] = VAL;
- 	} else if (ISSTR ("disk_rio") && io_or_blk == 0) {
- 	    new.disk_r[0] = VAL;
- 	    new.disk_r[1] = VAL;
- 	    new.disk_r[2] = VAL;
- 	    new.disk_r[3] = VAL;
-+	    new.disk_r[4] = VAL;
-+	    new.disk_r[5] = VAL;
-+	    new.disk_r[6] = VAL;
-+	} else if (ISSTR ("disk_wio") && io_or_blk == 0) {
-+	    new.disk_w[0] = VAL;
-+	} else if (ISSTR ("disk_wio") && io_or_blk == 0) {
-+	    new.disk_w[0] = VAL;
-+	} else if (ISSTR ("disk_wio") && io_or_blk == 0) {
-+	    new.disk_w[0] = VAL;
- 	} else if (ISSTR ("disk_wio") && io_or_blk == 0) {
- 	    new.disk_w[0] = VAL;
- 	    new.disk_w[1] = VAL;
- 	    new.disk_w[2] = VAL;
- 	    new.disk_w[3] = VAL;
-+	    new.disk_w[4] = VAL;
-+	    new.disk_w[5] = VAL;
-+	    new.disk_w[6] = VAL;
- 	} else if (ISSTR ("disk_rblk") && io_or_blk == 1) {
- 	    new.disk_r[0] = VAL;
- 	    new.disk_r[1] = VAL;
- 	    new.disk_r[2] = VAL;
- 	    new.disk_r[3] = VAL;
-+	    new.disk_r[4] = VAL;
-+	    new.disk_r[5] = VAL;
-+	    new.disk_r[6] = VAL;
- 	} else if (ISSTR ("disk_wblk") && io_or_blk == 1) {
- 	    new.disk_w[0] = VAL;
- 	    new.disk_w[1] = VAL;
- 	    new.disk_w[2] = VAL;
- 	    new.disk_w[3] = VAL;
-+	    new.disk_w[4] = VAL;
-+	    new.disk_w[5] = VAL;
-+	    new.disk_w[6] = VAL;
- 	} else if (ISSTR ("disk_io:")) {
-	    int disk_counter = 0, ret;
- 	    unsigned int q, w, e, r, t, y, u; /* I'm NOT in the mood today. */
- 	    char *barf;
- 
- 	    while ((barf = strtok (NULL, " "))) {
- 
-		if (++disk_counter > 4) /* 4 is all we have room for */
-+		if (++disk_counter > 7) /* 7 is all we have room for */
- 		    continue;
- 
- 		ret = sscanf (barf, "(%d,%d):(%d,%d,%d,%d,%d)",
-@@ -374,7 +447,10 @@
- 
-     printf ("system: %s %s",
- 	    hms (bDIFF (cpu_sys)), perc (bDIFF (cpu_sys), elapsed, nr_cpus));
-    printf ("  swap in :%9lu", bDIFF (swin));
-+    if (havetwosix)
-+        printf ("  page act:%9lu", bDIFF (pgac));
-+    else
-+        printf ("  swap in :%9lu", bDIFF (swin));
-     if (new.disk_r[2])
- 	printf ("  disk 3: %8lur%8luw\n", bDIFF (disk_r[2]),
- 		bDIFF (disk_w[2]));
-@@ -383,14 +459,53 @@
-     else
- 	putchar ('\n');
- 
-+    if (havetwosix) {
-+        printf ("IOwait: %s %s",
-+            hms (bDIFF (cpu_iowait)), perc (bDIFF (cpu_iowait), elapsed, nr_cpus));
-+        printf ("  page dea:%9lu", bDIFF (pgdeac));
-+        if (new.disk_r[3])
-+	    printf ("  disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
-+		bDIFF (disk_w[3]));
-+        else if (new.disk[3])
-+	    printf ("  disk 4: %8lu\n", bDIFF (disk[3]));
-+        else
-+	    putchar ('\n');
-+
-+        printf ("hw irq: %s %s",
-+            hms (bDIFF (cpu_hirq)), perc (bDIFF (cpu_hirq), elapsed, nr_cpus));
-+        printf ("  page flt:%9lu", bDIFF (pgfault));
-+        if (new.disk_r[4])
-+	    printf ("  disk 5: %8lur%8luw\n", bDIFF (disk_r[4]),
-+		bDIFF (disk_w[4]));
-+        else if (new.disk[4])
-+	    printf ("  disk 5: %8lu\n", bDIFF (disk[4]));
-+        else
-+	    putchar ('\n');
-+
-+        printf ("sw irq: %s %s",
-+            hms (bDIFF (cpu_sirq)), perc (bDIFF (cpu_sirq), elapsed, nr_cpus));
-+        printf ("  swap in :%9lu", bDIFF (swin));
-+        if (new.disk_r[5])
-+	    printf ("  disk 6: %8lur%8luw\n", bDIFF (disk_r[5]),
-+		bDIFF (disk_w[5]));
-+        else if (new.disk[5])
-+	    printf ("  disk 6: %8lu\n", bDIFF (disk[5]));
-+        else
-+	    putchar ('\n');
-+    }
-+
-     printf ("idle  : %s %s",
- 	    hms (bDIFF (cpu_idle)), perc (bDIFF (cpu_idle), elapsed, nr_cpus));
-     printf ("  swap out:%9lu", bDIFF (swout));
-    if (new.disk_r[3])
-	printf ("  disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
-		bDIFF (disk_w[3]));
-    else if (new.disk[3])
-	printf ("  disk 4: %8lu\n", bDIFF (disk[3]));
-+    if (havetwosix)
-+        lastdisk = 3;
-+    else
-+        lastdisk = 6;
-+    if (new.disk_r[lastdisk])
-+	printf ("  disk %d: %8lur%8luw\n", lastdisk+1, bDIFF (disk_r[lastdisk]),
-+		bDIFF (disk_w[lastdisk]));
-+    else if (new.disk[lastdisk])
-+	printf ("  disk %d: %8lu\n", lastdisk+1, bDIFF (disk[lastdisk]));
-     else
- 	putchar ('\n');
- 
-@@ -786,6 +901,8 @@
-     meminfofp = myfopen (PROC_DIR "meminfo");
-     statfp = myfopen (PROC_DIR "stat");
-     /* These may be missing, so check for NULL later. */
-+    diskstatsfp = fopen (PROC_DIR "diskstats", "r");
-+    vmstatfp = fopen (PROC_DIR "vmstat", "r");
-     modulesfp = fopen (PROC_DIR "modules", "r");
-     devicesfp = fopen (PROC_DIR "devices", "r");
-     filesystemsfp = fopen (PROC_DIR "filesystems", "r");
-@@ -990,6 +1107,9 @@
- 			new.disk_r[1] = new.disk_w[1] =
- 			new.disk_r[2] = new.disk_w[2] =
- 			new.disk_r[3] = new.disk_w[3] = 0;
-+			new.disk_r[4] = new.disk_w[4] = 0;
-+			new.disk_r[5] = new.disk_w[5] = 0;
-+			new.disk_r[6] = new.disk_w[6] = 0;
- 		    redrawn = 1;
- 		    message = io_or_blk ? "showing I/O in blocks" :
- 			"showing I/O per requests";
-diff -ruN procinfo-18/procinfo.h procinfo-19/procinfo.h
--- procinfo-18/procinfo.h	2001-02-24 23:30:45.000000000 +0000
-+++ procinfo-19/procinfo.h	2004-06-17 09:24:16.511726412 +0100
-@@ -81,11 +81,11 @@
-     unsigned long uptime;
-     long m_to, m_us, m_fr, m_sh, m_bu, m_ca;
-     long s_to, s_us, s_fr;
-    unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle;
-    unsigned long disk[5];
-    unsigned long disk_r[5];
-    unsigned long disk_w[5];
-    unsigned long pgin, pgout, swin, swout;
-+    unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle, cpu_iowait, cpu_hirq, cpu_sirq;
-+    unsigned long disk[8];
-+    unsigned long disk_r[8];
-+    unsigned long disk_w[8];
-+    unsigned long pgin, pgout, pgac, pgdeac, pgfault, swin, swout;
-     unsigned long *intr;	/* Phew. That's better. */
-     unsigned long old_intr;
-     unsigned long ctxt;
-diff -ruN procinfo-18/routines.c procinfo-19/routines.c
--- procinfo-18/routines.c	2001-02-24 23:30:45.000000000 +0000
-+++ procinfo-19/routines.c	2004-06-16 16:36:51.000000000 +0100
-@@ -388,9 +388,13 @@
- hms (unsigned long t)
- {
-     unsigned int d, h, m, s;
-+    unsigned long q;
-     static char buf[22];
- 
-    t = t * 100 / HZ;
-+    q = 100 / HZ; /* We need this because the libc does something funny here */
-+                  /* if we try to use: t = t * 100 / HZ; here! */
-+                  /* procinfo@meisel.cc 11. Feb. 2004 */
-+    t = t * q;
-     d = (int) (t / 8640000);
-     t = t - (long) (d * 8640000);
-     h = (int) (t / 360000);
--- a/app-admin/procinfo/files/procinfo-18-stat.patch
+++ b/app-admin/procinfo/files/procinfo-18-stat.patch
@ -1,21 +0,0 @@
-diff -ur procinfo-18/procinfo.c procinfo-18-mod/procinfo.c
--- procinfo-18/procinfo.c	2001-02-25 11:29:16.000000000 +0000
-+++ procinfo-18-mod/procinfo.c	2008-04-16 10:16:29.000000000 +0100
-@@ -76,7 +76,7 @@
-     *devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
-     *versionfp, *cpuinfofp;
- 
-char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
-+char line[4096], cmdline[1024], booted[40], *version = NULL, *message = NULL;
- 
- float rate = 1.0;		/* per interval or per sec */
- 
-@@ -446,7 +446,7 @@
- 		    */
- 		    char *q;
- 
-		    if ((q = strstr (p, "PIC"))) {
-+		    if ((q = strstr (p, "PIC")) || (q = strstr (p, "MSI"))) {
- 			while (*q != ' ')	/* eat up "PIC" or "PIC-foo" */
- 			    q++;
- 			while (*q == ' ')	/* eat up spaces */
--- a/app-admin/procinfo/files/procinfo-flags.patch
+++ b/app-admin/procinfo/files/procinfo-flags.patch
@ -1,16 +0,0 @@
--- procinfo-18/Makefile.orig	2001-02-25 00:29:53.000000000 +0100
-+++ procinfo-18/Makefile	2006-10-21 13:57:47.000000000 +0200
-@@ -2,10 +2,10 @@
- 
- prefix=/usr
- 
-CC = gcc -Wall -Wstrict-prototypes
-+CC += 
- 
-CFLAGS = -O2
-LDFLAGS = -s
-+CFLAGS += -Wall -Wstrict-prototypes
-+LDFLAGS +=
- 
- # If you get lots of `undefined references', you probably need -lncurses
- # instead:
--- a/app-admin/procinfo/metadata.xml
+++ b/app-admin/procinfo/metadata.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
--- a/app-admin/procinfo/procinfo-18-r2.ebuild
+++ b/app-admin/procinfo/procinfo-18-r2.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Displays some kernel stats and info on a running Linux system"
-HOMEPAGE="http://www.kozmix.org/src/"
-SRC_URI="http://www.kozmix.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/kernel-2.6.patch
-	epatch "${FILESDIR}"/cpu-usage-fix.patch
-	epatch "${FILESDIR}"/${PN}-flags.patch
-	epatch "${FILESDIR}"/${P}-stat.patch
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
-	dobin procinfo
-	newbin lsdev.pl lsdev
-	newbin socklist.pl socklist
-
-	doman *.8
-	dodoc README CHANGES
-}
--- a/app-admin/salt/salt-2016.11.8-r1.ebuild
+++ b/app-admin/salt/salt-2016.11.8-r1.ebuild
@ -105,6 +105,9 @@ python_prepare() {

 	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
 	rm tests/unit/cloud/clouds/gce_test.py || die
+
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
 }

 python_install_all() {
--- a/app-admin/salt/salt-2016.11.9-r1.ebuild
+++ b/app-admin/salt/salt-2016.11.9-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
@ -105,6 +105,9 @@ python_prepare() {

 	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
 	rm tests/unit/cloud/clouds/gce_test.py || die
+
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
 }

 python_install_all() {
--- a/app-admin/salt/salt-2017.7.2-r2.ebuild
+++ b/app-admin/salt/salt-2017.7.2-r2.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
@ -95,6 +95,8 @@ python_prepare() {
 	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
 	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
 	rm tests/unit/states/test_boto_vpc.py || die
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
 }

 python_install_all() {
--- a/app-admin/salt/salt-2017.7.2.ebuild
+++ b/app-admin/salt/salt-2017.7.2.ebuild
@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="http://saltstack.org/"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
-IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
-
-RDEPEND="sys-apps/pciutils
-	dev-python/jinja[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
-	virtual/python-futures[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
-	openssl? (
-		dev-libs/openssl:*[-bindist]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	zeromq? (
-		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
-	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
-	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest-salt[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/timelib[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		${RDEPEND}
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )"
-RESTRICT="x86? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
-)
-
-python_prepare() {
-	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
-	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-
-	(
-		cleanup() {
-			rm -f "${tempdir}"
-			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
-		}
-
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
-
-		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose
-
-	) || die "testing failed"
-}
--- a/app-admin/salt/salt-2017.7.4-r1.ebuild
+++ b/app-admin/salt/salt-2017.7.4-r1.ebuild
@ -97,6 +97,8 @@ python_prepare() {
 	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
 	rm tests/unit/states/test_boto_vpc.py || die
 	rm tests/unit/modules/test_kubernetes.py || die
+	# allow the use of the renamed msgpack
+	sed -i '/^msgpack/d' requirements/base.txt || die
 }

 python_install_all() {
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ b/app-admin/stow/stow-2.2.2-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
@ -11,11 +11,12 @@ SRC_URI="mirror://gnu/stow/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="test"

 DEPEND="dev-lang/perl
 	test? (
+		dev-perl/IO-stringy
 		virtual/perl-Test-Harness
 		dev-perl/Test-Output
 	)"
--- a/app-admin/supernova/Manifest
+++ b/app-admin/supernova/Manifest
@ -1,3 +1 @@
-DIST supernova-2.0.9.tar.gz 22877 BLAKE2B 02bb230c8392946bf43faedb19d8b5660a144f07b9ee4c3638f3211dcd25d2336c6a032a9c0b1006cc01ab61ea9d8e3769704ba034b676f0b115b32b39855b20 SHA512 8270f871efcf7c8741078e4658dd8413796a14bd9eb43514beb8b120462db757a5324c5c3c9e4988d8725ec9b903e7743c6ae336dd5f73536e1e0df456ba54a9
-DIST supernova-2.1.0.tar.gz 23196 BLAKE2B 70d41d42c8504075657aa869c666d6e8ec079c62535276a12e49687a139eec54d068ced7ee1f2bc18c8da708ec50edb11e2bdcdf324a36b9c309c3e134887e6d SHA512 fa4f6b3f0a3b5a19c309b507ce8c356a929c8a8cf805c45d58a8f4c1bc36f508a0d04477570cf79e7660e94d803df8a02e67206465e75eb3452e43cb6ca186aa
 DIST supernova-2.2.0.tar.gz 24068 BLAKE2B 129c077baf9b415851f3c17eb5a9870ff2d8109a54c424d9039204620b6dd68d8f17183b5c52d863882bd2586ed03b7d1c397f70f337bfba9e9c8255b6feb578 SHA512 436ec13dfaf5ff7cadacc1dedc3545a579784cfce3b0c7925cc0d877ba76a4c865ad3687ae8ae22fdb11d880282dd555f9a9d709c005ad024299a34607fd8063
--- a/app-admin/supernova/metadata.xml
+++ b/app-admin/supernova/metadata.xml
@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-    <email>alunduil@gentoo.org</email>
-    <name>Alex Brandt</name>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>openstack@gentoo.org</email>
+    <name>Openstack</name>
  </maintainer>
  <upstream>
    <remote-id type="github">rackerhacker/supernova</remote-id>
--- a/app-admin/supernova/supernova-2.0.9.ebuild
+++ b/app-admin/supernova/supernova-2.0.9.ebuild
@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="novaclient wrapper for multiple nova environments"
-HOMEPAGE="https://github.com/rackerhacker/supernova"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	${CDEPEND}
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/keyring-0.9.2[${PYTHON_USEDEP}]
-	dev-python/python-novaclient[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	if use doc; then
-		mkdocs build || die "docs failed to build"
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}"/lib || die
-	py.test || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( site/. )
-	use examples && local EXAMPLES=( example_configs/. )
-
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/${PN}-completion.bash ${PN}
-}
--- a/app-admin/supernova/supernova-2.1.0.ebuild
+++ b/app-admin/supernova/supernova-2.1.0.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="novaclient wrapper for multiple nova environments"
-HOMEPAGE="https://github.com/rackerhacker/supernova"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	${CDEPEND}
-	doc? ( >=dev-python/mkdocs-0.14.0[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	${CDEPEND}
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/keyring-0.9.2[${PYTHON_USEDEP}]
-	dev-python/python-novaclient[${PYTHON_USEDEP}]
-	dev-python/rackspace-novaclient[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_compile_all() {
-	if use doc; then
-		mkdocs build || die "docs failed to build"
-	fi
-}
-
-python_test() {
-	py.test || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( site/. )
-	use examples && local EXAMPLES=( example_configs/. )
-
-	distutils-r1_python_install_all
-
-	newbashcomp contrib/${PN}-completion.bash ${PN}
-}
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@ -1,3 +1,2 @@
-DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B abe273c561569047ef4ea0b21b08341d207ecc9a37ba88d1aa28f00de8a0c28cab2942b3d461b7b4fea940668b44ceda7f9c71b6f7c7583143f4bf65adb54036 SHA512 00370f8b090156c064d9fe932e2aafe3f78ffc01bc47b2bc2f0f3c6cbdf98ea8cc2084317b8c2b1a9755cce404646b20e131039ce55b87e24f4401a55b95ff7e
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
-DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
+DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
--- a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo
@ -1,4 +1,4 @@
-@version: 3.12
+@version: 3.14
 #
 # Syslog-ng default configuration file for Gentoo Linux

--- a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.fbsd
@ -1,4 +1,4 @@
-@version: 3.12
+@version: 3.14
 #
 # Syslog-ng default configuration file for Gentoo FreeBSD
 #
--- a/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.conf.gentoo.hardened
@ -1,5 +1,5 @@
-@version: 3.12
-# Copyright 1999-2017 Gentoo Foundation
+@version: 3.14
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 # https://bugs.gentoo.org/426814
@ -16,9 +16,10 @@ options {
 };

 source src {
-    unix-dgram("/dev/log");
+    system();
    internal();
 };
+
 source kernsrc {
    file("/proc/kmsg");
 };
--- a/app-admin/syslog-ng/files/3.14/syslog-ng.confd
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.confd
@ -29,6 +29,7 @@
 # For very customized setups these variables can be adjusted as needed
 # but for most situations they should remain commented:
 # SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
+# SYSLOG_NG_CONTROLFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.ctl
 # SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
 # SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
 # SYSLOG_NG_PIDFILE_DIR=/run
--- a/app-admin/syslog-ng/files/3.14/syslog-ng.rc
+++ b/app-admin/syslog-ng/files/3.14/syslog-ng.rc
@ -1,22 +1,23 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

-SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
-SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
-SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
-SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
-SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+: ${SYSLOG_NG_CONFIGFILE:=/etc/syslog-ng/${RC_SVCNAME}.conf}
+: ${SYSLOG_NG_STATEFILE_DIR:=/var/lib/${RC_SVCNAME}}
+: ${SYSLOG_NG_STATEFILE:=${SYSLOG_NG_STATEFILE_DIR}/${RC_SVCNAME}.persist}
+: ${SYSLOG_NG_PIDFILE_DIR:=/run}
+: ${SYSLOG_NG_PIDFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
+: ${SYSLOG_NG_CONTROLFILE:=${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.ctl}

-SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
-SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
+: ${SYSLOG_NG_GROUP:=root}
+: ${SYSLOG_NG_USER:=root}

 command="/usr/sbin/syslog-ng"
-command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+command_args="--cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --control \"${SYSLOG_NG_CONTROLFILE}\" --persist-file \"${SYSLOG_NG_STATEFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
+command_user="${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}"
 extra_commands="checkconfig"
 extra_started_commands="reload"
 pidfile="${SYSLOG_NG_PIDFILE}"
-start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
 description="Syslog-ng is a syslog replacement with advanced filtering features."
 description_checkconfig="Check the configuration file that will be used by \"start\""
 description_reload="Reload the configuration without exiting"
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo
@ -1,36 +0,0 @@
-@version: 3.7
-#
-# Syslog-ng default configuration file for Gentoo Linux
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-options { 
-	threaded(yes);
-	chain_hostnames(no); 
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-	# The default action of syslog-ng is to log a MARK line
-	# to the file every 20 minutes.  That's seems high for most
-	# people so turn it down to once an hour.  Set it to zero
-	# if you don't want the functionality at all.
-	mark_freq(3600); 
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-# By default messages are logged to tty12...
-destination console_all { file("/dev/tty12"); };
-# ...if you intend to use /dev/console for programs like xconsole
-# you can comment out the destination line above that references /dev/tty12
-# and uncomment the line below.
-#destination console_all { file("/dev/console"); };
-
-log { source(src); destination(messages); };
-log { source(src); destination(console_all); };
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.fbsd
@ -1,24 +0,0 @@
-@version: 3.7
-#
-# Syslog-ng default configuration file for Gentoo FreeBSD
-#
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-
-	# The default action of syslog-ng is to log a STATS line
-	# to the file every 10 minutes.  That's pretty ugly after a while.
-	# Change it to every 12 hours so you get a nice daily update of
-	# how many messages syslog-ng missed (0).
-	stats_freq(43200); 
-};
-
-source src { system(); internal(); };
-
-destination messages { file("/var/log/messages"); };
-
-log { source(src); destination(messages); };
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.conf.gentoo.hardened
@ -1,114 +0,0 @@
-@version: 3.7
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# https://bugs.gentoo.org/show_bug.cgi?id=426814
-@include "scl.conf"
-
-#
-# Syslog-ng configuration file, compatible with default hardened installations.
-#
-
-options {
-	threaded(yes);
-	chain_hostnames(no);
-	stats_freq(43200);
-};
-
-source src {
-    unix-dgram("/dev/log");
-    internal();
-};
-source kernsrc {
-    file("/proc/kmsg");
-};
-
-#source net { udp(); };
-#log { source(net); destination(net_logs); };
-#destination net_logs { file("/var/log/HOSTS/$HOST/$YEAR$MONTH$DAY.log"); };
-
-destination authlog { file("/var/log/auth.log"); };
-destination _syslog { file("/var/log/syslog"); };
-destination cron { file("/var/log/cron.log"); };
-destination daemon { file("/var/log/daemon.log"); };
-destination kern { file("/var/log/kern.log"); file("/dev/tty12"); };
-destination lpr { file("/var/log/lpr.log"); };
-destination user { file("/var/log/user.log"); };
-destination uucp { file("/var/log/uucp.log"); };
-#destination ppp { file("/var/log/ppp.log"); };
-destination mail { file("/var/log/mail.log"); };
-
-destination avc { file("/var/log/avc.log"); };
-destination audit { file("/var/log/audit.log"); };
-destination pax { file("/var/log/pax.log"); };
-destination grsec { file("/var/log/grsec.log"); };
-
-destination mailinfo { file("/var/log/mail.info"); };
-destination mailwarn { file("/var/log/mail.warn"); };
-destination mailerr { file("/var/log/mail.err"); };
-
-destination newscrit { file("/var/log/news/news.crit"); };
-destination newserr { file("/var/log/news/news.err"); };
-destination newsnotice { file("/var/log/news/news.notice"); };
-
-destination debug { file("/var/log/debug"); };
-destination messages { file("/var/log/messages"); };
-destination console { usertty("root"); };
-destination console_all { file("/dev/tty12"); };
-#destination loghost { udp("loghost" port(999)); };
-
-destination xconsole { pipe("/dev/xconsole"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { not facility(authpriv, mail); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kern { facility(kern); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-#filter f_ppp { facility(ppp); };
-filter f_news { facility(news); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn)
-	and not facility(auth, authpriv, mail, news); };
-filter f_emergency { level(emerg); };
-
-filter f_info { level(info); };
-
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-
-filter f_avc { message(".*avc: .*"); };
-filter f_audit { message("^(\\[.*\..*\] |)audit.*") and not message(".*avc: .*"); };
-filter f_pax { message("^(\\[.*\..*\] |)PAX:.*"); };
-filter f_grsec { message("^(\\[.*\..*\] |)grsec:.*"); };
-
-log { source(src); filter(f_authpriv); destination(authlog); };
-log { source(src); filter(f_syslog); destination(_syslog); };
-log { source(src); filter(f_cron); destination(cron); };
-log { source(src); filter(f_daemon); destination(daemon); };
-log { source(kernsrc); filter(f_kern); destination(kern); };
-log { source(src); filter(f_lpr); destination(lpr); };
-log { source(src); filter(f_mail); destination(mail); };
-log { source(src); filter(f_user); destination(user); };
-log { source(src); filter(f_uucp); destination(uucp); };
-log { source(kernsrc); filter(f_pax); destination(pax); };
-log { source(kernsrc); filter(f_grsec); destination(grsec); };
-log { source(kernsrc); filter(f_audit); destination(audit); };
-log { source(kernsrc); filter(f_avc); destination(avc); };
-log { source(src); filter(f_mail); filter(f_info); destination(mailinfo); };
-log { source(src); filter(f_mail); filter(f_warn); destination(mailwarn); };
-log { source(src); filter(f_mail); filter(f_err); destination(mailerr); };
-log { source(src); filter(f_news); filter(f_crit); destination(newscrit); };
-log { source(src); filter(f_news); filter(f_err); destination(newserr); };
-log { source(src); filter(f_news); filter(f_notice); destination(newsnotice); };
-log { source(src); filter(f_debug); destination(debug); };
-log { source(src); filter(f_messages); destination(messages); };
-log { source(src); filter(f_emergency); destination(console); };
-#log { source(src); filter(f_ppp); destination(ppp); };
-log { source(src); destination(console_all); };
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.confd
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.confd
@ -1,42 +0,0 @@
-# Config file for /etc/init.d/syslog-ng
-
-# If you are not using network logging, this entire section should be
-# commented out. Otherwise, choose one of the settings below based on
-# how you are configuring your network.
-#
-# If you are using the net.* scripts to configure your network, you should
-# set rc_need to match the interface through which your logging server
-# can be reached.
-#rc_need="net.eth0"
-#
-# If you are using an interface manager like wicd, dhcpcd in standalone
-# mode, networkmanager, etc to control your interfaces, set rc_need to
-# the name of that service.
-# rc_need="dhcpcd"
-#rc_need="networkmanager"
-#
-# If you are using newnet and configuring your interface statically with
-# the network script, you should use this setting.
-#rc_need="network"
-#
-# You can use this setting, but I do not recommend relying on it.
-#rc_need="net"
-#
-# You may also want to uncomment the following if you are using network
-# logging.
-#rc_use="stunnel"
-
-# For very customized setups these variables can be adjusted as needed
-# but for most situations they should remain commented:
-# SYSLOG_NG_CONFIGFILE=/etc/syslog-ng/syslog-ng.conf
-# SYSLOG_NG_STATEFILE_DIR=/var/lib/syslog-ng
-# SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist
-# SYSLOG_NG_PIDFILE_DIR=/run
-# SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE_DIR}/syslog-ng.pid
-# SYSLOG_NG_GROUP=root
-# SYSLOG_NG_USER=root
-
-# Put any additional options for syslog-ng here.
-# See syslog-ng(8) for more information.
-
-SYSLOG_NG_OPTS=""
--- a/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
+++ b/app-admin/syslog-ng/files/3.7/syslog-ng.rc6
@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf}
-SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng}
-SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist}
-SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/run}
-SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid}
-
-SYSLOG_NG_GROUP=${SYSLOG_NG_GROUP:-root}
-SYSLOG_NG_USER=${SYSLOG_NG_USER:-root}
-
-command="/usr/sbin/syslog-ng"
-command_args="--persist-file \"${SYSLOG_NG_STATEFILE}\" --cfgfile \"${SYSLOG_NG_CONFIGFILE}\" --pidfile \"${SYSLOG_NG_PIDFILE}\" ${SYSLOG_NG_OPTS}"
-extra_commands="checkconfig"
-extra_started_commands="reload"
-pidfile="${SYSLOG_NG_PIDFILE}"
-start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\""
-description="Syslog-ng is a syslog replacement with advanced filtering features."
-description_checkconfig="Check the configuration file that will be used by \"start\""
-description_reload="Reload the configuration without exiting"
-required_files="${SYSLOG_NG_CONFIGFILE}"
-required_dirs="${SYSLOG_NG_PIDFILE_DIR}"
-
-depend() {
-	use clock
-	need hostname localmount
-	after bootmisc
-	provide logger
-}
-
-checkconfig() {
-	ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})"
-	syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}"
-	eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})"
-}
-
-start_pre() {
-	checkconfig || return 1
-	checkpath \
-		-d \
-		--mode 0700 \
-		--owner "${SYSLOG_NG_USER}:${SYSLOG_NG_GROUP}" \
-		"${SYSLOG_NG_STATEFILE_DIR}"
-}
-
-stop_pre() {
-	[ "$RC_CMD" = restart ] && sleep 1
-	return 0
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration and re-opening log files"
-	start-stop-daemon --signal HUP --pidfile "${pidfile}"
-	eend $?
-}
--- a/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
+++ b/app-admin/syslog-ng/files/patches/syslog-ng-3.14.1-fix-tls-client.patch
@ -0,0 +1,173 @@
+From a4f7b9dc75c2b678466cc104d8ca111bd90fba11 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
+Date: Wed, 7 Mar 2018 18:35:09 +0100
+Subject: [PATCH 1/3] tls: fix tls_context_load_key_and_cert()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+key_file and cert_file are optional (the client cert is not mandatory).
+
+Signed-off-by: László Várady <laszlo.varady@balabit.com>
+---
+ lib/tlscontext.c                         | 9 +++++++++
+ modules/afsocket/transport-mapper-inet.c | 6 +++---
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/lib/tlscontext.c b/lib/tlscontext.c
+index 510ac2738d..b202c397f3 100644
+--- a/lib/tlscontext.c
+++ b/lib/tlscontext.c
+@@ -599,9 +599,18 @@ _are_key_and_cert_files_accessible(TLSContext *self)
+          file_exists(self->cert_file);
+ }
+ 
+static gboolean
+_client_key_and_cert_files_are_not_specified(TLSContext *self)
+{
+  return self->mode == TM_CLIENT && (!self->key_file && !self->cert_file);
+}
+
+ static TLSContextLoadResult
+ tls_context_load_key_and_cert(TLSContext *self)
+ {
+  if (_client_key_and_cert_files_are_not_specified(self))
+    return TLS_CONTEXT_OK;
+
+   if (!_are_key_and_cert_files_accessible(self))
+     return TLS_CONTEXT_FILE_ACCES_ERROR;
+   if (!SSL_CTX_use_PrivateKey_file(self->ssl_ctx, self->key_file, SSL_FILETYPE_PEM))
+diff --git a/modules/afsocket/transport-mapper-inet.c b/modules/afsocket/transport-mapper-inet.c
+index 80c0d21801..1afb34b33f 100644
+--- a/modules/afsocket/transport-mapper-inet.c
+++ b/modules/afsocket/transport-mapper-inet.c
+@@ -176,17 +176,17 @@ transport_mapper_inet_async_init(TransportMapper *s, TransportMapperAsyncInitCB
+ 
+   TLSContextSetupResult tls_ctx_setup_res = tls_context_setup_context(self->tls_context);
+ 
+  const gchar *key = tls_context_get_key_file(self->tls_context);
+
+   if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_OK)
+     {
+-      const gchar *key = tls_context_get_key_file(self->tls_context);
+-      if (secret_storage_contains_key(key))
+      if (key && secret_storage_contains_key(key))
+         secret_storage_update_status(key, SECRET_STORAGE_SUCCESS);
+       return func(func_args);
+     }
+ 
+   if (tls_ctx_setup_res == TLS_CONTEXT_SETUP_BAD_PASSWORD)
+     {
+-      const gchar *key = tls_context_get_key_file(self->tls_context);
+       msg_error("Error setting up TLS context",
+                 evt_tag_str("keyfile", key));
+       call_finalize_init_args *args = g_new0(call_finalize_init_args, 1);
+
+From 9e3eae23330442c9e58ae5ccc732457f2d0e694e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
+Date: Wed, 7 Mar 2018 19:39:24 +0100
+Subject: [PATCH 2/3] tlscontext: fix error logging of cert_file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+file_exists() has a side effect: it logs when the file can't be opened.
+
+Since the && operator is evaluated lazily, the error messages of cert_file
+were not displayed when the first invocation of file_exists failed
+(on key_file).
+
+Signed-off-by: László Várady <laszlo.varady@balabit.com>
+---
+ lib/tlscontext.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lib/tlscontext.c b/lib/tlscontext.c
+index b202c397f3..5a503387c4 100644
+--- a/lib/tlscontext.c
+++ b/lib/tlscontext.c
+@@ -595,8 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
+ static gboolean
+ _are_key_and_cert_files_accessible(TLSContext *self)
+ {
+-  return file_exists(self->key_file) &&
+-         file_exists(self->cert_file);
+  gboolean key_file_exists = file_exists(self->key_file);
+  gboolean cert_file_exists = file_exists(self->cert_file);
+
+  return key_file_exists && cert_file_exists;
+ }
+ 
+ static gboolean
+
+From 3eef78b6ac8016d3eb33b36bd98419d5b086767f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= <laszlo.varady@balabit.com>
+Date: Wed, 7 Mar 2018 19:43:41 +0100
+Subject: [PATCH 3/3] tlscontext: rename file_exists() to is_file_accessible()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: László Várady <laszlo.varady@balabit.com>
+---
+ lib/tlscontext.c | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/lib/tlscontext.c b/lib/tlscontext.c
+index 5a503387c4..73015d2462 100644
+--- a/lib/tlscontext.c
+++ b/lib/tlscontext.c
+@@ -322,7 +322,7 @@ tls_session_free(TLSSession *self)
+ }
+ 
+ static gboolean
+-file_exists(const gchar *fname)
+_is_file_accessible(const gchar *fname)
+ {
+   if (!fname)
+     return FALSE;
+@@ -444,7 +444,7 @@ _is_dh_valid(DH *dh)
+ static DH *
+ _load_dh_from_file(const gchar *dhparam_file)
+ {
+-  if (!file_exists(dhparam_file))
+  if (!_is_file_accessible(dhparam_file))
+     return NULL;
+ 
+   BIO *bio = BIO_new_file(dhparam_file, "r");
+@@ -528,7 +528,7 @@ tls_context_setup_dh(TLSContext *self)
+ static PKCS12 *
+ _load_pkcs12_file(const gchar *pkcs12_file)
+ {
+-  if (!file_exists(pkcs12_file))
+  if (!_is_file_accessible(pkcs12_file))
+     return NULL;
+ 
+   FILE *p12_file = fopen(pkcs12_file, "rb");
+@@ -595,10 +595,10 @@ tls_context_load_pkcs12(TLSContext *self)
+ static gboolean
+ _are_key_and_cert_files_accessible(TLSContext *self)
+ {
+-  gboolean key_file_exists = file_exists(self->key_file);
+-  gboolean cert_file_exists = file_exists(self->cert_file);
+  gboolean key_file_accessible = _is_file_accessible(self->key_file);
+  gboolean cert_file_accessible = _is_file_accessible(self->cert_file);
+ 
+-  return key_file_exists && cert_file_exists;
+  return key_file_accessible && cert_file_accessible;
+ }
+ 
+ static gboolean
+@@ -650,10 +650,10 @@ tls_context_setup_context(TLSContext *self)
+         goto error;
+     }
+ 
+-  if (file_exists(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
+  if (_is_file_accessible(self->ca_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->ca_dir))
+     goto error;
+ 
+-  if (file_exists(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
+  if (_is_file_accessible(self->crl_dir) && !SSL_CTX_load_verify_locations(self->ssl_ctx, NULL, self->crl_dir))
+     goto error;
+ 
+   if (self->crl_dir)
--- a/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.14.1.ebuild
@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )

 inherit autotools python-single-r1 eutils multilib systemd versionator

 MY_PV=${PV/_/}
 MY_PV_MM=$(get_version_component_range 1-2)
 DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
 SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"

 LICENSE="GPL-2+ LGPL-2.1+"
@ -44,9 +44,13 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"

 PATCHES=(
-	"${FILESDIR}"/patches/${PN}-3.12.1-json-c-0.13+.patch
+	"${FILESDIR}/patches/${PN}-3.14.1-fix-tls-client.patch"
 )

+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+	contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened"
+	"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
 S=${WORKDIR}/${PN}-${MY_PV}

 pkg_setup() {
@ -61,8 +65,15 @@ src_prepare() {
 	# remove bundled libs
 	rm -rv lib/ivykis modules/afmongodb/mongo-c-driver modules/afamqp/rabbitmq-c || die

-	if use !json ; then
-		sed -i -e '/cim/d' scl/Makefile.am || die
+	# drop scl modules requiring json
+	if use !json; then
+		sed -i -r '/cim|ewmm|graylog2/d' scl/Makefile.am || die
+	fi
+
+	# use gentoo default path
+	if use systemd; then
+		sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+			-i contrib/systemd/syslog-ng@default || die
 	fi

 	for f in "${FILESDIR}"/*logrotate*.in ; do
@ -70,7 +81,7 @@ src_prepare() {

 		sed \
 			-e "$(usex systemd \
-				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
+				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng@default/' \
 				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
 			"${f}" > "${T}/${bn/.in/}" || die
 	done
@ -114,13 +125,12 @@ src_configure() {
 }

 src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
-		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
-		"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
+	default

 	# Install default configuration
+	insinto /etc/default
+	doins contrib/systemd/syslog-ng@default
+
 	insinto /etc/syslog-ng
 	if use userland_BSD ; then
 		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
@ -140,9 +150,6 @@ src_install() {
 }

 pkg_postinst() {
-	elog "For detailed documentation please see the upstream website:"
-	elog "https://www.balabit.com/sites/default/files/documents/syslog-ng-ose-${MY_PV_MM}-guides/en/syslog-ng-ose-v${MY_PV_MM}-guide-admin/html/index.html"
-
 	# bug #355257
 	if ! has_version app-admin/logrotate ; then
 		echo
@ -151,4 +158,12 @@ pkg_postinst() {
 		elog "for logrotate to use."
 		echo
 	fi
+
+	if use systemd; then
+		echo
+		ewarn "The service file for systemd has changed to support multiple instances."
+		ewarn "To start the default instance issue:"
+		ewarn "# systemctl start syslog-ng@default"
+		echo
+	fi
 }
--- a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools python-single-r1 eutils multilib systemd versionator
-
-MY_PV=${PV/_/}
-MY_PV_MM=$(get_version_component_range 1-2)
-DESCRIPTION="syslog replacement with advanced filtering features"
-HOMEPAGE="http://www.balabit.com/network-security/syslog-ng"
-SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="test"
-
-RDEPEND="
-	caps? ( sys-libs/libcap )
-	dbi? ( >=dev-db/libdbi-0.8.3 )
-	geoip? ( >=dev-libs/geoip-1.5.0 )
-	json? ( >=dev-libs/json-c-0.9:= )
-	python? ( ${PYTHON_DEPS} )
-	redis? ( dev-libs/hiredis )
-	smtp? ( net-libs/libesmtp )
-	spoof-source? ( net-libs/libnet:1.1 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	dev-libs/libpcre
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/eventlog-0.2.12
-	>=dev-libs/glib-2.10.1:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	local f
-
-	use python && python_fix_shebang .
-
-	if use !json ; then
-		sed -i -e '1 s/cim //' scl/Makefile.am || die
-		eautoreconf
-	fi
-
-	for f in "${FILESDIR}"/*logrotate*.in ; do
-		local bn=$(basename "${f}")
-
-		sed \
-			-e "$(usex systemd \
-				's/@GENTOO_RESTART@/systemctl kill -s HUP syslog-ng/' \
-				's:@GENTOO_RESTART@:/etc/init.d/syslog-ng reload:')" \
-			"${f}" > "${T}/${bn/.in/}" || die
-	done
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		--disable-java \
-		--disable-docs \
-		--enable-manpages \
-		--with-embedded-crypto \
-		--with-ivykis=internal \
-		--with-libmongo-client=internal \
-		--sysconfdir=/etc/syslog-ng \
-		--localstatedir=/var/lib/syslog-ng \
-		--with-pidfile-dir=/var/run \
-		--with-module-dir=/usr/$(get_libdir)/syslog-ng \
-		$(systemd_with_unitdir) \
-		$(use_enable systemd) \
-		$(use_enable caps linux-caps) \
-		$(use_enable geoip) \
-		$(use_enable ipv6) \
-		$(use_enable json) \
-		$(use_enable mongodb) \
-		$(use_enable pacct) \
-		$(use_enable python) \
-		$(use_enable redis) \
-		$(use_enable smtp) \
-		$(use_enable amqp) \
-		$(usex amqp --with-librabbitmq-client=internal --without-librabbitmq-client) \
-		$(use_enable spoof-source) \
-		$(use_enable dbi sql) \
-		$(use_enable tcpd tcp-wrapper)
-}
-
-src_install() {
-	# -j1 for bug #484470
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf* \
-		contrib/syslog2ng "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.hardened" \
-		"${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened"
-
-	# Install default configuration
-	insinto /etc/syslog-ng
-	if use userland_BSD ; then
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
-	else
-		newins "${FILESDIR}/${MY_PV_MM}/syslog-ng.conf.gentoo" syslog-ng.conf
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${T}/syslog-ng.logrotate" syslog-ng
-
-	newinitd "${FILESDIR}/${MY_PV_MM}/syslog-ng.rc6" syslog-ng
-	newconfd "${FILESDIR}/${MY_PV_MM}/syslog-ng.confd" syslog-ng
-	keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
-	prune_libtool_files --modules
-
-	use python && python_optimize
-}
-
-pkg_postinst() {
-	elog "For detailed documentation please see the upstream website:"
-	elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.7-guides/en/syslog-ng-ose-v3.7-guide-admin/html/index.html"
-
-	# bug #355257
-	if ! has_version app-admin/logrotate ; then
-		echo
-		elog "It is highly recommended that app-admin/logrotate be emerged to"
-		elog "manage the log files.  ${PN} installs a file in /etc/logrotate.d"
-		elog "for logrotate to use."
-		echo
-	fi
-}
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/pigz/pigz-2.3.4.ebuild
+++ b/app-arch/pigz/pigz-2.3.4.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.zlib.net/pigz/${P}.tar.gz"

 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"

 LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
--- a/app-arch/tar/tar-1.29-r3.ebuild
+++ b/app-arch/tar/tar-1.29-r3.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2

 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"

 RDEPEND="acl? ( virtual/acl )
--- a/app-arch/xar/xar-1.8.ebuild
+++ b/app-arch/xar/xar-1.8.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="libressl kernel_Darwin"

 DEPEND="
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/attic/attic-0.16-r1.ebuild
+++ b/app-backup/attic/attic-0.16-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
@ -32,3 +32,9 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
 	${RDEPEND}"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
--- a/app-backup/attic/attic-9999.ebuild
+++ b/app-backup/attic/attic-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI="5"
@ -32,3 +32,9 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/cython[${PYTHON_USEDEP}]
 	${RDEPEND}"
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
--- a/app-backup/borgbackup/borgbackup-1.1.3-r1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.3-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
@ -38,3 +38,9 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	${RDEPEND}
 "
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
--- a/app-backup/borgbackup/borgbackup-1.1.4-r1.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.4-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
@ -38,3 +38,9 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	${RDEPEND}
 "
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i "s|'msgpack-python.*',||g" setup.py || die
+	distutils-r1_python_prepare_all
+}
--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.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
@ -38,3 +38,9 @@ DEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	${RDEPEND}
 "
+
+python_prepare_all() {
+	# allow use of new (renamed) msgpack
+	sed -i '/msgpack/d' setup.py || die
+	distutils-r1_python_prepare_all
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/kali-archive-keyring/metadata.xml
+++ b/app-crypt/kali-archive-keyring/metadata.xml
@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>steev@gentoo.org</email>
-    <name>Steev Klimaszewski</name>
-  </maintainer>
 </pkgmetadata>
--- a/app-office/hamster-time-tracker/Manifest
+++ b/app-office/hamster-time-tracker/Manifest
--- a/app-crypt/libnitrokey/libnitrokey-9999.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils udev
+
+DESCRIPTION="Support library for the Nitrokey"
+HOMEPAGE="https://github.com/Nitrokey/libnitrokey"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Nitrokey/libnitrokey.git"
+
+	# Disable pulling in bundled dependencies
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/hidapi:=
+	virtual/udev"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	test? ( >=dev-cpp/catch-2.2.0 )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DBUILD_SHARED_LIBS=ON
+
+		# actual hardware tests
+		#   1. require a connected Nitrokey
+		#   2. may kill data on your Nitrokey
+		# hence the main testsuite is disabled
+		-DCOMPILE_TESTS=OFF
+		-DCOMPILE_OFFLINE_TESTS=$(usex test)
+	)
+	cmake-utils_src_configure
+}
--- a/app-crypt/libnitrokey/metadata.xml
+++ b/app-crypt/libnitrokey/metadata.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Nitrokey/libnitrokey</remote-id>
+		<bugs-to>https://github.com/Nitrokey/libnitrokey/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
--- a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+inherit cmake-utils
+
+DESCRIPTION="Cross platform personalization tool for the Nitrokey"
+HOMEPAGE="https://github.com/Nitrokey/nitrokey-app"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Nitrokey/nitrokey-app"
+
+	# Disable pulling in bundled dependencies
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="
+	app-crypt/libnitrokey:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ b/app-editors/emacs/emacs-18.59-r11.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
@ -28,6 +28,14 @@ DEPEND="${RDEPEND}

 PATCHES="../${P}-linux22x-elf-glibc21.diff ../patch"

+src_prepare() {
+	default
+
+	# Do not use the sandbox, or the dumped Emacs will be twice as large
+	sed -i -e 's:\./temacs.*dump:env SANDBOX_ON=0 LD_PRELOAD= &:' \
+		src/ymakefile || die
+}
+
 src_configure() {
 	# autoconf? What's autoconf? We are living in 1992. ;-)
 	local arch
@ -70,8 +78,7 @@ src_configure() {
 }

 src_compile() {
-	# Do not use the sandbox, or the dumped Emacs will be twice as large
-	export SANDBOX_ON=0
+	addpredict /var/lib/emacs/lock
 	emake --jobs=1 \
 		CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \
 		LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}"
--- a/app-editors/emacs/emacs-23.4-r17.ebuild
+++ b/app-editors/emacs/emacs-23.4-r17.ebuild
@ -223,10 +223,11 @@ src_configure() {
 }

 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
 	emake CC="$(tc-getCC)" \
 		AR="$(tc-getAR) cq" \
-		RANLIB="$(tc-getRANLIB)"
+		RANLIB="$(tc-getRANLIB)" \
+		RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }

 src_install () {
--- a/app-editors/emacs/emacs-24.5-r5.ebuild
+++ b/app-editors/emacs/emacs-24.5-r5.ebuild
@ -224,8 +224,8 @@ src_configure() {
 }

 src_compile() {
-	export SANDBOX_ON=0			# for the unbelievers, see Bug #131505
-	emake
+	# Disable sandbox when dumping. For the unbelievers, see bug #131505
+	emake RUN_TEMACS="env SANDBOX_ON=0 LD_PRELOAD= ./temacs"
 }

 src_install () {
--- a/app-editors/emacs/emacs-25.3-r3.ebuild
+++ b/app-editors/emacs/emacs-25.3-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz"

 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
 SLOT="25"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
 REQUIRED_USE="?? ( aqua X )"

--- a/app-editors/nedit/nedit-5.6-r1.ebuild
+++ b/app-editors/nedit/nedit-5.6-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=5
@ -16,8 +16,6 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"

 RDEPEND=">=x11-libs/motif-2.3:0
-	x11-libs/libXp
-	x11-libs/libXpm
 	x11-libs/libXt
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
--- a/app-editors/vim-core/vim-core-8.0.1298.ebuild
+++ b/app-editors/vim-core/vim-core-8.0.1298.ebuild
@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="vim and gvim shared files"
--- a/app-editors/vim/vim-8.0.1298.ebuild
+++ b/app-editors/vim/vim-8.0.1298.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Vim, an improved vi-style text editor"
--- a/app-editors/xmlcopyeditor/metadata.xml
+++ b/app-editors/xmlcopyeditor/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rhill@gentoo.org</email>
-		<name>Ryan Hill</name>
-	</maintainer>
 	<longdescription>
 	Fast, free, validating XML editor.
 	</longdescription>
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/cloud-init/metadata.xml
+++ b/app-emulation/cloud-init/metadata.xml
@ -5,10 +5,6 @@
    <email>prometheanfire@gentoo.org</email>
    <name>Matthew Thode</name>
  </maintainer>
-  <maintainer type="person">
-    <email>alunduil@gentoo.org</email>
-    <name>Alex Brandt</name>
-  </maintainer>
  <longdescription lang="en">
    Package provides configuration and customization of cloud instance.
  </longdescription>
--- a/app-emulation/docker-compose/metadata.xml
+++ b/app-emulation/docker-compose/metadata.xml
@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>alunduil@gentoo.org</email>
-		<name>Alex Brandt</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@ -1,2 +1,3 @@
+DIST kompose-1.10.0.tar.gz 5232838 BLAKE2B 145938e68ede3f956cf0a2c08066ec49257527357c1c032d265b39fc00f4c07da26fcc90f1e8999a755345715332dfb5f6df82f15e817c8460f2c9038ebbc1a5 SHA512 578348c5907344b47bac17b9d6a9d8c4ba5cce9fbe72ad3b65af60dcfb985bd39ee2973308dbfa45d4bd78467fa330621c16624cc7d92287b943ac02d0ae3e45
 DIST kompose-1.8.0.tar.gz 5230179 BLAKE2B 47f2770eb527bb3b40e1734f9e5173ce4de55ef55460f624dcb22374d94d4a4ae650d82db6508dd0e441535c03da8a0f61d7600425e44604b580ecff493ba987 SHA512 4e618f9e9adc65abd2be503dd28b6d7761945a99788e910cc072d04b6088e953152f9354fe168fe7bf22252f698b957e2cc23440d242bed62c4b7415dc513e33
 DIST kompose-1.9.0.tar.gz 5229558 BLAKE2B 41c168dea0311ea4663b4056ec10a0a446f0c714a0d32cb6e75d4cb680335acb31d164d390fbde487856c268fb671a7d2e4238de2a542fd54e64e9c3ce693d41 SHA512 72d575bb79fea88de54740ed7a4809b68781b3473431c2c11213a32b9ff3dc9340ef49ea8009ff6f7f16dce8f36565a91b8c28ab45bc860d53075f42f3fde66b
--- a/app-emulation/kompose/kompose-1.10.0.ebuild
+++ b/app-emulation/kompose/kompose-1.10.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 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}"
+KOMPOSE_COMMIT="8bb0907"
+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 -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_KOMMIT}" -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}
+}
--- a/app-emulation/openstack-guest-agents-unix/metadata.xml
+++ b/app-emulation/openstack-guest-agents-unix/metadata.xml
@ -4,9 +4,6 @@
  <maintainer type="person">
    <email>robbat2@gentoo.org</email>
  </maintainer>
-  <maintainer type="person">
-    <email>alunduil@gentoo.org</email>
-  </maintainer>
  <upstream>
    <remote-id type="github">rackerlabs/openstack-guest-agents-unix</remote-id>
  </upstream>
--- a/app-emulation/runc/metadata.xml
+++ b/app-emulation/runc/metadata.xml
@ -5,10 +5,6 @@
 		runc is a CLI tool for spawning and running containers according
 		to the OCF (Open Container Format) specification.
 	</longdescription>
-	<maintainer type="person">
-		<email>cardoe@gentoo.org</email>
-		<name>Doug Goldstein</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`DIST AutoScaling-1.0.49.1.zip 12387808 BLAKE2B 7f43b3544b05f1adc196c28b7c2fc5c26ea84cb3d3bd7cf098d8413b98aac5d2908177ee5567aad6dbea96d1abbf60794c4450423de768c280a33cb4efdbbd1e SHA512 aefc4dfc970757062ca972c5d532485c9e28ceb771b6fa0a4fb2fe25460bd67e3023bcefde57f9852340b6015e7ab2771c49beb0826e1394710ea7eea94948ed`
				`@ -1 +0,0 @@`
				`DIST CloudWatch-1.0.12.1.zip 6156651 BLAKE2B 140dc28fa44423824f180f34ab05918068e941f31de3081c0ee7ae462ee8d63f26c4fdc838a9e677638a34609a215f52b83572980e488d34557d39d610c434e7 SHA512 881a428a2861b86196a691f24a3471058426f049170d16f067d7cc319712beb161c80041e9ae89339d5298ffbf2869c04509fbe4620cd60cc74658c8d3ab11ec`
				`@ -1 +0,0 @@`
				`DIST IAMCli-1.3.0.zip 3957057 BLAKE2B b2e429c2fb3169e23d6e6fc4c4b33594f2814bf976d1c584551008561b71977a3ee4abafd50bd3e52592e918624da01b83527557d2079772d083fbe96ee52eb5 SHA512 5012ece2d0569545848d83cf879b4d05f7f955f22bbc31b86f3993e4f5ee48de3099369fddf7f2b2d98f89e56c8c329e427a1f7dca0afa728ea9593c1b36497c`
				`@ -1 +0,0 @@`
				`DIST RDSCli-1.6.001.zip 6291974 BLAKE2B bdb7f9bce07e920b144cce15e6b05f9d98aeab4cbb33c181914d8584c5e24f70ef486e3d2b677e166ad9f936a2d15758ba55cc26f7fc129ed907989c2d3424a8 SHA512 29eb31064cc9b067bdc625e9777dd1cc77bdbd01a167c91c396d52f89fd9617496e2383fe343a17abb0d8029e47eb87f8ae7e60c0dd5a89cee485dbe45a05963`
				`@ -0,0 +1 @@`
				`DIST bind_exporter-0.2.0_p20180307.tar.gz 873965 BLAKE2B e59cbd2ccbd13dd60b673c6816e2d4c151e85ed159daa272996081814f7f276bc686b5d6a94db59e41085d57a12974bd2dcb8ef7696dba3940de705dfc800f25 SHA512 63331f877d988a41b86c0204569a1cd19cbfa176be9e811ef8fa5509d0af4a2f7dda0b27f9ba3b0f3df985f7c075f4535225298ce8808f97497d8bfa3b41256d`
				`@ -1 +0,0 @@`
				`DIST jinit-0.1.12.tar.gz 110745 BLAKE2B 411f02a45726b20045de7ce6e40627c0652ae778631e3bb1de37182839b316efaccb84b4270a3dc15258d3eb479ff3fcc1a99cd7f313a615d06326154c61cd78 SHA512 3428ba2c9bc57f6a1e30d75b9c2b86f597753fdb29e5c748986a3bf90b8189f35b88591dffb8f861b728e7ce08e78c6c5f1780147bfdb5b6a1d5f2128d34db5d`
				`@ -0,0 +1 @@`
				`DIST nginx-vts-exporter-0.10.0.tar.gz 149620 BLAKE2B 6856240886d1a7082c901535954193798e8636ef744a5960441726cb12a5510706f7b8c1757e9f719c756d0beabc355cde8ec626c9bd4f14f7ff84894d0cc6da SHA512 bdd3993b3fee24d3332db720df2880493eeb0724cd5b099ccdd5fe6456df1b344132e4e585271999df355fb2042954cb3d452e6dc0b92dead288e94dd71f627c`
				`@ -1 +0,0 @@`
				`DIST procinfo-18.tar.gz 24365 BLAKE2B 7da2f2afe014dc5b991244c0f2eff631db87ed00942a38dcbd1f5080df0bc7c2fb30fd5c7af14a180dfc2ce0562b2a26633451e0a3a17a577cd15a5f281f0118 SHA512 12c4d7983f5d6531be6d4df39f5f1e1ee2ea2394a6eb8fb8df0573f0085499e4b7d43355bfa549a24ddf1ecb09bbfa7b038cef9c483620c74ad5cedc219e35fa`