Fix unmappable character for encoding ASCII, bug #399729 by Dennis Schridde; restrict to jdk:1.6, bug #405933

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

4 files changed, 28 insertions, 8 deletions

diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index 83b37a21f50c..48fd80850dff 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.30 2012/01/21 13:49:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.31 2012/02/28 08:30:16 pacho Exp $
+
+  28 Feb 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/ikvm-0.46.0.2-unmappable-character.patch, ikvm-0.46.0.2.ebuild:
+  Fix unmappable character for encoding ASCII, bug #399729 by Dennis Schridde;
+  restrict to jdk:1.6, bug #405933
 
 *ikvm-0.46.0.2 (21 Jan 2012)
 
diff --git a/dev-dotnet/ikvm/Manifest b/dev-dotnet/ikvm/Manifest
index a1beb5bdaf4c..91e1c866b2d6 100644
--- a/dev-dotnet/ikvm/Manifest
+++ b/dev-dotnet/ikvm/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX ikvm-0.46.0.1-key.patch 2777 RMD160 de4e28f638478f379c9528ce7144a308b8e5d7ed SHA1 025d9c3f11ad0baad6bd488889d8ad3417847282 SHA256 cb05cb24008205cbfb297a0bf70794f9da830474434b64ce3b8d0dfab1890b90
+AUX ikvm-0.46.0.2-unmappable-character.patch 459 RMD160 e8b47ad639fd25473b4e7e7ae86b334fb29b625c SHA1 2d4e613a7fce7fdcbdeafb7341a996e771df9521 SHA256 5ad54b98d39b652759b82ce09b5d6c27c83e0ac26317865ed9baf654d47ec8de
 AUX mono.snk.uu 892 RMD160 bc1c6fdb6c99b85c025e646783a81446d1265565 SHA1 773cb82cb4f426fc14e7c60a71b8e8112666ba44 SHA256 19ad5c915aef4ae4e6ecc3051e5c55005bfa5098c98693b8a4cdd5c09a517e46
 DIST ikvmsrc-0.46.0.1.zip 1870376 RMD160 091cecfc29fe91785610c1e69cd2af85c3b9fece SHA1 6505fad1533278b1726b5ddaf829610bb2697a6c SHA256 901e8b990cf6d0fc9f8a18179e040cdba8a2fa00ac5658eded5c9ea4665f6423
 DIST ikvmsrc-0.46.0.2.zip 1873662 RMD160 99ef1233eec7454a404225aa587b10cd8268afa1 SHA1 05ced1e67202291512adc4d95360d5d4b1757f9d SHA256 25afda0b29a2562ffb8f0a457204bde1008c8d255abaf45c3a09b13f7eba5f06
 DIST openjdk6-b22-stripped.zip 51279392 RMD160 9d4a992ecf8580b48e19be106ee29e2f21f8cd58 SHA1 571e4dc6cfc34b3371aa3ccf1f5906d3965631a2 SHA256 32af924f320118b242c1bce4828abbe4c11120dd144c012ce2f5d88b75d2f568
 EBUILD ikvm-0.46.0.1.ebuild 2799 RMD160 9a36e0c94a5b523f80d09e67e151aef39bd8b19f SHA1 83ab3ffb89d8fb58b3b76211398918ca3c5c7ae8 SHA256 99990bc5f1190812bfc41f54d9461d77f446d3deee3271a2e5198fc50a926daa
-EBUILD ikvm-0.46.0.2.ebuild 2797 RMD160 d96bc3246064e8d4c1e6abdca70d0f14fd3d755a SHA1 8c660242317be85a6b6e74b1f2116e24ae73d651 SHA256 0ab4a9237903040adf0d1357678b9e8a75f220b400eef3ff6cb88169ac54ae4f
-MISC ChangeLog 6307 RMD160 956b0b6b81189eabd58bc1cfda9c6f7e4528e99d SHA1 a569dda740ca2a5321aeb9db57896cba678cc25e SHA256 8d3ddbafae8f99c2adfcfd82070a339b4c9a4777f4d5924cb3741ca01f49bca5
+EBUILD ikvm-0.46.0.2.ebuild 2926 RMD160 663117b7fa49a5edca1aa3effa722c99fd91abec SHA1 ab2d111e437e5b022e43053c19a3274fef24bf7a SHA256 1c6b5b70562188e8a227d8c2ccb527a0fbc84150917f556fe507b3434c9ee754
+MISC ChangeLog 6541 RMD160 ba0d3682d60b49f6d64de89f5479133c57e12e1a SHA1 d36592d9ba7ee1f344e34012ebb14582089f4cf6 SHA256 466acbf03f63fb34147d2857bebd89d51cb15652a9c511ac5ab385490a010b8d
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8awnEACgkQCaWpQKGI+9QeXwCbB5dECsr+9kxUqP0zLbeUTZ2T
-A5YAn2TItki6PPmdPPVDLN13fpoe5zhi
-=EWjt
+iEYEARECAAYFAk9MkJ4ACgkQCaWpQKGI+9RLCQCfWdEccbhs7z1ry08rxWmfcw++
+ZAkAn1ErBmV/p0VorDmMWmPSjsS4yBHC
+=BtAA
 -----END PGP SIGNATURE-----
diff --git a/dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch b/dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch
new file mode 100644
index 000000000000..2ed0308af74d
--- /dev/null
+++ b/dev-dotnet/ikvm/files/ikvm-0.46.0.2-unmappable-character.patch
@@ -0,0 +1,11 @@
+--- openjdk/sun/print/Win32PrintService.java.orig	2012-02-26 17:56:16.751000012 +0100
++++ openjdk/sun/print/Win32PrintService.java	2012-02-26 17:56:37.182000012 +0100
+@@ -119,7 +119,7 @@
+         Chromaticity.class

+     };

+ 

+-    // conversion from 1/100 Inch (.NET) to µm (Java)

++    // conversion from 1/100 Inch (.NET) to m (Java)

+     private static final int INCH100_TO_MYM = 254;

+     private static final int  MATCH_DIFF = 500; // 0.5 mm

+     

diff --git a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
index 231d63827d3a..c05ec1094118 100644
--- a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
@@ -1,6 +1,6 @@
 # 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-0.46.0.2.ebuild,v 1.1 2012/01/21 13:49:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild,v 1.2 2012/02/28 08:30:16 pacho Exp $
 
 EAPI="4"
 
@@ -21,12 +21,15 @@ RDEPEND=">=dev-lang/mono-2
 DEPEND="${RDEPEND}
 	!dev-dotnet/ikvm-bin
 	>=dev-dotnet/nant-0.85
-	>=virtual/jdk-1.6
+	>=virtual/jdk-1.6:1.6
 	app-arch/unzip
 	dev-util/pkgconfig
 	app-arch/sharutils"
 
 src_prepare() {
+	# Fix unmappable character for encoding ASCII, bug #399729
+	epatch "${FILESDIR}"/${PN}-0.46.0.2-unmappable-character.patch
+
 	# 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.46.0.1-key.patch