gentoo resync : 28.04.2019

3 files changed, 2 insertions, 90 deletions

diff --git a/dev-db/percona-xtrabackup/Manifest b/dev-db/percona-xtrabackup/Manifest
index bbda48a3118c..2b15f1603db9 100644
--- a/dev-db/percona-xtrabackup/Manifest
+++ b/dev-db/percona-xtrabackup/Manifest
@@ -1,8 +1,6 @@
 AUX percona-xtrabackup-2.4.11-fix-gcc6-isystem.patch 4034 BLAKE2B 0ce65196d4679481d3197e95d9efc3783c1e4f37dcd602588fc3e8da5957f63cf68b9222a7ab12fe2e8fd19d69e8a24e9f86cc7dd2ba776d473a95b9279a1f24 SHA512 4dd9352b8d8ae46782925daae27cd5ad1765c5f4ab26f1f5f07fbac68f0cb83e4979009dddacd8a55ba818c93014b46dee997b43f6951820337e0cb79733f60e
 AUX percona-xtrabackup-2.4.6-remove-boost-version-check.patch 485 BLAKE2B c9330c5b0a163a0d95682a81cee9e3c99cebdb2a6ed124cb5f424ade92728b11b29685e2c1eee0fbf9df613f5a1b08cc4021daec8b60a6c66ab51b08a397b33d SHA512 31277d6bef14a6b642ce425ce9f2c92fe49f905c42c720a583cb45406c1ee18ccbf2bef224b9b89bb02de18aecc1ec48576f5ca0c9bfef0cc683d78218506906
 DIST boost_1_59_0.tar.gz 83709983 BLAKE2B 8c6676fa05fa401a6ecb3b890d95aceb4421ec48dd0eab38ce8d170c618e177c82dc67a165938f6be1a01daab24ce41888f5442dbc19ad3dd41368a01a6f89e4 SHA512 05fdbe5637543defdbc630b921515425885593d16db14534ed7b9aa60925ade8fb598d50cb894aed6dae688e789047216daa1bf03fa1aeb6b531060d9dae52ae
-DIST percona-xtrabackup-2.4.12.tar.gz 57232309 BLAKE2B 71b1dc0448b521b252463fb68ff111def3b71aebe187d3196e3c82f56539db02347d94713bea3dda5978f13b86b88a564ad6f12e3907134edc49a41dcde98e51 SHA512 228a48617eec3b824c7cb33882796ac2beb6ca1895fe73f7004e8dfd0b8bd1df471c39ba1c3fca2a819140d934a8a884f61dafae7cb56023dc7bc844d2846c8a
 DIST percona-xtrabackup-2.4.13.tar.gz 57254236 BLAKE2B 061cbee03374193359ae557909389ec675ed35edf216afc9deeb0b7880705d03024d380d0d6070aabfdb710bbde3664fd73da65ae5980e58290d8c9af29f351c SHA512 19d5fb3d775f1513b931cb2e736b753c1dd82c42fee382fdfa9f183eaee562c32f635db5d569d991cf1c8f7168de55ed863ba2c59db459ab79b80792b21ab298
-EBUILD percona-xtrabackup-2.4.12.ebuild 2058 BLAKE2B cb0c270a6ae5cb2e22e3a41ae4960861b9ffae184ad2061e7244a436dbd9f3ef26a4c63ed51357d7938930b7a531b6c63a3618ee640b733c3eec30d44b3564ee SHA512 3c768d28b20c21c4edbe8cfa40f45313ea2e2e1e4534f2e04a222953256b34370befb9513e14fd8bccd9a3e516fe3c032e431c0127890d0fd32bca2b3bbfe7c9
-EBUILD percona-xtrabackup-2.4.13.ebuild 2084 BLAKE2B fe6f7ecc7c2c401d0a90aac9df4bb5db85242946676b332c345562c5af9a6484f283131fd3996495ae9843caa3fee2ae317035ecde485f11f7911e3dfa6fe704 SHA512 6ba6a87f46e9661caea8e8741295b61de8c4b77191fc70e9432a780d13f950b6a82b4b5795a6a681dd29516e888cd8b2a10a02ba495d55d49d26c901c65f2fca
+EBUILD percona-xtrabackup-2.4.13.ebuild 2082 BLAKE2B 88bdf030af98129fdc5053bb808f9779d5ee8d3223901826b1d9665d2d76ef686db42d24337bfe02dd0bc49eb185c0271f724e6a7a275504bfeb1c0a73806f41 SHA512 0674ab6381326d68b5857253aa002d9132b65a407e8452a095c1811793064366f8a18300b6e1589cee4dfdeca0d8171213f75412cc0a7a0d1548fdb96e8e0897
 MISC metadata.xml 563 BLAKE2B 5c657288a3cd0ece118920159db14756bad6a2faa308e5495cdf1eca6dd160dfbd05c979857fd55a031bc0acacdc7a81db628c0ca31a9b2d3dae226838e2abf5 SHA512 050e1a78c8c7f4b024b207754005dcec28188697b3be2d93c30f800f8a91da1a3376b4501a4a6e061dcd096a958a9a4cba62251f5003b2056dfadee5bfda6716
diff --git a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.12.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.12.ebuild
deleted file mode 100644
index 00fa92ff8fb4..000000000000
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.12.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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"
-
-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/percona-xtrabackup-bin
-	dev-perl/DBD-mysql"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.6-remove-boost-version-check.patch
-	"${FILESDIR}"/${PN}-2.4.11-fix-gcc6-isystem.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# 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 \
-		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
-
-	# 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
-		-DWITH_LIBEVENT=system
-		-DWITH_LZ4=system
-		-DWITH_SSL=bundled # uses yassl, which isn't packaged
-		-DWITH_ZLIB=system
-		-DWITH_PIC=ON
-	)
-
-	local CMAKE_BUILD_TYPE="Release"
-	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/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild
index b30c9c1a026b..d47037bbe0c4 100644
--- a/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild
+++ b/dev-db/percona-xtrabackup/percona-xtrabackup-2.4.13.ebuild
@@ -12,7 +12,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=