From c8a77dfe4d3d307c1d5dd2650b7297447d8b609d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Jan 2019 16:58:08 +0000 Subject: gentoo resync : 12.01.2019 --- dev-db/Manifest.gz | Bin 20165 -> 20165 bytes dev-db/cpp-driver/Manifest | 2 +- dev-db/cpp-driver/cpp-driver-2.9.0.ebuild | 6 +- dev-db/etcd/Manifest | 2 +- dev-db/etcd/files/etcd.initd | 5 +- dev-db/libzdb/Manifest | 2 +- dev-db/libzdb/libzdb-3.1.ebuild | 4 +- dev-db/lmdb/Manifest | 2 +- dev-db/lmdb/lmdb-0.9.22.ebuild | 9 +- dev-db/mariadb-connector-c/Manifest | 5 +- ...riadb-connector-c-3.0.8-fix-pkconfig-file.patch | 21 ++ .../mariadb-connector-c-3.0.8.ebuild | 103 +++++++ .../mariadb-connector-c-9999.ebuild | 6 +- dev-db/mydumper/Manifest | 6 +- dev-db/mydumper/mydumper-0.9.3-r1.ebuild | 4 +- dev-db/mydumper/mydumper-0.9.5-r1.ebuild | 4 +- dev-db/mydumper/mydumper-0.9.5.ebuild | 4 +- dev-db/mysql++/Manifest | 2 +- dev-db/mysql++/mysql++-3.2.3.ebuild | 4 +- dev-db/mysql-connector-c++/Manifest | 7 + ...ysql-connector-c++-1.1.11-fix-cpp-linking.patch | 15 + .../mysql-connector-c++-1.1.11-fix-mariadb.patch | 43 +++ .../mysql-connector-c++-8.0.13-fix-build.patch | 329 +++++++++++++++++++++ .../mysql-connector-c++-1.1.11.ebuild | 63 ++++ .../mysql-connector-c++-8.0.13.ebuild | 40 +++ dev-db/mysql-connector-c/Manifest | 2 +- .../mysql-connector-c-6.1.11-r1.ebuild | 4 +- dev-db/mysql-workbench/Manifest | 2 - .../mysql-workbench-6.3.4-r1.ebuild | 106 ------- dev-db/pgbouncer/Manifest | 2 +- dev-db/pgbouncer/pgbouncer-1.9.0.ebuild | 4 +- dev-db/pgpool2/Manifest | 14 +- dev-db/pgpool2/pgpool2-3.7.0.ebuild | 4 +- dev-db/pgpool2/pgpool2-3.7.1.ebuild | 4 +- dev-db/pgpool2/pgpool2-3.7.3.ebuild | 4 +- dev-db/pgpool2/pgpool2-3.7.5.ebuild | 4 +- dev-db/pgpool2/pgpool2-3.7.7.ebuild | 4 +- dev-db/pgpool2/pgpool2-4.0.2.ebuild | 4 +- dev-db/pgpool2/pgpool2-9999.ebuild | 4 +- dev-db/postgis/Manifest | 2 +- dev-db/postgis/postgis-2.5.1-r1.ebuild | 4 +- dev-db/postgresql/Manifest | 10 +- dev-db/postgresql/postgresql-10.6.ebuild | 4 +- dev-db/postgresql/postgresql-9.3.25.ebuild | 4 +- dev-db/postgresql/postgresql-9.4.20.ebuild | 4 +- dev-db/postgresql/postgresql-9.5.15.ebuild | 4 +- dev-db/postgresql/postgresql-9.6.11.ebuild | 4 +- dev-db/sqlite/Manifest | 2 +- dev-db/sqlite/sqlite-3.25.3.ebuild | 2 +- 49 files changed, 705 insertions(+), 185 deletions(-) create mode 100644 dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch create mode 100644 dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild create mode 100644 dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch create mode 100644 dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch create mode 100644 dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch create mode 100644 dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild create mode 100644 dev-db/mysql-connector-c++/mysql-connector-c++-8.0.13.ebuild delete mode 100644 dev-db/mysql-workbench/mysql-workbench-6.3.4-r1.ebuild (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 201800c02a59..5af29acc21b3 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/cpp-driver/Manifest b/dev-db/cpp-driver/Manifest index 7a0043be476b..7e38ed7b855e 100644 --- a/dev-db/cpp-driver/Manifest +++ b/dev-db/cpp-driver/Manifest @@ -1,5 +1,5 @@ DIST cpp-driver-2.8.1.tar.gz 1526453 BLAKE2B 8ab4332f00a1da9f35be6fa8651ace54d71fbac76223c1665089096376dcfd6f5976beb83c25094f531786a4aa628aa4e288540ef7bcb8cc5221625dcd1ccf78 SHA512 1b303e874d6b24cb429ec92d6030880ad7d7b28b167a25c62060626c206f623863ecf58eab33e89b0efea4a474ca9500e1701b719ac203c76b0875c2b5d0a1c8 DIST cpp-driver-2.9.0.tar.gz 9178108 BLAKE2B 22c51d050dc65303dd6b584f0a89e510905bf084ff5e45a543666675a4e0b904c11895c9a7dd3d0df2fb12c1e2e58e8530c4113706c8b2548adb0b6f9431419c SHA512 45c6d58b1d287d142c9d7d6b1e28114683648a3634f44b185208fa44da64d4c8a9d485b3956a0cf7429e96f74faa588de832de30265dfa17782ca90e8163a0c1 EBUILD cpp-driver-2.8.1.ebuild 627 BLAKE2B 212092960beee408c49866469a4e45ec48535feba75ef2c3ed176bb281145ce24cd5b2ee340878d7557cd1e14f0fc8c6707e668597909bb92623f5f32bdd7240 SHA512 f423cd87d8fa5e1f42a94222b054bbba1ba2855369fe17aaa94a480515a5b3a200697a8a5570f41d7ac032ec985c370e025786cacee9b2e63e87100750a09e53 -EBUILD cpp-driver-2.9.0.ebuild 626 BLAKE2B f6a87bb80ec4adce79bd4c64cea7efc97a393f3e6a4f61bea421e2aa83e5019b8a22b157f0e909624447a31bfc61700787fc4ad6f8a8d548b8a46d99e6722b58 SHA512 919b810c65293e7bdb17c80e29e3538dd100fa4b0b17650a30b4d41d516d0555eca0a295291a17da9fb60c05f6e5c57214ee1d6b9d11721f25100b2d88d038b7 +EBUILD cpp-driver-2.9.0.ebuild 625 BLAKE2B ab741c2ba9d2039bbc1743d6315c8374e148b0e3fc37ef62b50514eb628ec5d53915363347b85e76a5cd0e50a491f770692c7445ef743a65aaced9087ff33096 SHA512 46374aa29a2a0d2bd213cec83ca1a4ebd24704d5ecebaff334d1c81d501937aab164640f8ce5dbb17c26c3d367f6eedaf50e0a5dbec9bac98bac28e177da85c5 MISC metadata.xml 553 BLAKE2B 9cbe9ca09b891555c6f22e2a6da3fc24d938e5bfd30950c3f58e3e028f36a6784a0062c042b30c8215552191f9ccbb629693a059258a067effb97cd594e65fcb SHA512 7e02ca90a667319bd669dc10dbba7abc1018a1c4941fc213af728bd6b7afe48e5fca888f3f6d19798937f6fa5d8188cd784cd37f0ff690bc2295abab8ae408f8 diff --git a/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild b/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild index 66d76de1def7..961a2bbec060 100644 --- a/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild +++ b/dev-db/cpp-driver/cpp-driver-2.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,8 +17,8 @@ IUSE="libressl ssl" RDEPEND=" dev-libs/libuv:= ssl? ( - !libressl? ( dev-libs/openssl:= ) - libressl? ( dev-libs/libressl:= ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) )" DEPEND="${RDEPEND}" diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest index 011560c6a0c3..1da5c647d386 100644 --- a/dev-db/etcd/Manifest +++ b/dev-db/etcd/Manifest @@ -1,6 +1,6 @@ AUX etcd.conf 978 BLAKE2B 2aaecc5c7b3d0b7a44f8de65d8362333bdcf9616de55a2c4fa1551eca91d80061c146165f1bf077c1d93e6874b4444384889875b3fe81299e46e10fd6e24d8ec SHA512 3b543104df93ebd6013b5e50c1e17b947e089bf27ba976859574f9fa57f2ed0ba16342984d12a68a00ff6745f37d229b1fe3206df7d713805e289d029774be0d AUX etcd.confd 129 BLAKE2B 1d7aff8c57e4dc0f4348a5de4bfff0a1552e8b4d228ee0f0ba2eb6eb944daefae1b5b55ba6b5416697b923e9144884d0828612403a11e627f8f7e82fa7444f68 SHA512 a08b1c1701370dc23ebd86db915d1e65747dc4ca57ce44d8cba6cf8434d5711786ac96725eed3285f4ba7cdde25ea25a51539d6cd74fc2f4b713f48cda15c4c3 -AUX etcd.initd 813 BLAKE2B 3d63e753f2a04b1cba20ddfdbc7d67acd2be14caff08de74d498e8819cc54680693e832658ed83ab8bfc4c93498daf90b1a9b7bcb541f16cf06a608b003d005f SHA512 f86df57fc91e98310f00803b29d149a8a2850028b2a349eebfe7fb4059e97f8232fd137a6eeaa3a8edf29922e2552c6a4af10ed40696f0775b65645ac2c57859 +AUX etcd.initd 821 BLAKE2B 5eba7f0e8d134ff45caba8c1eb3aaf6afb412082b9a5df95925f36fb83841be15ffca0f0f9b7c7c4bc6989665aa4e8a51fc73b0c66b5d2f960c6795fc21040da SHA512 5b8c12285b5d609abdfc5440589f7703951f6550e53783fe5e7eb3a4a3b12625d6f0526cbaf7e9922de3fbf0b86ff9d3f40de1ef55f26261f61d11d177d9a580 AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12cb0ff7fb877527df33a91dedcaa4bbbffa190b4f9c2f53868aeca093b93e9cad50718a23eb5fdd46 SHA512 64d3181a936f8bab635a17f90679041c2d70a712307928feae03a517ad02252fc37e25738979bc1ccd0657ef70439e65cb0306759bec3939e940ec382a02d94f AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce diff --git a/dev-db/etcd/files/etcd.initd b/dev-db/etcd/files/etcd.initd index c9caecf7ff69..a2c67d0723da 100644 --- a/dev-db/etcd/files/etcd.initd +++ b/dev-db/etcd/files/etcd.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 pidfile=/run/${RC_SVCNAME}.pid @@ -23,7 +23,7 @@ depend() { after bootmisc } -start_pre() { +start() { if [ ! -d "${LOGPATH}" ] ; then mkdir -p "${LOGPATH}" chown "${command_user}:${command_user}" "${LOGPATH}" @@ -32,4 +32,5 @@ start_pre() { mkdir -p "${ETCD_DATA_DIR}" chown "${command_user}:${command_user}" "${ETCD_DATA_DIR}" fi + default_start } diff --git a/dev-db/libzdb/Manifest b/dev-db/libzdb/Manifest index 5841b96b0423..092d63112af8 100644 --- a/dev-db/libzdb/Manifest +++ b/dev-db/libzdb/Manifest @@ -9,5 +9,5 @@ EBUILD libzdb-2.11.2.ebuild 1951 BLAKE2B 302b935d57edf84f87d99e32f1b44f2f0e4e85a EBUILD libzdb-2.11.3.ebuild 1951 BLAKE2B 302b935d57edf84f87d99e32f1b44f2f0e4e85a175774bfd90f8528095b885e45917079947c057f6cb6d4ab6da12d6233a047275012a9a0e5f1d4ada5e29218f SHA512 d928c77f97d1f974561ef951fcdb3774af7880e6a06705df21698012a747475fb64b3c44248bbe4086e13e6373b038896d35c5cc877e57f2bbc3693498799a25 EBUILD libzdb-2.12.ebuild 1949 BLAKE2B 69c6a78a97234e1566c9b4caf7390ea4799252d7a1221639548e15f21445d0ba45ef63ed2607ddb220b622ae54cc3ba70df7a3108a769c78dcfc117c6e88b1ee SHA512 e463dc5edeec408ae42d282319b9cd4e49338fb7cf86a7c26de5ca808d9e4159fce8610f14fb881ae999626be373db4918e5f9162387f0663a7fc99cc6372ca3 EBUILD libzdb-3.0.ebuild 1951 BLAKE2B 302b935d57edf84f87d99e32f1b44f2f0e4e85a175774bfd90f8528095b885e45917079947c057f6cb6d4ab6da12d6233a047275012a9a0e5f1d4ada5e29218f SHA512 d928c77f97d1f974561ef951fcdb3774af7880e6a06705df21698012a747475fb64b3c44248bbe4086e13e6373b038896d35c5cc877e57f2bbc3693498799a25 -EBUILD libzdb-3.1.ebuild 1947 BLAKE2B 9f4f0cc56ef76cd541f1b1cd3e0bcec1ca726926fbf696b29cdb67223bca088ca2628196198ad1c8d8b02c0e0318452e3ab8244209108eef8e443bec370fba66 SHA512 88f77f36dfa481d6886ecf767060fefd2064b2c31ddd950c64a2e6a34679951574f4cae330ab006ca4101c42b4cfa670f55a909fed1d5bbcb786dcc235a49744 +EBUILD libzdb-3.1.ebuild 1947 BLAKE2B 38bad6b83db476257e1996b547668fe6270a5bef50bd94f444cc9c79a71a57ef089961c9ab6fee965cf45da18c6adfb280eaeebe1a1d7e666b01b7c4b667f0f6 SHA512 8ce0096085f71c4a96699816cf916fc1916318a5185b48dd0975b4cfbd062d9ccd36250f47f4232c7ef83a9893ba11adc0d006f6ba9f18e9a4c8e2bb33f0011d MISC metadata.xml 252 BLAKE2B 607ece46067f5be04418014fa63f92ad521ce98dcd952feb4fcd1bcfcb16fd520bddb62e7f6e14486a7f45a2505cc258067adc1017af98ba9e69a78244bc62a5 SHA512 e7da72c861777d74f6459375f6f43e39f9e4dda779352c3e8942fcd658dcce6f995f016e34a74b331533f1815fba3faa9af024956a804f38a411990878e4bad6 diff --git a/dev-db/libzdb/libzdb-3.1.ebuild b/dev-db/libzdb/libzdb-3.1.ebuild index 4de988ae6ebd..21ce5f4ef1c1 100644 --- a/dev-db/libzdb/libzdb-3.1.ebuild +++ b/dev-db/libzdb/libzdb-3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -20,7 +20,7 @@ RESTRICT=test RDEPEND="mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql ) sqlite? ( >=dev-db/sqlite-3.7:3[unlock-notify(+)] ) - ssl? ( dev-libs/openssl )" + ssl? ( dev-libs/openssl:0= )" DEPEND="${RDEPEND} virtual/pkgconfig doc? ( app-doc/doxygen )" diff --git a/dev-db/lmdb/Manifest b/dev-db/lmdb/Manifest index ca6d8b6970c6..87560f5920c5 100644 --- a/dev-db/lmdb/Manifest +++ b/dev-db/lmdb/Manifest @@ -6,5 +6,5 @@ DIST LMDB_0.9.22.tar.gz 143468 BLAKE2B 125b447344cc601ad8af1c3cf0ba4d05474c8e7a4 EBUILD lmdb-0.9.18.ebuild 1239 BLAKE2B cf75faf2a5fe6fd306eb7a28c2372a3bcb3a4395fb26f80e4beb9e99799a7c2d86755b2fe5d7172a24fc40d00519ee4a70cdd179f51f836853950311ae8d2549 SHA512 18b2c236625e0fd311521148dfd029a74c428459ab61847105d9e27cf2a602bf107af9147d11ada60a1efd972e29ea26ea59f7d7bd9848cf2dc145a05967fff9 EBUILD lmdb-0.9.19.ebuild 1849 BLAKE2B d9e235c2aa7ff06d2b6cdf6b6e29544a02d1aaa7ae7248afdf661c3ba4ea0ddbb0e7ed9ec7796e73b1865a430a2a8380236a3206e54a8eca054ba95ff9e1d820 SHA512 791cca180d0d429d64f197a627dd8d94c48e8502d38011be358fc901e521cdb3996653b2cc0c519b9e1e5a58815134e99e64f09d50bcc72444eb2990ac2879ad EBUILD lmdb-0.9.21-r1.ebuild 1960 BLAKE2B b2686f3859333a1f60b4e1053e40e7214ed3196e35b88956ada044f6655c7ae3a472e999db56d08bfeeb3d6520853b1091dc6d8a321827e67903c87e8aebbe15 SHA512 288aec449c08655fe4572451f2960cd6c489158198fc787cb5ec3bd489578995f651bd5d13c36924ef35c2497dd157ae46a78dc9b5e18b31f913753a2a8157bf -EBUILD lmdb-0.9.22.ebuild 2130 BLAKE2B 2312bdfff558e5241c5afd70ceee42e766db99e6ae70b707c9d009a87c94f9422e8eed34dab9f9df2b5fc9845146c4650e901a5b3538f9fd75a3a9043d422e6c SHA512 de0b66a2f51abedd8ef5508eaa7ca2c3e293442005f4b1a46695edecda1a51c9b02237e9ed9d776d1f856b8d301164cff815514a488446cc2ec2af0952b260c2 +EBUILD lmdb-0.9.22.ebuild 2322 BLAKE2B 119d9c927f512ecb24aaeaba41641e3fa7bcfe99a9a2c31f27a6152d6a7d1976ec139677ea90a26e3e76f1aa011e16a554d7ca10391ca4d919de56649916f4a8 SHA512 c7f3540619dc06ef582539730f5060c1a2e784c410b91c7fc977749c3e78829e59cf424b6c9c15700168a22f48b22ae554700961374f42f339cd352c50d8c6d9 MISC metadata.xml 540 BLAKE2B b064697aa562165a627cb1be8cce847c8046d10cf184a4563a632c43ebd1916ad866e843efd49ae5659e379f3695514005b9d601117719c9f48652dab48dcea8 SHA512 7ff1fddaca73c5d7b4a6a9ada9a7aad60e16c8c7063ad5cd9cf57301f504f6e0fe53bf568dec83abf522c2c099d2b3b2463619df17077ebaa3b39bd67bd738c4 diff --git a/dev-db/lmdb/lmdb-0.9.22.ebuild b/dev-db/lmdb/lmdb-0.9.22.ebuild index 3219ba9b0b51..9e4e027f8378 100644 --- a/dev-db/lmdb/lmdb-0.9.22.ebuild +++ b/dev-db/lmdb/lmdb-0.9.22.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,6 +21,11 @@ S="${WORKDIR}/${PN}-LMDB_${PV}/libraries/liblmdb" src_prepare() { eapply_user + if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -lt 10 ]] ; then + # posix_memalign isn't available before 10.6, but on OSX + # malloc is always aligned for any addressable type + sed -i -e '/(__APPLE__)/a#define HAVE_MEMALIGN 1\n#define memalign(X,Y) malloc(X)' mdb.c || die + fi multilib_copy_sources } @@ -38,8 +43,6 @@ multilib_src_configure() { "Makefile" || die if [[ ${CHOST} == *-solaris* ]] ; then - # ensure sigwait has a second sig argument - append-cppflags -D_POSIX_PTHREAD_SEMANTICS # fdatasync lives in -lrt on Solaris 10 [[ ${CHOST#*-solaris2.} -le 10 ]] && append-ldflags -lrt fi diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest index 4709841d2fb9..d98340b02e89 100644 --- a/dev-db/mariadb-connector-c/Manifest +++ b/dev-db/mariadb-connector-c/Manifest @@ -2,9 +2,12 @@ AUX gentoo-layout-3.0.patch 311 BLAKE2B 4c2f0ae8aa53d605bcaf134274d3b549ec970b43 AUX mariadb-connector-c-3.0.6-provide-pkconfig-file.patch 1838 BLAKE2B 454433d5815e818bb3cb08241b1629e7cb2e8c6b33d09e241db11cc7f18e73a8cbf40567fe47a613c420581f8487c39478bcbef22da4ba21b77a10f71e4b11ef SHA512 a3ec1a1702d2d5ae5ea6ef93e9bc7f01df548c65574b177a20e8b29694b078ebd67a409ed253467d1db38895e66285eaf73e604a507bfb09384bc3d15325cb60 AUX mariadb-connector-c-3.0.7-fix-pkconfig-file-r1.patch 998 BLAKE2B 7c07b70ec752832d62757ee08a6f56b59d47e11c68d5333308878ef6b030a3b959bf2d6ba6ec37f0960f1e5f0be702c974f53c81886cc7a8348d4eeca4eaaa03 SHA512 06fdd1bdcbe9550257e4947bae25870525f59a729c7b78eee703990b17b9ada152d32f80f1bb57f67455bc143725a7f166cf34f9de1edcd40c49e49a2d2a6826 AUX mariadb-connector-c-3.0.7-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334ebfdbfcf69df16e948dfd0c46c194d56ba44516bfb647ff518d766170d95c3c86f39211555f25993d95b57c516a357bb3db52b8428273aad48 SHA512 9949b6e6ea2fe325279a6459ce6119524444dbec65cd509549bdc89d5a4c9afb6c39abe2d4e1ab64f6c7e917279f83a323f93d3fe7bd79a8d519976f8c786028 +AUX mariadb-connector-c-3.0.8-fix-pkconfig-file.patch 630 BLAKE2B 4d087835c14334ebfdbfcf69df16e948dfd0c46c194d56ba44516bfb647ff518d766170d95c3c86f39211555f25993d95b57c516a357bb3db52b8428273aad48 SHA512 9949b6e6ea2fe325279a6459ce6119524444dbec65cd509549bdc89d5a4c9afb6c39abe2d4e1ab64f6c7e917279f83a323f93d3fe7bd79a8d519976f8c786028 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 EBUILD mariadb-connector-c-3.0.6-r1.ebuild 2816 BLAKE2B 38450ea224a5f0e960abc65ebce37121ed02d1ec0d5bfc7c2d7a124c9ffd77f10090247493eb0c758b991e40cb8a845fe13355ba8e32b64bb2ca90fa957aca76 SHA512 f5670d8174889c3ccc8b7693cdd97d39c1c0d597d5980c6a5d15317662bffebea1e3b6573c438b076362c8c46649dedf8f285d90ac4f5ffb4eed4d4db82b0378 EBUILD mariadb-connector-c-3.0.7-r1.ebuild 2828 BLAKE2B 3c7d2eefda6d8ee874c7570827ab015223f9bab0d7c649184d02492cdd319e2a7c281818cf633736e68f000203f23093ad40fdab31e185b4d5d1e1da7488992f SHA512 f45c2e1980bb4be51137b2658213a689acdc13f449704c2406f089179fb8ec897119b3c04fda353ffaad86c7f8bc33e2c2b25b6b56ec1be1eed8be68274970a6 -EBUILD mariadb-connector-c-9999.ebuild 2864 BLAKE2B 0bbc75c16ce0544e008b3e49df556b8c54875e93d04b706fd2f8e338295a3d02140a9eb64819c3a7e2b5485b4e17cd80528dd212330d3b9706b84e8529b43441 SHA512 b01b2b8267a532773ca62931572541ad98b13890297e39bf52f28f6d568fa82febe5662b59016fa17691f96207d3152d4f79e46a910a3e94d5455d312d3de0f3 +EBUILD mariadb-connector-c-3.0.8.ebuild 2869 BLAKE2B 39729738d90fbaba3033d87eefd808e5c14d04f746fa2b58f656822943ddb74b350c4c7c90eedf18657e2b793916dd1fd508439cd3bec1e70fb5a2d5e6200aab SHA512 0e55ef203af16d3cb6e000802a1d878d316806ab15f3945e12e1c61a9c14c5aef382a7776065d44376c496ed2558bbfd6bfcc86e7868355ee1f9a356460e17bd +EBUILD mariadb-connector-c-9999.ebuild 2869 BLAKE2B 39729738d90fbaba3033d87eefd808e5c14d04f746fa2b58f656822943ddb74b350c4c7c90eedf18657e2b793916dd1fd508439cd3bec1e70fb5a2d5e6200aab SHA512 0e55ef203af16d3cb6e000802a1d878d316806ab15f3945e12e1c61a9c14c5aef382a7776065d44376c496ed2558bbfd6bfcc86e7868355ee1f9a356460e17bd MISC metadata.xml 324 BLAKE2B fab5394015cd337683f65a257556ed0f15e35826bb0a6ce75a7033cd5931455ff2bed527064d698e9b3165f2cfcaff8a4bdfcad0b830482ae2e4389a79d529fb SHA512 1fe9e5d5d9f8e817ce49117fbcc6a6d706a090752606647496f2b7a25de51bfb641a408ff0cdaf626d83eb5c314d2e28c3f29532307d942cb41498edf4b44aa6 diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-fix-pkconfig-file.patch new file mode 100644 index 000000000000..1a16a2c01015 --- /dev/null +++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.0.8-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-3.0.8.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild new file mode 100644 index 000000000000..c957edaec2de --- /dev/null +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.0.8.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +VCS_INHERIT="" +if [[ "${PV}" == 9999 ]] ; 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}] + 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? ( + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + ) + ) + " +RDEPEND="${DEPEND} + mysqlcompat? ( + !dev-db/mysql[client-libs(+)] + !dev-db/mysql-cluster[client-libs(+)] + !dev-db/mariadb[client-libs(+)] + !dev-db/mariadb-galera[client-libs(+)] + !dev-db/percona-server[client-libs(+)] + !dev-db/mysql-connector-c ) + !>=dev-db/mariadb-10.2.0[client-libs(+)] + " +PATCHES=( + "${FILESDIR}"/gentoo-layout-3.0.patch + "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch +) + +src_configure() { + # bug 508724 mariadb cannot use ld.gold + tc-ld-disable-gold + multilib-minimal_src_configure +} + +multilib_src_configure() { + local mycmakeargs=( + -DWITH_EXTERNAL_ZLIB=ON + -DWITH_SSL:STRING=$(usex ssl $(usex gnutls GNUTLS OPENSSL) OFF) + -DWITH_CURL=$(usex curl ON OFF) + -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) + ) + cmake-utils_src_configure +} + +multilib_src_compile() { + cmake-utils_src_compile +} + +multilib_src_install() { + cmake-utils_src_install + if use mysqlcompat ; then + dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so.19 + dosym libmariadb.so.3 /usr/$(get_libdir)/libmysqlclient.so + fi +} + +multilib_src_install_all() { + if ! use static-libs ; then + find "${D}" -name "*.a" -delete || die + fi + if use mysqlcompat ; then + dosym mariadb_config /usr/bin/mysql_config + dosym mariadb /usr/include/mysql + fi +} 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 2e5ed26b63e0..c957edaec2de 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ else 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 ~ppc64 ~s390 ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" fi inherit cmake-utils multilib-minimal toolchain-funcs ${VCS_INHERIT} @@ -55,7 +55,7 @@ RDEPEND="${DEPEND} " PATCHES=( "${FILESDIR}"/gentoo-layout-3.0.patch - "${FILESDIR}"/${PN}-3.0.7-fix-pkconfig-file.patch + "${FILESDIR}"/${PN}-3.0.8-fix-pkconfig-file.patch ) src_configure() { diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest index fd83bc33acbc..b18e9f838f60 100644 --- a/dev-db/mydumper/Manifest +++ b/dev-db/mydumper/Manifest @@ -2,7 +2,7 @@ AUX mydumper-atomic.patch 948 BLAKE2B 78bc073083a44ad21346e419de6f76195d3e9c1687 AUX mydumper-mariadb-define.patch 766 BLAKE2B 26d8b037de5362bb456f19ed85d5b20cb901c63ed307b2377d58931d5fa8940bd3bb97632d3f9976bcb1723a36b8cebdc0a74723a555abc54800b3afe5fea673 SHA512 839061da9fcfc16d0729bf8ba62a5c22a03aba1c089006efd600020a8d618af0f8d962f6a3a92c5ff3acb9847d3a7944d865c035df93a567d7f21bb184e9dc53 DIST mydumper-0.9.3.tar.gz 45320 BLAKE2B 6e6d4420ced29d4ea77aa257ee155ce0810fe7d0ac3bf22c22156dfcfba35a3c461e4115d5814b5e0050331151a5b0c3bd819c1ecc534b6644972bf76de5d004 SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898 DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75 -EBUILD mydumper-0.9.3-r1.ebuild 1025 BLAKE2B bbaf77ab28323c82103b68aeee4222bf218554e45e05ae07467c18dc69e25f43ab2b1e70ddafa69cb8f2045d85c361511016de81c8d6aa20db7cdd25ffdbe614 SHA512 5b1a7b6669e4cfc85d0e32a9a5474de7dc00c27931c72219c1cd212139f616eaf492c76e749ea3cf94f88aa31d35455783b3ceb65943f9f82f34288dc037d64a -EBUILD mydumper-0.9.5-r1.ebuild 1054 BLAKE2B ab2776d3e913a6ee95906839878acde43c87c9bb04f901218a1e864601d60cd73a4e2329cae9abb5033501163d7535d4d1e1ecaf9785e4d6d09b98519ef371b6 SHA512 2d1b0e7a932a09114dc5e3848510700b81e6c086551e21fc41a966b0f116b0d96584908359879786f6c16cd6313800721b498ca53bb826380d6625c38786efb2 -EBUILD mydumper-0.9.5.ebuild 1026 BLAKE2B 6ded4d30e464888593beb8bf4d06441c02e17b28ff59ddb3aa9142b42dde1ccf00b05dac0977fe514d23e1be06099c217df778976a799451982bf9ac2948985c SHA512 37776222d7cc3cbcc5b520f1731d445841028aec63899a6bbfb2c1a931b78aef3987555404955f1c2742782cd599065eefbe04b6739460fc5642d4e0e606ba84 +EBUILD mydumper-0.9.3-r1.ebuild 1023 BLAKE2B 1b209fa847a4ed7ff7b4091e79a952f42ee0250c1748fe7cd67b60f80cbf0363c30016e04f79edc070303e6a0aae1f44d7ebee30ef3aa9c50120ebc9c9eb2f70 SHA512 460a697001f5fb2ceec2bbc23d7e9193b0ebc7fa10b1229456e4f3f3ffbd015c41815933389b4698e6fc7cad15e311ed7ce45d6046413df6b3ec7e9a7e966be7 +EBUILD mydumper-0.9.5-r1.ebuild 1055 BLAKE2B f8a5c5949143d378831c334be0ad6ed73f855cdc960701438824e5d1cc00cbdac34d8e04d1588da3e99aba7973f3c44a2ba7c341b38aed0e77252e73603cfdab SHA512 79eb47b52924ceaffa575071a1be629d5df07af5cb9238230d6c63b3ad4561a57f7a8cf5f2f5a92fe3580bbc7ba85b1ef2bfd0527d117d8e000e212540ec4495 +EBUILD mydumper-0.9.5.ebuild 1024 BLAKE2B 82e4eb89e5e9d266906b388089f6292c1bb6b93adb891a927ed8ac9f6cda6543a49ff736efdda62ccb0c310d7bea769f0f02704ab6707a3afb851160b9f891a6 SHA512 e49e1e09f402008a521dc8b9ea0ebfcde58509d080d23b58e4bdc7c5d00a45bdc4a811ef88fd088e2a9f919ade2d03ad98b702b497f047ae75046936ce48d3b7 MISC metadata.xml 448 BLAKE2B 141a4303111433ea46ec427dcf7942fae3165ea27b90c1d92f1fd4e4a82bbdea0476a7f5380250684ca763feb7ba7045bae9443329c260b0732452b3e639c5ea SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353 diff --git a/dev-db/mydumper/mydumper-0.9.3-r1.ebuild b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild index f95deef1be62..3778cfbe001a 100644 --- a/dev-db/mydumper/mydumper-0.9.3-r1.ebuild +++ b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ IUSE="doc" CDEPEND="dev-libs/glib:= dev-libs/libpcre:= - dev-libs/openssl:= + dev-libs/openssl:0= sys-libs/zlib:= virtual/mysql" DEPEND="${CDEPEND} diff --git a/dev-db/mydumper/mydumper-0.9.5-r1.ebuild b/dev-db/mydumper/mydumper-0.9.5-r1.ebuild index a924406ea685..078613262f27 100644 --- a/dev-db/mydumper/mydumper-0.9.5-r1.ebuild +++ b/dev-db/mydumper/mydumper-0.9.5-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ IUSE="doc" COMMON_DEPEND="dev-db/mysql-connector-c:= dev-libs/glib:= dev-libs/libpcre:= - dev-libs/openssl:= + dev-libs/openssl:0= sys-libs/zlib:=" DEPEND="${COMMON_DEPEND} virtual/pkgconfig diff --git a/dev-db/mydumper/mydumper-0.9.5.ebuild b/dev-db/mydumper/mydumper-0.9.5.ebuild index 1bdc840bd0b9..904232ebd4b6 100644 --- a/dev-db/mydumper/mydumper-0.9.5.ebuild +++ b/dev-db/mydumper/mydumper-0.9.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -15,7 +15,7 @@ IUSE="doc" CDEPEND="dev-libs/glib:= dev-libs/libpcre:= - dev-libs/openssl:= + dev-libs/openssl:0= sys-libs/zlib:= virtual/mysql" DEPEND="${CDEPEND} diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest index 604bf023abf1..670b38b491b9 100644 --- a/dev-db/mysql++/Manifest +++ b/dev-db/mysql++/Manifest @@ -11,6 +11,6 @@ DIST mysql++-3.2.3.tar.gz 3241023 BLAKE2B 5faa5711c7ed7c64346013bd1ca6e7dc20e5b2 DIST mysql++-3.2.4.tar.gz 4594696 BLAKE2B 7e0553b0e22bb3607a914fc7756ec192465af546749b0147a97558fb3d397e504f4552dcbc783f5bcc934e51fd1dac863e5479c4af3053d394a51c94cd825ee0 SHA512 69e23c211240854b59951bdb1cecc57f2f818d822a977942177e65195900dbdcc62d598c3e90c18f4a0a37e5340df7a149719c45b791de59c03d1f1259c5f4fd EBUILD mysql++-2.3.2-r1.ebuild 1410 BLAKE2B 6acbf4805dc44570d1d1b9df9a1c8769d3c13c9658b74cbad2052313d0538552693da45f2558be1afea78f80d6492ec36a9c02389ecbc054c60610ad521030eb SHA512 badefe7d214bd55b81965070b814b94c15fe3635d87c265225d2f9fef02360c3e09adeeb79a75c9990e89d596f111fc958c2a5fcec63624f14404192e4a26884 EBUILD mysql++-3.2.1.ebuild 901 BLAKE2B 0e6c3feef947f749d7124284dad8ce91d14fed57d7a24730482dea19646a8b675113577138d4d81dd3e803df74f13a91fe40b1959fa145bf676b8d301a24d588 SHA512 6a2029dab230cf4c1e4c344362ef7ae8204775a1dd898da6d5bbe274c3b5ad1b1d223eb6e4b4c5915b87b7c6b401c40b3630c8aa0546d4c0192ba418f4d1cf31 -EBUILD mysql++-3.2.3.ebuild 1557 BLAKE2B 4d6e6743162da47c5af3f50f460a383de1b893f878d100d298e9af3e0dd520c197c551923195374a469cebe8b0662986f31e3531f51e1f9da8e4c13cff7fd1bd SHA512 c937096617395b6ea1fc9058037a9e7e7357bffed51c9d543cac61567effef511ab4767dfb0116115ea005929a5930b3d732cb7bcffb90fd48a263527dbf2470 +EBUILD mysql++-3.2.3.ebuild 1556 BLAKE2B 8bcedbe3e000c0132610b7347329e62d0d82adc00be4b34e5333c274140ea682e3300b471dcf08a7e661e9df801fc6820b6771e7d41d0c74968856deb9375bde SHA512 4b04105492d20515ad98db286d9746b6ab1fe0d38a49c7de870cf19ab5d6dc2579303aa36b7216caeceb58ff17668fa4149b9a762612b0ca203adafda7145898 EBUILD mysql++-3.2.4.ebuild 1704 BLAKE2B c67e5a1e752602037503871f061f6a0430af178beab1c8fe293b19f903afbc78a62f602e8fa1af1c2812c0c938b540a99f0c25dd37ea782b9815237cfe8b4036 SHA512 7358abde75d8f9b57487955a75c7718d383b2ef0aea9094a9bce3affd8151ed94c509e884dea6b10b9d8d709fa893fcb0153e26520375410661045ed198013b2 MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b diff --git a/dev-db/mysql++/mysql++-3.2.3.ebuild b/dev-db/mysql++/mysql++-3.2.3.ebuild index 09d80aa43cdf..4b77996aeaf8 100644 --- a/dev-db/mysql++/mysql++-3.2.3.ebuild +++ b/dev-db/mysql++/mysql++-3.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://www.tangentsoft.net/mysqlpp/releases/${P}.tar.gz" LICENSE="LGPL-2" SLOT="0/3" -KEYWORDS="alpha amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc" RDEPEND="virtual/libmysqlclient:=" diff --git a/dev-db/mysql-connector-c++/Manifest b/dev-db/mysql-connector-c++/Manifest index 0d50126db2a5..a5f1d2f9b552 100644 --- a/dev-db/mysql-connector-c++/Manifest +++ b/dev-db/mysql-connector-c++/Manifest @@ -1,10 +1,17 @@ AUX 8.0.11-fix-build.patch 9453 BLAKE2B 72c42d2f0aac7de63151b4b12a5de6f1597f70be3a8a42d1a137c1a57329acf1adf196377e90c838e1d4995223fb58615814d8c14d3c8d86472ad795e1b456e7 SHA512 321444184d459f7e650b3f72589db4b2537f67c2d413f9d3d5a995c937497b6310bc2b58200fc61b5c0d8e8fe2030d65035ddbab672338d9df1b6cf3ce605ea9 +AUX mysql-connector-c++-1.1.11-fix-cpp-linking.patch 440 BLAKE2B 2b78f683c8e4645df7a306783ec3e61263682688b0069fff61cb3a85575d41aa33de481314bc1d18f8a5181c5e2dbb29cfb8c89d6a36b44c11f27340b4f7921c SHA512 f941e32d4f1e52d603958bb01d17e75c8fb89738d20f5af29d4c30bbe77ba82af4b25cc27f1e2df934d1b309f6c75faf2fb0fc88fb250770a0669f867cc16e1c +AUX mysql-connector-c++-1.1.11-fix-mariadb.patch 1939 BLAKE2B 4ca552777bfcb8671e5dc0213c411f9e1e8fbcbeb0f9f3369572c82ba03304a9df2ab98725b1fb3a365a63e4c8ed9d3d86332c54ffcb14210469b3d6078d89da SHA512 3d02972b57a0c2a544edef9ec5050c82f9214a7013e941cdc13a8f0742b7608812f33bc0c84367e70ea556562efb653297730ce5fc8d928458c5af1d71f3f60a AUX mysql-connector-c++-1.1.3-fix-cmake.patch 4949 BLAKE2B a3eaa6f656d7f587aca06b02847c335028a1595e61232d3c4579e10678234aec2c6e2d5e12997e9e9d268bd5dc6eef952852a91d64800cbc949d61663b25b03b SHA512 985e5dd9f9f4aaae3b34ff05e32cb0d9ddb108aa20be32e14786b5b2664263149907b46828cb01d491ef07934b73b18ee715185c59bce940370955a544325f3f AUX mysql-connector-c++-1.1.5-fix-mariadb.patch 1793 BLAKE2B f65ad472bbdced9920ae8f3fef868282608ec8bd361037e503f3879db223337e84f447157ec7b30f33cf6461abb327422d31fdd677914e672845c358e19ba883 SHA512 a2b23164d9632b84df233dfb0ae52c809256a9ec163deaa663eb3512ffb622a6885c21c67998e51e848772170966bb74322d4ab8d6816dda686c5d6ab9fa300a AUX mysql-connector-c++-1.1.6-fix-cmake.patch 762 BLAKE2B 4cecebd2cb075c6e1af7ab74a84132f41beeeb202d4d286038b05cbbb202cef709e7114563bdbee12aab4e6a738a9e23bbb9455fc1ce0f906d952af4e0042f05 SHA512 c4c89b398aa88a9e7b4ed4cf42b055b79670dc70685775afd1ef2d683e5b3754575c831a6083ef0d097431e796513597e1daf7737e3ade710abad917f63ed32f AUX mysql-connector-c++-1.1.8-fix-mariadb.patch 1939 BLAKE2B f2d2528cacfa4457c20587557e5125f9d642ce162319ba6b077173b5407319d8d07e6b525a5fb95e797d43a3ad4e9ceb111ebd07a52cf38df1db71b9b4f2ab4c SHA512 66e4783b2ad2db463b243d2fcd7c4f89f1ddbb02f6c5711adb09b402bb448e4ee69b50f635c60201cf63048aebaea25b5db6a18f46b35b25e8d7920dbcfde9bd +AUX mysql-connector-c++-8.0.13-fix-build.patch 10931 BLAKE2B aeeaa25d76073525a45b7b4bd5b51b6bfa151b7c20f9e563ff98673b5273ad84a3ef9c2ce26f17b175f1038ab4924187ec2e2d059f2052855d8875823ee762bd SHA512 a965e2a475e7802e8a0dd64c39b6e0f9996b9c1c49d647c26cefac33bf52afceb012c7b0acad383006152fb52d94ffb5481d4be9b2ba957776529df842370ffb +DIST mysql-connector-c++-1.1.11.tar.gz 504872 BLAKE2B 16a265ce291d18d3e76f6654b42271d8c6cc9329f047d9eb0c6cdfaea37e1c13f04932e595e4333882b26154f0940949bc9bdab9d8af8e25d2bfff43be0030fa SHA512 d6839ecda12d1f088f24b20c08f3e9a757e9907d3375dba39e0f247b6a11de59817739644201e74d782d4c900aa18bf60910fe60a9ee98a2c0138104fb55dc22 DIST mysql-connector-c++-1.1.9.tar.gz 508255 BLAKE2B e2cd300946a873a94beab13d9d1cb64ecb5bd9a9a56ef2217b1f7aff1643adc9afc0aa22c2ff1e0f6b8318cd34d12a7fe95f0584c96c212307fa9bd0cb54a2a1 SHA512 ec4d6cb7f21d52e786de3bff951e65ea5ad7391ba097b599d0094d3e8356cf17f700dee618e38e79d7a9e562684a6c51cca95fb8e2e225942766d33f8d0a5646 DIST mysql-connector-c++-8.0.11-src.tar.gz 2322951 BLAKE2B a1ea47c0440beae1892144186ad6b99a4519369845e1f37f5ce42088df6c29a458bd41840a1f9401dbd29827bc3a7c96ba34563a3a4cf3176e29e377cc254b9f SHA512 5113efb473b7cc63f680c04dacf5bee78d0a58ee20b41c8203edb92f8720c31c52c24de838996f25476eaa3d734c845531440317e82cb5e5f635bc03b057a148 +DIST mysql-connector-c++-8.0.13-src.tar.gz 2174609 BLAKE2B 5293ccfb7ad3bd6d50e0518db402d93f707535498ff1f608acc5c642cdc2c671601cbb7c14c7e6ec66fea8bdcb22effbb90e0ee2c207e8e82be7a2b446512f24 SHA512 0c260eff0002f5abc177049b9d050daf3b7860634355c10c02cb0ece18a3d1505454d67d8742d7e879c0cc6b44f8045f75e64d79bdd0bbfc211de9903abec902 +EBUILD mysql-connector-c++-1.1.11.ebuild 1625 BLAKE2B 2cdf84829a4be8ce15dd387889335885c1f1f236226cb3af86c32af7851dc274bca09118fc288a0bfff6a4e005ff875002e5fc87c1abda065ec7b1ec7444940d SHA512 075637a15b9919bed31d2228baf4a71fe9802c75be5a2e656e334b7b17c1d659d056e166bf1142345d9d36d48be0c56a902718dcbead003c5e02a00ae18e7c7c EBUILD mysql-connector-c++-1.1.9.ebuild 1568 BLAKE2B 767d7a824046b4b1b18967abc04ae51b0610b15af54d8f1491b7d0731a2a25add4ff0bf2dd0445c793737eaf897205216e554e4405f2ab3d3eec30ef0662edc4 SHA512 55070fa6863b2e3cffc3e7f71bd2b652b198ae824e256b6f72d9c525602582c05a57262ba7f33bf01802551617d4963f30b3bbf15818a4fd1a406ac6286aa65e EBUILD mysql-connector-c++-8.0.11.ebuild 831 BLAKE2B cd00b3ef8d70e64c8fa7d4852a45d58f060fa443dfb90ebffdb3fa11310d4afabf0396eb05ec4af04b2d3fb3115f38b10eb76a1a302d9d7a1cbb5b4f7e61fda0 SHA512 8de6feaa69664b8faea224769777b7050470fd0b60c0d317e00049bc0e29471bac94274ae0da4239ff211651bf3775df0526d29a02d39d88b1d107bddbb44ee0 +EBUILD mysql-connector-c++-8.0.13.ebuild 840 BLAKE2B ad79745000c37f90f50ffb434613bdabcdf7cc8c8fb93e24e2148f08e65414f5bfcbd792a6b942494b776bbcd8b0717760d8576dc77d78607aeba473a2e5878a SHA512 8ed227a9269efc07223a71798225f4e573904aae94126c549e32abcf4e02459269c570a7d8e4e4db3ec7a825636a77feab6b1752ceaf23d4416cc42d4ea94e8b MISC metadata.xml 378 BLAKE2B 43fdbbc8d3b6ef99e51da96ddfefbdeaa70ef5fcb2fc6067305f75f75b7ee2fd21b79ca76704d8752bf59ae057b28efb187b063770964246f93fea629b58b467 SHA512 c6e545fb60d306792421ea26a937aaa6aea53d2a4100c9cafe78cf695c9dd0620cf3e770d43ff42749ae42bbe3a35212407ea84edee9af2dcb0255c2b763ddfc diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch new file mode 100644 index 000000000000..4b8a4a983096 --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-cpp-linking.patch @@ -0,0 +1,15 @@ +https://bugs.mysql.com/bug.php?id=90727 + +--- a/FindMySQL.cmake ++++ b/FindMySQL.cmake +@@ -700,8 +700,10 @@ endif() + + # For dynamic linking use the built-in sys and strings + if(NOT MYSQLCLIENT_STATIC_LINKING) ++IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") + list(APPEND SYS_LIBRARIES "mysql_sys") + list(APPEND SYS_LIBRARIES "mysql_strings") ++endif() + list(APPEND SYS_LIBRARIES ${MYSQL_LIBRARIES}) + SET(MYSQL_LIBRARIES ${SYS_LIBRARIES}) + diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch new file mode 100644 index 000000000000..2868a3c024af --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-1.1.11-fix-mariadb.patch @@ -0,0 +1,43 @@ +--- a/driver/mysql_connection.cpp ++++ b/driver/mysql_connection.cpp +@@ -1067,6 +1067,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & optionName, void * opti + proxy->get_character_set_info(&cs); + *(static_cast(optionValue)) = cs.mbmaxlen; + /* mysql_get_option() was added in mysql 5.7.3 version */ ++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) + } else if ( proxy->get_server_version() >= 50703 ) { + try { + if (GET_CONN_OPTION(optionName, optionValue, intOptions)) { +@@ -1080,6 +1081,7 @@ MySQL_Connection::getClientOption(const sql::SQLString & optionName, void * opti + CPP_ERR_FMT("Unsupported option : %d:(%s) %s", proxy->errNo(), proxy->sqlstate().c_str(), proxy->error().c_str()); + throw e; + } ++#endif + } + } + /* }}} */ +@@ -1097,11 +1099,13 @@ MySQL_Connection::getClientOption(const sql::SQLString & optionName) + MY_CHARSET_INFO cs; + proxy->get_character_set_info(&cs); + return cs.dir ? sql::SQLString(cs.dir) : ""; ++#if !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) + } else if ( proxy->get_server_version() >= 50703 ) { + const char* optionValue= NULL; + if (GET_CONN_OPTION(optionName, &optionValue, stringOptions)) { + return optionValue ? sql::SQLString(optionValue) : ""; + } ++#endif + } + return ""; + } +--- a/driver/nativeapi/libmysql_static_proxy.cpp ++++ b/driver/nativeapi/libmysql_static_proxy.cpp +@@ -325,7 +325,7 @@ LibmysqlStaticProxy::options(MYSQL * mysql, enum mysql_option option, const void + int + LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg) + { +-#if MYSQL_VERSION_ID >= 50703 ++#if MYSQL_VERSION_ID >= 50703 && !defined( MARIADB_BASE_VERSION ) && !defined ( MARIADB_VERSION_ID ) + if (::mysql_get_option(mysql, option, arg)) { + throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()"); + } else { diff --git a/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch new file mode 100644 index 000000000000..9bc45d274d7d --- /dev/null +++ b/dev-db/mysql-connector-c++/files/mysql-connector-c++-8.0.13-fix-build.patch @@ -0,0 +1,329 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ba914a..e1127f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -669,7 +669,7 @@ set_target_properties(connector PROPERTIES + + + install(TARGETS connector +- CONFIGURATIONS Release RelWithDebInfo ++ CONFIGURATIONS Release RelWithDebInfo Gentoo + ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev + RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll +@@ -740,6 +740,12 @@ TARGET_LINK_LIBRARIES(try connector) + SET_INTERFACE_OPTIONS(try devapi) + # ADD_GCOV(try) + ++IF(WITH_SSL STREQUAL "system") ++ find_package(OpenSSL REQUIRED) ++ TARGET_LINK_LIBRARIES(try ${OPENSSL_LIBRARIES}) ++ENDIF() ++ ++ + if(WITH_JDBC) + + add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc) +diff --git a/buildinfo.cmake b/buildinfo.cmake +index cc57a2c..129afeb 100644 +--- a/buildinfo.cmake ++++ b/buildinfo.cmake +@@ -112,4 +112,4 @@ if(WITH_JDBC) + endif() + + +-install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION . COMPONENT Readme) ++#install(FILES "${PROJECT_BINARY_DIR}/BUILDINFO.txt" DESTINATION . COMPONENT Readme) +diff --git a/cdk/cmake/install_macros.cmake b/cdk/cmake/install_macros.cmake +index 37c1061..39336cf 100644 +--- a/cdk/cmake/install_macros.cmake ++++ b/cdk/cmake/install_macros.cmake +@@ -327,7 +327,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target) + DESTINATION ${ARG_DESTINATION} + ${RENAME_PARAM} + ${PERMISSIONS_${target_type}} +- CONFIGURATIONS Release RelWithDebInfo ++ CONFIGURATIONS Release RelWithDebInfo Gentoo + COMPONENT ${ARG_COMPONENT} + OPTIONAL) + +@@ -346,7 +346,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target) + INSTALL(FILES ${debug_pdb_target_location} + DESTINATION ${ARG_PDB_DESTINATION} + ${PDB_RENAME_PARAM} +- CONFIGURATIONS Release RelWithDebInfo ++ CONFIGURATIONS Release RelWithDebInfo Gentoo + COMPONENT ${ARG_COMPONENT} + OPTIONAL) + ENDIF() +diff --git a/cdk/cmake/libutils.cmake b/cdk/cmake/libutils.cmake +index 959fc5d..aec2d91 100644 +--- a/cdk/cmake/libutils.cmake ++++ b/cdk/cmake/libutils.cmake +@@ -282,14 +282,7 @@ function(add_library_ex TARGET) + endforeach() + + if(libs) +- +- if(${type} STREQUAL "STATIC") +- merge_static_libraries(${TARGET} ${libs}) +- add_dependencies(${TARGET} ${libs}) +- else() + target_link_libraries(${TARGET} PRIVATE ${libs}) +- endif() +- + endif() + + # +diff --git a/cdk/cmake/protobuf.cmake b/cdk/cmake/protobuf.cmake +index 95ecc71..484687c 100644 +--- a/cdk/cmake/protobuf.cmake ++++ b/cdk/cmake/protobuf.cmake +@@ -26,201 +26,8 @@ + # along with this program; if not, write to the Free Software Foundation, Inc., + # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +-# +-# Usage: +-# +-# INCLUDE(protobuf) +-# [USE_FULL_PROTOBUF()] +-# +-# MYSQLX_PROTOBUF_GENERATE_CPP(SRCS HDRS ) +-# ADD_LIBRARY(target ... ${SRCS}) +-# +- +-if(DEFINED WITH_PROTOBUF) +- +- # +- # If WITH_PROTOBUF is defined, it should point at external location where +- # protobuf libraries were built using our CMakeLists.txt (so that +- # exports.cmake was produced). +- # +- +- if (NOT EXISTS "${WITH_PROTOBUF}/exports.cmake") +- message(FATAL_ERROR +- "Valid protobuf build not found at the given location" +- " (could not find exports.cmake): ${WITH_PROTOBUF}" +- ) +- endif() +- +- message("Using protobuf build at: ${WITH_PROTOBUF}") +- +-else(DEFINED WITH_PROTOBUF) +- +- # +- # If external WITH_PROTOBUF location is not given, then we arrange for +- # building of protbuf from bundled sources in ${PROJECT_BINARY_DIR}/protobuf. +- # +- +- message("Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}") +- file(REMOVE "${PROJECT_BINARY_DIR}/protobuf/CMakeCache.txt") +- file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/protobuf") +- +- # +- # Pick build configuration for the protobuf build. Normally we build using the +- # same build configuration that is used for building CDK (Release/Debug/etc.). +- # But we also support building CDK under non-standard build configuration +- # named 'Static' (this is a dirty trick we use to simplify building our MSIs). +- # Since protobuf does not know 'Static' build configuration, we build protobuf +- # under 'Release' configuration in that case. +- # +- # We need to handle two cases. For some build systems, like Makefiles, +- # the build configuration is specified at cmake time using CMAKE_BUILD_TYPE +- # variable. In that case we also set it during protobuf build configuration. +- # Another case is a multi-configuration build system like MSVC. In this case +- # we use generator expression to pick correct configuration when the build +- # command is invoked below. +- # +- +- if(CMAKE_BUILD_TYPE) +- if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") +- set(set_build_type -DCMAKE_BUILD_TYPE=Release) +- else() +- set(set_build_type -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) +- endif() +- endif() +- +- set(CONFIG_EXPR +- $<$:Release>$<$>:$> +- ) +- +- execute_process( +- COMMAND ${CMAKE_COMMAND} +- -G "${CMAKE_GENERATOR}" +- ${set_build_type} +- -DSTATIC_MSVCRT=${STATIC_MSVCRT} +- -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} +- -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} +- -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} +- -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} +- -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} +- -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO} +- -DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL} +- -DCMAKE_STATIC_LINKER_FLAGS=${CMAKE_STATIC_LINKER_FLAGS} +- ${PROJECT_SOURCE_DIR}/protobuf +- WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/protobuf +- RESULT_VARIABLE protobuf_config +- ) +- +- if(protobuf_config) +- message(FATAL_ERROR "Could not configure Protobuf build: ${protobuf_config}") +- endif() +- +- set(WITH_PROTOBUF "${PROJECT_BINARY_DIR}/protobuf") +- +-endif(DEFINED WITH_PROTOBUF) +- +-# Import targets exported by protobuf +- +-include(${WITH_PROTOBUF}/exports.cmake) +- +-# +-# Protobuf library targets imported above (pb_protobuf +-# and pb_protobuf-lite) are local to the directory from which +-# they were imported. This is not good if cdk is used as +-# a sub-project of a parent project, because the parent project +-# must have access to these targets. +-# +-# For that reason below we create global protobuf/protobuf-lite targets +-# and copy their locations from the imported targets. +-# +-# Note: we can't use ALIAS library because it does not work with imported +-# targets +-# +- +-add_library(protobuf STATIC IMPORTED GLOBAL) +-add_library(protobuf-lite STATIC IMPORTED GLOBAL) +- +-foreach(lib protobuf protobuf-lite) +- #message("processing: ${lib}") +- +- foreach(CONF NOCONFIG DEBUG RELEASE MINSIZEREL RELWITHDEBINFO) +- #message("- CONF: ${CONF}") +- +- get_target_property(LOC pb_${lib} IMPORTED_LOCATION_${CONF}) +- if(LOC) +- #message("- setting imported location to: ${LOC}") +- set_target_properties(${lib} PROPERTIES +- IMPORTED_LOCATION_${CONF} "${LOC}" +- ) +- set_property(TARGET ${lib} APPEND PROPERTY +- IMPORTED_CONFIGURATIONS ${CONF} +- ) +- endif() +- +- endforeach(CONF) +- +-endforeach(lib) +- +-# +-# To support 'Static' build configuration the targets imported from the +-# Protobuf project need to have IMPORTED_LOCATION_STATIC defined. We use +-# 'Release' locations as Protobuf is built using 'Release' configuration in +-# that case. +-# +- +-foreach(tgt protobuf protobuf-lite pb_protoc) +- +- get_target_property(LOC ${tgt} IMPORTED_LOCATION_RELEASE) +- set_property(TARGET ${tgt} PROPERTY IMPORTED_LOCATION_STATIC ${LOC}) +- +-endforeach(tgt) +- +- +-# protobuf depends on protobuf-lite +- +-set_target_properties(protobuf PROPERTIES +- INTERFACE_LINK_LIBRARIES "protobuf-lite" +-) +- +- +-message("Protobuf include path: ${PROTOBUF_INCLUDE_DIR}") +- +-set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR} +- CACHE INTERNAL "Protobuf include path" FORCE) +-set(PROTOBUF_PROTOC_EXECUTABLE pb_protoc +- CACHE INTERNAL "Protobuf compiler" FORCE) +- +-# +-# Custom target build_protobuf ensures that Protobuf project is built. +-# +-# Note: this depends on Protobuf project generating the stamp file +-# +- +-if(NOT DEFINED PROTOBUF_BUILD_STAMP) +- message(FATAL_ERROR "Protobuf build stamp file not defined") +-endif() +- +- +-if(CMAKE_VERSION VERSION_LESS 3.0) +- add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP} +- COMMAND ${CMAKE_COMMAND} --build . --config $ +- WORKING_DIRECTORY ${WITH_PROTOBUF} +- COMMENT "Building protobuf using configuration: $(Configuration)" +- ) +-else() +- add_custom_command(OUTPUT ${PROTOBUF_BUILD_STAMP} +- COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG_EXPR} +- WORKING_DIRECTORY ${WITH_PROTOBUF} +- COMMENT "Building protobuf using configuration: $(Configuration)" +- ) +-endif() +- +-add_custom_target(build_protobuf +- DEPENDS ${PROTOBUF_BUILD_STAMP} +-) +- +-add_dependencies(protobuf build_protobuf) +-add_dependencies(protobuf-lite build_protobuf) +-add_dependencies(pb_protoc build_protobuf) ++#SET(Protobuf_USE_STATIC_LIBS ON) ++find_package(Protobuf REQUIRED) + + # + # Choice between full and lite version of the library. +diff --git a/cdk/protocol/mysqlx/crud.cc b/cdk/protocol/mysqlx/crud.cc +index 5cb12dc..6d32e21 100644 +--- a/cdk/protocol/mysqlx/crud.cc ++++ b/cdk/protocol/mysqlx/crud.cc +@@ -295,7 +295,7 @@ public: + class Placeholder_conv_imp + : public Args_conv + { +- map m_map; ++ std::map m_map; + + public: + +@@ -303,7 +303,7 @@ public: + + unsigned conv_placeholder(const string &name) + { +- map::const_iterator it = m_map.find(name); ++ std::map::const_iterator it = m_map.find(name); + if (it == m_map.end()) + throw_error("Placeholder converter: Placeholder was not defined on args"); + //throw Generic_error((boost::format("Placeholder %s was not defined on args.") +@@ -314,7 +314,7 @@ public: + + void add_placeholder(const string &name) + { +- map::const_iterator it = m_map.find(name); ++ std::map::const_iterator it = m_map.find(name); + if (it != m_map.end()) + throw_error("Placeholder converter: Redefined placeholder"); + //throw Generic_error((boost::format("Redifined placeholder %s.") +diff --git a/jdbc.cmake b/jdbc.cmake +index 60898da..b5d8bf0 100644 +--- a/jdbc.cmake ++++ b/jdbc.cmake +@@ -38,7 +38,7 @@ if(MYSQL_CONFIG_EXECUTABLE) + list(APPEND jdbc_cmake_opts -DMYSQL_CONFIG_EXECUTABLE=${MYSQL_CONFIG_EXECUTABLE}) + endif() + +-list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=ON) ++list(APPEND jdbc_cmake_opts -DMYSQLCLIENT_STATIC_LINKING=OFF) + + if(CMAKE_BUILD_TYPE) + if(CMAKE_BUILD_TYPE MATCHES "[Ss][Tt][Aa][Tt][Ii][Cc]") diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild new file mode 100644 index 000000000000..d7c1ec3619aa --- /dev/null +++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.11.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit cmake-utils flag-o-matic + +DESCRIPTION="MySQL database connector for C++ (mimics JDBC 4.0 API)" +HOMEPAGE="https://dev.mysql.com/downloads/connector/cpp/" +URI_DIR="Connector-C++" +SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug examples gcov static-libs" + +DEPEND="virtual/libmysqlclient:= + dev-libs/boost:= + dev-libs/openssl:0= + !