gentoo auto-resync : 21:01:2023 - 11:40:40

3 files changed, 4 insertions, 98 deletions

diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 322df0c86476..a8a077d07712 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -3,6 +3,5 @@ AUX imv-4.3.1_p20211221-libgrapheme2.patch 532 BLAKE2B 1a40b9478c4e47f4cf70e7f8d
 DIST imv-4.3.1_p20211221.tar.gz 80082 BLAKE2B 2b4f3cdb0b7123b978cdbc588cf686c38d65053e3fadb6532da45be3e24b35a297639ca8ddb7d05945f92763cc014a232eb0ca0af0da059b2dac48d2b3c9939d SHA512 7579930a406d2ba1dca7f043d635ea89301606d06ca5ebe5779fffd1410789bb07ef8228beb2ef08af2783e64deda8b67aa991fc56333c0e60051f7666fbb19f
 DIST imv-4.4.0.tar.gz 80360 BLAKE2B c598bb270ed57562f1c1b9a56f42676a7c8390c976ed74405228da572b000a85bf69e51f1bbfa6d554a481debc092995fe5222ba1e8b0b029b72395a8b8f329b SHA512 ddc0740022183a5467a0815ca623d2204b26449fee14b00c3468d06dbba3b5c3314b04a582bbac6075205f8d58cc24f157e283ce1ce3d34ecf0a9bdc497ab7f1
 EBUILD imv-4.3.1_p20211221-r3.ebuild 2140 BLAKE2B 83b0186887d4e47e0cfd563bd671fc11c4b3a91d320008f2c3d072b77ea35bdfd08bed352715ca3790eb10345fbc30a93fdfdf9a4d00a976ad83ab36c4483ff9 SHA512 67460ccc072f7121787eeda6c2bee81a5dee795490950b5b3bebb4a531e261671c407ce4fb1e4e2c36cea9fd46b8181685198a47b2f947feaffbd7a43b10d382
-EBUILD imv-4.4.0.ebuild 2060 BLAKE2B 84fbc2de932fbe1cb4527c881f0b32269c91300e5a56422ba4bd5a8a583456f5ed5750f68113cc82e18a87e62c7d604f34c388d15692a2fbf8ff635b7b0c9978 SHA512 4b311f8152d1c1e1649553f5e1899fa74dd2fd5c9e5f1cbecf4aa8c34c3c15a14437d38d2d3ef72d4618b08df5799e678d6d94d5d8ce3aec6215e25cf902146a
-EBUILD imv-9999.ebuild 2060 BLAKE2B 84fbc2de932fbe1cb4527c881f0b32269c91300e5a56422ba4bd5a8a583456f5ed5750f68113cc82e18a87e62c7d604f34c388d15692a2fbf8ff635b7b0c9978 SHA512 4b311f8152d1c1e1649553f5e1899fa74dd2fd5c9e5f1cbecf4aa8c34c3c15a14437d38d2d3ef72d4618b08df5799e678d6d94d5d8ce3aec6215e25cf902146a
+EBUILD imv-4.4.0.ebuild 1955 BLAKE2B ddc16936c293d9d4c631c094691dd2298eededa15427d9489a66e07976db2b31419162512454a1c41993f4fa93806f8850540acba58445e5d780afd888e1e130 SHA512 a26c4fcac210ef53c67759ab55ee27982e487fc8e34793c353c37b68532dfda40af9604ced0bf46ac16d6698dce08c0bda3f8fe57511061e99656b9623f30c31
 MISC metadata.xml 437 BLAKE2B 2be70afe81e59e1113948f9acc60788bae48ae2977865728299b6af28f0937d8dd80abc037e93438e6381790be02fcb2c6fa4bb8c14380b91e42656136d2f766 SHA512 3fd6b8fa1306250bd5bd55a8e90c9d6acd92278aa8aee5703e3df0c0c425c5e118446ed898d0aaa60e55423f4d94b9411c1a63ee9d637b79ecec63f5ab09f575
diff --git a/media-gfx/imv/imv-4.4.0.ebuild b/media-gfx/imv/imv-4.4.0.ebuild
index 2aca12fa827d..3ac1a362e72e 100644
--- a/media-gfx/imv/imv-4.4.0.ebuild
+++ b/media-gfx/imv/imv-4.4.0.ebuild
@@ -5,20 +5,14 @@ EAPI=8
 
 inherit meson xdg
 
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/"
-else
-	SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
 DESCRIPTION="Minimal image viewer designed for tiling window manager users"
 HOMEPAGE="https://sr.ht/~exec64/imv/"
+SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="+X +freeimage gif heif icu jpeg png svg test tiff wayland"
 REQUIRED_USE="|| ( X wayland )"
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
deleted file mode 100644
index 2aca12fa827d..000000000000
--- a/media-gfx/imv/imv-9999.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/"
-else
-	SRC_URI="https://git.sr.ht/~exec64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://sr.ht/~exec64/imv/"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="+X +freeimage gif heif icu jpeg png svg test tiff wayland"
-REQUIRED_USE="|| ( X wayland )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/inih
-	media-libs/libglvnd[X?]
-	x11-libs/cairo
-	x11-libs/libxkbcommon[X?]
-	x11-libs/pango
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb:=
-	)
-	freeimage? ( media-libs/freeimage )
-	gif? ( media-libs/libnsgif )
-	heif? ( media-libs/libheif:= )
-	icu? ( dev-libs/icu:= )
-	!icu? ( >=dev-libs/libgrapheme-2:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:= )
-	svg? ( >=gnome-base/librsvg-2.44:2 )
-	tiff? ( media-libs/tiff:= )
-	wayland? ( dev-libs/wayland )
-	!sys-apps/renameutils"
-DEPEND="
-	${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	test? ( dev-util/cmocka )"
-BDEPEND="
-	app-text/asciidoc
-	wayland? ( dev-util/wayland-scanner )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1_p20211221-animated-gif.patch
-)
-
-src_prepare() {
-	default
-
-	# if wayland-only, don't automagic on libGL and force libOpenGL
-	if ! use X; then
-		sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die
-	fi
-
-	# glu isn't used by anything
-	sed -i "/dependency('glu')/d" meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature freeimage)
-		$(meson_feature gif libnsgif)
-		$(meson_feature heif libheif)
-		$(meson_feature jpeg libjpeg)
-		$(meson_feature png libpng)
-		$(meson_feature svg librsvg)
-		$(meson_feature test)
-		$(meson_feature tiff libtiff)
-		-Dunicode=$(usex icu{,} grapheme)
-		-Dwindows=$(usex X $(usex wayland all x11) wayland)
-	)
-
-	meson_src_configure
-}