summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2014-05-16 01:49:59 +0000
committerBrian Evans <grknight@gentoo.org>2014-05-16 01:49:59 +0000
commitb7f974391db7d7f24401c96be43b91d8307fc454 (patch)
treeca16e99c8b8af8d7b1e4767e757caf34eb2cb812 /dev-db/mysql-init-scripts
parentVersion bump. (diff)
downloadhistorical-b7f974391db7d7f24401c96be43b91d8307fc454.tar.gz
historical-b7f974391db7d7f24401c96be43b91d8307fc454.tar.bz2
historical-b7f974391db7d7f24401c96be43b91d8307fc454.zip
Revbump to fix bug 491348, remove old
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x67C78E1D
Diffstat (limited to 'dev-db/mysql-init-scripts')
-rw-r--r--dev-db/mysql-init-scripts/ChangeLog10
-rw-r--r--dev-db/mysql-init-scripts/Manifest17
-rw-r--r--dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d-r1 (renamed from dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d)38
-rw-r--r--dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r3.ebuild56
-rw-r--r--dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r7.ebuild (renamed from dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild)24
5 files changed, 58 insertions, 87 deletions
diff --git a/dev-db/mysql-init-scripts/ChangeLog b/dev-db/mysql-init-scripts/ChangeLog
index 8b4d274a8891..df01f197e59b 100644
--- a/dev-db/mysql-init-scripts/ChangeLog
+++ b/dev-db/mysql-init-scripts/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for dev-db/mysql-init-scripts
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.38 2014/01/11 09:33:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/ChangeLog,v 1.39 2014/05/16 01:49:43 grknight Exp $
+
+*mysql-init-scripts-2.0_pre1-r7 (16 May 2014)
+
+ 16 May 2014; Brian Evans <grknight@gentoo.org> +files/mysql-5.1.67-init.d-r1,
+ +mysql-init-scripts-2.0_pre1-r7.ebuild, -files/mysql-5.1.53-init.d,
+ -mysql-init-scripts-2.0_pre1-r2.ebuild,
+ -mysql-init-scripts-2.0_pre1-r3.ebuild:
+ Revbump to fix bug 491348, remove old
11 Jan 2014; Pacho Ramos <pacho@gentoo.org>
mysql-init-scripts-2.0_pre1-r6.ebuild:
diff --git a/dev-db/mysql-init-scripts/Manifest b/dev-db/mysql-init-scripts/Manifest
index a73e2e75e016..4dcef7629a8c 100644
--- a/dev-db/mysql-init-scripts/Manifest
+++ b/dev-db/mysql-init-scripts/Manifest
@@ -3,8 +3,8 @@ Hash: SHA256
AUX logrotate.mysql 491 SHA256 a82f4497594e03cce55dce1f008206bafb85e3e4c6fc1f43c7a90d57be5f7aa1 SHA512 d5d3a753938c6c790a8202cd4685cc6a539e10519032fd26693130b51ef6a35a3a2e58b1c8be302ec7b73ef27aa8b99f992f16385fc2d28e05cc02611a2803ec WHIRLPOOL d7d55fa1a0afd1d98553809e30c99685db3ce20b26326ac19115f81c105db0b688c990494a4444f280517c2f56c05da4eddaa931b647fbed61d9db4908f878b7
AUX mysql-5.1.53-conf.d 3071 SHA256 45da613841969adf564f9f2f08257f749539651ee2fae85266f59fdd7a6f8123 SHA512 d8b861bea36e6701f6959edcac893a5e553eb9eeac70719789635d989a5b9bd90c85643ccc51b86df01879a730c0da3815169d3b16984f3342e10e2f5096a67a WHIRLPOOL d1c06e8eb7d3ae239b9ffae1a273bee318db1429ab4ea55eba7e6db94f826e711cefaf9f67a53778e55dff94a49719644eeb813237e0e94b4ef926d38b0c39eb
-AUX mysql-5.1.53-init.d 3354 SHA256 6abb1aeb5b82f8911aca59daf5dfbe199bc4d602842bf2ebec20830ed2869203 SHA512 a3a2f317256d2fdd50690ffc8a89f967a1787c4a367b5e5b7404db7fca184dd0ea858e1f0dca259fb2e7e40f03205a804100e434a5d1f116d5fb316e9a59cd78 WHIRLPOOL 5aaee393bab36f62cb7745d1fc7ec62cf0513eaa69da3d6800fe9ec73a18d88cb8aa91b8c3715d999a3d99f2adfa3f0ee9417ac710cf17cda401d27dc9ac2d98
AUX mysql-5.1.67-init.d 3289 SHA256 a08df7aa811607f45a40ee1a4aa56eff569568f9bc69f2f76192cc15e55f21b0 SHA512 cab8d33bd07c6981e70e67ae3b5ee4bf681c9fa453432a9994df1064ec492a6ef8be41b67472f4b893002b481ecfb13be7d4ffeefc3d92f81f5a12dea6edbd1b WHIRLPOOL aaf95c17c41fedd43f54e143f8e39e17735a4b631532b3cbbd81180a84a0e2c209582c31d875b5f0f3d3050c55fbd7afefdcf452da53d1b91c41a1240db90257
+AUX mysql-5.1.67-init.d-r1 3601 SHA256 6c60bf7746a63f0daac26e4de132e675d6aac9f04e2b4bc758776ab67f61146a SHA512 2b29fc00ce7d1ae5170a25f1c48c2cf472a5a88f5612e799088242b21921192fe61b21afcb657cf7a7d217b281318e3e7a681326be207b1271ec0ae2a10ea663 WHIRLPOOL 39c27966e85d9722caa35def115ae200095fe577f76dd37659312cbb5bb05b071bd799622b0f588476c59a058727b78358b4d21687e96554adfd18752d3772a5
AUX mysql.conf 37 SHA256 08daa863ddd50aff0b608621ed26936919211e286440951dca5866141291004d SHA512 7b4940666d21f09fda47e2b24bd252c83af4372f34f1b3410c59d8f439fb7c0166d5a1b8d857bf67f2263f15d95a0fa0b67f225152a18c180b67d28f4ceb5f00 WHIRLPOOL e2765bf32478fa6d3362760845188bc25b5e2a280cac66dc453b593445d8eaa0af4c92704ed20b4561377771b354605477d8cb5420937d1e9f970e0b4b106d85
AUX mysql.conf.d 3273 SHA256 ee049781a3885305ce9999371198ff54f97fee4d2ad0814ba3aa3a03abc2724c SHA512 b2d83b2b5a3966d580bc19b6da9dd8f124a2dde29f34258699b759cc7bf863411a44f4f3930d7102458e5020ca4bfb91b99bfa7c4de5318e6cad9e9663e84dae WHIRLPOOL 61d305da26bca89ec92a1ee0bd51e968844df324e9794ffce284e125979af25a7455a52d8ca3a96946ace02db07d00936cc3f3a5520aec957a20e9928be9d8d8
AUX mysql.rc6 10661 SHA256 039e54883fc42d3b9ddfdfca46bb906420a7d47156f5b1392292f4aa3f712149 SHA512 6a6349c5f3877a4ba81e2979f1eaad561cfea43029c46a2398624ffeca0c190aa7814813569605edca8ce70286b4af7854db27412975e446c357e09ce2cc6a66 WHIRLPOOL 5e80c8b36a97274ec1964218f27f15194269e1073fd9979ffb7b7512e54b8a1884970189f9f391b4871140ac5e84a4e89c7e78a3635ee2f8df78320b62a2aa9e
@@ -14,15 +14,18 @@ AUX mysqld_at.service 694 SHA256 5ba955058dfd26c3ed8a3b7d979ebd3e5cf0e1423cd1e73
AUX mysqlmanager.conf.d 1009 SHA256 35353f585cc9d3f97bbcfe77224d183e0fedcf4134377b8bff4c278462577cc7 SHA512 8900849a20ad8fc61e480bdc668397a108950cae69a138811d0fd0b82aca071b77e3af863df20e9c7d478c9842bb5e8407fc8313a31154cfa866f122c10a2d31 WHIRLPOOL 90abd9d197e0dc90110a6056a9c21720fe2ec80356400c8ed4c43bb477317e4de7796479663d87a0b5bb1c9522a8233ae3b9c1ad72cdd850f5fada36237712d1
AUX mysqlmanager.rc6 6632 SHA256 0d37cb3199a2752604a105d54340a61b9ee062e6c1d977a863628b694d93e96d SHA512 edaebc6a75157ced72556a64acb81e0761c0005fb4b6ca43778939577303e76cc7117ad3847eabaa28ed670e50f84366ae9773d3f7c88320f7690581f009f415 WHIRLPOOL b9840e0e2f0e8b1205dfbf066e6f89cd1cc053cbb8396bbfef955843a49e8ab36f08b6f5dc254eeebe5f5c5fa0a882a67d64aa9927f49716d201026229b4e4f0
EBUILD mysql-init-scripts-1.2.ebuild 766 SHA256 c052738cd94042676a6c082cfa2544acf3663c020e7705c5712a3c1254cbf762 SHA512 c34778c8528aa15b0534f87e71242df3f5e00536a8f864465b30f4ab946f50e6e574c14c6429883e55471fddedd92e98daa32e899062aa8a682338290e4f25e4 WHIRLPOOL cf15c8c9c639cc2d02e60b67dd0506a82c9d2813a0e239c7164c432ef1c02255722ae424f979dadd2b77826d1d5d39388f34101b4502c6a70096c82d8833fcea
-EBUILD mysql-init-scripts-2.0_pre1-r2.ebuild 1954 SHA256 fa597649d9c25f47bfc2564aaba40c42f108d0fd1758fb6c7106e8d19d3f5ceb SHA512 005d3f035500ad2f74da1806d954ebf44cfb2df651bc87ebe2101500844927ac859df8241f895cbf28ce95b1fa5fd692831048ec22f672ee70fb2e156dbcb280 WHIRLPOOL 754626c5db38fb08a8ec3a96e321e17ecb3ebf66cb6b772716518ad42dbd78c7baacff3d6eba5d49331273dfa9914cdddab6f887eb6969aa6541b99733bbf884
-EBUILD mysql-init-scripts-2.0_pre1-r3.ebuild 1955 SHA256 b23a896f25485065c9452b328d70e817e14155992d72e8bed648a81177682bdf SHA512 c0b00e7cb86eae1e886025220fef3d37f3d8ad338fc26aa90efd2c2b04ceab3174179d09c5abf69d56a1a2879e5c42757c7d6e7f8dd912438831a961fd05b551 WHIRLPOOL dab4f65b8d67f0ac46cd643886292ec2b38cf811a51bf50cd0027d614ff89a8bb074883f8e02fa01f9fb0f865b0f10d9dfdf4a3567f066773fd30b984be3d7e2
EBUILD mysql-init-scripts-2.0_pre1-r6.ebuild 2205 SHA256 dd5a44060e2f6c1ab52453cfb86531e7f486d5f447c35ffee5288e1e8beaa4c8 SHA512 20af2e2e238a2500d58246a5a5e32098f6f4827c0f0f99082a409697e4bee1ac83f42cab47f02992de79f60b2267d6009ab91764eaf7020972138764a10a355e WHIRLPOOL 5cbc3c29f4d8a071e133bd1b199b8c518bb3346d2277f6255e4ec1fe402e3489152757f79369487ae14efb31a71e9cae4ba15d7e40aa802d5885cf91905dd6e0
-MISC ChangeLog 6409 SHA256 46d088d50957b34d6266955bb20526c47ff3b35d593debab561dba297182dfbb SHA512 dcd8ed416a84d3d3130d4058e338ddc98e14c4b695b3f13eddc8edaeefacdca77c49bc737694cd2d3a20f33756a855f618cf3e6f5ad1f42de647c1b9c4826d29 WHIRLPOOL 1efdf336ac388abafd236f9558280ab95d894806d9e8e2fa3c10a585afaa4ab0546c5bbfa74a0ef449c50120cee18552db469732ab6a63116c93e4e62cd98ce7
+EBUILD mysql-init-scripts-2.0_pre1-r7.ebuild 2311 SHA256 929afc49ea59123e73f0da93905a1ad0ca1035a31863318fb2d857505f033330 SHA512 997db54c08e237c00d350c77b12aa5ecedd7b77fe32b3502473ad7a145bc81827b140f2967677802776f362a5e6b75df3aa92b1c909d011f99d6551f21b08649 WHIRLPOOL 91a0804ca22f816a2bb9a21a4005f5428c3d58dd52f131f58a50325e4df1526ff8eda14e1d97ca366442dad911d5c753dcd971dd8baea27c03d0adeaaa5a128e
+MISC ChangeLog 6734 SHA256 a38ccc22d6953ad90cbe3e4dc7d91a70d2ef38fd0f39b81edcdd686fa24b07a8 SHA512 d7be25e0b087c42dbb3826ae43058ce78cc2cc316c2eaa57db3d83a5bb7d076aebf04c723649d2f8b908f83e0b146e61f0b568de0d02b931dca27ccd75219ac7 WHIRLPOOL 426ae55fab1359632cab5ce8db91c342419e5d965cb932c0b3b3efd196497d78055a71bd2cf1e8dbaf7f5d8ffd630f1510d83783917782f87b4e5d78e12c2fde
MISC metadata.xml 159 SHA256 5cfd5aa0e8104c0326b5f4c9205a6449a94e0f6f6abfd2626f1e7a8fe77b98b7 SHA512 f06513333c3d0b329da5d8ea142c0dbd58d9c40c559d92ae4b0ac7e5fae848f56a832867c79f6931148de7d97302b690ce676f911d477e85ebab7798ce198d92 WHIRLPOOL b99390a39596639a5903a470d8a00dcfdc001c2cd70631526b1586b9a32893c00692fcb19cb2764979f128318dd01782be4d3a84ad82ee202da77d908d56c0b5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iEYEAREIAAYFAlLRD80ACgkQCaWpQKGI+9R74wCeOly26/xOOlXidAHhoXXyDZ3j
-JfAAn20smqJS283Nax9PXc8v4WOfuijg
-=PDfM
+iQEcBAEBCAAGBQJTdW7CAAoJEE4V4vFnx44duR4H/i5cwY3QLVdHhM3bEwto1kGx
+P47k042O+8nN+bS+z3nEUNwU+/72lOYYdSHPmuqBcFwzQcODZDYyiX1aLzsEykB4
+9cW3KaeBQUF5ucj299nX9nBvjpkxD0/UFXKZniwjml3EZvZb0mWiyB/ckUR+3ll9
+s9Zcx3wIJtaPKURJtBXfhjd0L9J5fINBAVcPNh7UVOKeRyJ8C9XubyaYOcl5My+U
+F+/bux9yP8rBqft59VeAM8R/Q0TkjJa6Shw0cx5C9q/vI0pkfpmBpuvOtYJIopYJ
+5N5CGELWmOHIj2McUhso2OJNlEu+1wETiRC0AQ9puabVbtAMM9vxWcy2bSMiDeM=
+=4jkE
-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d b/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d-r1
index d824b6ae650e..5ff7c32aa108 100644
--- a/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d
+++ b/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d-r1
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.53-init.d,v 1.1 2011/01/13 20:06:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/files/mysql-5.1.67-init.d-r1,v 1.1 2014/05/16 01:49:43 grknight Exp $
depend() {
use net.lo
@@ -25,12 +25,12 @@ mysql_svcname() {
start() {
# Check for old conf.d variables that mean migration was not yet done.
- local varlist="${!mysql_slot_*} ${!MYSQL_BLOG_PID_FILE*} ${!STOPTIMEOUT*}"
- varlist="${varlist// /}"
+ set | egrep -sq '^(mysql_slot_|MYSQL_BLOG_PID_FILE|STOPTIMEOUT)'
+ rc=$?
# Yes, MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING is a hidden variable.
# It does have a use in testing, as it is possible to build a config file
# that works with both the old and new init scripts simulateously.
- if [ -n "${varlist}" -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
+ if [ "${rc}" = 0 -a -z "${MYSQL_INIT_I_KNOW_WHAT_I_AM_DOING}" ]; then
eerror "You have not updated your conf.d for the new mysql-init-scripts-2 revamp."
eerror "Not proceeding because it may be dangerous."
return 1
@@ -59,20 +59,24 @@ start() {
fi
if [ ! -d "${datadir}"/mysql ] ; then
- eerror "You don't appear to have the mysql database installed yet."
- eerror "Please run /usr/bin/mysql_install_db to have this done..."
+ # find which package is installed to report an error
+ local EROOT=$(portageq envvar EROOT)
+ local DBPKG_P=$(portageq match ${EROOT} $(portageq expand_virtual ${EROOT} virtual/mysql))
+ if [[ -z ${DBPKG_P} ]] ; then
+ eerror "You don't appear to have a server package installed yet."
+ else
+ eerror "You don't appear to have the mysql database installed yet."
+ eerror "Please run \`emerge --config =${DBPKG_P}\` to have this done..."
+ fi
return 1
fi
local piddir="${pidfile%/*}"
- if [ ! -d "$piddir" ] ; then
- mkdir "$piddir" && \
- chown mysql "$piddir"
- rc=$?
- if [ $rc -ne 0 ]; then
- eerror "Directory $piddir for pidfile does not exist and cannot be created"
- return 1
- fi
+ checkpath -d --owner mysql:mysql --mode 0755 "$piddir"
+ rc=$?
+ if [ $rc -ne 0 ]; then
+ eerror "Directory $piddir for pidfile does not exist and cannot be created"
+ return 1
fi
local startup_timeout=${STARTUP_TIMEOUT:-900}
@@ -80,7 +84,7 @@ start() {
local tmpnice="${NICE:+"--nicelevel "}${NICE}"
local tmpionice="${IONICE:+"--ionice "}${IONICE}"
start-stop-daemon \
- ${DEBUG/*/"--verbose"} \
+ ${DEBUG:+"--verbose"} \
--start \
--exec "${basedir}"/sbin/mysqld \
--pidfile "${pidfile}" \
@@ -110,7 +114,7 @@ stop() {
local stop_timeout=${STOP_TIMEOUT:-120}
start-stop-daemon \
- ${DEBUG/*/"--verbose"} \
+ ${DEBUG:+"--verbose"} \
--stop \
--exec "${basedir}"/sbin/mysqld \
--pidfile "${pidfile}" \
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r3.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r3.ebuild
deleted file mode 100644
index 1b962c89fa10..000000000000
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 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.0_pre1-r3.ebuild,v 1.13 2013/05/20 17:59:08 ago Exp $
-
-DESCRIPTION="Gentoo MySQL init scripts."
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm 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.
-RDEPEND="!<dev-db/mysql-5.1
- sys-apps/openrc"
-
-src_install() {
- newconfd "${FILESDIR}/mysql-5.1.53-conf.d" "mysql"
- newinitd "${FILESDIR}/mysql-5.1.67-init.d" "mysql"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/logrotate.mysql" "mysql"
-}
-
-pkg_postinst() {
- grep -sq mysql_slot "${ROOT}"/etc/conf.d/mysql
- old_conf_present=$?
- grep -sq get_slot_config "${ROOT}"/etc/init.d/mysql
- old_init_present=$?
-
- egrep -sq 'MY_CNF|MY_ARGS|(STARTUP|STOP)_TIMEOUT' "${ROOT}"/etc/conf.d/mysql
- new_conf_present=$?
- egrep -sq 'MY_ARGS|STOP_TIMEOUT' "${ROOT}"/etc/init.d/mysql
- new_init_present=$?
-
- einfo "Please note that if you are using multiple internal 'slots' in the"
- einfo "old conf.d file, you should use multiple init files now."
- echo old $old_conf_present $old_init_present
- echo new $new_conf_present $new_init_present
-
- # new scripts present
- if [ $new_conf_present -eq 0 -a $new_init_present -eq 0 -a \
- $old_conf_present -eq 1 -a $old_init_present -eq 1 ]; then
- :
- elif [ $old_conf_present -eq 0 -a $old_init_present -eq 0 -a \
- $new_conf_present -eq 1 -a $new_init_present -eq 1 ]; then
- ewarn "Old /etc/init.d/mysql and /etc/conf.d/mysql still present!"
- ewarn "Update both of those files to the new versions!"
- else
- eerror "DANGER, mixed update of /etc/init.d/mysql and /etc/conf.d/mysql"
- eerror "detected! You must update BOTH to the new versions"
- fi
-}
diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r7.ebuild
index cbd5419e1879..5fea798eef67 100644
--- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r2.ebuild
+++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r7.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.0_pre1-r2.ebuild,v 1.9 2013/04/30 01:01:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-init-scripts/mysql-init-scripts-2.0_pre1-r7.ebuild,v 1.1 2014/05/16 01:49:43 grknight Exp $
+
+EAPI=5
+
+inherit systemd
DESCRIPTION="Gentoo MySQL init scripts."
HOMEPAGE="http://www.gentoo.org/"
@@ -8,18 +12,26 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~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.
-RDEPEND="!<dev-db/mysql-5.1
- sys-apps/openrc"
+RDEPEND="!<dev-db/mysql-5.1"
+# Need to set S due to PMS saying we need it existing, but no SRC_URI
+S=${WORKDIR}
src_install() {
newconfd "${FILESDIR}/mysql-5.1.53-conf.d" "mysql"
- newinitd "${FILESDIR}/mysql-5.1.53-init.d" "mysql"
+ newinitd "${FILESDIR}/mysql-5.1.67-init.d-r1" "mysql"
+
+ # 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"