gentoo resync : 21.06.2020

6 files changed, 122 insertions, 78 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 83c170be7178..6f379633c3e8 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/revtex/Manifest b/dev-tex/revtex/Manifest
deleted file mode 100644
index 14b49ebc16f3..000000000000
--- a/dev-tex/revtex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST revtex-4.2c.zip 3258548 BLAKE2B 8a457594c22dfee9becd18d2c26c0182d8eee51d549a85c5bc4ddaf122a1a06b835ca1f31a61de1bf194e4aeac7dafd25f9bf120c786356b773130f036de67e7 SHA512 9cb8287de61a49a35b18f6873ac3007eea3373c4836edd696d04d49ece297727d9aae614a6ba0f2aa03d5cf2430a2f02f674d342a092f1acb862b8ffdbf5cea9
-EBUILD revtex-4.2c.ebuild 1232 BLAKE2B 0ebf45a0840d3c93a4503ff78ac74950a8984f33ec896c0fa24dfe5616d9142a8f0f1b4cb144e685ef4b15b0eb74114f37fe798aa7eb09b9ffb5dbf9253985fb SHA512 390714c045a18337128af7575912ee4dd34eeb535559baa8f5d84d45942a0fff27417cefe23f160798cabe7fef9dfa357e1098272cd1b7140d3aa87a6d30f2c6
-MISC metadata.xml 426 BLAKE2B b7bbaadff70097886d660994d254a869b6f1ee8e8f331234e7756986c17e3f9e0c7392f0d99974ee75a483d5e1bb803ea8537843b0f68fb5852fdf86e46c76e1 SHA512 7e262c95822febb3edbcbeae5789302be3119ae7d216a539546abf8c36041f38ddf6bb0540df51ef12aa9b1604fe996e9a9d7ecd0414e1944739acc1d777872f
diff --git a/dev-tex/revtex/metadata.xml b/dev-tex/revtex/metadata.xml
deleted file mode 100644
index 7a7c477125c3..000000000000
--- a/dev-tex/revtex/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person"><email>dilfridge@gentoo.org</email></maintainer>
-<maintainer type="project">
-<email>tex@gentoo.org</email>
-<name>Gentoo TeX Project</name>
-</maintainer>
-<maintainer type="project">
-<email>sci@gentoo.org</email>
-<name>Gentoo Science Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-tex/revtex/revtex-4.2c.ebuild b/dev-tex/revtex/revtex-4.2c.ebuild
deleted file mode 100644
index 7a01b56ff080..000000000000
--- a/dev-tex/revtex/revtex-4.2c.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="LaTeX2e macros to prepare manuscripts for the journals of the APS and AIP"
-HOMEPAGE="https://journals.aps.org/revtex"
-SRC_URI="http://mirrors.ctan.org/macros/latex/contrib/revtex.zip -> ${P}.zip"
-
-LICENSE="LPPL-1.3c"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND=">=dev-texlive/texlive-latex-2012"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-IUSE="doc"
-
-S="${WORKDIR}/${PN}"
-
-TEXMF=/usr/share/texmf-site
-
-src_prepare() {
-	default
-	find "${S}" -name '*4-1*' -delete || die
-	find "${S}" -name reftest4-2.tex -delete || die
-}
-
-src_compile() {
-	cd "${S}/source" || die
-
-	for name in *.dtx; do
-		tex $name || die
-	done
-	latex-package_src_compile
-
-	cd "${S}/bibtex" || die
-	latex-package_src_compile
-}
-
-src_install() {
-	cd "${S}/source"
-
-	use doc && rm -f aip.dtx # fails to build docs
-
-	latex-package_src_install
-
-	# we need the revtex-specific rtx files in the same dir as the class files
-	insinto ${TEXMF}/tex/latex/${PN}
-	for i in `find . -maxdepth 1 -type f -name "*.rtx"` ; do
-		doins $i
-	done
-
-	cd "${S}/bibtex" || die
-	latex-package_src_install
-
-	find "${D}" -name aip4-1.rtx -delete || die
-}
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 49b5ab4eff5e..85ffe4949665 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -1,5 +1,7 @@
 AUX 50tex4ht.cnf 192 BLAKE2B 38a4543a22281d9b757e823e95cc8743a0c18b3fe7d6ce028317c8cea9305b7643e540171693ef70bdd364b6f6ff72daabc0baf66f32bb8ea526dcb0406fb065 SHA512 fec1a4ab9a3a493476a255001303c84a30fcf67873bd2639d177b414cf90880a149d31a68d6ce0dfd104b877bfc3fc2d39b1bb38a0f9d7c511bd311e0bfefc48
 DIST tex4ht-1.0.2009_06_11_1038.tar.gz 2576719 BLAKE2B d04fd7b5f614414a200b01f11bea9880ea12561873fc08cb2f5f6f62167d6128cc50abbeeee0c7eae5d80046f6d3b504493d66262153c5a534fd1b56bfa1dfcd SHA512 868961c16da63ef20a8af3ec3e56a2b6c518a291cdbc3974f701773dbb55b844f0df06aae4c7b481c96b9e2ba29cb0f1ed1279b6f32340e4708e31bb67170963
 DIST tex4ht-texlive-2019-03-22.tar.xz 868992 BLAKE2B 662cc23de1b3b5f4e3d504655b5b3d87740fea045bef7987cbe2d81971e73375bd88d8ab111d48878ce1fe9d1eece4e4003e443ed0bc0f9b643b7e1653a5fc8c SHA512 44d9e2c4f92ae1ea1d7f14432d7fe1a9f11b30ec8602d55c4b8f3f46283671fb75b08641c8170bd46918e16db1bed696a613a0518acd4e195e173fe12e386833
