gentoo auto-resync : 13:05:2023 - 05:50:34

4 files changed, 72 insertions, 5 deletions

diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index a534fcdb4ab1..e35699f4cde1 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mariadb-connector-odbc/Manifest b/dev-db/mariadb-connector-odbc/Manifest
index 356ce85735b8..933ca314474c 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,5 +1,6 @@
-AUX odbcinst.ini 82 BLAKE2B 7c752f9500f2141886c798d9be4aa2e84ecb089589394c4f473712aba0279f2ff853ebc1ea75b7f007abea18e46289bf06c7408d3d69026faa6b638755c13e70 SHA512 40c056bac44dc5e521ec2e66dd046566f50fd8b2fe0d0d2beacc29a68d9ddbe75f8dfe012ee6957c4e2874d4365dbb096e20faebb2b26371b060c0a9fec205b2
 AUX odbcinst2.ini 90 BLAKE2B 8070ddb3460799429fc9a80f5c54317381f3fc79a9b98766bb7c5db325ace3ed5f558df70386c2249f8a1f5a373cde51f0a28140421a00d3599f75994c28cbbf SHA512 00634eab33d08650cd19128bfd9d2187b4e5d38a866d08690d0b1e2224af7dcfefcb45f13a83f4a774beee322e6c5f3152c0f967399aea2893f8e857451aba8a
 DIST mariadb-connector-odbc-3.1.14-src.tar.gz 549698 BLAKE2B 612879086805c57b42036bb224b14ef1ab287d2ff288a5ec5ec6db7334fc8b82acd648476eca1dee282393486d117cadf1bbdcb0e78eae52bab26a0c05cb1fbe SHA512 bb3cb74ccd17a8df39456ccf3091579bbdfc56431954a978f488928df54e3f9ad1c5b67cb411be4b661ba0e0bdd69ccd4d00ea4bfd72c3f448b560031830512d
+DIST mariadb-connector-odbc-3.1.18-src.tar.gz 556590 BLAKE2B 9644521f91136b3bc30846d8c9df7cfa21c8fff0e9219bf0c758a0294f34783a57f1200834b84833284624160652315adb4f6eb465a90378e676e5767c7bd40a SHA512 1d240988d03dbb0ef2f4eb0667ff973a35d700f319caaea78db6d5c0ca569ed5adcee978fb10cd9f067c0c5aecbfe697e5adb3d736e564bae82cf6c11cd0dba2
 EBUILD mariadb-connector-odbc-3.1.14.ebuild 1946 BLAKE2B 76490f7869d61650589429714798de3885fd1b98d4838c9a68d00b23701cd595810efa14319d7b13616acfa4d825f4b6c3a1d4715e183711136190588afb3050 SHA512 013e4905f29f0dbf7bc511faa15cab959298bbf7836252c3eb162a247a98235b31e68dab43f1e22c6e943d36f5559711e5e2d8213d152ad22791184dba483951
+EBUILD mariadb-connector-odbc-3.1.18.ebuild 2113 BLAKE2B 399a3b52dbcae0f28b547bfb6f6f69f3a5aa9e8d564c49caacd22c74e96de4383f287799f37e73593f434add145945c8407c34479a0d99f3b90c8f577a3c083f SHA512 80dece590d5d16b587c656a2189127d67b6a74812d5ef8dd5e4dd06be9c024271be07bf932af39d387ca13e3bc19a6f97d40644e7d8bab2d059b8bbfab23c809
 MISC metadata.xml 495 BLAKE2B 50717eb32456dc6dec684b14b318e2f511e8f6d3b0fe810608a106dcca7bb1eb631aba5d034584474c3631d39fb647ba1dbe97fa3aa4aeb1d3f7d03b4427841a SHA512 ef88620670ae82a5b39a103f44d52cec79863f69389d38923a4a1c66a11751d14059f9bed496d3e05045208b40e1f3e83cd5020dfd33f6656bb030ce8577d6be
diff --git a/dev-db/mariadb-connector-odbc/files/odbcinst.ini b/dev-db/mariadb-connector-odbc/files/odbcinst.ini
deleted file mode 100644
index e196e032362f..000000000000
--- a/dev-db/mariadb-connector-odbc/files/odbcinst.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[maodbc]
-Description=MariaDB ODBC Driver
-Driver=/usr/lib/libmaodbc.so
-Threading=0
diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild
new file mode 100644
index 000000000000..9f52492f5727
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="MariaDB Connector/ODBC"
+HOMEPAGE="https://downloads.mariadb.org/connector-odbc/"
+SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz"
+S="${S}-src"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+# USE=ssl merely enables the configuration options (seemingly for interactive
+# sessions) and does not cause direct linking to any SSL libraries.  However,
+# it doesn't make sense enable these configuration options unless the
+# underlying mariadb-connector-c has ssl enabled, thus if we have USE=ssl,
+# require mariadb-connector-c to have it too.
+DEPEND="dev-db/mariadb-connector-c:=[ssl?]
+	dev-db/unixODBC"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e "s,/lib/,/$(get_libdir)/,g" "${FILESDIR}/odbcinst2.ini" > odbcinst.ini || die
+}
+
+multilib_src_configure() {
+	append-cppflags $(mariadb_config --cflags || die)
+	local mycmakeargs=(
+		-DWITH_SSL=$(usex ssl OPENSSL OFF)
+		-DMARIADB_LINK_DYNAMIC=YES
+		-DUSE_SYSTEM_INSTALLED_LIB=YES
+		-DINSTALL_DOCDIR="/usr/share/doc/${PF}"
+		-DINSTALL_LICENSEDIR="/usr/share/doc/${PF}"
+		-DINSTALL_LIBDIR="$(get_libdir)/mariadb"
+		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
+		#-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	insinto /usr/share/${PN}
+	doins odbcinst.ini
+
+	rm "${ED}/usr/share/doc/${PF}/COPYING" || die "Error removing COPYING file from installation"
+}
+
+pkg_postinst() {
+	elog "Please remember to use emerge --config =${P} to install the ODBC ini files."
+	elog "Alternatively run: /usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini"
+}
+
+pkg_config() {
+	[[ -n "${ROOT}" ]] && die "Sorry, non-standard ROOT setting is not supported."
+
+	if /usr/bin/odbcinst -q -d -n maodbc &>/dev/null; then
+		einfo "maodbc (MariaDB ODBC driver) has already been installed."
+	else
+		ebegin "Installing maodbc (MariaDB ODBC driver)"
+		/usr/bin/odbcinst -i -d -f /usr/share/${PN}/odbcinst.ini
+		eend ${?} || die
+	fi
+}