[gentoo-commits] gentoo-x86 commit in dev-db/mysql-init-scripts: metadata.xml mysql-init-scripts-2.1_alpha2.ebuild ChangeLog

[Brian Evans (grknight)]

grknight    15/05/27 17:02:26

  Modified:             metadata.xml ChangeLog
  Added:                mysql-init-scripts-2.1_alpha2.ebuild
  Log:
  Add new version with s6 supervisor support
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D1F781EFF9F4A3B6)

Revision  Changes    Path
1.2                  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.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/metadata.xml?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/metadata.xml?r1=1.1&r2=1.2

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/metadata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- metadata.xml	12 Jan 2007 16:54:20 -0000	1.1
+++ metadata.xml	27 May 2015 17:02:26 -0000	1.2
@@ -2,4 +2,7 @@
 <!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.56                 dev-db/mysql-init-scripts/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog?r1=1.55&r2=1.56

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- ChangeLog	3 Mar 2015 06:09:21 -0000	1.55
+++ ChangeLog	27 May 2015 17:02:26 -0000	1.56
@@ -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.55 2015/03/03 06:09:21 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.56 2015/05/27 17:02:26 grknight Exp $
+
+*mysql-init-scripts-2.1_alpha2 (27 May 2015)
+
+  27 May 2015; Brian Evans <grknight@g.o> +files/init.d-s6,
+  +files/log-s6, +files/run-s6, +mysql-init-scripts-2.1_alpha2.ebuild,
+  metadata.xml:
+  Add new version with s6 supervisor support
 
   02 Mar 2015; Yixun Lan <dlan@g.o> mysql-init-scripts-2.0-r1.ebuild:
   add arm64 support, tested on A53 board



1.1                  dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha2.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_alpha2.ebuild?rev=1.1&content-type=text/plain

Index: mysql-init-scripts-2.1_alpha2.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_alpha2.ebuild,v 1.1 2015/05/27 17:02:26 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="s6"

DEPEND=""
# This _will_ break with MySQL 5.0, 4.x, 3.x
# It also NEEDS openrc for the save_options/get_options builtins.
RDEPEND="
	!<dev-db/mysql-5.1
	s6? ( >=sys-apps/openrc-0.16.2 sys-apps/s6 )
	"
# 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"
	if use s6 ; then
		newinitd "${FILESDIR}/init.d-s6" "mysql"
		exeinto /var/svc.d/mysql
		newexe "${FILESDIR}/run-s6" "run"
		exeinto /var/svc.d/mysql/log
		newexe "${FILESDIR}/log-s6" "run"
	else
		newinitd "${FILESDIR}/init.d-2.0" "mysql"
	fi

	# systemd unit installation
	exeinto /usr/libexec
	doexe "${FILESDIR}"/mysqld-wait-ready
	systemd_dounit "${FILESDIR}/mysqld.service"
	systemd_newunit "${FILESDIR}/mysqld_at.service" "mysqld@.service"
	systemd_dotmpfilesd "${FILESDIR}/mysql.conf"

	insinto /etc/logrotate.d
	newins "${FILESDIR}/logrotate.mysql" "mysql"
}

pkg_postinst() {
	if use s6 ; then
		einfo "If you wish to use s6 logging support, "
		einfo "comment out the log-error setting in your my.cnf"
	fi
}