On 18/07/13 09:12, Michał Górny wrote:
>> +
>> +# @FUNCTION: fortran-2_pkg_setup
>> +# @DESCRIPTION:
>> +# Setup functionallity,
>> +# checks for a valid fortran compiler and optionally for its openmp
>> support.
>> +fortran-2_pkg_setup() {
>> + if [[ ${EAPI:-0} -lt 4 ]]; then
>
> Someone else's going to tell you this, so I'll tell you it first hand:
> EAPI is not guaranteed to be a number and you shouldn't be using
> numerical comparison against it.
>
> Not that you support any non-numerical EAPI. But then some people who
> fork eclasses in overlays will have to patch it more to support their
> weird EAPIs. And I'm not pointing my finger at anyone in particular.
>
Doesn't matter to me who is doing crazy things. If I can support it
easily then I will do it.
Next try, which is removes one redundant check.
Thanks for the suggestion.
Index: fortran-2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/fortran-2.eclass,v
retrieving revision 1.18
diff -u -B -b -u -p -r1.18 fortran-2.eclass
--- fortran-2.eclass 18 Jul 2013 07:03:33 -0000 1.18
+++ fortran-2.eclass 18 Jul 2013 07:28:12 -0000
@@ -203,11 +203,11 @@ _fortran_test_function() {
fi
}
-# @FUNCTION: fortran-2_pkg_setup
+# @FUNCTION: _fortran-2_pkg_setup
+# @INTERNAL
# @DESCRIPTION:
-# Setup functionallity,
-# checks for a valid fortran compiler and optionally for its openmp
support.
-fortran-2_pkg_setup() {
+# _The_ fortran-2_pkg_setup()
+_fortran-2_pkg_setup() {
for _f_use in ${FORTRAN_NEEDED}; do
case ${_f_use} in
always)
@@ -229,6 +229,26 @@ fortran-2_pkg_setup() {
done
}
+
+# @FUNCTION: fortran-2_pkg_setup
+# @DESCRIPTION:
+# Setup functionallity,
+# checks for a valid fortran compiler and optionally for its openmp
support.
+fortran-2_pkg_setup() {
+ case ${EAPI:-0} in
+ 0|1|2|3)
+ eqawarn "The fortran-2.eclass is going to deprecate support for"
+ eqawarn "EAPI < 4. Please migrate your package to a higher EAPI"
+ eqawarn "or file a bug at https://bugs.gentoo.org";
+ _fortran-2_pkg_setup ;;
+ 4|5)
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ _fortran-2_pkg_setup
+ fi
+ ;;
+ esac
+}
+
signature.asc
Description: OpenPGP digital signature
