gentoo resync : 06.05.2018

7 files changed, 128 insertions, 6 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index f82cc0084d5d..4bf38173ad8f 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/bibtex2html/Manifest b/dev-tex/bibtex2html/Manifest
index a354f5c55d24..2013a49201c4 100644
--- a/dev-tex/bibtex2html/Manifest
+++ b/dev-tex/bibtex2html/Manifest
@@ -1,4 +1,4 @@
 AUX bibtex2html-1.88-destdir.patch 1401 BLAKE2B 4b3e1e61a20be3820c2ce9380f086206d62b246c200b7bdbdf40a539f192fd3c32c7689538c2b1e334fc191d42072cb6ba643171f7022a5764be73c8aeba834e SHA512 34a3f53f08a133f16987cdee2a87a13d767b9b83228996999fc5ee6726a7c99602a3865c6dfbd03ede014dfcada9cc4882e802eff7939083e7c110f1cf0e07e9
 DIST bibtex2html-1.98.tar.gz 92719 BLAKE2B d9846c1ee03c7f003fe9acf586a0833715f8fc0a675ca4d3d2b2f070206aa81112ce5de1ce84c17fad4f3f5b5972bc6820b67428c73c56709875b2574b03cf19 SHA512 7d8480ed87bef74a1e0c970446fba4d30b103df3e78f127a051efff875032ac7f52d3d6baab0c6a2fc67ca11f3d558d7be4439311934f99067993b5891ff6ad4
-EBUILD bibtex2html-1.98.ebuild 1235 BLAKE2B be2769f08059fc45c4b2a0204a98883366f75077c05a78aeaac03e6b4b1a66447df94908be015f55ee681a057459de5ee586813ef251e949383b6c43a945f861 SHA512 662693c0f6c952d06fe23a8bf154d2608ceebd008c450555261609805364d0696bc08b5c925e22cf15c29fe09ac071c2e4f7452daca0b7f98c756bcc7fc42fdb
+EBUILD bibtex2html-1.98.ebuild 1237 BLAKE2B 40729b1025b9d3bd7521f13ea0ae48051ea3be45ec469d053ea816205e06caa0a0750e5902c87d759a87b344625fb61c293905a9a1bf800c5c6f115d1e25f5ef SHA512 748ae2c9467d0f115408b539765fba79de2a30cd511984e5db26d6d8aa4aec7d6364a3961626de3c8c628b5be5e7108d6ea209c195416f4a8816b00f6333dae8
 MISC metadata.xml 349 BLAKE2B ecb0cc8a36a349bd0a57b9e11d890356eaed68e353dad9133d844de329a96ce70eb9055d5213cb17aae37176faf002908b62bdf8ecd53e608441b5f2bfda9468 SHA512 31be034c4d00c733eb416ecc772ee220cfb1d1befefbdfca695557e8b482b34948ca1dc08d8def149cb8d4ec4a36cc4ff50b383fb0f658a49a19325c574b0bd7
diff --git a/dev-tex/bibtex2html/bibtex2html-1.98.ebuild b/dev-tex/bibtex2html/bibtex2html-1.98.ebuild
index 7e5e4b73a356..40fff567480f 100644
--- a/dev-tex/bibtex2html/bibtex2html-1.98.ebuild
+++ b/dev-tex/bibtex2html/bibtex2html-1.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ inherit eutils
 IUSE="doc +ocamlopt"
 
 DESCRIPTION="A bibtex to HTML converter"
-SRC_URI="http://www.lri.fr/~filliatr/ftp/bibtex2html/${P}.tar.gz"
-HOMEPAGE="http://www.lri.fr/~filliatr/bibtex2html/"
+SRC_URI="https://www.lri.fr/~filliatr/ftp/bibtex2html/${P}.tar.gz"
+HOMEPAGE="https://www.lri.fr/~filliatr/bibtex2html/"
 
 SLOT="0"
 
diff --git a/dev-tex/cjk-latex/Manifest b/dev-tex/cjk-latex/Manifest
index 6e595029a1e6..5c3ffd92ad89 100644
--- a/dev-tex/cjk-latex/Manifest
+++ b/dev-tex/cjk-latex/Manifest
@@ -1,5 +1,5 @@
 DIST cjk-4.8.4-doc.tar.gz 2152418 BLAKE2B 09b72aa75efa01ea880a99bf0c289dd3f7d0c107080b38fb99390a39c1179884eb55fcd32f978f07fdad25898aabbc636367e3ab83d1f1c1ce95aedfeb46efb7 SHA512 453ff48554d950eeba53481e0643dcd96214627a12e685e1c39476e19aee9f5284ae347cf694df583c43cc273be44a5b56511bfc622144552f07e51d9e1e0877
 DIST cjk-4.8.4-fonts.zip 20384230 BLAKE2B 6b73b20381b6a1de91cc7de6760f9c453616857b5fe493e90944145ae16c42b85f760018f2b2a6397fd8f1b02801b58b6e35f2a5493fcf0b367be2d25463664d SHA512 ec55aa604f1e8b19936d0e22949f8100f6442c6c93a5f240a78c9891289d838dd29350dcb4d20998c3e7a13ba05d451934ed29a2d7e7cbbaf517db06a92204d1
 DIST cjk-4.8.4.tar.gz 556197 BLAKE2B c884d8482dc107344c6afd3d2eba49c84907fdeaa9bd422c1239f2c43ed643991ad7c16c3c2a6dbf7d7bb0642c8f41d707feb98a5d08fc32c40de69615eb08bc SHA512 d1dc754c176331d0694561158554072083e6b8f2bbeb2516915c8bc8b15bbcedff81f2a14655cc9d77d832121971a5f9792e3c477336f9b5bcb77c8f15f8cfa3
