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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3A3C615808B for ; Wed, 2 Mar 2022 01:28:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBA00E0830; Wed, 2 Mar 2022 01:28:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1D1EE0830 for ; Wed, 2 Mar 2022 01:28:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C81B93432C0 for ; Wed, 2 Mar 2022 01:28:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BA712F9 for ; Wed, 2 Mar 2022 01:27:59 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1646184469.3793a1633379b402c2fcb7150378a5fc98cb80e1.chutzpah@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: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 3793a1633379b402c2fcb7150378a5fc98cb80e1 X-VCS-Branch: master Date: Wed, 2 Mar 2022 01:27:59 +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: 76d9bb3d-f550-4ee8-ac8a-30f77efd0652 X-Archives-Hash: fc29f0cb8a079730eb2e8292eb005340 commit: 3793a1633379b402c2fcb7150378a5fc98cb80e1 Author: Patrick McLean gentoo org> AuthorDate: Wed Mar 2 01:27:49 2022 +0000 Commit: Patrick McLean gentoo org> CommitDate: Wed Mar 2 01:27:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3793a163 sys-apps/smartmontools: Sync 9999 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Patrick McLean gentoo.org> sys-apps/smartmontools/smartmontools-9999.ebuild | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild index c3e86bfcdb7b..1c0502087af3 100644 --- a/sys-apps/smartmontools/smartmontools-9999.ebuild +++ b/sys-apps/smartmontools/smartmontools-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 inherit autotools flag-o-matic systemd if [[ ${PV} == "9999" ]] ; then @@ -22,13 +22,15 @@ IUSE="caps +daemon selinux static systemd +update-drivedb" DEPEND=" caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) + static? ( sys-libs/libcap-ng:=[static-libs] ) + !static? ( sys-libs/libcap-ng:= ) ) selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} + sys-libs/libselinux:= + ) +" +RDEPEND=" + ${DEPEND} daemon? ( virtual/mailx ) selinux? ( sec-policy/selinux-smartmon ) systemd? ( sys-apps/systemd ) @@ -110,16 +112,16 @@ src_install() { # Make sure we never install drivedb.h into the db location # of the acutal image so we don't record hashes because user # can modify that file - rm -f "${ED%/}${db_path}/drivedb.h" || die + rm -f "${ED}${db_path}/drivedb.h" || die # Bug #622072 - find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die + find "${ED}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die } pkg_postinst() { if use daemon || use update-drivedb; then - local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h" - local db_path="${EROOT}var/db/${PN}" + local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h" + local db_path="${EROOT}/var/db/${PN}" if [[ ! -f "${db_path}/drivedb.h" ]] ; then # No initial database found