[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/mariadb/

2017-07-08 Thread Brian Evans 
commit: 37df9dff3c8bdd99ec577220d564e24b56ab206d
Author: Brian Evans  gentoo  org>
AuthorDate: Sun Jul  9 02:01:11 2017 +
Commit: Brian Evans  gentoo  org>
CommitDate: Sun Jul  9 02:01:11 2017 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=37df9dff

Fix systemd detection in 10.2.6

 dev-db/mariadb/mariadb-10.2.6.ebuild |  2 +-
 eclass/mysql-multilib-r1.eclass  | 10 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-db/mariadb/mariadb-10.2.6.ebuild 
b/dev-db/mariadb/mariadb-10.2.6.ebuild
index d719edc..e09b344 100644
--- a/dev-db/mariadb/mariadb-10.2.6.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.6.ebuild
@@ -42,7 +42,6 @@ PATCHES=(
 COMMON_DEPEND="
mroonga? ( app-text/groonga-normalizer-mysql )
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
-   systemd? ( sys-apps/systemd:= )
!bindist? (
sys-libs/binutils-libs:0=
>=sys-libs/readline-4.1:0=
@@ -59,6 +58,7 @@ COMMON_DEPEND="
innodb-snappy? ( app-arch/snappy )
oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= )
pam? ( virtual/pam:0= )
+   systemd? ( sys-apps/systemd:= )
tokudb? ( app-arch/snappy )
)
>=dev-libs/libpcre-8.35:3=

diff --git a/eclass/mysql-multilib-r1.eclass b/eclass/mysql-multilib-r1.eclass
index c6ac253..8b604f2 100644
--- a/eclass/mysql-multilib-r1.eclass
+++ b/eclass/mysql-multilib-r1.eclass
@@ -420,10 +420,6 @@ multilib_src_configure() {
mycmakeargs+=( -DINSTALL_MYSQLTESTDIR='' )
fi
 
-   if in_iuse systemd ; then
-   mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
-   fi
-
if use openssl || use libressl ; then
mycmakeargs+=( -DWITH_SSL=system )
else
@@ -453,6 +449,11 @@ multilib_src_configure() {
mycmakeargs+=( -DWITH_EDITLINE=bundled )
 
if multilib_is_native_abi && use server ; then
+
+   if in_iuse systemd ; then
+   mycmakeargs+=( -DWITH_SYSTEMD=$(usex systemd) )
+   fi
+
if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n 
${MYSQL_DEFAULT_COLLATION} ) ]]; then
ewarn "You are using a custom charset of 
${MYSQL_DEFAULT_CHARSET}"
ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
@@ -511,6 +512,7 @@ multilib_src_configure() {
-DWITHOUT_EMBEDDED_SERVER=1
-DEXTRA_CHARSETS=none
-DINSTALL_SQLBENCHDIR=
+   -DWITH_SYSTEMD=NO
)
fi

[gentoo-commits] proj/mysql:master commit in: eclass/, dev-db/mariadb/

2015-03-15 Thread Brian Evans 
commit: 54539886d17960e92f03cc7865feda2965105728
Author: Brian Evans grknight AT gentoo DOT org
AuthorDate: Mon Mar 16 02:13:13 2015 +
Commit: Brian Evans grknight AT gentoo DOT org
CommitDate: Mon Mar 16 02:13:44 2015 +
URL:https://gitweb.gentoo.org/proj/mysql.git/commit/?id=54539886

[mariadb] Version bump for 10.1 series to beta

 dev-db/mariadb/ChangeLog  |   7 +-
 dev-db/mariadb/Manifest   |  23 ++
 dev-db/mariadb/mariadb-10.1.3_beta.ebuild | 116 ++
 eclass/mysql-cmake.eclass |   1 -
 4 files changed, 145 insertions(+), 2 deletions(-)

diff --git a/dev-db/mariadb/ChangeLog b/dev-db/mariadb/ChangeLog
index dfc3b0e..58d3c00 100644
--- a/dev-db/mariadb/ChangeLog
+++ b/dev-db/mariadb/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for dev-db/mariadb
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*mariadb-10.1.3_beta (16 Mar 2015)
+
+  16 Mar 2015; Brian Evans grkni...@gentoo.org +mariadb-10.1.3_beta.ebuild:
+  [mariadb] Version bump for 10.1 series to beta
+
 *mariadb-5.5.39 (05 Aug 2014)
 
   05 Aug 2014;  grkni...@gentoo.org +mariadb-5.5.39.ebuild,

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index d3493dc..c2eb76b 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,10 @@
+-BEGIN PGP SIGNED MESSAGE-
+Hash: SHA256
+
 DIST mariadb-10.0.16.tar.gz 55656968 SHA256 
44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4 SHA512 
8da873ff604d8cb247057a626b26e4086690bb97ef1243bf3dde81b1de4f39c80aded5e045920f8176554dc162c5adb7501fe9403c3ed44992be13fe4c63a2b3
 WHIRLPOOL 
916af6fbd50dba19d9fe74fdf206d6417d676852e59332a0c0e2da44d7cf7be58770adaa9e707e4177729a10d6145c57235df4af0bb8fc4dc72fb442f853e2cf
 DIST mariadb-10.1.0.tar.gz 51216842 SHA256 
