gentoo resync : 03.02.2018

16 files changed, 155 insertions, 341 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 596981ee8c57..ef77902b1618 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 005471fd6391..1171bc8f17a3 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,7 +1,9 @@
 DIST ansible-2.4.1.0.tar.gz 6675552 BLAKE2B 00497b33e833149510669c9e481b0893a2d016caf2949fa064ca0a2e4f62a6c5a3f94597673822418253b85abaf380308115dfaa4c1acd88f0c73322d87822d4 SHA512 86bda43d912fc6b9cbf662e7e9e3ca3178ac577bc7857c5dfc0e68a7083d76ad405b0ca9b34f680a0d635b87e0bf5dc8cbdeefb93174242e1942eabb74b07f1d
 DIST ansible-2.4.2.0.tar.gz 6503595 BLAKE2B df4ec4e24671f1488950f2d9eb7705fbad4e035d6ac67d5017417281455cc44cde1290976a9ed16675c0cc19a9190200b95b29890725c56df5f2699398accd6b SHA512 32a075959dca01e184d9c3988fc9c491e904e7627a38e3527c37a8b26340f331bd294cacfe7353d339d15488857ba5ee1b36d9ae4ebeb8b5827934a73f4b42b0
+DIST ansible-2.4.3.0.tar.gz 6511115 BLAKE2B d43679c651f6aa5fd86c797a204645a8ee98efbcde9abaa25385aeb6f1d7c8b4ad74185434bfd159dbf673fe9339ef8f915f78238f8b8a5caf924b54cb9bdd52 SHA512 a7cda358c67c519c7e5ba248bf47070f21a27203fb29d70d9d75ecf027ba1275d71c0f96493e047281211d172a3be8273d7e08144446284695fb0bc8b94daa82
 EBUILD ansible-2.4.1.0-r1.ebuild 1441 BLAKE2B c7d99a3d842b55015f0839ec115c341fd5e543c5b045573681a071d956fa74931135388f9cf081a26b80a40db0040fb63c2a6037d5cf496a5d39945eed955f2b SHA512 611e6a76d51e16fdfb0131862c39935938b439ed36e0bc5724bbc78f3944d9048e33c277120a6f681a647102c648dbcf2052f7008960cd97ee7afa133f16c41c
 EBUILD ansible-2.4.2.0-r1.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7
 EBUILD ansible-2.4.2.0.ebuild 1445 BLAKE2B f00ce2aaff90cbdff9a6eee800a61bfca78491671a3b8e7c931fe8f24cced9b6b8bb5552f42d34b106d8b101173c373f4ee69f8dba8738936af3866e946164df SHA512 2f731321ff758ca6db6cd90701ae234cd63fb84f8dcfe730c6b2cf824fb8f801ceb174e1bde7b3f3e9d14723574ff5c18d5ca68c82b27192aef3d4b355df5ff0
