From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RlQ9o-0000E0-CC for garchives@archives.gentoo.org; Thu, 12 Jan 2012 19:17:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD9C8E06C8; Thu, 12 Jan 2012 19:17:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A2B42E06C8 for ; Thu, 12 Jan 2012 19:17:44 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4F241B407D for ; Thu, 12 Jan 2012 19:17:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5282C80044 for ; Thu, 12 Jan 2012 19:17:43 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <86ac0f0297371eafc4c1f7e7c0341fa8c0d28431.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-autotools.eclass eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 86ac0f0297371eafc4c1f7e7c0341fa8c0d28431 Date: Thu, 12 Jan 2012 19:17:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3cc0ff1c-9b68-4aba-b238-8adebde16d65 X-Archives-Hash: 279fde85a6d72439bfe925ad4bcf3efe commit: 86ac0f0297371eafc4c1f7e7c0341fa8c0d28431 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Wed Dec 7 03:20:42 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Wed Dec 7 03:20:42 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D86ac0f02 Fix some issues with the federated and pbxt engines. --- eclass/mysql-autotools.eclass | 8 ++++---- eclass/mysql-v2.eclass | 13 +++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eclass/mysql-autotools.eclass b/eclass/mysql-autotools.eclas= s index bf0b0b5..d32f1c1 100644 --- a/eclass/mysql-autotools.eclass +++ b/eclass/mysql-autotools.eclass @@ -219,11 +219,11 @@ mysql-autotools_configure_51() { if [[ "${PN}" !=3D "mariadb" ]] ; then elog "Before using the Federated storage engine, please be sure to re= ad" elog "http://dev.mysql.com/doc/refman/5.1/en/federated-limitations.ht= ml" - plugins_dyn=3D"${plugins_sta} federatedx" + plugins_dyn=3D"${plugins_dyn} federated" else elog "MariaDB includes the FederatedX engine. Be sure to read" elog "http://askmonty.org/wiki/index.php/Manual:FederatedX_storage_en= gine" - plugins_dyn=3D"${plugins_sta} federated" + plugins_dyn=3D"${plugins_dyn} federatedx" fi else plugins_dis=3D"${plugins_dis} partition federated" @@ -289,7 +289,7 @@ mysql-autotools_configure_51() { =20 if pbxt_available && [[ "${PBXT_NEWSTYLE}" =3D=3D "1" ]]; then use pbxt \ - && plugins_dyn=3D"${plugins_dyn} pbxt" \ + && plugins_sta=3D"${plugins_sta} pbxt" \ || plugins_dis=3D"${plugins_dis} pbxt" fi =20 @@ -402,7 +402,7 @@ mysql-autotools_src_prepare() { popd >/dev/null fi =20 - if pbxt_available && [[ "${PBXT_NEWSTYLE}" =3D=3D "1" ]] && use pbxt ; = then + if pbxt_available && [[ "${PBXT_NEWSTYLE}" !=3D "1" ]] && use pbxt ; th= en einfo "Adding storage engine: PBXT" pushd "${S}"/storage >/dev/null i=3D'pbxt' diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index de9a79e..ed40160 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -321,13 +321,14 @@ if pbxt_patch_available; then PBXT_SRC_URI=3D"http://www.primebase.org/download/${PBXT_P}.tar.gz mirr= or://sourceforge/pbxt/${PBXT_P}.tar.gz" SRC_URI=3D"${SRC_URI} pbxt? ( ${PBXT_SRC_URI} )" =20 - # PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plu= gins - # vs. built outside the dir - if pbxt_available; then +fi =20 - IUSE=3D"${IUSE} pbxt" - PBXT_NEWSTYLE=3D1 - fi +# PBXT_NEWSTYLE means pbxt is in storage/ and gets enabled as other plug= ins +# vs. built outside the dir +if pbxt_available; then + + IUSE=3D"${IUSE} pbxt" + PBXT_NEWSTYLE=3D1 fi =20 if xtradb_patch_available; then