gentoo resync 31.01.2019

37 files changed, 219 insertions, 333 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a01928d63a48..726f5e54f481 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 3d9cd62e8638..cd3fa5e853d5 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,5 +1,5 @@
 AUX docbook-dsssl-stylesheets-1.77.Makefile 676 BLAKE2B e87e463a2fffd64e6633a2d1015660ebc341f089a2dd3cb5da9c743eaf9b98b8457a723040f871c350969445275a6eca705546e2d4ba7596c21994fc5069c540 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
 EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1622 BLAKE2B 1d3a39700f1d767669319d7ecfff473ecd4849ae66918d070780f1e9bd327a82488a65a7744834a98572bc2685bbcb333dc5482316f232b6a1fbbe157f8a96bd SHA512 87e7ffd95e6e6ff0dd713f1246b80353a246736696fac03384ae906d1ed6a3438f9d74ac1526f7bd516e7d3110f2e76d76e90aa59fe9d17bbc7930ec9257124c
-EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1565 BLAKE2B 321a8fb7c20cf54eaee41da434d1d053c5b82d7285b469573c7e4d7d1986ffb865664f19eccea3b1b3dd9b1ec3fef8c084dd77039720cc3864fa0bebd3ccf735 SHA512 d4f5996b503f9307ccff06b8e3af81b24d37ea5280596146fd9faa48bef2f07638070f59f4e5a7e0e2bde4d9e470d865e91e772cc4e396d18b43a9752310ae04
+EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1561 BLAKE2B fbb5bcb09fee5b3dd50c81338ac09011d6f92165423f23bf8af0363a276a6f03892efacaa7c78a31e297b9b7f13de8f869c32ade38d5209c9741e4700d67e1c6 SHA512 46fdc7be06cbc42641e50bda218fa9bf067f7304b4f8a719fed8d5e59f3165a2752482b64333fea50f93e4257fa2295b190f6aabff4092c1a430a5e8a3da54c6
 MISC metadata.xml 297 BLAKE2B 33f8b636a483011e6561d078c58c16a477925ea41543b150c11ea7ecb3465151a5404689d8cf263a6e9f6ede4d2d5a55fc8fd02fa89814c7b7b0e93e7c6077aa SHA512 e5cc7a9b4aea0e6cd29246bb44f1bd2713495d58b243bc78bceb760c827c415ec30459f5b9acf2ddab615e39d9ab5c4a9d4eb41e7bd53684032a08f7a4fbce3e
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
index 2cf6e40311d1..fb5677d34ce2 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.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 is blocked by Gentoo bug 497052.
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml/Manifest b/app-text/docbook-sgml/Manifest
index 96ba3647c85d..227d8adbf6a1 100644
--- a/app-text/docbook-sgml/Manifest
+++ b/app-text/docbook-sgml/Manifest
@@ -1,3 +1,2 @@
-EBUILD docbook-sgml-1.0-r1.ebuild 571 BLAKE2B 1e4bb9bb1b1bdc2c1ba7fe39553832b2a2ae85e58614e294aad176e4e7a202ef7cc0708da95338f6ede81f42514c6e64dc00428635a43ce24918cb0782684772 SHA512 1f7d016a6026715c021f9ccb01324c99389c91d52e648c5d5085d0df3cdcf56f3d15f1707a54aeadb45d853abaf82e2555976482b30fe7c106d5df88b19e2b7b
-EBUILD docbook-sgml-1.0.ebuild 568 BLAKE2B 21830870bfdf71613c2b6e1597b93573dc4fd35a6eb072320c8981db54a350a06c6f99c3ec546b8ebc16b1d1ea3fb2af47fbba749c24d077f8d1656ce4f60dcb SHA512 be3ec3040ae17bc95db4f68cd3789d84f57ee22ea731a650de79ac961d3545c69ffbff4697886184bf68ee2ed98692bee2cdbde1df88cba5bdc7e1a6d7a8c2f1
+EBUILD docbook-sgml-1.0-r1.ebuild 557 BLAKE2B 03a73fce2b117fcdc0edee1fa7444b05df6ed6dcbf97f8e3d7c18d3f211ea4795324358ecc7f94d6d5fdf402c698650c13014318cae84708643a5f300d9f82a4 SHA512 98b7ebeec8ab5a8ac8ff8a424c8e7184d54cb84df030b0be3c1539d5d18b363f34fd55c500f8dd3667da4a0c4f849e1718b0a238608d1f9c7cfe95275072d3a6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
index ad54610f23a3..aadcacdb95fe 100644
--- a/app-text/docbook-sgml/docbook-sgml-1.0-r1.ebuild
+++ b/app-text/docbook-sgml/docbook-sgml-1.0-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=7
@@ -7,7 +7,7 @@ DESCRIPTION="A helper package for sgml docbook"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 HOMEPAGE="https://www.docbook.org/sgml/"
 
 RDEPEND="app-text/sgml-common app-text/openjade
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
deleted file mode 100644
index 88cf25ee6cbd..000000000000
--- a/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A helper package for sgml docbook"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86"
-HOMEPAGE="http://www.docbook.org/sgml/"
-IUSE=""
-
-RDEPEND="app-text/sgml-common app-text/openjade
-	>=app-text/docbook-dsssl-stylesheets-1.64
-	>=app-text/docbook-sgml-utils-0.6.6
-	~app-text/docbook-sgml-dtd-3.0
-	~app-text/docbook-sgml-dtd-3.1
-	~app-text/docbook-sgml-dtd-4.0
-	~app-text/docbook-sgml-dtd-4.1"
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index c97bcb99641e..36c77d9531d8 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,4 +1,4 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
-EBUILD dvipng-1.15-r1.ebuild 1295 BLAKE2B 5b3272e0974907c12c4bfc87cd4ed918831066d78e81ceb4beea7f3d7d1cb571ce3bdcab09188e9a13516daaf6eaa16efc595a7b1badc5ca4fddf2f01be6d02e SHA512 0bcd7a13d6af039c90e8ffd9c34f88c50ef83153245bd786c5aec474a0894a483dc81b471a495b9ffd99c76b7cb7b779b2373247d7aa2685bead65ce740756f7
+EBUILD dvipng-1.15-r1.ebuild 1294 BLAKE2B c4bdfb2b64d8c81b410b03cc1044e62047f000720d00a48f5cbfc7340c39a6c6b0a5080bed826434a6b8d146e765dd7b9a2985ce5ed45ddf895fb94b350fdd46 SHA512 74ee4cd8c6b6e1e85dedf0d70e70280233d76032167c4788a2e4dbabf70d40d675c89f3b906ad88d0527fc93f9fa1a6484d4960391ccda672a2d575f57ddb86f
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index 4f7f255a1b52..ce06c6f999cb 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-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=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 
 RDEPEND="
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 7c820c985b8a..6211dc45c275 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -4,8 +4,10 @@ DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7
 DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
 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.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
 EBUILD enchant-2.1.2.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
+EBUILD enchant-2.2.3.ebuild 1171 BLAKE2B 73259403ac20a282d251d9941bd2aff8dde977aab3a71766b896e7e57d2e52c8e95eeb8c4688630b8a9960fc7ab4d03a433878a92ccdd93a67129052218e1ce7 SHA512 b270abe29c3c3f0c705a7c7d4f0115047386e89620212db4451b50284ec30a6a994f4e7c40035ba44e1471823b2842c49631744075eb52cd9d4ab93c6e76206c
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-2.2.3.ebuild b/app-text/enchant/enchant-2.2.3.ebuild
new file mode 100644
index 000000000000..b9445634e884
--- /dev/null
+++ b/app-text/enchant/enchant-2.2.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+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 )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+COMMON_DEPENDS="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+
+RDEPEND="${COMMON_DEPENDS}"
+
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig
+"
+#	test? ( dev-libs/unittest++ )
+
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_enable static-libs static) \
+		--without-hspell \
+		--without-voikko \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index c2aa68ea2f9e..9578db8569de 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,5 @@
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
+DIST gspell-1.8.1.tar.xz 419268 BLAKE2B f32c9c518c23f8f560d65eb6fb122703561cc09e385eefa99d0761e8aa5b5bf3a8cec3cab7071043134314262979de56d08ee2929973b7968016b123e53d8f16 SHA512 ae94f46c7bdcdeefa0279cd4ac3c50e53b63092016e298ef6b502c40c2574a2135c503ab322f5a3a7b8b4422fdec291a6ed0c937683a8c0f32d7ad474cc1569b
 EBUILD gspell-1.6.1.ebuild 1029 BLAKE2B e788cc6815412d4cfd157bf37700e38fd3604ab1ca51a2f7bd51c560a126ab5de9a9b8d1303d02f8da22de4207813693771469d0d80730bd91b6386559204073 SHA512 bceaaa706a10c980c184738664a0645c6e70d13ed3fd2a10e7ebd62daf51f502dc475794eb5782beb7f7bfa2f2a8974da8e4ef0fce76ab35e2b9d532a5c65100
+EBUILD gspell-1.8.1.ebuild 1031 BLAKE2B 0c22cda83a62fdea9ffd07cd5cf2c8635d38bcfc259bbd092572745687220f949391742a7d6c8574c8bc8c70a2bc8945b41a30c1c92c688fb020e06941b0fd5c SHA512 822f18b8dc5fe96a150de0482d304263ea3ce75b21afed141dbdd242db1739eae1acc5797a3535c50e1ec710310d59e6ad0d10b11b0d3ba6c162aa278fe1136b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.8.1.ebuild b/app-text/gspell/gspell-1.8.1.ebuild
new file mode 100644
index 000000000000..3226d1b01c67
--- /dev/null
+++ b/app-text/gspell/gspell-1.8.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	app-text/iso-codes
+	>=app-text/enchant-2.1.3
+	>=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
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 18ad7b200507..e8fec5ccea38 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,5 +1,7 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
+DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
 DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
 EBUILD gtkspell-2.0.16.ebuild 942 BLAKE2B ef168b07393e46a98497b1fa3a7d0e999af3d0a943a72e7c1b07eea830745ea6f56c7b1d6f9da3c392ec76fb56fa9ceabcc01ea26d5880ead6d281a0b5088d63 SHA512 90460f1f223900b13fa54ffdf5e87ff2b810d540242691f3574079ed66dd061539cf0d0bd5668f3fde09b2a18297cea93afedffb2772ac3725cdb98a5270ef53
