gentoo auto-resync : 19:02:2024 - 23:39:38

3 files changed, 163 insertions, 4 deletions

diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 8dae74dc2aee..421291849ac4 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -4,6 +4,7 @@ AUX smartmontools-update-drivedb 45 BLAKE2B 6b77927d453f6b39898dcb164b4e7cb32f65
 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-7.4-r1.ebuild 4194 BLAKE2B 2d656905660d60a3a6faaefe1b781f2ac2211c6291f6e2803d55e060ed6ac44afd90f76fcae7428fb3bff4444e88322b05f23ccdfc31b92942d0d922879a54b6 SHA512 e8477bffe408ef38a6c1df17eeb29c217ae5678a3b3e8ed37beb69ab2e0ed258222ea42d3c7ada902a5e0bb33950b1db40d9bd277769967781d427ddbe371489
 EBUILD smartmontools-7.4.ebuild 4159 BLAKE2B 488baad57fa991afc214dc1539948632cc2c574496ea48384c56d46706e1e929cab6ae61185f6d1076fed7868dca62da0a3fdddca34e5ce036a516144a4d5b8a SHA512 063ccfee2fdfe1a75fbd9361443a4859614186a5c5c93d35f77046a282e82dd2323f107a64f3b6500ea6e6cfc2dab9b20a643d89603dce91dd0161a6406d6966
-EBUILD smartmontools-9999.ebuild 4167 BLAKE2B 509f17c5895c97db8e31af6aec67693fb371c4808bdcb7ffe81d2cb26bc9127ff3187a69f43b745d63b48e2f1ad40fe49358470402eebcdfdd50c698312cb61e SHA512 501569fd36b25e7f272c29f118dc0c99e62ad6632909af1ec0b97e250d938087c144edab2f6dec5c383d2754b84fea69b905646d4fba877d7f6389ee8921d397
+EBUILD smartmontools-9999.ebuild 4194 BLAKE2B 2d656905660d60a3a6faaefe1b781f2ac2211c6291f6e2803d55e060ed6ac44afd90f76fcae7428fb3bff4444e88322b05f23ccdfc31b92942d0d922879a54b6 SHA512 e8477bffe408ef38a6c1df17eeb29c217ae5678a3b3e8ed37beb69ab2e0ed258222ea42d3c7ada902a5e0bb33950b1db40d9bd277769967781d427ddbe371489
 MISC metadata.xml 779 BLAKE2B 31b0b8da02912607e8769049ce4281ed113165f6a71dd953a2122b3b95f599c1f6149c606dbff4ec8a9f5c8c6619fb67d97c142bb09094799625b633a99600f5 SHA512 0684872f7fb9c540148ccd7f339175239ad0b70564d4a8fe25318a784885b2f8e624a8fb8a8ee977fd3dd5eccbba2f4d0e874303f05abe0d11ac1923ff1fb229
diff --git a/sys-apps/smartmontools/smartmontools-7.4-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.4-r1.ebuild
new file mode 100644
index 000000000000..e1f1f30e6d30
--- /dev/null
+++ b/sys-apps/smartmontools/smartmontools-7.4-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}"
+		--with-systemdenvfile=no
+		$(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 actual 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 deaefc5a3442..e1f1f30e6d30 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic systemd
 if [[ ${PV} == 9999 ]] ; then
@@ -66,6 +66,7 @@ src_configure() {
 		--with-drivedbdir="${EPREFIX}/var/db/${PN}" #575292
 		--with-initscriptdir="${EPREFIX}/etc/init.d"
 		#--with-smartdscriptdir="${EPREFIX}/usr/share/${PN}"
+		--with-systemdenvfile=no
 		$(use_with caps libcap-ng)
 		$(use_with selinux)
 		$(use_with systemd libsystemd)
@@ -113,7 +114,7 @@ src_install() {
 	fi
 
 	# Make sure we never install drivedb.h into the db location
-	# of the acutal image so we don't record hashes because user
+	# of the actual image so we don't record hashes because user
 	# can modify that file
 	rm -f "${ED}${db_path}/drivedb.h" || die