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 1QYWtt-0000Ih-1j for garchives@archives.gentoo.org; Mon, 20 Jun 2011 05:19:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 383BD1C04F; Mon, 20 Jun 2011 05:19:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 07F7F1C050 for ; Mon, 20 Jun 2011 05:19:35 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 852681B4033 for ; Mon, 20 Jun 2011 05:19:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2F0DB80048 for ; Mon, 20 Jun 2011 05:19:34 +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: Subject: [gentoo-commits] dev/bicatali:master commit in: eclass/ X-VCS-Repository: dev/bicatali X-VCS-Files: eclass/intel-sdp.eclass X-VCS-Directories: eclass/ X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro X-VCS-Revision: aa0ca12b16eb1e90101367d1b77a0e643f8bdd06 Date: Mon, 20 Jun 2011 05:19:34 +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: X-Archives-Hash: 30038a625ae6231925b60ecf6ea3a8ec commit: aa0ca12b16eb1e90101367d1b77a0e643f8bdd06 Author: S=C3=A9bastien Fabbro gentoo org> AuthorDate: Mon Jun 20 01:07:09 2011 +0000 Commit: Sebastien Fabbro gentoo org> CommitDate: Mon Jun 20 01:07:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/bicatali.git;a= =3Dcommit;h=3Daa0ca12b more multilib and prefix fixes --- eclass/intel-sdp.eclass | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass index 0234520..6759185 100644 --- a/eclass/intel-sdp.eclass +++ b/eclass/intel-sdp.eclass @@ -52,7 +52,7 @@ RDEPEND=3D"" DEPEND=3D">=3Dapp-arch/rpm2targz-9.0.0.3g" INTEL_SDP_YEAR=3D${INTEL_DPV%_update*} INTEL_SDP_DIR=3D"opt/intel/${INTEL_SUBDIR}-${INTEL_SDP_YEAR:-${INTEL_PV1= }}.${INTEL_PV3}.${INTEL_PV4}" -INTEL_SDP_EDIR=3D"${EROOT#/}/${INTEL_SDP_DIR}" +INTEL_SDP_EDIR=3D"${EROOT%/}/${INTEL_SDP_DIR}" =20 S=3D"${WORKDIR}" =20 @@ -64,7 +64,7 @@ intel-sdp_pkg_setup() { elif use amd64; then arch=3Dx86_64 INTEL_ARCH=3D"intel64" - if use multilib; then + if has_multilib_profile; then arch=3D"x86_64 ${INTEL_X86:-i486}" INTEL_ARCH=3D"intel64 ia32" fi @@ -132,15 +132,16 @@ intel-sdp_src_install() { find opt -name \*sh -type f -exec sed -i \ -e "s:<.*DIR>:${INTEL_SDP_EDIR}:g" \ '{}' \; + mkdir -p "${ED:-${D}}"/ || die mv opt "${ED:-${D}}"/ || die "moving files failed" } =20 intel-sdp_pkg_postinst() { # add product registry to intel "database" local l r - INTEL_SDP_DB=3D"${EROOT#/}"/opt/intel/intel-sdp-products.db + INTEL_SDP_DB=3D"${EROOT%/}"/opt/intel/intel-sdp-products.db for r in ${INTEL_RPMS}; do - l=3D"$(ls -1 ${EROOT#/}/opt/intel/.${r}_*.log | head -n 1)" + l=3D"$(ls -1 ${EROOT%/}/opt/intel/.${r}_*.log | head -n 1)" echo >> ${INTEL_SDP_DB} \ "<:${r%-${INTEL_PV4}*}-${INTEL_PV4}:${r}:${INTEL_SDP_EDIR}:${l}:>" done