gentoo resync : 23.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
commit: 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree: 230f3135ceaace633cf93e9838b185c4a6664c2e /app-text
parent: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
53 files changed, 519 insertions, 638 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 9985ab78d45d..dd7e073fa3db 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 38fdd4117952..ba08c5aa881b 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
 DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624
 EBUILD asciidoc-8.6.10_p20181016-r1.ebuild 2620 BLAKE2B e29260b9b80ccd796662ea0ce4d207a66c4b99ffc371ff7ad02e38350ae9564a21c98740d4de7fb967ebb17cba1ff243e19e51e575ddcf08fa32e34549b2e255 SHA512 21e1a6e7d72d96265be242b2234faff0aa777f22895a4b051fab26be6e36c0d0b9a91463097e87c485cde39168e3ed4bc0033d9eaa164407f051db806281ad58
-EBUILD asciidoc-9.0.2.ebuild 2354 BLAKE2B 8036d5095a6331cba7fdfdb7908627bae037ccd5bca81d3cc016b5f17690b6cd2e873117438ff0e119f95f228bca0bb57954db2282b0976539f236590cd5e7c2 SHA512 99341d44821c8659384c9e77f3a8cb739feca5ae90b80e32deff893dd3befda196429f4ba9f364f6688ddec388b0bf4a8d71e65b53eac262f7453264f8f56aca
+EBUILD asciidoc-9.0.2.ebuild 2351 BLAKE2B 7bf3035c99b810ae6f1c004219d056edb5d479381c208248fa3195f95cbf2664f133035839ec98c52d4ed0bd05599ba78cf467fdcd99df41804f9ff0b73099d7 SHA512 ce2174f63725b38b9f672ad8ea3bcc154c83a736624213f3793393c613daff595dddfc78793fabccd3cd96e771f1f86ea10c2b6f59c8e58c911948cba828559b
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-9.0.2.ebuild b/app-text/asciidoc/asciidoc-9.0.2.ebuild
index c289dc0c95a2..509c4f171bc5 100644
--- a/app-text/asciidoc/asciidoc-9.0.2.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index beaa2dfa6a01..4f52c8b5d16e 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -10,5 +10,5 @@ AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd
 DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
 EBUILD dictd-1.12.1-r2.ebuild 2870 BLAKE2B abfafae14c450faae4ddab7e6067140bf5ffae2fc44c89d22af9055cc0f087dd94ccf70013f423c0874279a3814a288b965d3d566af34b0c923f5885eb81dfb8 SHA512 4b4caa9de69e126ed84b9d00cf086c327ea47a059bfd3fc7e6f541b15153f73d5c9afb87de75da186d36b8226666e6284ae64b6981352273a6b58ee8b729a66a
-EBUILD dictd-1.13.0.ebuild 2956 BLAKE2B 05bf8ae9ec53ed9b4d2255f6fb3cc544534cc4662d6342eb2d69d28aaf3b2ebcad4c886f0e7a8e4783dd187e6915bbf48e1e26271a5d7b36eb9bea88396fbcc3 SHA512 f579cc49468d91b85d87c58464e0ea02e7aaeb37e18d76fc627891908306762588a460716b5bb3586c0c02380c587fb082aa0a61ec1741a25538b7e89e347bec
+EBUILD dictd-1.13.0.ebuild 2953 BLAKE2B cdaeb96e42c3c43901409682b8041230e2404a7aac6e049f33fa2dde0ace10383821b54dd1d8368a79a7e0ea2a0f397f870ef2cf08ff17ac0db5a3e454aa3832 SHA512 52ad5339a8c85847286068d793897bb09906c11fd197b5f31b6bc076fc9bf46edd1e30c104d423cf71cb0788b97a6ae23828125d0d7080f95e22f3cad0abc2cf
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.13.0.ebuild b/app-text/dictd/dictd-1.13.0.ebuild
index 79c142175876..510bb16e5845 100644
--- a/app-text/dictd/dictd-1.13.0.ebuild
+++ b/app-text/dictd/dictd-1.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 SLOT="0"
 # We install rfc so - ISOC-rfc
 LICENSE="GPL-2 ISOC-rfc"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="dbi judy minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 85a0abb59be2..552885ccb17e 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,7 +1,9 @@
 DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
 DIST ghostscript-9.53.0.tar.xz 41358720 BLAKE2B 9a8b5872dc799f14759033685c37890f2da28450b1e115fcc63a2a920bb22bfc02db078d3f39dc62778da2a2518b82c2fc91f349486e83914c88c70d1e15d7e8 SHA512 fa594ef99e58257074b651e4d078bd1025f7bc2c435cd2a5454ba59c2a98cc82e93339ccd1eaa4fe624275165aacefeabc6f8336476027946f56aeb02e93da30
+DIST ghostscript-9.53.1.tar.xz 41362600 BLAKE2B f4f3e9c067d120195cdcbd8ba3ecbb5618d668e0582408cc76b0e13627aca06c40064a7ae96d0ebe8c313ec282c4d3f5dddddabef3d0194ff9aaf98832b5a50c SHA512 5c78ed0a03983cbf9d55885c5ee8fbfc987db367b020ad0148b8861de42923e38c688447cfc6efcea5521121545ecfbea9690058fd3c4438629a43b5990800c5
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5097 BLAKE2B 748ff28b3a38714562d03d63b267a2cbb762103972d41883d2c5917083cbed564ca36788fdde92ac8366768153d0453ece4b25b760bad6c3d97e08c9e86961bf SHA512 82e9b5f3f1515236197510bb29238ca955cf042a233ef314036b8b88887df2bc8dc353342b09c7d0444d73de9f98412a2c7252d19782e956f15dac2147b3d289
 EBUILD ghostscript-gpl-9.53.0.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
+EBUILD ghostscript-gpl-9.53.1.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.1.ebuild
new file mode 100644
index 000000000000..0d3acf4a9d16
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Interpreter for the PostScript language and PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_PN=${PN/-gpl}
+MY_P="${MY_PN}-${PV/_}"
+PVM=$(ver_cut 1-2)
+PVM_S=$(ver_rs 1-2 "")
+
+MY_PATCHSET="ghostscript-gpl-9.53-patchset-01.tar.xz"
+
+SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
+
+if [[ -n "${MY_PATCHSET}" ]] ; then
+	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
+fi
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cups dbus gtk l10n_de static-libs unicode X"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	>=media-libs/jbig2dec-0.19:=
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=media-libs/tiff-4.0.1:0=
+	>=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:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	app-text/poppler-data
+	>=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 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	if [[ -n "${MY_PATCHSET}" ]] ; then
+		# apply various patches, many borrowed from Fedora
+		# https://src.fedoraproject.org/rpms/ghostscript
+		# and Debian
+		# https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
+		eapply "${WORKDIR}/patches/"*.patch
+	fi
+
+	default
+
+	# remove internal copies of various libraries
+	rm -r cups/libs || die
+	rm -r freetype || die
+	rm -r jbig2dec || die
+	rm -r jpeg || die
+	rm -r lcms2mt || die
+	rm -r libpng || die
+	rm -r tiff || die
+	rm -r zlib || die
+	rm -r openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -r Resource/CMap || die
+
+	if ! use gtk ; then
+		sed -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			-i base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		-i 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 -e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		-i base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -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' \
+		-i Makefile.in base/*.mak || die "sed failed"
+
+	# remove incorrect symlink, bug 590384
+	rm ijs/ltmain.sh || die
+	eautoreconf
+
+	cd 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 \
+		--with-system-libtiff \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with X x)
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd 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
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index cd2f98db459b..a287a6dab1aa 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,3 +1,3 @@
 DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
-EBUILD htmldoc-1.8.30.ebuild 1112 BLAKE2B 5aadf30d8e616123ca12fa723049f179d790e3bee421fa38bff8728f2c737943249c5692d22a4976086ca190f8e13097b818cd64df5e730c1a00c8b1a4cb661d SHA512 b210f0379cd075b7902052bac96685eed280774c859784379aef143905ec4a26b3df5b3b3dc4106bb6f2aa25da175fd725123c0eb41afbedeccbab183a7e5c45
+EBUILD htmldoc-1.8.30.ebuild 1117 BLAKE2B e2541de911f24741b3456f02fe4af773e8c918fc3125d2be67276baa2715be6b0d59b6c0e2d4e1714474e0f24755e3b645515dcfaeedd7d90e152a2cdfac346f SHA512 e901762a07d850837ed43f80986d4e63fc724de5f973b71cf10e231e1a462cea693995016e17432a93b9a5767264dd37690b1701a3159d969d71e8f986453e8f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild
index cc2c5a5a5668..61956c4652b9 100644
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit toolchain-funcs
+
+inherit toolchain-funcs xdg
 
 DESCRIPTION="Convert HTML pages into a PDF document"
 HOMEPAGE="http://www.msweet.org/projects.php?Z1"
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 2539b9bf1df5..5909c47fe1d7 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -2,5 +2,5 @@ AUX hunspell-1.7.0-CVE-2019-16707.patch 811 BLAKE2B 5adc2e6009a0381bbe6ea10a64fb
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
 AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
-EBUILD hunspell-1.7.0-r2.ebuild 2372 BLAKE2B 0fa1b468117d75a8cf719edda49852ec027fae21df54fa00623b85ede74f1fcf229824715f2f63a79addb1810c7c64892421f3eeaa8d28dcf1b3208f2343c016 SHA512 b957431599ef10e4f5986170dd324476f5c93fac08f5f70fc6dea63ae8ed3d735d27474ae74740e5f29ffcb9ab34575c93e8400bc7b33b217318fb5dbdfa6b79
+EBUILD hunspell-1.7.0-r2.ebuild 2320 BLAKE2B bc7b4f92f384d038fe285081abf7bf1cc5843c06e404bb7683454efb4990c89b363531d66d256dcf5df39ca83db0cd05ba450f9e693f66fadbd40d0637930b09 SHA512 f4e959a98b002aeccec5b0fe8dc08b6829f439c8fdd457d911a13cef96755d655eb7d5d3cf980ecf048eb70119218eeb56bdde94a1a54ffedd962669d7c062bb
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
index 2b7966634c05..8d9db7372eea 100644
--- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
@@ -2,16 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic
 
