[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2023-11-14 Thread Andreas Sturmlechner 
commit: 2ef5fd407fcf355469ce064248a02342fd358688
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 14 07:08:32 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 14 17:30:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef5fd40

dev-db/mariadb-connector-odbc: drop 3.1.14

Closes: https://bugs.gentoo.org/917310
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  1 -
 .../mariadb-connector-odbc-3.1.14.ebuild   | 67 --
 2 files changed, 68 deletions(-)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
index ca867fe9f53f..8c3a807bd1e0 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,2 +1 @@
-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

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
deleted file mode 100644
index da1eeb6dfc48..
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3.1"
-KEYWORDS="amd64 x86"
-IUSE="ssl"
-
-S="${S}-src"
-
-# 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-$(ver_cut 1-2)*:=[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}"
-   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
-   )
-   cmake_src_configure
-}
-
-multilib_src_install_all() {
-   insinto /usr/share/${PN}
-   doins odbcinst.ini
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2023-11-13 Thread Sam James 
commit: d23f846e82e7af7d4cd64af10e53465ae58794d5
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov 14 00:39:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 14 00:39:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d23f846e

dev-db/mariadb-connector-odbc: Stabilize 3.1.18 x86, #917310

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 055a0993c862..e59d67bf4816 100644
--- 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
@@ -12,7 +12,7 @@ S="${S}-src"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ssl"
 
 # USE=ssl merely enables the configuration options (seemingly for interactive

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2023-11-13 Thread Sam James 
commit: 9c8b1fe42adfcc7967ae106b8c623c0b4de4b49b
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov 14 00:39:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 14 00:39:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c8b1fe4

dev-db/mariadb-connector-odbc: Stabilize 3.1.18 amd64, #917310

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 9f52492f5727..055a0993c862 100644
--- 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
@@ -12,7 +12,7 @@ S="${S}-src"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="ssl"
 
 # USE=ssl merely enables the configuration options (seemingly for interactive

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2023-05-12 Thread Sam James 
commit: 28383056c56dc281ddba30f18757d73337319ecf
Author: Jaco Kroon  uls  co  za>
AuthorDate: Wed May 10 09:25:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 13 03:34:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28383056

dev-db/mariadb-connector-odbc: add 3.1.18

Closes: https://bugs.gentoo.org/895272
Signed-off-by: Jaco Kroon  uls.co.za>
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  1 +
 .../mariadb-connector-odbc-3.1.18.ebuild   | 67 ++
 2 files changed, 68 insertions(+)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
index e030dd17121f..ca867fe9f53f 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1 +1,2 @@
 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

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 ..62623dc60a49
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild
@@ -0,0 +1,67 @@
+# 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"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+S="${S}-src"
+
+# 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}"
+   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+   )
+   cmake_src_configure
+}
+
+multilib_src_install_all() {
+   insinto /usr/share/${PN}
+   doins odbcinst.ini
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/files/, dev-db/mariadb-connector-odbc/

2023-05-12 Thread Sam James 
commit: d9deb5dae4fa80b0e41b3751504e75909499b84d
Author: Jaco Kroon  uls  co  za>
AuthorDate: Wed May 10 12:42:14 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 13 03:34:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9deb5da

dev-db/mariadb-connector-odbc: remove unused files/odbcinst.ini

Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/30967
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-odbc/files/odbcinst.ini   | 4 
 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.18.ebuild | 7 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

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..
--- 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
index 62623dc60a49..9f52492f5727 100644
--- 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
@@ -8,14 +8,13 @@ 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"
 
-S="${S}-src"
-
 # 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
@@ -39,6 +38,8 @@ multilib_src_configure() {
-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
@@ -47,6 +48,8 @@ multilib_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() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2022-10-30 Thread Sam James 
commit: d2075b43e14585f698441f257c4ad631042e9d8b
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 31 01:56:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 31 02:17:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2075b43

dev-db/mariadb-connector-odbc: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-odbc/metadata.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-db/mariadb-connector-odbc/metadata.xml 
b/dev-db/mariadb-connector-odbc/metadata.xml
index 6aebbc46f559..327c7fa0c01f 100644
--- a/dev-db/mariadb-connector-odbc/metadata.xml
+++ b/dev-db/mariadb-connector-odbc/metadata.xml
@@ -9,4 +9,7 @@
proxy-ma...@gentoo.org
Proxy Maintainers

+   
+   mariadb-corporation/mariadb-connector-odbc
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2022-08-19 Thread Andreas Sturmlechner 
commit: de084f292f39f1e03653731e7f991e1458166953
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 16 18:26:03 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 19 08:13:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de084f29

dev-db/mariadb-connector-odbc: drop 3.1.13

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  1 -
 .../mariadb-connector-odbc-3.1.13.ebuild   | 69 --
 2 files changed, 70 deletions(-)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
index 8f57f358bcf8..e030dd17121f 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,2 +1 @@
-DIST mariadb-connector-odbc-3.1.13-src.tar.gz 546893 BLAKE2B 
7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f
 SHA512 
b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3
 DIST mariadb-connector-odbc-3.1.14-src.tar.gz 549698 BLAKE2B 
612879086805c57b42036bb224b14ef1ab287d2ff288a5ec5ec6db7334fc8b82acd648476eca1dee282393486d117cadf1bbdcb0e78eae52bab26a0c05cb1fbe
 SHA512 
bb3cb74ccd17a8df39456ccf3091579bbdfc56431954a978f488928df54e3f9ad1c5b67cb411be4b661ba0e0bdd69ccd4d00ea4bfd72c3f448b560031830512d

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
deleted file mode 100644
index 3dbdac9fdb80..
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3.1"
-KEYWORDS="amd64 x86"
-IUSE="ssl"
-
-S="${S}-src"
-
-# 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-$(ver_cut 1-2)*:=[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}"
-   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
-   )
-   cmake_src_configure
-}
-
-multilib_src_install_all() {
-   insinto /usr/share/${PN}
-   doins odbcinst.ini
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2022-08-15 Thread Joonas Niilola 
commit: 85f9367d7ed81fca307aa871b8a46d97a2baa5b4
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 16 05:42:50 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 05:43:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85f9367d

dev-db/mariadb-connector-odbc: Stabilize 3.1.14 amd64, #865169

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
index 0e84d122ea3c..0f2c972abacd 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="ssl"
 
 S="${S}-src"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2022-08-15 Thread Joonas Niilola 
commit: cc399694cd755d223eb99acea9353b8c0cabca29
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 16 05:42:22 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 05:43:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc399694

dev-db/mariadb-connector-odbc: Stabilize 3.1.14 x86, #865169

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
index 3c026e814745..0e84d122ea3c 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018-2021 Gentoo Authors
+# Copyright 2018-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 
SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ssl"
 
 S="${S}-src"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2022-08-15 Thread Andreas Sturmlechner 
commit: 506bf6405699d895f58bfac23e09e0266556744d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 14 21:03:47 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 15 11:57:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=506bf640

dev-db/mariadb-connector-odbc: drop 3.1.12

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  1 -
 .../mariadb-connector-odbc-3.1.12.ebuild   | 69 --
 2 files changed, 70 deletions(-)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
index 08aa13d342b7..8f57f358bcf8 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,3 +1,2 @@
-DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B 
b770d79d1724480589b941ded1552bcfedb85eb1f59256269c8cd219e395dc5c151ab6762ea49c062900187ec4ae6a161a33a15ea3ffd4addc542f1c9f846121
 SHA512 
9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb
 DIST mariadb-connector-odbc-3.1.13-src.tar.gz 546893 BLAKE2B 
7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f
 SHA512 
b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3
 DIST mariadb-connector-odbc-3.1.14-src.tar.gz 549698 BLAKE2B 
612879086805c57b42036bb224b14ef1ab287d2ff288a5ec5ec6db7334fc8b82acd648476eca1dee282393486d117cadf1bbdcb0e78eae52bab26a0c05cb1fbe
 SHA512 
bb3cb74ccd17a8df39456ccf3091579bbdfc56431954a978f488928df54e3f9ad1c5b67cb411be4b661ba0e0bdd69ccd4d00ea4bfd72c3f448b560031830512d

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
deleted file mode 100644
index b40a50b0e93e..
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-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"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3.1"
-KEYWORDS="amd64 x86"
-IUSE="ssl"
-
-S="${S}-src"
-
-# 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-$(ver_cut 1-2)*[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}"
-   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
-   )
-   cmake_src_configure
-}
-
-multilib_src_install_all() {
-   insinto /usr/share/${PN}
-   doins odbcinst.ini
-}
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-11-22 Thread Sam James 
commit: aec4a4d41a7e02b3b9984e4988a4d7ebc2d244d5
Author: Jaco Kroon  uls  co  za>
AuthorDate: Fri Nov 12 09:39:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 22 10:08:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec4a4d4

