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 1R9SWd-0006o9-AO for garchives@archives.gentoo.org; Fri, 30 Sep 2011 02:08:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FF7F21C0B6; Fri, 30 Sep 2011 02:08:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4D39D21C0B6 for ; Fri, 30 Sep 2011 02:08:23 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2E7F1B4007 for ; Fri, 30 Sep 2011 02:08:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F09B580042 for ; Fri, 30 Sep 2011 02:08:21 +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: <4f8dc640ce2f94c8878349e1f9cf28a9ecf663f3.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql.eclass X-VCS-Directories: eclass/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 4f8dc640ce2f94c8878349e1f9cf28a9ecf663f3 Date: Fri, 30 Sep 2011 02:08:21 +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: X-Archives-Hash: df9261555b8789d5566d558023191ddc commit: 4f8dc640ce2f94c8878349e1f9cf28a9ecf663f3 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Fri Sep 30 02:06:36 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Fri Sep 30 02:07:10 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D= commit;h=3D4f8dc640 [mysql.eclass] Sync with tree eclass. --- eclass/mysql.eclass | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 391351b..78b482b 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.eclass @@ -1,13 +1,14 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.161 2011/07/0= 8 11:35:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.166 2011/09/2= 5 12:43:28 grobian Exp $ =20 # @ECLASS: mysql.eclass # @MAINTAINER: -# Author: Francesco Riosa (Retired) -# Maintainers: MySQL Team -# - Luca Longinotti -# - Robin H. Johnson +# MySQL Team +# Luca Longinotti +# Robin H. Johnson +# @AUTHOR: +# Francesco Riosa (Retired) # @BLURB: This eclass provides most of the functions for mysql ebuilds # @DESCRIPTION: # The mysql.eclass provides almost all the code to build the mysql ebuil= ds @@ -141,8 +142,9 @@ for i in "mysql" "mysql-community" "mysql-cluster" "m= ariadb" ; do DEPEND=3D"${DEPEND} !dev-db/${i}" done =20 +# prefix: first need to implement something for #196294 RDEPEND=3D"${DEPEND} - !minimal? ( dev-db/mysql-init-scripts ) + !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )" =20 DEPEND=3D"${DEPEND} @@ -618,7 +620,7 @@ configure_51() { | xargs -0 sed -r -n \ -e '/^MYSQL_STORAGE_ENGINE/{ s~MYSQL_STORAGE_ENGINE\([[:space:]]*\[?([-_a-z0-9]+)\]?.*,~\1 ~g ; - s~^([^ ]+).*~\1~gp;=20 + s~^([^ ]+).*~\1~gp; }' \ | tr -s '\n' ' ' )"