commit: cc67804b489142b48cb3c9316c5b92324068794f
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 7 18:59:34 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 7 19:12:24 2019 +0000
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 <whissi <AT> 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 00000000000..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 00000000000..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}" == 9999 ]] ; 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 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
+}
