gentoo resync : 25.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-25 07:36:27 +0100
commit: 43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree: 6208a7f4fc744684fce0f55acbb47511acace498 /app-text
parent: 28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)
71 files changed, 637 insertions, 1741 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 017f8cdaf02a..b16898f0a13b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/capyt/Manifest b/app-text/capyt/Manifest
index 71e233dffb77..f335556d64f5 100644
--- a/app-text/capyt/Manifest
+++ b/app-text/capyt/Manifest
@@ -1,3 +1,3 @@
-DIST capyt-1.0.tar.gz 2152 BLAKE2B bde81e802c310a95c37695943d35a6cc98557f92199b7f8d5983340d1cbd6d2ffe4c07b48a9ea724603766d371cd80519c01c663fb8303c1abec3879e12caf34 SHA512 325de4bdc3d6b7e6d0926f37cb7facfbc216c0d46280576a3424add0b8c081405809a23982cda3032b3443a41ddbd7f6997040f7353defcbe72895b1ceff8384
-EBUILD capyt-1.0.ebuild 563 BLAKE2B ffc4b2f372ae2cf90bf6239b0d19fe8828b6230e28faf639845fcd0cd44f08854aa48d8b2269b303abc5067b1a87a824f958f6e13ba3d4a714a74b2a64563100 SHA512 c6a28572d692f057816336fe4028f99982750592e2ff751481c5cf436f22a0f89c2fc6d80e8ea8d431e4096bdc12232787454d3bbf32a5ebf122f524c37ce4fd
+DIST capyt-1.1.1.tar.gz 3247 BLAKE2B 259c1cc7eddc88853518ed106f25e9b1d47a5c4604e749d25fb2133f11d90e78672473a9dd31fa80322b4c5177163fe5a177d27a6fd9a7cd31ef12db7ee3ed0f SHA512 863164967aab93088d39b0324d1324145f41ba76b9d21874ea6a3aa49955e1ec3430c7bcc9eb100c51b9e159c63758b6474d3bad586383d7c10d9f1118340123
+EBUILD capyt-1.1.1.ebuild 621 BLAKE2B 1a515438c4edffcfe46c918a72269eee288be9a2b79462407f167006623d88a0e85b35a5a27faf78c85aa9dbf7d90eb39268f11a0d73f6849668743cf877315c SHA512 8a140ac9876c903b14f0d6649f5f520abed1fcdae3816c75b7c0980c3770f1046d6b623d0575a267fc9b39dc7608b5b9441fa84b89cbec70cb40b42b46d59952
 MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/app-text/capyt/capyt-1.0.ebuild b/app-text/capyt/capyt-1.0.ebuild
deleted file mode 100644
index 13690113dc90..000000000000
--- a/app-text/capyt/capyt-1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5..6} )
-
-inherit python-single-r1
-
-DESCRIPTION="A python3 CLI utility to interface with cpy.pt paste service"
-HOMEPAGE="https://github.com/lbatalha/capyt"
-SRC_URI="https://github.com/lbatalha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-src_install() {
-	dodoc README.md
-
-	python_doscript capyt.py
-}
diff --git a/app-text/capyt/capyt-1.1.1.ebuild b/app-text/capyt/capyt-1.1.1.ebuild
new file mode 100644
index 000000000000..3ecc5167169f
--- /dev/null
+++ b/app-text/capyt/capyt-1.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5..7} )
+
+inherit distutils-r1
+
+MY_PV=$(ver_rs 2 '-')
+
+DESCRIPTION="A python3 CLI utility to interface with cpy.pt paste service"
+HOMEPAGE="https://github.com/lbatalha/capyt
+	https://pypi.org/project/capyt/"
+SRC_URI="https://github.com/lbatalha/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 82d6dd7d770e..9e5c79bef8e3 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,3 +1,5 @@
 DIST cb2bib-1.9.7.tar.gz 845121 BLAKE2B eafce83874e82c20a45de5dc4c1558aa40346821f26bf2d9f53332f337e5cdaffb92c70972fd8b99823f72615608ea848808c9875e16ed50f02cf1d9655d552e SHA512 87a438288c6e7776db136de63de1a8e27f2abf8499d28c0691b60ad3ef4f848e8987af4fc47d1f2cfb1d47009e28e7535f6bab998811cb721bfc9f384941b1e4
+DIST cb2bib-1.9.8.tar.gz 1180660 BLAKE2B 86a826a9285ecd5ecd266b3935ddfa330153cba4b28f378519b464719d5a2bcaa6043470d36ba5c443202a07a18bbaeb28c3371db07063f0d682b54d2a8fe373 SHA512 717f9b4de3e261e6d22a7e514e2ec5891723572f1624280edc8a980171f4dada6e177a3e95748fc39ff0ba1c137406e38dd14f43a0f1e0995c1f39992842f38a
 EBUILD cb2bib-1.9.7.ebuild 1790 BLAKE2B db2460c6938e26d0d349b6bf4ec5e3c8cf70484a9f88cd6774b1586ab1b16a847cae12dcc1aa0befaef92b45261136247b4b0eaa28c1502110f16958c49bd320 SHA512 32a00cff24547b539671f355083d5b8956d49a1ad416ad904c94f2c72b4ad2c1376298e6aaf1515a995f771cb9b6a2989c06a80ed408c24982b94dbc72109d7b
+EBUILD cb2bib-1.9.8.ebuild 1780 BLAKE2B 3d8ed83b34ac231bb158646f6ef3d45200e784f9702fc328ed5fd77c4f870f099856264f1d22fec812ae1dc27efad82a14002ca623dbd88fa1383f9502aff9f5 SHA512 7001951bf5a033a735d7b5a60c45d5c775bbcfb974fffac8a543ec95a2edaeaf1cd54a2053bd262515db81f65bf9334e906a06430a1715a63d81d3bc850c22b3
 MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a
diff --git a/app-text/cb2bib/cb2bib-1.9.8.ebuild b/app-text/cb2bib/cb2bib-1.9.8.ebuild
new file mode 100644
index 000000000000..295b6e26046f
--- /dev/null
+++ b/app-text/cb2bib/cb2bib-1.9.8.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Tool for extracting unformatted bibliographic references"
+HOMEPAGE="https://www.molspaces.com/cb2bib/"
+SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lzo webengine +webkit"
+
+REQUIRED_USE="?? ( webkit webengine )"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	lzo? ( dev-libs/lzo:2 )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS CHANGELOG COPYRIGHT )
+
+src_prepare() {
+	default
+
+	sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
+
+	use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
+	use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		$(use !lzo && echo -config disable_lzo)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "For best functionality, emerge the following packages:"
+	elog "    app-text/poppler[utils] - for data import from PDF files"
+	elog "    app-text/dvipdfm        - for data import from DVI files"
+	elog "    app-text/bibutils       - for data import from ISI, endnote format"
+	elog "    media-fonts/jsmath      - for displaying mathematical notation"
+	elog "    media-libs/exiftool     - for proper UTF-8 metadata writing in PDF"
+	elog "                              text strings"
+	elog "    virtual/latex-base      - to check for BibTeX file correctness and to get"
+	elog "                              nice printing through the shell script bib2pdf"
+}
diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
index dc1d71e9f58f..7896a24329bd 100644
--- a/app-text/cmigemo/Manifest
+++ b/app-text/cmigemo/Manifest
@@ -5,5 +5,6 @@ DIST cmigemo-1.3c-MIT.tar.bz2 54447 BLAKE2B 37e561b992317dbf421b3d09203e92000c02
 DIST cmigemo-1.3c.tar.bz2 54323 BLAKE2B 4d63bde57c442131056e1aabcc702308243491de0632325b7a80af328e293c97479ac1733f29484a2ee7912f6d599360e7703d45612e8b30b52fd7a1228b5152 SHA512 240bdc92139d692cdb9e98a977f77105ef3ca716ede030629b3c4652276f0b0955ae80cc443fb879cada4b3fc83f7e4181043355e0285fcfe1011f4db4d13cc1
 EBUILD cmigemo-1.3c-r1.ebuild 1910 BLAKE2B 2137be59b724d22a4304ce6b385ea2d7f18fa284ee0ac641ae1d96bb8237c0d9d46f1d5576693d062f05da606d03bbb455352002f0ec2270885024a92b7ab56a SHA512 f8c23bbb27d3903b67923effcb087ca39c3e02a6168fa35867271935e408e2f1787fb30e23cab917050933c8d5c12b8d00f52e233630273649af43f98be08172
 EBUILD cmigemo-1.3c-r2.ebuild 2065 BLAKE2B 7922babddc037ccdc5e0f3ba99c250b1f66c5c3774e1989b94a10e1be5ce76e087857264b808eaabd3d955107c9c92aa13f9f727a9ce68333c0b36eb8ce790a1 SHA512 0b7889d5d72b57f5b9b9d917fff39a125e08b0f762cf0bb455370f4297788a3dc2ce50071c65e4e4cd5a01e10c54af38117f2cc785b121ad330b3bcd416b1772
+EBUILD cmigemo-1.3c-r3.ebuild 2057 BLAKE2B 36218198cd736f2fd572a197f8706d6571a5cab235f2eea793ac5b5c572a26f917b7f5fe87d17e95acd082e9c79a0ce8042a4dbbeca6efb8c3a8fe0df7bd7b3f SHA512 3d8b729455a7c171a5f2069163a2ef9ca7ca2afb34e95ebcc060377e20cecb5d279dc3f8b910537301d5274203af96914d982c1eabaa8fed423259384eecfbb3
 EBUILD cmigemo-1.3c.ebuild 1584 BLAKE2B 3962bce2bd338cb0871af5410d0cd8840075950dc728474131616e98354874940fc98999a9b683d1558e118c11d40dc6e8e9ef755ad7ca2b88b33a8e9471245c SHA512 dcb4708ea6ba2ed0f46a4ac61b3ca2776aa131e1880ec5a7ef39e1a474ec00504681569b1cb0dcc328c02e4962d0c8408e78c0d37eb976749616e65c89f94206
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
new file mode 100644
index 000000000000..dadb8751f0b9
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+MY_P="${P}-MIT"
+DESCRIPTION="Migemo library implementation in C"
+HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
+SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="emacs unicode vim-syntax"
+
+DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
+	dev-lang/perl
+	|| (
+		net-misc/curl
+		net-misc/wget
+		net-misc/fetch
+	)
+	app-i18n/nkf"
+RDEPEND="${DEPEND}
+	emacs? ( >=app-text/migemo-0.40-r1 )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	# Bug #246953
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	touch dict/SKK-JISYO.L || die
+	if use unicode ; then
+		sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
+	fi
+
+	# Bug #255813
+	sed -i -e "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
+}
+
+src_compile() {
+	append-flags -fPIC
+	# parallel make b0rked
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		gcc-all
+}
+
+src_install() {
+	# parallel make b0rked
+	emake -j1 \
+		prefix="${D}/usr" \
+		libdir="${D}/usr/$(get_libdir)" \
+		gcc-install
+
+	local encoding
+	if use unicode ; then
+		encoding="utf-8"
+	else
+		encoding="euc-jp"
+	fi
+
+	mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/" || die
+	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8} || die
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins tools/migemo.vim
+	fi
+
+	dodoc doc/{README_j,TODO_j,vimigemo}.txt
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elog
+		elog "Please add to your ~/.emacs"
+		elog "    (setq migemo-command \"cmigemo\")"
+		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
+		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
+		elog "    (setq migemo-user-dictionary nil)"
+		elog "    (setq migemo-regex-dictionary nil)"
+		elog "to use cmigemo instead of migemo under emacs."
+		elog
+	fi
+}
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index 801284577731..1bcd0d5ee4e8 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,7 +1,3 @@
-AUX cr3.1.2.71-r1_qt5_wx.diff 10066 BLAKE2B 8b1ecc7765735608e9651f23d1d9882186766e34c0ac5f9cac1312da68345d7a9028abaf9792f4ee85a4ddb5490fa1521d220b751eeeda84aa5ac79d92d33e88 SHA512 9f7a82964d1f5c308ad5124433dd0ed7debd715f1c0c2431bc84c9bf71d1d5dbbfb82a669b1c6ee114196c5e8ba1b745b07cc2195d4198c664ea15cf82182384
-AUX cr3ini.diff 1535 BLAKE2B 1eb5908bedf2a706d461ed84a60ed3232a4c98bee5d4b29c55e63d780d54785a1e3f77e9eb85d0675ac0efeb1652d505e9cef93b9c7dce39086c3b0a3f765c6b SHA512 efd7bfda3617168bda2bfad9e561b7bf3de89f141cf4155618bc6864fa5497d5b0e08ea583b302f4e9e3f60442472c7e5358313dd49549dce3fe078d58ee4ee5
-DIST coolreader-3.1.2.71.tar.bz2 10141514 BLAKE2B 143a69082a2dcabbb7a246df575e7ed2fddb4b11c542910faa2f6d44155f0de8ba6d7e0fd321b53fc0eda47c8d2867bfec02af3b95edbcb623f6a15fa6c4bc72 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
-EBUILD coolreader-3.1.2.71-r4.ebuild 2366 BLAKE2B 94049adc28a85bbba7648a992ae1975307816f477d15fbd48343314a99504889ed22e1d4ebd7379620b295a1e378675c0a331f41a144045ee6cd060caeb08628 SHA512 21be4a384808ca943d2278fe592c3acbbce7ea6951000efe107cb744b937c8b68c32fe2f8824abcf32c41343e835265bed865e7c5a01bef7d0d77a83093d7f43
-EBUILD coolreader-3.2.2.1.ebuild 2020 BLAKE2B 17bc4cfc083d7bb30ea67b98a0dc700695823b8a39e0fc20ff4b4ae80178c5207c60838874a80a23cbbf99430d7b1b26e39b430b94d4e870b981eefed46ec961 SHA512 f8b5daa8dc76471bce823563f53e9e3810c9530a58dde042400996b73ba636b8a726115b72b2666b561a9f419865e5e56c227d94034292c5aa7edd557451fc27
+EBUILD coolreader-3.2.2.1.ebuild 2044 BLAKE2B b3d1f58d769dce2d28f9a821b01bedd8b29758660a5099b49bdee6a6a2387dbaff63a304cf0417c274c786eb0ab0e7438ab75a9432af449bc24efe340fd1b746 SHA512 f642e67189be63bb996fb1381de92d26ae7b7a8d2015ae575a991bf1c0cf0e05fdada2a140058b12f06d57d6d284f4875817e97a6b49b7dce7cbcf8c87c2b7a1
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.1.2.71-r4.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r4.ebuild
deleted file mode 100644
index 33c7a7c28be5..000000000000
--- a/app-text/coolreader/coolreader-3.1.2.71-r4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
-
-if [ "${PV}" == 9999 ]
-then
-	inherit git-r3
-	# github mirror has some new commits to fix page margins settings
-	# sourceforge mirror saved as backup
-	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
-	EGIT_REPO_URI="https://github.com/buggins/coolreader.git"
-	SRC_URI=""
-else
-	# git tag cr3.1.2-71
-	SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-fi
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://sourceforge.net/projects/crengine/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-DEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-RDEPEND="${DEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-# 1st patch: To save cr3.ini to ~homedir.
-# 2nd patch: To build QT5 and WX GUI version of coolreader3;
-# setting correct vesrion number and years of cr3qt/cr3wx;
-# internal switching between wxGTK 2.8 or 3.0 version;
-# show wxWidgets version in "About" dialog window;
-# disabling "iCCP: known incorrect sRGB profile" warning popup window for wxwidgets GUI
-
-PATCHES=( "${FILESDIR}/cr3ini.diff" "${FILESDIR}/cr3.1.2.71-r1_qt5_wx.diff" )
-
-for lang in ${PLOCALES}; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# locales
-	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	local lang langs
-	langs=""
-	for lang in ${PLOCALES}; do
-		if use l10n_${lang}; then
-			langs="${langs} ${lang}"
-		fi
-	done
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/coolreader/coolreader-3.2.2.1.ebuild b/app-text/coolreader/coolreader-3.2.2.1.ebuild
index 3d97d3b6b4e7..caf405eb1501 100644
--- a/app-text/coolreader/coolreader-3.2.2.1.ebuild
+++ b/app-text/coolreader/coolreader-3.2.2.1.ebuild
@@ -12,6 +12,7 @@ if [ "${PV}" != 9999 ]
 then
 	# git tag cr3.2.2-1
 	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-cr${CR_PV}"
 else
 	inherit git-r3
 	# github mirror has some new commits to fix page margins settings
@@ -34,12 +35,10 @@ DEPEND="sys-libs/zlib
 	virtual/jpeg:0
 	media-libs/freetype
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 )"
 RDEPEND="${DEPEND}
 	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
 
-S="${WORKDIR}/${PN}-cr${CR_PV}"
-
 for lang in ${PLOCALES}; do
 	IUSE="${IUSE} l10n_${lang}"
 done
