Version bump to use the s6 eclass and bug fixes

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

4 files changed, 47 insertions, 38 deletions

diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog
index 4fd1c257866c..aad0c904bfcc 100644
--- a/dev-db/mysql-init-scripts/ChangeLog
+++ b/dev-db/mysql-init-scripts/ChangeLog
@@ -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.57 2015/05/27 21:01:03 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.58 2015/06/09 16:16:26 grknight Exp $
+
+*mysql-init-scripts-2.1_alpha4 (09 Jun 2015)
+
+  09 Jun 2015; Brian Evans <grknight@gentoo.org>
+  +mysql-init-scripts-2.1_alpha4.ebuild, -mysql-init-scripts-2.1_alpha3.ebuild,
+  files/init.d-s6:
+  Version bump to use the s6 eclass and bug fixes
 
 *mysql-init-scripts-2.1_alpha3 (27 May 2015)
 
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index 83c412db0f93..d9204ca41679 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -3,7 +3,7 @@ Hash: SHA256
 
 AUX conf.d-2.0 3063 SHA256 6cd8551b8ac0dded54f42c2cc9cd55fbc4776d1a541e13d7d571cefd906cb3f4 SHA512 10144086db0fdcb8309e091bc43911fa9861d099500f2d8532376707d947da08491f7629e4008468758464cd2b3911479701fa24fff9f1614008a5c227529e3a WHIRLPOOL 0317929f28e0767e9bcb60715dc3bb2a05f5d1a0e05133135294abc8870f40ed3a4a26507b2ea84d4f7bc6e25f371d1cc7f1acc69ad08a8a9e940bb289d6b1c3
 AUX init.d-2.0 4641 SHA256 1c89b70714bac5edece71ecc113a35350fc96ef977be2e0f44d6b46adbbb6c30 SHA512 0b4ea930ddd2ca7a59b8773d687f1f238cca51906e47ab09aff3deb463344072c4416f3d822e6cc4d804fec8755b50afe0a79a42ee5529afb90750792da98eb5 WHIRLPOOL 878f87a0b3657613cd01888d11bb1876a7b9036e8c81d544356cb23660149cd9ff2788b833e14f4e69f17f596847e94cd4022ee8ae0992d9649312cdc07e60d6
-AUX init.d-s6 3829 SHA256 e9c9a82352a44c9dad3985f69ce8e5ca5fe4755fb1c40ce21e4ccaceb4fa91e9 SHA512 73acf45c04f7476b82983b90b7a123274fa200e29eeccec4638805592e25904b8a3c09c1edb492b5f0994c57f25354c139a3f4b33c99aa94c25de9654e7d393f WHIRLPOOL 59ae5f41a35d615beb685676e5e79135d4f1c9af0149297d18c2365cdf23907923c68c3cda9d70e22d82a1f902631ccb2352ee690865937f2bafbb30632c9fcb
+AUX init.d-s6 3986 SHA256 248e7f42e4ed43e459d4b6c7e78fcad4ba22f03caa7a29f6da804ca081511a7b SHA512 21a7649ede277be0203c88b425690030ab2558dd7fcb5a85d8cbbb41d071baecfc83951ad6a078b7c265bbea21788dc81ae65cd4901d970fdde8ed3d0c516923 WHIRLPOOL c1ee25bc77374ccaa47e0a877686e8ca81471f6c36b6b3a236bd55b124f84efbf51975d0744062d2ee4c99dfe95e74098948c23692778f5399d83aba05fec8c7
 AUX log-s6 488 SHA256 8ca6c20e0d2f9f53dff1898dd86aeb315c8c436251645665fbc91e96584503d0 SHA512 13b895f2fc8926d26469d7e4093bddf6b8ce8da996727029df83da9fe60bb8aeb9f56d4283d387d7e135cc9a8a9ce405ad1f575ca89e53c379092287138b5cd0 WHIRLPOOL f44468cf683a70acedc30a97be860180a8cebb3bb76246f06ed953aebc8b8c32d2fc70fb703cc0fe185bbf41a43b73fc810818e076120883bf60a33a4ca5701a
 AUX logrotate.mysql 491 SHA256 a82f4497594e03cce55dce1f008206bafb85e3e4c6fc1f43c7a90d57be5f7aa1 SHA512 d5d3a753938c6c790a8202cd4685cc6a539e10519032fd26693130b51ef6a35a3a2e58b1c8be302ec7b73ef27aa8b99f992f16385fc2d28e05cc02611a2803ec WHIRLPOOL d7d55fa1a0afd1d98553809e30c99685db3ce20b26326ac19115f81c105db0b688c990494a4444f280517c2f56c05da4eddaa931b647fbed61d9db4908f878b7
 AUX mysql.conf 37 SHA256 08daa863ddd50aff0b608621ed26936919211e286440951dca5866141291004d SHA512 7b4940666d21f09fda47e2b24bd252c83af4372f34f1b3410c59d8f439fb7c0166d5a1b8d857bf67f2263f15d95a0fa0b67f225152a18c180b67d28f4ceb5f00 WHIRLPOOL e2765bf32478fa6d3362760845188bc25b5e2a280cac66dc453b593445d8eaa0af4c92704ed20b4561377771b354605477d8cb5420937d1e9f970e0b4b106d85
