Version bump of 1.4 SLOT, now also applies the patch from bug #126105 because at...

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index 4028fc6c7917a883caa63de77afe617e79b4a12a..af40822540c156b88714b2c2cc2b3d4e1a68029f 100644 (file)
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -6,21 +6,28 @@ AUX ibm-jdk-bin-1.4.env 1125 RMD160 9ee81d807088259b7c2f0a5062965e0e94195cef SHA
 MD5 e37ccf364b849b3bb5d11f25228927c2 files/ibm-jdk-bin-1.4.env 1125
 RMD160 9ee81d807088259b7c2f0a5062965e0e94195cef files/ibm-jdk-bin-1.4.env 1125
 SHA256 72c0d5ac1ea2e132a40a8e74402d01faa6c99af6abc8465bf8c4c7a4be03a2a1 files/ibm-jdk-bin-1.4.env 1125
-AUX ibm-jdk-bin-1.5.0.3-jawt-h.patch 377 RMD160 d9e5eab16ca4002b00ca70d55fb3a3112d0011dd SHA1 5fa611adbdf036678bb0d582d2013225251d5a9e SHA256 87d54a556d706c1f4ab0f2cd98cd89c354e69c3caf83518f687d6cac11cfb8ff
-MD5 c571cbaa0d1b37682528b8b90573d051 files/ibm-jdk-bin-1.5.0.3-jawt-h.patch 377
-RMD160 d9e5eab16ca4002b00ca70d55fb3a3112d0011dd files/ibm-jdk-bin-1.5.0.3-jawt-h.patch 377
-SHA256 87d54a556d706c1f4ab0f2cd98cd89c354e69c3caf83518f687d6cac11cfb8ff files/ibm-jdk-bin-1.5.0.3-jawt-h.patch 377
 AUX ibm-jdk-bin-1.5.env 1125 RMD160 39e84106fd3b6a1106a99b81472936320b1585ba SHA1 c73e1a50b07b6a5255a9e6e81c3ccc5d3be77f50 SHA256 215af1e5143626956a98b631b683cf1e71d4c9272edd8cd571dc763ae75e9234
 MD5 04a66efa73f1153ed512e93c823f7eab files/ibm-jdk-bin-1.5.env 1125
 RMD160 39e84106fd3b6a1106a99b81472936320b1585ba files/ibm-jdk-bin-1.5.env 1125
 SHA256 215af1e5143626956a98b631b683cf1e71d4c9272edd8cd571dc763ae75e9234 files/ibm-jdk-bin-1.5.env 1125
+AUX ibm-jdk-bin-jawt.h.patch 377 RMD160 d9e5eab16ca4002b00ca70d55fb3a3112d0011dd SHA1 5fa611adbdf036678bb0d582d2013225251d5a9e SHA256 87d54a556d706c1f4ab0f2cd98cd89c354e69c3caf83518f687d6cac11cfb8ff
+MD5 c571cbaa0d1b37682528b8b90573d051 files/ibm-jdk-bin-jawt.h.patch 377
+RMD160 d9e5eab16ca4002b00ca70d55fb3a3112d0011dd files/ibm-jdk-bin-jawt.h.patch 377
+SHA256 87d54a556d706c1f4ab0f2cd98cd89c354e69c3caf83518f687d6cac11cfb8ff files/ibm-jdk-bin-jawt.h.patch 377
 DIST IBMJava2-142-ia32-SDK-1.4.2-6.0.i386.rpm 58525734 RMD160 ee54add99e586bf8b968d57532264e553302f1b7 SHA1 25b99e3ce5017f996f4521458f9c1a8d3c7c4145 SHA256 fdc9d0e841c85f7a11001bf95faef54d045e38f8628dd6538273838f3de096d6
