From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 451CC13824A for ; Sat, 7 May 2016 19:02:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40232E07D4; Sat, 7 May 2016 19:02:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CFCFEE07D4 for ; Sat, 7 May 2016 19:02:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3EBDA340756 for ; Sat, 7 May 2016 19:02:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E0CE327 for ; Sat, 7 May 2016 19:02:27 +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: <1462647740.214e57f5eb11f3f00dd62246cb7b3085e0b958d0.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/Manifest sys-apps/smartmontools/metadata.xml sys-apps/smartmontools/smartmontools-6.5.ebuild 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: 214e57f5eb11f3f00dd62246cb7b3085e0b958d0 X-VCS-Branch: master Date: Sat, 7 May 2016 19:02:27 +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-Archives-Salt: aa5e7217-0826-4490-b291-c782b49daff6 X-Archives-Hash: cad7522738b2aab3f0997055cb29f275 commit: 214e57f5eb11f3f00dd62246cb7b3085e0b958d0 Author: Lars Wendler gentoo org> AuthorDate: Sat May 7 19:02:20 2016 +0000 Commit: Lars Wendler gentoo 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 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 @@ Do not install the monitoring daemon and associated scripts. + Install a script to update the drivedb file. smartmontools 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 }