gentoo resync : 10.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-10 21:05:55 +0000
commit: 71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree: 9f1f0dee23e13658e52f49437befe78427148c51 /app-text
parent: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)
70 files changed, 723 insertions, 239 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a938f4d834a0..a66e8a248321 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 991c8401af0f..3f6e5ca8d195 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,5 @@
-DIST ansifilter-2.14.tar.bz2 441884 BLAKE2B 90b3b0330866da11c00b105aa79164178aebecf39131f5c8d8e373091f53d2d8bbced54472c975a61857d594a9fa92ce08d018523f471fde445d4548d48b949b SHA512 a0b7f12ea5b9ef9b5845a03484a2e238a9f60e0e49f8eddca8bf24b47faba48aa0b55f922678b3bf1b3f08857bbe9a8285b3f318f2adec84673bc502e21b6802
 DIST ansifilter-2.15.tar.bz2 441381 BLAKE2B db55f8a21aada3aa851a099e5a19a3f3bbf81b8ce5d75b31600cbc47f409306e74f57ff51c52266212fa3c59730fac0d416e99f1fefe8a7009bd357ea216b0cd SHA512 4c30ea11665ce0876664c77fbe69c377d5e692508a54b4629e9b6363c1f223b65ac91d20fd61d6d8cf719d1b391ca6d94d69dabbacde7c2dc460330d530a09af
-EBUILD ansifilter-2.14.ebuild 1004 BLAKE2B cc405c8153cb0b54751498169307b13302f25242c9e1e2a7164f69c982fbb048266f05a100a04dbcad97c825cfa992a149a0b664ace821f719cbb670b3463213 SHA512 caf0d3364e39d7a66cc4b6684d9f5277f60af0c44a13ca10462370f475e9c4e98baa393b491a1810bc3cdb824c6c67bbd5bfee4ad13c7c4ca4f4a8d10bf90dec
+DIST ansifilter-2.16.tar.bz2 441932 BLAKE2B 7a6af4e4b78cd4c26551791b4661a6f41c397a65abe19667f049bd393af0c5e1453a3f7f5f56c7d321c41c2cf36acc05575bb866f5dbf04184de1069d6c64a20 SHA512 ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
 EBUILD ansifilter-2.15.ebuild 1004 BLAKE2B f80c1c12d0e25bc8596b4432bc8c1c72129650a2377d11d57b022fe17d67a1bdf1a957121bc88b0402f94b87a23f2f12f32bdb0cbf10dfdb2fe3d98fe5955b35 SHA512 411f165414fea2f9832135a2b9702e1f9d41cf41f00968e801cff6864ca3b2a34944eec63362c6eec0815def4094b124ba79dc05538db1a53486019eb89b4d01
+EBUILD ansifilter-2.16.ebuild 1006 BLAKE2B f75045ae4f6e6e87ae7217910f8f8502f3d4a32746cc7dc93e2ae13a47d8c926d4835c77ade3b0bbceee213d2a281bbb7fec836b3eb80e0ff5806462441f4ad1 SHA512 151af390ea256d12d9c0fd3a5776ca7d1aabaaaaadd592cc6aa1c544a1fcfba619b6e382d8d78573f2210e2beb923188b75a519f99b25728124b7f24c4d45c02
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.14.ebuild b/app-text/ansifilter/ansifilter-2.16.ebuild
index 89eb5868d897..d4c9c6144d6b 100644
--- a/app-text/ansifilter/ansifilter-2.14.ebuild
+++ b/app-text/ansifilter/ansifilter-2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 0a12099dee72..90b47eb07a80 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1,3 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
-EBUILD asciidoc-8.6.10_p20181016.ebuild 2580 BLAKE2B 05f5a6ca1c08d08837e0be753ec5f15d2e0e5632e4de5d62b359a8054b4c371e5ab0d0bca8755461cf1cc37f92034f0b848fa1fc7a975164aea6b896225137f4 SHA512 9005a49fcf9e12e89ef5de448f7f70e9d33b0c74abdd62b41bcd9929cafaf302bf78c2e06b301d7f2ad8c32841a199f9bc982f0bccd92cd1a8587bdee53b5dc0
+EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2620 BLAKE2B 4ae19fa2b8362818e9b5a04226aa7c4b57dd027efab22b0c9881ee3c3ce0d6b4d5ed903f03e0a26962d93ccdb125d73b1ef9e0a22178fb54fe28ef186b42ae2e SHA512 b01efd0d8d1b03de83bd39b37fee70645812795dba6136ea0410258793f4775e41a7ec9392e4b572dfb2db6bd76582de0a605704bb0dc026025044f5e971fdf6
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
index 5f5423e5152c..efbd0590a066 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016-r1.ebuild
@@ -29,7 +29,9 @@ RDEPEND="
 	highlight? (
 		|| (
 			dev-util/source-highlight
-			dev-python/pygments[${PYTHON_USEDEP}]
+			$(python_gen_cond_dep '
+				dev-python/pygments[${PYTHON_MULTI_USEDEP}]
+			')
 			app-text/highlight
 		)
 	)"
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 76c53aa9c993..fc53985f3908 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,10 +1,12 @@
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
+AUX calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch 2717 BLAKE2B 208686717ad91d2b59b1772352a6ffbe5e564c2243e87e956038a6c019e091e5b9b8fe91a1c51895bec352f61eae96a45831e866da86909fa09c9a8a294b7439 SHA512 9741f59bce3aad80c09aab91fd669bd4da3b05f0db560f4c769556e25e0ff092b7d184f198904d1ed9d86aa6314c4277cdc5e26ad2aeb2eaf063c84cedf13c48
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
+DIST calibre-4.10.1.tar.xz 37012272 BLAKE2B e5d9421ed986da8ec7d814f364702fe04bcbb76b5e08dedfadd7164c81943cdfe6f012042e82a4715e3ccda284efdf44340af0bde9d03cbc7c22cbcf10136a55 SHA512 eb6f4fd458da3e3e1121ff72da0dfb2bdc38cec98bdaf538e6761563aa176aae2439e4949424795c239a8fa8ebde507564452495ef71f3f7f19b25435e10a41a
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
-EBUILD calibre-3.48.0-r1.ebuild 8007 BLAKE2B 882d263a21ace1a51754426534139d9cf43148e1346cfeb08eacb86fbcb584adb4588ee2c6c483caf0cd76deb6ac4b7cb8d659eef7d89adacada9770226101ed SHA512 337368328e48337f68b0e8f315bc8159ac198ca4f85e2d886fffc31c4c8d7ece07290a0036ee327dbbc1e36d96399e8104f8970e0fd394d251a06a2ca134656e
-EBUILD calibre-4.9.1-r1.ebuild 8287 BLAKE2B b101adb4af4b9afa4b65acb34c131a1cb41d5d6079e5457ba3402ead5d3e7c5fd0caac101ae75367e4b658702f534d1aa8672e632c97950cbcde8e504cc7c54c SHA512 fa945bf73f846dc8b72e0e76a818289502745bfac6dc7ce42e31e5f58a04b3ee2bfc6c6b4e39bdb1b773cc9a61d455eb652c317e73ee542e9bcfeae573030a96
-EBUILD calibre-4.9.1.ebuild 8179 BLAKE2B 402c3e4adb13c25d68e1f0e914919b46618c75b6f74b6b936155eaec7120f6312b2408f9473c5e1a974d60d1cc6a50b6cdbef08611e1e2fa44669b5b148b6e5e SHA512 c346d84a029f66bc55b6d681236858f4648b75ae84c409ed1f5e47df51f5e4e91f242f8a6bcb73bc6b424a3851908a1a092078399ba7dd6d15e859bc8345e14e
+EBUILD calibre-3.48.0-r2.ebuild 8219 BLAKE2B e600ca6c64bf1a3330558d68c95b3281e07e3c31b02ec22615469ccaea97ea5786d70e93df93bfd12e1f16cd99e149c161813b03652888b97617cdd0dd19897a SHA512 9eb1c4d66f024c101a4d400b39251d93af0bf57e06e64ac267c6a8a4b3041fde641a538b2490fa452c1a8a769f2c484eabe960bb4a29c9e3caf90bf064103042
+EBUILD calibre-4.10.1-r2.ebuild 8595 BLAKE2B e1d22201ff20f2f97de5506f1ec67fd24e5d0508aca8e7a4a3935a36e1112ae5bc0c1ef3f579ff21560766e07d1f2d46a241f84174980a2fddef437b0400960f SHA512 1580aa62d48e2a212ac571fd11b61ee821d6c5f94473828104ed0537fb84d2c1addc69700854015db7801bcc79fe281b012b3893a990bcfa8113ea5d8beafd2b
+EBUILD calibre-4.9.1-r2.ebuild 8594 BLAKE2B 0b1db0bbf9124ec3a1c8491d13d2d91ca4a6c30b78f945d9cb60c399220b7cbc3afa0c6614c14c1150e44b1193e7f799c6fc4cc9d74c437c275b14b0a8a5f3bd SHA512 e9c92d66fa0d6e28d264413da4d73b8a0e3f3d43922e3b507aecfcaa8509bbe86ede8b3aace9850e45d128626577b9336a58f72989133b2284789bcba9c6c7ba
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.48.0-r1.ebuild b/app-text/calibre/calibre-3.48.0-r2.ebuild
index 750bc132087d..4aac7817f183 100644
--- a/app-text/calibre/calibre-3.48.0-r1.ebuild
+++ b/app-text/calibre/calibre-3.48.0-r2.ebuild
@@ -44,28 +44,30 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/glib:2=
 	>=dev-libs/icu-57.1:=
 	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${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/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.9[${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}]
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
 	dev-qt/qtgui:5=
@@ -94,8 +96,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 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}]
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
 	>=virtual/podofo-build-0.9.6_pre20171027
 	virtual/pkgconfig"
 
diff --git a/app-text/calibre/calibre-4.9.1-r1.ebuild b/app-text/calibre/calibre-4.10.1-r2.ebuild
index 96f088d77812..2004b89741dd 100644
--- a/app-text/calibre/calibre-4.9.1-r1.ebuild
+++ b/app-text/calibre/calibre-4.10.1-r2.ebuild
@@ -46,30 +46,32 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/hyphen:=
 	>=dev-libs/icu-57.1:=
 	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${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/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.9[${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.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
 	dev-qt/qtgui:5=
@@ -99,8 +101,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 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}]
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
 	>=virtual/podofo-build-0.9.6_pre20171027
 	virtual/pkgconfig"
 
@@ -117,7 +121,8 @@ src_prepare() {
 	# 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"
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch"
 
 	eapply_user
 
diff --git a/app-text/calibre/calibre-4.9.1.ebuild b/app-text/calibre/calibre-4.9.1-r2.ebuild
index 1b5faed75d37..3718b23741e9 100644
--- a/app-text/calibre/calibre-4.9.1.ebuild
+++ b/app-text/calibre/calibre-4.9.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="sqlite,ssl"
 
 inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
@@ -31,7 +31,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 SLOT="0"
 IUSE="ios +udisks"
 
@@ -46,30 +46,32 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	dev-libs/hyphen:=
 	>=dev-libs/icu-57.1:=
 	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${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/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.9[${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.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+	')
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
 	dev-qt/qtgui:5=
@@ -99,8 +101,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
 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}]
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
 	>=virtual/podofo-build-0.9.6_pre20171027
 	virtual/pkgconfig"
 
@@ -117,7 +121,8 @@ src_prepare() {
 	# 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"
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch"
 
 	eapply_user
 
@@ -152,6 +157,9 @@ src_prepare() {
 }
 
 src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
 	# Bypass kbuildsycoca and update-mime-database in order to
 	# avoid sandbox violations if xdg-mime tries to call them.
 	cat - > "${T}/kbuildsycoca" <<-EOF
diff --git a/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch b/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch
new file mode 100644
index 000000000000..fb55e0025b7d
--- /dev/null
+++ b/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch
@@ -0,0 +1,63 @@
+From 6f947d88d323bb08bb6e076d442662aa281fe197 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gentoo.org>
+Date: Sun, 9 Feb 2020 12:16:04 -0800
+Subject: [PATCH] py3: Ignore TypeError when sorting device collections for
+ kobo driver
+
+https://github.com/kovidgoyal/calibre/pull/1098
+
+Use the same approach as the usbms driver when cmp raises a
+TypeError (see a8deb4b1f8dfb768a32b95b1540be32d5d6e871e).
+
+This should suppress the following error which was reported for
+python3 and not python2:
+
+Traceback (most recent call last):
+  File "/usr/lib64/calibre/calibre/gui2/device.py", line 90, in run
+    self.result = self.func(*self.args, **self.kwargs)
+  File "/usr/lib64/calibre/calibre/gui2/device.py", line 543, in _sync_booklists
+    self.device.sync_booklists(booklists, end_session=False)
+  File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 970, in sync_booklists
+    self.update_device_database_collections(blist, collections, oncard)
+  File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 2398, in update_device_database_collections
+    collections = booklists.get_collections(collections_attributes) if bookshelf_attribute else None
+  File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 314, in get_collections
+    books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp))
+  File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 307, in none_cmp
+    c = cmp(x, y)
+  File "/usr/lib64/calibre/polyglot/builtins.py", line 106, in cmp
+    return (a > b) - (a < b)
+TypeError: '>' not supported between instances of 'float' and 'str'
+
+See: https://bugs.gentoo.org/708742
+---
+ src/calibre/devices/kobo/books.py | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py
+index f725751d00..fc1dee6b7e 100644
+--- a/src/calibre/devices/kobo/books.py
++++ b/src/calibre/devices/kobo/books.py
+@@ -304,11 +304,17 @@ class KTCollectionsBookList(CollectionsBookList):
+                 return -1
+             if isinstance(x, string_or_bytes) and isinstance(y, string_or_bytes):
+                 x, y = sort_key(force_unicode(x)), sort_key(force_unicode(y))
+-            c = cmp(x, y)
++            try:
++                c = cmp(x, y)
++            except TypeError:
++                c = 0
+             if c != 0:
+                 return c
+             # same as above -- no sort_key needed here
+-            return cmp(xx[2], yy[2])
++            try:
++                return cmp(xx[2], yy[2])
++            except TypeError:
++                return 0
+ 
+         for category, lpaths in iteritems(collections):
+             books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp))
+-- 
+2.24.1
+
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index bb59b5718566..ad5fd0d0c8d6 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,6 +1,6 @@
 AUX cherrytree-0.38.9_update_setup_py.patch 748 BLAKE2B de89314f017fed48e2433bfbffd47b117234e779e80c9c2a8eebe80371be95a2b8f8fa4941544c674695121396e34e8b65c558ff3e642f74eab83d693fc22a78 SHA512 26a2f7e92717cd2e0e2f60b6df2ed2a861ba77a94b957e1841cd57f3377044ee1b52e179d3566795c9501472a76530a25f4c752a9046ac341bb533ead86c7d41
 DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
 DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09 SHA512 40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b
-EBUILD cherrytree-0.37.0-r1.ebuild 1132 BLAKE2B e5ae77a4c323746f0a868ddb93ad875e1002096f584702a85953843a27ad87ceb15acde9526fc7bade6aa5c064d8aab667bbae4cc8fb372d1a950124925fd26a SHA512 387fd2dca8b5eaa9e633652ef969ddbb448ca3a50028afc26bba5a6020a5b150a5961dc9c7e3ed8f2d08fecf0694830898d1b6cc391ede10a57ddc80524f24ca
-EBUILD cherrytree-0.38.9.ebuild 1215 BLAKE2B 8c2ace0779ac24e801a5c70cca565bdd0022035dd8de2483fb2969662021e6ff838166c21738ba167c470bd495741362b8ac067bad7cc7f5138e8b58ef2867f0 SHA512 8271aad0b8dd6c8cac7d59ff0ea9e83b212f2513ca62971f31ba5abb87f7aebc5b3c3e2fce80ef1ce515ef7e051da58be17905769997196de033cf287ebf8d66
+EBUILD cherrytree-0.37.0-r1.ebuild 1189 BLAKE2B 3f56b8ab0077d13fc2bdabccdb44a07cedf5de5308aee8f0a4a7122856f2341762fca3d7e8f354c19ded1387458f22f90a87dca8ef39cf22bbf5d37cc152c787 SHA512 928f4b904c7047936caa78239615895a1365a76ee3b1260e5db1cce3688ce1627438f7c5cc87f3825210b3be736a155f9be847c91c07fbc1879f7e6f1699ec80
+EBUILD cherrytree-0.38.9-r1.ebuild 1279 BLAKE2B 4eabfb8f4c185c614cd17e7310199fc6b18acae898b3c286f2e458e6a7c34c663526c059df1ea4a227ace16be5d2ce463f936cfd4671472c9e365e4b30148481 SHA512 97b0318bb9270fe1c18cf85b7330437633375f72933dae02f9918a5848bf388bd409fd8d8c639a874280341c4a739a1897cab253c8d38530db5f6482af9b688d
 MISC metadata.xml 444 BLAKE2B d40087a12c79b778c4af5cd9b7eea1299941df716a11351acb087ad6ff3bc64e271bc54014b4fd9402fc679cd15d63a91ab5c1b8a838a9203b463e0ed21e4b60 SHA512 f3a43e7c407bbc442b165e5fe5401a1a0090f925bfb34b1e1fb6e46a068c274c5202f32f5e733b8abcfbee33e59677cd0b85017fc544f5fc1cfb7a0ea5156448
diff --git a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
index b7c0b37e37f2..1e0aa58e0412 100644
--- a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
+++ b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,10 +19,12 @@ SLOT="0"
 IUSE="nls"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-text/cherrytree/cherrytree-0.38.9.ebuild b/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
index 80af20d9208c..3451ffc2b7e6 100644
--- a/app-text/cherrytree/cherrytree-0.38.9.ebuild
+++ b/app-text/cherrytree/cherrytree-0.38.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,11 +19,13 @@ SLOT="0"
 IUSE="nls"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyenchant[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygtksourceview:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+	')"
 
 DEPEND="${RDEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index ec746abfef6b..af20213aff4c 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,3 +1,3 @@
 DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
-EBUILD diff-pdf-0.3.ebuild 1283 BLAKE2B 66f12a1fe1ca1c927b153ddae62d646106aab6fe54cfbbb5fda35bda57da46b1b63b4a5b9fd751943f031cee79018a97f8ac04f445b0945492de03c3bd84a2bf SHA512 b32216c901892d7b3c754cf9fb033969d909e7c55f7b1af4bad1f76bcd021986cb3823c68b878c0c31d149b44a1e40408772a03eb6a681dee2205e454b4b9d8d
+EBUILD diff-pdf-0.3.ebuild 1289 BLAKE2B ca651af5901d2e2f9ace61c85e3cf1ff3b330d1add145b96e83941462226623c8584eba5b55b8cc7ef98e1a333da974b389d660c941164d8e0a8e97fccc9febd SHA512 bb540d538d0b071a0348a0dd4efa9d020c7f17e44050b633a4bc9707d82420ec79517b14cf27d81db1bc2c818fabc057f11bf56d2f5f94511b67455b97271cd5
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.3.ebuild b/app-text/diff-pdf/diff-pdf-0.3.ebuild
index 5127655c04ef..e106b612cca9 100644
--- a/app-text/diff-pdf/diff-pdf-0.3.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.3.ebuild
@@ -7,7 +7,7 @@ EAPI=6
 inherit wxwidgets
 
 DESCRIPTION="A simple tool for visually comparing two PDF files"
-HOMEPAGE="http://vslavik.github.io/${PN}/ https://github.com/vslavik/${PN}/"
+HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
 SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 # The COPYING.icons file states that two icons were taken from
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 443447a7c4e4..df697782e34e 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,5 @@
 DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
 DIST discount-2.2.6.tar.bz2 102303 BLAKE2B 6ffcb64ff8889d79832b28db9a824e5a30bd194a6746dd08e4782cb4b7e60cf47c44f244884fc10372fc2b052fff7d70e6c263e6f4175829d1aedbc8c2ea15c6 SHA512 b67395afed0899563e28fdd2ddd5016d4f382b6b7e46612d12853d701ba191b90771d40e1223e24e3fbf497cad01fdd2e1c67a6b2bf4f6cf082f3fbe981bd002
 EBUILD discount-2.2.4.ebuild 1820 BLAKE2B a1466852395d684f5b71c79c2332750053c40f019626daf89fb8044745b007969a99aa671d125908a1ef4813c034991423ca35f88e8b40c46b82499740f2b749 SHA512 bd9a4e9386a1dccf7be3e6727d31ad231bbecab5b6e14f8858eaccf15b486f5baa275bb606adceadaf9c3928ac46f0d47526e2a9155c178ac4f4d707d5d83408
-EBUILD discount-2.2.6.ebuild 1643 BLAKE2B eea19be77f9800f55465a5faf27690a18c94469e90151e1905c3f5cfff972610cd16ea65ce517e7ae70850884707f43531ea678b82673d5d6935b25a475de549 SHA512 a526b82efa2f3a26ca5cbd5b70b2b651b85dac9fbb17c687b2c0ca3b0971a5f893da66d65818a1d315e08e8748c9df4052acbbe61b7b29df7b9621230b284aae
+EBUILD discount-2.2.6.ebuild 1627 BLAKE2B 68fc72328179a87d0bb4b69c97660c8604bd717b490115ded453846bb02041a2316d3b85c66adea7fe8b10aaf5132a18f90f6a5639e36c5c220bff2485c4acbe SHA512 373212d549f7dfd9197724d69895afeb5426248c8e0d06f7636e6eec74683e75328207b2bae12747afdfa2cdcad43200f4fa6a59a6d2b62228bc5b487c35a0ab
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-text/discount/discount-2.2.6.ebuild b/app-text/discount/discount-2.2.6.ebuild
index 9d8ffa589581..5188f84a09a9 100644
--- a/app-text/discount/discount-2.2.6.ebuild
+++ b/app-text/discount/discount-2.2.6.ebuild
@@ -47,14 +47,16 @@ src_configure() {
 	"${configure_call[@]}" || die
 }
 
+src_compile() {
+	emake libmarkdown
+	emake
+}
+
 src_install() {
 	emake \
 		DESTDIR="${D}" \
 		$(usex minimal install install.everything) \
 		SAMPLE_PFX="${PN}-"
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins libmarkdown.pc
 }
 
 pkg_postinst() {
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 4933c55ed663..4bc3ead55c38 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -2,6 +2,5 @@ AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.2.7.tar.gz 951995 BLAKE2B 32232a0a8e5003dcc056b6916f95274f357ac2ab69a08fde806da12487f63eba273a57049250fc75699fb545e98e25b95dcaf00c67af2ceabe779b8798f24a5a SHA512 696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6
 EBUILD enchant-1.6.1-r1.ebuild 1632 BLAKE2B 82cda91d9057fe587552c05163822441f12dac10a09ebfd48672bfd3fb7f893b022da927cfdadd773b2d6313194dec4f3ebfc470d41080d125d1d7fd700ff2aa SHA512 01f3929470bb979bf376520c6c9d27c9b3cb03200d6b12d755c7d0495ed3dbaf46f4962ec9728b530ef8dcbfbd030e73fa257031c72fc302a2e6fc4b4e7d524d
-EBUILD enchant-1.6.1.ebuild 1500 BLAKE2B d779c9d6fdef22357426a9a2f492c4a1afbcd25be07a69db2a072ea8a11696973874e9108e546bf07b46e883b321a0076e06beb9862c27224e094fa252b131a8 SHA512 f310612ceb6e997b8f4de195b8b07f20ce4aadb972485e644cc687f89d4c696bca8cb6dd8808602004b8bc9465f6fb20a010dfce64855e6fcbfc8be47bcc49c7
 EBUILD enchant-2.2.7.ebuild 1126 BLAKE2B 74c99075bd8fce858a940032ab50edbf0bc31074546cf285c4886bdc8848ef976732e094da7aec7384c41965a6d60cc90a2166363b72e8ea01c3b2f1f730351e SHA512 e55212fde8c27c9c6227db789b27e02795ee6b2d7eaf7c0b1e98aabe612e3e1ad42e9da495dd75bb9b7cac797ad54a0397bfe0f8810b3870c334a6abf9c3afa1
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
deleted file mode 100644
index 3ee15e26d65c..000000000000
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-MY_PV="$(replace_all_version_separators '-')"
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
-	>=dev-libs/glib-2.6:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
-)
-
-src_prepare() {
-	default
-	sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable aspell) \
-		$(use_enable hunspell myspell) \
-		$(use_enable static-libs static) \
-		--disable-hspell \
-		--disable-ispell \
-		--disable-uspell \
-		--disable-voikko \
-		--with-myspell-dir="${EPREFIX}"/usr/share/myspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index b314ac8e258e..bc06ccb2a376 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,5 +1,5 @@
 DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
-EBUILD grip-4.2.0.ebuild 616 BLAKE2B 06faceb684942253e1d01859b2221854cfd425a5e97c5c380e384441e589b253499a2c4d1bd9c76ba696bdea46d4b711011a77f1a1522f7923629dc39ee5df52 SHA512 90c0e76c87b66880278db840f0b66e13be8248ba0f52167c8edfea0e9a5bdaf5c392343eb3b30bec5f68b165ea2e8b773c4e37aaff82d43322b64fef316984fe
+EBUILD grip-4.2.0.ebuild 606 BLAKE2B 09cea289c7779aaeeca02b13987d9939529119c1eee9a349ffb9fde1e6af4173e5b6197a13b244d71280db33d2ae9cd67a5f54f133691bf459cfae7fc10d7f05 SHA512 22d97f6c35814a9ac395a5214422f7a3b9e20b4ad82c65d549d042becf621bb4603feb2b37ce0cbe05ff96375131677f33b827f1b672a76800e0ad0d29f98a7d
 EBUILD grip-4.5.2.ebuild 640 BLAKE2B f7f32f0b1b72a158dbc5916278d224d8bb46a8806f23b1e4cfb706c0ec8b0d32d8035c27496ccbf58549a3aae33838e927de218f3171d89a9f0710719b2728b8 SHA512 4ea96de40e3926ad990d342d9f10a21b5a0e7267f69ed87af0d9f54c5b874efcfd9ace24ae66f0923df758226aeab313cb5088872a53c456b3120811a34ab637
 MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
index 1325c688908d..d5e458d1fbb6 100644
--- a/app-text/grip/grip-4.2.0.ebuild
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy3 python3_6 )
+PYTHON_COMPAT=( pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 225c9566c32b..683f145bcc6d 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,7 +1,8 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
 DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
-EBUILD gtkspell-2.0.16.ebuild 931 BLAKE2B 75d272bda8c12f37fb080473509f4316be54995406c7d3e83ddf3660f761667e7f27735a0fcdceccb51b06d2f410b696acc99f1ad37e2bfa15db56dff76f0b12 SHA512 3e121f5fee9f31b2c1e0b190e8d9120f8e45511a051bcc824b6f85ae444eb894946bf0a7b6be16d5db4166e0a297bf0e2239c93645eafcb510b11c8ea2894bb3
+EBUILD gtkspell-2.0.16-r1.ebuild 996 BLAKE2B 444da566b24e6f9beeb5f34aaefb57930f1bee3dfa422f72a6960fec96cb2e76954a1fc2ef968637bf74b5acd782db430a5c76c87f6b87a93ae6bf614321d060 SHA512 55fb0836f0cb5aee5ca34e0c56803d65bae913a4ac15c3677b3bfd2b55907b59bcd7dc77db411ddf89e5b93314b55a0a077e52c9808b8747227855c71d92e346
+EBUILD gtkspell-2.0.16.ebuild 932 BLAKE2B 26570a2d49f21240e74abd785e61f49d5973f91d5661a10afcd9b0bf2c1f94616f3e5d31284aa6536c0984c35888ca12e58ae0486d3cc9be276711c7abedb832 SHA512 cc83089f2a9fe7a8f323233eb3004c3aae3536c6ac8514474c10dbdd3ec663b87041521d9dce022736943057b45bdcfc54cb01cd0ae284d6809feaee23dac8d2
 EBUILD gtkspell-3.0.10.ebuild 1067 BLAKE2B a923dbea388402ba9d5ffa9a7b3546a3d981b415e5db1118d421f7a4e472c2bc3edbf8fb8ad314845376b4182c0511be19925783ecc4932326f7839d9109ee45 SHA512 df7fb08a67b8f02aa4f43fdb6b8edded00fe235ee26e0296240f032d0c595b531fe248d34ee3b064a733000b2bd8479012dc6b1230c5944b5ddaeca97fd021b7
-EBUILD gtkspell-3.0.9.ebuild 1068 BLAKE2B 7d93551061749ecd326399873069fb4018c7f780a81bf9dece3593b94ed1be9743402a459445d963362f13125504d45d00087cff2aea28474fad57a6a202c7a3 SHA512 ab4b025efbd51fb718b813db2a30ed367e898dc13db9953a388223e9a65f446613638a10f6989743d3a84d180c73a730db07671768aa4b40240ab7e314d5a73a
+EBUILD gtkspell-3.0.9.ebuild 1069 BLAKE2B c7583baaabc1e860028ab1dc41e888d9e591e2eaf9e388c6dc5ee596d8b852da1e3ae4e36daea86a4e6eecf6977b1564bc9b1636a58ff462eb9b2ea20b22b4a1 SHA512 cffae0d5c3dfeb1c4750b4f3a6296375145896a20a3dd2d9013cff34b9fa95f5af6ea4dd7b9a217a46de478f68283d5720b23f1b6a0ada1a95106798e382d997
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
new file mode 100644
index 000000000000..167691bf5c7b
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="Spell checking widget for GTK"
+HOMEPAGE="http://gtkspell.sourceforge.net/"
+# gtkspell doesn't use sourceforge mirroring system it seems.
+SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=app-text/enchant-1.1.6:0"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README ) # NEWS file is empty
+
+src_prepare() {
+	default
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in || die
+}
+
+src_configure() {
+	econf --disable-static --disable-gtk-doc
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/gtkspell/gtkspell-2.0.16.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
index e2851ea43dee..b57d54a8d44f 100644
--- a/app-text/gtkspell/gtkspell-2.0.16.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
index db2f17b17ddc..a1f40688379d 100644
--- a/app-text/gtkspell/gtkspell-3.0.9.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 7221f2da578b..5f323b2ceb81 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,4 +1,4 @@
 DIST krop-0.5.1.tar.gz 42719 BLAKE2B e0baa3c14d9ce63815615eae004a08af720868d584262901eccbc569852177e07d5df659ea560d7e9cbdc4325daef8c35acd9c200440a8dfd73c19b274d8de37 SHA512 2bfd2a5d762454ab45538707c6f333d2b0947b6b203d6e7bd2d9d0d574d79de8ee6b30d87b17d6afea604456b915f323b855c9c9af5c169c192b0a01634075ca
-EBUILD krop-0.5.1.ebuild 763 BLAKE2B 2b55492cfd6b4ab24ea4c17d75efbec83845f1a772916a55c71cfa4f93ed3ea26a6cf01d7d65fbe9b00601a33570cc497fab060fbab7285670a210548c0e5e64 SHA512 640e37164c7bfe675554bf4dbcd1e5207d5bc3886c1be35019ecd41b484e2e2b00bb8d8deb6a01ecd570f2b639c019f8a088aa03a378017dc9b685675c3f487d
-EBUILD krop-9999.ebuild 879 BLAKE2B a92e6395bdb2baf2db60e06517f12fda051b2d822e3f8012cfce25593c8aa767cc7f648bc7066830b8cebb5336ad763dd1f342f8557c2e6c11de1cb30859b603 SHA512 a20617cc85fadc150ce15bcc1fce7a37f980ee6ec9361248ce6ef040d9a2c2a941cf46f7038fd5c4b7a5d582086235e29257f868b3385a7672f063596ddd17a6
+EBUILD krop-0.5.1.ebuild 757 BLAKE2B 43c6ef4fce3592305e59c1006f1d736a7777c0858c3baa2c0922a006988f92a65b20c2e4d73058f47a41e7bac3998140822b30a47a6c370373062a4999665674 SHA512 ee1865af35eda2f6971661aa32f0694d9cda57f857df380827085c5046370a321db38fd2b49d4afab0b46aed870ebd981400aa8665d4b19862e39c96104d6607
+EBUILD krop-9999.ebuild 873 BLAKE2B 8354d4d11794afdf167a4a584d48a3b4e7471dd0411bd636ba4323a67d1d7b5b7b7dad5e564445027bb5d231780d0e20a6fb140bc9df2ed725bf4140e10e879c SHA512 6fe66c73bc35914f113e8a66db53b514d42445df2df646580ac448f30ffeef8f078e2a081c7538e8fc6aaf14f1c78944c91a1cc22b29122c830159e3eed9d2dc
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.5.1.ebuild b/app-text/krop/krop-0.5.1.ebuild
index 986c8fe5c033..8dc3d8371c93 100644
--- a/app-text/krop/krop-0.5.1.ebuild
+++ b/app-text/krop/krop-0.5.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils distutils-r1 xdg-utils
 
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index 0888b2ff9ae3..b7f325ef3b86 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit desktop distutils-r1 xdg-utils
 
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index f98a39eb1f60..abbfe7b8735b 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -3,5 +3,5 @@ AUX libebook-0.1.2-tests.patch 784 BLAKE2B b7f2aa5b5abace8fb1276c534ef564d8e088b
 DIST libe-book-0.1.2.tar.bz2 465922 BLAKE2B 11898cb34d41a6abbf256ed8a7ff44006f239616987ca5883a8a611041bcda2cce221acc00c57cd36d94f8c26510889df3206ca4f071c23ae272262938e2c396 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
 EBUILD libebook-0.1.2-r1.ebuild 1102 BLAKE2B 746d4d4dda955395419b8c316650e2048496da0ea0684732b668edbbf4e1fb3859c22ff7e08e3388d707cbc1f8bba6923a5d4e89ccb45e95ef8512615b9e0b30 SHA512 cefcdac481822765c7ff42d90183e3c90c3122b75b8380f694d3bba000205a184ff114772aff47fe1266528a6ea4a7c90845454af7f8c3e9db48065d9e9c968d
-EBUILD libebook-0.1.3.ebuild 1040 BLAKE2B 6a39230aef9afc7dac8dac76724eb3da409b794afe100294debc07f0aaac02fff35a38a67f9d5f6e3ca9c899fa452df83cad6efcf5cf4ef2b06828eb3db67bc1 SHA512 28950094cda3f60ecf7db4c5a5f83df2a39670f867f83269d7ae5775618d2e3080b987bf73047bef66cdcacd08716f8b68dcc8401548ea7152a4bdbbebad570f
+EBUILD libebook-0.1.3.ebuild 1039 BLAKE2B 78ed938aef8e76bd9470bfb0fb2de9d318c5c503efaf49d82f5ddcf973190d042715271a62204fc7b0b3d33be827a7e042dc85bd0b6cb44fe995e590a891892a SHA512 98eb112d3ff3c5b5b2572b38c42a933b47860622f21980b703f7d9154189915d93a4b54b33a759c0e16ddd9f36761e30944da12eac25b52014467141c861db0f
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
index f3f0116c21a5..ebf1a3373666 100644
--- a/app-text/libebook/libebook-0.1.3.ebuild
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index 15c2a5a995af..1e298b65d734 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1,5 +1,5 @@
 DIST liblangtag-0.6.2.tar.bz2 766080 BLAKE2B e19599cb6445e40d21d4aec394ab3bcfe447badf096e8efd6e13caa48ce5cec832cb853f4924ce0204a747949506b49b05c175c2726fa3904424cc25b8dc9869 SHA512 812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f
 DIST liblangtag-0.6.3.tar.bz2 755492 BLAKE2B fb7b3cf5a4e6c3fabdce110ab208fa9e3537d8144839f2fc9779ff9de928afa416838c5c3c5317438ae0421806eb6ffb2207f6ad3dc02bcbf9123668187d22d2 SHA512 3dcfc20704dfaff05aeecdeef74fa81639fb70f930ebc0895fe4707ecd1d5b6221fe889449772811924d0c38329977c9d5fc751c3accbc272834b29c461f1fcf
 EBUILD liblangtag-0.6.2.ebuild 1159 BLAKE2B d20d9c30e08a145d77f6c31f8a72e8f09b0d2bbb6ecb0c3f9ad237462d71bd0f3c83a9b76984f6141ac5fc7ef194fcf965aebb2dcd5d9ba5c3c00877d082e02f SHA512 5c81c0eece432edbf077563ead860f55652fdf8d274385606762c986ce9657eca9cdfb78b937606a9f26bec68c9b491810b9b78e3abac140be10ca4ad9d69998
-EBUILD liblangtag-0.6.3.ebuild 1230 BLAKE2B b484327d82498ce8693bd02eb0653c231ea8b7edb3d68ccb30cda194e98e06a740e41cb24608c62df946cde2492d6b7fe5f57354ab99e501ea62d089b5ab1a5b SHA512 1d8bbe1d94028ef59b86258636c8c33e9ea59473861f29b00387849cd1c0975b160a2daf3ea04708dc5c7e05aa58d92be6d0cb4173bb39401e7c6a6d7b024a17
+EBUILD liblangtag-0.6.3.ebuild 1229 BLAKE2B 63cef5c98f492b721bbab859090cabd3e99350e2788319dea9c5697aa774914365f0cad5290bb0d276633561f8445c55a1c5289c63ab68f9cda7afaee9259128 SHA512 55b99a2660b0550c34b48283c696a409c2f461d20bba68416e1ed63f51a8fa510a5539bd13dbe26fd02a0e838dc99fafee9e3ccccc84cf39ed7e12768aafe8bf
 MISC metadata.xml 349 BLAKE2B 3be7ff388f2fa95c460c034408fb159d9f7f2b17b4634027f73870018e672f330b3b0f9cc96fa372170bf2daa314cb087a9cd5794ab1e373449b4cc0762bda87 SHA512 dc4a715ede23108572522e1e6c7afd36b3c3359fe4145e5a02b45e7fc094f1633fbfcdf0d9c75955f75acb1487e438bb437a85766d7a06e628674447d5cf3d96
diff --git a/app-text/liblangtag/liblangtag-0.6.3.ebuild b/app-text/liblangtag/liblangtag-0.6.3.ebuild
index 0ea1f591f0ef..a9c9bdde4c33 100644
--- a/app-text/liblangtag/liblangtag-0.6.3.ebuild
+++ b/app-text/liblangtag/liblangtag-0.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="|| ( LGPL-3 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc introspection static-libs test"
 
 BDEPEND="
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 88cb61605bfc..049df7d031b6 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.24.tar.gz 355272 BLAKE2B 28617744c7361a5d51bad3eda876b3a2c03e5aad0b381aeae037a7280c88dde7cf3c3a457e7aed2dbd86b116ae6ce2469f65edc0eedbb0c2df68451813a5a579 SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b
 EBUILD libpaper-1.1.24-r2.ebuild 1150 BLAKE2B 4d8442e26c0055624fc759419eaf9ff3b476bc8f7dce7a0c5e9519599ab6cf2e51c63ebe37553ee159e4bccdbaf1b8ad130486c1729418ceb13a00a94fb09725 SHA512 f3f3bcb01d9ac34a3bbfdbfa1d1586185a4e5a18aebca213c5855d3192f62764ee3fa64b63b3ee779182d81e14a098287322e5da00775b9c81658e8539af7356
-EBUILD libpaper-1.1.24_p5.ebuild 1221 BLAKE2B efcc5b15395b9f83576aa261570ca67e9c420dbb96c3a7819e27b8c28a37b1c522f0277f673257671335dd31d89da5093178c8fd3fea86d1ad6aa8ad5af42ea8 SHA512 9f78a9bc1ed0ea55f9dbd5579cc87e6d940a4abebc13515c21d50d08b363ff0082230b80ac2e60827ea6b6df43e243bf442c068fbfd3fa81b996b35a66a49396
+EBUILD libpaper-1.1.24_p5.ebuild 1220 BLAKE2B b53357f1f593706a9335e628d5c3b386d8911ffc1f2d4003fe096c63e9255dbe7b6fe3975743cbdb51b3898d82021ddbf62506c567e1770db0e9b44ccb2aac86 SHA512 d5a3aea610eee6fa920ab4fc4d6a0bf4975a1adee3a13d90b4b2599cc36d5ff7abf15440d39b3ee277f4d52559e0d272e539996bea433a736e27f5e3325d555d
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index eae4131557e2..b7478c96646f 100644
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 6dd455086215..040436f33948 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.2.tar.xz 341760 BLAKE2B e596b3ebd23c8fff2a1675b1076ba6b4403bb41358972b50eb946610108f5968ef3e553478aec8c6211f8b476030033e7d334cb4deccc7d6bdfba3914821abf5 SHA512 409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab
-EBUILD libqxp-0.0.2.ebuild 818 BLAKE2B b606252d677a16b8f74d4001f83d83c18c9287c9dec6d37020ac276bbce2f6e1fac98d0f6a45e4d52816c9bc52308b5753af3ce02307150f04f753c299c0067a SHA512 43152bee7a26a2b89a8879f3e203d80f2bf3e926663faf9790470b6b44a5b7f61f860d3e9bf589ba087abccd76e766b322c011e08ba7a215a6c844b7cd02b724
+EBUILD libqxp-0.0.2.ebuild 819 BLAKE2B c30f8093d93601e84cba18cad095507e033c51667913e533d74fe51d5a3284927aebe17516fce47bf3665af84334bfeef1764e082f1af6e25e418be9b8ac5a1d SHA512 a0912e6c49968abe903da83e044901c7701287f67bb0b46d70949cd2fed15014bc498d599e22b4dbea85b8ac4613f396499e2ce926eeb453b2b21ce2eecd48dd
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index 45620397cd35..c50e69eaad26 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Library parsing QuarkXpress documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
 SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index 213fad305f3b..9099b48d4478 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 640 BLAKE2B 214c55c5659d2073749ac35eab7437d9eb663f712822d2e14984494f9a000aba061ff789c50e681087b05b590e9cbe989719537c63cc505fbc9fe8476107f943 SHA512 89964f09ea99bf1bf97df1762780bf1680c1f70c4c0faaa359f6b9b6670ecfc0aa07718ac7a0cb6403e215dd8d2cac78df02428e4ed5af1a9117087f82a624fa
+EBUILD manpager-1.ebuild 657 BLAKE2B 362fc558a0036b7323303b61126dc54c640f72a51fb092c11dd340244bda2e2beb1c5f969558cef6725e02b6ded59d72370e02538b5efc1e353767e9ad2da19f SHA512 eaedaf8cddbfb5e8188e3f977c59f03d2d95884b0ce57257600e4642019afa88d4f162239a58112c051fc30093c0286f2784cb4343f45ce0fe929bbad54b41b7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index c925f2b1adb3..31e3767691ea 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 inherit toolchain-funcs
 
 DESCRIPTION="Enable colorization of man pages"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
new file mode 100644
index 000000000000..856068c0104d
--- /dev/null
+++ b/app-text/nuspell/Manifest
@@ -0,0 +1,3 @@
+DIST nuspell-3.0.0.tar.gz 403043 BLAKE2B b437012e4fb327f13d9ff0944dadf7e865c670daf153be00dd48e9d2fc01c87d410ebd5aeaa094f6446d3035346738010cdba961cfaada3751bedce264beaa6a SHA512 d9cd7dd276e2bca43dec3abaf11c5206695949b9fda8c9b86f2772cc7e8fa95bf17c685a2ef9ca87fe3c4f0b55f2fcb435bc21c187355f5e3fa35dcafab2c8c2
+EBUILD nuspell-3.0.0.ebuild 1091 BLAKE2B 07c8fa7a2b9c03c18821ccd35bc1d9fa5f72490c4a9ec4d52cd4f4f90cb2d295771e2110b6ab50ab8c0bb34db075349735993e61f3d5ddca1380d5cec4e467f8 SHA512 eceed5f031c930296ed451dad77718cd07e4b052598026b4c59219467eb26c7eb050239d1869339791bd9e4bf437af9e54cefa1981ffe939394331a5dde8adff
+MISC metadata.xml 489 BLAKE2B 51835316b4f8b1b1a016324955d48f6f5126ef7b7caf11f4b46ea858469fc9ebe3154de4fbc99d528bfef3808fe7c95dd2f540038572ae640b00dad9fccbeacf SHA512 ea959020e4b2a90f475d296fd1a43c2ba8efc1c39f2dde70b930165bce165df1011e04af8f54b37740f28e009502a5c64ec0fdb2b7221003388cd47b1ccadeb5
diff --git a/app-text/nuspell/metadata.xml b/app-text/nuspell/metadata.xml
new file mode 100644
index 000000000000..6a10d096c251
--- /dev/null
+++ b/app-text/nuspell/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<longdescription>
+		Spell checker library and command-line program designed for
+		languages with rich morphology and complex word compounding.
+
+		Nuspell is a pure C++ re-implementation of <pkg>app-text/hunspell</pkg>.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/nuspell/nuspell-3.0.0.ebuild b/app-text/nuspell/nuspell-3.0.0.ebuild
new file mode 100644
index 000000000000..91e224ba8293
--- /dev/null
+++ b/app-text/nuspell/nuspell-3.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Spell checker library and CLI for complex natural languages"
+HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
+SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="test? ( || ( MPL-1.1 GPL-2+ LGPL-2.1+ ) ) LGPL-3+"
+SLOT="0/3"  # due to libnuspell.so.3
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-libs/icu"
+DEPEND="${RDEPEND}
+	doc? ( app-text/ronn )
+	test? ( >=dev-cpp/catch-2.3.0:0 )
+	>=dev-libs/boost-1.62[icu]"
+
+DOCS=( CHANGELOG.md )
+
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'Nuspell needs language packs and/or dictionaries to be of use'
+	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
+	einfo
+	einfo 'Besides MySpell dictionaries, for other options please'
+	einfo 'see https://nuspell.github.io/#languages-and-users .  Good luck!'
+	einfo
+}
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index 5af3273d5b0f..37dc14c5e0c3 100644
--- a/app-text/pastebinit/Manifest
+++ b/app-text/pastebinit/Manifest
@@ -1,3 +1,3 @@
 DIST pastebinit-1.5.tar.bz2 42941 BLAKE2B 678df7f2e77cc832fc9e152fb451538284033d181d9165b1a1194b254ad08ca1ac3e4612dddf7db6c62c1c3c59265ad94a78cc6df9457565264864ab06bff00b SHA512 cc4b7c46ab7932be3a1064ce7a1d91da3ebf4b132ad44b0090c8d431bfc68e945357344e59ac1239e37b3178de124930c5c8dc552b42f16c39c0452ac9ab8099
-EBUILD pastebinit-1.5.ebuild 1329 BLAKE2B 68f28d927b02c7d9bd042e7ddae1d43cbb260810b8d036ee49c8b8d3cb982ce3e5b8b39cd596a72ce098c42a886cd69a25f0cd6014433ff57d3439332d530df1 SHA512 f034cc3abf06d801684a08a8d3daaf53f36aa5a203934f3eea92085597403cace1e9083509ae917e29944f644d68170d4fe5a681335158ce9ee42ee33df1e07b
+EBUILD pastebinit-1.5-r1.ebuild 1359 BLAKE2B e214069eb40284eb19aabb9ad019e9aab30fff119566c32d9842c0a53e4f1ca5a222a891b63b766c7d88d278c1dd2a6d3d9241dbfdac529cdafc63deeb178ca4 SHA512 3dbf85538256e9a15a0b9ebb10d2739508d2fb76e12ccb3b73a17597f171e92e8a574d062a53f2c4436d4759bb7b0968613310500cf46688d3276f667446bebd
 MISC metadata.xml 326 BLAKE2B d50cef7d0035889868a74b6a2794648129bf06b854208dc28eefe82251c2c2bb4562d19103a6abae51e3f40afccfd901a4c1e2ed8bfcf9910fa99d9543b069c3 SHA512 cd582b088098d0163e91ea17e6b4fa2fb5b816e44590ff8f159730215d9b8118b747b43fdcb9d7a6cad3dfbfbcd8d8b6e29cd509b7a9d6e3b860c77c4ac10c4c
diff --git a/app-text/pastebinit/pastebinit-1.5.ebuild b/app-text/pastebinit/pastebinit-1.5-r1.ebuild
index c707cb302333..f849d52e157a 100644
--- a/app-text/pastebinit/pastebinit-1.5.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 
 inherit python-single-r1
@@ -19,7 +19,9 @@ IUSE="crypt"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-python/configobj[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+	')
 	crypt? ( app-crypt/gnupg )"
 DEPEND="app-text/docbook-xsl-stylesheets"
 
diff --git a/app-text/pylize/Manifest b/app-text/pylize/Manifest
index 0077320a7ab6..06b700fec95c 100644
--- a/app-text/pylize/Manifest
+++ b/app-text/pylize/Manifest
@@ -1,4 +1,4 @@
 AUX pylize-pillow.patch 375 BLAKE2B 9aaf388fc67d03d9af957a1aee350891ded225b0f0def122120d23e7cb1981fe70a8ba7169806a94de913ddea4d8019687ac3088b2e0b318451dc423e6eb75e6 SHA512 5e6beeb1a0192328039d581eeaf568e606a1fa002f8d91ddb397e27d873e23834fda67cd88a5afb24563a515cb37c234ed2d8c913472ce9fccd431249be852dc
 DIST pylize-1.3b.tar.bz2 70979 BLAKE2B 3b90d60ef7c314e6f7683ebdfa4d518b64ebbfe3bbe39148409d50c41577c7850304eb11e588f99e9c22d550548cf81f5f93265624200395e7abe7557d738a0e SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454
-EBUILD pylize-1.3b-r1.ebuild 1022 BLAKE2B aaf0d9b9d31c62fddce0383cb4dd525b7ae1c080b09cdd2fa2a97f4d6461e9d092e414cc2d61ece6845fd8371b741793da0e786d20a453c636f662e3e188f3db SHA512 eecad9d01435070c7652ca2357bec6c9cbcf289e478fe34af2fb2ca17ef217609d792b6d6b14f79d71c2eba1b0769682daba5b2381b0a6798ff81513c39a2961
+EBUILD pylize-1.3b-r2.ebuild 1064 BLAKE2B b18a5af5e8e69673b445be5d0771c54ce3e3e3f58d11937343123e26e759b127d9b39290b6bcff17ff32a0599c183c4e0dccc11640386a49bc42543ae1238502 SHA512 bac5e62884904d7a7c3ade9333db0ab0dc8c47b64de3ce027d8bf6e835c53620e8012e0bc023e2e37e9ddb6b2f2e70a59a54841b47273a635b4fc92fc585a40d
 MISC metadata.xml 547 BLAKE2B d6d76c0357be91f51c01a0d0031c2a221e27dcdb65b300bd63bd614bd5fd29ea000903ed7206167ef3055b1da85297319a4d5517a0f80077ae2a0d072124afd1 SHA512 bf43543c0b0c4f90940d0a5b40c342d9151673418994e074421e723ed8242fa742cc06b93cf846bf8b860b997faa68b4f0f978d274434bb33b77c3e9cddec435
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r2.ebuild
index 799e97bf41da..1dc2b94a9c30 100644
--- a/app-text/pylize/pylize-1.3b-r1.ebuild
+++ b/app-text/pylize/pylize-1.3b-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,8 +16,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
-DEPEND="dev-python/empy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/empy[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+	')"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 1819488c5a40..b4fd7189a278 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,5 +1,7 @@
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 DIST qpdf-9.1.0.tar.gz 18285597 BLAKE2B ef86cd4192805761e121bcd112e071dacb4bc108335da0ba237476d9f1698e4ba630010e3266fb63d9aa5b97e0e778f76fe226613e91d351b93a53b9fc9abee7 SHA512 7561ffc366dbce9df58cc85ff18480b28b0d46de04733ba463139188bee95690f92cf0960a328619f0c9f34ce865598db490fa1c6aaa76ee87d2c034a5f7f57e
+DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
 EBUILD qpdf-9.0.2.ebuild 1274 BLAKE2B 070a9c72aa5cff4a6fa5e8e65d56c87ba04882527b242938087d9f876732c2e49b47cbb9baf37e373469d40d70ed3ecb6ec657126fdcbad63fd82a5299cb6c2f SHA512 e65ad97cff9fdb5ee261d139c9b391e1cdc8c4c13f861a988bdeba891ff02900e4ff06cc37801b170e3af442f6bbb9aaef8123b1a956fc0806f900babc5671cd
 EBUILD qpdf-9.1.0.ebuild 1421 BLAKE2B fcf852c0c05df1b7699d7dbabe2d01861d41eff1cf3b14bac03fb07fd67a28923cc063dfc8e7111cb1ba20a2485a48c863f86669cf9bfd25849f13b0b66d2663 SHA512 6bd4a49cbfc8972b0bd5781ddc7cd175191156064ae512466556a26eaae36cd7f7a830442744cfe1110810216ac5a98fb20e34f7b8c202c7ebc8880c65357a63
+EBUILD qpdf-9.1.1-r1.ebuild 1209 BLAKE2B a41341bc00ad325e8fc52b7bb72cc93d9fa615a82452c436518cc26310678f3fa1148a72f1ea26c50da5a2b366d69d53327c3138eff72370d06ab6be9ccfa673 SHA512 e94d36930a5c3ed832630ada53181acd18d487ed81e387dcbb0ea1fc9b46d99ec1e336dc9e352888f10e3661c9e0a01469e6d2fef2fc83b5896f8b276305d747
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-9.1.1-r1.ebuild b/app-text/qpdf/qpdf-9.1.1-r1.ebuild
new file mode 100644
index 000000000000..34cb46051867
--- /dev/null
+++ b/app-text/qpdf/qpdf-9.1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/26"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples static-libs test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/gnutls:0=
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-implicit-crypto
+		--enable-crypto-gnutls
+		--enable-crypto-native
+		--with-default-crypto=gnutls
+		$(use_enable static-libs static)
+		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 133423a31232..20aef4dd1c07 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,7 +1,7 @@
 DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
 DIST sigil-0.9.18.tar.gz 21396185 BLAKE2B a20a1465032371f9d7e567fff03c859adf4bd2264e9d803efeb3bdeb3b097eca826daa36824370848aea50fffb2b2b74b28568f7dca926565dfd0948d7ade030 SHA512 a8f669ffb76554268aae8aa0f85c6861f80def71e429b44b20ac9b231f3f7584839a82e7b6991f57ca1f2d1f023e24d1f37897bd048379e30565e9bdd7ee188a
 DIST sigil-1.0.0.tar.gz 21623303 BLAKE2B 5772316d3ffc78387f7fb9db1e88397756bf82c25513246033fe71f288d619844e9316f43b7f08b914e4f59912e42eea061079cd4b468de77087bf7a8ea46be0 SHA512 7fc440131fcdd9af60b10f703dcdaf946ac6c667cabbfc842addd68c6c9af35fc8808630a6cfee6db465e7faeec6a6b4f2c6bbe185426a0f845e47c16b02d7d1
-EBUILD sigil-0.9.16.ebuild 2849 BLAKE2B 0e6d0486dc550b77acbc2006757f24c2f29e4d3861998a9225a6f82e21cf3e87c165291647d7a084492bc26db1e0ffbfb70a3faa212aa2c061f314bedc8f4908 SHA512 d742c9f1c2be8cb979f4976008365e6f48b48511d4551efb1a39f00f5111ecfc97ebaba77385fdf42dc7094b679f02d032a9c9ca75aff10554d1416462994b99
-EBUILD sigil-0.9.18.ebuild 2673 BLAKE2B e8cd96014fac4e15113560c9efff8da7ddfa79a2ec9c645556d41b9c4ae5df0e0cef25115c97563e63a1ae1c1e51f0d5252175a6f16bac355c3c81a5c7580e21 SHA512 4976c672d974cc48c6626ff9b6a5e12e1947a4fc7bceb55bd2c9f62b6c718761e9264099feb5c887bbac3324d512501c7bb820aba6078086759debfb5f7f36b7
+EBUILD sigil-0.9.16-r1.ebuild 2960 BLAKE2B f3198426ecfe3f9e01a04a4741049a3e42e54c574a5e8df1500deb5cf632f41c32925b8fee9681da4287b1aaf63eb5c18be4c2372592fb5a7d07796c0fb099a6 SHA512 ce4c4428a22ca2ee06bd38a4cb05c45475a0a2b6ad766128bbfa9d4361ea5bcb756d9167a582e358ba1a80da53e1c1110e51b662a21a708f11b15102d4da35f3
+EBUILD sigil-0.9.18.ebuild 2784 BLAKE2B 33c8b03b32e4a20954f34e26c6e9f41dcc5d9f6f20cde6fb781d1fb3143dea6b58a87d87975df6b618745d5f2ddc22c9b8bb37fe9ef3721292e56cdde380b3d0 SHA512 4f0aabf83ea7cac03a43dee977f763b9631163a6e11003f9facfcef9ba946743b8c8d966fe6c0b996bfea5bb04dcdf010ae4f2b86b5c174239d08c8f95adefb1
 EBUILD sigil-1.0.0.ebuild 2102 BLAKE2B 62b2e071fcd1a6c817f37117864e1cc22b1b29e042de7e3141cc74de32d3dd592629eebc84588a966dd18f600faabe925f058be72b8d1e4e202eae1b5fa7a1c1 SHA512 1f9ca94bf37afa8c5196c1124f18a46777225e923de7cef0a1c5672914e4ff0c9fd08f6054fc2f36fc748b92f5aba08291623e0d0983e5068959be3f1e06a85e
 MISC metadata.xml 1073 BLAKE2B 5428bda0e56ccfc8a4f5c7df773698fa62e0309daa5cb970df9fe3381a7a45c920a854e793b92a2d7e91c66698ddd40f2cf89001e85d0bdfbf521af9fe8ea4a8 SHA512 cdfca84a4cd89a3d4d8d6d79b7eb6432d51019b3ac2c8f59f09262c7cf52c990886e299557bcf10f698ec84e8c3c4f46da19bd9dc298d7011aaf4e52b9e0b35b
diff --git a/app-text/sigil/sigil-0.9.16.ebuild b/app-text/sigil/sigil-0.9.16-r1.ebuild
index a712ce00178e..a9492f58a94c 100644
--- a/app-text/sigil/sigil-0.9.16.ebuild
+++ b/app-text/sigil/sigil-0.9.16-r1.ebuild
@@ -24,9 +24,10 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 	dev-libs/libpcre:3=[pcre16]
 	dev-libs/xerces-c[icu]
-	dev-python/css-parser[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]')
 	>=dev-qt/qtconcurrent-5.12:5
 	>=dev-qt/qtcore-5.12:5
 	>=dev-qt/qtgui-5.12:5
@@ -35,14 +36,13 @@ RDEPEND="
 	>=dev-qt/qtwidgets-5.12:5
 	>=dev-qt/qtxmlpatterns-5.12:5
 	sys-libs/zlib[minizip]
-	plugins? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/cssutils[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
+	plugins? ( $(python_gen_cond_dep \
+		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
 	system-mathjax? ( dev-libs/mathjax )
 "
 DEPEND="${RDEPEND}"
diff --git a/app-text/sigil/sigil-0.9.18.ebuild b/app-text/sigil/sigil-0.9.18.ebuild
index ee2155ae5c35..697fccf8b9f1 100644
--- a/app-text/sigil/sigil-0.9.18.ebuild
+++ b/app-text/sigil/sigil-0.9.18.ebuild
@@ -24,9 +24,10 @@ RDEPEND="
 	dev-libs/boost:=[threads]
 	dev-libs/libpcre:3=[pcre16]
 	dev-libs/xerces-c[icu]
-	dev-python/css-parser[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep \
+		'dev-python/css-parser[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/six[${PYTHON_MULTI_USEDEP}]')
 	>=dev-qt/qtconcurrent-5.12:5
 	>=dev-qt/qtcore-5.12:5
 	>=dev-qt/qtgui-5.12:5
@@ -34,14 +35,13 @@ RDEPEND="
 	>=dev-qt/qtwebengine-5.12:5[widgets]
 	>=dev-qt/qtwidgets-5.12:5
 	sys-libs/zlib[minizip]
-	plugins? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/cssutils[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/regex[${PYTHON_USEDEP}]
-	)
+	plugins? ( $(python_gen_cond_dep \
+		'dev-python/chardet[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssselect[${PYTHON_MULTI_USEDEP}]
+		dev-python/cssutils[${PYTHON_MULTI_USEDEP}]
+		dev-python/html5lib[${PYTHON_MULTI_USEDEP}]
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/regex[${PYTHON_MULTI_USEDEP}]') )
 	system-mathjax? ( dev-libs/mathjax )
 "
 DEPEND="${RDEPEND}"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index d2acad6c2bab..19364cbad761 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,6 +1,6 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-core-patches-2019-4.tar.xz 11932 BLAKE2B 5e73e2bd3afeb904f2b8898081ffd770c9ab152368ae5a8699d5f63507e3c0584901d7d6f8fece7724b8e744d7816fe31db4b96962c0550491a57a6d51adb296 SHA512 fce31563f8c7e8f1f0bdcba9c5108d9f5d14529c22c110e33f32a6367560f7f255e51a1e86f1d5c8fb275085ff3ba6d0f5f474acd79ff61d67be795dfb330708
-DIST texlive-core-patches-2019-7.tar.xz 12784 BLAKE2B 8bb9248a7065ab3922ed5d893c32a4ea623dc0726bc6c25de471b247ad3bdce62284b29d80ad905f70d7b1c17c244b892cea2922620136fa5fb7364a60239c08 SHA512 37976f26909cf25f33d6ce5277c56af4273c3381534f14c53f11426c7d1bcec4cdce1e6aa4f70cc872c964f67212eadd9b953444d54e6bd916bdb45faa463337
+DIST texlive-core-patches-2019-8.tar.xz 15172 BLAKE2B 97ac7855200fcf86463e09df1bdd30f9ebf50e8d207a136ed9dd380776f15d0a883b5eaec22ede4ae9e5201dc47cc40854e1ac77d197fe2bc8c0f5a1c287c1eb SHA512 1a9af52496a7cb4f8e0223811ac84e7adf6ff8d63ad1c29d5c738716e4a45db1375e3f67324104e6a40a93f68de46d7326b3e851a4e33ab66ae562667e4a883e
 DIST texlive-module-a2ping-2019.tar.xz 30616 BLAKE2B 545abfdd3aa23b8d2bed608d7b7aef0f9578d5c4d6039880d435144c687014edb8c841afcb2d9ca1fc48a365b2bcb57832d49d1c6bb35480a01a813e40e18ea6 SHA512 983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c
 DIST texlive-module-a2ping.doc-2019.tar.xz 39740 BLAKE2B 1a9cf6e4cf4dd4dd7677efddafc9da191ab3c34eea3b7bd0f51937f6946e1696b858aa9d53e7599c220933b06bc0332869a0bd596ca66b9801b48adb5ab1aa2b SHA512 daeefb01a0197e3b7751614cb84e2926f670d36b7e8a389bfbbe39cbd941c4d10ef5112593bfb88e11fa15f7f7bb07f2538c7d0a68cefe1482bbdaf02d475512
 DIST texlive-module-adhocfilelist-2019.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954
@@ -158,5 +158,5 @@ DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25
 DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
 DIST texlive-tlpdb-2019.tar.xz 2079308 BLAKE2B 5673fa842b129208a7ec027a0b0a097e7b29eb8baa019371e20444dc4386859144e0c88125e0f085a57812fabf41af1a146a8d66f6eb9e4aefe49518c95590f9 SHA512 024c8cbc65b3bf4d3cba7f527bcf5585c5304c88508d03ff8cb14ffd3a10a666dd58af6db2fa58fad2b1d30ec9a1f03f31fc2486526ecee338dcf46aea8906e0
 EBUILD texlive-core-2019-r4.ebuild 11204 BLAKE2B 58efddb7c26a18e262318e66ffee43b7c46bb89edef83eef0b571beb641549f07b5325142be7457196292dce4614af2bc81baafc3c6a814392d66e30a92f25ae SHA512 5844c2e39045b34361d8ecded8bfa1e8d570bf37aca89f1d7bc1526a85e04210316e6bc7ad8ba7bb059f72e14fb860d5fc20a5f98691fd67da19c46c9902f3e8
-EBUILD texlive-core-2019-r7.ebuild 11516 BLAKE2B 8d6bcc8f80382e2480b5dfaf9b5a9a26dec57708938f2e95f9ae392e0cabe7cd5b7c150ffc763eeacf2840c6c6e4fe90a2ffc5b70fff4cfae95879bdcfbd5591 SHA512 dd9638046c5b66227bc67562b49dad2469c33ad98990fbaed9ec95f7e3bdcb786610b64faf40a405dddd1a0498bd16ddb9099a3702a1e3a3ae977409aaa9a3e2
+EBUILD texlive-core-2019-r8.ebuild 11567 BLAKE2B 2efa686d908010c3e0dd8d858e4993f573970f61da72f231dcad1fc15b5737692ba30d9ab46f9c841491682134853c59b0c08bdf204262054c9c1391cae01228 SHA512 f77c7da05c36a6615cbd13324fcddfa7946ae1fd2b2e98b702aa9fb0e4004382deb7a3ec3e69d36f684c023f4e3b990e7372e53a55e9620120c8749002f0093e
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2019-r7.ebuild b/app-text/texlive-core/texlive-core-2019-r8.ebuild
index 1a7c04c4f1bc..093c3748dbda 100644
--- a/app-text/texlive-core/texlive-core-2019-r7.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit flag-o-matic toolchain-funcs libtool texlive-common
 
 MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
 
-PATCHLEVEL=7
+PATCHLEVEL=8
 
 DESCRIPTION="A complete TeX distribution"
 HOMEPAGE="https://tug.org/texlive/"
@@ -150,6 +150,7 @@ src_prepare() {
 
 	# These we need unconditionally
 	eapply "${WORKDIR}"/patches/{0001..0006}*.patch
+	eapply "${WORKDIR}"/patches/${P}-no-fcommon.patch
 
 	# Conditional poppler patching
 	if has_version ">=app-text/poppler-0.83.0"; then
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index b9d4be5e1d8f..57cd812d1b46 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,3 +1,4 @@
+AUX ttf2pk2-2.0_p20190410-fno-common-gcc10.patch 266 BLAKE2B 98f39f54a57008124d456d831fa02585de3563029acf520b47253510f1c59c1761b450c0b116f372142c9c197aac10b50edfdace60bd66ea9d3791f95556778b SHA512 c65aa9af68ed6073427f7c5713cf4157a1fa7782578612a26040ea50eff89c41251e1b36a395b2cdf639d46cb865abfe46f5662e932d29e6e10bce08dd48b5a7
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ttf2pk2-2.0_p20190410.ebuild 1089 BLAKE2B 5b5029b5b30a1fffee513985ea7748a1e573e2297816e595bbaeea220ddb1163b05a5bb5d3ea20bca053f253db29184a2909ae04995c42e843328373c6e0bfd7 SHA512 3dbd27d7134a8b8e087a53de69ede547fde5445d626ced22b87b9a52ce75b8502907b14dce8e8a8779cb740dfa137a966eaeda27c1471c2a8ed722b35c1a889a
+EBUILD ttf2pk2-2.0_p20190410.ebuild 1159 BLAKE2B 519047a229ac9071f1f32d8137e347a49dce542a72ce0814b08a4ebde254663541ae5ee4e82c2639c858a3f2f9be7422717c47141cfa1c05436a882855e70eac SHA512 2828785adb3c8f522578716abf3f6fa280384e7f1a2c5ab2b88b1d4f5f06d695b9970a789a32cfaf46497874bdc7f1d2ff25303442c46d6d31ec625a574288bd
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch
new file mode 100644
index 000000000000..74678208a240
--- /dev/null
+++ b/app-text/ttf2pk2/files/ttf2pk2-2.0_p20190410-fno-common-gcc10.patch
@@ -0,0 +1,21 @@
+--- a/pklib.c
++++ b/pklib.c
+@@ -64,8 +64,6 @@
+ #define PK_POST (char)245
+ #define PK_NOP  (char)246
+ 
+-int dpi;
+-
+ FILE *pk_file;
+ 
+ 
+--- a/pklib.h
++++ b/pklib.h
+@@ -13,6 +13,7 @@
+ 
+ typedef unsigned char byte;
+ 
++extern int dpi;
+ 
+ void TFMopen(char **filename);
+ 
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
index 6499ac50b3ec..6528f2d15c05 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,8 @@ BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
 
+PATCHES=( "${FILESDIR}"/${PN}-2.0_p20190410-fno-common-gcc10.patch )
+
 src_configure() {
 	econf --with-system-kpathsea \
 		--with-system-freetype2 \
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index d2b23abdc0e0..423ea078613c 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -2,6 +2,12 @@ AUX vilistextum-2.6.9-blockquote.patch 4541 BLAKE2B 231ea3348a4519c5f24160bd1755
 AUX vilistextum-2.6.9-darwin11.patch 615 BLAKE2B 0bfefb47961cf1752c8251a484d04b20c55196d2c64c2e98bc50caf6842b02960257ff22d7d6f7b04c4a7e97e5c66a6a2f122db24faaae4c7fe326833e57c7c6 SHA512 35aeec20cb7e6ba1668d97f041bbd5b98712589eaaf0ab70a59d3a7df74e0d2e67abbab3a27c7c5ee5f6fe9d61f11610686df3459f0cb401cca03f3f671309ac
 AUX vilistextum-2.6.9-gentoo.diff 763 BLAKE2B bb145aa629084c370281fdb2bd31e763d0c0106bb8aa5c7fc1ee030e837cc0062b9f46ad9d626b88a199c12e6163acc2ab28978eb5cb236c3a212b341a7ad9b9 SHA512 b4c49ff27598cedeb06058d3237ea8ebc59a4df9031818f98b5fb22225733d94b820b892541dbddc38c28c08a62ff6f52ef8278c016522b1db95352653178b21
 AUX vilistextum-2.6.9-prefix.patch 837 BLAKE2B 65aec718915942919f371453af12cbfa74437f999d7c25a49186ed5c02e975c4c10ebf629bc54a8a6fb69b9acc9723a32d4d82b0ee09c039afdc5f0fa8d9370c SHA512 6f913d283542bfea02d062f872dc2471e7ea2bc4c29ddb8893aecb9abeb36e6cc821c393217a92421e6888f7c25aa072bfc16c56a69a40593ed504245d8cd187
+AUX vilistextum-2.8.0-blockquote.patch 4479 BLAKE2B 45b63c30064bceb80cd37fa6fc8cf86685ee2017ed53a40ac76508e830b85c5b14d449ef0b5088245fbe87f056a28b83fba95f3795f5b8a05c35d2221696ff14 SHA512 88d5c696f4e20825e032258c85a154c65b9404bb2fc31854f88d8a6b2939cddaf6e6c99b9fa74bffb19a4fb4a75d200afd15a362fbcbcdcee075754866c9fa06
+AUX vilistextum-2.8.0-gentoo.patch 278 BLAKE2B 6fc580c02c38bd65855ff5866555360c6f0d13e1d558f19298418556b5b4124aad280bf0a46505db242ec25f869e8abfbd47dcd6eb030641eadb30878887c6d6 SHA512 3a1d701067ea291756e29d0a23dc6c21ae83a80239d2cfbf576513a667e0ef1222746aff7d1d1ec7bf0af0ceaa48ad44ea37b7b56b499eb214b103d682880d1f
+AUX vilistextum-2.8.0-prefix.patch 784 BLAKE2B 4aeab8e91012cc1302aa7a94337069973c9cea8b179658f30346f3d95bb9d0a351e1430666d6465888432fb74e3454d2eaadedbd8af64e2b57cfe00e9633c65e SHA512 95a92905c68e357c40f64696cf20c9639bed5da3c651c75df803eef4c991bb56424893a40a2a9ca80a9e66a16e1e986d0589dd43d751130146697348c5b0205f
+AUX vilistextum-2.8.0-towlower.patch 274 BLAKE2B b6c043049bf6d928ecb147465aeff6ac959c3320b76ff92c6ebfffb9dda0d8719fe1c1d5dded60e00e6a10a3fab9f177ccbfc053c9daee81b7a95d6ba29044e1 SHA512 3283ebd7694be279f9956df31f6b1e62de3f674f3af0a6d4d5cc139f2cc04c3be322d103faaf1bf0f9845dbcc2f9a12e89d49178df48c90020267fec73f2ecd5
 DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
+DIST vilistextum-2.8.0.20191023.tar.gz 219266 BLAKE2B b94f3179f9181711fd6fe2a8240c7654917f7f93f161495b3380c840bff687714862116d15dfd3f1817a521f0c2d2730221084b6fbe7d1242d4285b2fe21b18b SHA512 a68410993e1b9d3d9dbdfb5677941bf2e95805573d210c510f65be5ebad00cb09f50ef5e592f25a34e535b32a44fc23265e839195316d0ac3c8c8c3b626bfe98
 EBUILD vilistextum-2.6.9-r1.ebuild 1834 BLAKE2B 393ebec6b3a0dca18b66ce9782232e2d0a83fa15107040096e58d1e54b58c9fcdd6c18f28e5cdb4699e869361c6725ec6e36ff7be0834d0a70b2ea913af7b12a SHA512 7ff7b37ef26ea0cb2d421e8e26091431cedec2808e5bd75844930c5714b00d370fb17e5eab30ab312644b8aed9c0003dacdd5cd1b6f7ac17c5921df94f69f8f7
+EBUILD vilistextum-2.8.0.20191023.ebuild 2001 BLAKE2B b210f25ac626818ee22c432ef72b24bec152b0b06235313a91bf5316fb6895343720f5026a4398d35aa700c80136a2a6800de803c0fe152cc1a89c0a9a4349cf SHA512 2d15b2be165252e030ce9559423ae9c1fd2da0b63a1eb8b19bb753126a2c489c7e0bd5ac2ec44c61849ea72898ad372164c9cbad875200aa8c9e821358d4b21e
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
new file mode 100644
index 000000000000..74d44309669b
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
@@ -0,0 +1,120 @@
+Many clients seem to use blockquote tags to flag quotes these days, so
+write them out as quotes, so they remain readable.
+
+--- a/src/html_tags.c	2019-10-23 16:25:27.000000000 +0200
++++ b/src/html_tags.c	2020-02-05 20:11:57.308596941 +0100
+@@ -261,6 +261,7 @@
+ 		line_break();
+ 	} else {
+ 		start_p();
++		quote++;
+ 	}
+ } /* html_pre */
+ 
+@@ -271,6 +272,7 @@
+ 		line_break();
+ 	} else {
+ 		paragraphen_ende();
++		quote -= quote != 0;
+ 	}
+ } /* html_pre_end */
+ 
+--- a/src/multibyte.h	2020-02-05 20:08:43.863715764 +0100
++++ b/src/multibyte.h	2020-02-05 20:12:34.401382354 +0100
+@@ -18,6 +18,7 @@
+  #define ATOI(n) wcstoi(n)
+ 
+  #define ONESPACE L" "
++ #define QUOTE L">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
+ 
+  #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
+@@ -43,6 +44,7 @@
+  #define ATOI(n) atoi(n)
+ 
+  #define ONESPACE " "
++ #define QUOTE ">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(str)
+ 
+  #define STRSTR(haystack, needle) strstr(haystack, needle)
+--- a/src/text.c	2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.c	2020-02-05 20:16:04.852164539 +0100
+@@ -28,6 +28,7 @@
+ int breite=76,
+ 	hr_breite=76,
+ 	paragraph=0,
++	quote=0,
+ 
+ 	tab=4,         /* tabulator */
+ 	spaces=0,      /* spaces at beginning of line */
+@@ -378,6 +379,12 @@
+ 			printf(" z0: zeilen_pos: %d\n",zeilen_pos);
+ #endif
+ 			print_zeile();
++			if (quote > 0)
++			{
++				i=0;
++				while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++				zeile_plus_wort(ONESPACE,1,1);
++			}
+ 			i=0;
+ 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+@@ -398,6 +405,12 @@
+ 			printf(" z2: zeilen_len: %d\n",zeilen_len);
+ 			printf(" z2: zeilen_pos: %d\n",zeilen_pos);
+ #endif
++			if (quote > 0)
++			{
++				i=0;
++				while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++				zeile_plus_wort(ONESPACE,1,1);
++			}
+ 			i=0;
+ 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+--- a/src/text.h	2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.h	2020-02-05 20:18:40.792261818 +0100
+@@ -26,6 +26,7 @@
+ 
+ int tab;
+ int spaces;
++int quote;
+ 
+ void print_zeile();
+ int is_zeile_empty();
+--- a/tests/test_functions
++++ b/tests/test_functions
+@@ -12,6 +12,9 @@
+   rm -f testcases/$prefix.output.test
+   ../src/vilistextum 2>/dev/null $args testcases/$prefix.html testcases/$output_prefix.output.test
+ 
++  # remove (block)quotes
++  sed -i -e 's/^>\+ //' testcases/$output_prefix.output.test
++
+   diff >/dev/null testcases/$output_prefix.output testcases/$output_prefix.output.test
+   retval=$?
+   if [ $retval -ne 0 ]; then
+--- a/tests/testcases/utf-8-sampler.output
++++ b/tests/testcases/utf-8-sampler.output.test
+@@ -100,8 +100,8 @@
+ ვეპხის ტყაოსანი შოთა რუსთაველი
+ 
+ ღმერთსი შემვედრე, ნუთუ კვლა დამხსნას სოფლისა შრომასა, ცეცხლს, წყალსა და
+-მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას ჩემსა
+-ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
++მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას
++ჩემსა ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
+ 
+ Tamil poetry of Cupiramaniya Paarathiyar: சுப்ரமணிய பாரதியார் (1882-1921)
+ 
+@@ -446,7 +446,8 @@
+ д, п, and/or т:
+ 
+  Bulgarian:    [ бгдпт ]    [ бгдпт ]     Мога да ям стъкло и не ме боли.
+- Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не вредит.
++ Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не
++вредит.
+  Serbian:  [ бгдпт ]    [ бгдпт ]     Могу јести стакло а да ми не шкоди.
+ 
+   ------------------------------------------------------------------------
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
new file mode 100644
index 000000000000..a26ae7178184
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,7 @@
+ 											main.c main.h util.c util.h \
+ 											multibyte.h unicode_entities.c unicode_entities.h
+ 
+-AM_CFLAGS = -Wall -O2 -ansi
++AM_CFLAGS = -Wall -ansi
+ AM_LDFLAGS = $(STATIC)
+ 
+ EXTRA_DIST = kilistextum.kaptn
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
new file mode 100644
index 000000000000..e5cb3ba2a18a
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-prefix.patch
@@ -0,0 +1,27 @@
+* don't look in /usr/local
+* try to hack around not being able to use AM_ICONV
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -21,10 +21,6 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(getopt.h) 	
+ 
+-dnl add /usr/local
+-CFLAGS="$CFLAGS -I/usr/local/include"
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-
+ dnl checking for options
+ AC_MSG_CHECKING(if --enable-multibyte specified)
+ AC_ARG_ENABLE(multibyte,
+@@ -41,7 +37,9 @@
+ AC_CHECK_HEADERS(iconv.h,,
+ 			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
+ 
+-AC_CHECK_LIB(iconv, iconv,,
++dnl iconv_open_into is implemented only in GNU libiconv and not in other
++dnl iconv implementations
++AC_CHECK_LIB(iconv, libiconv_open_into,,
+ 			AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
+ 
+ dnl setting INTERNAL_LOCALE
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
new file mode 100644
index 000000000000..a9c8a96a7522
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0-towlower.patch
@@ -0,0 +1,12 @@
+towlower is defined by wctype.h
+
+--- a/src/multibyte.h
++++ b/src/multibyte.h
+@@ -2,6 +2,7 @@
+ 
+ #ifdef MULTIBYTE
+ #include <wchar.h>
++#include <wctype.h>
+  #define CHAR wchar_t
+  #define STRLEN(s) wcslen(s)
+  #define CPYSS(dest, src) wcscpy(dest, src) /* copy str to str */
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20191023.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20191023.ebuild
new file mode 100644
index 000000000000..d77ae962a94b
--- /dev/null
+++ b/app-text/vilistextum/vilistextum-2.8.0.20191023.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+GITID="f299bb5e5f661c345c4b85a3e8de9ad8615ad17a"
+DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
+HOMEPAGE="https://bhaak.net/vilistextum/"
+SRC_URI="https://github.com/bhaak/vilistextum/tarball/${GITID} -> ${P}.tar.gz"
+S="${WORKDIR}/bhaak-${PN}-${GITID:0:7}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="unicode"
+
+DEPEND="virtual/libiconv"
+RDEPEND=""
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.8.0-gentoo.patch"
+	eapply "${FILESDIR}/${PN}-2.8.0-prefix.patch"
+	eapply "${FILESDIR}/${PN}-2.8.0-blockquote.patch"
+	eapply "${FILESDIR}/${PN}-2.8.0-towlower.patch"
+
+	eapply_user
+	eautoreconf
+
+	# wcscasecmp needs extensions, which aren't enabled
+	export ac_cv_func_wcscasecmp=no
+}
+
+get_locale() {
+	locale -a | grep -i "$1\.utf.*8\$"
+}
+
+find_locale() {
+	local l t
+
+	# we basically prefer to find en_US.UTF-8, but it may not always be
+	# available, in which case it is better not to hardcode to use it
+	l=$(get_locale en_US)
+	if [[ -z ${l} ]] ; then
+		for t in "en_GB" "en_.*" ".*" ; do
+			l=$(get_locale ${t})
+			if [[ -n ${l} ]] ; then
+				l=${l%%$'\n'*}
+				break;
+			fi
+		done
+	fi
+	[[ -z ${l} ]] && die "Failed to find a unicode locale"
+	echo "${l}"
+}
+
+src_configure() {
+	# need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
+	# isn't always returning the most sensical (and working) locale
+	econf \
+		$(use_enable unicode multibyte) \
+		$(use_with unicode unicode-locale $(find_locale))
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		emake -j1 check
+	else
+		ewarn "If you like to run the test,"
+		ewarn "please make sure en_US.UTF-8 is installed."
+		die "en_US.UTF-8 locale is missing"
+	fi
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	dodoc doc/changes.xhtml doc/htmlmail.xhtml
+}
diff --git a/app-text/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
index 1dc92bc042a4..ce3af968dccb 100644
--- a/app-text/wiki2beamer/Manifest
+++ b/app-text/wiki2beamer/Manifest
@@ -2,6 +2,6 @@ AUX wiki2beamer-0.10.0-doc-examples-makefile.patch 641 BLAKE2B cbac271fbfcb8a41e
 AUX wiki2beamer-0.10.0-doc-man-makefile.patch 1441 BLAKE2B bfbf6c71f037d67359d1460a4e3c75b7b0a260252881efc2429ddc0b5aa90005c2c4bd36b18873106f9010803f765217f19a1575ee7ba5324ad53e52908a23d6 SHA512 b6ad3ce2b1435d79cce8a517e1a784399b349c4390c245d888b50acb2f5b89aaa49241d3687e4b5432fde7d433bf5ab5fb4bd1d4d96dfaa44358a6c0961bc76b
 DIST wiki2beamer-0.9.5.zip 443288 BLAKE2B a0263ba7044966ff45c892e9f0f78f6916346c051bf57cc8445f4127019cc4cd031719b1b5b61fc7d41a85b42439fa20cdf8fc35fbed43feb28d6d9797c781c7 SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7
 DIST wiki2beamer-v0.10.0.tar.gz 164911 BLAKE2B 0a532669915f0db5f1bb8755297bcd36e4175bc57d3b5f14df01566ac74e425c999447ff3f2bd20f2bcd50671bd65accfcf8049476a1656439fc46bab2becafd SHA512 712c719bcdd97f48c65aff1919f2e6a838a0beba1d2e5569063fd1f84bf68eda3137ac20e5dc463dff64c8b4656ce0bf02a0acea090b9a30262374cbee5db433
-EBUILD wiki2beamer-0.10.0.ebuild 952 BLAKE2B 998f98156e928746ce70b48523f145e92d6c06f5c5eda9abc0173802afc6d7cb23388994f5024edabaee4ef0b5404760cdfb7bdd0678b7435aaf135022bdc4da SHA512 6b50cc131a4ecc967c0bc0e806a4f5a9c4212d8e3efa5bf157cdf17b6cd2f919c738897c852939b7634f8500949514524a9f8b179ff26a724488cd131c8e52d1
-EBUILD wiki2beamer-0.9.5-r1.ebuild 790 BLAKE2B 3bb7fc5a147bc6233ce35fcc4e491a163a9644deb1728f851f3883f74e5085703faec6d5c95eb4015ea0d8472e171309d4ce83fb93f785891076dcf6f0f74457 SHA512 a14b02ab28c543ffc4805256a0a47c42d29072018dddc26b50e6d59f82131bba1816f479c2c917c6e6ae9744e9e4e7b1094255c6e09d744a67c122829e964d10
+EBUILD wiki2beamer-0.10.0.ebuild 946 BLAKE2B 21783eff4aa4eb1a981ed36a64c1ca0d10ebbf011d0e4d9c8e973117523cf112ee798a6dd2d476c87fb789df3d6073a4a5043fd674273deaae4094b302fe8b85 SHA512 1754372e1c4cc0c14988b515fa5f7cb8d42740af6e988d4af808c74ed1798232b83010aa68eb18240e3dfbeee1989d2a27516ece5ea5255564add3ed7662f9be
+EBUILD wiki2beamer-0.9.5-r1.ebuild 784 BLAKE2B 2d30ac44221d37aff5cf627805bafb0a07d106bd526ec9be8842789c1d89662e6059bd9a796a6af07b1e6cf5b08590fff4466f77da5609d28648c4a8a155e545 SHA512 2ce36544aa7ad33dc468ce4c6867e20867231e9c4066a7726c7f2e33fec43c3ddb82f77178ec1d414b55e1a6b2918c88e54cdb164e8618348ae7f05eaddfa985
 MISC metadata.xml 330 BLAKE2B 27059ed0cbe2bf10ad3b028d1f0e12b0617c0e2146432e375ccae5d570d8b1c1860bb9b9f36021a588ce859b7b30dfc04fb1f841890c549093687f3b6ad8addb SHA512 27c93b4ed84b734c1d8b6a7dc86a4d25f18694c0c096351afd35acf378e823dca63d692e853571e9d98e1e7dade682eb3802add4a7088f432279dbf890636cc1
diff --git a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
index e297abad055d..3d7c75757a2a 100644
--- a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
+++ b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit python-single-r1
 
diff --git a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
index 906911db6967..c87c19f7d575 100644
--- a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
+++ b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit python-single-r1
 
diff --git a/app-text/wscr/Manifest b/app-text/wscr/Manifest
index 7ea951bb2b0d..de6e6d2be52b 100644
--- a/app-text/wscr/Manifest
+++ b/app-text/wscr/Manifest
@@ -1,4 +1,4 @@
 DIST wscr-1.2.tar.gz 3502 BLAKE2B 4a6684dd6d9eb9c23caa92f9ddf62332f59b20eb4aba0f475015ddc7e66c592177b0d15ec25249fed86e2302a53463f59d608bd727d97bc33a42d903ecd04281 SHA512 8a26c7fb190f830f6436240fc00dcf61405b1818ff311999e02c64b3506fa6abf13a6f212dbb9b15794ecae4f122def563f9301eebdd7e8d09f22cd647467ee3
-EBUILD wscr-1.2-r1.ebuild 600 BLAKE2B d2dcd3d6d7a2d575c06560c70b48ab81e43bb2c2b74e467d8aab63cb486a2e21b14d412e0aa2b63277be18e1caa9d13e556afae25d0a188db75bb8e1c3c7117a SHA512 40793d93f075829e9533a6f534fe3118c5b3849439ccc7a238d43fefbd450f170fb6ab729db63c713dbc7cb061e97fce157f558ce062d80cab9bd04311c779ae
-EBUILD wscr-1.2-r2.ebuild 601 BLAKE2B 2eaceafa9ef3906dfa96411f372f6168bc0d88d8f044f7c2867b9f3d13d246b8baea2d5fece1fc20511e9585f92dfc1459aaba08a7992c63023e4dfb60496cb3 SHA512 c96e4b3d1718cd23b9b32c21a8063118b86531b62313e08d58c1667ac79496032025fe4720b98a5e9321cd7226d90c38df207426b028c01b0d761b96b70d1796
+EBUILD wscr-1.2-r1.ebuild 617 BLAKE2B 28ac56f2f2be79beb510b17485ba04b3b23851f7d8c69123472e4be7abb46be29457d0664f6dc4dc241fae42b8583ec320ee6f5358caf0f2f17e566c130fcf85 SHA512 a6cc22951901b485236ca86a637d87cd5aac52ec5b75c602ad04785fd418ca86b4af15d851e2a8c68ea9d52e65d6f6c7f136e55ed7914c8973b4b832646d5ad1
+EBUILD wscr-1.2-r2.ebuild 618 BLAKE2B 1f31256e75563d9dc010ff3c53163c83cd0fd6e914a6ed40cf22cddbca38b0979e3c58047aaf6877ee4d294e8ee359828810b8f13454a821148244e2cb0bd7f9 SHA512 a269f6a1f89461263d44d8f3b37744d9055d451ed05cb7028054215b0c21b3e74c5dbea7c0fc9a38f3c380907f1e59c282b649ec8f669e4bacb38777c41e5f68
 MISC metadata.xml 421 BLAKE2B dd48a7b914e790db0db06781519466d05de32f96ff8399e9fcb24ff040119dcec5380677910d9155c611c28203ac1ee7bf5d9602faeed69d4bff35a8cb1d6b3d SHA512 70722daa9c12a7e783b5fb3651f207c057648287e104739043f96c726820268ceb8e4ec211af9a3e2f8fcf7a5e03c9346cea7a25a70478dfdb60f333112b70e7
diff --git a/app-text/wscr/wscr-1.2-r1.ebuild b/app-text/wscr/wscr-1.2-r1.ebuild
index 70eae73fb6be..b68efd0dc49a 100644
--- a/app-text/wscr/wscr-1.2-r1.ebuild
+++ b/app-text/wscr/wscr-1.2-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit toolchain-funcs
 
 DESCRIPTION="A Lightweight and Fast Anagram Solver"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild
index 3a34f41b57d3..1760d0f73dd2 100644
--- a/app-text/wscr/wscr-1.2-r2.ebuild
+++ b/app-text/wscr/wscr-1.2-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A Lightweight and Fast Anagram Solver"
-HOMEPAGE="https://www.gentoo.org/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 605c034a2e20..ff77f288f234 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,5 +1,5 @@
 DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
 DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400
-EBUILD xiphos-4.0.6a-r1.ebuild 2045 BLAKE2B e5320b212660809ea9ea19cc7e0286ec13f6c7e4ef01cecb3e6800f9928568315a8336f6ae43d8107f4d94d028b60015072d27ffb6ae71405a18efb3fb1ed55b SHA512 f7385bb06286a2e1e8788a57aee2482f862f80db80d161835b9a8adb9b264bd12061ca555cd25318a5b1dfb27905a4e348270a44784e67669de591601c5d52ab
-EBUILD xiphos-4.1.0-r1.ebuild 1998 BLAKE2B 93bdf30b0e63b752047f170040b08fc3af5a1736ca3d18e62c4afb1c21b7705d92064c500a10c1c13b1282f372e4fd96f722e5d65c86fbc68234ce886c6e19c7 SHA512 c35fdfdf4911a571c9a4e9ee9ebc139ac3b509bf0bb8c8f5530852f4799355e97c9f730ba281b70965279a315de801681a6d25f22d40fe84f2697bea094d6d80
+EBUILD xiphos-4.0.6a-r2.ebuild 2131 BLAKE2B bcdc3613b78e9a3470304850a2f08b0009023d5eb9a908d0da5ab67d7e5becadd1d36ae0a464156b5df90b03db8416819c03c6680c8c5b6a612d618c6ba65e38 SHA512 de1c4be35149ff30ed202b7eef9297ad3354a0ef25022956ceb1a15f42fc5ab82408496780fb85e590aea5d9ede765067a8860b875f5bfa066ac07c86d6c03aa
+EBUILD xiphos-4.1.0-r2.ebuild 2084 BLAKE2B 47aab3f5421ef3d4c9b4e62aabadb7bc62d35427f16f2e1b2f2744947672c2ec890c27f998628c57f911e41a5e62d932e581a16b9576a2d3e138fab50310acd3 SHA512 cd2655a7d8c0fc95813ca737d7dfbf26730327a23f4d04f24c719fe5b8b220b3d397f3dc201ec60c2b2dfd07ae2777626139644df455938a7a460df096207a86
 MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
index c131ac2b16a7..4ca64d0c5aae 100644
--- a/app-text/xiphos/xiphos-4.0.6a-r1.ebuild
+++ b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,24 +21,28 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	>=app-text/sword-1.7.4
 	dev-libs/glib:2
-	dev-libs/libxml2:2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
 	gnome-extra/gtkhtml:4.0
 	>=gnome-extra/libgsf-1.14
 	net-libs/webkit-gtk:4
 	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
+		gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
+	')
 	dbus? ( dev-libs/dbus-glib )
 "
 DEPEND="${RDEPEND}
 	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
 	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
 	dev-util/intltool
 	dev-util/glib-utils
 	>=net-libs/biblesync-1.1.2-r1[-static]
 	virtual/pkgconfig
 	sys-devel/gettext
+	$(python_gen_cond_dep '
+		app-text/gnome-doc-utils[${PYTHON_MULTI_USEDEP}]
+		dev-libs/libxslt[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 pkg_setup() {
diff --git a/app-text/xiphos/xiphos-4.1.0-r1.ebuild b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
index 355ed3f118cb..159e9351269a 100644
--- a/app-text/xiphos/xiphos-4.1.0-r1.ebuild
+++ b/app-text/xiphos/xiphos-4.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,24 +19,28 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}
 	>=app-text/sword-1.8.0
 	dev-libs/glib:2
-	dev-libs/libxml2:2[${PYTHON_USEDEP}]
-	gnome-base/gconf[${PYTHON_USEDEP}]
 	gnome-extra/gtkhtml:4.0
 	>=gnome-extra/libgsf-1.14
 	net-libs/webkit-gtk:4
 	x11-libs/gtk+:3
+	$(python_gen_cond_dep '
+		dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
+		gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
+	')
 	dbus? ( dev-libs/dbus-glib )
 "
 DEPEND="${RDEPEND}
 	app-text/docbook2X
-	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
 	app-text/rarian
-	dev-libs/libxslt[${PYTHON_USEDEP}]
 	dev-util/glib-utils
 	dev-util/intltool
 	>=net-libs/biblesync-1.1.2-r1[-static]
 	virtual/pkgconfig
 	sys-devel/gettext
+	$(python_gen_cond_dep '
+		app-text/gnome-doc-utils[${PYTHON_MULTI_USEDEP}]
+		dev-libs/libxslt[${PYTHON_MULTI_USEDEP}]
+	')
 "
 
 pkg_setup() {
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-10 21:05:55 +0000
commit	71deace00d1a2b091313fe137ab7092418c6f87c (patch)
tree	9f1f0dee23e13658e52f49437befe78427148c51 /app-text
parent	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (diff)