gentoo resync : 04.05.2019

24 files changed, 315 insertions, 414 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a33fe8a99852..dd0caafa6048 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 68939c0c4b48..f8f271a5e71c 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,5 @@
 DIST ansifilter-2.13.tar.bz2 439681 BLAKE2B 4f23bfd05647046f9cb739f9ce0820b5b3ccad397a80558ecd5ca584c695dc4f942c1db3edd2f1b2d5a78b2c1e1b043677b1be3486ff7237090c27072e15f0fb SHA512 0d74607d2155f1cd0f66cf6470d1d83889d27c62475e366518a78b310c9681307e2fe662fea67078f95e6b9ce28e6f15656ab1ffc9e9e825d680808c673b7bfe
+DIST ansifilter-2.14.tar.bz2 441884 BLAKE2B 90b3b0330866da11c00b105aa79164178aebecf39131f5c8d8e373091f53d2d8bbced54472c975a61857d594a9fa92ce08d018523f471fde445d4548d48b949b SHA512 a0b7f12ea5b9ef9b5845a03484a2e238a9f60e0e49f8eddca8bf24b47faba48aa0b55f922678b3bf1b3f08857bbe9a8285b3f318f2adec84673bc502e21b6802
 EBUILD ansifilter-2.13.ebuild 1004 BLAKE2B cc405c8153cb0b54751498169307b13302f25242c9e1e2a7164f69c982fbb048266f05a100a04dbcad97c825cfa992a149a0b664ace821f719cbb670b3463213 SHA512 caf0d3364e39d7a66cc4b6684d9f5277f60af0c44a13ca10462370f475e9c4e98baa393b491a1810bc3cdb824c6c67bbd5bfee4ad13c7c4ca4f4a8d10bf90dec
+EBUILD ansifilter-2.14.ebuild 1006 BLAKE2B 080cb34e7ad7ca1d89a47db0786a34dcae1fc6a9f14a53010192e655ff1a18db4ceb449f6d9653977bea05ed2645897372776f90cedc11538e43452c105e8382 SHA512 79aa89bfdbbceeacfdb80d851047a20676b7d01ab4c7229ef8e9b94bf29bd79253bb79e7666af695e8776d405c649659f7c2e625a277a56f6f7430ce9bac38a4
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.14.ebuild b/app-text/ansifilter/ansifilter-2.14.ebuild
new file mode 100644
index 000000000000..e993d7be98a1
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.14.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 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/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 9409a00ac4d9..54f1ac54b09f 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,7 +1,7 @@
 DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9b0126ce86695c6b5840b69f94d0e5befbbfc355006a10d13d34e8ed3582f0bfb678744654a7d2040555016b1681 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
 DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab1503bd8d5d6bb6b7d66c442cf8bcd47ee4325dbb572bdcfd01168ef1bccc3430ee7c545e7b3a6715b8ebf09516ad9 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
-EBUILD asciidoc-8.6.10.ebuild 2412 BLAKE2B f86913608e5f13ea9509ba5432b0d1f9ec49c334fad7de9ba74989e01253d005c779a4cbc86f9887461f85b574a22f37002664cec814fed506890070870bca2a SHA512 67215f01089a47910b681de8f90fa99bd02514c0de6c98834a445b0cc39c3866b6f6cfebd0af933d96d96d2e80f32a6b2705cf1aea44a4ac6eca7c8624ab9190
+EBUILD asciidoc-8.6.10.ebuild 2411 BLAKE2B 18435c6f4749a661ae93d613991599fffde505210c132cfe1807035efb1323eb3bfe563a5fe53a14f4b7c7a6885c27889428db70b3c4e605f4dde37fa61d0620 SHA512 c202341942125b482e8e4cb6ef6ddf11e6806826667cd53f94e032971819b70cbdf4c2a16dc4a14b1b31df096d5bed673f1e76362af13e8761f15a6271b1d5b6
 EBUILD asciidoc-8.6.10_p20181016.ebuild 2584 BLAKE2B 3d6b1a45cafe3bff679e08ab3527c80e0cf9b6765a3bf58b82153c653f0bef90911cb07eac6d389b04e8c022133db47268ab49d8ba28e6363236444f51e6b2bb SHA512 4d881457521fa12086124df79aa835210bbee9d6d7791489ddf83ac7a2032c8a1bf3ee21643a0a4be5b1ef836e8fb59f1e70bb53197ccf5bc0ad95b20c825617
 EBUILD asciidoc-8.6.9-r2.ebuild 2171 BLAKE2B 76606035ddef0bd31709a24a1b9896dda55ee1c299a043b46724da1a3d21565eddbd484ec0fd80db320c6db7aaaba1b340d6e1aac4bed7416724b9cd421791a8 SHA512 5a5bb301dab871ca93c282892c0e7a9421dad343dd529670385231397cfb96bdc01a483ce23fe86348c4af7ff2f00185006cb498e65b0eb5718e34c2fa7a3883
 EBUILD asciidoc-8.6.9-r6.ebuild 2370 BLAKE2B ffa3b9a29ff82b63eeb56d4af3c527ec62d19034086a40569116c8949fbb8bde289273f006f6f707cfed75d3f5302a8da7d09b01e998b58268aa83925eb39d31 SHA512 f953144beb29005d3a0027a644f3a1d68fbe54dafeeb2f22d176ef2a28fe92e7dc6b315c47d49e7d6132cefdef8f623e2b1c90f30337324fa90a418e6e29e39d
diff --git a/app-text/asciidoc/asciidoc-8.6.10.ebuild b/app-text/asciidoc/asciidoc-8.6.10.ebuild
index 20e0726b1441..dfcb6964d773 100644
--- a/app-text/asciidoc/asciidoc-8.6.10.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10.ebuild
@@ -10,7 +10,7 @@ inherit autotools python-single-r1 readme.gentoo-r1
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/"
 SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-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 ~sparc64-solaris ~x64-solaris ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 30b5dfbb927c..09616e986535 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
-DIST blogc-0.16.1.tar.xz 336720 BLAKE2B 1b828ba6ba161ad74b0a880f5e84c43b8c5437e5ac6c745862b695bac0cbbdf6a313b9bacf97acedb5cff5650c71b0344f1a120090836c69441aa7feaa6c9cfa SHA512 bd408a4f9b9b10b7be324e03d70125aafff3bf59750820a8c947dc15323131a199372ffe00421f4ce949b22c65168088c0ed8ba0d55ba8dcab5f871a0dbd243b
-EBUILD blogc-0.16.1.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
+DIST blogc-0.17.0.tar.xz 338212 BLAKE2B 19c5119b5d877a70ccfd6b4c8fca0c31141efd4c47c1d457d53d3bfefc1573553c69288e628dbcfffb23420461b8f0f08955b40f949d5b7390c5160faae94db1 SHA512 10522ecb218a7f09fd57e4d67e1c6ac2a17dfaf04f322c56ef77c939fcff22f6ae619e6a7e659ef14d069955d87b790701758e48ebc373d2175883b8908ef857
+EBUILD blogc-0.17.0.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
 EBUILD blogc-9999.ebuild 1120 BLAKE2B 234392dc7c1e42c3bcd2c3ac4b1a648ee9e4fa6fc486cfcc60ef0af1c0cfb97ea68bc2b2ce3da820bdd88f05ef5993b7dc6589e52137d8d1e7cbce19d9c0a064 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9
 MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
