| 1 |
voyageur 08/10/03 14:59:42 |
| 2 |
|
| 3 |
Modified: gnustep-2.eclass gnustep-base.eclass |
| 4 |
Log: |
| 5 |
Add EAPI=2 support (src_configure) in gnustep eclasses |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.3 eclass/gnustep-2.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-2.eclass?rev=1.3&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-2.eclass?rev=1.3&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-2.eclass?r1=1.2&r2=1.3 |
| 13 |
|
| 14 |
Index: gnustep-2.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v |
| 17 |
retrieving revision 1.2 |
| 18 |
retrieving revision 1.3 |
| 19 |
diff -u -r1.2 -r1.3 |
| 20 |
--- gnustep-2.eclass 6 Jan 2008 19:30:24 -0000 1.2 |
| 21 |
+++ gnustep-2.eclass 3 Oct 2008 14:59:42 -0000 1.3 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2007 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.2 2008/01/06 19:30:24 swegener Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-2.eclass,v 1.3 2008/10/03 14:59:42 voyageur Exp $ |
| 27 |
|
| 28 |
inherit gnustep-base |
| 29 |
|
| 30 |
@@ -15,6 +15,7 @@ |
| 31 |
|
| 32 |
# The following gnustep-based EXPORT_FUNCTIONS are available: |
| 33 |
# * gnustep-base_pkg_setup |
| 34 |
+# * gnustep-base_src_configure (EAPI=2 only) |
| 35 |
# * gnustep-base_src_compile |
| 36 |
# * gnustep-base_src_install |
| 37 |
# * gnustep-base_pkg_postinst |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.8 eclass/gnustep-base.eclass |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.8&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?rev=1.8&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnustep-base.eclass?r1=1.7&r2=1.8 |
| 46 |
|
| 47 |
Index: gnustep-base.eclass |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v |
| 50 |
retrieving revision 1.7 |
| 51 |
retrieving revision 1.8 |
| 52 |
diff -u -r1.7 -r1.8 |
| 53 |
--- gnustep-base.eclass 4 Sep 2008 08:04:47 -0000 1.7 |
| 54 |
+++ gnustep-base.eclass 3 Oct 2008 14:59:42 -0000 1.8 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
# Copyright 1999-2007 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.7 2008/09/04 08:04:47 opfer Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.8 2008/10/03 14:59:42 voyageur Exp $ |
| 60 |
|
| 61 |
inherit eutils flag-o-matic |
| 62 |
|
| 63 |
@@ -57,11 +57,19 @@ |
| 64 |
fi |
| 65 |
} |
| 66 |
|
| 67 |
-gnustep-base_src_compile() { |
| 68 |
+gnustep-base_src_configure() { |
| 69 |
egnustep_env |
| 70 |
if [[ -x ./configure ]] ; then |
| 71 |
econf || die "configure failed" |
| 72 |
fi |
| 73 |
+} |
| 74 |
+ |
| 75 |
+gnustep-base_src_compile() { |
| 76 |
+ egnustep_env |
| 77 |
+ case ${EAPI:-0} in |
| 78 |
+ 0|1) gnustep-base_src_configure ;; |
| 79 |
+ esac |
| 80 |
+ |
| 81 |
egnustep_make |
| 82 |
} |
| 83 |
|
| 84 |
@@ -212,4 +220,7 @@ |
| 85 |
doexe "${T}"/${cfile} |
| 86 |
} |
| 87 |
|
| 88 |
-EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst |
| 89 |
+case ${EAPI:-0} in |
| 90 |
+ 0|1) EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_install pkg_postinst ;; |
| 91 |
+ 2) EXPORT_FUNCTIONS pkg_setup src_unpack src_configure src_compile src_install pkg_postinst ;; |
| 92 |
+esac |
Archives