gentoo resync : 28.09.2019

33 files changed, 178 insertions, 145 deletions

diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 8344c8fc9183..04038d994c4e 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,3 @@
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
-EBUILD cmark-0.29.0.ebuild 719 BLAKE2B 6c41a355786ea0005e26b93f44dc444dfb208e604521d4654ba80081f219eab270c0547c89c080f073faf8215b4afc68787d3e56bdefe9f13530d395b1e52963 SHA512 067870156191883e19de1cec46f0adb19010cd06fa64531495b517e17aca5f9a5d9f528b1aae33344d82c7326b63c94daf745d0edb4a699b96113cfc594c8518
+EBUILD cmark-0.29.0.ebuild 718 BLAKE2B 06384835aa4b35c5fb363d313433709ff48f8dcd79ce4b61c9513f9e569d4025f53b677bb932ba00e12843fbcf39506de0825fbebd8cd7ea8feeb2a7cb963999 SHA512 774047d8090655c41ba2e76b474fb8baa4fc9723370d58e33fab80802dbf049e49769cc5856d7b2d01bcaff88c3604022cf6431a40e2c1b31708e8eefb17de0c
 MISC metadata.xml 577 BLAKE2B f99edfb972715ce4b1660a5e68c0261c9b8d8f2914f5bd804227bbddeae1528205bbed55c20d6d366ecfdd6a01a69bb31decd57ed40f0440de4946e86339e659 SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
index 19581fce18ac..b9dfe5085714 100644
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ b/app-text/cmark/cmark-0.29.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0/0.29.0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
index 386276c19145..71fb9e71a5e9 100644
--- a/app-text/cpdf/Manifest
+++ b/app-text/cpdf/Manifest
@@ -1,5 +1,3 @@
-DIST cpdf-2.1.1.tar.gz 349536 BLAKE2B 4064605890745ebaa24d32c3294a3293312dc8df6ab3989e1a7417989cdb19aca6b70faafb258c7c00d6febeba8b17379396c1f90628e72be0791cdefc579b6f SHA512 aa06efaf098d3fe3f560ea30da9c3546e13d294b22d61c4cc3df553eb90e338d59ee1b51d14d7982ce52967bcf98c2afec9a5b5ae101e2183961f4be862c6517
 DIST cpdf-2.2.1.tar.gz 704730 BLAKE2B 1767d2c9fdc645b4ff97b828b1d7bedb22aa645444f299e36ec4717015ea7b87dbbac4c9ec27bb508a7adb28b2c75c155bf9094a168567abbffa93887712241d SHA512 3dda72513c551cca5d8cb60732b3f2c2e8ad400bd2c9fcf0c3b54a68e94385e3f19ec7713de95efa90eafb7b0077662097565a28616041019e03edf140b6af4f
-EBUILD cpdf-2.1.1-r1.ebuild 815 BLAKE2B e3db88ff54d34fe7b74bb9bda9496dbc20a992bb4b50a0ff537ab7cb871cdb08bf55d57967f4ae2810ad5dd34dd5df5c9ec52665532d2b374c082bd9c1c74e61 SHA512 e51916639a09447f6cefa7d2400c0ea1349f52926acd16b6d4ef250c5a4d865af04501763e0f0d40d78735e426b601c8d88cf171d2cff374898b6b98a3c8fff8
-EBUILD cpdf-2.2.1.ebuild 815 BLAKE2B 6fc75aea7da5d46a3dacb449fc65ff8804e033f187cb4d94e5d540153fef675ed957739bfbf8a1af8b9d0689cb602c247786ded6ec17c23168f55beb5d09ff0b SHA512 e019a563726c0b72bb28547302b2e87b4481514705ccbefafb8d4b91021868cbdf2a97c3f653592d4d3546fff2a48a56196fdf14930513b5c86df0da6436161c
+EBUILD cpdf-2.2.1.ebuild 816 BLAKE2B f6066dbbf981ba0e665e824432220024bf0c61dc2a86c4282adfebe37e8e21f8c1243a5e4bc523b3124ed40e76bb63e530402545489756af1289b4833df0da43 SHA512 6f9deef5e952035000287006c0a435ba5338bbd1d7569646738bf903683af208888a154367e2639a0abb2221d6d12dbc35376b71672442a25f2ae2283c783b34
 MISC metadata.xml 347 BLAKE2B 2f11a4f77be2b5501b6789daa1724cb1933313963450fa1df91072c095cab406f3907bb2656715022ffff4be94e6b8f4e70d5beae1feeb3b3fd5a2fa1c8413a1 SHA512 e97b4580d3d0e3c06a6e24aac842e66a354e2a9ea9eb70486383143999a2c8a188bdc5ac2d5672ae1ed83950f94d8fcce3d8c3a4d701009bd4102b88bd4b715d
