gentoo resync : 20.03.2022

3 files changed, 51 insertions, 28 deletions

diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 644920b27918..ecf36ecd1cfc 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,7 +1,8 @@
 AUX mydumper-0.10.5-atomic.patch 955 BLAKE2B 9405d3b1272bd913e7d570142fee01533323c18238e5a3f62205b3bd54da6c1d36df4adefbfffa1abfe8ccd51e28483ec48a7cb41058f9285f25625273d78c0e SHA512 82cadd013ccfd338f48ff109e58c64e74244fd922495b4cf764ed13408ef182694edee2ddcaf31fbe32e29ec7c4ef4d526613f8aeab3d23570ecd8469c3035d5
-AUX mydumper-atomic.patch 948 BLAKE2B 78bc073083a44ad21346e419de6f76195d3e9c16877a7851db6cea6e738ddeee06ff8ce255d067a9321c8a687c2e99c3f36caa84d9a3ef017a045261f81d4f13 SHA512 6c9a9a8378aec435431ac84cc530b880616e5e1df823525eebe4f813c6e0e73eeb0408bff4379b295a1fb095c91a4b1eaea83aa4d8a7bb2e159143ce7a579a90
 DIST mydumper-0.11.1-3.tar.gz 77589 BLAKE2B 5b5a6965ee07fb265e2f3dad288195035554c02da49337ed008b01b6a5f5d399769e67c00f57f4531ed1a1b14233829f617f4bbfb45abb904f1f3054a41b0b01 SHA512 70f5e4dac5af4e016bfc85d8befa2eebbe9e5c1a6b2ee1ccbd491bed29e2625202aee7961ead41d0cf432b23e8ce06dfa4474587663b35fbbdd5bffabc32ae2e
 DIST mydumper-0.11.3-5.tar.gz 105032 BLAKE2B 722938bf88fdea17804542c28f0613f4e792fece7fcc03b1c27bc9bf52ab4ffb235472a07a13761339ce4db0b6b3b320daaf8924990878752227c5d891a5eb15 SHA512 8eb99c3a949f6547badfe6a291fa63819f4fb3844e7dcf797a9d741e7df7912c6f0006a3ca694c4ad5b5d7efe2bde86c7fdd3c98a3c4a987cc99d8dfcb331f7c
+DIST mydumper-0.11.5-2.tar.gz 110088 BLAKE2B c9e2f56ce7cc206f311ba00fd82e96479cd0313d99260ae27130489b5aa02e0b465c96900e41e9eb017d68022501bf327495ae39c8a64b330dc1072b3fb5ca9b SHA512 f600c086c7e3402c3d35070709c5968e30046be5fc351e67dca05d2d7c48565e68ccbba08cf01195aa4d2ae3f2bdf8df84338d4f44a40504b583959fb67e72d8
 EBUILD mydumper-0.11.1.3.ebuild 1102 BLAKE2B e91d45b8773d91af63c6688b12b87f39c4538d48216b6583f44b6b9c58366971392e37cfdfb15a4e595b70639ab33f9dcecf6c1ff134bca9179c0f454ee3d139 SHA512 6be8ff2856833ce2a3a8252abdc09b030e421cbadf0eb6631964a9495ff750ac56811c4294b9196180def85abad0ddebeb627ebe7b77f37a849aae942ce71218
 EBUILD mydumper-0.11.3.5.ebuild 1103 BLAKE2B 8d0b27e49c8334030907ce1b96d49c1bbd1a37a82840a2619064201ff636d8d7a2b2e48832ff4a18bce5333455c948cbb9bfb97ab499e0416b88339f3b0e25ac SHA512 db64fc1e96b46cece40e14642d95f2c33b16e410c65458a9f0f807218c38b238aa823dcf87a32680b048605c9d7d78479f9f7fc97dac622e86a71df4fd83bac3
+EBUILD mydumper-0.11.5.2.ebuild 1105 BLAKE2B d1978ef0acaa9bcae511713c85815ed326ad1ab64adb8dd5c2b06093b66f560a5d195aa4ee4bd2afb723e447aceb7b73c93ec2094eba67add8ee15cc664e7745 SHA512 14a228e46f49d0816f456ea9ce157fe4e88209e59f7be65fc7397c493822ca1c23f958aea4a7dad629fdcd79f93a5efa1a1da5b690d84ef136111b94658d2b13
 MISC metadata.xml 479 BLAKE2B a45a9746e2f5be11c4cd992e81135c8b39fa494c105f1f3c01586482b635596f1384690d0d1bfa3f08b8e33d1bd64b625fba07f410b8a8220a9a19f7f048f2dd SHA512 b0f20f8fb1b5eb3771d9a59869a3a28b0011642721dd12b5545b4f80456556f2f7a9da3b4b69c85cfae666534bad6143ae437b43b45179544626455a03b9218a
diff --git a/dev-db/mydumper/files/mydumper-atomic.patch b/dev-db/mydumper/files/mydumper-atomic.patch
deleted file mode 100644
index 405e6883fbcb..000000000000
--- a/dev-db/mydumper/files/mydumper-atomic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
-index 23470a8..2b8ae63 100644
---- a/cmake/modules/FindMySQL.cmake
-+++ b/cmake/modules/FindMySQL.cmake
-@@ -85,20 +85,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
- 
- set(TMP_MYSQL_LIBRARIES "")
- set(CMAKE_FIND_LIBRARY_SUFFIXES .so .a .lib .so.1)
--foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
--    find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
--        HINTS
--        ${MYSQL_ADD_LIBRARY_PATH}
--        /usr/lib/mysql
--	/usr/lib
--        /usr/local/lib
--        /usr/local/lib/mysql
--        /usr/local/mysql/lib
--    )
--    list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}")
--endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES})
--
--set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
-+
-+set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL)
- 
- if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
-     set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")
diff --git a/dev-db/mydumper/mydumper-0.11.5.2.ebuild b/dev-db/mydumper/mydumper-0.11.5.2.ebuild
new file mode 100644
index 000000000000..72f86aa467fe
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.11.5.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake
+
+MY_PV="$(ver_rs 3 -)"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
+HOMEPAGE="https://github.com/maxbube/mydumper"
+SRC_URI="https://github.com/maxbube/mydumper/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="app-arch/zstd
+	dev-db/mysql-connector-c:=
+	dev-libs/glib:2
+	dev-libs/libpcre
+	dev-libs/openssl:=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.10.5-atomic.patch" #654314
+)
+
+src_prepare() {
+	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
+	sed -i -e 's|-O3 -g -Werror|${CMAKE_C_FLAGS}|' CMakeLists.txt || die
+
+	# fix doc install path
+	sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(-DBUILD_DOCS=$(usex doc))
+
+	cmake_src_configure
+}