diff options
Diffstat (limited to 'dev-db')
17 files changed, 148 insertions, 278 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz Binary files differindex 384faf8679c3..f74d20164427 100644 --- a/dev-db/Manifest.gz +++ b/dev-db/Manifest.gz diff --git a/dev-db/m17n-contrib/Manifest b/dev-db/m17n-contrib/Manifest deleted file mode 100644 index fcabb5a4c4dc..000000000000 --- a/dev-db/m17n-contrib/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST m17n-contrib-1.1.13.tar.gz 697293 BLAKE2B aabd780632da2385a3dc63c4465b7e7ca3bfcbb2359f5423d4332baaf224cf981a6f5dbc29f647c5704670893416ca67df650ef0baa5a86b7dba4c706c7796f6 SHA512 09b04315162b197bbada94e4213108a7b02e2349e519e311b545faefcb057f0bd5345a18f8eb3e9bb96843c2e8f04f56685e0347ede0ccade1b79caf459cb945 -DIST m17n-contrib-1.1.14.tar.gz 698611 BLAKE2B 407dc1a9a538a14f17f996d5856e064e4bf5e0b2ffa007ab6c250e9c1669c228e44aa456d1cc51d754814db9851f102d1066989ae534aebcf1b4e3a1d92fc3c2 SHA512 569149dc4318e033ecde347cd9f935b6e18fefdd8f24d8a447aed3f754a920cec53b5f7a806d93032a45c05a346076c38a3a5b6398cf4caadc7db0e52baf5ced -EBUILD m17n-contrib-1.1.13.ebuild 362 BLAKE2B 2f1659f4a63d55d6b65e31b3a4da4286bed03e26b5e9ccb4a91f0729e9efe1611cd0afc3596afe30dbc13a60d90adf12a89b73334be7d1358204a1482376428f SHA512 4110c884914a3659b49e4183c043ba66c17dd4e500b80e12187a5240c90a775b35b55dbd8c081b7d6785762283db475763149b13db922f3d6766fcdde78c4d4c -EBUILD m17n-contrib-1.1.14.ebuild 362 BLAKE2B 9270aee017b0b965fad6237a00fe80a6893d51663e334b32789539271321ce060435d99e9c79ee2a7b6bd91bec36d1c6416628012deddf33eabbe8544dc803a2 SHA512 49099dff373faa9405679b071b38ff4b309296ff33bf6fd6aaf30d4eb1427adc8f1158ee0dd42af30a30794174fb06a94cab1f2779ab39689732805ecf4fa1cf -MISC metadata.xml 365 BLAKE2B d5f40776eed8aabba3f66ee43e984f24f1899143fa090705e5f32545100500c6fb92c47cbe6fdcb70e164874d8d6f7b91893aac7a2962987ec6bf4d8a31749ee SHA512 e272f7633a6e09ec16bb0662076759674cbb5cdf00a4455c430450d480f3e6b9067aa560679686c51f6980508e5851f326888b238b3668f07f23ee98ee688466 diff --git a/dev-db/m17n-contrib/m17n-contrib-1.1.13.ebuild b/dev-db/m17n-contrib/m17n-contrib-1.1.13.ebuild deleted file mode 100644 index 44db8e9237f3..000000000000 --- a/dev-db/m17n-contrib/m17n-contrib-1.1.13.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Contribution database for the m17n library" -HOMEPAGE="https://savannah.nongnu.org/projects/m17n" -SRC_URI="mirror://nongnu/m17n/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="~dev-db/m17n-db-1.6.3" diff --git a/dev-db/m17n-contrib/m17n-contrib-1.1.14.ebuild b/dev-db/m17n-contrib/m17n-contrib-1.1.14.ebuild deleted file mode 100644 index fa435afbe24c..000000000000 --- a/dev-db/m17n-contrib/m17n-contrib-1.1.14.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Contribution database for the m17n library" -HOMEPAGE="https://savannah.nongnu.org/projects/m17n" -SRC_URI="mirror://nongnu/m17n/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="~dev-db/m17n-db-1.6.4" diff --git a/dev-db/m17n-contrib/metadata.xml b/dev-db/m17n-contrib/metadata.xml deleted file mode 100644 index 8007e041859b..000000000000 --- a/dev-db/m17n-contrib/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> -</maintainer> -<longdescription lang="en"> -The m17n-contrib is a collection of contributed works to be used with the m17n library. -</longdescription> -</pkgmetadata> diff --git a/dev-db/percona-xtrabackup-bin/Manifest b/dev-db/percona-xtrabackup-bin/Manifest new file mode 100644 index 000000000000..ff13d570863a --- /dev/null +++ b/dev-db/percona-xtrabackup-bin/Manifest @@ -0,0 +1,10 @@ +DIST percona-xtrabackup-2.4.10-Linux-i686.libgcrypt20.tar.gz 84004091 BLAKE2B 0fde32a53aaba54d71e34b729ba4d3dc94c21d8852a4c87da221b6967b6e9c6b59c7fc4966724cbdf3fd474082b3e14717dc34b30b3f235b2271c0f7fdbf52e8 SHA512 07e75c0770736f2566d44395a5ed455b5f90a64244754e621e9c90d8e7a0ad3fe1d7a05037b9f0ecba53b821a8f1ad4d51914ef0b414ae470091ccd489379b19 +DIST percona-xtrabackup-2.4.10-Linux-x86_64.libgcrypt20.tar.gz 86736776 BLAKE2B b55915b1ad34bb55668b90de2441502491e98d2a685932848e756ea61562592416a05eba33d0c6df2bcad9f113b867b64eca39813a3683b25c18574535ba2b70 SHA512 1293e9511e09cd8cac2ef2a117282d3f79573974b7b7c3ffe6e80fe1c57edb27f32fe19e14c0ea643084c62ad83f6e5e25b5f01671628735fae940fcfb7795f1 +DIST percona-xtrabackup-2.4.11-Linux-i686.libgcrypt20.tar.gz 85158090 BLAKE2B 3d6565542208d1a9c74154d0a7e23610a34416f4840bcff240a262958fe4e4b0f489883349760934469619d225dccc7a2d531919e716dfdc3c2f10b1f98263e2 SHA512 bd6419f1b2e79e8e41817c677209a0d08912b247314f611689e0208028d4870e1e2a2b559fe8d60a3a369704aaee57e300643d9d355f083bb89c950f13d724bb +DIST percona-xtrabackup-2.4.11-Linux-x86_64.libgcrypt20.tar.gz 87975988 BLAKE2B 850b06d3e063b2884f0731ada7ad20e09816e38f60ee5eef2b1150c2b1f0cd59082d26fa026bf7e80ccebdf6b513ab8af6c7d228ade96d532ef41a74490093e9 SHA512 dc412e3ad65a5d3aed6053e107a79094760b868f008171c9aaee190c97e666a38716b0c7d3e7f3db74eecff98b35c114be29114d50630f554a0c2cb0b1b71cfe +DIST percona-xtrabackup-2.4.9-Linux-i686.tar.gz 79816483 BLAKE2B 0fd97ee14c97f66edf629fa0300bfa2d6b333ac5942f5cee46dd9d0ad04ef2fe12750209971ff8f6a8ca225a85deaa42ca64c484e12e60c85789153689e55c42 SHA512 014921b0ea9fec783adbdd4556301e8df77f801729faae5b2b7245c349df069fc3af33ebef5ec65ef0e020c7b0ec8ebf4aa7a7acc0e9936c6f4a90b721a5de19 +DIST percona-xtrabackup-2.4.9-Linux-x86_64.tar.gz 90282874 BLAKE2B 2c4cdb8c6da443baf01857fbe4b27be002df370b67687f417a9fde6b08a5e72482552b165a9f27fda305787b42089fb138a4fca2f1d683afbd42efa23746b13c SHA512 24138c098d8e674de291dc494c38f2fce52f4d6a5a2552a62b34ea801b867431917449656f990043c7bbbc1e18a8806c4343eadbe1fea17e36ff1b10109e5047 +EBUILD percona-xtrabackup-bin-2.4.10.ebuild 1530 BLAKE2B 87233dfc8725ce661367ff5d426fdf0b4e1f9335295abbe1f154715a19cc2658a60d84e4040ea837d2c6b0b0d61b493fe1836dd632cec01211e8eb96b803d308 SHA512 87ab06a801645538a5d8a335c22ab16a21a507681ffbefeeaeb2fa0069e231cf8f332ffce63481bd6ffd8a185d451cbdd56f93ce74fd9b70693f62a660efbc29 +EBUILD percona-xtrabackup-bin-2.4.11.ebuild 1530 BLAKE2B 87233dfc8725ce661367ff5d426fdf0b4e1f9335295abbe1f154715a19cc2658a60d84e4040ea837d2c6b0b0d61b493fe1836dd632cec01211e8eb96b803d308 SHA512 87ab06a801645538a5d8a335c22ab16a21a507681ffbefeeaeb2fa0069e231cf8f332ffce63481bd6ffd8a185d451cbdd56f93ce74fd9b70693f62a660efbc29 +EBUILD percona-xtrabackup-bin-2.4.9.ebuild 1461 BLAKE2B fbe02435623b2c09f811dc5683733fbc2768e67a498f4e465c27f0f28a6341eb2ce92ab1192dc99aaed1a590da8a9c4f0183e1a030ad49253a35ff7cd81779e1 SHA512 9227a8efb509e94bd6be062959de7447bc8461b7278a0b7b633a58ac2a65f17726902ba9ec5d5a407d5e913cbe1c62620d01b139fd303d798567ce1b81b92dd2 +MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b diff --git a/dev-db/xtrabackup-bin/metadata.xml b/dev-db/percona-xtrabackup-bin/metadata.xml index 5840601f180f..5840601f180f 100644 --- a/dev-db/xtrabackup-bin/metadata.xml +++ b/dev-db/percona-xtrabackup-bin/metadata.xml diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.10.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.10.ebuild index dc58da552a83..2e9e7ddc7525 100644 --- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.10.ebuild +++ b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.10.ebuild @@ -3,7 +3,7 @@ EAPI="6" -MY_PN="percona-${PN/-bin}" +MY_PN="${PN%-bin}" MY_P="${MY_PN}-${PV}" DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases" diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.6.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.11.ebuild index 734bbe0fa11e..2e9e7ddc7525 100644 --- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.6.ebuild +++ b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" -MY_PN="percona-${PN/-bin}" +MY_PN="${PN%-bin}" MY_P="${MY_PN}-${PV}" DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases" HOMEPAGE="https://www.percona.com/software/percona-xtrabackup" SRC_URI=" amd64? ( - https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.tar.gz + https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.libgcrypt20.tar.gz ) x86? ( - https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.tar.gz + https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.libgcrypt20.tar.gz )" LICENSE="GPL-2" @@ -24,10 +24,13 @@ IUSE="" # NOTE: dev-perl/DBD-mysql still necessary, now for bin/xtrabackup? DEPEND="" RDEPEND="dev-libs/libaio - dev-libs/libgcrypt:11/11 + dev-libs/libgcrypt:0/20 dev-libs/libgpg-error dev-perl/DBD-mysql - sys-libs/zlib" + sys-libs/zlib + sys-process/numactl" + +QA_PREBUILT="usr/bin/*" src_unpack() { default diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.8.ebuild b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.9.ebuild index 734bbe0fa11e..061d2fc6a0c8 100644 --- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.8.ebuild +++ b/dev-db/percona-xtrabackup-bin/percona-xtrabackup-bin-2.4.9.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" -MY_PN="percona-${PN/-bin}" +MY_PN="${PN%-bin}" MY_P="${MY_PN}-${PV}" DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases" diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest index bdac29d6c598..7247e282c0bc 100644 --- a/dev-db/percona-xtrabackup/Manifest +++ b/dev-db/percona-xtrabackup/Manifest @@ -1,12 +1,11 @@ AUX percona-xtrabackup-2.4.10-fix-gcc6-isystem.patch 3822 BLAKE2B 796553a8760ecbf1c64e8aa349168a6a3c3ee2b03ee0ce123b574f20b2056b7238733486d78ecb90b2681ae15431aecf67dab26734324840c1b0ad5af319d69e SHA512 223ce359c662be6b67f5bb056c468aa14f73a54657a737e76d674e9549a18f924a34f34f0ab5a27a00f42f16c50b32553ee64f72e7bb8c76305c6d72aa34a7fd +AUX percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch 4034 BLAKE2B 0ce65196d4679481d3197e95d9efc3783c1e4f37dcd602588fc3e8da5957f63cf68b9222a7ab12fe2e8fd19d69e8a24e9f86cc7dd2ba776d473a95b9279a1f24 SHA512 4dd9352b8d8ae46782925daae27cd5ad1765c5f4ab26f1f5f07fbac68f0cb83e4979009dddacd8a55ba818c93014b46dee997b43f6951820337e0cb79733f60e AUX percona-xtrabackup-2.4.6-fix-gcc6-isystem.patch 3801 BLAKE2B 2494f55253e820c6b9bc079ff96d7894c9c16aedb6ed6017c7d5474007ebf19ef03b735a5b76bc67265b858205285f82f626f1058a216e0094c11a9440a11cd0 SHA512 8ab3cb41092f3ce324213917842d0cf72d2b501c60238007b57702458c572ea0d7faa159dec10367bfef97584b0b2dfc0a153bba5f13ac9efebeae2f1e2c7a39 AUX percona-xtrabackup-2.4.6-remove-boost-version-check.patch 485 BLAKE2B c9330c5b0a163a0d95682a81cee9e3c99cebdb2a6ed124cb5f424ade92728b11b29685e2c1eee0fbf9df613f5a1b08cc4021daec8b60a6c66ab51b08a397b33d SHA512 31277d6bef14a6b642ce425ce9f2c92fe49f905c42c720a583cb45406c1ee18ccbf2bef224b9b89bb02de18aecc1ec48576f5ca0c9bfef0cc683d78218506906 DIST percona-xtrabackup-2.4.10.tar.gz 59217573 BLAKE2B 3a4485b6d8c5b9ad2ca4b60603383b18ec0a3da7e4cca3b5a1ee2d24b6ca17844cc406123bbaf9313fc17570db0168c13af16d17404e075fc8140731ef9b79c2 SHA512 a4ebbebabc8b9b5fec9777fc3569c530b4a88a1b75d3e78d2edf7627a2e8cadf7aa2d8988963136b331a274c80371ff9b7fafcc7d8a129f446eb58777ce1764f -DIST percona-xtrabackup-2.4.7.tar.gz 54119422 BLAKE2B 41ae661efe53e0ede92dc1e1555e05f68c2fd2848d32c5ae9df3244a5b3e9d996c23cd3b9b79e5a0630140ea02e04f3560679b4c493484e7c2a1b0bcc5847aa0 SHA512 7aaf82975cd4c0b7af119902eddf96b8ce75c0fbcbd6835991e33f1f89347361fbe3c9040762c9989df5d53199b628aa6b2b45004ef440bb46e2415fbab13009 -DIST percona-xtrabackup-2.4.8.tar.gz 57965576 BLAKE2B 5cca947549181413ef68bcc7a5fd935404ebf2aaccc2e8de42221cbc0007371ca3499e26f2ab312b7fb94fe74a7079c48a11405df18cc3c809329403a83840cd SHA512 a613c41169c6ebdba27c6cb8111d388ff656d4daf0e69b52e401b293a6ac6499d81d0f028afd805fa60018ad5f2007e70db7a9ba931d6829272f0ce273ba9739 +DIST percona-xtrabackup-2.4.11.tar.gz 59267058 BLAKE2B 1de9905a2c191a58290e87a90e36c263f66935ce0846af205e1a0accc6e9b2938dd8679f65acc4b51ca956f2bcbca831cd10c9d50c01c2ecfd9d059fde500e20 SHA512 2fa4757fe944fb4c8113dca1fa25beaa23de5d5f9fc830b36a6d9eb4efb7e7fb1eec10f91be5e91fd3b7980bc157832ed52c9da59a342f6aae05ceae8ecdf760 DIST percona-xtrabackup-2.4.9.tar.gz 58001052 BLAKE2B d2a25a5ca2190ccf82a600245a0e21848abd9a33ea937a81b2ba9c7e518b24291080a3d3c4b8e6d02f51523e5cf2e78680e4b351c4f2bcd8f122c58f62c14418 SHA512 913431f0fa648731efa2e9bc87c9431a28816b0eca12e1c6df6e7ab04a4148ddd8fa03c9792335ad152b05bede5b9fe64ce94a393b5e4e37d4b18f4989b0ccdb EBUILD percona-xtrabackup-2.4.10.ebuild 2055 BLAKE2B 9fc3b57d1f24e80c5925eff40aa0822a1742756f897f1980341fe2778c47b12a35102422c703cbc44f5734377c8be2678ea0c05a32caf0f0fa34d631eaf31199 SHA512 5fe655f9fba940d50af9b633d4f5f8b6d88eb9add49ee5fa1233bd71e1f67f60b998b3775800e527f54c4f8fd4c39c527eb48fa8badaddac257622615dece9f8 -EBUILD percona-xtrabackup-2.4.7.ebuild 1757 BLAKE2B 7c6066f3b07036640671fd0d647bc1ec3c1752f20b2c634af72eb243ad9ab0e3fdba12ba9da36beeb1493119627e6d1bce002ce3591361edab3aea2945d10bff SHA512 12837447a0a2f63db110d93b7f736658e6c34aaf478bf1d94589ef48d881fea24085b55c1a71aeea85a315ac3843309292ef35a95d566b19dbf2971f62d8bf48 -EBUILD percona-xtrabackup-2.4.8.ebuild 1804 BLAKE2B ff7c593ef58016456633261f0fe4c0ebf918e077c6f8c98470422373f687c968a98a312571c332e50df1146bfd0fc202879f65891d124a40ccb27553b113534b SHA512 d598f38cc0266ca845b81a83a273f83e59dd44aa797ab22602be86e01572af021f28b07c8b1aca0497cdd5752bacc5572c76aa4e3c00a55aa82124b03eb20480 +EBUILD percona-xtrabackup-2.4.11.ebuild 2055 BLAKE2B 99a8568224308799d84c2ccfbebb1935e065b53ae2bdd3ca07e3cb33d5be6b53042389483941e06a7d58284a79bd09b96c15584456fbb051c516b5979c9d8117 SHA512 d353ded350a186cd244e8fdda2081cfe79bc78ee0a5ea4a9104afd4795b7a827096dec0ada7e1d268561cf910da0004b0015ac0b2e20a333bb972b15895c7bde EBUILD percona-xtrabackup-2.4.9.ebuild 1804 BLAKE2B db219c17e234b628a1730f23fa96f1766353b0de1615f1f93cc3b5ebb45faf405ea31215547fe0c1778dd65e48b743ea2b68727792695ca014e2d6f13bc20839 SHA512 25a54c649707d02e84ae5504122d725b1045fed258ed12d3643022c5d03fa1a008f13982cb7c5dbb02d212225ba8230057634dc867ab082bc9fc9692155c2dc2 MISC metadata.xml 563 BLAKE2B 5c657288a3cd0ece118920159db14756bad6a2faa308e5495cdf1eca6dd160dfbd05c979857fd55a031bc0acacdc7a81db628c0ca31a9b2d3dae226838e2abf5 SHA512 050e1a78c8c7f4b024b207754005dcec28188697b3be2d93c30f800f8a91da1a3376b4501a4a6e061dcd096a958a9a4cba62251f5003b2056dfadee5bfda6716 diff --git a/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch new file mode 100644 index 000000000000..4fed659cdae6 --- /dev/null +++ b/dev-db/percona-xtrabackup/files/percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch @@ -0,0 +1,113 @@ +Do not use -isystem to add headers, as they break GCC 6's header wrapping. +See also: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 + +diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt +index dbf1c48..e5d7347 100644 +--- a/client/CMakeLists.txt ++++ b/client/CMakeLists.txt +@@ -52,7 +52,7 @@ IF(NOT WITHOUT_SERVER) + upgrade/program.cc + ) + ADD_COMPILE_FLAGS( +- upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ upgrade/program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) +diff --git a/client/base/CMakeLists.txt b/client/base/CMakeLists.txt +index b206de7..91cce4c 100644 +--- a/client/base/CMakeLists.txt ++++ b/client/base/CMakeLists.txt +@@ -49,7 +49,7 @@ ADD_COMPILE_FLAGS( + mutex.cc + mysql_query_runner.cc + show_variable_query_extractor.cc +- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + + TARGET_LINK_LIBRARIES(client_base mysqlclient) +diff --git a/client/dump/CMakeLists.txt b/client/dump/CMakeLists.txt +index fdbb631..bae2ce7 100644 +--- a/client/dump/CMakeLists.txt ++++ b/client/dump/CMakeLists.txt +@@ -50,7 +50,7 @@ IF(USING_LOCAL_BOOST) + + ADD_COMPILE_FLAGS( + ${BOOST_LIB_SOURCES} +- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + + IF(HAVE_clock_gettime_IN_rt) +@@ -145,7 +145,7 @@ TARGET_LINK_LIBRARIES(mysqlpump_lib + + ADD_COMPILE_FLAGS( + ${MYSQLPUMP_LIB_SOURCES} +- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + + # Files that use Boost sources that trigger compilation warnings +@@ -179,7 +179,7 @@ ADD_COMPILE_FLAGS( + ) + MYSQL_ADD_EXECUTABLE(mysqlpump program.cc) + ADD_COMPILE_FLAGS( +- program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ program.cc COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + + TARGET_LINK_LIBRARIES(mysqlpump mysqlpump_lib ${LOCAL_BOOST_LIB}) +diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt +index 44c1d26..dac03d9 100644 +--- a/libmysqld/CMakeLists.txt ++++ b/libmysqld/CMakeLists.txt +@@ -123,7 +123,7 @@ ADD_COMPILE_FLAGS( + ../sql/item_geofunc_setops.cc + ../sql/item_json_func.cc + ../sql/spatial.cc +- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + + ADD_COMPILE_FLAGS( +diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt +index 1d1231f..9a35fa8 100644 +--- a/sql/CMakeLists.txt ++++ b/sql/CMakeLists.txt +@@ -312,7 +312,7 @@ ADD_COMPILE_FLAGS( + item_geofunc_setops.cc + item_json_func.cc + spatial.cc +- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + + ADD_COMPILE_FLAGS( +diff --git a/unittest/gunit/CMakeLists.txt b/unittest/gunit/CMakeLists.txt +index f0123b8..f2169f9 100644 +--- a/unittest/gunit/CMakeLists.txt ++++ b/unittest/gunit/CMakeLists.txt +@@ -385,7 +385,7 @@ IF (MERGE_UNITTESTS) + ENDIF() + ADD_COMPILE_FLAGS( + ${MERGE_SMALL_TESTS} +- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + # Fixes "C1128: number of sections exceeded object file format limit" in MSVC + IF(WIN32) +@@ -467,11 +467,11 @@ ENDIF(MERGE_UNITTESTS) + ENDIF() + ADD_COMPILE_FLAGS( + bounded_queue-t.cc +- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + ADD_COMPILE_FLAGS( + pump_object_filter-t.cc +- COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -isystem ${BOOST_INCLUDE_DIR} ++ COMPILE_FLAGS -I${BOOST_PATCHES_DIR} -I${BOOST_INCLUDE_DIR} + ) + + FOREACH(test ${SERVER_TESTS}) diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.8.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.11.ebuild index a7de4a224d03..8842c1a74b73 100644 --- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.8.ebuild +++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/s LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" DEPEND=" app-arch/lz4:0= @@ -25,7 +25,7 @@ DEPEND=" dev-libs/libgpg-error dev-python/sphinx net-misc/curl - sys-libs/zlib" + sys-libs/zlib:=" RDEPEND=" ${DEPEND} @@ -34,16 +34,16 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch - "${FILESDIR}"/${PN}-2.4.6-fix-gcc6-isystem.patch + "${FILESDIR}"/${PN}-2.4.11-fix-gcc6-isystem.patch ) src_prepare() { cmake-utils_src_prepare - # remove bundled lz4, boost, libedit, libevent, zlib + # 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 \ - extra/lz4 \ include/boost_1_59_0 \ cmd-line-utils/libedit \ libevent \ @@ -57,6 +57,10 @@ src_configure() { # 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_EDITLINE=system diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.7.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.7.ebuild deleted file mode 100644 index 7a3720c1107d..000000000000 --- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.7.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# 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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -DEPEND=" - app-arch/lz4:0= - app-editors/vim-core - <dev-libs/boost-1.65.0:= - dev-libs/libaio - <dev-libs/libedit-20170329.3.1 - 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/xtrabackup-bin - dev-perl/DBD-mysql" - -PATCHES=( - "${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch - "${FILESDIR}"/${PN}-2.4.6-fix-gcc6-isystem.patch -) - -src_prepare() { - cmake-utils_src_prepare - - # remove bundled lz4, boost, libedit, libevent, zlib - # just to be safe... - rm -r extra/lz4 include/boost_1_59_0 \ - 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 - - local mycmakeargs=( - -DBUILD_CONFIG=xtrabackup_release - -DWITH_EDITLINE=system - -DWITH_LIBEVENT=system - -DWITH_LZ4=system - -DWITH_SSL=bundled # uses yassl, which isn't packaged - -DWITH_ZLIB=system - -DWITH_PIC=ON - ) - 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/xtrabackup-bin/Manifest b/dev-db/xtrabackup-bin/Manifest deleted file mode 100644 index 5e30df5256e1..000000000000 --- a/dev-db/xtrabackup-bin/Manifest +++ /dev/null @@ -1,16 +0,0 @@ -DIST percona-xtrabackup-2.4.10-Linux-i686.libgcrypt20.tar.gz 84004091 BLAKE2B 0fde32a53aaba54d71e34b729ba4d3dc94c21d8852a4c87da221b6967b6e9c6b59c7fc4966724cbdf3fd474082b3e14717dc34b30b3f235b2271c0f7fdbf52e8 SHA512 07e75c0770736f2566d44395a5ed455b5f90a64244754e621e9c90d8e7a0ad3fe1d7a05037b9f0ecba53b821a8f1ad4d51914ef0b414ae470091ccd489379b19 -DIST percona-xtrabackup-2.4.10-Linux-x86_64.libgcrypt20.tar.gz 86736776 BLAKE2B b55915b1ad34bb55668b90de2441502491e98d2a685932848e756ea61562592416a05eba33d0c6df2bcad9f113b867b64eca39813a3683b25c18574535ba2b70 SHA512 1293e9511e09cd8cac2ef2a117282d3f79573974b7b7c3ffe6e80fe1c57edb27f32fe19e14c0ea643084c62ad83f6e5e25b5f01671628735fae940fcfb7795f1 -DIST percona-xtrabackup-2.4.4-Linux-i686.tar.gz 80913003 BLAKE2B b3e5a01408b5d9ce74973ab0d82cd786eda585ab9609e05cd78869058e257e6adee3f280b1ca58cb1091b70a6f78b93bb7007c9e92b8b46d02add218f60ac09a SHA512 88ab0c46a6bdb4c524e66f5f58a8a32f5cb0b728129eadda4c5002625c4fcedd48f4c6328af3745bcdae5a6c2d17c77dbd72b860b35728f16379d3f98add412a -DIST percona-xtrabackup-2.4.4-Linux-x86_64.tar.gz 82348558 BLAKE2B 43ab9e1def80806f55e5513a711f848c0c6c8122b1e8e86af39ac8d213bb794eb6d8c253806707f6615f2bc80eb8a3de2eb1233a1602700d4edc6d1d647e7398 SHA512 265ffc8a6976daaa8de2a22e1db2a15734fcbfe4881cb3482130fccbc69bda7302b013adb2c52cf93a1881baaaec2b08e98f3e5252b295802a426a2597960039 -DIST percona-xtrabackup-2.4.6-Linux-i686.tar.gz 80985248 BLAKE2B 5c946c4986713e98a9766323d3b10721c7edfd3d52e44f518b919ff178a7f41b68043dc783f9525e40398ea43a2da1582d57b5452e8a3929eb6af6b917ac304a SHA512 89e41b4aadf4506d6bc5ce99d6fdee9a6ef3456e6a8ffc0db0f421792d64d8df109557eca84f841825807b5b27077b7c194efa08c1b33ea7b41e65d6935d0b73 -DIST percona-xtrabackup-2.4.6-Linux-x86_64.tar.gz 82382422 BLAKE2B 5dc098f30f9ed370a7b44ad2561fb9c5b75bdf7810908a350b936497465c536c3366ede7135afde1cacff6d25a79df7c8979c8667fe64d5af56edb00818552e1 SHA512 7299f7e47417e62fdad5fdfb0637d4ba7e94e0804207ad690cd8573fc83e5eea15d0c5504bc084f24cec074765f51fafdb780115bbd336dd7e36ad123fae218e -DIST percona-xtrabackup-2.4.8-Linux-i686.tar.gz 79705968 BLAKE2B e10625d8082cfc683151bf011df7050f4618038b4babbe660bb36068de99b7e8f5da73972e72801947fd805bc0e764e8a11be027de59cd4300671ee69291e112 SHA512 8c1025e56ec0d6d6e73cf13f22858a81ce5390a691d5bf1989b42162c0b93837f73616ead294c5f14838b461b5124d2d9cbb6650ab9b089f1820a327a7bc4341 -DIST percona-xtrabackup-2.4.8-Linux-x86_64.tar.gz 81550220 BLAKE2B 7314b08deae3213c1e94404ace7c3f1397c948da1656ce623d31aa925c495d0dccff23f5102e111f336436452f18b5a3a64e56074beec396b43aef61373ab693 SHA512 e89d5cacb80022e1e427d0837137f14b9284e92277cde2f2365d1e4ede4d63d98c990dbc4ab65c8062f144d8a1644c2b9c9adebc220d6d251c9f00a2f2f53bfc -DIST percona-xtrabackup-2.4.9-Linux-i686.tar.gz 79816483 BLAKE2B 0fd97ee14c97f66edf629fa0300bfa2d6b333ac5942f5cee46dd9d0ad04ef2fe12750209971ff8f6a8ca225a85deaa42ca64c484e12e60c85789153689e55c42 SHA512 014921b0ea9fec783adbdd4556301e8df77f801729faae5b2b7245c349df069fc3af33ebef5ec65ef0e020c7b0ec8ebf4aa7a7acc0e9936c6f4a90b721a5de19 -DIST percona-xtrabackup-2.4.9-Linux-x86_64.tar.gz 90282874 BLAKE2B 2c4cdb8c6da443baf01857fbe4b27be002df370b67687f417a9fde6b08a5e72482552b165a9f27fda305787b42089fb138a4fca2f1d683afbd42efa23746b13c SHA512 24138c098d8e674de291dc494c38f2fce52f4d6a5a2552a62b34ea801b867431917449656f990043c7bbbc1e18a8806c4343eadbe1fea17e36ff1b10109e5047 -EBUILD xtrabackup-bin-2.4.10.ebuild 1538 BLAKE2B 0c44410037638571bca4c4507a0986c13640d20d745d7ecba98e6170247219a94357b3b65158a5905a1661a65cc3693474dbf2b80ae3d258dba5e1b449f84ef0 SHA512 108fb87232ab7f81608cbeda64ac55b3c42c84736109dd9e64cd831613e884e3d9e60ac049a430ebc77986ccb08e82fc04e34de43593bfc8ef39ea90edddf9fc -EBUILD xtrabackup-bin-2.4.4.ebuild 1467 BLAKE2B 25a1c2fbd6559f68cb4c20d3e05c69f4de1e3e0bb6887e9e764fe37ddd2b2d4d3f05c460455fc78dd4ee946c75611ae1022bfc8da3da61c7163ca01f17253d40 SHA512 cb611868afef4ada30674f1061e1b0d64158eb76013a54c055d04b7d2f8e6c667dd612a0db9d612699bdf4e162f16e0f9426b503b879b87ab9133b71a70c24b1 -EBUILD xtrabackup-bin-2.4.6.ebuild 1469 BLAKE2B 9488fe85f0e59cf753153a78c09a1c69721a6d30628f54a0ee1141fadcc5b293b286dea017caa6e109adbe5e43000af12f22120ecd9f8ce199f8651789930ab8 SHA512 015dc6f0f1a09839a3eeb9686ce33fb68abbdcbad45cb8a542376696117dd93bae52e9634788af9a430066bef903dc9ec44ef70497ba83c7df0790f2fb018f39 -EBUILD xtrabackup-bin-2.4.8.ebuild 1469 BLAKE2B 9488fe85f0e59cf753153a78c09a1c69721a6d30628f54a0ee1141fadcc5b293b286dea017caa6e109adbe5e43000af12f22120ecd9f8ce199f8651789930ab8 SHA512 015dc6f0f1a09839a3eeb9686ce33fb68abbdcbad45cb8a542376696117dd93bae52e9634788af9a430066bef903dc9ec44ef70497ba83c7df0790f2fb018f39 -EBUILD xtrabackup-bin-2.4.9.ebuild 1469 BLAKE2B 9488fe85f0e59cf753153a78c09a1c69721a6d30628f54a0ee1141fadcc5b293b286dea017caa6e109adbe5e43000af12f22120ecd9f8ce199f8651789930ab8 SHA512 015dc6f0f1a09839a3eeb9686ce33fb68abbdcbad45cb8a542376696117dd93bae52e9634788af9a430066bef903dc9ec44ef70497ba83c7df0790f2fb018f39 -MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.4.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.4.ebuild deleted file mode 100644 index 2b69d9bb82fb..000000000000 --- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.4.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 - -MY_PN="percona-${PN/-bin}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases" -HOMEPAGE="https://www.percona.com/software/percona-xtrabackup" -SRC_URI=" - amd64? ( - https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.tar.gz - ) - x86? ( - https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.tar.gz - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# NOTE: dev-perl/DBD-mysql still necessary, now for bin/xtrabackup? -DEPEND="" -RDEPEND="dev-libs/libaio - dev-libs/libgcrypt:11/11 - dev-libs/libgpg-error - dev-perl/DBD-mysql - sys-libs/zlib" - -src_unpack() { - default - - if use amd64; then - S="${WORKDIR}/${MY_P}-Linux-x86_64" - elif use x86; then - S="${WORKDIR}/${MY_P}-Linux-i686" - fi -} - -src_install() { - # Two new tools with an old libcurl.so.3 dep... - # TODO: Wait for a new release using libcurl.so.4 - # net-misc/curl dev-libs/libev - # dobin bin/xbcloud{,_osenv} - - for tool in xbcrypt xbstream xtrabackup; do - dobin bin/${tool} - done - - for man in innobackupex xbcrypt xbstream xtrabackup; do - doman man/man1/${man}.1 - done - - dosym xtrabackup /usr/bin/innobackupex -} - -pkg_postinst() { - ewarn "innobackupex got deprecated in 2.3.x series and is just a symlink to xtrabackup" -} diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.9.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.9.ebuild deleted file mode 100644 index 734bbe0fa11e..000000000000 --- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.4.9.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" - -MY_PN="percona-${PN/-bin}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="MySQL hot backup software. non-blocking backups for InnoDB/XtraDB databases" -HOMEPAGE="https://www.percona.com/software/percona-xtrabackup" -SRC_URI=" - amd64? ( - https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-x86_64.tar.gz - ) - x86? ( - https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PV}/binary/tarball/${MY_P}-Linux-i686.tar.gz - )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# NOTE: dev-perl/DBD-mysql still necessary, now for bin/xtrabackup? -DEPEND="" -RDEPEND="dev-libs/libaio - dev-libs/libgcrypt:11/11 - dev-libs/libgpg-error - dev-perl/DBD-mysql - sys-libs/zlib" - -src_unpack() { - default - - if use amd64; then - S="${WORKDIR}/${MY_P}-Linux-x86_64" - elif use x86; then - S="${WORKDIR}/${MY_P}-Linux-i686" - fi -} - -src_install() { - # Two new tools with an old libcurl.so.3 dep... - # TODO: Wait for a new release using libcurl.so.4 - # net-misc/curl dev-libs/libev - # dobin bin/xbcloud{,_osenv} - - for tool in xbcrypt xbstream xtrabackup; do - dobin bin/${tool} - done - - for man in innobackupex xbcrypt xbstream xtrabackup; do - doman man/man1/${man}.1 - done - - dosym xtrabackup /usr/bin/innobackupex -} - -pkg_postinst() { - ewarn "innobackupex got deprecated in 2.3.x series and is just a symlink to xtrabackup" -} |