Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/, dev-db/mydumper/files/
Date: Fri, 28 May 2021 19:24:00
Message-Id: 1622229833.291fd90c8bc3a9dd9e8fc24b7fd6f64030669528.whissi@gentoo
1 commit: 291fd90c8bc3a9dd9e8fc24b7fd6f64030669528
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Fri May 14 14:30:42 2021 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Fri May 28 19:23:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=291fd90c
7
8 dev-db/mydumper: bump to 0.10.5
9
10 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/20804
12 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
13
14 dev-db/mydumper/Manifest | 1 +
15 dev-db/mydumper/files/mydumper-0.10.5-atomic.patch | 27 +++++++++++++
16 dev-db/mydumper/mydumper-0.10.5.ebuild | 45 ++++++++++++++++++++++
17 3 files changed, 73 insertions(+)
18
19 diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
20 index 6e72aa713bf..445dd2908e1 100644
21 --- a/dev-db/mydumper/Manifest
22 +++ b/dev-db/mydumper/Manifest
23 @@ -1,3 +1,4 @@
24 DIST mydumper-0.10.1.tar.gz 63967 BLAKE2B ad2876eb4fd6528c119d722e70b096d12698119e6d84737601d7bc0e71022926f579d21456b73b8ff1d384c961256538467badeaceaf60a92b333196a17dda10 SHA512 dbcb207c8ac61b286cd4464a3f2c67ea6972d1cab215c09a577cdf621f685011cc26e1e36399b72be2a8165b4e4c518b401be928b6a1a31e35d2f27c169dcc18
25 DIST mydumper-0.10.3.tar.gz 64622 BLAKE2B 14020b6bbb72271659dec965de164274e2bf81c72b52fa7c1d6997f393d1c0cc977d06d689bb7d7c6e3da86926add2c61f1551afdd30be71ddc97c4803d4e455 SHA512 d7cf6897815de3d46ec15cbcacc393722f7d547300a45e70960e47b8ce30e06a5e652f52a0ff8999d2ac3662b4a48927aadbab464668ac23f446eee95ba574cf
26 +DIST mydumper-0.10.5.tar.gz 66399 BLAKE2B 77bba97580bcdb267d77be455f56831209a29b71389337c844e4e0cb37749dc22d000d3845e936f5d589951a21ad61bf19cd3b9084004a62aa1b33f16f81b5a0 SHA512 61127c4b9ae5a01111d431672ec3818a6c3db74704ac5db12d286e380273968b8b9e56298ac73eb6c1c32649875fd2ee01d099a73c99cb9c8d4604eaf0eedb09
27 DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
28
29 diff --git a/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch b/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch
30 new file mode 100644
31 index 00000000000..6dc7fb5fd29
32 --- /dev/null
33 +++ b/dev-db/mydumper/files/mydumper-0.10.5-atomic.patch
34 @@ -0,0 +1,27 @@
35 +diff --git a/cmake/modules/FindMySQL.cmake b/cmake/modules/FindMySQL.cmake
36 +index 23470a8..2b8ae63 100644
37 +--- a/cmake/modules/FindMySQL.cmake
38 ++++ b/cmake/modules/FindMySQL.cmake
39 +@@ -85,20 +85,8 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
40 +
41 + set(TMP_MYSQL_LIBRARIES "")
42 + set(CMAKE_FIND_LIBRARY_SUFFIXES .so .lib .so.1 .dylib .a)
43 +-foreach(MY_LIB ${MYSQL_ADD_LIBRARIES})
44 +- find_library("MYSQL_LIBRARIES_${MY_LIB}" NAMES ${MY_LIB}
45 +- HINTS
46 +- ${MYSQL_ADD_LIBRARY_PATH}
47 +- /usr/lib/mysql
48 +- /usr/lib
49 +- /usr/local/lib
50 +- /usr/local/lib/mysql
51 +- /usr/local/mysql/lib
52 +- )
53 +- list(APPEND TMP_MYSQL_LIBRARIES "${MYSQL_LIBRARIES_${MY_LIB}}")
54 +-endforeach(MY_LIB ${MYSQL_ADD_LIBRARIES})
55 +-
56 +-set(MYSQL_LIBRARIES ${TMP_MYSQL_LIBRARIES} CACHE FILEPATH INTERNAL)
57 ++
58 ++set(MYSQL_LIBRARIES ${MYSQL_ADD_LIBRARIES} CACHE FILEPATH INTERNAL)
59 +
60 + if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
61 + set(MYSQL_FOUND TRUE CACHE INTERNAL "MySQL found")
62
63 diff --git a/dev-db/mydumper/mydumper-0.10.5.ebuild b/dev-db/mydumper/mydumper-0.10.5.ebuild
64 new file mode 100644
65 index 00000000000..a9e9ab55b39
66 --- /dev/null
67 +++ b/dev-db/mydumper/mydumper-0.10.5.ebuild
68 @@ -0,0 +1,45 @@
69 +# Copyright 1999-2021 Gentoo Authors
70 +# Distributed under the terms of the GNU General Public License v2
71 +
72 +EAPI=7
73 +
74 +inherit cmake
75 +
76 +DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
77 +HOMEPAGE="https://github.com/maxbube/mydumper"
78 +SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
79 +
80 +LICENSE="GPL-3"
81 +SLOT="0"
82 +KEYWORDS="~amd64 ~x86"
83 +IUSE="doc"
84 +
85 +RDEPEND="app-arch/zstd
86 + dev-db/mysql-connector-c:=
87 + dev-libs/glib:=
88 + dev-libs/libpcre:=
89 + dev-libs/openssl:0=
90 + sys-libs/zlib:="
91 +DEPEND="${RDEPEND}"
92 +BDEPEND="virtual/pkgconfig
93 + doc? ( dev-python/sphinx )"
94 +
95 +PATCHES=(
96 + "${FILESDIR}/${P}-atomic.patch" #654314
97 +)
98 +
99 +src_prepare() {
100 + # respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
101 + sed -i -e 's|-Werror -O3 -g|${CMAKE_C_FLAGS}|' CMakeLists.txt || die
102 +
103 + # fix doc install path
104 + sed -i -e "s|share/doc/mydumper|share/doc/${PF}|" docs/CMakeLists.txt || die
105 +
106 + cmake_src_prepare
107 +}
108 +
109 +src_configure() {
110 + local mycmakeargs=("-DBUILD_DOCS=$(usex doc)")
111 +
112 + cmake_src_configure
113 +}