| 1 |
darkside 11/07/29 13:57:30 |
| 2 |
|
| 3 |
Modified: gtk-sharp-module.eclass |
| 4 |
Log: |
| 5 |
Fix for Gentoo Prefix, bug 360939 |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.31 eclass/gtk-sharp-module.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.31&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?rev=1.31&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gtk-sharp-module.eclass?r1=1.30&r2=1.31 |
| 13 |
|
| 14 |
Index: gtk-sharp-module.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v |
| 17 |
retrieving revision 1.30 |
| 18 |
retrieving revision 1.31 |
| 19 |
diff -u -r1.30 -r1.31 |
| 20 |
--- gtk-sharp-module.eclass 6 May 2011 04:24:31 -0000 1.30 |
| 21 |
+++ gtk-sharp-module.eclass 29 Jul 2011 13:57:29 -0000 1.31 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.30 2011/05/06 04:24:31 loki_val Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gtk-sharp-module.eclass,v 1.31 2011/07/29 13:57:29 darkside Exp $ |
| 27 |
|
| 28 |
# @ECLASS: gtk-sharp-module.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -16,6 +16,11 @@ |
| 31 |
|
| 32 |
inherit eutils mono multilib libtool autotools base versionator |
| 33 |
|
| 34 |
+case ${EAPI:-0} in |
| 35 |
+ 2|3|4) ;; |
| 36 |
+ *) die "Unknown EAPI." ;; |
| 37 |
+esac |
| 38 |
+ |
| 39 |
# @ECLASS-VARIABLE: GTK_SHARP_MODULE |
| 40 |
# @DESCRIPTION: |
| 41 |
# The name of the Gtk# module. |
| 42 |
@@ -412,6 +417,7 @@ |
| 43 |
# local assemblies to the installed ones. Is only called by src_prepare when |
| 44 |
# $GTK_SHARP_MODULE is a member of $gtk_sharp_module_list. |
| 45 |
gtk-sharp-tarball-post_src_prepare() { |
| 46 |
+ has "${EAPI:-0}" 2 && ! use prefix && EPREFIX= |
| 47 |
cd "${S}/${GTK_SHARP_MODULE_DIR}" |
| 48 |
sed -i \ |
| 49 |
-e "s; \$(srcdir)/../glib/glib-api.xml; $(get_sharp_apis --bare glib-sharp-2.0);" \ |
| 50 |
@@ -424,8 +430,8 @@ |
| 51 |
-e "s; \.\./atk/atk-sharp.dll; $(get_sharp_assemblies --bare atk-sharp-2.0);g" \ |
| 52 |
-e "s; \.\./gdk/gdk-sharp.dll; $(get_sharp_assemblies --bare gdk-sharp-2.0);g" \ |
| 53 |
-e "s; \.\./gtk/gtk-sharp.dll; $(get_sharp_assemblies --bare gtk-sharp-2.0);g" \ |
| 54 |
- -e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;/usr/bin/gapi2-fixup;" \ |
| 55 |
- -e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;/usr/bin/gapi2-codegen;" \ |
| 56 |
+ -e "s;\$(RUNTIME) \$(top_builddir)/parser/gapi-fixup.exe;${EPREFIX}/usr/bin/gapi2-fixup;" \ |
| 57 |
+ -e "s;\$(RUNTIME) \$(top_builddir)/generator/gapi_codegen.exe;${EPREFIX}/usr/bin/gapi2-codegen;" \ |
| 58 |
-e "s:\$(SYMBOLS) \$(top_builddir)/parser/gapi-fixup.exe:\$(SYMBOLS):" \ |
| 59 |
-e "s:\$(INCLUDE_API) \$(top_builddir)/generator/gapi_codegen.exe:\$(INCLUDE_API):" \ |
| 60 |
$(find . -name Makefile.in) || die "failed to fix ${TARBALL}-tarball makefiles" |
| 61 |
@@ -487,11 +493,12 @@ |
| 62 |
# Is only called by gtk-sharp-module_src_configure when $GTK_SHARP_MODULE |
| 63 |
# is a member of $gnome_sharp_module_list. |
| 64 |
gnome-sharp-tarball_src_configure() { |
| 65 |
+ has "${EAPI:-0}" 2 && ! use prefix && EPREFIX= |
| 66 |
pkg_check_modules_override GLADESHARP glade-sharp-2.0 |
| 67 |
pkg_check_modules_override GAPI gapi-2.0 |
| 68 |
- ac_path_prog_override GAPI_PARSER /usr/bin/gapi2-parser |
| 69 |
- ac_path_prog_override GAPI_CODEGEN /usr/bin/gapi2-codegen |
| 70 |
- ac_path_prog_override GAPI_FIXUP /usr/bin/gapi2-fixup |
| 71 |
+ ac_path_prog_override GAPI_PARSER "${EPREFIX}"/usr/bin/gapi2-parser |
| 72 |
+ ac_path_prog_override GAPI_CODEGEN "${EPREFIX}"/usr/bin/gapi2-codegen |
| 73 |
+ ac_path_prog_override GAPI_FIXUP "${EPREFIX}"/usr/bin/gapi2-fixup |
| 74 |
} |
| 75 |
|
| 76 |
# @FUNCTION: gtk-sharp-module_src_configure |
Archives