From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 93C9E1382C5 for ; Tue, 23 Jan 2018 06:42:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEE6BE0965; Tue, 23 Jan 2018 06:42:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7BF61E0965 for ; Tue, 23 Jan 2018 06:42:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6DF59335C5A for ; Tue, 23 Jan 2018 06:42:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3A391D8 for ; Tue, 23 Jan 2018 06:42:14 +0000 (UTC) From: "Mikhail Pukhlikov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikhail Pukhlikov" Message-ID: <1516240325.621308c8d9449a1fbe8871e9877426ce176751a5.cynede@gentoo> Subject: [gentoo-commits] proj/dotnet:master commit in: dev-util/nunit/, dev-dotnet/cecil/ X-VCS-Repository: proj/dotnet X-VCS-Files: dev-dotnet/cecil/cecil-0.10_beta1_p2016111002-r1.ebuild dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild dev-util/nunit/nunit-3.0.1-r2.ebuild X-VCS-Directories: dev-dotnet/cecil/ dev-util/nunit/ X-VCS-Committer: cynede X-VCS-Committer-Name: Mikhail Pukhlikov X-VCS-Revision: 621308c8d9449a1fbe8871e9877426ce176751a5 X-VCS-Branch: master Date: Tue, 23 Jan 2018 06:42:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 814f642d-ce10-4392-b232-d7ba9622df85 X-Archives-Hash: a25cc655fa56d4e96d8d3aec018c22e8 commit: 621308c8d9449a1fbe8871e9877426ce176751a5 Author: ArsenShnurkov users noreply github com> AuthorDate: Thu Jan 18 01:50:39 2018 +0000 Commit: Mikhail Pukhlikov gentoo 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