Gentoo Archives: gentoo-commits

From: Heather Cynede <cynede@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/libgit2sharp/files/, dev-dotnet/libgit2sharp/
Date: Wed, 27 Jul 2016 06:39:45
Message-Id: 1469582732.6cd49c20216a016d7807dc2613e70aec7b822a1d.cynede@gentoo
1 commit: 6cd49c20216a016d7807dc2613e70aec7b822a1d
2 Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
3 AuthorDate: Wed Jul 27 01:25:32 2016 +0000
4 Commit: Heather Cynede <cynede <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 27 01:25:32 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=6cd49c20
7
8 patches for removing xunit dependency
9
10 .../files/csproj-remove-nuget-targets-check.patch | 15 +++++++++++++++
11 .../libgit2sharp/files/packages-config-remove-xunit.patch | 8 ++++++++
12 dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild | 9 ++++-----
13 3 files changed, 27 insertions(+), 5 deletions(-)
14
15 diff --git a/dev-dotnet/libgit2sharp/files/csproj-remove-nuget-targets-check.patch b/dev-dotnet/libgit2sharp/files/csproj-remove-nuget-targets-check.patch
16 new file mode 100644
17 index 0000000..c90f79c
18 --- /dev/null
19 +++ b/dev-dotnet/libgit2sharp/files/csproj-remove-nuget-targets-check.patch
20 @@ -0,0 +1,15 @@
21 +--- a/LibGit2Sharp/LibGit2Sharp.csproj
22 ++++ b/LibGit2Sharp/LibGit2Sharp.csproj
23 +@@ -410,12 +410,6 @@
24 + <PreBuildEvent>
25 + </PreBuildEvent>
26 + </PropertyGroup>
27 +- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
28 +- <PropertyGroup>
29 +- <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>
30 +- </PropertyGroup>
31 +- <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'))" />
32 +- </Target>
33 + <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
34 + Other similar extension points exist, see Microsoft.Common.targets.
35 + <Target Name="BeforeBuild">
36
37 diff --git a/dev-dotnet/libgit2sharp/files/packages-config-remove-xunit.patch b/dev-dotnet/libgit2sharp/files/packages-config-remove-xunit.patch
38 new file mode 100644
39 index 0000000..6e1d44d
40 --- /dev/null
41 +++ b/dev-dotnet/libgit2sharp/files/packages-config-remove-xunit.patch
42 @@ -0,0 +1,8 @@
43 +--- a/.nuget/packages.config
44 ++++ b/.nuget/packages.config
45 +@@ -1,5 +1,3 @@
46 + <?xml version="1.0" encoding="utf-8"?>
47 + <packages>
48 +- <package id="xunit.runner.console" version="2.0.0" />
49 +- <package id="xunit.runner.msbuild" version="2.0.0" />
50 + </packages>
51
52 diff --git a/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild b/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild
53 index 5ac150e..35b9c2b 100644
54 --- a/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild
55 +++ b/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild
56 @@ -7,7 +7,7 @@ EAPI=6
57 USE_DOTNET="net45"
58 IUSE="${USE_DOTNET}"
59
60 -inherit nupkg
61 +inherit nuget nupkg
62
63 KEYWORDS="amd64 x86 ~ppc-macos"
64
65 @@ -32,11 +32,10 @@ DEPEND="${CDEPEND}
66 "
67 RDEPEND="${CDEPEND}"
68
69 -src_unpack() {
70 - nuget restore ${S}/LibGit2Sharp.sln || die
71 -}
72 -
73 src_prepare() {
74 eapply "${FILESDIR}/sln.patch"
75 + eapply "${FILESDIR}/csproj-remove-nuget-targets-check.patch"
76 + eapply "${FILESDIR}/packages-config-remove-xunit.patch"
77 + enuget_restore "${S}/LibGit2Sharp.sln"
78 default
79 }