gentoo resync : 29.12.2022

3 files changed, 0 insertions, 245 deletions

diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 2734b8ed7d30..406b5d78b7ef 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,10 +1,7 @@
 AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
-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
 DIST smartmontools-7.3.tar.gz 1043932 BLAKE2B 119fd4aded487796ffd38050ddf8c7dd69cc6f3950650cb0315846292fd4a6594d949d87c51ed46717d6aaadb332c68f655514d1fde89600d51f3fe36f8df1ca SHA512 08afe8b0a6a39e742160cd4e4c03fc7aff7b1ae8681b906360f0932277dc99e361b7606b2373bdf42425cf9453480a5f4344bc040ebc2fa26a03bd52f02a6ac0
-EBUILD smartmontools-7.2-r2.ebuild 4243 BLAKE2B a03483429b480b9116c6e7f9fd20dd39cd68899f5129bfac5e4a3ead00d5ba810047bbcdfba40dc6a7c9dae59dcef04234fe3964748e681e6ba1ec3922a402eb SHA512 dcaeb1f24fd743c8ebfb65ff44808d35d3258819e6ca75f26dd2077f7f9ecd18dcde295a68b335f74f82b50b4247db301ade39c5c2dab643a331a43e80a0110c
 EBUILD smartmontools-7.3.ebuild 4159 BLAKE2B bcff963225c9d017346409c47b8c8acd82ad9173e1f4f597613687282fc01a19e97086bb4cd6a493ba545c9cb4792c54df94b4de400449c90053eb4776a9ef48 SHA512 a561ed49dc1d39995e9ffe5c6e0f07616c0e3200747d2ab2673bca7ef0ae5c56aa3914a2528de9866fe31d713f4ff74d77204a091ac454caedf5c9ec4f971b96
 EBUILD smartmontools-9999.ebuild 4167 BLAKE2B 4c44ef2ed5903bef1013c14ad9c8c9384e2285fe97e5ad7f22d3066e3705041c4d30ca51e74ef22a541b79adc856992a4afa8957179cc0d8da939296ca61c038 SHA512 0baa8408e8387ebcd7a983eecd5ea5dd0198be2f46d0b2f195320f9eb1459a95e3f2ee85e40a75ec79a082ceebfe02851558caadaf712f4d58ab1d25ce1d8949
 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
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 <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/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
-}