From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F45B138334 for ; Tue, 17 Dec 2019 22:48:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96346E087F; Tue, 17 Dec 2019 22:48:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4C6FEE083B for ; Tue, 17 Dec 2019 22:48:36 +0000 (UTC) Received: from symphony.aura-online.co.uk (154.189.187.81.in-addr.arpa [81.187.189.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: chewi) by smtp.gentoo.org (Postfix) with ESMTPSA id 9D6AB34D480; Tue, 17 Dec 2019 22:48:34 +0000 (UTC) From: James Le Cuirot To: gentoo-dev Cc: dotnet@gentoo.org, James Le Cuirot Subject: [gentoo-dev] [PATCH] dotnet.eclass: Add EAPI 7 support Date: Tue, 17 Dec 2019 22:48:08 +0000 Message-Id: <20191217224808.3496-1-chewi@gentoo.org> X-Mailer: git-send-email 2.24.1 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: b808e242-829e-49ff-a45b-c4308903d713 X-Archives-Hash: 48b51487c2dbd5af12bd426f5231cd74 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 --- eclass/dotnet.eclass | 18 ++++++++++-------- 1 file 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 -- 2.24.1