gentoo resync : 10.11.2019

4 files changed, 42 insertions, 15 deletions

diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index f4bf2f7d347f..eaaa2b105647 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -3,12 +3,13 @@ AUX ntpd-r1.service 597 BLAKE2B a1185493452a57f3b7b8c506bedecca93dc7e92b7ce6a817
 AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542
 AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31
 AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9
+AUX ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch 736 BLAKE2B 63188a7fc1350b1ba4230f9d5080f81f703bd8bbb1fd59c1d79610fd0a650ee47c5f0679fa7679bc12daddfb7d12727b95099c46ede7d7b11718c16fbc225b5b SHA512 74807a33b59be2d65421b8a8bd1f83ec2861066740f8ede07e3424316f23528c4d23cd3850b04721f11af755163edf5217e4bf8b7005c915209ac703694e40d8
 AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
 DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
 DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 EBUILD ntpsec-1.1.4.ebuild 4130 BLAKE2B c14e7e7d1bf4d4f840b9e555cfe13b967824901ce1b5dc021be0fb9d0cdb53a358e1e73037bab9e251400238d99a9f2fac69c48232df2d8c49bf105927b363c5 SHA512 a40332b0d7621e905099dbffe43e336a8b32e842d888c15eac07e87de9bc89cedf23eef2e04681704a8011b84965b9a6c294eba7dfb5df5b10883b973e322984
 EBUILD ntpsec-1.1.6.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
-EBUILD ntpsec-1.1.7-r1.ebuild 4125 BLAKE2B 24648c76c7fe5e49b49ffcef95064f1b8f127b8471d29d6c25e581bb33f9d6ef7421455d4499d057419b7d5c57419c3feb6c69b9626729b8ed6f08abbf826311 SHA512 0d6e3f1163c696992add8430c316ee4398018115b4d18238f1266dd0c852fb649de317e5518ae0d0a31f13375e87976f82d7478529baf5ce811c656981d6007c
-EBUILD ntpsec-9999.ebuild 4091 BLAKE2B d776a2bdd01b332e0946b36a2958af3a75fecf452017a8dbc109b929f8ee5d42974f9ca147f4030dbe7dc11a7b4c1d3122e35b5cde75a247e02f0b0bfc5ce139 SHA512 b1ee562a25162b9dc7a753fe2fede321973e50ec6d1e623d9949917b120b8c05d6915443796128537149a8da3bf78d041e7ad551b7329132cbe34d6b09897d9e
+EBUILD ntpsec-1.1.7-r1.ebuild 4186 BLAKE2B b22105dd6337ff4fcb36d441bec8db8f750c4fc8faf3b1ea9a043535ef5a6b200d55a99101dd310d4223e82fd2ef0902036e85c64a648ab5af5c752e2b3a98a6 SHA512 8e2094a6a796e50d516f9fda942977d00262fb14d7f2134e6b1909faf86bdb2dfe67d8540a52cb5faa027dfab5d940da9457929856ca3e59cf0ff1e35bfead01
+EBUILD ntpsec-9999.ebuild 4113 BLAKE2B a8f7d26adaa2518397851b8d35119a767d24cebfdb5dd6f52a0b6af01c285a9771b15a2ae3770738f2d98ce529dc7713baf0af06732bef1bc9192ccb96b98ae2 SHA512 f0a31da90aa4b3fdd76250bcf17953691e50fbf4c05d0f5fa42c5c95c51e20fc48315e4d61298fee3a9a8615f3193ca4edf88384b92fa54416c017738b01c120
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/files/ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch b/net-misc/ntpsec/files/ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch
new file mode 100644
index 000000000000..4556d7a50f7d
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-1.1.7-make-sure-logrotate-config-has-missingok.patch
@@ -0,0 +1,28 @@
+From 252a301aba9a685b5b6df7824c576f52cc19fb81 Mon Sep 17 00:00:00 2001
+From: Stephen Arnold <nerdboy@gentoo.org>
+Date: Fri, 8 Nov 2019 16:41:16 -0800
+Subject: [PATCH] etc/logrotate-config.ntpd: make sure it has missingok
+
+* note master branch does not need this, but all the releases do
+
+Signed-off-by: Stephen Arnold <nerdboy@gentoo.org>
+---
+ etc/logrotate-config.ntpd | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/etc/logrotate-config.ntpd b/etc/logrotate-config.ntpd
+index e5d8616bf..a49129d45 100644
+--- a/etc/logrotate-config.ntpd
++++ b/etc/logrotate-config.ntpd
+@@ -5,6 +5,8 @@
+ 
+ /var/log/ntpd.log {
+     monthly
++    notifempty
++    missingok
+     postrotate
+       /usr/bin/killall -HUP ntpd
+     endscript
+-- 
+2.21.0
+
diff --git a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
index 1ef2fda749d3..984a26200b85 100644
--- a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
@@ -6,13 +6,13 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit flag-o-matic python-r1 waf-utils systemd user
+inherit flag-o-matic python-r1 waf-utils systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 	BDEPEND=""
-	KEYWORDS="amd64"
+	KEYWORDS=""
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
@@ -48,6 +48,8 @@ RDEPEND="${CDEPEND}
 	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
 	!net-misc/ntp
 	!net-misc/openntpd
+	acct-group/ntp
+	acct-user/ntp
 "
 DEPEND="${CDEPEND}
 	app-text/asciidoc
@@ -60,15 +62,11 @@ DEPEND="${CDEPEND}
 
 WAF_BINARY="${S}/waf"
 
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
 src_prepare() {
 	default
 	# Remove autostripping of binaries
 	sed -i -e '/Strip binaries/d' wscript
+	eapply "${FILESDIR}/${P}"-make-sure-logrotate-config-has-missingok.patch
 	if ! use libbsd ; then
 		epatch "${FILESDIR}/${PN}-no-bsd.patch"
 	fi
@@ -123,6 +121,7 @@ src_install() {
 		waf-utils_src_install
 	}
 	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl python_optimize
 
 	# Install heat generating scripts
 	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 050f701b387d..0d9f22dc3aa8 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE='threads(+)'
 
-inherit flag-o-matic python-r1 waf-utils systemd user
+inherit flag-o-matic python-r1 waf-utils systemd
 
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
@@ -48,6 +48,8 @@ RDEPEND="${CDEPEND}
 	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
 	!net-misc/ntp
 	!net-misc/openntpd
+	acct-group/ntp
+	acct-user/ntp
 "
 DEPEND="${CDEPEND}
 	app-text/asciidoc
@@ -60,11 +62,6 @@ DEPEND="${CDEPEND}
 
 WAF_BINARY="${S}/waf"
 
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
 src_prepare() {
 	default
 	# Remove autostripping of binaries
@@ -93,6 +90,7 @@ src_configure() {
 		--nopyc
 		--nopyo
 		--refclock="${CLOCKSTRING}"
+		--build-epoch="$(date +%s)"
 		$(use doc	&& echo "--enable-doc")
 		$(use early	&& echo "--enable-early-droproot")
 		$(use gdb	&& echo "--enable-debug-gdb")
@@ -122,6 +120,7 @@ src_install() {
 		waf-utils_src_install
 	}
 	python_foreach_impl run_in_build_dir python_install
+	python_foreach_impl python_optimize
 
 	# Install heat generating scripts
 	use heat && dosbin "${S}"/contrib/ntpheat{,usb}