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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27DD1138336 for ; Mon, 31 Dec 2018 10:39:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52D0AE0BD3; Mon, 31 Dec 2018 10:39:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FE4CE0BD3 for ; Mon, 31 Dec 2018 10:39:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 988C8335CCB for ; Mon, 31 Dec 2018 10:39:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B19684FF for ; Mon, 31 Dec 2018 10:39:13 +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: <1546252747.2f540901e9e8fed3c4e544ca5c0107a51cf192e9.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.4-r1.ebuild sys-apps/smartmontools/smartmontools-6.4.ebuild sys-apps/smartmontools/smartmontools-6.5-r1.ebuild X-VCS-Directories: sys-apps/smartmontools/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 2f540901e9e8fed3c4e544ca5c0107a51cf192e9 X-VCS-Branch: master Date: Mon, 31 Dec 2018 10:39:13 +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: 49ccf590-9bc0-43e3-9e28-c0f7accd9c49 X-Archives-Hash: d38e8f2833371af09b7dcf2c52b3d448 commit: 2f540901e9e8fed3c4e544ca5c0107a51cf192e9 Author: Lars Wendler gentoo org> AuthorDate: Mon Dec 31 10:38:50 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 31 10:39:07 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f540901 sys-apps/smartmontools: Removed old. Package-Manager: Portage-2.3.53, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-apps/smartmontools/Manifest | 2 - sys-apps/smartmontools/metadata.xml | 1 - sys-apps/smartmontools/smartmontools-6.4-r1.ebuild | 97 -------------- sys-apps/smartmontools/smartmontools-6.4.ebuild | 65 --------- sys-apps/smartmontools/smartmontools-6.5-r1.ebuild | 148 --------------------- 5 files changed, 313 deletions(-) diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest index 4637fa2c24a..a076447dcc8 100644 --- a/sys-apps/smartmontools/Manifest +++ b/sys-apps/smartmontools/Manifest @@ -1,4 +1,2 @@ -DIST smartmontools-6.4.tar.gz 822539 BLAKE2B be76ec24cf24b2388a77758a1df5b5b9b19bd455dda26df6c13184051a51feeb0baf164265fcfe15b1d2ac41767d546109dea53cd7ac290d02f6e03b44da454f SHA512 366cd55ec668da1ca8a3d9ba79d5bee6e0c59032936b7f2f161f8fbb1c9f869c505d715cc10562b6241f808bb8b534feaf9d9fd752f6cb1593ee893611742adc -DIST smartmontools-6.5.tar.gz 855642 BLAKE2B 25f78de8fd58497cf052e75aef746c15af8d56d2694007c1d6e2f8e31cae3b517babfc52ef73d3ae4bc5104a49e4bac16a48f23f3b3145228997bef0aad823dd SHA512 dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3 DIST smartmontools-6.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd434673df6a17e4527d160f06a5a8762e6ae490fc5ed13a33f819ba23c1924b49dd13620f4a51e6a40dac20a217523 SHA512 64bb533dac29f62ddd662a16a12c97df1af9cbac9ac526ce7af0b3bff9da49cf265a2030d91a7160452b56a67e80d7f34c9b4e45bbb320114f55695e2cb5cfaf DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512 diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml index 0ae4667bf8d..cb72f5108e4 100644 --- a/sys-apps/smartmontools/metadata.xml +++ b/sys-apps/smartmontools/metadata.xml @@ -8,7 +8,6 @@ Build against sys-libs/libcap-ng to allow smartd to drop its privileges. Install the monitoring daemon (smartd) and associated scripts. - Do not install the monitoring daemon and associated scripts. Install a script to update the drivedb file. diff --git a/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild b/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild deleted file mode 100644 index c5512a3aad9..00000000000 --- a/sys-apps/smartmontools/smartmontools-6.4-r1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit flag-o-matic systemd -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools" - ESVN_PROJECT="smartmontools" - inherit subversion autotools -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -fi - -DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" -HOMEPAGE="https://www.smartmontools.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps minimal selinux static" - -DEPEND=" - caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) - ) - selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} - !minimal? ( virtual/mailx ) - selinux? ( sec-policy/selinux-smartmon ) -" - -src_prepare() { - # 580424 - sed '/^SRCEXPR/s@http:@https:@' \ - -i update-smart-drivedb.in \ - || die - if [[ ${PV} == "9999" ]] ; then - eautoreconf - fi -} - -src_configure() { - use minimal && einfo "Skipping the monitoring daemon for minimal build." - use static && append-ldflags -static - # The build installs /etc/init.d/smartd, but we clobber it - # in our src_install, so no need to manually delete it. - myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --with-drivedbdir=/var/db/${PN} #575292 - --with-initscriptdir="${EPREFIX}/etc/init.d" - $(use_with caps libcap-ng) - $(use_with selinux) - $(systemd_with_unitdir) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local db_path="/var/db/${PN}" - - if use minimal ; then - dosbin smartctl - doman smartctl.8 - else - default - newinitd "${FILESDIR}"/smartd-r1.rc smartd - newconfd "${FILESDIR}"/smartd.confd smartd - - # Move drivedb.h file out of PM's sight (bug #575292) - mv "${ED}${db_path}/drivedb.h" "${T}" || die - keepdir "${db_path}" - - exeinto /etc/cron.monthly - doexe "${FILESDIR}"/${PN}-update-drivedb - fi -} - -pkg_postinst() { - if ! use minimal ; then - local db_path="/var/db/${PN}" - - if [[ -f "${db_path}/drivedb.h" ]] ; then - ewarn "WARNING! The existing copy of the drive database has been replaced with the version that" - ewarn "was 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 - fi -} diff --git a/sys-apps/smartmontools/smartmontools-6.4.ebuild b/sys-apps/smartmontools/smartmontools-6.4.ebuild deleted file mode 100644 index c3613455e26..00000000000 --- a/sys-apps/smartmontools/smartmontools-6.4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit flag-o-matic systemd -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools" - ESVN_PROJECT="smartmontools" - inherit subversion autotools -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -fi - -DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" -HOMEPAGE="https://www.smartmontools.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps minimal selinux static" - -DEPEND=" - caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) - ) - selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} - !minimal? ( virtual/mailx ) - selinux? ( sec-policy/selinux-smartmon ) -" - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - #./autogen.sh - eautoreconf - fi -} - -src_configure() { - use minimal && einfo "Skipping the monitoring daemon for minimal build." - use static && append-ldflags -static - # The build installs /etc/init.d/smartd, but we clobber it - # in our src_install, so no need to manually delete it. - econf \ - --docdir="${EPREFIX}/usr/share/doc/${PF}" \ - --with-initscriptdir="${EPREFIX}/etc/init.d" \ - $(use_with caps libcap-ng) \ - $(use_with selinux) \ - $(systemd_with_unitdir) -} - -src_install() { - if use minimal ; then - dosbin smartctl - doman smartctl.8 - else - default - newinitd "${FILESDIR}"/smartd-r1.rc smartd - newconfd "${FILESDIR}"/smartd.confd smartd - fi -} diff --git a/sys-apps/smartmontools/smartmontools-6.5-r1.ebuild b/sys-apps/smartmontools/smartmontools-6.5-r1.ebuild deleted file mode 100644 index 499d2ebabc7..00000000000 --- a/sys-apps/smartmontools/smartmontools-6.5-r1.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools flag-o-matic systemd -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="https://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools" - ESVN_PROJECT="smartmontools" - inherit subversion -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" -fi - -DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation" -HOMEPAGE="https://www.smartmontools.org" - -LICENSE="GPL-2" -SLOT="0" -IUSE="caps +daemon selinux static update_drivedb" - -DEPEND=" - caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) - ) - kernel_FreeBSD? ( - sys-freebsd/freebsd-lib[usb] - ) - selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} - daemon? ( virtual/mailx ) - selinux? ( sec-policy/selinux-smartmon ) - update_drivedb? ( - || ( - net-misc/curl - net-misc/wget - www-client/lynx - dev-vcs/subversion - ) - ) -" - -REQUIRED_USE="( caps? ( daemon ) )" - -src_prepare() { - default - - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - # The build installs /etc/init.d/smartd, but we clobber it - # in our src_install, so no need to manually delete it. - myeconfargs=( - --docdir="${EPREFIX}/usr/share/doc/${PF}" - --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 - --with-initscriptdir="${EPREFIX}/etc/init.d" - $(use_with caps libcap-ng) - $(use_with selinux) - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_with update_drivedb update-smart-drivedb) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local db_path="/var/db/${PN}" - - if use daemon; then - default - - newinitd "${FILESDIR}"/smartd-r1.rc smartd - newconfd "${FILESDIR}"/smartd.confd smartd - systemd_newunit "${FILESDIR}"/smartd.systemd smartd.service - else - dosbin smartctl - doman smartctl.8 - - local DOCS=( AUTHORS ChangeL* COPYING INSTALL NEWS README TODO ) - einstalldocs - fi - - if use update_drivedb ; then - if ! use daemon; then - dosbin "${S}"/update-smart-drivedb - fi - - exeinto /etc/cron.monthly - doexe "${FILESDIR}/${PN}-update-drivedb" - fi - - if use daemon || use update_drivedb; then - keepdir "${db_path}" - - # Install a copy of the initial drivedb.h to /usr/share/${PN} - # so that we can access that file later in pkg_postinst - # even when dealing with binary packages (bug #575292) - insinto /usr/share/${PN} - doins "${S}"/drivedb.h - fi - - # 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 - - # Bug #622072 - 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="${EPREFIX%/}/usr/share/${PN}/drivedb.h" - local db_path="${EPREFIX%/}/var/db/${PN}" - - if [[ ! -f "${db_path}/drivedb.h" ]] ; then - # No initial database found - cp "${initial_db_file}" "${db_path}" || die - einfo "Default drive database which was shipped with this release of ${PN}" - einfo "has been installed to '${db_path}'." - else - ewarn "WARNING: There's already a drive database in '${db_path}'!" - ewarn "Because we cannot determine if this database is untouched" - ewarn "or was modified by the user you have to manually update the" - ewarn "drive database:" - ewarn "" - ewarn "a) Replace '${db_path}/drivedb.h' by the database shipped with this" - ewarn " release which can be found in '${initial_db_file}', i.e." - ewarn "" - ewarn " cp \"${initial_db_file}\" \"${db_path}\"" - ewarn "" - ewarn "b) Run the following command as root:" - ewarn "" - ewarn " /usr/sbin/update-smart-drivedb" - - if ! use update_drivedb ; then - ewarn "" - ewarn "However, 'update-smart-drivedb' requires that you re-emerge ${PN}" - ewarn "with USE='update_drivedb'." - fi - fi - fi -}