diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2006-08-03 02:13:58 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2006-08-03 02:13:58 +0000 |
| commit | 2ce012cb1b4a20392e67023ca5e061bfeb4caa38 (patch) | |
| tree | 727b07ac403fd86b07c14205ac1a6479486e8a22 /dev-java/java-config/files | |
| parent | Added package.mask for shiny new java-configs (diff) | |
| download | historical-2ce012cb1b4a20392e67023ca5e061bfeb4caa38.tar.gz historical-2ce012cb1b4a20392e67023ca5e061bfeb4caa38.tar.bz2 historical-2ce012cb1b4a20392e67023ca5e061bfeb4caa38.zip | |
Version bumps. java-config-1 has been patched to read VMHANDLE from environment instead of JAVA_HOME. java-config-2 now installs a profile.d entry that sets JAVA_HOME appropriate, ie it is no longer set to generation-1 system vm. This is work towards bug #139889
Package-Manager: portage-2.1.1_pre4
Diffstat (limited to 'dev-java/java-config/files')
4 files changed, 56 insertions, 0 deletions
diff --git a/dev-java/java-config/files/digest-java-config-1.3.0-r3 b/dev-java/java-config/files/digest-java-config-1.3.0-r3 new file mode 100644 index 000000000000..55c0dd946ff4 --- /dev/null +++ b/dev-java/java-config/files/digest-java-config-1.3.0-r3 @@ -0,0 +1,3 @@ +MD5 9e9d61bf5b5b84be059e3efee6050bae java-config-1.3.0.tar.bz2 14287 +RMD160 f46ef41b9bb8ee5014cc1c870818db16d2e407de java-config-1.3.0.tar.bz2 14287 +SHA256 445aa68cbd34eb63122a9f339c275b97b06739d644c104a55371c2a16798b8a8 java-config-1.3.0.tar.bz2 14287 diff --git a/dev-java/java-config/files/digest-java-config-2.0.26-r6 b/dev-java/java-config/files/digest-java-config-2.0.26-r6 new file mode 100644 index 000000000000..56c0f4186bc9 --- /dev/null +++ b/dev-java/java-config/files/digest-java-config-2.0.26-r6 @@ -0,0 +1,3 @@ +MD5 60221d65176ceb2e2ef4edf7c1724ad0 java-config-2.0.26.tar.bz2 15298 +RMD160 9f6724af6c6d274c02171aab992e9165e5abc738 java-config-2.0.26.tar.bz2 15298 +SHA256 03e828568b5f965a59a2db57597d1b45e14ba8e89acca65d3082fb7ee4ef578c java-config-2.0.26.tar.bz2 15298 diff --git a/dev-java/java-config/files/java-config-1.3.0-JAVA_HOME.patch b/dev-java/java-config/files/java-config-1.3.0-JAVA_HOME.patch new file mode 100644 index 000000000000..fee8092c734b --- /dev/null +++ b/dev-java/java-config/files/java-config-1.3.0-JAVA_HOME.patch @@ -0,0 +1,38 @@ +Files java-config-1.3.0.vanilla/java_config/jc_exceptions.pyc and java-config-1.3.0/java_config/jc_exceptions.pyc differ +Files java-config-1.3.0.vanilla/java_config/jc_output.pyc and java-config-1.3.0/java_config/jc_output.pyc differ +diff -Nru java-config-1.3.0.vanilla/java_config/jc_util.py java-config-1.3.0/java_config/jc_util.py +--- java-config-1.3.0.vanilla/java_config/jc_util.py 2006-08-03 01:32:30.000000000 +0200 ++++ java-config-1.3.0/java_config/jc_util.py 2006-08-03 01:50:33.000000000 +0200 +@@ -66,8 +66,31 @@ + get_jvm_env_var.user_env_dir = os.path.join(env.get('HOME', 'THERE_IS_NO_HOME'), '.gentoo') + + def get_java_home(): ++ for f in os.listdir('/etc/env.d/java/'): ++ vmHandle = '' ++ try: ++ fh = open('/etc/env.d/java/' + f, 'r') ++ for line in fh.readlines(): ++ line = line.strip() ++ if line[0:8] == 'VMHANDLE': ++ vmHandle = line[10:-1] ++ break ++ fh.close() ++ except: ++ continue ++ if vmHandle == os.environ['VMHANDLE']: ++ try: ++ fh = open('/etc/env.d/java/' + f, 'r') ++ for line in fh.readlines(): ++ line = line.strip() ++ if line[0:9] == 'JAVA_HOME': ++ return line[10:] ++ break ++ fh.close() ++ except: ++ continue + +- return get_jvm_env_var ('JAVA_HOME') ++ return None + + + JAVA_HOME = get_java_home() diff --git a/dev-java/java-config/files/java-config-2.profiled b/dev-java/java-config/files/java-config-2.profiled new file mode 100644 index 000000000000..130ff8504507 --- /dev/null +++ b/dev-java/java-config/files/java-config-2.profiled @@ -0,0 +1,12 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled,v 1.1 2006/08/03 02:13:58 nichoj Exp $ + +# If we have a current-user-vm (and aren't root)... set it to JAVA_HOME +if [[ ${UID} != 0 && -L $HOME/.gentoo/java-config-2/current-user-vm ]]; then + export JAVA_HOME=$HOME/.gentoo/java-config-2/current-user-vm +# Otherwise set to the current system vm +elif [[ -L /etc/java-config-2/current-system-vm ]]; then + export JAVA_HOME=/etc/java-config-2/current-system-vm +fi +# |