gentoo resync : 24.03.2019

18 files changed, 162 insertions, 134 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 394809a88908..5b193855f184 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 468aed4c0c13..f90f4b58de0f 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -5,7 +5,7 @@ DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e81
 DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
 DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
 DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
-EBUILD enchant-1.6.1-r1.ebuild 1633 BLAKE2B aac2994d7a001722a71c308f2d4b63f40b634126545e47cea86e2d177b539f8ddd92b9230ee47294a18e41e03e17b4f9e21fcda1ccca1f5c8ca20749a78e0402 SHA512 25a076c976727036b9bce85167f708773f78835e769fbbe457360e367d47a61169ea7fbd7cec33303edfd01f27eb5d1e148eafb157fbdbf4e6f45c4bf0604ce3
+EBUILD enchant-1.6.1-r1.ebuild 1632 BLAKE2B cac99741474e96a94f3a42a78d0ebd89ab65257ada3f68c71abf398d985aead724b535203e6a37bd30794a852db9249e29bc796f79fc8796a7e28681b963101b SHA512 842446d8c9925aab2465c5d72b13afff36c0afc0b49312e89706fc3099f1da2ff6e6c9e6d38fa23a93a5817d249aed7ccbe94111e175e3c89dce3ea513f7c29f
 EBUILD enchant-1.6.1.ebuild 1497 BLAKE2B 0a9aefe2919ec376d33ac79e271014c065a26cfa4dd70e760efbbd3b76e6723127fb588f4365aec905215236ed407eccb25a9943067bd198ce67f6b7b41adc3c SHA512 ca846dd37eb5e9fabcb512dfb2c77dcecacf22018a3ba5e61528180c2c879f0a849236ad7799121f9f0839bd250078480c2c80f792756d301518e06bd3c7b01a
 EBUILD enchant-2.1.0.ebuild 1315 BLAKE2B 099906e37a942d542e7bf55a4f86e2def554890f131ebb2a717a270a1b7e1582200468f403eaeeb669d8e253ec437beaa8117f5ac8c05d757983caaa7158ba61 SHA512 6c6261e70abe20d1a4ad83b3b3d0cf68fa29543d3f676301ad16fbbd4d8477b3add24accdf94b9c14bcd970a27385c88bf1c8b516a4cdfa720e81bf9c6204515
 EBUILD enchant-2.1.1.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 068866bd3d8c..0d2a19a27b5c 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 48ca8b5d435a..a6c9fb604e7c 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -7,6 +7,6 @@ AUX mupdf-1.14-openssl-curl-x11.patch 1799 BLAKE2B 62ae64baad844a13379f8dd1e1a1f
 AUX mupdf-1.14-r3-openssl-curl-x11.patch 1256 BLAKE2B 49bfda1f434fbfcf85c7b38b714b3c471d8d4ce02d625a6716582e0a9b3d1d0f623d401a0e9f4fc8ce4a1a6109925199c9c2b188be8739f274804217fb829efb SHA512 387f282fdd2e450585743de7fa297c24685d12c199c801f930da37795c6406aa9ee0bee335c54ca6ccef46726ebf6b49b389753f061542cf7e5381c979e0786d
 AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
 DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
