Significant improvements to java-config-1, to address bug #139889 with regards to JAVA_HOME. Setting user vm and configuring classpaths have been disabled in java-config-1 in order . For java-config-2, bug #144856 was fixed, and also introduced a profile.d file which sets JAVA_HOME appropriately.

(Portage version: 2.1.1_pre5-r3)
 (Unsigned Manifest commit)

18 files changed, 20 insertions, 431 deletions

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 39c504e935f2..622cc91d4b3a 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -2,65 +2,25 @@ AUX java-config-1.2.11-shebang.patch 229 RMD160 e201dafad76307123139861371ade56f
 MD5 882665d94cc943f315ec729d990afadf files/java-config-1.2.11-shebang.patch 229
 RMD160 e201dafad76307123139861371ade56f03887342 files/java-config-1.2.11-shebang.patch 229
 SHA256 4068a51515b7510260de57a5872d6e04b1a33d2f9728d77ed00fe7f41cced83a files/java-config-1.2.11-shebang.patch 229
-AUX java-config-1.3.0-JAVA_HOME.patch 1277 RMD160 64f39d6ad1ef68675edf7e1a31fdc3e4e7a73b1f SHA1 5fb76fb6726a71efcf43a8311bc2dd563ac2bc46 SHA256 e7a63568e6ad2df96f5d3eefe350e147b9449ce14abd76581eb1f672bbb6755c
-MD5 dab2bb721abf71ce9be519eb18025aba files/java-config-1.3.0-JAVA_HOME.patch 1277
-RMD160 64f39d6ad1ef68675edf7e1a31fdc3e4e7a73b1f files/java-config-1.3.0-JAVA_HOME.patch 1277
-SHA256 e7a63568e6ad2df96f5d3eefe350e147b9449ce14abd76581eb1f672bbb6755c files/java-config-1.3.0-JAVA_HOME.patch 1277
-AUX java-config-1.3.0-regexp.patch 458 RMD160 4607b8762440279cc1caf989b1f8e03a66671d3b SHA1 92e4c6407eac0ed162cbe84ca47164e6b638299f SHA256 d5bacfb6a95f934ec4c0e19d6956c439801813dc8a6873c50bdb4d9d083299b8
-MD5 f315e41a6e740028b2a7b3f61f742507 files/java-config-1.3.0-regexp.patch 458
-RMD160 4607b8762440279cc1caf989b1f8e03a66671d3b files/java-config-1.3.0-regexp.patch 458
-SHA256 d5bacfb6a95f934ec4c0e19d6956c439801813dc8a6873c50bdb4d9d083299b8 files/java-config-1.3.0-regexp.patch 458
-AUX java-config-2.0.26-jconsole.patch 242 RMD160 4363dae12e44790b7e6870110c87d88bad8875dc SHA1 8fd7dae82be1f8065c2dd3d60d793150f8d266ce SHA256 7c7438696cece96832fb45363a0e14e0a7f58f350606ba767cc40e605cf3d3c1
-MD5 f2cf6aa341ff44f8ff2cd7c91635f8d1 files/java-config-2.0.26-jconsole.patch 242
-RMD160 4363dae12e44790b7e6870110c87d88bad8875dc files/java-config-2.0.26-jconsole.patch 242
-SHA256 7c7438696cece96832fb45363a0e14e0a7f58f350606ba767cc40e605cf3d3c1 files/java-config-2.0.26-jconsole.patch 242
-AUX java-config-2.0.26-nsplugin.patch 434 RMD160 0d996bc12aa193024195f0b80c9253e15d1e093a SHA1 330d7685840b11c78d80da12da5e3810932de419 SHA256 441fa41fc9601585c4e4e9b951414992fb72e97e19ed14b7da97d6cc6233a709
-MD5 ba3724c8365d6c27b7018a5b8a179c09 files/java-config-2.0.26-nsplugin.patch 434
-RMD160 0d996bc12aa193024195f0b80c9253e15d1e093a files/java-config-2.0.26-nsplugin.patch 434
-SHA256 441fa41fc9601585c4e4e9b951414992fb72e97e19ed14b7da97d6cc6233a709 files/java-config-2.0.26-nsplugin.patch 434
-AUX java-config-2.0.26-nsplugin_ls_stderr.patch 429 RMD160 1588dbe44c87474875c7981d0504bf47e5241f6d SHA1 e3848ec57266aa14b5086af16c3e2ba124f5d118 SHA256 0efd77205613ed0303e12ef4adb6926df28f9bc53b716c3bd36a37ccdeb2fc42
-MD5 b5f10ef2a3daf81386e2299b2889b0b7 files/java-config-2.0.26-nsplugin_ls_stderr.patch 429
-RMD160 1588dbe44c87474875c7981d0504bf47e5241f6d files/java-config-2.0.26-nsplugin_ls_stderr.patch 429
-SHA256 0efd77205613ed0303e12ef4adb6926df28f9bc53b716c3bd36a37ccdeb2fc42 files/java-config-2.0.26-nsplugin_ls_stderr.patch 429
-AUX java-config-2.0.26-set_number.patch 494 RMD160 cded53243b836673d7447dc1a6df978e6c5124f9 SHA1 eb7cccad59e4005b9d95c008225b9418b68e1b60 SHA256 3f7b349243126a767f3234a2ec2ac770918b2300194a157609e3a84f7f73a642
-MD5 057b41e43da76870b233acfdc1e29fb9 files/java-config-2.0.26-set_number.patch 494
-RMD160 cded53243b836673d7447dc1a6df978e6c5124f9 files/java-config-2.0.26-set_number.patch 494
-SHA256 3f7b349243126a767f3234a2ec2ac770918b2300194a157609e3a84f7f73a642 files/java-config-2.0.26-set_number.patch 494
-AUX java-config-2.profiled 613 RMD160 7a2e65d2f5648d11b9fd8d1112505d87c591b0a2 SHA1 15765fa6d47884403f2ab3fe25e72b2a2f57ad15 SHA256 73b48e18fc6af920195a033f869e81202bfc09aa6f96be4a592148999a19eea5
-MD5 fad7e6d3b705f7212379a66620f4ba63 files/java-config-2.profiled 613
-RMD160 7a2e65d2f5648d11b9fd8d1112505d87c591b0a2 files/java-config-2.profiled 613
-SHA256 73b48e18fc6af920195a033f869e81202bfc09aa6f96be4a592148999a19eea5 files/java-config-2.profiled 613
 DIST java-config-1.2.11.tar.bz2 15743 RMD160 e1175474e87f234f9428d7db6827a3a4435e6aba SHA1 fd2ffdda515005ef7a9358b650f59674c13bc0b7 SHA256 f17bdce2b97dca14daf77dbefb6d6c0935fbc444b67e9a0d7cc68538575a6b83
