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

2024-03-03 Thread Sam James
commit: 5f6bcf1d1e0af240e48c672ef388110114d90fd4
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 04:54:49 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 04:54:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f6bcf1d

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

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/Manifest | 1 +
 ...adb-connector-c-.ebuild => mariadb-connector-c-3.3.8.ebuild} | 6 ++
 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild  | 6 ++
 3 files changed, 13 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 9439c470d5f0..6333e56ae7a2 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,3 @@
 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
+DIST mariadb-connector-c-3.3.8-src.tar.gz 1393368 BLAKE2B 
09a8a310f97809f0b0396770a77d4512fe1124de263e2077e5a14a2fa1fbc59d7e35a09d97b0471b687943fc9ce06925507e4b950fdacfdc7ca04ea5ee56bf9e
 SHA512 
d2630bda8deb28696842a6b5dd308060a8b9a83a04dfb3ed908387f53af4108510c6f536aaecc4a3c9a035c7be91b98229d6c480366a3579b6be2c5a8d85ff56

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
similarity index 91%
copy from dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
index 416f40ada533..c7280c550ded 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild
@@ -47,9 +47,15 @@ MULTILIB_WRAPPED_HEADERS+=( 
/usr/include/mariadb/mariadb_version.h )
 
 PATCHES=(
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+   "${FILESDIR}"/${PN}-3.3.4-remove-zstd.patch
 )
 
 src_prepare() {
+   # Should be able to drop this once bug #926121 is fixed and
+   # 
https://github.com/mariadb-corporation/mariadb-connector-c/commit/395641549ac72bc31def6d8b64e09093336aef72
+   # is in a release.
+   sed -i -e '/SET(WARNING_AS_ERROR "-Werror")/d' CMakeLists.txt || die
+
# These tests the remote_io plugin which requires network access
sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, 
NULL},//g' "unittest/libmariadb/misc.c" || die
 

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index 416f40ada533..c7280c550ded 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -47,9 +47,15 @@ MULTILIB_WRAPPED_HEADERS+=( 
/usr/include/mariadb/mariadb_version.h )
 
 PATCHES=(
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+   "${FILESDIR}"/${PN}-3.3.4-remove-zstd.patch
 )
 
 src_prepare() {
+   # Should be able to drop this once bug #926121 is fixed and
+   # 
https://github.com/mariadb-corporation/mariadb-connector-c/commit/395641549ac72bc31def6d8b64e09093336aef72
+   # is in a release.
+   sed -i -e '/SET(WARNING_AS_ERROR "-Werror")/d' CMakeLists.txt || die
+
# These tests the remote_io plugin which requires network access
sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, 
NULL},//g' "unittest/libmariadb/misc.c" || die
 



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

2024-03-03 Thread Sam James
commit: a75e6bb902f21f884eddfda9efebf7d8ca6f04a9
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 04:51:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 04:52:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a75e6bb9

dev-db/mariadb-connector-c: filter LTO

Bug: https://jira.mariadb.org/browse/MDEV-11914
Bug: https://jira.mariadb.org/browse/MDEV-25633
Bug: https://bugs.gentoo.org/855233
Closes: https://bugs.gentoo.org/855236
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild | 13 ++---
 dev-db/mariadb-connector-c/mariadb-connector-c-3.3.4.ebuild | 13 ++---
 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild  | 13 ++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 0f94f5ae5fd0..455985c30d27 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 x86"
 fi
 
