| 1 |
commit: 33b99abf2a667e3f9d1ed0b67a718862347ccc21 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 28 18:28:25 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 28 18:28:25 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=33b99abf |
| 7 |
|
| 8 |
dev-db/mysql: Revert config change on 5.6.40-r1 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 11 |
Manifest-Sign-Key: D1F781EFF9F4A3B6 |
| 12 |
|
| 13 |
dev-db/mysql/mysql-5.6.40-r1.ebuild | 47 ++++++++++--------------------------- |
| 14 |
1 file changed, 13 insertions(+), 34 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/mysql/mysql-5.6.40-r1.ebuild b/dev-db/mysql/mysql-5.6.40-r1.ebuild |
| 17 |
index f91b13d..3851573 100644 |
| 18 |
--- a/dev-db/mysql/mysql-5.6.40-r1.ebuild |
| 19 |
+++ b/dev-db/mysql/mysql-5.6.40-r1.ebuild |
| 20 |
@@ -164,16 +164,6 @@ pkg_postinst() { |
| 21 |
einfo |
| 22 |
fi |
| 23 |
fi |
| 24 |
- |
| 25 |
- # Note about configuration change |
| 26 |
- einfo |
| 27 |
- elog "This version of mysql reorganizes the configuration from a single my.cnf" |
| 28 |
- elog "to several files in /etc/mysql/${PN}.d." |
| 29 |
- elog "Please backup any changes you made to /etc/mysql/my.cnf" |
| 30 |
- elog "and add them as a new file under /etc/mysql/${PN}.d with a .cnf extension." |
| 31 |
- elog "You may have as many files as needed and they are read alphabetically." |
| 32 |
- elog "Be sure the options have the appropitate section headers, i.e. [mysqld]." |
| 33 |
- einfo |
| 34 |
} |
| 35 |
|
| 36 |
src_unpack() { |
| 37 |
@@ -381,32 +371,21 @@ src_install() { |
| 38 |
# Configuration stuff |
| 39 |
einfo "Building default configuration ..." |
| 40 |
insinto "${MY_SYSCONFDIR#${EPREFIX}}" |
| 41 |
- [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf |
| 42 |
- cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die |
| 43 |
- eprefixify "${TMPDIR}/my.cnf" |
| 44 |
- doins "${TMPDIR}/my.cnf" |
| 45 |
- insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d" |
| 46 |
- cp "${FILESDIR}/my.cnf.distro-client" "${TMPDIR}/50-distro-client.cnf" || die |
| 47 |
- eprefixify "${TMPDIR}/50-distro-client.cnf" |
| 48 |
- doins "${TMPDIR}/50-distro-client.cnf" |
| 49 |
+ [[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf |
| 50 |
+ local mycnf_src="my.cnf-5.6" |
| 51 |
+ sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ |
| 52 |
+ "${FILESDIR%/}/${mycnf_src}" \ |
| 53 |
+ > "${TMPDIR%/}/my.cnf.ok" || die |
| 54 |
+ use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok" |
| 55 |
+ if use latin1 ; then |
| 56 |
+ sed -i \ |
| 57 |
+ -e "/character-set/s|utf8|latin1|g" \ |
| 58 |
+ "${TMPDIR%/}/my.cnf.ok" || die |
| 59 |
+ fi |
| 60 |
+ eprefixify "${TMPDIR%/}/my.cnf.ok" |
| 61 |
+ newins "${TMPDIR}/my.cnf.ok" my.cnf |
| 62 |
|
| 63 |
if use server ; then |
| 64 |
- mycnf_src="my.cnf.distro-server" |
| 65 |
- sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ |
| 66 |
- "${FILESDIR}/${mycnf_src}" \ |
| 67 |
- > "${TMPDIR}/my.cnf.ok" || die |
| 68 |
- if use prefix ; then |
| 69 |
- sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \ |
| 70 |
- "${TMPDIR}/my.cnf.ok" || die |
| 71 |
- fi |
| 72 |
- if use latin1 ; then |
| 73 |
- sed -i \ |
| 74 |
- -e "/character-set/s|utf8|latin1|g" \ |
| 75 |
- "${TMPDIR}/my.cnf.ok" || die |
| 76 |
- fi |
| 77 |
- eprefixify "${TMPDIR}/my.cnf.ok" |
| 78 |
- newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf |
| 79 |
- |
| 80 |
einfo "Including support files and sample configurations" |
| 81 |
docinto "support-files" |
| 82 |
local script |
Archives