gentoo resync : 15.05.2018

3 files changed, 28 insertions, 19 deletions

diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index 1601ba9f5ad6..85d943a28c79 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -6,7 +6,8 @@ AUX cronie-crontab 477 BLAKE2B 3ae5d23fbd5439a314d087f95f7cd469d7c7c617c2d7f2c4b
 AUX cronie-systemd.patch 865 BLAKE2B 3418425036ce7558f516a70203dac43126299d815bd473940c296015cbd4a1fb2fb7032ca2b7d81edc8bb946f72e83a3282c071ef14a1f0dc28505e03cdaba43 SHA512 dcbeb3fba468f3b63965714075bb6619c768e0d14caddf8c4b62a5d6bee6a2f55be2f1d589b9ef5adefe57d9a20eb2c17216550519fd83bcea2151ccf151d4e0
 DIST cronie-1.5.0.tar.gz 242072 BLAKE2B ef21cfabbc70981a0d57ff85cbdbae786aae2d01095e7da3f55c5a9c97c1b62cde2e29e7e872b34872e9b8faacb36d86cfb37a8257faf49f1586761eb8797f23 SHA512 cad4d78cbb58ea32d1093890b316b6599d115b29f367eecc2e4a0a3560ab85ac85aa159886c883e46defb6212432d37f425396cfca686e4dd8526102ca4dd8fe
 DIST cronie-1.5.1.tar.gz 114848 BLAKE2B 9b2a045c2c3c18a931588c620e455c4f2efbf17a5f5826bc1b276bd2c4537fe91d7f81cdb7434dc7d8357414c14d9dc89c90bb7a5dc22956d90b6a84c731f498 SHA512 7e5b2e5cc782d04b84ffced21b4601ed5a041c125ec9daa3ae3c704c04b376b07f8f6e6e1351659690ce695ca4c9373456420099eefde985e15fbe5d3ebdcf5a
+DIST cronie-1.5.2.tar.gz 121604 BLAKE2B 4225439fd13a32bba3bd24f25d7dd405cdb123e666ebbf14574143af9d161867f82ea3fc479d81a884590faaa9c42e19c971285e01a19d6ac793b7deb7fc4775 SHA512 6455e234becc44e6568fa25fd72abfaa293cb0bc2d2f1d124e551c068ba01083192b21e82e941158c8c1f41cb6dad3851d665b9f3baa82fd49080f3f8619740b
 EBUILD cronie-1.5.0-r1.ebuild 2149 BLAKE2B 11ba9fc9f9bbe786fa226f45b11c689188be8606b9c2365a2dcabb71c1e0a4ab77388be8c7ec9e3bc73c0e0c7f66bbe170949957496c1aab61e66d4cc74f819d SHA512 345dbd19db3c032f1a3a32253b091359775ce86f0ed69b7abffdcc9603fb56d49d355c6d4e0907f20a5d560eae10f815700c9e62dd472837b39d0645f90d6638
-EBUILD cronie-1.5.1-r1.ebuild 2274 BLAKE2B b22e14cb329a250cdf70898707468c88cc599018c19be6a6792f4d9d3a303454bc1d81c8b5289d8e15f119ee3a8e469b507967a782dbeb47ef6a6282f9aa61ce SHA512 cd896ba84da4a0a7b2c57c12d698cb2be5bd5b0d031a47c7f9ff36de2dd8e7acb9449f787f60563ffba9bc4094687673be71147200ebb4c77b4b548b4582923f
-EBUILD cronie-1.5.1.ebuild 2207 BLAKE2B e96e430c2654b80301a536b12fbc9584104eb6e2dbcf14df14f4eade954ae020e0b75f874eab8ccf8ea7fee193c73067893e1d0dac9b06b994b526dd7a3a1b88 SHA512 4f6588e27aa00bc7ace3c8a930c84873f23d28dbda048a1b4476108ea01fc0a5e6f733c05e5366ecd7c3c9a8e0608dcddf2e4942f08c0425b07312cce230db92
+EBUILD cronie-1.5.1-r1.ebuild 2271 BLAKE2B 101faa1014a2f7422ae231b6e4573362b32ca37abf00bb007d5290e45001343702c48968bff28a7496fb8d217c30499d552eb102e2da3aee204ab350f6f9e9b7 SHA512 f758f46ac1c9eaa29e06995bc09e421c9a1d0cfb8bfa61ede8bc59e7d2953a3ac5ab2340057a71f14464a60f98894d2f636a315ef2abd4d09507a827536fa285
+EBUILD cronie-1.5.2.ebuild 2304 BLAKE2B 7dfdab50996758c6686315f3f46b47ae4931183c7df9d01d2ea9c567ef6bc3fc390494d08c169fa7010c0d768e6387436e6f223e18ab925052e8251cb2542444 SHA512 5ec2fce3aa8fba1b9d7f02c25e8441bc66222a075e7cd4433de5effee7999ecddedf7b9271a83ed00d3c9f27cde8726befcb4a1b4bcdf0583e377f8446cd84dd
 MISC metadata.xml 1014 BLAKE2B be8a19ba115ac54d9cc8c667072264f4eb134ba5133e404f74436ab5b0fd88b42a21d6a6f0441ebe3158ce475ea29f5eebc5d135e6b2317ef4b35ee1365bce52 SHA512 7f8295708e5049940e4e2147494e8ee2649635b492fe9096f1d61785f6fd8126d380be1517b253e668d6355d0d2d03e97af4fcca47ed42a6b70a5d669e7ab2c5