+EBUILD ansible-2.4.3.0.ebuild 1406 BLAKE2B 9f63cd0a25a4ada0913f0e94c5dc221043936b60a0287d32668f3b9ede027f4b32695d527d5b6402252c5294e3bedc00d2ccdb3f8b0d8f892a9c6c003f81d73e SHA512 492cb42bc894ed7b07275828117689901b90574135397b73bbe9b7447a06df6024a18f9cc61bd48ac8d2f3ead9b0555ad79c708d275894725aa6ed1548a00fb7
 EBUILD ansible-9999.ebuild 1475 BLAKE2B f2718a27295c6d9ce5ad4415573558ab2e651f52dae85ae9dc79a3e39e5692a29279b5d6a96166c91b7d0b1a389915848e7e9480979c4fa3e0878ae6b2fdc662 SHA512 a1c816593bb2052ce3f89c37fa44322b25af436bf6f3bbbfb8c87e1b1ed33aac880e8e3499fcbc52a0d0bd85db6ad0ac48a858400b1806ae4b61beb66a634244
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.4.3.0.ebuild b/app-admin/ansible/ansible-2.4.3.0.ebuild
new file mode 100644
index 000000000000..346b2f5aea95
--- /dev/null
+++ b/app-admin/ansible/ansible-2.4.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit distutils-r1 eutils versionator
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="http://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 78b781856340..b4db77658497 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,5 +1,3 @@
-AUX logrotate-3.12.3-fbsd.patch 855 BLAKE2B 1f7139019671fae9ebd73e66a86d124003867de78b4e29a68070954564fa77cf1b57e14bcf1f7f1abc01c5cf7df2ebfa10ac79506c3579486c721e9080216be6 SHA512 3e54314ce32735bd70fe46792c073fd5eb345a77e40eae4b9c899671cc8b7dd8d6f1042a28f05364431fc730a3dbe924d19d6eacbb387c6384268a397dd9ac85
-AUX logrotate-3.12.3-ignore-hidden.patch 542 BLAKE2B 8f94f632c9942f3d05ebc652e56b7fc3b7ec3010c14ecfd788a0e12e07f8befabd48e51b7dcdac6598296cad7aa0efff11f0bbabc6ca06dfa09e5fb0b6200bf7 SHA512 86d7335dda9b913928eb14dc39a120e14f3796fc30516fbfb5424c575520802edb84224bf5673084be7e983f9e2d856d80d58fa4200a0a43a9624d41dc20a206
 AUX logrotate-3.13.0-fbsd.patch 855 BLAKE2B 48494caecc49d7b819f889bc7acf6bd29e71583625a0638b39c1f2d535396a88c205534353430d70fbb577093ab43bee4bec0325443cf3c233f5f28dcb20cb12 SHA512 5343814545554392f1ee1be5b35866ebce0d8f2f580cb7807940e3a5b2092025f1b9619fa0ff3bdf4b99aada4c46a602d6c34c6e3c1e42b15ce51cf9d879a3ed
 AUX logrotate-3.13.0-ignore-hidden.patch 542 BLAKE2B 01c6e92306eaa2356090e5539555711ff09c7bdc6042aad7f3c5d9faacf449f00bb3040132bd00774104f8c0a8cb40073cb7c26323978ef199847a88eee26e45 SHA512 88bd9dd906171d45877e4c21e40cfc9a729742825b4c5d583fd9364d3943aa604e037e4b58e053a1fc7c0b77bd5ed6171f741778716ef753ecbb02ebaf012589
 AUX logrotate-3.9.1-Werror.patch 344 BLAKE2B 6f132592ec2446943cb4f6426b7e25b432e9e44d82d080b3773ab7f5c34de019594ef77fa74cd74e026605e775ee2b119ab39c2eeb50a092dec1a1c502409b4a SHA512 6ae8b49d1f29ce1c32603716555085b7fa2d865177558abe92c84867c69ca84b8174563db07537801ad01572717670478b273acb34b5885b9170354d1cc02493
@@ -9,11 +7,8 @@ AUX logrotate-3.9.1-ignore-hidden.patch 551 BLAKE2B ed2a533ca01b99fa29b5a1fc4c51
 AUX logrotate-3.9.1-noasprintf.patch 1263 BLAKE2B 5f145d46e3c372d3999d58bb8e01ea07d7c81559f576a783548588b823abe33142fddb0bfbed51ddb4986aad0655a6c2b6c5f092866612af80aa2ed4c24368a6 SHA512 c84be7ef011fe09a2fae67fa918080c1b0c098f0000e6cacdfcc34311f17c0131e68bc1e337559391ae7272fd326ac7ba6ba1cca20f99a9cc51367ac35a924e6
 AUX logrotate.conf 743 BLAKE2B d623d150d9959ae57e61af2c442434f81636521c133479aecbad8731662ee3743cb3db858ed8326ff87d61262d20893ab6141fe09d12979785e8c52c428f5964 SHA512 c0357a432a4619392895d8180db3c593239a96f62aba7cfd981c76e9d1dfd9d93d63860655025b1e9473374c2a51068028c3a3f316cb5cbb71562ca4a61d8d24
 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
