summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-09-12 17:16:05 +0000
committerPacho Ramos <pacho@gentoo.org>2010-09-12 17:16:05 +0000
commitc8c3f794c3a8ac84d34259c237e63910819970ee (patch)
tree747867710ecb7c867437dfd6e158f4b8b37154f6 /dev-dotnet/ikvm
parentia64 stable wrt #333951 (diff)
downloadgentoo-2-c8c3f794c3a8ac84d34259c237e63910819970ee.tar.gz
gentoo-2-c8c3f794c3a8ac84d34259c237e63910819970ee.tar.bz2
gentoo-2-c8c3f794c3a8ac84d34259c237e63910819970ee.zip
Version bump and remove old.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-dotnet/ikvm')
-rw-r--r--dev-dotnet/ikvm/ChangeLog19
-rw-r--r--dev-dotnet/ikvm/files/ikvm-0.36.0.5.pc.in9
-rw-r--r--dev-dotnet/ikvm/files/ikvm-0.44.0.5-key.patch65
-rw-r--r--dev-dotnet/ikvm/files/ikvm.pc.in9
-rw-r--r--dev-dotnet/ikvm/files/mono.snk.uu20
-rw-r--r--dev-dotnet/ikvm/files/script-template2
-rw-r--r--dev-dotnet/ikvm/ikvm-0.14.0.1-r1.ebuild49
-rw-r--r--dev-dotnet/ikvm/ikvm-0.14.0.1-r2.ebuild50
-rw-r--r--dev-dotnet/ikvm/ikvm-0.14.0.1.ebuild45
-rw-r--r--dev-dotnet/ikvm/ikvm-0.20.0.0.ebuild50
-rw-r--r--dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild60
-rw-r--r--dev-dotnet/ikvm/ikvm-0.36.0.11.ebuild103
-rw-r--r--dev-dotnet/ikvm/ikvm-0.36.0.5.ebuild72
-rw-r--r--dev-dotnet/ikvm/ikvm-0.44.0.5.ebuild (renamed from dev-dotnet/ikvm/ikvm-0.36.0.11-r1.ebuild)40
-rw-r--r--dev-dotnet/ikvm/ikvm-0.8.0.0.ebuild35
15 files changed, 120 insertions, 508 deletions
diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index 53798a6e933f..d66cfd9c4de6 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,21 @@
# ChangeLog for dev-dotnet/ikvm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.23 2008/12/28 20:05:52 loki_val Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.24 2010/09/12 17:16:05 pacho Exp $
+
+*ikvm-0.44.0.5 (12 Sep 2010)
+
+ 12 Sep 2010; Pacho Ramos <pacho@gentoo.org> -ikvm-0.8.0.0.ebuild,
+ -ikvm-0.14.0.1.ebuild, -ikvm-0.14.0.1-r1.ebuild, -ikvm-0.14.0.1-r2.ebuild,
+ -ikvm-0.20.0.0.ebuild, -ikvm-0.34.0.2.ebuild, -ikvm-0.36.0.5.ebuild,
+ -files/ikvm-0.36.0.5.pc.in, -ikvm-0.36.0.11.ebuild,
+ -ikvm-0.36.0.11-r1.ebuild, +ikvm-0.44.0.5.ebuild,
+ +files/ikvm-0.44.0.5-key.patch, -files/ikvm.pc.in, +files/mono.snk.uu,
+ -files/script-template:
+ Version bump with bugfixes (bug #331649 by Dennis Schridde), add some
+ missing die statements. Remove old versions, even the oldest and stable
+ x86 one since this just bumped version is the only one compiling and
+ working ok (fixing bug #254522 and #306819 by Juergen Rose and Patrick
+ Lauer) and no other ebuild in the tree relies on it.
*ikvm-0.36.0.11-r1 (28 Dec 2008)
diff --git a/dev-dotnet/ikvm/files/ikvm-0.36.0.5.pc.in b/dev-dotnet/ikvm/files/ikvm-0.36.0.5.pc.in
deleted file mode 100644
index aaf131f3531f..000000000000
--- a/dev-dotnet/ikvm/files/ikvm-0.36.0.5.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/@LIBDIR@
-
-
-Name: IKVM.NET
-Description: An implementation of Java for Mono and the Microsoft .NET Framework.
-Version: @VERSION@
-Libs: -r:${libdir}/ikvm/IKVM.Runtime.dll -r:${libdir}/ikvm/IKVM.OpenJDK.ClassLibrary.dll -r:${libdir}/ikvm/IKVM.AWT.WinForms.dll
diff --git a/dev-dotnet/ikvm/files/ikvm-0.44.0.5-key.patch b/dev-dotnet/ikvm/files/ikvm-0.44.0.5-key.patch
new file mode 100644
index 000000000000..625d97a966ab
--- /dev/null
+++ b/dev-dotnet/ikvm/files/ikvm-0.44.0.5-key.patch
@@ -0,0 +1,65 @@
+Inspired in Debian patch:
+
+++ ikvm-0.40.0.1+dfsg/debian/patches/03-use_mono.snk_for_ikvm-key.patch
+
+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-0.40.0.1+dfsg/ikvm-0.40.0.1/CommonAssemblyInfo.cs
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/CommonAssemblyInfo.cs 2009-04-20 10:48:46.000000000 +0100
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/CommonAssemblyInfo.cs 2009-06-06 11:38:42.000000000 +0100
+@@ -33,5 +33,6 @@
+
+ #if SIGNCODE
+ #pragma warning disable 1699
+- [assembly: AssemblyKeyName("ikvm-key")]
++ [assembly: AssemblyDelaySign(false)]
++ [assembly: AssemblyKeyFile("../mono.snk")]
+ #endif
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/tools/pubkey.cs
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/tools/pubkey.cs 2008-09-18 07:34:30.000000000 +0100
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/tools/pubkey.cs 2009-06-06 11:39:20.000000000 +0100
+@@ -29,7 +29,8 @@
+
+ #if SIGNCODE
+ #pragma warning disable 1699
+- [assembly: AssemblyKeyName("ikvm-key")]
++ [assembly: AssemblyDelaySign(false)]
++ [assembly: AssemblyKeyFile("../mono.snk")]
+ #endif
+
+ class PublicKey
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/ikvm.build
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/ikvm.build 2009-03-26 15:32:28.000000000 +0000
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/ikvm.build 2009-06-06 11:40:16.000000000 +0100
+@@ -2,8 +2,8 @@
+ <project name="ikvm" default="all">
+ <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:../mono.snk" />
++ <property name="ilasm_signoption" value="/key:../mono.snk" />
+ <call target="all" />
+ </target>
+ <target name="all">
+Index: ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/runtime/runtime.build
+===================================================================
+--- ikvm-0.40.0.1+dfsg.orig/ikvm-0.40.0.1/runtime/runtime.build 2009-03-04 06:47:20.000000000 +0000
++++ ikvm-0.40.0.1+dfsg/ikvm-0.40.0.1/runtime/runtime.build 2009-06-06 11:40:37.000000000 +0100
+@@ -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:../../mono.snk" />
++ <property name="ilasm_signoption" value="/key:../../mono.snk" />
+ <call target="IKVM.Runtime" />
+ </target>
+
diff --git a/dev-dotnet/ikvm/files/ikvm.pc.in b/dev-dotnet/ikvm/files/ikvm.pc.in
deleted file mode 100644
index 3fdd3b5e9806..000000000000
--- a/dev-dotnet/ikvm/files/ikvm.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/@LIBDIR@
-
-
-Name: IKVM.NET
-Description: An implementation of Java for Mono and the Microsoft .NET Framework.
-Version: @VERSION@
-Libs: -r:${libdir}/ikvm/IKVM.Runtime.dll -r:${libdir}/ikvm/IKVM.GNU.Classpath.dll
diff --git a/dev-dotnet/ikvm/files/mono.snk.uu b/dev-dotnet/ikvm/files/mono.snk.uu
new file mode 100644
index 000000000000..ae4f04a38f5d
--- /dev/null
+++ b/dev-dotnet/ikvm/files/mono.snk.uu
@@ -0,0 +1,20 @@
+
+++ ikvm-0.40.0.1+dfsg/debian/mono.snk.uu
+
+begin 644 mono.snk
+M!P(````D``!24T$R``0```$``0!Y%9EWTM`ZCFOJ>BYTZ-&OS)/HA1ETE2NT
+M@*$LD31'300&)$?#?@YHP(!3;\\\/[XO^<EYSIF$=>4&Z,Z"W5L/-0W!#I._
+M+N[/ATLD=PQ0@=OJ=$?]VOHG>R+>1];_ZD26=*3Y_,^$T5!I").`*$V]TU]&
+MS?\2H;UXY.\`9=`6WTW&V[S-/V")DAN)G[17F@RI:B)C5#D%RJ56:#^3AH,C
+M]@&$<!=,R%8*<F"H`S/!I(,;/V3OE6!0!Z`&H,SN[/;=^?:,:CB8!<'N2$.%
+M7H%/2X3=?@$W-)2"1)`'WV\2@53=A6JBUHW;N?U!-S]<EJ/Y6HW9F4=Z::0K
+MC=$/H4GG7;O3OP\,QS/*+(.1##JVL!^\0:S9KUORVJ*OY?23U1C</20JL+MN
+MY*-:I&QG!TAKRN5Z7%,_D!Y@^\S6+41[9`GU8FWBY@M+$ZS&#K(\<<GX`1GJ
+MQT-7=!]>W>!$Z8GJN;LFRG+&@,&'^&J!2YL4]D*X*;XW'`$9-D,ZEH"`T-L\
+MPU"47K=X!%N$=E*!_.5#/%'9DL*<%>?&(60?[(CZ_.8[1Y0B%U'\GL:UQF`P
+M\@6'"3BB@G]:IBH-9]TTGER_$0GG'@?>3)<Z'^>B^*J&Y5W-W,A=.\\4*>\+
+M*L(^3D9>^G_9U9<N]IZ?;39PJI<OLPD/L8E-C/%(BQS6L2^W1E])]Z#[M2YD
+MR\0O7F0E1BOXBHJE$K'XC#U1H="B6>7:7^IZ$+.NG,][`/4*::QS_SFM!W[`
++"5R_0#E/%?%_J<\`
+`
+end
diff --git a/dev-dotnet/ikvm/files/script-template b/dev-dotnet/ikvm/files/script-template
deleted file mode 100644
index 4ee2d171a11d..000000000000
--- a/dev-dotnet/ikvm/files/script-template
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/mono /usr/lib/P/EXE.exe "$@"
diff --git a/dev-dotnet/ikvm/ikvm-0.14.0.1-r1.ebuild b/dev-dotnet/ikvm/ikvm-0.14.0.1-r1.ebuild
deleted file mode 100644
index 9eb10eabdc13..000000000000
--- a/dev-dotnet/ikvm/ikvm-0.14.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.14.0.1-r1.ebuild,v 1.8 2008/05/30 23:03:46 jurek Exp $
-
-inherit mono multilib
-
-CLASSPATH_P="classpath-0.15"
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip
- mirror://gnu/classpath/${CLASSPATH_P}.tar.gz"
-LICENSE="as-is"
-
-SLOT="0"
-S=${WORKDIR}/${PN}
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-1.1"
-DEPEND="${RDEPEND}
- !dev-dotnet/ikvm-bin
- >=dev-java/jikes-1.21
- >=dev-dotnet/nant-0.85_rc2
- app-arch/unzip
- dev-util/pkgconfig"
-
-src_compile() {
- nant || die "ikvm build failed"
-}
-
-src_install() {
- dodir /usr/bin
- for exe in ikvm ikvmc ikvmstub;
- do
- sed -e "s:EXE:${exe}:" \
- -e "s:P:${PN}:" \
- "${FILESDIR}"/script-template \
- > "${D}"/usr/bin/${exe}
- fperms +x /usr/bin/${exe}
- done
-
- dodir /usr/$(get_libdir)/pkgconfig
- sed -e "s:@VERSION@:${PV}:" "${FILESDIR}"/ikvm.pc.in \
- > "${D}"/usr/$(get_libdir)/pkgconfig/ikvm.pc
-
- insinto /usr/$(get_libdir)/${PN}
- doins "${S}"/bin/*
-}
diff --git a/dev-dotnet/ikvm/ikvm-0.14.0.1-r2.ebuild b/dev-dotnet/ikvm/ikvm-0.14.0.1-r2.ebuild
deleted file mode 100644
index f6892a73d5eb..000000000000
--- a/dev-dotnet/ikvm/ikvm-0.14.0.1-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.14.0.1-r2.ebuild,v 1.5 2008/05/30 23:03:46 jurek Exp $
-
-inherit mono multilib
-
-CLASSPATH_P="classpath-0.15"
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip
- mirror://gnu/classpath/${CLASSPATH_P}.tar.gz"
-LICENSE="as-is"
-
-SLOT="0"
-S=${WORKDIR}/${PN}
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-1.1"
-DEPEND="${RDEPEND}
- !dev-dotnet/ikvm-bin
- >=dev-java/jikes-1.21
- >=dev-dotnet/nant-0.85_rc2
- app-arch/unzip
- dev-util/pkgconfig"
-
-src_compile() {
- nant || die "ikvm build failed"
-}
-
-src_install() {
- dodir /usr/bin
- for exe in ikvm ikvmc ikvmstub;
- do
- sed -e "s:EXE:${exe}:" \
- -e "s:P:${PN}:" \
- "${FILESDIR}"/script-template \
- > "${D}"/usr/bin/${exe}
- fperms +x /usr/bin/${exe}
- done
-
- dodir /usr/$(get_libdir)/pkgconfig
- sed -e "s:@VERSION@:${PV}:" \
- -e "s:@LIBDIR@:$(get_libdir):" \
- "${FILESDIR}"/ikvm.pc.in > "${D}"/usr/$(get_libdir)/pkgconfig/ikvm.pc
-
- insinto /usr/$(get_libdir)/${PN}
- doins "${S}"/bin/*
-}
diff --git a/dev-dotnet/ikvm/ikvm-0.14.0.1.ebuild b/dev-dotnet/ikvm/ikvm-0.14.0.1.ebuild
deleted file mode 100644
index b48f9c3cef86..000000000000
--- a/dev-dotnet/ikvm/ikvm-0.14.0.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.14.0.1.ebuild,v 1.6 2008/05/30 23:03:46 jurek Exp $
-
-inherit mono multilib
-
-CLASSPATH_P="classpath-0.15"
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip
- mirror://gnu/classpath/${CLASSPATH_P}.tar.gz"
-LICENSE="as-is"
-
-SLOT="0"
-S=${WORKDIR}/${PN}
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-1.1"
-DEPEND="${RDEPEND}
- !dev-dotnet/ikvm-bin
- >=dev-java/jikes-1.21
- >=dev-dotnet/nant-0.85_rc2
- app-arch/unzip
- dev-util/pkgconfig"
-
-src_compile() {
- nant || die "ikvm build failed"
-}
-
-src_install() {
- dodir /usr/bin
- for exe in ikvm ikvmc ikvmstub;
- do
- sed -e "s:EXE:${exe}:" \
- -e "s:P:${P}:" \
- "${FILESDIR}"/script-template \
- > "${D}"/usr/bin/${exe}
- fperms +x /usr/bin/${exe}
- done
-
- insinto /usr/$(get_libdir)/${P}
- doins "${S}"/bin/*
-}
diff --git a/dev-dotnet/ikvm/ikvm-0.20.0.0.ebuild b/dev-dotnet/ikvm/ikvm-0.20.0.0.ebuild
deleted file mode 100644
index f4dc3b366d00..000000000000
--- a/dev-dotnet/ikvm/ikvm-0.20.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.20.0.0.ebuild,v 1.5 2008/05/30 23:03:46 jurek Exp $
-
-inherit mono multilib
-
-CLASSPATH_P="classpath-0.18"
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip
- mirror://gnu/classpath/${CLASSPATH_P}.tar.gz"
-LICENSE="as-is"
-
-SLOT="0"
-S=${WORKDIR}/${PN}
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-1.1"
-DEPEND="${RDEPEND}
- !dev-dotnet/ikvm-bin
- >=dev-java/jikes-1.21
- >=dev-dotnet/nant-0.85_rc2
- app-arch/unzip
- dev-util/pkgconfig"
-
-src_compile() {
- nant -D:jikes.compiler=true -D:ecj.compiler=false || die "ikvm build failed"
-}
-
-src_install() {
- dodir /usr/bin
- for exe in ikvm ikvmc ikvmstub;
- do
- sed -e "s:EXE:${exe}:" \
- -e "s:P:${PN}:" \
- "${FILESDIR}"/script-template \
- > "${D}"/usr/bin/${exe}
- fperms +x /usr/bin/${exe}
- done
-
- dodir /usr/$(get_libdir)/pkgconfig
- sed -e "s:@VERSION@:${PV}:" \
- -e "s:@LIBDIR@:$(get_libdir):" \
- "${FILESDIR}"/ikvm.pc.in > "${D}"/usr/$(get_libdir)/pkgconfig/ikvm.pc
-
- insinto /usr/$(get_libdir)/${PN}
- doins "${S}"/bin/*
-}
diff --git a/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild b/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild
deleted file mode 100644
index 241e2b49ae87..000000000000
--- a/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild,v 1.5 2008/05/30 23:03:46 jurek Exp $
-
-inherit eutils mono multilib
-
-CLASSPATH_P="classpath-0.95"
-
-ECJ_V=3.2.2
-ECJ_DATESTAMP=200702121330
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip
- mirror://gnu/classpath/${CLASSPATH_P}.tar.gz"
-LICENSE="as-is"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-1.1"
-DEPEND="${RDEPEND}
- !dev-dotnet/ikvm-bin
- >=dev-dotnet/nant-0.85
- >=virtual/jdk-1.5
- app-arch/unzip
- dev-util/pkgconfig"
-
-src_compile() {
- # Remove unneccesary executables and
- # Windows-only libraries (bug #186837)
- rm bin/*.exe bin/JVM.DLL bin/ikvm-native.dll
-
- # We use javac instead of ecj because of
- # memory related problems (see bug #183526)
- sed -i \
- -e 's#ecj#javac#' \
- -e 's#-1.5#-J-mx384M -source 1.5#' \
- classpath/classpath.build \
- || die "sed failed"
-
- nant -t:mono-1.0 || die "ikvm build failed"
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- doins bin/*
-
- for exe in ikvm ikvmc ikvmstub;
- do
- make_wrapper ${exe} "mono /usr/$(get_libdir)/${PN}/${exe}.exe"
- done
-
- dodir /usr/$(get_libdir)/pkgconfig
- sed -e "s:@VERSION@:${PV}:" \
- -e "s:@LIBDIR@:$(get_libdir):" \
- "${FILESDIR}"/${PN}.pc.in > "${D}"/usr/$(get_libdir)/pkgconfig/${PN}.pc \
- || die "sed failed"
-}
diff --git a/dev-dotnet/ikvm/ikvm-0.36.0.11.ebuild b/dev-dotnet/ikvm/ikvm-0.36.0.11.ebuild
deleted file mode 100644
index 7f3abcabbea5..000000000000
--- a/dev-dotnet/ikvm/ikvm-0.36.0.11.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.36.0.11.ebuild,v 1.2 2009/01/06 05:56:23 mr_bones_ Exp $
-
-EAPI=2
-
-inherit eutils mono multilib
-
-CLASSPATH_P="classpath-0.95"
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip
- mirror://sourceforge/${PN}/classpath-0.95-stripped.zip
- mirror://sourceforge/${PN}/openjdk-b13-stripped.zip"
-LICENSE="as-is"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-2
- dev-libs/glib"
-DEPEND="${RDEPEND}
- !dev-dotnet/ikvm-bin
- >=dev-dotnet/nant-0.85
- >=virtual/jdk-1.6
- app-arch/unzip
- dev-util/pkgconfig"
-
-src_prepare() {
- # Remove unneccesary executables and
- # Windows-only libraries (bug #186837)
- rm bin/{IKVM*dll,*.exe,JVM.DLL,ikvm-native.dll}
-
- # We use javac instead of ecj because of
- # memory related problems (see bug #183526)
- sed -i \
- -e 's#ecj#javac#' \
- -e 's#-1.5#-J-mx384M -source 1.5#' \
- classpath/classpath.build \
- || die "sed failed"
-
- sed -i -e 's:pkg-config --cflags:pkg-config --cflags --libs:' \
- native/native.build || die "sed failed"
-
- 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}'"/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 bin/*.so
-
- 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
-}
diff --git a/dev-dotnet/ikvm/ikvm-0.36.0.5.ebuild b/dev-dotnet/ikvm/ikvm-0.36.0.5.ebuild
deleted file mode 100644
index 839de24b88a6..000000000000
--- a/dev-dotnet/ikvm/ikvm-0.36.0.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.36.0.5.ebuild,v 1.3 2008/05/30 23:03:46 jurek Exp $
-
-inherit eutils mono multilib
-
-CLASSPATH_P="classpath-0.95"
-
-ECJ_V=3.2.2
-ECJ_DATESTAMP=200702121330
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip
- mirror://sourceforge/${PN}/classpath-0.95-stripped.zip
- mirror://sourceforge/${PN}/openjdk-b13-stripped.zip"
-LICENSE="as-is"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-1.1"
-DEPEND="${RDEPEND}
- !dev-dotnet/ikvm-bin
- >=dev-dotnet/nant-0.85
- >=virtual/jdk-1.5
- app-arch/unzip
- dev-util/pkgconfig"
-
-src_compile() {
- # Add missing strong name key
- #cp "${FILESDIR}"/key.snk "${S}"/mykey.snk
-
- # Remove unneccesary executables and
- # Windows-only libraries (bug #186837)
- rm bin/{IKVM*dll,*.exe,JVM.DLL,ikvm-native.dll}
-
- # We use javac instead of ecj because of
- # memory related problems (see bug #183526)
- sed -i \
- -e 's#ecj#javac#' \
- -e 's#-1.5#-J-mx384M -source 1.5#' \
- classpath/classpath.build \
- || die "sed failed"
-
- mkdir -p "${T}"/home/test
-
- XDG_CONFIG_HOME="${T}/home/test" nant -t:mono-2.0 signed || die "ikvm build failed"
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- doins bin/*
-
- for exe in ikvm ikvmc ikvmstub;
- do
- make_wrapper ${exe} "mono /usr/$(get_libdir)/${PN}/${exe}.exe"
- done
-
- dodir /usr/$(get_libdir)/pkgconfig
- sed -e "s:@VERSION@:${PV}:" \
- -e "s:@LIBDIR@:$(get_libdir):" \
- "${FILESDIR}"/${P}.pc.in > "${D}"/usr/$(get_libdir)/pkgconfig/${PN}.pc \
- || die "sed failed"
-
- for dll in IKVM.AWT.WinForms IKVM.OpenJDK.ClassLibrary IKVM.Runtime
- do
- gacutil -i bin/${dll}.dll -root "${D}"/usr/$(get_libdir) \
- -gacdir /usr/$(get_libdir) -package ${dll} > /dev/null
- done
-}
diff --git a/dev-dotnet/ikvm/ikvm-0.36.0.11-r1.ebuild b/dev-dotnet/ikvm/ikvm-0.44.0.5.ebuild
index 1ad03bc8f32a..73b91c670d7c 100644
--- a/dev-dotnet/ikvm/ikvm-0.36.0.11-r1.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.44.0.5.ebuild
@@ -1,18 +1,15 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.36.0.11-r1.ebuild,v 1.2 2009/01/06 05:56:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.44.0.5.ebuild,v 1.1 2010/09/12 17:16:05 pacho Exp $
EAPI=2
-inherit eutils mono multilib
-
-CLASSPATH_P="classpath-0.95"
+inherit eutils mono multilib java-pkg-2
DESCRIPTION="Java VM for .NET"
HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip
- mirror://sourceforge/${PN}/classpath-0.95-stripped.zip
- mirror://sourceforge/${PN}/openjdk-b13-stripped.zip"
+SRC_URI="mirror://sourceforge/${PN}/openjdk6-b18-stripped.zip
+ mirror://sourceforge/${PN}/${PN}src-${PV}.zip"
LICENSE="as-is"
SLOT="0"
@@ -26,23 +23,22 @@ DEPEND="${RDEPEND}
>=dev-dotnet/nant-0.85
>=virtual/jdk-1.6
app-arch/unzip
- dev-util/pkgconfig"
+ dev-util/pkgconfig
+ app-arch/sharutils"
src_prepare() {
- # Remove unneccesary executables and
- # Windows-only libraries (bug #186837)
- rm bin/{IKVM*dll,*.exe,JVM.DLL,ikvm-native.dll}
-
- # We use javac instead of ecj because of
- # memory related problems (see bug #183526)
- sed -i \
- -e 's#ecj#javac#' \
- -e 's#-1.5#-J-mx384M -source 1.5#' \
- classpath/classpath.build \
- || die "sed failed"
+ # 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}-0.44.0.5-key.patch
+ uudecode < "${FILESDIR}"/mono.snk.uu || 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 "sed failed"
+ native/native.build || die
mkdir -p "${T}"/home/test
}
@@ -79,7 +75,7 @@ generate_pkgconfig() {
src_install() {
local dll dllbase exe
insinto /usr/$(get_libdir)/${PN}
- doins bin/*.exe bin/*.so
+ doins bin/*.exe bin/*.so || die
dodir /bin
for exe in bin/*.exe
diff --git a/dev-dotnet/ikvm/ikvm-0.8.0.0.ebuild b/dev-dotnet/ikvm/ikvm-0.8.0.0.ebuild
deleted file mode 100644
index dbfc3f232b31..000000000000
--- a/dev-dotnet/ikvm/ikvm-0.8.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.8.0.0.ebuild,v 1.8 2008/05/30 23:03:46 jurek Exp $
-
-inherit mono
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-
-SRC_URI="http://www.go-mono.com/archive/1.0/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-RDEPEND=">=dev-lang/mono-1.0"
-DEPEND="${RDEPEND}
- !dev-dotnet/ikvm-bin"
-
-src_unpack() {
- unpack ${A}
-
- # Fix some makefile borkage.
- sed -i -e 's:-e$:-e \\:' "${S}"/scripts/Makefile.in
-}
-
-src_compile() {
- econf || die
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-}