gentoo resync : 18.08.2019

30 files changed, 187 insertions, 134 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6636700ee529..73e2ca5ce704 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index f8f271a5e71c..b0343f8653b3 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,5 +1,3 @@
-DIST ansifilter-2.13.tar.bz2 439681 BLAKE2B 4f23bfd05647046f9cb739f9ce0820b5b3ccad397a80558ecd5ca584c695dc4f942c1db3edd2f1b2d5a78b2c1e1b043677b1be3486ff7237090c27072e15f0fb SHA512 0d74607d2155f1cd0f66cf6470d1d83889d27c62475e366518a78b310c9681307e2fe662fea67078f95e6b9ce28e6f15656ab1ffc9e9e825d680808c673b7bfe
 DIST ansifilter-2.14.tar.bz2 441884 BLAKE2B 90b3b0330866da11c00b105aa79164178aebecf39131f5c8d8e373091f53d2d8bbced54472c975a61857d594a9fa92ce08d018523f471fde445d4548d48b949b SHA512 a0b7f12ea5b9ef9b5845a03484a2e238a9f60e0e49f8eddca8bf24b47faba48aa0b55f922678b3bf1b3f08857bbe9a8285b3f318f2adec84673bc502e21b6802
-EBUILD ansifilter-2.13.ebuild 1004 BLAKE2B cc405c8153cb0b54751498169307b13302f25242c9e1e2a7164f69c982fbb048266f05a100a04dbcad97c825cfa992a149a0b664ace821f719cbb670b3463213 SHA512 caf0d3364e39d7a66cc4b6684d9f5277f60af0c44a13ca10462370f475e9c4e98baa393b491a1810bc3cdb824c6c67bbd5bfee4ad13c7c4ca4f4a8d10bf90dec
-EBUILD ansifilter-2.14.ebuild 1006 BLAKE2B 080cb34e7ad7ca1d89a47db0786a34dcae1fc6a9f14a53010192e655ff1a18db4ceb449f6d9653977bea05ed2645897372776f90cedc11538e43452c105e8382 SHA512 79aa89bfdbbceeacfdb80d851047a20676b7d01ab4c7229ef8e9b94bf29bd79253bb79e7666af695e8776d405c649659f7c2e625a277a56f6f7430ce9bac38a4
+EBUILD ansifilter-2.14.ebuild 1004 BLAKE2B cc405c8153cb0b54751498169307b13302f25242c9e1e2a7164f69c982fbb048266f05a100a04dbcad97c825cfa992a149a0b664ace821f719cbb670b3463213 SHA512 caf0d3364e39d7a66cc4b6684d9f5277f60af0c44a13ca10462370f475e9c4e98baa393b491a1810bc3cdb824c6c67bbd5bfee4ad13c7c4ca4f4a8d10bf90dec
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.13.ebuild b/app-text/ansifilter/ansifilter-2.13.ebuild
deleted file mode 100644
index 89eb5868d897..000000000000
--- a/app-text/ansifilter/ansifilter-2.13.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs qmake-utils
-
-DESCRIPTION="Handles text files containing ANSI terminal escape codes"
-HOMEPAGE="http://www.andre-simon.de/"
-SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE="qt5"
-
-RDEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	# bug 431452
-	rm src/qt-gui/moc_mydialog.cpp || die
-}
-
-src_configure() {
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		eqmake5
-		popd > /dev/null || die
-	fi
-}
-
-src_compile() {
-	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
-
-	if use qt5 ; then
-		pushd src/qt-gui > /dev/null || die
-		emake
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	dobin src/${PN}
-	use qt5 && dobin src/qt-gui/${PN}-gui
-
-	gunzip man/${PN}.1.gz
-	doman man/${PN}.1
-	einstalldocs
-}
diff --git a/app-text/ansifilter/ansifilter-2.14.ebuild b/app-text/ansifilter/ansifilter-2.14.ebuild
index e993d7be98a1..89eb5868d897 100644
--- a/app-text/ansifilter/ansifilter-2.14.ebuild
+++ b/app-text/ansifilter/ansifilter-2.14.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index fc3aaaebcbda..102bb3371367 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,7 +5,7 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
 DIST calibre-3.44.0.tar.xz 38643008 BLAKE2B 7eb1412aa5de6ba2f48ea13e922dffff7ace0f4f475832ebe122db967c71df05b6bbb45092bdd53ddfe35d7a0c2af566ed83dde9aac64200d41ea2adc4cb1886 SHA512 a97f45f5f788357f62b4088c4d8190cd3e3b790685871d5a024342d5d21ca978d46fa4e47f85eef4b9fbc0774923732938a812dd188cd4a315445cf25b187d28
 DIST calibre-3.46.0.tar.xz 38750284 BLAKE2B 5590ba422d0323ea7c0cea67d88d448f00f5a470e7a8fdf9851b488c0856c88175bd107715a856706e95b2e1a45604713d061f4a7a3603ecaa01dfc018c1ed58 SHA512 d8eb014ba4d943e1c2ed05104d9b0c13f45a8b0085fa240248210cd43ab3739036936324183ae8a63dc636f7f8603484e3ddf50a260308ce1127745a8d3c6763
