gentoo auto-resync : 24:04:2024 - 23:59:27

3 files changed, 147 insertions, 0 deletions

diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ad49a9c7e87d..d23ca9f716a0 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,7 +1,10 @@
 AUX 8.0-cmake-doc-path.patch 1384 BLAKE2B 96f2bb290e48363c9cfababb845732291f709a4f996f13ea39cb2dd5fc0a19a68dd87cbf3454fd48c5f2281ebb0f786f2415b6e45f5714c967e5ba5b5005bd5d SHA512 d2a007d9c6846ad22a1f43c621f0376085802f3b15ca846fa1dd5bc8c3fb6ec1dc913240cb1135ab16f9dd369c8680aba5f600c7d28660dd28bb06873d97cce3
 AUX myodbc-8.0.19-cxxlinkage.patch 812 BLAKE2B 18e0f62ceb6bb33ad282972a8aae2f755c0324dbff09b450230d7eafb054a37b2f2ea47d6ab9eed42b0ce0682383c6a9e00d222dd5d7c81bb0ea4f4fe470808e SHA512 f4eb1f8c2182a1a6002548a3ef1fa37e859613b8ab31c67c34d6d7f237f435fe2cdada05e75a518d67c05175e5a6535ece55541bfde477df9820a871e83347d3
+AUX myodbc-8.0.32-include-string.patch 291 BLAKE2B a7645e918f7453f5d469976f5a52bc7dd02c3b8c0d814d0faa6eb96506220cb463a562f4ada2bcb0116906e4c233d6c53f0a722839580b3999f373e9d7539ab5 SHA512 25c228df7bfe383f26f63982f71fc13b32248b89f4bba4d82a1b20f913bd8d2cc1a237d0eb9cc22762f38a45edf83005949786436f962056b2735c461b485baf
 AUX odbc.ini.m4 406 BLAKE2B 3a20c28b1971753a14a4aa4d30efcc7de833488501a41d9404987567623d48250ce1daea1d3138adaef36741c4f2e0eafc60eba554e5262b45084f93f5205160 SHA512 84ab2a3aab594123d42b65205a7faf8e91fe9416a9e3c4c4c354533b9a298395f59172649c91dc0b671392bfbe5baeaddb6aa47119ce4c825917f3977d9dd521
 AUX odbcinst.ini.m4 118 BLAKE2B 6da835746e063f415ad7d640233cfd96e744cd56e12aaab4a21a2bf0bd5f1bd1e5c3d1c9a28522e3aa07c1261abac92301819d4112ac6a000a729aca9f7f7ad6 SHA512 6d929bbffd602a9f060a05998149a6b16334f8a5e3db30d02ff5d38c0065085d085042521e700b87a63766e32aa27ae92be72cef33c2a7aa8f6767b6b71c82c8
 DIST mysql-connector-odbc-8.0.27-src.tar.gz 3849283 BLAKE2B 6a2500cdd706c0f8cda83dd04d3e573baa0bfbad59c931e20bb25a3f09dd78d2380079d0a20e075c3f44482d58acb6e727f4cbcf490e9d4d7817dd26f98061ee SHA512 4f907b7647425c274d3bd1c3b3ebbb83ac2360f2ee56733dabb501c17b800a26ef1117e16e5b05180ff904bfc642d25393baa861b96a79edf9d35f186a8689b2
+DIST mysql-connector-odbc-8.0.32-src.tar.gz 3845574 BLAKE2B 84adca951149739b79c60ee89416d2e638c5a5880feaed69afbd9de3a671ce505bad04303ccab9f13410f83e8827d9e3ee658b9e1241e66243d3424ac525525b SHA512 8011b131657e214de3f33407893ff990e2238e79a5d0ef76a64797c6f160f0895ed819e81c04054b3b4d439fc0db85c4813c713401db28092a9f6da16f24fb34
 EBUILD myodbc-8.0.27-r1.ebuild 3390 BLAKE2B f7076a9259031d8d92b121cf3deed3be0a61122329bcca9cfff585f104cdda355f159cc4191beafeb59531342d52ec5c791102eb72bc3dfbdd33eeee0d915303 SHA512 a044e12eb06896bc00e4d4fc1f36875d725b3ff127c7648012557633af60e62d03f7a8f34ef90cca6754d461a8ae811951acfa24ce1d34ea1d35c66017a7bc57