@@ -12,25 +12,25 @@ AUX mysqld.service 638 SHA256 75cde49c980757250d4e801c3f506f4540ae2afc59d5cd0cff
 AUX mysqld_at.service 694 SHA256 5ba955058dfd26c3ed8a3b7d979ebd3e5cf0e1423cd1e730e400137059d10906 SHA512 f33864294ba2adea940027da32a9b744dd665e2d0325b0ff2a9d2ff7a1b7fbc2885e80ca548d4784c45665826b5fa7c0c73400352db5ac108260ef2e021d6752 WHIRLPOOL 1f703df092bdf03e2ebbab8db0aa618b7482b7116a21e31a6b41e84c3c35887b3ba6bf8c56fc8c74bfb0fabbb603f322502a6e34e745a2038cb1d188abf7d105
 AUX run-s6 383 SHA256 bf92a15f99f62901f9d0b43388c502fbb32b19af04782952c61f73ff48f9ba27 SHA512 403634a67550812fcca757affdaf1e66d003b03e13d9336c5339f135488e7b8a8d72bb44a96539b09c4f71a02131d6002b9b6cd3669db102d2a58f5fe0f2c20e WHIRLPOOL 0e97091a96e24dae574b474497f619bb41a220f7b30b5e463820a34796d3311f2b18b7b14108e9dc947f890c55688d933acffa4bef28f616580818c282586684
 EBUILD mysql-init-scripts-2.0-r1.ebuild 2283 SHA256 ead6787293ce10dfdd52ecc06397cb341324b5c125cb60b26123609e11bcf0d9 SHA512 b05efa479acbc3af0964808756b995c2e26cb442343d58cf3f6b5c1a30e9f9dd62f301bac81586731fdb0cce2dee5f46586b438a1f4fa295199cf85d2fd8478b WHIRLPOOL 1741bb682bc39b5e9ed096d73128198c287ce430309682abd62dfa3f664ecdbba64d396a7b15ba9a02578d9524bb079a770c0c7390ffadb29f6d716e80768766
-EBUILD mysql-init-scripts-2.1_alpha3.ebuild 1745 SHA256 f38e7c1dc676a3ba53049bed2a5eb43511fab44736704c12f069262326301096 SHA512 7e81166166428a2a87b4c00454b84c98b837bc8d001133a8393b623772875c13e4f7f24588b29043b1cac9f0446f1096f9bbd42288bb979a35efd89417821894 WHIRLPOOL 2096c6c080896f2dd91beb88d35a554ec67f0351b8c6162161f1dbd51162411d0f5d3927934dc67528f660f8d033fe80c75d02645d996a851b097a36dd94585d
-MISC ChangeLog 9774 SHA256 8b167c8f65620c1c53209f9a9098d848cf3a512b8623b45750ebc5da7d142a45 SHA512 f1b10a8e4cb7e3a1aa4a1e8a4b1901d3810d3473c2fd6d13a0248dda389d2fadc703cd524f3c66d057bc660f427485a704758a688181ea56cf0d3acff2478660 WHIRLPOOL aca3dc59a607490a53b3b28d765040cbb3f96a22c9ddbd305503055b42bd7a2a364b30775ae6128d14beb32edd5b40a6cbce8d605a5d49c361eaa11cc64996b0
+EBUILD mysql-init-scripts-2.1_alpha4.ebuild 1738 SHA256 204ecf4a814a4a58613e359080e2bad78042efd870d8ddd785959215cdf055d7 SHA512 d0f88a7c4e9889f7cdf2769f60b5243f240c760db899185165639cc32c6f52c9fb2f8040ee66c4ee99494162c2a027e1483891c499474be0800a9fecd03c67f5 WHIRLPOOL 9471fb90ce9f816cc07d768762e12e1b7c63b9926c5b6588039f9b051c9372be9c0abd56db26934b8ea9932522bc1c5dcdc2f8cc6c59170fa3320602d764d86d
+MISC ChangeLog 10019 SHA256 bc664645c2510ff8077652c36fdd804b29f4f2c2d84915f75323996d02088be4 SHA512 c7112d3e3695c89f06422f7af6e1b9ed723961c43d5d9cdf5a97ed32943faa66f035b0e04a6ea95499a8b596bc710361d7235c5dae780ab7fed6bc7ff979b2b7 WHIRLPOOL 697811e2925bf4501f4be76e7b48b50def027a8ffd1a01b4d726ff0d4b37ec280c1597f5632a8f90bab3680f0596b6a25ae5b3d11e003a2902f1c6c647d1ffbd
 MISC metadata.xml 159 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 SHA512 f06513333c3d0b329da5d8ea142c0dbd58d9c40c559d92ae4b0ac7e5fae848f56a832867c79f6931148de7d97302b690ce676f911d477e85ebab7798ce198d92 WHIRLPOOL b99390a39596639a5903a470d8a00dcfdc001c2cd70631526b1586b9a32893c00692fcb19cb2764979f128318dd01782be4d3a84ad82ee202da77d908d56c0b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iQJ8BAEBCABmBQJVZjDpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVdxHMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2M7AQAKa/Cg3juGd6BGYKIrxyv8/8
