Version bump, drop old.

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

5 files changed, 33 insertions, 81 deletions

diff --git a/dev-dotnet/ikvm-bin/ChangeLog b/dev-dotnet/ikvm-bin/ChangeLog
index d23388d046c2..bc4aabad0268 100644
--- a/dev-dotnet/ikvm-bin/ChangeLog
+++ b/dev-dotnet/ikvm-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/ikvm-bin
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ChangeLog,v 1.19 2011/11/05 12:19:36 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ChangeLog,v 1.20 2012/01/21 13:54:04 pacho Exp $
+
+*ikvm-bin-0.46.0.2 (21 Jan 2012)
+
+  21 Jan 2012; Pacho Ramos <pacho@gentoo.org> +ikvm-bin-0.46.0.2.ebuild,
+  -ikvm-bin-0.44.0.6.ebuild:
+  Version bump, drop old.
 
   05 Nov 2011; Markos Chandras <hwoarang@gentoo.org> ikvm-bin-0.46.0.1.ebuild:
   Stable on amd64 wrt bug #389181
diff --git a/dev-dotnet/ikvm-bin/ikvm-bin-0.44.0.6.ebuild b/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.2.ebuild
index 99c359b29b01..9b2d978913b4 100644
--- a/dev-dotnet/ikvm-bin/ikvm-bin-0.44.0.6.ebuild
+++ b/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ikvm-bin-0.44.0.6.ebuild,v 1.3 2011/06/30 14:15:02 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.2.ebuild,v 1.1 2012/01/21 13:54:04 pacho Exp $
+
+EAPI="4"
 
 inherit eutils mono multilib
 
@@ -15,7 +17,7 @@ LICENSE="as-is"
 SLOT="0"
 S=${WORKDIR}/${MY_P}
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/mono-1.1
@@ -25,7 +27,7 @@ RDEPEND="${DEPEND}"
 
 src_install() {
 	insinto /usr/$(get_libdir)/${MY_PN}
-	doins bin/* || die "doins failed"
+	doins bin/*
 
 	for exe in ikvm ikvmc ikvmstub;
 	do
@@ -40,7 +42,10 @@ src_install() {
 
 	for dll in bin/IKVM*.dll
 	do
-		gacutil -i ${dll} -root "${D}"/usr/$(get_libdir) \
-			-gacdir /usr/$(get_libdir) -package ${dll} || die
+		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/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index af48699107c4..83b37a21f50c 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/ikvm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.29 2011/11/10 19:16:47 xarthisius Exp $
+# 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 $
+
+*ikvm-0.46.0.2 (21 Jan 2012)
+
+  21 Jan 2012; Pacho Ramos <pacho@gentoo.org> +ikvm-0.46.0.2.ebuild,
+  -files/ikvm-0.44.0.5-key.patch, -ikvm-0.44.0.6.ebuild:
+  Version bump, drop old.
 
   10 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> ikvm-0.46.0.1.ebuild:
   ppc stable wrt #389181
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
deleted file mode 100644
index 625d97a966ab..000000000000
--- a/dev-dotnet/ikvm/files/ikvm-0.44.0.5-key.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-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/ikvm-0.44.0.6.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
index fceb77fe93bb..231d63827d3a 100644
--- a/dev-dotnet/ikvm/ikvm-0.44.0.6.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.44.0.6.ebuild,v 1.1 2010/12/06 14:09:34 pacho Exp $
+# $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 $
 
-EAPI=2
+EAPI="4"
 
 inherit eutils mono multilib java-pkg-2
 
 DESCRIPTION="Java VM for .NET"
 HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
-SRC_URI="http://www.frijters.net/openjdk6-b18-stripped.zip
+SRC_URI="http://www.frijters.net/openjdk6-b22-stripped.zip
 	http://www.frijters.net/${PN}src-${PV}.zip"
 LICENSE="as-is"
 
@@ -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