gentoo auto-resync : 02:08:2023 - 16:50:29

6 files changed, 162 insertions, 4 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7c83274f0614..dc79190fd834 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 50a6f0682233..b8ac2ed4411b 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -3,5 +3,5 @@ DIST inxi-3.3.25.1.tar.gz 591556 BLAKE2B 5e9f24a7e9d8a2ef0322d18e106da1b126e7aed
 DIST inxi-3.3.27.1.tar.gz 614167 BLAKE2B 1a312255340bfe361eb10dd725cc9fb1421d8dfda34ee944347278e4a293cbcb51d1e2b7aa00f26c16286b90f26d3e0f91f68fb4beeb112ecd8f7a3bc86680ff SHA512 f21285d709d8dc7ce393a6c3b43b5ebabb8ef2c55adf43f00935b728a28f502bbcbd8c1482249e872e4623430f01b4e8cf51f0a6790d56fb12147fa125152575
 EBUILD inxi-3.3.20.1.ebuild 849 BLAKE2B 249ed83ef6ad2b4bc351742d2fcb91073fbd6ba6c0c260b4d81dce6a26ab1c9bc87a34e07fc3a86c20cac78dd12687bd01a57cf446aa6e04792f9114cfa87152 SHA512 91a021a98be47dacb43dc05bdb30b66d26ff093085c86b4399ab6dd883f6b93db873d4f6d3b57c3897e74a85949ab1caf9d43b30a62df7f49c43b48f55e31ad0
 EBUILD inxi-3.3.25.1.ebuild 854 BLAKE2B 77e8ded042ff977389b564d539f54f8867821857ff43315521890ef30c819737cf4992909d848a9c194f105041ec67bd5d8e3911a0046e4ada824d4daae1285c SHA512 b0c9b27ed8385cfbc7dd164f4ae259bf56a548869af9218b0901fb30b728a28bbe8a494b41b1e58804f7412366a97957b2d2c1775628bbd0b0d7ba125f3c7f48
-EBUILD inxi-3.3.27.1.ebuild 850 BLAKE2B 10951cf9f1e2fa2ec68d3589a45362e92019a4b23168b686687e033c5325b7cae59aab2dba62afdbd3e113035f5f7897611fcb5982dc7002bf2c1b3b0c2b679e SHA512 7006ac86098e176b7db32d7ab4f52edde931c2df528675ce71f438302fa9d3551b870e8285d7f46aa094df41b96d7124dd0c95d8453f8c08b4ff270828c13e55
+EBUILD inxi-3.3.27.1.ebuild 849 BLAKE2B 249ed83ef6ad2b4bc351742d2fcb91073fbd6ba6c0c260b4d81dce6a26ab1c9bc87a34e07fc3a86c20cac78dd12687bd01a57cf446aa6e04792f9114cfa87152 SHA512 91a021a98be47dacb43dc05bdb30b66d26ff093085c86b4399ab6dd883f6b93db873d4f6d3b57c3897e74a85949ab1caf9d43b30a62df7f49c43b48f55e31ad0
 MISC metadata.xml 613 BLAKE2B f444aa0759120064814cacf0fcba57059d87b1c014d78eea52304fb3afb9da9b905e30c1cf1399bfbc0d66442e3d892eb2657543014b905f2bf9a943dc8480d9 SHA512 cbe6e76cb003bb77134398aa1db5a24c47de826eb1f17b07e2cee647b9d58948596c2f4588c7c834332c096ce8b782799f07ed4f47a7b252e85e402324ba76bb
