[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/libgit2sharp/files/, dev-dotnet/libgit2sharp/

[Heather Cynede]

commit:     d0917029fb71ff23db61c28eb4a5cdba094be899
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Wed Jul 27 02:49:10 2016 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 02:49:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=d0917029

corrections for Core/NativeDllName.cs

 .../remove-NativeBinaries-package-dependency.patch   | 19 +++++++++++++++++++
 dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild     | 20 +++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/dev-dotnet/libgit2sharp/files/remove-NativeBinaries-package-dependency.patch b/dev-dotnet/libgit2sharp/files/remove-NativeBinaries-package-dependency.patch
new file mode 100644
index 0000000..194ce41
--- /dev/null
+++ b/dev-dotnet/libgit2sharp/files/remove-NativeBinaries-package-dependency.patch
@@ -0,0 +1,19 @@
+--- a/LibGit2Sharp/LibGit2Sharp.csproj
++++ b/LibGit2Sharp/LibGit2Sharp.csproj
+@@ -1,6 +1,8 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.129\build\LibGit2Sharp.NativeBinaries.props')" />
++  <ItemGroup>
++    <EmbeddedResource Include="libgit2_filename.txt" />
++  </ItemGroup>
+   <PropertyGroup>
+     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+--- a/LibGit2Sharp/packages.config
++++ b/LibGit2Sharp/packages.config
+@@ -1,4 +1,3 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <packages>
+-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net4" allowedVersions="[1.0.129]" />
+ </packages>

diff --git a/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild b/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild
index 35b9c2b..f2c69b7 100644
--- a/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild
+++ b/dev-dotnet/libgit2sharp/libgit2sharp-0.22.ebuild
@@ -32,10 +32,28 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}"
 
+src_unpack() {
+	default
+	# remove rogue binaries
+	rm -rf "${S}/Lib/NuGet/" || die
+	rm -rf "${S}/Lib/CustomBuildTasks/CustomBuildTasks.dll" || 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"
+	eapply "${FILESDIR}/remove-NativeBinaries-package-dependency.patch"
+	echo "/usr/lib64/libgit2.so" >"LibGit2Sharp/libgit2_filename.txt" || die
+	enuget_restore "LibGit2Sharp.sln"
 	default
 }
+
+src_compile() {
+	# recreate custom build tasks .dll
+	sed -i "s#<OutputPath>.*</OutputPath>#<OutputPath>.</OutputPath>#g" "Lib/CustomBuildTasks/CustomBuildTasks.csproj" || die
+	exbuild "Lib/CustomBuildTasks/CustomBuildTasks.csproj"
+
+	# main compileation
+	exbuild "LibGit2Sharp.sln"
+}