summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2012-07-21 16:16:24 +0000
committerPacho Ramos <pacho@gentoo.org>2012-07-21 16:16:24 +0000
commitf623c0655320d2d0d8ee23382808cb741c5603ec (patch)
tree4fd4b6715dfb78c7fb003c2d51d96b5e4b40369b /dev-dotnet/ikvm
parentamd64/ppc/ppc64 stable wrt #416725 with systemd workaround, see the ebuild fo... (diff)
downloadgentoo-2-f623c0655320d2d0d8ee23382808cb741c5603ec.tar.gz
gentoo-2-f623c0655320d2d0d8ee23382808cb741c5603ec.tar.bz2
gentoo-2-f623c0655320d2d0d8ee23382808cb741c5603ec.zip
Use proper jdk slots to build, bug #422603 by Ralph Sennhauser.
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'dev-dotnet/ikvm')
-rw-r--r--dev-dotnet/ikvm/ChangeLog6
-rw-r--r--dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild5
-rw-r--r--dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild4
3 files changed, 11 insertions, 4 deletions
diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index cd5fe9cf8a8e..dc06e7f1df27 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,10 @@
# 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.35 2012/07/21 10:12:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.36 2012/07/21 16:16:24 pacho Exp $
+
+ 21 Jul 2012; Pacho Ramos <pacho@gentoo.org> ikvm-0.46.0.2.ebuild,
+ ikvm-7.1.4532.2.ebuild:
+ Use proper jdk slots to build, bug #422603 by Ralph Sennhauser.
*ikvm-7.1.4532.2 (21 Jul 2012)
diff --git a/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild b/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild
index 9ec9f6d9b223..39a85d6a790e 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.5 2012/05/22 12:16:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild,v 1.6 2012/07/21 16:16:24 pacho Exp $
EAPI="4"
@@ -21,7 +21,7 @@ RDEPEND=">=dev-lang/mono-2
DEPEND="${RDEPEND}
!dev-dotnet/ikvm-bin
>=dev-dotnet/nant-0.85
- >=virtual/jdk-1.6:1.6
+ virtual/jdk:1.6
app-arch/unzip
virtual/pkgconfig
app-arch/sharutils"
@@ -44,6 +44,7 @@ src_prepare() {
native/native.build || die
mkdir -p "${T}"/home/test
+ java-pkg-2_src_prepare
}
src_configure() {
diff --git a/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild b/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
index 3ad73cfb65e6..14647021b566 100644
--- a/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild
+++ b/dev-dotnet/ikvm/ikvm-7.1.4532.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-7.1.4532.2.ebuild,v 1.1 2012/07/21 10:12:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild,v 1.2 2012/07/21 16:16:24 pacho Exp $
EAPI="4"
@@ -42,6 +42,8 @@ src_prepare() {
native/native.build || die
mkdir -p "${T}"/home/test
+
+ java-pkg-2_src_prepare
}
src_configure() {