gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /app-text
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
130 files changed, 1003 insertions, 2609 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 54a8591f9879..d42ca3cd9b0b 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index f08981fd5a16..0602c6fd3f0c 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,7 @@
 DIST ansifilter-2.10.tar.bz2 436180 BLAKE2B b00a76867c17c63fa457c6e3ff6a57cfaedb6218df240d8afb52ec4acb46745f02b785fdbde294deb606a77564b9e6deb52e652cc4fdff32ebbb4c3a2ffcc846 SHA512 b2b2f7ec9d3343701cb1de19a1a3cb678ca9a908cc72e26e0eaf1e4cdf61cf7237edb4221bcde3159299aee3c05a84c46cf5706ad4f74b96ccec41b161ad44ec
 DIST ansifilter-2.12.tar.bz2 438051 BLAKE2B 112993b6f93d5fce6fc72c5e2d51dd99ba550902212098b3e75a6b4d910ccb9f49e9705a9f93d8d14f1423ae8a36e2ec0c442894241733a58a3b2a6c742e5691 SHA512 fd4e50f654c5e975f96bed8af1705c21d47d9e7f87f22411b2c7403362d4ee09c1be6fb5b31647daf6bea509d66f44e379ef7476a116470217d9c176302f7ffe
+DIST ansifilter-2.13.tar.bz2 439681 BLAKE2B 4f23bfd05647046f9cb739f9ce0820b5b3ccad397a80558ecd5ca584c695dc4f942c1db3edd2f1b2d5a78b2c1e1b043677b1be3486ff7237090c27072e15f0fb SHA512 0d74607d2155f1cd0f66cf6470d1d83889d27c62475e366518a78b310c9681307e2fe662fea67078f95e6b9ce28e6f15656ab1ffc9e9e825d680808c673b7bfe
 EBUILD ansifilter-2.10.ebuild 1004 BLAKE2B ea4e1af02cb1842900fa2e92b92aa2aaa4f4772e7e06a4819e427bd0f18f542caa4e9d44b7a0a418266aa15376a739929374c897cef9db8b33f0b8ec1a5a0b37 SHA512 eb11786afc6fd05adaa3584765a1ca3babf34f3a101664e50150706b906c0c9c4169e043f490ae8976b91d244aa94fd687b89d2e86908979eeec021246f133ea
 EBUILD ansifilter-2.12.ebuild 1006 BLAKE2B 9f8a7175a2c62e5a519f52a829d5045001912b1f72c7320672f622d75e3fb9b78cd48422d2e22178134fdb3bf26d3868dca9d94fb3d0695d9eb6683c2afb02dc SHA512 43c7fa2c5c2ca6d9f936503476bb60c9614d0719d3ad6315ef84cfa9f0855d5ee1cb9adc3322686683216ffc907eb4e8620e8f4fc28ace8713e2042e64c8c0aa
+EBUILD ansifilter-2.13.ebuild 1006 BLAKE2B 9f8a7175a2c62e5a519f52a829d5045001912b1f72c7320672f622d75e3fb9b78cd48422d2e22178134fdb3bf26d3868dca9d94fb3d0695d9eb6683c2afb02dc SHA512 43c7fa2c5c2ca6d9f936503476bb60c9614d0719d3ad6315ef84cfa9f0855d5ee1cb9adc3322686683216ffc907eb4e8620e8f4fc28ace8713e2042e64c8c0aa
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.13.ebuild b/app-text/ansifilter/ansifilter-2.13.ebuild
new file mode 100644
index 000000000000..a6d2e9316671
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.13.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs qmake-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="qt5"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		eqmake5
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
+
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dobin src/${PN}
+	use qt5 && dobin src/qt-gui/${PN}-gui
+
+	gunzip man/${PN}.1.gz
+	doman man/${PN}.1
+	einstalldocs
+}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index e3037883789e..8d3344b90de1 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,8 +2,8 @@ AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad7
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
-DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
-EBUILD calibre-3.15.0.ebuild 9281 BLAKE2B 8eaf92eb0c23c1b500105c74841aaf1980f71d7f3d01f5af76a0bf906a904d3df17ed71a5b01d150a70c1fd53b431f66de9a8c3a055a26b086dd60b714e535c0 SHA512 2194ef543af3296766c960768dbe8e6330d89583318052ad56a8a35df5704c88deec235c1dbfe042bc4c99df8ff94b48fd87f3b15b012c288a87f891433d49a5
+DIST calibre-3.35.0.tar.xz 39482684 BLAKE2B acf61ad52b9de4ab87913d536890f1f74cd4bca656ec275cd5fe21d6bbb4b97792d7f13f40b85b61f7a27745be2aedfff8b6deb9f8dff980f6f30596c184f1f2 SHA512 c81a00832c812603e5c5752f47ad322fcd9aa5079273385af2e0d8813bf04c4b84cca40210d53207c5b52ac4975ecec725f5560cb3c629f4afe9150229138b0d
 EBUILD calibre-3.26.1.ebuild 9281 BLAKE2B 8eaf92eb0c23c1b500105c74841aaf1980f71d7f3d01f5af76a0bf906a904d3df17ed71a5b01d150a70c1fd53b431f66de9a8c3a055a26b086dd60b714e535c0 SHA512 2194ef543af3296766c960768dbe8e6330d89583318052ad56a8a35df5704c88deec235c1dbfe042bc4c99df8ff94b48fd87f3b15b012c288a87f891433d49a5
+EBUILD calibre-3.35.0.ebuild 9246 BLAKE2B 1259df8792b677d45160ea9282d06db8b416cc002dc6016a13acde2054bb2574f7e7def8576277f2af6d8e29b93455dfdcb1c67e3a10fd0e349341101ebffa82 SHA512 7bbf1f3796843e46bd0ca0636476aa397e562b1333fdb605c2a49c8abdea032ec59f7e701e30414e93755db538ebd3d1eea5bea017b3fd5e6fec90a891c8c0eb
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.35.0.ebuild
index f761e9c5d83a..eaef52feb40d 100644
--- a/app-text/calibre/calibre-3.15.0.ebuild
+++ b/app-text/calibre/calibre-3.35.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -31,14 +31,14 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="ios +udisks"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.8.2:=
+	>=app-text/podofo-0.9.6_pre20171027:=
 	>=app-text/poppler-0.26.5[qt5]
 	>=dev-libs/chmlib-0.40:=
 	dev-libs/glib:2=
@@ -46,19 +46,19 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/libinput:=
 	>=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
 	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
 	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
 	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
 	>=dev-libs/dbus-glib-0.106
 	>=sys-apps/dbus-1.10.8
-	dev-python/html5-parser[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
+	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
 	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
@@ -75,7 +75,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/libmtp-1.1.11:=
 	>=media-libs/libwmf-0.2.8
 	>=media-gfx/optipng-0.7.6
-	sys-libs/zlib:=
+	>=sys-libs/zlib-1.2.11:=
 	virtual/libusb:1=
 	virtual/python-dnspython[${PYTHON_USEDEP}]
 	x11-libs/libxkbcommon:=
@@ -93,7 +93,7 @@ RDEPEND="${COMMON_DEPEND}
 	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.4
+	>=virtual/podofo-build-0.9.6_pre20171027
 	virtual/pkgconfig"
 
 pkg_pretend() {
@@ -199,11 +199,7 @@ src_install() {
 	local libdir=$(get_libdir)
 	[[ -n $libdir ]] || die "get_libdir returned an empty string"
 
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
+	addpredict /dev/dri #665310
 
 	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
 	#dodir $(python_get_sitedir)
diff --git a/app-text/chm2pdf/Manifest b/app-text/chm2pdf/Manifest
deleted file mode 100644
index 4d524828834f..000000000000
--- a/app-text/chm2pdf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tempdir.patch 3694 BLAKE2B a88d3709ee23f43ab6a9a9b3ec83306d964d3d791b4552f99df26bdf09924cc40b721b0f24c8807b47f0e91b3eb8d46dae1c15ee53b9fe7974431c523bda5b50 SHA512 e7d29e71afad11c79d508c35c9060a39308c78e654f00808cb38b7e75ebf5f885bbd436f58e9900977c2e81d0f4a7f543daeab6bd2f9a919c4c3b74dba33c325
-DIST chm2pdf-0.9.1.tar.gz 19955 BLAKE2B 6f16f35d25904cf1b42e91c46f58b279fceb11a328a88e14f20a9749148a4a5932af4884a19f57dc89b0135b3b8acd2dc880265aa46dfb9887ab6212a59172bd SHA512 1d1997b17750f371e60cc6bf9693a8e4316deadd63247700f6ebd1bf02340f2e0524766a6be846d0f6349416b8551609da63fbf60ecd62766cf0d9b4f0c886d3
-EBUILD chm2pdf-0.9.1-r2.ebuild 768 BLAKE2B 3dee8875ae605f35e8e3cbc992d74ae0a3188a9801183775a7a15eff4f64009a44235e9498be0e68fb8065cd1a6391adb4ab8e16b79ee0473ca637cd2c7c8397 SHA512 e6015c7b5eed96714e2afac98132141f55067654cd65dfb510c4266a68fc69328fbaa28bc771cc8978ec45f512f50e3d4234e7be1c9f09932daec093ef35a7cf
-MISC metadata.xml 244 BLAKE2B d68384fb6b1d1dbb9d20cd76c4991aa746477d14e2b318cecdcd66166758beef130e69ddf71dc7e27071af3ae234b537b106a9daf719d0f6f6039aa82702cb0c SHA512 6c2761abb4bf0f08e2bb5eaf232dfec4cc83a1617acd7954a5c7e0987056b1a8b3efdcee1a1c718436aa33c440bb65368dc1231e7146f9c795f696ba5686b644
diff --git a/app-text/chm2pdf/chm2pdf-0.9.1-r2.ebuild b/app-text/chm2pdf/chm2pdf-0.9.1-r2.ebuild
deleted file mode 100644
index d4ace08fe54d..000000000000
--- a/app-text/chm2pdf/chm2pdf-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A script that converts a CHM file into a single PDF file"
-HOMEPAGE="https://code.google.com/p/chm2pdf/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/pychm[${PYTHON_USEDEP}]
-	app-text/htmldoc
-	>=dev-libs/chmlib-0.40-r1[examples]
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=( "${FILESDIR}/tempdir.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare(){
-	python_fix_shebang .
-}
-
-src_install() {
-	default
-	python_doscript ${PN} || die "failed to create executable"
-}
diff --git a/app-text/chm2pdf/files/tempdir.patch b/app-text/chm2pdf/files/tempdir.patch
deleted file mode 100644
index 6bb5fe55d00d..000000000000
--- a/app-text/chm2pdf/files/tempdir.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- chm2pdf-0.9.1.orig/chm2pdf	2008-07-09 12:42:26.000000000 +0200
-+++ chm2pdf-0.9.1/chm2pdf	2009-02-25 20:58:53.000000000 +0100
-@@ -27,6 +27,8 @@
- import os, os.path
- import re, glob
- import getopt
-+import tempfile
-+import shutil
- # from BeautifulSoup import BeautifulSoup
- 
- global version
-@@ -39,8 +41,8 @@
- global filename #the input filename
- 
- version = '0.9.1'
--CHM2PDF_TEMP_WORK_DIR='/tmp/chm2pdf/work' 
--CHM2PDF_TEMP_ORIG_DIR='/tmp/chm2pdf/orig'
-+CHM2PDF_TEMP_WORK_DIR=tempfile.mkdtemp()
-+CHM2PDF_TEMP_ORIG_DIR=tempfile.mkdtemp()
- 
- 
- 
-@@ -299,16 +301,6 @@
-     # ########################### File extraction and correction: START ############################
-     #
-     if options['dontextract'] == '':
--    
--        try:
--            os.mkdir(CHM2PDF_TEMP_WORK_DIR)
--        except OSError: # The directory already exists.
--            pass
--        
--        try:
--            os.mkdir(CHM2PDF_TEMP_ORIG_DIR)
--        except OSError: # The directory already exists.
--            pass
-         
-         try:
-             os.mkdir(CHM2PDF_ORIG_DIR)
-@@ -620,7 +612,7 @@
-     print '\t--continuous\n\t\tSpecifies  that  the  HTML  sources are unstructured (plain web pages).\n\t\tNo page breaks are inserted between each file or URL in the output.'
-     print '\t--cookies \'name="value with space"; name=value\'\n\t\t'
-     print '\t--datadir directory\n\t\tSpecifies the  location  of  the  HTMLDOC  data  files,  usually  /usr/share/htmldoc  or  C:\Program Files\HTMLDOC '
--    print "\t--dontextract \n\t\tIf given, %s will not extract the HTML files from the given CHM file, but will use previously extracted copies from the temporary directory " %name + '(i.e. ' + CHM2PDF_TEMP_ORIG_DIR + ' and ' + CHM2PDF_TEMP_WORK_DIR + '). Usually you will use this option after you have used the \'--extract-only\' option to extract the files in order to correct them manually (in ' + CHM2PDF_TEMP_WORK_DIR + '). After the correction, a call with \'--dontextract\' will not overwrite your changes, but will use the corrected files instead.'
-+#    print "\t--dontextract \n\t\tIf given, %s will not extract the HTML files from the given CHM file, but will use previously extracted copies from the temporary directory " %name + '(i.e. ' + CHM2PDF_TEMP_ORIG_DIR + ' and ' + CHM2PDF_TEMP_WORK_DIR + '). Usually you will use this option after you have used the \'--extract-only\' option to extract the files in order to correct them manually (in ' + CHM2PDF_TEMP_WORK_DIR + '). After the correction, a call with \'--dontextract\' will not overwrite your changes, but will use the corrected files instead.'
-     print '\t--duplex\n\t\tSpecifies that the output should be formatted for double-sided printing.'
-     print '\t--effectduration {0.1..10.0}\n\t\tSpecifies the duration in seconds of PDF page transition effects.'
-     print '\t--embedfonts\n\t\tSpecifies that fonts should be embedded in PDF output.'
-@@ -1084,13 +1076,6 @@
-         print 'CHM file "' + filename + '" not found!'
-         return
-     
--    #remove temporary files
--    if options['dontextract'] == '':
--        if options['verbose']=='--verbose' and options['verbositylevel']=='high':
--            print 'Removing any previous temporary files...'
--        os.system('rm -r '+CHM2PDF_ORIG_DIR+'/*')
--        os.system('rm -r '+CHM2PDF_WORK_DIR+'/*')
--    
-     cfile = chm.CHMFile()
-     cfile.LoadCHM(filename)
- 
-@@ -1105,6 +1090,8 @@
-             os.system('extract_chmLib ' + filename + ' ' + CHM2PDF_ORIG_DIR + '&> /dev/null')
-     
-     convert_to_pdf(cfile, filename, outputfilename, options)
-+    shutil.rmtree(CHM2PDF_TEMP_WORK_DIR)
-+    shutil.rmtree(CHM2PDF_TEMP_ORIG_DIR)    
- 
- 
- if __name__ == '__main__':
diff --git a/app-text/chm2pdf/metadata.xml b/app-text/chm2pdf/metadata.xml
deleted file mode 100644
index 98820e79c356..000000000000
--- a/app-text/chm2pdf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="google-code">chm2pdf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/clara/Manifest b/app-text/clara/Manifest
deleted file mode 100644
index 71f33045643d..000000000000
--- a/app-text/clara/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX clara-20031214-debian-vararg.patch 1768 BLAKE2B 87457b832c224a4a199136abda7a8448fb80ec215d7d93a5f66a0d382b8bc3dc0a33412954a91040b5ed6a8a9e4d24619ff783b05b32481f2c6da694cc2fee5c SHA512 3ec7c2bb9a11721c670ac1f74f2038f0909d0282392381be8c2bb2b9fd564b32dc94b56ab9458d95a63bf701816729610501e8cea2ca9088f64db62f560611bb
-AUX clara_open_mode.patch 567 BLAKE2B 0b355d1ef6a2c8de21e2c90b4651d361799ce6d4972a1a235068d2d08fd0810d712bde3e3d759ce1305f9c52c094120e7e42bbfb6b1c332ccbcded64dcb64c5a SHA512 787972048c6ddcea4727b72a0b327486349876de2978358fcc4386010d5f43415e6573bf01d4c48ad747195718186954403ddae63a09f1bf5471995b17d27b34
-DIST clara-20031214.tar.gz 451539 BLAKE2B beed8b3a199825a8d8699c10b6a08c4d71fbafa3f3d2ebbbff6b13eafa35b4f38bacca35209039a93f0d31a993987a8773371b43440a1a0fbd61c40c455ec1f9 SHA512 260d710132a3903d71b6c4c0885ac1709b60d520861e3dcd5e4b75a3bf5627549c94423670be08245e7a9db6a870a93a9526c8d318fadaddcce00cbf02985f49
-EBUILD clara-20031214-r1.ebuild 1262 BLAKE2B ba3f6b45e1d17a56066134acf5991837d3e3fd92c6edf7ebf71833254d8c9f6eaa58b1369029d7a388a3dbb256cca75ae3d6804107fffac14f7361f6e95bfb6e SHA512 499a121d78c780e025ba45b9f56e1e8b8c16d7776ec2b21b1bd1af5b60b4c1526f5bd443c19ea697c12d5c7d519e902a17a15756c3d42f1cbe2972c49773335b
-EBUILD clara-20031214.ebuild 1245 BLAKE2B 46d3e3ea7114342eec8a8b6d298e41ceea7eb05a0af31ab7247daab97fe5645561cfcec96edb3886078548546ed6691783e802102935fca3520a151713ebd23d SHA512 e14f2c63eba3aa5dd9a3300b65bec2a0f263546dd778ec5ee826a6dc90d44dde778505abcaf21eeb8b7904e92f4fa7ab2f27aabee38d4505410bba29495d5a8e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/clara/clara-20031214-r1.ebuild b/app-text/clara/clara-20031214-r1.ebuild
deleted file mode 100644
index 758415dfd6af..000000000000
--- a/app-text/clara/clara-20031214-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An OCR (Optical Character Recognition) program"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-HOMEPAGE="http://www.claraocr.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-# The test provided by clara doesn't seem to make any sense.  It just
-# calls the binary with an unsupported option, which results in an
-# error.
-RESTRICT="test"
-
-src_prepare() {
-	sed -i -re "s/(C|LD)FLAGS =/\1FLAGS +=/" Makefile
-	epatch "${FILESDIR}/${PN}_open_mode.patch"
-	epatch "${FILESDIR}/${P}-debian-vararg.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-	emake doc || die
-}
-
-src_install() {
-	dobin ${PN} selthresh
-	doman doc/${PN}*.1 selthresh.1
-
-	dodoc ANNOUNCE CHANGELOG doc/FAQ
-	insinto /usr/share/doc/${P}
-	doins imre.pbm
-
-	dohtml doc/*.html
-}
-
-pkg_postinst() {
-	elog
-	elog "Please note that Clara OCR has to be trained to recognize text,"
-	elog "without a training session it simply won't work. Have a look at"
-	elog "the docs in /usr/share/doc/${P}/html/ to get more "
-	elog "info about the training procedure."
-	elog
-}
diff --git a/app-text/clara/clara-20031214.ebuild b/app-text/clara/clara-20031214.ebuild
deleted file mode 100644
index e1143a5a99b2..000000000000
--- a/app-text/clara/clara-20031214.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="An OCR (Optical Character Recognition) program"
-SRC_URI="mirror://gentoo/clara-20031214.tar.gz"
-HOMEPAGE="http://www.claraocr.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-# The test provided by clara doesn't seem to make any sense.  It just
-# calls the binary with an unsupported option, which results in an
-# error.
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -re "s/(C|LD)FLAGS =/\1FLAGS +=/" Makefile
-	epatch "${FILESDIR}/clara_open_mode.patch"
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-	emake doc || die
-}
-
-src_install() {
-	dobin clara selthresh
-	doman doc/clara*.1 selthresh.1
-
-	dodoc ANNOUNCE CHANGELOG doc/FAQ
-	insinto /usr/share/doc/${P}
-	doins imre.pbm
-
-	dohtml doc/*.html
-}
-
-pkg_postinst() {
-	elog
-	elog "Please note that Clara OCR has to be trained to recognize text,"
-	elog "without a training session it simply won't work. Have a look at"
-	elog "the docs in /usr/share/doc/${P}/html/ to get more "
-	elog "info about the training procedure."
-	elog
-}
diff --git a/app-text/clara/files/clara-20031214-debian-vararg.patch b/app-text/clara/files/clara-20031214-debian-vararg.patch
deleted file mode 100644
index 570bc4018993..000000000000
--- a/app-text/clara/files/clara-20031214-debian-vararg.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- clara-20031214.orig/clara.c
-+++ clara-20031214/clara.c
-@@ -751,11 +751,12 @@
-     s[128] = 0;
-     logmsg(s);
- 
--    if (!trace)
--        return;
--    va_start(args,m);
--    vfprintf(stderr,m,args);
--    fprintf(stderr,"\n");
-+    if (trace) {
-+        vfprintf(stderr,m,args);
-+        fprintf(stderr,"\n");
-+    }
-+
-+    va_end(args);
- }
- 
- /*
-@@ -775,10 +776,12 @@
-     logmsg(s);
- 
-     /* send to stderr if requested */
--    if (!debug)
--        return;
--    vfprintf(stderr,m,args);
--    fprintf(stderr,"\n");
-+    if (debug) {
-+        vfprintf(stderr,m,args);
-+        fprintf(stderr,"\n");
-+    }
-+
-+    va_end(args);
- }
- 
- /*
-@@ -797,9 +800,10 @@
-     s[128] = 0;
-     logmsg(s);
- 
--    va_start(args,m);
-     vfprintf(stderr,m,args);
-     fprintf(stderr,"\n");
-+
-+    va_end(args);
- }
- 
- /* (devel)
---- clara-20031214.orig/event.c
-+++ clara-20031214/event.c
-@@ -638,6 +638,8 @@
-         }
-     }
- 
-+    va_end(args);
-+
- /*
-     printf("request (priority %d, mclip=%d, redraw=%d) to draw the message \"%s\"\n",f,mclip,redraw_stline,s);
- */
---- clara-20031214.orig/html.c
-+++ clara-20031214/html.c
-@@ -1548,11 +1548,12 @@
-     va_list args;
-     int n=0,f;
- 
--    va_start(args, fmt);
-     for (f=0; f==0; ) {
- 
-         /* try to write */
-+        va_start(args, fmt);
-         n = vsnprintf(*t+*top+1,*sz-*top-1,fmt,args);
-+        va_end(args);
- 
-         /*
-             Some implementations of vsnprintf return -1 when
-@@ -1589,11 +1590,12 @@
-     va_list args;
-     int n=0,f;
- 
--    va_start(args, fmt);
-     for (f=0; f==0; ) {
- 
-         /* try to write */
-+        va_start(args, fmt);
-         n = vsnprintf(text+topt+1,textsz-topt-1,fmt,args);
-+        va_end(args);
- 
-         /*
-             Some implementations of vsnprintf return -1 when
diff --git a/app-text/clara/files/clara_open_mode.patch b/app-text/clara/files/clara_open_mode.patch
deleted file mode 100644
index 3f73f466ab8c..000000000000
--- a/app-text/clara/files/clara_open_mode.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pgmblock.c	2002-04-29 14:26:13.000000000 +0000
-+++ pgmblock.c	2009-03-05 02:51:43.000000000 +0000
-@@ -161,7 +161,7 @@
- 
-         printf("%d rare pixels (%1.4f)\n",t,((float)t)/(w*h));
- 
--        F = open("map",O_WRONLY|O_CREAT);
-+        F = open("map",O_WRONLY|O_CREAT, 0644);
-         write(F,m,h*bpl);
-         write(F,map,256);
-         close(F);
-@@ -197,7 +197,7 @@
-     {
-         int i,j,F;
- 
--        F = open("map",O_RDONLY|O_CREAT);
-+        F = open("map",O_RDONLY|O_CREAT, 0644);
-         read(F,m,h*bpl);
-         read(F,map,256);
-         close(F);
diff --git a/app-text/clara/metadata.xml b/app-text/clara/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/clara/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
index 150ed30a6a40..cb7cdaccbd6c 100644
--- a/app-text/cmigemo/Manifest
+++ b/app-text/cmigemo/Manifest
@@ -1,10 +1,5 @@
-AUX cmigemo-1.2-migemo-dict.diff 825 BLAKE2B 59c4d476188839e81f68c97b838e903498b890903d22d42a21c41b5f5fddcb7299dee36c9034893785e26d7d90a5e0d5773aefb97188a62c5b9eced826cac8d6 SHA512 e7b6826c4ce5a87a7e95743f233efaa6a5edc2515a86c85dc24e7dcf9d9a105fbab2f9fd8a81b3ff124a032eaa8dfd5050ca23ef7818ea29a7e8f9c44877388a
 AUX cmigemo-1.3c-gentoo.patch 1948 BLAKE2B 5c182d0c9c93b06104d1067272d35b023386a9ce7bfee1828489268cfff1bacbe64d83cde803df1a0f52804b3474900077a8144a1bd5900785c73b77ea0ca1d0 SHA512 90035c0fbf3b341113e4991f08c9962e27d37f6f215983379e92d7c616a67662b8754f390f9f19f7c84f1d5cc9a51a815999ec6c84e7c642758b3324f05b7837
 AUX cmigemo-1.3c-ldflags.patch 502 BLAKE2B 3fc4c85592cc9feffbaeee636e8fcada10c7b7cd8696495239436808ddf9462da09713bbba10c3e5eb66cb45a3ec02e53f1e708fc0c1281dd96cc3e66db8caea SHA512 932bfad5afc4c90531cac96a9a7fb06d1ed690b3391ad9425c5ae1baa7caf2d8046d208e25816ea4ecfbbe44b2a95216e551cbbeb7808548f534853e6b817f7b
 DIST cmigemo-1.3c-MIT.tar.bz2 54447 BLAKE2B 37e561b992317dbf421b3d09203e92000c0217347235545483b4f8b99071794c2b240636a880c1758c1828782468670eb640fbd411abe779b28c52dfc3147650 SHA512 8c5b9109f4309906ed19d5d48643918f51c339be7f3b34c90d2d814fed1b6d30e77a1539f6c1e11ceb3560f83fd9e1079254af0b41e81b274e39128de6ffeb18
-DIST cmigemo-1.3c.tar.bz2 54323 BLAKE2B 4d63bde57c442131056e1aabcc702308243491de0632325b7a80af328e293c97479ac1733f29484a2ee7912f6d599360e7703d45612e8b30b52fd7a1228b5152 SHA512 240bdc92139d692cdb9e98a977f77105ef3ca716ede030629b3c4652276f0b0955ae80cc443fb879cada4b3fc83f7e4181043355e0285fcfe1011f4db4d13cc1
-EBUILD cmigemo-1.3c-r1.ebuild 1427 BLAKE2B 1dac8bc6ba813acec59e3e17132330a742762a71ec6e97dc36debd2199a0a27db97e67c5a158a0938060f59445a286d34e3e255213ce658c2f9aac5aacef2b39 SHA512 976846e86885c9a0435ff36e389d5d8778738159f62a985660899420b7ce621e86057560243dc8540578cbe0ccb33e3a261660ba2641bf2a0e8321430edf86df
-EBUILD cmigemo-1.3c-r2.ebuild 1584 BLAKE2B 4bb59aeeaf8b428a3354ffa3508488f762b8cd8bad63a3f493908ea97c6c6fa48081e742cb47844e60a3304501a9a41969b87323befb2b2220899cfb9de44e21 SHA512 361932a88d926d6a969068e258eb242c12b1180abd5819bf07b199cb187728f8b782af1f9630e37a41c2cb0a022961998c90b0fbb9d06e45f2d413b16767e87d
-EBUILD cmigemo-1.3c-r3.ebuild 1576 BLAKE2B a18ecba544b095a268eb80eace0b596fbaed1fb2c2ef70f5c9eee2cbe481030c448c104426712e43fde8edace62d473b586f91903b360924fc29b488c0e2c562 SHA512 0f0d971ba48ed22fd5150f6724695120c6093e5425cb436772b5020d3a26b935e440e0d2aabdd2525eb7cd198bcfdd9f8b0bd125ff21f54060b24ad8c7261e05
-EBUILD cmigemo-1.3c.ebuild 1102 BLAKE2B 17e25d35db7bff1b72b865addcd4430d7b35b04f1421c6e6ed9c8bebe76d33493cdbb569a0630608a765d3903b4c1620ea3afe06026f29e5ed6e35996e8af2b0 SHA512 d7ab991b692b9dfee83b748be48e159ab2ab4954174384984bf434af80fd2e17d3aa2e5b54615c4981c8414725fa1ee7044f8fbad65530779130bee5d0e387a5
+EBUILD cmigemo-1.3c-r3.ebuild 1569 BLAKE2B 42211da0825a0e072a67c0fef575004f661d1d2d43cd32ef5bac7a63529eca3cda68a893eeae0973bd6a3f57ff9f5d508d3f5a1e770d5c9e83d2f15f6bdba051 SHA512 af7154cc3643cb97c9118155819a912dacc7a0defbcef5b1f8d0d76e221405a69510d0ca364a80a0c2367b113849d07718dd7fc64b354a88cd83ba8e1d0dfb42
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
deleted file mode 100644
index 5339687735fb..000000000000
--- a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${P}-MIT"
-DESCRIPTION="C/Migemo -- 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="unicode vim-syntax"
-
-DEPEND="dev-lang/perl
-	>=app-dicts/migemo-dict-200812[unicode=]
-	app-i18n/qkc"
-RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2-migemo-dict.diff"
-	touch dict/SKK-JISYO.L
-	if use unicode ; then
-		sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
-	fi
-
-	# Bug #246953
-	sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
-}
-
-src_compile() {
-	append-flags -fPIC
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" gcc || die
-}
-
-src_install() {
-	# parallel make install borks
-	emake -j1 \
-		prefix="${D}/usr" \
-		libdir="${D}/usr/$(get_libdir)" \
-		gcc-install || die
-
-	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/"
-	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8}
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins tools/migemo.vim
-	fi
-
-	dodoc doc/{README_j,TODO_j,vimigemo}.txt
-}
diff --git a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
deleted file mode 100644
index 5949875af65d..000000000000
--- a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${P}-MIT"
-DESCRIPTION="C/Migemo -- 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="unicode vim-syntax"
-
-DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
-	dev-lang/perl
-	|| (
-		net-misc/curl
-		net-misc/wget
-		www-client/fetch
-	)
-	app-i18n/nkf"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Bug #246953
-	epatch "${FILESDIR}/${P}-gentoo.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	touch dict/SKK-JISYO.L
-	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 || die
-}
-
-src_install() {
-	# parallel make b0rked
-	emake -j1 \
-		prefix="${D}/usr" \
-		libdir="${D}/usr/$(get_libdir)" \
-		gcc-install || die
-
-	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/"
-	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8}
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins tools/migemo.vim
-	fi
-
-	dodoc doc/{README_j,TODO_j,vimigemo}.txt
-}
diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
index 5843c8f263fd..b39dc8bc473a 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE="unicode vim-syntax"
 
 DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
diff --git a/app-text/cmigemo/cmigemo-1.3c.ebuild b/app-text/cmigemo/cmigemo-1.3c.ebuild
deleted file mode 100644
index d00bfc14a73b..000000000000
--- a/app-text/cmigemo/cmigemo-1.3c.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="C/Migemo -- Migemo library implementation in C"
-HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
-SRC_URI="http://www.kaoriya.net/dist/var/${P}.tar.bz2"
-
-LICENSE="cmigemo"
-SLOT="0"
-KEYWORDS="x86 alpha ppc"	# development branch
-IUSE=""
-
-DEPEND="app-i18n/qkc
-	app-dicts/migemo-dict"
-RDEPEND="app-dicts/migemo-dict"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/${PN}-1.2-migemo-dict.diff
-	touch ${S}/dict/SKK-JISYO.L
-
-	# Bug #246953
-	sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
-}
-
-src_compile() {
-	emake CFLAGS="-fPIC ${CFLAGS}" gcc || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		docdir=${D}/usr/share/doc/${P} \
-		gcc-install || die
-
-	mv ${D}/usr/share/migemo/euc-jp/*.dat ${D}/usr/share/migemo
-	rm -rf ${D}/usr/share/migemo/{cp932,euc-jp}
-
-	if has_version 'app-editors/vim-core' ; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins tools/migemo.vim
-	fi
-
-	dodoc tools/migemo.vim
-	dodoc doc/{README_j,TODO_j,vimigemo}.txt
-}
diff --git a/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff b/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff
deleted file mode 100644
index a216ceafb0ca..000000000000
--- a/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN cmigemo-1.2.ORIG/tools/migemo.vim cmigemo-1.2/tools/migemo.vim
---- cmigemo-1.2.ORIG/tools/migemo.vim	2003-01-07 22:57:59.000000000 +0900
-+++ cmigemo-1.2/tools/migemo.vim	2004-03-13 17:25:31.944190968 +0900
-@@ -20,7 +20,7 @@
-     let dict = globpath(path, "migemo-dict")
-   endif
-   if dict == ''
--    let dict = '/usr/local/share/migemo/'.&encoding.'/migemo-dict'
-+    let dict = '/usr/share/migemo/migemo-dict'
-     if !filereadable(dict)
-       let dict = ''
-     endif
-@@ -43,7 +43,9 @@
-   nnoremap <Leader>f :call <SID>SearchChar(0)<CR>
- else
-   " non-builtin version
--  let g:migemodict = s:SearchDict()
-+  if !exists('g:migemodict')
-+    let g:migemodict = s:SearchDict()
-+  endif
-   command! -nargs=* Migemo :call <SID>MigemoSearch(<q-args>)
-   nnoremap <silent> <leader>mi :call <SID>MigemoSearch('')<cr>
- 
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
index 8ae7aacab42b..386276c19145 100644
--- a/app-text/cpdf/Manifest
+++ b/app-text/cpdf/Manifest
@@ -1,3 +1,5 @@
 DIST cpdf-2.1.1.tar.gz 349536 BLAKE2B 4064605890745ebaa24d32c3294a3293312dc8df6ab3989e1a7417989cdb19aca6b70faafb258c7c00d6febeba8b17379396c1f90628e72be0791cdefc579b6f SHA512 aa06efaf098d3fe3f560ea30da9c3546e13d294b22d61c4cc3df553eb90e338d59ee1b51d14d7982ce52967bcf98c2afec9a5b5ae101e2183961f4be862c6517
+DIST cpdf-2.2.1.tar.gz 704730 BLAKE2B 1767d2c9fdc645b4ff97b828b1d7bedb22aa645444f299e36ec4717015ea7b87dbbac4c9ec27bb508a7adb28b2c75c155bf9094a168567abbffa93887712241d SHA512 3dda72513c551cca5d8cb60732b3f2c2e8ad400bd2c9fcf0c3b54a68e94385e3f19ec7713de95efa90eafb7b0077662097565a28616041019e03edf140b6af4f
 EBUILD cpdf-2.1.1-r1.ebuild 815 BLAKE2B e3db88ff54d34fe7b74bb9bda9496dbc20a992bb4b50a0ff537ab7cb871cdb08bf55d57967f4ae2810ad5dd34dd5df5c9ec52665532d2b374c082bd9c1c74e61 SHA512 e51916639a09447f6cefa7d2400c0ea1349f52926acd16b6d4ef250c5a4d865af04501763e0f0d40d78735e426b601c8d88cf171d2cff374898b6b98a3c8fff8
+EBUILD cpdf-2.2.1.ebuild 815 BLAKE2B 6fc75aea7da5d46a3dacb449fc65ff8804e033f187cb4d94e5d540153fef675ed957739bfbf8a1af8b9d0689cb602c247786ded6ec17c23168f55beb5d09ff0b SHA512 e019a563726c0b72bb28547302b2e87b4481514705ccbefafb8d4b91021868cbdf2a97c3f653592d4d3546fff2a48a56196fdf14930513b5c86df0da6436161c
 MISC metadata.xml 347 BLAKE2B 2f11a4f77be2b5501b6789daa1724cb1933313963450fa1df91072c095cab406f3907bb2656715022ffff4be94e6b8f4e70d5beae1feeb3b3fd5a2fa1c8413a1 SHA512 e97b4580d3d0e3c06a6e24aac842e66a354e2a9ea9eb70486383143999a2c8a188bdc5ac2d5672ae1ed83950f94d8fcce3d8c3a4d701009bd4102b88bd4b715d
diff --git a/app-text/cpdf/cpdf-2.2.1.ebuild b/app-text/cpdf/cpdf-2.2.1.ebuild
new file mode 100644
index 000000000000..f65bcfcc2166
--- /dev/null
+++ b/app-text/cpdf/cpdf-2.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="A command line tool for manipulating PDF files"
+HOMEPAGE="http://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
+SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# BSD is only for xmlm.ml
+LICENSE="Coherent-Graphics BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt]
+	dev-ml/camlpdf:="
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror bindist"
+
+S=${WORKDIR}/${PN}-source-${PV}
+
+src_compile() {
+	# parallel make issues
+	emake -j1
+}
+
+src_install() {
+	findlib_src_install
+
+	dobin cpdf
+	dodoc Changes README.md cpdfmanual.pdf
+	doman cpdf.1
+
+	use doc && dodoc -r doc/cpdf/html
+}
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
index 202f9205e4a8..7aa29fb15480 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -1,4 +1,6 @@
 AUX diction-1.13-make.patch 367 BLAKE2B 1b29ff3455dc455210dd1277281b175292ead12e3aebe3459d837597c2f4f37ab7608ee2819e284992f542f5a0bc5b699c671189e650810289adc25daa8393bd SHA512 ab317f3de37697a098dc9c50ef741417772ab66434a41b89381bf123b9e980263a1b6b488f7f1b1bfbe25a178b2d7acc793067e8eb26e34300e639765af818bc
 DIST diction-1.13.tar.gz 145971 BLAKE2B a70a198f356d9c92813d2b60b02e703a61dbefd5968314058a2538e77929f1fcdfb72d95a827ceb539770fdaf0f6d7a0f67e4318524463e24ae3eeeb31edf475 SHA512 f410f9992adcc362bc60f3e39e85cc07df5763623729c6d599538707aff0831e8cde59d80bcd384975d75229d6ce1cae9bebdf6eb3d4a7203b22d2a1773df039
+DIST diction-1.14.tar.gz 147268 BLAKE2B 12e4a56aa6429bb155dd08a0ba01438f79b69ab9d2a990a3d9c2d12e1eccd15ff7c09d634d399f82d09c97b24586e4586bd6521153ae071b3192dc7a3ea10102 SHA512 db704f3c01883b24ce01c5aaaae9a615418e2cfbf851b7f11a4357c853299caf666483e309d84217413732b7abd1abc44f0bcb3dc960b64adfdfa19121607ce3
 EBUILD diction-1.13.ebuild 560 BLAKE2B de58eee9a39d247850564a0699969c8ca6500338f2d047925d182dfb4b85f15c285f2782d3c0e1e497af333a3c314f707e0ef6a74c67d1df0d25b726d2f132e4 SHA512 62214b2d75940fd215871d7d3eefc0adc3198a178e1eb4e0376999f8dc484f5f9d3094495eb128140e3f7b333a5e39820ce665402f19fa25f4d9e884caf45f24
+EBUILD diction-1.14.ebuild 538 BLAKE2B 9ee694676055e676fc0e4ff3e1eb643d0ea31dd18b24a39a6db5a60d03d1ff88ea4b20a829d05564b07b1f92be668ee7dfa6b3e4e810ab6ececeb81e4d15e45e SHA512 576237a3fdd5f3af275cb100942e69e0c3eeff30b27dd1ab25a2500e52a256da4c6dd89127446413eec79682f9c164c1028e988c1db5101fb21b1391be8cf467
 MISC metadata.xml 1006 BLAKE2B eda482a025adacb54d70d937d88c1b2f88d3f1a48ba4c031a2abde7f70037b1b7150c1509a3b67f1421c25fb2fe299d31e11c900dfc48ee76f5502b7ce5bad66 SHA512 f8aa49a2b7cef19bd9658516a2ca5cbac77883c1e1c1615d00a886c46d2505999a383652e1fed8a6341d69b31a0fa4763ff2df7bb0ad2f03f65948982dee4675
diff --git a/app-text/diction/diction-1.14.ebuild b/app-text/diction/diction-1.14.ebuild
new file mode 100644
index 000000000000..07533e14ded3
--- /dev/null
+++ b/app-text/diction/diction-1.14.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Diction and style checkers for english and german texts"
+HOMEPAGE="https://www.gnu.org/software/diction/diction.html"
+SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DEPEND="
+	sys-devel/gettext
+	virtual/libintl
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.13-make.patch
+)
+DOCS=( NEWS README )
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 9b702f421d83..b7251ec56671 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -21,5 +21,5 @@ EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1000 BLAKE2B dbb46cff1a33f8f0770588c18cf08
 EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1015 BLAKE2B 1dd036ea95d19b8bdbc825c4bf60b30dbd26ddcb97c4cecd020ccbdbb57294d5841882ef39dca414bab1e33533d390dd8ba0aee4f663c0bf35e0c5e7b9048c32 SHA512 8ddd813944172d0f8a858029292d7b22318e6795b1338f07057472e7042912c0c642d18876caabdf0d83aceb60c1852256bd36249741616510fbbb9abe69eaec
 EBUILD docbook-sgml-dtd-4.3-r2.ebuild 996 BLAKE2B 0368e87e3debadf66d48791a0e5044dbf6b047aa7461ac2ef190e7df56e619ecaddf16942d34570fff853b358ad030d67ba195793e79c061016e2834bab2185c SHA512 a1b777d1620c54fc30fa1d8ba1bfbded15eeebdc6a5289b8c15b7bf91577e4809db10bedc5929d1ea134a94d398929d9241b989e146012ad12b8564d84b10217
 EBUILD docbook-sgml-dtd-4.4.ebuild 1006 BLAKE2B 895942f94fb5e43c0cec90080720378b675751ea55657c759a372642f960c9e58d8427d4d8270aa8624b25847cd7556320bf0f754b81b6e3501d6ee6746607b9 SHA512 bb0b2a4b95c8b9ef77bdafb2e9129415de1be53fcbff278811049964eb9e5ab6674fd7083edd1dd502ffac560b27ee4a4d0238cfac8901c04e3f0b34a5c8894f
-EBUILD docbook-sgml-dtd-4.5.ebuild 1000 BLAKE2B 65ebfa392ba196b29f3156b40fea1825d1cb8a89ad49070ecd24af54dd7b9591d1dd0390f0918c279ea88184ad4e511e2470c328181da11ad2f4108dc4e85a9d SHA512 24e1845ac7278cb9602d8cd992413396a83b03097187d1d1ba519a43e368c3c3529acdb6e8d2f25b8fdfc076f656b50c90c22cdf9d46f299c817116ed8cbcabc
+EBUILD docbook-sgml-dtd-4.5.ebuild 999 BLAKE2B 47395c84eb27c599d8dc014d052b96e113c6040a83b5c2f1ba0e5d73f37d848b53b3ac6969af8d0e9e12b063918b203fd60f65f6367332e7e48628aac5a86a99 SHA512 a36d36f45f89866f6f66e5a3b97467459b7e22bcc322c63aaf738e1b95f6b6259d1078f7945ae76e5f493f0721e5b7f2981ab54ca63cc902e42b8ab84d29a7e6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
index e642c2099ac0..da54710ad845 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="4.5"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 0b1ddc359dbc..c5e835835443 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,5 +1,5 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
-EBUILD dvipng-1.15-r1.ebuild 1297 BLAKE2B cea6723f171800093d0a7a9885060166824c4c81b89ed949d05eb48ac49ed7f8cacaaaeeedf350206ef9681ab1998b335a0e72f6e08a555d9a6914dfb253c7ed SHA512 6d88bd3ccfae01ff45dd014cc84ddeca8776bc0fee4b523af0be225a9c141766b2f585ebc972b9ded477b560e98165eaae9d293782e35e571e52504921206675
+EBUILD dvipng-1.15-r1.ebuild 1296 BLAKE2B acf6c12d9a346fe60b958f34c7608246b587a06a2146fff929e51120228e19e1b594882f25e1b21a538696deafe830ffd6bc8782908e78760396bff5c3b9a5cd SHA512 2a2f35d0bea016801901e0a244084b8eb9638bfb214198aeb8d6f50358fc609024c52c31ebcea0cbe21374b3769b2e71bc0c4bdd684208acf1a409688e0e9855
 EBUILD dvipng-1.15.ebuild 1121 BLAKE2B 3975d100ff1722886fc277ad7d37584bce315d6e3ced9e5cb62e86bab7430483cbf6bd6dba30fc2227097e9b6e247c7b65bf8590dad4c70476205f579b2b277d SHA512 95692a71c955e8d9ff08b32171831148aa455a60b765e2b1beea7687da1eeb1d8e7b9f0acd9c8da4a3f2173f26f1b77f6c2d67210d538eed25a88f80075eb82f
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index b99b0afda53d..13c8825da288 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 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 ~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 ~x86-solaris"
 IUSE="truetype test"
 
 RDEPEND="
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 04f23fded7f1..b2aaa312ee37 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,3 @@
-AUX 3.24.2-CVE-2017-1000159.patch 1644 BLAKE2B dfb16a3fd8403d69212d0d20fa97dc06ad2b43d1c71894a0a2b366002b945110a73942446543276058ad5bb8ed867b68b3750eb9eed5bb23d2b130c14239f98e SHA512 a09d1e4a6f22c1b93ab322c1b7201bf4665bbc12b29dd9222db22b7d1b73f9ebc745c7e9b77e2bb54656916360757fd8007b6c38c004983b42f506bbaf4369ff
-DIST evince-3.24.2.tar.xz 3509216 BLAKE2B 3bcb9e15a6576650d17d6ea1df638c4b16759ddd2353ca47b425c1fec04f90b85ff7f338472e5e18defc01ab066ef241eff40e8f493fa2238814933703636e7b SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f
 DIST evince-3.28.5.tar.xz 2196432 BLAKE2B 992e37ad3cb82934efbdcd83afa89dc7589104045e828c6516650ee0a3fc89b99dff3fe0a723691e95adba9a5cf767a95ec18690697df15310437c7980ccbf55 SHA512 42fcf1396546f62910966b31bc657e5d3532a6bf32e87590b057efded1597de5765ed5c17ae98208a5dafca54da9c8e81f451e4133df656aaf4a9966da457bc3
-EBUILD evince-3.24.2-r1.ebuild 2874 BLAKE2B dba10da7fdf7adfc96c52ed4cde40c9793bec028e3c56043f9bd6a1acec62f1b9d3dd900bfee8281c19fbf7eb43bab8a6895ca3bad21fd49669f0ec106459612 SHA512 92527495b1f50a477458599f01c00c652bfd572d179130920c49ecde92878adb3a8bea317645a10ead7f04c963ee46a082629dc05e153aaa0ea47bd91ed92b0e
-EBUILD evince-3.28.5.ebuild 2833 BLAKE2B 180ae57826483e9d5abbf962838483adc074073145b12506f044ba00fc3c520f6bfd57607133ab7a161c760c6a54c09b97e2c202a9c3ffd84d698e029ebde7a0 SHA512 6e8b9f1a4757d75810dd7dd89c3572ee0c1096233e1f4f1e3a5cdeed510f51a14d9901e08db6c9f5eed44e6141a558904acb572bfb87835848be746a5725a40e
+EBUILD evince-3.28.5.ebuild 2815 BLAKE2B de3b52cf0ab8381600a3641e3e8c3ae6b33a94e6620d147b6d4d3c3063a26440daca6fe96f4dc2b43e3e80c88f39c7b7a037406074c890ea4bcf63e00459c2b5 SHA512 ce430332dc2cbd3ceda2eb4838e94ead13807eaad0bd4878d842c63df21c6fed6feee4236b70ef0185dc968b95c6d67fe2c02eec50d23d9838903b60811d9714
 MISC metadata.xml 780 BLAKE2B 2d04283b6f69a9ba788c9d40049767219854376c36c5c1716084b62e2710fdadce7c917d6fa58e51f5e249954e22a0d725cccbaecd66bf6f7417d31b5c3a8865 SHA512 4580592dd517fcba266be541cada8bc0225d35bafaa9505bd5e8127c3cffee65917f4bb0b9aee1263f2d96f5fc47f0cf9d59ffb84e97d2f4727e4504f753a4b9
diff --git a/app-text/evince/evince-3.24.2-r1.ebuild b/app-text/evince/evince-3.24.2-r1.ebuild
deleted file mode 100644
index f8d23a5fc7bc..000000000000
--- a/app-text/evince/evince-3.24.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# gdk-pixbuf used all over the place
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.36:2[dbus]
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.16.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.33[cairo]
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-CVE-2017-1000159.patch
-)
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/evince/evince-3.28.5.ebuild b/app-text/evince/evince-3.28.5.ebuild
index 84b26f36da43..4140767692c0 100644
--- a/app-text/evince/evince-3.28.5.ebuild
+++ b/app-text/evince/evince-3.28.5.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # bundles unarr
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	gnome? ( gnome-base/gnome-desktop:3= )
 	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
 	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+	nautilus? ( >=gnome-base/nautilus-2.91.4 )
 	postscript? ( >=app-text/libspectre-0.2:= )
 	tiff? ( >=media-libs/tiff-3.6:0= )
 	xps? ( >=app-text/libgxps-0.2.1:= )
diff --git a/app-text/evince/files/3.24.2-CVE-2017-1000159.patch b/app-text/evince/files/3.24.2-CVE-2017-1000159.patch
deleted file mode 100644
index 80861fdc4dea..000000000000
--- a/app-text/evince/files/3.24.2-CVE-2017-1000159.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 350404c76dc8601e2cdd2636490e2afc83d3090e Mon Sep 17 00:00:00 2001
-From: Tobias Mueller <muelli@cryptobitch.de>
-Date: Fri, 14 Jul 2017 12:52:14 +0200
-Subject: [PATCH] dvi: Mitigate command injection attacks by quoting filename
-
-With commit 1fcca0b8041de0d6074d7e17fba174da36c65f99 came a DVI backend.
-It exports to PDF via the dvipdfm tool.
-It calls that tool with the filename of the currently loaded document.
-If that filename is cleverly crafted, it can escape the currently
-used manual quoting of the filename.  Instead of manually quoting the
-filename, we use g_shell_quote.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=784947
----
- backend/dvi/dvi-document.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
-index 4a896e21..28877700 100644
---- a/backend/dvi/dvi-document.c
-+++ b/backend/dvi/dvi-document.c
-@@ -300,12 +300,14 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
- 	gboolean success;
- 	
- 	DviDocument *dvi_document = DVI_DOCUMENT(exporter);
-+	gchar* quoted_filename = g_shell_quote (dvi_document->context->filename);
- 	
--	command_line = g_strdup_printf ("dvipdfm %s -o %s \"%s\"", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
-+	command_line = g_strdup_printf ("dvipdfm %s -o %s %s", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
- 					dvi_document->exporter_opts->str,
- 					dvi_document->exporter_filename,
--					dvi_document->context->filename);
--	
-+					quoted_filename);
-+	g_free (quoted_filename);
-+
- 	success = g_spawn_command_line_sync (command_line,
- 					     NULL,
- 					     NULL,
--- 
-2.17.0
-
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 487baea0d3ce..97d02995fec3 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,9 +1,9 @@
 AUX ghostscript-gpl-9.25-no-gtk3.patch 1605 BLAKE2B 8aad19d4496ef2b43169261cc5919ad2d015940d36b86ae1828cfb2f6386cd838e89b3d51531dce36934b3aecd1d33e0c2d71c269017fcf36289606b43f76486 SHA512 6c3d6a5d9be09eedf451496c221a707f90f639261a417386331f3aa8a24c82795c891ea1bbad086e3a01f706769adb591a9ac4ae358e0b86a1a22ad06687dac7
-DIST ghostscript-9.21.tar.xz 29164532 BLAKE2B 275e81e44585e186cdfd9f517d1ac77ec840c62ef01f107f6ec0131546c4a2b526000cbc4ba6a91b55eedb8f3783fbf831059d791ea441a484ce29dd5dd6af0e SHA512 cfea089b92fb01e3f7c18a9ce05e7165fc8b356e2914bf53b7f2fd9de672279c8b97ced07e983e619f0d4334ce16018b100cfbf0cc872c215a8cf2aff4c78731
 DIST ghostscript-9.25.tar.xz 33027708 BLAKE2B 7c6684898ef04bc5b6be8fec86adbf7b270107f4063b299175f5c08e5e7ace2468e1512a297464fda5695c830808916e6a0dd1202ca7e85b32cfd175d8cc2b18 SHA512 7a1c0b7546ed523f50c1452d4a1c13fcf043d6060fc9708bbc4b543f66ecb1b619b6e71998094ac702ef44a2fd159b6523271de19b1cae352981ef51fb637651
-DIST ghostscript-gpl-9.21-patchset-1.tar.xz 6196 BLAKE2B d2bccba582873d29c1724469af66a5aa72755d6ff73bbdadbf33e5eb4a2027c2cf14415319c3c3c6d03a9fbd9bad43e3bf7ef57eb7a3361305f6efb7fa550675 SHA512 58fef7080ca17a238231fb528be48f52bcfa771b1e496d7fede6df45fb927f1bb1c755cb77e02aa739295b0ccf0b3d3959f9a05a1628d32ffd11e134c0e0d355
+DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb529605e12214ab81253d2d354d26c24e393c8bec2ecdb51a1fefe8443b8af47758705c2fb6b1dab59932140c5de07ca SHA512 3ddb83029edf32282357bf606f4045a9ac73df6543cd423cfad09158ec12ada083a0dbb5aac3b73ae24cbc6c1e9d7574257a5c1fae63ba8776fbb00150ef2a3e
 DIST ghostscript-gpl-9.25-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
-EBUILD ghostscript-gpl-9.21.ebuild 5550 BLAKE2B 12dcddca96c1105b887ef804a1d7f6c6d5826691ee6e8ba525be77e65da82fa6f9910612ce84387ce9212c8ffffd3dacf4f10829256534582d7fb0bd09fc7cfb SHA512 b60cc50269906af827142897afb056d88a67e3ee10387d77a6b0b75d351bfb6239df41f9baa4e99d3d4f28ba38ea8849a282a0fc75e7aba25f2f707eee29f969
+DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 EBUILD ghostscript-gpl-9.25-r1.ebuild 5221 BLAKE2B d1eab61ccaec0860c96b736edcb94266f2b7b204ffa6c55b6e6270fbced47702abc01a081a070b97fb07bfd3e8f3ad6bb8ee85824d53be781413e1436488390f SHA512 969812796d605878c006157337ece0c3090812be249c7e298e85de79c13f60dbe2e238528d2c7875c3712a8e413d0e63345ba13765f69f182cb70404cfddcf9c
 EBUILD ghostscript-gpl-9.25.ebuild 5547 BLAKE2B 4db72cbd3379b85c980ec5ecd3b6953330c3835d8d184dbab8327ee95dbd78a77655468db6ed6ca2028eed4cdb6ccbb278a8fc89c0cf59ebeb14164961811c53 SHA512 60226db1126b70e11bd924d90d2bf399bb80846777a3ca557e7f8fb00ba72f67f8c872a1fc36381885151c224b95ce871733ab10da928108d0d0a78a7c6b871b
+EBUILD ghostscript-gpl-9.26.ebuild 5151 BLAKE2B 9e2a751080a17522929d4491861c22f8fdf36f4997e2943e0baacca18a248cf257fe8363eaabdc8f1732d3436687880c0390790be72ac7b1b23a6f5a3fc755d0 SHA512 c418a112f79f91f682cab0c51f2f4604ffc1bd0c40d6c227a08d5a45ea2ba8715ca5fd6bf158fe9c28e6ad1a169e236f5ca6ff5b24fb7c5533d00c053b50f2e7
 MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
index 84707c85efab..7a0cd0866828 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools multilib versionator flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
-DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
+DESCRIPTION="Interpreter for the PostScript language and PDF"
 HOMEPAGE="https://ghostscript.com/"
 
 MY_P=${P/-gpl}
-PVM=$(get_version_component_range 1-2)
-PVM_S=$(replace_all_version_separators "" ${PVM})
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
 
 MY_PATCHSET=1
 
@@ -21,10 +21,15 @@ SRC_URI="
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
 
-COMMON_DEPEND="
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
 	app-text/libpaper
 	media-libs/fontconfig
 	>=media-libs/freetype-2.4.9:2=
@@ -32,7 +37,7 @@ COMMON_DEPEND="
 	>=media-libs/lcms-2.6:2
 	>=media-libs/libpng-1.6.2:0=
 	>=media-libs/openjpeg-2.1.0:2=
-	>=sys-libs/zlib-1.2.7:=
+	>=sys-libs/zlib-1.2.7
 	virtual/jpeg:0
 	cups? ( >=net-print/cups-1.3.8 )
 	dbus? ( sys-apps/dbus )
@@ -41,84 +46,67 @@ COMMON_DEPEND="
 	tiff? ( >=media-libs/tiff-4.0.1:0= )
 	X? ( x11-libs/libXt x11-libs/libXext )
 "
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/poppler-data-0.4.5-r1
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-text/poppler-data
 	>=media-fonts/urw-fonts-2.4.9
 	l10n_ja? ( media-fonts/kochi-substitute )
 	l10n_ko? ( media-fonts/baekmuk-fonts )
 	l10n_zh-CN? ( media-fonts/arphicfonts )
 	l10n_zh-TW? ( media-fonts/arphicfonts )
-	!!media-fonts/gnu-gs-fonts-std
-	!!media-fonts/gnu-gs-fonts-other
-	!<net-print/cups-filters-1.0.36-r2
 "
 
 S="${WORKDIR}/${MY_P}"
 
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
 src_prepare() {
+	# apply various patches, many borrowed from Fedora
+	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
+	eapply "${WORKDIR}/patches/"*.patch
 	default
 
 	# remove internal copies of various libraries
-	rm -rf "${S}"/cups/libs || die
-	rm -rf "${S}"/expat || die
-	rm -rf "${S}"/freetype || die
-	rm -rf "${S}"/jbig2dec || die
-	rm -rf "${S}"/jpeg{,xr} || die
-	rm -rf "${S}"/lcms{,2} || die
-	rm -rf "${S}"/libpng || die
-	rm -rf "${S}"/tiff || die
-	rm -rf "${S}"/zlib || die
-	rm -rf "${S}"/openjpeg || die
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
 	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -rf "${S}"/Resource/CMap || die
-
-	# apply various patches, many borrowed from Fedora
-	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
-	eapply "${WORKDIR}/patches/"*.patch
+	rm -r Resource/CMap || die
 
 	if ! use gtk ; then
-		sed -i -e "s:\$(GSSOX)::" \
+		sed -e "s:\$(GSSOX)::" \
 			-e "s:.*\$(GSSOX_XENAME)$::" \
-			"${S}"/base/unix-dll.mak || die "sed failed"
+			-i base/unix-dll.mak || die "sed failed"
 	fi
 
 	# Force the include dirs to a neutral location.
-	sed -i \
-		-e "/^ZLIBDIR=/s:=.*:=${T}:" \
-		configure.ac || die
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i configure.ac || die
 	# Some files depend on zlib.h directly.  Redirect them. #573248
 	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
 	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
-	sed -i \
-		-e '/^zlib_h/s:=.*:=:' \
+	sed -e '/^zlib_h/s:=.*:=:' \
 		-e 's|-DOPJ_STATIC ||' \
-		base/lib.mak || die
+		-i base/lib.mak || die
 
 	# search path fix
 	# put LDFLAGS after BINDIR, bug #383447
-	sed -i -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
 		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
 		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
 		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
 		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
-		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
+		-i Makefile.in base/*.mak || die "sed failed"
 
-	cd "${S}" || die
 	# remove incorrect symlink, bug 590384
-	rm -f ijs/ltmain.sh || die
+	rm ijs/ltmain.sh || die
 	eautoreconf
 
-	cd "${S}/ijs" || die
+	cd ijs || die
 	eautoreconf
 }
 
@@ -167,7 +155,7 @@ src_configure() {
 src_compile() {
 	emake so all
 
-	cd "${S}/ijs" || die
+	cd ijs || die
 	emake
 }
 
@@ -198,7 +186,9 @@ src_install() {
 	# install the CMaps from poppler-data properly, bug #409361
 	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
 
-	use static-libs || find "${ED}" -name '*.la' -delete
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
 
 	if ! use l10n_de; then
 		rm -r "${ED}"/usr/share/man/de || die
diff --git a/app-text/glark/Manifest b/app-text/glark/Manifest
deleted file mode 100644
index 7e0a602fb52b..000000000000
--- a/app-text/glark/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glark-git-1.10.5.tgz 196283 BLAKE2B 4c4dd08e28ff328789f6a355b95bf9d3cb2dd6a6516355ef0b8a902c4a4b88b8cf72b4cbaae73a325d578201e2223b2ef8d95924d0ababfee781d1bcd1fb9b1c SHA512 6dcad5567a10f1608925b690e86cb8c0f4be56cc4bce70410d3dd3568a191be2c3fbeaa00bea296de6d658b65b8bd081b1d5555e3e43c3f03a22d5e3d19d6c2c
-EBUILD glark-1.10.5-r1.ebuild 933 BLAKE2B 257d567e48ab6b283230cc3688894eb7b6091d6001a586ae216c5cf0dfb8c39e88eb90f7a74454a124610c33d5d4d33a0174eeb6a6fced6b923f143a58321b51 SHA512 c50d8e2436b627f2c49e97be79cdf7b1fa0e87f1051ecb96eaeace5b861a4efe2fb4f4f95e27c30a8c41f635f3f1e84ccd8c48e0d2615291f88580e21955c204
-MISC metadata.xml 452 BLAKE2B 9db99e19f53cfc3c45cc61add782d4dc302aee58adb4a153e0000047ff772429d78e2825e4ad89375b5d086bf1b1944a0bf34ed0ff059376ae97c0337c4c720d SHA512 4ad436340a3d16c7c141423ad827f585c3dc7a73db3602ac57ae3112941349f83c604a35d802ff2a3fe9efbf5614b57ec03291c07f394d84989535f24ef85a2e
diff --git a/app-text/glark/glark-1.10.5-r1.ebuild b/app-text/glark/glark-1.10.5-r1.ebuild
deleted file mode 100644
index 08dedcb84c29..000000000000
--- a/app-text/glark/glark-1.10.5-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="File searcher similar to grep but with fancy output"
-HOMEPAGE="https://github.com/jpace/glark"
-
-SRC_URI="https://github.com/jpace/glark/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE="zip"
-
-ruby_add_rdepend "
-	>=dev-ruby/logue-1.0.0
-	>=dev-ruby/ragol-1.0.0
-	>=dev-ruby/rainbow-2.0.0:2
-	>=dev-ruby/riel-1.2.0
-	zip? ( dev-ruby/rubyzip:1 )"
-
-ruby_add_bdepend "test? ( dev-ruby/rubyzip:1 )"
-
-all_ruby_prepare() {
-	rm -rf doc/ || die
-
-	# Fix broken links to test data.
-	sed -i -e 's:/proj/org/incava/glark/::g' $(find test -type f) || die
-}
diff --git a/app-text/glark/metadata.xml b/app-text/glark/metadata.xml
deleted file mode 100644
index f5d43635abcc..000000000000
--- a/app-text/glark/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>shell-tools@gentoo.org</email>
-    <name>Gentoo Shell Tools Project</name>
-  </maintainer>
-  <use>
-    <flag name="zip">Support for ZIP files using <pkg>dev-ruby/rubyzip</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">jpace/glark</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
index 79c0a28cf11b..455f3d6a2d45 100644
--- a/app-text/goldendict/Manifest
+++ b/app-text/goldendict/Manifest
@@ -2,5 +2,5 @@ AUX goldendict-1.5.0-ffmpeg-4.patch 6184 BLAKE2B 17b8bddeab5bbb6e373c3ee3bfda695
 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 1789 BLAKE2B 1336c76cdd434f701374c8fc136fd486fb768c2435c5e9b2f72471a5a7a21bfc03fdba31d10950da3d6adeb1c9452f925890dc33bdc09a1854726ff68e030026 SHA512 d291a55bd41e6fd832c879801f9a3506e775139cb55315b57ed5dbe133bc188a18274fd37c82d08c52f2b484b54957c92ca7d145f5d12b86823a568a5e016d61
+EBUILD goldendict-1.5.0_rc2-r2.ebuild 1784 BLAKE2B a07504e251fdb3703525bdd301931d729e39696798796b7db6f7d65e9fbe4767c9d526fcff46f8a7e4bf70c2cbf3c4a1ef44ebf5c82b0c5d8aa1dc5be6105ef7 SHA512 a501077ad1ebe5077edf0e62120b022630eabdfb89963309bda8b7e2dc4512f2b84d41ff68e9e29d09b83958e8880c84c7d0439fc1462f1b2b43a7ba8906d111
 MISC metadata.xml 388 BLAKE2B 229d847f632fe3da3df10913551df5ee6ee386768c52aef7c436336476c7e837272decbe34a7e9322504e6d97e7319afb61815539494ef5faa8c93411ce7215d SHA512 c9be98ab768c3c13ff4b03336fc90314ec0e233d0860501d85b5c65250965d994a3f8ab4cf8f58cee3da27fdc37964c10854bc66b9cc16e5f558f0b7a4a39f42
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 866b4e88ea6c..cbbb665fe20e 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PV=${PV^^}
 MY_PV=${MY_PV/_/-}
-inherit eutils qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Feature-rich dictionary lookup program"
 HOMEPAGE="http://goldendict.org/"
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-qt/qthelp:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
-	dev-qt/qtsingleapplication[qt5(+)]
+	dev-qt/qtsingleapplication[qt5(+),X]
 	dev-qt/qtsvg:5
 	dev-qt/qtwebkit:5
 	dev-qt/qtwidgets:5
@@ -43,7 +43,8 @@ RDEPEND="
 		!libav? ( media-video/ffmpeg:0= )
 	)
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
 "
@@ -75,10 +76,7 @@ src_prepare() {
 
 src_configure() {
 	local myconf=()
-
-	if ! use ffmpeg ; then
-		myconf+=( DISABLE_INTERNAL_PLAYER=1 )
-	fi
+	use ffmpeg || myconf+=( DISABLE_INTERNAL_PLAYER=1 )
 
 	eqmake5 "${myconf[@]}"
 }
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 6646aac94ba9..c2aa68ea2f9e 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,3 @@
-DIST gspell-1.4.2.tar.xz 407356 BLAKE2B f2ee6ae43be55e8ad7253e10893868a8d7857bbe41e14d71103b27a0faf40b0ed247e9fa38ed7bc75039fe0f1f600fe739f538d50f69fb063d0932df6c0b1c27 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
-EBUILD gspell-1.4.2.ebuild 1002 BLAKE2B 06a4b0b33579b30a5e3f2cfda415ee0a81898089405af5b71d35e4e45ed90c89c7efe4d30808c23b56ffa883ce45f846d94774c06ff62e5f66adbc7bf2289811 SHA512 516960e85ba6bc8601dedc0c9045b23bf988644382157afcb4a7f3590668c88022d81647b0a1e97d6a6ecac12f7f6ad6c5949aaf78cdb622eda32125abad72af
-EBUILD gspell-1.6.1.ebuild 1031 BLAKE2B dda3a661518a14663b0bb30b4a3324aafa5ca28030e55b9318bee054b76ad15567174d5b91f39b0c2b256dbea0cb94ccd897e2e81961959c735eb4abad5a5d04 SHA512 d89a169bcec2093320857178b039ca2729bed54336d2658b63daf867950f0cb3038c20ae67ccf8b6de11cb426dd4d35c58ed929293da64e757def106da7eb901
+EBUILD gspell-1.6.1.ebuild 1029 BLAKE2B e788cc6815412d4cfd157bf37700e38fd3604ab1ca51a2f7bd51c560a126ab5de9a9b8d1303d02f8da22de4207813693771469d0d80730bd91b6386559204073 SHA512 bceaaa706a10c980c184738664a0645c6e70d13ed3fd2a10e7ebd62daf51f502dc475794eb5782beb7f7bfa2f2a8974da8e4ef0fce76ab35e2b9d532a5c65100
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.4.2.ebuild b/app-text/gspell/gspell-1.4.2.ebuild
deleted file mode 100644
index ec2125c80b3e..000000000000
--- a/app-text/gspell/gspell-1.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm ~ppc ~sparc x86 ~amd64-fbsd"
-
-IUSE="+introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	app-text/iso-codes
-	>=app-text/enchant-1.6.0
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-	vala? ( $(vala_depend) )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.6.1.ebuild
index 120ad059c3a2..181912bf171e 100644
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.6.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index 03d4339c90bc..2e3084aaae2c 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,5 +1,7 @@
 AUX gtranslator-2.91.7-gi-silence.patch 869 BLAKE2B 9916f2b8b83ddf924b55d9839b6d0c48796b593227dd02494e25f652f9ec75fc3e439ce3809116a5dd8337c596acfed89b6baaccd5d053b78379860c4f4f646c SHA512 c23457f2267377aefda4842e2300b33ced326ca7933d5d060e9f4c2e419267f722589f7fc9d7793f5b73e1f3cba2a3f863501c44ddf4f50a2acc45ad3b2b862e
 AUX gtranslator-2.91.7-gucharmap-python3.patch 1851 BLAKE2B dd54f2cd05501e0cdaae7fb082c8731b80cf232886ebef70f86b082996ea3c68e67d1c5fbf737a6dbfed14a63727d6cf937f93800ec24859b2e1afda528ff650 SHA512 0a622e707018fcf27c8d29317d87ad967a98eafb6961c447c566a383b434b4c06d8544e7c8575bfe36b352d9e08b2e6570628b4bf41ac3c41af3e31905a7a1e8
 DIST gtranslator-2.91.7.tar.xz 2835836 BLAKE2B e6e1f7b512705152a520a47bdddd01336ddcecb9ca20409546d64caa124f1bca2985fd2a9cd7564983a8411c6a7227d37b55ce8b3e452ee7a0d5beba3460bd59 SHA512 8d2a582e06ab0fecb9c18bde372ca0cd02d426155d4b30b876bd8f2e177c88c79d410adb0297ab85f18a952eeef32c17352cde18eda3c4c4fe33833db25022b5
-EBUILD gtranslator-2.91.7-r1.ebuild 2155 BLAKE2B 6e1e52dabd1b6cf90485c489ff1fa80966f1586cd2e16bac7ea8cd23ac1d5fcefdc817b701bf5e42647ec7c0368899cefc2b551eca09bdd32da0e496c6c097e9 SHA512 9d09a607d270e4999fff278ac4acb7b8424acf96ae6951b05022a266f7a806313bf07831b9f47b5bd7184c4c87c8014900cf57e00a36cb867e32cd25582ee144
-MISC metadata.xml 586 BLAKE2B a88ed8865c080411d6730962274dc991abceca8927ae3d427892cfe633a985c88bd6db8b3f409c19f552678ab55ec9f29422a830a4b6c12fa1a8c89d60344e0e SHA512 9f1f582767da7fec99f0cebecc01775b4b76b5eba91015a1c987599ed37bf8f4b031004765dc4388f8094e34034d3cf3636f53f6ac3c7b8c15e8a2e7986fd76f
+DIST gtranslator-3.30.1.tar.xz 3060168 BLAKE2B e2e238ffc461b99be9df679c431d7cae85c70ca9db7aea4e7c51d9bd12aa417fab0d53d6c512555992dfb2d40f55d6d0dba8c3aacd043ad8c2ebe690de8ac562 SHA512 5f6384bec8bb23afa9aefe5928260b7ccb408d41b8a363d85277435428ca34fe544068526b11801e534911753c95b3049892e647938bee755b37f3f5cbf94f41
+EBUILD gtranslator-2.91.7-r1.ebuild 2194 BLAKE2B be196129746036190b3121c0a1c0a10eb67a7c2a9d7035686e49d069cb992583a9825aee1ad7ac0b6f859eaa617dc73914c9decd04800d69b46b281d5e840466 SHA512 e7b199626794e474a932dc70ef364ba946935abca57df3161f355fa37b7e1a019509323d12e8d8d0f002b7e04d76b5a411ea112a80d2e7f68d51c6d7e76e7126
+EBUILD gtranslator-3.30.1.ebuild 988 BLAKE2B 92f587b8e94fe6e2a8c4c176615f7bbbca241ed6366c10eaf48dca664c76673b72b9e7daa3a9f6e6cd6d5b6a152755bbd671cb62f17adb87171ee2a8e439d887 SHA512 ef41ac1dffd611ccee374fec8cb05c5a190532ae1e10cbf88877c48e0764d439fb14eed95937066c218488cd226b18deb5a713a7c441d02804a5f331e04e8dba
+MISC metadata.xml 1064 BLAKE2B 7f39febe016d5aea980f3b4ec1eded4825c3fe3cd03a4314dd21cb0d3077cfebb21826c9bbf3f5c30d7581355379427923f9e2e284c7b7520c2fc5f915a746b3 SHA512 185b4b7bfb14d3ea94454b9405875b07884f19c52df2afa46de6a470b65cab521dfd19f09cbecf7168ac5722d871b085c029da7b11b533f26f6afb1f23ada6a9
diff --git a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
index 7e68b60a02a3..3c0c5abed813 100644
--- a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
+++ b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 
 	gnome-base/gsettings-desktop-schemas
 
-	gnome-dictionary? ( app-dicts/gnome-dictionary:= )
+	gnome-dictionary? ( app-dicts/gnome-dictionary:0/10 )
 	gucharmap? ( ${PYTHON_DEPS} )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
 	spell? ( app-text/gtkspell:3= )
@@ -43,8 +43,10 @@ RDEPEND="${COMMON_DEPEND}
 		x11-libs/gtk+:3[introspection] )
 "
 DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50.1
+	dev-util/itstool
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
diff --git a/app-text/gtranslator/gtranslator-3.30.1.ebuild b/app-text/gtranslator/gtranslator-3.30.1.ebuild
new file mode 100644
index 000000000000..88e7d00a7c7a
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-3.30.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME Translation Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk-doc"
+
+RDEPEND="
+	>=dev-libs/glib-2.36.0:2
+	>=x11-libs/gtk+-3.22.20:3
+	>=app-text/iso-codes-0.35
+	gnome-extra/libgda:5=
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/gspell-1.2.0:=
+	>=x11-libs/gtksourceview-4.0.2:4
+	>=dev-libs/libxml2-2.4.12:2
+"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	>=dev-util/meson-0.46.0
+	gtk-doc? ( dev-util/gtk-doc )
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
index a6e15044678b..fac790dbf919 100644
--- a/app-text/gtranslator/metadata.xml
+++ b/app-text/gtranslator/metadata.xml
@@ -9,6 +9,15 @@
 		<flag name="gnome-dictionary">Enable plugin for dictionary lookups using <pkg>app-dicts/gnome-dictionary</pkg>.</flag>
 		<flag name="gucharmap">Enable plugin for unicode symbols selection using <pkg>gnome-extra/gucharmap</pkg>.</flag>
 	</use>
+	<longdescription lang="en">
+		Gtranslator is an enhanced gettext po file editor for the GNOME desktop
+		environment.
+		It handles all forms of gettext po files and includes very useful features
+		like find/replace, translation memory, different translator profiles,
+		messages table (for having an overview of the translations/messages in the
+		po file), easy navigation and editing of translation messages and comments
+		of the translation where accurate.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">gtranslator</remote-id>
 	</upstream>
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index b1c888b24fd4..bd30655f7282 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,10 +1,7 @@
-AUX hunspell-1.6.0-renameexes.patch 5005 BLAKE2B 1bce704276c65e67077312d3a056072a52370d5465d2ea9e91046dd21f1368579950ecdbc37c403641cace770873865464cef855c836a54e95d1d5f2496c5b6a SHA512 a39225e25c76c6a6f3b92cc932efcc952c8559de2967d7a1c962b3f8a6ab39430fa82cf17ae51f15490f58297ecdfb9154c3ce7a8b058a717bfd1d694cf83245
 AUX hunspell-1.6.2-renameexes.patch 5104 BLAKE2B 83ea0ec81fdd5e8934c954bb2f2d07e9c47f725f8b63360aca7cd611348106a1e3f13ab08609ff4877272ec6b116927c382c5b47731945656ddb7927aca22c50 SHA512 0d1871eda31b83851bf153746e0f4957599e889a536e9c0994d1cb988bc4a887788c1fafe4dccccaa94e68a69e6fa4ff1e201678fa8d1afdcb9608b83211b0ae
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
-DIST hunspell-1.6.1.tar.gz 706893 BLAKE2B 5e5047aceb7510c2cfaa05d540f8faad2fb844b51bf2d8e48793d588e3b9d31628ddac5d7f9c87078a3b2b8aadf64cd8d93fd4ef881b13451d52f10a1960e2fb SHA512 39b096ec1f5226f13eaf241647fc9b49a6dad04945ae0bcdc61ba845d66d67d64a72ba4287b6f376b5ad053b5d0e1d42a42415c30521c50693f0544718029458
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
-EBUILD hunspell-1.6.1-r1.ebuild 2366 BLAKE2B d566bfed5c322566fdb30ff31f266020b1eb4ce9a0dd6920c5e340b2b922cb5bb3eba4a44dc458c0516c425b4c309cd13b6bf3225ef24b604b5c6d72245a2bc6 SHA512 c4e793a89c9ec4aad6bc2f7fb2036f5c251b329ec597976d07d607364df0de3c22a80903bbca5bfe03416b84bf3416a16691f78524cfc8f90c4519ecc3a89bb9
-EBUILD hunspell-1.6.2-r1.ebuild 2389 BLAKE2B d3e57f6f649c1457b4c9c74731a7ae05a71f5c1bfe634774b8fa0cf5f77d58cfc5cc69b9a903dc54fb74faf75502bfef594d992b30a205f46983623105aea14b SHA512 fbf2ddb1146f0dd83d26e60abb45816ba21d04db313f3d5913c26cc88e662cc685741d30a729e01d7cea0dc9720b43aaa998e22f24e391627593211271f02b7d
+EBUILD hunspell-1.6.2-r1.ebuild 2383 BLAKE2B 7ef52fd2c661ce65496350ebf7f33e550b9e2645183cea6a3801e7bea81045da4b9846dbedc6b933cb30a3876df87d434785ee4a39292aa2fb3093310b565b59 SHA512 41e296e4a093edc5ef757cec31fd93fcd9a6b08ea18e5b5086477f4f4b351a93fa9ff03a7cb6884da17236985c0d3e5ece154da8aba8557f56cff37c73efc3b7
 EBUILD hunspell-1.7.0.ebuild 2293 BLAKE2B 6a2053dd8f5cf3211521236ae7e027d99349b7864655b81c65a2f3614070b53818b3932c70ffa25cc09ed8c9b935c78243cfaf8923e4975d0e8ddef2621dcf64 SHA512 4dc99a1b623fbd8da6492bedea1d2d80c9c93fcae334ac1fee70769aaba17581ced12e3097a930324344d20d5a7e72f19df31364c665add74802163efe941d3d
 MISC metadata.xml 274 BLAKE2B 6631c0f576279afaf4cd444df14acd118e393977058e957bd3e41103554a756c43860f75f7550346815f6d8a4320d3d86fb069c9451fbad268bedbde18ed5ec0 SHA512 09ac7c3282788aae9fe48dc86a3bec7d2a5b651b22d6ea06108f9ca5a86e96dddf9ab80433d0f16549649665d9a582d6c44217b73a000ee83995aad922f3caa8
diff --git a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch
deleted file mode 100644
index 6a75ce3fb8c0..000000000000
--- a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- hunspell-1.6.0/src/tools/chmorph.cxx
-+++ hunspell-1.6.0/src/tools/chmorph.cxx
-@@ -58,11 +58,11 @@
-     if (!argv[i]) {
-       fprintf(
-           stderr,
--          "chmorph - change affixes by morphological analysis and generation\n"
--          "correct syntax is:\nchmorph affix_file "
-+          "hunspell-chmorph - change affixes by morphological analysis and generation\n"
-+          "correct syntax is:\nhunspell-chmorph affix_file "
-           "dictionary_file file_to_convert STRING1 STRING2\n"
-           "STRINGS may be arbitrary parts of the morphological descriptions\n"
--          "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+          "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-           " (convert informal Hungarian second person texts to formal third "
-           "person texts)\n");
-       exit(1);
---- hunspell-1.6.0/src/tools/example.cxx
-+++ hunspell-1.6.0/src/tools/example.cxx
-@@ -53,9 +53,9 @@
-   /* first parse the command line options */
- 
-   if (argc < 4) {
--    fprintf(stderr, "example (now it works with more dictionary files):\n");
-+    fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
-     fprintf(stderr,
--            "example affix_file dictionary_file(s) file_of_words_to_check\n");
-+            "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
-     exit(1);
-   }
- 
---- hunspell-1.6.0/src/tools/Makefile.am
-+++ hunspell-1.6.0/src/tools/Makefile.am
-@@ -1,4 +1,4 @@
--bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
-+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
- 
- INCLUDES=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
- 
-@@ -6,8 +6,8 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.6.la
- 
--munch_SOURCES=munch.cxx munch.h
--unmunch_SOURCES=unmunch.cxx unmunch.h
-+hunspell_munch_SOURCES=munch.cxx munch.h
-+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
- 
- example_SOURCES=example.cxx
- example_LDADD = ../hunspell/libhunspell-1.6.la
-@@ -16,11 +16,11 @@
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- 	../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@
- 
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.6.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la
- 
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
- 
- noinst_PROGRAMS=example
- 
---- hunspell-1.6.0/src/tools/munch.cxx
-+++ hunspell-1.6.0/src/tools/munch.cxx
-@@ -81,14 +81,14 @@
-     wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr, "correct syntax is:\n");
--    fprintf(stderr, "munch word_list_file affix_file\n");
-+    fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-     af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr, "correct syntax is:\n");
--    fprintf(stderr, "munch word_list_file affix_file\n");
-+    fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
- 
---- hunspell-1.6.0/src/tools/unmunch.cxx
-+++ hunspell-1.6.0/src/tools/unmunch.cxx
-@@ -76,14 +76,14 @@
-     wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr, "correct syntax is:\n");
--    fprintf(stderr, "unmunch dic_file affix_file\n");
-+    fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-     af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr, "correct syntax is:\n");
--    fprintf(stderr, "unmunch dic_file affix_file\n");
-+    fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
- 
---- hunspell-1.6.0/tests/test.sh
-+++ hunspell-1.6.0/tests/test.sh
-@@ -74,7 +74,7 @@
- shopt -s expand_aliases
- 
- alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
--alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
-+alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
- 
- if [ "$VALGRIND" != "" ]; then
-   rm -f $TEMPDIR/test.pid*
-@@ -83,7 +83,7 @@
-   fi
- 
-   alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
--  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
-+  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
- fi
- 
- # Tests good words
diff --git a/app-text/hunspell/hunspell-1.6.1-r1.ebuild b/app-text/hunspell/hunspell-1.6.1-r1.ebuild
deleted file mode 100644
index 2788a1246fa9..000000000000
--- a/app-text/hunspell/hunspell-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools flag-o-matic versionator
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/hunspell"
-
-SLOT="0/$(get_version_component_range 1-2)"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND="app-dicts/myspell-en"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de_1901" ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(
-	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
-	AUTHORS.myspell README.myspell license.myspell README.md
-)
-
-PATCHES=(
-	# Upstream package creates some executables which names are too generic
-	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
-	# It modifies a Makefile.am file, hence eautoreconf.
-	"${FILESDIR}/${PN}-1.6.0-renameexes.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# missing somehow, and I am too lazy to fix it properly
-	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
-	# I wanted to put the include files in /usr/include/hunspell.
-	# You can do that, libreoffice can find them anywhere, just
-	# ping me when you do so ; -- scarabeus
-	econf \
-		$(use_enable nls) \
-		$(use_with ncurses ui) \
-		$(use_with readline readline) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	prune_libtool_files --all
-
-	#342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
-	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.1,.so}
-	popd >/dev/null
-}
diff --git a/app-text/hunspell/hunspell-1.6.2-r1.ebuild b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
index 142389ea0fad..d4a295cdf9af 100644
--- a/app-text/hunspell/hunspell-1.6.2-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(get_version_component_range 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 349daccfc2cd..c348e0d78b90 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,3 @@
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
-EBUILD iso-codes-3.76.ebuild 2426 BLAKE2B e95562582a1d3db51a6d395ab95dd0c3ce2b41f1792b94554ca5aea406e5d44a0dc5e963e5b1b44f4f7e11fa1ec305f5d5337491458c39902599df675b798181 SHA512 51bae9c45a1aa31d5b94326a69f0391825ef558236589122725260e2d61b89bc8a72ebfb512d297bb0e8dca1af44a2aec3597d7ed86ed284d03b291d14aa6858
+EBUILD iso-codes-3.76.ebuild 2425 BLAKE2B 98b11381edd7aaad748b1c5bfdb0b3240340bdda78ce2e36e696d5addba33003ae670a60841d9bf8120f5d726764c84d1112e799e85a0105220e7fa77870f638 SHA512 b81faf5121b8c9253f2068a9d02b66e54660ff6514ea02c8379b01f4db16dcfb8ac8188b026d5c5a82dea941a417dcc19389b0a8fc32ab347beb7fe82466480a
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index b5a8f0e064c3..df8ffd9f49b9 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
 PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
 
 inherit eutils l10n python-any-r1
diff --git a/app-text/jist/Manifest b/app-text/jist/Manifest
deleted file mode 100644
index c1d323996620..000000000000
--- a/app-text/jist/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST jist-1.5.1.gem 13824 BLAKE2B dfa4fce7601969fa74158b8cc4ae3542a1e60e241dc430f920d4f2fb9c963ee281d8c2c2cf355547422228dd91d3809ee4fe9cb0df8cbdea32c793308b63639b SHA512 e59a0c5a5b0439a5cc3b847de3cbb0b9991685c1403fd8482ffd5564a77c8812587a7384ac19bb77cb812d0ece63df8ccd029c8757a242dc50a44da3e66b9936
-EBUILD jist-1.5.1-r1.ebuild 700 BLAKE2B 7d26f7921890ec69ec2051ed42cecd48a7b05abaf81d7c70ebb04334b569cc0023995ec71495390ab215abf9b874420ac9712f80f31742cda488a42dd6d40fec SHA512 bfb364afb3287d941434a5143d1df1a330208bc3570a33dee3adf55aef74af0f78a17d18660bf55a36afef6c282e8cb8abd33fd4c2defc59843e13abba4bb6b0
-MISC metadata.xml 342 BLAKE2B 1145b976b479197ca2824fd96b37de71d0efc6579bebe7e539a90465399225402b76d32e9f763d05ea05bfe6e3dd22b66575691b8b1c3248ddc50755194d6490 SHA512 dd94324def89cb3c5745995b21180e8ddcc785f81d53352c0b920f64a3e007f4edaf216116debb65686d5c43cd17291e0fc98edfc7ac5dc8f8d916c467a2f6cd
diff --git a/app-text/jist/jist-1.5.1-r1.ebuild b/app-text/jist/jist-1.5.1-r1.ebuild
deleted file mode 100644
index 10cdc385353f..000000000000
--- a/app-text/jist/jist-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby gem to publish a gist"
-HOMEPAGE="https://github.com/ConradIrwin/jist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/json:*"
-
-ruby_add_bdepend "test? ( dev-ruby/webmock:0 )"
-
-all_ruby_prepare() {
-	# Avoid failing test (due to webmock version?)
-	# We did not run any tests previously
-	rm -f spec/shorten_spec.rb || die
-
-	sed -i -e '1igem "webmock", "~>1.0"' spec/spec_helper.rb || die
-}
diff --git a/app-text/jist/metadata.xml b/app-text/jist/metadata.xml
deleted file mode 100644
index b5befd6d272f..000000000000
--- a/app-text/jist/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ConradIrwin/jist</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index 05ff8fd500fc..c5fd18155a51 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,5 +1,3 @@
 DIST libnumbertext-1.0.5.tar.xz 281640 BLAKE2B 5480c72fed80a9d4825b37a876efa8588c8efb187ee5a65629ac800d98a2882312f443736f4c967ee0ae2fc32a0dbe758b1c275378d807df3d1da4cee6dff9bc SHA512 4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3
-DIST libnumbertext-1.0.tar.gz 408181 BLAKE2B ceeba0a98c0d6fbfa92ad37347f7b7cb9887ea516126e35212d61e572a382a56c520406409e08024d53f1520219ec7e986324893b1c2b53330a217319d35ffc7 SHA512 b30f3650ba8cbaa771415026f40b7fc2cf5d9cd956a365d6654b1e2996fe61f714adfda845432e41f61f0fa474b1b60d99cc46cd6b7e42e1dccfd53f5017ae63
 EBUILD libnumbertext-1.0.5.ebuild 518 BLAKE2B e809eebb2784f556d6c2123fad20031ea1438e2050df2e267ff882c1136379da0465ca803dd37c4077c761d8d98229238ee747a86746ba7955e67396a488dd87 SHA512 7c419d85bba72b10aa72143816b5dbb90ed0526a2a30194f24a56418529a62167658b80818b4200f48140822fa83f0fa84d460383422fd0336ebba6eaafb77c2
-EBUILD libnumbertext-1.0.ebuild 613 BLAKE2B fd5f9aaf06da104d4cc5da165b0ccfe10edc0f0768c93d9ebb646c774ecd173fe19d2788af71a98534c1c9381c5d24e22e3368defb78a9288b433ce0c5fa92da SHA512 2fb2bd3f82282b33c6d8513746c0ba9737447adf6c6704f625a3512d72f193ed31c829fc8f76dc9abe50bca84153f8a8f090e77118f91eec595c7b25c560308e
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.ebuild b/app-text/libnumbertext/libnumbertext-1.0.ebuild
deleted file mode 100644
index 229b5a7e34b2..000000000000
--- a/app-text/libnumbertext/libnumbertext-1.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Number to number name and money text conversion libraries"
-HOMEPAGE="https://github.com/Numbertext/libnumbertext"
-SRC_URI="https://github.com/Numbertext/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index cdf8e65ac6b4..1598c696919e 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,4 +1,9 @@
+AUX Makefile 2810 BLAKE2B 9c8ad849e95dc4037813bc575b5627b54bdf1eae3085235489e1a1c0fdf3aa3c679b5884d4044fce828f2feef02afcb82c7762b09af2c9b167c1c2dd7d0c5c7c SHA512 28014bbf81cb22c28963b594f8ef15a16740e41de2d6ad7421017fc5a50015e33ca1d449ea43a9976f741a269dac4045b2ed459cb74081690f919a4218542303
 AUX llpp-26b-WM_CLASS.patch 860 BLAKE2B adcd60863d72d5328d6918c7904c58f160651a911c9b3f8f891ff884aae54b4327ca4b21fabf95a63025a7d76799a74d47dfb60a2ab55981aabf026be3afc2ca SHA512 42973fa329ab7fc900b1a5e86fee70918c5e78486cfc6fcf4802d9dc3e5a8a902d866a1ad23f3a6febf1dcd2d18f90389369d89024e3e1727a19fce456cf8604
+AUX llpp-30-keysym.patch 1669 BLAKE2B 4df35a04c4b5de7e8fa4eaf7efe6a63f203292f12c03d1c232a0c54fa7f9f47b92f1618042e998a006f9c9822f335620b6c0c40fe0d547ea6871cfff51e75676 SHA512 003d085650ee88ee3f7f12657aa81c8a46653f3fe4a13527aa18cd52f669b7135de7686169dfed706400a557c6654fdb8041a3cf2348014425f2063be67d494f
+AUX llpp.desktop 566 BLAKE2B 2b7497616434d7ae4abfa7a78d753f194ff13c460138a1d8f13cbee674b641a476d73753c8f95ef2d02e29568fcebc47df8820329ee224b611269724d812e108 SHA512 7bbfdb97ca6f3b58f95bde326cf20bed2a5b2797ff033b1fa497e1d1fbd4522c7691b3d06f57d36707623d335e0d6a7b2e82ec6e94bfd16689241bf58289313e
 DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
+DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
 EBUILD llpp-26b_p20180114.ebuild 3032 BLAKE2B d6cc8bf1fac0cd932c298d4816221137e47df136283fc752be62886a1111de02803e92230319ccffc1864dbaf81b318c0400a34454a4f1019d8825d76f353e5b SHA512 f4b0da1be74c63c71ae02e1b6dfb7067ead203a9e1203e2c88e1eb4302364205bb92c2e4e841d861124f99781e6bb7214bf5e536dbab51a0e20c178b54afec11
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+EBUILD llpp-30.ebuild 1716 BLAKE2B 720bf3ad6f76923ef518fe2bbbef66575087a27a7320b4e76fecbd09754ec64a80189e9da3e14d7f59d98a092222460c736f60b18841460edcc05b3d3159de89 SHA512 f1da1557700969bc6a1ad7aee50437b0b157dfbdfacbdf4377e55f434222d351faa231f0a5d9042b3de52524b25defdbf75e7a34a133f29df7a439e518f91959
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/files/Makefile b/app-text/llpp/files/Makefile
new file mode 100644
index 000000000000..0bd94cab00f2
--- /dev/null
+++ b/app-text/llpp/files/Makefile
@@ -0,0 +1,91 @@
+VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
+ifeq "$(VERSION)" ""
+VERSION = 28
+endif
+
+# paths
+PREFIX ?= /usr/local
+LIBDIR ?= /usr/lib
+
+# includes and libs
+PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib
+CPPFLAGS += -D_GNU_SOURCE -DFFP
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS))
+LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS))
+
+# ocaml
+CAMLOPT = ocamlopt
+CAMLFLAGS = -g -w +a -safe-string -I +lablGL
+
+VPATH = wsi/x11
+
+C_SRC = cutils.c keysym2ucs.c link.c xlib.c version.c
+C_OBJ = $(C_SRC:.c=.o)
+OCAML_SRC = utils.ml wsi.ml confstruct.ml parser.ml config.ml ffi.ml glutils.ml help.ml keys.ml utf8syms.ml listview.ml main.ml
+OCAML_OBJ = $(OCAML_SRC:.ml=.cmx)
+MOD = unix.cmxa str.cmxa lablgl.cmxa
+SRCMANS = $(wildcard adoc/*.adoc)
+MANS = $(SRCMANS:.adoc=.1)
+
+DISTFILES := Makefile $(OCAML_SRC) link.c glfont.c keysym2ucs.c wsi.mli
+DISTFILES += $(wildcard *.sh) KEYS README BUILDING
+DISTFILES += misc/ adoc/
+
+all: llpp $(MANS)
+
+# dependency ordering
+config.cmx: wsi.cmi parser.cmx utils.cmx confstruct.cmx
+confstruct.cmx: wsi.cmx utils.cmx
+ffi.cmx: config.cmx
+glutils.cmx: ffi.cmx
+help.cmx: help.cmi config.cmx utils.cmx
+listview.cmx: utils.cmx glutils.cmx config.cmx utf8syms.cmx
+main.cmx: main.ml utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx keys.cmx wsi.cmx
+main.cmx: CAMLFLAGS += -thread
+parser.cmx: utils.cmx
+wsi.cmi: utils.cmx keys.cmx
+wsi.cmx: wsi.cmi
+
+link.o: glfont.c
+version.o: CPPFLAGS += -DLLPP_VERSION=$(VERSION)
+
+# ordinary targets
+llpp: $(OCAML_OBJ) $(C_OBJ)
+	$(CAMLOPT) -o $@ $(CAMLFLAGS) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MOD) $(OCAML_OBJ)
+
+
+confstruct.ml: genconfstr.sh
+	sh $< >$@
+
+# pattern rules
+%.o: %.c
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) -cc $(CC) -ccopt '$(CFLAGS) $(CPPFLAGS)' $<
+
+%.cmx: %.ml
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.cmi: %.mli
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.1: %.adoc adoc/asciidoc.conf
+	a2x -d manpage -f manpage --asciidoc-opts="-f adoc/asciidoc.conf --out-file=$@.xml" $<
+
+# special targets
+clean:
+	$(RM) llpp link.o help.ml $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml)
+
+dist: clean
+	mkdir llpp-$(VERSION)
+	cp -r $(DISTFILES) llpp-$(VERSION)
+	tar czf llpp-$(VERSION).tar.gz llpp-$(VERSION)
+	rm -rf llpp-$(VERSION)
+
+install:
+	install -Dm755 llpp "$(DESTDIR)"$(PREFIX)/bin/llpp
+	install -Dm644 -t "$(DESTDIR)"$(PREFIX)/share/man/man1  $(MANS)
+	install -Dm755 misc/llppac "$(DESTDIR)"$(PREFIX)/bin/llppac
+	install -Dm755 misc/llpp.inotify "$(DESTDIR)"$(PREFIX)/bin/llpp.inotify
+	install -Dm755 misc/llpphtml "$(DESTDIR)"$(PREFIX)/bin/llpphtml
+	install -Dm644 misc/llpp.desktop "$(DESTDIR)"$(PREFIX)/share/applications/llpp.desktop
+
+.PHONY: all clean dist install
diff --git a/app-text/llpp/files/llpp-30-keysym.patch b/app-text/llpp/files/llpp-30-keysym.patch
new file mode 100644
index 000000000000..b1527e1856f1
--- /dev/null
+++ b/app-text/llpp/files/llpp-30-keysym.patch
@@ -0,0 +1,55 @@
+From 6e40f7315cb620fef1d96bbe56cfe24dd91e182a Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93@gmail.com>
+Date: Tue, 5 Jun 2018 11:56:06 -0400
+Subject: [PATCH] Do not use CPPFLAGS to add headers to source files
+
+Source code, e.g. #include, belongs in the source code, not the build
+system. Build systems are for defining include paths, not the includes
+themselves.
+
+Drop the KeySym keyword since it seems to be a useless alias for
+uint32_t which might as well be used directly instead of indirectly
+using #define everywhere.
+---
+ link.c               | 4 ++--
+ wsi/x11/keysym2ucs.c | 4 +++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/link.c b/link.c
+index 783b12f..e8dcac3 100644
+--- a/link.c
++++ b/link.c
+@@ -3437,9 +3437,9 @@ CAMLprim value ml_keysymtoutf8 (value keysym_v)
+ {
+     CAMLparam1 (keysym_v);
+     CAMLlocal1 (str_v);
+-    KeySym keysym = Int_val (keysym_v);
++    uint32_t keysym = Int_val (keysym_v);
+     Rune rune;
+-    extern long keysym2ucs (KeySym);
++    extern long keysym2ucs (uint32_t);
+     int len;
+     char buf[5];
+ 
+diff --git a/wsi/x11/keysym2ucs.c b/wsi/x11/keysym2ucs.c
+index 38f9f1f..0f907c2 100644
+--- a/wsi/x11/keysym2ucs.c
++++ b/wsi/x11/keysym2ucs.c
+@@ -37,6 +37,8 @@
+  * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
+  */
+ 
++#include <inttypes.h>
++
+ struct codepair {
+   unsigned short keysym;
+   unsigned short ucs;
+@@ -816,7 +818,7 @@ struct codepair {
+   { 0x20ac, 0x20ac }, /*                    EuroSign € EURO SIGN */
+ };
+ 
+-long keysym2ucs(KeySym keysym)
++long keysym2ucs(uint32_t keysym)
+ {
+     int min = 0;
+     int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
diff --git a/app-text/llpp/files/llpp.desktop b/app-text/llpp/files/llpp.desktop
new file mode 100644
index 000000000000..9d81141aede6
--- /dev/null
+++ b/app-text/llpp/files/llpp.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=llpp
+GenericName=PDF Pager
+Exec=llpp %f
+TryExec=llpp
+Terminal=false
+Type=Application
+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip;image/png;image/jpeg;image/pjpeg;image/gif;image/bmp;image/jpx;image/jp2;image/vnd.ms-photo;image/jxr;image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap;image/x-portable-arbitrarymap;image/png;
+Categories=Office;Viewer;Graphics
+Actions=View
+Version=1.0
+[Desktop Action View]
+Name=View with llpp
+Exec=llpp %f
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
new file mode 100644
index 000000000000..3ba1ce6fe451
--- /dev/null
+++ b/app-text/llpp/llpp-30.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="https://github.com/moosotc/llpp"
+SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.12.0: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}
+	app-text/asciidoc
+	virtual/pkgconfig
+	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}"/${P}-keysym.patch )
+
+src_prepare() {
+	default
+
+	# use custom makefile from archlinux with minor changes
+	cp "${FILESDIR}"/Makefile "${S}" || die
+
+	# re-add desktop file removed upstream
+	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
+}
+
+src_compile() {
+	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc README Thanks
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/app-text/llpp/metadata.xml
+++ b/app-text/llpp/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 9bdd48303898..dc88e7c1c875 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,16 +1,9 @@
 AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
-AUX mupdf-1.11-drop-libmupdfthird.patch 579 BLAKE2B a0a1ee93832135663c14a91bb181ddfdbb315b1f0a9864c834e4c69f52c0c16ed960705baa4c0067526a23d52dc0c681ed6308b1efb34d29242303d023109b48 SHA512 a51588eae9cd97f1d6abc6c41cf5daed7b3e43fe33a5aab756567effa1bbe24cea3b05cdb3a8d027820b13eb2f54e6121a1fafefbcbe1a7768b0ba1e83bf7aeb
-AUX mupdf-1.12-CFLAGS.patch 276 BLAKE2B 20a2440cbd5a8b2cbd17204939d876c8e6df3329c54ad477257ce875a9a5483e859be58cc2b4c6b93f7491aa1cbf4ae1444e8c43af161076feefbd570412b09c SHA512 834481f055df4ca8edc2991acade0295e753d72d1f973e4250ce25f81d33ea08bc4c5fafcef203efe686abd313b78512a36b2ce7c4b5b835206136793ab0e9d7
-AUX mupdf-1.13-libressl.patch 883 BLAKE2B ab4c59b95f035686b39906fc7a25bc92fa034857bbac30c4f27b97a6ed98e86fa3a39f907c663779d652e7f02e04faf8261c23f045c14f1fe4a835db16232255 SHA512 f1e189d07ac87819541938312efbc11cc4cfb90a35f6cea4a143a9a624b6e361b7dbca254a4de5522eda93d3e465fc11e0536065d9af02c6681be8ac14c6525c
-AUX mupdf-1.13-openssl-curl-x11.patch 1184 BLAKE2B 27428b976a8f3854f16968fa5b70d0c4df0fb24508bea3c214fd5a0e46b3c43129ab0953ff20f55b23080de54ae6c5760f7eb97b53195794350a832219449acc SHA512 46f28dc5b23831c7125e42224acf16fc4a6cb90a03f719d2bd423d92e22280689bd3d7dc634d123050c2762333062916712cc951634ec5e5a7d2d4fcef7ebabf
 AUX mupdf-1.14-CFLAGS.patch 395 BLAKE2B cc841dc186ac09892789664395bf632a33af3fd1e979e6f23809be0de74181004714b7352d52f3e4414147fe565e73ae9a6fe6b35a6674445e88a3d67ef640c8 SHA512 a5029fca7665e417f16062dcad22e084d6d99cd9ff9a6f1ad853d3ba182c8f565c75469d77edda521f7e777e14a55d4126ddd7631e70290c340d9c7411974c47
 AUX mupdf-1.14-Makefile.patch 1294 BLAKE2B 228ab49a5814e24b0fb1995c5137ce513a303f495973699a370a13a2af17e436ad67ecb47bab739740f7593b71087e167461ff188ef0fe8edf3980450d54984a SHA512 33be7134f8f469a4c72daf59d705de2ed2952ba4ff518ab54f5dc44279d4af8c5d05919bd19d4c6b84085f47f3713a752d678e708aa736e703d2f47d94391b84
+AUX mupdf-1.14-fix-big-endian.patch 4086 BLAKE2B c5104e808a83f122f1c1e80fd57b5aabadc017458e1d2383b09eef457ff6bd8809a42efac01d1f5fdfcbc55789696a2ab62dfd7f6f83150a1016e4c07c4fdfea SHA512 2519b33703976465f1411cad10daebe7646c2830ac385df642b326e82ca608bb4662f824ff98a1cc434994191f222ee02f56b296cac526abaa9e69d5786d50be
 AUX mupdf-1.14-openssl-curl-x11.patch 1799 BLAKE2B 62ae64baad844a13379f8dd1e1a1fed7cc0675fafe79e92a1029a968f59aa0aa3557734f2aa8e56d84f9bbeffbd148ae12255538d2f7b27a07fad5030621d33e SHA512 b6892c58c8a0d7561af16cc3e45e666b8bd1a6824f803d7500dd2db09b4bb477c45ab71b955bf76eedea8352d62d062ee656157c55d635514e464afdef1c2583
 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.13.0-source.tar.gz 51425034 BLAKE2B 7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a SHA512 d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
-EBUILD mupdf-1.13.0-r1.ebuild 5204 BLAKE2B f62442ec438a0f3245fb8a543a6f68c1474c11ebe2633c1460175c0c700575a6236ac1f4f747f5e85966577cf32d903f56c80353aef8cfa53570b204423ab154 SHA512 753f2e08443b4982f44a644d2be9fd769f9162ca387dae7ac49baaa4a12d906be6741f959bac14a78780085559e92d8ae2722fe2fe8a630d7983c37a171b53c3
-EBUILD mupdf-1.13.0.ebuild 5136 BLAKE2B deb1d486417e37df66461924632349d443f1b4b79a6a1c148c77cf5fc84799ce946a08d8bea7d79948b4a33914d96b30890e353d73cc49791cb6e16d8728ec8a SHA512 c9989b3ec1a39bfda215c798928723d1d099444e1695da24ed3709b355ccd99dc660ab6e7a245c3a5384376810c93649095c09255a6e8106ae599ae5bd55a343
-EBUILD mupdf-1.14.0-r2.ebuild 3051 BLAKE2B ebce615c6dd87355beedc8f8fc7fbd92cdb374bc7b3a37dadc173721c967e72129b1e6bb7e0887c13c3686e39ad88573e78eab9b38211d7d20f2b293376bd15f SHA512 a682a7f6f34bdcf54ab22eb59e6a3d46996d22af79d8c004163c078a6e9e495af8829cfd4421070eceb170a3f8d6ce1b452be1a27a2684fb1e5642c00e50482e
-MISC metadata.xml 429 BLAKE2B f2f025000df327431c06219bc8da22fc340cee333318f4006d889722cd089d8492c9b8b9b1b9591622606282574ccdcf4cb5ddea04b0ab9a8f22c22dae7bfe6c SHA512 60b17408d27057c7fa361d1b480d876db73b89850f3d1f1f06e442bd58e1bccd24ca599e25290614bb879898e87ecf6dc74116154c318e6bb1134144f0826e92
+EBUILD mupdf-1.14.0-r2.ebuild 3112 BLAKE2B 15e7a667afa71e4c34c2d5364cf23ed97700d0248b1e3f7ded0485cd401fd8f2f89ddd7f4ed419b061117ef3908100be8a3628588ffde765101c7e4b3aeb2744 SHA512 8921e789ffc8c0972a0f533200504fce27c3a75ade0e3d0bf7206860a4875ac4d844cf82ff5e7f0a322dd8dff792de69881dfa785940d1800e26a2b1eb740768
+MISC metadata.xml 325 BLAKE2B b1481395199609bf3f4f01f21946866005eeb2a5df124c1ded940702808cfba176494e7b801ad5fef4ea61c93ce47e7415548a3e86d0d41b28c16ea1d064a152 SHA512 8b7c565857b47f585fa4059e99087efdbf1a88cc61fc2370a489ebf6c46e3a1271eb23b2173354054c82317ce7305d9372f6d05afd4749b0467635030cd5ea1e
diff --git a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
deleted file mode 100644
index e5600c00cd83..000000000000
--- a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mupdf-1.11-source/Makefile
-+++ mupdf-1.11-source/Makefile
-@@ -301,7 +301,7 @@
- # --- Library ---
- 
- MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdfthird.a
-+THIRD_LIB =
- THREAD_LIB = $(OUT)/libmuthreads.a
- 
- MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
---- mupdf-1.12.0-source/Makefile
-+++ mupdf-1.12.0-source/Makefile
-@@ -343,7 +343,7 @@
- 
- THREAD_OBJ := $(THREAD_OBJ)
- 
--$(MUPDF_LIB) : $(MUPDF_OBJ)
-+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THIRD_LIB) : $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- 
diff --git a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch
deleted file mode 100644
index 796d127263ae..000000000000
--- a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mupdf-1.12.0-source/Makerules
-+++ mupdf-1.12.0-source/Makerules
-@@ -22,8 +22,6 @@
- endif
- 
- ifeq "$(build)" "debug"
--CFLAGS += -pipe -g
--LDFLAGS += -g
- else ifeq "$(build)" "release"
- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
- LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
diff --git a/app-text/mupdf/files/mupdf-1.13-libressl.patch b/app-text/mupdf/files/mupdf-1.13-libressl.patch
deleted file mode 100644
index 396a0e5b5db9..000000000000
--- a/app-text/mupdf/files/mupdf-1.13-libressl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/Makerules b/Makerules
-index f9b25d6..6c91c6c 100644
---- a/Makerules
-+++ b/Makerules
-@@ -106,11 +106,17 @@ SYS_GLUT_LIBS := -lglut -lGL
- 
- WANT_OPENSSL ?= yes
- ifeq "$(WANT_OPENSSL)" "yes"
--ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
-+ifeq "$(shell pkg-config --exists 'libcrypto >= 2.0.0' && echo libre)" "libre"
-+ifeq "$(shell pkg-config --exists 'libcrypto >= 2.7.0' && 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
-+else ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && 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
diff --git a/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch
deleted file mode 100644
index 6db51a083edb..000000000000
--- a/app-text/mupdf/files/mupdf-1.13-openssl-curl-x11.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/Makerules b/Makerules
-index ef2b6b0..f9b25d6 100644
---- a/Makerules
-+++ b/Makerules
-@@ -104,12 +104,17 @@ HAVE_GLUT := yes
- SYS_GLUT_CFLAGS :=
- SYS_GLUT_LIBS := -lglut -lGL
- 
-+WANT_OPENSSL ?= yes
-+ifeq "$(WANT_OPENSSL)" "yes"
- ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && 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)
-@@ -121,12 +126,16 @@ SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
- 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.14-fix-big-endian.patch b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
new file mode 100644
index 000000000000..dc472153ca6b
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
@@ -0,0 +1,125 @@
+vdupras note: exact same patch as in
+https://bugs.ghostscript.com/show_bug.cgi?id=699395 except for tweaked
+diff paths.
+From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001
+Message-Id: <5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528041417.git.mjg@fedoraproject.org>
+From: Michael J Gruber <mjg@fedoraproject.org>
+Date: Sun, 3 Jun 2018 17:55:46 +0200
+Subject: [PATCH] fix build on big endian
+
+0dc1153 ("Spread of context into all procedures and removal from
+structures", 2017-04-26) missed a few spots that are relevant on big
+endian only.
+
+Add the missing ContextIDs in the call chain so that the build succeeds
+again.
+
+Signed-off-by: Michael J Gruber <mjg@fedoraproject.org>
+---
+ src/cmsmd5.c | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/src/cmsmd5.c b/src/cmsmd5.c
+index 4b8f7f9..dd0925a 100644
+--- a/thirdparty/lcms2/src/cmsmd5.c
++++ b/thirdparty/lcms2/src/cmsmd5.c
+@@ -29,7 +29,7 @@
+ #ifdef CMS_USE_BIG_ENDIAN
+ 
+ static
+-void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
++void byteReverse(cmsContext ContextID, cmsUInt8Number * buf, cmsUInt32Number longs)
+ {
+     do {
+ 
+@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
+ }
+ 
+ #else
+-#define byteReverse(buf, len)
++#define byteReverse(ContextID, buf, len)
+ #endif
+ 
+ 
+@@ -172,7 +172,7 @@ cmsHANDLE  MD5alloc(cmsContext ContextID)
+ 
+ 
+ static
+-void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
++void MD5add(cmsContext ContextID, cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
+ {
+     _cmsMD5* ctx = (_cmsMD5*) Handle;
+     cmsUInt32Number t;
+@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
+         }
+ 
+         memmove(p, buf, t);
+-        byteReverse(ctx->in, 16);
++        byteReverse(ContextID, ctx->in, 16);
+ 
+         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
+         buf += t;
+@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
+ 
+     while (len >= 64) {
+         memmove(ctx->in, buf, 64);
+-        byteReverse(ctx->in, 16);
++        byteReverse(ContextID, ctx->in, 16);
+         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
+         buf += 64;
+         len -= 64;
+@@ -216,7 +216,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
+ 
+ // Destroy the object and return the checksum
+ static
+-void MD5finish(cmsProfileID* ProfileID,  cmsHANDLE Handle)
++void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID,  cmsHANDLE Handle)
+ {
+     _cmsMD5* ctx = (_cmsMD5*) Handle;
+     cmsUInt32Number count;
+@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID,  cmsHANDLE Handle)
+     if (count < 8) {
+ 
+         memset(p, 0, count);
+-        byteReverse(ctx->in, 16);
++        byteReverse(ContextID, ctx->in, 16);
+         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
+ 
+         memset(ctx->in, 0, 56);
+     } else {
+         memset(p, 0, count - 8);
+     }
+-    byteReverse(ctx->in, 14);
++    byteReverse(ContextID, ctx->in, 14);
+ 
+     ((cmsUInt32Number *) ctx->in)[14] = ctx->bits[0];
+     ((cmsUInt32Number *) ctx->in)[15] = ctx->bits[1];
+ 
+     MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
+ 
+-    byteReverse((cmsUInt8Number *) ctx->buf, 4);
++    byteReverse(ContextID, (cmsUInt8Number *) ctx->buf, 4);
+     memmove(ProfileID ->ID8, ctx->buf, 16);
+ 
+     _cmsFree(ctx ->ContextID, ctx);
+@@ -291,7 +291,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile)
+     if (MD5 == NULL) goto Error;
+ 
+     // Add all bytes
+-    MD5add(MD5, Mem, BytesNeeded);
++    MD5add(ContextID,MD5, Mem, BytesNeeded);
+ 
+     // Temp storage is no longer needed
+     _cmsFree(ContextID, Mem);
+@@ -300,7 +300,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile)
+     memmove(Icc, &Keep, sizeof(_cmsICCPROFILE));
+ 
+     // And store the ID
+-    MD5finish(&Icc ->ProfileID,  MD5);
++    MD5finish(ContextID, &Icc ->ProfileID,  MD5);
+     return TRUE;
+ 
+ Error:
+-- 
+2.18.0.rc0.294.g786209a621
+
diff --git a/app-text/mupdf/files/mupdf-1.9a-debug-build.patch b/app-text/mupdf/files/mupdf-1.9a-debug-build.patch
deleted file mode 100644
index 93c52f5c5f8b..000000000000
--- a/app-text/mupdf/files/mupdf-1.9a-debug-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mupdf-1.9a/Makefile
-+++ mupdf-1.9a/Makefile
-@@ -1,6 +1,6 @@
- # GNU Makefile
- 
--build ?= release
-+build ?= debug
- 
- OUT := build/$(build)
- GEN := generated
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 38351433e8bd..5866930fdf0c 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>vdupras@gentoo.org</email>
 		<name>Virgil Dupras</name>
 	</maintainer>
diff --git a/app-text/mupdf/mupdf-1.13.0-r1.ebuild b/app-text/mupdf/mupdf-1.13.0-r1.ebuild
deleted file mode 100644
index e24a2812a4d2..000000000000
--- a/app-text/mupdf/mupdf-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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.13-openssl-curl-x11.patch
-		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
-		# See bug #662352
-		"${FILESDIR}"/${PN}-1.13-libressl.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.13.0.ebuild b/app-text/mupdf/mupdf-1.13.0.ebuild
deleted file mode 100644
index 45887a2ebd6c..000000000000
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 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.13-openssl-curl-x11.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.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index 3ce32300c17c..d6f2331ad669 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="
@@ -45,6 +45,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
 	# See bug #662352
 	"${FILESDIR}"/${PN}-1.14-openssl-curl-x11.patch
+	# bug #672998
+	"${FILESDIR}"/${PN}-1.14-fix-big-endian.patch
 )
 
 src_prepare() {
diff --git a/app-text/paps/Manifest b/app-text/paps/Manifest
index 8038aeeee242..f51f77ac5630 100644
--- a/app-text/paps/Manifest
+++ b/app-text/paps/Manifest
@@ -4,4 +4,4 @@ AUX paps-0.6.8-fix-empty-file.patch 558 BLAKE2B 10b0726c8f788ec6e21172ec7529b2aa
 AUX paps-0.6.8-fix-freetype-include.patch 323 BLAKE2B 75d4030616e2efee60d1928404bb67fa9cb6ff42d9183d3c6785d1ce18c110000195962a1f5514c0d7678855a5ac179cd7d505888ae5bcfc637aa9faf3919c45 SHA512 1ace4c661972853390feaf3f4a123416a6847b5d969017884df75561255a487c0c1e0adf37a1904f17c6855996a2edb0a5e388c996d31224f713bdba9425b287
 DIST paps-0.6.8.tar.gz 460062 BLAKE2B 8ca34cd217a5ed26de80a1e35f5cb05d75c291a966923ddcf73fb8a6db1a3823075c480c876cff932757feb3a4767057d269bac0863236df0b513e246726b01b SHA512 db657d90179e11fe42bbcdbebe09a84f1927c99d0b539c9e29b66b3cb8ffcf33ff500c9d81835ae5a0880382bf8f24801f04742517b76b8e005b125a139d8bba
 EBUILD paps-0.6.8-r2.ebuild 777 BLAKE2B 9f025ffddc995a851fb48ca6ec2e3f72845df836cb6757f2074ad35ef7d03129b9088c1618c372331894595e1eadd72c8dbab7f719aeaba573dcfec2e6edc74d SHA512 bfccabf0ecdea578b095022acd26280ff4d2ed9cdcc342787169dbc6d6040dc13221ee4d6c36ccc756645de785b75b48307437db5aab2d28f7445d6fba0f754c
-MISC metadata.xml 317 BLAKE2B 8632806f00d6f0736b3c75830059175eac776a0aead44584cdc3d8d449c684f430e9500c83e7f81c0ffef1fe11219bf4897c6e90dc4ded8a8b8e6f9f554791cc SHA512 8f35f01381203ad3dc040eaad87a286b1c8ded91eb9f0d6d77f98168a49dafed6e6c4c7235cf4eee163981178d5c967c819625008cac700202378f717f90421a
+MISC metadata.xml 241 BLAKE2B d711ad02c7fdc064fbef09dafb39412c4af3ddc374f88bc1ed8ba1812a9d07c1a948592632a58bd059f8d476c1ad86ce575587c0045c94a9c5134432021ab1f6 SHA512 8eb60a6869898218688205e0915f7aef34bd3639d6ed8e3303c19ade6ead67bc15ae781bd5856214d8ee0d69bbd80682013b68750bfd73f125c45a5ea0fdc9cb
diff --git a/app-text/paps/metadata.xml b/app-text/paps/metadata.xml
index 3258972788e0..54bd128e976a 100644
--- a/app-text/paps/metadata.xml
+++ b/app-text/paps/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">paps</remote-id>
 	</upstream>
diff --git a/app-text/pdfshuffler/Manifest b/app-text/pdfshuffler/Manifest
index 65e71e7937cd..8f799a5e220f 100644
--- a/app-text/pdfshuffler/Manifest
+++ b/app-text/pdfshuffler/Manifest
@@ -1,4 +1,4 @@
 AUX pdfshuffler-PyPDF2.patch 701 BLAKE2B a8ee95b415f121bf7c450a80e9d01c3349ed685146fd375d6aa10bcc7cc3684e1b75ad9986504aeb10d039e897750e7f304f32af8ebe12aaf24b5236f79fe62c SHA512 8496ebb9656e1f9e5ee99184a5d8cf0493ebacedc9f936804aedd784930457d39390b577683e77b6b5264ba50f7e2b202404c40ae426ba42b6f612d7ca193433
 DIST pdfshuffler-0.6.0.tar.gz 48071 BLAKE2B 8bcb513f1dd18cf9d6e17315a7a2ec5bbf5240176acd6deb6ec803900174a39927998210ab5e4aab9a7330821ce7d1ab266e1ae677e03fd51df305ceec9f5836 SHA512 e2563e9b5faf3ebac56f3840017ad9279a5e8e096c9f44ec053c617894910b1d0531457bc37d8fb9bc1db13ae25b94d55ca0b4ec26fbddeb9e51e6b4d75293fe
 EBUILD pdfshuffler-0.6.0-r1.ebuild 877 BLAKE2B cb8ecf84a7cd7895b9f13e044bace9c094cd8ff4cc650a116c5b87862b465f30aba38cd5babba1bcc86a6a6b1b86a6f16169fa366dd5d28b39200046d6c019fe SHA512 0b508ebc13b85bbdab0c74a212f06128755bbcbf9f8969f5dc7f7a81defe3fa428af5f1b891adc8a84f6fdcf6235f8cd31b8114733e4379bf952d5d289f2e01b
-MISC metadata.xml 317 BLAKE2B 1fe689819b8e7ec92564b27c15595add2e7e52bd5c04b8ce3d24ac933461d50fe468e630a65c6525e2afcd42f9019b7e7198a7bf64b9ace99ee0c31ddc47ac6f SHA512 1e710aa1ddf91651f987d6fdf7ae15bb4ad58190c374b72bb9198e19262a4c3e1e4faedc8647a50060e113a32f38994bc0ac8393455b4ceeedf2973e310b7992
+MISC metadata.xml 244 BLAKE2B 551d6af2c99b19299e4d0da0548b49dc84d448ee49adbcc4d1e49580c75369aa9accf1fba724bff40ebbe2a3834105564dfba6f1f60db27502de87291e7974ae SHA512 f509ae4acd33243de7c2f7035971fb1c720da3aea0dac715dc1ce8c7e3e8a0ac10ac4b2089c900df5438a22ce5a03cc8acd946ffa74e4b8140f3c27d38e71ea5
diff --git a/app-text/pdfshuffler/metadata.xml b/app-text/pdfshuffler/metadata.xml
index 1449934ed1ee..bab57cb53461 100644
--- a/app-text/pdfshuffler/metadata.xml
+++ b/app-text/pdfshuffler/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@gentoo.org</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="sourceforge">pdfshuffler</remote-id>
 </upstream>
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 49c978e67f67..a1aa9543ff4f 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,7 +1,4 @@
-AUX pdftk-2.02-flags.patch 1922 BLAKE2B fc8be4321b7f39d3814a4da73986d4d81fd9d0eb52941e77f2ebcf85443c418b618584a5d9632979b3c6ed121e2fb4a42d7d694832119ee215a97454139e3d51 SHA512 96d2aceda2c98704ee70e55f84bd831ee131153d21a2b6f094ec111a1475cdc5da01434566d1c9aff2de403e55a81b0ae6baeb5d3017cb979662de895ebbf768
-DIST pdftk-2.02-src.zip 2239008 BLAKE2B 9bb55fb687b85de2ee0f9bec4ff16772646613b1519afb6d432985ad452cd09d04636788cb2deedb9924833cc10a802057c0e8ff146789da29cd4969cd614c39 SHA512 5c73ab3b7b12cfc24a17c2737d224fdde2ae684e1712031a968b83f5b8d91c521d477e932fc47f8b4a8c0ff0ba183678aaa13a1e7b29107c5c47ded8d960ef54
 DIST pdftk-v3.0.0.tar.bz2 546821 BLAKE2B 1d1935322f1468d9e2e8044e748fbb816e399599e445e078866d416d5e99866739134fb794ff42dbfcc37271d66655440f706db46f152722ab7030cba16edf38 SHA512 3b487f7532140366c9ac41222cd366d387b93e67aada845772f60ff20601e25611e34a190a65fbcec9d776a0b5683100fdd54453357bf7c43cebea7dda0c6229
-EBUILD pdftk-2.02.ebuild 958 BLAKE2B b67ae137dcd28f2bfef9ca0fb5b2b718fd14a8d51628995f24090e3c5cf5db69155ffa75f8788137f46669f0d625e544e9fc1f9188ac21589048ac51c55039ce SHA512 25565e5ea0c59b9af269419acab47d7a4d452800494697238a1e9b48d11617a4f46024357a91bf3b25c080a22960177b4249275f571d2bf38d9a492d70d650eb
-EBUILD pdftk-3.0.0.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
+EBUILD pdftk-3.0.0.ebuild 887 BLAKE2B 90e3a8fec61768bfb426616e13e3fd1abfba8603ff92fdf3397d4c25c6f9e66745e5130384f143ce1a0eb737d8f1b50ebb28fc061e522e4188c95d28825c2b13 SHA512 568a2467ab3f98e4b69c730ca3ab62f69ece26da3e930635f83181a945a1dc7b855cb8ceec31b9404e2f1aa37bcf0fa03b6f1773826d3d77ea9b430e4da2eb07
 EBUILD pdftk-9999.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
 MISC metadata.xml 348 BLAKE2B ef51c768c6964646b5e264d379b5c259134b37df3c9d4368b92c44855ee21fa40005fcf1514e95fba43fb683fbf49c35dc251521d1b63f91449c73ecb527a749 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572
diff --git a/app-text/pdftk/files/pdftk-2.02-flags.patch b/app-text/pdftk/files/pdftk-2.02-flags.patch
deleted file mode 100644
index 5b20c9701cc0..000000000000
--- a/app-text/pdftk/files/pdftk-2.02-flags.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Based on Debian patch, see http://patch-tracker.debian.org/patch/series/view/pdftk/2.01-1/customise_build_parameters
-
-diff -ruN pdftk-2.01-dist/pdftk/Makefile.Base pdftk-2.01-dist/pdftk/Makefile.Base
---- pdftk-2.01-dist/pdftk/Makefile.Base	2012-12-06 19:57:36.000000000 +0100
-+++ pdftk-2.01-dist/pdftk/Makefile.Base	2013-03-24 18:32:52.669492230 +0100
-@@ -43,7 +43,7 @@
- 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c
- 
- pdftk : pdftk.o attachments.o report.o passwords.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O)
--	$(CXX) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk
-+	$(CXX) $(LDFLAGS) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk
- 
- install:
- 	/usr/bin/install pdftk /usr/local/bin 
-diff -ruN pdftk-2.01-dist/pdftk/Makefile.Debian pdftk-2.01-dist/pdftk/Makefile.Debian
---- pdftk-2.01-dist/pdftk/Makefile.Debian	2012-12-06 19:58:44.000000000 +0100
-+++ pdftk-2.01-dist/pdftk/Makefile.Debian	2013-03-24 18:34:39.034540850 +0100
-@@ -21,7 +21,7 @@
- # tools
- # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME)
- TOOLPATH=
--export VERSUFF=-4.6
-+export VERSUFF=
- export CPP= $(TOOLPATH)cpp$(VERSUFF)
- export CXX= $(TOOLPATH)g++$(VERSUFF)
- export GCJ= $(TOOLPATH)gcj$(VERSUFF)
-@@ -64,13 +64,12 @@
- # only effects libraries following option on the command line
- #
- #  
--export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
--export CXXFLAGS= -Wall -Wextra -Weffc++ -O2
--export GCJFLAGS= -fsource=1.3 -O2
--export GCJHFLAGS= -force
-+export CPPFLAGS+= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
-+export GCJFLAGS+= -fsource=1.3
-+export GCJHFLAGS+= -force
- export LDLIBS= -lgcj
- 
- include Makefile.Base
- 
- # required packages (xubuntu 12.04)
- # gcj-jdk, g++
diff --git a/app-text/pdftk/pdftk-2.02.ebuild b/app-text/pdftk/pdftk-2.02.ebuild
deleted file mode 100644
index cd88040b5245..000000000000
--- a/app-text/pdftk/pdftk-2.02.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-DESCRIPTION="A tool for manipulating PDF documents"
-HOMEPAGE="https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
-SRC_URI="https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux"
-
-RDEPEND="sys-devel/gcc:5.4.0[gcj]"
-DEPEND="${RDEPEND}
-	sys-devel/gcc-config
-"
-
-S="${WORKDIR}/${P}-dist/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-flags.patch
-}
-
-src_compile() {
-	# Settings by java-config break compilation by gcj.
-	unset CLASSPATH
-	unset JAVA_HOME
-
-	# We need gcc-5 because of Java
-	export PATH="$(gcc-config -B 5.4.0):${PATH}"
-
-	# Parallel make fails; confirmed, still not fixed in version 2.02.
-	emake -j1 -f "${S}"/Makefile.Debian || die "Compilation failed."
-}
-
-src_install() {
-	dobin pdftk
-	doman ../pdftk.1
-	dohtml ../pdftk.1.html
-}
diff --git a/app-text/pdftk/pdftk-3.0.0.ebuild b/app-text/pdftk/pdftk-3.0.0.ebuild
index 9fe6b13efc09..013ab53a1b0f 100644
--- a/app-text/pdftk/pdftk-3.0.0.ebuild
+++ b/app-text/pdftk/pdftk-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
 else
 	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/pdftk-v${PV}"
 fi
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f930db2fb34f..6d3df9b9414b 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -9,9 +9,11 @@ DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1def
 DIST poppler-0.67.0.tar.xz 1459412 BLAKE2B 1c24908839fc9e3b3b2a1e0c014f7b6a1c6cc622157e161437ece91a86a20db0d5ae67b35783a5a4b712ab4ba0e43f141ca516fde10b5a549b9d36a98c5de25b SHA512 36584c62970ae0ae7807687f9c0523560ae92ac323949be8916a0e8dc6e691633e55cdd76c6026253c337aed8a4b43a7759a3de74c9ec606654f65379fb0f206
 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a
 DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c44447aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e
+DIST poppler-0.72.0.tar.xz 1492912 BLAKE2B 6582b418031c52e5e9031e9f25b80841ba471c1308030bef2cdb13cd607ddd0ca51639d93c09f33e42d5f9378ee44b5ebe4dbac29254f952f7c2ec147799bc5e SHA512 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145
 EBUILD poppler-0.62.0-r1.ebuild 3537 BLAKE2B 9c5ade9d12bba01198417d35e63ae454cd0a5a2d2e68ccda8fcf90bcae83fab248b46e8178e651661b25385b6863bb250461d6995afa38dee88c5c0084da0541 SHA512 4075ffbe26bd13100e9d43f8b0d3768d9ab9d2f287364654f1b223b91e6ede835268b7ff7226c1e65c4ff27e9be43bf355d377d4de8d2f2a7eab27ad908a3e3d
 EBUILD poppler-0.67.0.ebuild 3564 BLAKE2B dc1af15e88db8bf07c842a1bbc1d56d4fda73d2ce6a37bcd22c8214d58d3f94503fc41e03eb3585afcae188eb291d5d243117eb2366c101326211f5a124e6925 SHA512 a5231cb7a56b08651b73383aa5fe59213bc8ddfd87eb647b2b8ca39fb5b82daf42a88207eb814825c6c93c3debff6a8df05e61299a9e7644adb18369fb81498c
