Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/smartmontools/
Date: Wed, 02 Mar 2022 01:28:03
Message-Id: 1646184469.3793a1633379b402c2fcb7150378a5fc98cb80e1.chutzpah@gentoo
1 commit: 3793a1633379b402c2fcb7150378a5fc98cb80e1
2 Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 2 01:27:49 2022 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 2 01:27:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3793a163
7
8 sys-apps/smartmontools: Sync 9999
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
12
13 sys-apps/smartmontools/smartmontools-9999.ebuild | 24 +++++++++++++-----------
14 1 file changed, 13 insertions(+), 11 deletions(-)
15
16 diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
17 index c3e86bfcdb7b..1c0502087af3 100644
18 --- a/sys-apps/smartmontools/smartmontools-9999.ebuild
19 +++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
20 @@ -1,7 +1,7 @@
21 -# Copyright 1999-2021 Gentoo Authors
22 +# Copyright 1999-2022 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI="6"
26 +EAPI=7
27
28 inherit autotools flag-o-matic systemd
29 if [[ ${PV} == "9999" ]] ; then
30 @@ -22,13 +22,15 @@ IUSE="caps +daemon selinux static systemd +update-drivedb"
31
32 DEPEND="
33 caps? (
34 - static? ( sys-libs/libcap-ng[static-libs] )
35 - !static? ( sys-libs/libcap-ng )
36 + static? ( sys-libs/libcap-ng:=[static-libs] )
37 + !static? ( sys-libs/libcap-ng:= )
38 )
39 selinux? (
40 - sys-libs/libselinux
41 - )"
42 -RDEPEND="${DEPEND}
43 + sys-libs/libselinux:=
44 + )
45 +"
46 +RDEPEND="
47 + ${DEPEND}
48 daemon? ( virtual/mailx )
49 selinux? ( sec-policy/selinux-smartmon )
50 systemd? ( sys-apps/systemd )
51 @@ -110,16 +112,16 @@ src_install() {
52 # Make sure we never install drivedb.h into the db location
53 # of the acutal image so we don't record hashes because user
54 # can modify that file
55 - rm -f "${ED%/}${db_path}/drivedb.h" || die
56 + rm -f "${ED}${db_path}/drivedb.h" || die
57
58 # Bug #622072
59 - find "${ED%/}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
60 + find "${ED}"/usr/share/doc -type f -exec chmod a-x '{}' \; || die
61 }
62
63 pkg_postinst() {
64 if use daemon || use update-drivedb; then
65 - local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h"
66 - local db_path="${EROOT}var/db/${PN}"
67 + local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
68 + local db_path="${EROOT}/var/db/${PN}"
69
70 if [[ ! -f "${db_path}/drivedb.h" ]] ; then
71 # No initial database found