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-dotnet/dotnetzip-semverd/, eclass/
Date: Mon, 26 Mar 2018 06:35:21
Message-Id: 1522005973.5861b692121673e4f8cee9d3dd94b7a24f598df5.cynede@gentoo
1 commit: 5861b692121673e4f8cee9d3dd94b7a24f598df5
2 Author: grbd <garlicbready <AT> googlemail <DOT> com>
3 AuthorDate: Sun Mar 25 19:21:22 2018 +0000
4 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 25 19:26:13 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5861b692
7
8 fixed dotnetzip-semverd, re-added mono.snk, setup exbuild_strong so that it can locate mono.snk on different paths
9
10 .../dotnetzip-semverd/dotnetzip-semverd-1.9.3-r2.ebuild | 2 +-
11 eclass/mono.snk | Bin 0 -> 596 bytes
12 eclass/xbuild.eclass | 3 ++-
13 3 files changed, 3 insertions(+), 2 deletions(-)
14
15 diff --git a/dev-dotnet/dotnetzip-semverd/dotnetzip-semverd-1.9.3-r2.ebuild b/dev-dotnet/dotnetzip-semverd/dotnetzip-semverd-1.9.3-r2.ebuild
16 index 84901af..3916d5e 100644
17 --- a/dev-dotnet/dotnetzip-semverd/dotnetzip-semverd-1.9.3-r2.ebuild
18 +++ b/dev-dotnet/dotnetzip-semverd/dotnetzip-semverd-1.9.3-r2.ebuild
19 @@ -11,7 +11,7 @@ SLOT="0"
20
21 USE_DOTNET="net45"
22
23 -inherit dotnet gac mono-pkg-config
24 +inherit dotnet gac mono-pkg-config xbuild
25
26 SRC_URI="https://github.com/haf/DotNetZip.Semverd/archive/v1.9.3.tar.gz -> ${PV}.tar.gz
27 https://github.com/mono/mono/raw/master/mcs/class/mono.snk"
28
29 diff --git a/eclass/mono.snk b/eclass/mono.snk
30 new file mode 100644
31 index 0000000..380116c
32 Binary files /dev/null and b/eclass/mono.snk differ
33
34 diff --git a/eclass/xbuild.eclass b/eclass/xbuild.eclass
35 index 90a60c1..7e935d3 100644
36 --- a/eclass/xbuild.eclass
37 +++ b/eclass/xbuild.eclass
38 @@ -52,10 +52,11 @@ exbuild() {
39 # @DESCRIPTION: run xbuild with default key signing
40 exbuild_strong() {
41 # http://stackoverflow.com/questions/7903321/only-sign-assemblies-with-strong-name-during-release-build
42 + DOTNET_ECLASSDIR="`dirname "${EBUILD}"`/../../eclass"
43 if use gac; then
44 if [[ -z ${SNK_FILENAME} ]]; then
45 # elog ${BASH_SOURCE}
46 - SNK_FILENAME=/var/lib/layman/dotnet/eclass/mono.snk
47 + SNK_FILENAME="${DOTNET_ECLASSDIR}/mono.snk"
48 # sn - Digitally sign/verify/compare strongnames on CLR assemblies.
49 # man sn = http://linux.die.net/man/1/sn
50 if [ -f ${SNK_FILENAME} ]; then