-DIST logrotate-3.12.3.tar.gz 202991 BLAKE2B 26e6507eeeeae15cfa1e183a64151a66600462a48aa6eb951b30634b90644b24ae7ceb9e26da5954919c83e05cab5a102589b621b7a8fdc8bea8d40dd1c813fe SHA512 ab700a50736c7ce8a6e5b9dc2504919c6d3e6ae48a7f112f6980253df5c6bab7fc507c82a0cd961d73ed1312c930da46d96d9f27046996644e0759c84c6a1ae9
 DIST logrotate-3.13.0.tar.gz 213726 BLAKE2B b9970a0fb49b9de9c83ee679fd4587b6a1623cf1aae2444e818339361c7b7762ce51fcbd124fefafbe47d529dd21ef346a6c9a267da20547914388db99dce003 SHA512 3dec2fcdd674d3337b71fd70339cb5e3dd06b4bc24bee191356a30c2a211a290ae7747e63b90581e32a6d6d1f73cf62d5b0ee5a91aa05bad4d6ee403a35d9e76
 DIST logrotate-3.9.1.tar.gz 79061 BLAKE2B b07f8fd8eb59cc4d6c80441a3b5a8aab090bc13eb8fa5e35b111feb2203fb2c3092daa469e6fec02a29b1d377bca33fbbf5859bcd351a1f4a0d82343c5f65d3d SHA512 e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28
-EBUILD logrotate-3.12.3-r1.ebuild 2485 BLAKE2B 65dd96e9bc5a13840ad8b84dd193221783887c55e07de740a525a10310664b81588712e914373dcd0692cabead771efe74687783a3a2d5ece976a1744d5a64bf SHA512 46b79b611ba2e3533e1c068b3422b3507e2f505d5562810f91699f936be43b99a4456603e5c9298f30dc2eae5633e391319516babfd038520a0de58e03513ab4
-EBUILD logrotate-3.12.3-r2.ebuild 2552 BLAKE2B 9f4d04a6d303ad64f515c0f2b4f6a3dd2b60c8ed5c2216c76c1642a8205eada4db3316b81208bb42f4552378e25a871514f3126ee701215b37f25e65612ae772 SHA512 b3f3b5d0264bb75c717608be706eccf33d97996f38c5ca152e1797f9dfbdfc40add7065fa614a715d0a30d431dd484e34a8b48138b80d99bcdd546b597264436
 EBUILD logrotate-3.13.0.ebuild 2543 BLAKE2B d79fec2304b6b52ec1cc064fc40aed2054edecf4abeb8dbd0d5df7f8bbb27e1a17a384cf4d44042197eac0c8ac7d5e6e888ef689fe2794ae206d946661b6196a SHA512 2f6b6caef77088ff1aee15f8a289f1b3559180034b5f2bfa5520b2c3627bb0f92e0f5555cbe914f4877b50729f84e3ca3f0353c6e1b63442e156b530819294a4
 EBUILD logrotate-3.9.1.ebuild 1767 BLAKE2B a59f23a8a0a24b416f23a087c60fe046260cc24521f68f2551bb2a2821d12e94307e2d620ec4b625cd1b6be21cafa3d2c0f044468dbc2760897e5bb7854ac7af SHA512 ed808392727749efb6d20a410810f6eb9cb364db2e11460f4c2940abd0fb1d7430b75102f2fcabcaf64e8818da39323010d2a5d223df49c705a6171acf541a03
 MISC metadata.xml 1119 BLAKE2B ddb2266925506c260c4b3f67e4dd906d9446a17a54b5a0ffce547d3c942750ead45dd1cfdcbae548a096d87ee1e247fcda9bcb81e83b829f0526d4bfd7b4a01d SHA512 99725d54d1cf68b257446ef8afc43d4bfe05cc789c818222d603012ae1e636624962c23a845f8858f4fc7aaf5a7e7f8085a7b173185ba66d7e390012dbceef79
