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 5F6CE1382C5 for ; Sat, 2 Jan 2021 20:24:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8343BE083D; Sat, 2 Jan 2021 20:24:48 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 62BD1E083D for ; Sat, 2 Jan 2021 20:24:48 +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 568FC340D59 for ; Sat, 2 Jan 2021 20:24:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDC283FB for ; Sat, 2 Jan 2021 20:24:45 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1609619079.960be4798ed78136a30e38f0087c4cefdc22801c.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/smartmontools/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/smartmontools/smartmontools-9999.ebuild X-VCS-Directories: sys-apps/smartmontools/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 960be4798ed78136a30e38f0087c4cefdc22801c X-VCS-Branch: master Date: Sat, 2 Jan 2021 20:24:45 +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: 46aa2db0-5b4b-4cd5-8395-00e5e981c985 X-Archives-Hash: 66b37c4c76183dfb081673b71c637f61 commit: 960be4798ed78136a30e38f0087c4cefdc22801c Author: Lars Wendler gentoo org> AuthorDate: Sat Jan 2 20:21:25 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Jan 2 20:24:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960be479 sys-apps/smartmontools: Synced live ebuild Bug: https://bugs.gentoo.org/695108 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-apps/smartmontools/smartmontools-9999.ebuild | 26 ++++++++++++++---------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild index 9c4544209c1..bcbd184c16d 100644 --- a/sys-apps/smartmontools/smartmontools-9999.ebuild +++ b/sys-apps/smartmontools/smartmontools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -18,7 +18,7 @@ HOMEPAGE="https://www.smartmontools.org" LICENSE="GPL-2" SLOT="0" -IUSE="caps +daemon selinux static systemd update_drivedb" +IUSE="caps +daemon selinux static systemd +update-drivedb" DEPEND=" caps? ( @@ -32,7 +32,7 @@ RDEPEND="${DEPEND} daemon? ( virtual/mailx ) selinux? ( sec-policy/selinux-smartmon ) systemd? ( sys-apps/systemd ) - update_drivedb? ( + update-drivedb? ( app-crypt/gnupg || ( net-misc/curl @@ -43,7 +43,10 @@ RDEPEND="${DEPEND} ) " -REQUIRED_USE="( caps? ( daemon ) )" +REQUIRED_USE="( + caps? ( daemon ) + static? ( !systemd ) +)" src_prepare() { default @@ -61,8 +64,8 @@ src_configure() { $(use_with caps libcap-ng) $(use_with selinux) $(use_with systemd libsystemd) - $(use_with update_drivedb gnupg) - $(use_with update_drivedb update-smart-drivedb) + $(use_with update-drivedb gnupg) + $(use_with update-drivedb update-smart-drivedb) $(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '') ) econf "${myeconfargs[@]}" @@ -70,6 +73,7 @@ src_configure() { src_install() { local db_path="/var/db/${PN}" + insopts -m0644 -p # preserve timestamps if use daemon; then default @@ -84,7 +88,7 @@ src_install() { einstalldocs fi - if use update_drivedb ; then + if use update-drivedb ; then if ! use daemon; then dosbin "${S}"/update-smart-drivedb fi @@ -93,7 +97,7 @@ src_install() { doexe "${FILESDIR}/${PN}-update-drivedb" fi - if use daemon || use update_drivedb; then + if use daemon || use update-drivedb; then keepdir "${db_path}" # Install a copy of the initial drivedb.h to /usr/share/${PN} @@ -113,7 +117,7 @@ src_install() { } pkg_postinst() { - if use daemon || use update_drivedb; then + if use daemon || use update-drivedb; then local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h" local db_path="${EROOT}/var/db/${PN}" @@ -137,10 +141,10 @@ pkg_postinst() { ewarn "" ewarn " /usr/sbin/update-smart-drivedb" - if ! use update_drivedb ; then + if ! use update-drivedb ; then ewarn "" ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}" - ewarn "with USE='update_drivedb'." + ewarn "with USE='update-drivedb'." fi fi fi