summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2019-12-17 22:45:11 +0000
committerJames Le Cuirot <chewi@gentoo.org>2019-12-23 23:21:12 +0000
commita4f5d91f2d868983335fc3b6ff224f0526106444 (patch)
treec65b68d81cd2409b9fcce6fcbd3077b4e32610c9 /eclass
parentdev-dotnet/libgdiplus: Fix implicit use of eutils (diff)
downloadgentoo-a4f5d91f2d868983335fc3b6ff224f0526106444.tar.gz
gentoo-a4f5d91f2d868983335fc3b6ff224f0526106444.tar.bz2
gentoo-a4f5d91f2d868983335fc3b6ff224f0526106444.zip
dotnet.eclass: Add EAPI 7 support
I could not see eutils.eclass being used anywhere but multilib.eclass is needed for get_libdir. I will fix implicit use of eutils by libgdiplus for prune_libtool_files. Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/dotnet.eclass18
1 files changed, 10 insertions, 8 deletions
diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass
index 3e834835b971..55e10645deb7 100644
--- a/eclass/dotnet.eclass
+++ b/eclass/dotnet.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: dotnet.eclass
@@ -12,19 +12,21 @@
# of dotnet packages.
case ${EAPI:-0} in
- 0) die "this eclass doesn't support EAPI 0" ;;
- 1|2|3) ;;
- *) ;; #if [[ ${USE_DOTNET} ]]; then REQUIRED_USE="|| (${USE_DOTNET})"; fi;;
+ 0)
+ die "this eclass doesn't support EAPI 0" ;;
+ [1-6])
+ inherit eapi7-ver multilib
+ DEPEND="dev-lang/mono" ;;
+ *)
+ BDEPEND="dev-lang/mono" ;;
esac
-inherit eutils versionator mono-env
+inherit mono-env
# @ECLASS-VARIABLE: USE_DOTNET
# @DESCRIPTION:
# Use flags added to IUSE
-DEPEND+=" dev-lang/mono"
-
# SET default use flags according on DOTNET_TARGETS
for x in ${USE_DOTNET}; do
case ${x} in
@@ -51,7 +53,7 @@ dotnet_pkg_setup() {
FRAMEWORK="${F}";
fi
else
- version_is_at_least "${F}" "${FRAMEWORK}" || FRAMEWORK="${F}"
+ ver_test "${F}" -le "${FRAMEWORK}" || FRAMEWORK="${F}"
fi
done
if [[ -z ${FRAMEWORK} ]]; then