-inherit cmake-multilib toolchain-funcs
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/;
@@ -64,10 +64,17 @@ src_prepare() {
cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
# mariadb cannot use ld.gold, bug #508724
tc-ld-disable-gold
 
+   # bug #855233 (MDEV-11914, MDEV-25633) at least
+   filter-lto
+
+   cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
local mycmakeargs=(
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)

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
index 2778d1261848..3ebe51ce18fc 100644
--- 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~x86"
 fi
 
-inherit cmake-multilib toolchain-funcs
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/;
@@ -66,10 +66,17 @@ src_prepare() {
cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
# mariadb cannot use ld.gold, bug #508724
tc-ld-disable-gold
 
+   # bug #855233 (MDEV-11914, MDEV-25633) at least
+   filter-lto
+
+   cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
local mycmakeargs=(
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index 62a90589ade5..416f40ada533 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-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~x86"
 fi
 
-inherit cmake-multilib toolchain-funcs
+inherit cmake-multilib flag-o-matic toolchain-funcs
 
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/;
@@ -64,10 +64,17 @@ src_prepare() {
cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
# mariadb cannot use ld.gold, bug #508724
tc-ld-disable-gold
 
+   # bug #855233 (MDEV-11914, MDEV-25633) at least
+   filter-lto
+
+   cmake-multilib_src_configure
+}
+
+multilib_src_configure() {
local mycmakeargs=(
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)



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

2023-11-14 Thread Andreas Sturmlechner
commit: 5967282d7bbb50dbc73d7c3aad9fd564752d1632
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 13 19:27:21 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 14 17:30:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5967282d

dev-db/mariadb-connector-c: drop 3.1.13, 3.2.5

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|   2 -
 .../files/gentoo-layout-3.0.patch  |   9 --
 .../mariadb-connector-c-3.1.13.ebuild  |  76 
 .../mariadb-connector-c-3.2.5.ebuild   | 101 -
 4 files changed, 188 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index b1cd0e0d3d95..9439c470d5f0 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,4 +1,2 @@
-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/gentoo-layout-3.0.patch 
b/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
deleted file mode 100644
index b57b7abc03b4..
--- a/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
+++ /dev/null
@@ -1,9 +0,0 @@
 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.1.13.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
deleted file mode 100644
index 92da81e96162..
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV}" ==  ]] ; then
-   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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
x86"
-fi
-
-inherit cmake-multilib toolchain-funcs
-
-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 +ssl static-libs test"
-
-RESTRICT="!test? ( 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? (
-   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   "
-RDEPEND="${DEPEND}"
-PATCHES=(
-   "${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-multilib_src_configure() {
-   # bug 508724 mariadb cannot use ld.gold
-   tc-ld-disable-gold
-
-   local mycmakeargs=(
-   -DWITH_EXTERNAL_ZLIB=ON
-   -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-

[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
+   

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

2023-03-07 Thread Sam James
commit: 4e9bc4e14dc49c027df0455bcefbf133c55e6304
Author: Matoro Mahri  users  noreply  github  
com>
AuthorDate: Wed Mar  8 04:28:54 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  8 04:51:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9bc4e1

dev-db/mariadb-connector-c: unkeyword sparc

Bug: https://bugs.gentoo.org/891271
Bug: https://bugs.gentoo.org/891273
Closes: https://bugs.gentoo.org/891277
Bug: https://bugs.gentoo.org/891275
Signed-off-by: Matoro Mahri  users.noreply.github.com>
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild | 4 ++--
 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild  | 4 ++--
 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild  | 2 +-
 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index a8122dd38d27..92da81e96162 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
x86"
 fi
 
 inherit cmake-multilib toolchain-funcs

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index 0d427665a0a8..5ed3f7fbf421 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 x86"
 fi
 
 inherit cmake-multilib toolchain-funcs

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 2e7e4840b22a..0f94f5ae5fd0 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 x86"
 fi
 
 inherit cmake-multilib toolchain-funcs

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index 0660724cbec1..62a90589ade5 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-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2023-01-18 Thread Sam James
commit: ec8eb652889b2234f1f20afa6078cffa366d66c5
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 18 22:52:00 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 18 22:52:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec8eb652

dev-db/mariadb-connector-c: Stabilize 3.2.7 arm64, #891277

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 28b0aacaf92c..2e7e4840b22a 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2023-01-18 Thread Sam James
commit: 9b45ec09d87a14e077d03f228669f4e4acb30e46
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 18 21:53:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 18 21:53:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b45ec09

dev-db/mariadb-connector-c: Stabilize 3.2.7 x86, #891277

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 24a4588de759..4a57e7c911e8 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2023-01-18 Thread Sam James
commit: 8739bc4b5b6e898a8185d31096b5c64eaf45fb5d
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 18 21:53:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 18 21:53:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8739bc4b

dev-db/mariadb-connector-c: Stabilize 3.2.7 arm, #891277

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 4a57e7c911e8..28b0aacaf92c 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
+   KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2023-01-18 Thread Sam James
commit: 206331b17ba25422a3f66e30b3dfad281188514e
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 18 21:53:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 18 21:53:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=206331b1

dev-db/mariadb-connector-c: Stabilize 3.2.7 amd64, #891277

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index a07dc66d1049..24a4588de759 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2023-01-18 Thread Sam James
commit: 1513fd3f035c479fcf1dc3d5b08d31db8e4df728
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 18 21:53:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 18 21:53:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1513fd3f

dev-db/mariadb-connector-c: Stabilize 3.2.7 ppc64, #891277

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 0660724cbec1..a07dc66d1049 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2022-10-30 Thread Sam James
commit: 95b9f947c8f89149169d6899acd259453e311019
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 31 02:05:11 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 31 02:17:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b9f947

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

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|  1 +
 ...999.ebuild => mariadb-connector-c-3.2.7.ebuild} | 56 --
 .../mariadb-connector-c-.ebuild| 56 --
 3 files changed, 63 insertions(+), 50 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 816f9f768d2b..9148320c97ae 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
similarity index 76%
copy from dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 9799342c7442..0660724cbec1 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-if [[ "${PV}" ==  ]] ; then
+if [[ ${PV} ==  ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git;
 else
@@ -11,42 +11,41 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs
 
-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"
 
+LICENSE="LGPL-2.1"
 SLOT="0/3"
 IUSE="+curl gnutls kerberos +ssl static-libs test"
-
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+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? (
-   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+   curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+   kerberos? (
+   || (
+   app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+   app-crypt/heimdal[${MULTILIB_USEDEP}]
)
)
-   "
+   ssl? (
+   gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] )
+   !gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+   )
+"
 BDEPEND="test? ( dev-db/mariadb[server] )"
 RDEPEND="${DEPEND}"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
+
 PATCHES=(
-   "${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
 )
 
@@ -66,13 +65,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-   # bug 508724 mariadb cannot use ld.gold
+   # mariadb cannot use ld.gold, bug #508724
tc-ld-disable-gold
 
local mycmakeargs=(
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-   -DWITH_CURL=$(usex curl ON OFF)
+   -DWITH_CURL=$(usex curl)
 

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

2022-10-30 Thread Sam James
commit: 9206a5ae92995a15bc4407d2e6fbfda0d1a37332
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 31 01:47:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 31 02:17:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9206a5ae

dev-db/mariadb-connector-c: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-db/mariadb-connector-c/metadata.xml 
b/dev-db/mariadb-connector-c/metadata.xml
index 36efdc7f5148..9473660d9b02 100644
--- a/dev-db/mariadb-connector-c/metadata.xml
+++ b/dev-db/mariadb-connector-c/metadata.xml
@@ -5,4 +5,7 @@
mysql-b...@gentoo.org
MySQL

+   
+   mariadb-corporation/mariadb-connector-c
+   
 



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

2022-10-08 Thread Sam James
commit: 538b9cb369c4bacb1cab0e14d6f7dc57e6246e98
Author: Matoro Mahri  users  noreply  github  
com>
AuthorDate: Sat Oct  8 16:05:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 16:54:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538b9cb3

dev-db/mariadb-connector-c: Keyword 3.2.5 mips, #729944

Signed-off-by: Matoro Mahri  users.noreply.github.com>
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index 17e775c57359..0d427665a0a8 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv 
~s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 
~riscv ~s390 sparc x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2022-09-24 Thread Sam James
commit: c3b7a85534d328b640cad626286d0e1e6a883467
Author: matoro  users  noreply  github  com>
AuthorDate: Thu Sep 22 19:35:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 25 01:27:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b7a855

dev-db/mariadb-connector-c: enable tests

Bug: https://bugs.gentoo.org/729944
Closes: https://github.com/gentoo/gentoo/pull/27398
Signed-off-by: Sam James  gentoo.org>

 .../mariadb-connector-c-3.2.5.ebuild   | 24 ++
 .../mariadb-connector-c-.ebuild| 24 ++
 2 files changed, 48 insertions(+)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index f5de26435990..17e775c57359 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -43,12 +43,28 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
)
)
"
+BDEPEND="test? ( dev-db/mariadb[server] )"
 RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
 )
 
+src_prepare() {
+   # These tests the remote_io plugin which requires network access
+   sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, 
NULL},//g' "unittest/libmariadb/misc.c" || die
+
+   # These tests don't work with --skip-grant-tables
+   sed -i 's/{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, 
NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
+   sed -i 's/{"test_conc66", test_conc66, TEST_CONNECTION_DEFAULT, 0, 
NULL,  NULL},//g' "unittest/libmariadb/connection.c" || die
+
+   # [Warning] Aborted connection 2078 to db: 'test' user: 'root' host: '' 
(Got an error reading communication packets)
+   # Not sure about this one - might also require network access
+   sed -i 's/{"test_default_auth", test_default_auth, 
TEST_CONNECTION_NONE, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || 
die
+
+   cmake_src_prepare
+}
+
 multilib_src_configure() {
# bug 508724 mariadb cannot use ld.gold
tc-ld-disable-gold
@@ -70,6 +86,14 @@ multilib_src_configure() {
cmake_src_configure
 }
 
+multilib_src_test() {
+   mkdir -vp "${T}/mysql/data" || die
+   mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
+   mysqld --no-defaults --datadir="${T}/mysql/data" 
--socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
+   while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do 
sleep 1 ; done
+   cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" 
MARIADB_CC_TEST=1 ctest --verbose || die
+}
+
 multilib_src_install_all() {
if ! use static-libs ; then
find "${ED}" -name "*.a" -delete || die

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index f31b6bb77e17..9799342c7442 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -43,12 +43,28 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
)
)
"
+BDEPEND="test? ( dev-db/mariadb[server] )"
 RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
 )
 
+src_prepare() {
+   # These tests the remote_io plugin which requires network access
+   sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, 
NULL},//g' "unittest/libmariadb/misc.c" || die
+
+   # These tests don't work with --skip-grant-tables
+   sed -i 's/{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, 
NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
+   sed -i 's/{"test_conc66", test_conc66, TEST_CONNECTION_DEFAULT, 0, 
NULL,  NULL},//g' "unittest/libmariadb/connection.c" || die
+
+   # [Warning] Aborted connection 2078 to db: 'test' user: 'root' host: '' 
(Got an error reading communication packets)
+   # Not sure about this one - might also require network access
+   sed -i 's/{"test_default_auth", test_default_auth, 
TEST_CONNECTION_NONE, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || 
die
+
+   cmake_src_prepare
+}
+
 multilib_src_configure() {
# bug 508724 mariadb cannot use ld.gold
tc-ld-disable-gold
@@ -70,6 +86,14 @@ multilib_src_configure() {
cmake_src_configure
 }
 
+multilib_src_test() {
+   mkdir -vp "${T}/mysql/data" || die
+   mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
+   mysqld --no-defaults --datadir="${T}/mysql/data" 
--socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
+   while ! mysqladmin ping 

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

2022-08-29 Thread Agostino Sarubbo
commit: 7cde0db0152329c355a174e12366616de8c68ab1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 29 18:46:40 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 29 18:46:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cde0db0

dev-db/mariadb-connector-c: x86 stable wrt bug #865171

Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index 0d8f0471fa98..f5de26435990 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv 
~s390 sparc x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2022-08-29 Thread Agostino Sarubbo
commit: ec5ec944983590a3b38ed5aa2a9c1a5b722861dd
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 29 18:44:25 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 29 18:44:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5ec944

dev-db/mariadb-connector-c: amd64 stable wrt bug #865171

Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index 84bfe70b61ae..0d8f0471fa98 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2022-08-28 Thread Arthur Zamarin
commit: 7c4dd9a24edbdd7bdd6deba3e4721aaa5b180e5d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 28 18:03:00 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 28 18:03:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c4dd9a2

dev-db/mariadb-connector-c: Stabilize 3.2.5 ppc64, #865171

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index ce35bebb99c4..84bfe70b61ae 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~s390 sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv 
~s390 sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2022-08-28 Thread Arthur Zamarin
commit: b049b59342a922142907179ad69d92e618bd2356
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 28 16:31:42 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 28 16:31:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b049b593

dev-db/mariadb-connector-c: Stabilize 3.2.5 sparc, #865171

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index 6462fa305496..ce35bebb99c4 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~s390 sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2022-08-28 Thread Arthur Zamarin
commit: e4eb1b86f25d97bde85a96b53acdd5ae8fb1e811
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 28 16:31:40 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 28 16:31:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4eb1b86

dev-db/mariadb-connector-c: Stabilize 3.2.5 arm, #865171

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index f31b6bb77e17..b622a6235564 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2022-08-28 Thread Arthur Zamarin
commit: a812c35794fba4e44414661157ae5a3e391ef26d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 28 16:31:41 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 28 16:31:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a812c357

dev-db/mariadb-connector-c: Stabilize 3.2.5 arm64, #865171

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index b622a6235564..6462fa305496 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs



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

2022-08-12 Thread WANG Xuerui
commit: 5edd9100aa84a761e0094bcafd4f00f291f13e6a
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri Aug 12 07:50:20 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Fri Aug 12 12:24:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5edd9100

dev-db/mariadb-connector-c: forward ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index fb175f8f7402..794b4c4a4160 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-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2022-08-12 Thread WANG Xuerui
commit: 3c0f0be224609e5b8e004981976bd467e7603941
Author: WANG Xuerui  gentoo  org>
AuthorDate: Fri Aug 12 07:50:18 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Fri Aug 12 12:24:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c0f0be2

dev-db/mariadb-connector-c: keyword 3.2.5 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index fb175f8f7402..794b4c4a4160 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ else
MY_PV=${PV/_b/-b}

SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2022-03-27 Thread Conrad Kostecki
commit: c5ed321f4c7f04090f8f6f2ceb3b85cdc1520355
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Mar 13 10:01:22 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Mar 27 22:07:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ed321f

dev-db/mariadb-connector-c: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/24531
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 ...adb-connector-c-3.1.11-fix-flow-control-statement.patch | 14 --
 1 file changed, 14 deletions(-)

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
deleted file mode 100644
index 0b5a2d44cec5..
--- 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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}")
- 



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

2022-03-10 Thread David Seifert
commit: 7f40323048bcfa98e1636c4520c09ee3b0568757
Author: David Seifert  gentoo  org>
AuthorDate: Thu Mar 10 14:00:21 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Thu Mar 10 14:00:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f403230

dev-db/mariadb-connector-c: drop 3.1.12, 3.2.3, 3.2.4

Closes: https://github.com/gentoo/gentoo/pull/24475
Signed-off-by: David Seifert  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|  3 -
 .../mariadb-connector-c-3.1.12.ebuild  | 78 --
 .../mariadb-connector-c-3.2.3.ebuild   | 78 --
 .../mariadb-connector-c-3.2.4.ebuild   | 78 --
 4 files changed, 237 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 6fc1d0c567fe..816f9f768d2b 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,5 +1,2 @@
-DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 
8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17
 SHA512 
a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 
4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01
 SHA512 
a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
-DIST mariadb-connector-c-3.2.3-src.tar.gz 992155 BLAKE2B 
39f0c5f15c2b016e7708ca32f9f4c08ae87f52c38a1a6433ade66b03b9e2144744c559838c3c0bb98465b7e5c1d2f3d5678ee6b1197790c18740f990dbc82284
 SHA512 
0d45278ba55b3cda809d9d6c3d9726ec8b2f629c7da1205fcb936594ca6ea439039c02f484f7e31fca3e55288339c9bf64c06518988a8fed016c6ce544fac631
-DIST mariadb-connector-c-3.2.4-src.tar.gz 991053 BLAKE2B 
7378ddb47e7cbb8b6bec4d7daa1572e05ca494cd1585fff8c3dc9fca088d11ca523a2571fdda570e7a68633a6cf753fca12ba6b505dbdfa7ee9c9cc07223d0b7
 SHA512 
3debf8b31f280d70ba4f163351658dc1d15f2d250e0d7098200516f96a782cb66ef38855b2436d3d23a3385f79309d5c41b05b8d7d673001de4b4a6211ca
 DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B 
c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0
 SHA512 
5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc

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
deleted file mode 100644
index 6798a698ba71..
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ "${PV}" ==  ]] ; then
-   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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
-fi
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib toolchain-funcs
-
-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 +ssl static-libs test"
-
-RESTRICT="!test? ( 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? (
-   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   "
-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
-)
-
-multilib_src_configure() {
-   # bug 508724 mariadb cannot use ld.gold
-   tc-ld-disable-gold
-
-   local mycmakeargs=(
-   -DWITH_EXTERNAL_ZLIB=ON
-   -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-   -DWITH_CURL=$(usex curl ON OFF)
-   -DWITH_ICONV=ON
-   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex 

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

2021-11-16 Thread Thomas Deutschmann
commit: 13ca50ef3aed70a046adb2b7a0272c45d55dfc28
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Nov 16 18:30:00 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Nov 16 18:30:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13ca50ef

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.2.5.ebuild   | 78 ++
 2 files changed, 79 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index dc9cbff3613f..6fc1d0c567fe 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -2,3 +2,4 @@ DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 
8187199f43ccb6f92ea9df
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 
4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01
 SHA512 
a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
 DIST mariadb-connector-c-3.2.3-src.tar.gz 992155 BLAKE2B 
39f0c5f15c2b016e7708ca32f9f4c08ae87f52c38a1a6433ade66b03b9e2144744c559838c3c0bb98465b7e5c1d2f3d5678ee6b1197790c18740f990dbc82284
 SHA512 
0d45278ba55b3cda809d9d6c3d9726ec8b2f629c7da1205fcb936594ca6ea439039c02f484f7e31fca3e55288339c9bf64c06518988a8fed016c6ce544fac631
 DIST mariadb-connector-c-3.2.4-src.tar.gz 991053 BLAKE2B 
7378ddb47e7cbb8b6bec4d7daa1572e05ca494cd1585fff8c3dc9fca088d11ca523a2571fdda570e7a68633a6cf753fca12ba6b505dbdfa7ee9c9cc07223d0b7
 SHA512 
3debf8b31f280d70ba4f163351658dc1d15f2d250e0d7098200516f96a782cb66ef38855b2436d3d23a3385f79309d5c41b05b8d7d673001de4b4a6211ca
+DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B 
c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0
 SHA512 
5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
new file mode 100644
index ..fb175f8f7402
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 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://github.com/MariaDB/mariadb-connector-c.git;
+else
+   MY_PN=${PN#mariadb-}
+   MY_PV=${PV/_b/-b}
+   
SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
+   S="${WORKDIR%/}/${PN}-${MY_PV}-src"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+fi
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib toolchain-funcs
+
+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 +ssl static-libs test"
+
+RESTRICT="!test? ( 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? (
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+multilib_src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+
+   local mycmakeargs=(
+   -DWITH_EXTERNAL_ZLIB=ON
+   -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+   -DWITH_CURL=$(usex curl ON OFF)
+   -DWITH_ICONV=ON
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_MANDIR=share/man
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
+   )
+   cmake_src_configure
+}
+
+multilib_src_install_all() {
+   if ! 

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

2021-11-14 Thread Sam James
commit: 3881c5d23a72b2136d9ab9902fdba3f0db53106c
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 15 01:11:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 15 01:11:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3881c5d2

dev-db/mariadb-connector-c: Stabilize 3.1.13 arm, #802066

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index 47a263996a79..30a30d2ee024 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,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="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
sparc x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2021-10-15 Thread Thomas Deutschmann
commit: caa7b09d4a84d2ad2f225267de25ea986407129a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Oct 15 14:29:34 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Oct 15 14:33:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caa7b09d

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

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

 dev-db/mariadb-connector-c/Manifest   | 1 +
 ...riadb-connector-c-.ebuild => mariadb-connector-c-3.2.4.ebuild} | 4 ++--
 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild| 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 4cb0f55fd22..dc9cbff3613 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.12-src.tar.gz 966702 BLAKE2B 
8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17
 SHA512 
a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 
4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01
 SHA512 
a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
 DIST mariadb-connector-c-3.2.3-src.tar.gz 992155 BLAKE2B 
39f0c5f15c2b016e7708ca32f9f4c08ae87f52c38a1a6433ade66b03b9e2144744c559838c3c0bb98465b7e5c1d2f3d5678ee6b1197790c18740f990dbc82284
 SHA512 
0d45278ba55b3cda809d9d6c3d9726ec8b2f629c7da1205fcb936594ca6ea439039c02f484f7e31fca3e55288339c9bf64c06518988a8fed016c6ce544fac631
+DIST mariadb-connector-c-3.2.4-src.tar.gz 991053 BLAKE2B 
7378ddb47e7cbb8b6bec4d7daa1572e05ca494cd1585fff8c3dc9fca088d11ca523a2571fdda570e7a68633a6cf753fca12ba6b505dbdfa7ee9c9cc07223d0b7
 SHA512 
3debf8b31f280d70ba4f163351658dc1d15f2d250e0d7098200516f96a782cb66ef38855b2436d3d23a3385f79309d5c41b05b8d7d673001de4b4a6211ca

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.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.2.4.ebuild
index 055778b5039..fb175f8f740 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ "${PV}" ==  ]] ; then
inherit git-r3
@@ -9,7 +9,7 @@ if [[ "${PV}" ==  ]] ; then
 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"
