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

[Mikhail Pukhlikov]

commit:     826d3c27f1c3d9877164a9cb5373c6db8d88ce47
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sat Jul 30 03:05:05 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 03:05:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=826d3c27

engine package added

 .../nunit/files/nunit-3.0.1-nuget.nuspec.patch     | 20 ++++++++++++++++
 .../files/nunit-3.0.1-nunit.console.nuspec.patch   | 24 +++++++++++++++++++
 .../files/nunit-3.0.1-nunit.engine.nuspec.patch    | 16 +++++++++++++
 dev-util/nunit/nunit-3.0.1.ebuild                  | 28 +++++++++++++++-------
 4 files changed, 80 insertions(+), 8 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
new file mode 100644
index 0000000..1a782db
--- /dev/null
+++ b/dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch
@@ -0,0 +1,20 @@
+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:
+     <file src="LICENSE.txt" />
+     <file src="NOTICES.txt" />
+     <file src="CHANGES.txt" />
+-    <file src="bin/net-2.0/nunit.framework.dll" target="lib/net20" />
+-    <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/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" />
+   </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
new file mode 100644
index 0000000..db29255
--- /dev/null
+++ b/dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch
@@ -0,0 +1,24 @@
+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 @@
+     <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-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/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" />

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
new file mode 100644
index 0000000..c6920b0
--- /dev/null
+++ b/dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch
@@ -0,0 +1,16 @@
+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 @@
+     <file src="CHANGES.txt" />
+     <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-x86.exe" target="lib" />
+-    <file src="bin\nunit-agent-x86.exe.config" target="lib" />
+   </files>
+ </package>
+\ No newline at end of file

diff --git a/dev-util/nunit/nunit-3.0.1.ebuild b/dev-util/nunit/nunit-3.0.1.ebuild
index 1f11e9f..3ff9fc7 100644
--- a/dev-util/nunit/nunit-3.0.1.ebuild
+++ b/dev-util/nunit/nunit-3.0.1.ebuild
@@ -32,22 +32,30 @@ S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
 FILE_TO_BUILD=NUnit.proj
 METAFILETOBUILD="${S}/${FILE_TO_BUILD}"
 
+NUGET_PACKAGE_VERSION="$(get_version_component_range 1-3)"
+
 src_prepare() {
 	chmod -R +rw "${S}" || die
 	eapply "${FILESDIR}/nunit-3.0.1-removing-tests-from-nproj.patch"
+	eapply "${FILESDIR}/nunit-3.0.1-nuget.nuspec.patch"
+	eapply "${FILESDIR}/nunit-3.0.1-nunit.console.nuspec.patch"
+	eapply "${FILESDIR}/nunit-3.0.1-nunit.engine.nuspec.patch"
 	enuget_restore "${METAFILETOBUILD}"
 
 	if use debug; then
 		DIR="Debug"
 	else
-		DIR="Release"
+		DIR=""
 	fi
-	sed -i '/x86/d' "${S}/nuget/"*.nuspec || die
-	sed -i '/log4net/d' "${S}/nuget/"*.nuspec || die
+	
+	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#\${package.version}#$(get_version_component_range 1-3)#g" "${S}/nuget/"*.nuspec || die
-	sed -i "s#\${project.base.dir}##g" "${S}/nuget/"*.nuspec || die
-	sed -i "s#\${current.build.dir}#bin/${DIR}#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
 	default
 }
 
@@ -55,6 +63,8 @@ src_compile() {
 	exbuild "${METAFILETOBUILD}"
 	enuspec "${S}/nuget/nunit.nuspec"
 	enuspec "${S}/nuget/nunit.runners.nuspec"
+	enuspec "${S}/nuget/nunit.console.nuspec"
+	enuspec "${S}/nuget/nunit.engine.nuspec"
 }
 
 src_install() {
@@ -94,6 +104,8 @@ src_install() {
 		doins LICENSE.txt NOTICES.txt CHANGES.txt
 	fi
 
-	enupkg "${WORKDIR}/NUnit.3.0.0.nupkg"
-	enupkg "${WORKDIR}/NUnit.Runners.$(get_version_component_range 1-3).nupkg"
+	enupkg "${WORKDIR}/NUnit.${NUNIT_PACKAGE_VERSION}.nupkg"
+	enupkg "${WORKDIR}/NUnit.Runners.${NUNIT_PACKAGE_VERSION}.nupkg"
+	enupkg "${WORKDIR}/NUnit.Console.${NUNIT_PACKAGE_VERSION}.nupkg"
+	enupkg "${WORKDIR}/NUnit.Engine.${NUNIT_PACKAGE_VERSION}.nupkg"
 }