| 1 |
commit: 2770aa8433053443ce07a50cd08aa2edda6dc4f7 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 2 21:20:22 2022 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 2 21:20:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2770aa84 |
| 7 |
|
| 8 |
dev-db/mysql-connector-c++: update EAPI 7 -> 8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/834439 |
| 11 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 12 |
|
| 13 |
...ebuild => mysql-connector-c++-1.1.12-r2.ebuild} | 34 +++++++++------------- |
| 14 |
1 file changed, 13 insertions(+), 21 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r2.ebuild |
| 17 |
similarity index 55% |
| 18 |
rename from dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild |
| 19 |
rename to dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r2.ebuild |
| 20 |
index 889a975cea72..e4f89b29bcd2 100644 |
| 21 |
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r1.ebuild |
| 22 |
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.12-r2.ebuild |
| 23 |
@@ -1,21 +1,21 @@ |
| 24 |
# Copyright 1999-2022 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI="7" |
| 28 |
+EAPI=8 |
| 29 |
|
| 30 |
-inherit cmake-utils flag-o-matic |
| 31 |
+inherit cmake flag-o-matic |
| 32 |
|
| 33 |
DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" |
| 34 |
HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" |
| 35 |
-URI_DIR="Connector-C++" |
| 36 |
-SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz" |
| 37 |
+SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C++/${P}.tar.gz" |
| 38 |
|
| 39 |
LICENSE="Artistic GPL-2" |
| 40 |
SLOT="0/7" |
| 41 |
KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 sparc x86" |
| 42 |
-IUSE="debug examples gcov static-libs" |
| 43 |
+IUSE="debug examples gcov" |
| 44 |
|
| 45 |
-DEPEND="dev-db/mysql-connector-c:= |
| 46 |
+DEPEND=" |
| 47 |
+ dev-db/mysql-connector-c:= |
| 48 |
dev-libs/boost:= |
| 49 |
dev-libs/openssl:0= |
| 50 |
!<dev-db/mysql-connector-c-6.1.8" |
| 51 |
@@ -28,31 +28,23 @@ PATCHES=( |
| 52 |
|
| 53 |
src_configure() { |
| 54 |
# native lib/wrapper needs this! |
| 55 |
- append-flags "-fno-strict-aliasing" |
| 56 |
+ append-flags -fno-strict-aliasing |
| 57 |
|
| 58 |
local mycmakeargs=( |
| 59 |
-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF |
| 60 |
-DMYSQLCPPCONN_ICU_ENABLE=OFF |
| 61 |
- -DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug ON OFF) |
| 62 |
- -DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov ON OFF) |
| 63 |
- -DINSTALL_DOCS="/usr/share/doc/${PF}" |
| 64 |
+ -DMYSQLCPPCONN_TRACE_ENABLE=$(usex debug) |
| 65 |
+ -DMYSQLCPPCONN_GCOV_ENABLE=$(usex gcov) |
| 66 |
+ -DINSTALL_DOCS="share/doc/${PF}" |
| 67 |
-DMYSQL_CXX_LINKAGE=0 |
| 68 |
-DMYSQL_INCLUDE_DIR=$(mysql_config --variable=pkgincludedir) |
| 69 |
) |
| 70 |
- |
| 71 |
- cmake-utils_src_configure |
| 72 |
+ cmake_src_configure |
| 73 |
} |
| 74 |
|
| 75 |
src_install() { |
| 76 |
- cmake-utils_src_install |
| 77 |
- |
| 78 |
- # static lib has wrong name so we need to rename it |
| 79 |
- if use static-libs; then |
| 80 |
- mv "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a \ |
| 81 |
- "${ED}"/usr/$(get_libdir)/libmysqlcppconn.a || die |
| 82 |
- else |
| 83 |
- rm -f "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a |
| 84 |
- fi |
| 85 |
+ cmake_src_install |
| 86 |
+ rm "${ED}"/usr/$(get_libdir)/libmysqlcppconn-static.a || die |
| 87 |
|
| 88 |
# examples |
| 89 |
if use examples; then |
Archives