From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- dev-db/Manifest.gz | Bin 18806 -> 17973 bytes dev-db/clickhouse/Manifest | 2 + dev-db/clickhouse/clickhouse-19.15.2.2.ebuild | 207 ++++ dev-db/cppdb/Manifest | 3 - dev-db/cppdb/cppdb-0.3.1-r3.ebuild | 52 - dev-db/cppdb/metadata.xml | 14 - dev-db/etcd/Manifest | 8 +- dev-db/etcd/etcd-3.3.15.ebuild | 78 -- dev-db/etcd/etcd-3.3.17.ebuild | 2 +- dev-db/etcd/etcd-3.4.2.ebuild | 86 -- dev-db/etcd/etcd-3.4.3.ebuild | 86 ++ dev-db/kyotocabinet/Manifest | 2 +- dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild | 2 +- dev-db/mongodb/Manifest | 4 + dev-db/mongodb/mongodb-4.0.13.ebuild | 166 +++ dev-db/mongodb/mongodb-4.2.1.ebuild | 167 +++ dev-db/mysql-connector-c/Manifest | 3 + ...-8.0.18-always-build-decompress-utilities.patch | 34 + .../mysql-connector-c-8.0.18.ebuild | 110 ++ dev-db/mysql-workbench/Manifest | 2 + .../mysql-workbench/mysql-workbench-8.0.18.ebuild | 107 ++ dev-db/mysql/Manifest | 3 + dev-db/mysql/mysql-8.0.18.ebuild | 1117 +++++++++++++++++++ dev-db/mysqltuner/Manifest | 2 + dev-db/mysqltuner/mysqltuner-1.7.17.ebuild | 35 + dev-db/odbtp/Manifest | 4 - dev-db/odbtp/files/odbtp-1.1.4-amd64.patch | 11 - dev-db/odbtp/metadata.xml | 8 - dev-db/odbtp/odbtp-1.1.4.ebuild | 40 - dev-db/percona-server/Manifest | 8 +- .../percona-server/files/my.cnf-8.0.distro-client | 23 + .../percona-server/files/my.cnf-8.0.distro-server | 30 + dev-db/percona-server/metadata.xml | 1 + .../percona-server/percona-server-8.0.17.8.ebuild | 1128 ++++++++++++++++++++ dev-db/percona-toolkit/Manifest | 21 +- .../percona-toolkit-2.2.17-fix-package-name.patch | 35 - .../percona-toolkit-2.2.19-fix-package-name.patch | 13 - .../percona-toolkit/percona-toolkit-2.2.11.ebuild | 47 - .../percona-toolkit/percona-toolkit-2.2.17.ebuild | 44 - .../percona-toolkit/percona-toolkit-2.2.19.ebuild | 44 - .../percona-toolkit-3.0.10-r1.ebuild | 51 - .../percona-toolkit/percona-toolkit-3.0.10.ebuild | 49 - .../percona-toolkit/percona-toolkit-3.0.11.ebuild | 51 - .../percona-toolkit/percona-toolkit-3.0.12.ebuild | 51 - .../percona-toolkit/percona-toolkit-3.0.7.ebuild | 42 - .../percona-toolkit/percona-toolkit-3.0.8.ebuild | 49 - .../percona-toolkit/percona-toolkit-3.1.0.ebuild | 51 + dev-db/percona-xtrabackup/Manifest | 8 +- .../percona-xtrabackup-2.4.13.ebuild | 86 -- .../percona-xtrabackup-8.0.6.ebuild | 60 -- .../percona-xtrabackup-8.0.7.ebuild | 63 ++ dev-db/pgadmin4/Manifest | 2 + dev-db/pgadmin4/pgadmin4-4.13.ebuild | 109 ++ dev-db/pgbouncer/Manifest | 3 + dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch | 18 + dev-db/pgbouncer/pgbouncer-1.11.0.ebuild | 86 ++ dev-db/postgis/Manifest | 6 +- dev-db/postgis/postgis-3.0.0.ebuild | 125 +++ dev-db/postgis/postgis-3.0.0_alpha4.ebuild | 123 --- dev-db/postgis/postgis-3.0.0_rc2.ebuild | 125 --- dev-db/soci/Manifest | 3 - dev-db/soci/metadata.xml | 12 - dev-db/soci/soci-3.2.3-r1.ebuild | 50 - dev-db/spatialite/Manifest | 2 +- dev-db/spatialite/spatialite-4.3.0a.ebuild | 7 +- dev-db/sqlite/Manifest | 2 +- dev-db/sqlite/sqlite-3.29.0.ebuild | 2 +- dev-db/sqlitebrowser/Manifest | 2 +- .../sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild | 3 +- dev-db/xbase/Manifest | 13 - dev-db/xbase/files/xbase-2.0.0-ppc.patch | 20 - dev-db/xbase/files/xbase-3.1.2-fixconfig.patch | 12 - dev-db/xbase/files/xbase-3.1.2-gcc-version.patch | 16 - dev-db/xbase/files/xbase-3.1.2-gcc44.patch | 24 - dev-db/xbase/files/xbase-3.1.2-gcc47.patch | 21 - dev-db/xbase/files/xbase-3.1.2-gcc6.patch | 49 - dev-db/xbase/files/xbase-3.1.2-gcc7.patch | 34 - dev-db/xbase/files/xbase-3.1.2-lesserg.patch | 294 ----- dev-db/xbase/files/xbase-3.1.2-outofsource.patch | 52 - dev-db/xbase/files/xbase-3.1.2-xbnode.patch | 9 - dev-db/xbase/metadata.xml | 8 - dev-db/xbase/xbase-3.1.2.ebuild | 61 -- dev-db/xbsql/Manifest | 7 - dev-db/xbsql/files/xbsql-0.11-autotools.patch | 18 - dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch | 79 -- dev-db/xbsql/files/xbsql-0.11-ncurses64.patch | 19 - dev-db/xbsql/files/xbsql-0.11-xbase64.patch | 66 -- dev-db/xbsql/metadata.xml | 5 - dev-db/xbsql/xbsql-0.11-r2.ebuild | 40 - 89 files changed, 3716 insertions(+), 2121 deletions(-) create mode 100644 dev-db/clickhouse/clickhouse-19.15.2.2.ebuild delete mode 100644 dev-db/cppdb/Manifest delete mode 100644 dev-db/cppdb/cppdb-0.3.1-r3.ebuild delete mode 100644 dev-db/cppdb/metadata.xml delete mode 100644 dev-db/etcd/etcd-3.3.15.ebuild delete mode 100644 dev-db/etcd/etcd-3.4.2.ebuild create mode 100644 dev-db/etcd/etcd-3.4.3.ebuild create mode 100644 dev-db/mongodb/mongodb-4.0.13.ebuild create mode 100644 dev-db/mongodb/mongodb-4.2.1.ebuild create mode 100644 dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch create mode 100644 dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild create mode 100644 dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild create mode 100644 dev-db/mysql/mysql-8.0.18.ebuild create mode 100644 dev-db/mysqltuner/mysqltuner-1.7.17.ebuild delete mode 100644 dev-db/odbtp/Manifest delete mode 100644 dev-db/odbtp/files/odbtp-1.1.4-amd64.patch delete mode 100644 dev-db/odbtp/metadata.xml delete mode 100644 dev-db/odbtp/odbtp-1.1.4.ebuild create mode 100644 dev-db/percona-server/files/my.cnf-8.0.distro-client create mode 100644 dev-db/percona-server/files/my.cnf-8.0.distro-server create mode 100644 dev-db/percona-server/percona-server-8.0.17.8.ebuild delete mode 100644 dev-db/percona-toolkit/files/percona-toolkit-2.2.17-fix-package-name.patch delete mode 100644 dev-db/percona-toolkit/files/percona-toolkit-2.2.19-fix-package-name.patch delete mode 100644 dev-db/percona-toolkit/percona-toolkit-2.2.11.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-2.2.17.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-2.2.19.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.0.10.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.0.11.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.0.12.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.0.7.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.0.8.ebuild create mode 100644 dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild delete mode 100644 dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild delete mode 100644 dev-db/percona-xtrabackup/percona-xtrabackup-8.0.6.ebuild create mode 100644 dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild create mode 100644 dev-db/pgadmin4/pgadmin4-4.13.ebuild create mode 100644 dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch create mode 100644 dev-db/pgbouncer/pgbouncer-1.11.0.ebuild create mode 100644 dev-db/postgis/postgis-3.0.0.ebuild delete mode 100644 dev-db/postgis/postgis-3.0.0_alpha4.ebuild delete mode 100644 dev-db/postgis/postgis-3.0.0_rc2.ebuild delete mode 100644 dev-db/soci/Manifest delete mode 100644 dev-db/soci/metadata.xml delete mode 100644 dev-db/soci/soci-3.2.3-r1.ebuild delete mode 100644 dev-db/xbase/Manifest delete mode 100644 dev-db/xbase/files/xbase-2.0.0-ppc.patch delete mode 100644 dev-db/xbase/files/xbase-3.1.2-fixconfig.patch delete mode 100644 dev-db/xbase/files/xbase-3.1.2-gcc-version.patch delete mode 100644 dev-db/xbase/files/xbase-3.1.2-gcc44.patch delete mode 100644 dev-db/xbase/files/xbase-3.1.2-gcc47.patch delete mode 100644 dev-db/xbase/files/xbase-3.1.2-gcc6.patch delete mode 100644 dev-db/xbase/files/xbase-3.1.2-gcc7.patch delete mode 100644 dev-db/xbase/files/xbase-3.1.2-lesserg.patch delete mode 100644 dev-db/xbase/files/xbase-3.1.2-outofsource.patch delete mode 100644 dev-db/xbase/files/xbase-3.1.2-xbnode.patch delete mode 100644 dev-db/xbase/metadata.xml delete mode 100644 dev-db/xbase/xbase-3.1.2.ebuild delete mode 100644 dev-db/xbsql/Manifest delete mode 100644 dev-db/xbsql/files/xbsql-0.11-autotools.patch delete mode 100644 dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch delete mode 100644 dev-db/xbsql/files/xbsql-0.11-ncurses64.patch delete mode 100644 dev-db/xbsql/files/xbsql-0.11-xbase64.patch delete mode 100644 dev-db/xbsql/metadata.xml delete mode 100644 dev-db/xbsql/xbsql-0.11-r2.ebuild (limited to 'dev-db') diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz index 49705122f14c..e25957002cdc 100644 Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ diff --git a/dev-db/clickhouse/Manifest b/dev-db/clickhouse/Manifest index 78a5ee0b7c65..5df90942c534 100644 --- a/dev-db/clickhouse/Manifest +++ b/dev-db/clickhouse/Manifest @@ -7,6 +7,7 @@ DIST clickhouse-18.10.3.tar.gz 6136661 BLAKE2B 5564bbe85f4ca43f18df702148af0e4e5 DIST clickhouse-18.12.17.tar.gz 6495521 BLAKE2B 00dfb823b9e36923beb50a88bee88af3918bedc7b20079785699a42e36e52f32739f786bd78c5b350f58ae59251e3846da6202d04e24e9a750c92e16065cc395 SHA512 876c5fb6011c65b8ec201126678dad6f5de3430b7d320316ced5c6d22e8086ce337d20b73badbd053bf141097b8fe6cd94910ed607b4bbedb681cfa7921d1fb6 DIST clickhouse-18.6.0.tar.gz 5852534 BLAKE2B 5634fd26907b21d4a35cff3ed816696205be4aff1cdd1acfe222e24214b1842eb18a4e499e888b0d92b78f5c3023c2962a385af2c0ea889055e473dfa0198bf5 SHA512 e8ea2d4457122513cad47b1cdb2a58dd2ffaec77a7a08bf82179aca12a369d39970520a995bb5db2e5ea4b0939da827b7d4b1f3929cf71c149c965438ebb3633 DIST clickhouse-19.13.1.11.zip 11502726 BLAKE2B c2788702a2c27c995abc072a94f3945ed6f9039fe0c7840312a86987faf52d2f7801d531e89a02848fa8ee1319247c41de0f3ad0c0cb51c1df1dbcfca3bd3b0a SHA512 095a0e63eff6989ea1f70fac593069e1cdb6ea207a99d8cfd610c4eb8f3f7411a784d9f100c9fc899898e68dd88dd54bec3c136764793c8cae986d920a651f8c +DIST clickhouse-19.15.2.2.zip 11425217 BLAKE2B 3a2288d771cd92dc283713a44df84df8c3c946ef92efd781d7619c8ffc0d7a3884f1a988c81f1703a7d373e78e413bdaea0fd100cebf7090be9bba16779209ff SHA512 029376b9d540c592d30a32457deb9e605d512fc448eb3dc6896b0ca48a5e92f390ef2dc3a4ea63ce19c264a8b2810ff952e95a6c7a8d4506f733ac6253c079d3 DIST clickhouse-19.5.3.8.zip 11247905 BLAKE2B f72289f55bddf9b3ad2e16a4d1fc6e4f7681477e742eda3694c3c16975820c93affc01c70b194c5992226d79bee714f706c04402c62bd0ed3d1701a16fb22192 SHA512 f578abbd43c3ccf721e079ce2bafac22be0c5d619388be192c59a2053ae1cf1e7f0a025e0323f0f8f004f879990a88c0ca0cd4d135606de51c576619fe0172b8 DIST clickhouse-19.9.5.36.zip 11708002 BLAKE2B 075f9b1556c5ee207a608047fa559cec7a0b1f044236e412189ae6dabe25aa04abf881726e4ffa17d4aad6937250c704f050935e61470994b57eaa1ac9ea07e4 SHA512 b0aa04a1c0f7c15316c83a2711f9b64f8235e664956f933530a9f2dc26fcb8b817adb8ca43c96db1cad498e06f4291ce13c0bb259726039c5caa52ae523fa4ab EBUILD clickhouse-18.10.3-r1.ebuild 4918 BLAKE2B 2b7db7cd6213ec5965692c231d567f29345515edd639e054ad2f4dd9ca5ccc11560126c9361fb93412395810947c1b6b19859c0b5274a90eda502851a45c44f0 SHA512 97f4328dc9b0ad5cb50c223b00d127aee0da3f3349067674cd124b6a4842547376b674d031d72274313bc1df22099570cdac6211f294be97b5b08ed91155cedc @@ -14,6 +15,7 @@ EBUILD clickhouse-18.12.17-r1.ebuild 4915 BLAKE2B 6912e12f85c382c0a2822c92405558 EBUILD clickhouse-18.6.0-r1.ebuild 4906 BLAKE2B ab34699e3a363109e51559ed941bc47ee422335ec0a198191f8aee9673cabb2d14156210855bb46bcf0ac1cbd7b744541641b3e0e796085a0c2cd9d2e3a59435 SHA512 3671f1837b50806528893c8f1291ec60f2ef42230ae8f5b7c07ee9da34706a0ba489e90950a03fa0f3c8b9bc3b144a06e7f3f0bc35b30fbb179da7715ebefc14 EBUILD clickhouse-19.13.1.11-r2.ebuild 5060 BLAKE2B 9dd106fcbf56f676668613defe986cc39b8b489e67a15f96bc89101e7490bccebfffdbd85dbe5ea890e635f7f87dd7f06555caaaafdd76f06ee0ae5ea7cd1db6 SHA512 8e0eb0472dbe9bca99181b644489b331a292f41ede0d6ef35c6c8862f427f883255d890f0fd973728a9c6538d679c7aa6916e481bb55f3ac1b662c402215efa1 EBUILD clickhouse-19.13.1.11-r3.ebuild 5150 BLAKE2B 3224340a5229b176f033481560373c62ba3493e4f75d2d946379db1c1da8ff17180c382478572803d638e67614a4c4385a8bf1e13fb46293f0ea4a07fb9ae812 SHA512 ce24527a8c9c5802d6fb1cdc9a6c6fafa49a71d20199ae77e45da1190cd720719591009a0f2ecaad867f4f9952432d3af7ad5a39a9618f2467b2aee817d31f3b +EBUILD clickhouse-19.15.2.2.ebuild 5280 BLAKE2B 2ebd85d2ba0e26bcd0f55237c26e4280578caba6be08414b90613e727e21af371716fabf7109a6bcae4f2ee2ebe0aecf958b796f2c7e121fb1d37e6e1a1c690d SHA512 0dc7930bce6a5f34317ef2694b60b6b55f1caa9eff1dcd0d2f2f728a9bf0f713634da8c6d8fb5954ef9527aeb699ccc85548315d4cd777f94b01fd301b497ff0 EBUILD clickhouse-19.5.3.8-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847 EBUILD clickhouse-19.9.5.36-r1.ebuild 5041 BLAKE2B aad165d484fd9a978057e57f57a12146ae97f82455ff47909a9476f04c28c95e719a7867cb2b2fe6acde25fa2e43c12de4c7c19c2c8e6f0810f4ddcf08b311ad SHA512 253de2e46d5eaba79d5d79a149e0fcc582dd08dd30a0b04fe39e2900ebf5ca68cfd7619f4c9af5d662d7baa795649a37a4db48efc6067c92fb79956a2ca9e847 MISC metadata.xml 657 BLAKE2B ea02627178df53a81cf2cb46f47e51ebf0437d5e70ec745a7d5d92d430e2055f3112280d3cbed5d7d7eccd1ce892ff1b184f042b850de1f9071716bda5176e82 SHA512 1a3810659c43b9191a8a37aac652c070fb05e663090575c4908e5dc248dfb1e20d9dd3d832a71b95c36b17a6f3a802dacbea2866f33c530c3d5d6c93f8a58690 diff --git a/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild new file mode 100644 index 000000000000..47fed41d0c75 --- /dev/null +++ b/dev-db/clickhouse/clickhouse-19.15.2.2.ebuild @@ -0,0 +1,207 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +CMAKE_MAKEFILE_GENERATOR="ninja" + +inherit cmake-utils systemd toolchain-funcs user + +DESCRIPTION="An OSS column-oriented database management system for real-time data analysis" +HOMEPAGE="https://clickhouse.yandex" +LICENSE="Apache-2.0" + +MY_PN="ClickHouse" +TYPE="stable" + +CCTZ_COMMIT="4f9776a" +SRC_URI="https://github.com/yandex/${MY_PN}/archive/v${PV}-${TYPE}.zip -> ${P}.zip + https://github.com/google/cctz/archive/${CCTZ_COMMIT}.tar.gz -> cctz-${CCTZ_COMMIT}.tar.gz +" + +SLOT="0/${TYPE}" +IUSE="+client cpu_flags_x86_sse4_2 +server debug doc kafka mongodb mysql static test tools" +KEYWORDS="~amd64" + +REQUIRED_USE=" + server? ( cpu_flags_x86_sse4_2 ) + static? ( client server tools ) +" + +RDEPEND=" + dev-libs/re2:0= + !static? ( + >=app-arch/lz4-1.8.0:= + >=app-arch/zstd-1.3.4:= + client? ( + sys-libs/ncurses:0= + sys-libs/readline:0= + ) + + dev-libs/double-conversion + dev-libs/capnproto + dev-libs/libltdl:0 + sys-libs/libunwind:7 + sys-libs/zlib + dev-libs/poco[odbc] + dev-libs/icu:= + dev-libs/glib + >=dev-libs/boost-1.65.0:= + dev-libs/openssl:0= + kafka? ( dev-libs/librdkafka:= ) + mysql? ( dev-db/mysql-connector-c:= ) + ) + + >=dev-libs/poco-1.9.0 + dev-libs/libpcre + dev-libs/jemalloc + dev-libs/protobuf + dev-cpp/sparsehash +" + +DEPEND="${RDEPEND} + doc? ( >=dev-python/mkdocs-1.0.1 ) + static? ( + >=app-arch/lz4-1.8.0[static-libs] + >=app-arch/zstd-1.3.4[static-libs] + client? ( + sys-libs/ncurses:0=[static-libs] + sys-libs/readline:0=[static-libs] + ) + dev-libs/double-conversion[static-libs] + dev-libs/capnproto[static-libs] + dev-libs/libltdl[static-libs] + sys-libs/libunwind:7[static-libs] + sys-libs/zlib[static-libs] + || ( + dev-db/unixODBC[static-libs] + dev-libs/poco[odbc] + ) + dev-libs/icu[static-libs] + dev-libs/glib[static-libs] + >=dev-libs/boost-1.65.0[static-libs] + dev-libs/openssl[static-libs] + dev-db/mysql-connector-c[static-libs] + kafka? ( dev-libs/librdkafka[static-libs] ) + ) + =dev-cpp/gtest-1.8* + sys-libs/libtermcap-compat + dev-util/patchelf + >=sys-devel/lld-6.0.0 + >=sys-devel/gcc-7.0 + >=sys-devel/clang-6.0 +" + +S="${WORKDIR}/${MY_PN}-${PV}-${TYPE}" + +_clang_fullversion() { + local ver="$1"; shift + set -- $($(tc-getCPP "$@") -E -P - <<<"__clang_major__ __clang_minor__ __clang_patchlevel__") + eval echo "$ver" +} + +clang-fullversion() { + _clang_fullversion '$1.$2.$3' "$@" +} + +clang-version() { + _clang_fullversion '$1.$2' "$@" +} + +clang-major-version() { + _clang_fullversion '$1' "$@" +} + +clang-minor-version() { + _clang_fullversion '$2' "$@" +} + +clang-micro-version() { + _clang_fullversion '$3' "$@" +} + +pkg_pretend() { + if [[ $(tc-getCC) == clang ]]; then + if [[ $(clang-major-version) -lt 6 ]]; then + eerror "Compilation with clang older than 6.0 is not supported" + die "Too old clang found" + fi + : + elif [[ $(gcc-major-version) -lt 7 ]] && [[$(gcc-minor-version) -lt 2 ]]; then + eerror "Compilation with gcc older than 7.2 is not supported" + die "Too old gcc found" + fi +} + +src_unpack() { + default_src_unpack + [[ ${PV} == 9999 ]] && return 0 + cd "${S}/contrib" || die "failed to cd to contrib" + mkdir -p cctz zstd || die "failed to create directories" + tar --strip-components=1 -C cctz -xf "${DISTDIR}/cctz-${CCTZ_COMMIT}.tar.gz" || die "failed to unpack cctz" +} + +src_prepare() { + sed -i -e 's~add_subdirectory(contrib/libunwind-cmake)~~' cmake/find/unwind.cmake || die "Failed to succeed" + eapply_user + cmake-utils_src_prepare +} +src_configure() { + local mycmakeargs=( + -DENABLE_POCO_MONGODB="$(usex mongodb)" + -DENABLE_RDKAFKA="$(usex kafka)" + -DENABLE_TESTS="$(usex test)" + -DUSE_STATIC_LIBRARIES="$(usex static)" + -DMAKE_STATIC_LIBRARIES="$(usex static)" + -DUSE_MYSQL="$(usex mysql)" + -DENABLE_CLICKHOUSE_SERVER="$(usex server)" + -DENABLE_CLICKHOUSE_CLIENT="$(usex client)" + -DENABLE_CLICKHOUSE_LOCAL="$(usex tools)" + -DENABLE_CLICKHOUSE_BENCHMARK="$(usex tools)" + -DENABLE_CLICKHOUSE_PERFORMANCE="$(usex tools)" + -DENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG="$(usex tools)" + -DENABLE_CLICKHOUSE_COMPRESSOR="$(usex tools)" + -DENABLE_CLICKHOUSE_COPIER="$(usex tools)" + # As of now, clickhouse fails to build if odbc is disabled + -DENABLE_ODBC=True + -DENABLE_CLICKHOUSE_ODBC_BRIDGE=True + -DENABLE_CLICKHOUSE_ALL=OFF + -DUSE_INTERNAL_SSL_LIBRARY=False + -DUSE_INTERNAL_CITYHASH_LIBRARY=ON # Clickhouse explicitly requires bundled patched cityhash + -DUNBUNDLED=ON + ) + + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + + if ! use test; then + rm -rf "${D}/usr/share/clickhouse-test" || die "failed to remove tests" + fi + + if use doc; then + pushd "${S}/docs/tools" || die "Failed to enter docs build directory" + ./build.py || die "Failed to build docs" + popd || die "Failed to exit docs build directory" + + dodoc -r "${S}/docs/build" + fi + + if use server; then + newinitd "${FILESDIR}"/clickhouse-server.initd-r1 clickhouse-server + newconfd "${FILESDIR}"/clickhouse-server.confd clickhouse-server + systemd_dounit "${FILESDIR}"/clickhouse-server.service + fi + + keepdir /var/log/clickhouse-server + chown clickhouse:clickhouse "${D}"/var/log/clickhouse-server +} + +pkg_preinst() { + if use server; then + enewgroup clickhouse + enewuser clickhouse -1 -1 /var/lib/clickhouse clickhouse + fi +} diff --git a/dev-db/cppdb/Manifest b/dev-db/cppdb/Manifest deleted file mode 100644 index a632ff2c3143..000000000000 --- a/dev-db/cppdb/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST cppdb-0.3.1.tar.bz2 251449 BLAKE2B 13a59b50b53e276c3714c35a11dee09054d3017d4c60335028c1e41dece749e6b13e94cd6ca4ad40e8bd47c5530ff3310c5735b373ee7289afe657f31c6186de SHA512 19e60becbffef7a252eda5fdd5821b44c2eeb5d69e84cf46e89ed6af3cea315f3cfe7b2cc4f62fbe154be8abdad3363761dd0252f94671421010273eeae65678 -EBUILD cppdb-0.3.1-r3.ebuild 1296 BLAKE2B 4d8515d26bf053571ebf2586e170699a3b6018954ca159beb2f4cc87fbb5cf40c0268b24a543c91b3598bc8241a5e636cb7adac677d216026aec095d0e197b85 SHA512 f4cf1cfb877568ea0cf36a8fcea786e0cfb688837c6618f5a91a383e514ff725a37e25bfd0ad00fc6777fe8c55a45f41559f2617e9e1b5f06da98002d88576bb -MISC metadata.xml 793 BLAKE2B 5701e3c5e058f2a50fa977a8ccdccb9effefc69b64309062d1cf7117de69e811f525e41cfc4f70cb6b0dbbccc0a85005cff7215e2326b4623e936ac88a070cad SHA512 2f4fc751d3e9eb865df2e9ad42879e5f43a242a955340eb3e25ec12944f254368733abc7e80dbdab86ef84d8268e2d83183f834bdbad5c79a07b224eb64987e4 diff --git a/dev-db/cppdb/cppdb-0.3.1-r3.ebuild b/dev-db/cppdb/cppdb-0.3.1-r3.ebuild deleted file mode 100644 index 77cdabe6e5d5..000000000000 --- a/dev-db/cppdb/cppdb-0.3.1-r3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="SQL connectivity library for platform and database independent connectivity" -HOMEPAGE="http://cppcms.com/sql/cppdb/" -SRC_URI="mirror://sourceforge/cppcms/${P}.tar.bz2" - -LICENSE="|| ( Boost-1.0 MIT )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples mysql mysql_internal odbc odbc_internal postgres postgres_internal sqlite sqlite_internal" - -DEPEND=" - mysql? ( dev-db/mysql-connector-c:= ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DDISABLE_MYSQL=$(usex !mysql) - -DMYSQL_BACKEND_INTERNAL=$(usex mysql_internal) - -DDISABLE_ODBC=$(usex !odbc) - -DODBC_BACKEND_INTERNAL=$(usex odbc_internal) - -DDISABLE_PQ=$(usex !postgres) - -DPQ_BACKEND_INTERNAL=$(usex postgres_internal) - -DDISABLE_SQLITE=$(usex !sqlite) - -DSQLITE_BACKEND_INTERNAL=$(usex sqlite_internal) - -DLIBDIR=$(get_libdir) - ) - - cmake-utils_src_configure -} - -src_install() { - if use doc; then - rm docs/build.txt || die - dodoc docs/* - local HTML_DOCS=( html/. ) - fi - cmake-utils_src_install - if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples - fi -} diff --git a/dev-db/cppdb/metadata.xml b/dev-db/cppdb/metadata.xml deleted file mode 100644 index 803866a884e1..000000000000 --- a/dev-db/cppdb/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - Don't build a separate mysql loadable module but rather build it into the cppdb library itself - Don't build a separate postgresql loadable module but rather build it into the cppdb library itself - Don't build a separate odbc loadable module but rather build it into the cppdb library itself - Don't build a separate sqlite3 loadable module but rather build it into the cppdb library itself - - - cppcms - - diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest index 4c5e000980d3..5ffd4ee81aa6 100644 --- a/dev-db/etcd/Manifest +++ b/dev-db/etcd/Manifest @@ -4,10 +4,8 @@ AUX etcd.initd 821 BLAKE2B 5eba7f0e8d134ff45caba8c1eb3aaf6afb412082b9a5df95925f3 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 -DIST etcd-3.3.15.tar.gz 6271373 BLAKE2B 85786a2a4acaf144f80461a56775b8c91164e8f0c0034ef0741d98383ac400720ca69b855588a076dc174364330c0e12df73a36570983138e33a32cdbe69e22f SHA512 9fbc02c4aacb000335d558e9c5d4df672194d1b1b8511918efa35a6123bcd7f1a06ecc527f7ff01af7c7f0e818b4809918e640fd596ec51898bf511849f0a2c5 DIST etcd-3.3.17.tar.gz 6507229 BLAKE2B e49b66a3a2bb5be254cb3400341d4f1454608a9923295826ce780fb5750b6182ec7ec35996ef538aa38863cacd0c0e3efd072ce5c3dae1e65509ce962964994d SHA512 73f8ddab1c27c77cedeb602201d01b433363c9550ec26b4729f2c5c114aefa4b90d444fd5a7696272c2cccdc8329e641f073ef9f39c7ea4e62837341dfc28641 -DIST etcd-3.4.2.tar.gz 8940311 BLAKE2B cf385a52befd2acb27c85339f164b8f0db78ee164d9d13311568ec265bc6f4cdb2f6d9e34a5fdd02c9274331bbaa6bf53c1d33fc9567715ac05d87b21d7ec3fd SHA512 359af6a56d94e8282a82304438a677ddc9c4b8e3a95f737f97fed0275a2b8151a233fba1a243091c1f135b034750a58151f6b3c740e760b4c89de375acc60b00 -EBUILD etcd-3.3.15.ebuild 2003 BLAKE2B 67ad4d265af60a2acae219b2af516682a4ecbe960c2ef57a0d52f67e5abb46ef9e45faa7d1c5d97a08976a23fec6591f4a9405c42c97c1cc250b89b94967f574 SHA512 bacc3c09dcb728aae3f547e32ecf95774a102e4b10a63b2e13d4ae83551ac5feafd76a293a14cc2f916d1749c841b3b5f61ea4a0d068769b73cf32860d78c8a2 -EBUILD etcd-3.3.17.ebuild 2004 BLAKE2B 9529ee30db40adb52f1c9865cab8f7abdfcc1fbfa99bcbe41091415e1c60e6597f703a1338052e75d88d847d1c9ad72b6431b977754303aa7302b3bf210bcbfc SHA512 5d1c80f94f458f674a08135f4e9c6e2517f0cd85ff0ed236af43c47462420fcd6855be14e59dafb86307e47466e3191b7d04f861011f18af781b6dbd27a30450 -EBUILD etcd-3.4.2.ebuild 2274 BLAKE2B 6866bc3a7a596ecaa2e8c2b02c205a0c447da557eee501205105369cad8b19d739ef7b3b0da697181144025cd06d2c0ab2788174386c57aa0025e59f3c5eacdc SHA512 ad4e19b4932d4e1882a45ff7349e6e56b0c479925f7c6c333e2f4d7d613d38500bec39de448e0376e37926bac8fbfce1b470c328b75fdcae2e8e971b3eeda121 +DIST etcd-3.4.3.tar.gz 8941589 BLAKE2B 127e4a8dd9495686ffc43099c3002e0e3c00ab661bce917ac298f69351e1226dff0efcaf9277c1e46449abafef965af8f612a127e1e30c381545073232a2ff50 SHA512 0bc1e857b707be1d348f5ab58a330d259dd30338c28580751142f643b2a081d1fe42a8859fa9463a734ff27f51929dc89f933f044b89d6e549a348add034d752 +EBUILD etcd-3.3.17.ebuild 2003 BLAKE2B b17a2eb321060ae13b0fcd6ccc347b9449a3e113489431e95a96e3cec570c3f65adac65b446357eac95f0faaae0a2f33548fc51cd4bb05a37725a2529f076338 SHA512 41bdae1f83128670a89ab695a03a550d6ad29b29b977cf0e992c9c2a04d4110be651e7a15b615d34e83d1646a3573c8521b09a168d65069fb682846febb1f826 +EBUILD etcd-3.4.3.ebuild 2273 BLAKE2B 4fc16f6847b2843bd8e2fe4d419f8efb09ea0bb99d754bad831eec4c44af3678e141b90242bc3582eba374220a8a6a7758065bf968ea989ab7e7b0d67b0fb6b2 SHA512 3631168ebfd7275c949d7e7a31caeba76ba95bb5bb97bc2726c0ad971600c71d0243334fa8ebf2014a51fb8aa6f6549b746b59da28b653c400d14b98155b0bda MISC metadata.xml 679 BLAKE2B 7374379a18107011df792be631428834334ad8e6da5cfe404f18555e8c168d3fc716a1c8d6cb5cf1d9ccd173737aecf93a165f846865dbb6ba4a76bd4669b446 SHA512 8070d8b51dd3319e8b159072db237dcc5299361c2f74fa086fc4cbc174cc6a5c8f7659310332b54b2275e2bc3d028323c4dfa5775e21693a339f54312582d2f0 diff --git a/dev-db/etcd/etcd-3.3.15.ebuild b/dev-db/etcd/etcd-3.3.15.ebuild deleted file mode 100644 index 45845631992d..000000000000 --- a/dev-db/etcd/etcd-3.3.15.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user systemd golang-vcs-snapshot - -KEYWORDS="amd64" -EGO_PN="github.com/coreos/etcd" -GIT_COMMIT="94745a4" -MY_PV="${PV/_rc/-rc.}" -DESCRIPTION="Highly-available key value store for shared configuration and service discovery" -HOMEPAGE="https://github.com/etcd-io/etcd" -SRC_URI="https://${EGO_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -IUSE="doc +server" -DEPEND=">=dev-lang/go-1.12:=" -RDEPEND="!dev-db/etcdctl" - -src_prepare() { - default - sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\ - -i "${S}"/src/${EGO_PN}/build || die - sed -e 's:\(for p in \)shellcheck :\1 :' \ - -e 's:^ gofmt \\$:\\:' \ - -e 's:^ govet \\$:\\:' \ - -i "${S}"/src/${EGO_PN}/test || die - # missing ... in args forwarded to print-like function - sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \ - -i "${S}"/src/${EGO_PN}/raft/logger.go || die -} - -pkg_setup() { - if use server; then - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} - fi -} - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME #651934 - export GOPATH=${S} - pushd src/${EGO_PN} || die - GO_BUILD_FLAGS=-v ./build || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dobin bin/etcdctl - use doc && dodoc -r Documentation - if use server; then - insinto /etc/${PN} - doins "${FILESDIR}/${PN}.conf" - dobin bin/etcd - dodoc README.md - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - keepdir /var/lib/${PN} - fowners ${PN}:${PN} /var/lib/${PN} - fperms 0700 /var/lib/${PN} - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - fperms 755 /var/log/${PN} - fi - popd || die -} - -src_test() { - pushd src/${EGO_PN} || die - ./test || die - popd || die -} diff --git a/dev-db/etcd/etcd-3.3.17.ebuild b/dev-db/etcd/etcd-3.3.17.ebuild index 53c765061489..6290e49fcb13 100644 --- a/dev-db/etcd/etcd-3.3.17.ebuild +++ b/dev-db/etcd/etcd-3.3.17.ebuild @@ -5,7 +5,7 @@ EAPI=6 inherit user systemd golang-vcs-snapshot -KEYWORDS="~amd64" +KEYWORDS="amd64" EGO_PN="github.com/coreos/etcd" GIT_COMMIT="6d80523" MY_PV="${PV/_rc/-rc.}" diff --git a/dev-db/etcd/etcd-3.4.2.ebuild b/dev-db/etcd/etcd-3.4.2.ebuild deleted file mode 100644 index 66e471bbadb0..000000000000 --- a/dev-db/etcd/etcd-3.4.2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit user systemd golang-vcs-snapshot - -KEYWORDS="~amd64" -EGO_PN="go.etcd.io/etcd" -GIT_COMMIT="a14579f" -MY_PV="${PV/_rc/-rc.}" -DESCRIPTION="Highly-available key value store for shared configuration and service discovery" -HOMEPAGE="https://github.com/etcd-io/etcd" -SRC_URI="${HOMEPAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" -LICENSE="Apache-2.0 BSD BSD-2 MIT" -SLOT="0" -IUSE="doc +server" -DEPEND=">=dev-lang/go-1.12:=" -RDEPEND="!dev-db/etcdctl" - -src_prepare() { - default - sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\ - -i "${S}"/src/${EGO_PN}/build || die - sed -e 's:\(for p in \)shellcheck :\1 :' \ - -e 's:^ gofmt \\$:\\:' \ - -e 's:^ govet \\$:\\:' \ - -e 's:^ govet_shadow \\$:\\:' \ - -i "${S}"/src/${EGO_PN}/test || die - # missing ... in args forwarded to print-like function - sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \ - -i "${S}"/src/${EGO_PN}/raft/logger.go || die - - sed -e 's:TestGetDefaultInterface(:_\0:' \ - -e 's:TestGetDefaultHost(:_\0:' \ - -i "${S}"/src/${EGO_PN}/pkg/netutil/routes_linux_test.go || die - - # Avoid network-sandbox violations since go-1.13 - rm src/${EGO_PN}/go.mod || die -} - -pkg_setup() { - if use server; then - enewgroup ${PN} - enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} - fi -} - -src_compile() { - export -n GOCACHE XDG_CACHE_HOME #651934 - export GOPATH=${S} - pushd src/${EGO_PN} || die - GO_BUILD_FLAGS=-v ./build || die - popd || die -} - -src_install() { - pushd src/${EGO_PN} || die - dobin bin/etcdctl - use doc && dodoc -r Documentation - if use server; then - insinto /etc/${PN} - doins "${FILESDIR}/${PN}.conf" - dobin bin/etcd - dodoc README.md - systemd_dounit "${FILESDIR}/${PN}.service" - systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf - newinitd "${FILESDIR}"/${PN}.initd ${PN} - newconfd "${FILESDIR}"/${PN}.confd ${PN} - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}.logrotated" "${PN}" - keepdir /var/lib/${PN} - fowners ${PN}:${PN} /var/lib/${PN} - fperms 0700 /var/lib/${PN} - keepdir /var/log/${PN} - fowners ${PN}:${PN} /var/log/${PN} - fperms 755 /var/log/${PN} - fi - popd || die -} - -src_test() { - pushd src/${EGO_PN} || die - GO111MODULES=off ./test || die - popd || die -} diff --git a/dev-db/etcd/etcd-3.4.3.ebuild b/dev-db/etcd/etcd-3.4.3.ebuild new file mode 100644 index 000000000000..f43dd732266c --- /dev/null +++ b/dev-db/etcd/etcd-3.4.3.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit user systemd golang-vcs-snapshot + +KEYWORDS="~amd64" +EGO_PN="go.etcd.io/etcd" +GIT_COMMIT="3cf2f69" +MY_PV="${PV/_rc/-rc.}" +DESCRIPTION="Highly-available key value store for shared configuration and service discovery" +HOMEPAGE="https://github.com/etcd-io/etcd" +SRC_URI="${HOMEPAGE}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +LICENSE="Apache-2.0 BSD BSD-2 MIT" +SLOT="0" +IUSE="doc +server" +DEPEND=">=dev-lang/go-1.12:=" +RDEPEND="!dev-db/etcdctl" + +src_prepare() { + default + sed -e "s|GIT_SHA=.*|GIT_SHA=${GIT_COMMIT}|"\ + -i "${S}"/src/${EGO_PN}/build || die + sed -e 's:\(for p in \)shellcheck :\1 :' \ + -e 's:^ gofmt \\$:\\:' \ + -e 's:^ govet \\$:\\:' \ + -e 's:^ govet_shadow \\$:\\:' \ + -i "${S}"/src/${EGO_PN}/test || die + # missing ... in args forwarded to print-like function + sed -e 's:l\.Logger\.Panic(v):l.Logger.Panic(v...):' \ + -i "${S}"/src/${EGO_PN}/raft/logger.go || die + + sed -e 's:TestGetDefaultInterface(:_\0:' \ + -e 's:TestGetDefaultHost(:_\0:' \ + -i "${S}"/src/${EGO_PN}/pkg/netutil/routes_linux_test.go || die + + # Avoid network-sandbox violations since go-1.13 + rm src/${EGO_PN}/go.mod || die +} + +pkg_setup() { + if use server; then + enewgroup ${PN} + enewuser ${PN} -1 -1 /var/lib/${PN} ${PN} + fi +} + +src_compile() { + export -n GOCACHE XDG_CACHE_HOME #651934 + export GOPATH=${S} + pushd src/${EGO_PN} || die + GO_BUILD_FLAGS=-v ./build || die + popd || die +} + +src_install() { + pushd src/${EGO_PN} || die + dobin bin/etcdctl + use doc && dodoc -r Documentation + if use server; then + insinto /etc/${PN} + doins "${FILESDIR}/${PN}.conf" + dobin bin/etcd + dodoc README.md + systemd_dounit "${FILESDIR}/${PN}.service" + systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotated" "${PN}" + keepdir /var/lib/${PN} + fowners ${PN}:${PN} /var/lib/${PN} + fperms 0700 /var/lib/${PN} + keepdir /var/log/${PN} + fowners ${PN}:${PN} /var/log/${PN} + fperms 755 /var/log/${PN} + fi + popd || die +} + +src_test() { + pushd src/${EGO_PN} || die + GO111MODULE=off ./test || die + popd || die +} diff --git a/dev-db/kyotocabinet/Manifest b/dev-db/kyotocabinet/Manifest index b40b569b1f88..c257fe47a620 100644 --- a/dev-db/kyotocabinet/Manifest +++ b/dev-db/kyotocabinet/Manifest @@ -2,5 +2,5 @@ AUX fix_configure-1.2.62.patch 1668 BLAKE2B 5a572607b5c848c3616fcccac1e936f9218a AUX kyotocabinet-1.2.76-configure-8-byte-atomics.patch 1250 BLAKE2B 882c4897a40609bbfa1183cb97e80e5ed6d95d0035c30c836e3f252962db822249f8b48934923e816a720d3cbf64a6f47f80cef77528216f3171f332ca3a350b SHA512 4833cecd6c67515e0c59d7161be6891df290ae816593de1bf35718e9c9d8691db221bec5078c5dc7cf56e55b0086d61c415e148a7ee63b2a47ac4885f6d0960e AUX kyotocabinet-1.2.76-flags.patch 894 BLAKE2B 50efb4b21f0101a942eb758213cf703460056a951617298057567d08b116c7e0a631d631eace992ff447bed5b74940d2b60a8adad373cb77fe42b8c40bfcc9fd SHA512 60a15c54994a5f338cf168feb831d858fdd2cadd16ea0c8001ef652e8502797f5920d3fed0a3ec4a6a2d817381b4690410878a18c7c859df34e26b033f48fe03 DIST kyotocabinet-1.2.77.tar.gz 949326 BLAKE2B faacde57e8c7fed3fb232ea6fd12b668f2d2ee352cd357d5e16e0d1740cd8f73e223964249efeae50f3ea5d0672117b2410b91ba557ebe1ac7ba4075ac28deab SHA512 f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f -EBUILD kyotocabinet-1.2.77.ebuild 1508 BLAKE2B cc16490b66f5447c392a90399c2ceb81e586d64109baa31e3a220029398273c553236c8f92c195448b25ed9a6e902e291c74e7d5b2a398c27a36cdb07c6eacd2 SHA512 3a10a41fe65b88c58511bb8e40fee75459f8f8a256b464bda15e6d25f7d2b3d06b344c7cc0dbb97ed7c9cd48ad99e06931c2a25998bb885b2ba7095874393005 +EBUILD kyotocabinet-1.2.77.ebuild 1530 BLAKE2B a1abca816e16ff3738f1cdd3d93238f5182db60fc189097cf63097141d8879f417226305ac3e40842ec9aaffab3f6aef24cc0fe8a9d8a71705eb7a1a37fb29c3 SHA512 ba0a50310eeb5b73872974f4d5917649e08e7a1618b54460ab6b60b2180acd51311d05150dd0224f656ed22da0240cfb5d333e24e7cf6fd9e48ae84739663a3c MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild index 6b2ec47895de..b8d4c86ff2ef 100644 --- a/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild +++ b/dev-db/kyotocabinet/kyotocabinet-1.2.77.ebuild @@ -7,7 +7,7 @@ inherit autotools toolchain-funcs DESCRIPTION="A straightforward implementation of DBM" HOMEPAGE="https://fallabs.com/kyotocabinet/" -SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz" +SRC_URI="https://fallabs.com/kyotocabinet/pkg/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 97e3a98e5983..2ad267d36427 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -17,11 +17,15 @@ DIST mongodb-src-r3.6.14.tar.gz 40895581 BLAKE2B 3cfe2aedd11a67a01ddee9eba36d99b DIST mongodb-src-r3.6.8.tar.gz 40428295 BLAKE2B cc02f73cfb49fb38ccabaad5a02610ce73fc41895ce944e48669e254bcbc70c8872a1bd7f8e04371fae4fcd9af2466fd8550367dd1d1da5cee50b86fc5023bf2 SHA512 c981f3269be3bafb59aa89d36c39a801fd7007b60db6c09b4616a559aaf8e50b34cabbdac2b59f23552c0a5112913fba468f7e2ed9a5f4daa3702dcffdf34999 DIST mongodb-src-r4.0.10.tar.gz 49870574 BLAKE2B 1babbfa1a6d8fae390ec37042feff896c402772e832cc5b0b82fc4d531a6487ac2bd8d407c37ca75a76d78bc91cc665bfc3b7b223e6ceaaea2d921b337ef4d19 SHA512 891bfdc0d415515d7aa36aeb0618055ac6815c7d704537b88293226cecc1b677134db621fd90dee3913f4ff8174a888bcf68adee0a243d0f55ef6c0033a4f4b9 DIST mongodb-src-r4.0.12.tar.gz 49937644 BLAKE2B 81044a6d68be6420d30fb2d7386ff29871a696cad94ce5977c1aba60c2ce80e18ccb86492c1947a359ef124332ea82ac3cb0fb73a68f51904a008fdf911aa055 SHA512 802eaf57d56c5e8e217344f10104a201acb6f5abef0065fc1bb8e6ceef13fe489b7ae46ed0d55b5bad50fe3579860b1c1471d224b51b0f15f968278cb5f6a47a +DIST mongodb-src-r4.0.13.tar.gz 50006727 BLAKE2B bf47bd32cf50c24084091a1baa811690c50586352307deb80876bb1bad539e90de77f85fc591960d6ae871e0a6f22d5d2f05bb340218784b642e3529d0c64bb6 SHA512 2a74ac8648cde6d9b5aa33da195b22eca926ef5ff85d4140e0a1ba978e3d13d410f4d7d7e102e35f994ef3b848333a4ef4bacfec9e2ac1b1288cbee885875ef7 DIST mongodb-src-r4.2.0.tar.gz 60781115 BLAKE2B 75531f69647c84f71127d4cdccf13bc21e50586240c767b4c1aa1efbf56cf008bf4f32b3a2011120ad9099da0f97be934375b8dd3d012670034327175c454f0e SHA512 be2f4e00364ac49b1a0490fa859640680a4d10d861252d200bd3db535c770a3b97cee9de6d2b0b6b3622502d055ba92b6c1d88cb1134d251aa2cf50a8951b64c +DIST mongodb-src-r4.2.1.tar.gz 60922510 BLAKE2B b06141cf0a8d256fc24e64c7115093009f42a97c74d270997ad4a70fb040199db05c5083cf1639283cc253264fbeb975d7efe3a41227d75146d7aa2e2fb9fa12 SHA512 6057f68ebeb2d5f74e70639fcc08aecfb112d386e3d016e18dfb2413319abf46249a0f5ffcfb74be9264a2ef34f45dd96f9774d86b1ec7e7213276f1c84f3106 EBUILD mongodb-3.6.13.ebuild 4230 BLAKE2B b2d7e960c5d6a4dc9e4f882d999446eb9ab4e8a1128a513e87e1d119ade30197aa1941e75632d32f1adee32e9a6d0b659f32ad64adc1f0472982885ef303479c SHA512 70e382660c6ceca1bcd53beb41656add3d16c3fec27108864423e7eeeadef90cb4fe7d9b992af6d24b362a2a614b95171a22585eb9addf2f22c177dd65e4a635 EBUILD mongodb-3.6.14.ebuild 4231 BLAKE2B d285158017e7495ab091797ff655f86f192558eeb483863fa2307f4da26299b093ac1329c9a80560a2921134e573e1f23c249240c88e15ccb818e6bcf6433e53 SHA512 372a006e05788a405e9aae7363d12d4019974a2957be9f1c730fa10d93d1eb4374c01c252f3d286a76917f3e9fc3e7058ad33f586523fe9f7e96150ea5a8d4a8 EBUILD mongodb-3.6.8.ebuild 4197 BLAKE2B d28a62156019eaeab2d0fa8b4de5c5589e96c955145f283d810ba58c906d01e6447d74b08fc8037e2ebfff9b43dea38c3f6d5b28615e322ebee892bbe9c97d3a SHA512 90c2f9937355bed8d110044a89a7a5a3980c236b0e33b67457c3bc3ffce2ba3dc730dd55b977667cdd43ff07ecec4489183cee50e8e0e2a618ee2ec3e4fe82ef EBUILD mongodb-4.0.10.ebuild 4231 BLAKE2B 981c770cdbde22763fa8f4c7be235de7e8d312b1a1b1b6e688de557201cd0c265405b4bd8e5415d9e845618abdd0156bb594036376185ec57caa02cbe7b7ef56 SHA512 9e8153cd872408325dd0941f7e2fdffef09e6b1bd24dd8cf297821fdeb94098c1096df1a722db8e282db18a3bff0f95ce672cc3a3243801cbe3408135094c91a EBUILD mongodb-4.0.12.ebuild 4291 BLAKE2B dedfea39b0454fd1d4c13fe96c032845d8c951f75bcb6bc85bac84fbd1d6577e415cf817fddf5a6fab50e958b01dbdb467bcb1d33f4a3f1652efee2eacf745c3 SHA512 d0ec6aa07bb7a46b54ce43e4dccb599149e6e67dea4ecd7a85ff7332d515b802e7cf14f5dfc384e1c37820d9503913082bb0699bee37f6ab5308b12c8c26c5af +EBUILD mongodb-4.0.13.ebuild 4292 BLAKE2B 083dfd2200179cecda627ea545d4d0e5c7f26b7f0c5f4c0bfaf030d666b4cb1ee476056ab494b7e1dbf3678848e8a68f58a00d618f16b1d511954f028bf6bf8c SHA512 76d5a91f4530754698084c273115cdd7932edd0c8045148bd575c9d03cf73f8aa70ad28e4b0e826232cab37637d8af9353f7ff13e6cfe0f8beea43d6951a7ed5 EBUILD mongodb-4.2.0-r2.ebuild 4333 BLAKE2B 0ec1ff9596f0840de62c4ef6844aa0f38fd01a4f0de1c9a9545bb9de991482fae3ee398f3cec39367457c92758f442414986914354dbe8cd8d5bf3b34b37ccbd SHA512 01f7426d86a90f3e52b0310c260ce738b77c31baf01f3634734e41c978fa0123946c269834e12af93f4fe748d3019782d234a30c7a327a3814c3f7ef63d42a5d +EBUILD mongodb-4.2.1.ebuild 4278 BLAKE2B 1e5ee63d8c5eb814ddd3df7f298d5ba0ec7cfda7d5eb9a3dfebb44fa7cded350d2b4ef392254aee1af95787cd9bba4cca76540f01218c1d55658ba7e0e05812f SHA512 1e94249d45d6c4d41bb5b8d91b68223d52d50f5cbeb3df129e8391b7a716eeb837f18f14ad61668f0910b77e31d257591b1c330f30085babab56c5a966e6529e MISC metadata.xml 901 BLAKE2B f7fde58679ba05518634b82bf5fcc371897165364fe5b023a2ec161790c869de82b4a3dd769d5e1bb450f99679869b60bb1e35beb8d41c54d3448dfca580a7ae SHA512 48f133d396aa31b992bac5f947e5a262b2d07a1016c6d49fa3c86dabb85981edfa332abb867413826762d88051ff3981cc77c2ec92e992d7a231c3b542336e36 diff --git a/dev-db/mongodb/mongodb-4.0.13.ebuild b/dev-db/mongodb/mongodb-4.0.13.ebuild new file mode 100644 index 000000000000..d549bea6ba8f --- /dev/null +++ b/dev-db/mongodb/mongodb-4.0.13.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) + +SCONS_MIN_VERSION="2.5.0" +CHECKREQS_DISK_BUILD="2400M" +CHECKREQS_DISK_USR="512M" +CHECKREQS_MEMORY="1024M" + +inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user + +MY_P=${PN}-src-r${PV/_rc/-rc} + +DESCRIPTION="A high-performance, open source, schema-free document-oriented database" +HOMEPAGE="https://www.mongodb.com" +SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0 SSPL-1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug kerberos libressl lto mms-agent ssl test +tools" + +RDEPEND=">=app-arch/snappy-1.1.3 + >=dev-cpp/yaml-cpp-0.5.3:= + >=dev-libs/boost-1.60:=[threads(+)] + >=dev-libs/libpcre-8.41[cxx] + dev-libs/snowball-stemmer + net-libs/libpcap + >=sys-libs/zlib-1.2.11:= + kerberos? ( dev-libs/cyrus-sasl[kerberos] ) + mms-agent? ( app-admin/mms-agent ) + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) + libressl? ( dev-libs/libressl:0= ) + )" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/cheetah[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + virtual/python-typing[${PYTHON_USEDEP}] + ') + sys-libs/ncurses:0= + sys-libs/readline:0= + debug? ( dev-util/valgrind ) + test? ( + $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]') + )" +PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )" + +PATCHES=( + "${FILESDIR}/${PN}-3.6.1-fix-scons.patch" + "${FILESDIR}/${PN}-4.0.0-no-compass.patch" + "${FILESDIR}/${PN}-4.0.12-boost-1.71-cxxabi-include.patch" +) + +S="${WORKDIR}/${MY_P}" + +pkg_pretend() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + if ver_test "$REPLACING_VERSIONS" -lt 3.6; then + ewarn "To upgrade from a version earlier than the 3.6-series, you must" + ewarn "successively upgrade major releases until you have upgraded" + ewarn "to 3.6-series. Then upgrade to 4.0 series." + else + ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading." + fi + fi +} + +pkg_setup() { + enewgroup mongodb + enewuser mongodb -1 -1 /var/lib/${PN} mongodb + + python-any-r1_pkg_setup +} + +src_prepare() { + default + + # remove bundled libs + rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die + + # remove compass + rm -r src/mongo/installer/compass || die +} + +src_configure() { + # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source + # --use-system-icu fails tests + # --use-system-tcmalloc is strongly NOT recommended: + scons_opts=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + + --disable-warnings-as-errors + --use-system-boost + --use-system-pcre + --use-system-snappy + --use-system-stemmer + --use-system-yaml + --use-system-zlib + ) + + use debug && scons_opts+=( --dbg=on ) + use kerberos && scons_opts+=( --use-sasl-client ) + use lto && scons_opts+=( --lto=on ) + use ssl && scons_opts+=( --ssl ) + + # respect mongoDB upstream's basic recommendations + # see bug #536688 and #526114 + if ! use debug; then + filter-flags '-m*' + filter-flags '-O?' + fi + + default +} + +src_compile() { + escons "${scons_opts[@]}" core tools +} + +# FEATURES="test -usersandbox" emerge dev-db/mongodb +src_test() { + "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed" +} + +src_install() { + escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr + + doman debian/mongo*.1 + dodoc README docs/building.md + + newinitd "${FILESDIR}/${PN}.initd-r3" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} + newinitd "${FILESDIR}/mongos.initd-r3" mongos + newconfd "${FILESDIR}/mongos.confd-r3" mongos + + insinto /etc + newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf + newins "${FILESDIR}/mongos.conf-r2" mongos.conf + + systemd_dounit "${FILESDIR}/${PN}.service" + + insinto /etc/logrotate.d/ + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + # see bug #526114 + pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} + + local x + for x in /var/{lib,log}/${PN}; do + diropts -m0750 -o mongodb -g mongodb + keepdir "${x}" + done +} + +pkg_postinst() { + ewarn "Make sure to read the release notes and follow the upgrade process:" + ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/" + ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures" +} diff --git a/dev-db/mongodb/mongodb-4.2.1.ebuild b/dev-db/mongodb/mongodb-4.2.1.ebuild new file mode 100644 index 000000000000..3feef0be5a7d --- /dev/null +++ b/dev-db/mongodb/mongodb-4.2.1.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) + +SCONS_MIN_VERSION="2.5.0" +CHECKREQS_DISK_BUILD="2400M" +CHECKREQS_DISK_USR="512M" +CHECKREQS_MEMORY="1024M" + +inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user + +MY_P=${PN}-src-r${PV/_rc/-rc} + +DESCRIPTION="A high-performance, open source, schema-free document-oriented database" +HOMEPAGE="https://www.mongodb.com" +SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0 SSPL-1" +SLOT="0" +KEYWORDS="~amd64" +IUSE="debug kerberos libressl lto ssl test +tools" + +RDEPEND=">=app-arch/snappy-1.1.3 + >=dev-cpp/yaml-cpp-0.6.2:= + >=dev-libs/boost-1.70:=[threads(+)] + >=dev-libs/libpcre-8.42[cxx] + app-arch/zstd + dev-libs/snowball-stemmer + net-libs/libpcap + >=sys-libs/zlib-1.2.11:= + kerberos? ( dev-libs/cyrus-sasl[kerberos] ) + ssl? ( + !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) + libressl? ( dev-libs/libressl:0= ) + )" +DEPEND="${RDEPEND} + ${PYTHON_DEPS} + $(python_gen_any_dep ' + dev-python/cheetah3[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + virtual/python-typing[${PYTHON_USEDEP}] + ') + sys-libs/ncurses:0= + sys-libs/readline:0= + debug? ( dev-util/valgrind ) + test? ( + $(python_gen_any_dep 'dev-python/pymongo[${PYTHON_USEDEP}]') + )" +PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.0-fix-scons.patch" + "${FILESDIR}/${PN}-4.0.0-no-compass.patch" +) + +S="${WORKDIR}/${MY_P}" + +pkg_pretend() { + if [[ -n ${REPLACING_VERSIONS} ]]; then + if ver_test "$REPLACING_VERSIONS" -lt 4.0; then + ewarn "To upgrade from a version earlier than the 4.0-series, you must" + ewarn "successively upgrade major releases until you have upgraded" + ewarn "to 4.0-series. Then upgrade to 4.2 series." + else + ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading." + fi + fi +} + +pkg_setup() { + enewgroup mongodb + enewuser mongodb -1 -1 /var/lib/${PN} mongodb + + python-any-r1_pkg_setup +} + +src_prepare() { + default + + # remove bundled libs + rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die + + # remove compass + rm -r src/mongo/installer/compass || die +} + +src_configure() { + # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source + # --use-system-icu fails tests + # --use-system-tcmalloc is strongly NOT recommended: + scons_opts=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + + --disable-warnings-as-errors + --use-system-boost + --use-system-pcre + --use-system-snappy + --use-system-stemmer + --use-system-yaml + --use-system-zlib + --use-system-zstd + ) + + use debug && scons_opts+=( --dbg=on ) + use kerberos && scons_opts+=( --use-sasl-client ) + use lto && scons_opts+=( --lto=on ) + use ssl && scons_opts+=( --ssl ) + + # respect mongoDB upstream's basic recommendations + # see bug #536688 and #526114 + if ! use debug; then + filter-flags '-m*' + filter-flags '-O?' + fi + + default +} + +src_compile() { + escons "${scons_opts[@]}" core tools +} + +# FEATURES="test -usersandbox" emerge dev-db/mongodb +src_test() { + "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed" +} + +src_install() { + escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr + + doman debian/mongo*.1 + dodoc README docs/building.md + + newinitd "${FILESDIR}/${PN}.initd-r3" ${PN} + newconfd "${FILESDIR}/${PN}.confd-r3" ${PN} + newinitd "${FILESDIR}/mongos.initd-r3" mongos + newconfd "${FILESDIR}/mongos.confd-r3" mongos + + insinto /etc + newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf + newins "${FILESDIR}/mongos.conf-r2" mongos.conf + + systemd_dounit "${FILESDIR}/${PN}.service" + + insinto /etc/logrotate.d/ + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + # see bug #526114 + pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos} + + local x + for x in /var/{lib,log}/${PN}; do + diropts -m0750 -o mongodb -g mongodb + keepdir "${x}" + done +} + +pkg_postinst() { + ewarn "Make sure to read the release notes and follow the upgrade process:" + ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/" + ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures" +} diff --git a/dev-db/mysql-connector-c/Manifest b/dev-db/mysql-connector-c/Manifest index 581684cf6fdb..b6835584d118 100644 --- a/dev-db/mysql-connector-c/Manifest +++ b/dev-db/mysql-connector-c/Manifest @@ -4,9 +4,12 @@ AUX 8.0.16-libressl.patch 12591 BLAKE2B add6c31d6ea29af0b97e4f4558a006de899bf33a AUX mysql-connector-c-8.0.17-always-build-decompress-utilities.patch 819 BLAKE2B 424a30a5217aa4b1005d1991e90e75f033092c87cfadf0d2298d8f2a6819bafa24f5f1149d00ea252afb71f004069e9b4b406e801438d0f15a8077d5bcbc1561 SHA512 bf839e2a126066b78a64a7876b319507fd049cdc3a8b2855d8df27ae0c74a93f4b66d7d1db534552107cbe293a1913d51bd25ce945a6bdc47e785b3a6c3608df AUX mysql-connector-c-8.0.17-libressl.patch 10106 BLAKE2B 5ed9b5f77f35c5079ac13d855ec9de0f67769d9de20029876026064986a7c79671b607a19c6afe3cbcdc9ab14527e5618a213b4aa8953f10349e80b0ef7c21ea SHA512 7e692de4260f2a846008eca3bf8f4f59b61d2780743ded9a08d2245baf73ece360cb8b25ab4a3518b706b7dcc2915f3628122930b973ab27ec3e7bfbf120c3ed AUX mysql-connector-c-8.0.17-use-relative-include-path-for-udf_registration_types-h.patch 684 BLAKE2B 10007011b38462ffa8b539f9ac531c715fcead4e6bb1d1c04ea8055decc0aa6eda8b22e3967d91773316d04062ca231cf8561ce72ab2b5aaeaf37a0bb425c7f5 SHA512 d0e60dff5faa7b6c71878803d598b46266021029c874c8f6834d496de10ddf42d3b806fae3c6d532c1890cb5f491bbd69235bd1ac919848011a9ca57c465ce1c +AUX mysql-connector-c-8.0.18-always-build-decompress-utilities.patch 874 BLAKE2B 1622ba22ebb68d8b72499efec3075bbbe157b1ceaab5651dbc6dea996c831159161878a859972119dd4d5c20bb631681efb00b8d9715b3097890def8016898f4 SHA512 02ae005e8ac710dcc75f07011006df63a6d22f030b4eff0c6d28f78b083b1d7385190c9080812b5c9c2a84ad66972594b7d79a1485285c9ad76245577d42e528 AUX mysql_com.patch 1787 BLAKE2B 4fbd40325f400586926072927b3f07231d577f18c1e30951c34c36ded9b9e42b7c3dc47ca51df974265c28b40116e30274d8a73d6a843e5d9d0074430bc17b08 SHA512 340365b05d72045af0ef12fd5c260a796be547d9abb97a6ef3d6aaf30aecf29368c1dfa28f1284da544a81656f0436f11ada2f8c5cb481540d1f1c90dd354b49 DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a SHA512 a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d +DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc SHA512 180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5 DIST mysql-connector-c-6.1.11-src.tar.gz 3489345 BLAKE2B 813512520ef660521221565a4466e81d902629d0ee731f746b68eed2b9129ea8361fcabe184537ec8ba91aed5a4b02dfb3450b36524c2e98f81fba148eee0cf1 SHA512 271395c888a93b833e0bbe1840b9987ecdb37d0f1cf89904207cc9aa99ed32e538aee8c9529ff39b6533947159776a8f5aa079da86ed51b1d26b086f4ffdd7c6 EBUILD mysql-connector-c-6.1.11-r2.ebuild 2289 BLAKE2B edce26b9fea987ad0d3ba93388303f62dfe004779989c6e21ac154275cd9b7e0b3f0749e19375290d625f9a17384853b63a02f4742703030aa7c8dcf863f7ade SHA512 c33ea5754eae88f1628d9d53a81db4aaea2598ebca10f2158617b2a2cd9ac3d7cd34dfc9b0314bd096ba0f531dd27fbe8c42a61727dea91fc21852ee601f409e EBUILD mysql-connector-c-8.0.17-r3.ebuild 2910 BLAKE2B c84d7fd272718626f63ff5f7978d97b04f9b0ef0c621d7bd25d0fff3250fb00b3876bf5d83100c842a5536cbd6fc4533b87519669e3908ad3015e9799dc4739a SHA512 ffae48bad3697161efd56cea71c42fc4a3cc9ff97e17cb91bc6337dad69dd03cd86bf41b241fda0f8809f2ddff3e6137f7d10a67a7ba4a6e1aaaff81a787197c +EBUILD mysql-connector-c-8.0.18.ebuild 2883 BLAKE2B 17085cc4b61b0dd64c04401f2af637e23084d575fc1a2e7e1d04d75d34a5b51e84e3e3c8cdcd5660560179962f85baf72be6e36180e450dfeba3e6bfbf5a97e8 SHA512 719067e3f5c5adedf878d1888ebe67c53fb327124d041a6ad5ab6416be52b369aaa709168983f68541071b033f254667a2038c3b114bf04880af7f24a1bbfa2d MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b diff --git a/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch new file mode 100644 index 000000000000..af0b31e89a3e --- /dev/null +++ b/dev-db/mysql-connector-c/files/mysql-connector-c-8.0.18-always-build-decompress-utilities.patch @@ -0,0 +1,34 @@ +--- a/utilities/CMakeLists.txt ++++ b/utilities/CMakeLists.txt +@@ -110,21 +110,16 @@ MYSQL_ADD_EXECUTABLE(perror + DEPENDENCIES GenError + LINK_LIBRARIES mysys + ) +-IF(BUILD_BUNDLED_LZ4) +- MYSQL_ADD_EXECUTABLE(lz4_decompress +- lz4_decompress.cc +- COMPONENT Server +- LINK_LIBRARIES ${LZ4_LIBRARY} mysys +- ) +-ENDIF() +- +-IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB) +- MYSQL_ADD_EXECUTABLE(zlib_decompress +- zlib_decompress.cc +- COMPONENT Server +- LINK_LIBRARIES ${ZLIB_LIBRARY} mysys +- ) +-ENDIF() ++MYSQL_ADD_EXECUTABLE(lz4_decompress ++ lz4_decompress.cc ++ COMPONENT Server ++ LINK_LIBRARIES ${LZ4_LIBRARY} mysys ++ ) ++MYSQL_ADD_EXECUTABLE(zlib_decompress ++ zlib_decompress.cc ++ COMPONENT Server ++ LINK_LIBRARIES ${ZLIB_LIBRARY} mysys ++ ) + + # All targets below belong to COMPONENT Server and depend on InnoDB. + IF(WITHOUT_SERVER) diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild new file mode 100644 index 000000000000..6f10fa81b8bf --- /dev/null +++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.18.ebuild @@ -0,0 +1,110 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-multilib + +# wrap the config script +MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config ) + +DESCRIPTION="C client library for MariaDB/MySQL" +HOMEPAGE="https://dev.mysql.com/downloads/" +LICENSE="GPL-2" + +SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +SLOT="0/21" +IUSE="ldap libressl static-libs" + +RDEPEND=" + >=app-arch/lz4-0_p131:= + sys-libs/zlib:=[${MULTILIB_USEDEP}] + ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] ) + libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) + !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) + " +DEPEND="${RDEPEND}" + +# Avoid file collisions, #692580 +RDEPEND+=" ! client/CMakeLists.txt || die + + # Forcefully disable auth plugin + if ! use ldap ; then + sed -i -e '/MYSQL_CHECK_SASL/d' CMakeLists.txt || die + echo > libmysql/authentication_ldap/CMakeLists.txt || die + fi + + cmake-utils_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DINSTALL_LAYOUT=RPM + -DINSTALL_LIBDIR=$(get_libdir) + -DWITH_DEFAULT_COMPILER_OPTIONS=OFF + -DWITH_DEFAULT_FEATURE_SET=OFF + -DENABLED_LOCAL_INFILE=ON + -DMYSQL_UNIX_ADDR="${EPREFIX}/run/mysqld/mysqld.sock" + -DWITH_ZLIB=system + -DWITH_SSL=system + -DWITH_NUMA=OFF + -DLIBMYSQL_OS_OUTPUT_NAME=mysqlclient + -DSHARED_LIB_PATCH_VERSION="0" + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DWITHOUT_SERVER=ON + ) + cmake-utils_src_configure +} + +multilib_src_install() { + cmake-utils_src_install +} + +multilib_src_install_all() { + doman \ + man/my_print_defaults.1 \ + man/perror.1 \ + man/zlib_decompress.1 + + if ! use static-libs ; then + find "${ED}" -name "*.a" -delete || die + fi +} diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest index a757ddc211bb..cfaa91985dd5 100644 --- a/dev-db/mysql-workbench/Manifest +++ b/dev-db/mysql-workbench/Manifest @@ -4,6 +4,8 @@ AUX mysql-workbench-6.3.9-mariadb-json.patch 2320 BLAKE2B 9dcf7ca5091109ab71a201 DIST antlr-4.7.1-complete.jar 2240116 BLAKE2B 3acf99b3701b2092cad2fb6e91f27791cbedd82f26888d7329e481be29fce4ec644eb57f663e515b92dea46c24222d4fb090aae5cae30c57c412a38932ea72ed SHA512 de1c230d7294e05ac7b451cbc639bab9d416a674b281e21092fb4a9329ca8b6d4b92b9ad78a9771cff475a1610f1d0419819c4619bdff36c683019da67ef13b1 DIST mysql-workbench-community-8.0.16-src.tar.gz 15653536 BLAKE2B c76cd35e88167641037a779b85245c620b31e2a2943260309d8ba461391892d9ec5856023c8eb25e1ea40c12ece796a1d2e36f1638187db4bd2739eb273232c9 SHA512 e9495e78aec58f70cc586ad73908408d3b8d5071c815279c1019d5268c97f53f10f4e59a47fe0ffea03b795de8e283c1175e03e2585a81fc58b62461d665cfe9 DIST mysql-workbench-community-8.0.17-src.tar.gz 15777302 BLAKE2B ba1aebfc5f9b55e88529bdbc5ebe42da594fce1da0ea64bd0153294293fe4c2533bbc00aac9c1ba0942577eff90c1b522ef1af803e56edf0c361876ac5dea764 SHA512 c7b5f68e4a2fe30d33fde5f18a03342e034a8c10edc2506278dc09751f264884f1dba3d68c430594ac09d26b692465409d2189c2b2a440d80aca7ad00188a39f +DIST mysql-workbench-community-8.0.18-src.tar.gz 15513209 BLAKE2B decacee6ff3e30435fd0d198dc6efd95bf1342318adda977de64afda68d0c982de27dc8a811422f8ecf66a4436b406b63a2ab6c1c5541febdcacd79961a34574 SHA512 dbc633a74bc5ce5b46de410b52cb1bd7a81ebc21d57ae75ccd5b50476b557e412f6e21820fb9cc0f499dbcfb28a6975d2fe86531eeccfb90b674ffc6512319db EBUILD mysql-workbench-8.0.16.ebuild 2637 BLAKE2B 3b51c37e36967fcb2b88693953c18729ef3932ef2c8af677fb36ec9a9fce324d2897364b07cae56753fd4c793b832e55096935959019e8c23446a4a3ed886763 SHA512 a4ca773c4f10e60d3413244f0f7599dce9ce740e3e39bffd4bd150b8a5bcbe30f038f85cd4dee05d9495bf9fb69658867a926f5c15415f2647fa18f7c8bf510c EBUILD mysql-workbench-8.0.17.ebuild 2563 BLAKE2B 6a0adebe6937f644d709c55f34017d6ca661517e4424d924fdda4f972c702d7bac081da9a0f869d06873169df9c5066f196e857cb423f63d80286650888a1710 SHA512 2bbab3de08f6cb73c0b606d2a0a19035f3829d28b74a46c257360e21c4c5b0c823f7511193a20d49f4f60acc055c38c117cf9f0aa962e8e09799848ed55f7017 +EBUILD mysql-workbench-8.0.18.ebuild 2548 BLAKE2B c13dd24c389893a14bfa544521d2690a7716471de13173101a06259f370be44e628151d604e912a589432b43625721d10df587a5368c09dc8b935dbb48520380 SHA512 ef5fdd7c4c77787e563d2c39bd94e6431894201fcc5ea993d77497fbb8d7706ec3b071f2ecb9d01bb37a8fc9a2ea85fa799a62d9ef61a56c16032e7d3cac82b2 MISC metadata.xml 310 BLAKE2B b0d985e39bb17865a05907e5449723c2bf862d9f3ae7f8570173c9cff443171feef6694db26a51880f8c1a4b1e3834ca7ab9bc7c2057fd6f8930b9d1c1c02cdd SHA512 f284063d72f2218f8ed60a74b43f252d608865682b8c0447f52016a02a7cbf6d45a226787d893328dd31946ade1cca78ff7556896183b4422c4142a8935a2193 diff --git a/dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild b/dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild new file mode 100644 index 000000000000..75561cb1b2c8 --- /dev/null +++ b/dev-db/mysql-workbench/mysql-workbench-8.0.18.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GCONF_DEBUG="no" + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite" + +ANTLR_VERSION=4.7.1 + +inherit gnome2 flag-o-matic python-single-r1 cmake-utils + +MY_P="${PN}-community-${PV}-src" + +DESCRIPTION="MySQL Workbench" +HOMEPAGE="https://www.mysql.com/products/workbench/" +SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://www.antlr.org/download/antlr-${ANTLR_VERSION}-complete.jar" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="debug doc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# glibc: deprecated mutex functions, removed in 2.36.0 +CDEPEND="${PYTHON_DEPS} + app-crypt/libsecret + dev-libs/glib:2 + dev-cpp/antlr-cpp:4 + dev-cpp/atkmm + dev-cpp/pangomm + >=dev-cpp/glibmm-2.14:2 + dev-cpp/gtkmm:3.0 + dev-libs/atk + >=net-libs/libssh-0.8.5[server] + x11-libs/pango + x11-libs/gtk+:3 + gnome-base/libglade:2.0 + >=x11-libs/cairo-1.5.12[glib,svg] + >=dev-libs/rapidjson-1.1.0 + dev-libs/libsigc++:2 + >=dev-libs/boost-1.55.0[nls] + >=dev-cpp/ctemplate-0.95 + >=dev-libs/libxml2-2.6.2:2 + dev-libs/libzip + dev-libs/libpcre[cxx] + >=sci-libs/gdal-1.11.1-r1 + virtual/opengl + || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) + dev-libs/tinyxml[stl] + >=dev-db/mysql-connector-c++-1.1.8 + dev-db/vsqlite++ + || ( dev-db/libiodbc dev-db/unixODBC ) + dev-python/pexpect + >=dev-python/paramiko-1.7.4 +" + +RDEPEND="${CDEPEND} + app-admin/sudo + >=sys-apps/net-tools-1.60_p20120127084908" + +DEPEND="${CDEPEND} + dev-lang/swig + virtual/jre + virtual/pkgconfig" + +S="${WORKDIR}"/"${MY_P}" + +PATCHES=( + "${FILESDIR}/${PN}-6.2.5-wbcopytables.patch" +) + +src_unpack() { + unpack ${PN}-community-${PV}-src.tar.gz +} + +src_prepare() { + ## remove hardcoded CXXFLAGS + sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die + ## And avoid -Werror + sed -i -e 's/-Werror//' CMakeLists.txt || die + + ## package is very fragile... + strip-flags + + cmake-utils_src_prepare +} + +src_configure() { + if has_version dev-db/libiodbc ; then + IODBC="-DIODBC_CONFIG_PATH=/usr/bin/iodbc-config" + fi + + append-cxxflags -std=c++11 + ANTLR_JAR_PATH="${DISTDIR}/antlr-${ANTLR_VERSION}-complete.jar" + local mycmakeargs=( + -DWITH_ANTLR_JAR=${ANTLR_JAR_PATH} + -DLIB_INSTALL_DIR="/usr/$(get_libdir)" + -DIODBC_INCLUDE_PATH="/usr/include/iodbc" + ${IODBC} + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DMySQL_CONFIG_PATH="/usr/bin/mysql_config" + ) + cmake-utils_src_configure +} diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index d0c9176e26ba..f5097754a938 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -9,11 +9,14 @@ DIST mysql-5.6.45.tar.gz 32525559 BLAKE2B 3c629aed1de808acdea6654c7413e6851507c9 DIST mysql-boost-5.7.26.tar.gz 51098338 BLAKE2B 1263cd75814a7293b26b0f44fd2b7d20d983f3c6a62725df9515ecac2ef252f6644810cb4bf0d6f36b98e55317f1c67ea7541228cb38d896dfedc476a5755f26 SHA512 a5f9871dc5a8e5fffc1467c3dd542533a63fe553c029120475f8fd5530d884c76ab0c33ad260daf317faf318ccef01464f6ac2dc3468efceb6bf2b6c06c54cfd DIST mysql-boost-5.7.27.tar.gz 51436383 BLAKE2B 6db64ab5fa659aae9baa3725a0de9465e48c37618ffd69f34809880c06a00ce55dce77f507810c6fa52d86901facfa42d3d1bd8db1914a779fbc88a69be82497 SHA512 573f4555f3d62bcd3dc2228bcfba023518d462bb6689114a3505ccf7c7c3061d2775a8e7a37ec3c8b9dea6e8fbc56ba599610f237abc38cedff58e75799bdc52 DIST mysql-boost-8.0.17.tar.gz 189322239 BLAKE2B f9f46e5fdc3e9869b203626bc09edfbcdbabcd68eba43f9c6a33b9a52cffb3a32f39704c6d22a66899aac16fa2efb271c5dc7af7522768b45542ac8dc615cd8a SHA512 a278ee263670cb1f79d67c4b87c4b88632569c3b20a4297a6e77d550155db20902f22992ea851cf59ea523bb97d5e08707e3457f71a678e9f1ac2fa4ca5b7a2d +DIST mysql-boost-8.0.18.tar.gz 194953221 BLAKE2B e3622cccd8f60487a5e643e522e9cdc763d63ad2a5eda86a7a7db37f48a4e1288fea88ef7097c6c4b51bd5e8fd8ba26a5b8aea3501ae847180066e2d0aa2b5dc SHA512 180091ad3e74e2afa28ecb914850e6b4e8c92b8981f32b161f53381b92120d87dbd2c2fc073feb2543bb71702bac7368e9fb992821cfd3e3ca888019423b89f5 DIST mysql-extras-20190817-0024Z.tar.bz2 337793 BLAKE2B dfd51a708654aff5bdbbaf2acad7ef966869a8e3adcba544ee15f217d2ba942827445841e73981bccc6c1f145b6225bfa7245114219f0cf52f0dfb85494a6830 SHA512 c2ff81be1c55636f0a2700033af030149f312f0383217054a4b8c65aef174626299fcb4539eaae967ea7d096a5bb09f5b5122dce344b44b0a135d886ba0fdf28 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8 +DIST mysql-extras-20191016-1722Z.tar.bz2 340442 BLAKE2B fa38fc455693b940cfb96f69a35c190f7edb3fdfa7bf0e3f4e444032843ca1ad1d4767fecaf3b080f7f8885335ffe81f2355e9fe0fdebe77ac90d7fb1a0d2121 SHA512 1b4d3fb1cda63471807e37ecdd6a663672149a9eac9497d6b864a9ecdd57d179950176da2db0668892567994bd2fc1e98ea499f16dc689738331a1e319c9131c EBUILD mysql-5.6.44-r1.ebuild 27130 BLAKE2B d42d26aa3282093b81c795f1ef909487831cede065a996d814850fb4c638c848d278ba0ef0d8275a2ef1c91c5832977d7c2aa3085f324ddb03a2ac25b1607916 SHA512 16e437ee7e8497b84dabf1698f701ff46c096530acfa5d211c9ca96fa538b0014f8571e2fce64182c2d497155383353bdc38a69a68dd7d333c96e9175cea804a EBUILD mysql-5.6.45-r2.ebuild 27081 BLAKE2B eda4a8ff2d1145cd35e886442a09dbf9432ebcd498d2ebe8008d4acdd591ab4865b33ba4c8de663af47388f2e5934164cef72fd6593154721d9b0be4e0793f9c SHA512 65036a9f986aa579b831a0c1f595eae15752f0905c3d91eaa446d771af42417057a31a63cdecbdeabd33e2bc45a4cda1e5974e588a875d6df777104cf51bfe3b EBUILD mysql-5.7.26-r1.ebuild 31717 BLAKE2B 3085f70b4a76baaf7f94ac8fe5e37b9c3470b6537a88a626236232dec1c2cf234f4d25f83ab7bfd92fba1881b4080039c0259c4485259be472c8833cfcb71b6d SHA512 6663432102f90d9d2cbda3937c1a5e1dc9a01e4d6599bc517e0303e73beda60766be930cd9695fb4d0a65ea6e746c27f5449eda2e64e0268e670d0f5660040fb EBUILD mysql-5.7.27-r1.ebuild 31744 BLAKE2B d845c5dc775b1f25d8b63b66aaeca0620dab0709a49e47943e73a182eef8c96a79125454bcfd830ae6f8ec1659b48262837121c6670e227f2745a9ae7ed5584b SHA512 41dfcdde2790359007f84905900931a96259cf150e690213a7c2a3714d2c6e7d26c3b8a1a0cada5f7b3ee8067bff2c190b1a57945617b31d204e3fe53b9ea022 EBUILD mysql-8.0.17.ebuild 36451 BLAKE2B 9e81d30e5f0569790047ba7484ebe47cd70bc709ef4eca59caa5fdd2aeed4c4fddada4cfa1bbe5f298d759fc30e496d9fbe5ece7925d08eb8153cb507ada30d6 SHA512 ceeefc52d0a62cba8af57fed0a137e0317c4db39f237d31a9991611ef84ddade142287194d84e3f1dcba4ebd5c1a63c85821a2bfc2642adc0f0ebd45ed6270d2 +EBUILD mysql-8.0.18.ebuild 36472 BLAKE2B 7ac22811242bd58740930388149e8091f4b7b7a76574320d42e447d1524c046245acd8b07fea875208b676c11bdf47294f4b72bc443e9ab53f04165a15a8c0a1 SHA512 be5750b6518dd8f43e729231b53e365af3087bd41570f7eff5a2cf3b9cf9225e4e8501e57fd8f2ff69e752d2bfa2628388701ec7e25fce2c9b76a4a8bd5089c7 MISC metadata.xml 1470 BLAKE2B 09754bc9a1cf5584588c4f69700919fd72a860175ae1c045ce90a644a1360d5abccedd5b2649e16fcd189e82df659ceb96fd71ab2aeccdac6256af4f80e46a0d SHA512 d96f6a133611f50b80116221e2586eff899210255efac58d9f6ef7ccd0ee0854a3322b4d4d1db15b3b2e410525f5d73e43f52a833f3ce358f6708b88b3cf00c7 diff --git a/dev-db/mysql/mysql-8.0.18.ebuild b/dev-db/mysql/mysql-8.0.18.ebuild new file mode 100644 index 000000000000..95f1b274f5cc --- /dev/null +++ b/dev-db/mysql/mysql-8.0.18.ebuild @@ -0,0 +1,1117 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +MY_EXTRAS_VER="20191016-1722Z" + +CMAKE_MAKEFILE_GENERATOR=emake + +inherit cmake-utils flag-o-matic linux-info \ + multiprocessing prefix toolchain-funcs check-reqs + +MY_PV="${PV//_pre*}" +MY_P="${PN}-${MY_PV}" + +S="${WORKDIR}/${PN}-${MY_PV}" + +SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz + https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz + http://downloads.mysql.com/archives/MySQL-8.0/${PN}-boost-${MY_PV}.tar.gz" + +# Gentoo patches to MySQL +if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]] ; then + SRC_URI="${SRC_URI} + mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" +fi + +HOMEPAGE="https://www.mysql.com/" +DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" +LICENSE="GPL-2" +SLOT="0" +IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling + router selinux +server tcmalloc test" + +# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests +RESTRICT="libressl? ( test )" + +REQUIRED_USE="?? ( tcmalloc jemalloc )" + +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras" + EGIT_CLONE_TYPE=shallow + MY_PATCH_DIR="${WORKDIR}/mysql-extras" +else + MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" +fi + +PATCHES=( + "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-8.0.17.patch + "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-8.0.18.patch + "${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.18-without-clientlibs-tools.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.17-add-protobuf-3.8+-support.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.18-fix-libressl-support.patch +) + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +COMMON_DEPEND=" + >=app-arch/lz4-0_p131:= + dev-libs/icu:= + dev-libs/libedit + dev-libs/libevent:= + net-libs/libtirpc:= + >=sys-libs/zlib-1.2.3:0= + cjk? ( app-text/mecab:= ) + jemalloc? ( dev-libs/jemalloc:0= ) + kernel_linux? ( + dev-libs/libaio:0= + sys-process/procps:0= + ) + libressl? ( dev-libs/libressl:0= ) + !libressl? ( >=dev-libs/openssl-1.0.0:0= ) + numa? ( sys-process/numactl ) + tcmalloc? ( dev-util/google-perftools:0= ) +" +DEPEND="${COMMON_DEPEND} + || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + >=dev-libs/protobuf-3.8 + net-libs/rpcsvc-proto + virtual/yacc + test? ( + acct-group/mysql acct-user/mysql + dev-perl/JSON + ) +" +RDEPEND="${COMMON_DEPEND} + !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster + selinux? ( sec-policy/selinux-mysql ) + !prefix? ( + acct-group/mysql acct-user/mysql + dev-db/mysql-init-scripts + ) +" +# For other stuff to bring us in +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" + +CHECKREQS_DISK_BUILD="8G" + +mysql_init_vars() { + : ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + : ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + : ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + : ${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + MY_DATADIR="${MY_LOCALSTATEDIR}" + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LOCALSTATEDIR MY_LOGDIR + export MY_DATADIR +} + +pkg_pretend() { + [[ ${MERGE_TYPE} == binary ]] && return + use server && check-reqs_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} == binary ]] && return + + if has test ${FEATURES} ; then + # Bug #213475 - MySQL _will_ object strenuously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if ! has userpriv ${FEATURES} ; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + + local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null) + [[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \ + && die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!" + + if use latin1 ; then + # Upstream only supports tests with default charset + die "Testing with USE=latin1 is not supported." + fi + fi + + if use kernel_linux ; then + if use numa ; then + linux-info_get_any_version + + local CONFIG_CHECK="~NUMA" + + local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;" + WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support" + + check_extra_config + fi + fi + + use server && check-reqs_pkg_setup +} + +src_unpack() { + unpack ${A} + + # Grab the patches + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack + + mv -f "${WORKDIR}/${MY_P}" "${S}" || die +} + +src_prepare() { + # Avoid rpm call which would trigger sandbox, #692368 + sed -i \ + -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ + CMakeLists.txt || die + + if use jemalloc ; then + echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die + fi + + if use tcmalloc ; then + echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die + fi + + # Remove the centos and rhel selinux policies to support mysqld_safe under SELinux + if [[ -d "${S}/support-files/SELinux" ]] ; then + echo > "${S}/support-files/SELinux/CMakeLists.txt" || die + fi + + # Remove man pages for client-lib tools we don't install + rm \ + man/my_print_defaults.1 \ + man/perror.1 \ + man/zlib_decompress.1 \ + || die + + cmake-utils_src_prepare +} + +src_configure(){ + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + append-cxxflags -felide-constructors + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" + -DSYSCONFDIR="${EPREFIX}/etc/mysql" + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${PF} + -DINSTALL_DOCREADMEDIR=share/doc/${PF} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLSHAREDIR=share/mysql + -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" + -DINSTALL_SBINDIR=sbin + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" + -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" + -DWITH_UNIT_TESTS=$(usex test ON OFF) + -DWITH_EDITLINE=system + -DWITH_ZLIB=system + -DWITH_SSL=system + -DWITH_LIBWRAP=0 + -DENABLED_LOCAL_INFILE=1 + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DWITH_DEFAULT_COMPILER_OPTIONS=0 + -DWITH_DEFAULT_FEATURE_SET=0 + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DWITH_CURL=system + -DWITH_BOOST="${S}/boost" + -DWITH_ROUTER=$(usex router ON OFF) + ) + if use test ; then + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test ) + else + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) + fi + + mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES ) + + # client/mysql.cc:1131:16: error: redefinition of ‘struct _hist_entry’ + mycmakeargs+=( + -DUSE_LIBEDIT_INTERFACE=0 + -DUSE_NEW_EDITLINE_INTERFACE=1 + -DHAVE_HIST_ENTRY=1 + ) + + mycmakeargs+=( + -DWITH_ICU=system + -DWITH_LIBEVENT=system + -DWITH_LZ4=system + -DWITH_PROTOBUF=system + -DWITH_MECAB=$(usex cjk system OFF) + -DWITH_NUMA=$(usex numa ON OFF) + # Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex + -DWITH_RAPIDJSON=bundled + ) + + if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + ewarn "Tests will probably fail!" + + mycmakeargs+=( + -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} + -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} + ) + elif use latin1 ; then + mycmakeargs+=( + -DDEFAULT_CHARSET=latin1 + -DDEFAULT_COLLATION=latin1_swedish_ci + ) + else + mycmakeargs+=( + -DDEFAULT_CHARSET=utf8mb4 + -DDEFAULT_COLLATION=utf8mb4_0900_ai_ci + ) + fi + + if use server ; then + mycmakeargs+=( + -DWITH_EXTRA_CHARSETS=all + -DWITH_DEBUG=$(usex debug) + ) + + if use profiling ; then + # Setting to OFF doesn't work: Once set, profiling options will be added + # to `mysqld --help` output via sql/sys_vars.cc causing + # "main.mysqld--help-notwin" test to fail + mycmakeargs+=( -DENABLED_PROFILING=ON ) + fi + + # Storage engines + mycmakeargs+=( + -DWITH_EXAMPLE_STORAGE_ENGINE=0 + -DWITH_ARCHIVE_STORAGE_ENGINE=1 + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 + -DWITH_CSV_STORAGE_ENGINE=1 + -DWITH_FEDERATED_STORAGE_ENGINE=1 + -DWITH_HEAP_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=1 + -DWITH_INNODB_MEMCACHED=0 + -DWITH_MYISAMMRG_STORAGE_ENGINE=1 + -DWITH_MYISAM_STORAGE_ENGINE=1 + ) + else + mycmakeargs+=( + -DWITHOUT_SERVER=1 + -DWITH_SYSTEMD=no + ) + fi + + cmake-utils_src_configure +} + +# Official test instructions: +# ulimit -n 16500 && \ +# USE='perl server' \ +# FEATURES='test userpriv' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +src_test() { + _disable_test() { + local rawtestname bug reason + rawtestname="${1}" ; shift + bug="${1}" ; shift + reason="${@}" + ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})" + echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def" + } + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + if [[ -z "${MTR_PARALLEL}" ]] ; then + local -x MTR_PARALLEL=$(makeopts_jobs) + + if [[ ${MTR_PARALLEL} -gt 4 ]] ; then + # Running multiple tests in parallel usually require higher ulimit + # and fs.aio-max-nr setting. In addition, tests like main.multi_update + # are known to hit timeout when system is busy. + # To avoid test failure we will limit MTR_PARALLEL to 4 instead of + # using "auto". + local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})" + info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!" + einfo "${info_msg}" + unset info_msg + MTR_PARALLEL=4 + fi + else + einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'" + fi + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} || die + + # Run mysql tests + pushd "${TESTDIR}" &>/dev/null || die + + touch "${T}/disabled.def" + + local -a disabled_tests + disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges") + disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet") + disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet") + disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" ) + disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Known failure - no upstream bug yet" ) + disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware") + disabled_tests+=( "x.connection;0;Known failure - no upstream bug yet" ) + disabled_tests+=( "main.mysqlpump_basic_lz4;0;Extra tool output causes false positive" ) + + local test_ds + for test_infos_str in "${disabled_tests[@]}" ; do + IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}" + + if [[ ${#test_infos_arr[@]} != 3 ]] ; then + die "Invalid test data set, not matching format: ${test_infos_str}" + fi + + _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}" + done + unset test_ds test_infos_str test_infos_arr + + # Try to increase file limits to increase test coverage + if ! ulimit -n 16500 1>/dev/null 2>&1 ; then + # Upper limit comes from parts.partition_* tests + ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager." + + if ! ulimit -n 4162 1>/dev/null 2>&1 ; then + # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)' + ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager." + + if ! ulimit -n 3000 1>/dev/null 2>&1 ; then + ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager." + else + einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 4162 (medium test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 16500 (best test coverage)." + fi + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" + retstatus_tests=$? + + popd &>/dev/null || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + local failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" +} + +src_install() { + cmake-utils_src_install + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Convenience links + einfo "Making Convenience links for mysqlcheck multi-call binary" + dosym "mysqlcheck" "/usr/bin/mysqlanalyze" + dosym "mysqlcheck" "/usr/bin/mysqlrepair" + dosym "mysqlcheck" "/usr/bin/mysqloptimize" + + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir + if [[ -d "${ED}/usr/data" ]] ; then + rm -Rf "${ED}/usr/data" || die + fi + + # Unless they explicitly specific USE=test, then do not install the + # testsuite. It DOES have a use to be installed, esp. when you want to do a + # validation of your database configuration after tuning it. + if ! use test ; then + rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test" + fi + + # Configuration stuff + einfo "Building default configuration ..." + insinto "${MY_SYSCONFDIR#${EPREFIX}}" + [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf + cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die + eprefixify "${TMPDIR}/my.cnf" + doins "${TMPDIR}/my.cnf" + insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d" + cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die + eprefixify "${TMPDIR}/50-distro-client.cnf" + doins "${TMPDIR}/50-distro-client.cnf" + + mycnf_src="my.cnf-8.0.distro-server" + sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ + "${FILESDIR}/${mycnf_src}" \ + > "${TMPDIR}/my.cnf.ok" || die + + if use prefix ; then + sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \ + "${TMPDIR}/my.cnf.ok" || die + fi + + if use latin1 ; then + sed -i \ + -e "/character-set/s|utf8mb4|latin1|g" \ + "${TMPDIR}/my.cnf.ok" || die + fi + + eprefixify "${TMPDIR}/my.cnf.ok" + + newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf + + #Remove mytop if perl is not selected + [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" + + if use router ; then + rm -rf \ + "${ED}/usr/LICENSE.router" \ + "${ED}/usr/README.router" \ + "${ED}/usr/run" \ + "${ED}/usr/var" \ + || die + fi + + # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them. + find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die +} + +pkg_postinst() { + # Make sure the vars are correctly initialized + mysql_init_vars + + # Create log directory securely if it does not exist + # NOTE: $MY_LOGDIR contains $EPREFIX by default + [[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}" + + # Note about configuration change + einfo + elog "This version of ${PN} reorganizes the configuration from a single my.cnf" + elog "to several files in /etc/mysql/mysql.d." + elog "Please backup any changes you made to /etc/mysql/my.cnf" + elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension." + elog "You may have as many files as needed and they are read alphabetically." + elog "Be sure the options have the appropriate section headers, i.e. [mysqld]." + einfo + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + einfo + elog "You might want to run:" + elog " \"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + einfo + else + einfo + elog "Upgrade process for ${PN}-8.x has changed. Please read" + elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html" + einfo + fi +} + +pkg_config() { + local mysqld_binary="${EROOT}/usr/sbin/mysqld" + if [[ ! -x "${mysqld_binary}" ]] ; then + die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!" + fi + + local mysql_binary="${EROOT}/usr/bin/mysql" + if [[ ! -x "${mysql_binary}" ]] ; then + die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!" + fi + + local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults" + if [[ ! -x "${my_print_defaults_binary}" ]] ; then + die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!" + fi + + if [[ -z "${MYSQL_USER}" ]] ; then + MYSQL_USER=mysql + if use prefix ; then + MYSQL_USER=$(id -u -n 2>/dev/null) + if [[ -z "${MYSQL_USER}" ]] ; then + die "Failed to determine current username!" + fi + fi + fi + + if [[ -z "${MYSQL_GROUP}" ]] ; then + MYSQL_GROUP=mysql + if use prefix ; then + MYSQL_GROUP=$(id -g -n 2>/dev/null) + if [[ -z "${MYSQL_GROUP}" ]] ; then + die "Failed to determine current user groupname!" + fi + fi + fi + + einfo "Will use username '${MYSQL_USER}' and group '${MYSQL_GROUP}' ..." + + _getoptval() { + local section="$1" + local flag="--${2}=" + local extra_options="${3}" + local cmd=( + "${my_print_defaults_binary}" + "${extra_options}" + "${section}" + ) + local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") ) + + if [[ ${#results[@]} -gt 0 ]] ; then + # When option is set multiple times only return last value + echo "${results[-1]}" + fi + } + + _mktemp_dry() { + # emktemp has no --dry-run option + local template="${1}" + + if [[ -z "${template}" ]] ; then + if [[ -z "${T}" ]] ; then + template="/tmp/XXXXXXX" + else + template="${T}/XXXXXXX" + fi + fi + + local template_wo_X=${template//X/} + local n_X + let n_X=${#template}-${#template_wo_X} + if [[ ${n_X} -lt 3 ]] ; then + echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2 + return + fi + + local attempts=0 + local character tmpfile + while [[ true ]] ; do + let attempts=attempts+1 + + new_file= + while read -n1 character ; do + if [[ "${character}" == "X" ]] ; then + tmpfile+="${RANDOM:0:1}" + else + tmpfile+="${character}" + fi + done < <(echo -n "${template}") + + if [[ ! -f "${tmpfile}" ]] + then + echo "${tmpfile}" + return + fi + + if [[ ${attempts} -ge 100 ]] ; then + echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2 + return + fi + done + } + + # my_print_defaults needs to read stuff in $HOME/.my.cnf + local -x HOME="${EROOT}/root" + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Read currently set data directory + MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")" + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [[ -z "${MY_DATADIR}" ]] ; then + die "Sorry, unable to find MY_DATADIR!" + elif [[ -d "${MY_DATADIR}/mysql" ]] ; then + ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!" + ewarn "Please rename or delete its content if you wish to initialize a new data directory." + die "${PN} data directory at '${MY_DATADIR}' looks already initialized!" + else + einfo "${PN} data directory detected as '${MY_DATADIR}' ..." + fi + + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")" + # These are dir+prefix + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + + # Create missing directories. + # Always check if mysql user can write to directory even if we just + # created directory because a parent directory might be not + # accessible for that user. + PID_DIR="${EROOT}/run/mysqld" + if [[ ! -d "${PID_DIR}" ]] ; then + einfo "Creating ${PN} PID directory '${PID_DIR}' ..." + install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \ + || die "Failed to create PID directory '${PID_DIR}'!" + fi + + local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_pid_dir_testfile}" ]] \ + && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_pid_dir_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]] ; then + die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!" + else + rm "${_pid_dir_testfile}" || die + unset _pid_dir_testfile + fi + + if [[ ! -d "${MY_DATADIR}" ]] ; then + einfo "Creating ${PN} data directory '${MY_DATADIR}' ..." + install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \ + || die "Failed to create ${PN} data directory '${MY_DATADIR}'!" + fi + + local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_my_datadir_testfile}" ]] \ + && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_my_datadir_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]]; then + die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!" + else + rm "${_my_datadir_testfile}" || die + unset _my_datadir_testfile + fi + + if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then + einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..." + install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \ + || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!" + fi + + if [[ -n "${MYSQL_TMPDIR}" ]] ; then + local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_my_tmpdir_testfile}" ]] \ + && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_my_tmpdir_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]]; then + die "${MYSQL_USER} user cannot write into data directory '${MYSQL_TMPDIR}'!" + else + rm "${_my_tmpdir_testfile}" || die + unset _my_tmpdir_testfile + fi + else + # If no tmpdir is set, mysqld will use default system tmpdir. + # However, we are using tmpdir from package manager at the + # moment which maybe isn't writeable for $MYSQL_USER... + MYSQL_TMPDIR="$(_mktemp_dry "${T}/mysqld-tmp.XXXXXXXXX")" + [[ -z "${MYSQL_TMPDIR}" ]] \ + && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!" + + mkdir "${MYSQL_TMPDIR}" || die + chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die + fi + + if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then + einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..." + install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \ + || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'" + fi + + if [[ -n "${MYSQL_LOG_BIN}" ]] ; then + local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_my_logbin_testfile}" ]] \ + && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_my_logbin_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]]; then + die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!" + else + rm "${_my_logbin_testfile}" || die + unset _my_logbin_testfile + fi + fi + + if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then + einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..." + install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \ + || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!" + fi + + if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then + local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_my_relaylog_testfile}" ]] \ + && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_my_relaylog_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]]; then + die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!" + else + rm "${_my_relaylog_testfile}" || die + unset _my_relaylog_testfile + fi + fi + + local -a config_files + + local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf" + if [[ -f "${config_file}" ]] ; then + config_files+=( "${config_file}" ) + else + ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..." + fi + + config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf" + if [[ -f "${config_file}" ]] ; then + config_files+=( "${config_file}" ) + else + ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..." + fi + + if [[ ${#config_files[@]} -gt 0 ]] ; then + if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then + local user_answer + + echo + einfo "Please select default authentication plugin (enter number or plugin name):" + einfo "1) caching_sha2_password [MySQL 8.0 default]" + einfo "2) mysql_native_password [MySQL 5.7 default]" + einfo + einfo "For details see:" + einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password" + read -p " >" user_answer + echo + + case "${user_answer}" in + 1|caching_sha2_password) + MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password + ;; + 2|mysql_native_password) + MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password + ;; + '') + die "No authentication plugin selected!" + ;; + *) + die "Authentication plugin '${user_answer}' is unknown/unsupported!" + ;; + esac + + unset user_answer + fi + + local cfg_option cfg_option_tabs cfg_section + for config_file in "${config_files[@]}" ; do + cfg_option="default-authentication-plugin" + cfg_section="mysqld" + cfg_option_tabs="\t\t" + if [[ "${config_file}" == *client.cnf ]] ; then + cfg_option="default-auth" + cfg_section="client" + cfg_option_tabs="\t\t\t\t" + fi + + if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then + einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..." + sed -i \ + -e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \ + "${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!" + else + einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..." + sed -i \ + -e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \ + "${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!" + fi + done + unset cfg_option cfg_option_tabs cfg_section + fi + unset config_files config_file + + echo + + if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then + local tmp_mysqld_password_source= + + for tmp_mysqld_password_source in mysql client ; do + einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" + if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then + if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then + ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" + MYSQL_ROOT_PASSWORD= + continue + fi + + einfo "Found password in '${tmp_mysqld_password_source}' section!" + break + fi + done + + # Sometimes --show is required to display passwords in some implementations of my_print_defaults + if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" + fi + + unset tmp_mysqld_password_source + fi + + if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then + local pwd1="a" + local pwd2="b" + + echo + einfo "No password for mysql 'root' user was specified via environment" + einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config" + einfo "file like '${HOME}/.my.cnf'." + einfo "To continue please provide a password for the mysql 'root' user" + einfo "now on console:" + ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same!" + fi + + MYSQL_ROOT_PASSWORD="${pwd1}" + unset pwd1 pwd2 + + echo + fi + + local -a mysqld_options + + # Fix bug 446200. Don't reference host my.cnf, needs to come first, + # see http://bugs.mysql.com/bug.php?id=31312 + use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" ) + + # Figure out which options we need to disable to do the setup + local helpfile="${TMPDIR}/mysqld-help" + "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null + + local opt optexp optfull + for opt in host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + log-slave-updates \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" ) + done + + # Prepare timezones, see + # https://dev.mysql.com/doc/mysql/en/time-zone-support.html + local tz_sql="${TMPDIR}/tz.sql" + echo "USE mysql;" >"${tz_sql}" + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null + if [[ $? -ne 0 ]] ; then + die "mysql_tzinfo_to_sql failed!" + fi + + chown ${MYSQL_USER} "${tz_sql}" || die + + local mysql_install_log="${TMPDIR}/mysql_install_db.log" + touch "${mysql_install_log}" || die + chown ${MYSQL_USER} "${mysql_install_log}" || die + + # --initialize-insecure will not set root password + # --initialize would set a random one in the log which we don't need as we set it ourselves + local cmd=( + "${mysqld_binary}" + "${mysqld_options[@]}" + "--initialize-insecure" + "--init-file='${tz_sql}'" + "--basedir='${EROOT}/usr'" + "--datadir='${MY_DATADIR}'" + "--tmpdir='${MYSQL_TMPDIR}'" + "--log-error='${mysql_install_log}'" + "--user=${MYSQL_USER}" + ) + + einfo "Initializing ${PN} data directory: ${cmd[@]}" + eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1 + + if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then + grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2 + die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!" + fi + + local x=${RANDOM} + local socket="${EROOT}/run/mysqld/mysqld${x}.sock" + local pidfile="${EROOT}/run/mysqld/mysqld${x}.pid" + unset x + + local mysqld_logfile="${TMPDIR}/mysqld.log" + touch "${mysqld_logfile}" || die + chown ${MYSQL_USER} "${mysqld_logfile}" || die + + cmd=( + "${mysqld_binary}" + "${mysqld_options[@]}" + "--basedir='${EROOT}/usr'" + "--datadir='${MY_DATADIR}'" + "--tmpdir='${MYSQL_TMPDIR}'" + --max_allowed_packet=8M + --net_buffer_length=16K + "--socket='${socket}'" + "--pid-file='${pidfile}'" + "--log-error='${mysqld_logfile}'" + "--user=${MYSQL_USER}" + ) + + einfo "Starting mysqld to finalize initialization: ${cmd[@]}" + eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 & + + echo -n "Waiting for mysqld to accept connections " + local maxtry=15 + while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + + if [[ -S "${socket}" ]] ; then + # Even with a socket we don't know if mysqld will abort + # start due to an error so just wait a little bit more... + maxtry=5 + while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + fi + + echo + + if [[ ! -S "${socket}" ]] ; then + grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2 + die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!" + fi + + local mysql_logfile="${TMPDIR}/set_root_pw.log" + touch "${mysql_logfile}" || die + + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'" + cmd=( + "${mysql_binary}" + --no-defaults + "--socket='${socket}'" + -hlocalhost + "-e \"${sql}\"" + ) + eval "${cmd[@]}" >"${mysql_logfile}" 2>&1 + local rc=$? + eend ${rc} + + if [[ ${rc} -ne 0 ]] ; then + # Poor man's solution which tries to avoid having password + # in log. NOTE: sed can fail if user didn't follow advice + # and included character which will require escaping... + sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null + + grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}" + die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!" + fi + + # Stop the server + if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then + echo -n "Stopping the server " + pkill -F "${pidfile}" &>/dev/null + + maxtry=10 + while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + + echo + + if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then + # We somehow failed to stop server. + # However, not a fatal error. Just warn the user. + ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!" + fi + fi + + einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!" +} diff --git a/dev-db/mysqltuner/Manifest b/dev-db/mysqltuner/Manifest index c6efefbe3164..b132b64a5c22 100644 --- a/dev-db/mysqltuner/Manifest +++ b/dev-db/mysqltuner/Manifest @@ -2,7 +2,9 @@ AUX mysqltuner-1.7.15-password.patch 470 BLAKE2B effac147bcb0b471267659236035017 DIST mysqltuner-1.6.18.tar.gz 169074 BLAKE2B e138e29db2f0b1abf88b2d8268732fd9f05043abf320d8d97493d6abb3880e5664eaea39392406297e3125789ffc172f6347922ba14a00af16beb3f6f8080802 SHA512 8067b7ac4a4fe7398ee2cdc463a30042f46972f97680b49912dca46fd1d835989aa4115568dbe5473ff28c4d956bf0ad70537318db788dd56bc93ad220e6bcb6 DIST mysqltuner-1.7.13.tar.gz 26721104 BLAKE2B 76a51c5e3ff897feed6bb6348fb5b09ab3fce0eae403880a3be96203522c9006980dbf6966e8c7e7784168c71e149cc57941ffbadba049b68b30993ed4d519d1 SHA512 88842bef1968f3150be49a5e82cdd0349bf0975f6ff0d8188117240ed2161ae1e44722077ff661ce31b55d0d4fc90fa4bb1972d96405113d82255718cebe0d53 DIST mysqltuner-1.7.15.tar.gz 212839 BLAKE2B cd90091063e6ae7737cb79f6936d14577352c5b6c016e0efcf82cfcabcbc1acf9f646258bebc835ede368d5ea5594e269d165cb01ab8c980e5fdc68f3c605747 SHA512 b1ea9c91df3fb68d7ae9e54014b4d9095122f10750f7807e0c72d9bbbb859db9a60bc8698d337f4dda6e1bd89ce4ff97fa4299f5dbf650f6fa03012c309e761f +DIST mysqltuner-1.7.17.tar.gz 213429 BLAKE2B 166ed3d657a529ce7c8e92648bcbf6da91f23a45222a8df0c6b79a7a23ffa7a1d066f2d3e2f651eb0aecc4032b75b7976cc8ea5e789ee2e7c990549b422fe30d SHA512 ded34cc9532eb407ba72b5669caab874c948031606b99e414b397bbd2a150801203f7af66a01b3d39a35cec570abbac09af9e2a5f594d1c36d9b3141b7bb12d5 EBUILD mysqltuner-1.6.18.ebuild 819 BLAKE2B 28fbddde037358d38eac70b778e77e255c3a2fcc812652ed42bd3482bca055c81beabd4bdb879d08b05cb15c6b9a5d036a2db0ecdc032fefbfcca8d5b7de1a48 SHA512 097e8b3cecb29cfc084d73befee963c656b017202f048fcd04d8b2a7880218500fd8f52a7b72edbf5f4fa8f8d3780924d8fe954a254c048d6b4f8264f9107dea EBUILD mysqltuner-1.7.13.ebuild 825 BLAKE2B 0a4c896905040f43d559161fece619065e9da1392a9cc9814743cf6170a0d279a781a224174f9621884c52db36345766b62826442268af3f06ac5dc085fe7d36 SHA512 3496115cd682c512e34d46fd5f5db623a78618737b5c23e400e7dedd0f96b6ab1b641abf6fbd394e7d283f00025971f58e9fe3a6c8b371d92824076a3cb4bc17 EBUILD mysqltuner-1.7.15.ebuild 954 BLAKE2B c769e561ab9abbcb314394bca95314e8f1c41464187c8b77952cec9e4e13c20f47f03b0feecc360a6b6a235576fc4b498c05fadfdb0f87eff0e705205fe0347a SHA512 cf78ab7498b00bf8a696b589e22d624fcfb72a1354637e01e36506b54d386abb79e66971ba8c69d3517b7dd699934a9292ee84bcfc10d6bb946391f6196868b5 +EBUILD mysqltuner-1.7.17.ebuild 840 BLAKE2B 0afbbc1c5be8eb0000c95aed44b8213f24daca361ffafcca733f8a0a773d374d7d6db68974e7ed96d9b7309ac6710e08588d6058f395f6e13b827d2690ddbe89 SHA512 2e06dae8f0ffb9c11abbafefe1a2a46b6e93929aa7194c201a17e7f5ce4ac128cf54bc81ec9f3a24d985c08099907246c42350ea1262441d9459847f6c29fb58 MISC metadata.xml 373 BLAKE2B 475b09852e48dea8abbad16dfe918d7cef776bbabe51814dcc4bb82d074480cd3cfd463fd23057c403464bdae86b6f411e1fad098888e29621eaf0da72f0d246 SHA512 68d62e37a26c89ab68afd24c6832553150b21ef6a2abe911f5de8169c52daf10e6e5ffd201e0124b4a5069b123aad0dbc7669420b8d1823423d98553c1a36e4d diff --git a/dev-db/mysqltuner/mysqltuner-1.7.17.ebuild b/dev-db/mysqltuner/mysqltuner-1.7.17.ebuild new file mode 100644 index 000000000000..f9caa472df48 --- /dev/null +++ b/dev-db/mysqltuner/mysqltuner-1.7.17.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=MySQLTuner-perl + +DESCRIPTION="MySQLTuner is a high-performance MySQL tuning script" +HOMEPAGE="https://github.com/major/MySQLTuner-perl" +SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-lang/perl + virtual/mysql + virtual/perl-Getopt-Long" + +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_PN}-${PV}" + +DOCS=( USAGE.md CONTRIBUTING.md INTERNALS.md basic_passwords.txt vulnerabilities.csv ) + +src_install() { + einstalldocs + + newbin "${PN}.pl" "${PN}" + + # Passwords and vulnerabilities are meant to be fed + # to the script uncompressed. + docompress -x "/usr/share/doc/${PF}/basic_passwords.txt" "/usr/share/doc/${PF}/vulnerabilities.csv" +} diff --git a/dev-db/odbtp/Manifest b/dev-db/odbtp/Manifest deleted file mode 100644 index 637441cc6869..000000000000 --- a/dev-db/odbtp/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX odbtp-1.1.4-amd64.patch 331 BLAKE2B 49c2f05527d933f209731a6d39f008d1a84c3db27eef5c5a20b4371b86d45c58932e117b0d3ea0c94b4ec7976342e1fb1b8afdf39f195237d6f4cedf46252bc8 SHA512 e2f9f6874ce9b40ba0c3e4d0619af8ade796fe5e03e25ff93d1bd94d2c43bcf8212d9dd4ebf9ff3fd462231cff6d7c59a755a9e5a58cc8de49e4e326950deaa7 -DIST odbtp-1.1.4.tar.gz 1049975 BLAKE2B be7a674ce871ee1b8f9b636bed78ff396648d335ffa1d01347ec6414ec9ca85091c8a5d0de2bcaff13e49e495ae1396bd22e903e40968582c7c689a46244ebc2 SHA512 4b87c8733fc1f017546024901874b0ea2f410646ef39f9581cc170773639077c3f885813550422966e8797489c66b32b75de85fa658e3bb84da285b96c0a7b70 -EBUILD odbtp-1.1.4.ebuild 840 BLAKE2B 52146688457c6b3422eb58130d947d80d66178b2d81bc161e23201d85ac68022ee2f6aaec08750c32a9e27ef650c23795a70ba8629624f8fbee7a33bcd572a99 SHA512 ede291791076e225994cf5b2ba2aeb266d006148f3e7c0cab3973be7fae6e5b9c6a1d777b42e16cd724d8ccfad103c325d20b9fc461b037f01a71183531bd39e -MISC metadata.xml 242 BLAKE2B 76781b6c876647b5fbb1ff6e12addeb8c1c8ed4dc87f64b2139c991448a19ef29124d3ffefbf07d44fe07fab755a90b26793c26a45ee33d77b8d4a66495e7a02 SHA512 283656b4ec20f636e1ee18de3c598a3100abb2862c7117da8c5fe9ea47b63c1b47fc17ca11313164d5b1e341e4480b5841271ea35236652fbb3f971fef2c51ec diff --git a/dev-db/odbtp/files/odbtp-1.1.4-amd64.patch b/dev-db/odbtp/files/odbtp-1.1.4-amd64.patch deleted file mode 100644 index 1ba2cb3b71e5..000000000000 --- a/dev-db/odbtp/files/odbtp-1.1.4-amd64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- odbtp-1.1.4/odbtp.h.old 2006-11-05 21:29:33.000000000 +0100 -+++ odbtp-1.1.4/odbtp.h 2006-11-05 21:29:44.000000000 +0100 -@@ -22,7 +22,7 @@ - #define _ODBTP_H_ - - /* The below line must be uncommented for 64-bit systems, such as Tru64. */ --/* #define _C_LONG_64_ 1 */ -+#define _C_LONG_64_ 1 - - #define ODBTP_LIB_VERSION "1.1.4" - diff --git a/dev-db/odbtp/metadata.xml b/dev-db/odbtp/metadata.xml deleted file mode 100644 index c5e963f21d42..000000000000 --- a/dev-db/odbtp/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - odbtp - - diff --git a/dev-db/odbtp/odbtp-1.1.4.ebuild b/dev-db/odbtp/odbtp-1.1.4.ebuild deleted file mode 100644 index fa6048a6e8f1..000000000000 --- a/dev-db/odbtp/odbtp-1.1.4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils toolchain-funcs - -DESCRIPTION="Fast, efficient TCP/IP protocol for connecting to Win32-based databases" -HOMEPAGE="http://odbtp.sourceforge.net/" -SRC_URI="mirror://sourceforge/odbtp/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Patch according to the README.64bitOS - use amd64 && epatch "${FILESDIR}/${P}-amd64.patch" -} - -src_compile() { - # respect $CC (bug #243768) - tc-export CC - econf || die "econf failed" - emake -j1 || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - # Install various documentation - dodoc AUTHORS INSTALL NEWS README* - if use doc ; then - dohtml -r docs/* - fi -} diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest index fbe8ca888326..f2bbdb44d5c8 100644 --- a/dev-db/percona-server/Manifest +++ b/dev-db/percona-server/Manifest @@ -1,10 +1,16 @@ AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e216d3f10034796de9aa618efb11482cef78b7c7e50393b5f665810d03321b5ca770ac8a6144 SHA512 1d7250689005c948f4a849959baf33f5f0fda099f230611651919ed053fb563daa19d996b7ca6714e224174172fb504f4d7d08e9d449a7e1203e32cf3fdec782 +AUX my.cnf-8.0.distro-client 749 BLAKE2B b01b39c85430714b5a4bfb9923c9ed1df99cdcef0583b25f28c2ebeee264732f4402198b1918e5ec5b4b1091dbda2d321baf31fe87eae00792b20042260969b3 SHA512 62aa589833126c2b78528e103f2de11ba0e339615cb00170a0f9f53bbb123a4bf99f2041819440297ab6cc34cf57333488e6ae12082fa5dcbe1b0ddef5f6108d +AUX my.cnf-8.0.distro-server 1125 BLAKE2B f4d6941aad1fc29e81e6c805ac42f4c8d3c7bc250990a9c432800dbe25b5c31be08d8e3895666b57f21606ffb69e704c57ed2692fd94696b9d325a4442596587 SHA512 82d35b7bc944e5690e1f2670a3d5674845610c2d11d6d8b1c5784ccb3877c6298de70eced3d7c497c0bcaecfa9e339ac43ce0534a97e7d976e950bb1a7f5c75d AUX my.cnf.distro-client 637 BLAKE2B b0812e0e03aa9a3b2e55e08b933a0b41b6afd95ded61f4d9d7c34a2d3810ec38520abd0d89e1c6565f61d4cd8a36d653f9f3199b3dd6a91345cdb5ff962685d8 SHA512 74bd1d9a58075d0a6195be1f94db310bcbe8da532b03844e6fa1ff84676e84843fc9adf9aed06b7e4db53c9aa24ef0885d96de0ccfe4c6ad98afe4c145d43f4f AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae +DIST boost_1_69_0.tar.bz2 95078138 BLAKE2B ccab52b911066ed41db6555fe13fbc142cd51250ad620665d3fcf25508e158b7b766f4f3654333b4a19517215ebe4a6ce14e64395b093b9604b3f0e570419841 SHA512 d0e9bb858c44880d56c0291afef6a1b011a62f659a2d8f58dcb6147ea0899f9157bd8db3097896618fee0116847ebeac78b6d0f0fec8a92c3469500828bbe552 DIST mysql-extras-20190822-1908Z.tar.bz2 338830 BLAKE2B bc197f8e541206548d8982814e82e028d699ba9c41aec8d5191bcc46581f7880ed2741dbe2206fde44a5e8d8d54bbcf40efbd0709b357636c4c8fdb2ccc3a7bb SHA512 be469e55f7e9966638600d6836a44258c74e5600240fafe2d79eaeebe7d1695b043678184b5d18ee9946f28154bc2529586a7f860b510180a30c82454ed575c8 +DIST mysql-extras-20191031-0134Z.tar.bz2 340718 BLAKE2B 8c228d6953aa888449a006ab1000ef3ecb1747fd055f58a8eaa5f5680b223fa840debbb7fce7404aa7ef4524ce71144a6a970483ad6536ff7521bd949f4dfa90 SHA512 6d61c4a70980759ac90fc3ac35a677a340d88f63260fb2c130ef70de0c05654895fe17b5f4915ca6d96f2406f215559182af61f7d88c1a4157e9bcbcc0f4d4e2 DIST percona-server-5.7.26-29.tar.gz 84327421 BLAKE2B beedb4b5025c337a63ae56644e47991e90c2c0e57c6d03f1562095f9470cef4b67c8df6c3774d88dfc6ed6dfb81f9dd4b62325db30bc26802651279921bd3a2d SHA512 c8100e69f7e29a5aa2de9dddbc1a3cba9836fe485b7f829a8db0a7e5ac1d1bdabfb1360dacad90665f4c9c78ac91226209c6c15158ef449e84519e36bb06f0a1 DIST percona-server-5.7.27-30.tar.gz 84672298 BLAKE2B 8431d231f602b704195868110e8eb73adb3db7c761906c15eff182e54634ef091a3ffa0d4f3498a93dbfbf65cd5cdd12102871abaaaa0f32378ba3068d083b2b SHA512 d62c66de3128df87dce52292ad1671e01fe2c923e668ef0faf9cb663c11c9cd0b976345aea1de6ea2bc458d0e1066b42c022849e422121d96cea082ed12c8f4b +DIST percona-server-8.0.17-8.tar.gz 249562136 BLAKE2B d3bf20d9fee43f17b8aef3e403e74d9c5924a5a012d0c4208b22ffffce37f48867a2a1fb7992d7837f35492d5c5871901f3e0f68cde54793090bb2c089cee310 SHA512 c875492e8b67307aef439ae54b8ff6320464ac495a2d06029f1b33b2117e56bd1c2b3ce4ba7b406c1bd6604d0016d04a5c3f36643097cbf36425d60a44b6adc3 EBUILD percona-server-5.7.26.29-r1.ebuild 36357 BLAKE2B fb2c8d7df5f60be02196d94512a129574584181dfc7d3403a15624f034fa40d742d2cdd3334a61c58a0fa28cc93e315d8698042e8624c89b146abf80e8ce38b5 SHA512 4f66e8fea2ead405db593a251940768e33866fdaada65260e32ead75681a24efc082062dfe25045c1180966bd3945b8523aaef8e0ae48844da566bf3fe0560e0 EBUILD percona-server-5.7.27.30.ebuild 37274 BLAKE2B 61f000a8f022f4c2a2837454d97587f0ef4becef2d0d25ab4f8d4ee43ce668be1b1ea5ab177502ca48cfcdc479b73acc2113f78450becfc2aa7562ac90a58bf4 SHA512 593bbbf57c95abaec5b67bb37819af7e537969edecfa8544e284f9e7c96c9dc64c71fdc1d10c6f414f2a6b609d04c7dc124963647ece495e0ca8f0d6e04a9414 -MISC metadata.xml 1416 BLAKE2B a479a1bc7b6e5947ccef2fdf097d3dd91af932500483112c05b86c5d60ab6ec1ac4179bee0fa291a746281054baa791152cac7a34c8c79a0ad4fd8f5e3d1bcf9 SHA512 ec92d201154c3af80aa4cdcd1eae207827a1b2711cfe7b1a9b0153268a33e472329011c56ec39a009776c629163fc9d4f9e77ad2b00461f07199f3dd12db0b52 +EBUILD percona-server-8.0.17.8.ebuild 37069 BLAKE2B c92cf25eef3a38740816ed1d80dd920a4931987fb43142cdd7f5515343561a4f5ca96d55d5a70272b3529e5e81ed0b0f7ab0b32d136a8ea6585f26fcc99583f2 SHA512 109c01a542c0ebbea3d623260d85cfe0ef85719f239822c09e9e8eb2d328b85e0955fe35e7c4763b9662973375458f90b2fa6827c9478868c5c26088a0a181c1 +MISC metadata.xml 1476 BLAKE2B 45302733bbb03e6e999d60db72bed7382f664d9b46772904a35a1a8bfceccc89008e739fcead55bfb6a056523f0ff84fd22c638de859236f47a01eb8ac6c45eb SHA512 e53b29f9d78e895a26f228b7719a023dbd5957d1e10f384376b75b539a211425be143c229378af2ade5314f6b414d891bafc7e1fffde9bb88b59ff24de31a2c2 diff --git a/dev-db/percona-server/files/my.cnf-8.0.distro-client b/dev-db/percona-server/files/my.cnf-8.0.distro-client new file mode 100644 index 000000000000..1c2ee7da1d92 --- /dev/null +++ b/dev-db/percona-server/files/my.cnf-8.0.distro-client @@ -0,0 +1,23 @@ +# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mysql.d/50-distro-client.cnf: The global mysql configuration file. + +# The following options will be passed to all MySQL clients +[client] +# Should match default server to save a round trip +loose-default-auth = mysql_native_password +socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock +character-sets-dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets +loose-default-character-set = utf8mb4 + +[mysql] +# uncomment the next directive if you are not familiar with SQL +#safe-updates + +[mysqldump] +quick +max_allowed_packet = 16M + +[myisamchk] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets + +[myisampack] +character-sets-dir=@GENTOO_PORTAGE_EPREFIX@/usr/share/mysql/charsets diff --git a/dev-db/percona-server/files/my.cnf-8.0.distro-server b/dev-db/percona-server/files/my.cnf-8.0.distro-server new file mode 100644 index 000000000000..ac087963972e --- /dev/null +++ b/dev-db/percona-server/files/my.cnf-8.0.distro-server @@ -0,0 +1,30 @@ +# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mysql.d/50-distro-server.cnf: The global mysql configuration file. + +# add a section [mysqld-8.0] for specific configurations +[mysqld] +# Using "mysql_native_password" for compatibility with Perl, PHP, Ruby... +loose-default-authentication-plugin = mysql_native_password +character-set-server = utf8mb4 +user = mysql +port = 3306 +socket = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysqld.sock +pid-file = @GENTOO_PORTAGE_EPREFIX@/var/run/mysqld/mysql.pid +log-error = @GENTOO_PORTAGE_EPREFIX@/var/log/mysql/mysqld.err +basedir = @GENTOO_PORTAGE_EPREFIX@/usr +datadir = @DATADIR@ +skip-external-locking +lc_messages_dir = @GENTOO_PORTAGE_EPREFIX@/usr/share/mysql +#Set this to your desired error message language +lc_messages = en_US + +# security: +# using "localhost" in connects uses sockets by default +# skip-networking +bind-address = 127.0.0.1 + +log-bin +server-id = 1 + +# point the following paths to different dedicated disks +#tmpdir = @GENTOO_PORTAGE_EPREFIX@/tmp/ +#log-update = @GENTOO_PORTAGE_EPREFIX@/path-to-dedicated-directory/hostname diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml index 01da26f98829..f282af308762 100644 --- a/dev-db/percona-server/metadata.xml +++ b/dev-db/percona-server/metadata.xml @@ -14,6 +14,7 @@ Enable NUMA support using sys-process/numactl (NUMA kernel support is also required) Add support for statement profiling (requires USE=community). Add support for RocksDB; a key/value, LSM database optimized for flash storage + Build the MySQL router program Build the server program Build support for profiling and tracing using dev-util/systemtap Add support for TokuDB storage engine diff --git a/dev-db/percona-server/percona-server-8.0.17.8.ebuild b/dev-db/percona-server/percona-server-8.0.17.8.ebuild new file mode 100644 index 000000000000..e2666362cd2b --- /dev/null +++ b/dev-db/percona-server/percona-server-8.0.17.8.ebuild @@ -0,0 +1,1128 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +MY_EXTRAS_VER="20191031-0134Z" + +CMAKE_MAKEFILE_GENERATOR=emake + +inherit cmake-utils flag-o-matic linux-info \ + multiprocessing prefix toolchain-funcs check-reqs + +MY_BOOST_VERSION="1.69.0" +MY_PV=$(ver_rs 3 '-') +MY_PV="${MY_PV//_pre*}" +MY_PN="Percona-Server" +MY_P="${PN}-${MY_PV}" +MY_MAJOR_PV=$(ver_cut 1-2) +MY_RELEASE_NOTES_URI="https://www.percona.com/doc/percona-server/${MY_MAJOR_PV}/" + +S="${WORKDIR}/${PN}-${MY_PV}" + +SRC_URI="https://www.percona.com/downloads/${MY_PN}-${MY_MAJOR_PV}/${MY_PN}-${MY_PV}/source/tarball/${PN}-${MY_PV}.tar.gz + https://dl.bintray.com/boostorg/release/${MY_BOOST_VERSION}/source/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION}).tar.bz2 +" + +# Gentoo patches to MySQL +if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]] ; then + SRC_URI="${SRC_URI} + mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2 + https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2" +fi + +HOMEPAGE="https://www.percona.com/software/mysql-database/percona-server" +DESCRIPTION="Fully compatible, enhanced and open source drop-in replacement for MySQL" +LICENSE="GPL-2" +SLOT="0" +IUSE="cjk cracklib debug jemalloc latin1 libressl numa +perl profiling + rocksdb router selinux +server tcmalloc test tokudb tokudb-backup-plugin" + +# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests +RESTRICT="libressl? ( test )" + +REQUIRED_USE="?? ( tcmalloc jemalloc )" + +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + +# Shorten the path because the socket path length must be shorter than 107 chars +# and we will run a mysql server during test phase +S="${WORKDIR}/mysql" + +if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git" + EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras" + EGIT_CLONE_TYPE=shallow + MY_PATCH_DIR="${WORKDIR}/mysql-extras" +else + MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" +fi + +PATCHES=( + "${MY_PATCH_DIR}"/20001_all_fix-minimal-build-cmake-mysql-8.0.17.patch + "${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-8.0.17.patch + "${MY_PATCH_DIR}"/20018_all_mysql-5.7.23-fix-grant_user_lock-a-root.patch + "${MY_PATCH_DIR}"/20018_all_percona-server-8.0.17-without-clientlibs-tools.patch + "${MY_PATCH_DIR}"/20018_all_mysql-8.0.17-add-protobuf-3.8+-support.patch + "${MY_PATCH_DIR}"/20018_all_percona-server-8.0.17-fix-libressl-support.patch + "${MY_PATCH_DIR}"/20018_all_percona-server-8.0.16-dont-install-tokudb-misc-files.patch + "${MY_PATCH_DIR}"/20038_all_percona-server-8.0.16-PS-5873.patch +) + +# Be warned, *DEPEND are version-dependant +# These are used for both runtime and compiletime +COMMON_DEPEND=" + >=app-arch/lz4-0_p131:= + dev-libs/icu:= + dev-libs/libedit + dev-libs/libevent:= + net-libs/libtirpc:= + >=sys-libs/zlib-1.2.3:0= + cjk? ( app-text/mecab:= ) + jemalloc? ( dev-libs/jemalloc:0= ) + kernel_linux? ( + dev-libs/libaio:0= + sys-process/procps:0= + ) + libressl? ( dev-libs/libressl:0= ) + !libressl? ( >=dev-libs/openssl-1.0.0:0= ) + numa? ( sys-process/numactl ) + tcmalloc? ( dev-util/google-perftools:0= ) +" +DEPEND="${COMMON_DEPEND} + || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + dev-libs/re2 + >=dev-libs/protobuf-3.8 + net-libs/rpcsvc-proto + virtual/yacc + test? ( + acct-group/mysql acct-user/mysql + dev-perl/JSON + ) +" +RDEPEND="${COMMON_DEPEND} + !dev-db/mariadb !dev-db/mariadb-galera !dev-db/mysql !dev-db/mysql-cluster + selinux? ( sec-policy/selinux-mysql ) + !prefix? ( + acct-group/mysql acct-user/mysql + dev-db/mysql-init-scripts + ) +" +# For other stuff to bring us in +# dev-perl/DBD-mysql is needed by some scripts installed by MySQL +PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )" + +CHECKREQS_DISK_BUILD="8G" + +mysql_init_vars() { + : ${MY_SHAREDSTATEDIR="${EPREFIX}/usr/share/mysql"} + : ${MY_SYSCONFDIR="${EPREFIX}/etc/mysql"} + : ${MY_LOCALSTATEDIR="${EPREFIX}/var/lib/mysql"} + : ${MY_LOGDIR="${EPREFIX}/var/log/mysql"} + MY_DATADIR="${MY_LOCALSTATEDIR}" + + export MY_SHAREDSTATEDIR MY_SYSCONFDIR + export MY_LOCALSTATEDIR MY_LOGDIR + export MY_DATADIR +} + +pkg_pretend() { + [[ ${MERGE_TYPE} == binary ]] && return + use server && check-reqs_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} == binary ]] && return + + if has test ${FEATURES} ; then + # Bug #213475 - MySQL _will_ object strenuously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if ! has userpriv ${FEATURES} ; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + + local aio_max_nr=$(sysctl -n fs.aio-max-nr 2>/dev/null) + [[ -z "${aio_max_nr}" || ${aio_max_nr} -lt 250000 ]] \ + && die "FEATURES=test will require fs.aio-max-nr=250000 at minimum!" + + if use latin1 ; then + # Upstream only supports tests with default charset + die "Testing with USE=latin1 is not supported." + fi + fi + + if use kernel_linux ; then + if use numa ; then + linux-info_get_any_version + + local CONFIG_CHECK="~NUMA" + + local WARNING_NUMA="This package expects NUMA support in kernel which this system does not have at the moment;" + WARNING_NUMA+=" Either expect runtime errors, enable NUMA support in kernel or rebuild the package without NUMA support" + + check_extra_config + fi + fi + + use server && check-reqs_pkg_setup +} + +src_unpack() { + unpack ${A} + + # Grab the patches + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack + + mv -f "${WORKDIR}/${MY_P}" "${S}" || die +} + +src_prepare() { + # Avoid rpm call which would trigger sandbox, #692368 + sed -i \ + -e 's/MY_RPM rpm/MY_RPM rpmNOTEXISTENT/' \ + CMakeLists.txt || die + + if use jemalloc ; then + echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die + fi + + if use tcmalloc ; then + echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die + fi + + # Remove the centos and rhel selinux policies to support mysqld_safe under SELinux + if [[ -d "${S}/support-files/SELinux" ]] ; then + echo > "${S}/support-files/SELinux/CMakeLists.txt" || die + fi + + # Remove man pages for client-lib tools we don't install + rm \ + man/my_print_defaults.1 \ + man/perror.1 \ + man/zlib_decompress.1 \ + || die + + cmake-utils_src_prepare +} + +src_configure(){ + # Bug #114895, bug #110149 + filter-flags "-O" "-O[01]" + + append-cxxflags -felide-constructors + + # bug #283926, with GCC4.4, this is required to get correct behavior. + append-flags -fno-strict-aliasing + + CMAKE_BUILD_TYPE="RelWithDebInfo" + + # debug hack wrt #497532 + mycmakeargs=( + -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql" + -DSYSCONFDIR="${EPREFIX}/etc/mysql" + -DINSTALL_BINDIR=bin + -DINSTALL_DOCDIR=share/doc/${PF} + -DINSTALL_DOCREADMEDIR=share/doc/${PF} + -DINSTALL_INCLUDEDIR=include/mysql + -DINSTALL_INFODIR=share/info + -DINSTALL_LIBDIR=$(get_libdir) + -DINSTALL_MANDIR=share/man + -DINSTALL_MYSQLSHAREDIR=share/mysql + -DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin + -DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql" + -DINSTALL_SBINDIR=sbin + -DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql" + -DCOMPILATION_COMMENT="Gentoo Linux ${PF}" + -DWITH_UNIT_TESTS=$(usex test ON OFF) + -DWITH_EDITLINE=system + -DWITH_ZLIB=system + -DWITH_SSL=system + -DWITH_LIBWRAP=0 + -DENABLED_LOCAL_INFILE=1 + -DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock" + -DWITH_DEFAULT_COMPILER_OPTIONS=0 + -DWITH_DEFAULT_FEATURE_SET=0 + # The build forces this to be defined when cross-compiling. We pass it + # all the time for simplicity and to make sure it is actually correct. + -DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1) + -DCMAKE_POSITION_INDEPENDENT_CODE=ON + -DWITH_CURL=system + -DWITH_BOOST="${WORKDIR}/boost_$(ver_rs 1- _ ${MY_BOOST_VERSION})" + -DWITH_ROUTER=$(usex router ON OFF) + ) + if use test ; then + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test ) + else + mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' ) + fi + + mycmakeargs+=( -DWITHOUT_CLIENTLIBS=YES ) + + # client/mysql.cc:1131:16: error: redefinition of ‘struct _hist_entry’ + mycmakeargs+=( + -DUSE_LIBEDIT_INTERFACE=0 + -DUSE_NEW_EDITLINE_INTERFACE=1 + -DHAVE_HIST_ENTRY=1 + ) + + mycmakeargs+=( + -DWITH_ICU=system + -DWITH_RE2=system + -DWITH_LIBEVENT=system + -DWITH_LZ4=system + -DWITH_PROTOBUF=system + -DWITH_MECAB=$(usex cjk system OFF) + -DWITH_NUMA=$(usex numa ON OFF) + # Our dev-libs/rapidjson doesn't carry necessary fixes for std::regex + -DWITH_RAPIDJSON=bundled + ) + + if [[ -n "${MYSQL_DEFAULT_CHARSET}" && -n "${MYSQL_DEFAULT_COLLATION}" ]] ; then + ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}" + ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}." + ewarn "You MUST file bugs without these variables set." + ewarn "Tests will probably fail!" + + mycmakeargs+=( + -DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET} + -DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION} + ) + elif use latin1 ; then + mycmakeargs+=( + -DDEFAULT_CHARSET=latin1 + -DDEFAULT_COLLATION=latin1_swedish_ci + ) + else + mycmakeargs+=( + -DDEFAULT_CHARSET=utf8mb4 + -DDEFAULT_COLLATION=utf8mb4_0900_ai_ci + ) + fi + + if use server ; then + mycmakeargs+=( + -DWITH_EXTRA_CHARSETS=all + -DWITH_DEBUG=$(usex debug) + ) + + if use profiling ; then + # Setting to OFF doesn't work: Once set, profiling options will be added + # to `mysqld --help` output via sql/sys_vars.cc causing + # "main.mysqld--help-notwin" test to fail + mycmakeargs+=( -DENABLED_PROFILING=ON ) + fi + + # Storage engines + mycmakeargs+=( + -DWITH_EXAMPLE_STORAGE_ENGINE=0 + -DWITH_ARCHIVE_STORAGE_ENGINE=1 + -DWITH_BLACKHOLE_STORAGE_ENGINE=1 + -DWITH_CSV_STORAGE_ENGINE=1 + -DWITH_FEDERATED_STORAGE_ENGINE=1 + -DWITH_HEAP_STORAGE_ENGINE=1 + -DWITH_INNOBASE_STORAGE_ENGINE=1 + -DWITH_INNODB_MEMCACHED=0 + -DWITH_MYISAMMRG_STORAGE_ENGINE=1 + -DWITH_MYISAM_STORAGE_ENGINE=1 + -DWITH_ROCKSDB=$(usex rocksdb 1 0) + -DWITH_TOKUDB=$(usex tokudb 1 0) + ) + else + mycmakeargs+=( + -DWITHOUT_SERVER=1 + -DWITH_SYSTEMD=no + ) + fi + + cmake-utils_src_configure +} + +# Official test instructions: +# ulimit -n 16500 && \ +# USE='perl server' \ +# FEATURES='test userpriv' \ +# ebuild mysql-X.X.XX.ebuild \ +# digest clean package +src_test() { + _disable_test() { + local rawtestname bug reason + rawtestname="${1}" ; shift + bug="${1}" ; shift + reason="${@}" + ewarn "test '${rawtestname}' disabled: '${reason}' (BUG#${bug})" + echo ${rawtestname} : BUG#${bug} ${reason} >> "${T}/disabled.def" + } + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + + if [[ -z "${MTR_PARALLEL}" ]] ; then + local -x MTR_PARALLEL=$(makeopts_jobs) + + if [[ ${MTR_PARALLEL} -gt 4 ]] ; then + # Running multiple tests in parallel usually require higher ulimit + # and fs.aio-max-nr setting. In addition, tests like main.multi_update + # are known to hit timeout when system is busy. + # To avoid test failure we will limit MTR_PARALLEL to 4 instead of + # using "auto". + local info_msg="Parallel MySQL test suite jobs limited to 4 (MAKEOPTS=${MTR_PARALLEL})" + info_msg+=" to avoid test failures. Set MTR_PARALLEL if you know what you are doing!" + einfo "${info_msg}" + unset info_msg + MTR_PARALLEL=4 + fi + else + einfo "MTR_PARALLEL is set to '${MTR_PARALLEL}'" + fi + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} || die + + # Run mysql tests + pushd "${TESTDIR}" &>/dev/null || die + + touch "${T}/disabled.def" + + local -a disabled_tests + disabled_tests+=( "auth_sec.keyring_file_data_qa;0;Won't work with user privileges") + disabled_tests+=( "gis.spatial_analysis_functions_buffer;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.gis_bugs_crashes;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.geometry_class_attri_prop;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_utility_function_distance_sphere;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.geometry_property_function_issimple;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_analysis_functions_centroid;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_operators_intersection;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_utility_function_simplify;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_op_testingfunc_mix;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "gis.spatial_analysis_functions_distance;5452;Known rounding error with latest AMD processors (PS)") + disabled_tests+=( "main.window_std_var;0;Known rounding error with latest AMD processors -- no upstream bug yet") + disabled_tests+=( "main.window_std_var_optimized;0;Known rounding error with latest AMD processors -- no upstream bug yet") + disabled_tests+=( "rpl_gtid.rpl_gtid_stm_drop_table;90612;Known test failure" ) + disabled_tests+=( "rpl_gtid.rpl_multi_source_mtr_includes;0;Know failure - no upstream bug yet" ) + disabled_tests+=( "sys_vars.myisam_data_pointer_size_func;87935;Test will fail on slow hardware") + disabled_tests+=( "main.mysqlpump_basic_lz4;6042;Extra tool output causes false positive" ) + disabled_tests+=( "main.ssl_bug75311;5996;Known test failure" ) + + local test_ds + for test_infos_str in "${disabled_tests[@]}" ; do + IFS=';' read -r -a test_infos_arr <<< "${test_infos_str}" + + if [[ ${#test_infos_arr[@]} != 3 ]] ; then + die "Invalid test data set, not matching format: ${test_infos_str}" + fi + + _disable_test "${test_infos_arr[0]}" "${test_infos_arr[1]}" "${test_infos_arr[2]}" + done + unset test_ds test_infos_str test_infos_arr + + # Try to increase file limits to increase test coverage + if ! ulimit -n 16500 1>/dev/null 2>&1 ; then + # Upper limit comes from parts.partition_* tests + ewarn "For maximum test coverage please raise open file limit to 16500 (ulimit -n 16500) before calling the package manager." + + if ! ulimit -n 4162 1>/dev/null 2>&1 ; then + # Medium limit comes from '[Warning] Buffered warning: Could not increase number of max_open_files to more than 3000 (request: 4162)' + ewarn "For medium test coverage please raise open file limit to 4162 (ulimit -n 4162) before calling the package manager." + + if ! ulimit -n 3000 1>/dev/null 2>&1 ; then + ewarn "For minimum test coverage please raise open file limit to 3000 (ulimit -n 3000) before calling the package manager." + else + einfo "Will run test suite with open file limit set to 3000 (minimum test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 4162 (medium test coverage)." + fi + else + einfo "Will run test suite with open file limit set to 16500 (best test coverage)." + fi + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def" + retstatus_tests=$? + + popd &>/dev/null || die + + # Cleanup is important for these testcases. + pkill -9 -f "${S}/ndb" 2>/dev/null + pkill -9 -f "${S}/sql" 2>/dev/null + + local failures="" + [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" + [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" + + [[ -z "$failures" ]] || die "Test failures: $failures" + einfo "Tests successfully completed" +} + +src_install() { + cmake-utils_src_install + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Convenience links + einfo "Making Convenience links for mysqlcheck multi-call binary" + dosym "mysqlcheck" "/usr/bin/mysqlanalyze" + dosym "mysqlcheck" "/usr/bin/mysqlrepair" + dosym "mysqlcheck" "/usr/bin/mysqloptimize" + + # INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir + if [[ -d "${ED}/usr/data" ]] ; then + rm -Rf "${ED}/usr/data" || die + fi + + # Unless they explicitly specific USE=test, then do not install the + # testsuite. It DOES have a use to be installed, esp. when you want to do a + # validation of your database configuration after tuning it. + if ! use test ; then + rm -rf "${ED}/${MY_SHAREDSTATEDIR#${EPREFIX}}/mysql-test" + fi + + # Configuration stuff + einfo "Building default configuration ..." + insinto "${MY_SYSCONFDIR#${EPREFIX}}" + [[ -f "${S}/scripts/mysqlaccess.conf" ]] && doins "${S}"/scripts/mysqlaccess.conf + cp "${FILESDIR}/my.cnf-5.7" "${TMPDIR}/my.cnf" || die + eprefixify "${TMPDIR}/my.cnf" + doins "${TMPDIR}/my.cnf" + insinto "${MY_SYSCONFDIR#${EPREFIX}}/mysql.d" + cp "${FILESDIR}/my.cnf-8.0.distro-client" "${TMPDIR}/50-distro-client.cnf" || die + eprefixify "${TMPDIR}/50-distro-client.cnf" + doins "${TMPDIR}/50-distro-client.cnf" + + mycnf_src="my.cnf-8.0.distro-server" + sed -e "s!@DATADIR@!${MY_DATADIR}!g" \ + "${FILESDIR}/${mycnf_src}" \ + > "${TMPDIR}/my.cnf.ok" || die + + if use prefix ; then + sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' \ + "${TMPDIR}/my.cnf.ok" || die + fi + + if use latin1 ; then + sed -i \ + -e "/character-set/s|utf8mb4|latin1|g" \ + "${TMPDIR}/my.cnf.ok" || die + fi + + eprefixify "${TMPDIR}/my.cnf.ok" + + newins "${TMPDIR}/my.cnf.ok" 50-distro-server.cnf + + #Remove mytop if perl is not selected + [[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop" + + if use router ; then + rm -rf \ + "${ED}/usr/LICENSE.router" \ + "${ED}/usr/README.router" \ + "${ED}/usr/run" \ + "${ED}/usr/var" \ + || die + fi + + # Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them. + find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die +} + +pkg_postinst() { + # Make sure the vars are correctly initialized + mysql_init_vars + + # Create log directory securely if it does not exist + # NOTE: $MY_LOGDIR contains $EPREFIX by default + [[ -d "${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${MY_LOGDIR}" + + # Note about configuration change + einfo + elog "This version of ${PN} reorganizes the configuration from a single my.cnf" + elog "to several files in /etc/mysql/mysql.d." + elog "Please backup any changes you made to /etc/mysql/my.cnf" + elog "and add them as a new file under /etc/mysql/mysql.d with a .cnf extension." + elog "You may have as many files as needed and they are read alphabetically." + elog "Be sure the options have the appropriate section headers, i.e. [mysqld]." + einfo + + if [[ -z "${REPLACING_VERSIONS}" ]] ; then + einfo + elog "You might want to run:" + elog " \"emerge --config =${CATEGORY}/${PF}\"" + elog "if this is a new install." + einfo + else + einfo + elog "Upgrade process for ${PN}-8.x has changed. Please read" + elog "https://dev.mysql.com/doc/refman/8.0/en/upgrade-binary-package.html" + einfo + fi +} + +pkg_config() { + local mysqld_binary="${EROOT}/usr/sbin/mysqld" + if [[ ! -x "${mysqld_binary}" ]] ; then + die "'${mysqld_binary}' not found! Please re-install ${CATEGORY}/${PN}!" + fi + + local mysql_binary="${EROOT}/usr/bin/mysql" + if [[ ! -x "${mysql_binary}" ]] ; then + die "'${mysql_binary}' not found! Please re-install ${CATEGORY}/${PN}!" + fi + + local my_print_defaults_binary="${EROOT}/usr/bin/my_print_defaults" + if [[ ! -x "${my_print_defaults_binary}" ]] ; then + die "'${my_print_defaults_binary}' not found! Please re-install dev-db/mysql-connector-c!" + fi + + if [[ -z "${MYSQL_USER}" ]] ; then + MYSQL_USER=mysql + if use prefix ; then + MYSQL_USER=$(id -u -n 2>/dev/null) + if [[ -z "${MYSQL_USER}" ]] ; then + die "Failed to determine current username!" + fi + fi + fi + + if [[ -z "${MYSQL_GROUP}" ]] ; then + MYSQL_GROUP=mysql + if use prefix ; then + MYSQL_GROUP=$(id -g -n 2>/dev/null) + if [[ -z "${MYSQL_GROUP}" ]] ; then + die "Failed to determine current user groupname!" + fi + fi + fi + + einfo "Will use username '${MYSQL_USER}' and group '${MYSQL_GROUP}' ..." + + _getoptval() { + local section="$1" + local flag="--${2}=" + local extra_options="${3}" + local cmd=( + "${my_print_defaults_binary}" + "${extra_options}" + "${section}" + ) + local results=( $(eval "${cmd[@]}" 2>/dev/null | sed -n "/^${flag}/s,${flag},,gp") ) + + if [[ ${#results[@]} -gt 0 ]] ; then + # When option is set multiple times only return last value + echo "${results[-1]}" + fi + } + + _mktemp_dry() { + # emktemp has no --dry-run option + local template="${1}" + + if [[ -z "${template}" ]] ; then + if [[ -z "${T}" ]] ; then + template="/tmp/XXXXXXX" + else + template="${T}/XXXXXXX" + fi + fi + + local template_wo_X=${template//X/} + local n_X + let n_X=${#template}-${#template_wo_X} + if [[ ${n_X} -lt 3 ]] ; then + echo "${FUNCNAME[0]}: too few X's in template ‘${template}’" >&2 + return + fi + + local attempts=0 + local character tmpfile + while [[ true ]] ; do + let attempts=attempts+1 + + new_file= + while read -n1 character ; do + if [[ "${character}" == "X" ]] ; then + tmpfile+="${RANDOM:0:1}" + else + tmpfile+="${character}" + fi + done < <(echo -n "${template}") + + if [[ ! -f "${tmpfile}" ]] + then + echo "${tmpfile}" + return + fi + + if [[ ${attempts} -ge 100 ]] ; then + echo "${FUNCNAME[0]}: Cannot create temporary file after 100 attempts." >&2 + return + fi + done + } + + # my_print_defaults needs to read stuff in $HOME/.my.cnf + local -x HOME="${EROOT}/root" + + # Make sure the vars are correctly initialized + mysql_init_vars + + # Read currently set data directory + MY_DATADIR="$(_getoptval mysqld datadir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")" + + # Bug #213475 - MySQL _will_ object strenously if your machine is named + # localhost. Also causes weird failures. + [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" + + if [[ -z "${MY_DATADIR}" ]] ; then + die "Sorry, unable to find MY_DATADIR!" + elif [[ -d "${MY_DATADIR}/mysql" ]] ; then + ewarn "Looks like your data directory '${MY_DATADIR}' is already initialized!" + ewarn "Please rename or delete its content if you wish to initialize a new data directory." + die "${PN} data directory at '${MY_DATADIR}' looks already initialized!" + else + einfo "${PN} data directory detected as '${MY_DATADIR}' ..." + fi + + MYSQL_TMPDIR="$(_getoptval mysqld tmpdir "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")" + # These are dir+prefix + MYSQL_LOG_BIN="$(_getoptval mysqld log-bin "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")" + MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*} + MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log "--defaults-file='${MY_SYSCONFDIR}/my.cnf'")" + MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*} + + # Create missing directories. + # Always check if mysql user can write to directory even if we just + # created directory because a parent directory might be not + # accessible for that user. + PID_DIR="${EROOT}/run/mysqld" + if [[ ! -d "${PID_DIR}" ]] ; then + einfo "Creating ${PN} PID directory '${PID_DIR}' ..." + install -d -m 755 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${PID_DIR}" \ + || die "Failed to create PID directory '${PID_DIR}'!" + fi + + local _pid_dir_testfile="$(_mktemp_dry "${PID_DIR}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_pid_dir_testfile}" ]] \ + && die "_mktemp_dry() for '${PID_DIR}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_pid_dir_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_pid_dir_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]] ; then + die "${MYSQL_USER} user cannot write into PID dir '${PID_DIR}'!" + else + rm "${_pid_dir_testfile}" || die + unset _pid_dir_testfile + fi + + if [[ ! -d "${MY_DATADIR}" ]] ; then + einfo "Creating ${PN} data directory '${MY_DATADIR}' ..." + install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MY_DATADIR}" \ + || die "Failed to create ${PN} data directory '${MY_DATADIR}'!" + fi + + local _my_datadir_testfile="$(_mktemp_dry "${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_my_datadir_testfile}" ]] \ + && die "_mktemp_dry() for '${MY_DATADIR}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_my_datadir_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_my_datadir_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]]; then + die "${MYSQL_USER} user cannot write into data directory '${MY_DATADIR}'!" + else + rm "${_my_datadir_testfile}" || die + unset _my_datadir_testfile + fi + + if [[ -n "${MYSQL_TMPDIR}" && ! -d "${MYSQL_TMPDIR}" ]] ; then + einfo "Creating ${PN} tmpdir '${MYSQL_TMPDIR}' ..." + install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_TMPDIR}" \ + || die "Failed to create ${PN} tmpdir '${MYSQL_TMPDIR}'!" + fi + + if [[ -n "${MYSQL_TMPDIR}" ]] ; then + local _my_tmpdir_testfile="$(_mktemp_dry "${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_my_tmpdir_testfile}" ]] \ + && die "_mktemp_dry() for '${MYSQL_TMPDIR}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_my_tmpdir_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_my_tmpdir_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]]; then + die "${MYSQL_USER} user cannot write into data directory '${MYSQL_TMPDIR}'!" + else + rm "${_my_tmpdir_testfile}" || die + unset _my_tmpdir_testfile + fi + else + # If no tmpdir is set, mysqld will use default system tmpdir. + # However, we are using tmpdir from package manager at the + # moment which maybe isn't writeable for $MYSQL_USER... + MYSQL_TMPDIR="$(_mktemp_dry "${T}/mysqld-tmp.XXXXXXXXX")" + [[ -z "${MYSQL_TMPDIR}" ]] \ + && die "_mktemp_dry() for '${MYSQL_TMPDIR}' failed!" + + mkdir "${MYSQL_TMPDIR}" || die + chown ${MYSQL_USER} "${MYSQL_TMPDIR}" || die + fi + + if [[ -n "${MYSQL_LOG_BIN}" && ! -d "${MYSQL_LOG_BIN}" ]] ; then + einfo "Creating ${PN} log-bin directory '${MYSQL_LOG_BIN}' ..." + install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_LOG_BIN}" \ + || die "Failed to create ${PN} log-bin directory '${MYSQL_LOG_BIN}'" + fi + + if [[ -n "${MYSQL_LOG_BIN}" ]] ; then + local _my_logbin_testfile="$(_mktemp_dry "${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_my_logbin_testfile}" ]] \ + && die "_mktemp_dry() for '${MYSQL_LOG_BIN}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_my_logbin_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_my_logbin_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]]; then + die "${MYSQL_USER} user cannot write into log-bin directory '${MYSQL_LOG_BIN}'!" + else + rm "${_my_logbin_testfile}" || die + unset _my_logbin_testfile + fi + fi + + if [[ -n "${MYSQL_RELAY_LOG}" && ! -d "${MYSQL_RELAY_LOG}" ]] ; then + einfo "Creating ${PN} relay-log directory '${MYSQL_RELAY_LOG}' ..." + install -d -m 770 -o ${MYSQL_USER} -g ${MYSQL_GROUP} "${MYSQL_RELAY_LOG}" \ + || die "Failed to create ${PN} relay-log directory '${MYSQL_RELAY_LOG}'!" + fi + + if [[ -n "${MYSQL_RELAY_LOG}" ]] ; then + local _my_relaylog_testfile="$(_mktemp_dry "${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX")" + [[ -z "${_my_relaylog_testfile}" ]] \ + && die "_mktemp_dry() for '${MYSQL_RELAY_LOG}/.pkg_config-access-test.XXXXXXXXX' failed!" + + if use prefix ; then + touch "${_my_relaylog_testfile}" &>/dev/null + else + su -s /bin/sh -c "touch ${_my_relaylog_testfile}" ${MYSQL_USER} &>/dev/null + fi + + if [[ $? -ne 0 ]]; then + die "${MYSQL_USER} user cannot write into relay-log directory '${MYSQL_RELAY_LOG}'!" + else + rm "${_my_relaylog_testfile}" || die + unset _my_relaylog_testfile + fi + fi + + local -a config_files + + local config_file="${EROOT}/etc/mysql/mysql.d/50-distro-client.cnf" + if [[ -f "${config_file}" ]] ; then + config_files+=( "${config_file}" ) + else + ewarn "Client configuration '${config_file}' not found; Skipping configuration of default authentication plugin for client ..." + fi + + config_file="${EROOT}/etc/mysql/mysql.d/50-distro-server.cnf" + if [[ -f "${config_file}" ]] ; then + config_files+=( "${config_file}" ) + else + ewarn "Server configuration '${config_file}' not found; Skipping configuration of default authentication plugin for mysqld ..." + fi + + if [[ ${#config_files[@]} -gt 0 ]] ; then + if [[ -z "${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" ]] ; then + local user_answer + + echo + einfo "Please select default authentication plugin (enter number or plugin name):" + einfo "1) caching_sha2_password [MySQL 8.0 default]" + einfo "2) mysql_native_password [MySQL 5.7 default]" + einfo + einfo "For details see:" + einfo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html#upgrade-caching-sha2-password" + read -p " >" user_answer + echo + + case "${user_answer}" in + 1|caching_sha2_password) + MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=caching_sha2_password + ;; + 2|mysql_native_password) + MYSQL_DEFAULT_AUTHENTICATION_PLUGIN=mysql_native_password + ;; + '') + die "No authentication plugin selected!" + ;; + *) + die "Authentication plugin '${user_answer}' is unknown/unsupported!" + ;; + esac + + unset user_answer + fi + + local cfg_option cfg_option_tabs cfg_section + for config_file in "${config_files[@]}" ; do + cfg_option="default-authentication-plugin" + cfg_section="mysqld" + cfg_option_tabs="\t\t" + if [[ "${config_file}" == *client.cnf ]] ; then + cfg_option="default-auth" + cfg_section="client" + cfg_option_tabs="\t\t\t\t" + fi + + if grep -qE "^(loose-)?${cfg_option}\b.*=" "${config_file}" 2>/dev/null ; then + einfo "Ensuring that ${cfg_option} is set to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..." + sed -i \ + -e "s/^\(loose-\)\?${cfg_option}\b.*=.*/loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}/" \ + "${config_file}" || die "Failed to change ${cfg_option} in '${config_file}'!" + else + einfo "Setting ${cfg_option} to '${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}' in '${config_file}' ..." + sed -i \ + -e "/^\[${cfg_section}\]$/a loose-${cfg_option}${cfg_option_tabs}= ${MYSQL_DEFAULT_AUTHENTICATION_PLUGIN}" \ + "${config_file}" || die "Failed to add ${cfg_option} to '${config_file}'!" + fi + done + unset cfg_option cfg_option_tabs cfg_section + fi + unset config_files config_file + + echo + + if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then + local tmp_mysqld_password_source= + + for tmp_mysqld_password_source in mysql client ; do + einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..." + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)" + if [[ -n "${MYSQL_ROOT_PASSWORD}" ]] ; then + if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]] ; then + ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!" + MYSQL_ROOT_PASSWORD= + continue + fi + + einfo "Found password in '${tmp_mysqld_password_source}' section!" + break + fi + done + + # Sometimes --show is required to display passwords in some implementations of my_print_defaults + if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]] ; then + MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)" + fi + + unset tmp_mysqld_password_source + fi + + if [[ -z "${MYSQL_ROOT_PASSWORD}" ]] ; then + local pwd1="a" + local pwd2="b" + + echo + einfo "No password for mysql 'root' user was specified via environment" + einfo "variable MYSQL_ROOT_PASSWORD and no password was found in config" + einfo "file like '${HOME}/.my.cnf'." + einfo "To continue please provide a password for the mysql 'root' user" + einfo "now on console:" + ewarn "NOTE: Please avoid [\"'\\_%] characters in the password!" + read -rsp " >" pwd1 ; echo + + einfo "Retype the password" + read -rsp " >" pwd2 ; echo + + if [[ "x$pwd1" != "x$pwd2" ]] ; then + die "Passwords are not the same!" + fi + + MYSQL_ROOT_PASSWORD="${pwd1}" + unset pwd1 pwd2 + + echo + fi + + local -a mysqld_options + + # Fix bug 446200. Don't reference host my.cnf, needs to come first, + # see http://bugs.mysql.com/bug.php?id=31312 + use prefix && mysqld_options+=( "--defaults-file='${MY_SYSCONFDIR}/my.cnf'" ) + + # Figure out which options we need to disable to do the setup + local helpfile="${TMPDIR}/mysqld-help" + "${EROOT}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null + + local opt optexp optfull + for opt in host-cache name-resolve networking slave-start \ + federated ssl log-bin relay-log slow-query-log external-locking \ + log-slave-updates \ + ; do + optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" + egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" ) + done + + # Prepare timezones, see + # https://dev.mysql.com/doc/mysql/en/time-zone-support.html + local tz_sql="${TMPDIR}/tz.sql" + echo "USE mysql;" >"${tz_sql}" + "${EROOT}/usr/bin/mysql_tzinfo_to_sql" "${EROOT}/usr/share/zoneinfo" >> "${tz_sql}" 2>/dev/null + if [[ $? -ne 0 ]] ; then + die "mysql_tzinfo_to_sql failed!" + fi + + chown ${MYSQL_USER} "${tz_sql}" || die + + local mysql_install_log="${TMPDIR}/mysql_install_db.log" + touch "${mysql_install_log}" || die + chown ${MYSQL_USER} "${mysql_install_log}" || die + + # --initialize-insecure will not set root password + # --initialize would set a random one in the log which we don't need as we set it ourselves + local cmd=( + "${mysqld_binary}" + "${mysqld_options[@]}" + "--initialize-insecure" + "--init-file='${tz_sql}'" + "--basedir='${EROOT}/usr'" + "--datadir='${MY_DATADIR}'" + "--tmpdir='${MYSQL_TMPDIR}'" + "--log-error='${mysql_install_log}'" + "--user=${MYSQL_USER}" + ) + + einfo "Initializing ${PN} data directory: ${cmd[@]}" + eval "${cmd[@]}" >>"${mysql_install_log}" 2>&1 + + if [[ $? -ne 0 || ! -f "${MY_DATADIR}/mysql.ibd" ]] ; then + grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_install_log}" 1>&2 + die "Failed to initialize ${PN} data directory. Please review '${mysql_install_log}'!" + fi + + local x=${RANDOM} + local socket="${EROOT}/run/mysqld/mysqld${x}.sock" + local pidfile="${EROOT}/run/mysqld/mysqld${x}.pid" + unset x + + local mysqld_logfile="${TMPDIR}/mysqld.log" + touch "${mysqld_logfile}" || die + chown ${MYSQL_USER} "${mysqld_logfile}" || die + + cmd=( + "${mysqld_binary}" + "${mysqld_options[@]}" + "--basedir='${EROOT}/usr'" + "--datadir='${MY_DATADIR}'" + "--tmpdir='${MYSQL_TMPDIR}'" + --max_allowed_packet=8M + --net_buffer_length=16K + "--socket='${socket}'" + "--pid-file='${pidfile}'" + "--log-error='${mysqld_logfile}'" + "--user=${MYSQL_USER}" + ) + + einfo "Starting mysqld to finalize initialization: ${cmd[@]}" + eval "${cmd[@]}" >>"${mysqld_logfile}" 2>&1 & + + echo -n "Waiting for mysqld to accept connections " + local maxtry=15 + while [[ ! -S "${socket}" && "${maxtry}" -gt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + + if [[ -S "${socket}" ]] ; then + # Even with a socket we don't know if mysqld will abort + # start due to an error so just wait a little bit more... + maxtry=5 + while [[ -S "${socket}" && "${maxtry}" -gt 1 ]] ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + fi + + echo + + if [[ ! -S "${socket}" ]] ; then + grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysqld_logfile}" 1>&2 + die "mysqld was unable to start from initialized data directory. Please review '${mysqld_logfile}'!" + fi + + local mysql_logfile="${TMPDIR}/set_root_pw.log" + touch "${mysql_logfile}" || die + + ebegin "Setting root password" + # Do this from memory, as we don't want clear text passwords in temp files + local sql="ALTER USER 'root'@'localhost' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}'" + cmd=( + "${mysql_binary}" + --no-defaults + "--socket='${socket}'" + -hlocalhost + "-e \"${sql}\"" + ) + eval "${cmd[@]}" >"${mysql_logfile}" 2>&1 + local rc=$? + eend ${rc} + + if [[ ${rc} -ne 0 ]] ; then + # Poor man's solution which tries to avoid having password + # in log. NOTE: sed can fail if user didn't follow advice + # and included character which will require escaping... + sed -i -e "s/${MYSQL_ROOT_PASSWORD}/*****/" "${mysql_logfile}" 2>/dev/null + + grep -B5 -A999 -iE "(Aborting|ERROR|errno)" "${mysql_logfile}" + die "Failed to set ${PN} root password. Please review '${mysql_logfile}'!" + fi + + # Stop the server + if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then + echo -n "Stopping the server " + pkill -F "${pidfile}" &>/dev/null + + maxtry=10 + while [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; do + maxtry=$((${maxtry}-1)) + echo -n "." + sleep 1 + done + + echo + + if [[ -f "${pidfile}" ]] && pgrep -F "${pidfile}" &>/dev/null ; then + # We somehow failed to stop server. + # However, not a fatal error. Just warn the user. + ewarn "WARNING: mysqld[$(cat "${pidfile}")] is still running!" + fi + fi + + einfo "${PN} data directory at '${MY_DATADIR}' successfully initialized!" +} diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest index a535bdf22760..61daabc44ce2 100644 --- a/dev-db/percona-toolkit/Manifest +++ b/dev-db/percona-toolkit/Manifest @@ -1,31 +1,14 @@ -AUX percona-toolkit-2.2.17-fix-package-name.patch 872 BLAKE2B b8ce39ac4db7a38111b4622c081ee4d90023eee5cfd52c6a775786d8a0b540b9326c600e90960458d59364fba969f0598be3a5b4a89e9a426a6e36ec817972d8 SHA512 74cdd3d460811d6d7b03ca2c1c671cfe13e09de5789456f54a133803a1fd68f1506904a27d1bd41fd6423a52a96b9d8df485a750d8ac32773a04fd486173349d -AUX percona-toolkit-2.2.19-fix-package-name.patch 334 BLAKE2B 3f9034f3c7e0b0783e19a2d8e94772b9c582f1198397e5f600bcdb424db337d5d8dd89d56424a310af2f9f30b9e6e292c40ce2591d3479de6dfcd3a43a7424d3 SHA512 6a9ffdcc98e65dfe3eb013170efb4c35ca53375aff4d816118908cb2de1e946591501a22a7ad2a64a19cdf0f68d17a4d2910d6a6fb814e8cb012d20e8d302164 AUX percona-toolkit-2.2.20-fix-package-name.patch 334 BLAKE2B 3a36f40823194db89de326453d3a2b069edcd67fb50f1a65c27550002b0bf5f5c8631bf65fde8a4f83b7b90db434670c582a1a752b57ddb6c2acaecfc0ba8698 SHA512 eb87fa7d333160d0620ff56fb7e413024f573d05583b68a06aa0156f9a0332ce104ea38e9394d7a842bb5ab05349d77ec4ca3a5fdf28abd582241604f2337e09 AUX percona-toolkit-2.2.7-no-versioncheck.patch 9310 BLAKE2B 8d102dcab97bc87ad1a98ffd7b600d7453eb449ba919908b5a5063b53a127562bbd419d19dd716a9b6c199a1a38055fd5593817ddfe5200892c4529146c6435b SHA512 6d571c017254e8ea37d128f1623cc4e813ebbfc611cbb84403540c786abc62ee9ba625ec914b101953e5d1d09431f9caa91e270684e00ec6e002b2777b105df9 AUX percona-toolkit-3.0.10-slave-delay-fix.patch 1593 BLAKE2B 94bc49d581fbd453f650fe81b704ae042f3219495373c09bd750241cbdb3a1917e582927d3682072a1ac6369e2a564ee41bb16c25f662cab16748af1772c11b2 SHA512 40268aa6241416b80e6c076083a0ba2f75fb330529dc5de01438536cd6ce352b4dbee642cad1e1219441ababb054243731afdba0e4f8642dea20c0f1dada5646 AUX percona-toolkit-3.0.7-fix-package-name.patch 320 BLAKE2B 174f7d5870ec75eb7b8b1282eac9bf4ad4f9834480c5ae5645c436ce8df1dfcb353aaab59eb98cbad9b44aff20f4b1aa09ea2de9fc5e25cf8c7fd1a728bdc72e SHA512 32a3de3fc1e845a26d7d1cad2071030d4376bd408b6b8dead781866bfb29abea754c353f30f3b52c72d2fdefc2ef8727f21c7ff891c1c33c766862c5e7865497 AUX percona-toolkit-3.0.7-no-versioncheck.patch 5566 BLAKE2B 4def58c91dcdc35481c2ba89c78cb35db2a9121b86ba3a66896d0ef0175c9d6f47cf6eff0908847564ecc810243a3fdc0b893fbc3b2bd2131ec932f93a8694ad SHA512 a681b7f32f1acb509f01fe6c8e99106708729b8f8f5fe5fba0f2131b4380cfd22462f37bf0fbb95213b89d17375f0252b961d0257fb310295fe0e6e002b66e28 -DIST percona-toolkit-2.2.11.tar.gz 1389718 BLAKE2B 3d8c1207cda30aefc710ab5329aa94c76b3cd285a83f421b303e23e0544c4a51a0e8bf3ecdbb8532b67dcde808096bcb47c74ef63725b09ad59ca2b3f21e0fa5 SHA512 d5e34fce1b6b69dfc1a8ecd7bcbe84e586e950976553f4fd30afb887a850770c08990216e41fc194bdd0a5642034905ee2d69c2f8b3781503c9b4aab47017cdb -DIST percona-toolkit-2.2.17.tar.gz 1420968 BLAKE2B 886634cb4f1ed196595c0ebe9d2d53bea898a41d81e6881173949181fbdbc752be671a22344e4e5b142d22e724e86389bf2885273a67222feb28511e1de429b0 SHA512 a6ac84db9fc77b57fffd4f18b1e6c147fa39821a8b8db128af15bac6884a2937f973aa59adb05b738c3a15d9006c71db49276207c5b321acbefd8bd3a6130b76 -DIST percona-toolkit-2.2.19.tar.gz 1425623 BLAKE2B fe9b363ec924b1af9110ea7e7dab70ad4471ddf30868391f9e02a2f6d5a5698a2cb0238dd1cca81428adcac2f21262f10ea2da272ffd881dee1b8b88be1405e0 SHA512 8da35e2ee4d81465131623e5b423c2c49c0bf0faf01862952dd5ca72c2ffea64fabcaf88dda883e633e23de8ae4a6c75a095a751708bac6a8136fc8daaae2383 DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679 -DIST percona-toolkit-3.0.10.tar.gz 17335242 BLAKE2B c24103576c537eb9afbdcedc6acf51671853c8e0764092f76d3ee4a1de338a521d91b956b13665ca92a06a70726b92cb9d530ab04b50ed30990868305bd0a7a0 SHA512 e9477f908bbcc5c975f11d42fe9b2b61adebe823657e23a2c74c639767c73f3f71ebdf2bec1d839ad14f2d5080c5f1f9620db07c6bf9694bd7623e86f390e902 -DIST percona-toolkit-3.0.11.tar.gz 18254993 BLAKE2B a6c582bdda96bf5c74e7b5340c465d71f4f119d8364c1d36fc02c650d741972e706bb5eee86fd5bc22ed4f7298a45f0d5c5d9e4438230a8b7b09a58498dda7e8 SHA512 f722ccc8b0fde8f61d4cf269ec89df410f656153da06cf396d222cbb817e88b50e23c0ace383429acf39ddec0501e75d6d3e358fb5ed53ee50a0162eaed9a717 -DIST percona-toolkit-3.0.12.tar.gz 16205557 BLAKE2B e159867d7c6a8b1fd8fa0f31d3a7bdff45f45353995d57d71cd2fb763044524fb62c6c0dcff893ff9d92b5a18dd695445ac46b01ff99be7cbac9d625e5521c44 SHA512 4c01a04f6a4efb444e248d55ab846f32d4784e021b51b272875de3f1f0907298c66073f6d2a941ad407aefa9840407e55095c5ec848998f731539b12ec1875f8 DIST percona-toolkit-3.0.13.tar.gz 10855538 BLAKE2B 30dfbd3c56da64de10ce5d960a9b35b5729c7ea07ec8a40b97f2707af935e57d2291201926dae8794e623a2f60095502a5b97709d3343bd95318ab832f3a5ca5 SHA512 4f8050f3f3a43363c9ee1b15c161d60deafd443a0e057b7960881870d10d1fe0214b885e77b404f03081eb27adfa337e3adea26ca238efac753fb949272f36d3 -DIST percona-toolkit-3.0.7.tar.gz 79294306 BLAKE2B e3a556c823d355e5af504210dfb360e6fcf217ca6bfb7ba729e83e66cfdd09231c09d05fb51df1eac6bee0c6615620ac96ffce47c4f0473394d9c008ce8bdabe SHA512 e5a23ce6f4fd74f0956187679810de23a9d60f8073609289d641411c9f397f49b02c05cbcd0a68d78992849f17b70fb3ae411ac967e25c7be45f95ec374414fe -DIST percona-toolkit-3.0.8.tar.gz 79316265 BLAKE2B 5d6efdbaa4fd3ac914c059c9240f6dcd0de89c6b2ea444c407b115b380bb676c51266f907f6e37a62a40032fd5aa6e1816752c8ec08150dddf71c7568f42c739 SHA512 d5380395b052aebe651806649ff22f259d1af9401112b7ffe86b10664b87f917fecfe91bdc72b401d00471fc9c141391006cd322c9464fca1343f704ecaa8623 DIST percona-toolkit-3.0.9.tar.gz 15197340 BLAKE2B 095d8c0b26853caa6d2515de1d8fb8ff13b3084caa46498c8c789cd4e7b18473d41992701e393ad91cd7fdda8b3e56a099600285aeb4ba788110d36a028f76b6 SHA512 56a8732cfdbd58d0602e482d7bf049d2049104b7ae203d756db81a052cd837f16d2a35f75def4f23748534d0d2eb6441cb9fe49175a931fbcdbb6adeb42f1c53 -EBUILD percona-toolkit-2.2.11.ebuild 1262 BLAKE2B 8d33c609579606aac77a67c5d568a7c14d87f9f90ab3abcd1b6e225bd605a39359fb21f2f4cd845ac3bb27f2aa4e4e4e9e19407a84473db10b37f84364216826 SHA512 fb9ab1638b6aff2e43b55a2fb1872f07d36f3f41a7c7c02038681cbaf163e85291b0c79e422e4395b521a0bcb9bc9d0d9d4ae4aaa2654bcafcd39c6e85dca922 -EBUILD percona-toolkit-2.2.17.ebuild 1213 BLAKE2B 8602c2ac1859da4fbefa52c5714e07a9e44c3b148b35555e4977c1c4604fdf35de3a95a658065533e9f894f01a19f7b57b0eb2c537446622ab98ab59a7b13b6e SHA512 78b956efbe27586145cee31f784cb143cec4c40ef9f06efb315367178db085f2767f8b29180be0549ab407ad77ddc20527588102354eee23d3a328fc46f8a892 -EBUILD percona-toolkit-2.2.19.ebuild 1213 BLAKE2B 784c406e8b359b1c75c49725ee670c16d4e3ea91d845d83b9b5f032cbebcf455074fa7423f42102f257df571ad7b4cd9a21bbc318175c446867047c90d1cce95 SHA512 21caa33395129da3a11c2bd3bac9eff2a722bfc473d4e1065c9baa123542239531755b4b16965c5c470e7851027ce81b9a17b35bf6ba16cd922ca34a600f8fa2 +DIST percona-toolkit-3.1.0.tar.gz 18106856 BLAKE2B 4a08e70a03d80e86e2fd7ba4ac77be9568643faf46bb653ef9e18015b95d36936034369a8adf9de4e09d2ca6cd25a845b140d6dd2c41027597f08d74f328ad26 SHA512 6dd2de997fe9627897dad453277544142cbdcba41bf30de21ee10c292c671bc089df0e299a8e386af082511c57ac53621b8e11f4ae43e98ea41eeca0c76f652f EBUILD percona-toolkit-2.2.20.ebuild 1213 BLAKE2B 2bcc433599d64b15225e508fa16c50634b34c9963c38fae7d8ac412e730c9566751bfa1c784254018e40b5a6d8fcb6b4e52c2f85df7362d43bcf153282f7766b SHA512 f1b0b8a48e99d616d9a54a5bf6c39a06ef5e6f48992fe3e0584d464d7ed1abc5f6f08a14488cbffd4fcf4d8afe8791112094438baf06a5a4b788a953d539288b -EBUILD percona-toolkit-3.0.10-r1.ebuild 1330 BLAKE2B acf05bb59b278883dece85f7a60a6ae114a5a5253a867b0f2c5259196eddb4a95acdf66809c1ecb5ad47140f220b9cff47efeedc0ddc1f370db1ee6181c4f12c SHA512 cb5d77f6f689989ae2aa5e4eb4ca7273981b9f18e6308d67dd5ca25ddb163db24655b3d54e84f70f911ffd098bacf5d114dd8afd1a4b2c06198ad55f9fcbcff4 -EBUILD percona-toolkit-3.0.10.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982 -EBUILD percona-toolkit-3.0.11.ebuild 1330 BLAKE2B acf05bb59b278883dece85f7a60a6ae114a5a5253a867b0f2c5259196eddb4a95acdf66809c1ecb5ad47140f220b9cff47efeedc0ddc1f370db1ee6181c4f12c SHA512 cb5d77f6f689989ae2aa5e4eb4ca7273981b9f18e6308d67dd5ca25ddb163db24655b3d54e84f70f911ffd098bacf5d114dd8afd1a4b2c06198ad55f9fcbcff4 -EBUILD percona-toolkit-3.0.12.ebuild 1327 BLAKE2B becf83720c5604ec44f6ea1a9a36832778e34b06f9b33d72a7b83ac9bb4fd74803a03945fb918565bfd50cb2753b3915621d445dd33f44e64e25d06507f13a7b SHA512 3a598735a027e87c54c8417a43ef56edca0d89288a9e50e5ef826f84619908dfa76a0a51db5c7fa10c47113952be17b407bfeeb22294618d684430804322d0b8 EBUILD percona-toolkit-3.0.13.ebuild 1325 BLAKE2B c8dc51ce757c3165957190266fa484bf74451644cdc62a464d8276fd6d3523a2b2864caa27b766c7e90b1c02c81d940ebd706e876922020c0feb878eb3083d26 SHA512 152841e2bd6be6e7015be3c929e1ecef678bf4456b9beba1ace9dac5f129e02d7373b460bb445ab0c69e10c351602907d33dcddb14faf624013790f9cfe54753 -EBUILD percona-toolkit-3.0.7.ebuild 1167 BLAKE2B f61aaf597895efa1b68a04f889e93fef6207d4e2cc9f14e986aee81cccb6ca7888d7479bc01bf11bea554bb9f860615ebfb95111420c641ad7e8b16808121a24 SHA512 940474cb8cf56cff984dffc33c3848808d184c33f6d31a4bcafdc2ee16feecbe6f4084c80e243d18eb62c9f09759f274144aff2c3f45d465bc01c8f82d1e5ac1 -EBUILD percona-toolkit-3.0.8.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982 EBUILD percona-toolkit-3.0.9.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982 +EBUILD percona-toolkit-3.1.0.ebuild 1327 BLAKE2B f4b989014ab9f1d1b3915df600dec265a93db09857bc4f86a31fb2e454735d8a4b281d763e20d445d9ba5e74634f99f1923ce9951c2025e28ca6c5af1f5eb3af SHA512 5ecef35b561bf7d3fc3288e77c9eda32c3cebdd7a72228ccd606d4f573559cd711260691f1d211b5dc2af23778b2538d270ce50dd4a1c8844603547d2440c15e MISC metadata.xml 723 BLAKE2B f5150e42397c47b3815de1c9ff8414e12f517501e7075c5fddf3ac800a2c0a654db5d2fccef57609629017713f3a80a81164886b82d16df282601452e1bd5705 SHA512 b0e9ddbbd1834f5867600530e946ce30786ea83e779f62bf894facc0bb3f0fd5a58f6095f0e006d565e04370c89ae4101d9cfb9b7243704118eb7629ae0e0f9e diff --git a/dev-db/percona-toolkit/files/percona-toolkit-2.2.17-fix-package-name.patch b/dev-db/percona-toolkit/files/percona-toolkit-2.2.17-fix-package-name.patch deleted file mode 100644 index 2cd7634840e1..000000000000 --- a/dev-db/percona-toolkit/files/percona-toolkit-2.2.17-fix-package-name.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0e7c176b38c6ee286511e6bb7720390d31fc6233 Mon Sep 17 00:00:00 2001 -From: Thomas D. -Date: Tue, 15 Mar 2016 22:21:48 +0100 -Subject: [PATCH] Fix package name - -The previous package name "percona-toolkit" is not a valid package name for -ExtUtils::MakeMaker: - - $ perl Makefile.PL - Checking if your kit is complete... - Looks good - Warning: NAME must be a package name - [...] - -Let us use the same package name (Percona::Toolkit) various scripts in bin/ -are already using. ---- - Makefile.PL | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.PL b/Makefile.PL -index 7f46523..a9723f4 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -1,7 +1,7 @@ - use ExtUtils::MakeMaker; - - WriteMakefile( -- NAME => 'percona-toolkit', -+ NAME => 'Percona::Toolkit', - VERSION => '2.2.17', - EXE_FILES => [ ], - MAN1PODS => { --- -2.7.3 diff --git a/dev-db/percona-toolkit/files/percona-toolkit-2.2.19-fix-package-name.patch b/dev-db/percona-toolkit/files/percona-toolkit-2.2.19-fix-package-name.patch deleted file mode 100644 index 283299b14b42..000000000000 --- a/dev-db/percona-toolkit/files/percona-toolkit-2.2.19-fix-package-name.patch +++ /dev/null @@ -1,13 +0,0 @@ -Source https://github.com/percona/percona-toolkit/pull/84 -Adapted to current version ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -1,7 +1,7 @@ - use ExtUtils::MakeMaker; - - WriteMakefile( -- NAME => 'percona-toolkit', -+ NAME => 'Percona::Toolkit', - VERSION => '2.2.19', - EXE_FILES => [ ], - MAN1PODS => { diff --git a/dev-db/percona-toolkit/percona-toolkit-2.2.11.ebuild b/dev-db/percona-toolkit/percona-toolkit-2.2.11.ebuild deleted file mode 100644 index 402e3ff753d1..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-2.2.11.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils perl-app perl-module toolchain-funcs - -DESCRIPTION="essential command-line utilities for MySQL" -HOMEPAGE="http://www.percona.com/software/percona-toolkit/" -SRC_URI="http://www.percona.com/downloads/${PN}/${PV}/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -src_prepare() { - # bug 501904 - CVE-2014-2029 - # sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* - epatch "${FILESDIR}/${PN}-2.2.7-no-versioncheck.patch" -} - -# Percona Toolkit does NOT contain the UDF code for Murmur/FNV any more. -src_install() { - perl-module_src_install - dodoc docs/percona-toolkit.pod -} diff --git a/dev-db/percona-toolkit/percona-toolkit-2.2.17.ebuild b/dev-db/percona-toolkit/percona-toolkit-2.2.17.ebuild deleted file mode 100644 index 1673b79d5a9d..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-2.2.17.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -src_prepare() { - # Bug #501904 - CVE-2014-2029 - # sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* - eapply -p2 "${FILESDIR}"/${PN}-2.2.7-no-versioncheck.patch - eapply -p1 "${FILESDIR}"/${PN}-2.2.17-fix-package-name.patch - - default -} diff --git a/dev-db/percona-toolkit/percona-toolkit-2.2.19.ebuild b/dev-db/percona-toolkit/percona-toolkit-2.2.19.ebuild deleted file mode 100644 index 7ffe6c3da3be..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-2.2.19.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -src_prepare() { - # Bug #501904 - CVE-2014-2029 - # sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* - eapply -p2 "${FILESDIR}"/${PN}-2.2.7-no-versioncheck.patch - eapply -p1 "${FILESDIR}"/${PN}-2.2.19-fix-package-name.patch - - default -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild deleted file mode 100644 index 4a54323f4338..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -# ^ is *-no-versioncheck.patch -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch - "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.10.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.10.ebuild deleted file mode 100644 index 8cb91309b313..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.0.10.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.11.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.11.ebuild deleted file mode 100644 index 4a54323f4338..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.0.11.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -# ^ is *-no-versioncheck.patch -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch - "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.12.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.12.ebuild deleted file mode 100644 index 21aa1f40c53b..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.0.12.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -# ^ is *-no-versioncheck.patch -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch - "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.7.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.7.ebuild deleted file mode 100644 index 664d8424f999..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.0.7.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -PATCHES=( - "${FILESDIR}/${P}-fix-package-name.patch" - "${FILESDIR}/${P}-no-versioncheck.patch" -) diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.8.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.8.ebuild deleted file mode 100644 index 8cb91309b313..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.0.8.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit perl-module - -DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" -HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" -SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -# Package warrants IUSE doc -IUSE="" - -COMMON_DEPEND="dev-perl/DBI - dev-perl/DBD-mysql - virtual/perl-Time-HiRes" -RDEPEND="${COMMON_DEPEND} - dev-perl/JSON - dev-perl/libwww-perl - dev-perl/Role-Tiny - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Time-Local - virtual/perl-Digest-MD5 - virtual/perl-IO-Compress - virtual/perl-File-Temp - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - dev-perl/TermReadKey" -DEPEND="${COMMON_DEPEND} - virtual/perl-ExtUtils-MakeMaker" - -# Bug #501904 - CVE-2014-2029 -# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* -PATCHES=( - "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch -) - -src_prepare() { - default - - sed -i \ - -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ - Makefile.PL || die -} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild new file mode 100644 index 000000000000..700a8fd29578 --- /dev/null +++ b/dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit perl-module + +DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks" +HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit" +SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz" + +LICENSE="|| ( GPL-2 Artistic )" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +# Package warrants IUSE doc +IUSE="" + +COMMON_DEPEND="dev-perl/DBI + dev-perl/DBD-mysql + virtual/perl-Time-HiRes" +RDEPEND="${COMMON_DEPEND} + dev-perl/JSON + dev-perl/libwww-perl + dev-perl/Role-Tiny + virtual/perl-File-Path + virtual/perl-Getopt-Long + virtual/perl-Time-Local + virtual/perl-Digest-MD5 + virtual/perl-IO-Compress + virtual/perl-File-Temp + virtual/perl-File-Spec + virtual/perl-Scalar-List-Utils + dev-perl/TermReadKey" +DEPEND="${COMMON_DEPEND} + virtual/perl-ExtUtils-MakeMaker" + +# Bug #501904 - CVE-2014-2029 +# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/* +# ^ is *-no-versioncheck.patch +PATCHES=( + "${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch + "${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch +) + +src_prepare() { + default + + sed -i \ + -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ + Makefile.PL || die +} diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest index 6d8c4dc1acff..49b3f5401689 100644 --- a/dev-db/percona-xtrabackup/Manifest +++ b/dev-db/percona-xtrabackup/Manifest @@ -1,11 +1,9 @@ AUX percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch 4034 BLAKE2B 0ce65196d4679481d3197e95d9efc3783c1e4f37dcd602588fc3e8da5957f63cf68b9222a7ab12fe2e8fd19d69e8a24e9f86cc7dd2ba776d473a95b9279a1f24 SHA512 4dd9352b8d8ae46782925daae27cd5ad1765c5f4ab26f1f5f07fbac68f0cb83e4979009dddacd8a55ba818c93014b46dee997b43f6951820337e0cb79733f60e AUX percona-xtrabackup-2.4.6-remove-boost-version-check.patch 485 BLAKE2B c9330c5b0a163a0d95682a81cee9e3c99cebdb2a6ed124cb5f424ade92728b11b29685e2c1eee0fbf9df613f5a1b08cc4021daec8b60a6c66ab51b08a397b33d SHA512 31277d6bef14a6b642ce425ce9f2c92fe49f905c42c720a583cb45406c1ee18ccbf2bef224b9b89bb02de18aecc1ec48576f5ca0c9bfef0cc683d78218506906 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae -DIST boost_1_68_0.tar.gz 108771741 BLAKE2B 35e00bff941d5c55a83b642454843ecf4b98726e44d6ed389c0bce316ac3280977a53002b442bbf9cfcd3813c47e4df896a62e112384cf49b195f834f6f1b0e1 SHA512 66090ac63257f8151dfc98d4adaf1f35e04071b23067139e1297b91f0a09418aa85464fb956eaef5b2795b06368b20377ad1c2565d81f614f8fe9a39b8382b41 -DIST percona-xtrabackup-2.4.13.tar.gz 57254236 BLAKE2B 061cbee03374193359ae557909389ec675ed35edf216afc9deeb0b7880705d03024d380d0d6070aabfdb710bbde3664fd73da65ae5980e58290d8c9af29f351c SHA512 19d5fb3d775f1513b931cb2e736b753c1dd82c42fee382fdfa9f183eaee562c32f635db5d569d991cf1c8f7168de55ed863ba2c59db459ab79b80792b21ab298 +DIST boost_1_69_0.tar.gz 111710205 BLAKE2B 4a6d151ba10553641045a08bf4658c165862e05903b48bc700437104be468070785c67eed6dfcf1ed0923d5cf583a684b448e2a985e201bda298a3b839e62407 SHA512 89da45aca0774f68f897434882e8ec58f0673807c3a862315b90e893be90184722c098ad5822b89602b98ac3cc5a9f89c807079fd0f7e9c3f97be0d415414014 DIST percona-xtrabackup-2.4.15.tar.gz 57357749 BLAKE2B fcc64736230636a3a5584a300229e0507f00bcd64a3d0b8e00f834b15ec757347a55a85521dd0aea939761c3a26b1ef99466ff7e633133b8088cd290bd835444 SHA512 789b6870d3ad06861126f67190717ffb31224628d1b9631ec5f39d0a41b3c66aaf2127e3ec4b38d3e8f7858a1438a74f0e89b07b9f4248b637b2ed39143ab599 -DIST percona-xtrabackup-8.0.6.tar.gz 120345254 BLAKE2B e5cd5fe77cc439ffc42be9e8c97a987fbadc079262f1dd4a56d0fc93692bac604bc0ffaeefe2acd1e7edc2f57bfbeccff34621b4dfb5b707f5daa3d2653b0ec7 SHA512 39d4235e3c8e4f6d035d73154293968fd5e13d0d1430935c470155d7f00338ad612886e47c24a6a4d5f69985871ee9dd57d925f963b7c887412cf0c2480e3de1 -EBUILD percona-xtrabackup-2.4.13.ebuild 2082 BLAKE2B 88bdf030af98129fdc5053bb808f9779d5ee8d3223901826b1d9665d2d76ef686db42d24337bfe02dd0bc49eb185c0271f724e6a7a275504bfeb1c0a73806f41 SHA512 0674ab6381326d68b5857253aa002d9132b65a407e8452a095c1811793064366f8a18300b6e1589cee4dfdeca0d8171213f75412cc0a7a0d1548fdb96e8e0897 +DIST percona-xtrabackup-8.0.7.tar.gz 149143566 BLAKE2B 0a6c832f44725230023c01b50ed3d188358e7d2ba073422652a258cdf416b9d3c2a18bda4730bc5d9eb77aab17612bf93204fc2838c521e90b8571706a31d3c6 SHA512 9947b4a943f52e4d07fbde4d3b590146da19b94ce40305fc0230fc67c39e93fa4f3a30a55029cdcdb582cce7efe93831164a96f985d19d1f7b64a75aea552f47 EBUILD percona-xtrabackup-2.4.15.ebuild 1796 BLAKE2B 917f941081d07055251b8d66b2241208d0725e8c234f3ef502cfb52745d38f224f8556932c2435441a40aee6358dad131f588bf26e1ee76509a2f62231eb2e13 SHA512 01f27e72408a6f79d619de2e8364769487096725c1a5097e0768a4a24146f1aec93963b9373990e07b928ff753a3bb746f7c877fe14fee36070015f445818396 -EBUILD percona-xtrabackup-8.0.6.ebuild 1382 BLAKE2B 6738553dcff17fc83dd2574880da6128c2b1d2f42e229d5c6338b33397f10e56265fe48463041891cf01641fb344e0960a2c38f3b9729ec865c1a2b34bfd6037 SHA512 a23f2934451d0fb0030ad24c088c0729c2b1bdf73087c187f77c10b1937a67cf9f39bc1d66a8ce64bff5274d6ee8f8a8521a0b537b81ae84b6b94921eeae511d +EBUILD percona-xtrabackup-8.0.7.ebuild 1441 BLAKE2B 05572268ad2124593ffb24e9639a7ef055990041aa3990c29a08becfcc5b7d22e898a3f75d314e962ed7ab54205f996d45c1214bf456241a9420935d6eb93617 SHA512 6025287966c599c722cb4e4d7a81ce94fc78c2044d6189449c8b6dcc1b3cdfaa2d29140ecbd7e39ba25ee27dae1cf4439dcf9d2b9b419e9c657acbd6e9fe6a82 MISC metadata.xml 563 BLAKE2B 5c657288a3cd0ece118920159db14756bad6a2faa308e5495cdf1eca6dd160dfbd05c979857fd55a031bc0acacdc7a81db628c0ca31a9b2d3dae226838e2abf5 SHA512 050e1a78c8c7f4b024b207754005dcec28188697b3be2d93c30f800f8a91da1a3376b4501a4a6e061dcd096a958a9a4cba62251f5003b2056dfadee5bfda6716 diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild deleted file mode 100644 index d47037bbe0c4..000000000000 --- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic - -DESCRIPTION="Hot backup utility for MySQL based servers" -HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup" -SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/source/tarball/${P}.tar.gz - mirror://sourceforge/boost/boost_1_59_0.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -DEPEND=" - app-arch/lz4:0= - app-editors/vim-core - dev-libs/libaio - dev-libs/libedit - dev-libs/libev - dev-libs/libevent:0= - dev-libs/libgcrypt:0= - dev-libs/libgpg-error - dev-python/sphinx - net-misc/curl - sys-libs/zlib:=" - -RDEPEND=" - ${DEPEND} - !dev-db/percona-xtrabackup-bin - dev-perl/DBD-mysql" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch - "${FILESDIR}"/${PN}-2.4.11-fix-gcc6-isystem.patch -) - -src_prepare() { - cmake-utils_src_prepare - - # remove bundled boost, libedit, libevent, zlib - # just to be safe... - # We keep lz4 directory because we use extra/lz4/xxhash.c in cmake/libutils.cmake - rm -rv \ - cmd-line-utils/libedit \ - libevent \ - zlib || die -} - -src_configure() { - # Needed, due to broken handling of CMAKE_BUILD_TYPE leading to - # - # error: 'fts_ast_node_type_get' was not declared in this scope - # - append-cppflags -DDBUG_OFF - - # Upstream doesn't support C++14 -- build will fail with -fpermissive error - # https://bugs.mysql.com/bug.php?id=87956 - append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03 - - local mycmakeargs=( - -DBUILD_CONFIG=xtrabackup_release - -DWITH_BOOST="${WORKDIR}/boost_1_59_0" - -DWITH_EDITLINE=system - -DWITH_LIBEVENT=system - -DWITH_LZ4=system - -DWITH_SSL=bundled # uses yassl, which isn't packaged - -DWITH_ZLIB=system - -DWITH_PIC=ON - ) - - local CMAKE_BUILD_TYPE="Release" - cmake-utils_src_configure -} - -src_install() { - local p="${BUILD_DIR}/storage/innobase/xtrabackup" - - dobin "${p}"/src/{xbcloud,xbcrypt,xbstream,xtrabackup} - dosym xtrabackup /usr/bin/innobackupex - - einstalldocs - doman "${p}"/doc/source/build/man/* -} diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.6.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.6.ebuild deleted file mode 100644 index 47a080f6e78a..000000000000 --- a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.6.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake-utils flag-o-matic - -DESCRIPTION="Hot backup utility for MySQL based servers" -HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup" -SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-8.0-6/source/tarball/${P}.tar.gz - mirror://sourceforge/boost/boost_1_68_0.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -DEPEND=" - app-arch/lz4:0= - app-editors/vim-core - dev-libs/icu:= - dev-libs/libaio - dev-libs/libedit - dev-libs/libev - dev-libs/libevent:0= - dev-libs/libgcrypt:0= - dev-libs/libgpg-error - dev-libs/openssl:0= - dev-libs/protobuf:= - dev-libs/rapidjson - dev-libs/re2:= - dev-python/sphinx - net-misc/curl - sys-libs/zlib:=" - -RDEPEND=" - ${DEPEND} - !dev-db/percona-xtrabackup-bin - dev-perl/DBD-mysql" - -src_configure() { - local mycmakeargs=( - -DBUILD_CONFIG=xtrabackup_release - -DBUILD_SHARED_LIBS=OFF - -DWITH_BOOST="${WORKDIR}/boost_1_68_0" - -DWITH_SYSTEM_LIBS=ON - ) - local CMAKE_BUILD_TYPE="Release" - cmake-utils_src_configure -} - -src_install() { - local p="${BUILD_DIR}/storage/innobase/xtrabackup" - - dobin "${p}"/xbcloud_osenv - dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup} - - doman "${p}"/doc/source/build/man/* -} diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild new file mode 100644 index 000000000000..af0018e27b3c --- /dev/null +++ b/dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +CMAKE_MAKEFILE_GENERATOR="emake" + +inherit cmake-utils flag-o-matic + +BOOST_VER="1_69_0" +MY_PV="$(ver_rs 2 '-')" + +DESCRIPTION="Hot backup utility for MySQL based servers" +HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup" +SRC_URI="https://www.percona.com/downloads/Percona-XtraBackup-LATEST/Percona-XtraBackup-${MY_PV}/source/tarball/${P}.tar.gz + mirror://sourceforge/boost/boost_${BOOST_VER}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + app-arch/lz4:0= + app-editors/vim-core + dev-libs/icu:= + dev-libs/libaio + dev-libs/libedit + dev-libs/libev + dev-libs/libevent:0= + dev-libs/libgcrypt:0= + dev-libs/libgpg-error + dev-libs/openssl:0= + dev-libs/protobuf:= + dev-libs/rapidjson + dev-libs/re2:= + dev-python/sphinx + net-misc/curl + sys-libs/zlib:=" + +RDEPEND=" + ${DEPEND} + !dev-db/percona-xtrabackup-bin + dev-perl/DBD-mysql" + +src_configure() { + local mycmakeargs=( + -DBUILD_CONFIG=xtrabackup_release + -DBUILD_SHARED_LIBS=OFF + -DWITH_BOOST="${WORKDIR}/boost_${BOOST_VER}" + -DWITH_SYSTEM_LIBS=ON + ) + local CMAKE_BUILD_TYPE="Release" + cmake-utils_src_configure +} + +src_install() { + local p="${BUILD_DIR}/storage/innobase/xtrabackup" + + dobin "${p}"/xbcloud_osenv + dobin "${BUILD_DIR}"/runtime_output_directory/{xbcloud,xbcrypt,xbstream,xtrabackup} + + doman "${p}"/doc/source/build/man/* +} diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest index d3398e8efe38..d3609398655f 100644 --- a/dev-db/pgadmin4/Manifest +++ b/dev-db/pgadmin4/Manifest @@ -1,7 +1,9 @@ DIST pgadmin4-4.10.tar.gz 22809776 BLAKE2B 70a9857de31721b1cd5816b9e15abf325516f94ad5248f3ce5387cca5081ba96d7fca6c487265960ffac8d63c2fd09c3dea44d24a1cc9f8dbb170bd76d5de545 SHA512 b7f91d85fdc39766a294d9b66e8539f709b99f971726551d013345595161ff017e03505f05a41352575892be9d9622e86f4ccdbac76bcea435e2fb88a690b565 +DIST pgadmin4-4.13.tar.gz 25077107 BLAKE2B afbf0b6fba2f4cbbc1f47ac6c7867b7f131e5698de265a9dda53b79968f237ac591c5ff4da94dde0b74479cac1158ec825f42b14fc01aee13982043822c04443 SHA512 7eca41047e41f7bdce2dfe992260e8c2ab40f985dd232eb240ea9c0024f551f011653717aa0d5e4ccdccd4ef4936102cde1f97a32852d8382dcc222fadce7707 DIST pgadmin4-4.5.tar.gz 22420769 BLAKE2B ae16e34c4cfce0ae78f06321ea1fc34aac0e081df4c0d5906fc4da0c82abb67e374477b8f9a9266d003579eb8887541e4224465ce6eccd86589129e1b3efff24 SHA512 835434612ac2a7ff89fab4c4bed89644e43506491ce12d2b74ffdbc25b33f2ac9ae566c95e886d4b4f8bca6499c40be5f0d776b18bfdcebd44d7ffe3b89deb5f DIST pgadmin4-4.8.tar.gz 22780924 BLAKE2B 7b64ef8ac3782e9c8207d5938f3638d67ddf5c86ca520afbfb296a824b39411362ca6e9d8b03920e35cca38d1303efe81750e5bfc849cfb363f370da3d25ac44 SHA512 68b35c1091435fbeb39e67c7f93038fcba95cd5ae7098434b5d3afee10595f875ef9fd997934f2bbd93c914bcd5c3c71bd43f032f788e55c5795f5ad63b57cd7 EBUILD pgadmin4-4.10.ebuild 3559 BLAKE2B 4dadf2c0c44f091558cd0c510f4188842b7fa097ed91594c5ce3605d83f5a277a2f57a08bfe6165712520c2a2d2e4d6b1b9f141b86968cdc99326003e94aad9d SHA512 f6819b1183e57c6855d094bd4cc5bd9ba6073c55204f87f6a9542f117566550edabc6f76a506d26bfc142e5c1297dfc1dc298bb893f493d19738d0392c79bcc9 +EBUILD pgadmin4-4.13.ebuild 2822 BLAKE2B 6d36b16f3b9fdc5f8ee9d7e9479436184b8ecff6da1f92a9765246ff4841eeaadeaf849abcb8ae00022a93d5ff24669360dfb0a8dd017f34f678695b9e1aef35 SHA512 1547140af33afc93a29e9db4e3bb05d55c3510245057953adb68800b614243e125b6cab206ea18c6803e869dac55f92cae8280bc2914e6b9305f996b0bd2d0bb EBUILD pgadmin4-4.5.ebuild 3557 BLAKE2B d94690d8d884c26a070d5cd4a67c9aa79e308f5fa91f5f6d368193f9aeab733b5d176b8ae03c50251bbdb37cc0327504f2e78d06c125e90508f39e545cbb9739 SHA512 c9ed54b183053d0a93876fc8a7aa9565f36b6295fc437dfed965c76b2e9e3fc45b2b6739e841c340f44612bbdd8fe62b95ced938e7446559cf82e56a9bcd368e EBUILD pgadmin4-4.8.ebuild 3559 BLAKE2B 4dadf2c0c44f091558cd0c510f4188842b7fa097ed91594c5ce3605d83f5a277a2f57a08bfe6165712520c2a2d2e4d6b1b9f141b86968cdc99326003e94aad9d SHA512 f6819b1183e57c6855d094bd4cc5bd9ba6073c55204f87f6a9542f117566550edabc6f76a506d26bfc142e5c1297dfc1dc298bb893f493d19738d0392c79bcc9 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325 diff --git a/dev-db/pgadmin4/pgadmin4-4.13.ebuild b/dev-db/pgadmin4/pgadmin4-4.13.ebuild new file mode 100644 index 000000000000..52a65026ff9f --- /dev/null +++ b/dev-db/pgadmin4/pgadmin4-4.13.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6} ) +PYTHON_REQ_USE="sqlite" + +inherit python-single-r1 qmake-utils + +DESCRIPTION="GUI administration and development platform for PostgreSQL" +HOMEPAGE="https://www.pgadmin.org/" +SRC_URI="https://ftp.postgresql.org/pub/pgadmin/${PN}/v${PV}/source/${P}.tar.gz" + +LICENSE="POSTGRESQL" +KEYWORDS="~amd64 ~x86" +SLOT="0" +IUSE="doc" + +RESTRICT="test" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# libsodium dep added because of 689678 +COMMON_DEPEND="${PYTHON_DEPS} + dev-libs/libsodium[-minimal] + dev-qt/qtnetwork:5[ssl] + dev-qt/qtwidgets:5 +" + +DEPEND="${COMMON_DEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) +" + +RDEPEND="${COMMON_DEPEND} + >=app-text/htmlmin-0.1.12[${PYTHON_USEDEP}] + >=dev-python/blinker-1.4[${PYTHON_USEDEP}] + >=dev-python/flask-1.0.2[${PYTHON_USEDEP}] + >=dev-python/flask-gravatar-0.5.0[${PYTHON_USEDEP}] + >=dev-python/flask-htmlmin-1.5.0[${PYTHON_USEDEP}] + >=dev-python/flask-login-0.4.1[${PYTHON_USEDEP}] + >=dev-python/flask-mail-0.9.1[${PYTHON_USEDEP}] + >=dev-python/flask-migrate-2.4.0[${PYTHON_USEDEP}] + >=dev-python/flask-paranoid-0.2.0[${PYTHON_USEDEP}] + >=dev-python/flask-principal-0.4.0[${PYTHON_USEDEP}] + >=dev-python/flask-security-3.0.0[${PYTHON_USEDEP}] + >=dev-python/flask-sqlalchemy-2.3.2[${PYTHON_USEDEP}] + >=dev-python/flask-wtf-0.14.2[${PYTHON_USEDEP}] + >=dev-python/passlib-1.7.1[${PYTHON_USEDEP}] + >=dev-python/psutil-5.5.1[${PYTHON_USEDEP}] + >=dev-python/psycopg-2.8[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}] + >=dev-python/python-sqlparse-0.2.4[${PYTHON_USEDEP}] + >=dev-python/pytz-2018.9[${PYTHON_USEDEP}] + >=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}] + >=dev-python/six-1.12.0[${PYTHON_USEDEP}] + >=dev-python/speaklater-1.3[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.2.18[${PYTHON_USEDEP}] + >=dev-python/sshtunnel-0.1.4[${PYTHON_USEDEP}] + >=dev-python/wtforms-2.2.1[${PYTHON_USEDEP}] +" + +S="${WORKDIR}"/${P}/runtime + +src_prepare() { + cd "${WORKDIR}"/${P} || die + default +} + +src_configure() { + eqmake5 +} + +src_compile() { + default + if use doc; then + cd "${WORKDIR}"/${P} || die + emake docs + fi +} + +src_install() { + dobin pgAdmin4 + + cd "${WORKDIR}"/${P} || die + + local APP_DIR=/usr/share/${PN}/web + insinto "${APP_DIR}" + doins -r web/* + cat > "${D}${APP_DIR}"/config_local.py <<-EOF + SERVER_MODE = False + UPGRADE_CHECK_ENABLED = False + EOF + python_optimize "${D}${APP_DIR}" + + local CONFIG_DIR="/etc/xdg/pgadmin" + dodir "${CONFIG_DIR}" + cat > "${D}${CONFIG_DIR}"/pgadmin4.conf <<-EOF + [General] + ApplicationPath=${APP_DIR} + PythonPath=$(python_get_sitedir) + EOF + + if use doc; then + rm -r docs/en_US/_build/html/_sources || die + insinto /usr/share/${PN}/docs/en_US/_build + doins -r docs/en_US/_build/html + fi +} diff --git a/dev-db/pgbouncer/Manifest b/dev-db/pgbouncer/Manifest index 0bb0cf591832..0c8e7d167f8c 100644 --- a/dev-db/pgbouncer/Manifest +++ b/dev-db/pgbouncer/Manifest @@ -1,9 +1,12 @@ AUX logrotate 119 BLAKE2B 7ed90c0272410e5a37411f78aaa446d1688ceb5a5a0cfa652f8ea3d043f693af2b963aaf18bb230ec4cd5ae34f09219f02b9ee0ca5b43fe61489f46aa7a8d505 SHA512 5aa4226ab2d168a88a3b64deb114d3901431d2afb2571cf8ae411c989549bc465ee05104a6863cc8fce6d769d809b4ab536973280f50cb4415c6698c34e1a5b8 +AUX pgbouncer-1.11-dirs.patch 461 BLAKE2B ed51cc404049c92f59f08b87a2a7402c7f70e5ee4a66bf6ce0c2ea02a29ebb07441833852d46b34f95461fe4fef6972945c8a7ed5c0f3c8e7024103645e84ae1 SHA512 b6c53cf6b4ec5fb4620dfd71033a96918d90440c964a745c7befb89cb797c6b5af1b5f2cfd3f454cf1479df48a9f459f8a50d60127eef404c38de2b2445555a3 AUX pgbouncer-1.8-dirs.patch 984 BLAKE2B 0e9a3550efad0669e4598513197c50460326f701dae628ae8c9fb201e08ae3f0c5826515c6a884a00f2b0afd048490b16d87f9b3b9cf836ca4c77284cd705334 SHA512 2c9ddd2ae193b032435f97d41e789283ae69d99fefeb3829e80a90be296ccd2a754a9d00e6930985408758dfa3349d65f3c2ddf1f74053424bc8d8d09b2fa0e2 AUX pgbouncer.confd-r1 457 BLAKE2B 0b2e33b57ee33eac42742a8f9fe7c0f090bad53c5d7c29d86fd3047307bd05d62f922fc66a0805ba3396934f6e2e7060f810f1c71c5b07d887edf2763cc0f40d SHA512 0642b12236e944b6b5086b593dfd4a5d7c04c8347fc286835381945a50a421e87805900d63d84d12dcb1fad667fc81f21c8644c63af33388a71048ec6e024ab5 AUX pgbouncer.initd-r2 2204 BLAKE2B 9c417188d4a762906c7631f1ae8fc7c7b8f6c52805acf6bfc12d580c53b2faa4e36b7c0662852feaf78aebcc29498bb8ae441d749a710793508c6950a448862f SHA512 dd9e8f7487affcc46b359e6d07a4c2fd698626d7360d2b2929389bbd7a340059eb27f0e0e9a648b7005c446d65762edbb02b865fa68194ebb822c01fba19fd7e DIST pgbouncer-1.10.0.tar.gz 480571 BLAKE2B a0c1dadc48f38cfe0ba2641791b4734da84cfe6674198bb2a8014bc92543850e909d7b4649b99e78d58febaa0f89f62b6694f6333b1111cbd62ff2f22741984d SHA512 8ec9f102b57ca5f92fb689588ec090056ac29f21825400ec67bca413fe076ad50e0b491e65c4cfebc488cc245eb3c88c36db2ee0ba1cb737f35404be0983dd1d +DIST pgbouncer-1.11.0.tar.gz 571414 BLAKE2B 044d7cdf57b352b5b87547a8b96af1eca87e46b1f761bbd31d28a0d5158b52e438325db051ab51849f4e683f6211d0156a5081cc99a1109846085c84be7f72a6 SHA512 2373157f952a39dbb5d9afad7db2eba7459c28bcc302487c3bf15b64dca98940f65c9f7a1d142237f7053b6d2b290eaec15f930a341025f1665b501a26919115 DIST pgbouncer-1.9.0.tar.gz 469300 BLAKE2B 466f171a49ec9ce9be9a9d3208780cfbff956da7c74ec4332c7104ea537cb47a5cfdc0d80bbd96d233769b6f430f1ad99b623caefa2dc93af7ba336dd0f49514 SHA512 b127f4cb60ca5cdf339da76727918f0a3797a3e0a89f8ed6fdcaa80f3391d2c5bb51e19731915775210c0e5070dd611ee2e410c9a947624e45b5cf11aecdacf9 EBUILD pgbouncer-1.10.0.ebuild 1890 BLAKE2B 3040ae1502615e4b2dbc4a4e0baf503908eb97d53c94b98188edfe7916b3e9dfbac3d4ed74ad583cf36532260c0ebb12fbf0d5fee45c7efbb257720655ddb8de SHA512 4eb12a8791b02fa1ed0b0ab941194fb713a8b83a7d18e1d090a0603d29d2e37572725cc050764239749bc53b2b4a64bf044fa32ad08f9056fffc81144ca79d7b +EBUILD pgbouncer-1.11.0.ebuild 1893 BLAKE2B 09413b8c746ab8833746f83a8208386af799b260fdb314952222bdd5d148d400071d52e767b0f15e24de5533012e736b5230c234a7793ec357ec1f1bb68ef860 SHA512 51770bcb96830e2a3e7c29dd97cfda8bdaaa3f18ef3b485ea225d5411e3cd505b6875855b85c17dc1065fff6a10a286ce35f3ba25be92983dbd9c050fa871e91 EBUILD pgbouncer-1.9.0.ebuild 1893 BLAKE2B be596d0ec72a92b9c4351de0e9ff04b5f5f12e4c53684c12aec583e577ff20729f015890394e7ebeabdbf97ef84bcf6e4bad114b84c59e2ab07bd4ecd73c1013 SHA512 b65617a84baa28abb9c207f1a0567d9267cb936823539d908dcde9735fbb66d3b2619386e74fa8f4222cbba7b09227b03f3d9c2ec2abdfe21316110941a7c56e MISC metadata.xml 472 BLAKE2B b06a5dca1ee52c85fa1f948c4c8cf6e83c0aba3e0b0bd77672f1585c01d0a2f8ef4d7502e30e9cb658ec3dd3e53560671b69210166c36b4ce888e329f531585b SHA512 b098e87be6194706f462bb93c4bf5425023f7bd90a0ed421a51ea42db98c85ebd77f23eb413f4e271e126ad4404cd0bdf0694f675662c421f7afd8ec0f036b4d diff --git a/dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch b/dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch new file mode 100644 index 000000000000..3dd405372525 --- /dev/null +++ b/dev-db/pgbouncer/files/pgbouncer-1.11-dirs.patch @@ -0,0 +1,18 @@ +diff --git a/etc/pgbouncer.ini b/etc/pgbouncer.ini +index fed4a9f..5f2ed8e 100644 +--- a/etc/pgbouncer.ini ++++ b/etc/pgbouncer.ini +@@ -55,9 +55,9 @@ listen_port = 6432 + + ;; Unix socket is also used for -R. + ;; On Debian it should be /var/run/postgresql +-;unix_socket_dir = /tmp +-;unix_socket_mode = 0777 +-;unix_socket_group = ++unix_socket_dir = /run/postgresql ++unix_socket_mode = 0777 ++unix_socket_group = postgres + + ;;; + ;;; TLS settings for accepting clients + diff --git a/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild b/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild new file mode 100644 index 000000000000..1492a74c6e8f --- /dev/null +++ b/dev-db/pgbouncer/pgbouncer-1.11.0.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit user + +DESCRIPTION="Lightweight connection pooler for PostgreSQL" +HOMEPAGE="https://pgbouncer.github.io" +SRC_URI="https://pgbouncer.github.io/downloads/files/${PV}/${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+c-ares debug doc pam ssl -udns" + +# At-most-one-of, one can be enabled but not both +REQUIRED_USE="?? ( c-ares udns )" + +RDEPEND=" + >=dev-libs/libevent-2.0 + >=sys-libs/glibc-2.10 + c-ares? ( >=net-dns/c-ares-1.10 ) + ssl? ( >=dev-libs/openssl-1.0.1:=[-bindist] ) + udns? ( >=net-libs/udns-0.1 ) +" + +DEPEND="${RDEPEND}" + +pkg_setup() { + enewgroup postgres 70 + enewuser postgres 70 /bin/bash /var/lib/postgresql postgres + + enewuser pgbouncer -1 -1 -1 postgres +} + +src_prepare() { + eapply "${FILESDIR}/pgbouncer-1.11-dirs.patch" + + default +} + +src_configure() { + # --enable-debug is only used to disable stripping + econf \ + --docdir=/usr/share/doc/${PF} \ + --enable-debug \ + $(use_with c-ares cares) \ + $(use_enable debug cassert) \ + $(use_with pam) \ + $(use_with ssl openssl) \ + $(use_with udns) +} + +src_test() { + cd "${S}/test" + emake +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc AUTHORS + use doc && dodoc doc/*.rst + + newconfd "${FILESDIR}/${PN}.confd-r1" "${PN}" + newinitd "${FILESDIR}/${PN}.initd-r2" "${PN}" + + insinto /etc + doins etc/pgbouncer.ini + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate" pgbouncer +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + einfo "Please read the config.txt for Configuration Directives" + einfo + einfo "For Administration Commands, see:" + einfo " man pgbouncer" + einfo + einfo "By default, PgBouncer does not have access to any database." + einfo "GRANT the permissions needed for your application and make sure that it" + einfo "exists in PgBouncer's auth_file." + fi +} diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest index 9a80926fc574..0c912dc33c05 100644 --- a/dev-db/postgis/Manifest +++ b/dev-db/postgis/Manifest @@ -5,15 +5,13 @@ DIST postgis-2.4.8.tar.gz 12846228 BLAKE2B dc7cd26f08774011bddba362040f35fd46dab DIST postgis-2.5.1.tar.gz 16041872 BLAKE2B 589cf7168d3698737a19d817b8efb91695c2c3f63d6c3aa24189d9a37459a28ca8a7db0450aa2d557699f76cd8e3ab1eec198bd332b294d976330fdc9d8a7f60 SHA512 c6c9c8c5befd945614e92d1062df1d753ca8b7fd69b70226065c2dac77a59783b14ece4da994187079b683ee090ba5a79389ba679f22fce8c20a5afc2c8dfca0 DIST postgis-2.5.2.tar.gz 16252761 BLAKE2B 181ecc41e659c1df32392d0dfea9cc081c2a647fd23401b8b0470f99e1136b6b8ed900eaea38afdf87cc801bf13ede4247f9c188fcf0da6782624239c77b434f SHA512 b10781f0b74bad8162c33eb111a6090fba184b45fe5874d22cd3a5b0acfb057f3407c073bc44c9d4cd20ed8c2cb1fbb34480b0cf331340bc8b52580d4eccb819 DIST postgis-2.5.3.tar.gz 16424752 BLAKE2B 94c2ccd41eb88a39c6db48ad7f4d142742a1b0791e3abe57adb2c778406dcc8286afc6d55c80067e0b94a1300eff1c76a227d3cfd813e12541c715edeea11a9b SHA512 1c9f873ba8f8ff4aeae248c68c001eb4174416de1e00ce6a0d0c9ea129b475e887a83235027068d52f587ab95c549adbfaa7e5dccdda77855e39c55dac0fdc2d -DIST postgis-3.0.0alpha4.tar.gz 17488411 BLAKE2B ef819793ee431e54ab69e9434d45fc9c59ecb014dc18ccfb93705bc0ec6dec99ec05cedf687db17a8d65da5b6f2bd8760589ed00d1c51328f84f01461deb0922 SHA512 85eb8380772e7be0520617b23d74ab729be0a2ea6f2cbea4f765f38c9522312366723b6972f75017e7675e32b89692c2c25f7e355a18edf1fbb84d4eaa10e52a -DIST postgis-3.0.0rc2.tar.gz 17524319 BLAKE2B c538b9bf1813272fa5bdf3c842e483fac5b4285d2704988ff2a7601a4fcdb8e8966b3e884a4c8b5e37ca65c6ce6536524994c6a2f26d0c76ae5c4ec803525176 SHA512 479ddb9c59ca13b7b0f0003a60f0bce1acb07fbd580b071e6c5f693f7dfa62459ae8d6a44d24081bf34f942dcabbd3eacc5f455d26c6935d2d02032039fa0748 +DIST postgis-3.0.0.tar.gz 17359802 BLAKE2B aa83bdc2d1950c517f99cbdd877eb7261f6c29ce2cbd9f67f1e606c290080fc3d02ab0b7ceb68ce852e0c0d3d4b7753f03cb5b0921da164ab65d68e23d1df538 SHA512 82c233681fa6444686f9979768e5d6d3a9b6ca9cbd4fc2b14bd0a5d1269a8d0f45ee067e64984077063407c7abc13fa0e37a29928d7ccbfe3a61b694f592bed2 EBUILD postgis-2.4.6.ebuild 3062 BLAKE2B 54c4f4682a7803a425a590ade547d178aab1a07722d825a10d25a22b77c7e58f21d6aa7b2756ea5faa96bf8ff309dd40cb80b0145333be1407ac7e8fb826e4a8 SHA512 cd36e3462489fcdf97fc5935d6705906342c6ee178502c06918e230308e245fb22141d49889f692c4e6eee251e21ab8d34b1cb88abc4617fc2cf3476a056aacf EBUILD postgis-2.4.7.ebuild 3062 BLAKE2B 54c4f4682a7803a425a590ade547d178aab1a07722d825a10d25a22b77c7e58f21d6aa7b2756ea5faa96bf8ff309dd40cb80b0145333be1407ac7e8fb826e4a8 SHA512 cd36e3462489fcdf97fc5935d6705906342c6ee178502c06918e230308e245fb22141d49889f692c4e6eee251e21ab8d34b1cb88abc4617fc2cf3476a056aacf EBUILD postgis-2.4.8.ebuild 3064 BLAKE2B 49d50ffe6855984a43429167b72495d7b4ce7a25e572a17e31d798412879d3cce9606b4c724edefb19bfde200b2ae0e009eed06c744cd45ff6a2509d3a0780b5 SHA512 386d7ca69f4a45277c6b5a9089a922121c55f21ac0fb44eb4ba299001c922920eaa52967af668bb8bd3f39aa67d245eefb4e6759f4e35f46ef9b9b9790a9aa71 EBUILD postgis-2.5.1-r1.ebuild 3044 BLAKE2B ea7dd912c43f34cc13c596cea4f2169475c49d3318d4b5b2456889c52ef503c5300dcfc245220e9eacf8275c4443b6273c25da71f7d77831f888cc8d4f943f41 SHA512 3265db95c4debdf04068eafce9fef15466851b226752d90e6a4ebc8da0edb4f38f101cec4a59e1303700cfcabb0fe9382df25fbb68fe919bd639d61b9d9ba322 EBUILD postgis-2.5.2.ebuild 3044 BLAKE2B ea7dd912c43f34cc13c596cea4f2169475c49d3318d4b5b2456889c52ef503c5300dcfc245220e9eacf8275c4443b6273c25da71f7d77831f888cc8d4f943f41 SHA512 3265db95c4debdf04068eafce9fef15466851b226752d90e6a4ebc8da0edb4f38f101cec4a59e1303700cfcabb0fe9382df25fbb68fe919bd639d61b9d9ba322 EBUILD postgis-2.5.3.ebuild 3046 BLAKE2B f2664d46785b9bb43bb35a23435649a785893dcbab78161e7afd9f56a8f1daecfe5c4e923f17266e06e560c2bd9113b4cb7858d8322bbc29eb31c33cdb5d809c SHA512 1182ea0a9fdd8430d4d43fc0bcc13825dec8531b6b0be111cdf480c634263b1599cc544630a20cd56073ded452d507fe895b95a5f5987a5df6e8b5bed152015b -EBUILD postgis-3.0.0_alpha4.ebuild 3011 BLAKE2B dc6ad62c0612a554f8795a8da27a4071983bce755a9528f0b6a244a1879e575ec6c9302fa62e95aa4a8dbd223c79ea3b41ed27c79eaac0f502a43f16dc582e28 SHA512 fe2434616586fe768a66b78a20174bb8517e3b82d8baf37ff110078d6bad339c62d8d7302e9d6d555d48b2647769ba4db65bea7565436414d3553febcc5cc10f -EBUILD postgis-3.0.0_rc2.ebuild 3025 BLAKE2B b23af95626cb23a81c4aca2190425132d74036c151ca096885e8c9663c1e63657be21d9431dc712f28e7444d54755c3c87c27015e33799483f14e14940a35d6d SHA512 107f9d96f61ee7719cfcb6002463d14e593b53bafbdbd7dfc068d0bb874e8879adec91b2e5ef863e5aa3406e6d2d0a131244b5649690f42ee401e7aead6a3601 +EBUILD postgis-3.0.0.ebuild 3060 BLAKE2B 5b7798e3ab7293d163e504c3f9a370b905bb4c9c6062159976e4ef3129b3f569b16f4e31d4745c4636f89533344cc206d81093326adf0ec54072aba9f510f539 SHA512 920593b7e8015d9e8555adad9d9212c3abfd0a3bbb56e98d30f42a6fc13033b6fb093f8ca91479aa8077988f99ae0f6d98a6fc6835247d53fdba5ea149f1fbc1 EBUILD postgis-9999.ebuild 2999 BLAKE2B 258cac486a7405c8c539bb747c1bc50570fc2433cf67b96af7335d04c80cf329cbdd9cfa26b4eb6339bc81a3fa5102459051d6082de719fc116b6379c25c9ba5 SHA512 3789549924568079ae52b48ec5d754dd4eb05d9f7e9104e246a3cb1df3f26b921bb59d82fe97ead03d727415b23e990a65b4e0284fb0a88728bbd650ae4cb767 MISC metadata.xml 779 BLAKE2B 9dfbc86514c5f6e0c859dc41a46890e4f518f23c572786bf340112eadf21b35f5f583a3835f6ba58bef8c99a7ef8483f3a98898d372d1c0e5cc537bb9ecc2b12 SHA512 33ad2ddabf49e97af2cf188f2c0f72e1a936c228b43d8d3637230c43be0df82ec2aa20b63cb5f2385e936c215263fcd009332afe504bc5f30746a387b9b37ada diff --git a/dev-db/postgis/postgis-3.0.0.ebuild b/dev-db/postgis/postgis-3.0.0.ebuild new file mode 100644 index 000000000000..9a383102a778 --- /dev/null +++ b/dev-db/postgis/postgis-3.0.0.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +POSTGRES_COMPAT=( 9.{5..6} {10..12} ) +POSTGRES_USEDEP="server" + +inherit autotools eutils postgres-multi versionator + +MY_PV=$(replace_version_separator 3 '') +MY_P="${PN}-${MY_PV}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="Geographic Objects for PostgreSQL" +HOMEPAGE="http://postgis.net" +SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="address-standardizer doc gtk static-libs mapbox test topology" + +RDEPEND=" + ${POSTGRES_DEP} + dev-libs/json-c:= + dev-libs/libxml2:2 + >=sci-libs/geos-3.6.0 + >=sci-libs/proj-4.6.0 + >=sci-libs/gdal-1.10.0 + address-standardizer? ( dev-libs/libpcre ) + gtk? ( x11-libs/gtk+:2 ) + dev-libs/protobuf +" + +DEPEND="${RDEPEND} + doc? ( + app-text/docbook-xsl-stylesheets + app-text/docbook-xml-dtd:4.5 + dev-libs/libxslt + || ( + media-gfx/imagemagick[png] + media-gfx/graphicsmagick[imagemagick,png] + ) + ) + virtual/pkgconfig + test? ( dev-util/cunit ) +" + +PGIS="$(get_version_component_range 1-2)" + +REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" + +# Needs a running psql instance, doesn't work out of the box +RESTRICT="test" + +# These modules are built using the same *FLAGS that were used to build +# dev-db/postgresql. The right thing to do is to ignore the current +# *FLAGS settings. +QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" + +src_prepare() { + eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" + + # funky misdetection if enabled but --without-protobuf + + local AT_M4DIR="macros" + eautoreconf + + postgres-multi_src_prepare +} + +src_configure() { + local myargs="" + + use gtk && myargs+=" --with-gui" + + use address-standardizer || myargs+=" --without-address-standardizer" + myargs+=" --with-protobuf" + use topology || myargs+=" --without-topology" + + postgres-multi_foreach econf ${myargs} +} + +src_compile() { + postgres-multi_foreach emake + postgres-multi_foreach emake -C topology + + if use doc ; then + postgres-multi_foreach emake comments + postgres-multi_foreach emake cheatsheets + postgres-multi_forbest emake -C doc html + fi +} + +src_install() { + postgres-multi_foreach emake DESTDIR="${D}" install + postgres-multi_foreach emake -C topology DESTDIR="${D}" install + postgres-multi_forbest dobin ./utils/postgis_restore.pl + + dodoc CREDITS TODO loader/README.* doc/*txt + + docinto topology + dodoc topology/{TODO,README} + + if use doc ; then + postgres-multi_foreach emake DESTDIR="${D}" comments-install + + docinto html + postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} + + docinto html/images + postgres-multi_forbest dodoc doc/html/images/* + fi + + use static-libs || find "${ED}" -name '*.a' -delete +} + +pkg_postinst() { + ebegin "Refreshing PostgreSQL symlinks" + postgresql-config update + eend $? + + elog "To finish installing PostGIS, follow the directions detailed at:" + elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" +} diff --git a/dev-db/postgis/postgis-3.0.0_alpha4.ebuild b/dev-db/postgis/postgis-3.0.0_alpha4.ebuild deleted file mode 100644 index 4376ffab4a31..000000000000 --- a/dev-db/postgis/postgis-3.0.0_alpha4.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -POSTGRES_COMPAT=( 9.{5..6} {10..12} ) -POSTGRES_USEDEP="server" - -inherit autotools eutils postgres-multi versionator - -MY_PV=$(replace_version_separator 3 '') -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Geographic Objects for PostgreSQL" -HOMEPAGE="http://postgis.net" -SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="address-standardizer doc gtk static-libs mapbox test topology" - -RDEPEND=" - ${POSTGRES_DEP} - dev-libs/json-c:= - dev-libs/libxml2:2 - >=sci-libs/geos-3.5.0 - >=sci-libs/proj-4.6.0 - >=sci-libs/gdal-1.10.0 - address-standardizer? ( dev-libs/libpcre ) - gtk? ( x11-libs/gtk+:2 ) - mapbox? ( dev-libs/protobuf ) -" - -DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.5 - dev-libs/libxslt - || ( - media-gfx/imagemagick[png] - media-gfx/graphicsmagick[imagemagick,png] - ) - ) - virtual/pkgconfig - test? ( dev-util/cunit ) -" - -PGIS="$(get_version_component_range 1-2)" - -REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" - -# Needs a running psql instance, doesn't work out of the box -RESTRICT="test" - -# These modules are built using the same *FLAGS that were used to build -# dev-db/postgresql. The right thing to do is to ignore the current -# *FLAGS settings. -QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" - -src_prepare() { - eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" - - local AT_M4DIR="macros" - eautoreconf - - postgres-multi_src_prepare -} - -src_configure() { - local myargs="" - - use gtk && myargs+=" --with-gui" - - use address-standardizer || myargs+=" --without-address-standardizer" - use mapbox || myargs+=" --without-protobuf" - use topology || myargs+=" --without-topology" - - postgres-multi_foreach econf ${myargs} -} - -src_compile() { - postgres-multi_foreach emake - postgres-multi_foreach emake -C topology - - if use doc ; then - postgres-multi_foreach emake comments - postgres-multi_foreach emake cheatsheets - postgres-multi_forbest emake -C doc html - fi -} - -src_install() { - postgres-multi_foreach emake DESTDIR="${D}" install - postgres-multi_foreach emake -C topology DESTDIR="${D}" install - postgres-multi_forbest dobin ./utils/postgis_restore.pl - - dodoc CREDITS TODO loader/README.* doc/*txt - - docinto topology - dodoc topology/{TODO,README} - - if use doc ; then - postgres-multi_foreach emake DESTDIR="${D}" comments-install - - docinto html - postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} - - docinto html/images - postgres-multi_forbest dodoc doc/html/images/* - fi - - use static-libs || find "${ED}" -name '*.a' -delete -} - -pkg_postinst() { - ebegin "Refreshing PostgreSQL symlinks" - postgresql-config update - eend $? - - elog "To finish installing PostGIS, follow the directions detailed at:" - elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" -} diff --git a/dev-db/postgis/postgis-3.0.0_rc2.ebuild b/dev-db/postgis/postgis-3.0.0_rc2.ebuild deleted file mode 100644 index 50dc1cf0aa56..000000000000 --- a/dev-db/postgis/postgis-3.0.0_rc2.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -POSTGRES_COMPAT=( 9.{5..6} {10..12} ) -POSTGRES_USEDEP="server" - -inherit autotools eutils postgres-multi versionator - -MY_PV=$(replace_version_separator 3 '') -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="Geographic Objects for PostgreSQL" -HOMEPAGE="http://postgis.net" -SRC_URI="http://download.osgeo.org/postgis/source/${MY_P}.tar.gz" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -IUSE="address-standardizer doc gtk static-libs mapbox test topology" - -RDEPEND=" - ${POSTGRES_DEP} - dev-libs/json-c:= - dev-libs/libxml2:2 - >=sci-libs/geos-3.5.0 - >=sci-libs/proj-4.6.0 - >=sci-libs/gdal-1.10.0 - address-standardizer? ( dev-libs/libpcre ) - gtk? ( x11-libs/gtk+:2 ) - dev-libs/protobuf -" - -DEPEND="${RDEPEND} - doc? ( - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.5 - dev-libs/libxslt - || ( - media-gfx/imagemagick[png] - media-gfx/graphicsmagick[imagemagick,png] - ) - ) - virtual/pkgconfig - test? ( dev-util/cunit ) -" - -PGIS="$(get_version_component_range 1-2)" - -REQUIRED_USE="test? ( doc ) ${POSTGRES_REQ_USE}" - -# Needs a running psql instance, doesn't work out of the box -RESTRICT="test" - -# These modules are built using the same *FLAGS that were used to build -# dev-db/postgresql. The right thing to do is to ignore the current -# *FLAGS settings. -QA_FLAGS_IGNORED="usr/lib(64)?/(rt)?postgis-${PGIS}\.so" - -src_prepare() { - eapply "${FILESDIR}/${PN}-2.2.0-arflags.patch" - - # funky misdetection if enabled but --without-protobuf - - local AT_M4DIR="macros" - eautoreconf - - postgres-multi_src_prepare -} - -src_configure() { - local myargs="" - - use gtk && myargs+=" --with-gui" - - use address-standardizer || myargs+=" --without-address-standardizer" - myargs+=" --with-protobuf" - use topology || myargs+=" --without-topology" - - postgres-multi_foreach econf ${myargs} -} - -src_compile() { - postgres-multi_foreach emake - postgres-multi_foreach emake -C topology - - if use doc ; then - postgres-multi_foreach emake comments - postgres-multi_foreach emake cheatsheets - postgres-multi_forbest emake -C doc html - fi -} - -src_install() { - postgres-multi_foreach emake DESTDIR="${D}" install - postgres-multi_foreach emake -C topology DESTDIR="${D}" install - postgres-multi_forbest dobin ./utils/postgis_restore.pl - - dodoc CREDITS TODO loader/README.* doc/*txt - - docinto topology - dodoc topology/{TODO,README} - - if use doc ; then - postgres-multi_foreach emake DESTDIR="${D}" comments-install - - docinto html - postgres-multi_forbest dodoc doc/html/{postgis.html,style.css} - - docinto html/images - postgres-multi_forbest dodoc doc/html/images/* - fi - - use static-libs || find "${ED}" -name '*.a' -delete -} - -pkg_postinst() { - ebegin "Refreshing PostgreSQL symlinks" - postgresql-config update - eend $? - - elog "To finish installing PostGIS, follow the directions detailed at:" - elog "http://postgis.net/docs/manual-${PGIS}/postgis_installation.html#create_new_db_extensions" -} diff --git a/dev-db/soci/Manifest b/dev-db/soci/Manifest deleted file mode 100644 index 5d2d5a804852..000000000000 --- a/dev-db/soci/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST soci-3.2.3.zip 508929 BLAKE2B e1a83172391508506744b18ac0b18d69bec34bfbd31d9156b2cb786cdb7cdd8a99ace21d1286a2c4432ba18e18dedc4f390075a25a30fa2e45f36d802661ddb2 SHA512 dd9b7eaf535502e3230eada4d4d019963d2c9cf59b69fff5d466b4fc00976fa08f7b0199a0e4564a0395d0d30095b97aa1d613dfbaa329feb077ece3b0efacdf -EBUILD soci-3.2.3-r1.ebuild 1245 BLAKE2B 2582143b8657e4def6021b4372afca615d373347b38488e37856c698a42a1e334b0a660ca476d5cb3c21d3086c086e33a7ceb7a786a558a58d665f8b952409c0 SHA512 751da2107285e8b6aca6ffa2fb72f84e08402dc5a9cd681110bdd0144f7aa1cc078ebd21524011a1b3442633412ae8afcf2b926a91ee2fe97d79ae934df97741 -MISC metadata.xml 369 BLAKE2B 88ab173c19557879aa32b659f77ae01752fbcf63cc1f813801d23cfd6661fd2f4a367fcfdd3427d7c9d39a7347c293cbea3bf93c2ec058717c6851cfa0ba681d SHA512 d0c09ce11467f4c694fc91d3e2999ef14f0c3f9ebff056468be2d570f006ec0e7cd31d1f5bf74da23ffbc6c010216a99c9e00803aa1d072608d2237823dd85f9 diff --git a/dev-db/soci/metadata.xml b/dev-db/soci/metadata.xml deleted file mode 100644 index ad9d64cb1e23..000000000000 --- a/dev-db/soci/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - Enable boost support - Build the sample backend called Empty - - - soci - - diff --git a/dev-db/soci/soci-3.2.3-r1.ebuild b/dev-db/soci/soci-3.2.3-r1.ebuild deleted file mode 100644 index 9051f4411cb7..000000000000 --- a/dev-db/soci/soci-3.2.3-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Makes the illusion of embedding SQL queries in the regular C++ code" -HOMEPAGE="http://soci.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.zip" - -LICENSE="Boost-1.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="boost doc +empty firebird mysql odbc oracle postgres sqlite static-libs test" - -RDEPEND=" - firebird? ( dev-db/firebird ) - mysql? ( dev-db/mysql-connector-c:= ) - odbc? ( dev-db/unixODBC ) - oracle? ( dev-db/oracle-instantclient-basic ) - postgres? ( dev-db/postgresql:= ) - sqlite? ( dev-db/sqlite:3 ) -" -DEPEND="${RDEPEND} - boost? ( dev-libs/boost ) -" - -src_configure() { - local mycmakeargs=( - -DWITH_BOOST=$(usex boost) - -DSOCI_EMPTY=$(usex empty) - -DWITH_FIREBIRD=$(usex firebird) - -DWITH_MYSQL=$(usex mysql) - -DWITH_ODBC=$(usex odbc) - -DWITH_ORACLE=$(usex oracle) - -DWITH_POSTGRESQL=$(usex postgres) - -DWITH_SQLITE3=$(usex sqlite) - -DSOCI_STATIC=$(usex static-libs) - -DSOCI_TESTS=$(usex test) - -DWITH_DB2=OFF - ) - #use MYCMAKEARGS if you want enable IBM DB2 support - cmake-utils_src_configure -} - -src_install() { - use doc && local HTML_DOCS=( doc/. ) - cmake-utils_src_install -} diff --git a/dev-db/spatialite/Manifest b/dev-db/spatialite/Manifest index cca12fb31bb4..e569b10ccfe3 100644 --- a/dev-db/spatialite/Manifest +++ b/dev-db/spatialite/Manifest @@ -1,5 +1,5 @@ DIST libspatialite-4.3.0.tar.gz 4439538 BLAKE2B f3bbda3b9d6099197691eb85e20c693d5cbc3a8958c8f23bd1ba57add9d8676895163d845a4aadd690650244ffa7ae2a02ce86e844e032b815fe4c94f30fb4b8 SHA512 b686766ed90711a41efbf219a8942ead8aefda8784a9cabc59233f107e0e10eda949d022152af1064a169975aa6a47515f6064589166418b853427dde5779ecc DIST libspatialite-4.3.0a.tar.gz 4440660 BLAKE2B 2eb2afb96b096b86be9c30cf71663b7b2839d345b6c418fc8511653ed59d0aeff1756b6b19807140c67128c938e39be66d13088640658d14883c92c438c97251 SHA512 adfd63e8dde0f370b07e4e7bb557647d2bfb5549205b60bdcaaca69ff81298a3d885e7c1ca515ef56dd0aca152ae940df8b5dbcb65bb61ae0a9337499895c3c0 EBUILD spatialite-4.3.0-r1.ebuild 1060 BLAKE2B f01a8c5e0d60da79a3d3a524fdbd51b8afe63285746e1b5458d05742d0eb2b78bc02550dbb326f86691f0559a3d5c2f039007cba60fc3f07d9f49c1ad95b658b SHA512 1acdc18e95954a6bd6c510c80ea85b78f59435efa66f53d1f4029cc536f301243bb030161a2ad4eed596f15d2c4f1ce52b4fd673400decd171da9b11e356d582 -EBUILD spatialite-4.3.0a.ebuild 1067 BLAKE2B 25892661a8a88737205c12710502236cfd26adcac2872a41c75adb265db5fa71e7719a59d734a7ef86f8aec6af9873a8cf242650bf3688cea49c3da1dc035a01 SHA512 46a1254fcdf31bcb867ddd74cf330c2c62911a9b3b79a6dd9dd5dc6b75a9d1902d0d69e59e0d7ff55b38a9abcc7ef32985d881e52a0d9c0d0dacd0c1b5a71a6c +EBUILD spatialite-4.3.0a.ebuild 1208 BLAKE2B 93873ae74d1eb40012ef91063b873b2c336f17588ce738075cd7664d4570894b8974002015f7c9aa85e77ac71fd5a809c121f24efa9cbd4b527b9c3428cd842a SHA512 8c6f0c07490208f42a7658569d3d63889ec7937fb3e2286a305873919de47d6420f29b8d57a6536b4ebd71b7ee73bac1a36fe9803aa8d326e8b4a7bbd6e82781 MISC metadata.xml 559 BLAKE2B b128c4425723bb652063fd3ebebcd83de75a44c7a01e5a8b6c6596cad0bcd1a5f86977f4e3b49d2f1945ea83f12f9761ba712d5f1d919338996c7ddf18bc4a66 SHA512 a21438d83d828b52e4fc16f91edd29e6ace87ada9b697cf233b847a6d3a9f5196135769993873f23409f98548bf852a4e89645c2b0eaf57bd8427ff6dcc36111 diff --git a/dev-db/spatialite/spatialite-4.3.0a.ebuild b/dev-db/spatialite/spatialite-4.3.0a.ebuild index 796d1774d60c..3fb9d3d53dd8 100644 --- a/dev-db/spatialite/spatialite-4.3.0a.ebuild +++ b/dev-db/spatialite/spatialite-4.3.0a.ebuild @@ -3,6 +3,8 @@ EAPI=6 +inherit flag-o-matic + MY_PN="lib${PN}" MY_P="${MY_PN}-${PV}" @@ -19,7 +21,7 @@ RDEPEND=" >=dev-db/sqlite-3.7.5:3[extensions(+)] sys-libs/zlib geos? ( >=sci-libs/geos-3.4 ) - proj? ( sci-libs/proj ) + proj? ( sci-libs/proj:= ) xls? ( dev-libs/freexl ) xml? ( dev-libs/libxml2 ) " @@ -30,6 +32,9 @@ REQUIRED_USE="test? ( iconv )" S="${WORKDIR}/${MY_P}" src_configure() { + if use proj && has_version ">=sci-libs/proj-6.0.0"; then + append-flags "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" + fi econf \ --disable-examples \ --disable-static \ diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest index a8d02df662b3..5dc3426aa5bf 100644 --- a/dev-db/sqlite/Manifest +++ b/dev-db/sqlite/Manifest @@ -12,5 +12,5 @@ DIST sqlite-doc-3290000.zip 9415641 BLAKE2B 97fef1f01d3e7730e5220541ad9ccdf9f853 DIST sqlite-src-3280000.zip 12477204 BLAKE2B e62e0f36f0bebf89990f8ec91cb1e508a5ebc92bb212eaf9c80eb0febecb5623f5938ecd31c210837314f1f9aab19a18189824f82a106799384d8184ca5f65ab SHA512 49c35c65fa686a2326e13218db583c54fa5fe8f48f0caddd11a942601803b3023f7d32ffbab16641e0d72dc9ed288ad26eaa7226c865ac54e1f181859125651f DIST sqlite-src-3290000.zip 12557725 BLAKE2B b1aeb80734a2cb7d45c6f2e278bad2996b56ecaf792a8f26322bf50aeaa430eea267f23edb1721bb80ecb6e0c8e14c7a5d8f26178d056fd23efb52f496cc03e1 SHA512 575398fbe20c6471ee2abcbde170b8d48efbb3cb2716a65f42f05c52429a45d14e8046e50c59bbf75bfe2d8f151c34abd50b440c50af571f19e19f3290b230df EBUILD sqlite-3.28.0.ebuild 10067 BLAKE2B 1db1b8101b6db76d7146143bf9bbe2b27358d6d7233009fc7d1ac10b09589da34d3aa5c9a945f67a991c5123aa5e31562adee245a08d791eedc224521a367088 SHA512 d1fb4bbae6dd93a50f0242895bcab0508e0de42e7b0ec523fbeb4bae3b93eecc5ec0ad511a278748283124c38d60609dd251d8fb892f77dc43ddf2cc0a601a67 -EBUILD sqlite-3.29.0.ebuild 12014 BLAKE2B f8b2411dbcc2392d15aefaf1ef87a0320544980bde5a8724a806128d7a85733cc176478b82f004cb8efd916763518e8d60996557debd0dfe61b7715d46095139 SHA512 97a25ddbddeadad74c26e9ef92ad359ceac090b4be40a4321745bd1fccd94927ef3744a368c6a616e60d91765fb2ca56db90e6cde458e4362773703192acd990 +EBUILD sqlite-3.29.0.ebuild 12011 BLAKE2B 91889b43433a9d85ea2dffa3331ff101d8d4742d0c26a0c4cd7142aa4050f89d5eedc6d3ffb9762286de490109b903af0509a50d980a73677d7a413b1bd233ba SHA512 c5102b6760938baf3415f98c91f5569ba9e5fad817f3c97070ae87df1aa4896e2a2d6d1412a80adcc3f731674f2b6b92356645e653b327e3f731e61245fa2ea1 MISC metadata.xml 748 BLAKE2B c58da3e33e12b7747bbadacfd1a6137cf847fd5bd0525fc02ef854eb5bcad7bad0b29739257b632e19190995659768fdea418ffa7e485e55ef15f40f58b8382c SHA512 66f3f134065f76229b74a7ab7b469066a93da737a9037435e6fe78e85f45c980ec561537f2bb9b95db9de026bad025d8b06682187c97dedd2741717e893d43da diff --git a/dev-db/sqlite/sqlite-3.29.0.ebuild b/dev-db/sqlite/sqlite-3.29.0.ebuild index a0c30b4f293c..332d40390c4f 100644 --- a/dev-db/sqlite/sqlite-3.29.0.ebuild +++ b/dev-db/sqlite/sqlite-3.29.0.ebuild @@ -25,7 +25,7 @@ fi LICENSE="public-domain" SLOT="3" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" if [[ "${PV}" == "9999" ]]; then PROPERTIES="live" diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest index befb52637dac..e6e2b80e66b5 100644 --- a/dev-db/sqlitebrowser/Manifest +++ b/dev-db/sqlitebrowser/Manifest @@ -1,4 +1,4 @@ AUX sqlitebrowser-3.11.1-unbundle.patch 3194 BLAKE2B b2015e90e7f79409fb16d0490081634c47208956a53f4c24aeec3fa217dd165b1fec2bc51b818b82f39fae55a3ca7bb9a79dc58746781e1622707e0b051e845c SHA512 b0082e6373d54a2aee87b84f0194a91139f535da0c7d741e68458e05a6c7e6a46c1b027e8cf0dff455de0cf2c484d2be51bc829bdbedb2169c8fa44d553afd95 DIST sqlitebrowser-3.11.1.tar.gz 2523481 BLAKE2B c9a92b93795050605aa938cf5c73493b7d887b386da77b4cee206becd70779f00ab39c7a105772cdbe925ebedcfe0277b6ebe7898383db87454e19b050001253 SHA512 31f5315fd66d14fde16b58fe6522da937068c42e21f60aa15c3c04a1318ecac09f68143df108b83204cdc70ec8bac617a8ae196df9b5524690f837d7e7728916 -EBUILD sqlitebrowser-3.11.1-r1.ebuild 1363 BLAKE2B 5d773b3181600829e6746740deb37a0f9885eebc9f79a0ca6ce4e0a3f19907dc3f235f2a311b0f54e1b729159fc123e0c2a810e38de16cd7f0cc30d1d7f02209 SHA512 ffa03523d2b79218f1e82958c4624e6f36418dd1e6567264ade56600af450b9f0a290873ddb1846007ff0cdeae4e31c44a59ea760e0361ff347611e56313ea6e +EBUILD sqlitebrowser-3.11.1-r1.ebuild 1417 BLAKE2B 15bcf22a23c0ae234aedfce650329a5fdd71c83564b83fd26bdfe8b214152acaa3a27dd0858fe2ed6576929371a7127e2badb3e7b88f6a3f657566afd5ee84ac SHA512 f639d89292c98698bdb0c13e14eb71ccfc307f8216e09ac52a40850c3b99607dd7670f12b37c9470de2e09203a9f736fb8ae55232efb6e5ffdfbeb57750fbba0 MISC metadata.xml 659 BLAKE2B bf5f352f0227c1408cd9c0720fea6b7bf35e6f843f4e1f6fb3e340d3e7e5ddc09843484da6c54254345cde615993acaeba50027f44f33e0134ac05414e80e8ca SHA512 defe9a90cbcdee9750f9a5dffb8620445efd4d855fa789bad01d80151f4e64676245c2a51670c7418d2e19faa72bf26f4322c3953d610933a5b479985acedca2 diff --git a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild index c763fd949dca..937429c32f84 100644 --- a/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild +++ b/dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild @@ -48,7 +48,8 @@ src_prepare() { sed -e "/^project/ s/\".*\"/sqlitebrowser/" -i CMakeLists.txt || die if ! use test; then - sed -e "/qt5_use_modules/ s/ Test//" -i CMakeLists.txt || die + sed -e "/find_package/ s/ Test//" -i CMakeLists.txt || die + sed -e "/set/ s/ Qt5::Test//" -i CMakeLists.txt || die fi } diff --git a/dev-db/xbase/Manifest b/dev-db/xbase/Manifest deleted file mode 100644 index 49fd9eb3c3f0..000000000000 --- a/dev-db/xbase/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX xbase-2.0.0-ppc.patch 679 BLAKE2B fa2d305e57c6e99a703c0d5458d81c8d2b47adcba57e5926afeb3dfe024bac7dfe02e6cb2fab1e7a9f5e5d37eef2d1b5b812659d6b8936be324bf84828e761b8 SHA512 3a91e2ba27cfcb8f31172db7d381a81ebb2a49b984ae7d4f108839ef43c520d5d577b3393a3d520e4d95bf808fc50f738f54abc0172aa25f045267349dd00fe8 -AUX xbase-3.1.2-fixconfig.patch 467 BLAKE2B 031c2a4a22f5587be8819e2fa8536df7c6512719533cc7bb3298195541aff00f8f9c85408aecb664f5330c183817769e6659f646405a14c7ccbd28d4b5765a47 SHA512 15acffe25b7bb0eb495ad480deb9e2c349fee10b938a8cc9fd295ea9c745b7e1c1c94f544513a9839f577ac5a9af892c72c83f42e79601a244ecf84c99eeafb8 -AUX xbase-3.1.2-gcc-version.patch 441 BLAKE2B 3e925e759334fa20c5ae4013b56b05d52ff33ba80777a0f998075080e18226de17b52d7550f22ada09f8ac208eed2c996fc2bb995a8838d95fe0ea0ba61afe3c SHA512 2104f0c2d186a753bfb8d55d8234e3f2dc53e3b1ee375fbad47654ca5f814d62133606829e8a7884d147d1a213269394a88e9ca356dfb24fd0c8f6f73ec5b878 -AUX xbase-3.1.2-gcc44.patch 700 BLAKE2B 15b8805fe985f4a3597177143e968780aecce6609f2ae81bd72c2b563bf4ff018216a5a873609f85f3ce08783e3f0698be3c081f40833487672fab4716d06175 SHA512 b38415eced0ead8455bc443424ede47f110fb5d3d2673ccd74fbd438bb08a1fcdabf071bbece3ff3af2fe285b57ea3f2553f8797ccff03a33f7c38dd5c665a4c -AUX xbase-3.1.2-gcc47.patch 572 BLAKE2B e656c3343746650a455e187257b0deae5a5908a074ce1ac24d15a6c3ba953b3e70cc083a3d05165d73e24f7789e61c45205b8923d5cd83c5c7eec7e83e07fabb SHA512 765502e91df57876bc641c0eaae27a0531e9cca10d67f5811b0b93f0c79a8610d684f16a3fc0bfe2f7dc0c1862fa11658a869a2b561762e7697877117f4203fb -AUX xbase-3.1.2-gcc6.patch 2299 BLAKE2B 1eba4035ae9aeeee8aec0f1a833997f122444e8928d6246326d08324ab04a4d660b8ebbfd1f22b2349f9b86e6249a0f04c3a8f83715f71dcac773bdd0a9c4f8e SHA512 e8c3e5a4577a652bbd4582dbca57a1be0c9273ea60b105308258f35431e450fd18031ecac0a61ab934825533d5f07170bdeb88130ece6ca50e3164f82a947eb5 -AUX xbase-3.1.2-gcc7.patch 1282 BLAKE2B 98a6b04c828a4498d452f2f8a4b297a0a170e1c47a6bd4dddc913025cfb3b9bd4c534b459772260374f59811d2f91d53622b126c60ef961be967b748ea9f5c13 SHA512 1430ed552aed048c27b37ddc88eab2241b7c1632e884ebf35f333ad1adacbe60eccdcd4b81d869db004e2bec70622f950fecd4beea3f82f8c60a398a4c52b1b7 -AUX xbase-3.1.2-lesserg.patch 9096 BLAKE2B 1ae8e5d2a8fcf7d77519eaab5b49740b4dbd02b577daf2d68795eb7fb162cda88641c12c450a4f0870e3194da146429db2d49336e12b59e434ef885381ac29fb SHA512 5be7a701922a31e37c570dc054a9fa3f7833ce6733ad776311675dcd615400ec1cb0794c19f4eca110b857d68405391bf5801063224284d7d55fe3fe8dee09ad -AUX xbase-3.1.2-outofsource.patch 1290 BLAKE2B 08a151121f0270da996bcbce5885b1e5d7e5ce6e119d7a0fba32edf23942ad323df6af1554d62ea2a969ec68ac22d201b77198f8341158053e68ac9095a0560a SHA512 76164108abd4f50c4fe3d13a4c868936ad6a1d11ae8dd1e82487280bd4bdb70e5f751efda826ba4debc0112c67628b0c78fbdecbf556c18626d5afd378184270 -AUX xbase-3.1.2-xbnode.patch 341 BLAKE2B 4e69abe195b1918a0521eae1b14be43f29f23b12a56d5da515d50f63c5909ddce66315adcca93f0764de1299f4d0924e0e11c1e05a12fc6ac6e211c5619c2484 SHA512 795a6b06990d1399924007a7ad4e674f65131f5ef7ed339ed0f53445f6939c373d375603ae3aa8dee697335327fd1ae0b89fc31d68a253cc5a12380faddba524 -DIST xbase64-3.1.2.tar.gz 425650 BLAKE2B d99a15fa9642887e7f303344030eff351f764e7057beede2941016f4f8ee813c2196f20764f5e7e8a52a285d0a2d23dfe4ef49de3c0ba4c45e71d2ae2ffe2ef1 SHA512 bd9e27e250ad1035aa7c692cba668b2e9cf678c398f2ee9fdb9a08374a77f3920c059edd8c72fbd172e488d6169b256526acb47b7685e3dbbecd6cbca859ce87 -EBUILD xbase-3.1.2.ebuild 1420 BLAKE2B d7af2cfefe9873e5a5979f58d1a1987c739110fe1fc84b593d8ffdde9e6786a19354a9848348e077e13c74ffbaa53c6dde15f40e3b62fc22d3a34b7ca039668a SHA512 86e17fd291fe37597a8e1bff68eccbb4c14c99b727d72586d0be090d6f74cbbef03b0f69d03a9eb0e911156223d9ceb40202ce1a1753b05241e952d1cbc09a72 -MISC metadata.xml 240 BLAKE2B e63e77abbce61350b20e1b35e8a0950da40467f2ba51cff0ea6ed21955fa7ffc78ab218eaab4ca0696d780a8f75e17ad40c375ad449f7c15ad0ca4b556dbb96b SHA512 7d73f296795e371ae182b184072c8ed76389fa4eea31e75eb6df2eaa735597465b8f0a913483ec6e12f8ab28133eb93a1292566668c59e9b0e8ebece704ad09e diff --git a/dev-db/xbase/files/xbase-2.0.0-ppc.patch b/dev-db/xbase/files/xbase-2.0.0-ppc.patch deleted file mode 100644 index 3b743a9fd0ae..000000000000 --- a/dev-db/xbase/files/xbase-2.0.0-ppc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xbase-2.0.0/ltconfig.foo 2007-05-04 18:14:42.000000000 -0400 -+++ xbase-2.0.0/ltconfig 2007-05-04 18:15:39.000000000 -0400 -@@ -1664,16 +1664,7 @@ linux-gnu*) - shlibpath_var=LD_LIBRARY_PATH - check_shared_deplibs_method='file_magic ELF 32-bit LSB shared object' - sys_lib_search_path="/lib /usr/lib /usr/local/lib `echo $LD_LIBRARY_PATH | sed -e 's/:/ /g'`" -- -- if test -f /lib/ld.so.1; then -- dynamic_linker='GNU ld.so' -- else -- # Only the GNU ld.so supports shared libraries on MkLinux. -- case "$host_cpu" in -- powerpc*) dynamic_linker=no ;; -- *) dynamic_linker='Linux ld.so' ;; -- esac -- fi -+ dynamic_linker='GNU ld.so' - ;; - - netbsd* | openbsd*) diff --git a/dev-db/xbase/files/xbase-3.1.2-fixconfig.patch b/dev-db/xbase/files/xbase-3.1.2-fixconfig.patch deleted file mode 100644 index 2bfe92f8239a..000000000000 --- a/dev-db/xbase/files/xbase-3.1.2-fixconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xbase64-3.1.2/xbase64-config.in.BAD xbase64-3.1.2/xbase64-config.in ---- xbase64-3.1.2/xbase64-config.in.BAD 2009-08-19 22:58:42.081087534 -0400 -+++ xbase64-3.1.2/xbase64-config.in 2009-08-19 22:58:45.604090002 -0400 -@@ -5,7 +5,7 @@ exec_prefix=@exec_prefix@ - exec_prefix_set=no - CC="@CC@" - CXX="@CXX@" --LD="@SHARED_LD@" -+LD="@LD@" - - usage="\ - Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]" diff --git a/dev-db/xbase/files/xbase-3.1.2-gcc-version.patch b/dev-db/xbase/files/xbase-3.1.2-gcc-version.patch deleted file mode 100644 index 3f0d209eec47..000000000000 --- a/dev-db/xbase/files/xbase-3.1.2-gcc-version.patch +++ /dev/null @@ -1,16 +0,0 @@ - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/configure.in b/configure.in -index 3110c70..5850231 100755 ---- a/configure.in -+++ b/configure.in -@@ -74,7 +74,7 @@ AC_SUBST(RHREL) - - # get G++ version - if test "$GXX" = "yes"; then -- GXXVER=`${CXX} -v 2>&1 | grep version | cut -d " " -f 3 -` -+ GXXVER=`${CXX} -v 2>&1 | grep " version " | cut -d " " -f 3 -` - GXXVER="gcc${GXXVER}" - else - GXXVER="" diff --git a/dev-db/xbase/files/xbase-3.1.2-gcc44.patch b/dev-db/xbase/files/xbase-3.1.2-gcc44.patch deleted file mode 100644 index d23c9f23d08f..000000000000 --- a/dev-db/xbase/files/xbase-3.1.2-gcc44.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 xbase64-3.1.2/xbase64/xbase64.cpp ---- xbase64-3.1.2/xbase64/xbase64.cpp.gcc44 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbase64.cpp 2009-08-19 23:08:14.724079392 -0400 -@@ -66,6 +66,8 @@ - #include - #endif - -+#include -+ - - /*! \file xbase64.cpp - */ -diff -up xbase64-3.1.2/xbase64/xblock.cpp.gcc44 xbase64-3.1.2/xbase64/xblock.cpp ---- xbase64-3.1.2/xbase64/xblock.cpp.gcc44 2009-08-19 23:08:59.408186578 -0400 -+++ xbase64-3.1.2/xbase64/xblock.cpp 2009-08-19 23:09:11.416184844 -0400 -@@ -65,6 +65,8 @@ - //#include - //#include - -+#include -+ - /*! \file xblock.cpp - */ - #ifdef XB_LOCKING_ON diff --git a/dev-db/xbase/files/xbase-3.1.2-gcc47.patch b/dev-db/xbase/files/xbase-3.1.2-gcc47.patch deleted file mode 100644 index 7774251ed68d..000000000000 --- a/dev-db/xbase/files/xbase-3.1.2-gcc47.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up xbase64-3.1.2/bin/dumprecs.cpp.gcc47 xbase64-3.1.2/bin/dumprecs.cpp ---- xbase64-3.1.2/bin/dumprecs.cpp.gcc47 2012-01-05 15:36:00.377536998 -0500 -+++ xbase64-3.1.2/bin/dumprecs.cpp 2012-01-05 15:36:15.198399295 -0500 -@@ -70,7 +70,7 @@ int main(int ac,char** av) - return 1; - } - -- for(int i=1; i"; -- gets( exprsn ); -+ fgets( exprsn, sizeof(exprsn), stdin ); -+ strtok( exprsn, "\n" ); - - if( strstr( exprsn, "HELP" ) || strstr( exprsn, "help" )){ - std::cout << "** Command Help ***" << std::endl << std::endl; -diff -up xbase64-3.1.2/xbase64/xbase64.h.gcc7 xbase64-3.1.2/xbase64/xbase64.h ---- xbase64-3.1.2/xbase64/xbase64.h.gcc7 2017-02-20 09:49:07.063609482 -0500 -+++ xbase64-3.1.2/xbase64/xbase64.h 2017-02-20 09:57:36.586618723 -0500 -@@ -53,6 +53,7 @@ - #endif - - #include -+#include - - #if defined(__WIN32__) - #include "windows.h" diff --git a/dev-db/xbase/files/xbase-3.1.2-lesserg.patch b/dev-db/xbase/files/xbase-3.1.2-lesserg.patch deleted file mode 100644 index b6eb71e0b618..000000000000 --- a/dev-db/xbase/files/xbase-3.1.2-lesserg.patch +++ /dev/null @@ -1,294 +0,0 @@ -diff -up xbase64-3.1.2/xbase64/xbase64.cpp.lesserg xbase64-3.1.2/xbase64/xbase64.cpp ---- xbase64-3.1.2/xbase64/xbase64.cpp.lesserg 2012-01-05 15:31:01.695312436 -0500 -+++ xbase64-3.1.2/xbase64/xbase64.cpp 2012-01-05 15:31:01.717312232 -0500 -@@ -38,7 +38,7 @@ - - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbase64.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbase64.h.lesserg xbase64-3.1.2/xbase64/xbase64.h ---- xbase64-3.1.2/xbase64/xbase64.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbase64.h 2012-01-05 15:31:01.718312223 -0500 -@@ -42,7 +42,7 @@ - #ifndef __XB_XBASE_H__ - #define __XB_XBASE_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -@@ -60,7 +60,7 @@ - // ripped from wxWindows - - // _declspec works in BC++ 5 and later, as well as VC++ --#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNU LesserC__) -+#if defined(__VISUALC__) || defined(__BORLANDC__) || defined(__GNU_LesserC__) - # ifdef XBMAKINGDLL - # define XBDLLEXPORT __declspec( dllexport ) - # define XBDLLEXPORT_DATA(type) __declspec( dllexport ) type -diff -up xbase64-3.1.2/xbase64/xbcdx.h.lesserg xbase64-3.1.2/xbase64/xbcdx.h ---- xbase64-3.1.2/xbase64/xbcdx.h.lesserg 2012-01-05 15:32:17.398608985 -0500 -+++ xbase64-3.1.2/xbase64/xbcdx.h 2012-01-05 15:32:43.051370614 -0500 -@@ -50,7 +50,7 @@ struct CdxInnerNode: public CdxNode - { - char keys[500]; - } --#ifdef __GNU LesserC__ -+#ifdef __GNU_LesserC__ - __attribute__((packed)) - #endif - ; -@@ -67,7 +67,7 @@ struct CdxLeafNode: public CdxNode - char byteCount; - char keys[488]; - } --#ifdef __GNU LesserC__ -+#ifdef __GNU_LesserC__ - __attribute__((packed)) - #endif - ; -diff -up xbase64-3.1.2/xbase64/xbdate.cpp.lesserg xbase64-3.1.2/xbase64/xbdate.cpp ---- xbase64-3.1.2/xbase64/xbdate.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbdate.cpp 2012-01-05 15:31:01.719312213 -0500 -@@ -40,7 +40,7 @@ - - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbdate.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbdate.h.lesserg xbase64-3.1.2/xbase64/xbdate.h ---- xbase64-3.1.2/xbase64/xbdate.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbdate.h 2012-01-05 15:31:01.721312195 -0500 -@@ -45,7 +45,7 @@ - #ifndef __XB_XBDATE_H__ - #define __XB_XBDATE_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -diff -up xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg xbase64-3.1.2/xbase64/xbdbf.cpp ---- xbase64-3.1.2/xbase64/xbdbf.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbdbf.cpp 2012-01-05 15:31:01.722312185 -0500 -@@ -39,7 +39,7 @@ - - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbdbf.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbdbf.h.lesserg xbase64-3.1.2/xbase64/xbdbf.h ---- xbase64-3.1.2/xbase64/xbdbf.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbdbf.h 2012-01-05 15:31:01.723312175 -0500 -@@ -41,7 +41,7 @@ - #ifndef __XB_DBF_H__ - #define __XB_DBF_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -diff -up xbase64-3.1.2/xbase64/xbexp.cpp.lesserg xbase64-3.1.2/xbase64/xbexp.cpp ---- xbase64-3.1.2/xbase64/xbexp.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbexp.cpp 2012-01-05 15:31:01.725312157 -0500 -@@ -38,7 +38,7 @@ - - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbexp.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbexp.h.lesserg xbase64-3.1.2/xbase64/xbexp.h ---- xbase64-3.1.2/xbase64/xbexp.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbexp.h 2012-01-05 15:31:01.726312148 -0500 -@@ -42,7 +42,7 @@ - #ifndef __XB_EXP_H__ - #define __XB_EXP_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -diff -up xbase64-3.1.2/xbase64/xbfile.cpp.lesserg xbase64-3.1.2/xbase64/xbfile.cpp ---- xbase64-3.1.2/xbase64/xbfile.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbfile.cpp 2012-01-05 15:31:01.727312139 -0500 -@@ -39,7 +39,7 @@ - - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbfile.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbfile.h.lesserg xbase64-3.1.2/xbase64/xbfile.h ---- xbase64-3.1.2/xbase64/xbfile.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbfile.h 2012-01-05 15:31:01.728312130 -0500 -@@ -45,7 +45,7 @@ - #ifndef __XB_FILE_H__ - #define __XB_FILE_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -diff -up xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg xbase64-3.1.2/xbase64/xbfilter.cpp ---- xbase64-3.1.2/xbase64/xbfilter.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbfilter.cpp 2012-01-05 15:31:01.729312120 -0500 -@@ -38,7 +38,7 @@ - - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbfilter.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbfilter.h.lesserg xbase64-3.1.2/xbase64/xbfilter.h ---- xbase64-3.1.2/xbase64/xbfilter.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbfilter.h 2012-01-05 15:31:01.731312101 -0500 -@@ -44,7 +44,7 @@ - #ifndef __XB_FILTER_H__ - #define __XB_FILTER_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -diff -up xbase64-3.1.2/xbase64/xbindex.cpp.lesserg xbase64-3.1.2/xbase64/xbindex.cpp ---- xbase64-3.1.2/xbase64/xbindex.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbindex.cpp 2012-01-05 15:31:01.732312092 -0500 -@@ -37,7 +37,7 @@ - USA - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbindex.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbindex.h.lesserg xbase64-3.1.2/xbase64/xbindex.h ---- xbase64-3.1.2/xbase64/xbindex.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbindex.h 2012-01-05 15:31:01.733312083 -0500 -@@ -43,7 +43,7 @@ - #ifndef __XB_INDEX_H__ - #define __XB_INDEX_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -diff -up xbase64-3.1.2/xbase64/xblock.cpp.lesserg xbase64-3.1.2/xbase64/xblock.cpp ---- xbase64-3.1.2/xbase64/xblock.cpp.lesserg 2012-01-05 15:31:01.696312427 -0500 -+++ xbase64-3.1.2/xbase64/xblock.cpp 2012-01-05 15:31:01.734312074 -0500 -@@ -42,7 +42,7 @@ - USA - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xblock.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xblock.h.lesserg xbase64-3.1.2/xbase64/xblock.h ---- xbase64-3.1.2/xbase64/xblock.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xblock.h 2012-01-05 15:31:01.735312065 -0500 -@@ -44,7 +44,7 @@ - #ifndef __XB_XBLOCK_H__ - #define __XB_XBLOCK_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -diff -up xbase64-3.1.2/xbase64/xbndx.cpp.lesserg xbase64-3.1.2/xbase64/xbndx.cpp ---- xbase64-3.1.2/xbase64/xbndx.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbndx.cpp 2012-01-05 15:31:01.737312045 -0500 -@@ -36,7 +36,7 @@ - - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbndx.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbndx.h.lesserg xbase64-3.1.2/xbase64/xbndx.h ---- xbase64-3.1.2/xbase64/xbndx.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbndx.h 2012-01-05 15:31:01.738312036 -0500 -@@ -41,7 +41,7 @@ - #ifndef __XB_NDX_H__ - #define __XB_NDX_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -diff -up xbase64-3.1.2/xbase64/xbntx.cpp.lesserg xbase64-3.1.2/xbase64/xbntx.cpp ---- xbase64-3.1.2/xbase64/xbntx.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbntx.cpp 2012-01-05 15:31:01.740312018 -0500 -@@ -40,7 +40,7 @@ - USA - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbntx.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbntx.h.lesserg xbase64-3.1.2/xbase64/xbntx.h ---- xbase64-3.1.2/xbase64/xbntx.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbntx.h 2012-01-05 15:31:01.741312009 -0500 -@@ -42,7 +42,7 @@ - #ifndef __XB_NTX_H__ - #define __XB_NTX_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - -diff -up xbase64-3.1.2/xbase64/xbstring.cpp.lesserg xbase64-3.1.2/xbase64/xbstring.cpp ---- xbase64-3.1.2/xbase64/xbstring.cpp.lesserg 2006-07-17 12:54:42.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbstring.cpp 2012-01-05 15:31:01.742312000 -0500 -@@ -38,7 +38,7 @@ - - */ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma implementation "xbstring.h" - #endif - -diff -up xbase64-3.1.2/xbase64/xbstring.h.lesserg xbase64-3.1.2/xbase64/xbstring.h ---- xbase64-3.1.2/xbase64/xbstring.h.lesserg 2006-07-17 12:54:50.000000000 -0400 -+++ xbase64-3.1.2/xbase64/xbstring.h 2012-01-05 15:31:01.743311990 -0500 -@@ -41,7 +41,7 @@ - #ifndef __XBSTRING_H__ - #define __XBSTRING_H__ - --#ifdef __GNU LesserG__ -+#ifdef __GNU_LesserG__ - #pragma interface - #endif - diff --git a/dev-db/xbase/files/xbase-3.1.2-outofsource.patch b/dev-db/xbase/files/xbase-3.1.2-outofsource.patch deleted file mode 100644 index 87094a8b429a..000000000000 --- a/dev-db/xbase/files/xbase-3.1.2-outofsource.patch +++ /dev/null @@ -1,52 +0,0 @@ - bin/Makefile.am | 2 +- - examples/Makefile.am | 2 +- - libtest/Makefile.am | 2 +- - xbase64/Makefile.am | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/bin/Makefile.am b/bin/Makefile.am -index 43c8333..ca49ca1 100755 ---- a/bin/Makefile.am -+++ b/bin/Makefile.am -@@ -1,5 +1,5 @@ - --INCLUDES= -I$(topdir) -+INCLUDES= -I$(top_srcdir) - LDADD = -L$(topdir)/xbase64 -lxbase64 - - INSTALL_PROGRAM = @INSTALL@ -diff --git a/examples/Makefile.am b/examples/Makefile.am -index 248b1ec..85adbf3 100755 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,5 +1,5 @@ - --INCLUDES= -I$(topdir) $(all_includes) -+INCLUDES= -I$(top_srcdir) $(all_includes) - LDADD = -L$(topdir)/xbase64 -lxbase64 - - # for shadow passwords override the value -diff --git a/libtest/Makefile.am b/libtest/Makefile.am -index 9e84830..1b73af1 100755 ---- a/libtest/Makefile.am -+++ b/libtest/Makefile.am -@@ -1,5 +1,5 @@ - --INCLUDES= -I$(topdir) -+INCLUDES= -I$(top_srcdir) - LDADD = -L$(topdir)/xbase64 -lxbase64 - - INSTALL_PROGRAM = @INSTALL@ -diff --git a/xbase64/Makefile.am b/xbase64/Makefile.am -index b0dff24..857aa82 100755 ---- a/xbase64/Makefile.am -+++ b/xbase64/Makefile.am -@@ -25,7 +25,7 @@ - # - # - --INCLUDES = -I$(topdir) -+INCLUDES = -I$(top_srcdir) - - lib_LTLIBRARIES = libxbase64.la - diff --git a/dev-db/xbase/files/xbase-3.1.2-xbnode.patch b/dev-db/xbase/files/xbase-3.1.2-xbnode.patch deleted file mode 100644 index 98488453cc84..000000000000 --- a/dev-db/xbase/files/xbase-3.1.2-xbnode.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up xbase64-3.1.2/xbase64/xbnode.cpp.BAD xbase64-3.1.2/xbase64/xbnode.cpp ---- xbase64-3.1.2/xbase64/xbnode.cpp.BAD 2009-08-19 23:10:38.444059289 -0400 -+++ xbase64-3.1.2/xbase64/xbnode.cpp 2009-08-19 23:10:47.348202984 -0400 -@@ -1,4 +1,4 @@ --#include "xbNode.h" -+#include "xbnode.h" - - void xbNodeLink::AddNode(xbNodeLink* node) - { diff --git a/dev-db/xbase/metadata.xml b/dev-db/xbase/metadata.xml deleted file mode 100644 index 40a7cde10e6d..000000000000 --- a/dev-db/xbase/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - xdb - - diff --git a/dev-db/xbase/xbase-3.1.2.ebuild b/dev-db/xbase/xbase-3.1.2.ebuild deleted file mode 100644 index 67730755ca30..000000000000 --- a/dev-db/xbase/xbase-3.1.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="xbase (i.e. dBase, FoxPro, etc.) compatible C++ class library" -HOMEPAGE="https://sourceforge.net/projects/xdb/ http://linux.techass.com/projects/xdb/" -SRC_URI="mirror://sourceforge/xdb/${PN}64-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm hppa ppc ppc64 x86" -IUSE="doc static-libs" - -S="${WORKDIR}"/${PN}64-${PV} - -PATCHES=( - "${FILESDIR}"/${P}-fixconfig.patch - "${FILESDIR}"/${P}-gcc44.patch - "${FILESDIR}"/${PN}-2.0.0-ppc.patch - "${FILESDIR}"/${P}-xbnode.patch - "${FILESDIR}"/${P}-lesserg.patch - "${FILESDIR}"/${P}-outofsource.patch - "${FILESDIR}"/${P}-gcc47.patch - "${FILESDIR}"/${P}-gcc-version.patch - "${FILESDIR}"/${P}-gcc6.patch - "${FILESDIR}"/${P}-gcc7.patch -) - -src_prepare() { - default - mv configure.in configure.ac || die - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - if use doc; then - HTML_DOCS+=( html/. ) - if [[ -e examples/.libs ]] ; then - rm -r examples/.libs || die - fi - dodoc -r examples - fi - - default - find "${D}" -name '*.la' -delete || die - - if use doc; then - rm "${ED%/}"/usr/share/doc/${PF}/html/copying.lib || die - rm "${ED%/}"/usr/share/doc/${PF}/html/Makefile{,.in,.am} || die - fi - - # media-tv/linuxtv-dvb-apps collision, bug #208596 - mv "${ED%/}"/usr/bin/{,${PN}-}zap || die -} diff --git a/dev-db/xbsql/Manifest b/dev-db/xbsql/Manifest deleted file mode 100644 index 205736fe8cb8..000000000000 --- a/dev-db/xbsql/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -AUX xbsql-0.11-autotools.patch 495 BLAKE2B cf8c5a035783f9f742e8b491d1311870eb24f6da82cbafe18ffa1a7809b1f1e54c5330a3dbe09a00c3116c91af66f4d04c4f1038695e844ae44359b6c7e11b5a SHA512 fd5ecfbf5a63393147e305bfa1704848f807f97f0af4c03bdae7ad6be9085a4bd97724fa59aeec903d3020a01f42cd29440b619705d7678d153e8c4a3e59f450 -AUX xbsql-0.11-bfr-overflow.patch 3015 BLAKE2B 936dd846ef6b9781ea29357bc920f9a29e2aeb4aa5e63034d610d41caa1746afda777207f49fd7e8806e8c809a405aa889c07150d278bb3e695548ef073f9c27 SHA512 37d4f541fa7e85a9297e19d3793f97d80acef07a9131e35ed7dfa5e277aa646463aafe731c47885251171318edca141bfc2b8304a971db7804f3f0a1eb66d329 -AUX xbsql-0.11-ncurses64.patch 542 BLAKE2B 9ca86a1e805f0ac001259d738057d90ee4cd7a082577d1581a4668888b75af7db8507d330fd72e8aca062078d2d147a77a586d6b9fa6887d1ef3c2226b8d7f1a SHA512 64148cab80c3d5bc0209e31c0885ea69d3124dc8ad11c57706b71aafe926451928610aeb5dab6639b5a405bcba07d1a3e4588224293d3e4343f76eb194d3aec8 -AUX xbsql-0.11-xbase64.patch 2076 BLAKE2B 011809c0c8594fd49174608fd57709fa1f7bdb98acd4981823683e8d7b6decfa008fe32104fec462c4ebaa884a49ab9727e643031961ec217ef4b74a92c67a06 SHA512 9b1848156f0629a486510a87077c55548b338206331dbf2b7011487ba04bf7986f73b160505defe319b0144cbf617882da760de8f355b81c757166a603931ef3 -DIST xbsql-0.11.tgz 307392 BLAKE2B 1be4352208d95f9f451c59cba6494db2399ed93c937d2494f0877ee6866d1d679732eddd244d467118b70e303380b7eb212bf3fad0a5180e04ab62746d7e4ac3 SHA512 caf8a6d8191f7de860008e5ac2628e388097b05999887ec52b91684f6577dd3152dfa164b71a37d84ef70f43ab868dd02b30bc76c88208d4daa85d8e111ea3a4 -EBUILD xbsql-0.11-r2.ebuild 821 BLAKE2B bedeeb865930696b3b20a88d395ba53bc1afcaf3ebebb541ce2e0f351808979078f097a047343ea6fb46f8a7d1068c69b2fad049b2923394035c92f7b9122db9 SHA512 74b5d612ace30243ab726c2f424d940d4d4e4f00226a0d926aa58e875b2b5fef6bc3a463da6bb3cc2ba61b7398d3507598ad96352e27fb27cb06e70fab92ece1 -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-db/xbsql/files/xbsql-0.11-autotools.patch b/dev-db/xbsql/files/xbsql-0.11-autotools.patch deleted file mode 100644 index b1e72562b397..000000000000 --- a/dev-db/xbsql/files/xbsql-0.11-autotools.patch +++ /dev/null @@ -1,18 +0,0 @@ - xbsql/Makefile.am | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) - -diff --git a/xbsql/Makefile.am b/xbsql/Makefile.am -index c281358..5a09198 100644 ---- a/xbsql/Makefile.am -+++ b/xbsql/Makefile.am -@@ -1,9 +1,4 @@ --DEBUG = -g --CC = g++ --CFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) --CXXFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) --LDFLAGS = $(DEBUG) --INCLUDE = -I/usr/local/include -+CC = $(CXX) - - lib_LTLIBRARIES = libxbsql.la - bin_PROGRAMS = xql diff --git a/dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch b/dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch deleted file mode 100644 index 1615fb4d4389..000000000000 --- a/dev-db/xbsql/files/xbsql-0.11-bfr-overflow.patch +++ /dev/null @@ -1,79 +0,0 @@ - xbsql/xb_fieldset.cpp | 6 +++--- - xbsql/xbsql.cpp | 20 ++++++++++---------- - 2 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/xbsql/xb_fieldset.cpp b/xbsql/xb_fieldset.cpp -index ea9e726..f922ed3 100644 ---- a/xbsql/xb_fieldset.cpp -+++ b/xbsql/xb_fieldset.cpp -@@ -58,10 +58,10 @@ XBSQL::Index - if ((fldno < 0) || (fldno >= fieldSet.getNumFields())) - return XBSQL::IndexNone ; - -- char buff[255] ; -- strncpy (buff, tabname, sizeof(buff)) ; -+ char buff[256] ; -+ strncpy (buff, tabname, sizeof(buff) - 1) ; - strncat (buff, "_", sizeof(buff)) ; -- strncat (buff, getFieldName(fldno), sizeof(buff)) ; -+ strncat (buff, getFieldName(fldno), sizeof(buff) - strlen(tabname) - 1) ; - - const char *path = xbase->getPath (buff, "ndx") ; - int fd = open (path, O_RDONLY) ; -diff --git a/xbsql/xbsql.cpp b/xbsql/xbsql.cpp -index 9d07f88..96304c4 100644 ---- a/xbsql/xbsql.cpp -+++ b/xbsql/xbsql.cpp -@@ -376,9 +376,9 @@ bool XBaseSQL::createTable - char name [256] ; - xbNdx ndxFile (&dbfFile) ; - -- strncpy (name, table, sizeof(name)) ; -+ strncpy (name, table, sizeof(name) - 1) ; - strncat (name, "_", sizeof(name)) ; -- strncat (name, schema[idx].FieldName, sizeof(name)) ; -+ strncat (name, schema[idx].FieldName, sizeof(name) - strlen(table) - 1) ; - - path = getPath (name, "ndx") ; - idxflag = index[idx] == XBSQL::IndexUnique ? -@@ -467,9 +467,9 @@ XBSQLTable *XBaseSQL::openTable - { - char name[256] ; - -- strncpy (name, table, sizeof(name)) ; -+ strncpy (name, table, sizeof(name) - 1) ; - strncat (name, "_", sizeof(name)) ; -- strncat (name, fSet.getFieldName (idx), sizeof(name)) ; -+ strncat (name, fSet.getFieldName (idx), sizeof(name) - strlen(table) - 1) ; - - path = getPath (name, "ndx") ; - #ifndef _WIN32 -@@ -873,12 +873,12 @@ bool XBaseSQL::renameTable - char _newName[256] ; - const char *fname = fSet.getFieldName (idx) ; - -- strncpy (_oldName, oldName, sizeof(_oldName)) ; -+ strncpy (_oldName, oldName, sizeof(_oldName) - 1) ; - strncat (_oldName, "_", sizeof(_oldName)) ; -- strncat (_oldName, fname, sizeof(_oldName)) ; -- strncpy (_newName, newName, sizeof(_newName)) ; -+ strncat (_oldName, fname, sizeof(_oldName) - strlen(oldName) - 1) ; -+ strncpy (_newName, newName, sizeof(_newName) - 1) ; - strncat (_newName, "_", sizeof(_newName)) ; -- strncat (_newName, fname, sizeof(_newName)) ; -+ strncat (_newName, fname, sizeof(_newName) - strlen(newName) - 1) ; - - oldAnon = getPath (_oldName, "ndx") ; - newAnon = getPath (_newName, "ndx") ; -@@ -956,9 +956,9 @@ bool XBaseSQL::dropTable - char _idxName[256] ; - const char *fname = fSet.getFieldName (idx) ; - -- strncpy (_idxName, table, sizeof(_idxName)) ; -+ strncpy (_idxName, table, sizeof(_idxName) - 1) ; - strncat (_idxName, "_", sizeof(_idxName)) ; -- strncat (_idxName, fname, sizeof(_idxName)) ; -+ strncat (_idxName, fname, sizeof(_idxName) - strlen(table) - 1) ; - - tabAnon = getPath (_idxName, "ndx") ; - diff --git a/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch b/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch deleted file mode 100644 index 4c04d2736b0b..000000000000 --- a/dev-db/xbsql/files/xbsql-0.11-ncurses64.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- xbsql-0.11/configure.BAD 2005-08-18 10:34:49.000000000 -0500 -+++ xbsql-0.11/configure 2005-08-18 10:36:22.000000000 -0500 -@@ -6977,10 +6977,15 @@ - if test -f /usr/lib/libncurses.so - then - curses=ncurses -- -+ elif test -f /usr/lib64/libncurses.so -+ then -+ curses=ncurses - elif test -f /usr/lib/libcurses.so - then - curses=curses -+ elif test -f /usr/lib64/libcurses.so -+ then -+ curses=curses - else - { { echo "$as_me:6985: error: No (n)curses installation" >&5 - echo "$as_me: error: No (n)curses installation" >&2;} diff --git a/dev-db/xbsql/files/xbsql-0.11-xbase64.patch b/dev-db/xbsql/files/xbsql-0.11-xbase64.patch deleted file mode 100644 index 6d51cbaf06fc..000000000000 --- a/dev-db/xbsql/files/xbsql-0.11-xbase64.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -up xbsql-0.11/xbsql/Makefile.am.BAD xbsql-0.11/xbsql/Makefile.am ---- xbsql-0.11/xbsql/Makefile.am.BAD 2009-08-19 23:32:27.481185284 -0400 -+++ xbsql-0.11/xbsql/Makefile.am 2009-08-19 23:32:47.157206308 -0400 -@@ -17,10 +17,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el - xb_assignlist.cpp xb_create.cpp \ - xbsql.tab.c xb_datetime.cpp - --libxbsql_la_LDFLAGS = -lxbase $(DEBUG) -+libxbsql_la_LIBADD = -lxbase64 - - xql_SOURCES = xql.cpp --xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la -+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la - - # - # -diff -up xbsql-0.11/xbsql/Makefile.in.BAD xbsql-0.11/xbsql/Makefile.in ---- xbsql-0.11/xbsql/Makefile.in.BAD 2009-08-19 23:32:54.384058775 -0400 -+++ xbsql-0.11/xbsql/Makefile.in 2009-08-19 23:33:03.928059382 -0400 -@@ -108,10 +108,10 @@ libxbsql_la_SOURCES = xb_value.cpp xb_el - xbsql.tab.c xb_datetime.cpp - - --libxbsql_la_LDFLAGS = -lxbase $(DEBUG) -+libxbsql_la_LIBADD = -lxbase64 - - xql_SOURCES = xql.cpp --xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la -+xql_LDADD = -lxbase64 -lreadline -l$(CURSES) ./libxbsql.la - - - #install-data-hook: -diff -up xbsql-0.11/xbsql/xbsql.cpp.BAD xbsql-0.11/xbsql/xbsql.cpp ---- xbsql-0.11/xbsql/xbsql.cpp.BAD 2009-08-19 23:34:23.880063863 -0400 -+++ xbsql-0.11/xbsql/xbsql.cpp 2009-08-19 23:34:47.393184432 -0400 -@@ -207,7 +207,7 @@ void XBaseSQL::setError - break ; - - default : -- e = xbStrError (rc) ; -+ e = GetErrorMessage (rc) ; - break ; - } - -@@ -230,7 +230,7 @@ void XBaseSQL::setError - char t[1024] ; - va_list aptr ; - -- strcpy (t, xbStrError (rc)) ; -+ strcpy (t, GetErrorMessage (rc)) ; - strcat (t, ": ") ; - int l = strlen(t) ; - -diff -up xbsql-0.11/xbsql/xbsql.h.BAD xbsql-0.11/xbsql/xbsql.h ---- xbsql-0.11/xbsql/xbsql.h.BAD 2009-08-19 23:35:45.087088919 -0400 -+++ xbsql-0.11/xbsql/xbsql.h 2009-08-19 23:34:06.949184421 -0400 -@@ -43,8 +43,7 @@ XBSQL_API int strncasecmp (const char *s - - #endif - --#include --#include -+#include - - class XBaseSQL ; - class XBSQLTable ; diff --git a/dev-db/xbsql/metadata.xml b/dev-db/xbsql/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/dev-db/xbsql/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/dev-db/xbsql/xbsql-0.11-r2.ebuild b/dev-db/xbsql/xbsql-0.11-r2.ebuild deleted file mode 100644 index 53f79773ed13..000000000000 --- a/dev-db/xbsql/xbsql-0.11-r2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils - -DESCRIPTION="An SQL Wrapper for the XBase library" -HOMEPAGE="http://www.rekallrevealed.org/" -SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -IUSE="doc static-libs" - -RDEPEND=" - >=dev-db/xbase-3.1.2 - sys-libs/readline" -DEPEND="${RDEPEND} - sys-devel/automake - sys-devel/libtool" - -PATCHES=( - "${FILESDIR}"/${P}-ncurses64.patch - "${FILESDIR}"/${P}-xbase64.patch - "${FILESDIR}"/${P}-autotools.patch - "${FILESDIR}"/${P}-bfr-overflow.patch -) - -DOCS=( AUTHORS Announce ChangeLog INSTALL README TODO ) - -AUTOTOOLS_IN_SOURCE_BUILD=1 - -src_install() { - autotools-utils_src_install - use doc && dohtml doc/* -} -- cgit v1.2.3