Move rename of rmic/rmiregistry from 3.x ebuilds to toolchain.eclass - bug #139918

Package-Manager: portage-2.1.1_pre2-r6

12 files changed, 64 insertions, 388 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 8025a133ce1a..adb68df7e04f 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.563 2006/07/15 23:06:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.564 2006/07/28 06:39:21 kevquinn Exp $
+
+  28 Jul 2006; Kevin F. Quinn <kevquinn@gentoo.org> gcc-3.3.5-r1.ebuild,
+  gcc-3.3.5.20050130-r1.ebuild, gcc-3.3.6.ebuild, gcc-3.3.6-r1.ebuild,
+  gcc-3.4.4-r1.ebuild, gcc-3.4.5.ebuild, gcc-3.4.5-r1.ebuild,
+  gcc-3.4.6.ebuild, gcc-3.4.6-r1.ebuild, gcc-3.4.6-r2.ebuild:
+  Move rename of rmic/rmiregistry from ebuilds to toolchain.eclass - bug #139918
 
 *gcc-4.2.0_alpha20060715 (15 Jul 2006)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index aefaeff1541d..81b1bb0310fd 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -379,50 +379,50 @@ EBUILD gcc-3.3.2-r7.ebuild 20027 RMD160 f2a23e65d0c196364acfcf1fd1a1491ad3d0d207
 MD5 032ee27df15d7a0c8f940e06e9aae17a gcc-3.3.2-r7.ebuild 20027
 RMD160 f2a23e65d0c196364acfcf1fd1a1491ad3d0d207 gcc-3.3.2-r7.ebuild 20027
 SHA256 451f821f6f99d9e6307c09ef3a6d28ad6eb82e9fc3afed9b5a4bd452683128fc gcc-3.3.2-r7.ebuild 20027
