Version bump and remove old.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

16 files changed, 136 insertions, 532 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/Manifest b/dev-dotnet/ikvm/Manifest
index f7c7428e4b6c..03072e9e6313 100644
--- a/dev-dotnet/ikvm/Manifest
+++ b/dev-dotnet/ikvm/Manifest
@@ -1,25 +1,17 @@
-AUX ikvm-0.36.0.5.pc.in 307 RMD160 29fb7bfb5deb38c5687d1ecc36ffda9f5e9d9179 SHA1 e1c17dd2519691e3e602445c61197e42aee12b99 SHA256 e0c2b9aa10c15a482d9ae802c169a5525eba3e24c7334d8a74d42825f7f8196a
-AUX ikvm.pc.in 260 RMD160 bb18056213e45acb7c965df8f834e4a728c45dc6 SHA1 40e0280c5d4e36a63350d0bfbc5e1491a82324c8 SHA256 96a0af5d305d6e85191d54116a852e4ddc434d589e305495b6bbc314d20f6e4b
-AUX script-template 53 RMD160 1fd479358804cf5b43b991d7ae72322de44f4a2d SHA1 bb035ad3d4e9694d9f72b3a82e870ae2a370ca4c SHA256 23c29b204e00546aced367ffdaa10d606b2c8e9ac94641a0ada23ee82e4b1e14
-DIST classpath-0.15.tar.gz 5564571 RMD160 1740126b687f024c5bba2e6cdef2989c7ce20c40 SHA1 971bdd436b8010ab30096869f689a44d41e5a01c SHA256 19368b2ccd7d51b51bc265969042d39d48bcfecf6b4b58190009037f92b037c9
-DIST classpath-0.18.tar.gz 6389125 RMD160 c4cc3ac851bba79f1b497d727c868e942f998725 SHA1 28061c750244cac4ff0151da6aba183b94b98b25 SHA256 f2b3962b279a1d8f98c24e39cd5d62d4e9fbf50b7b8a75e90fcf0ded822824c2
-DIST classpath-0.95-stripped.zip 3217515 RMD160 d399f7a6aa1c70fefdefb3e4fd4ebb71bd8f45ef SHA1 8606522fad75b16752fdb4db6a7e7f09ad181183 SHA256 f2d386dedb3c4aa61fe21c84863e0899903dbc4628fdd95b855c067193ee0552
-DIST classpath-0.95.tar.gz 10210330 RMD160 8e5a2ef1517b757876066b3d899dc5cf2278a250 SHA1 9a3b276853a07ecc8753217a6db24afffab2cb2c SHA256 5c274a7741c35c35529f5641e644f61431143dac8e7724ac994d1f20c0d9cce0
-DIST ikvm-0.14.0.1.zip 4220553 RMD160 efb1b2e2ff89c31cdacad1816bd109b774098a7f SHA1 9ff6f605db49f887f3f286d6775f502851f17442 SHA256 20e6fd28d3c2a91413ecf2470d383d9fb1b2c1453d67021de7f4021fa8edbc96
-DIST ikvm-0.20.0.0.zip 4696966 RMD160 7f7902669d64ca011d8fb7f57e371056d2007795 SHA1 dba5a784c8e4b9da6ec94d053f9d175174663a91 SHA256 7959d06d1947fbf899259e8773b31367a20f06e6f16183ee543468f274988a8b
-DIST ikvm-0.34.0.2.zip 6371665 RMD160 f8da8e01b00c1e35f6e3a3df5fa33a31ea20cfd5 SHA1 fcfcfcfb78ea62d6941a19cddbb4576f75e4bf25 SHA256 302ecb54e56aaff456eb57bd0d53a23d649b18d75d7bbb0d8bce523370feeb42
-DIST ikvm-0.36.0.11.zip 13898346 RMD160 79f0c1c2553c78bca80e773814b481736a699ee7 SHA1 74860a38acbdec918493618999a8641e38073ab9 SHA256 e29067f6293648bb20016cd47e42ea985b8b905a2fd9db34d9d1ecb37c7385a6
-DIST ikvm-0.36.0.5.zip 13984212 RMD160 0ea02aa458493f65730eb38cc2e4997304328700 SHA1 b056e9c568232ed92199926e72b86c118090220b SHA256 5dfe99246914cf46201231d6d9fb782e8a2846d4dc2398de82dfffb61c88b913
-DIST ikvm-0.8.0.0.tar.gz 1369634 RMD160 9fb32c2d8fb3c8cb6e537e34a2f569d425c6dc29 SHA1 4c3b9aed7383dab7edc7e9cf73a04b09801d60eb SHA256 13d2cbb5d3be180a4d62cf85121a8f73a7d33e0c9470171f5f85e2b2e6ce41b0
-DIST openjdk-b13-stripped.zip 44733966 RMD160 a9b2c156acb2a85ab72bd38bbe3adb4de259959b SHA1 5eeae1a3ae217adf9c1dee4169f41eb458666606 SHA256 7b55c4d827475f98aaebe04ccb31adcc69cd6c792892c0616dc7b651809093f9
-EBUILD ikvm-0.14.0.1-r1.ebuild 1139 RMD160 e95d16523a206440f4154c54f03910617d4061a2 SHA1 439d0927c3c4dd2b0b6d813dad3beb9f83cef9ed SHA256 9828f167f255a06ec192ea3090db9ae0b6f67846798817cebde90a1a8f3c6119
-EBUILD ikvm-0.14.0.1-r2.ebuild 1174 RMD160 d8a469991db0ce13ebf0051445cdad211b4249a2 SHA1 f7a9ecf2f0058411365d71809f503618193cfa9e SHA256 da6c301a471b882618657cbfccfa2c030e2904ec75947783b1822be0ce77e6a6
-EBUILD ikvm-0.14.0.1.ebuild 982 RMD160 a8e928013489324e70c1551c5307f31f8becc741 SHA1 d0928c9ff7f07d1870b13920c818e17045b9ac8b SHA256 723da08d3e917baab38bcf0fd72c300de1c6e60faa05df9045ad58bf8d74ab01
-EBUILD ikvm-0.20.0.0.ebuild 1216 RMD160 5ff2e831651318c7df2d169b4606b6a185961f2b SHA1 41d43ef137db0db452eb52e66b81e1ba678407ab SHA256 c0725e9d26dfca69df4eb31fcd4b52b564d26efa00dbf864bdc64ee8f985af8a
-EBUILD ikvm-0.34.0.2.ebuild 1467 RMD160 c27e6febad1ef425a2cddf6d0f94a42c7b2e9f43 SHA1 36f2d17cdf081f202851711f02c31d5f8de09b03 SHA256 4f5a93ebe19a490ecdecefb5726669261d4c61157d6f4e5218a444a0215bfd57
-EBUILD ikvm-0.36.0.11-r1.ebuild 2720 RMD160 c90a0a4d97eeedce86025dcfa7994db7950c2c5d SHA1 8d5a8970f9b0554dfc7e89836bc42ad35aed00c8 SHA256 089381bf5b1ddcaa0523493074c5432b2500a992a9cdd6cc82e0f0b1394c0188
-EBUILD ikvm-0.36.0.11.ebuild 2712 RMD160 948f7eeadc364d7ed4fc8fdaa8ce5212dbc2198e SHA1 f04cb5153699ff3463b4d40c40b30401fa06ff74 SHA256 a9f570207162bf1ba77800063536c1da9b94973bced5b9995daf0e493017655a
-EBUILD ikvm-0.36.0.5.ebuild 1878 RMD160 2768944d8f9e3065b949f3a879214e20ac58568a SHA1 4bf76ebfed0fb87235ced510bfbf3656ec9e5513 SHA256 988a9d6f00a7987e58b114bdb8c62a687fc950c4b6eb191a3e966fdf909990fd
-EBUILD ikvm-0.8.0.0.ebuild 684 RMD160 da65a8ce78936ef52d5decafcc0a0d1f39d1aea8 SHA1 bbfd4e17d381042de577da1b7d023f601f1a85c2 SHA256 cbcfb5cdf80cd94ddbb3bced33bc8ac9ad777662656d3b5cab1fd2a8a298864d
-MISC ChangeLog 3646 RMD160 c046e2136cce21da6bb21db09e667cd1a9146a16 SHA1 fe81fe6dd536490fae63dd34b87f6d1151d2bcf3 SHA256 bb9dbb2447e983b29f65f54772ebe73be48230dba8eea54cdfd0b8348c8224a4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ikvm-0.44.0.5-key.patch 3013 RMD160 a733935d1543ad4894573be89d0e1efc32688466 SHA1 9f3fddea3a183a10ca0a265dc1859712e8e3a8f8 SHA256 c35dc7197a8888c4c5fd4fd106b0dc0aeccd409fbef6603cd329713714956b98
+AUX mono.snk.uu 892 RMD160 bc1c6fdb6c99b85c025e646783a81446d1265565 SHA1 773cb82cb4f426fc14e7c60a71b8e8112666ba44 SHA256 19ad5c915aef4ae4e6ecc3051e5c55005bfa5098c98693b8a4cdd5c09a517e46
+DIST ikvmsrc-0.44.0.5.zip 1684970 RMD160 af26eb2202f939693da46999059ca1a57f1d28af SHA1 115f7b26f9f1599aa6a6b6c1ba78f7aeffac6af4 SHA256 68c2a2184187b601f03a207fc5958a1e0c9e1a5b0b19c154c66c30ea8a8526c9
+DIST openjdk6-b18-stripped.zip 51303005 RMD160 e2e387f60c949eb34ce30e9954487a125d77a53d SHA1 82d08e146f049f6ace8b16e2007cc7231abf7a16 SHA256 73917ce374f86d985b4b148498ed6776b3b151a262de5e90b1264f81c922b57a
+EBUILD ikvm-0.44.0.5.ebuild 2793 RMD160 c392528a05bc3ad954b0187c71595e070304072b SHA1 3cb50713bdca8702e0b06b44e272bf2329988e68 SHA256 6946853f96e8936e0971470f3c461afec9be14141b2a356e3f7e0698338e508f
+MISC ChangeLog 4440 RMD160 a3d4e469e8c54295c54ab7fe9565ec487bff752a SHA1 f9ad69d4bc79e57a592ddf78e338ae8ad8a9d152 SHA256 94b18ba857709cc19da6ca41efc5e9e10023a1961895e2463428fc2c0b881191
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyNCt0ACgkQCaWpQKGI+9SOOwCfX1djT68uLEuYCZXoBsELvEOV
+7pIAn32xAwYufPFAc8PWX5WmveH7yWh7
+=RZkn
+-----END PGP SIGNATURE-----
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
-}