gentoo resync : 04.05.2021

24 files changed, 217 insertions, 83 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index ec1797b5b20f..73188b88ac9e 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index a96629b2330d..d579f919da48 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,5 +1,6 @@
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
 EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B c198997bd2b46f796e5ce31812830be1073d02fe4d716d5cd7e9d04c01b3bc792134e0f715f330f73e5e73e083206fda8211269eb9cfcda83e85221572fa0ef8 SHA512 774cae08ce0940d27e2bb4961509e005fe134bf2eeb59aa3b60dd98aca1786acc4bd6b6d438d8f936424eaa17a3bc174b77f89dbccee4908c23c3aebe2005e0b
+EBUILD djvu-3.5.28-r1.ebuild 1539 BLAKE2B da03e8d56f687108b2e8721ef390ebfe48a1fc6abdc57695c247190e3cf3fb19fb71e2b56f06c3ad1305a018f02f760707760912820074c8ca79cf4508b63fa5 SHA512 ea163dd85a00aeb658e9c1dd3d57504e9736c76afdcac5ea8c7c0102631c5a3ea05f63e9905e7ea9eab5fb23e051aefd4d408dd377c664ffd9329006e137fc5f
 EBUILD djvu-3.5.28.ebuild 1460 BLAKE2B 0676c99f9d5a56f052ee72787096fbcf109e4bf18783ec5e0f3d8604af04b4e927916951ec5c0936f73f42a6e65a4eb66f98148ac99921c1682f57cd15b22e2c SHA512 c90c9f93d60fc510a6da17027d3f85b9b15867e1c83359ba3c34c87c71083a6d3602eec24731dd8c9fc36117a271691bfb405366a5c43830c7796310b4b9cf3d
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.28-r1.ebuild b/app-text/djvu/djvu-3.5.28-r1.ebuild
new file mode 100644
index 000000000000..af3433f46f91
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.28-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic optfeature xdg
+
+MY_P="${PN}libre-${PV#*_p}"
+DESCRIPTION="DjVu viewers, encoders and utilities"
+HOMEPAGE="http://djvu.sourceforge.net/"
+SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P%%.3}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="debug doc jpeg tiff xml"
+
+RDEPEND="jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}"
+
+# inkscape/rsvg-convert are used to generate icons at build-time only
+BDEPEND="app-arch/unzip
+	|| ( gnome-base/librsvg media-gfx/inkscape )"
+
+DOCS=( NEWS README )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
+
+	# We install all desktop files by hand.
+	econf \
+		$(use_enable xml xmltools) \
+		$(use_with jpeg) \
+		$(use_with tiff) \
+		--disable-desktopfiles
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use doc && dodoc -r doc
+
+	# Install desktop files.
+	cd desktopfiles || die
+	for i in {22,32,48,64}; do
+		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
+		newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
+	done
+
+	insinto /usr/share/mime/packages
+	doins djvulibre-mime.xml
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "djviewer or browser plugin" app-text/djview
+}
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 79d76f1a7ff0..68d2041adde5 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,3 +1,5 @@
 DIST gspell-1.8.4.tar.xz 424356 BLAKE2B 031787c4f5c3f3cfe21d5f74ec72117818da43313c5e6dffb79581ca07033aede2ecf236ffdf2197938d62727c5bd3913d1362e02be7109b0d498304949e1d44 SHA512 adb481590442d81040151746c7747791d76248b1b35af1702dc5389efbd2e0c6bdda070b8e84384d22f4922b5a382ac2c6519e425f417ec85c8efbe22dc38c82
+DIST gspell-1.9.1.tar.xz 424252 BLAKE2B 436e6af50f7d1058dd7692c22b5a5e18c25cc76ea6816193e48728f7e1d55ef29af26127403a40d594a2125e4d3e1ee889abe067d2c065de74ae95ca431e5fbe SHA512 72f1fb384e02bb73397b457c3e8a7b98393c9fab5c0dad07f84d1db3f6b75c093663cc83c13fefe868424c503abc2fb89c8b045d0495dd43ddcedad025f23bca
 EBUILD gspell-1.8.4.ebuild 1477 BLAKE2B 1f646c4fbff986066b6ac3304082a6fd724dbec71bcec313d17039c2d0849f9ef7ee1679c633d8dc98b38dfe12db10358f76a1d5bd93bdff34ceaa6714fc4e36 SHA512 464249fffd2f300ccccd0f59443010b132328bec054863760a097816a100588a83af5df29162351c2ce37315ceb9d3ecc034d1501245b0441a404811b98d82df
