diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-05-01 11:37:14 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-05-01 11:37:14 +0000 |
| commit | d58bcb099559db1d91ce3684578ec6ae393ccecd (patch) | |
| tree | c3b35f70f8dd258c2acb8c4221dc457ddf3e1ac0 /dev-java/java-config-wrapper/files | |
| parent | Added ~ppc64; bug #175865 (diff) | |
| download | gentoo-2-d58bcb099559db1d91ce3684578ec6ae393ccecd.tar.gz gentoo-2-d58bcb099559db1d91ce3684578ec6ae393ccecd.tar.bz2 gentoo-2-d58bcb099559db1d91ce3684578ec6ae393ccecd.zip | |
Cleanup.
(Portage version: 2.1.2.5)
Diffstat (limited to 'dev-java/java-config-wrapper/files')
3 files changed, 0 insertions, 40 deletions
diff --git a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12 deleted file mode 100644 index 4ed577186fce..000000000000 --- a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 39a073be74d730bd618e5a3d4d4b0e23 java-config-wrapper-0.12.tar.bz2 7808 -RMD160 9cfa95dc96039f051f9f7ae034d14209ca2ac180 java-config-wrapper-0.12.tar.bz2 7808 -SHA256 0c50136cc82b180258364272b24d90702760cb05b39bc239e7cb2fef01718003 java-config-wrapper-0.12.tar.bz2 7808 diff --git a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12-r1 b/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12-r1 deleted file mode 100644 index 4ed577186fce..000000000000 --- a/dev-java/java-config-wrapper/files/digest-java-config-wrapper-0.12-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 39a073be74d730bd618e5a3d4d4b0e23 java-config-wrapper-0.12.tar.bz2 7808 -RMD160 9cfa95dc96039f051f9f7ae034d14209ca2ac180 java-config-wrapper-0.12.tar.bz2 7808 -SHA256 0c50136cc82b180258364272b24d90702760cb05b39bc239e7cb2fef01718003 java-config-wrapper-0.12.tar.bz2 7808 diff --git a/dev-java/java-config-wrapper/files/java-config-wrapper-0.12-generation_1_system_vm.patch b/dev-java/java-config-wrapper/files/java-config-wrapper-0.12-generation_1_system_vm.patch deleted file mode 100644 index f86fe88ada79..000000000000 --- a/dev-java/java-config-wrapper/files/java-config-wrapper-0.12-generation_1_system_vm.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: src/shell/java-check-environment -=================================================================== ---- src/shell/java-check-environment (revision 2757) -+++ src/shell/java-check-environment (working copy) -@@ -182,18 +182,19 @@ - local this_result=0 - local env="/etc/env.d/20java" - # Make sure a generation-1 VM is set -- if [[ ! -f "${env}" ]]; then -+ if [[ ! -f "${env}" || -z $(java-config-1 -f) ]]; then - qeerror "No Generation-1 System VM is set! (no /etc/env.d/20java)" -- qeerror "Run 'java-config-1 -L' to see a list of available VMs" -- qeerror "Then run 'java-config-1 -S <VM choice>'" -- qeerror "Then run 'env-update && source /etc/profile" -+ local vm_list=$(java-config-1 -L) -+ if [[ ! ${vm_list} =~ "]" ]]; then -+ qeerror "It doesn't look like java-config-1 sees any installed VMs." -+ qeerror "It is most likely because you don't have a 1.4 JDK installed" -+ qeerror "This is required for generation-1 to work properly." -+ qeerror "You will want to emerge =virtual/jdk-1.4*" -+ else -+ java-config-1 -L -+ qeerror "Choose one, and run 'java-config-1 ---set-system-vm <VM choice>'" -+ fi - this_result=1 -- elif [[ -z $(java-config-1 -f) ]]; then -- qeerror "No Generation-1 System VM is set! (no java-config-1 -f output)" -- qeerror "Run 'java-config-1 -L' to see a list of available VMs" -- qeerror "Then run 'java-config-1 -S <VM choice>'" -- qeerror "Then run 'env-update && source /etc/profile" -- this_result=1 - # Make sure the generation-1 VM set is generation-2 compatible, not set long before migration - else - # We need to unset GENERATION, because this ends up being in |