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
commitad5e587876ddecd033cea000c92132d4c77a74fa (patch)
treeb54797d8d9631c2366ded68f4ffb6ec9f5471de1 /dev-dotnet
parentamd64/ppc/ppc64 stable wrt #416725 with systemd workaround, see the ebuild fo... (diff)
downloadhistorical-ad5e587876ddecd033cea000c92132d4c77a74fa.tar.gz
historical-ad5e587876ddecd033cea000c92132d4c77a74fa.tar.bz2
historical-ad5e587876ddecd033cea000c92132d4c77a74fa.zip
Use proper jdk slots to build, bug #422603 by Ralph Sennhauser.
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'dev-dotnet')
-rw-r--r--dev-dotnet/ikvm/ChangeLog6
-rw-r--r--dev-dotnet/ikvm/Manifest12
-rw-r--r--dev-dotnet/ikvm/ikvm-0.46.0.2.ebuild5
-rw-r--r--dev-dotnet/ikvm/ikvm-7.1.4532.2.ebuild4
4 files changed, 17 insertions, 10 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/Manifest b/dev-dotnet/ikvm/Manifest
index 1ef6ebfc4c99..20ea34791548 100644
--- a/dev-dotnet/ikvm/Manifest
+++ b/dev-dotnet/ikvm/Manifest
@@ -11,14 +11,14 @@ DIST ikvmsrc-7.1.4532.2.zip 2102200 SHA256 3f22b9171b56a7600f28c42828898772bcd37
DIST openjdk-7u4-stripped.zip 55617337 SHA256 d85b89b452ecdb46309ec39b28e283813660bb8b8399d4c222d3ff1a83b971f9 SHA512 3f4d32994c9a078b68ae6da13770c249561240a01840f88094e139b0297b25e37a2acd3ef74fa14a830be5aa43c693b3ecf1c745dbc7051c4b2e1816c397e9a1 WHIRLPOOL b7690de8c31acb4b3a62fdd132bcf33b2264559e64a116d75fed3a3edeb570345ade582377d2d824d2ab5831a0865b5b1c51f7a514285935696be3cef5079b1b
DIST openjdk6-b22-stripped.zip 51279392 SHA256 32af924f320118b242c1bce4828abbe4c11120dd144c012ce2f5d88b75d2f568 SHA512 e0cd896c80e3b10aaa1b1128ea63b062c7de0539188d66f2ae081d420c6f467b1aa8fdbc5fe4cb366c89ed2880560b287e9af5e8312d36903a46f23d1bbbe791 WHIRLPOOL 7d86ea0693e371273ea160ba20daafe7b8d9453687a3e21f81ef239f4186cafcc367950a1117a14da21b212831baebfab9a03f87166f7cd6a598811cc73e3a10
EBUILD ikvm-0.46.0.1.ebuild 2794 SHA256 b726370bbb135256fe89d7eb1424a8796a033907f5da9e04c27052b0c2a48dff SHA512 4619aceaca0eaaa15afb4daaf85ee23627eccdb1f1a9badefb8e214173bba8bfc962a0760222747794c5e34c8e9bc26b6a52ebc94f72c4e8512210f591af7a75 WHIRLPOOL 27d091998ecc227a03ee90df3a7f5901a2c2fa488e43d2e6b7de758e5ddd152aa11b23f849babd2befd17f34ea9ea81e142149255e5766fb6240ac6973499859
-EBUILD ikvm-0.46.0.2.ebuild 2921 SHA256 ef60c480c116566b930bb0cb1c16e88ba9f112b380ba50f5c1a9d8f9a9207136 SHA512 b73271d0c59354abab25aaadfbd103adc8ff261e72359e7e0cc9c1bcbb346fbff0cc53644bba6313f175e0b2a80cbb1bc2e1dc83282efb57cf7701925d7b42fb WHIRLPOOL 3f171e83c2e6aec58ffa2661937f72adb931dab35f55290ca9b483927580c776feb2d97b2167060614a7e49163d6a377c7c17eee8c4ae2170df45b705c1a1588
-EBUILD ikvm-7.1.4532.2.ebuild 2842 SHA256 03a1af89e0d074bce63e58a3e6e565f76f0e8cf6d9b2d63190ecb356f71d4ff5 SHA512 abd4033b7c01c4381aca22993512098d7961338b9c00de554c4471e389a97c9c3a5413a7137fb5673b96f45922332983d96006105108d600e0963645d89faa0a WHIRLPOOL 385283cc6f308c816aa8d56500ac4cbb97007a08c57038accd732997a9605439302c2512e6dc1ab7678e0ca6903a9d0342dadd13f33332546c770ba19200a0f3
-MISC ChangeLog 7039 SHA256 137b5926af50a03014ecd0dd68414d351ad04ef0412006138619500384db49da SHA512 54a6cb912bbf65a0ed96147845c5147d98ca569f066a0ec8c031d7e5659f12a23adc74556645c526fddd7e09c20769e3f7433f138134d8b1a5e730fbf2a8d6b0 WHIRLPOOL 1aa5cd65ee363fed5f1f59284d0ebd6ac84f375640f7873b8a5f1e6d095659a8b7d3bf72fa81c48a9e229486b00c775d8990b5a15eff1b4194b945e2fda61717
+EBUILD ikvm-0.46.0.2.ebuild 2941 SHA256 9919ac731dcab2821dd0eb798648b2928e7e33ba2dd4a891d9b188990bb36a6f SHA512 d1776d0d508d983d9c1dd215fcdf41427764860babdfb6f6511a0c07063f9fc1e0f63d5e3aa3fcbe0d62a573cf1e65491266c9ea518bb562515990358bdad4c7 WHIRLPOOL 3851d976468db275a61067aa3a3d731394bc5599386628ca1703b10bb55ee5b72fd02dce7dd9c3da5e9ef88384aa100d9b4141d5960f2e3f24022e87af95c583
+EBUILD ikvm-7.1.4532.2.ebuild 2867 SHA256 9583fadecabe1e15861d0650ffa872178ca4e8edf3bf318a7b634e0f4ffea7ab SHA512 f7573d4f00b643db6093682f8a8963fc2a4434378f069ff316579707fa1d123b4810c89296fd697d8cf2eac0a3378fe15c0363b3839185346581707881e4d5eb WHIRLPOOL d379e4198ef043657e4aecbb4bc0eb56be5b751be3f5ffcf6e94f24a62aabf82edf8f968bd7315a7af61b34ede158b1d79e9181fcf8ab0523ef8d02b02648fb6
+MISC ChangeLog 7200 SHA256 692c7d8c4fb0bae64c793095c343da520f8021af910fa073f20074f17a80a055 SHA512 f59c17af13d003e1ae548fa0a3cbdaa5b07ea2a1a818f6a23222216f20c538956cd30741efac590bd8670dd0e8a704c1e670955a0f369849cbd65d46c144104e WHIRLPOOL e79c066556fc9eef6ad7a72078c1fc8920dc456d1631ba4711e4bd97c2f3e2d2c39e360a1055161f9c2f530861e5e81e66b88702658d00e7938386afb5b85505
MISC metadata.xml 160 SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687 SHA512 087fcbf85988f071b9ce3491d0b6e1a767758e970950ef4247759ef48bcc4335c973dcc53b69fd712ac7e9704614878506fa342ba09edcf1c067e9ee478f94d7 WHIRLPOOL 65533bc6b7e60c26732efd476ed2c3aa0938bbea25140b8402ab2e05f0ac34c7a6d838ed7af763b2ec0a34317fcd8baf814f7c7ea8718ca5901160083d9525b8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlAKgKUACgkQCaWpQKGI+9RwXQCfbKBdzp3scjLctQaIvTkRGZbF
-JJUAn2yihtls8TQf9egn7pr5vXrO4qRK
-=vH8A
+iEYEAREIAAYFAlAK1d4ACgkQCaWpQKGI+9QikQCcDWB7BPNii9XQ6zdRM9pbstwl
+ScoAmwXfDfLrH87HC0m8P2ZQvC0W19Ch
+=qYYw
-----END PGP SIGNATURE-----
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() {