change paths

4 files changed, 57 insertions, 51 deletions

diff --git a/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch b/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch
index 1a782db..7a01978 100644
--- a/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch
+++ b/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch
@@ -1,8 +1,7 @@
-diff --git a/nuget/nunit.nuspec b/nuget/nunit.nuspec
-index 71634a9..b450080 100644
---- a/nuget/nunit.nuspec
-+++ b/nuget/nunit.nuspec
-@@ -32,15 +32,7 @@ Supported platforms:
+diff -u -r a/nuget/nunit.nuspec b/nuget/nunit.nuspec
+--- a/nuget/nunit.nuspec	2015-12-02 05:52:00.000000000 +0300
++++ b/nuget/nunit.nuspec	2017-05-28 18:08:45.000000000 +0300
+@@ -32,15 +32,7 @@
      <file src="LICENSE.txt" />
      <file src="NOTICES.txt" />
      <file src="CHANGES.txt" />
@@ -10,11 +9,13 @@ index 71634a9..b450080 100644
 -    <file src="bin/net-2.0/nunit.framework.xml" target="lib/net20" />
 -    <file src="bin/net-4.0/nunit.framework.dll" target="lib/net40" />
 -    <file src="bin/net-4.0/nunit.framework.xml" target="lib/net40" />
-     <file src="bin/net-4.5/nunit.framework.dll" target="lib/net45" />
-     <file src="bin/net-4.5/nunit.framework.xml" target="lib/net45" />
+-    <file src="bin/net-4.5/nunit.framework.dll" target="lib/net45" />
+-    <file src="bin/net-4.5/nunit.framework.xml" target="lib/net45" />
 -    <file src="bin/portable/nunit.framework.dll" target="lib/dotnet" />
 -    <file src="bin/portable/nunit.framework.xml" target="lib/dotnet" />
 -    <file src="bin/portable/nunit.framework.dll" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
 -    <file src="bin/portable/nunit.framework.xml" target="lib/portable-net45+win8+wp8+wpa81+Xamarin.Mac+MonoAndroid10+MonoTouch10+Xamarin.iOS10" />
++    <file src="bin/$dir$/net-4.5/nunit.framework.dll" target="lib/net45" />
++    <file src="bin/$dir$/net-4.5/nunit.framework.xml" target="lib/net45" />
    </files>
  </package>
diff --git a/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch b/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch
index db29255..4d6e8b9 100644
--- a/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch
+++ b/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch
@@ -1,24 +1,38 @@
-diff --git a/nuget/nunit.console.nuspec b/nuget/nunit.console.nuspec
-index 7479f61..7c7e65f 100644
---- a/nuget/nunit.console.nuspec
-+++ b/nuget/nunit.console.nuspec
-@@ -25,8 +25,6 @@
+--- a/nuget/nunit.console.nuspec	2015-12-02 05:52:00.000000000 +0300
++++ b/nuget/nunit.console.nuspec	2017-05-28 18:49:12.746449899 +0300
+@@ -23,23 +23,17 @@
+     <file src="LICENSE.txt" />
+     <file src="NOTICES.txt" />
      <file src="CHANGES.txt" />
-     <file src="bin/nunit-agent.exe" target="tools" />
-     <file src="bin/nunit-agent.exe.config" target="tools" />
+-    <file src="bin/nunit-agent.exe" target="tools" />
+-    <file src="bin/nunit-agent.exe.config" target="tools" />
 -    <file src="bin/nunit-agent-x86.exe" target="tools" />
 -    <file src="bin/nunit-agent-x86.exe.config" target="tools" />
-     <file src="bin/nunit3-console.exe" target="tools" />
-     <file src="bin/nunit3-console.exe.config" target="tools" />
-     <file src="bin/nunit.engine.api.dll" target="tools" />
-@@ -34,10 +32,6 @@
-     <file src="bin/nunit.engine.dll" target="tools" />
-     <file src="bin/nunit.engine.addins" target="tools" />
-     <file src="bin/nunit.engine.addin.xml" target="tools" />
+-    <file src="bin/nunit3-console.exe" target="tools" />
+-    <file src="bin/nunit3-console.exe.config" target="tools" />
+-    <file src="bin/nunit.engine.api.dll" target="tools" />
+-    <file src="bin/nunit.engine.api.xml" target="tools" />
+-    <file src="bin/nunit.engine.dll" target="tools" />
+-    <file src="bin/nunit.engine.addins" target="tools" />
+-    <file src="bin/nunit.engine.addin.xml" target="tools" />
 -    <file src="bin/Mono.Cecil.dll" target="tools" />
 -    <file src="bin/addins/nunit.v2.driver.dll" target="tools/addins" />
 -    <file src="bin/addins/nunit.core.dll" target="tools/addins" />
 -    <file src="bin/addins/nunit.core.interfaces.dll" target="tools/addins" />