+   
SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index 055778b5039..fb175f8f740 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ "${PV}" ==  ]] ; then
inherit git-r3
@@ -9,7 +9,7 @@ if [[ "${PV}" ==  ]] ; then
 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"
+   
SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz;
S="${WORKDIR%/}/${PN}-${MY_PV}-src"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi



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

2021-09-06 Thread Sam James
commit: c744f26a1e96a80d74db918a2a32cc6c6708e3a2
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep  7 02:42:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep  7 02:42:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c744f26a

dev-db/mariadb-connector-c: Stabilize 3.1.13 arm64, #802066

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index 86003f60c86..47a263996a7 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,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="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
sparc x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
sparc x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2021-07-14 Thread Agostino Sarubbo
commit: db8b8f0f945cd6ef13f1db73a405e53812e11e02
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 14 06:22:07 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 14 06:22:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db8b8f0f

dev-db/mariadb-connector-c: x86 stable wrt bug #802066

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index b40ef1df2f2..86003f60c86 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,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="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
sparc x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2021-07-14 Thread Agostino Sarubbo
commit: dd8d5726d734519a77271b2b5b37949d0dcace4f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 14 06:21:13 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 14 06:21:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd8d5726

dev-db/mariadb-connector-c: sparc stable wrt bug #802066

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index db05e983453..b40ef1df2f2 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,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="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2021-07-14 Thread Agostino Sarubbo
commit: 6ed5f7f77af7b31d9d31a9ac7dd6517c4da35746
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 14 06:20:53 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 14 06:20:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ed5f7f7

dev-db/mariadb-connector-c: ppc64 stable wrt bug #802066

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index 6ae31b30430..db05e983453 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,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="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 
~sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2021-07-14 Thread Agostino Sarubbo
commit: ece7cd65cd102b28c813c60abeed270f3255b075
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 14 06:20:03 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 14 06:20:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece7cd65

dev-db/mariadb-connector-c: amd64 stable wrt bug #802066

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index 17578c1fe2e..6ae31b30430 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2021-07-13 Thread Thomas Deutschmann
commit: 97bdbb1f622f548568554b8e18e16080ba42d9a5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jul 13 21:02:38 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jul 13 21:04:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97bdbb1f

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

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

 dev-db/mariadb-connector-c/Manifest| 1 +
 ...ariadb-connector-c-.ebuild => mariadb-connector-c-3.2.3.ebuild} | 3 ++-
 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index f062ee647b6..4cb0f55fd22 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,3 @@
 DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 
8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17
 SHA512 
a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 
4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01
 SHA512 
a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
+DIST mariadb-connector-c-3.2.3-src.tar.gz 992155 BLAKE2B 
39f0c5f15c2b016e7708ca32f9f4c08ae87f52c38a1a6433ade66b03b9e2144744c559838c3c0bb98465b7e5c1d2f3d5678ee6b1197790c18740f990dbc82284
 SHA512 
0d45278ba55b3cda809d9d6c3d9726ec8b2f629c7da1205fcb936594ca6ea439039c02f484f7e31fca3e55288339c9bf64c06518988a8fed016c6ce544fac631

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.3.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.2.3.ebuild
index cfae428f3b4..055778b5039 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.3.ebuild
@@ -11,7 +11,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake
@@ -62,6 +62,7 @@ multilib_src_configure() {
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_MANDIR=share/man
-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-DINSTALL_BINDIR=bin

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index cfae428f3b4..055778b5039 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -11,7 +11,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake
@@ -62,6 +62,7 @@ multilib_src_configure() {
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_MANDIR=share/man
-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-DINSTALL_BINDIR=bin



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

2021-07-05 Thread Marek Szuba
commit: d3eee32ecbc400ee5b19fd3b182c7ba8b8df0651
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jul  5 16:26:23 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jul  5 16:53:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3eee32e

dev-db/mariadb-connector-c: keyword 3.1.13 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index cfae428f3b4..17578c1fe2e 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -11,7 +11,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2021-05-14 Thread Thomas Deutschmann
commit: ae116860b07a8f91dd887ad06741d3ad185690c5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri May 14 17:32:31 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri May 14 17:32:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae116860

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

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

 dev-db/mariadb-connector-c/Manifest|  1 -
 .../mariadb-connector-c-3.1.11.ebuild  | 89 --
 2 files changed, 90 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index ff44a7a3a95..f062ee647b6 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,3 +1,2 @@
-DIST mariadb-connector-c-3.1.11-src.tar.gz 752342 BLAKE2B 
5bee575bffdceb1eff60b7ba3fa334882cf2b2a12446cd6c52663cc5ce2e179bcd19c8452e9bdae3877ac7e9e08f4f6a974d136170c399439c42e1759d226c84
 SHA512 
2da3a5e438037dde2b9fafb07c084c742983ff4ce18f06cf7a34836aace5317cdb2ddb1bca63143367f5ae827c988d99ee20e8f598fabdb06190d9e2191eb3f4
 DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 
8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17
 SHA512 
a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 
4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01
 SHA512 
a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32

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
deleted file mode 100644
index 26a82a1b244..000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 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="~alpha 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 +ssl static-libs test"
-
-RESTRICT="!test? ( 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? (
-   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-   )
-   )
-   "
-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() {
-   # bug 508724 mariadb cannot use ld.gold
-   tc-ld-disable-gold
-   multilib-minimal_src_configure
-}
-
-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)
-   -DWITH_ICONV=ON
-   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-   -DINSTALL_LIBDIR="$(get_libdir)"
-   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-   -DINSTALL_BINDIR=bin
-   -DWITH_UNIT_TESTS=$(usex test ON OFF)
-   )
-   cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-   cmake-utils_src_compile
-}
-
-multilib_src_install() {
-   cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-   if ! use static-libs ; then
-   find "${D}" -name "*.a" -delete || die
-   fi
-}



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

2021-05-14 Thread Thomas Deutschmann
commit: 4105c94f54c8ca2925ff895e312ad9ab2fc3b0cd
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri May 14 17:30:31 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri May 14 17:32:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4105c94f

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

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

 dev-db/mariadb-connector-c/Manifest  | 1 +
 ...mariadb-connector-c-.ebuild => mariadb-connector-c-3.1.13.ebuild} | 1 -
 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild   | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 741d65dda0f..ff44a7a3a95 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,3 @@
 DIST mariadb-connector-c-3.1.11-src.tar.gz 752342 BLAKE2B 
