gentoo resync : 08.06.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-06-08 09:04:53 +0100
commit: 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree: 2878053f3e7faed19a1f82c733d3bd29df69991e /app-text
parent: 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
34 files changed, 372 insertions, 174 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 287694635789..de90751d74f4 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 401adf66ce83..09355d581efa 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -5,7 +5,7 @@ DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e81
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
 DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
-EBUILD enchant-1.6.1-r1.ebuild 1630 BLAKE2B da22699eaf410f739e0bc81a3afc6ec4e8bdc94972be7336afd75090962773ff793868569ab118de80bfb770eb01548b822cb630a0a853d1fa5df9e3a5fa32e8 SHA512 78e9bc54b650e0190b733ac2ef644671e74a42a6e4bc8ec68ab341f968af6af900bc9c606718446ebe34695eca092f0027720b29bcf075237ed69075b7816128
+EBUILD enchant-1.6.1-r1.ebuild 1626 BLAKE2B 10419db64a4a632c79ca63066f7021eaf5122c4448e461c23c1ab9275e7345f3990335d86bb529bee33710dfb371d0e71b622218d7cbb888491ef193dcfc33ca SHA512 53e554a64a50b2f0ddbb10158a44adb1b3bfe1aa50699ea52d7b13a4a23d811b5a3dca365b812f071084f423faaa248bc90db1a63077f31cb056c7baf1e2ecdf
 EBUILD enchant-1.6.1.ebuild 1497 BLAKE2B 0a9aefe2919ec376d33ac79e271014c065a26cfa4dd70e760efbbd3b76e6723127fb588f4365aec905215236ed407eccb25a9943067bd198ce67f6b7b41adc3c SHA512 ca846dd37eb5e9fabcb512dfb2c77dcecacf22018a3ba5e61528180c2c879f0a849236ad7799121f9f0839bd250078480c2c80f792756d301518e06bd3c7b01a
 EBUILD enchant-2.1.0.ebuild 1315 BLAKE2B 099906e37a942d542e7bf55a4f86e2def554890f131ebb2a717a270a1b7e1582200468f403eaeeb669d8e253ec437beaa8117f5ac8c05d757983caaa7158ba61 SHA512 6c6261e70abe20d1a4ad83b3b3d0cf68fa29543d3f676301ad16fbbd4d8477b3add24accdf94b9c14bcd970a27385c88bf1c8b516a4cdfa720e81bf9c6204515
 EBUILD enchant-2.1.1.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 17d415228236..79f317dc4b94 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
index b91f3d295290..767dd2a35c83 100644
--- a/app-text/jadetex/Manifest
+++ b/app-text/jadetex/Manifest
@@ -1,5 +1,5 @@
 AUX 80jadetex.cnf 995 BLAKE2B 1316aa328e42553d13ba377512bb1c7301a62ee60b8351a9209dbdf7ebd306f092e9b3e35c6b605c9847a1fd931cda3ccfb042a30ec3415b59f1c88537ebe55d SHA512 b1e940b79bbb76b3ad02c82e25120651ab64259be104849fc39aee94fcedaea091220b6896217faa84f93a45cbafca5b1855396b47210952723148b69d9727f9
 AUX format.jadetex.cnf 170 BLAKE2B f6f923eb38263e054ef470f0e9bb8f4beae75a9ea5f5df380077e1661e22fed024e1f77f56f8419127bfb831b7409f486cd53bfbf2aa81bb80a2c47ec674cf2a SHA512 8d5d6ed30c45e1d79f108268e045acb763fa6815ca90a8f246daff51350ab2c19c7d38237aff3ced94f10bb9de06e3021c11138d3f038f4beaff25c5cade391b
 DIST jadetex-3.13.tar.gz 103137 BLAKE2B f1b94f62a6a9c0a33acba4e8c757bcfaf26660a2d0b4ac338cf5afe8d03476a8744652244218d056678a59507ce3c8de7066314f5559469a60be5287a8c0ab37 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1
-EBUILD jadetex-3.13-r7.ebuild 1574 BLAKE2B 235bf45cd340d07811c0456f68ccefd912247db2d7de914873bb48eea77e3687295fa3c66a80fc90dc2add2f45d6665eb7f6b82b120e7c1c237eb633b3e7a3d9 SHA512 1dc5250c716ba2eb5e298bf779397afffefe61abf5802ca4f00201990620305a46518ed9d96dea22898b0c04dda7f9837e66a13a7c9c0710533f4ec4faec0346
+EBUILD jadetex-3.13-r7.ebuild 1683 BLAKE2B 09389bed81844e27bb6c0e07e037fe243918fc1b5f52aa6012082f2bb7021f67d1632e89ca6284911951377624f9e4d3155266bb18c763c396d34c0d8d0bdbce SHA512 1f6672c407ea52db05339fce455ff00a62182dfe2ee6806a26265c25c7456ee9e029835273c24edd4de73ab4e2e298afa3be7188974e19817f92f662989ad1b9
 MISC metadata.xml 326 BLAKE2B 43480e556a9ce9c52fc46d18765664881cbb16ea08954b18d357df0a956d335815e9a0c3093504bd68a5b2249bee307ca05030fbe7fb4324beb8fdd7ff8b2e53 SHA512 eb50eeb89f113a376963fe314c979d5e399f43b0ab85fcecc923618c717e30c90f8f70fe22ba7a02b39b14c57861efebfdb785f607a2e7830578aee20c2bd915
diff --git a/app-text/jadetex/jadetex-3.13-r7.ebuild b/app-text/jadetex/jadetex-3.13-r7.ebuild
index 3a80cfceed76..14d37d8b41f7 100644
--- a/app-text/jadetex/jadetex-3.13-r7.ebuild
+++ b/app-text/jadetex/jadetex-3.13-r7.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
@@ -20,9 +20,11 @@ DEPEND=">=app-text/openjade-1.3.1
 	dev-texlive/texlive-plaingeneric"
 
 src_compile() {
+	fmt_call="$(has_version '>=app-text/texlive-core-2019' \
+         && echo "fmtutil-user" || echo "fmtutil")"
 	VARTEXFONTS="${T}/fonts" emake
 	VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}" env -u TEXINPUTS \
-		fmtutil --cnffile "${FILESDIR}/format.jadetex.cnf" --fmtdir "${S}/texmf-var/web2c" --all\
+		$fmt_call --cnffile "${FILESDIR}/format.jadetex.cnf" --fmtdir "${S}/texmf-var/web2c" --all\
 				|| die "failed to build format"
 }
 
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 31053dcc0ffe..0fe38d097d9d 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,5 +1,5 @@
 DIST kbibtex-0.8.2.tar.xz 4065904 BLAKE2B 5b862ef48dc3e0fb2895aa2ad0c1fa8e712c5f63d0a279b33f9d41fca0262bbde1bd00423657e2714dfbacb28657e067760192adfa033f70ac5771a7188ad4cb SHA512 f15e2d1969f79f354881ccb1e41c5d6f1628c4850b3bd177cba0b74b1aab9aa61935f65ef280d242d0ef2ac816ce45b8a2e8a4ff51720a2400ec52bd555f594e
-DIST kbibtex-0.8.91.tar.xz 4183808 BLAKE2B 7cc37909f44fb8463dbdad5260cc0805aded4fa92bd05b0e6b613da79f94217e030f5484465a19acb19e67b1c488d196901ccf285120d84ffbce9ac44816378e SHA512 10ea1285b7e174c7e0c66c1961e5a3f490e9e1afb2b62b35d31af6759dfe9b785a40a36863e0fad119017981038556386085ef7c4bd90d8745b9259550b1424a
+DIST kbibtex-0.9.tar.xz 4184288 BLAKE2B 90baf7c4960540566c59b198de307703d0f34ff6f4284933c187625b2e4065739fb16b004408fec5929d4923e7f651091915841c94ef09797419daa737ae39eb SHA512 bdd849094f66feb1bd6d02131580cb5d2e1f8d172a4e36141a48d3fc38375b5f4512078d13d6310f326b5cb7b15364616308eaac6c2c10ef897f8f752e1f6682
 EBUILD kbibtex-0.8.2.ebuild 1936 BLAKE2B f6fbf95407c366b723175ba60debe6e8642041bcfda2e80da45449a9fd5bedd4b818db854ee87e09ec2625a92a7053d0acfd34ab0539312309effd0819dc1463 SHA512 a7c7fa54c5e372bb4d839477c307f8643f9eabc48c402726d286e81421951a1f1afa778e279945283b8b68054f4152fa6903217d2467790185b768bdbc38c6d6
-EBUILD kbibtex-0.8.91.ebuild 1861 BLAKE2B f02216ab0ed5cde47eb40efd88616bdc8530a954d4646a9e42217f3a3e9111e33ecfd354c2373925bfd018f3ff932eb504634ff9c43a77a9eaf391e31d624b17 SHA512 e105a0c8a28001276d0049ceb631afa53ac93bdfaef755bfab90e7921f800327802b52d368bc048eb9739b275b7a3e69b35889aafab42fc48e127723e2fe3884
+EBUILD kbibtex-0.9.ebuild 1865 BLAKE2B 874c728f338e930bf6fc2a6accce1bd573d7affb9fc0694025c6116f6a554c24648de4bbc4ef3ff744335c13ab5dab720a11f76b9574b6ce785c835dc4940f6b SHA512 e666c31272403d46695213c3506824c7cba6c11e3ffe8fd6cc79918ee06a76a01a794813c66ae0fd8c143cbe141df3a8186677ee0a451749466021790fc3ec2e
 MISC metadata.xml 518 BLAKE2B e10a5e38918c43315c3804c787f80c6df00f7a37da896784a1ee932a90c7f6c15d8a1fc69313314dadaf01461b65e6be78b189226ccae9fda5422950a86edb63 SHA512 be7be6b52a067ed23384344706adaa13cd06667e768a9b5adc2d93b2edeb5feec426dc83395a226219a469bb5fbe99d378b5e1c87ea82e17a05c9751f03e12bb
diff --git a/app-text/kbibtex/kbibtex-0.8.91.ebuild b/app-text/kbibtex/kbibtex-0.9.ebuild
index 0fd2876e0f29..db55a06be039 100644
--- a/app-text/kbibtex/kbibtex-0.8.91.ebuild
+++ b/app-text/kbibtex/kbibtex-0.9.ebuild
@@ -10,7 +10,7 @@ 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/unstable/KBibTeX/${P}.tar.xz"
+	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/app-text/msort/Manifest b/app-text/msort/Manifest
index d75864859eb8..c4414b1a5d27 100644
--- a/app-text/msort/Manifest
+++ b/app-text/msort/Manifest
@@ -4,5 +4,5 @@ AUX msort-8.53-fix-missing-limits-header.patch 559 BLAKE2B cb158b619540aa9679d84
 AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010b04a8fbb24c2043f5436dc866c2dc5b76de4c2639103ecf75bd12ec6d63fa9e2922ac79c8e97a6939c74fe5f37d026af8325c1b161b0f42 SHA512 6d7e1ddf68240f27055a43cddf9e99594ca2ff20c0d666b8e3e09f74c319b38432d15c0b608f76aa5732b6145f1d3120f618cca398c8a68bef4a394949df55dc
 AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e
 DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573
-EBUILD msort-8.53.ebuild 1026 BLAKE2B cc609f657b525ec99048db658b96d1f1ffef60b1bd0fc8e9fafc621b4990dfb57aca7af6abc55996b26f3e427f0046fa82f4a7afc664502471148afd700ef617 SHA512 99882c80414eb9f817d00276e14d3032cd91415293bff5aa227a4e26de760c8069acf99c548ee6a47b0976cd277d1eb8be5030cb034672519b7e72a9839614b8
+EBUILD msort-8.53.ebuild 1025 BLAKE2B 3c7acb0a7fa29c2612588898823c20690f2dee7e2ca35d855fad205a197f7cfd514710dfd77fc3cfe3ad9a7c7431836187100a99b06db51a07bb0c61e9fbf500 SHA512 1f6eec831620854e795d243ef81660a439df1ab99878205f055e758f55ef075315a0b189b69117ff13bd4a21f0d1d31a9df775197f2e219f8cfd1a64ebe30caa
 MISC metadata.xml 1119 BLAKE2B dc935ff36b3a965f890dda09b161d321cad04d3b8f427c8ef611bf6ba728ec97bb0622d012a837fbd8bf2ae1a4bd79b4bfd8314039a515c4b36375b71b69548e SHA512 4185e0b60575cb60fb14392f24286fa8d94a15ce81c6fdbfb5d5031d7dccb170861bfa6b78a2851ad3347fcdd1bd6b9b05973e9b243561a172a69921ccf2fbbc
diff --git a/app-text/msort/msort-8.53.ebuild b/app-text/msort/msort-8.53.ebuild
index 260beb77ff32..d70c5e1bf098 100644
--- a/app-text/msort/msort-8.53.ebuild
+++ b/app-text/msort/msort-8.53.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A program for sorting files in sophisticated ways"
 HOMEPAGE="https://billposer.org/Software/msort.html"
 SRC_URI="https://billposer.org/Software/Downloads/${P}.tar.bz2"
 
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 IUSE="heap +icu +libuninum"
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 3fe9d6db588b..62da2049f7be 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -12,6 +12,6 @@ AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a76
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
 DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
 EBUILD mupdf-1.14.0-r2.ebuild 3116 BLAKE2B 1700ed8f0eacc1c986393b597df20d4b45a2158ddedbe472281e900d8dc79ce4a76aafc5be0e3f35977afd6cecb643b7a382c6a7e0a422987d23b20bf2697343 SHA512 442a258938c868062ddd3de127da51c475c89908f466aa12d8baf44b4c29fa961c99f3e1eb3649672e1855cc447eb1b30f2aa31ed80ff1c2c751716b743ee6d8
-EBUILD mupdf-1.14.0-r3.ebuild 3235 BLAKE2B 044653b910e0ab537c1ee7c25edc49dff68cd70b139970bccafbb99f8b8cebe7884686022efac19bad9d177205087355ae4e82ab10bb7b552d370f5513af4b39 SHA512 85a86cca7813202b9043428effb459ce486c19e194f4399b8beb4081a937681322ca02f93c4e6512663593cac96683f727851cbef34d7abeb593df33f69125bc
+EBUILD mupdf-1.14.0-r3.ebuild 3230 BLAKE2B a3241f2abf60e48b8cc3f6b332912229d1450f2f83726b96e5c0e33ba483c5acb8a7bad3843392c83b3fc3ce5014b10cdd01644c82a4957f8106eb260f7a2afd SHA512 f7ff593d55c136c4f5b73adeed057c4b97886e40f7faefa6186b3f6a654159af9b62db1ca40d6e3c4a68ce7ec498a737a8b39482b54cd5cd4f2647ada248ae53
 EBUILD mupdf-1.15.0.ebuild 3505 BLAKE2B be357aae0944fda68a0e95cf12e2936ec94428d5baa645399add9f87ca5127de85898f22fb56762d7fb88d6ed3e61874723f7668fb9c4a2ac942585e3ddbde6f SHA512 41209dd40db318acaa224a031672fb9281dd674a6803b789da1cd673ab18af08c4fcdd2f5d82ccc5076026fec056986d2b67f1adc4b4cf3a7a0aca56787d7b75
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
index c414dd711611..c18f588a1d75 100644
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
 
 RDEPEND="
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 104be9ae5889..d33e56516e76 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -2,7 +2,7 @@ AUX podofo-0.9.6_pre20171027-libressl-bug-635890.patch 840 BLAKE2B f4bca9474abac
 DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
 DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10
 DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be
-EBUILD podofo-0.9.6_p20180715.ebuild 4629 BLAKE2B 7c1c0487e26cdf237b0f706e2371a7703a9bdc1c7e448847ec6e4f4168b26f9801c6dfdeb782415f70b5a8deb47e565a132ba1e79ad205cba1ec2edb638b7ed6 SHA512 6af85afbdff5ea5c877d8fe46725f4bd6c41a98885f2c38c4e3efe4f20d74edccbbbff1ba3463baf558db00a8afeec137c75b3764ffc0f894e8d4afab437bbc6
+EBUILD podofo-0.9.6_p20180715.ebuild 4628 BLAKE2B c4a12a983c375c4a962ed4698c37a8fa52f91449a3d939177e58b27253a4a905bc8c4a4d2b949f67046d04c24da41c51381f4cab0e87f1b2cbb0b31e0498fe32 SHA512 9ab5772ef9cf37781249786fe02ed734c5be9c49da9f01a4ad1a3f6d37bd4f25bdec0afd1141e076bfdd806fdc1149305e5bbe63987e9356710e29914fb2965d
 EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4581 BLAKE2B 7ae073e6e68192232440f925b0bef5cd9a5193ab7cea1d76bf303a2f01ccc3fbba42907408904da4043da0b38532134cff9c9deef868ec8c9d94e70d1360e80d SHA512 abc3b61b00606184996b904475ad9d41d61bbf6e9c301216df47a8c93b8c42f1f03fcd8c200c06e2c9c630105c39546097dc02df153f825aeecc4638a0ae65f3
 EBUILD podofo-0.9.6_pre20171027.ebuild 4643 BLAKE2B 38214968a021b0412e5a52b5d72f3a308a4d5c8fd0d47cef955c352a0f465b3e86e56917e46022cb4aa58767e8f7f4e2c131daefe06dd534d83fa63aaeb4a53b SHA512 5d333d71840298a02ac3bb209ca93946f760e1c443b943fad95ef9fcb726e56f7547979394818061b0fe826490888f39cb7ca53d99dd5b87f4670acc9983ad92
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
index 9d6a95c7f0f3..d4346e5fc022 100644
--- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d5bea5641b57..371e8137d773 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -8,6 +8,6 @@ DIST poppler-0.76.1.tar.xz 1531548 BLAKE2B edbd9c1be99aadf4f14608a1e0dc58a2fed35
 DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040
 EBUILD poppler-0.74.0.ebuild 3515 BLAKE2B ece68c444171e98859d712870d0611b9f2c49d4fc46b181d383253fe62aa64e4a1f4bef87c7940f103e878c722d4b29dd5f137d2a199da2cd0f86459cd313a62 SHA512 9ae8a8e2860129702bc3f03b0e934c7f3484c57d3e41fa2a2defa7e97c58d885cfc195289d5e2fd5ffdee809433452d4c9f7d40856d66366ca3bb9318ae038e0
 EBUILD poppler-0.76.1.ebuild 3526 BLAKE2B 8b38ac436ac303afdb856fcc07ea072452aa3bda92a4f3d6a95ae1ab3e019c67c267f2caa574f61bf65ae4a2e7ecb2090980795542d6f56f1e43d5b7136a528a SHA512 a0c05954864faa57ca3bf48b8de04eb74768b9357dbeba8d2b65db8e437ed91208d9f1e51c02655e731e301764964e9a42c6fc18c37600135ec160f56f5add6f
-EBUILD poppler-0.77.0.ebuild 3525 BLAKE2B 7be2d265493b97f6520d6905a82abfd382ac15a6d541525fc3923def0212c16d69353aa7e92456fb19fa8914a2b8da8d0b15c77ef28a749e9f16787fe1a8906a SHA512 466ef5490267a07923f2c9b5e6415cd36a6ebb70c05ec4defd36113d050033c02652290004f8f563ac2573e5380e41c8c08cd93aa0c53b6a129b6619a9029281
+EBUILD poppler-0.77.0.ebuild 3522 BLAKE2B fd10ea39e4267582aa20044267c6ac03a33f988589ad624f00f7b51825da252138f27ccb54f381b6e672181932d3a649c148bac26364d05b9cb526b9a3a307f2 SHA512 d58ad59375133344b90cc1e09400f646519efb79e1b21f529922b6d864bf5f3d205b4dea31a1c239000f369c752ab556087f03743ba550acf5cebd104e630fc2
 EBUILD poppler-9999.ebuild 3526 BLAKE2B abeb81a635d4e399510cf828cc31235c4c2b9b6e843b88ceed22d8645da9a21aea27ff362bb9931c6245bc0152bdc48fa9b23c931ba202c22c3715699b740456 SHA512 3cf4680cc0774ca4ae267485d7a0ee904b209686b307bfcba6dcaa47064ef4aa30fef74d3ed22b46069698bf1ea0a3f24760a224086314259115f919fe7abf13
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.77.0.ebuild b/app-text/poppler/poppler-0.77.0.ebuild
index c63a446c3b85..ce60ea6562e3 100644
--- a/app-text/poppler/poppler-0.77.0.ebuild
+++ b/app-text/poppler/poppler-0.77.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/88"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index 5a257dc1e529..b1680c4649ce 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,7 +1,5 @@
 AUX sdcv-t_interactive.patch 324 BLAKE2B ecdb0d89c4a26050927272f244e43b28e945e3ef5cb93167eaea7c09912e504af2061ec34c2b5f5a32665c784093e2d35ed92e10a00824b619da71e53049e5dc SHA512 9067330c6fa95910b5dd67716c9bc378d29a9ccc5d60c1eb0c1aca12e58478ea381b91c5122c1951bd2f4c9e8b629243ea885bdbbc87a2f88174340919f5cf8d
 AUX sdcv-t_list.patch 588 BLAKE2B ea7106246204d2c18eaecdb05e4bf7a9c1d12d0ef6e1509591ad5afcf529746a6ef3f4a5051add8923c399863f8b56c3144c9d758b7fa2215b6b593eb1e2b305 SHA512 7a2f8fc105988ce6847ce533051ed65ec49b2ac1ffa4ec076a78be59d219d8c18aee7170d965dd429b95b193bf5a4608d20002e9fa58b6abfa5b972bb6879f94
-DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B f2cca4dea35df82015607c88b225da593780d027978f5cd9c03d6f31b03d7ca134e0f2be3bd7ad6c4ed71f7c4ce8fab1bdd546914867b247e6c814ca669e7da5 SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00 SHA512 8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
-EBUILD sdcv-0.5.0_beta2-r1.ebuild 1426 BLAKE2B 6711cb854f6f010a06bf7e016de9739d719a3429e400005009847ee53087c4c1c2b49bd64e342b365cbe70d1fd9efbf333bf3287470537585ef29da1f7fe8023 SHA512 c721c50436f5f3224412f6229ca2796ab685bec580702025a341656b1d3b62400e5cbddbeea13ef0178e7635b55ee7616db6ac39c06ce4640ac464d837423d00
 EBUILD sdcv-0.5.2.ebuild 1582 BLAKE2B 509c6433aeb10d633bf9aac30b5f8b4f41d8021b09cbaeab9ee3ca0993af19f12641a388432a767c69bbc114950acb28848942115e27597c41d499347f7359dd SHA512 69ed0bf1a33c915c39ea98fd24b5e148051d0ad8f401848c097246c1fe17fa5bcf6aaaefa244013abe07013bd97206fc33f4ce002e6dbdabc0290af1e9b5a09c
 MISC metadata.xml 528 BLAKE2B 56e25a716843e62cb0a90bb7e75abf3811dbbb38c5c91a4153d5b340c355efdd4db771a815b116650e696b637deb4dc42320e0300d903ddbbc9b124b57934071 SHA512 0128fc0c89045f17ca1dbd13e18d2351dbcdc7af76451b80ba586ad223025c8c96f9100c09db5857e88f503534c6d699e649bf68c1bb3e23c6972ca2e5536c99
diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
deleted file mode 100644
index f521e22ff60e..000000000000
--- a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs fr ru sk uk zh_CN zh_TW"
-: ${CMAKE_MAKEFILE_GENERATOR:="ninja"}
-
-inherit cmake-utils l10n
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="http://sdcv.sourceforge.net"
-MY_PV="${PV/_beta/-beta}-Source"
-MY_PF="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_PF}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="darkterm nls"
-
-RDEPEND="sys-libs/zlib
-	sys-libs/readline:=
-	>=dev-libs/glib-2.6.1"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.14.1 )"
-
-src_prepare() {
-	if use darkterm; then
-		sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
-	fi
-
-	rm_loc() {
-		rm "po/${1}.po" || die
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-
-	# do not install locale-specific man pages unless asked to
-	if ! has uk ${LINGUAS-uk}; then
-		sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_NLS="$(usex nls)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use nls && cmake-utils_src_compile lang
-}
-
-src_install() {
-	# with USE=nls, but empty intersection of LINGUAS and list of
-	# supported translations, this directory is required, see bug 583386
-	# failure is ok here (e.g. if dir exists)
-	mkdir "${BUILD_DIR}/locale"
-	cmake-utils_src_install
-}
diff --git a/app-text/simple-fb2-reader/Manifest b/app-text/simple-fb2-reader/Manifest
new file mode 100644
index 000000000000..9ad94c0467bc
--- /dev/null
+++ b/app-text/simple-fb2-reader/Manifest
@@ -0,0 +1,3 @@
+DIST simple-fb2-reader-1.1.2.tar.gz 95181 BLAKE2B 4bcfc361fe25e2fbbd6767d4517dac61e50f2e907c969402dc76be688228e612c489758ae2adef731a30e9a9aac19b2fb5786ad768e83354c8d082edfbf2b634 SHA512 0d0b95cedf8b0863fc415ba710da7bae140fda6a9cc947f20986fae0f348653ab73a85425ba34fc9beb747372ad3fcffdf8c3c173386678653cdf10318abe64c
+EBUILD simple-fb2-reader-1.1.2.ebuild 719 BLAKE2B 0eb99cb61bebb33fed875ec4ea548663ddbd46e9aad7d2b3112113ca1e29a812ccbf039ae0c399f7883c6b2f4e6da6c39edb46d63f06635283214392d75d27ed SHA512 6f717e06aa6976382f37a4c193fb40effad3de7e8027801a15a07288a629d484d52552e106a6d6f41b1b4ace69e1f7a35cb1616ef85535295f72ae3be007de97
+MISC metadata.xml 317 BLAKE2B 42a730980929eff799e8de69cd94c2f15a2da6ba77cc3c98dabd4a323a6fcaae293a437b6509d0b9b32fe1bebc7c0d7e94f948f16c42a1eea552da45d40c7fc5 SHA512 09ce0420bdd7879b4f7578ea792cd27421abb6155d121c18bb0728c4e63b31577f7f6b8aa5dd1d647dd87e8f73c1a668148e0fc76efa7b3fcede097015fcb70a
diff --git a/app-text/simple-fb2-reader/metadata.xml b/app-text/simple-fb2-reader/metadata.xml
new file mode 100644
index 000000000000..07d74f27a515
--- /dev/null
+++ b/app-text/simple-fb2-reader/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">Cactus64k/simple-fb2-reader</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild
new file mode 100644
index 000000000000..c7d3c54be77d
--- /dev/null
+++ b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils xdg-utils
+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
+	dev-util/pkgconfig"
+
+pkg_postinst() {
+	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/tesseract/Manifest b/app-text/tesseract/Manifest
index f9acca026084..175f6b32779d 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -1,6 +1,6 @@
 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.00.00-use-system-piccolo2d.patch 1046 BLAKE2B 47aed1637b153bb946ddc76cc04fa564eafe83cf06d020b24ce9247c0e78cb62d3e03ee4bf950fb53bac0030c3bb4b2cea42d922414765c07862b929ee813800 SHA512 56bf955bf1b647dd3c5f55bd9e02126217cb21943866fdb6402e2dbe1f93ce018da41dcdbb120d88e06ebbdb6d7fb4726c19013150f7b07b38d91d784a2bb963
+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
@@ -126,7 +126,7 @@ DIST tam.traineddata-4.00 17333471 BLAKE2B 67e4b10d8e9fab5df8455b35483972d5543cc
 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_beta4.tar.gz 1855821 BLAKE2B 8273fefc5c07526c87adcbe1d9d81204f622f42396564d8e5fae5ed5275c47bcefab1bc5df1560dee722a1236fbd2211f622e61b3f279219a877b3bb3bad822e SHA512 37347c461c288cbaf839b65ac1283ab5b60e6723726442a5d067e6a4e2f48d6847d7393206f1ddd4de3c5dbd8a8d9febcc42d68567a46a4665fbf678bab232d4
+DIST tesseract-4.0.0.tar.gz 1961372 BLAKE2B 5d684ec58deddc2cad6d61f5a3e22e9bccc1fa96b57d5bcad5239d5ba6d0805978b94b4b44a871c0796a756173b8072327f8a44a6a84da5604a3b50d9e425d21 SHA512 69e57d4ba1fc43d212fd0fff69a2b5d48a3b37cfee7054fdc083cbb7e04d92317609a32e457229661d70ce8d9b16c9d25e81bfc3861db660dd2c8f292202d447
 DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
 DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
 DIST tgl.traineddata-4.00 11991699 BLAKE2B d888013c0416c1e057522ec828e2c2b4470d50b55b6de580ecf20090771cd6726167ca1dc66f02afab1f7c369035db1ea84cb0c7ddcc36d37820c0c065648986 SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380
@@ -142,7 +142,7 @@ DIST uzb_cyrl.traineddata-4.00 10390622 BLAKE2B 055ad7b767d5e919cf386f3a1b2902bd
 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 5844 BLAKE2B 498c5b5e633af1319b785c3ea40bfd3de48022710bd5edc8d381bf0dbc7d2ab29b11524be669a43cdbaae439677d606eae67ee334077961f0dbd952dd16a1745 SHA512 f8f9adc9e12ecaad1aafae82fed5ad3169b54275e43b225e91931044bc76822d4ac39dacbe0fdcc57a551eccce44ed4e5600deb1c100aca546a4467dfded99d2
-EBUILD tesseract-4.0.0_beta4.ebuild 3965 BLAKE2B c8d8b17f998368aca538ee664e6cdf12f6beba3ee0fb90c5439b84d16623b50cb75f0c81623d2fb777967d8531de583308127ec4e49c1f2c55d41e718479dc85 SHA512 0de2ba12cfb65644e126d2c4b635f6d3621d9cf4b6f0dc40e5ce606d27f55e9d4ddae567af7ee0b7691b6b57c951687ab623fcb6d6d1cf8f5fcab75e083f8715
-EBUILD tesseract-9999.ebuild 3842 BLAKE2B aef57e284d1268d22a48e832bb451999e05bf0a870d399f9e2d83ac53705ef8df3ea95973a42cfd40adaecd81595dd92a5cc5810c26128af15b922532604fd06 SHA512 a9e6935469b8b8dfef11ccfe86b0df0cacd2e7cc536517f0092fbc9242c29e7df3ef128b4057a09df5ebc57516457a11a231f7df554d3a55c8b85e1c34594ec3
+EBUILD tesseract-3.05.02.ebuild 5838 BLAKE2B f627210c35518f399ab06b608fb12d82a4b2a47ea012c9da55d602e6591971fd0da52d2892192725a448458a55e099769f5341910981eabee006cc4e0a9697aa SHA512 931439ef73d10ec5d97b42c718d4232068d2addcef174168f35a43f451262413f1aa611ebcdcf135eba168f0790ab6eb11622f7c9780758c1e2bffb7197b9861
+EBUILD tesseract-4.0.0.ebuild 3658 BLAKE2B d06d2635968b2b7d68a1dbcacffffbaf941722bbad81d12e1adf37993245964d5022aacb88fb40c9c1a8a35435cd8bf0baefb0ccc482c247a542e6c532c0d16a SHA512 fdb8e1b4a4f3280d3dd808ed630f229d5af276a4e035d1f7150bb2a8d2e8f60d0c2e44839c06f8bf1c0479b1ee20c52dc997a9369493832cd565c7bff4e1484b
+EBUILD tesseract-9999.ebuild 3544 BLAKE2B 3747649a31c9cc8d4d83aa1c9d2f47e5ebfaea45488373a1712ced42dcefd0beca400aae8b25db9c59fb4ded3b19c5e978adc365f90c162c3361aad8cb8c9cf2 SHA512 6926f550e5d0a68af8d941c4b9d1e0e54ca8d22a1a4e60d9f5ffa3159f399f5a69bdb2180da9b0fddb1416da5ae195eb2926d772233e9c759462876eb1730366
 MISC metadata.xml 1203 BLAKE2B 72b792649c8f504bc809dd7ba99cead07f74704a5743532bacf1e010fd4877b8e5c8c929830e04899362d26fb086fcbadbbddaec7dae0295b9e5f3f9de76bc78 SHA512 b92b597ee4a1597c59646d21e7a293a601b74a06266b61ca5ace001ba0a7cf2e8a6454c81215e4e5534109ca7bb81cf045ffa2584cdb114e810f41c9ae5f7b1c
diff --git a/app-text/tesseract/files/tesseract-4.0.0-manpages.patch b/app-text/tesseract/files/tesseract-4.0.0-manpages.patch
new file mode 100644
index 000000000000..dfa8e9fde340
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.0.0-manpages.patch
@@ -0,0 +1,49 @@
+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/files/tesseract-4.00.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
deleted file mode 100644
index dc60579c6671..000000000000
--- a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
---- tesseract.orig/java/Makefile.am	2017-01-30 17:20:23.135458366 +0100
-+++ tesseract/java/Makefile.am	2017-01-30 17:21:29.834462557 +0100
-@@ -36,10 +36,9 @@
- 	com/google/scrollview/ScrollView.class
- 
- SCROLLVIEW_LIBS = \
--	piccolo2d-core-3.0.jar \
--	piccolo2d-extras-3.0.jar
-+	/usr/share/piccolo2d/lib/piccolo2d.jar
- 
--CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
-+CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
- 
- ScrollView.jar : $(SCROLLVIEW_CLASSES)
- 	$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
-diff -Naur tesseract.orig/src/viewer/Makefile.am tesseract/src/viewer/Makefile.am
---- tesseract.orig/src/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
-+++ tesseract/src/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
-@@ -17,3 +17,7 @@
- 
- libtesseract_viewer_la_SOURCES = \
-     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
-+
-+if !GRAPHICS_DISABLED
-+AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
-+endif
diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
index 9f1cde5cf67a..961971a91daa 100644
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ b/app-text/tesseract/tesseract-3.05.02.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
@@ -60,7 +60,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+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"
 
diff --git a/app-text/tesseract/tesseract-4.0.0_beta4.ebuild b/app-text/tesseract/tesseract-4.0.0.ebuild
index 84e9db7e0a22..d4ba59d9b351 100644
--- a/app-text/tesseract/tesseract-4.0.0_beta4.ebuild
+++ b/app-text/tesseract/tesseract-4.0.0.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="tesseract-ocr"
-MY_PV=${PV/_beta/-beta.}
 LANGPACKV="4.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
 
-inherit autotools java-pkg-opt-2 toolchain-funcs
+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/${MY_PV}.tar.gz -> ${P}.tar.gz
+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} )"
@@ -21,7 +19,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.g
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+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
@@ -51,36 +49,30 @@ for lang in ${LANGUAGES}; do
 done
 
 # With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+RDEPEND=">=media-libs/leptonica-1.74:=[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 )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
+	"${FILESDIR}"/${P}-manpages.patch
 )
 
-S=${WORKDIR}/${PN}-${MY_PV}
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -101,16 +93,15 @@ src_unpack() {
 src_prepare() {
 	default
 	eautoreconf
-
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
+	# scrollview disabled for now, see bug #686944
 	local myeconfargs=(
 		--enable-shared
+		--disable-graphics
 		$(use_enable opencl)
 		$(use_enable openmp)
-		$(use_enable scrollview graphics)
 		$(use_enable static-libs static)
 	)
 
@@ -120,14 +111,14 @@ src_configure() {
 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
+
+	find "${D}" -name '*.la' -type f -delete || die
 
 	if use training; then
 		emake DESTDIR="${D}" training-install
@@ -135,5 +126,4 @@ src_install() {
 
 	insinto /usr/share/tessdata
 	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
 }
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
index efa9df5d7095..6bba4a49da59 100644
--- a/app-text/tesseract/tesseract-9999.ebuild
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="tesseract-ocr"
 LANGPACKV="4.00"
 URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
-JAVA_PKG_OPT_USE="scrollview"
 
-inherit autotools git-r3 java-pkg-opt-2 toolchain-funcs
+inherit autotools git-r3 toolchain-funcs
 
 DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
 HOMEPAGE="https://github.com/tesseract-ocr"
@@ -20,7 +19,7 @@ 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 scrollview static-libs tiff training webp"
+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
@@ -50,34 +49,26 @@ for lang in ${LANGUAGES}; do
 done
 
 # With opencl USE=tiff is necessary in leptonica
-CDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+RDEPEND=">=media-libs/leptonica-1.74:=[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 )"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	doc? ( app-doc/doxygen )"
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
-)
-
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }
@@ -98,16 +89,15 @@ src_unpack() {
 src_prepare() {
 	default
 	eautoreconf
-
-	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
+	# scrollview disabled for now, see bug #686944
 	local myeconfargs=(
 		--enable-shared
+		--disable-graphics
 		$(use_enable opencl)
 		$(use_enable openmp)
-		$(use_enable scrollview graphics)
 		$(use_enable static-libs static)
 	)
 
@@ -117,14 +107,14 @@ src_configure() {
 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
+
+	find "${D}" -name '*.la' -type f -delete || die
 
 	if use training; then
 		emake DESTDIR="${D}" training-install
@@ -132,5 +122,4 @@ src_install() {
 
 	insinto /usr/share/tessdata
 	doins tessdata/*traineddata* # language files
-	use scrollview && doins java/ScrollView.jar # scrollview
 }
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 8af8e9647cc5..de9cbd2ff6d6 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -2,7 +2,7 @@ DIST texlive-20170524-source-freetype.patch.xz 625056 BLAKE2B 70bcd15da1edfe5422
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-core-2017-poppler076.tar.xz 9232 BLAKE2B 945e4f8e6f3230b78dc43560c664fbe4989fb32759b41c0ef83d656b43b008030cebdbf668718c4f22831d01c3fe1466f686f7f6b76183d3d1bb5e760f17140d SHA512 63fb2b426921be5f6d310b31e7fea6fc0edc0900f4790445fcaface9c931ca6c3e8f98b81a3bccfd1c877750e854c9410a59ff9a124aa2826d7b4187d54ed8ab
-DIST texlive-core-2019-poppler076.patch.xz 7460 BLAKE2B 92219d1119231b31f3d2ec49f9d3b8db8f4eaeb2b7790ccfb62f106b5626b0d9f6c197b4016129230b32fd873515d1fd99676677f1584d0cfb6bcbf352f7e704 SHA512 e7d6d4692d702b24714d3d28da258d615d614577ad81ebf9cf261be2c4cf8a8207dc8861cd3c86bd82b2425c6c4ab1766f11b8b0ad14f9d6de2b12e3f76fed14
+DIST texlive-core-patches-2019-3.tar.xz 11940 BLAKE2B e696579b5012133dd588ffd8822417a6be25b082871664973d3967adc5689a0c29e83f225f5354f61d5ed5e9a445951c6fbc0e9a4af47cfb9282495f5385ad23 SHA512 0825037b2fbb56ccd1f4339fd5c2054b7efa4a93902d0cc4be6c99c6d23edfb4b922c4208d9753b573beae35e83c8423a685d12320589a078ad3153f8b7a9175
 DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
 DIST texlive-module-a2ping-2017.tar.xz 31136 BLAKE2B cc0d99992cb780711a2a423fa26135845fa1f2cbbac76485d64a0b3184e338e7a60cdcfeaca129e6251f72110b0069c32164f9c4904d7f7c9c2edc6306f50411 SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41
 DIST texlive-module-a2ping-2019.tar.xz 30616 BLAKE2B 545abfdd3aa23b8d2bed608d7b7aef0f9578d5c4d6039880d435144c687014edb8c841afcb2d9ca1fc48a365b2bcb57832d49d1c6bb35480a01a813e40e18ea6 SHA512 983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c
@@ -317,5 +317,5 @@ DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
 EBUILD texlive-core-2017-r4.ebuild 12341 BLAKE2B 97ce4f9a733fddb0bc85ba3885ac9e988b89408b71d045fa3172d643937587193f1a71c9b156f71eabe4e59f155b2694c6f5d7522d4d2f463950cd7a8ffe1b6f SHA512 bc97b917ce1da33677f58b865d551c904efbb0b971a8f2cd25cb785c2e999b1f550cf08cec2e8df40fad934176994c4865732c7cee44a53458cf92e8e8c6a249
-EBUILD texlive-core-2019.ebuild 11088 BLAKE2B ee18e88fa38f30e38e53c14cf7beb44d69389a2be67d5c4e19e8ca610754253ba2575bfe5fbaae92a989500e402f1266759c03b4ed82f33979ca66dd926c99ca SHA512 e082a113fb582bba27132d16211eae01fc32e1ca2716664e02d9072df294fe2286f5393594c9ee2ade3557a63b1a32036994db251c99b2eae9b266a63d08a62e
+EBUILD texlive-core-2019-r2.ebuild 11129 BLAKE2B c2d1f22b4e0af4c4429da1ad3bcbde271b156bc666996e60517b54dd0dfdf44861fa1631d409749c491b71e683fd4855c1e8ed1f35186e7165fa439175b67220 SHA512 ec9b82f51345ca46e430f13fe9e1a45c2c0646e314c92d0d7dddcc4e14aa363d07fe095e52c196d85e2fd810e4cd626a72b1b200148a19eed66d456d406b6f2e
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2019.ebuild b/app-text/texlive-core/texlive-core-2019-r2.ebuild
index 33c6995ada00..136b40688fb1 100644
--- a/app-text/texlive-core/texlive-core-2019.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r2.ebuild
@@ -9,13 +9,15 @@ inherit flag-o-matic toolchain-funcs libtool texlive-common
 
 MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
 
+PATCHLEVEL=3
+
 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
-	https://dev.gentoo.org/~zlogene/${P}-poppler076.patch.xz"
+	mirror://gentoo/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz"
 
 TL_CORE_BINEXTRA_MODULES="
 	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
@@ -83,6 +85,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	!dev-tex/luatex
 	sys-libs/zlib
 	>=media-libs/libpng-1.2.43-r2:0=
+	media-libs/gd[png]
 	>=app-text/poppler-0.58.0:=
 	>=x11-libs/cairo-1.12
 	>=x11-libs/pixman-0.18
@@ -143,7 +146,7 @@ src_prepare() {
 
 	default
 
-	eapply "${WORKDIR}"/${P}-poppler076.patch
+	eapply "${WORKDIR}"/patches
 
 	sed -i \
 		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
@@ -184,6 +187,7 @@ src_configure() {
 		--with-system-zziplib \
 		--with-system-libpaper \
 		--with-system-gmp \
+		--with-system-gd \
 		--with-system-mpfr \
 		--without-texinfo \
 		--disable-dialog \
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 8abeb14fe89e..c698da813a68 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,3 @@
 EBUILD texlive-2017.ebuild 7276 BLAKE2B 4bb6c9de41736664687aa1ba4318aef71d43e3823c64807755743ac1f30c8a0441b330bd98bcb265c118676953b406e2a138a376a1a14e17397aa6db838d8e66 SHA512 08a2ffabfb4b5732391a20afaab0615ac5c3a3ff5caba16c90430fff6eb144f00280969753b405a57167606cd40501287130cee059495287e8b7b8281d62ee07
+EBUILD texlive-2019.ebuild 7282 BLAKE2B 2d271e33deae5f67a8db84de259b32c7e4767522c692a9a703217a295f27eec46d78da9c69033dab647211b096e43774b9d82d2b734cf93a521c6a8e5984d35c SHA512 66d08076b62db81a4f04c943be69bbfc88f582204feb7ca6e24706a4d7ebe6cb293663d183493582b0cfc2f3bfa71d318a884aeed383ece13b146afbc1418270
 MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
diff --git a/app-text/texlive/texlive-2019.ebuild b/app-text/texlive/texlive-2019.ebuild
new file mode 100644
index 000000000000..e3f97018b809
--- /dev/null
+++ b/app-text/texlive/texlive-2019.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk context detex dvi2tty extra epspdf games graphics
+humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
+science tex4ht texi2html truetype xetex xindy xml X"
+
+LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
+	hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
+	pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+TEXLIVE_CAT="dev-texlive"
+
+DEPEND=">=app-text/texlive-core-${PV}"
+RDEPEND="${DEPEND}
+	app-text/psutils
+	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
+	media-gfx/sam2p
+	texi2html? ( app-text/texi2html )
+	sys-apps/texinfo
+	app-text/t1utils
+	>=app-text/lcdf-typetools-2.92[kpathsea]
+	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
+	detex? ( dev-tex/detex )
+	app-text/ps2eps
+	dvi2tty? ( dev-tex/dvi2tty )
+	png? ( app-text/dvipng )
+	X? ( >=app-text/xdvik-22.87 )
+	>=${TEXLIVE_CAT}/texlive-basic-${PV}
+	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
+	>=${TEXLIVE_CAT}/texlive-latex-${PV}
+	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
+	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
+	>=dev-tex/xcolor-2.11
+	>=dev-tex/latex-beamer-3.36
+	metapost? (
+		>=${TEXLIVE_CAT}/texlive-metapost-${PV}
+			dev-tex/feynmf
+	)
+	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
+	pdfannotextractor? ( dev-tex/pdfannotextractor )
+	extra? (
+		dev-tex/chktex
+		app-text/dvisvgm
+		dev-tex/latexdiff
+		>=dev-tex/latexmk-418
+		>=app-text/pdfjam-2.02
+		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}
+			>=dev-tex/glossaries-2.07
+			>=dev-tex/leaflet-20041222
+			>=dev-tex/currvita-0.9i-r1
+			>=dev-tex/g-brief-4.0.2
+			>=dev-tex/envlab-1.2-r1
+			>=dev-tex/europecv-20060424-r1
+			>=dev-tex/svninfo-0.7.3-r1
+	)
+	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
+	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
+		dev-tex/dot2texi )
+	epspdf? ( app-text/epspdf )
+	science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
+	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
+	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
+	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
+	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
+	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
+	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
+	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
+	xml? (
+		>=dev-tex/xmltex-1.9-r2
+		app-text/passivetex
+	)
+	jadetex? ( >=app-text/jadetex-3.13-r2 )
+	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
+		   >=dev-tex/cjk-latex-4.8.4 )
+	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
+	              >=app-text/vlna-1.3 )
+	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+	xindy? ( app-text/xindy )
+"
diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest
index 08e847ad5567..b1cf5cec2b55 100644
--- a/app-text/webgen/Manifest
+++ b/app-text/webgen/Manifest
@@ -1,3 +1,5 @@
 DIST webgen-1.4.1.gem 200192 BLAKE2B b52e8bf55fa93776fcd41a35ab495c03e775bb0fb9cfa0f4882ced4556d65403724de09531f80f3b3c51809295fc1abb692b9d709bd3ac65885a22066db83736 SHA512 ee21edbaa6592496101bff5b20b4b3041ac9a313e3ce5a00118f2011797330c5e274d468d2793ca29133d4f7301eda741e25a6f135dc6e2153c04780c2f5332b
+DIST webgen-1.5.2.gem 200704 BLAKE2B 55749d515223b46c7063596d1424de107f43af022fc54ba431e83ffa4dbe3ab5651e6c61e48f66710a1e958c2f6d09a64ea05c9186dd0c73add5351fbc419806 SHA512 83557bc7a3cafb5e885bd4c50f7083a7576a5c930458075d91ffd58b4fa3c4e406f342dd23988788afb22e9a03ffbff0dfb02d23ebfdef7d2275638c102839b4
 EBUILD webgen-1.4.1.ebuild 1045 BLAKE2B 118cc61a68b0fa5606e9ba1425bd97dc87b12f3eed1247b802e76e7aabd28647fb67e68dd56d3f3511b5b3e45a2b07dbdc0d4a88938fac5bcad75126a9f12fdf SHA512 dec87296386cf1dcd4e57a613c79e166105adb4cfaf315b005bc75ae4873cea5fbf3e37e857d246f34dee4bdb11dc13c505ea98c97340de02f298458ddcbf6ae
+EBUILD webgen-1.5.2.ebuild 1163 BLAKE2B a44f3a9abccb766d9f4905b912029e82dac08438771ffb73faadd400f7cf474b1a70a4398b45e1ee4b6e8cb1a15673ea1c5e839c291f840bd96dfb593d5e06a5 SHA512 32b64116287d64be074c47f6c74213ada9185d5a3cbca85ce98114180144669531b742bcacf7c1ac2b953260bfc272a8b3838358a41679d1de9420ca3e5530d4
 MISC metadata.xml 477 BLAKE2B c8293490729904a1a67e6c0861f6fc01b00190322213b566de36e6a56d474118c32a81a9573bb8e43f433d5eba8d5f111878cda00866a5f1b5fb36e052b779d1 SHA512 d872a0fb051b79b34541fafe549c2283a4a92edd7bad4a97adb1c3124e82820a67c286d04a004cdd2fe132a44ea4f0ec8cc3b335f3a1d91aa8877533a1c278bb
diff --git a/app-text/webgen/webgen-1.5.2.ebuild b/app-text/webgen/webgen-1.5.2.ebuild
new file mode 100644
index 000000000000..61d236872c81
--- /dev/null
+++ b/app-text/webgen/webgen-1.5.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24"
+
+RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
+RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template-based static website generator"
+HOMEPAGE="https://webgen.gettalong.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="builder highlight markdown"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? (
+		<dev-ruby/rdoc-6
+		dev-ruby/kramdown
+		dev-ruby/minitest:5
+		dev-ruby/rdiscount
+		>=dev-ruby/sass-3.2:* )"
+
+ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
+	>=dev-ruby/systemu-2.5
+	>=dev-ruby/kramdown-1.3
+	builder? ( >=dev-ruby/builder-2.1.0:* )
+	highlight? ( >=dev-ruby/coderay-1.0 )
+	markdown? ( dev-ruby/maruku )"
+
+all_ruby_prepare() {
+	# Avoid a test fragile for sass version differences
+	sed -i -e '/test_static_call/,/^  end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm -f test/webgen/content_processor/test_{css_minify,tikz}.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/webgen.1
+}
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 8609cf28c09c..02b1b947a6a5 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,5 @@
 DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
 DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
 EBUILD xmldiff-0.6.10-r2.ebuild 522 BLAKE2B 6d012cfec8f200441be4e5e27e9cbd4ca927843b46a5b8d24108440663d619c36b1f4bf11f256bd7c8478e88a9b01805d12c112cbba2a82fb96887aec40d9265 SHA512 b16ceed0a37b133b1f61b9e47529bd61469bc933ad99218f5d3a345baa6bfb2d4908754bcce5691be68085ace23f3049bc1ae12b855073f33bddce20620fc879
-EBUILD xmldiff-1.1.1.ebuild 632 BLAKE2B 5b1b3bd3fb43dd845022c287989fb8cec7b1000ccb027e492ef3e87766845db763355982f093c16a611e27214ec3c5c7f53939bd6f52324383095d3aca0a43f9 SHA512 358d8e78ecf83c5d5e83d2042d13d39c1687a2f2a4b1616d11fd80e2a9b35f969617a57a5ba91c368b493232c4ac2a25f30a5c653b95b55d0baa272acfb7386c
+EBUILD xmldiff-1.1.1.ebuild 631 BLAKE2B 9462cbfb0eb42b9b9afff994bc9b87ed32f7e23c054ae5ae554db138e2df9bdb1064d68857fa2c3908e696cf16eb14bae6aaa777ff2c2df093046af787c5180b SHA512 38f6c5ff6aaad0c787af614ba2a2f5c1171aed47b38f32c4e998c85c90aaca3d9250bd404c088bb16a08696e7337e147aff32d87f36b5234e591e3a6c12dd789
 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 ba247e45a6cc..c0248ef5c884 100644
--- a/app-text/xmldiff/xmldiff-1.1.1.ebuild
+++ b/app-text/xmldiff/xmldiff-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc ~x86 ~x86-linux"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/future
author	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-06-08 09:04:53 +0100
commit	73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree	2878053f3e7faed19a1f82c733d3bd29df69991e /app-text
parent	2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)