[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/dotnetzip-semverd/, eclass/

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/dotnetzip-semverd/, eclass/

[Mikhail Pukhlikov]

commit:     5861b692121673e4f8cee9d3dd94b7a24f598df5
Author:     grbd <garlicbready <AT> googlemail <DOT> com>
AuthorDate: Sun Mar 25 19:21:22 2018 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sun Mar 25 19:26:13 2018 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=5861b692

fixed dotnetzip-semverd, re-added mono.snk, setup exbuild_strong so that it can locate mono.snk on different paths

 .../dotnetzip-semverd/dotnetzip-semverd-1.9.3-r2.ebuild   |   2 +-
 eclass/mono.snk                                           | Bin 0 -> 596 bytes
 eclass/xbuild.eclass                                      |   3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)

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
index 84901af..3916d5e 100644
--- a/dev-dotnet/dotnetzip-semverd/dotnetzip-semverd-1.9.3-r2.ebuild
+++ b/dev-dotnet/dotnetzip-semverd/dotnetzip-semverd-1.9.3-r2.ebuild
@@ -11,7 +11,7 @@ SLOT="0"
 
 USE_DOTNET="net45"
 
-inherit dotnet gac mono-pkg-config
+inherit dotnet gac mono-pkg-config xbuild
 
 SRC_URI="https://github.com/haf/DotNetZip.Semverd/archive/v1.9.3.tar.gz -> ${PV}.tar.gz
 	https://github.com/mono/mono/raw/master/mcs/class/mono.snk"

diff --git a/eclass/mono.snk b/eclass/mono.snk
new file mode 100644
index 0000000..380116c
Binary files /dev/null and b/eclass/mono.snk differ

diff --git a/eclass/xbuild.eclass b/eclass/xbuild.eclass
index 90a60c1..7e935d3 100644
--- a/eclass/xbuild.eclass
+++ b/eclass/xbuild.eclass
@@ -52,10 +52,11 @@ exbuild() {
 # @DESCRIPTION: run xbuild with default key signing
 exbuild_strong() {
 	# http://stackoverflow.com/questions/7903321/only-sign-assemblies-with-strong-name-during-release-build
+	DOTNET_ECLASSDIR="`dirname "${EBUILD}"`/../../eclass"
 	if use gac; then
 		if [[ -z ${SNK_FILENAME} ]]; then
 			# elog ${BASH_SOURCE}
-			SNK_FILENAME=/var/lib/layman/dotnet/eclass/mono.snk
+			SNK_FILENAME="${DOTNET_ECLASSDIR}/mono.snk"
 			# sn - Digitally sign/verify/compare strongnames on CLR assemblies. 
 			# man sn = http://linux.die.net/man/1/sn
 			if [ -f ${SNK_FILENAME} ]; then