5bee575bffdceb1eff60b7ba3fa334882cf2b2a12446cd6c52663cc5ce2e179bcd19c8452e9bdae3877ac7e9e08f4f6a974d136170c399439c42e1759d226c84
 SHA512 
2da3a5e438037dde2b9fafb07c084c742983ff4ce18f06cf7a34836aace5317cdb2ddb1bca63143367f5ae827c988d99ee20e8f598fabdb06190d9e2191eb3f4
 DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 
8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17
 SHA512 
a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d
+DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 
4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01
 SHA512 
a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
similarity index 97%
copy from dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
index c5a4f38b4f7..cfae428f3b4 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild
@@ -48,7 +48,6 @@ 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
 )
 
 multilib_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 c5a4f38b4f7..cfae428f3b4 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -48,7 +48,6 @@ 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
 )
 
 multilib_src_configure() {



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

2021-05-03 Thread Mikle Kolyada
commit: 2c9a7d53df61975ec1ca130d1374eb23ac388422
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May  3 08:07:14 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May  3 08:07:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c9a7d53

dev-db/mariadb-connector-c: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild | 5 ++---
 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild | 5 ++---
 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild   | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

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 c6da89cae39..26a82a1b244 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
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/;
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+IUSE="+curl gnutls kerberos +ssl static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -40,8 +40,7 @@ DEPEND="sys-libs/zlib:=[${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}] )
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)
)
"

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 e4d90aeaa55..6798a698ba7 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
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/;
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+IUSE="+curl gnutls kerberos +ssl static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -40,8 +40,7 @@ DEPEND="sys-libs/zlib:=[${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}] )
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)
)
"

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index 7a4723936d3..c5a4f38b4f7 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/;
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
+IUSE="+curl gnutls kerberos +ssl static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -40,8 +40,7 @@ DEPEND="sys-libs/zlib:=[${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}] )
+   dev-libs/openssl:0=[${MULTILIB_USEDEP}]
)
)
"



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

2021-03-07 Thread Thomas Deutschmann
commit: 9afc8a25299101855ecaeac8110fdf4b4aea7280
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Mar  8 00:29:50 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Mar  8 00:29:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9afc8a25

dev-db/mariadb-connector-c: rollover stable keywords

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

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 7a4723936d3..9caa67e3bbb 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
@@ -11,7 +11,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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 fi
 
 CMAKE_ECLASS=cmake



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

2021-03-02 Thread Thomas Deutschmann
commit: 81f261aafc3a920b19281b06398738d21355379d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Mar  2 16:42:59 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Mar  2 17:15:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f261aa

dev-db/mariadb-connector-c: switch to cmake.eclass

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

 .../mariadb-connector-c-3.1.12.ebuild  | 23 +--
 .../mariadb-connector-c-.ebuild| 26 +++---
 2 files changed, 14 insertions(+), 35 deletions(-)

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 80f4c976d4b..7a4723936d3 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
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-VCS_INHERIT=""
 if [[ "${PV}" ==  ]] ; then
-   VCS_INHERIT="git-r3"
+   inherit git-r3
EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git;
 else
MY_PN=${PN#mariadb-}
@@ -15,7 +14,8 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
 fi
 
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+CMAKE_ECLASS=cmake
+inherit cmake-multilib toolchain-funcs
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
 
@@ -52,13 +52,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch
 )
 
