[gentoo-commits] proj/mysql:master commit in: dev-db/mariadb-native-client/, dev-db/mariadb-native-client/files/

[Brian Evans]

commit:     a4a07ad570180872e27d8d4b0c98cd005108579f
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Tue Apr 29 17:09:12 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Tue Apr 29 17:09:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=a4a07ad5

Version bump for 2.0.0

Package-Manager: portage-2.2.10

---
 dev-db/mariadb-native-client/ChangeLog             |  6 ++
 dev-db/mariadb-native-client/Manifest              |  1 +
 .../mariadb-native-client/files/fix-libdir.patch   | 58 ++++++++++++++++
 .../files/fix-mariadb_config.patch                 | 25 +++++++
 .../mariadb-native-client-2.0.0.ebuild             | 78 ++++++++++++++++++++++
 5 files changed, 168 insertions(+)

diff --git a/dev-db/mariadb-native-client/ChangeLog b/dev-db/mariadb-native-client/ChangeLog
index bb6ae82..22829b2 100644
--- a/dev-db/mariadb-native-client/ChangeLog
+++ b/dev-db/mariadb-native-client/ChangeLog
@@ -1,3 +1,9 @@
+*mariadb-native-client-2.0.0 (29 Apr 2014)
+
+  29 Apr 2014; Brian Evans <grknight@××××××××.com> +files/fix-libdir.patch,
+  +files/fix-mariadb_config.patch, +mariadb-native-client-2.0.0.ebuild:
+  Version bump for 2.0.0
+
 *mariadb-native-client-9999 (26 Jun 2013)
 
   26 Jun 2013; Brian Evans <grknight@×××××××.com>

diff --git a/dev-db/mariadb-native-client/Manifest b/dev-db/mariadb-native-client/Manifest
index a3cdbfd..934e091 100644
--- a/dev-db/mariadb-native-client/Manifest
+++ b/dev-db/mariadb-native-client/Manifest
@@ -1 +1,2 @@
 DIST mariadb-native-client.tar.gz 548121 SHA256 848c45ec1e685412abe020d934eee45d17cf81e7cbfa79ef6317343eb8557354 SHA512 ece36c3333cf6dbd4fc4f2be54542d05d7fe44a9387586afc0367356fdadae5d24c41d977b1d5f829156d6a54c9e89afc3d18d3f4b1510fcea2527ac701fa6af WHIRLPOOL 48a92dd2dc0655455a68aab91860a218463d95feec21b00fb43b406efc185838fb97d40880cba39d44bfff2f8c0ae4af85a4459a57cb050550b0d8809a0bb3bc
+DIST mariadb_client-2.0.0-src.tar.gz 3874667 SHA256 0da402597d249399f1cf81c58d70dc880e3f0c0ae4eeebbbac7ad662fafee16b SHA512 0f77f9d58f61e10c39bc7876be346ba78e4f1d341cfdc8f5d2649b182bb2201da0a9a86088026f7688444dc28aa902105ecc76e1b2062e759f9e9c4aff8ade66 WHIRLPOOL 06e2a18cbb8f306ed61acdb6abe7b67e9c8105f5a99d96544798e39721e05a9e4c7a58da76c7b8b3a52462f1276aedf4de1f61490258a79467ed3b8316df1f59

diff --git a/dev-db/mariadb-native-client/files/fix-libdir.patch b/dev-db/mariadb-native-client/files/fix-libdir.patch
new file mode 100644
index 0000000..c7ade92
--- /dev/null
+++ b/dev-db/mariadb-native-client/files/fix-libdir.patch
@@ -0,0 +1,58 @@
+diff -aurN mariadb_client-2.0.0-src/CMakeLists.txt mariadb_client-2.0.0-src.new/CMakeLists.txt
+--- mariadb_client-2.0.0-src/CMakeLists.txt	2014-04-01 11:14:40.000000000 -0400
++++ mariadb_client-2.0.0-src.new/CMakeLists.txt	2014-04-03 16:12:55.163032445 -0400
+@@ -27,8 +27,19 @@
+ 
+ OPTION(WITH_SQLITE "Enables Sqlite support" OFF)
+ OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF)
++OPTION(INSTALL_LIBDIR "Library install location" OFF)
+ ###############
+ 
++IF(NOT INSTALL_LIBDIR)
++  # Some distros can set this in a global cmake config
++  IF(CMAKE_INSTALL_LIBDIR)
++    SET(INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}")
++  ELSE() 
++    # Provide a sane default
++    SET(INSTALL_LIBDIR "lib/mariadb")
++  ENDIF()
++ENDIF()
++
+ IF(WITH_RTC)
+   SET(RTC_OPTIONS "/RTC1 /RTCc")
+ ENDIF()
+diff -aurN mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt mariadb_client-2.0.0-src.new/libmariadb/CMakeLists.txt
+--- mariadb_client-2.0.0-src/libmariadb/CMakeLists.txt	2014-03-18 11:01:05.000000000 -0400
++++ mariadb_client-2.0.0-src.new/libmariadb/CMakeLists.txt	2014-04-03 16:15:49.417626907 -0400
+@@ -210,15 +210,15 @@
+ 
+ INSTALL(TARGETS
+           libmariadb mariadbclient
+-          RUNTIME DESTINATION "lib/mariadb"
+-          LIBRARY DESTINATION "lib/mariadb"
+-          ARCHIVE DESTINATION "lib/mariadb")
++          RUNTIME DESTINATION "${INSTALL_LIBDIR}"
++          LIBRARY DESTINATION "${INSTALL_LIBDIR}"
++          ARCHIVE DESTINATION "${INSTALL_LIBDIR}")
+ IF(NOT WIN32 AND WITH_MYSQLCOMPAT)
+   INSTALL(FILES "${CMAKE_BINARY_DIR}/libmariadb/libmysql${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient_r${CMAKE_SHARED_LIBRARY_SUFFIX}"
+                 "${CMAKE_BINARY_DIR}/libmariadb/libmysqlclient${CMAKE_STATIC_LIBRARY_SUFFIX}"
+-                DESTINATION lib/mariadb)
++                DESTINATION ${INSTALL_LIBDIR})
+ ENDIF()
+ 
+ INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/
+diff -aurN mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in mariadb_client-2.0.0-src.new/mariadb_config/mariadb_config.c.in
+--- mariadb_client-2.0.0-src/mariadb_config/mariadb_config.c.in	2014-03-18 11:01:05.000000000 -0400
++++ mariadb_client-2.0.0-src.new/mariadb_config/mariadb_config.c.in	2014-04-03 16:16:52.455669572 -0400
+@@ -4,7 +4,7 @@
+ #include <stdio.h>
+ 
+ #define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb"
+-#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/lib/mariadb -lmariadb" \
++#define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@ -lmariadb" \
+                 "@extra_dynamic_LDFLAGS@"
+ #define CFLAGS  INCLUDE "@CMAKE_C_FLAGS@"
+ #define VERSION "@MYSQL_CLIENT_VERSION@"

