From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/smartmontools/
Date: Sat, 7 May 2016 19:02:27 +0000 (UTC) [thread overview]
Message-ID: <1462647740.214e57f5eb11f3f00dd62246cb7b3085e0b958d0.polynomial-c@gentoo> (raw)
commit: 214e57f5eb11f3f00dd62246cb7b3085e0b958d0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 19:02:20 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat May 7 19:02:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=214e57f5
sys-apps/smartmontools: Bump to version 6.5
Synced live ebuild.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/smartmontools/Manifest | 1 +
sys-apps/smartmontools/metadata.xml | 1 +
...ntools-9999.ebuild => smartmontools-6.5.ebuild} | 46 ++++++++++++----------
sys-apps/smartmontools/smartmontools-9999.ebuild | 46 ++++++++++++----------
4 files changed, 54 insertions(+), 40 deletions(-)
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 66f21cd..6ca4e0b 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1 +1,2 @@
DIST smartmontools-6.4.tar.gz 822539 SHA256 eab75600c1eda9c34b13097db71138ab376f3dad8a6a4667fb4d1d081feb7a85 SHA512 366cd55ec668da1ca8a3d9ba79d5bee6e0c59032936b7f2f161f8fbb1c9f869c505d715cc10562b6241f808bb8b534feaf9d9fd752f6cb1593ee893611742adc WHIRLPOOL 72af8a0a4754bd75da9e98a008c64c083579fe27bdbd0655da81c8fe7a258dbc305cafd05f2f21d1954918ab8ff040cf1d54b916a1ce82fb8da64ba2e49b4de0
+DIST smartmontools-6.5.tar.gz 855642 SHA256 89e8bb080130bc6ce148573ba5bb91bfe30236b64b1b5bbca26515d4b5c945bc SHA512 dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3 WHIRLPOOL 639bb5c847c4e0e0f7156b764140f4382f650826eb3d59db6a712468e944a40788c87bbbe0149b9a4d1480947492b007b5875969e611213409f247ff4383fbd6
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index 997fef2..b355588 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/metadata.xml
@@ -7,6 +7,7 @@
</maintainer>
<use>
<flag name="minimal">Do not install the monitoring daemon and associated scripts.</flag>
+ <flag name="update_drivedb">Install a script to update the drivedb file.</flag>
</use>
<upstream>
<remote-id type="sourceforge">smartmontools</remote-id>
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-6.5.ebuild
similarity index 67%
copy from sys-apps/smartmontools/smartmontools-9999.ebuild
copy to sys-apps/smartmontools/smartmontools-6.5.ebuild
index 9b4bce3..ff70dcf 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.5.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://www.smartmontools.org"
LICENSE="GPL-2"
SLOT="0"
-IUSE="caps minimal selinux static"
+IUSE="caps minimal selinux static update_drivedb"
DEPEND="
caps? (
@@ -35,10 +35,6 @@ RDEPEND="${DEPEND}
"
src_prepare() {
- # 580424
- sed '/^SRCEXPR/s@http:@https:@' \
- -i update-smart-drivedb.in \
- || die
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
@@ -56,11 +52,14 @@ src_configure() {
$(use_with caps libcap-ng)
$(use_with selinux)
$(systemd_with_unitdir)
+ $(use_with update_drivedb update-smart-drivedb)
)
econf "${myeconfargs[@]}"
}
src_install() {
+ local db_path="/var/db/${PN}"
+
if use minimal ; then
dosbin smartctl
doman smartctl.8
@@ -68,26 +67,33 @@ src_install() {
default
newinitd "${FILESDIR}"/smartd-r1.rc smartd
newconfd "${FILESDIR}"/smartd.confd smartd
- fi
- # Move drivedb.h file out of PM's sight (bug #575292)
- mv "${ED}"/var/db/${PN}/drivedb.h "${T}" || die
+ keepdir ${db_path}
+ if use update_drivedb ; then
+ # Move drivedb.h file out of PM's sight (bug #575292)
+ mv "${ED}"${db_path}/drivedb.h "${T}" || die
- exeinto /etc/cron.monthly
- doexe "${FILESDIR}"/${PN}-update-drivedb
+ exeinto /etc/cron.monthly
+ doexe "${FILESDIR}"/${PN}-update-drivedb
+ fi
+ fi
}
pkg_postinst() {
- local db_path="/var/db/${PN}"
+ if ! use minimal ; then
+ local db_path="/var/db/${PN}"
- if [[ -f "${db_path}/drivedb.h" ]] ; then
- ewarn "WARNING! The drive database file has been replaced with the version that"
- ewarn "got shipped with this release of ${PN}. You may want to update the"
- ewarn "database by running the following command as root:"
- ewarn ""
- ewarn "/usr/sbin/update-smart-drivedb"
- fi
+ if [[ -f "${db_path}/drivedb.h" ]] ; then
+ ewarn "WARNING! The drive database file has been replaced with the version that"
+ ewarn "got shipped with this release of ${PN}. You may want to update the"
+ ewarn "database by running the following command as root:"
+ ewarn ""
+ ewarn "/usr/sbin/update-smart-drivedb"
+ fi
- # Move drivedb.h to /var/db/${PN} (bug #575292)
- mv "${T}"/drivedb.h ${db_path} || die
+ if use update_drivedb ; then
+ # Move drivedb.h to /var/db/${PN} (bug #575292)
+ mv "${T}"/drivedb.h ${db_path} || die
+ fi
+ fi
}
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 9b4bce3..ff70dcf 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://www.smartmontools.org"
LICENSE="GPL-2"
SLOT="0"
-IUSE="caps minimal selinux static"
+IUSE="caps minimal selinux static update_drivedb"
DEPEND="
caps? (
@@ -35,10 +35,6 @@ RDEPEND="${DEPEND}
"
src_prepare() {
- # 580424
- sed '/^SRCEXPR/s@http:@https:@' \
- -i update-smart-drivedb.in \
- || die
if [[ ${PV} == "9999" ]] ; then
eautoreconf
fi
@@ -56,11 +52,14 @@ src_configure() {
$(use_with caps libcap-ng)
$(use_with selinux)
$(systemd_with_unitdir)
+ $(use_with update_drivedb update-smart-drivedb)
)
econf "${myeconfargs[@]}"
}
src_install() {
+ local db_path="/var/db/${PN}"
+
if use minimal ; then
dosbin smartctl
doman smartctl.8
@@ -68,26 +67,33 @@ src_install() {
default
newinitd "${FILESDIR}"/smartd-r1.rc smartd
newconfd "${FILESDIR}"/smartd.confd smartd
- fi
- # Move drivedb.h file out of PM's sight (bug #575292)
- mv "${ED}"/var/db/${PN}/drivedb.h "${T}" || die
+ keepdir ${db_path}
+ if use update_drivedb ; then
+ # Move drivedb.h file out of PM's sight (bug #575292)
+ mv "${ED}"${db_path}/drivedb.h "${T}" || die
- exeinto /etc/cron.monthly
- doexe "${FILESDIR}"/${PN}-update-drivedb
+ exeinto /etc/cron.monthly
+ doexe "${FILESDIR}"/${PN}-update-drivedb
+ fi
+ fi
}
pkg_postinst() {
- local db_path="/var/db/${PN}"
+ if ! use minimal ; then
+ local db_path="/var/db/${PN}"
- if [[ -f "${db_path}/drivedb.h" ]] ; then
- ewarn "WARNING! The drive database file has been replaced with the version that"
- ewarn "got shipped with this release of ${PN}. You may want to update the"
- ewarn "database by running the following command as root:"
- ewarn ""
- ewarn "/usr/sbin/update-smart-drivedb"
- fi
+ if [[ -f "${db_path}/drivedb.h" ]] ; then
+ ewarn "WARNING! The drive database file has been replaced with the version that"
+ ewarn "got shipped with this release of ${PN}. You may want to update the"
+ ewarn "database by running the following command as root:"
+ ewarn ""
+ ewarn "/usr/sbin/update-smart-drivedb"
+ fi
- # Move drivedb.h to /var/db/${PN} (bug #575292)
- mv "${T}"/drivedb.h ${db_path} || die
+ if use update_drivedb ; then
+ # Move drivedb.h to /var/db/${PN} (bug #575292)
+ mv "${T}"/drivedb.h ${db_path} || die
+ fi
+ fi
}
next reply other threads:[~2016-05-07 19:02 UTC|newest]
Thread overview: 98+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-07 19:02 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-05 22:39 [gentoo-commits] repo/gentoo:master commit in: sys-apps/smartmontools/ Sam James
2025-06-02 2:13 Sam James
2025-06-02 2:13 Sam James
2025-06-02 0:01 Sam James
2025-06-02 0:01 Sam James
2025-06-02 0:01 Sam James
2025-05-01 3:08 Sam James
2025-05-01 3:08 Sam James
2024-04-17 5:37 Arthur Zamarin
2024-03-24 12:12 Sam James
2024-03-24 12:12 Sam James
2024-03-24 11:34 Sam James
2024-03-24 11:34 Sam James
2024-03-24 11:29 Sam James
2024-03-24 11:29 Sam James
2024-03-24 11:29 Sam James
2024-02-19 19:54 Dennis Lamm
2024-01-26 2:09 Ionen Wolkens
2024-01-26 2:09 Ionen Wolkens
2024-01-11 9:38 Sam James
2023-11-25 6:36 Sam James
2023-10-28 19:38 Sam James
2023-10-21 22:48 Sam James
2023-10-21 20:37 Sam James
2023-08-02 13:14 Sam James
2022-05-05 9:51 WANG Xuerui
2022-05-05 9:51 WANG Xuerui
2022-05-04 14:42 Sam James
2022-05-04 5:31 Sam James
2022-05-04 4:26 Sam James
2022-05-04 0:16 Sam James
2022-05-03 19:17 Arthur Zamarin
2022-05-03 19:12 Arthur Zamarin
2022-05-03 18:09 Arthur Zamarin
2022-05-03 6:21 Agostino Sarubbo
2022-05-02 19:03 Sam James
2022-03-02 1:27 Patrick McLean
2022-03-02 1:27 Patrick McLean
2021-11-04 16:27 Sam James
2021-07-22 3:42 Georgy Yakovlev
2021-07-22 3:42 Georgy Yakovlev
2021-05-23 12:14 David Seifert
2021-05-11 15:45 Sergei Trofimovich
2021-05-10 10:54 Sam James
2021-05-10 10:54 Sam James
2021-05-10 6:26 Sam James
2021-05-10 6:26 Sam James
2021-05-10 6:26 Sam James
2021-05-10 6:26 Sam James
2021-01-25 13:59 Ben Kohler
2021-01-02 20:24 Lars Wendler
2021-01-02 20:24 Lars Wendler
2021-01-02 20:24 Lars Wendler
2020-10-06 15:41 Sam James
2020-09-18 10:44 Lars Wendler
2020-09-13 10:50 Sergei Trofimovich
2020-09-07 8:47 Sergei Trofimovich
2020-08-29 23:57 Sam James
2020-08-23 11:37 David Seifert
2020-08-18 11:16 Agostino Sarubbo
2020-08-15 7:31 Sergei Trofimovich
2020-08-15 6:05 Sam James
2020-05-06 17:25 Michał Górny
2020-02-08 16:53 David Seifert
2019-12-31 15:47 Lars Wendler
2019-05-02 21:32 Mikle Kolyada
2019-04-27 16:03 Sergei Trofimovich
2019-04-14 16:18 Mikle Kolyada
2019-04-08 22:07 Sergei Trofimovich
2019-04-08 15:36 Mikle Kolyada
2019-04-08 2:18 Thomas Deutschmann
2019-04-07 21:01 Sergei Trofimovich
2019-04-01 16:04 Lars Wendler
2018-12-31 10:39 Lars Wendler
2018-12-31 10:39 Lars Wendler
2018-12-31 10:39 Lars Wendler
2018-03-03 13:12 Tobias Klausmann
2018-01-10 6:19 Markus Meier
2018-01-07 23:40 Mikle Kolyada
2018-01-06 14:25 Sergei Trofimovich
2018-01-03 9:04 Sergei Trofimovich
2018-01-02 19:54 Sergei Trofimovich
2017-11-06 10:44 Lars Wendler
2017-11-06 10:44 Lars Wendler
2017-11-06 10:44 Lars Wendler
2017-10-31 21:55 Thomas Deutschmann
2017-02-14 21:31 Robin H. Johnson
2017-01-27 22:12 Robin H. Johnson
2016-10-30 20:05 Sven Wegener
2016-07-03 0:56 Zac Medico
2016-04-19 6:02 Lars Wendler
2016-04-18 17:25 Lars Wendler
2016-04-18 13:56 Lars Wendler
2015-09-07 5:34 Jeroen Roovers
2015-08-21 16:42 Markus Meier
2015-08-18 4:32 Jeroen Roovers
2015-08-16 20:43 Mikle Kolyada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462647740.214e57f5eb11f3f00dd62246cb7b3085e0b958d0.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox