gentoo resync : 18.11.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
commit: 536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree: 697733f5cb713908dcf378e13fd15a798a906a91 /app-text
parent: f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)
86 files changed, 1988 insertions, 1107 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 47feafe47e8a..54a8591f9879 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index c544671f7964..f08981fd5a16 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,5 @@
 DIST ansifilter-2.10.tar.bz2 436180 BLAKE2B b00a76867c17c63fa457c6e3ff6a57cfaedb6218df240d8afb52ec4acb46745f02b785fdbde294deb606a77564b9e6deb52e652cc4fdff32ebbb4c3a2ffcc846 SHA512 b2b2f7ec9d3343701cb1de19a1a3cb678ca9a908cc72e26e0eaf1e4cdf61cf7237edb4221bcde3159299aee3c05a84c46cf5706ad4f74b96ccec41b161ad44ec
-EBUILD ansifilter-2.10.ebuild 1000 BLAKE2B 06ba3ae0c29d11bd919576a98a01df3784354e97fe0ba8a2c3bbcee4af19b302f8b6f0680dbcaf5261a8019aa862d15b30a02c7e3c5add469306c750a5301bc5 SHA512 132461f3f691fcb2c3d4baa3101c03e04689095955b6391a77d12153aed9d2948c74a7ac4bdfca738b317a08d4621d9d465fdfeb82e6f188e1ac8740ba0a4b85
+DIST ansifilter-2.12.tar.bz2 438051 BLAKE2B 112993b6f93d5fce6fc72c5e2d51dd99ba550902212098b3e75a6b4d910ccb9f49e9705a9f93d8d14f1423ae8a36e2ec0c442894241733a58a3b2a6c742e5691 SHA512 fd4e50f654c5e975f96bed8af1705c21d47d9e7f87f22411b2c7403362d4ee09c1be6fb5b31647daf6bea509d66f44e379ef7476a116470217d9c176302f7ffe
+EBUILD ansifilter-2.10.ebuild 1004 BLAKE2B ea4e1af02cb1842900fa2e92b92aa2aaa4f4772e7e06a4819e427bd0f18f542caa4e9d44b7a0a418266aa15376a739929374c897cef9db8b33f0b8ec1a5a0b37 SHA512 eb11786afc6fd05adaa3584765a1ca3babf34f3a101664e50150706b906c0c9c4169e043f490ae8976b91d244aa94fd687b89d2e86908979eeec021246f133ea
+EBUILD ansifilter-2.12.ebuild 1006 BLAKE2B 9f8a7175a2c62e5a519f52a829d5045001912b1f72c7320672f622d75e3fb9b78cd48422d2e22178134fdb3bf26d3868dca9d94fb3d0695d9eb6683c2afb02dc SHA512 43c7fa2c5c2ca6d9f936503476bb60c9614d0719d3ad6315ef84cfa9f0855d5ee1cb9adc3322686683216ffc907eb4e8620e8f4fc28ace8713e2042e64c8c0aa
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.10.ebuild b/app-text/ansifilter/ansifilter-2.10.ebuild
index 05823fc22ef7..7cbeb18c1f46 100644
--- a/app-text/ansifilter/ansifilter-2.10.ebuild
+++ b/app-text/ansifilter/ansifilter-2.10.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
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/ansifilter/ansifilter-2.12.ebuild b/app-text/ansifilter/ansifilter-2.12.ebuild
new file mode 100644
index 000000000000..a6d2e9316671
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.12.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/cb2bib/Manifest b/app-text/cb2bib/Manifest
index d8d1291acc4f..2064df34b331 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,3 +1,5 @@
 DIST cb2bib-1.9.8.tar.gz 1180660 BLAKE2B 86a826a9285ecd5ecd266b3935ddfa330153cba4b28f378519b464719d5a2bcaa6043470d36ba5c443202a07a18bbaeb28c3371db07063f0d682b54d2a8fe373 SHA512 717f9b4de3e261e6d22a7e514e2ec5891723572f1624280edc8a980171f4dada6e177a3e95748fc39ff0ba1c137406e38dd14f43a0f1e0995c1f39992842f38a
+DIST cb2bib-1.9.9.tar.gz 1292720 BLAKE2B 7263d09ab077d1029129b81abbf7a745405d476776ab91d4b73dc9799b3d945e46283fe565fee32b08df7a8734c027cbeacf0e7a44c4e15efaa6c992c69f9b7a SHA512 66e81ea8d86cdf374c9e1109d26e02c0b3101608e751ab6bbded76cca42eb8c2c1d43f6a993b9003b6013d815683f644bff7513ce63dc750ffa8d608cccb49b3
 EBUILD cb2bib-1.9.8.ebuild 1778 BLAKE2B 6d381621b9d13fdc8459c95017a7ffe1814278d86112b843b3f3bfa714a38cf9aa47050ba6ec8d3e10adc8a62f590fa42df4eaca91bab8577fc09170e8ba3c23 SHA512 afbd9c421d77e9b46cb341e41c13929dd7a7169cba634dd54c584c39f5d6757c098c931ab149746acfd3c2a9e9782345a88b4b35da975ad7a2c31585d0e8ca42
+EBUILD cb2bib-1.9.9.ebuild 1777 BLAKE2B 3f71e35f3a27fe137e17bfdb0d605fb20b397f1f3144ceb0ce6d14038ef119675cfbd8ae0e3aa54085da54548b21edaf4e8198ab09e2f6ea5354822bda3205b0 SHA512 8092905d8d12e49ae68e204d78289c8a2c6ddf007349e61883183982821248f6a0a04ea946b69e1565c12df3928b06e260a73a85f87b4d781721113fdc4b2767
 MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a
diff --git a/app-text/cb2bib/cb2bib-1.9.9.ebuild b/app-text/cb2bib/cb2bib-1.9.9.ebuild
new file mode 100644
index 000000000000..1a3068c56e88
--- /dev/null
+++ b/app-text/cb2bib/cb2bib-1.9.9.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils
+
+DESCRIPTION="Tool for extracting unformatted bibliographic references"
+HOMEPAGE="https://www.molspaces.com/cb2bib/"
+SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lzo webengine +webkit"
+
+REQUIRED_USE="?? ( webkit webengine )"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	lzo? ( dev-libs/lzo:2 )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+	webkit? ( dev-qt/qtwebkit:5 )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS CHANGELOG COPYRIGHT )
+
+src_prepare() {
+	default
+
+	sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
+
+	use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
+	use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		$(use !lzo && echo -config disable_lzo)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "For best functionality, emerge the following packages:"
+	elog "    app-text/poppler[utils] - for data import from PDF files"
+	elog "    app-text/dvipdfm        - for data import from DVI files"
+	elog "    app-text/bibutils       - for data import from ISI, endnote format"
+	elog "    media-fonts/jsmath      - for displaying mathematical notation"
+	elog "    media-libs/exiftool     - for proper UTF-8 metadata writing in PDF"
+	elog "                              text strings"
+	elog "    virtual/latex-base      - to check for BibTeX file correctness and to get"
+	elog "                              nice printing through the shell script bib2pdf"
+}
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index b97b734e7832..c3c0f33915cf 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,3 +1,3 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
-EBUILD coolreader-3.2.2.1-r1.ebuild 2083 BLAKE2B b585ccc372f61ce062e98bc4051d321f1f285a1615b4919e6d68564a235a2ae34a1eb8aec8ba4683eff2585d2e6c4172dcacd97d69984fb56e9b5d7cb6f26fac SHA512 d9357022da3f13ad4e4f51f111d77267d1a26faa49d7d6f133b37058613070f1b2dae0e020311138e2205778548c6e70310fe402cb3ba9ba21f9e79564efbd27
+EBUILD coolreader-3.2.2.1-r2.ebuild 2479 BLAKE2B 63c86c1dee137edc9f8937c72cb80c77c0f890347aa1d385b2be771a3fdfc11a1d895ee87b4bd295a52392dc72f9abcd34f019c5f350943d4a9ce45e3971f5b0 SHA512 8df9d4a6337416a8d394cbab4be7f9d166d7ca9febe6e4dc5054d842de4f006adb535342c24a1b80370988edad4c71f9a0e7f50a0aeb832ebcd251fa38f0d8b0
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.2.1-r1.ebuild b/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
index 672463952a1e..db5d2760de9a 100644
--- a/app-text/coolreader/coolreader-3.2.2.1-r1.ebuild
+++ b/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
@@ -74,6 +74,16 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_install() {
+	cmake-utils_src_install
+	if ! use wxwidgets; then
+		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
+
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
diff --git a/app-text/cuneiform/Manifest b/app-text/cuneiform/Manifest
index 8ec921a20310..d965cc181a64 100644
--- a/app-text/cuneiform/Manifest
+++ b/app-text/cuneiform/Manifest
@@ -1,7 +1,12 @@
 AUX c-assert.diff 2053 BLAKE2B c5c4d36156534400ded8b4f665f822ba561d5eaddcb0d2b821d5eff52645b28e92422b18a012c83469104ddeab14909bf383ceac3ba77ba11a4c2e12340d5b40 SHA512 f330005441e0b9abefa97f0dfe46dcbf1c4471185417408e81b87c5b5332db49355fbeb2e5bb4d75f4f0ff79a0e8c60228de12776187c0fdb3bcc67370ec040f
+AUX cuneiform-1.1.0-fix_buffer_overflow.patch 1128 BLAKE2B 0b70a1ffa36a74171c817056f8833ce7d9bc2e68115cb3813cd1984e454dab6a99117977b371890cbe87b2f79a22fde286257b0bdfa4372534f3ed8fa1add6ae SHA512 5db3f9d7e483e2dd0eda83b3e26090743b5188e3ae6bb8a33496a0b9e228b4484081708bdfe41653b9051d7fc0decab90555a6a4f0e1392169251a2e7488b772
+AUX cuneiform-1.1.0-fix_buffer_overflow_2.patch 933 BLAKE2B 65f4ed379506882abfe886036d8aba52c7da20ce8a874fc99f725262a91a16c1594e40bc6210e06950f476305d53e3e25a5dff748581c201ed3971a02045ca39 SHA512 0642ba193e1e1a6b6264218aa55edc261baeb5d4f43eeba0114a46f539041fdb54aba26f11f1ff42ee97cc885a2f58dfa8d6c727a9da83374717b8bd08209d95
+AUX cuneiform-1.1.0-gcc6.patch 6081 BLAKE2B c2f11845aae2d07d94f985a474621b3f1d8b6c1d9e437d5eac948394e5540c8b4b03053ae46f07cda3ba16401f16589a0210ff050e6cb9a2b9c7431b55f0f65d SHA512 a061118133b6baaaf691a273b6d8e543d2dc250a2a132a800ad926f0a22916dce8d712400d8c8c65829ae373cc9aab5a4c89e73a0606e4399817aca91463bffa
+AUX cuneiform-1.1.0-gcc7.patch 3978 BLAKE2B e2e70bf7d878393cdd6be4f81983a089a6e3d66517be16ef23c530eab09068307f2b17fc5762b420708b3fe8c173cf8d331fc11a62cf6f9bdd0e2232f4731c08 SHA512 feff7586552debe13a6d8a7709d9e42724444eec0654d2430ff7e88cf1e614b1f8678beba4b6962162bc83a7ffd09ace4818df8753d703c90a8c68627568986a
+AUX cuneiform-1.1.0-typos.patch 1758 BLAKE2B 85e31589d6d02ecfdddc9c4134624164275d5392b4db2dabd881cebf35cd833fba49053f2f1e6ee732bb4727836549e25c3179669de6957cf52aa252fb8d4987 SHA512 36f5aef2a20b0d1411dbe2c53af854fae7cc2a41b90bb1de5fe37fb2de74e2f23c16f7c358620e9ac5173285a8752cd7f2db4d580ac9baf20b9fff37fb86d231
 AUX cuneiform.1 2844 BLAKE2B ed7d68de70ebd50caf35bb22ebd23ef7ecf00633be22f237e19830456c1efe83a6c546dd27dcf776e91bdb9189236b48690cdf2b172602e2a0528c12de9b1532 SHA512 55dfaa6fd759a24c1a49ed1455a6f04e63c40f048872bc8309b770942747006bb5ed4704171a53490552c4170471934dcaeeb692921ebbc020f012f84afc6d77
 AUX graphicsmagick.diff 1547 BLAKE2B 5dad602a467a2b3f8c0a55f8a873e9d46cde7857b078009888cf965440ad9a863a5cf3cdb5a3df8c42cf4cc33a4ada7d029c4a80e741083fe54f9948ff837832 SHA512 1aec9b28b1fdde076a4eb3b9d03c448ed28dfdfe102d0fcb7dd9c75c3dd735854ca69d0334c0b1067fa897cfd96044cc49cdf7c8b90e464fa653b702a946fad6
 AUX libm.diff 634 BLAKE2B a1f3eaba778b5cb1a8322a3b3c048293af61eebfe1c3e43c880242a100b732d3f2252ea9bac3469218e0f6e97424fd13ba52655adaf1a43b8c8abf8d67652e16 SHA512 7b1f00e9644ef0762adb10d64835bd9f2e5b2d64729a75cd1afde62f6560afe4fb632e666a4f971686aabbc8a6d5d6364ab641787a01152667e25904fedfff62
 DIST cuneiform-linux-1.1.0.tar.bz2 26388511 BLAKE2B 9a9406d42b96d814b7342c48b384b7d46b529116e37f9946da6b1158bd223d2e4be0158bd0101f0b9821b7d63374758190e60232483779bdb6a4164d1b06034e SHA512 82395f43aae9f4b1301fb47b8d46613affb0ccb09c92d64ac3d77a593618cd56824225b0306176e4d8b90eb468abf6b9f534e97f28dabd4bba81cb7977b79b56
-EBUILD cuneiform-1.1.0-r2.ebuild 1327 BLAKE2B 82bd224768add6da597c5946874bf28ca36eb40f3603535c1d22f22bd218e85a82585164956a82b264ab10fd5b352008728e13e7aa43050b858c80837adf7704 SHA512 083eb8b48d059513e696de7c8eb340526817d577f1b51ee34833101d86583131f9d563e01222c7256bcf201edf1a6a3d0ef03f027b5d524f8a1087d9be6c706e
+EBUILD cuneiform-1.1.0-r3.ebuild 1527 BLAKE2B 7a7ef252fddf498e555c9ff879b85045934cced8f27e490e64e5f077d81c232bdf852123b98dfcb3c7d245db70cf1ca5c8959bad93981101865d7166153b5952 SHA512 d2f35a031873e1b24d63131a429982c8dfd7bfc9a01277e1f8219e0144e4f8bca4d06a040f8757c9c957426a481466f8c896b65d9d177a95f017a5509b5f1cc2
 MISC metadata.xml 344 BLAKE2B a004a26b6f3707acc98c356f79b3d9451b5fb596fb5ee3e2291ceda662539e2b90e82cfcc3f0c5f17febd315f5f8d921a39cfa212fab2253efa67edb87914e41 SHA512 7c8e545246470ac8e3928f698434403dfd4ccfacce041d623a1fbfdc26bf2a032b4df5604425292d5fc63570237c576630d61884f1ab03e7d2052b9d167a385e
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
index 6b1f082888d5..b3da9fad0540 100644
--- a/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild
+++ b/app-text/cuneiform/cuneiform-1.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,8 +27,14 @@ S=${WORKDIR}/${MY_P}
 
 DOCS=( readme.txt )
 PATCHES=(
+	# From Fedora
 	"${FILESDIR}/c-assert.diff"
 	"${FILESDIR}/libm.diff"
+	"${FILESDIR}/${P}-fix_buffer_overflow.patch"
+	"${FILESDIR}/${P}-fix_buffer_overflow_2.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}/${P}-gcc7.patch"
+	"${FILESDIR}/${P}-typos.patch"
 )
 
 src_prepare(){
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch
new file mode 100644
index 000000000000..8e9811540cd6
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow.patch
@@ -0,0 +1,27 @@
+Description: Fix buffer overflow during crash when using user supplied image.
+Author: Sławomir Nizio
+Forwarded: no
+Last-Update: 2017-04-05
+
+--- a/cuneiform_src/Kern/rstr/src/acc_tabs.c	
++++ b/cuneiform_src/Kern/rstr/src/acc_tabs.c	
+@@ -1233,7 +1233,7 @@ if(is_cen_language(language))
+ 
+     strcpy(decode_ASCII_to_[(uchar)liga_i      ],   "_i_");
+     strcpy(decode_ASCII_to_[(uchar)liga_exm    ],   "_!_");
+-    strcpy(decode_ASCII_to_[(uchar)liga_inv_exm],   "_!!_");
++    strcpy(decode_ASCII_to_[(uchar)liga_inv_exm],   "_!_");
+     strcpy(decode_ASCII_to_[(uchar)right_quocket],  "\xbb");
+ 	strcpy(decode_ASCII_to_[(uchar)liga_CC     ],   "\xa9");
+ 	strcpy(decode_ASCII_to_[(uchar)liga_CR     ],   "\xae");
+--- a/cuneiform_src/Kern/rstr/src/match_wd.c	
++++ b/cuneiform_src/Kern/rstr/src/match_wd.c
+@@ -484,7 +484,7 @@
+   str_raster->w=(int32_t)(right-left);
+   str_raster->h=(int32_t)(bottom-top);
+ 
+-  if (str_raster->w > LINE_WIDTH || str_raster->h > LINE_HEIGHT)
++  if ((str_raster->w+7) > LINE_WIDTH || str_raster->h > LINE_HEIGHT)
+     return FALSE;
+ 
+   memset(&str_raster->pict,0,(str_raster->w+7)/8*str_raster->h);
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch
new file mode 100644
index 000000000000..c64b42fc8933
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-fix_buffer_overflow_2.patch
@@ -0,0 +1,18 @@
+Description: Split original patch by Slawomir and update the same to apply
+neatly.
+Author: Bhavani Shankar <bhavi@ubuntu.com>
+
+
+--- cuneiform-1.1.0+dfsg.orig/cuneiform_src/Kern/rstr/src/acc_tabs.c
++++ cuneiform-1.1.0+dfsg/cuneiform_src/Kern/rstr/src/acc_tabs.c
+@@ -2821,8 +2821,8 @@ if( CodePages[language]==CSTR_EASTEUROPE
+     strcpy(decode_ASCII_to_[(uchar)liga_j      ],   "_j_");
+     strcpy(decode_ASCII_to_[(uchar)liga_exm    ],   "_!_");
+     strcpy(decode_ASCII_to_[(uchar)liga_qm     ],   "_?_");
+-    strcpy(decode_ASCII_to_[(uchar)liga_inv_exm],   "_!!_");
+-    strcpy(decode_ASCII_to_[(uchar)liga_inv_qm ],   "_??_");
++    strcpy(decode_ASCII_to_[(uchar)liga_inv_exm],   "_!_");
++    strcpy(decode_ASCII_to_[(uchar)liga_inv_qm ],   "_?_");
+     strcpy(decode_ASCII_to_[(uchar)liga_bull   ],   "\xB0");
+     strcpy(decode_ASCII_to_[(uchar)left_quocket],   "�");
+     strcpy(decode_ASCII_to_[(uchar)right_quocket],  "�");
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch b/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch
new file mode 100644
index 000000000000..e45768e90f29
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc6.patch
@@ -0,0 +1,177 @@
+Description: fix FTBFS with GCC 6
+Author: Andreas Beckmann <anbe@debian.org>
+
+--- a/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
++++ b/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp
+@@ -594,8 +594,8 @@ Bool32 CRIControl::CreateDestinatonDIB(u
+ 		return FALSE;
+ 	}
+ 
+-	wNewHeight = (mbMarginsFlag ? abs(mrMargins.rmBottomMarg - mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber());
+-	wNewWidth = (mbMarginsFlag ? abs(mrMargins.rmLeftMarg - mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth());
++	wNewHeight = (mbMarginsFlag ? std::abs(int32_t(mrMargins.rmBottomMarg) - int32_t(mrMargins.rmTopMarg)) : mpSourceDIB->GetLinesNumber());
++	wNewWidth = (mbMarginsFlag ? std::abs(int32_t(mrMargins.rmLeftMarg) - int32_t(mrMargins.rmRightMarg)) : mpSourceDIB->GetLineWidth());
+ 	mpSourceDIB->GetResolutionDPM( &wXResolution, &wYResolution);
+ 
+ 	if ( !mpDestinationDIB->CreateDIBBegin( wNewWidth, wNewHeight, BitCount) )
+--- a/cuneiform_src/Kern/include/minmax.h
++++ b/cuneiform_src/Kern/include/minmax.h
+@@ -67,6 +67,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #define MAX(a,b) (((a)>(b))?(a):(b))
+ #endif
+ 
++#ifndef __cplusplus
++
+ #ifndef min
+ #define min(a,b) (((a)>(b))?(b):(a))
+ #endif
+@@ -75,3 +77,5 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #endif
+ 
+ #endif
++
++#endif
+--- a/cuneiform_src/Kern/rcutp/sources/main/rcutp_func.cpp
++++ b/cuneiform_src/Kern/rcutp/sources/main/rcutp_func.cpp
+@@ -902,8 +902,8 @@ int16_t   i,ver_byte,interval,l1,r1,minl
+    if(l1<0 || r1<0) return -1;
+    if(i>0)
+     {
+-     minl=MIN(minl,l1); minr=min(minr,r1);
+-     maxl=MAX(maxl,l1); maxr=max(maxr,r1);
++     minl=MIN(minl,l1); minr=MIN(minr,r1);
++     maxl=MAX(maxl,l1); maxr=MAX(maxr,r1);
+     }
+    else
+     {
+--- a/cuneiform_src/Kern/lns32/src/xydim.h
++++ b/cuneiform_src/Kern/lns32/src/xydim.h
+@@ -86,8 +86,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ 					);
+ 			};
+          void expandX( int l, int r ){
+-				left = min( left, l );
+-				right = max( right, r);
++				left = MIN( left, l );
++				right = MAX( right, r);
+ 			};
+ 
+ 	};
+@@ -115,8 +115,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ 				);
+ 			};
+          void expandY( int b, int t ){
+-				bottom = min( bottom, b );
+-				top = max( top, t );
++				bottom = MIN( bottom, b );
++				top = MAX( top, t );
+ 			};
+ 
+ 	};
+@@ -145,10 +145,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ 						 );
+ 			};
+          void restrictXY( int x1, int x2, int y1, int y2 ){
+-				left 		= 	max( left, x1 );
+-				right		=  min( right, x2 );
+-				bottom	= 	max(bottom, y1);
+-				top    	=  min(top, y2);
++				left 		= 	MAX( left, x1 );
++				right		=  MIN( right, x2 );
++				bottom	= 	MAX(bottom, y1);
++				top    	=  MIN(top, y2);
+ 			};
+          void expandXY( TXYDim* brother ){
+ 				expandX( brother->left, brother->right );
+--- a/cuneiform_src/Kern/rcorrkegl/src/cpp/cor_kegl.cpp
++++ b/cuneiform_src/Kern/rcorrkegl/src/cpp/cor_kegl.cpp
+@@ -75,6 +75,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #include "cor_kegl.h"
+ #include "garbage.h"
+ #include "ligas.h"
++#include "minmax.h"
+ 
+ #ifndef MAXINT32
+ #define  MAXINT32  0x7FFFFFFF
+@@ -1563,7 +1564,7 @@ static int32_t rect_dist(Rect32 *main, R
+   int32_t y2=test->top-main->bottom;
+   if (x1>0 || x2>0 || y1>0 || y2>0)   //не пересекаютс
+   {
+-    x=MAX(x1,x2);  y=max(y1,y2);
++    x=MAX(x1,x2);  y=MAX(y1,y2);
+     if (x<0)  return y;
+     if (y<0)  return x;
+     return MIN(x,y);
+@@ -1574,7 +1575,7 @@ static int32_t rect_dist(Rect32 *main, R
+   x2=test->right-main->right;
+   y1=main->top-test->top;
+   y2=test->bottom-main->bottom;
+-  x=MAX(x1,x2);  y=max(y1,y2);
++  x=MAX(x1,x2);  y=MAX(y1,y2);
+   x=MAX(x,y);
+   return (x>0) ? x : 0;
+ }
+--- a/cuneiform_src/Kern/rcutp/sources/main/rcutp_mainfunc.cpp
++++ b/cuneiform_src/Kern/rcutp/sources/main/rcutp_mainfunc.cpp
+@@ -73,13 +73,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ 
+ extern  int16_t      minrow,bbs1,bbs2,bbs3,bbs4,Nb1,Nb2,Nb3;
+ extern  uchar      language;
+-#ifndef max
+-#define MAX(a,b)            (((a) > (b)) ? (a) : (b))
+-#endif
+-
+-#ifndef min
+-#define MIN(a,b)            (((a) < (b)) ? (a) : (b))
+-#endif
+ 
+ extern int16_t   up_position,dw_position;
+ uchar MemForCutPoints[65536];
+--- a/cuneiform_src/Kern/hhh/lst3_win.h
++++ b/cuneiform_src/Kern/hhh/lst3_win.h
+@@ -845,7 +845,7 @@ int WidthPRS,MaxShtrih;
+   dist+=par.kv*dv; \
+ }
+ 
+-#define DIST_V(u1,d1,u2,d2) (min(d1,d2)-max(u1,u2))
++#define DIST_V(u1,d1,u2,d2) (MIN(d1,d2)-MAX(u1,u2))
+ 
+ #define DV_FRM(a,b) DIST_V(a->up,a->down,b->up,b->down)
+ 
+--- a/cuneiform_src/Kern/lns32/src/lns.cpp
++++ b/cuneiform_src/Kern/lns32/src/lns.cpp
+@@ -190,8 +190,8 @@ void  __RejectNearBound(LinesTotalInfo*
+          break;   // keep lines, if lack
+       if (li.Flags & LI_NOISE)
+          continue;
+-      Point32 Mn; Mn.x = MIN(li.A.x,li.B.x);   Mn.y = min(li.A.y,li.B.y);
+-      Point32 Mx; Mx.x = MAX(li.A.x,li.B.x);   Mx.y = max(li.A.y,li.B.y);
++      Point32 Mn; Mn.x = MIN(li.A.x,li.B.x);   Mn.y = MIN(li.A.y,li.B.y);
++      Point32 Mx; Mx.x = MAX(li.A.x,li.B.x);   Mx.y = MAX(li.A.y,li.B.y);
+       if ((Mn.y < imgrect.top + 50) || (Mx.y > imgrect.bottom - 50))
+       {
+          if (!__HasCorners(li, plti, TRUE))
+@@ -213,8 +213,8 @@ void  __RejectNearBound(LinesTotalInfo*
+          continue;
+       if (vcnt < 5)
+          break;   // keep lines, if lack
+-      Point32 Mn; Mn.x = MIN(li.A.x,li.B.x);   Mn.y = min(li.A.y,li.B.y);
+-      Point32 Mx; Mx.x = MAX(li.A.x,li.B.x);   Mx.y = max(li.A.y,li.B.y);
++      Point32 Mn; Mn.x = MIN(li.A.x,li.B.x);   Mn.y = MIN(li.A.y,li.B.y);
++      Point32 Mx; Mx.x = MAX(li.A.x,li.B.x);   Mx.y = MAX(li.A.y,li.B.y);
+       if ((Mn.x < imgrect.left + 50) || (Mx.x > imgrect.right - 50))
+       {
+          if (!__HasCorners(li, plti, FALSE))
+--- a/cuneiform_src/Kern/lns32/src/lnscheck.cpp
++++ b/cuneiform_src/Kern/lns32/src/lnscheck.cpp
+@@ -66,8 +66,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #include "decl.h"
+ 
+ typedef Point16 XPoint16;
+-#define maxi max
+-#define mini min
++#define maxi MAX
++#define mini MIN
+ #define PPSArray TArray
+ 
+ #define CONSOLE /* This can also be printf. */
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch b/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch
new file mode 100644
index 000000000000..01530ab4b1d3
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-gcc7.patch
@@ -0,0 +1,102 @@
+diff -urp cuneiform-1.1.0/cuneiform_src/Kern/hhh/tigerh/h/strings.h cuneiform-1.1.0-char/cuneiform_src/Kern/hhh/tigerh/h/strings.h
+--- cuneiform-1.1.0/cuneiform_src/Kern/hhh/tigerh/h/strings.h	2017-11-30 11:25:24.409125695 +0700
++++ cuneiform-1.1.0-char/cuneiform_src/Kern/hhh/tigerh/h/strings.h	2017-11-30 12:09:26.033501963 +0700
+@@ -80,6 +80,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ 
+ # include "ltconfig.h"
+ # include "c_types.h"
++# include "cttypes.h"
+ 
+ struct _String;
+ typedef struct _String STRING;
+diff -urp cuneiform-1.1.0/cuneiform_src/Kern/include/utf8-tables.h cuneiform-1.1.0-char/cuneiform_src/Kern/include/utf8-tables.h
+--- cuneiform-1.1.0/cuneiform_src/Kern/include/utf8-tables.h	2017-11-30 11:25:24.410125673 +0700
++++ cuneiform-1.1.0-char/cuneiform_src/Kern/include/utf8-tables.h	2017-11-30 11:32:05.974413875 +0700
+@@ -68,7 +68,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ #endif
+ 
+ 
+-const char win1250_to_utf8[][4] = {
++const unsigned char win1250_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+@@ -328,7 +328,7 @@ const char win1250_to_utf8[][4] = {
+ };
+ 
+ 
+-const char win1251_to_utf8[][4] = {
++const unsigned char win1251_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+@@ -587,7 +587,7 @@ const char win1251_to_utf8[][4] = {
+   {209, 143, 0, 0},
+ };
+ 
+-const char win1252_to_utf8[][4] = {
++const unsigned char win1252_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+@@ -847,7 +847,7 @@ const char win1252_to_utf8[][4] = {
+ };
+ 
+ 
+-const char win1254_to_utf8[][4] = {
++const unsigned char win1254_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+@@ -1107,7 +1107,7 @@ const char win1254_to_utf8[][4] = {
+ };
+ 
+ 
+-const char win1257_to_utf8[][4] = {
++const unsigned char win1257_to_utf8[][4] = {
+   {0, 0, 0, 0},
+   {1, 0, 0, 0},
+   {2, 0, 0, 0},
+diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/codetables.cpp
+--- cuneiform-1.1.0/cuneiform_src/Kern/rout/src/codetables.cpp	2017-11-30 11:25:24.411125651 +0700
++++ cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/codetables.cpp	2017-11-30 11:47:51.856189912 +0700
+@@ -937,13 +937,13 @@ CP_TO_CP tab[] = {
+  * codepage.
+  */
+ 
+-const char * getUTF8Str(const unsigned char in, const int codepage) {
++const unsigned char * getUTF8Str(const unsigned char in, const int codepage) {
+   switch(codepage) {
+   case 1250 : return win1250_to_utf8[in];
+   case 1251 : return win1251_to_utf8[in];
+   case 1252 : return win1252_to_utf8[in];
+   case 1254 : return win1254_to_utf8[in];
+   case 1257 : return win1257_to_utf8[in];
+-  default : return "?";
++  default : return (const unsigned char *) "?";
+   }
+ }
+diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/rout_own.h cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/rout_own.h
+--- cuneiform-1.1.0/cuneiform_src/Kern/rout/src/rout_own.h	2017-11-30 11:25:24.411125651 +0700
++++ cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/rout_own.h	2017-11-30 11:40:01.457220419 +0700
+@@ -458,7 +458,7 @@ Bool SetTableTextSeparators(char* s);
+ void ResetCodeTables();
+ Bool UpdateActiveCodeTable();
+ long GetCodePage();
+-const char * getUTF8Str(const unsigned char in, const int codepage);
++const unsigned char * getUTF8Str(const unsigned char in, const int codepage);
+ 
+ //*****************************************************************
+ // Rout.cpp
+diff -urp cuneiform-1.1.0/cuneiform_src/Kern/rout/src/text.cpp cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/text.cpp
+--- cuneiform-1.1.0/cuneiform_src/Kern/rout/src/text.cpp	2017-11-30 11:25:24.411125651 +0700
++++ cuneiform-1.1.0-char/cuneiform_src/Kern/rout/src/text.cpp	2017-11-30 11:40:43.571320319 +0700
+@@ -310,7 +310,7 @@ Bool OneChar(Handle charHandle)
+ 				*gMemCur++ = c2;
+ 		}
+ 		else {
+-			const char *utfchar;
++			const unsigned char *utfchar;
+ 			utfchar = getUTF8Str((char )c2, GetCodePage());
+ 			int i;
+ 			for(i=0; utfchar[i] != '\0' ;i++){
diff --git a/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch b/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch
new file mode 100644
index 000000000000..3439760d79d8
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform-1.1.0-typos.patch
@@ -0,0 +1,54 @@
+Description: fix typos
+Author: Andreas Beckmann <anbe@debian.org>
+
+--- a/cuneiform_src/Kern/rblock/sources/c/ltmain.c
++++ b/cuneiform_src/Kern/rblock/sources/c/ltmain.c
+@@ -344,7 +344,7 @@ i=0; i=i;
+ # ifdef LT_DEBUG
+     //if (LT_DebugGraphicsLevel >= 2)
+ 	if(!LDPUMA_Skip(hFirstDustAbsorbtion))
+-        LT_GraphicsBlocksOutput ("After first dust absorbtion");
++        LT_GraphicsBlocksOutput ("After first dust absorption");
+ # endif
+ 
+     PageMatrixExcludeSeparators (TRUE);
+@@ -368,7 +368,7 @@ i=0; i=i;
+ # ifdef LT_DEBUG
+     //if (LT_DebugGraphicsLevel >= 2)
+ 	if(!LDPUMA_Skip(hSecondDustAbsorbtion))
+-        LT_GraphicsBlocksOutput ("After second dust absorbtion");
++        LT_GraphicsBlocksOutput ("After second dust absorption");
+ # endif
+ 
+     if (cut_page_left || cut_page_right)
+--- a/cuneiform_src/Kern/rstr/src/pass3.c
++++ b/cuneiform_src/Kern/rstr/src/pass3.c
+@@ -648,7 +648,7 @@ ready_BL:;
+             {
+             if (snap_activity('d'))
+                 {
+-                snap_show_text("Skiped as dust");
++                snap_show_text("Skipped as dust");
+                 snap_monitor();
+                 }
+ 
+@@ -3135,7 +3135,7 @@ Bool match_word_prepare(CSTR_line ln, uc
+         {
+         if (snap_activity('n'))
+                 {
+-                snap_show_text("Skiped as dust");
++                snap_show_text("Skipped as dust");
+                 snap_monitor();
+                 }
+                         return FALSE;
+--- a/cuneiform_src/Kern/rstr/src/snap.c
++++ b/cuneiform_src/Kern/rstr/src/snap.c
+@@ -542,7 +542,7 @@ if( short_spell_re(wrd,lang)   )
+ else
+     strcat(buf," n");
+ 
+-strcat(buf," new agressive : ");
++strcat(buf," new aggressive : ");
+ if( _spell_agressive(wrd,lang) )
+     strcat(buf,"y ");
+ else
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index e2eb28a4aece..0b1ddc359dbc 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 1300 BLAKE2B ae70115dcf31ecbaae0484a0bd1c2177cfcb1f7191235ca40039e32b66fbc384318d83ed048c133a60ec02bafefd559e9cc2b97001de65d7a6a1d12a6e4937d9 SHA512 8f9db1ea0b21e68618d2471040f1b15a38dbb4068344778d24a4bfa0dc536adf2bc0c9167c6a1bc28779c9e5b0aeee44925754501b32fad03689facb31ef7f00
+EBUILD dvipng-1.15-r1.ebuild 1297 BLAKE2B cea6723f171800093d0a7a9885060166824c4c81b89ed949d05eb48ac49ed7f8cacaaaeeedf350206ef9681ab1998b335a0e72f6e08a555d9a6914dfb253c7ed SHA512 6d88bd3ccfae01ff45dd014cc84ddeca8776bc0fee4b523af0be225a9c141766b2f585ebc972b9ded477b560e98165eaae9d293782e35e571e52504921206675
 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 f7a638a83263..b99b0afda53d 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/fbreader/Manifest b/app-text/fbreader/Manifest
index 87002ed81ac6..0c8c2083b0c1 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,12 +1,4 @@
 AUX fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
-AUX fbreader-0.99.4-gcc6.patch 512 BLAKE2B 16e930b4594abbf48879fdbd6f46415a46e10a73c1660bfe44f05922269531c58b11a7c351a3f4fc9b338ce9a1ae2f319eb3750802ddbfac76b09ebcc5a70fee SHA512 79c64750c250e10fa6530ed397a77ed9ebb2b76d12a6c0967cf8739b24f8381c76961e72388d0116f514c71c3cecc04a4945781dc87db3a30a18e4a1afc0315d
-AUX fbreader-0.99.4-ld-bfd.patch 532 BLAKE2B 50a964b7cb79211302e3804f1eae2e54194114d8387f889e8707269d4bba8d9a5acd0718c49593564bcf397c8c0afdbc2773070195dbb28fd3c394057d781f00 SHA512 77c6a0454706f68f5065333c1bbf8456aaf405ae8532019f1d557d5f66d7d0b633d409b320c8ffba50a78d04f4d64c7d655c3b0ee6f87fdf146aa5f04332167d
-AUX fbreader-0.99.4-mimetypes.patch 505 BLAKE2B 6877f9750ed6d4b30b10a83aed47c0e75b76fdb8d6c02a1d70568d3b7b1e24e7d67602c83ef5e5df5c2c3aa462b5800431ba20b9256f9908be79d690cfe5ec55 SHA512 03fd64a802be53bf33c9582d5c2804e0c67809a43db02a2bfbc3e5a15592346cae9ba44333f2f547bcc623bc1d9785ca7a10c77d58a23152a1d3f59328e75d7b
-AUX fbreader-0.99.4-qreal-cast.patch 950 BLAKE2B ae354d03bf2e6efcdb9f16a0bf2272cfe11c62d44683a1d774085eb09c2213482ad747521b38a7d7e7c8167cbf7a5f4bdc86b11530ddb72fe98118fcc19c939d SHA512 260e1966eb5f0bfd42fc3c28fdcdd92d37314d93b31f44e1ec0f94e81ad0084caeaadb69cbd16eb4e8f8b9359534449604845e1b79e63b0dd2eff96b342286d1
-AUX fbreader-0.99.4-qt5.patch 18697 BLAKE2B 241f103b97b87f084c4f35ffb137cc9b6ea3368ddf6f0b4df2037856c5a3401d3687ed809abb0efc2e224bdb3a8d382930681f7896299421ebb7bd0300e0cbca SHA512 9eb8319308a36cada28d6036ee0537433cea03cb59e648c6ad1dd8f4d10a1b05fb879ebd38b1f9b1e149e6a6544aaafb93c52d6a97f4c9fd8905e89b8cf7ae86
-AUX fbreader-0.99.4.patch 472 BLAKE2B a34f27d9f53f3faed5889dcb7a841a1c045e7bd4080f2ae6ae6a949d76e1bc99e31953cd552a1aa8afbe26d64262aead7463432f407532050db1eda5da1517a9 SHA512 486dc74e3cfc6f94f1bf95269e35e866465095efee0cd31b586592fbd780613d4d5d243b809e494da14a69da8e0c5e47e6dd2ca35619616c4497eb0a053ba09d
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
-EBUILD fbreader-0.99.4-r3.ebuild 2279 BLAKE2B 1e22f5cbdc916be2543a79ccc95c753726e946c56c85e9dcd53c89b643fea39edefda496de67bc603d8c885858802a89e7d09c5d1a4d635fd5a32ff0333e0e24 SHA512 f93ebe20622e94f54b68ecd62d76520d3455595e3433b875d76654479939f34ba21ed80b580c1b46824473e9f927b4349e8a5df37e4b2f350daf824cb07eb27e
-EBUILD fbreader-0.99.4-r4.ebuild 2111 BLAKE2B 955873c4d80c35e8579e97140bc4eab256cff750ef844a68de99418666bb93f61824486c48983ed366993d8496e1d7396d4e8e2c5ebeb11f1513a3ddefb5e8bc SHA512 28195b8b7d246fd7057ba9c30835e263b37932206d07a26fa3f01d240b44c19a58196e575ffaf8fb4e4cdf76d50682ecf97a4b5bca2dc4c18582fdfdea2eb1a2
 EBUILD fbreader-0.99.4-r5.ebuild 1934 BLAKE2B e12e5cdb9714e1f97e6a375c3e64dc65aedd93b9214417e7d3b3f2dfb4b39f53a8cb540cf2636bed5940b202f64ab7f8817d541d32b212ac5a1835656e923fe9 SHA512 48a634082045cdc346d06473db3ac1b17e1ff91451fae50900ef7b19e5a7529b82c683d8ff93435b9d0053f69ccee8e924ec82854b06f213895657cec26aaad6
 MISC metadata.xml 320 BLAKE2B b537c430018e9035438033df51325115040dc2468f03721c678a60c40654ed99be77a154ba34bb6cc1b7afd54191912906a007a50924cefddb2b6bba908eceb8 SHA512 d215791adfc4cb16e4c25d0dfea7dcf6439fa12916d0c0e51be65d62dd8d48bd63c7e983080027101c6cac1220f4e622c580f7ced4dc895e8b4898f14e921539
diff --git a/app-text/fbreader/fbreader-0.99.4-r3.ebuild b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
deleted file mode 100644
index ab2f47419e79..000000000000
--- a/app-text/fbreader/fbreader-0.99.4-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib flag-o-matic
-
-DESCRIPTION="E-Book Reader. Supports many e-book formats"
-HOMEPAGE="http://www.fbreader.org/"
-SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/liblinebreak
-	dev-libs/fribidi
-	dev-db/sqlite
-	net-misc/curl
-	sys-libs/zlib
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5[ssl]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Still use linebreak instead of new unibreak
-	sed -e "s:-lunibreak:-llinebreak:" \
-		-i makefiles/config.mk zlibrary/text/Makefile || die "fixing libunibreak failed"
-
-	# Let portage decide about the compiler
-	sed -e "/^CC = /d" \
-		-i makefiles/arch/desktop.mk || die "removing CC line failed"
-
-	# let portage strip the binary
-	sed -e '/@strip/d' \
-		-i fbreader/desktop/Makefile || die
-
-	# Respect *FLAGS
-	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
-		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
-	sed -e "/^	CFLAGS +=/ d" \
-		-i makefiles/config.mk || die "CFLAGS sed failed"
-	sed -e "/^	LDFLAGS += -s$/ d" \
-		-i makefiles/config.mk || die "sed failed"
-	sed -e "/^LDFLAGS =$/ d" \
-		-i makefiles/arch/desktop.mk || die "sed failed"
-
-	echo "TARGET_ARCH = desktop" > makefiles/target.mk
-	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
-
-	echo "UI_TYPE = qt4" >> makefiles/target.mk
-	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
-		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
-
-	if use debug; then
-		echo "TARGET_STATUS = debug" >> makefiles/target.mk
-	else
-		echo "TARGET_STATUS = release" >> makefiles/target.mk
-	fi
-
-	# bug #452636
-	eapply "${FILESDIR}"/${P}.patch
-	# bug #515698
-	eapply "${FILESDIR}"/${P}-qreal-cast.patch
-	# bug #516794
-	eapply "${FILESDIR}"/${P}-mimetypes.patch
-	# bug #437262
-	eapply "${FILESDIR}"/${P}-ld-bfd.patch
-	# bug #592588
-	eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
-
-	eapply "${FILESDIR}"/${P}-qt5.patch
-	append-cflags -std=c++11
-
-	eapply_user
-}
-
-src_compile() {
-	# bug #484516
-	emake -j1
-}
-
-src_install() {
-	default
-	dosym FBReader /usr/bin/fbreader
-}
diff --git a/app-text/fbreader/fbreader-0.99.4-r4.ebuild b/app-text/fbreader/fbreader-0.99.4-r4.ebuild
deleted file mode 100644
index a828ea2670c9..000000000000
--- a/app-text/fbreader/fbreader-0.99.4-r4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib flag-o-matic
-
-DESCRIPTION="E-Book Reader. Supports many e-book formats"
-HOMEPAGE="http://www.fbreader.org/"
-SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/expat
-	dev-libs/libunibreak
-	dev-libs/fribidi
-	dev-db/sqlite
-	net-misc/curl
-	sys-libs/zlib
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5[ssl]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Let portage decide about the compiler
-	sed -e "/^CC = /d" \
-		-i makefiles/arch/desktop.mk || die "removing CC line failed"
-
-	# let portage strip the binary
-	sed -e '/@strip/d' \
-		-i fbreader/desktop/Makefile || die
-
-	# Respect *FLAGS
-	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
-		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
-	sed -e "/^	CFLAGS +=/ d" \
-		-i makefiles/config.mk || die "CFLAGS sed failed"
-	sed -e "/^	LDFLAGS += -s$/ d" \
-		-i makefiles/config.mk || die "sed failed"
-	sed -e "/^LDFLAGS =$/ d" \
-		-i makefiles/arch/desktop.mk || die "sed failed"
-
-	echo "TARGET_ARCH = desktop" > makefiles/target.mk
-	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
-
-	echo "UI_TYPE = qt4" >> makefiles/target.mk
-	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
-		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
-
-	if use debug; then
-		echo "TARGET_STATUS = debug" >> makefiles/target.mk
-	else
-		echo "TARGET_STATUS = release" >> makefiles/target.mk
-	fi
-
-	# bug #452636
-	eapply "${FILESDIR}"/${P}.patch
-	# bug #515698
-	eapply "${FILESDIR}"/${P}-qreal-cast.patch
-	# bug #516794
-	eapply "${FILESDIR}"/${P}-mimetypes.patch
-	# bug #437262
-	eapply "${FILESDIR}"/${P}-ld-bfd.patch
-	# bug #592588
-	eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
-
-	eapply "${FILESDIR}"/${P}-qt5.patch
-	append-cflags -std=c++11
-
-	eapply_user
-}
-
-src_compile() {
-	# bug #484516
-	emake -j1
-}
-
-src_install() {
-	default
-	dosym FBReader /usr/bin/fbreader
-}
diff --git a/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch b/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch
deleted file mode 100644
index c6f87a292697..000000000000
--- a/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fbreader/src/formats/doc/OleStorage.cpp	2012-11-30 13:41:25.000000000 +0100
-+++ fbreader/src/formats/doc/OleStorage.cpp-new	2016-08-31 17:23:18.232536401 +0200
-@@ -59,7 +59,7 @@
- 		clear();
- 		return false;
- 	}
--	static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
-+	static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
- 	if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
- 		clear();
- 		return false;
diff --git a/app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch b/app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch
deleted file mode 100644
index ab872edf17cd..000000000000
--- a/app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile
---- fbreader-0.99.4.orig/fbreader/Makefile	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/Makefile	2016-08-31 19:06:35.011708982 +0700
-@@ -23,5 +23,5 @@
- 	done;
- 	@echo -n 'Linking $(TARGET) ...'
--	@$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
-+	@$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
- 	@echo ' OK'
- 
diff --git a/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch b/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch
deleted file mode 100644
index 0e4a2935d442..000000000000
--- a/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch
+++ /dev/null
@@ -1,6 +0,0 @@
-diff -r -U1 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
---- fbreader-0.99.4.orig/fbreader/desktop/desktop	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/desktop/desktop	2014-07-10 20:56:33.527638562 +0700
-@@ -23 +23,2 @@
- Categories=Office;Viewer;Literature;
-+MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
diff --git a/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch b/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch
deleted file mode 100644
index ffd21b2924f7..000000000000
--- a/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r -U1 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2014-07-10 19:18:17.002886537 +0700
-@@ -88,3 +88,3 @@
- void QtWaitingSpinner::setRoundness(qreal roundness) {
--	myRoundness = std::max(0.0, std::min(100.0, roundness));
-+	myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
- }
-@@ -150,3 +150,3 @@
- 	qreal resultAlpha = color.alphaF() - gradation * distance;
--	resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
-+	resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
- 	color.setAlphaF(resultAlpha);
diff --git a/app-text/fbreader/files/fbreader-0.99.4-qt5.patch b/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
deleted file mode 100644
index c88e6db79d3d..000000000000
--- a/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
+++ /dev/null
@@ -1,573 +0,0 @@
-diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk
-index 4267113..3b46102 100644
---- a/makefiles/arch/desktop.mk
-+++ b/makefiles/arch/desktop.mk
-@@ -12,29 +12,11 @@ AR = ar rsu
- LD = g++
-
- CFLAGS += -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
--EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
-+EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
-
--ifeq "$(UI_TYPE)" "qt"
--  MOC = moc-qt3
--  QTINCLUDE = -I /usr/include/qt3
--else
--  MOC = $(shell pkg-config QtCore --variable=moc_location)
--  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
--endif
--
--GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
--
--ifeq "$(UI_TYPE)" "qt"
--  UILIBS = -lqt-mt
--endif
--
--ifeq "$(UI_TYPE)" "qt4"
--  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
--endif
--
--ifeq "$(UI_TYPE)" "gtk"
--  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
--endif
-+MOC = /usr/lib/qt5/bin/moc
-+QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
-+UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
-
- RM = rm -rvf
- RM_QUIET = rm -rf
-diff --git a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
-index 47067d3..119a5ee 100644
---- a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
-+++ b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
-@@ -24,7 +24,9 @@
- #include <QtCore/QDir>
- #include <QtCore/QList>
- #include <QtCore/QTimer>
-+#include <QtCore/QUrlQuery>
-
-+#include <QtNetwork/QNetworkCookie>
- #include <QtNetwork/QNetworkRequest>
- #include <QtNetwork/QNetworkReply>
- #include <QtNetwork/QNetworkProxy>
-@@ -149,12 +151,12 @@ void ZLQtNetworkManager::prepareReply(ZLQtNetworkReplyScope &scope, QNetworkRequ
- 	QNetworkReply *reply = NULL;
- 	if (!scope.request->postParameters().empty()) {
- 		QByteArray data;
--		QUrl tmp;
-+		QUrlQuery tmp;
- 		typedef std::pair<std::string, std::string> string_pair;
- 		foreach (const string_pair &pair, scope.request->postParameters()) {
- 			tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
- 		}
--		data = tmp.encodedQuery();
-+		data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
- 		reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
- 	} else {
- 		reply = const_cast<QNetworkAccessManager&>(myManager).get(networkRequest);
-diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
-index a3e5b35..ab41684 100644
---- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
-+++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
-@@ -17,14 +17,14 @@
-  * 02110-1301, USA.
-  */
-
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
- #include <QtGui/QPixmap>
- #include <QtGui/QPalette>
- #include <QtGui/QPainter>
- #include <QtGui/QPaintEvent>
--#include <QtGui/QScrollBar>
- #include <QtCore/QTimer>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
-
- #include <QtCore/QDebug>
-
-diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
-index 472f05f..b9809c8 100644
---- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
-+++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
-@@ -17,10 +17,10 @@
-  * 02110-1301, USA.
-  */
-
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QScrollBar>
--#include <QtGui/QGraphicsDropShadowEffect>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
-+#include <QtWidgets/QGraphicsDropShadowEffect>
-
- #include <QtCore/QDebug>
-
-diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
-index 1cddaf9..2b65cc1 100644
---- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
-+++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
-@@ -18,9 +18,9 @@
-  */
-
- #include <QtCore/QDebug>
--#include <QtGui/QStyle>
--#include <QtGui/QCompleter>
--#include <QtGui/QStringListModel>
-+#include <QtCore/QStringListModel>
-+#include <QtWidgets/QStyle>
-+#include <QtWidgets/QCompleter>
-
- #include <ZLibrary.h>
- #include <ZLFile.h>
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
-index 6de2c72..d942d47 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
-@@ -19,12 +19,12 @@
- 
- #include <algorithm>
- 
--#include <QtGui/QSplitter>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QScrollBar>
- #include <QtGui/QResizeEvent>
- #include <QtCore/QDebug>
-+#include <QtWidgets/QSplitter>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
- 
- #include <ZLFile.h>
- #include <ZLibrary.h>
-diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
-index 4f09cfc..51f1545 100644
---- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
-+++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
-@@ -20,12 +20,12 @@
- #ifndef __ZLQTITEMSLISTWIDGET_H__
- #define __ZLQTITEMSLISTWIDGET_H__
- 
--#include <QtGui/QWidget>
--#include <QtGui/QFrame>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QScrollArea>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QFrame>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QScrollArea>
- 
- #include <ZLTreeTitledNode.h>
- 
-diff --git a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
-index dfcbc0b..bd2689e 100644
---- a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
-+++ b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
-@@ -17,9 +17,9 @@
-  * 02110-1301, USA.
-  */
- 
--#include <QtGui/QBoxLayout>
--#include <QtGui/QLineEdit>
--#include <QtGui/QToolBar>
-+#include <QtWidgets/QBoxLayout>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QToolBar>
- #include <QtGui/QKeyEvent>
- 
- #include "ZLQtApplicationWindow.h"
-diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
-index 6241514..e0b143b 100644
---- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
-+++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
-@@ -17,17 +17,17 @@
-  * 02110-1301, USA.
-  */
- 
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtGui/QPixmap>
- #include <QtGui/QImage>
- #include <QtGui/QIcon>
--#include <QtGui/QToolBar>
--#include <QtGui/QMenuBar>
--#include <QtGui/QMenu>
--#include <QtGui/QToolButton>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QToolBar>
-+#include <QtWidgets/QMenuBar>
-+#include <QtWidgets/QMenu>
-+#include <QtWidgets/QToolButton>
-+#include <QtWidgets/QLayout>
- #include <QtGui/QWheelEvent>
--#include <QtGui/QDockWidget>
-+#include <QtWidgets/QDockWidget>
- #include <QtCore/QObjectList>
- 
- #include <ZLibrary.h>
-diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
-index 3b4fd3a..42ff2c8 100644
---- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
-+++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
-@@ -22,8 +22,8 @@
- 
- #include <map>
- 
--#include <QtGui/QMainWindow>
--#include <QtGui/QAction>
-+#include <QtWidgets/QMainWindow>
-+#include <QtWidgets/QAction>
- #include <QtGui/QCursor>
- 
- class QDockWidget;
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
-index 24eb897..c17e86c 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
-@@ -17,8 +17,8 @@
-  * 02110-1301, USA.
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QPushButton>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QPushButton>
- 
- #include <ZLDialogManager.h>
- 
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
-index 068039d..811cec8 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
-@@ -20,8 +20,8 @@
- #ifndef __ZLQTDIALOG_H__
- #define __ZLQTDIALOG_H__
- 
--#include <QtGui/QDialog>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QLayout>
- 
- #include <ZLDialog.h>
- 
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
-index e8ff422..352c350 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
-@@ -17,10 +17,10 @@
-  * 02110-1301, USA.
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QWidget>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QLayout>
- 
- #include "ZLQtDialogContent.h"
- #include "ZLQtOptionView.h"
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
-index d5eb4d4..2fc769b 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
-@@ -17,11 +17,11 @@
-  * 02110-1301, USA.
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QMessageBox>
--#include <QtGui/QFileDialog>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QMessageBox>
-+#include <QtWidgets/QFileDialog>
- #include <QtGui/QClipboard>
--#include <QtGui/QDesktopWidget>
-+#include <QtWidgets/QDesktopWidget>
- 
- #include "ZLQtDialogManager.h"
- #include "ZLQtDialog.h"
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
-index ec9e73c..a50a40d 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
-@@ -17,7 +17,7 @@
-  * 02110-1301, USA.
-  */
- 
--#include <QtGui/QFileDialog>
-+#include <QtWidgets/QFileDialog>
- 
- #include "ZLQtOpenFileDialog.h"
- 
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
-index 48a1b8f..90d50fb 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
-@@ -19,16 +19,16 @@
- 
- #include <cctype>
- 
--#include <QtGui/QCheckBox>
--#include <QtGui/QComboBox>
--#include <QtGui/QLabel>
--#include <QtGui/QGroupBox>
--#include <QtGui/QRadioButton>
--#include <QtGui/QPushButton>
--#include <QtGui/QSpinBox>
--#include <QtGui/QLineEdit>
--#include <QtGui/QSlider>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QCheckBox>
-+#include <QtWidgets/QComboBox>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QGroupBox>
-+#include <QtWidgets/QRadioButton>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QSpinBox>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QSlider>
-+#include <QtWidgets/QLayout>
- 
- #include <ZLStringUtil.h>
- #include <ZLDialogManager.h>
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
-index f6c36fb..7fe855a 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
-@@ -17,11 +17,11 @@
-  * 02110-1301, USA.
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QLayout>
--#include <QtGui/QPushButton>
--#include <QtGui/QButtonGroup>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QLayout>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QButtonGroup>
- #include <QtGui/QResizeEvent>
- 
- #include <ZLDialogManager.h>
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
-index e38b62a..ad26fba 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
-@@ -20,9 +20,9 @@
- #ifndef __ZLQTOPTIONSDIALOG_H__
- #define __ZLQTOPTIONSDIALOG_H__
- 
--#include <QtGui/QWidget>
--#include <QtGui/QTabWidget>
--#include <QtGui/QDialog>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QTabWidget>
-+#include <QtWidgets/QDialog>
- 
- #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
- 
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
-index 98e469e..5a1d574 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
-@@ -19,11 +19,11 @@
- 
- #include <unistd.h>
- 
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QWidget>
--#include <QtGui/QLabel>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLayout>
- #include <QtCore/QThreadPool>
- 
- #include "../dialogs/ZLQtDialogManager.h"
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
-index df6c73b..837bce5 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
-@@ -22,11 +22,11 @@
- 
- #include <string>
- 
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- #include <QtGui/QCursor>
--#include <QtGui/QDialog>
--#include <QtGui/QProgressBar>
--#include <QtGui/QLabel>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QProgressBar>
-+#include <QtWidgets/QLabel>
- #include <QtCore/QRunnable>
- 
- #include <ZLProgressDialog.h>
-diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
-index 9cf7c47..03f1223 100644
---- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
-+++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
-@@ -24,12 +24,12 @@
- #include <QtCore/QSet>
- #include <QtCore/QMap>
- 
--#include <QtGui/QDialog>
--#include <QtGui/QScrollArea>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
--#include <QtGui/QWidget>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QScrollArea>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QWidget>
- 
- #include <ZLTreeDialog.h>
- 
-diff --git a/zlibrary/ui/src/qt4/library/ZLQApplication.h b/zlibrary/ui/src/qt4/library/ZLQApplication.h
-index c08c536..a714fa9 100644
---- a/zlibrary/ui/src/qt4/library/ZLQApplication.h
-+++ b/zlibrary/ui/src/qt4/library/ZLQApplication.h
-@@ -20,7 +20,7 @@
- #ifndef __ZLQAPPLICATION_H__
- #define __ZLQAPPLICATION_H__
- 
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- 
- class ZLQApplication : public QApplication {
- 
-diff --git a/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
-index 9648e95..a544031 100644
---- a/zlibrary/ui/src/qt4/library/ZLibrary.cpp
-+++ b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
-@@ -19,7 +19,7 @@
- 
- #include <QtCore/QTextCodec>
- #include <QtCore/QFile>
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtGui/QFileOpenEvent>
- 
- #include <ZLApplication.h>
-@@ -72,7 +72,7 @@ bool ZLQApplication::event(QEvent *e) {
- void ZLQtLibraryImplementation::init(int &argc, char **&argv) {
- 	new ZLQApplication(argc, argv);
- 
--	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
-+	QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
- 
- 	ZLibrary::parseArguments(argc, argv);
- 
-diff --git a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
-index cdaef01..a259c65 100644
---- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
-+++ b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
-@@ -3,7 +3,7 @@
- 
- #include <QtCore/QTimer>
- 
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- #include <QtGui/QColor>
- 
- class QtWaitingSpinner : public QWidget {
-diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
-index 1b8ebcc..6f3b4e3 100644
---- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
-+++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
-@@ -20,11 +20,11 @@
- #ifndef __ZLQTPREVIEWWIDGET_H__
- #define __ZLQTPREVIEWWIDGET_H__
- 
--#include <QtGui/QWidget>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QScrollArea>
--#include <QtGui/QVBoxLayout>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QScrollArea>
-+#include <QtWidgets/QVBoxLayout>
- #include <QtCore/QSet>
- 
- #include <ZLTreePageNode.h>
-diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
-index f6e174c..c360965 100644
---- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
-+++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
-@@ -21,8 +21,8 @@
- #define __ZLQTSEARCHFIELD_H__
- 
- #include <QtCore/QSet>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLineEdit>
- 
- #include "QtWaitingSpinner.h"
- #include "ZLQtItemsListWidget.h"
-diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
-index 4f5d196..615050c 100644
---- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
-+++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
-@@ -19,8 +19,8 @@
- 
- #include <algorithm>
- 
--#include <QtGui/QLayout>
--#include <QtGui/QScrollBar>
-+#include <QtWidgets/QLayout>
-+#include <QtWidgets/QScrollBar>
- #include <QtGui/QPainter>
- #include <QtGui/QPixmap>
- #include <QtGui/QMouseEvent>
-@@ -185,11 +185,11 @@ void ZLQtViewWidget::repaint()	{
- 
- void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
- 	if (direction == ZLView::VERTICAL) {
--		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
--		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
-+		myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
-+		myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
- 	} else {
--		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
--		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
-+		myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
-+		myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
- 	}
- }
- 
-diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
-index 6fabf00..ccec1e3 100644
---- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
-+++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
-@@ -20,7 +20,7 @@
- #ifndef __ZLQTVIEWWIDGET_H__
- #define __ZLQTVIEWWIDGET_H__
- 
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- 
- #include "../../../../core/src/view/ZLViewWidget.h"
- #include <ZLApplication.h>
diff --git a/app-text/fbreader/files/fbreader-0.99.4.patch b/app-text/fbreader/files/fbreader-0.99.4.patch
deleted file mode 100644
index deb90228301d..000000000000
--- a/app-text/fbreader/files/fbreader-0.99.4.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2013-02-21 13:30:31.000000000 +0700
-@@ -49,3 +49,4 @@
- 	  path = replacement + path.substr(1);
- 	}
-+	ZLUnixFSManager::normalizeRealPath(path);
- }
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index eabe9802dc75..487baea0d3ce 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,7 +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-gpl-9.25-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 EBUILD ghostscript-gpl-9.21.ebuild 5550 BLAKE2B 12dcddca96c1105b887ef804a1d7f6c6d5826691ee6e8ba525be77e65da82fa6f9910612ce84387ce9212c8ffffd3dacf4f10829256534582d7fb0bd09fc7cfb SHA512 b60cc50269906af827142897afb056d88a67e3ee10387d77a6b0b75d351bfb6239df41f9baa4e99d3d4f28ba38ea8849a282a0fc75e7aba25f2f707eee29f969
-EBUILD ghostscript-gpl-9.25.ebuild 5548 BLAKE2B 5f8f890e5e3dd1136addff28a811bc0c8d7f9595dc9488c7a2dc01bce601d8a954ac8a273f153382db8f8d9b950a61126949b313fdeecc26c7d75ba627eea829 SHA512 9d7e18ca64f39e68fb90ef0fa2a237719ee4ec70bf24149444a66e6a382fc4da7f5940e4c38fe53b136464258348e1fa7b6b4dda36728d282aa088d722fb3be1
+EBUILD ghostscript-gpl-9.25-r1.ebuild 5221 BLAKE2B d1eab61ccaec0860c96b736edcb94266f2b7b204ffa6c55b6e6270fbced47702abc01a081a070b97fb07bfd3e8f3ad6bb8ee85824d53be781413e1436488390f SHA512 969812796d605878c006157337ece0c3090812be249c7e298e85de79c13f60dbe2e238528d2c7875c3712a8e413d0e63345ba13765f69f182cb70404cfddcf9c
+EBUILD ghostscript-gpl-9.25.ebuild 5547 BLAKE2B 4db72cbd3379b85c980ec5ecd3b6953330c3835d8d184dbab8327ee95dbd78a77655468db6ed6ca2028eed4cdb6ccbb278a8fc89c0cf59ebeb14164961811c53 SHA512 60226db1126b70e11bd924d90d2bf399bb80846777a3ca557e7f8fb00ba72f67f8c872a1fc36381885151c224b95ce871733ab10da928108d0d0a78a7c6b871b
 MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch
new file mode 100644
index 000000000000..34cc2ec88c14
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.25-no-gtk3.patch
@@ -0,0 +1,43 @@
+From a73071b87a61acf1237da5ad9da59bae9316fb8c Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Mon, 8 Oct 2018 09:24:22 +0100
+Subject: [PATCH] Bug 699907: Reinstate GTK+ 2.x.x code.
+
+The fix (from March 2018) for deprecated API calls in the GTK+ 3.x.x API
+didn't account for the new, supported methods not being available in
+GTK+ 2.x.x. Handle both cases, as we do elsewhere.
+---
+ psi/dxmain.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/psi/dxmain.c b/psi/dxmain.c
+index 72c060e..250269a 100644
+--- a/psi/dxmain.c
++++ b/psi/dxmain.c
+@@ -354,17 +354,23 @@ static void window_resize(IMAGE *img)
+ #endif
+ 
+     if (!visible) {
+-        guint width, height;
+         /* We haven't yet shown the window, so set a default size
+          * which is smaller than the desktop to allow room for
+          * desktop toolbars, and if possible a little larger than
+          * the image to allow room for the scroll bars.
+          * We don't know the width of the scroll bars, so just guess. */
++#if !GTK_CHECK_VERSION(3, 0, 0)
++        gtk_window_set_default_size(GTK_WINDOW(img->window),
++            min(gdk_screen_width()-96, img->width+24),
++            min(gdk_screen_height()-96, img->height+24));
++#else
++        guint width, height;
+         width = gtk_widget_get_allocated_width (img->window) - 96;
+         height = gtk_widget_get_allocated_height (img->window) - 96;
+         gtk_window_set_default_size(GTK_WINDOW(img->window),
+             min(width, img->width+24),
+             min(height, img->height+24));
++#endif
+     }
+ }
+ 
+-- 
+2.9.1
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild
new file mode 100644
index 000000000000..29eea9194c57
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.25-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_P=${P/-gpl}
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+MY_PATCHSET=1
+
+SRC_URI="
+	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
+"
+
+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"
+IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
+
+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=
+	media-libs/jbig2dec
+	>=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
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	unicode? ( net-dns/libidn:= )
+	tiff? ( >=media-libs/tiff-4.0.1:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+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 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-gtk3.patch" # bug 668160
+)
+
+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 -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 -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	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 -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	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' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd ijs || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with tiff system-libtiff) \
+		$(use_with X x)
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd ijs || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
+
+	# install our own cidfmap to handle CJK fonts
+	insinto /usr/share/ghostscript/${PVM}/Resource/Init
+	doins \
+		"${WORKDIR}/fontmaps/CIDFnmap" \
+		"${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use l10n_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
+		fi
+	done
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+	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
+	fi
+}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
index cc134164797d..5aabd4e86a3a 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
@@ -21,7 +21,7 @@ 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="
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index da85aff6a078..b1c888b24fd4 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,7 +1,10 @@
 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 2395 BLAKE2B 49772d94f2806f8e6cdda15f68aa89e2dc2eefa307d363a05f5e16c6fcac8118587119c4142b87c467eec51e1a7b43e3731e942b8f03f9a8e55c2dda62e5debc SHA512 79637a9c568b35a50e218254e1a3531fb27b05e694c0cb42bf2470810698010709e31101f1f6da02c60dfb08356808109ab1505175ad193350de6284a33c3d9b
+EBUILD hunspell-1.6.2-r1.ebuild 2389 BLAKE2B d3e57f6f649c1457b4c9c74731a7ae05a71f5c1bfe634774b8fa0cf5f77d58cfc5cc69b9a903dc54fb74faf75502bfef594d992b30a205f46983623105aea14b SHA512 fbf2ddb1146f0dd83d26e60abb45816ba21d04db313f3d5913c26cc88e662cc685741d30a729e01d7cea0dc9720b43aaa998e22f24e391627593211271f02b7d
+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.7.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch
new file mode 100644
index 000000000000..c45b9cc8a154
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch
@@ -0,0 +1,166 @@
+From d3e2d1d29615f4861fd3354353d426bd8701389d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 13 Nov 2018 10:37:42 +0100
+Subject: [PATCH] Rename some executables which have too generic names
+
+to be placed in /usr/bin - this patch prefixes them with 'hunspell-'
+
+Real authorship is a bit unclear as Gentoo is using this kind of patch since
+hunspell-1.1.3 which was added to Gentoo back in 2006-01-29 and the
+corresponding bug report didn't mention the patch at all:
+
+https://bugs.gentoo.org/114482
+https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch?hideattic=0&view=log
+---
+ src/tools/Makefile.am | 14 +++++++-------
+ src/tools/chmorph.cxx |  6 +++---
+ src/tools/example.cxx |  4 ++--
+ src/tools/munch.cxx   |  4 ++--
+ src/tools/unmunch.cxx |  4 ++--
+ tests/Makefile.am     |  2 +-
+ tests/test.sh         |  2 +-
+ 7 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
+index 1786e8e..190bffe 100644
+--- a/src/tools/Makefile.am
++++ b/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
+ 
+ AM_CPPFLAGS=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+ 
+@@ -6,8 +6,8 @@ hzip_SOURCES=hzip.cxx
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.7.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.7.la
+@@ -17,11 +17,11 @@ nodist_hunspell_SOURCES= ../../config.h
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ 	../hunspell/libhunspell-1.7.la @CURSESLIB@ @READLINELIB@
+ 
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.7.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.7.la
+ 
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
+ 
+ noinst_PROGRAMS=example 
+ 
+diff --git a/src/tools/chmorph.cxx b/src/tools/chmorph.cxx
+index 6e5add6..163186d 100644
+--- a/src/tools/chmorph.cxx
++++ b/src/tools/chmorph.cxx
+@@ -55,11 +55,11 @@ int main(int, char** argv) {
+     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);
+diff --git a/src/tools/example.cxx b/src/tools/example.cxx
+index 8213a5f..c3cc76a 100644
+--- a/src/tools/example.cxx
++++ b/src/tools/example.cxx
+@@ -48,9 +48,9 @@ int main(int argc, char** argv) {
+   /* 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);
+   }
+ 
+diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx
+index 5f51fc6..c8f8beb 100644
+--- a/src/tools/munch.cxx
++++ b/src/tools/munch.cxx
+@@ -78,14 +78,14 @@ int main(int argc, char** argv) {
+     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);
+   }
+ 
+diff --git a/src/tools/unmunch.cxx b/src/tools/unmunch.cxx
+index 82c2f9d..663e8ea 100644
+--- a/src/tools/unmunch.cxx
++++ b/src/tools/unmunch.cxx
+@@ -73,14 +73,14 @@ int main(int argc, char** argv) {
+     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);
+   }
+ 
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 6dc3e93..88d882c 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -4,7 +4,7 @@ SUBDIRS = suggestiontest
+ 
+ TEST_EXTENSIONS = .dic
+ AM_TESTS_ENVIRONMENT = export HUNSPELL=$(top_builddir)/src/tools/hunspell; \
+-                       export ANALYZE=$(top_builddir)/src/tools/analyze; \
++                       export ANALYZE=$(top_builddir)/src/tools/hunspell-analyze; \
+                        export LIBTOOL=$(top_builddir)/libtool;
+ DIC_LOG_COMPILER = $(top_srcdir)/tests/test.sh
+ 
+diff --git a/tests/test.sh b/tests/test.sh
+index 3fcf42c..8580d09 100755
+--- a/tests/test.sh
++++ b/tests/test.sh
+@@ -64,7 +64,7 @@ fi
+ shopt -s expand_aliases
+ 
+ [[ "$HUNSPELL" = "" ]] && HUNSPELL="$(dirname $0)"/../src/tools/hunspell
+-[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/analyze
++[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/hunspell-analyze
+ [[ "$LIBTOOL" = "" ]] && LIBTOOL="$(dirname $0)"/../libtool
+ alias hunspell='"$LIBTOOL" --mode=execute "$HUNSPELL"'
+ alias analyze='"$LIBTOOL" --mode=execute "$ANALYZE"'
+-- 
+2.19.1
+
diff --git a/app-text/hunspell/hunspell-1.6.2-r1.ebuild b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
index 257fddabc455..142389ea0fad 100644
--- a/app-text/hunspell/hunspell-1.6.2-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.6.2-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
@@ -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/hunspell/hunspell-1.7.0.ebuild b/app-text/hunspell/hunspell-1.7.0.ebuild
new file mode 100644
index 000000000000..f21f176c90c4
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/hunspell"
+
+SLOT="0/$(ver_cut 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=""
+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 THANKS license.hunspell
+	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.7.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
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with ncurses ui)
+		$(use_with readline readline)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	#342449
+	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
+	popd >/dev/null
+}
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index 71f88faebac4..df2f1936effe 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1,4 +1,6 @@
 DIST libodfgen-0.1.6.tar.xz 359988 BLAKE2B 89ef70762780efa70ea044758d3c5e677024897bcd1f031c15544dc2e5cc0115bd286ca21051b8223768a2253eb681bdea534230c517de9c00a0a1f5b320eaf3 SHA512 bc5e6908ee14c576adececdf8a94ae01f2ed487e6f2490e41aab787e1e8f72a3fb2a786f51ceeefa327710af215741ce13bcf4bb3d99d2aaf403f568c5db75a5
+DIST libodfgen-0.1.7.tar.xz 384760 BLAKE2B 93066e52c0651e3714843764f0d023178cf0ddb52c1185f085c70180f4123cd26d79b9ea2c211a82f2681c42c8795c3f062f081161effa7fe821b64b54b82cd8 SHA512 eaf5c6646a9cacf54cb0416b08526f35d18d0618f3f64cf14f4b24537b0285da2786d2f6d6e2c204c8248f900d37287b2c5af79720b0d49452f67b14c86ea36e
 EBUILD libodfgen-0.1.6.ebuild 899 BLAKE2B 2c43dc49dbab829d73b66ea4de39dd435746a5c4272f17ddec5c10f337749f0ee38ab957e3bd8593009e8d01735efc64bb141cd2662bf4bd9b99d7d2c8a627f4 SHA512 e0eff9df3cc4632153e8fe3b6187112d16ee0d631eea999ba661d6c623515fd18e831a8f6197decb6709e6639371af511cd589abe5b904f44436f7f5c53861bc
-EBUILD libodfgen-9999.ebuild 887 BLAKE2B bc6f0f5f96b318c45b51928dc79faf3184b7079ed310fcdf8ad53bb3d00c3f68e2634a218366f403664e60d5fe973ddc8b511c6fe39bba9415cc1627cb9bccb8 SHA512 801ff64c3f1fc23dcd53500a8cff20434bf4f9416d968df681961e82a72e0b8e96b97a2a10fbbd2fb7838e9437c61f24a218822d876b2df68d5a6e9d98f63ad6
+EBUILD libodfgen-0.1.7.ebuild 838 BLAKE2B 0550b7d1cfeabb1d2224e7a6df1527c1ba4592d64de6724a4a81c97ed9cb65ea6eae573c93a1b9ec447da2d0940a7892e12f8af926b95dd2075635889b23aa0a SHA512 23ffdea142a61bdb48461ae73a883de8a51d7225fe016f41270c630301485b8140aba193bf8046a418ab2af3b8b05817cae1e8915694f266e78778e49c9a1d40
+EBUILD libodfgen-9999.ebuild 838 BLAKE2B 0550b7d1cfeabb1d2224e7a6df1527c1ba4592d64de6724a4a81c97ed9cb65ea6eae573c93a1b9ec447da2d0940a7892e12f8af926b95dd2075635889b23aa0a SHA512 23ffdea142a61bdb48461ae73a883de8a51d7225fe016f41270c630301485b8140aba193bf8046a418ab2af3b8b05817cae1e8915694f266e78778e49c9a1d40
 MISC metadata.xml 331 BLAKE2B 4bb9537b8eacb393e4dd38a4199d954aa12aa917f626ffd125cecb49c2fe4b4e866bc33c941323eae45c2b804fdadc1e7200a1dfe6f57472a5e1a7881bf68bc1 SHA512 f96053e0336bf862446e0ca96ca743a1b7fac4977e6d5d4b9781424ac33a3d89c3e4c334eb27a427d3f83c2c437e8fe4b0eaf4ed87513c3eeaae39a72db8767d
diff --git a/app-text/libodfgen/libodfgen-0.1.7.ebuild b/app-text/libodfgen/libodfgen-0.1.7.ebuild
new file mode 100644
index 000000000000..03f14c4c7029
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.1.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sourceforge.net/"
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+
+IUSE="doc"
+
+RDEPEND="dev-libs/librevenge"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
index 3e7137661d27..03f14c4c7029 100644
--- a/app-text/libodfgen/libodfgen-9999.ebuild
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libwpd/libodfgen"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
 
 DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
-HOMEPAGE="http://libwpd.sf.net"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
-
+HOMEPAGE="http://libwpd.sourceforge.net/"
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
 
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-
 IUSE="doc"
 
-RDEPEND="
-	dev-libs/librevenge
-"
-DEPEND="${RDEPEND}
+RDEPEND="dev-libs/librevenge"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
@@ -34,8 +33,6 @@ src_prepare() {
 src_configure() {
 	econf \
 		--disable-static \
-		--disable-werror \
-		--with-sharedptr=c++11 \
 		$(use_with doc docs)
 }
 
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index ff1d877ff49f..4ab9d90a181a 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,3 +1,3 @@
 DIST libwpd-0.10.2.tar.xz 536400 BLAKE2B a4ed9b8c790898436e08afd0f571c4a4b31615228248116b24bad38d07df7837982df1ffa98b0ad442cfec417fc90eb089642b32e3a094323e75fb8fc7cb8da7 SHA512 821dbc0535ebd4fa41bcf984e344e11176862676c66abebe45cf4284f8de6e6cc7629f8a605b169d034a5c2f3e2461513d61e11e549ca73b8328eb66ac3bdd79
-EBUILD libwpd-0.10.2.ebuild 1311 BLAKE2B 72b68c00b543e90d9b0a4eb300b2e28d904466f226c442d4b21eea571c9df20fca884da5b1c2ae10bfdfef3beb68d99c60edbfdf4e90ce56241f17c62e0dc472 SHA512 9f07b6114ebe981cab729998325799f9bca04ae89d89601f6349839868a12ee506c955918cb3f976899fc313cf0dd5c10abe860f3797c8bf610055155ee33324
+EBUILD libwpd-0.10.2.ebuild 1324 BLAKE2B 7d298a3ce2f723baef5e8ba90edb29d4c2ed85e581e6bd60a417a77dfc279fef86be2092ff68b820ff1dd6373303b256688ad8412fcd45bc246c10a035885e73 SHA512 7baac381bbfe57063de284c5480e45c1b918e8b0e3874b561e9fef0e02fb66d89be2c68b859b5cd591d5e6a76d48ef4003e30d24f83d584df2147955a9e71783
 MISC metadata.xml 402 BLAKE2B 449d3fa4ee2b0be84bca5eca7708b2e318060e7d85c84369ab16923edfa4bd3a19eed80b11d3cbd7c4d9a12e2d3d07df6b0aad95f011d1ce100fd9a6fd22206c SHA512 af33c7d44f5766cadb1955928210dc6f28171eef00cfbdd96a0257226bb7eee560fb05cf58673dfbbef932600ec3e8fafa666db3f9c3ddd2bcfa5a2a90cd77f2
diff --git a/app-text/libwpd/libwpd-0.10.2.ebuild b/app-text/libwpd/libwpd-0.10.2.ebuild
index 4e53191397cb..48e245627e30 100644
--- a/app-text/libwpd/libwpd-0.10.2.ebuild
+++ b/app-text/libwpd/libwpd-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ IUSE="doc +tools"
 
 RDEPEND="dev-libs/librevenge"
 DEPEND="${RDEPEND}
+	dev-libs/boost
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 "
diff --git a/app-text/msort/Manifest b/app-text/msort/Manifest
new file mode 100644
index 000000000000..dcd5a42c4054
--- /dev/null
+++ b/app-text/msort/Manifest
@@ -0,0 +1,8 @@
+AUX msort-8.53-find-utf8proc-headers.patch 1540 BLAKE2B 2dd8cf34a982048df63cd4dab0aae8730975c1562e8fb818336a84827b93ee2cf75cc66179d0f92d4be9d5fe3316b01058bc0c69bf1322d97836c46a511f3e14 SHA512 fe19465012ded3532db5bd4cca30f3a8721d42d2301e232144be411a364941c7d63da47ea5b6c9d70cb7631bcd3fb50fcefa96421f2e79e5bbc3831ff3307b53
+AUX msort-8.53-fix-icu-build.patch 239 BLAKE2B ff53316fd6b1f531b432655d1fac1c3b24c114ea35ae63f4f4bb65f4598db2039dae80103bf942ba2ecd269ae3fb8ea9735bee71907876a6494181db052941ee SHA512 86f7c131166a568dd3b9534662c02681396686d9642d6cbdb6b4128d0c6c8eeec9660c8e5f9c8156e78e096a668ec67eba52e9c368455f40002e18de4dddf269
+AUX msort-8.53-fix-missing-limits-header.patch 559 BLAKE2B cb158b619540aa9679d845c1c94986f3bbe9f75aab0069d7a12133043ba547d13d26727251cf2524e4e285d0f1207ea43353972eea782198dda34456b984707a SHA512 9e779627e2f92955dc66b03fb64fce767e2cbf2dcdd8a42c9e10f06b512625be10434a47c26a9b7c46e1a15c226d4f66eeda21194f9a0d3eb6deb801b83633eb
+AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010b04a8fbb24c2043f5436dc866c2dc5b76de4c2639103ecf75bd12ec6d63fa9e2922ac79c8e97a6939c74fe5f37d026af8325c1b161b0f42 SHA512 6d7e1ddf68240f27055a43cddf9e99594ca2ff20c0d666b8e3e09f74c319b38432d15c0b608f76aa5732b6145f1d3120f618cca398c8a68bef4a394949df55dc
+AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e
+DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573
+EBUILD msort-8.53.ebuild 1027 BLAKE2B 571a85f6b89dd74991d9923496313e5070a574141141211ac1211d7f841395cfd875fa55dbb3a9523d7952d3dc862377ad2f950264adec65c1c744c41230d8e3 SHA512 3fd422e2bbccc815c7adf26a8540e7cedab74d9855de19cfdfc9c36c461a0055fa2f73c46c8a5bcb3a2543ad5ac41403c4ed99fde0bd8cd1704008987a0636d3
+MISC metadata.xml 1119 BLAKE2B dc935ff36b3a965f890dda09b161d321cad04d3b8f427c8ef611bf6ba728ec97bb0622d012a837fbd8bf2ae1a4bd79b4bfd8314039a515c4b36375b71b69548e SHA512 4185e0b60575cb60fb14392f24286fa8d94a15ce81c6fdbfb5d5031d7dccb170861bfa6b78a2851ad3347fcdd1bd6b9b05973e9b243561a172a69921ccf2fbbc
diff --git a/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch b/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch
new file mode 100644
index 000000000000..9b3845bc601c
--- /dev/null
+++ b/app-text/msort/files/msort-8.53-find-utf8proc-headers.patch
@@ -0,0 +1,33 @@
+--- a/configure.ac	2010-01-11 01:56:36.000000000 +0100
++++ b/configure.ac	2018-09-27 15:05:20.205734233 +0200
+@@ -94,7 +94,7 @@
+ AC_CHECK_HEADERS([alloca.h ctype.h errno.h gnu/libc-version.h langinfo.h libintl.h limits.h locale.h stdargs.h stddef.h stdint.h stdlib.h string.h sys/file.h sys/stat.h time.h tre/tre.h unicode/umachine.h unicode/unorm.h  uninum/unicode.h uninum/nsdefs.h uninum/uninum.h unistd.h wchar.h wctype.h])
+ 
+ if ${utf8proc}; then
+-AC_CHECK_HEADER([utf8proc.h],[AC_DEFINE([HAVE_UTF8PROC_H], [1],[Define to 1 if you have <utf8proc.h>.])],[AC_MSG_ERROR([LIB UTF8PROC and its header is obligatory. See http://www.flexiguided.de/publications.utf8proc.en.html])])
++AC_CHECK_HEADER([libutf8proc/utf8proc.h],[AC_DEFINE([HAVE_UTF8PROC_H], [1],[Define to 1 if you have <libutf8proc/utf8proc.h>.])],[AC_MSG_ERROR([LIB UTF8PROC and its header is obligatory. See http://www.flexiguided.de/publications.utf8proc.en.html])])
+ fi
+ 
+ if ${uninum}; then
+--- a/misc.c	2009-08-05 05:09:21.000000000 +0200
++++ b/misc.c	2018-09-27 15:10:37.355738021 +0200
+@@ -41,7 +41,7 @@
+ #include <unicode/umachine.h>
+ #include <unicode/unorm.h>
+ #else
+-#include <utf8proc.h>
++#include <libutf8proc/utf8proc.h>
+ #include "unorm.h"
+ #endif
+ #include <tre/regex.h>
+--- a/msort.c	2010-01-11 01:53:32.000000000 +0100
++++ b/msort.c	2018-09-27 15:10:30.275737936 +0200
+@@ -57,7 +57,7 @@
+ #ifndef USEUTF8PROC
+ #include <unicode/unorm.h>
+ #else
+-#include <utf8proc.h>
++#include <libutf8proc/utf8proc.h>
+ #include "unorm.h"
+ #endif
+ #ifdef HAVE_UNINUM_UNICODE_H
diff --git a/app-text/msort/files/msort-8.53-fix-icu-build.patch b/app-text/msort/files/msort-8.53-fix-icu-build.patch
new file mode 100644
index 000000000000..658be287e5ee
--- /dev/null
+++ b/app-text/msort/files/msort-8.53-fix-icu-build.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am	2009-08-05 05:09:21.000000000 +0200
++++ b/Makefile.am	2018-09-27 15:41:10.685759919 +0200
+@@ -22,7 +22,7 @@
+ LIBS+=-lutf8proc
+ AM_CFLAGS += -DUSEUTF8PROC
+ else
+-LIBS+=-licutu
++LIBS+=-licutu -licuuc
+ endif
+ 
+ msg:	msg.tcl
diff --git a/app-text/msort/files/msort-8.53-fix-missing-limits-header.patch b/app-text/msort/files/msort-8.53-fix-missing-limits-header.patch
new file mode 100644
index 000000000000..14459d1cfd24
--- /dev/null
+++ b/app-text/msort/files/msort-8.53-fix-missing-limits-header.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am	2009-08-05 05:09:21.000000000 +0200
++++ b/Makefile.am	2018-09-27 15:32:28.685753684 +0200
+@@ -6,7 +6,7 @@
+ noinst_HEADERS = comparisons.h compdefs.h dstr.h ex_codes.h exitcode.h input.h key.h limits.h record.h retcodes.h unicode.h  unorm.h utf8error.h
+ LOCALEDIR=/usr/local/share/locale
+ EXTRA_DIST = $(docs) msg.tcl CREDITS msort-${VERSION}.lsm RegressionTests SortOrders
+-AUTOMAKE_OPTIONS = dist-zip dist-bzip2
++AUTOMAKE_OPTIONS = dist-zip dist-bzip2 nostdinc
+ 
+ if ALLOCAOK
+ AM_CFLAGS = -DLOCALEDIR=\"${LOCALEDIR}\" -DALLOCAOK -std=gnu99
diff --git a/app-text/msort/files/msort-8.53-fix-segfault-on-certain-input.patch b/app-text/msort/files/msort-8.53-fix-segfault-on-certain-input.patch
new file mode 100644
index 000000000000..01edc69eb7da
--- /dev/null
+++ b/app-text/msort/files/msort-8.53-fix-segfault-on-certain-input.patch
@@ -0,0 +1,11 @@
+--- a/dstr.c	2009-08-05 05:09:21.000000000 +0200
++++ b/dstr.c	2018-09-27 15:43:52.815761856 +0200
+@@ -79,7 +79,7 @@
+ #ifdef SAFECALL
+   if(length == 0) return(ERROR);
+ #endif
+-  if (length > tgt->c) {
++  if (length + 1 > tgt->c) {
+     if(tgt->s != NULL) free( (void *) tgt->s);
+     tgt->s = (wchar_t *) malloc((length + 1) * sizeof(wchar_t));
+     if(tgt->s == NULL) return(ERROR);
diff --git a/app-text/msort/files/msort-8.53-respect-users-cflags.patch b/app-text/msort/files/msort-8.53-respect-users-cflags.patch
new file mode 100644
index 000000000000..aefe84772447
--- /dev/null
+++ b/app-text/msort/files/msort-8.53-respect-users-cflags.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2010-01-11 01:56:36.000000000 +0100
++++ b/configure.ac	2018-09-27 15:36:41.425756703 +0200
+@@ -78,8 +78,6 @@
+ AC_PROG_CC
+ if ${debugbuild}; then
+    CFLAGS="-ggdb -g3" 
+-else
+-   CFLAGS="-g -O2" 
+ fi
+ 
+ AC_PROG_INSTALL
diff --git a/app-text/msort/metadata.xml b/app-text/msort/metadata.xml
new file mode 100644
index 000000000000..f7bd381f8067
--- /dev/null
+++ b/app-text/msort/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Msort is a program for sorting files in sophisticated ways.
+		It was originally developed for alphabetizing dictionaries of "exotic" languages
+		in formats like those used by Shoebox and Toolbox, for which it has been extensively used,
+		but is useful for many other purposes.
+		Msort differs from typical sort utilities in providing greater flexibility in parsing
+		the input into records and identifying key fields and greater control over the sort order.
+	</longdescription>
+	<use>
+		<flag name="heap">Use heap instead of alloca()</flag>
+		<flag name="icu">Use <pkg>dev-libs/icu</pkg> instead of <pkg>dev-libs/libutf8proc</pkg>.</flag>
+		<flag name="libuninum">Use <pkg>dev-libs/libuninum</pkg> for conversion.</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53.ebuild
new file mode 100644
index 000000000000..d401053463c1
--- /dev/null
+++ b/app-text/msort/msort-8.53.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A program for sorting files in sophisticated ways"
+HOMEPAGE="https://billposer.org/Software/msort.html"
+SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+IUSE="heap +icu +libuninum"
+
+RDEPEND="dev-libs/tre
+	icu? ( dev-libs/icu:= )
+	!icu? ( dev-libs/libutf8proc:= )
+	libuninum? ( dev-libs/libuninum:= )"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-find-utf8proc-headers.patch"
+	"${FILESDIR}/${P}-fix-icu-build.patch"
+	"${FILESDIR}/${P}-fix-missing-limits-header.patch"
+	"${FILESDIR}/${P}-fix-segfault-on-certain-input.patch"
+	"${FILESDIR}/${P}-respect-users-cflags.patch"
+	)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable !heap allocaok)
+		$(use_enable !icu utf8proc)
+		$(use_enable libuninum uninum)
+		--disable-debugbuild
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 59cfd3f7d1db..34b5d2621a59 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -1,13 +1,15 @@
 AUX openjade-1.3.2-acinclude.m4 1922 BLAKE2B 1fe4500e45ffa14774b1c20257907732b9ff593c2a31146929859bc16cd9ac66619093a725bc60e1e7c1af812d4d1f87ab2742c737a424f95b43c3fd4e15aaca SHA512 76915d34e746f85eb15d2c79cc7a030070e5d266e3b2520d2321195f19c13aebc9a28fc4298006ab90a73148baebda568b3dc29517505224b78a8c244c2c0fdb
+AUX openjade-1.3.2-chmod.patch 311 BLAKE2B db74402d322ad11f1c4c5688df7db3c0b097182ca44518228cd29bbcd1bebce75da171ef460172153c88de7e19efeac2f2710499983d056fe702fcbf81210873 SHA512 90968a6ba70dfb75060859229e2ce8507bab9f9a5045f9b379ac810aaac6c99d7d229d988924254722b168007e6c72dbd38025ebd470095f2d0f5b11e2422f11
 AUX openjade-1.3.2-deplibs.patch 1506 BLAKE2B 44b81cd550202a21489bf14a1ddf6be2f27f3675671e644ddbec8580394d956a76f5d6d82cc4be7bd7bbf8d180c278675c0274cc79431553e7123b9448db3e07 SHA512 4a7df423c8b8ad15a1a39900c1bb6882157534c981a9c0679b2c6d71a435b6bf3adf27052799a9eb1dd4f6ecd7e19be72889d9a55c7511ffde9dd11f4c558d9e
 AUX openjade-1.3.2-gcc46.patch 2164 BLAKE2B 08d9ac31c20e3b2a27c92a0b14141404d7508a9cc269ca28e4af6405e7be560866df51e34270a98603b363aefc7ee1b0c7a3d6f882f0ec2f246bef4ab3a0b623 SHA512 df222938e4a04d27618540592e61b8d71fe42caaa4d8aeb90bfcd338efb1ff7903ea860dc460b65a69adf1ccf300a7d67459ff4950a35d9a35569fb8b3ed1438
 AUX openjade-1.3.2-ldflags.patch 819 BLAKE2B 8ac32c3d629c57439336830c58421463cd628d9cb13e43db7b734c83d26d35e8d18bd2f736ef620816f359d15955dade6ffca42a1fa583b67670f733cf0516cf SHA512 6112fbc474f0f2c3c024040b42b13290ba2763381b7f99071d7d9d4f8d11bf1087a2c319eba9f0006e2cc067a14a52cedde98444338b180f9566172b52c044ec
 AUX openjade-1.3.2-libosp-la.patch 1725 BLAKE2B 14521987d8c20c1276d72136c4ec046e35e1fc23b758d44e105c92cd31346c7bc53ca956b0f1f0385c8deaa6aaf6231ece753250560d117ca9c5d330e51bbdb1 SHA512 9b73b95ce3ac1d0042641eb0ddbb5ce753d2fd639dab026b9eab0f45bb3231515c69670f02c2a0793d950b6a6276f94e838d273f01e43694e97525af65903a0e
 AUX openjade-1.3.2-msggen.pl.patch 748 BLAKE2B 2329df5658b10bcd2e2e8986b7313b3c5256b4415e084ff3c189b4e0788430c138f76a5329446a78315acd4d6ab4582fcfd05792100d7a71d241c40353665825 SHA512 31f25e96bb3df3d8c0850a6ca2c2f0e59c19d23aa62a697ea475c9d2a5a36f5e1fcf807878ca7be5b57538b96d3295591466f1035edd9a885e035525f445b410
-AUX openjade-1.3.2-no-undefined.patch 434 BLAKE2B 69bf4b67166ef4253c88303ee0f682af0f09ccf4f3e3494f03119e1b17cfca9d37ca555ccac17a5b51946e2560fa43fecc408080aef812f4e0e20b5e3f645ff0 SHA512 fcabb03a649150a05b847fe9f367dffb8b2df4b8635bea8f50a433afb43bab4d6bc58c0bad705b84421d4c5e1d19e2df03065d89544d023c225c0f529f168656
+AUX openjade-1.3.2-no-undefined.patch 438 BLAKE2B a64392f7f11f69994ef2e7708e0346f1da877b3abef73e37f3d9e2e90db21783ce57e8d98cb0eef37964af4d0cc0087f3cf873da95907bc89f6c92731f76e813 SHA512 5ae0f893e1bf6f80247db80ec5333ba13a50e98a1e3d6ec9739f665fd74ad718be155e0ebeb90836bb5e4fe6651b62f42d92b27fdbefdf167f1351b772d1a459
 AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4814b91c5cefeac551f028cbbedeaf773ae7597b100785a5f53d0a428e95b6b2d1d6e235ac2c52ee53bd16b6fecdd394f3234b SHA512 bca7e9550329bc033a1df4ca78bc1ae75b12f27fdecc6aafff136fd81c93f88045ca675dd03e711b4d428a3de832f3bfa703d639319a2b348a2f8268091658d8
-AUX openjade-1.3.2-wchar_t-uint.patch 492 BLAKE2B f08e967feb9944285d0eb7b257841432ef4a462386c4609908e1fc8678e18fcde72d99d49c7f527f7b4e200c16ce834aa2781f8881f424b1e2b029cb7647d395 SHA512 5485e8bf2a781f87b14cef2e1b054604a1bca554a682d6f064c940df0b2eadaa1103085e56d57ec6b5bf816792be6ef954095c90349d30d1dd0e37faf766fc0d
+AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d2d5e9ba5414ab931583f1e791ceae948e381e558f8337399e6b853573388041288d0f42d7c45e1f34befb8d65bfa8b03b7 SHA512 e483c08b6ea63e78dfc6351670f7bb6a55927f458c6e922c542981b25389168f32eb79e16554a41c102b19b7fa12489c0303beb35b839dfc9767b5ab9e5e1027
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r7.ebuild 3678 BLAKE2B 477ff1defb0270a6e61b449c896d22b519acbf77f128b53fc45b09a07624cdbec1629e0e79844b9ee732d291323ed2faa772ab66d4e883a63aa5409a6a4e12bd SHA512 5e3678fa85225737b6880bcab51dd64160431cfc6603722a0112735a7cc2220cd98e5c10d05bd1fa9c3967fd8a3a5eb255f0ae20f4671e1b3ac7244f08fc4a34
+EBUILD openjade-1.3.2-r7.ebuild 3700 BLAKE2B b80ec4f9088cfe7d15ceaa84fd14d640e33f48e8a718034e1d7812c25a8376d93b68ae4a7b3e73e7ea17f6ac91a59af227a4f22c6bd5720b1d43e2fbcc744e0e SHA512 5a7df1f6187b35f1ca79777ba33ccc50fce08dcf3528dbe4f8439034104da58152d6fbdb13f5f303bf33cf18ecbf5a1e6d3760c4a293c7bb1c08b0cc0bd70d5d
+EBUILD openjade-1.3.2-r8.ebuild 3713 BLAKE2B 8b0d77dfd1fb724f4af91bf120e73f982520ea55b86180c1e45415cff6676b2d8d3987867820105b539db5ccb8ffe1495682d73ad33bcc0e5e95cf8c88a3273f SHA512 9e271fc764e90bc592cfce95858e179d0f9bed6904ac2872a633006609fa15336b7aa557c953783f3d94f1e399e44006e683bb770c96e24094a2c5daa1ef3fb1
 MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/files/openjade-1.3.2-chmod.patch b/app-text/openjade/files/openjade-1.3.2-chmod.patch
new file mode 100644
index 000000000000..ca8abbd50da8
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-chmod.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.comm.in.orig	2017-07-11 20:14:20.459014115 +0700
++++ b/Makefile.comm.in	2017-07-11 20:14:31.724715876 +0700
+@@ -53,7 +53,7 @@
+ .m4.cxx:
+ 	rm -f $@
+ 	$(PERL) $(srcdir)/../instmac.pl $< >$@
+-	chmod -w $@
++	chmod a-w $@
+ 
+ %.h %.cxx %.rc: %.msg
+ 	$(PERL) -w $(srcdir)/../msggen.pl $(MSGGENFLAGS) $<
diff --git a/app-text/openjade/files/openjade-1.3.2-no-undefined.patch b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
index 1b298f88a6f8..4e5aefc3a865 100644
--- a/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
+++ b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
@@ -1,5 +1,5 @@
---- Makefile.lib.in.orig	2016-05-19 17:20:25.164931700 +0200
-+++ Makefile.lib.in	2016-05-19 17:20:56.539989400 +0200
+--- a/Makefile.lib.in.orig	2016-05-19 17:20:25.164931700 +0200
++++ b/Makefile.lib.in	2016-05-19 17:20:56.539989400 +0200
 @@ -24,7 +24,7 @@
  
  lib$(LIB).la: $(LT_OBJS)
diff --git a/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
index 62dcb02cd2ec..920cff248d60 100644
--- a/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
+++ b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
@@ -1,7 +1,7 @@
 This fixes Cygwin, where wchar_t is ushort.
 
---- grove/Node.h
-+++ grove/Node.h
+--- a/grove/Node.h
++++ b/grove/Node.h
 @@ -8,6 +8,7 @@
  #endif
  
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild
index 15297e079041..95ece1c5ef24 100644
--- a/app-text/openjade/openjade-1.3.2-r7.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r7.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5  # sgml-catalog inherits base, banned in 6
-
-inherit autotools sgml-catalog eutils flag-o-matic multilib toolchain-funcs
+EAPI=7
+inherit autotools sgml-catalog flag-o-matic toolchain-funcs
 
 DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
 HOMEPAGE="http://openjade.sourceforge.net"
@@ -14,20 +13,26 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-RDEPEND="app-text/sgml-common
-	>=app-text/opensp-1.5.1"
-DEPEND="dev-lang/perl
-	${RDEPEND}"
+RDEPEND="
+	app-text/sgml-common
+	>=app-text/opensp-1.5.1
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-deplibs.patch
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-msggen.pl.patch
-	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
-	epatch "${FILESDIR}"/${P}-libosp-la.patch
-	epatch "${FILESDIR}"/${P}-gcc46.patch
-	epatch "${FILESDIR}"/${P}-no-undefined.patch
-	epatch "${FILESDIR}"/${P}-wchar_t-uint.patch
+	default
+
+	eapply "${FILESDIR}"/${P}-deplibs.patch
+	eapply "${FILESDIR}"/${P}-ldflags.patch
+	eapply "${FILESDIR}"/${P}-msggen.pl.patch
+	eapply "${FILESDIR}"/${P}-respect-ldflags.patch
+	eapply "${FILESDIR}"/${P}-libosp-la.patch
+	eapply "${FILESDIR}"/${P}-gcc46.patch
+	eapply "${FILESDIR}"/${P}-no-undefined.patch
+	eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
+	eapply "${FILESDIR}"/${P}-chmod.patch #487218
 
 	# Please note!  Opts are disabled.  If you know what you're doing
 	# feel free to remove this line.  It may cause problems with
@@ -68,9 +73,7 @@ src_configure() {
 }
 
 src_compile() {
-	# Bug 412725.
-	unset INCLUDE
-
+	unset INCLUDE #412725
 	emake -j1 SHELL="${BASH}"
 }
 
@@ -82,7 +85,7 @@ src_install() {
 		libdir="${EPREFIX}"/usr/$(get_libdir) \
 		install install-man
 
-	prune_libtool_files
+	use static-libs || find "${D}" -name '*.la' -delete || die
 
 	dosym openjade  /usr/bin/jade
 	dosym onsgmls   /usr/bin/nsgmls
@@ -98,14 +101,14 @@ src_install() {
 	insinto /usr/share/sgml/${P}/dsssl
 	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
 	newins "${FILESDIR}"/${P}.dsssl-catalog catalog
-# Breaks sgml2xml among other things
-#	insinto /usr/share/sgml/${P}/unicode
-#	doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
+
+	# Breaks sgml2xml among other things
+	#insinto /usr/share/sgml/${P}/unicode
+	#doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
 	insinto /usr/share/sgml/${P}/pubtext
 	doins pubtext/*
 
-	dodoc NEWS README VERSION
-	dohtml doc/*.htm
+	HTML_DOCS="doc/*.htm" einstalldocs
 
 	insinto /usr/share/doc/${PF}/jadedoc
 	doins jadedoc/*.htm
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
new file mode 100644
index 000000000000..af2595cbebd6
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r8.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools sgml-catalog flag-o-matic toolchain-funcs
+
+DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
+HOMEPAGE="http://openjade.sourceforge.net"
+SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	app-text/sgml-common
+	>=app-text/opensp-1.5.1
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+"
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${P}-deplibs.patch
+	eapply "${FILESDIR}"/${P}-ldflags.patch
+	eapply "${FILESDIR}"/${P}-msggen.pl.patch
+	eapply "${FILESDIR}"/${P}-respect-ldflags.patch
+	eapply "${FILESDIR}"/${P}-libosp-la.patch
+	eapply "${FILESDIR}"/${P}-gcc46.patch
+	eapply "${FILESDIR}"/${P}-no-undefined.patch
+	eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
+	eapply "${FILESDIR}"/${P}-chmod.patch #487218
+
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+	strip-flags
+
+	# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
+	# on hppa. Using -O1 works fine. So I force it here.
+	use hppa && replace-flags -O2 -O1
+
+	ln -s config/configure.in configure.ac || die
+	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
+	rm config/missing || die
+
+	AT_NOEAUTOMAKE=yes
+	eautoreconf
+
+	SGML_PREFIX="${EPREFIX}"/usr/share/sgml
+}
+
+src_configure() {
+	# avoids dead-store elimination optimization
+	# leading to segfaults on GCC 6
+	# bug #592590 #596506
+	tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
+
+	# We need Prefix env, bug #287358
+	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
+	econf \
+		--enable-http \
+		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+		--enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	unset INCLUDE #412725
+	emake -j1 SHELL="${BASH}"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)
+
+	make DESTDIR="${D}" \
+		SHELL="${BASH}" \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		install install-man
+
+	use static-libs || find "${D}" -name '*.la' -delete || die
+
+	dosym openjade  /usr/bin/jade
+	dosym onsgmls   /usr/bin/nsgmls
+	dosym osgmlnorm /usr/bin/sgmlnorm
+	dosym ospam     /usr/bin/spam
+	dosym ospent    /usr/bin/spent
+	dosym osx       /usr/bin/sgml2xml
+
+	insinto /usr/share/sgml/${P}/
+	doins dsssl/builtins.dsl
+
+	echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${ED}/usr/share/sgml/${P}/catalog
+	insinto /usr/share/sgml/${P}/dsssl
+	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
+	newins "${FILESDIR}"/${P}.dsssl-catalog catalog
+
+	# Breaks sgml2xml among other things
+	#insinto /usr/share/sgml/${P}/unicode
+	#doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
+	insinto /usr/share/sgml/${P}/pubtext
+	doins pubtext/*
+
+	HTML_DOCS="doc/*.htm" einstalldocs
+
+	insinto /usr/share/doc/${PF}/jadedoc
+	doins jadedoc/*.htm
+	insinto /usr/share/doc/${PF}/jadedoc/images
+	doins jadedoc/images/*
+}
+
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+	"/usr/share/sgml/openjade-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+	"/usr/share/sgml/openjade-${PV}/dsssl/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
+	"/etc/sgml/${P}.cat"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 6159d7073668..f930db2fb34f 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -4,9 +4,14 @@ AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc2200
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-0.62.0-glibc.patch 1119 BLAKE2B 680425520a9ea1e7d24639ea3a05ed5a857c09ea6ec48bf60a8a4b37bf725d5f7359fb5dc2708584e5a27fae862fd3ef6b0aabb7b4f0f63e1f4fc0c6c80f2c7f SHA512 4f6f8270513163b09a1861ebe7e83ed1a6150d523773daacbf039c660853bbde17bbdd502135eb56aba1e4812cb5adb7dc39294764b282f0b34aa43b04410fde
 AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170
+AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 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
 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-9999.ebuild 3565 BLAKE2B 6c798634591fc2db679dd89d5233a53cd62c3d0a3c58ebfd7aa1186cf1533ed390550960cb068ceb57bf925691fc57ae32ceb40390bd1f8cdb342e92e961aad7 SHA512 4d73ec3a41b6919d390a374ad9a1c5d2608545ed957711153381a349d957d4020e8b6aaa1a85071d1c61563e048f7b59f00e954f1875272de54c76dc1a0bfa37
+EBUILD poppler-0.68.0.ebuild 3491 BLAKE2B 940d099a8b6b3552332422b4744764a46362aebe06eea5e15e1c815d5f7bf8a91534e4e7f9bd244584347a39226c30454303bd83224a751ceef31986b854d057 SHA512 e5b2d0ad91e0cf588ed4744467b4f88839098d6c4d87fe19de9e7ec3016e9009989304d51de06bf94ddb994e02529d96d59429d21463504ebff799317144c047
+EBUILD poppler-0.71.0.ebuild 3540 BLAKE2B ac172b835255622ead92f000a8f0363780445dc2d3d2be23b450700af08cef77472a4eb8e6cf83eaa77d32ca09f773935fe0714da27471c604773caa201c449f SHA512 e69e46cff9fc2d118ba590f30cfdf002e40057c17422fc76dc1560772f744648a28c77fc5c2f1a059dc62c631cf0b384f903b98403ad48164df9c1262c092c39
+EBUILD poppler-9999.ebuild 3540 BLAKE2B ac172b835255622ead92f000a8f0363780445dc2d3d2be23b450700af08cef77472a4eb8e6cf83eaa77d32ca09f773935fe0714da27471c604773caa201c449f SHA512 e69e46cff9fc2d118ba590f30cfdf002e40057c17422fc76dc1560772f744648a28c77fc5c2f1a059dc62c631cf0b384f903b98403ad48164df9c1262c092c39
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
new file mode 100644
index 000000000000..e54f7c6390a9
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
@@ -0,0 +1,31 @@
+--- a/cmake/modules/PopplerMacros.cmake	2018-10-21 18:47:56.000000000 +0200
++++ b/cmake/modules/PopplerMacros.cmake	2018-11-01 10:43:10.898347039 +0100
+@@ -147,28 +147,6 @@
+   endif(GCC_HAS_AS_NEEDED)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ 
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+-  set(_warn "-Wall -Wextra -Wpedantic")
+-  set(_warn "${_warn} -Wno-unused-parameter")
+-  set(_warn "${_warn} -Wcast-align")
+-  set(_warn "${_warn} -Wformat-security")
+-  set(_warn "${_warn} -Wframe-larger-than=65536")
+-  set(_warn "${_warn} -Wmissing-format-attribute")
+-  set(_warn "${_warn} -Wnon-virtual-dtor")
+-  set(_warn "${_warn} -Woverloaded-virtual")
+-  set(_warn "${_warn} -Wmissing-declarations")
+-  set(_warn "${_warn} -Wundef")
+-  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+-
+-  # set extra warnings
+-  set(_warnx "${_warnx} -Wconversion")
+-  set(_warnx "${_warnx} -Wshadow")
+-
+-  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+-  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-endif()
+-
+ if(CMAKE_C_COMPILER MATCHES "icc")
+   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild
new file mode 100644
index 000000000000..4a319b20c846
--- /dev/null
+++ b/app-text/poppler/poppler-0.68.0.ebuild
@@ -0,0 +1,126 @@
+# 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/79"   # 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.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-0.71.0.ebuild b/app-text/poppler/poppler-0.71.0.ebuild
new file mode 100644
index 000000000000..a8ae481329a6
--- /dev/null
+++ b/app-text/poppler/poppler-0.71.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/82"   # 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 c2f019ea6964..a8ae481329a6 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/80"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/82"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -25,17 +25,17 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt
 RESTRICT="test"
 
 COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
+	media-libs/fontconfig
+	media-libs/freetype
 	sys-libs/zlib
 	cairo? (
 		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
 	)
 	curl? ( net-misc/curl )
 	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
+	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= )
@@ -51,16 +51,16 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.7 )
+	cjk? ( app-text/poppler-data )
 "
 
-DOCS=(AUTHORS NEWS README README-XPDF)
+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.62.0-openjpeg2.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
new file mode 100644
index 000000000000..8a415cde45a1
--- /dev/null
+++ b/app-text/xapers/Manifest
@@ -0,0 +1,3 @@
+DIST xapers-0.8.2.tar.gz 160938 BLAKE2B cb21d04146f0cca39f1a706641e4cd2a83a796cbf4eb096379367203d91811c20798638a27215e9fdd9ffb32de908a389b0af57200f19bf4d2c8477a9c82ca93 SHA512 cdf1d4791dd48f579f9ee019492c26d10c9855c1ceef2c15bdc81dfdab0f1d74f54db453bb60a9d297a155a55d73cd26ff192875b4ee2b80d8f9f5d35a4bbcc9
+EBUILD xapers-0.8.2.ebuild 669 BLAKE2B 652b1417da8e28bff7006e35f82a6b35abd963f9f96b411adf8141613287b47ed63ca1d8a50519018d51d4b8d038e7daafa7f0ccc63c8ad1b28f6197834dca04 SHA512 6d5534928f6c6d9568f478e4b2e78e7b568f6399bbf94af3688754e800bdbf92e9913f022671b8db3553bf2f7d120b45c06b103b894ad662d6b414fc4c359e4e
+MISC metadata.xml 687 BLAKE2B b94d3d3f42be513d61d5e594ed9fbf13e83f3141d4dab74c48f396b411994c512a6aeb401e884b4891e17ac45f0329f52672dd3513420084e524a2548337bd26 SHA512 15bc8e58aec03907425c6d2ed011223b1e0b5925329e137f4f4ce0ff92b3ead2b22a3988a417164d51546c01c36172969bb6cd50fbd36a21f6dd99db1b89a944
diff --git a/app-text/xapers/metadata.xml b/app-text/xapers/metadata.xml
new file mode 100644
index 000000000000..b2b0bbc66d70
--- /dev/null
+++ b/app-text/xapers/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>william@ewpettersson.se</email>
+    <name>William Pettersson</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy maintainers</name>
+  </maintainer>
+  <longdescription>
+    Xapers is a personal document indexing system, geared towards academic journal articles.
+  </longdescription>
+  <upstream>
+    <maintainer status="active">
+      <name>Jameson Graef Rollins</name>
+      <email>jrollins@finestructure.net</email>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/xapers/xapers-0.8.2.ebuild b/app-text/xapers/xapers-0.8.2.ebuild
new file mode 100644
index 000000000000..d835d91dec96
--- /dev/null
+++ b/app-text/xapers/xapers-0.8.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2016-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Personal document indexing system"
+HOMEPAGE="https://finestructure.net/xapers/"
+SRC_URI="https://finestructure.net/xapers/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="app-text/poppler[utils]
+	dev-libs/xapian-bindings[python,${PYTHON_USEDEP}]
+	dev-python/bibtexparser[${PYTHON_USEDEP}]
+	dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	x11-misc/xclip
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 3dc57e85b1da..eac59e36b3aa 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -5,11 +5,13 @@ DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde254
 DIST xapian-omega-1.4.6.tar.xz 510012 BLAKE2B 2c6d3479fe02eb3b44ef0995b0dfc2ce47012104bc860532967f234ccb7bb2a3357337419fbf5b79b42d0f598608fe9a071edca2195e4f025fb69760091c78ec SHA512 9376145c9c7c728bf444f5891777fe946bc574a4c91ef65779aae4cd2f40c76b33cde1231f654f23de32df8a4eea4aa0c69868d269ec79fba3abad2567ffb80d
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
 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 1273 BLAKE2B f57b3917eb6e9f37879b55d1e759e529c84901b237c673a5093acd2ef5d5117ed279d310995f2709e066f2e6f03e9a3cd6b4cccb2bea2faaa5adcfd03da93277 SHA512 b9a29ac4b8bfdacc219d171a088e1a05e3b092744317d33f197ef77415007ee589d89ee3512a937b4a0c63c781d3a319e05cc3ea7ae89aa5770d6a258784bc38
+EBUILD xapian-omega-1.2.25.ebuild 1267 BLAKE2B 66fd1074900cda3ec72d3bcee082525cdace6f1404e4d16c7d780dac09b6567b69fde76363d4583a716e4e35f97e43d51830ceae54fd9fd08c22dae1cd1818a8 SHA512 e640f095c198cdc54caa76b1240943ac3f7b463831108c1fca7b44ca841a7b9b4899166af633b2a9b5afb6ec2824c4d34b10e50173c28d8377aa4f270d213714
 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 1159 BLAKE2B 20e6767964ec6e986b48c02758c2acabee7ad2d6ef27308f92fa2098d02a07b4a7266b217b46b746e37c210c5514d2541350c4fb813e7ae3f228ff6f6ea21aae SHA512 0c152b80fa9f8495290e8869888f93866de076498e0ac33471b10e520bec2b6a0149d0c6d4418ec25d450c4f815721291e08e090619feb1ae809bb4f1dbee732
+EBUILD xapian-omega-1.4.7.ebuild 1153 BLAKE2B 0bf8f9dcf1b266523baa61009cb349758a427ddf12d0159106dc15f9b9092fd00983317fb9f4de1a94f257d5741949094f037f78555193a4fb673e19030e8dee SHA512 0a54fcddcd0e0eeda0ae3126e795fea947d785b6d91168a963484cbc04d3936191607ba741ccbc5be11541c7a2d991bc8e71bbfe9dacd87378f3b56ef597044e
 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 b7f2da1d327f..42474c02c8b6 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.25.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="5"
@@ -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 69bb116aaa81..e9f901545e57 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.7.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"
@@ -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/xapian-omega/xapian-omega-1.4.9.ebuild b/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
new file mode 100644
index 000000000000..2790bf5b9f0e
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 58404d69ba23..506488d11368 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -2,5 +2,5 @@ AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8
 DIST xmlto-0.0.26.tar.bz2 119819 BLAKE2B 9674389d7fac9e60ccab6530acc95338789401f6ddbd3bdea7cb98a350a50bbd8e539565fdcbad42778a1bbac22590bc923b3cae9108ec510dbc62e5d32e38c6 SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.26-r1.ebuild 1348 BLAKE2B fa3ef6d8ee89e8f7965ad6a4fd4a95a89962be6b301b8d799c2aaf417f235a316044a204fb0077584b3771a1bad11d476537d031ac6f7b3850fdf8cde4bf2b0a SHA512 36750c08fd77ccd4bcf23782c3a0f881b3f256f0f293f2a266b3de908aed2fdff0c119185ab0cb8e5a3c25659ea2236bf2b03148c5bd1f23eb4f963dbe891335
-EBUILD xmlto-0.0.28-r1.ebuild 1349 BLAKE2B c3606981e7c58ea417e7e521de787585516ea5c78a19710a1c48a4cee0c0c68d458f26349494be6bab78994482526f615d9b33437460159edfa92e1c363d2465 SHA512 968ce937d70c83259c70ca96f41fbf8ede90e164df54956f8c184c50b2e2356a945250990fe12d8d32cf62b45d81ff79fac73c8c09432dae2f256284b7ca41b7
+EBUILD xmlto-0.0.28-r1.ebuild 1348 BLAKE2B bd1b608e29153df81bbefbfbd5c9a8839b909de2003055e06e9ed95f9b0ffaa4c4435745cf8eceb6433b957d3c666ac133a9f44e2f2094ad8077f859f25d4618 SHA512 67ac4407e27618d045a96b33417d367ecf62bf9278225ec2fbb8fdd1b555c35894941fc442912cdc91d3c96b2fd0312e99e3e4bcdea50c425a78ddb247c660e7
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index 06e23721957e..dfb8da95ca61 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-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 ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index 942fb89cc7fe..4666e80694dd 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,6 +1,6 @@
 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 682 BLAKE2B 40cae667593f4484e2bc1fc4c0ea8da903020f360e31ede326c62470120147469f365b184ab1e27533daccdbff303afa59bd864824e260a4210b398dcd32b6dc SHA512 ecb4dd4733e756923925811b62273fb123948bba216f2ee9ef33ea9eec461891efe057d71ad15c267f8740431e450faf9903eb9fdd7795642afd8a9c550c2bde
-EBUILD zathura-cb-9999.ebuild 1194 BLAKE2B e45d6a066522374b807e917b6baca20ea91897a1b5cc99a2caccd2e9dedf5853774749a53c9c3009e4de36f2036bd09d14d7cb01cb7bfbb663c2d31f8b4b92eb SHA512 00eeca9e086cf608309fd780cf376cc40c5580de57ad42d79fc77bcc012ad799cb8dfce4530f3069e4a28b196925090b25e3a6882cae4b7ce121900798e63a29
+EBUILD zathura-cb-0.1.8.ebuild 656 BLAKE2B 6aa2ffbf504a2a5570b8a18c380319bb44a75cc1663275bc6ed0192422f2b1d4e781933012d416a4228b4848ddde1b1f824d9d39c077837940f22372b37eefc7 SHA512 2bed50a0662a4a7d19a7258cfdf858b5e26ac0dfc3fe42e81e521c288af868272e8d54ad2399c482933b7960c2ebfa4590377318acb981b5d67eef1254ce0df8
+EBUILD zathura-cb-9999.ebuild 657 BLAKE2B 0836100ed329f8b153dfe4382ba22f9175c09812d62964eacdd628061758297e90a4a2c477176e02b13a95d5036072efc5be568873e4efb8f257e87dc0288a42 SHA512 bc0e52634152a0606b9107c9e0e825375b13fcf284ed7108552210a0bc3942e12d75c36f70f8e8a574927bfd0634a516cf7f8b6024e7d5e323687a339a3f5d8a
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
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 431498d45edd..3e5717e543fe 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
 
@@ -19,7 +19,6 @@ HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
 
 DEPEND=">=app-text/zathura-0.3.9
 	dev-libs/girara
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index f1483517b654..5e59ea0d4e25 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,9 +1,9 @@
-# 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 eutils toolchain-funcs readme.gentoo-r1 xdg
+inherit meson
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -11,48 +11,20 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
 DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
 
 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
-}
+
+DEPEND=">=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index f7b06e745440..34f9c8f42966 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,6 @@
 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 793 BLAKE2B bee22309631b879837dab88c8d70954ca4ceb4272c7b3074ccc4bdd58f249e709f98252d9d90acd0354529556fa3df019077b5b1863a7daf2092a87111a49989 SHA512 f11599dc27c6b6dec3f66c7af1774a9dcd9790e0f2d38d7ff517a54e630e08031ff23023459c9c554577b38b17602314f67e52a02efa7c3bcc04025d0d85f437
-EBUILD zathura-djvu-9999.ebuild 876 BLAKE2B c0332a2c39389801dc8bbcfe42ed6aab193f23eccb43a29fce315c025f787cb47d3ee7945e2798b5b4407f5a63355a4c810e317a2b5c9826d3403bf660cce38b SHA512 e317ca99924d3e1c8a59e2f95ff91cb348b6e4dc310399f646d90b720c97e633f504508b63193fad90a7f9ec1c475253174ca4b9966b2b14ff7d6c9bcc58bed5
+EBUILD zathura-djvu-0.2.8.ebuild 792 BLAKE2B 6e99063a0e15746bd9a51df200afec243a24b7c1ae6c25dea998e8f807de14986a9bef66712de5175150e1d1bcdb2e6f1ef1b62c5035b58c60d4ee77e726bdeb SHA512 fba19cbad4e425ac85c54c6613a243e36d069f5d9ea8a00bebe170919e3200ad531d01d0451bcf256df65293be649a435583a66ccf1f2e5428ecfd519161fe8d
+EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B bee22309631b879837dab88c8d70954ca4ceb4272c7b3074ccc4bdd58f249e709f98252d9d90acd0354529556fa3df019077b5b1863a7daf2092a87111a49989 SHA512 f11599dc27c6b6dec3f66c7af1774a9dcd9790e0f2d38d7ff517a54e630e08031ff23023459c9c554577b38b17602314f67e52a02efa7c3bcc04025d0d85f437
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
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 71046574478c..76fcffdc1adc 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-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
index 06d973da811e..71046574478c 100644
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs xdg
+inherit gnome2-utils meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -11,37 +11,30 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
 fi
 
 DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
 
 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:="
+RDEPEND="app-text/djvu
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	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[@]}"
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index d596860ae936..ae80cb758549 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +1,6 @@
 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 733 BLAKE2B cb449f684a7fb77b8c337ead0f1c08fa914e5890392dea666be79ee05ea35fe2d81ecc47cf02aed295b29481eb98132176b46b889f18d5182b645d22691f1292 SHA512 fead9802e5d2113d187568f4dbf0c5cb55d95c763b69656a01a5c69f35fcc8b40854dbfe25251f721512c399f0fa4659bbf6ec48a373ea5f61e4b0ca75be7195
-EBUILD zathura-pdf-mupdf-9999.ebuild 1077 BLAKE2B d4f06640c28f86f45c274fdb77dca863742a4685dc47d14d82095a8adbac0c713a00a5c7676d017128926473f7ead99d6fe520682693b3e811da8b55ea49644c SHA512 c1f52c483e368114ee230b920bbe440687d668499b991ad92d85d6a93f677e0671c1561f3f8ca8230f1d84941facee607fd7661225c139a79a8299ab0140749e
+EBUILD zathura-pdf-mupdf-0.3.4.ebuild 795 BLAKE2B 74f00693c91c24690221b7fcc7634bf91239a2db9d257562573aebfc000b27fe2c402275fc73cabe41bb811266b3a5c28b6344858f05e8a10a60ebe8e64d5690 SHA512 27b492f2f2776c5b8c68245c39dc1ecde682692df1db6277659ed9412365b3ee89fb88050b4b577fd59d3db1865f02a442d477cf24d2439332885577fe586529
+EBUILD zathura-pdf-mupdf-9999.ebuild 796 BLAKE2B 623e1c0f435e95826791a71c3ce66c4448ff8c47f9e13dae411d86e8c78b4e6cc630333263eb9b2fc94bb41f6d86fcb871da340fc78509e894fa13613785d934 SHA512 54e52e1405959ee3fdf0ac819dcc1941a370369291c9b480256fc2b404a16f2c839d1f29110cc2e7728de148423bf372c33c2aae413fb3d658a74777bb577fe2
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
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 dcf685afa7a2..91edb9262dcc 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
 
@@ -24,6 +24,9 @@ DEPEND="app-text/mupdf
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
 	x11-libs/cairo"
 
 RDEPEND="${DEPEND}"
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index 8d7a7aa0a007..07030bc38d87 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,9 +1,9 @@
-# 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 eutils toolchain-funcs xdg
+inherit meson
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -11,43 +11,29 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura-pdf-mupdf/download/${P}.tar.xz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
 
 LICENSE="ZLIB"
 SLOT="0"
-IUSE=""
 
-RDEPEND="!app-text/zathura-pdf-poppler
-	>=app-text/mupdf-1.12.0:=
-	>=app-text/zathura-0.3.8
+DEPEND="app-text/mupdf
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
 	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=''
-	)
-}
+	x11-libs/cairo"
 
-src_compile() {
-	emake "${myzathuraconf[@]}"
-}
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
 
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
+src_prepare() {
+	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+	default
 }
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 1854f2776dde..9dc36f327456 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,6 +1,6 @@
 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 745 BLAKE2B 6abb817bbf4c1db7542f2b59e69eaa0785074578d9c32f7a37efc86dbe89b9888b8093061ebf4867727b52b205f941a7e5e453650006d4dd913e1bce851ae5cb SHA512 daac708c3c2b62185d843a8a649149165e028006987c7d0bf57f9959b7e01fbe52006ec3b46af9b0def91ba334bec0bee148d565b4749ca86ed1d1fb66246a73
-EBUILD zathura-pdf-poppler-9999.ebuild 861 BLAKE2B 5237bbfc9f3202dd7178a2a37abaaac0d67af71344823969175d7b677387ab1040d6a1fbd83d6927aee6faa95f9e2e36b4fb1bc5a348bf007ebbbbf0b363c8dc SHA512 e451c62dd3fae3610b36b0511bcdf760d70cb27b56fe2c75b57151fd9fab7c714e83ba511c3f2e622e0d8467d4c3c4d40593eb882cbfba69712af7e140104e0f
+EBUILD zathura-pdf-poppler-0.2.9.ebuild 744 BLAKE2B 974ba4498e2ebf45164ba6d28a813c3252e890e3dc2c8f97939c2b600b2aa2c3c0dbd33c83a6cd82bfafe8fb201908bf338fb5eaf8ce4b53e450d0d65841af3f SHA512 d0456347fa4fa780791f3968094548c1531ffbfe006489d7650b60d395a7d9a79e7988f15c72164c64732fb49e916ae4b2fff49fd059d24303557ce651ca24c1
+EBUILD zathura-pdf-poppler-9999.ebuild 745 BLAKE2B 6abb817bbf4c1db7542f2b59e69eaa0785074578d9c32f7a37efc86dbe89b9888b8093061ebf4867727b52b205f941a7e5e453650006d4dd913e1bce851ae5cb SHA512 daac708c3c2b62185d843a8a649149165e028006987c7d0bf57f9959b7e01fbe52006ec3b46af9b0def91ba334bec0bee148d565b4749ca86ed1d1fb66246a73
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
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 5b4915a8a871..321492b7c9f8 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-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
index ca0b8305c134..5b4915a8a871 100644
--- a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -1,9 +1,9 @@
-# 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 eutils toolchain-funcs xdg
+inherit meson xdg-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -11,35 +11,28 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86"
-	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
 DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="http://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
 
 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[@]}"
+DEPEND="app-text/poppler[cairo]
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
 }
 
-src_install() {
-	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
-	dodoc AUTHORS
+pkg_postrm() {
+	xdg_desktop_database_update
 }
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
index 65f3d7857f01..c3037701f7aa 100644
--- a/app-text/zathura-ps/Manifest
+++ b/app-text/zathura-ps/Manifest
@@ -1,6 +1,6 @@
 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 698 BLAKE2B 9fc5ef9ce7fe4592fa34b38b45b3d0cb67d6af3afbbadad41bf77900d84c7e9fcdf5262523ea26aa6927390fe68e387a6540d1f0ac8413cc57feb085c0fc2470 SHA512 1c7f95999fdb23daff98d731e83e9097afc1a123c2c26550ff0ce49f54a8aa573f305671212ca7736425a66751cb3c34aa62d1410b395e135eb450a9ee1f9e98
-EBUILD zathura-ps-9999.ebuild 934 BLAKE2B 3df19a2ebc4af3b76a3006cad4b381b2a8ac35c29c4c857f423d3a66a2be5870b9ff4aa4f53008dd8fef0b1ed39329dbc8d783444c5b142ebe1fffdc77caa697 SHA512 f4105099eef1796eb4d302c1ba0f76a1d6008464810da8c5bf59e0ef5076901a0dbe1f07dda5da8a52a6e723b8e34e0f3ff37ce4607fe16f98915a93664135d6
+EBUILD zathura-ps-0.2.6.ebuild 674 BLAKE2B 3e5a6aaf7d9a6c6afde939c7fc744c3bd7a8671b432b94eb9655fbefc7446e037a1e8edf0d45b4073aa59c539756b7b5805d65163414a43c6225cb14d647fce4 SHA512 540a3a38e5260b0d7266a050f13cd051e7b4fb744b51dc6d21389fe5dc0b5c68fb93cd57039414d7ce5e1f958f96e8cf6f394c73d3a36c0fd35deaa3473a7a5e
+EBUILD zathura-ps-9999.ebuild 675 BLAKE2B e9c7f67fc8d86bd307acb311d28f04a181511d70509ae777b2e096af40dd6518f7382468c423dcd368a3ae3fbec0c71bed17a6dc02b4807694a46d0df42066cd SHA512 e821086cbf8442d13bf4c08ec7cdb59d4eec41d2c2d09fb63a1281c8a5eed2e9daa7af5d9d618b405d7ae613f50ede25f1eece6638c96edf09f85741b6eb15ad
 MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
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 9a5fded445c1..f9203d17899e 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
 
@@ -19,7 +19,6 @@ HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-text/libspectre
 	>=app-text/zathura-0.3.9
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
index 305bfa827e75..16e0d2d5ba33 100644
--- a/app-text/zathura-ps/zathura-ps-9999.ebuild
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -1,9 +1,9 @@
-# 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 eutils toolchain-funcs xdg
+inherit meson
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -11,38 +11,21 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.xz"
 fi
 
 DESCRIPTION="PostScript plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura/"
+HOMEPAGE="https://pwmt.org/projects/zathura-ps/download/"
 
 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
-}
+
+DEPEND="app-text/libspectre
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 4faecd68d540..7fa78409726a 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,6 +1,7 @@
+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 1425 BLAKE2B 389bf013932b8e990b85ce274159a4033852b1b39acdfb796452ecd6d99ff5506f8d2fd2f3c70d39019dffb9f285eb8a9e79813d082b305e3e2c08e369e2086f SHA512 f396dd3221ba19a8e9e666be3d21efa4f1ea684460de67177ee0d07781b77a830ff1c6fd42c42700c8811eec754f0dcff11b3b5b5f6fefd7ad666baabf63f4e0
-EBUILD zathura-9999.ebuild 1408 BLAKE2B 54b2855111b07b5901be97b75bc355bea4408fb4d56e3fc93f8adb8e79b5063ea80fbc2311e2849e52deb409cd1f4b43419c09027dfbaa88ee8ad306ccaf29d0 SHA512 87673c67c76d98776116a57ef204ff53dbc9ad3bf6d5fe2c37b4fe534994143c4626d7721977078af01bf36ace5e8691a686a6da66cb0ad199572739d5d951b4
+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
diff --git a/app-text/zathura/files/zathura-find-libm.patch b/app-text/zathura/files/zathura-find-libm.patch
new file mode 100644
index 000000000000..4995238fb8da
--- /dev/null
+++ b/app-text/zathura/files/zathura-find-libm.patch
@@ -0,0 +1,26 @@
+From cc99b8d3491ce0cd30ba56decc33d811478bab0c Mon Sep 17 00:00:00 2001
+From: Sebastian Ramacher <sebastian@ramacher.at>
+Date: Tue, 30 Oct 2018 00:39:19 +0100
+Subject: [PATCH] Search for m instead of libm (fixes #757)
+
+Thanks to Franz Trischberger for the fix.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index f54f104..afe9ae8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -36,7 +36,7 @@ dbusinterfacesdir = join_paths(datadir, 'dbus-1', 'interfaces')
+ plugindir = join_paths(get_option('libdir'), 'zathura')
+ 
+ # required dependencies
+-libm = cc.find_library('libm', required: false)
++libm = cc.find_library('m', required: false)
+ girara = dependency('girara-gtk3', version: '>=0.2.9')
+ glib = dependency('glib-2.0', version: '>=2.50')
+ gio = dependency('gio-unix-2.0', required: host_machine.system() != 'windows')
+-- 
+2.18.0
+
diff --git a/app-text/zathura/zathura-0.4.1.ebuild b/app-text/zathura/zathura-0.4.1.ebuild
index 1b9071f73e74..49a7c2c24213 100644
--- a/app-text/zathura/zathura-0.4.1.ebuild
+++ b/app-text/zathura/zathura-0.4.1.ebuild
@@ -14,13 +14,15 @@ 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"
 SLOT="0"
 IUSE="+magic seccomp sqlite synctex test"
 
+PATCHES=( "${FILESDIR}"/${PN}-find-libm.patch )
+
 RDEPEND="dev-libs/appstream
 	>=dev-libs/girara-0.3.1
 	>=dev-libs/glib-2.50:2
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 89006688f4d4..1b9071f73e74 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,69 +1,64 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils multilib toolchain-funcs virtualx xdg-utils
+inherit gnome2-utils meson virtualx xdg-utils
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
 	EGIT_BRANCH="develop"
 else
+	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
 	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"
+IUSE="+magic seccomp sqlite synctex test"
+
+RDEPEND="dev-libs/appstream
+	>=dev-libs/girara-0.3.1
+	>=dev-libs/glib-2.50:2
+	dev-util/desktop-file-utils
+	dev-python/sphinx
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	magic? ( sys-apps/file )
+	seccomp? ( sys-libs/libseccomp )
+	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+	synctex? ( app-text/texlive-core )"
 
-RDEPEND=">=dev-libs/girara-0.2.7:=
-	>=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}"
-	)
-}
+BDEPEND="virtual/pkgconfig"
 
-src_compile() {
-	emake "${myzathuraconf[@]}"
+src_configure() {
+	local emesonargs=(
+		--libdir=/usr/$(get_libdir)
+		-Denable-magic=$(usex magic true false)
+		-Denable-seccomp=$(usex seccomp true false)
+		-Denable-sqlite=$(usex sqlite true false)
+		-Denable-synctex=$(usex synctex true false)
+		)
+	meson_src_configure
 }
 
 src_test() {
-	Xemake "${myzathuraconf[@]}" test
-}
-
-src_install() {
-	emake "${myzathuraconf[@]}" install
-	dodoc AUTHORS
+	virtx meson_src_test
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
+	gnome2_icon_cache_update
 	xdg_desktop_database_update
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
commit	536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree	697733f5cb713908dcf378e13fd15a798a906a91 /app-text
parent	f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)