994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521 SHA512 
479f22fa593e954a03c93767b5e5e03cc20092f2a41df67fb151d18ab275de25e17f1b505f612b916e9da776f0c01e86160e6e284f14c648f7dc8b090e5a063a
 WHIRLPOOL 
edaa0bfc744dcd1ed5f20d035b18ed0a57ce7f5d81617a6a150c17167f175a74a9d94a4772c1604f1116b4d4d36c34a610a4c27a91ed3b755a95a0bfc1e46df4
 DIST mariadb-10.1.2.tar.gz 52586559 SHA256 
411ea75cef58ab8fcaee8ec015b709400e5a9fc0dcfa76576044b23d32de1f5e SHA512 
cefbbfb00f1a311a0768282dc9d2085615aa6ea16825253576b9c2c69de8ebe4f1de7424c9573d5cf94c3d088ba0f03f7419d2a4ec71465e9301039b4a117421
 WHIRLPOOL 
67cb8e56cb48bf2b5dad9975068c5bd27d64fdc29e5536518075e6e4f3a23a9a0096de5ab95cec85877856fa48deec55837f6978522749a73a5e41b4efb81cff
+DIST mariadb-10.1.3.tar.gz 52935207 SHA256 
565e350b609c9b832f10baa33006aafc6c874990dacc81a185422c0e6599b5a6 SHA512 
c5188ec73e9bc732757d681692cb3d089c10d80bb8e0a382f2a0be850e46321773556459d16c894f539f743c822e6697a11c9977a32e709874b9242de7ba8cae
 WHIRLPOOL 
08371eb964dfe47b7e49b71a9ae7e0a7a823c85372c55a610afda70a5b7f064a84405360ce0a93dddf04ee2a63694fd134d902642cd16ce3fe8bbc663435aebb
 DIST mariadb-5.1.67.tar.gz 25022999 SHA256 
33471e9275c9b03919cabc38eb39f807d645adabf6a1a18f2e41ed73f47677c8 SHA512 
de4a531027860c4226ec5e023b6f8573c2eb723bacaeb14279b9609ed033dcb58fc090aef3d9babcd4a4d0817ddf6ef75589c78f63075072d31ad0b7f7c17d7d
 WHIRLPOOL 
22696d27c3a510396c4b86db5f5a4b39bbcde89285a8460b175ef7c40b3b7541fc8f205c0b96da7f94504a7fd14bfe02efb45204efda524a2426cd25e08162ff
 DIST mariadb-5.2.14.tar.gz 25469828 SHA256 
8ab3db0535ce8728b03a34799da2334c18cff467e01d122293f23aad20613fe5 SHA512 
b0aded450355861bf01604ac5bd0012d0d06a699bc83017cdb6b8749ed161aca9fedb733301aab991c521b21f3c8b2fea4867a2fd038379475e720782c02e869
 WHIRLPOOL 
8c2dd7ee0c1df5696d6b9f5c4387b7f755258a710ac088559f0f9779b27d18e30f32de0d4212015a15b6a83de2abbdd5c4ec811fa87fe2aec547809dc0970607
 DIST mariadb-5.3.12.tar.gz 26880808 SHA256 
83a4598117cadde2bd7eac4c1398edbc86cc3aa8d3824bbee864d4b568a3a30c SHA512 
d53ea48745dad5693fd6a1fd5cf502852f12f8236b8a1fb7f81ad647301d2fd08d4f2944c74de580d0a4136d6c8b49f257124fa1b234ba8f2338f2047435ef94
 WHIRLPOOL 
b9caf1b241262b3b25728769116a94b480ae404ed3d49c8afd6eb4ad6071552e436e4b9483e7f5d0113bc3127eaf04ceaa80d455486e7a92d00820b6b298c460
@@ -9,3 +13,22 @@ DIST mariadb-5.5.42.tar.gz 45586372 SHA256 
3c868e768f4c24b4aa2f8f1725460d15a5485
 DIST mysql-extras-20121101-2319Z.tar.bz2 1898358 SHA256 
ea5da082d3384bde67e005ebc39b78e7caadea80745333fb5a9cf47a4c4e4c5d SHA512 
6a49abb1beee012d87ab63071a568ee6d9d8e4ff7a76401b91f5bdc127860d1c504a3877cbadb81536b07afe5ff419c77c793b0fc14ba484f56765d1ca526614
 WHIRLPOOL 
4bda75a0a9063830b3140bbc3cb12b60fa21289eee2fa476fb286da6318fdf0445a9c6193bd2063aefcd3f4ecc1f8045b30635f0e32014098d0f3dbee86e01fc
 DIST mysql-extras-20140514-0124Z.tar.bz2 1493742 SHA256 
0cdda9f8587532375274510a8a1f8fe5e80f10cfdf851a01074109803f7ee4cf SHA512 
7a798809809b35a515a3475be5f1a96547d495592c83c4cf5c79fb07ceb45a04000da8922d051004c0f2d944f92ca47b75ad08d06a8dccca2ae9f94778d31a7e
 WHIRLPOOL