+DIST tl-tex4ht-2020.tar.xz 909692 BLAKE2B ef566977a0a5a8d6ae5244fceac4ff378dc8adf86817e7bbbd1d0cd1931fc5fcb618b94353b044d461d94edd426ec3aa185e1b7d678490416bb1c122438046c3 SHA512 c385b90fcff5ba43884918bf616aa4beffc285def1a380b84909bf4dd44cffb479612268a37977adf87f8dc226394d3239503b5d6f2a083a9f078862f282f0c4
 EBUILD tex4ht-20090611_p1038-r8.ebuild 3644 BLAKE2B 57e046a3ee07c5d871d10a5c582002f070f8a8648cf2963075af4670451eb3525b6c7f1661c773e83c2ea4dee450efa1bd231d69922f732f10b65c0b5114692d SHA512 564011601c3af1cd93a28d1cea2fe75eed43be30aaeac50d3c27fcae2e1b2ff3eecce2f0c0092af2782a9c6e3fc4b39aee38b86cd95c3d24999974a4a6a2137e
+EBUILD tex4ht-20090611_p1038-r9.ebuild 3602 BLAKE2B d281be861aa73cacb967b61c8769d057ed47f06deaefec488ecfdd9a9f60fc8cb833188804e131d228bde90eee19e279ca835183ec49da60f2ab07096e636b0b SHA512 a8f2dcb7e37324ff373639c9b814192ba841ed87902f7755f88af5b48761247117a1f5a86f5f16167fd496ac9fa8528b0cb77ac3bcab6b5a4d546a2a6a7dab5a
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r9.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r9.ebuild
new file mode 100644
index 000000000000..e5b3574cf7ea
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r9.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+TL_TEX4HT_VER="2020"
+
+# tex4ht-20050331_p2350 -> tex4ht-1.0.2005_03_31_2350
+MY_P="${PN}-1.0.${PV:0:4}_${PV:4:2}_${PV:6:2}_${PV/*_p/}"
+
+DESCRIPTION="Converts (La)TeX to (X)HTML, XML and OO.org"
+HOMEPAGE="http://www.cse.ohio-state.edu/~gurari/TeX4ht/
+	http://www.cse.ohio-state.edu/~gurari/TeX4ht/bugfixes.html"
+SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${PN}-${TL_TEX4HT_VER}.tar.xz"
+
+LICENSE="LPPL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="java"
+
+RDEPEND="app-text/ghostscript-gpl
+	media-gfx/imagemagick
+	dev-libs/kpathsea
+	java? ( >=virtual/jre-1.5 )"
+
+DEPEND="dev-libs/kpathsea"
+
+BDEPEND="virtual/pkgconfig
+	java? ( >=virtual/jdk-1.5 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	cp -a "${WORKDIR}/texmf-dist/"* texmf/ || die
+	eapply_user
+	cd "${S}/texmf/tex4ht/base/unix" || die
+	sed -i \
+		-e "s#~/tex4ht.dir#${EPREFIX}/usr/share#" \
+		-e "s#tpath/tex/texmf/fonts/tfm/!#t${EPREFIX}/usr/share/texmf-dist/fonts/tfm/!\nt${EPREFIX}/usr/local/share/texmf/fonts/tfm/!\nt${EPREFIX}/var/cache/fonts/tfm/!\nt${EPREFIX}${TEXMF}/fonts/tfm/!#" \
+		-e "s#%%~#${EPREFIX}${TEXMF}#g" \
+		-e "s#/usr/share/texmf/#${EPREFIX}${TEXMF}/#" \
+		tex4ht.env \
+		|| die "sed of tex4ht.env failed"
+
+	einfo "Removing precompiled java stuff"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete || die
+}
+
+src_compile() {
+	has_version '>=dev-libs/kpathsea-6.2.1' \
+		&& append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+	cd "${S}/src" || die
+	einfo "Compiling postprocessor sources..."
+	for f in tex4ht t4ht htcmd ; do
+		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
+			-DENVFILE="\"${EPREFIX}${TEXMF}/tex4ht/base/tex4ht.env\"" \
+			-DHAVE_DIRENT_H -DKPATHSEA -lkpathsea \
+			|| die "Compiling $f failed"
+	done
+	if use java; then
+		einfo "Compiling java files..."
+		cd java || die
+		ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin
+		cd "${S}/texmf/tex4ht/bin" || die
+		# Create the jar needed by oolatex
+		jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+	fi
+}
+
+src_install() {
+	# install the binaries
+	dobin "${S}/src/tex4ht" "${S}/src/t4ht" "${S}/src/htcmd"
+	# install the scripts
+	if ! use java; then
+		rm -f "${S}"/bin/unix/oo*
+		rm -f "${S}"/bin/unix/jh*
+	fi
+	dobin "${S}"/bin/unix/mk4ht
+
+	# install the .4ht scripts
+	insinto ${TEXMF}/tex/generic/tex4ht
+	doins "${S}"/texmf/tex/generic/tex4ht/*
+
+	# install the special htf fonts
+	insinto ${TEXMF}/tex4ht
+	doins -r "${S}/texmf/tex4ht/ht-fonts"
+
+	if use java; then
+		# install the java files
+		doins -r "${S}/texmf/tex4ht/bin"
+		java-pkg_jarinto ${TEXMF}/tex4ht/bin
+		java-pkg_dojar "${S}/${PN}.jar"
+	fi
+
+	# install the .4xt files
+	doins -r "${S}/texmf/tex4ht/xtpipes"
+
+	# install the env file
+	insinto ${TEXMF}/tex4ht/base
+	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env
+
+	insinto /etc/texmf/texmf.d
+	doins "${FILESDIR}/50tex4ht.cnf"
+
+	insinto ${TEXMF}/tex/generic/${PN}
+	insopts -m755
+	doins "${S}"/bin/ht/unix/*
+}
+
+pkg_postinst() {
+	use java ||	elog 'ODF converters (oolatex & friends) require the java use flag'
+	latex-package_pkg_postinst
+	elog "In order to avoid collisions with multiple packages"
+	elog "We are not installing the scripts in /usr/bin anymore"
+	elog "If you want to use, say, htlatex, you can use 'mk4ht htlatex file'"
+}