-EBUILD mupdf-1.14.0-r2.ebuild 3112 BLAKE2B 15e7a667afa71e4c34c2d5364cf23ed97700d0248b1e3f7ded0485cd401fd8f2f89ddd7f4ed419b061117ef3908100be8a3628588ffde765101c7e4b3aeb2744 SHA512 8921e789ffc8c0972a0f533200504fce27c3a75ade0e3d0bf7206860a4875ac4d844cf82ff5e7f0a322dd8dff792de69881dfa785940d1800e26a2b1eb740768
+EBUILD mupdf-1.14.0-r2.ebuild 3111 BLAKE2B 0431380b280fd111a1599aa1cc165a54c077d6881ac67dc99b76a2923ac001e5bfb3da3318f01178c708e0468f8940ee322b35956e51a76949771ca7c8eb3e4f SHA512 322240be76b53cf7f7f81dc04ada3463f6ba3ea00b7396d031b34d7343e7920b908c8eeb6e04f6192bd5187ffa211ac318efa5d01ce8df71c4fcbd57e215ee91
 EBUILD mupdf-1.14.0-r3.ebuild 3333 BLAKE2B edad471b5ec05e9932bf734b352bf4a7d99115fcc214f843b452f71e9c39dfb27b6b631fae9316a1bf2e4a6020d7424998666d2c433ade867182b303a4643afe SHA512 9e15ca3d84f0a04999127a8a4327de7dd55498aa0d59e3e8a0ca70bc09fbe222ea498894736e6fb9acf2e6c8a8523c419fe1f443f0bdf10344a0e8ca996d795a
 MISC metadata.xml 325 BLAKE2B b1481395199609bf3f4f01f21946866005eeb2a5df124c1ded940702808cfba176494e7b801ad5fef4ea61c93ce47e7415548a3e86d0d41b28c16ea1d064a152 SHA512 8b7c565857b47f585fa4059e99087efdbf1a88cc61fc2370a489ebf6c46e3a1271eb23b2173354054c82317ce7305d9372f6d05afd4749b0467635030cd5ea1e
diff --git a/app-text/mupdf/mupdf-1.14.0-r2.ebuild b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
index d6f2331ad669..0200aa416b3c 100644
--- a/app-text/mupdf/mupdf-1.14.0-r2.ebuild
+++ b/app-text/mupdf/mupdf-1.14.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X curl +javascript libressl opengl +openssl static-libs +vanilla"
 
 RDEPEND="
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index e52175872e56..92ad807bff84 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,10 +1,6 @@
-DIST pelican-3.6.0.tar.gz 773887 BLAKE2B 9e0827a13fc1668a718c69604c29832062d69db36753f248c03572b46490a57abb2cdcab84881b308792c7c9f1716665b12be7bdcaf878afd0f5d5d049c9d385 SHA512 7c4bcda6155b363d9e0d31d1763f20f9e3a3e9c5cd250ef4ce02305504e910c3ad61b3ae4ab909d1bca51a46102fe59583a6700f5a32a14d0c1cde47507db3d0
-DIST pelican-3.6.3.tar.gz 775060 BLAKE2B b4e2ab53f312f4a6f0a3398dd07512e9e51f3f780dae47a7a2405f36ac81149eb336e8a97a7898dfdec9d27938acd57ebaa19b4d9f928f7c714cb9b85108dda6 SHA512 8bd8fcb72e67955d9c267731f74905417174d0767ec159d9b141e74aaa3cd8ee095270a7cc30847c413c702944df0c0b974ff8e98c55aa5004c00dbc55eadb16
-DIST pelican-3.7.0.tar.gz 784432 BLAKE2B 34aac3c79fb4f9417132209ba2decb75b52aab80efa7a1770650422e283fe1801aedc68a84f2ec8ee36e3b3df67b0582ceb2062bf3dca2ba109bf76a8f462e06 SHA512 e4b8a771737a8f6fab109b0f4544229f09141f38210b502f605ae449be7ba12bb43db6637592d2e9060255e923f092c6cfe8dc7bbeec1431d5b625f3a9b8222d
 DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c96660c2a34137a425f879688822ddc8bbc19805444bf2b49369c3dccf8a5303748ff9e7cbde3910d6ba501652 SHA512 9e04e6a2009cc134f74410d8c8349831467192e7524287e23cad0b68232f2b5dd04f5d98505222d71eb3441e466bccec1cafc7f6e3c6bfcb4c5e57e4ab0fadda
