From 48f3e81fd35a18cd49f8b8d6a041f33ad88f9c89 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 29 Feb 2024 05:41:15 +0000
Subject: gentoo auto-resync : 29:02:2024 - 05:41:15
---
dev-db/Manifest.gz | Bin 16408 -> 16409 bytes
dev-db/mysql-init-scripts/Manifest | 4 +-
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 +++++++++++++++++++++
5 files changed, 69 insertions(+), 69 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
(limited to 'dev-db')
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 87a07af62a42..3d9766d7221c 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index e2038ca1f8af..70d00a52d4b2 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -1,4 +1,4 @@
-AUX conf.d-2.0 2944 BLAKE2B 94b94868e840267c5bf604226af11a4c806f48111472e417d725b51f48e38b8a4bd0dbbe8f9dba95c2250590c23bc0f9bc301203fdf399cd141055e54fa9a067 SHA512 2781e2caefed0c8be9c612f92cecf5a572dc17b97519034637a2b3f98a88af02dd8973f6c6b2af524d235067df6866409d1fe9d56740bfd0efb09948073c8d3b
+AUX conf.d-2.0 2945 BLAKE2B c31c5396a12bd1319fb1172d3431331045a9bebdd90aa5e4bea76427033ea1ed99acbe7b2a0433936c6709b63d903093e0018ed9e5533014e18b9eb06d5eb7c2 SHA512 6d330b84b36ce105b59bad16e3e9b336551248d63daef07501bb1cf064ddc18212795de8c0eabda11c43968316322c9f289f75fd4d2cf5a8606cac2977cf0232
AUX init.d-2.3 5722 BLAKE2B d3db86f22bb2bb7df5b03e071cf81bd005f45002a43c23a66a34dba540f397eb59e5db3fa1bffcfef8a63f0e69594e50312d785ade5da7b0fec0cccb4d949b8e SHA512 f8d8c4521c35e1d6de2a8a29e6be98dacdbd64d8a7b128c8b63361076d460475de537c57fa891aa0b1d862bcd71800f2c480bd087d89115601b5ccc49b0a2c18
AUX init.d-s6-2.3 4980 BLAKE2B b165f6a87cc3570ef6aa28d82dedbd0bc5e151c73e7a97bca62e474af15ae9cb91869f1f2d0a12618c972aa8d4b2100202671b736b6b184c6d9ad644f5955fe8 SHA512 61bfffb8a7af2fa5f2cd0f9e21930e5a2527bd9f2ada617d1b1c06110e247c78b4889f3a80d426eb2b9fcf0c312c6d0cbdc4b501690219f35b9b10d693f538a9
AUX init.d-supervise-2.3 5331 BLAKE2B b532f7759d9aba57526f6132598faf6d0f527f578edef13289965eaac39d7fe0403a8580a03c9b2aea0dfcc6dc51b5ce45afe49ec3c0b320161ece1031c40651 SHA512 ccb36e83357fdbb14bf3f842b06ddde1e019e802a2d6659f67944f5743e07b352668fcee81fd62a9c221c532ed17cef107fea6647c8454dd6274e3e50bfa4b09
@@ -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-r6.ebuild 1995 BLAKE2B ab4f0a71f7c8437fdedeb98afb0d1fd2c9e21eceb498a4285d709c0e9b990cd77ec18a404b3247c2e6f9a8783d5b6f035fec1a74fb7e116da2ab5cf21e9d7cb7 SHA512 d3c63cb0a2485464599b7076cfc2a1e228f3e57fe873e0b888af687c945f4b2fd93ec8a4b1c7543f4cd521ea784591609b7548c47c73c4434a1138f60a284dac
+EBUILD mysql-init-scripts-2.3-r7.ebuild 1995 BLAKE2B 50f8556000b92104a683513d48a16d2febcdc7d51e80a2f1f4bfb6d3a9f9d7fd16350a4ba41cb7ff9bbcd916a21c9dfb9c88c680688f6f7ec82eef9d34e7322e SHA512 8192804f56afc61331ede765517f6edda1a933e2180154f0f5a9f902f0f3a93bc51ed3f6f1bfab5d1f6c733817467bbb57a1991cd7aa36adf3c6d8731ebc2efe
MISC metadata.xml 244 BLAKE2B 4123aca5430915cc6801ba9b4e57e1ff48f31a4bacaa785c4dfbbf2d1aadf14f274684cad9b24a09e875a7f621b33bd9bd3333f7ababbd44aa173d4ace98b46e SHA512 380cbd85bebb869f4a2ec1e3518dc6ac5abed1fa5364172e7436098dbd910e738c4d59ee18aa7cf387b354020ed5782732e43702dc83c1857d46b720d623143d
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