1 |
commit: 13dea100afcf22cfc9ad063b302c0f293aa0490a |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 2 20:24:23 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 2 20:24:40 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13dea100 |
7 |
|
8 |
sys-apps/smartmontools: Revbump fixing QA issue |
9 |
|
10 |
Closes: https://bugs.gentoo.org/695108 |
11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
sys-apps/smartmontools/metadata.xml | 1 - |
15 |
...ntools-7.1.ebuild => smartmontools-7.1-r1.ebuild} | 20 ++++++++++---------- |
16 |
2 files changed, 10 insertions(+), 11 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml |
19 |
index 9ac33efa0d5..4ee89aff231 100644 |
20 |
--- a/sys-apps/smartmontools/metadata.xml |
21 |
+++ b/sys-apps/smartmontools/metadata.xml |
22 |
@@ -8,7 +8,6 @@ |
23 |
<use> |
24 |
<flag name="caps">Build against <pkg>sys-libs/libcap-ng</pkg> to allow smartd to drop its privileges.</flag> |
25 |
<flag name="daemon">Install the monitoring daemon (smartd) and associated scripts.</flag> |
26 |
- <flag name="update_drivedb">Install a script to update the drivedb file.</flag> |
27 |
<flag name="update-drivedb">Install a script to update the drivedb file.</flag> |
28 |
</use> |
29 |
<upstream> |
30 |
|
31 |
diff --git a/sys-apps/smartmontools/smartmontools-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild |
32 |
similarity index 90% |
33 |
rename from sys-apps/smartmontools/smartmontools-7.1.ebuild |
34 |
rename to sys-apps/smartmontools/smartmontools-7.1-r1.ebuild |
35 |
index 0b1811bc1f8..158bfd6444f 100644 |
36 |
--- a/sys-apps/smartmontools/smartmontools-7.1.ebuild |
37 |
+++ b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild |
38 |
@@ -1,4 +1,4 @@ |
39 |
-# Copyright 1999-2020 Gentoo Authors |
40 |
+# Copyright 1999-2021 Gentoo Authors |
41 |
# Distributed under the terms of the GNU General Public License v2 |
42 |
|
43 |
EAPI="6" |
44 |
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.smartmontools.org" |
45 |
|
46 |
LICENSE="GPL-2" |
47 |
SLOT="0" |
48 |
-IUSE="caps +daemon selinux static systemd update_drivedb" |
49 |
+IUSE="caps +daemon selinux static systemd update-drivedb" |
50 |
|
51 |
DEPEND=" |
52 |
caps? ( |
53 |
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND} |
54 |
daemon? ( virtual/mailx ) |
55 |
selinux? ( sec-policy/selinux-smartmon ) |
56 |
systemd? ( sys-apps/systemd ) |
57 |
- update_drivedb? ( |
58 |
+ update-drivedb? ( |
59 |
app-crypt/gnupg |
60 |
|| ( |
61 |
net-misc/curl |
62 |
@@ -61,8 +61,8 @@ src_configure() { |
63 |
$(use_with caps libcap-ng) |
64 |
$(use_with selinux) |
65 |
$(use_with systemd libsystemd) |
66 |
- $(use_with update_drivedb gnupg) |
67 |
- $(use_with update_drivedb update-smart-drivedb) |
68 |
+ $(use_with update-drivedb gnupg) |
69 |
+ $(use_with update-drivedb update-smart-drivedb) |
70 |
$(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '') |
71 |
) |
72 |
econf "${myeconfargs[@]}" |
73 |
@@ -84,7 +84,7 @@ src_install() { |
74 |
einstalldocs |
75 |
fi |
76 |
|
77 |
- if use update_drivedb ; then |
78 |
+ if use update-drivedb ; then |
79 |
if ! use daemon; then |
80 |
dosbin "${S}"/update-smart-drivedb |
81 |
fi |
82 |
@@ -93,7 +93,7 @@ src_install() { |
83 |
doexe "${FILESDIR}/${PN}-update-drivedb" |
84 |
fi |
85 |
|
86 |
- if use daemon || use update_drivedb; then |
87 |
+ if use daemon || use update-drivedb; then |
88 |
keepdir "${db_path}" |
89 |
|
90 |
# Install a copy of the initial drivedb.h to /usr/share/${PN} |
91 |
@@ -113,7 +113,7 @@ src_install() { |
92 |
} |
93 |
|
94 |
pkg_postinst() { |
95 |
- if use daemon || use update_drivedb; then |
96 |
+ if use daemon || use update-drivedb; then |
97 |
local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h" |
98 |
local db_path="${EROOT}/var/db/${PN}" |
99 |
|
100 |
@@ -137,10 +137,10 @@ pkg_postinst() { |
101 |
ewarn "" |
102 |
ewarn " /usr/sbin/update-smart-drivedb" |
103 |
|
104 |
- if ! use update_drivedb ; then |
105 |
+ if ! use update-drivedb ; then |
106 |
ewarn "" |
107 |
ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}" |
108 |
- ewarn "with USE='update_drivedb'." |
109 |
+ ewarn "with USE='update-drivedb'." |
110 |
fi |
111 |
fi |
112 |
fi |