grknight 15/05/27 21:01:03 Modified: metadata.xml ChangeLog Added: mysql-init-scripts-2.1_alpha3.ebuild Removed: mysql-init-scripts-2.1_alpha2.ebuild Log: Version bump to correct s6 support for dependencies and sourcing (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D1F781EFF9F4A3B6)
Revision Changes Path 1.3 dev-db/mysql-init-scripts/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/metadata.xml?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/metadata.xml?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/metadata.xml?r1=1.2&r2=1.3 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/metadata.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- metadata.xml 27 May 2015 17:02:26 -0000 1.2 +++ metadata.xml 27 May 2015 21:01:03 -0000 1.3 @@ -2,7 +2,4 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> <herd>mysql</herd> - <use> - <flag name='s6'>Install an OpenRC service that monitors using <pkg>sys-apps/s6</pkg> instead of using start-stop-daemon</flag> - </use> </pkgmetadata> 1.57 dev-db/mysql-init-scripts/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog?rev=1.57&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog?rev=1.57&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog?r1=1.56&r2=1.57 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- ChangeLog 27 May 2015 17:02:26 -0000 1.56 +++ ChangeLog 27 May 2015 21:01:03 -0000 1.57 @@ -1,6 +1,13 @@ # ChangeLog for dev-db/mysql-init-scripts # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.56 2015/05/27 17:02:26 grknight Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.57 2015/05/27 21:01:03 grknight Exp $ + +*mysql-init-scripts-2.1_alpha3 (27 May 2015) + + 27 May 2015; Brian Evans <[email protected]> + +mysql-init-scripts-2.1_alpha3.ebuild, -mysql-init-scripts-2.1_alpha2.ebuild, + files/init.d-s6, files/log-s6, files/run-s6, metadata.xml: + Version bump to correct s6 support for dependencies and sourcing *mysql-init-scripts-2.1_alpha2 (27 May 2015) 1.1 dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha3.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha3.ebuild?rev=1.1&content-type=text/plain Index: mysql-init-scripts-2.1_alpha3.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha3.ebuild,v 1.1 2015/05/27 21:01:03 grknight Exp $ EAPI=5 inherit systemd DESCRIPTION="Gentoo MySQL init scripts." HOMEPAGE="http://www.gentoo.org/"; SRC_URI="" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" 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 RDEPEND=" !<dev-db/mysql-5.1 !<sys-apps/openrc-0.16.2 " # 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" "mysql-s6" exeinto /var/svc.d/mysql-s6 newexe "${FILESDIR}/run-s6" "run" exeinto /var/svc.d/mysql-s6/log newexe "${FILESDIR}/log-s6" "run" fi newinitd "${FILESDIR}/init.d-2.0" "mysql" # systemd unit installation exeinto /usr/libexec doexe "${FILESDIR}"/mysqld-wait-ready systemd_dounit "${FILESDIR}/mysqld.service" systemd_newunit "${FILESDIR}/mysqld_at.service" "[email protected]" systemd_dotmpfilesd "${FILESDIR}/mysql.conf" insinto /etc/logrotate.d newins "${FILESDIR}/logrotate.mysql" "mysql" } pkg_postinst() { einfo "To use the mysql-s6 script, you need to install the optional sys-apps/s6 package." einfo "If you wish to use s6 logging support, " einfo "comment out the log-error setting in your my.cnf" }