-EBUILD gcc-3.3.5-r1.ebuild 5529 RMD160 b67bb7ec7b80163f37fd3dd4d555e456df88d502 SHA1 8e327693838693e6d4188d982ae86a40a9a234a6 SHA256 538b06d98878e00875cf650d6c743f4d368d29bda99fe1f42265d6d9fab6b679
-MD5 d1163b9fedde635f1f9c0dad7371c095 gcc-3.3.5-r1.ebuild 5529
-RMD160 b67bb7ec7b80163f37fd3dd4d555e456df88d502 gcc-3.3.5-r1.ebuild 5529
-SHA256 538b06d98878e00875cf650d6c743f4d368d29bda99fe1f42265d6d9fab6b679 gcc-3.3.5-r1.ebuild 5529
-EBUILD gcc-3.3.5.20050130-r1.ebuild 4961 RMD160 20884b989c9625a45e58bd219b37ec1ca8299ed3 SHA1 9acee48b24b6264fbf5273f915de0a941b94c2a9 SHA256 fd764ea13b43c1e0f0537890d73208741d90c499c25fa41c75cf827b9bcecfb0
-MD5 78108c740f7ad214d447eff76bf70b3a gcc-3.3.5.20050130-r1.ebuild 4961
-RMD160 20884b989c9625a45e58bd219b37ec1ca8299ed3 gcc-3.3.5.20050130-r1.ebuild 4961
-SHA256 fd764ea13b43c1e0f0537890d73208741d90c499c25fa41c75cf827b9bcecfb0 gcc-3.3.5.20050130-r1.ebuild 4961
-EBUILD gcc-3.3.6-r1.ebuild 4925 RMD160 b03c2f7f9dbafebc3a4c6cf80b25d9ff89a43ccd SHA1 7ce936bd2e5cfbf788113378d0e4fac3cec4358d SHA256 cedfd869b4364cfc9edf03cfea1602e9c7e46d8e8dd3d123b5dd99f8f782fbb8
-MD5 769fb1b947e40dd47669dbef96bdd295 gcc-3.3.6-r1.ebuild 4925
-RMD160 b03c2f7f9dbafebc3a4c6cf80b25d9ff89a43ccd gcc-3.3.6-r1.ebuild 4925
-SHA256 cedfd869b4364cfc9edf03cfea1602e9c7e46d8e8dd3d123b5dd99f8f782fbb8 gcc-3.3.6-r1.ebuild 4925
-EBUILD gcc-3.3.6.ebuild 4918 RMD160 f79635605a9e0e370985c8fb64d00b8e90c36ba8 SHA1 a1cb7dd41690b2bc668136d017a0af70f6f646de SHA256 5040a8b48e4d9c722c52bda3ef2129c8f2a1e7a07e85e99300655844b4417e0c
-MD5 b137dcce64f313a57e04d76552727300 gcc-3.3.6.ebuild 4918
-RMD160 f79635605a9e0e370985c8fb64d00b8e90c36ba8 gcc-3.3.6.ebuild 4918
-SHA256 5040a8b48e4d9c722c52bda3ef2129c8f2a1e7a07e85e99300655844b4417e0c gcc-3.3.6.ebuild 4918
+EBUILD gcc-3.3.5-r1.ebuild 3755 RMD160 4bb40f9d9e5a25aea604bb708a2f0f60bd46901e SHA1 b10ca6a1bf7ca378598cc38042621ccacf527463 SHA256 1484f30e61cb00511c56c3cd851cbc30b765968e6a6d6dc9c54b0669e50f22e9
+MD5 c0784fddcaad4fe27ac03ce823b5a0f4 gcc-3.3.5-r1.ebuild 3755
+RMD160 4bb40f9d9e5a25aea604bb708a2f0f60bd46901e gcc-3.3.5-r1.ebuild 3755
+SHA256 1484f30e61cb00511c56c3cd851cbc30b765968e6a6d6dc9c54b0669e50f22e9 gcc-3.3.5-r1.ebuild 3755
+EBUILD gcc-3.3.5.20050130-r1.ebuild 3187 RMD160 ce6b00cd861445b10c91e62910c228ce367e08f9 SHA1 7adcf82adbac6d21331feb9a9bed395798ed5dc6 SHA256 5038e90953afa76718e97c1cc6d8a98e6c55cbe9d0b489a05b9de1e521699ef6
+MD5 3d97ad30f7655ba244980656eb922118 gcc-3.3.5.20050130-r1.ebuild 3187
+RMD160 ce6b00cd861445b10c91e62910c228ce367e08f9 gcc-3.3.5.20050130-r1.ebuild 3187
+SHA256 5038e90953afa76718e97c1cc6d8a98e6c55cbe9d0b489a05b9de1e521699ef6 gcc-3.3.5.20050130-r1.ebuild 3187
+EBUILD gcc-3.3.6-r1.ebuild 3151 RMD160 48dd07ea5449dc6d252d9dbd2cdfb430f6354f47 SHA1 f2d23bc5bbae06cfbf466412a356d9f60152d4cd SHA256 744fe4d16673af471a01732df776f64f172eff0670786c66366e89e416659e73
+MD5 0140e8e2b055d45e98f15eb5a33535e1 gcc-3.3.6-r1.ebuild 3151
+RMD160 48dd07ea5449dc6d252d9dbd2cdfb430f6354f47 gcc-3.3.6-r1.ebuild 3151
+SHA256 744fe4d16673af471a01732df776f64f172eff0670786c66366e89e416659e73 gcc-3.3.6-r1.ebuild 3151
+EBUILD gcc-3.3.6.ebuild 3144 RMD160 f6ccef299ea8fc60b8df29314ef5f002cf3cd22e SHA1 d661bf8cbdab562a48b1aa465958a3df81682a16 SHA256 a2f077585d0372b05e59d5bc406d8c82efe0b1340d64fc46cad5deba9e022383
+MD5 27a1db4e15fa0ad7f169a290d6790e20 gcc-3.3.6.ebuild 3144
+RMD160 f6ccef299ea8fc60b8df29314ef5f002cf3cd22e gcc-3.3.6.ebuild 3144
+SHA256 a2f077585d0372b05e59d5bc406d8c82efe0b1340d64fc46cad5deba9e022383 gcc-3.3.6.ebuild 3144
 EBUILD gcc-3.4.1-r3.ebuild 29760 RMD160 af4e1fca9815c6d43ce16a3332bdfc8c9bc8355d SHA1 b4b1c6cbd03e2b3a97c9779cd9e341f9494f68f4 SHA256 249c8b73667bdbc9ef7a82eff613a3d25c5f5dbaf22bc9e01b1371529eee04c5
 MD5 7ea8098ad557c8bebebd184f46a2c5e2 gcc-3.4.1-r3.ebuild 29760
 RMD160 af4e1fca9815c6d43ce16a3332bdfc8c9bc8355d gcc-3.4.1-r3.ebuild 29760
 SHA256 249c8b73667bdbc9ef7a82eff613a3d25c5f5dbaf22bc9e01b1371529eee04c5 gcc-3.4.1-r3.ebuild 29760
-EBUILD gcc-3.4.4-r1.ebuild 6887 RMD160 cfb5518539e1500e4a73238420cb3b978d21b6af SHA1 c0cb34df06f8d66710d4b91923ea2d37ad97de9a SHA256 92bcddf9015c47baf605f588202d86bd6be5fa7f2b0c7f1bb90daf99f902fc4e
-MD5 5d7b0d475beee7446b3180a47da94022 gcc-3.4.4-r1.ebuild 6887
-RMD160 cfb5518539e1500e4a73238420cb3b978d21b6af gcc-3.4.4-r1.ebuild 6887
-SHA256 92bcddf9015c47baf605f588202d86bd6be5fa7f2b0c7f1bb90daf99f902fc4e gcc-3.4.4-r1.ebuild 6887
-EBUILD gcc-3.4.5-r1.ebuild 7040 RMD160 26c890c7acdfcc18fb821e75a1ff4127cbc25036 SHA1 0b039ea423d06edc721b38a2ff54620845c356cc SHA256 9864ce1fcad35eb3a4c9c020d76d650c2ed1eb2d42c73f9375b6eec6fa0949ef
-MD5 05b342a9a27b5bc8777d5d670efee837 gcc-3.4.5-r1.ebuild 7040
-RMD160 26c890c7acdfcc18fb821e75a1ff4127cbc25036 gcc-3.4.5-r1.ebuild 7040
-SHA256 9864ce1fcad35eb3a4c9c020d76d650c2ed1eb2d42c73f9375b6eec6fa0949ef gcc-3.4.5-r1.ebuild 7040
-EBUILD gcc-3.4.5.ebuild 6790 RMD160 69cbf78e50f73acec524f5eb50cb45a2487564d8 SHA1 6eff20316dc89106ed9cc9f46efbf88a6a23c346 SHA256 41a82e4e9dc57c5d3581aedfa2e0617430632ad295129a1c3333e41bf730d474
-MD5 c4e8ba5d6634c56ba7b243b31e3e0d90 gcc-3.4.5.ebuild 6790
-RMD160 69cbf78e50f73acec524f5eb50cb45a2487564d8 gcc-3.4.5.ebuild 6790
-SHA256 41a82e4e9dc57c5d3581aedfa2e0617430632ad295129a1c3333e41bf730d474 gcc-3.4.5.ebuild 6790
-EBUILD gcc-3.4.6-r1.ebuild 6887 RMD160 8ac365fd743737eaec1eb06e60cfdb007bbca234 SHA1 ce8b9c98a983f60771881fa98435bf7f9efb639f SHA256 93178866c9189571f97d95ea5f14600f2dc0744f0b6817a9baedc12a2918769e
-MD5 68e4e53ad103ee8a7fb17db55f01fd3f gcc-3.4.6-r1.ebuild 6887
-RMD160 8ac365fd743737eaec1eb06e60cfdb007bbca234 gcc-3.4.6-r1.ebuild 6887
-SHA256 93178866c9189571f97d95ea5f14600f2dc0744f0b6817a9baedc12a2918769e gcc-3.4.6-r1.ebuild 6887
-EBUILD gcc-3.4.6-r2.ebuild 6895 RMD160 9e0f19e973b755237d2cfc9df46c9ca257cb3f54 SHA1 9933594d93213126f39ed49a74b9386323e68117 SHA256 6e6691579a37a610605aee88dd695cebd394fb9e94a46912935a3f7c28c735b6
-MD5 87142d96b71cac96878a0db6b6d94e0b gcc-3.4.6-r2.ebuild 6895
-RMD160 9e0f19e973b755237d2cfc9df46c9ca257cb3f54 gcc-3.4.6-r2.ebuild 6895
-SHA256 6e6691579a37a610605aee88dd695cebd394fb9e94a46912935a3f7c28c735b6 gcc-3.4.6-r2.ebuild 6895
-EBUILD gcc-3.4.6.ebuild 6872 RMD160 b3cbc96e6cfabed5cf77848b94c3ef9e8d77436f SHA1 a1167c287f285e7daac7ab37b76f8d4e7864709f SHA256 6ebae8d0221dd770d96a26bfb7a0e5bce0afe6f037b1b8399d297a65fe8ac769
-MD5 0ff69f87e10e6f959b2cc98b02df5f01 gcc-3.4.6.ebuild 6872
-RMD160 b3cbc96e6cfabed5cf77848b94c3ef9e8d77436f gcc-3.4.6.ebuild 6872
-SHA256 6ebae8d0221dd770d96a26bfb7a0e5bce0afe6f037b1b8399d297a65fe8ac769 gcc-3.4.6.ebuild 6872
+EBUILD gcc-3.4.4-r1.ebuild 5113 RMD160 26cfd3b3f00fa13942dc1893474aef8e7d77bc58 SHA1 bcc9a5b806ef0fe3af948d8abec9a60ed9c580bf SHA256 2f7ff481e5269b7a65d4eb7e86569e2011bb5ba20ca022a3752794e18e6208d5
+MD5 3dbed8469774ad3a7d63ef19ff1d3cbe gcc-3.4.4-r1.ebuild 5113
+RMD160 26cfd3b3f00fa13942dc1893474aef8e7d77bc58 gcc-3.4.4-r1.ebuild 5113
+SHA256 2f7ff481e5269b7a65d4eb7e86569e2011bb5ba20ca022a3752794e18e6208d5 gcc-3.4.4-r1.ebuild 5113
+EBUILD gcc-3.4.5-r1.ebuild 5266 RMD160 1c901a89ad40fa76c2dfc8b1eba1006884f43aee SHA1 e93c9a194c71d89137eee73c4b2babdc3b577b60 SHA256 fa59050dd4f733e093f1be992dfc92034cf3ab64195ce927354c14455e43d7e0
+MD5 9468458a8dbe114d29c40c0b7e9f7383 gcc-3.4.5-r1.ebuild 5266
+RMD160 1c901a89ad40fa76c2dfc8b1eba1006884f43aee gcc-3.4.5-r1.ebuild 5266
+SHA256 fa59050dd4f733e093f1be992dfc92034cf3ab64195ce927354c14455e43d7e0 gcc-3.4.5-r1.ebuild 5266
+EBUILD gcc-3.4.5.ebuild 5016 RMD160 550d708bdc6c338c868020ca4a0612d65133c93e SHA1 7e932c15df47bb87383dcb818b9d1ca80ec99e3f SHA256 77861ae122978ae8f9f288f896532cac060518c89506557d7255e54cf0b922dd
+MD5 46eec3b1747d4609e1594b13bdd9ad5c gcc-3.4.5.ebuild 5016
+RMD160 550d708bdc6c338c868020ca4a0612d65133c93e gcc-3.4.5.ebuild 5016
+SHA256 77861ae122978ae8f9f288f896532cac060518c89506557d7255e54cf0b922dd gcc-3.4.5.ebuild 5016
+EBUILD gcc-3.4.6-r1.ebuild 5113 RMD160 c795da32abe602ffb2ef5d248f3f146a52adeccd SHA1 7f51827bdf8396c932ff7361d53d2116d0e89191 SHA256 fb0da73df51bff9b513c711a7f3324ba0c7314367fd29e06c5e2331d93c63d0e
+MD5 22eefbf85e4219df73a60800458a159a gcc-3.4.6-r1.ebuild 5113
+RMD160 c795da32abe602ffb2ef5d248f3f146a52adeccd gcc-3.4.6-r1.ebuild 5113
+SHA256 fb0da73df51bff9b513c711a7f3324ba0c7314367fd29e06c5e2331d93c63d0e gcc-3.4.6-r1.ebuild 5113
+EBUILD gcc-3.4.6-r2.ebuild 5121 RMD160 75501117c9d16752d63d589307ad2e0bc4aef1b9 SHA1 33c6bd4ab45353c2571fad764ae9bad6c40c91f4 SHA256 a1217aa842463440b6917623266a733b34640ca87bb6a19816d89520e6d2e024
+MD5 6cbc6e366fac45b8e2cb1c46fab6d642 gcc-3.4.6-r2.ebuild 5121
+RMD160 75501117c9d16752d63d589307ad2e0bc4aef1b9 gcc-3.4.6-r2.ebuild 5121
+SHA256 a1217aa842463440b6917623266a733b34640ca87bb6a19816d89520e6d2e024 gcc-3.4.6-r2.ebuild 5121
+EBUILD gcc-3.4.6.ebuild 5098 RMD160 4d89f4b81e0d2659e41c6283b62631262d4df818 SHA1 47a74d74e1ad97f8f525ea4168f8f9b463d7ecbb SHA256 597020073c203ad9f5b4c1e31d83659cef3b963346649dd2f8913ce18824f172
+MD5 7e804788e41dc7e4e5f92e5da6d624bb gcc-3.4.6.ebuild 5098
+RMD160 4d89f4b81e0d2659e41c6283b62631262d4df818 gcc-3.4.6.ebuild 5098
+SHA256 597020073c203ad9f5b4c1e31d83659cef3b963346649dd2f8913ce18824f172 gcc-3.4.6.ebuild 5098
 EBUILD gcc-4.0.2-r3.ebuild 1998 RMD160 08b0660f42d82a9824f8de7252df79d3cff7b824 SHA1 196f539dccb80c90b8dcf7754e12a1e15cdaaa65 SHA256 e3d2393d6b7795a9e2fc778735eb6ad2f860ca559358e554bbbbf8bb4b519977
 MD5 db4baccf3b8d2abe6fafef81b72eee7e gcc-4.0.2-r3.ebuild 1998
 RMD160 08b0660f42d82a9824f8de7252df79d3cff7b824 gcc-4.0.2-r3.ebuild 1998
@@ -443,10 +443,10 @@ EBUILD gcc-4.2.0_alpha20060715.ebuild 1961 RMD160 6e0102b39a0c5adc2eaf8a14d49f56
 MD5 5fb69e1e629cfebf6441fa45cb9a08a5 gcc-4.2.0_alpha20060715.ebuild 1961
 RMD160 6e0102b39a0c5adc2eaf8a14d49f566d1202e81a gcc-4.2.0_alpha20060715.ebuild 1961
 SHA256 608fcbe1f1944fe5e8f46ca8c514255743452cbe62e028eda9712126d141b722 gcc-4.2.0_alpha20060715.ebuild 1961
-MISC ChangeLog 111693 RMD160 0990195a4c223ef1d19e3d3de5942449b5655d8c SHA1 b76cf1078376e424b6a20d9ce0bc8edf1152bcb6 SHA256 daeac48b6e19466faab68b0dc2f7e7178daa290789ad1e053191098ec0bdf0b6
-MD5 e1939d3d91e8c583c9ebd27242cc8263 ChangeLog 111693
-RMD160 0990195a4c223ef1d19e3d3de5942449b5655d8c ChangeLog 111693
-SHA256 daeac48b6e19466faab68b0dc2f7e7178daa290789ad1e053191098ec0bdf0b6 ChangeLog 111693
+MISC ChangeLog 112045 RMD160 2cd575efccf6293ede8e9e91029370e9efd5f82e SHA1 c7c52eb15a6696220e9ba2af63832cc088975867 SHA256 f268ec268e514035985a7f4b0fd159ffe54275173ffa200744e050f1489be441
+MD5 c9ca217f9c8ace07e79c8ebbd0e9a74c ChangeLog 112045
+RMD160 2cd575efccf6293ede8e9e91029370e9efd5f82e ChangeLog 112045
+SHA256 f268ec268e514035985a7f4b0fd159ffe54275173ffa200744e050f1489be441 ChangeLog 112045
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -517,7 +517,7 @@ SHA256 c29de493a1f36a07b9ca2d978db2e9b9af4b9192582d958f0e5f7da4dae01e4c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEvG0XamhnQswr0vIRAoTVAKCWoAKxmHNmXXHDAadejqcL8gPw1gCePp6A
-E0AsIirIwoIBmkoN7Jmoo/o=
-=7imr
+iD8DBQFEybFDZfNLSOUrp0sRAixtAJwJP/1AFps+ZCPFyrOlIcHr5sfTygCg0Cpq
+c/cdLeOk0EEfqiqmzZCFQuk=
+=ntiQ
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/gcc-3.3.5-r1.ebuild b/sys-devel/gcc/gcc-3.3.5-r1.ebuild
index 4cb6bb740ad6..09f17507a8df 100644
--- a/sys-devel/gcc/gcc-3.3.5-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5-r1.ebuild,v 1.30 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5-r1.ebuild,v 1.31 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER="3.3.5"
 #BRANCH_UPDATE="20041025"