-src_configure() {
+multilib_src_configure() {
# bug 508724 mariadb cannot use ld.gold
tc-ld-disable-gold
-   multilib-minimal_src_configure
-}
 
-multilib_src_configure() {
local mycmakeargs=(
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
@@ -72,19 +69,11 @@ multilib_src_configure() {
-DINSTALL_BINDIR=bin
-DWITH_UNIT_TESTS=$(usex test ON OFF)
)
-   cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-   cmake-utils_src_compile
-}
-
-multilib_src_install() {
-   cmake-utils_src_install
+   cmake_src_configure
 }
 
 multilib_src_install_all() {
if ! use static-libs ; then
-   find "${D}" -name "*.a" -delete || die
+   find "${ED}" -name "*.a" -delete || die
fi
 }

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index be4696f0f20..7a4723936d3 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-VCS_INHERIT=""
 if [[ "${PV}" ==  ]] ; then
-   VCS_INHERIT="git-r3"
+   inherit git-r3
EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git;
 else
MY_PN=${PN#mariadb-}
@@ -15,7 +14,8 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
 fi
 
-inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
+CMAKE_ECLASS=cmake
+inherit cmake-multilib toolchain-funcs
 
 MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
 
@@ -49,15 +49,13 @@ 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() {
+multilib_src_configure() {
# bug 508724 mariadb cannot use ld.gold
tc-ld-disable-gold
-   multilib-minimal_src_configure
-}
 
-multilib_src_configure() {
local mycmakeargs=(
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
@@ -71,19 +69,11 @@ multilib_src_configure() {
-DINSTALL_BINDIR=bin
-DWITH_UNIT_TESTS=$(usex test ON OFF)
)
-   cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-   cmake-utils_src_compile
-}
-
-multilib_src_install() {
-   cmake-utils_src_install
+   cmake_src_configure
 }
 
 multilib_src_install_all() {
if ! use static-libs ; then
-   find "${D}" -name "*.a" -delete || die
+   find "${ED}" -name "*.a" -delete || die
fi
 }



[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/

2021-02-24 Thread Thomas Deutschmann
commit: 422b1418f6562fdf4755fb659aeb5ac283b68bb8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Feb 24 14:39:02 2021 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Feb 24 14:40:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422b1418

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.12.ebuild  | 89 ++
 2 files changed, 90 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 3b6bbb7078b..741d65dda0f 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1 +1,2 @@
 DIST mariadb-connector-c-3.1.11-src.tar.gz 752342 BLAKE2B 
5bee575bffdceb1eff60b7ba3fa334882cf2b2a12446cd6c52663cc5ce2e179bcd19c8452e9bdae3877ac7e9e08f4f6a974d136170c399439c42e1759d226c84
 SHA512 
2da3a5e438037dde2b9fafb07c084c742983ff4ce18f06cf7a34836aace5317cdb2ddb1bca63143367f5ae827c988d99ee20e8f598fabdb06190d9e2191eb3f4
+DIST mariadb-connector-c-3.1.12-src.tar.gz 966702 BLAKE2B 
8187199f43ccb6f92ea9df61a1f62e48dbef4744cda9a5e865f71038e47a65dea3ed094dd76d81d0d8d357a8d611a9770590a3504c297ea30f59f285ab511d17
 SHA512 
a46e8ec976c28e227a72f09c15c92126d178b422a92a4c90fd52c8053604c3309aeb3bd098dc63fbd0d87059d5360c8b63d76e61a1152e7a3e7145e13681453d

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
new file mode 100644
index 000..f5b20304f80
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 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="~alpha ~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"
+
+RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DWITH_ICONV=ON
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+   cmake-utils_src_compile
+}
+
+multilib_src_install() {
+   cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+   if ! use static-libs ; then
+   find "${D}" -name "*.a" -delete || die
+   fi
+}



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

2020-11-27 Thread Thomas Deutschmann
commit: 233c56704439bec8aa01cb533242857701bcccec
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Nov 27 17:49:21 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Nov 27 17:49:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=233c5670

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

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

 dev-db/mariadb-connector-c/Manifest|  2 -
 .../mariadb-connector-c-3.1.10.ebuild  | 89 --
 .../mariadb-connector-c-3.1.9.ebuild   | 88 -
 3 files changed, 179 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 35f7480814c..3b6bbb7078b 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,3 +1 @@
-DIST mariadb-connector-c-3.1.10-src.tar.gz 746801 BLAKE2B 
5c6c5b46306cd081d28f2e8be81fea5fd92b5dd75aac7711cfe5958f8a493b1bd84e79c96295b584effcd828303b35c0152a28892fe0bbd2994a6738ef62d5a5
 SHA512 
6b95b54e1c05a81010659d1b143330cbce411e3327e543eb240a4ab378336826c6958983b96beeaaff64836f4c5cc5c48eb8a7be6bb521dcb2bbe15e4048f38a
 DIST mariadb-connector-c-3.1.11-src.tar.gz 752342 BLAKE2B 
5bee575bffdceb1eff60b7ba3fa334882cf2b2a12446cd6c52663cc5ce2e179bcd19c8452e9bdae3877ac7e9e08f4f6a974d136170c399439c42e1759d226c84
 SHA512 
2da3a5e438037dde2b9fafb07c084c742983ff4ce18f06cf7a34836aace5317cdb2ddb1bca63143367f5ae827c988d99ee20e8f598fabdb06190d9e2191eb3f4
-DIST mariadb-connector-c-3.1.9-src.tar.gz 745374 BLAKE2B 
47c1bf1ffe888f6c2aefdb4661ad8bfe41c527d6ddc2b2aaf8da8003eebce90da420a52143265510ac47f07286d6dbfa27c4d82ce193c23aa928d0b22f83b87a
 SHA512 
cf7cd3a7592a15e2a4800c6a899e6b515ef899f4525c9f5f7d09faafbd72ac5b70a85e1c60119f58d1b5caa0f0f3657a544555bb47cdc22eabe74308c0c4bf42

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
deleted file mode 100644
index be4696f0f20..000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 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="~alpha ~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"
-
-RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
-   )
-   )
-   "
-RDEPEND="${DEPEND}"
-PATCHES=(
-   "${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-src_configure() {
-   # bug 508724 mariadb cannot use ld.gold
-   tc-ld-disable-gold
-   multilib-minimal_src_configure
-}
-
-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)
-   -DWITH_ICONV=ON
-   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-   -DINSTALL_LIBDIR="$(get_libdir)"
-   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-   -DINSTALL_BINDIR=bin
-   -DWITH_UNIT_TESTS=$(usex test ON OFF)
-   )
-   cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-   cmake-utils_src_compile
-}
-
-multilib_src_install() {
-   cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-   if ! use static-libs ; then
-  

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

2020-11-27 Thread Agostino Sarubbo
commit: a0f68ddd46ccb1d2e34a83e0d15656804476eb21
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 27 16:01:49 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 27 16:04:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0f68ddd

dev-db/mariadb-connector-c: amd64 stable wrt bug #756673

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0cf15cc88ba..5004f428a28 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
@@ -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="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-11-27 Thread Agostino Sarubbo
commit: 7beed4e45e44cda6e46ed0cd9cb8e023a205ae55
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 27 08:41:59 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 27 08:41:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7beed4e4

dev-db/mariadb-connector-c: sparc stable wrt bug #756673

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 fa80a914c80..0cf15cc88ba 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
@@ -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="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 ~sparc x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-11-26 Thread Agostino Sarubbo
commit: b3fdf38f7e88b426f2ab05d86636d1e68222701a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 27 07:55:21 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 27 07:55:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3fdf38f

dev-db/mariadb-connector-c: s390 stable wrt bug #756673

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8448ee0284c..fa80a914c80 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
@@ -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="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc 
x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 ~sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-11-26 Thread Sam James
commit: c688345996e527e92187da1ec6520190368758f1
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 26 08:27:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 26 08:32:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6883459

dev-db/mariadb-connector-c: Stabilize 3.1.11 arm64, #756673

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 d54f64b1364..8448ee0284c 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
@@ -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="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc 
x86"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc 
x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-11-26 Thread Sam James
commit: 16eaf4dccf96d9fca82967cb23b1e57d305fd673
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov 26 08:04:17 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov 26 08:04:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16eaf4dc

dev-db/mariadb-connector-c: Stabilize 3.1.11 arm, #756673

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 411599b4cbe..d54f64b1364 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
@@ -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="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc 
x86"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc 
x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-11-25 Thread Sergei Trofimovich
commit: ad35b98bedac4f9fae95d6c080b62d171897e398
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Nov 25 16:50:10 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Nov 25 22:38:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad35b98b

dev-db/mariadb-connector-c: stable 3.1.11 for hppa, bug #756673

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0d2107eb2b8..411599b4cbe 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
@@ -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc 
x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ppc64 ~s390 ~sparc 
x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-11-25 Thread Agostino Sarubbo
commit: e7330165b16d66d44a90ae2722c5bdb84c85ab51
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Nov 25 12:14:36 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Nov 25 12:14:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7330165

dev-db/mariadb-connector-c: ppc64 stable wrt bug #756673

Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0dd39f182fc..0d2107eb2b8 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
@@ -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 ~sparc 
x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-11-25 Thread Thomas Deutschmann
commit: 05e8e8856e4178217a88cd96c5701bf4242c40d2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Nov 25 11:50:20 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Nov 25 11:50:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e8e885

dev-db/mariadb-connector-c: x86 stable (bug #756673)

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

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 be4696f0f20..0dd39f182fc 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
@@ -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-11-09 Thread Thomas Deutschmann
commit: 10929401dd6d7787b95dfedc0316a982ead972ea
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Nov  9 15:29:57 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Nov  9 15:30:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10929401

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.11.ebuild  | 89 ++
 2 files changed, 90 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index c96d97de662..35f7480814c 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,3 @@
 DIST mariadb-connector-c-3.1.10-src.tar.gz 746801 BLAKE2B 
5c6c5b46306cd081d28f2e8be81fea5fd92b5dd75aac7711cfe5958f8a493b1bd84e79c96295b584effcd828303b35c0152a28892fe0bbd2994a6738ef62d5a5
 SHA512 
6b95b54e1c05a81010659d1b143330cbce411e3327e543eb240a4ab378336826c6958983b96beeaaff64836f4c5cc5c48eb8a7be6bb521dcb2bbe15e4048f38a
+DIST mariadb-connector-c-3.1.11-src.tar.gz 752342 BLAKE2B 
5bee575bffdceb1eff60b7ba3fa334882cf2b2a12446cd6c52663cc5ce2e179bcd19c8452e9bdae3877ac7e9e08f4f6a974d136170c399439c42e1759d226c84
 SHA512 
2da3a5e438037dde2b9fafb07c084c742983ff4ce18f06cf7a34836aace5317cdb2ddb1bca63143367f5ae827c988d99ee20e8f598fabdb06190d9e2191eb3f4
 DIST mariadb-connector-c-3.1.9-src.tar.gz 745374 BLAKE2B 
47c1bf1ffe888f6c2aefdb4661ad8bfe41c527d6ddc2b2aaf8da8003eebce90da420a52143265510ac47f07286d6dbfa27c4d82ce193c23aa928d0b22f83b87a
 SHA512 
cf7cd3a7592a15e2a4800c6a899e6b515ef899f4525c9f5f7d09faafbd72ac5b70a85e1c60119f58d1b5caa0f0f3657a544555bb47cdc22eabe74308c0c4bf42

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
new file mode 100644
index 000..be4696f0f20
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 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="~alpha ~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"
+
+RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DWITH_ICONV=ON
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+   cmake-utils_src_compile
+}
+
+multilib_src_install() {
+   cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+   if ! use static-libs ; then
+   find "${D}" -name "*.a" -delete || die
+   fi
+}



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

2020-09-21 Thread Thomas Deutschmann
commit: 70e437d70626e5232494c9ee5d57b6f734f1cb22
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Sep 21 12:08:09 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Sep 21 12:08:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e437d7

dev-db/mariadb-connector-c: enable ICONV support

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

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild | 1 +
 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
index 91e9ba93b99..be4696f0f20 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
@@ -62,6 +62,7 @@ multilib_src_configure() {
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-DWITH_CURL=$(usex curl ON OFF)
+   -DWITH_ICONV=ON
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DINSTALL_LIBDIR="$(get_libdir)"

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index 91e9ba93b99..be4696f0f20 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -62,6 +62,7 @@ multilib_src_configure() {
-DWITH_EXTERNAL_ZLIB=ON
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-DWITH_CURL=$(usex curl ON OFF)
+   -DWITH_ICONV=ON
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DINSTALL_LIBDIR="$(get_libdir)"



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

2020-09-21 Thread Thomas Deutschmann
commit: 7a0e9ab11b8d82bf317c6d9b185d079e8cbe05f7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Sep 21 11:59:20 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Sep 21 11:59:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0e9ab1

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.10.ebuild  | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index b41e43d6ff1..c96d97de662 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1 +1,2 @@
+DIST mariadb-connector-c-3.1.10-src.tar.gz 746801 BLAKE2B 
5c6c5b46306cd081d28f2e8be81fea5fd92b5dd75aac7711cfe5958f8a493b1bd84e79c96295b584effcd828303b35c0152a28892fe0bbd2994a6738ef62d5a5
 SHA512 
6b95b54e1c05a81010659d1b143330cbce411e3327e543eb240a4ab378336826c6958983b96beeaaff64836f4c5cc5c48eb8a7be6bb521dcb2bbe15e4048f38a
 DIST mariadb-connector-c-3.1.9-src.tar.gz 745374 BLAKE2B 
47c1bf1ffe888f6c2aefdb4661ad8bfe41c527d6ddc2b2aaf8da8003eebce90da420a52143265510ac47f07286d6dbfa27c4d82ce193c23aa928d0b22f83b87a
 SHA512 
cf7cd3a7592a15e2a4800c6a899e6b515ef899f4525c9f5f7d09faafbd72ac5b70a85e1c60119f58d1b5caa0f0f3657a544555bb47cdc22eabe74308c0c4bf42

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
new file mode 100644
index 000..91e9ba93b99
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.10.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 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="~alpha ~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"
+
+RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+   cmake-utils_src_compile
+}
+
+multilib_src_install() {
+   cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+   if ! use static-libs ; then
+   find "${D}" -name "*.a" -delete || die
+   fi
+}



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

2020-07-25 Thread Thomas Deutschmann
commit: c3ab991c7c6bbfd1d9b5861352b1581ef6d58de0
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jul 26 02:05:35 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jul 26 02:05:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3ab991c

dev-db/mariadb-connector-c: security cleanup

Bug: https://bugs.gentoo.org/729770
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|  3 -
 .../mariadb-connector-c-3.1.6.ebuild   | 88 --
 .../mariadb-connector-c-3.1.7.ebuild   | 88 --
 .../mariadb-connector-c-3.1.8.ebuild   | 88 --
 4 files changed, 267 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index f5d4a0fe63c..b41e43d6ff1 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,4 +1 @@
-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
-DIST mariadb-connector-c-3.1.8-src.tar.gz 744745 BLAKE2B 
24f4f6a8bb3a1fcbdf2c5a7434303e6a2295cb4aed0c59ee4cb776399516a9895eb51d6ef18dde429d7246750cad797f4f89c3838dfd54e835683021d712041b
 SHA512 
005fdacd7e7b353b97b5c1305f973a90744e495d7bf5d407fc6c75d49323e13a743e6c3877c00ada2b3fc49a0f33e5c2dcd70b1f8fe8eb8f579af1bce3b3e6b9
 DIST mariadb-connector-c-3.1.9-src.tar.gz 745374 BLAKE2B 
47c1bf1ffe888f6c2aefdb4661ad8bfe41c527d6ddc2b2aaf8da8003eebce90da420a52143265510ac47f07286d6dbfa27c4d82ce193c23aa928d0b22f83b87a
 SHA512 
cf7cd3a7592a15e2a4800c6a899e6b515ef899f4525c9f5f7d09faafbd72ac5b70a85e1c60119f58d1b5caa0f0f3657a544555bb47cdc22eabe74308c0c4bf42

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
deleted file mode 100644
index 8367605fc54..000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 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"
-
-RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
-   )
-   )
-   "
-RDEPEND="${DEPEND}"
-PATCHES=(
-   "${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-src_configure() {
-   # bug 508724 mariadb cannot use ld.gold
-   tc-ld-disable-gold
-   multilib-minimal_src_configure
-}
-
-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)
-   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-   -DINSTALL_LIBDIR="$(get_libdir)"
-   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-   

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

2020-06-29 Thread Sergei Trofimovich
commit: c0e792962e14b82f463ddf1395d90b9eca341428
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jun 29 18:26:44 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jun 29 19:54:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0e79296

dev-db/mariadb-connector-c: stable 3.1.9 for hppa, bug #729770

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index f06e270fdc2..219c37c6ae1 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-06-28 Thread Thomas Deutschmann
commit: d8277abfe44c52e43cc1d0ba258a100ff9895584
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Jun 28 19:39:58 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Jun 28 20:55:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8277abf