-MY_P="${PN}-${PV/_beta/b}"
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id is
+it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu"
+inherit autotools flag-o-matic
 
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+DESCRIPTION="Spell checker, morphological analyzer library and command-line tool"
+HOMEPAGE="https://hunspell.github.io/"
 SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/hunspell"
 
-SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
@@ -19,13 +20,8 @@ RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
 	readline? ( sys-libs/readline:= )
 "
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
 
 PDEPEND=""
 for lang in ${LANGS}; do
@@ -39,12 +35,7 @@ for lang in ${LANGS}; do
 done
 unset dict lang LANGS
 
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	AUTHORS ChangeLog NEWS THANKS license.hunspell
-	license.myspell README.md
-)
+DOCS=( AUTHORS ChangeLog NEWS THANKS license.{hunspell,myspell} README.md )
 
 PATCHES=(
 	# Upstream package creates some executables which names are too generic
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index f4adc9de65a0..7c7eede2698e 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -5,12 +5,12 @@ DIST JabRef-3.8.jar 36714920 BLAKE2B 4a26b40168a66dd8872ff194ce687589bb5b0c679d2
 DIST JabRef-4.0.jar 56583311 BLAKE2B cb45bad15d507ddfa9320b7805c9c8fee4be888eb2e209a1e9447d0923e729683ebac4dc91df29172da062946c9aca816200034106238de573e7c34a31ff601b SHA512 a3e27ae895c77c6d9e6a9bd2312c7b590fe7d9c45a5d42ecc5ebb75a7be9bce27bcfb7d17e06409c05e7fe490b3ff0e6776c3f12b205acb5e95bceeef6823af2
 DIST JabRef-4.1.jar 55587800 BLAKE2B fdbe44b672d0cab611c41a4c28fbe4e11e72ed4b0dff4b743a03ab49ad74a8472173e28c0b576a23d7a5a40c2b23bc6ce6f72aed378b3e5aca4e8b96abcaaf27 SHA512 22fae27a7eb8653e11fc5bd91f721dde49be9d1d79e1a4c05282893c25f993babe8a6df29e154bbb749e9ecc940b42b37401ab3f453401dc8eaa24e2e118d1a6
 DIST JabRef-4.3.1.jar 56868438 BLAKE2B d970599f6bfd4fef7ceda656fafeea77b5c2860ece1b5086bf895cbf212c49bb5e573f5573c483a7fc62431266899dbac7a9bd8e20308d51f5ba2d0c8814319f SHA512 6ff466e91d827254271e5728a9af9c46ac811c2e4fe01c01a2ec6ef9cc75d20978803f18e49365c8a695b0d2db7009ecf05f69f446b9e9136dad5526d5e83f19
-EBUILD jabref-bin-3.7.ebuild 864 BLAKE2B 2bb3f6d6c210c50bb737e7929283236c8771f0192b3b8a11a139ff317e375ff02d88716bacbee0be107a8038805f5acee025931eba47d21c1e4858fadcb36123 SHA512 243e44d36c417ed77c809aab63a5eb527e525874b786cd3d75ab487894e0cc27fd190f942a763aef4e3878524c7330da2dfeb43ce198cabb42ea44a73d377131
-EBUILD jabref-bin-3.8.1.ebuild 951 BLAKE2B 486b75b0dae55f9245cad51e5f5c750097adea5341e922ac0e2032e7dbbeaee56ba17a9f4c54e6e44e36bb4d189607cd752270f885893ab95c77d8a759cc48e6 SHA512 31e3af881a254bd9acc969e2ba538dc35206c360abe879827acaf80914ea557ff6e7e2c3f432a939314f37f7b3492e7beae5e2e722dc34b66fe66a7e64a90321
-EBUILD jabref-bin-3.8.2.ebuild 947 BLAKE2B 2b18c663846b348253c37a8c2adbdc22efbe1b6ab77b476f14617f4f5322dd7889f1921a19b0d1226d63dbb7597011fc7663f0f44ef9eaa39af3e0117181e782 SHA512 d7693a07bec915d348e3585defb30093bfd6574e023c16ed7d266c88972f08e7b87d145428d2ca789cda26702997b82365663c709dd3a38b9823f3ce1993a38f
-EBUILD jabref-bin-3.8.ebuild 956 BLAKE2B 1f2efdc7390090f0542a1bee2546f644fd0ae37ee6a598cabd9e4fc953adfbda423681bcdbf8a6dfc2348abe3bcea221348f97798c7c7229708c2a2c15b242d7 SHA512 4b0bd398d248eacf573dad7ab6fa70e5f49d3efb942a461bf4297801838031651aebcc786a9d0335d799d5c029f2ae2691ab5fad6d37a5d867b2e8e3e8a6f2d4
-EBUILD jabref-bin-4.0.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
-EBUILD jabref-bin-4.1.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
-EBUILD jabref-bin-4.3.1.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
-EBUILD jabref-bin-4.9999.ebuild 1209 BLAKE2B 4acf2b1a219c94010c74edc7eb15780c553978faf148d18b57df1cbb0e5dd018be7007cea6bd04e442b10e5fcbeb30960721eeada97a78866df6d3b9e06834a3 SHA512 141ee714ea516d86b8a303c18e6e20176bb47f33cd737ae0229094076be67b1329ce5d6b9f8ce6fc48fe6c4281631e87f9c44553c8e72cb1065107798c2f4509
+EBUILD jabref-bin-3.7.ebuild 859 BLAKE2B 3bd2a2d3733dd0fad638cdb88427b9d78e50bfc1bb1c5f7ec816cd6ddb0db92e370fcd35fc448f2a85464ce40cc8a3bbb808460f4962d233067649a825b615db SHA512 42fa1a4896c93007c95a58bba7c6a9f64b821a401efea62691d5a0686069900342abd38cf1f5fea96550a726924901e3a35b8659d20cc1d5f1edb18d1e77eb8c
+EBUILD jabref-bin-3.8.1.ebuild 946 BLAKE2B 88541ba47583cf992ee7d2852211e32b6a9cb5d49531a60baefe105da1039271a7c0b0c3e90c712931e3f164b1d365cff34587216cd4d7c6c3f5122fa0e50772 SHA512 a7419620d4ef781b2d5d9159cf65d9692ed05fb73a6a171a93f90e2c286a812d123e523b6ece1a87e933835826f2a2eefb6d0ac6a1eea38bdc51079d3634fbbe
+EBUILD jabref-bin-3.8.2.ebuild 942 BLAKE2B 160077839c9c06dad71508a1f7ce72319b2a47346905fe10bada62c1d222101dc055c3246300cd6eeb1cdeaf209d58939eefad41ff01451427e02d5c65c8155c SHA512 ae63400fcdee00312be4d8dd0156dee79b3619003d47c8bd11b6a4097a8b404c3599c584e119da81aa8e2bb37e79abd72ea006d57b23a513b5a7d01065532f21
+EBUILD jabref-bin-3.8.ebuild 951 BLAKE2B 45fcd84991da9c1205c0945ee4f813e47478d4821f15c9a9d8fa7e53a4e1d8a630a9182430408cc953f2dcaa5dcb4084676a6069a78bf3947325f7953b1ddd15 SHA512 48e2e2a979d97d8f6166cbcfca1e2d9becc2fecc83863622bb4e610ddad293731567bf5db8e989b0f711b4f38b8d1ab26314d9e003297e8771b88e50187649f0
+EBUILD jabref-bin-4.0.ebuild 1177 BLAKE2B 1f41e4d390cac4f4579523f29cfafb0bab5c022323c464514cf37818d25e6dbf7eaa0c0bb8a57c468240f14d2ef1afd3a2911f42623608c676d7ecdedfc8e910 SHA512 2dab48dd25474b869a284121843e60ed9ff8d6016224046f1eafe2ceb93bca17f02c67a6e7395e621c5824f5c5c1e57aa737499ac21183497168cbe0e64ee327
+EBUILD jabref-bin-4.1.ebuild 1177 BLAKE2B 1f41e4d390cac4f4579523f29cfafb0bab5c022323c464514cf37818d25e6dbf7eaa0c0bb8a57c468240f14d2ef1afd3a2911f42623608c676d7ecdedfc8e910 SHA512 2dab48dd25474b869a284121843e60ed9ff8d6016224046f1eafe2ceb93bca17f02c67a6e7395e621c5824f5c5c1e57aa737499ac21183497168cbe0e64ee327
+EBUILD jabref-bin-4.3.1.ebuild 1177 BLAKE2B 1f41e4d390cac4f4579523f29cfafb0bab5c022323c464514cf37818d25e6dbf7eaa0c0bb8a57c468240f14d2ef1afd3a2911f42623608c676d7ecdedfc8e910 SHA512 2dab48dd25474b869a284121843e60ed9ff8d6016224046f1eafe2ceb93bca17f02c67a6e7395e621c5824f5c5c1e57aa737499ac21183497168cbe0e64ee327
+EBUILD jabref-bin-4.9999.ebuild 1142 BLAKE2B 852e80eb1774991a6fa5ff29c04d177824ce89a2107d09d120828af62635944425bd5e65e18ccc9b5853f059ee096584ad348bd202e1c6e04d5465c4745f306b SHA512 a76aae463f1a31eb0097505fbfd05fbe4b8c5fae289c323ece68de2c2757f4f33be198b6f5e72221c4a3864e4d23475e3dc0475bd063b2aa4e7d63d2f9c53f79
 MISC metadata.xml 911 BLAKE2B 126cffb014bca2a1ac056adcbfd52140c8adf76547aea45de34a9d98a4e7c77d1e175e302e7f1cd3677181dda238bf4f75754f9f9a2dfb981196fc8b974d0fd3 SHA512 7a3e7ab167709c28857aed83ffd4e3ec5b202b9d444b4fc7a07c33d2415316e4aa8f22b80cc2bd281a1625e02503bbb5b517c01efe6a70558b2b9815b3b7f2b3
diff --git a/app-text/jabref-bin/jabref-bin-3.7.ebuild b/app-text/jabref-bin/jabref-bin-3.7.ebuild
index 1e671d607b1b..7ce3bd08767b 100644
--- a/app-text/jabref-bin/jabref-bin-3.7.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ DEPEND="
 	app-arch/unzip
 "
 RDEPEND="
-	>=virtual/jre-1.8
+	virtual/jre:1.8
 "
 
 S="${WORKDIR}"
diff --git a/app-text/jabref-bin/jabref-bin-3.8.1.ebuild b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
index c69c8a61c6e9..3217186a6601 100644
--- a/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/unzip"
 
-RDEPEND=">=virtual/jre-1.8"
+RDEPEND="virtual/jre:1.8"
 
 S="${WORKDIR}"
 
diff --git a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild b/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
index a0ff6dfe94b0..106c4590fe8c 100644
--- a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,7 @@ KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/unzip"
 
-RDEPEND=">=virtual/jre-1.8"
+RDEPEND="virtual/jre:1.8"
 
 S="${WORKDIR}"
 
diff --git a/app-text/jabref-bin/jabref-bin-3.8.ebuild b/app-text/jabref-bin/jabref-bin-3.8.ebuild
index 9bd260099483..0bf932d8461a 100644
--- a/app-text/jabref-bin/jabref-bin-3.8.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ DEPEND="
 	app-arch/unzip
 "
 RDEPEND="
-	>=virtual/jre-1.8
+	virtual/jre:1.8
 "
 
 S="${WORKDIR}"
diff --git a/app-text/jabref-bin/jabref-bin-4.0.ebuild b/app-text/jabref-bin/jabref-bin-4.0.ebuild
index a4bf511e4d47..228d81dafa31 100644
--- a/app-text/jabref-bin/jabref-bin-4.0.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,11 +23,8 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="app-arch/unzip"
 
 RDEPEND="
-	|| (
-	dev-java/oracle-jre-bin:1.8[javafx]
-	dev-java/oracle-jdk-bin:1.8[javafx]
-	)
-	>=virtual/jre-1.8
+	dev-java/openjdk:8[javafx]
+	virtual/jre:1.8
 "
 
 S="${WORKDIR}"
diff --git a/app-text/jabref-bin/jabref-bin-4.1.ebuild b/app-text/jabref-bin/jabref-bin-4.1.ebuild
index a4bf511e4d47..228d81dafa31 100644
--- a/app-text/jabref-bin/jabref-bin-4.1.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,11 +23,8 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="app-arch/unzip"
 
 RDEPEND="
-	|| (
-	dev-java/oracle-jre-bin:1.8[javafx]
-	dev-java/oracle-jdk-bin:1.8[javafx]
-	)
-	>=virtual/jre-1.8
+	dev-java/openjdk:8[javafx]
+	virtual/jre:1.8
 "
 
 S="${WORKDIR}"
diff --git a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild b/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
index a4bf511e4d47..228d81dafa31 100644
--- a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,11 +23,8 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="app-arch/unzip"
 
 RDEPEND="
-	|| (
-	dev-java/oracle-jre-bin:1.8[javafx]
-	dev-java/oracle-jdk-bin:1.8[javafx]
-	)
-	>=virtual/jre-1.8
+	dev-java/openjdk:8[javafx]
+	virtual/jre:1.8
 "
 
 S="${WORKDIR}"
diff --git a/app-text/jabref-bin/jabref-bin-4.9999.ebuild b/app-text/jabref-bin/jabref-bin-4.9999.ebuild
index 9c54f3b9b7e9..4c60f2779d03 100644
--- a/app-text/jabref-bin/jabref-bin-4.9999.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,12 +15,9 @@ SLOT="0"
 DEPEND="app-arch/unzip"
 
 RDEPEND="
-		|| (
-		dev-java/oracle-jre-bin:1.8[javafx]
-		dev-java/oracle-jdk-bin:1.8[javafx]
-		)
-		>=virtual/jre-1.8
-		"
+	dev-java/openjdk:8[javafx]
+	virtual/jre:1.8
+"
 
 S="${WORKDIR}"
 
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index 44312ecb28ed..57f65c8edb4b 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1,9 +1,4 @@
-AUX jo-1.1-version.patch 217 BLAKE2B 366b69d941f5f324de39e31de160e0a296dd65259a2051f4adcefde4b8253b514e44c0d4c52413379b33567d7a744a8beef0cc324bd098b7d017ec6318d2f5f2 SHA512 c70e5993069229143f75f2360bf7b4756a988f71d321a0f26c821d0258d523fc2c9d754692b498ece20ff452444ee817af609435160409f1ebe4033287ef89a3
-DIST jo-1.1.tar.gz 50395 BLAKE2B 753e65e5b483cee357bcfc1fb95d93fae008acc8a1eeee75e6e68da6d0ed8c9636cd489278c466ffbd179ceaec7121b4fe3f64fe2e9bf70b81febbe15144c0f2 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242
-DIST jo-1.3.tar.gz 143425 BLAKE2B 32efaa84f64b0d3e82173a5121a30e13ce7fed991ec09f26400c90071e5e3cc5cc8af372550f4d9769cc338e852bf50497782c11ffd7d32a52d5769370742fbf SHA512 3c9480257d0ab9d9f19f1aaeb3a5b72e69caff6dcf87118bea8aca74a3b0864c0d17ed52bfc5550783c4636ee3a6acb8578f08316d976cea4f06af7096c12f02
 DIST jo-1.4.tar.gz 144596 BLAKE2B 0e0a0290d276b18fbfea0c770e134f29ea3f1eea9c7e5ccdd6c7d853dc0a8c70279fa464731f5b231d6d9d48816be4e5a6d93c7abc0e03408a86f0e1691d67a0 SHA512 c283b25e76fa06842c4f7d8ae8d94b207981d92a1bd4a064631e0646bdeedc06c1a00dddac405a455b27bda5eb34aaa7dc6d886ccf750741fd4d7312f692d169
-EBUILD jo-1.1.ebuild 426 BLAKE2B 7752fa82f7f4f99ca1873eaa98f9a2f9612fe57548cc7791e81ffb15bced18061d1bf4d17367506dc6a6f860fd0fea2c314d240f9d6fbb84336d77f00d867a79 SHA512 eafeac07b4a04c94a03de806eabcf620685043815a4df4db89e06783533767e09c38aec38197c34ff86c854ce29ba6456b555b18a0df7373a35620dd3e34d893
-EBUILD jo-1.3.ebuild 488 BLAKE2B e6fa094208c84a74e8f81715ab621b7323c37d13ba04433e64d7c78b1115b2ec80291df2c898e38b99ed998e01cf17096f21b5d610eabe050ebe7f88c875a2e9 SHA512 3c26934e8a5e3c8be1e16bdc530a5e014af4b2b2b80173d46940c8ff0ce6cb14c78f727d1230ad26fcf08e3e309a5c0f64c4162c7f961c1089b55dc747a6b55d
 EBUILD jo-1.4.ebuild 488 BLAKE2B e6fa094208c84a74e8f81715ab621b7323c37d13ba04433e64d7c78b1115b2ec80291df2c898e38b99ed998e01cf17096f21b5d610eabe050ebe7f88c875a2e9 SHA512 3c26934e8a5e3c8be1e16bdc530a5e014af4b2b2b80173d46940c8ff0ce6cb14c78f727d1230ad26fcf08e3e309a5c0f64c4162c7f961c1089b55dc747a6b55d
 EBUILD jo-99999.ebuild 505 BLAKE2B 87c67279bfd395e89ee8e9f2f26cc4bd12abfbf4955da369791b323da30dbc19646c73e19e7a13e6205ab59fac4d383cc41092ff6ba92f4ce6b0ab464c1e9555 SHA512 57988d8a84baab4b7551331ee546a60bd1a3ddb7b0e428d949dd815c53d311a37e6bc956267fc0c77a716ad769ae9c4fbd37dc067b567457dc1173031584f628
 MISC metadata.xml 288 BLAKE2B 8b66970135ed40287f00f96188b1679d936f9f58d59d2991aa36f2641e0a5ae48bdf3f36556be0b0296190a1c8bf59c88e6900de93e32c102b3adb880e524dcf SHA512 c8e9c740f13a6d2e94d28748750b51c44d9291d4fdc8823dc11647e0ae058866c06d49656011398d48fed78192bfe89f50a5fd05d36054974e3e65bdc82c55cb
diff --git a/app-text/jo/files/jo-1.1-version.patch b/app-text/jo/files/jo-1.1-version.patch
deleted file mode 100644
index 446df4aa9211..000000000000
--- a/app-text/jo/files/jo-1.1-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,5 +1,5 @@
- AC_PREREQ([2.64])
--AC_INIT([jo], [1.0], [jpmens@gmail.com])
-+AC_INIT([jo], [1.1], [jpmens@gmail.com])
- AC_CONFIG_AUX_DIR([build-aux])
- AC_CONFIG_SRCDIR([jo.c])
- 
diff --git a/app-text/jo/jo-1.1.ebuild b/app-text/jo/jo-1.1.ebuild
deleted file mode 100644
index d52212e5bd0c..000000000000
--- a/app-text/jo/jo-1.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="JSON output from a shell"
-HOMEPAGE="https://github.com/jpmens/jo"
-SRC_URI="https://github.com/jpmens/jo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-version.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
diff --git a/app-text/jo/jo-1.3.ebuild b/app-text/jo/jo-1.3.ebuild
deleted file mode 100644
index bf84777ca6d8..000000000000
--- a/app-text/jo/jo-1.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit bash-completion-r1
-
-DESCRIPTION="JSON output from a shell"
-HOMEPAGE="https://github.com/jpmens/jo"
-SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_configure() {
-	export bashcompdir=$(get_bashcompdir)
-	default
-}
-
-src_install() {
-	default
-	mv "${D}"$(get_bashcompdir)/jo{.bash,} || die
-}
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index 1f5102e33d12..24819237abe5 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,4 +1,6 @@
 AUX kjots-5.0.2-kf5bookmarks-5.69.patch 2734 BLAKE2B 5bbad18ee50f844320a405347eb6f89535b831d42b4751c56d7227e31095dbf0767fff15ea5fe3930bb11a13155bd13db6f9b970be86aee011c0929efaa7dbfe SHA512 13aff021919d8565cce1c6e7c84cdf23e9a405394374451325f229a00ce5d36be070c0efb0726573297a615d709e0a7d1bd60cb5f1e7752aaee50d8021b64fef
+AUX kjots-5.0.2-kontactinterface-20.08.patch 5563 BLAKE2B 2c754b4a31c133c4fe9409e930df855366d0276a35678466b07b4fd54736c1ec64bdac6b3064bceb5044765433f6d953239746e580f4ef150ad274e111829001 SHA512 0fd6cfaaaac12bac57043acec043ad4fabb232a2df666379860b745b6d137e18193abd6447dca60a51596cfa969f4193bafc33d811bf793b547df43efb462026
 DIST kjots-5.0.2.tar.xz 230608 BLAKE2B 3194b0ef072decfa09455ca7e8d6057ea3f37f54d37641a6ddf28e17ef4662a408adc9e9b04394e6002b51e72ef740412bcdd70324d6efcb9e949f9911437559 SHA512 a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225
 EBUILD kjots-5.0.2-r1.ebuild 1469 BLAKE2B 0e66e6554360a201f1095861cc6f5a65fe5f4ac5b344f4f55ebd87b350c5e412782f5e75f5e56f64a36df1250aebf45d9d07d6afcb4b93f879df50cc1087bf06 SHA512 04e3be8661fb2eff2dd22373fea6c6fb12ce49cac076e661cbf1af9538742405bf71d84f6dcace4c07a5c451639694b6b2dd31c11af11d7a07f1a4a3a7795f90
+EBUILD kjots-5.0.2-r2.ebuild 1343 BLAKE2B ac83e67d01b3375519a0075f776b44c9cd6a4b81a7b5c28f24dd34a91613a92d89aac13b797a6f8a1fe1084389017ee38910c6d1680fb186008692c9d1c5b88e SHA512 50fc1c301a15794f5a14accb24b22f996c94fc364431d41fce024b5b7f342763b797012a058c1cb90c0ff2bff5047b872c7d01979f839234a2713d69893ce4a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch b/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch
new file mode 100644
index 000000000000..608a50d98567
--- /dev/null
+++ b/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch
@@ -0,0 +1,148 @@
+From bcf49fb95bee12bbc4bef0578285ad296deafcae Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Fri, 24 Apr 2020 01:25:43 +0200
+Subject: [PATCH] Install the kontact plugin into kontact5, with JSON metadata.
+
+Summary: This will allow kontact to use KPluginLoader one day.
+
+It also fixes compilation with current kontactinterface API.
+
+Test Plan:
+rm $prefix/lib64/plugins/kontact_zanshinplugin.so ; make install
+kontact still finds the zanshin plugin
+
+The same steps (other than old-kontact-interface compatibility) were already
+pushed to all other kontact plugins.
+
+This commit is very similar to https://phabricator.kde.org/D28847
+and its predecessor commit, in zanshin.
+---
+ src/kontact_plugin/CMakeLists.txt      | 11 ++++++++-
+ src/kontact_plugin/kjots_plugin.cpp    | 34 ++++++++++++++++++++------
+ src/kontact_plugin/kjots_plugin.h      |  5 ++++
+ src/kontact_plugin/kjotsplugin.desktop |  2 +-
+ 4 files changed, 43 insertions(+), 9 deletions(-)
+
+diff --git a/src/kontact_plugin/CMakeLists.txt b/src/kontact_plugin/CMakeLists.txt
+index 8a6b5e1..dec4b8b 100644
+--- a/src/kontact_plugin/CMakeLists.txt
++++ b/src/kontact_plugin/CMakeLists.txt
+@@ -1,13 +1,22 @@
+ include_directories(${kjots_SOURCE_DIR}/src)
+ 
++# TODO: remove once kontactinterface 5.14.42 is required
++if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
++  # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
++  # 3.10+ lets us provide more macro names that require automoc.
++  # KF5 >= 5.42 takes care itself of adding its macros in its cmake config files
++  list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "EXPORT_KONTACT_PLUGIN_WITH_JSON")
++endif()
++
+ set(kontact_kjots_PART_SRCS
+     kjots_plugin.cpp
+ )
+ 
+ add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS})
+ target_link_libraries(kontact_kjotsplugin KF5::KontactInterface)
++kcoreaddons_desktop_to_json(kontact_kjotsplugin kjotsplugin.desktop)
+ 
+-install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
++install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
+ install(FILES kjotsplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
+ install(FILES kjots.setdlg DESTINATION ${KDE_INSTALL_DATADIR}/kontact/ksettingsdialog)
+ 
+diff --git a/src/kontact_plugin/kjots_plugin.cpp b/src/kontact_plugin/kjots_plugin.cpp
+index 66e7ed5..b74d601 100644
+--- a/src/kontact_plugin/kjots_plugin.cpp
++++ b/src/kontact_plugin/kjots_plugin.cpp
+@@ -33,7 +33,25 @@
+ #include <QIcon>
+ #include <QStandardPaths>
+ 
+-EXPORT_KONTACT_PLUGIN(KJotsPlugin, kjots)
++#if KONTACTINTERFACE_VERSION < QT_VERSION_CHECK(5, 14, 42)
++/**
++  Exports Kontact plugin.
++  @param pluginclass the class to instanciate (must derive from KontactInterface::Plugin
++  @param jsonFile filename of the JSON file, generated from a .desktop file
++ */
++#define EXPORT_KONTACT_PLUGIN_WITH_JSON( pluginclass, jsonFile ) \
++    class Instance                                           \
++    {                                                        \
++    public:                                                \
++        static QObject *createInstance( QWidget *, QObject *parent, const QVariantList &list ) \
++        { return new pluginclass( static_cast<KontactInterface::Core*>( parent ), list ); } \
++    };                                                                    \
++    K_PLUGIN_FACTORY_WITH_JSON( KontactPluginFactory, jsonFile, registerPlugin< pluginclass >   \
++                              ( QString(), Instance::createInstance ); ) \
++    K_EXPORT_PLUGIN_VERSION(KONTACT_PLUGIN_VERSION)
++#endif
++
++EXPORT_KONTACT_PLUGIN_WITH_JSON(KJotsPlugin, "kjotsplugin.json")
+ 
+ KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList &)
+     : KontactInterface::Plugin(core, core, "kjots")
+@@ -63,15 +81,17 @@ QStringList KJotsPlugin::invisibleToolbarActions() const
+     return { QStringLiteral("new_page"), QStringLiteral("new_book") };
+ }
+ 
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
++KParts::Part *KJotsPlugin::createPart()
++{
++    return loadPart();
++}
++#else
+ KParts::ReadOnlyPart *KJotsPlugin::createPart()
+ {
+-    KParts::ReadOnlyPart *part = loadPart();
+-    if (!part) {
+-        return Q_NULLPTR;
+-    }
+-
+-    return part;
++    return loadPart();
+ }
++#endif
+ 
+ QStringList KJotsPlugin::configModules() const
+ {
+diff --git a/src/kontact_plugin/kjots_plugin.h b/src/kontact_plugin/kjots_plugin.h
+index cd62373..4945d25 100644
+--- a/src/kontact_plugin/kjots_plugin.h
++++ b/src/kontact_plugin/kjots_plugin.h
+@@ -24,6 +24,7 @@
+ #define KJOTS_PLUGIN_H
+ 
+ #include <KontactInterface/UniqueAppHandler>
++#include <kontactinterface_version.h>
+ 
+ namespace KontactInterface
+ {
+@@ -62,7 +63,11 @@ public:
+     QStringList invisibleToolbarActions() const Q_DECL_OVERRIDE;
+ 
+ protected:
++#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
++    KParts::Part *createPart() override;
++#else
+     KParts::ReadOnlyPart *createPart() Q_DECL_OVERRIDE;
++#endif
+     KontactInterface::UniqueAppWatcher *mUniqueAppWatcher;
+ 
+ private:
+diff --git a/src/kontact_plugin/kjotsplugin.desktop b/src/kontact_plugin/kjotsplugin.desktop
+index 1339753..d5a198f 100644
+--- a/src/kontact_plugin/kjotsplugin.desktop
++++ b/src/kontact_plugin/kjotsplugin.desktop
+@@ -3,7 +3,7 @@ Type=Service
+ Icon=kjots
+ X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
+ 
+-X-KDE-Library=kontact_kjotsplugin
++X-KDE-Library=kontact5/kontact_kjotsplugin
+ X-KDE-KontactPluginVersion=10
+ X-KDE-KontactPartLibraryName=kjotspart
+ X-KDE-KontactPartExecutableName=kjots
+-- 
+GitLab
+
diff --git a/app-text/kjots/kjots-5.0.2-r2.ebuild b/app-text/kjots/kjots-5.0.2-r2.ebuild
new file mode 100644
index 000000000000..07aaf94d7b1c
--- /dev/null
+++ b/app-text/kjots/kjots-5.0.2-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KFMIN=5.70.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Note taking utility by KDE"
+HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-20.08.1:5
+	>=kde-apps/akonadi-notes-20.08.1:5
+	>=kde-apps/kmime-20.08.1:5
+	>=kde-apps/kontactinterface-20.08.1:5
+	>=kde-apps/kpimtextedit-20.08.1:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES+=(
+	"${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # KDE-Bug 384000
+	"${FILESDIR}/${P}-kontactinterface-20.08.patch"
+)
diff --git a/app-text/landslide/Manifest b/app-text/landslide/Manifest
deleted file mode 100644
index f2fc6d11efe3..000000000000
--- a/app-text/landslide/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST landslide-1.1.3.tar.gz 151003 BLAKE2B 471cc83cbfc1c7ddc437b88514fb48632016e0915fc27c65d502a71b94f83a1184de8a7dbfaf2af8b75963e687c1af903add48e5ac8893308d9cfa07fdcc4c61 SHA512 2b29c416f8af04c0bf048060e0fe67b0b6a5e293485c5e3f68b9d1ce9d63ef66ca3bc58a96f65705c6918542932ef0a2fa6072b17c4c01cfc1975d283b417152
-EBUILD landslide-1.1.3.ebuild 853 BLAKE2B 9739d8899fad89a7fe7461014a251e73a726364bdb11599f55c4b337dc3723f8b2f32c36c6c23a6087be85c642b3def53169cc35cb71502a4e064172b2ad62fd SHA512 7e78381458c8c8b78c13fc85a7c9197e49ba241c83ba30b1434079ae35268667882a86c95c6c0096b0cf9ad608b566c84b7379bbcc0ed8239e662966feff32b0
-MISC metadata.xml 298 BLAKE2B 15316fb3bd0eb0be967bec08510269e31406e72c3cc7623d21cc2334bfb36b8031bf304c4627b085fa64cfec15964cf9a6a486ba29bf312facf1589f36cd9819 SHA512 19a5bf1f42b94a00856b856fc0120024df40a4394a17e61fdacc817d1b355b601595a27cc0f814d3f6b436775799b44aa4f5090daa91452b55d4760e8c89b8d0
diff --git a/app-text/landslide/landslide-1.1.3.ebuild b/app-text/landslide/landslide-1.1.3.ebuild
deleted file mode 100644
index d611bf5b0a04..000000000000
--- a/app-text/landslide/landslide-1.1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Generates a slideshow using the slides that power the html5-slides presentation"
-HOMEPAGE="https://github.com/adamzap/landslide"
-SRC_URI="https://github.com/adamzap/landslide/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-DEPEND=""
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/markdown[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	"
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/app-text/landslide/metadata.xml b/app-text/landslide/metadata.xml
deleted file mode 100644
index 3304ab920105..000000000000
--- a/app-text/landslide/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>naota@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">adamzap/landslide</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index e0dc1db804c2..6017e92fe834 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -2,5 +2,5 @@ AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6ab
 DIST multitail-6.4.1.tgz 155717 BLAKE2B 621e511c74f774681de95c7ad85bac12d528ffac1808ff22b5824c3b97c64397db2d084697a2d4f11a87eab3d4ff29715632d51afa7f7338178a9e89ccdf6e1c SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
 EBUILD multitail-6.4.1.ebuild 1297 BLAKE2B f42d72abd21ec2b2d5e8386dfe5915fabb73538a47dc353956788c3f86d6d7f05a27334dd0e6f94d1edcb48ea0e83d82034a517db67b7c543a83c01a84e6e38c SHA512 1b14d664c5cb2f4d17c96785c59f38655b2241a437e738a345bc479da37e3934441eabbea5deba077fba4b26f05e4e2e18b18843bfcb2f55e64943550cdadf96
-EBUILD multitail-6.4.2.ebuild 1316 BLAKE2B 4cf3af57fc091bf6440061bafa203c549b873bfce4240d5088448b9a183d0e09fffc9ed00767179743cea2f75a95314393c8502a32d850a787f5c667f18c7b35 SHA512 f89a7611e0617a6ba204685ad7b358fd53c1fbec2a6ae9d5886359fe96de2f73b3cd6dbc4797171a0e5e5cefcf42b03074056f4861a6251dfbcff455f65d1187
+EBUILD multitail-6.4.2.ebuild 1315 BLAKE2B 69c6437bcd25047d02850de483fc6533603fd73b94277f25f619770f603b6c1a5440353b8f8e0d46b05959865451325383c316d2aa1f15d1b07b46b4e2fcedf6 SHA512 6c6268804d965d733cd1fb9148012dc4f24693b7ae9d2067d4f3d6262e8826e781bc9a8010f1f4e745fc7b16cdd8f2c4038674051e615886a4cf5930f3af9e9c
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild
index 6fb9bf917d18..86a013c1ea7f 100644
--- a/app-text/multitail/multitail-6.4.2.ebuild
+++ b/app-text/multitail/multitail-6.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
 RESTRICT="test" # bug 492270
 
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 9bc17db6b1e7..929c4bc35bab 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,6 +1,3 @@
-DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
 DIST pdfminer-20191020.tar.gz 4168016 BLAKE2B 53658853f1c6948a3249b56769c4d9e28cfe8e977b8702c3802f2c3d64f5c9f1d228024a3cbc9a5f288f60c991b2738a7aa131021bdb47c1492c83f9682abb15 SHA512 6ba663440f0ac370742f3a300a55d5f810202d960253931dfdb109a30ce3f71cf3e3dd30af9d0f6257365972452813b4ebc2dbee8031e988b7efb9dac15075d4
-EBUILD pdfminer-20140328-r1.ebuild 779 BLAKE2B 7c3f07f51fa5b62654bf4e8b877e1cd752ff6546dd466fd8106fa8e40ebde1f42d7a909dd8a533c5c1fefd3d69ac646cf54e2cb74bd97805e38a6d87956166f4 SHA512 6ea9601e759713156ff3f93025fc362e1abca4f83b96784aed7972122e7d0065fab1a0671d90cb235cd6bc4a4a0e96076b489b6c2e803d054e13fbdb74eeab2e
-EBUILD pdfminer-20140328.ebuild 714 BLAKE2B 521142f1e2d74ad8487d7381e4db1fa73fda77a7e91187df4b6580f558e91dfdef6df8f8bb303ac17e438e2a3d18f7a8d660a94d8b0d2458ed6dea8b1534b2a8 SHA512 301947f92084ac278decbf638235bd539b5b63cb001ff1665965a502d94dd52380c1bde7cb222a7f4bce4639d87d182a3d767391d6f67d6485d53a7c4917440b
 EBUILD pdfminer-20191020.ebuild 791 BLAKE2B 1bf6a0d3232c00a44a99ac991de2fa3c3830e973656f6e57e0fba74e5db6df5efa673491fdce6863e8ec0d171d456ec484735bf0c30dcc249a4c4c51dc0ff70a SHA512 d50cf4520ff4cc536c4a5f8d93481c4974828ed4db00142507bb13726c93f026435f17e6e5a8468f7dc0c561822e9612e1ed41ec7c35f826a57508f2e3ee4832
 MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/pdfminer-20140328-r1.ebuild b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
deleted file mode 100644
index ea6d4f1215ed..000000000000
--- a/app-text/pdfminer/pdfminer-20140328-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-python_compile_all() {
-	use examples && emake -C samples all
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	if use examples; then
-		docinto examples
-		dodoc -r samples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/app-text/pdfminer/pdfminer-20140328.ebuild b/app-text/pdfminer/pdfminer-20140328.ebuild
deleted file mode 100644
index 8406215f4789..000000000000
--- a/app-text/pdfminer/pdfminer-20140328.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python tool for extracting information from PDF documents"
-HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-python_compile_all() {
-	use examples && emake -C samples all
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/. )
-	if use examples; then
-		docinto examples
-		dodoc -r samples/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 622e36c874eb..a1335d81a2fc 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,12 +3,9 @@ AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
 AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
-AUX poppler-0.88.0-pdfsig-crash.patch 918 BLAKE2B 1cafb94e03afb06729633e117951edf0a14c6d52786eee4d785786e249f22fb4579d909f946ec595c6a7a54fbd594b6b1e94006ea37f97cacc49a93336cb2d37 SHA512 8967348da204da57002fbbff55d318e8065ce422e99bc5fbe7d517aed70c5f962dac87996bd949053ff5844f44aac528de08bbb1b2f7131b7852b3f5ad11653e
-DIST poppler-0.88.0.tar.xz 1604348 BLAKE2B 3c78d15871398fb5f2125596f959d98a173de198c8460907be39ca5c5b91a05f0f4048a6ba01b59edb4643c4fdd2333462edf7ab0e0648cd607ffd2deb5a3b18 SHA512 2c4c1333d5bd7411eb6b05fa1c5967b8577798e439a22b2fd119cf7a8e7d519e04b253464c6892d31bae7483a8bda8492755089cef4131f760f95bc3f4e56880
 DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34
 DIST poppler-20.09.0.tar.xz 1642932 BLAKE2B be61275560bf57c639f185b5ebbd8b37b99fd008412f49890ed644e95f4d8f2c4ca865b081eea99f2604d44fa1c0c31bd551339340f03cb43ab7f5a03992f760 SHA512 fbd57dd0754279d4b0a20ccbdbfb06abc5a5d84e63915676353fd42d5b80318904cf7e6ae462db445ed6c6e011fc24675dccbb8bd3597fc6532657a4ea23406a
-EBUILD poppler-0.88.0-r1.ebuild 3393 BLAKE2B 3ab052ad53eaf884e6ae388010b8273c4e801b316490f040786dfd10cc115f420e00fba9a3e8449b89b8ac3f76c5e530601d9ca7f69eb4a57691407289dd9bbc SHA512 4dcd8052f9d6c4bc95c7670090e67de51b85329a91f39d266e9c92870b0931d91eb7c6f6d18039052416a1449b59cb7bded9b3b840db34d8a28b9d96ff234292
-EBUILD poppler-0.90.1.ebuild 3375 BLAKE2B 799e4efb1e1a63debd0c3cda48f8238126416eefe7163d3a823495247ad51802e95e346cf84b676b0b90884c754fe61bb50088d343e18ec4acf74267ac8db31c SHA512 be22676dc458896584ecf1a358cb01fd6fbf5adbfd1c816acbd4b038fd34808048acdfae2ac39520d53a197f21a727dab418a8854d378de73eea788993f0b184
+EBUILD poppler-0.90.1.ebuild 3374 BLAKE2B cbf9b5bcb9d888c7ed553519305dda004948e931573266564ac46c550e77bd8a52e8e93270d0c4f2ba1241d6a9ae2112b6c21ee10c0c1f8a472a8abfe6322c19 SHA512 2e9832d3fd0f7b81796364cbf532d6a212c6b3b0f5211f23f501cb93daadf838e2aff6797675f496d27b95e1199839f441240b1eab37acb8317523d64fdec219
 EBUILD poppler-20.09.0.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
 EBUILD poppler-9999.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch b/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch
deleted file mode 100644
index 4f29727b6fcf..000000000000
--- a/app-text/poppler/files/poppler-0.88.0-pdfsig-crash.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5cdb78fde50e3dc16006070b0884dfb6b23d964c Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 14 May 2020 00:22:33 +0200
-Subject: [PATCH] Fix crash in PDFDoc::getSignatureFields when there's no Forms
- at all
-
----
- poppler/PDFDoc.cc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
-index 572c77be..4b5621fc 100644
---- a/poppler/PDFDoc.cc
-+++ b/poppler/PDFDoc.cc
-@@ -613,10 +613,12 @@ static void addSignatureFieldsToVector(FormField *ff, std::vector<FormFieldSigna
- 
- std::vector<FormFieldSignature*> PDFDoc::getSignatureFields()
- {
--//   const int num_pages = getNumPages();
-   std::vector<FormFieldSignature*> res;
- 
-   const Form *f = catalog->getForm();
-+  if (!f)
-+      return res;
-+
-   const int nRootFields = f->getNumFields();
-   for (int i = 0; i < nRootFields; ++i) {
-     FormField *ff = f->getRootField(i);
--- 
-2.26.2
diff --git a/app-text/poppler/poppler-0.88.0-r1.ebuild b/app-text/poppler/poppler-0.88.0-r1.ebuild
deleted file mode 100644
index f8ff933be71e..000000000000
--- a/app-text/poppler/poppler-0.88.0-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2005-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/99"   # 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.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-	"${FILESDIR}/${P}-pdfsig-crash.patch"
-)
-
-src_prepare() {
-	cmake_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
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-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_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.90.1.ebuild b/app-text/poppler/poppler-0.90.1.ebuild
index 9f6d43e02578..46e8ad792b99 100644
--- a/app-text/poppler/poppler-0.90.1.ebuild
+++ b/app-text/poppler/poppler-0.90.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/101"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index d7d197d8e717..97324d63b6ea 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -3,6 +3,6 @@ DIST QQWry.Dat.bz2 4114875 BLAKE2B 3fb1a3b223b799645fcc7adc3d8158c80551bd1d35689
 DIST WyabdcRealPeopleTTS.tar.bz2 84329208 BLAKE2B 1dd9c00e4e914b0d747876aa566db59a4b973b3ec61fa1ed7a55f885d7f415f573f2f8783eca46c565bc52df4ba3576b3a0f4e863b4f7ba688007f6d6b375209 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0
 DIST stardict-3.0.6.tar.bz2 9341740 BLAKE2B df0ccfbd485dfb514bdcf4edaf92b2faf3c11016b025ca09596adcc12738027395a049d9d27420427acdf5c46923cb43ba521d334f875070f5451b7ff147e36f SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
 DIST stardict-4.0.0_pre20170304.tar.xz 3603012 BLAKE2B c9ac41f1e27c013e9c20e5b5477889cb4933ebaf35629311362ec48e820b10a7492d464ac7eddded697ca49f56f65032a1af36088e8e731643e83532e0586e48 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a
-EBUILD stardict-3.0.6-r3.ebuild 6058 BLAKE2B 06cc43bf8f00ebc08a8bbcbe7482f3ba009cd3c92519c71f1613e745985f7e0b8bf31bb54a15241fd9d362e22e980381ac307661d3233bd161b60c1745255576 SHA512 80708e6f0a022f531a5e706ed72054819f395ff182907d60960deb9a9a62e7533a4c8f88c86503ff200cc80afb5537029c04f39a23c6c1fc8416093e8d1f3523
-EBUILD stardict-4.0.0_pre20170304.ebuild 6471 BLAKE2B 8886d9b8488d049ea0d99770290f914da06873c4b4486063dc27ccc75c1df6d23387d9ebd8aac71b9f6ec9eb7d417b9af47d72954329afb73f8c57270d193a75 SHA512 8d091ac639c52eaa9d17df4b7bbf1aa20a421214067cc6c0bd3a34204007988e73f79e21af34bfc7f64d4ca36798e1b87925e3cbae6425d196c51bc02cbfdf86
+EBUILD stardict-3.0.6-r4.ebuild 5389 BLAKE2B a4926bb81e81b31181ede64891197b2e05d43a69423bfa7cd6ca669627891798784b0a7bc52c597cec045ef3f2bf8e76282a0a193169906b406a81889376a3ab SHA512 d5643b2e9f262ef7c22ca3ba5694ca49cf298f6a48d91471e5c75223414051a75d3489334e1048484acd6aae8317416311ddac98493b2c40187958cf4e4dc92a
+EBUILD stardict-4.0.0_pre20170304-r1.ebuild 5802 BLAKE2B 7f0401d5d338d0c1c08ec07dce73bfd8498a77c410f5f864ed2cc2af587b7624c56461c64220b02ce0ad42e42b5e135779bd8c3c3a99903c5c13ff677a451dff SHA512 92f2df7ece70b5df32285fe2b7976fa3fa75b1f01c5698d9c55188d53214fe78bcecde0caebd301caefbc8b6c99a0c9aa08f4a9b61d87df1936aeb99a853a7f0
 MISC metadata.xml 2668 BLAKE2B f5d9f4b43187c2140f84addb9bf1c2d209d7ef0de7a5081fae594c27b439ef77686ac9fd8b555bc95b76bdef041dab75fbdbe1bf5451bd754b4cfd1dd5d7771d SHA512 caae150f5dd42c45ee5f17659df5700b52ed38c9005c37316df9c4828dcfbbeed1dd585c8c9b44acfe16f1f68f745354ac40e4dc5695df183cbf5c64e82826d7
diff --git a/app-text/stardict/stardict-3.0.6-r3.ebuild b/app-text/stardict/stardict-3.0.6-r4.ebuild
index 66ab1895618e..c41fc396803b 100644
--- a/app-text/stardict/stardict-3.0.6-r3.ebuild
+++ b/app-text/stardict/stardict-3.0.6-r4.ebuild
@@ -8,9 +8,8 @@ EAPI=6
 #       seperate for now.
 
 GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
 
-inherit flag-o-matic gnome2 python-single-r1
+inherit flag-o-matic gnome2
 
 DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
 HOMEPAGE="http://stardict-4.sourceforge.net/"
@@ -22,7 +21,7 @@ LICENSE="CPL-1.0 GPL-3 LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
 IUSE="advertisement debug dictdotcn espeak examples +gucharmap
-+htmlparse man perl +powerwordparse pronounce python qqwry spell
++htmlparse man perl +powerwordparse pronounce qqwry spell
 tools updateinfo +wikiparse +wordnet +xdxfparse"
 
 RESTRICT="test"
@@ -41,7 +40,6 @@ COMMON_DEPEND="
 		dev-db/mysql-connector-c
 		dev-libs/libpcre:=
 		dev-libs/libxml2:=
-		python? ( ${PYTHON_DEPS} )
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -56,7 +54,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
 
 # docs are messy, installed manually below
 DOCS=""
@@ -71,17 +68,6 @@ src_prepare() {
 	# libsigc++ started to require c++11 support
 	append-cxxflags "-std=c++11"
 
-	if use python; then
-		local f
-		# force python shebangs handlable by python_doscript
-		for f in tools/src/*.py; do
-			[[ $(head -n1 "${f}") =~ ^#! ]] || continue
-			sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
-		done
-		# script contains UTF-8 symbols, but has no ecoding set
-		sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
-	fi
-
 	eapply_user
 	gnome2_src_prepare
 }
@@ -162,8 +148,6 @@ src_install() {
 			${PN}-bin2text ${PN}-repair"
 
 		use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
-		use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
-			makevietdict.py uyghur2dict.py"
 
 		for app in ${apps}; do
 			if [[ "${app}" =~ ^${PN} ]]; then
@@ -172,7 +156,6 @@ src_install() {
 				newbin "tools/src/${app}" "${PN}_${app}"
 			fi
 		done
-		use python && python_doscript "${ED}"usr/bin/*.py
 
 		docinto tools
 		dodoc tools/{AUTHORS,ChangeLog,README}
diff --git a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
index 068d4a3d51c6..41900b018b60 100644
--- a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
+++ b/app-text/stardict/stardict-4.0.0_pre20170304-r1.ebuild
@@ -8,9 +8,8 @@ EAPI=6
 #       seperate for now.
 
 GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
 
-inherit autotools flag-o-matic gnome2 python-single-r1
+inherit autotools flag-o-matic gnome2
 
 DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
 HOMEPAGE="http://stardict-4.sourceforge.net/
@@ -24,7 +23,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="advertisement cal debug dictdotcn espeak examples flite
 fortune gucharmap +htmlparse info man perl +powerwordparse
-pronounce python qqwry spell tools updateinfo +wikiparse +wordnet
+pronounce qqwry spell tools updateinfo +wikiparse +wordnet
 +xdxfparse youdaodict"
 
 RESTRICT="test"
@@ -47,7 +46,6 @@ COMMON_DEPEND="
 		dev-libs/expat
 		dev-libs/libpcre:=
 		dev-libs/libxml2:=
-		python? ( ${PYTHON_DEPS} )
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -63,7 +61,6 @@ DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig
 "
-REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
 
 # docs are messy, installed manually below
 DOCS=""
@@ -80,17 +77,6 @@ src_prepare() {
 	# libsigc++ started to require c++11 support
 	append-cxxflags "-std=c++11"
 
-	if use python; then
-		local f
-		# force python shebangs handlable by python_doscript
-		for f in tools/src/*.py; do
-			[[ $(head -n1 "${f}") =~ ^#! ]] || continue
-			sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
-		done
-		# script contains UTF-8 symbols, but has no ecoding set
-		sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
-	fi
-
 	# bug 604318
 	sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac || die
 
@@ -179,8 +165,6 @@ src_install() {
 			${PN}-text2bin ${PN}-bin2text ${PN}-repair"
 
 		use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
-		use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
-			makevietdict.py uyghur2dict.py"
 
 		for app in ${apps}; do
 			if [[ "${app}" =~ ^${PN} ]]; then
@@ -189,7 +173,6 @@ src_install() {
 				newbin "tools/src/${app}" "${PN}_${app}"
 			fi
 		done
-		use python && python_doscript "${ED}"usr/bin/*.py
 
 		docinto tools
 		dodoc tools/{AUTHORS,ChangeLog,README}
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index 4d65aaf6ce1f..d7d49492f2ac 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,6 +1,3 @@
-AUX 51txt2tags-gentoo.el 214 BLAKE2B f5c5aad466fbc7eaf1ec36dcd4a52a914f1710f10fdce35640391ea4d9599903574967c1a7ab63c66f84ade4443f256d1bc197ec8179a6c3af75f1ec79cdd404 SHA512 e2a76d355c2fb163fc5c9b8013e04240206c8301fe2351fbdbc53d711625121e22cdeb2336488e6bffc355258a6d5dacbd48a2cec2d618dc4db17eebf0496feb
-DIST txt2tags-2.6.tgz 544724 BLAKE2B 9c8c37c6e003c7252276b32bacd373fe9143fdd93fdbc2bf0c23a83e2123c2a9636be5f106d248f2f0ecccd71eb9bc68cf8343557f10a7e6f8deacd8ade975ee SHA512 716e975f45dd304b6fd7d4e5aa8bd12e57c54120d892ae9abe11f1f3b5aeb747d8df0a9ffd34b8b5e6c8d422aac8830477f9a332c9e94040e1aa9946ebfe051e
 DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
-EBUILD txt2tags-2.6-r1.ebuild 1670 BLAKE2B 00ecbc9792141f79ebb9488767c4ae56632117a898ce65b55517ec74fabb8679c51091c7cc56ac05f6deb9b07fe12d5106f93a7d1f6266ce698e18c2cc3789bc SHA512 1e106685085d9e282e297a753f061c901cc44ef785b9f3134684af3c3a9b695c98a50398922616a2524628cdc4770c24386c2ff170a910f6dbb79353ee77536c
 EBUILD txt2tags-3.3.ebuild 514 BLAKE2B 9c8f5e2adaa6362cb62ceddefb156e69a04bb26fe0568477d228f6c1134027caa909fe4d5ce9c78e2a18ce4bff076790225d8489f9c0883ce71cfe6321d3e471 SHA512 c03da7aa20627b69eb300f0ee465dacaa9d7caedfef925908bea9a310a346e4beea68f81fa76951fdd9b1a82e371b154128071ca25854141757993402a5b501c
 MISC metadata.xml 245 BLAKE2B e2a831e97b1c75aa3e161109943ede73b2d686a83fbb11b84d3f201c8214b997d759c93298c2d7f14a6a8486443cc52ea9369fc12476747528509d9d8807b1c9 SHA512 4fa0282e97338eef99cd0be8c2cda4a5eb6d6c1393a41782a45ad172c9b99690d572598f3de81f5828ab568fe32d4b28890c22908f86c73ac8e399837f28fddb
diff --git a/app-text/txt2tags/files/51txt2tags-gentoo.el b/app-text/txt2tags/files/51txt2tags-gentoo.el
deleted file mode 100644
index 0b98bd66b8b2..000000000000
--- a/app-text/txt2tags/files/51txt2tags-gentoo.el
+++ /dev/null
@@ -1,6 +0,0 @@
-
-;;; txt2tags site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-(autoload  't2t-mode "txt2tags-mode" "Major mode for editing Txt2Tags files" t)
-(add-to-list 'auto-mode-alist '("\\.t2t\\'" . t2t-mode))
diff --git a/app-text/txt2tags/txt2tags-2.6-r1.ebuild b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
deleted file mode 100644
index 142ed1befe04..000000000000
--- a/app-text/txt2tags/txt2tags-2.6-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit eutils elisp-common python-single-r1
-
-DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
-HOMEPAGE="https://txt2tags.org"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="emacs tk vim-syntax"
-
-DEPEND="${PYTHON_DEPS}
-	tk? ( dev-lang/tk )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-SITEFILE="51${PN}-gentoo.el"
-
-src_compile() {
-	if use emacs; then
-		elisp-compile extras/txt2tags-mode.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	dobin txt2tags
-
-	dodoc README ChangeLog*
-	dodoc doc/*.{pdf,t2t}
-	dodoc -r samples extras
-	newman doc/manpage.man txt2tags.1
-
-	# make .po files
-	for pofile in "${S}"/po/*.po; do
-		msgfmt -o ${pofile%%.po}.mo ${pofile}
-	done
-	domo po/*.mo
-
-	# emacs support
-	if use emacs; then
-		elisp-install ${PN} extras/txt2tags-mode.{el,elc}
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax/
-		doins extras/txt2tags.vim
-
-		echo 'au BufNewFile,BufRead *.t2t set ft=txt2tags' > "${T}/${PN}.vim"
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim"
-	fi
-
-	python_fix_shebang "${D}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 9e1b0097d603..4924011fa392 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,6 +1,4 @@
 AUX xiphos-4.2.1-appdata_metainfo.patch 312 BLAKE2B 9d08588d0cce33f56b45a882246528afcf36fd9b24bbf7fadeec270a24d230bec5a0ef2436b7a70358aff9946e19ed3bd60304bb786f4920f389ce2389bb146f SHA512 59d9ea167ccdbdbc7b90eedbe58e12fe9b11043b48442143d6bff67f2853d717597e7023c7898936a63e6e9def599b6309330e31a394dfb4c807ae95fdc63d52
-DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
 DIST xiphos-4.2.1.tar.gz 28373966 BLAKE2B 33f4cb8884add292047d4c9a594ee467f6a294c0732af54802ffa556c5d97978f398fc1b5da52d5620413305d4efe9ea1a3e680dc4db1dde962d5c9028c360cf SHA512 4ce92b86e1915fa4d0ffa867a3542ff697195dd176dff1c5d00193a9556ecfc60623049bf45837a2f60317c392b3c4365742a7490ac8304a6f1b9491e3318077
-EBUILD xiphos-4.0.6a-r2.ebuild 2053 BLAKE2B b9bd97ee6e3da5a10b98db3eaf45e6d5a746e852e4b7762e9fafca1213c471794035170fb9b43563144e7666709e749aa8748701435331e399d647441ca12ec6 SHA512 1a9b16294c1013f4b35da37c3bd3c6169e3e067f95f8d9505ab1042294df1c5d4877eb9353018f1ff71843e915c676127157b4c4a8d27ac77a4ee42f64c629d5
-EBUILD xiphos-4.2.1.ebuild 1335 BLAKE2B 22174bc8c2942e832255746e6151bfa0807574bdaa1f53858344c38958b8e2958195e2620570745c6aecabd6a8d6dd3539e76b54b06f35c29f97af180d5eddae SHA512 14019cd40634b2891de9aa894e932db91055ce9c26d5a514392ee50f43a75e27470a399101a0e11c9fa246425976b8991c7c3398c1675823468c4539e20e83a3
+EBUILD xiphos-4.2.1.ebuild 1334 BLAKE2B b69913a9017a167adac3c5012a7d3965ebfa9055a32fbb4ab9cbe9110bc694ce5ccb8f1b1fe7917d7b290e8e467299f571564743855168ef3cb401c58628c6a2 SHA512 e0c4a9c7d94f3c796aea434b1811c3c4ac5eb1ee1592a47a4955ec7b82c5c151769593540f2d6e605306f41203097e6f2806935e196041cdf3525d5533487690
 MISC metadata.xml 325 BLAKE2B 1fcf098a010153588db7bd29c726c965e4d0505841c47be0b7a75f07b4e785d7c42a3321d67079a66782ab5edf4f39611a9f4ac2578d552f93462632c872bfeb SHA512 0b9f3bfac06d3847983a5117be9d101d01ddb02511b5fc832451de6cec703ac46f5a18d10e330af1d79147338b077b957d4d1263b8113dc3e0bded92267714a6
diff --git a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild b/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
deleted file mode 100644
index 7521fa24db4e..000000000000
--- a/app-text/xiphos/xiphos-4.0.6a-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
-
-MY_PV="${PV}-20170820"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
-HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/sword-1.7.4
-	dev-libs/glib:2
-	gnome-extra/gtkhtml:4.0
-	>=gnome-extra/libgsf-1.14
-	net-libs/webkit-gtk:4
-	x11-libs/gtk+:3
-	$(python_gen_cond_dep '
-		dev-libs/libxml2:2[${PYTHON_MULTI_USEDEP}]
-		gnome-base/gconf[${PYTHON_MULTI_USEDEP}]
-	')
-	dbus? ( dev-libs/dbus-glib )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook2X
-	app-text/rarian
-	dev-util/intltool
-	dev-util/glib-utils
-	>=net-libs/biblesync-1.1.2-r1[-static]
-	virtual/pkgconfig
-	sys-devel/gettext
-	app-text/gnome-doc-utils
-	dev-libs/libxslt
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
-		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
-		wscript || die
-	default
-}
-
-src_configure() {
-	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
-
-	tc-export AR CC CPP CXX RANLIB
-
-	CCFLAGS="${CFLAGS}" \
-	LINKFLAGS="${LDFLAGS}" \
-	SGML2MAN="$(type -P docbook2man.pl)" \
-		./waf -v \
-			--prefix=/usr \
-			--gtk=3 \
-			--enable-webkit2 \
-			--debug-level=$(use debug && echo debug || echo release) \
-			$(use dbus || echo --disable-dbus) \
-			configure || die
-}
-
-src_compile() {
-	./waf -v build || die
-}
-
-src_install() {
-	./waf -v --destdir="${D}" install || die
-
-	doman ${PN}.1
-	dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
-
-	dodoc Xiphos.ogg
-	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
-
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
-
-pkg_preinst() {	gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.2.1.ebuild b/app-text/xiphos/xiphos-4.2.1.ebuild
index 7a03b2cb28bb..a79db9af7296 100644
--- a/app-text/xiphos/xiphos-4.2.1.ebuild
+++ b/app-text/xiphos/xiphos-4.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="dbus debug"
 
 COMMON="sys-apps/util-linux
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index e3617690d757..96d7d3aae682 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -15,5 +15,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.02-r4.ebuild 3731 BLAKE2B 718d8442527cf68dc6ffa3bb3a94b8431ed0afd87dd78056f3b31d4a5e36c48ee65aac4c4e4cc827b8894aa6fbe2af1987d190eac9df00707efc79238f9b1649 SHA512 8444474a1f8e8cf2cc6adf361ac5ac0543f583d7ad148106d0c65010367f3fea77cb9a72e723c29ce3e67c7585972749aa76f1461af3b7374f1709ba37e5082f
+EBUILD xpdf-4.02-r4.ebuild 3854 BLAKE2B d2419081bb8fdf75f82edf9b071b621ae0d7dcd01e6f8ac134b87989baf475de0501e88934d053fb47e504bfeb8013f07145434c472e0215f90bec2e9e2fb989 SHA512 a59a7dc6c78b6075f50f0076c49cab91fddd0f4dfbcb389eb47865aeaf7d10740ae5f874316ffb8b2af0498005ff325d91b3b2e4509a62c43a58c6deb1bed87e
 MISC metadata.xml 992 BLAKE2B da5a96221c19ec9db95204df4ddd68644d14f3940ef4fc367bbf2fad9a6c69368401f8a299d14210fb6706d479b7950621360967c7549f7c78c2cda87398767d SHA512 2916fbad9b12267929b58fa8b385df4bdfa8cbe0e32d51c9298e421f2e21729c920b18faec4f648b87aab37150c67b1aad441e36a3d6014e45f226d9baa0a568
diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild b/app-text/xpdf/xpdf-4.02-r4.ebuild
index 4311f1b32efa..288d1e759015 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="The PDF viewer and tools"
 HOMEPAGE="https://www.xpdfreader.com"
@@ -65,7 +65,8 @@ src_prepare() {
 		sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
 	fi
 
-	cmake-utils_src_prepare
+	xdg_environment_reset
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -80,13 +81,16 @@ src_configure() {
 		-DXPDFWIDGET_PRINTING=$(usex cups)
 		-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 
 	if use icons; then
+		# in some cases inkscape tries to write font cache to the
+		# system dir, see bug 739166
+		addpredict /usr/share/inkscape/fonts
 		local inkarg="-e"
 		has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"
 
@@ -101,7 +105,7 @@ src_compile() {
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	domenu "${FILESDIR}/xpdf.desktop"
 	newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
index b064f76eb908..2937c33d91d7 100644
--- a/app-text/zathura/Manifest
+++ b/app-text/zathura/Manifest
@@ -1,8 +1,10 @@
 DIST zathura-0.4.3.tar.xz 145796 BLAKE2B fe360d6ea2a11138324784beec8e8ebe0eaa83e4e682785a50265bbd0a77be0dcab4cd523923462398faaf918a4d304de148d64972dc9b6cb96578476e0ae6eb SHA512 427948025c20b2badb00921d03ec83e26806fd90d0d50cdcf0f3bcf645cd7206695faa3b5a7698d3d70b9bd60e8e68c920cf1e7f29855dd11a1a8ce6a7f8160b
 DIST zathura-0.4.4.tar.gz 194105 BLAKE2B dc99005c6e967a46af0db0001193d1b1551e9adb78acc88343096407ed4a61b889be600acaf83b45bd603e3b7c4b93402f619e06e7146089d4990309d3301d5f SHA512 8d1e5969cc2f9502d7d966d3341c8f7437422f2dcf952bc2567a5061e611c6fe90c2bc6670963d81b608aa621d70f77ec513d6ab9f03304894bd9ac648aaa6e7
 DIST zathura-0.4.5.tar.gz 195275 BLAKE2B c50793fac6e473c7ccc4cccf15674dd8f33c504675e95501d05dc396dc4803f327e0144c72e6182671118ec1234cbd5a75ad8b6ea129bc7d471e683ff90ad392 SHA512 9ce6c7745d83d7e21fcbbc6a7c799a4223cf77afbe1c933b710c1c7920c98ae1edcf683ae42433f448a091eb317f2b71b3bde9d1b27c8089d1adbc9aa0ab4e78
+DIST zathura-0.4.7.tar.gz 199857 BLAKE2B c4fd99049ed81c7965cc474f0c543ebd1aef55ff63312c21a33ce9161afb78da1c9f0a13ff86d5d69b2ce6b17965632de282a9c8bd60b0a8297d96528b5f2c5f SHA512 adfe69cbef6088a6fa7d49686194a0a3dc13757535974476742c733076dc5bb5ad95ed447d50cd1efdfb23fe2fb1f64452d5d8aeb27a80c3101f2ab5c68f9b60
 EBUILD zathura-0.4.3.ebuild 1334 BLAKE2B b8887cbbf8b755c44d79bf4c517ea4c6669566b5576584cf5f6b20fd918ef53ca36ec8918608070548556978a776fa80873716c108e32be0e252f9acc350ea1b SHA512 c9a38f2029607e41eac29b14446028eb6969317360039add7b3d7d8fa9add0c3fbba40d900053db498c7d0e6e83af67f6aec774259a2bb7613f6901631b7bb39
 EBUILD zathura-0.4.4.ebuild 1347 BLAKE2B 48da5928fb897cb42e2d76dfe24b4d6b55aefd8fd336d41af466b00a01dd75d59566f0b1d9a57d982ed94d543f8862f8205979e2bb2c084b162c77219b9dbe2e SHA512 58a2e7db42b483c922412a74bd47e938355ce828b9aa172c1a2bfd4a10690892101641fada3ff080cbdd0ca9dc8e491768ac114ab36a7cb560061b830b393d2a
 EBUILD zathura-0.4.5.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
-EBUILD zathura-9999.ebuild 1350 BLAKE2B 8f4d976a62b7ab8ec19e300a85742aa270c965ab2dcdcb3a43aa81b2db3faceaf7cee4a5dc41870edd96b6180487026f965743e4fcc2cdc2b0221be1e33241e9 SHA512 195dcff04cd249ab9860f0468e9df0f3470256d52a03bd37d982f1469ad6a6fdf2539bce2afa47996fe5316c7f173b851cb343d51e75545333236ad91dd4b281
+EBUILD zathura-0.4.7.ebuild 1351 BLAKE2B 3e72318b62ec7bf5f87d1dbf8082c9bb9388f6558f91f0a4feabd21d187ce834b8a60965859b765ceb91d002d15123aa3d2e8ca980953e63e955a7a76aaa5f44 SHA512 a95763c5be630cb6010b13be822bc75baf49da7df0bacf70026fe4779029af2513185c56c42d1420218833ffd1f87a7948dc3e45067085a3a152366720b15859
+EBUILD zathura-9999.ebuild 1347 BLAKE2B 156ee70df80e96cb4c9a4c06f39600538b4698cd873b2e06894cb877db54698caec7ae6c5cb219fe0fc00252721434ef9fd51476ff10cb828a105f675b00cd40 SHA512 31dd85e424cb33f4ce25d89252fa67c4757bf1280156873d3e94596022cbbb1bd38adb6d2757f2b93e1612120d73416f131ebec3fcd34ad2f3030310a883cfc2
 MISC metadata.xml 768 BLAKE2B f7be45d9f58cc3651406dc6f56da51f2544cb7361035e4d1a44a6a7e58010c1950bcd1f636ede8f89567d643d1bc2daf9733a781aa30d8425584f135757ae971 SHA512 c23719aa6fe1834996539157de6d80f56cf48eafa813d05832a8fb938f71e96ecc1d7b77467adce03274d2fccc375cad23bd0b3eb71c6037f9e4cbaf08874004
diff --git a/app-text/zathura/zathura-0.4.7.ebuild b/app-text/zathura/zathura-0.4.7.ebuild
new file mode 100644
index 000000000000..4d891afcd064
--- /dev/null
+++ b/app-text/zathura/zathura-0.4.7.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson virtualx xdg
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/pwmt/zathura/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc +magic seccomp sqlite synctex test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND=">=dev-libs/girara-0.3.3
+	>=dev-libs/glib-2.50:2
+	>=sys-devel/gettext-0.19.8
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	magic? ( sys-apps/file )
+	seccomp? ( sys-libs/libseccomp )
+	sqlite? ( >=dev-db/sqlite-3.5.9:3 )
+	synctex? ( app-text/texlive-core )"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="doc? ( dev-python/sphinx )
+	test? ( dev-libs/appstream-glib
+		dev-libs/check )
+	virtual/pkgconfig"
+
+src_configure() {
+	local emesonargs=(
+		-Dconvert-icon=disabled
+		-Dmagic=$(usex magic enabled disabled)
+		-Dmanpages=$(usex doc enabled disabled)
+		-Dseccomp=$(usex seccomp enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsynctex=$(usex synctex enabled disabled)
+		)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index 08b6a2a8e21d..96647a9ccf49 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 DEPEND=">=dev-libs/girara-0.3.3
 	>=dev-libs/glib-2.50:2
 	>=sys-devel/gettext-0.19.8
-	x11-libs/cairo[X]
+	x11-libs/cairo
 	>=x11-libs/gtk+-3.22:3
 	magic? ( sys-apps/file )
 	seccomp? ( sys-libs/libseccomp )
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
commit	8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree	230f3135ceaace633cf93e9838b185c4a6664c2e /app-text
parent	9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)