gentoo resync : 20.02.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-02-20 15:11:50 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-02-20 15:11:50 +0000
commit: 16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch)
tree: b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /app-text
parent: 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff)
47 files changed, 1078 insertions, 508 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6f049b72626c..9f1c231369ca 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
new file mode 100644
index 000000000000..defaec75ae75
--- /dev/null
+++ b/app-text/diff-pdf/Manifest
@@ -0,0 +1,3 @@
+DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
+EBUILD diff-pdf-0.3.ebuild 1284 BLAKE2B 3fac12175666e53660c24b8273ba498103cbbfca53b81b3fd5cfb83586a49d98d06ff015e5c497594f45dc9befe788784315850591a52b9ef479bbf8c5a4d6e0 SHA512 e2e620af68029e94af9905cc3545a0c864f24744a8fa31a6ffba938a87d91f078ec744dd3a8dd6620a9ae270beb19c89bea96c622345e9090f3d27d2a4599814
+MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.3.ebuild b/app-text/diff-pdf/diff-pdf-0.3.ebuild
new file mode 100644
index 000000000000..1f289d32bcb5
--- /dev/null
+++ b/app-text/diff-pdf/diff-pdf-0.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# No EAPI=7 support in wxwidgets.eclass.
+EAPI=6
+
+inherit wxwidgets
+
+DESCRIPTION="A simple tool for visually comparing two PDF files"
+HOMEPAGE="http://vslavik.github.io/${PN}/ https://github.com/vslavik/${PN}/"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+# The COPYING.icons file states that two icons were taken from
+# version 2.16.5 of GTK+, which is licensed LGPL-2+.
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# The build system checks for "poppler-glib", which is provided only
+# when app-text/poppler is built with USE=cairo. Moreover the glib ABI
+# of poppler is relatively stable, and I can only assume that diff-pdf
+# uses that rather than the low-level libpoppler.so API. Since the
+# subslot on app-text/poppler is ONLY for the low-level API, we
+# therefore don't need a subslot dependency on app-text/poppler.
+#
+# Since diff-pdf.cpp includes glib.h directly, I've included
+# dev-libs/glib as an explicit dependency. Ditto for x11-libs/cairo.
+DEPEND="app-text/poppler[cairo]
+	dev-libs/glib
+	x11-libs/cairo
+	x11-libs/wxGTK:3.0[X]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	WX_GTK_VER="3.0"
+	setup-wxwidgets
+	default
+}
diff --git a/app-text/diff-pdf/metadata.xml b/app-text/diff-pdf/metadata.xml
new file mode 100644
index 000000000000..45125b9b6e99
--- /dev/null
+++ b/app-text/diff-pdf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+    <name>Michael Orlitzky</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 2689d7b5d311..cdecca344676 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,5 +1,4 @@
 AUX docbook-dsssl-stylesheets-1.77.Makefile 676 BLAKE2B e87e463a2fffd64e6633a2d1015660ebc341f089a2dd3cb5da9c743eaf9b98b8457a723040f871c350969445275a6eca705546e2d4ba7596c21994fc5069c540 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1622 BLAKE2B 1d3a39700f1d767669319d7ecfff473ecd4849ae66918d070780f1e9bd327a82488a65a7744834a98572bc2685bbcb333dc5482316f232b6a1fbbe157f8a96bd SHA512 87e7ffd95e6e6ff0dd713f1246b80353a246736696fac03384ae906d1ed6a3438f9d74ac1526f7bd516e7d3110f2e76d76e90aa59fe9d17bbc7930ec9257124c
-EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1552 BLAKE2B 404a5e3406218b9d8120cfe66b9cc23ec1e961b6582cd3dd9bf04d324cc01d8f93121662d0707e8069ce1762480893feee8ce4b870821cfbfb1259afbde43eb5 SHA512 ec08de1af700a863e1b8124b47b40b18727f489868bbf14947b68a5e2d7a066a27f49ec8cd8c60599cc2b37171b817419eea0c912f9f08bea86cf3128904802f
+EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1551 BLAKE2B d1f490d4cbee15aab1a5902bf143b791c7cff874a1b5726ade3bb84c3431491a15b84e165f547cf456c3fba1104009fd0c4f32dfcfe555d023d2241a8bb3bdee SHA512 222a78a676a75071ad75d58c7c78904ff8fe0345e6a2f0c0088482926b60089fba5ab4a5937fbf22d658b8bdcdc91a7a1b790e2a08dc0f33bad661495fe42837
 MISC metadata.xml 297 BLAKE2B 33f8b636a483011e6561d078c58c16a477925ea41543b150c11ea7ecb3465151a5404689d8cf263a6e9f6ede4d2d5a55fc8fd02fa89814c7b7b0e93e7c6077aa SHA512 e5cc7a9b4aea0e6cd29246bb44f1bd2713495d58b243bc78bceb760c827c415ec30459f5b9acf2ddab615e39d9ab5c4a9d4eb41e7bd53684032a08f7a4fbce3e
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
deleted file mode 100644
index 215efe89a67f..000000000000
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit sgml-catalog
-
-MY_P=${P/-stylesheets/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="DSSSL Stylesheets for DocBook"
-HOMEPAGE="https://github.com/docbook/wiki/wiki"
-SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-RDEPEND="app-text/sgml-common"
-
-sgml-catalog_cat_include "/etc/sgml/dsssl-docbook-stylesheets.cat" \
-	"/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
-	"/etc/sgml/dsssl-docbook-stylesheets.cat"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	cp "${FILESDIR}/${PN}-1.77.Makefile" Makefile
-}
-
-src_compile() {
-	return 0
-}
-
-src_install() {
-	make \
-		BINDIR="${ED}/usr/bin" \
-		DESTDIR="${ED}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}" \
-		install || die
-
-	dodir /usr/share/sgml/stylesheets/dsssl/
-
-	if [ -d "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ] &&
-		[ ! -L "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ]
-	then
-		ewarn "Not linking /usr/share/sgml/stylesheets/dsssl/docbook to"
-		ewarn "/usr/share/sgml/docbook/dsssl-stylesheets-${PV}"
-		ewarn "as directory already exists there.  Will assume you know"
-		ewarn "what you're doing."
-	else
-		dosym ../../docbook/dsssl-stylesheets-${PV} \
-			/usr/share/sgml/stylesheets/dsssl/docbook
-	fi
-
-	dodoc BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew
-}
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
index e8d69d90a29f..df8d6e0a7df2 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
index a82a9cad7c0f..543f273f6a2f 100644
--- a/app-text/htmlinc/Manifest
+++ b/app-text/htmlinc/Manifest
@@ -1,4 +1,4 @@
 AUX htmlinc-gcc3-gentoo.patch 3601 BLAKE2B d268406b773c21cd2885d3f9b5e66ad0121493152a454811b5af1bb20e8ee857777374f2424d68ae9634c74d30d6e24a8d09779059c8fe4440db390259108e23 SHA512 f29d5c823fae27ef027002a8e075e105f028c8a4892d142c64d69af7bca52a63de4ca19aa0cf86acc67f772349472d2b04003c71257cf1b7464c9dee56d95afd
 DIST htmlinc.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
-EBUILD htmlinc-1.0_beta1-r2.ebuild 717 BLAKE2B 1550392f3fc525dd0fb8949d94a1d32d5b143b5134d71495a6424849d29c5bbbbfc1f4fe5875cff578a11f003519286551b46df03e4c2fd5e2ce5079b7a7fbec SHA512 ea4b9bd809690e905e6ab9bba09fe797c1e0333ce222bc66fbef1df4129584bf9d4d5d61d08e2a4751d91b89c7bf2f99069768f5a4565257d055d3da2ed17c69
+EBUILD htmlinc-1.0_beta1-r2.ebuild 716 BLAKE2B 4a5c2b28ec3605f93fdaf48b057d9b5ced42889400233cdea1fe9c22b1306f03b8f225aa91b5db4afec389661472d3fa5135562177efa5cc92011c0ad9aab380 SHA512 fd6c9bf88ed1e4abb957de35d182f661b1f86e415afb58f59046de48319738ca28ee7d8aad9c9b916c4c85bb771e9dc0f89d749ff282a5586fb460b2ac752aae
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index 73d010fb1fbe..694412759ced 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/htmlinc
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index 8b85caa77a2d..1f4d8af8b3a4 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,10 +1,4 @@
-AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a633875157acbb4c1e727bc7bcf2a4f1af67197c1d9762a7aa6265e31357eead2baff13c28126d6f4bbc698a997f442bc58771b5b2 SHA512 edc407a4958befee95b53733b0c73bc8281575b53b8d2c65491eee6aafc63d775d3ce9d0a0578ce51cf8bc8f047a683bb0dbd8b79f2b1914dc5df6de64b835fa
-AUX libetonyek-0.1.8-no-parentheses.patch 1052 BLAKE2B 9603025aa5e9ef25d8d17ee25c6f30cd87455b68c000b92f4483deda594ecb1b061cd8e0630247fb1c2eaa8860cfa7a3c2896c3fb901bc5205bc75fd51388a4d SHA512 7ab3cdca79784d362df85b279e762189738061a386313e71d9c1aa889b40df5586fb487bbc52615835472c8d3a674163bb84569285e9c3672dac4a5694af5c57
-AUX libetonyek-0.1.8-typo-fix.patch 1189 BLAKE2B 404c2c55b8a0946670bf68e13a50a660be7c38021ed7e9a50d9522b883b512d512bc89dc294df62cb479f609616327414b6064971a86e99f38d071a17196b62e SHA512 5085b727c12219f784339a3ab8ecad88302e33338c5467e49adbc1acee91f85ee20f6b2bf765e5a085099141615976368003cc0e8fc3ed4142f0467c15b7a0ee
-DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865
 DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
-EBUILD libetonyek-0.1.8-r1.ebuild 1439 BLAKE2B 4aedcdd5eeabda732bfb69204d073fe83157b489177b16683785b0db2ea09e2697e48438dfd455f40f9706e5cb6a80795b54a7f1a4bccfbe49795417fda02967 SHA512 5aa9b843157114144e65e867faf5ff9beb9d5916440b3e72b4ce9e9b2cc3cd207573f9c65d207ea543409fd264e8b4f8ad34ef1b16f3ed1b801cf1fd604c94fa
-EBUILD libetonyek-0.1.8.ebuild 1224 BLAKE2B afde4827cbdbc5d956e84dd46fc9df2252e5d3c6af8fcce8f3b1afbfe694a5050729b3989f1cde73efea30ae63cee413d2ea825b2df6c13595b509be0786d937 SHA512 1939662481af2af90d0b45ac6949c5453fdd20cd554ef4a0143465a1c48551377b0614742e3643fd59b31fe4296b22dfa493890f5ba90996dc40e1e14b32ae60
-EBUILD libetonyek-0.1.9.ebuild 1297 BLAKE2B ef85c5b3f63b108d7a9ba562b83e1650210da5cac71f2868d2f0fed2c5a47d796459af36d2c1442db39e2b2cb48c4f3616c48c82b6620a8cebb961e49b3bfb10 SHA512 667aace5bf321077a711dfe37ad01ef56a1b206b6c25c27ce68eb8b1546721c1961b71b75fb85a49612df1c9a9ac92740852b39332778277d0cc1e980a5bd449
+EBUILD libetonyek-0.1.9.ebuild 1295 BLAKE2B 37a79c68b56c5768befa64ddb1d2d8ffe972ba9571ce457a92cf1423dd2c2838865e2cb0a92fbcf76c2638d77836f470d5e2bf7365b19b23dfc1e1b546e0255d SHA512 de78ac5aa83fba332d0da599116daab908267e9c4b8c29814c944f782af307e3a09ddf643c16f4e3ca151aadbc31ec7a4db5df8acae5d81473f5c302d195bde5
 EBUILD libetonyek-9999.ebuild 1297 BLAKE2B ef85c5b3f63b108d7a9ba562b83e1650210da5cac71f2868d2f0fed2c5a47d796459af36d2c1442db39e2b2cb48c4f3616c48c82b6620a8cebb961e49b3bfb10 SHA512 667aace5bf321077a711dfe37ad01ef56a1b206b6c25c27ce68eb8b1546721c1961b71b75fb85a49612df1c9a9ac92740852b39332778277d0cc1e980a5bd449
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
deleted file mode 100644
index db78fa81d471..000000000000
--- a/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Gentoo-bug: https://bugs.gentoo.org/657820
-
---- a/configure.ac	2018-03-18 14:51:31.000000000 +0100
-+++ b/configure.ac	2018-07-11 23:13:14.901127036 +0200
-@@ -119,7 +119,6 @@
- saved_CPPFLAGS="${CPPFLAGS}"
- CPPFLAGS="${GLM_CFLAGS} ${CPPFLAGS}"
- GLM_headers="glm/glm.hpp"
--AS_IF([test "x$enable_tests" == "xyes"], [GLM_headers="$GLM_headers glm/gtx/io.hpp"], [])
- AC_CHECK_HEADERS(
-     [$GLM_headers],
-     [],
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch b/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch
deleted file mode 100644
index e13fe5f31cef..000000000000
--- a/app-text/libetonyek/files/libetonyek-0.1.8-no-parentheses.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 935cb58a61e45f441bdea143317a7d0d52c7f944 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 5 May 2018 14:01:43 +0200
-Subject: [PATCH] =?utf8?q?WaE:=20unnecessary=20parentheses=20in=20declarat?=
- =?utf8?q?ion=20of=20=E2=80=98aligns=E2=80=99?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Change-Id: Ic3cb38d071db8e3947c09a4b216b62d18e01b6aa
----
- src/lib/IWAParser.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp
-index ab9c6c8..973610e 100644
---- a/src/lib/IWAParser.cpp
-+++ b/src/lib/IWAParser.cpp
-@@ -1676,7 +1676,7 @@ void IWAParser::parseCellStyle(const unsigned id, IWORKStylePtr_t &style)
-       auto align=get(properties.uint32(8));
-       if (align<=2)
-       {
--        const IWORKVerticalAlignment(aligns[])=
-+        const IWORKVerticalAlignment aligns[] =
-         {
-           IWORK_VERTICAL_ALIGNMENT_TOP, IWORK_VERTICAL_ALIGNMENT_MIDDLE, IWORK_VERTICAL_ALIGNMENT_BOTTOM
-         };
--- 
-2.11.0
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch b/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch
deleted file mode 100644
index 32593fed4805..000000000000
--- a/app-text/libetonyek/files/libetonyek-0.1.8-typo-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9b78187ac2ccca0158cc9cc0bcc0576b457a78d7 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
-Date: Mon, 23 Apr 2018 17:20:16 +0100
-Subject: [PATCH] intial-creator->initial-creator
-
-Change-Id: I6fe5d0732edb97ac7ff6d527f48543cab1bb3f7b
-Reviewed-on: https://gerrit.libreoffice.org/53337
-Reviewed-by: David Tardon <dtardon@redhat.com>
-Tested-by: David Tardon <dtardon@redhat.com>
----
- src/lib/IWORKCollector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/IWORKCollector.cpp b/src/lib/IWORKCollector.cpp
-index 0e0c775..4252a49 100644
---- a/src/lib/IWORKCollector.cpp
-+++ b/src/lib/IWORKCollector.cpp
-@@ -771,7 +771,7 @@ void IWORKCollector::fillMetadata(librevenge::RVNGPropertyList &props)
-   if (!m_metadata.m_title.empty())
-     props.insert("dc:subject", m_metadata.m_title.c_str());
-   if (!m_metadata.m_author.empty())
--    props.insert("meta:intial-creator", m_metadata.m_author.c_str());
-+    props.insert("meta:initial-creator", m_metadata.m_author.c_str());
-   if (!m_metadata.m_keywords.empty())
-     props.insert("meta:keyword", m_metadata.m_keywords.c_str());
-   if (!m_metadata.m_comment.empty())
--- 
-2.11.0
diff --git a/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild b/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
deleted file mode 100644
index e58d47644acf..000000000000
--- a/app-text/libetonyek/libetonyek-0.1.8-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-[[ ${PV} == 9999 ]] && inherit git-r3
-inherit autotools
-
-DESCRIPTION="Library parsing Apple Keynote presentations"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="doc static-libs test"
-
-RDEPEND="
-	app-text/liblangtag
-	dev-libs/librevenge
-	dev-libs/libxml2
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	>=dev-util/mdds-1.2.2:1=
-	media-libs/glm
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glm-0.9.9.patch"
-	"${FILESDIR}/${P}-typo-fix.patch"
-	"${FILESDIR}/${P}-no-parentheses.patch"
-)
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-		$(use_with doc docs)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-	)
-	if has_version ">=dev-util/mdds-1.4"; then
-		myeconfargs+=( --with-mdds=1.4 )
-	else
-		myeconfargs+=( --with-mdds=1.2 )
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild
deleted file mode 100644
index 88f7b92bc33b..000000000000
--- a/app-text/libetonyek/libetonyek-0.1.8.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
-[[ ${PV} == 9999 ]] && inherit git-r3
-inherit autotools
-
-DESCRIPTION="Library parsing Apple Keynote presentations"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
-[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="doc static-libs test"
-
-RDEPEND="
-	app-text/liblangtag
-	dev-libs/librevenge
-	dev-libs/libxml2
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	>=dev-util/mdds-1.2.2:1/1.2
-	media-libs/glm
-	sys-devel/libtool
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=( "${FILESDIR}/${P}-glm-0.9.9.patch" )
-
-src_prepare() {
-	default
-	[[ -d m4 ]] || mkdir "m4"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable static-libs static) \
-		$(use_enable test tests) \
-		--with-mdds=1.2
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libetonyek/libetonyek-0.1.9.ebuild b/app-text/libetonyek/libetonyek-0.1.9.ebuild
index a59ca6e00967..1d4cb7ab9690 100644
--- a/app-text/libetonyek/libetonyek-0.1.9.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 DESCRIPTION="Library parsing Apple Keynote presentations"
 HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index 33dd8daacbc9..35ddd2a7322e 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,3 +1,3 @@
 DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
-EBUILD libexttextcat-3.4.5.ebuild 632 BLAKE2B 29e4ad81b9dacc08ceda14a310d26c1bed9eca187ef3c762ca9bd9291f9b3df71a6941796f4076e8019986ec3437e4b49ef2b9bc071cd7b21ed1d87e4ff2b2ee SHA512 87ba12fc0290302300ae8c9bba6f4f59a4730a84a2151739ead32a6837ce3949b9f6de8330e43109d8bdc3230492a1efdf97ff2dcdd95a1c63c4a772c7260e85
+EBUILD libexttextcat-3.4.5.ebuild 628 BLAKE2B a8dbab7b39a9fb9b8558ef49da69ff21533e1e0c89882e49ddb1faed7e10c92cc89906807a835d0ccce5415cb3c6b781f505294067f10d80b2988c3fcee2cc8f SHA512 ed2e2d1682016b352f142ea8ee01cd9d64e144eeaacb0549a780bffe49f339a3ed35aefb03585ba65b8f62e3d2075e32469a3100800173345747b4cc6f37b5e5
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
index e48b3a9a6156..783d78935393 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.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
@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 143853e9e191..d2d9ca83415e 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,7 +1,5 @@
 DIST libgepub-0.4.tar.xz 246016 BLAKE2B d51f55064d2dd0c9d6cb33884d9dae967b6a9ea971624fce333e9692abfaddf12c6ee4fb11cad97dc0fcc0b6a5d42ff71fc842eb205326ce8181af8e3ad46d2e SHA512 dd3e9837ba2c5896319918bda19eec8ea790d54f7893ddca46774f96f8e09ac1962ae6cbfc0bcd23c15059c63683ef4a6673e05f8416b024591677fddfa3ca15
-DIST libgepub-0.5.2.tar.xz 27076 BLAKE2B 8934e7cbd3b2e4056220c560111fb1cbaca1b16541519da3c3c1b28784900c14b84b9a7497d59d4895b74075c2f94bf8dc540e19d2e5bcc686429d216ec3d2f5 SHA512 9e8ba3acc717fe5d1957935b154776720fcdb90ab566e0888203bce4ea2281b84f9fe44d554f6b5cadb1bba3aeae8b5b9a759001f404c43fa46b0ba16b959e69
 DIST libgepub-0.5.3.tar.xz 25576 BLAKE2B c51f6850c78185fec6f027ad5507b2402ab578b2ce6e4b91c674c3a3c6945857ce3d3ebd4560408ae8e5552ca658c40b30c73b42db1ef61f4814cde36a404df7 SHA512 8eb3370b6ca639135a1365756f3977f6daea3039bcb7ec4d5cd116d869584be2a2b1e8bb7f202d4c101f1afb0f7b9a45bd48c1b2337197ec4320d50a4c8d0183
 EBUILD libgepub-0.4.ebuild 682 BLAKE2B 5e5e637ff47ed41cc130907d61d7e5bb4cfd4711d523350f12896926abf90c56f3f5994fdc17c329d5eeb30dea4bd5f7243059642c3261d3f5011f6581bfd1b4 SHA512 636d71bf49aa273232dc555c999febb2f10c14927f4a1c160c2caf64f5d6154921bf4390220483d5967c1abba4d02000e58c59f1270d18a5c6acdee39e9e9087
-EBUILD libgepub-0.5.2.ebuild 671 BLAKE2B e11f3acb7349358557aa8c4280e95ea6fbfc8fc469d0dc4783825bb3a4a8e7e7401a323ab557e2ad4fa17f67d6305e45e402eefa47a53c02b7abc23415c6e079 SHA512 eb9406d3f74ed4df90f42079e58aaeb8154d65f2f43705153db4d7b080329bd064230a1525c1bc4f54ee5180dfed70b1c84200ebcb7ea0c5df0e0a752a41af94
-EBUILD libgepub-0.5.3.ebuild 642 BLAKE2B b6e079a704a146457cecbc77c3cd61f96a3a02a9ccc459b935477f2242cfc443a15e15c34de6c6e44971e72e8dc933be451eb7ff0c7723fc6cfd6ab8c89d1f3e SHA512 1e9297a1b15e5f468fba37d6ba83f47aa5257f6e0d5c0004ce94c64033da730bcb4b23fd40f2ad6121585b7176a92c9cee3182aff753dc7ffd0720d80edc5cdb
+EBUILD libgepub-0.5.3.ebuild 646 BLAKE2B 2b15f05ebda230985ba74ff5d233447eed8bb4c283abccebf4d742c128e94447207d583e5ef2fcd5af660f69ca34dfcf31b752ff6640db4d8eb31a9ffc9210e2 SHA512 34fa589cb61498af1b73fbdc312171e6491a52c362fbefac83973b25b7de024355d25e2bc1126ce08a88a7086e745b618a34e48d2c6b5510c951c59d0a58cd97
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.5.2.ebuild b/app-text/libgepub/libgepub-0.5.2.ebuild
deleted file mode 100644
index 8f894e8e55f1..000000000000
--- a/app-text/libgepub/libgepub-0.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson
-
-DESCRIPTION="GObject based library for handling and rendering epub documents"
-HOMEPAGE="https://git.gnome.org/browse/libgepub"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib:2
-	dev-libs/libxml2
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	meson_src_configure \
-		-Denable-introspection=$(usex introspection true false)
-}
diff --git a/app-text/libgepub/libgepub-0.5.3.ebuild b/app-text/libgepub/libgepub-0.5.3.ebuild
index 47691a83f82b..5d6e53a2c0a0 100644
--- a/app-text/libgepub/libgepub-0.5.3.ebuild
+++ b/app-text/libgepub/libgepub-0.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit gnome.org meson
+inherit gnome.org meson xdg
 
 DESCRIPTION="GObject based library for handling and rendering epub documents"
 HOMEPAGE="https://git.gnome.org/browse/libgepub"
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 0960816817e7..376fbc8df4d7 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,5 +1,3 @@
-DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
 DIST libqxp-0.0.2.tar.xz 341760 BLAKE2B e596b3ebd23c8fff2a1675b1076ba6b4403bb41358972b50eb946610108f5968ef3e553478aec8c6211f8b476030033e7d334cb4deccc7d6bdfba3914821abf5 SHA512 409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab
-EBUILD libqxp-0.0.1.ebuild 746 BLAKE2B 442391082f776ce32a738301f1b979a21301b3db40fb8c7a5535c9e35bd7b913b189cfedb36c7bbab79bd8a1aaabdc4bba52c5bd90502996c0ce021f7203e29a SHA512 e51af28d5f65c24966d06bf89fac96bb8fb9b9c4a4b694692c6a1a35d544ac8e39b0be67c3e45551720f941488f4b7941211ed698fa2b29c3701cf2285cbe687
-EBUILD libqxp-0.0.2.ebuild 796 BLAKE2B 0b45d760aebd4b1b75ee46ee9f497f4042353bff363ab02efd3a87edd4469b9c14c35d2bb48cf2746c7a86b868130b1b2e829639424478736d50292c71f34643 SHA512 0663c2c2bb3993a89064910a7da742c9b7c1c05e9b8069b98742e0a4989c7a180976da94eff5901407ae102f8a70ab4dda5f93d00d21ec768c38d043b62e6c19
+EBUILD libqxp-0.0.2.ebuild 792 BLAKE2B 40a2127fd6244e2325dca9ad5049a36e68863d9980f496d1db879c2774512f667168cec8edcdaece381f5cd2bc83256ca697b01d1ce8c7f4edf35690afa6c81a SHA512 0424c54b1bde5a53883c314ea721c384702dd41fe427f9efad4daa6576988664dabbe3f19929007361c0c98d84923d63debd9874aef28defe43ee49a0d5c4900
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
deleted file mode 100644
index b3364e75301f..000000000000
--- a/app-text/libqxp/libqxp-0.0.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Library parsing QuarkXpress documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
-SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="debug doc test tools"
-
-RDEPEND="
-	dev-libs/librevenge
-	dev-libs/icu:=
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf \
-		--disable-weffc \
-		$(use_enable debug) \
-		$(use_with doc docs) \
-		$(use_enable test tests) \
-		$(use_enable tools)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index 7f26f61cd684..0b3de557f1e0 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index 360a34029bea..1e070e3d2a15 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,6 +1,4 @@
 AUX libwpd-0.10.3-gcc-4.8.patch 470 BLAKE2B a77e5a6fdc4dbadc716ed3c4bdb5ce04e2e173a9ad6dd57def6e622ab68db2e5d386a21d653a515b069c4982df83ee99ceabd80ce36ef6ab0605351beaafec5c SHA512 9bcad3f4ae15213c26d9730e5a496dffbb1c01b1ec85fe4eda8edc5bda3ddbc0df5b6d6a9eaa3d9c944f3f5900c189197cc0925df5adfc6523eed3e4ea327564
-DIST libwpd-0.10.2.tar.xz 536400 BLAKE2B a4ed9b8c790898436e08afd0f571c4a4b31615228248116b24bad38d07df7837982df1ffa98b0ad442cfec417fc90eb089642b32e3a094323e75fb8fc7cb8da7 SHA512 821dbc0535ebd4fa41bcf984e344e11176862676c66abebe45cf4284f8de6e6cc7629f8a605b169d034a5c2f3e2461513d61e11e549ca73b8328eb66ac3bdd79
 DIST libwpd-0.10.3.tar.xz 534712 BLAKE2B a7b39713c0df908912d0f6f94c6c0f7056a685dee7542ea88c441f055ad7cc62c1159985c459a4ff67d5b5fe4c412c31c9a9a2924702386ed5b8250147f071ff SHA512 df14f11e885a583218afdb0aafe8a15d01890289af8b316cd1d225e4a83996c82907fbfdde83257dc71d99bfbc5b21b2c96536f5a783748388659155dbdb8949
-EBUILD libwpd-0.10.2.ebuild 1324 BLAKE2B 7d298a3ce2f723baef5e8ba90edb29d4c2ed85e581e6bd60a417a77dfc279fef86be2092ff68b820ff1dd6373303b256688ad8412fcd45bc246c10a035885e73 SHA512 7baac381bbfe57063de284c5480e45c1b918e8b0e3874b561e9fef0e02fb66d89be2c68b859b5cd591d5e6a76d48ef4003e30d24f83d584df2147955a9e71783
-EBUILD libwpd-0.10.3.ebuild 797 BLAKE2B 4361bd02ce11c319e61fa17a7794d03f6694e2e7d631e5a441384bde7dd20017a7037fb9627c1761e790f09df2acf048e257795a6e62ca1bf4fb98acdbb7aeb3 SHA512 eb606d75dcb72b9b6b50643c6381db05669edd3b43328fecdfe97eb9677c6b2f4fe4172e39c49e8f8323d7ee5dc3ec81688dfc5f12915f51079582993fa4fb24
+EBUILD libwpd-0.10.3.ebuild 795 BLAKE2B ddd9e9a96651d286eeb9a8b8e9ffee5685eca43922fb006b790c01467815bc89cd14a208186efaab2f01d1360c91ab55fccf07e8f4fc7f0fb49377fcdacda535 SHA512 765e6ae85b845e143749089937e461dce08bf932d188a6f075a6d3b5e362e726a1bd191af2c7807987d69bba4c1ffb4d2636a6d838005e128dc28feed5dbced4
 MISC metadata.xml 402 BLAKE2B 449d3fa4ee2b0be84bca5eca7708b2e318060e7d85c84369ab16923edfa4bd3a19eed80b11d3cbd7c4d9a12e2d3d07df6b0aad95f011d1ce100fd9a6fd22206c SHA512 af33c7d44f5766cadb1955928210dc6f28171eef00cfbdd96a0257226bb7eee560fb05cf58673dfbbef932600ec3e8fafa666db3f9c3ddd2bcfa5a2a90cd77f2
diff --git a/app-text/libwpd/libwpd-0.10.2.ebuild b/app-text/libwpd/libwpd-0.10.2.ebuild
deleted file mode 100644
index 48e245627e30..000000000000
--- a/app-text/libwpd/libwpd-0.10.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives
-
-DESCRIPTION="WordPerfect Document import/export library"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86 ~x86-fbsd"
-IUSE="doc +tools"
-
-RDEPEND="dev-libs/librevenge"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable tools) \
-		--program-suffix=-${SLOT}
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if use tools; then
-		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
-	fi
-}
-
-pkg_postrm() {
-	if use tools; then
-		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
-		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
-	fi
-}
diff --git a/app-text/libwpd/libwpd-0.10.3.ebuild b/app-text/libwpd/libwpd-0.10.3.ebuild
index 469e0bc7eba3..ea3bb49c4cd9 100644
--- a/app-text/libwpd/libwpd-0.10.3.ebuild
+++ b/app-text/libwpd/libwpd-0.10.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86 ~x86-fbsd"
 IUSE="doc +tools"
 
 RDEPEND="dev-libs/librevenge"
