gentoo resync : 15.01.2020

202 files changed, 1501 insertions, 2444 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 91a868fb3b76..9b128bb25ad5 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index bb0cd4a173a8..d00f2fa058c9 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -16,5 +16,5 @@ AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a10
 AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963dfe92931fa63eee1410e615171f1f823e21702032ae7dca9ae397851e0620df40a09c8e09bbb0ff12e2843b3c7aa511adda8ec SHA512 31d77113c5a727cc2aa72bc31a6e961cfc5d5871c40aa1f59f3edbadaa06ba55cb35bf6cf9b142276c83ac0a69fa49df9eb157d732fe44dc392f7dac7e014db4
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3628 BLAKE2B 9ff12ac976e3d26ce92f74e6d068cd1caa487acbcab917b6670c8bb780393d2dc2a44dede7751f75c6af6edc54fb4cab6f66035e7737eef9770f79ba6367c781 SHA512 9da8c75603b70b2ca8469a9ebf2a5ce099fc335875ff7ee5d702fce91aa4f633227a54ee40a74cc8d59396a10a94765a045186166b1744ffbbda9bea32734215
+EBUILD a2ps-4.14-r6.ebuild 3641 BLAKE2B 610ec607885f418601dcba97914958b715551d05a10171097ba95873149b1bb4818d04c85765b5720858b095e51565e69a09d80ab902d54b9c5de4473ffbd925 SHA512 5b6f2cfb666a2ae626e89be7be30044b64ed80862a2a4076982e58b8145429e77dbfe465e658429a68d5f719da0adf54a5a1950817e8501fd40e751b34f7f638
 MISC metadata.xml 346 BLAKE2B 5f3d7c0d868dfb3ce0ec6e47c33087f9d41b6b2e11d569c48b1a6a635f1a46e7cbb51e793f7df235c4b9dc20eb2eb24a5c8764ca2b6eee34a900d1f4641c4de7 SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index 33b91a41bf4e..516e52823725 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -20,7 +20,7 @@ RDEPEND="app-text/ghostscript-gpl
 	app-text/libpaper
 	>=app-text/psutils-1.17
 	app-text/wdiff
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	latex? ( virtual/latex-base )
 	nls? ( virtual/libintl )
 	userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )"
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
index bd3d024ceea1..f5a7faab4674 100644
--- a/app-text/an/Manifest
+++ b/app-text/an/Manifest
@@ -1,4 +1,6 @@
+DIST an_1.2-6.debian.tar.xz 4432 BLAKE2B efec93daf46b30369aa5d6a6bc57b9e79db7aabea5d8cb7ec9305775bf05c693c3b2ea428c09b99b2350f8a168e2b7e810538d78c321b11a64e6ca804f56feb8 SHA512 33cd93ddf1dea5f1a8d94695dbf6fcfbdf58830c11be1d6c83e516f6dc6d11adbe0cb196c98ec094887021575adc68aaa667222d3b10ed40e87e55a5422deaf2
 DIST an_1.2.orig.tar.xz 13196 BLAKE2B bbb19eb16e558f8fc3d331e5ad308611b13a7a88a65fb310b678bd21d46c39761747fb6f60a7eba99a1c2e756a8c9467543d26e97bbf7f9c93d17f66a4d7698c SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d
 EBUILD an-1.2-r1.ebuild 770 BLAKE2B f6ac00e6faf8e128ed85f7256fba39e6582cb976640cdc460ed4dee8fb0038b543a3d29e48d6c926cb6c85136626c0adf19970bdef3b642e4c67b88f75462df5 SHA512 618ae33718d53a0702798933fe3ee2c14856f76aee53682ea60c2baddc7c28f4800753cdc1f61a21cc9097824716d1d2237291d306d6642fbdabd4755299b226
 EBUILD an-1.2.ebuild 719 BLAKE2B 89ea6d80bdb55f99dab24ed234bc86ada3ab44202285b5d382c737bc42db8529ee19da1fb5c4f4aa120b95d0829f7bf5d384a5ecb21ff2600d19a358c11c75be SHA512 774b56f85bc3d9812e5824551f83aebca3d08e34e0857030cca8b378f57ab5032d6a6f5f1f0bc6b766df0c2b825b0cf91e30d259e4f6fb772ad374cc4b447d1b
+EBUILD an-1.2_p6.ebuild 900 BLAKE2B c779862faf8e4e49072c63ced71e160dad58fdc5539f291c1ff98693922365bf6ba5a87079c99fe7ce0ed9a68c2a2ed1f45f7096d185c86473e0db0396385f62 SHA512 ce7f2eedd1ec6cfd202e588c21493dbc37110526e1d8de2cdb82022b8b6bdc4906498e0250c1ea4f2fb9d026888161e490eafbe7322d5f20f9ec7108b631817c
 MISC metadata.xml 242 BLAKE2B 719b2221a59fb1ea608b2bab1d89d6694220253a34d1919062de0fd77c3148919ec1ee77a86e3a8699eb8034bec2ca03602fdbcc176784bd7d53e78cd29200e2 SHA512 01fa45ae0901d0f1bbae0a22f72b4c999c24b4718a0a1f7cf8db80ebb29c9a97903246e560ec7e5d5e6800f425b7e32172802206109e67545aa82b2fbac13cf9
diff --git a/app-text/an/an-1.2_p6.ebuild b/app-text/an/an-1.2_p6.ebuild
new file mode 100644
index 000000000000..fd837055287f
--- /dev/null
+++ b/app-text/an/an-1.2_p6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Very fast anagram generator with dictionary lookup"
+HOMEPAGE="https://packages.debian.org/unstable/games/an"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.xz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-libs/icu:=
+	sys-apps/miscfiles[-minimal]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	default
+
+	eapply $(
+		for patch in $(cat "${WORKDIR}"/debian/patches/series)
+		do
+			echo "${WORKDIR}"/debian/patches/$patch
+		done
+	)
+
+	sed -i \
+		-e '/^CC/s|:=|?=|' \
+		Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.6 ${PN}.1
+	dodoc ALGORITHM
+}
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index 7ced64fb65b4..a2d5a50125e0 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -3,5 +3,5 @@ AUX apvlv-0.1.5-gcc6.patch 403 BLAKE2B d593c72ef63ddc22a76fe8b93ad12078b1739f359
 AUX apvlv-0.1.5-gcc7.patch 685 BLAKE2B 3ece21cc1bfb5bbf66d10fb67abb140a357c6953655ca1b02b37cbc3d09503b5382694fb20337b2a7e50fc0a7ab51657f1a3091060bf03e8666b2bdbd0b8a8dc SHA512 53102dfea587fd946bdd7300fdb60b8395d6b2436aef6fe67be539e4ac88063f9d7934282227316f456951aa1e0748db7db02ddda06e17056d32ea6b91588afb
 AUX apvlv-0.1.5-poppler-0.73.patch 282 BLAKE2B 8bd7926afd2ce2364b82e7f9c8348b2905e1c3cdd6ba3565b4191ec5b6cfa5565179cc58706286f793b5b02cba2dc6eff04076b2fa61eb0be1638681632eedd5 SHA512 b832ee8e8e7290d2294ac326e84271570f560a5e7afc29446401ad1c05f1b03998c054bf3cd7ec80813899e49c256f86c871b400ce8e5a663fa9ab22015990cb
 DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
-EBUILD apvlv-0.1.5-r2.ebuild 1092 BLAKE2B d707df2a6ad2db0a0c755452c9ce4c9d44e00f160155c76216cbc0ee73a7e00f45d221d44282220c4d58f3608792b1809e8a0c33a5e731016d53a6fe30779978 SHA512 cdad1f2cac5410a5a3c77ab6174880fb70536a782ef203a4e6e8cdf598aec68aa465578557147e3b19069b15fdd1eda32ae6538e9934ff179e2d916e4ba295b4
+EBUILD apvlv-0.1.5-r2.ebuild 1074 BLAKE2B 883640a0424976d396b8b499adf31dab39edffe4260b95394928233b8bf5ed858a32977987d1106657ff67ccd151ba2158c78c5f797a89964314d154de1e8871 SHA512 f1d7e1146ecf30538052172dbd4cfdbca804722e4f34a55a8801a86dfb8b3633695c616bc7ddde823e2da6ae2876896d19e4d29c1142fa4d55a40c3acd514d04
 MISC metadata.xml 304 BLAKE2B bd4def156407f7aa104c4bb45814ecc48caa571fef3b68961e831c0c1997324c8f0773beb78da896ee23e14f8e82634a20696bf2b2fd201fc5d87037e995fa5a SHA512 0d01027269ed441b2c29ae9ae560e16eca4a6aed7ed7d0e418887c538673b913988dc3f7c6414982198dfda258044ff7ef3667b8fc53cfd9d4f7773dd5d35030
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
index e952e34db067..5138d37d5edc 100644
--- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit xdg cmake-utils desktop
+inherit xdg cmake desktop
 
 DESCRIPTION="Alf's PDF Viewer Like Vim"
 HOMEPAGE="https://naihe2010.github.com/apvlv/"
@@ -44,10 +44,10 @@ src_configure() {
 		-DAPVLV_WITH_DJVU=$(usex djvu)
 		-DAPVLV_ENABLE_DEBUG=$(usex debug)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	newicon -s 32 icons/pdf.png ${PN}.png
 }
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index d928f1251498..0a9c2504a542 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 2581 BLAKE2B f464549e9a8859b08dd56450f329cfaf79777d13555b94e5d9484dbe91f202cea53f8d866aa6e0b3cc953889b34e9f7750b259231e892f481d81432d73b7b69b SHA512 c322af897f414085411c465736670d327fc6922d123e21ddadaf91714604600049924abdde5bd73824b342f9c799832969b35471de7331a9d9bb54f085934955
+EBUILD asciidoc-8.6.10_p20181016.ebuild 2579 BLAKE2B 2f67af887cf2cbb86d5c8fde6825a536cb6534f85e2b3bccdeb04e57b71dc9f7906bf847f886bb393657bc920d20f018a52df65c10a5440e7443a840282a4134 SHA512 4e36560dea5ce1a59260e5ad5465c63a220691d3acddedecc985ff2297a1bc1fb5c0fa6b8f9add2feb775cd5daebe592fbedcfcfeb470cc10f5b6ac67a70124a
 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.ebuild
index d7bf7ae33f54..73ce57de3752 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit autotools python-single-r1 readme.gentoo-r1
 
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index 256c646e6163..c6f314e15f80 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1,3 +1,3 @@
 DIST bibutils_6.7_src.tgz 580792 BLAKE2B 29c5863bc414ef7b2f362d95352c0e042c1bcc3275017df82b0206d96520b3f5c3fe1e12563577b84a8bd94b0677bf1ad04ecbd80dcbcc194a71037bbd6facba SHA512 08db07408eee26bce42dbd00b7e821ef41dc12c7ce847425e81145927bcfc6ea7180ff719056e089917811aa9675a09dd52e1e02b8187b8618f67647efcb1236
-EBUILD bibutils-6.7.ebuild 1359 BLAKE2B cff84426b4f5b8785d6990105923bcacf9e69537467c6bb291b84a216e0e10d17c5050a776c971b1ce7450ebe2c8ce867d667ace12cddc9da6177f54b27d9fe5 SHA512 9227cd90f15fb41be41adacb05a6c642abdabbef49ebb2ed0176c4014b9a06d889ec8cdc8e12e2899c324660ffc776d8954d5f3f016ef97a42097a946c77b309
+EBUILD bibutils-6.7.ebuild 1358 BLAKE2B 2377af5aaafc016c14a8b0f60d4d292ac334307d5303fca1c6daef64aafc077eaae93cf9c48048681805743f7bd4ab6feb7e91e8746d425037657b0001076ce9 SHA512 42582a705867653304c13bbac9a860892000c6ef3f8d11f69bdc7f6150fea61a27910e18d11fd24f30435be3d5fc1988a3b4d991a790e34a1c67910d107c887c
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-text/bibutils/bibutils-6.7.ebuild b/app-text/bibutils/bibutils-6.7.ebuild
index 0b626bb59e52..ae30674daea3 100644
--- a/app-text/bibutils/bibutils-6.7.ebuild
+++ b/app-text/bibutils/bibutils-6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/app-text/c2ps/Manifest b/app-text/c2ps/Manifest
index 15ced37b9ffe..9559b64107d5 100644
--- a/app-text/c2ps/Manifest
+++ b/app-text/c2ps/Manifest
@@ -1,4 +1,4 @@
-AUX c2ps-4.0-LDFLAGS.patch 342 BLAKE2B 7f6b97c231d9180007daa7982b8caeb98989bdce8efbac983cd3b5333e68ca366a2cd9521e66ea54e9e2af6d0ca91af01a1bf2f6c4e56e257baf275b37d6fdcd SHA512 79e943df0b2edbb6a7ab915e4760c46d34ac281eb2249f24be26ead327cf0f2bdf1aea58cf9e76453e89b2902ec2790eb50210cfcb433ab91a8449b03fcc3945
+AUX c2ps-4.0-LDFLAGS.patch 252 BLAKE2B 19ce475e2b7e1eeb4f02059ecf70ebf829043b805a1273feaa096c624d0b6e65166335a1b88e602051dce38db0ecc6df584f3517247d1ec510d60f459b66265e SHA512 78a3993b6f41d129de9f922ec23dd3f07d3a7bf632a6e27aefdcdcb80fb4275aa95d2c87355502d3fddfe5b14800fedef0a58954ef68fdc8b8a07cc699d43b20
 DIST c2ps-4.0.tar.gz 48137 BLAKE2B b2d07f97e1eee0d7e32070d828ec2c06d9d98fd6a480768e6580f8a12bf0974983ed144a6e92a9860f13e6b9ec780f9aa1a28ee42cedaa70c7d4ab6ca5e6eca9 SHA512 dde931a201950412c8aad04a59f9ca0862b21a221bb7212ee64cbba0193421f1538804525361075be3ed601c5015a0c4e0c3592696f8b545f5a45524b2c5c619
-EBUILD c2ps-4.0.ebuild 683 BLAKE2B d0681ebb59b6b65c7eb20c942f26733eedd52d94ae541bc9a5cd63f8e6dc1b67953e7a6283b528c6e87e29fc1177dc8025dde8cc08c3bee995fd6e3916cf2ce6 SHA512 a101fe636fef9abaacc97f96e225b99965462fbdf1744ef113a4abcee43bf351a5195d881b1537f97d4995b5017bb9ca112ecf808a6d6c054a711daf52d66111
+EBUILD c2ps-4.0.ebuild 679 BLAKE2B d3994d4f8e852fb9a984be335efd47460dd5e4400b8d0e1846de38d1f15828c8761b791dc8326d7b0cbe4a8be57cb566f7f85afcf8d7b683ae23c6084b66a680 SHA512 01ba21ce9af76387f3394802b728d53f834df36a8d7ebbc74a3820bb3790927460bcef1f85b0e83852c9c973a9840d0069eb527860a4a4b781996a4da48b92b3
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/c2ps/c2ps-4.0.ebuild b/app-text/c2ps/c2ps-4.0.ebuild
index 667ebb401a85..84c0be2694a3 100644
--- a/app-text/c2ps/c2ps-4.0.ebuild
+++ b/app-text/c2ps/c2ps-4.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit base toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Generates a beautified ps document from a source file (c/c++)"
 HOMEPAGE="http://www.cs.technion.ac.il/users/c2ps"
diff --git a/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch b/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
index d68002180091..04c12af2bad5 100644
--- a/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
+++ b/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
@@ -1,5 +1,5 @@
---- a/c2ps-4.0/Makefile	1997-05-15 11:50:56.000000000 -0400
-+++ b/c2ps-4.0/Makefile	2010-09-24 19:42:33.000000000 -0400
+--- a/Makefile
++++ b/Makefile
 @@ -45,7 +45,7 @@
  	install -m 644 c2ps.1 $(MAN)
  
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index b8855b2a73a5..40b512e6b168 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,14 +2,10 @@ AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad7
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
-DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
-DIST calibre-4.4.0.tar.xz 36389440 BLAKE2B d6f6bfb98dd95012a7d145d7700a2818974b2d2e9f8faf1d98b931283305c92ec7e136c9569ef2074d748cc39819e53186ab250b8331d60253d23fddaa1f8a41 SHA512 0204f47db53bc3d649f43276460152423f994cf321661db315904916997121592e0edfb0b9212fbb593d50d3faef0762a2dddd4a7568d1f72c7eecb6b952d278
-DIST calibre-4.5.0.tar.xz 36472092 BLAKE2B b742f897b45e3832e5d8ebec93d8223973b6f5b6d6b3074a07e529eb4b823fa63cbf55c2d6b46ee7e0b5868dc45a858d0a841ce6b9a071ebc27a8977c44b00c6 SHA512 0d024ca7bda1ba9f2bb20fd02af1c4225d63c1a1e1bd71bf7760c214cec9ccf821fe31859cf389c6e45ba7fca21c706e5619f2066b600571f17660c52d84bd09
-DIST calibre-4.6.0.tar.xz 37397188 BLAKE2B 145f329bb4dfeaffcc1a1dec741cf7f0d2bb943bc343f83828ad3755452c6313e59cc2e1518d8b05120746928080bc2c0de52827202c6a45733495bddf9995ed SHA512 4a057ffa6a77dfcec99a7ac89caf98045e2884af5a2833aed232620bd668ce92f542c903ea3817cfc05bbdbf10d89be029a459924d889fc83c8151100779a70d
-EBUILD calibre-3.47.1.ebuild 8350 BLAKE2B d59300c7f0fc9a85c5a2862b0ce844c76e83a30cec434351e1df98d3741cd0a21dff80a52548903d25da29421121e220d8ee02a3f629f56bb11f7b3f9f5873c8 SHA512 53f70f860b5e8b9e33ac49a598c03b6e3a075b03377461008ca77a0ae2518d0e899c1af19fca611850e3e16c6efb5cfce1241afa2cdce0cba82c704fcec05d9f
-EBUILD calibre-3.48.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
-EBUILD calibre-4.4.0.ebuild 8503 BLAKE2B 4e94ad847b26f6831cf6e3b8039f25e98b6705caef49c0a48388299e53c5242e74024f8df3c57e9a4530ca23f2a2ce2960df6a4efb725ebeec31a8aa48019d0e SHA512 b426805e6753fb3c021a64f2788e0f2cc3c180a763fd2936a4d151a92c1b472896a68d527f73dfcc875bfc3d159fc5892182dff19a8281c97352fa2d80b013b7
-EBUILD calibre-4.5.0.ebuild 8503 BLAKE2B 4e94ad847b26f6831cf6e3b8039f25e98b6705caef49c0a48388299e53c5242e74024f8df3c57e9a4530ca23f2a2ce2960df6a4efb725ebeec31a8aa48019d0e SHA512 b426805e6753fb3c021a64f2788e0f2cc3c180a763fd2936a4d151a92c1b472896a68d527f73dfcc875bfc3d159fc5892182dff19a8281c97352fa2d80b013b7
-EBUILD calibre-4.6.0.ebuild 8522 BLAKE2B d475c2bac249c353afa8b6806e91099aa9cac4805b3541f046c424c0d45f8bd1e88e51796752ae3b81f5590dfa7b6480274b91c651448970e143a486529aae4e SHA512 def3bd07821ae12e5f78e6ede830bb14b9b4f65bf0450805740e56a117f8afe33630e0fc3f7b2415151a92b36fd0ed3c42a7dc5cc2d3f1000608165bb59a1609
+DIST calibre-4.7.0.tar.xz 37432756 BLAKE2B 5030bee02506c2051949c248a941289da7b4e6b48aa638abcf14ab9c56f6552b1043f85bc6fbae644e33843711ad11d03da4ac3a320cb7cf4590bc1d0bf92ed8 SHA512 852f3ff45cbf055571c47754b55b51607ede63865fe04263a9c8d5d59973eaa8c5da718f589d2b830567796f59d5bd5189c8e5e9455e3f98e879a37acb7174e3
+DIST calibre-4.8.0.tar.xz 37448552 BLAKE2B 416500da33c5a7e0bb84e521db757c1ba5c6e38f04c2b92ad08c2039c64a7c7cc6daddf379cffe120e966e856468cb99da6d80feab75c518a3218a2e07c9cfd9 SHA512 5ab2340d9f4a8e4592aa5929827513127830bca5830f4861db97699fe491845dd17018158dc7c143255ce57730bc9e5ba556ddebb033d18086d0e1901388f840
+EBUILD calibre-3.48.0-r1.ebuild 8006 BLAKE2B ce4c88fd00d7c02d884b59568beb8ed80cd30cfa72d7017efa2fa0999b0655279ce5592deadd57145e0fc85b15e3dc533d85bcf90c2328a0aa1de13ea1adfb8f SHA512 7092be18d020aef0d5b5ce3b204f3b01a4eee3df8c343c51d914318e90c1bd8ed2c2829fb41f9fc31eb43e234a4c1e9df3216f28a6eeabc49d9dbc70a00aa3e4
+EBUILD calibre-4.7.0-r1.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca
+EBUILD calibre-4.8.0-r1.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.47.1.ebuild b/app-text/calibre/calibre-3.48.0-r1.ebuild
index c798de6c6e21..438e9707f607 100644
--- a/app-text/calibre/calibre-3.47.1.ebuild
+++ b/app-text/calibre/calibre-3.48.0-r1.ebuild
@@ -45,7 +45,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/icu-57.1:=
 	dev-libs/libinput:=
 	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	dev-python/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}]
@@ -54,7 +54,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=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.3[${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}]
@@ -144,13 +144,6 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
 }
 
 src_install() {
diff --git a/app-text/calibre/calibre-3.48.0.ebuild b/app-text/calibre/calibre-3.48.0.ebuild
deleted file mode 100644
index 9b8c29fcc23b..000000000000
--- a/app-text/calibre/calibre-3.48.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.5.0.ebuild b/app-text/calibre/calibre-4.5.0.ebuild
deleted file mode 100644
index bd7b7fd33648..000000000000
--- a/app-text/calibre/calibre-4.5.0.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/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.3[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.6.0.ebuild b/app-text/calibre/calibre-4.7.0-r1.ebuild
index 4f133b668aa3..3049f662198d 100644
--- a/app-text/calibre/calibre-4.6.0.ebuild
+++ b/app-text/calibre/calibre-4.7.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
@@ -47,7 +47,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/icu-57.1:=
 	dev-libs/libinput:=
 	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	dev-python/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}]
@@ -57,7 +57,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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.3[${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}]
@@ -149,13 +149,6 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
 }
 
 src_install() {
diff --git a/app-text/calibre/calibre-4.4.0.ebuild b/app-text/calibre/calibre-4.8.0-r1.ebuild
index bd7b7fd33648..3049f662198d 100644
--- a/app-text/calibre/calibre-4.4.0.ebuild
+++ b/app-text/calibre/calibre-4.8.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
@@ -43,10 +43,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.26.5[qt5]
 	>=dev-libs/chmlib-0.40:=
 	dev-libs/glib:2=
+	dev-libs/hyphen:=
 	>=dev-libs/icu-57.1:=
 	dev-libs/libinput:=
 	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	dev-python/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}]
@@ -56,7 +57,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	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.3[${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}]
@@ -148,13 +149,6 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
 }
 
 src_install() {
diff --git a/app-text/capyt/Manifest b/app-text/capyt/Manifest
index ea42dc1850ac..617bf7adce7b 100644
--- a/app-text/capyt/Manifest
+++ b/app-text/capyt/Manifest
@@ -1,3 +1,3 @@
 DIST capyt-1.1.1.tar.gz 3247 BLAKE2B 259c1cc7eddc88853518ed106f25e9b1d47a5c4604e749d25fb2133f11d90e78672473a9dd31fa80322b4c5177163fe5a177d27a6fd9a7cd31ef12db7ee3ed0f SHA512 863164967aab93088d39b0324d1324145f41ba76b9d21874ea6a3aa49955e1ec3430c7bcc9eb100c51b9e159c63758b6474d3bad586383d7c10d9f1118340123
-EBUILD capyt-1.1.1.ebuild 619 BLAKE2B 39f761d1aaea36e271dc9dcb532c05a66012daff02f7bcff75b063813ce5e3fd0ba8e85ba2487a8602685e3542ef1c1fa32cd333fcd1709ac3028b37fa53cf2a SHA512 28d490b8e6e6ae460f65efb9e33dc00923607d91a346e668851728a63e7a6ccaae51b22a3a95a9ccc96c30052c5a24dfa3ee0067226695874ef2bb583d6f348f
+EBUILD capyt-1.1.1.ebuild 586 BLAKE2B 907d28c7ecc85cff6c2f3736ddf2e64b4c71058a3864aab54d05a0f31d8112a2d6ab4027ee91643908920962303175826f0c9718c93168f10091dab898a3798c SHA512 ceb18fac932fb0eea865570017d9b810b3946bc0a5dc8fb23daa05aaedc65c4b654b9d43e3b4e579d62aa6ee2266d056c72853a63f85396e4f5de7a87fc3c964
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/app-text/capyt/capyt-1.1.1.ebuild b/app-text/capyt/capyt-1.1.1.ebuild
index 5292845b844f..22d47165439c 100644
--- a/app-text/capyt/capyt-1.1.1.ebuild
+++ b/app-text/capyt/capyt-1.1.1.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5..7} )
+PYTHON_COMPAT=( python3_{6..8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -18,10 +19,6 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${DEPEND}
-	dev-python/requests[${PYTHON_USEDEP}]
-"
+RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 0d8780ea106a..59b35cfddc18 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,4 +1,5 @@
 AUX catdoc-0.95-parallel-make.patch 1568 BLAKE2B 868cad85a1882c60e1f6f37b630a233949c457afd66f59b1e07616a8403bcb4710cb7ed7d914e58ea2e5022787ad94a4c4db20572386d373b27e61257c5cb2ef SHA512 f40d7440bf19157b862226e8d956b5505e6d79db3a39a21f71f68d6943b162f62863333739f1f4777c2c38b4116b4745888ed0cf5cd4159ccc84d02979f691ea
 DIST catdoc-0.95.tar.gz 217779 BLAKE2B 37c01c485410a6eb08c5935351b00f60f1d4c418f4c1b3cca73da23f870cb5d5414ea6cf7c37effb295e6ccb12a7981367bd08ca6226ee0fc64d2dfdca2762ea SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c
+EBUILD catdoc-0.95-r1.ebuild 1349 BLAKE2B 88f333de0ded60f2f287e44206baa8c423c14a0150752335d39a0fb2892613b83841551186eaef0843c391ab9b6bd74dfc30a6a885ed1d2ddf69b04742d096e2 SHA512 e4212270c30f26d5706f3f457befef3c5c559e345d16f8f2192dd0678373d83868e6f649e3b7935aa86999a133520a845cbd12734b212029e4d183a065642dae
 EBUILD catdoc-0.95.ebuild 1194 BLAKE2B 96629971c7c69ef5a46f6b0cde1ae1fd7a803c3d203c828ba3e7dbcceac53046aad29c62f524a48b691a7ff1c201bd13a2302239b9d84fa041779356d3ddb132 SHA512 48e93c76ff30043e9fb800109cdab36bd25e7d24895aede5767641b636a62ac30477e6a5dfda5d46a3d6c61f3cdcdd1876b3ecc6c0fecf539c06d7f3766adef5
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/catdoc/catdoc-0.95-r1.ebuild b/app-text/catdoc/catdoc-0.95-r1.ebuild
new file mode 100644
index 000000000000..bcb0c6d36a8e
--- /dev/null
+++ b/app-text/catdoc/catdoc-0.95-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
+HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="tk"
+
+DEPEND="tk? ( >=dev-lang/tk-8.1 )"
+
+DOCS="CODING.STD NEWS README TODO"
+# CREDITS missing by accident in catdoc-0.95
+
+PATCHES=(
+	"${FILESDIR}/${P}-parallel-make.patch"
+	)
+
+src_prepare() {
+	default
+
+	# Fix for case-insensitive filesystems
+	echo ".PHONY: all install clean distclean dist" >> Makefile.in || die
+
+	mv configure.{in,ac} || die
+}
+
+src_configure() {
+	econf --with-install-root="${D}" \
+		$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
+		$(use_enable tk wordview)
+}
+
+src_compile() {
+	emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
+}
+
+src_install() {
+	default
+
+	# dev-libs/libxls and app-text/catdoc both provide xls2cvs
+	if [[ -e ${ED}/usr/bin/xls2csv ]]; then
+		einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
+		mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
+		mv -vf "${ED}"/usr/share/man/man1/xls2csv.1 "${ED}"/usr/share/man/man1/xls2csv-${PN}.1 || die
+	fi
+}
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 21893633e282..5582081bb8fe 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,3 @@
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
-EBUILD cmark-0.29.0.ebuild 745 BLAKE2B 6c6499f3d8fe6dca58c635bc381d6d2c26a3dc4c16fb175c9c819b8ffa0afe6b95e68e6255ea5dd259529ef3ec7f98d246e1c728139f537dbd895ce3b5b08cd5 SHA512 1a7a4f350afbe83a3c0ce4d1dd6dc6f34bb465492177a1823439ca7f78a1c4eba2b5d34a30af281c0fc1299d618ec394853797b9dd580fe78edac62d54c4b304
+EBUILD cmark-0.29.0.ebuild 731 BLAKE2B 9cf4db73d57e077dfcf941a7fef74ca55afcb39b8a8e4e9241ed882a260d476b21c171d829eac90cf5696471bf553e23e50856fe2b177a2221b7c13d987223ec SHA512 746e152b0f048556a4e49b62db055e8b5d3d53fe3dd48fc4b914a8e50cae25b6717fb0e25eee7d550d8ceffeaaf4bd094be8415be54deeab7a9364e37af448dc
 MISC metadata.xml 577 BLAKE2B f99edfb972715ce4b1660a5e68c0261c9b8d8f2914f5bd804227bbddeae1528205bbed55c20d6d366ecfdd6a01a69bb31decd57ed40f0440de4946e86339e659 SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
index 2b06582a87f9..975cfc4fe12b 100644
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ b/app-text/cmark/cmark-0.29.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
 
 DESCRIPTION="CommonMark parsing and rendering library and program in C"
 HOMEPAGE="https://github.com/commonmark/cmark"
@@ -30,5 +30,5 @@ src_configure() {
 		-DCMARK_STATIC=OFF
 		-DCMARK_TESTS="$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
index 51f833738f6c..c6d17ad35096 100644
--- a/app-text/cpdf/Manifest
+++ b/app-text/cpdf/Manifest
@@ -1,5 +1,5 @@
-DIST cpdf-2.2.1.tar.gz 704730 BLAKE2B 1767d2c9fdc645b4ff97b828b1d7bedb22aa645444f299e36ec4717015ea7b87dbbac4c9ec27bb508a7adb28b2c75c155bf9094a168567abbffa93887712241d SHA512 3dda72513c551cca5d8cb60732b3f2c2e8ad400bd2c9fcf0c3b54a68e94385e3f19ec7713de95efa90eafb7b0077662097565a28616041019e03edf140b6af4f
+DIST cpdf-2.3.1.tar.gz 385720 BLAKE2B fae61c8e62b1c679919512c5fa4c57279e118d7ecc8378b528053a1487731675f47877c6164d92f3770e38db78fd9bcce0635f76f0b2efdf10c775a1e9cf5ed7 SHA512 3f22e76bc6bffe2bcd6b2c27d0aa8dc55b842cf0eee46f23c0f3e23e1a86ac7af4665b48513ae3e2d7d2ae84fc864af3b6c3c92e93d78b7798b801bb9be987a1
 DIST cpdf-2.3.tar.gz 384594 BLAKE2B 391cc2d88ae5ad2decc3911ea2125345cb337e15f059b2411f8e835f91460bc0cb28410ebe8a15bbf3c2c5ba511f89b0bcfec8ccae3aca69658fd6eb55c64dc2 SHA512 db17bd019a6c2a719761662af682cc74a7dbcc673c22867652cef37508b6d3dcbf4d5da9d9db9e8b1b0cf912f03be18f16748ab15dcbdfbdfd37900d4fd04ddd
-EBUILD cpdf-2.2.1.ebuild 816 BLAKE2B f6066dbbf981ba0e665e824432220024bf0c61dc2a86c4282adfebe37e8e21f8c1243a5e4bc523b3124ed40e76bb63e530402545489756af1289b4833df0da43 SHA512 6f9deef5e952035000287006c0a435ba5338bbd1d7569646738bf903683af208888a154367e2639a0abb2221d6d12dbc35376b71672442a25f2ae2283c783b34
+EBUILD cpdf-2.3.1.ebuild 823 BLAKE2B f2c254bc43decc98b70086acad8be52f9a3b85f70e51710863be39ef5fdcc237fca32a75dc52ebfa03350b5cccb43646d896fe1d46371874c34edd0cd2563670 SHA512 60855f500235a1fc2a3fc07a24e9699293bbdbffe0bc29ddc822e0cfcf43a4a34a8d54129b0db4022dabe89ff59b879c2b261c33700bfc86a46743b260ca66ed
 EBUILD cpdf-2.3.ebuild 823 BLAKE2B f2c254bc43decc98b70086acad8be52f9a3b85f70e51710863be39ef5fdcc237fca32a75dc52ebfa03350b5cccb43646d896fe1d46371874c34edd0cd2563670 SHA512 60855f500235a1fc2a3fc07a24e9699293bbdbffe0bc29ddc822e0cfcf43a4a34a8d54129b0db4022dabe89ff59b879c2b261c33700bfc86a46743b260ca66ed
 MISC metadata.xml 263 BLAKE2B 3ffd66543a6648ea0c9e61926708d5c754267db0c37f87a3eb0fa8cbd4aab9741b3a3954a784035b87b4f8464c2d9ee8f88b91d4ce085aaa6f44baf0ce6795bb SHA512 cc4f5613180a963e23d81b036e6e1993129818f421a695da9807cade662d1d6a16c5f470d2ae599479125dc87c5a41398db7056fc9cc0b2bcc8b4dd7c9efbbbe
diff --git a/app-text/cpdf/cpdf-2.2.1.ebuild b/app-text/cpdf/cpdf-2.3.1.ebuild
index fdbc8ccd6cdc..3df1825ad110 100644
--- a/app-text/cpdf/cpdf-2.2.1.ebuild
+++ b/app-text/cpdf/cpdf-2.3.1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt]
-	dev-ml/camlpdf:="
+	~dev-ml/camlpdf-${PV}:="
 DEPEND="${RDEPEND}"
 
 RESTRICT="mirror bindist"
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index d574852c7670..9b4f3f0613b8 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2465 BLAKE2B b5ce46f7632e1b40b890bbf19708dd0be7b79b96eeefd5179ada2452adf9119e009fce572f422bd652ad3bc93aa878ebbaf8e279aedde6aeb53605cb58ead14a SHA512 20b3a75d27f5dba7015295e8e7b4aecd9b2787431df8d4c65d91137cb0b34f21c03e6345db006fad0ba75bb2255e12d4428f08c09eee09b6142fbcb1e7583870
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2475 BLAKE2B 583bb9723950d79d887c9144942b5f1b1b272a7058b1b1c37fcad6d256804d70504dc23bbab0444e09d2d56254c6bf3a5a76446fc0515eb563d405d4db81f028 SHA512 6aa0565adc07a632f106722823c3ffcc251b80212437ab2b9817cfef19ee063ac82f0a2b0347505d2a06b991fda178de05b92f7e73222d38ebdabd8af4b0af8d
 MISC metadata.xml 377 BLAKE2B 035eb23363be52cbeb11b0ca2fbcedbb608dad9d4b26dbd2155a538db51cafe7296614f5005c0460ec4ce02a35378d98f2c7834fe2f098d7b05ef835bdbf520b SHA512 c965e64e4582a7452d8cf7eb46b794788cc8ccd9d93a48ab14e7ef606979cee706f682545bfebc2c5e380e9e18db0b671ce0f9ad935a0812472fc1586c989c28
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index 89a82cdb0d2c..89a9c877a97e 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -76,7 +76,7 @@ pkg_postinst() {
 		cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
 			CATALOG "${EPREFIX}/etc/sgml/dsssl-docbook-stylesheets.cat"
 		EOF
-		eend
+		eend ${?}
 	fi
 	sgml-catalog-r1_pkg_postinst
 }
@@ -86,7 +86,7 @@ pkg_postrm() {
 		ebegin "Removing dsssl-docbook-stylesheets.cat from /etc/sgml/sgml-docbook.cat"
 		sed -i -e '/dsssl-docbook-stylesheets/d' \
 			"${EROOT}"/etc/sgml/sgml-docbook.cat
-		eend
+		eend ${?}
 		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
 			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
 		fi
diff --git a/app-text/doconce/Manifest b/app-text/doconce/Manifest
index bb2964008c5c..2b91e5115fd0 100644
--- a/app-text/doconce/Manifest
+++ b/app-text/doconce/Manifest
@@ -1,5 +1,3 @@
-DIST doconce-1.3.tar.bz2 112034753 BLAKE2B 4ac826b09ca2dce93d8725868f6fa00a07b61835336a56b72f4d846cb81282cc6982ca25c7fc27d9e66aed5a22d3ef30badbc137748f7c6c3a2e078554b6715e SHA512 b59568e801f4cc5b7f01f3c3d344702ec80c65b5a065e2ece3b3ed8cb5f669739c9adf3caf96cd0b43c646ccae0f11325d5ca64ee1a325ac404ec6e5feb6148d
 DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31
-EBUILD doconce-1.3.ebuild 502 BLAKE2B 163499a2b033e562b584c0a2636a2004ba2adb53e08c3dc1e5816c7ac50e35bf4de1215d7a3e9f888d27d09c7d97cd0c4217e72c4f0dee71bd14d78c3ca7bc4d SHA512 f6bc20c935e48230edd0e5dd6b272ad36a573c472d75b66e2fa6e76e5bb0009ec821e99cdff7d5ac71bd9e9b67c9bac4a7448b5e1e98fe5854a13f661ad12de5
-EBUILD doconce-1.4.4.ebuild 781 BLAKE2B b0440491855d426fbb79fd529e639b3721737722ec4f27bc16fa97f5e5648890a8de411a60468efa9bf0492aa98032c449283acc4b24141830e868c28cb65741 SHA512 f144b7160e38817ef00c443f2083fe854775023db6df98f30bdb9943cde6705bb25aa04fb490084efbc1485da4d21ef4ac142d62cb85a7e8413ef2f5943eca0e
+EBUILD doconce-1.4.4.ebuild 774 BLAKE2B 58ef80b0af4ba709db2325dc90cdedc79e4531925230d63398d7d4b0859fd76a2bcc83dedc17ac0faf89b9eda48d8df12c14154daa80dd53192fb9ad94a37a64 SHA512 8aba5e29867d70b6bbc1a20e982c238e30996b7086bed6ffabf121ef13b939e966638b52bb44f0b692c1feb88468e318ef882b53cfe6479ee08f1041dd9e67f5
 MISC metadata.xml 886 BLAKE2B 0e17aef2ca8b68603b8d8b83d719d6224e3891594c07070acebfa25c22b7860e92dcc0cd856227626299c1d5f12d04f7e279afea75b7bb508854ea9ea15ecdf6 SHA512 51fd63b9e6ebef041891046676a22e11eb4addefa5730632f48843509fdfb7cb16d612b55941222d690a305ee50cf2d66557bdde64f6db35c71efe39019ca55b
diff --git a/app-text/doconce/doconce-1.3.ebuild b/app-text/doconce/doconce-1.3.ebuild
deleted file mode 100644
index b1f3108e9d7b..000000000000
--- a/app-text/doconce/doconce-1.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_5 )
-inherit distutils-r1
-
-DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
-HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/doconce/"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-DEPEND="dev-python/future"
-RDEPEND="${DEPEND}"
diff --git a/app-text/doconce/doconce-1.4.4.ebuild b/app-text/doconce/doconce-1.4.4.ebuild
index 8752b80e9b24..60871bec2190 100644
--- a/app-text/doconce/doconce-1.4.4.ebuild
+++ b/app-text/doconce/doconce-1.4.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index e9d56827eeea..189219f6a1e1 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,8 +1,4 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
-DIST evince-3.30.2.tar.xz 2288868 BLAKE2B dd0423b7ec51daf897bfbc45afb298f9ee23b28ada3dfe5d5d2808b4515bdc7077a7e0ae46541876bb2fbfd8aa9ec44abc7aabcb3cb10b6e52912f0ac1358eeb SHA512 dfffcf15547d0720bd2379054d7b9bee02f8bea7113562162cbab62d77cf84c04f70dcc87a3e6b1ba62db38783df8f481d801854d8f0767f60e9cfabd9efc646
-DIST evince-3.32.0.tar.xz 2564236 BLAKE2B 203bc6ff6b8b2a3d30ebd30f7f9be6269ded5044521da7d2732cb759db8e8ebd2d565c2ad04908e11ec1f726ec70dd2931c58c9b31951a7b3d3165c61042c87f SHA512 565298a200d9ae2f6b4cb53c3cba0d0d0e4cfbef60e4145bfb9c82a5682947ceb2371e52c27179cd69a238cd387bcfd744d3c55df814b6347f07781aec3ea658
 DIST evince-3.32.1.tar.xz 2567868 BLAKE2B 8fec9ce1981fb2c5fc60c4b653f462f07f0341ebe64a5615f1e1a123533f8053c6f76a02d05da9245b4263c24df1cdd2e28aa89486b8c802a2aa14cf04faf13b SHA512 29028fedde9aff85e53a5059f63df007e1bac7d662a91fe01e1bb8c48349d5674afe3ce37f9c495e4b208fd476b22f4ecaf749c6d7c3362a03b05703400ece05
-EBUILD evince-3.30.2.ebuild 3114 BLAKE2B 839716b0960b7a8ed6e7ad682de262f432711dca58d51a313d40c15f7737d4b174d514066301974e9b0e8356b98c561b687de6de6ded6875f6929c5efb8188c2 SHA512 e46cddcc1296237685d865c2a1e5c5400add7c1d329c9887e79bcda2b4d73e26be5e3114edee9406828ba6e25e56eb9e46061d5e4f702faf7d1c3ed831a7e41f
-EBUILD evince-3.32.0.ebuild 3117 BLAKE2B a151578067d49c84001bf878991f425273c8634ba2dd35b0fe2444c469db250dbadf0e30f6ed05d7ef7b7853cee2d9f484693e122b201d6d07aa7294f6cf8a4c SHA512 2911fd3bbe41c67fc96492f9643940c5ff690634301dfad93c3b2120fd60dd1af629cdde5f1cc94567a133441e122ece244c5903dae683a7feb60fcb5ac6f719
-EBUILD evince-3.32.1.ebuild 3152 BLAKE2B ab77c699ba3bc856c0af95f6cd3cac4cc792f306ef4f43bdd994acd1cdf1141a44fd9eca1686752e5882a7d71dc1420a42ca0e310254946dd495ce5107594298 SHA512 f3813bd53af21ab59c9838ffdc07d746d84a8ebb0230a82c33872313200c8f7f6cad95a2f938e2e35c2f85ae03b88f6bf76f9034ab781219eae5f88a5926b752
+EBUILD evince-3.32.1.ebuild 3137 BLAKE2B 0a067e4e869e5077e54873cb27abe40fb5a5325b7ff8d6c4762ffbe9af07253f83b693810005cf1a5777b9632ef5556f4579b316c15f1609b401ed63e3b5bf6f SHA512 5025869ecb300f00bcbaa7359fad3f38da28c95ec9f84d4a65c94e1ec8466125c342a37e4d5a6e9fc2e070e9b034a61d6c016257943e9967e9c2269609c5376d
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.30.2.ebuild b/app-text/evince/evince-3.30.2.ebuild
deleted file mode 100644
index 85804e8eea8e..000000000000
--- a/app-text/evince/evince-3.30.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.36:2[dbus]
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=x11-libs/gtk+-3.16.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.33[cairo]
-	>=app-arch/libarchive-3.2.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.4 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	spell? ( >=app-text/gspell-1.6.0:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	app-text/yelp-tools
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
-)
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_with spell gspell) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/evince/evince-3.32.0.ebuild b/app-text/evince/evince-3.32.0.ebuild
deleted file mode 100644
index 0211917c6847..000000000000
--- a/app-text/evince/evince-3.32.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
-SLOT="0/evd3.4-evv3.3"
-IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
-
-# atk used in libview
-# bundles unarr
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.36:2[dbus]
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.33[cairo]
-	>=app-arch/libarchive-3.2.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.4 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	spell? ( >=app-text/gspell-1.6.0:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-	app-text/yelp-tools
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-PATCHES=(
-	"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
-)
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_with spell gspell) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/evince/evince-3.32.1.ebuild b/app-text/evince/evince-3.32.1.ebuild
index e572562893a4..d53317c7ae5a 100644
--- a/app-text/evince/evince-3.32.1.ebuild
+++ b/app-text/evince/evince-3.32.1.ebuild
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 	>=x11-libs/gtk+-3.22.0:3[introspection?]
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.33[cairo]
+	>=app-text/poppler-0.76.0[cairo]
 	>=app-arch/libarchive-3.2.0
 	djvu? ( >=app-text/djvu-3.5.22:= )
 	dvi? (
@@ -60,9 +60,8 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.35
 	dev-util/itstool
-	sys-devel/gettext
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	app-text/yelp-tools
 "
diff --git a/app-text/fblog/Manifest b/app-text/fblog/Manifest
index 742fb448d5f9..c6f4c88fae6f 100644
--- a/app-text/fblog/Manifest
+++ b/app-text/fblog/Manifest
@@ -32,5 +32,5 @@ DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD fblog-1.3.1.ebuild 1055 BLAKE2B d3058bbea4693898ffc5cc494c7652f08cf3a5040aba00f1a0f81f8b403adbc2ef33d5bef5120cab947f427c1f7c9c8fd85c5c1a1f55ac71121992eda09bbf34 SHA512 0f497f15b0ab90f42acbf13fb944be8bc3ffedc80dcd7392da40de7047c7ecda6e77bd46663effa2013bd0a53bbb3b16a1b79874f8317aaa07fed700ca179a2d
+EBUILD fblog-1.3.1.ebuild 1088 BLAKE2B 53f55738f98edd20e4eb559459359b7cb3ae324679b6969945ac35b5d945cf4b895fb9bcab2686ec72c8dce157ca3092e9f656bdd0f40817ffbe7e6ba74f2d87 SHA512 ad075994c1e144e39b770807c46d20fda50c13d566f8b9242b151d9acad2c2a31e1391f9309c1b4fa270ed081444b765447e064d61cde9aab6ea03e1f8507742
 MISC metadata.xml 477 BLAKE2B 096b056ad3372685c163fded9f6bb7cbc2404950dac40b72e8b321c1530deba3728e1123b9fd158f799588cc3b10e3c97ff83132e313b5fc99f18049e2884a56 SHA512 94576bea6800d4aba812303abe6f6366c0fba1ecc35feed1402a383070915594e964941738a19b0b571e7577e2d06355d7204bda920f2f56904fbbf77338f7aa
diff --git a/app-text/fblog/fblog-1.3.1.ebuild b/app-text/fblog/fblog-1.3.1.ebuild
index f4b44651c603..eb9866f68fa1 100644
--- a/app-text/fblog/fblog-1.3.1.ebuild
+++ b/app-text/fblog/fblog-1.3.1.ebuild
@@ -46,9 +46,9 @@ DESCRIPTION="Small command-line JSON Log viewer"
 HOMEPAGE="https://github.com/brocode/fblog"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
-LICENSE="WTFPL-2"
+LICENSE="Apache-2.0 Boost-1.0 MIT Unlicense WTFPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc64"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -59,6 +59,6 @@ DOCS=( README.org sample.json.log )
 QA_FLAGS_IGNORED="/usr/bin/fblog"
 
 src_install() {
-	cargo_src_install --path=.
+	cargo_src_install
 	einstalldocs
 }
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index bf17920d3dd2..e08ac3e11890 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
-EBUILD grip-4.2.0.ebuild 623 BLAKE2B b4e93a1fedf58c990da6a9bb087014009338bc14e96cdc5df7185a5ff621747a14c6a149ba4c3d163f7672a30f6b064f9a13b70dec9fbb44463707aec8a75fc8 SHA512 a472818e9877fa23f9e18bd13b30a9fecc0ef2df6f366d40d0c99702ed6b2a1f7b143911c2658a3925bc1c187a0522cb0461b841f5de12ffb3f5973371726eb8
+EBUILD grip-4.2.0.ebuild 616 BLAKE2B 06faceb684942253e1d01859b2221854cfd425a5e97c5c380e384441e589b253499a2c4d1bd9c76ba696bdea46d4b711011a77f1a1522f7923629dc39ee5df52 SHA512 90c0e76c87b66880278db840f0b66e13be8248ba0f52167c8edfea0e9a5bdaf5c392343eb3b30bec5f68b165ea2e8b773c4e37aaff82d43322b64fef316984fe
 MISC metadata.xml 287 BLAKE2B 97d6c8c5b9fa03b5b8435a9719b819a9e071d1310656d97e6a203a8cf86d2414034e8642de7f010aa8f64955bcdc849bc66ef64a1e0e80fd23e355af50c6bbc1 SHA512 047bdd78979d55e9e37b92f51b52190c6a5780d6b3475560ae8908fdc98274949372918e1ab150821f09bff97cc12f25097f4e89ee4431861b608be79bd942bc
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
index 8c88d409de93..1325c688908d 100644
--- a/app-text/grip/grip-4.2.0.ebuild
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 pypy{,3} python3_{5,6} )
+PYTHON_COMPAT=( python2_7 pypy3 python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 1e50b37c540a..5986cb070bf4 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,7 +1,7 @@
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
 DIST gspell-1.8.1.tar.xz 419268 BLAKE2B f32c9c518c23f8f560d65eb6fb122703561cc09e385eefa99d0761e8aa5b5bf3a8cec3cab7071043134314262979de56d08ee2929973b7968016b123e53d8f16 SHA512 ae94f46c7bdcdeefa0279cd4ac3c50e53b63092016e298ef6b502c40c2574a2135c503ab322f5a3a7b8b4422fdec291a6ed0c937683a8c0f32d7ad474cc1569b
 DIST gspell-1.8.2.tar.xz 421936 BLAKE2B 5fdff772e716c1f062002d7371064dbbaf6eb43e77cef03b8fca7ea71a91eac82ca54a5463c0f785153a15ceb65ad06aeecc069196765cb78e5dfaff5d81fec6 SHA512 220bdec2b8229e848960e5e31bda1209dedac232637d3e6d4931ca2552054fbdf3f576d52f3d5a7ac734e6e626f2fcc7cefd0bff906b29ba9930cef791906c32
-EBUILD gspell-1.6.1.ebuild 1027 BLAKE2B 4981651ab7e910ffef4d963cffc37f527325cf7d98d6ce5d60b40526fcdd97da22587670f7b99385d13c0b6b6a6045d5288ee299cb02cacab09f46f38288e0d3 SHA512 760314be43139d7de2f670677681953372ad77e990f9102a42ae788966482fcd5dbcb64b68fa83f01b74eaeaabfe5d8d021f01e73c37cecb96ba4e6c57ff51c0
-EBUILD gspell-1.8.1.ebuild 1019 BLAKE2B d134214c4050a378e9ee58931edb6ee4b582e581875e4b1d27e0c0498abcd0774a56eb5631cf6131c3f8e9bb773e8aac6cf83cbb78b8516fa628a3acd37cc522 SHA512 d5a09cbd8e08f4d47839bee3b35c842d915aa0278ada9aad3782456bc9478446b4f4ba1fa2421a942a8933d0fc3a221ab24eed8be201f3322b097bcf975b2bce
-EBUILD gspell-1.8.2.ebuild 1019 BLAKE2B 72f68958561b2fbb450d38bb5463a475577876a59c3def7604f93ce2c7313b06670843e3e3bc563ebf5ebcbfaf86fe3782a0136b91ac4326c00d9eb655e4fe00 SHA512 95b4ead4d83f585535f5dca90b6b7d2f8b47eab567adfddd2940c06044ef7b3888dddaa6a1377451f0e1402a52b09b465e70aaf8b4d6007b1f114c36a9eb6e25
+EBUILD gspell-1.6.1.ebuild 1028 BLAKE2B 25d57e53d1d585b6ff94537ce7d65c079a66360fe11c5162c36d667ae1d59c03dbbb263b7a78a284a273513b43b6dadc90bbe8afa6dc47fafe9f1456a5d74b15 SHA512 25c33395a415b0b0207d6ed944729f424449ec45fbbf0eeda804778d3221bec6197e3f4d90181e46ac10ede0b3e5817d6cbf5134d60e8796c16b91a6fea5d2ce
+EBUILD gspell-1.8.1.ebuild 1020 BLAKE2B 7da0dc6bc3c16371a145aaab143bf102a76fff0d79fb23bbcf6839bea23a344eb26460597fe265fcf6078c53335ab7dc1bdfd69a5fc3c57174ebd7059497eee2 SHA512 6ec57705dc8790a0a8328746046b353c24f5d0129dbf071e01994bd5f198463df2712fc3cfaf2827460324317af9ab4d1d0e51608d439b754a8a3480bbf2188a
+EBUILD gspell-1.8.2.ebuild 1020 BLAKE2B 271877681d469ff4ea3341c44eaff959d34801e1addfa2423f3d34c4080ede7376b1a04c10ee332087f4ddcea3a315e03abb377f3611674285309f8c44ad877f SHA512 2388c82126c4a20bbba5e9e7588e407a093f0f606fe3733112b186c10d62b13fea60ef3c3b3dfcc680a546be105aa70a24427677ab2b59246111232ab522911c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.6.1.ebuild
index 2258eb9a0e38..108a5813d325 100644
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.6.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0/1" # subslot = libgspell-1 soname version
 KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 
-IUSE="+introspection vala"
+IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
@@ -22,7 +22,6 @@ RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.20:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
@@ -30,6 +29,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.25
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig
+	vala? ( $(vala_depend) )
 "
 
 src_prepare() {
diff --git a/app-text/gspell/gspell-1.8.1.ebuild b/app-text/gspell/gspell-1.8.1.ebuild
index 29b5aa6fd9fe..ef631e0e2952 100644
--- a/app-text/gspell/gspell-1.8.1.ebuild
+++ b/app-text/gspell/gspell-1.8.1.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0/1" # subslot = libgspell-1 soname version
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="+introspection vala"
+IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
@@ -22,7 +22,6 @@ RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.20:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
@@ -30,6 +29,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.25
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig
+	vala? ( $(vala_depend) )
 "
 
 src_prepare() {
diff --git a/app-text/gspell/gspell-1.8.2.ebuild b/app-text/gspell/gspell-1.8.2.ebuild
index 52ccc9e64039..ddbd5b2961b6 100644
--- a/app-text/gspell/gspell-1.8.2.ebuild
+++ b/app-text/gspell/gspell-1.8.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0/1" # subslot = libgspell-1 soname version
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="+introspection vala"
+IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
@@ -22,7 +22,6 @@ RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.20:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
@@ -30,6 +29,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.25
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
+	vala? ( $(vala_depend) )
 "
 
 src_prepare() {
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 4e566c4f5f60..d86b011e5d54 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,5 +1,5 @@
 DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 BLAKE2B 7cc22370afa045ac13bf05082d396534e08a454f13f6bf321bc45c4743c33813bc32c31b655c21d731f091f11d13aeef405bc82c8e2b0ed0d0a12a25e4e7f3ad SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec
 DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
-EBUILD htmlmin-0.1.11_pre20170909.ebuild 629 BLAKE2B 414fca47272870b7183c3fd712947fc9585a66ffff99b027c54e672d983b119920b188206ae10c02c85eb657611185764196173cc7687f0ff2af2a73970f0664 SHA512 ceb7d128615fe00d0e9fa138891b89d525d25228b0de24423f38ece20725158d4f69935d0b34cc66c7ba562acd2ab68420e56b276a27dd344bc37563cc4a5476
-EBUILD htmlmin-0.1.12.ebuild 514 BLAKE2B 47a414e076dc2d4c67c6dd0fd06f6d0f99942848a0387b20eb76dd7bcf6b35611ade0946564ed0cae15727666b048227ad63865406068935901ea70d76fbfa3e SHA512 b8ad304927cdcee5729636ad3e98fc9569e3ee489fe113e40599a61c87063c34359c8f28425091afb2b8bd7e7f4749825dd451ccaee4c8e97085278a49a51a07
+EBUILD htmlmin-0.1.11_pre20170909.ebuild 625 BLAKE2B 704664ac766ed67e9595e2ebabf7308e9b456a187825b589681127285bfc60d421dd4f7451270f1eade4807cf909efd71ed9fa51877beb557d705824aa6e0968 SHA512 6025196bb56be708b3c3674837ceb5e771284fe9bcf7ac32ceb98a0575025b72afa5f9ab850487eaa93f10cebdeedf5bc543ce02b3ae0acff47bdcb476c11fe9
+EBUILD htmlmin-0.1.12.ebuild 512 BLAKE2B 8548115108da628aec859cad8465c2b304a69429f2d3afc81f939d5dc0f7929057d48eb17bc56142f891124c0c1bc27a1fbafc2e4ff1597f7261728d640e6812 SHA512 c9dfee3fbd6907ab6314bf363aceb9dfc73a28f33e0de75f1fc7e804520fd86aba0349aaca949feb8362b78d26cc8b135757fc80d2463a1b79278357578214aa
 MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild b/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
index 824eee774c21..0f1226ba7e28 100644
--- a/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index 69c0412b0908..0b56363611ac 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 6ee47941434f..cb05f49b7eb6 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -4,5 +4,5 @@ AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb3
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
 EBUILD hunspell-1.6.2-r1.ebuild 2361 BLAKE2B b75f02e0862a9a8be86d7fb29b663a93f483410bf5d0301bdab8487516c00f132e6268ed0bdf133f2ef746528b93c6b0d7cc71a38eb3f49b33202b125e19e04e SHA512 fa6f2089e74c17adcfeebdce2ffa7f2a56ef86e53f1b05b2a2d7fc61e4a29dc9a5f010aa305e07cf22c63208bb73fe1c795efc47e951b666aad33feccd0aeaad
-EBUILD hunspell-1.7.0-r1.ebuild 2321 BLAKE2B d3e61cf6ed98838064a4f68d8e3b9b85aa6c53e4ef3a8e4daa9c120fb368919dfb8f71308aaac174cdb426b64aada52bb6263516e5a69b70e6c7d8980386cece SHA512 5b1a71cf8de78b1f0e6382f99290f7fb76227746fa9291d0860895e967e061f048241a79e7684bb68643885ff512dda859424cb68d42f29a840a590d3e0366d3
+EBUILD hunspell-1.7.0-r1.ebuild 2320 BLAKE2B 0847d45439cab6c110f629bc75148dc355be943d472944f4a766b026deeddd5941c6775b1afa96627eae476df3e25bcfab1ab3ef82a82fbf63dfe75f786927bd SHA512 bff1ea10fb94b6cecf2d62ce944ba05fdd1367c3a27ee7bb25a6ee44f3a9155a79198bc42e2027ccbf9a449fb9ea847ad7bdc0477a3d0c1ab840608531708d1e
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
index 526e232a310e..73ec87891865 100644
--- a/app-text/hunspell/hunspell-1.7.0-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 45100bbf8d23..07897d4c1dbd 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 DIST iso-codes-4.4.tar.gz 13299605 BLAKE2B 485f3b0240f1892fb96f2b5c391b3f0adc593fac97d53748aa104208936d1bf81de1d40e742ab48e3663cea0ce5b28a20782df2f4eed251bab5b8a7055745d0e SHA512 d22ecdef75cd07b59ea0dbc87d25eb254676ab83297c1a43dbad9d3471ba355630f5588b4590972526f9e885b2e1ec307303ac0bb94b2dd5c707377c1cfa64d8
-EBUILD iso-codes-3.76.ebuild 2411 BLAKE2B 2ea8d7891bb7d0dd56f4eb7931c5bff65412da737701001a8051730078a7d5bf5ad60cb53eb42ce93602198e0af26e9752da34e6801b86d777ad003bd9042640 SHA512 90c20515ee2d490550ac53a29b63cbe63d941edfc0486ceb8b383d7a064abfce0bfcebdeb78c6955ceba112ff9733c59be35f68686581cd2847a0371e8d07407
-EBUILD iso-codes-4.4.ebuild 2610 BLAKE2B 848c31fc51e13012b69624f64b5d87f0dfce311c230f88e256fefcb03bf8fd0065c82894af1d8a86cbeef6b46270d0d5c8a0884017c00d40805a1c5a0aa2ef7a SHA512 34be1311ad85ee8e956a70080a9d94f31ad4735f045748d438a18224756b2830348efc390c4b1415e0df21a363a6d779a64408c9c07f75504a8673aedc50e450
+EBUILD iso-codes-3.76.ebuild 2409 BLAKE2B fdfa564ff7e6c58aead012f18c879f62ac372677d3039a00a24d3e5764af36d3ae43fa818f4c5a57ba53980b3a54680db8e289d3d62fe26afd98652a84537049 SHA512 0d15de3e173f2788250d392a37c084422ff900483da231ffa720eb2cce56bdf8ea2b2bd2468109e59ec23fd6c6ce369bd953ac20b53b05c4bf20dbcc4369815e
+EBUILD iso-codes-4.4.ebuild 2635 BLAKE2B d41d87827ca74a6b46ef2a777fcc59dd3a819e59b9a6bdd66b3052d4024078365f6247ad9c08758522f25a305e182e15da879284218cfe1f6cbc56e3460b56a7 SHA512 23d2b4cfc8f4f5c57c1f509f99954a24b1e04388c71cc98670129f5e00b8fa5a98cf869fcb96a2e94ffa6df2861e397bbde0abb2523b80f94793ef8c6fc6e596
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index 5fb37b897061..0264d30c7d18 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
 
 inherit eutils l10n python-any-r1
diff --git a/app-text/iso-codes/iso-codes-4.4.ebuild b/app-text/iso-codes/iso-codes-4.4.ebuild
index 5494c38bf591..bf3fa6ef3f25 100644
--- a/app-text/iso-codes/iso-codes-4.4.ebuild
+++ b/app-text/iso-codes/iso-codes-4.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kn ko kok ku kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hant zh_TW zu"
 
 inherit python-any-r1
@@ -13,7 +13,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar
 
 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 ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
@@ -23,6 +23,8 @@ S="${WORKDIR}/${PN}-${P}"
 # This ebuild does not install any binaries.
 RESTRICT="binchecks strip"
 
+DOCS=( ChangeLog.md README.md )
+
 # l10n_find_plocales_changes doesn't support multiple directories,
 # so need to do the update scan ourselves.
 check_existing_locales() {
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 7c43cdd6be36..cd40fabe1405 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,3 @@
 DIST kbibtex-0.9.1.tar.xz 4185284 BLAKE2B 437fb2473095e89bc26446bf4dfcdd56ff0b402e604fe67f2f76073628e8e7f3fc8982c56aa24174303dde101c42d19abfac2b3c1e371bf930ff6bdb4307b7c0 SHA512 710ef3f0ddfe4869f079068723a2056866be9aab5907ea7eb00efb4b597270e4c1ec9464d6a15509e2a62749393d27bf0798022367536d3c879a0cbd10dc3129
-DIST kbibtex-0.9.tar.xz 4184288 BLAKE2B 90baf7c4960540566c59b198de307703d0f34ff6f4284933c187625b2e4065739fb16b004408fec5929d4923e7f651091915841c94ef09797419daa737ae39eb SHA512 bdd849094f66feb1bd6d02131580cb5d2e1f8d172a4e36141a48d3fc38375b5f4512078d13d6310f326b5cb7b15364616308eaac6c2c10ef897f8f752e1f6682
-EBUILD kbibtex-0.9.1.ebuild 2068 BLAKE2B 66ccdcb837c30348cb54d42574383d187bd6a9227b982a76c40215079de91401bcba3d6d6fd30b1d426af914e2c6bccf2954acf772177dc0e03929b4a276f923 SHA512 ef2df625328319313afdd32997e357d9a4db46b59b06ff060868cbc46b4abdf959eba6fcc7550c85b6f0d07f12832f1250e6e310ca05c8c47a591039779b65e0
-EBUILD kbibtex-0.9.ebuild 1882 BLAKE2B 90b416cddbbc4652a3b0cf29bb11960e800be20b7fd9519e566f26845bfbb5dea2680530d392bfc87a050f16686a39e0d1ce4e4d317b322d2f0693870c4aae3c SHA512 89998954808ef13654240a26b18a8ada4e3bffd20c7ef8b6b4839f3d867d4ab21852ce74118cb0755e689c55b03da5bc44282ccefe1415a28f5cb7d4dfcf89b7
+EBUILD kbibtex-0.9.1.ebuild 2060 BLAKE2B f880aa792f236a7525c42b7dcee2caebe5770b9893c47be6f4fdebe6c77b99d37fa94a5bfdd4acb00006cf12200904414e670264286dcf94f1c57f8352e81a84 SHA512 62e204d3e7451301d0845c7a652e9ea16fe710f32f46ae7229ec50ee3fb800d7a9074df0a9ec35b327af3be7d2bada93f862d26d1471725bddb808ef263508df
 MISC metadata.xml 440 BLAKE2B e5121ee173f89412a1bf3339de23a9e13fcec40f52c82129ebd185732759e4ad586b922d31e6470f91e03ba2ce614ba6de75dcb340e0f20d5b799c3476bde23b SHA512 cb2f6751bff9d468dde56635a792813de84b6c383e488ab5764c9656e54a892f5a9b9fd4932d49ec603bae4716f9f0bdd3cbe90b0c796017fceeb6b61196f1ef
diff --git a/app-text/kbibtex/kbibtex-0.9.1.ebuild b/app-text/kbibtex/kbibtex-0.9.1.ebuild
index e01569d3b7fd..89524913afe2 100644
--- a/app-text/kbibtex/kbibtex-0.9.1.ebuild
+++ b/app-text/kbibtex/kbibtex-0.9.1.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://userbase.kde.org/KBibTeX"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2"
@@ -68,7 +68,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
 		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package zotero Qca-qt5)
+		$(cmake_use_find_package zotero Qca-qt5)
 	)
 
 	ecm_src_configure
diff --git a/app-text/kbibtex/kbibtex-0.9.ebuild b/app-text/kbibtex/kbibtex-0.9.ebuild
deleted file mode 100644
index 3d572fc00944..000000000000
--- a/app-text/kbibtex/kbibtex-0.9.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://userbase.kde.org/KBibTeX"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-IUSE="webengine zotero"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtxmlpatterns)
-	app-text/poppler[qt5]
-	dev-libs/icu:=
-	virtual/tex-base
-	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
-	zotero? (
-		app-crypt/qca[qt5(+)]
-		dev-libs/qoauth:5
-	)
-"
-RDEPEND="${DEPEND}
-	!app-text/kbibtex:4
-	dev-tex/bibtex2html
-"
-
-RESTRICT+=" test"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package zotero Qca-qt5)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/okular:${SLOT}" ; then
-		elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}"
-	fi
-}
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index df08bbe8275a..4c0890a724f5 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,3 +1,3 @@
 DIST kjots-5.0.2.tar.xz 230608 BLAKE2B 3194b0ef072decfa09455ca7e8d6057ea3f37f54d37641a6ddf28e17ef4662a408adc9e9b04394e6002b51e72ef740412bcdd70324d6efcb9e949f9911437559 SHA512 a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225
-EBUILD kjots-5.0.2.ebuild 1075 BLAKE2B 5b1dc04b821bca3c7bf4a5d1f4d4941c9234963cb254b32ad6dc61443c58ea25a52d446eb7a50f4d2e09a0fcf35ec55844fb5d30d56073c304eeeed319777404 SHA512 cdebcacb1579acfbff8d2e47d7bcf2aac72723b797dc535305c0580526d46605d4547e3c83c3f1d39bd00e545b05104872c7d5843353773728425c68e9451a54
+EBUILD kjots-5.0.2.ebuild 1239 BLAKE2B d6974d518f55bdbee067441c9d83c3ef23605ddd45869105ec55fcc8334f0673f983c7f91757b72a2155deef2f4cecad00a494cf602437a3836ca66e1049c4f1 SHA512 6cc4b6374ff97e146927f04723a76d55f534a554a13d12b9fd3d2fcaaddba0625d282af9975269845dfcc1733ffc93e2060581a378326b6317dbc44cf347afb9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-text/kjots/kjots-5.0.2.ebuild b/app-text/kjots/kjots-5.0.2.ebuild
index 1aaa4567bdef..38c0288bc499 100644
--- a/app-text/kjots/kjots-5.0.2.ebuild
+++ b/app-text/kjots/kjots-5.0.2.ebuild
@@ -3,39 +3,43 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Note taking utility by KDE"
 HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
+LICENSE="GPL-2"
+SLOT="5"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-notes)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	dev-libs/grantlee:5
 	dev-libs/libxslt
+	>=kde-apps/akonadi-19.04.3:5
+	>=kde-apps/akonadi-notes-19.04.3:5
+	>=kde-apps/kmime-19.04.3:5
+	>=kde-apps/kontactinterface-19.04.3:5
+	>=kde-apps/kpimtextedit-19.04.3:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
 	!app-text/kjots:4
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 9eee5393ff04..7221f2da578b 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 768 BLAKE2B b9b60e0d517172ba7c9051659a033939092137b3cedac9e6fa477e3cdbdf910c480877195c19a6f211e51937b777a282fa864809752ccb3228403c23e406f125 SHA512 3a58fde7bfca116675bf198a69a799e07ced00bf16eb006379af265e7b792ab08f7b710545b85eec403f2e2410829bbada2907ce84320e398dfa7c9be0cc9eda
-EBUILD krop-9999.ebuild 883 BLAKE2B 8b72bf4c959560ff3e44e7332cd5bea2c1543a6e0027cf23793795bcaeef99b69a7d0ff730ebd84f5062287a0dea8cdc07d34a04b106c8eabd2200459a00f5b0 SHA512 32c6bb471442164f8f0d720d72869ef5b1b03d167c2c3084fd9569ecdc19f708a57228ec447241fc3ce061759439b5280ac6f81dda73df5cafdd03461ef3d3f3
+EBUILD krop-0.5.1.ebuild 763 BLAKE2B 2b55492cfd6b4ab24ea4c17d75efbec83845f1a772916a55c71cfa4f93ed3ea26a6cf01d7d65fbe9b00601a33570cc497fab060fbab7285670a210548c0e5e64 SHA512 640e37164c7bfe675554bf4dbcd1e5207d5bc3886c1be35019ecd41b484e2e2b00bb8d8deb6a01ecd570f2b639c019f8a088aa03a378017dc9b685675c3f487d
+EBUILD krop-9999.ebuild 879 BLAKE2B a92e6395bdb2baf2db60e06517f12fda051b2d822e3f8012cfce25593c8aa767cc7f648bc7066830b8cebb5336ad763dd1f342f8557c2e6c11de1cb30859b603 SHA512 a20617cc85fadc150ce15bcc1fce7a37f980ee6ec9361248ce6ef040d9a2c2a941cf46f7038fd5c4b7a5d582086235e29257f868b3385a7672f063596ddd17a6
 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 a4be44a8bdc3..986c8fe5c033 100644
--- a/app-text/krop/krop-0.5.1.ebuild
+++ b/app-text/krop/krop-0.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit eutils distutils-r1 xdg-utils
 
@@ -12,7 +12,7 @@ SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index bd6bb00454f4..0888b2ff9ae3 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit desktop distutils-r1 xdg-utils
 
diff --git a/app-text/landslide/Manifest b/app-text/landslide/Manifest
index 5aaae6726f90..6dd84617f40d 100644
--- a/app-text/landslide/Manifest
+++ b/app-text/landslide/Manifest
@@ -1,3 +1,3 @@
 DIST landslide-1.1.3.tar.gz 151003 BLAKE2B 471cc83cbfc1c7ddc437b88514fb48632016e0915fc27c65d502a71b94f83a1184de8a7dbfaf2af8b75963e687c1af903add48e5ac8893308d9cfa07fdcc4c61 SHA512 2b29c416f8af04c0bf048060e0fe67b0b6a5e293485c5e3f68b9d1ce9d63ef66ca3bc58a96f65705c6918542932ef0a2fa6072b17c4c01cfc1975d283b417152
-EBUILD landslide-1.1.3.ebuild 814 BLAKE2B faa789fbfdb7fd6a4e99a0323f54a3cf7d0c6b9f0e09c726eeb210ff3ce7be7de9e2ac0e0f4457a5a9d39afd62e7ca799492e95e9c1a95b8bc03547c029f09fd SHA512 31358e64b4604c2c53e755f8233c7a66075ec704ab4edd28843a4182d8d1e7d0604b21b079de3e377a73abfd329a4df8a862f6581cfc38ed2030aa532dea1cff
+EBUILD landslide-1.1.3.ebuild 810 BLAKE2B 952c2ad87a6baa889acd49807122ee92516319351128bea944cae5fe700d3fc006366f02397f06abaedb8331dd5a4af5a2e6032644f9eacc3cdbaf811888b3c8 SHA512 8fa0ca47fb9c749b1c9bca97bb6ab2c2cd048dc2399720095aa40b027d70e00ee8e7526b1be6699470bc8b0140db757187c8c46845c8f8fb1cf25db85db96ce6
 MISC metadata.xml 298 BLAKE2B 15316fb3bd0eb0be967bec08510269e31406e72c3cc7623d21cc2334bfb36b8031bf304c4627b085fa64cfec15964cf9a6a486ba29bf312facf1589f36cd9819 SHA512 19a5bf1f42b94a00856b856fc0120024df40a4394a17e61fdacc817d1b355b601595a27cc0f814d3f6b436775799b44aa4f5090daa91452b55d4760e8c89b8d0
diff --git a/app-text/landslide/landslide-1.1.3.ebuild b/app-text/landslide/landslide-1.1.3.ebuild
index df5e16ccb516..6b987b52c66f 100644
--- a/app-text/landslide/landslide-1.1.3.ebuild
+++ b/app-text/landslide/landslide-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_6 )
 
 inherit distutils-r1 vcs-snapshot
 
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index f6c3f47e6b95..b8021e426844 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,5 +1,3 @@
-DIST libgxps-0.3.0.tar.xz 93000 BLAKE2B 8e04ae281aa8ee637d597265992a5bf6df3592b7d251d657dae3833c8cca848f7142f926964d96586f50ce9987dee94841be15554a733816a3b4f0acef282f12 SHA512 283ce3041f0238ef1dcae30ce2adbc3f843677e00ae22f20ed3459828f3edaab6d05d87c20dddb613925ab248ed0b29855a94198b982606c3dcb2e59f800b013
 DIST libgxps-0.3.1.tar.xz 93132 BLAKE2B 63af298ef1dc345ef7c40fae4006ba73aa7529381cc6cbc8cf86f4d5b69c8c5617b902bef833ed7d3fa968d927b441e888889179f598b06e2ca13084d3b199af SHA512 80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239
-EBUILD libgxps-0.3.0.ebuild 1220 BLAKE2B 5a253905c2e9c7cfac0362a25f77e7d43bf204a07756ac12efd10b3a6b07331dca27a027aa125b4390557eba939dd8623433b06087989c78b67a0c4cb2aa1efc SHA512 a03b58d526fe52b849ffc7aaab979e18ba4af390e3a887732c7f3aab4a96f6abc01e141a6127c38fd2f8fb1bbff412abf596600a11e5c29b3e70cd220fac01bf
-EBUILD libgxps-0.3.1.ebuild 1222 BLAKE2B a9305175434c54097ac28cdee8fedf7def375241eaf2e5dc4879a9e5d937972f74a452cf8b6b4f9868eaa7dbd3b7cec8acf9c3d48ef20085a89490cb9524a955 SHA512 f3cc2bceb4d3aff935038182e14cb78810f8700515294a4f0196b56ee122e5c2d9be24e3c0e8b745b06df5b215fd09b68e369662b1fcabdc83d7b4b8fde3fa65
+EBUILD libgxps-0.3.1.ebuild 1221 BLAKE2B fbf495692afb265f9674ac5ee69fcf6cfbc0a94c262fae36b6e94219e76404923e835960e68fdc889b171e1ed936b95043a3834bc726ceb8854be44ed7bf765b SHA512 66e0ff99269687db10c99102fa10f6108ca67c62591aafc4e22ea08aa2aa55dad45587788d3de34ac75b44aa6226122e2e791c7b8817c3af1d27a9ac5a709000
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/libgxps/libgxps-0.3.0.ebuild b/app-text/libgxps/libgxps-0.3.0.ebuild
deleted file mode 100644
index 53b633dea4b7..000000000000
--- a/app-text/libgxps/libgxps-0.3.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson xdg-utils
-
-DESCRIPTION="Library for handling and rendering XPS documents"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
-IUSE="+introspection jpeg lcms tiff"
-
-RDEPEND="
-	>=app-arch/libarchive-2.8
-	>=dev-libs/glib-2.36:2
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=x11-libs/cairo-1.10[svg]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.1:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	tiff? ( media-libs/tiff:0[zlib] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-# There is no automatic test suite, only an interactive test application
-RESTRICT="test"
-
-src_configure() {
-	local emesonargs=(
-		-Denable-test=false
-		-Denable-gtk-doc=false
-		-Denable-man=true
-		-Ddisable-introspection=$(usex introspection false true)
-		-Dwith-liblcms2=$(usex lcms true false)
-		-Dwith-libjpeg=$(usex jpeg true false)
-		-Dwith-libtiff=$(usex tiff true false)
-	)
-
-	xdg_environment_reset
-	meson_src_configure
-}
diff --git a/app-text/libgxps/libgxps-0.3.1.ebuild b/app-text/libgxps/libgxps-0.3.1.ebuild
index b83d66060673..1e257ebf02ce 100644
--- a/app-text/libgxps/libgxps-0.3.1.ebuild
+++ b/app-text/libgxps/libgxps-0.3.1.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="gtk-doc +introspection jpeg lcms tiff"
 
 RDEPEND="
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index e469d5be0af4..21574d174825 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1,3 +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 1232 BLAKE2B 054fffce7b437970ae60349fba367022287d7d4bf56d508c8b4f7aa2ba916d912db1382458cc19238017701335b4c1dc6c37293909b84bd396d01b111fb16018 SHA512 0dd59f6abf72281160a3b4aeb77d408f12c32ef9e63ec37e8b45960ee42635acdae8b283aab58a06c736716e3a0caaa7bcd36dbe3b3d6458e1c4bf15ee613d0c
 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
new file mode 100644
index 000000000000..eb55dea03ec6
--- /dev/null
+++ b/app-text/liblangtag/liblangtag-0.6.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="An interface library to access tags for identifying languages"
+HOMEPAGE="https://bitbucket.org/tagoh/liblangtag/wiki/Home"
+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"
+IUSE="debug doc introspection static-libs test"
+
+BDEPEND="
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection-common )
+"
+RDEPEND="
+	dev-libs/libxml2
+	introspection? ( dev-libs/gobject-introspection )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+"
+
+# Upstream expect liblangtag to be installed when one runs tests...
+RESTRICT="test"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	if [[ -d docs/html ]]; then
+		rm -r docs/html || die "Failed to remove existing gtk-doc"
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable static-libs static)
+		$(use_enable test)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index c1afb7ba7e9c..442a350689ff 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1,7 +1,4 @@
 AUX libspectre-0.2.0-interix.patch 728 BLAKE2B 5954fa18e92c33f086e3cd45b1d837aa1dcebdef21f595ddaa7f3485bd02f563eafdfd8c0e541cf782875de2818aa91d07e2c1d377457197760095da0e69a7c2 SHA512 d5b35ea095175a3f51553e3bed6e0e02bf7396b036923660d2ea6cd73241ef6d84a8dac977c9ce38078d41b99aadc203e13853d7087624a43f2a3eae35fedb8c
-AUX libspectre-0.2.7-gs918.patch 1272 BLAKE2B 37f9b02992e622754c271d6c2d4921a3ee55d657f66d810b27498cc908c332ed735a177a1594fa625c135c13a9cc0809b1fbbba9e66ea7bcaa3e69df0aa5fdfd SHA512 50c307ffd6fbd1de92239670afa61a68a32b788e3664a1d4d5b86a074102596e678492c91f6ff9fb8ca58bbe00b5a5fc01034a0d04e5cee3149932ce0337b401
-DIST libspectre-0.2.7.tar.gz 387947 BLAKE2B 1d8c5ce045e90cb10a159615d3b011dafd24fa07c8bbd79349663880d077b53944495cba7f5a77e8e32735123762d0f6fcd2feb382258b8d35107284f72243b8 SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794
 DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
-EBUILD libspectre-0.2.7.ebuild 1210 BLAKE2B 655fc68798e1637c3013b407cd8bcc88c91a23f1c85747f33c1c5ee12b3c074ed57a13d25684645bf8f02e3d04e1af4a9bc2e4485ebe487201f83981f5e1ec50 SHA512 b65c05db5a76bd4618dc0bb43faa1b917c1a572d32a8e822af913e6a9633671d106823ea9563d55e60881c1b52098a8b2c0ebde110d46080096479fdf61a58e5
 EBUILD libspectre-0.2.8.ebuild 1079 BLAKE2B 78361980640afce657b85057ff9ee82f6abb15cc900daa88053be433ff0c8abf3dd762f27af1d68f85fb79e49e90766b5fd80571bf84de86b9292543798d3eec SHA512 7245c26fe1989b8b66d377505425bd0ede4093a37a1d11a3c88ec93c73862b8cb3b143089951cfee0563a258967afc38a8858d611ed7c0fe8acc8ee20677f7cc
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/files/libspectre-0.2.7-gs918.patch b/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
deleted file mode 100644
index e9a4eda192ba..000000000000
--- a/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Fixed error namespace for >=ghostscript-gpl-9.18
-
-https://bugs.gentoo.org/563540
-
---- libspectre-0.2.7/libspectre/spectre-gs.c
-+++ libspectre-0.2.7/libspectre/spectre-gs.c
-@@ -43,12 +43,12 @@
- 	
- 	if (code <= -100) {
- 		switch (code) {
--			case e_Fatal:
-+			case gs_error_Fatal:
- 				fprintf (stderr, "fatal internal error %d", code);
- 				return TRUE;
- 				break;
- 
--			case e_ExecStackUnderflow:
-+			case gs_error_ExecStackUnderflow:
- 				fprintf (stderr, "stack overflow %d", code);
- 				return TRUE;
- 				break;
-@@ -109,9 +109,9 @@
- 		set = _spectre_strdup_printf ("%d %d translate\n", -x, -y);
- 		error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set),
- 						   0, &exit_code);
--		error = error == e_NeedInput ? 0 : error;
-+		error = error == gs_error_NeedInput ? 0 : error;
- 		free (set);
--		if (error != e_NeedInput && critic_error_code (error)) {
-+		if (error != gs_error_NeedInput && critic_error_code (error)) {
- 			fclose (fd);
- 			return FALSE;
- 		}
-@@ -126,7 +126,7 @@
- 		read = fread (buf, sizeof (char), to_read, fd);
- 		error = gsapi_run_string_continue (ghostscript_instance,
- 						   buf, read, 0, &exit_code);
--		error = error == e_NeedInput ? 0 : error;
-+		error = error == gs_error_NeedInput ? 0 : error;
- 		left -= read;
- 	}
- 	
diff --git a/app-text/libspectre/libspectre-0.2.7.ebuild b/app-text/libspectre/libspectre-0.2.7.ebuild
deleted file mode 100644
index d250899af08d..000000000000
--- a/app-text/libspectre/libspectre-0.2.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="A library for rendering Postscript documents"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
-SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="debug doc static-libs"
-
-RDEPEND=">=app-text/ghostscript-gpl-8.62"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-# does not actually test anything, see bug 362557
-RESTRICT="test"
-
-DOCS="NEWS README TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.2.0-interix.patch
-	has_version \>=app-text/ghostscript-gpl-9.18 \
-		&& epatch "${FILESDIR}"/${PN}-0.2.7-gs918.patch
-	eautoreconf # need new libtool for interix
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug asserts) \
-		$(use_enable debug checks) \
-		$(use_enable static-libs static) \
-		--disable-test
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		doxygen || die
-	fi
-}
-
-src_install() {
-	default
-	use doc && dohtml -r doc/html/*
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index 8f85e5f9bd2c..08f41fe85fa7 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,5 +1,5 @@
 DIST mandoc-1.14.4.tar.gz 627229 BLAKE2B 43a561d4254e8bcd090891937582d7ee40cda70dcafbbe456f24c539f17f452081f324a90eae69f1025dab3760581d564fef3365e82204350d535f4809c36283 SHA512 c68390711a739284ad9a61364f3fea76c0c48c02b4830d6326b07c4188d099e3720ae3b91fc3b083269381b417b7e3f3647d13a54ed2548f8c2f94122f8a7d97
 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
-EBUILD mandoc-1.14.4.ebuild 1536 BLAKE2B 3ecc4853da9d231ab86f340bea39032ad230f2aced26987efe9ec14fb6fa86bac3bdddcb366428d9c539d611538991103e810908f898db7e11d93f70efd971d4 SHA512 ec236f12331d2564a28e9d8c7b2cd369984cbe3a1a5931cd18805c5c48ab58f99d91b004759428241d4bc7e8bab59ca6bfd9aa5317932d4403035bbeacbcfd99
-EBUILD mandoc-1.14.5.ebuild 1533 BLAKE2B d90996d54081786ed97cb61075671a8527af364aaeaf200eb5b4044f3a0b3a975a9ac625ec79cdcd7160d93423589da0c71efc411202bbff50ebd52bc5e34173 SHA512 83c9b522a8703b1bc10f2be8440c1c5fd3235b2fe198ad6db10254d314a85a62b8c7e92c5cfdd7a56130380936f360327514e2164b5ec60d4fe45b6e7d6fcd7c
+EBUILD mandoc-1.14.4.ebuild 1538 BLAKE2B 5a9fc9e4967702dbc191ea4ad4e5cfb12b7a1fe2a254f125a4be9ffe6b151db4d1f96cdd99f8dd631f858e38adf43c8379eaf62407afb7eebe47680f9d0fad2d SHA512 bc6480c6a8092eede870763a637ccb9a678f8da143e7aa011bd0111bb6d1943ba90109a79b7b12ef03bbc775d565822332e9ded08a9cc7b2276ccdefa0924d08
+EBUILD mandoc-1.14.5.ebuild 1535 BLAKE2B 01da2e0709c002bdd7f759b2656cd7a0eeb1e0c3970bbf3e1d1aaacfe4f7cf21c4b2bde943a23379e012b5fcc7e3c3dd2d8e3dda16a1ca739fd39840b30a6fbe SHA512 5a9ee80eec5a06fb2e1652a6a23a160f687b47867d844387f6d3ae2e1b83d38c7b1f9aaec58daf95474b7de06ec53f78c21d354ae347df1aea1280b1a2c4eb1c
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/app-text/mandoc/mandoc-1.14.4.ebuild b/app-text/mandoc/mandoc-1.14.4.ebuild
index 8c8b1bec615d..fbcafa5a7650 100644
--- a/app-text/mandoc/mandoc-1.14.4.ebuild
+++ b/app-text/mandoc/mandoc-1.14.4.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit multilib toolchain-funcs
 
 DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="http://mdocml.bsd.lv/"
-SRC_URI="http://mdocml.bsd.lv/snapshots/${P}.tar.gz"
+HOMEPAGE="https://mdocml.bsd.lv/"
+SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-text/mandoc/mandoc-1.14.5.ebuild b/app-text/mandoc/mandoc-1.14.5.ebuild
index 4b5e8af2d4fa..029a69eeadc9 100644
--- a/app-text/mandoc/mandoc-1.14.5.ebuild
+++ b/app-text/mandoc/mandoc-1.14.5.ebuild
@@ -6,8 +6,8 @@ EAPI="6"
 inherit multilib toolchain-funcs
 
 DESCRIPTION="Suite of tools compiling mdoc and man"
-HOMEPAGE="http://mdocml.bsd.lv/"
-SRC_URI="http://mdocml.bsd.lv/snapshots/${P}.tar.gz"
+HOMEPAGE="https://mdocml.bsd.lv/"
+SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
index e7a855138edd..cd955bb7e71a 100644
--- a/app-text/namazu/Manifest
+++ b/app-text/namazu/Manifest
@@ -5,6 +5,6 @@ AUX namazu-perl-5.18.patch 1761 BLAKE2B 38941d15556c229de19592ba2660b9a79782588a
 AUX namazu-perl-5.26.patch 632 BLAKE2B f6b4a0838d6ca529adb9330f7221ebb014e50f289be144920a24a6656fb3abc604a0dc39f6f618a02b25c1cbf2065331f57f80d4120fba69042692a3dcb8a673 SHA512 78c655dfb0bfee51e339a142e71685b0599a58786899a151279834b7e9523dcff8359df8addb2a1e40a162f2a412cbd10e178a8215f3a178527392c2a8fa7be7
 DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
 DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76 SHA512 e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989
-EBUILD namazu-2.0.21.ebuild 1692 BLAKE2B 2fe7a4a8002817dfa20b73321afcd043f2aa01c352bc21c6aa896931e9ed40e48d9902b6490cd98863e3f3178375b413b8d1fc7dede5d386468750f127fafb02 SHA512 5ada24b5ec12cf4de856ef30d72cebd00a617197399e9621c3841e0411206536580368e6fe095e457d6447cfad38391df2d2a8e512489735237d2e266bcc8e74
-EBUILD namazu-2.0.22_pre7.ebuild 1608 BLAKE2B 27514a4a797634de84c26227ad5a4cab0a32ceb90d80e1f54641e2dd7cd9f44e6c6af8ec278ff762a7d9e2f6c06571aa1db6448ce7069e62f6e42a6b1e8f005f SHA512 c845c0293144f5189f6f9b07b89612fae5e74e0ad39568182a7ccc7065f198f65f636c5a6d0328709b758abbe6097e589f9cd33a4a8a09c0f77abe16eb5625b3
+EBUILD namazu-2.0.21.ebuild 1702 BLAKE2B f84a3d893c5bdc471845d288e86defb43adec287b7792fcf7ce7cf22a431cecfeae41cb2fce24da3afc4850bc0adb636f0b6d8ba18d7a6ae5d4d9542638048d2 SHA512 d6c3bb404bd37106af1e7d8788fe1ec04e55d07b98b0050cdc592ba8793aea20c83fc39930e29077353993e9845640440492a7fe94ad4b04d56aeae82a896a36
+EBUILD namazu-2.0.22_pre7.ebuild 1618 BLAKE2B 370b2534f42f2853aa3408ce69ea5b164869be095d72c6226a17e6f13cc0c85390f3ec0dee60a68526239cc495fbdce4d35e2e8d239509eaed80ba8c126be599 SHA512 d99c03d2bbe1c272878b1fd1b78cfee6680b1b79a78dfbd6d9f690047867e4e8b11478329d6ee85534559127cf296c6930a923c4e11f311065060b6f646fe6c4
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
index 7a542c06eb94..54ecb12f321d 100644
--- a/app-text/namazu/namazu-2.0.21.ebuild
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="emacs l10n_ja nls static-libs tk"
 
 RDEPEND="dev-perl/File-MMagic
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	l10n_ja? (
 		app-i18n/nkf
 		|| (
diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild b/app-text/namazu/namazu-2.0.22_pre7.ebuild
index b0e98040e377..8bb626158323 100644
--- a/app-text/namazu/namazu-2.0.22_pre7.ebuild
+++ b/app-text/namazu/namazu-2.0.22_pre7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ KEYWORDS=""
 IUSE="emacs l10n_ja nls static-libs tk"
 
 RDEPEND="dev-perl/File-MMagic
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	l10n_ja? (
 		app-i18n/nkf
 		|| (
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index adbebc827c38..93c1951010ba 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,6 +1,6 @@
 DIST nfoview-1.26.tar.gz 117468 BLAKE2B 7fec761774ee66f1f5845d2d49cf99644d522c6fe402bdfd578e12371b58b3ac5a80b77959c92531ff54362c2234d043fa219b50730158c91310ba67b491f729 SHA512 2e697e3a49aa85fe0865ad9f281ea830e692335682658061f2aaaa1c5ed6ccb3dbd822dab244190ae0521ce237fbc3d91480da4c1229548f0fd5a74df712e336
 DIST nfoview-1.27.tar.gz 60094 BLAKE2B 3186de6d04b50aa4388f606a49f8c2f13a0fe3494d49a1dbbd2ffc84cc039f03f47223e3aed469c32c3fbb01d277cba7f53290056dbcc7fec8e0eeec7ebcb596 SHA512 157257f9f289bdeac140054320ad43893c73995e11e6ccc91ebd2ca53878f00d45945c4e3ac3c11ec2f589a0349598f96dfecad3b0e3cfbe06e5a036bcedc3b5
-EBUILD nfoview-1.26.ebuild 819 BLAKE2B 98129245e6681ae0455454018d2468d6d424a03b4e150f70dd067ad56c1adbb70d3e60a6a81f5c15e3b79384e3253abe50033131b434c4b445c24e787bc3a8ad SHA512 05b5dcbccb4141c959a32c3f45c4b2bf71aa859acf2f036770b169d577c94d604c05ed2d6b0fd36a4d79debac31cb978746a70712524b21ba24ac6ccb9131802
-EBUILD nfoview-1.27.ebuild 844 BLAKE2B 7a7d97cbe56bec4d771f7a018bb2fbde0433e4d6ccb15c7007d621cb6ec87d983e6ee8e5a2b27ea26d30383ee2e3bd8585dd6c530aa15924e848dec44c1887f9 SHA512 bd17af52f3f28842ee4b4f754bc3f7967f618eada731e1747cdcb77ca49ad2cb92300240ce78b6d887e719fb3091cf626f033264143b0a904cc390b100d9cc84
-EBUILD nfoview-9999.ebuild 819 BLAKE2B 98129245e6681ae0455454018d2468d6d424a03b4e150f70dd067ad56c1adbb70d3e60a6a81f5c15e3b79384e3253abe50033131b434c4b445c24e787bc3a8ad SHA512 05b5dcbccb4141c959a32c3f45c4b2bf71aa859acf2f036770b169d577c94d604c05ed2d6b0fd36a4d79debac31cb978746a70712524b21ba24ac6ccb9131802
+EBUILD nfoview-1.26.ebuild 817 BLAKE2B 47ada35bd06c2a1c43d78f598de8858e6a7bafcd9dc79987515155bbccdb4922288fb8374db2b3413c545bf7f2055f70a1eeda8b2f35009f6314424dec48b276 SHA512 56111d9d3a08543a698ef7319ca3ed2312955f0b611ce7069f24d6ce3957d30cc884b4ea9ec37f8749d31956b76c17786221c5829a9cce6e1dd0dbce640d1386
+EBUILD nfoview-1.27.ebuild 842 BLAKE2B 0b41463fa89d8dde1235c8609d728e9c696246fd1e6e252aad937ae238240127c832ab27e2592c93ba86a2c7150409501a70c918b584581dcfd51854a4abf717 SHA512 f14d92ccde72f6c5f72feb3b6b7f068f9fe26f3ddf86b0fff3a588fcb6ab829d1a042366fdf074b7876bf74f7786a3ed3e3cf487508d2dc3582f9c6d1d7d485a
+EBUILD nfoview-9999.ebuild 817 BLAKE2B 47ada35bd06c2a1c43d78f598de8858e6a7bafcd9dc79987515155bbccdb4922288fb8374db2b3413c545bf7f2055f70a1eeda8b2f35009f6314424dec48b276 SHA512 56111d9d3a08543a698ef7319ca3ed2312955f0b611ce7069f24d6ce3957d30cc884b4ea9ec37f8749d31956b76c17786221c5829a9cce6e1dd0dbce640d1386
 MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.26.ebuild b/app-text/nfoview/nfoview-1.26.ebuild
index 147b225c7db3..a6e9e5a10d68 100644
--- a/app-text/nfoview/nfoview-1.26.ebuild
+++ b/app-text/nfoview/nfoview-1.26.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/app-text/nfoview/nfoview-1.27.ebuild b/app-text/nfoview/nfoview-1.27.ebuild
index 3229ddf95d7a..568e5c1e57bd 100644
--- a/app-text/nfoview/nfoview-1.27.ebuild
+++ b/app-text/nfoview/nfoview-1.27.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 xdg-utils
 
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
index 147b225c7db3..a6e9e5a10d68 100644
--- a/app-text/nfoview/nfoview-9999.ebuild
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
diff --git a/app-text/ocrad/Manifest b/app-text/ocrad/Manifest
index 765e49bc0c68..9c179ef93a7a 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,11 +1,5 @@
-DIST ocrad-0.22.tar.lz 87698 BLAKE2B 90bc7a5fb94476819501a2026e4b55c0d8631acf40926c2840e614066786078235edbd44d6bc47877cf106244bcb90b0291c2fb45a34f7d3a99ca676271e5df7 SHA512 45c7934776d96b6868a0109bf40b6814503c03bf63cb797e6a727599aa79e700a253b4eb3ec8ec8ec7abc3417601dacafc7560b147395171348cdae1b6951254
-DIST ocrad-0.23.tar.lz 87385 BLAKE2B 9f6ece19f815e1e6011aef5c2c90f1772bdc9621586744ddb9c7fde16762ccba42ca887792a9958c3a7ff1d43f8cbab985a2196de1f1a7ada01ad79d30f308b1 SHA512 db3c282dd121b5138d7e0e8d52fe88a3d392aa5ba2a5b821c74a84b1f66f0bfb8f3b9f08a276b6814c6bb6c31b1a51f5bcaf0c6e66e1a4d659ea72f60b383d13
-DIST ocrad-0.24.tar.lz 84506 BLAKE2B 814604ffb04cc3b4e40a7c3a07d90c9d07e4b64afd4d97bc5043e1019eeb347dd1105481dbaa721951efe4aaea729dd87f3510f3ee7dd9b277d96f9d6cb33ea2 SHA512 c43cb4dc678e9588e7061af6ea83a0514181e56201fe5ab68b50b8a1c8e1ae7c7fbf959cdf172b7200b89d9e6b1f42261ead4fbf3a6d0123860feff7954e532d
-DIST ocrad-0.25.tar.lz 91464 BLAKE2B 424d2a67eee85bb2d66568c4869761f2ef63c7c274b3a5a0a1c82920bc23becb97553b76dd4a7af5ca4400e806a05e927581060420f70483eaf8a77bf865e05f SHA512 48a0753d699af909d4d0295005e12ec626dad8772a5212c0d579df3b24cf01f6e457ec61edc708a0f6eebace75f37ce0544e8b19c11c9a25166aafedc92c258f
 DIST ocrad-0.26.tar.lz 91450 BLAKE2B 9ce2324c30ce3236689236ff2f7079d89078c61c4c78efef8c7c34fad2351fdc59a67a1ef995b3ec1b64620f7262563126c0305e3ffda3c5ec04ee5cf4c39a05 SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c
-EBUILD ocrad-0.22.ebuild 755 BLAKE2B 62d679bb3aaabc86bd3eb8203f75066c35c7ea2b8ea6e6ec559c0b3425ebe7216bc3eef63b7b35d10ab3dcded6a7c9cdb582f5dc8ca7a2250580b97a21ce7db1 SHA512 e02df78e5516f824beb87e565c5116a7c66d19e7593831bc389148c14c85c399297ca545c2f62bfe6fbbc21bf47f4a5b82b9761a37c52babb0e46aa30abb2bc9
-EBUILD ocrad-0.23.ebuild 759 BLAKE2B 9952240e1dc307457daba5636f128127f479fd32427e59d96f23f91beb7fd27b0dd5f3e2c2b3a54e1fe0afb0ef2545e8903e34d2f2634073ae7fc7a27799b374 SHA512 ec14af5534f218db1fdb7943b65f69abc376709adcf8d8f00603f1969e60476fdd189dbc5fd413cec8ea43eb443f4d833b120bfa7cfc2d04a42fe28414c135bb
-EBUILD ocrad-0.24.ebuild 759 BLAKE2B 18751b6660fb528bf1eca49184864a1099f0b52acd5bed3465e5e9baed6c671bb7f8ea467286f9a871232e36203e345c2e537f00f19084fb8911cca034397399 SHA512 65ce48702e9f29b5b6d1184c0a4aa807c1226c2d54d710fdcea6365f3fad0c2ae22a1f528a74e04452297efb337904ad5462825be8dbc8bd46bfb208bd762838
-EBUILD ocrad-0.25.ebuild 759 BLAKE2B 4b2c75d5dcef0c50916a20488bbad6b7e6795d4149f7b2dbd6ebf8c2bbe8f9364082be5922b112c4ab3849b5d5adc586d530960abe20e694a57c858d7a0ab439 SHA512 ba8a7d8c05290255a59954645050cc93e991657e38fa0e02f9f7929420226edf4fa95eec01f8736c6cad5707b0a89ed27e439e559173f34c22ea89bbc68c66c0
-EBUILD ocrad-0.26.ebuild 759 BLAKE2B fd4da36e30b933bc7993e9bd01671238c2a1beffe522286f5e7ffad2a37363c1249a2751a2dcf9ecec7c82676114d5d105277a7237091815eea5b26070659ab7 SHA512 1680e6b2f64cb164596bd89339da1ec86f4facb4c6944f2374b883318ca4da8f9037aa0f26c01086cc5b15b9ca7f8e89d5d15f1640405e249613121832a1abfd
+DIST ocrad-0.27.tar.lz 91709 BLAKE2B 4dd152e6ccbd41d2ce7e7e3d4fc38e30af4f0bb9c36e32b1f32e67772347af133cf67a8b89c03d5c9924a1d4ffa009205b80609cdb96a59b3dbeb76709a8e8e1 SHA512 2a4731e0e26eefe6d37b08859c4d3cc2b54180411b0f846f7b7e873b9da5b4596ca3c6042ee42284a07aadfeb96d953dce3e95ce2410e48624d1b6020750539c
+EBUILD ocrad-0.26.ebuild 740 BLAKE2B 502d136b0a7d9648c208b78e884edaea06a620719613b35f62ee62f786eee35bdbd66781d505270a8ca0f09c6d16fdd6b22d150b138e7cdb28daeeebaa1918c6 SHA512 af202d8d6d97ef15378a10f77028758c5cd9afe0cf06de897cb695f1c73544542b5daec11c9ae610157555cd786845e7eca373eaf28cfd14d4e91598905c69ec
+EBUILD ocrad-0.27.ebuild 745 BLAKE2B b122a8bd100178f6d8b24a7f8a4940bbbd21b2698c749844961ebe6efea30442ac1ff37c2eb05b22ad4892dd99ba5b34ab547319e48d50e98d70c55595108fb3 SHA512 d89b5a6ee2cf49c1a1c3d65135870b5d760a07c384078041aa7d11f909a9128e89a58e2223da89383144a9315ff015f49bccb94bd84d2eaf179625ce6a1edce8
 MISC metadata.xml 496 BLAKE2B 08ddfa7a7988624d9d48b627c5f29205a0615b73e956d9520f53ac0be56bf64303474fffbe02236c8c18a8cd3e0b5573d08c1f42a37d09a7f57e69f043867e17 SHA512 702db4a3d253c553bb6ca651e80da98099fa6bb275e3b166eb43f7324a9165a6d2db397b9339ad2909d6c276029a8dbfab63bb7d8087dfe2c78345b7ed8088c0
diff --git a/app-text/ocrad/ocrad-0.22.ebuild b/app-text/ocrad/ocrad-0.22.ebuild
deleted file mode 100644
index 289635030861..000000000000
--- a/app-text/ocrad/ocrad-0.22.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
-	# ./configure is not based on autotools
-	./configure \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		--prefix=/usr
-}
-
-src_install() {
-	default
-	doman doc/${PN}.1
-	doinfo doc/${PN}.info
-}
diff --git a/app-text/ocrad/ocrad-0.23.ebuild b/app-text/ocrad/ocrad-0.23.ebuild
deleted file mode 100644
index 2f4bea7172dc..000000000000
--- a/app-text/ocrad/ocrad-0.23.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
-	# ./configure is not based on autotools
-	./configure \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		--prefix=/usr
-}
-
-src_install() {
-	default
-	doman doc/${PN}.1
-	doinfo doc/${PN}.info
-}
diff --git a/app-text/ocrad/ocrad-0.24.ebuild b/app-text/ocrad/ocrad-0.24.ebuild
deleted file mode 100644
index 2ccbc7b1dfe4..000000000000
--- a/app-text/ocrad/ocrad-0.24.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker toolchain-funcs
-
-DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
-HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="$(unpacker_src_uri_depends)"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_configure() {
-	# ./configure is not based on autotools
-	./configure \
-		CPPFLAGS="${CPPFLAGS}" \
-		CXX="$(tc-getCXX)" \
-		CXXFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		--prefix=/usr
-}
-
-src_install() {
-	default
-	doman doc/${PN}.1
-	doinfo doc/${PN}.info
-}
diff --git a/app-text/ocrad/ocrad-0.26.ebuild b/app-text/ocrad/ocrad-0.26.ebuild
index 1dc0d0045405..a17dd6ef8739 100644
--- a/app-text/ocrad/ocrad-0.26.ebuild
+++ b/app-text/ocrad/ocrad-0.26.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit unpacker toolchain-funcs
 
 DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
@@ -10,10 +11,8 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
 
-RDEPEND=""
 DEPEND="$(unpacker_src_uri_depends)"
 
 DOCS="AUTHORS ChangeLog NEWS README"
@@ -25,7 +24,7 @@ src_configure() {
 		CXX="$(tc-getCXX)" \
 		CXXFLAGS="${CXXFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		--prefix=/usr
+		--prefix=/usr || die
 }
 
 src_install() {
diff --git a/app-text/ocrad/ocrad-0.25.ebuild b/app-text/ocrad/ocrad-0.27.ebuild
index 84c6fa87268e..2dba77c125e6 100644
--- a/app-text/ocrad/ocrad-0.25.ebuild
+++ b/app-text/ocrad/ocrad-0.27.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit unpacker toolchain-funcs
 
 DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
@@ -11,9 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
 
-RDEPEND=""
 DEPEND="$(unpacker_src_uri_depends)"
 
 DOCS="AUTHORS ChangeLog NEWS README"
@@ -25,7 +24,7 @@ src_configure() {
 		CXX="$(tc-getCXX)" \
 		CXXFLAGS="${CXXFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		--prefix=/usr
+		--prefix=/usr || die
 }
 
 src_install() {
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index 6c38c805d78c..4d4014ae777a 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -1,7 +1,4 @@
-AUX odt2txt-0.4-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e00773464bcb63408f3bc03968ad4e758420f508165f6d450bc25bb034f85317dd3a001e13d3694fa9fa3ad77606579c9d20 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762
 AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e00773464bcb63408f3bc03968ad4e758420f508165f6d450bc25bb034f85317dd3a001e13d3694fa9fa3ad77606579c9d20 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762
-DIST odt2txt-0.4.tar.gz 23997 BLAKE2B ffa2ac915c1c239cfa7a498fa1597a2462bc7ecd2fb08a90ab50f21a60dbde8abffa52f4b4c40591732f7d497f08774555b36d880214a7708f2c05b692a18908 SHA512 65642dccdb08408e34d484d78be9777aa374cdabbcadd2ab54f43df29db506b136f13e5af720b9b6b6cfdb8508e4fab44159302d35fc002a22979efabf69bfc4
 DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
-EBUILD odt2txt-0.4-r1.ebuild 726 BLAKE2B 03a906d6431d1dda4f291c6be4d961dd235bebda7cc72885292d74eb3ef6897ac68408709c0ac818668d5ce53c3a3a28833a150be5a7d05154644bed7c3f6e21 SHA512 832fffdd8c1f62f71215d804541fe0e041726acc8a1964f3733afad1ad30d08f7fc7075c28ea8d7764225c1dea7cd086343e1b40e345040b9d45594d1911d877
 EBUILD odt2txt-0.5.ebuild 734 BLAKE2B ced2ae39bbf6a14ac6a03fcd04c319ccf818fda352f10a08fdd73e5a56b1e4708bbe1a1deb710eeecba8383e9d830e7798efe26354786d0c0d7988f3ecdf5f69 SHA512 11bd6caddec71145458b7b28198677fc3617224dcd67ea2d675db3ba368fd670155deb0ff36e366fc63c6d951ce6eb9ab88c9d534db0361a5d7f07e39325e1b2
 MISC metadata.xml 167 BLAKE2B ee34aa7c86910531f97e3ba5ec71670012761b3523ddf4e0e1fccb2134b6ddaabdc9329c3b45d697b4f745a707dd513f6b71a8cd32fb840a6b0b5af774ac0015 SHA512 bb251ebe24a6b0c9ff8ee0298e1aa3653443fc97bf44ff71ff56b88b82c36696a5db75c19cb345a1852e6a455874c603efff97b15799d7e8a224124a312df8b8
diff --git a/app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch b/app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch
deleted file mode 100644
index 05957269888e..000000000000
--- a/app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur odt2txt-0.4/Makefile odt2txt-0.4/Makefile
---- odt2txt-0.4/Makefile	2008-06-23 23:32:28 +0400
-+++ odt2txt-0.4/Makefile	2010-05-24 15:39:16 +0400
-@@ -56,6 +56,9 @@
- 	CFLAGS += -I$(ZLIB_DIR)
- 	LIBS = $(ZLIB_DIR)/libz.a
- endif
-+ifeq ($(UNAME_S),Darwin)
-+	LIBS += -liconv
-+endif
- ifeq ($(UNAME_O),Cygwin)
- 	CFLAGS += -DICONV_CHAR="const char"
- 	LIBS += -liconv
-
diff --git a/app-text/odt2txt/odt2txt-0.4-r1.ebuild b/app-text/odt2txt/odt2txt-0.4-r1.ebuild
deleted file mode 100644
index 180584feabd5..000000000000
--- a/app-text/odt2txt/odt2txt-0.4-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A simple converter from OpenDocument Text to plain text"
-HOMEPAGE="http://stosberg.net/odt2txt/"
-SRC_URI="http://stosberg.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc64 sparc x86 ~x86-macos"
-IUSE=""
-
-RDEPEND="
-	!app-office/unoconv
-	sys-libs/zlib
-	virtual/libiconv
-"
-DEPEND="${RDEPEND}
-	sys-apps/groff
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-darwin_iconv.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr
-	doman odt2txt.1
-}
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index ff7002dd7e34..f8fe1b338331 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -10,5 +10,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d2d5e9ba5414ab931583f1e791ceae948e381e558f8337399e6b853573388041288d0f42d7c45e1f34befb8d65bfa8b03b7 SHA512 e483c08b6ea63e78dfc6351670f7bb6a55927f458c6e922c542981b25389168f32eb79e16554a41c102b19b7fa12489c0303beb35b839dfc9767b5ab9e5e1027
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r9.ebuild 4321 BLAKE2B e8a4a8eb03b705731391c64bc70b58d01a50c0bbe31dae8c4c80e1d0dd3f748eaac547017c757e61cad42a723cb5b8f728f6d90f56ef402ff6a78a77ad45af1d SHA512 3b5d249e45a4d4228f5f766e5bdd0209d7f37d835aced6de77f14303d687b293c48d3277fb09204f7fffe51c2efc6e011b486f54dac323ff0c127c29020ce042
+EBUILD openjade-1.3.2-r9.ebuild 4331 BLAKE2B 7e7bc7d9ce1ffa27b2b3f21fae14707d2f758f0f303eebf58a022befb6c3955d42108f445e96ecaa06132067138d54c5373789c83dd8355711da1a75d8619660 SHA512 258dc1dc0028dab40d89d32236ec60f49be09b5c9e5f1a443028dc791db55257814a70c78c970e2e5f98c90ae5d3f03acb9fe466a3f587c56b611de972241d72
 MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 04d8536f09b2..25df3d82d4e2 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -136,7 +136,7 @@ pkg_postinst() {
 		cat >> "${EROOT}"/etc/sgml/sgml-docbook.cat <<-EOF
 			CATALOG "${EPREFIX}/etc/sgml/${P}.cat"
 		EOF
-		eend
+		eend ${?}
 	fi
 	sgml-catalog-r1_pkg_postinst
 }
@@ -146,7 +146,7 @@ pkg_postrm() {
 		ebegin "Removing ${P}.cat from /etc/sgml/sgml-docbook.cat"
 		sed -i -e '/${P}/d' \
 			"${EROOT}"/etc/sgml/sgml-docbook.cat
-		eend
+		eend ${?}
 		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
 			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
 		fi
diff --git a/app-text/openlp/Manifest b/app-text/openlp/Manifest
index c00bf8bf60b6..36984a6e021f 100644
--- a/app-text/openlp/Manifest
+++ b/app-text/openlp/Manifest
@@ -1,4 +1,4 @@
 AUX OpenLP-2.4.2-disable-tests.patch 795 BLAKE2B 0741116f289c1ec368e401d66a798f87124971c069921813f71518155e78f04b6fa097686899c809f8cab84084ab1fde2141d30ba74e4f940c2bd2647069c939 SHA512 ac67c675a4793be0194ccdc522737de0fd2b7b008707c19cfb5dd4fd1c17e88a59c0d38cdfebb02272774da81dbf06ca8b897504abe3d37b5eeaf40b8d0c63f9
 DIST OpenLP-2.4.6.tar.gz 7303683 BLAKE2B 4e5b1a60c8eb8772cdecf453e8277a69cfb1cdd51ab6478425332b58c52319713dd411027a108113485ee7fdc4c770cb6f94a626b23c6cca82231311a62df08a SHA512 071ca83c6969c5281213dea5efe6dfc60a3d22b56534b93e2fd1f8e43760ba5cab851b6f4dca485a31254d2090e26ce640359cb9f9797d84b9509426061dfb7a
-EBUILD openlp-2.4.6.ebuild 1189 BLAKE2B c41779cce8f02f881eb73353e7a4f98807a96afbc0ca584be7487215b922fb811ea6020a65878c775b15062e560246cb0b40c081dd7c360cccaa071f07853a6a SHA512 7893daf5777bbb06809597d456e2fb7bee142072380d0460df3134e923a895a61eec8fc9c3f8f95574ada1e5ddcaadc041bde9f960b56e93ccd82457b7e21e5b
+EBUILD openlp-2.4.6.ebuild 1185 BLAKE2B cd62e36a992c7d34a884d3e7f72e0e640de2a542d03acf9437d1683d2fa8cce5d7784a47aede5bc70105e90070e12955a37a08005666f2f369def233e8b9a341 SHA512 2e2fb23162c1850a09df2d1f1ba61ff338702a63ad2bdb179f5a5980c5a0340c806cef721f4867257c5471966593118d4fca928cf8a7774991c79dd0b73d9861
 MISC metadata.xml 243 BLAKE2B d538a563cab2fafd5f221d51aca0be85d290aa5e64dd6a2a1411eedb557a4014acd040859a18e9021cb33c978ad2028f4bad6f127714f3f410513b8e5ea5a600 SHA512 c2e42eb6d3044abae1cccd4fc2bfdc28d15223e2f1c4c5f365be504eac8a2db9862465d92a2ae5acd2d121a5dada77fa4724e3c24cd981a40e462435dd61eed2
diff --git a/app-text/openlp/openlp-2.4.6.ebuild b/app-text/openlp/openlp-2.4.6.ebuild
index bd2519a0933b..49765ea89237 100644
--- a/app-text/openlp/openlp-2.4.6.ebuild
+++ b/app-text/openlp/openlp-2.4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 442fb4527df7..021d2059587a 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,5 +1,7 @@
 DIST paperwork-backend-1.2.4.tar.gz 59998 BLAKE2B e92bfbc311a38563fcb38511e8961c081b7c5d3a445ae9b18a80cb6848edbca2460a37b3f0c81d284a04974954cecbced0122a0bc66b3bbf10dc1bc1784b9969 SHA512 aba8cfd7abe9058e3433c64a96c1f79b451d8bdc661fa16ed7eb19f1b7e15efef024c94557082ec4d71c5adbaf268254af34f1eef8a35bad5e322409821ed5c4
 DIST paperwork-backend-1.3.0.tar.gz 62119 BLAKE2B 0dcb4c4d3c96cef8ab993449da46a01168be0b1ade8bb56eada723f046a0b82eb9b8b7c15b7706ab8b6be8e22166e2e01082e57d85a68c5ca919a081ad67fade SHA512 127b71db39a54533f520bb6969a36c48b54827f5720efb40728b133d4362901cbe4a20aa84337c1e8262338ae528ed502c23fedee703898a53e08b3bd5dfd7e0
-EBUILD paperwork-backend-1.2.4.ebuild 864 BLAKE2B a7934e6c7804dc0efc99770cdee56569950445d9c6e0e82386be6f3e8b344bfc4c4cfa8a3469c4160d18b3302fa4905965414192dd0b51127393755e72ae9a09 SHA512 4714544691f7c3f9ed2777863d83246e8be06834eebd41830b4513d432ae4b19a9a6d2595803f4f213591f55ca52c99d003fd035b36e6964970da641ce375b3f
-EBUILD paperwork-backend-1.3.0.ebuild 901 BLAKE2B 9e61d6c0f1c7f390fa2f3d8ee8da5a8a1d87e3df434cfbe52363de6a6c4d4beaeea6e69a6032c6e547d48621e97b77cc686dc1f6acc631b7ee844fdefd785083 SHA512 bece3bc2cfc96b05bac14236b8b19276e4e72a47d5e06e43411ebeba52da4307e3977ea477fe1b0d89ff260f6fcc628469eddf2a56fac0d3c49f65c128592111
+DIST paperwork-backend-1.3.1.tar.gz 62343 BLAKE2B 2d391f63b0eaa010695b3c11b35a6c89df9df9f60d45401d8bad711743037379cdb856d8f6b0ba9f7837ac272c2d6fcbe6f58808d8b5047dccf210fbd9a3c98c SHA512 e845ddd4d01be0f4d89e7e4a0a728d06b90b87a551dca3a88426d1ce6487bc000676c997df73d13662ea8f93aced8e8dee8d44ed4fa588a4c8bd514135610c35
+EBUILD paperwork-backend-1.2.4.ebuild 860 BLAKE2B 9af4aeee426196a1ac3c58a048eab28bd4985cd02b50ba10edf5602ba0b7527f2a9d69c9dd481a61947aff927a59ff7a14b23113db20b5545e3204041acb3e47 SHA512 a7a405fdea6c2d22171d198f0591d7dca12882a0d6bbcea4c4bead5409ab37dd4dc00ffa87ddbc3f9208503d9782a6016910e5af0b5f14c5629cc4e21b20735f
+EBUILD paperwork-backend-1.3.0.ebuild 897 BLAKE2B e6a5cf5d5e85ae4db6f1d1b29924304e402d98f9bbec59c8f6b44f1f5fe10f0309361a109dff2e7400e7eccfacd5d5fc8dd5db15e04cdd88a06dfabf6035702c SHA512 2d894868be601eb565a3f567b966f861c32700e1cbbe41622fa6188b52b6b357ac6d9b665c51eb3cb09a64dd133d4977d26a4adb0c6a9612223f0520a7880d38
+EBUILD paperwork-backend-1.3.1.ebuild 897 BLAKE2B cbeb60d6e3d34907e0dbbe7a6c0e705417ea4f8b82b428376498f14dfffc48e25c83a660e3b68127ce95ce90da2dcf645853827075a7a3a73bfdd81d4eb75ab8 SHA512 98eb204890258600173d9fdb0400593b2759d70948c75714bd69071cde2606cccb28d381a9880f972aa0222b81ec2477bbfcdc3da46f59b32bc2713f2a4925b0
 MISC metadata.xml 415 BLAKE2B 3d7bb0d432b982a1c482119ffedbff65e938944bb771729e1c56cb801fd5c26286eba701eb7dbf54d682b2fc975bb8bcad32f38b27f93d8ed3dd403469a416c5 SHA512 aeff8f2d4565711d077d1d2a5105f6c87cb99fd37eb1daf7dd1e919e51b5a1309c974a9e7459b35c3334041ad9776b1ae291fc08b7f2fc0bffe8bb360e2f74c6
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
index c2523e5983c4..0a832e42581e 100644
--- a/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
index 05cf31677eb0..c49aa73fbd51 100644
--- a/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
+++ b/app-text/paperwork-backend/paperwork-backend-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild
new file mode 100644
index 000000000000..3e203a399adb
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.3.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 52038f3c5b39..7442f6aa23c4 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,5 +1,7 @@
 DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
 DIST paperwork-1.3.0.tar.gz 4625505 BLAKE2B 866a043216dd603fa4700ac09b998c55735e6a5fe09fc3ab02aeb6b68cc62f239e86f8116d84ae1571235e7d9230cbe25bb878909e3f7e542164d5f76440f367 SHA512 6f0b7b88d62520dd69fe8ee6a033a8cde9e48ba093ce7ec77df26549df29e7a0d8eb2bfef9f74e41a722cbd1d2d7693efbffa5327838708c9af54c76634b967e
-EBUILD paperwork-1.2.4-r2.ebuild 968 BLAKE2B 6962a17308bf22f9b4d18a6e662191f66b19b05c7533063c510365cd7952aaaf3c639777a22948d6d30748b06764d176ad4c4cbfbbfb2124dce38a70ebedf0b8 SHA512 cf90898f2916cb980e310c9d65dd67ac80f92e8b358bae52944768c5979c020801601b956c1dd7c571a9bec60519fafc10afa11c1e0863c475136c14df7cad7d
-EBUILD paperwork-1.3.0.ebuild 949 BLAKE2B 18cc69d417d02fc58b7d0bdd16410f09aa9eb1f863814ba821885ce39f4e1e7f0b1da56625a424e0f29876e860f40918c53eeeacb1f3eaa57c87f3feb600ae38 SHA512 60d7f4cd8a0336f6ea5ecac0d419b7ed09f3b37e5abad3523875efa6bd2109a7e7c5312017068130d3a34e776ed99c0cba75fbae55727639d44144a6a373c00b
+DIST paperwork-1.3.1.tar.gz 4631298 BLAKE2B 9b111c524da29c6d547141a64ff39a5c50f18375484ae60702a2c7ce57a7be51b62621cf114ffbfa9c2175f9978225525f321449a4a9cad2570cd26dd956e496 SHA512 a0e6a95ebd0b5bfc290b8981488967bb5f2198ac5ec768f824ed487648d0dea6abc3ab8b8cfd8107eac1223a5ecb351a5362d9cbd7d5efccf5cb8c9a318490bc
+EBUILD paperwork-1.2.4-r2.ebuild 964 BLAKE2B 26bad1bec6654b90751de1a1b24475c4a593d1f6dcb4b25f6800e60c78d24883b9093e0406a947f779feeba4923c83eb8c583194949ac9215c20ba85f61fc928 SHA512 d88dfe16b81eea0fafb90f978d66f3ea12cef061c17df64a700740052ec2ff39c21837526a55c80ba483f32fa692e5502bc1699a2974861eae6cb8429050104e
+EBUILD paperwork-1.3.0.ebuild 945 BLAKE2B 1b25bd7f29f84816f4e9cc7196f464143570ad8b26beb913bd3666d50b2ed2d14f295b7c084a697e0a6c69fa4a484f7705a19b7b8c4223f3f90ea2dfc2fc7d33 SHA512 2e88695f2c1f9f7b62f2b269a00ad29e9edae5f8de5137d08f98726f22a4c54f3eb0ab6fa80d5fe211afe5cd4a0db888cb0bd6587215127fdd6ccc81d4113d08
+EBUILD paperwork-1.3.1.ebuild 945 BLAKE2B be6e1ee7f52e5792795dc479f596010b938e07d3a976537e8cc0ebc9b257949bc8284da97db69805e48797bb5860f4dbb85d0db6f6bef2ae70bfa0f320cf45d5 SHA512 575611d921e7043243f43c9e6cc918f09c317cc3c99eca0075d7371d11b4f169bbc4a8fcb855670948816a63d68333397c7a0162095c0c2aa8350e2fed115bd2
 MISC metadata.xml 784 BLAKE2B 3da20318f2e16ddb08ca7d5920ef57112986fdd0e0c4bfd4acdecb2aedc35123746533b391be47629985d38b2eeef75dae4eb08874526254316bd240ccee5117 SHA512 dad2a904fa5374ae34f4364bc1140d2b550783bdad137269748f614c20803f938ff51cf2cd3154f1bcd6247c3b38a54afda985811881b17515768095987c7950
diff --git a/app-text/paperwork/paperwork-1.2.4-r2.ebuild b/app-text/paperwork/paperwork-1.2.4-r2.ebuild
index 0003108d4289..79426a67db7d 100644
--- a/app-text/paperwork/paperwork-1.2.4-r2.ebuild
+++ b/app-text/paperwork/paperwork-1.2.4-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/paperwork/paperwork-1.3.0.ebuild b/app-text/paperwork/paperwork-1.3.0.ebuild
index bff55ca7a05e..95b004a9b3ec 100644
--- a/app-text/paperwork/paperwork-1.3.0.ebuild
+++ b/app-text/paperwork/paperwork-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/paperwork/paperwork-1.3.1.ebuild b/app-text/paperwork/paperwork-1.3.1.ebuild
new file mode 100644
index 000000000000..e734cbe20ef7
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.3.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	media-libs/libinsane
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/par/Manifest b/app-text/par/Manifest
index 949db588c8bb..02c9ae188b61 100644
--- a/app-text/par/Manifest
+++ b/app-text/par/Manifest
@@ -1,3 +1,3 @@
 DIST Par152.tar.gz 47999 BLAKE2B 0f76abde64d00d0511d9b0b0ce2a97b13917e08fe3bd1c69fa98ca19dff75a2b55a21f5eaa8bfd0660b6523336de6c29b2a58647196ff6af8c24ec156a426bb0 SHA512 f5a46da4b693e6a3d15ccd57e24ee9b0332ebfbcfc88da9ef0731e18932ba6f0adde7691a233264d6361e8903ff7e2263f71885a415c896dc4c45a0d05b1978e
-EBUILD par-1.52-r1.ebuild 730 BLAKE2B 45044dd56d7f12ca96a55209141a10abedaaffc0776e3bb7d68cbe90635771821e5f2df2da1aff67f3888f7032ee0e2af7ff7f02aaf79510094bfe948499439d SHA512 b72c83f06eba360ea9df2275775cf960f5ec718ccc9e59a9546d6db959479ab6e6d07424dba3998193673aa1ec73870d3997b12b1416e40b91ee04c6af66f082
+EBUILD par-1.52-r1.ebuild 722 BLAKE2B f9aca7e9d0a3d81f5971cfbaf0eb30477d87dca750d7ec2a5993178662f256ba5c7da487395690f3b1f437a503f3fdea7eef61b0e033a8d562e5ef14bd28cfaf SHA512 0625322d759184ca511567f15594cd44691699df0d0df985ddac874af5609e95c40bd42a522152d9223ded7432894cf94c7c4e3c75fc98ef464d92f026d01028
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/par/par-1.52-r1.ebuild b/app-text/par/par-1.52-r1.ebuild
index 7e6f9b7dcf6e..2f34f767653c 100644
--- a/app-text/par/par-1.52-r1.ebuild
+++ b/app-text/par/par-1.52-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="a paragraph reformatter, vaguely similar to fmt, but better"
 HOMEPAGE="http://www.nicemice.net/par/"
 SRC_URI="http://www.nicemice.net/par/${MY_P/./}.tar.gz"
 
-LICENSE="freedist"
+LICENSE="par"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
index ebb97d68c1c3..5af3273d5b0f 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 1333 BLAKE2B b827bdcc95526640f4437c77f09bc046b856a71f4f5c8f790bedf16d96799e50ffde20489ad745ea9198cfdebc5de5d8db3eadfa52cd3881b96749f1e0b1d509 SHA512 0f3fbb06a7a5ab6a92e31c79a0eed6e0566d53f86646b68a5b2786c81a3279faa7d5064b2fd8e83cce15bb7a85064b7768f24657c8829c7311130484389ece37
+EBUILD pastebinit-1.5.ebuild 1329 BLAKE2B 68f28d927b02c7d9bd042e7ddae1d43cbb260810b8d036ee49c8b8d3cb982ce3e5b8b39cd596a72ce098c42a886cd69a25f0cd6014433ff57d3439332d530df1 SHA512 f034cc3abf06d801684a08a8d3daaf53f36aa5a203934f3eea92085597403cace1e9083509ae917e29944f644d68170d4fe5a681335158ce9ee42ee33df1e07b
 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.ebuild
index c78123910daf..c707cb302333 100644
--- a/app-text/pastebinit/pastebinit-1.5.ebuild
+++ b/app-text/pastebinit/pastebinit-1.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="xml"
 
 inherit python-single-r1
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index 180107aeb42e..8ead126fedec 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -3,8 +3,10 @@ AUX pdf2djvu-0.9.12-poppler-0.76-2.patch 2083 BLAKE2B 6d861148705ca78b03dead9a7e
 AUX pdf2djvu-0.9.12-poppler-0.76-3.patch 1127 BLAKE2B 2556851d29ebe02e0e17b3e2fa733a533cbf98b61fa6a20b7fb9f9befe800d2ed0d5826b61d7aa1deade63277ef61173a6080782e0c33d5946fd1fd076c064fe SHA512 07ee2c2b8277d4c9ba90fc192885c299451b20558b3ee5c268030bf21e69e37c0e3f750b1158b9cb927d7504ee2458ced8fb662cb65ad2ecae76d14ae729ce10
 DIST pdf2djvu-0.9.11.tar.xz 291356 BLAKE2B 726d9132c43c7dabdecf1e6174a3f2627db7f6981b3ba1f280ea131272ea0fef38acdaaa0f78ab0c883dd2cd046017edac46bb10d91e10668a6e480322e465fb SHA512 7b47ff4cd3a49f3fa1fec08490a192725899307d9c2a75a65a21d36abcece2f308e56161ec4c4f77f32fbdedcc167520657cad2b06cf178335f7e2169b7ada82
 DIST pdf2djvu-0.9.12.tar.xz 295088 BLAKE2B 6dd8b04f089e464becd7923c96ac2ca35efc28412c1913270c8c85656b58a74a47777b1b5b932d29e3ee2ad4d75bc6bcb85b835e5aa7e9d9c6a0ef7b242b5c46 SHA512 2a3acd8efa682541f45a0650070c0260903dadbd49ac6d4560e2e5ee3c5a68a1310dcb9d170035ee8fec0e588171f2c402047b3d7dc4e7d4033abe95f2ebde74
+DIST pdf2djvu-0.9.15.tar.xz 296208 BLAKE2B 19a88e3d38c80b6a67b5c79b4c9d03b882385ffdf4602a8fcde189bee4d25a70ed8feac7a14310c159327b126607673df57985522b2eff5699e85193729b3529 SHA512 825b1a01ea4fdda8d2354ef5c0702f1deea44a30893bdab3d4292a31a812b093d682c94ad73b85b6bb7dca5d865cc0357e2911aa4edd1133737a14dd102ad34f
 DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
 EBUILD pdf2djvu-0.9.11.ebuild 1252 BLAKE2B b4ccf61994472843536d4997b853f7bb606b2a0c31369d7169831dfc21820a1224847ce690e91a8f08c4e9a8ad8ac9e6633d99a6cf523b7115b1f3da288f06b5 SHA512 c9f91f83aacabfd2ecb3b017ffcdf77fe10303fd0ffedc6edab762571e8b64437d8797bf5bafccaee1e7e07b997e03efda91401d68ec2e80f455a5b13fd91403
 EBUILD pdf2djvu-0.9.12.ebuild 1312 BLAKE2B ea4e4a3f5b9cc7beca80d68da7b8fd6569cbb4a727501c67d851982e02ed95ec0ce96f25f268ddd4d931aefd119c3d4c977cb29aa5e353dc1a5b8e15ff74091c SHA512 2926b385fea89fd0ef7b80b72791469abd3e6624da12d8f0b30c214a3079f8875f9b7dadb2f62b7fbb0c7ae0f9d32e87bdcef265de48e0154a4df9673e78aa25
+EBUILD pdf2djvu-0.9.15.ebuild 1265 BLAKE2B 81aa84f90d49053cd511d461a3f4b6e86f422cf13ade704d5f1a5d02cd948ca4c6fa981df9903168bb82eb701454328b60ff4e17a8931c766026777e218d25e7 SHA512 3b6b17c88e328cd725623ec4eed10ba2878b4594a287dfe51277ce26e635d96315e7d57eeca675c942259f745b5d3cd25156a9628f4416e6b727ac29e9373b27
 EBUILD pdf2djvu-0.9.8.ebuild 1252 BLAKE2B 7d80189ccf17851ceaf235b02235962385a265670d1c295ddc02a857a85370c8a3d259c26810181063be85a646de1f1e9965f6021cac8fdc4f8fc20d2a8177e0 SHA512 12d8383e20649dc250a0fc41875177a3f9bbe7f2bf209d8c0cdd4698da338c08720914acd5b0a9ae283e51ca9a839747773d644cc3d03c65562304648947a148
 MISC metadata.xml 351 BLAKE2B 68816123c075f603535faa42307dfc58066cc7c9db272b1f6004a9e0bba5d71d0a798b5b2fed9d4af704ed5145264b400f406c5b1185e3b759c97c0ccccc05d1 SHA512 98cfb584785e967dfd11dc82da694ccde0031609c28faca492d2384d6257020ebf8ac264dcb512129f5a681455ce3228b9f443aa2aa99197134ed7957901eb06
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild
new file mode 100644
index 000000000000..988a47a28bb8
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 toolchain-funcs flag-o-matic
+
+DESCRIPTION="A tool to create DjVu files from PDF files"
+HOMEPAGE="http://jwilk.net/software/pdf2djvu"
+SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+graphicsmagick nls openmp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/djvu-3.5.21:=
+	>=app-text/poppler-0.16.7:=
+	dev-libs/libxml2:=
+	dev-libs/libxslt:=
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/pstreams
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+REQUIRED_USE="test? ( graphicsmagick )"
+
+DOCS=(
+	doc/{changelog,credits,djvudigital,README}
+)
+
+PATCHES=(
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# bug 626874, poppler headers require C++11
+	append-cxxflags -std=c++11
+	default
+}
+
+src_configure() {
+	local openmp=--disable-openmp
+	use openmp && tc-has-openmp && openmp=--enable-openmp
+
+	econf \
+		${openmp} \
+		$(use_enable nls) \
+		$(use_with graphicsmagick)
+}
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
new file mode 100644
index 000000000000..f15b9ac61a7b
--- /dev/null
+++ b/app-text/pdfarranger/Manifest
@@ -0,0 +1,3 @@
+DIST pdfarranger-1.3.1.tar.gz 120834 BLAKE2B 5f429d479d130ec06e795c6cedc2aefa75f89b971b556901fc0bfba02038e36c4fd7b4233b5ce6d0dfb6252862176dc7b07192ab43e458090970a25648bb946e SHA512 6ac13447410477e9125da26adbf7123f7f5ffa25814a4c254247a5ff2d07eba6af0557eafb60b4c68ac5987c8e9e7888da21296fb6a74d31a3d0d763b1077918
+EBUILD pdfarranger-1.3.1.ebuild 724 BLAKE2B 82d6558ce5a0316ac34d86c99e583cc59e134cdf14353ab4c7f442ec8f398515f7a3a550db31add679d8c4daef1185a1883700116172babbe491334d4aa5eb81 SHA512 1a7d1fba8f89fdfbe2a7002ced5c831043ea2239bc4a0d707927256b4ad5b6f7b4fb6890cb0240231eddcd3b561e76ec08fdb4b0a4704ffd0ac249e39881d815
+MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/metadata.xml b/app-text/pdfarranger/metadata.xml
new file mode 100644
index 000000000000..b1f526c7da8b
--- /dev/null
+++ b/app-text/pdfarranger/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
+    A small python-gtk application, which helps the user to merge or split pdf documents
+    and rotate, crop and rearrange their pages using an interactive and intuitive graphical interface.
+    It is a frontend for pikepdf.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">jeromerobert/pdfarranger</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/pdfarranger/pdfarranger-1.3.1.ebuild b/app-text/pdfarranger/pdfarranger-1.3.1.ebuild
new file mode 100644
index 000000000000..c0ea69749fb1
--- /dev/null
+++ b/app-text/pdfarranger/pdfarranger-1.3.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
+HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
+SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pygobject[${PYTHON_USEDEP},cairo]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	app-text/poppler[introspection]"
+DEPEND="${RDEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 93901c804299..8aedf7fd836a 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,6 +1,6 @@
 DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
 DIST pdfminer-20191020.tar.gz 4168016 BLAKE2B 53658853f1c6948a3249b56769c4d9e28cfe8e977b8702c3802f2c3d64f5c9f1d228024a3cbc9a5f288f60c991b2738a7aa131021bdb47c1492c83f9682abb15 SHA512 6ba663440f0ac370742f3a300a55d5f810202d960253931dfdb109a30ce3f71cf3e3dd30af9d0f6257365972452813b4ebc2dbee8031e988b7efb9dac15075d4
-EBUILD pdfminer-20140328-r1.ebuild 715 BLAKE2B 456ace72af27b7e68cd4a4cf673bee75f0fd9a04f4ee89f4bfccc242e39e7b6735b15ffc19a9eae03842d5b5d9e87f4dcb9f1be106b2535c95f1b98632d850aa SHA512 9b33bdaaec3656ba185646a2e1a6efc54133a324af237f030c9afabeaea769fb9e781d55e6b53c06a1de7475822609d4a91aa72d154247aa4699322e17d7aeb3
-EBUILD pdfminer-20140328.ebuild 653 BLAKE2B 1d63ce17c37449a24b22705b0cf347f1b4306bd41b9c6a1d73060d55d75fdf577f9306fb043160a41dee1e7a65c9a561a56b0675d9ab0c492313b9093925ee30 SHA512 b5add0e6d898864ec0ee5ddbe8e73675bb044db37528bbaff1bd37d095b424280f76127f340f9462cf7e708b40cc70dbfada2c91660a51f327179494481ddfe0
-EBUILD pdfminer-20191020.ebuild 798 BLAKE2B 8bc3bed31690e0f702f1e5fc8c1660aededda7fddf9c722c3b3a32ec78724cfeb4e1f5419cd11b2165ee75342150529a9cc30fa707420b323e06f231ec2378c2 SHA512 6cf555251c4f10b024df7a61dacd0d8b3887b94627af5ef4ccb0e7e25c8260cde0849fe226e0fd70cf9b5e1f0d8ff15ca08113956e4b6e028a385eceb692f11e
+EBUILD pdfminer-20140328-r1.ebuild 710 BLAKE2B 62103b84cfba56ea6e3cf3b7d38c01f708e7d6df1c5df827bd81bf95924e3caba496d4eb8f1f466e678b66033f3ac9e8c7414949c8d0090a188de6ce67eded8c SHA512 d6b4c398ac6d565c866621f87c4b2b5a1de86a0137ad6dd68e460dfe28a2ca0f97cb5ce31c0e05a31db1e008e563700a29dd90688408bc962c298d61ba1f0c26
+EBUILD pdfminer-20140328.ebuild 645 BLAKE2B 7bee82ab92d12c4bf096549db1a9ec3284564a87b672d5255867737097b8f08e32e3e80f4c90f82d24d1a3df294959585fa86961ae3c72d3384e543bc0f86d6a SHA512 f1dabd40276a5b04f7410bdb3a26d9abb606c927b57a304f96169fe1647633aedd27b42b35fe4948ff915f295c8ce50d5483d2bf72f58d64aeff3b4d89aa6787
+EBUILD pdfminer-20191020.ebuild 793 BLAKE2B 3ebbc5cb905bb2ca09d9c2b78ee67e99bd0c8ad41ee8d8faac18bb3f12a5990761a04ac3e02f451581506df9ee44a91b69d2d020d7de817ac18030874b67e07f SHA512 b1f1a8364afcecc11a76e058f0a193cd8be4d251fe51da36604c945614186a2531a4d876fd706c76fe2060fb6b1b35e356df752fce4920815d7303dd9eedc390
 MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/pdfminer-20140328-r1.ebuild b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
index 8f6b64eac22e..91cf73768b9e 100644
--- a/app-text/pdfminer/pdfminer-20140328-r1.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/app-text/pdfminer/pdfminer-20140328.ebuild b/app-text/pdfminer/pdfminer-20140328.ebuild
index 3f0dbf03188c..eea303083e1b 100644
--- a/app-text/pdfminer/pdfminer-20140328.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/app-text/pdfminer/pdfminer-20191020.ebuild b/app-text/pdfminer/pdfminer-20191020.ebuild
index f15e077d5f14..679252239b1d 100644
--- a/app-text/pdfminer/pdfminer-20191020.ebuild
+++ b/app-text/pdfminer/pdfminer-20191020.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} pypy )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-text/pdfshuffler/Manifest b/app-text/pdfshuffler/Manifest
deleted file mode 100644
index 730d53e20a90..000000000000
--- a/app-text/pdfshuffler/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pdfshuffler-PyPDF2.patch 701 BLAKE2B a8ee95b415f121bf7c450a80e9d01c3349ed685146fd375d6aa10bcc7cc3684e1b75ad9986504aeb10d039e897750e7f304f32af8ebe12aaf24b5236f79fe62c SHA512 8496ebb9656e1f9e5ee99184a5d8cf0493ebacedc9f936804aedd784930457d39390b577683e77b6b5264ba50f7e2b202404c40ae426ba42b6f612d7ca193433
-DIST pdfshuffler-0.6.0.tar.gz 48071 BLAKE2B 8bcb513f1dd18cf9d6e17315a7a2ec5bbf5240176acd6deb6ec803900174a39927998210ab5e4aab9a7330821ce7d1ab266e1ae677e03fd51df305ceec9f5836 SHA512 e2563e9b5faf3ebac56f3840017ad9279a5e8e096c9f44ec053c617894910b1d0531457bc37d8fb9bc1db13ae25b94d55ca0b4ec26fbddeb9e51e6b4d75293fe
-EBUILD pdfshuffler-0.6.0-r1.ebuild 607 BLAKE2B ab262ec61c560f7906036f1ea9bfb64561ffe556912ad60b7579aa904c30e4710c17eb0cc5c9def4d28ad3e100010932ceff53d0eab4e8987a4aab8099de4472 SHA512 2f2ee48f1ede05060b806f2e1df4764f131a73be9a7a890cc4b861dc2b42a186d7af21fb1b6b64a0174c1797f00f21912ffb203e5afe6c23aa0b01075b32974c
-MISC metadata.xml 244 BLAKE2B 551d6af2c99b19299e4d0da0548b49dc84d448ee49adbcc4d1e49580c75369aa9accf1fba724bff40ebbe2a3834105564dfba6f1f60db27502de87291e7974ae SHA512 f509ae4acd33243de7c2f7035971fb1c720da3aea0dac715dc1ce8c7e3e8a0ac10ac4b2089c900df5438a22ce5a03cc8acd946ffa74e4b8140f3c27d38e71ea5
diff --git a/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch b/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch
deleted file mode 100644
index 8228c1765143..000000000000
--- a/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -r -U2 pdfshuffler-0.6.0.orig/pdfshuffler/pdfshuffler.py pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py
---- pdfshuffler-0.6.0.orig/pdfshuffler/pdfshuffler.py	2012-04-28 21:15:17.000000000 +0700
-+++ pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py	2015-01-11 02:10:02.952809411 +0600
-@@ -72,5 +72,13 @@
- 
- import poppler      #for the rendering of pdf pages
--from pyPdf import PdfFileWriter, PdfFileReader
-+
-+try:
-+    from PyPDF2 import PdfFileWriter, PdfFileReader
-+except ImportError:
-+    try:
-+        from pyPdf import PdfFileWriter, PdfFileReader
-+    except ImportError:
-+        print('Neither PyPDF2 nor pyPdf found')
-+        sys.exit(1)
- 
- from pdfshuffler_iconview import CellRendererImage
diff --git a/app-text/pdfshuffler/metadata.xml b/app-text/pdfshuffler/metadata.xml
deleted file mode 100644
index bab57cb53461..000000000000
--- a/app-text/pdfshuffler/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-	<remote-id type="sourceforge">pdfshuffler</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild b/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
deleted file mode 100644
index 23dcc1238d34..000000000000
--- a/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 xdg
-
-DESCRIPTION="GUI app that can merge or split pdfs and rotate, crop and rearrange their pages"
-HOMEPAGE="https://sourceforge.net/projects/pdfshuffler/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="|| ( dev-python/PyPDF2 dev-python/pyPdf )
-	dev-python/python-poppler"
-RDEPEND="${DEPEND}"
-
-DOCS=( ChangeLog README TODO AUTHORS )
-
-PATCHES=( "${FILESDIR}"/${PN}-PyPDF2.patch )
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 50854c73b49b..44cb7b5387ac 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -2,9 +2,9 @@ DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c
 DIST pelican-4.0.0.tar.gz 1314626 BLAKE2B 18924209949b43063416f2e2c6e22a5524a36bab79a801f7cc6953c0822beb1bd5b05e715f5bcdb7c4877aba8d7a62cf4276e8abc43406f3c6fd7af8ef0c7c2f SHA512 5d98f5e13e6dde6b27cc299f9fb166edec79efb3fc53b29567218e0d0ba164989ce51830029ec8359697bc039661f6b0ced8d4155105e29098c038840c97d253
 DIST pelican-4.0.1.tar.gz 1314716 BLAKE2B 1fbe01f5df7f1c730d7a45429369311f77c7e8e278a05cc037e03d8193dc2ae9075ee1346fea072a08ee5d73baf9aaed8c1f8f210fd4331754accca9ebffa4da SHA512 26f91046124bb92de6fa31d17ab89f743cf9408c15b9b259875e2378342133313368418da083d1d4abc5de0537806a9dede327719c8fcf89d135805c47618a4a
 DIST pelican-4.1.2.tar.gz 1329126 BLAKE2B ec6067b9df2bf37877ca23602228b2eff035221ef16ed1f185e2806fd661c8b733603506f3f1d9516422bd8009a0712f726d40559a39b0d100224ee56c3e706c SHA512 9a20e3a16e2caa15b6a47281d4acd6ada344292f011d4fd30c6ac786aebbccffd9cd0b2fd80471d3a383d4cb0ba779c51653705572760e62f6c2d3d49a862a67
-EBUILD pelican-3.7.1.ebuild 1495 BLAKE2B f0175e996668d866a2e08a5b9510ea56069fe9a6f793a657dbce68ae4d61c8a3e8b9d4d6d55a00d13f6ef10a8dd4b533e095e8f1addfbe220252630dd8952bb0 SHA512 6bf42ec5e3df1c2cce141ef5696b143fd68b095208b738230876b7d7010f02d6b20d1669eb2c5ae5f0e1c08673865ff326074cf2b6fb9f13f1d6fa016b62442f
-EBUILD pelican-4.0.0.ebuild 1486 BLAKE2B f4359af3f68b0e9e05d7238d3b3cf4efe58bd494b059f13d8e0af92d65f55bbb924b9cb672fcc4651e7dca101051bca43073353895cd6a2501f3d91e3c80a20a SHA512 b87631cf9a40de695173e114cf3fc347a8d7ea876174476b997c7ae9e49d2c7d5906ad90e25c72af401d236e62ee3d653bf88029ca3ab333e743bd3ef82f7a0a
-EBUILD pelican-4.0.1.ebuild 1486 BLAKE2B b1f81ae6d9924380f7181c0af735e3436fc727a14f1a7604e61bf70e7698b73865801cc95bcab17500f91a52150b1416e1a019bc2742423a9144176fc0ae5f32 SHA512 676cb7c561ddd1770da789dffa866aea2725b3eb3c9c0436758aad7c909c8d1fe26b8c7d6a739e8cbcdf3400444d0c217c46ccf2973243ad48b54cebf14c0843
-EBUILD pelican-4.1.2.ebuild 1486 BLAKE2B b1f81ae6d9924380f7181c0af735e3436fc727a14f1a7604e61bf70e7698b73865801cc95bcab17500f91a52150b1416e1a019bc2742423a9144176fc0ae5f32 SHA512 676cb7c561ddd1770da789dffa866aea2725b3eb3c9c0436758aad7c909c8d1fe26b8c7d6a739e8cbcdf3400444d0c217c46ccf2973243ad48b54cebf14c0843
-EBUILD pelican-9999.ebuild 1545 BLAKE2B 7571deb70118ea2764b71544a3adcbf863be67713a68f5a71dd336397c69fcc9bb0c285dc7ea7a533f72547be398fc5dc43c7440348b1a386e55a583c4d55d6f SHA512 f7f9c00e6905be764bd93a2612460a9db99d5e57c2bbb8d3df5f4164085ce1455a41ff42541e24ad6cd5c1afcc3bb5d38761e3362ac7f4f9d4fdd3287ec3670e
+EBUILD pelican-3.7.1.ebuild 1491 BLAKE2B 7a105324f0b3ed240446f4460956b2c915315afb3e64e66e2ba07bdad32c9be86cc15af57d0ea56dcab50ee8326aea434baee731a0be4d6bf1d7ee22ee1853cf SHA512 ca199078198a4c2076c7025ff6834b8a2546b238bf43a8b9c5e526e0a067c65f511a451528fe07b67670a98e833ea2912364b705b61cde8f8b7ba3e4ef87af7a
+EBUILD pelican-4.0.0.ebuild 1482 BLAKE2B 63fecab605b23f6c93bd4d72204402677b316d8c3843d135fd2c1bf288eeaa61b23727a2b53b88e5d5f6d6eae5bc3f7786a0e0a167c6346ddc771c7811e8b1ac SHA512 0851b09c5562df33d27633911182d25ce4fd00d096ce47448793c9f09ca97a75dbb14890f457123da011e0ce46f09817f992eff33a7b6bd5b440dc1db4ef0621
+EBUILD pelican-4.0.1.ebuild 1482 BLAKE2B 3ff476b565226836374e14b746ac04989d1c13c9138cfcba5d7aa6dbe542efcabbdcbd188f525a817092f137d86054bde3744a861cfee0b0d679b15f5afb0abb SHA512 d34aad7617897c738b43f6dbda68cdd8c3a5943ad685b4b213217f9f3ed74c94bd12263150573a58f2bb5c98c6bb0a28cc5a867bc2455dbb07b8a021db6cb3cb
+EBUILD pelican-4.1.2.ebuild 1482 BLAKE2B 3ff476b565226836374e14b746ac04989d1c13c9138cfcba5d7aa6dbe542efcabbdcbd188f525a817092f137d86054bde3744a861cfee0b0d679b15f5afb0abb SHA512 d34aad7617897c738b43f6dbda68cdd8c3a5943ad685b4b213217f9f3ed74c94bd12263150573a58f2bb5c98c6bb0a28cc5a867bc2455dbb07b8a021db6cb3cb
+EBUILD pelican-9999.ebuild 1541 BLAKE2B 2ade3e11c773439efe530048ef0d5c07b97f9afa73ade817cb87aa6d6c84132060b732516234c4a8b7f7eaa1fc419263c3c8c3933969c21b494d6a02223ea7af SHA512 f8e7c9d488ad8e1dc126c3bcd9172984128de164a1f62c4a720cd32262d4ec32587f3c3b0de59f1e6fc92fd300ae447c6d490399870b253d8a01e055bb72b540
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
index ba77960ce0dc..362df26c4ce9 100644
--- a/app-text/pelican/pelican-3.7.1.ebuild
+++ b/app-text/pelican/pelican-3.7.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-4.0.0.ebuild b/app-text/pelican/pelican-4.0.0.ebuild
index fe8645d7688c..a83f2587e5d4 100644
--- a/app-text/pelican/pelican-4.0.0.ebuild
+++ b/app-text/pelican/pelican-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-4.0.1.ebuild b/app-text/pelican/pelican-4.0.1.ebuild
index c165da40c9a6..b57181167f87 100644
--- a/app-text/pelican/pelican-4.0.1.ebuild
+++ b/app-text/pelican/pelican-4.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-4.1.2.ebuild b/app-text/pelican/pelican-4.1.2.ebuild
index c165da40c9a6..b57181167f87 100644
--- a/app-text/pelican/pelican-4.1.2.ebuild
+++ b/app-text/pelican/pelican-4.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
index 7b7d57344621..ad1092526576 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index f4766dc5aed4..6b44413ed195 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,9 @@
 AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
 AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
-DIST po4a-0.55.tar.gz 2892158 BLAKE2B 606236a4bc143d4a5cc003f7dfaf59f605017478fc7ab3fc66af5eed078a8bb0744690b7191cd2ee0b795229e766145ed47545484e3d20e6a14ae1ac0981772a SHA512 95f7408caf2c603f2ea86d8439e99c39be72dca019361106190bd6e1f95679c6627280bcd02a2d9c843071a6ce96747bf5b4d85c9051344b08f32deade2cb599
 DIST po4a-0.56.tar.gz 2994792 BLAKE2B c95905c70d7e1e24367fb128d9096996d026f58dd4cd7fa77f19c6c9b8607cb4101a1a024773d2fd383e905a008e1ce4f0c019a73003168a90cb23328ac1d984 SHA512 4fc1ca5743471577d9e8bd0b80285b9dbd83b964f8e828472787a6deaf8b8388bb7f96e68afab4119c1f5488fe371d3b1fa94b101204a59228d1cc2f0878f3c1
+DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
 EBUILD po4a-0.47-r1.ebuild 1656 BLAKE2B 60e1a75c84bed91e7bb4728cce7d848835dd819d1e40297137212bb03aab6fb1fc88e1698e7b19ceb0494eda04c97fc5a972726813d7d48e9eda3074e4fbc732 SHA512 d1edabfdeb9ebeb220029b42bb9ef605791215f89b35a6c26d6d8a8ce5025ea710e46030affce56cf356cb63cfada034055e3715a22591c9a9e894c306ae338a
-EBUILD po4a-0.55.ebuild 1321 BLAKE2B 3e38d760c75f676e1686c59650a32676f9aeaa0c25c31a190be635a55a3dead22105ea3e65d10cc0935e8c419f773e73a7eecc06048b44621ea4f5adedd24386 SHA512 4c8f216c0a2365e8999bcf58cc67c945b5a6f9ede3c4fe554fe30a5d8f3723c6cd513aa809b16174a519acab6de17903a3173963bb1e32f094a8269492594c6c
 EBUILD po4a-0.56.ebuild 1324 BLAKE2B b4af81c57aab554457df323e68b1042f3a9d02d2d4353743b71addaa8ba1d14e8a6ac57822927f2a345e07f8daac775acfbdbac812bede7e4c5da98e2f2dccf4 SHA512 66ff950db06217a91de27665594fd2cdc7b8a7f0e295a6fd0f436065ce48029ca79ec91980ed7b186c347cdfb21c9703fd31af0a26b0aa5fed54042f9a6fccf7
+EBUILD po4a-0.57.ebuild 1327 BLAKE2B ce5f7c5865ed797cabf0702eb9f0e45816e39dff500f9b9da7ad2ded060481f10e86c3734b08304d656595b5b69754930bdb5fdfd39342475f55c9ae811be897 SHA512 a002b5fabfac6fc815119326beb40325c8535ce413a6667b2dd7a5714c3dc7f1abbc8d5e9fcca7d09a1315300fa3eda6ca817603348c15761f396865354c35ea
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.55.ebuild b/app-text/po4a/po4a-0.57.ebuild
index 1ed363d2ffee..8c24e87cabce 100644
--- a/app-text/po4a/po4a-0.55.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
+EAPI="7"
+PLOCALES="af ar ca cs da de eo es et eu fr hr hu id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
 
 inherit perl-module l10n
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 49e8d5fb109c..55ebce74fd04 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,13 +2,12 @@ AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
-AUX poppler-0.78.0-respect-cflags.patch 1140 BLAKE2B 59e87b6957a5aff35cf6ebc8092c0552b8ece31e2fc73765789ac73dc5ac01ba69928f9308de9660ba3cf6b38b921ca341dcf6c5bce1d360b1bcf1a4005e4115 SHA512 713f7a3e3e2ae950fd6406ed076d4e6d2079619e40f00de7ec7d7df587df520373b923d343494902da454423adf29174f1ced11cb874a12851febfc1860988f4
 AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
-DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
 DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
 DIST poppler-0.83.0.tar.xz 1555456 BLAKE2B 4ab24a85e879d0ddbf24cf7bab5b1da7c15fc026e88b4076dc2b8cd34d69a5bcc0113df20fabda6915afea880480613ba34be6e23b5b0d79a3c6197c92af7853 SHA512 bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713
-EBUILD poppler-0.79.0-r1.ebuild 3496 BLAKE2B 71c664164c00a554aa7e524b8e56e32d5d6e05ff68ec88bb4ca45e474cde45b20b653d101c8cafa5467875c1a31ca8184ec956efa278f07e762c2b74a3569449 SHA512 91aad9e8ef1648b5207cf9e20ef6a6475305a39b375109196fcbaed1078ca6fac67f5c70e0ca89668a8d46d9e7d234a39b48d6e5c83b6a4900804393e68ec9fa
-EBUILD poppler-0.82.0.ebuild 3357 BLAKE2B 2b5fe4322f1fb52674f9f7f8ec9678380267bc913f0140c808f661e45db16736d3a2623c8fd6f92c11d098426d979505c1ff613115960d14be7b88653bcf44d3 SHA512 143641efa624b2af333c7aaece777c767aeaff5a143aa20414c0900de4db5e7aa2c5531feb043363bb446371196704d69332414cf6b3948cf9ecd068ca0b2e82
-EBUILD poppler-0.83.0.ebuild 3367 BLAKE2B bc2dd304b48d9a4a0b9ae7d7646339b723ffd1388b2d5fa05ce0d29575e5675bdab0ab7f4b7a016d8b40965ec3f96d40745acb471ebcfc4368e08796c1f0c967 SHA512 f53d290e73b9c7c5feecd1822fc8267bf81c2d98f1fb6e1a2f7c83779aeef6b0a8972d725e1dcef73a27596e98dd03d78429a3183e1ab46f3acfba6c085f8e71
-EBUILD poppler-9999.ebuild 3367 BLAKE2B da58dbc5f9cb52c60dadc3f9c9a004338bfdcb4595a2b649952bf04a4b3aa0c13a11a4631d90da2d2f74a9548dc4d0b5bfff8f788be89b0c797a790c32a34147 SHA512 88b21996d1ae6152fec6033574d5d3bb1bee8058d13e4cb2f3f7af282a1f0f99065d7b5fd64b98b19590b5c598ce85bbe03c0db50b057fd4f0c700f9f1ea0e6c
+DIST poppler-0.84.0.tar.xz 1561236 BLAKE2B eb85b2d0aac2d736ffa74a11df4fbdf28841ded8fec3d32aa92d22f0d1c51aae9d3deacc8cbdd7dbf95906cf46b01f1bca7aa8af99c7fe209e4169478a778e72 SHA512 e00aca76b4909621b79ec68374529396ddba756af5d60d86750095dfebbabe5b576aa7c873c3fcfabaff28c89e3e37e826d4a0fac356d76ef966500514a772e7
+EBUILD poppler-0.82.0.ebuild 3326 BLAKE2B fb2829f8b4d551f99a3aac93c5e5305aa2034bad095e793d01d6148b33af6f8b29d54a59d5c9bcdf2daf72e2f3c4f4edaec08eca5de5c383f2bcf60ce754dbbe SHA512 6a7e8fb84d66e340ab6ac80e04c9befb6e384a5c957e203f8b21ee3b4cb2159d3370a38c917b9bf4abb1fc610d4c93fdaed2fb4d79ec616f31fa49f9ec8d2199
+EBUILD poppler-0.83.0.ebuild 3337 BLAKE2B c71dbea37c103190528ba3e6f2cf0fdfb4ce53c566335b86b3585f28e31b17ffe801155f55a8be29e044e1bb86ddcd3efd669c6caaef6631ee411128a94f26e5 SHA512 4fbfb1bff3c4711c2c748eaa5f82982bf9a7686ac4ebb1ad41abd41867072816c3c858ae55b1ac8e1a555b53867b6cd3784762074bd33a5ddded56afc1ab1251
+EBUILD poppler-0.84.0.ebuild 3337 BLAKE2B 1bbd89a894f18c11bbf6a8f6c3cd7e66b8ba844af8109861f88618a0787b71919710bb5e5cea754d0424788c89e2411a19838201bc521a6f0bf956c00af358b4 SHA512 567e761c4a7b73edf02cc574fa2866f0ae0f461ac232d00fbebebe7f9a04650f1f7aeaa84584e1617fcb416bfde623f99314ebb207eeeaec1087d053e9b94849
+EBUILD poppler-9999.ebuild 3337 BLAKE2B 1bbd89a894f18c11bbf6a8f6c3cd7e66b8ba844af8109861f88618a0787b71919710bb5e5cea754d0424788c89e2411a19838201bc521a6f0bf956c00af358b4 SHA512 567e761c4a7b73edf02cc574fa2866f0ae0f461ac232d00fbebebe7f9a04650f1f7aeaa84584e1617fcb416bfde623f99314ebb207eeeaec1087d053e9b94849
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch
deleted file mode 100644
index 137af0dedc4f..000000000000
--- a/app-text/poppler/files/poppler-0.78.0-respect-cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- poppler-0.78.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.78.0/cmake/modules/PopplerMacros.cmake
-@@ -145,28 +145,6 @@
-   endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
- 
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
--  set(_warn "-Wall -Wextra -Wpedantic")
--  set(_warn "${_warn} -Wno-unused-parameter")
--  set(_warn "${_warn} -Wcast-align")
--  set(_warn "${_warn} -Wformat-security")
--  set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wmissing-format-attribute")
--  set(_warn "${_warn} -Wnon-virtual-dtor")
--  set(_warn "${_warn} -Woverloaded-virtual")
--  set(_warn "${_warn} -Wmissing-declarations")
--  set(_warn "${_warn} -Wundef")
--  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
--  set(_warn "${_warn} -Wshadow")
--
--  # set extra warnings
--  set(_warnx "${_warnx} -Wconversion")
--
--  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
--  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--endif()
--
- if(CMAKE_C_COMPILER MATCHES "icc")
-   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
diff --git a/app-text/poppler/poppler-0.82.0.ebuild b/app-text/poppler/poppler-0.82.0.ebuild
index a0426000e924..1ad433185f4c 100644
--- a/app-text/poppler/poppler-0.82.0.ebuild
+++ b/app-text/poppler/poppler-0.82.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/92"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
 		-DENABLE_CMS=$(usex lcms lcms2 none)
 		-DWITH_NSS3=$(usex nss)
 		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# live version doesn't provide html documentation
 	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
diff --git a/app-text/poppler/poppler-0.83.0.ebuild b/app-text/poppler/poppler-0.83.0.ebuild
index 33ffc42f9cac..4e79ad3d70dc 100644
--- a/app-text/poppler/poppler-0.83.0.ebuild
+++ b/app-text/poppler/poppler-0.83.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
 		-DENABLE_CMS=$(usex lcms lcms2 none)
 		-DWITH_NSS3=$(usex nss)
 		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# live version doesn't provide html documentation
 	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
diff --git a/app-text/poppler/poppler-0.79.0-r1.ebuild b/app-text/poppler/poppler-0.84.0.ebuild
index 7043b939f9bb..dc4ab8ebb00d 100644
--- a/app-text/poppler/poppler-0.79.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.84.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2005-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/89"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/94"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -59,13 +59,13 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 PATCHES=(
 	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
@@ -79,9 +79,6 @@ src_prepare() {
 	else
 		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
 	fi
-
-	# we need to up the C++ version, bug #622526, #643278
-	append-cxxflags -std=c++11
 }
 
 src_configure() {
@@ -94,8 +91,6 @@ src_configure() {
 		-DENABLE_ZLIB=ON
 		-DENABLE_ZLIB_UNCOMPRESS=OFF
 		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
 		-DUSE_FLOAT=OFF
 		-DWITH_Cairo=$(usex cairo)
 		-DENABLE_LIBCURL=$(usex curl)
@@ -106,17 +101,17 @@ src_configure() {
 		-DENABLE_CMS=$(usex lcms lcms2 none)
 		-DWITH_NSS3=$(usex nss)
 		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# live version doesn't provide html documentation
 	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index a5c4e4a699c8..dc4ab8ebb00d 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/92"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/94"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Clang doesn't grok this flag, the configure nicely tests that, but
 	# cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
 		-DENABLE_CMS=$(usex lcms lcms2 none)
 		-DWITH_NSS3=$(usex nss)
 		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
+		$(cmake_use_find_package qt5 Qt5Core)
 		-DWITH_TIFF=$(usex tiff)
 		-DENABLE_UTILS=$(usex utils)
 	)
 	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	# live version doesn't provide html documentation
 	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 74d4822fa9ae..98af5f6cf007 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,5 +1,5 @@
 DIST pytextile-2.3.3.tar.gz 42277 BLAKE2B a6e6e1d96695f3ada03f5da9bd8bd19b99da345d83c62b1d4f2e765303dfbbbee072da4611f1b29b46d28ed334373c809117940ff0c1238dea3b12fb9076656c SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60
 DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
-EBUILD pytextile-2.3.3.ebuild 1045 BLAKE2B 04606f9480d8a81b41e4f061c983823f3573d016396ccc093c77aac3c889d9f42e55e0f100daf426c614f015a924834fe666c47078141d5cab0ef063edefc7cf SHA512 010e4c15c02a4f0dce016bf44b711f82d44148bc90ea4b298a49f8a37ecc3278a2c2e103f52edf0f828f2f0c476bac862767601d7a4284fdde005979ed2727e4
-EBUILD pytextile-3.0.3.ebuild 1043 BLAKE2B 0b8584b151b19242cfa11af7c178ee2a5a0a84817ff8d61044a1e82c306dfa4416ec22d25bf0136c746d4e743adb7abdb690d6a411df4a508d7ecb8eb67a9a42 SHA512 025df2eac1817b07e8d1a0509881d8ee78691e389511e7f9e8e55eb36395a7139b538274d45c546def30532945a5f60ae9e0a80bd8be0a23e31e32a27b0e0da3
+EBUILD pytextile-2.3.3.ebuild 1036 BLAKE2B ba614ffe9b9de018cf7ec983fa4cac0dc46b200827bc7223a6a47079b2668a3b00f1bbfa70147a09c5f2648b09043710ee7ea264ddbca6769074e6f02e8c2e67 SHA512 bf00544133faac82bb8c1d24a6195385931fc8ec342b7977c276cb8b4f34cc964604aed99205f4f98744ea64193aed82c66915c1e12f809065491883fbda523a
+EBUILD pytextile-3.0.3.ebuild 1034 BLAKE2B 6bdc043818d56c668682de698a22c92178fce6e4c1fe91159aca4e4432c4847df6d32565478b8a3677e29ea4d36f5a80d9914f7073bb127dc0afcbf5e44a021c SHA512 4bb47e18f850d3c2d661d84aec75fba354f0be7078eae755951df4c6cbbda3715e2f5a2d55c9698be4ac937c6ff4c4109ae6c6fd15cbf631c5963908d2086f2c
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/pytextile-2.3.3.ebuild b/app-text/pytextile/pytextile-2.3.3.ebuild
index 4c257b78c7e3..2226c9abb454 100644
--- a/app-text/pytextile/pytextile-2.3.3.ebuild
+++ b/app-text/pytextile/pytextile-2.3.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/app-text/pytextile/pytextile-3.0.3.ebuild b/app-text/pytextile/pytextile-3.0.3.ebuild
index 06069bbdd49c..8ea0f74d9ac3 100644
--- a/app-text/pytextile/pytextile-3.0.3.ebuild
+++ b/app-text/pytextile/pytextile-3.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} pypy )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 23abe82da778..531bda1a7ea4 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,7 +1,5 @@
 DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
-DIST qpdfview-0.4.18_pre3.tar.gz 747794 BLAKE2B 08420a350ae6f8bba65efe2a930a8941a00182900e33266a03d9b6ded4b8ba7ac446de9ed8095f8876dfd3ecfb26b20cc146c82d9c9228fd5c136ad36d749061 SHA512 c72f766b0ffb175e0577f08975490b985e859cb41ccf1d6bcdb618664b96b3c4d0fe4ffab2e493ac20b87b85aa658f3beb5b0d430d21deae78df4c503649f1c0
-DIST qpdfview-0.4.18_pre4.tar.gz 782305 BLAKE2B 0e79a30e9774a1afb7f38bd932e8e1b2a7930acca217b7ac485f4857211449f5a8f902706b4638023667002d2f98fc116a180b2ec0219a360fe8c3025023cc39 SHA512 24431a27c279c290ce95a7db52f87e6cade0683dab53a3c494823020a7df9150919af31f20f63ff4c7337f5548b3e7252df0d8a6043a8c50ebb18e41f387838d
+DIST qpdfview-0.4.18.tar.gz 786577 BLAKE2B 07ef444ba39435578481e549fcbbd2d97362c6bda3092a17f1daa8b8437febf50cd2f145cd5e80cc1be565c5a658e85a428314a1bcd2a5a38efce0830f1cffba SHA512 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66
 EBUILD qpdfview-0.4.16.ebuild 2137 BLAKE2B d0ce86840680b56afd8b925b820d0641a0754776d4054b469c691f5da10db072febd5b04b34b80394bc08f47d6b5b7b58390332c30d445116528cbc238fe2144 SHA512 2d89740ee569287794935eb369c8a035a3ceeceb3e428e740f0b0adbe808f532a336dae9739c789bd4ee71b1a7f87af222ce91c19028bb179275184607489549
-EBUILD qpdfview-0.4.18_pre3-r1.ebuild 2392 BLAKE2B 9b8d9bf46515c2e77b85fb0dbf6bbcc183c9bf8e2c0b0c837bb1442634885770806285c35094e91439da58482176a77deea8a0addbd9842804509b1aea3fd9bb SHA512 930ef2979ac45d7beb67b8da2074d476c393a00e0054e0a045ea14b62825688d53b19047faa57ac12ed155b46bfc6833fbdc93eddba5ecd9bcf7ac63dce707fe
-EBUILD qpdfview-0.4.18_pre4.ebuild 2399 BLAKE2B cd8c12940af69772fcf9ac6271f18488968ea10165ed1a09fe4427357115d0054e79b629f98d3823ebf111991429b6726e3662808b151c3aaa47ef4f36bea3bb SHA512 c1f17e9694ec8acd3002451cdbe248bbb8ec696c66ded602ce66a784eb37aa8437743dcfefe8099877c2a3bafdda64557ec2ac186163faee87ec4fdf7efb21a7
+EBUILD qpdfview-0.4.18.ebuild 2202 BLAKE2B 801dcc3a3ea854977a0138aa105dd3e3f54600d82b1fcad2ecae1d7b5e9f64cee66aeddee242d407ca214b827bf526432009454661d7ddcc38bc997276acaa31 SHA512 414890b97913c58dfb8d6ccde7103fbcec6d23b686bf0d65e4eee7f3811e64f4ef136e5b40a939e868db856f35585cf6c1d017d9fb0d7d15d8002dfb5803c4a0
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild b/app-text/qpdfview/qpdfview-0.4.18.ebuild
index cf650275d2a4..0f096fb17dc3 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_pre4.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
+EAPI=7
 
-inherit l10n qmake-utils xdg-utils gnome2-utils
+PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
+inherit l10n qmake-utils xdg
 
 DESCRIPTION="A tabbed document viewer"
 HOMEPAGE="https://launchpad.net/qpdfview"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -17,6 +17,10 @@ IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
 
 REQUIRED_USE="?? ( fitz pdf )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 RDEPEND="
 	cups? ( net-print/cups )
 	djvu? ( app-text/djvu )
@@ -34,15 +38,14 @@ RDEPEND="
 	svg? ( dev-qt/qtsvg:5 )
 	!svg? ( virtual/freedesktop-icon-theme )
 	synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES CONTRIBUTORS README TODO )
 
 src_prepare() {
-	local mylrelease="$(qt5_get_bindir)"/lrelease
+	default
 
+	local mylrelease="$(qt5_get_bindir)"/lrelease
 	prepare_locale() {
 		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
 	}
@@ -57,8 +60,6 @@ src_prepare() {
 
 	# adapt for prefix
 	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-
-	default
 }
 
 src_configure() {
@@ -82,15 +83,3 @@ src_install() {
 	emake INSTALL_ROOT="${D}" install
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild
deleted file mode 100644
index a6c1da2e0daa..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.18_pre3-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
-
-inherit l10n qmake-utils xdg-utils gnome2-utils
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="https://launchpad.net/qpdfview"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-RDEPEND="
-	cups? ( net-print/cups )
-	djvu? ( app-text/djvu )
-	fitz? ( >=app-text/mupdf-1.7:= )
-	postscript? ( app-text/libspectre )
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5[cups?]
-	dev-qt/qtwidgets:5
-	dbus? ( dev-qt/qtdbus:5 )
-	pdf? ( >=app-text/poppler-0.35[qt5]
-		dev-qt/qtxml:5 )
-	sqlite? ( dev-qt/qtsql:5[sqlite] )
-	svg? ( dev-qt/qtsvg:5 )
-	!svg? ( virtual/freedesktop-icon-theme )
-	synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-src_prepare() {
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-
-	prepare_locale() {
-		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
-	}
-
-	rm_help() {
-		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
-	}
-
-	l10n_find_plocales_changes translations ${PN}_ .ts
-	l10n_for_each_locale_do prepare_locale
-	l10n_for_each_disabled_locale_do rm_help
-
-	# adapt for prefix
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-
-	default
-}
-
-src_configure() {
-	local myconfig=() i=
-	for i in cups dbus djvu pdf svg synctex; do
-		use ${i} || myconfig+=(without_${i})
-	done
-	use fitz && myconfig+=(with_fitz)
-	use postscript || myconfig+=(without_ps)
-	use sqlite || myconfig+=(without_sql)
-
-	local myqmakeargs=(
-		qpdfview.pro
-		CONFIG+="${myconfig[@]}"
-		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
index 4a13801aefa1..be37ec21f94e 100644
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@@ -1,3 +1,3 @@
 DIST restview-2.9.2.tar.gz 47181 BLAKE2B 6812e39eb2f830cedacc359fe24988191fc6c7b46b4ddc7005e6e6ee3e52d6998b4b99687892842710154eb2bceb22dc161986f0c8f5f0d1910733226084b0b2 SHA512 4b8627248097368a06fba5dba8994d349b96e605ebde0965a9100c213d9c8bb9320e6ff33a93ce40d80a6b5f3150e4094e2824b5ef5b4757d1e3bd39399a8e0c
-EBUILD restview-2.9.2.ebuild 748 BLAKE2B 89961f83baa7c8f1089741791f0626d258c3bd5b5aa5cc735beed8a7cbf195b17eff4c261f64f076ff1af58acdc5a3e2af66994574548b5510ae2cd64217445d SHA512 b3c15b7fe9d97177eaa3524d75881aefe41fff7cdaf912ba739b1d3f9ce3f649565ba789637f06f40356d6a1a1d8ab9846be3089b4c89d680d27aa876bc8a290
+EBUILD restview-2.9.2.ebuild 741 BLAKE2B 027280174e573746e4deeef44127226f3e1bdee11b849ef7ab8c329b836143967696479204bec5a177da07fac67a075358b870ee5283db6ea7bbcd995f8f3d1b SHA512 0f997cc74e8a80ce0a81302366c9fa163cd9a20ad23ff5b57ae29819e7cba97a2dbcbe286343feda7d1795a91764831fae7a0f657d75b03774df8562c3ef9315
 MISC metadata.xml 243 BLAKE2B 60e9636de2cbdae69a508d7f370662af030d8cebb04ac02967c0c9a274c2d066314c0add0ca28c98674d215c8bd3b1209a2c9bb916a538f171243df00c865e2c SHA512 773c027b6753265835a85d22ded35a3a46ff7c0341d9d802639d0fa796c4211ee46f8810785662ce05c3dee74489c0fa08be6ee50248c2a84b4de839b8f8cf23
diff --git a/app-text/restview/restview-2.9.2.ebuild b/app-text/restview/restview-2.9.2.ebuild
index 01d1f9c130b6..43653ab1a97f 100644
--- a/app-text/restview/restview-2.9.2.ebuild
+++ b/app-text/restview/restview-2.9.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index 4e923b61a649..de6248aa647c 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,5 +1,5 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r7.ebuild 2558 BLAKE2B 4a818e14a8cb42127e235a79ce922b0b7643049d7d2bb2f7760713ea3b13bc8d2285b918aa0808c26f82dfb7c44c95fe1dfa51c7440cec3db175f11a2215227a SHA512 a21f3dadf7bc7404614c48d75fa03abb54c84ee1c380345002a7c10594aef4bcea6c6fd3d98b756421fd2a326d3388b775ea341b006cd3a09d69024fe6d4fdf8
+EBUILD sgml-common-0.6.3-r7.ebuild 2568 BLAKE2B 6733c3345bd061dee79494bb0fef871293a87d1c9486b18553a9f0bba01c17ad92620837015cd2701be9207df7b80e3bf56e9691d2e0ff45adaf676f3b0ca070 SHA512 8030b9f32cbdb52c95b6492c2ee7674c43cc8cb4520f3ee974569e4f2aaf18de42a2e8928a3a0a36d592a5b9cd4e8bc1c777b0708a4318381cab4d4c3990255b
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index e1b921979e4c..1910a7b6edbf 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -73,7 +73,7 @@ pkg_postinst() {
 		cat >> "${EROOT}/etc/sgml/sgml-docbook.cat" <<-EOF
 			CATALOG "${EPREFIX}/etc/sgml/sgml-ent.cat"
 		EOF
-		eend
+		eend ${?}
 	fi
 
 	sgml-catalog-r1_pkg_postinst
@@ -84,7 +84,7 @@ pkg_postrm() {
 		ebegin "Removing sgml-ent.cat from /etc/sgml/sgml-docbook.cat"
 		sed -i -e '/sgml-ent\.cat/d' \
 			"${EROOT}"/etc/sgml/sgml-docbook.cat
-		eend
+		eend ${?}
 		if [[ ! -s ${EROOT}/etc/sgml/sgml-docbook.cat ]]; then
 			rm -f "${EROOT}"/etc/sgml/sgml-docbook.cat
 		fi
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index d31afa862d82..133423a31232 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,7 +1,7 @@
-DIST Sigil-0.9.13.tar.gz 18235134 BLAKE2B 4afe0f0258a8c1056029534ec696372e40343b9a398b612ee32fe95a3d417594bcc6782a4e6447323d67e84db5193756ff7c8756e160c432678ebc59ddeab706 SHA512 cafc6b075827239b73e80d3efa02e4e77d5903fed1faf8b600f70b178fb0c248c38d43e115f249124859edc12ddd8caf199ef0b0d05f20852eb060b27e5a3578
 DIST sigil-0.9.16.tar.gz 21241424 BLAKE2B 1e784768cfe98e08ac01f5a9c11ec8254f9a0211f69ee1eb479643cc83677f6fea43745bcb158ea178ac64eec87c2e0062e783af2fe7477e2e5e8faf4db24c46 SHA512 45358912527484a7c580db34733d30927938443096fbf23e969d966e140a20607a4d98e086149a5eeb620f2462efc9abd531988c1b5cd93c373e747d5e5cd20a
 DIST sigil-0.9.18.tar.gz 21396185 BLAKE2B a20a1465032371f9d7e567fff03c859adf4bd2264e9d803efeb3bdeb3b097eca826daa36824370848aea50fffb2b2b74b28568f7dca926565dfd0948d7ade030 SHA512 a8f669ffb76554268aae8aa0f85c6861f80def71e429b44b20ac9b231f3f7584839a82e7b6991f57ca1f2d1f023e24d1f37897bd048379e30565e9bdd7ee188a
-EBUILD sigil-0.9.13.ebuild 2527 BLAKE2B f48d3ad43514ad147011b2902e9dec7d4ca35e8f58100cd6ed4e0ce640d9a3f321ccd1c996cb5e88c861ee273c09dd384c95f1136be5604361d1dc7f5044ca0e SHA512 a6b0a5e912f90617f23abdd36b6173e8cc8287f0dc0b2d8052069f656c042dc3d132c7a0b6035c8bc899c6a8defa13f8d6caf08c55793661e5d0e8ef34d0fcdf
-EBUILD sigil-0.9.16.ebuild 2875 BLAKE2B 431939484d3124f69512bebc5bfcdf40cc5c6cc3a4fb9c4456b99fe5151579928f675a7cc2c3d3026212b36b49ad6f3e0f236eac25edb4ed68e9db90d665b350 SHA512 6aceb1ac42f5b6e7f0413337c1ec4c79748f6b8654fff933bdd93b98c5c574e6ab4dba700d80ea102e834ba518f8846848aba7c1d4eedc6ecf932db39cc051ce
-EBUILD sigil-0.9.18.ebuild 2693 BLAKE2B 531b36defdc189bd33c1c3cf15c55093518894a791af9daa89acf7438e083ddca07fa09302a28de452cbd0a7e77f5080fdccd2c9ff66efb46e86b973ef66eacb SHA512 97b853181a212d9be386cc9a769a492fdb10ad7edcbd15cf1e4621ad00a77c7c491e23654c1271f91bb8ed880f8eaeb20a0bde4065167762cf35e045a959435c
+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-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.13.ebuild b/app-text/sigil/sigil-0.9.13.ebuild
deleted file mode 100644
index 4fe858867563..000000000000
--- a/app-text/sigil/sigil-0.9.13.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit cmake-utils python-single-r1 readme.gentoo-r1 xdg-utils
-
-MY_P="Sigil-${PV}"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+ Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell:=
-	dev-libs/boost:=[threads]
-	dev-libs/libpcre:3=[pcre16]
-	dev-libs/mathjax
-	dev-libs/xerces-c[icu]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( ChangeLog.txt README.md )
-
-DOC_CONTENTS="From Sigil's release notes:
-When you fire up Sigil for the very first time:
-navigate to the new General Preferences and select the default
-epub version you plan to work with (epub 2 or epub3) so that new
-empty ebooks start with the correct code.
-if you plan to work with epub3 epubs, you should change your
-PreserveEntities setting to use ONLY NUMERIC entities.
-
-For example use & # 1 6 0 ; for non-breaking spaces and etc.
-
-We strongly recommend enabling Mend On Open in your settings
-for best performance with Sigil."
-
-src_configure() {
-	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
-	local mycmakeargs=(
-		-DINSTALL_BUNDLED_DICTS=0
-		-DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
-		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"/usr/share/sigil/
-	python_optimize "${ED}"/usr/share/sigil/
-	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-text/sigil/sigil-0.9.16.ebuild b/app-text/sigil/sigil-0.9.16.ebuild
index f2afdb994b88..a712ce00178e 100644
--- a/app-text/sigil/sigil-0.9.16.ebuild
+++ b/app-text/sigil/sigil-0.9.16.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="tk"
 
-inherit cmake-utils python-single-r1 readme.gentoo-r1 xdg-utils
+inherit cmake python-single-r1 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
 HOMEPAGE="https://sigil-ebook.com/"
@@ -72,7 +72,7 @@ for best performance with Sigil."
 src_prepare() {
 	# bundled is a exact copy of the package, and upstream plan to switch soon
 	rm -r src/Resource_Files/plugin_launchers/python/css_parser/ || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -87,11 +87,11 @@ src_configure() {
 	)
 	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_fix_shebang "${ED}"/usr/share/sigil/
 	python_optimize "${ED}"/usr/share/sigil/
 	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
diff --git a/app-text/sigil/sigil-0.9.18.ebuild b/app-text/sigil/sigil-0.9.18.ebuild
index f7af56a5f6f3..ee2155ae5c35 100644
--- a/app-text/sigil/sigil-0.9.18.ebuild
+++ b/app-text/sigil/sigil-0.9.18.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="tk"
 
-inherit cmake-utils python-single-r1 readme.gentoo-r1 xdg-utils
+inherit cmake python-single-r1 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
 HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
@@ -80,11 +80,11 @@ src_configure() {
 	)
 	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	python_fix_shebang "${ED}"/usr/share/sigil/
 	python_optimize "${ED}"/usr/share/sigil/
 	DISABLE_AUTOFORMATTING=true readme.gentoo_create_doc
diff --git a/app-text/sigil/sigil-1.0.0.ebuild b/app-text/sigil/sigil-1.0.0.ebuild
new file mode 100644
index 000000000000..0d5c548e6440
--- /dev/null
+++ b/app-text/sigil/sigil-1.0.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="tk"
+
+inherit cmake python-single-r1 xdg-utils
+
+DESCRIPTION="Multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="https://sigil-ebook.com/ https://github.com/Sigil-Ebook/Sigil"
+SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins system-mathjax"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell:=
+	dev-libs/libpcre:3=[pcre16]
+	$(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
+	>=dev-qt/qtprintsupport-5.12:5
+	>=dev-qt/qtwebengine-5.12:5[widgets]
+	>=dev-qt/qtwidgets-5.12:5
+	sys-libs/zlib[minizip]
+	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}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/Sigil-${PV}"
+
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+	python_export PYTHON_LIBPATH PYTHON_INCLUDEDIR
+	local mycmakeargs=(
+		-DINSTALL_BUNDLED_DICTS=0
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_LIBRARY="${PYTHON_LIBPATH}"
+		-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDEDIR}"
+	)
+	use system-mathjax && mycmakeargs+=( -DMATHJAX_DIR="${EPREFIX}"/usr/share/mathjax )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_fix_shebang "${ED}"/usr/share/sigil/
+	python_optimize "${ED}"/usr/share/sigil/
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/simple-fb2-reader/Manifest b/app-text/simple-fb2-reader/Manifest
index 9ad94c0467bc..c98467e55b63 100644
--- a/app-text/simple-fb2-reader/Manifest
+++ b/app-text/simple-fb2-reader/Manifest
@@ -1,3 +1,5 @@
 DIST simple-fb2-reader-1.1.2.tar.gz 95181 BLAKE2B 4bcfc361fe25e2fbbd6767d4517dac61e50f2e907c969402dc76be688228e612c489758ae2adef731a30e9a9aac19b2fb5786ad768e83354c8d082edfbf2b634 SHA512 0d0b95cedf8b0863fc415ba710da7bae140fda6a9cc947f20986fae0f348653ab73a85425ba34fc9beb747372ad3fcffdf8c3c173386678653cdf10318abe64c
+DIST simple-fb2-reader-1.1.3.tar.gz 94550 BLAKE2B 857f3b472d6dc2e7c4b1935b8123a1ae269df436457ad061cd8bb2d051b77fe2f318e37f1e2adc93add132870879a0fe53bf36eaaf9998bdfaf6993dd34d32c2 SHA512 6c683ca1cd29e09a2c3ceef2057f61cba8a7711d7c6508a3ebb40ccf3440e90ec87c34ff9832d11f2f9215f8bccd4d365cd725ec5d4004562763e1bdbae3cc7a
 EBUILD simple-fb2-reader-1.1.2.ebuild 719 BLAKE2B 0eb99cb61bebb33fed875ec4ea548663ddbd46e9aad7d2b3112113ca1e29a812ccbf039ae0c399f7883c6b2f4e6da6c39edb46d63f06635283214392d75d27ed SHA512 6f717e06aa6976382f37a4c193fb40effad3de7e8027801a15a07288a629d484d52552e106a6d6f41b1b4ace69e1f7a35cb1616ef85535295f72ae3be007de97
+EBUILD simple-fb2-reader-1.1.3.ebuild 571 BLAKE2B b4ae5ad5f708d6c04fe9019d2d16a25e5c41188650da73da3e7a65041f8ea60c91f2be63a11b2ed29bca0ee67bc0244c16f29facb6e1a546970b6a65fdeebd6f SHA512 8c92c67bb3767df08af35b0283493864a8ec8529d3db3ac7c4d5a1f3d1bd639b3d7aaf482a324cefd90bc4a05ab4c89b553a376ed0305d5ca9aa60e57e4e5e66
 MISC metadata.xml 317 BLAKE2B 42a730980929eff799e8de69cd94c2f15a2da6ba77cc3c98dabd4a323a6fcaae293a437b6509d0b9b32fe1bebc7c0d7e94f948f16c42a1eea552da45d40c7fc5 SHA512 09ce0420bdd7879b4f7578ea792cd27421abb6155d121c18bb0728c4e63b31577f7f6b8aa5dd1d647dd87e8f73c1a668148e0fc76efa7b3fcede097015fcb70a
diff --git a/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild
new file mode 100644
index 000000000000..3568a4f9df7e
--- /dev/null
+++ b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils xdg
+DESCRIPTION="A simple gtk3 reader for fb2 ebooks"
+HOMEPAGE="https://github.com/Cactus64k/simple-fb2-reader"
+SRC_URI="https://github.com/Cactus64k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RDEPEND="x11-libs/gtk+:3
+	dev-libs/libxml2
+	dev-libs/libzip
+	dev-db/sqlite"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	xdg_src_prepare
+	cmake-utils_src_prepare
+}
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index d024137db633..17e60f1c456d 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-1.ebuild 3961 BLAKE2B fe0193035732029ea55eb6bea090de9eec408612bd77158e30efa29342e09dd887cebb17d4c601ad30f15f83aeaea002eaf75e087ef5038518dd666420afbfff SHA512 539861d578b0509bd06e0aa32612401c13235c8c4b718aa3f64a8ff46d5a42bfded4597b19520771d7f32da7fa5c70bb8397a0c7022fde4416fec983e5ad9258
+EBUILD sword-modules-1-r1.ebuild 3342 BLAKE2B 44b3cabbc441116f6f4c8a3d03d0033d80e1a8a783474e699d7fd9a2a66c7697ce339b43472faabccf20121b84f00d525a8089f81df6d913532f2777446ef786 SHA512 e6f65cacdfe94994cef8096aae2def0d9c972b95a5edee1b352dd537baef9c4c03b1db80f187a4706b9285fd2a077595c81b6fa7bcb605999d92b06d8714397d
 MISC metadata.xml 378 BLAKE2B 94f101a56061c2386d02786a9f8f023bd97e33629ed7d660f5f62395c8b18a95c5ee6facbdc54b0f4dddc530fa7e07802dd470067087226859e9de9df0f83441 SHA512 066849ccc8fbb9e87e694a0c6e3de55b9d4d685eace107a70287d2aab827231dbb7d2eba8fb5e92dec30de93cb4d8749332a7cdc838d971e298b8c0818ad026d
diff --git a/app-text/sword-modules/sword-modules-1.ebuild b/app-text/sword-modules/sword-modules-1-r1.ebuild
index f8c88194ab51..ada05b1a4dd3 100644
--- a/app-text/sword-modules/sword-modules-1.ebuild
+++ b/app-text/sword-modules/sword-modules-1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,9 +11,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=""
-RDEPEND="app-dicts/sword-ab
-	app-dicts/sword-abbott
-	app-dicts/sword-abs_essay_goodsam_swb
+RDEPEND="app-dicts/sword-abbott
 	app-dicts/sword-acv
 	app-dicts/sword-afr1953
 	app-dicts/sword-akjv
@@ -24,24 +22,14 @@ RDEPEND="app-dicts/sword-ab
 	app-dicts/sword-asv
 	app-dicts/sword-barnes
 	app-dicts/sword-bbe
-	app-dicts/sword-br_en
-	app-dicts/sword-bulcarigradnt
 	app-dicts/sword-bulveren
-	app-dicts/sword-bwe
 	app-dicts/sword-byz
 	app-dicts/sword-cbc
 	app-dicts/sword-chamorro
-	app-dicts/sword-chincvs
-	app-dicts/sword-chincvt
-	app-dicts/sword-chiun
-	app-dicts/sword-chiuns
 	app-dicts/sword-clarke
 	app-dicts/sword-common
 	app-dicts/sword-cro
 	app-dicts/sword-czebkr
-	app-dicts/sword-czecep
-	app-dicts/sword-czekms
-	app-dicts/sword-czenkb
 	app-dicts/sword-daily
 	app-dicts/sword-dan
 	app-dicts/sword-darby
@@ -52,12 +40,10 @@ RDEPEND="app-dicts/sword-ab
 	app-dicts/sword-dutsvv
 	app-dicts/sword-easton
 	app-dicts/sword-esperanto
-	app-dicts/sword-est
 	app-dicts/sword-farsiopv
 	app-dicts/sword-finbiblia
 	app-dicts/sword-finney
 	app-dicts/sword-finpr
-	app-dicts/sword-frecrl
 	app-dicts/sword-frelsg
 	app-dicts/sword-geneva1599
 	app-dicts/sword-gerelb1871
@@ -65,14 +51,11 @@ RDEPEND="app-dicts/sword-ab
 	app-dicts/sword-gerlut1545
 	app-dicts/sword-gersch
 	app-dicts/sword-greekhebrew
-	app-dicts/sword-hebmodern
 	app-dicts/sword-hebrewgreek
 	app-dicts/sword-heretics
 	app-dicts/sword-hitchcock
 	app-dicts/sword-hnv
 	app-dicts/sword-hunkar
-	app-dicts/sword-hunuj
-	app-dicts/sword-icelandic
 	app-dicts/sword-institutes
 	app-dicts/sword-isbe
 	app-dicts/sword-isv
@@ -83,21 +66,16 @@ RDEPEND="app-dicts/sword-ab
 	app-dicts/sword-jps
 	app-dicts/sword-jst
 	app-dicts/sword-jubilee2000
-	app-dicts/sword-kekchi
 	app-dicts/sword-kjv
 	app-dicts/sword-kjvd
 	app-dicts/sword-klv
 	app-dicts/sword-klven_iklingon
 	app-dicts/sword-klviklingon_en
-	app-dicts/sword-korean
-	app-dicts/sword-la_en
-	app-dicts/sword-latvian
 	app-dicts/sword-lightfoot
 	app-dicts/sword-litv
 	app-dicts/sword-luther
 	app-dicts/sword-mak
 	app-dicts/sword-manxgaelic
-	app-dicts/sword-maori
 	app-dicts/sword-mhc
 	app-dicts/sword-mhcc
 	app-dicts/sword-mkjv
@@ -115,7 +93,6 @@ RDEPEND="app-dicts/sword-ab
 	app-dicts/sword-rkjnt
 	app-dicts/sword-rnkjv
 	app-dicts/sword-robinson
-	app-dicts/sword-romcor
 	app-dicts/sword-rotherham
 	app-dicts/sword-rst
 	app-dicts/sword-rusmakarij
@@ -147,7 +124,6 @@ RDEPEND="app-dicts/sword-ab
 	app-dicts/sword-ukjv
 	app-dicts/sword-ukrainian
 	app-dicts/sword-uma
-	app-dicts/sword-umgreek
 	app-dicts/sword-vulgate
 	app-dicts/sword-vulgate_hebps
 	app-dicts/sword-web
@@ -159,5 +135,4 @@ RDEPEND="app-dicts/sword-ab
 	app-dicts/sword-wlc
 	app-dicts/sword-wulfila
 	app-dicts/sword-wycliffe
-	app-dicts/sword-xhosa
 	app-dicts/sword-ylt"
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 1f1b8bd3b098..a515dc21e3ff 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,151 +1,53 @@
 AUX tesseract-3.05.00-no_graphics.patch 2199 BLAKE2B 0ed987995a7686dfb6e420c1e79eb1374df5d1c2c69177f858f962c1216f54daeb4b0e10e9c6cbfeda931f44a359b75fa266266c0807321479a4275b8ab7fdb4 SHA512 136b4f298e52517a801a19847ceb85cbb77ee0de42a43dc5a82faa7039f0b9c0bde965453ac5cd6c25f4578351217319a0ceb719fa42f207a38b3efe0c210388
 AUX tesseract-3.05.00-use-system-piccolo2d.patch 1030 BLAKE2B ce4e080e7d192df3ee7f9579d40cc30dcde63cf17ad85d06beb939ef26cddc013b4be5e2a8c0a0556576c01a57ad2c8a6281709a0d902e02e096b6a5688438c5 SHA512 df203ab3933a59f1f2f689ce8dcf266200c705837b5b97dab5f7b1684903523ffa7b88c374c2e7c0b106c1726ef54fdcda47ab44bf75cf51e7dc4308dac6a810
-AUX tesseract-4.0.0-manpages.patch 1132 BLAKE2B b38f4385ff916b40a679a925cfcd4aaf4e64a3e1735dba8a5cb385dc513f9bb8e9acf7a37f90080a1327eac129897eae738faabd8e4b483d1a5f614d824b3abb SHA512 24bda3df99ee059e6957ab34f66537d9743791b968c242cae19eaa13d434210e6b4f9be2c433a0e92756a56752f575dcab37c4c62f2dcbeb063248ddb4397c91
-DIST afr.traineddata-4.00 12213914 BLAKE2B e06516788c09f6a9538ffe3c4378eef4e88eaec0c8e14a7f3ddfd6db0820839a90a27f8519dcf6872dc8c08f47229d4ee8bd6aa41e383cbf51a5584bcda6f7f8 SHA512 1c00ef71a0e846bf5d0d57c7c3a3a8b5af47dfa8f429dbc02fdb560731923c0d0ab3273b3b975a570ffe7bfed2c7b284ef28ef4f830f8d4a0f33d84692cc655b
-DIST amh.traineddata-4.00 9771502 BLAKE2B 3a905487136efd099aacd0a979bfda1edcd30c8eb14fe2b304ba1f5355f570520b864c992b63a1fd1f683baa91186de7cd7c89e6057dfebb896f2d6f905b6d6a SHA512 0b449936c350eff717aa5bba502d3df86632746de9b3a7320252cb69707d18596b0bbd4a27caa3cb5bb560add8991bfbe7b56dac6f7e0a9f91202924fcb694de
 DIST ara.traineddata-3.04.00 6315068 BLAKE2B 30af9442d0180c9288c6e8ae03e7ede7e4a1a18743733bc00b63c28f405ee1f0221a64e01c19dde3f808efe6b4547bceeee36690d9bf44288dfe57211b7acc90 SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b
-DIST ara.traineddata-4.00 12537236 BLAKE2B 461b521d70609593f51df2e93d0ad74b289cdf42cc421f1445e70b63b7e56fde31f23ca9ef5b9584683fdb53d98e6057e090be890229a22a315a16863e60174e SHA512 a3dfc8604aba6efccb0cdd39488ea978d324ec953c5e74892cbfb7506f1b4276e5e335cba56301272779d7a0ec69c55187db01bcd01de06a524ecb92820b7348
-DIST asm.traineddata-4.00 23520270 BLAKE2B 81705edbbb1d4d467945b533a1789ed41dd6218a61621713dfba6c41a40545c99f8f7e112ce897de09cab242a06c0a493b46673630749a925111b808fbf02b9d SHA512 9413806ba55d101cf2c88c0c0cf408a8b4010c4a4b4ecfb315f98527865a1ddd052f1590326500f4c583628171d203a2a5530ef406b583a8b9f5451da91bb42a
-DIST aze.traineddata-4.00 15168011 BLAKE2B 65da3a20717a574338c2a371f3832477a0f06d6619042f53987b7932e18d0bd1ee49ae722d6199b9c84543d77f00a398a387c3eb739105d0551670a3670efe97 SHA512 372241fa9f1d060d47a1ffd4830cbca4c9a319a014631545ca8f2c043609afe4427d4342e522d383778f0448ad853fccb632ef3eaa6dc09192ba06f1693102cf
-DIST aze_cyrl.traineddata-4.00 10530787 BLAKE2B 9643274e5d89ec18655d5552a59eb96e2732bb1163e0d1c5a9a49d05e6271b0b4170a566fe5f69f8eea73fa4e8a1890bd4950cd7f65516ef4ff6effe92993a43 SHA512 8cba80fd1201ad89eaaf31bf256924257fb45e192b139abcd9a7cefe43e4e30fd35dd4e08588d593a062b2668f0715804f66566479dd0a0beb688bb2c1ce7291
-DIST bel.traineddata-4.00 16325127 BLAKE2B 8c97ac476fc7baa333b173494a004a134cdedbd3237fb73f2257c4126a0ca964eff6f8504966251a133e0ec1a23f85011fcbb3a2e2e1b690ecf225b72fe78fe8 SHA512 b6c7eccda420fc6c9cb30d3cd2e38b8f2d09766a77f701f3daae38fde198e2314a9a050841f2fec2fe49551e8334d9d5b820303b2d19285a942b423c66a71538
-DIST ben.traineddata-4.00 23447857 BLAKE2B 34c02e9a95706893045fccbc2e6728c89b4e5acf34262a7bea5beac91f1585b02a09192f20efcbfacdf0099ec5f1649edeb651112af98af590a0494c8eae8951 SHA512 6e59864bb499e048d8f8ce575f280f897b14bc626cad1970bb70d267f982be96ce2dacde847d060520288389bcbf2bd4a39d6abd9269a51d3d7970ffa19f4a17
-DIST bod.traineddata-4.00 35497681 BLAKE2B 53486538158ebd3946c49539a3f5bdfe72a1f22aedd84d3fffa3ff4b4676d3a9a2ed8c0da44ffc33e5634218185d963b5fc58f1a0490c5b97182f06a6b81331d SHA512 3b57c9d71b0914f274a6dc34e3d60fdb94f487e67e2fbddc92dafdb3bdc6e90766aa5b780449d367a6ac4d02b2c6634ee43efe74cbe52f71b11358e4d1c74339
-DIST bos.traineddata-4.00 13859186 BLAKE2B 04485ff70535292d3befa748955e831ff0fdc229629280c2469629a45ea34499efc382946edc3303e2f9ab02c2f463efd54353c5bed928a5c5a40fcb9b81cbfa SHA512 21d9c6c4bbc042b1ee473d2f67fbd875cfa6f7fd9652abf914f8a0c526b5833ebb9602ee942f72642b00db4d632647beb531da37db712f0acdb86410024ebb01
 DIST bul.traineddata-3.04.00 6026234 BLAKE2B a39a5757ec6bbb77ed6fe9a263e11b9d83eb64653f62f96dec68c102aa199348eefb8f99642f9824af9e41c537573f06af45f393271145fdcfbfff71bd07e1fd SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c
-DIST bul.traineddata-4.00 13677970 BLAKE2B 8c3e790138bea9def6d21ec26bd7755ea5604acfce3c4f60602fc8ab7145dfcfb29132277d00b8cff6b7497e29bd266dc9a8c84614c0cc2f5c29db5e690f113e SHA512 26a010581fc65673d48b30fdd69308cee47c12531bb260c93a0b22429b2c342e78ee3d7ccae1590e71ea2fb1c9f33110a3bbbaebf8e7c4fbaab207a4bf9cea48
 DIST cat.traineddata-3.04.00 5356190 BLAKE2B 64c7677812342474a7182c4e7907e068231511e09403c7122004e7720ab023f98c2d157ba5d417582d6323d3aa3ce5eb9914ce10506663f70749a1290c553747 SHA512 d3b1f2ff0d7d57fdbddbf9a2cd44fd1fcec08d13b82c6fd77a21fe45ef8e33dd809332b59d8bec0600f2596e0bf163605811539aca154eb11f7d8238e6df9630
-DIST cat.traineddata-4.00 12704811 BLAKE2B 5a775d9cb85238ee3c1ae965601c0855b497ddfcc665f540569e90f29aab9e819edda1b99344ec048917ebe3228a52961393e55b402af85b6b4220b862e5bfce SHA512 d743b2515081d2121f294ba179c81a96f632b9ffec539777a3f1f1f54516a02d068377fed05ee7008fd6268e754645aec7d338043fda1340a4da432358248db1
 DIST ces.traineddata-3.04.00 11896327 BLAKE2B 253795339231d377d3b033f348cc3413ba3bf9520bae44d318b459271608501db7958dcd216f44deabc7755008cb66c5b20625ad3a00a3ea8fca2258aef3c8af SHA512 de65b88d76fd50115099dfaac8ac80b7c6581eb0aa6186fa0c91c9cf12e90632a96de341b2faf94a8de1c5ed7b71c196571c914792b6aa7de42a3b7542ed625d
-DIST ces.traineddata-4.00 22727966 BLAKE2B 51793a4202b0a5a24d0e82e0403f42eeec61fa01efb5cb0376ec9f016911201534ae5133429eaa24d2bb97a4623ddc3b19d9fc4f4163af5cf2f19b7d924febf7 SHA512 48513c3c653aee6c6d7b22cd364331ee4ce5daeae6291b0f3eeac7cbfec8603ada5c64ae10f084ac12151d659ccc8957d040df36e68e605b34c56293491f0d6a
 DIST chi_sim.traineddata-3.04.00 42089623 BLAKE2B d7ac25d5a43ab36fe54035e78c34aa9b7fd4fee06fb32da6ec8173d0c0a40ea727d0c529f0d02ec949642c81c81a4d180c6c68557709d3561d169c9e7c3a29f8 SHA512 e3427c17988e777447262bd3f5704f84d1296a8c02d10f343fc6f698ed23b8577670bdc76f3e0ea53284a233de1e6d0f25224d984bed75bfd52f73e6a6945673
-DIST chi_sim.traineddata-4.00 52662579 BLAKE2B 96dae9feca0e7cff822d850dbe23f6ff3b5aaba18f7053521f8e7a8adf04c7669879fe602d6f73a933147ac62c6291ef8e3f9960fbd90a23cde23da638f99fd7 SHA512 18c6307c2f1d7f498df58a198b4bd61fb434651a1cdaf2abfea259f01d0064edaad69421c744ef3485134b49868ff3a5c75cb53db87d68bb1b746e29f9356440
 DIST chi_tra.traineddata-3.04.00 56692327 BLAKE2B 83ef6e067107b14cacb208ec5885d3db6a9fc6be85eae90f27eb4c70ae723cec6fa17912068f46078d8a03541a51ee2aa7b1eea007211b5fa9f7282142fd8ffb SHA512 149795758dd51beeea3b9739395b599c9b6fac35862ef50fd663273709f00bab72840a6983d09289d05269f808a6af25b588d9740f54736beaf2452da1c735d1
-DIST chi_tra.traineddata-4.00 67377986 BLAKE2B cb06673cf33cafbb4eca7ba98a14736925a55f7d7a7badb06cef66a8e91072b631036f455a68fe0a4f5a21e8c9c25691286819d265d859b092fc1e71c456c832 SHA512 a8300b785ae367b94059ea8519512474088c2202410aa74d9621fc5aaeb552125f257daccad1294456f8dd7ae07071e73151847b296b971c8c18d48ae519201f
 DIST chr.traineddata-3.04.00 1083194 BLAKE2B 86a4c64f3df108d92f0b1d68743fb0a7c6e6aef328751c770968d946a476b1123141beb99730d67af8a4a321220be2a82cb3d96920352fd21709bfd15507a284 SHA512 e0982f5069a9cab4ad274babcd00a7199e2e76ae02167101a24c0074a91db5faf55f921159da724391860c9187423b14b5aab096f90eccc604a32b2d30376455
-DIST cym.traineddata-4.00 10333739 BLAKE2B 496296881fd98c77cbdcac413ad85ecbfe8c088de8326ef84c3e8d6c492f486a21be0982b9374f07310b85b25ad6bf646ae57a42ceba2be5f5190306cef01e3d SHA512 8f845d557be62195689ecf17b43c229bd33e85cac4cadf90b176e9a6d9f184411465be5b3534344b562bfa14b10cad6b0f47cb7dcece3f3d7192b13db7fd2e23
 DIST dan.traineddata-3.04.00 7340575 BLAKE2B 8437979bd4a01534e7a2c1c82c88232707ba10043c3bb824f71f8c365fed1353ce438dd08205286c1e2053adbe96211f34a5199648679f7c147806083d659a26 SHA512 ed320c5a3b93b5416ad1941a3e8a331a2f60570ba74b4bc2285e687472e7222556379c0ef261ae06970e3b9710c5fa89a26da5d509be325c2e627ed6e9f48bff
-DIST dan.traineddata-4.00 16011554 BLAKE2B b57f7e30f4449f648aff92a6258a109e7f43dd84fa0406f44dd5b81937e7504c786c2aa75f791f47e0565afa6c872b06e4609e3849087a73a5f52bd501f7623b SHA512 3b678b28d4d5c67c4781251974dc36fb8d430440a1409b67e5c7124ee3c04fb39fe545af8a7e8fd0e14a24ccde55a9dc32bae127eb48ad7c8eab16cc374fde48
 DIST dan_frak.traineddata-3.04.00 1622710 BLAKE2B 458935c2176a74ef0090574be0ead1d65a0ede29fee48215a674643bb3a38f7a4fb40c940480e1e490edab8758f49010c6c2304ad9490ea22f60d8a8602317e1 SHA512 8bb21f7ee21f99e0eb8fb55bdcd60b006bb1dbb42946f1f7dce1c53bcbef46f5f6cca7aaf069b1b3c43b13eee2c7dee752fea8c38003ee266999752a9b466b01
 DIST deu.traineddata-3.04.00 13367187 BLAKE2B 3ead7f065fc4284f1dbdb83180d5f87e717fe39971d2bcf248f22125b5ac5fa9ed0f53491b955c9e0063a419dfd23a6696841ad0d12d7f6de13411f81254c416 SHA512 fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee234444d6995
-DIST deu.traineddata-4.00 20193615 BLAKE2B b554b66edd074844f607700af1855581b73a251693b666a4091105a21093b27adedeedc97540b0bb739af48ee4cd289874b366e64b0c8701cded25a84df6f8d4 SHA512 23326861284f096e40834bac31ef4e9344507b9332c8bbdc10dced0c60743bb2fbeae79d888c80c56e796661a2232998f1f7ba64ff1e0c9bc79ff13bd0a2663c
 DIST deu_frak.traineddata-3.04.00 1978593 BLAKE2B 7a9bf16949baa3167d162f5075a254fac7699cd6ce2766423a1d0ef652daa0174ae6a36c6dd0d0e6f45bf961b4a0d13a7f55a0de3bfa2afe023816dff0f54ed2 SHA512 6d458b657c5b88671e0932da24fe91051b7191105b710b18331620347407c5f91338ae951ee9e0464af2d93dca552d77b1e40d372dda1aed12bc209baf00d4b7
-DIST dzo.traineddata-4.00 8771208 BLAKE2B 4651c08d7d7fced6c86dc7c41b14a205b85fdb5a98a5db392be0769ca35868e061ad39947d80aadaff38cf8651da10dcbdfdfb089192672eab9d3ea5e4d3ebcc SHA512 b9801388c1e2e6355846be86ec61b8eb0bdec0c2907b787c5ee5cfd042a3889b8b4a9baea27775088a1e18597c024012263830ee238b4d8f7c58d31c607f47e6
 DIST ell.traineddata-3.04.00 5422512 BLAKE2B cec340bb25a6f60fdf17dff46c06440ee2be62bf4b8dc8055dae1d77ec4a06a43862052399a3ece1c3d860cb1d88a1511a3b58a8b9f61bde3371736b0d686c01 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48
-DIST ell.traineddata-4.00 12594922 BLAKE2B 297198e6e4341123c88ce6d92442618797b0ad2f7b8c4f47051855c8186468d843071567a8b3b26b6693bc09a927f49694995e5f335baafdc7749ad87bf2664b SHA512 ba49067c8eed46992615013a09f58c457bf333afa4f152f3b1f837e934c71d04564bf1e9a1a8d80cd4aeac95639c19124aa586f3043737c556d28e2bc478fbae
 DIST eng.traineddata-3.04.00 21876550 BLAKE2B 983f91e54b334ee533d5689ac8ce768922e348ef89a284c47d93ba91fcad6de8614998c8a5b17c2406c5c30c1228530077aad84929da6d8bc983c89c1d3a2234 SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a
-DIST eng.traineddata-4.00 31873501 BLAKE2B d055774978588376c69fac2c4010971a37480f493ed3d6371236d0ab14c51428f328b1be658606bdc4658e36deebe744a3ddd132c7ba3bcf275c4222cf4b2e62 SHA512 dec017b60c7ee7c8dfe1c4cef562a02c8699c2856d6562641a7077c1a0b5493a26085fa81e7dfff97323054276f24eb51f64833bc2fe7bbe91b1955c6f719618
-DIST enm.traineddata-4.00 10479188 BLAKE2B a6ef01ccd91699b506d02c5c558923040afb65df7612477345d498b2798f5d04d09c6778773adba3fa0999caba6f56aecd54f2cd622434dee830c0f3d22535f7 SHA512 fe78e53eaaedee66e688291d684c221673b787dd3f020736f60ecdf4dd1257f3d2ccfcc10408a6ef50c711b538a4a3933c84d1ebfded82c2adc1685e7a9712ed
-DIST epo.traineddata-4.00 15408492 BLAKE2B 88f7ca7d97f6ce5443819c94eb5c31badfb7e00f7880a4d8167e53a204ca05b548669214a50c2765372f6df6b726797682141332d7dc6fdd964ade92dbac9bd7 SHA512 44230babdbe3ff366c0141f49ee524cc7eb1226be767e865b4ddd5afc1c1f99b67ccdc68ddc1ad0c8b3a368937508d9edbeeef099cb23815b506f1e08910427f
 DIST equ.traineddata-3.04.00 2251826 BLAKE2B b7ad09d1d57dd5af088496e0f6524a7bea869f61c8f4be45eee1f84d83eab5b5f724e736055bc5226abc704f90afe2726210e5eed1fcd2936c65010457c4b8b3 SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8
-DIST equ.traineddata-4.00 2251826 BLAKE2B b7ad09d1d57dd5af088496e0f6524a7bea869f61c8f4be45eee1f84d83eab5b5f724e736055bc5226abc704f90afe2726210e5eed1fcd2936c65010457c4b8b3 SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8
-DIST est.traineddata-4.00 21175883 BLAKE2B 82a9927d7d7ff5d79ab7fd6518b12e53a5e24931be17d83e07feacb96ba34d022148c7b20e8651ef05c6e85e1d44dac60b10ecb70d8ec7acf1f392c63fdf58ac SHA512 733200cfb2e963e93d12666b28f7993af4a84737cf4c9a4c68946fa70076d4fc649bde93e68d701d1970fb7ac3adb2c1fcf89f54b0a35dfa56c257f8a30ab6f8
-DIST eus.traineddata-4.00 12542297 BLAKE2B 7dbee88a1813893986bec9b5564d0e5169497734fedc13ccef05ea091d200d2021c2e65533bec2fdb990491767e5a4ca84031b8ad102e3385a1fc979b797675a SHA512 bbdab8f049a42cbe9e84d9695c6d209613ac35549147f000301954f8275b2683bbb2787df772f084e2f7887b2de9c0567fb424e80f0e82f95a14bbdac66c266e
-DIST fas.traineddata-4.00 10579225 BLAKE2B e0d68b0d0713f0042bd18bc52c41bd6af3501b4aec54f16b18229f4f9fba1f115825add6f270e8e020345c25f337c2066ca7d9894119a678257d8ee76511139a SHA512 8423479acc7ed52156a0a4f3c574de4555e51979a98f60a760c86b5726a767bdab7a787069574cbe2f9dd11f9ad9a723b9b9f03b656e2b0e0192cccaeef0c3b8
 DIST fin.traineddata-3.04.00 13274908 BLAKE2B 7fd89de5435619600523106184aea5e7c87720b1d5796508b4953d6d8c19e2e2bee96b7a36c887ab0f456a0322c30f17e37d91e3afaa1e0733c110f3324aa784 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789
-DIST fin.traineddata-4.00 28467692 BLAKE2B 9de412dd406915f2c55b5ecebe1bbbb15620c9d3f84f58d215a20a7cf3103e3e20c05177822f9b7fdb488c67fceee892c50fb3ffcd4f1e73314b8e4670d3688d SHA512 a077a853ab89d2d03d5bd7ccb60af51544c7ef3afd230ab0e12dc616f28130c860701af314f6e73f24ccdca4fd8d4c611126df525fbded4b7f023a135ab3a094
 DIST fra.traineddata-3.04.00 14044118 BLAKE2B 9acb6f5d6710632178aba4b95db27390d0100d9dec6ca3648c518dbc221b2cc03ecaaf33aafa363265863b9032e2ab7a327beafb8a6e29ae1a3345ba80455aed SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561
-DIST fra.traineddata-4.00 20908386 BLAKE2B ef52ff763733c5a957e34aa9cf280c9a90ad70039183ded321750c35321c399e131b03717180e89fbfde8bc121762dacc46dff54c7b0cc69f727053aa392b1e4 SHA512 ecf1ded66b3e5c903161377903b5a693ea8221b155ac61fa88b0e2ba1fdb34cce8d8e6d0270a45ed822baa012d7d24ee15c6032a31b62d9b773106e39bd18603
-DIST frk.traineddata-4.00 29861799 BLAKE2B 13336a3715221fbabde3b6d57ba08802b33faf21aee4c55401099f3667b0173469a051b845667f1d9269387dd7c0433e88c3cf778da3c34d855cdf8cced0e9c3 SHA512 1d70263862960fd55e51bf906dfc2092cb9acbab94e46f57c9dc83180585604a12072c977f820b2bbbe2b7a26bc63ca4e24900ac95d4f8a0e6d45f0a485dc186
-DIST frm.traineddata-4.00 24482384 BLAKE2B f2ee9f87a983b43a2b2513f3c2247558649fabf6561e805fe758f074bb3f22426cefcf9994b3eafaf5fbb83761ed11d0b903579f71958b4fbf427c5d3a6a089b SHA512 946587cbbde6d4fa537312bb9cbb1952f5c30cd404b2cec4f2bc6282e3b190bddc4f2450e0f1904a1b5e8523c5651a5592fa892aaed2d2da7b0f1cc6f35f3e2d
-DIST gle.traineddata-4.00 10190010 BLAKE2B 60a4c16012e61cd2c32010ab4c2f6848c2c493c1e7857ed4391989f7f4e67371018bd8935684f484c4d7e236c6276eb2aacd8ac2fdaf1661c52cf8f3d4d7c415 SHA512 b8ac110cd62185aaf4336080e9e08df83f9bca2418aacb440345c5a00b2b938613ef1b13788dd4484791b3728e9b88fd739ed1cd042b82ca61341f541b4403d3
-DIST glg.traineddata-4.00 12746027 BLAKE2B 06147539764f2f3433df4fbf92807bd5da888faf91c3da51813855c125d67631e85e2215ae135136449817ef8afa1c6fb5bfc74d11e2443689d00dbbe7ba99e6 SHA512 3c0e34d0b2fc50e21bd1d08ec2862fe3839f84206669127b5a902cf9d61ffb38faa25d68154619053677ca2682cc70260d2ca443bc3ea4d319ce0ee4b21e649b
-DIST grc.traineddata-4.00 12838816 BLAKE2B f1cf709876d26a8136cc12b1f1d87771cb9fbe71d58e76dbd524812dd3d2724250104c2861694ab42eeaadcf43df676940119f0cdf429f2929cb69e17ed25056 SHA512 121aa44fd9f6b1841bcc50407c483aa7c94dc63217cedf655c393907e32d24e5dadc34f9c40c044153329f01010128c58a3ae8b6e30b8fa1419c1b66617b9202
-DIST guj.traineddata-4.00 22879598 BLAKE2B a4c062855e68a95c69c7849d2169fd3167a60bd6c473c87c0c16a809b23fbe49d935b242d15295e7d3dc50d9eac752214309998c459d1084b48375ef978d7973 SHA512 47cd56dbd2cce5bc1dd1947440f03ca3879df8526256bd4f8973fc670046f68eb4b5529f13402af9e1580c4af272f976a1a95efae1126d09208f18c7aa9d7b6f
 DIST heb.traineddata-3.04.00 4339016 BLAKE2B cbc22428f18602f7d9af02465e5e8c1088a86db812c37e113ea6a52a914710377d480366c190c852e466b7861172b964b705e328ba9cd3de5364c992e2c6e938 SHA512 9528f3b0d63bb2bc4f90c33808208846df2e9806085f134d4d6d6cd4ff96fe30ba3ae58db222245a7320646319526185ddc29cfb728d6db5038988bcf14a7727
-DIST heb.traineddata-4.00 10992421 BLAKE2B d7ac5d0863627073c9191d45afaf6cd2c76391309f58ded90231a3fca10e3e50ec81a0c51ce19a0dc0db9b4c395a3f6e49cb1beb20908331f841b53823b6b413 SHA512 b86ae5cc2ba7a1d9b3e178e9eb9153f2de38906de5054f494f0e4d35fb22af0c479ad9400ed8d1e625e648a7769778966eeae8a4064b1c9c85c3b78a7235155c
 DIST hin.traineddata-3.04.00 14152165 BLAKE2B 1efd29d700d9baaf2a6865caebca5b6375fe5e459cf0dc075396062233f54a1ea136787a975e3b0701956200fa79c539de5ff2e615ac83862b229c74b172c85f SHA512 3ac300090fc39564079aa3ba70dc09841d0fcf3181ff2f25e50fc5687c17ec9e8a5f5343879a87f7362235bafe074025de5eb02391fc68f0637f8bef1c16c3ed
-DIST hin.traineddata-4.00 25757980 BLAKE2B 018a1eecfd3ae63afec77678512b2c23a9343be330e3d0e242a2531dde7dd4686450db8598eb8a20f57463350da9fd28cfc16835b0436673d517b93915120094 SHA512 53c55f22b3d52a852e7b1a699eddf4567e1b72897c4f5ca2cb13e0968c1e40d0a9d80ca84986c35e9b478868e1dc2d86b65873960d21f8d3671980a796dae2fc
-DIST hrv.traineddata-4.00 19582927 BLAKE2B 2f8e7662a82f90373a6ef763f3878ca6a35861d91c03ccb72833008f7b430dd839e9e8d1633e2834b251de2f5299ee6fd42ecb1954208b8222b5848d359074b0 SHA512 35bbe4c202993d421a29f63390b2b5e774d348e15c9bfbe88b8e910f949fc84e3c9edee13fe47a3e8629a55384ee880f815d74eabe85fcb775c9d4bdb16e4321
 DIST hun.traineddata-3.04.00 12213770 BLAKE2B 70f39e1e9b370c186cdffc2532810542e4655dd46274ea8e2ba9249383b991be4d82793edbab2edf7ad400eb54e0c7be032a20fa3fe851d5c6e9b5f4be12f139 SHA512 cdd6957f83a50850b30d66de5063db83d0612bbbf3a582aacf35f011b8b595ba5dd03f4ffea784c337ce568bdd1cc3cdbdf96f5fc80783bad634a785f12f147e
-DIST hun.traineddata-4.00 21667149 BLAKE2B bd0e3cb3d515eab4e0d22d69d09ca5d3d372ebd65f7e9cc6f81887a208ff932f70df36f491b4288d635cd26bcca7f2947f5e64d8da0d12aa37fba8d5773bdea0 SHA512 f59a5b2291fd5588b4107936bd813209df174e5a6494af6b3101f7f426501c00d78c3c2e02a9e3277f2b802ebd6e1c1b95825f8e08a9bf7eac12bd149d9fa4e5
 DIST ind.traineddata-3.04.00 6503178 BLAKE2B 183221318212ff8c121f07541dc0d2855f12a0f5020b71d9e91a0c03c3938b7908debbcbe55e2df6d9f4f04066d513925d000cf1662aa084691f52532a4ae6a9 SHA512 997b0acbfac262d8889b47e8ad3c9ddea7893b89fe5edcbdb9a7fafe68ab4ac9e93e67cc1806bc6f4b1e1fa669da034687fae982318f9e05ad4716da0f276c77
-DIST ind.traineddata-4.00 14281790 BLAKE2B 668b8cc8d034a36c0c84a7109c92c547d42ef539103ddec41c996c5de71e71284d88253724d386bb190cbceb82432c0dc6fc25eb6b324e2e4a1d6a2297be2b04 SHA512 1835d1992975214c3a85a436e78cf732c8f8a1464e8c24109f6d1dab65764f4a1b0757e32166620637074ef02d0749eb494e66f4932d1e0af11ecf00fa7bb28d
-DIST isl.traineddata-4.00 14374305 BLAKE2B 46bc653a93095a93da74d73d93decea657c80ba14777bed7efab0d5fa504bd7fb16dc741d3a1bbc9782bfd92e043b8ff0ac9ce967f5f0f0a384bf638a265bc57 SHA512 598e827226edeb843d03848edcf95cf41a8adec2aacb79c2be47411876a2fd5650bffc1e6a252f3eae4b148667dc0a7e02b4130bcea898c6ade9ed99af8e9299
 DIST ita.traineddata-3.04.00 14210569 BLAKE2B 2bfe588757c1f4765d5f6323cd7a72a80ba37c2796dcfd58b8dc00d9a3ad94f1e8710690b75542758be01fbe7b966d29e19054affc27d473e43448be0b2f327c SHA512 97566bb89803656cca14d3559a46734b74f7859fa651399705de8a22259828e76aca2ef8d27f486e3ae7779005772966155ef190ba666ea31b7bf8c1d2fe53ef
-DIST ita.traineddata-4.00 23586689 BLAKE2B 288bfe546f3bf0f7183214d08b8f655482c22676fd50ed43556a2772a9ba4c8739011faa2c49f4d06646088dd232c5ea5beb34d5049bf5cecffe39ec3c5dc647 SHA512 0e32802292edb6bde1300a28af43e720e8cd6ea28e236865b01f8f5ff7b2e04b88d5d1ff2c32bf4fe20691c01aee4e524411c4cabb612e881e7573dc836ed0e6
-DIST ita_old.traineddata-4.00 23437150 BLAKE2B 3c949a6f67210f5a5d81240f4530915990ba1f4e5eed7dae32d33b3c7db7a3ca401dab887f5327a86f7dc5b20795f8ebfc0537f894a3a054c35ab5d1b5ab5fd0 SHA512 d0e98445f637422dc24350c7d29c8e3a3403a75b8a28322706b5dc7c8588e9a74796edbc39036ee44bfe68964e7aa60f430682ac2385501a4fd8653c54d01c5f
 DIST jpn.traineddata-3.04.00 33072615 BLAKE2B 39fc312a431c2fa8a82a4fd81cb2ed27bc29b92daba71307db484c34ca0cb616e816ce7404214e562b822251862ba79f256108320ff8fbb1cf942e3facd571f2 SHA512 23d2880f19e53739bff456a2e656924ea811872f16aa6bd52c87afdf2d7f639896d9b732ad0eea1966acb3ac76e2ed17dd6786cbbfabd9602f4af229580bf567
-DIST jpn.traineddata-4.00 44380238 BLAKE2B 0fd8222725cdecd00f8c70bab75c9634d1dbfe7b8ba11a274d199459d237dc3ab3b0e4a838576ae6522e4d503bc1987a574a98fd4d4610a8e420f8eb630d9a04 SHA512 ff49dd391d718152232b1db45ddd909441c9b6e753d56ce66ff637421db0e3876d7f2e66901bb67f8ca42c34d009d519e6814cb38fbc4403f63791754fe2aaf2
-DIST kan.traineddata-4.00 49079291 BLAKE2B 3d0e8dd6448ae51506a35b724e960d4d8e6a04c58d81ae1af6ba45b12a7ccdcd265812619898bbbf4684c7a7809e884950e55421d7e70ced19cc4d163b9c3334 SHA512 b407ac1d48f7d60d1e2ad67dffc0a7d0756466bf4f687089f62bbac44d787804048c95ddf83565726fcf5638f9986e11fce163c008bce92b51d42b4016444a9f
-DIST kat.traineddata-4.00 15490959 BLAKE2B 0eeda0f9c317d84dcebb9015792de6e01b140144fc718ff9c01780902a5ace770b0b4b1a7361b96e8246fc04adee087e3c46699fab0781f7a2f87f727286a3bb SHA512 9af3cdfcc0be350a9a2952a478bd5f12cae0a688486dfb391b5eae9a44c28b24a05209b08feb36fd7b27dde86a300bde32b569596854370ec5e08bedcb39efa9
-DIST kat_old.traineddata-4.00 5981988 BLAKE2B ecc8044ef090da97e12da3855ecdd5a01972c2d30544a57ce2835e8142e55e73bfb214a56c899916dc5438351d08ae3706f10c40fe4cf493ef3ace3036ff0ed0 SHA512 d98c6ad4a345726b20178eb018fe521c5e811eaeb79f7eb3c6c2abe4e984bc9bd03cb4644942ea24aa88e01a5972c8e1e3df9374b4f0e5e6464c8f5eb131b74b
-DIST kaz.traineddata-4.00 12616561 BLAKE2B db8f8166bbf8bb90be8295b7a80fbd8b4a3ae89cd4a46bd2caaeeb055dc56b41432aef32679d71c09c22384d60f2d34ce0b9b12b94d70ac3494d1587fa04a7ac SHA512 742bfd1ecd6cc06b1f4c89aecd64439b981d5194933fae7a8fc428b3b761b99f9cf54151c3ab2950a9e3630ffd28ce973e82c4cf3fa6b035a1fb60562c038912
-DIST khm.traineddata-4.00 54152200 BLAKE2B 7ca00baff0eb2b1efe749f823a85f74a72b58364de8e2c58bc85105e5911d28910b6778e86ba48ed0ca25c3895120d9c8d7594023284994ad6b94318c7ea4ba0 SHA512 3d9d096880e75ca6df0fc47548fd31f1035b2527edcfcfc6df926f358fdffc9ef8b8347cf7d58bfe76ed1b0bc8906ec02a0e493bdcdca14a78c251aadca56b42
-DIST kir.traineddata-4.00 13994013 BLAKE2B 20a8dd1c73a599e3cd79e0f9e0ecbf824eb465beaa56728cfd7a7583976e9371a247f0ad8083c1f6645166e1a15c625798158ba2d9c6a113614326efeb0a9217 SHA512 399c4f53a1a6ac8c3895231d15fdd2e564e2fc81b900dacbc1d39fde019f2f881be83ed79c2a7637b5ad7a11be0139275929f4cccaab388583ad107666776582
 DIST kor.traineddata-3.04.00 13309831 BLAKE2B 6a2ebbe51f8c1b5dd426a62b982acaa1b1a7c32f1a9282ccdb9561846d36a77660c8911065a72f80fb353d757b34958292b76dcc25656441e30c68f648df5cf8 SHA512 83d44cc7a870aa3efa6858f09ed1ee50d810e29711b706d6417d2aa79125da13bcd8f50e107dceef93849446a0506d122bfb8ce649f7e1e7181cdf75a6e0e4ee
-DIST kor.traineddata-4.00 19342144 BLAKE2B 3fd755cdfa8d3e73d6c19f4fcc637edf3816f24d36e23ce0a25fa319e85daa4512ce6420a06fadae6e4522f7ab5d57af3a6ca4905bbd0036e92867576a363e25 SHA512 1f932f25b60ec8a1f375bf03b9e51f3457d0259340bb4bed21bcaae44768c5dbfeb3b2dca98b88de89d8b52cc6e38dddee61315d4a286833186e5fdea1e7f773
-DIST kur.traineddata-4.00 2020502 BLAKE2B a2bf3775f976330c9b566ab77d210dbe97b15142ad26883c64d2156cd79322c8cd92368c827f524cecc2732e2b82e45586d161e2f0f9a95efdac5a93e07db835 SHA512 49e0661a2517632543eaeebd8c6468231f811bfca513731c7e5b1b0f6c0f1f1c86e3e8d757bb0cea1af077db46517cbce72cd8d9d71cb006c1ed6a51c9b8d24d
-DIST lao.traineddata-4.00 28962138 BLAKE2B 7c1e71dd68bf206152155a3efabf58e1fda09c8e43131d71d7f004bafd162fb67df433f1647eccbfc6f275271f7ee62c2402c8c3651e48111e4799848b9e6c29 SHA512 75e56e234e544de5c683801be0e0c5b41cec7553f441c302c4ca1936c73afe2a0f467118e5b773d574495d925f54d5607675056674c0908362735c6a1b777a9f
-DIST lat.traineddata-4.00 15241172 BLAKE2B 3711fbc71fb29adfaf5a1037c45550c7fc62a99f281018d20a0a396ae614d58411f6aae15b2de2b2aad44cfa51aec22d0a32be0acc3fe7df2a5ff69a8db0d010 SHA512 fef165eaada48f0c423177674061e05f569a3973e10423a78c2ce8fda21848e421150a9ce47f4185d70a72a344239715b2199d82dc5f609a29681cd85ac53234
 DIST lav.traineddata-3.04.00 7802105 BLAKE2B 40b90aadcab68a1787c77ebc3bceeb120fd4407cad3b7a33ca176cf1741d3b32ce1c4e81b3b793872caff756ec9651bfe7fc99e9721747eca7681024eb4b4726 SHA512 f45f3c722994c627a681bc38b66f64eb7d33563654f35ad838acdc11f66d7290eba3af3cb41aed633af981316f71fe44cc6fc20a0229b6ae20f3a96a1744a16b
-DIST lav.traineddata-4.00 16963807 BLAKE2B 1998b9b2995f81069733292cff42919eba5ef35f61359ede5a339d2667f708038a2ecd3a66e66cab33b07c43e0cabeb00db2b75f87d535f312119954e1e1c084 SHA512 c8ab21a9de64b13fd2e96c8300e77d81bbbc8037ee8cf38cc5ab98f3b81b2cdf969dd4a0b893cb3d545eaa24dd3fface55b3da3cc8350e6e3c8ed71134ae7018
 DIST lit.traineddata-3.04.00 8916163 BLAKE2B 7530938920b957b5affabc2e73deeb5e1c44a1005c5fddb3e5981db3c9b4c42fae45eb5ff88b1b41a9da9fa888ea4679ac2bb36f458c5da81d0251c85874ccc0 SHA512 cebd5fdd1387b919c6327fb8a6337c44787bfcde283e56dd71bd96b22ac4435c2a55418f57c4dbcf11f7174eb4feb736370d2b8f5ed2184a3c8503e13fc404d0
-DIST lit.traineddata-4.00 19560399 BLAKE2B 9d7beb73c7552cee0dcc3d9d3f88d1f4f00890d2f0831d310fd0cac7fb02cd5eedcdca625e998f4fd3c113229443a907d0279ab0c9ec33305d1f71fca9125faf SHA512 e8c7f23bfa87b23a80c15929e0697f6a9a2fee62b298555bcae61aed80f9cb4528e54c92733c844a69f656e98e302a2415cbc4ee54f3c5f2743ffd653fa78e37
-DIST mal.traineddata-4.00 21778761 BLAKE2B 8c61958db17d2cd5b688e4978552a8959b14944e972b221fbb9864f73bf2b9d35fab8a090bdaf83ea16fae2da7900dece202accdd34c0156058bcd95ee5e2f35 SHA512 2b0cb5ea506a91206f3e33c5c7db7e48369cca240aad57e78c9a8b642826a3fdde5b0b1f5d83f8745db4d9ee66f96e6ae8d321cd41ae93f6759c83927c235bea
-DIST mar.traineddata-4.00 26199347 BLAKE2B 726dc5dd7370038b9eadaa1facabdbae2ebff0ded6833e461cda004f7a33dfbb5b4deff6eb59332a27929058bf71ebf6dd458a8e3d3e9661171c09e457432883 SHA512 60fb8db91831476a7bdb70d64f16811a1d244286fd92c2db65b7d53e177aa0141149325d8eb87c29a1935a7942d74ecca36e7153c656c47366a2eba4f35c815d
-DIST mkd.traineddata-4.00 10485081 BLAKE2B ef57817f9aeff720af2f10418b3244e8dc83988ca580b726d9b628c45eafd4e9347d7aa68e8aacf9cda1e5ee6c2fa27a8302b01775c88252a7b1838e79975f0d SHA512 2bd8220e6133c7e60980da687fd8fa25ef227de76326bff70f7e285ffa7d30c05bbc0ae57af346fc17dd37f5c1cf408b976d8983be264687517c292056daf75e
-DIST msa.traineddata-4.00 14604064 BLAKE2B 3367afa1e8d9084a767ecdaf36c0441ad35c1437f95ac480e1b186c5e6706fcdd0a580a386d7bcd80dc2109c2e5dbf76b19a7eb144bc04377fd4549a93901210 SHA512 deb9fba173fd967ea6e92b68f79417c126c3b2d25b67eeb4390a6d27d04e585e27761c1c81ae8c03119a223570bb1bddfe31b13cb5450666253cc1a8fe83b9f8
-DIST mya.traineddata-4.00 75085274 BLAKE2B a1334f89300c2189770812e281d7dbf5e8586a5b87f223f85e90c789345ae881ec012fff94a0a15f3786cb99922cb56c5d76b77804cf0069949de1b1cbf6dfc7 SHA512 681d641eefb389636e59ddd9c3bf23153d0bc0aaf4a6bebeb15af4cda6a9069c78f64e1eea75abcb06aa563ff074ba7b3688d54025c71a073c0e88133bc1d7ca
-DIST nep.traineddata-4.00 24248362 BLAKE2B cb033b55609b9bdc18ae96cfee5315de3ac440f4e40240a692e9025f36106dda67c77bad7fe1e70f04ba8a596dd988a0c455112f56c8f6d753b4f2ee73322601 SHA512 f289a240f2d9c442b8c4cb678d849547dd3c8c187ad4d4e5829c98c925fe07e0763679e04c8a2360a4a0a77644dd191ac31728398a807731ead879896e4f5509
 DIST nld.traineddata-3.04.00 17098919 BLAKE2B dcf0641a78f1c8c6493e504229a08e1d4838d6c808446693b354ea822c7e2afc5fd9c9a1a2b970543c92fd7d4b3e9090dd8a6cd2461d6ac91aade1e1cf150aef SHA512 adffd81fe6fdbc94f790a102940dcbf913d51ab1a75b7ced9818f88df5c9444f2f3eb6363523084f1dd474c98a558e02ccfc32d83ae73af2af180334c1c39a1c
-DIST nld.traineddata-4.00 33075399 BLAKE2B 5fee9b7d29184501f98b490085717f26a626a26e00a133fdaa87e7374c17283b8de2c706f40ab43b1aa9278f6c588c33ca894f374514649dcae5903a24b7a0a5 SHA512 248ac4048b8909e325bd3ca4edbe48f9853eb8fdd8ad9d1950a557706fe45832ada8dac9dbbf033d33fe676101fa81f96de1c691465b77ad84e29f1307eb2846
 DIST nor.traineddata-3.04.00 8262167 BLAKE2B 5ee6362a945e0ba56da6da95fd9a7958ff90fbbb20b978975092410f9d8da7f600f8eafd8587f32065b669b8399a228ccea14db94c9e74f32b1c8b683facc36b SHA512 4e943a2e19b10b3c8c862e23e78c70f6a02d3c2ebcd01a90b7f25a677f92b19bde052a6fa48f640c0d8b7d74769fc7fc45ab1c412339cb0e9e108926be439ce2
-DIST nor.traineddata-4.00 17444731 BLAKE2B 1f8ed7ce296e27226ea12bcca9da0121859ebfded6780222993233d4c1b6346fb9a799efebeb9540ac1bda0ea1cbb80eec49e989005d8d7c81dbdf2199cd6ac3 SHA512 9f439a99e7316796c9d1fe3a562ea056459897d1cb195fe20ede546fe09b46dff9ffcff497b6db1ba1d9e82a914724f7645ef33263fdf9d7a86e5102802ff1f4
-DIST ori.traineddata-4.00 14655225 BLAKE2B f89441e97134a20c6324d07c58b3eabb130228e6fc4e123273b3e496c9862699acc21afd01bab3619d96447329c296d1b545206a72c69210296733f2106ce953 SHA512 532f3b0466675fb15f22888323bdb4bef983204169333b46387820add7f7d9e2d79bda3b65cb7a0825d20da13ca721c1233066592de0145555ccce2da7e0ec6a
 DIST osd.traineddata-3.04.00 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
-DIST osd.traineddata-4.00 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
-DIST pan.traineddata-4.00 20032828 BLAKE2B cc8d3a24e11dca32e183b5decc7fef04ab54b553d21f045a638391598e7f055b2ca4f15bed6dfe4200b567740e7f3e5211d13fc0c1e95e2d77bc4f9898d8ab26 SHA512 c86547b2ae1dedd259237acd59417cc1a181dcb2960791974dea2dc7cfeaf1d7604988c892ae40b5d51b63573d3fcbfc24aa87e2e068f532ecca730cd3395872
 DIST pol.traineddata-3.04.00 13918058 BLAKE2B 5531bcda6cbe2a27655f3448b5093fc1cbd1167e91fe3bb410a260062a7163790667d43954d880b20df23d68d73f2aa2933d425a8651b2c3ca7c8387486b876a SHA512 e1730d8bdbb296d223000747aea0dfd9561401e17f37518f4f7ae6c1b13cf500f5f359df465013112e126fc426e3e940b5dc98f84bdfc6517a73a1f8e8fc4c10
-DIST pol.traineddata-4.00 25941386 BLAKE2B e32f7bd871463ef49804195300dbd5abbe2f0b57b42061b7f5a727087bc452358620a775ef66a6b8f1924ff47382e228b18e18b81a0ca7593e537d61efdb1ae9 SHA512 42442d52aa1afa52274b307994a1470bd643b017ab3effde0a61e44a22463fd17cbc516cfe2bcd3bb9964782315b08a95d1dd7b40d3f31c04fec8109fad224ba
 DIST por.traineddata-3.04.00 12914622 BLAKE2B ed0edc8440ebd3f2e9df7dac9ed399df79ca803d16a1396434cb058424637b123af54b0f970120b54d21c00d8a0b1fd387a12bbd200d5a85ed1d49bfea297026 SHA512 cf771fb86aad468d73c879049382b4c88b978eb9ac450472b1729f2cc86e713e5ffe5bdd3f226e3f6e6340e38e115d201046849428b05c2a3bd406eed240ea03
-DIST por.traineddata-4.00 21457953 BLAKE2B 48968b2680ad161f20a6e51bbd6da47c9b9e60657702250348900e27ddcd39f2a9482bc0bb331570e1db3c5aea9190194287938c4f249025bd73409f54c46009 SHA512 5bc95002bda1fd0cf15d3be6d417fcda952417c5a9e08c46f3bcce859e89be2359ec4bb15199bee0cc72b407251b7b4ee655d67d46f8738bf29bf2b12bf3b29d
 DIST ron.traineddata-3.04.00 7957608 BLAKE2B f17e0e139bb0c5b12de89b82b62fa3014ed6129c60278a751994fd107a4ee310f991ef425296e3f3e3f44387ec8fa22da4e6b29127d7a7f5b31140240b79cc9c SHA512 921aec7e0e91d7bcb3b85e2b0c5544b105cb01516c100eac21caedfcf27da678c392574c3dfedc81ff52571a8702c91ee76529ecea2b6bc3e155f6e2c56b951a
-DIST ron.traineddata-4.00 16545516 BLAKE2B 805a76320f74ba0047c726226115b056ac99334376883a2d5b824ff406d87da5334d9e0fe523aa6c22a04404c45bbfdfd3e250ad6a881b437e35697bb787f260 SHA512 045eb12025bb4e85edd7f82407287e451432411303a17bfe2ae13327a99f568903fa6b105d3fdd6ab066161821106485dbd8d44931b2eb357cd6145adbcd3d65
 DIST rus.traineddata-3.04.00 16152507 BLAKE2B 329619a15cfb48c04d1d4e4bf902e090aac9ffaa1998a26a8861dc24ddb8d9727d473024dae44a43b7ff29f0079cb87dd60dc1a49d2e310249eb05999daea839 SHA512 e5053d8b53a676d800f490276172f16f2754e009408164958ad2f61071906042c299b23fdd3dde4a10026e42b19d03f8a8ab7de2fc29d8b9843d30de5c36a335
-DIST rus.traineddata-4.00 28115168 BLAKE2B 331d490fdd50f77c3c02ed01780af28431e531f6bc4b45ce889e9be2c63a8de02c45d9b503871dbf4a2eabbaedb9d8b448f6a4764bd4601ad2033ef4dc229acc SHA512 4a4524a4759b52e7936518c37aa3e60032537a5a2e11fc8ad5e48bf92a2f8efc54cab3962db5e980b9d894dcbf791ad796c55b875eb95b7f03444eb75c1cedee
-DIST san.traineddata-4.00 44276691 BLAKE2B 0da566cb2b5f576e601610b6532f0661c88efcb2d1570dd754b41a9abb4f5e3ea75bce3f34a8631b13cce6c1369698dbfe79e397d6cd99f1072d81004b60eb5d SHA512 97c266b3dd7b557575004d432ed7ea09ee44cf168d8f00a0dc544ebcc4df736c175a88f9c0b45a600d99eb7b3616bd2ceb96ebd2eae67b43f9d38bc35736d006
-DIST sin.traineddata-4.00 13528944 BLAKE2B a7d7be01e740373946069aaf2d8f8695aa6a9c958c09ca0de7d904d915f6dc803d734702a279fd630cdf3e3f6cc35977938a05fa298f1e2d5cbc7d3a6e3677b9 SHA512 1dc149d2c9e1c394d2945a6c41a9885ba05a82b6b629f87157d8439932066fa54b5316aba0430c4f861703a8aabc3cacc1577992d68869a988b11d4b93c71140
 DIST slk.traineddata-3.04.00 9126966 BLAKE2B fba32bf08f14a2e354b298e01b900f7e7b0aa6082c78214a19b2a11a9b2cc73a0ab9f70453888860b3e1db5b450c1934099375c258d363b32ea497c2833335c6 SHA512 33fbb9ee9881eb68b1e75cf9c7cacc31f306bb4371139894271e34e201740325ea26fb9622e4cf980a6c3a162568927a4085c5f63d483146fa2b2fe3d4b85a96
-DIST slk.traineddata-4.00 19335882 BLAKE2B 2b7f901a4530c79bf790bc0f5e79671b48cb6e919a87d16ddca29e6229a2b36d7b7b8793e5e13c8affc18f49969b09ac4074a354c56b7b2c78ce04b5d6cb3729 SHA512 f72db1f57ffab113424d872ad97f8b1381c2be1ad2b8f09f6b4a5a75eb59d5f53e3319160b451fd6313ee8cb0606afd089f4051580d4af4dfa7706814d89bf7b
 DIST slk_frak.traineddata-3.04.00 845250 BLAKE2B 623c43315b4fc842811d4f165d19f82b1141c22d78e1ae98ec31b5b05df31f7c05702f30a37043c7bfe6bb29b8f7648f50445e7a2f4b1de666599b211c1de6b6 SHA512 89b794f06772982ec63e317e95ba1c6b611881b8363b645ebfbb4e7c29f914545162401d4766d1b3247ada6df1fa1d7cc02ea539a746fd6839c45124e9e68ae5
 DIST slv.traineddata-3.04.00 6824064 BLAKE2B b9e804194e82b3f7358cb794ca0eea0766e9166e76d0d48f6be57b431c8ea4d88884adb4dc68dda24e07d06ced018992cb9e4690d5778ae192fa9aa533ccd8b2 SHA512 26634af8d9585f293d4af38c0bd6bd7c552edeaa59e3f2ab1e170431f40ba172ca455ede49df90a0b97b4da253b3a96394f4729f6a349361c3e954f2f59e2bbe
-DIST slv.traineddata-4.00 15472904 BLAKE2B e701dc8e30147cf3779414bcf95e30344e661f0eee929a419d9f30892fe7ebd39ed87b5a2be6073f06be06b03cdbe25e74bf987e23290d353d3ad4d6ee2c947d SHA512 975542196c706e98430e5e8fd9673d03ada91a829c0b0744bacb6fbbbe93d22f3fd36de4993766fdbb76f3902e4e7bdcf59a4b51a0c452130b3a368d0e645208
 DIST spa.traineddata-3.04.00 15953087 BLAKE2B 9eba61ca27a8697b4e671d8f0d1626500da4c18f046b51fdd692576e5b9068898a75663d2745cd21345a6f3df5108b358624b7b7a264e3c3d4baa34cf0631771 SHA512 e1356c0948c9245fecd335b1b7dd3c84c56b09210e84c5d211d9ddfb2bd3aa232c97f8e8d03f2a6639120c5196aa4222a8385da64528261c7cf137cd64b214a8
-DIST spa.traineddata-4.00 25107848 BLAKE2B 6ac79f12ae4a06b1843e6df713b61abfd4933f17e61e783e57c2049cbb8cbf82962eea6e1280d975004d9efec4be463ffba4be2416204d63587d25321c698f26 SHA512 5d009401faa71d3a8e9c4ff32dd1efc5e38c02b8c4170653ebb33874e6c489f7556c67ce6ca7cee27500496f657cf4361314563576176ff5e545b8079722bb8f
-DIST spa_old.traineddata-4.00 26019934 BLAKE2B f7c7383ea812fef6ea9bc15083a78880df71d19dc9ea092102e78bad9a7cdea4fc88d8a96201d8f403757c366a6368ee0c59b8af0163b9ff33486672a19a24c9 SHA512 b50c9785e6962defd3c9373272581eefd476405e8b0f20d4f692a99137af01319ec92af0c51207d724d4f83852c789c2f5109cc6f47a1a79080d5024926ffc7c
-DIST sqi.traineddata-4.00 14827880 BLAKE2B 6af1b9033aec450f44a4cc37e9df71970a60a60d1b53151182ea39da2c85e7e638a5174b45256fd04aec05c174d13b4dbe7861767c0ae186f787df2c776aff0a SHA512 56a2e2486f05498f6fd136f27406eafc218e2c9328274c60c4bacc5f51289d3b99810c305da76e5ab3ded05ac1c33bc822b367394bb030dc7f2f6bda3092a4fa
 DIST srp.traineddata-3.04.00 4611681 BLAKE2B 08c3814a6463a279fa4111d9c94161ec43c84e6479436734e067ae5aa9b17d09ed02a74ea814ffe389e625253599a757b2bb5b866d1ca0e8991308658f57585a SHA512 41925f957f9b30617746072216dbfb642d55caebdf95f8c322fbc78cf6040b85ed3bb91e81c3114830504189fb8e9f33a3150878a571ce714345e9d87263ac2a
-DIST srp.traineddata-4.00 12189572 BLAKE2B a3ad3417703807dc4f74b4ba79af8038a96b3dcb1cc56d1370a9c41d1508d6981a146c6dcac833e0d88c690de8a488fc9c2bfaca97035baa048e3c993d9c73b1 SHA512 69f7703d48cc3e6cd1d2d40d1012ead58a3905beba6787cf0276c0268d142f64bc7116ab43c6339eb8704ebb293ec25c2041093b4eca8cc76d64cf432a95f26d
-DIST srp_latn.traineddata-4.00 14395288 BLAKE2B 08fc69718d64df4d785f3943482c7cd1e09345a18312c1de8661a0d1db0e926322854e0b02c3c44e516b00b42e19153268849de6d41de494d5ebd2e715221d4d SHA512 65644d3f7e01cc77038a438d438707f48f5dda1827f729e793fc478a997afe84388d51993e18b31833f5b1a3f37b183112ec1459bdc3184ccce3f6dd361c232b
-DIST swa.traineddata-4.00 10931654 BLAKE2B 6d3861b636c06dd7e03a04c50c48a8b736afc91187ec4bfa44a58563f20207af2472da7832955c02681d53d12384ccac65058f0b2fca6ba5b0a027e99f0cad05 SHA512 bb865197fe1558ea8b63a83d68906a7f2a12aadcdba2904f1f01f15db4576e96d942b8a2c684ee3a049f2cdc3997b9e6ca49faf531b1d885abe7228a50af2d2b
 DIST swe.traineddata-3.04.00 9460295 BLAKE2B 766bcd64e506eea7014975de1ddf6cffcf8610d23e38ddee77ac00125eed6c3db9c434c9f1d111a9fbfa64543b230743e1cce141b19201c7c94c96967bc35141 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167
-DIST swe.traineddata-4.00 19062525 BLAKE2B bcdd4b24e671c47d7c4e2bc88c19c9257651214b8eb4d7714e3c7fe8744ed0949a31a195e2daac6eef6e94439bff9a644bb794c386e7c32eced96b9aa1771694 SHA512 634c75641d27026afa84e4179889673bcc1dd6eb56459894612e0148a3e70862c82e5e92832ea83e066c128cb5646eec90a0b36f3cb4c789128b43cc27117450
-DIST syr.traineddata-4.00 8056121 BLAKE2B bacf6ee42b8a9dac7042ca2608ec72b6db1a760f505e3325105141a24395d7e4e35fed3fe737785e92232bf89584822b46af05e97308f76edad0c7bd28a048e7 SHA512 c79acc0bde79d7f38b5ddd34683615886d7c284040273849e4b31dd988c4c0ac1617c0f6ef9d246b47eaade5ad5fdfdc4bf99dbb29e2d33c3827927135ea6f06
-DIST tam.traineddata-4.00 17333471 BLAKE2B 67e4b10d8e9fab5df8455b35483972d5543ccf76d7440e7b1c9c8fe89a3cc4e19359a8695b1410004e202b138b8524c000487fdf2ee26247c0a2d4190b7184ed SHA512 9ad90eb8c291712e4cd874d41ed9bcd4169427a50509a353f5549382909458b46a7e4a092dec0d475c548e681426a81597c577f2f821978405a94f965fd4d05f
-DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac8975f079c42c78a661faa87ac1ed7f9d38fd59383d3ca1b484fbf371aeb5e872765921d4b79066a938b88671a3d9f SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6
-DIST tesseract-3.05.01.tar.gz 3574810 BLAKE2B 0af97d0a58c05ce4d6f8fb3f76302344f75b5894b036adc327ecc79f90f2b41da58c8145509dc131706e806e291355e221482980294e2c9caff4be93d9b448b6 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81
 DIST tesseract-3.05.02.tar.gz 3571750 BLAKE2B f8c856449ab763d66a50d4bc65450f3c71132e66b4306f5a022c3df65c62646ec202256e12b5ce91888330a5ef10a3966f91eddc241cf306809ce40abc165c82 SHA512 4cb23a6981dd5ec9eefea7b9674847ae88a411a7308ee6d946a920c76eefcf5fe7a90f6cb3ff00493a0e69b5c327d052fa8514d7f3ed506bccbe4b0163065793
-DIST tesseract-4.0.0.tar.gz 1961372 BLAKE2B 5d684ec58deddc2cad6d61f5a3e22e9bccc1fa96b57d5bcad5239d5ba6d0805978b94b4b44a871c0796a756173b8072327f8a44a6a84da5604a3b50d9e425d21 SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447
 DIST tesseract-4.1.0.tar.gz 1965053 BLAKE2B 172aed0b149cb1af8c8c7b53022de237c8e07086bad78063374d5e425180e4b70eca5cee4d66a1f5b0bc2d51f6b8d41bf0c564918a85977d83fdbe6ba2f5497b SHA512 d617f5c5b826640b2871dbe3d7973bcc5e66fafd837921a20e009d683806ed50f0f258aa455019d99fc54f5cb65c2fa0380e3a3c92b39ab0684b8799c730b09d
-DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
+DIST tesseract-4.1.1.tar.gz 1974988 BLAKE2B f729beb017ec81704b84f5e6539706ff0cd6a51a4d1b7b730c394af58ce2ea2a659203bf239417e8d500cfbde845a73d6e6e181ca946257c2f22525820899602 SHA512 017723a2268be789fe98978eed02fd294968cc8050dde376dee026f56f2b99df42db935049ae5e72c4519a920e263b40af1a6a40d9942e66608145b3131a71a2
 DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
-DIST tgl.traineddata-4.00 11991699 BLAKE2B d888013c0416c1e057522ec828e2c2b4470d50b55b6de580ecf20090771cd6726167ca1dc66f02afab1f7c369035db1ea84cb0c7ddcc36d37820c0c065648986 SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380
 DIST tha.traineddata-3.04.00 13565168 BLAKE2B 1fe254a7ace923a88579c46111a0be81ad7cac9d60d59189e26fef6c11469da26e86ca867ff97cbf1b83fc501d6e48fee0e729f6e73e7f5a512e7b89998475c2 SHA512 1f8750ee148a6dc5677441bdf8b41d09594b591c34c7fc0af1923a89acf9db76f12ab3ed136819b6900b70ff393fd586054fd383a427ca70b4cf9aecb6db029a
-DIST tha.traineddata-4.00 22477903 BLAKE2B d7c63754511c3769d12b424b7fd30c700f184d470dc4d1e12a861beca1f2574023f76ac7f308e4c6f1f0d289b3f428d6a677b65cb1d4b3fb1217a348f5ff59e7 SHA512 b4349650ca1f2a5317cd2691a9fa97afde1c22872147829a71b0c49cdffe7b8a732c9aafcb87fe12431e0bc897a82e48204e5d2369e8441a654aa3baa4d41096
 DIST tur.traineddata-3.04.00 14069931 BLAKE2B 385714a9fb0efa7a8299de7152729a7f7e12a29d4c33cc4df6c5592bd1ddca145acb056caaf93f077279489c3a12e2d95285d0790979cbb036206ecdab910080 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e
-DIST tur.traineddata-4.00 26503738 BLAKE2B ad1b7eec15dfe5176e0ee607b8eee5dd2e860601b8c838374a7bf85c890bc4013789144508aa78b3f613bdaa534a5c24a1b3b1330fd47c5747aba04a49050ad3 SHA512 03b58b9757a975a2b6101ce62cf12a13ae1b167bb3f8c8fb9384802ae6427af5f2182600972412c942d706a37b624ea49cd7ef3bab7244e7dd7bd765e011a558
-DIST uig.traineddata-4.00 7657636 BLAKE2B c1ff74721c689f5e8db24d3dd68f55c0e3cf4d3650f1764b65596e404a82ff25fd4fbc90b5a8cc504639fae005ba943999a35ab7811b8274777bd40dcba28128 SHA512 fc53338b875bd8d104f196e59b66e070fd789d8a58c54f04cf5b788bb83b4b83c5c9b6f1b1f468619358e833e436e1bd64c2b6b52e8499f5cd6189ebbdee3ddd
 DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96b9d626db6cdd8dfc190c4b8dd0919e6955db8ccea45dba2877b4959f3146cbdc5472a1fb813093232de8ea4d97a20 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef
-DIST ukr.traineddata-4.00 17775376 BLAKE2B 9d9b2edcd76e858f041edb3f04c29fb1c630fd9b250f982f6445baab8c256262f9f444eab69226ba50a8e647d2aede24d4478bb44c86c67deaeafaddcd5eb826 SHA512 26f02bd7d4c392beb3ec174041685d6eed0b6a2f0d7102d6dea271e94bfc8bbbbcb4d74bb34e72357cb3de7bd72f7e5da2d7fa576b98374f9a0938b2b52c9c81
-DIST uzb.traineddata-4.00 12505562 BLAKE2B e0fb586d07d70e13c03e2ae0ce7a9749528196ab6348cfc87f9cbb203d6ab1fded029549f6aef014e4d5a171feff4b41bd38190340c7e84582f621f5cff1cd21 SHA512 dd7579e62d5564d22945447d471bc288abceab99b21e224ec9adafc20899cf708e7fecc5c2c0133171f6a6841d56c04743a0b7762ee021e6b5d5f678e4cdc05c
-DIST uzb_cyrl.traineddata-4.00 10390622 BLAKE2B 055ad7b767d5e919cf386f3a1b2902bdf21918b7e7604d83b4e002f248c3ae209326c1cc78541bbdf58a12c96e7e072f5d935c76053bd7b65090191f9b0956af SHA512 d2e82371312bdeb3e4db73bb74270553165df2f4d2b62ae7de474286c8c02e27f7c5401c3857c60d0d1de3d02b9106e396de7cfa167b82bb8a874101498be0e7
 DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
-DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4ce4cbd40493d9b56b13ecc42e9e2b9030fd8ad80e44e8c784f344b0eabbdec65373135bffadf36cd79b25f19bd4d SHA512 6f73647d8fc4df104eb8a8b9444bb46e0ee7560dfff3c33055a791a17a9ffb78a857dac2aa0219c628469eea636f89eb1551151fd79d7ac8c2d4a09c68765560
-EBUILD tesseract-3.05.01.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
 EBUILD tesseract-3.05.02.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
-EBUILD tesseract-4.0.0.ebuild 3658 BLAKE2B d06d2635968b2b7d68a1dbcacffffbaf941722bbad81d12e1adf37993245964d5022aacb88fb40c9c1a8a35435cd8bf0baefb0ccc482c247a542e6c532c0d16a SHA512 fdb8e1b4a4f3280d3dd808ed630f229d5af276a4e035d1f7150bb2a8d2e8f60d0c2e44839c06f8bf1c0479b1ee20c52dc997a9369493832cd565c7bff4e1484b
 EBUILD tesseract-4.1.0-r1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
-EBUILD tesseract-4.1.0.ebuild 1752 BLAKE2B 3585fbdec92bcc4ee4f8826a851b9c58cf03bbc8624c0af82528ba2f9cb900305d9816f3daf08a5343a3dd1623882ba34402b967843a84d0dc5f3f90055237bc SHA512 da8401d6628b45cf9e89c3d4703f53441b0ef789db81d841d3b657a3bc883b5622dfe651fe1827dd4530715858458d68694d2ef3fcaa241c3390c5469181d6f8
-EBUILD tesseract-9999.ebuild 3544 BLAKE2B 3747649a31c9cc8d4d83aa1c9d2f47e5ebfaea45488373a1712ced42dcefd0beca400aae8b25db9c59fb4ded3b19c5e978adc365f90c162c3361aad8cb8c9cf2 SHA512 6926f550e5d0a68af8d941c4b9d1e0e54ca8d22a1a4e60d9f5ffa3159f399f5a69bdb2180da9b0fddb1416da5ae195eb2926d772233e9c759462876eb1730366
+EBUILD tesseract-4.1.1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
+EBUILD tesseract-9999.ebuild 1979 BLAKE2B f8f441ac97944f6d9a7239d0753e73e0b962fcc434bcd5741e4378ee91d054f254e7d9b55bdaacb5e5fe30bcdd224c611e2fb8880b3b04f9bdc26454d112fff9 SHA512 356a9202271d4a6b27b12ca30bcbd4dd06ab2da82bea81ef35a6c2135afcdd1e784a2da0b2c746047d9a1f9da3fe1b41af1454749612ef666cfb25342e69ef4d
 MISC metadata.xml 1144 BLAKE2B 1b9ecd743c9a6b016ae04ea28b8bc2f80f6192c8c52d9d7e165cb8a2f222cc08408c97b0e01cebd4840b46cf0f046b2a7511b56c8f14b1a6434fea6e1149a48f SHA512 a86b76ef0f4bdf4339df2d061d1ef4c4fa80b60bc1d748a8c8c06023a9a5bc025bd14ee2d5e06f25706fc8055d8722cef41048e39908fc3771ec5ddd314eea4e
diff --git a/app-text/tesseract/files/tesseract-4.0.0-manpages.patch b/app-text/tesseract/files/tesseract-4.0.0-manpages.patch
deleted file mode 100644
index dfa8e9fde340..000000000000
--- a/app-text/tesseract/files/tesseract-4.0.0-manpages.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 39ed30ad834a43cf403f88158c6db7a96f1bed29 Mon Sep 17 00:00:00 2001
-From: Stefan Weil <sw@weilnetz.de>
-Date: Fri, 1 Feb 2019 19:47:46 +0100
-Subject: Fix build rule for manpages
-
-This is similar to commit 2106cba0a98a90451df835f3ab7b2aaf54826442
-which fixed doc/generate_manpages.sh.
-
-Signed-off-by: Stefan Weil <sw@weilnetz.de>
----
- doc/Makefile.am | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index a218aca3..c0eeda84 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -2,9 +2,6 @@
- 
- if ASCIIDOC
- 
--asciidoc=asciidoc -d manpage
--
--
- man_MANS = \
-   combine_lang_model.1 \
-   combine_tessdata.1  \
-@@ -29,6 +26,8 @@ man_MANS += \
-   unicharset.5
- endif
- 
-+man_xslt = http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
-+
- EXTRA_DIST = $(man_MANS) Doxyfile
- 
- .PHONY: html
-@@ -36,7 +35,8 @@ EXTRA_DIST = $(man_MANS) Doxyfile
- html: $(patsubst %,%.html,$(man_MANS))
- 
- %: %.asc
--	$(asciidoc) -o $@ $<
-+	asciidoc -b docbook -d manpage -o - $< | \
-+	xsltproc --nonet $(man_xslt) -
- 
- %.html: %.asc
- 	asciidoc -b html5 -o $@ $<
--- 
-cgit v1.2.1
-
diff --git a/app-text/tesseract/tesseract-3.05.01.ebuild b/app-text/tesseract/tesseract-3.05.01.ebuild
deleted file mode 100644
index 02784759ea3c..000000000000
--- a/app-text/tesseract/tesseract-3.05.01.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="tesseract-ocr"
-LANGPACKV="3.04.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
-
-inherit autotools java-pkg-opt-2 toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
-	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
-	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
-	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
-	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
-	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
-	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
-	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
-	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
-	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
-	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
-	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
-	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
-	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
-	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
-	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
-	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
-	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
-	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
-	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
-	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
-	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
-	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
-	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
-	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
-	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
-	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
-	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
-	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
-				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
-	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
-	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
-	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
-	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
-	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
-	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
-	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
-	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
-	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
-	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
-
-IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
-
-# With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
-		media-libs/leptonica:=[tiff]
-	)
-	scrollview? (
-		>=dev-java/piccolo2d-3.0:0
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)"
-
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	scrollview? ( >=virtual/jdk-1.7 )"
-
-RDEPEND="${CDEPEND}
-	scrollview? ( >=virtual/jre-1.7 )"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
-	"${FILESDIR}/${PN}-3.05.00-use-system-piccolo2d.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	for file in ${A}; do
-		if [[ "${file}" == *traineddata* ]]; then
-			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable opencl)
-		$(use_enable scrollview graphics)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
-	use training && emake training
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-	prune_libtool_files
-
-	if use training; then
-		emake DESTDIR="${D}" training-install
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins testing/eurotext.tif testing/phototest.tif
-	fi
-
-	insinto /usr/share/tessdata
-	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
-}
diff --git a/app-text/tesseract/tesseract-4.0.0.ebuild b/app-text/tesseract/tesseract-4.0.0.ebuild
deleted file mode 100644
index d4ba59d9b351..000000000000
--- a/app-text/tesseract/tesseract-4.0.0.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="tesseract-ocr"
-LANGPACKV="4.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
-HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
-	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc jpeg math opencl openmp osd png static-libs tiff training webp"
-
-# List of supported Gentoo linguas and their upstream mapping
-# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
-# "old" variants were regrouped in the matching modern locale
-LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
-# Missing matches:
-#	ceb 	Cebuano
-#	chr 	Cherokee
-#	hat 	Haitian; Haitian Creole
-#	iku 	Inuktitut
-#	jav 	Javanese
-#	mlt 	Maltese
-#	pus 	Pushto; Pashto
-#	tir 	Tigrinya
-#	urd 	Urdu
-#	yid 	Yiddish
-# l10n_en provides the additional data:
-#	enm 	English, Middle (1100-1500)
-
-for lang in ${LANGUAGES}; do
-	gentoo_lang=${lang%:*}
-	tess_langs=${lang#*:}
-	for tess_lang in ${tess_langs//,/ }; do
-		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
-	done
-	IUSE+=" l10n_${gentoo_lang}"
-done
-
-# With opencl USE=tiff is necessary in leptonica
-RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
-	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
-		media-libs/leptonica:=[tiff]
-	)
-	training? (
-		dev-libs/icu:=
-		x11-libs/pango:=
-		x11-libs/cairo:=
-	)"
-
-DEPEND="${RDEPEND}
-	app-text/asciidoc
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-manpages.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	for file in ${A}; do
-		if [[ "${file}" == *traineddata* ]]; then
-			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
-		fi
-	done
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# scrollview disabled for now, see bug #686944
-	local myeconfargs=(
-		--enable-shared
-		--disable-graphics
-		$(use_enable opencl)
-		$(use_enable openmp)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-	use doc && emake doc
-	use training && emake training
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	if use training; then
-		emake DESTDIR="${D}" training-install
-	fi
-
-	insinto /usr/share/tessdata
-	doins tessdata/*traineddata* # language files
-}
diff --git a/app-text/tesseract/tesseract-4.1.0.ebuild b/app-text/tesseract/tesseract-4.1.1.ebuild
index c7877cb2d442..7313d345c7a4 100644
--- a/app-text/tesseract/tesseract-4.1.0.ebuild
+++ b/app-text/tesseract/tesseract-4.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools toolchain-funcs
+inherit autotools multilib-minimal toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
 
-COMMON_DEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
 	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
+		virtual/opencl[${MULTILIB_USEDEP}]
+		media-libs/tiff:0=[${MULTILIB_USEDEP}]
 		media-libs/leptonica:=[tiff]
 	)
 	training? (
@@ -37,8 +37,6 @@ DEPEND="${COMMON_DEPEND}
 	dev-libs/libxslt
 	doc? ( app-doc/doxygen )"
 
-DOCS=( AUTHORS ChangeLog README.md )
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -52,7 +50,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+multilib_src_configure() {
 	# scrollview disabled for now, see bug #686944
 	local myeconfargs=(
 		--enable-shared
@@ -62,22 +60,32 @@ src_configure() {
 		$(use_enable static-libs static)
 	)
 
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-src_compile() {
+multilib_src_compile() {
 	default
-	use doc && emake doc
-	use training && emake training
+	if multilib_is_native_abi; then
+		use doc && emake doc
+		use training && emake training
+	fi
 }
 
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+		if use doc; then
+			HTML_DOCS=( doc/html/. )
+		fi
+		einstalldocs
 
-	if use training; then
-		emake DESTDIR="${D}" training-install
+		if use training; then
+			emake DESTDIR="${D}" training-install
+		fi
 	fi
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index 6bba4a49da59..f44c6f3d8fc8 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -3,56 +3,21 @@
 
 EAPI=7
 
-MY_PN="tesseract-ocr"
-LANGPACKV="4.00"
-URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-
-inherit autotools git-r3 toolchain-funcs
+inherit autotools git-r3 multilib-minimal toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
-SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
-	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
-	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
 EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc jpeg math opencl openmp osd png static-libs tiff training webp"
-
-# List of supported Gentoo linguas and their upstream mapping
-# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
-# "old" variants were regrouped in the matching modern locale
-LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
-# Missing matches:
-#	ceb 	Cebuano
-#	chr 	Cherokee
-#	hat 	Haitian; Haitian Creole
-#	iku 	Inuktitut
-#	jav 	Javanese
-#	mlt 	Maltese
-#	pus 	Pushto; Pashto
-#	tir 	Tigrinya
-#	urd 	Urdu
-#	yid 	Yiddish
-# l10n_en provides the additional data:
-#	enm 	English, Middle (1100-1500)
-
-for lang in ${LANGUAGES}; do
-	gentoo_lang=${lang%:*}
-	tess_langs=${lang#*:}
-	for tess_lang in ${tess_langs//,/ }; do
-		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
-	done
-	IUSE+=" l10n_${gentoo_lang}"
-done
+IUSE="doc jpeg opencl openmp png static-libs tiff training webp"
 
-# With opencl USE=tiff is necessary in leptonica
-RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+COMMON_DEPEND=">=media-libs/leptonica-1.74:=[${MULTILIB_USEDEP},zlib,tiff?,jpeg?,png?,webp?]
 	opencl? (
-		virtual/opencl
-		media-libs/tiff:0=
+		virtual/opencl[${MULTILIB_USEDEP}]
+		media-libs/tiff:0=[${MULTILIB_USEDEP}]
 		media-libs/leptonica:=[tiff]
 	)
 	training? (
@@ -60,15 +25,18 @@ RDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
 		x11-libs/pango:=
 		x11-libs/cairo:=
 	)"
-
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=app-text/tessdata_fast-4.0.0
+		>=app-text/tessdata_best-4.0.0
+		>=app-text/tessdata_legacy-4.0.0
+	)"
+DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	doc? ( app-doc/doxygen )"
 
-DOCS=( AUTHORS ChangeLog README.md )
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -77,21 +45,12 @@ pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
 
-src_unpack() {
-	git-r3_src_unpack
-	for file in ${A}; do
-		if [[ "${file}" == *traineddata* ]]; then
-			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
-		fi
-	done
-}
-
 src_prepare() {
 	default
 	eautoreconf
 }
 
-src_configure() {
+multilib_src_configure() {
 	# scrollview disabled for now, see bug #686944
 	local myeconfargs=(
 		--enable-shared
@@ -101,25 +60,32 @@ src_configure() {
 		$(use_enable static-libs static)
 	)
 
-	econf "${myeconfargs[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
-src_compile() {
+multilib_src_compile() {
 	default
-	use doc && emake doc
-	use training && emake training
+	if multilib_is_native_abi; then
+		use doc && emake doc
+		use training && emake training
+	fi
 }
 
-src_install() {
-	use doc && HTML_DOCS=( doc/html/. )
-	default
-
-	find "${D}" -name '*.la' -type f -delete || die
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		DOCS=( "${S}"/AUTHORS "${S}"/ChangeLog "${S}"/README.md )
+		if use doc; then
+			HTML_DOCS=( doc/html/. )
+		fi
+		einstalldocs
 
-	if use training; then
-		emake DESTDIR="${D}" training-install
+		if use training; then
+			emake DESTDIR="${D}" training-install
+		fi
 	fi
+	emake DESTDIR="${D}" install
+}
 
-	insinto /usr/share/tessdata
-	doins tessdata/*traineddata* # language files
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 0df7faf6f102..0fc1f3bac729 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,5 +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-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
@@ -157,4 +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 11203 BLAKE2B 223fe9c011e12bcbbacbea22dc97a5d8633d593cd9ff38fd2376c51784f24c6cc4d9db8d12a0c1d87afaadef15c03d91cbae12ce60d64065e20db6020e83d700 SHA512 1100efaaa3bbfbf9609b2b5634457ef58a3613d595a73440beef7efa4be87cfe016b2d79fd0d2a3bc5c5a48502ae3f66501d610439fc7c720da8a85543f13cd0
+EBUILD texlive-core-2019-r7.ebuild 11516 BLAKE2B 8d6bcc8f80382e2480b5dfaf9b5a9a26dec57708938f2e95f9ae392e0cabe7cd5b7c150ffc763eeacf2840c6c6e4fe90a2ffc5b70fff4cfae95879bdcfbd5591 SHA512 dd9638046c5b66227bc67562b49dad2469c33ad98990fbaed9ec95f7e3bdcb786610b64faf40a405dddd1a0498bd16ddb9099a3702a1e3a3ae977409aaa9a3e2
 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-r7.ebuild
new file mode 100644
index 000000000000..1a7c04c4f1bc
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2019-r7.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TL_SOURCE_VERSION=20190410
+
+inherit flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+PATCHLEVEL=7
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_P}.tar.xz
+	mirror://gentoo/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz
+	mirror://gentoo/texlive-tlpdb-${PV}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source
+"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk +luajittex xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libX11
+				x11-libs/libXmu
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	media-libs/gd[png]
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	dev-libs/gmp:0
+	dev-libs/mpfr:0=
+	xetex? (
+		>=media-libs/harfbuzz-1.4.5[icu,graphite]
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/icu-50:=
+	>=dev-libs/kpathsea-6.2.3
+	cjk? ( >=dev-libs/ptexenc-1.3.7 )
+	>=app-text/poppler-0.76.1:="
+
+BDEPEND="sys-apps/ed
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20170524
+	>=app-text/dvipsk-5.997
+	>=dev-tex/bibtexu-3.71_p20170524
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/Tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+
+	mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
+
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}" || die
+
+	default
+
+	# These we need unconditionally
+	eapply "${WORKDIR}"/patches/{0001..0006}*.patch
+
+	# Conditional poppler patching
+	if has_version ">=app-text/poppler-0.83.0"; then
+		eapply "${WORKDIR}"/patches/${P}-poppler083.patch
+		eapply "${WORKDIR}"/patches/${P}-poppler084.patch
+	else
+		eapply "${WORKDIR}"/patches/${P}-poppler076.patch
+	fi
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable freetype-config as this is considered obsolete.
+	# Also only pkg-config works for prefix as described in bug #690094
+	export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-gd \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pk \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		--disable-build-in-source-tree \
+		--with-banner-add=" Gentoo Linux" \
+		$(use_enable luajittex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk dviout-util) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk" || die
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk" || die
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk" || die
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c" || die
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}" || die
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}" || die
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	einfo "Regenerating TeX formats"
+	fmtutil-sys --all &> /dev/null
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+}
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index 973ddcfc16b5..1df3b844f838 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,6 +1,6 @@
 AUX 51txt2tags-gentoo.el 214 BLAKE2B f5c5aad466fbc7eaf1ec36dcd4a52a914f1710f10fdce35640391ea4d9599903574967c1a7ab63c66f84ade4443f256d1bc197ec8179a6c3af75f1ec79cdd404 SHA512 e2a76d355c2fb163fc5c9b8013e04240206c8301fe2351fbdbc53d711625121e22cdeb2336488e6bffc355258a6d5dacbd48a2cec2d618dc4db17eebf0496feb
 DIST txt2tags-2.6.tgz 544724 BLAKE2B 9c8c37c6e003c7252276b32bacd373fe9143fdd93fdbc2bf0c23a83e2123c2a9636be5f106d248f2f0ecccd71eb9bc68cf8343557f10a7e6f8deacd8ade975ee SHA512 716e975f45dd304b6fd7d4e5aa8bd12e57c54120d892ae9abe11f1f3b5aeb747d8df0a9ffd34b8b5e6c8d422aac8830477f9a332c9e94040e1aa9946ebfe051e
 DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
-EBUILD txt2tags-2.6-r1.ebuild 1660 BLAKE2B e80ea10e868c318ff82ec4484217a2c95a23b9ad47e5646fce0baabdf8ff2f1498a69cc25e8ee8c97baf3ca653ad9e2822904c813aa28770614b4918b5185ebd SHA512 70d26497c0eb36efbb652af56705b179c206ffeb4e2498ad3b2d382966b2058aadc39804787937bdf77201ddcbd5720ace1551e21bbf1514b242789525ebf420
-EBUILD txt2tags-3.3.ebuild 519 BLAKE2B 60f010af5ab4ad0049844a005bfdbe93f4f7e198dfe4762f546f83f6de4dd089d7d7b3db234b102ce15c23281285c32dbc3b05b5030ad90b3aa628063138c434 SHA512 00c3e08f27b8d3b852891107f4caf889348b14add838feb03315ac8b444f4be945032eae8f674bc071dde629e4593aa698f47fd1d4c1489554a59eda910a0f01
-MISC metadata.xml 335 BLAKE2B 1852f3f02279c2d959ef2b886fa75f51c98771cf190057de977b730aae4c23941efa4b409b15ff3b859892484bcc559d8467e2b53a815b346b1165ac8af8621c SHA512 257cc7e9d2137e94fdc9d133133ca92b688ac2475a59dd30e1e0b4d548ce399cbf73cbe986f0f816c4be1f84668104e4e90f1257914512987aebb06697282b87
+EBUILD txt2tags-2.6-r1.ebuild 1670 BLAKE2B 00ecbc9792141f79ebb9488767c4ae56632117a898ce65b55517ec74fabb8679c51091c7cc56ac05f6deb9b07fe12d5106f93a7d1f6266ce698e18c2cc3789bc SHA512 1e106685085d9e282e297a753f061c901cc44ef785b9f3134684af3c3a9b695c98a50398922616a2524628cdc4770c24386c2ff170a910f6dbb79353ee77536c
+EBUILD txt2tags-3.3.ebuild 517 BLAKE2B 1000d1641025192ff07f593f6f60d9f0c97597eecacf47bccd9d2cb4fdcef50527e923d380a890bde62fb5efcd1945290408c6ef0907272b3ef608a156b2185e SHA512 10ed52c6fd76c6ac405919d8cc665d9251d2bd146c45624ed489b2e1fae10dbdbe8aab12ef67e90bced158c1bf21f0ee94f6f1bc1d44fd6c25419f881ff463d8
+MISC metadata.xml 245 BLAKE2B e2a831e97b1c75aa3e161109943ede73b2d686a83fbb11b84d3f201c8214b997d759c93298c2d7f14a6a8486443cc52ea9369fc12476747528509d9d8807b1c9 SHA512 4fa0282e97338eef99cd0be8c2cda4a5eb6d6c1393a41782a45ad172c9b99690d572598f3de81f5828ab568fe32d4b28890c22908f86c73ac8e399837f28fddb
diff --git a/app-text/txt2tags/metadata.xml b/app-text/txt2tags/metadata.xml
index f96fe67ab4db..dbfe7dbaf136 100644
--- a/app-text/txt2tags/metadata.xml
+++ b/app-text/txt2tags/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">txt2tags</remote-id>
 	</upstream>
diff --git a/app-text/txt2tags/txt2tags-2.6-r1.ebuild b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
index a1ae6ff89610..142ed1befe04 100644
--- a/app-text/txt2tags/txt2tags-2.6-r1.ebuild
+++ b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ DEPEND="${PYTHON_DEPS}
 			app-editors/gvim
 		)
 	)
-	emacs? ( virtual/emacs )"
+	emacs? ( >=app-editors/emacs-23.1:* )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/app-text/txt2tags/txt2tags-3.3.ebuild b/app-text/txt2tags/txt2tags-3.3.ebuild
index f7acea59b38b..572bf7c02bc9 100644
--- a/app-text/txt2tags/txt2tags-3.3.ebuild
+++ b/app-text/txt2tags/txt2tags-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/app-text/u2ps/Manifest b/app-text/u2ps/Manifest
index 2a287c965b71..b3fb2df7dcca 100644
--- a/app-text/u2ps/Manifest
+++ b/app-text/u2ps/Manifest
@@ -1,3 +1,6 @@
+AUX u2ps-1.1-nostrip.patch 579 BLAKE2B 0b76323c430eb56730dc15540424d12ddc509b0dbb4dab2a58a2bdd92d24952d95527faa62d39d295c3eb90f90403ce9fbdac6ee0791c61b021dea8dc4e97ab5 SHA512 8b45c626f439c7f72be092a310dd105bd1348185ed4c2bea05b084360b4b5f01cbd7cc6a2b1b3b9e8510bc1f1cc4feca429b0347bbc7a9c40694cb78af4391ac
+DIST u2ps-1.1.tar.gz 110892 BLAKE2B af0dd92d47a8530e8434983132c3bf0f0e6b88ff14cc9d7e73e95c842b4c1dad1b900d91c22a34c8f94373e62382841329e5b2e6b3aa9b51f6e5d6d6d164b596 SHA512 44a470268aafe7b90c17e14a15864924d0ba78b0c8707b9bf076e13b262a9d43d71b6527c5a995f82741e52fe2d07eac6a2626921e7465127a57405d4b5babd3
 DIST u2ps-full-0.8.4.tar.gz 5496922 BLAKE2B 416a206b768328cf1a268b4706578610e6bed45ee7475d52de515e112e51bbfcc777b2f21603826d52da42b9c6a3bd10dd4e95920e77c14e957ad4a6d0888984 SHA512 31e5c22163a934a3e153ec95e2e5dd94ce79f71a72278a386a6446b1dd053161c896344c51b696c37d838eb3f06fa6fe1db6b5daa55812a06467b2525266363e
-EBUILD u2ps-0.8.4.ebuild 875 BLAKE2B 5fc21b3f72b6dd9be481a7d765664e036efd4c61fb9fd22572b11f5926054fe378f10d69dff92a6775d2781180b13f63c8b6d96a7e981a88c111107e6862d26f SHA512 0206ca5f09c6a13d7c222eed5a291a2c79d8b00a1ad27256bdc4db230bae36e5e92708589e70258e7e50e0b52f429cba4e82eff8cbc2e1a7748b4b14a9761797
+EBUILD u2ps-0.8.4.ebuild 871 BLAKE2B ee76a71dbfe790942e74257ec4bba30340b4576892424c032b3b02370b83b2f77dd4f0d6552e7b38d5271bb3ef530e9a1064716f82f8de767afe185dad67dc2b SHA512 eacaf727800f1b06376980ce822a5c059633645b41609254a8134d4deabe6f82acb1027733f056515c12a8d80c8761ae5668ba6e627f761e28c56a6050255b45
+EBUILD u2ps-1.1.ebuild 684 BLAKE2B 1d0fc4e2589e66744b61242c549ef6d650fbcb8e5ddd6c7733b0b3ec4dfd18442b7c56ae8464ba825d05996bb07ba5fcd34614a06844e47cef26126ace7685a6 SHA512 f56ebd5ef238898e355e105d7498e1f78034501a6a2ecfa4adab3b45d399ddaef8a1bdd71d814f9b75119c293b8425a816a9268aad29045aa1ecbfd1acfba1ee
 MISC metadata.xml 249 BLAKE2B c8d28416ba97bac363e00b75508b255979d89984b4b053fb86e63deb2070dc32a4a363e5594e4fcf4a4c33268fd59e5e4d3c962087c7cd97e2912a6d62f0cefe SHA512 23e993b72c46792c1d03d216adc82fe8392b7b695187308ad3c5b181da2dbd9d1f68b884c60429e3bcae79693112369ef84a02545aeda90460aa2504b4057d5a
diff --git a/app-text/u2ps/files/u2ps-1.1-nostrip.patch b/app-text/u2ps/files/u2ps-1.1-nostrip.patch
new file mode 100644
index 000000000000..33ac79c4909e
--- /dev/null
+++ b/app-text/u2ps/files/u2ps-1.1-nostrip.patch
@@ -0,0 +1,14 @@
+diff -ruN u2ps-1.1.orig/Makefile u2ps-1.1/Makefile
+--- u2ps-1.1.orig/Makefile	2019-02-17 20:01:48.000000000 +0100
++++ u2ps-1.1/Makefile	2019-12-22 20:43:17.667058496 +0100
+@@ -18,8 +18,8 @@
+ 
+ install:
+ 	install -dm 0755 $(DESTDIR)$(bindir)
+-	install -sm 0755 u2ps $(DESTDIR)$(bindir)/u2ps
+-	install -sm 0755 psfrem $(DESTDIR)$(bindir)/psfrem
++	install -m 0755 u2ps $(DESTDIR)$(bindir)/u2ps
++	install -m 0755 psfrem $(DESTDIR)$(bindir)/psfrem
+ 	install -dm 0755 $(DESTDIR)$(basedir)
+ 	install -dm 0755 $(DESTDIR)$(basedir)/ProcSet
+ 	install -m 0644 res/*.ps $(DESTDIR)$(basedir)
diff --git a/app-text/u2ps/u2ps-0.8.4.ebuild b/app-text/u2ps/u2ps-0.8.4.ebuild
index 9ba7a301cae0..62fbac22b42b 100644
--- a/app-text/u2ps/u2ps-0.8.4.ebuild
+++ b/app-text/u2ps/u2ps-0.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${PN}-full-${PV}.tar.gz"
 
 LICENSE="GPL-3 GPL-3-with-font-exception free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-text/u2ps/u2ps-1.1.ebuild b/app-text/u2ps/u2ps-1.1.ebuild
new file mode 100644
index 000000000000..c28a8ccdd0aa
--- /dev/null
+++ b/app-text/u2ps/u2ps-1.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
+HOMEPAGE="https://github.com/arsv/u2ps"
+SRC_URI="https://github.com/arsv/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-nostrip.patch" )
+
+src_configure() {
+	# this isnt autoconf, so econf fails...
+	./configure \
+		--prefix=/usr \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
+		--with-gs=/usr/bin/gs \
+		|| die 'configure failed'
+}
diff --git a/app-text/unac/Manifest b/app-text/unac/Manifest
index 4b39ee039540..ddcec0b23f3a 100644
--- a/app-text/unac/Manifest
+++ b/app-text/unac/Manifest
@@ -1,5 +1,5 @@
 AUX unac-1.8.0-automake-1.13.1.patch 950 BLAKE2B 41be5811b494475d0927f6dc8a3581a4f39d15c6bd315921674e8653c0c87bf07b85e9d72c6ef3cae6463852a78b5f084b4a193ec1412369a818b04737f57f2e SHA512 f6f29885b937b4e3dc21379e1e5d81229de9f1a400d24f3ea83a8cd06db822b0dc7bb8fb1dbfce27aac6d2b83834fe7fe15cdbfabfb6d82ee6311079fe7807f5
-AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1454 BLAKE2B af02bd996b41651305b7f958adf87a0901be40b39312951ddfec4b0c973fa95626de115ed33d0ac609a3ef8b1f97e8673fad3c5d6ef09ac5f2744ef415c8609b SHA512 40294181f611a047c25900235d35b231e4026ff0a2759f90e3b74b0b93c97f64162803bcdfa4041652fe39421291248d189046f7e993d0a88606f4e240d04b7e
+AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1204 BLAKE2B 8014d5cf159b64c3898f3356ea8dd5393d4288c352c660b75d847a8323eb4425b02ab3f466864424405011e6587334a1e5f006588b563a1666b53b0e5f256359 SHA512 a4379869ea0035640905fd592085a48a6d23e3ae958044f606129e589348d5244cd3b6b161a22b8b5867588aeb60cc3f90ea93ed38ea1c90039928e4126fd29b
 DIST unac_1.8.0.orig.tar.gz 281807 BLAKE2B 1c566d75eef70b37cc6e8d4840d5712783ec01e2cf6ed5dc39a10b5da2af2c35928b62a1e6592bae1bb21682c3a0410582158661b4989f0ecbea80220bd256d9 SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8
-EBUILD unac-1.8.0.ebuild 1171 BLAKE2B 8b5a9c2fcdcb36897b2c872f868779d61594ce3e436d381588a072698ee1b508aae1936e42126e68253d6a3d988f0f696b026d76223deb2c118017f3b21c17e5 SHA512 78bde946af0b15b836075093f2d0d93b031c4fa1071fcae697c5e6940b80caae970d5418c4c62f3e5e404da93b757f39ace4154edd1344284e266ee80ed35c60
+EBUILD unac-1.8.0.ebuild 864 BLAKE2B e6341adb6cab9229b6e298abf5ba3162768d8f53d85b3579db43fb118255d101fed4edc4a27ceb8bb152ef0ba1119732020d8a623ae8c7636649a23f2a6ced5e SHA512 fbbbf170f80624d5952a4a7982d343f3d22f3fe8b6495bad7d57197ffeb49c5ceb265640dd55e11f9ee024819e1317fef2a4b5ef912523ffa64263c9f6cba5c5
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch b/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
index ca1d50274da6..a006c4fbd787 100644
--- a/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
+++ b/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
@@ -1,8 +1,7 @@
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556379
 
-diff -r fd7eb0d70970 unac-1.8.0/unac.c
---- a/unac-1.8.0/unac.c	Fri Sep 17 10:35:14 2010 +0200
-+++ b/unac-1.8.0/unac.c	Fri Sep 17 10:36:07 2010 +0200
+--- a/unac.c
++++ b/unac.c
 @@ -13873,9 +13873,9 @@
      *out_lengthp = 0;
    } else {
@@ -15,9 +14,8 @@ diff -r fd7eb0d70970 unac-1.8.0/unac.c
    
      if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
        return -1;
-diff -r fd7eb0d70970 unac-1.8.0/unaccent.c
---- a/unac-1.8.0/unaccent.c	Fri Sep 17 10:35:14 2010 +0200
-+++ b/unac-1.8.0/unaccent.c	Fri Sep 17 10:40:34 2010 +0200
+--- a/unaccent.c
++++ b/unaccent.c
 @@ -90,7 +90,7 @@
      const char* charset = argv[optind++];
  
diff --git a/app-text/unac/unac-1.8.0.ebuild b/app-text/unac/unac-1.8.0.ebuild
index 72fcf4f08e3f..fed5a147afe5 100644
--- a/app-text/unac/unac-1.8.0.ebuild
+++ b/app-text/unac/unac-1.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Library and command-line tool for removing accents from characters"
 HOMEPAGE="http://www.nongnu.org/unac/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/u/unac/${P/-/_}.orig.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="static-libs test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/libiconv"
@@ -21,29 +21,26 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${P}.orig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-debian-gcc-4.4-bug-556379.patch
+	"${FILESDIR}"/${P}-automake-1.13.1.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${P}-debian-gcc-4.4-bug-556379.patch"
-	epatch "${FILESDIR}/${P}-automake-1.13.1.patch"
+	default
+	rm README.Debian || die
 	# otherwise automake will fail
 	touch config.rpath
 	eautoreconf
 }
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README THANKS"
 	default
-	prune_libtool_files
-}
 
-pkg_postinst() {
-	einfo "Examples of using unaccent from the command line:"
-	einfo "unaccent utf8 été"
-	einfo "echo -e '\\\\0303\\\\0251t\\\\0303\\\\0251' | unaccent utf8"
-	einfo "unaccent ISO-8859-1 < myfile > myfile.unaccent"
-	einfo
-	einfo "See man unaccent and man unac for more information."
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-text/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
index 049f773a2891..1dc92bc042a4 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 954 BLAKE2B a1e2c2c34e0cee4dc3df62c0d92cc60af3174249b5f7501a01278c73b52d291de1b7b7f220eef2d52ad7f5562799e0a34b002a01e53e730a2c9748099ad9a5d6 SHA512 ef930a8683e19b7ae8858c554c3bed7741a6ce4508709794301756e5c041fd2545e1a777f538612ab7aff13674861a2dc2ec79e05ef1fd486a596dc290f45f1f
-EBUILD wiki2beamer-0.9.5-r1.ebuild 794 BLAKE2B 67e2278fb1568503d485f693f710e1b01dc4f513c7fd949ac0befa799efb050af3e0658a78eec4ca8e9716af24c7f3a98c88bf327c3fbac37cec8a98dab13a47 SHA512 78a5880517ff12c5fdd349c97bdd2676f594798f1e60695367f89495ea7bf456cd86d136509578743442992600df61475accd6cbc93f89540fbae6e67faf0e16
+EBUILD wiki2beamer-0.10.0.ebuild 952 BLAKE2B 998f98156e928746ce70b48523f145e92d6c06f5c5eda9abc0173802afc6d7cb23388994f5024edabaee4ef0b5404760cdfb7bdd0678b7435aaf135022bdc4da SHA512 6b50cc131a4ecc967c0bc0e806a4f5a9c4212d8e3efa5bf157cdf17b6cd2f919c738897c852939b7634f8500949514524a9f8b179ff26a724488cd131c8e52d1
+EBUILD wiki2beamer-0.9.5-r1.ebuild 790 BLAKE2B 3bb7fc5a147bc6233ce35fcc4e491a163a9644deb1728f851f3883f74e5085703faec6d5c95eb4015ea0d8472e171309d4ce83fb93f785891076dcf6f0f74457 SHA512 a14b02ab28c543ffc4805256a0a47c42d29072018dddc26b50e6d59f82131bba1816f479c2c917c6e6ae9744e9e4e7b1094255c6e09d744a67c122829e964d10
 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 6afe4808c6af..e297abad055d 100644
--- a/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
+++ b/app-text/wiki2beamer/wiki2beamer-0.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{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 1d2c951c2453..906911db6967 100644
--- a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
+++ b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit python-single-r1
 
diff --git a/app-text/wscr/Manifest b/app-text/wscr/Manifest
index 9af57eac226c..7ea951bb2b0d 100644
--- a/app-text/wscr/Manifest
+++ b/app-text/wscr/Manifest
@@ -1,3 +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
 MISC metadata.xml 421 BLAKE2B dd48a7b914e790db0db06781519466d05de32f96ff8399e9fcb24ff040119dcec5380677910d9155c611c28203ac1ee7bf5d9602faeed69d4bff35a8cb1d6b3d SHA512 70722daa9c12a7e783b5fb3651f207c057648287e104739043f96c726820268ceb8e4ec211af9a3e2f8fcf7a5e03c9346cea7a25a70478dfdb60f333112b70e7
diff --git a/app-text/wscr/wscr-1.2-r2.ebuild b/app-text/wscr/wscr-1.2-r2.ebuild
new file mode 100644
index 000000000000..3a34f41b57d3
--- /dev/null
+++ b/app-text/wscr/wscr-1.2-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A Lightweight and Fast Anagram Solver"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+RDEPEND="sys-apps/miscfiles"
+
+src_prepare() {
+	default
+	sed -i 's#"/usr/dict/words";#"/usr/share/dict/words";#' wscr.h || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" FLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin wscr
+	doman wscr.6
+	dodoc README
+}
diff --git a/app-text/xapers/Manifest b/app-text/xapers/Manifest
index 8a415cde45a1..6595defbca3b 100644
--- a/app-text/xapers/Manifest
+++ b/app-text/xapers/Manifest
@@ -1,3 +1,3 @@
 DIST xapers-0.8.2.tar.gz 160938 BLAKE2B cb21d04146f0cca39f1a706641e4cd2a83a796cbf4eb096379367203d91811c20798638a27215e9fdd9ffb32de908a389b0af57200f19bf4d2c8477a9c82ca93 SHA512 cdf1d4791dd48f579f9ee019492c26d10c9855c1ceef2c15bdc81dfdab0f1d74f54db453bb60a9d297a155a55d73cd26ff192875b4ee2b80d8f9f5d35a4bbcc9
-EBUILD xapers-0.8.2.ebuild 669 BLAKE2B 652b1417da8e28bff7006e35f82a6b35abd963f9f96b411adf8141613287b47ed63ca1d8a50519018d51d4b8d038e7daafa7f0ccc63c8ad1b28f6197834dca04 SHA512 6d5534928f6c6d9568f478e4b2e78e7b568f6399bbf94af3688754e800bdbf92e9913f022671b8db3553bf2f7d120b45c06b103b894ad662d6b414fc4c359e4e
+EBUILD xapers-0.8.2.ebuild 665 BLAKE2B 74ded3c69b277243be799924fe3abd57f517dbb2075f01c67ab955f88cfdd4c050c8fb9d5df415c60917d24973c6d9f567ede69038a0f13f74b6fc34d2cd5330 SHA512 f9d2eb51bd7a2c33c1ff1e44a1f2b3c04a205856c2adefaa03096e1fc4652ca4d282e2b112fb5bb414f657faa7489054a3c53258ca6ba96f2652f2bdfc3dbc67
 MISC metadata.xml 687 BLAKE2B b94d3d3f42be513d61d5e594ed9fbf13e83f3141d4dab74c48f396b411994c512a6aeb401e884b4891e17ac45f0329f52672dd3513420084e524a2548337bd26 SHA512 15bc8e58aec03907425c6d2ed011223b1e0b5925329e137f4f4ce0ff92b3ead2b22a3988a417164d51546c01c36172969bb6cd50fbd36a21f6dd99db1b89a944
diff --git a/app-text/xapers/xapers-0.8.2.ebuild b/app-text/xapers/xapers-0.8.2.ebuild
index d835d91dec96..87eb7f540cf5 100644
--- a/app-text/xapers/xapers-0.8.2.ebuild
+++ b/app-text/xapers/xapers-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2016-2018 Gentoo Authors
+# Copyright 2016-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index a67fdcf419c6..a445411bb6f1 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -9,5 +9,5 @@ EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e403
 EBUILD xchm-1.29.ebuild 1212 BLAKE2B a92a0015f18489465890cb9d292aa8e834a732e9d3b13b4df7fff95a42e0a3f2654c0aa59dae7327fd09e1330b5d0d8ab885a757c6fbfdb01227f2c04957c26d SHA512 ae281e0998252802f558ed91ba1ff39ec04144b9b2f6666657bc27d2ed9320a0420cc7ade9aa25cf5846fd1fbb3e4c158c2a4d3f9d164026cbf1fa9d3108399e
 EBUILD xchm-1.30.ebuild 1014 BLAKE2B b78f2480a9fb60cea85e74e185fc69b7cf34b429c53fb4d5a2b02b6287b88d156a29f2229dfa2332d080fbc8fa7b35a6c7165dcaffb60a9da12fb9739b352c75 SHA512 030b6a0e0100e1ba1ab2948eeeacb88fe42aa4d0d40be1746b2fd0a17d90178894a9034d66f8f7921160f2a4052a0e1f85f08c7cf191229f17badcc56ff0ad7c
 EBUILD xchm-1.31.ebuild 977 BLAKE2B 624e6af9fcc645192601235324dc61af665c23633fdfeb1ef461ea0e30f68f47b9723c0ed80f05aa73cf683b4ce1f37e1ce509966c7aa97b2060a00c24ab87b8 SHA512 ed839bbf9adf445c192518682e2aded1a0a2063f9ff1baa07427121dca675193a8d75ea2c0b23ed999588777a434487e52f1b38e070b6ff1712626c105a96689
-EBUILD xchm-9999.ebuild 970 BLAKE2B 0bee0abacf945c31e9b496be37d5a148639165e475f43e09c18c150da1f4166d915fff896cfffc6ba3823564a8c52e5c1d2d115255f46a31b2b56d50f3f89a37 SHA512 82e21f1bc56388d51e60c84df4ff1bbc4ef3321acf0eea4b5ba583d368d28e9b4b7c7ded1d87bcf3d5768348b9e14b86298950e9e0b3c1ede91c34d08c31f865
+EBUILD xchm-9999.ebuild 990 BLAKE2B c6f3df7cb30de65fb9a7cb66732b41f6f5f7392c1cf916e587dc5157a0620e859cc4adcad63f617f570598effcf98fe1e81d71a739620e8bd5fabbf9b66f4678 SHA512 346c431c1f9e30b80d7a1bf7ba769fa3410cb32e951bfe0388f8718472950ccf0fab1398f0133f3456ed55a7f0f6cdee08975b20a9cfa84a1f1d948b93d5f412
 MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild
index e47dacf50e3e..ae26cab402c0 100644
--- a/app-text/xchm/xchm-9999.ebuild
+++ b/app-text/xchm/xchm-9999.ebuild
@@ -7,7 +7,7 @@ inherit autotools desktop git-r3 wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
-EGIT_REPO_URI="${HOMEPAGE}"
+EGIT_REPO_URI="https://github.com/rzvncj/xCHM/"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 049f66bb78df..3e27884a4187 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,6 +1,6 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r1.ebuild 2760 BLAKE2B 019a10d63e77b3ebabe7b21d322dd39442958238050547842b3b583780dfb0357abc2f190ce40e32332e7d7f383988652218a00468f6f27a2f1b2e1c781d05f3 SHA512 cd46dedaf47b11b3f3ffb2febec8321700c2d9620eb7db600175ed21c3d51cd6516a90f33c2d2fbb3bdd0bb1507c81f09e44b89a098e5045f0e63fab35036b00
-EBUILD xdvik-22.87.03-r2.ebuild 2901 BLAKE2B 63409ea7ab58a864ca922d099988a44cefd3a18d6e6d4e4c3c46b69fb5f65616014370caee4e427404acb281d0b10273f17c68ea7096e6837ea88c699207c247 SHA512 04773c14bad5fdb1cd0460d0e69550d1709fb4d3e5cc13afbb7d91469d8306301770229b152f02cf7fba7f7784f882ff68dde1dfe983da7bade9ef56fe9f4ee9
+EBUILD xdvik-22.87.03-r1.ebuild 2773 BLAKE2B e41e55c20bc55ba501765713a55b9551c15581e8f0cdcdef2c81fd9273da99cdac8f7c82a57200aa500cdc75cec2975bc5d8157e7cbedcac9b8098bd902288df SHA512 dc696b2cd75490bd9ed7954b3fd78ca76b0a4aaf8cc1e63cb1bc2aee6db5d7c3fc3e899f4832154dc59050239c1a5bea08d01f2784a11103b0029ffdc7af5a74
+EBUILD xdvik-22.87.03-r2.ebuild 2914 BLAKE2B d3b3b254214fa79a2a1e65aafa22e756d1b1155afe676a97ffb698f03938fac8fb0c5dbb96fa3918d1725bdba3575e5c84d886e51aadb7ca43c5a424bf3c55b1 SHA512 a535c091e8baff1dbac9eb47f81f2c7b29a0934073cd9858285a5d884759c664ca328f9e932547b6a8a4afa3058af90ad3d500eafdd00e11da3d7f1de5552b9f
 MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/xdvik-22.87.03-r1.ebuild b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
index b52295a19d1e..3f2fbc15dc71 100644
--- a/app-text/xdvik/xdvik-22.87.03-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ RDEPEND="media-libs/freetype:2
 	x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/libXt
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	motif? ( >=x11-libs/motif-2.3:0 )
 	!motif? (
 		neXt? ( x11-libs/neXtaw )
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
index d31665bbb6c4..5ec22d077c6e 100644
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ CDEPEND=">=media-libs/freetype-2.9.1-r2:2
 	x11-libs/libXmu
 	x11-libs/libXpm
 	x11-libs/libXt
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	motif? ( >=x11-libs/motif-2.3:0 )
 	!motif? (
 		neXt? ( x11-libs/neXtaw )
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index 0f9016ab3c61..9d81319dcd32 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,4 +1,4 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
 DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
-EBUILD xhtml1-20020801-r6.ebuild 2361 BLAKE2B 73fe63abb3bd77b8ac2875040969a302c75e63d02524df43fe610b3b9543a867a92c240ab4b8bfc468507aeb83de63ffad70408176ccc5059a48e7ab33a2d821 SHA512 b256d6c0300b7a712785376e870f7e70636bfccd4f4fb6f7b2700c2dca242d6b6bee9e1cdfc81b2b0d8f04c986e21e363b998692abe92804a2aa3faed34a2981
+EBUILD xhtml1-20020801-r6.ebuild 2368 BLAKE2B 523c308e2dafe577aa734b7e1d685b72e7241d81f98d10d1d451f1682371704b45d2b0b6aab355d4cf6dbea71e817c19e6097e0d1f4b881ef881fedd8293cdb0 SHA512 86893a7861ceba1eee4039ba29fd840eefe7d14436067d2f3bf165dac1fc8d5ca0fcab869d7cc1de1bf9100afa0e9e6608e5fbc9cf46f3415b3a3ab896dfc384
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/xhtml1/xhtml1-20020801-r6.ebuild b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
index 41ac3da774b6..257116cb54b3 100644
--- a/app-text/xhtml1/xhtml1-20020801-r6.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="app-text/sgml-common
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index 8ccfb3314caa..f6bc3d5a03e4 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,4 +1,4 @@
 AUX xlsx2csv-0.7.6-tests.patch 2180 BLAKE2B 173aa4d2650b86648a7b0897a86f49650acffd1603cb6af4f8fa603d70bc902b23cd280cba0453176e477907e7e93447693ff8ec28b531213c1aa690e9288d7b SHA512 7374e315fbe73532e91278eea825d0171642f4d4d5c412e904932c67ecde0b71291c37d8f5cf8908449663435a587f11e10f409bc82128ef9388be0c002da22e
 DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489
-EBUILD xlsx2csv-0.7.6.ebuild 664 BLAKE2B 79ea8f4872a09df3aa62aa48ff9a68d8a8e53bd30493388c01068dfce76053373cd0fafd3e8b31b601d1776ac59376927177c3e92a0664fcc49b5705d16d7ab8 SHA512 bbb235c480ce938becbb3a87e69fd3a33abc49a01dc5a0ab7148c8f2d160b2dc8f63f5ced099159a382bf57e61c73c665212c9b740b71f6774a63ad579b2f65c
+EBUILD xlsx2csv-0.7.6.ebuild 660 BLAKE2B ad109d42fdd1f46fc6f6591edddeda3b130abf16c121e7d89746285cf2da68382d299982f5e6bb71188c78bc9fd9350d62805fa0cece1c484baccd2120b4b54a SHA512 afb686a4f52d945524d65f50b7de3a29e50a70338f470000e947fe21f093fc990b16b6793e295eb246519225f214669f4e3ac7ab832cf7c723f58e9347d02f64
 MISC metadata.xml 301 BLAKE2B b6bbde41ddb21a05cbfaf8a75bbc5e0d2eb24ce3b62bb93966e7712811cbda3cd258d351f584253d1e831806e2c26fc499092311d2c2d36fa0a8f7323e0b85e0 SHA512 bd16895b82a69676daacc8cf9f4c196423b61600a7dc9ffe8b8d3962cb0a06e46bee7e38a4c692c368a93879be4a83d7d70ce1fb82db6ef4bec25d21a86203c8
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
index a23cd8563014..397e3eb6b968 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 
 inherit distutils-r1
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index aaba4e0d88f6..751fc2169ca3 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,3 +1,3 @@
 DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
-EBUILD xmldiff-1.1.1.ebuild 631 BLAKE2B 9462cbfb0eb42b9b9afff994bc9b87ed32f7e23c054ae5ae554db138e2df9bdb1064d68857fa2c3908e696cf16eb14bae6aaa777ff2c2df093046af787c5180b SHA512 38f6c5ff6aaad0c787af614ba2a2f5c1171aed47b38f32c4e998c85c90aaca3d9250bd404c088bb16a08696e7337e147aff32d87f36b5234e591e3a6c12dd789
+EBUILD xmldiff-1.1.1.ebuild 629 BLAKE2B 63b443810bd6011d3119d42c61f7a9eae6a9616f96b2bccaf7c6448b810acb0ae7ea7750f9fa9bf6a846fe68f22d0cde61170136ece48023a065b73e756bccec SHA512 f779583cdfd312aabd74de0ee00f567a6f5a969e22f49efc468735d4a35e61595a23a63858acede25844a88c1c20e1cfbde154c690d72f0f02eabbe6e3476d66
 MISC metadata.xml 578 BLAKE2B ae500988e52962a46d0c79c948a163f7d3414c230d14ae344d33b09979085cf400ec38e911fe54f71da6035f40a795cdb9b70ed2c3299b9e37d0e6e3a77fcb7d SHA512 09529a22484d9b660b11b70137cf7e113ee07af4de0c58247d9f6dd7c9e85e222111b209b71dcdb342e734897fa0243b5f9a83688fdbd649584fa226a36acefb
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
index c0248ef5c884..16880e320495 100644
--- a/app-text/xmldiff/xmldiff-1.1.1.ebuild
+++ b/app-text/xmldiff/xmldiff-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 56fcb36e230d..0e31e047df46 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,7 +1,3 @@
-DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
-DIST yelp-tools-3.28.0.tar.xz 210496 BLAKE2B 2904b0ffe50f302d7f0938fecca74b37f6d070fe42fd681dd96b3a70b73244f65e204c34bb6f6ffb2b5bcd3400334b3d85a82807793b2bd30261c616382b8be6 SHA512 0b5adcb746ffb2b9c60303ef484dac01fbb59a06abf94bb8ec8a66bd573451939299688dec088a7421eab8f69ec2d7628475e81720640f0cb5b947a8d410ed62
 DIST yelp-tools-3.32.2.tar.xz 211668 BLAKE2B b45aef4d03f1954ac33bb05a9c788af40a74d76b54c2a0bcc466098e18435e02eb40004465dda399eb74e986caf404e51a393974d37ef1abeff6d76289840ecc SHA512 c9383426b854ae46ff4587bef07955541de3026f845025f9e99ba095cce11ff307e23d00d07a2da8763bcb6f9f061fc610351170e2abd99b5669912463729a85
-EBUILD yelp-tools-3.18.0.ebuild 653 BLAKE2B eebca2c8369fe16431219fb8a66815fd6246a74d70bf85078bed0685f84f69cb15583209f60653e24eb5fb8c2a498f10407a54bb42ae8f9c374a3613dd2fff95 SHA512 4d5f2c149a3dffb3d10f5854061f2ad35b030a993aa4f02ef43b77a647de7fbe5fee3036b8eef8095cc1a3ed86107b5f62fa0d9a065fca60855b90db0432ef89
-EBUILD yelp-tools-3.28.0.ebuild 632 BLAKE2B 3a0a01ed48e27bb67336da5926e9e25705cdee023272b99bfc18777fd83e46a98bbdf84b253fd85b22625a66f3a2e0f185bccd625faa8eb9b21931dced578879 SHA512 9416cc50f6c4fa52770092f63477b0799d394f25ecfbd418ba715476e39b202325ac67abd03d97e90410316308839fa5b0485d06a9b54011ea26b599b12b0dbf
-EBUILD yelp-tools-3.32.2.ebuild 634 BLAKE2B dcd4e90ce9e1976ac0d6587172081bf9229436a8bd7f7dbc7d03150fc72ddba86e905962c95704bb99f9aa4dcc4821a92e27fc28afaac5d7496097c45aeba9c9 SHA512 6510e48c5aad4fdee41a4f742b26cc5aca2b5fbc0d27e702f8a70b5cbc348977906e5140d457f1b4c6380ea21fc6eccb9ff293f8bed6182a36b1da6479383a63
+EBUILD yelp-tools-3.32.2.ebuild 631 BLAKE2B d97b6eba684eb8f3c7dc3bb7663a724b37dded1b90f36584c638b81b8d2c044a4c8b062defe1864f3e353c93bd60a9d56f7bea5604ea9b807e396540136ce3db SHA512 4b6fccbd5abd2eae1302f82abd5617c1d5855a627c088b1ae33a37149382728c129dff8eed0225c5ed4e4073dafae742b997b4c42c8df241a2e5930bdd11b106
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
deleted file mode 100644
index 860196bb74fa..000000000000
--- a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	>=gnome-extra/yelp-xsl-3.17.3
-	virtual/awk
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild b/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
deleted file mode 100644
index 5da64177c9d5..000000000000
--- a/app-text/yelp-tools/yelp-tools-3.28.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	>=gnome-extra/yelp-xsl-3.17.3
-	virtual/awk
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
index f8d8b886761c..fb87f22c263f 100644
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.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
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index 1fdbd9b7fdbb..cddccdba71ab 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1,3 +1,5 @@
 DIST yodl-4.02.01.tar.gz 308670 BLAKE2B f94c094f17ec99e66f64a704e41814274f61128ff21b11077d772874dcbc9f15fbc878df8831e7f73d9b6c89a497462c694bc0bdb6cd5637c0db08303e3838d5 SHA512 59e23bb173786b8806f56bf302dee9d8d971d0d840c609e2b24d9783b5866fca2509be844616318f9a4f302117b3a41f620be5cba09181e7ccdcf0c141402be7
+DIST yodl-4.02.02.tar.gz 309075 BLAKE2B ce9da287ca59e20319ae8a132553b669ffff926c79e7ffbf7891af3e777c45815cbd784eaf8d706b7f4b8240ceac41c38882c7b5d2b51e2691da249b0f5be43b SHA512 531b5b61f85ed556163b0cf76a30451212849e5e03e11819cc466603db0856737a9d3bc34ba11419befd7925ec1bac33f92b707c38acd2fa8047e3e1223d0a78
 EBUILD yodl-4.02.01.ebuild 1184 BLAKE2B 7547e9d39fd312c30e1d465cec9f95fc15ef1acfd04e45af85105b95ef57a5fa8a24949d2d70348c9c03a89a060c59a785f771f0a70eb99b673753c0ea939bfd SHA512 a33e23178c78cad05f8f3c1e1b67cab2676706e2c989346a823c993ee3ac60dbe3c303a01c71d38ef9bb5cbcbd8ef039e0ef63c8cec52409a9ed200a6d53dbf4
+EBUILD yodl-4.02.02.ebuild 1634 BLAKE2B a79333320d7ee5e49e0980ff33ac83c38dfd9b6ab68deaf02e5573481f39762189aa682994d759cbd570a0150a12ba7d2e2c5246409edc5ac350962cf8ccfa3d SHA512 d0daf25c56ed5e7efb7503ed691a6133f77910fcbe42a415e5be251bda1cb740978795198c122b955f9ab2b1db9c3b585973a85c0d8b0fb547f473f6ce93efa8
 MISC metadata.xml 244 BLAKE2B 256b5e0596820baf1555605a91d2b5a2454bd96180ac95ea34b705405212a37eca42f21754f8f11f875607f97b82badc149211361ec253226593297d867d1376 SHA512 4116d229be9545299fb52d43d3c5f3f1bcd44e53ebb05483cf231f05d76758b59a6a1a6b7b2eb0fc78304dc3a2422d9ba70c89ac159eef4afbcc5730b58f297e
diff --git a/app-text/yodl/yodl-4.02.02.ebuild b/app-text/yodl/yodl-4.02.02.ebuild
new file mode 100644
index 000000000000..25f75b909934
--- /dev/null
+++ b/app-text/yodl/yodl-4.02.02.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl"
+SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-util/icmake-8.00.00"
+
+S=${WORKDIR}/${P}/${PN}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 8 ]]; then
+			die "Your compiler doesn't fully support C++17. Use GCC 8 or newer."
+		elif tc-is-clang && [[ $(clang-major-version) -lt 6 ]]; then
+			die "Your compiler doesn't fully support C++17. Use Clang 6 or newer."
+		fi
+	fi
+}
+
+src_prepare() {
+	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
+		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
+		-e "/CXX =/s/g++/$(tc-getCXX)/" \
+		-i INSTALL.im || die
+
+	sed -e "s/g++/$(tc-getCXX)/" \
+		-e "s:#define CLS://\0:" \
+		-i verbinsert/icmconf || die
+
+	sed -e "s/ar r /$(tc-getAR) r /" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-i icmake/stdcompile || die
+
+	# required for std::filesystem usage
+	append-cxxflags -std=c++17
+
+	default
+}
+
+src_compile() {
+	./build programs || die
+	./build macros || die
+	./build man || die
+	use doc && { ./build manual || die ; }
+}
+
+src_install() {
+	./build install programs "${ED}" || die
+	./build install macros "${ED}" || die
+	./build install man "${ED}" || die
+	./build install docs "${ED}" || die
+	use doc && { ./build install manual "${ED}" || die ; }
+}
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index ffb1ef22683e..3a5ae0fa6fb8 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
+DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
 EBUILD zathura-djvu-0.2.8.ebuild 790 BLAKE2B e1d46cea20f9449006092e2ff44263b0d9bb9e8a269801a850dc7182e014c17c12f1fa23dddab820b05a158e03e322a8e9fe3d99e82e6c2ca5ae8b8e3a0bc72e SHA512 4c9809b8a22db671ab492204a30493daa74aed5f86d2b3b7642057a73114c8fc9e556e8f22717e8b82f52a92c4d660c1e2831016dbecd810083d5f129a6d286e
-EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B bee22309631b879837dab88c8d70954ca4ceb4272c7b3074ccc4bdd58f249e709f98252d9d90acd0354529556fa3df019077b5b1863a7daf2092a87111a49989 SHA512 f11599dc27c6b6dec3f66c7af1774a9dcd9790e0f2d38d7ff517a54e630e08031ff23023459c9c554577b38b17602314f67e52a02efa7c3bcc04025d0d85f437
+EBUILD zathura-djvu-0.2.9.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
+EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
 MISC metadata.xml 662 BLAKE2B 814cc5f79fb81dd24d286c28af469a97eb3813f51bab2b9e42028d6b798d513066a5e66f2b5fa533d76dd0096a77c3a65d0f33c3181e195b77d2ef85305a225b SHA512 5e20b7489d0ba64ba4e58b555ff4b19eebfa652d085d665e6cc50b251f2ea846a59911e4b08bacb9dff0a02b3e91b278a52f68e9b2ea2569f89b102878414fe0
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
new file mode 100644
index 000000000000..7262f7ee1caf
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+RDEPEND="app-text/djvu
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
index 71046574478c..7262f7ee1caf 100644
--- a/app-text/zathura-djvu/zathura-djvu-9999.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit gnome2-utils meson xdg-utils
 
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
index 186100c1af70..5186f1736d7f 100644
--- a/app-text/zathura-pdf-poppler/Manifest
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -1,4 +1,6 @@
 DIST zathura-pdf-poppler-0.2.9.tar.xz 7456 BLAKE2B f6454ea750597f797f8dee5dda6812245e0f7d158f37d63d4d554ea83c935bd1785cdcb1fcbbf60e4519faaa8e824e5d9d69884ff7dd8bac8e24164aa953d48b SHA512 d363c9051fcd5be73c11ee3a88fff277e9a42b5878ce5a64715d801457380b113891504a01b7343affdf275bbd31cc3c0bf17d5208cb513edf52d6c2f5270cde
+DIST zathura-pdf-poppler-0.3.0.tar.gz 8895 BLAKE2B 42ea3e63901474106af744f8c48ff74f91ada036f0cc9beca49b2ebac3e09dbc8334b150ac313d75c3f05f7be59d1f42873a67b77c58186a40c41f88d4772f15 SHA512 588c1d03fef2b0cbb44af6904ab078ae3686d79ce05b1448a41a62ac807226cade4b54725002f0c4bd9c428b192b607664da4bdc8d83c792fab250ef43622a85
 EBUILD zathura-pdf-poppler-0.2.9.ebuild 742 BLAKE2B e3a1fbaf7947512832385b3b8ffd47a56ca09cba148a5d80af28457a9d041563eb5dfdf7bb89a0cd590f990a9c4265349a8ceb832c77b6ac1b0dd185b730125c SHA512 a8504ef444e936e214b3621ea3111d82a0e86f89f087531f9f82b9ea05e2648c9aa11adc19c923e33b6bee85330bc8fd9bf782ae78801dc303fccf62b0438ed8
+EBUILD zathura-pdf-poppler-0.3.0.ebuild 763 BLAKE2B cdaee47346ca46fb18c9d4003c41195426e0c6af395592e6dc691a099e674af073c8363cb635a0889c20eab75c6234369e70d61ee5e9cb3878a8687af3bab68f SHA512 931475dee0efa3e9a8c6d82e8cca5cfbb1305461f8f576908c4c67e6adbff792c06444f4819a503dad3e2811527b265e20d55886a97b372f4cd57ce1a37dc522
 EBUILD zathura-pdf-poppler-9999.ebuild 745 BLAKE2B 6abb817bbf4c1db7542f2b59e69eaa0785074578d9c32f7a37efc86dbe89b9888b8093061ebf4867727b52b205f941a7e5e453650006d4dd913e1bce851ae5cb SHA512 daac708c3c2b62185d843a8a649149165e028006987c7d0bf57f9959b7e01fbe52006ec3b46af9b0def91ba334bec0bee148d565b4749ca86ed1d1fb66246a73
 MISC metadata.xml 663 BLAKE2B 0e076d5625ba01810d18d1494048c619129ef68473242f7cb80efc51d056b7a918b2297d045514b3362bd5120d96166d1c83ddfec37c5eee3ece733b29736316 SHA512 509bc36f10297eca9a9f6290502a5531729146abc95ad5cf0b8052cbd478a05bc868a0285e9c52962a5852079e962ba471eec216885444a6206f7bf3a4b1b20c
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild
new file mode 100644
index 000000000000..629dcc59d611
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://github.com/pwmt/zathura-pdf-poppler/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-poppler"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="app-text/poppler[cairo]
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index 3f2a3928f0a1..e4ed970e2dd3 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,6 +1,8 @@
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
 DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
+DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
 EBUILD zathura-0.4.3.ebuild 1333 BLAKE2B ad5146cdea9826b8d22bf95d47dc0dcfc02989ae7acd5c085cdbccb61a3b69fe2eb3aa7a44866efe71387da6d63490f37f4d19f01a4a0cdffdd680a52cd60e02 SHA512 cca06811020ead3fbc6d56aa54f1d6e5b73ab03874c5a59c885db015aeb8a9841f6f3d43562bcd0dc3a305d1faec8b7f4473f16ff7107740fc02b330869390fd
 EBUILD zathura-0.4.4.ebuild 1346 BLAKE2B bc8eae75f9e3c766eafbfd96e692cf5733d82c502159b0d56007f8dcb0238b13aed2543e23e3737419fc54b5dfe1ed4ac83b1c27bdeffc05ae18940517a7377f SHA512 d241a6f6daa64522e99f188c17b87dd0d89473800d487dcb50fda99942f05c58d66f2a551bb314e82bb2f691ea88e4efa27c715fc3d3163dd7e5818c20012337
+EBUILD zathura-0.4.5.ebuild 1349 BLAKE2B eb2974163405117618ac3fd188b48270ae117d519206e71aa10fb675ae26009a5d8966a81ed5484ff266cd96a1bccdb3a9166d1a207d12f87457841a87be43cb SHA512 1e9c6535854d0b17dd49165097fa30bb52b34e95806e9df9387e9f183d88af85c883249f215322091c23d02fc4df64abba9bf91427b838b3fa664ffe7aade14b
 EBUILD zathura-9999.ebuild 1349 BLAKE2B 1e27a0335f223fcab2330c4650a736f6c7c595c711ba1be8f04eec3375ead89f735c347eb2231d3ea2ba29153d713e63b354d4623012cf4ad94bcca338154ea6 SHA512 bc8c191d8c2bd6e507080cc845f71ea4533791499af345b23742d6a5710d2d5322884e8c6a2ebb3e8087eeda25fc09bc839dc72d1e03ec6a1f30daf28627a322
 MISC metadata.xml 763 BLAKE2B 1a98b02634dd4017052820cb2103b81d7bc8308c8832edb28f65127f43e9a673926b76091e2062a66c701b25e9d5866051e2268fa3fb4f53a681257132618789 SHA512 5afbabe1726a25ba2b0ae5c66533bbc247deaf1c745534487895bfafa2671ba87d9fc4333ac824176f78db64a940cc53a87d018fa4d7e5d201cfc6f41cfb50d6
diff --git a/app-text/zathura/zathura-0.4.5.ebuild b/app-text/zathura/zathura-0.4.5.ebuild
new file mode 100644
index 000000000000..4a62e043c71b
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc +magic seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.3
+	>=dev-libs/glib-2.50:2
+	>=sys-devel/gettext-0.19.8
+	x11-libs/cairo[X]
+	>=x11-libs/gtk+-3.22:3
+	magic? ( sys-apps/file )
+	seccomp? ( sys-libs/libseccomp )
+	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+	synctex? ( app-text/texlive-core )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-libs/appstream-glib
+		dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Dconvert-icon=disabled
+		-Dmagic=$(usex magic enabled disabled)
+		-Dmanpages=$(usex doc enabled disabled)
+		-Dseccomp=$(usex seccomp enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsynctex=$(usex synctex enabled disabled)
+		)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}