public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2013-06-12 18:21 Robin H. Johnson
  0 siblings, 0 replies; 5+ messages in thread
From: Robin H. Johnson @ 2013-06-12 18:21 UTC (permalink / raw
  To: gentoo-commits

commit:     f7bdab91cbe3145b4bb9550e08b274c9b7616968
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Tue May 14 01:06:47 2013 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 18:52:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=f7bdab91

Add required runtime-only library for mariadb-galera

Package-Manager: portage-2.1.11.62

---
 sys-cluster/galera/ChangeLog                 |  5 ++
 sys-cluster/galera/Manifest                  |  1 +
 sys-cluster/galera/files/disable-tests.patch | 80 ++++++++++++++++++++++++++++
 sys-cluster/galera/files/garb.cnf            | 17 ++++++
 sys-cluster/galera/files/garb.sh             | 58 ++++++++++++++++++++
 sys-cluster/galera/galera-23.2.4.ebuild      | 78 +++++++++++++++++++++++++++
 sys-cluster/galera/metadata.xml              |  8 +++
 7 files changed, 247 insertions(+)

diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog
new file mode 100644
index 0000000..ef382a7
--- /dev/null
+++ b/sys-cluster/galera/ChangeLog
@@ -0,0 +1,5 @@
+*galera-23.2.4 (14 May 2013)
+
+  14 May 2013;  <grknight@lavabit.com> +files/disable-tests.patch,
+  +files/garb.cnf, +files/garb.sh, +galera-23.2.4.ebuild, +metadata.xml:
+  Add required runtime-only library for mariadb-galera

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
new file mode 100644
index 0000000..4b82998
--- /dev/null
+++ b/sys-cluster/galera/Manifest
@@ -0,0 +1 @@
+DIST galera-23.2.4-src.tar.gz 3061934 SHA256 83eec5e8df53b9adcd601a84312a54e843b2584b0cbe445125c2266b22590e78 SHA512 b953d07cdd69c7e42e80053125bb69f4becf457529924768348846612db49d92c4a46e6c85739cc0c0b102d703dc3a3b73bc368171e6f863a1f56b2cd22cb711 WHIRLPOOL 3842dd7f4bd11ab4cb656c3d89758232b96d85ba64919932d03dde2f44cb13bdf7913e6d217e6ca49f376aaf15b7271d3a870a16ba1010d522b57ff59247edc2

diff --git a/sys-cluster/galera/files/disable-tests.patch b/sys-cluster/galera/files/disable-tests.patch
new file mode 100644
index 0000000..b82294b
--- /dev/null
+++ b/sys-cluster/galera/files/disable-tests.patch
@@ -0,0 +1,80 @@
+diff -aurN a/galera/SConscript b/galera/SConscript
+--- a/galera/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/galera/SConscript	2013-05-13 13:13:20.851827437 -0400
+@@ -1,2 +1,2 @@
+ 
+-SConscript(['src/SConscript', 'tests/SConscript'])
++SConscript(['src/SConscript'])
+diff -aurN a/galerautils/SConscript b/galerautils/SConscript
+--- a/galerautils/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/galerautils/SConscript	2013-05-13 13:15:37.010071765 -0400
+@@ -1,3 +1,3 @@
+ # SConscript for building galerautils
+ 
+-SConscript(Split('''src/SConscript tests/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcache/SConscript b/gcache/SConscript
+--- a/gcache/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcache/SConscript	2013-05-13 13:15:55.179837389 -0400
+@@ -1,3 +1,3 @@
+ # SConscript for building galerautils
+ 
+-SConscript(Split('''src/SConscript tests/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcomm/SConscript b/gcomm/SConscript
+--- a/gcomm/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcomm/SConscript	2013-05-13 13:16:08.979659369 -0400
+@@ -1,3 +1,3 @@
+ # SCons build script for building gcomm
+ 
+-SConscript(Split('''src/SConscript test/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcs/src/SConscript b/gcs/src/SConscript
+--- a/gcs/src/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcs/src/SConscript	2013-05-13 13:12:53.122184848 -0400
+@@ -46,8 +46,6 @@
+                      source = 'gcs_test.c',
+                      LINK = libgcs_env['CXX'])
+ 
+-SConscript('unit_tests/SConscript')
+-
+ #
+ env.Append(LIBGALERA_OBJS = libgcs_env.SharedObject(libgcs_sources))
+ 
+diff -aurN a/SConstruct b/SConstruct
+--- a/SConstruct	2013-03-11 02:44:50.000000000 -0400
++++ b/SConstruct	2013-05-13 13:11:03.493597370 -0400
+@@ -305,20 +305,6 @@
+ # Clone base from default environment
+ check_env = env.Clone()
+ 
+-conf = Configure(check_env)
+-
+-# Check header and library
+-
+-if not conf.CheckHeader('check.h'):
+-    print 'Error: check header file not found or not usable'
+-    Exit(1)
+-
+-if not conf.CheckLib('check'):
+-    print 'Error: check library not found or not usable'
+-    Exit(1)
+-
+-conf.Finish()
+-
+ # Note: Don't do this, glibc does not like static linking
+ # Link unit tests statically
+ # check_env.Append(LINKFLAGS = ' -static')
+@@ -328,11 +314,7 @@
+ #
+ 
+ def builder_unit_test(target, source, env):
+-    app = str(source[0].abspath)
+-    if os.spawnl(os.P_WAIT, app, app)==0:
+-        open(str(target[0]),'w').write("PASSED\n")
+-    else:
+-        return 1
++	print("Disabled\n")
+ # Create a builder for tests
+ bld = Builder(action = builder_unit_test)
+ check_env.Append(BUILDERS = {'Test' :  bld})

diff --git a/sys-cluster/galera/files/garb.cnf b/sys-cluster/galera/files/garb.cnf
new file mode 100644
index 0000000..4f0047a
--- /dev/null
+++ b/sys-cluster/galera/files/garb.cnf
@@ -0,0 +1,17 @@
+# Copyright (C) 2012 Coedership Oy
+# This config file is to be sourced by garbd service script.
+
+# A space-separated list of node addresses (address[:port]) in the cluster
+# GALERA_NODES=""
+
+# Galera cluster name, should be the same as on the rest of the nodes.
+# GALERA_GROUP=""
+
+# Optional Galera internal options string (e.g. SSL settings)
+# see http://www.codership.com/wiki/doku.php?id=galera_parameters
+# GALERA_OPTIONS=""
+
+# Log file for garbd. Optional, by default logs to syslog
+# LOG_FILE=""
+
+PIDFILE=/var/run/garbd

diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
new file mode 100755
index 0000000..1744639
--- /dev/null
+++ b/sys-cluster/galera/files/garb.sh
@@ -0,0 +1,58 @@
+#!/sbin/runscript
+#
+# Copyright (C) 2012 Codership Oy <info@codership.com>
+# Modified by: Brian Evans <grknight@lavabit.com> for OpenRC
+# $Header: $
+
+depend() {
+	need net
+}
+
+stop() {
+	ebegin $"Shutting down "${SVCNAME}" "
+	start-stop-daemon --stop --quiet --oknodo --retry TERM/30/KILL/5 \
+		                  --pidfile $PIDFILE
+	eend $?
+}
+
+start() {
+	local rcode
+
+	# Check that node addresses are configured
+	if [ -z "$GALERA_NODES" ]; then
+		eerror "List of GALERA_NODES is not configured"
+		return 6
+	fi
+	if [ -z "$GALERA_GROUP" ]; then
+		eerror "GALERA_GROUP name is not configured" 
+		return 6
+	fi
+
+	GALERA_PORT=${GALERA_PORT:-4567}
+
+	# Find a working node
+	for ADDRESS in ${GALERA_NODES} 0; do
+		HOST=$(echo $ADDRESS | cut -d \: -f 1 )
+		PORT=$(echo $ADDRESS | cut -d \: -f 2 )
+		PORT=${PORT:-$GALERA_PORT}
+		nc -z $HOST $PORT >/dev/null && break
+	done
+	if [ ${ADDRESS} == "0" ]; then
+		eerror "None of the nodes in $GALERA_NODES is accessible"
+		return 1
+	fi
+
+	OPTIONS="-d -a gcomm://$ADDRESS"
+	[ -n "$GALERA_GROUP" ]   && OPTIONS="$OPTIONS -g $GALERA_GROUP"
+	[ -n "$GALERA_OPTIONS" ] && OPTIONS="$OPTIONS -o $GALERA_OPTIONS"
+	[ -n "$LOG_FILE" ]       && OPTIONS="$OPTIONS -l $LOG_FILE"
+
+	ebegin "Starting ${SVCNAME} "
+	start-stop-daemon --start --quiet --background \
+			--pidfile "${PIDFILE}" --make-pidfile \
+	                  --exec /usr/bin/garbd -- $OPTIONS
+	rcode=$?
+	# Hack: sleep a bit to give garbd some time to fork
+	sleep 1
+	eend $rcode
+}

diff --git a/sys-cluster/galera/galera-23.2.4.ebuild b/sys-cluster/galera/galera-23.2.4.ebuild
new file mode 100644
index 0000000..3dab48e
--- /dev/null
+++ b/sys-cluster/galera/galera-23.2.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_P="${PN}-${PV}-src"
+
+inherit scons-utils multilib toolchain-funcs base versionator
+DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+HOMEPAGE="http://www.codership.org/"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="garbd ssl test"
+
+RDEPEND="
+	 ssl? ( dev-libs/openssl )
+	>=dev-libs/boost-1.41
+	"
+DEPEND="${DEPEND}
+	${RDEPEND}
+	test? ( dev-libs/check )
+	>=sys-devel/gcc-4.4
+	>=dev-cpp/asio-1.4.8[ssl?]
+	"
+#Run time only
+RDEPEND="${RDEPEND}
+	garbd? ( || (
+		net-analyzer/netcat
+		net-analyzer/netcat6
+		net-analyzer/gnu-netcat
+		net-analyzer/openbsd-netcat
+	) )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	#Remove bundled dev-cpp/asio
+	rm -fr "${S}/asio"
+	#Remove Werror from build file, no way to disable
+	sed -i	-e "s/-Werror //" \
+		-e "s/LINKFLAGS = link_arch/LINKFLAGS = link_arch + ' ' + os.environ['LDFLAGS']/" \
+		"${S}/SConstruct"
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -fr "${S}/garb"
+	fi
+	if ! use test ; then
+		epatch "${FILESDIR}/disable-tests.patch"
+	fi
+}
+
+src_configure() {
+	tc-export CC
+	tc-export CXX
+	myesconsargs=(
+		$(use_scons ssl ssl 1 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}/garbd.cnf" garbd
+		newinitd "${FILESDIR}/garbd.sh" garbd
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}

diff --git a/sys-cluster/galera/metadata.xml b/sys-cluster/galera/metadata.xml
new file mode 100644
index 0000000..6c8e585
--- /dev/null
+++ b/sys-cluster/galera/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>mysql</herd>
+<use>
+  <flag name='garbd'>Install Galera Arbitrator - a stateless daemon which acts as a lightweight group member</flag>
+</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2013-08-21 17:28 Brian Evans
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2013-08-21 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     1b4b8d47c0892309bd613caa890672906dce91c4
Author:     Brian Evans <grknight <AT> lavabit <DOT> com>
AuthorDate: Wed Aug 21 17:25:16 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Wed Aug 21 17:25:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=1b4b8d47

[sys-cluster/galera] Revbump to fix issues report in Bug 466706 Comment 14

Package-Manager: portage-2.1.12.2

---
 sys-cluster/galera/ChangeLog                       |  6 ++
 sys-cluster/galera/files/garb.sh                   | 77 ++++++++++++----------
 ...alera-23.2.4.ebuild => galera-23.2.4-r1.ebuild} | 13 +++-
 3 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog
index ef382a7..a9eb07b 100644
--- a/sys-cluster/galera/ChangeLog
+++ b/sys-cluster/galera/ChangeLog
@@ -1,3 +1,9 @@
+*galera-23.2.4-r1 (21 Aug 2013)
+
+  21 Aug 2013; Brian Evans <grknight@tuffmail.com> +galera-23.2.4-r1.ebuild,
+  -galera-23.2.4.ebuild, files/garb.sh:
+  [sys-cluster/galera] Revbump to fix issues report in Bug 466706 Comment 14
+
 *galera-23.2.4 (14 May 2013)
 
   14 May 2013;  <grknight@lavabit.com> +files/disable-tests.patch,

diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
old mode 100755
new mode 100644
index 1744639..6f0cc93
--- a/sys-cluster/galera/files/garb.sh
+++ b/sys-cluster/galera/files/garb.sh
@@ -1,58 +1,63 @@
 #!/sbin/runscript
-#
-# Copyright (C) 2012 Codership Oy <info@codership.com>
-# Modified by: Brian Evans <grknight@lavabit.com> for OpenRC
-# $Header: $
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 
 depend() {
-	need net
-}
-
-stop() {
-	ebegin $"Shutting down "${SVCNAME}" "
-	start-stop-daemon --stop --quiet --oknodo --retry TERM/30/KILL/5 \
-		                  --pidfile $PIDFILE
-	eend $?
+	use net
+	after mysql
 }
 
 start() {
-	local rcode
+	ebegin "Starting ${SVCNAME}"
 
-	# Check that node addresses are configured
-	if [ -z "$GALERA_NODES" ]; then
+	if [ -z "${GALERA_NODES}" ]; then
 		eerror "List of GALERA_NODES is not configured"
-		return 6
+		return 1
 	fi
-	if [ -z "$GALERA_GROUP" ]; then
-		eerror "GALERA_GROUP name is not configured" 
-		return 6
+
+	if [ -z "${GALERA_GROUP}" ]; then
+		eerror "GALERA_GROUP name is not configured"
+		return 1
 	fi
 
-	GALERA_PORT=${GALERA_PORT:-4567}
+	GALERA_PORT="${GALERA_PORT:-4567}"
 
-	# Find a working node
 	for ADDRESS in ${GALERA_NODES} 0; do
 		HOST=$(echo $ADDRESS | cut -d \: -f 1 )
 		PORT=$(echo $ADDRESS | cut -d \: -f 2 )
+		if [[ "${HOST}" == "${PORT}" ]]; then
+			PORT=${GALERA_PORT}
+		fi
 		PORT=${PORT:-$GALERA_PORT}
-		nc -z $HOST $PORT >/dev/null && break
+		nc -z ${HOST} ${PORT} > /dev/null &&  break
 	done
 	if [ ${ADDRESS} == "0" ]; then
-		eerror "None of the nodes in $GALERA_NODES is accessible"
+		eerror "None of the nodes in GALERA_NODES is accessible"
 		return 1
 	fi
 
-	OPTIONS="-d -a gcomm://$ADDRESS"
-	[ -n "$GALERA_GROUP" ]   && OPTIONS="$OPTIONS -g $GALERA_GROUP"
-	[ -n "$GALERA_OPTIONS" ] && OPTIONS="$OPTIONS -o $GALERA_OPTIONS"
-	[ -n "$LOG_FILE" ]       && OPTIONS="$OPTIONS -l $LOG_FILE"
-
-	ebegin "Starting ${SVCNAME} "
-	start-stop-daemon --start --quiet --background \
-			--pidfile "${PIDFILE}" --make-pidfile \
-	                  --exec /usr/bin/garbd -- $OPTIONS
-	rcode=$?
-	# Hack: sleep a bit to give garbd some time to fork
-	sleep 1
-	eend $rcode
+	OPTIONS="-a gcomm://${ADDRESS} -g ${GALERA_GROUP}"
+	[ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
+        [ -n "${LOG_FILE}" ]       && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
+
+	start-stop-daemon \
+		--start \
+		--exec /usr/bin/garbd \
+		--pidfile "${PIDFILE}" \
+		--make-pidfile \
+		--user garbd \
+		--group garbd \
+		--background \
+		-- ${OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon \
+		--stop \
+		--exec /usr/bin/garbd \
+		--pidfile "${PIDFILE}"
+	eend $?
 }
+

diff --git a/sys-cluster/galera/galera-23.2.4.ebuild b/sys-cluster/galera/galera-23.2.4-r1.ebuild
similarity index 87%
rename from sys-cluster/galera/galera-23.2.4.ebuild
rename to sys-cluster/galera/galera-23.2.4-r1.ebuild
index 3dab48e..a4d2bc5 100644
--- a/sys-cluster/galera/galera-23.2.4.ebuild
+++ b/sys-cluster/galera/galera-23.2.4-r1.ebuild
@@ -38,10 +38,17 @@ RDEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd
+	fi
+}
+
 src_prepare() {
 	#Remove bundled dev-cpp/asio
 	rm -fr "${S}/asio"
-	#Remove Werror from build file, no way to disable
+	#Remove Werror from build file, no way to disable. Also, respect LDFLAGS.
 	sed -i	-e "s/-Werror //" \
 		-e "s/LINKFLAGS = link_arch/LINKFLAGS = link_arch + ' ' + os.environ['LDFLAGS']/" \
 		"${S}/SConstruct"
@@ -70,8 +77,8 @@ src_install() {
 	dodoc scripts/packages/README scripts/packages/README-MySQL
 	if use garbd ; then
 		dobin garb/garbd
-		newconfd "${FILESDIR}/garbd.cnf" garbd
-		newinitd "${FILESDIR}/garbd.sh" garbd
+		newconfd "${FILESDIR}/garb.cnf" garbd
+		newinitd "${FILESDIR}/garb.sh" garbd
 	fi
 	exeinto /usr/$(get_libdir)/${PN}
 	doexe libgalera_smm.so


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2013-11-18 21:34 Brian Evans
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2013-11-18 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     63bc866aebd78a30555d2fbede401634e9346104
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Mon Nov 18 21:33:47 2013 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Mon Nov 18 21:33:47 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=63bc866a

[galera] Version bump

Package-Manager: portage-2.2.7

---
 sys-cluster/galera/ChangeLog                       |  6 ++
 sys-cluster/galera/Manifest                        |  1 +
 .../galera/files/disable-tests-23.2.7.patch        | 76 +++++++++++++++++++
 sys-cluster/galera/galera-23.2.7.ebuild            | 86 ++++++++++++++++++++++
 4 files changed, 169 insertions(+)

diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog
index a9eb07b..6651511 100644
--- a/sys-cluster/galera/ChangeLog
+++ b/sys-cluster/galera/ChangeLog
@@ -1,3 +1,9 @@
+*galera-23.2.7 (18 Nov 2013)
+
+  18 Nov 2013; Brian Evans <grknight@tuffmail.com>
+  +files/disable-tests-23.2.7.patch, +galera-23.2.7.ebuild:
+  [galera] Version bump
+
 *galera-23.2.4-r1 (21 Aug 2013)
 
   21 Aug 2013; Brian Evans <grknight@tuffmail.com> +galera-23.2.4-r1.ebuild,

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
index 4b82998..413510a 100644
--- a/sys-cluster/galera/Manifest
+++ b/sys-cluster/galera/Manifest
@@ -1 +1,2 @@
 DIST galera-23.2.4-src.tar.gz 3061934 SHA256 83eec5e8df53b9adcd601a84312a54e843b2584b0cbe445125c2266b22590e78 SHA512 b953d07cdd69c7e42e80053125bb69f4becf457529924768348846612db49d92c4a46e6c85739cc0c0b102d703dc3a3b73bc368171e6f863a1f56b2cd22cb711 WHIRLPOOL 3842dd7f4bd11ab4cb656c3d89758232b96d85ba64919932d03dde2f44cb13bdf7913e6d217e6ca49f376aaf15b7271d3a870a16ba1010d522b57ff59247edc2
+DIST galera-23.2.7-src.tar.gz 3140705 SHA256 b444583753462281e8ddadc3a10463687ecedc089d763251f8658c6232aaa927 SHA512 15b21f060ecff44dc11f57955867b938831e41cef7b27737fbd050cc9c9af4fed9cc9d62584b445277b8ab087444a7e31d5d20d6ee188c4bb9956e4ba22bcbcc WHIRLPOOL 011a3b943dcbaf4efc5628f3be5ff7b95f45862cd115729d13201599455a1576fbd43a7baf37c15240f7d164bf50df2ef078645fa8d7ccf96a3f67b1f4d2b482

diff --git a/sys-cluster/galera/files/disable-tests-23.2.7.patch b/sys-cluster/galera/files/disable-tests-23.2.7.patch
new file mode 100644
index 0000000..fd6c0a0
--- /dev/null
+++ b/sys-cluster/galera/files/disable-tests-23.2.7.patch
@@ -0,0 +1,76 @@
+diff -aurN a/galera/SConstruct b/galera/SConstruct
+--- a/galera/SConstruct	2013-10-16 10:08:43.057673018 -0400
++++ b/galera/SConstruct	2013-10-16 10:10:04.687494314 -0400
+@@ -407,19 +407,20 @@
+ # Clone base from default environment
+ check_env = env.Clone()
+ 
+-conf = Configure(check_env)
++if tests == 1:
++    conf = Configure(check_env)
+ 
+ # Check header and library
+ 
+-if not conf.CheckHeader('check.h'):
+-    print 'Error: check header file not found or not usable'
+-    Exit(1)
+-
+-if not conf.CheckLib('check'):
+-    print 'Error: check library not found or not usable'
+-    Exit(1)
++    if not conf.CheckHeader('check.h'):
++        print 'Error: check header file not found or not usable'
++        Exit(1)
++
++    if not conf.CheckLib('check'):
++        print 'Error: check library not found or not usable'
++        Exit(1)
+ 
+-conf.Finish()
++    conf.Finish()
+ 
+ # Note: Don't do this, glibc does not like static linking
+ # Link unit tests statically
+diff -aurN a/galera/SConscript b/galera/SConscript
+--- a/galera/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/galera/SConscript	2013-05-13 13:13:20.851827437 -0400
+@@ -1,2 +1,2 @@
+ 
+-SConscript(['src/SConscript', 'tests/SConscript'])
++SConscript(['src/SConscript'])
+diff -aurN a/galerautils/SConscript b/galerautils/SConscript
+--- a/galerautils/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/galerautils/SConscript	2013-05-13 13:15:37.010071765 -0400
+@@ -1,3 +1,3 @@
+ # SConscript for building galerautils
+ 
+-SConscript(Split('''src/SConscript tests/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcache/SConscript b/gcache/SConscript
+--- a/gcache/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcache/SConscript	2013-05-13 13:15:55.179837389 -0400
+@@ -1,3 +1,3 @@
+ # SConscript for building galerautils
+ 
+-SConscript(Split('''src/SConscript tests/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcomm/SConscript b/gcomm/SConscript
+--- a/gcomm/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcomm/SConscript	2013-05-13 13:16:08.979659369 -0400
+@@ -1,3 +1,3 @@
+ # SCons build script for building gcomm
+ 
+-SConscript(Split('''src/SConscript test/SConscript'''))
++SConscript(Split('''src/SConscript'''))
+diff -aurN a/gcs/src/SConscript b/gcs/src/SConscript
+--- a/gcs/src/SConscript	2013-03-11 02:44:50.000000000 -0400
++++ b/gcs/src/SConscript	2013-05-13 13:12:53.122184848 -0400
+@@ -46,8 +46,6 @@
+                      source = 'gcs_test.c',
+                      LINK = libgcs_env['CXX'])
+ 
+-SConscript('unit_tests/SConscript')
+-
+ #
+ env.Append(LIBGALERA_OBJS = libgcs_env.SharedObject(libgcs_sources))
+ 

diff --git a/sys-cluster/galera/galera-23.2.7.ebuild b/sys-cluster/galera/galera-23.2.7.ebuild
new file mode 100644
index 0000000..e67cfae
--- /dev/null
+++ b/sys-cluster/galera/galera-23.2.7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+MY_P="${PN}-${PV}-src"
+
+inherit scons-utils multilib toolchain-funcs base versionator
+DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
+HOMEPAGE="http://www.codership.org/"
+SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="garbd ssl test"
+
+RDEPEND="
+	 ssl? ( dev-libs/openssl )
+	>=dev-libs/boost-1.41
+	"
+DEPEND="${DEPEND}
+	${RDEPEND}
+	dev-libs/check
+	>=sys-devel/gcc-4.4
+	>=dev-cpp/asio-1.4.8[ssl?]
+	"
+#Run time only
+RDEPEND="${RDEPEND}
+	garbd? ( || (
+		net-analyzer/netcat
+		net-analyzer/netcat6
+		net-analyzer/gnu-netcat
+		net-analyzer/openbsd-netcat
+	) )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_preinst() {
+	if use garbd ; then
+		enewgroup garbd
+		enewuser garbd
+	fi
+}
+
+src_prepare() {
+	#Remove bundled dev-cpp/asio
+	rm -fr "${S}/asio"
+	#Remove Werror from build file, no way to disable. Also, respect LDFLAGS.
+	sed -i	-e "s/-Werror //" \
+		-e "s/LINKFLAGS = link_arch/LINKFLAGS = link_arch + ' ' + os.environ['LDFLAGS']/" \
+		"${S}/SConstruct"
+	#Remove optional garbd daemon
+	if ! use garbd ; then
+		rm -fr "${S}/garb"
+	fi
+#	if ! use test ; then
+#		epatch "${FILESDIR}/disable-tests-${PV}.patch"
+#	fi
+}
+
+src_configure() {
+	tc-export CC
+	tc-export CXX
+	myesconsargs=(
+		$(use_scons ssl ssl 1 0)
+		$(use_scons test tests 1 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
+	fi
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe libgalera_smm.so
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2014-03-07 20:30 Brian Evans
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2014-03-07 20:30 UTC (permalink / raw
  To: gentoo-commits

commit:     9f179e1e9d277f482af2ef218325465e3a676a7d
Author:     Brian Evans <grknight <AT> tuffmail <DOT> com>
AuthorDate: Fri Mar  7 20:17:50 2014 +0000
Commit:     Brian Evans <grknight <AT> lavabit <DOT> com>
CommitDate: Fri Mar  7 20:17:50 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=9f179e1e

[galera] Provide a proper flags patch

---
 sys-cluster/galera/files/respect-flags.patch | 35 ++++++++++++++++++++++++++++
 sys-cluster/galera/galera-25.3.2.ebuild      | 14 +++++------
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/sys-cluster/galera/files/respect-flags.patch b/sys-cluster/galera/files/respect-flags.patch
new file mode 100644
index 0000000..d7e5f37
--- /dev/null
+++ b/sys-cluster/galera/files/respect-flags.patch
@@ -0,0 +1,35 @@
+--- a/SConstruct	2014-03-07 14:27:26.797904671 -0500
++++ b/SConstruct	2014-03-07 14:31:18.672478115 -0500
+@@ -49,7 +49,7 @@
+ build_target = 'all'
+ 
+ # Optimization level
+-opt_flags    = ' -g -O3 -DNDEBUG'
++opt_flags    = ' -DNDEBUG'
+ 
+ # Architecture (defaults to build host type)
+ compile_arch = ''
+@@ -214,12 +214,12 @@
+                       ' -Wall -Wextra -Wno-unused-parameter')
+ 
+ # C-specific flags
+-env.Replace(CFLAGS = ' -std=c99 -fno-strict-aliasing -pipe')
++env.Replace(CFLAGS = os.getenv('CFLAGS','') + ' -std=c99 -fno-strict-aliasing -pipe')
+ 
+ # CXX-specific flags
+ # Note: not all 3rd-party libs like '-Wold-style-cast -Weffc++'
+ #       adding those after checks
+-env.Replace(CXXFLAGS = ' -Wno-long-long -Wno-deprecated -ansi')
++env.Replace(CXXFLAGS = os.getenv('CXXFLAGS','') + ' -Wno-long-long -Wno-deprecated -ansi')
+ if sysname != 'sunos':
+     env.Append(CXXFLAGS = ' -pipe')
+ 
+@@ -228,7 +228,7 @@
+ # TODO: enable '-Wl,--warn-common -Wl,--fatal-warnings' after warnings from
+ # static linking have beed addressed
+ #
+-env.Append(LINKFLAGS = link_arch)
++env.Append(LINKFLAGS = link_arch + ' ' + os.getenv('LDFLAGS',''))
+ 
+ #
+ # Check required headers and libraries (autoconf functionality)

diff --git a/sys-cluster/galera/galera-25.3.2.ebuild b/sys-cluster/galera/galera-25.3.2.ebuild
index 5e5c42b..4b96af4 100644
--- a/sys-cluster/galera/galera-25.3.2.ebuild
+++ b/sys-cluster/galera/galera-25.3.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 MY_P="${PN}-${PV}-src"
 
-inherit scons-utils multilib toolchain-funcs base versionator
+inherit scons-utils multilib toolchain-funcs base versionator eutils
 DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
 HOMEPAGE="http://www.codership.org/"
 SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
@@ -48,20 +48,20 @@ pkg_preinst() {
 src_prepare() {
 	# Remove bundled dev-cpp/asio
 	rm -fr "${S}/asio"
-	# Respect LDFLAGS.
-	sed -i	-e "s/LINKFLAGS = link_arch/LINKFLAGS = link_arch + ' ' + os.environ['LDFLAGS']/" \
-		"${S}/SConstruct"
+	
+	# Respect {C,LD}FLAGS.
+	epatch "${FILESDIR}/respect-flags.patch"
+	
 	#Remove optional garbd daemon
 	if ! use garbd ; then
 		rm -fr "${S}/garb"
 	fi
+	
+	epatch_user
 }
 
 src_configure() {
 	tc-export CC CXX
-	CPPFLAGS=${CPPFLAGS:-$CXXFLAGS}
-	export CPPFLAGS
-	tc-export_build_env
 	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
 	# and -Wold-style-cast
 	myesconsargs=(


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/, sys-cluster/galera/files/
@ 2018-03-08 17:37 Brian Evans
  0 siblings, 0 replies; 5+ messages in thread
From: Brian Evans @ 2018-03-08 17:37 UTC (permalink / raw
  To: gentoo-commits

commit:     648dc76eb5a9a0f1ebeaa88b8086192bb2543936
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  8 17:34:49 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar  8 17:34:49 2018 +0000
URL:        https://gitweb.gentoo.org/proj/mysql.git/commit/?id=648dc76e

sys-cluster/galera: Remove;  old versions and ::gentoo is newer

 sys-cluster/galera/ChangeLog                       | 35 ---------
 sys-cluster/galera/Manifest                        | 17 -----
 .../galera/files/disable-tests-23.2.7.patch        | 76 -------------------
 sys-cluster/galera/files/garb.cnf                  | 17 -----
 sys-cluster/galera/files/garb.sh                   | 63 ----------------
 sys-cluster/galera/files/respect-flags.patch       | 35 ---------
 sys-cluster/galera/galera-23.2.7.ebuild            | 86 ---------------------
 sys-cluster/galera/galera-25.3.5.ebuild            | 87 ----------------------
 sys-cluster/galera/galera-25.3.7.ebuild            | 87 ----------------------
 sys-cluster/galera/metadata.xml                    | 11 ---
 10 files changed, 514 deletions(-)

diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog
deleted file mode 100644
index a9dd029..0000000
--- a/sys-cluster/galera/ChangeLog
+++ /dev/null
@@ -1,35 +0,0 @@
-*galera-25.3.7 (14 Nov 2014)
-
-  14 Nov 2014; Brian Evans <grknight@gentoo.org> +galera-25.3.7.ebuild,
-  -files/disable-tests.patch, -galera-23.2.4-r1.ebuild, -galera-25.3.2.ebuild:
-  Version bump; drop old
-
-  01 Nov 2014; Brian Evans <grknight@gentoo.org> files/garb.sh,
-  galera-25.3.5.ebuild:
-  [galera] Sync changes from tree for enewuser and bashisms
-
-  31 Oct 2014; Brian Evans <grknight@gentoo.org> galera-25.3.5.ebuild:
-  Sync from main tree for user eclass. Thanks for dcmwai on IRC for noticing
-
-*galera-25.3.2 (13 Feb 2014)
-
-  13 Feb 2014;  <grknight@gentoo.org> +galera-25.3.2.ebuild:
-  [galera] Version bump for new 25.x series
-
-*galera-23.2.7 (18 Nov 2013)
-
-  18 Nov 2013; Brian Evans <grknight@tuffmail.com>
-  +files/disable-tests-23.2.7.patch, +galera-23.2.7.ebuild:
-  [galera] Version bump
-
-*galera-23.2.4-r1 (21 Aug 2013)
-
-  21 Aug 2013; Brian Evans <grknight@tuffmail.com> +galera-23.2.4-r1.ebuild,
-  -galera-23.2.4.ebuild, files/garb.sh:
-  [sys-cluster/galera] Revbump to fix issues report in Bug 466706 Comment 14
-
-*galera-23.2.4 (14 May 2013)
-
-  14 May 2013;  <grknight@lavabit.com> +files/disable-tests.patch,
-  +files/garb.cnf, +files/garb.sh, +galera-23.2.4.ebuild, +metadata.xml:
-  Add required runtime-only library for mariadb-galera

diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest
deleted file mode 100644
index 50c141c..0000000
--- a/sys-cluster/galera/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST galera-23.2.7-src.tar.gz 3140705 SHA256 b444583753462281e8ddadc3a10463687ecedc089d763251f8658c6232aaa927 SHA512 15b21f060ecff44dc11f57955867b938831e41cef7b27737fbd050cc9c9af4fed9cc9d62584b445277b8ab087444a7e31d5d20d6ee188c4bb9956e4ba22bcbcc WHIRLPOOL 011a3b943dcbaf4efc5628f3be5ff7b95f45862cd115729d13201599455a1576fbd43a7baf37c15240f7d164bf50df2ef078645fa8d7ccf96a3f67b1f4d2b482
-DIST galera-25.3.5-src.tar.gz 3820268 SHA256 9e6d718bac9608c69cbfc0662963b29c13659c576aaa8469b6a325d75603f7a3 SHA512 34bd01c46b080219106e140a7ff011c39ce2c9afaf6b8205daca91347ac3979a3af61bcddaf9c5cc63748b19236a2e4efa88532760b347fefa38e037f90b0995 WHIRLPOOL 055a59cc3631ccb0501c2ce4c5812ae0e001104254a97540f78a3f8feaed94b85bd82ecc3e1e4a3c2e477ab6f02d638dc8e8ea1471b8a63ca603f3a9ecd6403d
-DIST release_25.3.7.tar.gz 3889105 SHA256 7066c6299cd8ad6108dddf5d625dbb579cbd9f81b0f7f461b49c60c056ff3d6b SHA512 be22645a5b2c7a5e2ecfce2e348884cf6ba171b31337ccc93192a1b7e81b02d08528b696d22da3f3296360bea8148419e345bde76d7e20a6d3f984eb6595b61b WHIRLPOOL 77c4e1cde57e4bc35393deb97cd3820b7aaabc836a0d260a464b2ab00ad9dceb3f326ff562b07bc63877936b739808ca3737fc73aa6e7f8e2f360e717f6d6e87
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQEcBAEBCAAGBQJUZkzYAAoJEE4V4vFnx44dHP0IALOKRuX31KBQhey2o3BEvBv+
-RAMGEb0CUUw4nvwyxyXNsSDbfuXogNKh9XsQhk1Aw50RK96VD5d+UlcyEtXTQVAL
-kMlkFfcvrnXgUYb8i3dAsZqFQZmoQvS2nerfZXoxt3MYPeFA7ee41EhEapG3KEsn
-6jmB2bvKBJKxafhj0LWwpZxGLUJGbGUhhVIH+aUh9WV2S8jcvORp8f95g2QfvXfH
-sy4aegntCX+Yww+TsGoj8riWDaq1paPy3ldobX3h1tO/6Ju49F2wgujTB7afFPlF
-9YJs4Rm61HHoDdh3MLYOkd55qUeu0DFpJCX0fcJhNSnFIDvQsRJxMaivYFX4NrE=
-=rsGA
------END PGP SIGNATURE-----

diff --git a/sys-cluster/galera/files/disable-tests-23.2.7.patch b/sys-cluster/galera/files/disable-tests-23.2.7.patch
deleted file mode 100644
index fd6c0a0..0000000
--- a/sys-cluster/galera/files/disable-tests-23.2.7.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -aurN a/galera/SConstruct b/galera/SConstruct
---- a/galera/SConstruct	2013-10-16 10:08:43.057673018 -0400
-+++ b/galera/SConstruct	2013-10-16 10:10:04.687494314 -0400
-@@ -407,19 +407,20 @@
- # Clone base from default environment
- check_env = env.Clone()
- 
--conf = Configure(check_env)
-+if tests == 1:
-+    conf = Configure(check_env)
- 
- # Check header and library
- 
--if not conf.CheckHeader('check.h'):
--    print 'Error: check header file not found or not usable'
--    Exit(1)
--
--if not conf.CheckLib('check'):
--    print 'Error: check library not found or not usable'
--    Exit(1)
-+    if not conf.CheckHeader('check.h'):
-+        print 'Error: check header file not found or not usable'
-+        Exit(1)
-+
-+    if not conf.CheckLib('check'):
-+        print 'Error: check library not found or not usable'
-+        Exit(1)
- 
--conf.Finish()
-+    conf.Finish()
- 
- # Note: Don't do this, glibc does not like static linking
- # Link unit tests statically
-diff -aurN a/galera/SConscript b/galera/SConscript
---- a/galera/SConscript	2013-03-11 02:44:50.000000000 -0400
-+++ b/galera/SConscript	2013-05-13 13:13:20.851827437 -0400
-@@ -1,2 +1,2 @@
- 
--SConscript(['src/SConscript', 'tests/SConscript'])
-+SConscript(['src/SConscript'])
-diff -aurN a/galerautils/SConscript b/galerautils/SConscript
---- a/galerautils/SConscript	2013-03-11 02:44:50.000000000 -0400
-+++ b/galerautils/SConscript	2013-05-13 13:15:37.010071765 -0400
-@@ -1,3 +1,3 @@
- # SConscript for building galerautils
- 
--SConscript(Split('''src/SConscript tests/SConscript'''))
-+SConscript(Split('''src/SConscript'''))
-diff -aurN a/gcache/SConscript b/gcache/SConscript
---- a/gcache/SConscript	2013-03-11 02:44:50.000000000 -0400
-+++ b/gcache/SConscript	2013-05-13 13:15:55.179837389 -0400
-@@ -1,3 +1,3 @@
- # SConscript for building galerautils
- 
--SConscript(Split('''src/SConscript tests/SConscript'''))
-+SConscript(Split('''src/SConscript'''))
-diff -aurN a/gcomm/SConscript b/gcomm/SConscript
---- a/gcomm/SConscript	2013-03-11 02:44:50.000000000 -0400
-+++ b/gcomm/SConscript	2013-05-13 13:16:08.979659369 -0400
-@@ -1,3 +1,3 @@
- # SCons build script for building gcomm
- 
--SConscript(Split('''src/SConscript test/SConscript'''))
-+SConscript(Split('''src/SConscript'''))
-diff -aurN a/gcs/src/SConscript b/gcs/src/SConscript
---- a/gcs/src/SConscript	2013-03-11 02:44:50.000000000 -0400
-+++ b/gcs/src/SConscript	2013-05-13 13:12:53.122184848 -0400
-@@ -46,8 +46,6 @@
-                      source = 'gcs_test.c',
-                      LINK = libgcs_env['CXX'])
- 
--SConscript('unit_tests/SConscript')
--
- #
- env.Append(LIBGALERA_OBJS = libgcs_env.SharedObject(libgcs_sources))
- 

diff --git a/sys-cluster/galera/files/garb.cnf b/sys-cluster/galera/files/garb.cnf
deleted file mode 100644
index 4f0047a..0000000
--- a/sys-cluster/galera/files/garb.cnf
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright (C) 2012 Coedership Oy
-# This config file is to be sourced by garbd service script.
-
-# A space-separated list of node addresses (address[:port]) in the cluster
-# GALERA_NODES=""
-
-# Galera cluster name, should be the same as on the rest of the nodes.
-# GALERA_GROUP=""
-
-# Optional Galera internal options string (e.g. SSL settings)
-# see http://www.codership.com/wiki/doku.php?id=galera_parameters
-# GALERA_OPTIONS=""
-
-# Log file for garbd. Optional, by default logs to syslog
-# LOG_FILE=""
-
-PIDFILE=/var/run/garbd

diff --git a/sys-cluster/galera/files/garb.sh b/sys-cluster/galera/files/garb.sh
deleted file mode 100644
index 63e88df..0000000
--- a/sys-cluster/galera/files/garb.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-	after mysql
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-
-	if [ -z "${GALERA_NODES}" ]; then
-		eerror "List of GALERA_NODES is not configured"
-		return 1
-	fi
-
-	if [ -z "${GALERA_GROUP}" ]; then
-		eerror "GALERA_GROUP name is not configured"
-		return 1
-	fi
-
-	GALERA_PORT="${GALERA_PORT:-4567}"
-
-	for ADDRESS in ${GALERA_NODES} 0; do
-		HOST=$(echo $ADDRESS | cut -d \: -f 1 )
-		PORT=$(echo $ADDRESS | cut -d \: -f 2 )
-		if [ "x${HOST}" = "x${PORT}" ]; then
-			PORT=${GALERA_PORT}
-		fi
-		PORT=${PORT:-$GALERA_PORT}
-		nc -z ${HOST} ${PORT} > /dev/null &&  break
-	done
-	if [ ${ADDRESS} = "0" ]; then
-		eerror "None of the nodes in GALERA_NODES is accessible"
-		return 1
-	fi
-
-	OPTIONS="-a gcomm://${ADDRESS} -g ${GALERA_GROUP}"
-	[ -n "${GALERA_OPTIONS}" ] && OPTIONS="${OPTIONS} -o ${GALERA_OPTIONS}"
-        [ -n "${LOG_FILE}" ]       && OPTIONS="${OPTIONS} -l ${LOG_FILE}"
-
-	start-stop-daemon \
-		--start \
-		--exec /usr/bin/garbd \
-		--pidfile "${PIDFILE}" \
-		--make-pidfile \
-		--user garbd \
-		--group garbd \
-		--background \
-		-- ${OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon \
-		--stop \
-		--exec /usr/bin/garbd \
-		--pidfile "${PIDFILE}"
-	eend $?
-}
-

diff --git a/sys-cluster/galera/files/respect-flags.patch b/sys-cluster/galera/files/respect-flags.patch
deleted file mode 100644
index d7e5f37..0000000
--- a/sys-cluster/galera/files/respect-flags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/SConstruct	2014-03-07 14:27:26.797904671 -0500
-+++ b/SConstruct	2014-03-07 14:31:18.672478115 -0500
-@@ -49,7 +49,7 @@
- build_target = 'all'
- 
- # Optimization level
--opt_flags    = ' -g -O3 -DNDEBUG'
-+opt_flags    = ' -DNDEBUG'
- 
- # Architecture (defaults to build host type)
- compile_arch = ''
-@@ -214,12 +214,12 @@
-                       ' -Wall -Wextra -Wno-unused-parameter')
- 
- # C-specific flags
--env.Replace(CFLAGS = ' -std=c99 -fno-strict-aliasing -pipe')
-+env.Replace(CFLAGS = os.getenv('CFLAGS','') + ' -std=c99 -fno-strict-aliasing -pipe')
- 
- # CXX-specific flags
- # Note: not all 3rd-party libs like '-Wold-style-cast -Weffc++'
- #       adding those after checks
--env.Replace(CXXFLAGS = ' -Wno-long-long -Wno-deprecated -ansi')
-+env.Replace(CXXFLAGS = os.getenv('CXXFLAGS','') + ' -Wno-long-long -Wno-deprecated -ansi')
- if sysname != 'sunos':
-     env.Append(CXXFLAGS = ' -pipe')
- 
-@@ -228,7 +228,7 @@
- # TODO: enable '-Wl,--warn-common -Wl,--fatal-warnings' after warnings from
- # static linking have beed addressed
- #
--env.Append(LINKFLAGS = link_arch)
-+env.Append(LINKFLAGS = link_arch + ' ' + os.getenv('LDFLAGS',''))
- 
- #
- # Check required headers and libraries (autoconf functionality)

diff --git a/sys-cluster/galera/galera-23.2.7.ebuild b/sys-cluster/galera/galera-23.2.7.ebuild
deleted file mode 100644
index 1a67e92..0000000
--- a/sys-cluster/galera/galera-23.2.7.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-${PV}-src"
-
-inherit scons-utils multilib toolchain-funcs base versionator
-DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
-HOMEPAGE="http://www.codership.org/"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="garbd ssl test"
-
-RDEPEND="
-	 ssl? ( dev-libs/openssl )
-	>=dev-libs/boost-1.41
-	"
-DEPEND="${DEPEND}
-	${RDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.4.8[ssl?]
-	"
-#Run time only
-RDEPEND="${RDEPEND}
-	garbd? ( || (
-		net-analyzer/netcat
-		net-analyzer/netcat6
-		net-analyzer/gnu-netcat
-		net-analyzer/openbsd-netcat
-	) )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_preinst() {
-	if use garbd ; then
-		enewgroup garbd
-		enewuser garbd
-	fi
-}
-
-src_prepare() {
-	#Remove bundled dev-cpp/asio
-	rm -fr "${S}/asio"
-	#Remove Werror from build file, no way to disable. Also, respect LDFLAGS.
-	sed -i	-e "s/-Werror //" \
-		-e "s/LINKFLAGS = link_arch/LINKFLAGS = link_arch + ' ' + os.environ['LDFLAGS']/" \
-		"${S}/SConstruct"
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -fr "${S}/garb"
-	fi
-#	if ! use test ; then
-#		epatch "${FILESDIR}/disable-tests-${PV}.patch"
-#	fi
-}
-
-src_configure() {
-	tc-export CC
-	tc-export CXX
-	myesconsargs=(
-		$(use_scons ssl ssl 1 0)
-		$(use_scons test tests 1 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
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}

diff --git a/sys-cluster/galera/galera-25.3.5.ebuild b/sys-cluster/galera/galera-25.3.5.ebuild
deleted file mode 100644
index 4a2f4d1..0000000
--- a/sys-cluster/galera/galera-25.3.5.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_P="${PN}-${PV}-src"
-
-inherit scons-utils multilib toolchain-funcs base versionator eutils user
-DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
-HOMEPAGE="http://www.codership.org/"
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range 2).x/${PV}/+download/${MY_P}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="garbd ssl test"
-
-CDEPEND="
-	 ssl? ( dev-libs/openssl )
-	>=dev-libs/boost-1.41
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.4.8[ssl?]
-	"
-#Run time only
-RDEPEND="${CDEPEND}
-	garbd? ( || (
-		net-analyzer/netcat
-		net-analyzer/netcat6
-		net-analyzer/gnu-netcat
-		net-analyzer/openbsd-netcat
-	) )"
-
-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"
-
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -r "${S}/garb" || die
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	tc-export CC CXX
-	# 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
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}

diff --git a/sys-cluster/galera/galera-25.3.7.ebuild b/sys-cluster/galera/galera-25.3.7.ebuild
deleted file mode 100644
index d50a5f0..0000000
--- a/sys-cluster/galera/galera-25.3.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PV="release_${PV}"
-
-inherit scons-utils multilib toolchain-funcs base versionator eutils user
-DESCRIPTION="Synchronous multi-master replication engine that provides its service through wsrep API"
-HOMEPAGE="http://www.codership.org/"
-SRC_URI="https://github.com/codership/${PN}/archive/${MY_PV}.tar.gz"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="garbd ssl test"
-
-CDEPEND="
-	 ssl? ( dev-libs/openssl )
-	>=dev-libs/boost-1.41
-	"
-DEPEND="${DEPEND}
-	${CDEPEND}
-	dev-libs/check
-	>=sys-devel/gcc-4.4
-	>=dev-cpp/asio-1.4.8[ssl?]
-	"
-#Run time only
-RDEPEND="${CDEPEND}
-	garbd? ( || (
-		net-analyzer/netcat
-		net-analyzer/netcat6
-		net-analyzer/gnu-netcat
-		net-analyzer/openbsd-netcat
-	) )"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-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"
-
-	#Remove optional garbd daemon
-	if ! use garbd ; then
-		rm -r "${S}/garb" || die
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	tc-export CC CXX
-	# 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
-	fi
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe libgalera_smm.so
-}

diff --git a/sys-cluster/galera/metadata.xml b/sys-cluster/galera/metadata.xml
deleted file mode 100644
index 919518c..0000000
--- a/sys-cluster/galera/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>mysql-bugs@gentoo.org</email>
-  <name>MySQL</name>
-</maintainer>
-<use>
-  <flag name="garbd">Install Galera Arbitrator - a stateless daemon which acts as a lightweight group member</flag>
-</use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-08 17:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-21 17:28 [gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/, sys-cluster/galera/files/ Brian Evans
  -- strict thread matches above, loose matches on Subject: below --
2018-03-08 17:37 Brian Evans
2014-03-07 20:30 Brian Evans
2013-11-18 21:34 Brian Evans
2013-06-12 18:21 Robin H. Johnson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox