Version bump.

(Portage version: 2.1.11.9/cvs/Linux x86_64)

3 files changed, 168 insertions, 2 deletions

diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index 11d02067c45f..cd5fe9cf8a8e 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/ikvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.34 2012/05/22 12:16:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.35 2012/07/21 10:12:48 pacho Exp $
+
+*ikvm-7.1.4532.2 (21 Jul 2012)
+
+  21 Jul 2012; Pacho Ramos <pacho@gentoo.org> +files/ikvm-7.1.4532.2-key.patch,
+  +ikvm-7.1.4532.2.ebuild:
+  Version bump.
 
   22 May 2012; Agostino Sarubbo <ago@gentoo.org> ikvm-0.46.0.2.ebuild:
   Stable for amd64, wrt bug #407701
@@ -173,4 +179,3 @@
   30 Jun 2004; Peter Johanson <latexer@gentoo.org> +metadata.xml,
   +ikvm-0.8.0.0.ebuild:
   Initial commit. Version that goess with mono-1.0
-
diff --git a/dev-dotnet/ikvm/files/ikvm-7.1.4532.2-key.patch b/dev-dotnet/ikvm/files/ikvm-7.1.4532.2-key.patch
new file mode 100644
index 000000000000..34ce79da5bb6
--- /dev/null
+++ b/dev-dotnet/ikvm/files/ikvm-7.1.4532.2-key.patch
@@ -0,0 +1,61 @@
+Author: Jo Shields
+Description: This patch ensures that rather than trying to use the Mono Crypto
+Description: Service Provider to retrieve a signing key (CSP is not safe to
+Description: run with fakeroot), we simply hard-code the path to a bundled key
+Description: file
+Index: ikvm/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in	2012-02-07 01:29:25.080047165 +0000
++++ ikvm/ikvm-7.0.4335.0/CommonAssemblyInfo.cs.in	2012-02-07 01:30:58.092593303 +0000
+@@ -33,5 +33,6 @@
+ 

+ #if SIGNCODE

+ 	#pragma warning disable 1699

+-	[assembly: AssemblyKeyName("ikvm-key")]

++	[assembly: AssemblyDelaySign(false)]

++	[assembly: AssemblyKeyFile("../../debian/mono.snk")]

+ #endif

+Index: ikvm/ikvm-7.0.4335.0/ikvm.build
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/ikvm.build	2012-02-07 01:29:57.152235493 +0000
++++ ikvm/ikvm-7.0.4335.0/ikvm.build	2012-02-07 01:30:48.348536094 +0000
+@@ -6,8 +6,8 @@
+     </target>

+     <target name="signed">

+          <property name="signed" value="SIGNCODE" />

+-         <property name="signoption" value="-key:ikvm-key" />

+-         <property name="ilasm_signoption" value="/key:@ikvm-key" />

++         <property name="signoption" value="-keyfile:../../debian/mono.snk" />

++         <property name="ilasm_signoption" value="/key:../../debian/mono.snk" />

+          <call target="managed" />

+     </target>

+     <target name="managed" depends="clean-managed CommonAssemblyInfo">

+Index: ikvm/ikvm-7.0.4335.0/runtime/runtime.build
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/runtime/runtime.build	2012-02-07 01:31:20.084722420 +0000
++++ ikvm/ikvm-7.0.4335.0/runtime/runtime.build	2012-02-07 01:31:47.120881144 +0000
+@@ -19,8 +19,8 @@
+ 

+     <target name="signed">

+         <property name="signed" value="SIGNCODE" />

+-        <property name="signoption" value="-key:ikvm-key" />

+-        <property name="ilasm_signoption" value="/key:@ikvm-key" />

++        <property name="signoption" value="-keyfile:../../../debian/mono.snk" />

++        <property name="ilasm_signoption" value="/key:../../../debian/mono.snk" />

+         <call target="full" />

+     </target>

+ 

+Index: ikvm/ikvm-7.0.4335.0/tools/pubkey.cs
+===================================================================
+--- ikvm.orig/ikvm-7.0.4335.0/tools/pubkey.cs	2012-02-07 01:28:30.479726527 +0000
++++ ikvm/ikvm-7.0.4335.0/tools/pubkey.cs	2012-02-07 01:28:58.927893592 +0000
+@@ -29,7 +29,8 @@
+ 

