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 724C2138200 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 B643621C009; 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 2C357E04EC for ; Thu, 1 Nov 2012 20:20:16 +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 6C40F33D914 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 F0E56E5441 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: <1351800588.b382de87fe6b3b2ea179e0924beabda13f82a2d5.robbat2@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: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: b382de87fe6b3b2ea179e0924beabda13f82a2d5 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: c9cb4e4c-3f7f-4499-a4ad-7f2fa67d07a5 X-Archives-Hash: ce61b6b9f9e5ec6148646c9c597d4466 commit: b382de87fe6b3b2ea179e0924beabda13f82a2d5 Author: Robin H. Johnson gentoo org> AuthorDate: Thu Nov 1 20:09:48 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Thu Nov 1 20:09:48 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mysql.git;a=commit;h=b382de87 Import v1.175 of mysql.eclass. --- eclass/mysql.eclass | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass index 731e231..f14023a 100644 --- a/eclass/mysql.eclass +++ b/eclass/mysql.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.eclass,v 1.170 2012/01/09 10:42:19 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.175 2012/09/27 16:35:41 axs Exp $ # @ECLASS: mysql.eclass # @MAINTAINER: @@ -33,7 +33,7 @@ if [[ "${MY_EXTRAS_VER}" == "live" ]]; then fi case "${EAPI:-0}" in - 2 | 3 | 4) + 2|3|4|5) EXPORT_FUNCTIONS pkg_setup \ src_unpack src_prepare \ src_configure src_compile \ @@ -1304,8 +1304,10 @@ mysql_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