[gentoo-commits] repo/gentoo:master commit in: dev-tex/rubber/

[Sebastian Pipping]

commit:     0ec4644f56e48a0244a192556e6c48c6df58e1ae
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 14:11:56 2024 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 14:15:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec4644f

dev-tex/rubber: 1.6.5 + sync 9999

Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>

 dev-tex/rubber/Manifest                                    |  1 +
 dev-tex/rubber/{rubber-9999.ebuild => rubber-1.6.5.ebuild} | 13 ++++++-------
 dev-tex/rubber/rubber-9999.ebuild                          | 13 ++++++-------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest
index 18cd13a5b516..38ac9cbb1160 100644
--- a/dev-tex/rubber/Manifest
+++ b/dev-tex/rubber/Manifest
@@ -1,3 +1,4 @@
 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
+DIST rubber-1.6.5.tar.bz2 100300 BLAKE2B 
bbddf550fbce2f2f98ecf2e737515b4c6891e89494dc2c39cc4a0f268d76f505cad184f27c5f333bc706fe08adcce1d668e8e33c37e26fc6142b12b32797e402
 SHA512 
e0fadbca6d9e570e6414a99a72da22656abb0fc71e14dd0840bd3dd68364d0da0b2fd5c416f45eb8489bdcb10c226657799efae4ae0c73807b2485b8c8c2094b

diff --git a/dev-tex/rubber/rubber-9999.ebuild 
b/dev-tex/rubber/rubber-1.6.5.ebuild
similarity index 92%
copy from dev-tex/rubber/rubber-9999.ebuild
copy to dev-tex/rubber/rubber-1.6.5.ebuild
index bac70181e992..cc981e17fe39 100644
--- a/dev-tex/rubber/rubber-9999.ebuild
+++ b/dev-tex/rubber/rubber-1.6.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://gitlab.com/latex-rubber/${PN}.git";
 else
-       # NOTE: Cannot be "PYPI_PN=latex-rubber" + "inherit pypi" due to 
missing tests
+       # NOTE: Cannot be "PYPI_PN=latex-rubber" + "inherit pypi" due to 
missing files
        
SRC_URI="https://gitlab.com/latex-rubber/${PN}/-/archive/${PV}/${P}.tar.bz2";
        KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 fi
@@ -48,6 +48,10 @@ BDEPEND="
        )
 "
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.6.4-pythontex.patch
+)
+
 pkg_setup() {
        # https://bugs.gentoo.org/727996
        export VARTEXFONTS="${T}"/fonts
@@ -102,10 +106,5 @@ python_install() {
 src_install() {
        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
+       mv "${D}"/usr/share/doc/{${PN},${PF}} || die
 }

diff --git a/dev-tex/rubber/rubber-9999.ebuild 
b/dev-tex/rubber/rubber-9999.ebuild
index bac70181e992..cc981e17fe39 100644
--- a/dev-tex/rubber/rubber-9999.ebuild
+++ b/dev-tex/rubber/rubber-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
        inherit git-r3
        EGIT_REPO_URI="https://gitlab.com/latex-rubber/${PN}.git";
 else
-       # NOTE: Cannot be "PYPI_PN=latex-rubber" + "inherit pypi" due to 
missing tests
+       # NOTE: Cannot be "PYPI_PN=latex-rubber" + "inherit pypi" due to 
missing files
        
SRC_URI="https://gitlab.com/latex-rubber/${PN}/-/archive/${PV}/${P}.tar.bz2";
        KEYWORDS="~amd64 ~ppc ~riscv ~x86"
 fi
@@ -48,6 +48,10 @@ BDEPEND="
        )
 "
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.6.4-pythontex.patch
+)
+
 pkg_setup() {
        # https://bugs.gentoo.org/727996
        export VARTEXFONTS="${T}"/fonts
@@ -102,10 +106,5 @@ python_install() {
 src_install() {
        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
+       mv "${D}"/usr/share/doc/{${PN},${PF}} || die
 }