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 5956115A7DA for ; Fri, 17 Mar 2023 22:04:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0A042BC2FD; Fri, 17 Mar 2023 22:04:46 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 871382BC2FD for ; Fri, 17 Mar 2023 22:04:46 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93E9734104F for ; Fri, 17 Mar 2023 22:04:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6E8C8E8 for ; Fri, 17 Mar 2023 22:04:42 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1679090654.17a03dc319817453d58ea7f2e909e8b522c6659d.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/findlib.eclass X-VCS-Directories: eclass/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 17a03dc319817453d58ea7f2e909e8b522c6659d X-VCS-Branch: master Date: Fri, 17 Mar 2023 22:04:42 +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: 0145d89b-2446-4640-83e6-429609418e5f X-Archives-Hash: 9ed1ce213b60243fc5808e815e5ec4f7 commit: 17a03dc319817453d58ea7f2e909e8b522c6659d Author: David Seifert gentoo org> AuthorDate: Fri Mar 17 22:04:14 2023 +0000 Commit: David Seifert gentoo org> CommitDate: Fri Mar 17 22:04:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17a03dc3 findlib.eclass: remove EAPI 6 Signed-off-by: David Seifert gentoo.org> eclass/findlib.eclass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eclass/findlib.eclass b/eclass/findlib.eclass index 52e3655b3e84..fdcaa0c1b77c 100644 --- a/eclass/findlib.eclass +++ b/eclass/findlib.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: findlib.eclass @@ -6,13 +6,13 @@ # ML # @AUTHOR: # Original author: Matthieu Sozeau (retired) -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: ocamlfind (a.k.a. findlib) eclass # @DESCRIPTION: # ocamlfind (a.k.a. findlib) eclass -case ${EAPI:-0} in - [678]) ;; +case ${EAPI} in + 7|8) ;; *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; esac @@ -35,7 +35,7 @@ RDEPEND="dev-lang/ocaml:=[ocamlopt?]" # @DESCRIPTION: # Die if ocamlfind is not found check_ocamlfind() { - if [ ! -x "${EPREFIX}"/usr/bin/ocamlfind ] ; then + if [[ ! -x ${EPREFIX}/usr/bin/ocamlfind ]] ; then eerror "In ${ECLASS}: could not find the ocamlfind executable" eerror "Please report this bug on Gentoo's Bugzilla, assigning to ml@gentoo.org" die "ocamlfind executable not found" @@ -51,16 +51,16 @@ findlib_src_preinst() { check_ocamlfind # destdir is the ocaml sitelib - local destdir=`ocamlfind printconf destdir` + local destdir=$(ocamlfind printconf destdir) # strip off prefix destdir=${destdir#${EPREFIX}} - dodir ${destdir} || die "dodir failed" + dodir "${destdir}" export OCAMLFIND_DESTDIR=${ED}${destdir} # stublibs style - dodir ${destdir}/stublibs || die "dodir failed" + dodir "${destdir}"/stublibs export OCAMLFIND_LDCONF=ignore }