-EBUILD poppler-0.68.0.ebuild 3491 BLAKE2B 940d099a8b6b3552332422b4744764a46362aebe06eea5e15e1c815d5f7bf8a91534e4e7f9bd244584347a39226c30454303bd83224a751ceef31986b854d057 SHA512 e5b2d0ad91e0cf588ed4744467b4f88839098d6c4d87fe19de9e7ec3016e9009989304d51de06bf94ddb994e02529d96d59429d21463504ebff799317144c047
+EBUILD poppler-0.68.0.ebuild 3490 BLAKE2B 4ae091507539d78ca85a0186161921d2818ad5537cd9a336bc30658babbdc31a1214e38c32644d61989533f0087f6b1f50d7d4d454ac09f3b44f4606776d0a93 SHA512 9988912a6955f1483981e5f06f2d8d2ad324d0e535524f9de20313b01483473dcbd1e9b69fc0935d9ee4515ff8612409ad5cbccea6e5e876e8579a056b19232d
 EBUILD poppler-0.71.0.ebuild 3540 BLAKE2B ac172b835255622ead92f000a8f0363780445dc2d3d2be23b450700af08cef77472a4eb8e6cf83eaa77d32ca09f773935fe0714da27471c604773caa201c449f SHA512 e69e46cff9fc2d118ba590f30cfdf002e40057c17422fc76dc1560772f744648a28c77fc5c2f1a059dc62c631cf0b384f903b98403ad48164df9c1262c092c39
