* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-connector-c/files/, dev-db/mariadb-connector-c/
@ 2015-01-30 19:37 Brian Evans
0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2015-01-30 19:37 UTC (permalink / raw
To: gentoo-commits
commit: befe69a14bd64b64716a4c9e854709788d77e319
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 30 19:29:01 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jan 30 19:29:01 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=befe69a1
Version bump
---
dev-db/mariadb-connector-c/Manifest | 1 +
.../files/fix-mariadb_config-2.1.0.patch | 12 ++++
.../mariadb-connector-c-2.1.0.ebuild | 78 ++++++++++++++++++++++
3 files changed, 91 insertions(+)
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 273846d..b94a3e6 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1 +1,2 @@
+DIST mariadb-connector-c-2.1.0-src.tar.gz 1912888 SHA256 568050b89463af7610d458669fd9eee06dcc9405689aca8a526ac8c013b59167 SHA512 1bf06ed2fe2a39c15bbd48029b2e6aaf0a9b4704f18e0caa9f356f6b41c8e57e5170e83e875929eb77ec631250f983d1cf8d60d78156b1e6795518a1a346bbe7 WHIRLPOOL 205319d1e4b47f41f2e5f409f66ba9101d7a041ac7550f3886471db02ae329d671a12ebd2177bbec83d2f99baa603589ca8d45fe09ed7f4f20c26a9150ed0624
DIST mariadb_client-2.0.0-src.tar.gz 1923436 SHA256 fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 SHA512 7be7454dedc218bb5cdeae5d54c461129cc4611d0e380c4d2bf60bc276e85ea0ae52b0dcf8a41edef0e0e678e1392c2ddcebb9c4a75ad4625808fd0cc7522c75 WHIRLPOOL be699bbda7d86a8708347fcfdc0ebdc17f1fe6ee6e4d1b839e849673450849ab4838eee8d6995a45009a899dbe88d63f7e09dc94933b598b16709db92958aa55
diff --git a/dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch b/dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch
new file mode 100644
index 0000000..e5bbce3
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/fix-mariadb_config-2.1.0.patch
@@ -0,0 +1,12 @@
+diff -aruN a/mariadb_config/mariadb_config.c.in b/mariadb_config/mariadb_config.c.in
+--- a/mariadb_config/mariadb_config.c.in 2015-01-29 13:21:48.000000000 -0500
++++ b/mariadb_config/mariadb_config.c.in 2015-01-30 13:03:01.312548413 -0500
+@@ -6,7 +6,7 @@
+ #define INCLUDE "-I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@/mysql"
+ #define LIBS "-L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb" \
+ "@extra_dynamic_LDFLAGS@"
+-#define CFLAGS INCLUDE " @CMAKE_C_FLAGS@"
++#define CFLAGS INCLUDE
+ #define VERSION "@MYSQL_CLIENT_VERSION@"
+ #define PLUGIN_DIR "@PREFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@"
+ #define SOCKET "@MYSQL_UNIX_ADDR@"
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
new file mode 100644
index 0000000..4942c84
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+VCS_INHERIT=""
+if [[ "${PV}" == 9999 ]] ; then
+ VCS_INHERIT="git-r3"
+ EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
+ KEYWORDS=""
+else
+ MY_PN=${PN#mariadb-}
+ SRC_URI="
+ http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+ http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+ http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+ "
+ S="${WORKDIR}/${P}-src"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit cmake-multilib eutils "${VCS_INHERIT}"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+ /usr/include/mariadb/my_config.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="http://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/2"
+IUSE="+mysqlcompat +ssl static-libs"
+
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+ virtual/libiconv:=[${MULTILIB_USEDEP}]
+ ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+ "
+# Block server packages due to /usr/bin/mariadb_config symlink there
+# TODO: make server package block only when mysqlcompat is enabled
+RDEPEND="${DEPEND}
+ !dev-db/mysql
+ !dev-db/mysql-cluster
+ !dev-db/mysql-connector-c
+ !dev-db/mariadb
+ !dev-db/mariadb-galera
+ !dev-db/percona-server
+ "
+
+src_prepare() {
+ epatch "${FILESDIR}/fix-mariadb_config-2.1.0.patch"
+ epatch_user
+}
+
+multilib_src_configure() {
+ mycmakeargs+=(
+ -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
+ -DWITH_EXTERNAL_ZLIB=ON
+ $(cmake-utils_use_with ssl OPENSSL)
+ $(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ -DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
+ )
+ cmake-utils_src_configure
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-connector-c/files/, dev-db/mariadb-connector-c/
@ 2015-03-18 19:35 Brian Evans
0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2015-03-18 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 3557ebb38948bbfbf7eea27348b2d5d601e56a9e
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 19:35:20 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 19:35:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=3557ebb3
[mariadb-connector-c] Add a Gentoo layout patch
.../mariadb-connector-c/files/gentoo-layout.patch | 60 ++++++++++++++++++++++
.../mariadb-connector-c-2.1.0.ebuild | 7 ++-
.../mariadb-connector-c-9999.ebuild | 51 +++++++++---------
3 files changed, 90 insertions(+), 28 deletions(-)
diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout.patch b/dev-db/mariadb-connector-c/files/gentoo-layout.patch
new file mode 100644
index 0000000..5663a37
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/gentoo-layout.patch
@@ -0,0 +1,60 @@
+diff -uarN a/cmake/install.cmake b/cmake/install.cmake
+--- a/cmake/install.cmake 2015-01-29 13:21:48.000000000 -0500
++++ b/cmake/install.cmake 2015-03-18 14:43:14.682768210 -0400
+@@ -39,12 +39,14 @@
+ ENDIF()
+
+ SET(INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE
+- STRING "Installation layout. Currently supported options are DEFAULT (tar.gz and zip) and RPM")
++ STRING "Installation layout. Currently supported options are DEFAULT (tar.gz and zip), GENTOO, and RPM")
+
+ # On Windows we only provide zip and .msi. Latter one uses a different packager.
+ IF(UNIX)
+ IF(INSTALL_LAYOUT MATCHES "RPM")
+ SET(libmariadb_prefix "/usr")
++ ELSEIF(INSTALL_LAYOUT MATCHES "GENTOO")
++ SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
+ ELSEIF(INSTALL_LAYOUT MATCHES "DEFAULT")
+ SET(libmariadb_prefix ${CMAKE_INSTALL_PREFIX})
+ ENDIF()
+@@ -55,7 +57,7 @@
+ ENDIF()
+
+ # check if the specified installation layout is valid
+-SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM")
++SET(VALID_INSTALL_LAYOUTS "DEFAULT" "RPM" "GENTOO")
+ LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" layout_no)
+ IF(layout_no EQUAL -1)
+ MESSAGE(FATAL_ERROR "Invalid installation layout. Please specify one of the following layouts: ${VALID_INSTALL_LAYOUTS}")
+diff -uarN a/cmake/install.cmake b/cmake/install.cmake
+--- a/cmake/install.cmake 2015-01-29 13:21:48.000000000 -0500
++++ b/cmake/install.cmake 2015-03-18 14:39:35.240617655 -0400
+@@ -79,6 +79,16 @@
+ SET(PLUGIN_INSTALL_DIR_DEFAULT "lib/plugin")
+
+ #
++# Gentoo layout
++#
++SET(SUFFIX_INSTALL_DIR_GENTOO "")
++SET(BIN_INSTALL_DIR_GENTOO "bin")
++SET(LIB_INSTALL_DIR_GENTOO "lib")
++SET(INCLUDE_INSTALL_DIR_GENTOO "include/mariadb")
++SET(DOCS_INSTALL_DIR_GENTOO "share/docs")
++SET(PLUGIN_INSTALL_DIR_GENTOO "lib/mariadb/plugin")
++
++#
+ # RPM layout
+ #
+ SET(SUFFIX_INSTALL_DIR_RPM "mariadb")
+diff -uarN a/cmake/install.cmake b/cmake/install.cmake
+--- a/cmake/install.cmake 2015-01-29 13:21:48.000000000 -0500
++++ b/cmake/install.cmake 2015-03-18 14:31:56.156920869 -0400
+@@ -118,8 +118,5 @@
+ SET(PREFIX_INSTALL_DIR_${INSTALL_LAYOUT} ${libmariadb_prefix})
+ ENDIF()
+
+-IF(NOT SUFFIX_INSTALL_DIR)
+- SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} "mariadb")
+-ENDIF()
+
+ FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PREFIX" "SUFFIX" "PLUGIN")
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
index 4f9dda0..1ba3e08 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-2.1.0.ebuild
@@ -37,7 +37,7 @@ IUSE="mysqlcompat +ssl static-libs"
DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
virtual/libiconv:=[${MULTILIB_USEDEP}]
- ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+ ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
"
# Block server packages due to /usr/bin/mariadb_config symlink there
# TODO: make server package block only when mysqlcompat is enabled
@@ -51,7 +51,9 @@ RDEPEND="${DEPEND}
"
src_prepare() {
- epatch "${FILESDIR}/fix-mariadb_config-2.1.0.patch"
+ epatch \
+ "${FILESDIR}/fix-mariadb_config-2.1.0.patch" \
+ "${FILESDIR}/gentoo-layout.patch"
epatch_user
}
@@ -63,6 +65,7 @@ multilib_src_configure() {
$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
-DLIB_INSTALL_DIR=$(get_libdir)
-DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_LAYOUT=GENTOO
)
cmake-utils_src_configure
}
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 89bd64f..717a923 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-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -7,21 +7,23 @@ EAPI=5
VCS_INHERIT=""
if [[ "${PV}" == 9999 ]] ; then
VCS_INHERIT="git-r3"
- EGIT_REPO_URI="https://github.com/MariaDB/connector-c.git"
+ EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
KEYWORDS=""
else
- MY_PN="mariadb_client"
+ MY_PN=${PN#mariadb-}
SRC_URI="
- http://ftp.osuosl.org/pub/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz
- http://mirrors.fe.up.pt/pub/mariadb/client-native${PV}/src/${MY_PN}-${PV}-src.tar.gz
- http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/client-native-${PV}/src/${MY_PN}-${PV}-src.tar.gz
+ http://ftp.osuosl.org/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+ http://mirrors.fe.up.pt/pub/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
+ http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/${MY_PN}-${PV}/source-tgz/${P}-src.tar.gz
"
- S="${WORKDIR}/${MY_PN}-${PV}-src"
+ S="${WORKDIR}/${P}-src"
KEYWORDS="~amd64 ~x86"
fi
inherit cmake-multilib eutils "${VCS_INHERIT}"
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
MULTILIB_WRAPPED_HEADERS+=(
/usr/include/mariadb/my_config.h
)
@@ -31,50 +33,47 @@ HOMEPAGE="http://mariadb.org/"
LICENSE="LGPL-2.1"
SLOT="0/2"
-IUSE="doc +mysqlcompat +ssl static-libs"
+IUSE="mysqlcompat +ssl static-libs"
-CDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
virtual/libiconv:=[${MULTILIB_USEDEP}]
- ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+ ssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
"
# Block server packages due to /usr/bin/mariadb_config symlink there
# TODO: make server package block only when mysqlcompat is enabled
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
!dev-db/mysql
!dev-db/mysql-cluster
- !dev-db/mysql-connector-c
!dev-db/mariadb
!dev-db/mariadb-galera
!dev-db/percona-server
+ mysqlcompat? ( !dev-db/mysql-connector-c )
"
-DEPEND="${CDEPEND}
- doc? ( app-text/xmlto )"
src_prepare() {
- epatch "${FILESDIR}/fix-libdir.patch"
- sed -i "s/INCLUDE(CPack)//" CMakeLists.txt || die "sed failed"
+ epatch \
+ "${FILESDIR}/fix-mariadb_config-2.1.0.patch" \
+ "${FILESDIR}/gentoo-layout.patch"
+ epatch_user
}
-src_configure() {
+multilib_src_configure() {
mycmakeargs+=(
-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
-DWITH_EXTERNAL_ZLIB=ON
$(cmake-utils_use_with ssl OPENSSL)
$(cmake-utils_use_with mysqlcompat MYSQLCOMPAT)
- $(cmake-utils_use_build doc DOCS)
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ -DPLUGIN_INSTALL_DIR=$(get_libdir)/mariadb/plugin
+ -DINSTALL_LAYOUT=GENTOO
)
- cmake-multilib_src_configure
+ cmake-utils_src_configure
}
-multilib_src_install() {
- cmake-utils_src_install
+multilib_src_install_all() {
if ! use static-libs ; then
- rm "${ED}/usr/$(get_libdir)/libmariadbclient.a" || die
- use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a" || die
+ find "${D}" -name "*.a" -delete || die
fi
-}
-
-multilib_src_install_all() {
if use mysqlcompat ; then
dosym mariadb_config /usr/bin/mysql_config
dosym mariadb /usr/include/mysql
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-connector-c/files/, dev-db/mariadb-connector-c/
@ 2017-04-25 16:19 Brian Evans
0 siblings, 0 replies; 3+ messages in thread
From: Brian Evans @ 2017-04-25 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 6c983c33acc4b11c19f1a0360131f0e90ea4c191
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 16:19:29 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 16:19:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=6c983c33
dev-db/mariadb-connector-c: Version bump to 3.0.1_beta
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Manifest-Sign-Key: D1F781EFF9F4A3B6
dev-db/mariadb-connector-c/ChangeLog | 6 ++
dev-db/mariadb-connector-c/Manifest | 27 +++---
.../files/gentoo-layout-3.0.patch | 9 ++
.../mariadb-connector-c-3.0.1_beta.ebuild | 97 ++++++++++++++++++++++
4 files changed, 129 insertions(+), 10 deletions(-)
diff --git a/dev-db/mariadb-connector-c/ChangeLog b/dev-db/mariadb-connector-c/ChangeLog
index 2457265..6f57011 100644
--- a/dev-db/mariadb-connector-c/ChangeLog
+++ b/dev-db/mariadb-connector-c/ChangeLog
@@ -1,3 +1,9 @@
+*mariadb-connector-c-3.0.1_beta (25 Apr 2017)
+
+ 25 Apr 2017; Brian Evans <grknight@gentoo.org> +files/gentoo-layout-3.0.patch,
+ +mariadb-connector-c-3.0.1_beta.ebuild:
+ dev-db/mariadb-connector-c: Version bump to 3.0.1_beta
+
*mariadb-connector-c-2.2.2 (13 Feb 2016)
13 Feb 2016; Brian Evans <grknight@gentoo.org>
diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 7358e41..2262c97 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,17 +3,24 @@ Hash: SHA256
DIST mariadb-connector-c-2.1.0-src.tar.gz 1912888 SHA256 568050b89463af7610d458669fd9eee06dcc9405689aca8a526ac8c013b59167 SHA512 1bf06ed2fe2a39c15bbd48029b2e6aaf0a9b4704f18e0caa9f356f6b41c8e57e5170e83e875929eb77ec631250f983d1cf8d60d78156b1e6795518a1a346bbe7 WHIRLPOOL 205319d1e4b47f41f2e5f409f66ba9101d7a041ac7550f3886471db02ae329d671a12ebd2177bbec83d2f99baa603589ca8d45fe09ed7f4f20c26a9150ed0624
DIST mariadb-connector-c-2.2.2-src.tar.gz 519724 SHA256 93f56ad9f08bbaf0da8ef03bc96f7093c426ae40dede60575d485e1b99e6406b SHA512 8e7b35345de3ae3902b74613646c17641e441548ec87eb97c635c98dcddb0862411a625d9e82ba62324babe21d0d099a241b074826f0b396b425a80e714dd355 WHIRLPOOL e09d535186726cad6c880327e2045176a8bc773675381262bcff071ecccbdaa6b2fc802250cedf9d3a5f8848fa178fba9a8e236e3d3d988800826176376b91b1
+DIST mariadb-connector-c-3.0.1_beta-src.tar.gz 650137 SHA256 37b7922254e637285e69deceaa81667be103b1ac904b5a946a74d6d3ec97eeac SHA512 99e65987317b4169558191e45449332465188721429842f5196afb22f5e7ec31ac833c75ca8820c9bd63f7745df58fd17e809a83bca58d1a74f329dc10aee551 WHIRLPOOL 770e7e4368fbc17e871a704112c94522b27f564dd66d4520d0afdb46ef0e32e054d533d93a2ff60b9d7f42e15a2c33d2d8723dcb07f4d8f5b459820c797b012b
DIST mariadb_client-2.0.0-src.tar.gz 1923436 SHA256 fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60 SHA512 7be7454dedc218bb5cdeae5d54c461129cc4611d0e380c4d2bf60bc276e85ea0ae52b0dcf8a41edef0e0e678e1392c2ddcebb9c4a75ad4625808fd0cc7522c75 WHIRLPOOL be699bbda7d86a8708347fcfdc0ebdc17f1fe6ee6e4d1b839e849673450849ab4838eee8d6995a45009a899dbe88d63f7e09dc94933b598b16709db92958aa55
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
-iQF8BAEBCABmBQJWvqB2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0RkMzMzEwODc1NUUyNzUzNjNGREIyRkY0
-RTE1RTJGMTY3Qzc4RTFEAAoJEE4V4vFnx44drH8H/0UNsMpIuoPMkj176qCbHiKI
-pE2AyIf3GcLi95sPDEUO5IhQRAcOulxaMQfLctVSb2Yp1iCVrSS89cNC2AAnkyrb
-ZHBpWMFdf4Fg8SyfIJfaYkrGayXoOabum1HVlfsvz6bgQvHqCBjrPL8Q4rFCZtKM
-MJXBw1kXLdwPVKkQDgf4Id3Ganu+euVd8KLLuifXIvgVu+fNbJ0kMULK83DaAMiE
-3buUD8MDEtI0QmYoGVr0LWnbvpnHSql+nmrk+7P1hn/Drn3xSBhytcLNVBu16lKZ
-tgKwgb2ahLJrdzE0y4rtuaOcuhEp+Np186/qX+wnIxEPmJX7g8v3RB2om9rOmUo=
-=GltZ
+iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlj/dw5fFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
+QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
+o7ah1Q//eiU2SkY4vfZsYZ+P82SbAD0oDxlLiUlochqwvce0BfJ8gUrH5ZNQs0Qg
+XoJnx/CQ9xDDzIibgccPMXvw/wfczbo/aAO9eoD5HfBnGyrZeewHV6kogfz1WNo/
+jt7+xcfpsNbnLaDuE5EU2EdHnMhcxbb3DPnx3m70D36L4cvlN8D91oM+6YAOKUZV
+pMBU2RLKRSiJdSxKN3QZwdNtdhaz/Dlpyyl+C3CUEf4CxvJvB71fCbzMNPMRfcA5
++CsHyl5cd/3bBccaNHFFnf3prcfoh6pxf6zHtQj9Wy5Q6/Kbt6DbecsVoRjlwrp3
+vhuZXu0eJ/TUhB+F7XYlyXmqPVH60EkP43sRXsfQQ7IXYRbs7NH6XbQWRVCOk5lU
+UUvqexKAwDQ6hU9wrq8SJEb5TSwlK4aC2E69on23ky5l5SjlgK0lGctmR/lZMPr3
+lXTBuSAJhJqsdBPAou5dgp2NDhz+6z4DSeW0toudyITIz7upCugCcKrPd4HWrIJG
+qeuuWYSDL1lt9ksoAjWznY43gVfjqwN6UtsDrsi5in9Jaf5Ewo3esl4TmqiYz2Qo
+NObPEW3FxU11LJGIujO/8zQ/qnkKiv6rXQ1iU8YPatL6fVmXfyEcQm0PRDJidvYe
+urHDjgY7GHGYewt/hrtt+tuJw1Rck/845aeHeBOKNvX+nluhAS0=
+=hm+F
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch b/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
new file mode 100644
index 0000000..b57b7ab
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch
@@ -0,0 +1,9 @@
+--- a/mariadb_config/CMakeLists.txt 2016-02-12 21:21:06.981021227 -0500
++++ b/mariadb_config/CMakeLists.txt 2016-02-12 22:06:02.397130410 -0500
+@@ -40,5 +44,5 @@
+ # Installation
+ #
+ INSTALL(TARGETS mariadb_config
+- DESTINATION "bin"
++ DESTINATION ${INSTALL_BINDIR}
+ COMPONENT Development)
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild
new file mode 100644
index 0000000..05f8f0d
--- /dev/null
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.1_beta.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 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=""
+else
+ MY_PN=${PN#mariadb-}
+ MY_PV=${PV/_b/-b}
+ SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz"
+ S="${WORKDIR}/${PN}-${MY_PV}-src"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit cmake-utils multilib-minimal ${VCS_INHERIT}
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+
+MULTILIB_WRAPPED_HEADERS+=(
+ /usr/include/mariadb/mariadb_version.h
+)
+
+DESCRIPTION="C client library for MariaDB/MySQL"
+HOMEPAGE="http://mariadb.org/"
+LICENSE="LGPL-2.1"
+
+SLOT="0/2"
+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
+ !dev-db/mysql-cluster
+ !dev-db/mariadb
+ !dev-db/mariadb-galera
+ !dev-db/percona-server
+ !dev-db/mysql-connector-c )
+ "
+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
+ default
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DWITH_EXTERNAL_ZLIB=ON
+ -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+ -DWITH_MYSQLCOMPAT=$(usex mysqlcompat ON OFF)
+ -DWITH_CURL=$(usex curl ON OFF)
+ -DAUTH_GSSAPI_PLUGIN_TYPE:STRING=$(usex kerberos ON OFF)
+ -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_install_all() {
+ if ! use static-libs ; then
+ find "${D}" -name "*.a" -delete || die
+ fi
+ if use mysqlcompat ; then
+ dosym /usr/bin/mariadb_config /usr/bin/mysql_config
+ dosym mariadb /usr/include/mysql
+ fi
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-25 16:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-30 19:37 [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-connector-c/files/, dev-db/mariadb-connector-c/ Brian Evans
-- strict thread matches above, loose matches on Subject: below --
2015-03-18 19:35 Brian Evans
2017-04-25 16:19 Brian Evans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox