| 1 |
commit: 424f3d70ef01082f2080c79b68009203b2ef3a0d |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 13 06:58:54 2011 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 13 06:58:54 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=424f3d70 |
| 7 |
|
| 8 |
Import v1.161 change for git-2. |
| 9 |
|
| 10 |
--- |
| 11 |
eclass/mysql.eclass | 6 +++--- |
| 12 |
1 files changed, 3 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass |
| 15 |
index 8dd87f7..d41a064 100644 |
| 16 |
--- a/eclass/mysql.eclass |
| 17 |
+++ b/eclass/mysql.eclass |
| 18 |
@@ -1,6 +1,6 @@ |
| 19 |
# Copyright 1999-2009 Gentoo Foundation |
| 20 |
# Distributed under the terms of the GNU General Public License v2 |
| 21 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.160 2011/05/07 19:16:48 robbat2 Exp $ |
| 22 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.161 2011/07/08 11:35:01 ssuominen Exp $ |
| 23 |
|
| 24 |
# @ECLASS: mysql.eclass |
| 25 |
# @MAINTAINER: |
| 26 |
@@ -28,7 +28,7 @@ S="${WORKDIR}/mysql" |
| 27 |
if [[ "${MY_EXTRAS_VER}" == "live" ]]; then |
| 28 |
EGIT_PROJECT=mysql-extras |
| 29 |
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mysql-extras.git" |
| 30 |
- inherit git-2 |
| 31 |
+ inherit git |
| 32 |
fi |
| 33 |
|
| 34 |
case "${EAPI:-0}" in |
| 35 |
@@ -773,7 +773,7 @@ pbxt_src_install() { |
| 36 |
# create new user and group for mysql |
| 37 |
# warn about deprecated features |
| 38 |
mysql_pkg_setup() { |
| 39 |
- if hasq test ${FEATURES} ; then |
| 40 |
+ if has test ${FEATURES} ; then |
| 41 |
if ! use minimal ; then |
| 42 |
if [[ $UID -eq 0 ]]; then |
| 43 |
eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." |
Archives