Version bump

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD1F781EFF9F4A3B6

5 files changed, 244 insertions, 17 deletions

diff --git a/dev-db/mysql-connector-c++/ChangeLog b/dev-db/mysql-connector-c++/ChangeLog
index 0a04ce70956d..6f54dd1eb421 100644
--- a/dev-db/mysql-connector-c++/ChangeLog
+++ b/dev-db/mysql-connector-c++/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mysql-connector-c++
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.24 2014/10/29 09:37:29 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.25 2015/02/22 03:50:29 grknight Exp $
+
+*mysql-connector-c++-1.1.5 (22 Feb 2015)
+
+  22 Feb 2015; Brian Evans <grknight@gentoo.org>
+  +files/mysql-connector-c++-1.1.5-fix-cmake.patch,
+  +files/mysql-connector-c++-1.1.5-fix-mariadb.patch,
+  +mysql-connector-c++-1.1.5.ebuild:
+  Version bump
 
   29 Oct 2014; Agostino Sarubbo <ago@gentoo.org>
   mysql-connector-c++-1.1.3.ebuild:
diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index bb81253a27fa..41b781ba949a 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -4,26 +4,32 @@ Hash: SHA256
 AUX mysql-connector-c++-1.1.0-disable-tests.patch 602 SHA256 c2c117c621172e93c6c52bdb9c684aa3bbbb39c1a808d709511308382ae9a1a6 SHA512 e051583d286797c4307aeaab8c719b1ee3588358e669258d49e559b96be38ed6d07bb4c8e1368b7568d489c21a020f14a3e2b99fb4407223f7c9241001f5f579 WHIRLPOOL 15fe13c64fdfae5286b6f21c2a8442f71a60e7c52c693cabd1bd6ef50401c8c19df2d76ae1d2fd9d1e82e7b43d991fc9361735ab16250eb4c229a405d7c8ee38
 AUX mysql-connector-c++-1.1.0-fix-cmake.patch 3713 SHA256 272b7807f4b17293d39a6161075abc4d6c220cc5873c297254d0049d8c65d44d SHA512 12ad034d8ebaef2a1dfbce10bf9d7b20566fb466ca5be832a4513e78379cd1206a188d25d6b90b6c4a5ae11edb8d4f23a101b82d6ee450371bf352e8e515c617 WHIRLPOOL 0b1d03e6f66f6b129a0edc19b38d908cbc4befa8f47fd954e623684119aea14f0ee1e79e7dad4827e5a3cd5ff25823602d305041d13ab7200ba803ae6bbaedad
 AUX mysql-connector-c++-1.1.3-fix-cmake.patch 4949 SHA256 78c442e7d2518bf5d40d48a2a408c9540d4dbb0281c6875ee1b4f4eef6de271d SHA512 985e5dd9f9f4aaae3b34ff05e32cb0d9ddb108aa20be32e14786b5b2664263149907b46828cb01d491ef07934b73b18ee715185c59bce940370955a544325f3f WHIRLPOOL 13955fc649b370bf630b5975ee8363ff7d0b21b8251e140a927ddc82d7920258df4ff7e46d641cbede0d4b00fe1cea8a5310a7ca752a09a88e877a7299059362
+AUX mysql-connector-c++-1.1.5-fix-cmake.patch 4442 SHA256 d1ad90a57705d298d38c4c32b4259fab1640796d7ab6d0beb9926351732fe7b6 SHA512 ab3ac7e385a340b474627924c17177f5ddead865b39ec3602d9c7bdad5039bc2f4ff4d8135218b6dae38e88904a5db7e56a4e34e8bab588ea5ecd00e63c331f0 WHIRLPOOL a2729ecd5e50f713fa179784317dd51faaa1376122383593c244bf2ad29d909cab2792037a68e3bcbdb2c54b7f78da963f2cc2e45a81ff884a3eeba44f817f69
+AUX mysql-connector-c++-1.1.5-fix-mariadb.patch 1793 SHA256 7576b78e3688f14d34a1b50a3b223ba063910657af06fc74e0d32a02a1c4195a SHA512 a2b23164d9632b84df233dfb0ae52c809256a9ec163deaa663eb3512ffb622a6885c21c67998e51e848772170966bb74322d4ab8d6816dda686c5d6ab9fa300a WHIRLPOOL 109399d6a73295add33e2e4f0d67b61d18397f549aeb38270155f87f26d2b80743c0ca94c6df71c3708ff62aa12187170dfb03b091c6cb19876a659b51dc02eb
 DIST mysql-connector-c++-1.1.1.tar.gz 492659 SHA256 31c3e4f637153bd270812dffc6a50708dfc686a8afa7ea1c88a9dfda0d8af52e SHA512 d6b34fd4aeaf1032870d6de4f57ae92230790a3661c24af4ffed30f715f9a1941d0d063abbc0d703c15697c054731af6e39240d6dd70459371f25435595ec903 WHIRLPOOL f9fddb59df913a728769824aa7cc39b9ba55b1d3de56048148bf5ca37a366772f34a85bae58f0d5efead4010b0aac7ab5b897bd4a0db113e99fdf4898a31d26c
 DIST mysql-connector-c++-1.1.3.tar.gz 496226 SHA256 4b1516f183f29c011c1677d5a9b174d0f5c3b761d2e8056e79690c55c01ea690 SHA512 c03a4ae25e9d189a5114ab630bef6edaefd1aee809dbb1ec26b765f5e84b93fbe17e5f7357a4fe2a95c179cd2028b676151df4baf4e3da7515543ecc0834afd7 WHIRLPOOL 5f04231cec63de16c2a076143b2e0409544ebdf600d7423f63c8c2db45f1b63048e1da108a9f374dda6b6ff0d4c13b509190390e797f4674e14284acbaa9e2e5
