gentoo resync : 28.04.2019

3 files changed, 31 insertions, 15 deletions

diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 5703d06c92ed..1a8e4492c2e9 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -2,6 +2,6 @@ AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b74
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
 DIST uptimed-0.4.0.tar.gz 55026 BLAKE2B 9f66f3cda4181c01e686896a8560ecab7bb7f3ed9cdaeaee840a589137188d8629ba414e436a99b212d386b8d3319ce88ccb8867c78335b015ed65a179154621 SHA512 918cd9e065d5005daf5062f14dffb725cb6d6764aa571fd45d63de3f7349b910cbae0dedc832f9bfb52a42caea90e8aec8390685baaf0718fec827240e517900
 DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
-EBUILD uptimed-0.4.0-r1.ebuild 1476 BLAKE2B f402e24dc3b229c10007464807ecc8427aeb078745dfd82e333884455a333a81a4bef074cb4c723d52f280a0f82f7de8edaa706cf04cbda1e070a2e9444cbeeb SHA512 cd97c3611a7e5d9f87364c703f811fb2b790239f5c4db0998ab7468d218de6c16a33c5ce0ad8529cc50f00b8efa354c194e1bcfca1daa842a7110402024f328b
-EBUILD uptimed-0.4.1.ebuild 1421 BLAKE2B 363b45ddcb148a2e56c6629be1f0eca7c2a8e28964a5422ec1de992eea1823bf786508b80f82e587111811b11e6b4daebd43ca61d2d1444756e9e6a3ef9c6a27 SHA512 51401b8ed326a61d1bb2bb7acf22666ecc901a675c7756120bfce1091d058d280fbf66c891bb2da1082b54405a3b257de677e7f14942f0e96098e81b1daff266
+EBUILD uptimed-0.4.0-r1.ebuild 1665 BLAKE2B cfe1181127c603e3ae41b73147e6e86498a11ed7f0f1c688821bb9fc442abf1dcd2e7a2edb87aab66fdbbcb28aae33b3acf442cb9dd2bc5c3bee1f1bfdce3481 SHA512 ce1d9b90d71a2cb49084499e22994d75e4461480f1f939f26f1fb75b2453749d2afbc55b5d8a96e6cf7b3f5d7ae4249f175a3198580e0ecc53ba566eec9c1ad9
+EBUILD uptimed-0.4.1-r1.ebuild 1584 BLAKE2B f6c1c8fe723808c89552e239cb6f56c01c19ae6dd93c270a3509436f4b8be0558c62ce42ac4ad04a576ee24d2948181ad45e4c063866fc110b4e2f3d2484d4c1 SHA512 b760062bd5f221098a5ff4483fee45b8a276abbf5794f88f0108132776bd84b8d49678f645afe8b7bf62c33ec3d60c073cab67c8c624c297f80d93878edc0978
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.0-r1.ebuild b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
index 2fbdfafd16b3..8e4829fd4054 100644
--- a/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit autotools eutils user systemd
+inherit autotools ltprune user systemd
 
 DESCRIPTION="System uptime record daemon that keeps track of your highest uptimes"
 HOMEPAGE="https://github.com/rpodgorny/uptimed/"
@@ -36,15 +36,23 @@ src_install() {
 	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
 	default
 	prune_libtool_files --all
-	keepdir /var/spool/uptimed
-	fowners uptimed:uptimed /var/spool/uptimed
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
 	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 
 pkg_postinst() {
-	einfo "Fixing permissions in /var/spool/${PN}"
-	chown -R uptimed:uptimed /var/spool/${PN}
+	local spooldir="/var/spool/${PN}"
+	if [[ -d "${spooldir}" ]] ; then
+		einfo "Fixing permissions in ${spooldir}"
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs --no-run-if-empty chown uptimed:uptimed || die
+	fi
 	echo
 	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
 	elog "or systemctl start uptimed (for systemd)"
diff --git a/app-misc/uptimed/uptimed-0.4.1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
index 498d1fc64756..4fecae3a38ba 100644
--- a/app-misc/uptimed/uptimed-0.4.1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc ~x86 ~x86-fbsd"
 IUSE="static-libs"
 
 pkg_setup() {
@@ -33,16 +33,24 @@ src_configure() {
 src_install() {
 	local DOCS=( ChangeLog README.md TODO AUTHORS CREDITS INSTALL.cgi sample-cgi/* )
 	default
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-	keepdir /var/spool/uptimed
-	fowners uptimed:uptimed /var/spool/uptimed
+	find "${ED}" -name '*.la' -delete || die
+
+	local spooldir="/var/spool/${PN}"
+	keepdir ${spooldir}
+	fowners uptimed:uptimed ${spooldir}
+
 	newinitd "${FILESDIR}"/${PN}.init-r1 uptimed
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 
 pkg_postinst() {
-	einfo "Fixing permissions in /var/spool/${PN}"
-	chown -R uptimed:uptimed /var/spool/${PN}
+	local spooldir="/var/spool/${PN}"
+	if [[ -d "${spooldir}" ]] ; then
+		einfo "Fixing permissions in ${spooldir}"
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs --no-run-if-empty chown uptimed:uptimed || die
+	fi
 	echo
 	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"
 	elog "or systemctl start uptimed (for systemd)"