dev-db/mariadb-connector-odbc: 3.1.14

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/22913
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  1 +
 .../mariadb-connector-odbc-3.1.14.ebuild   | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
index f442eeab540d..08aa13d342b7 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,2 +1,3 @@
 DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B 
b770d79d1724480589b941ded1552bcfedb85eb1f59256269c8cd219e395dc5c151ab6762ea49c062900187ec4ae6a161a33a15ea3ffd4addc542f1c9f846121
 SHA512 
9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb
 DIST mariadb-connector-odbc-3.1.13-src.tar.gz 546893 BLAKE2B 
7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f
 SHA512 
b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3
+DIST mariadb-connector-odbc-3.1.14-src.tar.gz 549698 BLAKE2B 
612879086805c57b42036bb224b14ef1ab287d2ff288a5ec5ec6db7334fc8b82acd648476eca1dee282393486d117cadf1bbdcb0e78eae52bab26a0c05cb1fbe
 SHA512 
bb3cb74ccd17a8df39456ccf3091579bbdfc56431954a978f488928df54e3f9ad1c5b67cb411be4b661ba0e0bdd69ccd4d00ea4bfd72c3f448b560031830512d

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
new file mode 100644
index ..3c026e814745
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.14.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+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"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+S="${S}-src"
+
+# 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-$(ver_cut 1-2)*:=[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}"
+   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+   )
+   cmake_src_configure
+}
+
+multilib_src_install_all() {
+   insinto /usr/share/${PN}
+   doins odbcinst.ini
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-11-22 Thread Sam James 
commit: 7a779e9cf36a0e52aa01b0cfb42602c9775c
Author: Jaco Kroon  uls  co  za>
AuthorDate: Fri Nov 12 09:33:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 22 10:08:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a779e99

dev-db/mariadb-connector-odbc: Prune old versions.

3.1.6 is long gone, and 3.11 is second stable (3.13 en route).

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jaco Kroon  uls.co.za>
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  2 -
 .../mariadb-connector-odbc-3.1.11-r2.ebuild| 69 --
 .../mariadb-connector-odbc-3.1.6.ebuild| 65 
 3 files changed, 136 deletions(-)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
index 91c5dc606a63..f442eeab540d 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,4 +1,2 @@
-DIST mariadb-connector-odbc-3.1.11-ga-src.tar.gz 542434 BLAKE2B 
318e5a269c6f4584df4ffd2272f5db4a354f3616d52b60d2c5f785faabc1eaabe47a75f07e3cd97847d4413670391acdb71092955b8facd9f81b8706ab78c966
 SHA512 
185f58b05f196bfe8b23d5470877dcfc0550be45d2f4538ddbd0b96aadde5cdbc0346ecaf65554728875e33b88761211349bf0d1def17f3b7cd43abae9d706b3
 DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B 
b770d79d1724480589b941ded1552bcfedb85eb1f59256269c8cd219e395dc5c151ab6762ea49c062900187ec4ae6a161a33a15ea3ffd4addc542f1c9f846121
 SHA512 
9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb
 DIST mariadb-connector-odbc-3.1.13-src.tar.gz 546893 BLAKE2B 
7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f
 SHA512 
b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3
-DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B 
c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3
 SHA512 
ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d

diff --git 
a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
deleted file mode 100644
index 3ef0c53a9e12..
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="MariaDB Connector/ODBC"
-HOMEPAGE="https://downloads.mariadb.org/connector-odbc/;
-SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-ga-src.tar.gz;
-
-LICENSE="LGPL-2.1"
-SLOT="0/3.1"
-KEYWORDS="amd64 x86"
-IUSE="ssl"
-
-S="${S}-ga-src"
-
-# 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-$(ver_cut 1-2)*[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}"
-   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
-   )
-   cmake_src_configure
-}
-
-multilib_src_install_all() {
-   insinto /usr/share/${PN}
-   doins odbcinst.ini
-}
-
-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
-}

