gentoo resync : 05.04.2019

6 files changed, 64 insertions, 66 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index bb3ce7e573a5..74aae7d884c1 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/rail/Manifest b/dev-tex/rail/Manifest
index 1546753c995c..be1216257126 100644
--- a/dev-tex/rail/Manifest
+++ b/dev-tex/rail/Manifest
@@ -1,3 +1,3 @@
 DIST rail-1.2_p1.zip 107773 BLAKE2B 557f1406768a03e049f403798e459a9cf40c231ceda156bac5bfcc8e1df6018428b1a0eeb4c7e518078d96de141c9aa045cabf22d4ffa3ebe16c3a04798c9884 SHA512 8d0178b7beb0f212eb34487b6a285f41d10e776d4294c945e2cc1c163bde44b4d6a38afca952ed0fb9759962f565002d3591f4e098d78d60eb03ae30469483c8
-EBUILD rail-1.2_p1.ebuild 711 BLAKE2B 4e0c7ad26c00cc41cbadb85b8c480dc087f9ffb5a93728cd2f1285da6e7a27cddbbcde428d5702e4e2fd8f2e173c841ca58345d2a349a6339306231b10a4cd08 SHA512 1f844afa3b6831d2363475eaaefab49e467bf6b6b00b9da79abb9700cee5b7dbde8f7b05dc928bfcedd8f1b1fa98648ebd832fbeaa5c63961c764201b01d160e
+EBUILD rail-1.2_p1-r1.ebuild 698 BLAKE2B c27b35a9aeb8956582f3a55b069a855d412f3d34f301d54bad3829ce53d869f084523fe0d09efad8b7bff1999ca9bf3886394b14eeb4959601da20ed5929ac99 SHA512 9b92b87380c4d5da7d211b20830bdf15d4dbc4634eba4faf150692e84ba8d8c3de519d36e549e798e6a09582d2a40b524465ffdc5e30790457320950c9d13c4d
 MISC metadata.xml 365 BLAKE2B 8f09704df5e3d6f5d20cc6d823d7809c40ae59b31b2840fdc778389290886052479f5c30724558f8cab3c040f58f2ef625f11f256d5f1136a187dc19acabc95f SHA512 df55351259b21df4030904d6eb7a2f7514002f9946b047d2b8af75cc22d0184f86e029775c8efe127143947fe2bc5fe89c3b8c86f9178970dffed4439a8b9d21
