Diff mysql-5.6.44-r1 with a mysql-5.6.45-r2

/usr/portage/dev-db/mysql/mysql-5.6.45-r2.ebuild 2019-09-15 13:09:00.000000000 +0300
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4 4
EAPI="6"
5
MY_EXTRAS_VER="20190817-0024Z"
5
MY_EXTRAS_VER="20190822-1908Z"
6 6

  
7 7
CMAKE_MAKEFILE_GENERATOR=emake
8 8

  
9 9
# Keeping eutils in EAPI=6 for emktemp in pkg_config
10 10

  
11 11
inherit eutils flag-o-matic prefix toolchain-funcs \
12
	user cmake-utils multilib-build
12
	cmake-utils multilib-build
13 13

  
14 14
SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.6/${P}.tar.gz
15 15
	https://cdn.mysql.com/archives/mysql-5.6/${P}.tar.gz
......
37 37

  
38 38
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
39 39

  
40
KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
40
KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
41 41

  
42 42
# Shorten the path because the socket path length must be shorter than 107 chars
43 43
# and we will run a mysql server during test phase
......
62 62
	"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
63 63
	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
64 64
	"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
65
	"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
66 65
	"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
67 66
	"${MY_PATCH_DIR}"/20036_all_mysql-5.6-fix-rpl_semi_sync_shutdown_hang.test.patch
68 67
	"${MY_PATCH_DIR}"/20018_all_mysql-5.6.44-fix-libressl-support.patch
......
95 94
"
96 95
DEPEND="virtual/yacc
97 96
	static? ( sys-libs/ncurses[static-libs] )
98
	test? ( dev-perl/JSON )
97
	test? (
98
		acct-group/mysql acct-user/mysql
99
		dev-perl/JSON
100
	)
99 101
	|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
100 102
	${COMMON_DEPEND}"
101 103
RDEPEND="selinux? ( sec-policy/selinux-mysql )
102 104
	client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
103 105
	!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
104
	server? ( !prefix? ( dev-db/mysql-init-scripts ) )
106
	server? (
107
		!prefix? (
108
			acct-group/mysql acct-user/mysql
109
			dev-db/mysql-init-scripts
110
		)
111
	)
105 112
	${COMMON_DEPEND}
106 113
"
107 114
# For other stuff to bring us in
......
125 132
		use server && ! has userpriv ${FEATURES} ; then
126 133
			eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
127 134
	fi
128

  
129
	# This should come after all of the die statements
130
	enewgroup mysql 60 || die "problem adding 'mysql' group"
131
	enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
132 135
}
133 136

  
134 137
pkg_preinst() {
......
198 201
		echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
199 202
	fi
200 203

  
204
	# Don't clash with dev-db/mysql-connector-c
205
	rm \
206
		man/my_print_defaults.1 \
207
		man/perror.1 \
208
		|| die
209

  
201 210
	if use libressl ; then
202 211
		sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
203 212
			"${S}/cmake/ssl.cmake" || die
Thank you!