diff --git

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-11-22 Thread Sam James 
commit: 18fa3ff00086a473f539cacf18a2205077c34ea7
Author: Jaco Kroon  uls  co  za>
AuthorDate: Fri Nov 12 09:37:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 22 10:08:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fa3ff0

dev-db/mariadb-connector-odbc: Update download URLs.

The old ones broke when MariaDB again modified their download
mechanisms.  Use mirror://mariadb now - which will hopefully remain more
reliable.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Jaco Kroon  uls.co.za>
Signed-off-by: Sam James  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild | 2 +-
 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
index 4f55b84be25f..b40a50b0e93e 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
@@ -9,7 +9,7 @@ inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="MariaDB Connector/ODBC"
 HOMEPAGE="https://downloads.mariadb.org/connector-odbc/;
-SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-src.tar.gz;
+SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
index cb5cde255a2b..3dbdac9fdb80 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
@@ -9,7 +9,7 @@ inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="MariaDB Connector/ODBC"
 HOMEPAGE="https://downloads.mariadb.org/connector-odbc/;
-SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-src.tar.gz;
+SRC_URI="mirror://mariadb/connector-odbc-${PV}/${P}-src.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-11-12 Thread Agostino Sarubbo 
commit: 20826d14a604c0e194ede78c548826318f5345ee
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Nov 13 07:08:10 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Nov 13 07:08:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20826d14

