From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6FD0F15815E for ; Sat, 10 Feb 2024 16:25:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0AB98E2A74; Sat, 10 Feb 2024 16:25:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1FB9E2A64 for ; Sat, 10 Feb 2024 16:25:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B0A3A343089 for ; Sat, 10 Feb 2024 16:24:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 350E614DD for ; Sat, 10 Feb 2024 16:24:56 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1707582288.b28abd902a912ed2d283b58e1d61ec489379ef29.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-dotnet/netcoredbg/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-dotnet/netcoredbg/netcoredbg-3.0.0.1018-r1.ebuild dev-dotnet/netcoredbg/netcoredbg-3.0.0.1018.ebuild X-VCS-Directories: dev-dotnet/netcoredbg/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: b28abd902a912ed2d283b58e1d61ec489379ef29 X-VCS-Branch: master Date: Sat, 10 Feb 2024 16:24:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1abd47ac-75a5-41aa-bfda-2b8930d6dec7 X-Archives-Hash: fb2a3808d25c5c8886d70a00da89f6ba commit: b28abd902a912ed2d283b58e1d61ec489379ef29 Author: Maciej Barć gentoo org> AuthorDate: Sat Feb 10 13:12:03 2024 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sat Feb 10 16:24:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28abd90 dev-dotnet/netcoredbg: use dotnet-pkg eclass Signed-off-by: Maciej Barć gentoo.org> ...1018.ebuild => netcoredbg-3.0.0.1018-r1.ebuild} | 49 +++++++--------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/dev-dotnet/netcoredbg/netcoredbg-3.0.0.1018.ebuild b/dev-dotnet/netcoredbg/netcoredbg-3.0.0.1018-r1.ebuild similarity index 89% rename from dev-dotnet/netcoredbg/netcoredbg-3.0.0.1018.ebuild rename to dev-dotnet/netcoredbg/netcoredbg-3.0.0.1018-r1.ebuild index aeac34f8ec8e..f273ca2ffe32 100644 --- a/dev-dotnet/netcoredbg/netcoredbg-3.0.0.1018.ebuild +++ b/dev-dotnet/netcoredbg/netcoredbg-3.0.0.1018-r1.ebuild @@ -7,7 +7,7 @@ MY_PV="$(ver_cut 1-3)-$(ver_cut 4)" DOTNET_RUNTIME_V="7.0.14" CMAKE_IN_SOURCE_BUILD="ON" - +DOTNET_PKG_COMPAT="8.0" NUGETS=" microsoft.codeanalysis.analyzers@1.1.0 microsoft.codeanalysis.common@2.3.0 @@ -128,7 +128,7 @@ system.xml.xpath.xdocument@4.3.0 system.xml.xpath@4.3.0 " -inherit check-reqs cmake flag-o-matic nuget +inherit check-reqs dotnet-pkg flag-o-matic cmake DESCRIPTION="NetCoreDbg is a managed code debugger with MI interface for CoreCLR" HOMEPAGE="https://github.com/Samsung/netcoredbg/" @@ -159,15 +159,10 @@ SRC_URI+=" LICENSE="MIT" SLOT="0/${MY_PV}" -RDEPEND=" - >=virtual/dotnet-sdk-6.0 -" -BDEPEND=" - ${RDEPEND} - dev-dotnet/csharp-gentoodotnetinfo -" - CHECKREQS_DISK_BUILD="1400M" +DOTNET_PKG_PROJECTS=( + src/managed/ManagedPart.csproj # Restore but do not build those projects. +) PATCHES=( "${FILESDIR}/${PN}-3.0.0.1012-compileoptions.patch" ) @@ -175,10 +170,13 @@ QA_FLAGS_IGNORED=".*/libdbgshim.so" DOCS=( README.md docs/{interop,stepping}.md ) +pkg_setup() { + check-reqs_pkg_setup + dotnet-pkg_pkg_setup +} + src_unpack() { - nuget_link-system-nugets - nuget_link-nuget-archives - nuget_unpack-non-nuget-archives + dotnet-pkg_src_unpack if [[ -n "${EGIT_REPO_URI}" ]] ; then git-r3_src_unpack @@ -186,35 +184,16 @@ src_unpack() { } src_prepare() { - if [[ -z "${DOTNET_ROOT}" ]] ; then - die "DOTNET_ROOT is not set" - fi + cmake_src_prepare - export DOTNET_CLI_TELEMETRY_OPTOUT=1 - export DOTNET_NOLOGO=1 - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - export MSBUILDDISABLENODEREUSE=1 - export UseSharedCompilation=false - - find "${S}" -type f -iname nuget.config -exec rm -v {} + || die - cat <<-EOF > NuGet.config || die - - - - - - - -EOF + nuget_writeconfig "$(pwd)/" cp NuGet.config tools/generrmsg/nuget.xml || die - - cmake_src_prepare } src_configure() { INSTALL_PREFIX="/usr/$(get_libdir)/${PN}" - gentoo-dotnet-info || die append-cxxflags -fpermissive + dotnet-pkg_src_configure local -a mycmakeargs=( -DBUILD_MANAGED=1