-EBUILD calibre-3.26.1-r1.ebuild 9308 BLAKE2B 07541b211051fe1ab42abcbefcc244e58987f58e22c6f444da32388e34ad38d131ede851be637f13665b6686874cb9db5d94e19915ad04141bd2b399d003faa3 SHA512 09c90d37a96294a1351cbc0703b9ea1855f1ea2016ba6fe449059fef2136109cfe5122862abf8f28bda3fea0f218a20653653650a50ce4593f12ea7c18352046
-EBUILD calibre-3.44.0.ebuild 8459 BLAKE2B f8bb5e99492acdd8c99aa26681b1f9ceb4c7fbafb226ee7f1102608f8722f31cf6cbdcb6f21adc9394edc37946893258cb9b1ceadd9e24fe541e78b5ef18fc67 SHA512 19933bc77c456af17cb782d9b0770f7cfab64c37cf96e4f9697c669a9db9aece28e0b8b1f51b20649ecef57780b213f21d3859f296ae9d042e26494d234a2a7d
-EBUILD calibre-3.46.0-r1.ebuild 8459 BLAKE2B f8bb5e99492acdd8c99aa26681b1f9ceb4c7fbafb226ee7f1102608f8722f31cf6cbdcb6f21adc9394edc37946893258cb9b1ceadd9e24fe541e78b5ef18fc67 SHA512 19933bc77c456af17cb782d9b0770f7cfab64c37cf96e4f9697c669a9db9aece28e0b8b1f51b20649ecef57780b213f21d3859f296ae9d042e26494d234a2a7d
+EBUILD calibre-3.26.1-r1.ebuild 9203 BLAKE2B 9e3bc1630f915a8548e1480f0b00d6acb4001dee3be5a5119dd9b2eb8b984c4eecaa0a0742e550a36eca359e8806d2444d21f8bf344321c11ffeca59e7e10877 SHA512 98407a3605b58125ca783dadbe7dfed5f3bb526f816d79a167fb0358202cc56870601d16b7eae46d2464a0f64761168d9f0a00d69a5a184e17d705eb540afb97
+EBUILD calibre-3.44.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
+EBUILD calibre-3.46.0-r1.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.26.1-r1.ebuild b/app-text/calibre/calibre-3.26.1-r1.ebuild
index 5fb25df4b35e..c92715c1e5f5 100644
--- a/app-text/calibre/calibre-3.26.1-r1.ebuild
+++ b/app-text/calibre/calibre-3.26.1-r1.ebuild
@@ -206,8 +206,6 @@ src_install() {
 		[[ -e ${x} ]] && addpredict ${x}
 	done
 
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
 	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 	"${PYTHON}" setup.py install \
 		--root="${D}" \
diff --git a/app-text/calibre/calibre-3.44.0.ebuild b/app-text/calibre/calibre-3.44.0.ebuild
index 2459339e2595..9b8c29fcc23b 100644
--- a/app-text/calibre/calibre-3.44.0.ebuild
+++ b/app-text/calibre/calibre-3.44.0.ebuild
@@ -196,8 +196,6 @@ src_install() {
 
 	addpredict /dev/dri #665310
 
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
 	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 	"${PYTHON}" setup.py install \
 		--root="${D}" \
@@ -252,7 +250,7 @@ pkg_preinst() {
 pkg_postinst() {
 	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
 	local x
-	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
 		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
 			elog "Purging '${x}'"
 			rm -rf "${x}"
diff --git a/app-text/calibre/calibre-3.46.0-r1.ebuild b/app-text/calibre/calibre-3.46.0-r1.ebuild
index 2459339e2595..9b8c29fcc23b 100644
--- a/app-text/calibre/calibre-3.46.0-r1.ebuild
+++ b/app-text/calibre/calibre-3.46.0-r1.ebuild
@@ -196,8 +196,6 @@ src_install() {
 
 	addpredict /dev/dri #665310
 
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
 	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 	"${PYTHON}" setup.py install \
 		--root="${D}" \
@@ -252,7 +250,7 @@ pkg_preinst() {
 pkg_postinst() {
 	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
 	local x
-	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
 		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
 			elog "Purging '${x}'"
 			rm -rf "${x}"
diff --git a/app-text/cook/Manifest b/app-text/cook/Manifest
index 3edc6186a43b..8b5bd380e0ca 100644
--- a/app-text/cook/Manifest
+++ b/app-text/cook/Manifest
@@ -1,3 +1,3 @@
 DIST cook-1.0.2.tar.gz 139428 BLAKE2B c3f1a3e753a7de14fce4f357af64f99af5e0a515988bb2aef40b79a0cc70dcba4bb585c1fa31e0da1d235fc1c363e9693338756f2bd784898a7dc63944b9ed51 SHA512 6941d3541a6cccc18fcbf14128e0593556148d40f74715b0da943455a223099406d632466137fabef27a2083b582701df92666a1ad6e6a04f5d2d3dc0b62e1a1
-EBUILD cook-1.0.2-r1.ebuild 1131 BLAKE2B 054ff9116919a34d481cf45d4ac8a27dba153265e9debbfaf0e31803554015aec4ea39b6f5a66e7f9b0d51ebe23d01c74a30b320669bd645414336c993563c6b SHA512 0bc16805bb07f199d2885c06481343efea93647a57e50b9298437f202bcdc208ff5b8169cd8f109e7d84846cce8af34b409ee528e561ab91398af0a694212ecb
+EBUILD cook-1.0.2-r1.ebuild 981 BLAKE2B 1e41fff4ff2bf035c2e272b327f23f0583f9dadac8a496db11cf8457563514f14d69cdf839bfc3de387701f367cf975ed913c955f2a17d3b614ab5f2348d9018 SHA512 879f999a2e88e019cfb5e1a1d0c613d43e3d34b066bf8570db2eee6827a04689cbe4ecfa9d9be123ea628b67f7f2d630aece6594c772abbad583441fe127eeaf
 MISC metadata.xml 241 BLAKE2B 6f92bb59126251d9e6b2cae4fa0a43926317c6c133dd882e845fe0b693238311241463d8de465e36ff2e90c7c25ea35309e3bc5b0c20a32153965ce0b626a1da SHA512 36edaae333e04297f6f6357cbcaaf6360580a83e20ec3af8b09c1010601e47c29c45b6eec5347cb90f8fc1fecdffeb1074d3ee55dda78c29026210ea58a7264c
diff --git a/app-text/cook/cook-1.0.2-r1.ebuild b/app-text/cook/cook-1.0.2-r1.ebuild
index cfa071431faf..4c1343f0e2c4 100644
--- a/app-text/cook/cook-1.0.2-r1.ebuild
+++ b/app-text/cook/cook-1.0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit toolchain-funcs
+inherit readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Embedded language which can be used as a macro preprocessor"
 HOMEPAGE="http://cook.sourceforge.net/"
@@ -12,34 +12,30 @@ SRC_URI="mirror://sourceforge/cook/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-DEPEND=""
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	use prefix || EPREFIX=
-
-	dodoc README doc/cook.txt doc/cook.html || die "dodoc failed"
-
-	insinto /usr/share/doc/${PF}/example
-	doins test/pcb.dbdef test/pcb.dg test/pcbprol.ps test/tempsens.pcb || die "doins failed"
-
-	newbin src/cook cookproc || die "newbin failed"
-
-	cat > "${T}"/README.Gentoo <<EOF
-NOTICE:
-
- ${EPREFIX}/usr/bin/cook has been renamed to ${EPREFIX}/usr/bin/cookproc in Gentoo
-
- -- Karl Trygve Kalleberg <karltk@gentoo.org>
-EOF
-	dodoc "${T}"/README.Gentoo || die "dodoc failed"
+	newbin src/cook cookproc
+
+	dodoc README doc/cook.txt doc/cook.html
+	docinto examples
+	dodoc test/pcb.dbdef test/pcb.dg test/pcbprol.ps test/tempsens.pcb
+	docompress -x /usr/share/doc/${PF}/examples
+
+	local DOC_CONTENTS="
+	NOTICE:
+	${EPREFIX}/usr/bin/cook has been renamed to ${EPREFIX}/usr/bin/cookproc in Gentoo
+	-- Karl Trygve Kalleberg <karltk@gentoo.org>"
+	readme.gentoo_create_doc
+	dodoc "${T}"/README.gentoo
 }
 
 pkg_postinst() {
-	ewarn "${EPREFIX}/usr/bin/cook has been renamed to ${EPREFIX}/usr/bin/cookproc"
+	readme.gentoo_print_elog
 }
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 94d8ba82e52d..bf117ef8babc 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 1293 BLAKE2B 533b4e979f3487682f99944f6343ba78a76b91614b27a7fd0b11dc4bfeb05cc545cae551a1edeb1e4df2d288aca8e57c636116c35bec9fc499e00c566e476c5a SHA512 e6174f4489b7f0266d7a9d794edb5696d4b5770504f3d2294ec96be9f688554c94321a090366a753db964ccea3e9073430f8682d29586f56d49ac0d662f085dc
+EBUILD dvipng-1.15-r1.ebuild 1320 BLAKE2B cb0d2336005e0dbf709ed2cecdb98bc80999553bbdb8c6aaaec3c4b8a74c33be148dbb70892bce8451df56f8ef15892d3836dfa27674385c1f585f598b08e174 SHA512 16fef8e9b8164876519ebbdfed8061d53cefe63e80cba48e72ca1b70abbef8d872909d065f6e6d8146eac4ec40e7075627537e89a096dc20ce885e16fa721df8
 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 af72b049c50d..a7c56c1005f1 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -13,6 +13,7 @@ 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"
 IUSE="truetype test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/kpathsea-6.2.1:=
diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
index 543f273f6a2f..8b5fc2c7c37d 100644
--- a/app-text/htmlinc/Manifest
+++ b/app-text/htmlinc/Manifest
@@ -1,4 +1,5 @@
+AUX htmlinc-1.0_beta1-fix-build-system.patch 768 BLAKE2B a9da434128aeb20a2151d38353b8b7ce5eaab8fa4e4b44b9f9c79a87a55ba63cb6a344f6328b9b2c439a530aaba1b5377844946b24def2b1b0ca62c7fb52a145 SHA512 78c386be5ca30e15c786ab882800a065fa785f4ea5d3683d4a703948d642945077e00cf59f724cf7dc4a533827102883dfdcbc799752130d41bc846da83ebcfb
 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 716 BLAKE2B 4a5c2b28ec3605f93fdaf48b057d9b5ced42889400233cdea1fe9c22b1306f03b8f225aa91b5db4afec389661472d3fa5135562177efa5cc92011c0ad9aab380 SHA512 fd6c9bf88ed1e4abb957de35d182f661b1f86e415afb58f59046de48319738ca28ee7d8aad9c9b916c4c85bb771e9dc0f89d749ff282a5586fb460b2ac752aae
+DIST htmlinc-1.0_beta1.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
+EBUILD htmlinc-1.0_beta1-r2.ebuild 603 BLAKE2B 39e1397f1c4c0a5cb03ef142e25574d264cc061b920f98e705b732ed29f9d72a6bf2c461df34bc361bbf20da6087f40227a626a49dc2a3a933db449dde558c14 SHA512 72fad342057ae06c1e1fa2025a04a96e37dcce8736120a37896bdf05db154f1a828041ed410bcc38bfcce1a4661d260c1a1b3d9434c5976fbd14e2cd46725218
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlinc/files/htmlinc-1.0_beta1-fix-build-system.patch b/app-text/htmlinc/files/htmlinc-1.0_beta1-fix-build-system.patch
new file mode 100644
index 000000000000..3d0fff8d86f7
--- /dev/null
+++ b/app-text/htmlinc/files/htmlinc-1.0_beta1-fix-build-system.patch
@@ -0,0 +1,33 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,28 +1,9 @@
+-CC=g++
+-INSTDIR=/usr/local/bin
+-CFLAGS=-Wall
+-STRINGLIB=bytevector.o stringlist.o
+-
+-htmlinc :htmlinc.o
+-	$(CC) $(STRINGLIB) htmlinc.o -o htmlinc $(CFLAGS)
+-
+-htmlinc.o: htmlinc.cc stringlist.o bytevector.o 
+-	$(CC) -c htmlinc.cc $(CFLAGS)
++htmlinc: bytevector.o stringlist.o
+ 
+ headers: text2h 
+ 	text2h help <help.txt >help.h 
+ 
+-text2h: text2h.o bytevector.o stringlist.o 
+-	$(CC) $(STRINGLIB) text2h.o -o text2h $(CFLAGS)
+-
+-text2h.o: text2h.cc
+-	$(CC) -c text2h.cc $(CFLAGS)
+-
+-bytevector.o: bytevector.h bytevector.cc
+-	${CC} -c bytevector.cc $(CFLAGS)
+-
+-stringlist.o: bytevector.o stringlist.h stringlist.cc
+-	$(CC) -c stringlist.cc $(CFLAGS)
++text2h: bytevector.o stringlist.o
+ 
+ clean:
+ 	rm *.o text2h htmlinc
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index 694412759ced..a2d1afc50502 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -1,37 +1,30 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="HTML Include System by Ulli Meybohm"
 HOMEPAGE="http://www.meybohm.de/"
-SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
 
-S=${WORKDIR}/htmlinc
+S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gcc3-gentoo.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/htmlinc-gcc3-gentoo.patch
-	sed -i Makefile \
-		-e 's| -o | $(LDFLAGS)&|g' \
-		|| die "sed Makefile"
-}
-
-src_compile() {
-	# This is C++ not C source
-	emake \
-		CC=$(tc-getCXX) \
-		CFLAGS="${CXXFLAGS} -Wall" \
-		LDFLAGS="${LDFLAGS}"
+src_configure() {
+	tc-export CXX
+	append-cxxflags -Wall
 }
 
 src_install() {
 	dobin htmlinc
-	dodoc README
+	einstalldocs
 }
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
index 767dd2a35c83..1f77413d2419 100644
--- a/app-text/jadetex/Manifest
+++ b/app-text/jadetex/Manifest
@@ -1,5 +1,5 @@
 AUX 80jadetex.cnf 995 BLAKE2B 1316aa328e42553d13ba377512bb1c7301a62ee60b8351a9209dbdf7ebd306f092e9b3e35c6b605c9847a1fd931cda3ccfb042a30ec3415b59f1c88537ebe55d SHA512 b1e940b79bbb76b3ad02c82e25120651ab64259be104849fc39aee94fcedaea091220b6896217faa84f93a45cbafca5b1855396b47210952723148b69d9727f9
 AUX format.jadetex.cnf 170 BLAKE2B f6f923eb38263e054ef470f0e9bb8f4beae75a9ea5f5df380077e1661e22fed024e1f77f56f8419127bfb831b7409f486cd53bfbf2aa81bb80a2c47ec674cf2a SHA512 8d5d6ed30c45e1d79f108268e045acb763fa6815ca90a8f246daff51350ab2c19c7d38237aff3ced94f10bb9de06e3021c11138d3f038f4beaff25c5cade391b
 DIST jadetex-3.13.tar.gz 103137 BLAKE2B f1b94f62a6a9c0a33acba4e8c757bcfaf26660a2d0b4ac338cf5afe8d03476a8744652244218d056678a59507ce3c8de7066314f5559469a60be5287a8c0ab37 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1
-EBUILD jadetex-3.13-r7.ebuild 1683 BLAKE2B 09389bed81844e27bb6c0e07e037fe243918fc1b5f52aa6012082f2bb7021f67d1632e89ca6284911951377624f9e4d3155266bb18c763c396d34c0d8d0bdbce SHA512 1f6672c407ea52db05339fce455ff00a62182dfe2ee6806a26265c25c7456ee9e029835273c24edd4de73ab4e2e298afa3be7188974e19817f92f662989ad1b9
+EBUILD jadetex-3.13-r7.ebuild 1676 BLAKE2B 1ca11aaa3b536ea806ca2cbcf66f70081b40a9fa3a590695d59d73a15015d9c340d7404662d396cef3f783c82a2fcf4a07d90185feacae2fb59e76d720b5bfb4 SHA512 95b2411a4b2741a1f752f0ed148d5f022ecd79e2ed666151cff8eb10ebbd127eca13e1be133a21a46fecda79e645d020621362041d51793c97ccf276f6973896
 MISC metadata.xml 326 BLAKE2B 43480e556a9ce9c52fc46d18765664881cbb16ea08954b18d357df0a956d335815e9a0c3093504bd68a5b2249bee307ca05030fbe7fb4324beb8fdd7ff8b2e53 SHA512 eb50eeb89f113a376963fe314c979d5e399f43b0ab85fcecc923618c717e30c90f8f70fe22ba7a02b39b14c57861efebfdb785f607a2e7830578aee20c2bd915
diff --git a/app-text/jadetex/jadetex-3.13-r7.ebuild b/app-text/jadetex/jadetex-3.13-r7.ebuild
index 14d37d8b41f7..d1f1a0cc071a 100644
--- a/app-text/jadetex/jadetex-3.13-r7.ebuild
+++ b/app-text/jadetex/jadetex-3.13-r7.ebuild
@@ -21,7 +21,7 @@ DEPEND=">=app-text/openjade-1.3.1
 
 src_compile() {
 	fmt_call="$(has_version '>=app-text/texlive-core-2019' \
-         && echo "fmtutil-user" || echo "fmtutil")"
+		&& echo "fmtutil-user" || echo "fmtutil")"
 	VARTEXFONTS="${T}/fonts" emake
 	VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}" env -u TEXINPUTS \
 		$fmt_call --cnffile "${FILESDIR}/format.jadetex.cnf" --fmtdir "${S}/texmf-var/web2c" --all\
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 6a432ce0dd03..dbc92853cad4 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,4 +1,6 @@
 DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
+DIST lesspipe-1.84.tar.gz 119657 BLAKE2B 671b504022bdba82eea03d7a83960d5ed148d851d0420f179967f46d38a88ab90c9928a462e01744134aedfe710dba741430e78743451b1b65e603e5d89ae139 SHA512 f11ef23610f722d62ddf7e084b03967ed59d21af6ac207d4456f625c93c3c58c87ec5907cf6bca00ae5550dcddfc9b7f0be5de51f9ff81044fcff1f1cde81267
 EBUILD lesspipe-1.83-r1.ebuild 1123 BLAKE2B e0e9a8373bda948281b5a584b174bb9bd1b75b503f004fdbaec54629673cbb7a850a685445dbd7de9b3bc1237f052fdb10e8ee771d3600c5fee4f2cfcacfc5b7 SHA512 334fae62576add56f38a0ba9c0ff46bdba7a5bf03a5f5236e028b30ee3cadc123913aae4d78ef38942d7b816e2f243cdb6828c7a366313ff83f48cc82e92fddd
 EBUILD lesspipe-1.83.ebuild 1136 BLAKE2B 4e7dd1ab4b3a24c1233539d1132b791b5576eb81c32fc866bfaabe3904c9de104e02db88a516f122f5892a08c9da231100c1417a55536973b241751bd55fdbd9 SHA512 aa8ed4b60d7396c65204d149057ac8f56480201ac1fccca2d9f5661a76100cdca8daf2c322dfe9d3e754281c49d5ec6b07201b938e72e96e72f2a1f4212f205d
+EBUILD lesspipe-1.84.ebuild 1129 BLAKE2B c0e0e5bc2bf7412601c6c79a98fa044e7754b16fdea7620749c0468d1b8004e7ff8864ca1116e2cc26cdc575b1286415d6808964a246f981057b44e184926028 SHA512 1c827e596d3915ec72de0d72397005c6daf0ed80e691d26593c2e536a1e1de1f66dd73c7ed903402fbebb8607e57a3e652a1e3cd4dcce6b43992e0e2a3fc142d
 MISC metadata.xml 303 BLAKE2B 57a0ab69188055eec0a29d4f2e331dd027d87b12623099013f889cd4954574772f3279c7fdce85c0fe627083db59a89a6d3daed8266c867b17bbdf84d1fef4a5 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7
diff --git a/app-text/lesspipe/lesspipe-1.84.ebuild b/app-text/lesspipe/lesspipe-1.84.ebuild
new file mode 100644
index 000000000000..4ecd47310905
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.84.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="a preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!<sys-apps/less-483-r1"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build.
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index f0bef048645e..99f8d3367d36 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -2,8 +2,10 @@ DIST master-pdf-editor-5.2.20_qt5.amd64.tar.gz 16261577 BLAKE2B 112c8d308875d36e
 DIST master-pdf-editor-5.3.02_qt5.amd64.tar.gz 16333023 BLAKE2B 99c1291cd5d354e304e873dd2528806898109f0a9a79c87eb89394ec8300ab692294c5b04fa7fb712df82fa683cd3ed549b9842417d2b13f6a3f5f41fcfa334e SHA512 bf1118f1eefe3f46addacba832eee757112a91154de5929c825845983e7b6bc681bff84501082e696bb14acf6652ea180912ae48a0dfea270053fc42a3200448
 DIST master-pdf-editor-5.3.12_qt5.amd64.tar.gz 16350912 BLAKE2B a633af3f9a99542b5c61c27b237c5788468d163ea3297d17134e6f4404cbf6bfd579bb9b1febbb27892e40b369405c05c827b0b01433039cb9d9b2f062a785bd SHA512 526ff0998734eb24406907b3ffbf8801fc04cd49aa620ea57e20cb885d7d3e94e279592bd937e306151f91f82c459cf6810c80e51d438fde0db9dbeef46edbbe
 DIST master-pdf-editor-5.3.22_qt5.amd64.tar.gz 16410658 BLAKE2B fc9cb09e58625534d12b8fe4ff657917f76a14578341c678d6be909a5f2e7a75b4587c2f1abfac66741c088b43943a30874f6ae1414ae735ee01254f019c02b3 SHA512 033914e94c9ae4114243e79be445f523a6bbc6c39527db786613ef7220bedb2412ea75c83210ed8b6096d045afce73bc8f6141b55995f2f9c464ef4a7fd69d16
+DIST master-pdf-editor-5.4.38-qt5-all.amd64.tar.gz 38044035 BLAKE2B 60fbbaaaea47a1a572ea39a0c15e0d5a9b8a2f6d9fa68c06eea6279e5728cc84016514db5e91fc2a2a0b35a462325fc8cd66b1f9eb5bff5b4815c926587eeec5 SHA512 1f94bdd6a70d352c246081a40cd81801cf9b658ff1121572a91ee5bb3589e36d6db3c5db7ad54692334e04487c29ce6ef0b9381a6895467f1bb6ef0d9e00e00e
 EBUILD master-pdf-editor-5.2.20.ebuild 1174 BLAKE2B d5522b2277cdae788777071681ad00edab0c32897cdb204ade78167a42004e90119000e1dfcf11bd9f7059616fbb0f93bb231dcba236817082b5e00c25d20941 SHA512 1e462a4d9a8d30fc831cd70411ed028581d6c4d44038f9541f900a81763c122079c301056a230630d812aaac3db92ebd9e0889c7b1fb192a0ad34043697ef4ff
 EBUILD master-pdf-editor-5.3.02.ebuild 1174 BLAKE2B 296a73e127a2ffc90a85762bbe3724922f7af76ae972c0295f9103a68d573d67963bc14e251abb62e4cfcdbe0d99a3c2939978cefd05dd22cbf7fa5953997155 SHA512 227d9cf8bb100f905eb1cc5262d362ec71b4a70b801fc8eaab97029a8188d8dbf2c33d6af0250c9754845e79cacc90a2aa1b47946698a939030795333ee0db23
 EBUILD master-pdf-editor-5.3.12.ebuild 1174 BLAKE2B 9c347747f3b2692d4fa368b3f7b0bcf2baa4b461aeb530bb09345db7a1145f67870a6bca8c154c13c4cb29799ede5c80af298c915992484d34df3524f157ffb0 SHA512 82a6fa658e4678239662a28225b21383ebecc2c0af17882cfb83a436ef0bfb09d75de123b45851411800d7d6565687aa373157c8496ed10e60b6170641de484c
 EBUILD master-pdf-editor-5.3.22.ebuild 1174 BLAKE2B 9c347747f3b2692d4fa368b3f7b0bcf2baa4b461aeb530bb09345db7a1145f67870a6bca8c154c13c4cb29799ede5c80af298c915992484d34df3524f157ffb0 SHA512 82a6fa658e4678239662a28225b21383ebecc2c0af17882cfb83a436ef0bfb09d75de123b45851411800d7d6565687aa373157c8496ed10e60b6170641de484c
+EBUILD master-pdf-editor-5.4.38.ebuild 1178 BLAKE2B a02b75cafccd006ae478298dcf058440a867696dee22caeba5bb088a07c6c223ec0ab0014156ba2f84eebb5348444104b236ace45c83bdae5e5a01dd8bc0654f SHA512 0bda5dbf66455fd1c3a6efeccf25115ad7f5a9eb33c0072860fa77f872c6b3485ec7a355618230e7d84b88480e7a029508f9f59d09b58cd96bce7de11500d9ef
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.4.38.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.4.38.ebuild
new file mode 100644
index 000000000000..f1c1c8618ca9
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.4.38.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5-all.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.9.8:5
+	>=dev-qt/qtgui-5.9.8:5
+	>=dev-qt/qtnetwork-5.9.8:5
+	>=dev-qt/qtprintsupport-5.9.8:5
+	>=dev-qt/qtsvg-5.9.8:5
+	>=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 06d50996d1a8..00906d373b7e 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -14,6 +14,6 @@ DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
 EBUILD pinfo-0.6.10-r5.ebuild 1327 BLAKE2B fa65a2d59989d50982921aaf64b2f7e98fb3c4ea82e2c1537656d30159d44a29df0ffb0c8034dbabcfb4b82386bf15b7f4ccf86f5fcfb577eaa667cab7ee22b2 SHA512 f5132c2d41aba6c9cc41076571d70266db613f28ce63c1c3d3b3902c011d3860004cd910280527090b72c97a7735928ae2c3e8f85f96139134bf847d6ec624ba
 EBUILD pinfo-0.6.10-r7.ebuild 1440 BLAKE2B 1a52c7a2f04d51b7788233a0b0e4f4ff3367a798abdfe2c1c949655431652e1fffccc0b8c582143f596e44d4753a1e67d9b19a3b2f4ed5442260556015260990 SHA512 001351b50d182fea1772686449629ceb9946625f0d13d1f13219938ef0a3dfaaeb142d3fa7d8dd3dd1f28cb359da3a526d76654875cc6c62bf39451f1b6ca431
-EBUILD pinfo-0.6.13.ebuild 975 BLAKE2B 22338c9bfd712b43760ff67e1a987a5266175fc8d6656941acef4d16f9029502f02157cd69a3f476fbc434b0cc6c89f466b6a15ee94271c63cc6835e1d428aa3 SHA512 ec1b0bd68a7ff1506e00ca1c26be1233bf71b3200ffb3d1c3c4a60701517cd9b08dc22e857e2a8447aae58c8044dc5a6033eb45f7c77424711db5e7f84a448b4
+EBUILD pinfo-0.6.13.ebuild 972 BLAKE2B 66a20d7f06c652930ecbce6862cd35ee5899ba45bd7d01fa6ed3d9719b5a54ad83b1d9a9bb7d98cce34139b951c10055c9f2849097ba6470ed11d4881054100d SHA512 0de182fe6b431a8346a9f8a8bc21e339c2d233e725f4202482bdb5e42ada6a11438540746b0e49190eab25898fe3238228e1dc0443a2d23f943aee1ec31012f7
 EBUILD pinfo-99999.ebuild 886 BLAKE2B 52c3d54f248446df82c34f49a4ed73ea3cd6dfebac907a7624a9eab847234b997ee1b24d3367ba1e0426ed6e2ac7173a95b35d4aca18f7d2b597bdee45197c83 SHA512 87561fef7173dfd86f36edd55ce92d1afb70d995d589b25dc889e0bee9a48116a1eda7f4673e3d47dbb466052b45e1252af255e43d7551417ffcf00feef0e91c
 MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 7ea70501a526..70e4f9f8e0c8 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="nls readline"
 
 RDEPEND="
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index ea2d642083e9..0c5d61bb13ef 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,6 +7,6 @@ AUX poppler-0.78.0-respect-cflags.patch 1140 BLAKE2B 59e87b6957a5aff35cf6ebc8092
 DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f SHA512 7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040
 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
 EBUILD poppler-0.77.0.ebuild 3515 BLAKE2B 6891a220705d7abde2096ff11b8f66dfee40dff5bb19fa4581ed72473a7476c6356d7c608760565a93c538f41e2447a65d520c2f4487f7a2651e4d700aab5f15 SHA512 70a9b2b6930071532d224eb93560555f4ee47409fa58d2a6282dff648763603575367ce5b80e2402d1a3bba015349936925ae78ef092773251b8c531a777de50
-EBUILD poppler-0.79.0-r1.ebuild 3529 BLAKE2B 6aa26e84d2030230eae7625f55acc15e3448ac9caa7493c79cb32ddd06145caadec663b115471eedeaf67a3648a059196220b49064bbea4959414077ece059ac SHA512 a4faa580f3605bdca2e6499b93ebbd4146ee01f6074b6721ad16e8f9d90e435467dff3fd8e3374f09be05b4ed0e4a45371cf925efedf2659d9c519f84aa1c949
+EBUILD poppler-0.79.0-r1.ebuild 3519 BLAKE2B 5f0d5955e574546abbb15eeb73c3d28325b67bce90b819d2ae114b79d15cc40d544f4c6a73285752b7fcf684c2a4dc9f7a74e5a1ac3514f8cf254abc15d112cf SHA512 485faa57f4a2fb01ce4c792d8ece62cf9cee4355ecdab2b02aa1d067ebe4784d2fe5e33fad8cd8057518107cfefdc8b3748850fef2888a68bb88c17e4a074d9f
 EBUILD poppler-9999.ebuild 3529 BLAKE2B a443f6eea15d1e41eca59f5c9f5433cb6def0b4ebbae5fcfb881157bd4dbbe0d31bfbf6c10e8ccc78553e2a825f5d0615a7bef1b2ca9ca6783d0f019aa2eef87 SHA512 3904299dead5c2666709277469161c4795057b9651c685619cf56ee70d48230a684ded4528a288dffa4df1f4e6145d07c5066808ddc59de2d4e4458b0da0697b
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.79.0-r1.ebuild b/app-text/poppler/poppler-0.79.0-r1.ebuild
index d2fad20eb355..e13bc99957e5 100644
--- a/app-text/poppler/poppler-0.79.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.79.0-r1.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/89"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 701e85d0adc0..8fe6baf2477d 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -5,7 +5,7 @@ DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47
 EBUILD scdoc-1.3.1.ebuild 1031 BLAKE2B 3da18d09700584dc4c3365ea66c06bdcc5e8363e5dd3ca44a0c36a2237abe6ec444a760ed0ee288e522d6c4ea1994f8c9dc0db09a6b3bb07005f8cc9c379915d SHA512 2a943adf9b0ecac43499c55f74ab56fb0f5cc59d74bb43862726ff4da4aa9a765c09cc8b4ff1de28cae3de0d7856634de65027c83577a61c91c2b222fa6f14cc
 EBUILD scdoc-1.5.2.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 EBUILD scdoc-1.8.1.ebuild 1109 BLAKE2B 9e0265584e2e9dca427d2ecd419a0ab72e723f88d4cb88be78e0ad5266a48534930d848c35a7542d8de89a12c91b7d279002c5d2b6a9550358666737fe191838 SHA512 5fbf573577f5e489e8361c8fc03594a1a4a0c38371e2df40af7178e0bbcc5b4bc78ce01c88e35326c6c66142a491bfb40a25b6be2e6373d10bd382e048bc3e68
-EBUILD scdoc-1.9.3-r1.ebuild 1158 BLAKE2B a97624e0abd5bb2c33dc4ef261954af6df58c4c133aea60883a3ab5b0032580011e91d414394cd6bf87d0320e04223d1233a0d247662f6fe6ac7900eda6d0501 SHA512 4d6e8e745b0c4c9b1b7e792eea029b4c8ec9d4c93d3f5f706bc7d60fcbffb8da57598055663ff94a89e884e48018e7171d487a11738cb20737decad89a876c97
+EBUILD scdoc-1.9.3-r1.ebuild 1165 BLAKE2B acddab79253fec1c4e2c59f8ee70b9ab0d86c4fea2784a41afe94aa62909af7b2664e20f69b610484452aaeaf1ed597567439af8b4aa12e0462226b9c8108522 SHA512 9e8bf612cf40478c23dae4fa2934a09115f9ee813d2a9eb904710c638b605ad28a9938a7f90a0e6da024e0338e7dfbce66cf79f3e202c992a1140a0bc0b10eba
 EBUILD scdoc-1.9.3.ebuild 1108 BLAKE2B 7beb9f0d42619ac83496a9e9e7d86ac1ca359f397d3b7d74162c8c4fc60dbb5bcf2cfbf5a8d83497d34919ff8b0bc4417916ab2fc237c16aa138e076a792f9b9 SHA512 17def7a7bf2e90554eb736a7d50e4450b12508430a5c3464e6f12ace019596cd640241fd2d6941ec1c0b3d8235e80d2fa9fdd2df185d7efe30a3e16bb562baca
-EBUILD scdoc-9999.ebuild 1154 BLAKE2B abebdc143dcf69209b591b14a752348481cb53887a3bce20c9e2b3c56645be2022c407e9ea7f06bcbdd3d7a3765aa0abe255a5891c903b3d259370af639eb93d SHA512 6e74ce420930fb3996d53fa105c845adc07103b8dc131b69cd09fcea9e2bafbdbd9cfaf6fbe47ce4491f05a6284198916160dc0375f4aa60846390adb5e2ac86
+EBUILD scdoc-9999.ebuild 1168 BLAKE2B 896d9b2c6a246e64c59e29043ed7805c11362595a6502794de288216459e00e3b6517d4cb0f971b072d51c96b027d3c961228c0f7cf23cb65c364c47d29f3776 SHA512 d4c5631f5e5821753cbbb95dfdfda031032c4502ff89c036424b7e7a29324783b9409b8b4293c2f2ad56782980415d491f544257125e980eb5b0373941dedf56
 MISC metadata.xml 444 BLAKE2B fe48dd13d534bacc09205bd073b4052e2f5afca50eedea53236f7d2d2f31f4f876fe0b4dcb57eb8a87b4090fffb5f924ed57b9a636453be7c2bb586cc4d1a142 SHA512 3a172b03f1768baf0bb940bd842f7e6c05762e79bb1d8632bdbf86276e79cda7f1b334750a3650cc86106154a8b2e2e426c7ab99d41cc5bf5119ac1e81e7b5fc
diff --git a/app-text/scdoc/scdoc-1.9.3-r1.ebuild b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
index 77bf0dba2e95..13560ac4771e 100644
--- a/app-text/scdoc/scdoc-1.9.3-r1.ebuild
+++ b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
index 119be54bf057..a73e37542026 100644
--- a/app-text/scdoc/scdoc-9999.ebuild
+++ b/app-text/scdoc/scdoc-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
index 378648ec292a..a5adf084a9e3 100644
--- a/app-text/xhtml1/Manifest
+++ b/app-text/xhtml1/Manifest
@@ -1,4 +1,4 @@
 AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
-DIST xhtml1.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
-EBUILD xhtml1-20020801-r5.ebuild 2177 BLAKE2B 0d0c33716b2f816b03713365af543835934e9112afd74c00099fb98d9013cc5b8adb0581f3e6dfd64456511cd1199352cd51dcee244acee426b3eb547ce19b55 SHA512 9b7732f5606ba95344bfe1bce64f5f3ccc7a298356b9d25f3ab6e9fa667c4f9be2f98168494c535b9226cec6c3dbf2b55a92f7681d5222fbaf7e6af0efede957
+DIST xhtml1-20020801.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
+EBUILD xhtml1-20020801-r5.ebuild 2174 BLAKE2B 2029974397a6deb6848f5310a0c3078e70219c204406d1ef115241cf22f870f10ce8c18a965b035cdead98db36e4f0833053a67c765d1e538cdad172abada25b SHA512 57294051e859fd17a6942d180026f3d8e74c84e5ddfcf012e1f04f1870a867d908c4b7343b1a99c5a1d52844e86bc4a5754e6488e8ce45973d25e578b0d4a478
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xhtml1/xhtml1-20020801-r5.ebuild b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
index b1ffbb673296..8fb45b9a9a67 100644
--- a/app-text/xhtml1/xhtml1-20020801-r5.ebuild
+++ b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ inherit sgml-catalog eutils
 
 DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
 HOMEPAGE="http://www.w3.org/TR/xhtml1/"
-SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
+SRC_URI="mirror://gentoo/xhtml1.tgz -> ${P}.tgz"
 LICENSE="W3C"
 
 SLOT="0"