diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-07-29 13:57:29 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-07-29 13:57:29 +0000 |
| commit | 82604b18e1b0528d58c3c669ac2b3400a5d8a65b (patch) | |
| tree | b637f1324e4f79bd280540d295cd6a7dbd18907c /eclass | |
| parent | Python related improvements wrt bug #373637 (diff) | |
| download | gentoo-2-82604b18e1b0528d58c3c669ac2b3400a5d8a65b.tar.gz gentoo-2-82604b18e1b0528d58c3c669ac2b3400a5d8a65b.tar.bz2 gentoo-2-82604b18e1b0528d58c3c669ac2b3400a5d8a65b.zip | |
Fix for Gentoo Prefix, bug 360939
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/gtk-sharp-module.eclass | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/eclass/gtk-sharp-module.eclass b/eclass/gtk-sharp-module.eclass index b4f4e2b13a97..08625fc6e411 100644 --- a/eclass/gtk-sharp-module.eclass +++ b/eclass/gtk-sharp-module.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/gtk-sharp-module.eclass,v 1.30 2011/05/06 04:24:31 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.31 2011/07/29 13:57:29 darkside Exp $ # @ECLASS: gtk-sharp-module.eclass # @MAINTAINER: @@ -16,6 +16,11 @@ WANT_AUTOCONF=none inherit eutils mono multilib libtool autotools base versionator +case ${EAPI:-0} in + 2|3|4) ;; + *) die "Unknown EAPI." ;; +esac + # @ECLASS-VARIABLE: GTK_SHARP_MODULE # @DESCRIPTION: # The name of the Gtk# module. @@ -412,6 +417,7 @@ pkg_check_modules_override() { # local assemblies to the installed ones. Is only called by src_prepare when # $GTK_SHARP_MODULE is a member of $gtk_sharp_module_list. gtk-sharp-tarball-post_src_prepare() { + has "${EAPI:-0}" 2 && ! use prefix && EPREFIX= cd "${S}/${GTK_SHARP_MODULE_DIR}" sed -i \ -e "s; \$(srcdir)/../glib/glib-api.xml; $(get_sharp_apis --bare glib-sharp-2.0);" \ @@ -424,8 +430,8 @@ gtk-sharp-tarball-post_src_prepare() { -e "s; \.\./atk/atk-sharp.dll; $(get_sharp_assemblies --bare atk-sharp-2.0);g" \ -e "s; \.\./gdk/gdk-sharp.dll; $(get_sharp_assemblies --bare gdk-sharp-2.0);g" \ -e "s; \.\./gtk/gtk-sharp.dll; $(get_sharp_assemblies --bare gtk-sharp-2.0);g" \ - -e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;/usr/bin/gapi2-fixup;" \ - -e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;/usr/bin/gapi2-codegen;" \ + -e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;${EPREFIX}/usr/bin/gapi2-fixup;" \ + -e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;${EPREFIX}/usr/bin/gapi2-codegen;" \ -e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):" \ -e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):" \ $(find . -name Makefile.in) || die "failed to fix ${TARBALL}-tarball makefiles" @@ -487,11 +493,12 @@ gtk-sharp-tarball_src_configure() { # Is only called by gtk-sharp-module_src_configure when $GTK_SHARP_MODULE # is a member of $gnome_sharp_module_list. gnome-sharp-tarball_src_configure() { + has "${EAPI:-0}" 2 && ! use prefix && EPREFIX= pkg_check_modules_override GLADESHARP glade-sharp-2.0 pkg_check_modules_override GAPI gapi-2.0 - ac_path_prog_override GAPI_PARSER /usr/bin/gapi2-parser - ac_path_prog_override GAPI_CODEGEN /usr/bin/gapi2-codegen - ac_path_prog_override GAPI_FIXUP /usr/bin/gapi2-fixup + ac_path_prog_override GAPI_PARSER "${EPREFIX}"/usr/bin/gapi2-parser + ac_path_prog_override GAPI_CODEGEN "${EPREFIX}"/usr/bin/gapi2-codegen + ac_path_prog_override GAPI_FIXUP "${EPREFIX}"/usr/bin/gapi2-fixup } # @FUNCTION: gtk-sharp-module_src_configure |