From f78108598211053d41752a83e0345441bb9014ae Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Feb 2018 16:09:52 +0000 Subject: gentoo resync : 11.02.2018 --- dev-db/mariadb-galera/Manifest | 6 +- .../mariadb-galera/mariadb-galera-10.0.32.ebuild | 181 -------------------- .../mariadb-galera/mariadb-galera-10.0.34.ebuild | 183 +++++++++++++++++++++ 3 files changed, 186 insertions(+), 184 deletions(-) delete mode 100644 dev-db/mariadb-galera/mariadb-galera-10.0.32.ebuild create mode 100644 dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild (limited to 'dev-db/mariadb-galera') diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest index b464083949aa..21bc03dc59f4 100644 --- a/dev-db/mariadb-galera/Manifest +++ b/dev-db/mariadb-galera/Manifest @@ -1,6 +1,6 @@ AUX my.cnf-5.5 5244 BLAKE2B f6e22850e34454d7b48566b3e3e1731940933e00611cf5c3c79ab8107603ccea8ef9b5d1c08a1dbfb076f517afe4d11dd5ec44c9b3d64c4934ff4e8d08b11408 SHA512 c20420fb498ba2c3db7973848fe8cf715815e15ccc315a57e4ab9cea3c8778def0e66cef8253870dc94c92903e04dd0c7037c12894b37e8cfd70f0c3822ee65e AUX my.cnf-5.6 5144 BLAKE2B 2f977b6a92524cfabbdd19058430c62dd4d03a0587036f49057eff69fda04c148a4dca8e58abe418a2bdc0fe1ef3c780cf53d7214fb51f13d5a4b2a4f7a3b8e9 SHA512 db4bdde6f82d9bd33026477d89d8191ddc4099586273ca4aa3f2dcd09572f887d03f79c2ce00bf74d01c21a18384b05516982bdcf31a6c458631315ea75c4cab -DIST mariadb-galera-10.0.32.tar.gz 63961466 BLAKE2B 98e98364e32cd6196b40c112f805d57b014d5cbb7d2d266f7730ba5a5f91e86f9c9902ac97e5ff1bfe3b421e3a0ced0204d24edc1ebdfd7fcf715255282ca836 SHA512 3f17c4baaa06a51e037c96bc9a44fb612d6e492f9212664a7b9b7a70be49e7657626cd10b89ec312d4062ddf44bbc1d2ca6b044269af0507669e86bdc683fabb -DIST mysql-extras-20160629-1442Z.tar.bz2 299152 BLAKE2B 171733eba8579b222b20ccabfc93aec666c60ea8498be3daec030e4217fde0e6112a2bcef48996c44817a6c6e8f7e9b255fe96e02553b042d3d9630a0a5a17ba SHA512 1de46daf6b4534dadf9d3eff8d5d557778e63b5e04aedb57fe56d3016ba93a9d55d80faee38f77852d23da5169879e4f25b3386abe44ee8d961db7ffc4145715 -EBUILD mariadb-galera-10.0.32.ebuild 5474 BLAKE2B 49d260956b4d3968d4a5a865f0bdcaeb6c9cc559beec7e62da89b68218a75a1e9b2bfa4df7491819ac53ec9f57614ea47f7640a7446da44c8ceb2dbebab95bab SHA512 bd885311ad0fc0826ffe93b57042890a522769055c069ba1797c9e71a065835ea827ec3bcc2205b518f611c60bbe06aafc9b6571681fdc2d9f19e19263e98494 +DIST mariadb-galera-10.0.34.tar.gz 69661677 BLAKE2B a905e24c217843e04d35393af9eee06e2e42d6b6d4f7202645a795dd17ee60394b19228332dca9f0d078748f5d02893ad3f367c8c449147811abf78e502b7997 SHA512 e0226e6032d5ff0080a97ea486726a44d8e1b977b93c8d07b517be70098df4149d119d325ebcba6c6affa95a586c94ec8f99a5e5a74a7d2314311748029dc7ab +DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5 +EBUILD mariadb-galera-10.0.34.ebuild 5497 BLAKE2B 2daef9bc4a961bc9c8d15ce728144c91a108e3c6deddcb6c0f3f80a82b01f55b25889f8a0c1a32be4fc07e2a12062b4ab4355874f1dbc69de13efc0aed05377d SHA512 a627e03eda10237d5b68f4aebc5014689c197cb510c963801cdb88729ee6fb52d38b532f9e50a563470360e2ef4fae4ebded4d540bf4111b866c12130278eda1 MISC metadata.xml 1848 BLAKE2B 8046367163d7adcf0f31b9972486ed3d6fcf157574b775f1ad871c67d28998777fa7b03b10cc20d7fa85adc7ceb7910f90f25480546ac78f3d47d4be2685219f SHA512 57f604c9f265f3b4873b681fda8005a0241bc8474bf966b83209ec56b3de70172a70401f2ac9818068ae79656e78b1dfb13b616f3ddc9254669c1ccdc43749aa diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.32.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.32.ebuild deleted file mode 100644 index 61a1c209dde8..000000000000 --- a/dev-db/mariadb-galera/mariadb-galera-10.0.32.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -MY_EXTRAS_VER="20160629-1442Z" -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number -WSREP_REVISION="25" -SUBSLOT="18" -MYSQL_PV_MAJOR="5.6" - -SERVER_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz" -MY_SOURCEDIR="${PN%%-galera}-${PV}" -JAVA_PKG_OPT_USE="jdbc" - -inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 - -HOMEPAGE="http://mariadb.org/" -DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication" - -IUSE="bindist jdbc odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb xml" -RESTRICT="!bindist? ( bindist )" - -REQUIRED_USE="server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~amd64 ~x86" - -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" -PATCHES=( - "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" - "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.26.patch" - "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" - "${MY_PATCH_DIR}/20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch" -) -COMMON_DEPEND=" - !bindist? ( >=sys-libs/readline-4.1:0= ) - server? ( - extraengine? ( - odbc? ( dev-db/unixODBC:0= ) - xml? ( dev-libs/libxml2:2= ) - ) - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) - pam? ( virtual/pam:0= ) - tokudb? ( app-arch/snappy ) - ) - >=dev-libs/libpcre-8.35:3= -" -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) - ${COMMON_DEPEND}" -RDEPEND="${RDEPEND} ${COMMON_DEPEND} - sys-apps/iproute2 - =sys-cluster/galera-${WSREP_REVISION}* - sst-rsync? ( sys-process/lsof ) - sst-xtrabackup? ( net-misc/socat[ssl] ) - perl? ( !dev-db/mytop - virtual/perl-Getopt-Long - dev-perl/TermReadKey - virtual/perl-Term-ANSIColor - virtual/perl-Time-HiRes ) - server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) -" -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed -PDEPEND="sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) )" - -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) - -pkg_setup() { - java-pkg-opt-2_pkg_setup - mysql-multilib-r1_pkg_setup -} - -pkg_preinst() { - java-pkg-opt-2_pkg_preinst - mysql-multilib-r1_pkg_preinst -} - -src_prepare() { - java-pkg-opt-2_src_prepare - mysql-multilib-r1_src_prepare -} - -src_configure(){ - # bug 508724 mariadb cannot use ld.gold - tc-ld-disable-gold - local MYSQL_CMAKE_NATIVE_DEFINES=( - -DWITH_JEMALLOC=$(usex jemalloc system) - -DWITH_PCRE=system - ) - if use server ; then - # Federated{,X} must be treated special otherwise they will not be built as plugins - if ! use extraengine ; then - MYSQL_CMAKE_NATIVE_DEFINES+=( - -DWITHOUT_FEDERATED=1 - -DWITHOUT_FEDERATEDX=1 ) - fi - - MYSQL_CMAKE_NATIVE_DEFINES+=( - $(mysql-cmake_use_plugin oqgraph OQGRAPH) - $(mysql-cmake_use_plugin sphinx SPHINX) - $(mysql-cmake_use_plugin tokudb TOKUDB) - $(mysql-cmake_use_plugin pam AUTH_PAM) - -DWITHOUT_CASSANDRA=0 - $(mysql-cmake_use_plugin extraengine SEQUENCE) - $(mysql-cmake_use_plugin extraengine SPIDER) - $(mysql-cmake_use_plugin extraengine CONNECT) - -DCONNECT_WITH_MYSQL=1 - -DCONNECT_WITH_LIBXML2=$(usex xml) - -DCONNECT_WITH_ODBC=$(usex odbc) - -DCONNECT_WITH_JDBC=$(usex jdbc) - -DWITHOUT_MROONGA=1 - ) - fi - mysql-multilib-r1_src_configure -} - -# Official test instructions: -# USE='embedded extraengine perl server openssl static-libs' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mariadb-X.X.XX.ebuild \ -# digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - if ! use server ; then - einfo "Skipping server tests due to minimal build." - fi - - # 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 [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might run out of order - mkdir -p "${T}"/var-tests{,/log} - - # Run mysql tests - pushd "${TESTDIR}" || die - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder - retstatus_tests=$? - - popd || 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" -} diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild b/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild new file mode 100644 index 000000000000..2279222e828d --- /dev/null +++ b/dev-db/mariadb-galera/mariadb-galera-10.0.34.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" +MY_EXTRAS_VER="20170926-1321Z" +# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number +WSREP_REVISION="25" +SUBSLOT="18" +MYSQL_PV_MAJOR="5.6" + +SERVER_URI="https://downloads.mariadb.org/interstitial/${P}/source/${P}.tar.gz" +MY_SOURCEDIR="${PN%%-galera}-${PV}" +JAVA_PKG_OPT_USE="jdbc" + +inherit toolchain-funcs java-pkg-opt-2 mysql-multilib-r1 + +HOMEPAGE="http://mariadb.org/" +DESCRIPTION="An enhanced, drop-in replacement for MySQL with Galera Replication" + +IUSE="bindist jdbc odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb xml" +RESTRICT="!bindist? ( bindist )" + +REQUIRED_USE="server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" + +KEYWORDS="~amd64 ~x86" + +MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" +PATCHES=( + "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" + "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.33.patch" + "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" + "${MY_PATCH_DIR}/20018_all_mariadb-galera-10.0.20-without-clientlibs-tools.patch" +) +COMMON_DEPEND=" + !bindist? ( >=sys-libs/readline-4.1:0= ) + server? ( + extraengine? ( + odbc? ( dev-db/unixODBC:0= ) + xml? ( dev-libs/libxml2:2= ) + ) + oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) + pam? ( virtual/pam:0= ) + tokudb? ( app-arch/snappy ) + ) + >=dev-libs/libpcre-8.35:3= +" +DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) + server? ( extraengine? ( jdbc? ( >=virtual/jdk-1.6 ) ) ) + ${COMMON_DEPEND}" +RDEPEND="${RDEPEND} ${COMMON_DEPEND} + sys-apps/iproute2 + =sys-cluster/galera-${WSREP_REVISION}* + sst-rsync? ( sys-process/lsof ) + sst-xtrabackup? ( net-misc/socat[ssl] ) + perl? ( !dev-db/mytop + virtual/perl-Getopt-Long + dev-perl/TermReadKey + virtual/perl-Term-ANSIColor + virtual/perl-Time-HiRes ) + server? ( extraengine? ( jdbc? ( >=virtual/jre-1.6 ) ) ) +" +# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed +PDEPEND="sst-xtrabackup? ( || ( >=dev-db/xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) )" + +MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) + +pkg_setup() { + java-pkg-opt-2_pkg_setup + mysql-multilib-r1_pkg_setup +} + +pkg_preinst() { + java-pkg-opt-2_pkg_preinst + mysql-multilib-r1_pkg_preinst +} + +src_prepare() { + java-pkg-opt-2_src_prepare + mysql-multilib-r1_src_prepare +} + +src_configure(){ + # bug 508724 mariadb cannot use ld.gold + tc-ld-disable-gold + local MYSQL_CMAKE_NATIVE_DEFINES=( + -DWITH_JEMALLOC=$(usex jemalloc system) + -DWITH_PCRE=system + ) + if use server ; then + # Federated{,X} must be treated special otherwise they will not be built as plugins + if ! use extraengine ; then + MYSQL_CMAKE_NATIVE_DEFINES+=( + -DWITHOUT_FEDERATED=1 + -DWITHOUT_FEDERATEDX=1 ) + fi + + MYSQL_CMAKE_NATIVE_DEFINES+=( + $(mysql-cmake_use_plugin oqgraph OQGRAPH) + $(mysql-cmake_use_plugin sphinx SPHINX) + $(mysql-cmake_use_plugin tokudb TOKUDB) + $(mysql-cmake_use_plugin pam AUTH_PAM) + -DWITHOUT_CASSANDRA=0 + $(mysql-cmake_use_plugin extraengine SEQUENCE) + $(mysql-cmake_use_plugin extraengine SPIDER) + $(mysql-cmake_use_plugin extraengine CONNECT) + -DCONNECT_WITH_MYSQL=1 + -DCONNECT_WITH_LIBXML2=$(usex xml) + -DCONNECT_WITH_ODBC=$(usex odbc) + -DCONNECT_WITH_JDBC=$(usex jdbc) + -DWITHOUT_MROONGA=1 + ) + fi + mysql-multilib-r1_src_configure +} + +# Official test instructions: +# USE='extraengine perl server openssl static-libs' \ +# FEATURES='test userpriv -usersandbox' \ +# ebuild mariadb-X.X.XX.ebuild \ +# digest clean package +multilib_src_test() { + + if ! multilib_is_native_abi ; then + einfo "Server tests not available on non-native abi". + return 0; + fi + + local TESTDIR="${BUILD_DIR}/mysql-test" + local retstatus_unit + local retstatus_tests + + if ! use server ; then + einfo "Skipping server tests due to minimal build." + fi + + # 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 [[ $UID -eq 0 ]]; then + die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." + fi + has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" + + einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" + + # Run CTest (test-units) + cmake-utils_src_test + retstatus_unit=$? + + # Ensure that parallel runs don't die + export MTR_BUILD_THREAD="$((${RANDOM} % 100))" + # Enable parallel testing, auto will try to detect number of cores + # You may set this by hand. + # The default maximum is 8 unless MTR_MAX_PARALLEL is increased + export MTR_PARALLEL="${MTR_PARALLEL:-auto}" + + # create directories because mysqladmin might run out of order + mkdir -p "${T}"/var-tests{,/log} + + # Run mysql tests + pushd "${TESTDIR}" || die + + mysql-multilib-r1_disable_test galera.galera_defaults \ + "Test may vary by library defaults" + + # run mysql-test tests + perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder + retstatus_tests=$? + + popd || 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" +} -- cgit v1.2.3