From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Ry9wJ-0006tM-DX for garchives@archives.gentoo.org; Thu, 16 Feb 2012 22:36:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6D42E0FAD; Thu, 16 Feb 2012 22:36:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 78813E0FAD for ; Thu, 16 Feb 2012 22:36:03 +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 D69001B4016 for ; Thu, 16 Feb 2012 22:36:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B90ECE5410 for ; Thu, 16 Feb 2012 22:35:59 +0000 (UTC) From: "Sebastien Fabbro" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastien Fabbro" Message-ID: <1329431738.2ed5df40d51f981370e638e15e794a775a41dcb1.bicatali@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/intel-sdp.eclass X-VCS-Directories: eclass/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: 2ed5df40d51f981370e638e15e794a775a41dcb1 X-VCS-Branch: master Date: Thu, 16 Feb 2012 22:35:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 045b9d9b-6a49-4628-a5a2-d1e5f0504cc4 X-Archives-Hash: baff3a89dd97c28b80dc817484752498 commit: 2ed5df40d51f981370e638e15e794a775a41dcb1 Author: S=C3=A9bastien Fabbro gmail com> AuthorDate: Thu Feb 16 22:35:38 2012 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Thu Feb 16 22:35:38 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D2ed5df40 eapi4 goodness --- eclass/intel-sdp.eclass | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index 7b03379..1d986b1 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -58,6 +58,11 @@ INTEL_SDP_EDIR=3D"${EROOT%/}/${INTEL_SDP_DIR}" =20 S=3D"${WORKDIR}" =20 +intel-sdp_pkg_pretend() { + : ${CHECKREQS_DISK_BUILD:=3D256M} + check-reqs_pkg_pretend +} + intel-sdp_pkg_setup() { local arch a p if use x86; then @@ -80,8 +85,10 @@ intel-sdp_pkg_setup() { for p in ${INTEL_DAT_RPMS}; do INTEL_RPMS=3D"${INTEL_RPMS} intel-${p}-${INTEL_PV4}-${INTEL_PV1}.${INT= EL_PV2}-${INTEL_PV3}.noarch.rpm" done - [[ -z ${CHECKREQS_DISK_BUILD} ]] && CHECKREQS_DISK_BUILD=3D256M - check-reqs_pkg_setup + + case "${EAPI:-0}" in + 0|1|2|3) intel-sdp_pkg_pretend ;; + esac } =20 intel-sdp_src_unpack() { @@ -96,12 +103,12 @@ intel-sdp_src_unpack() { l=3D.${r}_$(date +'%d%m%y_%H%M%S').log tar xf "${DISTDIR}"/${t} \ ${rpmdir}/${r} || die "extracting ${r} failed" - rpm2tar -O "./${rpmdir}/${r}" | tar xvf - \ - | sed -e "s:^\.:${EROOT#/}:g" > ${l} || die "failure unpacking ${r}" + rpm2tar -O "./${rpmdir}/${r}" | tar xvf - | sed -e \ + "s:^\.:${EROOT#/}:g" > ${l} || die "unpacking ${r} failed" mv ${l} opt/intel/ || die "failed moving extract log file" done done - mv -v opt/intel/* ${INTEL_SDP_DIR} || die "Correction of INTEL_SDP_DIR = failed" + mv -v opt/intel/* ${INTEL_SDP_DIR} || die "mv to INTEL_SDP_DIR failed" } =20 intel_link_eclipse_plugins() { @@ -163,3 +170,8 @@ intel-sdp_pkg_postrm() { } =20 EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postr= m +case "${EAPI:-0}" in + 0|1|2|3) ;; + 4) EXPORT_FUNCTIONS pkg_pretend ;; + *) die "EAPI=3D${EAPI} is not supported" ;; +esac