+DIST mysql-connector-c++-1.1.5.tar.gz 519440 SHA256 f3696726da29d56e0daad7046b30aa51444360a3ff112c079eb942929eb1cce8 SHA512 6e6e6ed7f7496d5d51f6709a7fb47b8031d5639b0729a439056466ae24e4e24d419fad19c54571e0485f3717d7a07ccd840795724a8b79deb8e93c59d447595b WHIRLPOOL 8c0be70301454d130797d6dd74da5f29a77f543bf4c2353e53b6ebfa8c9f8282850ba6266d4988e7d305c5be14d64b41133ad05ded2f70662235f254f76d75ea
 EBUILD mysql-connector-c++-1.1.1.ebuild 1644 SHA256 b7f47474fcd487d99ee7729859b2745763087be00554f1f48ef530319f0d1f94 SHA512 fc6aae7f987c40410536f448aed39f2a1a2f0d82de2c050ae061c1912c0d150e49fafad3fade04442bfa2ca36e3d0a876aedabac28b5b481aa190a8ec4189be0 WHIRLPOOL a6c8e82b2642c98944990cecb10575c79d3c703cf06c1996b7bd27b102a23960c4428f0fc09aef2eb5d06ad072c94198880b8dc24f7fe2dc938134aee30a0fa4
 EBUILD mysql-connector-c++-1.1.3.ebuild 1523 SHA256 0ef5b31474aa8590169ac8acbc65967930a8287977db4ff275b0b4aba4b6b192 SHA512 40d43ea2b2482edab46533fa12a770cfe20dfa34519e297bf1cd4179dacb3c7707aacd97c580f9164038d804ac0fb121b76b6b5eee10fc64ca9f8188c7e75dad WHIRLPOOL cdeeccd5861313771fe4d7df8c4097a4b81ef6de2e260b7e9be85468b54afd1c96eac1b9bbc5f0a928be50092c154dc194352443c0fa296d3dbcce85b8468b62
-MISC ChangeLog 3983 SHA256 f732b768fe91c96914cabd2e491310dffcf6f20bc4d18d8c95fcd5ac463f9258 SHA512 658c784e12e4ebd46dd19f388d4ffb8e01410a970ceb6dffcd91e5b55a3c79af06c6431f0299e7f130506c517fd0a5a22eb615160db10add0311495971b85e90 WHIRLPOOL d0b394e1cd2e26958b4020d720f8d4d7bc6fe8f444f3be1d17816b5751b9590d13946c93c6c7fb4bcf49967a9d99c3aed9b1836ba9942edd214ae635e88364b6
+EBUILD mysql-connector-c++-1.1.5.ebuild 1671 SHA256 50806617a082a8d6add142c35a910c90bbfdabc1218a780645468cb425f36436 SHA512 2708103706509eb214a1d0eda087fb314b8f6912f97336317baa22ae8621f914a499a83d9db33c17b0d56de11065fa7ab432a641c7821b34bdf7f2188ef8a5ae WHIRLPOOL 810eec0b8aac12f117cd5c2c148335ae72e42c94738fb70d2f80234d2c7c6c1912fa9e88476a5cdccb59b0e96922fb431b68d783eda498265c95ac086088c531
+MISC ChangeLog 4238 SHA256 fb953e8b59510b3be62b0e5903a8bad13b161039247d898f2260f5abe1e208d5 SHA512 dbd725e74975beec0693e006d6eff24d4f2604f8152b1d49b38061864fa6d2192add36562f893f1e7f586c2c5640be0289c894943d892660d59aa4122cdc6ce9 WHIRLPOOL af03bd6cd1f93df42fffdf4ee471ca12993e7fd8f5933e657e0ca079ab834c62b470a7d1fc4c74ed389fa353774c822b6049926261d094869b0e6e2e9eaac901
 MISC metadata.xml 410 SHA256 cb306fe38a285ffd35a2a881d94e3b0239bca4f37568a90f49feaca22aadc2f7 SHA512 a72764ca5c5e6139c52f99d16a7981783637cae6dff56d388927f0c54b0db082b97795bd92260b62cb3fa19725d4f36f96ef4d06960bad0d69f5f4b8b26ee20e WHIRLPOOL 1a03219f984950fa3de37a9a1abbae8bb2061fdfbb4b3a9ed0a51ac514cc402427ad7ca251e494cdc82ada9aca425db1ce2a48ef4432a2ed12b5714c695283e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUULVaAAoJELp701BxlEWfxwcP/R6+NzlOGpTasEPaxPgvtpf8
