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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/
Date: Mon, 31 Oct 2022 02:20:01 +0000 (UTC)	[thread overview]
Message-ID: <1667182657.95b9f947c8f89149169d6899acd259453e311019.sam@gentoo> (raw)

commit:     95b9f947c8f89149169d6899acd259453e311019
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 02:05:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 02:17:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b9f947

dev-db/mariadb-connector-c: add 3.2.7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-db/mariadb-connector-c/Manifest                |  1 +
 ...999.ebuild => mariadb-connector-c-3.2.7.ebuild} | 56 ++++++++++++----------
 .../mariadb-connector-c-9999.ebuild                | 56 ++++++++++++----------
 3 files changed, 63 insertions(+), 50 deletions(-)

diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 816f9f768d2b..9148320c97ae 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -1,2 +1,3 @@
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
 DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0 SHA512 5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc
+DIST mariadb-connector-c-3.2.7-src.tar.gz 1212691 BLAKE2B ae2d1317fdc087c6d64b7cf11f4343bf35662d04da5c693f6f3b45ec405ff0f3d5d03157eb56a9c05cf4e16b9980baffec8800b886ae3d962d22a828a6938671 SHA512 3f0c67c5fd12e889a3704e0a638b64a784f05d12c7c424f7ce64e78a3eb17e2ad588e0e23f0ce037cd49efb695294ab69277da78f02940c2a7ea0676886b9c36

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
similarity index 76%
copy from dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
index 9799342c7442..0660724cbec1 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
 else
@@ -11,42 +11,41 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs
 
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
 
+LICENSE="LGPL-2.1"
 SLOT="0/3"
 IUSE="+curl gnutls kerberos +ssl static-libs test"
-
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+DEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	kerberos? (
+		|| (
+			app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}]
 		)
 	)
-	"
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] )
+		!gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	)
+"
 BDEPEND="test? ( dev-db/mariadb[server] )"
 RDEPEND="${DEPEND}"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
+
 PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
 	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
 )
 
@@ -66,13 +65,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
+	# mariadb cannot use ld.gold, bug #508724
 	tc-ld-disable-gold
 
 	local mycmakeargs=(
 		-DWITH_EXTERNAL_ZLIB=ON
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
+		-DWITH_CURL=$(usex curl)
 		-DWITH_ICONV=ON
 		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
 		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
@@ -81,17 +80,24 @@ multilib_src_configure() {
 		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
 		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
 		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_UNIT_TESTS=$(usex test)
 	)
+
 	cmake_src_configure
 }
 
 multilib_src_test() {
 	mkdir -vp "${T}/mysql/data" || die
+
 	mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
 	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
-	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do sleep 1 ; done
-	cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
+
+	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
+		sleep 1
+	done
+
+	cd unittest/libmariadb || die
+	MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
 }
 
 multilib_src_install_all() {

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
index 9799342c7442..0660724cbec1 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-if [[ "${PV}" == 9999 ]] ; then
+if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git"
 else
@@ -11,42 +11,41 @@ else
 	MY_PV=${PV/_b/-b}
 	SRC_URI="https://downloads.mariadb.com/Connectors/c/connector-c-${PV}/${P}-src.tar.gz"
 	S="${WORKDIR%/}/${PN}-${MY_PV}-src"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 inherit cmake-multilib toolchain-funcs
 
-MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
-
-MULTILIB_WRAPPED_HEADERS+=(
-	/usr/include/mariadb/mariadb_version.h
-)
-
 DESCRIPTION="C client library for MariaDB/MySQL"
 HOMEPAGE="https://mariadb.org/"
-LICENSE="LGPL-2.1"
 
+LICENSE="LGPL-2.1"
 SLOT="0/3"
 IUSE="+curl gnutls kerberos +ssl static-libs test"
-
 RESTRICT="!test? ( test )"
 
-DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
+DEPEND="
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/libiconv:=[${MULTILIB_USEDEP}]
-	curl? ( net-misc/curl:0=[${MULTILIB_USEDEP}] )
-	kerberos? ( || ( app-crypt/mit-krb5[${MULTILIB_USEDEP}]
-			app-crypt/heimdal[${MULTILIB_USEDEP}] ) )
-	ssl? (
-		gnutls? ( >=net-libs/gnutls-3.3.24:0=[${MULTILIB_USEDEP}] )
-		!gnutls? (
-			dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	kerberos? (
+		|| (
+			app-crypt/mit-krb5[${MULTILIB_USEDEP}]
+			app-crypt/heimdal[${MULTILIB_USEDEP}]
 		)
 	)
-	"
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.3.24:=[${MULTILIB_USEDEP}] )
+		!gnutls? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
+	)
+"
 BDEPEND="test? ( dev-db/mariadb[server] )"
 RDEPEND="${DEPEND}"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/mariadb_config )
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mariadb/mariadb_version.h )
+
 PATCHES=(
-	"${FILESDIR}"/gentoo-layout-3.0.patch
 	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
 )
 