+DIST IBMJava2-142-ia32-SDK-1.4.2-7.0.i386.rpm 58600739 RMD160 001b31d128ed10215ca4b25c9367234ceca917c4 SHA1 4f145917f03033d609cd4dd3a23cd0111dc05d4e SHA256 3c858493e83701ee083a4da922c1cfc73dde84cb8a34526d1cfbdf7601c73100
 DIST IBMJava2-142-ppc32-SDK-1.4.2-6.0.ppc.rpm 61302067 RMD160 fe80bdad101c5fd5ecd5a618c1aaaf3a2a427c27 SHA1 45e3b885568c7371a3c708ffb18c50dd34662bac SHA256 16052150d8c22bfc0906fcc81c2d11c8dbaf84a250d068e843f953e0a121cc17
+DIST IBMJava2-142-ppc32-SDK-1.4.2-7.0.ppc.rpm 66191985 RMD160 0b77d8c3b82acff94e866162b6bea1dc28e98812 SHA1 20bafbeccc1bdfba963d3c55615df005a245f7b7 SHA256 c04cd708e09713a7504b87c6abbb80f2219cdf77ebb03f3c9031f75fe8813dd0
 DIST IBMJava2-142-ppc64-SDK-1.4.2-6.0.ppc64.rpm 58302316 RMD160 155d132b25d990c876762474c10a0b57790a8cb9 SHA1 2c2efb68db09800ed51eeea1b6e0c0c057e782bb SHA256 6393faa4becec892292192db0827c03f3984ad2e7ef09a209e801d88527366f9
+DIST IBMJava2-142-ppc64-SDK-1.4.2-7.0.ppc64.rpm 64389005 RMD160 f6d29a181ec778148e69a1f05d3645c3acc7e62e SHA1 dbb9085d3858805bfcdbbfa8f10c5a1d7377c46c SHA256 999af5dbc1ed0aabc6f81e9807a54861df29f2cab37a750087bc8c3a5c4a8b4d
 DIST IBMJava2-142-z31-SDK-1.4.2-6.0.s390.rpm 54720659 RMD160 ce4f51f0b2d6ce6e0a4004d78c3596bca06d4f30 SHA1 11eb70c8e603ec537f6878fe194cd6022d3e634a SHA256 42af9a1bb57c3036ce378cba87ba20e21bef8781787c3f6c6e9a9f4875eefadb
+DIST IBMJava2-142-z31-SDK-1.4.2-7.0.s390.rpm 54794650 RMD160 dbdfc1661057847d6002a8e14ca4f12267cebc02 SHA1 d7f04f4c165352ff65ad760ce5587fc980d5cb20 SHA256 9631e42f57a72d2127504e71a23a1598a44eb88789d05d76addbbbf4260a7918
 DIST IBMJava2-AMD64-142-SDK-1.4.2-6.0.x86_64.rpm 52722325 RMD160 f2d1fe49a606c204dbc0b0bdd054b7ec8bb7ca63 SHA1 c5659f4d3e658a7642f51513c4d2d8789a705d9a SHA256 4bfd9461aec661fee1584920bb2d0a4274c8ac592eec612f724824cf2790d7f1
+DIST IBMJava2-AMD64-142-SDK-1.4.2-7.0.x86_64.rpm 52762987 RMD160 57e4dda6b0dd8780bf495da0dfa10f84e8172948 SHA1 1b085c7195aee66c5d75316972aec3f90c78183b SHA256 04bd30e3a2b5ae2cabc5c052b73afc5dd4b8196f922f6916d318d90ff7435321
 DIST IBMJava2-JAVACOMM-1.4.2-6.0.i386.rpm 121766 RMD160 e543dac45fac2773fd0f54f6b1b516eefc24763e SHA1 32fd6ca156df6b1b7d840cb76f32e3f0943e9e89 SHA256 749c6400a7a78e7300ef5cc9e588c490b788661b0917586cca6d07639711cebd
+DIST IBMJava2-JAVACOMM-1.4.2-7.0.i386.rpm 121766 RMD160 64088291369bc4f75f83467bbd674f0396e7d77e SHA1 0bafc9aecaad9756426a9556c13e1177853d9050 SHA256 5cc7e42477aa62d6c50668b53b21bb464aa4dcb031844994a50394d30da2626e
 DIST IBMJava2-JAVACOMM-AMD64-1.4.2-6.0.x86_64.rpm 123609 RMD160 449904345b1377568264e348ba2c71811472a61d SHA1 6e23299873b8e660c2ff94843631aa253780b2c7 SHA256 ff13b4cb1fcfb5ef658cbab8725ef896a64da496b95bcbd05981dba1a0499f30
