gentoo auto-resync : 21:03:2023 - 00:38:34

4 files changed, 7 insertions, 76 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 87e3f0f43c8d..94d7f8e4433f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index c649f3932bd7..dc964ae45195 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -1,8 +1,5 @@
 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884
-DIST feh-3.7.2.tar.bz2 2121677 BLAKE2B ce9acf27dc312ef46bcfbbdb5bf982d3a5c5a32ea56e716982c0e3dfaa3a66643bc9471353cca4dde9e28fcb8d002d38bfbafab699d952b81c59bababfafb82f SHA512 e74c4a4ce655711dc3c777f83c9376d54aa82aa7e38e07837b8593ed19ba813217f99d5768c8f8d0b6c1a0f6475a5e36cf404f4bc024674214568715a931b9e3
 DIST feh-3.9.1.tar.bz2 2108873 BLAKE2B af559837224a90e403015648717cb9aa516d18bceb0a49a0635b471435370209c80b77a7a87f66b22c99615d44be0832a0d03152aabde72917417e5f992a5d8a SHA512 78682ec80df6b6655dbc18774ee95b3d68f1711a50129a9befb8adfb8c1a74aeede2493a35955687cdc2aa079978927727dac02543643418ef8deefa0d8c6d05
-DIST feh-3.9.tar.bz2 2111997 BLAKE2B 853812e580eda808acbe4bc38325ac387b66eaf90b54da7e94980bd785d0001fa3f8d2507e2a435d5f533cc215bf8e28419b57b436d85c32b8e609b12c3a191a SHA512 0d217bdc9f78c8a4a40684ccc798986465c46282eef39a6792791763a5683ddc9a2ca277dc10c23bfe55aa11b415f5ff66b4ded2fe2a7a946660ccd07a4edc50
-EBUILD feh-3.7.2.ebuild 1511 BLAKE2B 4ea7b87f2abf97391df8d688bea31fa816725c716e8060c100fb3409eec59d5249ed6388b45eea434e348d75f66398ef644aef039a6fc59e211b63b427eda8a0 SHA512 c0a276d82a9f51eafcab4152091d4eee0daade48c0b18c4317e88d9de97cc295e18ed01bac02e29690d754d15efacc011d7b6a13ed6837a12f9d2066060fa800
-EBUILD feh-3.9-r1.ebuild 1527 BLAKE2B 03523723113bd743eb4094e5180e7d7f72b541db7e9dc5e5e8ff2ca0562aa2afb25883b8b307aedf42802decc3fa75dc2620e57dddb46b7c8b86d01bffb5dcf1 SHA512 79b7a6459a575b395b6a733737e982e26f0aba1278254836417c0001cbb898d2f298963bacacc563c130793717c43899098337578281530de6215eb1ace89bbe
+EBUILD feh-3.9.1-r1.ebuild 1593 BLAKE2B b6e91bf0d56443430f89437b66ac6d2a98ebf0645dabbb0d6a120225988df4a9db1b453e2c260cca16e2ee25e4c2c1174e498b8ab7588204fd8dc93ef03fa7a9 SHA512 5f39f768af70b56e8890dfbe769e19941eac0ab068548e012ba69c5dc375e2681513dc9eb94da1b6e30d525eacddc4b6cf9d2ce9797859fbde4c2e7d34baa49b
 EBUILD feh-3.9.1.ebuild 1532 BLAKE2B e2a475b618b97749c568e6afd10b4047c137964b7f71b8cef77277968a42a228801ce924ea6e9a47dd6b2dde66771404fd6d970029a0829757299b0b820b7bdf SHA512 279bd900631c97e9e14998ba7629b92a4f057f0229f440db0f1080b087810f9a49366ea5c5e0892c5fd5bd25c6709baed6da3c55bb1bfd9508aa01f60b29ffc9
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/media-gfx/feh/feh-3.7.2.ebuild b/media-gfx/feh/feh-3.7.2.ebuild
deleted file mode 100644
index 92720f85d06b..000000000000
--- a/media-gfx/feh/feh-3.7.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="A fast, lightweight imageviewer using imlib2"
-HOMEPAGE="https://feh.finalrewind.org/"
-SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
-
-LICENSE="feh"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86"
-IUSE="debug curl exif test xinerama inotify"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="media-libs/imlib2[X]
-	>=media-libs/libpng-1.2:0=
-	x11-libs/libX11
-	curl? ( net-misc/curl )
-	exif? ( media-libs/libexif )
-	xinerama? ( x11-libs/libXinerama )"
-RDEPEND="${COMMON_DEPEND}
-	virtual/jpeg:0"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXt
-	test? (
-		>=dev-lang/perl-5.10
-		dev-perl/Test-Command
-		media-libs/imlib2[gif,jpeg,png]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
-
-pkg_setup() {
-	use_feh() { usex $1 1 0; }
-
-	fehopts=(
-		PREFIX="${EPREFIX}"/usr
-		doc_dir='${main_dir}'/share/doc/${PF}
-		example_dir='${main_dir}'/share/doc/${PF}/examples
-		curl=$(use_feh curl)
-		debug=$(use_feh debug)
-		xinerama=$(use_feh xinerama)
-		exif=$(use_feh exif)
-		inotify=$(use_feh inotify)
-	)
-}
-
-src_compile() {
-	tc-export CC
-	emake "${fehopts[@]}"
-}
-
-src_install() {
-	emake "${fehopts[@]}" DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/feh/feh-3.9-r1.ebuild b/media-gfx/feh/feh-3.9.1-r1.ebuild
index b05cfb8585a7..7ea8a8a2d3be 100644
--- a/media-gfx/feh/feh-3.9-r1.ebuild
+++ b/media-gfx/feh/feh-3.9.1-r1.ebuild
@@ -12,9 +12,13 @@ LICENSE="feh"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
 IUSE="debug curl exif test xinerama inotify"
-RESTRICT="!test? ( test )"
+RESTRICT="test" # Tests are broken.
 
-COMMON_DEPEND="media-libs/imlib2[X]
+COMMON_DEPEND="
+	|| (
+		>=media-libs/imlib2-1.11.0[X,text]
+		<media-libs/imlib2-1.11.0[X]
+	)
 	>=media-libs/libpng-1.2:0=
 	x11-libs/libX11
 	curl? ( net-misc/curl )