@@ -108,37 +108,4 @@ src_unpack() {
 
 	# Don't screw with directories when cross-compiling
 	epatch ${FILESDIR}/3.3.5/gcc-3.3.5-no-COPYING-cross-compile.patch
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }
diff --git a/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild b/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild
index 6ceb35a7987b..a8d82cec7a7c 100644
--- a/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild,v 1.16 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.5.20050130-r1.ebuild,v 1.17 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER="3.3.5"
 PATCH_VER="1.4"
@@ -95,37 +95,4 @@ src_unpack() {
 		replace-cpu-flags opteron i686
 		replace-cpu-flags athlon64 i686
 	fi
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }
diff --git a/sys-devel/gcc/gcc-3.3.6-r1.ebuild b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
index f4bdabcc7707..20baba348e18 100644
--- a/sys-devel/gcc/gcc-3.3.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.2 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6-r1.ebuild,v 1.3 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER=""
 PATCH_VER="1.4"
@@ -89,37 +89,4 @@ src_unpack() {
 
 	[[ $(tc-arch) == "amd64" ]] && \
 		replace-cpu-flags k8 athlon64 opteron i686
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }
diff --git a/sys-devel/gcc/gcc-3.3.6.ebuild b/sys-devel/gcc/gcc-3.3.6.ebuild
index 879673ea3267..7f74c2ae9a53 100644
--- a/sys-devel/gcc/gcc-3.3.6.ebuild
+++ b/sys-devel/gcc/gcc-3.3.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.23 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.6.ebuild,v 1.24 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER=""
 PATCH_VER="1.3"