+DIST IBMJava2-JAVACOMM-AMD64-1.4.2-7.0.x86_64.rpm 123608 RMD160 58ca636893249e0c476d316c491f09568aaa995b SHA1 c1c8b7057993de69cb949be59d6541921eabacdc SHA256 519300df0c1144e600c29172f84cdeea739b29f83640b8f6b69b3d02996ed3ed
 DIST ibm-java2-i386-javacomm-5.0-3.0.i386.rpm 125502 RMD160 7f730b454c73f95f59589735713d748736c6e7a5 SHA1 f0fe51d0e2c1a126d885a10afc6dd8776bff4899 SHA256 5766c8d8656c7dff6defda953954dee8f22d18c6dfbadb889bc5b27534ebd730
 DIST ibm-java2-i386-sdk-5.0-3.0.i386.rpm 63033967 RMD160 dd32bc82e274923bb23e538942f727f1cbf36528 SHA1 b951f1d75a984dff3ef18b1689fdda88ecd84c9a SHA256 6455de039dac7c5ee6642d04940b2704fdf611f6275914821fdc548ee685ecd8
 DIST ibm-java2-ppc-javacomm-5.0-3.0.ppc.rpm 133427 RMD160 082e914b846803bbb5b777dad28dc93cc605ecc8 SHA1 80160b02fc49e3dbde4c9b3b54488eddcaf81f03 SHA256 c1179604922b978d720fc15b1eca24c411d0bd61cb3e006e147c19cf8376cafa
@@ -29,22 +36,26 @@ DIST ibm-java2-ppc64-javacomm-5.0-3.0.ppc64.rpm 135853 RMD160 a7853bfc8c33eda880
 DIST ibm-java2-ppc64-sdk-5.0-3.0.ppc64.rpm 68640918 RMD160 9ba5e027ea38aaf2164e5eeb88eface227d7c8d0 SHA1 5f6877c9ee836143bb55f9b57fc25568d5d62b2d SHA256 74771d4d40f044f54a93d0711937976afc840e4f117b4f0d46609d361e421727
 DIST ibm-java2-x86_64-javacomm-5.0-3.0.x86_64.rpm 127812 RMD160 e574bebd9ab5ddc82b68a585e927c574de4f19f7 SHA1 ea3b0fb184f3e651e5be5e606e4828985e75352f SHA256 fc1c7ce4a63ac61c76c99125218e504598849398645be711f6c44d47c6a4e54c
 DIST ibm-java2-x86_64-sdk-5.0-3.0.x86_64.rpm 64564753 RMD160 1d6c9441b1b7ce62b6e7967509ad3cb0732543ec SHA1 74e0b3f6590669905e3bd9f8dedaf03ca731cddc SHA256 75fe72f73c226084c21e7f63bd5267006c48daa7121f47c9034aad00c48e29a4
