gentoo resync : 20.03.2022

4 files changed, 2 insertions, 173 deletions

diff --git a/media-gfx/ahoviewer/Manifest b/media-gfx/ahoviewer/Manifest
index cabfb0d72ba6..307bb652f2bc 100644
--- a/media-gfx/ahoviewer/Manifest
+++ b/media-gfx/ahoviewer/Manifest
@@ -1,7 +1,3 @@
-DIST ahoviewer-2.0.0_beta.tar.gz 488564 BLAKE2B 325d9689e13fc2847d00be3e77eb5cd8234c98d0c516d3427d4275beaf6cc08ba8a054dfa047ec5e00e4693f8b14f730694358dc22a15e8d503bf67f232c1772 SHA512 6a38da0810c93886233a41d1fdc3f9779158c54b328c13cb2eea9e921057913fd3bb48370b95526f2bc8635ca4ba0967e7edeb95052ea689b05fb8555d826cf0
-DIST ahoviewer-2.0.0_pre20211126.tar.gz 502643 BLAKE2B fdfb4def35f6f1024ae47c114395f45e86abfb23a54275abf98a16bc8b7bae879e57034401b5effb340a2855af64b66ae09d86bcbbdd50e39f43f4f300232e2f SHA512 4facaa1938308e82b1743cb97186925b18ee843456a75bb2639e303e35e40fbee4b6bdebf1aa977fed03b2a4cf6a2b558c488720156db5f821da30578362303f
 DIST ahoviewer-2.0.0_pre20220124.tar.gz 502882 BLAKE2B 9476c42dd36615f9106b6db0386b20c8922092fe68674f7a4439ca64458c00e3c1943a7402aed752ec91395e0684ce7cd89b0ac2de7f198edb39ebccef782fbd SHA512 0cf01c7011ae506fcff9700c46a06a57fdccc8f8a274d86a8438c926f0513e4e5851bdb37cb6ee7f8b673894938aafa7c2cb485773db04b977ec5f8b8634da3e
-EBUILD ahoviewer-2.0.0_beta.ebuild 1975 BLAKE2B f4ded42ed2acce53d6d72872e5f108f76bb58be7ac884b8b4db2943c949d2da3c270d956beb290f3fcebaf1e59466a7a2997a25bdb03f2ead3d4e7f1d874b92d SHA512 20eaa9a7b32ace00b176cf197cc2ed6da64268ba4f083512a7753bf32b3305a9922dbdf70e3b97792462830ff40cb1267ac2b496d0958dbc857082c15b895c5e
-EBUILD ahoviewer-2.0.0_pre20211126.ebuild 1862 BLAKE2B 8e556b630ead24875cd9a52611955c9686cb10555c2b78ee319718b0faffdda9408e15a8ce82639cfaaae900ff5beb9df0514b3b321be8104537b0c88dc0f68d SHA512 bbd04b293aa61d4855feee830284900eaad9b0d47a2da5f5ea8a2e82898bbf770c63b9d6e1ac75a1b242110f923748e17c80aeadc06be3f5a282e0fb2f12c4e2
-EBUILD ahoviewer-2.0.0_pre20220124.ebuild 1864 BLAKE2B 2ade906efc1b0bacab5bfc38654423978686b3a0dca849eab8cc74e243b218765e1660084c6bd1dbce840cb4a031379e44f76d768bad528a1bc5aab742d1eb79 SHA512 d3fb725e65b8b8f0a193939f819d2607d8511dd856fa16b13f31ce4342b3a1a6ab00fc6487e18f33537ceb0ca566bc44bc60d2c0e641e27b891ebddf316668e1
+EBUILD ahoviewer-2.0.0_pre20220124.ebuild 1862 BLAKE2B d0e14c5cbef7793057870b19d7fbd555449fa2f58ee6111770935da3ce0b7e495da9a40e341e6269b7cdf1eab45e72dbf9fa8d6e47e757c638a410cfd5043a5d SHA512 13ce96e650cadab10b0e6f6e33178efe37df14ed18f0fdb22cfea8c26eafeeeac4dcf88748c9687c154345cc8fe915a3d24ab65f95350867f7dce8a486807cfe
 MISC metadata.xml 432 BLAKE2B 865f9803f9a469564f6d4fee9bffa7eb94d268db2358281cc8b744f5de2b88dc9abcd69b8610113c797bd0eeb574985d3775f9259884f57cbe9eda47aa051ac7 SHA512 60ecc403ad49d4a774ec98ef8850041f358d1903d345eaf63d7429e6c96e11a34e3dc5ed7e1470fb851fbdef9b3b2d965d9d04303c1b8f61691857354cca5924
diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild
deleted file mode 100644
index a1ed34a9932e..000000000000
--- a/media-gfx/ahoviewer/ahoviewer-2.0.0_beta.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-MY_PV="$(ver_rs 3 -)"
-
-DESCRIPTION="A GTK image viewer, manga reader, and booru browser"
-HOMEPAGE="https://github.com/ahodesuka/ahoviewer"
-SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome-keyring gnutls +gstreamer plugins +rar +ssl +zip"
-
-DEPEND="dev-cpp/glibmm:=
-	dev-cpp/gtkmm:3.0=
-	dev-libs/libconfig:=[cxx]
-	dev-libs/libsigc++:2=
-	dev-libs/libxml2:2=
-	media-libs/libnsgif
-	net-misc/curl
-	x11-libs/gtk+:3
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gstreamer:1.0
-	)
-	plugins? ( dev-libs/libpeas )
-	rar? ( app-arch/unrar:= )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:=
-			net-libs/gnutls:=
-			net-misc/curl[curl_ssl_gnutls]
-		)
-		!gnutls? (
-			dev-libs/openssl:=
-			net-misc/curl[curl_ssl_openssl]
-		)
-	)
-	zip? ( dev-libs/libzip )
-"
-RDEPEND="${DEPEND}
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		|| (
-			media-plugins/gst-plugins-vpx
-			media-plugins/gst-plugins-libav
-		)
-	)"
-
-# In future (-beta), pull https://github.com/ahodesuka/ahoviewer-plugins
-# directly via SRC_URI="plugins? ( )", or add as a separate package. It
-# depends on how the plugins are handled.
-#PDEPEND="plugins? ( x11-misc/ahoviewer-plugins )"
-
-S="${WORKDIR}/ahoviewer-${MY_PV}"
-
-src_prepare() {
-	default
-
-	# Hopefully related to beta/git, incomplete release.
-	cat <<- EOF > src/version.h || die
-		#ifndef _VERSION_H_
-		#define AHOVIEWER_VERSION "${MY_PV}"
-		extern const char *const ahoviewer_version;
-		#endif // _VERSION_H_
-	EOF
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature gnome-keyring libsecret)
-		$(meson_feature gstreamer)
-		$(meson_feature plugins libpeas)
-		$(meson_feature rar libunrar)
-		$(meson_feature zip libzip)
-	)
-
-	meson_src_configure
-}
diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20211126.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20211126.ebuild
deleted file mode 100644
index 881b2ea5efd6..000000000000
--- a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20211126.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-MY_COMMIT="92f2b2f57c8a6ebf0d10cb95bfc9b685bf98be5c"
-
-DESCRIPTION="A GTK image viewer, manga reader, and booru browser"
-HOMEPAGE="https://github.com/ahodesuka/ahoviewer"
-SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnome-keyring gnutls +gstreamer plugins +rar +ssl +zip"
-
-DEPEND="dev-cpp/atkmm:0
-	dev-cpp/glibmm:2
-	dev-cpp/gtkmm:3.0
-	dev-cpp/pangomm:1.4
-	dev-libs/glib:2
-	dev-libs/libconfig:=[cxx]
-	dev-libs/libsigc++:2
-	dev-libs/libxml2:2
-	media-libs/libnsgif
-	net-misc/curl
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gstreamer:1.0
-	)
-	plugins? (
-		dev-libs/gobject-introspection
-		dev-libs/libpeas
-	)
-	rar? ( app-arch/unrar:= )
-	ssl? (
-		gnutls? (
-			dev-libs/libgcrypt:=
-			net-libs/gnutls:=
-			net-misc/curl[curl_ssl_gnutls]
-		)
-		!gnutls? (
-			dev-libs/openssl:=
-			net-misc/curl[curl_ssl_openssl]
-		)
-	)
-	zip? ( dev-libs/libzip:= )
-"
-RDEPEND="${DEPEND}
-	gstreamer? (
-		media-libs/gst-plugins-base:1.0[X]
-		media-libs/gst-plugins-good:1.0
-		|| (
-			media-plugins/gst-plugins-vpx
-			media-plugins/gst-plugins-libav
-		)
-	)"
-
-# In future (-beta), pull https://github.com/ahodesuka/ahoviewer-plugins
-# directly via SRC_URI="plugins? ( )", or add as a separate package. It
-# depends on how the plugins are handled.
-#PDEPEND="plugins? ( x11-misc/ahoviewer-plugins )"
-
-S="${WORKDIR}/ahoviewer-${MY_COMMIT}"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature gnome-keyring libsecret)
-		$(meson_feature gstreamer)
-		$(meson_feature plugins libpeas)
-		$(meson_feature rar libunrar)
-		$(meson_feature zip libzip)
-	)
-
-	meson_src_configure
-}
diff --git a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
index 582df8de4359..3fb63efcf620 100644
--- a/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
+++ b/media-gfx/ahoviewer/ahoviewer-2.0.0_pre20220124.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ahodesuka/ahoviewer/archive/${MY_COMMIT}.tar.gz -> $
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnome-keyring gnutls +gstreamer plugins +rar +ssl +zip"
 
 DEPEND="dev-cpp/atkmm:0