gentoo resync : 16.06.2019

4 files changed, 228 insertions, 0 deletions

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 56040f63084b..7fc4774c9a4a 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,12 +1,16 @@
 AUX 5.3-cmake-doc-path.patch 1480 BLAKE2B 5f89253a86fa97fbf4103fbe797f60449245195e9c8d0f6d7f065e654a402de0461459dd11d9d878f0794089261ee5ee9fac3240bf90f7c8382edb54d84b27a6 SHA512 aa2303161af2b53608acc127464951cf77492a1a90e869a58893ba10a014077d7f8f319325b77713fffceeaa002943f4ce52b6cb9571b0b3d3d7ab562601968d
 AUX 5.3.10-cxxlinkage.patch 1027 BLAKE2B b3df78658e4fb3243debb6f95cea6c5530db309ffc50f3a6afaff8bce143d147b4645a4bef4a54f6d04203ea132d4245812f5a2473ad7e9899f6e6b3c0799213 SHA512 f4d6df55313ccba995c8bd2e182397ce2652c2fbc0f0706474386654fb890fc47cad3a18f306206e840a47b729569e9a0ccb1cc2401c5280792afc4f544b41fd
 AUX 5.3.10-mariadb.patch 1744 BLAKE2B a9e33c86f999394d77757f69f1f314238123fa4158297961b4ce0f501e6fb743927e892c1f6640945842e843da56a826e5da1a968d84f7e5dcf3b2b4a590c0e8 SHA512 ebf62a2e0cc901fce81d0ad358f62d1c41494a5e35fb5a4df6913d1f4d5b8bbb638a23cabfe483818efa39688744b7be8b98d922b4bdff830de701c665da0fa0
+AUX 8.0-cmake-doc-path.patch 1384 BLAKE2B 96f2bb290e48363c9cfababb845732291f709a4f996f13ea39cb2dd5fc0a19a68dd87cbf3454fd48c5f2281ebb0f786f2415b6e45f5714c967e5ba5b5005bd5d SHA512 d2a007d9c6846ad22a1f43c621f0376085802f3b15ca846fa1dd5bc8c3fb6ec1dc913240cb1135ab16f9dd369c8680aba5f600c7d28660dd28bb06873d97cce3
+AUX 8.0.16-cxxlinkage.patch 1890 BLAKE2B 0b19115acada4abea75466891cced6979011736de9a64686b8ef5ec1f9bfad8c6297ac48f26d3297f24b6817cfaced033a3d42120bfb948cc1e9e7204665abc4 SHA512 460aad29170b8694cc6776553fef8ac15ca715f7dceea392f4a0c75fef98ac6e7a40cdd57c86ae4bcd216b942fa0a2ea92862defc54f8466ea32c74f6a6832e5
 AUX cmake-doc-path.patch 1498 BLAKE2B b79110c92b7fc80c64fdf05b469c4bb333d68610ff4fadc78bd307689651e41bcd66f33fd782db1b69c863ef81faee3d5eb485d5c9bd284db8be3948d2bec7e7 SHA512 2e48af11efb55a1508402d5d1d717a3dfc9897bf0ccce5aa190792fb673ac78b27a9480e951a6347a2c8d0e2fe08a28c11fd08c55dbea835a93f525decaaf09e
 AUX odbc.ini.m4 406 BLAKE2B 3a20c28b1971753a14a4aa4d30efcc7de833488501a41d9404987567623d48250ce1daea1d3138adaef36741c4f2e0eafc60eba554e5262b45084f93f5205160 SHA512 84ab2a3aab594123d42b65205a7faf8e91fe9416a9e3c4c4c354533b9a298395f59172649c91dc0b671392bfbe5baeaddb6aa47119ce4c825917f3977d9dd521
 AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4a21a2bf0bd5f1bd1e5c3d1c9a28522e3aa07c1261abac92301819d4112ac6a000a729aca9f7f7ad6 SHA512 6d929bbffd602a9f060a05998149a6b16334f8a5e3db30d02ff5d38c0065085d085042521e700b87a63766e32aa27ae92be72cef33c2a7aa8f6767b6b71c82c8
 DIST mysql-connector-odbc-5.3.10-src.tar.gz 2646571 BLAKE2B e85e179ee8a54c8c98dd254e949c08227adc72141d52bc15935eafd60edaf95f47c12ca51fa9472ae29c761d5de2149277c58e6d3f02a566668be17f595ca7ba SHA512 ebe56b95a1690332959a7a37e8ed381b46730fb9f6fbd6522ddc1a6961e4c8cdac59681a957b33abeb6cae12f210278e4063daa59ce952d92acf427bc188e22b
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B e41dd65d940c0c91c67e6ec4c46ea2c3327e96d372c493635d05833862f2aa73919410a9e9a9c090a6fa65fd29e022a9b088c07a5e11089aee04b3b86005ad1e SHA512 02fcf6ac88f6052206aa55b6fc2b37f499da26e596e8e64b1c20e87dc4a24f745416da56c6e1268feff60321f54cb45864b8d34e055ea2f99da37b6efeedc844
 DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