-EBUILD pelican-3.6.0.ebuild 1219 BLAKE2B e21a02d18a47ee5d46409e35e09ae7f76fc969264560e856b165a25f6322bc3625e393b9df834c8d294e333dba60c6a45fc9500abd7d9838790620148abe12e1 SHA512 ed51abdea2e38145275804b672b34f5f1dca3b9675b84976b120ddaa6b2b150b06bbc0f5e7be15210d8d656089c7a5d23dbed0fb666d17c1affe839f3c4aab28
-EBUILD pelican-3.6.3.ebuild 1542 BLAKE2B ff3c6bb148c000677a9d322e23cc4a94d192598e7cfdac029a88a7b43a0a33fd75da616f7ed1887494eb48a434e5201884034d97bd756b88699707cbc9701764 SHA512 f52d04c4d7c1660d034fe4ebeef6bb99dc0853463afc812cae53ef755ac1f7eae35404a852570fd82685c865bf63eb2a8e6ad896e4bb6ccd7471b5020bf7f401
-EBUILD pelican-3.7.0.ebuild 1471 BLAKE2B 3c456e5348ec3e8de5b4cd0cf08266f525cabc42c98fcc206550c7f11d1f7a950daed077fda5f5cb2a25d87bbc78a93da01cd2563a3a0189e48e7609f0e8d9d7 SHA512 03823597ac2356e0c2946c15c18ab5dc544bc6f789797c6044d7c2b0aafea03954ca5f6697274b31df1e5c7020f2bf95e6a7217025a5da1a23622e7e72e827f7
+DIST pelican-4.0.0.tar.gz 1314626 BLAKE2B 18924209949b43063416f2e2c6e22a5524a36bab79a801f7cc6953c0822beb1bd5b05e715f5bcdb7c4877aba8d7a62cf4276e8abc43406f3c6fd7af8ef0c7c2f SHA512 5d98f5e13e6dde6b27cc299f9fb166edec79efb3fc53b29567218e0d0ba164989ce51830029ec8359697bc039661f6b0ced8d4155105e29098c038840c97d253
 EBUILD pelican-3.7.1.ebuild 1475 BLAKE2B 9d2de4c9d95c66c4f58fec74ef8b8ed5d804539edf66684c53c00a2b668316fb0752ff612eea3dca024f7192a91d6d99a4ffa4b99b2dd00f532e7bab133d898c SHA512 4df5e139aec385af52f994e83ea8250eb73625b24fcf17a7dc344c0a57f87733d15cd0e5ae53fd1c8ce62e28e84c1e2c0960537cd524780382e17d9b5179f268
+EBUILD pelican-4.0.0.ebuild 1490 BLAKE2B 3fc5dabb6d210511ea296a2090b5a6b4b51fd8568296e77aa6f523e5f6fcaa38d3c0dcab7a5a413096fbd9de430df9ca45491d7d175031382e5adde61a3bd0c6 SHA512 9c266a6e0bfba42de95ab268a9cea7397f088b92001063a5591cb1680876317664c0eb3028abbb26c61fd8991eefe5db6841f7156b2495f161c042cc0d2e364a
 EBUILD pelican-9999.ebuild 1552 BLAKE2B e2ef90c3d6eb63e1e7e11f62b0605ed4d93a4d654a1ba3c0fe7a8a07134dac21e60f11059802346512419188e013cd141d887f08150166d55f6e4132270d5e42 SHA512 666fad2f7b97bbb8ec69b1b56cc1d5d1da1113af11588696e9ef35b1a375341c7bf89e49c1a01ca640d3ffd54fcaf60040c2372b4eb7f6f4346680b9eca7d7db
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-3.6.0.ebuild b/app-text/pelican/pelican-3.6.0.ebuild
deleted file mode 100644
index f6c4eac0245c..000000000000
--- a/app-text/pelican/pelican-3.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples markdown"
-
-DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
-RDEPEND=""
-
-DOCS=( README.rst )
-
-python_install_all() {
-	use examples && local EXAMPLES=( samples/. )
-	distutils-r1_python_install_all
-}
-
-# no tests: tests/content not in tarball for 2.8.1
-# for 3.0, should be based on tox (refer to virtualenvwrapper)
-
-#python_test() {
-#	esetup.py test
-#}
diff --git a/app-text/pelican/pelican-3.6.3.ebuild b/app-text/pelican/pelican-3.6.3.ebuild
deleted file mode 100644
index 306df4f67c47..000000000000
--- a/app-text/pelican/pelican-3.6.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples markdown test"
-# Tests fail for this release but are fixed upstream
-RESTRICT="test"
-
-DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-DOCS=( README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		docompress -x "/usr/share/doc/${PF}/samples"
-		doins -r samples
-	fi
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/pelican/pelican-3.7.0.ebuild b/app-text/pelican/pelican-4.0.0.ebuild
index 826b9d76db6f..568df33717e0 100644
--- a/app-text/pelican/pelican-3.7.0.ebuild
+++ b/app-text/pelican/pelican-4.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples markdown test"
 
 DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
@@ -31,6 +31,7 @@ DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 		dev-python/markdown[${PYTHON_USEDEP}]
 	)"
 RDEPEND=""