dev-db/mariadb-connector-odbc: x86 stable wrt bug #823236

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
index 51dbfe5c9de..cb5cde255a2 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-sr
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ssl"
 
 S="${S}-src"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-11-12 Thread Agostino Sarubbo 
commit: 9932555cd10a38a1b29b3129d98e0f475ebf69e9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Nov 13 07:07:51 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Nov 13 07:07:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9932555c

dev-db/mariadb-connector-odbc: amd64 stable wrt bug #823236

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
index 5cbce6d6d5f..51dbfe5c9de 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-sr
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="ssl"
 
 S="${S}-src"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-09-27 Thread Agostino Sarubbo 
commit: 40948fe75a13dc210d2a1ff0bdfb4c58b0e4c8f1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Sep 27 06:54:27 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Sep 27 06:54:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40948fe7

dev-db/mariadb-connector-odbc: amd64 stable wrt bug #814647

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
index d29d57ab3c2..4f55b84be25 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-sr
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="ssl"
 
 S="${S}-src"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-09-26 Thread Agostino Sarubbo 
commit: 0a1ab084bb0f7a7c9d19b8cb8550111ccc103564
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Sep 26 07:29:02 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Sep 26 07:29:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a1ab084

dev-db/mariadb-connector-odbc: x86 stable wrt bug #814647

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
index 9e99b65066b..d29d57ab3c2 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-sr
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ssl"
 
 S="${S}-src"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-09-04 Thread Joonas Niilola 
commit: f0982dba363de5145b1c7c50be5362873be05c5f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Sep  4 05:45:09 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Sep  4 05:45:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0982dba

dev-db/mariadb-connector-odbc: add := to mariadb-connector-c

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
index 9e99b65066b..5cbce6d6d5f 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
@@ -23,7 +23,7 @@ S="${S}-src"
 # 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-$(ver_cut 1-2)*[ssl?]
+DEPEND="=dev-db/mariadb-connector-c-$(ver_cut 1-2)*:=[ssl?]
dev-db/unixODBC"
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-09-04 Thread Joonas Niilola 
commit: 266542ac048044bf98b21a57140774300c246500
Author: Jaco Kroon  uls  co  za>
AuthorDate: Mon Aug 30 08:31:21 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Sep  4 05:44:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=266542ac

