[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/files/, dev-db/mariadb-connector-c/
commit: 5967282d7bbb50dbc73d7c3aad9fd564752d1632 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 13 19:27:21 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Nov 14 17:30:15 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5967282d dev-db/mariadb-connector-c: drop 3.1.13, 3.2.5 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-db/mariadb-connector-c/Manifest| 2 - .../files/gentoo-layout-3.0.patch | 9 -- .../mariadb-connector-c-3.1.13.ebuild | 76 .../mariadb-connector-c-3.2.5.ebuild | 101 - 4 files changed, 188 deletions(-) diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest index b1cd0e0d3d95..9439c470d5f0 100644 --- a/dev-db/mariadb-connector-c/Manifest +++ b/dev-db/mariadb-connector-c/Manifest @@ -1,4 +1,2 @@ -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 DIST mariadb-connector-c-3.3.4-src.tar.gz 1389030 BLAKE2B 4bee45ee4f76979d36072ab2119042b4de1127a42e99510bd0c1bc5e163fdb4e9b7ca4cce9381ed89e0c733158293d0641c7b7cbd14feaf3257a442c62083e23 SHA512 3a3f20efe58f8458a426501248b154107b76bd2001a43e41923e31568c8419cd88f2379e3636a54118ee64ac160a1c6f68dd79c0ac053fa273d9b6b127410ef6 diff --git a/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch b/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch deleted file mode 100644 index b57b7abc03b4.. --- a/dev-db/mariadb-connector-c/files/gentoo-layout-3.0.patch +++ /dev/null @@ -1,9 +0,0 @@ a/mariadb_config/CMakeLists.txt2016-02-12 21:21:06.981021227 -0500 -+++ b/mariadb_config/CMakeLists.txt2016-02-12 22:06:02.397130410 -0500 -@@ -40,5 +44,5 @@ - # Installation - # - INSTALL(TARGETS mariadb_config --DESTINATION "bin" -+DESTINATION ${INSTALL_BINDIR} - COMPONENT Development) diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild deleted file mode 100644 index 92da81e96162.. --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.13.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ "${PV}" == ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git; -else - MY_PN=${PN#mariadb-} - MY_PV=${PV/_b/-b} - SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" - S="${WORKDIR%/}/${PN}-${MY_PV}-src" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 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" - -SLOT="0/3" -IUSE="+curl gnutls kerberos +ssl static-libs test" - -RESTRICT="!test? ( test )" - -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}] - ) - ) - " -RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}"/gentoo-layout-3.0.patch - "${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch -) - -multilib_src_configure() { - # bug 508724 mariadb cannot use ld.gold - tc-ld-disable-gold - - local mycmakeargs=( - -DWITH_EXTERNAL_ZLIB=ON - -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) -
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/files/, dev-db/mariadb-connector-c/
commit: 0a4f621821c5c2ebd8e52ab24264b047cb60f5ad Author: Brian Evans gentoo org> AuthorDate: Fri Mar 15 19:13:01 2019 + Commit: Brian Evans gentoo org> CommitDate: Fri Mar 15 19:13:01 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a4f6218 dev-db/mariadb-connector-c: Drop old Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Brian Evans gentoo.org> dev-db/mariadb-connector-c/Manifest| 2 - ...db-connector-c-3.0.7-fix-pkconfig-file-r1.patch | 32 --- .../mariadb-connector-c-3.0.7-r1.ebuild| 102 .../mariadb-connector-c-3.0.8.ebuild | 103 - 4 files changed, 239 deletions(-) diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest index 4ce03a3c9a6..6b46d2466d8 100644 --- a/dev-db/mariadb-connector-c/Manifest +++ b/dev-db/mariadb-connector-c/Manifest @@ -1,4 +1,2 @@ DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e -DIST mariadb-connector-c-3.0.7-src.tar.gz 667274 BLAKE2B 75d2d548d51889aecc8af56cbeb61f5eaf21e60924b70dd0559214de464eae209743febdb5d443797f853bc902352f7333aefe84cb367f61f7bf2c341a4a8ac2 SHA512 70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219 -DIST mariadb-connector-c-3.0.8-src.tar.gz 674455 BLAKE2B eca5972f8443c78cdc9f450e7e88ee1c69e2a004664916a0f7dfd9a1ab8242c9e11d3cafcd95323262223fba5d68c5d489d4f61fdddb8369cf603cdd563cfe51 SHA512 d9f970c7ac164ef7d8dd748bf2f749cc1f877a9c8f68a1d57e9ff62d95046bb9505619feca1f1d0d1cdefc1ac49489742aadf4ad9e47c8e6a9b8b40c56eed788 DIST mariadb-connector-c-3.0.9-src.tar.gz 668142 BLAKE2B f61f855c334268b1cb079abc566a600093d7e0bdd164c22045000e337f43d2b57d14988cba1b3fd2f6316f6e0d949be7e67ac73410ddb1abc66e0faa16422946 SHA512 6f45bcd4bee07f6d72d1c4fee0bdb903ef4fa879eb7508156bc885a5657caf69b145d95647c4bc663eb2a2b03569b41ef9d87ca532b77901c2f67fd608048a1a diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch deleted file mode 100644 index 1fe06e2c8e5..000 --- a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/673218 - a/mariadb_config/CMakeLists.txt -+++ b/mariadb_config/CMakeLists.txt -@@ -59,5 +59,5 @@ INSTALL(TARGETS mariadb_config - COMPONENT Development) - - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmariadb.pc --DESTINATION "lib/pkgconfig" -+DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - COMPONENT Development) a/mariadb_config/libmariadb.pc.in -+++ b/mariadb_config/libmariadb.pc.in -@@ -7,13 +7,12 @@ - # - - prefix=@CMAKE_INSTALL_PREFIX@ --includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ --libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ -+includedir=${prefix}/include -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ - - Name: libmariadb - Version: @CPACK_PACKAGE_VERSION@ -+URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ - Description: MariaDB Connector/C dynamic library --Cflags: -I${includedir} --Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@ -- -- -+Cflags: -I${includedir}/mariadb -+Libs: -L${libdir} -lmariadb diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild deleted file mode 100644 index 2cd32bf0db3..000 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -VCS_INHERIT="" -if [[ "${PV}" == ]] ; then - VCS_INHERIT="git-r3" - EGIT_REPO_URI="https://github.com/MariaDB/mariadb-connector-c.git; -else - MY_PN=${PN#mariadb-} - MY_PV=${PV/_b/-b} - SRC_URI="https://downloads.mariadb.org/f/${MY_PN}-${PV%_beta}/${PN}-${MY_PV}-src.tar.gz?serve -> ${P}-src.tar.gz" - S="${WORKDIR%/}/${PN}-${MY_PV}-src" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -fi - -inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT} - -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" - -SLOT="0/3" -IUSE="+curl gnutls kerberos libressl mysqlcompat +ssl static-libs test" - -DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}] -
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/files/, dev-db/mariadb-connector-c/
commit: 92437856b0ef2c059cc9c19be5d89b3c1a048c12 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Dec 17 11:04:49 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Dec 17 11:05:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92437856 dev-db/mariadb-connector-c: fix pkg-config file install location Bug: https://bugs.gentoo.org/673218 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> ...ariadb-connector-c-3.0.7-fix-pkconfig-file.patch | 21 + .../mariadb-connector-c-.ebuild | 1 + 2 files changed, 22 insertions(+) diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch new file mode 100644 index 000..1a16a2c0101 --- /dev/null +++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch @@ -0,0 +1,21 @@ +--- a/mariadb_config/libmariadb.pc.in b/mariadb_config/libmariadb.pc.in +@@ -7,13 +7,12 @@ + # + + prefix=@CMAKE_INSTALL_PREFIX@ +-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ +-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ ++includedir=${prefix}/include ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + + Name: libmariadb + Version: @CPACK_PACKAGE_VERSION@ ++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ + Description: MariaDB Connector/C dynamic library +-Cflags: -I${includedir} +-Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@ +- +- ++Cflags: -I${includedir}/mariadb ++Libs: -L${libdir} -lmariadb diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild index b6cc03960be..2e5ed26b63e 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild @@ -72,6 +72,7 @@ multilib_src_configure() { -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT:STRING=$(usex kerberos DYNAMIC OFF) -DMARIADB_UNIX_ADDR="${EPREFIX%/}/var/run/mysqld/mysqld.sock" -DINSTALL_LIBDIR="$(get_libdir)" + -DINSTALL_PCDIR="$(get_libdir)/pkgconfig" -DINSTALL_PLUGINDIR="$(get_libdir)/mariadb/plugin" -DINSTALL_BINDIR=bin -DWITH_UNIT_TESTS=$(usex test ON OFF)
[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/files/, dev-db/mariadb-connector-c/
commit: ea877c3b3848900bd9b42ef61ec137220343507f Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Dec 2 23:08:58 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Dec 3 00:07:59 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea877c3b dev-db/mariadb-connector-c: bump to v3.0.7 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> dev-db/mariadb-connector-c/Manifest | 1 + ...ariadb-connector-c-3.0.7-fix-pkconfig-file.patch | 21 + ....ebuild => mariadb-connector-c-3.0.7.ebuild} | 2 +- .../mariadb-connector-c-.ebuild | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest index 42e70beae03..46ec03744d9 100644 --- a/dev-db/mariadb-connector-c/Manifest +++ b/dev-db/mariadb-connector-c/Manifest @@ -1 +1,2 @@ DIST mariadb-connector-c-3.0.6-src.tar.gz 666819 BLAKE2B 7245c0e13e569454d1cc70e3579afcbd53c64a0a7e828012b38d73f7d737a81b4fdf0363bd1b156dae783806a51773dbceb2ea06621bd4a73773edb78a70249a SHA512 6a41efacff1840eb8ddd8b34d8894b51f260444c76a1344f9ac9b675fd8492d44716338e4c11594d80118b12d90f75430304282650bce0d5f64179df6cc14d8e +DIST mariadb-connector-c-3.0.7-src.tar.gz 667274 BLAKE2B 75d2d548d51889aecc8af56cbeb61f5eaf21e60924b70dd0559214de464eae209743febdb5d443797f853bc902352f7333aefe84cb367f61f7bf2c341a4a8ac2 SHA512 70facae6234f180d94c0526845a3bf7723d6de3b6871544cb8cea35311fec0537c6342fbf4f024d0dca58ee618642c38748ae73628fcba334064a3c15d307219 diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch new file mode 100644 index 000..1a16a2c0101 --- /dev/null +++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.7-fix-pkconfig-file.patch @@ -0,0 +1,21 @@ +--- a/mariadb_config/libmariadb.pc.in b/mariadb_config/libmariadb.pc.in +@@ -7,13 +7,12 @@ + # + + prefix=@CMAKE_INSTALL_PREFIX@ +-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@ +-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@ ++includedir=${prefix}/include ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + + Name: libmariadb + Version: @CPACK_PACKAGE_VERSION@ ++URL: https://mariadb.com/kb/en/library/mariadb-connector-c/ + Description: MariaDB Connector/C dynamic library +-Cflags: -I${includedir} +-Libs: -L${libdir} -lmariadb @extra_dynamic_LDFLAGS@ +- +- ++Cflags: -I${includedir}/mariadb ++Libs: -L${libdir} -lmariadb diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild similarity index 98% copy from dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild copy to dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild index 1b2b77025ff..b6cc03960be 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.7.ebuild @@ -55,7 +55,7 @@ RDEPEND="${DEPEND} " PATCHES=( "${FILESDIR}"/gentoo-layout-3.0.patch - "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch + "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch ) src_configure() { diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild index 1b2b77025ff..b6cc03960be 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-.ebuild @@ -55,7 +55,7 @@ RDEPEND="${DEPEND} " PATCHES=( "${FILESDIR}"/gentoo-layout-3.0.patch - "${FILESDIR}"/${PN}-3.0.6-provide-pkconfig-file.patch + "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch ) src_configure() {