app-emulation/steam-native-runtime : rework dependencies

4 files changed, 34 insertions, 16 deletions

diff --git a/app-emulation/steam-native-runtime/steam-native-runtime-1.0.0.71.ebuild b/app-emulation/steam-native-runtime/steam-native-runtime-1.0.0.71-r1.ebuild
index 04fa5e2a..d5b2f628 100644
--- a/app-emulation/steam-native-runtime/steam-native-runtime-1.0.0.71.ebuild
+++ b/app-emulation/steam-native-runtime/steam-native-runtime-1.0.0.71-r1.ebuild
@@ -12,8 +12,7 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="pulseaudio"
 
-DEPEND=""
-RDEPEND="
+DEPEND="
 	app-emulation/steam
 	app-arch/bzip2[abi_x86_32]
 	dev-libs/atk[abi_x86_32]
@@ -26,9 +25,7 @@ RDEPEND="
 	media-libs/fontconfig[abi_x86_32]
 	media-libs/freetype[abi_x86_32]
 	media-libs/libcaca[abi_x86_32]
-	media-libs/libcanberra[abi_x86_32]
 	media-libs/libpng-compat:1.2[abi_x86_32]
-	media-libs/libpipewire[abi_x86_32]
 	media-libs/libsdl[abi_x86_32]
 	media-libs/sdl-image[abi_x86_32]
 	media-libs/sdl-mixer[abi_x86_32]
@@ -69,8 +66,28 @@ RDEPEND="
 	x11-libs/libXtst[abi_x86_32]
 	x11-libs/pango[abi_x86_32]
 
-	pulseaudio? ( media-sound/pulseaudio[abi_x86_32] )
-	!pulseaudio? ( media-sound/apulse[abi_x86_32] )"
+	pulseaudio? (
+		media-libs/libcanberra[abi_x86_32]
+		media-sound/pulseaudio[abi_x86_32]
+	)
+	!pulseaudio? (
+		media-libs/libcanberra[abi_x86_32]
+		media-libs/libpipewire[abi_x86_32]
+		media-sound/apulse[abi_x86_32]
+	)
+"
+RDEPEND="${DEPEND}
+	pulseaudio? ( || (
+		media-video/pipewire
+		media-sound/pulseaudio-daemon
+		media-sound/pulseaudio[daemon(+)]
+	) )
+	!pulseaudio? (
+		media-libs/libcanberra[abi_x86_32]
+		media-libs/libpipewire[abi_x86_32]
+		media-sound/apulse[abi_x86_32]
+	)
+"
 
 S="${FILESDIR}"
 
diff --git a/metadata/md5-cache/app-emulation/steam-native-runtime-1.0.0.71 b/metadata/md5-cache/app-emulation/steam-native-runtime-1.0.0.71
deleted file mode 100644
index 3556eb7d..00000000
--- a/metadata/md5-cache/app-emulation/steam-native-runtime-1.0.0.71
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Native replacement for the Steam runtime using system libraries
-EAPI=7
-IUSE=pulseaudio
-KEYWORDS=amd64
-LICENSE=GPL-2
-RDEPEND=app-emulation/steam app-arch/bzip2[abi_x86_32] dev-libs/atk[abi_x86_32] dev-libs/dbus-glib[abi_x86_32] dev-libs/expat[abi_x86_32] dev-libs/glib:2[abi_x86_32] dev-libs/nspr[abi_x86_32] dev-libs/nss[abi_x86_32] media-libs/alsa-lib[abi_x86_32] media-libs/fontconfig[abi_x86_32] media-libs/freetype[abi_x86_32] media-libs/libcaca[abi_x86_32] media-libs/libcanberra[abi_x86_32] media-libs/libpng-compat:1.2[abi_x86_32] media-libs/libpipewire[abi_x86_32] media-libs/libsdl[abi_x86_32] media-libs/sdl-image[abi_x86_32] media-libs/sdl-mixer[abi_x86_32] media-libs/sdl-ttf[abi_x86_32] media-libs/libsdl2[abi_x86_32] media-libs/sdl2-image[abi_x86_32] media-libs/sdl2-mixer[abi_x86_32] media-libs/sdl2-ttf[abi_x86_32] media-libs/mesa[abi_x86_32] media-libs/openal[abi_x86_32] net-libs/libnm-glib[abi_x86_32] net-misc/curl[abi_x86_32] net-print/cups[abi_x86_32] sys-apps/dbus[abi_x86_32,X] sys-libs/libudev-compat[abi_x86_32] sys-libs/zlib[abi_x86_32] virtual/jpeg[abi_x86_32] virtual/opengl[abi_x86_32] virtual/libusb[abi_x86_32] x11-libs/gdk-pixbuf[abi_x86_32] x11-libs/gtk+:2[abi_x86_32,cups] x11-libs/libdrm[abi_x86_32] x11-libs/libICE[abi_x86_32] x11-libs/libSM[abi_x86_32] x11-libs/libva-compat:1[abi_x86_32] x11-libs/libvdpau[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXScrnSaver[abi_x86_32] x11-libs/libXcomposite[abi_x86_32] x11-libs/libXcursor[abi_x86_32] x11-libs/libXdamage[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXfixes[abi_x86_32] x11-libs/libXi[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] x11-libs/libXtst[abi_x86_32] x11-libs/pango[abi_x86_32] pulseaudio? ( media-sound/pulseaudio[abi_x86_32] ) !pulseaudio? ( media-sound/apulse[abi_x86_32] )
-SLOT=0
-_md5_=f048a0ea4a9f110655de6f4a2ff584c3
diff --git a/metadata/md5-cache/app-emulation/steam-native-runtime-1.0.0.71-r1 b/metadata/md5-cache/app-emulation/steam-native-runtime-1.0.0.71-r1
new file mode 100644
index 00000000..253411be
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/steam-native-runtime-1.0.0.71-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=app-emulation/steam app-arch/bzip2[abi_x86_32] dev-libs/atk[abi_x86_32] dev-libs/dbus-glib[abi_x86_32] dev-libs/expat[abi_x86_32] dev-libs/glib:2[abi_x86_32] dev-libs/nspr[abi_x86_32] dev-libs/nss[abi_x86_32] media-libs/alsa-lib[abi_x86_32] media-libs/fontconfig[abi_x86_32] media-libs/freetype[abi_x86_32] media-libs/libcaca[abi_x86_32] media-libs/libpng-compat:1.2[abi_x86_32] media-libs/libsdl[abi_x86_32] media-libs/sdl-image[abi_x86_32] media-libs/sdl-mixer[abi_x86_32] media-libs/sdl-ttf[abi_x86_32] media-libs/libsdl2[abi_x86_32] media-libs/sdl2-image[abi_x86_32] media-libs/sdl2-mixer[abi_x86_32] media-libs/sdl2-ttf[abi_x86_32] media-libs/mesa[abi_x86_32] media-libs/openal[abi_x86_32] net-libs/libnm-glib[abi_x86_32] net-misc/curl[abi_x86_32] net-print/cups[abi_x86_32] sys-apps/dbus[abi_x86_32,X] sys-libs/libudev-compat[abi_x86_32] sys-libs/zlib[abi_x86_32] virtual/jpeg[abi_x86_32] virtual/opengl[abi_x86_32] virtual/libusb[abi_x86_32] x11-libs/gdk-pixbuf[abi_x86_32] x11-libs/gtk+:2[abi_x86_32,cups] x11-libs/libdrm[abi_x86_32] x11-libs/libICE[abi_x86_32] x11-libs/libSM[abi_x86_32] x11-libs/libva-compat:1[abi_x86_32] x11-libs/libvdpau[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXScrnSaver[abi_x86_32] x11-libs/libXcomposite[abi_x86_32] x11-libs/libXcursor[abi_x86_32] x11-libs/libXdamage[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXfixes[abi_x86_32] x11-libs/libXi[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] x11-libs/libXtst[abi_x86_32] x11-libs/pango[abi_x86_32] pulseaudio? ( media-libs/libcanberra[abi_x86_32] media-sound/pulseaudio[abi_x86_32] ) !pulseaudio? ( media-libs/libcanberra[abi_x86_32] media-libs/libpipewire[abi_x86_32] media-sound/apulse[abi_x86_32] )
+DESCRIPTION=Native replacement for the Steam runtime using system libraries
+EAPI=7
+IUSE=pulseaudio
+KEYWORDS=amd64
+LICENSE=GPL-2
+RDEPEND=app-emulation/steam app-arch/bzip2[abi_x86_32] dev-libs/atk[abi_x86_32] dev-libs/dbus-glib[abi_x86_32] dev-libs/expat[abi_x86_32] dev-libs/glib:2[abi_x86_32] dev-libs/nspr[abi_x86_32] dev-libs/nss[abi_x86_32] media-libs/alsa-lib[abi_x86_32] media-libs/fontconfig[abi_x86_32] media-libs/freetype[abi_x86_32] media-libs/libcaca[abi_x86_32] media-libs/libpng-compat:1.2[abi_x86_32] media-libs/libsdl[abi_x86_32] media-libs/sdl-image[abi_x86_32] media-libs/sdl-mixer[abi_x86_32] media-libs/sdl-ttf[abi_x86_32] media-libs/libsdl2[abi_x86_32] media-libs/sdl2-image[abi_x86_32] media-libs/sdl2-mixer[abi_x86_32] media-libs/sdl2-ttf[abi_x86_32] media-libs/mesa[abi_x86_32] media-libs/openal[abi_x86_32] net-libs/libnm-glib[abi_x86_32] net-misc/curl[abi_x86_32] net-print/cups[abi_x86_32] sys-apps/dbus[abi_x86_32,X] sys-libs/libudev-compat[abi_x86_32] sys-libs/zlib[abi_x86_32] virtual/jpeg[abi_x86_32] virtual/opengl[abi_x86_32] virtual/libusb[abi_x86_32] x11-libs/gdk-pixbuf[abi_x86_32] x11-libs/gtk+:2[abi_x86_32,cups] x11-libs/libdrm[abi_x86_32] x11-libs/libICE[abi_x86_32] x11-libs/libSM[abi_x86_32] x11-libs/libva-compat:1[abi_x86_32] x11-libs/libvdpau[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXScrnSaver[abi_x86_32] x11-libs/libXcomposite[abi_x86_32] x11-libs/libXcursor[abi_x86_32] x11-libs/libXdamage[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXfixes[abi_x86_32] x11-libs/libXi[abi_x86_32] x11-libs/libXinerama[abi_x86_32] x11-libs/libXrandr[abi_x86_32] x11-libs/libXrender[abi_x86_32] x11-libs/libXtst[abi_x86_32] x11-libs/pango[abi_x86_32] pulseaudio? ( media-libs/libcanberra[abi_x86_32] media-sound/pulseaudio[abi_x86_32] ) !pulseaudio? ( media-libs/libcanberra[abi_x86_32] media-libs/libpipewire[abi_x86_32] media-sound/apulse[abi_x86_32] ) pulseaudio? ( || ( media-video/pipewire media-sound/pulseaudio-daemon media-sound/pulseaudio[daemon(+)] ) ) !pulseaudio? ( media-libs/libcanberra[abi_x86_32] media-libs/libpipewire[abi_x86_32] media-sound/apulse[abi_x86_32] )
+SLOT=0
+_md5_=0291858f0859ae53170eb44e7c7829e1
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index e87e0214..719c8fce 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -5,7 +5,7 @@ app-admin/calamares 3.2.44.3-r2: Distribution-independent installer framework
 app-admin/vasile 2.1812.2: Versatile Advanced Script for ISO and Latest Enchantments
 app-emulation/linux-steam-integration 0.7.3-r2: Helper for enabling better Steam integration on Linux
 app-emulation/steam 1.0.0.71: Digital distribution client bootstrap package
-app-emulation/steam-native-runtime 1.0.0.71: Native replacement for the Steam runtime using system libraries
+app-emulation/steam-native-runtime 1.0.0.71-r1: Native replacement for the Steam runtime using system libraries
 app-emulation/virt-manager 4.0.0-r10: A graphical tool for administering virtual machines
 app-emulation/virtualbox-bin 6.1.18.142142-r2: Family of powerful x86 virtualization products for enterprise and home use
 app-emulation/virtualbox-modules 6.1.18: Kernel Modules for Virtualbox