From 6f292c815f3656e78702d02fa17cb173c473d7aa Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 29 Feb 2024 00:27:13 +0000
Subject: dev-db/mysql-init-scripts: update init.d for nfsmount removal

Bug: https://bugs.gentoo.org/925459
Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-db/mysql-init-scripts/files/conf.d-2.0         |  2 +-
 .../mysql-init-scripts-2.3-r6.ebuild               | 66 ----------------------
 .../mysql-init-scripts-2.3-r7.ebuild               | 66 ++++++++++++++++++++++
 3 files changed, 67 insertions(+), 67 deletions(-)
 delete mode 100644 dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild
 create mode 100644 dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r7.ebuild

diff --git a/dev-db/mysql-init-scripts/files/conf.d-2.0 b/dev-db/mysql-init-scripts/files/conf.d-2.0
index cecb9a940f14..843b6fe93095 100644
--- a/dev-db/mysql-init-scripts/files/conf.d-2.0
+++ b/dev-db/mysql-init-scripts/files/conf.d-2.0
@@ -63,7 +63,7 @@ STOP_TIMEOUT=120
 
 # Or from NFS? P.S. This is not a good idea in most cases, but does have some
 # valid usage cases, so we provide the option.
-#rc_need="nfsmount"
+#rc_need="nfsclient"
 
 # Should any one of the instances satisfy the requirement for MySQL coming up?
 # By default, we say no.
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild
deleted file mode 100644
index b5212ccb5bf5..000000000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd s6 tmpfiles
-
-DESCRIPTION="Gentoo MySQL init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# This _will_ break with MySQL 5.0, 4.x, 3.x
-# It also NEEDS openrc for the save_options/get_options builtins.
-# The s6 support was added after openrc 0.16.2
-# mysql-connector-c needed for my_print_defaults
-RDEPEND="
-	!<dev-db/mysql-5.1
-	!<sys-apps/openrc-0.16.2
-	dev-db/mysql-connector-c
-	!prefix? (
-		acct-group/mysql acct-user/mysql
-	)
-"
-
-src_install() {
-	newconfd "${FILESDIR}"/conf.d-2.0 mysql
-
-	# s6 init scripts
-	if use amd64 || use x86 ; then
-		newconfd "${FILESDIR}"/conf.d-2.0 mysql-s6
-		newinitd "${FILESDIR}"/init.d-s6-2.3 mysql-s6
-		s6_install_service mysql "${FILESDIR}"/run-s6
-		s6_install_service mysql/log "${FILESDIR}"/log-s6
-	fi
-
-	newinitd "${FILESDIR}"/init.d-2.3 mysql
-	newinitd "${FILESDIR}"/init.d-supervise-2.3 mysql-supervise
-
-	# systemd unit installation
-	exeinto /usr/libexec
-	doexe "${FILESDIR}"/mysqld-wait-ready
-	systemd_newunit "${FILESDIR}"/mysqld-v2.service mysqld.service
-	systemd_newunit "${FILESDIR}"/mysqld_at-v2.service mysqld@.service
-	newtmpfiles "${FILESDIR}"/mysql.conf-r1 mysql.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/logrotate.mysql-2.3 mysql
-}
-
-pkg_postinst() {
-	tmpfiles_process mysql.conf
-
-	if use amd64 || use x86 ; then
-		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
-		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
-		elog
-	fi
-
-	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
-	elog "You should prefer that unit over this package's mysqld.service."
-}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r7.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r7.ebuild
new file mode 100644
index 000000000000..ce3110eecafa
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd s6 tmpfiles
+
+DESCRIPTION="Gentoo MySQL init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+# This _will_ break with MySQL 5.0, 4.x, 3.x
+# It also NEEDS openrc for the save_options/get_options builtins.
+# The s6 support was added after openrc 0.16.2
+# mysql-connector-c needed for my_print_defaults
+RDEPEND="
+	!<dev-db/mysql-5.1
+	!<sys-apps/openrc-0.16.2
+	dev-db/mysql-connector-c
+	!prefix? (
+		acct-group/mysql acct-user/mysql
+	)
+"
+
+src_install() {
+	newconfd "${FILESDIR}"/conf.d-2.0 mysql
+
+	# s6 init scripts
+	if use amd64 || use x86 ; then
+		newconfd "${FILESDIR}"/conf.d-2.0 mysql-s6
+		newinitd "${FILESDIR}"/init.d-s6-2.3 mysql-s6
+		s6_install_service mysql "${FILESDIR}"/run-s6
+		s6_install_service mysql/log "${FILESDIR}"/log-s6
+	fi
+
+	newinitd "${FILESDIR}"/init.d-2.3 mysql
+	newinitd "${FILESDIR}"/init.d-supervise-2.3 mysql-supervise
+
+	# systemd unit installation
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/mysqld-wait-ready
+	systemd_newunit "${FILESDIR}"/mysqld-v2.service mysqld.service
+	systemd_newunit "${FILESDIR}"/mysqld_at-v2.service mysqld@.service
+	newtmpfiles "${FILESDIR}"/mysql.conf-r1 mysql.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate.mysql-2.3 mysql
+}
+
+pkg_postinst() {
+	tmpfiles_process mysql.conf
+
+	if use amd64 || use x86 ; then
+		elog "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package."
+		elog "If you wish to use s6 logging support, comment out the log-error setting in your my.cnf"
+		elog
+	fi
+
+	elog "Starting with version 10.1.8, MariaDB includes an improved systemd unit named mariadb.service"
+	elog "You should prefer that unit over this package's mysqld.service."
+}
-- 
cgit v1.2.3-65-gdbad