diff --git a/dev-tex/rail/rail-1.2_p1-r1.ebuild b/dev-tex/rail/rail-1.2_p1-r1.ebuild
new file mode 100644
index 000000000000..eb33e29088b4
--- /dev/null
+++ b/dev-tex/rail/rail-1.2_p1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit latex-package toolchain-funcs
+
+DESCRIPTION="Offers syntax/railroad diagrams"
+HOMEPAGE="http://www.ctan.org/tex-archive/support/rail/"
+SRC_URI="http://mirror.ctan.org/support/${PN}.zip -> ${P}.zip"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip
+	sys-devel/bison
+	sys-devel/flex"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="-DYYDEBUG ${CFLAGS} ${LDFLAGS}" \
+		rail rail.dvi
+}
+
+src_install() {
+	local LATEX_PACKAGE_SKIP="try.tex"
+
+	latex-package_src_doinstall sty doc
+	dobin rail
+	newman rail.man rail.1
+}
diff --git a/dev-tex/rail/rail-1.2_p1.ebuild b/dev-tex/rail/rail-1.2_p1.ebuild
deleted file mode 100644
index a46c1e07fe0c..000000000000
--- a/dev-tex/rail/rail-1.2_p1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit latex-package
-
-DESCRIPTION="Offers syntax/railroad diagrams"
-HOMEPAGE="http://www.ctan.org/tex-archive/support/rail/"
-SRC_URI="http://mirror.ctan.org/support/${PN}.zip
-	-> ${P}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-RDEPEND="app-text/texlive"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/bison
-	sys-devel/flex"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	emake -j 1 || die "make failed"
-}
-
-src_install() {
-	latex-package_src_doinstall sty doc
-
-	dobin rail || die "Installing the rail tool failed"
-
-	newman rail.man rail.1 || die "Installing the manpage failed"
-}
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index 7d8fe3696d12..879a75158f5f 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -1,9 +1,9 @@
 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-2015-08-03.tar.xz 801488 BLAKE2B 56397450cc600141cbc541188e4a896727af4823982aae20a198d27b51fcb071794a1aa5a4037cf803f9b172c3183a927b7f446757df1520a596b5b6ee150a06 SHA512 a8a56e0d41406df8c76d72eea6f726f012d70a46665d9dfe99c7362790a2f0126f2c21e07c5de08aff7694e9837c47e162aa6790c256b4538f4780551f6e6191
 DIST tex4ht-texlive-2017-02-05.tar.xz 826816 BLAKE2B 8387c1fc7326cb4eb74ec82d15ed6a6f07bacd08788b00e3e6583bf993e0d0e0d387269650217a2a2f2e1f4b94cc8e154359d258bf3311820772b5fdc9aeec34 SHA512 c5a62a10b956d1108f288490e966e9c225555a74ace7744058a4464e4b166f3906d429ed8557d640ca0e9b4dbcc4278ef20298e869560a906c85c68ff832be52
 DIST tex4ht-texlive-2018-05-03.tar.xz 858204 BLAKE2B e302f24ca36ee0f61bad0979a139c25ea44128ba518b2736638ae41735e105b40be23338d93b08f0a9c3f9143486deab6551b344de5f74299d94f9edaa58ab37 SHA512 84ff9cec4d3637477d34475f05efc25e75fcb1ddd9b9cda36fbc77957f6e85b6cb456aa30554ed2c832268d6921949dc2fd4e111755269fb92fc7d231d434ca6
-EBUILD tex4ht-20090611_p1038-r4.ebuild 3645 BLAKE2B 5244b6f59a2e74fe1d0b2629d836bbe17d4b7177b4774f0c7de9d649cc42ed1bc83e6af319c9e9a018fe6bbcf364267328c7a2805e5c17af91b26bc8165343ba SHA512 29252db9bd919f743f325a54f1efb72513fb07b040dcd963e2b566d5c5f9b470624a72e11c4cb47908d893df0c55118af06d5f2e426d5ef1388fd5bd57468569
+DIST tex4ht-texlive-2019-03-22.tar.xz 868992 BLAKE2B 662cc23de1b3b5f4e3d504655b5b3d87740fea045bef7987cbe2d81971e73375bd88d8ab111d48878ce1fe9d1eece4e4003e443ed0bc0f9b643b7e1653a5fc8c SHA512 44d9e2c4f92ae1ea1d7f14432d7fe1a9f11b30ec8602d55c4b8f3f46283671fb75b08641c8170bd46918e16db1bed696a613a0518acd4e195e173fe12e386833
 EBUILD tex4ht-20090611_p1038-r5.ebuild 3667 BLAKE2B 21c903fd2ccd19fcf9adebbc5fd7afc4994327ac219003ee563329a9cc5d4a895223e37b6e0bff95bb184888737a94f3086851f96b0713157628cbc43ecdf5a6 SHA512 c136cd88318233aa1c94e81626169a19e647eb34668ca27c1372255efbfb7e6f75f43969a6c3ce15661e660de76641b35e02d3a2f74bc13a99e83b2b2999ac56
 EBUILD tex4ht-20090611_p1038-r6.ebuild 3626 BLAKE2B a7b2e0ba7a7671df612ac01eb824085d90748747f02c05ee3ee44155c1cfe300523c3941de04ae70cb9eb10908d1f2282a2ed0f8f5982996fee18519ff514c66 SHA512 28c517c420a498202aff5690aa6486c0141e44aa991b450706408322756aa0c6d05ea94825a76f17a9bb6f456a69d421c73dc47df496d65f9f68b320d87a8706