diff --git a/app-text/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff b/app-text/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff
deleted file mode 100644
index 434d4556da94..000000000000
--- a/app-text/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff
+++ /dev/null
@@ -1,242 +0,0 @@
-diff -Naur old/CMakeLists.txt new/CMakeLists.txt
---- old/CMakeLists.txt	2017-08-30 18:31:28.000000000 +0300
-+++ new/CMakeLists.txt	2017-09-02 23:43:38.000000000 +0300
-@@ -29,7 +29,7 @@
-   endif()
- elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-   # Update if necessary
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic -std=c++11 -fPIC")
- endif()
- 
- if (NOT DEFINED GUI)
-@@ -323,7 +323,7 @@
-   message("Will make CR3/WX")
-   ADD_DEFINITIONS( ${DESKTOP_DEFS} -DCR_WX_SUPPORT=1 )
-   SET(wxWidgets_USE_LIBS base core )
--  FIND_PACKAGE(wxWidgets)
-+  FIND_PACKAGE(wxWidgets 2.8)
-   IF (wxWidgets_FOUND)
-     INCLUDE(${wxWidgets_USE_FILE})
-     include_directories( ${wxWidgets_INCLUDE_DIRS} )
-diff -Naur old/cr3qt/CMakeLists.txt new/cr3qt/CMakeLists.txt
---- old/cr3qt/CMakeLists.txt	2017-08-30 18:31:28.000000000 +0300
-+++ new/cr3qt/CMakeLists.txt	2017-09-03 00:53:38.000000000 +0300
-@@ -173,7 +173,11 @@
-     SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} )
- #${QT_LIBRARIES} 
- ELSEIF (UNIX)
--    SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
-+    IF( ${GUI} STREQUAL QT )
-+	SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
-+    ELSE()
-+        SET (EXTRA_LIBS fontconfig ${STD_LIBS} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
-+    ENDIF()
- ELSE()
-     SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} )
- ENDIF(MAC)
-diff -Naur old/cr3qt/src/aboutdlg.ui new/cr3qt/src/aboutdlg.ui
---- old/cr3qt/src/aboutdlg.ui	2017-08-30 18:31:28.000000000 +0300
-+++ new/cr3qt/src/aboutdlg.ui	2017-09-03 00:56:14.000000000 +0300
-@@ -56,7 +56,7 @@
-      <item>
-       <widget class="QLabel" name="label_2">
-        <property name="text">
--        <string notr="true">(c) 1998-2010 Vadim Lopatin</string>
-+        <string notr="true">(c) 1998-2015 Vadim Lopatin</string>
-        </property>
-       </widget>
-      </item>
-diff -Naur old/cr3wx/CMakeLists.txt new/cr3wx/CMakeLists.txt
---- old/cr3wx/CMakeLists.txt	2017-08-30 18:31:28.000000000 +0300
-+++ new/cr3wx/CMakeLists.txt	2017-09-03 00:54:59.000000000 +0300
-@@ -10,7 +10,7 @@
- )
- LINK_DIRECTORIES(${wxWidgets_LIBRARY_DIRS})
- ADD_EXECUTABLE(cr3 ${CR3_SOURCES})
--SET (EXTRA_LIBS  ${wxWidgets_LIBRARIES} ${STD_LIBS})
-+SET (EXTRA_LIBS  ${wxWidgets_LIBRARIES} fontconfig ${STD_LIBS})
- TARGET_LINK_LIBRARIES(cr3 crengine tinydict ${EXTRA_LIBS})
- 
- IF (UNIX)
-@@ -22,6 +22,9 @@
-   INSTALL( DIRECTORY ../cr3qt/data/hyph DESTINATION share/cr3 
-   FILES_MATCHING PATTERN "*.pattern" )
-   INSTALL( DIRECTORY ../cr3qt/data/skins DESTINATION share/cr3/skins )
-+  INSTALL( FILES ../cr3qt/src/desktop/cr3.desktop DESTINATION share/applications )
-+  INSTALL( FILES ../cr3qt/src/desktop/cr3.png DESTINATION share/pixmaps )
-+  INSTALL( FILES ../cr3qt/src/desktop/cr3.xpm DESTINATION share/pixmaps )
- ELSE()
-   INSTALL( TARGETS cr3 RUNTIME DESTINATION . )
-   INSTALL( DIRECTORY ../cr3qt/data/ DESTINATION . 
-diff -Naur old/cr3wx/src/cr3.cpp new/cr3wx/src/cr3.cpp
---- old/cr3wx/src/cr3.cpp	2017-08-30 18:31:28.000000000 +0300
-+++ new/cr3wx/src/cr3.cpp	2017-09-03 02:30:35.000000000 +0300
-@@ -395,7 +395,11 @@
- 
- lString16 GetConfigFileName()
- {
--    lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
-+    #if wxCHECK_VERSION(3, 0, 0)
-+        lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
-+    #else
-+        lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
-+    #endif
-     if ( !wxDirExists( cfgdir.c_str() ) )
-         ::wxMkdir( wxString( cfgdir.c_str() ) );
-     lChar16 slash = detectSlash( cfgdir );
-@@ -520,6 +524,7 @@
- 
- wxBitmap cr3Frame::getIcon16x16( const lChar16 * name )
- {
-+    wxLogNull logNo; // Temporary disable warnings ( see: http://trac.wxwidgets.org/ticket/15331 )
-     lString16 dir;
-     if ( _toolbarSize==2 )
-         dir = "icons/22x22/";
-@@ -531,7 +536,7 @@
-     if ( icon.IsOk() )
-         return icon;
-     return wxNullBitmap;
--}
-+} // ~wxLogNull called, old log sink restored
- 
- #if (USE_FREETYPE==1)
- bool getDirectoryFonts( lString16Collection & pathList, lString16 ext, lString16Collection & fonts, bool absPath )
-@@ -622,7 +627,11 @@
-     wxImage::AddHandler(new wxPNGHandler);
-     resources = new ResourceContainer();
- 
--    lString16 appname( argv[0] );
-+    #if wxCHECK_VERSION(3, 0, 0)
-+        lString16 appname( argv[0].wx_str() );
-+    #else
-+        lString16 appname( argv[0] );
-+    #endif
-     int lastSlash=-1;
-     lChar16 slashChar = '/';
-     for ( int p=0; p<(int)appname.length(); p++ ) {
-@@ -777,7 +786,11 @@
-     int argc = wxGetApp().argc;
-     lString16 fnameToOpen;
-     for ( int i=1; i<argc; i++ ) {
--        lString16 param = lString16( wxGetApp().argv[1] );
-+        #if wxCHECK_VERSION(3, 0, 0)
-+            lString16 param = lString16( wxGetApp().argv[1].wx_str() );
-+        #else
-+            lString16 param = lString16( wxGetApp().argv[1] );
-+        #endif
-         if ( param[0]!='-' )
-             fnameToOpen = param;
-     }
-@@ -1193,7 +1206,11 @@
-     lString16 outFile;
-     bool convert = false;
-     for ( int i=1; i<argc; i++ ) {
--        lString16 param = lString16( wxGetApp().argv[i] );
-+        #if wxCHECK_VERSION(3, 0, 0)
-+            lString16 param = lString16( wxGetApp().argv[i].wx_str() );
-+        #else
-+            lString16 param = lString16( wxGetApp().argv[i] );
-+        #endif
-         if ( param[0]!='-' )
-             fnameToOpen = param;
-         else if (param.startsWith("--convert"))
-@@ -1470,7 +1487,11 @@
-         wxCursor hg( wxCURSOR_WAIT );
-         this->SetCursor( hg );
-         wxSetCursor( hg );
--        _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() );
-+        #if wxCHECK_VERSION(3, 0, 0)
-+            _view->getDocView()->exportWolFile( dlg.GetPath().wx_str(), opts.getMode()==0, opts.getLevels() );
-+        #else
-+            _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() );
-+        #endif
-         wxSetCursor( wxNullCursor );
-         this->SetCursor( wxNullCursor );
-     }
-@@ -1479,7 +1500,7 @@
- void 
- cr3Frame::OnAbout( wxCommandEvent& WXUNUSED( event ) )
- {
--    wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2007 Vadim Lopatin\nwxWidgets version\n") )
-+    wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2015 Vadim Lopatin\n" wxVERSION_STRING"\n") )
-     wxT("\nBased on CREngine library " wxT(CR_ENGINE_VERSION) )
-     wxT("\nThird party libraries used:")
-     wxT("\nzlib, libpng, libjpeg, freetype2,")
-diff -Naur old/cr3wx/src/optdlg.cpp new/cr3wx/src/optdlg.cpp
---- old/cr3wx/src/optdlg.cpp	2017-08-30 18:31:28.000000000 +0300
-+++ new/cr3wx/src/optdlg.cpp	2017-09-03 02:36:51.000000000 +0300
-@@ -41,7 +41,11 @@
-             if ( v==_choices[i] )
-                 tb = i;
-         if ( _storeStringValues ) {
--            props->setString( _option, lString16(_choices[tb]) );
-+            #if wxCHECK_VERSION(3, 0, 0)
-+                props->setString( _option, lString16(_choices[tb].wx_str()) );
-+            #else
-+                props->setString( _option, lString16(_choices[tb]) );
-+            #endif
-         } else {
-             props->setInt( _option, tb );
-         }
-@@ -50,7 +54,11 @@
-     {
-         unsigned tb = _defvalue;
-         if ( _storeStringValues ) {
--            lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) );
-+            #if wxCHECK_VERSION(3, 0, 0)
-+                lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue].wx_str()) );
-+            #else
-+                lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) );
-+            #endif
-             lString16 s16 = props->getStringDef( _option, s8.c_str() );
-             wxString v = s16.c_str();
-             for ( unsigned i=0; i<_choices.GetCount(); i++ )
-diff -Naur old/cr3wx/src/view.cpp new/cr3wx/src/view.cpp
---- old/cr3wx/src/view.cpp	2017-08-30 18:31:28.000000000 +0300
-+++ new/cr3wx/src/view.cpp	2017-09-03 02:40:42.000000000 +0300
-@@ -353,7 +353,11 @@
- 
- lString16 cr3view::GetHistoryFileName()
- {
--    lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
-+    #if wxCHECK_VERSION(3, 0, 0)
-+        lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
-+    #else
-+        lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
-+    #endif
-     if ( !wxDirExists( cfgdir.c_str() ) )
-         ::wxMkdir( wxString( cfgdir.c_str() ) );
-     lChar16 slash = detectSlash( cfgdir );
-@@ -667,13 +671,21 @@
-     //===========================================
-     GetParent()->Update();
-     //printf("   loading...  ");
--    bool res = getDocView()->LoadDocument( fname.c_str() );
-+    #if wxCHECK_VERSION(3, 0, 0)
-+        bool res = getDocView()->LoadDocument( fname.wx_str() );
-+    #else
-+        bool res = getDocView()->LoadDocument( fname.c_str() );
-+    #endif
-     //printf("   done. \n");
- 	//DEBUG
- 	//_docview->exportWolFile( "test.wol", true );
- 	//_docview->SetPos(0);
-     if ( !res )
--        getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.c_str() );
-+        #if wxCHECK_VERSION(3, 0, 0)
-+            getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.wx_str() );
-+        #else
-+            getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.c_str() );
-+        #endif
-     lString16 title = getDocView()->getAuthors();
-     if ( !title.empty() && !getDocView()->getTitle().empty() )
-         title << L". ";
-diff -Naur old/crengine/include/cr3version.h new/crengine/include/cr3version.h
---- old/crengine/include/cr3version.h	2017-08-30 18:31:28.000000000 +0300
-+++ new/crengine/include/cr3version.h	2017-09-03 00:55:28.000000000 +0300
-@@ -1,2 +1,2 @@
--#define CR_ENGINE_VERSION "3.1.2-52"
--#define CR_ENGINE_BUILD_DATE "2014-11-19"
-+#define CR_ENGINE_VERSION "3.1.2-71"
-+#define CR_ENGINE_BUILD_DATE "2015-07-02"
diff --git a/app-text/coolreader/files/cr3ini.diff b/app-text/coolreader/files/cr3ini.diff
deleted file mode 100644
index 66562aa836a7..000000000000
--- a/app-text/coolreader/files/cr3ini.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-# Patch to allow creating cr3.ini file in the home directory of user
-# instead to trying save it in /usr/share/cr3/cr3.ini
-# Bug: https://sourceforge.net/p/crengine/bugs/179/
-# Patch was proposed by "Olexandr" (see bug report)
-diff --git a/cr3qt/src/mainwindow.cpp b/cr3qt/src/mainwindow.cpp
-index 142242a..0401f71 100644
---- a/cr3qt/src/mainwindow.cpp
-+++ b/cr3qt/src/mainwindow.cpp
-@@ -77,8 +77,8 @@ MainWindow::MainWindow(QWidget *parent)
- #endif
-     QString cacheDir = homeDir + "cache";
-     QString bookmarksDir = homeDir + "bookmarks";
--    QString histFile = exeDir + "cr3hist.bmk";
--    QString histFile2 = homeDir + "cr3hist.bmk";
-+    QString histFile2 = exeDir + "cr3hist.bmk";
-+    QString histFile = homeDir + "cr3hist.bmk";
-     QString iniFile2 = exeDir + "cr3.ini";
-     QString iniFile = homeDir + "cr3.ini";
-     QString cssFile = homeDir + "fb2.css";
-@@ -92,9 +92,13 @@ MainWindow::MainWindow(QWidget *parent)
-     ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE );
-     ui->view->setPropsChangeCallback( this );
-     if ( !ui->view->loadSettings( iniFile ) )
--        ui->view->loadSettings( iniFile2 );
-+        if ( !ui->view->loadSettings( iniFile2 ) )
-+          ui->view->saveSettings( iniFile );
-+
-     if ( !ui->view->loadHistory( histFile ) )
--        ui->view->loadHistory( histFile2 );
-+        if ( !ui->view->loadHistory( histFile2 ) )
-+          ui->view->saveHistory( histFile );
-+
-     if ( !ui->view->loadCSS( cssFile ) )
-         ui->view->loadCSS( cssFile2 );
- #if ENABLE_BOOKMARKS_DIR==1
diff --git a/app-text/docbook-sgml/Manifest b/app-text/docbook-sgml/Manifest
index e4d080ead1bc..96ba3647c85d 100644
--- a/app-text/docbook-sgml/Manifest
+++ b/app-text/docbook-sgml/Manifest
@@ -1,2 +1,3 @@
+EBUILD docbook-sgml-1.0-r1.ebuild 571 BLAKE2B 1e4bb9bb1b1bdc2c1ba7fe39553832b2a2ae85e58614e294aad176e4e7a202ef7cc0708da95338f6ede81f42514c6e64dc00428635a43ce24918cb0782684772 SHA512 1f7d016a6026715c021f9ccb01324c99389c91d52e648c5d5085d0df3cdcf56f3d15f1707a54aeadb45d853abaf82e2555976482b30fe7c106d5df88b19e2b7b
 EBUILD docbook-sgml-1.0.ebuild 568 BLAKE2B 21830870bfdf71613c2b6e1597b93573dc4fd35a6eb072320c8981db54a350a06c6f99c3ec546b8ebc16b1d1ea3fb2af47fbba749c24d077f8d1656ce4f60dcb SHA512 be3ec3040ae17bc95db4f68cd3789d84f57ee22ea731a650de79ac961d3545c69ffbff4697886184bf68ee2ed98692bee2cdbde1df88cba5bdc7e1a6d7a8c2f1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
new file mode 100644
index 000000000000..ad54610f23a3
--- /dev/null
+++ b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A helper package for sgml docbook"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://www.docbook.org/sgml/"
+
+RDEPEND="app-text/sgml-common app-text/openjade
+	>=app-text/docbook-dsssl-stylesheets-1.64
+	>=app-text/docbook-sgml-utils-0.6.6
+	~app-text/docbook-sgml-dtd-3.0
+	~app-text/docbook-sgml-dtd-3.1
+	~app-text/docbook-sgml-dtd-4.0
+	~app-text/docbook-sgml-dtd-4.1"
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index e6ecb8793efd..0595e5b636ea 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -13,5 +13,5 @@ EBUILD dvisvgm-2.3.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d0
 EBUILD dvisvgm-2.3.5.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
 EBUILD dvisvgm-2.4.2.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
 EBUILD dvisvgm-2.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
-EBUILD dvisvgm-2.5.ebuild 1193 BLAKE2B d9d376aa401bdcc304bc13f98e771874fddbf18473809bbbc8e07d4a9b48e6671893d60c263478b82d22efa86bb06c6d171fb879b0e523c62abb5bf954e2e822 SHA512 8ef4c5a5e14bb31041609d5de80be500baf1b74c983b3db1da74076ef78322b272b35dbfac469e211c907375d1e086d52b861af590c07010d0442c53eefada9b
+EBUILD dvisvgm-2.5.ebuild 1186 BLAKE2B a789f9cfcbffb73daa1782cf7df501783ce7ec98ac6d51b29d690d3d161f610799b847e4e9fd2c4340d1ccb041310b906e1e951ab025642aa01209011ec90581 SHA512 68cf41d70b133c474abd76242306053ae93f02f1d1ddf788d6d3f96289c9e68ee6d1d1e7d7b71f373bfbf9a6d5514e3e6656cc54965108154c339aa76cfe5795
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.5.ebuild b/app-text/dvisvgm/dvisvgm-2.5.ebuild
index 4f200db18915..f4c0ba5ab26e 100644
--- a/app-text/dvisvgm/dvisvgm-2.5.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~hppa ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
index 9767abf639c7..b13052cc7ab4 100644
--- a/app-text/goldendict/Manifest
+++ b/app-text/goldendict/Manifest
@@ -1,4 +1,5 @@
+AUX goldendict-1.5.0-qt-5.11.patch 1532 BLAKE2B cd6869c59d2afef21d92660173516b56a880cd245e5b928096d9d3d6e8e4fc915694a5dedd762400be091dca6a86fed2b553ce11688e84117ef4653ab1124ce3 SHA512 25721bf8cca9e0abb3f04dd912520577f7c3a31d34883887286476895263049495e3286c520549409ec8244f99b632b4a76f0ce514b8509e5e16a12adc3a5ac6
 AUX goldendict-1.5.0-qtsingleapplication-unbundle.patch 341 BLAKE2B 7f5b2c715d41d50d358a8cca5f259f8b70266b9037dac9f5f6c9c0b1323b46cb42f68fd73725a6f25903e35a83582b32015b3401f1aa3a8f9c8bb1a05c54b531 SHA512 86a08b1333a61fee7559028f68779f45cf17da6f7e6f3ea9cae46184279469b91e38f825ad072e0557bcd4188b87fe8f0bd696c4819e3bc96874439d1290e5a3
 DIST goldendict-1.5.0_rc2.tar.gz 19413751 BLAKE2B 17fb0140e6ce392800a05d36a41f2a42c813990eaecabf55f765d5583118be694e66c5438b90e46853070a782086422b533b0f653461dd81cecd23f2deec40b7 SHA512 b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