dev-db/mariadb-connector-odbc: 3.1.13

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/22157
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  1 +
 .../mariadb-connector-odbc-3.1.13.ebuild   | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
index 6a43107889d..91c5dc606a6 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,3 +1,4 @@
 DIST mariadb-connector-odbc-3.1.11-ga-src.tar.gz 542434 BLAKE2B 
318e5a269c6f4584df4ffd2272f5db4a354f3616d52b60d2c5f785faabc1eaabe47a75f07e3cd97847d4413670391acdb71092955b8facd9f81b8706ab78c966
 SHA512 
185f58b05f196bfe8b23d5470877dcfc0550be45d2f4538ddbd0b96aadde5cdbc0346ecaf65554728875e33b88761211349bf0d1def17f3b7cd43abae9d706b3
 DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B 
b770d79d1724480589b941ded1552bcfedb85eb1f59256269c8cd219e395dc5c151ab6762ea49c062900187ec4ae6a161a33a15ea3ffd4addc542f1c9f846121
 SHA512 
9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb
+DIST mariadb-connector-odbc-3.1.13-src.tar.gz 546893 BLAKE2B 
7d3f02667ab3c5eb81063a2a2470bd49914cabea79d8756fd4d493b3117a692c9bd3594c00d5c7d8a866ad4677dec2848a08a80b0e97952e6e80edb5d677e93f
 SHA512 
b50949b99207aeef18fc7f8e15ecb8e8c869fcdc85a04ce1922f2ff856d3f07eb6701df8515545e762abbcb97f74605c6b5ac66efa1927e761a80dcd1c29c2d3
 DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B 
c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3
 SHA512 
ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
new file mode 100644
index 000..9e99b65066b
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.13.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="MariaDB Connector/ODBC"
+HOMEPAGE="https://downloads.mariadb.org/connector-odbc/;
+SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-src.tar.gz;
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+S="${S}-src"
+
+# 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-$(ver_cut 1-2)*[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}"
+   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+   )
+   cmake_src_configure
+}
+
+multilib_src_install_all() {
+   insinto /usr/share/${PN}
+   doins odbcinst.ini
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-05-24 Thread Joonas Niilola 
commit: 5c2f79070a634b395cb396ad7e13426a4b30e032
Author: Jaco Kroon  uls  co  za>
AuthorDate: Thu May  6 19:51:16 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon May 24 07:39:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2f7907

dev-db/mariadb-connector-odbc: Version 3.1.12

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/20706
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  1 +
 .../mariadb-connector-odbc-3.1.12.ebuild   | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
index bb40643d79b..6a43107889d 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1,2 +1,3 @@
 DIST mariadb-connector-odbc-3.1.11-ga-src.tar.gz 542434 BLAKE2B 
318e5a269c6f4584df4ffd2272f5db4a354f3616d52b60d2c5f785faabc1eaabe47a75f07e3cd97847d4413670391acdb71092955b8facd9f81b8706ab78c966
 SHA512 
185f58b05f196bfe8b23d5470877dcfc0550be45d2f4538ddbd0b96aadde5cdbc0346ecaf65554728875e33b88761211349bf0d1def17f3b7cd43abae9d706b3
+DIST mariadb-connector-odbc-3.1.12-src.tar.gz 542918 BLAKE2B 
b770d79d1724480589b941ded1552bcfedb85eb1f59256269c8cd219e395dc5c151ab6762ea49c062900187ec4ae6a161a33a15ea3ffd4addc542f1c9f846121
 SHA512 
9723555c598c3ec77c41a617d9960c8d0fb9ee9d0b70e44b44f55f8842a5966b50ed6c04e8a80d252330b2cd96bdac4e0403100141e827c23af72ed58f747ffb
 DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B 
c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3
 SHA512 
ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
new file mode 100644
index 000..9e99b65066b
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.12.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="MariaDB Connector/ODBC"
+HOMEPAGE="https://downloads.mariadb.org/connector-odbc/;
+SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-src.tar.gz;
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+S="${S}-src"
+
+# 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-$(ver_cut 1-2)*[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}"
+   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+   )
+   cmake_src_configure
+}
+
+multilib_src_install_all() {
+   insinto /usr/share/${PN}
+   doins odbcinst.ini
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-05-09 Thread Agostino Sarubbo 
commit: 429ca250c3f760ce65d38c271820fcb48c4b4619
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May  9 09:17:31 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May  9 09:17:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429ca250

dev-db/mariadb-connector-odbc: x86 stable wrt bug #788628

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
index cad9bff8926..3ef0c53a9e1 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-ga
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ssl"
 
 S="${S}-ga-src"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-05-09 Thread Agostino Sarubbo 
commit: f6a6c7088a1e414a553165b0f39e59a072b926f1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun May  9 09:15:11 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun May  9 09:15:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6a6c708

dev-db/mariadb-connector-odbc: amd64 stable wrt bug #788628

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
index f6036b2752f..cad9bff8926 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-ga
 
 LICENSE="LGPL-2.1"
 SLOT="0/3.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="ssl"
 
 S="${S}-ga-src"

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-02-28 Thread Joonas Niilola 
commit: 9f3541d5966a7525b95a023041e67b9ad23d8742
Author: Jaco Kroon  uls  co  za>
AuthorDate: Thu Feb 25 09:14:18 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Mar  1 06:54:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f3541d5

dev-db/mariadb-connector-odbc: secondary ini path fix.

Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/19641
Signed-off-by: Joonas Niilola  gentoo.org>

 ...or-odbc-3.1.11-r1.ebuild => mariadb-connector-odbc-3.1.11-r2.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
similarity index 95%
rename from 
dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
rename to dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
index c7775a4cf97..f6036b2752f 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r2.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
cmake_src_prepare
 
-   sed -e "s,lib/lib,$(get_libdir)/lib,g" "${FILESDIR}/odbcinst2.ini" > 
odbcinst.ini || die
+   sed -e "s,/lib/,/$(get_libdir)/,g" "${FILESDIR}/odbcinst2.ini" > 
odbcinst.ini || die
 }
 
 multilib_src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-02-23 Thread Joonas Niilola 
