fix bug 125149

(Portage version: 2.1_pre5-r2)

14 files changed, 101 insertions, 67 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 33e48999c224..4816939e2214 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.119 2006/02/16 19:49:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.120 2006/03/06 20:29:24 blubb Exp $
+
+  06 Mar 2006; Simon Stelling <blubb@gentoo.org> openmotif-2.1.30-r9.ebuild,
+  openmotif-2.1.30-r13.ebuild, openmotif-2.2.3-r3.ebuild,
+  openmotif-2.2.3-r7.ebuild, openmotif-2.2.3-r8.ebuild,
+  openmotif-2.2.3-r9.ebuild:
+  fix bug 125149
 
   16 Feb 2006; Fabian Groffen <grobian@gentoo.org>
   openmotif-2.1.30-r13.ebuild, openmotif-2.2.3-r8.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 3c4a30b5ddbd..b54c0fa3be47 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,27 +1,27 @@
-MD5 a6aa3fec08eebaea7cebabba45758ca0 ChangeLog 17918
-RMD160 e70d9eed9a9cb6dce997626eaaa19e2289c0b31f ChangeLog 17918
-SHA256 573e8fb997829ec2e42d7737017eec05da8236a555126d7b3b680ff6ef97bb0c ChangeLog 17918
+MD5 d399a714dc92334748a7bf921aaa8fef ChangeLog 18156
+RMD160 07d0c2db177637681b414fcd8c4242ee278cf793 ChangeLog 18156
+SHA256 6c85f088f17b84ab3b69688b54d2a1166f93321926d0410af5acce242cb211d0 ChangeLog 18156
 MD5 b38be118160b49f6b0f9e31d26f01594 files/CAN-2005-0605.patch 1118
 RMD160 56a1a4433bb71d54b6d5df33fab68aca74158730 files/CAN-2005-0605.patch 1118
 SHA256 20517fc5c4b61419528b658422fdcc9ed972762cffd605a844a4cfd1f628a331 files/CAN-2005-0605.patch 1118
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r13 79
-RMD160 f5ef9b4794966fcfbdc6a89061809d1c5cb43d3a files/digest-openmotif-2.1.30-r13 79
-SHA256 ae8228b272976c6cd34cc31b303c3a8f4c5a7986cfd3f3959e5b9b7cd831b230 files/digest-openmotif-2.1.30-r13 79
-MD5 818d2d673fe5ee323f93b5a66fb1baca files/digest-openmotif-2.1.30-r9 79
-RMD160 f5ef9b4794966fcfbdc6a89061809d1c5cb43d3a files/digest-openmotif-2.1.30-r9 79
-SHA256 ae8228b272976c6cd34cc31b303c3a8f4c5a7986cfd3f3959e5b9b7cd831b230 files/digest-openmotif-2.1.30-r9 79
-MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r3 68
-RMD160 f20b29068bf8f6b579288535c545e8ea693c9487 files/digest-openmotif-2.2.3-r3 68
-SHA256 c05881215a0fa8f08eb981e3e74b296a7b0bc88255516d94a19ac5d2afa71faa files/digest-openmotif-2.2.3-r3 68
-MD5 744ea82c1ac06c88fb0e8c93418d5a6e files/digest-openmotif-2.2.3-r7 68
-RMD160 f20b29068bf8f6b579288535c545e8ea693c9487 files/digest-openmotif-2.2.3-r7 68
-SHA256 c05881215a0fa8f08eb981e3e74b296a7b0bc88255516d94a19ac5d2afa71faa files/digest-openmotif-2.2.3-r7 68
-MD5 843f6a0700ae08d17908118bcc778747 files/digest-openmotif-2.2.3-r8 250
-RMD160 d0610ee8ccf7f8450a8744054f984bb28d0dcc73 files/digest-openmotif-2.2.3-r8 250
-SHA256 39a2c0b3de47294c758d0997cf8279de6616ad5e9bcfcda2577a84d65d410219 files/digest-openmotif-2.2.3-r8 250
-MD5 843f6a0700ae08d17908118bcc778747 files/digest-openmotif-2.2.3-r9 250
-RMD160 d0610ee8ccf7f8450a8744054f984bb28d0dcc73 files/digest-openmotif-2.2.3-r9 250
-SHA256 39a2c0b3de47294c758d0997cf8279de6616ad5e9bcfcda2577a84d65d410219 files/digest-openmotif-2.2.3-r9 250
+MD5 d960b3fa95d83fd9daf0111514cfd4fa files/digest-openmotif-2.1.30-r13 395
+RMD160 a5fc311c43079fd442600c33f4b8ce9fa6689f62 files/digest-openmotif-2.1.30-r13 395
+SHA256 dfd3b84a006d67c7fccf1fa9710d41ebbdc5767d017ed84a0fa4df6c2151c540 files/digest-openmotif-2.1.30-r13 395
+MD5 d960b3fa95d83fd9daf0111514cfd4fa files/digest-openmotif-2.1.30-r9 395
+RMD160 a5fc311c43079fd442600c33f4b8ce9fa6689f62 files/digest-openmotif-2.1.30-r9 395
+SHA256 dfd3b84a006d67c7fccf1fa9710d41ebbdc5767d017ed84a0fa4df6c2151c540 files/digest-openmotif-2.1.30-r9 395
+MD5 e38a0e0825238206da7e31703f5eb0a3 files/digest-openmotif-2.2.3-r3 563
+RMD160 7d060c5bbe733493b9e67db1a864923c2bb35013 files/digest-openmotif-2.2.3-r3 563
+SHA256 4333e38dae316879724e878cafd5d5477975edfe50134b36cec4ddf40c0eecc6 files/digest-openmotif-2.2.3-r3 563
+MD5 e38a0e0825238206da7e31703f5eb0a3 files/digest-openmotif-2.2.3-r7 563
+RMD160 7d060c5bbe733493b9e67db1a864923c2bb35013 files/digest-openmotif-2.2.3-r7 563
+SHA256 4333e38dae316879724e878cafd5d5477975edfe50134b36cec4ddf40c0eecc6 files/digest-openmotif-2.2.3-r7 563
+MD5 e38a0e0825238206da7e31703f5eb0a3 files/digest-openmotif-2.2.3-r8 563
+RMD160 7d060c5bbe733493b9e67db1a864923c2bb35013 files/digest-openmotif-2.2.3-r8 563
+SHA256 4333e38dae316879724e878cafd5d5477975edfe50134b36cec4ddf40c0eecc6 files/digest-openmotif-2.2.3-r8 563
+MD5 e38a0e0825238206da7e31703f5eb0a3 files/digest-openmotif-2.2.3-r9 563
+RMD160 7d060c5bbe733493b9e67db1a864923c2bb35013 files/digest-openmotif-2.2.3-r9 563
+SHA256 4333e38dae316879724e878cafd5d5477975edfe50134b36cec4ddf40c0eecc6 files/digest-openmotif-2.2.3-r9 563
 MD5 e8aae28045bdb3b82472dd90c1f55f99 files/openmotif-2.1.30-CAN-2004-0687-0688.patch 12932
 RMD160 9dfda7de44b875839d22680e5431523b62291059 files/openmotif-2.1.30-CAN-2004-0687-0688.patch 12932
 SHA256 bd2c811affb18375c523bdc39049204a7d12d75922a184bad77a5937e80df1b3 files/openmotif-2.1.30-CAN-2004-0687-0688.patch 12932
@@ -94,21 +94,21 @@ SHA256 d1136f63ecd9c9779ff3ba5b9ce062a0580cb713d948f3f992d8ff85091c2770 files/si
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 RMD160 bfa92d311ac4e8cc9a2190f578925f333ae096a8 metadata.xml 253
 SHA256 8e0389110e0cd8cc331b484cde34c22dd93f9f49df16c2263eea4d8e84093976 metadata.xml 253
-MD5 b4534eeeecf8d1d73e9ee47577bc25e6 openmotif-2.1.30-r13.ebuild 5158
-RMD160 5a0c5dea3bdc8929d2001439d4e316fb85d16f60 openmotif-2.1.30-r13.ebuild 5158
-SHA256 c0cd84efa959f1a923bd85bb9f8ab1da374eeae3387ac46428d81bc179d8e30a openmotif-2.1.30-r13.ebuild 5158
-MD5 cbb60554d94564b84d4960afdbcc2500 openmotif-2.1.30-r9.ebuild 3939
-RMD160 9f48e31e68e115ebd5e418fb5078e413f11044a4 openmotif-2.1.30-r9.ebuild 3939
-SHA256 1d24ee64515cc30096ff93dc7c8dd950b9eab0c4b65c14e390d6d3d40962bc1c openmotif-2.1.30-r9.ebuild 3939
-MD5 820298e14c2fe7aa9d83621eb59a75ad openmotif-2.2.3-r3.ebuild 3239
-RMD160 afb52583d277091014b70de64de476b4103e872b openmotif-2.2.3-r3.ebuild 3239
-SHA256 b9e9655f290c0615eb06a335939e5106af7f1df303e20abeffaf5ff7372a9fb3 openmotif-2.2.3-r3.ebuild 3239
-MD5 0b8526ea0e8fb64a6dafc6108efae24d openmotif-2.2.3-r7.ebuild 3919
-RMD160 d4179eee0775bea90d0a6f1b6c8f814cc035c134 openmotif-2.2.3-r7.ebuild 3919
-SHA256 7960c865b1cdaede2874bc1490dbc1e4d8969740c4c8f5ca7da9b66aec42d79f openmotif-2.2.3-r7.ebuild 3919
-MD5 89c85e4f5cdebc8d161d4dcf1a8f3b5e openmotif-2.2.3-r8.ebuild 3916
-RMD160 d22b5a41b63d8fabf0bfb0f308abf8b1a7c196f4 openmotif-2.2.3-r8.ebuild 3916
-SHA256 33456cc74041c0c6146bbc62df029a923a59c8841af3e12519cf49177f1c724c openmotif-2.2.3-r8.ebuild 3916
-MD5 c169762695749d5670debf91362355c3 openmotif-2.2.3-r9.ebuild 3918
-RMD160 8028feed361f520fa754ee32fe342c48dda0370a openmotif-2.2.3-r9.ebuild 3918
-SHA256 4a23d6c447a4821cf8b14d21e7515343975f72afe4ea20f970d2c3b6165e5042 openmotif-2.2.3-r9.ebuild 3918
+MD5 e7cf3ffee870f2d29c3049881ecd71bb openmotif-2.1.30-r13.ebuild 5203
+RMD160 15dbcfa76ffdae799f240adad2f22db492fdf13b openmotif-2.1.30-r13.ebuild 5203
+SHA256 bb029f042d47c79ddd2bdd48b64bde3e5ed7229fe4aa62cf2ef8b3447d7508d6 openmotif-2.1.30-r13.ebuild 5203
+MD5 b18fe75891ee4d9589e00325cd212252 openmotif-2.1.30-r9.ebuild 3983
+RMD160 da8c560aab059887d36858a34a647ef5b1769ac6 openmotif-2.1.30-r9.ebuild 3983
+SHA256 c05a06cb5882ba3c41562061cec3a0b3be614e142ac9191d3becd087d02c654e openmotif-2.1.30-r9.ebuild 3983
+MD5 48f94684278af9f7cec14cc0856c8078 openmotif-2.2.3-r3.ebuild 3283
+RMD160 a4569cce1b13d0a7434ba703185bb00bacc9e54c openmotif-2.2.3-r3.ebuild 3283
+SHA256 e34b2bc8f48ad3b553949afccec29ecf3b0879c78b9a50bd4089fa0ac19d801f openmotif-2.2.3-r3.ebuild 3283
+MD5 3f7b8ac9215bdc6a83c316a3fda5cc0e openmotif-2.2.3-r7.ebuild 3963
+RMD160 cee726df26fb2758635a372d7de65878fb60b8c4 openmotif-2.2.3-r7.ebuild 3963
+SHA256 48334ebfea0ef6fb895fd21cda66135174be42a7357658dfbdbb475c806c5755 openmotif-2.2.3-r7.ebuild 3963
+MD5 8d8658cffa8fb03c8f2b51d0dd92a3fe openmotif-2.2.3-r8.ebuild 3961
+RMD160 7a8225d73d41140231e47d1a760c95e8b19113e8 openmotif-2.2.3-r8.ebuild 3961
+SHA256 2a792548552adbd3acd79c3cc5c10a7ab9462bb1586835f234377cb6005a1521 openmotif-2.2.3-r8.ebuild 3961
+MD5 3a134a94b3d0a10778953694a84b1c50 openmotif-2.2.3-r9.ebuild 3962
+RMD160 5ca9517eefce098f279daab1817756bf2711a02c openmotif-2.2.3-r9.ebuild 3962
+SHA256 0cd132c8ebf7c04eae87f1b2f8f373cb692844097ebead2e069fe263589298e0 openmotif-2.2.3-r9.ebuild 3962
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r13 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r13
index ead704e865e9..81dcd905faba 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r13
+++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r13
@@ -1 +1,4 @@
 MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
+MD5 5c49a886f108baeda96fc41f32647cf6 openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
+RMD160 308c3f96f6fcc82ce503fd1bb6f3291bd1641d6f openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
+SHA256 a693d7c10bf6648b2af5fb260645526e5651b1c4a9cf9a60405a67df8aa349f5 openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r9 b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r9
index ead704e865e9..81dcd905faba 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.1.30-r9
+++ b/x11-libs/openmotif/files/digest-openmotif-2.1.30-r9
@@ -1 +1,4 @@
 MD5 950f0d409e0ce508fa3995790c1106c7 openmotif-2.1.30-4_MLI.src.tar.gz 8645792
+MD5 5c49a886f108baeda96fc41f32647cf6 openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
+RMD160 308c3f96f6fcc82ce503fd1bb6f3291bd1641d6f openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
+SHA256 a693d7c10bf6648b2af5fb260645526e5651b1c4a9cf9a60405a67df8aa349f5 openmotif-2.1.30-CAN-2004-0914-newer.patch.bz2 12300
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r3 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r3
index a6451299c75a..19f34c546fc4 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r3
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r3
@@ -1 +1,6 @@
 MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
+RMD160 b99230d508da57bca72b6920d28fce4187bf5179 openMotif-2.2.3.tar.gz 5149785
+SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 openMotif-2.2.3.tar.gz 5149785
+MD5 a6ffd504c7b34b3c24a2e9f45e864bbe openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+RMD160 f04ccc46b82782d53e30c6a08475353ae8a1d4ad openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+SHA256 89a44c191d3ffcb09bebc2d2c859560af0c93a56300b502cad77d77801f57cd7 openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r7 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r7
index a6451299c75a..19f34c546fc4 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r7
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r7
@@ -1 +1,6 @@
 MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
