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