From: Thomas Deutschmann <whissi@gentoo.org>
Date: Thu, 22 Aug 2019 19:38:53 +0000 (+0200)
Subject: dev-db/mysql-connector-c: rev bump
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93dc56e0b40fe411ad82b3990f85bd5adf562dad;p=gentoo.git

dev-db/mysql-connector-c: rev bump

- Always install {lz4,zlib}_decompress

- Avoid file collisions

Closes: https://bugs.gentoo.org/692580
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---

diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
new file mode 100644
index 000000000000..927662705aa3
--- /dev/null
+++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.17-always-build-decompress-utilities.patch
@@ -0,0 +1,22 @@
+--- a/utilities/CMakeLists.txt
++++ b/utilities/CMakeLists.txt
+@@ -101,15 +101,11 @@ MYSQL_ADD_EXECUTABLE(perror perror.cc)
+ ADD_DEPENDENCIES(perror GenError)
+ TARGET_LINK_LIBRARIES(perror mysys)
+ 
+-IF (BUILD_BUNDLED_LZ4)
+-  MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
+-  TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
+-ENDIF()
++MYSQL_ADD_EXECUTABLE(lz4_decompress lz4_decompress.cc)
++TARGET_LINK_LIBRARIES(lz4_decompress ${LZ4_LIBRARY} mysys)
+ 
+-IF (BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
+-  MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
+-  TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
+-ENDIF()
++MYSQL_ADD_EXECUTABLE(zlib_decompress zlib_decompress.cc)
++TARGET_LINK_LIBRARIES(zlib_decompress ${ZLIB_LIBRARY} mysys)
+ 
+ IF(WITH_INNOBASE_STORAGE_ENGINE)
+ 
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild
similarity index 85%
rename from dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild
rename to dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild
index c99bb77dd8a1..3eb18955b0bf 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.17-r2.ebuild
@@ -19,6 +19,7 @@ SLOT="0/21"
 IUSE="ldap libressl static-libs"
 
 RDEPEND="
+	>=app-arch/lz4-0_p131:=
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
@@ -26,11 +27,22 @@ RDEPEND="
 	"
 DEPEND="${RDEPEND}"
 
+# Avoid file collisions, #692580
+RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
+RDEPEND+=" !=dev-db/mysql-5.7.23*"
+RDEPEND+=" !=dev-db/mysql-5.7.24*"
+RDEPEND+=" !=dev-db/mysql-5.7.25*"
+RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
+RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
+
 DOCS=( README )
 
 S="${WORKDIR}/mysql-${PV}"
 
-PATCHES=( "${FILESDIR}"/${PN}-8.0.17-libressl.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.0.17-always-build-decompress-utilities.patch
+	"${FILESDIR}"/${PN}-8.0.17-libressl.patch
+)
 
 src_prepare() {
 	sed -i -e 's/CLIENT_LIBS/CONFIG_CLIENT_LIBS/' "${S}/scripts/CMakeLists.txt" || die
@@ -42,7 +54,6 @@ src_prepare() {
 		-e '/MYSQL_CHECK_RAPIDJSON/d' \
 		-e '/MYSQL_CHECK_ICU/d' \
 		-e '/MYSQL_CHECK_RE2/d' \
-		-e '/MYSQL_CHECK_LZ4/d' \
 		-e '/MYSQL_CHECK_EDITLINE/d' \
 		-e '/MYSQL_CHECK_CURL/d' \
 		-e '/ADD_SUBDIRECTORY(man)/d' \