diff --git a/app-text/cpdf/cpdf-2.1.1-r1.ebuild b/app-text/cpdf/cpdf-2.1.1-r1.ebuild
deleted file mode 100644
index 74a530638f33..000000000000
--- a/app-text/cpdf/cpdf-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A command line tool for manipulating PDF files"
-HOMEPAGE="http://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
-SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# BSD is only for xmlm.ml
-LICENSE="Coherent-Graphics BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lang/ocaml-4:=
-	dev-ml/camlpdf:="
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror bindist"
-
-S=${WORKDIR}/${PN}-source-${PV}
-
-src_compile() {
-	# parallel make issues
-	emake -j1
-}
-
-src_install() {
-	findlib_src_install
-
-	dobin cpdf
-	dodoc Changes README.md
-
-	if use doc ; then
-		dodoc cpdfmanual.pdf
-		dohtml doc/cpdf/html/*
-	fi
-}
diff --git a/app-text/cpdf/cpdf-2.2.1.ebuild b/app-text/cpdf/cpdf-2.2.1.ebuild
index f65bcfcc2166..fdbc8ccd6cdc 100644
--- a/app-text/cpdf/cpdf-2.2.1.ebuild
+++ b/app-text/cpdf/cpdf-2.2.1.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit findlib
 
 DESCRIPTION="A command line tool for manipulating PDF files"
-HOMEPAGE="http://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
+HOMEPAGE="https://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
 SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 # BSD is only for xmlm.ml
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 891e3e57a5fa..bc6c5d0b30d7 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,5 +1,7 @@
 DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
 DIST dos2unix-7.4.0.tar.gz 710339 BLAKE2B 629c4a410f0cbb0b5b0fdb89c03fbec1965759a747309ad8a4459820bf2151d1861f4040d67ce6934ca27cfc3b6d0495eccd0966045803f065b10520808d9686 SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9
+DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955fffd7ae1435725014d52ba716626e7891911afe11674beec11fa62a12983c8dfc28cff682ca0c3e798449a9b0f SHA512 81e7cff82d95b298fb218b073f54d17fa851a7507fbd54b3cd9af7c1efa6a7bd3cf59f7a84ffbaf395403bf458650763e1755944451b24f708878a9c62316dc4
 EBUILD dos2unix-7.3.5.ebuild 2037 BLAKE2B edfc091f5ae520b92c58aa58b5273a1748c07741a64ad37fa9b06458c257b2e394fd43c56ae46c562f40a8331c9360e486f7d1e27957bff1f6e0c783b4f5a0f8 SHA512 be9ba30896b2e246b978ec3184c593c85e06e3b223fcdce599874645477f35c4161a6a1261379dbed08db2556eb9c472f6a89959a636887cfdd51ff924377dbe
 EBUILD dos2unix-7.4.0.ebuild 2046 BLAKE2B b76c15a3753bcfe22324fd3caafd4e4a1286d6d96bc379a3e23854dcc9bb7bb1344e7661cbdcc846caa1e740bee2a428f88408dea8ea6298735d15e2d8ffbfc5 SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350
+EBUILD dos2unix-7.4.1.ebuild 2055 BLAKE2B fa9aabf70d771a0e39709efd6c20b394dd3699b2a601a8c4a3ee16c7e950490edee1909ad00c350053b3ec7dc095dbe27fa7d27a2254215350d3061578d0139f SHA512 6a0cddfcf4da36a0194a99dc9e87c3bd654e1a5838bf7e936d720535301735764a1d08381b367ebe687c0292839d590898fa481d3d8ead4e135b266ca6759d3a
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.4.1.ebuild b/app-text/dos2unix/dos2unix-7.4.1.ebuild
new file mode 100644
index 000000000000..09270293006f
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.4.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls test"
+
+RDEPEND="
+	!app-text/hd2u
+	virtual/libintl"
+
+DEPEND="
+	${RDEPEND}
+	test? ( virtual/perl-Test-Simple )
+"
+BDEPEND="
+	dev-lang/perl
+	nls? ( sys-devel/gettext )
+"
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror "po*/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	rm_loc() { rm po*/$1.po || die; }
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_prepare() {
+	default
+
+	handle_locales
+
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 8e351d74ed9e..2a91329cba9d 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -13,5 +13,5 @@ DIST texlive-module-dvips.doc-2019.tar.xz 514068 BLAKE2B 91e4717b49f7c3b3cc0b350
 EBUILD dvipsk-5.995_p20150521.ebuild 1944 BLAKE2B f3f3c1655be30372750d06afb40367d22169ee2cada945995fa4f92dad409abab12d7a54b5d03814d79599680c897d061686db76451fa04e304267f226ea0ce0 SHA512 a4d3295a5d8fc8d11b0023d37e3f1df30c836fbcede3c2b131f550704f959678238720705dad182f325fd181bce032615afe242f1bbafd9d68cfa1a29984d680
 EBUILD dvipsk-5.996_p20160523.ebuild 1956 BLAKE2B be85abf0a4d4ff7ade60990a777b51e7d2f7b772f10088d1b434e5a5ac10a3bc4eeb46f8d84cf945e78ac6eae4613b3900525e2182c8526af797f26f3b33e8b2 SHA512 b4d84566fb3655cf8a38c28fae357485ed3ae936d569aedd7114200cd65c19e0ba651e2c7a6f0b1410f78c1d2d3132b92b0610953763914446f0d215849f5668
 EBUILD dvipsk-5.997_p20170524.ebuild 1968 BLAKE2B e93d33ad3b952a161a82d73f306e8f8892f0cc7b999424ac22bc7387b412af9556af361d9a44c3237326b951368ba2c8900b7d00be21c32fc75bd7291fc50d23 SHA512 95f56cc680033b0581e5bf0b13157d173f06712b517e33e9d0ee0ab83225d80a4aeca40d277ec53301694514a984b08a798350402d682a58d95eb2168494c359
-EBUILD dvipsk-5.999_p20190410.ebuild 1530 BLAKE2B 4eb70ef4ee346dac810e505d1e915539381a7dfd9dd47c0136ba9abe45477cb943e80040ce31d7161922ede4b1094621a9509a8ba8cbdf3dca5bf8a3eefc8d52 SHA512 ab638d2e8b270683f9b27ec3a0f1d6e8816d27158b566a9d547aab38b674880e08a28b8bb4d7c2aeb403f2d62b82269f799d78202b652fbf3a2c0f2a9d2672b8
+EBUILD dvipsk-5.999_p20190410.ebuild 1526 BLAKE2B 468df06e96107ca6caefd5eb2d7c3cd1b38446b1e94eb50d94b183564530118a2a6d249266512983bb054c58c9c43b95f5cf688207e5637a74b023dcb6324e6b SHA512 0585aa3c9d434a1282796cbcb20fc34472f418d9b7f3a2b5cee680b6e09cfee01f42a4ec756f880fa8e81c054fa129e396eff6988f6278716dbe7af43375ede4
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
index 0caf307b1c72..0b79c5a4ae0e 100644
--- a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
+++ b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 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 ~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"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 4bdc3fb78b4d..adbebc827c38 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,8 +1,6 @@
-DIST nfoview-1.23.tar.gz 83337 BLAKE2B d73cd6987bf7929c57e8acf0a24278272ea199bf980756ddb5da9a5eddf7760a8c05f0e48a287ee760d4bf4d2594fb08b43a77cef46d371a746629bf76955e91 SHA512 b94724e130cdf58b911634496c52361d008ebfafab3ac40a76612c4891737d4145596a6badc15fe4228c90c1cd7261e5a892e3e462070ebb55f71332b36345d7
-DIST nfoview-1.24.tar.gz 86037 BLAKE2B 5d565680864f1a73a64d9557e69eda0771dc164f12018ac8964fb1c2225005c1bb881c7b9035c7baed2021838e3a291e52fb5af84cf9c271c046cfddd684270c SHA512 91ad1f9f972b7681655b429c0910475012bd2231e51c6db5659b19fb869779d1de10dadc1d6461fa7d577c051af9b74f1d463543a429e1dca438a4ff17ac2293
 DIST nfoview-1.26.tar.gz 117468 BLAKE2B 7fec761774ee66f1f5845d2d49cf99644d522c6fe402bdfd578e12371b58b3ac5a80b77959c92531ff54362c2234d043fa219b50730158c91310ba67b491f729 SHA512 2e697e3a49aa85fe0865ad9f281ea830e692335682658061f2aaaa1c5ed6ccb3dbd822dab244190ae0521ce237fbc3d91480da4c1229548f0fd5a74df712e336
-EBUILD nfoview-1.23.ebuild 817 BLAKE2B 0b3131d2b370724dccc96cb32972780cf3d43b2bb32ceb3f5f2c4e14d2f49560d4dc98f82fb7200963cbf17fc2bb53320b0eb91f1fe690e9aa8c76c350db75ae SHA512 00c6e69051ecada167297b006c0b53302027a67c4f1ca911d854336dcd291b79e6d591c833df8fe09e56ca852dde10b6400f56c8abb9194ae254aa8444f708bc
-EBUILD nfoview-1.24.ebuild 817 BLAKE2B 0b3131d2b370724dccc96cb32972780cf3d43b2bb32ceb3f5f2c4e14d2f49560d4dc98f82fb7200963cbf17fc2bb53320b0eb91f1fe690e9aa8c76c350db75ae SHA512 00c6e69051ecada167297b006c0b53302027a67c4f1ca911d854336dcd291b79e6d591c833df8fe09e56ca852dde10b6400f56c8abb9194ae254aa8444f708bc
+DIST nfoview-1.27.tar.gz 60094 BLAKE2B 3186de6d04b50aa4388f606a49f8c2f13a0fe3494d49a1dbbd2ffc84cc039f03f47223e3aed469c32c3fbb01d277cba7f53290056dbcc7fec8e0eeec7ebcb596 SHA512 157257f9f289bdeac140054320ad43893c73995e11e6ccc91ebd2ca53878f00d45945c4e3ac3c11ec2f589a0349598f96dfecad3b0e3cfbe06e5a036bcedc3b5
 EBUILD nfoview-1.26.ebuild 819 BLAKE2B 98129245e6681ae0455454018d2468d6d424a03b4e150f70dd067ad56c1adbb70d3e60a6a81f5c15e3b79384e3253abe50033131b434c4b445c24e787bc3a8ad SHA512 05b5dcbccb4141c959a32c3f45c4b2bf71aa859acf2f036770b169d577c94d604c05ed2d6b0fd36a4d79debac31cb978746a70712524b21ba24ac6ccb9131802
+EBUILD nfoview-1.27.ebuild 844 BLAKE2B 7a7d97cbe56bec4d771f7a018bb2fbde0433e4d6ccb15c7007d621cb6ec87d983e6ee8e5a2b27ea26d30383ee2e3bd8585dd6c530aa15924e848dec44c1887f9 SHA512 bd17af52f3f28842ee4b4f754bc3f7967f618eada731e1747cdcb77ca49ad2cb92300240ce78b6d887e719fb3091cf626f033264143b0a904cc390b100d9cc84
 EBUILD nfoview-9999.ebuild 819 BLAKE2B 98129245e6681ae0455454018d2468d6d424a03b4e150f70dd067ad56c1adbb70d3e60a6a81f5c15e3b79384e3253abe50033131b434c4b445c24e787bc3a8ad SHA512 05b5dcbccb4141c959a32c3f45c4b2bf71aa859acf2f036770b169d577c94d604c05ed2d6b0fd36a4d79debac31cb978746a70712524b21ba24ac6ccb9131802
 MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.24.ebuild b/app-text/nfoview/nfoview-1.24.ebuild
deleted file mode 100644
index b7aa96c2ddb9..000000000000
--- a/app-text/nfoview/nfoview-1.24.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="https://otsaloma.io/nfoview/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/nfoview/nfoview-1.23.ebuild b/app-text/nfoview/nfoview-1.27.ebuild
index b7aa96c2ddb9..3229ddf95d7a 100644
--- a/app-text/nfoview/nfoview-1.23.ebuild
+++ b/app-text/nfoview/nfoview-1.27.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
-inherit distutils-r1 gnome2-utils xdg-utils
+inherit distutils-r1 xdg-utils
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
@@ -22,16 +22,18 @@ LICENSE="GPL-3+"
 SLOT="0"
 IUSE=""
 
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext"
 DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	media-fonts/terminus-font"
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index 9010226dba0b..6a2f49563ef9 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -5,11 +5,11 @@ DIST pandoc-1.14.0.4.tar.gz 2052114 BLAKE2B 12de5d3ab457718708f3181e78879b511c90
 DIST pandoc-1.15.0.6.tar.gz 2049870 BLAKE2B d1495abd3451ec6e14fa13ca022051813bf736b9c15ff6106987c00bd53672fe027ad87d43d81faa15d50694fa1735a5ec31472738ff2b9a496e78d27c7656c9 SHA512 4c9bfea7440d6bdb72fb10a9a99b69c018db0ef0f1028d86b032e6c4df215c86566b93fd55c5cba7772d713d4ce3f764891de079dfa24de8ca21f818b7729211
 DIST pandoc-1.18.tar.gz 2711663 BLAKE2B 3c324917285eb0bff314ff04add75aa6dfa381d1bb8dcc99078284be8c93cb8f5f9bacd9e557be1f07b2e6a4137b74d10e769b42e08f27bdfa0c6bd71aca4b12 SHA512 52bc68e9586366433e522a867946adf2e03219dfa4ca63cd6ff318ebb251f77ab16aa18f0350605fa31f8e085bb6cac9055f9661a0ef3cb5693faba9e124d049
 DIST pandoc-1.19.2.1.tar.gz 2755101 BLAKE2B 1314ebe4084dd39521fed89c1d14b8365f2bfb40c6f8ff581ab6b2566bf5e5ef43c4014e383c2e17ac10bc66cbb159ae60a718d399873084b68c7fcd5fb90f2b SHA512 bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9
-EBUILD pandoc-1.12.4.2-r1.ebuild 4149 BLAKE2B 2bcc691e16ba0d762b3d55e4c8e78efa6abdd18d067cede51ff559953dc71ce0a74180ae1089ef94ed96448458b283c2af5432830a94c33cb170d25bc51b705b SHA512 2eae02132cfa1c375614427c5396478579eb028bf4aca572c1dac71762a71f8c9ecf716c3282747b041c5132344732cf94b018a0450ee4398f2e502dcbc9899d
-EBUILD pandoc-1.13.2.1.ebuild 5041 BLAKE2B de2eb89a53e038f4a8fb2c888e95de399c116894091a48afed8d0e8555400e9f26cdd995e6ef198c45770f20c2dc0ccf3ce908986e840600e6b24db0ad3d99bd SHA512 b7c0f5e5a9a90e02ff91424829d49a7917de7ac561fa9b848c88fa8e9e064049c284f22d34e1380b3ce059730aa77a09a94f68481f40978d427922a5a4c4ad60
-EBUILD pandoc-1.14.0.4.ebuild 5340 BLAKE2B 0ae7446510153b74ddb2ea366edde8b13fc1b0c2f1231d5fa36f7914a03db6ac41d0e42f5c712bacbd0c0f24f5483eab70b468492236427a4acd2f27540dd538 SHA512 23a41dc824605ee67f99d0ce1b3aec123e9389baed04e56c16f534d1ed469c673a7d764d157e12b037a1d29a8ead4ebeb84defc7ac6a1368618c0a42cb4a44f0
-EBUILD pandoc-1.15.0.6.ebuild 4925 BLAKE2B ffd8c3846c7487b1ef3a42145b5ca6f543ea18a3aa95e23504cf891c2bd26a428b57aea4e1191c768ee4afea32dfcd11ec4fdebb3f55d3173bf29b344c247d6c SHA512 8f54615ba43f4ad98d8bf4f683a43a0be1a04f4eb1fb85958585752291e7713879475c0e325fcd6f89df18c0a2fa3a8b06cee7a19f78f75bd2b43686cecb61ce
-EBUILD pandoc-1.18.ebuild 4837 BLAKE2B e37424db0529ae3939b7c2e0e38a238e80410b7c0858bfdffd9d4b48865e53d60f02aee1194fc1ba1718662b27c6eaa387ff39fe966b7b8c4b88a353df03d32b SHA512 569cc13dbe08ba3863f911e1c9c31644e518f73a695c5f0aa84f23c73ee6b5c3f4cc0cebc3167e942c074c67318efff5a6be11ec3d6ba93c54f4c3d5dca7d056
-EBUILD pandoc-1.19.2.1-r1.ebuild 4913 BLAKE2B dd906885a6fd2dd907f1eeac91d58033616a1960cb6866f178b6fbf7569a99222fdbf6123429e430ec79c1f4b1f952c15c76d83148bb3edb7bc527eb8f86a288 SHA512 77b9a05d6ebe40673a5792074e022d8b97fd47531bf434c461b45c69d92f7b3267147205c6da1004e89a1bea03b93848fdeb604f175fd0072bc2fd6784aa2df0
-EBUILD pandoc-1.19.2.1.ebuild 4787 BLAKE2B c9b552131459c444255d3b1151ec702f8b39f0ed29c9dc8e7c96618524bb50b76b28176187f54719150b57f531f97292f707e99bf4dff994ec2cd6deb254fe29 SHA512 bb8b15ff611e70b0ef51972e73147cd768e154e44e6cfb7f09bbfdd8c5583dcb113c00d31c1df8d2b7aa5c4cc29e6f44db5af75dec2dc8d3415ab7b1e1b792a7
-MISC metadata.xml 1284 BLAKE2B 2870b0a838dde25aa218b69ca351aa95eadcc13ddba2953be9442bdeee56b9bba39e561bfdea019b1d1a2db8bca7ff99f5da37ba5b8836df5beb5c05ba3ceb44 SHA512 eb48931a43b32e6fdbd1d0abfbebd7b40ceae184705e95442cfe9e84ada734a98e72fc1c93dca165edeb4304e9f7e25271e667a85d0370066b2bc7fd0b4e4841
+EBUILD pandoc-1.12.4.2-r1.ebuild 4146 BLAKE2B 2ae6371d630788e7636c063737f266aacaa7f93605c8aa13fd33be60a31f808d256a12b9279e0b6b32461daeb71d1a2c431971908f6070e3f11f5e2de2ff10a9 SHA512 8592fa0a3de137d224d65c5980b1c8cf0a9b18b7696d0c7b9f312aa26b12b45eaae10f5909a8c7d8d6f1b3f1654280d2d628b69769b82aa72143b2562f190e93
+EBUILD pandoc-1.13.2.1.ebuild 5038 BLAKE2B aa3e3901b637f1ceeeed7253f6218faf344094d3d07b2a6faffcd8f20283f9a112de396a308e8e1cfa0f1fa85334997c92b9fcaaa49afdf00bb88012d41d6bc5 SHA512 944994dbf480aeec38c195616b0eae1ebb757773db336fb27b365c82f82a6ed4c3ee94c87dc8a37b219a87e3bc1a3df77f9daf5f692d02021e34ee4fefa0f298
+EBUILD pandoc-1.14.0.4.ebuild 5337 BLAKE2B 3053b22d1241f3277134a445fd8d25665b7555351b0de4c0d26ba3eb1d0f12b8b7f9110f4348cccf18a755bec4b4807f44c653940e05af91f65ed5a46598482b SHA512 63846f1f17520594f781ecf568268031a1b6bc4210d0e280f548a71a195b9ffb248de6cd01a9cf0f6b95616fc60fa0ac7b1ada72898d89cd1de59fb7b5b4e2f9
+EBUILD pandoc-1.15.0.6.ebuild 4922 BLAKE2B 8d0037bb012aa65a7d2d77c8448a19d23a4d0452054113661c3264a84c3ab59d84f472c7e1a2939ac15441cf9fa94dcd53e13c3d317721a48cb473e5a5329704 SHA512 204aca8869d4d6103efc59af2f7fdca721d37a09b20bdd7d5d91f2866603eee83c76e3312043d937b1d56ac744baf33d6ef31c70e062271201d8037a6aa67785
+EBUILD pandoc-1.18.ebuild 4834 BLAKE2B f7c3a19feb516a2113fb84365b3cb344211adfd6b6beb54b359d713286ed8a7355799fc80d1a6e8495fe6cfb70e7220dc8e26f0621db37c0c1e4700619836cca SHA512 5fbd2f47829ddf533a055c9b6253ad18e1c28dbd2a62e638b6040347bb27d3472995eb686827bf7047d5fac4624b81c4cd453960e421bcaaf1baec1a6297d139
+EBUILD pandoc-1.19.2.1-r1.ebuild 4910 BLAKE2B 17ade29a952bc9768d22b29d1e5d79add7fd555c7b35931d1dd9d78028650ad6b3a45d2916c6bb92fb6d31b117d548a04614d1f3ab0c1e827b7720afc88e7dee SHA512 821502b5781542b0cac42eaf9cbf19a3ffe4bd1cb0853ee604e4dbfa48f2d5f7c1503fd3421c0659bd04b5ffb4a187d61b81200b2baeaf609bbad104928a0157
+EBUILD pandoc-1.19.2.1.ebuild 4784 BLAKE2B 0fa19ef414ddd733fb8cd21b825a6f4a7624bcb4a20accb639a91b3a696601405207f0dc91f738bc39d5702df7bafac8893f494f49bf6adb39475d1dce8e3ee7 SHA512 ea3a7aae0354a3f2677b7c0a2338ae919f0a529a6c4dfc786b37bdd74676b791bc1a5c349441900e5315fa45f74e20ec4c95d55a78b011fdd917487390f63093
+MISC metadata.xml 1284 BLAKE2B 0ac01c07148aa682d4e6bd074b246d2578a816c76d6110ba3a9506e051b5ef2254f98e3faa8399c5f51200af26155dbabb6d08987bba32dd27f863f7c8183c15 SHA512 ba9a2c3897e5b645c0faa2a1a2f918cf5c30e3cace81343b01de73b25c26c343d95d7a09c50d56bf2aaa18a0a39318a506131e6bcdd7a48ab32197f3ef68be2a
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index f0713d9bef06..837984f412b5 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/metadata.xml
@@ -15,7 +15,7 @@
 		slide shows.
 	</longdescription>
 	<use>
-		<flag name="embed_data_files">Embed data files in binary for relocatable executable.</flag>
+		<flag name="embed-data-files">Embed data files in binary for relocatable executable.</flag>
 		<flag name="http-conduit">Enable downloading of resources over https.</flag>
 		<flag name="trypandoc">Build trypandoc cgi executable.</flag>
 		<flag name="https">Enable support for downloading of resources over https.</flag>
diff --git a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
index 65d34c37daf1..d50069737440 100644
--- a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +http-conduit"
+IUSE="embed-data-files +http-conduit"
 
 RESTRICT=test # missing files
 
@@ -48,7 +48,7 @@ RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
 	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	embed_data_files? ( dev-haskell/hsb2hs )
+	embed-data-files? ( dev-haskell/hsb2hs )
 	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
 "
@@ -77,6 +77,6 @@ src_prepare() {
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag embed-data-files embed_data_files) \
 		$(cabal_flag http-conduit http-conduit)
 }
diff --git a/app-text/pandoc/pandoc-1.13.2.1.ebuild b/app-text/pandoc/pandoc-1.13.2.1.ebuild
index bf83cd46d3c9..c17b9e9e758f 100644
--- a/app-text/pandoc/pandoc-1.13.2.1.ebuild
+++ b/app-text/pandoc/pandoc-1.13.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +https make-pandoc-man-pages +network-uri trypandoc"
+IUSE="embed-data-files +https make-pandoc-man-pages +network-uri trypandoc"
 
 RESTRICT=test # likes to break on highlighting-kate update
 
@@ -52,7 +52,7 @@ RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?]
 	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
 	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	embed_data_files? ( dev-haskell/hsb2hs )