+EBUILD tex4ht-20090611_p1038-r7.ebuild 3689 BLAKE2B 16ac3d981e972ec33a80ff07037b9624ccc4faddd9147005b6b86f596fab08b9741f882e169fdf843894208e63e031ea2ba7f6716d0dcbd86676a2766be5c978 SHA512 801942099d37c7e2b3ac5b8e19731cc856e815ec86e6322a8d0ebc66488808fa71bb92af456e765dfaec7ad9526fe8a5d3271e8c3a2258290fbd1d7e8aada516
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r4.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r7.ebuild
index ffa6960f3bba..9a6f1043053d 100644
--- a/dev-tex/tex4ht/tex4ht-20090611_p1038-r4.ebuild
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r7.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic
 
-TL_TEX4HT_VER=2015-08-03
-IUSE=""
+# from ftp://ftp.cstug.cz/pub/tex/local/tlpretest/archive/tex4ht.tar.xz
+TL_TEX4HT_VER="2019-03-22"
 
 # 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/}"
@@ -18,26 +18,26 @@ SRC_URI="http://www.cse.ohio-state.edu/~gurari/TeX4ht/fix/${MY_P}.tar.gz
 	mirror://gentoo/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
 
 LICENSE="LPPL-1.2"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
-
-DEPEND=">=sys-apps/sed-4
-	virtual/pkgconfig
-	dev-libs/kpathsea
-	java? ( >=virtual/jdk-1.5 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="java"
 
 RDEPEND="app-text/ghostscript-gpl
 	media-gfx/imagemagick
 	dev-libs/kpathsea
 	java? ( >=virtual/jre-1.5 )"
 
-IUSE="java"
+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
-	cd "${S}/texmf/tex4ht/base/unix"
+	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/!#" \
@@ -47,13 +47,14 @@ src_prepare() {
 		|| die "sed of tex4ht.env failed"
 
 	einfo "Removing precompiled java stuff"
-	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -print -delete
+	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)"
+	has_version '>=dev-libs/kpathsea-6.2.1' \
+		&& append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
 
-	cd "${S}/src/"
+	cd "${S}/src" || die
 	einfo "Compiling postprocessor sources..."
 	for f in tex4ht t4ht htcmd ; do
 		$(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o $f $f.c \
@@ -63,9 +64,9 @@ src_compile() {
 	done
 	if use java; then
 		einfo "Compiling java files..."
-		cd java
+		cd java || die
 		ejavac *.java */*.java */*/*.java -d ../../texmf/tex4ht/bin
-		cd "${S}/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
@@ -79,15 +80,15 @@ src_install () {
 		rm -f "${S}"/bin/unix/oo*
 		rm -f "${S}"/bin/unix/jh*
 	fi
-	dobin "${S}"/bin/unix/mk4ht || die
+	dobin "${S}"/bin/unix/mk4ht
 
 	# install the .4ht scripts
 	insinto ${TEXMF}/tex/generic/tex4ht
-	doins "${S}"/texmf/tex/generic/tex4ht/* || die
+	doins "${S}"/texmf/tex/generic/tex4ht/*
 
 	# install the special htf fonts
 	insinto ${TEXMF}/tex4ht
-	doins -r "${S}/texmf/tex4ht/ht-fonts" || die
+	doins -r "${S}/texmf/tex4ht/ht-fonts"
 
 	if use java; then
 		# install the java files
@@ -97,20 +98,18 @@ src_install () {
 	fi
 
 	# install the .4xt files
-	doins -r "${S}/texmf/tex4ht/xtpipes" || die
+	doins -r "${S}/texmf/tex4ht/xtpipes"
 
 	# install the env file
 	insinto ${TEXMF}/tex4ht/base
-	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env || die
+	newins "${S}/texmf/tex4ht/base/unix/tex4ht.env" tex4ht.env
 
-	if latex-package_has_tetex_3 ; then
-		insinto /etc/texmf/texmf.d
-		doins "${FILESDIR}/50tex4ht.cnf" || die
-	fi
+	insinto /etc/texmf/texmf.d
+	doins "${FILESDIR}/50tex4ht.cnf"
 
 	insinto ${TEXMF}/tex/generic/${PN}
 	insopts -m755
-	doins "${S}"/bin/ht/unix/* || die
+	doins "${S}"/bin/ht/unix/*
 }
 
 pkg_postinst() {