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 1Q33Yf-0006h0-7H for garchives@archives.gentoo.org; Fri, 25 Mar 2011 09:43:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E197E07AB; Fri, 25 Mar 2011 09:43:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5BD41E07AB for ; Fri, 25 Mar 2011 09:43:45 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CC0F81BC012 for ; Fri, 25 Mar 2011 09:43:43 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2183) id 6D61B20054; Fri, 25 Mar 2011 09:43:42 +0000 (UTC) From: "Christoph Mende (angelos)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, angelos@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: mono.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: mono.eclass X-VCS-Directories: eclass X-VCS-Committer: angelos X-VCS-Committer-Name: Christoph Mende Content-Type: text/plain; charset=utf8 Message-Id: <20110325094342.6D61B20054@flycatcher.gentoo.org> Date: Fri, 25 Mar 2011 09:43:42 +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: 6cddfb06251f937f954e482f15bda4ae angelos 11/03/25 09:43:42 Modified: mono.eclass Log: Support EAPI >=3D3 in mono.eclass Revision Changes Path 1.14 eclass/mono.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mono.eclass= ?rev=3D1.14&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mono.eclass= ?rev=3D1.14&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/mono.eclass= ?r1=3D1.13&r2=3D1.14 Index: mono.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mono.eclass 8 Mar 2009 15:46:54 -0000 1.13 +++ mono.eclass 25 Mar 2011 09:43:42 -0000 1.14 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v 1.13 2009/03/08 = 15:46:54 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v 1.14 2011/03/25 = 09:43:42 angelos Exp $ =20 # @ECLASS: mono.eclass # @MAINTAINER: @@ -35,24 +35,26 @@ unset MONO_AOT_CACHE =20 egacinstall() { + use !prefix && has "${EAPI:-0}" 0 1 2 && ED=3D"${D}" gacutil -i "${1}" \ - -root "${D}"/usr/$(get_libdir) \ + -root "${ED}"/usr/$(get_libdir) \ -gacdir /usr/$(get_libdir) \ -package ${2:-${GACPN:-${PN}}} \ || die "installing ${1} into the Global Assembly Cache failed" } =20 mono_multilib_comply() { + use !prefix && has "${EAPI:-0}" 0 1 2 && ED=3D"${D}" local dir finddirs=3D() mv_command=3D${mv_command:-mv} - if [[ -d "${D}/usr/lib" && "$(get_libdir)" !=3D "lib" ]] + if [[ -d "${ED}/usr/lib" && "$(get_libdir)" !=3D "lib" ]] then - if ! [[ -d "${D}"/usr/"$(get_libdir)" ]] + if ! [[ -d "${ED}"/usr/"$(get_libdir)" ]] then - mkdir "${D}"/usr/"$(get_libdir)" || die "Couldn't mkdir ${D}/usr/$(ge= t_libdir)" + mkdir "${ED}"/usr/"$(get_libdir)" || die "Couldn't mkdir ${ED}/usr/$(= get_libdir)" fi - ${mv_command} "${D}"/usr/lib/* "${D}"/usr/"$(get_libdir)"/ || die "Mov= ing files into correct libdir failed" - rm -rf "${D}"/usr/lib - for dir in "${D}"/usr/"$(get_libdir)"/pkgconfig "${D}"/usr/share/pkgco= nfig + ${mv_command} "${ED}"/usr/lib/* "${ED}"/usr/"$(get_libdir)"/ || die "M= oving files into correct libdir failed" + rm -rf "${ED}"/usr/lib + for dir in "${ED}"/usr/"$(get_libdir)"/pkgconfig "${ED}"/usr/share/pkg= config do =20 if [[ -d "${dir}" && "$(find "${dir}" -name '*.pc')" !=3D "" ]] @@ -64,9 +66,9 @@ popd "${dir}" &> /dev/null fi done - if [[ -d "${D}/usr/bin" ]] + if [[ -d "${ED}/usr/bin" ]] then - for exe in "${D}/usr/bin"/* + for exe in "${ED}/usr/bin"/* do if [[ "$(file "${exe}")" =3D=3D *"shell script text"* ]] then