[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/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
+   
+