@@ -89,37 +89,4 @@ src_unpack() {
 
 	[[ $(tc-arch) == "amd64" ]] && \
 		replace-cpu-flags k8 athlon64 opteron i686
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }
diff --git a/sys-devel/gcc/gcc-3.4.4-r1.ebuild b/sys-devel/gcc/gcc-3.4.4-r1.ebuild
index 8c8280cf600e..0353fc8bed00 100644
--- a/sys-devel/gcc/gcc-3.4.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.4-r1.ebuild,v 1.15 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.4-r1.ebuild,v 1.16 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER=""
 PATCH_VER="1.7"
@@ -136,37 +136,4 @@ src_unpack() {
 			fi
 			;;
 	esac
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }
diff --git a/sys-devel/gcc/gcc-3.4.5-r1.ebuild b/sys-devel/gcc/gcc-3.4.5-r1.ebuild
index 0c06cfcb3196..40936ec5a51e 100644
--- a/sys-devel/gcc/gcc-3.4.5-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.5-r1.ebuild,v 1.13 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.5-r1.ebuild,v 1.14 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER=""
 PATCH_VER="1.4"
@@ -137,37 +137,4 @@ src_unpack() {
 			fi
 			;;
 	esac
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }
diff --git a/sys-devel/gcc/gcc-3.4.5.ebuild b/sys-devel/gcc/gcc-3.4.5.ebuild
index 98b4104fdf33..8c13f0ae8145 100644
--- a/sys-devel/gcc/gcc-3.4.5.ebuild
+++ b/sys-devel/gcc/gcc-3.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.5.ebuild,v 1.16 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.5.ebuild,v 1.17 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER=""
 PATCH_VER="1.2"