-DIST java-config-1.3.0.tar.bz2 14287 RMD160 f46ef41b9bb8ee5014cc1c870818db16d2e407de SHA1 0fe44df00cc2f622e95b1b2f2e79b34f6ff662e4 SHA256 445aa68cbd34eb63122a9f339c275b97b06739d644c104a55371c2a16798b8a8
-DIST java-config-2.0.26.tar.bz2 15298 RMD160 9f6724af6c6d274c02171aab992e9165e5abc738 SHA1 96b8a824a235e201f60e6983b65ea995e3c13ac4 SHA256 03e828568b5f965a59a2db57597d1b45e14ba8e89acca65d3082fb7ee4ef578c
+DIST java-config-1.3.1.tar.bz2 14732 RMD160 5fd14ce884f6c6de83c899d25d73e779cf94e923 SHA1 6bf5b70d3583c9d5f6efa5f5107afb1c7dad15bf SHA256 d23fe3f521e547eb319d8e04cd578a8803324c8fbff91b17567924a2c7f9f9ac
+DIST java-config-2.0.27.tar.bz2 15522 RMD160 e830fda4b8ecfe6061207cada34d39083807f8f6 SHA1 66687409031ae0b39b3757696b2103f598ed4c25 SHA256 ff01124a0fd97a293f3f34d772c5280ffb6390f6e2f5d796b6d1b3728417133c
 EBUILD java-config-1.2.11-r1.ebuild 874 RMD160 caf41840d1b96596b88464edf9e476e8debe621d SHA1 f669e17d7153660b532671a6e3696c86d8d21ae7 SHA256 abf7e6e4ebc06bcd838ab4e9466d7c8e076d6f808242203693c46cdddb9c081f
 MD5 7e9562363f495fbef6591ad21366d0a4 java-config-1.2.11-r1.ebuild 874
 RMD160 caf41840d1b96596b88464edf9e476e8debe621d java-config-1.2.11-r1.ebuild 874
 SHA256 abf7e6e4ebc06bcd838ab4e9466d7c8e076d6f808242203693c46cdddb9c081f java-config-1.2.11-r1.ebuild 874
-EBUILD java-config-1.3.0-r2.ebuild 1014 RMD160 b1b706b3d26cbe99359747e17ddb895a6fe84aff SHA1 b04e9ca1a79dc9bf13513338def97be02dc35dd6 SHA256 f823a5d5ef5ee33b87c801531db0086fc938d2d3cb026f62c27b3855ce46c852
-MD5 6f38ed96b900b83b2cd5ffa3cb2c7c3c java-config-1.3.0-r2.ebuild 1014
-RMD160 b1b706b3d26cbe99359747e17ddb895a6fe84aff java-config-1.3.0-r2.ebuild 1014
-SHA256 f823a5d5ef5ee33b87c801531db0086fc938d2d3cb026f62c27b3855ce46c852 java-config-1.3.0-r2.ebuild 1014
-EBUILD java-config-1.3.0-r3.ebuild 1052 RMD160 45de1361b9daa7b874fe209c76b741780f42643d SHA1 5cccb9870fe40388ee5b9746713a739d660ff370 SHA256 13e8e03febfcf949f7c330d5c88d60d38a39af675370135d14f9e6cc9c86d7f6
-MD5 4f54d4c71dce0943a8c874eabeec5426 java-config-1.3.0-r3.ebuild 1052
-RMD160 45de1361b9daa7b874fe209c76b741780f42643d java-config-1.3.0-r3.ebuild 1052
-SHA256 13e8e03febfcf949f7c330d5c88d60d38a39af675370135d14f9e6cc9c86d7f6 java-config-1.3.0-r3.ebuild 1052
-EBUILD java-config-2.0.26-r4.ebuild 1461 RMD160 3ecea43dae29ad96f262f6b2a6d39e9ffcccf72e SHA1 f15cb600c0cdadac6e0067a61ec095b96d49f000 SHA256 9f4c11cb2823f6f04262b82f0108575b33f70c6d42798b17ce55d8c2804cce03
-MD5 e65d175ebfc52b16505026b90f6ceada java-config-2.0.26-r4.ebuild 1461
-RMD160 3ecea43dae29ad96f262f6b2a6d39e9ffcccf72e java-config-2.0.26-r4.ebuild 1461
-SHA256 9f4c11cb2823f6f04262b82f0108575b33f70c6d42798b17ce55d8c2804cce03 java-config-2.0.26-r4.ebuild 1461
-EBUILD java-config-2.0.26-r5.ebuild 1493 RMD160 d67fe71fa3016d70d554d4078dbd4a679dc954e1 SHA1 2f91d0357a06df36f5eb5f149358af299449aec9 SHA256 ad914afc548b39c94b5dbc88485414eaabd89d4b61e36c1a7560f383cad4abfc
-MD5 3113226a8cb8c648d4ef63015684330f java-config-2.0.26-r5.ebuild 1493
-RMD160 d67fe71fa3016d70d554d4078dbd4a679dc954e1 java-config-2.0.26-r5.ebuild 1493
-SHA256 ad914afc548b39c94b5dbc88485414eaabd89d4b61e36c1a7560f383cad4abfc java-config-2.0.26-r5.ebuild 1493
-EBUILD java-config-2.0.26-r6.ebuild 1643 RMD160 4c68f3c0baebe017c27cfcdc02b1259dd3b22203 SHA1 fbcd3390d05d198fb2e1319fd55e70220805614e SHA256 8c868f592198eac2860189e8a9e9aac0b7e28f779b202e63f9180dcf059161a0
-MD5 0e85392a060528e992877600bc961c8e java-config-2.0.26-r6.ebuild 1643
-RMD160 4c68f3c0baebe017c27cfcdc02b1259dd3b22203 java-config-2.0.26-r6.ebuild 1643
-SHA256 8c868f592198eac2860189e8a9e9aac0b7e28f779b202e63f9180dcf059161a0 java-config-2.0.26-r6.ebuild 1643
-MISC ChangeLog 16953 RMD160 e2e71f09fc78aa972f20d369d013b98d95eb231a SHA1 9efd2e345f22ec0edd8a43c1f00dfb125bfe36ee SHA256 afb5e939cb50aaa40afc59770d3d4b8e9f4c65d3801da672f5f09a0039497fcf
-MD5 98b15007d63830ab7f78517b6f2aa87a ChangeLog 16953
-RMD160 e2e71f09fc78aa972f20d369d013b98d95eb231a ChangeLog 16953
-SHA256 afb5e939cb50aaa40afc59770d3d4b8e9f4c65d3801da672f5f09a0039497fcf ChangeLog 16953
+EBUILD java-config-1.3.1.ebuild 930 RMD160 f4c6519506bf55ff10e9a5184dd5f5fda8b6017f SHA1 56d0de56068c348f79d9113082782de66e4d6936 SHA256 b9a7c86fce997ab3b8b629ce178438de574812b355eca776b9df4afb46e43ea1
+MD5 bd0c608eda649734f749bc161c95250a java-config-1.3.1.ebuild 930
+RMD160 f4c6519506bf55ff10e9a5184dd5f5fda8b6017f java-config-1.3.1.ebuild 930
+SHA256 b9a7c86fce997ab3b8b629ce178438de574812b355eca776b9df4afb46e43ea1 java-config-1.3.1.ebuild 930
+EBUILD java-config-2.0.27.ebuild 1475 RMD160 e75abf88c122505299d8464d94c4085bcfdb234d SHA1 740b5955157e544f7d64da68ee0f07fd30407ecf SHA256 8c9b2d80acfb8a279504167cd2ee8814f39ba017f4b144680f532b70301eb418
+MD5 eb0056d4fcf97408ecdf95024b9aef93 java-config-2.0.27.ebuild 1475
+RMD160 e75abf88c122505299d8464d94c4085bcfdb234d java-config-2.0.27.ebuild 1475
+SHA256 8c9b2d80acfb8a279504167cd2ee8814f39ba017f4b144680f532b70301eb418 java-config-2.0.27.ebuild 1475
+MISC ChangeLog 17900 RMD160 053221a82a93689a191171e1539204f54e763073 SHA1 c3c0fdc286b5d026730a18aa3ac2c1efebd30c64 SHA256 b384f694db875b462d4c726883cc8e53d897337f75aff50ce97edca3efa761e7
+MD5 4c53d8c21eda7ad4acbeae8696ae2ce1 ChangeLog 17900
+RMD160 053221a82a93689a191171e1539204f54e763073 ChangeLog 17900
+SHA256 b384f694db875b462d4c726883cc8e53d897337f75aff50ce97edca3efa761e7 ChangeLog 17900
 MISC metadata.xml 486 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 SHA1 1561f2727694d8312adbda18294f690116ab3c84 SHA256 5d3e4a1780efad67e6265b82a4397a2b4fe26c2c0785ee65a3390dd8218c82ce
 MD5 ff83dbd41edf207798f367c723ab813f metadata.xml 486
 RMD160 158f1d9652c83644739d40c8014d65d487dca4e6 metadata.xml 486