+EBUILD gtkspell-3.0.10.ebuild 1073 BLAKE2B 63ffc838848ab6585ade092b37e11c68148d73ae15a8fb8248eb799aaed0ee2f9b80f99a13d7b0692dd37cc065075176640b85884954128147e11f8e6f5dc5bd SHA512 ebe3f1f432f0f12c256c9f1f83f5dfa91c96c042764814ba68766cfc8ebd2d3decc8eea143f3fdba659234fa60a42218a64072868cb4210c0abfe8d20ad87df1
 EBUILD gtkspell-3.0.9.ebuild 1073 BLAKE2B 3ec89c21b8057ac6dc4db2e492b58044879f215611ee6c4dc5da55fe2ea5d5b4826d65ad3458b77029bb413426cad8c03e0cb46655f0493cd48b812b9fdcfbeb SHA512 39aaa3a31784ec025a8b6fd0a54cb7c05f7f5b346bb06062c8d467887977019dbe0131bf83c5e8e563a1c179977db821a03831df67d045d6ecf64ef734b406de
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10.ebuild
new file mode 100644
index 000000000000..a87cfe4fc106
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-3.0.10.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 vala
+
+DESCRIPTION="Spell checking widget for GTK"
+HOMEPAGE="http://gtkspell.sourceforge.net/"
+MY_P="${PN}3-${PV}"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="3/0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=app-text/enchant-2.0.0
+	app-text/iso-codes
+	dev-libs/glib:2
+	x11-libs/gtk+:3[introspection?]
+	>=x11-libs/pango-1.8.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.17
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index 07cbe125d07c..3ed76313d660 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -4,6 +4,6 @@ DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c32
 DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
 DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
 EBUILD html2text-1.3.2a-r1.ebuild 994 BLAKE2B a6ecf556040564c64bba93dc0dd4d9fcf5060df5a6b9a487ea91f4b2b1fac6da4f4783910a86a98cc2e2c02c9f2ee19bc7ab9f7e40d0441f56c07f28b2979a45 SHA512 94ad8a3df67dc20c080bab7a5eabe3ed2f38c39df6f454f6425b0033774b5aa0f393afe16d69e01f499ee69c2f31316a979cc0326e19737550d5bfa57603e0fb
-EBUILD html2text-1.3.2a-r2.ebuild 974 BLAKE2B 2e2c23b127324b054e57c6d4927c43b39baf04fa977329f5b5a9f168f242d5ced6e2db251b6429d1aa4c020dcb29d6d0730606b21c711ab9909cd633d3f5aee3 SHA512 723302d8745c83cf48c1dc8406d4b6bf575b975164b3123ac2b40d5e882ccf7449709229975dc4bac23da0860ef86283749f4ac89be5ef68e30f5d344fbe12b5
+EBUILD html2text-1.3.2a-r2.ebuild 968 BLAKE2B 9e852176b6e2471af0681fe473d200f4e9b9a76d6d0bb938e2cc0d3e3c627c239e310c96d1c06fb1963195d954837ed231eed91f2f1e1ed01b52e6b64642522c SHA512 5042914ac32951cce2cc23394037ecae44ecb246b61491579fb9a2b6f08329f7a1788bd16e9675b70594882d250894874e97c93b2b23bdae0d0d85edeb7dcd4a
 EBUILD html2text-1.3.2a.ebuild 933 BLAKE2B 79617efc95c443681009563030126da8aadc589ae081b7162a700622367647112fae06271797923f0de4ed462aa4b89d17f2ab36084dae3edfbf67784cdb0797 SHA512 ab234c98f3998db61cb17dad4fc72dbfa184a93511d7a4482bee1dd0f1a350ef59645b5ffbd427fb0d4107135d19a95cb3cf8e36760377309e63076a56158e4a
 MISC metadata.xml 373 BLAKE2B a4ea5de91e4a5f5a7653f4c9d86262c999e72c69863f0185700bd4fab6c27cf87d3e392aa013dd4b60a84b1ea0ddc42d811c4131c8db3ba427df86df7fa4abb8 SHA512 ae24dd6abb85c0abb4085f15c9c140d2dc3bb0c201ee22f1762e1eadc37899e8b5aa5cb794f9cd12bc26857195c9b9ba8cfa46d05628cdf765ddfc0639dd6bd4
diff --git a/app-text/html2text/html2text-1.3.2a-r2.ebuild b/app-text/html2text/html2text-1.3.2a-r2.ebuild
index f96c4819e230..f0f24d8c6dd1 100644
--- a/app-text/html2text/html2text-1.3.2a-r2.ebuild
+++ b/app-text/html2text/html2text-1.3.2a-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=7
@@ -14,7 +14,7 @@ SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha ~amd64 hppa ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 PATCHES=(
 	"${FILESDIR}/${P}-compiler.patch"
diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
index fe31c1db50ea..e957847b2261 100644
--- a/app-text/htmlinc/Manifest
+++ b/app-text/htmlinc/Manifest
@@ -1,5 +1,5 @@
 AUX htmlinc-gcc3-gentoo.patch 3601 BLAKE2B d268406b773c21cd2885d3f9b5e66ad0121493152a454811b5af1bb20e8ee857777374f2424d68ae9634c74d30d6e24a8d09779059c8fe4440db390259108e23 SHA512 f29d5c823fae27ef027002a8e075e105f028c8a4892d142c64d69af7bca52a63de4ca19aa0cf86acc67f772349472d2b04003c71257cf1b7464c9dee56d95afd
 DIST htmlinc.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
-EBUILD htmlinc-1.0_beta1-r2.ebuild 722 BLAKE2B f41a4bfbc8f66da2208c4c3a85fdbb0e64b399688cfc43980f2dd7ac0eec1fb932a999674c25dc4938a797d4ead42cf5f875b39726cc8b01b0120a295c12b70d SHA512 f2514266fa029136b0ea9561033624aafd61a89ff51e9d512bb2046663495e2ee281d4390826f724184527c48e4a571a3a5c700c103b987f2a6f460edb68f60e
+EBUILD htmlinc-1.0_beta1-r2.ebuild 718 BLAKE2B 9f6f6208f9bb395c4db942f589fa7becbfe84c150bea3b0e3696273ed663255b380b397cffce873fc5e9440b2eddd6fc0552839c16deacc3ca018aeb2a926bd9 SHA512 8011704a4ecb7a97305058292c92015475189999d2e0bf551e8d983c6c8c8545f1d36346eb22d48aab6b9c1d59acd40c2137f58017a2fd5257a549703492566a
 EBUILD htmlinc-1.0_beta1.ebuild 528 BLAKE2B 34f15f9f94bfa769fbf258cc81b2878acc4c0c9c29b71de890291127c73b8cb1ae7e95973be9a6a46987b0c91aeab948829588afe17b6b1ee28e1bb76ca8684e SHA512 5cfd9473e10c5b0676c59376070438f8c2c21f5e8a9659ce19ac9ab951575262664f7a1fe3754743afe8f171b0dd7a03c1cd3f75e9eaa55a13edd8be47ed2d03
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index 3a6d05570bbb..fe99dabe2c32 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/htmlinc
diff --git a/app-text/itex2mml/Manifest b/app-text/itex2mml/Manifest
index 8e5a0b7cb594..6b96f5517fea 100644
--- a/app-text/itex2mml/Manifest
+++ b/app-text/itex2mml/Manifest
@@ -1,5 +1,3 @@
-DIST itexToMML-1.5.5.tar.gz 155205 BLAKE2B 46edba14bc30ee06109433f3aff1d2449a0f9ff31d3c1c8a2541e0b6ec7d6f426cd230bcd3957eea758517972515a13daf21ba229ea382966a36dccf2612784a SHA512 452436fe6f72d2c99c2bf3aec0d5d74d0bd754b6f54948428e45f50b037927a64ae3148386c387d3065d35392c3744ec6467d3e6fb8c25d46a3872d92d35ce2d
 DIST itexToMML-1.5.6.tar.gz 155394 BLAKE2B be83c2de3a7ffd0a60fa45c38bb7fb224afbbfe3e715d09813137886ab0274fad4670a6156066e2f4f15ea1e3ff63f9f5cb4a30fc64256801af45455ea3d498b SHA512 2f4ebcaccbef71ba1728909bdc60abf06606cfe267481835315fb1ecaa365641e45dfad370cffb758153379e721bde48e71ff660b0cba511f8d8db8a4aec0171
-EBUILD itex2mml-1.5.5.ebuild 605 BLAKE2B d47ae666c119872d55730afb01a57b617aca32325bd0dbc2dcd4327498e06984ab8b2bc65a3de4ec3873b5fa346f4bcc68035b8bf5d38f4a6bc704f29c82b4de SHA512 8965086d25edbb6072494f70330010c19bbb0989c958c4efe9169daf8ac3fd4842189e6eb41c9ffb5345dd927f9134b967c0fc23d78587668484d019c3568863
 EBUILD itex2mml-1.5.6.ebuild 612 BLAKE2B 689cf14ca4d3a0f1fbd5eee37a42aafd7f50b2d1564e55fe00147ab594e06c9a9bba4326527a35d805b06c5d59c6648072dcaadea0c76232d8fa354fb306051a SHA512 15492c37242bef67fd24739c8b846aab0e45f3706ce3cec8d4f3c171f1747fa31c00fb5edc215a14e54126e403b17d6e4c25c3ef99617eeaa5c7f0c08e35a430
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-text/itex2mml/itex2mml-1.5.5.ebuild b/app-text/itex2mml/itex2mml-1.5.5.ebuild
deleted file mode 100644
index 205585e9b93a..000000000000
--- a/app-text/itex2mml/itex2mml-1.5.5.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="A LaTeX into XHTML/MathML converter"
-HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
-SRC_URI="https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
-LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/itexToMML/itex-src"
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin itex2MML
-	dodoc ../README
-}
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 8bd78a0bf010..0960816817e7 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,5 +1,5 @@
 DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
 DIST libqxp-0.0.2.tar.xz 341760 BLAKE2B e596b3ebd23c8fff2a1675b1076ba6b4403bb41358972b50eb946610108f5968ef3e553478aec8c6211f8b476030033e7d334cb4deccc7d6bdfba3914821abf5 SHA512 409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab
 EBUILD libqxp-0.0.1.ebuild 746 BLAKE2B 442391082f776ce32a738301f1b979a21301b3db40fb8c7a5535c9e35bd7b913b189cfedb36c7bbab79bd8a1aaabdc4bba52c5bd90502996c0ce021f7203e29a SHA512 e51af28d5f65c24966d06bf89fac96bb8fb9b9c4a4b694692c6a1a35d544ac8e39b0be67c3e45551720f941488f4b7941211ed698fa2b29c3701cf2285cbe687
-EBUILD libqxp-0.0.2.ebuild 791 BLAKE2B 588537b7b9ff032603ab626503e2427088a295ed035148038b8dd14831b6e2965db7920bab3557cd95858cb579b00c92ca2ae3c3b88838c780e487734f8f050d SHA512 9f5ddf3a157cff50457ddef63636cb1b0d8c426464c80c61ebbe5b9a8d8d2bace584c5b0659bbb021fc8e9c0a035aa63d1cb28dba4982be1bf78f5a400816d4d
+EBUILD libqxp-0.0.2.ebuild 796 BLAKE2B 0b45d760aebd4b1b75ee46ee9f497f4042353bff363ab02efd3a87edd4469b9c14c35d2bb48cf2746c7a86b868130b1b2e829639424478736d50292c71f34643 SHA512 0663c2c2bb3993a89064910a7da742c9b7c1c05e9b8069b98742e0a4989c7a180976da94eff5901407ae102f8a70ab4dda5f93d00d21ec768c38d043b62e6c19
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index f1095915cd1f..7f26f61cd684 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.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=7
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 34b5d2621a59..4e53fa2c95c1 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -11,5 +11,5 @@ AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
 EBUILD openjade-1.3.2-r7.ebuild 3700 BLAKE2B b80ec4f9088cfe7d15ceaa84fd14d640e33f48e8a718034e1d7812c25a8376d93b68ae4a7b3e73e7ea17f6ac91a59af227a4f22c6bd5720b1d43e2fbcc744e0e SHA512 5a7df1f6187b35f1ca79777ba33ccc50fce08dcf3528dbe4f8439034104da58152d6fbdb13f5f303bf33cf18ecbf5a1e6d3760c4a293c7bb1c08b0cc0bd70d5d
-EBUILD openjade-1.3.2-r8.ebuild 3713 BLAKE2B 8b0d77dfd1fb724f4af91bf120e73f982520ea55b86180c1e45415cff6676b2d8d3987867820105b539db5ccb8ffe1495682d73ad33bcc0e5e95cf8c88a3273f SHA512 9e271fc764e90bc592cfce95858e179d0f9bed6904ac2872a633006609fa15336b7aa557c953783f3d94f1e399e44006e683bb770c96e24094a2c5daa1ef3fb1
+EBUILD openjade-1.3.2-r8.ebuild 3712 BLAKE2B ce55471d2e2e73b1939f3a88fc454908a2a0b3b2dcaa3c210b684fd256e20893ff5c6419db606c68a42f449fa5da9342ff2d3971fdc950d002603109e484b871 SHA512 faa364ac6b268fa4f7fe48d31b5d125befee7e1eecf17a7f6154fa8abab41c714137916a50a31b1fdad248b07dae6f62d07cc78e16926c2fd00113926f363f32
 MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
index af2595cbebd6..975f0df40525 100644
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r8.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=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 665351e01594..50d9497a4db1 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,6 +1,4 @@
-DIST pdfminer-20131113.tar.gz 4080763 BLAKE2B 6cfe2c48f3294c6d491f47620fe0bd3b54daa5211c95b32db39c574485482254b7d6e61e461994706d364a8bfbcfa7776aa0a9dc2cd27fc26cf902ce794cac05 SHA512 be598f9ca5cb87fcde91190f72ee77209a6f8ca9db93588c914e6ec666b2a3cc69abedd92ca73a53e714c3660065b7f2c1e9c770e46c838f6d3d489dd637203e
 DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
-EBUILD pdfminer-20131113.ebuild 650 BLAKE2B 7b8c71aa5a5f04c69d9d060f8e44ab7064c8545cc27b4f73d04ff9b5cc58187e933194aface3eac2e070345759ff3eec021cd64d220382cb772e4b617a41ec8a SHA512 14618d50ba8a7eefc9845b7efbe38ea178354f3d8b1775236e529795414ac799debbe32727ea9423bf196044d703add87f7f7afb7eb3e24089c046d3b9cfd1a0
 EBUILD pdfminer-20140328-r1.ebuild 691 BLAKE2B 3b663daca3079290a88be838dd6381dcd029f3209eefad30881b89e10f0c37169ccc84372b464333accd467885e2e8dec4dc164647648a9d6a1e8e98dca19441 SHA512 8d4a9ba66c8ea67faa802709c799971262c08cfafe72c12d8e2549aa4c5da81f56dc9b7510c354f3c77b33eb6c225ce5122c2f1aaa8c376c7e53fcf9626d4963
 EBUILD pdfminer-20140328.ebuild 653 BLAKE2B 1d63ce17c37449a24b22705b0cf347f1b4306bd41b9c6a1d73060d55d75fdf577f9306fb043160a41dee1e7a65c9a561a56b0675d9ab0c492313b9093925ee30 SHA512 b5add0e6d898864ec0ee5ddbe8e73675bb044db37528bbaff1bd37d095b424280f76127f340f9462cf7e708b40cc70dbfada2c91660a51f327179494481ddfe0
 MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/pdfminer-20131113.ebuild b/app-text/pdfminer/pdfminer-20131113.ebuild
deleted file mode 100644
index 737235045c34..000000000000
--- a/app-text/pdfminer/pdfminer-20131113.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-python_compile_all(){
-	use examples && emake -C samples all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	use examples && local EXAMPLES=( samples/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index f5d3b916b171..deaf8316dd07 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,7 +3,7 @@ AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32
 DIST po4a-0.54.tar.gz 2686485 BLAKE2B f33f1e27bd24e4429ef8edbdd999333714e9a50e4af2c60ccffec91098bf330776c4ee9de9b6d4cdb459b67a26a1a6e4b8a0ead7efa82fe97584405a15245ef4 SHA512 5d97a169c73bcb872247599af477ecca9112b9ff576dfb93a2aa06b9891464a1837d799304f1a3ea8344ad46a4529ec19568584b7914761deccc09a9099e3130
 DIST po4a-0.55.tar.gz 2892158 BLAKE2B 606236a4bc143d4a5cc003f7dfaf59f605017478fc7ab3fc66af5eed078a8bb0744690b7191cd2ee0b795229e766145ed47545484e3d20e6a14ae1ac0981772a SHA512 95f7408caf2c603f2ea86d8439e99c39be72dca019361106190bd6e1f95679c6627280bcd02a2d9c843071a6ce96747bf5b4d85c9051344b08f32deade2cb599
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.47-r1.ebuild 1679 BLAKE2B 1e5ad4809bf26a0b6fc31b9b88e7aec0a639d7585693d19e0c83461dc10be62b999f6dd3b5375dbe1f81fa4133aa7ed51211a6ea9f467634a5ac6aeed8f53c3a SHA512 9faf0ae116996c07bafaf1fef5c9d6ae0c23b85e4ec813e363ed4476bb5d62f890c267c1360df3a42bb05fac94685f97f8ad51e3616b15491385246cd5137633
+EBUILD po4a-0.47-r1.ebuild 1639 BLAKE2B b87cf534057df8788fb681dd3475290ddd90066ca20fe87a621b36e21065743f0c211e5dae2aac4ce02f543b6b93acb7bc8979447f935e26555b391f68f817ac SHA512 562bb377b7d2c504247632f69d0ee3720b496e75282f4e96751bc46ee967476ca491312d848544d1b36e6bc1187e9659763510b2c30142d0a225fd8b425f87b6
 EBUILD po4a-0.54.ebuild 1295 BLAKE2B 30c5351226ff055e5c1252abc4be74b533b7c9a32927dbd99d25ed0d361668f48cbedc23edb915e9df9101575f984ee4d207511377f9f8288d9e0779dc647a68 SHA512 3738487c57b8376d993df7116dd181f3b5fb2a8d5b780e2490d311ece4ff269b097b3de83c35fde0f222551368f61e7b95d83840b99e8fd7ca9973b1c7116cb3
-EBUILD po4a-0.55.ebuild 1295 BLAKE2B 30c5351226ff055e5c1252abc4be74b533b7c9a32927dbd99d25ed0d361668f48cbedc23edb915e9df9101575f984ee4d207511377f9f8288d9e0779dc647a68 SHA512 3738487c57b8376d993df7116dd181f3b5fb2a8d5b780e2490d311ece4ff269b097b3de83c35fde0f222551368f61e7b95d83840b99e8fd7ca9973b1c7116cb3
+EBUILD po4a-0.55.ebuild 1297 BLAKE2B 1e4957e353bf250fe9350a60c3c106cd697122231b4f3edaad19e26d446f36013c01e619e37255f138bd98e758d965eb64f035ed1dcfb052362b7a55dcb9fcc1 SHA512 ad840f6d01112b838fd4666b4db171816bc1f726002f8625d4a42b65ed82594b31d7cc1f0c7f87a57201995f307a23b705c70a1072e8c9157b6b5a0ebd7e91e7
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
index dcf757c2f2b7..48553f426ba7 100644
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -17,20 +17,21 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
-RDEPEND="dev-perl/SGMLSpm
-	>=sys-devel/gettext-0.13
-	app-text/openjade
+RDEPEND="app-text/openjade
 	dev-libs/libxslt
 	dev-perl/Locale-gettext
+	dev-perl/SGMLSpm
 	dev-perl/TermReadKey
-	dev-perl/Text-WrapI18N"
+	dev-perl/Text-WrapI18N
+	sys-devel/gettext"
 DEPEND="${RDEPEND}
-	>=dev-perl/Module-Build-0.380.0
-	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.1.2
-	test? ( app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
-		virtual/tex-base )"
+	app-text/docbook-xsl-stylesheets
+	dev-perl/Module-Build
+	test? (
+		app-text/docbook-sgml-dtd:4.1
+		virtual/tex-base
+	)"
 
 # Running tests in parallel fails
 DIST_TEST="do"
diff --git a/app-text/po4a/po4a-0.55.ebuild b/app-text/po4a/po4a-0.55.ebuild
index 45fe4908e046..2f7af51c8354 100644
--- a/app-text/po4a/po4a-0.55.ebuild
+++ b/app-text/po4a/po4a-0.55.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	dev-perl/Module-Build
 	test? (
 		app-text/docbook-sgml-dtd:4.1
-		virtual/tex-base
+		virtual/latex-base
 	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-man.patch )
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c4dc95634538..1042d88f7a8d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,16 +2,13 @@ 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.62.0-glibc.patch 1119 BLAKE2B 680425520a9ea1e7d24639ea3a05ed5a857c09ea6ec48bf60a8a4b37bf725d5f7359fb5dc2708584e5a27fae862fd3ef6b0aabb7b4f0f63e1f4fc0c6c80f2c7f SHA512 4f6f8270513163b09a1861ebe7e83ed1a6150d523773daacbf039c660853bbde17bbdd502135eb56aba1e4812cb5adb7dc39294764b282f0b34aa43b04410fde
-AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170
+AUX poppler-0.68.0-bool.patch 1208 BLAKE2B b0baebfe06e4e140ee5918b521a792e87b57153f043c55ef1149af1a2c9c87302c9f7acaa19a21da1b3fc9f2399af68add637381da0d95db83105c11335d6b4d SHA512 85b7359bb4c3ac332afe0be1a0fd51d6249491b1fd97615604eb4d116d621a866b5c1b9febde52b54eb76c50706da8d43040a475a3ce5a0590be2904fa599e13
 AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
-DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a
 DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c44447aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e
 DIST poppler-0.72.0.tar.xz 1492912 BLAKE2B 6582b418031c52e5e9031e9f25b80841ba471c1308030bef2cdb13cd607ddd0ca51639d93c09f33e42d5f9378ee44b5ebe4dbac29254f952f7c2ec147799bc5e SHA512 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145
 DIST poppler-0.73.0.tar.xz 1507068 BLAKE2B d88a7595d0d8b779d623b56d8dc25c753f2cfc6f015092ec9d254a2b2d701d0e760a069324a15d3a03c65c9c85c3398ad142d7f8cc259e5455f53b4d391596d3 SHA512 6924a343032573504a0039c56a6263cd1183fa6aca75966fe1f084bd19da78553e455e541a3693896c1ed0c3865f11c11758a0f5a66b2f6cd48ac8a7eccf891a
-EBUILD poppler-0.62.0-r1.ebuild 3537 BLAKE2B 9c5ade9d12bba01198417d35e63ae454cd0a5a2d2e68ccda8fcf90bcae83fab248b46e8178e651661b25385b6863bb250461d6995afa38dee88c5c0084da0541 SHA512 4075ffbe26bd13100e9d43f8b0d3768d9ab9d2f287364654f1b223b91e6ede835268b7ff7226c1e65c4ff27e9be43bf355d377d4de8d2f2a7eab27ad908a3e3d
-EBUILD poppler-0.68.0.ebuild 3481 BLAKE2B d5f6d958d65bc86c9c80d6850cba3bf472ebc0249169c6a7af0e1f66faeeee7cf634e82d0096a0cef3bd82ebd51138d658092f5569bc65637ed88f85de73161e SHA512 d49dbe9a37d399097cfba2e4c96dedd8df5a6d162e687f1d50406e59cd93f5420a1b0122869e233d197161834d8fda54ca2ec044b76efcc46b6dd89f1c6795d4
+EBUILD poppler-0.68.0.ebuild 3519 BLAKE2B f32a7ea6a326f046e0295c381a625ae32e17b140b6055bc5a7a1cf651337c36537d65c40fce39fc379339c1d737a929e92f96056d0f338eef35fc6da817af067 SHA512 81e0874f4f4beb316ba8b24eee1252fbd486d96b44ccf150372cdcd46d7c97a54f116bae7544022f4ca3da0e9c3a00147806eaf18c22396b85f5f25356e699ca
 EBUILD poppler-0.71.0.ebuild 3540 BLAKE2B ac172b835255622ead92f000a8f0363780445dc2d3d2be23b450700af08cef77472a4eb8e6cf83eaa77d32ca09f773935fe0714da27471c604773caa201c449f SHA512 e69e46cff9fc2d118ba590f30cfdf002e40057c17422fc76dc1560772f744648a28c77fc5c2f1a059dc62c631cf0b384f903b98403ad48164df9c1262c092c39
 EBUILD poppler-0.72.0.ebuild 3540 BLAKE2B 354cd476e92a4bf81678ae80e792fd4766d3fc7645035908cc6a9b77f8cf3bd785f00eef0dcaecb1851f6d02323763af95b92c4a9a5e0763b34a77b28adc20c2 SHA512 2fe94a398d441edbe0cccc736e9964fec3d0d5adfe70ff1808b74e091d8edf2302c157d704565cf436c6597b13cda09f3b15faa939991a29da1098544526454a
 EBUILD poppler-0.73.0.ebuild 3526 BLAKE2B 1fef03f89557f7d738d4dfe8920d2370e812810e0a1079f96e26848561484fb05ecde443593ff2e3000c9b79f118650adfe7fa2c552e21f44ee236409a4f9335 SHA512 9ff4b2da943780aee81ff0311b8d417068bd52d3d47e3964539ba03449178da9f4631bb04819d4769b8993baa63850422dd01677f004e7d14637a5e99350a4f6
diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch
deleted file mode 100644
index 6808e91601dc..000000000000
--- a/app-text/poppler/files/poppler-0.62.0-glibc.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001
-From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
-Date: Fri, 15 Dec 2017 16:56:20 +0200
-Subject: Honor configuration for building glibc copy of strtok_r
-
-config.h didn't get included and HAVE_STRTOK_R was never defined.
-Now getting via glibc.h.
----
- goo/glibc_strtok_r.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc
-index e779bf5..e323bc2 100644
---- a/goo/glibc_strtok_r.cc
-+++ b/goo/glibc_strtok_r.cc
-@@ -50,12 +50,15 @@
- // Copyright (C) 2012 Alexey Pavlov <alexpux@gmail.com>
- // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
- // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
-+// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@jollamobile.com>
- //
- // To see a description of the changes please see the Changelog file that
- // came with your tarball or type make ChangeLog if you are building from git
- //
- //========================================================================
- 
-+#include "glibc.h"
-+
- #ifndef HAVE_STRTOK_R
- 
- #include <string.h>
--- 
-cgit v1.1
-
diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
deleted file mode 100644
index 789090cc9b22..000000000000
--- a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Sadly the CMake side of openjpeg slotting in Gentoo is broken.
-To reliably find openjpeg:2 we need to use pkg-config.
-
---- poppler-0.62.0/CMakeLists.txt
-+++ poppler-0.62.0/CMakeLists.txt
-@@ -193,7 +193,7 @@
- endif()
- set(WITH_OPENJPEG FALSE)
- if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
--  find_package(LIBOPENJPEG2)
-+  pkg_check_modules(LIBOPENJPEG2 libopenjp2)
-   set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
-   if(NOT LIBOPENJPEG2_FOUND)
-     message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.")
diff --git a/app-text/poppler/files/poppler-0.68.0-bool.patch b/app-text/poppler/files/poppler-0.68.0-bool.patch
new file mode 100644
index 000000000000..a2d8ba7bd402
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.68.0-bool.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/670252
+
+From de34900993bff73c8da651319027b2fa8c490172 Mon Sep 17 00:00:00 2001
+From: Ed Porras <ed@motologic.com>
+Date: Sun, 26 Aug 2018 20:24:23 +0200
+Subject: [PATCH] fix macOS compilation due to boolean define in jpeglib
+
+typedef enum { FALSE = 0, TRUE = 1 } boolean;
+---
+ goo/JpegWriter.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc
+index 16c97afe..26fa77a7 100644
+--- a/goo/JpegWriter.cc
++++ b/goo/JpegWriter.cc
+@@ -11,6 +11,7 @@
+ // Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
+ // Copyright (C) 2017, 2018 Albert Astals Cid <aacid@kde.org>
+ // Copyright (C) 2018 Martin Packman <gzlist@googlemail.com>
++// Copyright (C) 2018 Ed Porras <ed@motologic.com>
+ //
+ //========================================================================
+ 
+@@ -143,7 +144,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
+   }
+ 
+   // Set whether to compute optimal Huffman coding tables
+-  priv->cinfo.optimize_coding = priv->optimize;
++  priv->cinfo.optimize_coding = static_cast<boolean>(priv->optimize);
+ 
+   // Get ready for data
+   jpeg_start_compress(&priv->cinfo, TRUE);
+-- 
+2.20.1
+
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
deleted file mode 100644
index 568a800956bf..000000000000
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/73"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-COMMON_DEPEND="
-	>=media-libs/fontconfig-2.6.0
-	>=media-libs/freetype-2.3.9
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		>=x11-libs/cairo-1.10.0
-		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	cjk? ( >=app-text/poppler-data-0.4.7 )
-"
-
-DOCS=(AUTHORS NEWS README README-XPDF)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-	"${FILESDIR}/${P}-glibc.patch" # bug 643858
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-
-	# we need to up the C++ version, bug #622526, #643278
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_XPDF_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FIXEDPOINT=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_GObjectIntrospection=$(usex introspection)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.68.0.ebuild b/app-text/poppler/poppler-0.68.0.ebuild
index 2c3f948431bb..e2839fc0c540 100644
--- a/app-text/poppler/poppler-0.68.0.ebuild
+++ b/app-text/poppler/poppler-0.68.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/79"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
@@ -61,6 +61,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${PN}-0.68.0-bool.patch"
 )
 
 src_prepare() {
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 30cd8d698bc4..55dde53c5b42 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,6 +1,4 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
-DIST xmlto-0.0.26.tar.bz2 119819 BLAKE2B 9674389d7fac9e60ccab6530acc95338789401f6ddbd3bdea7cb98a350a50bbd8e539565fdcbad42778a1bbac22590bc923b3cae9108ec510dbc62e5d32e38c6 SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.26-r1.ebuild 1348 BLAKE2B fa3ef6d8ee89e8f7965ad6a4fd4a95a89962be6b301b8d799c2aaf417f235a316044a204fb0077584b3771a1bad11d476537d031ac6f7b3850fdf8cde4bf2b0a SHA512 36750c08fd77ccd4bcf23782c3a0f881b3f256f0f293f2a266b3de908aed2fdff0c119185ab0cb8e5a3c25659ea2236bf2b03148c5bd1f23eb4f963dbe891335
 EBUILD xmlto-0.0.28-r1.ebuild 1530 BLAKE2B c0435791043c1c0c5f3ab90b90b6e5e1190d53e108c41c13c7952498cd76af41e36af22aeacf8b6b254ffa472afa477a43934dfdf2eb40b494011d8fb89cf238 SHA512 8c922e63f42b23db4afb8779fffaf40f2af039a045d7e9b066311298507a3d4e112ff2ffdfba84a964967bf42bef03bf45877080e705f71d91b0fa96ba5dfd9d
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.26-r1.ebuild b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
deleted file mode 100644
index 5f0b782929a1..000000000000
--- a/app-text/xmlto/xmlto-0.0.26-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://pagure.io/xmlto"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="latex text"
-
-RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
-	app-text/docbook-xml-dtd:4.2
-	app-shells/bash:0
-	dev-libs/libxslt
-	sys-apps/sed
-	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
-	|| ( sys-apps/util-linux app-misc/getopt )
-	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
-	text? ( || ( virtual/w3m www-client/lynx www-client/links ) )
-	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
-# We only depend on flex when we patch the imput lexer.
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
-}
-
-src_configure() {
-	# We don't want the script to detect /bin/sh if it is bash.
-	export ac_cv_path_BASH=/bin/bash
-	has_version sys-apps/util-linux || export GETOPT=getopt-long
-	econf
-}