diff --git a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch b/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch
deleted file mode 100644
index 67a60e3af177..000000000000
--- a/app-admin/logrotate/files/logrotate-3.12.3-fbsd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2017-04-22 23:46:08.201991730 +0200
-+++ b/config.c	2017-04-22 23:49:43.021996055 +0200
-@@ -25,6 +25,10 @@
- #include <sys/mman.h>
- #include <libgen.h>
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "log.h"
- #include "logrotate.h"
- 
-diff -Nuar a/logrotate.c b/logrotate.c
---- a/logrotate.c	2017-04-21 10:52:10.000000000 +0200
-+++ b/logrotate.c	2017-04-22 23:50:20.691996814 +0200
-@@ -1,6 +1,6 @@
- #include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
--#ifndef __NetBSD__
-+#if !defined(__NetBSD__) && !defined(__FreeBSD__)
- #include <alloca.h>
- #endif
- #include <limits.h>
-@@ -27,6 +27,10 @@
- #include <limits.h>
- #endif
- 
-+#if !defined(PATH_MAX) && defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-+
- #include "log.h"
- #include "logrotate.h"
- 
diff --git a/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch b/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch
deleted file mode 100644
index 0bbb91dcb4fc..000000000000
--- a/app-admin/logrotate/files/logrotate-3.12.3-ignore-hidden.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nuar a/config.c b/config.c
---- a/config.c	2017-04-18 14:57:02.000000000 +0200
-+++ b/config.c	2017-04-22 23:46:08.201991730 +0200
-@@ -389,7 +389,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 */
diff --git a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild b/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
deleted file mode 100644
index 81b5ffc20c50..000000000000
--- a/app-admin/logrotate/logrotate-3.12.3-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 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"
-	"${FILESDIR}/${P}-fbsd.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-}
-
-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}
-
-	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
-	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
-}
diff --git a/app-admin/logrotate/logrotate-3.12.3-r2.ebuild b/app-admin/logrotate/logrotate-3.12.3-r2.ebuild
deleted file mode 100644
index f0661a39594e..000000000000
--- a/app-admin/logrotate/logrotate-3.12.3-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 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"
-	"${FILESDIR}/${P}-fbsd.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die
-}
-
-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
-}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 114ac021b04a..6c9d6eed086f 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -5,10 +5,10 @@ AUX logstash.confd-r1 837 BLAKE2B dd8362a386c865b44e05dd4a244146c5b593e4497d876c
 AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e8990036812ad8f5cbd4e2561affab3ef1de2482990635169afdd10c0841167494d2bf024b28101a0df45fc SHA512 5592918e82182f638a02f6446f9103f70274fdf615573aa4463fde1dfcfa7955c715b0fdcb1f98de9c19ab86268b439d253a696b27f32e55d830cc3839231e30
 AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
 AUX logstash.logrotate 103 BLAKE2B d87e7945c35a01e9c62731a4561d0dcbd18413717ba656ba69b449d94c9c4cfc9c690dc2562e348318b93b477f9407e0be5041bcbc55a6797d7f0c0a5cd7be65 SHA512 a5b508d49889dc27722ba82322082b3845449ce99e9e65a4936ed2a49ba2a25a55c0d3bdb31f560da94190d41b39192548f63074ecf5376b9b2b9b73fdaa0ff6
-DIST logstash-5.5.3.zip 99551442 BLAKE2B ee29db9b606a3aae83c218d020fc8c17d19013411e3a0deb6c333489803f4d3d6809ac8806adf373e319888049826d0d4ce8f09ca6db3b1afdeb261321e349ba SHA512 a4328ad0b8192b7c5aaed155d608d9db6adeaefd640e461ef4467daa1a28a2ae25d6b2b1adcf47c5dd82b66fc1adbf8ba5f3eabcf7e69dd8719a5860795877aa
 DIST logstash-5.6.5.zip 109135563 BLAKE2B 6846231439807dd4fc77ae86af849aaefcc9084482f2f88de6148da3d31ef583164da6749ebe0c4def83217e95729a933acbb3e04777db58639eaab91de06831 SHA512 f1dcbb8f67d2f2868e38646b56376428e0996cbf302837300939b8c7ff6d764417fccea40f90559c48441f939e6940e84501ee3ad1e29ad2538969f2cc12b2b8
 DIST logstash-6.0.1.zip 116215793 BLAKE2B 676810b9cd62f578e31e1d63d4aae8c920590905a7344434d5e14607bab0e3ce59e2740e6839491f44ce769b24330a7a060174dcb5e6cb9cf51a31d165ba990b SHA512 395e4e2ff199d9ffc5156901d6ba6ab17771ab8f8859acede74567b2294e2d7ee2a6693e79f7b3e82c8d5c1959ad259bfb22e7992670cdcd3b73c7b72a635a31
