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 A28D713835A for ; Sat, 22 May 2021 17:20:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4F08E0843; Sat, 22 May 2021 17:20:25 +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 8D097E0843 for ; Sat, 22 May 2021 17:20:25 +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 3B47C340CA2 for ; Sat, 22 May 2021 17:20:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA74B78F for ; Sat, 22 May 2021 17:20:22 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1621704006.5830639f50629bd01a8c96416dc6a31e7beae497.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/logrotate/logrotate-3.18.1.ebuild X-VCS-Directories: app-admin/logrotate/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 5830639f50629bd01a8c96416dc6a31e7beae497 X-VCS-Branch: master Date: Sat, 22 May 2021 17:20:22 +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: da55ee43-f0f0-4db0-8355-4b1c54500229 X-Archives-Hash: bb4e57eea5cd1ed46a15cb7c61d342e1 commit: 5830639f50629bd01a8c96416dc6a31e7beae497 Author: Sam James gentoo org> AuthorDate: Sat May 22 17:20:06 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sat May 22 17:20:06 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5830639f app-admin/logrotate: tidy up Signed-off-by: Sam James gentoo.org> Signed-off-by: David Seifert gentoo.org> app-admin/logrotate/logrotate-3.18.1.ebuild | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/app-admin/logrotate/logrotate-3.18.1.ebuild b/app-admin/logrotate/logrotate-3.18.1.ebuild index ddc0d62508b..d49a3017aab 100644 --- a/app-admin/logrotate/logrotate-3.18.1.ebuild +++ b/app-admin/logrotate/logrotate-3.18.1.ebuild @@ -14,20 +14,16 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE="acl +cron selinux" -COMMON_DEPEND=" +DEPEND=" >=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl )" - -DEPEND="${COMMON_DEPEND} - >=sys-apps/sed-4" - -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron )" -STATEFILE="/var/lib/misc/logrotate.status" -OLDSTATEFILE="/var/lib/logrotate.status" +STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status" +OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status" move_old_state_file() { elog "logrotate state file is now located at ${STATEFILE}" @@ -48,15 +44,15 @@ PATCHES=( ) src_prepare() { - sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' "${S}"/examples/logrotate.{cron,service} || die + sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die default } src_configure() { econf \ - $(use_with acl) \ - $(use_with selinux) \ - --with-state-file-path="${STATEFILE}" + $(use_with acl) \ + $(use_with selinux) \ + --with-state-file-path="${STATEFILE}" } src_test() { @@ -64,7 +60,6 @@ src_test() { } src_install() { - insinto /usr dobin logrotate doman logrotate.8 dodoc ChangeLog.md @@ -75,7 +70,7 @@ src_install() { use cron && install_cron_file systemd_dounit examples/logrotate.{service,timer} - newtmpfiles "${FILESDIR}/${PN}.tmpfiles" "${PN}".conf + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf keepdir /etc/logrotate.d } @@ -85,11 +80,14 @@ pkg_postinst() { 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"