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 21B95138010 for ; Thu, 1 Nov 2012 20:20:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76397E061F; Thu, 1 Nov 2012 20:20:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E13A9E04EC for ; Thu, 1 Nov 2012 20:20:15 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 342C233D911 for ; Thu, 1 Nov 2012 20:20:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C4870E5436 for ; Thu, 1 Nov 2012 20:20:13 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1351800444.c918372a1a510bb66f5e4ce110cbdcfc7434790b.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql:master commit in: eclass/ X-VCS-Repository: proj/mysql X-VCS-Files: eclass/mysql-v2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: c918372a1a510bb66f5e4ce110cbdcfc7434790b X-VCS-Branch: master Date: Thu, 1 Nov 2012 20:20:13 +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: 8a87d01e-cb57-450a-a97b-ae17ecf01c21 X-Archives-Hash: 099170342b0550579b85cf8a38539738 commit: c918372a1a510bb66f5e4ce110cbdcfc7434790b Author: Robin H. Johnson gentoo org> AuthorDate: Thu Nov 1 20:07:24 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Nov 1 20:07:24 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=c918372a Import v1.19 of mysql-v2.eclass. --- eclass/mysql-v2.eclass | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eclass/mysql-v2.eclass b/eclass/mysql-v2.eclass index b515a06..4c8d635 100644 --- a/eclass/mysql-v2.eclass +++ b/eclass/mysql-v2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.15 2012/04/18 02:08:34 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.19 2012/09/27 16:35:41 axs Exp $ # @ECLASS: mysql-v2.eclass # @MAINTAINER: @@ -53,7 +53,7 @@ inherit eutils flag-o-matic gnuconfig ${MYSQL_EXTRAS} ${BUILD_INHERIT} mysql_fx # case "${EAPI:-0}" in - 3|4) ;; + 3|4|5) ;; *) die "Unsupported EAPI: ${EAPI}" ;; esac @@ -545,8 +545,10 @@ mysql-v2_pkg_config() { fi if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then - local MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${MY_DATADIR})" - local old_MY_DATADIR_s="$(strip_duplicate_slashes ${ROOT}/${old_MY_DATADIR})" + local MY_DATADIR_s="${ROOT}/${MY_DATADIR}" + MY_DATADIR_s="${MY_DATADIR_s%%/}" + local old_MY_DATADIR_s="${ROOT}/old_MY_DATADIR}" + old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}" if [[ -d "${old_MY_DATADIR_s}" ]]; then if [[ -d "${MY_DATADIR_s}" ]]; then