summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2017-07-18 20:34:44 -0400
committerBrian Evans <grknight@gentoo.org>2017-07-18 20:34:44 -0400
commiteb506cf02fd57b42cce30d21a6689cd9694f5261 (patch)
tree196751ff7a22c968b0b2faf843c763321818cfb6
parentdev-db/mariadb: Syntax errors in last commit (diff)
downloadmysql-eb506cf02fd57b42cce30d21a6689cd9694f5261.tar.gz
mysql-eb506cf02fd57b42cce30d21a6689cd9694f5261.tar.bz2
mysql-eb506cf02fd57b42cce30d21a6689cd9694f5261.zip
dev-db/mariadb: Affix patch version
Package-Manager: Portage-2.3.6, Repoman-2.3.2 Manifest-Sign-Key: 0xD1F781EFF9F4A3B6
-rw-r--r--dev-db/mariadb/Manifest27
-rw-r--r--dev-db/mariadb/mariadb-10.2.6.ebuild4
2 files changed, 15 insertions, 16 deletions
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index b6ce426..3c29014 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,22 +8,23 @@ DIST mariadb-5.3.12.tar.gz 26880808 SHA256 83a4598117cadde2bd7eac4c1398edbc86cc3
DIST mariadb-5.5.49.tar.gz 45738390 SHA256 2c82f2af71b88a7940d5ff647498ed78922c92e88004942caa213131e20f4706 SHA512 4eceb8ab4e1fb7144374f100440b83a8b3294fa9da61027086c27b02b8ff899e3f9d4511adbb02fb50ddab92a48bf6a39ad71ab9e00bc8be00022a4ea4e6fc2f WHIRLPOOL e757ff389b184fa235e39bebbfd4bd53e29a20da640a90a6a2454537a238edfff07f9a76da32e65a7756aa25421174d57f6f28d94924bb3ee0aa7ac6474d03c3
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614 WHIRLPOOL 4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
+DIST mysql-extras-20170719-0024Z.tar.bz2 310450 SHA256 220d4a62c737164a22554bc34c4a1b557441dda12f85ab94936158d540bf2f45 SHA512 658f70b617129b80c69e897e60b4aacc414ce4fc31b3814be6ef7b0002a8f81d6a41af2a88a0a4cd82b7665b1d6682ef6140bebd3c41d08b8ad6b4e083669139 WHIRLPOOL 2463673e700cf3eacc1d02e973f486afdc6120b4cdd194751644770145d5fd018d9a1674d119749224cefca6dd6fc13037c490aec0c34a02c01975141b5e38f1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKTBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlkrglVfFIAAAAAALgAo
+iQKSBAEBCAB9FiEEZsLkTtkOMnWOfVXA0feB7/n0o7YFAlluqSBfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDY2
QzJFNDRFRDkwRTMyNzU4RTdENTVDMEQxRjc4MUVGRjlGNEEzQjYACgkQ0feB7/n0
-o7b/Iw/+PZ0Z9mNDUqFmiSY0Q6pRelLhukElKXlPFYKySrfEZa6r3mKXGcDzDfKa
-lZB9heHCFqLReGEQ/NOFJRYQ3K759OW31UpQYvzux8vOsxNkkL1eZUl5uqWFPLRa
-uNgy+9nI9pRuhhKosRQ+kD2xF4mwwDv2/iEzxG1mDXhr52rZXZbjdFkqzD9lUmt/
-eTyWrYGcjIKkNauh8x1sp84ejDHzxv3Q2aMJflcpl+v0oDFyTD18xZ3A3y0aJLUM
-96eCY3KEI22TSvomZkURyMvNuCrDGpaVWDZwRhD1GVm5e3WdzdIOffABU8ezjMKs
-Tm+ioYW679rRmug2t51fOT6439SW5iKD9jMXM7kk8/ZFymM1G46ErLgrM00gOEF0
-tPiNeamCcM7QkaHSDUPHC9Rekj3wXX9PoDtIYckDC1DrEnmk50Phi1ji5PjQlgh+
-CV76WwB+TKCPP62eob0eWUPtT9387W+AufZgQBOaf+I8P0Pfdwi3fEvpdyrlc5Qe
-hHWC5JLe6scGuC8BG4IITP/oZzVRUBnmRWXlWVuWSKEXigjXqw5A45ZSsek40C8U
-+tR3bhuh6YBObkWj2KmHcfAyzLOJxxyf+SkGjezRQe6FgWzl5wua7x+XAvFv7rJ2
-pQJSdeDaWoZejclpiUmhz6C5zyJFFsTjIcArtiLaiB6nFq8Cj08=
-=flkk
+o7Zoug/2Ndk6gK7uDEymWFai1ZJLtQyskFbTbtuwS6tAwtqjlNgGb5QnhM/ksKoP
+iRHtPbY6I1nayiIlnDnuqP9eSOQutbKNzxDWZLX4DY0RJkB2FLJlx9Z4mKpSKHFe
+3s5rEjp46FAqW7P3DK45SBwOAt04nqodKPGEq/jhovJgaCw+lA4laH6kGPklYyGx
+Fg4dBK2EUfEdqGaaWwpO4j4wWWQzKuDuOLxDyoI6sPyUTVo9y5paENXuTcpzYj5H
+QSxB4BImaVIS46ew88F3q5ZfZsSmskK2v+S8boc1J1IzYCxlYI5k+uIgEWOIVfyx
+QEEUs3cuTSlpMs7cYiIDyL8pAimrpRtz+Iex3KPZpBLTOwh+PvNhV+7qDqSd2AEC
+I37vT1+8Uivlqyu6OT+kqk4aYrZETmA4njoVEK+0f6iNmS9gUzxlJ8rONs2qK2IR
+60Np4RnjSP567m8U1bIqN6Kx6Nqx7fBIxK0gkxe29H1jZWuRQr+XZ+9MG0KxpEwI
+mEmQ7E2IyVcTdatxBTAQyGRjFnRk3E4uRkgw+Eet8eJFj7vMLgBcQpQlz8y8/yIA
+znwp/a7v8SwC4yKzo7enM59dmjrnufD4I8rJrCyW0cxzDjmJBgiWVFqmL+RcMgyD
+JEIWaB57X32/OhI4A57JPiv0QnzXsIogvYT3xNoNTslLNJBuzg==
+=RiQd
-----END PGP SIGNATURE-----
diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild b/dev-db/mariadb/mariadb-10.2.6.ebuild
index f1a4230..e805996 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
-MY_EXTRAS_VER="live"
+MY_EXTRAS_VER="20170719-0024Z"
# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
WSREP_REVISION="25"
SUBSLOT="18"
@@ -31,8 +31,6 @@ else
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
fi
-# "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.8.patch
-# "${MY_PATCH_DIR}"/20009_all_mariadb_myodbc_symbol_fix-5.5.38.patch
PATCHES=(
"${MY_PATCH_DIR}"/20015_all_mariadb-pkgconfig-location.patch
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.6-without-clientlibs-tools.patch