From d302a5d7fc9caafba5c8a404f2891bb6ccdec311 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 May 2018 13:19:56 +0100 Subject: gentoo resync : 15.05.2018 --- dev-db/mariadb/Manifest | 15 +- dev-db/mariadb/mariadb-10.0.30-r1.ebuild | 212 --------------------------- dev-db/mariadb/mariadb-10.1.24-r1.ebuild | 227 ----------------------------- dev-db/mariadb/mariadb-10.1.31-r1.ebuild | 5 +- dev-db/mariadb/mariadb-10.1.32.ebuild | 242 ------------------------------- dev-db/mariadb/mariadb-10.1.33.ebuild | 9 +- dev-db/mariadb/mariadb-10.2.14.ebuild | 13 +- 7 files changed, 23 insertions(+), 700 deletions(-) delete mode 100644 dev-db/mariadb/mariadb-10.0.30-r1.ebuild delete mode 100644 dev-db/mariadb/mariadb-10.1.24-r1.ebuild delete mode 100644 dev-db/mariadb/mariadb-10.1.32.ebuild (limited to 'dev-db/mariadb') diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index a0b7acb2b589..722923a734e6 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -4,33 +4,26 @@ AUX my.cnf-5.5 4805 BLAKE2B 39ffb485329b246867db03977661441ebfa71c8ac6275d5263dd AUX my.cnf-5.6 4579 BLAKE2B 5d3bac1e59b6f0ca798c334dd72f7ad1d17168166e8e6d088aeb681a4403c63167a3d320c4bf8fd97ea7e45b275a43443bc4028f2a91a11362f182945e4a6401 SHA512 4a55807a119e847f6aa42c94a3c1761eb819d837a9d71a28afb71e5704195f920a0488d54cbeacbe978590c5f2b1dc9b743127cb9d2aa9e3813db226b5bdc356 AUX my.cnf.distro-client 637 BLAKE2B b9b6b01195a4e2523a0a1cb7efdf5c35579d394b12b7426cc7f2e65485d8c5bd54622b096be12fb9c1b252fc7311278d79ff922ba9332074e4f06419c5dba68e SHA512 85c0b0eb4281b398ca7c010042d69b4306ccebae9838bf7a1ee53c0d6bb12b20f95bcbd3bb359b107b018d456d7bcae8d168757ff34028ce69357ce3f3fbd54e AUX my.cnf.distro-server 998 BLAKE2B a7f2977a96d394cb7e24d72d82a1c21095c4b55607e5ca4a2c10619278796c328931a5ec076c15b60afef370c2e5da02ca0c628f330e876b4d2c984eeb54df5f SHA512 d9ab6f7fdfe08e6c242f84410ec680ef6aa6778c4bd55fee67c644e1a7d997446d8ef2129be6fc9833d16fe40cf17e09cdf0cf015f06bb145bbf9cfecb51e882 -DIST mariadb-10.0.30.tar.gz 63433598 BLAKE2B ccf5b1650a4134cdcdd99bf52b0e6441f3255a938bddc050418ac8766e8301dadde92e7a349fa6f0b9338304790121ace7d5da9fe8bb86f2ed553f37809c8daa SHA512 b9f4bdf2b19edc661c80b0c19b09979ad765e6a7f76e038436660d29bc05c2c9882c39f557aa407828ba2917632a9a0f6a96090279912e78f04b54ca2d9f14e7 DIST mariadb-10.0.33.tar.gz 69211872 BLAKE2B 02efa97a75ff13655e9a6d6ba562c4d14bd749b4873ac2f783f32494104f00517c2af63805afa552b6ba707aa412d61b8b3561d5d4d534bf9ad5c6f67b33cfe4 SHA512 9369399553ab336ba1ab20393b69fe5ba49e88ff86d9a448034a9d521e8d85216eb1093e040dd893fc2fb15344da3d57995074bd489be66a3b1457abab097104 DIST mariadb-10.0.34.tar.gz 69266294 BLAKE2B ee8157d1b4d5d4cc096159efb3a20321486092eb28f35d120ee99b2260e52f46d1803b62df29a4fc905de23aa009dbb4666e8457903d97d5fdb14dcbfdda4b2c SHA512 46539ef37ec3b2fb00e7d546f3bbfe48eb86d0403d33e50b1bca40c145d69ca3ac8ddaa72ddb0c1f0aa41f3177aedfe1c6c0bdb7949d47efe49aed3ed52bd47b DIST mariadb-10.0.35.tar.gz 66551252 BLAKE2B 69cc9c78f7c47a4b1760940cb0f395b4053fcc47c1087a0c2af873d4a998ee60915e1f4e64f7fe6474c7c1fa3dabe48a3b6621c67893b20526f01e56b0542e7a SHA512 01fc8d48be3f3847bb222835436ab938c6c5b5ac8ba6cc87b3b6d2a2201b7ab4b152dc1f7d9749c89de90097d50052714ac08aafbbb117fffac32bfb47e74779 -DIST mariadb-10.1.24.tar.gz 61780687 BLAKE2B 38df67a1b26aab559e41f44b129f2e57388634b80a8b10637744c3d11f9cad15329c9a1725cb836f7249352d5bdf9471bc9c3f254e1ef96229716543f235f7ed SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9 DIST mariadb-10.1.29.tar.gz 67885370 BLAKE2B 40b94ed519522f16ee4687a9c569a0e52632d2aeccf65b87070de31118bf5e719cce78cf36afd4f1386166b14e418e0262ffbc3a61098c95e6ee101faf871ec5 SHA512 c169dfa2878f9fa9e0e9d12ca79fcbfa644e9b51bb0b78b8dd51d6c5679f3184d139fa96a1ddb25f3ae5d1c0489708c2c624f96a24020f77bf7e5247fac45ecd DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 1fabbea67345024157be4be34a50c4e9c73b1a60def452321b6e9209d9fb16aace92e7ab1c37c168e5c9f6c52b623245e9df3171ce3f84e8fd0e840948b3e57f SHA512 db37ddb8ae5daf35b37d5132860c19c4a9b51c40005d05c5107f956ac5b4ecd447375b6f3a09bf59ea5aef2f4009314ed6e969ca2ac516722702b4da286dbd89 -DIST mariadb-10.1.32.tar.gz 68001321 BLAKE2B 8ecdf12b10697576b3550d962c6090726f515e0f1f99f786e2b8882e1b81c053e9e43e423f83afd6955357ef85cd539db6fb1ff613d3c553f2f3801293c7ee07 SHA512 fcaeb8005b08b3ac5b7c070f07fe669593bd8a2eb8ea1bbdcb4d8e9ba4856420039f39542ecf920eec352ee4a26179899f9c6cb1f9f26040f557ae4b4b63660a DIST mariadb-10.1.33.tar.gz 65292094 BLAKE2B 3223f9476e946112f7c1d23cc82ff52636801244136343413ae00336173ec58bb4af8dc36e065f6cd27e9aa3f9f999b1d19f9257b928bd92555b34b614b9cf76 SHA512 1d30e06d0c19e338bfbbe6815cf5eee8e1b839b525950f7f54c7cf8f89034658a284df4756f54719ab0f55875546d4713b03bab7dd094ec13291732b069f737e DIST mariadb-10.2.14.tar.gz 72607526 BLAKE2B ca0c73e30e15265a7a1599d9bd4b64e030aaf92fcdbe18fda39eaf071c88c90b32a16ea5d9c63130e3853572a30a0c5870e6389e6dcb2a3eb690311cdb9bde3c SHA512 12195cc8c7a97619024d6b8b37558a43f4f543efff257a7a3dbb10e8a6e064ec2f0740554cf50cc83576b74ba355cf00f3c99855bc2bcf68b90c1fa90c850026 DIST mariadb-10.3.6.tar.gz 71064269 BLAKE2B 681150a26de95cc276276a9b8d0b2c6e4a842dac80f20c2e8b0caeec5823cb956feffb494d18b1f2832e220c392c437424813de7720fb83a5d5c1fca71a4aef9 SHA512 cf146752be5857e702a3c88f42c7b6be3117bd92ac304eb217f902c1ffe478dc3043d3cf6a9a9305b51babb3bafc2612a8e4f5dfa7731cfa53634014d86438d1 DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 150a2d7108db2db18d66b56d961b05f8746f744e9453e341fde21f93bd846a3091a44c5df3baed6774d0ad12b8dc806b9bfdd177b4149f5be9d37af2a298f807 SHA512 eacf6ec57d46b00701b5038a67745174060d592b0e425466149c9a1b6dc1ac0659a36e57e82bf7e9f7865d8eac3dd50d0737630bd6220002d168b5b574437e4c DIST mysql-extras-20160721-1526Z.tar.bz2 301788 BLAKE2B 23ef75d0122e9e18382f708a86c61624e0437fad593b7f02ccb2b3939d710404e18e3b70617ed400e5f6947d3a92d2867a5f7d98bf61597442e99989f60ca4f7 SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d -DIST mysql-extras-20170310-1426Z.tar.bz2 307052 BLAKE2B 2c364678301c97ae5c88551a78caa633377f20dd45ce3e43516f8909f7bfa1b3ed5b115dd314540e7ea96f4232f7265d8fc50099da51934a0e38561bbeff84e4 SHA512 2dbb3e46f14fbd0be9ee0e3a8ff2e4d5325f9a9be332014ea556283c0bc5f53349952d267d6713fac5b54e3167a66ddd36f18b18b79ca6b68ede399399488157 -DIST mysql-extras-20170316-1355Z.tar.bz2 308933 BLAKE2B e515f5926a0cbba86fdaaa9295e9d1f7d5f36e401f73de0d9d3c837a7f2d2a4f48c8a1bb5dadefad73a1aa676c9c5aee3571342d594644918cfca2861f2ba253 SHA512 5bf7938bfa5989da85216fbca4575397fc05c83e1afac76bd6c0b338a876caf37194f53a2a933d6f69eb31727ca005be617e53a8fdd0a95d8f1f68684c4ba68c DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5 DIST mysql-extras-20180308-1938Z.tar.bz2 318238 BLAKE2B 003389434dc52d5e49be77d0e70edfce664d5011a6dbc280bebc1d958a6626ecf7457a720dc66a6b692e2f7796f36fc55cc7048cee78278aa1fe6f82659ccf07 SHA512 12e39c97ebb23e8ae3db5f4a344779fe47f59e32d7e39258f1d8f527ef5ab7470cd6dda0b2980f67472ae4a10a21249aed87eeac18e7fea58c22aebd7f838d2c -EBUILD mariadb-10.0.30-r1.ebuild 6874 BLAKE2B f599097904869476a5a30ce264a2c27683ae1c59129bc6c4e4d73d5268fe5788027a2f9056309a9b97fa00881f63b7f8b88560f38272866d0d89767b10f602dd SHA512 370fa3e79b5aea1b89e2136da06a3d7b3a3bcfb49dfdcf030346764fbcee81b4c365e43be6a994e4bc6ad067aba126bd4be66ec94096dca25eb45b8fc0a136bd +DIST mysql-extras-20180515-0123Z.tar.bz2 320380 BLAKE2B a56e3ef19f4e30628fea9889dbb55379a8c92f08c9c493fe3f524b98fabf3505150fbe7cc65f97fc8b75632b5dd7360ddb9bd1542714c5e9916f94c2792ff3db SHA512 3e0b36ab4cb3f2e7d30f1fb2d8d3a916439611f1714475f2ab0480ba51176f47dcccd40931de4bd0a46b0aca6dfcb62cfc92b6939eed2e61628947bf664008ee EBUILD mariadb-10.0.33.ebuild 6718 BLAKE2B 46e9980c6d4143e621aee1341b88b8021bc80e42faf54f0f7dd8a9c830ba88939a292016cf07c9e39a2c3c2addcd7de6d7724d3404cab8daae4002fa81a98f7f SHA512 f46c1b1e827d283d930ad6a4059b4d3e8f8ab5cf9bbf33c0f985646119b000eca0474f2447d0bf6dd22243b859de2496e29c5b9b862ab3f8610cf5fb3a674bcd EBUILD mariadb-10.0.34.ebuild 6719 BLAKE2B 207819cf6c1801e61b35d45f554398db561359cb0520dda02125e2dbe249ae44214cd35481cbd00bc71fc18a66eedacf6d290451a8e9658dfe259c6f6994e00e SHA512 151cb1497b83db5ead56643e41467469e1abd8390e30bac31a49d75889f4fc37c6a354f0f226f66f02feb36f558b43e7592ff718bca94c085da18e6674e40fab EBUILD mariadb-10.0.35.ebuild 6762 BLAKE2B 847296154e6ad3e3f4ec37bb773755cd395817a8360da0dbc8a7e2b54fd865dd548e65d6291bdde7001b0a8a4c7422538e02128a50562654f28a3a3e006953fc SHA512 80ada9ea2cdf2884b36e49c13d8161e0e2b099f7b2f727d2123a5f20404761ec60289b4b5dd5ac4283718ed231e2c22f4263feb694466b8c0421b9a51660ff0c -EBUILD mariadb-10.1.24-r1.ebuild 7191 BLAKE2B 345cfd4108bc191b749989d44bcb39842225011411d7cc8ea55b85941affe2f12e938911b958f7223bd4fbd6cc8b88d1c972cfb6c586f1dbe42a9e78184e243a SHA512 50e37053275b85e2fb6464a6e1e81434ec365e4963bddd73037663f7878d4110b5bbac1700cc35c4c5c559cd5fe6de303b5f81718887fa655786bcc3209fd08e EBUILD mariadb-10.1.29.ebuild 7321 BLAKE2B 55e437ba42c4b02edb500952e54827c8a168c30e310ad1ca5373075a053dadcab325716bd2b9cea20d1fd8ee618604b45778e5fe7008a133dc7bf8bb20d4ab24 SHA512 e40f6a200fc6914603ff5b4ca8e4e4c645a169e79bc96904a67a264c0172b83b3c54ab4f8394ee7ccb560e468500692544201c07df97cf64c1907185fd3d4276 -EBUILD mariadb-10.1.31-r1.ebuild 7820 BLAKE2B 1e1ce7d9733467b79e71ca16f2d124f6644ff744b43734d20e104198e35259a2b736b9b7963ae9cd84d22279d5d0b00ecd3449671d20d7b66e95b02ffb0b7e87 SHA512 d74968950d6aeb0d37b406afb7e914cd9d071d51000a095c150068cec60fedd50356dc22b30705e016eb6b76062a05253e8272142922d500d978b4214b7e9b13 -EBUILD mariadb-10.1.32.ebuild 7762 BLAKE2B adcd84563e2e168b1a0b492b72e4c5db4268f89b4eef4a201f4e77e2c98a0d90c9587ea321783126dc99fd0addae1d6d69ab50f40b180da1ddc0b4546b68936d SHA512 7b673aaebe26d928a14dd7eee57cc6cfbbc549d4673e02dda9ccc91d9579f269f4e57146bc2dbcc5c32050459e8dea533d84f58c7655236865044fb1387cabcc -EBUILD mariadb-10.1.33.ebuild 7802 BLAKE2B 20dda9f5fc8efe81c19784252fb13683933b79d2edd5e85703b2df42fbdb504b406327fa17a651f561c6aab5b9439bca69e260ca863ff050f41d849ca7243ad5 SHA512 f0b1447659f98f3f6b5867caa9623fa14e05a5a687a242e6d5f49738765e4cfdad56b118def26c831711d62988d77e5560bfc85762b4ffdf096d5e306f4e1d6d -EBUILD mariadb-10.2.14.ebuild 32970 BLAKE2B 8b1ca349b93799a0ac273092287c0c5085aacd85badb16e6cb0cbc1f7acef22c57e6fffcec7497c5ab02932910db772f86159139d8cea0a597f40d087de0ceb0 SHA512 1a112e9401a9cb3fe458852816ca6a799d9941724ab989cdff3ca7f36661dcee99f0961b0bc773ae47a5d12bde5f809b1f6eb63a947b87331218a2faab55021a +EBUILD mariadb-10.1.31-r1.ebuild 7887 BLAKE2B 40d0cdfb1bd7813bff2978d543c044aba4ffbb606aa0f07627038d67727d60876cebf0b3ec1523e02448e7768e4406eabb6c2e82a022902479aab764f1a8aebe SHA512 76ccfb96e8ef0dbad814f75a1706da1c8ee9422521656b228b083fdd0a7d37216371bd9d683960dfb1bdcc2ee5423f48e30d1ae4403d5ccd22eadc70d351ba16 +EBUILD mariadb-10.1.33.ebuild 7963 BLAKE2B 87ae31bbd6039cae27d2b234468d43bf7677d598c284489398035550a579abf519535a8070be3e1cb2e3141c05da8bd160a77b8d55642248475dd9d215b2636f SHA512 3261f2f6fbb4ad0d9ffc9e3d8659d8680fe9e3697d56409e32e513957e6744cd25e8fc70a9a2479f69c6aecc4b4f3e0b0887b779d812a71481174ea7c577a10c +EBUILD mariadb-10.2.14.ebuild 33195 BLAKE2B f44188a41ffb72fb8acb3f1943afbb601c2d0b4ef185d73be07dc5cd035f0dd1b843e9f9334bc30b9a52868a0aed5b7d7acb0f8cbc6819cb83ab299a7ba923f2 SHA512 8846394ee6663491e82102d32ddf6117bcecffe4ed77047070f5b6ce7465cc14b3027475d9f47efbea444aa92d876c4e129e0e93c16c8869f03d1cf683e112e4 EBUILD mariadb-10.3.6_rc.ebuild 33339 BLAKE2B 5c62a08062212b83f649e2aaae97827b1323667a180a145ac4325ed7b8592576fe1f6e04ea3ab36a51d00a12918ba2bf1a095816ef7a760d32d7bbf07baf94e4 SHA512 515355b9b8c940407a2b2b3f2620480a0641059cbe93405825412108b39222d73a5e4857f9c8fe94c2dd9af971af65af79bddcc4130cc10090971d3650f3a65d EBUILD mariadb-5.5.60.ebuild 4254 BLAKE2B ee31137be4020cdb3626a93981eb2c667b4c9f8a543d52e272f4c2721f8ded71305a1caab6319a3a7cad25cbdf17a736abae3eb01062ffe5cc54c66da1b9703d SHA512 9d9ffc8ca65d6e4f7a64f4e6c1477096d46404d3a4401db1687ab5507452bbf4afb294667a2b01f7db8ba6953b8d935a40211fb006273462723846b960248920 MISC metadata.xml 3172 BLAKE2B 9b546b51359c0881ee5ce452c89e788ff27300471433fb9d1eb28b3f72d47cd84787eac1d7fd536a8133aa56dd4dd9c1139afb4b3e83b463ce12b7d6cb0fa35f SHA512 143381d9443b778b4f8fb5545c6e8ac59e54eaba20458eecb757e292650a1fd5a470ded204f25c173f456cc222bd32f8b9885e00ecb00c9b4abfd639c9e98391 diff --git a/dev-db/mariadb/mariadb-10.0.30-r1.ebuild b/dev-db/mariadb/mariadb-10.0.30-r1.ebuild deleted file mode 100644 index 0a74c1ba458b..000000000000 --- a/dev-db/mariadb/mariadb-10.0.30-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -MY_EXTRAS_VER="20170310-1426Z" -SUBSLOT="18" -MYSQL_PV_MAJOR="5.6" - -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" - -IUSE="bindist jdbc odbc oqgraph pam sphinx tokudb xml" -RESTRICT="!bindist? ( bindist )" - -REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -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-10.0.20-without-clientlibs-tools.patch" - "${MY_PATCH_DIR}/20034_all_mariadb-10.0.30-fix-without-server.patch" -) -COMMON_DEPEND=" - !bindist? ( >=sys-libs/readline-4.1:0= ) - server? ( - extraengine? ( - odbc? ( dev-db/unixODBC:0= ) - xml? ( dev-libs/libxml2:2= ) - sys-libs/zlib[minizip] - ) - 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=[${MULTILIB_USEDEP}] -" -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} - 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 ) ) ) -" -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h - /usr/include/mysql/private/probes_mysql_nodtrace.h - /usr/include/mysql/private/probes_mysql_dtrace.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 - - # Connect with Zip is currently broken and does not compile - # Reported upstream https://jira.mariadb.org/browse/MDEV-11809 - - 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 - - # 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 && eerror "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - addpredict /this-dir-does-not-exist/t9.MYI - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - - # 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} - - # These are failing in MariaDB 10.0 for now and are believed to be - # false positives: - # - # main.information_schema, binlog.binlog_statement_insert_delayed, - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, - # funcs_1.is_columns_mysql main.bootstrap - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test, main.mysql_client_test_nonblock - # main.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - # - # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam - # fails due to bad cleanup of previous tests when run in parallel - # The tool is deprecated anyway - # Bug 532288 - -#main.bootstrap \ -# for t in main.mysql_client_test main.mysql_client_test_nonblock \ -# main.mysql_client_test_comp \ -# binlog.binlog_statement_insert_delayed main.information_schema \ -# main.mysqld--help \ -# archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ -# funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do -# mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" -# done - - # Run mysql tests - pushd "${TESTDIR}" || die - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder - - retstatus_tests=$? - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd || die - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild b/dev-db/mariadb/mariadb-10.1.24-r1.ebuild deleted file mode 100644 index 1e63d720f7b6..000000000000 --- a/dev-db/mariadb/mariadb-10.1.24-r1.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -MY_EXTRAS_VER="20170316-1355Z" -# 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" - -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" - -IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" -RESTRICT="!bindist? ( bindist )" - -REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" - -PATCHES=( - "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.16.patch - "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch - "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch -) - -COMMON_DEPEND=" - mroonga? ( app-text/groonga-normalizer-mysql ) - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - systemd? ( sys-apps/systemd:= ) - !bindist? ( - sys-libs/binutils-libs:0= - >=sys-libs/readline-4.1:0= - ) - server? ( - backup? ( app-arch/libarchive:0= ) - cracklib? ( sys-libs/cracklib:0= ) - extraengine? ( - odbc? ( dev-db/unixODBC:0= ) - xml? ( dev-libs/libxml2:2= ) - sys-libs/zlib[minizip] - ) - innodb-lz4? ( app-arch/lz4 ) - innodb-lzo? ( dev-libs/lzo ) - innodb-snappy? ( app-arch/snappy ) - 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} - galera? ( - 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 ) ) ) -" -# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed -PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" - -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h - /usr/include/mysql/private/probes_mysql_nodtrace.h - /usr/include/mysql/private/probes_mysql_dtrace.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 - ) - local MYSQL_CMAKE_EXTRA_DEFINES=( - -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) - ) - 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+=( - -DPLUGIN_FEDERATED=NO - -DPLUGIN_FEDERATEDX=NO ) - fi - - MYSQL_CMAKE_NATIVE_DEFINES+=( - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) - -DPLUGIN_SPHINX=$(usex sphinx YES NO) - -DPLUGIN_TOKUDB=$(usex tokudb YES NO) - -DPLUGIN_AUTH_PAM=$(usex pam YES NO) - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) - -DPLUGIN_CASSANDRA=NO - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) - -DPLUGIN_SPIDER=$(usex extraengine YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) - -DCONNECT_WITH_MYSQL=1 - -DCONNECT_WITH_LIBXML2=$(usex xml) - -DCONNECT_WITH_ODBC=$(usex odbc) - -DCONNECT_WITH_JDBC=$(usex jdbc) - -DWITH_WSREP=$(usex galera) - -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) - -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) - -DPLUGIN_MROONGA=$(usex mroonga YES NO) - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) - -DWITH_MARIABACKUP=$(usex backup ON OFF) - -DWITH_LIBARCHIVE=$(usex backup ON OFF) - ) - 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." - return 0 - 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 - - # These are failing in MariaDB 10.0 for now and are believed to be - # false positives: - # - # main.mysql_client_test, main.mysql_client_test_nonblock - # main.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - - local t - for t in plugins.cracklib_password_check plugins.two_password_validations ; do - mysql-multilib-r1_disable_test "$t" "False positive due to varying policies" - done - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - main.mysql_client_test_comp ; do - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" - done - - # 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" ]] || eerror "Test failures: $failures" - einfo "Tests successfully completed" -} diff --git a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild index 7b86ca62c035..d37fe3d7fbd5 100644 --- a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild +++ b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -MY_EXTRAS_VER="20180308-1938Z" +MY_EXTRAS_VER="20180515-0123Z" # The wsrep API version must match between upstream WSREP and sys-cluster/galera major number WSREP_REVISION="25" SUBSLOT="18" @@ -23,7 +23,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc # REMEMBER: also update eclass/mysql*.eclass before committing! KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" +MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}" PATCHES=( "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch @@ -33,6 +33,7 @@ PATCHES=( "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch "${MY_PATCH_DIR}"/20033_all_mariadb-10.1.31-xtradb-sst.patch + "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch ) COMMON_DEPEND=" diff --git a/dev-db/mariadb/mariadb-10.1.32.ebuild b/dev-db/mariadb/mariadb-10.1.32.ebuild deleted file mode 100644 index c436772d9d76..000000000000 --- a/dev-db/mariadb/mariadb-10.1.32.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -MY_EXTRAS_VER="20180308-1938Z" -# 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" - -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" - -IUSE="+backup bindist cracklib galera kerberos innodb-lz4 innodb-lzo innodb-snappy jdbc mroonga numa odbc oqgraph pam sphinx sst-rsync sst-mariabackup sst-xtrabackup tokudb systemd xml" -RESTRICT="!bindist? ( bindist )" - -REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) static? ( !pam )" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" - -PATCHES=( - "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch - "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch - "${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch - "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch - "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch - "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch -) - -COMMON_DEPEND=" - mroonga? ( app-text/groonga-normalizer-mysql ) - kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - !bindist? ( - sys-libs/binutils-libs:0= - >=sys-libs/readline-4.1:0= - ) - server? ( - backup? ( app-arch/libarchive:0= ) - cracklib? ( sys-libs/cracklib:0= ) - extraengine? ( - odbc? ( dev-db/unixODBC:0= ) - xml? ( dev-libs/libxml2:2= ) - sys-libs/zlib[minizip] - ) - innodb-lz4? ( app-arch/lz4 ) - innodb-lzo? ( dev-libs/lzo ) - innodb-snappy? ( app-arch/snappy ) - numa? ( sys-process/numactl ) - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) - pam? ( virtual/pam:0= ) - systemd? ( sys-apps/systemd:= ) - tokudb? ( app-arch/snappy ) - ) - >=dev-libs/libpcre-8.41-r1: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} - galera? ( - sys-apps/iproute2 - =sys-cluster/galera-${WSREP_REVISION}* - sst-rsync? ( sys-process/lsof ) - sst-mariabackup? ( net-misc/socat[ssl] ) - 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 ) ) ) -" -# percona-xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed -PDEPEND="galera? ( sst-xtrabackup? ( || ( >=dev-db/percona-xtrabackup-bin-2.2.4 dev-db/percona-xtrabackup ) ) )" - -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h - /usr/include/mysql/private/probes_mysql_nodtrace.h - /usr/include/mysql/private/probes_mysql_dtrace.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 - ) - local MYSQL_CMAKE_EXTRA_DEFINES=( - -DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO) - ) - 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+=( - -DPLUGIN_FEDERATED=NO - -DPLUGIN_FEDERATEDX=NO ) - fi - - MYSQL_CMAKE_NATIVE_DEFINES+=( - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) - -DPLUGIN_SPHINX=$(usex sphinx YES NO) - -DPLUGIN_TOKUDB=$(usex tokudb YES NO) - -DPLUGIN_AUTH_PAM=$(usex pam YES NO) - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) - -DPLUGIN_CASSANDRA=NO - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) - -DPLUGIN_SPIDER=$(usex extraengine YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) - -DCONNECT_WITH_MYSQL=1 - -DCONNECT_WITH_LIBXML2=$(usex xml) - -DCONNECT_WITH_ODBC=$(usex odbc) - -DCONNECT_WITH_JDBC=$(usex jdbc) - # Build failure and autodep wrt bug 639144 - -DCONNECT_WITH_MONGO=OFF - -DWITH_WSREP=$(usex galera) - -DWITH_INNODB_LZ4=$(usex innodb-lz4 ON OFF) - -DWITH_INNODB_LZO=$(usex innodb-lzo ON OFF) - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy ON OFF) - -DPLUGIN_MROONGA=$(usex mroonga YES NO) - -DPLUGIN_AUTH_GSSAPI=$(usex kerberos YES NO) - -DWITH_MARIABACKUP=$(usex backup ON OFF) - -DWITH_LIBARCHIVE=$(usex backup ON OFF) - -DWITH_NUMA=$(usex numa ON OFF) - ) - 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 - - _disable_test() { - local rawtestname reason - rawtestname="${1}" ; shift - reason="${@}" - ewarn "test '${rawtestname}' disabled: '${reason}'" - echo ${rawtestname} : ${reason} >> "${T}/disabled.def" - } - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - if ! use server ; then - einfo "Skipping server tests due to minimal build." - return 0 - 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 - - touch "${T}/disabled.def" - # These are failing in MariaDB 10.0 for now and are believed to be - # false positives: - # - # main.mysql_client_test, main.mysql_client_test_nonblock - # main.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - - local t - for t in plugins.cracklib_password_check plugins.two_password_validations ; do - _disable_test "$t" "False positive due to varying policies" - done - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - main.mysql_client_test_comp ; do - _disable_test "$t" "False positives in Gentoo" - done - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test-list="${T}/disabled.def" - 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" ]] || eerror "Test failures: $failures" - einfo "Tests successfully completed" -} diff --git a/dev-db/mariadb/mariadb-10.1.33.ebuild b/dev-db/mariadb/mariadb-10.1.33.ebuild index ce4d15d2d12d..9b0cc566681a 100644 --- a/dev-db/mariadb/mariadb-10.1.33.ebuild +++ b/dev-db/mariadb/mariadb-10.1.33.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="6" -MY_EXTRAS_VER="20180308-1938Z" +MY_EXTRAS_VER="20180515-0123Z" # The wsrep API version must match between upstream WSREP and sys-cluster/galera major number WSREP_REVISION="25" SUBSLOT="18" @@ -23,7 +23,11 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc # REMEMBER: also update eclass/mysql*.eclass before committing! KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" +if [[ ${MY_EXTRAS_VER} == "live" ]] ; then + MY_PATCH_DIR="${WORKDIR%/}/mysql-extras" +else + MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}" +fi PATCHES=( "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch @@ -32,6 +36,7 @@ PATCHES=( "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch + "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch ) COMMON_DEPEND=" diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild index 893927aa1797..459ddfd64db6 100644 --- a/dev-db/mariadb/mariadb-10.2.14.ebuild +++ b/dev-db/mariadb/mariadb-10.2.14.ebuild @@ -50,9 +50,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li S="${WORKDIR}/mysql" if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then - MY_PATCH_DIR="${WORKDIR}/mysql-extras" + MY_PATCH_DIR="${WORKDIR%/}/mysql-extras" + inherit git-r3 + EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git" + EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras" + EGIT_CLONE_TYPE=shallow else - MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" + MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}" fi PATCHES=( @@ -60,6 +64,7 @@ PATCHES=( "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch + "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch ) # Be warned, *DEPEND are version-dependant @@ -248,9 +253,9 @@ pkg_postinst() { src_unpack() { unpack ${A} # Grab the patches - [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack + [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack - mv -f "${WORKDIR}/${P}" "${S}" || die + mv -f "${WORKDIR%/}/${P}" "${S}" || die } src_prepare() { -- cgit v1.2.3