From a2e045276140813d197d5eb341bb583dc76cac41 Mon Sep 17 00:00:00 2001
From: Conrad Kostecki <conikost@gentoo.org>
Date: Thu, 7 Apr 2022 21:00:48 +0200
Subject: dev-db/mysql-init-scripts: update tmpfiles path

The path '/var/run' is deprecated, as the following message is being
shown:

/usr/lib/tmpfiles.d/mysql.conf:1: Line references path below legacy
directory /var/run/, updating /var/run/mysqld  /run/mysqld;
please update the tmpfiles.d/ drop-in file accordingly.

Closes: https://github.com/gentoo/gentoo/pull/24947
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 dev-db/mysql-init-scripts/files/mysql.conf         |  1 -
 dev-db/mysql-init-scripts/files/mysql.conf-r1      |  1 +
 .../mysql-init-scripts-2.3-r3.ebuild               | 70 ----------------------
 .../mysql-init-scripts-2.3-r4.ebuild               | 70 ++++++++++++++++++++++
 4 files changed, 71 insertions(+), 71 deletions(-)
 delete mode 100644 dev-db/mysql-init-scripts/files/mysql.conf
 create mode 100644 dev-db/mysql-init-scripts/files/mysql.conf-r1
 delete mode 100644 dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
 create mode 100644 dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild

(limited to 'dev-db/mysql-init-scripts')

diff --git a/dev-db/mysql-init-scripts/files/mysql.conf b/dev-db/mysql-init-scripts/files/mysql.conf
deleted file mode 100644
index 74cd5f836e76..000000000000
--- a/dev-db/mysql-init-scripts/files/mysql.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/mysqld 0755 mysql mysql -
diff --git a/dev-db/mysql-init-scripts/files/mysql.conf-r1 b/dev-db/mysql-init-scripts/files/mysql.conf-r1
new file mode 100644
index 000000000000..6883dc798881
--- /dev/null
+++ b/dev-db/mysql-init-scripts/files/mysql.conf-r1
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
deleted file mode 100644
index 34fe271b9756..000000000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd s6 tmpfiles
-
-DESCRIPTION="Gentoo MySQL init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-# 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
-	)
-	"
-# Need to set S due to PMS saying we need it existing, but no SRC_URI
-S=${WORKDIR}
-
-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"
-	dotmpfiles "${FILESDIR}/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 ""
-		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"
-	fi
-
-	elog ""
-	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."
-	einfo ""
-}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
new file mode 100644
index 000000000000..889e84ccfc61
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd s6 tmpfiles
+
+DESCRIPTION="Gentoo MySQL init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+IUSE=""
+
+DEPEND=""
+# 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
+	)
+	"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S=${WORKDIR}
+
+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 ""
+		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"
+	fi
+
+	elog ""
+	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."
+	einfo ""
+}
-- 
cgit v1.2.3