dev-db/mariadb-connector-c: x86 stable (bug #729770)

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

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index 3cce873dec9..f06e270fdc2 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc ~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-06-28 Thread Agostino Sarubbo
commit: 8c59f691954e047fa9b16eeaa9eef2b004cf2d2c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 28 20:40:29 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 28 20:40:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c59f691

dev-db/mariadb-connector-c: s390 stable wrt bug #729770

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index b78be06f8f9..3cce873dec9 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc 
~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc ~x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-06-28 Thread Agostino Sarubbo
commit: 42f6748803ba84eac6996dda18c131ed559e358c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 28 20:36:35 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 28 20:36:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f67488

dev-db/mariadb-connector-c: ppc64 stable wrt bug #729770

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index 6e25e41cbbe..b78be06f8f9 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -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="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc 
~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc 
~x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-06-28 Thread Agostino Sarubbo
commit: 3d2c5c92e82f035fcb4a49178d673d66e4f9c989
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 28 20:29:36 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 28 20:29:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d2c5c92

dev-db/mariadb-connector-c: arm stable wrt bug #729770

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index 6a11fbd684f..6e25e41cbbe 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -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="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc 
~x86"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc 
~x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-06-28 Thread Agostino Sarubbo
commit: 4747167f12e4a7e0e4e3d862c7afdbdce78e252c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jun 28 20:27:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jun 28 20:27:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4747167f

dev-db/mariadb-connector-c: amd64 stable wrt bug #729770

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index de5885c92ec..6a11fbd684f 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -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="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc 
~x86"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc 
~x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-06-28 Thread Sergei Trofimovich
commit: 3178375383baf931ce7aba9963ece1068cf4e937
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Jun 28 07:28:43 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun 28 07:49:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31783753

dev-db/mariadb-connector-c: stable 3.1.9 for sparc, bug #729770

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index 42b7c8c5997..de5885c92ec 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -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="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc 
~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc 
~x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-06-27 Thread Mart Raudsepp
commit: 8cf3d792f0d9bbf8b0c088f96c0f24516d747bbf
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Sat Jun 27 02:24:06 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Jun 27 20:41:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf3d792

dev-db/mariadb-connector-c: arm64 stable (bug #729770)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
index 91e9ba93b99..42b7c8c5997 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc 
~x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2020-06-25 Thread Thomas Deutschmann
commit: 53f878f233459817f8c0de88dc5f4e72d3e440cc
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Jun 25 21:04:53 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Jun 25 21:43:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53f878f2

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.9.ebuild   | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 85ed7e42198..f5d4a0fe63c 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.6-src.tar.gz 742858 BLAKE2B 
416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60
 SHA512 
44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8
 DIST mariadb-connector-c-3.1.7-src.tar.gz 742923 BLAKE2B 
641c3c49cf83af918e5dab06f9b8afecd59bd7b6486cc55b33749cd0ef317ab6cff86da9b85829b0309305a190e16f4ecc369210c54070e265387a5818c48ca1
 SHA512 
0b7f6497b6b88b2bbcb870b7c3a8f3fe0bf547c6b5d9b95cc99423aa8ea02ac510c5fb71079e7cd79a49741c7f26f3e68c39e245b18fab46754e8640f79ff670
 DIST mariadb-connector-c-3.1.8-src.tar.gz 744745 BLAKE2B 
24f4f6a8bb3a1fcbdf2c5a7434303e6a2295cb4aed0c59ee4cb776399516a9895eb51d6ef18dde429d7246750cad797f4f89c3838dfd54e835683021d712041b
 SHA512 
005fdacd7e7b353b97b5c1305f973a90744e495d7bf5d407fc6c75d49323e13a743e6c3877c00ada2b3fc49a0f33e5c2dcd70b1f8fe8eb8f579af1bce3b3e6b9
+DIST mariadb-connector-c-3.1.9-src.tar.gz 745374 BLAKE2B 
47c1bf1ffe888f6c2aefdb4661ad8bfe41c527d6ddc2b2aaf8da8003eebce90da420a52143265510ac47f07286d6dbfa27c4d82ce193c23aa928d0b22f83b87a
 SHA512 
cf7cd3a7592a15e2a4800c6a899e6b515ef899f4525c9f5f7d09faafbd72ac5b70a85e1c60119f58d1b5caa0f0f3657a544555bb47cdc22eabe74308c0c4bf42

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
new file mode 100644
index 000..91e9ba93b99
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.9.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 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="~alpha ~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"
+
+RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
+   )
+   

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

2020-05-25 Thread Thomas Deutschmann
commit: eb66b7e9b4b8b92d160fa968a3610fbe4eac80e6
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon May 25 11:46:52 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon May 25 11:46:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb66b7e9

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.8.ebuild   | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 50ad9a5d2bf..85ed7e42198 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,3 @@
 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
+DIST mariadb-connector-c-3.1.8-src.tar.gz 744745 BLAKE2B 
24f4f6a8bb3a1fcbdf2c5a7434303e6a2295cb4aed0c59ee4cb776399516a9895eb51d6ef18dde429d7246750cad797f4f89c3838dfd54e835683021d712041b
 SHA512 
005fdacd7e7b353b97b5c1305f973a90744e495d7bf5d407fc6c75d49323e13a743e6c3877c00ada2b3fc49a0f33e5c2dcd70b1f8fe8eb8f579af1bce3b3e6b9

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.8.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.8.ebuild
new file mode 100644
index 000..91e9ba93b99
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.8.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 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="~alpha ~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"
+
+RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+   cmake-utils_src_compile
+}
+
+multilib_src_install() {
+   cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+   if ! use static-libs ; then
+   find "${D}" -name "*.a" -delete || die
+   fi
+}



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

2020-04-01 Thread Thomas Deutschmann
commit: 0e3eefc6538cd7ec8d13384e6d95af1f6a61731c
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Apr  1 21:25:00 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Apr  1 21:25:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e3eefc6

dev-db/mariadb-connector-c: update live ebuild

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

 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index 9b1a6789a00..91e9ba93b99 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 
~sparc ~x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}
@@ -48,7 +48,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.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: 

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

2020-04-01 Thread Mart Raudsepp
commit: 24509ae82a18f9a7c09eeca65c2c2241a748b734
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Wed Apr  1 21:08:00 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Apr  1 21:12:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24509ae8

dev-db/mariadb-connector-c: arm64 (bug #709618)

Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index 4618f61448e..720127a8acf 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -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 ~ppc 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}



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

2020-02-22 Thread Sergei Trofimovich
commit: e705c1aebff6c1952c8dd20bfc1e83d95dfe168a
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Feb 22 12:21:41 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb 22 14:19:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e705c1ae

dev-db/mariadb-connector-c: stable 3.1.6 for hppa, bug #709618

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index d5326a236ad..4618f61448e 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -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 ~ppc 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}



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

2020-02-17 Thread Agostino Sarubbo
commit: 40b75b75a67452575d185db2be0b4fa4ccb9e0f6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Feb 17 12:25:23 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Feb 17 12:25:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b75b75

dev-db/mariadb-connector-c: ppc64 stable wrt bug #709618

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index df41145b9a4..d5326a236ad 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -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 ~ppc ~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}



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

2020-02-17 Thread Agostino Sarubbo
commit: bcf7d096a87a04795bad1215dd517095b6a1fc92
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Feb 17 12:16:48 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Feb 17 12:16:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf7d096

dev-db/mariadb-connector-c: ia64 stable wrt bug #709618

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index d2835a00776..df41145b9a4 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -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 ~ppc ~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}



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

2020-02-17 Thread Agostino Sarubbo
commit: af8e60227ccf47f1b2c38cbe74f08fd9638c8bc0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Feb 17 11:53:31 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Feb 17 11:53:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8e6022

dev-db/mariadb-connector-c: s390 stable wrt bug #709618

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index 7ba6693e152..d2835a00776 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -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 ~ppc ~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}



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

2020-02-17 Thread Agostino Sarubbo
commit: 4d231a3d8e07efc045601a089c7709aa21c6da59
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Feb 17 11:45:13 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Feb 17 11:45:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d231a3d

dev-db/mariadb-connector-c: arm stable wrt bug #709618

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index 755a1b6320b..7ba6693e152 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -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 ~ppc ~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}



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

2020-02-16 Thread Thomas Deutschmann
commit: 8a526b2c8b38729788cc49933af9d7168da374ba
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 16 20:55:58 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 16 21:13:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a526b2c

dev-db/mariadb-connector-c: x86 stable (bug #709618)

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

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index dcdd977bb5b..755a1b6320b 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -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 ~ppc ~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}



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

2020-02-15 Thread Sergei Trofimovich
commit: 7ad0d22d2db4b3549a347a0a14dd5c149d86f6ed
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Feb 15 15:30:11 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb 15 19:29:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad0d22d

dev-db/mariadb-connector-c: stable 3.1.6 for sparc, bug #709618

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index 88b36eb388a..dcdd977bb5b 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -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 ~ppc ~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}



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

2020-02-15 Thread Mikle Kolyada
commit: 085f26e3b911290bece993f96add32786ea406f4
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Feb 15 12:16:37 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Feb 15 12:16:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=085f26e3

dev-db/mariadb-connector-c: amd64 stable wrt bug #709618

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
index a62f6afecfb..88b36eb388a 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~ppc ~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}



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

2020-02-14 Thread Thomas Deutschmann
commit: dc9030e267fc82c312a9a05a92f471eeb0487738
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Feb 14 15:25:01 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Feb 14 15:25:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9030e2

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.7.ebuild   | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 36e224defa0..854f5361f2f 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.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/mariadb-connector-c-3.1.7.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.7.ebuild
new file mode 100644
index 000..63c6d2e6025
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.7.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 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"
+
+RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+   cmake-utils_src_compile
+}
+
+multilib_src_install() {
+   cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+   if ! use static-libs ; then
+   find "${D}" -name "*.a" -delete || die
+   fi
+}



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

2019-12-26 Thread Thomas Deutschmann
commit: fe03fe715c02fb9e40a351b619526e45b40b0e7b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Dec 26 10:22:54 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Dec 26 10:23:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe03fe71

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

Due to non-working certificate signature check, these versions
are no stable candidates.

Link: https://jira.mariadb.org/browse/CONC-447
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|  2 -
 .../mariadb-connector-c-3.1.4.ebuild   | 88 --
 .../mariadb-connector-c-3.1.5.ebuild   | 88 --
 3 files changed, 178 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index a28e0d425d2..36e224defa0 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,4 +1,2 @@
 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 
7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a
 SHA512 
6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e
-DIST mariadb-connector-c-3.1.4-src.tar.gz 738308 BLAKE2B 
ba0242ba951ba53aec899517cb25877cefebb757eb1d90adcf88021d669213790c32654d1078943f1c37f0494de780e03d93b3f2c2d8a584ddffc08d9802c392
 SHA512 
9528760df2aa4921d6a06dfd977977060b58fe7d57c7cb1e323021245533de3da97e45f44818fe9bfdfbe60606aff69f8216e23a0b53620aa21dcdee241c30ea
-DIST mariadb-connector-c-3.1.5-src.tar.gz 739192 BLAKE2B 
4430231489bcd173ce6f0dc1502a4bc376545e598336a239d81e9a19ef73b7788316cdfc2660ab7681c3201afa42ed2527b37944097e6e525e6896e4f74766e0
 SHA512 