+RESTRICT="test"
 
 DOCS=( README.rst )
 
diff --git a/app-text/pep/Manifest b/app-text/pep/Manifest
index 88fa4549ce7f..218fd22f5246 100644
--- a/app-text/pep/Manifest
+++ b/app-text/pep/Manifest
@@ -1,5 +1,5 @@
 AUX pep-2.8-gentoo.patch 521 BLAKE2B f5dd34e1e46c40986b74e0707ce88fc2d98b6ffb8361af44c50f025696ee28fd60883faf0016b92b7f9dfab0eae0870a62a6e611ec1f727578944fee0241eba6 SHA512 f25ee35964b158dfaa22721f28f01ebcd90bca963a8564926c6050014c4104f9aaea5cf6594028d7700d8a13c95c336dbd95ea05fff9ba05245937a725d09ccc
 AUX pep-2.8-include.patch 239 BLAKE2B fd411d4e3753314ae93634bd24093524f364b1603671149722d31fb42e70977e3c97a76a2902a891aebd4e0f69632c5cd6da7996732195cf4a2d5005f5996fd4 SHA512 980ac8e710b2c0213c9ab6cb298274ca3eef21fdf9cd980e62530b98e913784cb5346fc13613b9723eaa6352383d31079d74749e21ac322edde86863344eff80
 DIST pep-2.8.zip 84665 BLAKE2B 529ce27e819e1f4aa683516b71e1b391169647dc477980db5e6f334559f265f6427d20043edf42047286c46724cba578a961a305bfecd24cd72692ebca061e6a SHA512 553efb3f6ca113d96313cfaa7efc7142e3f87d1eb746478aa5f112bb09d6e5d863cd8fa2a34d866777d6724b525d9b94a0978842afc6198fa70fe59c2a8d1169
-EBUILD pep-2.8-r2.ebuild 1057 BLAKE2B f192d99476a8444d8d2de1e30949de228678bf9da452731871e247a5703a6c5bed4ab8d5638ca1814de11fc795620c613e1c44158c7b348a4a02af46a1fa7901 SHA512 1fa3de815352fcee977ce021c4061e6f19be2a1e6f29abaf6d79bb151cac151b643cd3b3f9a414ab5c2c2ebed2e347c1d68f15acf92c40f59390a539e92cabce
+EBUILD pep-2.8-r2.ebuild 1056 BLAKE2B 55a4841927fb134f6875b02d4c022475225128b0ea8a8ae79d422c7cd27f1678c0e2fc871b94be00311c1d063679f188a4e9fa8f873323397680a5b3127bfaca SHA512 327fd2c41d1d63f2fd336955be8a4abfa84319ef2bea1161d57ce7c6c74b6edc5e9777f3ff9c4e95ae407d2451b0349972d64e9ad823756876ad9d2777f4106b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
index 27ea8d3bc0a7..f1864940b8b8 100644
--- a/app-text/pep/pep-2.8-r2.ebuild
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,8 +6,8 @@ EAPI=7
 inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="General purpose filter and file cleaning program"
-HOMEPAGE="http://hannemyr.com/enjoy/pep.html"
-SRC_URI="http://hannemyr.com/enjoy/${PN}${PV//./}.zip -> ${P}.zip"
+HOMEPAGE="https://hannemyr.com/enjoy/pep.html"
+SRC_URI="https://hannemyr.com/enjoy/${PN}${PV//./}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index f5440792c342..164d20f6d399 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -4,6 +4,8 @@ AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc2200
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-0.71.0-respect-cflags.patch 1188 BLAKE2B 5bd8f4a66a8e0094ed02bc36f8c56fae4a34f470551a666767a5ff82ec23b387b31228fe8ca8ba3727c67211fc3fdd66bd6ba4719320a5c6f86f3858e1eb19fc SHA512 764f0d0264fede2812cd6630d744fdbf5e258616e90fc01f67f6a3a0f31ae64e0680def9768764efd890187c78cb4a1ad73556d5b138dbe187aeb955a02f2700
 DIST poppler-0.74.0.tar.xz 1514044 BLAKE2B af3821d5a5c68a3f2541cd9468fd7318ad0182cda66cea068dc42208fef6c2af78a401e50a6a5906cdc943de7339620937ddc6f69f0d8d1b15082aabc6cc3482 SHA512 4e48e2ffb559863ee693930db3b8594fd7e60e4b4ca3cdeb198faf90a6f4dbb5e102461492a12058221bc1218fe7e17c9085afb9e7956ae4bf26c11674315e66
