From 64e107b9b6058580ff0432107eb37cefb0b2a7d8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 22 Oct 2018 11:09:47 +0100 Subject: gentoo resync : 22.10.2018 --- dev-db/mariadb-connector-c/Manifest | 9 +- ...b-connector-c-3.0.6-provide-pkconfig-file.patch | 48 +++++++++ .../mariadb-connector-c-3.0.3-r1.ebuild | 116 --------------------- .../mariadb-connector-c-3.0.4-r1.ebuild | 101 ------------------ .../mariadb-connector-c-3.0.6-r1.ebuild | 102 ++++++++++++++++++ .../mariadb-connector-c-3.0.6.ebuild | 101 ------------------ .../mariadb-connector-c-9999.ebuild | 7 +- 7 files changed, 157 insertions(+), 327 deletions(-) create mode 100644 dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch delete mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.ebuild delete mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.4-r1.ebuild create mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild delete mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild (limited to 'dev-db/mariadb-connector-c') diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest index 812ffc92cbaa..e0bce7b8587a 100644 --- a/dev-db/mariadb-connector-c/Manifest +++ b/dev-db/mariadb-connector-c/Manifest @@ -1,9 +1,6 @@ AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43cc68eed1ac71cf089c9fa32a1343d7ebfdf428e7f25032f5782aecfb86fb8f78528ffc708ab15dc7285a24e7 SHA512 4d5a48b4dd66aab04ba597b30e96b4601c6745acca21be1daf051ba6ce1e8fef1a0efa46d8e81da1ecdc893a8ee471bd8c7ed0c5436ee33b8b4f7cd18fdca1a5 -DIST mariadb-connector-c-3.0.3-src.tar.gz 666928 BLAKE2B 83181949f1867909fd96696ac5cc9d11433a0c772ecb97d862983916b235d380fd84462d547faf42756d6698dd9dbe7dcd4d6b1d0f6336e147f5a597108ea025 SHA512 6da66a32165cb74b106bf94e13a35d4bb38f05e5d2b3ff3740862dfc0892a7705977c1394b4f84b8e1f1e50a59a3fadbc62e7733b1feb532c6368a9fc262db04 -DIST mariadb-connector-c-3.0.4-src.tar.gz 659406 BLAKE2B 9285880338e6040976741d8b440d78ef95005d44e0e7b1428cb526735380038d6dfaccfd6bd689f4b9c084a340281b2d8f4f38a193d1c6a4c5853c5333617899 SHA512 6edc7b70380aade1c88a3d9dac70d6da846e6e2e7d7b0dc2eddaba148dc3889f2baa3e757a8b91e479b1ae14051d9f948fbfdc516219e21d4a3117f6700cb020 +AUX mariadb-connector-c-3.0.6-provide-pkconfig-file.patch 1838 BLAKE2B 454433d5815e818bb3cb08241b1629e7cb2e8c6b33d09e241db11cc7f18e73a8cbf40567fe47a613c420581f8487c39478bcbef22da4ba21b77a10f71e4b11ef SHA512 a3ec1a1702d2d5ae5ea6ef93e9bc7f01df548c65574b177a20e8b29694b078ebd67a409ed253467d1db38895e66285eaf73e604a507bfb09384bc3d15325cb60 DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e -EBUILD mariadb-connector-c-3.0.3-r1.ebuild 3323 BLAKE2B fd0559a46920f20df4bfc0f96512c860345e63a3d9514ba43b4ba3c19d372da2d2eaa30e31d5c6756a857de0eb2f9f9e4b11bfff6396d65b0c0c7e844f0a4832 SHA512 654032eeeef401367f12941b21fd8f8ecaaaa53049b2699ce96a945e327defffcb257d0138b31a906aad1fcba0b43e6c4e52a8c7597583c6e2cd39e59a288a9a -EBUILD mariadb-connector-c-3.0.4-r1.ebuild 2787 BLAKE2B 0f300bd4e7eb8f86f2ea358f0d26925ddb5df80bedeabb3bf1495da143a057afb4202d5a5335e4f439607d52e7eecfb0df22f25eb2d7a1fb754cec39f0f5ed73 SHA512 65fd079d9ebc7312a8ad47045b7653d6c4bc35b6581e10b4bf40208fbe1ef6b0edd45fbde18a65c86309b97c059d68441516c2b0149b99a8fbd39453628da099 -EBUILD mariadb-connector-c-3.0.6.ebuild 2787 BLAKE2B 0f300bd4e7eb8f86f2ea358f0d26925ddb5df80bedeabb3bf1495da143a057afb4202d5a5335e4f439607d52e7eecfb0df22f25eb2d7a1fb754cec39f0f5ed73 SHA512 65fd079d9ebc7312a8ad47045b7653d6c4bc35b6581e10b4bf40208fbe1ef6b0edd45fbde18a65c86309b97c059d68441516c2b0149b99a8fbd39453628da099 -EBUILD mariadb-connector-c-9999.ebuild 2787 BLAKE2B 0f300bd4e7eb8f86f2ea358f0d26925ddb5df80bedeabb3bf1495da143a057afb4202d5a5335e4f439607d52e7eecfb0df22f25eb2d7a1fb754cec39f0f5ed73 SHA512 65fd079d9ebc7312a8ad47045b7653d6c4bc35b6581e10b4bf40208fbe1ef6b0edd45fbde18a65c86309b97c059d68441516c2b0149b99a8fbd39453628da099 +EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2817 BLAKE2B a6096a7d9aa65984468bc171be778531a78d380fdb347c0377b9818f0637bb91a799c70572580aec6229aaefd084eb970fd62db98d92246c45dc0741a713209f SHA512 ef15674194ed80ed74ffb9a17e4ab6c2c347d1dd354606ba4a48ebf843439486548769d3c88c2d2eeb0348739ce00a75ddceba2bab7b309b538bb33923a57e9f +EBUILD mariadb-connector-c-9999.ebuild 2824 BLAKE2B aeac543f01595fe6995ca8fb59450cfa4381593f7c034beec8f344880bf092f17e40e84fa3fb1e64aa1f8cdb82751bc75916b9d817df6800bcc8a3532c334734 SHA512 9c693876ede71b1ac59be9b10276e193b25497ee5c4411a6260449f31c73f1e7e28310574aa9e97f889f4f0382c167c188d0b3cbf03d2084aac73a1d2e5d2a90 MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6 diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch new file mode 100644 index 000000000000..02bbefce3576 --- /dev/null +++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.6-provide-pkconfig-file.patch @@ -0,0 +1,48 @@ +--- a/mariadb_config/CMakeLists.txt ++++ b/mariadb_config/CMakeLists.txt +@@ -46,6 +46,8 @@ ENDIF() + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mariadb_config.c.in + ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c @ONLY) ++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmariadb.pc.in ++ ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc @ONLY) + + ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) + +@@ -54,3 +56,6 @@ ADD_EXECUTABLE(mariadb_config ${CMAKE_CURRENT_BINARY_DIR}/mariadb_config.c) + INSTALL(TARGETS mariadb_config + DESTINATION "bin" + COMPONENT Development) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ++ COMPONENT Development) +--- a/mariadb_config/libmariadb.pc.in ++++ b/mariadb_config/libmariadb.pc.in +@@ -1,19 +1,11 @@ +-# +-# pkg_config.pc.in +-# +-# pkg_config configuration file +-# For a detailed description of options, please visit +-# Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/) +-# +- +-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ +-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ +-prefix=@PREFIX_INSTALL_DIR@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=${prefix}/include + + Name: libmariadb +-Version: @LIBMARIADB_VERSION@ + Description: MariaDB Connector/C dynamic library +-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@ +-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@ +- +- ++Version: @LIBMARIADB_VERSION@ ++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ ++Libs: -L${libdir} -lmariadb ++Cflags: -I${includedir}/mariadb diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.ebuild deleted file mode 100644 index b15b8490e8e3..000000000000 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.3-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -VCS_INHERIT="" -if [[ "${PV}" == 9999 ]] ; then - VCS_INHERIT="git-r3" - EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git" - KEYWORDS="~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sparc" -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 ~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" - -DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] - virtual/libiconv:=[${MULTILIB_USEDEP}] - curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] ) - kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}] - app-crypt/heimdal[${MULTILIB_USEDEP}] ) ) - ssl? ( - gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] ) - !gnutls? ( - libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) - !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) - ) - ) - " -RDEPEND="${DEPEND} - mysqlcompat? ( - !dev-db/mysql[client-libs(+)] - !dev-db/mysql-cluster[client-libs(+)] - !dev-db/mariadb[client-libs(+)] - !dev-db/mariadb-galera[client-libs(+)] - !dev-db/percona-server[client-libs(+)] - !dev-db/mysql-connector-c ) - !>=dev-db/mariadb-10.2.0[client-libs(+)] - " -PATCHES=( - "${FILESDIR}/gentoo-layout-3.0.patch" ) - -src_prepare() { - local gpluginconf="${T}/gentoo-plugins.cmake" - touch "${gpluginconf}" || die - # Plugins cannot be disabled by a build switch, redefine them in our own file to be included - if ! use kerberos ; then - echo 'REGISTER_PLUGIN("AUTH_GSSAPI" "" "auth_gssapi_plugin" "OFF" "auth_gssapi_client" 1)' \ - >> "${gpluginconf}" || die - fi - if ! use curl ; then - echo 'REGISTER_PLUGIN("REMOTEIO" "" "remote_io_plugin" "OFF" "remote_io" 1)' \ - >> "${gpluginconf}" || die - fi - cmake-utils_src_prepare -} - -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) - -DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF) - -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" - -DINSTALL_LIBDIR="$(get_libdir)" - -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" - -DINSTALL_BINDIR=bin - -DPLUGIN_CONF_FILE:STRING="${T}/gentoo-plugins.cmake" - ) - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_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-3.0.4-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.4-r1.ebuild deleted file mode 100644 index df11d5524952..000000000000 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.4-r1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -VCS_INHERIT="" -if [[ "${PV}" == 9999 ]] ; then - VCS_INHERIT="git-r3" - EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" - KEYWORDS="" -else - MY_PN=${PN#mariadb-} - MY_PV=${PV/_b/-b} - SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" - S="${WORKDIR%/}/${PN}-${MY_PV}-src" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" ) - -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_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 - 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-3.0.6-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild new file mode 100644 index 000000000000..a72bd4c23537 --- /dev/null +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 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.6-provide-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_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 + 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-3.0.6.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild deleted file mode 100644 index df11d5524952..000000000000 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.6.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -VCS_INHERIT="" -if [[ "${PV}" == 9999 ]] ; then - VCS_INHERIT="git-r3" - EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" - KEYWORDS="" -else - MY_PN=${PN#mariadb-} - MY_PV=${PV/_b/-b} - SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" - S="${WORKDIR%/}/${PN}-${MY_PV}-src" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" ) - -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_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 - 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-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild index df11d5524952..1b2b77025ff6 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,7 +7,6 @@ VCS_INHERIT="" if [[ "${PV}" == 9999 ]] ; then VCS_INHERIT="git-r3" EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git" - KEYWORDS="" else MY_PN=${PN#mariadb-} MY_PV=${PV/_b/-b} @@ -55,7 +54,9 @@ RDEPEND="${DEPEND} !>=dev-db/mariadb-10.2.0[client-libs(+)] " PATCHES=( - "${FILESDIR%/}/gentoo-layout-3.0.patch" ) + "${FILESDIR}"/gentoo-layout-3.0.patch + "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch +) src_configure() { # bug 508724 mariadb cannot use ld.gold -- cgit v1.2.3