diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-db/mysql-connector-c++ | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-db/mysql-connector-c++')
12 files changed, 660 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..e17d5fc148dd --- /dev/null +++ b/dev-db/mysql-connector-c++/Manifest @@ -0,0 +1,4 @@ +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 +DIST mysql-connector-c++-1.1.6.tar.gz 522236 SHA256 ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447 SHA512 e940b6ee090f792bad8acbbfa3dacd46310ac40c7993c4097eeebb6be4b792d3f1856574e603a71e2795773db97169f47c9ed76a127654472370c726bcb291c7 WHIRLPOOL b3027423cf2e250f1fd7340b58ff5ff55ce771c91cc435e37cddd156f681621206438b6329a49df760dce660ef983b3cf3e5060af527668de64ed06e69830d12 diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch new file mode 100644 index 000000000000..e6345c046b63 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-disable-tests.patch @@ -0,0 +1,14 @@ +diff -urNad mysql-connector-c++-1.0.6~r754~/CMakeLists.txt mysql-connector-c++-1.0.6~r754/CMakeLists.txt +--- mysql-connector-c++-1.0.6~r754~/CMakeLists.txt 2009-08-20 22:25:35.000000000 +0200 ++++ mysql-connector-c++-1.0.6~r754/CMakeLists.txt 2009-08-20 22:25:57.000000000 +0200 +@@ -241,10 +241,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.0-fix-cmake.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch new file mode 100644 index 000000000000..d32fa07f1e0b --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.0-fix-cmake.patch @@ -0,0 +1,85 @@ +diff -urN mysql-connector-c++-1.1.0.old/CMakeLists.txt mysql-connector-c++-1.1.0/CMakeLists.txt +--- mysql-connector-c++-1.1.0.old/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ mysql-connector-c++-1.1.0/CMakeLists.txt 2011-07-30 13:16:18.000000000 +0200 +@@ -232,7 +232,7 @@ + "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_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") + +diff -urN mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt mysql-connector-c++-1.1.0/cppconn/CMakeLists.txt +--- mysql-connector-c++-1.1.0.old/cppconn/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ mysql-connector-c++-1.1.0/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 +--- mysql-connector-c++-1.1.0.old/driver/CMakeLists.txt 2011-07-30 13:15:44.000000000 +0200 ++++ mysql-connector-c++-1.1.0/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.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-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++/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++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml new file mode 100644 index 000000000000..306a658a7fa8 --- /dev/null +++ b/dev-db/mysql-connector-c++/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>mysql</herd> +<herd>proxy-maintainers</herd> +<use> +<flag name='gcov'>Build coverage support</flag> +</use> + <maintainer> + <email>h.mth@web.de</email> + <description>Proxied developer. Please CC on bugs.</description> + <name>Hanno Meyer-Thurow</name> + </maintainer> +</pkgmetadata> diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild new file mode 100644 index 000000000000..dac36731dd28 --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +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.1 + dev-libs/boost + dev-libs/openssl" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-1.1.0-fix-cmake.patch" + "${FILESDIR}/${PN}-1.1.0-disable-tests.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) + ) + + 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 + + # docs are installed poorly + rm -rf "${ED}"/usr/{ANNOUNCEMENT,COPYING,README} + dodoc ANNOUNCEMENT README + + # 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.3.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild new file mode 100644 index 000000000000..ab50a1ac6860 --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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.1 + dev-libs/boost + 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.5.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.5.ebuild new file mode 100644 index 000000000000..98c1aeb42d2f --- /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 +# $Id$ + +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 +} 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..b32600fc7d88 --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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.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 +} |