+DIST poppler-0.75.0.tar.xz 1523872 BLAKE2B 245f574e985570a1d0923e732da8694728506fc59382c9e4532159867e1b18ad9f03f6b995891796d72a6e401d2c86ac18403c9219bf533e36c8a07a1dc85d61 SHA512 6a1b76cc5095b7c5809eaa5072aeb4ea615744ff8ffce537f40a3f73a81fc12cc18d596876ceda1c78b5312ad20535f72366e69c861b620d108616f24a98e6b8
 EBUILD poppler-0.74.0.ebuild 3515 BLAKE2B ece68c444171e98859d712870d0611b9f2c49d4fc46b181d383253fe62aa64e4a1f4bef87c7940f103e878c722d4b29dd5f137d2a199da2cd0f86459cd313a62 SHA512 9ae8a8e2860129702bc3f03b0e934c7f3484c57d3e41fa2a2defa7e97c58d885cfc195289d5e2fd5ffdee809433452d4c9f7d40856d66366ca3bb9318ae038e0
-EBUILD poppler-9999.ebuild 3526 BLAKE2B 8082c82df3dad31bc098df0e0625fb253a1a462bfa8ed4c15f738a251c1d68f5a37e364154b43405b9a807fcd25072e560bdfef540aa398084d9dca92000f2f4 SHA512 adef5d41e10c65cebd85f43921969e1ce30d9f121408ac9132984753701700fdc21b478798dffdab3e4ee8d5b426d4587ae01d2538ad689efe0c484877605f5d
+EBUILD poppler-0.75.0.ebuild 3526 BLAKE2B 519a0db97078b67ab704ed6bd9e1e264f877949b67fe014bfcf84ecc239d4f92b7060592bb44f31f519406b31031a8f00a53829da8609d8f833cfcc0cb9ba75e SHA512 d688ba1d78aeca0c0f6d5c406d0cc714911ad9cb57544544757675fb5b3771b8b4bb2a9cfe6571d601ad2b85fade836bdc14d7518b3ecd883f023fd225c9ab3c
+EBUILD poppler-9999.ebuild 3526 BLAKE2B 519a0db97078b67ab704ed6bd9e1e264f877949b67fe014bfcf84ecc239d4f92b7060592bb44f31f519406b31031a8f00a53829da8609d8f833cfcc0cb9ba75e SHA512 d688ba1d78aeca0c0f6d5c406d0cc714911ad9cb57544544757675fb5b3771b8b4bb2a9cfe6571d601ad2b85fade836bdc14d7518b3ecd883f023fd225c9ab3c
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.75.0.ebuild b/app-text/poppler/poppler-0.75.0.ebuild
new file mode 100644
index 000000000000..4c97add33be3
--- /dev/null
+++ b/app-text/poppler/poppler-0.75.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/86"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.71.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index d6fdf5f55a34..4c97add33be3 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/85"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/86"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index c8b35cf16d66..0c73498298a4 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -3,7 +3,8 @@ AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
 DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
 DIST xchm-1.26.tar.gz 785338 BLAKE2B b5aedff3de1a3c79205f27b833e339fa24ac08710ab2c97199fdd10f5674ee7d4a4689e275d9f6df4b6eb34c60cf2d36c5938924c4c0d73e37c2a464a1c63695 SHA512 8ed0281a2b2969f83d474b89e828545096b4ad9ece451cff2bdb602079751f6f6ca2c8f3c8cd79740ab0b4e5b2c3a3f8ce4e6f4985dc158b5d76007b7bc549a3
