gentoo auto-resync : 26:07:2023 - 22:32:29

3 files changed, 3 insertions, 162 deletions

diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 74bca26fa6db..e5c44ca43c11 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,6 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
-DIST icewm-2.9.6.tar.lz 1763654 BLAKE2B 6d002e8f1c10bc6a0867308ede058beb0d044ef57a91c66a557271a100dcafe21f1499a90a5d95924a2ff0c9d9456c64996de4cfbad29172b9c08dec15afb8ed SHA512 7deea4d4bc8cd856aa06d0578257cef557b0fdf4e03208ec7a890bfd22171dbda3b5d94b166fbefa2e72cabe9c23295b63963dfc6024181bc9632f0210e2b348
-DIST icewm-2.9.7.tar.lz 1764916 BLAKE2B b2b88f96bb71999c3580c7df6b3f8858aca2a49f02b64f8e94e3c223ddf2bb660c0121e6172cf690424ce4bb002b95fd78589329d97a5f1695b5890ceee9e9ae SHA512 1ec2a73536a08f252d2c16f21b8d8646f4179ce025d6e828c6b9ae2405febe048ed4ab5c7d079a4a83cb4a83a5e027ae6ef1262ee0438c68f4d6124da552114d
 DIST icewm-3.3.1.tar.lz 1875279 BLAKE2B c43e092676f456fe1e7df7c88ad264f154a1b1a90b2488dabb4edacde23b80feb6827fe0379a2aae334687374702afc3f0a37be59804590664af5f756cc65eda SHA512 f57eecc7ed7e03bfce7a41998eacb8d224ef5c0978846d9bc7f3d14c0b8ca557478eaad94b6fc6dbe5d84ae34a40b5e120dabe722e56c648c5ee1ea5a2ca9e4a
-EBUILD icewm-2.9.6.ebuild 2948 BLAKE2B 364024d2836d3e7da7f90f5fc2d7b40d0efa346ffdf57c5ed33af7014eb9fc83f31659bed59743643d5deb6401d7b2d5bfb4b03804dfc277308b36b3c84d797e SHA512 fde4f8f4aa1501abae2c153078b86e39d5f080722de4c84ec049098c27549cb961999988cb701456256b884ebb349873b59e95c16d324c2a50e51a1deafeb260
-EBUILD icewm-2.9.7.ebuild 2944 BLAKE2B 5e69bf7faaf94594160f6a03072358cc6a3f8aef2b3f08fd8eb5f58f7d2cf6928fe175352d84b074ba999342ab9fb83ccd7ec1ba5e7d28c6ce970ac2425d514e SHA512 02086a959a12d28aafb8c9fee694993d07b27ac0fd6984d622ccd07938792e61c32d4db4b284ad885ee3154b4de70e5c3e35e232cb53aaf2522a42fdc1a74a80
+DIST icewm-3.4.1.tar.lz 1828032 BLAKE2B 7b0d75af789ad9910dd39b64a57c0efe11bb32cba463543f0f173e1b8034bef673d7205f6c62ea408eb95a6d968524213f25ca9f071841018a65f2206c0b2049 SHA512 33fcbb487d7f66b3ef6618b5a5996e201657589e465cf2ee2f3220443330451c871f105f61d876148c17aab7e9e1011ce0aff4775aa3c73085879c8feed24908
 EBUILD icewm-3.3.1.ebuild 2871 BLAKE2B 646e2cff21cad90dd6b823d5c828b84d656c30cccad6b93d6a76b6c53feea22106e86e029314b26f2991f30a82693417ba2ff782ec5ced23073e4c05eb962bc7 SHA512 1926017df3b82469813d8d6af559cdb6c68b63a520a64d0ea64b58c55bf22c090807bcc38c8421e7788df9bcffbb9a41c1f97a9c97c9084a8b7bf2ce557a9d20
+EBUILD icewm-3.4.1.ebuild 2875 BLAKE2B 343daaca2641a314c972df337cb2e9ffc68881a038a6855736f5908d62e7209325648c5646df68f257ae222f4cc990076ccf120bcd2a81f3a2bf8b11b58d9539 SHA512 b1e44eabd6e0c7d920f156436580fd513766237686eef19d4beaf94ae558afac9231fdad5c2e0f2a04d2b03d18430d8be5aeb4cecd987a08d7ebee5931180db3
 MISC metadata.xml 664 BLAKE2B 5a99bb11c31a4dbae2d4628fbd6278aedaa783ae65797d2a98c7f415704b23730f89e28d872f3f8f0e838ad2962dcc2e098d559b5ea68a703136a21e7f4a1cae SHA512 396201ee77abf78058b52452e3c14f985f125bb7d3bda3b09f04ad978639e5bfb8c614a0a4262a9b52f44d084cfabac3e53d2256a063dd3bc4daacc80954ce66
diff --git a/x11-wm/icewm/icewm-2.9.7.ebuild b/x11-wm/icewm/icewm-2.9.7.ebuild
deleted file mode 100644
index 24527671c135..000000000000
--- a/x11-wm/icewm/icewm-2.9.7.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools unpacker
-
-DESCRIPTION="Ice Window Manager with Themes"
-HOMEPAGE="https://ice-wm.org/ https://github.com/ice-wm/icewm"
-LICENSE="GPL-2"
-SRC_URI="https://github.com/ice-wm/icewm/releases/download/${PV}/${P}.tar.lz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE="+alsa ao bidi debug +gdk-pixbuf imlib nls truetype xinerama"
-
-# Tests broken in all versions, patches welcome, bug #323907, #389533
-RESTRICT="test"
-
-REQUIRED_USE="|| ( alsa ao )"
-#?? ( gdk-pixbuf imlib )
-
-#fix for icewm preversion package names
-S="${WORKDIR}/${P/_}"
-
-# These are the core dependencies of icewm.
-# Look into configure.ac and search for PKG_CHECK_MODULES([CORE]
-CORE_DEPEND="
-	media-libs/fontconfig
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-"
-
-RDEPEND="
-	${CORE_DEPEND}
-	dev-libs/glib:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	alsa? (
-		media-libs/alsa-lib
-		media-libs/libsndfile[alsa]
-	)
-	ao? (
-		media-libs/libao
-		media-libs/libsndfile
-	)
-	bidi? ( dev-libs/fribidi )
-	gdk-pixbuf? (
-		x11-libs/gdk-pixbuf-xlib
-		>=x11-libs/gdk-pixbuf-2.42.0:2
-	)
-	!gdk-pixbuf? (
-		imlib? (
-			gnome-base/librsvg:2
-			media-libs/imlib2
-		)
-		!imlib? (
-			media-libs/libpng:0=
-			virtual/jpeg
-		)
-	)
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-	gdk-pixbuf? ( gnome-base/librsvg:2 )
-"
-BDEPEND="
-	$(unpacker_src_uri_depends)
-	app-text/asciidoc
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.19.8 )
-"
-
-pkg_pretend() {
-	if use gdk-pixbuf && use imlib ; then
-		einfo 'Conflicting USE flags have been enabled:'
-		einfo '"gdk-pixbuf" and "imlib" exclude each other!'
-		einfo 'Using "gdk-pixbuf".'
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local icesound
-	if use alsa && use ao ; then
-		icesound="alsa,ao"
-	elif use alsa ; then
-		icesound="alsa"
-	elif use ao ; then
-		icesound="ao"
-	fi
-
-	local myconf=(
-		--enable-logevents
-		--enable-xrandr
-		--with-cfgdir="${EPREFIX}"/etc/icewm
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-		--with-icesound="${icesound}"
-		--with-libdir="${EPREFIX}"/usr/share/icewm
-		$(use_enable bidi fribidi)
-		$(use_enable debug)
-		$(use_enable debug logevents)
-		$(use_enable gdk-pixbuf)
-		$(use_enable imlib imlib2)
-		$(use_enable nls i18n)
-		$(use_enable nls)
-		$(use_enable xinerama)
-	)
-	if use truetype ; then
-		myconf+=(
-			--enable-shape
-		)
-	else
-		myconf+=(
-			--disable-xfreetype
-			--enable-corefonts
-		)
-	fi
-
-	econf "${myconf[@]}"
-
-	sed \
-		-e "s:/icewm-\$(VERSION)::" \
-		-e "s:ungif:gif:" \
-		-i src/Makefile || die
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog NEWS README.md TODO VERSION )
-
-	default
-
-	docinto html
-	dodoc doc/icewm.html
-	dodoc man/*.html
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/icewm"
-}
diff --git a/x11-wm/icewm/icewm-2.9.6.ebuild b/x11-wm/icewm/icewm-3.4.1.ebuild
index 8abbaa37a6ab..182fcaf040ba 100644
--- a/x11-wm/icewm/icewm-2.9.6.ebuild
+++ b/x11-wm/icewm/icewm-3.4.1.ebuild
@@ -63,7 +63,7 @@ RDEPEND="
 		)
 		!imlib? (
 			media-libs/libpng:0=
-			virtual/jpeg
+			media-libs/libjpeg-turbo:=
 		)
 	)
 	xinerama? ( x11-libs/libXinerama )
@@ -131,11 +131,6 @@ src_configure() {
 	fi
 
 	econf "${myconf[@]}"
-
-	sed \
-		-e "s:/icewm-\$(VERSION)::" \
-		-e "s:ungif:gif:" \
-		-i src/Makefile || die
 }
 
 src_install() {