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 5F21E1384B4 for ; Fri, 11 Dec 2015 21:06:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF76F21C0A5; 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.218]) (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 7B07421C014 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 j03e48rBBL3tULr (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 19593300277; Fri, 11 Dec 2015 22:03:55 +0100 (CET) From: dilfridge@gentoo.org To: gentoo-dev@lists.gentoo.org Cc: "Andreas K. Huettel (dilfridge)" Subject: [gentoo-dev] [PATCH 05/15] perl-module.eclass: Use eapply from EAPI=6 on and always call eapply_user Date: Fri, 11 Dec 2015 22:03:01 +0100 Message-Id: <1449867791-30513-5-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 X-Archives-Salt: c9fe791e-7d0f-4b44-9a74-5874ae77f562 X-Archives-Hash: 41028d307899d7e4224f21ccfa110fda From: "Andreas K. Huettel (dilfridge)" --- eclass/perl-module.eclass | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 8caa981..9d87b17 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -138,9 +138,17 @@ perl-module_src_unpack() { # This function is to be called during the ebuild src_prepare() phase. perl-module_src_prepare() { debug-print-function $FUNCNAME "$@" - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" - debug-print "$FUNCNAME: applying user patches" - epatch_user + + if [[ ${EAPI:-0} = 5 ]] ; then + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + debug-print "$FUNCNAME: applying user patches" + epatch_user + else + [[ ${PATCHES[@]} ]] && eapply "${PATCHES[@]}" + debug-print "$FUNCNAME: applying user patches" + eapply_user + fi + if [[ ${PERL_RM_FILES[@]} ]]; then debug-print "$FUNCNAME: stripping unneeded files" perl_rm_files "${PERL_RM_FILES[@]}" -- 2.6.3