-EBUILD ibm-jdk-bin-1.4.2.6-r4.ebuild 4896 RMD160 ec7bc6ac93ceacf2230af3684797c35d39285ddf SHA1 acc57205227e5ba330d846269d7e3e2b7adba221 SHA256 20f1819e9b40d6c529661621243adb1cb03378385ca700df30523073309af836
-MD5 b51018207af413c770df7ad3feacddec ibm-jdk-bin-1.4.2.6-r4.ebuild 4896
-RMD160 ec7bc6ac93ceacf2230af3684797c35d39285ddf ibm-jdk-bin-1.4.2.6-r4.ebuild 4896
-SHA256 20f1819e9b40d6c529661621243adb1cb03378385ca700df30523073309af836 ibm-jdk-bin-1.4.2.6-r4.ebuild 4896
-EBUILD ibm-jdk-bin-1.5.0.3-r1.ebuild 7613 RMD160 12cff60154170a1d2e9a8ed94a28669b565742e0 SHA1 84656d3af82e066e3d802efadf8442e3ea9c9b96 SHA256 fd215007290d6ff8cc9937018cbd974482ff44a8e8f32801cb98bf6f43e8afb1
-MD5 fd3c7f6af8ec5041ce7654fd0dc14c01 ibm-jdk-bin-1.5.0.3-r1.ebuild 7613
-RMD160 12cff60154170a1d2e9a8ed94a28669b565742e0 ibm-jdk-bin-1.5.0.3-r1.ebuild 7613
-SHA256 fd215007290d6ff8cc9937018cbd974482ff44a8e8f32801cb98bf6f43e8afb1 ibm-jdk-bin-1.5.0.3-r1.ebuild 7613
+EBUILD ibm-jdk-bin-1.4.2.6-r4.ebuild 5346 RMD160 7ea22ecc6e4a1259a1b659a82260650659337244 SHA1 dc6ed8638eaa7cac776fd855b3a7f0cb0228f7ed SHA256 c252eea6b89cd543050f5310f1af985b7af291ecc31dfda01fba52a8b64484e0
+MD5 4e2b3238f15d6051aca0e744d02e2f0a ibm-jdk-bin-1.4.2.6-r4.ebuild 5346
+RMD160 7ea22ecc6e4a1259a1b659a82260650659337244 ibm-jdk-bin-1.4.2.6-r4.ebuild 5346
+SHA256 c252eea6b89cd543050f5310f1af985b7af291ecc31dfda01fba52a8b64484e0 ibm-jdk-bin-1.4.2.6-r4.ebuild 5346
+EBUILD ibm-jdk-bin-1.4.2.7.ebuild 5449 RMD160 5b980a7901ec0dea4439472cc39594c6976d7fca SHA1 4b6d0eb637c882c0e9a60b940d43d436e411c268 SHA256 a4be61f8b76ff6b791b4f545b2dc74a0f2140c7f786d817c69efb2dd3dff07a9
+MD5 8a85c7fbae9d98dd227e0d394c6e9cc2 ibm-jdk-bin-1.4.2.7.ebuild 5449
+RMD160 5b980a7901ec0dea4439472cc39594c6976d7fca ibm-jdk-bin-1.4.2.7.ebuild 5449
+SHA256 a4be61f8b76ff6b791b4f545b2dc74a0f2140c7f786d817c69efb2dd3dff07a9 ibm-jdk-bin-1.4.2.7.ebuild 5449
+EBUILD ibm-jdk-bin-1.5.0.3-r1.ebuild 7919 RMD160 a4620818850c417223ee2309a0e7cdd8c0542a6b SHA1 8c7943011d3234f282b33240640ac8bdcc9a9ab6 SHA256 5add3337f4b002ecac4faa3a4379f3025b1c84d71f4c980773b829e9dc5870e6
+MD5 dec5eaf0c68be38fc8fa7d24245e33c2 ibm-jdk-bin-1.5.0.3-r1.ebuild 7919
+RMD160 a4620818850c417223ee2309a0e7cdd8c0542a6b ibm-jdk-bin-1.5.0.3-r1.ebuild 7919
+SHA256 5add3337f4b002ecac4faa3a4379f3025b1c84d71f4c980773b829e9dc5870e6 ibm-jdk-bin-1.5.0.3-r1.ebuild 7919
 EBUILD ibm-jdk-bin-1.5.0.3.ebuild 7505 RMD160 d796df42f0dfae8440350ea0d899d9476c7d0c72 SHA1 50ff2330713b2e9b1f4ffa85799226ed0c3f7be1 SHA256 5ce4cfd16db75fa8f0ce2e2a84879191016dd4501a2dcbd9ec16e7bbe31a164e
 MD5 fb8fa3c8a3745bd56aef7203515a3f61 ibm-jdk-bin-1.5.0.3.ebuild 7505
 RMD160 d796df42f0dfae8440350ea0d899d9476c7d0c72 ibm-jdk-bin-1.5.0.3.ebuild 7505
 SHA256 5ce4cfd16db75fa8f0ce2e2a84879191016dd4501a2dcbd9ec16e7bbe31a164e ibm-jdk-bin-1.5.0.3.ebuild 7505