06da9d400bdaf1db640cd20ef0e028986e7dbe1108c24b73c67d6df40eecc36bcfa35fc0697567a95f5016242da5829a48b47a07c08faf8eadd4ba44b50acc1d
 DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 
416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60
 SHA512 
44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild
deleted file mode 100644
index a62f6afecfb..000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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"
-
-RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
-   )
-   )
-   "
-RDEPEND="${DEPEND}"
-PATCHES=(
-   "${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
-)
-
-src_configure() {
-   # bug 508724 mariadb cannot use ld.gold
-   tc-ld-disable-gold
-   multilib-minimal_src_configure
-}
-
-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)
-   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-   -DINSTALL_LIBDIR="$(get_libdir)"
-   

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

2019-12-26 Thread Thomas Deutschmann
commit: 4ecd1e0e4f7a0dc709fd1946e37b243e92c3db47
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Dec 26 10:19:49 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Dec 26 10:23:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ecd1e0e

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.6.ebuild   | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index ac8268a1f21..a28e0d425d2 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.1.4-src.tar.gz 738308 BLAKE2B 
ba0242ba951ba53aec899517cb25877cefebb757eb1d90adcf88021d669213790c32654d1078943f1c37f0494de780e03d93b3f2c2d8a584ddffc08d9802c392
 SHA512 
9528760df2aa4921d6a06dfd977977060b58fe7d57c7cb1e323021245533de3da97e45f44818fe9bfdfbe60606aff69f8216e23a0b53620aa21dcdee241c30ea
 DIST mariadb-connector-c-3.1.5-src.tar.gz 739192 BLAKE2B 
4430231489bcd173ce6f0dc1502a4bc376545e598336a239d81e9a19ef73b7788316cdfc2660ab7681c3201afa42ed2527b37944097e6e525e6896e4f74766e0
 SHA512 
06da9d400bdaf1db640cd20ef0e028986e7dbe1108c24b73c67d6df40eecc36bcfa35fc0697567a95f5016242da5829a48b47a07c08faf8eadd4ba44b50acc1d
+DIST mariadb-connector-c-3.1.6-src.tar.gz 742858 BLAKE2B 
416cc33cf7a01fee9649f6c35e0a7e16b889a1fad10f2b204e259a2672535d1ad7f9ade9723989a4ce00cf8a2c4660f40357516bfdc4547118a54637911f9b60
 SHA512 
44309e706cb49451a0d1a91f907ab7cfa1fb1bf95d26cf3bbce1caa367c2fa8ad377a691361e297dd2fcbc444c10115f18aec66dd6d69c458f282ace3025a3e8

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
new file mode 100644
index 000..a62f6afecfb
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.6.ebuild
@@ -0,0 +1,88 @@
+# 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"
+
+RESTRICT="!test? ( 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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
+   )
+   

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

2019-11-17 Thread Thomas Deutschmann
commit: 491bbe82e75fed57e6b58b791817d4254a819e85
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 17 21:52:34 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 17 21:54:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=491bbe82

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

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

 dev-db/mariadb-connector-c/Manifest|  3 -
 .../mariadb-connector-c-3.0.9.ebuild   | 86 --
 .../mariadb-connector-c-3.1.2.ebuild   | 86 --
 .../mariadb-connector-c-3.1.3.ebuild   | 86 --
 4 files changed, 261 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 15bf9e5a445..ac8268a1f21 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,6 +1,3 @@
 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
 DIST mariadb-connector-c-3.1.4-src.tar.gz 738308 BLAKE2B 
ba0242ba951ba53aec899517cb25877cefebb757eb1d90adcf88021d669213790c32654d1078943f1c37f0494de780e03d93b3f2c2d8a584ddffc08d9802c392
 SHA512 
9528760df2aa4921d6a06dfd977977060b58fe7d57c7cb1e323021245533de3da97e45f44818fe9bfdfbe60606aff69f8216e23a0b53620aa21dcdee241c30ea
 DIST mariadb-connector-c-3.1.5-src.tar.gz 739192 BLAKE2B 
4430231489bcd173ce6f0dc1502a4bc376545e598336a239d81e9a19ef73b7788316cdfc2660ab7681c3201afa42ed2527b37944097e6e525e6896e4f74766e0
 SHA512 
06da9d400bdaf1db640cd20ef0e028986e7dbe1108c24b73c67d6df40eecc36bcfa35fc0697567a95f5016242da5829a48b47a07c08faf8eadd4ba44b50acc1d

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
deleted file mode 100644
index 854813a44d9..000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/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=[${MULTILIB_USEDEP}] )
-   )
-   )
-   "
-RDEPEND="${DEPEND}"
-PATCHES=(
-   "${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
-)
-
-src_configure() {
-   # bug 508724 mariadb 

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

2019-11-17 Thread Thomas Deutschmann
commit: 94295bde6c2857023375f46d4219e3cf849cd265
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 17 21:51:48 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 17 21:54:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94295bde

dev-db/mariadb-connector-c: Add RESTRICT="!test? ( test )"

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

 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild | 2 ++
 dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild | 2 ++
 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild
index 234dbab6974..a62f6afecfb 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild
@@ -30,6 +30,8 @@ LICENSE="LGPL-2.1"
 SLOT="0/3"
 IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
 
+RESTRICT="!test? ( test )"
+
 DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
virtual/libiconv:=[${MULTILIB_USEDEP}]
curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild
index 234dbab6974..a62f6afecfb 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild
@@ -30,6 +30,8 @@ LICENSE="LGPL-2.1"
 SLOT="0/3"
 IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
 
+RESTRICT="!test? ( test )"
+
 DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
virtual/libiconv:=[${MULTILIB_USEDEP}]
curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index 2985ce7c2c6..9b1a6789a00 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -30,6 +30,8 @@ LICENSE="LGPL-2.1"
 SLOT="0/3"
 IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
 
+RESTRICT="!test? ( test )"
+
 DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
virtual/libiconv:=[${MULTILIB_USEDEP}]
curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )



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

2019-11-17 Thread Thomas Deutschmann
commit: b4ef16df6bb1e0a02b756f51e18198efc325ec6b
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Nov 17 20:32:08 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Nov 17 20:32:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4ef16df

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.5.ebuild   | 86 ++
 2 files changed, 87 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 47de8ebdc06..15bf9e5a445 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,3 +3,4 @@ DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B 
f61f855c334268b1cb079ab
 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
 DIST mariadb-connector-c-3.1.4-src.tar.gz 738308 BLAKE2B 
ba0242ba951ba53aec899517cb25877cefebb757eb1d90adcf88021d669213790c32654d1078943f1c37f0494de780e03d93b3f2c2d8a584ddffc08d9802c392
 SHA512 
9528760df2aa4921d6a06dfd977977060b58fe7d57c7cb1e323021245533de3da97e45f44818fe9bfdfbe60606aff69f8216e23a0b53620aa21dcdee241c30ea
+DIST mariadb-connector-c-3.1.5-src.tar.gz 739192 BLAKE2B 
4430231489bcd173ce6f0dc1502a4bc376545e598336a239d81e9a19ef73b7788316cdfc2660ab7681c3201afa42ed2527b37944097e6e525e6896e4f74766e0
 SHA512 
06da9d400bdaf1db640cd20ef0e028986e7dbe1108c24b73c67d6df40eecc36bcfa35fc0697567a95f5016242da5829a48b47a07c08faf8eadd4ba44b50acc1d

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.ebuild
new file mode 100644
index 000..234dbab6974
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.5.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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex 

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

2019-10-04 Thread Thomas Deutschmann
commit: ce7e8ec2b2d7e02fbbdd00740b34ee1be9c07690
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Oct  5 00:35:56 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Oct  5 00:37:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7e8ec2

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.4.ebuild   | 86 ++
 2 files changed, 87 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index da04c0403d7..47de8ebdc06 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -2,3 +2,4 @@ DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 
7245c0e13e569454d1cc70e
 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
+DIST mariadb-connector-c-3.1.4-src.tar.gz 738308 BLAKE2B 
ba0242ba951ba53aec899517cb25877cefebb757eb1d90adcf88021d669213790c32654d1078943f1c37f0494de780e03d93b3f2c2d8a584ddffc08d9802c392
 SHA512 
9528760df2aa4921d6a06dfd977977060b58fe7d57c7cb1e323021245533de3da97e45f44818fe9bfdfbe60606aff69f8216e23a0b53620aa21dcdee241c30ea

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.ebuild
new file mode 100644
index 000..234dbab6974
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.4.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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex 

[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? ( 

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

2019-07-30 Thread Thomas Deutschmann
commit: de28c645716d9ee4b59f8587cc6b3ab860ece436
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jul 30 21:52:20 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jul 30 21:52:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de28c645

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

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

 dev-db/mariadb-connector-c/Manifest|  1 +
 .../mariadb-connector-c-3.1.2.ebuild   | 86 ++
 2 files changed, 87 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 6b46d2466d8..9581259d514 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.9-src.tar.gz 668142 BLAKE2B 
f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946
 SHA512 
6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a
+DIST mariadb-connector-c-3.1.2-src.tar.gz 735530 BLAKE2B 
c441cb69b0affaaa5ed87a9e81232ef2dfab305bf5d92ad60ad0198508294c1153ad517347d2af1336722149200a1a62ddd4c289913b09de0195c9da79279305
 SHA512 
8ad0ec5aea07a04e7ac9da6af3d067755dd8f22deed071de2321c581374b5ed1e4d6bab048b231655d3c2a3722b2b99f276d95046c659f867cbd58d772fb17bb

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.2.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.2.ebuild
new file mode 100644
index 000..2985ce7c2c6
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.2.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=[${MULTILIB_USEDEP}] )
+   )
+   )
+   "
+RDEPEND="${DEPEND}"
+PATCHES=(
+   "${FILESDIR}"/gentoo-layout-3.0.patch
+   "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+   -DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+   -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
+   -DINSTALL_BINDIR=bin
+   -DWITH_UNIT_TESTS=$(usex test ON OFF)
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+   cmake-utils_src_compile
+}
+
+multilib_src_install() {
+   cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+   if ! use static-libs ; then
+   find "${D}" -name "*.a" -delete || die
+   fi
+}



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

2019-07-30 Thread Aaron Bauman
commit: f94efac198b341c77da07b863112d8e30488814c
Author: Aaron Bauman  gentoo  org>
AuthorDate: Tue Jul 30 21:38:32 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Jul 30 21:39:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94efac1