-QksfdiHGxutQZAIDHZEhY81I+g3t8/rDmu22ZBLve31aDdE12/+QH/96m7qjvl2l
-oN49WTvVz22OopsiA4bfGU2UVmhvMkc8LzghPF0A7Ko8ffJfjdNR1/31pSChaQDL
-3F3Y65AWPChe9CEFAFgBScW1wwjd8oPTBVF1TxkzoT6s4bJ0r9fV55TDxeM0vIt/
-aJu2P3mHoQONRQEF1eEImMmloxBU5mgjdtStcP4zsPeYNyRT8C/jfjMbjWhzR93p
-rvABDEcXagDDY63bDamMtVko+WoiTcwYGC7uVHY/3nj4zsIRbPBVDLf//ztA059g
-VIOKZbaI1RSb8R/QXy4VS+bNJ0vmGySXzF24XOhb6m1GJdWkZtrBO4Nv3YVzg17K
-PYMvSOfXh4bY7U0CpKgEjQ8uJe4pd6/z2UWuQ16zZDmL8AHCSxOKduy3UOytXVcQ
-18VsDlqXNhRWMPZg7uvRT96OhAdooLpUxJuLe4rE2FC2oyjf6rIs6OrnZA4UUU3W
-1ICVMTBYv0CZLjSBLzx5cNlHY/OLpgWLbZYK7d475fdyevEQA2aZE+u5gAjc/cIn
-m1bFMrKS6+LNUiE39mSHZGFzLGeWZIBSqKRlY1Y9i9TsFNs5wvbXgDcFGwdBZ+VC
-0UvSWtot1YrRRVIJ2be4
-=9z7R
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2/n4QAMH0GY1GBtavGWUxQUeYG53L
+p0rcbekqn64x1BMF01wTFId2VZQ58a7uzoN8JEAVlfYt7zyRg1X82n6J81pRmwdd
+6ZJznNE85BLQS1Gxnk8P2sZtrkgBhM4MunxQvBAecP9oDn9kFNRslO/swCf5bSXJ
+MXR+9QsHe+tYNs6zF0ljDq6c80oJILCiudGdnMrY690tHc4W6E+TS/2itonJ4xpJ
+4GWk4cKSTgdFOCnD0kTiEc5Da1fNY0kY4J9xEtKKhtPwD25kW19O16GTXKgILrJr
+keR4qSD6oz67jFxYdCy0BMTKztzA//dOKPrZEYMoRX8fmVYpLX78P3LcIRKmmHDt
+OqnGA8DIFAow78yfo/9y1aGVpDg7dl7YomMWBD2tdJzuuJAoYl8/2Pj/M+g5ftUx
+R8G377J7nH/BultUWhHVYtYrTcajYOXF4V/xAA1PMGP2TxVIELXkwBl4zS3KBWqV
+HVmHYdvjmBeeeIyY6WZ8U+F08P3ECvGng9e3xKvC7AtdY6S2IbZ19nbhEQz8yDi0
+VZkR8QVX665cwImKZxMIwkeCkWheHlQPNFtRzHzZ2VrJSoftJcJeTBWU9a5+hH6G
+cJzxe9zlDx5B6DZ1Mkv3pRb5zJAQNHAgvcpbFdXSzZepvMDKs39Zu8ZlKny01ZhA
+73xopcHFYkjmJcg+6oVF
+=ay5k
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-init-scripts/files/init.d-s6 b/dev-db/mysql-init-scripts/files/init.d-s6
index f856e1d97e98..3c83b0b082c3 100644
--- a/dev-db/mysql-init-scripts/files/init.d-s6
+++ b/dev-db/mysql-init-scripts/files/init.d-s6
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 # 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/files/init.d-s6,v 1.2 2015/05/27 21:01:03 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/init.d-s6,v 1.3 2015/06/09 16:16:26 grknight Exp $
 
 depend() {
 	use net.lo
@@ -16,11 +16,11 @@ get_config() {
 
 mysql_svcname() {
 	local ebextra=
-	case "${SVCNAME}" in
+	case "${svc_name}" in
 		mysql*) ;;
 		*) ebextra=" (mysql)" ;;
 	esac
-	echo "${SVCNAME}${ebextra}"
+	echo "${svc_name}${ebextra}"
 }
 
 extra_commands="checkconfig"