@@ -66,13 +65,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# bug 508724 mariadb cannot use ld.gold
+	# mariadb cannot use ld.gold, bug #508724
 	tc-ld-disable-gold
 
 	local mycmakeargs=(
 		-DWITH_EXTERNAL_ZLIB=ON
 		-DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF)
-		-DWITH_CURL=$(usex curl ON OFF)
+		-DWITH_CURL=$(usex curl)
 		-DWITH_ICONV=ON
 		-DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF)
 		-DMARIADB_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
@@ -81,17 +80,24 @@ multilib_src_configure() {
 		-DINSTALL_PCDIR="$(get_libdir)/pkgconfig"
 		-DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin"
 		-DINSTALL_BINDIR=bin
-		-DWITH_UNIT_TESTS=$(usex test ON OFF)
+		-DWITH_UNIT_TESTS=$(usex test)
 	)
+
 	cmake_src_configure
 }
 
 multilib_src_test() {
 	mkdir -vp "${T}/mysql/data" || die
+
 	mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die
 	mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking &
-	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do sleep 1 ; done
-	cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
+
+	while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do
+		sleep 1
+	done
+
+	cd unittest/libmariadb || die
+	MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
 }
 
 multilib_src_install_all() {

next             reply	other threads:[~2022-10-31  2:26 UTC|newest]

Thread overview: 117+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-31  2:20 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-10  4:52 [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/ Sam James
2025-01-09  7:57 Sam James
2025-01-09  3:26 Sam James
2025-01-09  3:21 Sam James
2025-01-09  3:14 Sam James
2025-01-09  3:07 Sam James
2025-01-09  3:07 Sam James
2025-01-09  3:07 Sam James
2025-01-09  3:07 Sam James
2025-01-09  3:07 Sam James
2024-12-13 15:03 Sam James
2024-03-04  4:57 Sam James
2024-03-04  4:53 Sam James
2023-03-08  4:52 Sam James
2023-01-18 22:52 Sam James
2023-01-18 21:54 Sam James
2023-01-18 21:54 Sam James
2023-01-18 21:54 Sam James
2023-01-18 21:54 Sam James
2022-10-31  2:20 Sam James
2022-10-08 16:54 Sam James
2022-09-25  1:27 Sam James
2022-08-29 18:46 Agostino Sarubbo
2022-08-29 18:45 Agostino Sarubbo
2022-08-28 18:03 Arthur Zamarin
2022-08-28 16:32 Arthur Zamarin
2022-08-28 16:32 Arthur Zamarin
2022-08-28 16:32 Arthur Zamarin
2022-08-12 12:26 WANG Xuerui
2022-08-12 12:26 WANG Xuerui
2022-03-10 14:00 David Seifert
2021-11-16 18:30 Thomas Deutschmann
2021-11-15  1:12 Sam James
2021-10-15 14:33 Thomas Deutschmann
2021-09-07  2:43 Sam James
2021-07-14  6:22 Agostino Sarubbo
2021-07-14  6:21 Agostino Sarubbo
2021-07-14  6:20 Agostino Sarubbo
2021-07-14  6:20 Agostino Sarubbo
2021-07-13 21:04 Thomas Deutschmann
2021-07-05 16:53 Marek Szuba
2021-05-14 17:32 Thomas Deutschmann
2021-05-14 17:32 Thomas Deutschmann
2021-05-03  8:07 Mikle Kolyada
2021-03-08  0:29 Thomas Deutschmann
2021-03-02 17:15 Thomas Deutschmann
2021-02-24 14:40 Thomas Deutschmann
2020-11-27 17:53 Thomas Deutschmann
2020-11-27 16:04 Agostino Sarubbo
2020-11-27  8:42 Agostino Sarubbo
2020-11-27  7:55 Agostino Sarubbo
2020-11-26  8:32 Sam James
2020-11-26  8:14 Sam James
2020-11-25 22:38 Sergei Trofimovich
2020-11-25 12:14 Agostino Sarubbo
2020-11-25 11:51 Thomas Deutschmann
2020-11-09 15:31 Thomas Deutschmann
2020-09-21 12:08 Thomas Deutschmann
2020-09-21 11:59 Thomas Deutschmann
2020-07-26  2:05 Thomas Deutschmann
2020-06-29 19:54 Sergei Trofimovich
2020-06-28 20:56 Thomas Deutschmann
2020-06-28 20:40 Agostino Sarubbo
2020-06-28 20:37 Agostino Sarubbo
2020-06-28 20:30 Agostino Sarubbo
2020-06-28 20:27 Agostino Sarubbo
2020-06-28  7:49 Sergei Trofimovich
2020-06-27 20:41 Mart Raudsepp
2020-06-25 21:43 Thomas Deutschmann
2020-05-25 11:48 Thomas Deutschmann
2020-04-01 21:25 Thomas Deutschmann
2020-04-01 21:12 Mart Raudsepp
2020-02-22 14:19 Sergei Trofimovich
2020-02-17 12:25 Agostino Sarubbo
2020-02-17 12:17 Agostino Sarubbo
2020-02-17 11:53 Agostino Sarubbo
2020-02-17 11:45 Agostino Sarubbo
2020-02-16 21:14 Thomas Deutschmann
2020-02-15 19:30 Sergei Trofimovich
2020-02-15 12:16 Mikle Kolyada
2020-02-14 15:30 Thomas Deutschmann
2019-12-26 10:23 Thomas Deutschmann
2019-12-26 10:23 Thomas Deutschmann
2019-11-17 21:54 Thomas Deutschmann
2019-11-17 21:54 Thomas Deutschmann
2019-11-17 20:32 Thomas Deutschmann
2019-10-05  0:37 Thomas Deutschmann
2019-07-30 22:10 Thomas Deutschmann
2019-07-30 21:39 Aaron Bauman
2019-07-08 16:29 Brian Evans
2019-03-15 19:09 Brian Evans
2019-02-28  3:09 Thomas Deutschmann
2018-12-26 20:06 Sergei Trofimovich
2018-11-09 18:18 Mikle Kolyada
2018-10-21  8:29 Sergei Trofimovich
2018-10-20 15:27 Mikle Kolyada
2018-10-20 15:24 Mikle Kolyada
2018-10-20 11:46 Sergei Trofimovich
2018-10-20 11:35 Sergei Trofimovich
2018-10-17 18:38 Sergei Trofimovich
2018-10-17 17:14 Thomas Deutschmann
2018-10-17 12:07 Thomas Deutschmann
2018-10-15 15:58 Thomas Deutschmann
2018-08-27 16:41 Thomas Deutschmann
2018-08-27 16:41 Thomas Deutschmann
2018-07-11 10:48 Tony Vroon
2018-06-25 20:14 Brian Evans
2018-05-17 17:52 Brian Evans
2018-05-15 17:41 Brian Evans
2018-04-14 11:25 Markus Meier
2018-03-08 20:01 Markus Meier
2018-03-04 11:13 Sergei Trofimovich
2018-03-03 17:56 Sergei Trofimovich
2018-03-02 12:17 Jeroen Roovers
2018-03-02  8:07 Sergei Trofimovich
2018-03-02  2:10 Brian Evans

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:816f9f768d2 dfblob:9148320c97a dfblob:9799342c744
dfblob:0660724cbec dfblob:9799342c744 dfblob:0660724cbec )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1667182657.95b9f947c8f89149169d6899acd259453e311019.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox