commit:     799be1104533d4c6b07300a0c74f650754066957
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 00:05:32 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 00:05:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=799be110

Revert "dev-db/mariadb: Add net-libs/libnsl dependencies"

This reverts commit b081514850b14f9d2e434865385f1994e456dfc9.

 dev-db/mariadb/Manifest                            |   2 +
 ...riadb-10.2.14.ebuild => mariadb-10.2.12.ebuild} | 129 ++++++++-------------
 ...riadb-10.2.14.ebuild => mariadb-10.2.13.ebuild} |   8 +-
 dev-db/mariadb/mariadb-10.2.14.ebuild              |   6 +-
 dev-db/mariadb/mariadb-10.3.5_rc.ebuild            |  24 +---
 5 files changed, 60 insertions(+), 109 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6c694917ebe..b87e6c83080 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -5,6 +5,8 @@ DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 
38df67a1b26aab559e41f44b129f2e57388
 DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 
40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5
 SHA512 
c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd
 DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 
1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f
 SHA512 
db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89
 DIST mariadb-10.1.32.tar.gz 68001321 BLAKE2B 
8ecdf12b10697576b3550d962c6090726f515e0f1f99f786e2b8882e1b81c053e9e43e423f83afd6955357ef85cd539db6fb1ff613d3c553f2f3801293c7ee07
 SHA512 
fcaeb8005b08b3ac5b7c070f07fe669593bd8a2eb8ea1bbdcb4d8e9ba4856420039f39542ecf920eec352ee4a26179899f9c6cb1f9f26040f557ae4b4b63660a
+DIST mariadb-10.2.12.tar.gz 72818636 BLAKE2B 
50a72b8096ae8bd5dc635352fc35d22322a0d7cf415e45883898307050ec547a79c66d51ab0ce311f1895eb178afeb49664fb434af77f9ff2b9aedef0aea85bc
 SHA512 
8d3d3c84d4a01d6047e4f2b6802eb802e1f6a7b0e10e981c7ef9fdd27a5a25baab0af47a21b8637f4cbb9d21ef3bcc85097c5fdb8745c2a79040ab87fecb5a7b
+DIST mariadb-10.2.13.tar.gz 72591913 BLAKE2B 
5abc3fefc5b02f099254b8a3a832a20793989a316efdc22b146cf78b5b83fcb3e4e617fce1b9161194e3f54b7bb469de3bb656319048fb137915af24e21f6aa2
 SHA512 
4c6038f134a32f50daa3172b367588240ef20a6f6cfe36d830e427cf52d315284481f5300d3db32d9e81ddd352dbea01fd4230f4e4d79e175d97c0c49331a4ca
 DIST mariadb-10.2.14.tar.gz 72607526 BLAKE2B 
ca0c73e30e15265a7a1599d9bd4b64e030aaf92fcdbe18fda39eaf071c88c90b32a16ea5d9c63130e3853572a30a0c5870e6389e6dcb2a3eb690311cdb9bde3c
 SHA512 
12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026
 DIST mariadb-10.3.5.tar.gz 70945381 BLAKE2B 
10f5f08a64b3d046f8255a5ea9bb1661b7a88d130b0a89b41c8f98abbe3c04cc13154e1ad6c012ef97a396f055ca5d748998f1e7d6dc89ca73a3b61f70749457
 SHA512 
e7f2ffd38da4e4dbd214bc97e30216682b6f8ca368bcbd5717fb408a6110f26da4472cd7ac0d288c817eb9c6426a063cff8d582e03fe8a1219c0d70508e5a004
 DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 
150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807
 SHA512 
eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c

diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild 
b/dev-db/mariadb/mariadb-10.2.12.ebuild
similarity index 91%
copy from dev-db/mariadb/mariadb-10.2.14.ebuild
copy to dev-db/mariadb/mariadb-10.2.12.ebuild
index 90f70d1e201..73d4cd9e20e 100644
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20180308-1938Z"
+MY_EXTRAS_VER="20170926-1321Z"
 SUBSLOT="18"
 
 JAVA_PKG_OPT_USE="jdbc"
@@ -28,7 +28,7 @@ HOMEPAGE="http://mariadb.org/";
 DESCRIPTION="An enhanced, drop-in replacement for MySQL"
 LICENSE="GPL-2 LGPL-2.1+"
 SLOT="0/${SUBSLOT:-0}"
-IUSE="+backup bindist client-libs cracklib debug extraengine galera innodb-lz4
+IUSE="+backup bindist cracklib debug embedded extraengine galera innodb-lz4
        innodb-lzo innodb-snappy jdbc jemalloc kerberos latin1 libressl mroonga
        numa odbc oqgraph pam +perl profiling rocksdb selinux +server sphinx
        sst-rsync sst-mariabackup sst-xtrabackup static static-libs systemd 