@@ -68,18 +28,9 @@ SHA256 5d3e4a1780efad67e6265b82a4397a2b4fe26c2c0785ee65a3390dd8218c82ce metadata
 MD5 9091e598ac872425ce4ee3037822d4f2 files/digest-java-config-1.2.11-r1 256
 RMD160 be9d3f129e710d9448e047004f63070736f9bcc8 files/digest-java-config-1.2.11-r1 256
 SHA256 da2af16dd2d187eb5301706d751663c290362f05f8a84eed14ecf5c21284c7da files/digest-java-config-1.2.11-r1 256
-MD5 43fb58eb5b3d48f906399c953fc29651 files/digest-java-config-1.3.0-r2 253
-RMD160 6ccd4638f2a01e9f60536a2d2d76be5a404a97fc files/digest-java-config-1.3.0-r2 253
-SHA256 8e829d236fd6326f55c2679229926adcba694b4a8f19387bfbb731dc6be1da67 files/digest-java-config-1.3.0-r2 253
-MD5 43fb58eb5b3d48f906399c953fc29651 files/digest-java-config-1.3.0-r3 253
-RMD160 6ccd4638f2a01e9f60536a2d2d76be5a404a97fc files/digest-java-config-1.3.0-r3 253
-SHA256 8e829d236fd6326f55c2679229926adcba694b4a8f19387bfbb731dc6be1da67 files/digest-java-config-1.3.0-r3 253
-MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r4 256
-RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r4 256
-SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r4 256
-MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r5 256
-RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r5 256
-SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r5 256
-MD5 ca47623e6607ec52d4a845512fe4478c files/digest-java-config-2.0.26-r6 256
-RMD160 42089f4f980238fe6c10497e9b8a659518ef4b19 files/digest-java-config-2.0.26-r6 256
-SHA256 02c0d98b5c9c0116316da2f68ccfd05f449c43e493b30e3e55dcf07cd7a0ffe7 files/digest-java-config-2.0.26-r6 256
+MD5 7cae9ad7043a830379ca29e3610f40ea files/digest-java-config-1.3.1 253
+RMD160 491b0ce2526202ea77697b79b5e6fcfd79685288 files/digest-java-config-1.3.1 253
+SHA256 120d46d06097c2de8902b5d4962b71814b4a963be519f309be8619095ac5afb8 files/digest-java-config-1.3.1 253
+MD5 1357ec25e19a873bdc1f7c3cb3e4f2db files/digest-java-config-2.0.27 256
+RMD160 7f10fd3d5c792fd693eb171407af65849be4badc files/digest-java-config-2.0.27 256
+SHA256 e63d4b0790075be20dc5ea3a8700d2833f7974553569b6e69072ef1014e77875 files/digest-java-config-2.0.27 256
diff --git a/dev-java/java-config/files/digest-java-config-1.3.0-r2 b/dev-java/java-config/files/digest-java-config-1.3.0-r2
deleted file mode 100644
index 55c0dd946ff4..000000000000
--- a/dev-java/java-config/files/digest-java-config-1.3.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9e9d61bf5b5b84be059e3efee6050bae java-config-1.3.0.tar.bz2 14287
-RMD160 f46ef41b9bb8ee5014cc1c870818db16d2e407de java-config-1.3.0.tar.bz2 14287
-SHA256 445aa68cbd34eb63122a9f339c275b97b06739d644c104a55371c2a16798b8a8 java-config-1.3.0.tar.bz2 14287
diff --git a/dev-java/java-config/files/digest-java-config-1.3.0-r3 b/dev-java/java-config/files/digest-java-config-1.3.0-r3
deleted file mode 100644
index 55c0dd946ff4..000000000000
--- a/dev-java/java-config/files/digest-java-config-1.3.0-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9e9d61bf5b5b84be059e3efee6050bae java-config-1.3.0.tar.bz2 14287
-RMD160 f46ef41b9bb8ee5014cc1c870818db16d2e407de java-config-1.3.0.tar.bz2 14287
-SHA256 445aa68cbd34eb63122a9f339c275b97b06739d644c104a55371c2a16798b8a8 java-config-1.3.0.tar.bz2 14287
diff --git a/dev-java/java-config/files/digest-java-config-2.0.26-r4 b/dev-java/java-config/files/digest-java-config-2.0.26-r4
deleted file mode 100644
index 56c0f4186bc9..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.26-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60221d65176ceb2e2ef4edf7c1724ad0 java-config-2.0.26.tar.bz2 15298
-RMD160 9f6724af6c6d274c02171aab992e9165e5abc738 java-config-2.0.26.tar.bz2 15298
-SHA256 03e828568b5f965a59a2db57597d1b45e14ba8e89acca65d3082fb7ee4ef578c java-config-2.0.26.tar.bz2 15298
diff --git a/dev-java/java-config/files/digest-java-config-2.0.26-r5 b/dev-java/java-config/files/digest-java-config-2.0.26-r5
deleted file mode 100644
index 56c0f4186bc9..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.26-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60221d65176ceb2e2ef4edf7c1724ad0 java-config-2.0.26.tar.bz2 15298
-RMD160 9f6724af6c6d274c02171aab992e9165e5abc738 java-config-2.0.26.tar.bz2 15298
-SHA256 03e828568b5f965a59a2db57597d1b45e14ba8e89acca65d3082fb7ee4ef578c java-config-2.0.26.tar.bz2 15298
diff --git a/dev-java/java-config/files/digest-java-config-2.0.26-r6 b/dev-java/java-config/files/digest-java-config-2.0.26-r6
deleted file mode 100644
index 56c0f4186bc9..000000000000
--- a/dev-java/java-config/files/digest-java-config-2.0.26-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 60221d65176ceb2e2ef4edf7c1724ad0 java-config-2.0.26.tar.bz2 15298
-RMD160 9f6724af6c6d274c02171aab992e9165e5abc738 java-config-2.0.26.tar.bz2 15298
-SHA256 03e828568b5f965a59a2db57597d1b45e14ba8e89acca65d3082fb7ee4ef578c java-config-2.0.26.tar.bz2 15298
diff --git a/dev-java/java-config/files/java-config-1.3.0-JAVA_HOME.patch b/dev-java/java-config/files/java-config-1.3.0-JAVA_HOME.patch
deleted file mode 100644
index fee8092c734b..000000000000
--- a/dev-java/java-config/files/java-config-1.3.0-JAVA_HOME.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Files java-config-1.3.0.vanilla/java_config/jc_exceptions.pyc and java-config-1.3.0/java_config/jc_exceptions.pyc differ
-Files java-config-1.3.0.vanilla/java_config/jc_output.pyc and java-config-1.3.0/java_config/jc_output.pyc differ
-diff -Nru java-config-1.3.0.vanilla/java_config/jc_util.py java-config-1.3.0/java_config/jc_util.py
---- java-config-1.3.0.vanilla/java_config/jc_util.py	2006-08-03 01:32:30.000000000 +0200
-+++ java-config-1.3.0/java_config/jc_util.py	2006-08-03 01:50:33.000000000 +0200
-@@ -66,8 +66,31 @@
- get_jvm_env_var.user_env_dir = os.path.join(env.get('HOME', 'THERE_IS_NO_HOME'), '.gentoo')
- 
- def get_java_home():
-+	for f in os.listdir('/etc/env.d/java/'):
-+		vmHandle = ''
-+		try:
-+			fh = open('/etc/env.d/java/' + f, 'r')
-+			for line in fh.readlines():
-+				line = line.strip()
-+				if line[0:8] == 'VMHANDLE':
-+					vmHandle = line[10:-1]
-+					break
-+			fh.close()
-+		except:
-+			continue
-+		if vmHandle == os.environ['VMHANDLE']:
-+			try:
-+				fh = open('/etc/env.d/java/' + f, 'r')
-+				for line in fh.readlines():
-+					line = line.strip()
-+					if line[0:9] == 'JAVA_HOME':
-+						return line[10:]
-+						break
-+				fh.close()
-+			except:
-+				continue
- 
--	return get_jvm_env_var ('JAVA_HOME')
-+	return None
- 
- 
- JAVA_HOME = get_java_home()
diff --git a/dev-java/java-config/files/java-config-1.3.0-regexp.patch b/dev-java/java-config/files/java-config-1.3.0-regexp.patch
deleted file mode 100644
index fc25c37d9fb4..000000000000
--- a/dev-java/java-config/files/java-config-1.3.0-regexp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru java-config-1.3.0-orig/java_config/jc_util.py java-config-1.3.0/java_config/jc_util.py
---- java-config-1.3.0-orig/java_config/jc_util.py	2006-04-12 21:04:04.000000000 -0400
-+++ java-config-1.3.0/java_config/jc_util.py	2006-04-12 21:04:53.000000000 -0400
-@@ -23,8 +23,9 @@
- 
- 	fp = open(fn)
- 	rStr = _get_line_from_env_file(query, fp)
--	rStr = re.sub("\"", "", rStr)
- 	fp.close()
-+	if rStr != None:
-+		rStr = re.sub("\"", "", rStr)
- 
- 	return rStr
- 
diff --git a/dev-java/java-config/files/java-config-2.0.26-jconsole.patch b/dev-java/java-config/files/java-config-2.0.26-jconsole.patch
deleted file mode 100644
index ada57c7f13c5..000000000000
--- a/dev-java/java-config/files/java-config-2.0.26-jconsole.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: config/symlink-tools
-===================================================================
---- config/symlink-tools	(revision 2480)
-+++ config/symlink-tools	(working copy)
-@@ -7,6 +7,7 @@
- javah
- javap
- javaws
-+jconsole
- jdb
- rmic
- rmid
diff --git a/dev-java/java-config/files/java-config-2.0.26-nsplugin.patch b/dev-java/java-config/files/java-config-2.0.26-nsplugin.patch
deleted file mode 100644
index 35bb37f3fe04..000000000000
--- a/dev-java/java-config/files/java-config-2.0.26-nsplugin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/eselect/java-nsplugin.eselect
-===================================================================
---- src/eselect/java-nsplugin.eselect	(revision 2404)
-+++ src/eselect/java-nsplugin.eselect	(working copy)
-@@ -25,6 +25,7 @@
- 
- 		for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do
- 			local vm=${targets[${i}]}
-+			local mark=""
- 			if [[ ${vm} == ${system_name} ]]; then
- 				mark="${mark} $(highlight 'current')"
- 			fi
diff --git a/dev-java/java-config/files/java-config-2.0.26-nsplugin_ls_stderr.patch b/dev-java/java-config/files/java-config-2.0.26-nsplugin_ls_stderr.patch
deleted file mode 100644
index 97b8f629b891..000000000000
--- a/dev-java/java-config/files/java-config-2.0.26-nsplugin_ls_stderr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/eselect/java-nsplugin.eselect
-===================================================================
---- src/eselect/java-nsplugin.eselect	(revision 2466)
-+++ src/eselect/java-nsplugin.eselect	(working copy)
-@@ -96,7 +96,7 @@
- ## }}}
- 
- get_targets() {
--	for plugin in $(ls ${PLUGINS_HOME}/*-javaplugin.so);
-+	for plugin in $(ls ${PLUGINS_HOME}/*-javaplugin.so 2>/dev/null);
- 	do
- 		echo $(plugin_to_vm ${plugin})
- 	done
diff --git a/dev-java/java-config/files/java-config-2.0.26-set_number.patch b/dev-java/java-config/files/java-config-2.0.26-set_number.patch
deleted file mode 100644
index 68bdeb4fe294..000000000000
--- a/dev-java/java-config/files/java-config-2.0.26-set_number.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: src/eselect/java-nsplugin.eselect
-===================================================================
---- src/eselect/java-nsplugin.eselect	(revision 2422)
-+++ src/eselect/java-nsplugin.eselect	(working copy)
-@@ -45,6 +45,10 @@
- 	do_set() {
- 		# TODO check for # of args
- 		local vm=${1}
-+		if is_number "${vm}" ; then
-+			local targets=( $(get_targets) )
-+			vm=${targets[$(( ${vm} - 1 ))]}
-+		fi
- 		local plugin="${PLUGINS_HOME}/${vm}-javaplugin.so"
- 
- 		if [[ ! -f ${plugin} ]]; then
diff --git a/dev-java/java-config/files/java-config-2.profiled b/dev-java/java-config/files/java-config-2.profiled
deleted file mode 100644
index 130ff8504507..000000000000
--- a/dev-java/java-config/files/java-config-2.profiled
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled,v 1.1 2006/08/03 02:13:58 nichoj Exp $
-
-# If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
-if [[ ${UID} != 0 && -L $HOME/.gentoo/java-config-2/current-user-vm ]]; then
-  export JAVA_HOME=$HOME/.gentoo/java-config-2/current-user-vm
-# Otherwise set to the current system vm
-elif [[ -L /etc/java-config-2/current-system-vm ]]; then
-  export JAVA_HOME=/etc/java-config-2/current-system-vm
-fi
-#
diff --git a/dev-java/java-config/java-config-1.3.0-r2.ebuild b/dev-java/java-config/java-config-1.3.0-r2.ebuild
deleted file mode 100644
index 982d00e9e518..000000000000
--- a/dev-java/java-config/java-config-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-1.3.0-r2.ebuild,v 1.4 2006/07/21 00:21:10 flameeyes Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="Java environment configuration tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/java/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="virtual/python
-	dev-java/java-config-wrapper"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-regexp.patch
-}
-
-src_install() {
-	distutils_src_install
-	newbin java-config java-config-1
-	doman java-config.1
-
-	doenvd 30java-finalclasspath
-}
-
-pkg_postinst() {
-	einfo "The way Java is handled on Gentoo has been recently updated."
-	einfo "If you have not done so already, you should follow the"
-	einfo "instructions available at:"
-	einfo "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
-}
diff --git a/dev-java/java-config/java-config-1.3.0-r3.ebuild b/dev-java/java-config/java-config-1.3.0-r3.ebuild
deleted file mode 100644
index 0017ff427cc6..000000000000
--- a/dev-java/java-config/java-config-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-1.3.0-r3.ebuild,v 1.1 2006/08/03 02:13:58 nichoj Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="Java environment configuration tool"
-HOMEPAGE="http://www.gentoo.org/proj/en/java/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="virtual/python
-	dev-java/java-config-wrapper"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-regexp.patch
-	epatch ${FILESDIR}/${P}-JAVA_HOME.patch
-}
-
-src_install() {
-	distutils_src_install
-	newbin java-config java-config-1
-	doman java-config.1
-
-	doenvd 30java-finalclasspath
-}
-
-pkg_postinst() {
-	einfo "The way Java is handled on Gentoo has been recently updated."
-	einfo "If you have not done so already, you should follow the"
-	einfo "instructions available at:"
-	einfo "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
-}
diff --git a/dev-java/java-config/java-config-2.0.26-r4.ebuild b/dev-java/java-config/java-config-2.0.26-r4.ebuild
deleted file mode 100644
index 4bb858c6a41b..000000000000
--- a/dev-java/java-config/java-config-2.0.26-r4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 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.0.26-r4.ebuild,v 1.2 2006/07/21 00:21:10 flameeyes Exp $
-
-inherit base distutils eutils
-
-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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/python"
-RDEPEND="virtual/python
-	dev-java/java-config-wrapper"
-
-PATCHES="${FILESDIR}/${P}-nsplugin.patch ${FILESDIR}/${P}-set_number.patch \
-	${FILESDIR}/${P}-nsplugin_ls_stderr.patch"
-
-src_install() {
-	distutils_src_install
-
-	insinto /usr/share/java-config-2/config/
-	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86; do
-		if use ${i}; then
-			newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch	config not found"
-		fi
-	done
-
-	for tool in $(< config/symlink-tools); do
-		dosym /usr/bin/run-java-tool /usr/bin/${tool}
-	done
-}
-
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/java-config-2/pym/java_config
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/java-config-2/pym/java_config
-	einfo "The way Java is handled on Gentoo has been recently updated."
-	einfo "If you have not done so already, you should follow the"
-	einfo "instructions available at:"
-	einfo "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
-}
diff --git a/dev-java/java-config/java-config-2.0.26-r5.ebuild b/dev-java/java-config/java-config-2.0.26-r5.ebuild
deleted file mode 100644
index c421b8212eca..000000000000
--- a/dev-java/java-config/java-config-2.0.26-r5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 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.0.26-r5.ebuild,v 1.1 2006/07/29 20:27:17 nichoj Exp $
-
-inherit base distutils eutils
-
-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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/python"
-RDEPEND="virtual/python
-	dev-java/java-config-wrapper"
-
-PATCHES="${FILESDIR}/${P}-nsplugin.patch ${FILESDIR}/${P}-set_number.patch \
-	${FILESDIR}/${P}-nsplugin_ls_stderr.patch \
-	${FILESDIR}/${P}-jconsole.patch"
-
-src_install() {
-	distutils_src_install
-
-	insinto /usr/share/java-config-2/config/
-	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86; do
-		if use ${i}; then
-			newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch	config not found"
-		fi
-	done
-
-	for tool in $(< config/symlink-tools); do
-		dosym /usr/bin/run-java-tool /usr/bin/${tool}
-	done
-}
-
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/java-config-2/pym/java_config
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/java-config-2/pym/java_config
-	einfo "The way Java is handled on Gentoo has been recently updated."
-	einfo "If you have not done so already, you should follow the"
-	einfo "instructions available at:"
-	einfo "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
-}
diff --git a/dev-java/java-config/java-config-2.0.26-r6.ebuild b/dev-java/java-config/java-config-2.0.26-r6.ebuild
deleted file mode 100644
index 94da4420118d..000000000000
--- a/dev-java/java-config/java-config-2.0.26-r6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2006 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.0.26-r6.ebuild,v 1.1 2006/08/03 02:13:58 nichoj Exp $
-
-inherit base distutils eutils
-
-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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="virtual/python"
-RDEPEND="virtual/python
-	dev-java/java-config-wrapper"
-
-PATCHES="${FILESDIR}/${P}-nsplugin.patch ${FILESDIR}/${P}-set_number.patch \
-	${FILESDIR}/${P}-nsplugin_ls_stderr.patch \
-	${FILESDIR}/${P}-jconsole.patch"
-
-src_install() {
-	distutils_src_install
-
-	insinto /usr/share/java-config-2/config/
-	for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86; do
-		if use ${i}; then
-			newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch	config not found"
-		fi
-	done
-
-	for tool in $(< config/symlink-tools); do
-		dosym /usr/bin/run-java-tool /usr/bin/${tool}
-	done
-
-	# Install profile.d for setting JAVA_HOME
-	dodir /etc/profile.d
-	exeinto /etc/profile.d
-	newexe ${FILESDIR}/${PN}-${SLOT}.profiled ${PN}-${SLOT}.sh
-}
-
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/java-config-2/pym/java_config
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/java-config-2/pym/java_config
-	einfo "The way Java is handled on Gentoo has been recently updated."
-	einfo "If you have not done so already, you should follow the"
-	einfo "instructions available at:"
-	einfo "http://www.gentoo.org/proj/en/java/java-upgrade.xml"
-}