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 8F44A13832E for ; Sat, 30 Jul 2016 08:35:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4BC53E0BAA; Sat, 30 Jul 2016 08:35:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30632E0B98 for ; Sat, 30 Jul 2016 08:35:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D47C340CF2 for ; Sat, 30 Jul 2016 08:35:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46A431B9B for ; Sat, 30 Jul 2016 08:35:38 +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: <1469847905.826d3c27f1c3d9877164a9cb5373c6db8d88ce47.cynede@gentoo> Subject: [gentoo-commits] proj/dotnet:master commit in: dev-util/nunit/, dev-util/nunit/files/ X-VCS-Repository: proj/dotnet X-VCS-Files: dev-util/nunit/files/nunit-3.0.1-nuget.nuspec.patch dev-util/nunit/files/nunit-3.0.1-nunit.console.nuspec.patch dev-util/nunit/files/nunit-3.0.1-nunit.engine.nuspec.patch dev-util/nunit/nunit-3.0.1.ebuild X-VCS-Directories: dev-util/nunit/files/ dev-util/nunit/ X-VCS-Committer: cynede X-VCS-Committer-Name: Mikhail Pukhlikov X-VCS-Revision: 826d3c27f1c3d9877164a9cb5373c6db8d88ce47 X-VCS-Branch: master Date: Sat, 30 Jul 2016 08:35:38 +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: 25c35e01-eab3-4698-a679-2ed7b0226738 X-Archives-Hash: 52b9f1338472b0a9fb2b001e7e12d5d1 commit: 826d3c27f1c3d9877164a9cb5373c6db8d88ce47 Author: ArsenShnurkov gmail com> AuthorDate: Sat Jul 30 03:05:05 2016 +0000 Commit: Mikhail Pukhlikov gentoo 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: + + + +- +- +- +- + + +- +- +- +- + + 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 @@ + + + +- +- + + + +@@ -34,10 +32,6 @@ + + + +- +- +- +- + + + 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 @@ + + + +- + + +- +- + + +\ 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" }