| 1 |
commit: eed1436473f24f4cf2b30a345a3c0fe4b11e017c |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 2 18:35:51 2016 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 2 18:35:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=eed14364 |
| 7 |
|
| 8 |
dev-db/mariadb: Version bump for 10.0.25 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Manifest-Sign-Key: D1F781EFF9F4A3B6 |
| 12 |
|
| 13 |
dev-db/mariadb/ChangeLog | 6 +++++ |
| 14 |
dev-db/mariadb/Manifest | 30 +++++++++++----------- |
| 15 |
...riadb-10.0.24.ebuild => mariadb-10.0.25.ebuild} | 17 +++++++----- |
| 16 |
3 files changed, 31 insertions(+), 22 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog |
| 19 |
index 9027728..444b5fb 100644 |
| 20 |
--- a/dev-db/mariadb/ChangeLog |
| 21 |
+++ b/dev-db/mariadb/ChangeLog |
| 22 |
@@ -2,6 +2,12 @@ |
| 23 |
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Id$ |
| 25 |
|
| 26 |
+*mariadb-10.0.25 (02 May 2016) |
| 27 |
+ |
| 28 |
+ 02 May 2016; Brian Evans <grknight@g.o> +mariadb-10.0.25.ebuild, |
| 29 |
+ -mariadb-10.0.24.ebuild: |
| 30 |
+ dev-db/mariadb: Version bump for 10.0.25 |
| 31 |
+ |
| 32 |
*mariadb-5.5.49 (22 Apr 2016) |
| 33 |
|
| 34 |
22 Apr 2016; Brian Evans <grknight@g.o> +mariadb-5.5.49.ebuild, |
| 35 |
|
| 36 |
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest |
| 37 |
index 0ef0590..b3d1356 100644 |
| 38 |
--- a/dev-db/mariadb/Manifest |
| 39 |
+++ b/dev-db/mariadb/Manifest |
| 40 |
@@ -1,7 +1,7 @@ |
| 41 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 42 |
Hash: SHA256 |
| 43 |
|
| 44 |
-DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64 |
| 45 |
+DIST mariadb-10.0.25.tar.gz 57459461 SHA256 4540832c18112a332f61f4eeb57140890c4e2188ae12b312f4e2e8a0363553e4 SHA512 7d07834dcd5a89ac276c0a85ca3ab99c630cc3768d3576ac7c1038698e3633803ae0ec0f27619c271ccd79371885f6b3f2a67d36b17ecf76432ba90760fbb96d WHIRLPOOL 011400ec5d2fc99d4426315cb5190cf2888d65f47535bfa7cc0c97b89915a029ec76d956dbc4635a18bcd42bc84905da08ea73c6c75eb9e955385b5f586c737c |
| 46 |
DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8 |
| 47 |
DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54 |
| 48 |
DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d |
| 49 |
@@ -17,19 +17,19 @@ DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1d |
| 50 |
-----BEGIN PGP SIGNATURE----- |
| 51 |
Version: GnuPG v2.1 |
| 52 |
|
| 53 |
-iQJ8BAEBCABmBQJXGlm/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
| 54 |
+iQJ8BAEBCABmBQJXJ54DXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w |
| 55 |
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2NkMyRTQ0RUQ5MEUzMjc1OEU3RDU1QzBE |
| 56 |
-MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2yd8P/0Fn0x2JKmP7CZlppQ67mqc7 |
| 57 |
-X+f/XWEdLebN9Iifs/C1NHMkKxzDg2pjsn8B+Uq3ITs4lv2hQ9htNSlNKlogLIUt |
| 58 |
-B8bc54MUHM6wRm0HTF3AzklECE6aGFGqm++LXgOs0Ohn30gFDKCR9l6BSiGekKCw |
| 59 |
-obiAW4FRi9HADqgSoMvgc/OTIMnbgkEbn+ZybH6OOYVOaYSqT00GEz8PvYBbS9vI |
| 60 |
-ZYssxD2ilFwgn9/48F2hKF+Un510JW8fn85vgIXj/46BFcJs3gTLglka8bCb/t/q |
| 61 |
-Vog5kevjWAs6429G1/q3zki+jIaxDh/H66yRwxBQKJPLNvU8PVTDs2SD29auguKI |
| 62 |
-lKVXPAFRmL0WER78Pyj19j5bdoMLKHIOyU2XPYVPEFUV56b1F6h3nO6veSoJGdR0 |
| 63 |
-0ewO6nf58t2lFnf5lNRHsf4qpDHtvox3B7d6/J5u828KNf/fan/rhCP8ZRaTQcCG |
| 64 |
-Qst2BrPStjec1R3nBxpu0MzTBWXwBZJp5j3FcKTuBOktyCsk413KAVELvpg9nJ+n |
| 65 |
-onai45GzEgp5L0XmtLpV+eIV45mNzc8cBdSuari+5z4LLtEkpee+zeKwQQcSNgnr |
| 66 |
-1o/VJvEk5ZRuglepR2q2GOSfoNvdl+55rT/sSFALyqNXilnDEd1DR8OCu4a92pAp |
| 67 |
-wKCkUb5dOum97BQszjCi |
| 68 |
-=1upL |
| 69 |
+MUY3ODFFRkY5RjRBM0I2AAoJENH3ge/59KO2i8MP/06aVeYb7p2bd2ryEnKqT71/ |
| 70 |
+g8qxenMnaqgyTqtwP4dSR7+msli1dCxXyPWHtbilem57f7mtUCCE0CVX/lO1+MFW |
| 71 |
+H4T7NVfy9PmnHSrACzKTddKdND/wp5GNejt+TnCeDqW2gT6uVt8qIBNc4ShjVAOK |
| 72 |
+Sq43LZCkJlprHFdzkYO93JuoFyX6RlDqQFI88cFyBQD2JHY+wxh46V0DYduC2Xex |
| 73 |
+4Z94wrLEBMUSqeNnF6rH+pRuAgag08Hl8550n0EFegQyS4TAIJfDvNvpB/2XmJf/ |
| 74 |
+Kshuwyle/QFpY/fEaCM4BxQ97KomeaUxmbe03MesBsenGF5wP8/vvzHy6umsujo3 |
| 75 |
+QqCGft9nhHZM9SIGuSzcgcQkjqWs/vzYD8jtESu0iEGd+2xQQFy32CKXT4SHVXL6 |
| 76 |
+zrK0bD6mW1zwUWkfhTgcKfHW5oYXaCkLbg/sJg+9b96Yjby1eGN/rhnNa512J4C+ |
| 77 |
+JyUvAjCluoIz9cVh+ezGPilyd8OYqGVAqvZ7HPtuFL2qnDKz7jbSBAatf/bMM8ca |
| 78 |
+hmiJVK1c21qppbatU29KXLy69xVcA2l0y/cPVwSbtKUMTmVvzlyhtzJsklP3cPhx |
| 79 |
+BXdZsWxD24veS1z3mYt8XjpM2i1u+dYCGL7wA/C7txiJs4LUkfHPWxAl0VbqyCYE |
| 80 |
+xLf8S9tfuOptLYm8I6Wk |
| 81 |
+=gCrt |
| 82 |
-----END PGP SIGNATURE----- |
| 83 |
|
| 84 |
diff --git a/dev-db/mariadb/mariadb-10.0.24.ebuild b/dev-db/mariadb/mariadb-10.0.25.ebuild |
| 85 |
similarity index 92% |
| 86 |
rename from dev-db/mariadb/mariadb-10.0.24.ebuild |
| 87 |
rename to dev-db/mariadb/mariadb-10.0.25.ebuild |
| 88 |
index 7ee3980..22b5004 100644 |
| 89 |
--- a/dev-db/mariadb/mariadb-10.0.24.ebuild |
| 90 |
+++ b/dev-db/mariadb/mariadb-10.0.25.ebuild |
| 91 |
@@ -2,10 +2,8 @@ |
| 92 |
# Distributed under the terms of the GNU General Public License v2 |
| 93 |
# $Id$ |
| 94 |
|
| 95 |
-EAPI="5" |
| 96 |
+EAPI="6" |
| 97 |
MY_EXTRAS_VER="20151223-1501Z" |
| 98 |
-# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number |
| 99 |
-WSREP_REVISION="25" |
| 100 |
SUBSLOT="18" |
| 101 |
MYSQL_PV_MAJOR="5.6" |
| 102 |
|
| 103 |
@@ -17,14 +15,19 @@ DESCRIPTION="An enhanced, drop-in replacement for MySQL" |
| 104 |
IUSE="bindist odbc oqgraph pam sphinx tokudb xml" |
| 105 |
RESTRICT="!bindist? ( bindist )" |
| 106 |
|
| 107 |
-REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )" |
| 108 |
+REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )" |
| 109 |
|
| 110 |
# REMEMBER: also update eclass/mysql*.eclass before committing! |
| 111 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 112 |
|
| 113 |
-# When MY_EXTRAS is bumped, the index should be revised to exclude these. |
| 114 |
-EPATCH_EXCLUDE='' |
| 115 |
- |
| 116 |
+MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}" |
| 117 |
+PATCHES=( |
| 118 |
+ "${MY_PATCH_DIR}/01050_all_mariadb_mysql_config_cleanup-5.5.41.patch" |
| 119 |
+ "${MY_PATCH_DIR}/20004_all_mariadb-filter-tokudb-flags-10.0.23.patch" |
| 120 |
+ "${MY_PATCH_DIR}/20006_all_cmake_elib-mariadb-10.0.15.patch" |
| 121 |
+ "${MY_PATCH_DIR}/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch" |
| 122 |
+ "${MY_PATCH_DIR}/20018_all_mariadb-10.0.20-without-clientlibs-tools.patch" |
| 123 |
+) |
| 124 |
COMMON_DEPEND=" |
| 125 |
!bindist? ( >=sys-libs/readline-4.1:0= ) |
| 126 |
server? ( |
Archives