summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2013-01-13 16:53:11 +0000
committerRalph Sennhauser <sera@gentoo.org>2013-01-13 16:53:11 +0000
commit17ef7afc5cbc67ce9f258ce25e46cc34e0eb58d4 (patch)
treefc1f5e618d0fd0d59698924474ee2902d2e16735 /dev-java
parentAdd dbus[X] to dependencies for tests, bug #402461. Does not really affect de... (diff)
downloadhistorical-17ef7afc5cbc67ce9f258ce25e46cc34e0eb58d4.tar.gz
historical-17ef7afc5cbc67ce9f258ce25e46cc34e0eb58d4.tar.bz2
historical-17ef7afc5cbc67ce9f258ce25e46cc34e0eb58d4.zip
Make vm env file Prefix aware. #445350
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64 Manifest-Sign-Key: 0x3C5CF75A
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/gcj-jdk/ChangeLog7
-rw-r--r--dev-java/gcj-jdk/Manifest18
-rw-r--r--dev-java/gcj-jdk/files/gcj-jdk.env10
3 files changed, 19 insertions, 16 deletions
diff --git a/dev-java/gcj-jdk/ChangeLog b/dev-java/gcj-jdk/ChangeLog
index 379296b071ae..f0e4a32a1923 100644
--- a/dev-java/gcj-jdk/ChangeLog
+++ b/dev-java/gcj-jdk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/gcj-jdk
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.9 2012/10/23 19:28:58 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/ChangeLog,v 1.10 2013/01/13 16:53:02 sera Exp $
+
+ 13 Jan 2013; Ralph Sennhauser <sera@gentoo.org> files/gcj-jdk.env:
+ Make vm env file Prefix aware. #445350
*gcj-jdk-4.6.3-r2 (23 Oct 2012)
*gcj-jdk-4.5.4 (23 Oct 2012)
diff --git a/dev-java/gcj-jdk/Manifest b/dev-java/gcj-jdk/Manifest
index 02f31619366d..95f3449cdba3 100644
--- a/dev-java/gcj-jdk/Manifest
+++ b/dev-java/gcj-jdk/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX gcj-jdk.env 624 SHA256 e5236f2d09c1cee14171de780f303007cfa9b4febaf3eafb98f01dfeeedbc6bd SHA512 62652e68cff8ed80750ef38d15f5a5d1d1299ab0e55fccb7cfd9e90c1bbea056128e89138b81f286fd6227afd1b8ffc741d5b9a2cf5ba42d95d7981d5a4d9073 WHIRLPOOL b08c0eddd4bcad5e8e6cf0a47037fb137845dbf0aec333d093ee0d041d47216d20b26ecee55676bd96ce4e3093b90e679fe93d60d29a051a8940ca042dca0f4c
+AUX gcj-jdk.env 676 SHA256 d8c8aab55aebe15dd783e273b857da4042d5041f32d31277180b619a9715be68 SHA512 b843774ee68f82f2379fb01a7f5b482993d13cd01cefefee7dcd50292555ff2b459c81ae0c30a5837a145ed559adb62c57811790cfed6c245c37ed395ca1579a WHIRLPOOL 414b00a70a95d13a8b733c0168bb18c95487c553b76c5dff7056883e1e6d9bc23bb3dd84330504805b01930a60e05ef85a63141491203667299f0f9e268e3134
EBUILD gcj-jdk-4.4.4-r1.ebuild 3731 SHA256 a4840e90e9cb57284dc46c9166030ab6160fa510e5513db35000a41b2f226430 SHA512 da8b2092f604e37c83f8b08ec79a7820f952a59b07fc7789400696c223a9ac8ff55949ba579832cd54fddf7b1067e62cbb24a65c7557023c9fdac941fc7b2da7 WHIRLPOOL 5466fd5ea77ff7d8a4312ce0f782225952f22d455825314b4c4c3e1fcd98af7f64b897169e1df7afb0c9f9bd3770d3f1a79c053e883455e33f98fdf4546b714e
EBUILD gcj-jdk-4.4.5-r1.ebuild 3731 SHA256 1f8c673e4ab37d313c808cc26a4beead4da8c903c5d27479c0c7093eb284be2d SHA512 695aea351a792f061b5b1bd4e6a48c1d78b6aebaa207c67cbda68fa15ef2d1bfbb569f7aade1adb0389fa00fe4909f45bc5d616cf178cff9ed742a7f35420b41 WHIRLPOOL 3744f81f788e56932bc2ec2a0941703468debae46410008c2ea3e19840e937f40d9fdf8cc70948628ea0e466dec58ff5c7a27fe14a4550a63bab8f37f92ac510
EBUILD gcj-jdk-4.4.6.ebuild 3728 SHA256 bde8e11a1e6942f53de2949c041ab7775fb8abc19882bf3aedbe818e95c923e8 SHA512 2b3790258c9ab8e0bc692c1f6a10671f18b68d3064b1ba016c1b377626647b9c76f84522748e8cecad854f11b8fbe781162383c131626c4782afc028bc3888b6 WHIRLPOOL 5a8a5780335239c0d3e0b46b996b1659edfdfbffb0296eb51fb7565498fbfa02a07f8eb7fc88f014f9fa24d1f03932596038224db63b1dc24e9e72c7e63241da
@@ -15,16 +15,16 @@ EBUILD gcj-jdk-4.6.2-r1.ebuild 3814 SHA256 52f887c8a0f28f2d9504b809d987dcfb007f7
EBUILD gcj-jdk-4.6.3-r1.ebuild 3762 SHA256 f52f0b5bf3fd1df89842f6a7089e24fd654c819f5b2dbb32b1637270604a04b1 SHA512 f9c370cb10889efbc4c722df7abe40710b48ab2c585b75fc3b85c0dc06aa33ffe0084ba35120fead5528b0d73f8b94e95c7731e505cdeafd077201154c73a2df WHIRLPOOL 201087bd2d610124a32af83aece6b8ad7d230238e19bc89fd69e62635cca71e4c9dd6b6d8c49ca8b49f00f920c3a4ccd80bd0efc3aaaf3e72c618baf92050076
EBUILD gcj-jdk-4.6.3-r2.ebuild 3418 SHA256 83f62d076d09d027b1507e1138a6d0147b78c86974bc2e61eede0030e3f0c588 SHA512 43e64a693753314a2b33032c117a59b5ac9e9e3bb71ec3ee4d71c90ab61dabaa14a7992e411ca1bca629443891f6b327dfd3a4e6064910984f220c508f04d789 WHIRLPOOL db2842c368f04df2c424f1f23d71d831474f59ed17bba469cda78f61152661950762933d885e4eebeb263f1cd6acdf228555a80df68592ac48123cba08c2f7b7
EBUILD gcj-jdk-4.6.3.ebuild 3820 SHA256 27b45809157c0055ce6418c103905f412c7c5dd2f70e6b24cf0b5906fcb44bfa SHA512 15e43819132880317a718215eefb9fe26a102c632886fe27bb353ddbd153ecdcb13c9825c56b71f2112be0e53552a95e4b9d790124aa80c17bae5c703411527b WHIRLPOOL dd09140b44bc2c296aacf01db431b338a9654b1acec1a2e5884ca5e6b2cc93dc5dc9180db7fc24ec57234abf5bd3288d039de9d2e04e621e667f7bcd2f3a3bbd
-MISC ChangeLog 2682 SHA256 6d649935b3e38b345687398a7445e00a027da9c38f211c64d754c25cc5f0c866 SHA512 e5da6562af279f3292c41c4a0f78380c518a07c5e5f584aa7092bff858ddb2960549e847d714b0f6e726a3b69870e31c2d7fc80ce5e6162739e4c3f29a3d3a31 WHIRLPOOL b01de0b68b8fde6a88c92239b960d53ac7f86ad732c435010083558ea3bd84e5e41278a3dd1b2f914cca32ceef968f1557ec48b277914db07d27d332148a58ed
+MISC ChangeLog 2794 SHA256 b2c44885034eaa484086ca0db1c1f7ca9411e3938e22affe9d79ce87e99bbfbb SHA512 a2134da667bfccb800edb1f81ac8be8b48a69112fcfc08be833d43eca5d65fe2597ed41f7d869c4ad5e8ffac5acf152db767cfa979c0e8a2df20df87c39b1e20 WHIRLPOOL 8c8d8c0a8a894d654867dea0b136f5823521622cdc089c2970f3fdb7d1b10cec70b827ee51789aaf8597ca182e04890d555d8bdcd92397c91b52dad6331d0e1b
MISC metadata.xml 389 SHA256 a1a04237211b0bac3c7d591a283c41bd4ee9afcb2304f85cf15a9436a66c724b SHA512 8214632729e5d93013b28af2aadaa324b6fb14b7cae83816dee1fe612537e58150080df0ae940237d65f8e08e6df01b4eb281a2d4af9002f8e2a5db1aa715b5c WHIRLPOOL 52aca940bef6aa74d862f2ca3704afb79983cfbd4d33d7384f362548e0d7b1f8a1c9cdacd4bbe58f24d31e3938ff67af48bec88f9ecadc92a7a083da9798c314
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQhvAJAAoJEIUJ+svaV163yKkH/3uQ0QirH4B6mDSqG+sQONm1
-bDtJexNlCZ095yApHLiU3BdnEY3Dk4+kKiQlxqjeu/8OfR5fICj2BMBOLg0l+l0j
-Zjhb3zU5MLMmuyVZTOv19GuXCtUqkTJID0A6jdqo77HsA15RGrbioIS32p/hdOLx
-gSnO7W2V4pwide/S2Aui86HA1v9xpgr+cjPfkaCYFxl2K081QdQAZ9uDNArRfOrW
-o5T/dyAq0SSjhlhuWj9FLzu6H97UWsw5cjvNw158U3Dnf3ICaQygnW72OD5fk5ne
-n2xL5LTRqEWgjyR6CxR51siNqOK+JzdDJXcGYrXPW7f3snzW1th4z4R5nUV1MJo=
-=02Zx
+iQEcBAEBCAAGBQJQ8uczAAoJELjwI6Q8XPda0xoH/RsGiinaRC7QxiIH6cfaEr2c
+RFTCxtRxwwKsCCsIEV8BOWMGcLW9IuYuhS/3G304Xqhej0i/X5BZTeyAj46UmPnz
+SKvrWvJ2Vk3Nr4eCAmJhtBF1xpQlq43GT4OVAKXqLYM16G7V8egfU2W876/jPC64
+a+IuZh8Wrbkx70K79ZXKcgFF0gHQgBwDqo68H2/OcqL5ZLPMfZsFUlvCy8zM5phN
+tAb+I13sp994M81HVOiXWBGvMw9ovsZ1ZD0nxmtOUc8BIipGCMRu6JeluhxUcdwI
+8dtEgAUxEA1v5skxrIhVn4hGeEg/NjQzNxCucjuluR8UP4EXNCNoyhFw39vxqYc=
+=8uXV
-----END PGP SIGNATURE-----
diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env b/dev-java/gcj-jdk/files/gcj-jdk.env
index 96a0367ff6de..e8dfec7b067b 100644
--- a/dev-java/gcj-jdk/files/gcj-jdk.env
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/files/gcj-jdk.env,v 1.1 2010/11/14 01:04:18 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/files/gcj-jdk.env,v 1.2 2013/01/13 16:53:02 sera Exp $
VERSION="GCJ @PV@"
-JAVA_HOME=/usr/lib/@P@
-JDK_HOME=/usr/lib/@P@
-JAVAC=${JAVA_HOME}/bin/javac
+JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
+JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/usr/lib/@P@"
+JAVAC="${JAVA_HOME}/bin/javac"
PATH="${JAVA_HOME}/bin"
ROOTPATH="${JAVA_HOME}/bin"
LDPATH="${JAVA_HOME}/lib"