-eiAY3REqgAC4WaAOZK1l+TSeJwOtFU40YDX92FyaEuNCgpnWW+SRnIEfaa9CXbkh
-eTNGVonm6ZKddvFQM1zIqyo/+zukn6xqOYMD1o3ymc9TH5OF9xykrvjahZw2RFLi
-dDdML5ArO5SY9bIYh8eneSm43LxQZwXYvokPmV5aggGFNZ9InIW1yquSERmihyLE
-Q5FOvXe2V7pC+08wy0t6a198hR+obIuY3SChZsRRHNxkrx3c7yg4G3RukB9zfU66
-KWdR48pVaFJdWXzvkomvkYVIxPu0uROnUI+iZLTRoXijHUlK3fb3aun61GZ4sJFz
-MtX9oGRftYKJHkr4LskifbrCIT1QxiK3sq56OORTxAPv6jYXDwNBSX2lcGj/E1Sv
-Kdgnf8Pyqt8VR6NKqAEMd3HiutzBZv3zTBMQfBIbz/RcyzLyiiE3p9JoBZLU7eA4
-xy8bJk53O+iqRlfu4kFf35DkaQca37JQEw+9rqDVqO2Pzee6FP9+HAtZPtJXm+MP
-Dwm7hcwXEf6MfX+EEBjgf3Wba5dm4SsKYgj8KurQp6j5sdGfYjLTMnCGRRNZqCPM
-LQN/RDYS113eSkvhoDvDLXg6k+a/fAbLclqVhlP5Vb7UN0r5VBlIzubjJUIKGIPE
-eVrIOyGa2u52anLcvTAe
-=OnbY
+iQJ8BAEBCABmBQJU6VIJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2fBAP/3ypLbxfL7tHqdURgNXFd8X3
+0KUE4Y1o/jOLI+akvtiLE03vtCx584j2g+R7Cgh0lF4D92BcoPsc1hJWgU9wJi2Y
+s5WvOoVUYSKmA3mjyR0Dqdrlt08EsOutGln2YqGASV8axEw1TtCN8f0rKr4MSGWs
+hzj4DXN9hX7rPoYvMUOzaOZWyk+1tt+XjA3KLoRV0qhbCyJAR4cAkI2yDod9pqA/
+2QK7nqWoKB+N51x6TclK9gVo4b96ArWW/w5G5Gw4e0N+jgWrzDfbpz8jiA08/JHo
+ZUC9hxC8M/vwsOHUK7wdhE98vDNuvBOPnHxhxCkOUKrvuYNeWxqWFGXA7IhgUcWx
+1KU9NP6bgZWCX2UAHmVb0bje+aSrMc/mjtkaXIC33TzZYQP0IVgF6omGxemGoL7m
+96r1JHzOdCBX7f6w/UJMkgxrxJD3YvaxtxqlTECf4JBfEJ5bSzNrO04IS4rzcIVY
+bA929CLjPTcZ4MTbdFhDjfLs69ArZQ8aJ2hNzqAUkC5wv/GOmNElj4YQTv8jhZam
+0xSiy4eyGy37I4zD7pZNvzx5zOPS21y7cmBJCxR81Vb5dTbjHXY3dYSJldH9plcB
+Ze8L0ltsi50fUeb/GhICwTa78OxWYKu2vextUzD+jxRvhJNg2bKY32CzuSfI2BE0
+j5GJagi1Y579DbFVzY90
+=cKUM
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch
new file mode 100644
index 000000000000..33479092561f
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-cmake.patch
@@ -0,0 +1,106 @@
+--- a/CMakeLists.txt	2014-05-04 21:27:59.000000000 -0400
++++ b/CMakeLists.txt	2014-05-04 21:47:31.460572470 -0400
+@@ -269,14 +269,14 @@
+ 	${CPACK_RESOURCE_FILE_LICENSE}
+ 	"${CMAKE_SOURCE_DIR}/Licenses_for_Third-Party_Components.txt"
+ 	"${CMAKE_SOURCE_DIR}/ANNOUNCEMENT"
+-	DESTINATION "." OPTIONAL)
++	DESTINATION "${INSTALL_DOCS}" OPTIONAL)
+ 
+ SET(COMMON_IGNORE_FILES "/CMakeFiles/" "/Testing/" "/.bzr/" "_CPack_Packages/"
+     "~" ".swp" ".log" ".gz" ".directory$" "CMakeCache.txt" "Makefile"
+ 	"install_manifest.txt")
+ SET(PRJ_COMMON_IGNORE_FILES ${COMMON_IGNORE_FILES} "ANNOUNCEMENT_102_ALPHA" "ANNOUNCEMENT_103_ALPHA" "ANNOUNCEMENT_104_BETA" "ANNOUNCEMENT_105_GA" "ANNOUNCEMENT_110_GA" "ANNOUNCEMENT_111_GA" "ANNOUNCEMENT_DRAFT" )
+ 
+-SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES}  "./cppconn/config.h$" "./driver/nativeapi/binding_config.h$" "./driver/version_info.h$")
++SET(CPACK_SOURCE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES}  "${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/nativeapi/binding_config.h$" "${CMAKE_CURRENT_SOURCE_DIR}/driver/version_info.h$")
+ SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
+ SET(CPACK_SOURCE_GENERATOR "TGZ")
+ 
+@@ -303,10 +303,6 @@
+ ADD_SUBDIRECTORY(cppconn)
+ ADD_SUBDIRECTORY(driver)
+ ADD_SUBDIRECTORY(examples)
+-ADD_SUBDIRECTORY(test)
+-ADD_SUBDIRECTORY(test/framework)
+-ADD_SUBDIRECTORY(test/CJUnitTestsPort)
+-ADD_SUBDIRECTORY(test/unit)
+ 
+ IF(DEFINED CMAKE_SYSTEM_NAME AND ${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
+ 	# see also README
+diff -urN a/cppconn/CMakeLists.txt b/cppconn/CMakeLists.txt
+--- a/cppconn/CMakeLists.txt	2011-07-30 13:15:44.000000000 +0200
++++ b/cppconn/CMakeLists.txt	2011-07-30 14:10:34.000000000 +0200
+@@ -55,7 +55,7 @@
+ 
+ SET(MYSQLCPPCONN_INSTALL_HEADERS
+ 		build_config.h
+-		config.h
++		${CMAKE_CURRENT_BINARY_DIR}/config.h
+ 		connection.h
+ 		datatype.h
+ 		driver.h
+diff -urN mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt mysql-connector-c++-1.1.0/driver/CMakeLists.txt
+--- a/driver/CMakeLists.txt	2011-07-30 13:15:44.000000000 +0200
++++ b/driver/CMakeLists.txt	2011-07-30 13:20:36.000000000 +0200
+@@ -26,6 +26,9 @@
+ 
+ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR})
+ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_SOURCE_DIR}/cppconn)
++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR})
++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/cppconn)
++INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BINARY_DIR}/driver/nativeapi)
+ INCLUDE_DIRECTORIES(${MYSQLCPPCONN_BOOST_INCLUDE_DIRS})
+ MESSAGE(STATUS "BOOST_INCLUDE_DIRS=${MYSQLCPPCONN_BOOST_INCLUDE_DIRS}")
+ 
+@@ -149,21 +152,23 @@
+ 		nativeapi/native_statement_wrapper.h
+ 		nativeapi/mysql_native_resultset_wrapper.h
+ 		nativeapi/native_resultset_wrapper.h
+-		../cppconn/warning.h
+-		../cppconn/statement.h
+-		../cppconn/sqlstring.h
+-		../cppconn/resultset_metadata.h
+-		../cppconn/resultset.h
+-		../cppconn/prepared_statement.h
+-		../cppconn/parameter_metadata.h
+-		../cppconn/metadata.h
+-		../cppconn/exception.h
+-		../cppconn/driver.h
+-		../cppconn/datatype.h
+-		../cppconn/variant.h
+-		../cppconn/connection.h
+-		../cppconn/config.h
+-		../cppconn/build_config.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/warning.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/statement.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/sqlstring.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset_metadata.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/resultset.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/prepared_statement.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/parameter_metadata.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/metadata.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/exception.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/driver.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/datatype.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/variant.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/connection.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/config.h
++		${CMAKE_CURRENT_BINARY_DIR}/cppconn/config.h
++		${CMAKE_CURRENT_SOURCE_DIR}/cppconn/build_config.h
++		${CMAKE_CURRENT_BINARY_DIR}/cppconn/build_config.h
+ 
+ 	)
+ 
+diff -aruN a/FindMySQL.cmake b/FindMySQL.cmake
+--- a/FindMySQL.cmake	2014-11-19 08:37:11.000000000 -0500
++++ b/FindMySQL.cmake	2015-02-21 21:58:20.264446822 -0500
+@@ -462,7 +462,7 @@
+     endif()
+ 
+     if(NOT MYSQL_CXXFLAGS)
+-      if(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
++      if(MYSQL_CXX_LINKAGE)
+         _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+         set(MYSQL_CXX_LINKAGE 1)
+       else()
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch
new file mode 100644
index 000000000000..fa36e3bad936
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch
@@ -0,0 +1,45 @@
+diff -aruN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp
+--- a/driver/nativeapi/libmysql_static_proxy.cpp	2014-11-19 08:37:11.000000000 -0500
++++ b/driver/nativeapi/libmysql_static_proxy.cpp	2015-02-21 22:19:50.119234140 -0500
+@@ -319,7 +319,7 @@
+ int
+ LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)
+ {
+-#if MYSQL_VERSION_ID >= 50703
++#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION )
+ 	if (::mysql_get_option(mysql, option, arg)) {
+ 		throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
+ 	} else {
+diff -aruN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
+--- a/driver/mysql_connection.cpp	2014-11-19 08:37:11.000000000 -0500
++++ b/driver/mysql_connection.cpp	2015-02-21 22:28:48.920210376 -0500
+@@ -1015,6 +1015,7 @@
+ 		MY_CHARSET_INFO cs;
+ 		proxy->get_character_set_info(&cs);
+ 		*(static_cast<int *>(optionValue)) = cs.mbmaxlen;
++#ifndef MARIADB_BASE_VERSION
+ 	/* mysql_get_option() was added in mysql 5.7.3 version */
+ 	} else if ( proxy->get_server_version() >= 50703 ) {
+ 		try {
+@@ -1029,6 +1030,7 @@
+ 			CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str());
+ 			throw e;
+ 		}
++#endif /* MARIADB_BASE_VERSION */
+ 	}
+ }
+ /* }}} */
+@@ -1046,11 +1048,13 @@
+ 		MY_CHARSET_INFO cs;
+ 		proxy->get_character_set_info(&cs);
+ 		return cs.dir ? sql::SQLString(cs.dir) : "";
++#ifndef MARIADB_BASE_VERSION
+ 	} else if ( proxy->get_server_version() >= 50703 ) {
+ 		const char* optionValue= NULL;
+ 		if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) {
+ 			return optionValue ? sql::SQLString(optionValue) : "";
+ 		}
++#endif /* MARIADB_BASE_VERSION */
+ 	}
+ 	return "";
+ }
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.5.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.5.ebuild
new file mode 100644
index 000000000000..24318b3db0fd
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.5.ebuild,v 1.1 2015/02/22 03:50:29 grknight Exp $
+
+EAPI=5
+
+inherit eutils cmake-utils flag-o-matic multilib
+
+DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)"
+HOMEPAGE="http://dev.mysql.com/downloads/connector/cpp/"
+URI_DIR="Connector-C++"
+SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples gcov static-libs"
+
+DEPEND=">=virtual/mysql-5.5:0=
+	dev-libs/boost:0=
+	dev-libs/openssl:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.5-fix-cmake.patch"
+	"${FILESDIR}/${PN}-1.1.5-fix-mariadb.patch"
+)
+
+src_configure() {
+	# native lib/wrapper needs this!
+	append-flags "-fno-strict-aliasing"
+
+	local mycmakeargs=(
+		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF
+		-DMYSQLCPPCONN_ICU_ENABLE=OFF
+		$(cmake-utils_use debug MYSQLCPPCONN_TRACE_ENABLE)
+		$(cmake-utils_use gcov MYSQLCPPCONN_GCOV_ENABLE)
+		-DINSTALL_DOCS="/usr/share/doc/${PF}"
+		-DMYSQL_CXX_LINKAGE=0
+		-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# static lib has wrong name so we need to rename it
+	if use static-libs; then
+		mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \
+			"${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die
+	else
+		rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a
+	fi
+
+	# examples
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*
+	fi
+}