dev-db/mariadb-connector-c: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index eedda9285fb..f2f106102fe 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.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 ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2019-07-08 Thread Brian Evans
commit: 2e36f9b20495c5c6c7df618c82b1aba9901f3479
Author: Brian Evans  gentoo  org>
AuthorDate: Mon Jul  8 16:29:50 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Mon Jul  8 16:29:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e36f9b2

dev-db/mariadb-connector-c: Drop client-libs USE requirement on live

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index e6c4b2e6896..2985ce7c2c6 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 VCS_INHERIT=""
 if [[ "${PV}" ==  ]] ; then
@@ -43,9 +43,7 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
)
)
"
-RDEPEND="${DEPEND}
-   !>=dev-db/mariadb-10.2.0[client-libs(+)]
-   "
+RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
@@ -63,7 +61,7 @@ multilib_src_configure() {
-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-DWITH_CURL=$(usex curl ON OFF)
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-   -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
+   -DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DINSTALL_LIBDIR="$(get_libdir)"
-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"



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

2019-03-15 Thread Brian Evans
commit: 0a4f621821c5c2ebd8e52ab24264b047cb60f5ad
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Mar 15 19:13:01 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Mar 15 19:13:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4f6218

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

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 dev-db/mariadb-connector-c/Manifest|   2 -
 ...db-connector-c-3.0.7-fix-pkconfig-file-r1.patch |  32 ---
 .../mariadb-connector-c-3.0.7-r1.ebuild| 102 
 .../mariadb-connector-c-3.0.8.ebuild   | 103 -
 4 files changed, 239 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 4ce03a3c9a6..6b46d2466d8 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,4 +1,2 @@
 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
 DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B 
f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946
 SHA512 
6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a

diff --git 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch
 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch
deleted file mode 100644
index 1fe06e2c8e5..000
--- 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 @@
- #
- 
- 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-3.0.7-r1.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
deleted file mode 100644
index 2cd32bf0db3..000
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/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 mysqlcompat +ssl static-libs test"
-
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
-  

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

2019-03-15 Thread Brian Evans
commit: 5195b2ae5d4c7edf3fea92e2b7f441f0160860b6
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Mar 15 19:05:28 2019 +
Commit: Brian Evans  gentoo  org>
CommitDate: Fri Mar 15 19:05:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5195b2ae

dev-db/mariadb-connector-c: Begin to drop the mysqlcompat USE flag

This library is functionally incompatible and should never have introduced
this in the first place.

Bug: https://bugs.gentoo.org/show_bug.cgi?id=666750
Bug: https://bugs.gentoo.org/668560
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Brian Evans  gentoo.org>

 .../mariadb-connector-c-3.0.9.ebuild| 21 ++---
 .../mariadb-connector-c-.ebuild | 17 +
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
index c957edaec2d..854813a44d9 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/;
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
 
 DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
virtual/libiconv:=[${MULTILIB_USEDEP}]
@@ -43,16 +43,7 @@ DEPEND="sys-libs/zlib:=[${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(+)]
-   "
+RDEPEND="${DEPEND}"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
"${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
@@ -86,18 +77,10 @@ multilib_src_compile() {
 
 multilib_src_install() {
cmake-utils_src_install
-   if use mysqlcompat ; then
-   dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-   dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-   fi
 }
 
 multilib_src_install_all() {
if ! use static-libs ; then
find "${D}" -name "*.a" -delete || die
fi
-   if use mysqlcompat ; then
-   dosym mariadb_config /usr/bin/mysql_config
-   dosym mariadb /usr/include/mysql
-   fi
 }

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
index c957edaec2d..e6c4b2e6896 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://mariadb.org/;
 LICENSE="LGPL-2.1"
 
 SLOT="0/3"
-IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test"
+IUSE="+curl gnutls kerberos libressl +ssl static-libs test"
 
 DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
virtual/libiconv:=[${MULTILIB_USEDEP}]
@@ -44,13 +44,6 @@ DEPEND="sys-libs/zlib:=[${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=(
@@ -86,18 +79,10 @@ multilib_src_compile() {
 
 multilib_src_install() {
cmake-utils_src_install
-   if use mysqlcompat ; then
-   dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19
-   dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so
-   fi
 }
 
 multilib_src_install_all() {
if ! use static-libs ; then
find "${D}" -name "*.a" -delete || die
fi
-   if use mysqlcompat ; then
-   dosym mariadb_config /usr/bin/mysql_config
-   dosym mariadb /usr/include/mysql
-   fi
 }



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

2019-02-27 Thread Thomas Deutschmann
commit: fa1106a5c96562e38069aea5bca50287c544f4b5
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Feb 28 03:08:45 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Feb 28 03:08:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa1106a5

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

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

 dev-db/mariadb-connector-c/Manifest|   1 +
 .../mariadb-connector-c-3.0.9.ebuild   | 103 +
 2 files changed, 104 insertions(+)

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 7d29a1f9d0f..4ce03a3c9a6 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.7-src.tar.gz 667274 BLAKE2B 
75d2d548d51889aecc8af56cbeb61f5eaf21e60924b70dd0559214de464eae209743febdb5d443797f853bc902352f7333aefe84cb367f61f7bf2c341a4a8ac2
 SHA512 
70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219
 DIST mariadb-connector-c-3.0.8-src.tar.gz 674455 BLAKE2B 
eca5972f8443c78cdc9f450e7e88ee1c69e2a004664916a0f7dfd9a1ab8242c9e11d3cafcd95323262223fba5d68c5d489d4f61fdddb8369cf603cdd563cfe51
 SHA512 
d9f970c7ac164ef7d8dd748bf2f749cc1f877a9c8f68a1d57e9ff62d95046bb9505619feca1f1d0d1cdefc1ac49489742aadf4ad9e47c8e6a9b8b40c56eed788
+DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B 
f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946
 SHA512 
6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
new file mode 100644
index 000..c957edaec2d
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.9.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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/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 mysqlcompat +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=[${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
+   "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch
+)
+
+src_configure() {
+   # bug 508724 mariadb cannot use ld.gold
+   tc-ld-disable-gold
+   multilib-minimal_src_configure
+}
+
+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)
+   -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
+   

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

2019-02-26 Thread Aaron Bauman
commit: 596f98d877b9cb9d2272967e030a08551b1cff03
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Feb 12 16:23:55 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Feb 27 05:35:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596f98d8

dev-db/mariadb-connector-c: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11032
Signed-off-by: Aaron Bauman  gentoo.org>

 ...ariadb-connector-c-3.0.7-fix-pkconfig-file.patch | 21 -
 1 file changed, 21 deletions(-)

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.patch
deleted file mode 100644
index 1a16a2c0101..000
--- 
a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-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: 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



[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/

2018-12-26 Thread Sergei Trofimovich
commit: 67735194200802fd11c1a0a297e8de46469ed3bd
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Dec 26 20:05:37 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Dec 26 20:05:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67735194

dev-db/mariadb-connector-c: keyworded 3.0.7-r1 for ppc, bug #563932

Package-Manager: Portage-2.3.52, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
index 8622a1ea73c..2cd32bf0db3 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild
@@ -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}



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

2018-12-17 Thread Thomas Deutschmann
commit: 92437856b0ef2c059cc9c19be5d89b3c1a048c12
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Dec 17 11:04:49 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Dec 17 11:05:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92437856

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

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

 ...ariadb-connector-c-3.0.7-fix-pkconfig-file.patch | 21 +
 .../mariadb-connector-c-.ebuild |  1 +
 2 files changed, 22 insertions(+)

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.patch
new file mode 100644
index 000..1a16a2c0101
--- /dev/null
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-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-.ebuild
index b6cc03960be..2e5ed26b63e 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -72,6 +72,7 @@ multilib_src_configure() {
-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos 
DYNAMIC OFF)
-DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock"
-DINSTALL_LIBDIR="$(get_libdir)"
+   -DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
-DINSTALL_BINDIR=bin
-DWITH_UNIT_TESTS=$(usex test ON OFF)



[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/files/, dev-db/mariadb-connector-c/

2018-12-02 Thread Thomas Deutschmann
commit: ea877c3b3848900bd9b42ef61ec137220343507f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Dec  2 23:08:58 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Dec  3 00:07:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea877c3b

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

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

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

diff --git a/dev-db/mariadb-connector-c/Manifest 
b/dev-db/mariadb-connector-c/Manifest
index 42e70beae03..46ec03744d9 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1 +1,2 @@
 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

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.patch
new file mode 100644
index 000..1a16a2c0101
--- /dev/null
+++ 
b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-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.7.ebuild
similarity index 98%
copy from dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild
index 1b2b77025ff..b6cc03960be 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch
+   "${FILESDIR}"/${PN}-3.0.7-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 1b2b77025ff..b6cc03960be 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${DEPEND}
"
 PATCHES=(
"${FILESDIR}"/gentoo-layout-3.0.patch
-   "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch
+   "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch
 )
 
 src_configure() {



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

2018-11-09 Thread Mikle Kolyada
commit: 0e691965a593539c72263cd533b192b9a5c84803
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Nov  9 18:18:19 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Nov  9 18:18:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e691965

dev-db/mariadb-connector-c: arm stable wrt bug #668316

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index a72bd4c2353..eedda9285fb 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -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 ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2018-10-21 Thread Sergei Trofimovich
commit: 9f7b5e0ada187ee91d22e124ce5747715b67b094
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Oct 21 08:09:40 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Oct 21 08:28:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f7b5e0a

dev-db/mariadb-connector-c: stable 3.0.6-r1 for hppa, bug #668316

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index e6ddf8e637e..a72bd4c2353 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -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 ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2018-10-20 Thread Mikle Kolyada
commit: 2a48c1705e388c4c342150690796aada062cc825
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 20 15:25:15 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 20 15:27:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a48c170

dev-db/mariadb-connector-c: amd64 stable wrt bug #668316

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index 79661957423..e6ddf8e637e 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -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 ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2018-10-20 Thread Mikle Kolyada
commit: d854309c529570ab5919f8cae2fd073c869df093
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 20 15:24:15 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 20 15:24:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d854309c

dev-db/mariadb-connector-c: s390 stable wrt bug #668316

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index 01997e92a0b..79661957423 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -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 ppc64 s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



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

2018-10-20 Thread Sergei Trofimovich
commit: 0b315d95dc9246bd856aa738cfde394515ac23ec
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Oct 20 11:44:37 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Oct 20 11:44:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b315d95

dev-db/mariadb-connector-c: stable 3.0.6-r1 for ppc64, bug #668316

Signed-off-by: Sergei Trofimovich  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"

 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild 
b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
index ee6425a2440..01997e92a0b 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild
@@ -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 ppc64 ~s390 sparc x86"
 fi
 
 inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT}



  1   2   >