gentoo auto-resync : 14:05:2023 - 16:01:32

3 files changed, 15 insertions, 64 deletions

diff --git a/dev-tex/latex2rtf/Manifest b/dev-tex/latex2rtf/Manifest
index 297733d9bd4d..94758aab6458 100644
--- a/dev-tex/latex2rtf/Manifest
+++ b/dev-tex/latex2rtf/Manifest
@@ -1,5 +1,3 @@
-DIST latex2rtf-2.3.11a.tar.gz 1582004 BLAKE2B 0740e4e836c0638e0fbb712a77b258943b549d3cd4531cf1121452df92e36ec83d216bc7ad196a8c6c1341a876e42f833840cd3bd7e402dd38840405a3e501ba SHA512 b6e6000b4f919ecfb5174f32887cb4e1b765530547b3b50103e778d0244f0ce37d0ec14bbd1fa6b2ef2569f0c437b34b29586c4bdb2e3caf50584847819f54c0
 DIST latex2rtf-2.3.15.tar.gz 1648297 BLAKE2B b9c6a2c6ef978eb1aee8245582763b3339aaeebb34c7ff8b501ba1f18a2337407d13b440eeb2421a0df7336715a0ac3a4390ba7dd15c22ee5498911a93f599f4 SHA512 ef4603bd4d484eadd2accc16b1e20165450cf2ee56b29f950549028954f00ab6e99ec695959b8971d112617f641f8cca193e990a17053ee5cbe0c1bfc8b8630c
-EBUILD latex2rtf-2.3.11.ebuild 1044 BLAKE2B 54dd21bd2322752575ab755df3544273ff5d6faa003cd0b60a39062fc0d56c5fa1df77122bfd0cedfa06652c1f984c4828f4c602f7bcd0f68528d6c559a3ad65 SHA512 93415f2467a64648c6a99d19a7102def616db16c9b57951215c756b2519c3ad04fc695f3ebb34d469b276a9babf8f24140e282397346617bd0b60945baa1e171
-EBUILD latex2rtf-2.3.15.ebuild 1035 BLAKE2B 06b85e264a5d607327f546328025da8d56d20ea5d90aacac59c19409cc51d4de2c6655ddf4481524214ec310f719cfcdfffeba029c3f87f79410f2f4927eb063 SHA512 d10bbda5d708fcebb272a9206dfeb0b89d65f4bd23e09d456b7dbc68014ff3179ec96c93d7483958d1c14b8a7bc6e97794e8c897feef22d8d28c572b9dace533
+EBUILD latex2rtf-2.3.15-r1.ebuild 1035 BLAKE2B bbe02b4f81c26296872b1c99ff4470e331864b8df01065c768fcf3c613cbb826c7f992e95b586cef5d27e9feac48f457e582abfb468c6712a82bd0cb143f610b SHA512 369defc2d4f6e98858aa76c7cabd93f474aa49259348a6bf19c7f30dd7539b533db1f2fa1a912e75c31b9d5d06ccfe666671f175af154f81fb10a8aaabeb502d
 MISC metadata.xml 329 BLAKE2B 7bc757fbe67b37ea89df8b8858fff8b4a11fd57f388555fdaf9a69a7f4de05b56d2bbfcd072c1ce3ee9b32a094a7f0fffcaa8cba6416119e4953774ce6bbd769 SHA512 5aeed05dc2baf5d2665b00c4ce21b1fa8f9630c81c1dbf561d519080a5b25608cc830e01053ca83b39b797733da26978b3e1b0f36bfcbb0574050c0a560768e1
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
deleted file mode 100644
index 61512130ad48..000000000000
--- a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="LaTeX to RTF converter"
-HOMEPAGE="http://latex2rtf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/latex2rtf/${P}a.tar.gz" # 'a' is only for 2.3.11 version for fixing a tarball generation bug
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-S="${WORKDIR}/${P%b}"
-
-RDEPEND="
-	virtual/latex-base
-	media-gfx/imagemagick
-"
-DEPEND="${RDEPEND}
-	virtual/texi2dvi
-	test? (
-		dev-texlive/texlive-langgerman
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-latexextra
-		dev-tex/latex2html
-	)
-"
-
-src_compile() {
-	export VARTEXFONTS="${T}/fonts"
-	tc-export CC
-	# Set DESTDIR here too so that compiled-in paths are correct.
-	emake DESTDIR="${EPREFIX}/usr"
-
-	cd "${S}/doc"
-	emake realclean
-	emake -j1
-}
-
-src_install() {
-	dodoc README* HACKING ToDo ChangeLog doc/credits
-	emake DESTDIR="${ED}/usr" -j1 install install-info
-}
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.15-r1.ebuild
index 732b4e1aa03a..f1105ddeb5b2 100644
--- a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.15-r1.ebuild
@@ -1,49 +1,48 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit toolchain-funcs
 
 DESCRIPTION="LaTeX to RTF converter"
 HOMEPAGE="http://latex2rtf.sourceforge.net/"
 SRC_URI="mirror://sourceforge/latex2rtf/${P}.tar.gz"
+S="${WORKDIR}/${P%b}"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 SLOT="0"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
-S="${WORKDIR}/${P%b}"
 
 RDEPEND="
 	virtual/latex-base
-	media-gfx/imagemagick
-"
-DEPEND="${RDEPEND}
+	media-gfx/imagemagick"
+BDEPEND="${RDEPEND}
 	virtual/texi2dvi
 	test? (
 		dev-texlive/texlive-langgerman
 		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-latexextra
 		dev-tex/latex2html
-	)
-"
+	)"
 
 src_compile() {
-	export VARTEXFONTS="${T}/fonts"
+	export VARTEXFONTS="${T}"/fonts
+
 	tc-export CC
 	# Set DESTDIR here too so that compiled-in paths are correct.
-	emake DESTDIR="${EPREFIX}/usr"
+	emake DESTDIR="${EPREFIX}"/usr
 
 	# Needed for tests
 	chmod +x test/bracecheck || die
 
-	cd "${S}/doc"
-	emake realclean
-	emake -j1
+	emake -C doc realclean
+	emake -C doc -j1
 }
 
 src_install() {
 	dodoc README* HACKING ToDo ChangeLog doc/credits
-	emake DESTDIR="${ED}/usr" -j1 install install-info
+	emake DESTDIR="${ED}"/usr -j1 install install-info
 }