-EBUILD cjk-latex-4.8.4.ebuild 3653 BLAKE2B c01df2a44ff0e7c8923512682ad1948d380ab7123b85c52233d74527d8b0155a262b01ba592cad7ac700d9b95a8c941a153e0916abfb858a60c37d5f3907982e SHA512 7b8f82287d9973a2187f3b784739112ee9c89804e61d92f9a90ec658dbf11643a09193e1f78116bf539b0fab4dc976e9c26afc6a881f46a862a9b6ac2aad49b3
+EBUILD cjk-latex-4.8.4.ebuild 3654 BLAKE2B 25fe93e5d1670d5e0769d4feb4b7cb9341a651b495c618d8a315d71d770d98a5f14642c9b1ac6bfb86f5e7577c224c74cbec3743718c1b8c834d651f4178f8a4 SHA512 8f2c6faba22ed49b90bcee99e97e1c58fcf733ab8969d36b2109ccbcc398a029e9df91b53b54386377eab30aa64e9291cd6db44d288ad6b40ca5e8bc6a728040
 MISC metadata.xml 336 BLAKE2B 3b1a7634ed8211dbf66256972325fc0227c3d03f43d9281b035909a73fd3278f5569156430c501c10545f1f8879068c533529293628bb4fe043d77256af4dfb7 SHA512 02b448b851022e1aa1e70f9b7a5e21bf0d7d8638de6e8064a98dc2f7be856af7dbaa1ab527f5fd940083e0866748819ebc0c49dde4945a383958256b02aeaefb
diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
index 7689d080cf86..fce0fab7d656 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
@@ -8,7 +8,7 @@ inherit latex-package elisp-common toolchain-funcs multilib eutils flag-o-matic
 MY_P="${P/-latex/}"
 
 DESCRIPTION="LaTeX package to use CJK (Chinese/Japanese/Korean) scripts in various encodings"
-HOMEPAGE="http://cjk.ffii.org/"
+HOMEPAGE="https://cjk.ffii.org/"
 # fonts are taken from ftp://ftp.ctan.org/tex-archive/fonts/CJK.zip
 SRC_URI="ftp://ftp.ffii.org/pub/cjk/${MY_P}.tar.gz
 	mirror://gentoo/${MY_P}-fonts.zip
diff --git a/dev-tex/tex4ht/Manifest b/dev-tex/tex4ht/Manifest
index d6b9071c7fe8..7d8fe3696d12 100644
--- a/dev-tex/tex4ht/Manifest
+++ b/dev-tex/tex4ht/Manifest
@@ -2,6 +2,8 @@ AUX 50tex4ht.cnf 192 BLAKE2B 38a4543a22281d9b757e823e95cc8743a0c18b3fe7d6ce02831
 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
 EBUILD tex4ht-20090611_p1038-r5.ebuild 3667 BLAKE2B 21c903fd2ccd19fcf9adebbc5fd7afc4994327ac219003ee563329a9cc5d4a895223e37b6e0bff95bb184888737a94f3086851f96b0713157628cbc43ecdf5a6 SHA512 c136cd88318233aa1c94e81626169a19e647eb34668ca27c1372255efbfb7e6f75f43969a6c3ce15661e660de76641b35e02d3a2f74bc13a99e83b2b2999ac56
+EBUILD tex4ht-20090611_p1038-r6.ebuild 3626 BLAKE2B a7b2e0ba7a7671df612ac01eb824085d90748747f02c05ee3ee44155c1cfe300523c3941de04ae70cb9eb10908d1f2282a2ed0f8f5982996fee18519ff514c66 SHA512 28c517c420a498202aff5690aa6486c0141e44aa991b450706408322756aa0c6d05ea94825a76f17a9bb6f456a69d421c73dc47df496d65f9f68b320d87a8706
 MISC metadata.xml 317 BLAKE2B feec903cd392ba092a0dc0f85e44788604c6fde736ebc5c81a930ed0109ecde56c0ba8220f5a56559b06fb1573cd2f159754dcda52c982601bb67306e2c15aa7 SHA512 33ba7a4fa5948eae907a650c1c53b3c5d3b71cef6ae9cc371017c14aca8e641f3badafaf3b3387b6638c877d10787d430bfc16a7e191b2b4327049a56a37b3af
diff --git a/dev-tex/tex4ht/tex4ht-20090611_p1038-r6.ebuild b/dev-tex/tex4ht/tex4ht-20090611_p1038-r6.ebuild
new file mode 100644
index 000000000000..d0cfa850fc84
--- /dev/null
+++ b/dev-tex/tex4ht/tex4ht-20090611_p1038-r6.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit latex-package toolchain-funcs java-pkg-opt-2 flag-o-matic
+
+TL_TEX4HT_VER=2018-05-03
+
+# 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
+	mirror://gentoo/${PN}-texlive-${TL_TEX4HT_VER}.tar.xz"
+
+LICENSE="LPPL-1.2"
+SLOT="0"
+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"
+
+DEPEND=">=sys-apps/sed-4
+	virtual/pkgconfig
+	dev-libs/kpathsea
+	java? ( >=virtual/jdk-1.5 )"
+
+RDEPEND="app-text/ghostscript-gpl
+	media-gfx/imagemagick
+	dev-libs/kpathsea
+	java? ( >=virtual/jre-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#%%~/texmf-dist#${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'"
+}