gentoo auto-resync : 05:11:2024 - 03:03:37

4 files changed, 69 insertions, 109 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index df7dfb89ab43..be6c8b9a100b 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,7 +1,6 @@
-AUX audacious-enum-backporting.patch 1153 BLAKE2B b5934eaccb88bd37848b50a6834858dbc8a2c7419ff4dbbfbef8b89a932898b219addae0ad9f176c964b27a30ea96b5b73969df44f1d1bad43a4747031392d02 SHA512 b84c04bf47916b5da9049fe2e58576db6ec2753fa45564da4ffec7155c2dc073d57c33201a81f458f542408518d47adc39021033992d822a5220f7400fd18ba0
-DIST audacious-4.3.1.tar.bz2 630820 BLAKE2B e8885d25cce4a480ac58c5ee1874a530f4b169f264eaafb13830be17ce7e25933a2fb491ed0b86220fdb2e916ea5d7b13bca8a5ac00695ffd06e1ad8b2a6ff67 SHA512 7662a1b136c6ced346ce160a3a6b71ea5941644860466e23248a44168179118202006e8892a5bbd1f6d77730846a4644b6cb4e008af38e1117588b9f4d1521f5
 DIST audacious-4.4.1.tar.bz2 636301 BLAKE2B 875b214e3372ce000684d4e9a2868062bc0addea19ecaa652b605e1ae79d13f58f42eeb761451da682301124c54cacdb61b326a3b1855d0cc7b47c4d8983e459 SHA512 68ba1f468b540dfeec82825b19352dab785243aa3dc456d2a5acfda97601d64a11dadd2de668a1b0adab3a42e232509d60b5658f0a0047e153791ab9318f2b76
+DIST audacious-4.4.2.tar.bz2 636838 BLAKE2B 6e0b4e099660249d3631091e6c38e2b2ad40e2fafeb9e85bb365134fe1c28f128f294bdeadf50643329569c21475fc6d0da8e41fb9839cff0131ddce61597c72 SHA512 a1a561ac969863555aa349c068d85398bc6e58c3f11b74842799c7ed1287a826bd6ce9624421b9da47354a632d2e0ccb8326de27c0730028d98dd85fa0c061c1
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-4.3.1.ebuild 1520 BLAKE2B a603d51ee02342b8dbefadaf10a46667ca66a70125250c39410ac5c04f3dfbe5a34a23e8c0f26e2d543a7b66769fb1e90a2bffa263ec9f49f2326b24bc289c36 SHA512 f3673882ae2ee0e1fbaa3e615cd8fe15f6363b077e842c53a1b852d2110fcfb03a719978f9a277996480459ef9ebef16b15ed8900efd2fda11f1b1b72410257a
 EBUILD audacious-4.4.1.ebuild 1444 BLAKE2B 72c87c2c0dc339f1c0dcfec88d9e90737b7ede7be3aa7892b4ef6f98ad2274608d1584fa403a496694c616a0283b0973d7891d5f8d7b95dd7258cd827ed66d7f SHA512 2b8572d465f7caa3705b2cd10407be67b400555932ea73bee5f55d8730e985bccf4a9732374a71663d51eb2184bd503e04fb34f0abac3023cee9aaf85ed8ff6c
+EBUILD audacious-4.4.2.ebuild 1446 BLAKE2B 326ce08ebcde56a551c4b0ee5522b567712f8449db0bb47ad846751d6147c1e95b7087106612369236c9583516c10e102ded6fcb451ad214053ca058097dc981 SHA512 ee9aa71b07ee22551db5b42d37752f6628a9c4fcf6ea52b93084ded71c114322fdf140876bb054a3efbe048d8134e63765e0cb28fa498f9244c04152d1c67c09
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-sound/audacious/audacious-4.3.1.ebuild b/media-sound/audacious/audacious-4.3.1.ebuild
deleted file mode 100644
index 591c2b60ab94..000000000000
--- a/media-sound/audacious/audacious-4.3.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${P/_/-}"
-
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-enum-backporting.patch
-)
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "failed to sed" # bug #512698
-	fi
-}
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	local myeconfargs=(
-		--disable-valgrind
-		--disable-gtk
-		--enable-dbus
-		--enable-qt
-		$(use_enable nls)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins -r "${WORKDIR}"/gentoo_ice/.
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
diff --git a/media-sound/audacious/audacious-4.4.2.ebuild b/media-sound/audacious/audacious-4.4.2.ebuild
new file mode 100644
index 000000000000..67b9613808c7
--- /dev/null
+++ b/media-sound/audacious/audacious-4.4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI="
+	https://distfiles.audacious-media-player.org/${P}.tar.bz2
+	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2
+"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="gtk qt6"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	virtual/freedesktop-icon-theme
+	gtk? (
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-3.18:3
+		x11-libs/pango
+	)
+	qt6? (
+		dev-qt/qtbase:6[gui,widgets]
+		dev-qt/qtsvg:6
+	)
+"
+RDEPEND="${DEPEND}"
+PDEPEND="~media-plugins/audacious-plugins-${PV}[gtk=,qt6=]"
+
+src_configure() {
+	# D-Bus is a mandatory dependency. Remote control,
+	# session management and some plugins depend on this.
+	# Building without D-Bus is *unsupported* and a USE-flag
+	# will not be added due to the bug reports that will result.
+	# Bugs #197894, #199069, #207330, #208606
+	local emesonargs=(
+		-Ddbus=true
+		$(meson_use qt6 qt)
+		-Dqt5=false
+		$(meson_use gtk)
+		-Dgtk2=false
+		-Dlibarchive=false
+		-Dbuildstamp="Gentoo ${P}"
+		-Dvalgrind=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Gentoo_ice skin installation; bug #109772
+	insinto /usr/share/audacious/Skins/gentoo_ice
+	doins -r "${WORKDIR}"/gentoo_ice/.
+	docinto gentoo_ice
+	dodoc "${WORKDIR}"/README
+}
diff --git a/media-sound/audacious/files/audacious-enum-backporting.patch b/media-sound/audacious/files/audacious-enum-backporting.patch
deleted file mode 100644
index 66bb959f737e..000000000000
--- a/media-sound/audacious/files/audacious-enum-backporting.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3989bafcb7a8843cef4e25875cd6c0e72680ad80 Mon Sep 17 00:00:00 2001
-From: Guido Falsi <mad@madpilot.net>
-Date: Wed, 28 Jun 2023 15:42:37 +0200
-Subject: [PATCH] Add missing enum value.
-
-New versions of the clang compiler have strict checks for enum values.
-
-The value "-1" is returned as a last resort from to_vfs_seek_type() as a VFSSeekType.
-
-Replace usage of `-1` with the new enum name.
----
- src/libaudcore/vfs.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libaudcore/vfs.h b/src/libaudcore/vfs.h
-index 33c5a65c97..f6a1dd3f23 100644
---- a/src/libaudcore/vfs.h
-+++ b/src/libaudcore/vfs.h
-@@ -51,6 +51,7 @@ enum VFSReadOptions
- 
- enum VFSSeekType
- {
-+    VFS_SEEK_INVALID = -1,
-     VFS_SEEK_SET = 0,
-     VFS_SEEK_CUR = 1,
-     VFS_SEEK_END = 2
-@@ -75,7 +76,7 @@ constexpr VFSSeekType to_vfs_seek_type(int whence)
-                ? VFS_SEEK_SET
-                : (whence == SEEK_CUR)
-                      ? VFS_SEEK_CUR
--                     : (whence == SEEK_END) ? VFS_SEEK_END : (VFSSeekType)-1;
-+                     : (whence == SEEK_END) ? VFS_SEEK_END : VFS_SEEK_INVALID;
- }
- 
- #endif // WANT_VFS_STDIO_COMPAT