commit: 3911b4603456960d5fe926cfed2ef44408ef4aab Author: layman <layman <AT> localhost> AuthorDate: Thu May 14 18:24:41 2015 +0000 Commit: Brian Evans <grknight <AT> gentoo <DOT> org> CommitDate: Thu May 14 18:24:41 2015 +0000 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3911b460
Update for changes in latest sys-apps/openrc dev-db/mysql-init-scripts/files/init.d-s6 | 1 + dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha2.ebuild | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-db/mysql-init-scripts/files/init.d-s6 b/dev-db/mysql-init-scripts/files/init.d-s6 index da97b30..984c831 100644 --- a/dev-db/mysql-init-scripts/files/init.d-s6 +++ b/dev-db/mysql-init-scripts/files/init.d-s6 @@ -26,6 +26,7 @@ mysql_svcname() { extra_commands="checkconfig" supervisor=s6 name=$(mysql_svcname) +s6_service_timeout_stop="$((1000*${STOP_TIMEOUT:-120}))" #s6_svwait_options_start="-U -t $((1000*${STARTUP_EARLY_TIMEOUT:-1000}))" start_pre() { diff --git a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha2.ebuild b/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha2.ebuild index b8fcf01..ba6ccfc 100644 --- a/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha2.ebuild +++ b/dev-db/mysql-init-scripts/mysql-init-scripts-2.1_alpha2.ebuild @@ -20,7 +20,7 @@ DEPEND="" # It also NEEDS openrc for the save_options/get_options builtins. RDEPEND=" !<dev-db/mysql-5.1 - s6? ( >=sys-apps/openrc-0.16.1 sys-apps/s6 ) + 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}