From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 81AE3138A1A for ; Fri, 14 Nov 2014 18:41:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FE99E09A8; Fri, 14 Nov 2014 18:41:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0DD46E09A8 for ; Fri, 14 Nov 2014 18:41:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8AD6F340585 for ; Fri, 14 Nov 2014 18:41:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 17584A237 for ; Fri, 14 Nov 2014 18:41:42 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1415990488.4739ae8d0e9da807d26247c00bd2e4cf6ff3e507.grknight@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: sys-cluster/galera/files/, sys-cluster/galera/ X-VCS-Repository: proj/mysql X-VCS-Files: sys-cluster/galera/ChangeLog sys-cluster/galera/Manifest sys-cluster/galera/files/disable-tests.patch sys-cluster/galera/galera-23.2.4-r1.ebuild sys-cluster/galera/galera-25.3.2.ebuild sys-cluster/galera/galera-25.3.7.ebuild X-VCS-Directories: sys-cluster/galera/files/ sys-cluster/galera/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 4739ae8d0e9da807d26247c00bd2e4cf6ff3e507 X-VCS-Branch: master Date: Fri, 14 Nov 2014 18:41:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bb912959-949b-4001-9e21-c9a9322f8f7f X-Archives-Hash: a664714455acc169e15cc66c90a59b9d commit: 4739ae8d0e9da807d26247c00bd2e4cf6ff3e507 Author: Brian Evans gentoo org> AuthorDate: Fri Nov 14 18:41:28 2014 +0000 Commit: Brian Evans gentoo org> CommitDate: Fri Nov 14 18:41:28 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=4739ae8d Version bump; drop old Package-Manager: portage-2.2.14 Manifest-Sign-Key: 67C78E1D --- sys-cluster/galera/ChangeLog | 6 ++ sys-cluster/galera/Manifest | 17 ++--- sys-cluster/galera/files/disable-tests.patch | 80 -------------------- sys-cluster/galera/galera-23.2.4-r1.ebuild | 85 ---------------------- .../{galera-25.3.2.ebuild => galera-25.3.7.ebuild} | 14 ++-- 5 files changed, 21 insertions(+), 181 deletions(-) diff --git a/sys-cluster/galera/ChangeLog b/sys-cluster/galera/ChangeLog index 6d4b7e8..a9dd029 100644 --- a/sys-cluster/galera/ChangeLog +++ b/sys-cluster/galera/ChangeLog @@ -1,3 +1,9 @@ +*galera-25.3.7 (14 Nov 2014) + + 14 Nov 2014; Brian Evans +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 files/garb.sh, galera-25.3.5.ebuild: [galera] Sync changes from tree for enewuser and bashisms diff --git a/sys-cluster/galera/Manifest b/sys-cluster/galera/Manifest index 3c10197..50c141c 100644 --- a/sys-cluster/galera/Manifest +++ b/sys-cluster/galera/Manifest @@ -1,18 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -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 -DIST galera-25.3.2-src.tar.gz 3808803 SHA256 5dd54364720f8854088590bdfea1e3a7f3e37fda3dfe8a5f58ebcc987cc6788d SHA512 784476938d8d57e865685f3a43ed95d1aeed151dd145476bc094d5a132c87bdaab2cd9c8aac610adc4c847dfbf814b0d59cddaa68b73c741fd6918738f52f545 WHIRLPOOL 01c51a6ba5f069890e9c529bde7d7ce7bb7e16997779ab074be592257792f5c5d3d146e228548a2db31acf5fab0d7e410506118f03c2fdb44004fb364a3cc6fa 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 -iQEcBAEBCAAGBQJUU/ceAAoJEE4V4vFnx44dYkwH/iYwDNMBcc7lufB7IxaWs8zO -p1t2GP4VSOZQPb47pJhfvmsbOUSq3maiZ2XCRm2N17HvFcLSyYnEKhGib8FkFJsk -e/e5Qp9SoPP1sthnrrWyA5Zw1lM6VHOSioty26L9KNaiMitMeymcXo7A4YZR2tIE -0ug+nbC9Vdkt7ICcjl5+RhWRNHcnGKHLBB7i0loW0+Pn5JclNgb5y2Dj8gDZeFNG -QhMuwHlTEgYo657yDqqgA54htsNT2n/PB2qUk1CKGZFZCWsCkpvUb/IMiDo2n3ns -hybaEpXC055US0hmylGOcSn+JJzXlVabW3Fg6hxl/5ziU92OtsgAD00jWhyNSoU= -=WrSM +iQEcBAEBCAAGBQJUZkzYAAoJEE4V4vFnx44dHP0IALOKRuX31KBQhey2o3BEvBv+ +RAMGEb0CUUw4nvwyxyXNsSDbfuXogNKh9XsQhk1Aw50RK96VD5d+UlcyEtXTQVAL +kMlkFfcvrnXgUYb8i3dAsZqFQZmoQvS2nerfZXoxt3MYPeFA7ee41EhEapG3KEsn +6jmB2bvKBJKxafhj0LWwpZxGLUJGbGUhhVIH+aUh9WV2S8jcvORp8f95g2QfvXfH +sy4aegntCX+Yww+TsGoj8riWDaq1paPy3ldobX3h1tO/6Ju49F2wgujTB7afFPlF +9YJs4Rm61HHoDdh3MLYOkd55qUeu0DFpJCX0fcJhNSnFIDvQsRJxMaivYFX4NrE= +=rsGA -----END PGP SIGNATURE----- diff --git a/sys-cluster/galera/files/disable-tests.patch b/sys-cluster/galera/files/disable-tests.patch deleted file mode 100644 index b82294b..0000000 --- a/sys-cluster/galera/files/disable-tests.patch +++ /dev/null @@ -1,80 +0,0 @@ -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/galera-23.2.4-r1.ebuild b/sys-cluster/galera/galera-23.2.4-r1.ebuild deleted file mode 100644 index a4d2bc5..0000000 --- a/sys-cluster/galera/galera-23.2.4-r1.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# 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}" - -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.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}/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.2.ebuild b/sys-cluster/galera/galera-25.3.7.ebuild similarity index 87% rename from sys-cluster/galera/galera-25.3.2.ebuild rename to sys-cluster/galera/galera-25.3.7.ebuild index b0e73ea..43bfd5b 100644 --- a/sys-cluster/galera/galera-25.3.2.ebuild +++ b/sys-cluster/galera/galera-25.3.7.ebuild @@ -4,12 +4,12 @@ EAPI=5 -MY_P="${PN}-${PV}-src" +MY_PV="release_${PV}" -inherit scons-utils multilib toolchain-funcs base versionator eutils +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" +SRC_URI="https://github.com/codership/${PN}/archive/${MY_PV}.tar.gz" LICENSE="GPL-2 BSD" SLOT="0" @@ -36,25 +36,25 @@ RDEPEND="${CDEPEND} net-analyzer/openbsd-netcat ) )" -S="${WORKDIR}/${MY_P}" +S="${WORKDIR}/${PN}-${MY_PV}" pkg_preinst() { if use garbd ; then enewgroup garbd - enewuser garbd + enewuser garbd -1 -1 -1 garbd fi } src_prepare() { # Remove bundled dev-cpp/asio - rm -fr "${S}/asio" + rm -r "${S}/asio" || die # Respect {C,LD}FLAGS. epatch "${FILESDIR}/respect-flags.patch" #Remove optional garbd daemon if ! use garbd ; then - rm -fr "${S}/garb" + rm -r "${S}/garb" || die fi epatch_user