+DIST mysql-connector-odbc-8.0.16-src.tar.gz 3986610 BLAKE2B c91760f8e0352a57adb5400700d22f52f70d5210d85ff0932f5288f19c917c771ce9ea9abad097d27a9723c585d1029d56c09f6865f634f9c41ad852690e016d SHA512 b7ddcdf635441bc3ed0325a8562f453e42d3c9768b0fe0b42d9b5417e268f4631e3fca3c2adc417c124ede37254c7b1890c792593d846ecaf5b158ce4b4808cd
 EBUILD myodbc-5.3.10-r2.ebuild 3588 BLAKE2B db9749af6dd80c60ae359485e3526258e43ea7003b2302076b0ef39a72098663b27f9413d050809328fe4348f5c129135f163da8d895f65d8c9f76bd53415eb4 SHA512 33d3aced0bc4575baa860dc53f1a6b35b6a5dc2e1815d88922d66c5270e570deaa0dc20018d9329c4651cef00f48b902b208671dd0836e7224d11972491b9e66
 EBUILD myodbc-5.3.9.ebuild 3072 BLAKE2B 4922ed231672f11742590007b7b1f5c5dfa27263a6c98893b373793da06088f29c5401917179d479f4c57b24b2a1be9c3507caa752db79f3268fceff4719013d SHA512 4da8b034a745c453a310391a38e5cb1697bfa51838edc6903ee643e7dbe28fa5fb8f7d34264f88bb79b2aba83fa042212c0a2dd251c15150f7f0a2fcf561e052
+EBUILD myodbc-8.0.16.ebuild 3101 BLAKE2B 28664fd845b3bfb251e2f754c06b1b21ac1fb0ce85fbcaf620ff4ebea4ee181fe3c2f7c00ff8b47a084dc2e31a893c35f2d28e6176a4a40d508a6b0ebdfd57cd SHA512 856408b130fad4e4fc70fd48d841a2969aa85df46eeebb1d1476e5054b5d78af8e799463a7314f6db4131e4868146d6838c528b85f5bec1c569230231516a2cc
 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/myodbc/files/8.0-cmake-doc-path.patch b/dev-db/myodbc/files/8.0-cmake-doc-path.patch
new file mode 100644
index 000000000000..405c39e0bcd4
--- /dev/null
+++ b/dev-db/myodbc/files/8.0-cmake-doc-path.patch
@@ -0,0 +1,42 @@
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2019-06-11 11:21:59.723705824 -0400
++++ b/CMakeLists.txt	2019-06-11 11:26:11.109625713 -0400
+@@ -71,6 +71,12 @@
+ 
+ INCLUDE(version.cmake)
+ 
++IF(WITH_DOCUMENTATION_INSTALL_PATH)
++       set(DOCUMENTATION_INSTALL_PATH ${WITH_DOCUMENTATION_INSTALL_PATH})
++ELSE(WITH_DOCUMENTATION_INSTALL_PATH)
++       set(DOCUMENTATION_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/share/doc/myodbc-${CONNECTOR_MAJOR}.${CONNECTOR_MINOR})
++ENDIF(WITH_DOCUMENTATION_INSTALL_PATH)
++
+ IF(NOT WIN32)
+ 	INCLUDE(CheckFunctionExists)
+ 	CHECK_FUNCTION_EXISTS(dlopen DLOPEN_IN_LIBC)
+@@ -520,13 +526,10 @@
+ #------------ Installation ---------------------------
+-INCLUDE(cmake/info_bin.cmake)
+ 
+-INSTALL(FILES LICENSE.txt   DESTINATION .)
+-
+ if(EXISTS "${CMAKE_SOURCE_DIR}/README.txt")
+-  INSTALL(FILES README.txt    DESTINATION .)
++  INSTALL(FILES README.txt    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ else()
+-  INSTALL(FILES README.md    DESTINATION .)
+-  INSTALL(FILES CONTRIBUTING.md    DESTINATION .)
++  INSTALL(FILES README.md    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
++  INSTALL(FILES CONTRIBUTING.md    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ endif()
+ 
+ IF(WIN32)
+@@ -567,7 +571,7 @@
+ 
+ ELSE(WIN32)
+ 
+-  INSTALL(FILES ChangeLog    DESTINATION .)
++  INSTALL(FILES ChangeLog    DESTINATION ${DOCUMENTATION_INSTALL_PATH})
+ 
+ ENDIF(WIN32)
+ 
diff --git a/dev-db/myodbc/files/8.0.16-cxxlinkage.patch b/dev-db/myodbc/files/8.0.16-cxxlinkage.patch
new file mode 100644
index 000000000000..326036c0b88d
--- /dev/null
+++ b/dev-db/myodbc/files/8.0.16-cxxlinkage.patch
@@ -0,0 +1,63 @@
+diff -aurN a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
+--- a/cmake/FindMySQL.cmake	2016-11-29 07:40:13.000000000 -0500
++++ b/cmake/FindMySQL.cmake	2017-02-17 13:59:18.115389096 -0500
+@@ -747,7 +747,7 @@
+     endif()
+ 
+     if(NOT MYSQL_CXXFLAGS)
+-      if(MYSQL_CXX_LINKAGE OR MYSQL_VERSION_ID GREATER 50603)
++      if(MYSQL_CXX_LINKAGE)
+         _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+         set(MYSQL_CXX_LINKAGE 1)
+       else()
+diff -aurN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2018-02-10 21:41:13.161553751 -0500
++++ b/CMakeLists.txt	2018-02-10 21:45:20.038398824 -0500
+@@ -379,10 +379,9 @@
+ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
+ SET(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib")
+ 
+-SET(LIB_SUBDIR "lib")
+-IF(RPM_BUILD AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86_64|ppc64|ppc64p7|s390x|sparc64|aarch64)")
+-  SET(LIB_SUBDIR "lib64")
+-ENDIF()
++IF(NOT LIB_SUBDIR)
++	MESSAGE(ERROR "LIB_SUBDIR is not set")
++ENDIF(NOT LIB_SUBDIR)
+ 
+ MESSAGE(STATUS "Installation library subdir: ${LIB_SUBDIR}")
+ 
+diff -aurN a/driver/CMakeLists.txt b/driver/CMakeLists.txt
+--- a/driver/CMakeLists.txt	2019-06-11 13:46:37.863345781 -0400
++++ b/driver/CMakeLists.txt	2019-06-11 14:04:25.758997218 -0400
+@@ -194,29 +194,3 @@
+ 
+ ENDWHILE(${DRIVER_INDEX} LESS ${DRIVERS_COUNT})
+ 
+-IF(MYSQL8)
+-  SET(ssl_libs_to_find
+-    libcrypto.*
+-    libssl.*
+-    libeay32.*
+-    ssleay32.*
+-  )
+-
+-  SET(_SSL_PATH)
+-
+-  IF(WIN32)
+-    SET(_SSL_PATH ${MYSQL_DIR}/bin/)
+-  ELSE(WIN32)
+-    SET(_SSL_PATH ${MYSQL_DIR}/lib/)
+-  ENDIF(WIN32)
+-
+-  FOREACH(_lib_to_find IN LISTS ssl_libs_to_find)
+-    INSTALL(DIRECTORY ${_SSL_PATH} DESTINATION ${LIB_SUBDIR}
+-          FILES_MATCHING
+-          PATTERN "mecab" EXCLUDE
+-          PATTERN "pkgconfig" EXCLUDE
+-          PATTERN "plugin" EXCLUDE
+-          PATTERN ${_lib_to_find})
+-  ENDFOREACH()
+-
+-ENDIF(MYSQL8)
+\ No newline at end of file
diff --git a/dev-db/myodbc/myodbc-8.0.16.ebuild b/dev-db/myodbc/myodbc-8.0.16.ebuild
new file mode 100644
index 000000000000..a5db40b27ad7
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.16.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+MAJOR="$(ver_cut 1-2)"
+MY_PN="mysql-connector-odbc"
+MY_P="${MY_PN}-${PV/_p/r}-src"
+
+DESCRIPTION="ODBC driver for MySQL"
+HOMEPAGE="http://www.mysql.com/products/myodbc/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+# Broken when built dynamically against libmysqlclient.so
+RDEPEND="
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	>=dev-db/mysql-connector-c-8.0:0=[static-libs,${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${MY_P}
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+# Patch document path so it doesn't install files to /usr
+PATCHES=(
+	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+	"${FILESDIR}/8.0.16-cxxlinkage.patch"
+)
+
+src_prepare() {
+	# Remove Tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt"
+
+	cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+	mycmakeargs+=(
+		-DMYSQLCLIENT_STATIC_LINKING=1
+		-DMYSQL_CXX_LINKAGE=1
+		-DWITH_UNIXODBC=1
+		-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
+		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+		-DMYSQLCLIENT_NO_THREADS=ON
+		-DDISABLE_GUI=ON
+		# The NUMA and LIBWRAP options are not really used.
+		# They are just copied from the server code
+		-DWITH_NUMA=OFF
+		-DWITH_LIBWRAP=OFF
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	dodir /usr/share/${PN}-${SLOT}
+	for i in odbc.ini odbcinst.ini; do
+		einfo "Building $i"
+			sed \
+			-e "s,__PN__,${DRIVER_NAME},g" \
+			-e "s,__PF__,${MAJOR},g" \
+			-e "s,lib/libmyodbc3.so,$(get_libdir)/${PN}-${MAJOR}/libmyodbc${SLOT:0:1}a.so,g" \
+			>"${D}"/usr/share/${PN}-${SLOT}/${i} \
+			<"${FILESDIR}"/${i}.m4 \
+			|| die "Failed to build $i"
+	done;
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
+}
+
+pkg_config() {
+
+	[ "${ROOT}" != "/" ] && \
+		die 'Sorry, non-standard ROOT setting is not supported :-('
+
+	local msg='MySQL ODBC driver'
+	local drivers=$(/usr/bin/odbcinst -q -d)
+
+	if echo $drivers | grep -vq "^\[${DRIVER_NAME}\]$" ; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}-${SLOT}/odbcinst.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+
+	local sources=$(/usr/bin/odbcinst -q -s)
+	msg='sample MySQL ODBC DSN'
+	if echo $sources | grep -vq "^\[${DRIVER_NAME}-test\]$"; then
+		ebegin "Installing ${msg}"
+		/usr/bin/odbcinst -i -s -l -f /usr/share/${PN}-${SLOT}/odbc.ini
+		rc=$?
+		eend $rc
+		[ $rc -ne 0 ] && die
+	else
+		einfo "Skipping already installed ${msg}"
+	fi
+}
+
+pkg_postinst() {
+
+	elog "If this is a new install, please run the following command"
+	elog "to configure the MySQL ODBC drivers and sources:"
+	elog "emerge --config =${CATEGORY}/${PF}"
+	elog "Please note that the driver name used to form the DSN now includes the SLOT."
+	elog "The myodbc-install utility is installed as myodbc-install-${MAJOR}"
+}