diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2011-03-25 09:43:42 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2011-03-25 09:43:42 +0000 |
| commit | f9137cb4a2d2881e0c2607783485ac0799550b70 (patch) | |
| tree | b7a5bf6fd3351903f641d6a063fbe8eadbff6064 /eclass/mono.eclass | |
| parent | ppc/ppc64 stable wrt #356813 (diff) | |
| download | gentoo-2-f9137cb4a2d2881e0c2607783485ac0799550b70.tar.gz gentoo-2-f9137cb4a2d2881e0c2607783485ac0799550b70.tar.bz2 gentoo-2-f9137cb4a2d2881e0c2607783485ac0799550b70.zip | |
Support EAPI >=3 in mono.eclass
Diffstat (limited to 'eclass/mono.eclass')
| -rw-r--r-- | eclass/mono.eclass | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/eclass/mono.eclass b/eclass/mono.eclass index 8216138609de..f90e59744647 100644 --- a/eclass/mono.eclass +++ b/eclass/mono.eclass @@ -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 $ # @ECLASS: mono.eclass # @MAINTAINER: @@ -35,24 +35,26 @@ export XDG_CONFIG_HOME="${T}" unset MONO_AOT_CACHE egacinstall() { + use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${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" } mono_multilib_comply() { + use !prefix && has "${EAPI:-0}" 0 1 2 && ED="${D}" local dir finddirs=() mv_command=${mv_command:-mv} - if [[ -d "${D}/usr/lib" && "$(get_libdir)" != "lib" ]] + if [[ -d "${ED}/usr/lib" && "$(get_libdir)" != "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/$(get_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 "Moving files into correct libdir failed" - rm -rf "${D}"/usr/lib - for dir in "${D}"/usr/"$(get_libdir)"/pkgconfig "${D}"/usr/share/pkgconfig + ${mv_command} "${ED}"/usr/lib/* "${ED}"/usr/"$(get_libdir)"/ || die "Moving files into correct libdir failed" + rm -rf "${ED}"/usr/lib + for dir in "${ED}"/usr/"$(get_libdir)"/pkgconfig "${ED}"/usr/share/pkgconfig do if [[ -d "${dir}" && "$(find "${dir}" -name '*.pc')" != "" ]] @@ -64,9 +66,9 @@ mono_multilib_comply() { 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}")" == *"shell script text"* ]] then |