-EBUILD poppler-9999.ebuild 3540 BLAKE2B ac172b835255622ead92f000a8f0363780445dc2d3d2be23b450700af08cef77472a4eb8e6cf83eaa77d32ca09f773935fe0714da27471c604773caa201c449f SHA512 e69e46cff9fc2d118ba590f30cfdf002e40057c17422fc76dc1560772f744648a28c77fc5c2f1a059dc62c631cf0b384f903b98403ad48164df9c1262c092c39
+EBUILD poppler-0.72.0.ebuild 3540 BLAKE2B 354cd476e92a4bf81678ae80e792fd4766d3fc7645035908cc6a9b77f8cf3bd785f00eef0dcaecb1851f6d02323763af95b92c4a9a5e0763b34a77b28adc20c2 SHA512 2fe94a398d441edbe0cccc736e9964fec3d0d5adfe70ff1808b74e091d8edf2302c157d704565cf436c6597b13cda09f3b15faa939991a29da1098544526454a
+EBUILD poppler-9999.ebuild 3552 BLAKE2B 28aa4602a965d43bd0c26c2a89cf8ba9ccc4925c21b7b626a13dbe0717384dd57142282bcd3838f690765e15b36f15d70a34dd6586421fb3854370d3494c154f SHA512 b548a0c857314bbe8edd2ff26be6cd08e0cbe83f177b31692591abf0324538ac1f75de73f31731ea5a300bd810496bcc528ae46800e7fed1567f6f84332e1d34
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild
index 4a319b20c846..eac089bb9e68 100644
--- a/app-text/poppler/poppler-0.68.0.ebuild
+++ b/app-text/poppler/poppler-0.68.0.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/79"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.72.0.ebuild b/app-text/poppler/poppler-0.72.0.ebuild
new file mode 100644
index 000000000000..8e7a2fcd30cf
--- /dev/null
+++ b/app-text/poppler/poppler-0.72.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/83"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.71.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a8ae481329a6..a91d71770d67 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/82"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/83"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -93,7 +93,7 @@ src_configure() {
 		-DENABLE_SPLASH=ON
 		-DENABLE_ZLIB=ON
 		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
 		-DSPLASH_CMYK=OFF
 		-DUSE_FIXEDPOINT=OFF
 		-DUSE_FLOAT=OFF
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 61625afc2eeb..2bcb452295d8 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -159,6 +159,5 @@ DIST texlive-module-typeoutfileinfo-2017.tar.xz 1596 BLAKE2B 3c20d6daebac40630f4
 DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf44728d0fc474cd1a39036997366b9f4565f6a1648a27ec904fc24100ab0109d35825b171f9d094a165cf72f7fbcf53ce766c5cd6acd336f2ac0 SHA512 277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de
 DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
