From patchwork Fri Mar 31 15:32:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 48851 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 84CA2172C8; Fri, 31 Mar 2023 16:33:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 00ACB17280 for ; Fri, 31 Mar 2023 16:33:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1piGkX-00034B-55; Fri, 31 Mar 2023 11:33:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1piGkV-000320-53 for guix-patches@gnu.org; Fri, 31 Mar 2023 11:33:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1piGkQ-0000tv-Sl for guix-patches@gnu.org; Fri, 31 Mar 2023 11:33:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1piGkQ-0007Sj-Og for guix-patches@gnu.org; Fri, 31 Mar 2023 11:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62570] [PATCH 4/6] gnu: texlive-latex-acronym: Replace with texlive-acronym. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Mar 2023 15:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62570@debbugs.gnu.org Received: via spool by 62570-submit@debbugs.gnu.org id=B62570.168027677728634 (code B ref 62570); Fri, 31 Mar 2023 15:33:02 +0000 Received: (at 62570) by debbugs.gnu.org; 31 Mar 2023 15:32:57 +0000 Received: from localhost ([127.0.0.1]:34280 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piGkK-0007Rf-Fz for submit@debbugs.gnu.org; Fri, 31 Mar 2023 11:32:56 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:50747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1piGk6-0007QL-OX for 62570@debbugs.gnu.org; Fri, 31 Mar 2023 11:32:46 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 22E19E001B for <62570@debbugs.gnu.org>; Fri, 31 Mar 2023 15:32:36 +0000 (UTC) From: Nicolas Goaziou Date: Fri, 31 Mar 2023 17:32:24 +0200 Message-Id: <20230331153226.607420-4-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230331153226.607420-1-mail@nicolasgoaziou.fr> References: <20230331153226.607420-1-mail@nicolasgoaziou.fr> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/tex.scm (texlive-latex-acronym): Deprecate package. (texlive-acronym): New variable. --- gnu/packages/tex.scm | 59 +++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 20 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d78b1672f1..94bb47d626 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8171,28 +8171,47 @@ (define-public texlive-latex-preview files.") (license license:gpl3+))) -(define-public texlive-latex-acronym - (package - (name "texlive-latex-acronym") - (version (number->string %texlive-revision)) - (source (origin - (method svn-fetch) - (uri (texlive-ref "latex" "acronym")) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "09pd4wynksg1y1ddxnqbhk2dc185zw5nyi794d86n3qx8l014ijy")))) - (build-system texlive-build-system) - (arguments '(#:tex-directory "latex/acronym")) - (home-page "https://www.ctan.org/pkg/acronym") - (synopsis "Expand acronyms at least once") - (description - "This package ensures that all acronyms used in the text are spelled out -in full at least once. It also provides an environment to build a list of +(define-public texlive-acronym + (let ((template (simple-texlive-package + "texlive-acronym" + (list "doc/latex/acronym/" + "source/latex/acronym/" + "tex/latex/acronym/") + (base32 + "0p2sws3qy7wv0v6bsy6c5j36n9s1ps7b1z7dmg1370schrjpqnfh")))) + (package + (inherit template) + (outputs '("out" "doc")) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ #t) "latex/acronym") + ((#:build-targets _ '()) '(list "acronym.ins")) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'chdir + (lambda _ (chdir "source/latex/acronym/"))) + (replace 'copy-files + (lambda* (#:key inputs #:allow-other-keys) + (let ((origin (assoc-ref inputs "source")) + (source (string-append #$output + "/share/texmf-dist/source")) + (doc (string-append #$output:doc + "/share/texmf-dist/doc"))) + (copy-recursively (string-append origin "/source") source) + (copy-recursively (string-append origin "/doc") doc)))))))) + (propagated-inputs + (list texlive-bigfoot texlive-relsize texlive-xstring)) + (home-page "https://ctan.org/pkg/acronym") + (synopsis "Expand acronyms at least once") + (description + "This package ensures that all acronyms used in the text are spelled +out in full at least once. It also provides an environment to build a list of acronyms used. The package is compatible with PDF bookmarks. The package -requires the suffix package, which in turn requires that it runs under +requires the @code{suffix} package, which in turn requires that it runs under e-TeX.") - (license license:lppl1.3+))) + (license license:lppl1.3+)))) + +(define-deprecated-package texlive-latex-acronym texlive-acronym) (define-public texlive-pdftex (package