gentoo resync : 20.03.2022

4 files changed, 2 insertions, 110 deletions

diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index f9aa62f786b6..716a7d1df1fc 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1,8 +1,5 @@
 AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
-DIST xchm-1.32.tar.gz 986604 BLAKE2B f2a1d27ee747bb2d599452f1fa91864afbd2d604e9c27322d70c0925c9c313d4c80ab647ed5bb7ae3672687decfaafb2be23f7b9ed09fb95ae7490b0a65d7cab SHA512 e8250660ff28c80ddda62b886b296d98fb60e8d482ad6791c775a51a860ca78e310222bd0f5baa40c941a3f345c0bb07edb932c0417835ab0b090d14b7b4c0f6
 DIST xchm-1.33.tar.gz 886169 BLAKE2B 26b6c664307de3ef1bef21d3fd240b5636f5abc8196c5aa1b7cd6b91f12addbbd5a8c54d133de2fd8ce9132ea2677f79f0ef722b1da6c87429cd3df54d208585 SHA512 06f5c191ef9f2c608259261839d6641f202a21150a6622b8162e06e3cc857802390f551dcef47f25d048b3d407511c5a8cc6aabd3003942006847366ebb08989
-EBUILD xchm-1.32.ebuild 953 BLAKE2B 13415d881258107cdb94802e522cba3f1a4e79a9e3119c80707654cc83265f7df4e4f914e2348cdad3e662e39be76980d5334b03b1100715f9163ce1176ac3e9 SHA512 7689a6f7b4ed8832fe65d45bb307148edce53c0ade7e8eed0f9a67e82b657ecb9cfd7f24256ff9e51aa5fbe2f4505ef4918f2adee32092dbfd247d2feb623c26
-EBUILD xchm-1.33.ebuild 973 BLAKE2B d8615cbe5915e79cf3bf7820edb6ecad52f91738efc9de855986136d7112a0da9549199d1b6ffd6a628aa531834e0da60eb7de75ac5b8c6fcd9d5b750c2006f8 SHA512 1310fb3a0336ac8791396473126984669e3206b5779377ccd2599866fa5cbac3bf0a3ad778945707cd2cbbc0ca98ef1383a7ae5de9d8d8c6ebb660a69a9d02e9
-EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
+EBUILD xchm-1.33.ebuild 970 BLAKE2B 0fa84e34510016d5639c076a214c235c888d46254822fdafdafe707b2325b10f5ae6f50af2767b9ae591e60ff374bd2d72e4c4b192689a4a6f71173b5465c6d1 SHA512 0d66aef4ee322afc1eae8d49c9b35261cb0d98b0fa462a6ce897cdc0cfc7522fe5f743411fdd2823160262da1429a92908ff6704c79bb6fc564fc70d6087cb6e
 MISC metadata.xml 322 BLAKE2B 66ab995c1a7252d656f8f7b74dd6ae09fd6d83912b16bdff6300ac24eb0271d2d74964147b9c72c7fdc03df42d17d2341b694e07b64cfe793b760a9b8e2cef99 SHA512 1ecb1f165786fcc62a09f792b5316b9434059a0741bd9066493a7875f800ac0402c3b3e835a46491f614fea25806d6220940b38009cc937bef90abbcd46134f9
diff --git a/app-text/xchm/xchm-1.32.ebuild b/app-text/xchm/xchm-1.32.ebuild
deleted file mode 100644
index 4f682b41d68d..000000000000
--- a/app-text/xchm/xchm-1.32.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 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 ~riscv 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.33.ebuild b/app-text/xchm/xchm-1.33.ebuild
index 27f28acfd7aa..bf624116cb69 100644
--- a/app-text/xchm/xchm-1.33.ebuild
+++ b/app-text/xchm/xchm-1.33.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 ~riscv ~x86"
+KEYWORDS="amd64 ppc ~riscv x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/chmlib-0.36
diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild
deleted file mode 100644
index b652fcfc7a2e..000000000000
--- a/app-text/xchm/xchm-9999.ebuild
+++ /dev/null
@@ -1,58 +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 autotools desktop wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="https://github.com/rzvncj/xCHM/"
-
-if [[ ${PV} == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rzvncj/xCHM/"
-else
-	SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-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_prepare() {
-	default
-	eautoreconf
-}
-
-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
-}