gentoo resync : 03.03.2019

3 files changed, 0 insertions, 170 deletions

diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 5df013516d72..f063f300733d 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,8 +1,6 @@
 AUX 8.0.11-fix-build.patch 9453 BLAKE2B 72c42d2f0aac7de63151b4b12a5de6f1597f70be3a8a42d1a137c1a57329acf1adf196377e90c838e1d4995223fb58615814d8c14d3c8d86472ad795e1b456e7 SHA512 321444184d459f7e650b3f72589db4b2537f67c2d413f9d3d5a995c937497b6310bc2b58200fc61b5c0d8e8fe2030d65035ddbab672338d9df1b6cf3ce605ea9
 AUX mysql-connector-c++-1.1.11-fix-cpp-linking.patch 440 BLAKE2B 2b78f683c8e4645df7a306783ec3e61263682688b0069fff61cb3a85575d41aa33de481314bc1d18f8a5181c5e2dbb29cfb8c89d6a36b44c11f27340b4f7921c SHA512 f941e32d4f1e52d603958bb01d17e75c8fb89738d20f5af29d4c30bbe77ba82af4b25cc27f1e2df934d1b309f6c75faf2fb0fc88fb250770a0669f867cc16e1c
 AUX mysql-connector-c++-1.1.11-fix-mariadb.patch 1939 BLAKE2B 4ca552777bfcb8671e5dc0213c411f9e1e8fbcbeb0f9f3369572c82ba03304a9df2ab98725b1fb3a365a63e4c8ed9d3d86332c54ffcb14210469b3d6078d89da SHA512 3d02972b57a0c2a544edef9ec5050c82f9214a7013e941cdc13a8f0742b7608812f33bc0c84367e70ea556562efb653297730ce5fc8d928458c5af1d71f3f60a
-AUX mysql-connector-c++-1.1.3-fix-cmake.patch 4949 BLAKE2B a3eaa6f656d7f587aca06b02847c335028a1595e61232d3c4579e10678234aec2c6e2d5e12997e9e9d268bd5dc6eef952852a91d64800cbc949d61663b25b03b SHA512 985e5dd9f9f4aaae3b34ff05e32cb0d9ddb108aa20be32e14786b5b2664263149907b46828cb01d491ef07934b73b18ee715185c59bce940370955a544325f3f
-AUX mysql-connector-c++-1.1.5-fix-mariadb.patch 1793 BLAKE2B f65ad472bbdced9920ae8f3fef868282608ec8bd361037e503f3879db223337e84f447157ec7b30f33cf6461abb327422d31fdd677914e672845c358e19ba883 SHA512 a2b23164d9632b84df233dfb0ae52c809256a9ec163deaa663eb3512ffb622a6885c21c67998e51e848772170966bb74322d4ab8d6816dda686c5d6ab9fa300a
 AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab74a84132f41beeeb202d4d286038b05cbbb202cef709e7114563bdbee12aab4e6a738a9e23bbb9455fc1ce0f906d952af4e0042f05 SHA512 c4c89b398aa88a9e7b4ed4cf42b055b79670dc70685775afd1ef2d683e5b3754575c831a6083ef0d097431e796513597e1daf7737e3ade710abad917f63ed32f
 AUX mysql-connector-c++-1.1.8-fix-mariadb.patch 1939 BLAKE2B f2d2528cacfa4457c20587557e5125f9d642ce162319ba6b077173b5407319d8d07e6b525a5fb95e797d43a3ad4e9ceb111ebd07a52cf38df1db71b9b4f2ab4c SHA512 66e4783b2ad2db463b243d2fcd7c4f89f1ddbb02f6c5711adb09b402bb448e4ee69b50f635c60201cf63048aebaea25b5db6a18f46b35b25e8d7920dbcfde9bd
 AUX mysql-connector-c++-8.0.13-fix-build.patch 10931 BLAKE2B aeeaa25d76073525a45b7b4bd5b51b6bfa151b7c20f9e563ff98673b5273ad84a3ef9c2ce26f17b175f1038ab4924187ec2e2d059f2052855d8875823ee762bd SHA512 a965e2a475e7802e8a0dd64c39b6e0f9996b9c1c49d647c26cefac33bf52afceb012c7b0acad383006152fb52d94ffb5481d4be9b2ba957776529df842370ffb
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
deleted file mode 100644
index 5f0669ca3381..000000000000
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.3-fix-cmake.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- 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
deleted file mode 100644
index fa36e3bad936..000000000000
--- a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.5-fix-mariadb.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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 "";
- }