gentoo resync : 15.12.2019

83 files changed, 198 insertions, 2098 deletions

diff --git a/dev-tex/Manifest.gz b/dev-tex/Manifest.gz
index 8300bea2ddcd..113898b9cc09 100644
--- a/dev-tex/Manifest.gz
+++ b/dev-tex/Manifest.gz
diff --git a/dev-tex/bera/Manifest b/dev-tex/bera/Manifest
deleted file mode 100644
index 7658e1b883f3..000000000000
--- a/dev-tex/bera/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bera-20040930.zip 474202 BLAKE2B b1d9d581e9406acf8615256517fb7e703eb64755462403591edfc51448bc9c29968142a26a3758b593e40a02a342b93a1618f682fdbddcf66bfc1fc97b34e7e5 SHA512 a783fa424b0274e83e3648f763e66a467ae154a12da800a806ef74dce820b1d9ff0daf19e155f1edde78caac0880a6512cfe40c707a82b65dcac738e7a9588fa
-EBUILD bera-20040930.ebuild 1076 BLAKE2B 8c277e14a7ed2bf3cfbfa65e54fb7c6576c254ba32a5754c1743354c28b51a8aaae9de0720ba0d9cd5f47b53371a3c1e7312196a75fe65bafe25966f3fe9a5ed SHA512 600f9f05f6efa2fab5cbd7cf5fef717c8786ffe56c3667c5153fe999d88cd04f86d3cd33f734e75454f00b389d23e46c72c426d231886928e7363d2d578d822d
-MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/bera/bera-20040930.ebuild b/dev-tex/bera/bera-20040930.ebuild
deleted file mode 100644
index ddce27ef3912..000000000000
--- a/dev-tex/bera/bera-20040930.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit latex-package
-
-MY_P=${PN}
-S=${WORKDIR}/${MY_P}
-SUPPLIER="public"
-DESCRIPTION="LaTeX package for the Bera Type1 font family"
-HOMEPAGE="http://www.ctan.org/tex-archive/fonts/bera/"
-SRC_URI="mirror://gentoo/${P}.zip"
-LICENSE="LPPL-1.2"
-
-DEPEND="app-arch/unzip"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unzip ${MY_P}.zip
-}
-
-src_install() {
-	DOCS="${S}/README ${S}/LICENSE ${S}/doc/fonts/bera/bera.txt"
-	# install sty and fonts
-	cd "${S}/tex/latex/${MY_P}"
-	latex-package_src_install
-
-	cd "${S}/fonts/vf/public/${MY_P}"
-	latex-package_src_install
-
-	cd "${S}/fonts/tfm/public/${MY_P}"
-	latex-package_src_install
-
-	# install map
-	cd "${S}"
-	dodir ${TEXMF}/fonts/map/dvips/${MY_P}
-	cp -pPR fonts/map/dvips/${MY_P}.map "${D}${TEXMF}/fonts/map/dvips/${MY_P}"
-
-	latex-package_src_install
-}
-
-pkg_postinst() {
-	latex-package_rehash
-	updmap-sys --enable Map ${MY_P}.map
-}
-
-pkg_postrm() {
-	updmap-sys --disable ${MY_P}.map
-}
diff --git a/dev-tex/bera/metadata.xml b/dev-tex/bera/metadata.xml
deleted file mode 100644
index 7b4a61aab741..000000000000
--- a/dev-tex/bera/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index 5f670e496c39..0aab68288631 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -2,6 +2,6 @@ AUX biber-2.5-unescaped-left-brace-in-regex.patch 601 BLAKE2B c79797c702204c5d41
 AUX biber-2.7-drop-mozilla-ca.patch 5146 BLAKE2B 4380345c27ea3e3a23c787a820486b7fc620cc6b1d3ab5f3ddca35db2c33003f0e490ce35777a3da29b42f675fc3a9c41e31cf3724290eaea2112d50161b0c7c SHA512 83295ada1516e18d4d4f1bab50c70304c1df9c88113a215b31f4bc8c9b250244f4bcb8e5b5f4958b1086327796967b27681c5d574c6dd15ddf73f35092e8cf3a
 DIST biber-2.12.tar.gz 1323440 BLAKE2B 9f124e1bdbfaeba6e3072c6e797d47eef50e4efe419b490975df0a25fa802f5f44a1c246d9c0bcf860767c35e1a399caf088b33223d0267286e0a5f064be7a63 SHA512 72f1a05224dc2735b32e92ac376d392fb631bf788a15de449471fdc5a94182ad4434ce71f95281e4cfc3a06cd275d2ff98e526d540c2979cd3e0dfa15b5c75ff
 DIST biber-2.7.tar.gz 1274716 BLAKE2B 216ad69cf536a79e3a8c46d945fee76bf0532097b5e269bf9318709e3bb2f11732c9fe0700115cb5a8e4f66d325b4938cc274f7c5c2c0450894e26447c015987 SHA512 a62c116d4278b177c9e05a1cac857358dd0ebc6283465e74bb557d13fa343843d8b84050a466b2308a309345309bd584ccd2e90ccbbefbd01f2203a8eea77609
-EBUILD biber-2.12.ebuild 1711 BLAKE2B 87b5f892f7c30092272275bc514589d9b50961d2000d9133c359c683bda46b69ceedaa6a82dde03fb25c27e1ee8ee3f1d97369682f6209bb6f0a7f5c0a49c6d1 SHA512 ef2d6d7126c4df17d7088dd84a3db090a8dd7951afe4fddffe646ea0782dd6cf06eeb27142257f182daf09cd0a6ab031aed295aa2ed0892ab2bf0e939d1a0ec1
-EBUILD biber-2.7.ebuild 1735 BLAKE2B faf031a9dc400583fd14fb12734394728a5399df26e77e320706a3f2122e0836125952948ccb884f64ecc4efad9dfd9d6446c95b643e53c8a144ae8657af6364 SHA512 5cc1cc0bbb9f717e1d9cf201228f8b397004c9039acb5e79a597c5c9bbecfbc122857fa7a1fad6e564749a1bedc4b7e9ce928750949517993e755d355385200d
+EBUILD biber-2.12.ebuild 1738 BLAKE2B 1a724077c2168c65ac02e6c5d04c3fcafab1317a35a9e5dc0fc134ff94310d8106b20dbeb70944f88a32f2a296b00dbe54e105c144174e48047887273f243716 SHA512 6333bf2e61e71da389b4beea9aa3466861682b37c9aa79971e5ffc6e80bcad065df6ca5a7a0be135b44c78be4a0f4fb7f699a34dfecde1f22c2c08038e67514c
+EBUILD biber-2.7.ebuild 1762 BLAKE2B b5746b7dfd39de2af65a9e348ad50117fd6d624e414d39ede65545ab9f477ef5a7fa54f8bc18cdc4a5e0ec22df0e9deb5df906d7afd7458a0900fd9a1918603d SHA512 56faacf57aec7951bd278fd87b2920a19a89d6bf42f05812c52aaa826ddb2b5caf40847eac94e66ea913b9cf9f4dd020154f0dd11d8f1a4a1f9698d7d724b5c1
 MISC metadata.xml 517 BLAKE2B d9b10c6ee36cbd1f0d5ddd33d0944b4ba73b31c8dd7bb0537285bd2c0656d12f74f90524f3688d4d9b20c9bca2d3b3bad02be473ec1a87c4a8d66791fd77dcf2 SHA512 5b580b01df44df89406b9e845416ce043bc5ede5239c9024380348a7aa43f4c436485619e73fd12b4f0b5ea0628b9f8ab55142b5861e2a227fac02385c179533
diff --git a/dev-tex/biber/biber-2.12.ebuild b/dev-tex/biber/biber-2.12.ebuild
index a7d79736202e..5feffbec88a1 100644
--- a/dev-tex/biber/biber-2.12.ebuild
+++ b/dev-tex/biber/biber-2.12.ebuild
@@ -13,6 +13,7 @@ LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/perl-5.26
 	dev-perl/autovivification
diff --git a/dev-tex/biber/biber-2.7.ebuild b/dev-tex/biber/biber-2.7.ebuild
index 5a2aaf1c1a1b..2e5ad7bb84fa 100644
--- a/dev-tex/biber/biber-2.7.ebuild
+++ b/dev-tex/biber/biber-2.7.ebuild
@@ -13,6 +13,7 @@ LICENSE="Artistic-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-lang/perl-5.24
 	dev-perl/autovivification
diff --git a/dev-tex/bibtex2html/Manifest b/dev-tex/bibtex2html/Manifest
index 2013a49201c4..39174277d259 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 1237 BLAKE2B 40729b1025b9d3bd7521f13ea0ae48051ea3be45ec469d053ea816205e06caa0a0750e5902c87d759a87b344625fb61c293905a9a1bf800c5c6f115d1e25f5ef SHA512 748ae2c9467d0f115408b539765fba79de2a30cd511984e5db26d6d8aa4aec7d6364a3961626de3c8c628b5be5e7108d6ea209c195416f4a8816b00f6333dae8
-MISC metadata.xml 349 BLAKE2B ecb0cc8a36a349bd0a57b9e11d890356eaed68e353dad9133d844de329a96ce70eb9055d5213cb17aae37176faf002908b62bdf8ecd53e608441b5f2bfda9468 SHA512 31be034c4d00c733eb416ecc772ee220cfb1d1befefbdfca695557e8b482b34948ca1dc08d8def149cb8d4ec4a36cc4ff50b383fb0f658a49a19325c574b0bd7
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/bibtex2html/metadata.xml b/dev-tex/bibtex2html/metadata.xml
index 372e6f2a2754..13170c3184d8 100644
--- a/dev-tex/bibtex2html/metadata.xml
+++ b/dev-tex/bibtex2html/metadata.xml
@@ -5,8 +5,4 @@
 	<email>tex@gentoo.org</email>
 	<name>Gentoo TeX Project</name>
 </maintainer>
-<maintainer type="project">
-	<email>ml@gentoo.org</email>
-	<name>Gentoo ML Project</name>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/chktex/Manifest b/dev-tex/chktex/Manifest
index c43f15ab85f9..0e0aabb1b96f 100644
--- a/dev-tex/chktex/Manifest
+++ b/dev-tex/chktex/Manifest
@@ -1,7 +1,5 @@
 AUX chktex-1.7.1-asneeded.patch 619 BLAKE2B 04bbcd5b101759902577ef0e92514e58572996ca681c135c8f6a519ad406fcd82d13a6a6335fdeaf4e1bf533874bf16500d99b1124a5988bd0fe04458ab17ff0 SHA512 6fd935703799316518476ccdf90e263e8a773c37a1a8ed97c6544792bf7716ab20aca0601d6598c12a4306a96e1566e1cd655bf6761d66c557f12401b3008b99
 AUX tex-inputenc.patch 410 BLAKE2B 5c97b926d43e62287cbcf06207aeafd945d4d5c3ea5efe8cded42fcb3e69f1a4e702cf79d382426561864322fe4e854b27d6dfc638573eeb35b4f5d20090a7fb SHA512 5910761c0c1b9fbb30fb986dbbdc5094659c5906e80a04373947159bceb3eccf5a5bbb6e6befe893ee8c3ebcb7c43591527986350225b81b294c140a65750caf
-DIST chktex-1.7.1.tar.gz 349551 BLAKE2B 00a1aed460fc6b0daae065ee39671104b1c5290df7097cbd75fb8c8406e309c5b950ddb3834325ba579f5870bbcf8a5890bb410c7e7633ae575944b704f738a6 SHA512 88b8b6b20a2242557d253e690ad7a7b5a41497e3c96ee44798997b83ccbfd4e37203aea9c557c7b25fc0b6223bd08a590b464af674f7558547393c2af0a86926
 DIST chktex-1.7.6.tar.gz 153071 BLAKE2B 7419b35eb045509ab39983f16d9cc72d1501f3b6781c304ddf8cc91ae1123b132e17e2919f5d2f6c5b6584e91c63651dc819497c2a5945b9debe329c03704256 SHA512 dd5ad2d7fce66eeb8d890bd79d00bdb28d9807539988232a917d6478c204e9a0ab287f2b8baf7977dba374b551609d8951cbf67ad15a793d35cdfe3411e4fe0b
-EBUILD chktex-1.7.1.ebuild 1258 BLAKE2B 87bd92212d547bf8b3d75291267e50bb2eeaf7e57d073f7a92fb1faf99ccf8e464d309c5ea7f6b13770f2120a49e2438321907a2c2c41e5f99d8acebc1e07a63 SHA512 8b57a94a7704f7b127a7f76e7d05ca56e230e152840877254bd27b079784a368bf1850384768f518ba80fa6dcfae116add4357d3d591792a63190d380de7e241
-EBUILD chktex-1.7.6.ebuild 1467 BLAKE2B 2d6d2a54d06d9776888a4760cbc14bb1e94474fc51b7a4d450570997aa5c28c7e172c1e524eeb2fb953c0002dec38243e1f608531bc35ad358954179a9735028 SHA512 55202e12c6f615c2d016ffcc84a09a56800374cd0e4d4d323ee0715eb11e3389a8ae9c606c80d0542994c9ff726a80ee208155028c78ba44f8c8b5c4eb08e22a
+EBUILD chktex-1.7.6.ebuild 1264 BLAKE2B 2742e50613ecbf5773213d244395cd4c5ab435fb7f1e1b34c16dd030bed4c3ad69de70af195c12196e5ad22f30449e71d0fa54f062ceb10d1cec019a5f8f4f79 SHA512 ffdaa36994367c146372a1c438afaa991f40f35e5a3593449cab75139921ccbcdefcdc1436c44a279e50f9a81d63133fe171ccb330479ef7f7e3699cc266f552
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/chktex/chktex-1.7.1.ebuild b/dev-tex/chktex/chktex-1.7.1.ebuild
deleted file mode 100644
index 66f74777005a..000000000000
--- a/dev-tex/chktex/chktex-1.7.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-AUTOTOOLS_AUTORECONF=true
-
-inherit autotools-utils
-
-DESCRIPTION="Checks latex source for common mistakes"
-HOMEPAGE="http://www.nongnu.org/chktex/"
-SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug doc +pcre test"
-# Tests fail without pcre. Enable pcre by default and make tests depend on it.
-REQUIRED_USE="test? ( pcre )"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre )"
-DEPEND="${RDEPEND}
-	sys-apps/groff
-	doc? ( dev-tex/latex2html )"
-
-PATCHES=( "${FILESDIR}/${P}-asneeded.patch"
-	  "${FILESDIR}/tex-inputenc.patch" )
-DOCS=( NEWS )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug debug-info)
-		$(use_enable pcre)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile html
-}
-
-src_install() {
-	if use doc ; then
-		HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX/")
-		DOCS+=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX.tex")
-	fi
-	autotools-utils_src_install
-	doman *.1
-}
diff --git a/dev-tex/chktex/chktex-1.7.6.ebuild b/dev-tex/chktex/chktex-1.7.6.ebuild
index e6f58879d684..9edd1bcc2f1d 100644
--- a/dev-tex/chktex/chktex-1.7.6.ebuild
+++ b/dev-tex/chktex/chktex-1.7.6.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-AUTOTOOLS_AUTORECONF=true
+EAPI=7
 
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="Checks latex source for common mistakes"
 HOMEPAGE="http://www.nongnu.org/chktex/"
@@ -12,22 +11,25 @@ SRC_URI="http://download.savannah.gnu.org/releases/chktex/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc +pcre test"
+RESTRICT="!test? ( test )"
 # Tests fail without pcre. Enable pcre by default and make tests depend on it.
 REQUIRED_USE="test? ( pcre )"
 
-RDEPEND="virtual/latex-base
-	dev-lang/perl
-	pcre? ( dev-libs/libpcre )"
+RDEPEND="pcre? ( dev-libs/libpcre )"
+
 DEPEND="${RDEPEND}
 	sys-apps/groff
 	dev-texlive/texlive-fontsrecommended
 	doc? ( dev-tex/latex2html )"
 
+BDEPEND="virtual/latex-base
+	dev-lang/perl:="
+
 PATCHES=( "${FILESDIR}/${PN}-1.7.1-asneeded.patch"
 	  "${FILESDIR}/tex-inputenc.patch" )
-DOCS=( NEWS )
+
 AT_M4DIR="${S}/m4"
 
 src_configure() {
@@ -37,21 +39,20 @@ src_configure() {
 		$(use_enable debug debug-info)
 		$(use_enable pcre)
 	)
-	autotools-utils_src_configure
+	econf ${myconfargs[@]}
 }
 
 src_compile() {
-	autotools-utils_src_compile
-	autotools-utils_src_compile ChkTeX.dvi
-	use doc && autotools-utils_src_compile html
+	default
+	emake ChkTeX.dvi
+	use doc && emake html
 }
 
 src_install() {
+	default
 	if use doc ; then
-		HTML_DOCS=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX/")
-		DOCS+=("${AUTOTOOLS_BUILD_DIR}/HTML/ChkTeX.tex")
+	      dodoc HTML/ChkTeX.tex
 	fi
-	DOCS+=("${AUTOTOOLS_BUILD_DIR}/ChkTeX.dvi")
-	autotools-utils_src_install
+	dodoc ChkTeX.dvi NEWS
 	doman *.1
 }
diff --git a/dev-tex/cjk-latex/Manifest b/dev-tex/cjk-latex/Manifest
index ad6fa4b219cd..e53c2e8ed162 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 3632 BLAKE2B 01612ee49214478aa10b56a67d02fbdbf8c7bfb4e03dfb43271ebaccea7fa86bd7d8694e699dce6ffabb72b286c5b65aab5f105915af1ae0cef1b68cb280d6a2 SHA512 e15a19a778f2e19d5ae0c5ce9962425786f8767c86c8afaa260c2c9d850ae61a8b798d72bad20d1070e41f8d1fa4e03085d2e3d4f2aaf5cdb7f4122e4d8a338b
+EBUILD cjk-latex-4.8.4.ebuild 3676 BLAKE2B 8a2c71d38f8b5a5957d6ba7c9b343eb32541d80a62cb9382c55a75898062083e802d2e92f186ac100b995ef535b401ddc668424058d4e8e9da8e1bb9d8bd5f16 SHA512 ccd73203fc8a2d3859a28dfdf8b54adca371294762695610a696889204fff6a426559e515033e79e29332764e1617950477e8720d276f5408d35c7b476cefcb0
 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 df0a850f7e88..d258be7dc29d 100644
--- a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
+++ b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 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 elisp-common toolchain-funcs multilib eutils flag-o-matic
+inherit latex-package elisp-common toolchain-funcs flag-o-matic
 
 MY_P="${P/-latex/}"
 
