Version bump, remove old.

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

4 files changed, 86 insertions, 17 deletions

diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index b7fc3eac23e8..da0bd44520af 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/ikvm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.25 2010/12/06 14:09:34 pacho Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.26 2011/09/10 10:33:47 pacho Exp $
+
+*ikvm-0.46.0.1 (10 Sep 2011)
+
+  10 Sep 2011; Pacho Ramos <pacho@gentoo.org> -ikvm-0.44.0.5.ebuild,
+  +ikvm-0.46.0.1.ebuild, +files/ikvm-0.46.0.1-key.patch:
+  Version bump, remove old.
 
 *ikvm-0.44.0.6 (06 Dec 2010)
 
diff --git a/dev-dotnet/ikvm/Manifest b/dev-dotnet/ikvm/Manifest
index 2d6adb9409ce..cbb3897497a9 100644
--- a/dev-dotnet/ikvm/Manifest
+++ b/dev-dotnet/ikvm/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA1
 
 AUX ikvm-0.44.0.5-key.patch 3013 RMD160 a733935d1543ad4894573be89d0e1efc32688466 SHA1 9f3fddea3a183a10ca0a265dc1859712e8e3a8f8 SHA256 c35dc7197a8888c4c5fd4fd106b0dc0aeccd409fbef6603cd329713714956b98
+AUX ikvm-0.46.0.1-key.patch 2777 RMD160 de4e28f638478f379c9528ce7144a308b8e5d7ed SHA1 025d9c3f11ad0baad6bd488889d8ad3417847282 SHA256 cb05cb24008205cbfb297a0bf70794f9da830474434b64ce3b8d0dfab1890b90
 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 ikvmsrc-0.44.0.6.zip 1686191 RMD160 3dd7dc01858d131f17d0cc275829f49fd4b1559e SHA1 01c1ed5c50809a1e4fc060058fb37f0708dfff71 SHA256 23c6f291ee191e788f4ced7c62c0e900489a2e4ecd42aedf40ac9b16851170bf
+DIST ikvmsrc-0.46.0.1.zip 1870376 RMD160 091cecfc29fe91785610c1e69cd2af85c3b9fece SHA1 6505fad1533278b1726b5ddaf829610bb2697a6c SHA256 901e8b990cf6d0fc9f8a18179e040cdba8a2fa00ac5658eded5c9ea4665f6423
 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
+DIST openjdk6-b22-stripped.zip 51279392 RMD160 9d4a992ecf8580b48e19be106ee29e2f21f8cd58 SHA1 571e4dc6cfc34b3371aa3ccf1f5906d3965631a2 SHA256 32af924f320118b242c1bce4828abbe4c11120dd144c012ce2f5d88b75d2f568
 EBUILD ikvm-0.44.0.6.ebuild 2811 RMD160 e97b5f2389bee81c5c13ab42958476dd00c527b1 SHA1 e6a899444593a7c7124a01f80e644c73ed0274b3 SHA256 f8b422ef3a20979f33378abd58fb99d13e093aa9a6e1c926045d3e63d6f37d70
-MISC ChangeLog 5620 RMD160 30269c9a074ae5456f303531eb3fd56ff4dc7273 SHA1 8f7697ca4a592383ad7888ae4bf562ae429c1abc SHA256 f3e0a9311f82d51ab97c513748c7937ca5aede580bc9db4f5fc3af92eb6fb3fa
+EBUILD ikvm-0.46.0.1.ebuild 2797 RMD160 c3eed2b11294b19f18654578b9cbedb1dd1d2e70 SHA1 3bc44085e09e701e593d497eed089568750d7d6e SHA256 1acb9878dc2e3af97abf4c8a3951c5c2d27a7ff6a49de0de302e7568225b7b1a
+MISC ChangeLog 5805 RMD160 9124e3c580ed36dc029ceef4c8531f5879304a4b SHA1 ad4e1adb7d985d3ec36919f998cdce4b5e1718ee SHA256 dce24471f7a3aba3833ea2c3198e008983aeec97d8a4a4d8e1a56f98243dd5eb
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAkz87qQACgkQCaWpQKGI+9S2egCfeS4mARZWfGBEClXZrEaQf7Ot
-kY0AljI/H+3p36UKo2/HR4mksHRoGes=
-=u6x9
+iEYEARECAAYFAk5rPREACgkQCaWpQKGI+9ROngCfap2tQ7bJHEnlucgiQfaoOG4w
+5DsAoIT2Qiq+t/z2rPWcRXyYnNLB0zox
+=aqk/
 -----END PGP SIGNATURE-----