-EBUILD goldendict-1.5.0_rc2-r2.ebuild 1705 BLAKE2B 67763317939dc507c8328e99dd4cc1696172fe97fc51ccd1e00c6ebaa6e2fa317a8ef8c9888f26a81792f844c69ed9b99e5b7cff3641db80f428e6b469205e5f SHA512 e0b330c8b9576864dbfae1f2165f2a8048c327f145adc9d676251ea4aaebead035c4a8250d6a283f56beae4853bf0fc7bf7cc7bfcb86b3c98e4c7c17c4449998
+EBUILD goldendict-1.5.0_rc2-r2.ebuild 1747 BLAKE2B 9774eb0235bd86e8827ec94d8ce043fce8870196bf3fd2dba88be071a3896fc4a7e8d02f30c4a831dbede01fb5564e8d0f568df9ca8fdf2e94334389dcc17179 SHA512 0a739ecc1364da46cb13d87e7234609b249d45cc62bfa5735f74f400dfab10c28ae7f916f6086eac00bc8549c0dbe3e130cd68f7b52c942734ac5da992c202b0
 MISC metadata.xml 388 BLAKE2B 229d847f632fe3da3df10913551df5ee6ee386768c52aef7c436336476c7e837272decbe34a7e9322504e6d97e7319afb61815539494ef5faa8c93411ce7215d SHA512 c9be98ab768c3c13ff4b03336fc90314ec0e233d0860501d85b5c65250965d994a3f8ab4cf8f58cee3da27fdc37964c10854bc66b9cc16e5f558f0b7a4a39f42
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
new file mode 100644
index 000000000000..247ec52931b9
--- /dev/null
+++ b/app-text/goldendict/files/goldendict-1.5.0-qt-5.11.patch
@@ -0,0 +1,56 @@
+From 3d4a468b6c8cb154c88cf4592a5845973999dc29 Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Tue, 10 Apr 2018 18:44:43 +0300
+Subject: [PATCH] Qt5: Fix compilation with Qt 5.11 (issue #991)
+
+---
+ fulltextsearch.hh | 1 +
+ initializing.cc   | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/fulltextsearch.hh b/fulltextsearch.hh
+index da7e2943..adf9619f 100644
+--- a/fulltextsearch.hh
++++ b/fulltextsearch.hh
+@@ -6,6 +6,7 @@
+ #include <QRegExp>
+ #include <QAbstractListModel>
+ #include <QList>
++#include <QAction>
+ 
+ #include "dictionary.hh"
+ #include "ui_fulltextsearch.h"
+diff --git a/initializing.cc b/initializing.cc
+index 0db6909b..59e605d6 100644
+--- a/initializing.cc
++++ b/initializing.cc
+@@ -1,6 +1,7 @@
+ /* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
+  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+ 
++#include <QIcon>
+ #include "initializing.hh"
+ #include <QCloseEvent>
+ 
+From a65967805ab424b299bdfa1d1f9c7ebb8a7fd517 Mon Sep 17 00:00:00 2001
+From: Perfect Gentleman <perfect007gentleman@gmail.com>
+Date: Wed, 11 Apr 2018 00:04:12 +0700
+Subject: [PATCH] Update groups_widgets.hh
+
+fixes https://github.com/goldendict/goldendict/issues/991
+---
+ groups_widgets.hh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/groups_widgets.hh b/groups_widgets.hh
+index ce442fa2..2064e3bb 100644
+--- a/groups_widgets.hh
++++ b/groups_widgets.hh
+@@ -8,6 +8,7 @@
+ 
+ #include <vector>
+ 
++#include <QAction>
+ #include <QListWidget>
+ #include <QSortFilterProxyModel>
+ 
diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
index 47c7916defc8..e25c25eb0628 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -48,7 +48,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch"
+	"${FILESDIR}/${PN}-1.5.0-qt-5.11.patch"
+)
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index e197d4d5107c..b67911fc9f06 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,5 +1,5 @@
 DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
 DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
 EBUILD libepubgen-0.1.0.ebuild 725 BLAKE2B df6c45b50db98bc979374adead89de3e2cb5d7a055b298d6538ce2dea44790b201cef4b437e1af86755ea3bae0c7cd6f8eb4de27f3c610e6db78df4ebf497f4d SHA512 8de1cf0aa61451aa11703e3dadb1fb00a03e3945f4ed2dfb8b4e7fa96f28fd0da2d14124f45e71b5868c72bf62e7488cd63785a4f68c652df618b15f25d43691
-EBUILD libepubgen-0.1.1.ebuild 713 BLAKE2B 57119868a143aa90b78c9e82339fa108e2cdf988220626a759459bbfa084d3ac9dca2a93af3488d9f2409a79e4876e75bc1cd0ac075df00c8aa291ad26c965a4 SHA512 7372214a9bd3f0576c5a23cde82b528dbcd9d16e2d2a3cfcf439052282da13b8e9eb03e7aea97b514c2fcd013a8574ae53c38ee0828d39c8a386642cedd319c7
+EBUILD libepubgen-0.1.1.ebuild 711 BLAKE2B 8aa60a1e03391e83c2c9f443a948dedda973c4c0bc96e6124466bf0a21c228b846c01394e0cc3a074d8b81b36142a120bb20aeeb44a74f037391c013e723f315 SHA512 c297adfc8e10f33a760053b3d763916cff52e4683cfcaafb2e277b69cce1efa0c2d7b3f5d69a084ef82778564d067e666411f71c6b1e7e399c1ee5be487b70f0
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
index 80387cdb8ac9..49fb813100fa 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index b6ae26a14c21..3d3ea05306c5 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -2,6 +2,6 @@ AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a63387515
 DIST libetonyek-0.1.7.tar.xz 1256232 BLAKE2B ef2abcc427014d515a75ff75d90a78da0b5b28d54b5de3793540e8448f163da0b6d3ff4026373ffc3a4973d3e0e4fee280e75a77407620b3ba0e833bd7d8c82a SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f
 DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865
 EBUILD libetonyek-0.1.7.ebuild 1181 BLAKE2B cc869861947ebb3b5a3e117999f2f2aea14e012f9412f07d610af7c4c5df02ede968557b821d2c88252742796fbe2010f2749d6d0df5631054f6276722f0cc7d SHA512 d5e73167601b6fcd21568f4f9f45254d4b8098a1d503aaa6794b6c5af4de497bb607613eced94d4adbd9c93ccb15b1a6fbc115ced80c0db2c041989ba5b2b85c
-EBUILD libetonyek-0.1.8.ebuild 1218 BLAKE2B 27d32c5df3acc0abbfbd33ed52dc5893ca124bfe77d2e8dfe8176aad2b0f78d0e8b2fb418006b5d8c3d4d62ef94faf19f34dba6b06d3e3d4a8dbc5e0433b6bf6 SHA512 95166c5ede3f644277b2b5efa36ce212a288916b8bd690bb24107b35008005dce89e92bec7d52419d9ede991301b4144f9603d7d75bd5270b86fb0e374575d50
+EBUILD libetonyek-0.1.8.ebuild 1216 BLAKE2B 0a9fe54ab84331e8ee1f0e2e947ad636637893aa4871b46f93bfa990e4fef859041a188a79876bf77510240d4485c0f814eae48d6db03cc91e2fe801b07afc33 SHA512 a426c1fff4ef90b238f3fea32b4c5011573acfd1a385a514af74eb5d34a41711041460744902bcb63362799e474341a7c3ecf42f70972f7a027928d4b9126396
 EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild
index 7e445ac2171a..fb11cfdaba0b 100644
--- a/app-text/libetonyek/libetonyek-0.1.8.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.8.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 69f1a6755029..6d2a726edfee 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -2,6 +2,6 @@ AUX libmwaw-0.3.13-buildfix.patch 562 BLAKE2B 4ec40a613a1ebb88ab5d3d790ec68789ec
 DIST libmwaw-0.3.13.tar.xz 1258220 BLAKE2B 79cb4d8a91d361ceae70fa7a0145fa9f5e230bbafba1b0a586b10a1375e34511769d2a5d6b8ba9b6b9676a3cffc9ae6d22529a1920ed4bf932ef7e88ca7bae0c SHA512 3d6a5142cc45f6519ac29f935c01418278ed4cc1bdcb0ecb1a190309c43d3f7ee06deab519d29a3e2aec01ef091cb4f4c17809662640b54a8e4fe8d4bd8db5f3
 DIST libmwaw-0.3.14.tar.xz 1276240 BLAKE2B 34a5b118064dcac37834c83b2b5a61303f3e2eb70e41322845ff7661a5494c0b85db0bb07c6bf1f357c2027cab1c515eade58bb6b4fdf845a81d4d079a414b98 SHA512 6893a7a8a72765a66973a94bc7de8b3b6061aa85fd9cca5e73cb2a4024cbe81f0c030df0b6383f24835643259c361efda5527813bb84a1b08d0089d509215888
 EBUILD libmwaw-0.3.13.ebuild 1055 BLAKE2B e11ebd9eeba3c2ae91dbf71e413eb2366a91b788e7394c34200ec1134bc7602adba37996699daa09de18711a9a00eedd96dfd1ee1c488e42c4c0ac1266e6eeae SHA512 13f090f1610613958c5f37070f41378636cd5b25f5a2f0899a6c464a61bc316a9429a0652c154945ae14fcb0c8905aef8eddadccd41419dd80dd025e9ce22a9e
-EBUILD libmwaw-0.3.14.ebuild 1010 BLAKE2B caf4e52dadd33b6348da5ae194d1d9364fb972dfbd4ed05b97a639f835958857b023c3a0afa658288e616e7500d3ae62fa6ee7de213b656b3084cb96633dd4d7 SHA512 313ac932f39b04df8668fddc72004ab421bb6415ca90569cde318345c40512cea7fca01f546ff044e92d373b11f5441a90be178ca6e1bac12be6743a0e6faf46
+EBUILD libmwaw-0.3.14.ebuild 1008 BLAKE2B 79af8a588f1fe052538abe54532e7ce53b2739158ffe523e750017204f0c9f2a41aed880b7443dc3ace78399d16bb6d3b2f3a15c569618bb690eefd203abc220 SHA512 35d1a89cac999df584c2586a7c8d14535c820d2d9fc47ea7f598f166752004520b50eab6e310cf58912a3072c7a8e66bf1de690775bc1211df312a6184bd6c71
 EBUILD libmwaw-9999.ebuild 1010 BLAKE2B caf4e52dadd33b6348da5ae194d1d9364fb972dfbd4ed05b97a639f835958857b023c3a0afa658288e616e7500d3ae62fa6ee7de213b656b3084cb96633dd4d7 SHA512 313ac932f39b04df8668fddc72004ab421bb6415ca90569cde318345c40512cea7fca01f546ff044e92d373b11f5441a90be178ca6e1bac12be6743a0e6faf46
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.14.ebuild b/app-text/libmwaw/libmwaw-0.3.14.ebuild
index 7dde090fa754..c5222845e578 100644
--- a/app-text/libmwaw/libmwaw-0.3.14.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.14.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 IUSE="doc static-libs tools"
 
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index 934b46a0e3f3..1f81496b5d83 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1,6 +1,6 @@
 DIST libstaroffice-0.0.5.tar.xz 682380 BLAKE2B 1f514873a7dcaf210fae77f32e88ce7e3e8652474f51616865cb95ff81e7ceb86d784aab0efc301b86b416264fd0eb59c9be717039fb6a4fb086c9d09ec124ae SHA512 937fc618bef79c9e25957f25f39bc829621b0a2da0213cbfb1b56c2b00d44f61bcd9db67d3e6329a4bd700a2c88fc743088381f58a96a87712b040c0ffc17fde
 DIST libstaroffice-0.0.6.tar.xz 706324 BLAKE2B 5ff692c85bb48a7cd4c1e05e0afcc3ab26d627254dcf0b4ba10314c6ec654d69e2910f031ec7b88c9d28c48fe6a7267cd2434d224dc980ad9e266273cbc65bfa SHA512 9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324
 EBUILD libstaroffice-0.0.5.ebuild 936 BLAKE2B 679e15b1ff60c00f82b0e2e847d3dae87877136aad694d07cdebc30b7cf2b7ea9f2b2011d019469b43bbe4c65f256225b1eb25e870d61adb9d7212e62fcb059a SHA512 fd6bdf21f011c4c47ef75a43e2e76305f2e57efcb67c713a23bb67b9422a4b1690b34048910c5e3b9576c03db934dc643312f19c9a638534979b12540538a087
-EBUILD libstaroffice-0.0.6.ebuild 938 BLAKE2B 11fc9d72cf695d1f5a5d113e1ffa1dbb93a9fe2e1d58ea560951566f80d604e3900d24c67c5ed02c54c5b6b8ecc1356b5fffeab9e5c3ba7408892146ca73e7ef SHA512 12a9e7e4a9555134c2a6950c80ee093f1fff810daaa3bff64880b04ece88d226e8e00eb55e2f76712bbc0a050b42ad03bf7a57ea60ed0e25345a37c85d968ac9
+EBUILD libstaroffice-0.0.6.ebuild 936 BLAKE2B 8a9333c389b67dfa59dbb587e6860553c941b8db99156f4750f205f3361c11e4c0cb589715b24f99566396c3eabb01cd4323739b101ff1e8b6c2379f21e01f04 SHA512 3e123fc5ad73485aa3efdbdb4b588b7a2ea65566ae8548b7ccb8e655a89de09616060777ed6cedc61d02cd123a0d24ae0fd89d809a242101a7fafd2e2c9ef4d9
 EBUILD libstaroffice-9999.ebuild 938 BLAKE2B 11fc9d72cf695d1f5a5d113e1ffa1dbb93a9fe2e1d58ea560951566f80d604e3900d24c67c5ed02c54c5b6b8ecc1356b5fffeab9e5c3ba7408892146ca73e7ef SHA512 12a9e7e4a9555134c2a6950c80ee093f1fff810daaa3bff64880b04ece88d226e8e00eb55e2f76712bbc0a050b42ad03bf7a57ea60ed0e25345a37c85d968ac9
 MISC metadata.xml 469 BLAKE2B a9dad122953621001465506893edb9b72c1b1e7a213f0cfbf155a985595d7d319041d95030ea80411a6c21c97aea0a2aa891538f26f31f46cfc4ac6ceb75d183 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8
diff --git a/app-text/libstaroffice/libstaroffice-0.0.6.ebuild b/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
index 7578276aed40..17d046f018eb 100644
--- a/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
+++ b/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/fosnola/libstaroffice"
 LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 IUSE="debug doc tools +zlib"
 
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 4f515dceee5f..353e70bc63f0 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,7 +1,7 @@
 DIST libwps-0.4.10.tar.xz 695448 BLAKE2B ec26b6ccd918aa29d0df053b3e321b651e0c7142910009e0b50a89f88f4dba8f7e9e20f8962a7afb84497b533129d85eb5c7628aa7c64f2a57ce2976d5ff372f SHA512 e5a6155d9e59df226e72db5723ae7574d3f3fdc49bd64156e11f9d3715748fb919dd3d2ab83b6d5fb80c002e7d4ca12563f6ff80472a6485f374b037404acf83
 DIST libwps-0.4.8.tar.xz 648512 BLAKE2B b446c9999ff0e760569daa52fd24e42af8cdda78f2c0bc77d26cc25957381456f045dde1eb4ec8bd7999de29f658d67b2a493fdeacde4faa12a00aa28725603f SHA512 bf5d7aeb6f06e87f15ec8e911fb6436fb4e14839123db71488638f0e658034ad4ea8849ed83926af2fab9b50a7ef7410199d4a1102abc63c83d37bf1966a4afb
 DIST libwps-0.4.9.tar.xz 673784 BLAKE2B 7843de719d6c2ff3152b216e808fc06798ae77e582a644fccd34667e409ec8a34764f302c484bf991e653cd1bb8eaca48f68861aa50e5c41ae41373b5b0c531d SHA512 8703e60837c525ab24e40bb3e2e25244e9f4d2231699373b28d86430f6d7f818a5ba32de08f19febdb4f917f1a90e3b27f95e7d3200ca2d4a9101c262b37a30d
-EBUILD libwps-0.4.10.ebuild 738 BLAKE2B 1a93f47417f85a1c7c0012a842b05e9baca9ca03a2207129fc6f54583c95ec918cdf99c536d3f4f17681a7764c99336a0536bb3d137e137b7839e9f267635138 SHA512 afacf84df37e42654254e9de6aebffa6398f5aa0181ff461a69484d48a9fd645454c62d939fa0815c822e078900d4d97a49d75d84de1a290424d6d6a50140564
+EBUILD libwps-0.4.10.ebuild 736 BLAKE2B e6a30583fcdcff03e9ac9e6e6f71d56e684b9a6d1153da8db145ac699c1dfb08e6064b6106bb1584457e26a2b258732a647c4f25f9a449550c1f9751894e8735 SHA512 7960629cc3bec49bfdfb1d0f3188704b6d9d28887c1ca1a90e70712c46d09a63b636d60004a5b8471aa946fbfa553fc8b3fc49be6b80e70416441841d8477133
 EBUILD libwps-0.4.8.ebuild 746 BLAKE2B 60cfafa10653cb4911a6c8bc88fd54fbb36de63ba2a8d60a845155eb0e62018f78d7232711be572b1954cf8c763b1eb589b6e4650fcf35e7750ec3fc8ebac981 SHA512 45c309260c9aac532a096bd5f91dfbba32ed7fa79172958c4004f3073e56fcdbf1c32885391ca81cccc7871efca207580a50a97d7be0eaf24574d9fb9f2a9fbb
 EBUILD libwps-0.4.9.ebuild 748 BLAKE2B b524b053e2cd0e7bddf6e1be0f7c0a6aae415834cc182deec8a1181131cae204d15bc696f3617069a91d989d00a4ab15b9da07dba5ac9a76189e1811cf7b2f41 SHA512 05c507aaf579f55a194f9e066d0e99373aa7f199c1041ef96c3cc24bb5b231ea651f75b24cc6fa23898b68460fc87e7d1f0866ab67b85a8e1841860e80e8d104
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.10.ebuild b/app-text/libwps/libwps-0.4.10.ebuild
index b9ba610b623c..aeb220bc8f7e 100644
--- a/app-text/libwps/libwps-0.4.10.ebuild
+++ b/app-text/libwps/libwps-0.4.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
 IUSE="doc debug static-libs tools"
 
 RDEPEND="
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 24878bb8ee8c..cdf8e65ac6b4 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,6 +1,4 @@
 AUX llpp-26b-WM_CLASS.patch 860 BLAKE2B adcd60863d72d5328d6918c7904c58f160651a911c9b3f8f891ff884aae54b4327ca4b21fabf95a63025a7d76799a74d47dfb60a2ab55981aabf026be3afc2ca SHA512 42973fa329ab7fc900b1a5e86fee70918c5e78486cfc6fcf4802d9dc3e5a8a902d866a1ad23f3a6febf1dcd2d18f90389369d89024e3e1727a19fce456cf8604
-DIST llpp-26b.tar.gz 169385 BLAKE2B 9a80c22d013af063e3908bda69108ce6a4e0f72efb1c0b930308591d2b8a0f94f7b71a5f1057543e102b95b01440d567e6648d1ed77f1e85728f5ea31718ea28 SHA512 ce7d743d8ec998a93cf272083dc5926ce6a250aee6ac768814f511ecb309ffe94fb0e2561ca1778e1c7fbd5824545477937618c8e66d32fd273f9b5e5e3fd143
 DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
-EBUILD llpp-26b.ebuild 3115 BLAKE2B 03813d97d89259ddb09a0b7fc5f90ce7bfbb99464573aab532f8af232d33432b5a2406b8c455d34d2f2f87d0d6a1c095dd563ea7d419088ed83b1c594c77c9a0 SHA512 f7afd8b79aece96846f5bf5cedf3f4f3a92aa34aa9974f0243729da72f4470a942239af21c6697969b2401f4eb10743d498e425bdaacc0101775cc21cd348196
 EBUILD llpp-26b_p20180114.ebuild 3032 BLAKE2B d6cc8bf1fac0cd932c298d4816221137e47df136283fc752be62886a1111de02803e92230319ccffc1864dbaf81b318c0400a34454a4f1019d8825d76f353e5b SHA512 f4b0da1be74c63c71ae02e1b6dfb7067ead203a9e1203e2c88e1eb4302364205bb92c2e4e841d861124f99781e6bb7214bf5e536dbab51a0e20c178b54afec11
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/app-text/llpp/llpp-26b.ebuild b/app-text/llpp/llpp-26b.ebuild
deleted file mode 100644
index 607103b2b3e5..000000000000
--- a/app-text/llpp/llpp-26b.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
-HOMEPAGE="http://repo.or.cz/w/llpp.git"
-SRC_URI="http://repo.or.cz/llpp.git/snapshot/606ca0f5b7d9c1f031e558c17d66591daa04e3a4.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="+ocamlopt static"
-
-LIB_DEPEND=">=app-text/mupdf-1.11:0=[static-libs]
-	<app-text/mupdf-1.12:0=[static-libs]
-	media-libs/openjpeg:2[static-libs]
-	media-libs/fontconfig:1.0[static-libs]
-	media-libs/freetype:2[static-libs]
-	media-libs/jbig2dec[static-libs]
-	sys-libs/zlib[static-libs]
-	virtual/jpeg:0[static-libs]
-	x11-libs/libX11[static-libs]"
-RDEPEND="x11-misc/xsel
-	!static? ( ${LIB_DEPEND//\[static-libs]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND}
-		app-arch/bzip2[static-libs]
-		media-libs/libXcm[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libXmu[static-libs] )
-	>=dev-lang/ocaml-4.02[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
-
-RESTRICT="!ocamlopt? ( strip )"
-
-PATCHES=( "${FILESDIR}"/${PN}-26b-WM_CLASS.patch )
-
-src_compile() {
-	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
-	local cmo=$(usex ocamlopt cmx cmo)
-	local cma=$(usex ocamlopt cmxa cma)
-	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG -std=c99 -Wextra -Wall -pedantic-errors -Wunused-parameter -Wsign-compare -Wshadow"
-	if use static ; then
-		local cclib=""
-		local slib=""
-		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
-		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
-			case ${slib} in
-				-lm|-ldl|-lpthread)
-					einfo "${slib}: shared"
-					cclib+="${slib} " ;;
-				*)
-					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
-					einfo "${slib}: use ${ccnew}"
-					cclib+="${ccnew} " ;;
-			esac
-		done
-	else
-		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
-	fi
-
-	verbose() { echo "$@" >&2 ; "$@" || die ; }
-	verbose sh mkhelp.sh KEYS ${PV} > help.ml
-	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
-	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
-	verbose ${ocaml} -c -o keys.${cmo} keys.ml
-	verbose ${ocaml} -c -o help.${cmo} help.ml
-	verbose ${ocaml} -c -o utils.${cmo} utils.ml
-	verbose ${ocaml} -c -o wsi/x11/wsi.cmi wsi/x11/wsi.mli
-	verbose ${ocaml} -c -o wsi/x11/wsi.${cmo} -I wsi/x11 wsi/x11/wsi.ml
-	verbose ${ocaml} -c -o parser.${cmo} parser.ml
-	verbose ${ocaml} -c -o config.${cmo} -I +lablGL -I wsi/x11 config.ml
-	verbose ${ocaml} -c -o main.${cmo} -I +lablGL -I wsi/x11 main.ml
-	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL -I wsi/x11 \
-		str.${cma} unix.${cma} lablgl.${cma} link.o \
-	    -cclib "${cclib}" \
-		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
-}
-
-src_install() {
-	dobin ${PN} misc/${PN}ac
-	dodoc KEYS README Thanks
-}
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index fcf1e23a1276..6c568cce0883 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,5 +1,5 @@
 DIST mandoc-1.14.3.tar.gz 617202 BLAKE2B f534c200d450ad526946afe3ffd0a6c21831080312220452aba400f97d11a01ec2e7e31ae64cd9f4e40c00487769b2ad4a9fe132adbe1419b96e7a5995ef746b SHA512 cd638fbacb068fcd6191f2a4e941effc010e3ebf06a3e32847b892c2e561771d03d5bca8fbdf8434d6491f4b68df3f443e2568b79193b7342044fba476fcd30b
-DIST mdocml-1.14.1.tar.gz 549302 BLAKE2B 160d75b187223dde21bf861487f6aeef7b48b39432a6c8c3ab8cb7b3a1d48c4757ccadd3261cca74df47c52df0c6eab2393f65512874f43ff554315762069ffe SHA512 90f00297d162faa404fe4e530f95422c210b8d23a0be5a115c2c8c17255d366e224444901842affb06ed8aaf8febd3e5c79966ff713fa7daf00e8c48b7a857c6
-EBUILD mandoc-1.14.1-r1.ebuild 1549 BLAKE2B f5f18a11aae7375dff00e43ebf93d647e435c88f715e92880b0fcd775eca285dd479878dd5d5239764c01ed59ad30ed532fee4a9f33f583d4befab4a1dea260d SHA512 10a594d1da10cd7e55bf0aad3ee788b46a533c8b0c0b47f75f1143ac349371c337ab57fabf6166aa6e3a26d6dd2f382cdca6aeb60f0390f40cf6e25e66302758
+DIST mandoc-1.14.4.tar.gz 627229 BLAKE2B 43a561d4254e8bcd090891937582d7ee40cda70dcafbbe456f24c539f17f452081f324a90eae69f1025dab3760581d564fef3365e82204350d535f4809c36283 SHA512 c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97
 EBUILD mandoc-1.14.3.ebuild 1536 BLAKE2B 96d5d1977bdf98a28d26053cd162a050ba8450014ab828486e2621378e8fb2e5b467acb22f93d52be87f7537cb3e9bdee44bb3e6892aae7c851c2e5463db020b SHA512 ba3e9775ce7566f2a7ba9cfd6d8f5e2b86aa3197a9bee35749323b55385d88d7ed8bd29126bca3061e7dc569411483e39952bcca713324e675b0f67f72d09551
+EBUILD mandoc-1.14.4.ebuild 1536 BLAKE2B 3ecc4853da9d231ab86f340bea39032ad230f2aced26987efe9ec14fb6fa86bac3bdddcb366428d9c539d611538991103e810908f898db7e11d93f70efd971d4 SHA512 ec236f12331d2564a28e9d8c7b2cd369984cbe3a1a5931cd18805c5c48ab58f99d91b004759428241d4bc7e8bab59ca6bfd9aa5317932d4403035bbeacbcfd99
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/app-text/mandoc/mandoc-1.14.1-r1.ebuild b/app-text/mandoc/mandoc-1.14.1-r1.ebuild
deleted file mode 100644
index 1f7bd01b6fab..000000000000
--- a/app-text/mandoc/mandoc-1.14.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-MY_PN="mdocml"
-MY_P="${MY_PN}-${PV}"
-
-inherit multilib toolchain-funcs
-
-DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="http://mdocml.bsd.lv/"
-SRC_URI="http://mdocml.bsd.lv/snapshots/${MY_P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static"
-
-LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# The db-install change is to support parallel installs.
-	sed -i \
-		-e '/ar rs/s:ar:$(AR):' \
-		-e '/^db-install:/s:$: base-install:' \
-		Makefile || die
-
-	cat <<EOF > "configure.local"
-PREFIX="${EPREFIX}/usr"
-BINDIR="${EPREFIX}/usr/bin"
-SBINDIR="${EPREFIX}/usr/sbin"
-LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-MANDIR="${EPREFIX}/usr/share/man"
-INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
-EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
-MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
-
-BINM_MAN=mman
-BINM_SOELIM=msoelim
-BINM_APROPOS=mapropos
-BINM_WHATIS=mwhatis
-BINM_MAKEWHATIS=mmakewhatis
-MANM_MAN=mandoc_man
-MANM_MDOC=mandoc_mdoc
-MANM_ROFF=mandoc_roff
-MANM_EQN=mandoc_eqn
-MANM_TBL=mandoc_tbl
-MANM_MANCONF=mman.conf
-
-CFLAGS="${CFLAGS} ${CPPFLAGS}"
-LDFLAGS="${LDFLAGS} $(usex static -static '')"
-AR="$(tc-getAR)"
-CC="$(tc-getCC)"
-# The STATIC variable is only used by man.cgi.
-STATIC=
-EOF
-}
diff --git a/app-text/mandoc/mandoc-1.14.4.ebuild b/app-text/mandoc/mandoc-1.14.4.ebuild
new file mode 100644
index 000000000000..8c8b1bec615d
--- /dev/null
+++ b/app-text/mandoc/mandoc-1.14.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Suite of tools compiling mdoc and man"
+HOMEPAGE="http://mdocml.bsd.lv/"
+SRC_URI="http://mdocml.bsd.lv/snapshots/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+	default
+
+	# The db-install change is to support parallel installs.
+	sed -i \
+		-e '/ar rs/s:ar:$(AR):' \
+		-e '/^db-install:/s:$: base-install:' \
+		Makefile || die
+
+	cat <<-EOF > "configure.local"
+		PREFIX="${EPREFIX}/usr"
+		BINDIR="${EPREFIX}/usr/bin"
+		SBINDIR="${EPREFIX}/usr/sbin"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
+		EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
+		MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
+
+		BINM_MAN=mman
+		BINM_SOELIM=msoelim
+		BINM_APROPOS=mapropos
+		BINM_WHATIS=mwhatis
+		BINM_MAKEWHATIS=mmakewhatis
+		MANM_MAN=mandoc_man
+		MANM_MDOC=mandoc_mdoc
+		MANM_ROFF=mandoc_roff
+		MANM_EQN=mandoc_eqn
+		MANM_TBL=mandoc_tbl
+		MANM_MANCONF=mman.conf
+
+		CFLAGS="${CFLAGS} ${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS} $(usex static -static '')"
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		# The STATIC variable is only used by man.cgi.
+		STATIC=
+	EOF
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 562dd6f25b83..c825ed9adec2 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,20 +1,9 @@
 AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
-AUX mupdf-1.11-CFLAGS.patch 234 BLAKE2B d1ee80c2315101b3210ad13a78eb920edec9e524809fb5aff43e5db045f63fdd881f2993184a0181f60118aacb5cfab41bd1f8daa13bec362fbca6cbb18bc4d2 SHA512 8c0ae23e14842cf089434c716733f26738def189fbbb44341b772c9993b9f73b269f4d7744d2ef90a285cd1b02d7f67e18f1146e91851fc4d8c118c49ef0dea2
-AUX mupdf-1.11-CVE-2017-6060.patch 675 BLAKE2B 525ddceb2c853df02418a2cfbd6ac27c5b79a405b18c8d847d5c4f7a75fcffe9dcb5600e4758a9f681d5b8cf7db25ef253f9586714be666093b804d16d47515a SHA512 1ff64fb7f8a527d643cb57b472bbc48b73769eb826acdb511a5f77877d748ee165bb0e072ad27b62af5e3b7fcb075595ff53812824c5b03e686f758d0d270bd3
 AUX mupdf-1.11-drop-libmupdfthird.patch 579 BLAKE2B a0a1ee93832135663c14a91bb181ddfdbb315b1f0a9864c834e4c69f52c0c16ed960705baa4c0067526a23d52dc0c681ed6308b1efb34d29242303d023109b48 SHA512 a51588eae9cd97f1d6abc6c41cf5daed7b3e43fe33a5aab756567effa1bbe24cea3b05cdb3a8d027820b13eb2f54e6121a1fafefbcbe1a7768b0ba1e83bf7aeb
-AUX mupdf-1.11-openssl-curl-x11-r1.patch 1087 BLAKE2B 919a3fd6e955f8aee13e0bbce1db634ad5a32ed5f3a37508be18f182e54bf0550725dc94903bf9d33545e6fd20fc4084cfc62968f9b425efca4c14b4d9c9a7f6 SHA512 d82cfa7adfe2f6853f9fb08ee4c952919b2eb829fd3da2e015cca6dfd7924d2c494f229f461a0e33db2e69ffea90385ab04394fef856668b7ccc338e3fb60f29
-AUX mupdf-1.11-openssl-curl-x11.patch 1087 BLAKE2B b56dde0f5f150d1697562b96e3bfdc1a004ba6fbb50ce2fd3561c3d1f1c5c9ec5b10ec789eaed7d0b73ed1c24a4025c7e99b3ed056513be0fc31607abd9a9f33 SHA512 f3441a4ef5548e11adda6984ed84c6fe6d337a9ac3b17456b8b1b620e51f134fd39f5cef969ffe43b1a3025b3b6026b7cfc6d7fcdccc464859e3bf931d253c82
-AUX mupdf-1.11-system-glfw.patch 288 BLAKE2B 809aaed6098f59f555b14b80cb7576bd77b6cc781f07b387f720d8a74446fc44d74f5fc87f252b12cfa07495e7cbbc872bb20250290896d798d7b792c1ed6e3f SHA512 8331c72323011be2905383af3e0d76653d2a8551da3b815730aa8287494d6f867cc82bc8e2ba9ca2f5bdbb301ca3aba775c946019567957246bab1a852cda75f
 AUX mupdf-1.12-CFLAGS.patch 276 BLAKE2B 20a2440cbd5a8b2cbd17204939d876c8e6df3329c54ad477257ce875a9a5483e859be58cc2b4c6b93f7491aa1cbf4ae1444e8c43af161076feefbd570412b09c SHA512 834481f055df4ca8edc2991acade0295e753d72d1f973e4250ce25f81d33ea08bc4c5fafcef203efe686abd313b78512a36b2ce7c4b5b835206136793ab0e9d7
 AUX mupdf-1.13-openssl-curl-x11.patch 1184 BLAKE2B 27428b976a8f3854f16968fa5b70d0c4df0fb24508bea3c214fd5a0e46b3c43129ab0953ff20f55b23080de54ae6c5760f7eb97b53195794350a832219449acc SHA512 46f28dc5b23831c7125e42224acf16fc4a6cb90a03f719d2bd423d92e22280689bd3d7dc634d123050c2762333062916712cc951634ec5e5a7d2d4fcef7ebabf
 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
 AUX mupdf-1.9a-debug-build.patch 159 BLAKE2B da7e5294cb9e348d057d1436d68c6d3ce62aff7d7e0923c1b3c492c8dbaa459f26894c9c0c3c83e6885b7607c42f8c3da68e646f0dee3f83a168c7caab236f39 SHA512 5337c7dc2c5b29200378082651b81f5483475fe5cba997b2c55f60143e3f00901b19fc51216413151be87cef80e8fe452cde81006bfc552bdb6b1e9d6c0309cb
-DIST mupdf-1.11-source.tar.gz 40156070 BLAKE2B 2a9991a11355a449b91955bd897b5da175d3a89943277345779ea52c74f57c58226ee4087b23e3f434c0a45ae7a39df95c81c26c55d959f362bd1a0d0216716d SHA512 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
-DIST mupdf-1.12.0-source.tar.gz 51508917 BLAKE2B c34df17f0df7a200897d678514ff4012e02b1cef71189fe48740948c88cb544c6ce80f52a5dc335d70002806a7b413e5f79a1edee88865e42daf76e49416d9bf SHA512 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
 DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a SHA512 d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
-EBUILD mupdf-1.11-r1.ebuild 4650 BLAKE2B f68c39d06fae959cc37de3a6eb03758f3b146eda42253a795b48ba56ddb887f76eb79d901745fe4b6ff16924436f3fd4699b4065ed7d1a33bf605dd8f4265173 SHA512 4c2b3d4c568b42335177ccd975b11e044a0887d6541c2b78f7b3d43b1bc9030dd35f1ff4d8c3c2d4278c3e06b78ee2acab975eeff2dc5c00516575dfad436b6e
-EBUILD mupdf-1.11-r2.ebuild 4773 BLAKE2B d30970c3d275a44ff46a971b707cba9f17d2d4da24e1699cac848be97fc82fb5433a8a09166239b67a3764d13843b91683f93ff0e604fffde27e18d9bb500e7e SHA512 af89cdf6f3a595b424c67225cfa57b9c6811b4cbd9d1cb032bcadf98468aacbce00a78d4479592477bcdc3f6ad6f14703b4ea3aeda3820be7d8893ce506e2214
-EBUILD mupdf-1.12.0-r2.ebuild 5150 BLAKE2B b259c4eac6cc8e9e8aece1409227eedb8c57121a4e67b007ddaf8d952cede3cc078b125a13abbe1b90243075e71259344a032ade0259f07e9435966b8391995a SHA512 9bfce240ca26490e268b2e9076f12cdd5dce2cbc85e943a423e24c0adb5485bf32e0de9ba28bf62e8b43da04953819baea2fdd0e8814c6de4eee1b9cd6ef1eda
-EBUILD mupdf-1.12.0.ebuild 5060 BLAKE2B d68da2df2e328e4f96560d28dc8a79b7cdcbc5be7761513cac5dce3f9cc01a09083c11dea7ced2b8ab4cf41a788eb4a80b890e683e2178b6caed48dd758273c3 SHA512 42bf1fec67bbee0aa84a20614d322640f4c92c54eb947f35957886111834031d4a45994aaf39ba4ea08c709823475bede42c9dc4b49099929414ce587e8eb020
 EBUILD mupdf-1.13.0.ebuild 5148 BLAKE2B 4836ab82ae27c5aec001d0cc3e984eeef17a3ef964f19a43be2fe1d122edc10fa6b73450e8528ddc76cce8721bd5d990bba7249b6b8d6e40d05d2d1796a83863 SHA512 43c6695a9ebfd52ce9e8442f1fd632418bd9bdb55412e35c26fff1f58f42abd50ec985e14007cf1204977e0ac7edc2f002cd661d15fbe901087fbe82efe1b734
 MISC metadata.xml 315 BLAKE2B b143559c33bb6e3b81fe4dd7df802d48470f9080987e6c888b96bfb3f17e51dd3beaeb5501941dbbc47e1a525900a4719dc42d3d457d391d725670ff201e0c5b SHA512 1f3d23236f716a9e02a4f320105a8cd36e0dc84e25e35764677b66f7ae42039e0ae6f82ef06635cb0fe53fbb2e27ab854e54d45280275b8235f186328daa2b4e
diff --git a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch
deleted file mode 100644
index 2ffd326e5e46..000000000000
--- a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mupdf-1.11-source/Makerules
-+++ mupdf-1.11-source/Makerules
-@@ -23,7 +23,6 @@
- endif
- 
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g
- LDFLAGS += -g
- else ifeq "$(build)" "release"
- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
diff --git a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
deleted file mode 100644
index a595253e8649..000000000000
--- a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.ghostscript.com/?p=user%2Fsebras%2Fmupdf.git;a=blobdiff_plain;f=platform%2Fx11%2Fjstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614
-
-diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c
-index 13c3a0a..f158d96 100644
---- a/platform/x11/jstest_main.c
-+++ b/platform/x11/jstest_main.c
-@@ -346,7 +346,7 @@ main(int argc, char *argv[])
- 				}
- 				else if (match(&line, "OPEN"))
- 				{
--					char path[1024];
-+					char path[LONGLINE];
- 					if (file_open)
- 						pdfapp_close(&gapp);
- 					if (prefix)
diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch
deleted file mode 100644
index 92845a0eef2f..000000000000
--- a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mupdf-1.11-source/Makerules
-+++ mupdf-1.11-source/Makerules
-@@ -116,12 +116,17 @@
- SYS_PTHREAD_CFLAGS :=
- SYS_PTHREAD_LIBS := -lpthread
- 
-+WANT_OPENSSL ?= yes
-+ifeq "$(WANT_OPENSSL)" "yes"
- ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
- HAVE_LIBCRYPTO := yes
- SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
- SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
- endif
-+endif
- 
-+WANT_CURL ?= yes
-+ifeq "$(WANT_CURL)" "yes"
- ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
- HAVE_CURL := yes
- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
-@@ -133,12 +138,16 @@
- endif
- endif
- SYS_CURL_DEPS += -lpthread -lrt
-+endif
- 
-+WANT_X11 ?= yes
-+ifeq "$(WANT_X11)" "yes"
- ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
- HAVE_X11 := yes
- SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
- SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
- endif
-+endif
- 
- ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch
deleted file mode 100644
index 91fd9f6485dc..000000000000
--- a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mupdf-1.11-source/Makerules
-+++ mupdf-1.11-source/Makerules
-@@ -116,12 +116,17 @@
- SYS_PTHREAD_CFLAGS :=
- SYS_PTHREAD_LIBS := -lpthread
- 
-+WANT_OPENSSL ?= yes
-+ifeq "$(WANT_OPENSSL)" "yes"
- ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
- HAVE_LIBCRYPTO := yes
- SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
- SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
- endif
-+endif
- 
-+WANT_CURL ?= yes
-+ifeq "$(WANT_CURL)" "yes"
- ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
- HAVE_CURL := yes
- SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
-@@ -133,12 +138,16 @@
- endif
- endif
- SYS_CURL_DEPS += -lpthread -lrt
-+endif
- 
-+WANT_X!! ?= yes
-+ifeq "$(WANT_X11)" "yes"
- ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
- HAVE_X11 := yes
- SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
- SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
- endif
-+endif
- 
- ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
- SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
diff --git a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch
deleted file mode 100644
index 90189f9400b0..000000000000
--- a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mupdf-1.11-source/Makerules
-+++ mupdf-1.11-source/Makerules
-@@ -158,6 +158,8 @@
- SYS_JBIG2DEC_LIBS := -ljbig2dec
- SYS_LIBJPEG_LIBS := -ljpeg
- SYS_ZLIB_LIBS := -lz
-+SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl)
-+SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl)
- 
- endif
- 
diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild b/app-text/mupdf/mupdf-1.11-r1.ebuild
deleted file mode 100644
index 0b2990cc8b25..000000000000
--- a/app-text/mupdf/mupdf-1.11-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0[static-libs?] )
-	libressl? ( dev-libs/libressl[static-libs?] )
-	javascript? ( >=dev-lang/mujs-0_p20160504 )
-	media-libs/freetype:2[static-libs?]
-	media-libs/harfbuzz[static-libs?]
-	media-libs/jbig2dec[static-libs?]
-	media-libs/libpng:0[static-libs?]
-	>=media-libs/openjpeg-2.1:2[static-libs?]
-	net-misc/curl[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )
-	opengl? ( >=media-libs/glfw-3.2 )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-REQUIRED_USE="opengl? ( X !static !static-libs )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-1.11-CFLAGS.patch
-		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
-		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-		"${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch
-		"${FILESDIR}"/${PN}-1.11-system-glfw.patch
-		"${FILESDIR}"/${PN}-1.11-CVE-2017-6060.patch
-)
-
-src_prepare() {
-	default
-	use hppa && append-cflags -ffunction-sections
-
-	rm -rf thirdparty || die
-
-	if has_version ">=media-libs/openjpeg-2.1:2" ; then
-		# Remove a switch, which prevents using shared libraries for openjpeg2.
-		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
-		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
-	fi
-
-	use javascript || \
-		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-			-i include/mupdf/fitz/config.h
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i platform/debian/${PN}.pc || die
-
-	use vanilla || eapply \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getCC)" \
-		-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}" \
-		-e "1iWANT_X11 = $(usex X)" \
-		-e "1iWANT_OPENSSL = $(usex openssl)" \
-		-e "1iWANT_CURL = $(usex curl)" \
-		-e "1iHAVE_MUJS = $(usex javascript)" \
-		-e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \
-		-e "1iMUJS_CFLAGS =" \
-		-e "1iHAVE_GLFW = $(usex opengl yes no)" \
-		-i Makerules || die
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-			-i "${S}"-static/Makerules || die
-	fi
-
-	my_soname=libmupdf.so.${PV}
-	my_soname_js_none=libmupdf-js-none.so.${PV}
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake XCFLAGS="-fpic"
-	use static-libs && \
-		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-src_install() {
-	if use X ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	emake install
-	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/${PN}-x11
-	fi
-	if use X ; then
-		if use opengl ; then
-			dosym ${PN}-gl /usr/bin/${PN}
-			einfo "mupdf symlink points to mupdf-gl (bug 616654)"
-		else
-			dosym ${PN}-x11 /usr/bin/${PN}
-		fi
-	fi
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README docs/*.{txt,c}
-}
diff --git a/app-text/mupdf/mupdf-1.11-r2.ebuild b/app-text/mupdf/mupdf-1.11-r2.ebuild
deleted file mode 100644
index da582f3a2918..000000000000
--- a/app-text/mupdf/mupdf-1.11-r2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0[static-libs?] )
-	libressl? ( dev-libs/libressl[static-libs?] )
-	javascript? ( >=dev-lang/mujs-0_p20160504 )
-	media-libs/freetype:2[static-libs?]
-	media-libs/harfbuzz[static-libs?]
-	media-libs/jbig2dec[static-libs?]
-	media-libs/libpng:0[static-libs?]
-	>=media-libs/openjpeg-2.1:2[static-libs?]
-	net-misc/curl[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )
-	opengl? ( >=media-libs/glfw-3.2 )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-REQUIRED_USE="opengl? ( !static !static-libs )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-1.11-CFLAGS.patch
-		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
-		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-		"${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch
-		"${FILESDIR}"/${PN}-1.11-system-glfw.patch
-		"${FILESDIR}"/${PN}-1.11-CVE-2017-6060.patch
-		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
-)
-
-src_prepare() {
-	default
-	use hppa && append-cflags -ffunction-sections
-
-	rm -rf thirdparty || die
-
-	if has_version ">=media-libs/openjpeg-2.1:2" ; then
-		# Remove a switch, which prevents using shared libraries for openjpeg2.
-		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
-		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
-	fi
-
-	use javascript || \
-		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-			-i include/mupdf/fitz/config.h
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i platform/debian/${PN}.pc || die
-
-	use vanilla || eapply \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getCC)" \
-		-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}" \
-		-e "1iWANT_X11 = $(usex X)" \
-		-e "1iWANT_OPENSSL = $(usex openssl)" \
-		-e "1iWANT_CURL = $(usex curl)" \
-		-e "1iHAVE_MUJS = $(usex javascript)" \
-		-e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \
-		-e "1iMUJS_CFLAGS =" \
-		-e "1iHAVE_GLFW = $(usex opengl yes no)" \
-		-i Makerules || die
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-			-i "${S}"-static/Makerules || die
-	fi
-
-	my_soname=libmupdf.so.${PV}
-	my_soname_js_none=libmupdf-js-none.so.${PV}
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-}
-
-src_compile() {
-	emake XCFLAGS="-fpic"
-	use static-libs && \
-		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-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 ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/${PN}-x11
-	fi
-	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
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES docs/*.{txt,c}
-}
diff --git a/app-text/mupdf/mupdf-1.12.0-r2.ebuild b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
deleted file mode 100644
index 8810e2deaf06..000000000000
--- a/app-text/mupdf/mupdf-1.12.0-r2.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/${P}-source.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	libressl? ( dev-libs/libressl:0=[static-libs?] )
-	javascript? ( >=dev-lang/mujs-0_p20160504 )
-	media-libs/freetype:2=[static-libs?]
-	media-libs/harfbuzz:=[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/libpng:0=[static-libs?]
-	>=media-libs/openjpeg-2.1:2=[static-libs?]
-	net-misc/curl[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )
-	opengl? ( >=media-libs/freeglut-3.0.0:= )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-REQUIRED_USE="opengl? ( !static !static-libs )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-1.12-CFLAGS.patch
-		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
-		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-		"${FILESDIR}"/${PN}-1.11-openssl-curl-x11-r1.patch
-		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use hppa && append-cflags -ffunction-sections
-
-	# specialized lcms2, keep it if wanted inside lubmupdfthird
-	if ! use lcms ; then
-		rm -rf thirdparty/lcms2
-	fi
-
-	rm -rf thirdparty/{README,curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib} || die
-	for my_third in thirdparty/* ; do
-		ewarn "Bundled thirdparty lib: ${my_third}"
-	done
-
-	if has_version ">=media-libs/openjpeg-2.1:2" ; then
-		# Remove a switch, which prevents using shared libraries for openjpeg2.
-		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
-		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
-	fi
-
-	use javascript || \
-		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-			-i include/mupdf/fitz/config.h
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i platform/debian/${PN}.pc || die
-
-	use vanilla || eapply \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getCC)" \
-		-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
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-			-i "${S}"-static/Makerules || die
-	fi
-
-	my_soname=libmupdf.so.${PV}
-	my_soname_js_none=libmupdf-js-none.so.${PV}
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-}
-
-src_compile() {
-	use lcms && emake XCFLAGS="-fpic" third
-	emake XCFLAGS="-fpic" \
-		HAVE_GLUT=$(usex opengl yes no) \
-		HAVE_MUJS=$(usex javascript) \
-		MUJS_LIBS=$(usex javascript -lmujs '') \
-		WANT_CURL=$(usex curl) \
-		WANT_OPENSSL=$(usex openssl) \
-		WANT_X11=$(usex X)
-
-	use static-libs && \
-		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-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 \
-		HAVE_GLUT=$(usex opengl yes no) \
-		HAVE_MUJS=$(usex javascript) \
-		MUJS_LIBS=$(usex javascript -lmujs '') \
-		WANT_CURL=$(usex curl) \
-		WANT_OPENSSL=$(usex openssl) \
-		WANT_X11=$(usex X)
-
-	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/${PN}-x11
-	fi
-	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
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.12.0.ebuild b/app-text/mupdf/mupdf-1.12.0.ebuild
deleted file mode 100644
index 9f1100e51cb3..000000000000
--- a/app-text/mupdf/mupdf-1.12.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/${P}-source.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
-
-LIB_DEPEND="
-	!libressl? ( dev-libs/openssl:0[static-libs?] )
-	libressl? ( dev-libs/libressl[static-libs?] )
-	javascript? ( >=dev-lang/mujs-0_p20160504 )
-	media-libs/freetype:2[static-libs?]
-	media-libs/harfbuzz[static-libs?]
-	media-libs/jbig2dec[static-libs?]
-	media-libs/libpng:0[static-libs?]
-	>=media-libs/openjpeg-2.1:2[static-libs?]
-	net-misc/curl[static-libs?]
-	virtual/jpeg[static-libs?]
-	X? ( x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?] )
-	opengl? ( >=media-libs/glfw-3.2 )"
-RDEPEND="${LIB_DEPEND}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static-libs? ( ${LIB_DEPEND} )
-	static? ( ${LIB_DEPEND//?}
-		app-arch/bzip2[static-libs]
-		x11-libs/libXau[static-libs]
-		x11-libs/libXdmcp[static-libs]
-		x11-libs/libxcb[static-libs] )"
-
-REQUIRED_USE="opengl? ( !static !static-libs )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-1.12-CFLAGS.patch
-		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
-		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-		"${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch
-		"${FILESDIR}"/${PN}-1.11-system-glfw.patch
-		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use hppa && append-cflags -ffunction-sections
-
-	# specialized lcms2, keep it if wanted inside lubmupdfthird
-	if ! use lcms ; then
-		rm -rf thirdparty/lcms2
-	fi
-
-	rm -rf thirdparty/{README,curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib} || die
-	for my_third in thirdparty/* ; do
-		ewarn "Bundled thirdparty lib: ${my_third}"
-	done
-
-	if has_version ">=media-libs/openjpeg-2.1:2" ; then
-		# Remove a switch, which prevents using shared libraries for openjpeg2.
-		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
-		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
-	fi
-
-	use javascript || \
-		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-			-i include/mupdf/fitz/config.h
-
-	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
-		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
-		-i platform/debian/${PN}.pc || die
-
-	use vanilla || eapply \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getCC)" \
-		-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}" \
-		-e "1iWANT_X11 = $(usex X)" \
-		-e "1iWANT_OPENSSL = $(usex openssl)" \
-		-e "1iWANT_CURL = $(usex curl)" \
-		-e "1iHAVE_MUJS = $(usex javascript)" \
-		-e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \
-		-e "1iMUJS_CFLAGS =" \
-		-e "1iHAVE_GLFW = $(usex opengl yes no)" \
-		-i Makerules || die
-
-	if use static-libs || use static ; then
-		cp -a "${S}" "${S}"-static || die
-		#add missing Libs.private for xcb and freetype
-		sed -e 's:\(pkg-config --libs\):\1 --static:' \
-			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
-			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
-			-i "${S}"-static/Makerules || die
-	fi
-
-	my_soname=libmupdf.so.${PV}
-	my_soname_js_none=libmupdf-js-none.so.${PV}
-	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
-		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
-		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
-		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
-		-e "/install/s: COPYING : :" \
-		-i Makefile || die
-}
-
-src_compile() {
-	use lcms && emake XCFLAGS="-fpic" third
-	emake XCFLAGS="-fpic"
-	use static-libs && \
-		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
-	use static && \
-		emake -C "${S}"-static XLIBS="-static"
-}
-
-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 ${my_soname} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
-	if use static ; then
-		dobin "${S}"-static/build/debug/mu{tool,draw}
-		use X && dobin "${S}"-static/build/debug/${PN}-x11
-	fi
-	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
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/pep/Manifest b/app-text/pep/Manifest
index 338d78f49f02..61c7b2c9e486 100644
--- a/app-text/pep/Manifest
+++ b/app-text/pep/Manifest
@@ -2,4 +2,5 @@ AUX pep-2.8-gentoo.patch 494 BLAKE2B 62beadd57cf83f21f92dc9597265f7ef672aa19e743
 AUX pep-2.8-include.patch 239 BLAKE2B fd411d4e3753314ae93634bd24093524f364b1603671149722d31fb42e70977e3c97a76a2902a891aebd4e0f69632c5cd6da7996732195cf4a2d5005f5996fd4 SHA512 980ac8e710b2c0213c9ab6cb298274ca3eef21fdf9cd980e62530b98e913784cb5346fc13613b9723eaa6352383d31079d74749e21ac322edde86863344eff80
 DIST pep28.zip 83969 BLAKE2B 76dd8867b04299a7d616a1487a4b7812349a076f51b2828e01b45ef4790d890436eed147b51c2591dec8936b339a19fad3bb41eeafca8cda8c9904afbd2107e0 SHA512 c987b8f23409475e1882e06a87366a1692a7d859af907b4154715a4caf4475d6c266162ede019b29d65400fe72e115948d26e9c9396d628ea5f35ca472548ec8
 EBUILD pep-2.8-r1.ebuild 1149 BLAKE2B cc4ab4bd998e1762e9c474af66ca3c578b425fffd4e5166f3840a57a26d6c9831fa1ec0263886493e04dadf515e7a8589fade40b1dfb815abed5083fe503df50 SHA512 b4f5ca5770d0127f20b4b2c6145fa68703c5751df0dfac7739046e823dfd3f5193ecef150804bf59282c1286903d113727f3f30460258d3fea1d9d1116caafe6
+EBUILD pep-2.8-r2.ebuild 1048 BLAKE2B 5f5dd164c759d67445167a01f12f62e75263735530bcb29409465b4f699f3e1b5fde9af17e12827351419e8f0d05cb6879316e642877052ee970f6e17c9281c0 SHA512 d42b409655b3a126f7486e5e68e7a89aeb3b47a120b03e81ebac581d44b711ad379a8077b66ba9ab3e4c76acd108348d728416ac64399cb6952ab7764e396e8c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
new file mode 100644
index 000000000000..8e25853adc30
--- /dev/null
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="General purpose filter and file cleaning program"
+HOMEPAGE="http://hannemyr.com/enjoy/pep.html"
+SRC_URI="http://hannemyr.com/enjoy/${PN}${PV//./}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x86-linux ~ppc-macos"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}
+
+# pep does not come with autconf so here's a patch to configure
+# Makefile with the correct path
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-include.patch
+)
+
+src_prepare() {
+	default
+	# Darwin lacks stricmp and DIRCHAR
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/^OBJS/s/^\(.*\)$/\1 bdmg.o/' Makefile || die
+		append-flags "-Dunix" -DSTRICMP
+	fi
+}
+
+src_compile() {
+	# make man page too
+	make Doc/pep.1 || die "make man page failed"
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin pep
+	doman Doc/pep.1
+
+	insinto /usr/share/pep
+	doins Filters/*
+
+	dodoc aareadme.txt file_id.diz
+}
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index a37c652f4a52..683278abce51 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -3,5 +3,5 @@ DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 EBUILD ps2pkm-1.7_p20150521.ebuild 836 BLAKE2B 10e2fa2b739ab555770328f5e5cc25d9bd092b2a8efc7a519256eda0e056fe84d76a4a9d5f642e04e230639c0161b5f5814b524ecdc990f01fd3863ac6dfbbac SHA512 5007f586c9941ae159cbfdc49ebbd0da23f11b81731f5954ff79dcdff700764d15c555173c17b9d4bcfe82727eada7a0d07c98e19a62ce3e2933707c8557cb24
 EBUILD ps2pkm-1.8_p20160523.ebuild 848 BLAKE2B 7b28623873b847d71ff2f5f2f5bca7d68ab82b5cfd62e39c2f040cfd38b7895f3c6729b0544f6872d882539598aaffb233306bbcefe6dccd78897200d36b89f5 SHA512 829b0fa2979bc26a1198bc265b8e5977ccbf6edc2b9834f60ef504318d54c288bc54621f646e5f01313d12fbeee9d4223e9d8d7aae75635e24e3069f422a7659
-EBUILD ps2pkm-1.8_p20170524.ebuild 847 BLAKE2B 7cabd8c5204d7b19ec8ca22b6a421b7c62eeaf2798680c7460de26383c3bf469d71aef8701b5dd783081a09e8382bbc2d38cc150eb6b7fdba4585c5ae4d7b51f SHA512 e26e5f6f248f5efcb27fb6eba9b07274671448c3f9e3806e2b09fccf9165005fef8a8c18eb98a260081a263aec2cceb6ec2feeb6b209f647890bcab6d343491b
+EBUILD ps2pkm-1.8_p20170524.ebuild 846 BLAKE2B b4d755ceb012e39002be8da61a38d0479f4d5a6b3dc11467d766e894b274648cdd0ebb5e79d96aad97b167f0d2d23fda3d148712e6aae1d0cc2cfec77dc69c58 SHA512 d8d68f8b71aa47b384709a58f686c24c8b22767d9e596fb29f06fc759774558c2807ff55a52f609c915e8acd3f351ca6a9d73444874d6eda7dfdd30af3b991f2
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
index 4f7fe338493a..59318b16b5ac 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 77bad3c430e9..e2367d9c8d02 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,9 +1,6 @@
-AUX tesseract-3.04.01-use-system-piccolo2d.patch 1158 BLAKE2B f12d99977644dfdb7078ebab18ab02c1979922b94fbff4cde568e1496e572671465dd849cc38d86d0d32c986d054092eaa6e78c3423de0bdeef7c7d501a80a24 SHA512 635276f604238c0aace8be06ee6d0e7ec5fcb61a6cbe2504721ce41407a9799289f4917e4fecbe2155072e324c3ae3246238ec12abd23700a9311532657e678b
 AUX tesseract-3.05.00-no_graphics.patch 2199 BLAKE2B 0ed987995a7686dfb6e420c1e79eb1374df5d1c2c69177f858f962c1216f54daeb4b0e10e9c6cbfeda931f44a359b75fa266266c0807321479a4275b8ab7fdb4 SHA512 136b4f298e52517a801a19847ceb85cbb77ee0de42a43dc5a82faa7039f0b9c0bde965453ac5cd6c25f4578351217319a0ceb719fa42f207a38b3efe0c210388
-AUX tesseract-4.00.00-use-system-piccolo2d.patch 1030 BLAKE2B ce4e080e7d192df3ee7f9579d40cc30dcde63cf17ad85d06beb939ef26cddc013b4be5e2a8c0a0556576c01a57ad2c8a6281709a0d902e02e096b6a5688438c5 SHA512 df203ab3933a59f1f2f689ce8dcf266200c705837b5b97dab5f7b1684903523ffa7b88c374c2e7c0b106c1726ef54fdcda47ab44bf75cf51e7dc4308dac6a810
-AUX tesseract-4.00.00_alpha-isnan.patch 1027 BLAKE2B 7123c50da551abfe12e74e2dcb5c7b63dae7c6c35fad577b123acd341ce49ebb9c844033ee33a4c3bfe0751c4443e765311393b51c59513f5002ecb2c35bf2f9 SHA512 c2fa33a385b7fa0da525abf80ac39f846bb89df89a80c71c076355e98ac1d16a01d69c9ba748462f02e8f94b0049e6706ad77406ed0cc230fcac20b00fc917d8
-AUX tesseract-4.00.00_alpha-no_graphics.patch 4485 BLAKE2B a904e8c781c46f4173dafb86a665a8f736c97d37cf23a70bff2930d73c5794e888b44a6bbb33aedb9e89f9d383fd30d4a944b72f3feffcb08f53e60ba3ada091 SHA512 d64592d0236fdadde005020e3afe3839029b2090d052c8034f1f16c401a6df99bbd11750dd9e0013367afae04e770c8166e984531be05822f8cc134c2ff9b1d4
-AUX tesseract-4.00.00_alpha-openmp.patch 3817 BLAKE2B 31d0534d8006e91f25e78d4e2ffa132f3b46a764acd32726a1c3ea3ca98466b07a53f1716dd82d4b497670a933dbc3f6d67b038cf0b3a74a0538c9d47872fc52 SHA512 6e685f0b8da173714139bf48c2406bfb365081f8723c7b58c9feeb140ad0abf6875b871fd95c521f3e26421869c84409a0b8f405ea3179847a1052899148d4ca
+AUX tesseract-3.05.00-use-system-piccolo2d.patch 1030 BLAKE2B ce4e080e7d192df3ee7f9579d40cc30dcde63cf17ad85d06beb939ef26cddc013b4be5e2a8c0a0556576c01a57ad2c8a6281709a0d902e02e096b6a5688438c5 SHA512 df203ab3933a59f1f2f689ce8dcf266200c705837b5b97dab5f7b1684903523ffa7b88c374c2e7c0b106c1726ef54fdcda47ab44bf75cf51e7dc4308dac6a810
+AUX tesseract-4.00.00-use-system-piccolo2d.patch 1046 BLAKE2B 47aed1637b153bb946ddc76cc04fa564eafe83cf06d020b24ce9247c0e78cb62d3e03ee4bf950fb53bac0030c3bb4b2cea42d922414765c07862b929ee813800 SHA512 56bf955bf1b647dd3c5f55bd9e02126217cb21943866fdb6402e2dbe1f93ce018da41dcdbb120d88e06ebbdb6d7fb4726c19013150f7b07b38d91d784a2bb963
 DIST afr.traineddata-4.00 12213914 BLAKE2B e06516788c09f6a9538ffe3c4378eef4e88eaec0c8e14a7f3ddfd6db0820839a90a27f8519dcf6872dc8c08f47229d4ee8bd6aa41e383cbf51a5584bcda6f7f8 SHA512 1c00ef71a0e846bf5d0d57c7c3a3a8b5af47dfa8f429dbc02fdb560731923c0d0ab3273b3b975a570ffe7bfed2c7b284ef28ef4f830f8d4a0f33d84692cc655b
 DIST amh.traineddata-4.00 9771502 BLAKE2B 3a905487136efd099aacd0a979bfda1edcd30c8eb14fe2b304ba1f5355f570520b864c992b63a1fd1f683baa91186de7cd7c89e6057dfebb896f2d6f905b6d6a SHA512 0b449936c350eff717aa5bba502d3df86632746de9b3a7320252cb69707d18596b0bbd4a27caa3cb5bb560add8991bfbe7b56dac6f7e0a9f91202924fcb694de
 DIST ara.traineddata-3.04.00 6315068 BLAKE2B 30af9442d0180c9288c6e8ae03e7ede7e4a1a18743733bc00b63c28f405ee1f0221a64e01c19dde3f808efe6b4547bceeee36690d9bf44288dfe57211b7acc90 SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b
@@ -128,7 +125,8 @@ DIST syr.traineddata-4.00 8056121 BLAKE2B bacf6ee42b8a9dac7042ca2608ec72b6db1a76
 DIST tam.traineddata-4.00 17333471 BLAKE2B 67e4b10d8e9fab5df8455b35483972d5543ccf76d7440e7b1c9c8fe89a3cc4e19359a8695b1410004e202b138b8524c000487fdf2ee26247c0a2d4190b7184ed SHA512 9ad90eb8c291712e4cd874d41ed9bcd4169427a50509a353f5549382909458b46a7e4a092dec0d475c548e681426a81597c577f2f821978405a94f965fd4d05f
 DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac8975f079c42c78a661faa87ac1ed7f9d38fd59383d3ca1b484fbf371aeb5e872765921d4b79066a938b88671a3d9f SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6
 DIST tesseract-3.05.01.tar.gz 3574810 BLAKE2B 0af97d0a58c05ce4d6f8fb3f76302344f75b5894b036adc327ecc79f90f2b41da58c8145509dc131706e806e291355e221482980294e2c9caff4be93d9b448b6 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81
-DIST tesseract-4.00.00_alpha.tar.gz 3706567 BLAKE2B e3790c95ca7f219a3e1a90de09b9464bc54210d6f553132d4fa9e39f0afe56e458e16424a10a1a6e6461e8e98a84fbea826542a32d3432533165a9d400a416c4 SHA512 282ec941233ceb80fe1008e585a6069fe8ecd6bf2dd1d0f56e2e79b772a0b83bca918d5da892a6cab194a7828607e41a7fd873acec33181b8b86c3c37e434103
+DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
+DIST tesseract-4.0.0_beta4.tar.gz 1855821 BLAKE2B 8273fefc5c07526c87adcbe1d9d81204f622f42396564d8e5fae5ed5275c47bcefab1bc5df1560dee722a1236fbd2211f622e61b3f279219a877b3bb3bad822e SHA512 37347c461c288cbaf839b65ac1283ab5b60e6723726442a5d067e6a4e2f48d6847d7393206f1ddd4de3c5dbd8a8d9febcc42d68567a46a4665fbf678bab232d4
 DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
 DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
 DIST tgl.traineddata-4.00 11991699 BLAKE2B d888013c0416c1e057522ec828e2c2b4470d50b55b6de580ecf20090771cd6726167ca1dc66f02afab1f7c369035db1ea84cb0c7ddcc36d37820c0c065648986 SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380
@@ -143,7 +141,8 @@ DIST uzb.traineddata-4.00 12505562 BLAKE2B e0fb586d07d70e13c03e2ae0ce7a974952819
 DIST uzb_cyrl.traineddata-4.00 10390622 BLAKE2B 055ad7b767d5e919cf386f3a1b2902bdf21918b7e7604d83b4e002f248c3ae209326c1cc78541bbdf58a12c96e7e072f5d935c76053bd7b65090191f9b0956af SHA512 d2e82371312bdeb3e4db73bb74270553165df2f4d2b62ae7de474286c8c02e27f7c5401c3857c60d0d1de3d02b9106e396de7cfa167b82bb8a874101498be0e7
 DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
 DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4ce4cbd40493d9b56b13ecc42e9e2b9030fd8ad80e44e8c784f344b0eabbdec65373135bffadf36cd79b25f19bd4d SHA512 6f73647d8fc4df104eb8a8b9444bb46e0ee7560dfff3c33055a791a17a9ffb78a857dac2aa0219c628469eea636f89eb1551151fd79d7ac8c2d4a09c68765560
-EBUILD tesseract-3.05.01.ebuild 5839 BLAKE2B 601d39333d3b9f48116991182b43b9bdcd8d4e0075ca2f0615c42c3591dc1e8ca2aebc9047b658698a406784e145d42285c371155d7e2d35668827ee7fd6ab8d SHA512 bb8df48c8865a06bcc79cf8fe32744761faff9a57ccb0e304a0dd09ee386ad4d9eddbe2e1ebc2fa815f1b62369c758ded77e9b45b69573e49a95579f554ccd57
-EBUILD tesseract-4.00.00_alpha.ebuild 4167 BLAKE2B e638b8eb2a49dede24bc822a28da5d5e0671859eb707f28e8fd8de02b9f7e6db4d370d94b9a651f0072632d9f5cf4da809c128eb2a58636a7cdb6cff3eb35172 SHA512 1fbd99257210baee6791dc8fc4b3faa39b86bcbf786ed9c1a4da521c7b5b4a0c48a9c74596d589fcbe07767cd104490ef1b5c72beaa7226bdcfac373f30eed03
-EBUILD tesseract-9999.ebuild 3975 BLAKE2B 7aec6a728d49f1c50a7f12c15c17c37280c7cf38495fe375b37f5203da998c7fd1967fff4b1326d9cbc3ca8edbcb03e5ec16d63aaa2ed1129eddbffd9dd13bba SHA512 f1c5f75693a6eaff06a193113266020cde1bdbba7ba291ae7e6aad94fd7a94401fa03ac3f8ea2fdcd27417438045fac83a242027fb34ae836d6bfb0e77ad1f13
+EBUILD tesseract-3.05.01.ebuild 5839 BLAKE2B 60b51c0673443da142de10d6b2494a0e6e64351ab05b93294834c2c7f0dd7b49cabfaa7b6ac3524f2448edf27a42d3c064e6eafaebe325b12734b39ac5fb72cf SHA512 bd9aafd41fff04ee0c0b725c402613050ebfffa0113a74352b8819bffae7aa6d200d18f9058db22cff312befe213c0468affc5efc36b08e8b544570a9a4241f5
+EBUILD tesseract-3.05.02.ebuild 5844 BLAKE2B 498c5b5e633af1319b785c3ea40bfd3de48022710bd5edc8d381bf0dbc7d2ab29b11524be669a43cdbaae439677d606eae67ee334077961f0dbd952dd16a1745 SHA512 f8f9adc9e12ecaad1aafae82fed5ad3169b54275e43b225e91931044bc76822d4ac39dacbe0fdcc57a551eccce44ed4e5600deb1c100aca546a4467dfded99d2
+EBUILD tesseract-4.0.0_beta4.ebuild 3965 BLAKE2B c8d8b17f998368aca538ee664e6cdf12f6beba3ee0fb90c5439b84d16623b50cb75f0c81623d2fb777967d8531de583308127ec4e49c1f2c55d41e718479dc85 SHA512 0de2ba12cfb65644e126d2c4b635f6d3621d9cf4b6f0dc40e5ce606d27f55e9d4ddae567af7ee0b7691b6b57c951687ab623fcb6d6d1cf8f5fcab75e083f8715
+EBUILD tesseract-9999.ebuild 3842 BLAKE2B aef57e284d1268d22a48e832bb451999e05bf0a870d399f9e2d83ac53705ef8df3ea95973a42cfd40adaecd81595dd92a5cc5810c26128af15b922532604fd06 SHA512 a9e6935469b8b8dfef11ccfe86b0df0cacd2e7cc536517f0092fbc9242c29e7df3ef128b4057a09df5ebc57516457a11a231f7df554d3a55c8b85e1c34594ec3
 MISC metadata.xml 1271 BLAKE2B e2f8b18ee6fa20f2c059c5fc99e242743cc30153e783874e3b43ef7185b0f5827d611884dfa98242ec442edd8adf278fdc389731d61e9114d7549df934b6f7d9 SHA512 7ea459bc822290be824fc07b7abe26e13ad537e932b5cf71925e654f191fdee4d8681fabdd9a7fb246e87a9a365a8c0d6f933e34217aff24eb8bf3d741369656
diff --git a/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch
deleted file mode 100644
index a9dd00419347..000000000000
--- a/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -U 3 -dHrN tesseract-3.04.01/java/Makefile.am tesseract-3.04.01-scrollview/java/Makefile.am
---- tesseract-3.04.01/java/Makefile.am	2016-02-16 22:27:01.000000000 +0100
-+++ tesseract-3.04.01-scrollview/java/Makefile.am	2016-08-09 13:18:12.810503862 +0200
-@@ -36,10 +36,9 @@
- 	com/google/scrollview/ScrollView.class
- 
- SCROLLVIEW_LIBS = \
--	$(srcdir)/piccolo2d-core-3.0.jar \
--	$(srcdir)/piccolo2d-extras-3.0.jar
-+	/usr/share/piccolo2d/lib/piccolo2d.jar
- 
--CLASSPATH = $(srcdir)/piccolo2d-core-3.0.jar:$(srcdir)/piccolo2d-extras-3.0.jar
-+CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
- 
- ScrollView.jar : $(SCROLLVIEW_CLASSES)
- 	$(JAR) cfm $@ Manifest.txt com/google/scrollview/*.class \
-diff -U 3 -dHrN tesseract-3.04.01/viewer/Makefile.am tesseract-3.04.01-scrollview/viewer/Makefile.am
---- tesseract-3.04.01/viewer/Makefile.am	2016-02-16 22:27:01.000000000 +0100
-+++ tesseract-3.04.01-scrollview/viewer/Makefile.am	2016-08-09 13:20:57.788318147 +0200
-@@ -17,3 +17,7 @@
- 
- libtesseract_viewer_la_SOURCES = \
-     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
-+
-+if !GRAPHICS_DISABLED
-+AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
-+endif
diff --git a/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
new file mode 100644
index 000000000000..ad1f0f3df208
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.05.00-use-system-piccolo2d.patch
@@ -0,0 +1,27 @@
+diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
+--- tesseract.orig/java/Makefile.am	2017-01-30 17:20:23.135458366 +0100
++++ tesseract/java/Makefile.am	2017-01-30 17:21:29.834462557 +0100
+@@ -36,10 +36,9 @@
+ 	com/google/scrollview/ScrollView.class
+ 
+ SCROLLVIEW_LIBS = \
+-	piccolo2d-core-3.0.jar \
+-	piccolo2d-extras-3.0.jar
++	/usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+-CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
++CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+ ScrollView.jar : $(SCROLLVIEW_CLASSES)
+ 	$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
+diff -Naur tesseract.orig/viewer/Makefile.am tesseract/viewer/Makefile.am
+--- tesseract.orig/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
++++ tesseract/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
+@@ -17,3 +17,7 @@
+ 
+ libtesseract_viewer_la_SOURCES = \
+     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
++
++if !GRAPHICS_DISABLED
++AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
++endif
diff --git a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
index ad1f0f3df208..dc60579c6671 100644
--- a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
+++ b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
@@ -14,9 +14,9 @@ diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
  
  ScrollView.jar : $(SCROLLVIEW_CLASSES)
  	$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
-diff -Naur tesseract.orig/viewer/Makefile.am tesseract/viewer/Makefile.am
---- tesseract.orig/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
-+++ tesseract/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
+diff -Naur tesseract.orig/src/viewer/Makefile.am tesseract/src/viewer/Makefile.am
+--- tesseract.orig/src/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
++++ tesseract/src/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
 @@ -17,3 +17,7 @@
  
  libtesseract_viewer_la_SOURCES = \
diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch
deleted file mode 100644
index 4ae4c8150a61..000000000000
--- a/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From beb564df82204078563bcbde4e569caac2f7a2ac Mon Sep 17 00:00:00 2001
-From: Stefan Weil <sw@weilnetz.de>
-Date: Tue, 22 Nov 2016 11:31:01 +0100
-Subject: [PATCH] lstm: Fix compilation (undeclared 'isnan')
-
-gcc report:
-
-lstm/lstmrecognizer.cpp:608:47: error: 'isnan' was not declared in this scope
-     ASSERT_HOST(!isnan(output.f(t)[null_char_]));
-
-Signed-off-by: Stefan Weil <sw@weilnetz.de>
----
- lstm/lstmrecognizer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lstm/lstmrecognizer.cpp b/lstm/lstmrecognizer.cpp
-index f648e16..babfe50 100644
---- a/lstm/lstmrecognizer.cpp
-+++ b/lstm/lstmrecognizer.cpp
-@@ -600,7 +600,7 @@ void LSTMRecognizer::LabelsViaThreshold(const NetworkIO& output,
-     ++t;
-   }
-   while (t < width) {
--    ASSERT_HOST(!isnan(output.f(t)[null_char_]));
-+    ASSERT_HOST(!std::isnan(output.f(t)[null_char_]));
-     int label = output.BestLabel(t, null_char_, null_char_, NULL);
-     int char_start = t++;
-     while (t < width && !NullIsBest(output, null_thr, null_char_, t) &&
diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch
deleted file mode 100644
index 6707ff093644..000000000000
--- a/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff --git a/lstm/lstmrecognizer.cpp b/lstm/lstmrecognizer.cpp
-index 1d4f0f3..7192ba7 100644
---- a/lstm/lstmrecognizer.cpp
-+++ b/lstm/lstmrecognizer.cpp
-@@ -16,6 +16,11 @@
- // limitations under the License.
- ///////////////////////////////////////////////////////////////////////
- 
-+// Include automatically generated configuration file if running autoconf.
-+#ifdef HAVE_CONFIG_H
-+#include "config_auto.h"
-+#endif
-+
- #include "lstmrecognizer.h"
- 
- #include "allheaders.h"
-diff --git a/lstm/lstmtrainer.cpp b/lstm/lstmtrainer.cpp
-index ab66702..fd3f247 100644
---- a/lstm/lstmtrainer.cpp
-+++ b/lstm/lstmtrainer.cpp
-@@ -16,6 +16,11 @@
- // limitations under the License.
- ///////////////////////////////////////////////////////////////////////
- 
-+// Include automatically generated configuration file if running autoconf.
-+#ifdef HAVE_CONFIG_H
-+#include "config_auto.h"
-+#endif
-+
- #include "lstmtrainer.h"
- #include <string>
- 
-diff --git a/lstm/network.cpp b/lstm/network.cpp
-index 795d4a5..791848a 100644
---- a/lstm/network.cpp
-+++ b/lstm/network.cpp
-@@ -16,6 +16,11 @@
- // limitations under the License.
- ///////////////////////////////////////////////////////////////////////
- 
-+// Include automatically generated configuration file if running autoconf.
-+#ifdef HAVE_CONFIG_H
-+#include "config_auto.h"
-+#endif
-+
- #include "network.h"
- 
- #include <stdlib.h>
-@@ -277,27 +282,31 @@ double Network::Random(double range) {
-   return randomizer_->SignedRand(range);
- }
- 
--#ifndef GRAPHICS_DISABLED
- // === Debug image display methods. ===
- // Displays the image of the matrix to the forward window.
- void Network::DisplayForward(const NetworkIO& matrix) {
-+#ifndef GRAPHICS_DISABLED  // do nothing if there's no graphics
-   Pix* image = matrix.ToPix();
-   ClearWindow(false, name_.string(), pixGetWidth(image),
-               pixGetHeight(image), &forward_win_);
-   DisplayImage(image, forward_win_);
-   forward_win_->Update();
-+#endif  // GRAPHICS_DISABLED
- }
- 
- // Displays the image of the matrix to the backward window.
- void Network::DisplayBackward(const NetworkIO& matrix) {
-+#ifndef GRAPHICS_DISABLED  // do nothing if there's no graphics
-   Pix* image = matrix.ToPix();
-   STRING window_name = name_ + "-back";
-   ClearWindow(false, window_name.string(), pixGetWidth(image),
-               pixGetHeight(image), &backward_win_);
-   DisplayImage(image, backward_win_);
-   backward_win_->Update();
-+#endif  // GRAPHICS_DISABLED
- }
- 
-+#ifndef GRAPHICS_DISABLED
- // Creates the window if needed, otherwise clears it.
- void Network::ClearWindow(bool tess_coords, const char* window_name,
-                           int width, int height, ScrollView** window) {
-diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
-index 34a2286..84a4b94 100644
---- a/viewer/svutil.cpp
-+++ b/viewer/svutil.cpp
-@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
- #endif
- }
- 
-+// Create new thread.
-+void SVSync::StartThread(void *(*func)(void*), void* arg) {
-+#ifdef _WIN32
-+  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
-+  DWORD threadid;
-+  HANDLE newthread = CreateThread(
-+  NULL,          // default security attributes
-+  0,             // use default stack size
-+  f,             // thread function
-+  arg,           // argument to thread function
-+  0,             // use default creation flags
-+  &threadid);    // returns the thread identifier
-+#else
-+  pthread_t helper;
-+  pthread_attr_t attr;
-+  pthread_attr_init(&attr);
-+  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-+  pthread_create(&helper, &attr, func, arg);
-+#endif
-+}
-+
- #ifndef GRAPHICS_DISABLED
- 
- const int kMaxMsgSize = 4096;
-@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
- #endif
- }
- 
--
--// Create new thread.
--
--void SVSync::StartThread(void *(*func)(void*), void* arg) {
--#ifdef _WIN32
--  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
--  DWORD threadid;
--  HANDLE newthread = CreateThread(
--  NULL,          // default security attributes
--  0,             // use default stack size
--  f,             // thread function
--  arg,           // argument to thread function
--  0,             // use default creation flags
--  &threadid);    // returns the thread identifier
--#else
--  pthread_t helper;
--  pthread_attr_t attr;
--  pthread_attr_init(&attr);
--  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
--  pthread_create(&helper, &attr, func, arg);
--#endif
--}
--
- // Place a message in the message buffer (and flush it).
- void SVNetwork::Send(const char* msg) {
-   mutex_send_->Lock();
diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch
deleted file mode 100644
index d07fb58157fe..000000000000
--- a/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-Backport from upstream 6140be6a5575e9159e3678adf4ee9e673b3ff2cc
-
-diff -Naur tesseract-4.00.00alpha.orig/api/Makefile.am tesseract-4.00.00alpha/api/Makefile.am
---- tesseract-4.00.00alpha.orig/api/Makefile.am	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/api/Makefile.am	2017-01-26 10:27:59.269712914 +0100
-@@ -88,9 +88,7 @@
- 
- tesseract_LDFLAGS = $(OPENCL_LDFLAGS)
- 
--if OPENMP
- tesseract_LDADD += $(OPENMP_CFLAGS)
--endif
- 
- if T_WIN
- tesseract_LDADD += -lws2_32
-@@ -99,4 +97,3 @@
- if ADD_RT
- tesseract_LDADD += -lrt
- endif
--
-diff -Naur tesseract-4.00.00alpha.orig/ccmain/Makefile.am tesseract-4.00.00alpha/ccmain/Makefile.am
---- tesseract-4.00.00alpha.orig/ccmain/Makefile.am	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/ccmain/Makefile.am	2017-01-26 10:27:59.269712914 +0100
-@@ -8,6 +8,7 @@
-     -I$(top_srcdir)/textord -I$(top_srcdir)/opencl
- 
- AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
-+AM_CPPFLAGS += $(OPENMP_CXXFLAGS)
- 
- if VISIBILITY
- AM_CPPFLAGS += -DTESS_EXPORTS \
-diff -Naur tesseract-4.00.00alpha.orig/ccmain/par_control.cpp tesseract-4.00.00alpha/ccmain/par_control.cpp
---- tesseract-4.00.00alpha.orig/ccmain/par_control.cpp	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/ccmain/par_control.cpp	2017-01-26 10:27:59.269712914 +0100
-@@ -18,9 +18,9 @@
- ///////////////////////////////////////////////////////////////////////
- 
- #include "tesseractclass.h"
--#ifdef OPENMP
-+#ifdef _OPENMP
- #include <omp.h>
--#endif  // OPENMP
-+#endif // _OPENMP
- 
- namespace tesseract {
- 
-@@ -53,7 +53,9 @@
-   }
-   // Pre-classify all the blobs.
-   if (tessedit_parallelize > 1) {
-+#ifdef _OPENMP
-     #pragma omp parallel for num_threads(10)
-+#endif // _OPENMP
-     for (int b = 0; b < blobs.size(); ++b) {
-       *blobs[b].choices =
-           blobs[b].tesseract->classify_blob(blobs[b].blob, "par", White, NULL);
-diff -Naur tesseract-4.00.00alpha.orig/configure.ac tesseract-4.00.00alpha/configure.ac
---- tesseract-4.00.00alpha.orig/configure.ac	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/configure.ac	2017-01-26 10:28:45.636688839 +0100
-@@ -170,14 +170,7 @@
- fi
- 
- # check whether to build OpenMP support
--AM_CONDITIONAL([OPENMP], false)
- AC_OPENMP
--AS_IF([test "x$OPENMP_CFLAGS" != "x"],
--  [AM_CONDITIONAL([OPENMP], true)
--   AC_SUBST([AM_CPPFLAGS], ["$OPENMP_CXXFLAGS"])
--   AC_DEFINE([OPENMP], [], [Defined when compiled with OpenMP support])]
--)
--
- 
- # check whether to build opencl version
- AC_MSG_CHECKING([--enable-opencl argument])
-diff -Naur tesseract-4.00.00alpha.orig/lstm/lstm.cpp tesseract-4.00.00alpha/lstm/lstm.cpp
---- tesseract-4.00.00alpha.orig/lstm/lstm.cpp	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/lstm/lstm.cpp	2017-01-26 10:27:59.269712914 +0100
-@@ -18,7 +18,7 @@
- 
- #include "lstm.h"
- 
--#ifndef ANDROID_BUILD
-+#ifdef _OPENMP
- #include <omp.h>
- #endif
- #include <stdio.h>
-diff -Naur tesseract-4.00.00alpha.orig/lstm/Makefile.am tesseract-4.00.00alpha/lstm/Makefile.am
---- tesseract-4.00.00alpha.orig/lstm/Makefile.am	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/lstm/Makefile.am	2017-01-26 10:27:59.269712914 +0100
-@@ -4,7 +4,7 @@
-     -I$(top_srcdir)/dict -I$(top_srcdir)/lstm
- AUTOMAKE_OPTIONS = subdir-objects
- SUBDIRS =
--AM_CXXFLAGS = -fopenmp
-+AM_CXXFLAGS = $(OPENMP_CXXFLAGS)
- 
- if !NO_TESSDATA_PREFIX
- AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/
-diff -Naur tesseract-4.00.00alpha.orig/lstm/parallel.cpp tesseract-4.00.00alpha/lstm/parallel.cpp
---- tesseract-4.00.00alpha.orig/lstm/parallel.cpp	2016-11-08 00:38:07.000000000 +0100
-+++ tesseract-4.00.00alpha/lstm/parallel.cpp	2017-01-26 10:27:59.269712914 +0100
-@@ -18,7 +18,9 @@
- 
- #include "parallel.h"
- 
-+#ifdef _OPENMP
- #include <omp.h>
-+#endif
- 
- #include "functions.h"  // For conditional undef of _OPENMP.
- #include "networkscratch.h"
diff --git a/app-text/tesseract/tesseract-3.05.01.ebuild b/app-text/tesseract/tesseract-3.05.01.ebuild
index b75cd450b347..d237409e66ae 100644
--- a/app-text/tesseract/tesseract-3.05.01.ebuild
+++ b/app-text/tesseract/tesseract-3.05.01.ebuild
@@ -91,7 +91,7 @@ DOCS=( AUTHORS ChangeLog NEWS README.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
+	"${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
 )
 
 src_unpack() {
diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
new file mode 100644
index 000000000000..9f1cde5cf67a
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.05.02.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="tesseract-ocr"
+LANGPACKV="3.04.00"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+JAVA_PKG_OPT_USE="scrollview"
+
+inherit autotools java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
+	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
+	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
+	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
+	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
+	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
+	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
+	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
+	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
+	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
+	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
+	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
+	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
+	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
+	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
+	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
+	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
+	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
+	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
+	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
+	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
+	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
+	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
+	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
+	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
+	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
+	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
+	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
+	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
+	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
+	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
+	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
+	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
+	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
+	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
+	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
+	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
+	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
+	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
+
+# With opencl USE=tiff is necessary in leptonica
+CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	scrollview? (
+		>=dev-java/piccolo2d-3.0:0
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )
+	scrollview? ( >=virtual/jdk-1.7 )"
+
+RDEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jre-1.7 )"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
+	"${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	for file in ${A}; do
+		if [[ "${file}" == *traineddata* ]]; then
+			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable opencl)
+		$(use_enable scrollview graphics)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
+	use training && emake training
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	prune_libtool_files
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins testing/eurotext.tif testing/phototest.tif
+	fi
+
+	insinto /usr/share/tessdata
+	doins tessdata/*traineddata* # language files
+	use scrollview && doins java/ScrollView.jar # scrollview
+}
diff --git a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
index b936e99c917f..84e9db7e0a22 100644
--- a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
+++ b/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_PN="tesseract-ocr"
+MY_PV=${PV/_beta/-beta.}
 LANGPACKV="4.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
 JAVA_PKG_OPT_USE="scrollview"
@@ -12,7 +13,7 @@ inherit autotools java-pkg-opt-2 toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
 	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
 	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
@@ -20,7 +21,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+IUSE="doc jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
 
 # List of supported Gentoo linguas and their upstream mapping
 # https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
@@ -72,16 +73,13 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	scrollview? ( >=virtual/jre-1.7 )"
 
-DOCS=( AUTHORS ChangeLog NEWS README.md )
+DOCS=( AUTHORS ChangeLog README.md )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.04.01-use-system-piccolo2d.patch"
-	"${FILESDIR}/${P}-isnan.patch"
-	"${FILESDIR}/${P}-openmp.patch"
-	"${FILESDIR}/${P}-no_graphics.patch"
+	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
 )
 
-S=${WORKDIR}/${P/_}
+S=${WORKDIR}/${PN}-${MY_PV}
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -135,11 +133,6 @@ src_install() {
 		emake DESTDIR="${D}" training-install
 	fi
 
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
 	insinto /usr/share/tessdata
 	doins tessdata/*traineddata* # language files
 	use scrollview && doins java/ScrollView.jar # scrollview
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index d7b815358586..efa9df5d7095 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+IUSE="doc jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
 
 # List of supported Gentoo linguas and their upstream mapping
 # https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
@@ -72,7 +72,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	scrollview? ( >=virtual/jre-1.7 )"
 
-DOCS=( AUTHORS ChangeLog NEWS README.md )
+DOCS=( AUTHORS ChangeLog README.md )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
@@ -130,11 +130,6 @@ src_install() {
 		emake DESTDIR="${D}" training-install
 	fi
 
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
 	insinto /usr/share/tessdata
 	doins tessdata/*traineddata* # language files
 	use scrollview && doins java/ScrollView.jar # scrollview
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
index 4cacd3eedbf9..f2c8b210ce66 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -2,4 +2,4 @@ AUX wv2-0.4.2-glib.patch 312 BLAKE2B 7c68aff28688cf4ad7ee99c73d4509197e958bf05fc
 AUX wv2-0.4.2-libgsf.patch 425 BLAKE2B 417d6b340c34dffee0301308ee5a04f4468a5627670638399535f7336cca7515927392e66dd723e8a13742e71ccb1bf850c7b91608b7f280b545a707d6425a2d SHA512 634b1a336506777f8976b81cd906f8a896e2b777a3f04c5791277ed5ca2856dacb71adab807efecdf29d07c02e4c95b5d6fe143b1660be77e37ed9d7bd177143
 DIST wv2-0.4.2.tar.bz2 452759 BLAKE2B 6134739459617189f9d4e11a660dac25114b5d329b43d02fffe773d25bf62f2eb9f4ccb2712016e670c72f089a6d48f764e99b0ce5d44554d3e9d69ea9e14762 SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b
 EBUILD wv2-0.4.2-r2.ebuild 831 BLAKE2B a8829c7340d953d9b6329837956f2639936a5bf33c6f88b4937fda6bc0f115c24bf8ad96de3046a41b40db3bea124a2ea436944f07e504d352afc605536f6dd1 SHA512 ee2dc6db1c3302a6938157bccb9bddf3d77ef571a5e10907a2832af93fb6452d8668489c648a7d9b26705b01936f63113b52a69629c44ae4d03159ca70f2ae21
-MISC metadata.xml 394 BLAKE2B 33e5bd22439c91b6c6ae5f1cd67ed2419fd44f90a6f4dad26247d3b57ad3f46ff85a7dde13ecd1d4f859fdd08c87a8a836add617f05a8fe586579189c6df1c1f SHA512 abdccf92962c57c2c206a32eab8e855467874b3e17e8f1fc5db8d84b4c368fd005d3cee9e4bac28bd775aff4e9bd9319d61dc1c0e47492c2c531b41b33a4e4f2
+MISC metadata.xml 385 BLAKE2B 3528b2f800f83faedd0d61e9842dcd95c97a6fd805beec944ede5967c6f7da198d742521c1d8a5202366518407011ce8cb2b4a6072b9aba2aeb5a5b9642be09d SHA512 700605145c4883ed52e8f5a2dbc230aaabbe12038006c31f784d2bacfa71f8942100ae8342d393a27fa74d19dbc2a6d9cdd829659cf7509182761ecfd4782408
diff --git a/app-text/wv2/metadata.xml b/app-text/wv2/metadata.xml
index 4102994d89ca..f7ff6e99633e 100644
--- a/app-text/wv2/metadata.xml
+++ b/app-text/wv2/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wvware</remote-id>
-		<bugs-to>https://sourceforge.net/tracker/?group_id=10501</bugs-to>
+		<bugs-to>https://sourceforge.net/p/wvware/bugs/</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index e3b6df574586..cacc6f1894ec 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,5 +1,5 @@
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
 DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400
-EBUILD xiphos-4.0.6a.ebuild 2045 BLAKE2B 02426203620395f5a64438b0a7f97f41224a454fb8fcab01b61a6bb607bdda89ab0f47a1e4d44372db100abc8b8f28f0aa24dcff6cdb71f8e98412a589747d7d SHA512 e33b0410713e889a93febe02576e6a8213243be185c66b3b947fb0e7dc48c76178a05dc3e031f81bccf89668f9feb64f9db45fd59babaf263576ac58c3d85000
-EBUILD xiphos-4.1.0.ebuild 1998 BLAKE2B 4446b0796c9cc14c3f4cea5b7bef5b3773c7ad86cdfa8cb69f413494ba3fa161063373ffa3bbcf00e5bf68ead866675347f8ea92ed9b7a63edac679dbc4553a6 SHA512 24797cb338bce8906f6553e61f46d7eacab72ebb9540c3ee4465c1509e32884e56c5345388ff11ef0b2ca0a97542b47f63e383964439945726337d9a7b9cec2b
+EBUILD xiphos-4.0.6a-r1.ebuild 2027 BLAKE2B 6978cd3b5a439ceeb7acc9ecadbaa8ac110e81f49e65e4302ad5d8bd96fd376008a035c98cb188704ea61bd6711282673b9f4028322cef037aa815c0e9adec93 SHA512 5f1db81a0bcbe19297c68ee0a9d67374c20d58e0d41c59c1cfb77e7e80d51c2321db294ec54629ec7ed44bf10371d1b5aec864531bdbbf36f212d26405f2a3cf
+EBUILD xiphos-4.1.0-r1.ebuild 1980 BLAKE2B c696eee05bd1d0c721a5afae96ac3ca6ed445dbae9b6d3ce7c96191e632d29b97ef064f702491d9697d4142e2b0fe84a9b44c9cdf7df1397b75108685aa02109 SHA512 58f5d666133c466c0fb452425aa51923330d7c149a22432f23656b361d75e81cfb18689fca895bb4051737c58d4b794854c995939e18a49e8db329a1ae0f2a1f
 MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/app-text/xiphos/xiphos-4.0.6a.ebuild b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
index 1bd7cf90e5b0..c8c02b73669a 100644
--- a/app-text/xiphos/xiphos-4.0.6a.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,8 +20,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=app-text/sword-1.7.4
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
+	dev-libs/glib:2
+	dev-libs/libxml2:2[${PYTHON_USEDEP}]
 	gnome-base/gconf[${PYTHON_USEDEP}]
 	gnome-extra/gtkhtml:4.0
 	>=gnome-extra/libgsf-1.14
diff --git a/app-text/xiphos/xiphos-4.1.0.ebuild b/app-text/xiphos/xiphos-4.1.0-r1.ebuild
index 9824202606e8..a9f5298597bd 100644
--- a/app-text/xiphos/xiphos-4.1.0.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r1.ebuild
@@ -18,8 +18,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	>=app-text/sword-1.8.0
-	>=dev-libs/glib-2[${PYTHON_USEDEP}]
-	dev-libs/libxml2[${PYTHON_USEDEP}]
+	dev-libs/glib:2
+	dev-libs/libxml2:2[${PYTHON_USEDEP}]
 	gnome-base/gconf[${PYTHON_USEDEP}]
 	gnome-extra/gtkhtml:4.0
 	>=gnome-extra/libgsf-1.14
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index c8648021f6ff..e540fe33a98b 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,3 +1,5 @@
 DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
-EBUILD xmldiff-0.6.10-r2.ebuild 488 BLAKE2B 189741dc68933d3e514fb99b816aa2d531650d7850816cbabbb161e9bfad810a79d84b4e92e2ecc1782e6f9cc043590c3def905e1559e035dc9a67af8e1e52b4 SHA512 a2bd7bb2bb2a7cb3c6cfd3b6489dfe510b6f1ff6eb7b421e43f0fa29ceb229a3b60f73a982807c66d51b140770808d5657de5774ffeb77f87ca1be050fdd712c
-MISC metadata.xml 575 BLAKE2B a4b096b5e7322a3b44bd67a360f32ea6042ad59e6f90c93d33fe468550e2bbe23d3d449e633c4f1ab8133333b689341d374196784d4bb9f4a6bc2b20030002ae SHA512 6bc0a3df2b2c0c34df37d6b5985fcf4fba8577560edbebfc4d87ce0e66b8bba4d44eb6df72ed22c70d84b1ead2c975f567ec45f6bc01128cbd5c62cc7ec0fd4e
+DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
+EBUILD xmldiff-0.6.10-r2.ebuild 522 BLAKE2B 6d012cfec8f200441be4e5e27e9cbd4ca927843b46a5b8d24108440663d619c36b1f4bf11f256bd7c8478e88a9b01805d12c112cbba2a82fb96887aec40d9265 SHA512 b16ceed0a37b133b1f61b9e47529bd61469bc933ad99218f5d3a345baa6bfb2d4908754bcce5691be68085ace23f3049bc1ae12b855073f33bddce20620fc879
+EBUILD xmldiff-1.1.1.ebuild 642 BLAKE2B b747b274147b25923c77a250953eee32d1de0b247bef714489c6f6b06587c8bbc1563bc5f3630b6c446c4b66903e3ae2a2e0c7d4fd9816d75067bca3088311d2 SHA512 80bf5518b584c09e5d84e09e234ab234db9ff606e2ac97ff080caf458f83820564226ab44253fc2014717018691bf4c084b0fa749376e002ef752fef1d68c28d
+MISC metadata.xml 654 BLAKE2B c1cee22927b381829f18b5f25c8059d5c6dd595a98688dc6fb69633d69c051c7dae5225aac80e63d7e1537e9db6663498250e7ad0548c648d51cb64bf43d2051 SHA512 e36d33b6a5f3f0cdde3af65f81efb30ace0e781efb5c5e3565231f5968d12e3553bd5dd394ff2a61873b40a523b1277bfdc3854e7c7ff28883ad968479496626
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
index e7734cc5fb8a..30d3057f57c4 100644
--- a/app-text/xmldiff/metadata.xml
+++ b/app-text/xmldiff/metadata.xml
@@ -12,4 +12,7 @@
 		used as a library or as a command line tool. It can work either with XML
 		files or DOM trees.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">Shoobx/xmldiff</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild b/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
index e116f9beb7a1..7f33b19bd77d 100644
--- a/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
+++ b/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A tool that figures out the differences between two similar XML files"
-HOMEPAGE="https://www.logilab.org/project/xmldiff"
+HOMEPAGE="https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff"
 SRC_URI="ftp://ftp.logilab.fr/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
new file mode 100644
index 000000000000..955725e5043f
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-1.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool that figures out the differences between two similar XML files"
+HOMEPAGE="https://github.com/Shoobx/xmldiff https://www.logilab.org/project/xmldiff"
+SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/future
+	dev-python/lxml
+	dev-python/six"
+
+DOCS=( AUTHORS.rst CHANGES.rst README.rst TODO.rst )
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 8601fd80ebc3..f9dc4aad1913 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-pdf-mupdf-0.3.1.tar.gz 9755 BLAKE2B bbacecd503bda14301e1111799bf8fd82aa1488d4db5a28db7c0805b1e1391c038be64a0f4c64be974c2173396f972115ec6300686f34ac9b8b3e7e091d7ae5c SHA512 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d
 DIST zathura-pdf-mupdf-0.3.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
-EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1095 BLAKE2B 1c8506329cb6b56e46f53522990271aeb72afd30b38301cb1443fa8808460af81810713958c6f55f1fd79a635426d89812511b9ac8a5441020cc483a7b068284 SHA512 a8eb48a9029089008b9925d946d909a21802275a23a0e33edf67780c028fd1a7c8432438bc3aaac3b8460d40d0f7df8b9219bd8af5c99c6eb98339510e7c0479
 EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1074 BLAKE2B 33d9faf3af3156f08f3a2ac764c3ef16c2fc32b31ff396eafe1027663d0464f735ba0349423e9a173aeb84498a5da7d3fe13606ae2e46a10eb5b20fa0bc5a08b SHA512 99caf865cbc7751aec41b38e1d179d52bed4523c1813554413b4631fda9318726cffdb476de2777fe35f80ee463c2364437e1b30e80271b79c106ad7f5b5bb11
 EBUILD zathura-pdf-mupdf-9999.ebuild 1077 BLAKE2B d4f06640c28f86f45c274fdb77dca863742a4685dc47d14d82095a8adbac0c713a00a5c7676d017128926473f7ead99d6fe520682693b3e811da8b55ea49644c SHA512 c1f52c483e368114ee230b920bbe440687d668499b991ad92d85d6a93f677e0671c1561f3f8ca8230f1d84941facee607fd7661225c139a79a8299ab0140749e
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
deleted file mode 100644
index 2d076f7b32cd..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!app-text/zathura-pdf-poppler
-	>=app-text/mupdf-1.10a:=
-	<app-text/mupdf-1.12.0:=
-	>=app-text/zathura-0.3.1
-	media-libs/jbig2dec:=
-	media-libs/openjpeg:2=
-	virtual/jpeg:0
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-		MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)"
-		OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)"
-		OPENSSL_LIB=''
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-25 07:36:27 +0100
commit	43793fab84041cfc5c60c0151d1591b8a69fb24a (patch)
tree	6208a7f4fc744684fce0f55acbb47511acace498 /app-text
parent	28e3d252dc8ac8a5635206dfefe1cfe05058d1db (diff)