* [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/files/, dev-db/mydumper/
@ 2017-10-08 12:29 Amy Liffey
0 siblings, 0 replies; 3+ messages in thread
From: Amy Liffey @ 2017-10-08 12:29 UTC (permalink / raw
To: gentoo-commits
commit: 9a32f45addb90b07db95b4d0e232d26874131604
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Oct 6 18:53:52 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 12:24:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a32f45a
dev-db/mydumper: bump to 0.9.3
dev-db/mydumper/Manifest | 1 +
.../files/mydumper-mariadb-include-fix.patch | 24 +++++++++++++
dev-db/mydumper/mydumper-0.9.3.ebuild | 42 ++++++++++++++++++++++
3 files changed, 67 insertions(+)
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index 65f8cf4f41e..ef71bad9872 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1 +1,2 @@
DIST mydumper-0.6.2.tar.gz 40165 SHA256 fa28563e8967752828954c5d81e26ef50aad9083d50a977bf5733833b23e3330 SHA512 ef9e48cc481f2674456659c061c45f3cb056180ab5576805e75d458658e94998758b894e45ddc06fb716c1d37fedefb644158f07cf6e77f4b5477663e954eb83 WHIRLPOOL 867b7efa6ca00dcfbb32f5dda2b63de038d0da3ac1a127059cbfdae9af577fef74868c38dad2bd5b5a9b4de76f7d108fcb6232b27c41d3062f413eac4cac843b
+DIST mydumper-0.9.3.tar.gz 45320 SHA256 2cd6a074bac7072905bd044ec20955c53c81b10e877ac9c644509940a8d201fb SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898 WHIRLPOOL 09988aa314ede6e56ce82c6eade9d29770ca2cbc39d4b2f1cd3f8403f9521e1aa5a372fda7992885c1c25743cc59d4c41cdce8d86eb79b8c7725631c2919c9ae
diff --git a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch b/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch
new file mode 100644
index 00000000000..0914b3acff6
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch
@@ -0,0 +1,24 @@
+--- a/mydumper.c 2017-09-07 14:53:02.000000000 +0000
++++ b/mydumper.c 2017-10-06 17:39:34.962315949 +0000
+@@ -22,6 +22,9 @@
+ #define _FILE_OFFSET_BITS 64
+
+ #include <mysql.h>
++#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID)
++ #include <server/mysql_version.h>
++#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-06 17:39:28.962315949 +0000
+@@ -19,6 +19,9 @@
+ #define _FILE_OFFSET_BITS 64
+
+ #include <mysql.h>
++#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID)
++ #include <server/mysql_version.h>
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/dev-db/mydumper/mydumper-0.9.3.ebuild b/dev-db/mydumper/mydumper-0.9.3.ebuild
new file mode 100644
index 00000000000..b4970ec03bf
--- /dev/null
+++ b/dev-db/mydumper/mydumper-0.9.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 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}-mariadb-include-fix.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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/files/, dev-db/mydumper/
@ 2017-10-25 18:49 Amy Liffey
0 siblings, 0 replies; 3+ messages in thread
From: Amy Liffey @ 2017-10-25 18:49 UTC (permalink / raw
To: gentoo-commits
commit: 772b80658ebe20d659319d68d521254725e37a13
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Wed Oct 25 15:07:43 2017 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 18:48:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772b8065
dev-db/mydumper: do not use mariadb server headers (bug #635176)
Closes: #6049
Closes: https://bugs.gentoo.org/635176
Package-Manager: Portage-2.3.12, Repoman-2.3.3
.../mydumper/files/mydumper-mariadb-define.patch | 28 ++++++++++++++++++++++
.../files/mydumper-mariadb-include-fix.patch | 24 -------------------
...umper-0.9.3.ebuild => mydumper-0.9.3-r1.ebuild} | 2 +-
3 files changed, 29 insertions(+), 25 deletions(-)
diff --git a/dev-db/mydumper/files/mydumper-mariadb-define.patch b/dev-db/mydumper/files/mydumper-mariadb-define.patch
new file mode 100644
index 00000000000..ee39a33be81
--- /dev/null
+++ b/dev-db/mydumper/files/mydumper-mariadb-define.patch
@@ -0,0 +1,28 @@
+--- 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/files/mydumper-mariadb-include-fix.patch b/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch
deleted file mode 100644
index 0914b3acff6..00000000000
--- a/dev-db/mydumper/files/mydumper-mariadb-include-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/mydumper.c 2017-09-07 14:53:02.000000000 +0000
-+++ b/mydumper.c 2017-10-06 17:39:34.962315949 +0000
-@@ -22,6 +22,9 @@
- #define _FILE_OFFSET_BITS 64
-
- #include <mysql.h>
-+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID)
-+ #include <server/mysql_version.h>
-+#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-06 17:39:28.962315949 +0000
-@@ -19,6 +19,9 @@
- #define _FILE_OFFSET_BITS 64
-
- #include <mysql.h>
-+#if defined(MARIADB_BASE_VERSION) && defined(MARIADB_VERSION_ID)
-+ #include <server/mysql_version.h>
-+#endif
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/dev-db/mydumper/mydumper-0.9.3.ebuild b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
similarity index 94%
rename from dev-db/mydumper/mydumper-0.9.3.ebuild
rename to dev-db/mydumper/mydumper-0.9.3-r1.ebuild
index b4970ec03bf..f95deef1be6 100644
--- a/dev-db/mydumper/mydumper-0.9.3.ebuild
+++ b/dev-db/mydumper/mydumper-0.9.3-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND="${CDEPEND}
doc? ( dev-python/sphinx )"
RDEPEND="${CDEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-mariadb-include-fix.patch" )
+PATCHES=( "${FILESDIR}/${PN}-mariadb-define.patch" )
src_prepare() {
# respect user cflags; do not expand ${CMAKE_C_FLAGS} (!)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/files/, dev-db/mydumper/
@ 2018-05-24 10:23 Amy Liffey
0 siblings, 0 replies; 3+ messages in thread
From: Amy Liffey @ 2018-05-24 10:23 UTC (permalink / raw
To: gentoo-commits
commit: cf649b87bc0a3083060a8439e99f7a122a0a2218
Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Tue May 22 08:52:03 2018 +0000
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Thu May 24 10:23:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf649b87
dev-db/mydumper: bump to 0.9.5
Closes: https://bugs.gentoo.org/654314
Package-Manager: Portage-2.3.38, Repoman-2.3.9
dev-db/mydumper/Manifest | 1 +
dev-db/mydumper/files/mydumper-atomic.patch | 27 ++++++++++++++++++
dev-db/mydumper/mydumper-0.9.5.ebuild | 44 +++++++++++++++++++++++++++++
3 files changed, 72 insertions(+)
diff --git a/dev-db/mydumper/Manifest b/dev-db/mydumper/Manifest
index d3b790f4b87..b9c7adaacc4 100644
--- a/dev-db/mydumper/Manifest
+++ b/dev-db/mydumper/Manifest
@@ -1,2 +1,3 @@
DIST mydumper-0.6.2.tar.gz 40165 BLAKE2B a5acfaad96874cb078dda1e2f73a2b73c03c051889eee0607efb6b36ce05e2ce468b58e66688e711e1f8814b5221da1132d545cc6965b10a24f38be6291910fa SHA512 ef9e48cc481f2674456659c061c45f3cb056180ab5576805e75d458658e94998758b894e45ddc06fb716c1d37fedefb644158f07cf6e77f4b5477663e954eb83
DIST mydumper-0.9.3.tar.gz 45320 BLAKE2B 6e6d4420ced29d4ea77aa257ee155ce0810fe7d0ac3bf22c22156dfcfba35a3c461e4115d5814b5e0050331151a5b0c3bd819c1ecc534b6644972bf76de5d004 SHA512 3bc2c85dbedf234aecca3b66f445e42bb7ddff83f914d5cc231f6a5755d1c2bf300ae9bf4bdea0717b45ea5338c6c336ec44f375dbf29570ed785ffddda53898
+DIST mydumper-0.9.5.tar.gz 60010 BLAKE2B f74a949712526b3fc3b1957c9f9dc5c5f820d88f781926331e751eb99e6315b37bd8f38ac8a0e1943485cc74fe9b14a7e74e955c77ceba6b10bb1e18a7720d75 SHA512 5b72234c88fd22c103afb9fa5a7c3c99d6585cb450b8cc7385cfd23ae2ce09c0848d15767a5957a7b8f87a7614bdb058dea8990f1a2a12300c2c74fc9da2de75
diff --git a/dev-db/mydumper/files/mydumper-atomic.patch b/dev-db/mydumper/files/mydumper-atomic.patch
new file mode 100644
index 00000000000..405e6883fbc
--- /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.9.5.ebuild b/dev-db/mydumper/mydumper-0.9.5.ebuild
new file mode 100644
index 00000000000..1bdc840bd0b
--- /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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-05-24 10:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-08 12:29 [gentoo-commits] repo/gentoo:master commit in: dev-db/mydumper/files/, dev-db/mydumper/ Amy Liffey
-- strict thread matches above, loose matches on Subject: below --
2017-10-25 18:49 Amy Liffey
2018-05-24 10:23 Amy Liffey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox