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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 85B51158013 for ; Mon, 11 Dec 2023 07:31:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FCB12BC064; Mon, 11 Dec 2023 07:31:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AE2DE2BC064 for ; Mon, 11 Dec 2023 07:31:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C62A34067D for ; Mon, 11 Dec 2023 07:31:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BF3214B1 for ; Mon, 11 Dec 2023 07:31:01 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1702279855.a4008c25b3189ab153ce8d0a4a9b381911fdb491.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/haskell-cabal.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: a4008c25b3189ab153ce8d0a4a9b381911fdb491 X-VCS-Branch: master Date: Mon, 11 Dec 2023 07:31:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bdbd6b9e-c9c3-4c92-ab3a-38a2ab1b2ef8 X-Archives-Hash: 079ab322f9eabbbfac1ea8b2b4061ab3 commit: a4008c25b3189ab153ce8d0a4a9b381911fdb491 Author: Ulrich Müller gentoo org> AuthorDate: Sun Dec 10 14:56:30 2023 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Dec 11 07:30:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4008c25 haskell-cabal.eclass: Drop support for EAPI 6 Signed-off-by: Ulrich Müller gentoo.org> eclass/haskell-cabal.eclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index a3e2da6155f3..4ae554d22fe8 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -7,7 +7,7 @@ # @AUTHOR: # Original author: Andres Loeh # Original author: Duncan Coutts -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: for packages that make use of the Haskell Common Architecture for Building Applications and Libraries (cabal) # @DESCRIPTION: # Basic instructions: @@ -41,9 +41,7 @@ # is fixed. case ${EAPI} in - # eutils is for eqawarn - 6) inherit eutils ;; - 8|7) ;; + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -99,7 +97,6 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile src_test src_in # CABAL_EXTRA_HSCOLOUR_FLAGS="--executables --tests" : "${CABAL_EXTRA_HSCOLOUR_FLAGS:=}" - # @ECLASS_VARIABLE: CABAL_EXTRA_TEST_FLAGS # @USER_VARIABLE # @DESCRIPTION: @@ -157,7 +154,7 @@ S="${WORKDIR}/${CABAL_P}" # @DESCRIPTION: # The location of the .cabal file for the Haskell package. This defaults to # "${S}/${CABAL_PN}.cabal". -# +# # NOTE: If $S is redefined in the ebuild after inheriting this eclass, # $CABAL_FILE will also need to be redefined as well. : "${CABAL_FILE:="${S}/${CABAL_PN}.cabal"}"