commit: 1c3354bef155df476ccf6c2b557b2d353082ded1
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 08:31:00 2016 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 08:31:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=1c3354be
dev-java/java-config: sync with gx86
Package-Manager: portage-2.2.28-prefix
RepoMan-Options: --force
dev-java/java-config/Manifest | 2 -
.../files/java-config-1.3.7-prefix.patch | 136 ---------
.../files/java-config-2.1.11-prefix.patch | 315 ---------------------
.../files/java-config-2.1.11-python3.patch | 22 --
.../files/java-config-2.1.4-prefix.patch | 273 ------------------
.../files/java-config-2.1.6-portage-import.patch | 27 --
.../files/java-config-2.1.6-prefix.patch | 259 -----------------
.../files/java-config-2.1.7-prefix.patch | 272 ------------------
.../files/java-config-2.1.8-load_packages.patch | 13 -
.../files/java-config-2.1.8-prefix.patch | 250 ----------------
.../files/java-config-2.1.9-prefix.patch | 297 -------------------
dev-java/java-config/files/java-config-2.1.9.patch | 35 ---
.../java-config/files/python-abi-support.patch | 37 ---
dev-java/java-config/java-config-2.1.11.ebuild | 71 -----
dev-java/java-config/java-config-2.1.12-r1.ebuild | 69 -----
dev-java/java-config/java-config-2.2.0-r3.ebuild | 40 +++
dev-java/java-config/java-config-2.2.0.ebuild | 33 ---
dev-java/java-config/metadata.xml | 5 +-
18 files changed, 44 insertions(+), 2112 deletions(-)
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 9b95711..9db5c14 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,3 +1 @@
-DIST java-config-2.1.11.tar.bz2 60763 SHA256
ffc90aac716f6edc2f99f70e4947eab606e3a70dadb90328dedda16345796bbe SHA512
7a68e515f6cf15deac26c19589f9a7556084c5c29a8a65783a804f222da917f047118d2e80da93d045339549b21541a88ba9e4e97e7c9afb2238ade1c1c2d496
WHIRLPOOL
9be6a6fe87a95e4310a86d45f4798f89823fad9dd5ea35fe02c892f5400c4ba69bc6a3204dc1711f01f16166065855721c26f7eb71ebeef8243eb6f001a17305
-DIST java-config-2.1.12.tar.bz2 48925 SHA256
2bace29c276a9507260df505d27bdb9eeaac79e46a8ba615496ae91072b35460 SHA512
f694002baa5d4db3712b8ed9e8b15ba5f867159ea9d605ddaed93e7beb91fc98211c1431f6fcd4c3f10da88a396d73f2d85db0a5e4dca76f465b3a35a18f2a9d
WHIRLPOOL
fe117e36d5c1afb510f1ab696690ffcf4a5c601de8309c3b96e3e13ea72f9309bde371bd4a7c5b2d30464675557b5da33d7f73c5a391baaae41d342be24dcdc7
DIST java-config-2.2.0.tar.bz2 51851 SHA256
2cc47541714975099886156838f1f2c584b65e0cbc75ba2348cb18d9dec85fb7 SHA512
a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
WHIRLPOOL
1ded227dcdd7f248f9a8335b07bf006ebfefc8368dd400558d3ed7ca14e22da83ee052fc33d65bb784c61d573fa7fae6295be4d023ad7652ed4704997260316e
diff --git a/dev-java/java-config/files/java-config-1.3.7-prefix.patch
b/dev-java/java-config/files/java-config-1.3.7-prefix.patch
deleted file mode 100644
index aff30b1..0000000
--- a/dev-java/java-config/files/java-config-1.3.7-prefix.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- java-config~ 2007-09-24 16:22:14 +0200
-+++ java-config 2007-09-24 16:22:28 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2001-2005 Gentoo Foundation
-@@ -13,6 +13,7 @@
- import sys, getopt, os
- from java_config import jc_options
- from java_config.jc_output import *
-+from portage.const import rootuid
-
- __version__ = "$Revision: 1.44 $" [11:-2]
- __portage_version__ = "1.3.7"
-@@ -34,7 +35,7 @@
- try:
- cn = str(name).split('.')[1]
- if func.require_root:
-- if os.getuid() != 0:
-+ if os.getuid() != rootuid:
- raise jc_options.OptionRuntimeError(
- 'root access required'
- )
---- java_config.orig/jc_envgen.py 2006-09-21 03:57:05 +0200
-+++ java_config/jc_envgen.py 2008-01-13 11:12:40 +0100
-@@ -273,7 +273,7 @@
-
- class EnvFileOutput (EnvOutput):
-
-- def __init__ (self, config_file='20java', config_path='/etc/env.d'):
-+ def __init__ (self, config_file='20java',
config_path='@GENTOO_PORTAGE_EPREFIX@/etc/env.d'):
-
- try:
- self.configFile = open(os.path.join(config_path,
config_file), 'w')
---- java_config/jc_options.py~ 2006-09-21 03:57:05 +0200
-+++ java_config/jc_options.py 2007-09-24 16:34:37 +0200
-@@ -1,4 +1,4 @@
--#!/usr/sbin/env python2
-+#!/usr/bin/env python2
- # -*- coding: UTF-8 -*-
-
- # Author: Jason Mobarak
-@@ -402,15 +402,15 @@
- def __init__ (self):
-
- self.glob_pkg = os.path.join(
-- '/', 'usr', 'share', '*', 'package.env'
-+ '@GENTOO_PORTAGE_EPREFIX@', 'usr', 'share', '*', 'package.env'
- )
-
- self.glob_cp = os.path.join(
-- '/', 'usr', 'share', '*', 'classpath.env'
-+ '@GENTOO_PORTAGE_EPREFIX@', 'usr', 'share', '*',
'classpath.env'
- )
-
- self.glob_pkg_dir = os.path.join(
-- '/', 'usr', 'share', 'java', 'packages', '*'
-+ '@GENTOO_PORTAGE_EPREFIX@', 'usr', 'share', 'java',
'packages', '*'
- )
-
- def __call__(self, args):
-@@ -688,7 +688,7 @@
-
- else:
- try:
-- fn = os.path.join('/', 'etc', 'env.d',
'21java-classpath')
-+ fn = os.path.join("@GENTOO_PORTAGE_EPREFIX@",
'etc', 'env.d', '21java-classpath')
- fp = file(fn, 'w')
- except (OSError, IOError), e:
- raise OptionRuntimeError(
-@@ -721,7 +721,7 @@
- names = ('B:', 'add-system-classpath=')
- require_root = True
-
-- conf_file = os.path.join('/', 'etc', 'env.d', '21java-classpath')
-+ conf_file = os.path.join("@GENTOO_PORTAGE_EPREFIX@", 'etc', 'env.d',
'21java-classpath')
-
- def __call__(self, args):
- sys.stderr.write(red('Classpath operations are no longer
supported by java-config-1. Use java-config-2 instead\n'))
-@@ -774,7 +774,7 @@
- names = ('X', 'clean-system-classpath')
-
- require_root = True
-- env_file = '/etc/env.d/21java-classpath'
-+ env_file = '@GENTOO_PORTAGE_EPREFIX@/etc/env.d/21java-classpath'
-
- def __call__(self, args):
- sys.stderr.write(red('Classpath operations are no longer
supported by java-config-1. Use java-config-2 instead\n'))
---- java_config/jc_util.py~ 2007-09-24 16:37:58 +0200
-+++ java_config/jc_util.py 2007-09-24 16:37:48 +0200
-@@ -7,12 +7,12 @@
- import glob
- import sys
-
--sys.path.insert(0, '/usr/lib/portage/pym')
-+sys.path.insert(0, '@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym')
- from jc_output import *
- from jc_exceptions import OptionRuntimeError
-
- env = os.environ
--ENV_DIR = '/etc/env.d'
-+ENV_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/env.d'
-
- def warn (msg):
-
-@@ -53,7 +53,7 @@
- # Read VMHANDLE from /etc/env.d/20java
- p = re.compile('^' + name + '=\"?(.*?)\"?$')
- try:
-- fh = open('/etc/env.d/20java')
-+ fh = open(os.path.join(ENV_DIR, '20java'))
- for line in fh.readlines():
- line = line.strip()
- m = p.match(line)
-@@ -200,16 +200,16 @@
- return norm_cp(':'.join(classpath_list))
-
- collect_packages.cp_env = lambda pkg: os.path.join(
-- '/', 'usr', 'share', pkg, 'classpath.env'
-+ '@GENTOO_PORTAGE_EPREFIX@', 'usr', 'share', pkg, 'classpath.env'
- )
-
- collect_packages.pkg_env = lambda pkg: os.path.join(
-- '/', 'usr', 'share', pkg, 'package.env'
-+ '@GENTOO_PORTAGE_EPREFIX@', 'usr', 'share', pkg, 'package.env'
- )
-
- collect_packages.adl_pkgs = lambda pkg: glob.glob(
- os.path.join(
-- '/', 'usr', 'share', pkg, 'packages', '*'
-+ '@GENTOO_PORTAGE_EPREFIX@', 'usr', 'share', pkg, 'packages', '*'
- )
- )
-
diff --git a/dev-java/java-config/files/java-config-2.1.11-prefix.patch
b/dev-java/java-config/files/java-config-2.1.11-prefix.patch
deleted file mode 100644
index 83e42cd..0000000
--- a/dev-java/java-config/files/java-config-2.1.11-prefix.patch
+++ /dev/null
@@ -1,315 +0,0 @@
-diff -ur java-config-2.1.11.orig/config/20java-config
java-config-2.1.11/config/20java-config
---- java-config-2.1.11.orig/config/20java-config 2009-01-14
07:33:24.000000000 +0100
-+++ java-config-2.1.11/config/20java-config 2010-05-05 11:23:04.000000000
+0200
-@@ -1,2 +1,2 @@
--MANPATH=/etc/java-config/system-vm/man/
-+MANPATH="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config/system-vm/man/
- CONFIG_PROTECT_MASK="/etc/env.d/java/"
-diff -ur java-config-2.1.11.orig/man/java-config-2.1
java-config-2.1.11/man/java-config-2.1
---- java-config-2.1.11.orig/man/java-config-2.1 2009-01-14
07:33:25.000000000 +0100
-+++ java-config-2.1.11/man/java-config-2.1 2010-05-05 11:23:04.000000000
+0200
-@@ -71,7 +71,7 @@
- .TP
- \fB\-s <vm\-id> \-\-set\-user\-vm=<vm\-id>\fI
- Sets the user\-specific JVM by putting all necessary env vars into
--.I $HOME/.gentoo/java\-env .
-+.I $HOME/.gentoo@GENTOO_PORTAGE_EPREFIX@/java\-env .
- .TP
- \fB\-f \-\-show\-active\-vm\fI
- Show the JVM that's currently active, as set via \-\-set\-system\-vm or
\-\-set\-user\-vm.
-@@ -81,8 +81,8 @@
- .TP
- \fB\-a <pkg1>,<pkg2>,... \-\-set\-user\-classpath=<package1>,<package2>,...\fI
- Sets the user\-specific CLASSPATH by putting all necessary env vars into
--.I $HOME/.gentoo/java\-env\-classpath
--(sourced from $HOME/.gentoo/java\-env).
-+.I $HOME/.gentoo@GENTOO_PORTAGE_EPREFIX@/java\-env\-classpath
-+(sourced from $HOME/.gentoo@GENTOO_PORTAGE_EPREFIX@/java\-env).
- .TP
- \fB\-X \-\-clean\-system\-classpath\fI
- Cleans the system\-wide default classpath, leaving only vm needed jars
-@@ -92,7 +92,7 @@
- Cleans the user specific classpath that was specified by
- .I \-\-set\-user\-classpath
- by deleting
--.I $HOME/.gentoo/java\-env\-classpath .
-+.I $HOME/.gentoo@GENTOO_PORTAGE_EPREFIX@/java\-env\-classpath .
- .
- .TP
- \fB\-n \-\-nocolor\fI
-Only in java-config-2.1.11: prefix.patch
-diff -ur java-config-2.1.11.orig/setup.py java-config-2.1.11/setup.py
---- java-config-2.1.11.orig/setup.py 2010-04-28 22:51:04.000000000 +0200
-+++ java-config-2.1.11/setup.py 2010-05-05 11:23:04.000000000 +0200
-@@ -57,11 +57,11 @@
- ('share/pixmaps/', ['data/java-icon48.png']),
- ('share/java-config-2/launcher', ['src/launcher.bash']),
- ('share/eselect/modules', glob('src/eselect/*.eselect')),
-- ('/etc/java-config-2/', ['config/virtuals']),
-- ('/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-- ('/etc/env.d/',['config/20java-config']),
-- ('/etc/profile.d/', glob('src/profile.d/*')),
-- ('/etc/revdep-rebuild/', ['src/revdep-rebuild/60-java'])
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/',
['config/virtuals']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-+
('@GENTOO_PORTAGE_EPREFIX@/etc/env.d/',['config/20java-config']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/profile.d/',
glob('src/profile.d/*')),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/revdep-rebuild/',
['src/revdep-rebuild/60-java'])
- ]
- )
-
-diff -ur java-config-2.1.11.orig/src/depend-java-query
java-config-2.1.11/src/depend-java-query
---- java-config-2.1.11.orig/src/depend-java-query 2009-12-25
23:30:02.000000000 +0100
-+++ java-config-2.1.11/src/depend-java-query 2010-05-05 11:23:04.000000000
+0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-diff -ur java-config-2.1.11.orig/src/eselect/java-nsplugin.eselect
java-config-2.1.11/src/eselect/java-nsplugin.eselect
---- java-config-2.1.11.orig/src/eselect/java-nsplugin.eselect 2009-11-26
19:15:13.000000000 +0100
-+++ java-config-2.1.11/src/eselect/java-nsplugin.eselect 2010-05-05
11:23:04.000000000 +0200
-@@ -10,10 +10,10 @@
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-
--PLUGINS_HOME="${ROOT}/usr/share/java-config-2/nsplugin"
--SYSTEM_PLUGIN_DIR="${ROOT}/usr/lib/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_32="${ROOT}/usr/lib32/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_64="${ROOT}/usr/lib64/nsbrowser/plugins"
-+PLUGINS_HOME="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/nsplugin"
-+SYSTEM_PLUGIN_DIR="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_32="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib32/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_64="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib64/nsbrowser/plugins"
- SYSTEM_PLUGIN="${SYSTEM_PLUGIN_DIR}/javaplugin.so"
- SYSTEM_PLUGIN_32="${SYSTEM_PLUGIN_DIR_32}/javaplugin.so"
- SYSTEM_PLUGIN_64="${SYSTEM_PLUGIN_DIR_64}/javaplugin.so"
-diff -ur java-config-2.1.11.orig/src/eselect/java-vm.eselect
java-config-2.1.11/src/eselect/java-vm.eselect
---- java-config-2.1.11.orig/src/eselect/java-vm.eselect 2010-04-14
22:42:34.000000000 +0200
-+++ java-config-2.1.11/src/eselect/java-vm.eselect 2010-05-05
11:24:45.000000000 +0200
-@@ -9,10 +9,10 @@
- SVN_DATE='$Date: $'
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
--VM_BASE=/usr/lib/jvm/
--VM_SYSTEM="/etc/java-config-2/current-system-vm"
--VM_USER="${HOME}/.gentoo/java-config-2/current-user-vm"
--VM_CONFIG="/usr/share/java-config-2/vm"
-+VM_BASE="@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/"
-+VM_SYSTEM="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm"
-+VM_USER="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+VM_CONFIG="@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm"
-
- find_targets() {
- local f
-diff -ur java-config-2.1.11.orig/src/gjl java-config-2.1.11/src/gjl
---- java-config-2.1.11.orig/src/gjl 2009-12-25 23:30:09.000000000 +0100
-+++ java-config-2.1.11/src/gjl 2010-05-05 11:23:04.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-@@ -196,7 +196,7 @@
- envlp = os.getenv('LD_LIBRARY_PATH')
- envjlp = os.getenv('JAVA_LIBRARY_PATH')
-
-- newlibrary = '/lib:/usr/lib'
-+ newlibrary =
'@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib'
- if library:
- newlibrary = ':'.join((library, newlibrary))
- if envjlp:
-diff -ur java-config-2.1.11.orig/src/java-config-2
java-config-2.1.11/src/java-config-2
---- java-config-2.1.11.orig/src/java-config-2 2010-04-14 22:42:34.000000000
+0200
-+++ java-config-2.1.11/src/java-config-2 2010-05-05 11:23:04.000000000
+0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2006 Gentoo Foundation
-@@ -180,7 +180,8 @@
- if not vm:
- fatalError("Could not find a vm matching: %s" % value)
- else:
-- if os.getuid() is 0:
-+ # in prefix this check is disabled
-+ if True or os.getuid() is 0:
- try:
- manager.set_system_vm(vm)
- printer._print("Now using %s as your generation-2 system JVM"
% (vm) )
-@@ -219,13 +220,13 @@
- # Deprecated
- def system_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-- return [{'file': '/etc/env.d/21java-classpath', 'format': '%s=%s\n' }]
-+ return [{'file': '@GENTOO_PORTAGE_EPREFIX@/etc/env.d/21java-classpath',
'format': '%s=%s\n' }]
-
- def user_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
- return [
-- {'file': os.path.join(os.environ.get("HOME"),
'.gentoo/java-env-classpath'), 'format': 'export %s=%s\n' },
-- {'file': os.path.join(os.environ.get("HOME"),
'.gentoo/java-env-classpath.csh'), 'format': 'setenv %s %s\n' }
-+ {'file': os.path.join(os.environ.get("HOME"),
'.gentoo@GENTOO_PORTAGE_EPREFIX@/java-env-classpath'), 'format': 'export
%s=%s\n' },
-+ {'file': os.path.join(os.environ.get("HOME"),
'.gentoo@GENTOO_PORTAGE_EPREFIX@/java-env-classpath.csh'), 'format': 'setenv %s
%s\n' }
- ]
- # Deprecated
- def set_system_classpath(option, opt, value, parser):
-@@ -302,12 +303,12 @@
- fatalError("The vm could not be found")
-
- def update_env():
-- printer._print(getoutput("/usr/sbin/env-update"))
-+ printer._print(getoutput("@GENTOO_PORTAGE_EPREFIX@/usr/sbin/env-update"))
- printer._printAlert("If you want the changes too take effect in your
current session, you should update\n\
-- your environment by running: source /etc/profile")
-+ your environment by running: source
@GENTOO_PORTAGE_EPREFIX@/etc/profile")
-
- def user_update_env():
-- printer._printAlert("Environment files in ~/.gentoo/ have been updated.
You should source these from your shell's profile.\n\
-+ printer._printAlert("Environment files in
~/.gentoo@GENTOO_PORTAGE_EPREFIX@/ have been updated. You should source these
from your shell's profile.\n\
- If you want the changes too take effect in your current sessiosn,
you should resource these files")
-
- def deprecation_notice():
-diff -ur java-config-2.1.11.orig/src/java_config_2/EnvironmentManager.py
java-config-2.1.11/src/java_config_2/EnvironmentManager.py
---- java-config-2.1.11.orig/src/java_config_2/EnvironmentManager.py
2010-04-28 00:01:58.000000000 +0200
-+++ java-config-2.1.11/src/java_config_2/EnvironmentManager.py 2010-05-05
11:23:04.000000000 +0200
-@@ -23,12 +23,12 @@
- active = None
-
- # Location of the vm ev files
-- vms_path = '/usr/share/java-config-2/vm'
-+ vms_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm'
- # Location of the package env files to load
-- pkg_path = '/usr/share/%s/package.env'
-- virtual_path = '/usr/share/java-config-2/virtuals/'
-+ pkg_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/%s/package.env'
-+ virtual_path =
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/virtuals/'
-
-- system_config_path="/etc/java-config-2/"
-+ system_config_path="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/"
-
- def __init__(self):
- self.all_packages_loaded = False
-@@ -246,7 +246,7 @@
- elif os.path.exists(target):
- raise InvalidConfigError(target)
-
-- os.symlink('/usr/lib/jvm/'+vm.name(),target)
-+ os.symlink('@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/'+vm.name(),target)
-
- def vm_links(self):
- # Don't try to use user-vm if HOME is undefined
-@@ -256,10 +256,10 @@
- return [ self.user_vm_link(), self.system_vm_link() ]
-
- def user_vm_link(self):
-- return os.path.join(os.environ.get('HOME'),
'.gentoo/java-config-2/current-user-vm')
-+ return os.path.join(os.environ.get('HOME'),
'.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm')
-
- def system_vm_link(self):
-- return '/etc/java-config-2/current-system-vm'
-+ return '@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm'
-
- def system_vm_name(self):
- link = self.system_vm_link()
-diff -ur java-config-2.1.11.orig/src/java_config_2/VersionManager.py
java-config-2.1.11/src/java_config_2/VersionManager.py
---- java-config-2.1.11.orig/src/java_config_2/VersionManager.py
2010-04-22 22:25:02.000000000 +0200
-+++ java-config-2.1.11/src/java_config_2/VersionManager.py 2010-05-05
11:26:39.000000000 +0200
-@@ -5,7 +5,7 @@
- # $Header: $
-
- import sys
--sys.path.append("/usr/lib/portage/pym")
-+sys.path.append("@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym")
-
- import re
-
-@@ -54,8 +54,8 @@
- atom_parser = re.compile(r"([<>=]*)virtual/(jre|jdk)[-:]([0-9\.*]+)")
- virtuals_parser = re.compile(r"([<>=~]+)?java-virtuals/([\w\-\.:]+)")
- package_parser = re.compile(r"([\w\-]+)/([\w\-]+)(?:\:(\d+))?")
-- user_pref_file = '/etc/java-config-2/build/jdk.conf'
-- default_pref_file = '/usr/share/java-config-2/config/jdk-defaults.conf'
-+ user_pref_file =
'@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/jdk.conf'
-+ default_pref_file =
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/config/jdk-defaults.conf'
- _prefs = None
-
- def __init__(self):
-diff -ur java-config-2.1.11.orig/src/launcher.bash
java-config-2.1.11/src/launcher.bash
---- java-config-2.1.11.orig/src/launcher.bash 2009-01-14 07:33:25.000000000
+0100
-+++ java-config-2.1.11/src/launcher.bash 2010-05-05 11:23:04.000000000
+0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # Not-so-elegant? patches more then welcome
-
- abort() {
-@@ -8,8 +8,8 @@
-
- # Source package env
- # ---------------------
--gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}"
--gjl_system_env="/etc/java-config-2/launcher.d/${gjl_package}"
-+gjl_user_env="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/launcher.d/${gjl_package}"
-+gjl_system_env="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/launcher.d/${gjl_package}"
- if [[ -f "${gjl_user_env}" ]]; then
- source "${gjl_user_env}"
- elif [[ -f "${gjl_system_env}" ]]; then
-diff -ur java-config-2.1.11.orig/src/profile.d/java-config-2.csh
java-config-2.1.11/src/profile.d/java-config-2.csh
---- java-config-2.1.11.orig/src/profile.d/java-config-2.csh 2009-01-14
07:33:25.000000000 +0100
-+++ java-config-2.1.11/src/profile.d/java-config-2.csh 2010-05-05
11:23:04.000000000 +0200
-@@ -2,8 +2,8 @@
- # 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.csh,v
1.3 2007/01/13 17:17:08 grobian Exp $
-
--set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm"
--set gentoo_system_vm = "/etc/java-config-2/current-system-vm"
-+set gentoo_user_vm =
"${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+set gentoo_system_vm =
"@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- ## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
- ## Otherwise set to the current system vm
-diff -ur java-config-2.1.11.orig/src/profile.d/java-config-2.sh
java-config-2.1.11/src/profile.d/java-config-2.sh
---- java-config-2.1.11.orig/src/profile.d/java-config-2.sh 2009-01-14
07:33:25.000000000 +0100
-+++ java-config-2.1.11/src/profile.d/java-config-2.sh 2010-05-05
11:23:04.000000000 +0200
-@@ -3,8 +3,8 @@
- # $Header:
/var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.sh-r1,v
1.1 2007/03/16 11:13:16 betelgeuse Exp $
-
- # If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
--gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--gentoo_system_vm="/etc/java-config-2/current-system-vm"
-+gentoo_user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+gentoo_system_vm="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- # Please make sure that this script is POSIX compliant
- # See https://bugs.gentoo.org/show_bug.cgi?id=169925
-@@ -23,7 +23,7 @@
- if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
- export JAVA_HOME=${gentoo_user_vm}
- # Otherwise set to the current system vm
--elif [ -L /etc/java-config-2/current-system-vm ]; then
-+elif [ -L "@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm ];
then
- export JAVA_HOME=${gentoo_system_vm}
- fi
-
-diff -ur java-config-2.1.11.orig/src/run-java-tool
java-config-2.1.11/src/run-java-tool
---- java-config-2.1.11.orig/src/run-java-tool 2009-01-14 07:33:25.000000000
+0100
-+++ java-config-2.1.11/src/run-java-tool 2010-05-05 11:23:04.000000000
+0200
-@@ -1,10 +1,10 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-
--user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--system_vm="/etc/java-config-2/current-system-vm"
-+user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+system_vm="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm"
- # Try GENTOO_VM
- if [[ -n ${GENTOO_VM} ]]; then
-- vmpath="/usr/lib/jvm/${GENTOO_VM}/"
-+ vmpath="@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/${GENTOO_VM}/"
- # Then user VM
- elif [[ -h ${user_vm} ]]; then
- vmpath=$(readlink ${user_vm})
diff --git a/dev-java/java-config/files/java-config-2.1.11-python3.patch
b/dev-java/java-config/files/java-config-2.1.11-python3.patch
deleted file mode 100644
index bbf56df..0000000
--- a/dev-java/java-config/files/java-config-2.1.11-python3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://overlays.gentoo.org/proj/java/changeset/8184
-
---- src/gjl
-+++ src/gjl
-@@ -23,7 +23,7 @@
-
- #Depreciated.
- def get_needed_target(pkg):
-- highest_target = None
-+ highest_target = ""
- needs_jdk = False
- for pkg in get_needed_packages(pkg):
- pkg_needs_jdk = False
-@@ -43,7 +43,7 @@
- return highest_target, needs_jdk
-
- def get_needed_target2(pkg):
-- highest_target = None
-+ highest_target = ""
- needs_jdk = set()
- for pkg in get_needed_packages(pkg):
- target = pkg.target()
diff --git a/dev-java/java-config/files/java-config-2.1.4-prefix.patch
b/dev-java/java-config/files/java-config-2.1.4-prefix.patch
deleted file mode 100644
index 4a66bb8..0000000
--- a/dev-java/java-config/files/java-config-2.1.4-prefix.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-diff -ur java-config-2.1.2.orig/config/20java-config
java-config-2.1.2/config/20java-config
---- java-config-2.1.2.orig/config/20java-config 2007-11-19 21:55:09
+0100
-+++ java-config-2.1.2/config/20java-config 2007-11-19 21:58:04 +0100
-@@ -1,2 +1,2 @@
--MANPATH=/etc/java-config/system-vm/man/
-+MANPATH="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config/system-vm/man/
- CONFIG_PROTECT_MASK="/etc/env.d/java/"
-Only in java-config-2.1.2: prefix.patch
-diff -ur java-config-2.1.2.orig/setup.py java-config-2.1.2/setup.py
---- java-config-2.1.2.orig/setup.py 2007-11-19 21:55:09 +0100
-+++ java-config-2.1.2/setup.py 2007-11-19 21:57:20 +0100
-@@ -50,11 +50,11 @@
- ('share/man/man1', ['man/java-config-2.1']),
- ('share/java-config-2/launcher', ['src/launcher.bash']),
- ('share/eselect/modules', glob('src/eselect/*.eselect')),
-- ('/etc/java-config-2/', ['config/virtuals']),
-- ('/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-- ('/etc/env.d/',['config/20java-config']),
-- ('/etc/profile.d/', glob('src/profile.d/*')),
-- ('/etc/revdep-rebuild/', ['src/revdep-rebuild/60-java'])
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/',
['config/virtuals']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-+
('@GENTOO_PORTAGE_EPREFIX@/etc/env.d/',['config/20java-config']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/profile.d/',
glob('src/profile.d/*')),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/revdep-rebuild/',
['src/revdep-rebuild/60-java'])
- ]
- )
-
-diff -ur java-config-2.1.2.orig/src/depend-java-query
java-config-2.1.2/src/depend-java-query
---- java-config-2.1.2.orig/src/depend-java-query 2007-11-19 21:55:09
+0100
-+++ java-config-2.1.2/src/depend-java-query 2007-11-19 21:59:24 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-diff -ur java-config-2.1.2.orig/src/eselect/java-nsplugin.eselect
java-config-2.1.2/src/eselect/java-nsplugin.eselect
---- java-config-2.1.2.orig/src/eselect/java-nsplugin.eselect 2007-11-19
21:55:09 +0100
-+++ java-config-2.1.2/src/eselect/java-nsplugin.eselect 2007-11-19
21:57:20 +0100
-@@ -10,10 +10,10 @@
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-
--PLUGINS_HOME="${ROOT}/usr/share/java-config-2/nsplugin"
--SYSTEM_PLUGIN_DIR="${ROOT}/usr/lib/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_32="${ROOT}/usr/lib32/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_64="${ROOT}/usr/lib64/nsbrowser/plugins"
-+PLUGINS_HOME="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/nsplugin"
-+SYSTEM_PLUGIN_DIR="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_32="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib32/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_64="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib64/nsbrowser/plugins"
- SYSTEM_PLUGIN="${SYSTEM_PLUGIN_DIR}/javaplugin.so"
- SYSTEM_PLUGIN_32="${SYSTEM_PLUGIN_DIR_32}/javaplugin.so"
- SYSTEM_PLUGIN_64="${SYSTEM_PLUGIN_DIR_64}/javaplugin.so"
-diff -ur java-config-2.1.2.orig/src/eselect/java-vm.eselect
java-config-2.1.2/src/eselect/java-vm.eselect
---- java-config-2.1.2.orig/src/eselect/java-vm.eselect 2007-11-19 21:55:09
+0100
-+++ java-config-2.1.2/src/eselect/java-vm.eselect 2007-11-19 21:57:20
+0100
-@@ -9,8 +9,8 @@
- SVN_DATE='$Date: $'
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
--VM_BASE=/usr/lib/jvm/
--VM_SYSTEM="/etc/java-config-2/current-system-vm"
-+VM_BASE="@GENTOO_PORTAGE_EPREFIX@"/usr/lib/jvm/
-+VM_SYSTEM="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
- VM_USER="${HOME}/.gentoo/java-config-2/current-user-vm"
-
- find_targets() {
-diff -ur java-config-2.1.2.orig/src/gjl java-config-2.1.2/src/gjl
---- java-config-2.1.2.orig/src/gjl 2007-11-19 21:55:09 +0100
-+++ java-config-2.1.2/src/gjl 2007-11-19 21:59:57 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-@@ -123,7 +123,7 @@
- envlp = os.getenv('LD_LIBRARY_PATH')
- envjlp = os.getenv('JAVA_LIBRARY_PATH')
-
-- newlibrary = '/lib:/usr/lib'
-+ newlibrary =
'@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib'
- if library:
- newlibrary = ':'.join((library, newlibrary))
- if envjlp:
-diff -ur java-config-2.1.2.orig/src/java-config-2
java-config-2.1.2/src/java-config-2
---- java-config-2.1.2.orig/src/java-config-2 2007-11-19 21:55:09 +0100
-+++ java-config-2.1.2/src/java-config-2 2007-11-19 22:00:29 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2006 Gentoo Foundation
-@@ -143,7 +143,8 @@
- if not vm:
- fatalError("Could not find a vm matching: %s" % value)
- else:
-- if os.getuid() is 0:
-+ # in prefix this check is disabled
-+ if True or os.getuid() is 0:
- try:
- manager.set_system_vm(vm)
- printer._print("Now using %s as your generation-2 system JVM"
% (vm) )
-@@ -176,7 +176,7 @@
- # Deprecated
- def system_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-- return [{'file': '/etc/env.d/21java-classpath', 'format': '%s=%s\n' }]
-+ return [{'file': '@GENTOO_PORTAGE_EPREFIX@/etc/env.d/21java-classpath',
'format': '%s=%s\n' }]
-
- def user_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-@@ -259,7 +259,7 @@
- fatalError("The vm could not be found")
-
- def update_env():
-- printer._print(getoutput("/usr/sbin/env-update"))
-+ printer._print(getoutput("@GENTOO_PORTAGE_EPREFIX@/usr/sbin/env-update"))
- printer._printAlert("If you want the changes too take effect in your
current session, you should update\n\
- your environment by running: source /etc/profile")
-
-diff -ur java-config-2.1.2.orig/src/java_config_2/EnvironmentManager.py
java-config-2.1.2/src/java_config_2/EnvironmentManager.py
---- java-config-2.1.2.orig/src/java_config_2/EnvironmentManager.py
2007-11-19 21:55:09 +0100
-+++ java-config-2.1.2/src/java_config_2/EnvironmentManager.py 2007-11-19
21:57:39 +0100
-@@ -24,12 +24,12 @@
- active = None
-
- # Location of the vm ev files
-- vms_path = '/usr/share/java-config-2/vm'
-+ vms_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm'
- # Location of the package env files to load
-- pkg_path = '/usr/share/*/package.env'
-- virtual_path = '/usr/share/java-config-2/virtuals/'
-+ pkg_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/*/package.env'
-+ virtual_path =
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/virtuals/'
-
-- system_config_path="/etc/java-config-2/"
-+ system_config_path="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/"
-
- def __init__(self):
- try:
-@@ -68,7 +68,7 @@
- def load_package(self, name):
- try:
- name = name.replace(':', '-')
-- pkg = Package(name, '/usr/share/' + name + '/package.env')
-+ pkg = Package(name, '@GENTOO_PORTAGE_EPREFIX@/usr/share/' + name
+ '/package.env')
- self.packages[name] = pkg
- return pkg
- except InvalidConfigError:
-@@ -227,7 +227,7 @@
- elif os.path.exists(target):
- raise InvalidConfigError(target)
-
-- os.symlink('/usr/lib/jvm/'+vm.name(),target)
-+ os.symlink('@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/'+vm.name(),target)
-
- def vm_links(self):
- # Don't try to use user-vm if HOME is undefined
-@@ -240,7 +240,7 @@
- return os.path.join(os.environ.get('HOME'),
'.gentoo/java-config-2/current-user-vm')
-
- def system_vm_link(self):
-- return '/etc/java-config-2/current-system-vm'
-+ return '@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm'
-
- def clean_classpath(self, targets):
- for target in targets:
-Only in java-config-2.1.2/src/java_config_2: EnvironmentManager.py.orig
-diff -ur java-config-2.1.2.orig/src/java_config_2/VM.py
java-config-2.1.2/src/java_config_2/VM.py
---- java-config-2.1.2.orig/src/java_config_2/VM.py 2007-10-11 12:54:22
+0200
-+++ java-config-2.1.2/src/java_config_2/VM.py 2007-11-19 21:57:51 +0100
-@@ -44,7 +44,7 @@
-
- def name(self):
- # TODO: MAKE THIS MODULAR!a (compnerd)
-- return self.file.split("/usr/share/java-config-2/vm/")[-1]
-+ return
self.file.split("@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm/")[-1]
-
- def is_jre(self):
- return self.is_type("JRE")
-diff -ur java-config-2.1.2.orig/src/java_config_2/VersionManager.py
java-config-2.1.2/src/java_config_2/VersionManager.py
---- java-config-2.1.2.orig/src/java_config_2/VersionManager.py 2007-10-12
08:26:11 +0200
-+++ java-config-2.1.2/src/java_config_2/VersionManager.py 2007-11-19
21:58:04 +0100
-@@ -5,7 +5,7 @@
- # $Header: $
-
- import sys
--sys.path.append("/usr/lib/portage/pym")
-+sys.path.append("@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym")
-
- import re
- from string import upper
-@@ -28,7 +28,7 @@
- #virtuals_parser = re.compile(r"([<>=]+)?java-virtuals/(.*?)")
- #virtuals_parser =
re.compile(r"([<>=~]+)?java-virtuals/(.+)[\-:]([0-9\.*]+)")
- virtuals_parser = re.compile(r"([<>=~]+)?java-virtuals/([\w\-\.:]+)")
-- pref_files = ['/etc/java-config-2/build/jdk.conf',
'/usr/share/java-config-2/config/jdk-defaults.conf']
-+ pref_files =
['@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/jdk.conf',
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/config/jdk-defaults.conf']
- _prefs = None
-
- def __init__(self):
-diff -ur java-config-2.1.2.orig/src/launcher.bash
java-config-2.1.2/src/launcher.bash
---- java-config-2.1.2.orig/src/launcher.bash 2007-11-19 21:55:09 +0100
-+++ java-config-2.1.2/src/launcher.bash 2007-11-19 21:57:20 +0100
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # Not-so-elegant? patches more then welcome
-
- abort() {
-@@ -9,7 +9,7 @@
- # Source package env
- # ---------------------
- gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}"
--gjl_system_env="/etc/java-config-2/launcher.d/${gjl_package}"
-+gjl_system_env="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/launcher.d/${gjl_package}"
- if [[ -f "${gjl_user_env}" ]]; then
- source "${gjl_user_env}"
- elif [[ -f "${gjl_system_env}" ]]; then
-diff -ur java-config-2.1.2.orig/src/profile.d/java-config-2.csh
java-config-2.1.2/src/profile.d/java-config-2.csh
---- java-config-2.1.2.orig/src/profile.d/java-config-2.csh 2007-11-19
21:55:09 +0100
-+++ java-config-2.1.2/src/profile.d/java-config-2.csh 2007-11-19 21:57:20
+0100
-@@ -3,7 +3,7 @@
- # $Header:
/var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.csh,v
1.3 2007/01/13 17:17:08 grobian Exp $
-
- set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm"
--set gentoo_system_vm = "/etc/java-config-2/current-system-vm"
-+set gentoo_system_vm =
"@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- ## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
- ## Otherwise set to the current system vm
-diff -ur java-config-2.1.2.orig/src/profile.d/java-config-2.sh
java-config-2.1.2/src/profile.d/java-config-2.sh
---- java-config-2.1.2.orig/src/profile.d/java-config-2.sh 2007-11-19
21:55:09 +0100
-+++ java-config-2.1.2/src/profile.d/java-config-2.sh 2007-11-19 21:57:20
+0100
-@@ -4,7 +4,7 @@
-
- # If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
- gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--gentoo_system_vm="/etc/java-config-2/current-system-vm"
-+gentoo_system_vm="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- # Please make sure that this script is POSIX compliant
- # See https://bugs.gentoo.org/show_bug.cgi?id=169925
-@@ -23,7 +23,7 @@
- if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
- export JAVA_HOME=${gentoo_user_vm}
- # Otherwise set to the current system vm
--elif [ -L /etc/java-config-2/current-system-vm ]; then
-+elif [ -L "@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm ];
then
- export JAVA_HOME=${gentoo_system_vm}
- fi
-
-diff -ur java-config-2.1.2.orig/src/run-java-tool
java-config-2.1.2/src/run-java-tool
---- java-config-2.1.2.orig/src/run-java-tool 2007-11-19 21:55:09 +0100
-+++ java-config-2.1.2/src/run-java-tool 2007-11-19 21:57:20 +0100
-@@ -1,10 +1,10 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-
- user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--system_vm="/etc/java-config-2/current-system-vm"
-+system_vm="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm"
- # Try GENTOO_VM
- if [[ -n ${GENTOO_VM} ]]; then
-- vmpath="/usr/lib/jvm/${GENTOO_VM}/"
-+ vmpath="@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/${GENTOO_VM}/"
- # Then user VM
- elif [[ -h ${user_vm} ]]; then
- vmpath=$(readlink ${user_vm})
diff --git a/dev-java/java-config/files/java-config-2.1.6-portage-import.patch
b/dev-java/java-config/files/java-config-2.1.6-portage-import.patch
deleted file mode 100644
index 0150927..0000000
--- a/dev-java/java-config/files/java-config-2.1.6-portage-import.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru --exclude .svn tags/2.1.6/src/eselect/java-nsplugin.eselect
trunk/src/eselect/java-nsplugin.eselect
---- tags/2.1.6/src/eselect/java-nsplugin.eselect 2008-04-28
02:58:44.000000000 +0300
-+++ trunk/src/eselect/java-nsplugin.eselect 2008-06-16 22:00:26.000000000
+0300
-@@ -68,7 +68,7 @@
- system_name=$(get_system_plugin_vm)
-
- for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
-- twaek_list_item ${targets[${i}]} ${system_name}
-+ tweak_list_item ${targets[${i}]} ${system_name}
- done
- }
-
-diff -ru --exclude .svn tags/2.1.6/src/java_config_2/VersionManager.py
trunk/src/java_config_2/VersionManager.py
---- tags/2.1.6/src/java_config_2/VersionManager.py 2008-04-28
02:58:44.000000000 +0300
-+++ trunk/src/java_config_2/VersionManager.py 2008-07-02 20:24:01.000000000
+0300
-@@ -71,7 +71,10 @@
- use = os.environ["USE"]
-
- # Local import to avoid initializing portage elsewhere
-- from portage_dep import use_reduce,paren_reduce
-+ try:
-+ from portage.dep import use_reduce,paren_reduce
-+ except ImportError:
-+ from portage_dep import use_reduce,paren_reduce
- from portage import flatten
-
- # Normalize white space for Portage
diff --git a/dev-java/java-config/files/java-config-2.1.6-prefix.patch
b/dev-java/java-config/files/java-config-2.1.6-prefix.patch
deleted file mode 100644
index 0403047..0000000
--- a/dev-java/java-config/files/java-config-2.1.6-prefix.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-diff -ur java-config-2.1.6.orig/config/20java-config
java-config-2.1.6/config/20java-config
---- java-config-2.1.6.orig/config/20java-config 2008-04-30 11:25:43
+0200
-+++ java-config-2.1.6/config/20java-config 2008-04-30 11:26:55 +0200
-@@ -1,2 +1,2 @@
--MANPATH=/etc/java-config/system-vm/man/
-+MANPATH="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config/system-vm/man/
- CONFIG_PROTECT_MASK="/etc/env.d/java/"
-diff -ur java-config-2.1.6.orig/setup.py java-config-2.1.6/setup.py
---- java-config-2.1.6.orig/setup.py 2008-04-30 11:25:43 +0200
-+++ java-config-2.1.6/setup.py 2008-04-30 11:26:55 +0200
-@@ -54,11 +54,11 @@
- ('share/pixmaps/', ['data/java-icon48.png']),
- ('share/java-config-2/launcher', ['src/launcher.bash']),
- ('share/eselect/modules', glob('src/eselect/*.eselect')),
-- ('/etc/java-config-2/', ['config/virtuals']),
-- ('/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-- ('/etc/env.d/',['config/20java-config']),
-- ('/etc/profile.d/', glob('src/profile.d/*')),
-- ('/etc/revdep-rebuild/', ['src/revdep-rebuild/60-java'])
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/',
['config/virtuals']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-+
('@GENTOO_PORTAGE_EPREFIX@/etc/env.d/',['config/20java-config']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/profile.d/',
glob('src/profile.d/*')),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/revdep-rebuild/',
['src/revdep-rebuild/60-java'])
- ]
- )
-
-diff -ur java-config-2.1.6.orig/src/depend-java-query
java-config-2.1.6/src/depend-java-query
---- java-config-2.1.6.orig/src/depend-java-query 2008-04-30 11:25:43
+0200
-+++ java-config-2.1.6/src/depend-java-query 2008-04-30 11:26:55 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-diff -ur java-config-2.1.6.orig/src/eselect/java-nsplugin.eselect
java-config-2.1.6/src/eselect/java-nsplugin.eselect
---- java-config-2.1.6.orig/src/eselect/java-nsplugin.eselect 2008-04-30
11:25:43 +0200
-+++ java-config-2.1.6/src/eselect/java-nsplugin.eselect 2008-04-30
11:26:55 +0200
-@@ -10,10 +10,10 @@
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-
--PLUGINS_HOME="${ROOT}/usr/share/java-config-2/nsplugin"
--SYSTEM_PLUGIN_DIR="${ROOT}/usr/lib/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_32="${ROOT}/usr/lib32/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_64="${ROOT}/usr/lib64/nsbrowser/plugins"
-+PLUGINS_HOME="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/nsplugin"
-+SYSTEM_PLUGIN_DIR="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_32="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib32/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_64="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib64/nsbrowser/plugins"
- SYSTEM_PLUGIN="${SYSTEM_PLUGIN_DIR}/javaplugin.so"
- SYSTEM_PLUGIN_32="${SYSTEM_PLUGIN_DIR_32}/javaplugin.so"
- SYSTEM_PLUGIN_64="${SYSTEM_PLUGIN_DIR_64}/javaplugin.so"
-diff -ur java-config-2.1.6.orig/src/eselect/java-vm.eselect
java-config-2.1.6/src/eselect/java-vm.eselect
---- java-config-2.1.6.orig/src/eselect/java-vm.eselect 2008-04-30 11:25:43
+0200
-+++ java-config-2.1.6/src/eselect/java-vm.eselect 2008-04-30 11:26:55
+0200
-@@ -9,8 +9,8 @@
- SVN_DATE='$Date: $'
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
--VM_BASE=/usr/lib/jvm/
--VM_SYSTEM="/etc/java-config-2/current-system-vm"
-+VM_BASE="@GENTOO_PORTAGE_EPREFIX@"/usr/lib/jvm/
-+VM_SYSTEM="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
- VM_USER="${HOME}/.gentoo/java-config-2/current-user-vm"
-
- find_targets() {
-diff -ur java-config-2.1.6.orig/src/gjl java-config-2.1.6/src/gjl
---- java-config-2.1.6.orig/src/gjl 2008-04-30 11:25:43 +0200
-+++ java-config-2.1.6/src/gjl 2008-04-30 11:26:55 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-@@ -234,7 +234,7 @@
- envlp = os.getenv('LD_LIBRARY_PATH')
- envjlp = os.getenv('JAVA_LIBRARY_PATH')
-
-- newlibrary = '/lib:/usr/lib'
-+ newlibrary =
'@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib'
- if library:
- newlibrary = ':'.join((library, newlibrary))
- if envjlp:
-diff -ur java-config-2.1.6.orig/src/java-config-2
java-config-2.1.6/src/java-config-2
---- java-config-2.1.6.orig/src/java-config-2 2008-04-30 11:25:43 +0200
-+++ java-config-2.1.6/src/java-config-2 2008-04-30 11:26:55 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2006 Gentoo Foundation
-@@ -142,7 +142,8 @@
- if not vm:
- fatalError("Could not find a vm matching: %s" % value)
- else:
-- if os.getuid() is 0:
-+ # in prefix this check is disabled
-+ if True or os.getuid() is 0:
- try:
- manager.set_system_vm(vm)
- printer._print("Now using %s as your generation-2 system JVM"
% (vm) )
-@@ -175,7 +176,7 @@
- # Deprecated
- def system_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-- return [{'file': '/etc/env.d/21java-classpath', 'format': '%s=%s\n' }]
-+ return [{'file': '@GENTOO_PORTAGE_EPREFIX@/etc/env.d/21java-classpath',
'format': '%s=%s\n' }]
-
- def user_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-@@ -258,7 +259,7 @@
- fatalError("The vm could not be found")
-
- def update_env():
-- printer._print(getoutput("/usr/sbin/env-update"))
-+ printer._print(getoutput("@GENTOO_PORTAGE_EPREFIX@/usr/sbin/env-update"))
- printer._printAlert("If you want the changes too take effect in your
current session, you should update\n\
- your environment by running: source /etc/profile")
-
-diff -ur java-config-2.1.6.orig/src/java_config_2/EnvironmentManager.py
java-config-2.1.6/src/java_config_2/EnvironmentManager.py
---- java-config-2.1.6.orig/src/java_config_2/EnvironmentManager.py
2008-04-30 11:25:43 +0200
-+++ java-config-2.1.6/src/java_config_2/EnvironmentManager.py 2008-04-30
11:26:55 +0200
-@@ -23,12 +23,12 @@
- active = None
-
- # Location of the vm ev files
-- vms_path = '/usr/share/java-config-2/vm'
-+ vms_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm'
- # Location of the package env files to load
-- pkg_path = '/usr/share/*/package.env'
-- virtual_path = '/usr/share/java-config-2/virtuals/'
-+ pkg_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/*/package.env'
-+ virtual_path =
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/virtuals/'
-
-- system_config_path="/etc/java-config-2/"
-+ system_config_path="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/"
-
- def __init__(self):
- self.all_packages_loaded = False
-@@ -68,7 +68,7 @@
- def load_package(self, name):
- try:
- name = name.replace(':', '-')
-- pkg = Package(name, '/usr/share/' + name + '/package.env')
-+ pkg = Package(name, '@GENTOO_PORTAGE_EPREFIX@/usr/share/' + name
+ '/package.env')
- self.packages[name] = pkg
- return pkg
- except InvalidConfigError:
-@@ -241,7 +241,7 @@
- elif os.path.exists(target):
- raise InvalidConfigError(target)
-
-- os.symlink('/usr/lib/jvm/'+vm.name(),target)
-+ os.symlink('@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/'+vm.name(),target)
-
- def vm_links(self):
- # Don't try to use user-vm if HOME is undefined
-@@ -254,7 +254,7 @@
- return os.path.join(os.environ.get('HOME'),
'.gentoo/java-config-2/current-user-vm')
-
- def system_vm_link(self):
-- return '/etc/java-config-2/current-system-vm'
-+ return '@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm'
-
- def clean_classpath(self, targets):
- for target in targets:
-diff -ur java-config-2.1.6.orig/src/java_config_2/VersionManager.py
java-config-2.1.6/src/java_config_2/VersionManager.py
---- java-config-2.1.6.orig/src/java_config_2/VersionManager.py 2008-04-30
11:25:43 +0200
-+++ java-config-2.1.6/src/java_config_2/VersionManager.py 2008-04-30
11:26:56 +0200
-@@ -5,7 +5,7 @@
- # $Header: $
-
- import sys
--sys.path.append("/usr/lib/portage/pym")
-+sys.path.append("@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym")
-
- import re
- from string import upper
-@@ -28,7 +28,7 @@
- #virtuals_parser = re.compile(r"([<>=]+)?java-virtuals/(.*?)")
- #virtuals_parser =
re.compile(r"([<>=~]+)?java-virtuals/(.+)[\-:]([0-9\.*]+)")
- virtuals_parser = re.compile(r"([<>=~]+)?java-virtuals/([\w\-\.:]+)")
-- pref_files = ['/etc/java-config-2/build/jdk.conf',
'/usr/share/java-config-2/config/jdk-defaults.conf']
-+ pref_files =
['@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/jdk.conf',
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/config/jdk-defaults.conf']
- _prefs = None
-
- def __init__(self):
-diff -ur java-config-2.1.6.orig/src/launcher.bash
java-config-2.1.6/src/launcher.bash
---- java-config-2.1.6.orig/src/launcher.bash 2008-04-30 11:25:43 +0200
-+++ java-config-2.1.6/src/launcher.bash 2008-04-30 11:26:56 +0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # Not-so-elegant? patches more then welcome
-
- abort() {
-@@ -9,7 +9,7 @@
- # Source package env
- # ---------------------
- gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}"
--gjl_system_env="/etc/java-config-2/launcher.d/${gjl_package}"
-+gjl_system_env="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/launcher.d/${gjl_package}"
- if [[ -f "${gjl_user_env}" ]]; then
- source "${gjl_user_env}"
- elif [[ -f "${gjl_system_env}" ]]; then
-diff -ur java-config-2.1.6.orig/src/profile.d/java-config-2.csh
java-config-2.1.6/src/profile.d/java-config-2.csh
---- java-config-2.1.6.orig/src/profile.d/java-config-2.csh 2008-04-30
11:25:43 +0200
-+++ java-config-2.1.6/src/profile.d/java-config-2.csh 2008-04-30 11:26:56
+0200
-@@ -3,7 +3,7 @@
- # $Header:
/var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.csh,v
1.3 2007/01/13 17:17:08 grobian Exp $
-
- set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm"
--set gentoo_system_vm = "/etc/java-config-2/current-system-vm"
-+set gentoo_system_vm =
"@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- ## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
- ## Otherwise set to the current system vm
-diff -ur java-config-2.1.6.orig/src/profile.d/java-config-2.sh
java-config-2.1.6/src/profile.d/java-config-2.sh
---- java-config-2.1.6.orig/src/profile.d/java-config-2.sh 2008-04-30
11:25:43 +0200
-+++ java-config-2.1.6/src/profile.d/java-config-2.sh 2008-04-30 11:26:56
+0200
-@@ -4,7 +4,7 @@
-
- # If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
- gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--gentoo_system_vm="/etc/java-config-2/current-system-vm"
-+gentoo_system_vm="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- # Please make sure that this script is POSIX compliant
- # See https://bugs.gentoo.org/show_bug.cgi?id=169925
-@@ -23,7 +23,7 @@
- if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
- export JAVA_HOME=${gentoo_user_vm}
- # Otherwise set to the current system vm
--elif [ -L /etc/java-config-2/current-system-vm ]; then
-+elif [ -L "@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm ];
then
- export JAVA_HOME=${gentoo_system_vm}
- fi
-
-diff -ur java-config-2.1.6.orig/src/run-java-tool
java-config-2.1.6/src/run-java-tool
---- java-config-2.1.6.orig/src/run-java-tool 2008-04-30 11:25:43 +0200
-+++ java-config-2.1.6/src/run-java-tool 2008-04-30 11:26:56 +0200
-@@ -1,10 +1,10 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-
- user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--system_vm="/etc/java-config-2/current-system-vm"
-+system_vm="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm"
- # Try GENTOO_VM
- if [[ -n ${GENTOO_VM} ]]; then
-- vmpath="/usr/lib/jvm/${GENTOO_VM}/"
-+ vmpath="@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/${GENTOO_VM}/"
- # Then user VM
- elif [[ -h ${user_vm} ]]; then
- vmpath=$(readlink ${user_vm})
diff --git a/dev-java/java-config/files/java-config-2.1.7-prefix.patch
b/dev-java/java-config/files/java-config-2.1.7-prefix.patch
deleted file mode 100644
index 538d56c..0000000
--- a/dev-java/java-config/files/java-config-2.1.7-prefix.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-diff -ruN java-config-2.1.7.orig/config/20java-config
java-config-2.1.7/config/20java-config
---- java-config-2.1.7.orig/config/20java-config 2007-08-25
18:47:45.000000000 +0200
-+++ java-config-2.1.7/config/20java-config 2009-05-12 08:49:44.000000000
+0200
-@@ -1,2 +1,2 @@
--MANPATH=/etc/java-config/system-vm/man/
-+MANPATH="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config/system-vm/man/
- CONFIG_PROTECT_MASK="/etc/env.d/java/"
-diff -ruN java-config-2.1.7.orig/setup.py java-config-2.1.7/setup.py
---- java-config-2.1.7.orig/setup.py 2009-01-13 09:29:45.000000000 +0100
-+++ java-config-2.1.7/setup.py 2009-05-12 08:49:44.000000000 +0200
-@@ -54,11 +54,11 @@
- ('share/pixmaps/', ['data/java-icon48.png']),
- ('share/java-config-2/launcher', ['src/launcher.bash']),
- ('share/eselect/modules', glob('src/eselect/*.eselect')),
-- ('/etc/java-config-2/', ['config/virtuals']),
-- ('/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-- ('/etc/env.d/',['config/20java-config']),
-- ('/etc/profile.d/', glob('src/profile.d/*')),
-- ('/etc/revdep-rebuild/', ['src/revdep-rebuild/60-java'])
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/',
['config/virtuals']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-+
('@GENTOO_PORTAGE_EPREFIX@/etc/env.d/',['config/20java-config']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/profile.d/',
glob('src/profile.d/*')),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/revdep-rebuild/',
['src/revdep-rebuild/60-java'])
- ]
- )
-
-diff -ruN java-config-2.1.7.orig/src/depend-java-query
java-config-2.1.7/src/depend-java-query
---- java-config-2.1.7.orig/src/depend-java-query 2008-01-21
06:17:32.000000000 +0100
-+++ java-config-2.1.7/src/depend-java-query 2009-05-12 08:49:44.000000000
+0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-diff -ruN java-config-2.1.7.orig/src/eselect/java-nsplugin.eselect
java-config-2.1.7/src/eselect/java-nsplugin.eselect
---- java-config-2.1.7.orig/src/eselect/java-nsplugin.eselect 2007-08-25
18:47:45.000000000 +0200
-+++ java-config-2.1.7/src/eselect/java-nsplugin.eselect 2009-05-12
08:49:44.000000000 +0200
-@@ -10,10 +10,10 @@
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-
--PLUGINS_HOME="${ROOT}/usr/share/java-config-2/nsplugin"
--SYSTEM_PLUGIN_DIR="${ROOT}/usr/lib/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_32="${ROOT}/usr/lib32/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_64="${ROOT}/usr/lib64/nsbrowser/plugins"
-+PLUGINS_HOME="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/nsplugin"
-+SYSTEM_PLUGIN_DIR="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_32="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib32/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_64="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib64/nsbrowser/plugins"
- SYSTEM_PLUGIN="${SYSTEM_PLUGIN_DIR}/javaplugin.so"
- SYSTEM_PLUGIN_32="${SYSTEM_PLUGIN_DIR_32}/javaplugin.so"
- SYSTEM_PLUGIN_64="${SYSTEM_PLUGIN_DIR_64}/javaplugin.so"
-diff -ruN java-config-2.1.7.orig/src/eselect/java-vm.eselect
java-config-2.1.7/src/eselect/java-vm.eselect
---- java-config-2.1.7.orig/src/eselect/java-vm.eselect 2008-02-26
06:16:01.000000000 +0100
-+++ java-config-2.1.7/src/eselect/java-vm.eselect 2009-05-12
09:00:09.000000000 +0200
-@@ -9,9 +9,9 @@
- SVN_DATE='$Date: $'
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
--VM_BASE=/usr/lib/jvm/
--VM_SYSTEM="/etc/java-config-2/current-system-vm"
--VM_USER="${HOME}/.gentoo/java-config-2/current-user-vm"
-+VM_BASE="@GENTOO_PORTAGE_EPREFIX@"/usr/lib/jvm/
-+VM_SYSTEM="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-+VM_USER="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-
- find_targets() {
- local f
-diff -ruN java-config-2.1.7.orig/src/gjl java-config-2.1.7/src/gjl
---- java-config-2.1.7.orig/src/gjl 2008-11-20 11:14:23.000000000 +0100
-+++ java-config-2.1.7/src/gjl 2009-05-12 08:49:44.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-@@ -232,7 +232,7 @@
- envlp = os.getenv('LD_LIBRARY_PATH')
- envjlp = os.getenv('JAVA_LIBRARY_PATH')
-
-- newlibrary = '/lib:/usr/lib'
-+ newlibrary =
'@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib'
- if library:
- newlibrary = ':'.join((library, newlibrary))
- if envjlp:
-diff -ruN java-config-2.1.7.orig/src/java-config-2
java-config-2.1.7/src/java-config-2
---- java-config-2.1.7.orig/src/java-config-2 2008-11-20 11:25:42.000000000
+0100
-+++ java-config-2.1.7/src/java-config-2 2009-05-12 08:49:44.000000000
+0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2006 Gentoo Foundation
-@@ -140,7 +140,8 @@
- if not vm:
- fatalError("Could not find a vm matching: %s" % value)
- else:
-- if os.getuid() is 0:
-+ # in prefix this check is disabled
-+ if True or os.getuid() is 0:
- try:
- manager.set_system_vm(vm)
- printer._print("Now using %s as your generation-2 system JVM"
% (vm) )
-@@ -173,7 +174,7 @@
- # Deprecated
- def system_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-- return [{'file': '/etc/env.d/21java-classpath', 'format': '%s=%s\n' }]
-+ return [{'file': '@GENTOO_PORTAGE_EPREFIX@/etc/env.d/21java-classpath',
'format': '%s=%s\n' }]
-
- def user_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-@@ -256,7 +257,7 @@
- fatalError("The vm could not be found")
-
- def update_env():
-- printer._print(getoutput("/usr/sbin/env-update"))
-+ printer._print(getoutput("@GENTOO_PORTAGE_EPREFIX@/usr/sbin/env-update"))
- printer._printAlert("If you want the changes too take effect in your
current session, you should update\n\
- your environment by running: source /etc/profile")
-
-diff -ruN java-config-2.1.7.orig/src/java_config_2/EnvironmentManager.py
java-config-2.1.7/src/java_config_2/EnvironmentManager.py
---- java-config-2.1.7.orig/src/java_config_2/EnvironmentManager.py
2008-10-11 05:54:09.000000000 +0200
-+++ java-config-2.1.7/src/java_config_2/EnvironmentManager.py 2009-05-12
09:00:01.000000000 +0200
-@@ -22,12 +22,12 @@
- active = None
-
- # Location of the vm ev files
-- vms_path = '/usr/share/java-config-2/vm'
-+ vms_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm'
- # Location of the package env files to load
-- pkg_path = '/usr/share/*/package.env'
-- virtual_path = '/usr/share/java-config-2/virtuals/'
-+ pkg_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/*/package.env'
-+ virtual_path =
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/virtuals/'
-
-- system_config_path="/etc/java-config-2/"
-+ system_config_path="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/"
-
- def __init__(self):
- self.all_packages_loaded = False
-@@ -67,7 +67,7 @@
- def load_package(self, name):
- try:
- name = name.replace(':', '-')
-- pkg = Package(name, '/usr/share/' + name + '/package.env')
-+ pkg = Package(name, '@GENTOO_PORTAGE_EPREFIX@/usr/share/' + name
+ '/package.env')
- self.packages[name] = pkg
- return pkg
- except InvalidConfigError:
-@@ -240,7 +240,7 @@
- elif os.path.exists(target):
- raise InvalidConfigError(target)
-
-- os.symlink('/usr/lib/jvm/'+vm.name(),target)
-+ os.symlink('@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/'+vm.name(),target)
-
- def vm_links(self):
- # Don't try to use user-vm if HOME is undefined
-@@ -250,10 +250,10 @@
- return [ self.user_vm_link(), self.system_vm_link() ]
-
- def user_vm_link(self):
-- return os.path.join(os.environ.get('HOME'),
'.gentoo/java-config-2/current-user-vm')
-+ return os.path.join(os.environ.get('HOME'),
'.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm')
-
- def system_vm_link(self):
-- return '/etc/java-config-2/current-system-vm'
-+ return '@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm'
-
- def clean_classpath(self, targets):
- for target in targets:
-diff -ruN java-config-2.1.7.orig/src/java_config_2/VersionManager.py
java-config-2.1.7/src/java_config_2/VersionManager.py
---- java-config-2.1.7.orig/src/java_config_2/VersionManager.py 2008-07-03
11:32:44.000000000 +0200
-+++ java-config-2.1.7/src/java_config_2/VersionManager.py 2009-05-12
08:49:44.000000000 +0200
-@@ -5,7 +5,7 @@
- # $Header: $
-
- import sys
--sys.path.append("/usr/lib/portage/pym")
-+sys.path.append("@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym")
-
- import re
- from string import upper
-@@ -28,7 +28,7 @@
- #virtuals_parser = re.compile(r"([<>=]+)?java-virtuals/(.*?)")
- #virtuals_parser =
re.compile(r"([<>=~]+)?java-virtuals/(.+)[\-:]([0-9\.*]+)")
- virtuals_parser = re.compile(r"([<>=~]+)?java-virtuals/([\w\-\.:]+)")
-- pref_files = ['/etc/java-config-2/build/jdk.conf',
'/usr/share/java-config-2/config/jdk-defaults.conf']
-+ pref_files =
['@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/jdk.conf',
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/config/jdk-defaults.conf']
- _prefs = None
-
- def __init__(self):
-diff -ruN java-config-2.1.7.orig/src/launcher.bash
java-config-2.1.7/src/launcher.bash
---- java-config-2.1.7.orig/src/launcher.bash 2008-01-21 04:40:03.000000000
+0100
-+++ java-config-2.1.7/src/launcher.bash 2009-05-12 08:58:30.000000000
+0200
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # Not-so-elegant? patches more then welcome
-
- abort() {
-@@ -8,8 +8,8 @@
-
- # Source package env
- # ---------------------
--gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}"
--gjl_system_env="/etc/java-config-2/launcher.d/${gjl_package}"
-+gjl_user_env="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/launcher.d/${gjl_package}"
-+gjl_system_env="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/launcher.d/${gjl_package}"
- if [[ -f "${gjl_user_env}" ]]; then
- source "${gjl_user_env}"
- elif [[ -f "${gjl_system_env}" ]]; then
-diff -ruN java-config-2.1.7.orig/src/profile.d/java-config-2.csh
java-config-2.1.7/src/profile.d/java-config-2.csh
---- java-config-2.1.7.orig/src/profile.d/java-config-2.csh 2007-08-25
18:47:45.000000000 +0200
-+++ java-config-2.1.7/src/profile.d/java-config-2.csh 2009-05-12
09:00:13.000000000 +0200
-@@ -2,8 +2,8 @@
- # 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.csh,v
1.3 2007/01/13 17:17:08 grobian Exp $
-
--set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm"
--set gentoo_system_vm = "/etc/java-config-2/current-system-vm"
-+set gentoo_user_vm =
"${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+set gentoo_system_vm =
"@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- ## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
- ## Otherwise set to the current system vm
-diff -ruN java-config-2.1.7.orig/src/profile.d/java-config-2.sh
java-config-2.1.7/src/profile.d/java-config-2.sh
---- java-config-2.1.7.orig/src/profile.d/java-config-2.sh 2007-08-25
18:47:45.000000000 +0200
-+++ java-config-2.1.7/src/profile.d/java-config-2.sh 2009-05-12
09:00:19.000000000 +0200
-@@ -3,8 +3,8 @@
- # $Header:
/var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.sh-r1,v
1.1 2007/03/16 11:13:16 betelgeuse Exp $
-
- # If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
--gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--gentoo_system_vm="/etc/java-config-2/current-system-vm"
-+gentoo_user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+gentoo_system_vm="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- # Please make sure that this script is POSIX compliant
- # See https://bugs.gentoo.org/show_bug.cgi?id=169925
-@@ -23,7 +23,7 @@
- if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
- export JAVA_HOME=${gentoo_user_vm}
- # Otherwise set to the current system vm
--elif [ -L /etc/java-config-2/current-system-vm ]; then
-+elif [ -L "@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm ];
then
- export JAVA_HOME=${gentoo_system_vm}
- fi
-
-diff -ruN java-config-2.1.7.orig/src/run-java-tool
java-config-2.1.7/src/run-java-tool
---- java-config-2.1.7.orig/src/run-java-tool 2008-02-27 11:04:13.000000000
+0100
-+++ java-config-2.1.7/src/run-java-tool 2009-05-12 09:01:06.000000000
+0200
-@@ -1,10 +1,10 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-
--user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--system_vm="/etc/java-config-2/current-system-vm"
-+user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+system_vm="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm"
- # Try GENTOO_VM
- if [[ -n ${GENTOO_VM} ]]; then
-- vmpath="/usr/lib/jvm/${GENTOO_VM}/"
-+ vmpath="@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/${GENTOO_VM}/"
- # Then user VM
- elif [[ -h ${user_vm} ]]; then
- vmpath=$(readlink ${user_vm})
diff --git a/dev-java/java-config/files/java-config-2.1.8-load_packages.patch
b/dev-java/java-config/files/java-config-2.1.8-load_packages.patch
deleted file mode 100644
index dd2855a..0000000
--- a/dev-java/java-config/files/java-config-2.1.8-load_packages.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: java_config_2/EnvironmentManager.py
-===================================================================
---- src/java_config_2/EnvironmentManager.py (revision 7809)
-+++ src/java_config_2/EnvironmentManager.py (working copy)
-@@ -81,7 +81,7 @@
- raise UnexistingPackageError(name)
-
- def load_packages(self):
-- for package in iter(glob(self.pkg_path) % "*" ):
-+ for package in iter(glob(self.pkg_path % "*" )):
- name = basename(dirname(package))
- if name in self.packages:
- continue
diff --git a/dev-java/java-config/files/java-config-2.1.8-prefix.patch
b/dev-java/java-config/files/java-config-2.1.8-prefix.patch
deleted file mode 100644
index feca2be..0000000
--- a/dev-java/java-config/files/java-config-2.1.8-prefix.patch
+++ /dev/null
@@ -1,250 +0,0 @@
---- java-config-2.1.8/config/20java-config
-+++ java-config-2.1.8/config/20java-config
-@@ -1,2 +1,2 @@
--MANPATH=/etc/java-config/system-vm/man/
-+MANPATH="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config/system-vm/man/
- CONFIG_PROTECT_MASK="/etc/env.d/java/"
---- java-config-2.1.8/setup.py
-+++ java-config-2.1.8/setup.py
-@@ -54,11 +54,11 @@
- ('share/pixmaps/', ['data/java-icon48.png']),
- ('share/java-config-2/launcher', ['src/launcher.bash']),
- ('share/eselect/modules', glob('src/eselect/*.eselect')),
-- ('/etc/java-config-2/', ['config/virtuals']),
-- ('/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-- ('/etc/env.d/',['config/20java-config']),
-- ('/etc/profile.d/', glob('src/profile.d/*')),
-- ('/etc/revdep-rebuild/', ['src/revdep-rebuild/60-java'])
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/',
['config/virtuals']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-+
('@GENTOO_PORTAGE_EPREFIX@/etc/env.d/',['config/20java-config']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/profile.d/',
glob('src/profile.d/*')),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/revdep-rebuild/',
['src/revdep-rebuild/60-java'])
- ]
- )
-
---- java-config-2.1.8/src/depend-java-query
-+++ java-config-2.1.8/src/depend-java-query
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
---- java-config-2.1.8/src/eselect/java-nsplugin.eselect
-+++ java-config-2.1.8/src/eselect/java-nsplugin.eselect
-@@ -10,10 +10,10 @@
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-
--PLUGINS_HOME="${ROOT}/usr/share/java-config-2/nsplugin"
--SYSTEM_PLUGIN_DIR="${ROOT}/usr/lib/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_32="${ROOT}/usr/lib32/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_64="${ROOT}/usr/lib64/nsbrowser/plugins"
-+PLUGINS_HOME="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/nsplugin"
-+SYSTEM_PLUGIN_DIR="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_32="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib32/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_64="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib64/nsbrowser/plugins"
- SYSTEM_PLUGIN="${SYSTEM_PLUGIN_DIR}/javaplugin.so"
- SYSTEM_PLUGIN_32="${SYSTEM_PLUGIN_DIR_32}/javaplugin.so"
- SYSTEM_PLUGIN_64="${SYSTEM_PLUGIN_DIR_64}/javaplugin.so"
---- java-config-2.1.8/src/eselect/java-vm.eselect
-+++ java-config-2.1.8/src/eselect/java-vm.eselect
-@@ -9,9 +9,9 @@
- SVN_DATE='$Date: $'
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
--VM_BASE=/usr/lib/jvm/
--VM_SYSTEM="/etc/java-config-2/current-system-vm"
--VM_USER="${HOME}/.gentoo/java-config-2/current-user-vm"
-+VM_BASE="@GENTOO_PORTAGE_EPREFIX@"/usr/lib/jvm/
-+VM_SYSTEM="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-+VM_USER="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-
- find_targets() {
- local f
---- java-config-2.1.8/src/gjl 2009-05-27 20:53:03 +0200
-+++ java-config-2.1.8/src/gjl 2009-05-27 20:56:32 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-@@ -232,7 +232,7 @@
- envlp = os.getenv('LD_LIBRARY_PATH')
- envjlp = os.getenv('JAVA_LIBRARY_PATH')
-
-- newlibrary = '/lib:/usr/lib'
-+ newlibrary =
'@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib'
- if library:
- newlibrary = ':'.join((library, newlibrary))
- if envjlp:
---- java-config-2.1.8/src/java-config-2
-+++ java-config-2.1.8/src/java-config-2
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2006 Gentoo Foundation
-@@ -160,7 +160,8 @@
- if not vm:
- fatalError("Could not find a vm matching: %s" % value)
- else:
-- if os.getuid() is 0:
-+ # in prefix this check is disabled
-+ if True or os.getuid() is 0:
- try:
- manager.set_system_vm(vm)
- printer._print("Now using %s as your generation-2 system JVM"
% (vm) )
-@@ -193,7 +194,7 @@
- # Deprecated
- def system_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-- return [{'file': '/etc/env.d/21java-classpath', 'format': '%s=%s\n' }]
-+ return [{'file': '@GENTOO_PORTAGE_EPREFIX@/etc/env.d/21java-classpath',
'format': '%s=%s\n' }]
-
- def user_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-@@ -276,7 +277,7 @@
- fatalError("The vm could not be found")
-
- def update_env():
-- printer._print(getoutput("/usr/sbin/env-update"))
-+ printer._print(getoutput("@GENTOO_PORTAGE_EPREFIX@/usr/sbin/env-update"))
- printer._printAlert("If you want the changes too take effect in your
current session, you should update\n\
- your environment by running: source /etc/profile")
-
---- java-config-2.1.8/src/java_config_2/EnvironmentManager.py
-+++ java-config-2.1.8/src/java_config_2/EnvironmentManager.py
-@@ -22,12 +22,12 @@
- active = None
-
- # Location of the vm ev files
-- vms_path = '/usr/share/java-config-2/vm'
-+ vms_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm'
- # Location of the package env files to load
-- pkg_path = '/usr/share/%s/package.env'
-- virtual_path = '/usr/share/java-config-2/virtuals/'
-+ pkg_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/%s/package.env'
-+ virtual_path =
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/virtuals/'
-
-- system_config_path="/etc/java-config-2/"
-+ system_config_path="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/"
-
- def __init__(self):
- self.all_packages_loaded = False
-@@ -240,7 +240,7 @@
- elif os.path.exists(target):
- raise InvalidConfigError(target)
-
-- os.symlink('/usr/lib/jvm/'+vm.name(),target)
-+ os.symlink('@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/'+vm.name(),target)
-
- def vm_links(self):
- # Don't try to use user-vm if HOME is undefined
-@@ -250,10 +250,10 @@
- return [ self.user_vm_link(), self.system_vm_link() ]
-
- def user_vm_link(self):
-- return os.path.join(os.environ.get('HOME'),
'.gentoo/java-config-2/current-user-vm')
-+ return os.path.join(os.environ.get('HOME'),
'.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm')
-
- def system_vm_link(self):
-- return '/etc/java-config-2/current-system-vm'
-+ return '@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm'
-
- def clean_classpath(self, targets):
- for target in targets:
---- java-config-2.1.8/src/java_config_2/VersionManager.py
-+++ java-config-2.1.8/src/java_config_2/VersionManager.py
-@@ -5,7 +5,7 @@
- # $Header: $
-
- import sys
--sys.path.append("/usr/lib/portage/pym")
-+sys.path.append("@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym")
-
- import re
- from string import upper
-@@ -25,7 +25,7 @@
- """
- atom_parser = re.compile(r"([<>=]*)virtual/(jre|jdk)[-:]([0-9\.*]+)")
- virtuals_parser = re.compile(r"([<>=~]+)?java-virtuals/([\w\-\.:]+)")
-- pref_files = ['/etc/java-config-2/build/jdk.conf',
'/usr/share/java-config-2/config/jdk-defaults.conf']
-+ pref_files =
['@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/jdk.conf',
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/config/jdk-defaults.conf']
- _prefs = None
-
- def __init__(self):
---- java-config-2.1.8/src/launcher.bash
-+++ java-config-2.1.8/src/launcher.bash
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # Not-so-elegant? patches more then welcome
-
- abort() {
-@@ -8,8 +8,8 @@
-
- # Source package env
- # ---------------------
--gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}"
--gjl_system_env="/etc/java-config-2/launcher.d/${gjl_package}"
-+gjl_user_env="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/launcher.d/${gjl_package}"
-+gjl_system_env="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/launcher.d/${gjl_package}"
- if [[ -f "${gjl_user_env}" ]]; then
- source "${gjl_user_env}"
- elif [[ -f "${gjl_system_env}" ]]; then
---- java-config-2.1.8/src/profile.d/java-config-2.csh
-+++ java-config-2.1.8/src/profile.d/java-config-2.csh
-@@ -2,8 +2,8 @@
- # 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.csh,v
1.3 2007/01/13 17:17:08 grobian Exp $
-
--set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm"
--set gentoo_system_vm = "/etc/java-config-2/current-system-vm"
-+set gentoo_user_vm =
"${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+set gentoo_system_vm =
"@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- ## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
- ## Otherwise set to the current system vm
---- java-config-2.1.8/src/profile.d/java-config-2.sh
-+++ java-config-2.1.8/src/profile.d/java-config-2.sh
-@@ -3,8 +3,8 @@
- # $Header:
/var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.sh-r1,v
1.1 2007/03/16 11:13:16 betelgeuse Exp $
-
- # If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
--gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--gentoo_system_vm="/etc/java-config-2/current-system-vm"
-+gentoo_user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+gentoo_system_vm="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- # Please make sure that this script is POSIX compliant
- # See https://bugs.gentoo.org/show_bug.cgi?id=169925
-@@ -23,7 +23,7 @@
- if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
- export JAVA_HOME=${gentoo_user_vm}
- # Otherwise set to the current system vm
--elif [ -L /etc/java-config-2/current-system-vm ]; then
-+elif [ -L "@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm ];
then
- export JAVA_HOME=${gentoo_system_vm}
- fi
-
---- java-config-2.1.8/src/run-java-tool
-+++ java-config-2.1.8/src/run-java-tool
-@@ -1,10 +1,10 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-
--user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--system_vm="/etc/java-config-2/current-system-vm"
-+user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+system_vm="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm"
- # Try GENTOO_VM
- if [[ -n ${GENTOO_VM} ]]; then
-- vmpath="/usr/lib/jvm/${GENTOO_VM}/"
-+ vmpath="@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/${GENTOO_VM}/"
- # Then user VM
- elif [[ -h ${user_vm} ]]; then
- vmpath=$(readlink ${user_vm})
diff --git a/dev-java/java-config/files/java-config-2.1.9-prefix.patch
b/dev-java/java-config/files/java-config-2.1.9-prefix.patch
deleted file mode 100644
index 78502a0..0000000
--- a/dev-java/java-config/files/java-config-2.1.9-prefix.patch
+++ /dev/null
@@ -1,297 +0,0 @@
---- java-config-2.1.8/config/20java-config
-+++ java-config-2.1.8/config/20java-config
-@@ -1,2 +1,2 @@
--MANPATH=/etc/java-config/system-vm/man/
-+MANPATH="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config/system-vm/man/
- CONFIG_PROTECT_MASK="/etc/env.d/java/"
-diff -ru java-config-2.1.9.orig/man/java-config-2.1
java-config-2.1.9/man/java-config-2.1
---- java-config-2.1.9.orig/man/java-config-2.1 2009-01-14 07:33:25.000000000
+0100
-+++ java-config-2.1.9/man/java-config-2.1 2009-09-24 09:13:39.176129565
+0200
-@@ -71,7 +71,7 @@
- .TP
- \fB\-s <vm\-id> \-\-set\-user\-vm=<vm\-id>\fI
- Sets the user\-specific JVM by putting all necessary env vars into
--.I $HOME/.gentoo/java\-env .
-+.I $HOME/.gentoo@GENTOO_PORTAGE_EPREFIX@/java\-env .
- .TP
- \fB\-f \-\-show\-active\-vm\fI
- Show the JVM that's currently active, as set via \-\-set\-system\-vm or
\-\-set\-user\-vm.
-@@ -81,8 +81,8 @@
- .TP
- \fB\-a <pkg1>,<pkg2>,... \-\-set\-user\-classpath=<package1>,<package2>,...\fI
- Sets the user\-specific CLASSPATH by putting all necessary env vars into
--.I $HOME/.gentoo/java\-env\-classpath
--(sourced from $HOME/.gentoo/java\-env).
-+.I $HOME/.gentoo@GENTOO_PORTAGE_EPREFIX@/java\-env\-classpath
-+(sourced from $HOME/.gentoo@GENTOO_PORTAGE_EPREFIX@/java\-env).
- .TP
- \fB\-X \-\-clean\-system\-classpath\fI
- Cleans the system\-wide default classpath, leaving only vm needed jars
-@@ -92,7 +92,7 @@
- Cleans the user specific classpath that was specified by
- .I \-\-set\-user\-classpath
- by deleting
--.I $HOME/.gentoo/java\-env\-classpath .
-+.I $HOME/.gentoo@GENTOO_PORTAGE_EPREFIX@/java\-env\-classpath .
- .
- .TP
- \fB\-n \-\-nocolor\fI
---- java-config-2.1.8/setup.py
-+++ java-config-2.1.8/setup.py
-@@ -54,11 +54,11 @@
- ('share/pixmaps/', ['data/java-icon48.png']),
- ('share/java-config-2/launcher', ['src/launcher.bash']),
- ('share/eselect/modules', glob('src/eselect/*.eselect')),
-- ('/etc/java-config-2/', ['config/virtuals']),
-- ('/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-- ('/etc/env.d/',['config/20java-config']),
-- ('/etc/profile.d/', glob('src/profile.d/*')),
-- ('/etc/revdep-rebuild/', ['src/revdep-rebuild/60-java'])
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/',
['config/virtuals']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/',
['config/jdk.conf','config/compilers.conf']),
-+
('@GENTOO_PORTAGE_EPREFIX@/etc/env.d/',['config/20java-config']),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/profile.d/',
glob('src/profile.d/*')),
-+ ('@GENTOO_PORTAGE_EPREFIX@/etc/revdep-rebuild/',
['src/revdep-rebuild/60-java'])
- ]
- )
-
---- java-config-2.1.8/src/depend-java-query
-+++ java-config-2.1.8/src/depend-java-query
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
---- java-config-2.1.8/src/eselect/java-nsplugin.eselect
-+++ java-config-2.1.8/src/eselect/java-nsplugin.eselect
-@@ -10,10 +10,10 @@
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
-
--PLUGINS_HOME="${ROOT}/usr/share/java-config-2/nsplugin"
--SYSTEM_PLUGIN_DIR="${ROOT}/usr/lib/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_32="${ROOT}/usr/lib32/nsbrowser/plugins"
--SYSTEM_PLUGIN_DIR_64="${ROOT}/usr/lib64/nsbrowser/plugins"
-+PLUGINS_HOME="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/nsplugin"
-+SYSTEM_PLUGIN_DIR="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_32="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib32/nsbrowser/plugins"
-+SYSTEM_PLUGIN_DIR_64="${ROOT}@GENTOO_PORTAGE_EPREFIX@/usr/lib64/nsbrowser/plugins"
- SYSTEM_PLUGIN="${SYSTEM_PLUGIN_DIR}/javaplugin.so"
- SYSTEM_PLUGIN_32="${SYSTEM_PLUGIN_DIR_32}/javaplugin.so"
- SYSTEM_PLUGIN_64="${SYSTEM_PLUGIN_DIR_64}/javaplugin.so"
---- java-config-2.1.8/src/eselect/java-vm.eselect
-+++ java-config-2.1.8/src/eselect/java-vm.eselect
-@@ -9,9 +9,9 @@
- SVN_DATE='$Date: $'
- VERSION=$(svn_date_to_version "${SVN_DATE}" )
-
--VM_BASE=/usr/lib/jvm/
--VM_SYSTEM="/etc/java-config-2/current-system-vm"
--VM_USER="${HOME}/.gentoo/java-config-2/current-user-vm"
-+VM_BASE="@GENTOO_PORTAGE_EPREFIX@"/usr/lib/jvm/
-+VM_SYSTEM="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-+VM_USER="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-
- find_targets() {
- local f
---- java-config-2.1.8/src/gjl 2009-05-27 20:53:03 +0200
-+++ java-config-2.1.8/src/gjl 2009-05-27 20:56:32 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2005 Gentoo Foundation
-@@ -232,7 +232,7 @@
- envlp = os.getenv('LD_LIBRARY_PATH')
- envjlp = os.getenv('JAVA_LIBRARY_PATH')
-
-- newlibrary = '/lib:/usr/lib'
-+ newlibrary =
'@GENTOO_PORTAGE_EPREFIX@/lib:@GENTOO_PORTAGE_EPREFIX@/usr/lib'
- if library:
- newlibrary = ':'.join((library, newlibrary))
- if envjlp:
---- java-config-2.1.8/src/java-config-2
-+++ java-config-2.1.8/src/java-config-2
-@@ -1,4 +1,4 @@
--#!/usr/bin/python -E
-+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/python -E
- # -*- coding: UTF-8 -*-
-
- # Copyright 2004-2006 Gentoo Foundation
-@@ -160,7 +160,8 @@
- if not vm:
- fatalError("Could not find a vm matching: %s" % value)
- else:
-- if os.getuid() is 0:
-+ # in prefix this check is disabled
-+ if True or os.getuid() is 0:
- try:
- manager.set_system_vm(vm)
- printer._print("Now using %s as your generation-2 system JVM"
% (vm) )
-@@ -210,13 +211,13 @@
- # Deprecated
- def system_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
-- return [{'file': '/etc/env.d/21java-classpath', 'format': '%s=%s\n' }]
-+ return [{'file': '@GENTOO_PORTAGE_EPREFIX@/etc/env.d/21java-classpath',
'format': '%s=%s\n' }]
-
- def user_classpath_target():
- # TODO: MAKE THIS MODULAR!! (compnerd)
- return [
-- {'file': os.path.join(os.environ.get("HOME"),
'.gentoo/java-env-classpath'), 'format': 'export %s=%s\n' },
-- {'file': os.path.join(os.environ.get("HOME"),
'.gentoo/java-env-classpath.csh'), 'format': 'setenv %s %s\n' }
-+ {'file': os.path.join(os.environ.get("HOME"),
'.gentoo@GENTOO_PORTAGE_EPREFIX@/java-env-classpath'), 'format': 'export
%s=%s\n' },
-+ {'file': os.path.join(os.environ.get("HOME"),
'.gentoo@GENTOO_PORTAGE_EPREFIX@/java-env-classpath.csh'), 'format': 'setenv %s
%s\n' }
- ]
- # Deprecated
- def set_system_classpath(option, opt, value, parser):
-@@ -293,12 +294,12 @@
- fatalError("The vm could not be found")
-
- def update_env():
-- printer._print(getoutput("/usr/sbin/env-update"))
-+ printer._print(getoutput("@GENTOO_PORTAGE_EPREFIX@/usr/sbin/env-update"))
- printer._printAlert("If you want the changes too take effect in your
current session, you should update\n\
-- your environment by running: source /etc/profile")
-+ your environment by running: source
@GENTOO_PORTAGE_EPREFIX@/etc/profile")
-
- def user_update_env():
-- printer._printAlert("Environment files in ~/.gentoo/ have been updated.
You should source these from your shell's profile.\n\
-+ printer._printAlert("Environment files in
~/.gentoo@GENTOO_PORTAGE_EPREFIX@/ have been updated. You should source these
from your shell's profile.\n\
- If you want the changes too take effect in your current sessiosn,
you should resource these files")
-
- def deprecation_notice():
---- java-config-2.1.8/src/java_config_2/EnvironmentManager.py
-+++ java-config-2.1.8/src/java_config_2/EnvironmentManager.py
-@@ -22,12 +22,12 @@
- active = None
-
- # Location of the vm ev files
-- vms_path = '/usr/share/java-config-2/vm'
-+ vms_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/vm'
- # Location of the package env files to load
-- pkg_path = '/usr/share/%s/package.env'
-- virtual_path = '/usr/share/java-config-2/virtuals/'
-+ pkg_path = '@GENTOO_PORTAGE_EPREFIX@/usr/share/%s/package.env'
-+ virtual_path =
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/virtuals/'
-
-- system_config_path="/etc/java-config-2/"
-+ system_config_path="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/"
-
- def __init__(self):
- self.all_packages_loaded = False
-@@ -240,7 +240,7 @@
- elif os.path.exists(target):
- raise InvalidConfigError(target)
-
-- os.symlink('/usr/lib/jvm/'+vm.name(),target)
-+ os.symlink('@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/'+vm.name(),target)
-
- def vm_links(self):
- # Don't try to use user-vm if HOME is undefined
-@@ -250,10 +250,10 @@
- return [ self.user_vm_link(), self.system_vm_link() ]
-
- def user_vm_link(self):
-- return os.path.join(os.environ.get('HOME'),
'.gentoo/java-config-2/current-user-vm')
-+ return os.path.join(os.environ.get('HOME'),
'.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm')
-
- def system_vm_link(self):
-- return '/etc/java-config-2/current-system-vm'
-+ return '@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm'
-
- def clean_classpath(self, targets):
- for target in targets:
---- java-config-2.1.8/src/java_config_2/VersionManager.py
-+++ java-config-2.1.8/src/java_config_2/VersionManager.py
-@@ -5,7 +5,7 @@
- # $Header: $
-
- import sys
--sys.path.append("/usr/lib/portage/pym")
-+sys.path.append("@GENTOO_PORTAGE_EPREFIX@/usr/lib/portage/pym")
-
- import re
- from string import upper
-@@ -25,7 +25,7 @@
- """
- atom_parser = re.compile(r"([<>=]*)virtual/(jre|jdk)[-:]([0-9\.*]+)")
- virtuals_parser = re.compile(r"([<>=~]+)?java-virtuals/([\w\-\.:]+)")
-- pref_files = ['/etc/java-config-2/build/jdk.conf',
'/usr/share/java-config-2/config/jdk-defaults.conf']
-+ pref_files =
['@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/build/jdk.conf',
'@GENTOO_PORTAGE_EPREFIX@/usr/share/java-config-2/config/jdk-defaults.conf']
- _prefs = None
-
- def __init__(self):
---- java-config-2.1.8/src/launcher.bash
-+++ java-config-2.1.8/src/launcher.bash
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
- # Not-so-elegant? patches more then welcome
-
- abort() {
-@@ -8,8 +8,8 @@
-
- # Source package env
- # ---------------------
--gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}"
--gjl_system_env="/etc/java-config-2/launcher.d/${gjl_package}"
-+gjl_user_env="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/launcher.d/${gjl_package}"
-+gjl_system_env="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/launcher.d/${gjl_package}"
- if [[ -f "${gjl_user_env}" ]]; then
- source "${gjl_user_env}"
- elif [[ -f "${gjl_system_env}" ]]; then
---- java-config-2.1.8/src/profile.d/java-config-2.csh
-+++ java-config-2.1.8/src/profile.d/java-config-2.csh
-@@ -2,8 +2,8 @@
- # 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.csh,v
1.3 2007/01/13 17:17:08 grobian Exp $
-
--set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm"
--set gentoo_system_vm = "/etc/java-config-2/current-system-vm"
-+set gentoo_user_vm =
"${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+set gentoo_system_vm =
"@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- ## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
- ## Otherwise set to the current system vm
---- java-config-2.1.8/src/profile.d/java-config-2.sh
-+++ java-config-2.1.8/src/profile.d/java-config-2.sh
-@@ -3,8 +3,8 @@
- # $Header:
/var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.sh-r1,v
1.1 2007/03/16 11:13:16 betelgeuse Exp $
-
- # If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
--gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--gentoo_system_vm="/etc/java-config-2/current-system-vm"
-+gentoo_user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+gentoo_system_vm="@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm
-
- # Please make sure that this script is POSIX compliant
- # See https://bugs.gentoo.org/show_bug.cgi?id=169925
-@@ -23,7 +23,7 @@
- if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
- export JAVA_HOME=${gentoo_user_vm}
- # Otherwise set to the current system vm
--elif [ -L /etc/java-config-2/current-system-vm ]; then
-+elif [ -L "@GENTOO_PORTAGE_EPREFIX@"/etc/java-config-2/current-system-vm ];
then
- export JAVA_HOME=${gentoo_system_vm}
- fi
-
---- java-config-2.1.8/src/run-java-tool
-+++ java-config-2.1.8/src/run-java-tool
-@@ -1,10 +1,10 @@
--#!/bin/bash
-+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
-
--user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
--system_vm="/etc/java-config-2/current-system-vm"
-+user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
-+system_vm="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm"
- # Try GENTOO_VM
- if [[ -n ${GENTOO_VM} ]]; then
-- vmpath="/usr/lib/jvm/${GENTOO_VM}/"
-+ vmpath="@GENTOO_PORTAGE_EPREFIX@/usr/lib/jvm/${GENTOO_VM}/"
- # Then user VM
- elif [[ -h ${user_vm} ]]; then
- vmpath=$(readlink ${user_vm})
diff --git a/dev-java/java-config/files/java-config-2.1.9.patch
b/dev-java/java-config/files/java-config-2.1.9.patch
deleted file mode 100644
index d2e81af..0000000
--- a/dev-java/java-config/files/java-config-2.1.9.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: src/depend-java-query
-===================================================================
---- src/depend-java-query (revision 7909)
-+++ src/depend-java-query (working copy)
-@@ -40,7 +40,7 @@
-
- def get_vm(option, opt, value, parser):
- try:
-- vm = verman.get_vm(value, False)
-+ vm = verman.get_vm(value, True)
- printer._print(vm)
- except Exception, ex:
- printer._printError(str(ex))
-Index: java-config-2
-===================================================================
---- src/java-config-2 (revision 7909)
-+++ src/java-config-2 (working copy)
-@@ -143,12 +143,15 @@
- printer._print('%HThe following VMs are available for generation-2:%$')
- for i, vm in vm_list.iteritems():
- if vm is active:
-- printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'),
vm.name(), '%$'))
-+ if not vm.is_build_only():
-+ printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'),
vm.name(), '%$'))
-+ else:
-+ printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'),
vm.name(), '%$') + '%r (Build Only)%$')
- else:
- if not vm.is_build_only():
- printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'),
vm.name()))
- else:
-- printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'),
vm.name()) + '%r (Build Only)')
-+ printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'),
vm.name()) + '%r (Build Only)%$')
-
- printer._print('')
- printer._print('%r' + 'VMs marked as Build Only may contain Security
Vulnerabilities and/or be EOL.')
diff --git a/dev-java/java-config/files/python-abi-support.patch
b/dev-java/java-config/files/python-abi-support.patch
deleted file mode 100644
index bff9559..0000000
--- a/dev-java/java-config/files/python-abi-support.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/launcher.bash
-+++ src/launcher.bash
-@@ -6,6 +6,19 @@
- exit 1
- }
-
-+# Save Python-specific variables for support for Jython
-+# ---------------------
-+_EPYTHON="${EPYTHON}"
-+_GENTOO_PYTHON_PROCESS_NAME="${GENTOO_PYTHON_PROCESS_NAME}"
-+_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH="${GENTOO_PYTHON_WRAPPER_SCRIPT_PATH}"
-+_GENTOO_PYTHON_TARGET_SCRIPT_PATH="${GENTOO_PYTHON_TARGET_SCRIPT_PATH}"
-+_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION="${GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION}"
-+unset EPYTHON
-+unset GENTOO_PYTHON_PROCESS_NAME
-+unset GENTOO_PYTHON_WRAPPER_SCRIPT_PATH
-+unset GENTOO_PYTHON_TARGET_SCRIPT_PATH
-+unset GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION
-+
- # Source package env
- # ---------------------
- gjl_user_env="${HOME}/.gentoo/java-config-2/launcher.d/${gjl_package}"
-@@ -54,6 +67,14 @@
- abort "Dont know what to run :(("
- fi
-
-+# Restore Python-specific variables for support for Jython
-+# ---------------------
-+[[ -n ${_EPYTHON} ]] && export EPYTHON="${_EPYTHON}"
-+[[ -n ${_GENTOO_PYTHON_PROCESS_NAME} ]] && export
GENTOO_PYTHON_PROCESS_NAME="${_GENTOO_PYTHON_PROCESS_NAME}"
-+[[ -n ${_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH} ]] && export
GENTOO_PYTHON_WRAPPER_SCRIPT_PATH="${_GENTOO_PYTHON_WRAPPER_SCRIPT_PATH}"
-+[[ -n ${_GENTOO_PYTHON_TARGET_SCRIPT_PATH} ]] && export
GENTOO_PYTHON_TARGET_SCRIPT_PATH="${_GENTOO_PYTHON_TARGET_SCRIPT_PATH}"
-+[[ -n ${_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION} ]] && export
GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION="${_GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION}"
-+
- # Run it
- # --------
-
diff --git a/dev-java/java-config/java-config-2.1.11.ebuild
b/dev-java/java-config/java-config-2.1.11.ebuild
deleted file mode 100644
index 0e209e6..0000000
--- a/dev-java/java-config/java-config-2.1.11.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.11.ebuild,v 1.14
2015/03/31 18:55:04 ulm Exp $
-
-EAPI="2"
-PYTHON_DEPEND="*:2.6"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit fdo-mime gnome2-utils distutils eutils prefix
-
-DESCRIPTION="Java environment configuration tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/java/";
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-java/java-config-wrapper-0.15
- !sys-apps/baselayout-java
- !app-eselect/eselect-java"
-# Tests fail when java-config isn't already installed.
-RESTRICT="test"
-RESTRICT_PYTHON_ABIS="2.4 2.5 *-jython"
-
-PYTHON_MODNAME="java_config_2"
-
-src_test() {
- testing() {
- PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)"
src/run-test-suite.py
- }
- python_execute_function testing
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-prefix.patch
- eprefixify \
- config/20java-config setup.py \
-
src/{depend-java-query,gjl,java-config-2,launcher.bash,run-java-tool} \
- src/eselect/java-{nsplugin,vm}.eselect \
- src/profile.d/java-config-2.{,c}sh \
-
src/java_config_2/{EnvironmentManager.py,VM.py,VersionManager.py} \
- man/java-config-2.1
-}
-
-src_install() {
- distutils_src_install
-
- local a=${ARCH}
- case $a in
- *-hpux) a=hpux;;
- *-linux) a=${a%-linux};;
- esac
-
- insinto /usr/share/java-config-2/config/
- newins config/jdk-defaults-${a}.conf jdk-defaults.conf || die "arch
config not found"
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/dev-java/java-config/java-config-2.1.12-r1.ebuild
b/dev-java/java-config/java-config-2.1.12-r1.ebuild
deleted file mode 100644
index 365c816..0000000
--- a/dev-java/java-config/java-config-2.1.12-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.12-r1.ebuild,v
1.10 2015/03/31 18:55:04 ulm Exp $
-
-EAPI="5"
-
-# jython depends on java-config, so don't add it or things will breake.
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-inherit distutils-r1 eutils fdo-mime gnome2-utils prefix
-
-DESCRIPTION="Java environment configuration tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/java/";
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-# this needs testing/checking/updating
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-java/java-config-wrapper-0.15
- !sys-apps/baselayout-java
- !app-eselect/eselect-java"
-# https://bugs.gentoo.org/show_bug.cgi?id=315229
-PDEPEND=">=virtual/jre-1.5"
-# Tests fail when java-config isn't already installed.
-RESTRICT="test"
-
-python_test() {
- "${PYTHON}" src/run-test-suite.py || die
- "${PYTHON}" src/run-test-suite2.py || die
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-prefix.patch
- eprefixify \
- config/20java-config setup.py \
-
src/{depend-java-query,gjl,java-config-2,launcher.bash,run-java-tool} \
- src/eselect/java-{nsplugin,vm}.eselect \
- src/profile.d/java-config-2.{,c}sh \
-
src/java_config_2/{EnvironmentManager.py,VM.py,VersionManager.py} \
- man/java-config-2.1
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local a=${ARCH}
- case $a in
- *-hpux) a=hpux;;
- *-linux) a=${a%-linux};;
- amd64-fbsd) a=x64-freebsd;;
- esac
-
- insinto /usr/share/java-config-2/config/
- newins config/jdk-defaults-${a}.conf jdk-defaults.conf
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/dev-java/java-config/java-config-2.2.0-r3.ebuild
b/dev-java/java-config/java-config-2.2.0-r3.ebuild
new file mode 100644
index 0000000..7702339
--- /dev/null
+++ b/dev-java/java-config/java-config-2.2.0-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java";
+SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2";
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+ !dev-java/java-config-wrapper
+ sys-apps/baselayout-java
+ sys-apps/portage[${PYTHON_USEDEP}]"
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ epatch "${FILESDIR}/${P}-prefix.patch"
+
+ # This replaces the file installed by java-config-wrapper.
+ dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-java/java-config/java-config-2.2.0.ebuild
b/dev-java/java-config/java-config-2.2.0.ebuild
deleted file mode 100644
index d8aa44e..0000000
--- a/dev-java/java-config/java-config-2.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.2.0.ebuild,v 1.12
2014/11/29 09:56:32 pacho Exp $
-
-EAPI="5"
-
-# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Java environment configuration query tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/java/";
-SRC_URI="http://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2";
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# baselayout-java is added as a dep till it can be added to eclass.
-RDEPEND="
- >=dev-java/java-config-wrapper-0.15
- sys-apps/baselayout-java
- sys-apps/portage"
-
-python_prepare() {
- epatch "${FILESDIR}/${P}-prefix.patch"
-}
-
-python_test() {
- esetup.py test || die
-}
diff --git a/dev-java/java-config/metadata.xml
b/dev-java/java-config/metadata.xml
index 7e8e003..fb57516 100644
--- a/dev-java/java-config/metadata.xml
+++ b/dev-java/java-config/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>java</herd>
+ <maintainer type="project">
+ <email>[email protected]</email>
+ <name>Java</name>
+ </maintainer>
<longdescription>
java-config is used to configure the Java subsystem on your
Gentoo
installation. In particular, it can be used to configure
system-wide and
