[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

2023-05-01 Thread Sam James 
commit: b3c42b37e02e311e0750e3ae6071029f3a1f2626
Author: Tomáš Mózes  gmail  com>
AuthorDate: Wed Apr 26 13:15:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 10:01:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c42b37

dev-db/mariadb-connector-c: add 3.3.4

Signed-off-by: Tomáš Mózes  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30767
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|   1 +
 ...ector-c-3.3.4-fix-building-without-gssapi.patch |  15 +++
 .../mariadb-connector-c-3.3.4-remove-zstd.patch|  19 
 .../mariadb-connector-c-3.3.4.ebuild   | 109 +
 4 files changed, 144 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 9148320c97ae..b1cd0e0d3d95 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,3 +1,4 @@
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 
4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01
 SHA512 
a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
 DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B 
c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0
 SHA512 
5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc
 DIST mariadb-connector-c-3.2.7-src.tar.gz 1212691 BLAKE2B 
ae2d1317fdc087c6d64b7cf11f4343bf35662d04da5c693f6f3b45ec405ff0f3d5d03157eb56a9c05cf4e16b9980baffec8800b886ae3d962d22a828a6938671
 SHA512 
3f0c67c5fd12e889a3704e0a638b64a784f05d12c7c424f7ce64e78a3eb17e2ad588e0e23f0ce037cd49efb695294ab69277da78f02940c2a7ea0676886b9c36
+DIST mariadb-connector-c-3.3.4-src.tar.gz 1389030 BLAKE2B 
4bee45ee4f76979d36072ab2119042b4de1127a42e99510bd0c1bc5e163fdb4e9b7ca4cce9381ed89e0c733158293d0641c7b7cbd14feaf3257a442c62083e23
 SHA512 
3a3f20efe58f8458a426501248b154107b76bd2001a43e41923e31568c8419cd88f2379e3636a54118ee64ac160a1c6f68dd79c0ac053fa273d9b6b127410ef6

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.3.4-fix-building-without-gssapi.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.3.4-fix-building-without-gssapi.patch
new file mode 100644
index ..a76af28aabd4
--- /dev/null
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.3.4-fix-building-without-gssapi.patch
@@ -0,0 +1,15 @@
+# https://jira.mariadb.org/browse/CONC-637
+# 
https://github.com/mariadb-corporation/mariadb-connector-c/commit/4e2408c1cc298ada91b30683501c0c94a6621562
+diff --git a/plugins/auth/CMakeLists.txt b/plugins/auth/CMakeLists.txt
+index ed9be6f3..da0b58e4 100644
+--- a/plugins/auth/CMakeLists.txt
 b/plugins/auth/CMakeLists.txt
+@@ -120,7 +120,7 @@ IF(GSSAPI_SOURCES)
+   IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+ SET_SOURCE_FILES_PROPERTIES(${GSSAPI_SOURCES} PROPERTY COMPILE_FLAGS 
"-Wno-deprecated-declarations")
+   ENDIF()
+-  IF(have__Wl___as_needed)
++  IF(have__Wl___as_needed AND TARGET auth_gssapi_client)
+ SET_TARGET_PROPERTIES(auth_gssapi_client PROPERTIES LINK_FLAGS 
"-Wl,--as-needed")
+   ENDIF()
+ ENDIF()

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.3.4-remove-zstd.patch 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.3.4-remove-zstd.patch
new file mode 100644
index ..e4942b583ef8
--- /dev/null
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.3.4-remove-zstd.patch
@@ -0,0 +1,19 @@
+# conflicts with dev-db/mariadb
+diff --git a/plugins/compress/CMakeLists.txt b/plugins/compress/CMakeLists.txt
+index f6dab85..7ace926 100644
+--- a/plugins/compress/CMakeLists.txt
 b/plugins/compress/CMakeLists.txt
+@@ -11,13 +11,3 @@ REGISTER_PLUGIN(TARGET zlib
+ DEFAULT STATIC
+ SOURCES ${COMPRESS_PLUGIN_DIR}/c_zlib.c)
+ 
+-#zstd compression
+-IF(${ZSTD_FOUND})
+-  INCLUDE_DIRECTORIES(${ZSTD_INCLUDE_DIRS})
+-  REGISTER_PLUGIN(TARGET zstd
+-  TYPE MARIADB_CLIENT_COMPRESSION_PLUGIN
+-  CONFIGURATIONS DYNAMIC STATIC OFF
+-  DEFAULT DYNAMIC
+-  SOURCES ${COMPRESS_PLUGIN_DIR}/c_zstd.c
+-  LIBRARIES ${ZSTD_LIBRARIES})
+-ENDIF()

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
new file mode 100644
index ..2778d1261848
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} ==  ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="https:/

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