+EBUILD myodbc-8.0.32.ebuild 3476 BLAKE2B 3b96475d402c219dc9abfc494f475da9d61526cdbe1269bdef378e88431860330c22d7211c19f42be45c0309d7b7dbd0a68a0e260ff8412bdb3b5e96e6cff557 SHA512 df3b22989a19e9a4e23e35c89af9b2935375c2d860cd8e5e807a12428e364c9ba56181d743a3953b7826bbd3138a174161ca9c136471c32364187a53b8eecf50
 MISC metadata.xml 335 BLAKE2B bd41dfc9b0bb01a54d8754c81bbdfe4fe9e1b9331865beeeed7b853100a27c008feb7977b5a7ec1a1f50e95bf66e3361e85a12ac9d0009de134f5437f6bd8b52 SHA512 dc350644f551aaee6c0437721e8bd842bb33b9e55d60e38b169c861182103d4a1afd7ce99d38606912fc944d32bd5b7db0a280c9a65c833a16e7cf075a95f067
diff --git a/dev-db/myodbc/files/myodbc-8.0.32-include-string.patch b/dev-db/myodbc/files/myodbc-8.0.32-include-string.patch
new file mode 100644
index 000000000000..6bf31e1a53eb
--- /dev/null
+++ b/dev-db/myodbc/files/myodbc-8.0.32-include-string.patch
@@ -0,0 +1,14 @@
+# Gentoo Bug: https://bugs.gentoo.org/919501
+
+diff --git a/dltest/dltest.c b/dltest/dltest.c
+index d3b9360..3fb354b 100644
+--- a/dltest/dltest.c
++++ b/dltest/dltest.c
+@@ -28,6 +28,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #ifdef WIN32
+     #include <windows.h>
diff --git a/dev-db/myodbc/myodbc-8.0.32.ebuild b/dev-db/myodbc/myodbc-8.0.32.ebuild
new file mode 100644
index 000000000000..942a50b491f7
--- /dev/null
+++ b/dev-db/myodbc/myodbc-8.0.32.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="https://dev.mysql.com/downloads/connector/odbc/"
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-ODBC/${MAJOR}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="${MAJOR}"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-db/unixODBC[${MULTILIB_USEDEP}]
+	>=dev-db/mysql-connector-c-8.0:0=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# Careful!
+DRIVER_NAME="${PN}-${SLOT}"
+
+PATCHES=(
+	# Patch document path so it doesn't install files to /usr
+	"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
+	"${FILESDIR}/${PN}-8.0.19-cxxlinkage.patch"
+	"${FILESDIR}/${PN}-8.0.32-include-string.patch"
+)
+
+src_prepare() {
+	# Remove tests
+	sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
+		"${S}/CMakeLists.txt" || die
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	mycmakeargs+=(
+		-DCMAKE_C_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-DNDEBUG
+		-DMYSQLCLIENT_STATIC_LINKING=OFF
+		-DMYSQL_CXX_LINKAGE=YES
+		-DWITH_UNIXODBC=YES
+		-DWITH_DOCUMENTATION_INSTALL_PATH="${EPREFIX}"/usr/share/doc/${PF}
+		-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
+		-DMYSQLCLIENT_NO_THREADS=ON
+		-DDISABLE_GUI=ON
+		# Don't build "libmysql_strings.so" and "libmysql_sys.so" which are only
+		# used internally
+		-DBUILD_SHARED_LIBS=OFF
+		# The NUMA and LIBWRAP options are not really used.
+		# They are just copied from the server code
+		-DWITH_NUMA=OFF
+		-DWITH_LIBWRAP=OFF
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	rm -rf "${ED}"/usr/test || die
+
+	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
+
+	rm -rf "${ED}/usr/$(get_libdir)/${PN}-${MAJOR}/private" \
+		|| die "failed to remove bundled libs"
+
+	mv "${D}/usr/bin/myodbc-installer" \
+		"${D}/usr/bin/myodbc-installer-${MAJOR}" || die "failed to move slotted binary"
+}
+
+pkg_config() {
+	[ -n "${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}"
+}