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: [PATCH] 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 +
 ...scripts-2.3-r3.ebuild => mysql-init-scripts-2.3-r4.ebuild} | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 dev-db/mysql-init-scripts/files/mysql.conf
 create mode 100644 dev-db/mysql-init-scripts/files/mysql.conf-r1
 rename dev-db/mysql-init-scripts/{mysql-init-scripts-2.3-r3.ebuild => mysql-init-scripts-2.3-r4.ebuild} (95%)

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 74cd5f836e76f..0000000000000
--- 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 0000000000000..6883dc7988816
--- /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-r4.ebuild
similarity index 95%
rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
rename to dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
index 34fe271b97566..889e84ccfc61a 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@ src_install() {
 	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"
+	newtmpfiles "${FILESDIR}/mysql.conf-r1" "mysql.conf"
 
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/logrotate.mysql-2.3" "mysql"