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 3B7C91384B4 for ; Fri, 11 Dec 2015 21:06:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F02A921C0A7; Fri, 11 Dec 2015 21:04:01 +0000 (UTC) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.160]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80BC021C025 for ; Fri, 11 Dec 2015 21:03:57 +0000 (UTC) X-RZG-AUTH: :LWIAZ0WpaN8ZbZokUUbkjK1FlhWAPobRR6CE01MhpOKB+5jY/DVlPOa8rOHZrOuQs+JEAQ== X-RZG-CLASS-ID: mo00 Received: from pinacolada.akhuettel.de (88-133-183-17.hsi.glasfaser-ostbayern.de [88.133.183.17]) by smtp.strato.de (RZmta 37.14 AUTH) with ESMTPSA id v0599arBBL3tc0z (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Fri, 11 Dec 2015 22:03:55 +0100 (CET) Received: by pinacolada.akhuettel.de (Postfix, from userid 1000) id 3225E300179; Fri, 11 Dec 2015 22:03:55 +0100 (CET) From: dilfridge@gentoo.org To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Subject: [gentoo-dev] [PATCH 07/15] perl-module.eclass: Do not do any magic with MY_... variables in EAPI=6 anymore Date: Fri, 11 Dec 2015 22:03:03 +0100 Message-Id: <1449867791-30513-7-git-send-email-dilfridge@gentoo.org> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1449867791-30513-1-git-send-email-dilfridge@gentoo.org> References: <201512112201.15354.dilfridge@gentoo.org> <1449867791-30513-1-git-send-email-dilfridge@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 9ee62089-bb9f-49d6-ae44-bdfd07c8dc21 X-Archives-Hash: 50242d2910ddc2f6facaa4ddc53855bf From: Andreas K. Hüttel --- eclass/perl-module.eclass | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 6a5f2ff..7434bcf 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -102,12 +102,18 @@ esac LICENSE="${LICENSE:-|| ( Artistic GPL-1+ )}" -if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then - : ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}} - S=${MY_S:-${WORKDIR}/${MY_P}} +if [[ ${EAPI:-0} = 5 ]] ; then + if [[ -n ${MY_PN} || -n ${MY_PV} || -n ${MODULE_VERSION} ]] ; then + : ${MY_P:=${MY_PN:-${PN}}-${MY_PV:-${MODULE_VERSION:-${PV}}}} + S=${MY_S:-${WORKDIR}/${MY_P}} + fi + MODULE_NAME=${MY_PN:-${PN}} + MODULE_P=${MY_P:-${P}} +else + MODULE_NAME=${MODULE_NAME:-${PN}} + MODULE_P=${MODULE_NAME}-${MODULE_VERSION:-${PV}} + S=${WORKDIR}/${MODULE_P} fi -MODULE_NAME=${MY_PN:-${PN}} -MODULE_P=${MY_P:-${P}} [[ -z "${SRC_URI}" && -z "${MODULE_A}" ]] && \ MODULE_A="${MODULE_P}.${MODULE_A_EXT:-tar.gz}" -- 2.6.3