Version bump, remove old and fix links gac managing (bug #380645 by Juergen Rose).

(Portage version: 2.1.10.14/cvs/Linux x86_64)

3 files changed, 20 insertions, 53 deletions

diff --git a/dev-dotnet/ikvm-bin/ChangeLog b/dev-dotnet/ikvm-bin/ChangeLog
index cb62a0733946..26e9b832c131 100644
--- a/dev-dotnet/ikvm-bin/ChangeLog
+++ b/dev-dotnet/ikvm-bin/ChangeLog
@@ -1,6 +1,13 @@
 # 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.16 2011/06/30 14:15:02 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ChangeLog,v 1.17 2011/09/10 10:46:23 pacho Exp $
+
+*ikvm-bin-0.46.0.1 (10 Sep 2011)
+
+  10 Sep 2011; Pacho Ramos <pacho@gentoo.org> -ikvm-bin-0.42.0.6.ebuild,
+  -ikvm-bin-0.44.0.5.ebuild, +ikvm-bin-0.46.0.1.ebuild:
+  Version bump, remove old and fix links gac managing (bug #380645 by Juergen
+  Rose).
 
   30 Jun 2011; Christoph Mende <angelos@gentoo.org> ikvm-bin-0.44.0.6.ebuild:
   Stable on amd64 wrt bug #371163
diff --git a/dev-dotnet/ikvm-bin/ikvm-bin-0.42.0.6.ebuild b/dev-dotnet/ikvm-bin/ikvm-bin-0.42.0.6.ebuild
deleted file mode 100644
index 191997c184ee..000000000000
--- a/dev-dotnet/ikvm-bin/ikvm-bin-0.42.0.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2010 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.42.0.6.ebuild,v 1.3 2010/09/23 22:16:40 hwoarang Exp $
-
-inherit eutils mono multilib
-
-MY_P=${P/-bin/}
-MY_PN=${PN/-bin/}
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}bin-${PV}.zip"
-LICENSE="as-is"
-
-SLOT="0"
-S=${WORKDIR}/${MY_P}
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-lang/mono-1.1
-		!dev-dotnet/ikvm
-		app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /usr/$(get_libdir)/${MY_PN}
-	doins bin/* || die "doins failed"
-
-	for exe in ikvm ikvmc ikvmstub;
-	do
-		make_wrapper ${exe} "mono /usr/$(get_libdir)/${MY_PN}/${exe}.exe"
-	done
-
-	dodir /usr/$(get_libdir)/pkgconfig
-	sed -e "s:@VERSION@:${PV}:" \
-		-e "s:@LIBDIR@:$(get_libdir):" \
-		"${FILESDIR}"/ikvm-0.36.0.5.pc.in > "${D}"/usr/$(get_libdir)/pkgconfig/${MY_PN}.pc
-
-	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-bin/ikvm-bin-0.44.0.5.ebuild b/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.1.ebuild
index 3550e204759b..1e31e6094587 100644
--- a/dev-dotnet/ikvm-bin/ikvm-bin-0.44.0.5.ebuild
+++ b/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.1.ebuild
@@ -1,6 +1,8 @@
-# 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-bin/ikvm-bin-0.44.0.5.ebuild,v 1.1 2010/09/12 15:24:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ikvm-bin-0.46.0.1.ebuild,v 1.1 2011/09/10 10:46:23 pacho Exp $
+
+EAPI="4"
 
 inherit eutils mono multilib
 
@@ -8,8 +10,8 @@ MY_P=${P/-bin/}
 MY_PN=${PN/-bin/}
 
 DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}bin-${PV}.zip"
+HOMEPAGE="http://www.ikvm.net/ http://weblog.ikvm.net/"
+SRC_URI="http://www.frijters.net/${MY_PN}bin-${PV}.zip"
 LICENSE="as-is"
 
 SLOT="0"
@@ -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
 }