commit: 42283048bb74dcf3e5c1101774ec2481dbc69b35
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Feb 24 07:05:46 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 24 07:05:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42283048

dev-db/mariadb-connector-odbc: fix docdir to ${PF} instead of ${P}

 - applied in 3.1.11-r1

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
index 379e544cc84..c7775a4cf97 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
@@ -39,8 +39,8 @@ multilib_src_configure() {
-DWITH_SSL=$(usex ssl OPENSSL OFF)
-DMARIADB_LINK_DYNAMIC=YES
-DUSE_SYSTEM_INSTALLED_LIB=YES
-   -DINSTALL_DOCDIR="/usr/share/doc/${P}"
-   -DINSTALL_LICENSEDIR="/usr/share/doc/${P}"
+   -DINSTALL_DOCDIR="/usr/share/doc/${PF}"
+   -DINSTALL_LICENSEDIR="/usr/share/doc/${PF}"
#-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
)
cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/, dev-db/mariadb-connector-odbc/files/

2021-02-23 Thread Joonas Niilola 
commit: b932ba0d003c340f30bde0ce451427a65e3912d1
Author: Jaco Kroon  uls  co  za>
AuthorDate: Tue Feb 23 22:38:04 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 24 07:04:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b932ba0d

dev-db/mariadb-connector-odbc: rev-bump fix odbcinst.ini

Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/19622
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/files/odbcinst2.ini | 4 
 ...tor-odbc-3.1.11.ebuild => mariadb-connector-odbc-3.1.11-r1.ebuild} | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-odbc/files/odbcinst2.ini 
b/dev-db/mariadb-connector-odbc/files/odbcinst2.ini
new file mode 100644
index 000..e29de3c5898
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/files/odbcinst2.ini
@@ -0,0 +1,4 @@
+[maodbc]
+Description=MariaDB ODBC Driver
+Driver=/usr/lib/mariadb/libmaodbc.so
+Threading=0

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
similarity index 95%
rename from dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11.ebuild
rename to dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
index 3bea0e8db67..379e544cc84 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
cmake_src_prepare
 