2021-03-02 Thread Thomas Deutschmann 
commit: 23e96561eec030b2c42fc38a6a9b163aea2f1c88
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Mar  2 16:24:45 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Mar  2 17:15:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e96561

dev-db/mariadb-connector-c: fix flow control statement

Closes: https://bugs.gentoo.org/772398
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...adb-connector-c-3.1.11-fix-flow-control-statement.patch | 14 ++
 .../mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild  |  3 ++-
 .../mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild  |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch
new file mode 100644
index 000..0b5a2d44cec
--- /dev/null
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch
@@ -0,0 +1,14 @@
+https://github.com/mariadb-corporation/mariadb-connector-c/pull/158
+
+--- a/cmake/ConnectorName.cmake
 b/cmake/ConnectorName.cmake
+@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+ SET(MACHINE_NAME "x64")
+   ELSE()
+ SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name 
"mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
+ 

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
index 65abb644ccf..65570a7fd69 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,6 +49,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+   "${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch
 )
 
 src_configure() {

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
index f5b20304f80..80f4c976d4b 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
@@ -49,6 +49,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+   "${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

2020-04-01 Thread Thomas Deutschmann 
commit: 3a81979e66468006181677f2ac9e5b2bdf5d3704
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Apr  1 21:23:14 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Apr  1 21:23:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a81979e

dev-db/mariadb-connector-c: drop old

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|   1 -
 ...b-connector-c-3.0.6-provide-pkconfig-file.patch |  48 --
 ...riadb-connector-c-3.0.8-fix-pkconfig-file.patch |  21 -
 .../mariadb-connector-c-3.0.6-r1.ebuild| 103 -
 dev-db/mariadb-connector-c/metadata.xml|  11 +--
 5 files changed, 4 insertions(+), 180 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 854f5361f2f..50ad9a5d2bf 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,3 +1,2 @@
-DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 
7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a
 SHA512 
6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
 DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 
416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60
 SHA512 
44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8
 DIST mariadb-connector-c-3.1.7-src.tar.gz 742923 BLAKE2B 
641c3c49cf83af918e5dab06f9b8afecd59bd7b6486cc55b33749cd0ef317ab6cff86da9b85829b0309305a190e16f4ecc369210c54070e265387a5818c48ca1
 SHA512 
0b7f6497b6b88b2bbcb870b7c3a8f3fe0bf547c6b5d9b95cc99423aa8ea02ac510c5fb71079e7cd79a49741c7f26f3e68c39e245b18fab46754e8640f79ff670

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
deleted file mode 100644
index 02bbefce357..000
--- 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
+++ /dev/null
@@ -1,48 +0,0 @@
 a/mariadb_config/CMakeLists.txt
-+++ b/mariadb_config/CMakeLists.txt
-@@ -46,6 +46,8 @@ ENDIF()
- 
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in
-${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY)
-+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in
-+   ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY)
- 
- ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
- 
-@@ -54,3 +56,6 @@ ADD_EXECUTABLE(mariadb_config 
${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
- INSTALL(TARGETS mariadb_config
- DESTINATION "bin"
- COMPONENT Development)
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
-+DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-+COMPONENT Development)
 a/mariadb_config/libmariadb.pc.in
-+++ b/mariadb_config/libmariadb.pc.in
-@@ -1,19 +1,11 @@
--# 
--#  pkg_config.pc.in
--#
--#  pkg_config configuration file 
--#  For a detailed description of options, please visit
--#  Dan Nicholson’s Guide to pkg-config 
(http://www.freedesktop.org/wiki/Software/pkg-config/)
--#
--
--includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
--libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
--prefix=@PREFIX_INSTALL_DIR@
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=${prefix}
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/include
- 
- Name: libmariadb
--Version: @LIBMARIADB_VERSION@
- Description: MariaDB Connector/C dynamic library
--Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ 
@CMAKE_C_FLAGS@
--Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb 
@extra_dynamic_LDFLAGS@
--
--
-+Version: @LIBMARIADB_VERSION@
-+URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
-+Libs: -L${libdir} -lmariadb
-+Cflags: -I${includedir}/mariadb

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
deleted file mode 100644
index 1a16a2c0101..000
--- 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 a/mariadb_config/libmariadb.pc.in
-+++ b/mariadb_config/libmariadb.pc.in
-@@ -7,13 +7,12 @@
- #
- 
- prefix=@CMAKE_INSTALL_PREFIX@
--includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
--libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
-+includedir=${prefix}/include
-+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
- 
- Name: lib

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

2019-08-07 Thread Thomas Deutschmann 
commit: cc67804b489142b48cb3c9316c5b92324068794f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug  7 18:59:34 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug  7 19:12:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc67804b

dev-db/mariadb-connector-c: bump to v3.1.3

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|  1 +
 ...riadb-connector-c-3.1.3-fix-pkconfig-file.patch | 21 ++
 .../mariadb-connector-c-3.1.3.ebuild   | 86 ++
 3 files changed, 108 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 9581259d514..da04c0403d7 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,3 +1,4 @@
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 
7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a
 SHA512 
6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
 DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B 
f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946
 SHA512 
6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a
 DIST mariadb-connector-c-3.1.2-src.tar.gz 735530 BLAKE2B 
c441cb69b0affaaa5ed87a9e81232ef2dfab305bf5d92ad60ad0198508294c1153ad517347d2af1336722149200a1a62ddd4c289913b09de0195c9da79279305
 SHA512 
8ad0ec5aea07a04e7ac9da6af3d067755dd8f22deed071de2321c581374b5ed1e4d6bab048b231655d3c2a3722b2b99f276d95046c659f867cbd58d772fb17bb
+DIST mariadb-connector-c-3.1.3-src.tar.gz 738250 BLAKE2B 
a3ea70d2dc226b7c8e907dddaa39e280a76fac7b0a8a74971aa9cc6c1fadf3e5cb96fb3f55e29a639a899d5eeb30dd28d4cfaef0256f030af86909d68e9f85dc
 SHA512 
ca3809a5f1a33317962908ee40d5c339ba6b02c5c8818bf12af9b78eb2289efad711ab74ac7706d711951b22957ba897b5e80b60e8df44924ca70569a4e1c5e7

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch
new file mode 100644
index 000..ea4798ea943
--- /dev/null
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.3-fix-pkconfig-file.patch
@@ -0,0 +1,21 @@
+--- a/mariadb_config/libmariadb.pc.in
 b/mariadb_config/libmariadb.pc.in
+@@ -7,14 +7,13 @@
+ #
+ 
+ prefix=@CMAKE_INSTALL_PREFIX@
+-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
+-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
++includedir=${prefix}/include
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ 
+ Name: libmariadb
+ Version: @CPACK_PACKAGE_VERSION@
++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
+ Description: MariaDB Connector/C dynamic library
+-Cflags: -I${includedir}
++Cflags: -I${includedir}/mariadb
+ Libs: -L${libdir} -lmariadb
+ Libs.private: @extra_dynamic_LDFLAGS@
+-
+-

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild
new file mode 100644
index 000..234dbab6974
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VCS_INHERIT=""
+if [[ "${PV}" ==  ]] ; then
+   VCS_INHERIT="git-r3"
+   EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git";
+else
+   MY_PN=${PN#mariadb-}
+   MY_PV=${PV/_b/-b}
+   
SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve
 -> ${P}-src.tar.gz"
+   S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+   /usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="https://mariadb.org/";
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   virtual/libiconv:=[${MULTILIB_USEDEP}]
+   curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+   kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+   app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+   ssl? (
+   gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+   !gnutls? (
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   !libressl? ( dev-libs/openssl:0=[$

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

2019-01-06 Thread Thomas Deutschmann 
commit: 2427a4f5f2d0c0a6b8d79d7dab3ccd13dd09b5c4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jan  6 20:52:21 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jan  6 20:52:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2427a4f5

dev-db/mariadb-connector-c: bump to v3.0.8

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mariadb-connector-c/Manifest |  1 +
 ...ariadb-connector-c-3.0.8-fix-pkconfig-file.patch | 21 +
 ....ebuild => mariadb-connector-c-3.0.8.ebuild} |  6 +++---
 .../mariadb-connector-c-.ebuild |  6 +++---
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 46ec03744d9..7d29a1f9d0f 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,3 @@
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 
7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a
 SHA512 
6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
 DIST mariadb-connector-c-3.0.7-src.tar.gz 667274 BLAKE2B 
75d2d548d51889aecc8af56cbeb61f5eaf21e60924b70dd0559214de464eae209743febdb5d443797f853bc902352f7333aefe84cb367f61f7bf2c341a4a8ac2
 SHA512 
70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219
+DIST mariadb-connector-c-3.0.8-src.tar.gz 674455 BLAKE2B 
eca5972f8443c78cdc9f450e7e88ee1c69e2a004664916a0f7dfd9a1ab8242c9e11d3cafcd95323262223fba5d68c5d489d4f61fdddb8369cf603cdd563cfe51
 SHA512 
d9f970c7ac164ef7d8dd748bf2f749cc1f877a9c8f68a1d57e9ff62d95046bb9505619feca1f1d0d1cdefc1ac49489742aadf4ad9e47c8e6a9b8b40c56eed788

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
new file mode 100644
index 000..1a16a2c0101
--- /dev/null
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch
@@ -0,0 +1,21 @@
+--- a/mariadb_config/libmariadb.pc.in
 b/mariadb_config/libmariadb.pc.in
+@@ -7,13 +7,12 @@
+ #
+ 
+ prefix=@CMAKE_INSTALL_PREFIX@
+-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
+-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
++includedir=${prefix}/include
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ 
+ Name: libmariadb
+ Version: @CPACK_PACKAGE_VERSION@
++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
+ Description: MariaDB Connector/C dynamic library
+-Cflags: -I${includedir}
+-Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@
+-
+-
++Cflags: -I${includedir}/mariadb
++Libs: -L${libdir} -lmariadb

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
similarity index 94%
copy from dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
index 2e5ed26b63e..c957edaec2d 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve
 -> ${P}-src.tar.gz"
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch
+   "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
 )
 
 src_configure() {

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index 2e5ed26b63e..c957edaec2d 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve
 -> ${P}-src.tar.gz"
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

2018-12-16 Thread Thomas Deutschmann 
commit: 71ffb6be137465ce9d49f95f8444d8ea434d1bf8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Dec 17 02:00:43 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Dec 17 02:00:43 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ffb6be

dev-db/mariadb-connector-c: fix pkg-config file install location

Closes: https://bugs.gentoo.org/673218
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...h => mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch} | 11 +++
 ...tor-c-3.0.7.ebuild => mariadb-connector-c-3.0.7-r1.ebuild} |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch
similarity index 63%
rename from 
dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch
rename to 
dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch
index 1a16a2c0101..1fe06e2c8e5 100644
--- 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch
@@ -1,3 +1,14 @@
+https://bugs.gentoo.org/673218
+
+--- a/mariadb_config/CMakeLists.txt
 b/mariadb_config/CMakeLists.txt
+@@ -59,5 +59,5 @@ INSTALL(TARGETS mariadb_config
+ COMPONENT Development)
+ 
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
+-DESTINATION "lib/pkgconfig"
++DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ COMPONENT Development)
 --- a/mariadb_config/libmariadb.pc.in
 +++ b/mariadb_config/libmariadb.pc.in
 @@ -7,13 +7,12 @@

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
similarity index 98%
rename from dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild
rename to dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
index b6cc03960be..8622a1ea73c 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch
+   "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file-r1.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

2018-10-15 Thread Thomas Deutschmann 
commit: e570c57be2d795f816a494ea41a3046d013a80f1
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Oct 15 15:57:33 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Oct 15 15:58:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e570c57b

dev-db/mariadb-connector-c: install pkconfig file

Closes: https://bugs.gentoo.org/668664
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann  gentoo.org>

 ...b-connector-c-3.0.6-provide-pkconfig-file.patch | 48 ++
 ebuild => mariadb-connector-c-3.0.6-r1.ebuild} |  6 ++-
 .../mariadb-connector-c-.ebuild|  6 ++-
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
new file mode 100644
index 000..02bbefce357
--- /dev/null
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch
@@ -0,0 +1,48 @@
+--- a/mariadb_config/CMakeLists.txt
 b/mariadb_config/CMakeLists.txt
+@@ -46,6 +46,8 @@ ENDIF()
+ 
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in
+${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in
++   ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY)
+ 
+ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
+ 
+@@ -54,3 +56,6 @@ ADD_EXECUTABLE(mariadb_config 
${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c)
+ INSTALL(TARGETS mariadb_config
+ DESTINATION "bin"
+ COMPONENT Development)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc
++DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
++COMPONENT Development)
+--- a/mariadb_config/libmariadb.pc.in
 b/mariadb_config/libmariadb.pc.in
+@@ -1,19 +1,11 @@
+-# 
+-#  pkg_config.pc.in
+-#
+-#  pkg_config configuration file 
+-#  For a detailed description of options, please visit
+-#  Dan Nicholson’s Guide to pkg-config 
(http://www.freedesktop.org/wiki/Software/pkg-config/)
+-#
+-
+-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
+-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
+-prefix=@PREFIX_INSTALL_DIR@
++prefix=@CMAKE_INSTALL_PREFIX@
++exec_prefix=${prefix}
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
++includedir=${prefix}/include
+ 
+ Name: libmariadb
+-Version: @LIBMARIADB_VERSION@
+ Description: MariaDB Connector/C dynamic library
+-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ 
@CMAKE_C_FLAGS@
+-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb 
@extra_dynamic_LDFLAGS@
+-
+-
++Version: @LIBMARIADB_VERSION@
++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/
++Libs: -L${libdir} -lmariadb
++Cflags: -I${includedir}/mariadb

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
similarity index 95%
rename from dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild
rename to dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index df11d552495..330c1ac6ef2 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,7 +55,9 @@ RDEPEND="${DEPEND}
!>=dev-db/mariadb-10.2.0[client-libs(+)]
"
 PATCHES=(
-   "${FILESDIR%/}/gentoo-layout-3.0.patch" )
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch
+)
 
 src_configure() {
# bug 508724 mariadb cannot use ld.gold

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index df11d552495..330c1ac6ef2 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,7 +55,9 @@ RDEPEND="${DEPEND}
!>=dev-db/mariadb-10.2.0[client-libs(+)]
"
 PATCHES=(
-   "${FILESDIR%/}/gentoo-layout-3.0.patch" )
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch
+)
 
 src_configure() {
# bug 508724 mariadb cannot use ld.gold

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

2018-02-28 Thread Brian Evans 
commit: 9e503d7f68fa3162b62ba151efafb2f3ca314e9c
Author: Brian Evans  gentoo  org>
AuthorDate: Wed Feb 28 15:48:13 2018 +
Commit: Brian Evans  gentoo  org>
CommitDate: Wed Feb 28 16:24:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e503d7f

dev-db/mariadb-connector-c: New package to provide libmariadb.so

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-db/mariadb-connector-c/Manifest|   1 +
 .../files/gentoo-layout-3.0.patch  |   9 ++
 .../mariadb-connector-c-3.0.3.ebuild   | 105 +
 dev-db/mariadb-connector-c/metadata.xml|  11 +++
 4 files changed, 126 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
new file mode 100644
index 000..961da533ce5
--- /dev/null
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -0,0 +1 @@
+DIST mariadb-connector-c-3.0.3-src.tar.gz 666928 BLAKE2B 
83181949f1867909fd96696ac5cc9d11433a0c772ecb97d862983916b235d380fd84462d547faf42756d6698dd9dbe7dcd4d6b1d0f6336e147f5a597108ea025
 SHA512 
6da66a32165cb74b106bf94e13a35d4bb38f05e5d2b3ff3740862dfc0892a7705977c1394b4f84b8e1f1e50a59a3fadbc62e7733b1feb532c6368a9fc262db04

diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch 
b/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
new file mode 100644
index 000..b57b7abc03b
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
@@ -0,0 +1,9 @@
+--- a/mariadb_config/CMakeLists.txt2016-02-12 21:21:06.981021227 -0500
 b/mariadb_config/CMakeLists.txt2016-02-12 22:06:02.397130410 -0500
+@@ -40,5 +44,5 @@
+ # Installation
+ #
+ INSTALL(TARGETS mariadb_config
+-DESTINATION "bin"
++DESTINATION ${INSTALL_BINDIR}
+ COMPONENT Development)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
new file mode 100644
index 000..1f264a5fc62
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VCS_INHERIT=""
+if [[ "${PV}" ==  ]] ; then
+   VCS_INHERIT="git-r3"
+   EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git";
+   KEYWORDS=""
+else
+   MY_PN=${PN#mariadb-}
+   MY_PV=${PV/_b/-b}
+   
SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve
 -> ${P}-src.tar.gz"
+   S="${WORKDIR}/${PN}-${MY_PV}-src"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+inherit cmake-utils multilib-minimal ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+   /usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="http://mariadb.org/";
+LICENSE="LGPL-2.1"
+
+SLOT="0/3"
+IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+   virtual/libiconv:=[${MULTILIB_USEDEP}]
+   curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
+   kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+   app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
+   ssl? (
+   gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
+   !gnutls? (
+   libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+   !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}
+   mysqlcompat? (
+   !dev-db/mysql[client-libs(+)]
+   !dev-db/mysql-cluster[client-libs(+)]
+   !dev-db/mariadb[client-libs(+)]
+   !dev-db/mariadb-galera[client-libs(+)]
+   !dev-db/percona-server[client-libs(+)]
+   !dev-db/mysql-connector-c )
+   !>=dev-db/mariadb-10.2.0[client-libs(+)]
+   "
+PATCHES=(
+   "${FILESDIR}/gentoo-layout-3.0.patch" )
+
+src_prepare() {
+   local gpluginconf="${T}/gentoo-plugins.cmake"
+   touch "${gpluginconf}" || die
+   # Plugins cannot be disabled by a build switch, redefine them in our 
own file to be included
+   if ! use kerberos ; then
+   echo 'REGISTER_PLUGIN("AUTH_GSSAPI" "" "auth_gssapi_plugin" 
"OFF" "auth_gssapi_client" 1)' \
+   >> "${gpluginconf}" || die
+   fi
+   if ! use curl ; then
+   echo 'REGISTER_PLUGIN("REMOTEIO" "" "remote_io_plugin" "OFF" 
"remote_io" 1)' \
+   >> "${gpluginconf}" || die
+   fi
+   cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+   local mycmakeargs=(
+   -DWITH_EXTERNAL_ZLIB=ON
+   -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+   -DWITH_CURL=$(usex curl ON OFF)
+   -DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF)