commit: 4a0854adc994570e8307d4dfde9ed86b130ec020 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Thu Aug 22 19:22:43 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Thu Aug 22 19:45:25 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a0854ad
dev-db/mysql: migrate to GLEP 81 Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> ...mysql-5.6.45-r1.ebuild => mysql-5.6.45-r2.ebuild} | 20 ++++++++++++-------- dev-db/mysql/mysql-5.7.27-r1.ebuild | 18 +++++++++++------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dev-db/mysql/mysql-5.6.45-r1.ebuild b/dev-db/mysql/mysql-5.6.45-r2.ebuild similarity index 98% rename from dev-db/mysql/mysql-5.6.45-r1.ebuild rename to dev-db/mysql/mysql-5.6.45-r2.ebuild index dfea0d2a2a4..da38c876ad5 100644 --- a/dev-db/mysql/mysql-5.6.45-r1.ebuild +++ b/dev-db/mysql/mysql-5.6.45-r2.ebuild @@ -2,14 +2,14 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -MY_EXTRAS_VER="20190817-0024Z" +MY_EXTRAS_VER="20190822-1908Z" CMAKE_MAKEFILE_GENERATOR=emake # Keeping eutils in EAPI=6 for emktemp in pkg_config inherit eutils flag-o-matic prefix toolchain-funcs \ - user cmake-utils multilib-build + cmake-utils multilib-build SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.6/${P}.tar.gz https://cdn.mysql.com/archives/mysql-5.6/${P}.tar.gz @@ -94,13 +94,21 @@ COMMON_DEPEND=" " DEPEND="virtual/yacc static? ( sys-libs/ncurses[static-libs] ) - test? ( dev-perl/JSON ) + test? ( + acct-group/mysql acct-user/mysql + dev-perl/JSON + ) || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) ${COMMON_DEPEND}" RDEPEND="selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster - server? ( !prefix? ( dev-db/mysql-init-scripts ) ) + server? ( + !prefix? ( + acct-group/mysql acct-user/mysql + dev-db/mysql-init-scripts + ) + ) ${COMMON_DEPEND} " # For other stuff to bring us in @@ -124,10 +132,6 @@ pkg_setup() { use server && ! has userpriv ${FEATURES} ; then eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." fi - - # This should come after all of the die statements - enewgroup mysql 60 || die "problem adding 'mysql' group" - enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" } pkg_preinst() { diff --git a/dev-db/mysql/mysql-5.7.27-r1.ebuild b/dev-db/mysql/mysql-5.7.27-r1.ebuild index 45c4fd67d30..2edc05182a4 100644 --- a/dev-db/mysql/mysql-5.7.27-r1.ebuild +++ b/dev-db/mysql/mysql-5.7.27-r1.ebuild @@ -9,7 +9,7 @@ CMAKE_MAKEFILE_GENERATOR=emake # Keeping eutils in EAPI=6 for emktemp in pkg_config inherit cmake-utils eutils flag-o-matic linux-info \ - prefix toolchain-funcs user multilib-minimal + prefix toolchain-funcs multilib-minimal SRC_URI="https://cdn.mysql.com/Downloads/MySQL-5.7/${PN}-boost-${PV}.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-${PV}.tar.gz @@ -112,13 +112,21 @@ DEPEND="${COMMON_DEPEND} experimental? ( net-libs/rpcsvc-proto ) ) static? ( sys-libs/ncurses[static-libs] ) - test? ( dev-perl/JSON ) + test? ( + acct-group/mysql acct-user/mysql + dev-perl/JSON + ) " RDEPEND="${COMMON_DEPEND} !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c dev-libs/protobuf:= ) selinux? ( sec-policy/selinux-mysql ) - server? ( !prefix? ( dev-db/mysql-init-scripts ) ) + server? ( + !prefix? ( + acct-group/mysql acct-user/mysql + dev-db/mysql-init-scripts + ) + ) " # For other stuff to bring us in # dev-perl/DBD-mysql is needed by some scripts installed by MySQL @@ -209,10 +217,6 @@ pkg_setup() { use server && ! has userpriv ${FEATURES} ; then eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." fi - - # This should come after all of the die statements - enewgroup mysql 60 || die "problem adding 'mysql' group" - enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user" } pkg_preinst() {
