7 files changed, 117 insertions, 5 deletions
diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index a50cf2f193db..73b5b48eb26b 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-dotnet/ikvm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.9 2005/06/03 22:11:06 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.10 2005/11/03 04:15:35 latexer Exp $
+
+*ikvm-0.20.0.0 (03 Nov 2005)
+*ikvm-0.14.0.1-r2 (03 Nov 2005)
+
+  03 Nov 2005; Peter Johanson <latexer@gentoo.org> files/ikvm.pc.in,
+  +ikvm-0.14.0.1-r2.ebuild, +ikvm-0.20.0.0.ebuild:
+  New release, and revision bump the previous one to push out pkgconfig file
+  changes to try to be multilib proper.
 
   03 Jun 2005; David Holm <dholm@gentoo.org> ikvm-0.14.0.1-r1.ebuild:
   Added to ~ppc.
diff --git a/dev-dotnet/ikvm/Manifest b/dev-dotnet/ikvm/Manifest
index 528143d0493e..f7c0d83f2e94 100644
--- a/dev-dotnet/ikvm/Manifest
+++ b/dev-dotnet/ikvm/Manifest
@@ -1,10 +1,14 @@
-MD5 eb314adc6548b2fb56438de85c873842 ChangeLog 1322
-MD5 cda6915dcb7383b4a690f04c23bf1fcb ikvm-0.8.0.0.ebuild 682
+MD5 94b197af2379b6fbc8b30002195c0c4a ChangeLog 1625
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
+MD5 cda6915dcb7383b4a690f04c23bf1fcb ikvm-0.8.0.0.ebuild 682
 MD5 39e5e04d77616fd65d6f9b0495980485 ikvm-0.14.0.1.ebuild 930
 MD5 0ecab761af2e63d0469b7d644a90a4c7 ikvm-0.14.0.1-r1.ebuild 1080
+MD5 e6b760353340896ee8f927f70cd53512 ikvm-0.20.0.0.ebuild 1159
+MD5 b7e153e9d20c9946fb9555b8db7b0b7c ikvm-0.14.0.1-r2.ebuild 1117
 MD5 e80b63a8abf009a70f69a4d4037345fe files/digest-ikvm-0.8.0.0 65
 MD5 00c7d35cf8e7897b6bd3cc9fb54bcffc files/digest-ikvm-0.14.0.1 130
 MD5 4663f47604a2844330031fbdad711339 files/script-template 53
+MD5 bc3504eb525c8b3b53793cec10b9a8ac files/ikvm.pc.in 260
 MD5 00c7d35cf8e7897b6bd3cc9fb54bcffc files/digest-ikvm-0.14.0.1-r1 130
-MD5 11d8b925e6c32a7c4adf28e967c4b05e files/ikvm.pc.in 255
+MD5 64acd1ad225e08edf28bc367d62877a6 files/digest-ikvm-0.20.0.0 130
+MD5 00c7d35cf8e7897b6bd3cc9fb54bcffc files/digest-ikvm-0.14.0.1-r2 130
diff --git a/dev-dotnet/ikvm/files/digest-ikvm-0.14.0.1-r2 b/dev-dotnet/ikvm/files/digest-ikvm-0.14.0.1-r2
new file mode 100644
index 000000000000..0d8fd94045ee
--- /dev/null
+++ b/dev-dotnet/ikvm/files/digest-ikvm-0.14.0.1-r2
@@ -0,0 +1,2 @@
+MD5 41aac88c0e0a6f148af8ad378eb60d69 ikvm-0.14.0.1.zip 4220553
+MD5 036c23aec7cb53a43b7b9dc63a92fbbe classpath-0.15.tar.gz 5564571
diff --git a/dev-dotnet/ikvm/files/digest-ikvm-0.20.0.0 b/dev-dotnet/ikvm/files/digest-ikvm-0.20.0.0
new file mode 100644
index 000000000000..0119ad1673ef
--- /dev/null
+++ b/dev-dotnet/ikvm/files/digest-ikvm-0.20.0.0
@@ -0,0 +1,2 @@
+MD5 b5c736a52279002e53b844b7657d59a7 ikvm-0.20.0.0.zip 4696966
+MD5 c0650c257aa93eafb709553f172f0bbb classpath-0.18.tar.gz 6389125
diff --git a/dev-dotnet/ikvm/files/ikvm.pc.in b/dev-dotnet/ikvm/files/ikvm.pc.in
index dad52930a186..3fdd3b5e9806 100644
--- a/dev-dotnet/ikvm/files/ikvm.pc.in
+++ b/dev-dotnet/ikvm/files/ikvm.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=${prefix}/@LIBDIR@
 
 
 Name: IKVM.NET
diff --git a/dev-dotnet/ikvm/ikvm-0.14.0.1-r2.ebuild b/dev-dotnet/ikvm/ikvm-0.14.0.1-r2.ebuild
new file mode 100644
index 000000000000..d260ccd0d2a3
--- /dev/null
+++ b/dev-dotnet/ikvm/ikvm-0.14.0.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 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.1 2005/11/03 04:15:35 latexer 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
+		ftp://ftp.gnu.org/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"
+
+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/lib/pkgconfig
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@LIBDIR@:$(get_libdir):" \
+		${FILESDIR}/ikvm.pc.in > ${D}/usr/lib/pkgconfig/ikvm.pc
+
+	insinto /usr/$(get_libdir)/${PN}
+	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
new file mode 100644
index 000000000000..1f662a5403f4
--- /dev/null
+++ b/dev-dotnet/ikvm/ikvm-0.20.0.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2005 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.1 2005/11/03 04:15:35 latexer 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
+		ftp://ftp.gnu.org/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"
+
+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/lib/pkgconfig
+	sed -e "s:@VERSION@:${PV}:" \
+		-e "s:@LIBDIR@:$(get_libdir):" \
+		${FILESDIR}/ikvm.pc.in > ${D}/usr/lib/pkgconfig/ikvm.pc
+
+	insinto /usr/$(get_libdir)/${PN}
+	doins ${S}/bin/*
+}