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

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

[Mikhail Pukhlikov]

commit:     621308c8d9449a1fbe8871e9877426ce176751a5
Author:     ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Jan 18 01:50:39 2018 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 01:52:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=621308c8

workaround for roslyn bug with signing

 .../cecil/cecil-0.10_beta1_p2016111002-r1.ebuild   |  5 +++--
 dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild   | 24 ++++++++++++++--------
 dev-util/nunit/nunit-3.0.1-r2.ebuild               | 23 +++++++++++++--------
 3 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/dev-dotnet/cecil/cecil-0.10_beta1_p2016111002-r1.ebuild b/dev-dotnet/cecil/cecil-0.10_beta1_p2016111002-r1.ebuild
index ec032ce..77e0bc0 100644
--- a/dev-dotnet/cecil/cecil-0.10_beta1_p2016111002-r1.ebuild
+++ b/dev-dotnet/cecil/cecil-0.10_beta1_p2016111002-r1.ebuild
@@ -6,17 +6,18 @@ EAPI=6
 KEYWORDS="~amd64 ~x86"
 RESTRICT+=" mirror"
 
+SLOT="0"
+
 USE_DOTNET="net45 net35"
 IUSE="+${USE_DOTNET} +gac +nupkg +pkg-config +debug +developer"
 
-inherit gac nupkg
+inherit xbuild gac mono-pkg-config nupkg
 
 HOMEPAGE="http://cecil.pe/"
 DESCRIPTION="System.Reflection alternative to generate and inspect .NET executables/libraries"
 # https://github.com/jbevain/cecil/wiki/License
 # https://github.com/jbevain/cecil/blob/master/LICENSE.txt
 LICENSE="MIT"
-SLOT="0"
 
 COMMON_DEPEND=">=dev-lang/mono-4.0.2.5
 "

diff --git a/dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild b/dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild
index 92cbd11..0889de6 100644
--- a/dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild
+++ b/dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild
@@ -2,24 +2,26 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
-inherit mono-env gac nupkg
+EAPI="6"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror"
+
+SLOT="2" # NUnit V2 IS NO LONGER MAINTAINED OR UPDATED.
+
+USE_DOTNET="net45"
+IUSE="+${USE_DOTNET} developer debug +gac nupkg doc"
+
+inherit mono-env xbuild gac nupkg
 
 NAME="nunitv2"
 HOMEPAGE="https://github.com/nunit/${NAME}"
 
 EGIT_COMMIT="1b549f4f8b067518c7b54a5b263679adb83ccda4"
 SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${PN}-${PV}.zip"
-RESTRICT="mirror"
 S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
 
-SLOT="2" # NUnit V2 IS NO LONGER MAINTAINED OR UPDATED.
-
 DESCRIPTION="NUnit test suite for mono applications"
 LICENSE="NUnit-License" # http://nunit.org/nuget/license.html
-KEYWORDS="~amd64 ~x86"
-USE_DOTNET="net45"
-IUSE="net45 developer debug gac nupkg doc"
 
 RDEPEND=">=dev-lang/mono-4.0.2.5
 	dev-util/nant[nupkg]
@@ -53,7 +55,10 @@ src_prepare() {
 }
 
 src_compile() {
-	exbuild "${METAFILETOBUILD}"
+	# /p:PublicSign=true
+	exbuild /p:SignAssembly=true /p:DelaySign=true "/p:AssemblyOriginatorKeyFile=${S}/src/nunit.snk" "${METAFILETOBUILD}"
+	sn -R "${S}/bin/${DIR}/lib/nunit-console-runner.dll" "${S}/src/nunit.snk" || die
+	sn -R "${S}/bin/${DIR}/framework/nunit.framework.dll" "${S}/src/nunit.snk" || die
 	enuspec "${S}/nuget/nunit.nuspec"
 	enuspec "${S}/nuget/nunit.runners.nuspec"
 }
@@ -85,6 +90,7 @@ src_install() {
 		fi
 
 		egacinstall "${S}/bin/${DIR}/lib/nunit-console-runner.dll"
+		egacinstall "${S}/bin/${DIR}/framework/nunit.framework.dll"
 	fi
 
 	if use doc; then

diff --git a/dev-util/nunit/nunit-3.0.1-r2.ebuild b/dev-util/nunit/nunit-3.0.1-r2.ebuild
index a5cd7fd..927956d 100644
--- a/dev-util/nunit/nunit-3.0.1-r2.ebuild
+++ b/dev-util/nunit/nunit-3.0.1-r2.ebuild
@@ -2,25 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=6
-inherit mono-env gac nupkg
+EAPI="6"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror"
+
+SLOT="3"
+
+USE_DOTNET="net45"
+IUSE="+net45 developer debug nupkg gac doc"
+
+inherit mono-env xbuild gac nupkg
 
 NAME="nunit"
 HOMEPAGE="https://github.com/nunit/${NAME}"
 
 EGIT_COMMIT="dd39deaa2c805783cb069878b58b0447d0849849"
 SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz"
-RESTRICT="mirror"
+#	https://github.com/mono/mono/raw/master/mcs/class/mono.snk"
 S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
 
-SLOT="3"
-
 DESCRIPTION="NUnit test suite for mono applications"
 LICENSE="MIT" # https://github.com/nunit/nunit/blob/master/LICENSE.txt
-KEYWORDS="~amd64 ~x86"
-#USE_DOTNET="net20 net40 net45"
-USE_DOTNET="net45"
-IUSE="+net45 developer debug nupkg gac doc"
 
 CDEPEND=">=dev-lang/mono-4.0.2.5
 	net45? (
@@ -58,6 +60,7 @@ METAFILETOBUILD="${S}/${FILE_TO_BUILD}"
 NUGET_PACKAGE_VERSION="$(get_version_component_range 1-3)"
 
 src_prepare() {
+	# cp "${DISTDIR}/mono.snk" "${S}/src/nunit.snk" || die
 	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"
@@ -104,6 +107,8 @@ src_install() {
 
 	# https://stackoverflow.com/questions/36430417/is-there-a-nunit-console-runner-dll-for-nunit-3-0
 	# egacinstall "${S}/bin/${DIR}/nunit-console-runner.dll"
+	sn -R "bin/${DIR}/net-4.5/nunit.framework.dll" src/nunit.snk || die
+	egacinstall "bin/${DIR}/net-4.5/nunit.framework.dll"
 
 	if use doc; then
 #		dodoc ${WORKDIR}/doc/*.txt