gentoo auto-resync : 11:04:2024 - 00:32:37

3 files changed, 127 insertions, 11 deletions

diff --git a/dev-tex/rubber/Manifest b/dev-tex/rubber/Manifest
index 5912f0f9985f..6e87d6e1a269 100644
--- a/dev-tex/rubber/Manifest
+++ b/dev-tex/rubber/Manifest
@@ -1,6 +1,8 @@
 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
 EBUILD rubber-1.5.1-r1.ebuild 734 BLAKE2B 7a5830ee24b406390b747717e16a1f2c175dbb46d2d6ee2e94b86731be813bb6c3630e1921e4022e9a1f8b44f47a4cf1d8eb25abb9554bc2aa3534f671d7f1b8 SHA512 6c10c4c6846edd3c57dae36e14763ca6158eeade6f74c5f98a1b68f96469a9042127011448b705bdf5ab2eb40a841146a7cb4fbf5a5882dc96f95cb5938a9c52
 EBUILD rubber-1.6.0-r1.ebuild 3043 BLAKE2B 0ad277227573c51966d2cdb38d8a6472c7730ff14883f5a8b227a1288dfef3a439d8a8e9a4d03b91a7c65dc96573a3ea5989c7eb4eb261f5ad9715bcb1f22cad SHA512 9c60c59414e01e14416e68e3564b1fb10c746624158c85b6932350a6b3580ff84fcabecb4ad2c2b216a8b15e067a99001e2df5867457ca306d10b0fc9f293a1c
-EBUILD rubber-9999.ebuild 3037 BLAKE2B 4f3f7da117024c9fd85cb495e5f5de12b8b0b3b86678645fbe732d437d5a4a62d62033c1591c240a8bd17349cf000bdc2ac69f8223193f444eb85a557d2ed431 SHA512 c88fd00b4dc77e574cac10e81477427fdd9bc7329612d878756ab14751597c141bf98541b258f163f109acde74326c7a5e3ce19a5d778ad626756a455f865cfc
+EBUILD rubber-1.6.4.ebuild 3191 BLAKE2B ec1242306e1a44dcb053d6cba31eb4dffa8e2b945cf882111c007f7c9cca8fa53c88da0b72a61544cde93ef95a55e4b3bba15fe6220eb6275ce4c8e483f5af82 SHA512 e5285fcc84fa09682887b418bc83f0c95f459ac1048204c3800762e2dc88aabc7b591eab3481553039636db0ae8fd32cab9df1845ff653fb6e0bc0476f6372be
+EBUILD rubber-9999.ebuild 3191 BLAKE2B ec1242306e1a44dcb053d6cba31eb4dffa8e2b945cf882111c007f7c9cca8fa53c88da0b72a61544cde93ef95a55e4b3bba15fe6220eb6275ce4c8e483f5af82 SHA512 e5285fcc84fa09682887b418bc83f0c95f459ac1048204c3800762e2dc88aabc7b591eab3481553039636db0ae8fd32cab9df1845ff653fb6e0bc0476f6372be
 MISC metadata.xml 465 BLAKE2B 36be3746c0ec60fc3396323dd3a1e9401b754c7ab8cf893a0bee6201cf054c90e7caf337772a75c66e4e2391ad6bfeeb5f1284761a87301d09c1421513e1daa1 SHA512 5dbf081ccc11b8ce546c3939267e786f50bf47d5fab94715721a5cac841472143720748914f20079851c9fbe02ed28ddfe734357acde49de13d5106747f39128
diff --git a/dev-tex/rubber/rubber-1.6.4.ebuild b/dev-tex/rubber/rubber-1.6.4.ebuild
new file mode 100644
index 000000000000..bac70181e992
--- /dev/null
+++ b/dev-tex/rubber/rubber-1.6.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+inherit distutils-r1
+
+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
+	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"
+HOMEPAGE="https://gitlab.com/latex-rubber/rubber"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/latex-base"
+
+# Test dependencies:
+# - app-text/texlive-core for rubber's 'cweave' test
+# - dev-lang/R for rubber's 'knitr' test (requires knitr R library, currently disabled)
+# - dev-texlive/texlive-latexextra for rubber's 'combine' test (currently disabled)
+BDEPEND="
+	${RDEPEND}
+	virtual/texi2dvi
+	test? (
+		app-text/ghostscript-gpl
+		app-text/texlive-core
+		dev-tex/biber
+		dev-tex/biblatex
+		dev-tex/glossaries
+		dev-tex/latex-beamer
+		$(python_gen_cond_dep 'dev-tex/pythontex[${PYTHON_USEDEP}]')
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-pstricks
+		media-gfx/asymptote
+	)
+"
+
+pkg_setup() {
+	# https://bugs.gentoo.org/727996
+	export VARTEXFONTS="${T}"/fonts
+}
+
+python_test() {
+	cd tests || die
+
+	# Disable the broken 'combine' test as it uses the 'combine' as a
+	# latex package when it is only a document class (probably only in
+	# newer versions of combine). Also note that this tests works
+	# under debian 'buster'. TODO: Look into potential modifications
+	# done by debian.
+	touch combine/disable || die
+
+	# This test does not work under Gentoo nor Debian 'buster'.
+	# TODO: Investigate why it does not work.
+	touch cweb-latex/disable || die
+
+	# TODO: Investigate why the following are failing.
+	touch fig2dev-dvi/disable || die
+	touch fig2dev-path/disable || die
+	touch fig2dev-path-inplace/disable || die
+	touch fig2dev-path-into/disable || die
+	touch graphicx-dotted-files/disable || die
+	touch hooks-input-file/disable || die
+	touch knitr/disable || die
+
+	# Even tough metapost is available, those tests fail on Gentoo
+	# (while they succeed on Debian 'buster').
+	# TODO: Determine why.
+	# ERROR:mpost:I can't read MetaPost's log file, this is wrong.
+	touch metapost/disable || die
+	# expected error message not reported by Rubber
+	touch metapost-error/disable || die
+	# ERROR:mpost:I can't read MetaPost's log file, this is wrong.
+	touch metapost-input/disable || die
+
+	./run.sh * || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	local my_install_args=(
+		--mandir="${EPREFIX}/usr/share/man"
+		--infodir="${EPREFIX}/usr/share/info"
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+	)
+
+	distutils-r1_python_install "${my_install_args[@]}"
+}
+
+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
+}
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
 }