diff --git a/sys-process/cronie/cronie-1.5.1-r1.ebuild b/sys-process/cronie/cronie-1.5.1-r1.ebuild
index 9030fc8fb1df..ee8862554821 100644
--- a/sys-process/cronie/cronie-1.5.1-r1.ebuild
+++ b/sys-process/cronie/cronie-1.5.1-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
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/cronie-crond/cronie"
 SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="+anacron +inotify pam selinux"
 
 DEPEND="pam? ( virtual/pam )
diff --git a/sys-process/cronie/cronie-1.5.1.ebuild b/sys-process/cronie/cronie-1.5.2.ebuild
index 845934d32395..f9c9fbc31a16 100644
--- a/sys-process/cronie/cronie-1.5.1.ebuild
+++ b/sys-process/cronie/cronie-1.5.2.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 autotools cron eutils pam systemd user
+inherit autotools cron pam systemd user
 
 DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
 HOMEPAGE="https://github.com/cronie-crond/cronie"
@@ -11,11 +11,12 @@ SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
 
 LICENSE="ISC BSD BSD-2 GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="anacron +inotify pam selinux"
+IUSE="+anacron +inotify pam selinux"
 
 DEPEND="pam? ( virtual/pam )
 	anacron? ( !sys-process/anacron )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	sys-apps/debianutils"
 
 #cronie supports /etc/crontab
 CRON_SYSTEM_CRONTAB="yes"
@@ -36,16 +37,18 @@ src_prepare() {
 }
 
 src_configure() {
+	local myeconfargs=(
+		$(use_with inotify)
+		$(use_with pam)
+		$(use_with selinux)
+		$(use_enable anacron)
+		--enable-syscrontab
+		--with-daemon_username=cron
+		--with-daemon_groupname=cron
+	)
 	SPOOL_DIR="/var/spool/cron/crontabs" \
 	ANACRON_SPOOL_DIR="/var/spool/anacron" \
-	econf \
-		$(use_with inotify) \
-		$(use_with pam) \
-		$(use_with selinux) \
-		$(use_enable anacron) \
-		--enable-syscrontab \
-		--with-daemon_username=cron \
-		--with-daemon_groupname=cron
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -58,10 +61,12 @@ src_install() {
 	newconfd "${S}"/crond.sysconfig ${PN}
 
 	insinto /etc
-	newins "${FILESDIR}/${PN}-1.3-crontab" crontab
+	newins "${FILESDIR}/${PN}-crontab" crontab
 	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
 
-	keepdir /etc/cron.d
+	insinto /etc/cron.d
+	doins contrib/0hourly
+
 	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
 	newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
 
@@ -79,9 +84,12 @@ src_install() {
 		insinto /etc/cron.hourly
 		doins contrib/0anacron
 		fperms 0750 /etc/cron.hourly/0anacron
+	else
+		insinto /etc/cron.d
+		doins contrib/dailyjobs
 	fi
 
-	dodoc AUTHORS README NEWS contrib/*
+	einstalldocs
 }
 
 pkg_postinst() {