Gentoo Archives: gentoo-commits

From: Mikhail Pukhlikov <cynede@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/dotnet:master commit in: dev-util/nunit/, eclass/
Date: Fri, 02 Jun 2017 08:19:48
Message-Id: 1495983450.60e26cfc04cac4bd2ede6152483add005654602a.cynede@gentoo
1 commit: 60e26cfc04cac4bd2ede6152483add005654602a
2 Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com>
3 AuthorDate: Sun May 28 14:57:30 2017 +0000
4 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
5 CommitDate: Sun May 28 14:57:30 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=60e26cfc
7
8 fix for nupkg.eclass
9
10 dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild | 1 +
11 eclass/nupkg.eclass | 11 ++++++-----
12 2 files changed, 7 insertions(+), 5 deletions(-)
13
14 diff --git a/dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild b/dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild
15 index 9c17df5..7340198 100644
16 --- a/dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild
17 +++ b/dev-util/nunit/nunit-2.6.4_p2015011102-r2.ebuild
18 @@ -10,6 +10,7 @@ HOMEPAGE="https://github.com/nunit/${NAME}"
19
20 EGIT_COMMIT="1b549f4f8b067518c7b54a5b263679adb83ccda4"
21 SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${PF}.zip"
22 +RESTRICT="mirror"
23 S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
24
25 SLOT="2" # NUnit V2 IS NO LONGER MAINTAINED OR UPDATED.
26
27 diff --git a/eclass/nupkg.eclass b/eclass/nupkg.eclass
28 index 9ba4be7..d038aeb 100644
29 --- a/eclass/nupkg.eclass
30 +++ b/eclass/nupkg.eclass
31 @@ -79,17 +79,18 @@ enuget_restore() {
32 # accepts path to .nuspec file as parameter
33 enuspec() {
34 if use nupkg; then
35 - if [ -n "${NUSPEC_PROPERTIES}" ]; then
36 - NUSPEC_PROPERTIES+=';'
37 + local PROPS=${NUSPEC_PROPERTIES}
38 + if [ -n "${PROPS}" ]; then
39 + PROPS+=';'
40 fi
41 # see http://docs.nuget.org/create/nuspec-reference#specifying-files-to-include-in-the-package
42 # for the explaination why $configuration$ property is passed
43 if use debug; then
44 - NUSPEC_PROPERTIES+="configuration=Debug"
45 + PROPS+="configuration=Debug"
46 else
47 - NUSPEC_PROPERTIES+="configuration=Release"
48 + PROPS+="configuration=Release"
49 fi
50 - nuget pack -Properties "${NUSPEC_PROPERTIES}" -BasePath "${S}" -OutputDirectory "${WORKDIR}" -NonInteractive -Verbosity detailed "$@" || die
51 + nuget pack -Properties "${PROPS}" -BasePath "${S}" -OutputDirectory "${WORKDIR}" -NonInteractive -Verbosity detailed "$@" || die
52 fi
53 }