diff --git a/sys-apps/inxi/inxi-3.3.27.1.ebuild b/sys-apps/inxi/inxi-3.3.27.1.ebuild
index ed38e49a0467..a706e26a71c6 100644
--- a/sys-apps/inxi/inxi-3.3.27.1.ebuild
+++ b/sys-apps/inxi/inxi-3.3.27.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="bluetooth hddtemp opengl"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 406b5d78b7ef..d89dad863e13 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -2,6 +2,8 @@ AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
 AUX smartmontools-update-drivedb 45 BLAKE2B 6b77927d453f6b39898dcb164b4e7cb32f65de528088bfe4e2b358a3adffecc5cc6a120ee64de307551f0a0444b13901eb2db28bbd8ac81fba50f1dfbf0772f9 SHA512 6fd231ea3215fdc14c25f2ee7d767ca35f8c1f438e97d6056f419699d042a6a23473b26f2e28b1fb16a1389144a62a4b642f0ae19ab1dbda0c0a4a34bf709246
 DIST smartmontools-7.3.tar.gz 1043932 BLAKE2B 119fd4aded487796ffd38050ddf8c7dd69cc6f3950650cb0315846292fd4a6594d949d87c51ed46717d6aaadb332c68f655514d1fde89600d51f3fe36f8df1ca SHA512 08afe8b0a6a39e742160cd4e4c03fc7aff7b1ae8681b906360f0932277dc99e361b7606b2373bdf42425cf9453480a5f4344bc040ebc2fa26a03bd52f02a6ac0
+DIST smartmontools-7.4.tar.gz 1094955 BLAKE2B fbf7888b92b6be4892a206e1c0fae1cb7c45fe0d62270c5fe713a540616e3599c67dd3297ad8c1cd344987e1fe95ae7c5e92db8e13ef622b3316b3780fbb4052 SHA512 439fbf8d0e77fbe1d5a9fb100e655a7e47a82382ce8e1a4e942541a4dfbdff3391caa635e8d354d0e87c10ae79cb97aa6d24915f9f193620d763b384baf2e753
 EBUILD smartmontools-7.3.ebuild 4159 BLAKE2B bcff963225c9d017346409c47b8c8acd82ad9173e1f4f597613687282fc01a19e97086bb4cd6a493ba545c9cb4792c54df94b4de400449c90053eb4776a9ef48 SHA512 a561ed49dc1d39995e9ffe5c6e0f07616c0e3200747d2ab2673bca7ef0ae5c56aa3914a2528de9866fe31d713f4ff74d77204a091ac454caedf5c9ec4f971b96
-EBUILD smartmontools-9999.ebuild 4167 BLAKE2B 4c44ef2ed5903bef1013c14ad9c8c9384e2285fe97e5ad7f22d3066e3705041c4d30ca51e74ef22a541b79adc856992a4afa8957179cc0d8da939296ca61c038 SHA512 0baa8408e8387ebcd7a983eecd5ea5dd0198be2f46d0b2f195320f9eb1459a95e3f2ee85e40a75ec79a082ceebfe02851558caadaf712f4d58ab1d25ce1d8949
+EBUILD smartmontools-7.4.ebuild 4167 BLAKE2B 509f17c5895c97db8e31af6aec67693fb371c4808bdcb7ffe81d2cb26bc9127ff3187a69f43b745d63b48e2f1ad40fe49358470402eebcdfdd50c698312cb61e SHA512 501569fd36b25e7f272c29f118dc0c99e62ad6632909af1ec0b97e250d938087c144edab2f6dec5c383d2754b84fea69b905646d4fba877d7f6389ee8921d397
+EBUILD smartmontools-9999.ebuild 4167 BLAKE2B 509f17c5895c97db8e31af6aec67693fb371c4808bdcb7ffe81d2cb26bc9127ff3187a69f43b745d63b48e2f1ad40fe49358470402eebcdfdd50c698312cb61e SHA512 501569fd36b25e7f272c29f118dc0c99e62ad6632909af1ec0b97e250d938087c144edab2f6dec5c383d2754b84fea69b905646d4fba877d7f6389ee8921d397
 MISC metadata.xml 708 BLAKE2B fcd5acb620a89a1171a63a678e16a6eefd0f72616c7c8c8999adb617d5b7e6aa359c89793db574e18a7424e838cf986005df9b538eb4d3a0df59fe09aa701f0f SHA512 0c6315a656c69a2d343f072d91d0457d3ee6169824c6eb232fd651895f207cf8162b178adc5a1f9de2b76bc9cb0f10fb3ead49c45a104db744bc98915a3aa7dd
diff --git a/sys-apps/smartmontools/smartmontools-7.4.ebuild b/sys-apps/smartmontools/smartmontools-7.4.ebuild
new file mode 100644
index 000000000000..deaefc5a3442
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-7.4.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 autotools subversion
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 )
+)"
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	fi
+}
+
+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
+}
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 9772d6259993..deaefc5a3442 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7