-EBUILD logstash-bin-5.5.3.ebuild 2158 BLAKE2B 78605e21a12f389c8a9c771a9dbf2fdf0f49224c0966f378699d2c8da92f0c5375e99102629dd21e6103da7c487e0a19d447dd2541b3a28cb746a23ab912a0cd SHA512 e756ea562c886d1f4d1f1196a683eb17ef7f36de2dc04ca61d9f8f10bb458b779efe00c4a8c2d24360a99fc0691ffc3c509d8ef2da1d7a8d8d83b5aced7d8dca
+DIST logstash-6.1.1.zip 116335093 BLAKE2B e7a990c2ea0eb3ec7de714f038765817c76eaf9e6cef0e55106f1f1aca406ec95d6be779f24c1fa28e096b51feeef968cb31f416f99c85c2f45d798bb74aadf7 SHA512 a2a420169dff31f3d5d65628a9d1eaad930a8e544fc4e986e3671ffeea3a1d03c8f77f8b51568a0da082588a843568fb7aefe29c1c90365882f429f9536f9240
 EBUILD logstash-bin-5.6.5.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85
 EBUILD logstash-bin-6.0.1.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85
+EBUILD logstash-bin-6.1.1.ebuild 2203 BLAKE2B cd2127e338eead00002113add534ac31c23ac5578263ebcbd7ec96b9d234a82a50a86ec7c476596afc4c51ae51a0be434a89165138b7b1515a4fda4a8efd5aba SHA512 96e4e8391a149c4350d28c40f28efe652216171e4026be735df4aa48c1427e8e6f37fcb16720e288ca1d69bbbea6a3657db93f5bf3ef5d7a55b757296a5e2e68
 MISC metadata.xml 578 BLAKE2B 739149a851fd22460a5cf86deaa74732e44ef44c9edfcba880e7734a8660c92d18df33728939addff8e95241c0475cafed5b0df77d0b9acde609b163f8e7eb0f SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049
diff --git a/app-admin/logstash-bin/logstash-bin-5.5.3.ebuild b/app-admin/logstash-bin/logstash-bin-6.1.1.ebuild
index 0c945e550909..1977b1915acb 100644
--- a/app-admin/logstash-bin/logstash-bin-5.5.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit user
+inherit java-pkg-2 user
 
 MY_PN="${PN%-bin}"
 MY_P="${MY_PN}-${PV}"
