commit: 6b5e8085a524f484a1262b2d4181656a56f40f7d Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Tue Jun 21 09:40:45 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Tue Jun 21 09:40:45 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b5e8085
sys-apps/smartmontools: drop 7.2-r2 Signed-off-by: David Seifert <soap <AT> gentoo.org> sys-apps/smartmontools/Manifest | 1 - ...rtmontools-7.2-update-smart-drivedb-quiet.patch | 86 ------------ sys-apps/smartmontools/smartmontools-7.2-r2.ebuild | 156 --------------------- 3 files changed, 243 deletions(-) diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest index 90efc5ddec43..c8bdef502e27 100644 --- a/sys-apps/smartmontools/Manifest +++ b/sys-apps/smartmontools/Manifest @@ -1,2 +1 @@ -DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea DIST smartmontools-7.3.tar.gz 1043932 BLAKE2B 119fd4aded487796ffd38050ddf8c7dd69cc6f3950650cb0315846292fd4a6594d949d87c51ed46717d6aaadb332c68f655514d1fde89600d51f3fe36f8df1ca SHA512 08afe8b0a6a39e742160cd4e4c03fc7aff7b1ae8681b906360f0932277dc99e361b7606b2373bdf42425cf9453480a5f4344bc040ebc2fa26a03bd52f02a6ac0 diff --git a/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch b/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch deleted file mode 100644 index 773375508222..000000000000 --- a/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch +++ /dev/null @@ -1,86 +0,0 @@ -commit 56363dff436c12eaa296bbba39dfd65ec3f1f1f2 -Author: chrfranke <auth...@smartmontools.org> -Date: Sat Nov 6 15:07:18 2021 +0000 - - update-smart-drivedb.in: Add '-q' option to suppress info messages. - (GH issues/110). - update-smart-drivedb.8.in: Document new option. - - git-svn-id: http://svn.code.sf.net/p/smartmontools/code/trunk@5242 4ea69e1a-61f1-4043-bf83-b5c94c648137 - ---- a/update-smart-drivedb.8.in -+++ b/update-smart-drivedb.8.in -@@ -1,6 +1,6 @@ - .ig - Copyright (C) 2013 Hannes von Haugwitz <han...@vonhaugwitz.com> --Copyright (C) 2014-20 Christian Franke -+Copyright (C) 2014-21 Christian Franke - - SPDX-License-Identifier: GPL-2.0-or-later - -@@ -144,6 +144,10 @@ Print the OpenPGP/GPG public key block. - .B \-\-dryrun - Print download commands only. - .TP -+.B \-q -+[NEW EXPERIMENTAL UPDATE-SMART-DRIVEDB FEATURE] -+Suppress info messages. -+.TP - .B \-v - Verbose output. - .Sp ---- a/update-smart-drivedb.in -+++ b/update-smart-drivedb.in -@@ -72,6 +72,7 @@ Usage: $myname [OPTIONS] [DESTFILE] - --no-verify Don't verify signature - --export-key Print the OpenPGP/GPG public key block - --dryrun Print download commands only -+ -q Suppress info messages - -v Verbose output - - Updates $DRIVEDB -@@ -131,6 +132,11 @@ inpath() - return $rc - } - -+iecho() -+{ -+ test -n "$quiet" || echo "$*" -+} -+ - vecho() - { - test -n "$q" || echo "$*" -@@ -522,6 +528,7 @@ mv_all() - smtctl=$SMARTCTL - tool= - urlid="svn" -+quiet= - q="-q" - dryrun= - trunk= -@@ -547,6 +554,9 @@ while true; do case $1 in - shift; test -n "$1" || usage - urlid=$1 ;; - -+ -q) -+ quiet=t ;; -+ - -v) - q= ;; - -@@ -727,7 +737,7 @@ if [ -f "$DEST" ]; then - then - rm -f "$DEST.new" "$DEST.new.raw" "$DEST.new.raw.asc" - touch "$DEST.lastcheck" -- echo "$DEST is already up to date" -+ iecho "$DEST is already up to date" - exit 0 - fi - mv_all "$DEST" "" ".old" -@@ -738,4 +748,4 @@ fi - - mv_all "$DEST" ".new" "" - --echo "$DEST updated from ${trunk:-branches/$brnch}${no_verify:+ (NOT VERIFIED)}" -+iecho "$DEST updated from ${trunk:-branches/$brnch}${no_verify:+ (NOT VERIFIED)}" diff --git a/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild b/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild deleted file mode 100644 index 3059ff0feb50..000000000000 --- a/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# 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 ~riscv sparc x86 ~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 systemd +update-drivedb" - -DEPEND=" - caps? ( - static? ( sys-libs/libcap-ng[static-libs] ) - !static? ( sys-libs/libcap-ng ) - ) - selinux? ( - sys-libs/libselinux - )" -RDEPEND="${DEPEND} - daemon? ( virtual/mailx ) - selinux? ( sec-policy/selinux-smartmon ) - systemd? ( sys-apps/systemd ) - update-drivedb? ( - app-crypt/gnupg - || ( - net-misc/curl - net-misc/wget - www-client/lynx - dev-vcs/subversion - ) - ) -" - -REQUIRED_USE="( - caps? ( daemon ) - static? ( !systemd ) -)" - -PATCHES=( - # Backport from commit 56363dff436c12eaa296bbba39dfd65ec3f1f1f2 - "${FILESDIR}/${P}-update-smart-drivedb-quiet.patch" -) - -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=( - --with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292 - --with-initscriptdir="${EPREFIX}/etc/init.d" - #--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}" - $(use_with caps libcap-ng) - $(use_with selinux) - $(use_with systemd libsystemd) - $(use_with update-drivedb gnupg) - $(use_with update-drivedb update-smart-drivedb) - $(usex systemd "--with-systemdsystemunitdir=$(systemd_get_systemunitdir)" '') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local db_path="/var/db/${PN}" - insopts -m0644 -p # preserve timestamps - - if use daemon; then - default - - newinitd "${FILESDIR}"/smartd-r1.rc smartd - newconfd "${FILESDIR}"/smartd.confd smartd - 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="${EROOT}usr/share/${PN}/drivedb.h" - local db_path="${EROOT}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 -}