diff --git a/dev-db/mariadb-native-client/files/fix-mariadb_config.patch b/dev-db/mariadb-native-client/files/fix-mariadb_config.patch
new file mode 100644
index 0000000..ae12801
--- /dev/null
+++ b/dev-db/mariadb-native-client/files/fix-mariadb_config.patch
@@ -0,0 +1,25 @@
+diff -aurN mariadb_config.orig/CMakeLists.txt mariadb_config/CMakeLists.txt
+--- mariadb_config.orig/CMakeLists.txt	2014-04-29 12:44:35.309693578 -0400
++++ mariadb_config/CMakeLists.txt	2014-04-29 12:43:25.511924411 -0400
+@@ -19,7 +19,8 @@
+   SEARCH_LIBRARY(LIBDL dlopen "dl")
+   SEARCH_LIBRARY(LIBM floor m)
+   FOREACH(lib ${EXTRA_LIBS})
+-    SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -l${lib}")
++    STRING(REPLACE "-l" "" clean_lib ${lib})
++    SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -l${clean_lib}")
+   ENDFOREACH()
+   IF(WITH_SQLITE)
+     SET(extra_dynamic_LDFLAGS "${extra_dynamic_LDFLAGS} -lsqlite")
+diff -aurN mariadb_config.orig/mariadb_config.c.in mariadb_config/mariadb_config.c.in
+--- mariadb_config.orig/mariadb_config.c.in	2014-04-29 12:44:22.320108741 -0400
++++ mariadb_config/mariadb_config.c.in	2014-04-29 12:41:54.934819014 -0400
+@@ -6,7 +6,7 @@
+ #define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/include/mariadb"
+ #define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@ -lmariadb" \
+                 "@extra_dynamic_LDFLAGS@"
+-#define CFLAGS  INCLUDE "@CMAKE_C_FLAGS@"
++#define CFLAGS  INCLUDE " @CMAKE_C_FLAGS@"
+ #define VERSION "@MYSQL_CLIENT_VERSION@"
+ #define SOCKET  "@MYSQL_UNIX_ADDR@"
+ #define PORT "@MYSQL_PORT@"

diff --git a/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild b/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
new file mode 100644
index 0000000..12a38e3
--- /dev/null
+++ b/dev-db/mariadb-native-client/mariadb-native-client-2.0.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+VCS_INHERIT=""
+MY_PN="mariadb_client"
+if [[ "${PV}" == 9999 ]] ; then
+	VCS_INHERIT="bzr"
+	EBZR_REPO_URI="lp:${PN}"
+else
+	S="${WORKDIR}/${MY_PN}-${PV}-src"
+fi
+
+inherit cmake-multilib eutils "${VCS_INHERIT}"
+
+MULTILIB_WRAPPED_HEADERS+=(
+	/usr/include/mariadb/my_config.h
+)
+
+DESCRIPTION="Client Library for C is used to connect applications developed in C/C++ to MariaDB/MySQL databases"
+HOMEPAGE="http://mariadb.org/"
+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
+	"
+LICENSE="LGPL-2.1"
+
+SLOT="0/2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +mysqlcompat +ssl static-libs"
+
+RDEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/libiconv:=[${MULTILIB_USEDEP}]
+	ssl? ( dev-libs/openssl:=
+		amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs  )  )
+	 )
+	mysqlcompat? (
+		!dev-db/mysql
+		!dev-db/mysql-cluster
+		!dev-db/mariadb
+		!dev-db/mariadb-galera
+		!dev-db/percona-server
+	)"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+src_prepare() {
+	epatch "${FILESDIR}/fix-libdir.patch"
+	epatch "${FILESDIR}/fix-mariadb_config.patch"
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+	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)
+	)
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	strip_static_libraries() {
+		rm "${ED}/usr/$(get_libdir)/libmariadbclient.a"
+		use mysqlcompat && rm "${ED}/usr/$(get_libdir)/libmysqlclient.a"
+	}
+
+	cmake-multilib_src_install
+	if ! use static-libs ; then
+		multilib_foreach_abi strip_static_libraries
+	fi
+	dodoc README
+}