diff --git a/app-text/libwpg/Manifest b/app-text/libwpg/Manifest
index 7992bbf2782e..5820f5e4e7bc 100644
--- a/app-text/libwpg/Manifest
+++ b/app-text/libwpg/Manifest
@@ -1,5 +1,3 @@
-DIST libwpg-0.3.2.tar.xz 326840 BLAKE2B a32668671bf0f6a69555dea39a522fac65f7522d7fda5cc29b8d2588fa268f1923e959bb6aa75c6ed1d4c40dde5cf458577098e4662dcee769a449ae36f13229 SHA512 f3f76a17056274b2dfd11ce4eb451411d8458b00b3f7be4fae0a932a382f247adbaae1f4f8f6005e7b84f063e415ef5ab609015ba32f779c6ab2f0404b275f3f
 DIST libwpg-0.3.3.tar.xz 328664 BLAKE2B 02ffaf8ea96e66dea94d847c85e17db5b7efcc5891bb1bf4069e664ece09f808b7462fcbb08a75d6ab17fff4ea51a8e494c48fba1540aed132f47d05b746e1a5 SHA512 99f8346b336eb902626fe07836c73870a57e100620ddd242ce7c2866e564483ed024a3a0b2804f81a0f59a0873310c3a93c005d306437a27818a6f4374c0c491
-EBUILD libwpg-0.3.2.ebuild 1291 BLAKE2B 38dd7c28f9483a83fc919b3bb40202241c6b4cc694ae20a077123a1a63ada5449fd73cd8cf78655834a1e99c3646fb824b6abc0a2974cadf7658306976797ad6 SHA512 fdbf3d45daea3e699264448ccf24d5365e03695c8cc8f5a141687cfec7605280b59a7b82bcad9141b3669039e434900f9cb932e398bdb9f7fdd72c52dde89ab5
-EBUILD libwpg-0.3.3.ebuild 777 BLAKE2B 88cea89b5a1818c29de493cc4531383e8c6402c8d3da12534b0f8cd589167afc221a880c075fe4476ce8688c174cd46f3c2d9972dd70cdf70bc104c221ddb413 SHA512 92b4a11f295f9329a5de4d35944a9d4540c268b285aae435e933b715ab2b98d46b10670db3384339c246d220c4f1968160d668dfa23ef7e618c90258c2a79296
+EBUILD libwpg-0.3.3.ebuild 775 BLAKE2B b07167305dbb6e10d4a03fae5d4e968ff941e87cd093dfee4b425948406ef352059709a805d5322e47b138589348c0bde7056208e2d7a61ea8cbb55a2fc9dd0c SHA512 affa8eefb3346a6d1c6efd3b97a8c16970b9d20ddfeecfea81b0c0c8bfadf55da42478fbdafdfdf1066d3a49d18219139aea2535f1b5bf8e919cc716b75496e7
 MISC metadata.xml 441 BLAKE2B c04d84af2f7d50d0c2ccf2b134b90de33ecd52a1be37e018c2c4ae071f0a54628b16c3da82398bddc4b9d53adff5f0b5da0356d12b9138b19cd4bcc7433a1255 SHA512 9725ace7bfceff2309f836bf01ab5da588f24da56d85e1130c098353e617945b820b7763cf0932e15e2b5d7ed339929fed26e8defc6a19bcad17235fe01bfc3c
diff --git a/app-text/libwpg/libwpg-0.3.2.ebuild b/app-text/libwpg/libwpg-0.3.2.ebuild
deleted file mode 100644
index 1ca82bb199ef..000000000000
--- a/app-text/libwpg/libwpg-0.3.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit alternatives
-
-DESCRIPTION="C++ library to read and parse graphics in WPG"
-HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
-IUSE="doc static-libs"
-
-RDEPEND="
-	app-text/libwpd:0.10[tools]
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_configure() {
-	econf \
-		--disable-werror \
-		--program-suffix=-${SLOT} \
-		$(use_with doc docs) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
-	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
-	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
-}
-
-pkg_postrm() {
-	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
-	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
-	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
-}
diff --git a/app-text/libwpg/libwpg-0.3.3.ebuild b/app-text/libwpg/libwpg-0.3.3.ebuild
index d21cc0f2a78d..1342505d388f 100644
--- a/app-text/libwpg/libwpg-0.3.3.ebuild
+++ b/app-text/libwpg/libwpg-0.3.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 55dbfe48cd14..08f452265594 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -5,5 +5,5 @@ AUX llpp.desktop 566 BLAKE2B 2b7497616434d7ae4abfa7a78d753f194ff13c460138a1d8f13
 DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
 EBUILD llpp-26b_p20180114.ebuild 3032 BLAKE2B d6cc8bf1fac0cd932c298d4816221137e47df136283fc752be62886a1111de02803e92230319ccffc1864dbaf81b318c0400a34454a4f1019d8825d76f353e5b SHA512 f4b0da1be74c63c71ae02e1b6dfb7067ead203a9e1203e2c88e1eb4302364205bb92c2e4e841d861124f99781e6bb7214bf5e536dbab51a0e20c178b54afec11
-EBUILD llpp-30.ebuild 1715 BLAKE2B c7e3de96332ddec7ed68bb96401dca50f12992c380b4694682f05acd89558c9cea0a92dbe8acf7cf0b37afbe1a13d5516ffaa8c2133832c1149a2ae5245974d3 SHA512 3af9f945925cb7552f9c19432cd7d43410de241d864de1b05e43e0530a538d76a9271ce1e68ed66968dd6e4b27a1678ba9a87870c495fccf79aa9a76367202fd
+EBUILD llpp-30.ebuild 1714 BLAKE2B 18e9e138cacfd1a3a66ee20530432cc2a8536771718ed9a675b26ce7298a9b2590f115d31fc7d56b80771b8a4bf80d29a1910fb8637c4166a013156e82dffa7d SHA512 53637de2dbd6bae2e885027ee39b3e2fe47b050852ae880b003c363ba2a42ca0ca176a22fa726fba874937d2cc41b70da5dda940d1c57975c96b137e647aea46
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 5b3092727458..9fc50c6f10e2 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
index 3221d01b8d7c..75f57caecbf3 100644
--- a/app-text/lv/Manifest
+++ b/app-text/lv/Manifest
@@ -3,6 +3,5 @@ AUX lv-headers.patch 725 BLAKE2B 64a570d256aae0e5d3c13c2c6a51c2311da1dff3057219f
 AUX lv-tinfo.patch 629 BLAKE2B 1923de4cb256d6752561f2489d1633a01987e4ad073bd28fcafcd2ab81c68a2ea8a4a278a0c4a8c1c09df581f0391fb2c469c65144ddf5d7975ba1b8b9ae5555 SHA512 3a33edf5ad11d77cd23bd27fbe071aacf83ec5367b100103954159a0dc4ba2856f3978d3b8c7f41c52006dc99097bdd9d127419f700d75cbb88b745ffe4694e0
 AUX lv-xz.patch 1415 BLAKE2B e4a9cbd5bb2ca71eb3c6eea8e132caf2f1bbfda84e8055654eac86948b7f0e57397af96beca2eeacf259f9258aafa5d03303a202ab5562236ba05f0adf22cfa7 SHA512 eb791a2e392070a01e372bbc6d0d4bc113fbb57394e50fb7a55e46ee4b0896177fdb1698db750b43e78b6aa120d0fef34ad4859fee5d4a1749c062a7afb6ec84
 DIST lv451.tar.gz 605082 BLAKE2B cbfdf1c4c90dc746de631e55e3d1e88335f22342991ca7d5bd4b3661803af4efc0c6dcd821ea58be6024fa7ce773ffaa0aa3844350b6f67dd61be09e2475cb70 SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810
-EBUILD lv-4.51-r3.ebuild 1067 BLAKE2B 22d15f031dc2edc33fd93e80e8bc9b596eb78cad3532307ba7bbe092f186f6cab722219441ff21aeb02a8aa8ac9b6c272951540e113440a9274af469a0dbbb5d SHA512 31a2d9bc82822582c2e68f746385b0e623a3aa05117f84c996023d4a9bfc575e281ebf7a15f71bc4d52b0297054b8e1bdb9e76202e911c7987aa388c8805fcec
-EBUILD lv-4.51-r4.ebuild 1007 BLAKE2B 51ee96a9678cd0e4c3b7b051d8f8ec43411258b08f398729bde0785454d29843fb4ea145ab336435b0f870ec8ad665063c1d67e078440a525b243b17354f543d SHA512 5860c40f73268d82f9ef8640d90d8827498d1cfea92a6ce8f338b8e84c4fb09747fd71feb3a22ecf260681bdc8080f443c40d238ab65aa5b2002885678826c1e
+EBUILD lv-4.51-r4.ebuild 1006 BLAKE2B 3b1d148cedb017ddce84cdd91b2652c9e583d64904d38fc2496e038ccb29e9d0e8f964513d893e211b48cc4a0a88abf9246fb5beff7daa2a6ac490c38faa1807 SHA512 538d091fe0d8077cf2135ebb467f65461d56806a301dec64e552683aa37cf3abd234192c626f7cc0b2e2b26eb7df5be2faaaa62d257e224405da08d01185a9fb
 MISC metadata.xml 358 BLAKE2B 56858cc481cec55add44dce0a02d0955fa787248b0a6861914fc450957d9b18ae256a698613d94479aca810cae4c264e0a91bf3ff89b52183c4945ce32a5dec5 SHA512 7b250d5ddc092d7ecd4e6f48175e1f57f1671af4f8529368f368071b777fd773e363e83bcd3cfee3c9352ee93c9c0bc205f940c4cb6601dac3164ad34766e6a1
diff --git a/app-text/lv/lv-4.51-r3.ebuild b/app-text/lv/lv-4.51-r3.ebuild
deleted file mode 100644
index f5f4561fe2c9..000000000000
--- a/app-text/lv/lv-4.51-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils toolchain-funcs
-
-MY_P="${PN}${PV//./}"
-
-DESCRIPTION="Powerful Multilingual File Viewer"
-#HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="!app-editors/levee
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-gentoo.patch
-	epatch "${FILESDIR}"/${PN}-headers.patch
-	epatch "${FILESDIR}"/${PN}-tinfo.patch
-	epatch "${FILESDIR}"/${PN}-xz.patch
-
-	cd "${S}"/src
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	ECONF_SOURCE=src econf
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README hello.sample
-	dohtml index.html relnote.html hello.sample.gif
-}
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
index 8cc8939a23b3..eef46afd6200 100644
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="!app-editors/levee
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 7b52671e9bb8..6e736a15a0f2 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,5 +1,7 @@
 DIST master-pdf-editor-5.2.20_qt5.amd64.tar.gz 16261577 BLAKE2B 112c8d308875d36e3a71d28ae407eb78a0f714383fc005dc020cdb911a5596548274a55466133d8e03cbf47df29c062973f243f88ad0b1e9caa8410fbdfe2b8d SHA512 85b095603da1114cd4749ddbcf7bdd513c868ee17434df47037f7e0b914546fd13a6911949579ee981b5c33dcb13eb0ffa9585d4cbedd9bff4dc56e32bdcf4cb
 DIST master-pdf-editor-5.3.02_qt5.amd64.tar.gz 16333023 BLAKE2B 99c1291cd5d354e304e873dd2528806898109f0a9a79c87eb89394ec8300ab692294c5b04fa7fb712df82fa683cd3ed549b9842417d2b13f6a3f5f41fcfa334e SHA512 bf1118f1eefe3f46addacba832eee757112a91154de5929c825845983e7b6bc681bff84501082e696bb14acf6652ea180912ae48a0dfea270053fc42a3200448
+DIST master-pdf-editor-5.3.12_qt5.amd64.tar.gz 16350912 BLAKE2B a633af3f9a99542b5c61c27b237c5788468d163ea3297d17134e6f4404cbf6bfd579bb9b1febbb27892e40b369405c05c827b0b01433039cb9d9b2f062a785bd SHA512 526ff0998734eb24406907b3ffbf8801fc04cd49aa620ea57e20cb885d7d3e94e279592bd937e306151f91f82c459cf6810c80e51d438fde0db9dbeef46edbbe
 EBUILD master-pdf-editor-5.2.20.ebuild 1174 BLAKE2B d5522b2277cdae788777071681ad00edab0c32897cdb204ade78167a42004e90119000e1dfcf11bd9f7059616fbb0f93bb231dcba236817082b5e00c25d20941 SHA512 1e462a4d9a8d30fc831cd70411ed028581d6c4d44038f9541f900a81763c122079c301056a230630d812aaac3db92ebd9e0889c7b1fb192a0ad34043697ef4ff
 EBUILD master-pdf-editor-5.3.02.ebuild 1174 BLAKE2B 296a73e127a2ffc90a85762bbe3724922f7af76ae972c0295f9103a68d573d67963bc14e251abb62e4cfcdbe0d99a3c2939978cefd05dd22cbf7fa5953997155 SHA512 227d9cf8bb100f905eb1cc5262d362ec71b4a70b801fc8eaab97029a8188d8dbf2c33d6af0250c9754845e79cacc90a2aa1b47946698a939030795333ee0db23
+EBUILD master-pdf-editor-5.3.12.ebuild 1174 BLAKE2B 9c347747f3b2692d4fa368b3f7b0bcf2baa4b461aeb530bb09345db7a1145f67870a6bca8c154c13c4cb29799ede5c80af298c915992484d34df3524f157ffb0 SHA512 82a6fa658e4678239662a28225b21383ebecc2c0af17882cfb83a436ef0bfb09d75de123b45851411800d7d6565687aa373157c8496ed10e60b6170641de484c
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.3.12.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.3.12.ebuild
new file mode 100644
index 000000000000..7b474ad5521c
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.3.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.4.1:5
+	>=dev-qt/qtgui-5.4.1:5
+	>=dev-qt/qtnetwork-5.4.1:5
+	>=dev-qt/qtprintsupport-5.4.1:5
+	>=dev-qt/qtsvg-5.4.1:5
+	>=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index dc88e7c1c875..48ca8b5d435a 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -2,8 +2,11 @@ AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6
 AUX mupdf-1.14-CFLAGS.patch 395 BLAKE2B cc841dc186ac09892789664395bf632a33af3fd1e979e6f23809be0de74181004714b7352d52f3e4414147fe565e73ae9a6fe6b35a6674445e88a3d67ef640c8 SHA512 a5029fca7665e417f16062dcad22e084d6d99cd9ff9a6f1ad853d3ba182c8f565c75469d77edda521f7e777e14a55d4126ddd7631e70290c340d9c7411974c47
 AUX mupdf-1.14-Makefile.patch 1294 BLAKE2B 228ab49a5814e24b0fb1995c5137ce513a303f495973699a370a13a2af17e436ad67ecb47bab739740f7593b71087e167461ff188ef0fe8edf3980450d54984a SHA512 33be7134f8f469a4c72daf59d705de2ed2952ba4ff518ab54f5dc44279d4af8c5d05919bd19d4c6b84085f47f3713a752d678e708aa736e703d2f47d94391b84
 AUX mupdf-1.14-fix-big-endian.patch 4086 BLAKE2B c5104e808a83f122f1c1e80fd57b5aabadc017458e1d2383b09eef457ff6bd8809a42efac01d1f5fdfcbc55789696a2ab62dfd7f6f83150a1016e4c07c4fdfea SHA512 2519b33703976465f1411cad10daebe7646c2830ac385df642b326e82ca608bb4662f824ff98a1cc434994191f222ee02f56b296cac526abaa9e69d5786d50be
