reinit the tree, so we can have metadata

10 files changed, 509 insertions, 0 deletions

diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
new file mode 100644
index 000000000000..feb859b6a903
--- /dev/null
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -0,0 +1,15 @@
+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-mariadb.patch 1793 SHA256 7576b78e3688f14d34a1b50a3b223ba063910657af06fc74e0d32a02a1c4195a SHA512 a2b23164d9632b84df233dfb0ae52c809256a9ec163deaa663eb3512ffb622a6885c21c67998e51e848772170966bb74322d4ab8d6816dda686c5d6ab9fa300a WHIRLPOOL 109399d6a73295add33e2e4f0d67b61d18397f549aeb38270155f87f26d2b80743c0ca94c6df71c3708ff62aa12187170dfb03b091c6cb19876a659b51dc02eb
+AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 SHA256 8d27b8c70afecb439b3809adff71a8386d2acf00a695be6d958434425b4284b7 SHA512 c4c89b398aa88a9e7b4ed4cf42b055b79670dc70685775afd1ef2d683e5b3754575c831a6083ef0d097431e796513597e1daf7737e3ade710abad917f63ed32f WHIRLPOOL a97f4afe9c6c5fac2a14732704837e19ad7288e5278b022b5a0ae9f28303cdd5f10e8c414c967b0447d9ac37a29d0ea3b858e989b73ca2f9866bfe2e557861f3
+AUX mysql-connector-c++-1.1.8-fix-mariadb.patch 1939 SHA256 f3fbb5d5bbf46ef050993347786f89850e1f3a9e82b5974c06edeeabda34148c SHA512 66e4783b2ad2db463b243d2fcd7c4f89f1ddbb02f6c5711adb09b402bb448e4ee69b50f635c60201cf63048aebaea25b5db6a18f46b35b25e8d7920dbcfde9bd WHIRLPOOL d0db5f76a53c975ee5c8ae43b40cee1ed83d90b558af4437b23e09135916edf6a5754e8205c4d61249443693f4faf31187d85e763cfa4bea455ad3ce17f0a765
+DIST mysql-connector-c++-1.1.3.tar.gz 496226 SHA256 4b1516f183f29c011c1677d5a9b174d0f5c3b761d2e8056e79690c55c01ea690 SHA512 c03a4ae25e9d189a5114ab630bef6edaefd1aee809dbb1ec26b765f5e84b93fbe17e5f7357a4fe2a95c179cd2028b676151df4baf4e3da7515543ecc0834afd7 WHIRLPOOL 5f04231cec63de16c2a076143b2e0409544ebdf600d7423f63c8c2db45f1b63048e1da108a9f374dda6b6ff0d4c13b509190390e797f4674e14284acbaa9e2e5
+DIST mysql-connector-c++-1.1.6.tar.gz 522236 SHA256 ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447 SHA512 e940b6ee090f792bad8acbbfa3dacd46310ac40c7993c4097eeebb6be4b792d3f1856574e603a71e2795773db97169f47c9ed76a127654472370c726bcb291c7 WHIRLPOOL b3027423cf2e250f1fd7340b58ff5ff55ce771c91cc435e37cddd156f681621206438b6329a49df760dce660ef983b3cf3e5060af527668de64ed06e69830d12
+DIST mysql-connector-c++-1.1.8.tar.gz 528954 SHA256 85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963 SHA512 c3ab5c1e805598d557a449c44f77ce44cc110e5b529075e38b4f775d3726ebd16a2155f61e47a378a375a9d9362d1520334ea25376636151ddd087291aafd85d WHIRLPOOL 6cb88c3b28a8b0bf072b97c55c8b24de016e8bc5f4d66dce7597cfee2f6c2e83fc88f5d1203df60b3425af5881834635ab3f2053bea6a4c16c7eb73be1f3950c
+DIST mysql-connector-c++-1.1.9.tar.gz 508255 SHA256 3e31847a69a4e5c113b7c483731317ec4533858e3195d3a85026a0e2f509d2e4 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646 WHIRLPOOL b8dbd1f12a6efac5e337c85ff9f32b53a0185af9ae4fd281d4c2e3f68749dabf0e361f775f3bbea44699b8d686a277ea123cb22b6b11ff6222d84b5e111bb74d
+EBUILD mysql-connector-c++-1.1.3.ebuild 1411 SHA256 c6ae65a9179206b552d7786cb7b527e385ced287550c85b34bb193cc4867d6e4 SHA512 ecffb736efeadcce8c93290821f1323c7e37a8f45ad606d0e8f1a6440af75ee6b9b1863affdd0c91a56255e566d534ed9175400cc56c5071b8af2430b2b0af5e WHIRLPOOL ed5fc45ecc5d3adf93b409eea5fc5e6436df6ac7a9834910ac4ec0cf3beebba1bb56508a8e0568950cda7eefd9cf8cd18c8190636f5de5a2651965e454c5e687
+EBUILD mysql-connector-c++-1.1.6.ebuild 1541 SHA256 09ce4c5a42a6d2a802ec4adec9c99ee8d6cfd4bd4982d0bbb23deffcda3e8dd1 SHA512 b8f5eb48edb0c8baade552ef9126badaa72abba78f1b7e9cd875b4f71bbd58c2619ed2cb2c37edb47ef90699ba942b0e02e310e7ed908f90b891a1807ea05a5f WHIRLPOOL 29675c71d36a1e2d1391e0a5ed7de7d853854ff4c4a6a4689e415b97a0fd3a421df9a480bb1e89db0b1b4f8de92f851a23b20949d566cf4fa5b8f360ff316a23
+EBUILD mysql-connector-c++-1.1.8.ebuild 1569 SHA256 ed7b496e16325fd12c39e6e66395b37deb269d9e12885eabfb8d0ccb2f7d55bf SHA512 ab305ddc37dae3d8d32b894c1a100e2eab029362eb9a14806279df6426098a53764cdaa40b82f9f17b54b2f087ff29b29e479a775ff9a1a0cb4e1438032e8621 WHIRLPOOL 1921c086f4db25afe7dcf9043d4dd91ce686ecb802819cc0137e063d8a0f75e97254e235af9a9e1de2b56b6811942eb8b7b0a46c31befa6c2fd80bdf142d57e8
+EBUILD mysql-connector-c++-1.1.9.ebuild 1576 SHA256 9ce229bb3cd8b5265472d4951c7978637d6f8c88f25186b23618fa671ec5c6ef SHA512 ed01ef8f9b63c63e4ef148cb9945d75df4da111e2689a0d04b20eed62af0395868b9fb2429d6f4b692811c7358830f0ca224c16837ba18d4e0091f14d269171e WHIRLPOOL 181b7a3d03639cc620980436efe0e5499334a2fff3c9d0a089c14e106ccd23461e5a33f0bd498d01bafef6afbc0004db31bb0e61bfb4af8edd06113f7981e228
+MISC ChangeLog 5664 SHA256 85801285594a20bfacf97ca7705669cd9fa9580baf35a22a32f83d9fce2b1519 SHA512 d2ad7494c8bc6483a6aa7336581f08b9211eaeded7fda487e82a9695ab22c0fe76cf6df0f41f1c54ae1e6949748972a00932cdf79e3bbfa10dc2fdb1a45c5834 WHIRLPOOL e237f1d45431ed6a628c85c99b384587528033b49bef2426130c2b7605a23ce5e884abd2e67d4aaf65732a55532436e77c4de3149f5155b9522eaf129651119a
+MISC ChangeLog-2015 4494 SHA256 254376d667054085d8ab01dbe3c239eb3a4ec7981a1864d9e42c43788629f07e SHA512 9a49703b510adf3eb7560e450ad08224a71f34335bcb84a37b333b3723bdad9f66d97d980f818115af1f6c2c01a80cca10dd04ae7c008627a489af66ad1954d0 WHIRLPOOL 34ae8cf5ae51d7c3e3c352229789b11214bf7d8558105967c86d7da37e0c7a56c9cab0b4bb07175048157f3e108d9cfb651ecb47731e43da65d8670b16241e56
+MISC metadata.xml 419 SHA256 95b8e5045d7498670ca90c681356e0ad4b991319c6327cac46f7b404516dc86d SHA512 81bb84bb08c240b6bb8aa9d6f749eb3a2b0e433da4cc61fec7c261d68b2239f2ca374d3a273fbcc5be786fe33d42330835d1877fbbbe2ce3c3374a49e4a4f35c WHIRLPOOL 1a878d5ac0791a787acdd1af0243df076dc305eeb09cc32206289ce16bb5c1eae87308b4ba636b821b5abf746a1a1595db85f3b6c0a6cd82581ca35ebaf94ea3
diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch
new file mode 100644
index 000000000000..5f0669ca3381
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch
@@ -0,0 +1,123 @@
+--- a/CMakeLists.txt	2014-05-04 21:27:59.000000000 -0400
++++ b/CMakeLists.txt	2014-05-04 21:47:31.460572470 -0400
+@@ -38,7 +38,7 @@
+ 
+ if(COMMAND cmake_policy AND POLICY CMP0015)
+ 	cmake_policy(SET CMP0015 NEW)
+-endif(COMMAND cmake_policy)
++endif(COMMAND cmake_policy AND POLICY CMP0015)
+ 
+ #-----------------
+ # CPPFLAGS, CXXFLAGS and LDFLAGS from the environment
+@@ -258,14 +258,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/"
+     ".cmake$" "~" ".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$")
++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$")
+ SET(CPACK_PACKAGE_IGNORE_FILES ${PRJ_COMMON_IGNORE_FILES} "something_there" )
+ SET(CPACK_SOURCE_GENERATOR "TGZ")
+ 
+@@ -292,10 +292,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
+--- a/FindMySQL.cm	2014-05-04 22:20:50.000000000 -0400
++++ b/FindMySQL.cm	2014-05-04 22:21:40.325384447 -0400
+@@ -58,7 +58,7 @@
+ 	EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
+ 					OUTPUT_VARIABLE _mysql_config_output
+ 					)
+-	STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
++	STRING(REGEX MATCHALL " -m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
+ 	STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}")
+ #	ADD_DEFINITIONS("${MYSQL_CXXFLAGS}")
+ ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
+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,20 +152,22 @@
+ 		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/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/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
+ 
+ 	)
+ 
+@@ -271,8 +276,8 @@
+ 	)
+ ELSE(WIN32)
+ 	INSTALL(TARGETS mysqlcppconn mysqlcppconn-static
+-		LIBRARY DESTINATION lib
+-		ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION lib${LIB_SUFFIX}
++		ARCHIVE DESTINATION lib${LIB_SUFFIX}
+ 	)
+ ENDIF(WIN32)
+ 
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++/files/mysql-connector-c++-1.1.6-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch
new file mode 100644
index 000000000000..18d4e9a80410
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.6-fix-cmake.patch
@@ -0,0 +1,23 @@
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2015-06-04 08:58:30.000000000 -0400
++++ b/CMakeLists.txt	2015-07-21 10:41:59.081091000 -0400
+@@ -300,7 +300,7 @@
+   SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
+ ENDIF(WIN32)
+ 
+-SET(DOC_DESTINATION ".")
++SET(DOC_DESTINATION ${INSTALL_DOCS})
+ IF(RPM_LAYOUT)
+   SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
+ ENDIF()
+@@ -373,10 +373,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 --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
new file mode 100644
index 000000000000..35ed218e18dc
--- /dev/null
+++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.8-fix-mariadb.patch
@@ -0,0 +1,45 @@
+diff -aurN a/driver/mysql_connection.cpp b/driver/mysql_connection.cpp
+--- a/driver/mysql_connection.cpp	2016-12-14 04:58:54.000000000 -0500
++++ b/driver/mysql_connection.cpp	2017-01-26 16:33:58.086005627 -0500
+@@ -1023,6 +1023,7 @@
+     proxy->get_character_set_info(&cs);
+     *(static_cast<int *>(optionValue)) = cs.mbmaxlen;
+   /* mysql_get_option() was added in mysql 5.7.3 version */
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
+   } else if ( proxy->get_server_version() >= 50703 ) {
+     try {
+       if (GET_CONN_OPTION(optionName, optionValue, intOptions)) {
+@@ -1036,6 +1037,7 @@
+       CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str());
+       throw e;
+     }
++#endif
+   }
+ }
+ /* }}} */
+@@ -1053,11 +1055,13 @@
+     MY_CHARSET_INFO cs;
+     proxy->get_character_set_info(&cs);
+     return cs.dir ? sql::SQLString(cs.dir) : "";
++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID )
+   } else if ( proxy->get_server_version() >= 50703 ) {
+     const char* optionValue= NULL;
+     if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) {
+       return optionValue ? sql::SQLString(optionValue) : "";
+     }
++#endif
+   }
+   return "";
+ }
+diff -aurN a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp
+--- a/driver/nativeapi/libmysql_static_proxy.cpp	2017-01-26 16:35:46.256038741 -0500
++++ b/driver/nativeapi/libmysql_static_proxy.cpp	2017-01-26 16:28:34.114915809 -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 ) && !defined ( MARIADB_VERSION_ID )
+ 	if (::mysql_get_option(mysql, option, arg)) {
+ 		throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
+ 	} else {
diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml
new file mode 100644
index 000000000000..ded2dec8ab9d
--- /dev/null
+++ b/dev-db/mysql-connector-c++/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<use>
+<flag name="gcov">Build coverage support</flag>
+</use>
+<maintainer type="project">
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
new file mode 100644
index 000000000000..57d25d9de98d
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="https://dev.mysql.com/get/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.1:=
+	dev-libs/boost:0=
+	dev-libs/openssl:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.3-fix-cmake.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}"
+	)
+
+	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
+}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
new file mode 100644
index 000000000000..e5de51d1a0fe
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="https://dev.mysql.com/get/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/libmysqlclient:=
+	dev-libs/boost:=
+	dev-libs/openssl:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-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
+}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.8.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.8.ebuild
new file mode 100644
index 000000000000..1120d852cbed
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+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="https://dev.mysql.com/get/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/libmysqlclient:=
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	!<dev-db/mysql-connector-c-6.1.8"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
+	"${FILESDIR}/${PN}-1.1.8-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
+		-DUSE_MYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
+		-DUSE_MYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
+		-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
+}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
new file mode 100644
index 000000000000..2f1872df3f0b
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+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="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug examples gcov static-libs"
+
+DEPEND="virtual/libmysqlclient:=
+	dev-libs/boost:=
+	dev-libs/openssl:0=
+	!<dev-db/mysql-connector-c-6.1.8"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.6-fix-cmake.patch"
+	"${FILESDIR}/${PN}-1.1.8-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
+		-DUSE_MYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF)
+		-DUSE_MYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF)
+		-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
+}