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

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

4 files changed, 27 insertions, 62 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/Manifest b/dev-dotnet/ikvm-bin/Manifest
index 39c6d9a0c6b6..30d537a9c987 100644
--- a/dev-dotnet/ikvm-bin/Manifest
+++ b/dev-dotnet/ikvm-bin/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ikvm-0.36.0.5.pc.in 307 RMD160 29fb7bfb5deb38c5687d1ecc36ffda9f5e9d9179 SHA1 e1c17dd2519691e3e602445c61197e42aee12b99 SHA256 e0c2b9aa10c15a482d9ae802c169a5525eba3e24c7334d8a74d42825f7f8196a
-DIST ikvmbin-0.42.0.6.zip 13435499 RMD160 42507d181c9a8b0bfd204ec800353b672a45be34 SHA1 f858f6d035e13a06653d3537b2b8c7038f387725 SHA256 a004fe49dbbca01d1239268b59f2baad7945fb0cb4ab1fbb098aa56e3f824e1f
-DIST ikvmbin-0.44.0.5.zip 14500330 RMD160 8414b96a232be0e5ff1d4a720b25ed5918cbfea1 SHA1 4f0902501dcfed182eb0b1cb5aeaa6de1877e51e SHA256 9d134bd658460cd19bed5699f1839f3d7ac188276dec4128e071ed65a3f30e88
 DIST ikvmbin-0.44.0.6.zip 14501002 RMD160 406775e1b3a5b4b6e3c687777b8d573a8ef2a6bd SHA1 efa7d6c3a0c6e479c4a91516bd460e50804d197f SHA256 a3cfe47604a689606464acf8b0a7f43d1ee4dc58defe7be64fbee9526822f934
-EBUILD ikvm-bin-0.42.0.6.ebuild 1172 RMD160 8f27db70c37ac150f28d0bde496b8c9516d4a6e6 SHA1 735609a8f459ffefb81ad1eb4b5065c31f8e0e50 SHA256 433edb9f447894876f84c90b1752021b0c82b89be44c8a19bb14533ed8c5d3ba
-EBUILD ikvm-bin-0.44.0.5.ebuild 1146 RMD160 8962337ae98a6f83a83e483e6073615838f37a28 SHA1 929387813fbfcf0197fbef5650861fb9e7bc5f74 SHA256 95472239842c370e827e39d4ddd5097d902d477412b55a88e17a822fbd2ef95a
+DIST ikvmbin-0.46.0.1.zip 15678737 RMD160 347e4ed11954492c72458ea698e392ab30e63ec3 SHA1 67279aa22a41ace52764c3ba30f7508d0a42b440 SHA256 7ba554b6f7436158fe2e6904eb660f267cf22445553a1083e54162b35fe5640d
 EBUILD ikvm-bin-0.44.0.6.ebuild 1164 RMD160 07f102dfae6a91b3fe9cfb472f4789d5b3138bd8 SHA1 b57e28d315317029c06f6ca729078854e7a9dcb6 SHA256 53cd8fd0ff90abc156b05a4a973e0481239243a5d078abc152c821f7762de144
-MISC ChangeLog 3474 RMD160 978fb6db1120f294d405da1bad7d125b165c4c93 SHA1 8f068b6b43d909112c2cff6db1adbfd3efffb815 SHA256 b7e86311543a21dcf53eb51eaadcd50fa9cc2daadf9b968b730f7c9741cb38c2
+EBUILD ikvm-bin-0.46.0.1.ebuild 1281 RMD160 d360a8ef678deaf80b501386fc66226c851ac8c8 SHA1 92c7c89ebec174d49cccbe0c9606c3a8efa05dcf SHA256 f59093e9ba6b398fa9cc4446087a5fb877645d9819d53edabceebd35a9c38cd6
+MISC ChangeLog 3723 RMD160 d8cabf0094d5b429042e4fa8e3d70fa8de2397b2 SHA1 de2ad4d1178f30fee2fba9439862a3063d4ed9e7 SHA256 0270267f09c4bfce94524a95f99d4c1ddea3ef2c0880536e83e40f48c2f4c414
 MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4MhOsACgkQmWq1bYTyC0MXmAEAkjHjAU/qv42HzBgkX3q7hy/1
-LIMCxcoZdWduF1v1h3oA/ikbXqtmHxaF/bJvknznJTDRbvhInkw2prSd5sV4Anxx
-=HSwL
+iEYEARECAAYFAk5rQAUACgkQCaWpQKGI+9RTBwCdEoFW9vOeLDeV0+nVd86VNlUA
+jMQAn0lOWhPnaf9oVBFaAReMLq4LKJzt
+=TkOz
 -----END PGP SIGNATURE-----
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
 }