@@ -37,15 +37,17 @@ src_install() {
 	insinto "/usr/share/${MY_PN}"
 	newins "${FILESDIR}/agent.conf.sample" agent.conf
 
+	rm -v config/startup.options || die
+	insinto /etc/${MY_PN}
+	doins -r config/.
+	rm -rv config data || die
+
 	insinto "/opt/${MY_PN}"
 	doins -r .
 	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
 
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
+	newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
 
 	insinto /usr/share/eselect/modules
 	doins "${FILESDIR}"/logstash-plugin.eselect
diff --git a/app-admin/restart-services/Manifest b/app-admin/restart-services/Manifest
new file mode 100644
index 000000000000..8669d5b22f0e
--- /dev/null
+++ b/app-admin/restart-services/Manifest
@@ -0,0 +1,3 @@
+DIST restart-services-0.14.1.tgz 20909 BLAKE2B 2f6b74fc6094be83e1872d2a6ca7abb02a49b5db65d81cd37f8161bac148e5fe0614502f1f06356ff9cd6c6ba03c416dae1eec3a86f48dc011bc6e28c1b076e3 SHA512 3434c4b6cdf9d02b035eba2cc67cebe8e06a2cf31c2d8627063b84224dcb6d44e276e1fcb82221ad77ab7ee7e16fa7ee58fb94b7849d40e6786d3fcfb6087866
+EBUILD restart-services-0.14.1.ebuild 2287 BLAKE2B 1cae98d58743a2168c0754bbd0abe2576da33a45ef1525b1474a8704235343d8d02759e8256e5dfdcdac1612a6fd511972a03436d5754d850779d204ce9344ac SHA512 ea1a811336138ca9b68ad29f26fbc2f5580cdbaafa91b8d60533f0ca94ac5b950a76fecbbc7b57dfaedd13cbacfa4f156ece309af31c0865f1fee1ca0a2863b6
+MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart_services/metadata.xml b/app-admin/restart-services/metadata.xml
index ea6b59e79026..ea6b59e79026 100644
--- a/app-admin/restart_services/metadata.xml
+++ b/app-admin/restart-services/metadata.xml
diff --git a/app-admin/restart-services/restart-services-0.14.1.ebuild b/app-admin/restart-services/restart-services-0.14.1.ebuild
new file mode 100644
index 000000000000..507423cab5de
--- /dev/null
+++ b/app-admin/restart-services/restart-services-0.14.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
+HOMEPAGE="https://dev.gentoo.org/~mschiff/restart-services/"
+SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	app-admin/lib_users
+	sys-apps/openrc
+"
+
+src_install() {
+	dosbin restart-services
+	doman restart-services.1
+	keepdir /etc/restart-services.d
+	insinto /etc
+	doins restart-services.conf
+	dodoc README CHANGES
+
+	# remove after 2018/07/01
+	dosym restart-services /usr/sbin/restart_services
+
+	sed -i 's/^#include/include/' "${D}"/etc/restart-services.conf
+	cat>"${D}"/etc/restart-services.d/00-local.conf<<-EOF
+	# You may put your local changes here or in any other *.conf file
+	# in this directory so you can leave /etc/restart-services.conf as is.
+	# Example:
+	# *extend* SV_ALWAYS to match 'myservice'
+	# SV_ALWAYS+=( myservice )
+	EOF
+}
+
+pkg_postinst() {
+	local MAJOR MINOR
+	# migrate config data for versions < 0.13.2
+	if [[ $REPLACING_VERSIONS ]]; then
+		MAJOR=${REPLACING_VERSIONS%%.*}
+		MINOR=${REPLACING_VERSIONS%.*}
+		MINOR=${MINOR#*.}
+
+		if [[ $MAJOR -eq 0 && $MINOR -lt 14 ]]; then
+			einfo "Migrating config"
+			if [[ -e /etc/restart-services.d ]]; then
+				ewarn "/etc/restart-services.d already exists?!"
+				return
+			fi
+			if [[ -e /etc/restart-services.conf ]]; then
+				ewarn "/etc/restart-services.conf already exists?!"
+				return
+			fi
+
+			if [[ -f /etc/restart_services.d/00-local.conf ]]; then
+				sed -i 's/restart_services/restart-services/g' \
+					/etc/restart_services.d/00-local.conf
+			fi
+			if [[ $(ls /etc/restart_services.d/) ]]; then
+				mv -v /etc/restart_services.d/* /etc/restart-services.d/
+			fi
+			if [[ -f /etc/restart_services.d/.keep_app-admin_restart_services-0 ]]; then
+				rm -v /etc/restart_services.d/.keep_app-admin_restart_services-0
+			fi
+			if [[ -d /etc/restart_services.d ]]; then
+				rmdir -v /etc/restart_services.d
+			fi
+
+			if [[ -f /etc/restart_services.conf ]]; then
+				sed -i 's/restart_services/restart-services/g' \
+					/etc/restart_services.conf
+				mv /etc/restart_services.conf /etc/restart-services.conf
+			fi
+			einfo "done"
+		fi
+	fi
+}
diff --git a/app-admin/restart_services/Manifest b/app-admin/restart_services/Manifest
deleted file mode 100644
index 541cdc71e7ff..000000000000
--- a/app-admin/restart_services/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST restart_services-0.13.0.tgz 20790 BLAKE2B 67ec5d4f32ae0c521ccea2cd13525b930ebfb96c5a4b5385ac9f24ea538cb04017550bad15116a93bbe844fd2f879dccb4f4ba28818a2ca5662018d36c68083b SHA512 778139f724f0e8f5f5a4a146ea19808f1d58717e2158570e829ed15950cf4394ecce1c2d3fe7afd6c9324b255186b9d740928c973a48aafeb4df3a38faa814ba
-DIST restart_services-0.13.1.tgz 20860 BLAKE2B 48aa801fe473fc5bd9c903a4f4b20ff71c524021aa46b517ac2d8aef3921ed3dc079ee6d477da0588772af7fd7e459ef4890d746720f553fe84b29379647715f SHA512 29983382ddf217865b4e2cde62caaba4f6a54ac20223a1fe8019e39ad0fdb61c491013444a684a0a5941965417b87abf1c25f52036649205cb16a0f12bf397ef
-EBUILD restart_services-0.13.0-r1.ebuild 942 BLAKE2B dd80c162570e085b23b099baa38217baf573ce10bdfa8ec4889203fe7fa7a35319e85a6c1ad6dfbbf51da9957228e9c898dbf86462ac9b9a884a7c43335ae402 SHA512 0f8ef249b60867b71d74d8a059d187ea86461e699f7be9116e59fb0ff702841ba0c1eac1dc8ecb8e5428156a1385f83b1a32782ed79bf029da99a0c65da36fc8
-EBUILD restart_services-0.13.1.ebuild 942 BLAKE2B dd80c162570e085b23b099baa38217baf573ce10bdfa8ec4889203fe7fa7a35319e85a6c1ad6dfbbf51da9957228e9c898dbf86462ac9b9a884a7c43335ae402 SHA512 0f8ef249b60867b71d74d8a059d187ea86461e699f7be9116e59fb0ff702841ba0c1eac1dc8ecb8e5428156a1385f83b1a32782ed79bf029da99a0c65da36fc8
-MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/app-admin/restart_services/restart_services-0.13.0-r1.ebuild b/app-admin/restart_services/restart_services-0.13.0-r1.ebuild
deleted file mode 100644
index 02d25b888c71..000000000000
--- a/app-admin/restart_services/restart_services-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
-HOMEPAGE="https://dev.gentoo.org/~mschiff/restart_services/"
-SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-admin/lib_users
-	sys-apps/openrc
-"
-
-src_install() {
-	dosbin restart_services
-	doman restart_services.1
-	keepdir /etc/restart_services.d
-	insinto /etc
-	doins restart_services.conf
-	dodoc README CHANGES
-
-	sed -i 's/^#include/include/' "${D}"/etc/restart_services.conf
-	cat>"${D}"/etc/restart_services.d/00-local.conf<<-EOF
-	# You may put your local changes here or in any other *.conf file
-	# in this directory so you can leave /etc/restart_services.conf as is.
-	# Example:
-	# *extend* SV_ALWAYS to match 'myservice'
-	# SV_ALWAYS+=( myservice )
-	EOF
-}
diff --git a/app-admin/restart_services/restart_services-0.13.1.ebuild b/app-admin/restart_services/restart_services-0.13.1.ebuild
deleted file mode 100644
index 02d25b888c71..000000000000
--- a/app-admin/restart_services/restart_services-0.13.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Tool to manage OpenRC services that need to be restarted"
-HOMEPAGE="https://dev.gentoo.org/~mschiff/restart_services/"
-SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	app-admin/lib_users
-	sys-apps/openrc
-"
-
-src_install() {
-	dosbin restart_services
-	doman restart_services.1
-	keepdir /etc/restart_services.d
-	insinto /etc
-	doins restart_services.conf
-	dodoc README CHANGES
-
-	sed -i 's/^#include/include/' "${D}"/etc/restart_services.conf
-	cat>"${D}"/etc/restart_services.d/00-local.conf<<-EOF
-	# You may put your local changes here or in any other *.conf file
-	# in this directory so you can leave /etc/restart_services.conf as is.
-	# Example:
-	# *extend* SV_ALWAYS to match 'myservice'
-	# SV_ALWAYS+=( myservice )
-	EOF
-}