+ #if SIGNCODE

+     #pragma warning disable 1699

+-    [assembly: AssemblyKeyName("ikvm-key")]

++    [assembly: AssemblyDelaySign(false)]

++    [assembly: AssemblyKeyFile("../../debian/mono.snk")]

+ #endif

+ 

+ class PublicKey

diff --git a/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild b/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
new file mode 100644
index 000000000000..3ad73cfb65e6
--- /dev/null
+++ b/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild,v 1.1 2012/07/21 10:12:48 pacho Exp $
+
+EAPI="4"
+
+inherit eutils mono multilib java-pkg-2
+
+DESCRIPTION="Java VM for .NET"
+HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
+SRC_URI="http://www.frijters.net/openjdk-7u4-stripped.zip
+	http://www.frijters.net/${PN}src-${PV}.zip"
+LICENSE="as-is"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/mono-2
+	dev-libs/glib"
+DEPEND="${RDEPEND}
+	!dev-dotnet/ikvm-bin
+	>=dev-dotnet/nant-0.85
+	virtual/jdk:1.7
+	app-arch/unzip
+	virtual/pkgconfig
+	app-arch/sharutils"
+
+src_prepare() {
+	# We cannot rely on Mono Crypto Service Provider as it doesn't work inside
+	# sandbox, we simply hard-code the path to a bundled key like Debian does.
+	epatch "${FILESDIR}"/${PN}-7.1.4532.2-key.patch
+	mkdir -p ../debian/ || die
+	uudecode < "${FILESDIR}"/mono.snk.uu -o ../debian/mono.snk || die
+
+	# Ensures that we use Mono's bundled copy of SharpZipLib instead of relying
+	# on ikvm-bin one
+	sed -i -e 's:../bin/ICSharpCode.SharpZipLib.dll:ICSharpCode.SharpZipLib.dll:' \
+		ikvmc/ikvmc.build ikvmstub/ikvmstub.build || die
+
+	sed -i -e 's:pkg-config --cflags:pkg-config --cflags --libs:' \
+		native/native.build || die
+
+	mkdir -p "${T}"/home/test
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	XDG_CONFIG_HOME="${T}/home/test" nant -t:mono-2.0 signed || die "ikvm build failed"
+}
+
+generate_pkgconfig() {
+	ebegin "Generating .pc file"
+	local dll LSTRING="Libs:"
+	dodir "/usr/$(get_libdir)/pkgconfig"
+	cat <<- EOF -> "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"
+		prefix=/usr
+		exec_prefix=\${prefix}
+		libdir=\${prefix}/$(get_libdir)
+		Name: IKVM.NET
+		Description: An implementation of Java for Mono and the Microsoft .NET Framework.
+		Version: ${PV}
+	EOF
+	for dll in "${S}"/bin/IKVM.*.dll
+	do
+		LSTRING="${LSTRING} -r:"'${libdir}'"/mono/IKVM/${dll##*/}"
+	done
+	printf "${LSTRING}" >> "${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc"
+	PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --silence-errors --libs ikvm &> /dev/null
+	eend $?
+}
+
+src_install() {
+	local dll dllbase exe
+	insinto /usr/$(get_libdir)/${PN}
+	doins bin/*.exe
+
+	dodir /bin
+	for exe in bin/*.exe
+	do
+		exebase=${exe##*/}
+		ebegin "Generating wrapper for ${exebase} -> ${exebase%.exe}"
+		make_wrapper ${exebase%.exe} "mono /usr/$(get_libdir)/${PN}/${exebase}"
+		eend $? || die "Failed generating wrapper for ${exebase}"
+	done
+
+	generate_pkgconfig || die "generating .pc failed"
+
+	for dll in bin/IKVM.*.dll
+	do
+		dllbase=${dll##*/}
+		ebegin "Installing and registering ${dllbase}"
+		gacutil -i bin/${dllbase} -root "${D}"/usr/$(get_libdir) \
+			-gacdir /usr/$(get_libdir) -package IKVM &>/dev/null
+		eend $? || die "Failed installing ${dllbase}"
+	done
+}