-EBUILD texlive-core-2017-r3.ebuild 11608 BLAKE2B 5f73ff31793371ac42d9ca6f527982b86ddb078d7d51da5344baa8c0b797b93785e2b607b04b4700ed60dfdeb119f3e54598dfa47db39c4cc3d0dc963d548968 SHA512 6594b8000529bb15dce0c6c3ff033143e9bcfa0dce43c54cb73e86f54b9324ababef04af1d55a3303a5d365ba3e764484c69e73dcdd449af0b4bc9de8a458300
 EBUILD texlive-core-2017-r4.ebuild 11801 BLAKE2B 4ddcc339eec638cb5b2ba2a0ff75ff22b67a9bd8d45fe3b0f05de043b9e9e404c61469434aefab022ef6bc80c1b2e30b4b58e63b1932f6743d3a3d90416b635e SHA512 ab52558e5d4cd66f92b8a3aba70336730694f9dc1e96c26bd5e9b10c70ff5c90ab18d6cd53a3e00ff718cd3efd7c24671e0631f12c156b4a461f8b0e457c7978
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
deleted file mode 100644
index 660c0a04812b..000000000000
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="70"
-TL_SOURCE_VERSION=20170524
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="https://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
-	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
-	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
-	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
-	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
-	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
-	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
-	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
-	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
-	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
-	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
-	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
-	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
-	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
-	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
-	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
-	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
-"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source arara.source checklistings.source hyphenex.source
-	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
-	texdef.source texosquery.source
-"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="alpha amd64 arm arm64 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="cjk X doc source tk +luajittex xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libX11
-				x11-libs/libXmu
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.58.0:=
-	<app-text/poppler-0.64.0
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	app-text/libpaper
-	dev-libs/gmp:0
-	dev-libs/mpfr:0=
-	xetex? (
-		>=media-libs/harfbuzz-1.4.5[icu,graphite]
-		>=dev-libs/icu-50:=
-		>=app-text/teckit-2.5.3
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.3
-	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
-
-DEPEND="${COMMON_DEPEND}
-	<media-libs/freetype-2.9.1-r3
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.8_p20170524
-	>=app-text/dvipsk-5.997
-	>=dev-tex/bibtexu-3.71_p20170524
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	sed -i \
-		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
-		texk/web2c/configure || die
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Required for newest icu, bug #618732
-	append-cxxflags '-std=c++11'
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--with-system-gmp \
-		--with-system-mpfr \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pk \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable luajittex) \
-		$(use_enable luajittex mfluajit) \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable cjk pmp) \
-		$(use_enable cjk upmp) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${B}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
-	cd "${B}" || die
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	einfo "Regenerating TeX formats"
-	fmtutil-sys --all &> /dev/null
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}
diff --git a/app-text/tofrodos/Manifest b/app-text/tofrodos/Manifest
index d72d2c7961e4..61a2eb906b8f 100644
--- a/app-text/tofrodos/Manifest
+++ b/app-text/tofrodos/Manifest
@@ -1,4 +1,7 @@
+AUX tofrodos-1.7.13-CFLAGS.patch 192 BLAKE2B a83cb40a82e2034820315423d4da8dd800cbf5c5e3f5e50c04e7d489e5b68c471c19c846ae40db4f69c2568d03ce79640e8bb5b6438c6dcaebbfb0f1d103067e SHA512 137b0d00edd1a534eba7a415b46ddc455eb5954a06148ca2132579bcca859b18b642deeb6e5bc364e1ec1824a5f0d72512de58109acbbad2ba958b6071aa9723
 AUX tofrodos-1.7.8-CFLAGS.patch 306 BLAKE2B 4e3b3ec28cb47d758d053394c4a0c806f27bc2bb97f0b715e85c21c6c3646924fcdb0b520dd819460f84c787a5852e0aab3ff67479c16dd959aa202b3c04711d SHA512 d96573638ba4cc4c3413ad42b903a08ac84286571317097aabcba7dfc69f794e53601154b5faf3e19ca0833377a742df745209ae3958ec9e7d2895e13bce5b2d
 DIST tofrodos-1.7.12a.tar.gz 97588 BLAKE2B ca8794df5b58e0e88d23a52287ec3f9c58918baa6590b6e2d571782c4c2ff1625e208648cce8346b2f63b52031da5dd3aff0e66522e670525cdc09bdfd8744b0 SHA512 45a03203ccd053ec02a420fe4a63b427ee74dfa2c30e914836621a1cd7836ce81800e8bd5f1cccdb93233780ce79bc74d4ad49dca6192899b3039cf559baa8a2
