gentoo auto-resync : 01:01:2023 - 20:22:32

3 files changed, 19 insertions, 23 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 67d6ee29df6e..c62ba195fbc1 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index c0f4d2d4db94..e2038ca1f8af 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -9,5 +9,5 @@ AUX mysqld-v2.service 1208 BLAKE2B 9dad4cfa0a102fe7705f4d1db042d0c65d66e669b51b8
 AUX mysqld-wait-ready 1758 BLAKE2B 2a6ccc105cedc78e4e8acf77fd13f8083af80b3488572079bd063fac263382cd37a85cf40c02ffa8a9a047f146402dc2f7bfef91d47487003b64c84cdc8196c9 SHA512 ad4a850d045149df156c8236ae114e94887626e3ca803dea9bcc3909349043b51357a71ac17d694e0217f7856e076a0736267fc1ea3dedbef8a319fc9014c01b
 AUX mysqld_at-v2.service 1170 BLAKE2B d02f7ee3549d273d309e8e6e5cd8c2f987c6feab42bb330367c14df6932a887f7740ca6c28ecd15aba8bf2f89c33854345d773134630a5e8cd5ce8b99a8b6667 SHA512 a91eb574925afc0096e668799f9806b1cfa4c808ffab26dab5df1934db0dd8059a5e7913b0fdc3374f41e14cc72a6450890c9d746d3ff2de873af91199a71ee0
 AUX run-s6 268 BLAKE2B ebc9c74527257e1a35a4671afe2d34d9ed9868db0e0f33eebe655b31317a4ceeb02affe471ad49007534a9ce0a9399d9f14af664488ae753e207cf97d467107b SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3
-EBUILD mysql-init-scripts-2.3-r5.ebuild 2064 BLAKE2B 463332644e352a821e64ca76f66b75ea974155714fb71b1b503b6f0c2d805ef153b54dcaf2e912e787b9521e74eace2bf4850f8182ea995497bea67c17f1e8e0 SHA512 0627f94d82db97bfc8184636b537037f061d1f68d7a2ae7e62f543d0e0850cf3199973d6e3756ebb60b45aa8d179377211ea3faaf422860644eb5ebe44b40557
+EBUILD mysql-init-scripts-2.3-r6.ebuild 1995 BLAKE2B ab4f0a71f7c8437fdedeb98afb0d1fd2c9e21eceb498a4285d709c0e9b990cd77ec18a404b3247c2e6f9a8783d5b6f035fec1a74fb7e116da2ab5cf21e9d7cb7 SHA512 d3c63cb0a2485464599b7076cfc2a1e228f3e57fe873e0b888af687c945f4b2fd93ec8a4b1c7543f4cd521ea784591609b7548c47c73c4434a1138f60a284dac
 MISC metadata.xml 244 BLAKE2B 4123aca5430915cc6801ba9b4e57e1ff48f31a4bacaa785c4dfbbf2d1aadf14f274684cad9b24a09e875a7f621b33bd9bd3333f7ababbd44aa173d4ace98b46e SHA512 380cbd85bebb869f4a2ec1e3518dc6ac5abed1fa5364172e7436098dbd910e738c4d59ee18aa7cf387b354020ed5782732e43702dc83c1857d46b720d623143d
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r5.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild
index f8c746797828..b5212ccb5bf5 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r5.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit systemd s6 tmpfiles
 
 DESCRIPTION="Gentoo MySQL init scripts"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
+# 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"
-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
@@ -26,45 +25,42 @@ RDEPEND="
 	!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"
+	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"
+		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"
+	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"
+	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"
+	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"
+		elog
 	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 ""
 }