+RMD160 b99230d508da57bca72b6920d28fce4187bf5179 openMotif-2.2.3.tar.gz 5149785
+SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 openMotif-2.2.3.tar.gz 5149785
+MD5 a6ffd504c7b34b3c24a2e9f45e864bbe openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+RMD160 f04ccc46b82782d53e30c6a08475353ae8a1d4ad openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+SHA256 89a44c191d3ffcb09bebc2d2c859560af0c93a56300b502cad77d77801f57cd7 openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r8 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r8
index 667c762f991c..19f34c546fc4 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r8
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r8
@@ -1,3 +1,6 @@
 MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
 RMD160 b99230d508da57bca72b6920d28fce4187bf5179 openMotif-2.2.3.tar.gz 5149785
 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 openMotif-2.2.3.tar.gz 5149785
+MD5 a6ffd504c7b34b3c24a2e9f45e864bbe openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+RMD160 f04ccc46b82782d53e30c6a08475353ae8a1d4ad openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+SHA256 89a44c191d3ffcb09bebc2d2c859560af0c93a56300b502cad77d77801f57cd7 openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
diff --git a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r9 b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r9
index 667c762f991c..19f34c546fc4 100644
--- a/x11-libs/openmotif/files/digest-openmotif-2.2.3-r9
+++ b/x11-libs/openmotif/files/digest-openmotif-2.2.3-r9
@@ -1,3 +1,6 @@
 MD5 94c96a0f94ee0d5e41d3dba2188b263d openMotif-2.2.3.tar.gz 5149785
 RMD160 b99230d508da57bca72b6920d28fce4187bf5179 openMotif-2.2.3.tar.gz 5149785
 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 openMotif-2.2.3.tar.gz 5149785
+MD5 a6ffd504c7b34b3c24a2e9f45e864bbe openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+RMD160 f04ccc46b82782d53e30c6a08475353ae8a1d4ad openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
+SHA256 89a44c191d3ffcb09bebc2d2c859560af0c93a56300b502cad77d77801f57cd7 openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild
index b48a8ebf6e14..a6ef1ad804dc 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r13.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/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild,v 1.8 2006/02/16 19:49:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r13.ebuild,v 1.9 2006/03/06 20:29:24 blubb Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -8,7 +8,8 @@ MY_P=${P}-4_MLI.src
 S=${WORKDIR}/motif
 DESCRIPTION="Open Motif (Metrolink Bug Fix Release)"
 HOMEPAGE="http://www.openmotif.org/"
-SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz
+		mirror://gentoo//${P}-CAN-2004-0914-newer.patch.bz2"
 
 LICENSE="MOTIF"
 KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc-macos ppc64 sparc x86"
@@ -30,8 +31,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch
+	epatch ${WORKDIR}/${P}-CAN-2004-0914-newer.patch
 	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
 	epatch ${FILESDIR}/CAN-2005-0605.patch
 
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r9.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r9.ebuild
index f8b8580405f4..b436b0f2e220 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r9.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r9.ebuild,v 1.11 2005/07/08 12:15:42 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r9.ebuild,v 1.12 2006/03/06 20:29:24 blubb Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -8,7 +8,8 @@ MY_P=${P}-4_MLI.src
 S=${WORKDIR}/motif
 DESCRIPTION="Open Motif (Metrolink Bug Fix Release)"
 HOMEPAGE="http://www.openmotif.org/"
-SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.metrolink.com/pub/openmotif/2.1.30-4/${MY_P}.tar.gz
+		mirror://gentoo/${P}-CAN-2004-0914-newer.patch.bz2"
 
 LICENSE="MOTIF"
 SLOT="0"
@@ -29,8 +30,8 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch
+	epatch ${WORKDIR}/${P}-CAN-2004-0914-newer.patch
 	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
 
 	ebegin "adjusting file permissions"
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild
index dfb31218fe00..085b67d9f149 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild,v 1.9 2005/03/25 07:09:27 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r3.ebuild,v 1.10 2006/03/06 20:29:24 blubb Exp $
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -8,7 +8,8 @@ MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Open Motif"
 HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz
+		mirror://gentoo/${P}-CAN-2004-0914-newer.patch.bz2"
 
 LICENSE="MOTIF"
 SLOT="2.2"
@@ -37,8 +38,8 @@ src_unpack() {
 
 	# various patches
 	epatch ${FILESDIR}/${P}-mwm-configdir.patch
-	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch
+	epatch ${WORKDIR}/${P}-CAN-2004-0914-newer.patch
 	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
 	epatch ${FILESDIR}/${P}-char_not_supported.patch
 	epatch ${FILESDIR}/${P}-pixel_length.patch
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild
index 1a6ba64f7067..88a661e6478b 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild,v 1.3 2005/12/12 06:01:31 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r7.ebuild,v 1.4 2006/03/06 20:29:24 blubb Exp $
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -8,7 +8,8 @@ MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Open Motif"
 HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz
+		mirror://gentoo/${P}-CAN-2004-0914-newer.patch.bz2"
 
 LICENSE="MOTIF"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
@@ -47,8 +48,8 @@ src_unpack() {
 
 	# various patches
 	epatch ${FILESDIR}/${P}-mwm-configdir.patch
-	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch
+	epatch ${WORKDIR}/${P}-CAN-2004-0914-newer.patch
 	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
 	epatch ${FILESDIR}/${P}-char_not_supported.patch
 	epatch ${FILESDIR}/${P}-pixel_length.patch
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild
index bebd5a1dbd65..240ade50c3ea 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r8.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/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild,v 1.9 2006/02/16 19:49:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r8.ebuild,v 1.10 2006/03/06 20:29:24 blubb Exp $
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -8,7 +8,8 @@ MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Open Motif"
 HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz
+		mirror://gentoo//${P}-CAN-2004-0914-newer.patch.bz2"
 
 LICENSE="MOTIF"
 SLOT="2.2"
@@ -47,8 +48,8 @@ src_unpack() {
 
 	# various patches
 	epatch ${FILESDIR}/${P}-mwm-configdir.patch
-	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch
+	epatch ${WORKDIR}/${P}-CAN-2004-0914-newer.patch
 	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
 	epatch ${FILESDIR}/${P}-char_not_supported.patch
 	epatch ${FILESDIR}/${P}-pixel_length.patch
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild
index 3223e9b78beb..d0aef06dfd25 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r9.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/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild,v 1.1 2006/02/16 16:01:20 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r9.ebuild,v 1.2 2006/03/06 20:29:24 blubb Exp $
 
 inherit eutils libtool flag-o-matic multilib
 
@@ -8,7 +8,8 @@ MY_P=${P/m/M}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Open Motif"
 HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.motifzone.net/om${PV}/src/${MY_P}.tar.gz
+		mirror://gentoo/${P}-CAN-2004-0914-newer.patch.bz2"
 
 LICENSE="MOTIF"
 SLOT="2.2"
@@ -47,8 +48,8 @@ src_unpack() {
 
 	# various patches
 	epatch ${FILESDIR}/${P}-mwm-configdir.patch
-	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch.bz2
-	epatch ${FILESDIR}/${P}-CAN-2004-0914-newer.patch.bz2
+	epatch ${FILESDIR}/${P}-CAN-2004-0687-0688.patch
+	epatch ${WORKDIR}/${P}-CAN-2004-0914-newer.patch
 	epatch ${FILESDIR}/${P}-CAN-2004-0914_sec8.patch
 	epatch ${FILESDIR}/${P}-char_not_supported.patch
 	epatch ${FILESDIR}/${P}-pixel_length.patch