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

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