sys-cluster/galera: Version bump

Package-Manager: portage-2.2.20.1

4 files changed, 176 insertions, 0 deletions

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 008ff6db66c7..2f875c5dad59 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1,2 +1,3 @@
 DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d
 DIST galera-3-25.3.10.tar.gz 2990393 SHA256 5281cef0c26e409f93184a08fe3668bc0891aeec9710ffebc66402091d005d1d SHA512 d2fc09a9d274199650e29c7492a736a6518655458b6cad9ba960282928ec2d0f8187d35ee439c93a57ecb0f1b6a66b83474128f71ad67724cc784a887fc2172d WHIRLPOOL 294feec18418f69d7f1f1d416fc9893e403555d525851e3a4c1996bd9f0bf5689588ae930f77ad8c691a0c7c30d11c62f4928519a7b3722e9976ec5ee57931e5
+DIST galera-3-25.3.12.tar.gz 2989294 SHA256 2941cece3aa12d34bd454de8c3d2c4796a47dcfaef643e97d1b94462aa32e126 SHA512 6c18327d786a0c549b89a8668c302e3221d1f7586b271e927ca511ac9e8ee4413315641f6a43814b49e9231cdcd4c76dcd8e975098f768ea8d9f4638b1391e62 WHIRLPOOL b0067ade420c49d374baf901472841ff21ccbd73c1ef7eb7b48f7e591954f875fc5993664c54daa1e400e37cc0647f1a39515129e2d6789035de3dba0edb6d7e
diff --git a/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch b/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch
new file mode 100644
index 000000000000..19394250fae7
--- /dev/null
+++ b/sys-cluster/galera/files/galera-3.12-strip-extra-buildconfig.patch
@@ -0,0 +1,21 @@
+diff -aurN a/chromium/build_config.h b/chromium/build_config.h
+--- a/chromium/build_config.h	2015-08-27 03:32:41.000000000 -0400
++++ b/chromium/build_config.h	2015-09-15 09:50:21.765091000 -0400
+@@ -46,8 +46,6 @@
+ #elif defined(__sun)
+ #define OS_SOLARIS 1
+ #define TOOLKIT_GTK
+-#else
+-#error Please add support for your platform in build/build_config.h
+ #endif
+ 
+ #if defined(USE_OPENSSL) && defined(USE_NSS)
+@@ -132,8 +130,6 @@
+ #define ARCH_CPU_32_BITS 1
+ #endif
+ #define ARCH_CPU_BIG_ENDIAN 1
+-#else
+-#error Please add support for your architecture in build/build_config.h
+ #endif
+ 
+ // Type detection for wchar_t.
diff --git a/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch b/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch
new file mode 100644
index 000000000000..414996b482f3
--- /dev/null
+++ b/sys-cluster/galera/files/galera-3.12-strip-machine-cflags.patch
@@ -0,0 +1,64 @@
+diff -aurN a/galerautils/src/SConscript b/galerautils/src/SConscript
+--- a/galerautils/src/SConscript	2015-03-16 07:18:42.000000000 -0400
++++ b/galerautils/src/SConscript	2015-04-07 15:03:21.661301200 -0400
+@@ -1,4 +1,4 @@
+-Import('env', 'x86', 'sysname')
++Import('env', 'sysname')
+ 
+ libgalerautils_env = env.Clone()
+ 
+@@ -33,21 +33,6 @@
+ crc32c_sources = [ '#/www.evanjones.ca/crc32c.c' ]
+ crc32c_objs = crc32c_env.SharedObject(crc32c_sources)
+ 
+-if x86:
+-    crc32c_env.Append(CFLAGS = ' -msse4.2')
+-    if sysname == 'sunos':
+-        # Ideally we want to simply strip SSE4.2 flag from the resulting
+-        # crc32.pic.o
+-        # (see http://ffmpeg.org/pipermail/ffmpeg-user/2013-March/013977.html)
+-        # but that requires some serious scons-fu, so we just don't
+-        # compile hardware support in if host CPU does not have it.
+-        from subprocess import check_call
+-        try:
+-            check_call("isainfo -v | grep sse4.2 >/dev/null 2>&1", shell=True);
+-        except:
+-            libgalerautils_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-            crc32c_env.Append(CPPFLAGS = ' -DCRC32C_NO_HARDWARE')
+-
+ libgalerautils_env.StaticLibrary('galerautils',
+                                  libgalerautils_objs + crc32c_objs)
+ 
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct	2015-09-15 09:15:07.770091000 -0400
++++ b/SConstruct	2015-09-15 09:18:41.160091000 -0400
+@@ -87,29 +87,6 @@
+ if dbug:
+     opt_flags = opt_flags + ' -DGU_DBUG_ON'
+ 
+-if sysname == 'sunos':
+-    compile_arch = ' -mtune=native'
+-    link_arch    = ''
+-elif x86:
+-    if bits == 32:
+-        compile_arch = ' -m32 -march=i686'
+-        link_arch    = compile_arch
+-        if sysname == 'linux':
+-            link_arch = link_arch + ' -Wl,-melf_i386'
+-    else:
+-        compile_arch = ' -m64'
+-        link_arch    = compile_arch
+-        if sysname == 'linux':
+-            link_arch = link_arch + ' -Wl,-melf_x86_64'
+-elif machine == 's390x':
+-    compile_arch = ' -mzarch -march=z196 -mtune=zEC12'
+-    link_arch    = ''
+-    if bits == 32:
+-        compile_arch += ' -m32'
+-else:
+-    compile_arch = ' -mtune=native'
+-    link_arch    = ''
+-
+ 
+ boost      = int(ARGUMENTS.get('boost', 1))
+ boost_pool = int(ARGUMENTS.get('boost_pool', 0))
diff --git a/sys-cluster/galera/galera-25.3.12.ebuild b/sys-cluster/galera/galera-25.3.12.ebuild
new file mode 100644
index 000000000000..ca0cb7345819
--- /dev/null
+++ b/sys-cluster/galera/galera-25.3.12.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="${PN}-3-${PV}"
+
+inherit scons-utils multilib toolchain-funcs eutils user flag-o-matic
+DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+HOMEPAGE="http://www.galeracluster.com"
+SRC_URI="http://releases.galeracluster.com/source/galera-3-${PV}.tar.gz"
+LICENSE="GPL-2 BSD"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse4_2 garbd ssl test"
+
+CDEPEND="
+	 ssl? ( dev-libs/openssl:0= )
+	>=dev-libs/boost-1.41:0=
+	"
+DEPEND="${DEPEND}
+	${CDEPEND}
+	dev-libs/check
+	>=sys-devel/gcc-4.4
+	>=dev-cpp/asio-1.4.8[ssl?]
+	"
+#Run time only
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd -1 -1 -1 garbd
+	fi
+}
+
+src_prepare() {
+	# Remove bundled dev-cpp/asio
+	rm -r "${S}/asio" || die
+
+	# Respect {C,LD}FLAGS.
+	epatch "${FILESDIR}/respect-flags.patch" \
+		"${FILESDIR}/galera-3.12-strip-machine-cflags.patch" \
+		"${FILESDIR}/galera-3.12-strip-extra-buildconfig.patch"
+
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -r "${S}/garb" || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	tc-export CC CXX
+	# Uses hardware specific code that seems to depend on SSE4.2
+	if use cpu_flags_x86_sse4_2 ; then
+		append-cflags -msse4.2
+	else
+		append-cflags -DCRC32C_NO_HARDWARE
+	fi
+	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
+	# and -Wold-style-cast
+	myesconsargs=(
+		$(use_scons ssl ssl 1 0)
+		$(use_scons test tests 1 0)
+		strict_build_flags=0
+	)
+}
+
+src_compile() {
+	escons --warn=no-missing-sconscript
+}
+
+src_install() {
+	dodoc scripts/packages/README scripts/packages/README-MySQL
+	if use garbd ; then
+		dobin garb/garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.sh" garbd
+		doman man/garbd.8
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}