+EBUILD gspell-1.9.1.ebuild 1494 BLAKE2B 483fe7669a997593be8d71cb5b4f102ea1215b2954a3cee23cb337a5f316619cc51e9842ff07130d8635da6606495ea6e6fc35cb7af39a8eb7c05c3778c6b223 SHA512 becd98408567af2b1287980cc1d7578415938175e2977436daccf25614a5705824e5066f7e28945bcb8cfa654e32f3ef1764fcb722c95686852a9c465ea36927
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.9.1.ebuild b/app-text/gspell/gspell-1.9.1.ebuild
new file mode 100644
index 000000000000..a2a1f1502ecf
--- /dev/null
+++ b/app-text/gspell/gspell-1.9.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="+introspection +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+DEPEND="
+	>=app-text/enchant-2.1.3:2
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	dev-libs/icu:=
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		app-text/enchant:2[hunspell]
+		|| (
+			app-dicts/myspell-en[l10n_en(+)]
+			app-dicts/myspell-en[l10n_en-US(+)]
+		)
+	)
+"
+# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
+# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
+# however a different backend like hspell or nuspell + their en_US dict might be fine too,
+# but we don't support them at this time (2020-04-12) in enchant:2
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index ef22e6c9ba61..0f422709885a 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,3 +1,5 @@
 DIST gtranslator-3.36.0.tar.xz 2121776 BLAKE2B 745ae74a9a1a47af609b30712f5e6e99474081da9136cc15ecf0bd121e0dd01d326574466ddf4551df7255247a6a895dd468b085cee91735fe8883e4feb16c97 SHA512 63393a33db031ea549763113d6bc55cd00c081e671a31654d225968d8d31d671ca7e577b4df8336603fe2c769c5c443e9ebf69d558c888438d194a503e044044
+DIST gtranslator-40.0.tar.xz 1509940 BLAKE2B dbf4c4a8765167177959c058b29563a2c3190e103a9f462a976bfc416c7cd995c649b549a40aa6f7c9b26502c5d56f3e4252a52919de979167f7adb5381604fc SHA512 214c5360ada6c98e9e7cd6a653bdc9a1dc5dd6cca995295369f8f9aac7261680fa521f2d2528f275233479d55ef1b03ee9ddc4a4e734e27a25bb24172c855a47
 EBUILD gtranslator-3.36.0.ebuild 1047 BLAKE2B 078ac2c56e4a4cb779bbb195f4bf5a04735c18eb7e4cc3250ba2d2b2e2a5f456aa0688a20f3787a5c5e8a1b364ae8c06fdad7c4061f2a2e69e716c7120b75039 SHA512 5810d411679934605ac7b8285ff87abedd8eb1ad443392278d8fed50dda3557b8bbcc006abb614879d07c4ece98c5d9a4d7c87ec801ea5c748d17edc4be73fc2
+EBUILD gtranslator-40.0.ebuild 1084 BLAKE2B 1eb12502017a3f85c8e4e57b9f7e19aae744e12f26136de757977a2334922b6d7e001eda1997afbba088955934f76e13a798568974373b5a8448b314bc380634 SHA512 7867f37a94cc5e969596ede7c8f7bd2b75c381d4efae29788c6129f3b587ceba47f4cce86680630d37db35a2a12d974bfdc190a35f2515b1a1460293891679cc
 MISC metadata.xml 812 BLAKE2B 9a347a373b7b39cd522c7bcacd845252798a5b9b06cef89ce14b71160e6b6673d65d5d9eee806c52aa104dde2d937894cb0e12a8d51b8d53feecb4bd52bb3db2 SHA512 e9cab01e3126862ab79cd223d87ed3bb927844b6a0cd7a40e94dc6ece54a2e2c4fe820032b4dd3c25b876a6704c866f3429f5ad98d82b9893ba9337a3a85d6a4
diff --git a/app-text/gtranslator/gtranslator-40.0.ebuild b/app-text/gtranslator/gtranslator-40.0.ebuild
new file mode 100644
index 000000000000..aaa8db2bfd1a
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-40.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="GNOME Translation Editor"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk-doc"
+
+DEPEND="
+	>=dev-libs/glib-2.36.0:2
+	>=x11-libs/gtk+-3.22.20:3
+	gui-libs/libhandy:1=
+	>=dev-libs/libdazzle-3.33.90
+	gnome-extra/libgda:5=
+	gnome-base/gsettings-desktop-schemas
+	>=app-text/gspell-1.2.0:=
+	>=x11-libs/gtksourceview-4.0.2:4
+	>=dev-libs/libxml2-2.4.12:2
+	net-libs/libsoup:2.4
+	>=dev-libs/json-glib-1.2.0
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.28
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index c03d9b97e799..377c7783ba45 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -1,4 +1,4 @@
 AUX libebook-0.1.3-icu-68.patch 991 BLAKE2B d8b7cbd831e65cdd82131d13c50558e2ffe4ed5ab72c6f576267921176ff5d65be2a0c71b3c1cbd853db9456d6a7c20ba27516fbb7f4b7a83e22fa0680cd23ad SHA512 5378d95e926e4b385b8dfa957254b5a1d2b943be5562124b897ead5a81e2922a39d37768afdd010e18655f2a184d82c837b19ab7f862b19ff71c0d5e664c076b
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
-EBUILD libebook-0.1.3-r1.ebuild 1062 BLAKE2B 34ec7e280b67c138c15a47f46d867490150cbfdf95e520824a267bbe0734c715ea1dc9aa784d388b0a7673146668af0043ef3038672cdf0f3f2a8fa7eea052ed SHA512 2c98c078ebb77ff932f760b68316a98e0bc0d0989bf6d05d58208b1948a0bbd5407d7cde85d6539f2ec06e6997f115d45aa6418dfe599f0082f9939ed8eb1586
+EBUILD libebook-0.1.3-r2.ebuild 1053 BLAKE2B d2b59bbaa3c6a6aeaefd06f3e5bdad8c8f6597355eb114041e5c7aac3bbd7818fddeddfe2a211218376dd67a32acbf8f19cd3b89558056431424479fd16e8ed4 SHA512 c1492ad0a0936977bdd26fad7abedae7b7c501d5c0a37a74aea0f2a867641c81e313c9dd9a90bfe6053a94244c3d4c4c57501ca780169772795242ca9b2c5163
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/libebook-0.1.3-r1.ebuild b/app-text/libebook/libebook-0.1.3-r2.ebuild
index 8f1af5bceffe..28eae3a3163b 100644
--- a/app-text/libebook/libebook-0.1.3-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,11 +27,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-libs/boost
 	dev-util/gperf
+"
+BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )
 "
-RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index f5791a8b4642..87eb512d99ec 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,4 +1,4 @@
 AUX podofo-0.9.6_p20190928-cmake_lua_version.patch 522 BLAKE2B b911b2ab2b35f5eccb58b32e575a775fe43cac1576831bb4e47d10c666a1e7040d8c01c865ee63ef1c3ff3c1a1feb2059dc25c71924b61995302dad21c32c868 SHA512 953f41b44468918aa96af42ecf3de8e3dd0d7721ed7c6283d8a6d44941caf70d9ef63d7d59ee1d94081fdc91a915ba8770bc335f8af5d60b24cd1f6c04698f6f
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
-EBUILD podofo-0.9.6_p20190928-r100.ebuild 4842 BLAKE2B ddc2274791a3c42af1ec1fdff1e02797c755fe1db4a37f08ebbd4be44dda679811bdd1e97309c4dd8ffa96b3c3be53d87941777e726920b6514a8d31c7286d79 SHA512 ce64fc63bd56dcc9c207bf07288c0780683ba9504e1a22c26f57f4c8ba79f52e3bf601f08aec4e6deb5b14b8b50c0a6441b05dd788d4c9613e1ecfc78d32154e
+EBUILD podofo-0.9.6_p20190928-r100.ebuild 4619 BLAKE2B 972cef8e4fb71b257d424f4c06614d44cb530cbd18d50bacc58f4bea760d85ee4002242331b6cc70c761275401bd8436e75646e4d2f2c73540ad46a1bcf30a67 SHA512 f9d2f217fe6cb486c0d0fc98a0b4166998098585dc60c1ccb2ca57133182603453a10a03db6df4cd7e949214e8a9abbc65dc898a495389839ed65b772f8cca7f
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild b/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
index 722fcecb298b..aab395fe5f58 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
@@ -14,15 +14,14 @@ SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="+boost idn libressl debug test +tools"
+IUSE="+boost idn debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}
 	test? ( tools )"
 
 RDEPEND="${LUA_DEPS}
 	idn? ( net-dns/libidn:= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	media-libs/fontconfig:=
 	media-libs/freetype:2=
 	virtual/jpeg:0=
@@ -44,11 +43,6 @@ src_prepare() {
 	cmake_src_prepare
 	local x sed_args
 
-	if use libressl; then
-		sed -e 's:^#ifdef PODOFO_HAVE_OPENSSL_1_1$:#ifndef PODOFO_HAVE_OPENSSL_1_1:' \
-			 -i tools/podofosign/podofosign.cpp || die #663602
-	fi
-
 	# bug 620934 - Disable linking with cppunit when possible, since it
 	# triggers errors with some older compilers.
 	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index a5f8c5179960..b06298c10b32 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,7 +1,7 @@
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
 DIST qpdf-10.3.1.tar.gz 18956768 BLAKE2B 1581799b7bd08e28829fd26571ddaa06fc8460fd4f6935a4f69374e49c445cfcbe824175de7137817a26278c2f58d7524f6440181945064fc853f4dd30b2d528 SHA512 def94fe09770e67fe13bd3fc946667fc2935e7c448eb43602e15218e5b50f452e4f4152411f818115620e67934890c37203663537ac77ed1fcd4317e01a6d623
-EBUILD qpdf-10.0.4.ebuild 1305 BLAKE2B e038fd3c2cdc1674028bc5957ce45d38cff6a706afd5184e55bf2d4aadf2261a9ae0f9cec78913ba74d50140c8f98046f441dfd5c038a8ea7110663503b3f042 SHA512 431bbe1fae4e1f0521b306e62a0e73620e97646678f5a164b25bbe668d092b9428028b32afd26fea1cd7a0d97098561496162293ce8780fdd7d8a81d8530c3c9
-EBUILD qpdf-10.1.0.ebuild 1305 BLAKE2B e038fd3c2cdc1674028bc5957ce45d38cff6a706afd5184e55bf2d4aadf2261a9ae0f9cec78913ba74d50140c8f98046f441dfd5c038a8ea7110663503b3f042 SHA512 431bbe1fae4e1f0521b306e62a0e73620e97646678f5a164b25bbe668d092b9428028b32afd26fea1cd7a0d97098561496162293ce8780fdd7d8a81d8530c3c9
-EBUILD qpdf-10.3.1.ebuild 1311 BLAKE2B ac435cf51da6b724772275ebbe5a3e0421db00b51c9a59741cecdfe40fee0417f10c3b97b55f4fc69a014a68456c5e37cf2eba7e7bfb83ada8b2643f176ca13d SHA512 a3468bda0dac4a01c1c5cef2efad79c4101fc4160022c8cc1a5c14dd5af6c144719369251ef2b38ddb9d9535989996c435ebaebfba1b204b92522f529b67186f
+EBUILD qpdf-10.0.4.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
+EBUILD qpdf-10.1.0.ebuild 1244 BLAKE2B 2884f1c0754b6ffb8e4bc21f0d760d02d0a6073329eaf8bd455d027f27d15a711c787d308ce94da5728417c164486175e8e1c37dc00edd71ced7428655bf073c SHA512 01f9701a9be098c2332bd96fc04882b6bf67be4ab862c5f370ab3ee370de396d44ddb9cd38cbe9df895caa07dd975f3cd88a1552247095514b559de2c1566b5f
+EBUILD qpdf-10.3.1.ebuild 1249 BLAKE2B b5e184db99326067946ba1b9b43299a4862b4ac89f5592b635c709a804c043feaffdf9514c5adcf500f0c68ca657f7cdf3d889b3115e71c1616a793cd26c1a01 SHA512 02f5e0bb292408359ffbda3b77ba195678437b892faa31a86dbc899c1427bfa97ca8d27432d5e768599efebe28b8a15185dff7229eaeb1cda11c76a6e68830bd
 MISC metadata.xml 443 BLAKE2B 4522681371216196a58ef46575aad835e548c7f4e18a7137d6c780b1a5b8596f121e223fbfa6face7e33d5fe487b20219f0a40c68c5b0cb4d7eae1dfe7e8dc92 SHA512 1fcc6699cc87a906f341f9ebf45158a18870df921c573bba5f348375cd1ef0a204270abc9c6337e81d48082bf970ba16b09d940c4dea94b92d1d4efbeac5fbde
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
index da30b1934de3..e6c1b1772480 100644
--- a/app-text/qpdf/qpdf-10.0.4.ebuild
+++ b/app-text/qpdf/qpdf-10.0.4.ebuild
@@ -11,7 +11,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples libressl ssl test"
+IUSE="doc examples ssl test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -19,8 +19,7 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/jpeg:0=
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/app-text/qpdf/qpdf-10.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
index da30b1934de3..e6c1b1772480 100644
--- a/app-text/qpdf/qpdf-10.1.0.ebuild
+++ b/app-text/qpdf/qpdf-10.1.0.ebuild
@@ -11,7 +11,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples libressl ssl test"
+IUSE="doc examples ssl test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -19,8 +19,7 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/jpeg:0=
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/app-text/qpdf/qpdf-10.3.1.ebuild b/app-text/qpdf/qpdf-10.3.1.ebuild
index e00fc9a0d07f..8144742131d2 100644
--- a/app-text/qpdf/qpdf-10.3.1.ebuild
+++ b/app-text/qpdf/qpdf-10.3.1.ebuild
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
-IUSE="doc examples libressl ssl test"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples ssl test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -19,8 +19,7 @@ RDEPEND="
 	sys-libs/zlib
 	virtual/jpeg:0=
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 7a2d50dbf326..05388abd5f27 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
-EBUILD ttf2pk2-2.0_p20200406.ebuild 1101 BLAKE2B 1c0d69f29874d00338abec7380780aa1958c009374a37eb28288af031ac1f2a449207e87ed4e44d790a99b92762b8b04607713511790f02b479d61df3c08e1bb SHA512 33026725c2140d795dea8f0330da93f059ada8ef764d2e85a30e3238022f0d62d86d947bdab6b85c4a8d79d9c2a0dbc0350a4f794c282aa938517183a01e1f13
-EBUILD ttf2pk2-2.0_p20210325.ebuild 1108 BLAKE2B 75679e56225c6c9877d637d32dd9f73842a5d1ba440efa1b1a5d43af3698ccc8b66e0c3f6f44d322447c134c6d935919185c140f5fd87361b0f12cadb4f63d4e SHA512 112f6b98f929a7ea21e5a17bf82625b7b969fcc66437478dcc9f5ed8f9b861a9453c9076aa3e2c07dafb3a80e1cdb28af9b414f4368ec06b9694be71f78ae64e
+EBUILD ttf2pk2-2.0_p20200406.ebuild 1120 BLAKE2B 92b477af86c6b1bb15a24e0cca0d28c85182168fe47f91a5d20b2cfcc0870db239975f43bfc55d2142a9494121e91b82414aceb6974d307e265f93f3452dd40e SHA512 00585ea45690ed0052940d42a4410a39d4ef2239a581b9e62c6494aaaf32a0754b7c6617bd42f807f56ad5489125db7dcf424168a3edec309af0e3810b6a7e37
+EBUILD ttf2pk2-2.0_p20210325.ebuild 1127 BLAKE2B 8a66adfb1cfe4e88915d4c06780fe1c8fbfc6636ae3072431bc3b53b62370ea0084db269e877e768670c07324923a8210cc6a9e9a239da1a9510dfcb5e23d0df SHA512 a20f912d525874b85ed46daa43e0482a0373413fee69cb371e1b00d12cfdf5f77da0474053465cf777a41e4c7c51ecf63c1d00f7d73bf3dbc7613a3cc37ddd25
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
index e211ff725b7d..e722a14b4810 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/kpathsea-6.2.1
 	media-libs/freetype:2
 	sys-libs/zlib
 	!media-libs/freetype:1"
-
+DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
index 01907bf57002..901cf53cd7c8 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/kpathsea-6.2.1
 	media-libs/freetype:2
 	sys-libs/zlib
 	!media-libs/freetype:1"
-
+DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index df06c44f6ef8..34d8b52a3e53 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -4,5 +4,5 @@ DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4
 DIST wgetpaste-2.30_p20210222.tar.gz 14654 BLAKE2B e74332826f7faec3c2be2dddfd5f81d1ec14aec92888f27cdcd081b59262ac742003f2f48af3c3ca25be9e02f583a37dd1bec315236ab54912ebf6cf61308a10 SHA512 467daff5531fd6361ade87913ab867f67f72d5ffc07a35c263cd3dad65774ed31b3a6b0d69d2b52726a24419758d784c23e8c587f23e9028afd0e0a27966f32f
 EBUILD wgetpaste-2.29-r1.ebuild 689 BLAKE2B 3f803efebbe86ace4e41a78f358d820f2609f534b6b976cecebef1223754be95ec1301f4c7d03e50579a7a2e7586f7092deab40a224a660a2c2c86b38ea8ec81 SHA512 4818b22025d7b3e985479596558a3832371df3df2e5f9862c08eba3011d3bb022a87c3131ac6e421e99381a3bfb09468be133394e1b5470907f21396311bae13
 EBUILD wgetpaste-2.30_p20210222-r1.ebuild 771 BLAKE2B 4e3f23e7f0fff4a74b139cd5f5534f491a086d8c363cfbeea9f4180f5854df1b0fc9675176f273ab288c81411f40393b4dc35af1375dc996f912d49d56062dd7 SHA512 bf823e8f3dda78ad78594b4d2ba1f1b1cc75ee3b34c49c9ba6f42bd4f225ce6199e9c1a674f22747fa7d8806e7ba6e523e713cf59081fe55b8e8aa4175bc44d3
-EBUILD wgetpaste-2.30_p20210222-r2.ebuild 838 BLAKE2B 230f4d236b280ca641ebabf245a7e5738844f18fa6758bce2ea73f68311c68f99bf03a36a502873de534c230056fe418147005ab2f47ddee59ee4143c60a719b SHA512 1bca0f96b93153293d3f1aea9877b40f09a0c5bc9393e5ac5dc9db9671264300ba270f543bb36b7702e9217a002da951feb81e20d32cfde6e849cae9043b917c
-MISC metadata.xml 388 BLAKE2B 62b99789c15efdac7b00312ab6fec1964398d4adb5b75f495490a7bbf970f1f42acb5b151ed9c093c31e909cfd2ad124795240aefb1ee672776282ef0f8fc0a1 SHA512 1e9aa5b9d8a6d02926fbbe31421d62f00fa1d1e0ad6063a356c49068a7541ee267b8168b04d5a954e3c79138103ca551be41e289346e67fb0348717b8aea694e
+EBUILD wgetpaste-2.30_p20210222-r2.ebuild 829 BLAKE2B 21ab964a57d4a27b95a0a4a1e12575a343c52254941d657933d0f80a9b897278677e0513322cbe06dbca25e4d2ee3cfed55f1e42e791b02529f422bd6e41a912 SHA512 666a06bab8f9820be2fb7eb3f5a7deac61255d6f62e10b8bc42fb083fc0acb6e4e79063f6dee5626bc4d704a3179116c2643022e8d02dd2ac738f4e6dd168d85
+MISC metadata.xml 412 BLAKE2B e746785155941e2ca0d1c502bfc90a5f709b2afbf45e9e7f5ac291eea71ad67d54f5da691d72206556d7681ba5ebb8c9cd3bd8e1352353fdee802cd8fe7c2fff SHA512 1fecddde86406300943195b5be5502cb6efa1c5d061e56155946ec8b7fe9daaa74234f03a8f93a29a86544b0280ef58d697a9e96599d6fa5a2712d56c47ab236
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
index 582546ac73ce..572530f7b09a 100644
--- a/app-text/wgetpaste/metadata.xml
+++ b/app-text/wgetpaste/metadata.xml
@@ -5,6 +5,7 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">zlin/wgetpaste</remote-id>
 		<bugs-to>https://github.com/zlin/wgetpaste/issues</bugs-to>
diff --git a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
index c4c95081e20e..62b07cb4f813 100644
--- a/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.30_p20210222-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zlin/wgetpaste/archive/${COMMIT_HASH}.tar.gz -> ${P}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 amd64-linux ~x86-linux ~x64-macos"
 IUSE="+ssl"
 
 RDEPEND="net-misc/wget[ssl?]"
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 3e8d12b86ad3..dfb3e1fdc799 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1,8 +1,6 @@
 AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
-DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5
 DIST xchm-1.32.tar.gz 986604 BLAKE2B f2a1d27ee747bb2d599452f1fa91864afbd2d604e9c27322d70c0925c9c313d4c80ab647ed5bb7ae3672687decfaafb2be23f7b9ed09fb95ae7490b0a65d7cab SHA512 e8250660ff28c80ddda62b886b296d98fb60e8d482ad6791c775a51a860ca78e310222bd0f5baa40c941a3f345c0bb07edb932c0417835ab0b090d14b7b4c0f6
-EBUILD xchm-1.31.ebuild 946 BLAKE2B 3a79a20c9adc1a6263549c3449fa1c1f36ed7c99808b08007b34d15006de214c0bd34e1b134ef3c77350ab84c890bebfac4a9b78e43f251353b0315f507042c3 SHA512 03e41fdc435f95c64017bd39177997b2e6c40c17f4de4fd9fa295ac050203f9c156913fb8e333b267279d151276a718e070a2f24d76dbda1846c408b9ef307a5
-EBUILD xchm-1.32.ebuild 947 BLAKE2B b9eeb5ecc18cfbe23cc9f14460b6895e21a47ddea1149ae901d9ecd10ee0818d15fe53554a3f73cf735ff47492eb3c3660d416a09628f2c3b036df7a853ab4d9 SHA512 23f93add37df0b38297157eb5be71a25b85c51de25ebb0889b0fae4f911d9a9a5061ef836a610e9afc79790f3b8aa9517375ffd85b1013b090fbfbc9e0c6bd92
+EBUILD xchm-1.32.ebuild 946 BLAKE2B b093d826d297ad75fc1976e7bc81499ddcb5ff13dc79e92b20d24ac36aa5ef76c6c53f5d914474e655d015ffa561411ef8391797b8f6c5c8d01321e1f0d38774 SHA512 87b940fd6eb86a9046614761944612e782c7be2fbe4327fd2ebf609fe1af30b8e40ba61387d509f2242df5deb3a54ab400e42380b126a207cc76dd84ecf819ff
 EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
 MISC metadata.xml 321 BLAKE2B 65dacec7a8a5eb1d29ea9ed172e9d5d50077d3e39669a1250197b4f179f33112402be8e9c31b7070ba64bde942487a569cc521e920aa9dff612e3b74081096ff SHA512 9af4d9876f239fa7d85a360814bc0f188c30b117aec2aec3847df1974d94e304979f700301605abdbf868906d364060712d5035992a52e20b69ff88f35716727
diff --git a/app-text/xchm/xchm-1.31.ebuild b/app-text/xchm/xchm-1.31.ebuild
deleted file mode 100644
index de5c0956e1ac..000000000000
--- a/app-text/xchm/xchm-1.31.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit desktop wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/chmlib-0.36
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	domenu "${FILESDIR}"/xchm.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/xchm/xchm-1.32.ebuild b/app-text/xchm/xchm-1.32.ebuild
index 30f2bda9aa20..67a67e5064b8 100644
--- a/app-text/xchm/xchm-1.32.ebuild
+++ b/app-text/xchm/xchm-1.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/chmlib-0.36