gentoo resync : 15.12.2019

3 files changed, 2 insertions, 279 deletions

diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest
index 0a24ae1b2d59..d9d3bb62f097 100644
--- a/dev-db/mysql-connector-c++/Manifest
+++ b/dev-db/mysql-connector-c++/Manifest
@@ -1,4 +1,3 @@
-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.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab74a84132f41beeeb202d4d286038b05cbbb202cef709e7114563bdbee12aab4e6a738a9e23bbb9455fc1ce0f906d952af4e0042f05 SHA512 c4c89b398aa88a9e7b4ed4cf42b055b79670dc70685775afd1ef2d683e5b3754575c831a6083ef0d097431e796513597e1daf7737e3ade710abad917f63ed32f
@@ -11,7 +10,7 @@ DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1
 DIST mysql-connector-c++-8.0.15-src.tar.gz 2210243 BLAKE2B 45e0ffa2134c9df5a7e311963c7f2c58b5d7cfc0eefd80a5dc323bbe34ba60d40c79154f932e19c5f8e18ae45d0b61d304b7b7daba4955f92f830cf20c718931 SHA512 9a217b8f61babe5dac405be19b12d34b22673e779433d880a3aa31ea2e128f93434599a3fe0c1150b3f7b8c4d03f595d545d8cc33342a60561a2f60bff71ef14
 DIST mysql-connector-c++-8.0.18-src.tar.gz 3115736 BLAKE2B f28229593d20f4a401a3e9d0e636ee896a90fb7573f06d9b60340540d6c4d577b4f44daa287c7896a03a60d75dec343413cba981e63a22607ce60eb20f4de122 SHA512 f5b202677392bcf5c5bdd4c3433332e57aa20c1a140de81b57ce3ce69709661d572e2466ae022926fc220b20159c90f09f15b5e44f384529103a24fd592de60d
 EBUILD mysql-connector-c++-1.1.11-r1.ebuild 1621 BLAKE2B fdf824ec8993976294bbc03467c63da10206bd04ed066ec33a2d7ce9310e654a0cdd1440e57517bcb22c37851310da0fb2e8e8c48696a99800da3e45cdc0c47a SHA512 7c05b18bac4af342c9feab9622e63afc916bd408a8f2b88dcf59c6192b5a62fba481b3e3f5cbca6826f61d092e7c91e9ef8f20f29b7272c11454c28a836fb15c
-EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1643 BLAKE2B b7d17b47134e45350f956c8594144404e5de6abd6413daa87591072ddb90a598a51c6413fe32178153b9ec07d88d55143e504c23c6c20f58c1b003a872478fc7 SHA512 5165dfe0f68af0a360401e594cbf0f0c0df5cb9a00be0e049543e978e3378a2d84e57b7a5a6b2810ad73c93e3eb2cf2b243ce2b741c1fafc6295deb8e789ae89
+EBUILD mysql-connector-c++-1.1.12-r1.ebuild 1642 BLAKE2B 6e6fa755a9c7f51fc9ddd4310664b7f1a9dfa1e348ea033006195ae9ef7d1f6cbbfa82c13394ea3355fb15bca3d05baa5bee43a287b7c63d9fcbe5240d0a59ab SHA512 0a0d2ec5bd5231f708baa1d605c8d24118d2bf3ca8583d5f22e3b9cbdcbd55c6a2fc3f5aa53bc3e4858884d5f7ad4d70221dbe57d2dc60df68cc3c27fceb16d4
 EBUILD mysql-connector-c++-1.1.9-r1.ebuild 1570 BLAKE2B 2f5d17177fe53a0ab0a70efe13d225a6982746819191719d1378b072881037ce81b0d63beb1e0e3dd9106dc04d17ef29b6ac010831734fca2f184901568ba2b2 SHA512 ce9598a2a5f8924cb24822dec8b5349f1655148ba7aba234e324912999d7a5df054a3b3d78c7e9c33c909d046d28bceb9322dc1848370fbed00b27941d49d387
 EBUILD mysql-connector-c++-8.0.15.ebuild 909 BLAKE2B 3a0fa261424e3ce299cf1d10ff5ace8e8bedc4e91fd0eb098916ca1b2d2353562a21d4aaf3fb73c119a665ad64da113036fba6ad9a02a6199306cece67b1f835 SHA512 32c8692e66ed3805c3e01ad5b4e66b04bc0a750e1fd270fc52f70777242abd21d5f11acdff27210b9194190e2ea1bfb3d203e264986c985f0d13210618e51047
 EBUILD mysql-connector-c++-8.0.18.ebuild 1015 BLAKE2B e14bf0abe5da065ff96a350c16ce5e90bd8f2190665d0fc45d29a3c6cfe447987733a9b10bb42671cc6c9ccdef485070a3ab265880b256739958cd46a4f7b186 SHA512 3b53b586627adeb2567d275a1a7f8f1787dc9d01d996015bf273e2fed9b387666793eba0add85961fc1eae2c011d8ce11b359f400217154a2029ea67c2783de1