-MISC ChangeLog 15886 RMD160 b5e10f693e5067d16abbeec5e79e65c2fd433fb0 SHA1 ac9ed989b5065e2ab9c72131db3d3adacb798f33 SHA256 d4f94ef6ade0d4693ae9baf65e1932aed5e568fa6f43050376ceefd3c69f91f0
-MD5 3336afc6a36a770d248bfebeefb7fa06 ChangeLog 15886
-RMD160 b5e10f693e5067d16abbeec5e79e65c2fd433fb0 ChangeLog 15886
-SHA256 d4f94ef6ade0d4693ae9baf65e1932aed5e568fa6f43050376ceefd3c69f91f0 ChangeLog 15886
+MISC ChangeLog 16494 RMD160 163aa68ed21e4c1ca3fea816d94c56acd4896748 SHA1 acc3056440ff55d294c844d7933c3d989718b5da SHA256 993b5c1861cfdbd1b58db490d943a5e442a3c7efe171e9c4559c346be8db11cb
+MD5 2a422b31c1fd3d134f3b385a78ccce5c ChangeLog 16494
+RMD160 163aa68ed21e4c1ca3fea816d94c56acd4896748 ChangeLog 16494
+SHA256 993b5c1861cfdbd1b58db490d943a5e442a3c7efe171e9c4559c346be8db11cb ChangeLog 16494
 MISC metadata.xml 219 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e SHA1 7f610c6c183a353d1969b4d9ac48e01629830026 SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428
 MD5 4a3cb4232103a0de9bd143a145086a7b metadata.xml 219
 RMD160 2b7340f3ca0725d19839049c85a644fb2bb55b5e metadata.xml 219
@@ -52,6 +63,9 @@ SHA256 97628c0f582c0835c18b9ea2d722a316084d64ded80d4e1be2db984a2c292428 metadata
 MD5 35ce90be8c07b578b83a0813986813f2 files/digest-ibm-jdk-bin-1.4.2.6-r4 2149
 RMD160 0fca43d73aec0e76916059a2eb7ca441c5d8eddb files/digest-ibm-jdk-bin-1.4.2.6-r4 2149
 SHA256 b6fa2ae167cd41f796b7638c70ef9f8e1fb91e1fe212f2d77bb38d569b5573f2 files/digest-ibm-jdk-bin-1.4.2.6-r4 2149
+MD5 419c8a8434af302dad581a66c4f84366 files/digest-ibm-jdk-bin-1.4.2.7 2149
+RMD160 8b10b0ac20175accaff97c0e9a6a6feda9325caa files/digest-ibm-jdk-bin-1.4.2.7 2149
+SHA256 6c7f0571514f33f693e756e05621567f4d70e27c3c0ead655dee5b9539a046dd files/digest-ibm-jdk-bin-1.4.2.7 2149
 MD5 bb9a5af9ad7ff0deddf4774fae62c81a files/digest-ibm-jdk-bin-1.5.0.3 2396
 RMD160 fda8627b96f7aa9352f3b4e682a3beb2c50a2e33 files/digest-ibm-jdk-bin-1.5.0.3 2396
 SHA256 e961c91ba6dc3a8afb2e2d763a0d92a82c6a178ea7800b8ab3cce00ecebe5af8 files/digest-ibm-jdk-bin-1.5.0.3 2396

diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.0.3-jawt-h.patch b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.0.3-jawt-h.patch
deleted file mode 100644 (file)
index c3fa40c..0000000
--- a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-1.5.0.3-jawt-h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/jawt.h     2006/07/20 23:02:04     1.1
-+++ include/jawt.h     2006/07/20 23:03:13
-@@ -298,7 +298,9 @@ typedef struct jawt {
-  * Get the AWT native structure.  This function returns JNI_FALSE if
-  * an error occurs.
-  */
-+#ifdef _JNI_IMPORT_OR_EXPORT_
- _JNI_IMPORT_OR_EXPORT_
-+#endif
- jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt);
- 
- #define JAWT_VERSION_1_3 0x00010003