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 EDF5213835B for ; Sat, 13 Mar 2021 20:02:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40D61E083B; Sat, 13 Mar 2021 20:02:31 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2AD42E083B for ; Sat, 13 Mar 2021 20:02:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46DE0335D7F for ; Sat, 13 Mar 2021 20:02:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D508759B for ; Sat, 13 Mar 2021 20:02:28 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1615665739.4bd838280b7d4be0f84e0ea6a523a6f14c556136.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/myspell-r2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 4bd838280b7d4be0f84e0ea6a523a6f14c556136 X-VCS-Branch: master Date: Sat, 13 Mar 2021 20:02:28 +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: ebeff48d-29ca-46a2-8601-a91676c9c89d X-Archives-Hash: 516a9281d3fc49a808a255956251815e commit: 4bd838280b7d4be0f84e0ea6a523a6f14c556136 Author: Conrad Kostecki gentoo org> AuthorDate: Sat Mar 13 18:46:34 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat Mar 13 20:02:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bd83828 eclass/myspell-r2.eclass: add EAPI support As this eclass has no EAPI checks, so adding them. Currently EAPI 5,6 and 7 will be supported, as all existing ebuilds are currently in EAPI 5 and 6. This eclass also adds app-arch/unzip to DEPEND. In order to support EAPI=7, we need to add app-arch/unzip to BDEPEND instead. Signed-off-by: Conrad Kostecki gentoo.org> eclass/myspell-r2.eclass | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/eclass/myspell-r2.eclass b/eclass/myspell-r2.eclass index b75044a383f..8abbed09798 100644 --- a/eclass/myspell-r2.eclass +++ b/eclass/myspell-r2.eclass @@ -6,13 +6,12 @@ # maintainer-needed@gentoo.org # @AUTHOR: # Tomáš Chvátal +# @SUPPORTED_EAPIS: 5 6 7 # @BLURB: An eclass to streamline the construction of ebuilds for new Myspell dictionaries. # @DESCRIPTION: # The myspell-r2 eclass is designed to streamline the construction of ebuilds for # the new Myspell dictionaries which support hunspell. -EXPORT_FUNCTIONS src_unpack src_install - # @ECLASS-VARIABLE: MYSPELL_DICT # @DEFAULT_UNSET # @DESCRIPTION: @@ -31,11 +30,28 @@ EXPORT_FUNCTIONS src_unpack src_install # Array variable containing list of all thesarus files. # MYSPELL_THES=( "file.dat" "dir/file2.idx" ) +case ${EAPI:-0} in + [0-4]) + die "${ECLASS} is banned in EAPI ${EAPI:-0}" + ;; + [5-7]) + ;; + *) + die "Unknown EAPI ${EAPI:-0}" + ;; +esac + +EXPORT_FUNCTIONS src_unpack src_install + # Basically no extra deps needed. # Unzip is required for .oxt libreoffice extensions # which are just fancy zip files. -DEPEND="app-arch/unzip" -RDEPEND="" +if [[ ${EAPI:-0} == 7 ]]; then + BDEPEND="app-arch/unzip" +else + DEPEND="app-arch/unzip" + RDEPEND="" +fi # by default this stuff does not have any folder in the pack S="${WORKDIR}"