+DIST xchm-1.27.tar.gz 957753 BLAKE2B 84df84712d092a29692d287570f35893fb38a47f571f112093b6b7529ee5bceb22c439e7842377b2181f823bd069911c4889dc6ff794654d18cee589cf78e897 SHA512 82b003569307fc76f35acea51fe3d615601f185e084a9789b9757db60547d45af84428b63efbe645f9e20161815a1801d6a96a38c004cb1280e4ede35b02c014
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
-EBUILD xchm-1.23-r2.ebuild 1066 BLAKE2B a195970c160cc7216b1b4eacf079e33f8ed4391ac630eadd49fe60953858804dfe3003af5f4b493d9863bb1ec9750d05be2c30ffdbd8eae5900ab00011b094b7 SHA512 25d23d01ea964f0a924544d90b422dfba200ffb528c4ef0c1f2ef866df857936bc324969711b6de2ec5c609709b26c8b4ca9c9da94be84d7cd85127ca8f35cfb
 EBUILD xchm-1.26.ebuild 1022 BLAKE2B cc9f00fa40103bfd9792f081b7e425d9250dbe29c6188bd428fd2ee65cceeaba6a087680476f898a4e23051abeefb210a8406d2ccb81530a4f5e2bc7a80e669e SHA512 e533a82a1be1e78a3f30882abfbb1723a0328b662f81afd36490154d29a54e82cf928a9ca4a2bc9a5a74dd478a2554b9b3ac4e9cfb274e5e14b2f66f7e0d6c63
+EBUILD xchm-1.27.ebuild 1022 BLAKE2B cc9f00fa40103bfd9792f081b7e425d9250dbe29c6188bd428fd2ee65cceeaba6a087680476f898a4e23051abeefb210a8406d2ccb81530a4f5e2bc7a80e669e SHA512 e533a82a1be1e78a3f30882abfbb1723a0328b662f81afd36490154d29a54e82cf928a9ca4a2bc9a5a74dd478a2554b9b3ac4e9cfb274e5e14b2f66f7e0d6c63
 MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
diff --git a/app-text/xchm/xchm-1.23-r2.ebuild b/app-text/xchm/xchm-1.27.ebuild
index f7ee063880c7..a2c546cdaf3c 100644
--- a/app-text/xchm/xchm-1.23-r2.ebuild
+++ b/app-text/xchm/xchm-1.27.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 WX_GTK_VER="3.0-gtk3"
 
 inherit wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="http://xchm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