+AUX mupdf-1.14-libressl.patch 1362 BLAKE2B b52ccec0a03d97b357d5329317143595e0cf3029179b91f3d6134f6b59e313ed71063aee97d1192630fb64bd237997b1a56a6a55461b5e434297756e234990ef SHA512 3094d427a7beedc756e47a367423ffe7c8221f9078bd7bef5e8dddba615e918824778cc8118cd656b2dd1d8c235c770631241eb84a46551c96c32906a7986281
 AUX mupdf-1.14-openssl-curl-x11.patch 1799 BLAKE2B 62ae64baad844a13379f8dd1e1a1fed7cc0675fafe79e92a1029a968f59aa0aa3557734f2aa8e56d84f9bbeffbd148ae12255538d2f7b27a07fad5030621d33e SHA512 b6892c58c8a0d7561af16cc3e45e666b8bd1a6824f803d7500dd2db09b4bb477c45ab71b955bf76eedea8352d62d062ee656157c55d635514e464afdef1c2583
+AUX mupdf-1.14-r3-openssl-curl-x11.patch 1256 BLAKE2B 49bfda1f434fbfcf85c7b38b714b3c471d8d4ce02d625a6716582e0a9b3d1d0f623d401a0e9f4fc8ce4a1a6109925199c9c2b188be8739f274804217fb829efb SHA512 387f282fdd2e450585743de7fa297c24685d12c199c801f930da37795c6406aa9ee0bee335c54ca6ccef46726ebf6b49b389753f061542cf7e5381c979e0786d
 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
 EBUILD mupdf-1.14.0-r2.ebuild 3112 BLAKE2B 15e7a667afa71e4c34c2d5364cf23ed97700d0248b1e3f7ded0485cd401fd8f2f89ddd7f4ed419b061117ef3908100be8a3628588ffde765101c7e4b3aeb2744 SHA512 8921e789ffc8c0972a0f533200504fce27c3a75ade0e3d0bf7206860a4875ac4d844cf82ff5e7f0a322dd8dff792de69881dfa785940d1800e26a2b1eb740768
+EBUILD mupdf-1.14.0-r3.ebuild 3333 BLAKE2B edad471b5ec05e9932bf734b352bf4a7d99115fcc214f843b452f71e9c39dfb27b6b631fae9316a1bf2e4a6020d7424998666d2c433ade867182b303a4643afe SHA512 9e15ca3d84f0a04999127a8a4327de7dd55498aa0d59e3e8a0ca70bc09fbe222ea498894736e6fb9acf2e6c8a8523c419fe1f443f0bdf10344a0e8ca996d795a
 MISC metadata.xml 325 BLAKE2B b1481395199609bf3f4f01f21946866005eeb2a5df124c1ded940702808cfba176494e7b801ad5fef4ea61c93ce47e7415548a3e86d0d41b28c16ea1d064a152 SHA512 8b7c565857b47f585fa4059e99087efdbf1a88cc61fc2370a489ebf6c46e3a1271eb23b2173354054c82317ce7305d9372f6d05afd4749b0467635030cd5ea1e
