[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/irony-daxnet/, dev-dotnet/sharpziplib/

[Mikhail Pukhlikov]

commit:     ff6f8a9503e7a5ef9080399f4960b3c67bebc158
Author:     ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Oct 13 11:39:53 2017 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 11:39:53 2017 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=ff6f8a95

compilation and signing done

 dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild | 11 ++++++++---
 dev-dotnet/sharpziplib/sharpziplib-0.86.0.762.ebuild          |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild b/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild
index ead9db2..aaa7b01 100644
--- a/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild
+++ b/dev-dotnet/irony-daxnet/irony-daxnet-1.0.0_p2017083101.ebuild
@@ -40,7 +40,7 @@ DEPEND="${CDEPEND}
 	"
 
 PROJECT_PATH="src/Irony"
-PROJECT_FILE=Irony
+PROJECT_NAME=Irony
 PROJECT_OUT=Irony
 
 KEY2="${DISTDIR}/mono.snk"
@@ -57,12 +57,17 @@ function output_filename ( ) {
 }
 
 src_prepare() {
-	cp "${FILESDIR}/template.csproj" "${S}/${PROJECT_PATH}/${PROJECT_FILE}.csproj" || die
+	sed -i "/Version/d" "${S}/${PROJECT_PATH}/Properties/AssemblyInfo.cs" || die
+	cp "${FILESDIR}/template.csproj" "${S}/${PROJECT_PATH}/${PROJECT_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Xml" />#' "${S}/${PROJECT_PATH}/${PROJECT_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Numerics" />#' "${S}/${PROJECT_PATH}/${PROJECT_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="Microsoft.CSharp" />#' "${S}/${PROJECT_PATH}/${PROJECT_NAME}.csproj" || die
 	eapply_user
 }
 
 src_compile() {
-	emsbuild /p:SignAssembly=true /p:PublicSign=true "/p:AssemblyOriginatorKeyFile=${KEY2}" "/p:AssemblyName=${PROJECT_OUT}" "/p:ProjectType=Library" "/p:AssemblyVersion=${ASSEMBLY_VERSION}""${S}/${PROJECT_PATH}/${PROJECT_FILE}.csproj"
+	emsbuild /p:SignAssembly=true /p:PublicSign=true "/p:AssemblyOriginatorKeyFile=${KEY2}" "/p:OutputName=${PROJECT_OUT}" "/p:OutputType=Library" "/p:VersionNumber=${ASSEMBLY_VERSION}" "${S}/${PROJECT_PATH}/${PROJECT_NAME}.csproj"
+	sn -R "$(output_filename)" "${KEY2}" || die
 }
 
 src_install() {

diff --git a/dev-dotnet/sharpziplib/sharpziplib-0.86.0.762.ebuild b/dev-dotnet/sharpziplib/sharpziplib-0.86.0.762.ebuild
index 6737b71..a8a05bb 100644
--- a/dev-dotnet/sharpziplib/sharpziplib-0.86.0.762.ebuild
+++ b/dev-dotnet/sharpziplib/sharpziplib-0.86.0.762.ebuild
@@ -24,11 +24,11 @@ DESCRIPTION="Zip, GZip, Tar and BZip2 library written entirely in C# for the .NE
 LICENSE="MIT" # Actually not, it is GPL with exception - http://icsharpcode.github.io/SharpZipLib/
 
 #	dev-dotnet/system-security-cryptography-algorithms
-COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-5.4.0.167 <dev-lang/mono-9999 )
+CDEPEND="|| ( >=dev-lang/mono-5.4.0.167 <dev-lang/mono-9999 )
 	"
-RDEPEND="${COMMON_DEPENDENCIES}
+RDEPEND="${CDEPEND}
 "
-DEPEND="${COMMON_DEPENDENCIES}
+DEPEND="${CDEPEND}
 	>=dev-dotnet/msbuildtasks-1.5.0.240
 "