Version bump.

Fix bugs #442662 and #445122.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

3 files changed, 191 insertions, 2 deletions

diff --git a/dev-db/mysql-connector-c++/ChangeLog b/dev-db/mysql-connector-c++/ChangeLog
index f10f4dbdf1e8..d789e54f6d0d 100644
--- a/dev-db/mysql-connector-c++/ChangeLog
+++ b/dev-db/mysql-connector-c++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mysql-connector-c++
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.16 2013/03/17 15:19:29 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-connector-c++/ChangeLog,v 1.17 2014/05/05 02:29:33 grknight Exp $
+
+*mysql-connector-c++-1.1.3 (05 May 2014)
+
+  05 May 2014;  <grknight@gentoo.org>
+  +files/mysql-connector-c++-1.1.3-fix-cmake.patch,
+  +mysql-connector-c++-1.1.3.ebuild:
+  Version bump.  Fix bugs #442662 and #445122.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
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++/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..6d980a5ec23a
--- /dev/null
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 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.3.ebuild,v 1.1 2014/05/05 02:29:33 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.1
+	dev-libs/boost
+	dev-libs/openssl"
+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
+}