diff --git a/app-text/blogc/blogc-0.16.1.ebuild b/app-text/blogc/blogc-0.17.0.ebuild
index d5c7c49e8ea5..d5c7c49e8ea5 100644
--- a/app-text/blogc/blogc-0.16.1.ebuild
+++ b/app-text/blogc/blogc-0.17.0.ebuild
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index e421cef6afa6..7dc6228a628e 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,9 +3,7 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
-DIST calibre-3.40.1.tar.xz 38365300 BLAKE2B 5b1b8624d81d8a60d954b3871e46ae5dad8a49a7efb6e986cfef133da6da249fa8b36d1eed3840322ddec9c8144772c1e9504e114d27774096a9939f2a58a326 SHA512 1333c24e384ccae79d264055e1e84b8a13919e68d9290a277e07bb7f3b4579d15090859b50945672c155a438a2bf9e5f088f094bc30781af7c5d0d9ccd7226f4
 DIST calibre-3.41.3.tar.xz 38508848 BLAKE2B bbbe888bab285207a23a24a152b396cdc51723442e49d6e8ea6d3631cc4c6d67d421452d3d616d03dbe89f6df292dcdce5b564d6ed423dfece60a4bc59678a87 SHA512 9bed5d05fbe0a6b0e5c8d290f21ffc9b61c51767437aafb72afd3db94f755be3bd68f84cd1f73e5d15c7039dd0858a666975e860577f9ce84999aa9ed8e1a895
 EBUILD calibre-3.26.1.ebuild 9312 BLAKE2B b9e7712133717e608f2d6195fb3f4cc88a40f6628f74e7ae08294bc75bbb7ac42e29f7b07db77712028bc12b71950ffa3782a17dd028a7fa0e083cd2a58f733b SHA512 6a5297715b33057a539ddf46d195cdbef6a8fe9cc4f183dbc2dd78ec55352da288c904a969417c53b38db3500f4a2fb88df741fd1a0c54df11739b1e27471eb0
-EBUILD calibre-3.40.1.ebuild 9381 BLAKE2B dadfa37da609ea5134a8c88393c4f3a00a6136bd6b68e5e1ba46a35b3e92799328167a5292c0fc3123f83410bb06df64a15b81c80a5875685cc016cfac8186b8 SHA512 9ba128d123b602935c3426413b698ecd20f267731f84f1e373d8baf160435c57f81d71f3f967a3baf9cecb97eb0964368687f09c781ab9d684cd11c070c57dba
-EBUILD calibre-3.41.3.ebuild 9505 BLAKE2B d19763642dee91efa267c4ccf3be291274d8ab834bacf34efabf659e71de4cdcf2a18f012e34dc4067e9e569d7d4a2c127513c9b4ef56a531ed657c5d9785b50 SHA512 b08aeae0d4913842d64a4092816785024ac9ba2983baaca74e9ca6b5ffc35656b8b909819b4898be868778b29cf9dd2f582e61ce45c86b2666ba95269fb52568
+EBUILD calibre-3.41.3.ebuild 9544 BLAKE2B c59219a990d34e9e1ee641f42e7c5ecd040c425874d2bf81009255b744ba79920ac933e86375112051c8aec995fe2832bf24a666aa3597c267803b0c89dc7cda SHA512 0f8993342fa9a0ba2ada9cdbac9781e0aa84116e54cc875b88d2a38263462781e286c143947f5d3ca5668b901f972f5676411ec39ebc6812e708942c2ea860fb
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.40.1.ebuild b/app-text/calibre/calibre-3.40.1.ebuild
deleted file mode 100644
index cd10ca04cdca..000000000000
--- a/app-text/calibre/calibre-3.40.1.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# don't create/install uninstaller
-	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-3.41.3.ebuild b/app-text/calibre/calibre-3.41.3.ebuild
index 08315bc6d741..721c5da17ba3 100644
--- a/app-text/calibre/calibre-3.41.3.ebuild
+++ b/app-text/calibre/calibre-3.41.3.ebuild
@@ -189,7 +189,8 @@ src_install() {
 	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
 	#    raise ValueError, 'unknown locale: %s' % localename
 	#ValueError: unknown locale: 46
-	export -n LANGUAGE
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C #684484
 
 	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
 	# variables to point to our fake temporary $HOME.
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index 366f626ec757..123a5af2ed4a 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,5 +1,5 @@
 AUX kchmviewer-7.7-force-qtwebkit.patch 960 BLAKE2B da573cf4eb4a2668b7d37356df270f002cda5f1ca54055fbed36dc9f95bd8373934d8befa2b635f23074e0ce69cb9707cfd41cfab223c6254cb68c4fdade8a3b SHA512 bb93256211bc7390acb52b142da5cd12dc4c8220fdf745c6b5dcc93bfba8880272ad0134c868409afe5fe6ea3bcae47cebe1aaab13cdead6556bf15bd838b549
 AUX kchmviewer-7.7-underlinking.patch 300 BLAKE2B 02d86fad61fe727e5bebdd8b340bd9a70ccde78d04ef65b2dcbc517a76304b5788412d16ba727bc7575087a9c0229c814550c25f80edba6ca6332a9dfd366f8d SHA512 004056e7ba232a80f76fe7a8955a2ef621d8148f7c594c78ae3136dca7ca8d3c39e8ab3081f75b3181bef3c9a720601cc7e65ba371b95853faa4bf845e80d0ec
 DIST kchmviewer-7.7.tar.gz 345952 BLAKE2B 7c42f3d05c7a46163d4e63af271ba73932dc2f7eb20e4e0c2c5dc2b335f488593288e4dd5b0a03b75ee7a008836a16b86ec8f47aa6d076b6351d48290a23bdef SHA512 e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070
-EBUILD kchmviewer-7.7-r1.ebuild 958 BLAKE2B f0eb5ffbe23d8bebab285411619f6cb7347461558a1bde4d1b487eb3408349d2012a0c73d31e2026269ca33371304ee417125d3accd040862ade78edac84d04d SHA512 960de65730bdd95a7db91a6d77f90f3b547050ec9f74246053d6fbf6daf57ef885b8d85c20d6bf7fe5276b94fca6254706fad64cca29e229b0f4b9bf87a29b8b
-MISC metadata.xml 979 BLAKE2B 0b17a5a299dbe5f72ee4a1bfd7262447325ca4276400e0bd159af969e4f9590a47c20d777121b31496e5c2b51e4d8684662dd79c4ee6bc116c71453cd7639834 SHA512 e7786881fccd93bebb9ee1e0904d18b9eb1c6604f36aecd44673f3cd59c09955a9bde08bf765efee3422bc9c514d59040375e770f960163640acc0577642d399
+EBUILD kchmviewer-7.7-r1.ebuild 859 BLAKE2B b4427a44334b82f0e6af50b499199e55e50aecf2b0d1cc81adc85c97fe2c84853a04e09c5b711328e0caee83244965ff77ab84b80ac49bf0b9d463a952692d2c SHA512 bb620cad030ced2ea5584c175212c9901fd219d32c93a53c210ba086f7dba5b8b8ab0e7ffc04f6cdef0046ea60066d8af9dabf5c3f5de288de21f6deecb03a31
+MISC metadata.xml 982 BLAKE2B ed5f9ea7ed6aa8a2b6d743ad2944bbfbe46638f3c0e2b154b8abe250d2b7cf0a56ad48cb4df994fe2c1df1cde7c7a612f3c681107d0b5c1f8652072e15ad5cc8 SHA512 746f5a51bc2e4373f41a24f71e2f19647f70a53439a1f40933f32405b3a9c2fdec6130bbe2ecd2cee0b1901f87a5bae12cfa782ab44a37f5ecce61727a16ae91
diff --git a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
index f9d3ca256aad..f38835061d77 100644
--- a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
+++ b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils qmake-utils xdg-utils
+inherit desktop qmake-utils xdg-utils
 
 DESCRIPTION="Feature rich chm file viewer, based on Qt"
 HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="
+DEPEND="
 	dev-libs/chmlib
 	dev-libs/libzip:=
 	dev-qt/qtcore:5
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-force-qtwebkit.patch"
@@ -43,11 +43,3 @@ src_install() {
 	dobin bin/kchmviewer
 	domenu packages/kchmviewer.desktop
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
index 2c14212dc2e8..9826a818187b 100644
--- a/app-text/kchmviewer/metadata.xml
+++ b/app-text/kchmviewer/metadata.xml
@@ -16,6 +16,6 @@
 		(search for MBCS languages - ja/ko/ch is still in progress). 
 	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">kchmviewer</remote-id>
+		<remote-id type="github">gyunaev/kchmviewer</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a889e7b6962f..bda26cf2bc44 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,8 +6,10 @@ AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c
 DIST poppler-0.74.0.tar.xz 1514044 BLAKE2B af3821d5a5c68a3f2541cd9468fd7318ad0182cda66cea068dc42208fef6c2af78a401e50a6a5906cdc943de7339620937ddc6f69f0d8d1b15082aabc6cc3482 SHA512 4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66
 DIST poppler-0.75.0.tar.xz 1523872 BLAKE2B 245f574e985570a1d0923e732da8694728506fc59382c9e4532159867e1b18ad9f03f6b995891796d72a6e401d2c86ac18403c9219bf533e36c8a07a1dc85d61 SHA512 6a1b76cc5095b7c5809eaa5072aeb4ea615744ff8ffce537f40a3f73a81fc12cc18d596876ceda1c78b5312ad20535f72366e69c861b620d108616f24a98e6b8
 DIST poppler-0.76.0.tar.xz 1530264 BLAKE2B 6496b7e069c98b8ac0bdb9001abd96bf0d71129e436813f4c91832f732e9ae6e125dd1adf49c238cad095185ecdeb47f7efc70b39a03309964dc2bb8552bf4e6 SHA512 bff0dacfabcfb6d4843d3dbc526e45eca85c1e043734d4cd2adb11c025c432559a26d59427169e2172a89e1d7d2bd6cad773688d11410495c6dcda108cf5ca9c
+DIST poppler-0.76.1.tar.xz 1531548 BLAKE2B edbd9c1be99aadf4f14608a1e0dc58a2fed351b10e18aa3c006f4e54cf0f2082deaded9c67a0181bb0f012bcbc550f1208e8a632df9cbe26261b735ca44cde60 SHA512 e4af2785948ecc89c105ab00269b0072b33feea25224e5beb158d515b1de789f979084bed2d4260c9659382cf437c25c0baf2444f5b4fbbba5c58afeb707b7ac
 EBUILD poppler-0.74.0.ebuild 3515 BLAKE2B ece68c444171e98859d712870d0611b9f2c49d4fc46b181d383253fe62aa64e4a1f4bef87c7940f103e878c722d4b29dd5f137d2a199da2cd0f86459cd313a62 SHA512 9ae8a8e2860129702bc3f03b0e934c7f3484c57d3e41fa2a2defa7e97c58d885cfc195289d5e2fd5ffdee809433452d4c9f7d40856d66366ca3bb9318ae038e0
 EBUILD poppler-0.75.0.ebuild 3526 BLAKE2B 519a0db97078b67ab704ed6bd9e1e264f877949b67fe014bfcf84ecc239d4f92b7060592bb44f31f519406b31031a8f00a53829da8609d8f833cfcc0cb9ba75e SHA512 d688ba1d78aeca0c0f6d5c406d0cc714911ad9cb57544544757675fb5b3771b8b4bb2a9cfe6571d601ad2b85fade836bdc14d7518b3ecd883f023fd225c9ab3c
 EBUILD poppler-0.76.0.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
+EBUILD poppler-0.76.1.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
 EBUILD poppler-9999.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.76.1.ebuild b/app-text/poppler/poppler-0.76.1.ebuild
new file mode 100644
index 000000000000..61a50816fcf1
--- /dev/null
+++ b/app-text/poppler/poppler-0.76.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/87"   # 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"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+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 )
+"
+RDEPEND="${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 -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^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_UNSTABLE_API_ABI_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/sigil/Manifest b/app-text/sigil/Manifest
index e432282df490..2d5b1aec885b 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,4 +1,6 @@
 AUX sigil-0.9.8-proper-gumbo-install.patch 1351 BLAKE2B d24d6e0be9b7c56c944aad2d97528ef38b3f96b4d81504b1169095112cc939a662101754ccc9f4d8e9303cd0e9d2ad084e8c86c32d73d43720d1a1736ec572d3 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89
+DIST Sigil-0.9.13.tar.gz 18235134 BLAKE2B 4afe0f0258a8c1056029534ec696372e40343b9a398b612ee32fe95a3d417594bcc6782a4e6447323d67e84db5193756ff7c8756e160c432678ebc59ddeab706 SHA512 cafc6b075827239b73e80d3efa02e4e77d5903fed1faf8b600f70b178fb0c248c38d43e115f249124859edc12ddd8caf199ef0b0d05f20852eb060b27e5a3578
 DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
+EBUILD sigil-0.9.13.ebuild 2527 BLAKE2B f48d3ad43514ad147011b2902e9dec7d4ca35e8f58100cd6ed4e0ce640d9a3f321ccd1c996cb5e88c861ee273c09dd384c95f1136be5604361d1dc7f5044ca0e SHA512 a6b0a5e912f90617f23abdd36b6173e8cc8287f0dc0b2d8052069f656c042dc3d132c7a0b6035c8bc899c6a8defa13f8d6caf08c55793661e5d0e8ef34d0fcdf
 EBUILD sigil-0.9.8.ebuild 2234 BLAKE2B 81dbc8905e5e4d96f7a423a64a66fa2f5a1ad501a7f8e8ae4049bbf43cbac8366c7fe388da1a9ba9a2f4aaca92b7df9fe585443276f283f80a305eead2797db0 SHA512 834be1bffdd30059bd224d8b0ea0d4b5efa8286f934042183e305ba793b3b25bca01a807ce1c3de9c011d4c335a5362bcfd6cc20694a83f4f9142f65f91286c9
-MISC metadata.xml 389 BLAKE2B 8f9988168470e8545fa0fa47e520d7019cb9cf1ba8af0c502fa0b66a8a6a4567feea882d0ddc44864aac2193b411010eee2bd7d5905c68b34a32550ba4f6e223 SHA512 0728fc5f14cceb331ea75a6231d176ecbd22defa77b6d90a6859ec6e001feb3cd1f9c57c779bdcf83f81a4f7dca06e120964d6c93e372e39584293addacb5929
+MISC metadata.xml 596 BLAKE2B 620d0143f20ca5b215ab4dbbbab6636f82951ee505681ab969bb5eb19d8c6d56e9094067c26f6ff6979f32814a5894c2b7aa18db85ad436900e1655e7cd081b8 SHA512 5a657dabca05bfe05a7b0d8165b0a9be0f6f74b38ca30a85710a333b87534900992ce09d98037894593511c7dc30412152715f1bdaa452e8718973989ac40a00
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index 53f4fedf5f1d..bfc4712a175b 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>arthurzam+gentoo@gmail.com</email>
+		<name>Arthur Zamarin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">Sigil is a multi-platform WYSIWYG ebook editor.
 		It is designed to edit books in ePub format.</longdescription>
 	<upstream>
diff --git a/app-text/sigil/sigil-0.9.13.ebuild b/app-text/sigil/sigil-0.9.13.ebuild
new file mode 100644
index 000000000000..4fe858867563
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.13.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit cmake-utils python-single-r1 readme.gentoo-r1 xdg-utils
+
+MY_P="Sigil-${PV}"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell:=
+	dev-libs/boost:=[threads]
+	dev-libs/libpcre:3=[pcre16]
+	dev-libs/mathjax
+	dev-libs/xerces-c[icu]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/cssutils[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-qt/qtconcurrent-5.4:5
+	>=dev-qt/qtcore-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+	>=dev-qt/qtwebkit-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
+	>=dev-qt/qtxmlpatterns-5.4:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( ChangeLog.txt README.md )
+
+DOC_CONTENTS="From Sigil's release notes:
+When you fire up Sigil for the very first time:
+navigate to the new General Preferences and select the default
+epub version you plan to work with (epub 2 or epub3) so that new
+empty ebooks start with the correct code.
+if you plan to work with epub3 epubs, you should change your
+PreserveEntities setting to use ONLY NUMERIC entities.
+
+For example use & # 1 6 0 ; for non-breaking spaces and etc.
+
+We strongly recommend enabling Mend On Open in your settings
+for best performance with Sigil."
+
+src_configure() {
+	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
+	local mycmakeargs=(
+		-DINSTALL_BUNDLED_DICTS=0
+		-DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 4df8fe2af070..8609cf28c09c 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,5 @@
 DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
 DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
 EBUILD xmldiff-0.6.10-r2.ebuild 522 BLAKE2B 6d012cfec8f200441be4e5e27e9cbd4ca927843b46a5b8d24108440663d619c36b1f4bf11f256bd7c8478e88a9b01805d12c112cbba2a82fb96887aec40d9265 SHA512 b16ceed0a37b133b1f61b9e47529bd61469bc933ad99218f5d3a345baa6bfb2d4908754bcce5691be68085ace23f3049bc1ae12b855073f33bddce20620fc879
-EBUILD xmldiff-1.1.1.ebuild 633 BLAKE2B 1c6ddd088e2349de2a0582df42f6fc476ef315986ccf58c04b489092fef47f27634121ee2553461f41db772e1542f1f54d79f76cd8ce0ae0df9243269b9b1800 SHA512 8b03007cbd3bea34505104a77484245a24126010f1ff4da859d58ca43eeb234607b2a82b39c058dc4631e1dbd92a71b73b0a8d795ec7ba27d232bf25d24ec6ce
+EBUILD xmldiff-1.1.1.ebuild 632 BLAKE2B 5b1b3bd3fb43dd845022c287989fb8cec7b1000ccb027e492ef3e87766845db763355982f093c16a611e27214ec3c5c7f53939bd6f52324383095d3aca0a43f9 SHA512 358d8e78ecf83c5d5e83d2042d13d39c1687a2f2a4b1616d11fd80e2a9b35f969617a57a5ba91c368b493232c4ac2a25f30a5c653b95b55d0baa272acfb7386c
 MISC metadata.xml 578 BLAKE2B ae500988e52962a46d0c79c948a163f7d3414c230d14ae344d33b09979085cf400ec38e911fe54f71da6035f40a795cdb9b70ed2c3299b9e37d0e6e3a77fcb7d SHA512 09529a22484d9b660b11b70137cf7e113ee07af4de0c58247d9f6dd7c9e85e222111b209b71dcdb342e734897fa0243b5f9a83688fdbd649584fa226a36acefb
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
index d18c3bb32aa0..ba247e45a6cc 100644
--- a/app-text/xmldiff/xmldiff-1.1.1.ebuild
+++ b/app-text/xmldiff/xmldiff-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc ~x86 ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc sparc ~x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/future
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 364feb77f8e7..b222de9bdd2a 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,7 +1,4 @@
-AUX zathura-find-libm.patch 896 BLAKE2B f28a1a967d274b0840f64bc94b7179bbcc5cfcb025b8450604c2e928cd4199e78a190e7766a33dd5b513d128f6567be45e667c75605397892745997b97c3b9ce SHA512 664440b3ca4e241f4d2072be5dbc52b00d962c264d5698649d7843e5ea54479a114a8c6ce731f4471fd600603898f4e571d23979aecd0447f592f0d3ebc51f2a
-DIST zathura-0.4.1.tar.xz 148592 BLAKE2B c6fc495ce6413057dc86be95272e8178f32649c68f95052b2db00526b7805b1f6772c628902409af66ba88983171b5456f4cd26c77fcbe32023bf99d1081a55d SHA512 370e7fa12a3a3a2a973870a99f7b2b910c808d6932c1de9093630d7e8bd7d97feb4b7df713e9ac33c7927849b63174a899ce6eaa60db89b1c47d6e13ef181ad6
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
-EBUILD zathura-0.4.1-r2.ebuild 1420 BLAKE2B 8d0dfd67bd584180927b14f4e0ff003416753475252424e30a5b229eb11a681b5234e3c63f4c562f870312da7367ce208ee04d63186d38e6139e5411b65844d5 SHA512 c14052854ac312e13d6a2a33ee4898a99eef2486737bef411c5b8a509f3474da07e23231395b47387ee4f64fc7deddd498ca4140193da0006fe3c95724f66fb2
-EBUILD zathura-0.4.3.ebuild 1336 BLAKE2B 434c74612bd50d5b7776a5df443ece98b6ebf683fd7ae485eb57497cc46ee7bdbb96f0278513a352dba45256090e2715f30052539bf11022336ffe97adfa74d6 SHA512 61fb8fcf6671dfcfdc4e561f6dd94d543996bc7edb037a371a29f9f152d9e9f5ea4593ca2416864c4a549dfdc32639c91119b254b8da95d676716699edc8112e
+EBUILD zathura-0.4.3.ebuild 1333 BLAKE2B ad5146cdea9826b8d22bf95d47dc0dcfc02989ae7acd5c085cdbccb61a3b69fe2eb3aa7a44866efe71387da6d63490f37f4d19f01a4a0cdffdd680a52cd60e02 SHA512 cca06811020ead3fbc6d56aa54f1d6e5b73ab03874c5a59c885db015aeb8a9841f6f3d43562bcd0dc3a305d1faec8b7f4473f16ff7107740fc02b330869390fd
 EBUILD zathura-9999.ebuild 1374 BLAKE2B b1935313606001d9dac20406d05fde7fe1720afd0380885577fbf4ae88e78e989226f01651f59279fe863c67b552f0e4b9e6b8dcc00dbbee2b06e80622e8acc7 SHA512 a904dacf3ac21794e27aa8ebc84c2faf7cfbecde519a52936a91ec7d0d317552fd64ef95d0481ef2eb43ca19183e14075b6dc442ca2732ca6958e17cb2fde2c6
 MISC metadata.xml 827 BLAKE2B ce7ca0240a5fc4caca62988ca9d849aa2c010ff36f9ca542f45c49d47a04669e66cd6e1c891f3ef1c36b5eed690d7a6bc134d7130be7ee7e0ee987a428eaeecf SHA512 fba70c39e525376da98422f05601a327e68cb7bc904688ebb3b17854b1123e8baf066cae45d82d3c91d9ccf24b64241a6541484cfcd342fecb2a5f7ca44af02f
diff --git a/app-text/zathura/files/zathura-find-libm.patch b/app-text/zathura/files/zathura-find-libm.patch
deleted file mode 100644
index 4995238fb8da..000000000000
--- a/app-text/zathura/files/zathura-find-libm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-r2.ebuild b/app-text/zathura/zathura-0.4.1-r2.ebuild
deleted file mode 100644
index f6972544584a..000000000000
--- a/app-text/zathura/zathura-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/${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"
-fi
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="+magic seccomp sqlite synctex test"
-
-PATCHES=( "${FILESDIR}"/${PN}-find-libm.patch )
-
-RDEPEND=">=dev-libs/girara-0.3.1
-	>=dev-libs/glib-2.50:2
-	dev-python/sphinx
-	>=sys-devel/gettext-0.19.8
-	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 )"
-
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check )"
-
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
-	local emesonargs=(
-		-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() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.4.3.ebuild
index 19b0aaae81e4..26887b29c3f2 100644
--- a/app-text/zathura/zathura-0.4.3.ebuild
+++ b/app-text/zathura/zathura-0.4.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="develop"
 else
 	SRC_URI="https://pwmt.org/projects/zathura/download/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="ZLIB"