gentoo (valentine's day) resync : 14.02.2021

5 files changed, 12 insertions, 84 deletions

diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index b18e9f838f60..05cad9e3f9c0 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,8 +1,6 @@
 AUX mydumper-atomic.patch 948 BLAKE2B 78bc073083a44ad21346e419de6f76195d3e9c16877a7851db6cea6e738ddeee06ff8ce255d067a9321c8a687c2e99c3f36caa84d9a3ef017a045261f81d4f13 SHA512 6c9a9a8378aec435431ac84cc530b880616e5e1df823525eebe4f813c6e0e73eeb0408bff4379b295a1fb095c91a4b1eaea83aa4d8a7bb2e159143ce7a579a90
-AUX mydumper-mariadb-define.patch 766 BLAKE2B 26d8b037de5362bb456f19ed85d5b20cb901c63ed307b2377d58931d5fa8940bd3bb97632d3f9976bcb1723a36b8cebdc0a74723a555abc54800b3afe5fea673 SHA512 839061da9fcfc16d0729bf8ba62a5c22a03aba1c089006efd600020a8d618af0f8d962f6a3a92c5ff3acb9847d3a7944d865c035df93a567d7f21bb184e9dc53
-DIST mydumper-0.9.3.tar.gz 45320 BLAKE2B 6e6d4420ced29d4ea77aa257ee155ce0810fe7d0ac3bf22c22156dfcfba35a3c461e4115d5814b5e0050331151a5b0c3bd819c1ecc534b6644972bf76de5d004 SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898
+DIST mydumper-0.10.1.tar.gz 63967 BLAKE2B ad2876eb4fd6528c119d722e70b096d12698119e6d84737601d7bc0e71022926f579d21456b73b8ff1d384c961256538467badeaceaf60a92b333196a17dda10 SHA512 dbcb207c8ac61b286cd4464a3f2c67ea6972d1cab215c09a577cdf621f685011cc26e1e36399b72be2a8165b4e4c518b401be928b6a1a31e35d2f27c169dcc18
 DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
-EBUILD mydumper-0.9.3-r1.ebuild 1023 BLAKE2B 1b209fa847a4ed7ff7b4091e79a952f42ee0250c1748fe7cd67b60f80cbf0363c30016e04f79edc070303e6a0aae1f44d7ebee30ef3aa9c50120ebc9c9eb2f70 SHA512 460a697001f5fb2ceec2bbc23d7e9193b0ebc7fa10b1229456e4f3f3ffbd015c41815933389b4698e6fc7cad15e311ed7ce45d6046413df6b3ec7e9a7e966be7
-EBUILD mydumper-0.9.5-r1.ebuild 1055 BLAKE2B f8a5c5949143d378831c334be0ad6ed73f855cdc960701438824e5d1cc00cbdac34d8e04d1588da3e99aba7973f3c44a2ba7c341b38aed0e77252e73603cfdab SHA512 79eb47b52924ceaffa575071a1be629d5df07af5cb9238230d6c63b3ad4561a57f7a8cf5f2f5a92fe3580bbc7ba85b1ef2bfd0527d117d8e000e212540ec4495
-EBUILD mydumper-0.9.5.ebuild 1024 BLAKE2B 82e4eb89e5e9d266906b388089f6292c1bb6b93adb891a927ed8ac9f6cda6543a49ff736efdda62ccb0c310d7bea769f0f02704ab6707a3afb851160b9f891a6 SHA512 e49e1e09f402008a521dc8b9ea0ebfcde58509d080d23b58e4bdc7c5d00a45bdc4a811ef88fd088e2a9f919ade2d03ad98b702b497f047ae75046936ce48d3b7
+EBUILD mydumper-0.10.1.ebuild 1055 BLAKE2B 1fba1963ca58f425fb9319aca1507bc895eb717f8f2ffdec3741003187e0203f7493191e62d3475e057c6e2c4735ec2210355705fcd24750ac73e850740a9c16 SHA512 867fa644160a44955f4be27eb2a82bb10be73d5e1a9c80850e7ea5bf34f00410e0005bdfc963df4a94439cdc54ba8b22178481b606fa0d8d33eb94f96c6ad1dc
+EBUILD mydumper-0.9.5-r1.ebuild 1054 BLAKE2B 5561bc8e94a28d6676d6673953b970b05f062a48d25a2ef280a6cf79a9a881081b936e39260d34f46719a45085b4201511a10af0a00441008218032a5aeaafd5 SHA512 fe5ab2d9ef8f9d4067e61f376e9867bf48b49029666d7e85182aa1ad774fd9177936e311e9c31fd8835a0494712cf231e55097b393b01c084712492245f507f6
 MISC metadata.xml 448 BLAKE2B 141a4303111433ea46ec427dcf7942fae3165ea27b90c1d92f1fd4e4a82bbdea0476a7f5380250684ca763feb7ba7045bae9443329c260b0732452b3e639c5ea SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353
diff --git a/dev-db/mydumper/files/mydumper-mariadb-define.patch b/dev-db/mydumper/files/mydumper-mariadb-define.patch
deleted file mode 100644
index ee39a33be818..000000000000
--- a/dev-db/mydumper/files/mydumper-mariadb-define.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/mydumper.c	2017-09-07 14:53:02.000000000 +0000
-+++ b/mydumper.c	2017-10-25 14:53:46.614729185 +0000
-@@ -22,6 +22,11 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <mysql.h>
-+
-+#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION
-+  #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR
-+#endif
-+
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
---- a/myloader.c	2017-09-07 14:53:02.000000000 +0000
-+++ b/myloader.c	2017-10-25 14:55:34.677729185 +0000
-@@ -19,6 +19,11 @@
- #define _FILE_OFFSET_BITS 64
- 
- #include <mysql.h>
-+
-+#if defined MARIADB_CLIENT_VERSION_STR && !defined MYSQL_SERVER_VERSION
-+  #define MYSQL_SERVER_VERSION MARIADB_CLIENT_VERSION_STR
-+#endif
-+
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/dev-db/mydumper/mydumper-0.9.5.ebuild b/dev-db/mydumper/mydumper-0.10.1.ebuild
index 904232ebd4b6..5ba7f676d458 100644
--- a/dev-db/mydumper/mydumper-0.9.5.ebuild
+++ b/dev-db/mydumper/mydumper-0.10.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -13,15 +13,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
-CDEPEND="dev-libs/glib:=
+COMMON_DEPEND="dev-db/mysql-connector-c:=
+	dev-libs/glib:=
 	dev-libs/libpcre:=
 	dev-libs/openssl:0=
-	sys-libs/zlib:=
-	virtual/mysql"
-DEPEND="${CDEPEND}
+	sys-libs/zlib:="
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )"
-RDEPEND="${CDEPEND}"
+RDEPEND="${COMMON_DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-atomic.patch" #654314
diff --git a/dev-db/mydumper/mydumper-0.9.3-r1.ebuild b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
deleted file mode 100644
index 3778cfbe001a..000000000000
--- a/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A high-performance multi-threaded backup (and restore) toolset for MySQL"
-HOMEPAGE="https://github.com/maxbube/mydumper"
-SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-CDEPEND="dev-libs/glib:=
-	dev-libs/libpcre:=
-	dev-libs/openssl:0=
-	sys-libs/zlib:=
-	virtual/mysql"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )"
-RDEPEND="${CDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-mariadb-define.patch" )
-
-src_prepare() {
-	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
-	sed -i -e 's:-Werror -O3 -g:${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-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=("-DBUILD_DOCS=$(usex doc)")
-
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mydumper/mydumper-0.9.5-r1.ebuild b/dev-db/mydumper/mydumper-0.9.5-r1.ebuild
index 078613262f27..ba130fd803c8 100644
--- a/dev-db/mydumper/mydumper-0.9.5-r1.ebuild
+++ b/dev-db/mydumper/mydumper-0.9.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/maxbube/mydumper"
 SRC_URI="https://github.com/maxbube/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc"
 
 COMMON_DEPEND="dev-db/mysql-connector-c:=