diff --git a/dev-dotnet/ikvm/files/ikvm-0.46.0.1-key.patch b/dev-dotnet/ikvm/files/ikvm-0.46.0.1-key.patch
new file mode 100644
index 000000000000..cd45f6bf0da3
--- /dev/null
+++ b/dev-dotnet/ikvm/files/ikvm-0.46.0.1-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-0.46.0.1/CommonAssemblyInfo.cs.in
+===================================================================
+--- ikvm.orig/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in	2011-07-05 01:24:45.000000000 +0100
++++ ikvm/ikvm-0.46.0.1/CommonAssemblyInfo.cs.in	2011-07-05 01:28:22.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/ikvm-0.46.0.1/ikvm.build
+===================================================================
+--- ikvm.orig/ikvm-0.46.0.1/ikvm.build	2011-07-05 01:24:45.000000000 +0100
++++ ikvm/ikvm-0.46.0.1/ikvm.build	2011-07-05 01:33:07.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="managed" />

+     </target>

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

+Index: ikvm/ikvm-0.46.0.1/runtime/runtime.build
+===================================================================
+--- ikvm.orig/ikvm-0.46.0.1/runtime/runtime.build	2011-07-05 01:24:45.000000000 +0100
++++ ikvm/ikvm-0.46.0.1/runtime/runtime.build	2011-07-05 01:32:53.000000000 +0100
+@@ -7,8 +7,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>

+ 

+Index: ikvm/ikvm-0.46.0.1/tools/pubkey.cs
+===================================================================
+--- ikvm.orig/ikvm-0.46.0.1/tools/pubkey.cs	2011-07-05 01:24:45.000000000 +0100
++++ ikvm/ikvm-0.46.0.1/tools/pubkey.cs	2011-07-05 01:28:22.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

diff --git a/dev-dotnet/ikvm/ikvm-0.44.0.5.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild
index 73b91c670d7c..3ba267100304 100644
--- a/dev-dotnet/ikvm/ikvm-0.44.0.5.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.46.0.1.ebuild,v 1.1 2011/09/10 10:33:47 pacho Exp $
 
-EAPI=2
+EAPI="4"
 
 inherit eutils mono multilib java-pkg-2
 
 DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${PN}/openjdk6-b18-stripped.zip
-	mirror://sourceforge/${PN}/${PN}src-${PV}.zip"
+HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
+SRC_URI="http://www.frijters.net/openjdk6-b22-stripped.zip
+	http://www.frijters.net/${PN}src-${PV}.zip"
 LICENSE="as-is"
 
 SLOT="0"
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 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}-0.44.0.5-key.patch
+	epatch "${FILESDIR}"/${PN}-0.46.0.1-key.patch
 	uudecode < "${FILESDIR}"/mono.snk.uu || die
 
 	# Ensures that we use Mono's bundled copy of SharpZipLib instead of relying
@@ -75,7 +75,7 @@ generate_pkgconfig() {
 src_install() {
 	local dll dllbase exe
 	insinto /usr/$(get_libdir)/${PN}
-	doins bin/*.exe bin/*.so || die
+	doins bin/*.exe
 
 	dodir /bin
 	for exe in bin/*.exe