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 19784158041 for ; Wed, 10 Apr 2024 19:42:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 580CEE29E1; Wed, 10 Apr 2024 19:42:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3593AE29E1 for ; Wed, 10 Apr 2024 19:42:28 +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 4F47B34302D for ; Wed, 10 Apr 2024 19:42:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4F26B47 for ; Wed, 10 Apr 2024 19:42:25 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1712778002.3f10a00d16c1ab452b2f5b7fe0634aef7a5ecf4c.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tex/rubber/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-tex/rubber/Manifest dev-tex/rubber/rubber-1.6.4.ebuild dev-tex/rubber/rubber-9999.ebuild X-VCS-Directories: dev-tex/rubber/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 3f10a00d16c1ab452b2f5b7fe0634aef7a5ecf4c X-VCS-Branch: master Date: Wed, 10 Apr 2024 19:42:25 +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: ccb15417-b928-47a7-ac53-adacea8b8666 X-Archives-Hash: e067d8ffd79bb88a43f5c0c839d8758a commit: 3f10a00d16c1ab452b2f5b7fe0634aef7a5ecf4c Author: Sebastian Pipping gentoo org> AuthorDate: Wed Apr 10 16:43:32 2024 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Wed Apr 10 19:40:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f10a00d dev-tex/rubber: 1.6.4 + EAPI 8 + PEP 517 + sync 9999 Closes: https://bugs.gentoo.org/909975 Closes: https://bugs.gentoo.org/922804 Signed-off-by: Sebastian Pipping gentoo.org> dev-tex/rubber/Manifest | 1 + .../{rubber-9999.ebuild => rubber-1.6.4.ebuild} | 23 ++++++++++++---------- dev-tex/rubber/rubber-9999.ebuild | 23 ++++++++++++---------- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest index 5c990028fcde..18cd13a5b516 100644 --- a/dev-tex/rubber/Manifest +++ b/dev-tex/rubber/Manifest @@ -1,2 +1,3 @@ DIST rubber-1.5.1.tar.gz 111812 BLAKE2B 4d08527689d669e3ac8dd6e9050fc09766bfb46c53d9923ce10efc0aaf8a62a962cb2f1c27a0e7a19a9be96710edba923d93589d816aa22305eec33fd08aa08c SHA512 ba22eeddc24b4f9abf0bf087604a4261add648877ec558b766555de09538cd20c21c8cfd9731c1421540bb2479501dd6ed066346d250c6bc981529e31efacc40 DIST rubber-1.6.0.tar.bz2 98055 BLAKE2B e3355a53f811e972b68a918393023a16c11a84035c0ea76b560df25db2d9c20f2a7c9d0d4fc3b0395c6baab5dc785840fa18a76aa0e3f480cf2c14668d61b083 SHA512 68674c27fa7c6eb2c8ec60c0a961fd2dd07822fe5ba50682e863a7dbe7d1e0ce8ebffce84a52b72a254cb9c8d446a33005715b81e43dd6266e2c247f12ebb1e6 +DIST rubber-1.6.4.tar.bz2 100227 BLAKE2B 5a467f5a2a4709e7faffef1308e644900f02ca51e4fff635e7a88bb237788e60257e0e8e82ed9acac66db46f0a1e8aed1296703fefc8e1fb6e28cd38334b7d14 SHA512 dbb3896c165d63cfae8421929d0d796002fb3abcfc2ccb3fe70c4c98acc54ed48be1ad469158436dabd973bf37355c62c096ebd47c0efa7dbe58137a0a895527 diff --git a/dev-tex/rubber/rubber-9999.ebuild b/dev-tex/rubber/rubber-1.6.4.ebuild similarity index 84% copy from dev-tex/rubber/rubber-9999.ebuild copy to dev-tex/rubber/rubber-1.6.4.ebuild index 52c54772aed8..bac70181e992 100644 --- a/dev-tex/rubber/rubber-9999.ebuild +++ b/dev-tex/rubber/rubber-1.6.4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS="no" +DISTUTILS_USE_PEP517=hatchling inherit distutils-r1 @@ -12,10 +12,9 @@ if [[ ${PV} == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/latex-rubber/${PN}.git" else - UPSTREAM_PV=$(ver_rs 3 -) - SRC_URI="https://gitlab.com/latex-rubber/${PN}/-/archive/${UPSTREAM_PV}/${PN}-${UPSTREAM_PV}.tar.bz2" - S="${WORKDIR}/${PN}-${UPSTREAM_PV}" - KEYWORDS="~amd64 ~ppc ~x86" + # NOTE: Cannot be "PYPI_PN=latex-rubber" + "inherit pypi" due to missing tests + SRC_URI="https://gitlab.com/latex-rubber/${PN}/-/archive/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~ppc ~riscv ~x86" fi DESCRIPTION="A LaTeX wrapper for automatically building documents" @@ -101,8 +100,12 @@ python_install() { } src_install() { - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _rubber - distutils-r1_src_install + + # Fix file misplacements + dodir /usr/share/man/fr + mv "${D}"/usr/share/{doc/man-fr,man/fr/man1} || die + mv "${D}"/usr/share/{doc/man-en,man/man1} || die + dodir /usr/share/doc/${P} + mv "${D}"/usr/share/doc/{rubber.*,${P}/} || die } diff --git a/dev-tex/rubber/rubber-9999.ebuild b/dev-tex/rubber/rubber-9999.ebuild index 52c54772aed8..bac70181e992 100644 --- a/dev-tex/rubber/rubber-9999.ebuild +++ b/dev-tex/rubber/rubber-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_USE_SETUPTOOLS="no" +DISTUTILS_USE_PEP517=hatchling inherit distutils-r1 @@ -12,10 +12,9 @@ if [[ ${PV} == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/latex-rubber/${PN}.git" else - UPSTREAM_PV=$(ver_rs 3 -) - SRC_URI="https://gitlab.com/latex-rubber/${PN}/-/archive/${UPSTREAM_PV}/${PN}-${UPSTREAM_PV}.tar.bz2" - S="${WORKDIR}/${PN}-${UPSTREAM_PV}" - KEYWORDS="~amd64 ~ppc ~x86" + # NOTE: Cannot be "PYPI_PN=latex-rubber" + "inherit pypi" due to missing tests + SRC_URI="https://gitlab.com/latex-rubber/${PN}/-/archive/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~ppc ~riscv ~x86" fi DESCRIPTION="A LaTeX wrapper for automatically building documents" @@ -101,8 +100,12 @@ python_install() { } src_install() { - insinto /usr/share/zsh/site-functions - newins misc/zsh-completion _rubber - distutils-r1_src_install + + # Fix file misplacements + dodir /usr/share/man/fr + mv "${D}"/usr/share/{doc/man-fr,man/fr/man1} || die + mv "${D}"/usr/share/{doc/man-en,man/man1} || die + dodir /usr/share/doc/${P} + mv "${D}"/usr/share/doc/{rubber.*,${P}/} || die }