-   sed -e "s,lib/lib,$(get_libdir)/lib,g" "${FILESDIR}/odbcinst.ini" > 
odbcinst.ini || die
+   sed -e "s,lib/lib,$(get_libdir)/lib,g" "${FILESDIR}/odbcinst2.ini" > 
odbcinst.ini || die
 }
 
 multilib_src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2021-02-18 Thread Joonas Niilola 
commit: e40751d15c5f99ca603d054a29c385f95a32a4fb
Author: Jaco Kroon  uls  co  za>
AuthorDate: Sat Feb 13 11:12:13 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Feb 18 13:47:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e40751d1

dev-db/mariadb-connector-odbc: version bump 3.1.11

Changelogs does not indicate any major differences, mostly minor
bugfixes.

Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/19446
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  1 +
 .../mariadb-connector-odbc-3.1.11.ebuild   | 69 ++
 2 files changed, 70 insertions(+)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
index 8e1ff5fecee..bb40643d79b 100644
--- a/dev-db/mariadb-connector-odbc/Manifest
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -1 +1,2 @@
+DIST mariadb-connector-odbc-3.1.11-ga-src.tar.gz 542434 BLAKE2B 
318e5a269c6f4584df4ffd2272f5db4a354f3616d52b60d2c5f785faabc1eaabe47a75f07e3cd97847d4413670391acdb71092955b8facd9f81b8706ab78c966
 SHA512 
185f58b05f196bfe8b23d5470877dcfc0550be45d2f4538ddbd0b96aadde5cdbc0346ecaf65554728875e33b88761211349bf0d1def17f3b7cd43abae9d706b3
 DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B 
c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3
 SHA512 
ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11.ebuild
new file mode 100644
index 000..3bea0e8db67
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.11.ebuild
@@ -0,0 +1,69 @@
+# Copyright 2018-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="MariaDB Connector/ODBC"
+HOMEPAGE="https://downloads.mariadb.org/connector-odbc/;
+SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-ga-src.tar.gz;
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="ssl"
+
+S="${S}-ga-src"
+
+# 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-$(ver_cut 1-2)*[ssl?]
+   dev-db/unixODBC"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   cmake_src_prepare
+
+   sed -e "s,lib/lib,$(get_libdir)/lib,g" "${FILESDIR}/odbcinst.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/${P}"
+   -DINSTALL_LICENSEDIR="/usr/share/doc/${P}"
+   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+   )
+   cmake_src_configure
+}
+
+multilib_src_install_all() {
+   insinto /usr/share/${PN}
+   doins odbcinst.ini
+}
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2020-10-31 Thread David Seifert 
commit: 6e8e0032d8580a819792087f0f048116b60571bb
Author: David Seifert  gentoo  org>
AuthorDate: Sat Oct 31 11:10:50 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 31 11:10:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8e0032

dev-db/mariadb-connector-odbc: [QA] Inherit flag-o-matic.eclass explicitly

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
index 0ad95ec91df..6e710c76408 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_ECLASS=cmake
 
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 DESCRIPTION="MariaDB Connector/ODBC"
 HOMEPAGE="https://downloads.mariadb.org/connector-odbc/;

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/files/, dev-db/mariadb-connector-odbc/

2020-03-15 Thread Joonas Niilola 
commit: 2e3e6e6cdc1801a03deb52856dd875892e4ad14f
Author: Jaco Kroon  uls  co  za>
AuthorDate: Fri Feb 21 12:05:54 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 15 17:51:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e3e6e6c

dev-db/mariadb-connector-odbc: new package.

mariadb-connector-odbc is MariaDB's version of myodbc package, and uses
mariadb-connector-c instead of mysql-connector-c.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/14729
Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/Manifest |  1 +
 dev-db/mariadb-connector-odbc/files/odbcinst.ini   |  4 ++
 .../mariadb-connector-odbc-3.1.6.ebuild| 63 ++
 dev-db/mariadb-connector-odbc/metadata.xml | 12 +
 4 files changed, 80 insertions(+)