@@ -133,37 +133,4 @@ src_unpack() {
 			fi
 			;;
 	esac
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }
diff --git a/sys-devel/gcc/gcc-3.4.6-r1.ebuild b/sys-devel/gcc/gcc-3.4.6-r1.ebuild
index f062a46f259f..fc9947555074 100644
--- a/sys-devel/gcc/gcc-3.4.6-r1.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r1.ebuild,v 1.12 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r1.ebuild,v 1.13 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER=""
 PATCH_VER="1.2"
@@ -137,37 +137,4 @@ src_unpack() {
 			fi
 			;;
 	esac
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }
diff --git a/sys-devel/gcc/gcc-3.4.6-r2.ebuild b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
index 53cd2d23477b..986618c9f2e9 100644
--- a/sys-devel/gcc/gcc-3.4.6-r2.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.2 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6-r2.ebuild,v 1.3 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER=""
 PATCH_VER="1.2"
@@ -137,37 +137,4 @@ src_unpack() {
 			fi
 			;;
 	esac
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }
diff --git a/sys-devel/gcc/gcc-3.4.6.ebuild b/sys-devel/gcc/gcc-3.4.6.ebuild
index 52db5aa13947..30089691835c 100644
--- a/sys-devel/gcc/gcc-3.4.6.ebuild
+++ b/sys-devel/gcc/gcc-3.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6.ebuild,v 1.10 2006/07/13 11:34:13 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.6.ebuild,v 1.11 2006/07/28 06:39:21 kevquinn Exp $
 
 MAN_VER=""
 PATCH_VER="1.0"
@@ -136,37 +136,4 @@ src_unpack() {
 			fi
 			;;
 	esac
-
-	# bug #139918 - conflict between gcc and java-config-2 for ownership of
-	# /usr/bin/rmi{c,registry}.  Done with mv & sed rather than a patch
-	# because patches would be large (thanks to the rename of man files),
-	# and it's clear from the sed invocations that all that changes is the
-	# rmi{c,registry} names to grmi{c,registry} names.
-	# Kevin F. Quinn 2006-07-12
-	einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry."
-	# 1) Move the man files if present (missing prior to gcc-3.4)
-	for manfile in rmic rmiregistry; do
-		[[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue
-		mv ${S}/gcc/doc/${manfile}.1 ${S}/gcc/doc/g${manfile}.1
-	done
-	# 2) Fixup references in the docs if present (mission prior to gcc-3.4)
-	for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi; do
-		[[ -f ${S}/${jfile} ]] || continue
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		sed -i -e 's:rmic:grmic:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
-	# 3) Fixup Makefiles to build the changed executable names
-	#    These are present in all 3.x versions, and are the important bit
-	#    to get gcc to build with the new names.
-	for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in; do
-		sed -i -e 's:rmiregistry:grmiregistry:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmiregistry"
-		# Careful with rmic on these files; it's also the name of a directory
-		# which should be left unchanged.  When it appears as a directory,
-		# it has a '/' after it.
-		sed -i -e 's:rmic\([$_ ]\):grmic\1:g' ${S}/${jfile} ||
-			die "Failed to fixup file ${jfile} for rename to grmic"
-	done
 }