From: Nick Bowler Date: Wed, 5 Jun 2024 01:22:24 +0000 (-0400) Subject: dev-python/pygobject: Unbreak deps after package move. X-Git-Url: http://git.draconx.ca/gitweb/gentoo-fixes.git/commitdiff_plain/HEAD?ds=sidebyside;hp=869c6d7ab6d98cd64ccb7d882d3d9066a4225968 dev-python/pygobject: Unbreak deps after package move. Adjust deps to work around pointless churn in gentoo repo breaking downstream repositories. --- diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 7795cd7..9407c5a 100644 --- 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 -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 1a5f201..6b227bd 100644 --- 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) +# * Update media-sound/mpg123 -> media-sound/mpg123-base (2024-02) 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}] ) - 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}] ) diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest index 2a547a4..cdb10f4 100644 --- a/dev-python/pygobject/Manifest +++ b/dev-python/pygobject/Manifest @@ -8,4 +8,4 @@ AUX pygobject-2.28.6-python-byte-compile.patch 539 BLAKE2B b2d64ab0ad8943948c7bf AUX pygobject-2.28.6-set_qdata.patch 847 BLAKE2B 696aa6c48ee900db738f8a92265a625a3ab7b59afece84157bf0b9abd0aca5ae68b7ac8cc627a47a5b1a688029d592abcc38e403543a4144e055bcdac68285e4 SHA512 19025af51a8387061276ec9d6c8eb0ecadb5124bba2c4ab3755ab653df467896d19c366d80ce9313fd46e43b493b7c536f780014cf18a6ac47f4b1d2ad4bedb4 AUX pygobject-2.28.6-tests-no-introspection.patch 1257 BLAKE2B 7ff0587b4b40a1519927f8837b5487847ad0d0aa25f57dbaa4b10eaed2eff79f52d6581ca29f1688ebdbe71db231aba56de06c3aa8b246fdd1799320d9a15cc3 SHA512 7d57cb9bbd0b16f4fb0ed9d5eca310c47daf86b89daefa41fb0cf5dd470a6f6a31d0dad31dd261332c039d39bd778f9de8de7260c5856f1b718f72b9aabc01b4 DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c -EBUILD pygobject-2.28.6-r59.ebuild 2859 BLAKE2B 6de822503f961d5ee6cb8b8139b13308c13e179f51b6d811d44f65affac57d985ae3805520ec7e51abb5d375377fc40b1700f8d630fc76dd66713e20a535f0cb SHA512 9ed57cbd24cb251c0369779df82899398126f82c5c47c2ca15823e87d564d6f994eeecbb2206fad6404058e70052780732261e41c2ea36ea7f4e55626308e461 +EBUILD pygobject-2.28.6-r60.ebuild 2887 BLAKE2B 2776d3e7b216be3917ab8326dc327120f08dfb2ec89126bda0aa0916146bbe24157e1b9401077b31a225a19ed57d7cf8308b80b8cc196542783b7f839b691581 SHA512 e2dba8eed08acfa097e5d29bc95cd8e3436da065eb649680b858960717fec415f08c8452c88f36146b78d1faee410a46579a65fa9d733a30c91884e424462584 diff --git a/dev-python/pygobject/pygobject-2.28.6-r59.ebuild b/dev-python/pygobject/pygobject-2.28.6-r60.ebuild similarity index 98% rename from dev-python/pygobject/pygobject-2.28.6-r59.ebuild rename to dev-python/pygobject/pygobject-2.28.6-r60.ebuild index 4b2aeef..89a206d 100644 --- a/dev-python/pygobject/pygobject-2.28.6-r59.ebuild +++ b/dev-python/pygobject/pygobject-2.28.6-r60.ebuild @@ -29,7 +29,7 @@ IUSE="examples libffi test" RESTRICT="test" BDEPEND="virtual/pkgconfig - dev-util/gtk-doc-am" + || ( dev-build/gtk-doc-am dev-util/gtk-doc-am )" RDEPEND=">=dev-libs/glib-2.24.0:2 libffi? ( dev-libs/libffi:= )