systemtap tcmalloc
@@ -39,11 +39,12 @@ RESTRICT="!bindist? ( bindist ) libressl? ( test )"
 
 REQUIRED_USE="jdbc? ( extraengine server !static )
        server? ( tokudb? ( jemalloc !tcmalloc ) )
-       !server? ( !extraengine )
+       !server? ( !extraengine !embedded )
        ?? ( tcmalloc jemalloc )
        static? ( yassl !pam )"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 
chars
 # and we will run a mysql server during test phase
@@ -57,7 +58,7 @@ fi
 
 PATCHES=(
        "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
-       
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
+       
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.8-without-clientlibs-tools.patch
        "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
        "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
 )
@@ -72,28 +73,18 @@ COMMON_DEPEND="
        )
        >=sys-apps/sed-4
        >=sys-apps/texinfo-4.7-r1
+       !dev-db/mariadb-connector-c[mysqlcompat]
        jemalloc? ( dev-libs/jemalloc:0= )
        tcmalloc? ( dev-util/google-perftools:0= )
        systemtap? ( >=dev-util/systemtap-1.3:0= )
        !yassl? (
-               client-libs? (
-                       !libressl? ( 
>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-                       libressl? ( 
dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-               )
-               !client-libs? (
-                       !libressl? ( >=dev-libs/openssl-1.0.0:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-               net-libs/libnsl:0=[${MULTILIB_USEDEP}]
-               kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       )
-       !client-libs? ( >=sys-libs/zlib-1.2.3:0=
-               net-libs/libnsl:0=
-               kerberos? ( virtual/krb5 )
+               !libressl? ( 
>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+               libressl? ( 
dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
        )
+       >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
        sys-libs/ncurses:0=
+       mroonga? ( app-text/groonga-normalizer-mysql )
+       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
        !bindist? (
                sys-libs/binutils-libs:0=
                >=sys-libs/readline-4.1:0=
@@ -108,7 +99,6 @@ COMMON_DEPEND="
                innodb-lz4? ( app-arch/lz4 )
                innodb-lzo? ( dev-libs/lzo )
                innodb-snappy? ( app-arch/snappy )
-               mroonga? ( app-text/groonga-normalizer-mysql )
                numa? ( sys-process/numactl )
                oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
                pam? ( virtual/pam:0= )
@@ -123,7 +113,6 @@ DEPEND="virtual/yacc
        server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) )
        ${COMMON_DEPEND}"
 RDEPEND="selinux? ( sec-policy/selinux-mysql )
-       client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] 
!dev-db/mysql-connector-c )
        !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server 
!dev-db/mysql-cluster
        server? ( !prefix? ( dev-db/mysql-init-scripts ) )
        !<virtual/mysql-5.6-r9
@@ -146,9 +135,9 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 # xtrabackup-bin causes a circular dependency if DBD-mysql is not already 
installed
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-       !client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] 
dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
-        server? ( ~virtual/mysql-5.6[static=]
-                galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 
dev-db/percona-xtrabackup ) ) ) )"
+        server? ( ~virtual/mysql-5.6[embedded=,static=] )
+        virtual/libmysqlclient:${SLOT}[${MULTILIB_USEDEP},static-libs=]
+       server? ( galera? ( sst-xtrabackup? ( || ( 
>=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) ) )"
 
 pkg_setup() {
        if [[ ${MERGE_TYPE} != binary ]] ; then
@@ -250,6 +239,10 @@ pkg_postinst() {
 }
 
 src_unpack() {
+
+       # Initialize the proper variables first
+       mysql_init_vars
+
        unpack ${A}
        # Grab the patches
        [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" 
git-r3_src_unpack
@@ -272,10 +265,6 @@ src_prepare() {
        # There is no CMake flag, it simply checks for existance
        rm -r "${S}"/storage/mroonga/vendor/groonga || die "could not remove 
packaged groonga"
 
-       if ! use server; then
-               rm -r "${S}"/plugin/handler_socket || die
-       fi
-
        cmake-utils_src_prepare
 }
 
@@ -290,20 +279,12 @@ src_configure(){
        # bug #283926, with GCC4.4, this is required to get correct behavior.
        append-flags -fno-strict-aliasing
 
-       if use client-libs ; then
-               multilib-minimal_src_configure
-       else
-               multilib_src_configure
-       fi
+       multilib-minimal_src_configure
 }
 
 multilib_src_configure() {
        debug-print-function ${FUNCNAME} "$@"
 
-       if ! multilib_is_native_abi && ! use client-libs ; then
-               return
-       fi
-
        CMAKE_BUILD_TYPE="RelWithDebInfo"
 
        # debug hack wrt #497532
@@ -361,10 +342,6 @@ multilib_src_configure() {
                mycmakeargs+=( -DWITH_SSL=bundled )
        fi
 
-       if ! use client-libs ; then
-               mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES )
-       fi
-
        # bfd.h is only used starting with 10.1 and can be controlled by 
NOT_FOR_DISTRIBUTION
        # systemtap only works on native ABI  bug 530132
        if multilib_is_native_abi; then
@@ -458,7 +435,7 @@ multilib_src_configure() {
                        -DMYSQL_USER=mysql
                        -DDISABLE_SHARED=$(usex static YES NO)
                        -DWITH_DEBUG=$(usex debug)
-                       -DWITH_EMBEDDED_SERVER=OFF
+                       -DWITH_EMBEDDED_SERVER=$(usex embedded)
                        -DWITH_PROFILING=$(usex profiling)
                )
 
@@ -485,7 +462,7 @@ multilib_src_configure() {
        else
                mycmakeargs+=(
                        -DWITHOUT_SERVER=1
-                       -DWITH_EMBEDDED_SERVER=OFF
+                       -DWITHOUT_EMBEDDED_SERVER=1
                        -DEXTRA_CHARSETS=none
                        -DINSTALL_SQLBENCHDIR=
                        -DWITH_SYSTEMD=no
@@ -496,11 +473,7 @@ multilib_src_configure() {
 }
 
 src_compile() {
-       if use client-libs ; then
-               multilib-minimal_src_compile
-       else
-               multilib_src_compile
-       fi
+       multilib-minimal_src_compile
 }
 
 multilib_src_compile() {
@@ -508,33 +481,28 @@ multilib_src_compile() {
 }
 
 src_install() {
-       local MULTILIB_WRAPPED_HEADERS
-       local MULTILIB_CHOST_TOOLS
-       if use client-libs ; then
-               # headers with ABI specific data
-               MULTILIB_WRAPPED_HEADERS=(
-                       /usr/include/mysql/server/my_config.h
-                       /usr/include/mysql/server/private/embedded_priv.h
-                       /usr/include/mysql/server/mysql_version.h
-                       /usr/include/mariadb/mariadb_version.h
-                       /usr/include/mysql/mariadb_version.h
-                       
/usr/include/mysql/server/private/probes_mysql_nodtrace.h
-                       /usr/include/mysql/server/private/probes_mysql_dtrace.h 
)
-
-               # wrap the config scripts
-               MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config 
/usr/bin/mysql_config )
-               multilib-minimal_src_install
-       else
-               multilib_src_install
-               multilib_src_install_all
-       fi
+       # headers with ABI specific data
+       local MULTILIB_WRAPPED_HEADERS=(
+               /usr/include/mysql/server/my_config.h
+               /usr/include/mysql/server/private/embedded_priv.h
+               /usr/include/mysql/server/mysql_version.h
+               /usr/include/mariadb/mariadb_version.h
+               /usr/include/mysql/mariadb_version.h
+               /usr/include/mysql/server/private/probes_mysql_nodtrace.h
+               /usr/include/mysql/server/private/probes_mysql_dtrace.h )
+
+       # wrap the config scripts
+       local MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config 
/usr/bin/mysql_config )
+       multilib-minimal_src_install
 }
 
 # Intentionally override eclass function
 multilib_src_install() {
-
        cmake-utils_src_install
 
+       # Make sure the vars are correctly initialized
+       mysql_init_vars
+
        # Remove an unnecessary, private config header which will never match 
between ABIs and is not meant to be used
        if [[ -f "${ED}/usr/include/mysql/server/private/config.h" ]] ; then
                rm "${ED}/usr/include/mysql/server/private/config.h" || die
@@ -545,12 +513,10 @@ multilib_src_install() {
                doins "${S}"/sql/*.h
        fi
 
-       if use client-libs ; then
        # Install compatible symlinks to libmysqlclient
 #      use static-libs && dosym libmariadbclient.a 
"/usr/$(get_libdir)/libmysqlclient.a"
 #      dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so"
        dosym libmariadb.so.3 "/usr/$(get_libdir)/libmysqlclient.so.${SUBSLOT}"
-       fi
 
        # Kill old libmysqclient_r symlinks if they exist.  Time to fix what 
depends on them.
        find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
@@ -631,7 +597,12 @@ multilib_src_install_all() {
 # FEATURES='test userpriv -usersandbox' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
-src_test() {
+multilib_src_test() {
+
+       if ! multilib_is_native_abi ; then
+               einfo "Server tests not available on non-native abi".
+               return 0;
+       fi
 
        _disable_test() {
                local rawtestname reason
@@ -696,10 +667,6 @@ src_test() {
                        _disable_test  "$t" "False positives in Gentoo"
        done
 
-       if ! use client-libs ; then
-               _disable_test main.plugin_auth "Needs client libraries built"
-       fi
-
        # run mysql-test tests
        perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder 
--skip-test=tokudb --skip-test-list="${T}/disabled.def"
        retstatus_tests=$?
@@ -850,11 +817,11 @@ pkg_config() {
 
                unset tmp_mysqld_password_source
        fi
-       MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
+       MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)"
        # These are dir+prefix
-       MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
+       MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)"
        MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
-       MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
+       MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)"
        MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
 
        if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then

diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild 
b/dev-db/mariadb/mariadb-10.2.13.ebuild
similarity index 99%
copy from dev-db/mariadb/mariadb-10.2.14.ebuild
copy to dev-db/mariadb/mariadb-10.2.13.ebuild
index 90f70d1e201..2eff8c74630 100644
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.13.ebuild
@@ -60,6 +60,8 @@ PATCHES=(
        
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
        "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
        "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
+       "${MY_PATCH_DIR}"/20032_all_mariadb-10.2.12-fix-address-resolve.patch
+       "${MY_PATCH_DIR}"/20033_all_mariadb-10.1.31-xtradb-sst.patch
 )
 
 # Be warned, *DEPEND are version-dependant
@@ -86,13 +88,9 @@ COMMON_DEPEND="
                )
        )
        client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-               net-libs/libnsl:0=[${MULTILIB_USEDEP}]
                kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
        )
-       !client-libs? ( >=sys-libs/zlib-1.2.3:0=
-               net-libs/libnsl:0=
-               kerberos? ( virtual/krb5 )
-       )
+       !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) )
        sys-libs/ncurses:0=
        !bindist? (
                sys-libs/binutils-libs:0=

diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild 
b/dev-db/mariadb/mariadb-10.2.14.ebuild
index 90f70d1e201..3c62b609a1e 100644
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild
@@ -86,13 +86,9 @@ COMMON_DEPEND="
                )
        )
        client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-               net-libs/libnsl:0=[${MULTILIB_USEDEP}]
                kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
        )
-       !client-libs? ( >=sys-libs/zlib-1.2.3:0=
-               net-libs/libnsl:0=
-               kerberos? ( virtual/krb5 )
-       )
+       !client-libs? ( >=sys-libs/zlib-1.2.3:0= kerberos? ( virtual/krb5 ) )
        sys-libs/ncurses:0=
        !bindist? (
                sys-libs/binutils-libs:0=

diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild 
b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
index 0575417da24..69e55e88ddc 100644
--- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
@@ -81,24 +81,13 @@ COMMON_DEPEND="
        tcmalloc? ( dev-util/google-perftools:0= )
        systemtap? ( >=dev-util/systemtap-1.3:0= )
        !yassl? (
-               client-libs? (
-                       !libressl? ( 
>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
-                       libressl? ( 
dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
-               )
-               !client-libs? (
-                       !libressl? ( >=dev-libs/openssl-1.0.0:0= )
-                       libressl? ( dev-libs/libressl:0= )
-               )
-       )
-       client-libs? ( >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
-               net-libs/libnsl:0=[${MULTILIB_USEDEP}]
-               kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-       )
-       !client-libs? ( >=sys-libs/zlib-1.2.3:0=
-               net-libs/libnsl:0=
-               kerberos? ( virtual/krb5 )
+               !libressl? ( 
>=dev-libs/openssl-1.0.0:0=[${MULTILIB_USEDEP},static-libs?] )
+               libressl? ( 
dev-libs/libressl:0=[${MULTILIB_USEDEP},static-libs?] )
        )
+       >=sys-libs/zlib-1.2.3:0=[${MULTILIB_USEDEP},static-libs?]
        sys-libs/ncurses:0=
+       mroonga? ( app-text/groonga-normalizer-mysql )
+       kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
        !bindist? (
                sys-libs/binutils-libs:0=
                >=sys-libs/readline-4.1:0=
@@ -113,7 +102,6 @@ COMMON_DEPEND="
                innodb-lz4? ( app-arch/lz4 )
                innodb-lzo? ( dev-libs/lzo )
                innodb-snappy? ( app-arch/snappy )
-               mroonga? ( app-text/groonga-normalizer-mysql )
                numa? ( sys-process/numactl )
                oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
                pam? ( virtual/pam:0= )
@@ -151,7 +139,7 @@ RDEPEND="selinux? ( sec-policy/selinux-mysql )
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 # xtrabackup-bin causes a circular dependency if DBD-mysql is not already 
installed
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )
-       !client-libs? ( dev-db/mariadb-connector-c[${MULTILIB_USEDEP}] 
dev-db/mysql-connector-c[${MULTILIB_USEDEP}] )
+       !client-libs? ( dev-db/mariadb-connector-c dev-db/mysql-connector-c )
         server? ( ~virtual/mysql-5.6[static=]
                 galera? ( sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 
dev-db/percona-xtrabackup ) ) ) )"
 

Reply via email to