-     <file src="bin/addins/nunit-v2-result-writer.dll" target="tools/addins" />
-     <file src="bin/addins/nunit-project-loader.dll" target="tools/addins" />
-     <file src="bin/addins/vs-project-loader.dll" target="tools/addins" />
+-    <file src="bin/addins/nunit-v2-result-writer.dll" target="tools/addins" />
+-    <file src="bin/addins/nunit-project-loader.dll" target="tools/addins" />
+-    <file src="bin/addins/vs-project-loader.dll" target="tools/addins" />
++    <file src="bin/$dir$/nunit-agent.exe" target="tools" />
++    <file src="bin/$dir$/nunit-agent.exe.config" target="tools" />
++    <file src="bin/$dir$/nunit3-console.exe" target="tools" />
++    <file src="bin/$dir$/nunit3-console.exe.config" target="tools" />
++    <file src="bin/$dir$/nunit.engine.api.dll" target="tools" />
++    <file src="bin/$dir$/nunit.engine.api.xml" target="tools" />
++    <file src="bin/$dir$/nunit.engine.dll" target="tools" />
++    <file src="bin/$dir$/nunit.engine.addins" target="tools" />
++    <file src="bin/$dir$/nunit.engine.addin.xml" target="tools" />
++    <file src="bin/$dir$/addins/nunit-v2-result-writer.dll" target="tools/addins" />
++    <file src="bin/$dir$/addins/nunit-project-loader.dll" target="tools/addins" />
++    <file src="bin/$dir$/addins/vs-project-loader.dll" target="tools/addins" />
+   </files>
+ </package>
diff --git a/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch b/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch
index c6920b0..9713dc7 100644
--- a/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch
+++ b/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch
@@ -1,16 +1,21 @@
-diff --git a/nuget/nunit.engine.nuspec b/nuget/nunit.engine.nuspec
-index 04086bf..53f3be6 100644
---- a/nuget/nunit.engine.nuspec
-+++ b/nuget/nunit.engine.nuspec
-@@ -23,10 +23,7 @@
+diff -u -r a/nuget/nunit.engine.nuspec b/nuget/nunit.engine.nuspec
+--- a/nuget/nunit.engine.nuspec	2015-12-02 05:52:00.000000000 +0300
++++ b/nuget/nunit.engine.nuspec	2017-05-28 19:01:55.000000000 +0300
+@@ -21,12 +21,9 @@
+     <file src="LICENSE.txt" />
+     <file src="NOTICES.txt" />
      <file src="CHANGES.txt" />
-     <file src="bin\nunit.engine.dll" target="lib" />
-     <file src="bin\nunit.engine.api.dll" target="lib" />
+-    <file src="bin\nunit.engine.dll" target="lib" />
+-    <file src="bin\nunit.engine.api.dll" target="lib" />
 -    <file src="bin\Mono.Cecil.dll" target="lib" />
-     <file src="bin\nunit-agent.exe" target="lib" />
-     <file src="bin\nunit-agent.exe.config" target="lib" />
+-    <file src="bin\nunit-agent.exe" target="lib" />
+-    <file src="bin\nunit-agent.exe.config" target="lib" />
 -    <file src="bin\nunit-agent-x86.exe" target="lib" />
 -    <file src="bin\nunit-agent-x86.exe.config" target="lib" />
++    <file src="bin/$dir$/nunit.engine.dll" target="lib" />
++    <file src="bin/$dir$/nunit.engine.api.dll" target="lib" />
++    <file src="bin/$dir$/nunit-agent.exe" target="lib" />
++    <file src="bin/$dir$/nunit-agent.exe.config" target="lib" />
    </files>
  </package>
 \ No newline at end of file
diff --git a/dev-util/nunit/nunit-3.0.1-r2.ebuild b/dev-util/nunit/nunit-3.0.1-r2.ebuild
index 2dd2e98..af165c1 100644
--- a/dev-util/nunit/nunit-3.0.1-r2.ebuild
+++ b/dev-util/nunit/nunit-3.0.1-r2.ebuild
@@ -68,17 +68,12 @@ src_prepare() {
 	if use debug; then
 		DIR="Debug"
 	else
-		DIR=""
+		DIR="Release"
 	fi
 
 	sed -i "s=\\\$version\\\$=${NUGET_PACKAGE_VERSION}=g" "${S}/nuget/"*.nuspec || die
-	#sed -i "s=\\\${package.version}=${NUGET_PACKAGE_VERSION}=g" "${S}/nuget/"*.nuspec || die
-	#sed -i '/test/d' "${S}/nuget/"*.nuspec || die
-	#sed -i '/x86/d' "${S}/nuget/"*.nuspec || die
-	#sed -i '/log4net/d' "${S}/nuget/"*.nuspec || die
 	sed -i 's#\\#/#g' "${S}/nuget/"*.nuspec || die
-	#sed -i "s#\\${project.base.dir}##g" "${S}/nuget/"*.nuspec || die
-	sed -i "s#bin/#bin/${DIR}/#g" "${S}/nuget/"*.nuspec || die
+	sed -i "s=\\\$dir\\\$=${DIR}=g" "${S}/nuget/"*.nuspec || die
 	default
 }
 
@@ -105,19 +100,10 @@ src_install() {
 		doins bin/${DIR}/*.mdb
 	fi
 
-#	into /usr
-#	dobin ${FILESDIR}/nunit-console
 	make_wrapper nunit "mono ${SLOTTEDDIR}/nunit-console.exe"
 
-	if use gac; then
-		if use debug; then
-			DIR="Debug"
-		else
-			DIR="Release"
-		fi
-
-		egacinstall "${S}/bin/${DIR}/lib/nunit-console-runner.dll"
-	fi
+	# https://stackoverflow.com/questions/36430417/is-there-a-nunit-console-runner-dll-for-nunit-3-0
+	# egacinstall "${S}/bin/${DIR}/nunit-console-runner.dll"
 
 	if use doc; then
 #		dodoc ${WORKDIR}/doc/*.txt