+	embed-data-files? ( dev-haskell/hsb2hs )
 	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
 			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
 			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
@@ -85,7 +85,7 @@ src_prepare() {
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag embed-data-files embed_data_files) \
 		$(cabal_flag https https) \
 		$(cabal_flag make-pandoc-man-pages make-pandoc-man-pages) \
 		$(cabal_flag network-uri network-uri) \
diff --git a/app-text/pandoc/pandoc-1.14.0.4.ebuild b/app-text/pandoc/pandoc-1.14.0.4.ebuild
index 360b86c14045..0d2811c4fc57 100644
--- a/app-text/pandoc/pandoc-1.14.0.4.ebuild
+++ b/app-text/pandoc/pandoc-1.14.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +https make-pandoc-man-pages +network-uri trypandoc"
+IUSE="embed-data-files +https make-pandoc-man-pages +network-uri trypandoc"
 
 RESTRICT=test # likes to break on highlighting-kate update
 
@@ -90,7 +90,7 @@ src_prepare() {
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag embed-data-files embed_data_files) \
 		$(cabal_flag https https) \
 		$(cabal_flag network-uri network-uri) \
 		$(cabal_flag trypandoc trypandoc)
diff --git a/app-text/pandoc/pandoc-1.15.0.6.ebuild b/app-text/pandoc/pandoc-1.15.0.6.ebuild
index 7a70c85e7bf8..22d82ef329b7 100644
--- a/app-text/pandoc/pandoc-1.15.0.6.ebuild
+++ b/app-text/pandoc/pandoc-1.15.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
-IUSE="embed_data_files +https +network-uri trypandoc"
+IUSE="embed-data-files +https +network-uri trypandoc"
 
 RESTRICT=test # likes to break on highlighting-kate update
 
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-	embed_data_files? ( dev-haskell/hsb2hs )
+	embed-data-files? ( dev-haskell/hsb2hs )
 "
 
 src_prepare() {
@@ -83,7 +83,7 @@ src_prepare() {
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag embed-data-files embed_data_files) \
 		$(cabal_flag https https) \
 		$(cabal_flag network-uri network-uri) \
 		$(cabal_flag trypandoc trypandoc)
diff --git a/app-text/pandoc/pandoc-1.18.ebuild b/app-text/pandoc/pandoc-1.18.ebuild
index 6cb3e32e2e75..a15af2da8192 100644
--- a/app-text/pandoc/pandoc-1.18.ebuild
+++ b/app-text/pandoc/pandoc-1.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +https +network-uri trypandoc"
+IUSE="embed-data-files +https +network-uri trypandoc"
 
 RESTRICT=test # fails to load dynamic libraries
 
@@ -73,7 +73,7 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-	embed_data_files? ( dev-haskell/hsb2hs )
+	embed-data-files? ( dev-haskell/hsb2hs )
 "
 
 src_prepare() {
@@ -86,7 +86,7 @@ src_prepare() {
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag embed-data-files embed_data_files) \
 		$(cabal_flag https https) \
 		$(cabal_flag network-uri network-uri) \
 		$(cabal_flag trypandoc trypandoc)
diff --git a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
index ba14b58cdc40..aebce7cd3047 100644
--- a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
+++ b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="amd64 x86"
-IUSE="embed_data_files +https +network-uri trypandoc weigh-pandoc"
+IUSE="embed-data-files +https +network-uri trypandoc weigh-pandoc"
 
 RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
 	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
@@ -72,7 +72,7 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-	embed_data_files? ( dev-haskell/hsb2hs )
+	embed-data-files? ( dev-haskell/hsb2hs )
 "
 
 src_prepare() {
@@ -85,7 +85,7 @@ src_prepare() {
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag embed-data-files embed_data_files) \
 		$(cabal_flag https https) \
 		$(cabal_flag network-uri network-uri) \
 		$(cabal_flag trypandoc trypandoc) \
diff --git a/app-text/pandoc/pandoc-1.19.2.1.ebuild b/app-text/pandoc/pandoc-1.19.2.1.ebuild
index 8aa7bd5a81f5..2f751283f9ca 100644
--- a/app-text/pandoc/pandoc-1.19.2.1.ebuild
+++ b/app-text/pandoc/pandoc-1.19.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="embed_data_files +https +network-uri trypandoc weigh-pandoc"
+IUSE="embed-data-files +https +network-uri trypandoc weigh-pandoc"
 
 RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
 	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
@@ -72,12 +72,12 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
 		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
-	embed_data_files? ( dev-haskell/hsb2hs )
+	embed-data-files? ( dev-haskell/hsb2hs )
 "
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag embed-data-files embed_data_files) \
 		$(cabal_flag https https) \
 		$(cabal_flag network-uri network-uri) \
 		$(cabal_flag trypandoc trypandoc) \
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index f1534ec18780..eb7fc1b6ad89 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -1,9 +1,9 @@
 AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
 AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32a2a243995d9f26b0099e2194848a9a4d3b01dc24d4657cdc4470977838a96a1979495871dac5b8b SHA512 0d797b92c551eb75fa144e9b39d1aacc8acb00104a6d9e0dbdf4d00219b4c0c074637c953764e8cf1d67bdb1f3941fa0727da242b7761a96a8dafe66af224397
-DIST po4a-0.54.tar.gz 2686485 BLAKE2B f33f1e27bd24e4429ef8edbdd999333714e9a50e4af2c60ccffec91098bf330776c4ee9de9b6d4cdb459b67a26a1a6e4b8a0ead7efa82fe97584405a15245ef4 SHA512 5d97a169c73bcb872247599af477ecca9112b9ff576dfb93a2aa06b9891464a1837d799304f1a3ea8344ad46a4529ec19568584b7914761deccc09a9099e3130
 DIST po4a-0.55.tar.gz 2892158 BLAKE2B 606236a4bc143d4a5cc003f7dfaf59f605017478fc7ab3fc66af5eed078a8bb0744690b7191cd2ee0b795229e766145ed47545484e3d20e6a14ae1ac0981772a SHA512 95f7408caf2c603f2ea86d8439e99c39be72dca019361106190bd6e1f95679c6627280bcd02a2d9c843071a6ce96747bf5b4d85c9051344b08f32deade2cb599
+DIST po4a-0.56.tar.gz 2994792 BLAKE2B c95905c70d7e1e24367fb128d9096996d026f58dd4cd7fa77f19c6c9b8607cb4101a1a024773d2fd383e905a008e1ce4f0c019a73003168a90cb23328ac1d984 SHA512 4fc1ca5743471577d9e8bd0b80285b9dbd83b964f8e828472787a6deaf8b8388bb7f96e68afab4119c1f5488fe371d3b1fa94b101204a59228d1cc2f0878f3c1
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
 EBUILD po4a-0.47-r1.ebuild 1629 BLAKE2B cfb962e72436e3155e60a3cb7a09ae59294a4ec6eea276dffabceaf9dbfc2557968ca64063e8e504d114d5427f130ba5526487d8a4bf01ae99d0518f1bb06f7f SHA512 2e8398f42828c49bdef9c1623f14df13d5ba3c9e79508ebe9b147f544a60a8358f445347a6b3d9e2b0cb2bc078c850c5bfda099d98a594ffa2ff673441bdbded
-EBUILD po4a-0.54.ebuild 1285 BLAKE2B 1f77f52416a8dde753d8dea4a6f96a3a389b3249b93611e371f180a0acb4e2ce55ffd734ad7ae2a573c5f7ab97a07dda73b5c2569cd1a9988a94fa6ea1a083ab SHA512 72ebd096ff66d66a43aa24ce17afcffb90b05fff736e5bfef12fb78c1c66817dbc3b995490bf169c033f9cf10bcbefe6e0397d3836478f454b65ee5bbaea01eb
 EBUILD po4a-0.55.ebuild 1294 BLAKE2B 77027379281e38cbc94340713ee6fb1aa3365a6a2ce739467bd5fc162455fc6fe1577cae21cc243e6c9916b7f792b5e1690b8ee186a0d8963892c7a4e1081132 SHA512 1e01a1bba154b3b3d86b5ef162ca30adaabe9f468212966c855a986e3fb2ed5f6f9096a4a03ecf0ec02e6291e1e21e2966db0f204ae4ee60ffb8618f8a2a30c0
+EBUILD po4a-0.56.ebuild 1297 BLAKE2B 0941ccf72e14e272c4116b29c87802d3f3d9dec28e5bebedb9600167eefdb9990a48d5875db6a6f9cc53c052e066ca61e42a739f5f2334ac7324e853e5e244b0 SHA512 838e34f23aca519a260b5328f2e54c84f64249311c193c307939ac903fa936ab4d670f7f33b0735d19ae90307d8985489df8c05d6f80d99324133ee9f0d5f58d
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.54.ebuild b/app-text/po4a/po4a-0.56.ebuild
index b457c515610b..c4c7d79c9443 100644
--- a/app-text/po4a/po4a-0.54.ebuild
+++ b/app-text/po4a/po4a-0.56.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
+PLOCALES="af ar ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt pt_BR ru sl sv uk vi zh_CN zh_HK"
 
 inherit perl-module l10n
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND="app-text/opensp
@@ -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/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 9ad482a7eac2..196f47a1c958 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -5,5 +5,5 @@ DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7ed
 EBUILD ps2pkm-1.7_p20150521.ebuild 836 BLAKE2B 10e2fa2b739ab555770328f5e5cc25d9bd092b2a8efc7a519256eda0e056fe84d76a4a9d5f642e04e230639c0161b5f5814b524ecdc990f01fd3863ac6dfbbac SHA512 5007f586c9941ae159cbfdc49ebbd0da23f11b81731f5954ff79dcdff700764d15c555173c17b9d4bcfe82727eada7a0d07c98e19a62ce3e2933707c8557cb24
 EBUILD ps2pkm-1.8_p20160523.ebuild 848 BLAKE2B 7b28623873b847d71ff2f5f2f5bca7d68ab82b5cfd62e39c2f040cfd38b7895f3c6729b0544f6872d882539598aaffb233306bbcefe6dccd78897200d36b89f5 SHA512 829b0fa2979bc26a1198bc265b8e5977ccbf6edc2b9834f60ef504318d54c288bc54621f646e5f01313d12fbeee9d4223e9d8d7aae75635e24e3069f422a7659
 EBUILD ps2pkm-1.8_p20170524.ebuild 846 BLAKE2B b4d755ceb012e39002be8da61a38d0479f4d5a6b3dc11467d766e894b274648cdd0ebb5e79d96aad97b167f0d2d23fda3d148712e6aae1d0cc2cfec77dc69c58 SHA512 d8d68f8b71aa47b384709a58f686c24c8b22767d9e596fb29f06fc759774558c2807ff55a52f609c915e8acd3f351ca6a9d73444874d6eda7dfdd30af3b991f2
-EBUILD ps2pkm-1.8_p20190410.ebuild 797 BLAKE2B 3db9744d097d42bb3872ee29a4b7376b57d43952badfeb235d84d701ea996e4ff28bc17a28f9b3302d6cc8d35edecdbef86963f9c3b6158d8363fa4e0a157052 SHA512 06445820e57442cbb50d1c498c17cee7831352e1c35f90ec94c50c4c71fa6fd2535524b36843f43537b256a0db6c41555aea615b4f815b3dd220c660e1c5baf5
+EBUILD ps2pkm-1.8_p20190410.ebuild 793 BLAKE2B 340696bc3b5002cbb9f7809ea094f461efaec2d96c627c3ea88962cc2b8f8625fbeaacd49605d2ef3821752544b995f54abc5c5c03b311290efe209a88dc46c8 SHA512 f7a97ce406d09f60fdbcb1b2c4ff2eabefea510b7d18049a7aeae155d95ed983586118f9710bac67941aa9e0168e159b8a91ba24372457d5418c82b0cfe41c9f
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
index 60873d1ab8fe..0cdded57cfae 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 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 ~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 ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 9f81695851a4..4791bb586da9 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -318,5 +318,5 @@ DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618
 DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
 DIST texlive-tlpdb-2019.tar.xz 2079308 BLAKE2B 5673fa842b129208a7ec027a0b0a097e7b29eb8baa019371e20444dc4386859144e0c88125e0f085a57812fabf41af1a146a8d66f6eb9e4aefe49518c95590f9 SHA512 024c8cbc65b3bf4d3cba7f527bcf5585c5304c88508d03ff8cb14ffd3a10a666dd58af6db2fa58fad2b1d30ec9a1f03f31fc2486526ecee338dcf46aea8906e0
 EBUILD texlive-core-2017-r4.ebuild 12142 BLAKE2B e985aa11a092e0ec2182790bdff1b97fd40d4d899bcdbd1d6afe630db8708552732d1b6ff797c1e4e82787ac1a009ffcbc44007071dc17960291218c26b5c218 SHA512 d2ece7dc59460ea810897b8fab11bda393a5ad4b249efd62e0d52687ecc2172d2f459e1ba2ad6c55ddd5ead8e6921935924fd6bf93f4aee6d465271354bd7bfd
-EBUILD texlive-core-2019-r4.ebuild 11277 BLAKE2B 34520809caf282d5becc896c58b8c618b146f9f06ba138ceb1e82706d945489b722255fd15965467d3ee9b3540ae061729ccfcbc57a6c8173009b7a7beb4bd8e SHA512 939e95297c1ca1fd4619ea48a03b99db5354786960eded205b0696bf8a02526125c62fb7128af97892f5827212d20747a9946585313e1994937a9f7a8e28bda6
+EBUILD texlive-core-2019-r4.ebuild 11273 BLAKE2B 748ea4308ba4325d589168a98f05d48a02f5356e34fe5234a19d1c30ad0c329638b1c86c13da216ab45af23ba4724b3c913917b8033431d400e73aa8c8ca51a6 SHA512 98186f70348f596d840ea9418eaee234b4676432760678b5fdb55b8b30fad0fab9e3ca6ed325dc2e787ada868fa1125ce756bc69db3556deaf8124e7c48fcce9
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2019-r4.ebuild b/app-text/texlive-core/texlive-core-2019-r4.ebuild
index 6005340d469e..9534cf675048 100644
--- a/app-text/texlive-core/texlive-core-2019-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r4.ebuild
@@ -72,7 +72,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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 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"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index c698da813a68..7bee6bb89612 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,3 +1,3 @@
 EBUILD texlive-2017.ebuild 7276 BLAKE2B 4bb6c9de41736664687aa1ba4318aef71d43e3823c64807755743ac1f30c8a0441b330bd98bcb265c118676953b406e2a138a376a1a14e17397aa6db838d8e66 SHA512 08a2ffabfb4b5732391a20afaab0615ac5c3a3ff5caba16c90430fff6eb144f00280969753b405a57167606cd40501287130cee059495287e8b7b8281d62ee07
-EBUILD texlive-2019.ebuild 7282 BLAKE2B 2d271e33deae5f67a8db84de259b32c7e4767522c692a9a703217a295f27eec46d78da9c69033dab647211b096e43774b9d82d2b734cf93a521c6a8e5984d35c SHA512 66d08076b62db81a4f04c943be69bbfc88f582204feb7ca6e24706a4d7ebe6cb293663d183493582b0cfc2f3bfa71d318a884aeed383ece13b146afbc1418270
+EBUILD texlive-2019.ebuild 7278 BLAKE2B 5240c3ecb111469ab16774375bed0ce4443a69342ad2943064cd88d8dbe22bd27135572ee9632eb9eaa0e634da4ffdcdc5870116c185b36b270f0e2edbda07fb SHA512 0d51c436b0df8fe31cf4161ecb6860fc699e53bcfe29a65dc7c18132d88c2a30206bad0f4afdcae699f405e2fc4d52af1049a54b2fa6af5bbbb10322fcc08175
 MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
diff --git a/app-text/texlive/texlive-2019.ebuild b/app-text/texlive/texlive-2019.ebuild
index e3f97018b809..c44916e25ef2 100644
--- a/app-text/texlive/texlive-2019.ebuild
+++ b/app-text/texlive/texlive-2019.ebuild
@@ -9,7 +9,7 @@ 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"
+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"
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 569dd9672fc2..40a5073c8d7d 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -7,5 +7,5 @@ EBUILD ttf2pk2-2.0_p20150521.ebuild 1380 BLAKE2B 8a332fc015d1e328b342328096e173d
 EBUILD ttf2pk2-2.0_p20160523.ebuild 1251 BLAKE2B eb840feed846e552a3202b42db5872d26c19949be4444ec538470e02ce1da85a2a3e2f3cd03e0d1e81f0282978cb86b3282310ca8865b576c6be4eadb393e0b9 SHA512 aa1cfe98ed451aaa6066e4815698113ea0e925b4361eb50ebb51935089f26ac438e511eb06d74dc7c7737981422718a4e4fe67b5aaa839594d617f0c488296d8
 EBUILD ttf2pk2-2.0_p20170524-r1.ebuild 1462 BLAKE2B 29fbec0d2ecfb06fb7c7303b9ffcc8d0aab170ae70c171a92f9c0517763f4a18e9860decf85cdff98a71b2a98cb760139fdc60d743abf2d512edebb41093f4dd SHA512 27fc9486fbadb5e73bb9f70ef3b695bebef7b8a580b13bf0d427aef54bcf6a86e400c2d14cc126302bff39676b28018e082dda2791a50b4afa389bc197395a30
 EBUILD ttf2pk2-2.0_p20170524.ebuild 1257 BLAKE2B 88872ff9775a86392454eca4ecd81c1b1e92fed99a6c46ac73082d5242d6a33a78b0d5f5cc2f056fa077366f6ade864063d5d59e286ea65dc611a67bef119051 SHA512 8ef2e82cd26116b828b4e287210d4823f4ff4d9b0b89efb3ad3ec37c00da8b9b23649ce245d7c05bae8f6fc0820138fd7fb073886a7aa5be048230da66c76a2c
-EBUILD ttf2pk2-2.0_p20190410.ebuild 1121 BLAKE2B 98443e3800854dbf00fd38f0c7d3477aea61e6914cc8e5ce86c4db650848ec687aad02d078e041649419d5cce2ccec4d8cac08d14f4b2b3934171e15dabff9b4 SHA512 bd351e4a69e6860c6c2b2afb32ad31223c456ff352c5daf48317d2d68d33f7986407d6e486f0f28cb1b8ea275a4ed8c36f6661c2ec03903348ef0b6cc3fea7a6
+EBUILD ttf2pk2-2.0_p20190410.ebuild 1117 BLAKE2B cbc8c6529643fcc58875cb6e49035ba0e241b570100b000a2e1bec93e21094b4f2028835798db94fbc1e3c3475b8d526dbbffdb1f8655efb40b87c68cb752da3 SHA512 73c0c6721ec5712684bebf4865e39793687d1974dff494280e06a3d91b8edb0765998dcab7dbd4c2c538571588733722e8b4c13237e99968f220df5a70043777
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
index 5fe37002fddb..62cf2ceb43d4 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 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 ~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"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index e71a7b50a5ed..5bc91a3d6397 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,5 +1,7 @@
 DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
 DIST yelp-tools-3.28.0.tar.xz 210496 BLAKE2B 2904b0ffe50f302d7f0938fecca74b37f6d070fe42fd681dd96b3a70b73244f65e204c34bb6f6ffb2b5bcd3400334b3d85a82807793b2bd30261c616382b8be6 SHA512 0b5adcb746ffb2b9c60303ef484dac01fbb59a06abf94bb8ec8a66bd573451939299688dec088a7421eab8f69ec2d7628475e81720640f0cb5b947a8d410ed62
+DIST yelp-tools-3.32.2.tar.xz 211668 BLAKE2B b45aef4d03f1954ac33bb05a9c788af40a74d76b54c2a0bcc466098e18435e02eb40004465dda399eb74e986caf404e51a393974d37ef1abeff6d76289840ecc SHA512 c9383426b854ae46ff4587bef07955541de3026f845025f9e99ba095cce11ff307e23d00d07a2da8763bcb6f9f061fc610351170e2abd99b5669912463729a85
 EBUILD yelp-tools-3.18.0.ebuild 665 BLAKE2B cca32e98a9cbcf49457795aa608955662f8a58ab7276b24aed66b5069f1f67de5c6ea5c244c4ec8dba26670b996e3d1554d210888fe339bc1f7b299b32aca978 SHA512 265e23a9f7286e866e85c431dbab8bed4f1c6477ac55029f1e55680cee77840be72260470d6bb81590174a16a0f5affc8c54fe8d072bd834ffb666f4d685f8c6
 EBUILD yelp-tools-3.28.0.ebuild 644 BLAKE2B 9571186c6a9ac3bc24e582165f8c115a485e24be2b8f2cbe9b71a7b7cce0e1a00b890b3ea6b330141ccea480581a87d2571c9d27695ff56054502152622b1db3 SHA512 96b9a6195150ed92076ecaa96b6697445d3bf63ed4a5c144bf14370fbe0f67ca23973b85623f041d84c77f08a4043ac3ee18e99fe001c6830aad4148c521c89f
+EBUILD yelp-tools-3.32.2.ebuild 654 BLAKE2B 59cb15841c8c003bc6cb65e25ee24a6b52b502b990f01801f759a3437a71555ee7ed3b8eaeff26c2933548c240c096eebac3469b77c7dce042d4abc8b0ead16a SHA512 50f9a685c573c554acdb025ec786210e53cc02aa72d45e53e2f64c97719c6ca557ef6f22f89548aa0ffbe040ea37586d43d4c81ce757c8f56db1d3be2335c47d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
new file mode 100644
index 000000000000..2316f862c34a
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	>=gnome-extra/yelp-xsl-3.17.3
+	virtual/awk
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"