summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-03-27 22:40:05 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-03-27 22:40:05 +0100
commit8c364c784966be1700ea39ae45028f3e9be9cae0 (patch)
treec1971211069b79e3831b71accd52a67a9fdc77a3 /dev-db
parent6bd95d1f6320b8666a31ec949183aaa3088aa16f (diff)
gentoo resync : 27.03.2018
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/Manifest.gzbin20834 -> 20849 bytes
-rw-r--r--dev-db/mariadb/Manifest4
-rw-r--r--dev-db/mariadb/mariadb-10.2.13.ebuild6
-rw-r--r--dev-db/mariadb/mariadb-10.3.5_rc.ebuild6
-rw-r--r--dev-db/myodbc/Manifest2
-rw-r--r--dev-db/myodbc/myodbc-5.3.10-r2.ebuild (renamed from dev-db/myodbc/myodbc-5.3.10-r1.ebuild)16
-rw-r--r--dev-db/redis/Manifest2
-rw-r--r--dev-db/redis/metadata.xml1
8 files changed, 11 insertions, 26 deletions
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 5e15e9fb414d..d894fbf531da 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
Binary files differ
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index f42d22167841..359ca450aebd 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -26,7 +26,7 @@ EBUILD mariadb-10.1.24-r1.ebuild 7175 BLAKE2B 6d92e08b3197423710e91f0f56e1fff64b
EBUILD mariadb-10.1.29.ebuild 7305 BLAKE2B b5828f97361eb989638654f3399e1a036c12356c5cb90c2e62caf1055497b6f0e1c4f3587d1fe599d2da4cb1059c5aa676109e0aad88306d8136753c22c87854 SHA512 a0b25e416d701f557a017c4b6c454c6359406da3c43da0dda3c892020961b27888412582a892fedce4484c4412ce774fab45f868074b7ac053ba530339288337
EBUILD mariadb-10.1.31-r1.ebuild 7805 BLAKE2B da3c0a2e7783a3cbcb6f863633ef48f1fd1be138f522d59939bf301e5882f29cb96d064db1849ae8f1bbc663027776fa766469909788a63ffa1384d672d1c667 SHA512 c62876255db9f8ade2be143d7a548a4b297b02b575b09d6fbfc7da2d2ce9f93a738813d9d474e2a5bb84c1b4cef6eb7b24d3d710c8e21ca09cecaa77426d29cb
EBUILD mariadb-10.2.12.ebuild 32528 BLAKE2B 4fc6c74390c572d2fac693286149078338034c8159dbeb292cd4699753920efce67ae5550868ef9dcddfa73dafad2d4aa9277466d367841eab99afe5f2d187c4 SHA512 df8e91f637b349eab91877de631cdac730629c481c3798b147af135a8609bdb7c3838de530a75b9cb791e609a332653f218642df5937a741f9e2781a4c5bb190
-EBUILD mariadb-10.2.13.ebuild 33186 BLAKE2B 1948f1f012ae1766774e47c74077f3197409d0bc7ba1c1f28721137fbd447e397d6a1f88b87b1659cf9523abd1aa77f9bb0659fba5e8a56d70426e8507efbcc0 SHA512 107b441d9108c3261b7b3b262dcf9f8d5e8b51f86201415df2ad1a18e57d0683e75c65ae5ba75b81996922f92066c1c8ad229fec25ecc2588373716d33d54e08
-EBUILD mariadb-10.3.5_rc.ebuild 33146 BLAKE2B b6feb54ae1266ddd9cb59a07e279549f1467b7da7ee80ee61c9aca83c7d0cc0dbb1d3c4e556d180f5bb230833fe5af652edeea5750a42beb2848adf5725d29fe SHA512 75fe9e53e73b3ab930093a98dd584d7b89846a419d4df1d29c3bfe366b139998da0ef9762797585c134e95f26cc5208075634ea11ffa1bfe69eb771efee94d29
+EBUILD mariadb-10.2.13.ebuild 33174 BLAKE2B 957cd928349050eae31cb51067df474b6fda0457a2dab5e17e801022ba09908f661b01b38f69c56f44f66f498108e173901a6f4790850b002e1fdb4102f43a5b SHA512 33343971992cbe5f9cca8590c21abdc87c5a7b9e470bae452b740d31d99aece817d37ecd7e867f7d915434a7ac7efa8b6963caf6598815eb565e348b57074f22
+EBUILD mariadb-10.3.5_rc.ebuild 33134 BLAKE2B 817f7f6d206e1d2f966d7750b972f43abbe6b994bb9f926fbc88dd5d76f5341a80bb777ac1a0f609d2c5cb3fb0b63d0223e37dc78dbe7ba88022c6bb15710a1d SHA512 5617b24495b5a31e72b7db111afd9aa4ca9cab8173782a4d8532ba91931debdb8c64a4ce2a15d5b0ac60ac56d01cc6b5ce30f80ea6fe58ec70bdd5c752e788ed
EBUILD mariadb-5.5.59.ebuild 4220 BLAKE2B 15d84c6e8405e0f2339a1fa2c1dac8c5cb5d070f083219e5b0b6b6f59b83a5d147f049a7874f4109bea38a295be86f560faa6bf21b8665a2696a9ef4ff09ad08 SHA512 0397ba6f08cdedcb3812b61044d6d58b42db9009747fd1a0af53e450d530b56bbb748ffdd0a9c3de7dc535f9e4566e2513a7ea01fe893f250b9a31fa074de5e1
MISC metadata.xml 3172 BLAKE2B 9b546b51359c0881ee5ce452c89e788ff27300471433fb9d1eb28b3f72d47cd84787eac1d7fd536a8133aa56dd4dd9c1139afb4b3e83b463ce12b7d6cb0fa35f SHA512 143381d9443b778b4f8fb5545c6e8ac59e54eaba20458eecb757e292650a1fd5a470ded204f25c173f456cc222bd32f8b9885e00ecb00c9b4abfd639c9e98391
diff --git a/dev-db/mariadb/mariadb-10.2.13.ebuild b/dev-db/mariadb/mariadb-10.2.13.ebuild
index d515e8570a64..cc2988c75ed4 100644
--- a/dev-db/mariadb/mariadb-10.2.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.13.ebuild
@@ -849,11 +849,11 @@ pkg_config() {
unset tmp_mysqld_password_source
fi
- MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)"
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
# These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)"
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)"
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
diff --git a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
index 0baa860a6a36..e155c7cf981b 100644
--- a/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.5_rc.ebuild
@@ -853,11 +853,11 @@ pkg_config() {
unset tmp_mysqld_password_source
fi
- MYSQL_TMPDIR="$(_getoptval '--mysqld' tmpdir)"
+ MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
# These are dir+prefix
- MYSQL_RELAY_LOG="$(_getoptval '--mysqld' relay-log)"
+ MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
- MYSQL_LOG_BIN="$(_getoptval '--mysqld' log-bin)"
+ MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
if [[ ! -d "${ROOT}/$MYSQL_TMPDIR" ]]; then
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index fa3063ee1e59..5a7232dca28f 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -16,6 +16,6 @@ DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-32bit.tar.gz 11501665 BLAKE2B
DIST mysql-connector-odbc-5.3.9-linux-debian9-x86-64bit.tar.gz 12013057 BLAKE2B e372cfb6ca49f9f01e9e60d7cd497fc009ec38dee76ca2cfb74cc95213b84ef1eebca85e1400f19c9715c0f9b2ef40fc212196e14189f5506be8d0e887507ce4 SHA512 b54ca167f762b4d8b988b4a91f14dc6a4bf49f55bc639ce8eecc9eba6c11400bd3494d74ef77ebe3348bdefd8fb5b8c1b62b3a6beebb926a1899da17ea4a1b44
EBUILD myodbc-5.2.7-r1.ebuild 3363 BLAKE2B c2023e4e3d9b5be097438f32a44b754ac41b3366b978d28220a8cbc5e33575045dd68d120c6bd6e3abe89bce427a560cbfdf8752e609ca2bcf63b616e898a9d0 SHA512 f2b041eec24689bf072691e127381a180545bbef7d60e79ba76160c09ce8088999ee251a439a4bd6cafe5c7055ad454e5b68cf2dd5120353bd40da09c15919e7
EBUILD myodbc-5.2.7-r3.ebuild 3767 BLAKE2B 40e3d7f3eb5c1a3064f8a790adfb06b66e2317a29a05ec4825ed5fc704de32a1388e0f0eccc4347806c80568335660544712393e61f7e7812f8ae96ccc284d3e SHA512 dd4e3ea7e5cc504b9ee3f59944e4d52a34fec1e7247b6f4f0744c6c5416e69677c9a986d144eb5db62f76c752af3406e0c6659cb6a38021cfe9fefa7b28e54d0
-EBUILD myodbc-5.3.10-r1.ebuild 4189 BLAKE2B 2ba12e3ecb3e403db26dde4050ff91cb9ec0e2db7793c1ebad2b624bdb41c01aff88730e142ca9e50c719802bc834c58d8ec31affaa36f6fbf89aa188096da55 SHA512 f67fa28318bc872730763be47e3b8211584f221485a6aca81dbca3ad34785265dae802960bdec27328cad617e028655286ddc6616fad90f6af46eb62dc696207
+EBUILD myodbc-5.3.10-r2.ebuild 3660 BLAKE2B 9d607e8d23d1b15d0bd8cb23e987bfd90a317803a10e2802de2516b6de743dbf15eca90507bedfa102a1f525976d3493cd5564056e6d171db36d9f4c1ecb9ab0 SHA512 4046a7f1e806a6938c71e9ad2944fbd649aae7ede4c8d147f8abe7195d7ede68e5e3db7d4664f9eba1ed270b22777814fc9366da2eeb238bbef30f38ec79780c
EBUILD myodbc-5.3.9.ebuild 3142 BLAKE2B 5f535a2f331a91d4884ccd2f6e7429fe2b981375f6c71a4e4a1d85d1ee226760221a3aa29790c1cf3e69a9963f43c1c266ff9c5c26b4b89d5fd77f5adfe49ca6 SHA512 376f9bb1fb00b8e0ca2fe2f9962bf259eb2bd5828a9422f8f63897756359140a84b1e064d84e6a26590713050f7cf0c3820c1de1fa375e723fa1cf708fa5f5e0
MISC metadata.xml 239 BLAKE2B c4d6706d083b72927d239f41a644a4009c054c1c1a388af7733d3a2daf47d354009eb472573304a6be272601f05535297bcd9ceaea811a741cd905577ffe53d1 SHA512 e6e2fafe2f503db1d12e3d2368a99631ee8d014b7ea802d9879e7e3e2c0f9378675fffccd78ed09b914ae781ac3902567b1a53a721906e3ea63ceb51d0a1654b
diff --git a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
index 5aeb327fb5b1..62d7f9d9034e 100644
--- a/dev-db/myodbc/myodbc-5.3.10-r1.ebuild
+++ b/dev-db/myodbc/myodbc-5.3.10-r2.ebuild
@@ -41,39 +41,25 @@ DRIVER_NAME="${PN}-${SLOT}"
PATCHES=(
"${FILESDIR}/${MAJOR}-cmake-doc-path.patch"
"${FILESDIR}/5.3.10-cxxlinkage.patch"
-# "${FILESDIR}/${MAJOR}-mariadb-dynamic-array.patch"
- "${FILESDIR}/5.2.7-my_malloc.patch"
"${FILESDIR}/5.3.10-mariadb.patch"
)
src_prepare() {
- # Fix undefined references due to standards change
-# append-cflags -std=gnu89
-
# Remove Tests
sed -i -e "s/ADD_SUBDIRECTORY(test)//" \
"${S}/CMakeLists.txt"
# Fix as-needed on the installer binary
- echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
+# echo "TARGET_LINK_LIBRARIES(myodbc-installer odbc)" >> "${S}/installer/CMakeLists.txt"
cmake-utils_src_prepare
}
multilib_src_configure() {
-# local clientlib
-# for clientlib in "mariadb" "perconaclient" "mysqlclient" "notfound" ; do
-# [[ -x "${EPREFIX}/usr/$(get_libdir)/lib${clientlib}.so" ]] && break
-# done
-# [[ "${clientlib}x" == "notfoundx" ]] && \
-# die "Installed client library name could not be determined"
-
# MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
mycmakeargs+=(
-DMYSQL_CXX_LINKAGE=0
-DWITH_UNIXODBC=1
-# -DMYSQLCLIENT_LIB_NAME="${clientlib}"
-# -DMYSQLCLIENT_LIB_NAME="mysqlclient"
-DWITH_DOCUMENTATION_INSTALL_PATH=/usr/share/doc/${PF}
-DMYSQL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
-DLIB_SUBDIR="$(get_libdir)/${PN}-${MAJOR}"
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index e03910b3b84b..90d8d244448e 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -37,4 +37,4 @@ EBUILD redis-4.0.2-r1.ebuild 3809 BLAKE2B 3a44f14b32a02ccc6ff1f31136d17d30a8847c
EBUILD redis-4.0.6.ebuild 4074 BLAKE2B 8c650824c8216e360014750cfe64d205dc02d33b6997b31f4e1a282836c670e97c2c4158818b226a98a3b0cb1954def0ac356c5f154e93e6d41356fb68ec6550 SHA512 f864f88c8ce91cfb73448e4427b82d7a76276dfad851004e9b13f96c395e369a101d878cfba65f277aae878885b58202d0b52c0d37a160419aa55904ad8cb7f7
EBUILD redis-4.0.7.ebuild 4074 BLAKE2B a6190e8b3223f516c48889f5bd455e7c94c1c68e0f142f8370fc74931d7b9fb79621bae4a080956eb8cc9cf00ece885535c2e3a17e717d1c2c069e61bed479ee SHA512 aafbb4f1a85133e3baf0b73f026281c6dba2cd2146c9d3a9e5fa610e5e1ca5a9ea8458b9b031345f7346b74e42fc2a238f3824ddf12ec7d83ba571ebe7d18e3d
EBUILD redis-4.0.8.ebuild 4074 BLAKE2B a6190e8b3223f516c48889f5bd455e7c94c1c68e0f142f8370fc74931d7b9fb79621bae4a080956eb8cc9cf00ece885535c2e3a17e717d1c2c069e61bed479ee SHA512 aafbb4f1a85133e3baf0b73f026281c6dba2cd2146c9d3a9e5fa610e5e1ca5a9ea8458b9b031345f7346b74e42fc2a238f3824ddf12ec7d83ba571ebe7d18e3d
-MISC metadata.xml 632 BLAKE2B a81542eb7374b9e3ca2c963586f330ee2f5fa5ef39ebef21baadd9bcc65c1edd285485982ff87da6132960930faa1d9c6d7b0b49f9e6d02f273c71c8468d8612 SHA512 a032eb7204137f8c5e7b75f8b214b0b6fd7f2a119b261a3da2e0cf8979fda5a5f25643870515a8e8d821ff63df3d17808a6e3189cc16a0f87c88f479571e8ef5
+MISC metadata.xml 535 BLAKE2B 8b38981c28c1a1ac98cbadcc1a7e6ae9b48eff471f56a8ce182b26a331e8fdb92e0d76fa44f0c7f84f6d262fc7b1ad23ddb348d445dfc472f9b8be86d6ca222b SHA512 10302874f9e9818bfa599f4cb1e75bf9dc27f187cf7858855c2d77ddfb282ead944f40027596a80e8e22bdd5bf374613362be0c1779c0e5941e4135ad994c120
diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index 872bd8ba741e..19c095efc2a0 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -14,6 +14,5 @@
<flag name="tcmalloc">
Use tcmalloc from <pkg>dev-util/google-perftools</pkg> for allocations.
</flag>
- <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
</use>
</pkgmetadata>