diff --git a/dev-db/mariadb-connector-odbc/Manifest 
b/dev-db/mariadb-connector-odbc/Manifest
new file mode 100644
index 000..8e1ff5fecee
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/Manifest
@@ -0,0 +1 @@
+DIST mariadb-connector-odbc-3.1.6-ga-src.tar.gz 536871 BLAKE2B 
c41f1fb00b5a93b3618d79ee457dc84c8b98e216083ec315870dc2ab46f1f56db345c1a2fae51e78e8b6c42b81183ce9c161ac5a051e52481cd687138f3dadd3
 SHA512 
ec0e244fc1b62c27f619f0ed3025906b02fc897c75dd74799df396beb5009bfdd27d609b5629ea0e6f5172ca8521b60bf7f3efc6dac44e84e835e4a05273ba3d

diff --git a/dev-db/mariadb-connector-odbc/files/odbcinst.ini 
b/dev-db/mariadb-connector-odbc/files/odbcinst.ini
new file mode 100644
index 000..e196e032362
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/files/odbcinst.ini
@@ -0,0 +1,4 @@
+[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.6.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
new file mode 100644
index 000..dc1668302aa
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
@@ -0,0 +1,63 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="MariaDB Connector/ODBC"
+HOMEPAGE="https://downloads.mariadb.org/connector-odbc/;
+SRC_URI="https://downloads.mariadb.org/interstitial/connector-odbc-${PV}/${P}-ga-src.tar.gz;
+
+LICENSE="LGPL-2.1"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnutls ssl"
+
+S="${S}-ga-src"
+
+DEPEND="=dev-db/mariadb-connector-c-$(ver_cut 1-2)*
+   dev-db/unixODBC"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   cp "${FILESDIR}/odbcinst.ini" . || die
+   sed -e "s,lib/lib,$(get_libdir)/lib,g" -i "odbcinst.ini" || die
+}
+
+multilib_src_configure() {
+   append-cppflags $(mariadb_config --cflags || die)
+   local mycmakeargs=(
+   -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
+   -DMARIADB_LINK_DYNAMIC=YES
+   -DUSE_SYSTEM_INSTALLED_LIB=YES
+   -DINSTALL_DOC_DIR="/usr/share/doc/${P}"
+   -DINSTALL_LICENSE_DIR="/usr/share/doc/${P}"
+   #-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
+   )
+   cmake-utils_src_configure
+}
+
+multilib_src_install_all() {
+   insinto /usr/share/${PN}
+   doins odbcinst.ini
+}
+
+pkg_postinst() {
+   elog "Please remember to use emerge --config =${P} to install the ODBC 
ini files."
+   elog "Alterantively 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
+}

diff --git a/dev-db/mariadb-connector-odbc/metadata.xml 
b/dev-db/mariadb-connector-odbc/metadata.xml
new file mode 100644
index 000..64b17e08bff
--- /dev/null
+++ b/dev-db/mariadb-connector-odbc/metadata.xml
@@ -0,0 +1,12 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   j...@uls.co.za
+   Jaco Kroon
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-odbc/

2020-03-15 Thread Joonas Niilola 
commit: dca9b4dbd626e8190b7800e072854322062e6801
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Mar 15 17:32:42 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Mar 15 17:51:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca9b4db

dev-db/mariadb-connector-odbc: switch to cmake.eclass

Signed-off-by: Joonas Niilola  gentoo.org>

 dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild 
b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
index dc1668302aa..0ad95ec91df 100644
--- a/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
+++ b/dev-db/mariadb-connector-odbc/mariadb-connector-odbc-3.1.6.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
+
 inherit cmake-multilib
 
 DESCRIPTION="MariaDB Connector/ODBC"
@@ -21,7 +23,7 @@ DEPEND="=dev-db/mariadb-connector-c-$(ver_cut 1-2)*
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_src_prepare
 
cp "${FILESDIR}/odbcinst.ini" . || die
sed -e "s,lib/lib,$(get_libdir)/lib,g" -i "odbcinst.ini" || die
@@ -37,7 +39,7 @@ multilib_src_configure() {
-DINSTALL_LICENSE_DIR="/usr/share/doc/${P}"
#-DCMAKE_C_FLAGS="$(mariadb_config --cflags)"
)
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 multilib_src_install_all() {