gentoo resync : 25.05.2018

4 files changed, 74 insertions, 39 deletions

diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index f9e647b177ad..e597f188c9c4 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,6 +1,7 @@
+AUX mydumper-atomic.patch 948 BLAKE2B 78bc073083a44ad21346e419de6f76195d3e9c16877a7851db6cea6e738ddeee06ff8ce255d067a9321c8a687c2e99c3f36caa84d9a3ef017a045261f81d4f13 SHA512 6c9a9a8378aec435431ac84cc530b880616e5e1df823525eebe4f813c6e0e73eeb0408bff4379b295a1fb095c91a4b1eaea83aa4d8a7bb2e159143ce7a579a90
 AUX mydumper-mariadb-define.patch 766 BLAKE2B 26d8b037de5362bb456f19ed85d5b20cb901c63ed307b2377d58931d5fa8940bd3bb97632d3f9976bcb1723a36b8cebdc0a74723a555abc54800b3afe5fea673 SHA512 839061da9fcfc16d0729bf8ba62a5c22a03aba1c089006efd600020a8d618af0f8d962f6a3a92c5ff3acb9847d3a7944d865c035df93a567d7f21bb184e9dc53
-DIST mydumper-0.6.2.tar.gz 40165 BLAKE2B a5acfaad96874cb078dda1e2f73a2b73c03c051889eee0607efb6b36ce05e2ce468b58e66688e711e1f8814b5221da1132d545cc6965b10a24f38be6291910fa SHA512 ef9e48cc481f2674456659c061c45f3cb056180ab5576805e75d458658e94998758b894e45ddc06fb716c1d37fedefb644158f07cf6e77f4b5477663e954eb83
 DIST mydumper-0.9.3.tar.gz 45320 BLAKE2B 6e6d4420ced29d4ea77aa257ee155ce0810fe7d0ac3bf22c22156dfcfba35a3c461e4115d5814b5e0050331151a5b0c3bd819c1ecc534b6644972bf76de5d004 SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898
-EBUILD mydumper-0.6.2.ebuild 949 BLAKE2B 38d86cb8cf7adbb52055c801d7ab1914b77bf147c491c52f3ecdd759cf37b6737e74fab1e7517b342cda1fc1a5c6c729a3c99417090a033039da1bc12aa8d6fa SHA512 4b5078ef47b20819915e187121d1ff42e31d910e515ab1ec70289fdc775b48ff2da50bd549cb9fbe526dd453b9d09bd5631da12206bb254613a6ed4c0f5d7818
+DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
 EBUILD mydumper-0.9.3-r1.ebuild 1025 BLAKE2B bbaf77ab28323c82103b68aeee4222bf218554e45e05ae07467c18dc69e25f43ab2b1e70ddafa69cb8f2045d85c361511016de81c8d6aa20db7cdd25ffdbe614 SHA512 5b1a7b6669e4cfc85d0e32a9a5474de7dc00c27931c72219c1cd212139f616eaf492c76e749ea3cf94f88aa31d35455783b3ceb65943f9f82f34288dc037d64a
+EBUILD mydumper-0.9.5.ebuild 1026 BLAKE2B 6ded4d30e464888593beb8bf4d06441c02e17b28ff59ddb3aa9142b42dde1ccf00b05dac0977fe514d23e1be06099c217df778976a799451982bf9ac2948985c SHA512 37776222d7cc3cbcc5b520f1731d445841028aec63899a6bbfb2c1a931b78aef3987555404955f1c2742782cd599065eefbe04b6739460fc5642d4e0e606ba84
 MISC metadata.xml 448 BLAKE2B 141a4303111433ea46ec427dcf7942fae3165ea27b90c1d92f1fd4e4a82bbdea0476a7f5380250684ca763feb7ba7045bae9443329c260b0732452b3e639c5ea SHA512 192415f225533e6195856255483cb80c5da21f496bfe048518dbfccf8cdc049339ab5322d125e627a3a84fcdfb052012fd57cbe2083118917b35796f7a9e9353
diff --git a/dev-db/mydumper/files/mydumper-atomic.patch b/dev-db/mydumper/files/mydumper-atomic.patch
new file mode 100644
index 000000000000..405e6883fbcb
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-atomic.patch
@@ -0,0 +1,27 @@
+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.6.2.ebuild b/dev-db/mydumper/mydumper-0.6.2.ebuild
deleted file mode 100644
index 8e098e7167e4..000000000000
--- a/dev-db/mydumper/mydumper-0.6.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils versionator
-
-DESCRIPTION="A high-performance multi-threaded backup toolset for MySQL and Drizzle"
-HOMEPAGE="https://launchpad.net/mydumper"
-SRC_URI="https://launchpad.net/mydumper/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND="dev-libs/libpcre
-	virtual/mysql
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( <dev-python/sphinx-1.3 )"
-
-DOCS=( README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
-	sed -i -e 's:-Werror -O3 -g:${CMAKE_C_FLAGS}:' CMakeLists.txt
-	# fix doc install path
-	sed -i -e "s:share/doc/mydumper:share/doc/${PF}:" docs/CMakeLists.txt
-}
-
-src_configure() {
-	mycmakeargs=( $(cmake-utils_use doc BUILD_DOCS) )
-
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mydumper/mydumper-0.9.5.ebuild b/dev-db/mydumper/mydumper-0.9.5.ebuild
new file mode 100644
index 000000000000..1bdc840bd0b9
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.9.5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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:=
+	sys-libs/zlib:=
+	virtual/mysql"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )"
+RDEPEND="${CDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-atomic.patch" #654314
+)
+
+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
+}