@@ -28,12 +28,14 @@ supervisor=s6
 name=$(mysql_svcname)
 s6_service_timeout_stop="$((1000*${STOP_TIMEOUT:-120}))"
 #s6_svwait_options_start="-U -t $((1000*${STARTUP_EARLY_TIMEOUT:-1000}))"
+svc_name=${RC_SVCNAME%-s6}
+s6_service_path=/var/svc.d/${svc_name}
 
 start_pre() {
 	# Check the config or die
 	checkconfig || return 1
 
-	MY_CNF="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+	MY_CNF="${MY_CNF:-/etc/${svc_name}/my.cnf}"
 
 	if [ ! -r "${MY_CNF}" ] ; then
 		eerror "Cannot read the configuration file \`${MY_CNF}'"
@@ -80,12 +82,13 @@ start_pre() {
 	fi
 
 	# Prepare env files to source
-	mkdir -p "/var/svc.d/${SVCNAME}"
-	echo "MY_CNF=\"${MY_CNF}\"" > "/var/svc.d/${SVCNAME}/env"
-	echo "MY_ARGS=\"${MY_ARGS}\"" >> "/var/svc.d/${SVCNAME}/env"
-	echo "basedir=\"${basedir}\"" >> "/var/svc.d/${SVCNAME}/env"
-	mkdir -p "/var/svc.d/${SVCNAME}/log"
-	echo "SVCNAME=\"${SVCNAME}\"" > "/var/svc.d/${SVCNAME}/log/env"
+	mkdir -p "/var/svc.d/${svc_name}"
+	echo "MY_CNF=\"${MY_CNF}\"" > "/var/svc.d/${svc_name}/env"
+	echo "MY_ARGS=\"${MY_ARGS}\"" >> "/var/svc.d/${svc_name}/env"
+	echo "basedir=\"${basedir}\"" >> "/var/svc.d/${svc_name}/env"
+	mkdir -p "/var/svc.d/${svc_name}/log"
+	echo "SVCNAME=\"${svc_name}\"" > "/var/svc.d/${svc_name}/log/env"
+	echo "S6_LOG_OPTIONS=\"${S6_LOG_OPTIONS}\"" > "/var/svc.d/${svc_name}/log/env"
 }
 
 start_post() {
@@ -100,7 +103,7 @@ start_post() {
 }
 
 checkconfig() {
-	local my_cnf="${MY_CNF:-/etc/${SVCNAME}/my.cnf}"
+	local my_cnf="${MY_CNF:-/etc/${svc_name}/my.cnf}"
 	local basedir=$(get_config "${my_cnf}" basedir | tail -n1)
 	local svc_name=$(mysql_svcname)
 	ebegin "Checking mysqld configuration for ${svc_name}"
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha4.ebuild
index 34eae3b2ac7f..a3e37d3a3e23 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha3.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha4.ebuild
@@ -1,10 +1,10 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha4.ebuild,v 1.1 2015/06/09 16:16:26 grknight Exp $
 
 EAPI=5
 
-inherit systemd
+inherit systemd s6
 
 DESCRIPTION="Gentoo MySQL init scripts."
 HOMEPAGE="http://www.gentoo.org/"
@@ -33,10 +33,8 @@ src_install() {
 	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"
+		s6_install_service mysql "${FILESDIR}/run-s6"
+		s6_install_service mysql/log "${FILESDIR}/log-s6"
 	fi
 
 	newinitd "${FILESDIR}/init.d-2.0" "mysql"
@@ -53,7 +51,8 @@ src_install() {
 }
 
 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"
+	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"
+	fi
 }