From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3583415800F for ; Sun, 1 Jan 2023 18:25:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 75303E07EF; Sun, 1 Jan 2023 18:24:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 559D8E07EF for ; Sun, 1 Jan 2023 18:24:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70C4F3408B8 for ; Sun, 1 Jan 2023 18:24:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D0C762F for ; Sun, 1 Jan 2023 18:24:57 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1672597486.31922860863674ce1034caed40076c376cc55eef.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mysql-init-scripts/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r5.ebuild dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r6.ebuild X-VCS-Directories: dev-db/mysql-init-scripts/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 31922860863674ce1034caed40076c376cc55eef X-VCS-Branch: master Date: Sun, 1 Jan 2023 18:24:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e38f265a-5941-4686-bac8-6e3c14f97b40 X-Archives-Hash: 26f5675f58987e2a2a81ac33082672c7 commit: 31922860863674ce1034caed40076c376cc55eef Author: David Seifert gentoo org> AuthorDate: Sun Jan 1 18:24:46 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jan 1 18:24:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31922860 dev-db/mysql-init-scripts: update EAPI 6 -> 8 Signed-off-by: David Seifert gentoo.org> ...-r5.ebuild => mysql-init-scripts-2.3-r6.ebuild} | 40 ++++++++++------------ 1 file changed, 18 insertions(+), 22 deletions(-) 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 similarity index 66% rename from dev-db/mysql-init-scripts/mysql-init-scripts-2.3-r5.ebuild rename to 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 "" }