diff --git a/app-text/mupdf/files/mupdf-1.14-libressl.patch b/app-text/mupdf/files/mupdf-1.14-libressl.patch
new file mode 100644
index 000000000000..fcc0a7205c1c
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-libressl.patch
@@ -0,0 +1,45 @@
+From 8561b744ac95ab6145a1163fa1d7c490a3329465 Mon Sep 17 00:00:00 2001
+From: William <wonko@undefined.re>
+Date: Mon, 12 Nov 2018 16:50:07 +0100
+Subject: [PATCH] hardcode missing ssl functions
+
+---
+ source/helpers/pkcs7/pkcs7-openssl.c | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c
+index 58dbf65..2b1f9e9 100644
+--- a/source/helpers/pkcs7/pkcs7-openssl.c
++++ b/source/helpers/pkcs7/pkcs7-openssl.c
+@@ -511,6 +511,28 @@ static void signer_drop_designated_name(pdf_pkcs7_signer *signer, pdf_pkcs7_desi
+ 	fz_free(osigner->ctx, dn);
+ }
+ 
++int
++PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag)
++{
++    return OBJ_obj2nid(bag->type);
++}
++
++const STACK_OF(PKCS12_SAFEBAG) *
++PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag)
++{
++    if (OBJ_obj2nid(bag->type) != NID_safeContentsBag)
++        return NULL;
++    return bag->value.safes;
++}
++
++const PKCS8_PRIV_KEY_INFO *
++PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag)
++{
++    if (PKCS12_SAFEBAG_get_nid(bag) != NID_keyBag)
++        return NULL;
++    return bag->value.keybag;
++}
++
+ static void add_from_bags(X509 **pX509, EVP_PKEY **pPkey, const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pw);
+ 
+ static void add_from_bag(X509 **pX509, EVP_PKEY **pPkey, PKCS12_SAFEBAG *bag, const char *pw)
+-- 
+2.19.1
+
diff --git a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch
new file mode 100644
index 000000000000..79efe32c0e41
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch
@@ -0,0 +1,35 @@
+diff --git a/Makerules b/Makerules
+index fc9bf998..f1fd93cb 100644
+--- a/Makerules
++++ b/Makerules
+@@ -113,10 +113,11 @@ else ifeq ($(OS),Linux)
+ 	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
+   endif
+ 
+-  HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
++  HAVE_CURL ?= not-unless-portage-tells-me
+   ifeq ($(HAVE_CURL),yes)
+ 	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+-	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++    # We have to forcibly add -lpthread to avoid linking errors.
++	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread
+   endif
+ 
+   HAVE_GLUT := yes
+@@ -125,13 +126,14 @@ else ifeq ($(OS),Linux)
+ 	SYS_GLUT_LIBS := -lglut -lGL
+   endif
+ 
+-  HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
++  HAVE_X11 ?= not-unless-portage-tells-me
+   ifeq ($(HAVE_X11),yes)
+ 	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ 	X11_LIBS := $(shell pkg-config --libs x11 xext)
+   endif
+ 
+-  HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
++  
++  HAVE_LIBCRYPTO ?= not-unless-portage-tells-me
+   ifeq ($(HAVE_LIBCRYPTO),yes)
+ 	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
+ 	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
new file mode 100644
index 000000000000..1b153620923f
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X curl +javascript libressl opengl openssl static-libs +vanilla"
+
+RDEPEND="
+	>=dev-lang/mujs-1.0.4
+	media-libs/freetype:2=[static-libs?]
+	media-libs/harfbuzz:=[static-libs?,truetype]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	>=media-libs/openjpeg-2.1:2=[static-libs?]
+	virtual/jpeg[static-libs?]
+	curl? ( net-misc/curl[static-libs?] )
+	libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
+	opengl? ( >=media-libs/freeglut-3.0.0:= )
+	openssl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
+	X? (
+		x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+REQUIRED_USE="
+	libressl? ( !openssl )
+	opengl? ( !static-libs )
+	curl? ( X )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14-CFLAGS.patch
+	"${FILESDIR}"/${PN}-1.14-Makefile.patch
+	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	# See bugs #662352
+	"${FILESDIR}"/${PN}-1.14-r3-openssl-curl-x11.patch
+	# bug #672998
+	"${FILESDIR}"/${PN}-1.14-fix-big-endian.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use hppa && append-cflags -ffunction-sections
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	use vanilla || eapply \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	# See bug #670832
+	use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getLD)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
+		-i Makerules || die
+}
+
+_emake() {
+	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	local have_libcrypto=no
+	if use openssl || use libressl ; then
+		have_libcrypto=yes
+	fi
+	emake \
+		GENTOO_PV=${PV} \
+		HAVE_GLUT=$(usex opengl) \
+		HAVE_CURL=$(usex curl) \
+		HAVE_LIBCRYPTO=$have_libcrypto \
+		HAVE_X11=$(usex X) \
+		USE_SYSTEM_LIBS=yes \
+		USE_SYSTEM_MUJS=yes \
+		HAVE_OBJCOPY=no \
+		"$@"
+}
+
+src_compile() {
+	_emake XCFLAGS="-fpic"
+
+	use curl && _emake extra-apps
+
+	use static-libs && \
+		_emake build/debug/lib${PN}.a
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	_emake install
+
+	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a build/debug/lib${PN}.a
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+	use curl && dobin build/debug/${PN}-x11-curl
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 9548946ca56b..48f1b9323bfd 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,4 +1,8 @@
 AUX texlive-core-2017-poppler064.patch 5491 BLAKE2B 2028747fba8ecf08a47d3f4348fef40095ca1cd7127eb0f332c0bcd68f396070cbd1c8a8daa1aa52315ec7a14fbbc5e10c82d5cdbfc3ed2db31f6c43a23a7678 SHA512 d05e79ba223f22d73c2bdb83020ab61b8eb0e7d2c963635afe6badbfcd5c8654bb93eb9aba8add9e49e5866563ac8e8ee54ce231f88526423cb915eeb08c9c0d
+AUX texlive-core-2017-poppler069.patch 7757 BLAKE2B 4465552809e9101058562f390d90e94e768eb55dfeb4724598c5aac1677a99379ebfbddcf0be3bb3f1c0bd4e308aec22d88c7526c9f2f7107381cfa5c44c54c4 SHA512 e1a9d7488b8a5cf92f0fe4111970f73f4f1308d5dfd4e7092d67ba46a891bcf25589da0b78fec5c99b9315e9f1527eeda97223151bdef562b37306d20b575e3d
+AUX texlive-core-2017-poppler071.patch 10031 BLAKE2B c9ca6c5b6b6ec0c2e5320dbf53bd845579a0e7bffbd723fa7e5d44297e9b23eac4018c5d4da913374c09eaf9d424787a8e421ad406c299445e83abed108f8b3d SHA512 4fec9eefbf3dabdba24258e2e6e5569113c239f339d481a8edd7c49443b4788e689be462baccdb639037441e4bc9634b196d73841e5cc7b69e6888ead259fabf
+AUX texlive-core-2017-poppler072.patch 6784 BLAKE2B f0253975e7f64b39f2671e3cf2d4bf27219309e5febbcd0e9a75529a0055c4bc44b9f5295af71a9c865e84322d1caf57f9ffe68f3eb00ad8ded5ff67c95329fc SHA512 6e6d99fab8ad0b3f3782531a19519c1967470661a48d5073c308e489f2254cad30483b75d7375dbdbccf20efce550cadc4383e06d8275b27ff778a1997869228
+AUX texlive-core-2017-poppler073.patch 2603 BLAKE2B 1d79005e38f1a0f31d47bee4d23b2ebe602f1e0850b628b667fb77ff42183c30c34ffbf506e75e53d56a26782efc3ae1d9c785ff4718b6215295fc2b54a4024b SHA512 8b7e53334787a492a4a1142ea19d03f989e77a375f5455ec3e2299d72522bd99d5ca5c96c7bf28a7ca99866bea1eb813933a51cebb7cf4551c433df4aa6539e1
 DIST texlive-20170524-source-freetype.patch.xz 625056 BLAKE2B 70bcd15da1edfe5422f6dc0e736bc842f93787d45a81f823c8ddc5a420eff65f176ccce20cb17ac1dbc3b4eef3081de7dfbe34eb390f1baaa925e17f3d55c6c1 SHA512 daa0ff9306b39e6d5058c53572fdc741adad17cec9a874785005aacd0e57b75ce59f21d0d12260f4178d47b7b0e6509e49c44e2ab524613fe962ac1199a9120b
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
@@ -159,5 +163,5 @@ DIST texlive-module-typeoutfileinfo-2017.tar.xz 1596 BLAKE2B 3c20d6daebac40630f4
 DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf44728d0fc474cd1a39036997366b9f4565f6a1648a27ec904fc24100ab0109d35825b171f9d094a165cf72f7fbcf53ce766c5cd6acd336f2ac0 SHA512 277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de
 DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
-EBUILD texlive-core-2017-r4.ebuild 11818 BLAKE2B 955e5f488670ce38548df5706c3cd6117f5068617a1070c75239fb802aeb862f4e1ddf99fcaa4b17458181bb6c2eb0d3a046b5b133ab21db7cce02a614b1a9ec SHA512 b190396e707d875dab1801a25798e1e91cbeeca8414f819393b54b0bd9a7a8db9eb51547ad8656faaf3a41b90a9b98ebf4045a85b389427b29a7bdb57d61597c
+EBUILD texlive-core-2017-r4.ebuild 11952 BLAKE2B 0f35e84dd6ca4c7e7ed51eef9c3e37c128ed94a679304d48563390b3c70f7f58f5fccd3a213dcbd97024ab0df2f75feeb9f95103bd68949dd9d5872c6a48d117 SHA512 7d8e91ef2030d32815cec9e0c9325112fe355819cc8110a71c496be484a9a3ccdeeb4f461364a4637dad5d146a825de884948a552d8690e4d016ffd19bce06c3
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler069.patch b/app-text/texlive-core/files/texlive-core-2017-poppler069.patch
new file mode 100644
index 000000000000..309341705006
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2017-poppler069.patch
@@ -0,0 +1,216 @@
+From 29f2412e10523158f5e601f32482d3d233a934fc Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 12 Jan 2019 21:42:09 +0100
+Subject: [PATCH 1/2] Fix build with poppler-0.69.0
+
+---
+ texk/web2c/luatexdir/image/epdf.h          |  1 +
+ texk/web2c/luatexdir/image/pdftoepdf.w     | 14 +++++++-------
+ texk/web2c/luatexdir/lua/lepdflib.cc       | 18 +++++++++---------
+ texk/web2c/luatexdir/lua/lpdfscannerlib.cc |  1 +
+ texk/web2c/pdftexdir/pdftoepdf.cc          |  7 ++++---
+ texk/web2c/pdftexdir/pdftosrc.cc           |  5 +++--
+ 6 files changed, 25 insertions(+), 21 deletions(-)
+
+diff --git a/texk/web2c/luatexdir/image/epdf.h b/texk/web2c/luatexdir/image/epdf.h
+index 57bb2e39..ebc83bdb 100644
+--- a/texk/web2c/luatexdir/image/epdf.h
++++ b/texk/web2c/luatexdir/image/epdf.h
+@@ -39,6 +39,7 @@ extern "C" {
+ #  include <goo/GooString.h>
+ #  include <goo/gmem.h>
+ #  include <goo/gfile.h>
++#  include <goo/gdir.h>
+ #  include <Object.h>
+ #  include <Stream.h>
+ #  include <Gfx.h>
+diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
+index 3aebf009..0a23b201 100644
+--- a/texk/web2c/luatexdir/image/pdftoepdf.w
++++ b/texk/web2c/luatexdir/image/pdftoepdf.w
+@@ -31,7 +31,7 @@
+ 
+ extern void md5(Guchar *msg, int msgLen, Guchar *digest);
+ 
+-static GBool isInit = gFalse;
++static bool isInit = false;
+ 
+ /* Maintain AVL tree of all PDF files for embedding */
+ 
+@@ -468,7 +468,7 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj)
+         break;
+     /*
+     case objNum:
+-        GBool isNum() { return type == objInt || type == objReal; }
++        bool isNum() { return type == objInt || type == objReal; }
+         break;
+     */
+     case objString:
+@@ -587,11 +587,11 @@ void read_pdf_info(image_dict * idict)
+     PDFRectangle *pagebox;
+     int pdf_major_version_found, pdf_minor_version_found;
+     float xsize, ysize, xorig, yorig;
+-    if (isInit == gFalse) {
++    if (isInit == false) {
+         if (!(globalParams))
+             globalParams = new GlobalParams();
+-        globalParams->setErrQuiet(gFalse);
+-        isInit = gTrue;
++        globalParams->setErrQuiet(false);
++        isInit = true;
+     }
+     if (img_type(idict) == IMG_TYPE_PDF)
+         pdf_doc = refPdfDocument(img_filepath(idict), FE_FAIL);
+@@ -960,7 +960,7 @@ void epdf_free()
+     if (PdfDocumentTree != NULL)
+         avl_destroy(PdfDocumentTree, destroyPdfDocument);
+     PdfDocumentTree = NULL;
+-    if (isInit == gTrue)
++    if (isInit == true)
+         delete globalParams;
+-    isInit = gFalse;
++    isInit = false;
+ }
+diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
+index 14558510..d47ec941 100644
+--- a/texk/web2c/luatexdir/lua/lepdflib.cc
++++ b/texk/web2c/luatexdir/lua/lepdflib.cc
+@@ -1374,9 +1374,9 @@ static int m_Object_initBool(lua_State * L)
+         pdfdoc_changed_error(L);
+     luaL_checktype(L, 2, LUA_TBOOLEAN);
+     if (lua_toboolean(L, 2) != 0)
+-        *((Object *) uin->d) = Object(gTrue);
++        *((Object *) uin->d) = Object(true);
+     else
+-        *((Object *) uin->d) = Object(gFalse);
++        *((Object *) uin->d) = Object(false);
+     return 0;
+ }
+ 
+@@ -2881,12 +2881,12 @@ m_poppler_get_BOOL(Attribute, isHidden);
+ 
+ static int m_Attribute_setHidden(lua_State * L)
+ {
+-    GBool i;
++    bool i;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+-    i = (GBool) lua_toboolean(L, 2);
++    i = (bool) lua_toboolean(L, 2);
+     ((Attribute *) uin->d)->setHidden(i);
+     return 0;
+ }
+@@ -3023,7 +3023,7 @@ static int m_StructElement_getParentRef(lua_State * L)
+ // Ref is false if the C++ functione return false
+ static int m_StructElement_getPageRef(lua_State * L)
+ {
+-    GBool b;
++    bool b;
+     Ref *r;
+     udstruct *uin, *uout;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
+@@ -3069,13 +3069,13 @@ static int m_StructElement_setRevision(lua_State * L)
+ 
+ static int m_StructElement_getText(lua_State * L)
+ {
+-    GBool i;
++    bool i;
+     GooString *gs;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+-    i = (GBool) lua_toboolean(L, 2);
++    i = (bool) lua_toboolean(L, 2);
+     gs =  ((StructElement *) uin->d)->getText(i);
+     if (gs != NULL)
+         lua_pushlstring(L, gs->getCString(), gs->getLength());
+@@ -3164,7 +3164,7 @@ static int m_StructElement_findAttribute(lua_State * L)
+ {
+     Attribute::Type t;
+     Attribute::Owner o;
+-    GBool g;
++    bool g;
+     udstruct *uin, *uout;
+     const Attribute *a;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
+@@ -3172,7 +3172,7 @@ static int m_StructElement_findAttribute(lua_State * L)
+         pdfdoc_changed_error(L);
+     t = (Attribute::Type) luaL_checkint(L,1);
+     o = (Attribute::Owner) luaL_checkint(L,2);
+-    g = (GBool) lua_toboolean(L, 3);
++    g = (bool) lua_toboolean(L, 3);
+     a = ((StructElement *) uin->d)->findAttribute(t,g,o);
+ 
+     if (a!=NULL){
+diff --git a/texk/web2c/luatexdir/lua/lpdfscannerlib.cc b/texk/web2c/luatexdir/lua/lpdfscannerlib.cc
+index eb881b63..a2d39b83 100644
+--- a/texk/web2c/luatexdir/lua/lpdfscannerlib.cc
++++ b/texk/web2c/luatexdir/lua/lpdfscannerlib.cc
+@@ -34,6 +34,7 @@ extern "C" {
+ #  include <goo/GooString.h>
+ #  include <goo/gmem.h>
+ #  include <goo/gfile.h>
++#  include <goo/gdir.h>
+ #  include <Object.h>
+ #  include <Stream.h>
+ #  include <Gfx.h>
+diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc
+index 0ffc3e19..af12c74e 100644
+--- a/texk/web2c/pdftexdir/pdftoepdf.cc
++++ b/texk/web2c/pdftexdir/pdftoepdf.cc
+@@ -37,6 +37,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include <goo/GooString.h>
+ #include <goo/gmem.h>
+ #include <goo/gfile.h>
++#include <goo/gdir.h>
+ #define GString GooString
+ #else
+ #include <aconf.h>
+@@ -114,7 +115,7 @@ struct UsedEncoding {
+ 
+ static InObj *inObjList;
+ static UsedEncoding *encodingList;
+-static GBool isInit = gFalse;
++static bool isInit = false;
+ 
+ // --------------------------------------------------------------------
+ // Maintain list of open embedded PDF files
+@@ -718,8 +719,8 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
+     // initialize
+     if (!isInit) {
+         globalParams = new GlobalParams();
+-        globalParams->setErrQuiet(gFalse);
+-        isInit = gTrue;
++        globalParams->setErrQuiet(false);
++        isInit = true;
+     }
+     // open PDF file
+     pdf_doc = find_add_document(image_name);
+diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
+index ead9f209..22ab6bdc 100644
+--- a/texk/web2c/pdftexdir/pdftosrc.cc
++++ b/texk/web2c/pdftexdir/pdftosrc.cc
+@@ -31,6 +31,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #include <goo/GooString.h>
+ #include <goo/gmem.h>
+ #include <goo/gfile.h>
++#include <goo/gdir.h>
+ #else
+ #include <aconf.h>
+ #include <GString.h>
+@@ -167,8 +168,8 @@ int main(int argc, char *argv[])
+ 
+                 // parse the header: object numbers and offsets
+                 objStr.streamReset();
+-                str = new EmbedStream(objStr.getStream(), Object(objNull), gTrue, first);
+-                parser = new Parser(xref, new Lexer(xref, str), gFalse);
++                str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
++                parser = new Parser(xref, new Lexer(xref, str), false);
+                 for (n = 0; n < nObjects; ++n) {
+                     obj1 = parser->getObj();
+                     obj2 = parser->getObj();
+-- 
+2.20.1
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler071.patch b/app-text/texlive-core/files/texlive-core-2017-poppler071.patch
new file mode 100644
index 000000000000..6238002c2e59
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2017-poppler071.patch
@@ -0,0 +1,281 @@
+From 2f77decfd2340c9a241dc508ae984a93dfef2643 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 12 Jan 2019 21:43:29 +0100
+Subject: [PATCH 2/2] Fix build with poppler-0.71.0
+
+Thanks-to: maurerpe <junk4me46806@yahoo.com>
+---
+ texk/web2c/luatexdir/image/pdftoepdf.w | 10 +++++-----
+ texk/web2c/luatexdir/lua/lepdflib.cc   | 18 +++++++++---------
+ texk/web2c/pdftexdir/pdftex-common.h   |  2 +-
+ texk/web2c/pdftexdir/pdftoepdf.cc      | 20 ++++++++++----------
+ texk/web2c/pdftexdir/writeenc.c        |  2 +-
+ texk/web2c/xetexdir/pdfimage.cpp       |  2 +-
+ 6 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
+index 0a23b201..aa1d7f25 100644
+--- a/texk/web2c/luatexdir/image/pdftoepdf.w
++++ b/texk/web2c/luatexdir/image/pdftoepdf.w
+@@ -363,7 +363,7 @@ void copyReal(PDF pdf, double d)
+ 
+ static void copyString(PDF pdf, GooString * string)
+ {
+-    char *p;
++    const char *p;
+     unsigned char c;
+     size_t i, l;
+     p = string->getCString();
+@@ -393,7 +393,7 @@ static void copyString(PDF pdf, GooString * string)
+     pdf->cave = true;
+ }
+ 
+-static void copyName(PDF pdf, char *s)
++static void copyName(PDF pdf, const char *s)
+ {
+     pdf_out(pdf, '/');
+     for (; *s != 0; s++) {
+@@ -527,7 +527,7 @@ static void writeRefs(PDF pdf, PdfDocument * pdf_doc)
+ 
+ /* get the pagebox coordinates according to the pagebox_spec */
+ 
+-static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
++static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
+ {
+     switch (pagebox_spec) {
+         case PDF_BOX_SPEC_MEDIA:
+@@ -584,7 +584,7 @@ void read_pdf_info(image_dict * idict)
+     Catalog *catalog;
+     Page *page;
+     int rotate;
+-    PDFRectangle *pagebox;
++    const PDFRectangle *pagebox;
+     int pdf_major_version_found, pdf_minor_version_found;
+     float xsize, ysize, xorig, yorig;
+     if (isInit == false) {
+@@ -721,7 +721,7 @@ void write_epdf(PDF pdf, image_dict * idict, int suppress_optional_info)
+     Ref *pageref;
+     Dict *pageDict;
+     Object obj1, contents, pageobj, pagesobj1, pagesobj2, *op1, *op2, *optmp;
+-    PDFRectangle *pagebox;
++    const PDFRectangle *pagebox;
+     int i, l;
+     double bbox[4];
+     /* char s[256]; */
+diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
+index d47ec941..01f9415c 100644
+--- a/texk/web2c/luatexdir/lua/lepdflib.cc
++++ b/texk/web2c/luatexdir/lua/lepdflib.cc
+@@ -238,7 +238,7 @@ static int l_new_Attribute(lua_State * L)
+        if (uobj->pd != NULL && uobj->pd->pc != uobj->pc)
+           pdfdoc_changed_error(L);
+        uout = new_Attribute_userdata(L);
+-       uout->d = new Attribute(n, nlen, (Object *)uobj->d);
++       uout->d = new Attribute(GooString(n, nlen), (Object *)uobj->d);
+        uout->atype = ALLOC_LEPDF;
+        uout->pc = uobj->pc;
+        uout->pd = uobj->pd;
+@@ -443,7 +443,7 @@ static int m_##in##_##function(lua_State * L)                  \
+     uin = (udstruct *) luaL_checkudata(L, 1, M_##in);          \
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)             \
+         pdfdoc_changed_error(L);                               \
+-    o = ((in *) uin->d)->function();                           \
++    o = (out *) ((in *) uin->d)->function();		       \
+     if (o != NULL) {                                           \
+         uout = new_##out##_userdata(L);                        \
+         uout->d = o;                                           \
+@@ -972,12 +972,12 @@ m_poppler_get_INT(Dict, getLength);
+ 
+ static int m_Dict_add(lua_State * L)
+ {
+-    char *s;
++    const char *s;
+     udstruct *uin, *uobj;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_Dict);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+-    s = copyString(luaL_checkstring(L, 2));
++    s = luaL_checkstring(L, 2);
+     uobj = (udstruct *) luaL_checkudata(L, 3, M_Object);
+     ((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d)));
+     return 0;
+@@ -1894,7 +1894,7 @@ static int m_Object_dictAdd(lua_State * L)
+         pdfdoc_changed_error(L);
+     if (!((Object *) uin->d)->isDict())
+         luaL_error(L, "Object is not a Dict");
+-    ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d)));
++    ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d)));
+     return 0;
+ }
+ 
+@@ -2308,7 +2308,7 @@ m_PDFDoc_INT(getErrorCode);
+ 
+ static int m_PDFDoc_getFileName(lua_State * L)
+ {
+-    GooString *gs;
++    const GooString *gs;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+@@ -2396,7 +2396,7 @@ m_PDFDoc_INT(getNumPages);
+ 
+ static int m_PDFDoc_readMetadata(lua_State * L)
+ {
+-    GooString *gs;
++    const GooString *gs;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+@@ -2414,7 +2414,7 @@ static int m_PDFDoc_readMetadata(lua_State * L)
+ 
+ static int m_PDFDoc_getStructTreeRoot(lua_State * L)
+ {
+-    StructTreeRoot *obj;
++    const StructTreeRoot *obj;
+     udstruct *uin, *uout;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+@@ -2422,7 +2422,7 @@ static int m_PDFDoc_getStructTreeRoot(lua_State * L)
+     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
+         obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
+         uout = new_StructTreeRoot_userdata(L);
+-        uout->d = obj;
++        uout->d = (StructTreeRoot *) obj;
+         uout->pc = uin->pc;
+         uout->pd = uin->pd;
+     } else
+diff --git a/texk/web2c/pdftexdir/pdftex-common.h b/texk/web2c/pdftexdir/pdftex-common.h
+index 307ba64a..09741707 100644
+--- a/texk/web2c/pdftexdir/pdftex-common.h
++++ b/texk/web2c/pdftexdir/pdftex-common.h
+@@ -101,7 +101,7 @@ extern void tex_printf(const char *, ...);
+ extern void write_epdf(void);
+ 
+ /* writeenc.c */
+-extern void epdf_write_enc(char **, int);
++extern void epdf_write_enc(const char **, int);
+ 
+ /* writeimg.c */
+ extern float epdf_width;
+diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc
+index af12c74e..e353b652 100644
+--- a/texk/web2c/pdftexdir/pdftoepdf.cc
++++ b/texk/web2c/pdftexdir/pdftoepdf.cc
+@@ -270,7 +270,7 @@ static int getNewObjectNumber(Ref ref)
+ 
+ static void copyObject(Object *);
+ 
+-static void copyName(char *s)
++static void copyName(const char *s)
+ {
+     pdf_puts("/");
+     for (; *s != 0; s++) {
+@@ -305,7 +305,7 @@ static void copyDict(Object * obj)
+ static void copyFontDict(Object * obj, InObj * r)
+ {
+     int i, l;
+-    char *key;
++    const char *key;
+     if (!obj->isDict())
+         pdftex_fail("PDF inclusion: invalid dict type <%s>",
+                     obj->getTypeName());
+@@ -377,7 +377,7 @@ static bool embeddableFont(Object * fontdesc)
+     return false;
+ }
+ 
+-static void copyFont(char *tag, Object * fontRef)
++static void copyFont(const char *tag, Object * fontRef)
+ {
+     Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
+         stemV;
+@@ -462,7 +462,7 @@ static void copyFontResources(Object * obj)
+     pdf_puts(">>\n");
+ }
+ 
+-static void copyOtherResources(Object * obj, char *key)
++static void copyOtherResources(Object * obj, const char *key)
+ {
+     // copies all other resources (write_epdf handles Fonts and ProcSets),
+ 
+@@ -549,7 +549,7 @@ static void copyObject(Object * obj)
+     Object obj1;
+     int i, l, c;
+     Ref ref;
+-    char *p;
++    const char *p;
+     GString *s;
+     if (obj->isBool()) {
+         pdf_printf("%s", obj->getBool()? "true" : "false");
+@@ -650,7 +650,7 @@ static void writeRefs()
+ static void writeEncodings()
+ {
+     UsedEncoding *r, *n;
+-    char *glyphNames[256], *s;
++    const char *glyphNames[256], *s;
+     int i;
+     for (r = encodingList; r != 0; r = r->next) {
+         for (i = 0; i < 256; i++) {
+@@ -678,7 +678,7 @@ static void writeEncodings()
+ }
+ 
+ // get the pagebox according to the pagebox_spec
+-static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
++static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
+ {
+     if (pagebox_spec == pdfboxspecmedia)
+         return page->getMediaBox();
+@@ -710,7 +710,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
+ {
+     PdfDocument *pdf_doc;
+     Page *page;
+-    PDFRectangle *pagebox;
++    const PDFRectangle *pagebox;
+ #ifdef POPPLER_VERSION
+     int pdf_major_version_found, pdf_minor_version_found;
+ #else
+@@ -829,7 +829,7 @@ void write_epdf(void)
+     Object groupDict;
+     bool writeSepGroup = false;
+     Object info;
+-    char *key;
++    const char *key;
+     char s[256];
+     int i, l;
+     int rotate;
+@@ -856,7 +856,7 @@ void write_epdf(void)
+     pageObj = xref->fetch(pageRef->num, pageRef->gen);
+     pageDict = pageObj.getDict();
+     rotate = page->getRotate();
+-    PDFRectangle *pagebox;
++    const PDFRectangle *pagebox;
+     // write the Page header
+     pdf_puts("/Type /XObject\n");
+     pdf_puts("/Subtype /Form\n");
+diff --git a/texk/web2c/pdftexdir/writeenc.c b/texk/web2c/pdftexdir/writeenc.c
+index bd55103f..08f44633 100644
+--- a/texk/web2c/pdftexdir/writeenc.c
++++ b/texk/web2c/pdftexdir/writeenc.c
+@@ -83,7 +83,7 @@ fe_entry *get_fe_entry(char *s)
+ 
+ /**********************************************************************/
+ 
+-void epdf_write_enc(char **glyph_names, int fe_objnum)
++void epdf_write_enc(const char **glyph_names, int fe_objnum)
+ {
+     int i, i_old;
+     assert(glyph_names != NULL);
+diff --git a/texk/web2c/xetexdir/pdfimage.cpp b/texk/web2c/xetexdir/pdfimage.cpp
+index 85389136..ce46cae1 100644
+--- a/texk/web2c/xetexdir/pdfimage.cpp
++++ b/texk/web2c/xetexdir/pdfimage.cpp
+@@ -78,7 +78,7 @@ pdf_get_rect(char* filename, int page_num, int pdf_box, realrect* box)
+ 
+ 	Page*		page = doc->getCatalog()->getPage(page_num);
+ 
+-	PDFRectangle*	r;
++	const PDFRectangle*	r;
+ 	switch (pdf_box) {
+ 		default:
+ 		case pdfbox_crop:
+-- 
+2.20.1
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler072.patch b/app-text/texlive-core/files/texlive-core-2017-poppler072.patch
new file mode 100644
index 000000000000..489ff25fa006
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2017-poppler072.patch
@@ -0,0 +1,157 @@
+From 19462cf1b5628d7251cde91031a0635e636d890a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 12 Jan 2019 21:59:07 +0100
+Subject: [PATCH] Fix build with poppler-0.72
+
+---
+ texk/web2c/luatexdir/image/pdftoepdf.w |  2 +-
+ texk/web2c/luatexdir/lua/lepdflib.cc   | 16 ++++++++--------
+ texk/web2c/pdftexdir/pdftoepdf.cc      |  4 ++--
+ texk/web2c/pdftexdir/pdftosrc.cc       |  6 +++---
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
+index aa1d7f25..2f143068 100644
+--- a/texk/web2c/luatexdir/image/pdftoepdf.w
++++ b/texk/web2c/luatexdir/image/pdftoepdf.w
+@@ -366,7 +366,7 @@ static void copyString(PDF pdf, GooString * string)
+     const char *p;
+     unsigned char c;
+     size_t i, l;
+-    p = string->getCString();
++    p = string->c_str();
+     l = (size_t) string->getLength();
+     if (pdf->cave)
+         pdf_out(pdf, ' ');
+diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
+index 01f9415c..6b24a39b 100644
+--- a/texk/web2c/luatexdir/lua/lepdflib.cc
++++ b/texk/web2c/luatexdir/lua/lepdflib.cc
+@@ -523,7 +523,7 @@ static int m_##in##_##function(lua_State * L)                  \
+         pdfdoc_changed_error(L);                               \
+     gs = (GooString *)((in *) uin->d)->function();             \
+     if (gs != NULL)                                            \
+-        lua_pushlstring(L, gs->getCString(), gs->getLength()); \
++        lua_pushlstring(L, gs->c_str(), gs->getLength()); \
+     else                                                       \
+         lua_pushnil(L);                                        \
+     return 1;                                                  \
+@@ -758,7 +758,7 @@ static int m_Array_getString(lua_State * L)
+     if (i > 0 && i <= len) {
+         gs = new GooString();
+         if (((Array *) uin->d)->getString(i - 1, gs))
+-            lua_pushlstring(L, gs->getCString(), gs->getLength());
++            lua_pushlstring(L, gs->c_str(), gs->getLength());
+         else
+             lua_pushnil(L);
+         delete gs;
+@@ -910,7 +910,7 @@ static int m_Catalog_getJS(lua_State * L)
+     if (i > 0 && i <= len) {
+         gs = ((Catalog *) uin->d)->getJS(i - 1);
+         if (gs != NULL)
+-            lua_pushlstring(L, gs->getCString(), gs->getLength());
++            lua_pushlstring(L, gs->c_str(), gs->getLength());
+         else
+             lua_pushnil(L);
+         delete gs;
+@@ -1225,7 +1225,7 @@ static int m_GooString__tostring(lua_State * L)
+     uin = (udstruct *) luaL_checkudata(L, 1, M_GooString);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+-    lua_pushlstring(L, ((GooString *) uin->d)->getCString(),
++    lua_pushlstring(L, ((GooString *) uin->d)->c_str(),
+                     ((GooString *) uin->d)->getLength());
+     return 1;
+ }
+@@ -1657,7 +1657,7 @@ static int m_Object_getString(lua_State * L)
+         pdfdoc_changed_error(L);
+     if (((Object *) uin->d)->isString()) {
+         gs = (GooString *)((Object *) uin->d)->getString();
+-        lua_pushlstring(L, gs->getCString(), gs->getLength());
++        lua_pushlstring(L, gs->c_str(), gs->getLength());
+     } else
+         lua_pushnil(L);
+     return 1;
+@@ -2315,7 +2315,7 @@ static int m_PDFDoc_getFileName(lua_State * L)
+         pdfdoc_changed_error(L);
+     gs = ((PdfDocument *) uin->d)->doc->getFileName();
+     if (gs != NULL)
+-        lua_pushlstring(L, gs->getCString(), gs->getLength());
++        lua_pushlstring(L, gs->c_str(), gs->getLength());
+     else
+         lua_pushnil(L);
+     return 1;
+@@ -2404,7 +2404,7 @@ static int m_PDFDoc_readMetadata(lua_State * L)
+     if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
+         gs = ((PdfDocument *) uin->d)->doc->readMetadata();
+         if (gs != NULL)
+-            lua_pushlstring(L, gs->getCString(), gs->getLength());
++            lua_pushlstring(L, gs->c_str(), gs->getLength());
+         else
+             lua_pushnil(L);
+     } else
+@@ -3078,7 +3078,7 @@ static int m_StructElement_getText(lua_State * L)
+     i = (bool) lua_toboolean(L, 2);
+     gs =  ((StructElement *) uin->d)->getText(i);
+     if (gs != NULL)
+-        lua_pushlstring(L, gs->getCString(), gs->getLength());
++        lua_pushlstring(L, gs->c_str(), gs->getLength());
+     else
+         lua_pushnil(L);
+     return 1;
+diff --git a/texk/web2c/pdftexdir/pdftoepdf.cc b/texk/web2c/pdftexdir/pdftoepdf.cc
+index e353b652..84e9f7ce 100644
+--- a/texk/web2c/pdftexdir/pdftoepdf.cc
++++ b/texk/web2c/pdftexdir/pdftoepdf.cc
+@@ -422,7 +422,7 @@ static void copyFont(const char *tag, Object * fontRef)
+         charset = fontdesc.dictLookup("CharSet");
+         if (!charset.isNull() &&
+             charset.isString() && is_subsetable(fontmap))
+-            epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
++            epdf_mark_glyphs(fd, (char *)charset.getString()->c_str());
+         else
+             embed_whole_font(fd);
+         addFontDesc(fontdescRef.getRef(), fd);
+@@ -561,7 +561,7 @@ static void copyObject(Object * obj)
+         pdf_printf("%s", convertNumToPDF(obj->getNum()));
+     } else if (obj->isString()) {
+         s = (GooString *)obj->getString();
+-        p = s->getCString();
++        p = s->c_str();
+         l = s->getLength();
+         if (strlen(p) == (unsigned int) l) {
+             pdf_puts("(");
+diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
+index 22ab6bdc..bad1b78f 100644
+--- a/texk/web2c/pdftexdir/pdftosrc.cc
++++ b/texk/web2c/pdftexdir/pdftosrc.cc
+@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
+             fprintf(stderr, "No SourceName found\n");
+             exit(1);
+         }
+-        outname = (char *)srcName.getString()->getCString();
++        outname = (char *)srcName.getString()->c_str();
+         // We cannot free srcName, as objname shares its string.
+         // srcName.free();
+     } else if (objnum > 0) {
+@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
+             fprintf(stderr, "Not a Stream object\n");
+             exit(1);
+         }
+-        sprintf(buf, "%s", fileName->getCString());
++        sprintf(buf, "%s", fileName->c_str());
+         if ((p = strrchr(buf, '.')) == 0)
+             p = strchr(buf, 0);
+         if (objgen == 0)
+@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
+         outname = buf;
+     } else {                    // objnum < 0 means we are extracting the XRef table
+         extract_xref_table = true;
+-        sprintf(buf, "%s", fileName->getCString());
++        sprintf(buf, "%s", fileName->c_str());
+         if ((p = strrchr(buf, '.')) == 0)
+             p = strchr(buf, 0);
+         sprintf(p, ".xref");
+-- 
+2.20.1
+
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler073.patch b/app-text/texlive-core/files/texlive-core-2017-poppler073.patch
new file mode 100644
index 000000000000..487ecc0129c1
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2017-poppler073.patch
@@ -0,0 +1,74 @@
+From b3df00dcf7332ae9b64f019278af8708c1ced284 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 16 Jan 2019 21:10:09 +0100
+Subject: [PATCH] Fix build with poppler-0.73
+
+---
+ texk/web2c/luatexdir/image/pdftoepdf.w | 2 +-
+ texk/web2c/luatexdir/lua/lepdflib.cc   | 8 ++++----
+ texk/web2c/pdftexdir/pdftosrc.cc       | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/texk/web2c/luatexdir/image/pdftoepdf.w b/texk/web2c/luatexdir/image/pdftoepdf.w
+index 2f143068..10ed9879 100644
+--- a/texk/web2c/luatexdir/image/pdftoepdf.w
++++ b/texk/web2c/luatexdir/image/pdftoepdf.w
+@@ -29,7 +29,7 @@
+     the functions of poppler, which happens to be written in C++.
+ */
+ 
+-extern void md5(Guchar *msg, int msgLen, Guchar *digest);
++extern void md5(unsigned char *msg, int msgLen, unsigned char *digest);
+ 
+ static bool isInit = false;
+ 
+diff --git a/texk/web2c/luatexdir/lua/lepdflib.cc b/texk/web2c/luatexdir/lua/lepdflib.cc
+index 6b24a39b..87078fc5 100644
+--- a/texk/web2c/luatexdir/lua/lepdflib.cc
++++ b/texk/web2c/luatexdir/lua/lepdflib.cc
+@@ -2867,12 +2867,12 @@ m_poppler_get_GUINT(Attribute,getRevision);
+ 
+ static int m_Attribute_setRevision(lua_State * L)
+ {
+-    Guint i;
++    unsigned int i;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+-    i = (Guint) luaL_checkint(L, 2);
++    i = (unsigned int) luaL_checkint(L, 2);
+     ((Attribute *) uin->d)->setRevision(i);
+     return 0;
+ }
+@@ -3057,12 +3057,12 @@ static int m_StructElement_getTypeName(lua_State * L)
+ 
+ static int m_StructElement_setRevision(lua_State * L)
+ {
+-    Guint i;
++    unsigned int i;
+     udstruct *uin;
+     uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement);
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+-    i = (Guint) luaL_checkint(L, 2);
++    i = (unsigned int) luaL_checkint(L, 2);
+     ((StructElement *) uin->d)->setRevision(i);
+     return 0;
+ }
+diff --git a/texk/web2c/pdftexdir/pdftosrc.cc b/texk/web2c/pdftexdir/pdftosrc.cc
+index bad1b78f..295c4e66 100644
+--- a/texk/web2c/pdftexdir/pdftosrc.cc
++++ b/texk/web2c/pdftexdir/pdftosrc.cc
+@@ -156,7 +156,7 @@ int main(int argc, char *argv[])
+                 Object objStr, obj1, obj2;
+                 int nObjects, first, n;
+                 int localOffset = 0;
+-                Guint firstOffset;
++                unsigned int firstOffset;
+ 
+                 objStr = xref->fetch(e->offset, 0);
+                 assert(objStr.isStream());
+-- 
+2.20.1
+
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index 2123b45c914b..e0cf232cbf42 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -166,6 +166,10 @@ src_prepare() {
 	# bug ?
 	epatch "${FILESDIR}/${P}-poppler064.patch"
 
+	if has_version ">=app-text/poppler-0.69.0"; then
+		epatch "${FILESDIR}"/${P}-poppler0{69,71,72,73}.patch # bugs #672854, 675448
+	fi
+
 	sed -i \
 		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
 		texk/web2c/configure || die
author	V3n3RiX <venerix@redcorelinux.org>	2019-02-20 15:11:50 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-02-20 15:11:50 +0000
commit	16449a80e28af2209916cc66d19c9a44ca2b90d9 (patch)
tree	b4cfe2332c7a6c5da27b6985bf05db4508df1a92 /app-text
parent	79599515788b85b18aa655e7b7f8cc05c1bbddd8 (diff)