From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E19713997D for ; Sun, 10 Nov 2019 11:15:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8D854E082D; Sun, 10 Nov 2019 11:15:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4F5DE0784 for ; Sun, 10 Nov 2019 11:15:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A9D2734CD53 for ; Sun, 10 Nov 2019 03:40:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4228779 for ; Sun, 10 Nov 2019 03:40:49 +0000 (UTC) From: "Steve Arnold" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Steve Arnold" Message-ID: <1573357238.9d14e57c67797ad976bd6c5f45756c93c87dc92c.nerdboy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild net-misc/ntpsec/ntpsec-9999.ebuild X-VCS-Directories: net-misc/ntpsec/ X-VCS-Committer: nerdboy X-VCS-Committer-Name: Steve Arnold X-VCS-Revision: 9d14e57c67797ad976bd6c5f45756c93c87dc92c X-VCS-Branch: master Date: Sun, 10 Nov 2019 03:40:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e36eb0f-e67b-4d63-84c3-2c23891b8dc8 X-Archives-Hash: 402c63f29209bc041c3425dbd4ffb349 commit: 9d14e57c67797ad976bd6c5f45756c93c87dc92c Author: Stephen Arnold gentoo org> AuthorDate: Sun Nov 10 03:39:27 2019 +0000 Commit: Steve Arnold gentoo org> CommitDate: Sun Nov 10 03:40:38 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d14e57c net-misc/ntpsec: fix logrotate, inherit user, QA issues (really) * fixes bug 697948 (use acct-group/acct-user) * fixes bug 698042 (logrotate) * fixes some QA issues from bug 695088 but leaves clock flags (for now) * does not address in-progress bugs or pre-1.1.7 Package-Manager: Portage-2.3.67, Repoman-2.3.17 Signed-off-by: Steve Arnold gentoo.org> net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild | 13 ++++++------- net-misc/ntpsec/ntpsec-9999.ebuild | 11 +++++------ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild index 1ef2fda749d..984a26200b8 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 050f701b387..0d9f22dc3aa 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}