diff --git a/dev-db/mysql-connector-c++/files/8.0.11-fix-build.patch b/dev-db/mysql-connector-c++/files/8.0.11-fix-build.patch
deleted file mode 100644
index 7449b910a9b0..000000000000
--- a/dev-db/mysql-connector-c++/files/8.0.11-fix-build.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-diff -aurN a/buildinfo.cmake b/buildinfo.cmake
---- a/buildinfo.cmake	2018-04-08 15:10:57.000000000 -0400
-+++ b/buildinfo.cmake	2018-04-20 13:37:20.993266176 -0400
-@@ -112,4 +112,4 @@
- endif()
- 
- 
--install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION .)
-+#install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION .)
-diff -aurN a/cdk/cmake/install_macros.cmake b/cdk/cmake/install_macros.cmake
---- a/cdk/cmake/install_macros.cmake	2018-04-08 15:10:57.000000000 -0400
-+++ b/cdk/cmake/install_macros.cmake	2018-04-20 14:12:17.255877167 -0400
-@@ -327,7 +327,7 @@
-     DESTINATION ${ARG_DESTINATION}
-     ${RENAME_PARAM}
-     ${PERMISSIONS_${target_type}}
--    CONFIGURATIONS Release RelWithDebInfo
-+    CONFIGURATIONS Release RelWithDebInfo Gentoo
-     COMPONENT ${ARG_COMPONENT}
-     OPTIONAL)
- 
-@@ -346,7 +346,7 @@
-     INSTALL(FILES ${debug_pdb_target_location}
-       DESTINATION ${ARG_PDB_DESTINATION}
-       ${PDB_RENAME_PARAM}
--      CONFIGURATIONS Release RelWithDebInfo
-+      CONFIGURATIONS Release RelWithDebInfo Gentoo
-       COMPONENT ${ARG_COMPONENT}
-       OPTIONAL)
-   ENDIF()
-diff -aurN a/cdk/cmake/libutils.cmake b/cdk/cmake/libutils.cmake
---- a/cdk/cmake/libutils.cmake     2018-04-08 15:10:57.000000000 -0400
-+++ b/cdk/cmake/libutils.cmake     2018-04-20 14:27:49.021432318 -0400
-@@ -275,14 +275,7 @@
-   endforeach()
-
-   if(libs)
--
--    if(${type} STREQUAL "STATIC")
--        merge_static_libraries(${TARGET} ${libs})
--        add_dependencies(${TARGET} ${libs})
--    else()
-       target_link_libraries(${TARGET} PRIVATE ${libs})
--    endif()
--
-   endif()
-
-   #
-diff -aurN a/cdk/cmake/protobuf.cmake b/cdk/cmake/protobuf.cmake
---- a/cdk/cmake/protobuf.cmake	2018-04-08 15:10:57.000000000 -0400
-+++ b/cdk/cmake/protobuf.cmake	2018-04-20 13:43:04.950466261 -0400
-@@ -36,142 +36,8 @@
- #  ADD_LIBRARY(target ... ${SRCS})
- #
- 
--#
--# Configure Protobuf project in protobuf subfolder of build location.
--#
--
--message("Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}")
--file(REMOVE ${PROJECT_BINARY_DIR}/protobuf/CMakeCache.txt)
--file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf)
--
--# If specified, use the same build type for Protobuf
--
--if(CMAKE_BUILD_TYPE)
--  set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
--endif()
--
--execute_process(
--  COMMAND ${CMAKE_COMMAND}
--          -G "${CMAKE_GENERATOR}"
--          ${set_build_type}
--          -DSTATIC_MSVCRT=${STATIC_MSVCRT}
--          -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
--          -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
--          -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
--          ${PROJECT_SOURCE_DIR}/protobuf
--  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
--  RESULT_VARIABLE protobuf_config
--)
--
--if(protobuf_config)
--  message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}")
--endif()
--
--include(${PROJECT_BINARY_DIR}/protobuf/exports.cmake)
--
--#
--# Protobuf library targets imported above (pb_protobuf
--# and pb_protobuf-lite) are local to the directory from which
--# they were imported. This is not good if cdk is used as
--# a sub-project of a parent project, because the parent project
--# must have access to these targets.
--#
--# For that reason blow we create global protobuf/protobuf-lite targets
--# and copy their loactions from the imported targets.
--#
--
--add_library(protobuf STATIC IMPORTED GLOBAL)
--add_library(protobuf-lite STATIC IMPORTED GLOBAL)
--
--foreach(lib protobuf protobuf-lite)
--  #message("processing: ${lib}")
--
--   foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO)
--    #message("- CONF: ${CONF}")
--
--    get_target_property(LOC pb_${lib} IMPORTED_LOCATION_${CONF})
--    if(LOC)
--      #message("- settig imported location to: ${LOC}")
--      set(location "${LOC}")
--      set_target_properties(${lib} PROPERTIES
--        IMPORTED_LOCATION_${CONF} "${LOC}"
--      )
--      set_property(TARGET ${lib} APPEND PROPERTY
--        IMPORTED_CONFIGURATIONS ${CONF})
--    endif()
--
--  endforeach(CONF)
--
--  # For multi-configuration builders like MSVC, set a generic
--  # location of the form <prefix>/$(Configuration)/<name> which will
--  # work with any configuration choosen at build time.
--  # It is constructed from one of per-configurartion locations
--  # determined above and saved in ${location}. The logic assumes
--  # that the per-configration location is of the form
--  # <prefix>/<config>/<name>
--
--  if(CMAKE_CONFIGURATION_TYPES)
--
--    get_filename_component(name "${location}" NAME)
--    get_filename_component(LOC "${location}" PATH)
--    get_filename_component(LOC "${LOC}" PATH)
--    set(LOC "${LOC}/$(Configuration)/${name}")
--
--    message("- setting generic location to: ${LOC}")
--    set_target_properties(${lib} PROPERTIES
--      IMPORTED_LOCATION "${LOC}"
--    )
--
--  endif()
--
--endforeach(lib)
--
--
--# protobuf depends on protobuf-lite
--
--set_target_properties(protobuf PROPERTIES
--  INTERFACE_LINK_LIBRARIES "protobuf-lite"
--)
--
--
--message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}")
--
--set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR}
--    CACHE INTERNAL "Protobuf include path" FORCE)
--set(PROTOBUF_PROTOC_EXECUTABLE pb_protoc
--    CACHE INTERNAL "Protobuf compiler" FORCE)
--
--#
--# Custom target build_protobuf ensures that Protobuf project is built.
--#
--# Note: this depends on Protobuf project generating the stamp file
--#
--
--if(NOT DEFINED PROTOBUF_BUILD_STAMP)
--  message(FATAL_ERROR "Protobuf build stamp file not defined")
--endif()
--
--if(CMAKE_VERSION VERSION_LESS 3.0)
--  add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
--    COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIGURATION>
--    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
--    COMMENT "Building protobuf using configuration: $<CONFIGURATION>"
--  )
--else()
--  add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP}
--    COMMAND ${CMAKE_COMMAND} --build . --config $<CONFIG>
--    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf
--    COMMENT "Building protobuf using configuration: $<CONFIG>"
--  )
--endif()
--
--add_custom_target(build_protobuf
--  DEPENDS ${PROTOBUF_BUILD_STAMP}
--)
--
--add_dependencies(protobuf build_protobuf)
--add_dependencies(protobuf-lite build_protobuf)
--add_dependencies(pb_protoc build_protobuf)
-+#SET(Protobuf_USE_STATIC_LIBS ON)
-+find_package(Protobuf REQUIRED)
- 
- #
- #  Choice between full and lite version of the library.
-diff -aurN a/cdk/protocol/mysqlx/crud.cc b/cdk/protocol/mysqlx/crud.cc
---- a/cdk/protocol/mysqlx/crud.cc	2018-04-08 15:10:57.000000000 -0400
-+++ b/cdk/protocol/mysqlx/crud.cc	2018-04-20 11:22:22.398040489 -0400
-@@ -295,7 +295,7 @@
- class Placeholder_conv_imp
-     : public Args_conv
- {
--  map<string, unsigned> m_map;
-+  std::map<string, unsigned> m_map;
- 
- public:
- 
-@@ -303,7 +303,7 @@
- 
-   unsigned conv_placeholder(const string &name)
-   {
--    map<string, unsigned>::const_iterator it = m_map.find(name);
-+    std::map<string, unsigned>::const_iterator it = m_map.find(name);
-     if (it == m_map.end())
-       throw_error("Placeholder converter: Placeholder was not defined on args");
-       //throw Generic_error((boost::format("Placeholder %s was not defined on args.")
-@@ -314,7 +314,7 @@
- 
-   void add_placeholder(const string &name)
-   {
--    map<string, unsigned>::const_iterator it = m_map.find(name);
-+    std::map<string, unsigned>::const_iterator it = m_map.find(name);
-     if (it != m_map.end())
-       throw_error("Placeholder converter: Redefined placeholder");
-       //throw Generic_error((boost::format("Redifined placeholder %s.")
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2018-04-20 14:15:00.546645410 -0400
-+++ b/CMakeLists.txt	2018-04-20 13:26:16.888470928 -0400
-@@ -529,7 +529,7 @@
- 
- 
- install(TARGETS connector
--  CONFIGURATIONS Release RelWithDebInfo
-+  CONFIGURATIONS Release RelWithDebInfo Gentoo
-   ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}"
-   RUNTIME DESTINATION "${INSTALL_LIB_DIR}"
-   LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
-@@ -576,6 +576,12 @@
- SET_INTERFACE_OPTIONS(try devapi)
- #  ADD_GCOV(try)
- 
-+IF(WITH_SSL STREQUAL "system")
-+  find_package(OpenSSL REQUIRED)
-+  TARGET_LINK_LIBRARIES(try ${OPENSSL_LIBRARIES})
-+ENDIF()
-+
-+
- if(WITH_JDBC)
- 
-   add_executable(try_jdbc try_jdbc.cc)
---- a/jdbc.cmake	2018-04-08 15:10:57.000000000 -0400
-+++ b/jdbc.cmake	2018-04-20 15:03:38.683674143 -0400
-@@ -20,7 +20,7 @@
- # Configure legacy connector build environment in ${JDBC_DIR}
- #
- 
--list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON)
-+list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF)
- 
- if(CMAKE_BUILD_TYPE)
-   list(APPEND jdbc_cmake_opts -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
---- /var/tmp/portage/dev-db/mysql-connector-c++-8.0.11/work/mysql-connector-c++-8.0.11-src/jdbc/FindMySQL.cmake	2018-02-23 05:47:56.000000000 -0500
-+++ mysql-connector-c++-8.0.11-src/jdbc/FindMySQL.cmake	2018-04-20 15:13:42.204665429 -0400
-@@ -832,9 +832,11 @@
- IF(NOT WIN32)
- _mysql_conf(MYSQL_COMPILER_VERSION "")
- STRING(REGEX MATCH "Compiler:[a-zA-Z0-9\\. ]+" MYSQL_COMPILER_VERSION ${MYSQL_COMPILER_VERSION})
-+IF(MYSQL_COMPILER_VERSION)
- STRING(REGEX REPLACE "Compiler: " "" MYSQL_COMPILER_VERSION ${MYSQL_COMPILER_VERSION})
- STRING(REGEX MATCH "[a-zA-Z0-9]+" MYSQL_COMPILER_ID ${MYSQL_COMPILER_VERSION})
- STRING(REGEX REPLACE "[a-zA-Z0-9]+ " "" MYSQL_COMPILER_VERSION ${MYSQL_COMPILER_VERSION})
-+ENDIF(MYSQL_COMPILER_VERSION)
- ENDIF(NOT WIN32)
- 
- ##########################################################################
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
index 5ca30d754e7c..6a139eae88f6 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0/7"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
 IUSE="debug examples gcov libressl static-libs"
 
 DEPEND="dev-db/mysql-connector-c:=