Add dev-db/mysql-init-scripts-2.2-r3

3 files changed, 79 insertions, 2 deletions

diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index f6f11e3d..b22b6f6d 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -1,6 +1,6 @@
 AUX conf.d-2.0 2944 SHA256 b94756f2a5fe43893dea90fadbe47308e50fb4dbe2cbaa2676f34fa88181d8e7 SHA512 2781e2caefed0c8be9c612f92cecf5a572dc17b97519034637a2b3f98a88af02dd8973f6c6b2af524d235067df6866409d1fe9d56740bfd0efb09948073c8d3b WHIRLPOOL d174ea0c58217b4403a640c06dba06db3d6ecd650ae66a24051e4319f13fb8e6f603c01dee6e9af5b91c645e67f186817182c808e0ba7d7282d51d3ac932ea86
 AUX init.d-2.0 4534 SHA256 b6eb4576e654b1f4a8138df04408935a07fab69775e9663f736133c71bbb414b SHA512 f3ba5b3f9b6d60ecdcda3a3aa38f62991969d597586ca0bdc70f2c2901409298f88cab7f98665edd486a6ce312f27c74796afa9c2d880a132516c3b2c002d69c WHIRLPOOL 13bff6f9c7882f7bbc8f755d862f0eea80d7d9e40edf308b3347035cb324f12e649253eafceff8332fa4219f62dab2588740079bb68f0d68c504f3a594a95ac8
-AUX init.d-2.2 5605 SHA256 aeeb81c6aeff7e62cd51974e8cf9166fb950d4638ccdd1360faf4a0895125715 SHA512 9569cddda48ca2f8dd39497ad6c7f287fc4615cd9a9a03f270757eb5ee5dfd2ceba9a22d69bee80164c13e7ac9c6fd5ba3c097494c96fdeee1425e9bac047820 WHIRLPOOL 4e6f17e88ae0b30cebfa14813795bafe48d3cfec0f02ebbf7da7a4d620af056af05894168af52666cb8d3d0a5632c55971cc661aad8cbf148e46ec1e54dce551
+AUX init.d-2.2 5721 SHA256 fea84afede183b404126973d8815082afe83d9689fb1c8b785a3fccfbde63695 SHA512 9ae6b410fb6ba335304dec460860528dd9317abc8a53f574c655ea994932f10d6427e690185ed467933ad10ce93d6e6a3fef5213c1d5c725ef4b7147d0436411 WHIRLPOOL bd387eb80fe1f992b4eb138e03e0ea2fa59355351aa558239f9d92434dfc1dd214b069a5727b0259f46d64d5ca08c4ab80bec3d0ecbaa8fd7cd569dcf1acc7b4
 AUX init.d-s6 3879 SHA256 4499808045497addaf504abeb2de80de7259e2f2f8468762157ff4612e40d602 SHA512 dc3b7bb441b3df58ecb99d977773365324b43474b1c2d3f9bbd8e18542579008445bbe788e78bc4ef6c1cd0cb51d0c2f16a5577d3840aa125383715f1938b8d9 WHIRLPOOL 7961756c3cc888bd52b321452a2c68bdd6bbc3ed1cedc76e5bab5ced7f4d1d6d910e75886be3d0388c9ecaaf341a7bc17374705efafbf67dc1dc27f9438cb028
 AUX init.d-s6-2.2 4979 SHA256 e7c30a611b20a4a3a788b99e5daf5c21c20c0c6a639c4fb6c60162a6f3423721 SHA512 1fb490f60ca8705da800a6bc7a5294555ff652897aa23b85e053ba7d99a2414c1747a7015bd1f80fd4fc10b1dd7e617e1700d18715ecf6989309d5ef0655b8e3 WHIRLPOOL 498b461eda325e23270b56ac7daebfa266e530adab6256293ab5effc9c649dbbac11f9b865949484d49070f6c5e755856de706d974753d4e635be7f37956e90b
 AUX init.d-supervise 5313 SHA256 8e5050196aa3160ac05e729d87e770a1889fdeaf06a698e531bbcb2f5b9b8a43 SHA512 5c2b9399934a65eeeac263eb1ed50b9a0f7c663078d49f2da4a879fec571c50560f6c9b9c5ae8512e3c2c7733dff264a9d6d9d52fcc7cd22f8511e1c5da58605 WHIRLPOOL b4ee2d8a63d804f52f3711ddccd29ccd8a3d60cdac9f1dda112dabf3129a0e766523dbc46ff8269ba7f161a4a9d8cbcf1798fe40bf65bf60fa8fd3ba74aaaa80