+HOMEPAGE="https://github.com/rzvncj/xCHM/"
+SRC_URI="${HOMEPAGE}releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE=""
-DEPEND=">=dev-libs/chmlib-0.36
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND=${DEPEND}
-
-PATCHES=( "${FILESDIR}"/${P}-wx3.0-compat.patch )
+DEPEND="
+	>=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+"
+RDEPEND="
+	${DEPEND}
+"
 
 src_prepare() {
 	setup-wxwidgets
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 2f0c05725970..43f6ce855e8e 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,7 +1,7 @@
 AUX xpdf-automagic.patch 924 BLAKE2B df4d7a245d8f710568d455660b29a81fd4d4dcfb21fccf60d5f2db959a7a2e2e64eb36cc7cbc0aea7e1cd21bdc6a11cb0ae7ae43e9293164ba5ef88685aa1653 SHA512 8bdeafe1553fea67b6d30afd1eb6e6abbd57f470a79b982b2b545fc91f12bc00c34a1639a05e8ef589ce1518886cc8de45c54303c4528c7e3d721ff624a0d27e
 AUX xpdf-shared-libs.patch 2286 BLAKE2B 63d668f5ab910ede26c85ec8fb379baa39112c0056ab61d3d8192447d76a5d455a3d3eb43ac1f0f3e275ed38d8cfaa56ed45432cf2f0d22a5eeaa63fa8e794e6 SHA512 560bf773fea8aed81678710aebb5733c8134ea7c088a761e20726c8758a98219c977a32437bd6f425271ed7c76a2742705074e11db108cb4bf71c0530b10276c
 AUX xpdf-visibility.patch 414 BLAKE2B 835bdfdbb39297859d1886a5ebd76bec23a8b8df744f627a475d8c00ae3cdcfe219ec039f00b7b6a7305e6c451399c422fafdea0599bf22d2ef34bd4912eae4c SHA512 a1f87523aeb657484181005b3e40a90eaaee2d00452bfc50bc23913d6e1e5a9117600959b3800e789be50f6d12d726f875caf02b73ec41dc9d98e1215b2e964e
-DIST xpdf-4.01.tar.gz 891150 BLAKE2B 6280bf9d4c17894a22e63d3fdbe3c67679657121196f84964c1353cb2f09348c38de327f7a6259831afb2ff748340c94196eec11b24a442c6e76dbc170d62ac7 SHA512 327d8bcf1f30a0fdbbdc33e2262d4e7de44f28a0f42cc87bbee6b2a8059d8cca8ffa715f7e810f9b53deb690bf9744ae5e8cf86a101941b8103100ded89e36e6
+DIST xpdf-4.01.01.tar.gz 891962 BLAKE2B 500cec4091f1ea4fda2008febcfbbe758663d26a1a2a9842abd8630c41a29f6f9fa9839a4b286a2d42e8d686d33084335ad7aa5775c1142cc196b38ef70914d6 SHA512 e0b42195ba4858ecf2ec3c3c06a42eae742eb8567dca695a45a01185b606b399b5e45d220b24ed39782d1f9b1ee16f674129db3346d25b709bbb3f90ef078c22
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab SHA512 1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
 DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34 SHA512 1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
 DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc SHA512 6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b
@@ -13,5 +13,5 @@ DIST xpdf-korean.tar.gz 526847 BLAKE2B e1640f6df0bc1e126b2e0f010403fc3ff068a8171
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.0.1.ebuild 3038 BLAKE2B 28561bb40f52285d6c4cab731624e87dff10694d4b8abbc435ac3648f275acafdf9fced9440e3c94fc1e9ca022dec86fc269535d5f25009ce09698911252053c SHA512 3ace4b1baab1a0fbb70b7bcf8874a2a3c1593ab0a9d46d018a7b2235964a2757673cc000b5729f0d8a0402f41ecb8fcb0f663f414d81c2f66f7a7b34e2ddd838
+EBUILD xpdf-4.01.01.ebuild 2985 BLAKE2B a7f1d05f66c6734cc67a0bfb7a6a6e8eccc49605d7cf730d28dbbd24d05e09513a5256d78de86f14e4d7b2f408d8108b9307be5e03d3e255eed65097c5aaffde SHA512 abaa47c209e377702777d8ea6ca13c4ad73651e80883f334672ce77e98792a33aa96f5a80bb522f3bef7c4f5209acb7dcc3e8acffe8c2756126d97e7ab281996
 MISC metadata.xml 899 BLAKE2B ec3658537d667032b6f725c70c6ad41dbaea8bf8a15e999bdc4d7ca2f2000542b1d6bf4f247c4d050b0c9ccf11c8a7abd385c496091facd2038b7e55be3783d4 SHA512 7be89c30dfb1644aebf07794f2fb0f26abbf921d6185ce6fed9c0f5c802704e5fc6cff9d9a1f8e59a0e6bdf27548f34eef3b8b130296c93b492d0110aa16e359
diff --git a/app-text/xpdf/xpdf-4.0.1.ebuild b/app-text/xpdf/xpdf-4.01.01.ebuild
index 1a243e175e9e..272214724007 100644
--- a/app-text/xpdf/xpdf-4.0.1.ebuild
+++ b/app-text/xpdf/xpdf-4.01.01.ebuild
@@ -5,10 +5,9 @@ EAPI=7
 
 inherit cmake-utils
 
-MY_P=${PN}-$(ver_rs 2 "")
 DESCRIPTION="The PDF viewer and tools"
 HOMEPAGE="https://www.xpdfreader.com"
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${MY_P}.tar.gz
+SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
 	i18n? (
 		https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
 		https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
@@ -50,8 +49,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-shared-libs.patch
 )
 
-S="${WORKDIR}/${MY_P}"
-
 src_prepare() {
 	sed -i \
 		"s|/usr/local/etc|${EPREFIX}/etc|;