commit: b7588f22e70bb8e7259f001b049b6254a9d7a3b7 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Mon Oct 30 19:11:47 2023 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Mon Oct 30 23:15:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7588f22
dev-lang/jint: force-target only net7.0 Closes: https://bugs.gentoo.org/916530 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> dev-lang/jint/Manifest | 2 -- dev-lang/jint/jint-3.0.0_beta2051.ebuild | 19 ++++++------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dev-lang/jint/Manifest b/dev-lang/jint/Manifest index 4acc86256ecf..c38c475808a1 100644 --- a/dev-lang/jint/Manifest +++ b/dev-lang/jint/Manifest @@ -36,8 +36,6 @@ DIST microsoft.netcore.platforms.2.1.2.nupkg 31064 BLAKE2B 6b28f015a1c3c2dbad93f DIST microsoft.netcore.platforms.5.0.0.nupkg 39826 BLAKE2B a122f0d2afb77455c005740fe5096c055f72eb658b0d1f10e6a17f9d07c3bf91ad0010ff472ee1d05b84bfbb75c9de3c46d2a2d33fdcaa245d64d6c3a956f233 SHA512 8493fe11648c7ecc20b6530490d30fd63744961345c0501a7a10b11046661da09b783ddceb8b3208ae52a72a8a94cafdce8dc1bd6073c32081e30d0e7407f174 DIST microsoft.netcore.targets.1.1.0.nupkg 18162 BLAKE2B 419d19e0da934ab4b9db75dd66cc22b83a003f34e93cf7a92feccf4f32d3d695e18b826b1aba13073dd4ec53aa7905a67346921d1055516647ddcde0d79009f1 SHA512 1ef033a68688aab9997ec1c0378acb1638b4afb618e533fcaf749d93389737ba94f4a0a94481becdf701c7e988ae2fe390136a8eae225887ee60db45063490fe DIST microsoft.netcore.targets.1.1.3.nupkg 31152 BLAKE2B 80a656508fda7db32065d89f8eeb319db79869a00cb22d7a8c9c2204711f057f076e905050717302d4f900b8881c7d2a15bfc040fa285dca984c138cce311d3a SHA512 a71c2af20d8f61188417929756399914c353aac8361abd69baffe9475b2a01db802870066da0ae27afb2737a4026c782950503dbd4b651bae6ee7fd90fbf1d52 -DIST microsoft.netframework.referenceassemblies.1.0.2.nupkg 20957 BLAKE2B e521646690b142a703d943cb0528552a669ceed16fa71e3a04300da1eb58d5428b168628c85b8e963e963cf0041b0a02d7442414248e6f506ff3d7ae452a85cb SHA512 8bf3922b695856059b8eec696a7ace03a7269d71d4c456cbdfb21bd3f6e69f2a9fa25e46acd5c29ad872829a07cc05ec083c3a6ee942bca21afd47ce3bc533e3 -DIST microsoft.netframework.referenceassemblies.net462.1.0.2.nupkg 19902480 BLAKE2B 72b3db5915db8e8f1ddcc2fc9f9598eae8521ff122bcc6447e9e18728308524969e4773dfc5f50700253bc25383a301d2a9a291a3e553cd4187f40cfa1dae8fc SHA512 883404876c53200fe8d7a76d71509056c8c995f99ad695af9468cfd4b61b377bc60e602a98386881408e88ddc3d56fc43fb1dcd9a0cbd038673f3758c4f33b43 DIST microsoft.sourcelink.common.1.1.1.nupkg 271934 BLAKE2B 6678fa357eba30a58cd1b457bfe8423a2c0e1359c9088cab364707c0061a7e11035094a00a75528a290b1c9415062ce47a17600bd010f769b3d7e2501456e911 SHA512 bf2241eeeb82876f7612d525064aa90f9bb56610260d44a2fc5b75b63b45a652444c25451f7daacbe97cb2c5a6e72180805f894054f7176cc290d147a2753ef4 DIST microsoft.sourcelink.github.1.1.1.nupkg 285433 BLAKE2B 986ee1aa2bd39c577c0ffc71e27d5ed5128dc5b2df9dcdc29f0b62cae31de120253cea0afeb583ab1a3fc5e5b50766a608f2f8ec749224436a031092fb14b553 SHA512 54c7ff8d0cafd654a115d5755710ec89534399a605949ffd43778290796022092679a43e1a129250ff9a03e61417c43dc2fc1362a9019dee88a7e048c1be953c DIST microsoft.testplatform.objectmodel.17.7.1.nupkg 1496394 BLAKE2B 2957d63fd29b5adc5753730bedc6531128a36f6738a8951cb7e328d9e2fd9a637dba20974fab33822723b510a6063b782cbea699308bce968caf172991b6cfde SHA512 6230d4db57b4b94e53dbece850ccd8e6d7b5d68a0fe06cf73dd16108f07e0b566ae721b4eeaaaa5b36415d9405bda14b922731d6d50638ea6a8c97a0322305e4 diff --git a/dev-lang/jint/jint-3.0.0_beta2051.ebuild b/dev-lang/jint/jint-3.0.0_beta2051.ebuild index 531b441dfbbd..fc437c26d904 100644 --- a/dev-lang/jint/jint-3.0.0_beta2051.ebuild +++ b/dev-lang/jint/jint-3.0.0_beta2051.ebuild @@ -44,8 +44,6 @@ [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] @@ -233,6 +231,12 @@ SLOT="0" RESTRICT="test" # Tests fail. CHECKREQS_DISK_BUILD="2G" +DOTNET_PKG_RESTORE_EXTRA_ARGS=( + -p:TargetFramework="net${DOTNET_PKG_COMPAT}" + -p:TargetFrameworks="net${DOTNET_PKG_COMPAT}" +) +DOTNET_PKG_BUILD_EXTRA_ARGS=( "${DOTNET_PKG_RESTORE_EXTRA_ARGS[@]}" ) +DOTNET_PKG_TEST_EXTRA_ARGS=( "${DOTNET_PKG_RESTORE_EXTRA_ARGS[@]}" ) DOTNET_PKG_PROJECTS=( Jint.Repl/Jint.Repl.csproj ) pkg_setup() { @@ -240,17 +244,6 @@ pkg_setup() { dotnet-pkg_pkg_setup } -src_prepare() { - default - - # Force update to SDK 7.0 since build fails with current version - # of SDK 6.0 in the ::gentoo tree. - find . \ - -type f -name "*.csproj" \ - -exec sed -e "s|net6.0|net7.0|g" -i {} \; \ - || die -} - src_install() { dotnet-pkg-base_install dotnet-pkg-base_dolauncher "/usr/share/${P}/Jint.Repl" "${PN}"
