gentoo resync : 21.09.2018

45 files changed, 480 insertions, 200 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index f8159698c261..60c1b94d3c64 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 50aa4fd0ad01..ce34f56c5689 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,7 @@
 DIST ghostscript-9.21.tar.xz 29164532 BLAKE2B 275e81e44585e186cdfd9f517d1ac77ec840c62ef01f107f6ec0131546c4a2b526000cbc4ba6a91b55eedb8f3783fbf831059d791ea441a484ce29dd5dd6af0e SHA512 cfea089b92fb01e3f7c18a9ce05e7165fc8b356e2914bf53b7f2fd9de672279c8b97ced07e983e619f0d4334ce16018b100cfbf0cc872c215a8cf2aff4c78731
+DIST ghostscript-9.25.tar.xz 33027708 BLAKE2B 7c6684898ef04bc5b6be8fec86adbf7b270107f4063b299175f5c08e5e7ace2468e1512a297464fda5695c830808916e6a0dd1202ca7e85b32cfd175d8cc2b18 SHA512 7a1c0b7546ed523f50c1452d4a1c13fcf043d6060fc9708bbc4b543f66ecb1b619b6e71998094ac702ef44a2fd159b6523271de19b1cae352981ef51fb637651
 DIST ghostscript-gpl-9.21-patchset-1.tar.xz 6196 BLAKE2B d2bccba582873d29c1724469af66a5aa72755d6ff73bbdadbf33e5eb4a2027c2cf14415319c3c3c6d03a9fbd9bad43e3bf7ef57eb7a3361305f6efb7fa550675 SHA512 58fef7080ca17a238231fb528be48f52bcfa771b1e496d7fede6df45fb927f1bb1c755cb77e02aa739295b0ccf0b3d3959f9a05a1628d32ffd11e134c0e0d355
+DIST ghostscript-gpl-9.25-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 EBUILD ghostscript-gpl-9.21.ebuild 5550 BLAKE2B 12dcddca96c1105b887ef804a1d7f6c6d5826691ee6e8ba525be77e65da82fa6f9910612ce84387ce9212c8ffffd3dacf4f10829256534582d7fb0bd09fc7cfb SHA512 b60cc50269906af827142897afb056d88a67e3ee10387d77a6b0b75d351bfb6239df41f9baa4e99d3d4f28ba38ea8849a282a0fc75e7aba25f2f707eee29f969
+EBUILD ghostscript-gpl-9.25.ebuild 5561 BLAKE2B 2ffc000083b14d57a215824798782566e68208b19960d96f5fb9dca0442ecb81ad614a44e995087e0ed07f97a3a24bd11de2ba93dcff2bb4133081e5ad6c46b2 SHA512 7d88cb1b753983dc98821941afe3757f8cf1b8db55edc0a7ff95b6a26552c4d1d35ade381643c4566530196378780d3c3a919b860157de4ef966e1aac3940e9d
 MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
new file mode 100644
index 000000000000..2d27fdc8171a
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.25.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib versionator flag-o-matic toolchain-funcs
+
+DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_P=${P/-gpl}
+PVM=$(get_version_component_range 1-2)
+PVM_S=$(replace_all_version_separators "" ${PVM})
+
+MY_PATCHSET=1
+
+SRC_URI="
+	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
+"
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
+
+COMMON_DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	media-libs/jbig2dec
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=sys-libs/zlib-1.2.7:=
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	unicode? ( net-dns/libidn:= )
+	tiff? ( >=media-libs/tiff-4.0.1:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/poppler-data-0.4.5-r1
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )
+	!!media-fonts/gnu-gs-fonts-std
+	!!media-fonts/gnu-gs-fonts-other
+	!<net-print/cups-filters-1.0.36-r2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+src_prepare() {
+	default
+
+	# remove internal copies of various libraries
+	rm -rf "${S}"/cups/libs || die
+	rm -rf "${S}"/expat || die
+	rm -rf "${S}"/freetype || die
+	rm -rf "${S}"/jbig2dec || die
+	rm -rf "${S}"/jpeg{,xr} || die
+	rm -rf "${S}"/lcms{,2} || die
+	rm -rf "${S}"/libpng || die
+	rm -rf "${S}"/tiff || die
+	rm -rf "${S}"/zlib || die
+	rm -rf "${S}"/openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -rf "${S}"/Resource/CMap || die
+
+	# apply various patches, many borrowed from Fedora
+	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
+	eapply "${WORKDIR}/patches/"*.patch
+
+	if ! use gtk ; then
+		sed -i -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			"${S}"/base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -i \
+		-e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -i \
+		-e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -i -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
+
+	cd "${S}" || die
+	# remove incorrect symlink, bug 590384
+	rm -f ijs/ltmain.sh || die
+	eautoreconf
+
+	cd "${S}/ijs" || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with tiff system-libtiff) \
+		$(use_with X x)
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd "${S}/ijs" || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
+
+	# install our own cidfmap to handle CJK fonts
+	insinto /usr/share/ghostscript/${PVM}/Resource/Init
+	doins \
+		"${WORKDIR}/fontmaps/CIDFnmap" \
+		"${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use l10n_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
+		fi
+	done
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
index b13052cc7ab4..79c0a28cf11b 100644
--- a/app-text/goldendict/Manifest
+++ b/app-text/goldendict/Manifest
@@ -1,5 +1,6 @@
+AUX goldendict-1.5.0-ffmpeg-4.patch 6184 BLAKE2B 17b8bddeab5bbb6e373c3ee3bfda695ddd363ec733955364b3973f9538cc86bfa5907156704444e31d0c1a99768ff5cc2b577ed2b129100dd1273bbeea1f1eb8 SHA512 596e7ee22e210978ec1f787fd1bb6051f7f9a4d4eb88edb7af40d2e3ba9e66403edb932876a6738c0471c5fe439245e0de61e3c7b57039e0dfd0560f20fd5b8b
 AUX goldendict-1.5.0-qt-5.11.patch 1532 BLAKE2B cd6869c59d2afef21d92660173516b56a880cd245e5b928096d9d3d6e8e4fc915694a5dedd762400be091dca6a86fed2b553ce11688e84117ef4653ab1124ce3 SHA512 25721bf8cca9e0abb3f04dd912520577f7c3a31d34883887286476895263049495e3286c520549409ec8244f99b632b4a76f0ce514b8509e5e16a12adc3a5ac6
 AUX goldendict-1.5.0-qtsingleapplication-unbundle.patch 341 BLAKE2B 7f5b2c715d41d50d358a8cca5f259f8b70266b9037dac9f5f6c9c0b1323b46cb42f68fd73725a6f25903e35a83582b32015b3401f1aa3a8f9c8bb1a05c54b531 SHA512 86a08b1333a61fee7559028f68779f45cf17da6f7e6f3ea9cae46184279469b91e38f825ad072e0557bcd4188b87fe8f0bd696c4819e3bc96874439d1290e5a3
 DIST goldendict-1.5.0_rc2.tar.gz 19413751 BLAKE2B 17fb0140e6ce392800a05d36a41f2a42c813990eaecabf55f765d5583118be694e66c5438b90e46853070a782086422b533b0f653461dd81cecd23f2deec40b7 SHA512 b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
-EBUILD goldendict-1.5.0_rc2-r2.ebuild 1747 BLAKE2B 9774eb0235bd86e8827ec94d8ce043fce8870196bf3fd2dba88be071a3896fc4a7e8d02f30c4a831dbede01fb5564e8d0f568df9ca8fdf2e94334389dcc17179 SHA512 0a739ecc1364da46cb13d87e7234609b249d45cc62bfa5735f74f400dfab10c28ae7f916f6086eac00bc8549c0dbe3e130cd68f7b52c942734ac5da992c202b0
+EBUILD goldendict-1.5.0_rc2-r2.ebuild 1789 BLAKE2B 1336c76cdd434f701374c8fc136fd486fb768c2435c5e9b2f72471a5a7a21bfc03fdba31d10950da3d6adeb1c9452f925890dc33bdc09a1854726ff68e030026 SHA512 d291a55bd41e6fd832c879801f9a3506e775139cb55315b57ed5dbe133bc188a18274fd37c82d08c52f2b484b54957c92ca7d145f5d12b86823a568a5e016d61
 MISC metadata.xml 388 BLAKE2B 229d847f632fe3da3df10913551df5ee6ee386768c52aef7c436336476c7e837272decbe34a7e9322504e6d97e7319afb61815539494ef5faa8c93411ce7215d SHA512 c9be98ab768c3c13ff4b03336fc90314ec0e233d0860501d85b5c65250965d994a3f8ab4cf8f58cee3da27fdc37964c10854bc66b9cc16e5f558f0b7a4a39f42
diff --git a/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch b/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
new file mode 100644
index 000000000000..6e6d03675a4f
--- /dev/null
+++ b/app-text/goldendict/files/goldendict-1.5.0-ffmpeg-4.patch
@@ -0,0 +1,167 @@
+From 03bbe01b79a1f07a6780cb60f23a087104c5d77b Mon Sep 17 00:00:00 2001
+From: Abs62 <ottomann@yandex.ru>
+Date: Fri, 30 Mar 2018 22:53:24 +0300
+Subject: [PATCH] Fix warnings while compile with FFMpeg 3.4.2 (issue #978)
+
+---
+ ffmpegaudio.cc | 68 +++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 62 insertions(+), 6 deletions(-)
+
+diff --git a/ffmpegaudio.cc b/ffmpegaudio.cc
+index ed1172bd..56e8f788 100644
+--- a/ffmpegaudio.cc
++++ b/ffmpegaudio.cc
+@@ -91,6 +91,7 @@ struct DecoderContext
+   QByteArray audioData_;
+   QDataStream audioDataStream_;
+   AVFormatContext * formatContext_;
++  AVCodec * codec_;
+   AVCodecContext * codecContext_;
+   AVIOContext * avioContext_;
+   AVStream * audioStream_;
+@@ -114,6 +115,7 @@ DecoderContext::DecoderContext( QByteArray const & audioData, QAtomicInt & isCan
+   audioData_( audioData ),
+   audioDataStream_( audioData_ ),
+   formatContext_( NULL ),
++  codec_( NULL ),
+   codecContext_( NULL ),
+   avioContext_( NULL ),
+   audioStream_( NULL ),
+@@ -143,7 +145,11 @@ bool DecoderContext::openCodec( QString & errorString )
+     return false;
+   }
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 56 || ( LIBAVCODEC_VERSION_MAJOR == 56 && LIBAVCODEC_VERSION_MINOR < 56 )
+   unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + FF_INPUT_BUFFER_PADDING_SIZE );
++#else
++  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
++#endif
+   if ( !avioBuffer )
+   {
+     errorString = QObject::tr( "av_malloc() failed." );
+@@ -186,7 +192,11 @@ bool DecoderContext::openCodec( QString & errorString )
+   // Find audio stream, use the first audio stream if available
+   for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
+   {
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+     if ( formatContext_->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
++#else
++      if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
++#endif
+     {
+       audioStream_ = formatContext_->streams[i];
+       break;
+@@ -198,22 +208,38 @@ bool DecoderContext::openCodec( QString & errorString )
+     return false;
+   }
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 33 )
+   codecContext_ = audioStream_->codec;
+-  AVCodec * codec = avcodec_find_decoder( codecContext_->codec_id );
+-  if ( !codec )
++  codec_ = avcodec_find_decoder( codecContext_->codec_id );
++  if ( !codec_ )
+   {
+     errorString = QObject::tr( "Codec [id: %1] not found." ).arg( codecContext_->codec_id );
+     return false;
+   }
++#else
++  codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
++  if ( !codec_ )
++  {
++    errorString = QObject::tr( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
++    return false;
++  }
++  codecContext_ = avcodec_alloc_context3( codec_ );
++  if ( !codecContext_ )
++  {
++    errorString = QObject::tr( "avcodec_alloc_context3() failed." );
++    return false;
++  }
++  avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
++#endif
+ 
+-  ret = avcodec_open2( codecContext_, codec, NULL );
++  ret = avcodec_open2( codecContext_, codec_, NULL );
+   if ( ret < 0 )
+   {
+     errorString = QObject::tr( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
+     return false;
+   }
+ 
+-  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec->long_name,
++  av_log( NULL, AV_LOG_INFO, "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
+           codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+   return true;
+ }
+@@ -252,10 +278,13 @@ void DecoderContext::closeCodec()
+ 
+   // Closing a codec context without prior avcodec_open2() will result in
+   // a crash in ffmpeg
+-  if ( audioStream_ && audioStream_->codec && audioStream_->codec->codec )
++  if ( audioStream_ && codecContext_ && codec_ )
+   {
+     audioStream_->discard = AVDISCARD_ALL;
+-    avcodec_close( audioStream_->codec );
++    avcodec_close( codecContext_ );
++#if LIBAVCODEC_VERSION_MAJOR > 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR >= 33 )
++    avcodec_free_context( &codecContext_ );
++#endif
+   }
+ 
+   avformat_close_input( &formatContext_ );
+@@ -356,6 +385,7 @@ bool DecoderContext::play( QString & errorString )
+     if ( packet.stream_index == audioStream_->index )
+     {
+       AVPacket pack = packet;
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+       int gotFrame = 0;
+       do
+       {
+@@ -370,6 +400,19 @@ bool DecoderContext::play( QString & errorString )
+         pack.data += len;
+       }
+       while( pack.size > 0 );
++#else
++      int ret = avcodec_send_packet( codecContext_, &pack );
++      /* read all the output frames (in general there may be any number of them) */
++      while( ret >= 0 )
++      {
++        ret = avcodec_receive_frame( codecContext_, frame);
++
++        if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++          break;
++
++        playFrame( frame );
++      }
++#endif
+     }
+     // av_free_packet() must be called after each call to av_read_frame()
+ #if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 7 )
+@@ -379,6 +422,7 @@ bool DecoderContext::play( QString & errorString )
+ #endif
+   }
+ 
++#if LIBAVCODEC_VERSION_MAJOR < 57 || ( LIBAVCODEC_VERSION_MAJOR == 57 && LIBAVCODEC_VERSION_MINOR < 37 )
+   if ( !Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) &&
+        codecContext_->codec->capabilities & CODEC_CAP_DELAY )
+   {
+@@ -391,6 +435,18 @@ bool DecoderContext::play( QString & errorString )
+       playFrame( frame );
+     }
+   }
++#else
++  /* flush the decoder */
++  av_init_packet( &packet );
++  int ret = avcodec_send_packet(codecContext_, &packet );
++  while( ret >= 0 )
++  {
++    ret = avcodec_receive_frame(codecContext_, frame);
++    if ( Qt4x5::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
++      break;
++    playFrame( frame );
++  }
++#endif
+ 
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+   av_free( frame );
diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
index e25c25eb0628..866b4e88ea6c 100644
--- a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch"
 	"${FILESDIR}/${PN}-1.5.0-qt-5.11.patch"
+	"${FILESDIR}/${PN}-1.5.0-ffmpeg-4.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index dbcf0a47ddb7..1e389de98f8d 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,5 @@
 DIST gspell-1.4.2.tar.xz 407356 BLAKE2B f2ee6ae43be55e8ad7253e10893868a8d7857bbe41e14d71103b27a0faf40b0ed247e9fa38ed7bc75039fe0f1f600fe739f538d50f69fb063d0932df6c0b1c27 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
 EBUILD gspell-1.4.2.ebuild 984 BLAKE2B 34d49bf58ed3d59cbb94f95739fa8e03985f3e93be328251e5f1a080ea2e0eec734e9ab036e096f37c873da24c4fdea98c09b98bb010d9c9fc7b455e6ef7ad74 SHA512 43c47b3b112301aa1876e805999bb1631f6add794a7ab68d5ba162f7d12b741fadf2486458294f4b2b5bfd78f3143d9f9ca16631ba8020aad92ff1fbefc2cd92
-EBUILD gspell-1.6.1.ebuild 1006 BLAKE2B 411c9733da9d9c1b391fa9b1870a3e5cfcba4e87ca7d7ed921c735568ae93e155164e2b014e20d9b0eaa64abb50e28541611308720b2653eb47b794808254505 SHA512 dd4c5aa2efeb64e726baf14d4797a06d344d9f3f3872eb6caa2fb300e4070d3c3ea7bde773b6474c4f253e907491504b88132a474ae46bfb7b814e9918740d9d
+EBUILD gspell-1.6.1.ebuild 1013 BLAKE2B 88c7afe164ee3909fd779cd5f66d417b5315d72c60911f41556c0a0b38b5d67d300949f147d5eef4bb450f7b830d4d947c6670b9e07c22eb1c49890498457c1e SHA512 3e16dd138639cba06d4a6edb08b80767e43d63cbb411e01a2be8f3e084135946332acbf442d2b23d5b336f24c62b423aa092bd1a4aea79c9682382ee38e49165
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.6.1.ebuild
index 483713d17e13..c47de38e8597 100644
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.6.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index d0e8fa52bd3c..167d671c593d 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -1,3 +1,3 @@
 DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
-EBUILD libabw-0.1.2.ebuild 851 BLAKE2B fd94404dcfcdc39a0427bd7e79b5bf2fb97e7bb3e784b38077ad6293cffaebf1c7f16d1f87a2a2c9f6e0300ff4bc12e00d98d6ef80e301d4797427375935bda0 SHA512 4b12c64971db94eb5bb43d7f55e84e4b1c250beeb0bf2da92baf43f81843ad58dd4eeac3d7d292f88c6c0f7ddf3c86296cd24f6c04bbe3c15badc04261d25bc2
+EBUILD libabw-0.1.2.ebuild 858 BLAKE2B d34d26962595d570d4fe4b654ccc2f53839af6dff1225e588476c31a13bbc285b5f168ab8b145f52715816c7baa5d2b9af8a8039d9e695f371462489b6418882 SHA512 0d086a178924935848828d4e3805c8c487a9e8f0ff872bbc8b103d504d8b596b7229a35aa3816aa174ddfe7959789264bc02418d723f4b78285e1254dfcfdee9
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
index 9bc7f96f1b3a..99ad555c2b0e 100644
--- a/app-text/libabw/libabw-0.1.2.ebuild
+++ b/app-text/libabw/libabw-0.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index a8da783c4d10..595844547d40 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -3,5 +3,5 @@ AUX libebook-0.1.2-tests.patch 784 BLAKE2B b7f2aa5b5abace8fb1276c534ef564d8e088b
 DIST libe-book-0.1.2.tar.bz2 465922 BLAKE2B 11898cb34d41a6abbf256ed8a7ff44006f239616987ca5883a8a611041bcda2cce221acc00c57cd36d94f8c26510889df3206ca4f071c23ae272262938e2c396 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
 EBUILD libebook-0.1.2-r1.ebuild 1079 BLAKE2B 8f7c519b161b6fdb8d6f0c55294fc2de890ad0d16086146b1316ad3794422d69117994359a4b669d2388eb905531f62cd7b89337f7a256b36b4dcb2d0d00f4a3 SHA512 2ec5e9b00df55ba2c20c901f2512fabf5b3aa5a4ec8812f24fa83a162dbc164f7f86c658e07b850c8ce9f58410c5ec227e45c51400fcc04a7ad4ac5830cd310f
-EBUILD libebook-0.1.3.ebuild 1011 BLAKE2B 657012ef4e1833134322c0ea33aa9209788eb66d0d47a58a84dec199e2565dbd2023b17c8bccfd1a76c43b3b4a8de075ea353b2fd9d5a47457a595a487757dee SHA512 30dd8d31108744cbd2ea71b863a3789124d47680cca93fc83c7bc27bdeb92de20f4934f277eff50c233b339d77c125a7550c61856e059242b4d1234e4bc7efa9
+EBUILD libebook-0.1.3.ebuild 1018 BLAKE2B fc52e8c376ca1ce72502b752f0feb5817e7e165c926860989e04645e658992502942584d6aaa7c9a156ff5b82329d8d8631daef0579ece9839fd75e273765c97 SHA512 97db9fe34881c30583a616470212182e7553c475c8dae1999555b85519318e55cc6c4e15d25de4678ad1681b6897edfbce89b247f01d8234f8f8a161b308b6d9
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
index ecfbde86e9f2..37b315119bd4 100644
--- a/app-text/libebook/libebook-0.1.3.ebuild
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc test tools"
 
 RDEPEND="
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index b2baa312733e..04fde756212d 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,3 @@
 DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
-EBUILD libepubgen-0.1.1.ebuild 711 BLAKE2B 8aa60a1e03391e83c2c9f443a948dedda973c4c0bc96e6124466bf0a21c228b846c01394e0cc3a074d8b81b36142a120bb20aeeb44a74f037391c013e723f315 SHA512 c297adfc8e10f33a760053b3d763916cff52e4683cfcaafb2e277b69cce1efa0c2d7b3f5d69a084ef82778564d067e666411f71c6b1e7e399c1ee5be487b70f0
+EBUILD libepubgen-0.1.1.ebuild 718 BLAKE2B c0cce96af57e952fba18766c1aaa4a127909b50c721877439b742d403e20869d2beb6796f7b741e88696a754f31270496e10bc0a3dce2686e568200a74e518f2 SHA512 c88f740e0b65846d749de01550e180e0d735cbabc6883ff9d187fe616e7b65a101c37c4ace2aa6af79b20adccbc9ae14af98c91465241f6d3f85149282b72865
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
index 49fb813100fa..fd9039c5978c 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="debug doc test"
 
 RDEPEND="
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index efa41b3e8460..60a794df43d8 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,5 +1,5 @@
 AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a633875157acbb4c1e727bc7bcf2a4f1af67197c1d9762a7aa6265e31357eead2baff13c28126d6f4bbc698a997f442bc58771b5b2 SHA512 edc407a4958befee95b53733b0c73bc8281575b53b8d2c65491eee6aafc63d775d3ce9d0a0578ce51cf8bc8f047a683bb0dbd8b79f2b1914dc5df6de64b835fa
 DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865
-EBUILD libetonyek-0.1.8.ebuild 1216 BLAKE2B 0a9fe54ab84331e8ee1f0e2e947ad636637893aa4871b46f93bfa990e4fef859041a188a79876bf77510240d4485c0f814eae48d6db03cc91e2fe801b07afc33 SHA512 a426c1fff4ef90b238f3fea32b4c5011573acfd1a385a514af74eb5d34a41711041460744902bcb63362799e474341a7c3ecf42f70972f7a027928d4b9126396
+EBUILD libetonyek-0.1.8.ebuild 1223 BLAKE2B a6b9d1b52b17ba30d2f5eeb1e3716322d69ac50a655294607b6e4ba0633ae2f35fc64b4ada3e9bbfaa02e93d9b0eb5719224c8d3b1ef8273c213fb424692096e SHA512 526520f569135e98351aaa12ff5a5b2c45b6689cc0f54cabeae9c6aa593231bd0fb35f4ffd387ee449ad44b2e1f991ebd1038cea8872d78469189c2d1d77dc5d
 EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild
index fb11cfdaba0b..a3df8b9feddd 100644
--- a/app-text/libetonyek/libetonyek-0.1.8.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.8.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="doc static-libs test"
 
 RDEPEND="
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
index e2dfa50042a1..15280894e8e2 100644
--- a/app-text/liblangtag/Manifest
+++ b/app-text/liblangtag/Manifest
@@ -1,3 +1,3 @@
 DIST liblangtag-0.6.2.tar.bz2 766080 BLAKE2B e19599cb6445e40d21d4aec394ab3bcfe447badf096e8efd6e13caa48ce5cec832cb853f4924ce0204a747949506b49b05c175c2726fa3904424cc25b8dc9869 SHA512 812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f
-EBUILD liblangtag-0.6.2.ebuild 1156 BLAKE2B 77c6134d5dbcd2eb2fdd67c624a021a1ec55c64e51756d68467547a37c42946c01b96fc81add00281fc873d91873734c96546847ad77d2fd3e6650c0da02ca20 SHA512 e300c2810e739298e2700297e69bf3abaa795f85a7b580c466f90f5c9df6825e1ce43210520df1e98913671ee94d6567f3335d2cf39a5f19b76bb4853dbaca08
+EBUILD liblangtag-0.6.2.ebuild 1163 BLAKE2B 1ccfb778ac2d8d4af3e44cda82fca9337cc0b7ddffc6bba075d12a32a99f1c2ae21298ba6872ac751853816c0d1236535b0a5f1d98fdd4beceb54d48eca1b9d3 SHA512 e6e0de39f60be863bbd91d89809205c9e1ad4dbb49e49fe25fd9d9471b0287541ca5d1f0345c7e1df91df89397168227efacbf396767cacac194376a2b90d915
 MISC metadata.xml 349 BLAKE2B 3be7ff388f2fa95c460c034408fb159d9f7f2b17b4634027f73870018e672f330b3b0f9cc96fa372170bf2daa314cb087a9cd5794ab1e373449b4cc0762bda87 SHA512 dc4a715ede23108572522e1e6c7afd36b3c3359fe4145e5a02b45e7fc094f1633fbfcdf0d9c75955f75acb1487e438bb437a85766d7a06e628674447d5cf3d96
diff --git a/app-text/liblangtag/liblangtag-0.6.2.ebuild b/app-text/liblangtag/liblangtag-0.6.2.ebuild
index b55dd05299d0..eb4cac7ef1a6 100644
--- a/app-text/liblangtag/liblangtag-0.6.2.ebuild
+++ b/app-text/liblangtag/liblangtag-0.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 
 LICENSE="|| ( LGPL-3 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="debug doc introspection static-libs test"
 
 RDEPEND="
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index c7e346706232..cbf6be38a29a 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,4 +1,4 @@
 DIST libmwaw-0.3.14.tar.xz 1276240 BLAKE2B 34a5b118064dcac37834c83b2b5a61303f3e2eb70e41322845ff7661a5494c0b85db0bb07c6bf1f357c2027cab1c515eade58bb6b4fdf845a81d4d079a414b98 SHA512 6893a7a8a72765a66973a94bc7de8b3b6061aa85fd9cca5e73cb2a4024cbe81f0c030df0b6383f24835643259c361efda5527813bb84a1b08d0089d509215888
-EBUILD libmwaw-0.3.14.ebuild 1008 BLAKE2B 79af8a588f1fe052538abe54532e7ce53b2739158ffe523e750017204f0c9f2a41aed880b7443dc3ace78399d16bb6d3b2f3a15c569618bb690eefd203abc220 SHA512 35d1a89cac999df584c2586a7c8d14535c820d2d9fc47ea7f598f166752004520b50eab6e310cf58912a3072c7a8e66bf1de690775bc1211df312a6184bd6c71
+EBUILD libmwaw-0.3.14.ebuild 1015 BLAKE2B eb9a228a21d0bf53be7af47baf26458f1cea0c6a2e4f4bbff499533c9b7a9c226fe401bc112e4009972232ca2cf96846085cb2d9af0d37b62277b5c8e5478cf1 SHA512 58f7477e5af9f99a2248ec8f233cc5c1ec9d679c1f0a6dc4a278beb718140eb762c3c3a16cd43357c779b16b1341c2e843002a2559378022aabf7f92053caf75
 EBUILD libmwaw-9999.ebuild 1010 BLAKE2B caf4e52dadd33b6348da5ae194d1d9364fb972dfbd4ed05b97a639f835958857b023c3a0afa658288e616e7500d3ae62fa6ee7de213b656b3084cb96633dd4d7 SHA512 313ac932f39b04df8668fddc72004ab421bb6415ca90569cde318345c40512cea7fca01f546ff044e92d373b11f5441a90be178ca6e1bac12be6743a0e6faf46
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.14.ebuild b/app-text/libmwaw/libmwaw-0.3.14.ebuild
index c5222845e578..2a987a7876ef 100644
--- a/app-text/libmwaw/libmwaw-0.3.14.ebuild
+++ b/app-text/libmwaw/libmwaw-0.3.14.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 IUSE="doc static-libs tools"
 
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index afb8eaed2cfc..a17616d27127 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,3 +1,3 @@
 DIST libnumbertext-1.0.tar.gz 408181 BLAKE2B ceeba0a98c0d6fbfa92ad37347f7b7cb9887ea516126e35212d61e572a382a56c520406409e08024d53f1520219ec7e986324893b1c2b53330a217319d35ffc7 SHA512 b30f3650ba8cbaa771415026f40b7fc2cf5d9cd956a365d6654b1e2996fe61f714adfda845432e41f61f0fa474b1b60d99cc46cd6b7e42e1dccfd53f5017ae63
-EBUILD libnumbertext-1.0.ebuild 599 BLAKE2B 84589619a58bb79e7a845ae81bffc6a23542a7b78658a0ef310f20156efa662b2d847cbd232960e9a6a4eb7c72f7f6c79eb02f65541db4bad1b6c9f209c6bdf1 SHA512 8aed589c9a38371b3b13c17a1159fa0c739bbf3262a968b4fd03b081ee8d55b37ddd8eb3443b4fb883ae82c2968baa0e5eae9a12d19a408bcaeeb77d87c07e62
+EBUILD libnumbertext-1.0.ebuild 613 BLAKE2B fd5f9aaf06da104d4cc5da165b0ccfe10edc0f0768c93d9ebb646c774ecd173fe19d2788af71a98534c1c9381c5d24e22e3368defb78a9288b433ce0c5fa92da SHA512 2fb2bd3f82282b33c6d8513746c0ba9737447adf6c6704f625a3512d72f193ed31c829fc8f76dc9abe50bca84153f8a8f090e77118f91eec595c7b25c560308e
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.ebuild b/app-text/libnumbertext/libnumbertext-1.0.ebuild
index e8f54fa9d101..229b5a7e34b2 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
index 966db7bca6fd..71f88faebac4 100644
--- a/app-text/libodfgen/Manifest
+++ b/app-text/libodfgen/Manifest
@@ -1,4 +1,4 @@
 DIST libodfgen-0.1.6.tar.xz 359988 BLAKE2B 89ef70762780efa70ea044758d3c5e677024897bcd1f031c15544dc2e5cc0115bd286ca21051b8223768a2253eb681bdea534230c517de9c00a0a1f5b320eaf3 SHA512 bc5e6908ee14c576adececdf8a94ae01f2ed487e6f2490e41aab787e1e8f72a3fb2a786f51ceeefa327710af215741ce13bcf4bb3d99d2aaf403f568c5db75a5
-EBUILD libodfgen-0.1.6.ebuild 892 BLAKE2B 885e578968e244219c331f469725dc87bf9050dc803820292f8341089d8c37c70a43eb940b315abf1d20b8845e8b63e9e7026b7f5fe833e36b359201154e4b8f SHA512 2d1465998ba5e568fa4f79b86833936a67640dc2844d3fcd865879f1e9c5006345a5143827dab71fa30a3341fc82783798d2dd335165d13e3b55e18080dd233d
+EBUILD libodfgen-0.1.6.ebuild 899 BLAKE2B 2c43dc49dbab829d73b66ea4de39dd435746a5c4272f17ddec5c10f337749f0ee38ab957e3bd8593009e8d01735efc64bb141cd2662bf4bd9b99d7d2c8a627f4 SHA512 e0eff9df3cc4632153e8fe3b6187112d16ee0d631eea999ba661d6c623515fd18e831a8f6197decb6709e6639371af511cd589abe5b904f44436f7f5c53861bc
 EBUILD libodfgen-9999.ebuild 887 BLAKE2B bc6f0f5f96b318c45b51928dc79faf3184b7079ed310fcdf8ad53bb3d00c3f68e2634a218366f403664e60d5fe973ddc8b511c6fe39bba9415cc1627cb9bccb8 SHA512 801ff64c3f1fc23dcd53500a8cff20434bf4f9416d968df681961e82a72e0b8e96b97a2a10fbbd2fb7838e9437c61f24a218822d876b2df68d5a6e9d98f63ad6
 MISC metadata.xml 331 BLAKE2B 4bb9537b8eacb393e4dd38a4199d954aa12aa917f626ffd125cecb49c2fe4b4e866bc33c941323eae45c2b804fdadc1e7200a1dfe6f57472a5e1a7881bf68bc1 SHA512 f96053e0336bf862446e0ca96ca743a1b7fac4977e6d5d4b9781424ac33a3d89c3e4c334eb27a427d3f83c2c437e8fe4b0eaf4ed87513c3eeaae39a72db8767d
diff --git a/app-text/libodfgen/libodfgen-0.1.6.ebuild b/app-text/libodfgen/libodfgen-0.1.6.ebuild
index c966282b7ed2..b1617cd77829 100644
--- a/app-text/libodfgen/libodfgen-0.1.6.ebuild
+++ b/app-text/libodfgen/libodfgen-0.1.6.ebuild
@@ -14,7 +14,7 @@ LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc"
 
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 4bd817aead09..250786cb1295 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
-EBUILD libqxp-0.0.1.ebuild 739 BLAKE2B d4430fe59ef2c7a64a2d96a87354ae15cdb26849ae752927d87fc6c9aefd77a957c6104862fbb6689bc4b1b543e988068eedac682583c6cf34e5f14f80402a3d SHA512 42479a0ea9e024af42a40469a773c2830692dfa0b13b791f28cb29f5abaecab4766ce9debfae41ab6b41e21fc3464822618d09bc1c801ce1958bab0f39189fdf
+EBUILD libqxp-0.0.1.ebuild 746 BLAKE2B 442391082f776ce32a738301f1b979a21301b3db40fb8c7a5535c9e35bd7b913b189cfedb36c7bbab79bd8a1aaabdc4bba52c5bd90502996c0ce021f7203e29a SHA512 e51af28d5f65c24966d06bf89fac96bb8fb9b9c4a4b694692c6a1a35d544ac8e39b0be67c3e45551720f941488f4b7941211ed698fa2b29c3701cf2285cbe687
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
index bfa4a9fb2255..b3364e75301f 100644
--- a/app-text/libqxp/libqxp-0.0.1.ebuild
+++ b/app-text/libqxp/libqxp-0.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="debug doc test tools"
 
 RDEPEND="
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
index 9402cad2a353..453576a08c95 100644
--- a/app-text/libstaroffice/Manifest
+++ b/app-text/libstaroffice/Manifest
@@ -1,4 +1,4 @@
 DIST libstaroffice-0.0.6.tar.xz 706324 BLAKE2B 5ff692c85bb48a7cd4c1e05e0afcc3ab26d627254dcf0b4ba10314c6ec654d69e2910f031ec7b88c9d28c48fe6a7267cd2434d224dc980ad9e266273cbc65bfa SHA512 9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324
-EBUILD libstaroffice-0.0.6.ebuild 936 BLAKE2B 8a9333c389b67dfa59dbb587e6860553c941b8db99156f4750f205f3361c11e4c0cb589715b24f99566396c3eabb01cd4323739b101ff1e8b6c2379f21e01f04 SHA512 3e123fc5ad73485aa3efdbdb4b588b7a2ea65566ae8548b7ccb8e655a89de09616060777ed6cedc61d02cd123a0d24ae0fd89d809a242101a7fafd2e2c9ef4d9
+EBUILD libstaroffice-0.0.6.ebuild 943 BLAKE2B 3effcea72ead68060aa8ceec07ce52f8de1085d5ea37bb3911295752525bd2b169c0bdc776fe7aa95655d63450848ce157a5d456617a476632575f2f6e7d18d8 SHA512 678c5061783f45fe4871a01d33cb1183b9550bd4c0446c6b9a376e3cbcd4a48288a2e1338e6127c5ceba8811fc0ff4da631bcbc8b9ec102c19a7a6bd00f5711e
 EBUILD libstaroffice-9999.ebuild 938 BLAKE2B 11fc9d72cf695d1f5a5d113e1ffa1dbb93a9fe2e1d58ea560951566f80d604e3900d24c67c5ed02c54c5b6b8ecc1356b5fffeab9e5c3ba7408892146ca73e7ef SHA512 12a9e7e4a9555134c2a6950c80ee093f1fff810daaa3bff64880b04ece88d226e8e00eb55e2f76712bbc0a050b42ad03bf7a57ea60ed0e25345a37c85d968ac9
 MISC metadata.xml 469 BLAKE2B a9dad122953621001465506893edb9b72c1b1e7a213f0cfbf155a985595d7d319041d95030ea80411a6c21c97aea0a2aa891538f26f31f46cfc4ac6ceb75d183 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8
diff --git a/app-text/libstaroffice/libstaroffice-0.0.6.ebuild b/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
index 17d046f018eb..0aa7e20b8544 100644
--- a/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
+++ b/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/fosnola/libstaroffice"
 LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
 SLOT="0"
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 IUSE="debug doc tools +zlib"
 
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index 7d252cf491a2..ff1d877ff49f 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,3 +1,3 @@
 DIST libwpd-0.10.2.tar.xz 536400 BLAKE2B a4ed9b8c790898436e08afd0f571c4a4b31615228248116b24bad38d07df7837982df1ffa98b0ad442cfec417fc90eb089642b32e3a094323e75fb8fc7cb8da7 SHA512 821dbc0535ebd4fa41bcf984e344e11176862676c66abebe45cf4284f8de6e6cc7629f8a605b169d034a5c2f3e2461513d61e11e549ca73b8328eb66ac3bdd79
-EBUILD libwpd-0.10.2.ebuild 1304 BLAKE2B 667017fe4e55c22281724f6bcb6971d10f135f4a28c1599388d72fcffb1a6cc49d9941120f86d9f84c83a96dc26cb6d332ea0fc61b1032e46078eb5ac70d0bbb SHA512 3c2aef394fc4ddaeb66a437697c4cd5cc37f04d989f4e2a7d654b602b2c9ee13e2f3ce413ad61cac53567f8983326ae209323e989421977ae60b035182a0f48e
+EBUILD libwpd-0.10.2.ebuild 1311 BLAKE2B 72b68c00b543e90d9b0a4eb300b2e28d904466f226c442d4b21eea571c9df20fca884da5b1c2ae10bfdfef3beb68d99c60edbfdf4e90ce56241f17c62e0dc472 SHA512 9f07b6114ebe981cab729998325799f9bca04ae89d89601f6349839868a12ee506c955918cb3f976899fc313cf0dd5c10abe860f3797c8bf610055155ee33324
 MISC metadata.xml 402 BLAKE2B 449d3fa4ee2b0be84bca5eca7708b2e318060e7d85c84369ab16923edfa4bd3a19eed80b11d3cbd7c4d9a12e2d3d07df6b0aad95f011d1ce100fd9a6fd22206c SHA512 af33c7d44f5766cadb1955928210dc6f28171eef00cfbdd96a0257226bb7eee560fb05cf58673dfbbef932600ec3e8fafa666db3f9c3ddd2bcfa5a2a90cd77f2
diff --git a/app-text/libwpd/libwpd-0.10.2.ebuild b/app-text/libwpd/libwpd-0.10.2.ebuild
index 72fe00dc568c..4e53191397cb 100644
--- a/app-text/libwpd/libwpd-0.10.2.ebuild
+++ b/app-text/libwpd/libwpd-0.10.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86 ~x86-fbsd"
 IUSE="doc +tools"
 
 RDEPEND="dev-libs/librevenge"
diff --git a/app-text/libwpg/Manifest b/app-text/libwpg/Manifest
index 401d5d3e7ba2..94b45bbee858 100644
--- a/app-text/libwpg/Manifest
+++ b/app-text/libwpg/Manifest
@@ -1,3 +1,3 @@
 DIST libwpg-0.3.2.tar.xz 326840 BLAKE2B a32668671bf0f6a69555dea39a522fac65f7522d7fda5cc29b8d2588fa268f1923e959bb6aa75c6ed1d4c40dde5cf458577098e4662dcee769a449ae36f13229 SHA512 f3f76a17056274b2dfd11ce4eb451411d8458b00b3f7be4fae0a932a382f247adbaae1f4f8f6005e7b84f063e415ef5ab609015ba32f779c6ab2f0404b275f3f
-EBUILD libwpg-0.3.2.ebuild 1284 BLAKE2B d2a1421146f2b0151f4ef066dc56a0afa022199f7fdcac024eb80c4b2315902a0cee1981eb9e471937fe295c4ffcf90cd54cc1d748eed19775ebfc27873ac41a SHA512 10c37c3bc9046758d110594f43182c5b0a95ea63febce3a5aac282940d8c26bc698dba5c08bfba5d7b18b2aa26291d44bd3707a1b60671a25c07d90912248d5b
+EBUILD libwpg-0.3.2.ebuild 1291 BLAKE2B 38dd7c28f9483a83fc919b3bb40202241c6b4cc694ae20a077123a1a63ada5449fd73cd8cf78655834a1e99c3646fb824b6abc0a2974cadf7658306976797ad6 SHA512 fdbf3d45daea3e699264448ccf24d5365e03695c8cc8f5a141687cfec7605280b59a7b82bcad9141b3669039e434900f9cb932e398bdb9f7fdd72c52dde89ab5
 MISC metadata.xml 441 BLAKE2B c04d84af2f7d50d0c2ccf2b134b90de33ecd52a1be37e018c2c4ae071f0a54628b16c3da82398bddc4b9d53adff5f0b5da0356d12b9138b19cd4bcc7433a1255 SHA512 9725ace7bfceff2309f836bf01ab5da588f24da56d85e1130c098353e617945b820b7763cf0932e15e2b5d7ed339929fed26e8defc6a19bcad17235fe01bfc3c
diff --git a/app-text/libwpg/libwpg-0.3.2.ebuild b/app-text/libwpg/libwpg-0.3.2.ebuild
index 46042da23141..1ca82bb199ef 100644
--- a/app-text/libwpg/libwpg-0.3.2.ebuild
+++ b/app-text/libwpg/libwpg-0.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0.3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc64 x86"
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index dda640295ff2..69641e1d6a4f 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,3 +1,3 @@
 DIST libwps-0.4.10.tar.xz 695448 BLAKE2B ec26b6ccd918aa29d0df053b3e321b651e0c7142910009e0b50a89f88f4dba8f7e9e20f8962a7afb84497b533129d85eb5c7628aa7c64f2a57ce2976d5ff372f SHA512 e5a6155d9e59df226e72db5723ae7574d3f3fdc49bd64156e11f9d3715748fb919dd3d2ab83b6d5fb80c002e7d4ca12563f6ff80472a6485f374b037404acf83
-EBUILD libwps-0.4.10.ebuild 736 BLAKE2B e6a30583fcdcff03e9ac9e6e6f71d56e684b9a6d1153da8db145ac699c1dfb08e6064b6106bb1584457e26a2b258732a647c4f25f9a449550c1f9751894e8735 SHA512 7960629cc3bec49bfdfb1d0f3188704b6d9d28887c1ca1a90e70712c46d09a63b636d60004a5b8471aa946fbfa553fc8b3fc49be6b80e70416441841d8477133
+EBUILD libwps-0.4.10.ebuild 743 BLAKE2B a5bd0c6e8dc1160ebcc84e84c7106c79ba5ef155acdb990738d291b3eff8c22ef0c6cb6c2d98becfa2bab96109c818a03cf4bb5c3ab6538adc38510fccaee3c2 SHA512 32654eb9f678d48137657df634c3ce054e5128d8aafe3ec54fe00a4e28a962ba1202b910c93c76070ca8826632709e10fc8541cfd11ac408d5177fc737e9d773
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.10.ebuild b/app-text/libwps/libwps-0.4.10.ebuild
index aeb220bc8f7e..3fa616fb8cd1 100644
--- a/app-text/libwps/libwps-0.4.10.ebuild
+++ b/app-text/libwps/libwps-0.4.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="doc debug static-libs tools"
 
 RDEPEND="
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index 4e9393aede8c..aea39d097e7f 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,7 +1,5 @@
-DIST master-pdf-editor-4.3.82_qt5.amd64.tar.gz 14934502 BLAKE2B f93c756f9270b2857af02047c6ebd242d35ddaf23b70118d440c21cc7a0718937aa9945bb24adad6544e984f9390e9f49bfce5298bb8bc54f3c705372aff0fd4 SHA512 9bc6b056bdc8ce349dbab139f64c90948f3e0498918f07df6249fee2fad98a35b133aa7913e375366d062e134878feed0fadd097ab1d5504e97884ffa2c37b24
-DIST master-pdf-editor-5.0.36_qt5.amd64.tar.gz 16021838 BLAKE2B d46b9f6205e2832535060584a8841e3fa35d3b59c99a7fc2bcca5f913771633eed0d987a94141ef186b2077b65c781509b5f9938a033a5a856a9b0ad914bd5fc SHA512 31bae232d4629e10b29a4c7273ef7635bb7ec7cce9dc837355fc0d9aacc98943ec009eeac7b445f022831da8a2c400a7ce2b1de82b4e780d625ff49120e2a964
-DIST master-pdf-editor-5.1.00_qt5.amd64.tar.gz 16045580 BLAKE2B 89696a74d2df83836b1e9201d1bee8ba6a30a41f6a39664a975f9bbfb061b4536558d8746e24c57bfcb495f5324ed9d851471276f0da9f9f1d8caa454bf48c38 SHA512 a67d0668cb4c9daa0287af7bce4f24436c31b1636d29aed03503c0976c3efbc2df9ff34c2e65421e5e4cd3e184544bd78a4312b85aa6aee6af0cdaa18ba9c4a2
-EBUILD master-pdf-editor-4.3.82.ebuild 1436 BLAKE2B 5ebf8d5d7998d610a159eca9dacc66ad66aa8b959b1ffd0cd11f4756d38624c7e3593e68fe65231f305cc4bd1e8ceb61516627d78cc30b5290e81cbf2b2cd0ab SHA512 ae2bc92cc35985c7978dd3e93e1432c51441ce191aa24e697e88eca45a48fc30341b8a62652942635fc0ec0b27cab49cbcd439456bd007e8fcf5aafc04e1e7e3
-EBUILD master-pdf-editor-5.0.36.ebuild 1185 BLAKE2B 14925aa16121393a994074998193a4c18ee94f8bebf578c5367b8b0f104cd370a482a836944560ac15dbd2d33354a51ed76175168bf580b3bc3f36f3c0d74211 SHA512 b7c6b37b095f76b8972f76cfdf62be541377c4178c05a5c5d25359dd058d74d0468e474bba5cac883de65d82002fb62b64c5d71dcf67fef64871caf97f3b3c8d
-EBUILD master-pdf-editor-5.1.00.ebuild 1185 BLAKE2B 14925aa16121393a994074998193a4c18ee94f8bebf578c5367b8b0f104cd370a482a836944560ac15dbd2d33354a51ed76175168bf580b3bc3f36f3c0d74211 SHA512 b7c6b37b095f76b8972f76cfdf62be541377c4178c05a5c5d25359dd058d74d0468e474bba5cac883de65d82002fb62b64c5d71dcf67fef64871caf97f3b3c8d
+DIST master-pdf-editor-5.1.30_qt5.amd64.tar.gz 16150271 BLAKE2B dfbdacb6df75d268c57cc5d7f6c949c796abecd09394a80694dfc05b5e666c4e836f636b5af6a17a309625ed243e88c1871347e8f7162b6e3f8c47fc27d83e26 SHA512 3cc0a85e9518e75581cfdc05ac8dbdbd534fa11b4f4cfb490a0e9b411b84c073d52e9a5a3aa620507c88117cc04e033f5e860e335b37aef49eec95f2352e9b21
+DIST master-pdf-editor-5.1.36_qt5.amd64.tar.gz 16149439 BLAKE2B 882f399bfb5cf7b2a39c8174f541a1124953df5bc3bf5ded27bba1eec3ebc966e1b5c0174219759995d939ff203426a2004be61989fa7d062c26dc64320769b5 SHA512 934e9d856476e412a7b40858365e843a8350f638b48a9b593faeab12cd9032243042fd11929e826a294a29ab3810110c40fdd07f56e8c5d0fb6fa2f957a36c21
+EBUILD master-pdf-editor-5.1.30.ebuild 1186 BLAKE2B 7cdad5f7b3ddd475afe443a8311a975fb5923f31305ef115745bdebeeaccc0bde057cdc5689d58159b774ad8247a98890108555faf315c1fd4e6026f8b1a9945 SHA512 9840b21b297e7913f628d0acda4804e73ad5bd46847e14862da07aca13b9cdca4747e66de079c426dca7213abf758d950fc48127a71dd3a32280d9b053f5e4e8
+EBUILD master-pdf-editor-5.1.36.ebuild 1186 BLAKE2B 7cdad5f7b3ddd475afe443a8311a975fb5923f31305ef115745bdebeeaccc0bde057cdc5689d58159b774ad8247a98890108555faf315c1fd4e6026f8b1a9945 SHA512 9840b21b297e7913f628d0acda4804e73ad5bd46847e14862da07aca13b9cdca4747e66de079c426dca7213abf758d950fc48127a71dd3a32280d9b053f5e4e8
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild b/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
deleted file mode 100644
index cb32e02a6562..000000000000
--- a/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils desktop
-
-DESCRIPTION="A complete solution for viewing and editing PDF files"
-HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="http://get.code-industry.net/public/${P}_qt5.amd64.tar.gz"
-
-LICENSE="master-pdf-editor"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="mirror"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	dev-libs/double-conversion
-	dev-libs/glib
-	dev-libs/icu
-	dev-libs/openssl
-	media-gfx/graphite2
-	media-gfx/sane-backends
-	media-libs/freetype
-	media-libs/harfbuzz
-	media-libs/libjpeg-turbo
-	media-libs/libpng
-	media-libs/tiff
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	>=dev-qt/qtsvg-5.4:5
-	>=dev-qt/qtnetwork-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${PN}-${PV%%.*}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r fonts lang stamps templates masterpdfeditor4.png
-
-	exeinto /opt/${PN}
-	doexe masterpdfeditor4
-
-	dosym ../${PN}/masterpdfeditor4 /opt/bin/masterpdfeditor4
-	make_desktop_entry "masterpdfeditor4 %f" \
-		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor4.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/master-pdf-editor/master-pdf-editor-5.0.36.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.1.30.ebuild
index b3809849559f..05c37155037b 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.0.36.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.1.30.ebuild
@@ -7,7 +7,7 @@ inherit xdg-utils desktop
 
 DESCRIPTION="A complete solution for viewing and editing PDF files"
 HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="http://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
 
 LICENSE="master-pdf-editor"
 SLOT="0"
@@ -34,8 +34,8 @@ src_install() {
 
 	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" \
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.1.00.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.1.36.ebuild
index b3809849559f..05c37155037b 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.1.00.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.1.36.ebuild
@@ -7,7 +7,7 @@ inherit xdg-utils desktop
 
 DESCRIPTION="A complete solution for viewing and editing PDF files"
 HOMEPAGE="https://code-industry.net/free-pdf-editor/"
-SRC_URI="http://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+SRC_URI="https://code-industry.net/public/${P}_qt5.amd64.tar.gz"
 
 LICENSE="master-pdf-editor"
 SLOT="0"
@@ -34,8 +34,8 @@ src_install() {
 
 	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" \
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 5ff5c533aae6..c455fb9340d9 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -7,5 +7,5 @@ AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a76
 AUX mupdf-1.9a-debug-build.patch 159 BLAKE2B da7e5294cb9e348d057d1436d68c6d3ce62aff7d7e0923c1b3c492c8dbaa459f26894c9c0c3c83e6885b7607c42f8c3da68e646f0dee3f83a168c7caab236f39 SHA512 5337c7dc2c5b29200378082651b81f5483475fe5cba997b2c55f60143e3f00901b19fc51216413151be87cef80e8fe452cde81006bfc552bdb6b1e9d6c0309cb
 DIST mupdf-1.13.0-source.tar.gz 51425034 BLAKE2B 7f4a1c84b5840991cc7879f3617165579f4db1f7a010a8313b0eaf94ad59af60bb3d0e4a0f2acc14d2c7511dd0f8b96c89c51e360ab379ba32590b887dd3be6a SHA512 d7fca7292e612959893a728d35964cf7b4e607385bdd72e81b8ca1de6ab642f999b734afbbf32d75400cd29b7e178ec360e65c91d7b1e1a53c2a04ff0adbd707
 EBUILD mupdf-1.13.0-r1.ebuild 5214 BLAKE2B 5084a3f581138ec893379dec40cbc29f53bd6d5ab832960d8239ed410050529bfeb2cb0efc97d1e40cc29913fcaa1b144767f232c4e13f2eeef38857d8bde97e SHA512 813feb1aa5267790e9174ba57382b1e7d17c99a7e86a8c621447fb91c03b762edd9391be6c009ce6273a4ca644bc86b6518383a2ac1851eff093ff2a28c2ac77
-EBUILD mupdf-1.13.0.ebuild 5148 BLAKE2B 4836ab82ae27c5aec001d0cc3e984eeef17a3ef964f19a43be2fe1d122edc10fa6b73450e8528ddc76cce8721bd5d990bba7249b6b8d6e40d05d2d1796a83863 SHA512 43c6695a9ebfd52ce9e8442f1fd632418bd9bdb55412e35c26fff1f58f42abd50ec985e14007cf1204977e0ac7edc2f002cd661d15fbe901087fbe82efe1b734
+EBUILD mupdf-1.13.0.ebuild 5146 BLAKE2B ce63575c46687216ede7db12c924ce953ec80ca632a9218a155ad0854b04b30f19f02208704e3b21c04a6e1d6c616d61aa8ae3a181e6e176b6e6a2477fd208bf SHA512 c6f9e1cf4ebdd127ad07b5125312b75e5eb04f52a6246429ed3983efe498260a667c3b25d931d2f729ee94e3e342ff89704e2e6259fd1b6d1257fbb5cbe78186
 MISC metadata.xml 315 BLAKE2B b143559c33bb6e3b81fe4dd7df802d48470f9080987e6c888b96bfb3f17e51dd3beaeb5501941dbbc47e1a525900a4719dc42d3d457d391d725670ff201e0c5b SHA512 1f3d23236f716a9e02a4f320105a8cd36e0dc84e25e35764677b66f7ae42039e0ae6f82ef06635cb0fe53fbb2e27ab854e54d45280275b8235f186328daa2b4e
diff --git a/app-text/mupdf/mupdf-1.13.0.ebuild b/app-text/mupdf/mupdf-1.13.0.ebuild
index 731ec1534b1f..4c5c9d0cca84 100644
--- a/app-text/mupdf/mupdf-1.13.0.ebuild
+++ b/app-text/mupdf/mupdf-1.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
 
 LIB_DEPEND="
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index bdea7352f715..555b7befa1ac 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -2,8 +2,10 @@ DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961a
 DIST qpdf-7.1.1.tar.gz 7099282 BLAKE2B 9658dd1cc6f8d0e3dd13137db147e0f954f747b5bb6b1577f70a236b1f67c5513713889dca77181a9b25f1a2054a8ec5cbfda60866e97b2d43e60b494752c9fd SHA512 a75f988c7dd7ac174bdc981cd3696ca8b539ac6c581e3afecf601dc67277014cb4fe3f0e5cb75a67412cafa4eb645b2fc2d8a0ec203834464baf0c7e80baa0b4
 DIST qpdf-8.0.2.tar.gz 7952979 BLAKE2B a9c81f41d6b5e3e9f80dab8325fffbedb8740ae500efbf4f4d2c27aca1778b1e2c438b7aba7846bd62874e2ff4265bb50b3b3d3d32302fb3e4583ba0251bf8f4 SHA512 f6d062f011d87f3f1df44e96e5dec0cd4b1b5f800dc6c088bf1313b2c96922d2f3c1b6eb1109a6ef00c558144b85dc20aeb85f937b73a3b594633aa67104f5e3
 DIST qpdf-8.1.0.tar.gz 8243624 BLAKE2B 6db64282353bedca91225f2f5a9bc2a568872209d9c6b392374412e561bcb37d8e17223ecb34b332ebc7a83aa826bf2e85fbb0b3eeee3f055b24f343a26eed9d SHA512 1831bcaaed87dae268db5d61805d1483ec5c101f6ce594be660664c119597ae67cf011c2b50092964d785a814d5f6c780935127a89401fe37a1026ae4d3af15c
+DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
 EBUILD qpdf-7.0.0.ebuild 1234 BLAKE2B 303e3943f8429ab560cfef1d62b1c35f2dbec6c2e27fd6436fd8cba9eec5d8247bf4df27b2093f5a5936295452c171b81a7e07f3b888b98fff428ad7b566d109 SHA512 bc0f824517bf3d7837243162e11cd7a1b973fc27f984f2486cfea23047a7df185f5d4adcdbc82fa7c7b39a9aa6a31c80624e76fb5bda9d92aa2bff4dc457efb1
 EBUILD qpdf-7.1.1.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
 EBUILD qpdf-8.0.2.ebuild 1247 BLAKE2B 764bccbf564caebf07f28c24bdc84fc9b14dd8a494aa529d27c32ad473443cfce21ef062cc74a2b5e0a44c6e61f40f123611140298cfe9051fd7e68604a555e9 SHA512 7370df6aa8c3ac1609488169d6aed641fbcdcf7130ccee68a1f24ddaf153cf9564fa02b2476851c4141d81b0dad39481f5db77ac836aa1a950744a6961a1e447
 EBUILD qpdf-8.1.0.ebuild 1247 BLAKE2B 764bccbf564caebf07f28c24bdc84fc9b14dd8a494aa529d27c32ad473443cfce21ef062cc74a2b5e0a44c6e61f40f123611140298cfe9051fd7e68604a555e9 SHA512 7370df6aa8c3ac1609488169d6aed641fbcdcf7130ccee68a1f24ddaf153cf9564fa02b2476851c4141d81b0dad39481f5db77ac836aa1a950744a6961a1e447
+EBUILD qpdf-8.2.1.ebuild 1287 BLAKE2B 95b8d5f23c3f6b8ad9bebba711a550f7d7f59a74f078a78b9aab4b4a5e81001bf5b9bf34430a997472070cd92b25f4d67e3edb7922b735c13649589e43d18367 SHA512 b202256ad6065652a603c8cd754700bb5873408d5b3cc60f2b6d4db5ca0081f791b6dd1f48f6fa8b85a6e257e21696d9eb26aa0d4c0877d35aa4f5471a4ee985
 MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
diff --git a/app-text/qpdf/qpdf-8.2.1.ebuild b/app-text/qpdf/qpdf-8.2.1.ebuild
new file mode 100644
index 000000000000..386c8fc74b3c
--- /dev/null
+++ b/app-text/qpdf/qpdf-8.2.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/21"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${CDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+	perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use perl ; then
+		rm "${ED%/}"/usr/bin/fix-qdf || die
+		rm "${ED%/}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 98b0b884d426..b41fa39dff49 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,9 +1,7 @@
 DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
-DIST qpdfview-0.4.17beta1.tar.gz 658978 BLAKE2B 7f0ba945cf7903cae7bb11ac1d3baa08fc5f70e9e5a20a9f265cf8de4f0ce0f847f34852b2ce4374e2736542c8fc1e07c15e6bd4ae54d5147d14524e076f312f SHA512 803bd9a1165fc84302fb3c7734127eaab754bd2bf23083a1bcf340810fa617800f3d0069eae7b1f43fb528ebe17a6a32a652efbb902d525a95efc31efeb1e10a
-DIST qpdfview-0.4.18_pre.tar.gz 667869 BLAKE2B ed729b6aa1104ca1525877242bc3f2c630d8ee563005ab35854d775197c24352f0a39be13bf4808e4544c50072619da9cd5c36cdbdcbae33fa2fc2016b80ce18 SHA512 3a7a2cc474078dc742fccba2c87710c1e05cec76f0bd66650fa6cb4d6d8e2103241474689d4798da28ae1aeb2caa6e09dd8d1e9d0433c2eba21b202166aa3051
 DIST qpdfview-0.4.18_pre2.tar.gz 668677 BLAKE2B 1c79a7f9f9d67c533660457ca74d27c1cb389224910d0c8482c2e1d6a0843787e588a40ae7f4e02268392c15aa19b54b6383c2422cc60b20e521d26133c10a3e SHA512 ad19dd6a2bfeb3c5f26488619688ad96653ed50821203b7e5cb2817a4f9957510ce238804b48bf3b21d965ceed25ad1b0386e0bb5e9d0bc5e5c95e6fe10ef811
+DIST qpdfview-0.4.18_pre3.tar.gz 747794 BLAKE2B 08420a350ae6f8bba65efe2a930a8941a00182900e33266a03d9b6ded4b8ba7ac446de9ed8095f8876dfd3ecfb26b20cc146c82d9c9228fd5c136ad36d749061 SHA512 c72f766b0ffb175e0577f08975490b985e859cb41ccf1d6bcdb618664b96b3c4d0fe4ffab2e493ac20b87b85aa658f3beb5b0d430d21deae78df4c503649f1c0
 EBUILD qpdfview-0.4.16.ebuild 2137 BLAKE2B d0ce86840680b56afd8b925b820d0641a0754776d4054b469c691f5da10db072febd5b04b34b80394bc08f47d6b5b7b58390332c30d445116528cbc238fe2144 SHA512 2d89740ee569287794935eb369c8a035a3ceeceb3e428e740f0b0adbe808f532a336dae9739c789bd4ee71b1a7f87af222ce91c19028bb179275184607489549
-EBUILD qpdfview-0.4.17_beta1.ebuild 2169 BLAKE2B 61d969d7af89373d0d657c00049c7a86a6cb67d2cea7d436f1052e21c0a02ebe7d06024851a6e956b8227d41b90df2cfb862804a09a7f817307f5b2185a88d33 SHA512 14fe234d15e1f6a38a8ba2c744c5f9061c21969f43bab039227636eb69f25fea5f1a91ffb15afe84c3eb92de25ef1c0db693b02a074f365e9069af5ae145ad24
-EBUILD qpdfview-0.4.18_pre.ebuild 2351 BLAKE2B 64beca033eb45d715185360ff9ea653de2f444e0fdfa5bc58e5e37f46fa2e8f03e5674837121e2c61b2f5781281de70bc960d85ff10e763a0467c292f88bd4cc SHA512 560b54fc310413fc34e24f441eb438db5221d211cb57fc318018e27b7913588e3361b056f4102cf922d6f79d955993ab40182158e6ce00ac5394bd82d98f56f0
 EBUILD qpdfview-0.4.18_pre2.ebuild 2351 BLAKE2B aa38b631649b7d03be1a6e1df550cce81f44fe721d8b874b225ce6414a749a96dedc585b4d4482224d23c56cb2176c530e02bd47dc74ebdc45718642c8c39f28 SHA512 1c49e2ce7d9fedbbed5ea45b550403a11c68035d5943361d901b9df33c357c730d1b46ab66de6783576bcb562f64eeee61a9ca3857a93aa9759d4c756d98dbf6
+EBUILD qpdfview-0.4.18_pre3.ebuild 2388 BLAKE2B 17cea66141ca629186a310ff101e138a57ddb995b46df94d834524be2b0fa4a565973715022bb5adfa19dbc9423c742bf91ba2b7b08c7fb9d88873aa4658a5ad SHA512 52b2f4ea6c8c4a5a5eb673613c6e4cea1e503280f63093e5044c247724507495d633f673712a1bdc7743cb4c0f1f63a4922f9cedcd0b316db9e80c4d71c0e5ec
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild b/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild
deleted file mode 100644
index 0002d29b3a05..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
-
-inherit l10n qmake-utils
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="https://launchpad.net/qpdfview"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_/}/+download/${P/_/}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	cups? ( net-print/cups )
-	dbus? ( dev-qt/qtdbus:5 )
-	djvu? ( app-text/djvu )
-	fitz? ( >=app-text/mupdf-1.7:= )
-	pdf? (
-		>=app-text/poppler-0.35[qt5]
-		dev-qt/qtxml:5
-	)
-	postscript? ( app-text/libspectre )
-	sqlite? ( dev-qt/qtsql:5[sqlite] )
-	svg? ( dev-qt/qtsvg:5 )
-	!svg? ( virtual/freedesktop-icon-theme )
-	synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-S="${WORKDIR}/${P/_/}"
-
-src_prepare() {
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-
-	prepare_locale() {
-		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
-	}
-
-	rm_help() {
-		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
-	}
-
-	l10n_find_plocales_changes translations ${PN}_ .ts
-	l10n_for_each_locale_do prepare_locale
-	l10n_for_each_disabled_locale_do rm_help
-
-	# adapt for prefix
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-
-	default
-}
-
-src_configure() {
-	local myconfig=() i=
-	for i in cups dbus djvu pdf svg synctex; do
-		use ${i} || myconfig+=(without_${i})
-	done
-	use fitz && myconfig+=(with_fitz)
-	use postscript || myconfig+=(without_ps)
-	use sqlite || myconfig+=(without_sql)
-
-	local myqmakeargs=(
-		qpdfview.pro
-		CONFIG+="${myconfig[@]}"
-		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre3.ebuild
index 13bcc7b4241f..21f9544f85ee 100644
--- a/app-text/qpdfview/qpdfview-0.4.18_pre.ebuild
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it ja kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
+PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
 
 inherit l10n qmake-utils xdg-utils gnome2-utils