| 1 |
I could not see eutils.eclass being used anywhere but multilib.eclass |
| 2 |
is needed for get_libdir. I will fix implicit use of eutils by |
| 3 |
libgdiplus for prune_libtool_files. |
| 4 |
|
| 5 |
Signed-off-by: James Le Cuirot <chewi@g.o> |
| 6 |
--- |
| 7 |
eclass/dotnet.eclass | 18 ++++++++++-------- |
| 8 |
1 file changed, 10 insertions(+), 8 deletions(-) |
| 9 |
|
| 10 |
diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass |
| 11 |
index 3e834835b971..55e10645deb7 100644 |
| 12 |
--- a/eclass/dotnet.eclass |
| 13 |
+++ b/eclass/dotnet.eclass |
| 14 |
@@ -1,4 +1,4 @@ |
| 15 |
-# Copyright 1999-2015 Gentoo Foundation |
| 16 |
+# Copyright 1999-2019 Gentoo Authors |
| 17 |
# Distributed under the terms of the GNU General Public License v2 |
| 18 |
|
| 19 |
# @ECLASS: dotnet.eclass |
| 20 |
@@ -12,19 +12,21 @@ |
| 21 |
# of dotnet packages. |
| 22 |
|
| 23 |
case ${EAPI:-0} in |
| 24 |
- 0) die "this eclass doesn't support EAPI 0" ;; |
| 25 |
- 1|2|3) ;; |
| 26 |
- *) ;; #if [[ ${USE_DOTNET} ]]; then REQUIRED_USE="|| (${USE_DOTNET})"; fi;; |
| 27 |
+ 0) |
| 28 |
+ die "this eclass doesn't support EAPI 0" ;; |
| 29 |
+ [1-6]) |
| 30 |
+ inherit eapi7-ver multilib |
| 31 |
+ DEPEND="dev-lang/mono" ;; |
| 32 |
+ *) |
| 33 |
+ BDEPEND="dev-lang/mono" ;; |
| 34 |
esac |
| 35 |
|
| 36 |
-inherit eutils versionator mono-env |
| 37 |
+inherit mono-env |
| 38 |
|
| 39 |
# @ECLASS-VARIABLE: USE_DOTNET |
| 40 |
# @DESCRIPTION: |
| 41 |
# Use flags added to IUSE |
| 42 |
|
| 43 |
-DEPEND+=" dev-lang/mono" |
| 44 |
- |
| 45 |
# SET default use flags according on DOTNET_TARGETS |
| 46 |
for x in ${USE_DOTNET}; do |
| 47 |
case ${x} in |
| 48 |
@@ -51,7 +53,7 @@ dotnet_pkg_setup() { |
| 49 |
FRAMEWORK="${F}"; |
| 50 |
fi |
| 51 |
else |
| 52 |
- version_is_at_least "${F}" "${FRAMEWORK}" || FRAMEWORK="${F}" |
| 53 |
+ ver_test "${F}" -le "${FRAMEWORK}" || FRAMEWORK="${F}" |
| 54 |
fi |
| 55 |
done |
| 56 |
if [[ -z ${FRAMEWORK} ]]; then |
| 57 |
-- |
| 58 |
2.24.1 |
Archives