@@ -22,13 +22,16 @@ IUSE="doc emacs"
 RDEPEND="virtual/latex-base
 	dev-libs/kpathsea
 	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-arch/unzip"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="app-arch/unzip
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	for i in "${WORKDIR}"/CJK/*.tar.gz; do
 		tar -xzf ${i} || die "failed to unpack $i"
 	done
@@ -40,43 +43,43 @@ src_prepare() {
 
 src_configure() {
 	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	cd utils
+	cd utils || die
 	for d in *conv; do
-		cd $d
-		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
+		cd ${d} || die
+		local f=`echo ${d} | tr '[:upper:]' '[:lower:]'`
 		echo "all: $f" >> Makefile
-		if [ $d = CEFconv ] ; then
+		if [ ${d} = CEFconv ] ; then
 			echo "all: cef5conv cefsconv" >> Makefile
 		fi
-		cd -
+		cd - || die
 	done
-	cd hbf2gf
+	cd hbf2gf || die
 	econf --with-kpathsea-lib="${EPREFIX}"/usr/$(get_libdir) \
 		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea
 }
 
 src_compile() {
 	tc-export CC
-	cd utils
+	cd utils || die
 	for d in *conv; do
-		cd $d
-		emake || die
-		cd -
+		cd ${d} || die
+		emake
+		cd - || die
 	done
-	cd hbf2gf
-	emake || die
-	cd -
+	cd hbf2gf || die
+	emake
+	cd - || die
 
 	if use emacs ; then
-		cd lisp
+		cd lisp || die
 		elisp-compile *.el
-		cd emacs
+		cd emacs || die
 		elisp-compile *.el
-		cd ../mule-2.3
+		cd ../mule-2.3 || die
 		elisp-compile *.el
 	fi
 
-	cd "${T}"
+	cd "${T}" || die
 
 	for f in "${S}"/texmf/hbf2gf/*.cfg ; do
 	env TEXMFCNF="${EPREFIX}/etc/texmf/web2c" HBF_TARGET="${S}/texmf/fonts" "${S}/utils/hbf2gf/hbf2gf" $f || die
@@ -90,39 +93,41 @@ src_compile() {
 }
 
 src_install() {
-	cd utils
+	cd utils || die
 	for d in *conv; do
-		cd $d
+		cd ${d} || die
 		local f=`echo $d | tr '[:upper:]' '[:lower:]'`
 		dobin *latex *conv
 		doman *.1
-		cd -
+		cd - || die
 	done
-	cd hbf2gf
-	einstall || die "einstall failed"
+	cd hbf2gf || die
+	doman hbf2gf.1
+	dobin hbf2gf
+	dodir "${TEXMF}/fonts/hbf"
 
-	cd "${S}"
+	cd "${S}" || die
 
 	# Install pk fonts
-	pushd texmf &>/dev/null
+	pushd texmf &>/dev/null || die
 	for d in fonts/pk/modeless/*/* ; do
 		insinto ${TEXMF}/${d}
 		for f in "${T}"/${d##*/}*.pk ; do
-			newins $f `basename ${f/.pk/.500pk}` || die "newins failed"
+			newins ${f} `basename ${f/.pk/.500pk}`
 		done
 	done
-	popd &>/dev/null
+	popd &>/dev/null || die
 
 	insinto "${TEXMF}/tex/latex/${PN}"
-	doins -r texinput/* || die "installing texinput files failed"
-	doins -r contrib/wadalab || die "installing wadalab failed"
+	doins -r texinput
+	doins -r contrib/wadalab
 
 	if use emacs ; then
-		cd utils/lisp
+		cd utils/lisp || die
 		elisp-install ${PN} *.el{,c} emacs/*.el{,c} mule-2.3/*.el{,c}
 	fi
 
-	cd "${S}"
+	cd "${S}" || die
 
 	# uwpatch stuff
 	insinto ${TEXMF}/scripts/uwpatch
@@ -132,30 +137,30 @@ src_install() {
 
 	# jisksp40 stuff
 	insinto ${TEXMF}
-	doins -r jisksp40/texmf/*
+	doins -r jisksp40/texmf
 
 	# kanji48 stuff
 	insinto ${TEXMF}
-	doins -r kanji48/texmf/*
+	doins -r kanji48/texmf
 
 	use doc || rm -rf texmf/doc
 	insinto ${TEXMF}
-	doins -r texmf/* || die "installing texmf failed"
+	doins -r texmf
 
 	# Move fonts because hbf2gf expects them in MISCFONTS
 	mv "${ED}/${TEXMF}/fonts/hbf" "${ED}/${TEXMF}/fonts/misc" || die "mv font failed"
 
 	insinto ${TEXMF}/hbf2gf
-	doins utils/hbf2gf/cfg/*
+	doins -r utils/hbf2gf/cfg/
 
 	insinto ${TEXMF}/scripts/subfonts
-	doins utils/subfonts/*
+	doins -r utils/subfonts/
 
-	rm -f doc/COPYING doc/INSTALL
+	rm -f doc/COPYING doc/INSTALL || die
 	dodoc ChangeLog README
 	if use doc ; then
 		insinto /usr/share/doc/${PF}
-		doins -r doc/*
+		doins -r doc
 		doins -r examples
 	fi
 	docinto uwpatch
diff --git a/dev-tex/dot2tex/Manifest b/dev-tex/dot2tex/Manifest
index 9241c6a27d3a..8ee0c1d4b0a4 100644
--- a/dev-tex/dot2tex/Manifest
+++ b/dev-tex/dot2tex/Manifest
@@ -1,3 +1,5 @@
+DIST dot2tex-2.11.3.tar.gz 664750 BLAKE2B 9c7effeca0d71810ce37e126df9e7df2b9df19be41393916c85e49df0dc116f42e58a2b29cce9e2bac700fa00859c63c1a4a8c41c70a9db96a5fc210960f463b SHA512 1595299811461b18cff490a8a56c0215f46989dd4a46fa087b455c717ed5d5f7a5782d04acaa3e4567b4e348bca866d5f24d21663012c4cd813445804ef6f714
 DIST dot2tex-2.9.0.tar.gz 663372 BLAKE2B 807093c5bd7304a6c315568e69c8c8387a377a8aa47790d558feb84036ca6ce2d00534823254a50af9852206d0e27b2e15f2a8ba0e8333e2bb8b20a983947e74 SHA512 97ba9983643254d5a3034d2fc8c454c445849ac546bd285676b854e20c8aae9a25d61e73632717da1562541ce9b3a4ae8aa4daa29e33f78105e28a34b5ebae5d
+EBUILD dot2tex-2.11.3.ebuild 1022 BLAKE2B 1981dec3f53ab5d53c33cd70dec906f28f3ec7fe316d3d6e13c16c9cbf253734d8aaf01c4b32864e28f4e4e540b8c725fe72f53edc6efe2d5bb746599199dc38 SHA512 d0d2a995b9e969ba0cbb028e3d2ef1b89d8b7525bea6e0bf5f8da0d26a216d3ff9fde91d73cac766db058b46e3f6c79813b9847230b08532f126fa7992b635a8
 EBUILD dot2tex-2.9.0.ebuild 1000 BLAKE2B 37a968728290d1232bfb93c723fa1dae92a1c8b93b0330f46ea41d426f5e8c300013c925c6ac10f46e530dfe2058ab940d59eeff9f8ef6afd2a6f7608a9dc596 SHA512 85af4840d7ba4aa62bb772191e1cda2c45ee7c9f30b1ffc5f6131cc80af04dc5c7876afa6e36bcd2e39000477d611a979591bc009d58e80c203eeea7e665f723
 MISC metadata.xml 381 BLAKE2B ab936fa6e8bedf30df2713557cb55b558831dd2230be87fdea15ef84c7ded1a665b90d74cea23a3a2d4ff0bef03e43af9f226e1d236c5e5e79ebfb51a2b55358 SHA512 1b1e745b1979792a554d0a0fbd15e5f97f4806e668ccf3ddb519e60cf70af7081194f1f442b6cd7ef5ff4676fd2a837833e59879d4b05dff817927a11449700e
diff --git a/dev-tex/dot2tex/dot2tex-2.11.3.ebuild b/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
new file mode 100644
index 000000000000..2ea47959d682
--- /dev/null
+++ b/dev-tex/dot2tex/dot2tex-2.11.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7})
+
+inherit distutils-r1
+
+DESCRIPTION="A Graphviz to LaTeX converter"
+HOMEPAGE="https://dot2tex.readthedocs.org/ https://github.com/kjellmf/dot2tex"
+SRC_URI="https://github.com/kjellmf/dot2tex/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="doc examples"
+
+DEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pydot[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+DEPEND="${DEPEND}
+	doc? ( dev-python/sphinx )"
+
+python_compile_all() {
+	if use doc ; then
+		cd "${S}/docs"
+		emake html
+	fi
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use doc; then
+		dodoc -r docs/_build/html
+	fi
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-tex/dvi2tty/Manifest b/dev-tex/dvi2tty/Manifest
index 1a3ed9e1ec8b..919ec41d92a7 100644
--- a/dev-tex/dvi2tty/Manifest
+++ b/dev-tex/dvi2tty/Manifest
@@ -1,4 +1,4 @@
-AUX dvi2tty-5.3.4-cflags.patch 615 BLAKE2B 7cf275db31c39267640b1579e2b0488f57c4d1e7510d5eaee2775521412e2960f07c3e7c250b204da28a8144b4a51787f89abc63000bd5ed56b047509202415e SHA512 d6aa5a3276583b4f98a5a21f1d08e4dfcd4c9fcedc3b4d82c2f6e274d8eeaf2fb9d1826b341405e080f4607adfd2020c528d79126847d783c450e39806718fc5
+AUX dvi2tty-5.3.4-cflags.patch 619 BLAKE2B b8ee2f1eea314d5b0abd58ad49263969c55ed79cb801377dfbb16a18b9094e7fcef8f788bc7faa1b039f21cdb250268191135231849342f63ad1540667c2297e SHA512 3101de49093658beafa0c5c8aaea6c9f1228782e240dbf6f0040902b54beeb61ea6195cba939688bcb71c693ed90498f2bc400350c88280a0ddddeec6b6985db
 DIST dvi2tty-5.3.4.tgz 59519 BLAKE2B 0de24efec80a1d6254db904c498ebf4d6e638a19e3ca85f1092725050d4020a904bb8088946e10603ec4e6a0e6a0938245210af6af86dd2f03a42ab3994fa80f SHA512 5ad91f346d882cbe8a64e746aafec51dce208a01f83a058a86669a3eecb9546804831bf0b283553c54cfd751f0b08fda80343de0ebe78c6f86360d606a839877
-EBUILD dvi2tty-5.3.4.ebuild 616 BLAKE2B 1a2d486ce804c8fb12935b5eb23d78633dd7cd6fddb9456f497ddd4fc7c045f84dd349373978fef4746cba36383c8a18849581c272c69a58a5e16e2f24a38df4 SHA512 874bea8eff5a9f1e1a9996395247359f2671c1be47908c177daf95b468bd8de6cd3e83b81d5ce9b4902c3a1995ee19fe5e87be3f4711951c4b13d2bef02157ab
+EBUILD dvi2tty-5.3.4-r1.ebuild 608 BLAKE2B c40bddb66fb15a83752d3ae6269e26455834406904d39886a9525b2ec3e23a78008be86a2b2b00cf2f71df7b8d3cf73280ebf619150a95c135ded4dc8ebebb76 SHA512 3a0a7fd0703fe8baa879d1372ef1f611661fe0ca7495c472ccb83663bda457cdb751563053e7352c2d553be751a040b8869f5673bb5300e1ddf609dec5c10f62
 MISC metadata.xml 351 BLAKE2B c005a720042536cdad9089ad0e8d4a96dc3c7519f469691b5e2388197211d024a90d476066efea3dc3ce6bfa367ca9f188270f910abaf9c37e283b123d967ea1 SHA512 0101264deff11ad3ac6f600aebb219fd8050ce76392655af100c280f68d1161cd5ef5827ccc395b7fdb74699eb8c30e174c79854e583ac1c0b953c868b70376d
diff --git a/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild b/dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild
index 8f353052b446..1645a6ca1c2c 100644
--- a/dev-tex/dvi2tty/dvi2tty-5.3.4.ebuild
+++ b/dev-tex/dvi2tty/dvi2tty-5.3.4-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Preview dvi-files on text-only devices"
 HOMEPAGE="http://www.ctan.org/tex-archive/dviware/"
@@ -11,10 +12,10 @@ SRC_URI="ftp://ftp.mesa.nl/pub/dvi2tty/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
+	default
+	eapply "${FILESDIR}"/${P}-cflags.patch
 }
 
 src_compile() {
diff --git a/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch b/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch
index 1d46f1954531..3f1449012ca6 100644
--- a/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch
+++ b/dev-tex/dvi2tty/files/dvi2tty-5.3.4-cflags.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -6,11 +6,10 @@
  # This Makefile does not work for MSDOS. Make your 
  # own one, or compile by hand.
diff --git a/dev-tex/europecv/Manifest b/dev-tex/europecv/Manifest
index 324629297bfa..e900e759f8fc 100644
--- a/dev-tex/europecv/Manifest
+++ b/dev-tex/europecv/Manifest
@@ -1,3 +1,3 @@
 DIST europecv-20060424.zip 783310 BLAKE2B 7efb4c9ae994c6847a619d765bb996b2e624cdc86c966b4d158d152e801e9529b719c3a9e5452ef4a62970265d510c607d3b9cfb29c1a80169118190835c78b7 SHA512 6378bc96cff2952f05d7f401ff811868fbf9c4cc336bab7e7b2d4822f1591e0a08791368a5c230a95dcde70cafeab6b12bc36cc4b0a60a35c47891091f1463d8
-EBUILD europecv-20060424-r2.ebuild 1029 BLAKE2B c6c3881ec399f3bfcd60a73fb0feb770c0a0557fb1a306e50924159a8ec9953db244a901fbc6fb6297cc61b82cb9e9dc3197681f62fa55810c22cb1420dd940e SHA512 22a32062de08981a97e4ef332cd7561628ad2585390543e15b7209b6a38ba58dcabb0e7eee44b6af528b5a6131577ce17eaa99b89cea84cbf278a25567394c89
+EBUILD europecv-20060424-r2.ebuild 1039 BLAKE2B fa0c302673dff77a2a2ed5518c82b53cbc02ee84c4e115e5fa65897ac6f41e57989138af6dd973c7710688d345840bb1b6c7dba63af0ef8c78c352bf3483e0b1 SHA512 e3f36bfa9dfed0ab7f3c59f890c6000ed4243d0180e3c3d28f33ba813d2f97f7a775eae71cda7ad5e99d045f8ab79de0782082703846794a2f8c1473e2a90f32
 MISC metadata.xml 313 BLAKE2B 4120e83c45647024c15f307c60040264e900cc555fdcec874311b331d22b85e329ba4ec8bf32a3eb62cf60a601e5de80b222b99008dac77791731e3995650ac7 SHA512 326a8a7add92acefc673bb04f24ca9aa4d57f07a19972bb725b86fbdd38e67aa729b6ba5cae1fdf1a8c7eefb61a5d0249160944813d69719dcba8564566513e7
diff --git a/dev-tex/europecv/europecv-20060424-r2.ebuild b/dev-tex/europecv/europecv-20060424-r2.ebuild
index 176acadf0c9d..52a64514dc70 100644
--- a/dev-tex/europecv/europecv-20060424-r2.ebuild
+++ b/dev-tex/europecv/europecv-20060424-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit latex-package
 
 DESCRIPTION="LaTeX class for the standard model for curricula vitae as recommended by the EC"
@@ -17,8 +18,11 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-li
 IUSE="examples"
 
 RDEPEND=">=dev-texlive/texlive-latexextra-2008"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="app-arch/unzip"
+
 S="${WORKDIR}/${PN}"
 
 TEXMF=/usr/share/texmf-site
diff --git a/dev-tex/flabels/Manifest b/dev-tex/flabels/Manifest
index 6ac709500ffa..aa6ea38ddb17 100644
--- a/dev-tex/flabels/Manifest
+++ b/dev-tex/flabels/Manifest
@@ -1,3 +1,3 @@
 DIST flabels-1.0.tar.gz 13824 BLAKE2B 39cf382dbd836484a7a0017405ca3d13ce49f23575acbd05711223800b9f843f41b980ca61fa0e034b2233021622e5fb04188e3490cfbf4264a9eeda989c426f SHA512 5ab08153b4979b99f90306cf207e5e693677c1cfb63fbfddcd37ff3f7aeb31208982776d9c0ce3e9dc4c92e60eddc51b943e9917e53aaae1eef9ad9ea8ef9628
-EBUILD flabels-1.0.ebuild 510 BLAKE2B e526578b30e56865f7dedd3167afaae0c913c11bca53500d16a8cf2b9babb46a889968d96d74cfa021ac9319717eacfae0eff3a86d889cd6f3b51bc30add0d0a SHA512 93db76cda8198481d4b1ea9229f785846d47ec3d708247482515860a973593eca6c45e76f00521b24cffb0c8a9c6e1af9745829edcb013cc491fadffd619ec7a
+EBUILD flabels-1.0.ebuild 499 BLAKE2B 71ea5914c3f3da4a5cf6c0c4e6451fb87a806b3e01229a60f81bb4c9adaadb4751c75ad686e93fc1f5b9655397d38846a59ae3cba26bf9f556c0a665befced27 SHA512 c05173d979ddb12c1b157404bf44f5777a80519967fadb6bebfb16fa58f69e7d48ad7e19d1cde82aef9895bd30777a9c877e0fd3a9ebffddc19be29b008c7ac9
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/flabels/flabels-1.0.ebuild b/dev-tex/flabels/flabels-1.0.ebuild
index 5620e5a19c41..79f633efdbf7 100644
--- a/dev-tex/flabels/flabels-1.0.ebuild
+++ b/dev-tex/flabels/flabels-1.0.ebuild
@@ -1,7 +1,7 @@
-# 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
 
@@ -13,7 +13,6 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="LPPL-1.2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 S=${WORKDIR}/${PN}
 DOCS="README"
diff --git a/dev-tex/glossaries/Manifest b/dev-tex/glossaries/Manifest
index 22dbfb5f463a..b399525bdf04 100644
--- a/dev-tex/glossaries/Manifest
+++ b/dev-tex/glossaries/Manifest
@@ -1,7 +1,3 @@
-DIST glossaries-3.04.zip 3838009 BLAKE2B 58316ac6442960ae3a48188b64cd382afba5c9ff53732b43c1b8309ee0e655dc5793bcd10571c8f610484145fe3ccc2fb4efff9acc49bcb657bb61f4c31a7b4c SHA512 1669c2288c31f1b1b79dc9776c55c2abfc8fd216482cf6175e9f788a2882cfe997ca13c9d93d317e4d31fcc9eba8dc977bc806874179654141ca7235ec7c3889
-DIST glossaries-4.12.zip 5410108 BLAKE2B 681e91b4c057d649007675d05cab5eac219a73818c24c6c2e5f752721b65108f078dd05ee6340a686054359371f0f91549069087e2bd5679ddd8cfec961776b1 SHA512 34d5512a1d8daf3b8ddf3290e8da3ed69b835752ff93a166df5ccda95c9784fa3a63aa703926c5e90725cd4a204a43e8a718d460d7eb5dec7560927cc7ce7ef9
 DIST glossaries-4.41.zip 6285205 BLAKE2B df3dc8e6a6a8cd2fc741c6891a9d0322b5d012e6ed9428e5b5b016eece4bba72647081a482a338c0b895b6aaf856c75f344b1327f88e854ea8c8c246d50398ff SHA512 4f93d7568e280da96c8e32dbbdeab48c71282fb8bbc2e8b88b74976b74f5f466683b1b3d983aec7c8749ee9807d76236366276754639e5ba68888584850fd243
-EBUILD glossaries-3.04.ebuild 951 BLAKE2B 365873404e2eec2d1ea7d611529786830bb2ab55db7365006a3a13cdf7478d9bae9d83b42fb87bc4ce81b41a2a05985394aa8952d7bd5afa06d7a54bf9eb3217 SHA512 422925279b2e6b47608a2c224a4955b77c10ab23d00d5719f70c1e68301cea6df4be25f03c07bba11bc8832c89651c535fdf80c045f14f10d5bc994e814d76a5
-EBUILD glossaries-4.12-r1.ebuild 936 BLAKE2B f35e9431f73ed71a4408d64848b7ba2454ae432633505293edaa9cf234ac67f3da32699244855431233d83922dc113020b8f173ed15c624b4b5d5a3ed6c02836 SHA512 a5efff6d458b27888660326dacff5f0e23e9ef80596cfc63e62ddf1f582a6abd30c6fd8b6da4ea3e105b60364805440d16b7717c201fc11aba585c9c3772d946
 EBUILD glossaries-4.41.ebuild 946 BLAKE2B 10795c3d076d89724d14a8b9ddb112c26c6aae23720993f5ecb22c4664829937677d566977c91e5267f553e8b48362fbf798a2ac7812440c9838b9c7bb85eae7 SHA512 de10085bbe129112635198d4f87bf9962b4cf4c9762d9a1c93d2977641a433f42cf5a4c363f47d2e0b711824d9c200ebb4e16c82486cc5e103d48c65146ba133
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/glossaries/glossaries-3.04.ebuild b/dev-tex/glossaries/glossaries-3.04.ebuild
deleted file mode 100644
index 2c29c6105e0f..000000000000
--- a/dev-tex/glossaries/glossaries-3.04.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="Create glossaries and lists of acronyms"
-HOMEPAGE="http://www.ctan.org/tex-archive/help/Catalogue/entries/glossaries.html"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-RDEPEND="dev-lang/perl
-	dev-texlive/texlive-latexrecommended
-	>=dev-texlive/texlive-latexextra-2012"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-TEXMF="/usr/share/texmf-site"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	latex-package_src_doinstall styles
-
-	dobin makeglossaries
-
-	dodoc CHANGES README
-	insinto "${TEXMF}/tex/latex/${PN}/dict"
-	doins *.dict
-	if use doc ; then
-		latex-package_src_doinstall pdf
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.tex
-	fi
-}
diff --git a/dev-tex/glossaries/glossaries-4.12-r1.ebuild b/dev-tex/glossaries/glossaries-4.12-r1.ebuild
deleted file mode 100644
index 619953a8f3d9..000000000000
--- a/dev-tex/glossaries/glossaries-4.12-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="Create glossaries and lists of acronyms"
-HOMEPAGE="http://www.ctan.org/pkg/glossaries/"
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-RDEPEND="dev-lang/perl
-	dev-texlive/texlive-latexrecommended
-	>=dev-texlive/texlive-latexextra-2012
-	dev-texlive/texlive-plaingeneric"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-TEXMF="/usr/share/texmf-site"
-S=${WORKDIR}/${PN}
-
-src_install() {
-	latex-package_src_doinstall styles
-
-	dobin makeglossaries
-
-	dodoc CHANGES README
-	if use doc ; then
-		latex-package_src_doinstall pdf
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.tex
-	fi
-}
diff --git a/dev-tex/hevea/Manifest b/dev-tex/hevea/Manifest
index 11a2e221afa6..f502bebdedd7 100644
--- a/dev-tex/hevea/Manifest
+++ b/dev-tex/hevea/Manifest
@@ -1,7 +1,7 @@
 DIST hevea-2.29.tar.gz 969599 BLAKE2B 88724c0a1a139d370fa852af473e4f21f7c1f8a8ed79cf0a59fa6098d63a3956423f7b1403316aa2e296b00d77ddc529938f98476243795b6a00971532918d90 SHA512 4ea2f3d60fd43d183712a868cb3894b38f6d9809ba7905d69123a7672faba0d6dfe73ad1379d7996ede98ceb645bba903e5b7550bdf92e7950ce69ba7f4f3994
 DIST hevea-2.30.tar.gz 965635 BLAKE2B 7f23c6f793be1515b689571f0ae25d76d45c7bd8df9cc6fe1f73697b34dec598f64b0ed30e4b2cd5e456990c80ac0bba50c60e0294a825c6a0af59b228456cbd SHA512 75c700e009070bff4845ccc6f984ade8068f90ea78630a2e6ab1d27618a225a4bbbb7c4aa07c08be03094ddad4aac5d0c9e83fa01d41ff501f5c1eed9f4428eb
 DIST hevea-2.31.tar.gz 965678 BLAKE2B 770a3ff5b3e209d1e34e68647baffc064cb78f63a610e6b81181a829837861984f22e381cc17c34a3b0b4643c260a5cb84841cd8e2038e40083bba7ffbdab929 SHA512 4b66030f69b8b60750f8e62a9d81240b0ba399af8af69df10b33742e10d23fe7aef3e7782265fac9705f27715e5964debd47b9da7a394f70fda947b5fcd2d6ea
-EBUILD hevea-2.29.ebuild 1578 BLAKE2B 45718a3e4289fc79eb1a9be6bab4763dc2165097635902cbcecbd9fc30a461289778ae6e8ef7829b60fd9c1b484f131880a5d51db18ad18f6718e991c1344bb8 SHA512 6125faaaa52cd1cf0323ed91c06983538782a83618e21bcfda29ef27351f4173a9e1d252ff7381d1386f7e80e74ed97bb3a3e1b0f1a0371295d3dbed326a9ca9
-EBUILD hevea-2.30.ebuild 1582 BLAKE2B b25c3d4a2f596c3145d7e1772be6599be738c857e61537dd74478365db9a6e55d8e679a7feb237fa1e51d28011238f07faf2c05508705cc02c40b8c39673d09d SHA512 ec3d25692e4a81ab3f5421abbeed4711b87c83de22c464e34ee41bd803b543e97ba08eef7077c8c9b33790074925472df023399ab900b656e2f284a3cab67cb4
-EBUILD hevea-2.31.ebuild 1582 BLAKE2B b25c3d4a2f596c3145d7e1772be6599be738c857e61537dd74478365db9a6e55d8e679a7feb237fa1e51d28011238f07faf2c05508705cc02c40b8c39673d09d SHA512 ec3d25692e4a81ab3f5421abbeed4711b87c83de22c464e34ee41bd803b543e97ba08eef7077c8c9b33790074925472df023399ab900b656e2f284a3cab67cb4
-MISC metadata.xml 356 BLAKE2B a7f615933a0e3a96a715745ae427649370e382d38621d77733982247fd090942d75d9328b2274d7d636bde0a44822a6ca40f4a8f50cb4127f359ec674309068a SHA512 f01f19a40a296cd3675f75d2c09aae119bc9c644e7c80b3bebb8f265c5e49dc47f481b33e93aed51db6f19a6164b5cdff5cfabeb7e7daf10c67994cfa7aa1375
+EBUILD hevea-2.29.ebuild 1405 BLAKE2B 1a158f525e27dfb6973b6d57da17a98ad1285a86166656010be8abea6c8d28d5643429fd8e81dff458aebf2b4134833a1a1b041fceb4fa480eb9dfbe8593a2e7 SHA512 b0b04b7d1eb7ebc971d5baab81063ce46c183100dbf8525771821a8c2336d5186eebf0e5265ba747dae2c22c9f043d087658b425d77a7bbd7fe65b577ac080f3
+EBUILD hevea-2.30.ebuild 1409 BLAKE2B 85ab6991b7908a20d654202b3a921eca0a68c2f4476b3c1fce2d6a9a8c2b95c0c78167c36eebcdd9546e5c4f977bdef27b9ff5ff295069e50116bcc790b46411 SHA512 73edcbdb44f47c57c46f7471805224adae791fcf396241a4f0919698a4628fc3f58cd6839da4b05c158904659da886a3f921078e84605ad7df87b227990a1585
+EBUILD hevea-2.31.ebuild 1409 BLAKE2B 85ab6991b7908a20d654202b3a921eca0a68c2f4476b3c1fce2d6a9a8c2b95c0c78167c36eebcdd9546e5c4f977bdef27b9ff5ff295069e50116bcc790b46411 SHA512 73edcbdb44f47c57c46f7471805224adae791fcf396241a4f0919698a4628fc3f58cd6839da4b05c158904659da886a3f921078e84605ad7df87b227990a1585
+MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild
index 4eba8726f009..3f91c929d1aa 100644
--- a/dev-tex/hevea/hevea-2.29.ebuild
+++ b/dev-tex/hevea/hevea-2.29.ebuild
@@ -22,19 +22,19 @@ DEPEND="${DEPEND} dev-ml/ocamlbuild"
 
 src_compile() {
 	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh"
+	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
 	if use ocamlopt; then
-		emake PREFIX=/usr || die "Failed to build native code binaries"
+		emake PREFIX=/usr
 	else
-		emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries"
+		emake PREFIX=/usr TARGET=byte
 	fi
 }
 
 src_install() {
 	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed"
+		emake DESTDIR="${D}" PREFIX=/usr install
 	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed"
+		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
 	fi
 
 	dodoc README CHANGES
diff --git a/dev-tex/hevea/hevea-2.30.ebuild b/dev-tex/hevea/hevea-2.30.ebuild
index a09af4ace2c4..c49589ed4c53 100644
--- a/dev-tex/hevea/hevea-2.30.ebuild
+++ b/dev-tex/hevea/hevea-2.30.ebuild
@@ -22,19 +22,19 @@ DEPEND="${DEPEND} dev-ml/ocamlbuild"
 
 src_compile() {
 	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh"
+	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
 	if use ocamlopt; then
-		emake PREFIX=/usr || die "Failed to build native code binaries"
+		emake PREFIX=/usr
 	else
-		emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries"
+		emake PREFIX=/usr TARGET=byte
 	fi
 }
 
 src_install() {
 	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed"
+		emake DESTDIR="${D}" PREFIX=/usr install
 	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed"
+		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
 	fi
 
 	dodoc README CHANGES
diff --git a/dev-tex/hevea/hevea-2.31.ebuild b/dev-tex/hevea/hevea-2.31.ebuild
index a09af4ace2c4..c49589ed4c53 100644
--- a/dev-tex/hevea/hevea-2.31.ebuild
+++ b/dev-tex/hevea/hevea-2.31.ebuild
@@ -22,19 +22,19 @@ DEPEND="${DEPEND} dev-ml/ocamlbuild"
 
 src_compile() {
 	rm -f config.sh
-	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh"
+	emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh
 	if use ocamlopt; then
-		emake PREFIX=/usr || die "Failed to build native code binaries"
+		emake PREFIX=/usr
 	else
-		emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries"
+		emake PREFIX=/usr TARGET=byte
 	fi
 }
 
 src_install() {
 	if use ocamlopt; then
-		emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed"
+		emake DESTDIR="${D}" PREFIX=/usr install
 	else
-		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed"
+		emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install
 	fi
 
 	dodoc README CHANGES
diff --git a/dev-tex/hevea/metadata.xml b/dev-tex/hevea/metadata.xml
index db7d550fd7b0..7b4a61aab741 100644
--- a/dev-tex/hevea/metadata.xml
+++ b/dev-tex/hevea/metadata.xml
@@ -5,8 +5,4 @@
 		<email>tex@gentoo.org</email>
 		<name>Gentoo TeX Project</name>
 	</maintainer>
-<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>Gentoo ML Project</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-tex/latex-beamer/Manifest b/dev-tex/latex-beamer/Manifest
index 97eb2c725972..f1817792da34 100644
--- a/dev-tex/latex-beamer/Manifest
+++ b/dev-tex/latex-beamer/Manifest
@@ -1,5 +1,5 @@
 DIST latex-beamer-3.56.tar.gz 651927 BLAKE2B b63bbe0e2b392db8166a3b3465464457e761a35c8a3c7ade0803c905a42a4a35731b816c4cf24fa352a0da720a2f4aa0aaa475c7db577e43e354c3e6eeb5fc1c SHA512 b774923f65312d359eb843826cd96363e6f0d315a22c1f881a1a17ed7f307ed568e593a1489b47d4ef0b630248fcadcbd7df1d69b2c39ace13c385c4d53ce236
 DIST latex-beamer-3.57.tar.gz 653136 BLAKE2B 7157d1e52df5221ea2aaa2634ed079bc690eb541cef2a6b60742d02e197ebdb4589877327c12aed80eebbb4fffa2b7d68a3ec6e4799874ff396660d4a1b949c9 SHA512 b3d7d5aa552badde18ae49967d729ee99a10a5157e167db92c235bdc36662d1113c5a5c775d59c7976e9e6a24a2e08271b95dc6240d3ed28fc816cdad3499ff7
-EBUILD latex-beamer-3.56-r1.ebuild 1008 BLAKE2B 6b64e199f485846dcb176ed91c6cb9e7b8a55ccf4cea5373a36dad93bfc3c1da2c91749c3a83434a79bc2cfaf188c33c2a31f771b73c69cec9f98c86c0b97bba SHA512 ca6e12f797c66e3f3332e35c6beed801735b889e1b53f570213d4555b6371b57ce1c4e871859944b70f6d13e057da63391fa1c4088b6441f14e4e8e38de5a1e2
-EBUILD latex-beamer-3.57.ebuild 1018 BLAKE2B 68d320d54081ea3bbb6a1c658a4905b9ad9130111b3d438a49eab672c3bf15e3fa1db52cdb02f9eea3010d42bd583615af1fa07e870be37dde07226c95628a25 SHA512 e760a1d5d583349e73a8b2dbfffd26c38d03674e796a02be9fcd7749c695058b31c04f5836b3c0f2c9053f48a38e8c19f584b70c3e97de4462668d55a4511fa1
+EBUILD latex-beamer-3.56-r1.ebuild 1007 BLAKE2B eb01c3d0500b0a14c475243ec0554f27ecf65a16a065c628b54da58bbb6ec77aafb9a84b3b0e2c423bd32b6e5f3ba83872b009daa5d24f01b41de628e5a42b9c SHA512 3717a95a422bce5e687e6d5a6368b31973fbde8e3fabbc4af04098556dd0bf21468dfac31f181e1489326c433d4367476dec7e2c086a371faf73ac9261ec19f2
+EBUILD latex-beamer-3.57.ebuild 1017 BLAKE2B 25d1eb60dacc12e237a2e61b01991c122f6ee372bfb88706e96ee5b16f16e5d513da5d98d51d6a93a0f4486631647f809f3dcbc058428fc0038a19f30124c1c2 SHA512 e9bc400658c681b819c3bcf8459dc6fda70b463453337fe3725520981edf497b4da0c7648f53ddcf2b8d508e4e6ebb0a0bf88409a24970ce34e4bdbcbbb235ca
 MISC metadata.xml 333 BLAKE2B db108642b2e79b0221ae8c4a3750cfee95d6de31b9249889c2eb61cb6f2f178f75b4bfcf09167bce2c9cccaf429a51b6a5fef20138c58d6f03a46d897b064013 SHA512 3beec0899689b43ff66d65f0657af6ff194543f0d4567a2679c5b320f77a0751500e5b725136c5ae4bfd14583c035ba3a62558650285d8b8e4cfd8c0ff87ec0d
diff --git a/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild b/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild
index 5fd0b571e88d..11806dfb80f6 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.56-r1.ebuild
@@ -34,7 +34,7 @@ src_install() {
 
 	if use doc ; then
 		docinto doc
-		dodoc -r doc
-		dosym "${ED}/usr/share/doc/${P}/doc/" "${TEXMF}/doc/latex/beamer"
+		dodoc -r  doc
+		dosym "../usr/share/doc/${PF}/doc/" "${TEXMF}/doc/latex/beamer"
 	fi
 }
diff --git a/dev-tex/latex-beamer/latex-beamer-3.57.ebuild b/dev-tex/latex-beamer/latex-beamer-3.57.ebuild
index 1360f9eea1bb..e147805d247d 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.57.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.57.ebuild
@@ -34,7 +34,7 @@ src_install() {
 
 	if use doc ; then
 		docinto doc
-		dodoc -r doc
-		dosym "${ED}/usr/share/doc/${P}/doc/" "${TEXMF}/doc/latex/beamer"
+		dodoc -r  doc
+		dosym "../usr/share/doc/${PF}/doc/" "${TEXMF}/doc/latex/beamer"
 	fi
 }
diff --git a/dev-tex/latex2rtf/Manifest b/dev-tex/latex2rtf/Manifest
index 84164fe35380..40bf1d000043 100644
--- a/dev-tex/latex2rtf/Manifest
+++ b/dev-tex/latex2rtf/Manifest
@@ -1,5 +1,5 @@
 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 1039 BLAKE2B d9db6cc071e428c72b8b8be2ea2b67afd6e75ca5c2fd6e6e3e285e72dfba3590beffa68c431f93e9a57dadfdb23715103b051ea3eafb4d3c4c4cccc041c72fd1 SHA512 85702d955dc7ac3705d81c26211a2f26bb4134e39174ded9b50d29cb4d705e82cec51b1ca07eccaf4f1280b4470ef96ecb4d71b2fd3951599ce3e5d9e95591c7
-EBUILD latex2rtf-2.3.15.ebuild 1025 BLAKE2B 6084807370c24f630ff3ff9747f4795c63bad1ea1bd0b922e524c73cbec0fc31fee264d555b5fa490e941de8fbe4ea9b7e4b177aac4d5bf84716fc865242661e SHA512 99e2c1a55c9190e0d11416c603d8e2a0a6633293d0e9aad218c8afdff9a12a778b751fcc16f78d1e4ecd1024378360b0c40d899c3b0b1d959f6f64b68ed40c21
+EBUILD latex2rtf-2.3.11.ebuild 1041 BLAKE2B 4843fbfe7009f17a9cb0d8a6835df3c993d1e9b12c96019189c9a758d5873c8c527436f885b18905e486cfed9c91d5c742fe689f8f8673bd7b4a247dc854bc57 SHA512 664f3057466ffa181ce529af25e9f952b52c235c8c06d011c6f5f6d95702a3a659baf2d5885d793b507f2cdd857e899935402c641195757012e05f598e472af2
+EBUILD latex2rtf-2.3.15.ebuild 1027 BLAKE2B 8820ea7ee454628fa0e78c5be4ca5f664447bb52a8838e20e6d1069a95642485c323b5a633e6e6a53327a8080ab00c3cde8acb221b9c88b0960a4d5a390ad11b SHA512 f020ac0400809deb00a00c9f0d90422efc68026321dd668bec240ccc14bc5c6adffdd1b1f3897bf95d67de60a0c120f4ddb8a34504e2294536747be7f6da43fc
 MISC metadata.xml 328 BLAKE2B 6287a33c4f372852cf86f82faef17cc2447af6605011b1cafbd8b3ab02326bc7acdcf789617a8e1f0f3f991bcc7ede462a15cac9592e14ae329cb6b91291f5c3 SHA512 03629d8faac12c3fbc5fafe8ce1ec4cb6ee0b564c21b3a987bec1b4db07ead69d1dcf7a9db45791c3885510af311332d7e94cb3e12052896cb21b67ba4fbac20
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
index dc7dab1b2461..17ae8b6a4908 100644
--- a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 S="${WORKDIR}/${P%b}"
 
 RDEPEND="
@@ -32,7 +33,7 @@ src_compile() {
 	export VARTEXFONTS="${T}/fonts"
 	tc-export CC
 	# Set DESTDIR here too so that compiled-in paths are correct.
-	emake DESTDIR="${EPREFIX}/usr" || die "emake failed"
+	emake DESTDIR="${EPREFIX}/usr"
 
 	cd "${S}/doc"
 	emake realclean
diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
index e03802b9c2ee..6bfab71d3f27 100644
--- a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
+++ b/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 S="${WORKDIR}/${P%b}"
 
 RDEPEND="
@@ -32,7 +33,7 @@ src_compile() {
 	export VARTEXFONTS="${T}/fonts"
 	tc-export CC
 	# Set DESTDIR here too so that compiled-in paths are correct.
-	emake DESTDIR="${EPREFIX}/usr" || die "emake failed"
+	emake DESTDIR="${EPREFIX}/usr"
 
 	# Needed for tests
 	chmod +x test/bracecheck || die
diff --git a/dev-tex/latexdiff/Manifest b/dev-tex/latexdiff/Manifest
index 2da3ae3f4068..8a218fb7ac9e 100644
--- a/dev-tex/latexdiff/Manifest
+++ b/dev-tex/latexdiff/Manifest
@@ -2,7 +2,7 @@ DIST latexdiff-1.1.0.zip 466029 BLAKE2B 5efe78845f6bcd2a3c8af8e889cb868047a81312
 DIST latexdiff-1.2.1.tar.gz 1780064 BLAKE2B d657d5d36bcb759889a582b4aac38ae67d99a17bc30fb37d627e9d496df40a1523871e31968333f07b1ad94b521faf91336b225f7466ef382713d48a803f1444 SHA512 9917a0eee36e5bff7c13e5690e743fa34aa7c1347a6509961aa4484094433854c6742a4c1605087db1902a57537fda2b49b071e98b015a5535379c27ccc1fd46
 DIST latexdiff-1.3.0.tar.gz 1791127 BLAKE2B e394dcf29d529f47a87eb7615d0da42a2d30c0e3a40938903cee75c2241ee8543713ee735f94f9eb9fe59829be85a5dad681183d96b2651e0e09d20ecae9e207 SHA512 d1b47ff4733bbba0ecadd71e6c54362b78ad8e97cac54b99b9ead4565dd0a56a8a5d4ce27866cabb4dc43c47a3c2230ce7743909f2d30bb94ecbae75c6ecbaae
 EBUILD latexdiff-1.1.0.ebuild 808 BLAKE2B adb8d8cfde26511203625918a86011784925a6ca2ace1992980061fb4ed325f66d84a6b0743d8fc062c9556826bd0ceb2913c851596a0491c00cbfba818e45c2 SHA512 451204c704141664539151b42bdaf8a66cc964ffdd6b429d5d8325a50543d899d3fad03722209b333bd5b7145a9cfb392d8b7afde2af8a2aef2b8a02f7f4105c
-EBUILD latexdiff-1.2.1.ebuild 1141 BLAKE2B c2e5a5841fb8550d087846baab1a54793e2f074c7f30e7fa1f3c59f2668a12f45d45f72c93664e2f3e51c0612ee618d6fc35f4fa4c1d0f242c198893a1491363 SHA512 650c97ac304bc044dc1006936bad4992e290683a16548b36dfb502da98581ce0c4a1b3d6434f61fe429c037b35d566541bc94114ce6434e043ee0c2d2f4a68f1
-EBUILD latexdiff-1.3.0.ebuild 1149 BLAKE2B 898a15b210f6dd2c9abd4b0b52c21464a049b80394d71335b65bf0a8a3b91d288d7d78e5679e6a9aeb921e7cf9a002a432edaee3b11eb81d6a4294c9130e50a2 SHA512 2760578f11d4233d1288035e165c06068e513cdcd8ba7775a4e5de78eda126aa500501a8fab4da32bc597cbc1c3a8dbdc6ad7c2652084d2d04892e74bb4e4d72
-EBUILD latexdiff-9999.ebuild 1159 BLAKE2B cf389de194915d82b758da0cbd99626292ba8e7a5bcbe1200d33fa33718f91f9c4927e2b60b66666031931024f2dbb088338e78f4fabce4c46e15745b8aec170 SHA512 feb39c61957ef15cb8412a844249f7dd3edd6eab03366a36f6f1856bdb3059aff3ceb8f0d5f95645a48b3107ff4c4d84905fe9a064f20dd9a8a74ccbc11efbe5
+EBUILD latexdiff-1.2.1.ebuild 1165 BLAKE2B ab2a9c3d6e74929a8251b036cb76faf09a76f4bad846f086db2d6d2a79b27f8f87f0bf4c38777cfffef8449689663a98fe0726a6354f11cf3a6a2d0bfb424a7f SHA512 ba87888173014c173fd503f838bdd56a4807b0dc2f6ffaf86f434957d0178b6fd4f22032924b3ee0ddedd133bda9a6c002f962a824c38c8fe316e1798c73a58a
+EBUILD latexdiff-1.3.0.ebuild 1176 BLAKE2B c825b4bcd3ea62a5e474b28bebf719620828c0d38da294cc04c02f613adf4a132255a43574f4b92e4418124f8fb4615e39ca3c9cf13ca33f7c8a53907e023a69 SHA512 c9eca797c19b14e5b0ae9ab594bc02800c5692431b23cf3759decc4a5f8e9209f797854fb9707834344b65869854573330ae47e23a81f8f46b96e7348b4676d4
+EBUILD latexdiff-9999.ebuild 1186 BLAKE2B b7c0f024d885555f75e1c80b600a403653ee97cfb787e840ab8cf92211ee2048ad3f1fb7d35b491ce637cdd862897e201bd9dfcb0fec1211cb5a54378e33216d SHA512 e181d705ab2a8554b26612c0843e11e4e8eceb918e8f0dfcef5086aab5b6d319118183c9e02ced10a76f8db15146a198edcac2fbe659d09a8f86cacb0224a631
 MISC metadata.xml 332 BLAKE2B e23b9e1ce0df618f8130ae9291147e4c2cdd33e0aaa3f26e6900cf30f41dae7f4954144180ca0886a8a3370910e1e4bba21dd87b303e23e6bbb8ceea484e00bc SHA512 a0e324d4d38574f5f5af8003e9e048f4c0628022e5b6553d1ce4b20cf12424f15e1bea07c6bd6cf87b7f7ba54c9983e2c025b42d517ef31c9fa3853def50ba3c
diff --git a/dev-tex/latexdiff/latexdiff-1.2.1.ebuild b/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
index 19bd50cbfb84..5ae0931dd3ec 100644
--- a/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/perl-5.8
diff --git a/dev-tex/latexdiff/latexdiff-1.3.0.ebuild b/dev-tex/latexdiff/latexdiff-1.3.0.ebuild
index 88e924c7a67c..9ff47ff1fb2e 100644
--- a/dev-tex/latexdiff/latexdiff-1.3.0.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.3.0.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/perl-5.8
diff --git a/dev-tex/latexdiff/latexdiff-9999.ebuild b/dev-tex/latexdiff/latexdiff-9999.ebuild
index 1e5b3eeff9cd..827ffb515f54 100644
--- a/dev-tex/latexdiff/latexdiff-9999.ebuild
+++ b/dev-tex/latexdiff/latexdiff-9999.ebuild
@@ -18,6 +18,7 @@ LICENSE="GPL-3"
 SLOT="0"
 
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-lang/perl-5.8
diff --git a/dev-tex/latexmk/Manifest b/dev-tex/latexmk/Manifest
index c28cd8b4e47b..6430800278fe 100644
--- a/dev-tex/latexmk/Manifest
+++ b/dev-tex/latexmk/Manifest
@@ -1,22 +1,6 @@
 AUX completion.bash-2 1540 BLAKE2B 95b81acb67eb3eca85be33a303fbba2f6558e7683989b5a1e71493d0ff649848d16650fbc1477dae707a24b9dd4342d8a925817efb8570971ffca9b2b9076824 SHA512 67432b66ffe6bfbd8d3155776a17d5bddd95b08f9d4c4394c913a90aa93ce51201084d1af11bd6886558296d8808a2e4cfe07d9d8a0b91b1b7a9f890bd78ae45
-DIST latexmk-435.zip 386766 BLAKE2B fe3e6495f75b12ffe6740297ca23fa1f15cc01bdaa6cc5a2db41122ac2b13e257339932db0278bfa4d1d6168b7ab55caed1185f3ad49dbdd0727450d753ae012 SHA512 ff8f88c261e2b90663d979ddcb373f777fd3ad4b125ab703052867b4896257b34033ed2a07fd4574da526d839449512ccc898bcb9aaf81ae5afb442dcb8622be
-DIST latexmk-441.zip 425737 BLAKE2B 828d43915037eebc474e9b9a2018504f225b9ae7ee21813137f8475470349c37dce6458fdd715afabff14c55dcf91a311b960ed1e08856454abb91b2a3525770 SHA512 b9b65ebda1edc6f1f2692f7c8f02eeeac07dc2bd2f5d96c763615a9e27918069ba65809e5e61580e541420bf1f8d7edc451ad3f1753d43e9596175fdb3571a73
-DIST latexmk-443a.zip 434070 BLAKE2B adc099c8d26504e47ac2f52e2c2178e2abf25e1f22e1496dedf123013592dfbec79647b0eec33a5339c5fa8da2869d1dd938d548697be903c446bb977183cc86 SHA512 9791bea6341f92988b6a7bdc4cd1587d1b8c6e013d9e7a3be219ea4045a8f95971072cf6633998839c35a462b2e5843adf3d5893519f1f6c2bd4ecf81314b2c0
-DIST latexmk-444.zip 446413 BLAKE2B 321d1652a47ca92643d6f3254e4da50fcc4d09cb09c0ff1d672e3868bfb38147f811da6d587d3601f17c775aaf2f896f2b0975294fad61a03a498ad1290b2382 SHA512 9a3237e4a31ce3ee0002370b16226909ee5389fdd081b0a3d37dce2f960bb2ea64eb4bd3e262f2a87766cc8401bf749d98267e6659ea0ce8c334db9e156d2128
-DIST latexmk-445.zip 447045 BLAKE2B 16caa95f1331468a0e535899b9e5c8fb1e3bcd6b7ee113e7509018b0468c001f9d4fa51158a7a18fea24daf346f7823cac4e8887b82fb3230e5c62cc558d0bc3 SHA512 1441d4d1c0112f3cf64067ed8b661554b0ad6fcbb84316d9cbb84c84220d7f99fcbcad27f8686946aaccf6ba184471d5ea774e594e2f3a6632fcdca6ca8e63b3
-DIST latexmk-448.zip 452245 BLAKE2B 4b033a6eecdb366e4e5e4b8accfc839e7638c1fa79091eb9888bfdb393e6df01edec5ac11cbff5b0c9dbf28c1783f0108372c240f45305329189abedc211af8d SHA512 cfa5c4a95a902baf1d4c56303500e5d54369b68abaa52e904a62bbeaeeb356bfe711ea040f0f02067a40e3fc88a12b46136a3a6d9708a34c177a4bae0bb6b986
-DIST latexmk-452c.zip 391327 BLAKE2B 1cde3f3005382958bba10c6bd513e3887eefeff5114bc5ed327a528c56b3b77bf9a1b51907c8bab0d50817f6bee63d15b4373e83799231a815000f6b797c0053 SHA512 164837066a285e3ffca938eb735c35b253b2dba2addf1ae2b2db5155b0586f6f4e626faf86eb630f97ce296c03c5c1c2f0f3c61445a75b9132aff009d683aeba
-DIST latexmk-453a.zip 368805 BLAKE2B 5bca05dd0196c43a1cc1e58e8036b66d8ce5825e2fc53e824cf6028c47ab4c420f0cff6b9e2ca205377d1784ce955bd24ba1be1a89f304b296550b5ca76d40c3 SHA512 401789383f75ecd78820dadf968e60ede762be0d9a781488e07a0a8239e213ae04959777a6ea87fc6b2bb64315ce00bdda25f7f25542370b5edf2ae5af9ba46e
 DIST latexmk-456.zip 425179 BLAKE2B 1cd2fcaff070bb9809a263763164f364f13146ba4a5115494824dfe422b2b58906aa9e9ee7ce02238961c77da2e828e6a73a56e7397efa77003b8237fa949fe5 SHA512 ff169ff677367125b32e7641e9fabc66d9fb015e6cf1433d39c598baf17a926e0d29c975c4a8fa8ed482b4bc57ff177cfedc058ebdc83a3abadde50f9a490d91
 DIST latexmk-465.zip 447290 BLAKE2B 2f11667e674122aad88604aad3f61da1503d220b27bae9b95c29922fc6304c227c5c5257666a6de3da6f6dee77b466d7e3c6f06fc6c03f4102cce43879765dd0 SHA512 132cdd95c0274f98946b37a0c1554a82bb649dcd61284386f3005aa78895d51c382d5d8f6cf1ecd8ece60c1877a0dc80660367e0ad82a44036334b3f4634ee86
-EBUILD latexmk-435.ebuild 801 BLAKE2B 69c2ecc492f09c9a15b136fa9cb13d7bd9767adf207355f09183b9cc90c77294579897e88a33eafb0846e15cbac9a41521b252afd7c4935c7036bd6740aeab26 SHA512 7c7f38af8a86c07edaa5930cd2fa357da47dd9ea3d421db2e35f64fc0debe7702f80f42ca4ef33818c5afd0715cdcde28417cf4722e1f416f0e8e33fc6776090
-EBUILD latexmk-441.ebuild 804 BLAKE2B 7869fb7258d5c79ce5159fe98b614bbf18a7b5b78bdc187dd03caa7b922e48c9357a67c685d0f9f2bba0b7e13b201ad0eee6c912145215cfc3bdc14423f20a78 SHA512 ff92a65196246a89c0b6e5e5263488dfed36419322d935837fcf9ff46cd79b203cb5148b75a1b9f38d5d79b173b8d78d7ef7b03911e4f10d67c25c73c8179ec9
-EBUILD latexmk-443a.ebuild 812 BLAKE2B d6ffb501222233da0bc7e7bfa17d82ba1b866ff3fba37879ac6c070872e4abc5a0a005aa86ab0c3031bc8e5d589606a4e0d135764cef220464fc76bf37c24f4e SHA512 bdf04d1edfb7f15fe0d643f7e12428cc1b44dd56f440c2931b3f5cd63e64970a5704848281bf4de4d5bad3b417ea74045e5a9d0af9ee391df770e0f698fc4abe
-EBUILD latexmk-444.ebuild 812 BLAKE2B 1931928e1d722fa68f5c8227bdba6e4a54b38abe45fefcf8fefd585d9d95f97817f0db57ca0670f18937d09dbde5853215f52afc89e81305913f8fe5b54c563a SHA512 694cc4f40cb7869fb9fd27c46a7da9ff98a2c297b31e34595e4d948c0c5e3ab05a6cea7bc26177d2b44fed6ab869005bd0d3d102ce32e766be616b575cf7b054
-EBUILD latexmk-445.ebuild 812 BLAKE2B 1931928e1d722fa68f5c8227bdba6e4a54b38abe45fefcf8fefd585d9d95f97817f0db57ca0670f18937d09dbde5853215f52afc89e81305913f8fe5b54c563a SHA512 694cc4f40cb7869fb9fd27c46a7da9ff98a2c297b31e34595e4d948c0c5e3ab05a6cea7bc26177d2b44fed6ab869005bd0d3d102ce32e766be616b575cf7b054
-EBUILD latexmk-448.ebuild 812 BLAKE2B 1931928e1d722fa68f5c8227bdba6e4a54b38abe45fefcf8fefd585d9d95f97817f0db57ca0670f18937d09dbde5853215f52afc89e81305913f8fe5b54c563a SHA512 694cc4f40cb7869fb9fd27c46a7da9ff98a2c297b31e34595e4d948c0c5e3ab05a6cea7bc26177d2b44fed6ab869005bd0d3d102ce32e766be616b575cf7b054
-EBUILD latexmk-452c.ebuild 808 BLAKE2B 2ca8f2c7441e06204fcb3f4528958a68bd2267af87d39b0e8a7cb40ee00981e57b4f9c940946540bb4e7d3b1266c0259870d9f7a8c07cfee2b91a22754f347e5 SHA512 fe5d8bdb13c6cfa40fc3b98c04be4df8dd055dfc92b412e1a5787d8161e43b519d238ffe2b6c993d1b047be2ddd1a78c25a57377861988aaedfc98c038005722
-EBUILD latexmk-453a.ebuild 808 BLAKE2B 2ca8f2c7441e06204fcb3f4528958a68bd2267af87d39b0e8a7cb40ee00981e57b4f9c940946540bb4e7d3b1266c0259870d9f7a8c07cfee2b91a22754f347e5 SHA512 fe5d8bdb13c6cfa40fc3b98c04be4df8dd055dfc92b412e1a5787d8161e43b519d238ffe2b6c993d1b047be2ddd1a78c25a57377861988aaedfc98c038005722
-EBUILD latexmk-456.ebuild 797 BLAKE2B b178475fadf31b713fb885af686290fcb8de730fe9d62a7febd90c0e429c5f76465f06c92a576329496460f96a6821f33dcac8bededbf4d127ca4e48e1d14241 SHA512 c3d6f8ec248cc6286a9c8420ed052ae36e5c7e7cb07d0461bb4b4e9175c478f420e0ffd217604943a9dc8a8a0f7f4953bd7e3625cb25ae04441b0ac7545840a5
+EBUILD latexmk-456.ebuild 793 BLAKE2B 586b5a6e70ea5200063fe81af034a112ec5dbf3eaea8bf56023e8f7492c1ae90e95d1cf8174b1348d3e7403f7f98b6e83f4b3185e2a41a9cd9c9c945025f228b SHA512 004827c6a636b1e15833bf569e1daf00e5d8e46feaf051b07e9bac9b5204e1853b7b94599af2cbfcc05fc0381e0caceb40638e4225d5be068d26e7f8561533e9
 EBUILD latexmk-465.ebuild 805 BLAKE2B 1cd231e055952026b570b91166c6c016c1bf409ad8188a2aae92909a22f22539075afb3c9b223292216625403a69af7562c5342ae53da65f86bca717d6b8406c SHA512 2c00837eba97e4a4de4b71768f9512c1fe79e93e61ed5073bf616f9d04650a457119032931e993bb7d965644163c190126c92ccf373a96054d8cf983d37893c9
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/dev-tex/latexmk/latexmk-435.ebuild b/dev-tex/latexmk/latexmk-435.ebuild
deleted file mode 100644
index 920a03756546..000000000000
--- a/dev-tex/latexmk/latexmk-435.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit bash-completion-r1
-
-DESCRIPTION="Perl script for automatically building LaTeX documents"
-HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
-SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin latexmk.pl latexmk
-	doman latexmk.1
-	dodoc CHANGES README latexmk.pdf latexmk.ps latexmk.txt
-	dodoc -r example_rcfiles extra-scripts
-	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
-}
diff --git a/dev-tex/latexmk/latexmk-441.ebuild b/dev-tex/latexmk/latexmk-441.ebuild
deleted file mode 100644
index 7a51b65d17da..000000000000
--- a/dev-tex/latexmk/latexmk-441.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Perl script for automatically building LaTeX documents"
-HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
-SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin latexmk.pl latexmk
-	doman latexmk.1
-	dodoc CHANGES README latexmk.pdf latexmk.ps latexmk.txt
-	dodoc -r example_rcfiles extra-scripts
-	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
-}
diff --git a/dev-tex/latexmk/latexmk-443a.ebuild b/dev-tex/latexmk/latexmk-443a.ebuild
deleted file mode 100644
index 41e7ea8ca08f..000000000000
--- a/dev-tex/latexmk/latexmk-443a.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Perl script for automatically building LaTeX documents"
-HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
-SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	newbin latexmk.pl latexmk
-	doman latexmk.1
-	dodoc CHANGES README latexmk.pdf latexmk.ps latexmk.txt
-	dodoc -r example_rcfiles extra-scripts
-	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
-}
diff --git a/dev-tex/latexmk/latexmk-444.ebuild b/dev-tex/latexmk/latexmk-444.ebuild
deleted file mode 100644
index b9f43c91c26d..000000000000
--- a/dev-tex/latexmk/latexmk-444.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Perl script for automatically building LaTeX documents"
-HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
-SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	newbin latexmk.pl latexmk
-	doman latexmk.1
-	dodoc CHANGES README latexmk.pdf latexmk.ps latexmk.txt
-	dodoc -r example_rcfiles extra-scripts
-	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
-}
diff --git a/dev-tex/latexmk/latexmk-445.ebuild b/dev-tex/latexmk/latexmk-445.ebuild
deleted file mode 100644
index b9f43c91c26d..000000000000
--- a/dev-tex/latexmk/latexmk-445.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Perl script for automatically building LaTeX documents"
-HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
-SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	newbin latexmk.pl latexmk
-	doman latexmk.1
-	dodoc CHANGES README latexmk.pdf latexmk.ps latexmk.txt
-	dodoc -r example_rcfiles extra-scripts
-	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
-}
diff --git a/dev-tex/latexmk/latexmk-448.ebuild b/dev-tex/latexmk/latexmk-448.ebuild
deleted file mode 100644
index b9f43c91c26d..000000000000
--- a/dev-tex/latexmk/latexmk-448.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Perl script for automatically building LaTeX documents"
-HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
-SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	newbin latexmk.pl latexmk
-	doman latexmk.1
-	dodoc CHANGES README latexmk.pdf latexmk.ps latexmk.txt
-	dodoc -r example_rcfiles extra-scripts
-	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
-}
diff --git a/dev-tex/latexmk/latexmk-452c.ebuild b/dev-tex/latexmk/latexmk-452c.ebuild
deleted file mode 100644
index 3b9aab0c56f8..000000000000
--- a/dev-tex/latexmk/latexmk-452c.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Perl script for automatically building LaTeX documents"
-HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
-SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	newbin latexmk.pl latexmk
-	doman latexmk.1
-	dodoc CHANGES README latexmk.pdf latexmk.txt
-	dodoc -r example_rcfiles extra-scripts
-	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
-}
diff --git a/dev-tex/latexmk/latexmk-453a.ebuild b/dev-tex/latexmk/latexmk-453a.ebuild
deleted file mode 100644
index 3b9aab0c56f8..000000000000
--- a/dev-tex/latexmk/latexmk-453a.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1
-
-DESCRIPTION="Perl script for automatically building LaTeX documents"
-HOMEPAGE="http://www.phys.psu.edu/~collins/software/latexmk/"
-SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="virtual/latex-base
-	dev-lang/perl"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	newbin latexmk.pl latexmk
-	doman latexmk.1
-	dodoc CHANGES README latexmk.pdf latexmk.txt
-	dodoc -r example_rcfiles extra-scripts
-	newbashcomp "${FILESDIR}"/completion.bash-2 ${PN}
-}
diff --git a/dev-tex/latexmk/latexmk-456.ebuild b/dev-tex/latexmk/latexmk-456.ebuild
index 7d7fe21ec1f4..69b9168ebab0 100644
--- a/dev-tex/latexmk/latexmk-456.ebuild
+++ b/dev-tex/latexmk/latexmk-456.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.phys.psu.edu/~collins/software/latexmk/${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="virtual/latex-base
 	dev-lang/perl"
diff --git a/dev-tex/luatex/Manifest b/dev-tex/luatex/Manifest
deleted file mode 100644
index 236d6b539f22..000000000000
--- a/dev-tex/luatex/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX includes.patch 923 BLAKE2B b0b4602086c2eff9c17fff7d98ff4431b19e3345bac5ebc6d5ea46a517b3f9bced7ed8f17df2b51ad22c72f32be17be3d222f2d5f9d8228f957ebe2e47bd45eb SHA512 e1f45331e341130d74c5327e67fb8ec34741fc5edeca94dbc1a2d034e9362ce933294c80538db0f89030f293b157f7626f9c90b27cb72b9a85c7d9dbe6bac287
-AUX kpathsea2012.patch 944 BLAKE2B dfe4148cb2dfbec3d39d7132ed9018323dfcda80ec820384a2bd3fe35455863281839bdd642f0a7cae4f4dabb351e90f0553ded89eb1af471af6523b8326b8ec SHA512 d72bce55c2494622fd15703f483c058245c96c8b2aa03d6fa02b112be827ddfe8a0013ee0c3710bb3e1313b631bf436f70ce99d383f11f4d2b51915752c59960
-AUX poppler018.patch 4993 BLAKE2B ed036dbb14206742ca5c54471c6b1e26c6c248136266d1a99109fe84c958e8f98f53bb44fb727b777e178d367d82af005f951de9636524c5a937705dd5cc95aa SHA512 1d78163db7061b21761144218b2078154fc55020c5beee0835729f17a16e176a5b850ba9bb9d3d7d649f6d48903d02c7b828d6cb5bc6366bad6e648d59861b9a
-AUX poppler020.patch 2909 BLAKE2B d4482cb205907713c211ab4dbbe514f9fb25ea70a93e834999fd38bd28ba2a199015c63fbe7467c35c04e7125954b9127db79227d3f4731cf723262836b51146 SHA512 9517efce4ede9b792f27647ec4ed95d447572a9cbb3ee58e089b658ccc55bbb6a7843768b5962a4535ed77ab364e73f4fd1248e92a5a480ce30429303664f385
-AUX poppler022.patch 12562 BLAKE2B 732619ac23742e60552646b9fc3eaff5202a2c3e6a80227d4be07bb7621923e861c9a55299ae6557b10227c42a1672237176d141e9bbc9b5af40fa993d1b9d44 SHA512 6cfda5fa48bc16b41379928c1ce83979ceafa177d30a95b7494048fba1bbd6d15333aad30d00fa282e050e4d432e6431b2ce30972b24dff3387d75ad90f14757
-AUX poppler026-backport.patch 3776 BLAKE2B 60f8b05c76ec6542d8e41cc75e48cb53f1825bcb545da38c0ec96392aa34050c5f723fc2b1680e811aa60d0d1365053ad9bbc17c76efae754a6e9459c12ad50a SHA512 818f779b29ffad6a0e72113c40c6eaeee0c8b4ae96d5c9fce915cc0641ccc388cf40acaa84d2297ae5e823e8d60e573a69840cfbf9ddc217897ab0df2238d0a9
-AUX poppler026.patch 5063 BLAKE2B 8b3481671b9002fdc293b48dc9b7e9b64f85ca46bcb2a9510d2793d30de6207f288a8d0abab2bc498829dde22328adf46f33b078e8282a2a60361e67d2133119 SHA512 774198495da7d3425c7b7005b69fdb8051ad0748eec2e97d80be1ea5dd7aa24fe1299ab7e2ca3bddf93c1ace994e2543327dec3beac1bdc72efea475a1b86725
-AUX remove-zlib-version-check.patch 885 BLAKE2B 6893d1f0df9e0ce9b18ba8de42af0a52bc8d64d06435e3f63d0d244be864fc5af80da0fa76a8ac0c0cd3f4536c6829c6761e58e5a202e8dcdacaf42c85bbb900 SHA512 e40ac82ba9dfbd8c6b693a357cb2a08a66744b9476d4efd55477b03478fd27584f1c564d80c892d10e26ac1acd416392e86b69c3073e396ecc4730389ce66d1c
-DIST luatex-beta-0.70.1-doc.tar.bz2 1048489 BLAKE2B 199419361348fcb4ff5c591e00adde11787153094ccc4990bdf102a6ddc5a72bca34f87e6391ea3156c43d34f5fb20e5fc7fc26a79351d36bca7bf11bf67dac0 SHA512 eb4de91a80a6afccf5cca5cb05d5c1378a60ec35763e5ef5e9dbadaa2a276758a446e01d66e76a78e91442274778c10c73458b513af903e7221d90beb644afa9
-DIST luatex-beta-0.70.1.tar.bz2 8181155 BLAKE2B ef053914eb2a5c25324bcc406df48b82ff92e8dc88fee929ba760489fadfa9896bd2cb98fd0c7f3092e7efc000a16a10d95aa5d41ca78d0f9bc18af8f19b6f50 SHA512 e04a9b96f349bf9036ef4c01746dee96ebf245cd4da6b719f546223e05cb98fb844e20878a64f80f42c77e220fac01ee2d97ad56939c1fb3af44faab53c603cb
-DIST luatex-beta-0.76.0-doc.tar.bz2 995143 BLAKE2B b3819dc821e637c24bfd5add91466b15e46f4752422b7801cb1bde0bb92a6976ba2219c95b24df7f28cf1cad93ddceb4d30c3ffa513367dfca69379b68caea34 SHA512 cd64e1fea3f631c7c6e268d01285f96966325fd16971d8840eef178ccc11b001b40ae5cfcc6c7c3bb026a3f04c04a16b90813f0b6818383bb80686a89ea48596
-DIST luatex-beta-0.76.0-source.tar.bz2 11748576 BLAKE2B 5ff71ee5a2357d1c48b745b55892bb6b8e96917b8dc778d334f80843d8e2ee829cdb9a7a57b3abd5c99202fec5278b680874e72975d774b7134eaf15b9617de6 SHA512 71ea789a95d419bf177f7f9f8d24d00a9d5639665feadac93cc30c86531e4942d29d848ef39ca3698de3efb1b8da9eb19890b1a06b45664641c7e47a79dd80b0
-EBUILD luatex-0.70.1-r3.ebuild 3772 BLAKE2B 6ddb0781d237fb054f06a6ac41eaf3fec0f624da8d680ac22bcadfa4c4f4b5e510442c87427221ae6bb2951b222847a689d9361e8bd278a796ba0b76c6c793a1 SHA512 e19e4b18856d6ab022ac1e3c8fddfa7e3177280d86bb9a9e3949e1a38b36ab827c61b220f4fdfd24676287263c613c72f87996098fdc28d5352168010454fb4c
-EBUILD luatex-0.76.0-r1.ebuild 3171 BLAKE2B 2afe559102b25a7182cfa89882f23b8f08731a53238c22d1c1384a1cef9b3c05cbdcdf64a0fff6ad4a1150a8dbd7f85eac88652f3fb4bff940c2504667670817 SHA512 b20228a8f1b068452f066f209ab5d4c67917f0eec8291282bdc062a5d304ded23ee87fed512dcd39466f827c413f74587d2de2cccfacaa01500ad29b07b76e7d
-MISC metadata.xml 425 BLAKE2B e7887c2453db4e82d38b824cc946629dfee23c440f2b6d9982fd1b58cd43d601ff62f2ee0513078bf2f979a06c511576de1ac6c2d620c6dcfd6ef2dd125fb732 SHA512 9442b997ff504c7aef4e129b3c3fbc5212e6b7838b53059cfd16764bff66b025d39e6c9565f932295118393b8b648a489066d85e6bdb5e09380ec02a384addd9
diff --git a/dev-tex/luatex/files/includes.patch b/dev-tex/luatex/files/includes.patch
deleted file mode 100644
index f93c7312b315..000000000000
--- a/dev-tex/luatex/files/includes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: source/texk/web2c/luatexdir/image/pdftoepdf.w
-===================================================================
---- source.orig/texk/web2c/luatexdir/image/pdftoepdf.w
-+++ source/texk/web2c/luatexdir/image/pdftoepdf.w
-@@ -26,6 +26,8 @@ static const char _svn_version[] =
- // define DEBUG
- #define __STDC_FORMAT_MACROS /* for PRId64 etc.  */
- 
-+#include <stdint.h>
-+#include <inttypes.h>
- #include "image/epdf.h"
- 
- // This file is mostly C and not very much C++; it's just used to interface
-Index: source/texk/web2c/luatexdir/image/writejp2.w
-===================================================================
---- source.orig/texk/web2c/luatexdir/image/writejp2.w
-+++ source/texk/web2c/luatexdir/image/writejp2.w
-@@ -30,6 +30,7 @@ ISO/IEC 15444-1, Second edition, 2004-09
- @c
- #include <math.h>
- #include <assert.h>
-+#include <stdint.h>
- #include "ptexlib.h"
- #include "image/image.h"
- #include "image/writejp2.h"
diff --git a/dev-tex/luatex/files/kpathsea2012.patch b/dev-tex/luatex/files/kpathsea2012.patch
deleted file mode 100644
index 80c356d9de80..000000000000
--- a/dev-tex/luatex/files/kpathsea2012.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From TeX Live svn rev 23421.
-Remove unnecessary headers. Fixes build with kpathsea from TeX Live 2012.
-
-
-Index: source/texk/web2c/luatexdir/luatex.c
-===================================================================
---- source/texk/web2c/luatexdir/luatex.c	(revision 23420)
-+++ source/texk/web2c/luatexdir/luatex.c	(revision 23421)
-@@ -32,7 +32,6 @@
- #include <kpathsea/readable.h>
- #include <kpathsea/variable.h>
- #include <kpathsea/absolute.h>
--#include <kpathsea/recorder.h>
- #ifdef WIN32
- #include <kpathsea/concatn.h>
- #endif
-Index: source/texk/web2c/lib/texmfmp.c
-===================================================================
---- source/texk/web2c/lib/texmfmp.c	(revision 23420)
-+++ source/texk/web2c/lib/texmfmp.c	(revision 23421)
-@@ -17,7 +17,6 @@
- #include <kpathsea/readable.h>
- #include <kpathsea/variable.h>
- #include <kpathsea/absolute.h>
--#include <kpathsea/recorder.h>
- #ifdef WIN32
- #include <kpathsea/concatn.h>
- #endif
diff --git a/dev-tex/luatex/files/poppler018.patch b/dev-tex/luatex/files/poppler018.patch
deleted file mode 100644
index 0fd55a296711..000000000000
--- a/dev-tex/luatex/files/poppler018.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-by Martin von Gagern
-https://bugs.gentoo.org/show_bug.cgi?id=384875
-http://thread.gmane.org/gmane.comp.tex.luatex/2630
-
---- a/texk/web2c/luatexdir/lua/lepdflib.cc	
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc	
-@@ -89,7 +89,6 @@ new_poppler_userdata(AnnotBorder);
- new_poppler_userdata(Annots);
- new_poppler_userdata(Array);
- new_poppler_userdata(Catalog);
--new_poppler_userdata(EmbFile);
- new_poppler_userdata(Dict);
- //new_poppler_userdata(GooString);
- new_poppler_userdata(LinkDest);
-@@ -393,7 +392,7 @@ static int m_Annot__gc(lua_State * L)
-     printf("\n===== Annot GC ===== uin=<%p>\n", uin);
- #endif
-     if (uin->atype == ALLOC_LEPDF)
--        delete(Annot *) uin->d;
-+        ((Annot *) uin->d)->decRefCnt();
-     return 0;
- }
- 
-@@ -408,34 +407,6 @@ static const struct luaL_Reg Annot_m[] =
- };
- 
- //**********************************************************************
--// AnnotBorderStyle
--
--m_poppler_get_DOUBLE(AnnotBorderStyle, getWidth);
--
--m_poppler__tostring(AnnotBorderStyle);
--
--static int m_Annots__gc(lua_State * L)
--{
--    udstruct *uin;
--    uin = (udstruct *) luaL_checkudata(L, 1, M_Annots);
--    if (uin->pd != NULL && uin->pd->pc != uin->pc)
--        pdfdoc_changed_error(L);
--#ifdef DEBUG
--    printf("\n===== Annots GC ===== uin=<%p>\n", uin);
--#endif
--    if (uin->atype == ALLOC_LEPDF)
--        delete(Annots *) uin->d;
--    return 0;
--}
--
--static const struct luaL_Reg AnnotBorderStyle_m[] = {
--    {"getWidth", m_AnnotBorderStyle_getWidth},
--    {"__tostring", m_AnnotBorderStyle__tostring},
--    {"__gc", m_Annots__gc},
--    {NULL, NULL}                // sentinel
--};
--
--//**********************************************************************
- // Annots
- 
- m_poppler_get_INT(Annots, getNumAnnots);
-@@ -683,31 +654,6 @@ static int m_Catalog_findDest(lua_State
- 
- m_poppler_get_poppler(Catalog, Object, getDests);
- m_poppler_get_INT(Catalog, numEmbeddedFiles);
--
--static int m_Catalog_embeddedFile(lua_State * L)
--{
--    EmbFile *ef;
--    int i, len;
--    udstruct *uin, *uout;
--    uin = (udstruct *) luaL_checkudata(L, 1, M_Catalog);
--    if (uin->pd != NULL && uin->pd->pc != uin->pc)
--        pdfdoc_changed_error(L);
--    i = luaL_checkint(L, 2);
--    len = ((Catalog *) uin->d)->numEmbeddedFiles();
--    if (i > 0 && i <= len) {
--        ef = ((Catalog *) uin->d)->embeddedFile(i - 1);
--        if (ef != NULL) {
--            uout = new_EmbFile_userdata(L);
--            uout->d = ef;
--            uout->pc = uin->pc;
--            uout->pd = uin->pd;
--        } else
--            lua_pushnil(L);
--    } else
--        lua_pushnil(L);
--    return 1;
--}
--
- m_poppler_get_INT(Catalog, numJS);
- 
- static int m_Catalog_getJS(lua_State * L)
-@@ -749,7 +695,6 @@ static const struct luaL_Reg Catalog_m[]
-     {"findDest", m_Catalog_findDest},
-     {"getDests", m_Catalog_getDests},
-     {"numEmbeddedFiles", m_Catalog_numEmbeddedFiles},
--    {"embeddedFile", m_Catalog_embeddedFile},
-     {"numJS", m_Catalog_numJS},
-     {"getJS", m_Catalog_getJS},
-     {"getOutline", m_Catalog_getOutline},
-@@ -759,49 +704,6 @@ static const struct luaL_Reg Catalog_m[]
- };
- 
- //**********************************************************************
--// EmbFile
--
--m_poppler_get_GOOSTRING(EmbFile, name);
--m_poppler_get_GOOSTRING(EmbFile, description);
--m_poppler_get_INT(EmbFile, size);
--m_poppler_get_GOOSTRING(EmbFile, modDate);
--m_poppler_get_GOOSTRING(EmbFile, createDate);
--m_poppler_get_GOOSTRING(EmbFile, checksum);
--m_poppler_get_GOOSTRING(EmbFile, mimeType);
--
--static int m_EmbFile_streamObject(lua_State * L)
--{
--    udstruct *uin, *uout;
--    uin = (udstruct *) luaL_checkudata(L, 1, M_EmbFile);
--    if (uin->pd != NULL && uin->pd->pc != uin->pc)
--        pdfdoc_changed_error(L);
--    uout = new_Object_userdata(L);
--    uout->d = new Object();     // automatic init to type "none"
--    ((EmbFile *) uin->d)->streamObject().copy((Object *) uout->d);
--    uout->pc = uin->pc;
--    uout->pd = uin->pd;
--    return 1;
--}
--
--m_poppler_get_BOOL(EmbFile, isOk);
--
--m_poppler__tostring(EmbFile);
--
--static const struct luaL_Reg EmbFile_m[] = {
--    {"name", m_EmbFile_name},
--    {"description", m_EmbFile_description},
--    {"size", m_EmbFile_size},
--    {"modDate", m_EmbFile_modDate},
--    {"createDate", m_EmbFile_createDate},
--    {"checksum", m_EmbFile_checksum},
--    {"mimeType", m_EmbFile_mimeType},
--    {"streamObject", m_EmbFile_streamObject},
--    {"isOk", m_EmbFile_isOk},
--    {"__tostring", m_EmbFile__tostring},
--    {NULL, NULL}                // sentinel
--};
--
--//**********************************************************************
- // Dict
- 
- static int m_Dict_incRef(lua_State * L)
-@@ -2683,11 +2585,9 @@ int luaopen_epdf(lua_State * L)
- {
-     register_meta(Annot);
-     // TODO register_meta(AnnotBorder);
--    register_meta(AnnotBorderStyle);
-     register_meta(Annots);
-     register_meta(Array);
-     register_meta(Catalog);
--    register_meta(EmbFile);
-     register_meta(Dict);
-     register_meta(GooString);
-     register_meta(LinkDest);
diff --git a/dev-tex/luatex/files/poppler020.patch b/dev-tex/luatex/files/poppler020.patch
deleted file mode 100644
index d3db830d3430..000000000000
--- a/dev-tex/luatex/files/poppler020.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=416545
-build with poppler-0.20 by Rafał Mużyło
-
---- source/texk/web2c/luatexdir/lua/lepdflib.cc	2012-05-18 16:23:53.000000000 +0200
-+++ source/texk/web2c/luatexdir/lua/lepdflib.cc	2012-05-18 17:43:12.959843483 +0200
-@@ -151,7 +151,7 @@ static int l_new_Annot(lua_State * L)
-         pdfdoc_changed_error(L);
-     uout = new_Annot_userdata(L);
-     uout->d =
--        new Annot((XRef *) uxref->d, (Dict *) udict->d, (Catalog *) ucatalog->d,
-+        new Annot(udict->pd->doc, (Dict *) udict->d,
-                   (Object *) uref->d);
-     uout->atype = ALLOC_LEPDF;
-     uout->pc = uxref->pc;
-@@ -173,7 +173,7 @@ static int l_new_Annots(lua_State * L)
-         pdfdoc_changed_error(L);
-     uout = new_Annots_userdata(L);
-     uout->d =
--        new Annots((XRef *) uxref->d, (Catalog *) ucatalog->d,
-+        new Annots(uannotsobj->pd->doc,
-                    (Object *) uannotsobj->d);
-     uout->atype = ALLOC_LEPDF;
-     uout->pc = uxref->pc;
-@@ -363,7 +363,7 @@ static int m_##type##__tostring(lua_Stat
- // Annot
- 
- m_poppler_get_BOOL(Annot, isOk);
--m_poppler_get_OBJECT(Annot, getAppearance);
-+m_poppler_get_OBJECT(Annot, getAppearanceResDict);
- m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
- 
- static int m_Annot_match(lua_State * L)
-@@ -398,7 +398,7 @@ static int m_Annot__gc(lua_State * L)
- 
- static const struct luaL_Reg Annot_m[] = {
-     {"isOk", m_Annot_isOk},
--    {"getAppearance", m_Annot_getAppearance},
-+    {"getAppearanceResDict", m_Annot_getAppearanceResDict},
-     {"getBorder", m_Annot_getBorder},
-     {"match", m_Annot_match},
-     {"__tostring", m_Annot__tostring},
-@@ -1249,7 +1249,7 @@ static int m_Object_getType(lua_State *
- 
- static int m_Object_getTypeName(lua_State * L)
- {
--    char *s;
-+    const char *s;
-     udstruct *uin;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_Object);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-@@ -1936,7 +1936,7 @@ static int m_Page_getLinks(lua_State * L
-     if ((uin->pd != NULL && uin->pd->pc != uin->pc)
-         || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
-         pdfdoc_changed_error(L);
--    links = ((Page *) uin->d)->getLinks((Catalog *) ucat->d);
-+    links = ((Page *) uin->d)->getLinks();
-     if (links != NULL) {
-         uout = new_Links_userdata(L);
-         uout->d = links;
-@@ -2531,7 +2531,6 @@ m_poppler_get_INT(XRef, getNumObjects);
- m_poppler_get_INT(XRef, getRootNum);
- m_poppler_get_INT(XRef, getRootGen);
- // getStreamEnd
--m_poppler_get_INT(XRef, getSize);
- // getEntry
- m_poppler_get_poppler(XRef, Object, getTrailerDict);
- 
-@@ -2558,7 +2557,6 @@ static const struct luaL_Reg XRef_m[] =
-     {"getRootNum", m_XRef_getRootNum},
-     {"getRootGen", m_XRef_getRootGen},
-     //
--    {"getSize", m_XRef_getSize},
-     {"getTrailerDict", m_XRef_getTrailerDict},
-     {"__tostring", m_XRef__tostring},
-     {NULL, NULL}                // sentinel
diff --git a/dev-tex/luatex/files/poppler022.patch b/dev-tex/luatex/files/poppler022.patch
deleted file mode 100644
index 75d07b751893..000000000000
--- a/dev-tex/luatex/files/poppler022.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-Patch updating lepdflib.cc to upstream revision 4415, which basically removes 
-part of the exported interface and thereby circumvents the changes in 
-poppler-0.20 -> 0.22. Experimental, rebased on our existing Gentoo patches 
-poppler-0.18.patch and poppler-0.20.patch. Here to solve bug 449538.
-
-diff -ruN luatex-beta-0.70.1.gentoo/source/texk/web2c/luatexdir/lua/lepdflib.cc 
-luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc
---- a/texk/web2c/luatexdir/lua/lepdflib.cc	2013-03-10 13:31:22.000000000 +0100
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc	2013-03-10 13:47:24.000000000 +0100
-@@ -1,7 +1,7 @@
- /* lepdflib.cc
- 
--   Copyright 2009-2011 Taco Hoekwater <taco@luatex.org>
--   Copyright 2009-2011 Hartmut Henkel <hartmut@luatex.org>
-+   Copyright 2009-2012 Taco Hoekwater <taco@luatex.org>
-+   Copyright 2009-2012 Hartmut Henkel <hartmut@luatex.org>
- 
-    This file is part of LuaTeX.
- 
-@@ -49,15 +49,13 @@
- //**********************************************************************
- 
- #define M_Annot            "Annot"
--#define M_AnnotBorder      "AnnotBorder"
--#define M_AnnotBorderStyle "AnnotBorderStyle"
- #define M_Annots           "Annots"
- #define M_Array            "Array"
- #define M_Catalog          "Catalog"
--#define M_EmbFile          "EmbFile"
- #define M_Dict             "Dict"
- #define M_GooString        "GooString"
- #define M_LinkDest         "LinkDest"
-+#define M_Link             "Link"
- #define M_Links            "Links"
- #define M_Object           "Object"
- #define M_Page             "Page"
-@@ -65,8 +63,8 @@
- #define M_PDFRectangle     "PDFRectangle"
- #define M_Ref              "Ref"
- #define M_Stream           "Stream"
--#define M_XRef             "XRef"
- #define M_XRefEntry        "XRefEntry"
-+#define M_XRef             "XRef"
- 
- //**********************************************************************
- 
-@@ -84,13 +82,9 @@
- new_poppler_userdata(PDFDoc);
- 
- new_poppler_userdata(Annot);
--new_poppler_userdata(AnnotBorder);
--//new_poppler_userdata(AnnotBorderStyle);
--new_poppler_userdata(Annots);
- new_poppler_userdata(Array);
- new_poppler_userdata(Catalog);
- new_poppler_userdata(Dict);
--//new_poppler_userdata(GooString);
- new_poppler_userdata(LinkDest);
- new_poppler_userdata(Links);
- new_poppler_userdata(Object);
-@@ -99,7 +93,6 @@
- new_poppler_userdata(Ref);
- new_poppler_userdata(Stream);
- new_poppler_userdata(XRef);
--//new_poppler_userdata(XRefEntry);
- 
- //**********************************************************************
- 
-@@ -134,53 +127,6 @@
-     return 1;                   // doc path
- }
- 
--static int l_new_Annot(lua_State * L)
--{
--    udstruct *uxref, *udict, *ucatalog, *uref, *uout;
--    uxref = (udstruct *) luaL_checkudata(L, 1, M_XRef);
--    udict = (udstruct *) luaL_checkudata(L, 2, M_Dict);
--    ucatalog = (udstruct *) luaL_checkudata(L, 3, M_Catalog);
--    uref = (udstruct *) luaL_checkudata(L, 4, M_Ref);
--    if (uxref->pd != ucatalog->pd || uxref->pd != udict->pd
--        || uxref->pd != uref->pd)
--        pdfdoc_differs_error(L);
--    if ((uxref->pd != NULL && uxref->pd->pc != uxref->pc) ||
--        (ucatalog->pd != NULL && ucatalog->pd->pc != ucatalog->pc) ||
--        (udict->pd != NULL && udict->pd->pc != udict->pc) ||
--        (uref->pd != NULL && uref->pd->pc != uref->pc))
--        pdfdoc_changed_error(L);
--    uout = new_Annot_userdata(L);
--    uout->d =
--        new Annot(udict->pd->doc, (Dict *) udict->d,
--                  (Object *) uref->d);
--    uout->atype = ALLOC_LEPDF;
--    uout->pc = uxref->pc;
--    uout->pd = uxref->pd;
--    return 1;
--}
--
--static int l_new_Annots(lua_State * L)
--{
--    udstruct *uxref, *ucatalog, *uannotsobj, *uout;
--    uxref = (udstruct *) luaL_checkudata(L, 1, M_XRef);
--    ucatalog = (udstruct *) luaL_checkudata(L, 2, M_Catalog);
--    uannotsobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
--    if (uxref->pd != ucatalog->pd || uxref->pd != uannotsobj->pd)
--        pdfdoc_differs_error(L);
--    if ((uxref->pd != NULL && uxref->pd->pc != uxref->pc)
--        || (ucatalog->pd != NULL && ucatalog->pd->pc != ucatalog->pc)
--        || (uannotsobj->pd != NULL && uannotsobj->pd->pc != uannotsobj->pc))
--        pdfdoc_changed_error(L);
--    uout = new_Annots_userdata(L);
--    uout->d =
--        new Annots(uannotsobj->pd->doc,
--                   (Object *) uannotsobj->d);
--    uout->atype = ALLOC_LEPDF;
--    uout->pc = uxref->pc;
--    uout->pd = uxref->pd;
--    return 1;
--}
--
- static int l_new_Array(lua_State * L)
- {
-     udstruct *uxref, *uout;
-@@ -235,8 +181,6 @@
- 
- static const struct luaL_Reg epdflib[] = {
-     {"open", l_open_PDFDoc},
--    {"Annot", l_new_Annot},
--    {"Annots", l_new_Annots},
-     {"Array", l_new_Array},
-     {"Dict", l_new_Dict},
-     {"Object", l_new_Object},
-@@ -359,12 +303,26 @@
-     return 1;                                                  \
- }
- 
-+#define m_poppler_check_string(in, function)                   \
-+static int m_##in##_##function(lua_State * L)                  \
-+{                                                              \
-+    const char *s;                                             \
-+    udstruct *uin;                                             \
-+    uin = (udstruct *) luaL_checkudata(L, 1, M_##in);          \
-+    if (uin->pd != NULL && uin->pd->pc != uin->pc)             \
-+        pdfdoc_changed_error(L);                               \
-+    s = luaL_checkstring(L, 2);                                \
-+    if (((in *) uin->d)->function((char *) s))                 \
-+        lua_pushboolean(L, 1);                                 \
-+    else                                                       \
-+        lua_pushboolean(L, 0);                                 \
-+    return 1;                                                  \
-+}
-+
- //**********************************************************************
- // Annot
- 
- m_poppler_get_BOOL(Annot, isOk);
--m_poppler_get_OBJECT(Annot, getAppearanceResDict);
--m_poppler_get_poppler(Annot, AnnotBorder, getBorder);
- 
- static int m_Annot_match(lua_State * L)
- {
-@@ -398,8 +356,6 @@
- 
- static const struct luaL_Reg Annot_m[] = {
-     {"isOk", m_Annot_isOk},
--    {"getAppearanceResDict", m_Annot_getAppearanceResDict},
--    {"getBorder", m_Annot_getBorder},
-     {"match", m_Annot_match},
-     {"__tostring", m_Annot__tostring},
-     {"__gc", m_Annot__gc},
-@@ -654,6 +610,7 @@
- 
- m_poppler_get_poppler(Catalog, Object, getDests);
- m_poppler_get_INT(Catalog, numEmbeddedFiles);
-+
- m_poppler_get_INT(Catalog, numJS);
- 
- static int m_Catalog_getJS(lua_State * L)
-@@ -770,20 +727,7 @@
-     return 0;
- }
- 
--static int m_Dict_is(lua_State * L)
--{
--    const char *s;
--    udstruct *uin;
--    uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
--    if (uin->pd != NULL && uin->pd->pc != uin->pc)
--        pdfdoc_changed_error(L);
--    s = luaL_checkstring(L, 2);
--    if (((Dict *) uin->d)->is((char *) s))
--        lua_pushboolean(L, 1);
--    else
--        lua_pushboolean(L, 0);
--    return 1;
--}
-+m_poppler_check_string(Dict, is);
- 
- static int m_Dict_lookup(lua_State * L)
- {
-@@ -894,6 +838,8 @@
-     return 1;
- }
- 
-+m_poppler_check_string(Dict, hasKey);
-+
- m_poppler__tostring(Dict);
- 
- static const struct luaL_Reg Dict_m[] = {
-@@ -910,6 +856,7 @@
-     {"getKey", m_Dict_getKey},
-     {"getVal", m_Dict_getVal},
-     {"getValNF", m_Dict_getValNF},
-+    {"hasKey", m_Dict_hasKey},
-     {"__tostring", m_Dict__tostring},
-     {NULL, NULL}                // sentinel
- };
-@@ -1017,9 +964,13 @@
- //**********************************************************************
- // Links
- 
-+m_poppler_get_INT(Links, getNumLinks);
-+
- m_poppler__tostring(Links);
- 
- static const struct luaL_Reg Links_m[] = {
-+    {"getNumLinks", m_Links_getNumLinks},
-+    //{"getLink", m_Links_getLink},
-     {"__tostring", m_Links__tostring},
-     {NULL, NULL}                // sentinel
- };
-@@ -1925,28 +1876,6 @@
- m_poppler_get_poppler(Page, Dict, getResourceDict);
- m_poppler_get_OBJECT(Page, getAnnots);
- 
--static int m_Page_getLinks(lua_State * L)
--{
--    Links *links;
--    udstruct *uin, *ucat, *uout;
--    uin = (udstruct *) luaL_checkudata(L, 1, M_Page);
--    ucat = (udstruct *) luaL_checkudata(L, 2, M_Catalog);
--    if (uin->pd != NULL && ucat->pd != NULL && uin->pd != ucat->pd)
--        pdfdoc_differs_error(L);
--    if ((uin->pd != NULL && uin->pd->pc != uin->pc)
--        || (ucat->pd != NULL && ucat->pd->pc != ucat->pd->pc))
--        pdfdoc_changed_error(L);
--    links = ((Page *) uin->d)->getLinks();
--    if (links != NULL) {
--        uout = new_Links_userdata(L);
--        uout->d = links;
--        uout->pc = uin->pc;
--        uout->pd = uin->pd;
--    } else
--        lua_pushnil(L);
--    return 1;
--}
--
- m_poppler_get_OBJECT(Page, getContents);
- 
- m_poppler__tostring(Page);
-@@ -1973,7 +1902,6 @@
-     {"getSeparationInfo", m_Page_getSeparationInfo},
-     {"getResourceDict", m_Page_getResourceDict},
-     {"getAnnots", m_Page_getAnnots},
--    {"getLinks", m_Page_getLinks},
-     {"getContents", m_Page_getContents},
-     {"__tostring", m_Page__tostring},
-     {NULL, NULL}                // sentinel
-@@ -2158,19 +2086,23 @@
- 
- static int m_PDFDoc_getLinks(lua_State * L)
- {
--    int i;
-+    int i, pages;
-     Links *links;
-     udstruct *uin, *uout;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
-     i = luaL_checkint(L, 2);
--    links = ((PdfDocument *) uin->d)->doc->getLinks(i);
--    if (links != NULL) {
--        uout = new_Links_userdata(L);
--        uout->d = links;
--        uout->pc = uin->pc;
--        uout->pd = uin->pd;
-+    pages = ((PdfDocument *) uin->d)->doc->getNumPages();
-+    if (i > 0 && i <= pages) {
-+        links = ((PdfDocument *) uin->d)->doc->getLinks(i);
-+        if (links != NULL) {
-+            uout = new_Links_userdata(L);
-+            uout->d = links;
-+            uout->pc = uin->pc;
-+            uout->pd = uin->pd;
-+        } else
-+            lua_pushnil(L);
-     } else
-         lua_pushnil(L);
-     return 1;
-@@ -2249,6 +2181,8 @@
- m_PDFDoc_INT(getPDFMajorVersion);
- m_PDFDoc_INT(getPDFMinorVersion);
- 
-+m_poppler__tostring(PDFDoc);
-+
- static int m_PDFDoc__gc(lua_State * L)
- {
-     udstruct *uin;
-@@ -2292,6 +2226,7 @@
-     {"getDocInfoNF", m_PDFDoc_getDocInfoNF},
-     {"getPDFMajorVersion", m_PDFDoc_getPDFMajorVersion},
-     {"getPDFMinorVersion", m_PDFDoc_getPDFMinorVersion},
-+    {"__tostring", m_PDFDoc__tostring},
-     {"__gc", m_PDFDoc__gc},     // finalizer
-     {NULL, NULL}                // sentinel
- };
-@@ -2437,11 +2372,6 @@
-     "Flate", "JBIG2", "JPX", "Weird", NULL
- };
- 
--#if 0
--static const char *StreamColorSpaceModeNames[] =
--    { "CSNone", "CSDeviceGray", "CSDeviceRGB", "CSDeviceCMYK", NULL };
--#endif
--
- m_poppler_get_INT(Stream, getKind);
- 
- static int m_Stream_getKindName(lua_State * L)
-@@ -2527,11 +2457,26 @@
- m_poppler_get_OBJECT(XRef, getDocInfo);
- m_poppler_get_OBJECT(XRef, getDocInfoNF);
- m_poppler_get_INT(XRef, getNumObjects);
--// getLastXRefPos
- m_poppler_get_INT(XRef, getRootNum);
- m_poppler_get_INT(XRef, getRootGen);
- // getStreamEnd
--// getEntry
-+
-+static int m_XRef_getNumEntry(lua_State * L)
-+{
-+    int i, offset;
-+    udstruct *uin;
-+    uin = (udstruct *) luaL_checkudata(L, 1, M_XRef);
-+    if (uin->pd != NULL && uin->pd->pc != uin->pc)
-+        pdfdoc_changed_error(L);
-+    offset = luaL_checkint(L, 2);
-+    i = ((XRef *) uin->d)->getNumEntry(offset);
-+    if (i >= 0)
-+        lua_pushinteger(L, i);
-+    else
-+        lua_pushnil(L);
-+    return 1;
-+}
-+
- m_poppler_get_poppler(XRef, Object, getTrailerDict);
- 
- m_poppler__tostring(XRef);
-@@ -2553,10 +2498,10 @@
-     {"getDocInfo", m_XRef_getDocInfo},
-     {"getDocInfoNF", m_XRef_getDocInfoNF},
-     {"getNumObjects", m_XRef_getNumObjects},
--    //
-     {"getRootNum", m_XRef_getRootNum},
-     {"getRootGen", m_XRef_getRootGen},
--    //
-+    // {"getStreamEnd", m_XRef_getStreamEnd},
-+    {"getNumEntry", m_XRef_getNumEntry},
-     {"getTrailerDict", m_XRef_getTrailerDict},
-     {"__tostring", m_XRef__tostring},
-     {NULL, NULL}                // sentinel
-@@ -2565,7 +2510,10 @@
- //**********************************************************************
- // XRefEntry
- 
-+m_poppler__tostring(XRefEntry);
-+
- static const struct luaL_Reg XRefEntry_m[] = {
-+    {"__tostring", m_XRefEntry__tostring},
-     {NULL, NULL}                // sentinel
- };
- 
-@@ -2582,7 +2530,6 @@
- int luaopen_epdf(lua_State * L)
- {
-     register_meta(Annot);
--    // TODO register_meta(AnnotBorder);
-     register_meta(Annots);
-     register_meta(Array);
-     register_meta(Catalog);
diff --git a/dev-tex/luatex/files/poppler026-backport.patch b/dev-tex/luatex/files/poppler026-backport.patch
deleted file mode 100644
index a32d3e961204..000000000000
--- a/dev-tex/luatex/files/poppler026-backport.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h
---- a/texk/web2c/luatexdir/image/epdf.h	2011-05-19 07:38:37.000000000 +0200
-+++ b/texk/web2c/luatexdir/image/epdf.h	2014-10-11 12:17:00.028331243 +0200
-@@ -33,6 +33,7 @@
- #  include <sys/stat.h>
- #  include <dirent.h>
- #  include <poppler-config.h>
-+#  include <StructTreeRoot.h>
- #  include <goo/GooString.h>
- #  include <goo/gmem.h>
- #  include <goo/gfile.h>
-diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc
---- a/texk/web2c/luatexdir/lua/lepdflib.cc	2014-10-11 12:24:52.509357663 +0200
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc	2014-10-11 12:42:03.665415321 +0200
-@@ -48,23 +48,24 @@
- 
- //**********************************************************************
- 
--#define M_Annot            "Annot"
--#define M_Annots           "Annots"
--#define M_Array            "Array"
--#define M_Catalog          "Catalog"
--#define M_Dict             "Dict"
--#define M_GooString        "GooString"
--#define M_LinkDest         "LinkDest"
--#define M_Link             "Link"
--#define M_Links            "Links"
--#define M_Object           "Object"
--#define M_Page             "Page"
--#define M_PDFDoc           "PDFDoc"
--#define M_PDFRectangle     "PDFRectangle"
--#define M_Ref              "Ref"
--#define M_Stream           "Stream"
--#define M_XRefEntry        "XRefEntry"
--#define M_XRef             "XRef"
-+#define M_Annot            "epdf.Annot" /* ls-hh: epdf.* gives better protection in registry */
-+#define M_Annots           "epdf.Annots"
-+#define M_Array            "epdf.Array"
-+#define M_Catalog          "epdf.Catalog"
-+#define M_Dict             "epdf.Dict"
-+#define M_GooString        "epdf.GooString"
-+#define M_LinkDest         "epdf.LinkDest"
-+#define M_Link             "epdf.Link"
-+#define M_Links            "epdf.Links"
-+#define M_Object           "epdf.Object"
-+#define M_Page             "epdf.Page"
-+#define M_PDFDoc           "epdf.PDFDoc"
-+#define M_PDFRectangle     "epdf.PDFRectangle"
-+#define M_Ref              "epdf.Ref"
-+#define M_Stream           "epdf.Stream"
-+#define M_StructTreeRoot   "epdf.StructTreeRoot"
-+#define M_XRef             "epdf.XRef"
-+#define M_XRefEntry        "epdf.XRefEntry"
- 
- //**********************************************************************
- 
-@@ -92,6 +93,7 @@
- new_poppler_userdata(PDFRectangle);
- new_poppler_userdata(Ref);
- new_poppler_userdata(Stream);
-+new_poppler_userdata(StructTreeRoot);
- new_poppler_userdata(XRef);
- 
- //**********************************************************************
-@@ -565,7 +567,11 @@
- 
- m_poppler_get_GOOSTRING(Catalog, getBaseURI);
- m_poppler_get_GOOSTRING(Catalog, readMetadata);
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
-+#else
-+m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
-+#endif
- 
- static int m_Catalog_findPage(lua_State * L)
- {
-@@ -2048,14 +2054,22 @@
- 
- static int m_PDFDoc_getStructTreeRoot(lua_State * L)
- {
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
-     Object *obj;
-+#else
-+    StructTreeRoot *obj;
-+#endif
-     udstruct *uin, *uout;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
-     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
-         obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
-         uout = new_Object_userdata(L);
-+#else
-+        uout = new_StructTreeRoot_userdata(L);
-+#endif
-         uout->d = obj;
-         uout->pc = uin->pc;
-         uout->pd = uin->pd;
diff --git a/dev-tex/luatex/files/poppler026.patch b/dev-tex/luatex/files/poppler026.patch
deleted file mode 100644
index c09ff05e1092..000000000000
--- a/dev-tex/luatex/files/poppler026.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Source: NetBSD CVS
-http://mail-index.netbsd.org/pkgsrc-bugs/2014/04/29/msg053974.html
-http://cvsweb.de.netbsd.org/cgi-bin/cvsweb.cgi/pkgsrc/print/luatex/patches/
-
-
-diff -ruN luatex-beta-0.76.0.orig/source/texk/web2c/luatexdir/image/epdf.h luatex-beta-0.76.0/source/texk/web2c/luatexdir/image/epdf.h
---- a/texk/web2c/luatexdir/image/epdf.h	2013-04-05 12:58:37.000000000 +0200
-+++ b/texk/web2c/luatexdir/image/epdf.h	2014-05-01 01:39:39.838462783 +0200
-@@ -37,6 +37,7 @@
- #  include <sys/stat.h>
- #  include <dirent.h>
- #  include <poppler-config.h>
-+#  include <StructTreeRoot.h>
- #  include <goo/GooString.h>
- #  include <goo/gmem.h>
- #  include <goo/gfile.h>
-diff -ruN luatex-beta-0.76.0.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc luatex-beta-0.76.0/source/texk/web2c/luatexdir/lua/lepdflib.cc
---- a/texk/web2c/luatexdir/lua/lepdflib.cc	2013-04-05 12:58:37.000000000 +0200
-+++ b/texk/web2c/luatexdir/lua/lepdflib.cc	2014-05-01 01:40:15.698461067 +0200
-@@ -48,25 +48,26 @@
- 
- //**********************************************************************
- 
--#define M_Annot            "Annot"
--#define M_Annots           "Annots"
--#define M_Array            "Array"
--#define M_Catalog          "Catalog"
--#define M_Dict             "Dict"
--#define M_EmbFile          "EmbFile"
--#define M_FileSpec         "FileSpec"
--#define M_GooString        "GooString"
--#define M_LinkDest         "LinkDest"
--#define M_Link             "Link"
--#define M_Links            "Links"
--#define M_Object           "Object"
--#define M_Page             "Page"
--#define M_PDFDoc           "PDFDoc"
--#define M_PDFRectangle     "PDFRectangle"
--#define M_Ref              "Ref"
--#define M_Stream           "Stream"
--#define M_XRefEntry        "XRefEntry"
--#define M_XRef             "XRef"
-+#define M_Annot            "epdf.Annot" /* ls-hh: epdf.* gives better protection in registry */
-+#define M_Annots           "epdf.Annots"
-+#define M_Array            "epdf.Array"
-+#define M_Catalog          "epdf.Catalog"
-+#define M_Dict             "epdf.Dict"
-+#define M_EmbFile          "epdf.EmbFile"
-+#define M_FileSpec         "epdf.FileSpec"
-+#define M_GooString        "epdf.GooString"
-+#define M_LinkDest         "epdf.LinkDest"
-+#define M_Link             "epdf.Link"
-+#define M_Links            "epdf.Links"
-+#define M_Object           "epdf.Object"
-+#define M_Page             "epdf.Page"
-+#define M_PDFDoc           "epdf.PDFDoc"
-+#define M_PDFRectangle     "epdf.PDFRectangle"
-+#define M_Ref              "epdf.Ref"
-+#define M_Stream           "epdf.Stream"
-+#define M_StructTreeRoot   "epdf.StructTreeRoot"
-+#define M_XRefEntry        "epdf.XRefEntry"
-+#define M_XRef             "epdf.XRef"
- 
- //**********************************************************************
- 
-@@ -96,6 +97,7 @@
- new_poppler_userdata(PDFRectangle);
- new_poppler_userdata(Ref);
- new_poppler_userdata(Stream);
-+new_poppler_userdata(StructTreeRoot);
- new_poppler_userdata(XRef);
- 
- //**********************************************************************
-@@ -573,7 +575,11 @@
- 
- m_poppler_get_GOOSTRING(Catalog, getBaseURI);
- m_poppler_get_GOOSTRING(Catalog, readMetadata);
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
- m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
-+#else
-+m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
-+#endif
- 
- static int m_Catalog_findPage(lua_State * L)
- {
-@@ -2146,14 +2152,22 @@
- 
- static int m_PDFDoc_getStructTreeRoot(lua_State * L)
- {
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
-     Object *obj;
-+#else
-+    StructTreeRoot *obj;
-+#endif
-     udstruct *uin, *uout;
-     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
-     if (uin->pd != NULL && uin->pd->pc != uin->pc)
-         pdfdoc_changed_error(L);
-     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
-         obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
-+#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
-         uout = new_Object_userdata(L);
-+#else
-+        uout = new_StructTreeRoot_userdata(L);
-+#endif
-         uout->d = obj;
-         uout->pc = uin->pc;
-         uout->pd = uin->pd;
-@@ -2617,6 +2631,15 @@
- 
- //**********************************************************************
- 
-+#ifdef LuajitTeX
-+#define setfuncs_meta(type)                 \
-+    luaL_newmetatable(L, M_##type);         \
-+    lua_pushvalue(L, -1);                   \
-+    lua_setfield(L, -2, "__index");         \
-+    lua_pushstring(L, "no user access");    \
-+    lua_setfield(L, -2, "__metatable");     \
-+    luaL_register(L, NULL, type##_m)
-+#else
- #define setfuncs_meta(type)                 \
-     luaL_newmetatable(L, M_##type);         \
-     lua_pushvalue(L, -1);                   \
-@@ -2624,6 +2647,7 @@
-     lua_pushstring(L, "no user access");    \
-     lua_setfield(L, -2, "__metatable");     \
-     luaL_setfuncs(L, type##_m, 0)
-+#endif
- 
- int luaopen_epdf(lua_State * L)
- {
-@@ -2646,6 +2670,10 @@
-     setfuncs_meta(XRef);
-     setfuncs_meta(XRefEntry);
- 
-+#ifdef LuajitTeX
-+    luaL_register(L, "epdf", epdflib_f);
-+#else
-     luaL_newlib(L, epdflib_f);
-+#endif
-     return 1;
- }
diff --git a/dev-tex/luatex/files/remove-zlib-version-check.patch b/dev-tex/luatex/files/remove-zlib-version-check.patch
deleted file mode 100644
index f3f21a595a09..000000000000
--- a/dev-tex/luatex/files/remove-zlib-version-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Let soname dictate the ABI and do not check for minor/micro which requires
-needless rebuilds after every zlib update. By Ulrich Müller.
-
-https://bugs.gentoo.org/show_bug.cgi?id=310487
-http://www.ntg.nl/pipermail/dev-luatex/2012-July/004534.html
-
---- a/texk/web2c/luatexdir/luazlib/lzlib.c
-+++ b/texk/web2c/luatexdir/luazlib/lzlib.c
-@@ -549,14 +549,6 @@
- 
-     /* ====================================================================== */
- 
--    /* make sure header and library version are consistent */
--    const char* version = zlibVersion();
--    if (strncmp(version, ZLIB_VERSION, 5))
--    {
--        lua_pushfstring(L, "zlib library version does not match - header: %s, library: %s", ZLIB_VERSION, version);
--        lua_error(L);
--    }
--
-     /* create new metatable for zlib compression structures */
-     luaL_newmetatable(L, ZSTREAMMETA);
-     lua_pushliteral(L, "__index");
diff --git a/dev-tex/luatex/luatex-0.70.1-r3.ebuild b/dev-tex/luatex/luatex-0.70.1-r3.ebuild
deleted file mode 100644
index b06166bb98e8..000000000000
--- a/dev-tex/luatex/luatex-0.70.1-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool texlive-common
-
-DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language"
-HOMEPAGE="http://www.luatex.org/"
-SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/392/1730/${PN}-beta-${PV}.tar.bz2
-	http://foundry.supelec.fr/gf/download/frsrelease/392/1732/${PN}-beta-${PV}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-libs/zziplib
-	>=media-libs/libpng-1.4
-	app-text/poppler:=[xpdf-headers(+)]
-	sys-libs/zlib:*
-	>=dev-libs/kpathsea-6.0.1_p20110627"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-beta-${PV}/source"
-PRELIBS="libs/obsdcompat"
-#texk/kpathsea"
-#kpathsea_extraconf="--disable-shared --disable-largefile"
-
-src_prepare() {
-	default
-	has_version '>=app-text/poppler-0.18.0:0' && eapply "${FILESDIR}/poppler018.patch"
-	has_version '>=app-text/poppler-0.20.0:0' && eapply "${FILESDIR}/poppler020.patch"
-	has_version '>=app-text/poppler-0.22.0:0' && eapply "${FILESDIR}/poppler022.patch"
-	has_version '>=app-text/poppler-0.26.0:0' && eapply "${FILESDIR}/poppler026-backport.patch"
-	has_version '>=app-text/poppler-0.57.0:0' && append-cxxflags -std=c++11 # bug 627538
-	eapply "${FILESDIR}/kpathsea2012.patch" \
-		"${FILESDIR}/remove-zlib-version-check.patch"
-	S="${S}/build-aux" elibtoolize --shallow
-}
-
-src_configure() {
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #244619
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	local myconf
-	myconf=""
-	#has_version '>=app-text/texlive-core-2009' && myconf="--with-system-kpathsea"
-
-	cd "${S}/texk/web2c" || die
-	econf \
-		--disable-cxx-runtime-hack \
-		--disable-all-pkgs	\
-		--disable-mp		\
-		--disable-ptex		\
-		--disable-tex		\
-		--disable-mf		\
-	    --disable-largefile \
-		--disable-ipc		\
-		--disable-shared	\
-		--enable-luatex		\
-		--enable-dump-share	\
-		--without-mf-x-toolkit \
-		--without-x			\
-	    --with-system-kpathsea	\
-	    --with-kpathsea-includes="${EPREFIX}"/usr/include \
-	    --with-system-gd	\
-	    --with-system-libpng	\
-	    --with-system-teckit \
-	    --with-system-zlib \
-	    --with-system-t1lib \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-zziplib \
-	    --disable-multiplatform
-
-	for i in ${PRELIBS} ; do
-		einfo "Configuring $i"
-		local j=$(basename $i)_extraconf
-		local myconf
-		eval myconf=\${$j}
-		cd "${S}/${i}" || die
-		econf ${myconf}
-	done
-}
-
-src_compile() {
-	texk/web2c/luatexdir/getluatexsvnversion.sh || die
-	for i in ${PRELIBS} ; do
-		cd "${S}/${i}" || die
-		emake
-	done
-	cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c" || die
-	emake luatex
-}
-
-src_install() {
-	cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c" || die
-	emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
-		install-exec-am
-
-	dodoc "${WORKDIR}/${PN}-beta-${PV}/README"
-	doman "${WORKDIR}/texmf/doc/man/man1/"*.1
-	if use doc ; then
-		dodoc "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf
-		dodoc "${WORKDIR}/texmf/doc/man/man1/"*.pdf
-	fi
-}
-
-pkg_postinst() {
-	if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
-		elog "Note that this package does not install many files, mainly just the"
-		elog "${PN} executable, which needs other files in order to be"
-		elog "useful. Please consider installing a recent TeX distribution such as"
-		elog "TeX Live 2008 or later to take advantage of the full power of"
-		elog "${PN} ."
-	fi
-	efmtutil-sys
-}
diff --git a/dev-tex/luatex/luatex-0.76.0-r1.ebuild b/dev-tex/luatex/luatex-0.76.0-r1.ebuild
deleted file mode 100644
index cb38d3df2dea..000000000000
--- a/dev-tex/luatex/luatex-0.76.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool flag-o-matic texlive-common
-
-MY_P=${PN}-beta-${PV}
-DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language"
-HOMEPAGE="http://www.luatex.org/"
-SRC_URI="
-	http://foundry.supelec.fr/frs/download.php/file/15745/${MY_P}-source.tar.bz2
-	http://foundry.supelec.fr/frs/download.php/file/15747/${MY_P}-doc.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-libs/zziplib
-	>=media-libs/libpng-1.4:0=
-	>=x11-libs/cairo-1.12
-	>x11-libs/pixman-0.18
-	app-text/poppler:=[xpdf-headers(+)]
-	sys-libs/zlib:*
-	>=dev-libs/kpathsea-6.1.0_p20120701"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}/source"
-
-src_prepare() {
-	default
-	has_version '>=app-text/poppler-0.26.0:0' && eapply "${FILESDIR}/poppler026.patch"
-	has_version '>=app-text/poppler-0.57.0:0' && append-cxxflags -std=c++11 # bug 627538
-	eapply "${FILESDIR}/remove-zlib-version-check.patch" \
-		"${FILESDIR}/includes.patch"
-	S="${S}/build-aux" elibtoolize --shallow
-}
-
-src_configure() {
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #244619
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-
-	cd "${S}/texk/web2c" || die
-	econf \
-		--disable-cxx-runtime-hack \
-		--disable-all-pkgs	\
-		--disable-mp		\
-		--disable-ptex		\
-		--disable-tex		\
-		--disable-mf		\
-	    --disable-largefile \
-		--disable-ipc		\
-		--disable-shared	\
-		--enable-luatex		\
-		--enable-dump-share	\
-		--without-mf-x-toolkit \
-		--without-x			\
-	    --with-system-kpathsea	\
-	    --with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-cairo \
-		--with-system-pixman \
-	    --with-system-gd	\
-	    --with-system-libpng	\
-	    --with-system-teckit \
-	    --with-system-zlib \
-	    --with-system-t1lib \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-zziplib \
-		--with-system-ptexenc \
-	    --disable-multiplatform
-}
-
-src_compile() {
-	texk/web2c/luatexdir/getluatexsvnversion.sh || die
-	cd "${WORKDIR}/${MY_P}/source/texk/web2c" || die
-	emake luatex
-}
-
-src_install() {
-	cd "${WORKDIR}/${MY_P}/source/texk/web2c" || die
-	emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
-		install-exec-am
-
-	dodoc "${WORKDIR}/${MY_P}/README" luatexdir/NEWS
-	cp source/texk/web2c/man || die
-	cp man/luatex.man "${T}/luatex.1" || die
-	doman "${T}/luatex.1"
-	use doc && dodoc "${WORKDIR}/${MY_P}/manual/"*.pdf
-}
-
-pkg_postinst() {
-	if ! has_version '>=dev-texlive/texlive-basic-2008' ; then
-		elog "Note that this package does not install many files, mainly just the"
-		elog "${PN} executable, which needs other files in order to be"
-		elog "useful. Please consider installing a recent TeX distribution such as"
-		elog "TeX Live 2008 or later to take advantage of the full power of"
-		elog "${PN} ."
-	fi
-	efmtutil-sys
-}
diff --git a/dev-tex/luatex/metadata.xml b/dev-tex/luatex/metadata.xml
deleted file mode 100644
index c4cc7073d3f4..000000000000
--- a/dev-tex/luatex/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="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-<longdescription lang="en">
-An experimental pdfTeX extension that is to eventually
-become its successor. It is developed by a subset of the
-current pdfTeX team.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-tex/minted/Manifest b/dev-tex/minted/Manifest
deleted file mode 100644
index 3f99f32a084c..000000000000
--- a/dev-tex/minted/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX minted-2.1-remove-extra-curly-brace.patch 2452 BLAKE2B 5ac0570847318d8d6555d7b5edb85c16ac6671c661038059256cdda6d25d16113d1c129d7688b15def306e288e5b338ff91faf2bf1af6fd3adf38de6183e13c1 SHA512 c717dde0a33a2f793dba97ca96d8f836400bee89bc94ab874640b4f4812c72549828b9a1bf4c6a89513bcedc2d83f6eb4b3abdfc7473d0127716aa1ff7fd3050
-DIST minted-2.0.tar.gz 1039735 BLAKE2B d9d11762b9a1dc198f01ddf1e8b1f6f9bd955d80de8f224b298b541d4016749b9c6348ebe4626e292ad3b3ed00e25daa63d120f0356a20e044cd1f0db6110d82 SHA512 1e874a865da24d9d890d68f9a7d7fed710746993534903cd04a518e3d65003f65efca47c4cd563bda70b3eb1356e609f5e662a0d762248c7b722b8c5aebda6de
-DIST minted-2.1.tar.gz 1104993 BLAKE2B 697ec2a8e324c88f4da13b55cb8650e06ca0cbf87ebf7bcb393c8763968bac1f15ae52b1b18febf1d19043a0829af850378d4a1f4c81a67af736f9563e313f9c SHA512 692098ccfe2337b97658f7eb517782f0dddb33ec5031648fe2ce9a53524690257cc1a5ce5697280711aee8007f16678ca4a945d62b45910fb4f5e8ca9fdc5ec7
-DIST minted-2.4.1.tar.gz 858803 BLAKE2B f1945376a18148b40645fcc695721e2c15a6f05ef522c644ed1ace9f3e251c35c98b458162d1a8c8bf0cd26ccd0ef4678e6e7fbf63296d9e1ae7c39079c219fe SHA512 a8edf099eae7eef3d7d4322b1473809b69bee204509adc15e328222b769293ba19e9913b5b5df86d1a2eabbb93c69b585d020569a2850bd059061a1ef220d52f
-EBUILD minted-2.0.ebuild 630 BLAKE2B 92e72e9302abb8d1fcdd845e55f71416bd65b447f5b2b2a315fec79604f529b34ad1158980bcb8629c4bf5a760653b87e75269cc428a92f1791237911f81fd4d SHA512 a2821172b97a40f6e7d01f641227c3938217baf6e7dc97445c0afa81a279272365f2c2667e605d6bda007232d403d73aad9ed5a0b7e280dcd2c0ada7f1300547
-EBUILD minted-2.1.ebuild 720 BLAKE2B bc8ff098e41ede2d9ac33d2962a8f932be195c85124264eb18ab0bbaccd9b1e11231112ea87d1cce408278509a530f02070106fb9c9fe209d1fd97e0a0bb342c SHA512 4e7dd1ad3f65070910eaf0e73cbfcee903a9138d54bec378bef2360a0e16cde7ca942fe20c4657b7ea79ddee2c55f38bd1fe1a98d7f46ff938d4b8deab1c466e
-EBUILD minted-2.4.1.ebuild 648 BLAKE2B 723e38ddd7ad0af284957d791db39effe58df0dc3bdef0cf6b2a51f7f10ed3dd5c342831b39105f28417643a497df0d1e84e74843685a2010906637b06a7453c SHA512 8eba1b3bc5fe22c1a53365b3a4406a723ec752c4099f19af21d2e73218398626de0de6c72e93eceed7b981d4983b708591aeeff2615c5b3157a7c55c7cdd582c
-MISC metadata.xml 301 BLAKE2B a4ff6315480aad0a2e6fd43fb9bef26cdd04ecfedb49ccafa558df2aeb624f85912844fc5771e7d31196c69e03d94843d7a7a1a14e8ae65d3d99baa463629882 SHA512 6499d03b19ab4838ad73b1ee62c4e77c0ad7665ce41da7541e6a4ca723ec5bef69c41a93756fff959aad5d747a3bc6bd66f0bff410d463a6e524f38d0b3f3799
diff --git a/dev-tex/minted/files/minted-2.1-remove-extra-curly-brace.patch b/dev-tex/minted/files/minted-2.1-remove-extra-curly-brace.patch
deleted file mode 100644
index d27c309916c5..000000000000
--- a/dev-tex/minted/files/minted-2.1-remove-extra-curly-brace.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# compilation of minted.dtx fails as there is an extra curly brace at line
-# 1390. While passing -interaction=batchmode (what latex-package.eclass does)
-# it compiles without warning but a return value of -1 and therefore is assumed
-# as failed by latex-package.eclass.
---- minted.dtx	2015-09-09 22:40:04.000000000 +0200
-+++ minted.dtx	2016-03-06 14:20:46.544180149 +0100
-@@ -1387,7 +1387,7 @@
- %
- %
- % \begin{macro}{\minted@jobname}
--% At various points, temporary files and directories will need to be named after the main |.tex| file.  The typical way to do this is to use |\jobname|.  However, if the file name contains spaces, then |\jobname| will contain the name wrapped in quotes (older versions of MiKTeX replace spaces with asterisks instead, and \texttt{XeTeX} apparently \href{http://tex.stackexchange.com/a/93829/10742}{allows double quotes within file names}, in which case names are wrapped in single quotes}).  While that is perfectly fine for working with \LaTeX\ internally, it causes problems with |\write18|, since quotes will end up in unwanted locations in shell commands.  It would be possible to strip the wrapping quotation marks when they are present, and maintain any spaces in the file name.  But it is simplest to create a ``sanitized'' version of |\jobname| in which spaces and asterisks are replaced by underscores, and double quotes are stripped.
-+% At various points, temporary files and directories will need to be named after the main |.tex| file.  The typical way to do this is to use |\jobname|.  However, if the file name contains spaces, then |\jobname| will contain the name wrapped in quotes (older versions of MiKTeX replace spaces with asterisks instead, and \texttt{XeTeX} apparently \href{http://tex.stackexchange.com/a/93829/10742}{allows double quotes within file names}, in which case names are wrapped in single quotes).  While that is perfectly fine for working with \LaTeX\ internally, it causes problems with |\write18|, since quotes will end up in unwanted locations in shell commands.  It would be possible to strip the wrapping quotation marks when they are present, and maintain any spaces in the file name.  But it is simplest to create a ``sanitized'' version of |\jobname| in which spaces and asterisks are replaced by underscores, and double quotes are stripped.
- %    \begin{macrocode}
- \StrSubstitute{\jobname}{ }{_}[\minted@jobname]
- \StrSubstitute{\minted@jobname}{*}{_}[\minted@jobname]
diff --git a/dev-tex/minted/metadata.xml b/dev-tex/minted/metadata.xml
deleted file mode 100644
index 1835430265fd..000000000000
--- a/dev-tex/minted/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gpoore/minted</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-tex/minted/minted-2.0.ebuild b/dev-tex/minted/minted-2.0.ebuild
deleted file mode 100644
index 8cea88340692..000000000000
--- a/dev-tex/minted/minted-2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package
-
-DESCRIPTION="LaTeX package for source code syntax highlighting"
-HOMEPAGE="https://github.com/gpoore/minted"
-SRC_URI="https://github.com/gpoore/minted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	dev-texlive/texlive-latexextra
-	dev-python/pygments"
-
-S="${WORKDIR}"/${P}/source
-
-src_install() {
-	LATEX_DOC_ARGUMENTS='-shell-escape'
-	latex-package_src_install
-	dodoc "${S}"/../*md
-}
diff --git a/dev-tex/minted/minted-2.1.ebuild b/dev-tex/minted/minted-2.1.ebuild
deleted file mode 100644
index aede91e60a2b..000000000000
--- a/dev-tex/minted/minted-2.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit latex-package eutils
-
-DESCRIPTION="LaTeX package for source code syntax highlighting"
-HOMEPAGE="https://github.com/gpoore/minted"
-SRC_URI="https://github.com/gpoore/minted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	dev-texlive/texlive-latexextra
-	dev-python/pygments"
-
-S="${WORKDIR}"/${P}/source
-
-src_prepare() {
-	epatch "${FILESDIR}/minted-2.1-remove-extra-curly-brace.patch"
-}
-
-src_install() {
-	LATEX_DOC_ARGUMENTS='-shell-escape'
-	latex-package_src_install
-	dodoc "${S}"/../*md
-}
diff --git a/dev-tex/minted/minted-2.4.1.ebuild b/dev-tex/minted/minted-2.4.1.ebuild
deleted file mode 100644
index 0264c50c4ae3..000000000000
--- a/dev-tex/minted/minted-2.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit latex-package eutils
-
-DESCRIPTION="LaTeX package for source code syntax highlighting"
-HOMEPAGE="https://github.com/gpoore/minted"
-SRC_URI="https://github.com/gpoore/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( BSD LPPL-1.3 LPPL-1.3b LPPL-1.3c )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
-	dev-texlive/texlive-latexextra
-	dev-python/pygments"
-
-S="${WORKDIR}"/${P}/source
-
-src_install() {
-	LATEX_DOC_ARGUMENTS='-shell-escape'
-	latex-package_src_install
-	dodoc "${S}"/../*md
-}
diff --git a/dev-tex/ppower4/Manifest b/dev-tex/ppower4/Manifest
deleted file mode 100644
index 30990c78cbf2..000000000000
--- a/dev-tex/ppower4/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ppower4-gentoo.patch 411 BLAKE2B d7442d5eb233403022448a7295c3430340958b226d14af7e5e3b907b3c2881b25dfb7e5861970d143d2f051d06054a7b614d721dea7f65bb17480a065bca1e55 SHA512 901783d8a4d1806f820a5f98375230497781f5ee16ccb2c9092e8e34527aa7d0a3fbb1a12319c69d989ff6d8aedcaec041e9e59f03c43e3b5ef1ff2f9f97d7f2
-DIST ppower4-0.9.6.tar.gz 379282 BLAKE2B 8bce022b53eebd689d248df7c1bd8b1b9f52e71431ce164b280899ddc4af41d92bc310cbf73f53609e9ffa2179577e1d1f88bebb9cdfd796fe4311a38fb296fa SHA512 edade748c33006a20535a663904adccfd8196eb96bcd963d3512a4e416e2747231101756396af7b4eb2395c4bfa1338b73fd77bb1c1e9addfcf57cf8d0beadcd
-EBUILD ppower4-0.9.6.ebuild 958 BLAKE2B 6dd70f9ed353b331f38cb490f9beda7b1cf88f4adce8082b92011ac32868bd10a13da27a5fdfe0c1915541d89825422f3d301d5424d0c76f516b39c5a90294f4 SHA512 17e3afaa50f0c1720f1762c31c2e2c3a85064a5bef60c0913bfe4888cd75871669323ac12f6bc2d5b8b8e420792af0bf26c29bbe2d68df65be87414c7e7b2bbb
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/ppower4/files/ppower4-gentoo.patch b/dev-tex/ppower4/files/ppower4-gentoo.patch
deleted file mode 100644
index f9afa86a9bdb..000000000000
--- a/dev-tex/ppower4/files/ppower4-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ppower4	2003-08-16 19:43:09.000000000 +0200
-+++ ppower4	2003-08-16 19:46:24.000000000 +0200
-@@ -14,7 +14,7 @@
- #  Modify this script such that jarfile contains the full path
- #  of the pp4p.jar file.
- #
--jarfile=/common/Java/lib/ppower4/pp4p.jar
-+jarfile=/usr/lib/ppower4/pp4p.jar
- #
- #  If you use a web2c distribution, you can place pp4p.jar 
- #  e.g. into the directory texmf/java/ppower4, run mktexlsr,
diff --git a/dev-tex/ppower4/metadata.xml b/dev-tex/ppower4/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/dev-tex/ppower4/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-tex/ppower4/ppower4-0.9.6.ebuild b/dev-tex/ppower4/ppower4-0.9.6.ebuild
deleted file mode 100644
index 98758f06bf76..000000000000
--- a/dev-tex/ppower4/ppower4-0.9.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit latex-package eutils
-
-DESCRIPTION="The Java tool PPower4 adds effects to slides using LaTeX"
-
-# Taken from:
-#SRC_URI="http://www.tex.ac.uk/tex-archive/support/ppower4/pp4sty.zip
-#	http://www.tex.ac.uk/tex-archive/support/ppower4/pp4p.jar
-#	http://www.tex.ac.uk/tex-archive/support/ppower4/ppower4
-#	http://www.tex.ac.uk/tex-archive/support/ppower4/manual.pdf"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-HOMEPAGE="http://tug.ctan.org/support/ppower4/index.html"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND="${DEPEND}
-	virtual/jre"
-
-src_unpack() {
-
-	unpack ${A}
-	cd "${S}"
-	unzip pp4sty.zip
-
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-}
-
-src_install() {
-
-	latex-package_src_install || die
-
-	dobin ppower4
-
-	insinto /usr/lib/${PN}
-	doins pp4p.jar
-
-	insinto /usr/share/doc/${PF}
-	doins manual.pdf
-}
diff --git a/dev-tex/prosper/Manifest b/dev-tex/prosper/Manifest
deleted file mode 100644
index 04f8a9cc6bcf..000000000000
--- a/dev-tex/prosper/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST contrib-prosper-1.0.0.tar.gz 78708 BLAKE2B 1e5f9b87ed64deb21f0505657ca846127c3ef736310c225eb29942cbb2fc4cf9f74fec67e8e4f173adc86e3bd6e16e5cf3653bcda976b3c91fdfbd6705330db6 SHA512 39e5bcbd492e8fd4b88692715b9d0b7c098f1c49443114ed9f37cb880c9cb25179d1da87ebb31a7b0826a298ac279885eef11101bcfb999fb72d3e8ef14cff52
-DIST prosper-1.5.tar.gz 543515 BLAKE2B eee957279e0b8f1897851cb26c4bfc04aa2a9976895987f219e656cc29fcd58eaf1ad4f9ec175cbf1710086bc8a6e9b0c008415d74970cde1d28a0a8f45bef77 SHA512 14ddbcd3636b307a460a024f5d1551b0504e83e50f4fc1801be3ed206e009a362d0181acade69be8c6e5dc517683e06f2ce9ce44c30778aa51b79df1135acadd
-EBUILD prosper-1.5-r1.ebuild 1130 BLAKE2B c7a53e4e6ccb71b92fd5478e14bac213f0267107a5aa65ab3c3809e0c9ff5f60f01e43b9305ab10580a2e4f08a9050a1f7aead3edfff63d1e22f98856e0c232a SHA512 11e7068b4cd15edea3695cd1ff8bf3d8afd40045a07e9135f498fa8ca859fdca0012c2a082f9f98ce48657f24f64ae3ff4bdb005c6a94d3862b1e002ccbc3902
-MISC metadata.xml 326 BLAKE2B 2be7c2736cb4305a6a7759cc6a2613210d39bba655b7211ef69540a775c7a93b06cdbdacf1e0270978e02b0a44ccd15cdd0bd97b7729618064851932393093e5 SHA512 e60831ee2d76a31a992568a322729929461ad7f9773e8a31c7bd4bbfb3f2fbd41b479d018a28ad0423508e0dcbd58ca9350ddb07aa08ade5907220f140d5d9fe
diff --git a/dev-tex/prosper/metadata.xml b/dev-tex/prosper/metadata.xml
deleted file mode 100644
index 765d0c5702d0..000000000000
--- a/dev-tex/prosper/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">prosper</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-tex/prosper/prosper-1.5-r1.ebuild b/dev-tex/prosper/prosper-1.5-r1.ebuild
deleted file mode 100644
index dde4697fd58e..000000000000
--- a/dev-tex/prosper/prosper-1.5-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit latex-package
-
-CONTRIB="contrib-prosper-1.0.0"
-
-DESCRIPTION="Prosper is a LaTeX class for writing transparencies"
-HOMEPAGE="http://prosper.sf.net/"
-# Taken from: ftp://ftp.dante.de/tex-archive/macros/latex/contrib/${PN}.tar.gz
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://sourceforge/prosper/${CONTRIB}.tar.gz"
-LICENSE="LPPL-1.2"	# has been changed since 1.5
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-S=${WORKDIR}/${PN}
-IUSE=""
-DEPEND=""
-RDEPEND="dev-texlive/texlive-pstricks"
-
-src_install(){
-	latex-package_src_doinstall styles
-	insinto ${TEXMF}/tex/latex/${PN}/img/
-	doins img/*.{ps,gif}
-	for i in `find ./contrib/ -maxdepth 1 -type f -name "*.sty"`
-	do
-		insinto ${TEXMF}/tex/latex/${PN}/contrib/
-		doins $i
-	done
-	insinto ${TEXMF}/tex/latex/${PN}/contrib/img/
-	doins ./contrib/img/*.{ps,eps}
-	dodoc README TODO NEWS FAQ AUTHORS ChangeLog
-	dodoc doc/*.{eps,pdf,tex,ps}
-	docinto doc-examples/
-	dodoc doc/doc-examples/*.tex
-	docinto contrib/
-	dodoc contrib/*.{ps,tex}
-}
diff --git a/dev-tex/pscyr/Manifest b/dev-tex/pscyr/Manifest
index 0c6013df035e..8e4f8f1c1ba4 100644
--- a/dev-tex/pscyr/Manifest
+++ b/dev-tex/pscyr/Manifest
@@ -1,5 +1,5 @@
 AUX 90pscyr.cfg 28 BLAKE2B 407448f7837c3bf5a3e282f034b5db7e1e3f0e94d7cc05438844258a41321f1e43bd92fd24d3248e4ab984d6fdd3817c4dc9381fa569ad1ccdf1c10a09c06506 SHA512 72f8af39dac496fd502471bbdc635add4a6f716be024afd29e42c2ae9c17012bea80e037d1c9b0b06669e7ccce83a8b6aff200c0fd9b50947d517c3d073f92f1
 DIST PSCyr-0.4-beta9-tex.tar.gz 535507 BLAKE2B 0b4e6675c3712c11154e53489288188700290b285eacb8fe9e357fc859f2d5c1ba9fb31ce7669758cd8849a984706cd7f788ed4067c4d17931348df897dd1095 SHA512 2cd1c99b4a85e72cda7824869036374436b82fe787eaa2307263e64237ad5955b22279c33c436e4b1d4c0d065751984f57bbbb91422f1055b1bdff6581631429
 DIST PSCyr-0.4-beta9-type1.tar.gz 2041127 BLAKE2B 00044a5632bb80c32fadc22429a6a1b10f420ff73a2e19622025ced62949cc27bd49a0b6dd62ab6b79122ec3c4656f367e0dbcd3483a57b62d2d4eb2fd20f936 SHA512 b648a60a768f14102e30dcc6d628d1a0f3cf1e2351d973621d3468c2bdf502726f12089cf0ac2d129ca6fbd694b78a48f184ce02e19d4d5641adebfea2e382f2
-EBUILD pscyr-0.4d_beta9.ebuild 1080 BLAKE2B 691ebaba32f7de07d4902b339c938fa148e13061fa64fc8960005af2cdfd7be876dc52651897304fb31caa158c50ca3f615b68cd98fb7bf0102c580f4e52a60c SHA512 a92c11ea38d25991e6e64c5deec9f30af6fa0732af5bb330b83c53e94f7d3b7d46d9d61b8619f3b41be8c05dacded176bad3365f50c8518b845130ae07e6654a
+EBUILD pscyr-0.4d_beta9.ebuild 1046 BLAKE2B 65341405e748b02b0b95195d56d2af741fb3a73a0a843baf1b09b77ae40547d180e4aa86ec5c595b34649c98b5a7043ae86fdccea751a5a50c2e5ee1996c915f SHA512 a68a0fec08ad192a25811d05be3a4ab2653d8479067cc7fabf911226d6db61112ac771ca2dea7fa166a2e5b23ed7d93769f4ef978e65cc1ea5ec3ad43716387c
 MISC metadata.xml 357 BLAKE2B 8ea8b8d594efde7511f3320ecc10d13a3404c16186c8f560d82e295ea3a1dc3455c0a9b29b8fb891faafebbcf3b32471435948d7872d69b1028bee0eb780c968 SHA512 cb537c71f75e92e69351d4f3bd23e0caf83c9c7f710ed29934f6b9db3201736ad23027aa31ecc727d30842f6e1df122ec82f43dc534998aef39d149763b576f9
diff --git a/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild b/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild
index f6011b526184..e9d3b15e720a 100644
--- a/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild
+++ b/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit latex-package
 
@@ -9,10 +9,10 @@ DESCRIPTION="Type1 cyrillic fonts collection"
 HOMEPAGE="ftp://scon155.phys.msu.su/pub/russian/psfonts/"
 SRC_URI="ftp://scon155.phys.msu.su/pub/russian/psfonts/0.4d-beta/PSCyr-0.4-beta9-tex.tar.gz
 		ftp://scon155.phys.msu.su/pub/russian/psfonts/0.4d-beta/PSCyr-0.4-beta9-type1.tar.gz"
+
 LICENSE="LPPL-1.2"
 
 SLOT="0"
-IUSE=""
 KEYWORDS="amd64 x86"
 
 SUPPLIER="public"
@@ -23,17 +23,17 @@ src_install() {
 
 	for each in dvips/pscyr tex/latex/pscyr fonts/tfm/public/pscyr \
 		fonts/vf/public/pscyr fonts/type1/public/pscyr fonts/afm/public/pscyr; do
-		cd "${S}"
-		cd "$each"
+		cd "${S}" || die
+		cd "$each" || die
 		latex-package_src_install
 	done
-	cd "${S}"
+	cd "${S}" || die
 	insinto "${TEXMF}/fonts/map/dvips/pscyr"
-	doins dvips/pscyr/pscyr.map || die "doins $i failed"
+	doins dvips/pscyr/pscyr.map
 
 	for each in dvips/pscyr/*.enc; do
 		insinto "${TEXMF}/fonts/enc/dvips/pscyr"
-		doins "$each" || die "doins $i failed"
+		doins "${each}"
 	done
 
 	insinto /etc/texmf/updmap.d
diff --git a/dev-tex/style-check/Manifest b/dev-tex/style-check/Manifest
index d2d1aca91ea8..333f1e21eef6 100644
--- a/dev-tex/style-check/Manifest
+++ b/dev-tex/style-check/Manifest
@@ -1,3 +1,3 @@
 DIST style-check-0.14.tar.gz 31699 BLAKE2B e75a2cda65d6751697c586b13883855b36c1ab4c2e0e5f2d4044ab5bdc4db31dc16c449ee97a57d81422a84b5b79de094269cf8beda9e13434eb5a45f00231fe SHA512 80c2ff47a4b00783a34e96e3015277108bd784806139a126bc84488944a725e7a4e33bedce00dda1c58c76e5540234863919d2564b53a534e5a25a12e9ee237d
-EBUILD style-check-0.14.ebuild 607 BLAKE2B bc6078acb3ce7e2a5272b4da6dbb6dceeb2d8f6b0663dabacf24349de515a848caab39cdb563ad930ba7f2ca21240be07d5366ee1ea8eaa86f60d20351a13adf SHA512 c6bdd09095cdfbf502044d73c762810fad6715ce97e7ab120fb9adad357e7b7a6cd18f8ba5a0d6b3af0299ad7409252b766f993cc13307661fe775f1eac28fae
+EBUILD style-check-0.14.ebuild 635 BLAKE2B eaf87a2518e06f5cbc255698163a14c42b7550a8e35c4e3c3c4fe0fe5f49f4edb7c4cdec71a327ef625cd32d8ab7a67cdc4dfa581ae0e362d6a7ee2047d39cbf SHA512 71464502e828156956683a0638554cae2ed948d4a9982e188b9a3a0f8bd5f6b642f28eeb99e9691acccefe370d1d2652a3286e12a98e841d39d30594e07a1e51
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/style-check/style-check-0.14.ebuild b/dev-tex/style-check/style-check-0.14.ebuild
index 57b9aa826bd5..c5b480c27b0d 100644
--- a/dev-tex/style-check/style-check-0.14.ebuild
+++ b/dev-tex/style-check/style-check-0.14.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 DESCRIPTION="Parses LaTeX-formatted text in search of forbidden phrases"
 HOMEPAGE="http://www.cs.umd.edu/~nspring/software/style-check-readme.html https://github.com/nspring/style-check"
@@ -12,11 +12,13 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="test"
 
-RDEPEND="dev-lang/ruby"
-DEPEND="test? ( dev-lang/ruby )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/ruby:*"
+DEPEND="test? ( dev-lang/ruby:* )"
 
 src_install() {
 	dodir /etc/style-check.d
 	emake PREFIX="${EPREFIX}/usr" DESTDIR="${ED}" install
-	dohtml README.html
+	dodoc README.html
 }
diff --git a/dev-tex/xcolor/Manifest b/dev-tex/xcolor/Manifest
deleted file mode 100644
index 4c45b0f754be..000000000000
--- a/dev-tex/xcolor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xcolor212.zip 769972 BLAKE2B 4d8b1dbf123fae07e6ecfdd90150d82b4932e64941598774d8bad4b009db15491d831bdaa03266a925724bac2d22bd28adf7e936f991d4d0d90a14de4ec81722 SHA512 66255b29aa7d2eb11239fa9ce1a12e2b9397028d84b1503fb5bbf06276b597263224eccd064f1e87f7bdb2e96b0ae2d564bb7cb99b92907ccfc2468492a3479e
-EBUILD xcolor-2.12-r1.ebuild 1030 BLAKE2B 1c45fb32724b604dd53355684ba78af4bcbef34a583ebff9cef3cbc1f83519b7ad5431282f8adf75b82e8b8c8ff6258c9f5f7bc4c06fdde9dc5f3255dba546d4 SHA512 8a3e5d2a9213ac0b029f13a928fcfbd5043d4baf657140a9079fdf588d3e1e5832ba069de2e863eb1bcbbba37aad3e065aeafae408da64716f22a8fe159ae15f
-MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-tex/xcolor/metadata.xml b/dev-tex/xcolor/metadata.xml
deleted file mode 100644
index 13170c3184d8..000000000000
--- a/dev-tex/xcolor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>tex@gentoo.org</email>
-	<name>Gentoo TeX Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-tex/xcolor/xcolor-2.12-r1.ebuild b/dev-tex/xcolor/xcolor-2.12-r1.ebuild
deleted file mode 100644
index c71b621bf3ed..000000000000
--- a/dev-tex/xcolor/xcolor-2.12-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit latex-package
-
-DESCRIPTION="Easy driver-independent access to colors"
-HOMEPAGE="http://www.ukern.de/tex/xcolor.html"
-SRC_URI="http://www.ukern.de/tex/xcolor/ctan/${P//[.-]/}.zip"
-
-LICENSE="LPPL-1.2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-RDEPEND="dev-texlive/texlive-latex"
-
-DEPEND="${RDEPEND}
-	doc? (
-		dev-texlive/texlive-pstricks
-		dev-texlive/texlive-latexextra
-	)"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-TEXMF="/usr/share/texmf-site"
-
-src_prepare() {
-	if has_version '>=dev-texlive/texlive-latexrecommended-2019'; then
-		#sty filename has been changed in tl2019
-		sed -i -e s#fvrb-ex#fancyvrb-ex# xcolor.dtx || die
-	fi
-	default
-}
-
-src_install() {
-	export VARTEXFONTS="${T}/fonts"
-
-	latex-package_src_install
-
-	dodoc README ChangeLog
-}