From 6fb4c15a01283a79932549b89ae47687a68a3f66 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Thu, 6 Mar 2008 22:28:54 +0100 Subject: Ooops, wrong dir Also add a virtual --- virtual/mysql-minimal/Manifest | 3 - virtual/mysql-minimal/mysql-minimal-5.0.54.ebuild | 75 ----------------------- virtual/mysql/Manifest | 1 + virtual/mysql/mysql-5.0.ebuild | 19 ++++++ 4 files changed, 20 insertions(+), 78 deletions(-) delete mode 100644 virtual/mysql-minimal/Manifest delete mode 100644 virtual/mysql-minimal/mysql-minimal-5.0.54.ebuild create mode 100644 virtual/mysql/Manifest create mode 100644 virtual/mysql/mysql-5.0.ebuild (limited to 'virtual') diff --git a/virtual/mysql-minimal/Manifest b/virtual/mysql-minimal/Manifest deleted file mode 100644 index 5b6a4e8c..00000000 --- a/virtual/mysql-minimal/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST mysql-5.0.54.tar.gz 27397332 RMD160 50898b7339cad1339cfdcf01e75c8e851d837d80 SHA1 8b540ccce64a1c4cf470d4f78c8d811ebad8da1d SHA256 d3431038e594c6e6b480d2d7a24bca7166bb5e593c9d807140257ed06b105a66 -DIST mysql-extras-20080124.tar.bz2 106526 RMD160 8f9f556308c96c4cd5cffd0506c99ea59e7c25c2 SHA1 574f5dbf4a8bb53d352cb2fbe391ad5c484eb932 SHA256 c4b33dd391834252d20d4b083ac4bd6999253a8f20d894dd93b0795c6b318829 -EBUILD mysql-minimal-5.0.54.ebuild 2251 RMD160 159c71142ee2a883a271d237274fecb3fa9285f2 SHA1 5acc4fb6ea1aca749705f85525c73013e23d2ea0 SHA256 7d94f21f89dba56ecf655ae16a11a070f78cff2ea7f321a8c7bab21296c92bda diff --git a/virtual/mysql-minimal/mysql-minimal-5.0.54.ebuild b/virtual/mysql-minimal/mysql-minimal-5.0.54.ebuild deleted file mode 100644 index 4c1d4aba..00000000 --- a/virtual/mysql-minimal/mysql-minimal-5.0.54.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.54.ebuild,v 1.10 2008/01/28 07:06:09 jer Exp $ - -MY_EXTRAS_VER="20080124" -P=${P/-minimal/} -SERVER_URI="http://mirror.provenscaling.com/mysql/enterprise/source/5.0/${P}.tar.gz" - -inherit toolchain-funcs mysql - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc ~sparc-fbsd x86 ~x86-fbsd" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -EPATCH_EXCLUDE='' - -src_test() { - make check || die "make check failed" - if ! use "minimal" ; then - if ! hasq "userpriv" ${FEATURES} ; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream" - fi - cd "${S}" - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - local retstatus1 - local retstatus2 - local t - addpredict /this-dir-does-not-exist/t9.MYI - - # mysqladmin start before dir creation - mkdir -p "${S}"/mysql-test/var{,/log} - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - - case ${PV} in - 5.0.42) - mysql_disable_test "archive_gis" "Broken in 5.0.42" ;; - - 5.0.44|5.0.45|5.0.46|5.0.48|5.0.50|5.0.52|5.0.54) - [ "$(tc-endian)" == "big" ] && \ - mysql_disable_test \ - "archive_gis" \ - "Broken in 5.0.44-54 on big-endian boxes only" ;; - esac - - [ "${PV}" == "5.0.54" ] && \ - mysql_disable_test \ - "read_only" \ - "Broken in 5.0.54, output in wrong order" - - [ "${PV}" == "5.0.54" ] && \ - [ "${ARCH/x86}" != "${ARCH}" ] && \ - mysql_disable_test \ - "subselect" \ - "Testcase needs tuning on x86 for oom condition" - - # We run the test protocols seperately - make -j1 test-ns force=--force - retstatus1=$? - [[ $retstatus1 -eq 0 ]] || eerror "test-ns failed" - - make -j1 test-ps force=--force - retstatus2=$? - [[ $retstatus2 -eq 0 ]] || eerror "test-ps failed" - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - [[ $retstatus1 -eq 0 ]] || die "test-ns failed" - [[ $retstatus2 -eq 0 ]] || die "test-ps failed" - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/virtual/mysql/Manifest b/virtual/mysql/Manifest new file mode 100644 index 00000000..0e5e314b --- /dev/null +++ b/virtual/mysql/Manifest @@ -0,0 +1 @@ +EBUILD mysql-5.0.ebuild 540 RMD160 1d6b6bb406f32f25b04cfff65e51c952c920611b SHA1 ebf4a21842cec70caca109785461505bdb3f2c34 SHA256 6f027d4a916c59a4211042ba8d68502ff766b61febe80b0191a50e5893ba8ce0 diff --git a/virtual/mysql/mysql-5.0.ebuild b/virtual/mysql/mysql-5.0.ebuild new file mode 100644 index 00000000..74ea636f --- /dev/null +++ b/virtual/mysql/mysql-5.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.0.ebuild,v 1.5 2007/05/17 08:39:40 kloeri Exp $ + +DESCRIPTION="Virtual for MySQL client or database" +HOMEPAGE="http://dev.mysql.com" +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd" +IUSE="" + +DEPEND="" +RDEPEND="|| ( + =dev-db/mysql-${PV}* + =dev-db/mysql-community-${PV}* + =dev-db/mysql-minimal-${PV}* +)" -- cgit v1.2.3