commit: 6cd49c20216a016d7807dc2613e70aec7b822a1d Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> AuthorDate: Wed Jul 27 01:25:32 2016 +0000 Commit: Heather Cynede <cynede <AT> gentoo <DOT> org> CommitDate: Wed Jul 27 01:25:32 2016 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=6cd49c20
patches for removing xunit dependency .../files/csproj-remove-nuget-targets-check.patch | 15 +++++++++++++++ .../libgit2sharp/files/packages-config-remove-xunit.patch | 8 ++++++++ dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild | 9 ++++----- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dev-dotnet/libgit2sharp/files/csproj-remove-nuget-targets-check.patch b/dev-dotnet/libgit2sharp/files/csproj-remove-nuget-targets-check.patch new file mode 100644 index 0000000..c90f79c --- /dev/null +++ b/dev-dotnet/libgit2sharp/files/csproj-remove-nuget-targets-check.patch @@ -0,0 +1,15 @@ +--- a/LibGit2Sharp/LibGit2Sharp.csproj ++++ b/LibGit2Sharp/LibGit2Sharp.csproj +@@ -410,12 +410,6 @@ + <PreBuildEvent> + </PreBuildEvent> + </PropertyGroup> +- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> +- <PropertyGroup> +- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> +- </PropertyGroup> +- <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props'))" /> +- </Target> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> diff --git a/dev-dotnet/libgit2sharp/files/packages-config-remove-xunit.patch b/dev-dotnet/libgit2sharp/files/packages-config-remove-xunit.patch new file mode 100644 index 0000000..6e1d44d --- /dev/null +++ b/dev-dotnet/libgit2sharp/files/packages-config-remove-xunit.patch @@ -0,0 +1,8 @@ +--- a/.nuget/packages.config ++++ b/.nuget/packages.config +@@ -1,5 +1,3 @@ + <?xml version="1.0" encoding="utf-8"?> + <packages> +- <package id="xunit.runner.console" version="2.0.0" /> +- <package id="xunit.runner.msbuild" version="2.0.0" /> + </packages> diff --git a/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild b/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild index 5ac150e..35b9c2b 100644 --- a/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild +++ b/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild @@ -7,7 +7,7 @@ EAPI=6 USE_DOTNET="net45" IUSE="${USE_DOTNET}" -inherit nupkg +inherit nuget nupkg KEYWORDS="amd64 x86 ~ppc-macos" @@ -32,11 +32,10 @@ DEPEND="${CDEPEND} " RDEPEND="${CDEPEND}" -src_unpack() { - nuget restore ${S}/LibGit2Sharp.sln || die -} - src_prepare() { eapply "${FILESDIR}/sln.patch" + eapply "${FILESDIR}/csproj-remove-nuget-targets-check.patch" + eapply "${FILESDIR}/packages-config-remove-xunit.patch" + enuget_restore "${S}/LibGit2Sharp.sln" default }
