gentoo resync : 13.11.2021

5 files changed, 109 insertions, 18 deletions

diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 78eaaf94a3dc..1e6663ef0eb1 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,7 +1,8 @@
 AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
-AUX smartmontools-update-drivedb 161 BLAKE2B e1ff7f8f77b6b1afe02228e1b5a3045555ec11f4f1cef86af2a024544ae8714520682ca87592a54d801327f95c4cb3b7c9e1b49592e7bcfcdc0c7837a3a5c881 SHA512 cf460168f1e0cb9a5276a098b62b61044d797ffc992dc0233fae5109769aeab4c04eab56fbcbdc5202513f8a537bc7c40cf463d9260deefd3efa4811e58a249b
+AUX smartmontools-7.2-update-smart-drivedb-quiet.patch 2141 BLAKE2B 9de69ba2187b94885e29594c9a350f0b44c2ea88b6fdee96e8c397ea57db74903b174714fce94433cbf00e11e9c6270f70ccdd3ca818667c09ed4681ebc49b8e SHA512 7e1f70212602b6e4b87ab1017777c4edf8627dbea3bb15476e4c356d41469913a1194dbba5054055fb6fd814face766b85851d16b7383c64d26eb9a8d796bc7c
+AUX smartmontools-update-drivedb 45 BLAKE2B 6b77927d453f6b39898dcb164b4e7cb32f65de528088bfe4e2b358a3adffecc5cc6a120ee64de307551f0a0444b13901eb2db28bbd8ac81fba50f1dfbf0772f9 SHA512 6fd231ea3215fdc14c25f2ee7d767ca35f8c1f438e97d6056f419699d042a6a23473b26f2e28b1fb16a1389144a62a4b642f0ae19ab1dbda0c0a4a34bf709246
 DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea
-EBUILD smartmontools-7.2-r1.ebuild 4112 BLAKE2B 765864c21f3d938f524f3060e02de878d7720395a5cef885e2be272657450512f009378b1ac919f644036ef5b546b57a716a70ea21fe23472627df8543fc7b85 SHA512 cbd85fad50a8a5e6094fbd0dd75ab906a0650ebf01e3191f8758fba643f7a38ccac1237dd382d79174ba3cc5458671140ff4a827332710ea91dd5df58a26efa6
+EBUILD smartmontools-7.2-r2.ebuild 4243 BLAKE2B a03483429b480b9116c6e7f9fd20dd39cd68899f5129bfac5e4a3ead00d5ba810047bbcdfba40dc6a7c9dae59dcef04234fe3964748e681e6ba1ec3922a402eb SHA512 dcaeb1f24fd743c8ebfb65ff44808d35d3258819e6ca75f26dd2077f7f9ecd18dcde295a68b335f74f82b50b4247db301ade39c5c2dab643a331a43e80a0110c
 EBUILD smartmontools-9999.ebuild 4120 BLAKE2B 8934c567f80a47f0a3d31a7e97b6a0821bb3cc34cc203c0c8568e78c2023b64bfbc938c4b68584bff6ec9eb41c46f7a6d7edcbc9f1f63a62fa0329b87412c2f8 SHA512 424b6c177004e0d7c706699343e0aa145470e95f6e65cb8d3b326e702c699a02e9bd4a640c30ffec7de635c9d7dfa4db1cd54e46b8d3cc010084103ed494526a
-MISC metadata.xml 629 BLAKE2B c73896c9de740a685e9032160525ff16cea74570a357add089208502966cd30a8aa9e60cd582ebd739c452e11da41a9e1edf5383d0060b4b6e90e4184d2c7478 SHA512 2263c65a48ab07a4fa6440c38c4d25486f0b55b686983911297becddbacb7549c54d6d8c890e5df5a30654d1b3d589389d83cb4d974bb6c9a5a4aa61907b2478
+MISC metadata.xml 708 BLAKE2B fcd5acb620a89a1171a63a678e16a6eefd0f72616c7c8c8999adb617d5b7e6aa359c89793db574e18a7424e838cf986005df9b538eb4d3a0df59fe09aa701f0f SHA512 0c6315a656c69a2d343f072d91d0457d3ee6169824c6eb232fd651895f207cf8162b178adc5a1f9de2b76bc9cb0f10fb3ead49c45a104db744bc98915a3aa7dd
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
new file mode 100644
index 000000000000..773375508222
--- /dev/null
+++ b/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch
@@ -0,0 +1,86 @@
+commit 56363dff436c12eaa296bbba39dfd65ec3f1f1f2
+Author: chrfranke <authors@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 <hannes@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/files/smartmontools-update-drivedb b/sys-apps/smartmontools/files/smartmontools-update-drivedb
index b7d1bb95243f..270789c53d0a 100644
--- a/sys-apps/smartmontools/files/smartmontools-update-drivedb
+++ b/sys-apps/smartmontools/files/smartmontools-update-drivedb
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-# Hide stdout until a --quiet switch is added:
-# https://github.com/smartmontools/smartmontools/issues/110
-/usr/sbin/update-smart-drivedb > /dev/null
+/usr/sbin/update-smart-drivedb -q
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index b1a371e967df..db3a4e7b4141 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="caps">Build against <pkg>sys-libs/libcap-ng</pkg> to allow smartd to drop its privileges.</flag>
-	<flag name="daemon">Install the monitoring daemon (smartd) 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>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="caps">Build against <pkg>sys-libs/libcap-ng</pkg> to allow smartd to drop its privileges.</flag>
+		<flag name="daemon">Install the monitoring daemon (smartd) and associated scripts.</flag>
+		<flag name="update-drivedb">Install a script to update the drivedb file.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">smartmontools/smartmontools</remote-id>
+		<remote-id type="sourceforge">smartmontools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild
index 39f90ac1de44..3059ff0feb50 100644
--- a/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild
@@ -48,6 +48,11 @@ REQUIRED_USE="(
 	static? ( !systemd )
 )"
 
+PATCHES=(
+	# Backport from commit 56363dff436c12eaa296bbba39dfd65ec3f1f1f2
+	"${FILESDIR}/${P}-update-smart-drivedb-quiet.patch"
+)
+
 src_prepare() {
 	default
 	eautoreconf