+DIST tofrodos-1.7.13.tar.gz 99975 BLAKE2B 677b5cf7b1ef061b86a60229e083dc19ddcb7887b1319685ccd5a50493c1f02feb8556db3c2866f3ca1851304d0e97592a8abdd880a5f4e70eb7032f4238445d SHA512 629804caf20ac7bfc6f47637b7bc575766f032e324142df3be14347f050c61d969e023f8fed0ce5c87d8fc57b25c60c4e0214600738c5079d5e731045dae4843
 EBUILD tofrodos-1.7.12a.ebuild 699 BLAKE2B 6cb65a781ef4ea7b86b8bd62a4ea6714140663dac58aeb24d349eef8856f3fc7e5cc46e3f0d7926d11a897d4208b845b86886bd5c4e50ee5dc6073a21492746a SHA512 8c4e88d3082d5c597f18fcf45c092ac86d291236ab9cd2e78cdae2a62cb6c85bec5adbee83007c9a64cf8dfe85401db3ace18e45561ac13ea7d92284943462ad
+EBUILD tofrodos-1.7.13.ebuild 678 BLAKE2B 506e4bffe84c7af833a70ba1db010c57e097ac17aded77c4d222e1bfc6bb78ef23d77008f96ecd7e3069b0a211bff3de87b350c932dd054176d7bb7ee2e4c9e1 SHA512 43401bdad6358fc79d96015dae8df3dbfdfaee3c02535fe6540660e7f9b6c07eace732df3aaf29864f48d003cee0768d29c3f7b75cf2be5a81f842ef8d5e391a
 MISC metadata.xml 325 BLAKE2B 89b80fe9769278e73ae9aaeea66f6037a6321f25725f6645a0b02220d1ba06a18213bdf71a2d7676150d75f58ba67ad79a4f4f5fe8c8ba7e5dd4d95054c0e45f SHA512 d32c6a8e3e9bd397896145130afc1328ed86f507af35e2ab5b0a9b385462624542728178a06530af5cda863aee10e961bf3d189fbe3d1cf64619ba3d0a8f0b8b
diff --git a/app-text/tofrodos/files/tofrodos-1.7.13-CFLAGS.patch b/app-text/tofrodos/files/tofrodos-1.7.13-CFLAGS.patch
new file mode 100644
index 000000000000..dafdf66838ed
--- /dev/null
+++ b/app-text/tofrodos/files/tofrodos-1.7.13-CFLAGS.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -56,10 +56,6 @@ OBJS =	emsg.o \
+ 	tofrodos.o \
+ 	utility.o
+ 
+-# implicit rules
+-.c.o:
+-	$(CC) $(CFLAGS) $<
+-
+ # user visible rules
+ all: $(FROMDOS) $(TODOS)
+ 
diff --git a/app-text/tofrodos/tofrodos-1.7.13.ebuild b/app-text/tofrodos/tofrodos-1.7.13.ebuild
new file mode 100644
index 000000000000..23f51043153c
--- /dev/null
+++ b/app-text/tofrodos/tofrodos-1.7.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Utility that converts ASCII files between the MSDOS and the Unix format"
+HOMEPAGE="http://tofrodos.sourceforge.net/"
+SRC_URI="http://tofrodos.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}/src"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.7.13-CFLAGS.patch )
+
+src_compile() {
+	emake DEBUG=1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin fromdos
+	dosym fromdos /usr/bin/todos
+	doman fromdos.1
+}
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index f43d82d4e09d..cc4afb89eff6 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -1,5 +1,7 @@
 AUX unrtf-0.21.8-automake-fix.patch 191 BLAKE2B ca81dbbebd8ab2ae786e6291018ecae848ee79a0193c0c176e15052712363f196776b2014a83a2f294d718528588251087c896c87f24335dc4f1fcaf76b926a3 SHA512 7df52c8bc5a6955096fdb3a0e2c151ecec8226c4f703a7d6095f9ca4e4507084b0b0a97b10d853b5da0e27b01bb4e73a6080aec35e5fef14fb015c36bed222ad
 AUX unrtf-0.21.8-iconv-detection.patch 301 BLAKE2B 53d3125d59e44da9c539a13f76d99828be94261e61e367c3582da17cb8625caa75accdd38bfb59b6a7e15a3879ed8ecaf62df3ff26d5e757a86f963ef6c3094f SHA512 57d51baa1160b772896a7fa2ce88c5ea70110d2d7edf6cac121d86849e7352e34ff0cb684161ef9a68e96e886beb6072323c9a66517691e42dce852e04035ca0
+DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
 DIST unrtf-0.21.9.tar.gz 828590 BLAKE2B 832ab672265efa8f1ed5dfdcc73e310ef920199db57cc2be5303c7d0c502a15e7027cb9539ee5a27df66e2589d9dce88aac40d465f87d39770de9c4b5d886b8f SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03
+EBUILD unrtf-0.21.10.ebuild 414 BLAKE2B 62c24573ab5d81a2c8e8672fdf0e68650ea2d538fd52eeb9e3dd0a8ed4fd1bf59126768bec866a1deafad03c99c6a624985ea278a511e4e75844d61cc5b88887 SHA512 c3589f76e2c41a946112691f8cac9a72e9fb0b584b0fec49f1960851b4f08f7d97ef004137b9f4981dbd5918e12a059b64fbe11cb28933c3c9e8212f1361f857
 EBUILD unrtf-0.21.9.ebuild 735 BLAKE2B bccc2ee4512c901399b519aea8ebdf0d6de2a5dc6999d15ce2110715d5322b614d804d1815919827b56aeae1737604e848e92f71ca23329ecb788757734ae1e8 SHA512 00130f5ad9a8ea05bd87c1ae43cefe47a5842215dd69d3195fe33af033ffdef6e719b9945e8523189acebe78d2eaddacc1d56f5b441ff730048cf5274c656a8f
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild
new file mode 100644
index 000000000000..e600260492fa
--- /dev/null
+++ b/app-text/unrtf/unrtf-0.21.10.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Converts RTF files to various formats"
+HOMEPAGE="https://www.gnu.org/software/unrtf/unrtf.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index eac59e36b3aa..ce46ee808646 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -7,11 +7,11 @@ DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a7459361
 DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
 DIST xapian-omega-1.4.9.tar.xz 522100 BLAKE2B af1d01d918ff6b6355bd3ebdd28883d7f833384ba7ca53aa7e8affef77d71bc74602476ef7c6a8b11b67a60e0ff2e007e0d4da38020ddcac9d7ac7f2df4774d9 SHA512 3e784691c7de807a2eb9c00c97e03cfb7e66686d54e0ee572facad7bcfbdcc2c7aba4b60996bc56657a5ecabc79984e838b9d207cf6f1b7df1df90c108d17d1d
 EBUILD xapian-omega-1.2.24.ebuild 1265 BLAKE2B 3208b0fbbacfe32abde89176a4f4615a9cc848e7f37a9f23333309da9804b457713a9a7b774d62d97043701813996ce53abb689bf944ca1cec1262510f61156d SHA512 8f8902b4d7843bb2a70e1c673b6aa78e5fa17f248709a9c62d03ff65c3a47784b98110ac8c3f73dfc8772f58094b96ceea41b11c7ddac17744714fbde6c55674
-EBUILD xapian-omega-1.2.25.ebuild 1267 BLAKE2B 66fd1074900cda3ec72d3bcee082525cdace6f1404e4d16c7d780dac09b6567b69fde76363d4583a716e4e35f97e43d51830ceae54fd9fd08c22dae1cd1818a8 SHA512 e640f095c198cdc54caa76b1240943ac3f7b463831108c1fca7b44ca841a7b9b4899166af633b2a9b5afb6ec2824c4d34b10e50173c28d8377aa4f270d213714
+EBUILD xapian-omega-1.2.25.ebuild 1266 BLAKE2B f1f024cd920aeb977a8132169f16b1f8d437852dd85107722436e21c76a0d138e902bbdb01a02ab4802a286ec7684fd2785cf1173f6c5278e946070d7c889bd7 SHA512 7fa49934659ccbd30bf1dd4ea47000fe5ec7278c77f31000ea4cfea1d80165c46c6213d5f54c01fe6d46c0e412cf4c13753a0563f84e0615241447d1f6e9944c
 EBUILD xapian-omega-1.4.4.ebuild 1156 BLAKE2B 04daef4ad0d3cdac10fc657b54cb5d21c5fa445561a51b1add18db624ec97ad43531597ffce51648ec978fc39f57760c61e1b120cf660a1e8b452470311f2a97 SHA512 006fdcf2159d49895786895245f7236dda96d81fea5e6b80d707083a7cc17153aec1969c1a30a6677a0b67e39ee53376eb507a9a7efacc12057b8dba070fcb66
 EBUILD xapian-omega-1.4.5.ebuild 1152 BLAKE2B 1cdca6a87ec353a468a65a7dc5df903e452128c8df66930d3b7eb651963d211305962cf5b415dca9a56475ff782c4693aa34cd2a91e4d2a444e6a1d2f00b5144 SHA512 540c43a135aaab12509e155b188e17f768d0b9c50a4170f39a29d815532aea4c66c24c65af270c7b906321527f4795a06d325d87b0b67f51600a0da488408944
 EBUILD xapian-omega-1.4.6.ebuild 1159 BLAKE2B 20e6767964ec6e986b48c02758c2acabee7ad2d6ef27308f92fa2098d02a07b4a7266b217b46b746e37c210c5514d2541350c4fb813e7ae3f228ff6f6ea21aae SHA512 0c152b80fa9f8495290e8869888f93866de076498e0ac33471b10e520bec2b6a0149d0c6d4418ec25d450c4f815721291e08e090619feb1ae809bb4f1dbee732
-EBUILD xapian-omega-1.4.7.ebuild 1153 BLAKE2B 0bf8f9dcf1b266523baa61009cb349758a427ddf12d0159106dc15f9b9092fd00983317fb9f4de1a94f257d5741949094f037f78555193a4fb673e19030e8dee SHA512 0a54fcddcd0e0eeda0ae3126e795fea947d785b6d91168a963484cbc04d3936191607ba741ccbc5be11541c7a2d991bc8e71bbfe9dacd87378f3b56ef597044e
+EBUILD xapian-omega-1.4.7.ebuild 1152 BLAKE2B 4ee3adedbe9750ddcf70814f1f02ffb54eb5ecdc204a57efba8cdf0e8ae6425711f93298605abbffd3feb4c99c39976f87ee67101d17a68c4a70be100f4652e1 SHA512 c80dc0bf1251f6257e045caa880ea43ab2dae50862e045f194b6317412b265228674df840eb2be52638098fbf3669e2cbfe0e59d2a6968b239e46cc02c80903d
 EBUILD xapian-omega-1.4.8.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
 EBUILD xapian-omega-1.4.9.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
index 42474c02c8b6..97de00d3fd40 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/1.2.22
diff --git a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild b/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
index e9f901545e57..a21ab121fb6d 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index ee618d453d27..0e23b7d6f792 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,5 +1,5 @@
-DIST xlsx2csv-0.7.2.tar.gz 188520 BLAKE2B f0db947e0f2a69997f1c380fd1f6427fef9ff354dd8ea68fec06767a5222e4a1163b8401be3c40d9075fcd1b57e3ed33a046e8fa881e93d5e638d103a98c417c SHA512 c55535271801a690ed9ff28c2572d13cdac0efd206685a2119b73d1da7b4a46754da60782b36f7976bc5dc1b478860430848ccbee347824aea1a6556764c5922
 DIST xlsx2csv-0.7.3.tar.gz 201482 BLAKE2B a2268e584097777d28f2565a19d0f271cb694066e1abffffd7578ecf0271efd420af63932eaea4389c062e050da257fa2f7164c9de7cdfa4ab3fd416692e7968 SHA512 855fcce9ae6ec51c46673e085a456d2862912d0da5130fdac34d88e5612c64d2bc0674c13b3bfb6cd6b7017e513fe0924dbb594db543020842705a82b6006e8e
-EBUILD xlsx2csv-0.7.2.ebuild 544 BLAKE2B e990caa76a47651d6228cc6a0ea2b9f2e620cf2119cd3ecfe77fe3064c9ddd8b865f3e317f594c472384a1bf0b139cfbc1df613ef7bd4ef319081620836dead5 SHA512 dd0ec87bc91079bedf57ad386b7ef403e6e0317f2a1edf5ff379788c7215567c2531d5970d5f7acd301a0eba073512726d6bc28c3919c110bc8ac0e5470201a3
+DIST xlsx2csv-0.7.4.tar.gz 212472 BLAKE2B de77f4d199bd5fbb43fb4aa775aed9b36aea4c956846be42e9387b79bf76727ba457a0c54db3b4803376b82af12923f21786aa34d21542e2d6ab354be33ad3f3 SHA512 771af30dce63b64272fc8d4dccbcab2106f60a2c9d33370b4d4034a21606e5726c84d963d59e88e2aa124c60f62fd57831ca5fb442d7540474ff1d688da9aaf6
 EBUILD xlsx2csv-0.7.3.ebuild 544 BLAKE2B d6380cc49b1f277049c6730e5c058849ef4995a3c8589d73f2d6ef442ebee072a300fb018ca6bb35cbbd95cc64737342dac73758a53b624c0fc85ae91f022963 SHA512 c58752c07e4aec3963b50e2d47d44d8e608d5144b2205bd30e7c13be4b5097fe029d39275fecf2183e58ea348f8d4ae80e91a5ba155080d3a348728c920f6313
+EBUILD xlsx2csv-0.7.4.ebuild 545 BLAKE2B 1d2b7ec41d494a5e022277f6bc09487ce4989d60e461322b59f546cb2ae8b6d7ca0b28b67fbc83d3b76a28f5f18c47dbcd7468dd942edc49863bd3aa0e6381ac SHA512 1b926a1733593ba9a115879b5a9286c3459f4f8bf60283356bd79d4aaaffaad02eaaabee11884ebe3d0c59f06215b1a4260c99822107cbfe952faf4b0072b98a
 MISC metadata.xml 385 BLAKE2B 6392216bb79b39e6121a2b6e48f838c04acc0682e1cff0c4c39c68cc7439edb2ff924b817e6bef0e94af24c64b19e68c897d5ef620bee4c171004a7420f7e151 SHA512 e608a317791c590b9dc226f44cc9ddfc2c2d4ebf39cad1b41d230d14549d2718ad09a8cdd79afc2c2e75f4929907ea14d4944923013e00001e9ab0e87c58619b
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild
index 56d36da399eb..42b5982077fc 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI="6"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index e540fe33a98b..c36ad2bc878a 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -2,4 +2,4 @@ DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35
 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
+MISC metadata.xml 578 BLAKE2B ae500988e52962a46d0c79c948a163f7d3414c230d14ae344d33b09979085cf400ec38e911fe54f71da6035f40a795cdb9b70ed2c3299b9e37d0e6e3a77fcb7d SHA512 09529a22484d9b660b11b70137cf7e113ee07af4de0c58247d9f6dd7c9e85e222111b209b71dcdb342e734897fa0243b5f9a83688fdbd649584fa226a36acefb
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
index 30d3057f57c4..14c1b6f3de84 100644
--- a/app-text/xmldiff/metadata.xml
+++ b/app-text/xmldiff/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A python tool that figures out the differences between two
 		similar XML files, in the same way the diff utility does.
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 0f5166c99672..f583bad7e7fd 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,5 @@
 DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
+DIST yelp-tools-3.28.0.tar.xz 210496 BLAKE2B 2904b0ffe50f302d7f0938fecca74b37f6d070fe42fd681dd96b3a70b73244f65e204c34bb6f6ffb2b5bcd3400334b3d85a82807793b2bd30261c616382b8be6 SHA512 0b5adcb746ffb2b9c60303ef484dac01fbb59a06abf94bb8ec8a66bd573451939299688dec088a7421eab8f69ec2d7628475e81720640f0cb5b947a8d410ed62
 EBUILD yelp-tools-3.18.0.ebuild 665 BLAKE2B cca32e98a9cbcf49457795aa608955662f8a58ab7276b24aed66b5069f1f67de5c6ea5c244c4ec8dba26670b996e3d1554d210888fe339bc1f7b299b32aca978 SHA512 265e23a9f7286e866e85c431dbab8bed4f1c6477ac55029f1e55680cee77840be72260470d6bb81590174a16a0f5affc8c54fe8d072bd834ffb666f4d685f8c6
+EBUILD yelp-tools-3.28.0.ebuild 654 BLAKE2B d93a7ea632e15f4617cdd21a1a82d619c162158797c6da115eddfd497250aab0efadbcb87515216109861830bb7b6d11200baa3d757bba006dfebf2b4160ce26 SHA512 d0af1aecc928f9c6dbdef5e6866f6f5070a56e56a619cbba650d004eee88f3e6beb0ce2de357115102e90651f4acda467e547cdce99adacf11c53ee07b81ecbe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
new file mode 100644
index 000000000000..a991a8a83649
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	>=gnome-extra/yelp-xsl-3.17.3
+	virtual/awk
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 4666e80694dd..fec106ff0a7c 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-cb-0.1.7.tar.gz 6971 BLAKE2B 814b0ff8e3d33c85e06ceb3abb315aa16464efda8a5c60554eb7ac8ce3babcf33daea5122e1ca201c1fbffb616a1eea79ba40b74e0c325ec23a7c2dd249d2e6f SHA512 a48c70bf534a8798d94c1b15382dad229d37ea5f5cbef8382ce87a4366c3607609577f10a8eeb2056e2aa539014e6411e08c879f5359f80ff676cb55c6ae9af2
 DIST zathura-cb-0.1.8.tar.xz 5616 BLAKE2B bfce33d56f7a28ae66f8bbee4bbb164238abba7ae3de0e7d9dd0874516b703a4e841749dd825a618aa09204e06a3fa339832412cd5b1cacf6814c4292634052e SHA512 ca9b57e59f3955afabb246b8f71989647ce4c86f7f59aa13e4d7150f22dfb1bd64642efc155bba5997633d8bf5144e7ef42bea05512a2c2d20e13fb180c89cb8
-EBUILD zathura-cb-0.1.7.ebuild 1191 BLAKE2B 12a7784c95acc44a25ad571fa203063c332ad91af7d8c8b1533b0a9dc84350c4e9a07ba1fb81b37bf78178d4ea3b01e267185a3dba8a4a10d3dacc98bd3868b7 SHA512 8d1d8fbdc1e54f4238fa8e31df10c71662c194ec60b63eea32085276b86b9de115c9539c5f6260aadfc88a95bee1b6c3116badf83eb6e1e2c4d0603bfc256220
-EBUILD zathura-cb-0.1.8.ebuild 656 BLAKE2B 6aa2ffbf504a2a5570b8a18c380319bb44a75cc1663275bc6ed0192422f2b1d4e781933012d416a4228b4848ddde1b1f824d9d39c077837940f22372b37eefc7 SHA512 2bed50a0662a4a7d19a7258cfdf858b5e26ac0dfc3fe42e81e521c288af868272e8d54ad2399c482933b7960c2ebfa4590377318acb981b5d67eef1254ce0df8
+EBUILD zathura-cb-0.1.8.ebuild 654 BLAKE2B 24002517066047c86d4e716bc27bad39890193376ce5a3e205614ec161dfe8d04aea57ee8f8ec97e89d1a7bc93ea02e129aa48582a8ab26e3a42e18e23420741 SHA512 f7756d761c06f0f1451759cae82a535c3fe70e202a09d0327c6825417df0100e8bb561bfef0db62ee2aba5e13f04ca2de7775e38de592310628af132d1583a96
 EBUILD zathura-cb-9999.ebuild 657 BLAKE2B 0836100ed329f8b153dfe4382ba22f9175c09812d62964eacdd628061758297e90a4a2c477176e02b13a95d5036072efc5be568873e4efb8f257e87dc0288a42 SHA512 bc0e52634152a0606b9107c9e0e825375b13fcf284ed7108552210a0bc3942e12d75c36f70f8e8a574927bfd0634a516cf7f8b6024e7d5e323687a339a3f5d8a
-MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
+MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
index b7ed6eb4ffbe..9e0907fe1628 100644
--- a/app-text/zathura-cb/metadata.xml
+++ b/app-text/zathura-cb/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mlq@pwmt.org</email>
-      <name>Moritz Lipp</name>
-    </maintainer>
-    <maintainer status="active">
-      <email>sebastian+dev@ramacher.at</email>
-      <name>Sebastian Ramacher</name>
-    </maintainer>
-    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
-    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
-    <bugs-to>http://bugs.pwmt.org/</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+		<email>mlq@pwmt.org</email>
+		<name>Moritz Lipp</name>
+	</maintainer>
+	<maintainer status="active">
+		<email>sebastian+dev@ramacher.at</email>
+		<name>Sebastian Ramacher</name>
+	</maintainer>
+	<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+	<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
deleted file mode 100644
index 1fff9b735815..000000000000
--- a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs readme.gentoo-r1 xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/zathura-0.3.8
-	dev-libs/glib:2=
-	app-arch/libarchive:=
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-
-	FORCE_PRINT_ELOG=1
-	local DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
-		app-arch/unzip for additional file support."
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
index 3e5717e543fe..2fad557959ce 100644
--- a/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
+++ b/app-text/zathura-cb/zathura-cb-0.1.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index 34f9c8f42966..ffb1ef22683e 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-djvu-0.2.7.tar.gz 10909 BLAKE2B 6a55927aa99ec5d29b8f24922c4871c050c25f6c166ee3435390488deefd13f1f81f4286a0c3cd348e4f550e1b4082b9a7c5c7cce40371f8fb62074c87a2d372 SHA512 f0a33f53caced4cb90354e431d180a3b357db300ba5a376051e45f5409e8476105640e92768c2a31bdbbb0b37dea05df24a6489799c556e30336013f807b28b6
 DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
-EBUILD zathura-djvu-0.2.7.ebuild 873 BLAKE2B c7329a9562bcd883ba1cfc042bea476d9a40a243f9d493704fd7655362c1e8c4a4fe6aeae5b509014db4a7a3d8e7323565d727aacc64a2ecdbc8271dcab53444 SHA512 616e7310f5bd94394546dd4cb624ee5c0a9b384064593a6d3098d11cc8669c3417e999e9adfc2c4b1f5a55256535f1633b8d6f644ce9772dd70b967a144bc32f
-EBUILD zathura-djvu-0.2.8.ebuild 792 BLAKE2B 6e99063a0e15746bd9a51df200afec243a24b7c1ae6c25dea998e8f807de14986a9bef66712de5175150e1d1bcdb2e6f1ef1b62c5035b58c60d4ee77e726bdeb SHA512 fba19cbad4e425ac85c54c6613a243e36d069f5d9ea8a00bebe170919e3200ad531d01d0451bcf256df65293be649a435583a66ccf1f2e5428ecfd519161fe8d
+EBUILD zathura-djvu-0.2.8.ebuild 790 BLAKE2B e1d46cea20f9449006092e2ff44263b0d9bb9e8a269801a850dc7182e014c17c12f1fa23dddab820b05a158e03e322a8e9fe3d99e82e6c2ca5ae8b8e3a0bc72e SHA512 4c9809b8a22db671ab492204a30493daa74aed5f86d2b3b7642057a73114c8fc9e556e8f22717e8b82f52a92c4d660c1e2831016dbecd810083d5f129a6d286e
 EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B bee22309631b879837dab88c8d70954ca4ceb4272c7b3074ccc4bdd58f249e709f98252d9d90acd0354529556fa3df019077b5b1863a7daf2092a87111a49989 SHA512 f11599dc27c6b6dec3f66c7af1774a9dcd9790e0f2d38d7ff517a54e630e08031ff23023459c9c554577b38b17602314f67e52a02efa7c3bcc04025d0d85f437
-MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
+MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
index b7ed6eb4ffbe..9e0907fe1628 100644
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mlq@pwmt.org</email>
-      <name>Moritz Lipp</name>
-    </maintainer>
-    <maintainer status="active">
-      <email>sebastian+dev@ramacher.at</email>
-      <name>Sebastian Ramacher</name>
-    </maintainer>
-    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
-    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
-    <bugs-to>http://bugs.pwmt.org/</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+		<email>mlq@pwmt.org</email>
+		<name>Moritz Lipp</name>
+	</maintainer>
+	<maintainer status="active">
+		<email>sebastian+dev@ramacher.at</email>
+		<name>Sebastian Ramacher</name>
+	</maintainer>
+	<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+	<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
deleted file mode 100644
index 528afa9e57d9..000000000000
--- a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/djvu-3.5.24-r1:=
-	>=app-text/zathura-0.3.8
-	dev-libs/glib:2=
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
index 76fcffdc1adc..2a891acd222b 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-meta/Manifest b/app-text/zathura-meta/Manifest
index 355ea6674422..34893da400e9 100644
--- a/app-text/zathura-meta/Manifest
+++ b/app-text/zathura-meta/Manifest
@@ -1,2 +1,2 @@
 EBUILD zathura-meta-0.ebuild 515 BLAKE2B 78ce2092905f66cfd4baa9f6888536180fdba987584d0597ba7d03cf14865741f431e7dac9fa173621ec828e8bec094375fe62a1ad3e7e6f8852f69fc6b5160f SHA512 bce76a30ea72a3bea5d892e758dd7a0665a6e06dbc02f5202055cb313565e72f2993ee3928e8e4c50e3abab167ff4f470877979258e612c718e7510f8c1dfd4e
-MISC metadata.xml 784 BLAKE2B 1828dcb5847efbdff5b7cad10ba17fc6561debe2c8f860863ed158c918dc74fe7851ef21a9dd08c06cd62c4322aaee30b3f1e496d0fcc60a2fd85bc64e20b867 SHA512 862a83f9aef1dd793f72015ec94a778582639c421446775316ae8f7c22a627cce2e09bef70049252617340ee1ff71704a95ea1a78547aec65af1ca8dbe9fde45
+MISC metadata.xml 703 BLAKE2B b13604794f080bd0777de948901a58cbd63e8d435b584b7ab751965778086df991df51c3ac164cbacf9da800fcee2b40ab0dd3c59b001cb3bde7754cc6251e28 SHA512 a1545d6fe0a7358a102e9dcdfe3a365ec396ae93aad3eb678283a1e4b2372e0d37a4b2ba57bddcdb040e07b68512a9d729714bcac7efa2cd4c13c406fdc063f7
diff --git a/app-text/zathura-meta/metadata.xml b/app-text/zathura-meta/metadata.xml
index 2482ebc42ae1..c80ab57c7e6d 100644
--- a/app-text/zathura-meta/metadata.xml
+++ b/app-text/zathura-meta/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="cb">Install plug-in for ComicBook support</flag>
   </use>
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index ae80cb758549..8813cdb082e7 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.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
 DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d2603a93a3fc05bbbcf036f825a534f9083fda3ea536de7b47091aca63409b54a15bec057b7fb3da687507e55efa779075 SHA512 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
-EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1074 BLAKE2B 33d9faf3af3156f08f3a2ac764c3ef16c2fc32b31ff396eafe1027663d0464f735ba0349423e9a173aeb84498a5da7d3fe13606ae2e46a10eb5b20fa0bc5a08b SHA512 99caf865cbc7751aec41b38e1d179d52bed4523c1813554413b4631fda9318726cffdb476de2777fe35f80ee463c2364437e1b30e80271b79c106ad7f5b5bb11
-EBUILD zathura-pdf-mupdf-0.3.4.ebuild 795 BLAKE2B 74f00693c91c24690221b7fcc7634bf91239a2db9d257562573aebfc000b27fe2c402275fc73cabe41bb811266b3a5c28b6344858f05e8a10a60ebe8e64d5690 SHA512 27b492f2f2776c5b8c68245c39dc1ecde682692df1db6277659ed9412365b3ee89fb88050b4b577fd59d3db1865f02a442d477cf24d2439332885577fe586529
+EBUILD zathura-pdf-mupdf-0.3.4.ebuild 793 BLAKE2B 480774b820e6390885f0a6901fde83b5c7ee777d4921bd4e6a105e325743222c4c8793879249734e33ab2ddb6170056105454e52ed6d358870c7a1f24778d166 SHA512 f0e9fe25289a90e838062f37522255ee6256b04a0deaadc9357f996eb7b8d735903bbec10421c4e985461d4454e697004806a83c756568adca76c54a7ccbdfb4
 EBUILD zathura-pdf-mupdf-9999.ebuild 796 BLAKE2B 623e1c0f435e95826791a71c3ce66c4448ff8c47f9e13dae411d86e8c78b4e6cc630333263eb9b2fc94bb41f6d86fcb871da340fc78509e894fa13613785d934 SHA512 54e52e1405959ee3fdf0ac819dcc1941a370369291c9b480256fc2b404a16f2c839d1f29110cc2e7728de148423bf372c33c2aae413fb3d658a74777bb577fe2
-MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
+MISC metadata.xml 672 BLAKE2B 539ab88c5ef3fe3ad7ca25d9856bcf6a7755e09c479631c1cbdd835aeb398d2f6052af0980afc35771312397b6858fca2271f5aa8ee64fa8a57130f05b7594ee SHA512 288bfcdc265543b1d5d364af4fe0c6dbdeec0f30019b683ef0bf32619d87ada509cce47c141aac08cf0942f7ad74d1a453e6b5303175ea591e2f661ba044882a
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index b7ed6eb4ffbe..a4adf124756a 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mlq@pwmt.org</email>
-      <name>Moritz Lipp</name>
-    </maintainer>
-    <maintainer status="active">
-      <email>sebastian+dev@ramacher.at</email>
-      <name>Sebastian Ramacher</name>
-    </maintainer>
-    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
-    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
-    <bugs-to>http://bugs.pwmt.org/</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mlq@pwmt.org</email>
+			<name>Moritz Lipp</name>
+		</maintainer>
+			<maintainer status="active">
+			<email>sebastian+dev@ramacher.at</email>
+		<name>Sebastian Ramacher</name>
+		</maintainer>
+		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+		<bugs-to>http://bugs.pwmt.org/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
deleted file mode 100644
index 93ca970998ab..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs xdg
-
-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.12.0:=
-	>=app-text/zathura-0.3.8
-	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
-}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
index 91edb9262dcc..33b1f2deedb7 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://pwmt.org/projects/zathura-pdf-mupdf/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 9dc36f327456..186100c1af70 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-pdf-poppler-0.2.8.tar.gz 9504 BLAKE2B fc7ac4b4789f23d03b084dd90489c2b6e6fa0a93814140cf563fb826ed5bc7bad2cdcbf100cc6c2e708ecabd85be177c88a4faf9a0fc910bbfcddc1a515a7373 SHA512 644a36e31f89ee87a4d9bd50d5f9e209f06b6755af00009756422c89ad2ab50a97dd2c03a037b4e22bcf04bd620bd5b5ea55db7c380da9d3cebe0d1c00e18b9b
 DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
-EBUILD zathura-pdf-poppler-0.2.8.ebuild 858 BLAKE2B ba83d7d00563e03c080154f5e3c36964eb587dbd6bc6bf78bad02d5e7f0134e3c463dd793d6e864901c5b9569a773a4ec0d0b68bb5fd17db5b093980bf724126 SHA512 b751fbed29bae1a90d7be7e4346176c76266898abc5526a010a82e0c0c398898e138ea464fd2dac76316a470a8ac97344e2808dfc13021999a1d18225c435f05
-EBUILD zathura-pdf-poppler-0.2.9.ebuild 744 BLAKE2B 974ba4498e2ebf45164ba6d28a813c3252e890e3dc2c8f97939c2b600b2aa2c3c0dbd33c83a6cd82bfafe8fb201908bf338fb5eaf8ce4b53e450d0d65841af3f SHA512 d0456347fa4fa780791f3968094548c1531ffbfe006489d7650b60d395a7d9a79e7988f15c72164c64732fb49e916ae4b2fff49fd059d24303557ce651ca24c1
+EBUILD zathura-pdf-poppler-0.2.9.ebuild 742 BLAKE2B e3a1fbaf7947512832385b3b8ffd47a56ca09cba148a5d80af28457a9d041563eb5dfdf7bb89a0cd590f990a9c4265349a8ceb832c77b6ac1b0dd185b730125c SHA512 a8504ef444e936e214b3621ea3111d82a0e86f89f087531f9f82b9ea05e2648c9aa11adc19c923e33b6bee85330bc8fd9bf782ae78801dc303fccf62b0438ed8
 EBUILD zathura-pdf-poppler-9999.ebuild 745 BLAKE2B 6abb817bbf4c1db7542f2b59e69eaa0785074578d9c32f7a37efc86dbe89b9888b8093061ebf4867727b52b205f941a7e5e453650006d4dd913e1bce851ae5cb SHA512 daac708c3c2b62185d843a8a649149165e028006987c7d0bf57f9959b7e01fbe52006ec3b46af9b0def91ba334bec0bee148d565b4749ca86ed1d1fb66246a73
-MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
+MISC metadata.xml 663 BLAKE2B 0e076d5625ba01810d18d1494048c619129ef68473242f7cb80efc51d056b7a918b2297d045514b3362bd5120d96166d1c83ddfec37c5eee3ece733b29736316 SHA512 509bc36f10297eca9a9f6290502a5531729146abc95ad5cf0b8052cbd478a05bc868a0285e9c52962a5852079e962ba471eec216885444a6206f7bf3a4b1b20c
diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
index b7ed6eb4ffbe..39371e1e7ba9 100644
--- a/app-text/zathura-pdf-poppler/metadata.xml
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mlq@pwmt.org</email>
-      <name>Moritz Lipp</name>
-    </maintainer>
-    <maintainer status="active">
-      <email>sebastian+dev@ramacher.at</email>
-      <name>Sebastian Ramacher</name>
-    </maintainer>
-    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
-    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
-    <bugs-to>http://bugs.pwmt.org/</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+		<email>mlq@pwmt.org</email>
+		<name>Moritz Lipp</name>
+		</maintainer>
+	<maintainer status="active">
+		<email>sebastian+dev@ramacher.at</email>
+		<name>Sebastian Ramacher</name>
+	</maintainer>
+	<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+	<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
deleted file mode 100644
index 1ac980534872..000000000000
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-text/poppler[cairo]
-	>=app-text/zathura-0.3.8
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
-	dodoc AUTHORS
-}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
index 321492b7c9f8..ebbe11bcdbf3 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index c3037701f7aa..21322046fe96 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-ps-0.2.5.tar.gz 5845 BLAKE2B b716381b66f54626298544fab6ef6f857066db50b027e1b729cfa59e33a23fda4cab09ba8dc33317725058b6942ef84fbc7c24aa30a4d7db2c73f7ac1b6ef137 SHA512 043898fdca56bee28a8e2af61d3216af25e222c0a137737e599881bb21e805dd8a609ff2901a50763bdbb34bf2e3fca2afaf1a59b715f3ba6aa067971c99c258
 DIST zathura-ps-0.2.6.tar.xz 4336 BLAKE2B 9129ae5c5b6b7452fbee720ded0a69d4ae735811b81ec49485fffc81833e5e0adf0563b005770082adcc17dc90d4650b5bd309154b64377625c2cef86f0b7978 SHA512 6631f9b1c951b6f91f2a5217c3de47176205102206f15b596fb21285dae8d01fd759cfaca1b8a23bf47166dfbc3f8cf6061ce5a4d7a1c3a2b671a3beef5a07bb
-EBUILD zathura-ps-0.2.5.ebuild 931 BLAKE2B da60bdb706487c8e464285a963722cdcac0d979913b65ede2aa1d7d0bb3cfde63927f84aa729bff86f8a8380e245360689c6df6a6219d93fe4c224b7162ce41f SHA512 64e3ca1aead820f3c49c4d65d06b5f7ba3a39f44f0585efcf5daa4a7d4aea01bd59735e6f0132688cd0c5246d41c7feebd9d76c083255a2b5048aa616231f1c1
-EBUILD zathura-ps-0.2.6.ebuild 674 BLAKE2B 3e5a6aaf7d9a6c6afde939c7fc744c3bd7a8671b432b94eb9655fbefc7446e037a1e8edf0d45b4073aa59c539756b7b5805d65163414a43c6225cb14d647fce4 SHA512 540a3a38e5260b0d7266a050f13cd051e7b4fb744b51dc6d21389fe5dc0b5c68fb93cd57039414d7ce5e1f958f96e8cf6f394c73d3a36c0fd35deaa3473a7a5e
+EBUILD zathura-ps-0.2.6.ebuild 672 BLAKE2B f5eb15d1e5892617a8167a5fb56cc5f13c32f7218e51a769409497156ffd954277a99213c6afaff6a69cd88dbf5a71289e50d3d7fc4775e1ba55a57503128efa SHA512 359a2ec673a1278c13ea285fc5cf199081746361bd92d6ab7efa7d2e6fa56a71751e347ad9d566e817966d7f8416f5454f6d248334c583540ad79d284e42c1c8
 EBUILD zathura-ps-9999.ebuild 675 BLAKE2B e9c7f67fc8d86bd307acb311d28f04a181511d70509ae777b2e096af40dd6518f7382468c423dcd368a3ae3fbec0c71bed17a6dc02b4807694a46d0df42066cd SHA512 e821086cbf8442d13bf4c08ec7cdb59d4eec41d2c2d09fb63a1281c8a5eed2e9daa7af5d9d618b405d7ae613f50ede25f1eece6638c96edf09f85741b6eb15ad
-MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
+MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
index b7ed6eb4ffbe..9e0907fe1628 100644
--- a/app-text/zathura-ps/metadata.xml
+++ b/app-text/zathura-ps/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mlq@pwmt.org</email>
-      <name>Moritz Lipp</name>
-    </maintainer>
-    <maintainer status="active">
-      <email>sebastian+dev@ramacher.at</email>
-      <name>Sebastian Ramacher</name>
-    </maintainer>
-    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
-    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
-    <bugs-to>http://bugs.pwmt.org/</bugs-to>
-  </upstream>
+	<maintainer type="person">
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+		<email>mlq@pwmt.org</email>
+		<name>Moritz Lipp</name>
+	</maintainer>
+	<maintainer status="active">
+		<email>sebastian+dev@ramacher.at</email>
+		<name>Sebastian Ramacher</name>
+	</maintainer>
+	<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+	<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+	<bugs-to>http://bugs.pwmt.org/</bugs-to>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
deleted file mode 100644
index bd1db8d44519..000000000000
--- a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs xdg
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=app-text/libspectre-0.2.6:=
-	>=app-text/zathura-0.3.8
-	dev-libs/glib:2=
-	x11-libs/cairo:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	myzathuraconf=(
-		CC="$(tc-getCC)"
-		LD="$(tc-getLD)"
-		VERBOSE=1
-		DESTDIR="${D}"
-		PREFIX="${EPREFIX}/usr"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
diff --git a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
index f9203d17899e..94dab249fb7a 100644
--- a/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
+++ b/app-text/zathura-ps/zathura-ps-0.2.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 7fa78409726a..f27a17fbe5d5 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,7 +1,5 @@
 AUX zathura-find-libm.patch 896 BLAKE2B f28a1a967d274b0840f64bc94b7179bbcc5cfcb025b8450604c2e928cd4199e78a190e7766a33dd5b513d128f6567be45e667c75605397892745997b97c3b9ce SHA512 664440b3ca4e241f4d2072be5dbc52b00d962c264d5698649d7843e5ea54479a114a8c6ce731f4471fd600603898f4e571d23979aecd0447f592f0d3ebc51f2a
-DIST zathura-0.3.8.tar.gz 174962 BLAKE2B 44d91564ee42cea80357230c789160e37774d5ae29f8de8bac1fbf734a28e7b862d58d807fe3fa01d323d0baaf88a3960243f8022893c3ad40b67ba8d8a1ae6d SHA512 bad10eaf6642885f96850a01921dc1580357144d8b9b27e88e7765e6fc8e7d8f8c94c240904469e1e6b22114be5117a28a24c87183476d2c89d93f27a5083109
 DIST zathura-0.4.1.tar.xz 148592 BLAKE2B c6fc495ce6413057dc86be95272e8178f32649c68f95052b2db00526b7805b1f6772c628902409af66ba88983171b5456f4cd26c77fcbe32023bf99d1081a55d SHA512 370e7fa12a3a3a2a973870a99f7b2b910c808d6932c1de9093630d7e8bd7d97feb4b7df713e9ac33c7927849b63174a899ce6eaa60db89b1c47d6e13ef181ad6
-EBUILD zathura-0.3.8.ebuild 1410 BLAKE2B 78e227aaf7716eadc6fc448b8f5d8bd0b1e2ab2f90914474270a7ef3700fe89225b8220cb46f617687d669b38c76d77f87dcd9f68858e79d5b16b593fcb89b1d SHA512 6148c69fd47e0342124ba49a6792422baaf4e9644a04473c42229f2e20c4f3559143f115703dde1d70e380a65b95f394acc19929ab59bb276c640c1d5e0697c1
-EBUILD zathura-0.4.1.ebuild 1473 BLAKE2B 90eeb93136fb2df9f339fce141149b0b8bcb55dd70f6cc28d182df37e88db28f76c819e53b02dda9b1a7a572c12ec90eade8cd3c7547051299e94a61678884ef SHA512 f668314e56613a62f43384e8a5b537f91c5f6441c8134c8d15640c9486c3d78363615e336aacc7cc55be48b483998935074a79d530eda39065119d74c5172eda
-EBUILD zathura-9999.ebuild 1425 BLAKE2B 389bf013932b8e990b85ce274159a4033852b1b39acdfb796452ecd6d99ff5506f8d2fd2f3c70d39019dffb9f285eb8a9e79813d082b305e3e2c08e369e2086f SHA512 f396dd3221ba19a8e9e666be3d21efa4f1ea684460de67177ee0d07781b77a830ff1c6fd42c42700c8811eec754f0dcff11b3b5b5f6fefd7ad666baabf63f4e0
-MISC metadata.xml 823 BLAKE2B 745fba701ca26b7b430c8b55393ef77dae3175068b0afebcd6e2b3a9ac90823e542734464e4c1852e1306963c06663d13a507b6dc4967b54cdcc12c117046f81 SHA512 4bf7d56010d989c286976ece526874abbeb90449d940d4ff550f5c084ded0e028998c7b021fc2e3015ebf202d43a5d35fa9b4e8083d6eeadfb9c2915cbbeaa87
+EBUILD zathura-0.4.1-r2.ebuild 1450 BLAKE2B 8e24dbd957d937983f1fcab3fb2f3ee0f26bde6a842ab90d89feaed077ed26443f2d81d7ca5d92bbafb4becb2bb3787109410fca39d8876f7c7a54a34103d491 SHA512 28cc323afcde7d575b1ec468d56f9db4a3e9dddb560f8d638d6a3dcde96bde3184b2b1e9c7bb3a4b217d5010dddf29929e8b2748802dd242b136494ea506813b
+EBUILD zathura-9999.ebuild 1404 BLAKE2B 39ec6014b09175029fe05023a1896ae44a20f48497b61ae9b1120770b52e22de28929d0a922ced1690b48a27de3acb769616f19e52ecc9785b8918bf5340e2e6 SHA512 072cdae46c679f6f0453e881baa83b3474f2458e8a5d9a9298cfe6d9165ff232cbd246a33166d21aac19d3c9c3fb17f1d96a8b30b61085f4d0e242766a69632c
+MISC metadata.xml 827 BLAKE2B ce7ca0240a5fc4caca62988ca9d849aa2c010ff36f9ca542f45c49d47a04669e66cd6e1c891f3ef1c36b5eed690d7a6bc134d7130be7ee7e0ee987a428eaeecf SHA512 fba70c39e525376da98422f05601a327e68cb7bc904688ebb3b17854b1123e8baf066cae45d82d3c91d9ccf24b64241a6541484cfcd342fecb2a5f7ca44af02f
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index 10adea682545..f01011d4cef6 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
+		<name>Mikle Kolyada</name>
+		<email>zlogene@gentoo.org</email>
 	</maintainer>
 	<use>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
diff --git a/app-text/zathura/zathura-0.3.8.ebuild b/app-text/zathura/zathura-0.3.8.ebuild
deleted file mode 100644
index 77c3802a951a..000000000000
--- a/app-text/zathura/zathura-0.3.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs virtualx xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
-	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
-fi
-
-DESCRIPTION="A highly customizable and functional document viewer"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+magic sqlite synctex test"
-
-RDEPEND=">=dev-libs/girara-0.2.8:=
-	>=dev-libs/glib-2.32:2=
-	x11-libs/cairo:=
-	>=x11-libs/gtk+-3.6:3
-	magic? ( sys-apps/file:= )
-	sqlite? ( dev-db/sqlite:3= )
-	synctex? ( >=app-text/texlive-core-2015 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-src_configure() {
-	myzathuraconf=(
-		WITH_MAGIC=$(usex magic 1 0)
-		WITH_SQLITE=$(usex sqlite 1 0)
-		WITH_SYNCTEX=$(usex synctex 1 0)
-		PREFIX="${EPREFIX}"/usr
-		LIBDIR='${PREFIX}'/$(get_libdir)
-		CC="$(tc-getCC)"
-		SFLAGS=''
-		VERBOSE=1
-		DESTDIR="${D}"
-	)
-}
-
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
-
-src_test() {
-	virtx emake "${myzathuraconf[@]}" test
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura/zathura-0.4.1.ebuild b/app-text/zathura/zathura-0.4.1-r2.ebuild
index 49a7c2c24213..834f69ea245a 100644
--- a/app-text/zathura/zathura-0.4.1.ebuild
+++ b/app-text/zathura/zathura-0.4.1-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"
@@ -23,11 +23,10 @@ IUSE="+magic seccomp sqlite synctex test"
 
 PATCHES=( "${FILESDIR}"/${PN}-find-libm.patch )
 
-RDEPEND="dev-libs/appstream
-	>=dev-libs/girara-0.3.1
+RDEPEND=">=dev-libs/girara-0.3.1
 	>=dev-libs/glib-2.50:2
-	dev-util/desktop-file-utils
 	dev-python/sphinx
+	>=sys-devel/gettext-0.19.8
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	magic? ( sys-apps/file )
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 1b9071f73e74..fced4c2aa2b9 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -21,11 +21,10 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="+magic seccomp sqlite synctex test"
 
-RDEPEND="dev-libs/appstream
-	>=dev-libs/girara-0.3.1
+RDEPEND=">=dev-libs/girara-0.3.1
 	>=dev-libs/glib-2.50:2
-	dev-util/desktop-file-utils
 	dev-python/sphinx
+	>=sys-devel/gettext-0.19.8
 	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	magic? ( sys-apps/file )
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /app-text
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)