Version bump, remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

6 files changed, 17 insertions, 136 deletions

diff --git a/dev-dotnet/ikvm-bin/ChangeLog b/dev-dotnet/ikvm-bin/ChangeLog
index 3709c4482c40..9d1a2c0e5eb5 100644
--- a/dev-dotnet/ikvm-bin/ChangeLog
+++ b/dev-dotnet/ikvm-bin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-dotnet/ikvm-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ChangeLog,v 1.11 2010/09/12 03:38:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm-bin/ChangeLog,v 1.12 2010/09/12 15:24:58 pacho Exp $
+
+*ikvm-bin-0.44.0.5 (12 Sep 2010)
+
+  12 Sep 2010; Pacho Ramos <pacho@gentoo.org> -ikvm-bin-0.14.ebuild,
+  -ikvm-bin-0.34.0.2.ebuild, -ikvm-bin-0.36.0.5.ebuild,
+  -ikvm-bin-0.42.0.3.ebuild, +ikvm-bin-0.44.0.5.ebuild, -files/ikvm.pc.in:
+  Version bump, add some missing die statements and install dlls in a better
+  way. Remove old.
 
   12 Sep 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   ikvm-bin-0.42.0.6.ebuild:
diff --git a/dev-dotnet/ikvm-bin/files/ikvm.pc.in b/dev-dotnet/ikvm-bin/files/ikvm.pc.in
deleted file mode 100644
index 3fdd3b5e9806..000000000000
--- a/dev-dotnet/ikvm-bin/files/ikvm.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/@LIBDIR@
-
-
-Name: IKVM.NET
-Description: An implementation of Java for Mono and the Microsoft .NET Framework.
-Version: @VERSION@
-Libs: -r:${libdir}/ikvm/IKVM.Runtime.dll -r:${libdir}/ikvm/IKVM.GNU.Classpath.dll
diff --git a/dev-dotnet/ikvm-bin/ikvm-bin-0.14.ebuild b/dev-dotnet/ikvm-bin/ikvm-bin-0.14.ebuild
deleted file mode 100644
index aa19b7878bab..000000000000
--- a/dev-dotnet/ikvm-bin/ikvm-bin-0.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 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.14.ebuild,v 1.3 2005/05/21 15:23:28 slarti Exp $
-
-inherit mono
-
-MY_P=${P/-bin/}
-MY_PN=${PN/-bin/}
-
-DESCRIPTION="Java VM for .NET"
-HOMEPAGE="http://www.ikvm.net/"
-SRC_URI="http://www.go-mono.com/sources/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="as-is"
-
-SLOT="0"
-S=${WORKDIR}/${MY_P}
-
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/mono-1.1
-	!dev-dotnet/ikvm"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-}
diff --git a/dev-dotnet/ikvm-bin/ikvm-bin-0.34.0.2.ebuild b/dev-dotnet/ikvm-bin/ikvm-bin-0.34.0.2.ebuild
deleted file mode 100644
index 2159e7fb08bd..000000000000
--- a/dev-dotnet/ikvm-bin/ikvm-bin-0.34.0.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2007 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.34.0.2.ebuild,v 1.2 2007/06/28 03:46:37 jurek 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="~x86 ~amd64"
-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/*
-
-	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}/${MY_PN}.pc.in > ${D}/usr/$(get_libdir)/pkgconfig/${MY_PN}.pc
-}
diff --git a/dev-dotnet/ikvm-bin/ikvm-bin-0.36.0.5.ebuild b/dev-dotnet/ikvm-bin/ikvm-bin-0.36.0.5.ebuild
deleted file mode 100644
index cce87db5eea6..000000000000
--- a/dev-dotnet/ikvm-bin/ikvm-bin-0.36.0.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 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.36.0.5.ebuild,v 1.1 2007/12/31 18:59:37 jurek 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="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/mono-1.1
-		!dev-dotnet/ikvm
-		app-arch/unzip"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	# Remove Windows specific libraries
-	rm bin/JVM.DLL bin/ikvm-native.dll
-
-	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}"/${MY_P}.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.42.0.3.ebuild b/dev-dotnet/ikvm-bin/ikvm-bin-0.44.0.5.ebuild
index fd1ff2c2dd4e..3550e204759b 100644
--- a/dev-dotnet/ikvm-bin/ikvm-bin-0.42.0.3.ebuild
+++ b/dev-dotnet/ikvm-bin/ikvm-bin-0.44.0.5.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2010/02/27 01:04:46 patrick Exp $
+# $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 $
 
 inherit eutils mono multilib
 
@@ -15,7 +15,7 @@ LICENSE="as-is"
 SLOT="0"
 S=${WORKDIR}/${MY_P}
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/mono-1.1
@@ -29,17 +29,18 @@ src_install() {
 
 	for exe in ikvm ikvmc ikvmstub;
 	do
-		make_wrapper ${exe} "mono /usr/$(get_libdir)/${MY_PN}/${exe}.exe"
+		make_wrapper ${exe} "mono /usr/$(get_libdir)/${MY_PN}/${exe}.exe" || die
 	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
+		"${FILESDIR}"/ikvm-0.36.0.5.pc.in > "${D}"/usr/$(get_libdir)/pkgconfig/${MY_PN}.pc \
+		|| die "sed failed"
 
-	for dll in IKVM.AWT.WinForms IKVM.OpenJDK.ClassLibrary IKVM.Runtime
+	for dll in bin/IKVM*.dll
 	do
-		gacutil -i bin/${dll}.dll -root "${D}"/usr/$(get_libdir) \
-			-gacdir /usr/$(get_libdir) -package ${dll} > /dev/null
+		gacutil -i ${dll} -root "${D}"/usr/$(get_libdir) \
+			-gacdir /usr/$(get_libdir) -package ${dll} || die
 	done
 }