@@ -13,3 +13,4 @@ AUX mysqld_at-v2.service 1174 SHA256 a6c91b4940d246021a705898a17518cd9aea4b6c860
 AUX run-s6 268 SHA256 387eff4eeef85711e052cc5ee7f532f5574e35ff1875c490316b65203009e750 SHA512 82be247195f6d9d230b063e9bda393bab8855382c2f3e5eb4d427fc1eb7e23dbd8c90939224ff2b5e4116a5c9d3f26ebdc9b9f548cde91e7c1217f4f8500c0d3 WHIRLPOOL e7ea48cf98bf7c2a4dd433db0fd64344e62da19f8d7f3b0d092fcd145d69ff1794b432da7a122fef5738684674986e8743141c328e02d1b789a0e4cc8abb32bb
 EBUILD mysql-init-scripts-2.1-r1.ebuild 2039 SHA256 8726c8bb367bde9268c9a6dd73ecf6f724e58378418fc846a067b168e1683c25 SHA512 e2a689225c5a2c7e5c5bda0ce02baa2706e5fb4eecf282dbe3564f25b76d158c2d381a149e5111f0a11444060f1009afc54a958fc73d76c387e4c2570df9dd4a WHIRLPOOL 902a95b98dc4f2411593c9e057d850963d80daff12d7a101a91a17d86899e0489951264767acbf786d9b519053c39b37cff9178536deb2b9255a4c1153174d91
 EBUILD mysql-init-scripts-2.2-r2.ebuild 2090 SHA256 917641662cd127e5a96190118fe53bcab614e5a12156d7486dbd44126834f1ea SHA512 44cd043446cd27e93a997a1a19658d79d6c607d08f0ea538e650b50ec2da5a4101febedc0cd47d5339c6fccf04f12aa0e15bea63bb7a8436870763ffccc133df WHIRLPOOL f495c754fc915c18e99e4e5d4b171bf258b6f33c3973821a11fb9aca2fa2a9b24bcc03d80e0f27eff176de528155c8b75f60b0eb12a3308c65b9e6f4dc3b972d
+EBUILD mysql-init-scripts-2.2-r3.ebuild 2017 SHA256 501fe99fbcf8a548571be231ae61e59e4625da47ea1dfc8b6bf90c90ca5078a3 SHA512 ab6bd2723be63816da3bc8d093c19f6a8278776614d42b739f7c4eaaeec151f20ab3517cef8de50f412ecd7d2792c3e5e68690cef3a0438846d8f59e4554d78b WHIRLPOOL 59080cc672e254ef155c593dbb2b2ecea150935e8ba5725036fdc2866b04766fbf61fc269a85383650bbe8816bef7d39106490be490cdc71f383b0a5dd426a75
diff --git a/dev-db/mysql-init-scripts/files/init.d-2.2 b/dev-db/mysql-init-scripts/files/init.d-2.2
index 490d481d..24114e6f 100644
--- a/dev-db/mysql-init-scripts/files/init.d-2.2
+++ b/dev-db/mysql-init-scripts/files/init.d-2.2
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_commands="checkconfig"
@@ -12,6 +12,9 @@ depend() {
 	use net.lo
 	# localmount needed for $basedir
 	need localmount
+	# This service has its own timeout and may need to wait for repairs
+	# or remote synchronization
+	keyword -timeout
 }
 
 get_config() {
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild
new file mode 100644
index 00000000..97fe3baf
--- /dev/null
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.2-r3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit systemd s6
+
+DESCRIPTION="Gentoo MySQL init scripts."
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="s6 systemd"
+
+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 s6; then
+		if use amd64 || use x86 ; then
+			newconfd "${FILESDIR}/conf.d-2.0" "mysql-s6"
+			newinitd "${FILESDIR}/init.d-s6-2.2" "mysql-s6"
+			s6_install_service mysql "${FILESDIR}/run-s6"
+			s6_install_service mysql/log "${FILESDIR}/log-s6"
+		fi
+	fi
+
+	newinitd "${FILESDIR}/init.d-2.2" "mysql"
+	newinitd "${FILESDIR}/init.d-supervise" "mysql-supervise"
+
+	# systemd unit installation
+	if use systemd; then
+		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"
+		systemd_dotmpfilesd "${FILESDIR}/mysql.conf"
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotate.mysql" "mysql"
+}
+
+pkg_postinst() {
+	if use s6; then
+		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"
+		fi
+	fi
+
+	if use systemd; then
+		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."
+	fi
+}
+
+# vi: set diffopt=iwhite,filler: