app-emulation/wine-vanilla-4.0.4: Adapt mpg123 dependency.

Gentoo has split this into multiple packages.  We should only need
the decoder libraries, I think, in media-sound/mpg123-base.

diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index 7795cd7e7afb9c15e608dab3136a72db65784cee..9407c5aefc4884926ba988fb0b9370ed0d9bdd59 100644 (file)
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -1,4 +1,4 @@
 AUX 4.0.4-configure-fixes.patch 523 BLAKE2B 8cb555cdf763b734dcf27c6f6892867f597de5481ce69f975df17844518842b9f8f6f0190f8b3690eb4b7f5978f6daa508525eebb07d8349e84f314969c16d90 SHA512 5d67d43d7bcfe6497826ac1f8e2d8f1ac63bc724c31a44caa6cb91d9f5a1004be5a56d0d6f03891c9acb2530fb7f14503f7cc950ff650ebdad31868ee6b1c7b6
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-4.0.4.tar.xz 21686868 BLAKE2B 3ba9afef38a33e53eb1979aa4e7bbb120370692a8480e7bc15fc6959fb326c0c1f2151bb96355220e534858c0be56e1c35813e5e31b8a85db89c701466edac21 SHA512 21780b3c846bfa7a54572fe78939d7a2579a2b96654fc578e8e70d20b50262b4bfb43a0431f4089264cf8f83202c2fc67dd6a4c89257e951b64e7c91ee3bdf4e
 AUX 4.0.4-configure-fixes.patch 523 BLAKE2B 8cb555cdf763b734dcf27c6f6892867f597de5481ce69f975df17844518842b9f8f6f0190f8b3690eb4b7f5978f6daa508525eebb07d8349e84f314969c16d90 SHA512 5d67d43d7bcfe6497826ac1f8e2d8f1ac63bc724c31a44caa6cb91d9f5a1004be5a56d0d6f03891c9acb2530fb7f14503f7cc950ff650ebdad31868ee6b1c7b6
 DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a06429680b518d7eafb938cefd903f3f8aa71ea3049ac9d8de05af48f9f4f4a1b9172c7ef17784540413e410eb8ec11e8ec4a63858c6 SHA512 5b354a409c7a2b77499aaa593b9248a1d15d755e3687b095755faacc30068bfcdbdd5c2a2a78617cb1a78c46d2931162bd69ec3379b035d81494bea7108263c2
 DIST wine-4.0.4.tar.xz 21686868 BLAKE2B 3ba9afef38a33e53eb1979aa4e7bbb120370692a8480e7bc15fc6959fb326c0c1f2151bb96355220e534858c0be56e1c35813e5e31b8a85db89c701466edac21 SHA512 21780b3c846bfa7a54572fe78939d7a2579a2b96654fc578e8e70d20b50262b4bfb43a0431f4089264cf8f83202c2fc67dd6a4c89257e951b64e7c91ee3bdf4e

-EBUILD wine-vanilla-4.0.4-r1.ebuild 17806 BLAKE2B aa97f4b8ae8baeeda110c19c7c37effb7ef578a40e53d96e1f9e4f9149636d334d90c5de810d890acfc2c317fb4d9dee49b9d46e79aede1f2d90fc453433ee7b SHA512 f06357ba053f90184561057694830e7781568942e3252bc3825099c74ebcf2355ffd44544cd53a5284110a9208fdbfc7d76a369ff09cf58885acc1ae8020bde6
+EBUILD wine-vanilla-4.0.4-r2.ebuild 17945 BLAKE2B 14856ae26a71d12128d1f23840c9f995bed33846cd3662aad0a9d114996c38544e4a9c341f39202217238ad2f62fbfb0dfb50f043c8aa8c66961184c069dc4d7 SHA512 f81c26ed094f18385f1aefc1ff63315edf0a946f7ee7eb63f18023a04658640c4f2ed64f3056ffcdfc55bec289562d5ffbde638a56680b9261cbdc5f4e6a32a4

diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.0.4-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.0.4-r2.ebuild
similarity index 98%
rename from app-emulation/wine-vanilla/wine-vanilla-4.0.4-r1.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-4.0.4-r2.ebuild
index 1a5f201b0208d9ef51188cafcab6d22584689b7a..6b227bdbda1f6b29dc3daf5ba951583b3ac13237 100644 (file)
--- a/app-emulation/wine-vanilla/wine-vanilla-4.0.4-r1.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.0.4-r2.ebuild
@@ -9,6 +9,7 @@
 #   * Apply patch to build successfully with Autoconf 2.71 (2021-11)
 #   * Build with -fcommon to get compatible behaviour from GCC 10 (2022-04)
 #   * Port to EAPI 8 for compatibility with current eclasses (2022-12)
 #   * Apply patch to build successfully with Autoconf 2.71 (2021-11)
 #   * Build with -fcommon to get compatible behaviour from GCC 10 (2022-04)
 #   * Port to EAPI 8 for compatibility with current eclasses (2022-12)

+#   * Update media-sound/mpg123 -> media-sound/mpg123-base (2024-02)

 
 EAPI=8
 
 
 EAPI=8
 


@@ -85,7 +86,12 @@ COMMON_DEPEND="
        kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
        lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
        ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
        kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
        lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
        ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )

-       mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+       mp3? (
+               || (
+                       >=media-sound/mpg123-base-1.5.0[${MULTILIB_USEDEP}]
+                       >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}]
+               )
+       )

        ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
        netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
        nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
        ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
        netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
        nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )