commit: 4900d36b57127f19b9b2c30f7159db27215ca2d6
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 17:24:27 2015 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 17:24:27 2015 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=4900d36b
Use proper patch sets
dev-db/mariadb-galera/Manifest | 1 +
.../files/without-clientlibs-tools.patch | 120 --------------------
.../mariadb-galera-10.0.20-r1.ebuild | 8 +-
dev-db/mariadb/Manifest | 1 +
.../mariadb/files/without-clientlibs-tools.patch | 117 -------------------
dev-db/mariadb/mariadb-10.0.20-r1.ebuild | 8 +-
dev-db/mysql/Manifest | 1 +
dev-db/mysql/files/without-clientlibs-tools.patch | 125 ---------------------
dev-db/mysql/mysql-5.6.25-r1.ebuild | 11 +-
dev-db/percona-server/Manifest | 1 +
.../files/without-clientlibs-tools.patch | 125 ---------------------
.../percona-server-5.6.25.73.0-r1.ebuild | 10 +-
12 files changed, 10 insertions(+), 518 deletions(-)
diff --git a/dev-db/mariadb-galera/Manifest b/dev-db/mariadb-galera/Manifest
index e1d3ad0..b8b20d3 100644
--- a/dev-db/mariadb-galera/Manifest
+++ b/dev-db/mariadb-galera/Manifest
@@ -1,2 +1,3 @@
DIST mariadb-galera-10.0.20.tar.gz 56558895 SHA256
f6b979cbae803d1b33e85407fcd2aaf19b07fb5e183726666e8c990f1f7d5ce8 SHA512
dbae146c798d08f624fcdac86d7f69aea2ebe8540f659004fee11dba4a0a6c234b7235544ae4adf3b58add989649533f86dbe1de4107eb7bbd433add42f55dad
WHIRLPOOL
93ad52daae91463772a163a59beab57496102fc2cd23ba7f9b009875ea8cb7b854d8a0d857ddb90d6e3ec3e034ae8403eb7aedba55f9d2a97f72dbc999085f69
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256
4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512
7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed
WHIRLPOOL
99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
+DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256
d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512
3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9
WHIRLPOOL
11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
diff --git a/dev-db/mariadb-galera/files/without-clientlibs-tools.patch
b/dev-db/mariadb-galera/files/without-clientlibs-tools.patch
deleted file mode 100644
index 85e9786..0000000
--- a/dev-db/mariadb-galera/files/without-clientlibs-tools.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400
-+++ b/CMakeLists.txt 2015-06-24 10:34:17.314169100 -0400
-@@ -354,8 +354,6 @@
- MYSQL_CHECK_ZLIB_WITH_COMPRESS()
- # Add bundled yassl/taocrypt or system openssl.
- MYSQL_CHECK_SSL()
--# Add readline or libedit.
--MYSQL_CHECK_READLINE()
-
- SET(MALLOC_LIBRARY "system")
- CHECK_JEMALLOC()
-@@ -394,27 +392,38 @@
- CONFIGURE_PLUGINS()
- ENDIF()
-
--ADD_SUBDIRECTORY(include)
-+IF(NOT WITHOUT_CLIENTLIBS)
-+ ADD_SUBDIRECTORY(include)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
-+
- ADD_SUBDIRECTORY(dbug)
- ADD_SUBDIRECTORY(strings)
- ADD_SUBDIRECTORY(vio)
- ADD_SUBDIRECTORY(mysys)
- ADD_SUBDIRECTORY(mysys_ssl)
- ADD_SUBDIRECTORY(libmysql)
- IF(WITH_WSREP)
- ADD_SUBDIRECTORY(wsrep)
- ENDIF()
--ADD_SUBDIRECTORY(client)
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(libservices)
- ADD_SUBDIRECTORY(scripts)
- ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(support-files)
-
-+IF(NOT WITHOUT_TOOLS)
-+ # Add readline or libedit.
-+ MYSQL_CHECK_READLINE()
-+ ADD_SUBDIRECTORY(client)
-+ENDIF(NOT WITHOUT_TOOLS)
-+
- IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(sql)
- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-- IF(WITH_EMBEDDED_SERVER)
-+ IF(WITH_EMBEDDED_SERVER)
-+ IF(WITHOUT_TOOLS)
-+ MYSQL_CHECK_READLINE()
-+ ENDIF(WITHOUT_TOOLS)
- ADD_SUBDIRECTORY(libmysqld)
- ADD_SUBDIRECTORY(libmysqld/examples)
- ENDIF(WITH_EMBEDDED_SERVER)
-diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
---- a/extra/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400
-+++ b/extra/CMakeLists.txt 2015-06-24 10:37:31.879169100 -0400
-@@ -54,12 +54,14 @@
- DEPENDS
- ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
-
--MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
--TARGET_LINK_LIBRARIES(my_print_defaults mysys)
-+IF(NOT WITHOUT_CLIENTLIBS)
-+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-+ TARGET_LINK_LIBRARIES(my_print_defaults mysys)
-
--MYSQL_ADD_EXECUTABLE(perror perror.c)
--ADD_DEPENDENCIES(perror GenError)
--TARGET_LINK_LIBRARIES(perror mysys)
-+ MYSQL_ADD_EXECUTABLE(perror perror.c)
-+ ADD_DEPENDENCIES(perror GenError)
-+ TARGET_LINK_LIBRARIES(perror mysys)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
-
- IF(UNIX)
- MYSQL_ADD_EXECUTABLE(resolveip resolveip.c)
-diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
---- a/scripts/CMakeLists.txt 2015-06-24 10:28:12.800169100 -0400
-+++ b/scripts/CMakeLists.txt 2015-06-24 10:42:49.682169100 -0400
-@@ -327,7 +327,6 @@
- # On Unix, most of the files end up in the bin directory
- SET(BIN_SCRIPTS
- msql2mysql
-- mysql_config
- mysql_fix_extensions
- mysql_setpermission
- mysql_secure_installation
-@@ -341,6 +340,12 @@
- mysqld_multi
- mysqld_safe
- )
-+ IF(NOT WITHOUT_CLIENTLIBS)
-+ SET(BIN_SCRIPTS
-+ ${BIN_SCRIPTS}
-+ mysql_config
-+ )
-+ ENDIF(NOT WITHOUT_CLIENTLIBS)
- FOREACH(file ${BIN_SCRIPTS})
- IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
-diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
---- a/libmysql/CMakeLists.txt 2015-06-24 12:32:11.606169100 -0400
-+++ b/libmysql/CMakeLists.txt 2015-06-24 13:44:53.857169100 -0400
-@@ -440,12 +440,12 @@
- SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
- ENDIF()
- ENDMACRO()
-- IF(ENABLE_STATIC_LIBS)
-+ IF(ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS)
- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient
${INSTALL_LIBDIR} Development)
- ENDIF()
- ENDIF()
-
--IF(NOT DISABLE_SHARED)
-+IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS)
- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
- EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA}
${CLIENT_API_5_5_EXTRA}
- COMPONENT SharedLibraries)
diff --git a/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
b/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
index 2003698..e26a548 100644
--- a/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
+++ b/dev-db/mariadb-galera/mariadb-galera-10.0.20-r1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
+MY_EXTRAS_VER="20150717-1707Z"
WSREP_REVISION="25"
HAS_TOOLS_PATCH="1"
SUBSLOT="18"
@@ -25,12 +25,6 @@ RDEPEND="${RDEPEND}"
# If you want to add a single patch, copy the ebuild to an overlay
# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
- mysql-multilib_src_prepare
- einfo "Applying experimental tools patch"
- epatch "${FILESDIR}/without-clientlibs-tools.patch"
-}
-
# Official test instructions:
# USE='embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 52ff954..d2783b4 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -11,3 +11,4 @@ DIST mariadb-5.5.44.tar.gz 45672065 SHA256
7d425caf5f1e45de9e5eb72daa98ceb542e7b
DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
WHIRLPOOL
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256
4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512
7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed
WHIRLPOOL
99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256
de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512
f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4
WHIRLPOOL
f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
+DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256
d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512
3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9
WHIRLPOOL
11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
diff --git a/dev-db/mariadb/files/without-clientlibs-tools.patch
b/dev-db/mariadb/files/without-clientlibs-tools.patch
deleted file mode 100644
index 7b759f3..0000000
--- a/dev-db/mariadb/files/without-clientlibs-tools.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400
-+++ b/CMakeLists.txt 2015-06-24 10:34:17.314169100 -0400
-@@ -354,8 +354,6 @@
- MYSQL_CHECK_ZLIB_WITH_COMPRESS()
- # Add bundled yassl/taocrypt or system openssl.
- MYSQL_CHECK_SSL()
--# Add readline or libedit.
--MYSQL_CHECK_READLINE()
-
- SET(MALLOC_LIBRARY "system")
- CHECK_JEMALLOC()
-@@ -394,24 +392,35 @@
- CONFIGURE_PLUGINS()
- ENDIF()
-
--ADD_SUBDIRECTORY(include)
-+IF(NOT WITHOUT_CLIENTLIBS)
-+ ADD_SUBDIRECTORY(include)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
-+
- ADD_SUBDIRECTORY(dbug)
- ADD_SUBDIRECTORY(strings)
- ADD_SUBDIRECTORY(vio)
- ADD_SUBDIRECTORY(mysys)
- ADD_SUBDIRECTORY(mysys_ssl)
- ADD_SUBDIRECTORY(libmysql)
--ADD_SUBDIRECTORY(client)
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(libservices)
- ADD_SUBDIRECTORY(scripts)
- ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(support-files)
-
-+IF(NOT WITHOUT_TOOLS)
-+ # Add readline or libedit.
-+ MYSQL_CHECK_READLINE()
-+ ADD_SUBDIRECTORY(client)
-+ENDIF(NOT WITHOUT_TOOLS)
-+
- IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(sql)
- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-- IF(WITH_EMBEDDED_SERVER)
-+ IF(WITH_EMBEDDED_SERVER)
-+ IF(WITHOUT_TOOLS)
-+ MYSQL_CHECK_READLINE()
-+ ENDIF(WITHOUT_TOOLS)
- ADD_SUBDIRECTORY(libmysqld)
- ADD_SUBDIRECTORY(libmysqld/examples)
- ENDIF(WITH_EMBEDDED_SERVER)
-diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
---- a/extra/CMakeLists.txt 2015-06-17 10:54:11.000000000 -0400
-+++ b/extra/CMakeLists.txt 2015-06-24 10:37:31.879169100 -0400
-@@ -54,12 +54,14 @@
- DEPENDS
- ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
-
--MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
--TARGET_LINK_LIBRARIES(my_print_defaults mysys)
-+IF(NOT WITHOUT_CLIENTLIBS)
-+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-+ TARGET_LINK_LIBRARIES(my_print_defaults mysys)
-
--MYSQL_ADD_EXECUTABLE(perror perror.c)
--ADD_DEPENDENCIES(perror GenError)
--TARGET_LINK_LIBRARIES(perror mysys)
-+ MYSQL_ADD_EXECUTABLE(perror perror.c)
-+ ADD_DEPENDENCIES(perror GenError)
-+ TARGET_LINK_LIBRARIES(perror mysys)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
-
- IF(UNIX)
- MYSQL_ADD_EXECUTABLE(resolveip resolveip.c)
-diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
---- a/scripts/CMakeLists.txt 2015-06-24 10:28:12.800169100 -0400
-+++ b/scripts/CMakeLists.txt 2015-06-24 10:42:49.682169100 -0400
-@@ -327,7 +327,6 @@
- # On Unix, most of the files end up in the bin directory
- SET(BIN_SCRIPTS
- msql2mysql
-- mysql_config
- mysql_fix_extensions
- mysql_setpermission
- mysql_secure_installation
-@@ -341,6 +340,12 @@
- mysqld_multi
- mysqld_safe
- )
-+ IF(NOT WITHOUT_CLIENTLIBS)
-+ SET(BIN_SCRIPTS
-+ ${BIN_SCRIPTS}
-+ mysql_config
-+ )
-+ ENDIF(NOT WITHOUT_CLIENTLIBS)
- FOREACH(file ${BIN_SCRIPTS})
- IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
-diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
---- a/libmysql/CMakeLists.txt 2015-06-24 12:32:11.606169100 -0400
-+++ b/libmysql/CMakeLists.txt 2015-06-24 13:44:53.857169100 -0400
-@@ -440,12 +440,12 @@
- SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
- ENDIF()
- ENDMACRO()
-- IF(ENABLE_STATIC_LIBS)
-+ IF(ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS)
- INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient
${INSTALL_LIBDIR} Development)
- ENDIF()
- ENDIF()
-
--IF(NOT DISABLE_SHARED)
-+IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS)
- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
- EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA}
${CLIENT_API_5_5_EXTRA}
- COMPONENT SharedLibraries)
diff --git a/dev-db/mariadb/mariadb-10.0.20-r1.ebuild
b/dev-db/mariadb/mariadb-10.0.20-r1.ebuild
index a7d4a2c..38eb7c5 100644
--- a/dev-db/mariadb/mariadb-10.0.20-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.20-r1.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI="5"
-MY_EXTRAS_VER="20141215-0144Z"
+MY_EXTRAS_VER="20150717-1707Z"
HAS_TOOLS_PATCH="1"
SUBSLOT="18"
@@ -19,12 +19,6 @@ EPATCH_EXCLUDE=''
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
RDEPEND="${RDEPEND}"
-src_prepare() {
- mysql-multilib_src_prepare
- einfo "Applying experimental tools patch"
- epatch "${FILESDIR}/without-clientlibs-tools.patch"
-}
-
# Official test instructions:
# USE='embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 2033863..6fa4fba 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -14,5 +14,6 @@ DIST mysql-extras-20120401-2131Z.tar.bz2 1835097 SHA256
95e531799ed267c566da8b07
DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256
0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512
7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e
WHIRLPOOL
371446d80cd9fa22a28eeecde8d18c9c3ca76db9bc57a4ab2073ed0fc1d19a70a06a33cb92257a671849e4bad8bfb9f235272ee1221c7c21ce5f45bc900a59cc
DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256
74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512
886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35
WHIRLPOOL
9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
DIST mysql-extras-20150410-1944Z.tar.bz2 1493690 SHA256
e327adf02be4c2bce5121f01d6b139309c72814b8c50a29559dfddee12a0b4e2 SHA512
e2e5345290134e597734514041e413f0633b8078bfddb8b8e7695468ce7341735b732d5bb602ab7aa9a4045d71571b73aac01a5d96687d4fbd380736f5ed650c
WHIRLPOOL
f65f294905fd1d04e2be79a803b658ed432338501665a75cbe0cc5b3af8abf0615f1f808465c3ca3c7e850b9277f451f5c77b518977f4bee8dc77d6089ff88fb
+DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256
d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512
3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9
WHIRLPOOL
11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
DIST pbxt-1.0.11-6-pre-ga.tar.gz 3156307 SHA256
71ff3d86e9e5691f3efe541bf31f55a7ec2a88af27df6ad853b65902e00e6d12 SHA512
fa238303f06e0a9adfb10bd5a2e1d2e4850d2c17a350af3874cbff099d6e47b7c555d750c584d06a3ca87c1eb1e9301a9619d8d9a4cffb7fd0169b2b3a63c80c
WHIRLPOOL
05cdd39f6f5dafff2def0062a00a24eff6cf6d8754f622b133365cef47cd6b828df5500ac407359d0793a75dd239ec1e49a13d2400a01ddf8b4cef7466e86962
DIST percona-xtradb-1.0.6-10.tar.gz 1676716 SHA256
e3aa818f13cf669412e59ad194eae8eada7a857bf7a4260e4bb41cab4d7ae39c SHA512
72e4b656b22a0420e6f5935dc28060e5c50fbeb48c6d1ae430579d9ccef8042fdd4dde128cc977b903de6221f7021e8c87ea29fe6a8a8c74edb84bf54ab889f3
WHIRLPOOL
a916879be315498da27c60992efa4d19e91305b81242925e161547f3fb97a820256e1d07863e9e007ef843af54cd087ce5ac47d5ed1b70862da6cd5a9d81eccf
diff --git a/dev-db/mysql/files/without-clientlibs-tools.patch
b/dev-db/mysql/files/without-clientlibs-tools.patch
deleted file mode 100644
index 35e60de..0000000
--- a/dev-db/mysql/files/without-clientlibs-tools.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2015-07-09 09:04:00.118091000 -0400
-+++ b/CMakeLists.txt 2015-07-09 09:17:06.291091000 -0400
-@@ -405,8 +405,6 @@
- MYSQL_CHECK_ZLIB_WITH_COMPRESS()
- # Add bundled yassl/taocrypt or system openssl.
- MYSQL_CHECK_SSL()
--# Add system/bundled editline.
--MYSQL_CHECK_EDITLINE()
- # Add libevent
- MYSQL_CHECK_LIBEVENT()
-
-@@ -436,7 +434,10 @@
- ADD_SUBDIRECTORY(storage/ndb)
- ENDIF()
-
--ADD_SUBDIRECTORY(include)
-+IF(NOT WITHOUT_CLIENTLIBS)
-+ ADD_SUBDIRECTORY(include)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
-+
- ADD_SUBDIRECTORY(dbug)
- ADD_SUBDIRECTORY(strings)
- ADD_SUBDIRECTORY(vio)
-@@ -462,7 +463,6 @@
- ENDIF()
-
- ADD_SUBDIRECTORY(extra)
--ADD_SUBDIRECTORY(client)
- ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-
-@@ -470,11 +470,20 @@
- ADD_SUBDIRECTORY(man)
- ENDIF()
-
-+IF(NOT WITHOUT_TOOLS)
-+ # Add system/bundled editline
-+ MYSQL_CHECK_EDITLINE()
-+ ADD_SUBDIRECTORY(client)
-+ENDIF(NOT WITHOUT_TOOLS)
-+
- IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(sql)
- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
- IF(WITH_EMBEDDED_SERVER)
-+ IF(WITHOUT_TOOLS)
-+ MYSQL_CHECK_EDITLINE()
-+ ENDIF(WITHOUT_TOOLS)
- ADD_SUBDIRECTORY(libmysqld)
- ADD_SUBDIRECTORY(libmysqld/examples)
- ENDIF(WITH_EMBEDDED_SERVER)
-diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
---- a/extra/CMakeLists.txt 2015-05-05 07:05:53.000000000 -0400
-+++ b/extra/CMakeLists.txt 2015-07-09 09:18:16.982091000 -0400
-@@ -59,15 +59,16 @@
- ADD_DEPENDENCIES(GenError copy_openssl_extra)
- ENDIF()
-
-+IF(NOT WITHOUT_CLIENTLIBS)
-+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-+ TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
-+ SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-
--MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
--TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
--SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
--
--MYSQL_ADD_EXECUTABLE(perror perror.c)
--ADD_DEPENDENCIES(perror GenError)
--TARGET_LINK_LIBRARIES(perror mysys mysys_ssl)
--SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX)
-+ MYSQL_ADD_EXECUTABLE(perror perror.c)
-+ ADD_DEPENDENCIES(perror GenError)
-+ TARGET_LINK_LIBRARIES(perror mysys mysys_ssl)
-+ SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
-
- MYSQL_ADD_EXECUTABLE(resolveip resolveip.c)
- TARGET_LINK_LIBRARIES(resolveip mysys mysys_ssl)
-diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
---- a/libmysql/CMakeLists.txt 2015-07-09 09:04:01.217091000 -0400
-+++ b/libmysql/CMakeLists.txt 2015-07-09 09:22:47.903091000 -0400
-@@ -217,14 +217,14 @@
-
- IF(UNIX)
- GET_TARGET_NAME(mysqlclient lib_name)
-- IF(ENABLE_STATIC_LIBS)
-+ IF(ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS)
- INSTALL_SYMLINK(mysqlclient
- ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
- ${INSTALL_LIBDIR} Development)
- ENDIF()
- ENDIF()
-
--IF(NOT DISABLE_SHARED)
-+IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS)
- # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
-diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
---- a/scripts/CMakeLists.txt 2015-07-09 09:04:00.401091000 -0400
-+++ b/scripts/CMakeLists.txt 2015-07-09 09:20:25.723091000 -0400
-@@ -347,7 +347,6 @@
- SET(mysql_config_COMPONENT COMPONENT Development)
- SET(BIN_SCRIPTS
- msql2mysql
-- mysql_config
- mysql_fix_extensions
- mysql_setpermission
- mysql_zap
-@@ -360,6 +359,12 @@
- mysqld_multi
- mysqld_safe
- )
-+ IF(NOT WITHOUT_CLIENTLIBS)
-+ SET(BIN_SCRIPTS
-+ ${BIN_SCRIPTS}
-+ mysql_config
-+ )
-+ ENDIF(NOT WITHOUT_CLIENTLIBS)
- FOREACH(file ${BIN_SCRIPTS})
- IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
diff --git a/dev-db/mysql/mysql-5.6.25-r1.ebuild
b/dev-db/mysql/mysql-5.6.25-r1.ebuild
index 227e8c6..5a3d31c 100644
--- a/dev-db/mysql/mysql-5.6.25-r1.ebuild
+++ b/dev-db/mysql/mysql-5.6.25-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.6.25.ebuild,v 1.1
2015/06/01 16:18:23 grknight Exp $
+# $Heaher: $
EAPI="5"
-MY_EXTRAS_VER="20150410-1944Z"
+MY_EXTRAS_VER="20150717-1707Z"
MY_PV="${PV//_alpha_pre/-m}"
MY_PV="${MY_PV//_/-}"
HAS_TOOLS_PATCH="1"
@@ -27,13 +27,6 @@ RDEPEND="${RDEPEND}"
# If you want to add a single patch, copy the ebuild to an overlay
# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
- mysql-multilib_src_prepare
- einfo "Applying experimental tools patch"
- epatch "${FILESDIR}/without-clientlibs-tools.patch"
-}
-
-
# Official test instructions:
# USE='server embedded extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
diff --git a/dev-db/percona-server/Manifest b/dev-db/percona-server/Manifest
index b9a7b03..d87b4b5 100644
--- a/dev-db/percona-server/Manifest
+++ b/dev-db/percona-server/Manifest
@@ -1,2 +1,3 @@
DIST mysql-extras-20150113-1853Z.tar.bz2 1494439 SHA256
420553dc8557d0622ad762ee6924900acc74fd4f367fd3840acab03114fada4d SHA512
b1252d905b71a6f42484eaa796ebcd2f0769affc566e6c277ef3bc0ef9bc446a1c22aac3faa48ef7b9305056a1302b37d7ef86b547c44514528a5956ce61d372
WHIRLPOOL
d14f0d88358eb0bbd2c338052ec086ab8260988497ef09da934365ded3c30c7e905ea936a0c9817ccb49d1f6e3408b3f6a438455a2455c65c2f26a9fc6367ff3
+DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256
d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512
3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9
WHIRLPOOL
11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
DIST percona-server-5.6.25-73.0.tar.gz 34152178 SHA256
790d056931b9dd5b158a732812490fdaf9407012aaf93d3f1c1b21942dcdc251 SHA512
9bb4ee29ceb7e80460d2ffa779ca0aefaa6c0af1c4e5309c1c5f37840da4e85da1196a936e1862bacb3f36d064a6dcb6ad45b3eb55f60b033f2741ec6b487b9d
WHIRLPOOL
76c59da78fda5cf70802117e59ceb0a877513ed83b0069c6d5a3f169595eac43516897bc02c092caa71cb059424ed3d4cbb97133c6946f870ab7734e8ca7a282
diff --git a/dev-db/percona-server/files/without-clientlibs-tools.patch
b/dev-db/percona-server/files/without-clientlibs-tools.patch
deleted file mode 100644
index d6d21ad..0000000
--- a/dev-db/percona-server/files/without-clientlibs-tools.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2015-07-09 09:04:00.118091000 -0400
-+++ b/CMakeLists.txt 2015-07-09 09:17:06.291091000 -0400
-@@ -405,8 +405,6 @@
- MYSQL_CHECK_ZLIB_WITH_COMPRESS()
- # Add bundled yassl/taocrypt or system openssl.
- MYSQL_CHECK_SSL()
--# Add system/bundled editline.
--MYSQL_CHECK_EDITLINE()
- # Add libevent
- MYSQL_CHECK_LIBEVENT()
-
-@@ -436,7 +434,10 @@
- ADD_SUBDIRECTORY(storage/ndb)
- ENDIF()
-
--ADD_SUBDIRECTORY(include)
-+IF(NOT WITHOUT_CLIENTLIBS)
-+ ADD_SUBDIRECTORY(include)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
-+
- ADD_SUBDIRECTORY(dbug)
- ADD_SUBDIRECTORY(strings)
- ADD_SUBDIRECTORY(vio)
-@@ -462,7 +463,6 @@
- ENDIF()
-
- ADD_SUBDIRECTORY(extra)
--ADD_SUBDIRECTORY(client)
- ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-
-@@ -470,11 +470,20 @@
- ADD_SUBDIRECTORY(man)
- ENDIF()
-
-+IF(NOT WITHOUT_TOOLS)
-+ # Add system/bundled editline
-+ MYSQL_CHECK_EDITLINE()
-+ ADD_SUBDIRECTORY(client)
-+ENDIF(NOT WITHOUT_TOOLS)
-+
- IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(sql)
- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
- IF(WITH_EMBEDDED_SERVER)
-+ IF(WITHOUT_TOOLS)
-+ MYSQL_CHECK_EDITLINE()
-+ ENDIF(WITHOUT_TOOLS)
- ADD_SUBDIRECTORY(libmysqld)
- ADD_SUBDIRECTORY(libmysqld/examples)
- ENDIF(WITH_EMBEDDED_SERVER)
-diff -aurN a/extra/CMakeLists.txt b/extra/CMakeLists.txt
---- a/extra/CMakeLists.txt 2015-05-05 07:05:53.000000000 -0400
-+++ b/extra/CMakeLists.txt 2015-07-09 09:18:16.982091000 -0400
-@@ -59,15 +59,16 @@
- ADD_DEPENDENCIES(GenError copy_openssl_extra)
- ENDIF()
-
-+IF(NOT WITHOUT_CLIENTLIBS)
-+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-+ TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
-+ SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-
--MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
--TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
--SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
--
--MYSQL_ADD_EXECUTABLE(perror perror.c)
--ADD_DEPENDENCIES(perror GenError)
--TARGET_LINK_LIBRARIES(perror mysys mysys_ssl)
--SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX)
-+ MYSQL_ADD_EXECUTABLE(perror perror.c)
-+ ADD_DEPENDENCIES(perror GenError)
-+ TARGET_LINK_LIBRARIES(perror mysys mysys_ssl)
-+ SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX)
-+ENDIF(NOT WITHOUT_CLIENTLIBS)
-
- MYSQL_ADD_EXECUTABLE(resolveip resolveip.c)
- TARGET_LINK_LIBRARIES(resolveip mysys mysys_ssl)
-diff -aurN a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
---- a/libmysql/CMakeLists.txt 2015-07-09 09:04:01.217091000 -0400
-+++ b/libmysql/CMakeLists.txt 2015-07-09 09:22:47.903091000 -0400
-@@ -217,14 +217,14 @@
-
- IF(UNIX)
- GET_TARGET_NAME(perconaserverclient lib_name)
-- IF(ENABLE_STATIC_LIBS)
-+ IF(ENABLE_STATIC_LIBS AND NOT WITHOUT_CLIENTLIBS)
- INSTALL_SYMLINK(perconaserverclient
- ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
- ${INSTALL_LIBDIR} Development)
- ENDIF()
- ENDIF()
-
--IF(NOT DISABLE_SHARED)
-+IF(NOT DISABLE_SHARED AND NOT WITHOUT_CLIENTLIBS)
- # Merge several convenience libraries into one big perconaserverclient
- # and link them together into shared library.
- MERGE_LIBRARIES(libmysql SHARED ${LIBS}
-diff -aurN a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
---- a/scripts/CMakeLists.txt 2015-07-09 09:04:00.401091000 -0400
-+++ b/scripts/CMakeLists.txt 2015-07-09 09:20:25.723091000 -0400
-@@ -347,7 +347,6 @@
- SET(mysql_config_COMPONENT COMPONENT Development)
- SET(BIN_SCRIPTS
- msql2mysql
-- mysql_config
- mysql_fix_extensions
- mysql_setpermission
- mysql_zap
-@@ -360,6 +359,12 @@
- mysqld_multi
- mysqld_safe
- )
-+ IF(NOT WITHOUT_CLIENTLIBS)
-+ SET(BIN_SCRIPTS
-+ ${BIN_SCRIPTS}
-+ mysql_config
-+ )
-+ ENDIF(NOT WITHOUT_CLIENTLIBS)
- FOREACH(file ${BIN_SCRIPTS})
- IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
diff --git a/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
b/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
index b5ae51a..7a6cefd 100644
--- a/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
+++ b/dev-db/percona-server/percona-server-5.6.25.73.0-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-db/percona-server/percona-server-5.6.25.73.0.ebuild,v
1.1 2015/07/06 18:00:05 grknight Exp $
+# $Header: $
EAPI="5"
-MY_EXTRAS_VER="20150113-1853Z"
+MY_EXTRAS_VER="20150717-1707Z"
HAS_TOOLS_PATCH="1"
SUBSLOT="18"
@@ -24,12 +24,6 @@ RDEPEND="${RDEPEND}"
# If you want to add a single patch, copy the ebuild to an overlay
# and create your own mysql-extras tarball, looking at 000_index.txt
-src_prepare() {
- mysql-multilib_src_prepare
- einfo "Applying experimental tools patch"
- epatch "${FILESDIR}/without-clientlibs-tools.patch"
-}
-
# Official test instructions:
# USE='extraengine perl ssl static-libs community' \
# FEATURES='test userpriv -usersandbox' \
