Use /usr/lib instead of get_libdir for the vmhome path, bug #380853.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index b0b5bbccd4153cb8b072582bb72a2bfc5b3b7c51..d3f460ac55f693ca58a9c6824c9cb2df30b00dba 100644 (file)
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.31 2011/07/22 09:02:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.32 2011/09/09 09:24:34 caster Exp $
+
+  09 Sep 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.2.ebuild,
+  icedtea-6.1.10.3.ebuild:
+  Use /usr/lib instead of get_libdir for the vmhome path, bug #380853.
 
 *icedtea-6.1.10.3 (22 Jul 2011)
 

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 7a9f5400e4f04572cba2b60fca9b009949119a3e..70d8142471b0d9831c54c3ca522e638eee7d2910 100644 (file)
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -11,7 +11,7 @@ DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
-EBUILD icedtea-6.1.10.2.ebuild 10675 RMD160 18babd39f2812d0a18323d0cda4a3212c1734470 SHA1 214b6f6ad0af4489480ed6562819bb389a1d2564 SHA256 f74714fe5c27aef821e1ee5b0fc0b4aa72d658a02780a0a0e638f5138b7c11cc
-EBUILD icedtea-6.1.10.3.ebuild 10578 RMD160 2686510b6a8dda68d42137e0e21720958d17c57c SHA1 1f0ddeb6b47aac5e76e986616b1772384c33467e SHA256 8d2003e60d7004c8c6487aa7e7e61d91d68f0b08a758b4a63403c4c36681337c
-MISC ChangeLog 6375 RMD160 82eaf0a9157bf7ea21a4d33ee2a67d666e22df2b SHA1 592723957898175f92b4a7fef844bd3b37d77cc0 SHA256 4c785320a01bac76e4543057dd8ffeb70b5b1ffd6a93eb7163e5ddd7daa88657
+EBUILD icedtea-6.1.10.2.ebuild 10752 RMD160 4ef55339dbefa16afe66c457d3321291b4a867e2 SHA1 37bdf0c1459bdabee7c5a43dc2289d60df40ec7c SHA256 c2de97f3d118644f028207362865b5cb86a934f00d2fa3075c5baef0a4db8558
+EBUILD icedtea-6.1.10.3.ebuild 10655 RMD160 cf34bf9341717ce9bdabef5057653daf6ac58fba SHA1 c308244aff56f27e8c42e1e90b582a6f32cb9674 SHA256 a73b0e93373ec979c5826c140f32e86ae2fc1d61c40fd822edcf5d924266a91e
+MISC ChangeLog 6550 RMD160 4278f16ed66a7e7df140001ff4dd69926911c870 SHA1 9ac55bc0a1b54a4cbdc5f320d91201cc9aac990e SHA256 191711a6a59572fb236826bf0a336afbcf29bd94f750344e58dcfbf8a39f2a73
 MISC metadata.xml 1631 RMD160 72e61e27b431b353472ca7c0469dc1adaab14971 SHA1 6010b4cfbf447ec6bfce758b42283f3e4d3ffb21 SHA256 dec15c576e0651a896199d0282487de83b2413779097ca4845cde4e85c0a92aa

diff --git a/dev-java/icedtea/icedtea-6.1.10.2.ebuild b/dev-java/icedtea/icedtea-6.1.10.2.ebuild
index ff674c79bbeda9b38b237c23289b25513b227e51..6b6eacc4e0521053d1141c0ab39d37fa154fb602 100644 (file)
--- a/dev-java/icedtea/icedtea-6.1.10.2.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.2.ebuild,v 1.2 2011/07/17 19:18:52 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.2.ebuild,v 1.3 2011/09/09 09:24:34 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -180,7 +180,8 @@ src_prepare() {
 src_configure() {
        local config procs rhino_jar
        local vm=$(java-pkg_get-current-vm)
-       local vmhome="/usr/$(get_libdir)/jvm/${vm}"
+       # the VM symlinks are installed specifically to /usr/lib (not get_libdir), bug 380853
+       local vmhome="/usr/lib/jvm/${vm}"
 
        # IcedTea6 can't be built using IcedTea7; its class files are too new
        if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then

diff --git a/dev-java/icedtea/icedtea-6.1.10.3.ebuild b/dev-java/icedtea/icedtea-6.1.10.3.ebuild
index 1142c8f45b56fe3f7385ff1fb57c331cd88b1f39..fc77d938ca0fe9a984fb6c1ed258e4cecd98e605 100644 (file)
--- a/dev-java/icedtea/icedtea-6.1.10.3.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.3.ebuild,v 1.1 2011/07/22 09:02:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.3.ebuild,v 1.2 2011/09/09 09:24:34 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -175,7 +175,8 @@ unset_vars() {
 src_configure() {
        local config procs rhino_jar
        local vm=$(java-pkg_get-current-vm)
-       local vmhome="/usr/$(get_libdir)/jvm/${vm}"
+       # the VM symlinks are installed specifically to /usr/lib (not get_libdir), bug 380853
+       local vmhome="/usr/lib/jvm/${vm}"
 
        # IcedTea6 can't be built using IcedTea7; its class files are too new
        if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then