Block gnome-2.18 for gnome support, see Bug #176566. Remove old versions.

Package-Manager: portage-2.1.2.7

11 files changed, 51 insertions, 210 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 93b4194f9309..a9d2dc4e88a2 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.231 2007/05/04 21:10:28 pioto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.232 2007/05/09 00:05:19 pioto Exp $
+
+  09 May 2007; Mike Kelly <pioto@gentoo.org> gvim-7.0.17.ebuild,
+  -gvim-7.0.91.ebuild, -gvim-7.0.146.ebuild, gvim-7.0.174.ebuild,
+  -gvim-7.0.201.ebuild, gvim-7.0.235.ebuild:
+  Block gnome-2.18 for gnome support, see Bug #176566. Remove old versions.
 
   04 May 2007; Daniel Gryniewicz <dang@gentoo.org> gvim-7.0.235.ebuild:
   Marked stable on amd64 for bug #176464
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 369526be80bf..b66478d49c48 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gvim-completion 1200 RMD160 cd8b51301dc544d51d974307c344ffa992e65186 SHA1 64d72bb63150745743fcddc396f425c8721d1af5 SHA256 e3976b6e6732002059129cfbe158ba43b2edc1ccd6e3753d1751211297c95ce8
 MD5 99367dbfe85f20e78e648bdcf0760d86 files/gvim-completion 1200
 RMD160 cd8b51301dc544d51d974307c344ffa992e65186 files/gvim-completion 1200
@@ -24,44 +27,29 @@ DIST vim-6.4.tar.bz2 3737338 RMD160 739d4bb92306864b1a454358988d03c294ed88cf SHA
 DIST vim-7.0-gentoo-patches-r1.tar.bz2 6749 RMD160 88cead14b07bc3b7113a3e60f2b358caf501c789 SHA1 694d7567a7100478083207a77c0282365e3b4581 SHA256 17934badbe1288149a31ac309c17b579a0c33a409b5928a759620631c4a1ec7c
 DIST vim-7.0-gentoo-patches.tar.bz2 6178 RMD160 994b7405dd02366cdee252d455db97a0c35f17ae SHA1 489d46684f22d7af3d71b00d9a99434181d01157 SHA256 f243a5d7f73b9a86f1a3ce6e7931bbc72b60b962158d82cf92c360170a20f6cc
 DIST vim-7.0-r1.tar.bz2 6117202 RMD160 d24982a1b802dad9955940365665163a4641fd74 SHA1 cac7d8980804dff1a3615e0e6a0bdc07cbe31b53 SHA256 e7383b2dfdc6f6df52fb45599eb6c5dc9037b1d3a4077bfe770cb98440b2589e
-DIST vim-patches-7.0.146.tar.gz 211729 RMD160 b9e02bd64fa1a2ec0dc36ee8927da459c2c2897e SHA1 01cc533e003c6c8cba03a5ca87dbf5f76c3868d7 SHA256 cda83c278df35510a343f689393965a3e5e585312e0989204832b02477f8110a
 DIST vim-patches-7.0.17.tar.gz 17829 RMD160 aa7f4de15985bc3582b96c25d9fcef25eb104636 SHA1 664df9f7271f74d8e8c7514d3fd9e8cbe72070c7 SHA256 83020eff7c33a56962868f8e484f069c5f81382f33b623de1ba5ec7789785d0e
 DIST vim-patches-7.0.174.tar.gz 257873 RMD160 0bccdff774a7fdbe3c72cdbe3896ed7c6154e9aa SHA1 a25f69e2be17889deee084e2ea21e1b4d245492f SHA256 79aa9eb52f23d91e66034cc6897d7d31a1596d130a3902a4e21824193a53ca51
-DIST vim-patches-7.0.201.tar.gz 291618 RMD160 62bcbd2a6ae0d1967e18eb62523c0141adce1c36 SHA1 eb36b79e301c495a0afe195258cf324c67d9ada2 SHA256 031444112de567319e730b1de48fbb3188a0c843350840cd951c51d9d39c1ad6
 DIST vim-patches-7.0.235.tar.gz 343289 RMD160 c54e63fbc74250e95d2ba242a66cea99ffffeff1 SHA1 6d95f9b4e3ce2c1a45863d73b85a3481ca386cd1 SHA256 0833aae00440155a6b5c507ecdcc00b743889c578b47a967fc4ae9ea456d5779
-DIST vim-patches-7.0.91.tar.gz 131624 RMD160 ee65f753a9aaf42135ae206b6105adf5bbe9b493 SHA1 69320120bc09bbee5dd8798bf66d264277d0ab7c SHA256 2a5c68c3c21721a48261cd3e6cd52b00dfe26695a3e7da95f061369b4e038fa8
 EBUILD gvim-6.4.ebuild 1152 RMD160 688cde54adc54e9da0d6b0485d2b6ffa25f4fc8f SHA1 74af470598db55367b142be376e638cb5d1ed1bd SHA256 db5727b072f4bbc0964f3d2685ed1333df1dd0c01b4e863a2b5385bba2555b2f
 MD5 ed5aa531d4f1094a4561c210a1aee152 gvim-6.4.ebuild 1152
 RMD160 688cde54adc54e9da0d6b0485d2b6ffa25f4fc8f gvim-6.4.ebuild 1152
 SHA256 db5727b072f4bbc0964f3d2685ed1333df1dd0c01b4e863a2b5385bba2555b2f gvim-6.4.ebuild 1152
-EBUILD gvim-7.0.146.ebuild 1116 RMD160 fb866e98dabc51c38760c4853703b082c0879b44 SHA1 991b8e8679bef3f18a3f6c4c60cdef90a95978c3 SHA256 7a5b193954bdc584375bb2a97124ff1bf6c77fffc936527dbceba866a3d5afe1
-MD5 a019fc15821843f5f9ef50552eb39a5b gvim-7.0.146.ebuild 1116
-RMD160 fb866e98dabc51c38760c4853703b082c0879b44 gvim-7.0.146.ebuild 1116
-SHA256 7a5b193954bdc584375bb2a97124ff1bf6c77fffc936527dbceba866a3d5afe1 gvim-7.0.146.ebuild 1116
-EBUILD gvim-7.0.17.ebuild 1113 RMD160 90316789961cde211205e0574708ca8b529f7dba SHA1 9ce18a84f3221029118c6ed2ab40f496e3dce99f SHA256 752a9ea55b3da1edc14edfde89e57674735c31ddc47e78a0162ad62b7695bd3e
-MD5 9a12b6b767d97130c0532603e7f57eda gvim-7.0.17.ebuild 1113
-RMD160 90316789961cde211205e0574708ca8b529f7dba gvim-7.0.17.ebuild 1113
-SHA256 752a9ea55b3da1edc14edfde89e57674735c31ddc47e78a0162ad62b7695bd3e gvim-7.0.17.ebuild 1113
-EBUILD gvim-7.0.174.ebuild 1111 RMD160 8519c095d31214bb19da4d540ccfe3f02b3ba9b1 SHA1 8f9aba7412ae041822f663b5428f23f3f8762e49 SHA256 176957406754f27e8be5f71b61a4575e81fe73446a2b94a4a6fdcd8fb10d9a22
-MD5 b0386e473f1fdcba8ab273b65a842d57 gvim-7.0.174.ebuild 1111
-RMD160 8519c095d31214bb19da4d540ccfe3f02b3ba9b1 gvim-7.0.174.ebuild 1111
-SHA256 176957406754f27e8be5f71b61a4575e81fe73446a2b94a4a6fdcd8fb10d9a22 gvim-7.0.174.ebuild 1111
-EBUILD gvim-7.0.201.ebuild 1116 RMD160 a7cb7afdf060354ffe62eb0f3856d87c13589a19 SHA1 93ee574698fd65d8cee7298529d16cbb53b57c6b SHA256 8e7df5c0b131774bc2051a65c07bb5ae3813f9db0faf438bac3ccabb84e792e8
-MD5 d2fc859e032a067e44ebb4e2d281f65b gvim-7.0.201.ebuild 1116
-RMD160 a7cb7afdf060354ffe62eb0f3856d87c13589a19 gvim-7.0.201.ebuild 1116
-SHA256 8e7df5c0b131774bc2051a65c07bb5ae3813f9db0faf438bac3ccabb84e792e8 gvim-7.0.201.ebuild 1116
-EBUILD gvim-7.0.235.ebuild 1107 RMD160 4dcae9fcd03e0aa532e1db1fd453ab9ccf96e5fc SHA1 fccf5a8c10d21b0c23509c39701fd2bf48b91ed1 SHA256 74ee6ef1bab19dbce28cf957acc38f760c5636c2c0e6ffda9fec3e49f8b919d1
-MD5 dea94c2cfea677fc92efd9d04da43399 gvim-7.0.235.ebuild 1107
-RMD160 4dcae9fcd03e0aa532e1db1fd453ab9ccf96e5fc gvim-7.0.235.ebuild 1107
-SHA256 74ee6ef1bab19dbce28cf957acc38f760c5636c2c0e6ffda9fec3e49f8b919d1 gvim-7.0.235.ebuild 1107
-EBUILD gvim-7.0.91.ebuild 1109 RMD160 3da8519a557608bb65e1548aa551a050d9c1bd0a SHA1 ff16d016df028c33eb10d00df752fc11f78d373f SHA256 e6381e55296a78d387aed5c9ac27f63e2bc0801ce3c536a3e732ce0d24eec7ce
-MD5 cde4522e30e2e0eb7dc1fed7d6288720 gvim-7.0.91.ebuild 1109
-RMD160 3da8519a557608bb65e1548aa551a050d9c1bd0a gvim-7.0.91.ebuild 1109
-SHA256 e6381e55296a78d387aed5c9ac27f63e2bc0801ce3c536a3e732ce0d24eec7ce gvim-7.0.91.ebuild 1109
-MISC ChangeLog 31465 RMD160 357294a519b45654f5fb03d8c89c5a7e58735f5d SHA1 e602f5991f24a27cde60c6de3bfc2802482df42a SHA256 aa30a07f6d53b7d0b4fd142f9adae43677b4e746f4fe2cf21357032288f3c8b9
-MD5 e401f068ea119c7b882177d0458c4d57 ChangeLog 31465
-RMD160 357294a519b45654f5fb03d8c89c5a7e58735f5d ChangeLog 31465
-SHA256 aa30a07f6d53b7d0b4fd142f9adae43677b4e746f4fe2cf21357032288f3c8b9 ChangeLog 31465
+EBUILD gvim-7.0.17.ebuild 1183 RMD160 430cfae8e87b2c3d24c12b999a3f6be0af2b6a4d SHA1 4671c08641d6ad6a169c344e99a92c0c3e8bfe19 SHA256 11acafaf8e879ad750e25752040fbffeacccab7fd9286bdd247ad7d8aa97f048
+MD5 720bb29e583f513ad5322f129fe92e9c gvim-7.0.17.ebuild 1183
+RMD160 430cfae8e87b2c3d24c12b999a3f6be0af2b6a4d gvim-7.0.17.ebuild 1183
+SHA256 11acafaf8e879ad750e25752040fbffeacccab7fd9286bdd247ad7d8aa97f048 gvim-7.0.17.ebuild 1183
+EBUILD gvim-7.0.174.ebuild 1181 RMD160 a711838f59aac808cde610550e56a086c916ab35 SHA1 15ed2dae082eb7ff89f7be87640573fcf4f70ea3 SHA256 30006e5bde1b044373b87b0d2b070afb9e4ed621f54acbee60fd40a9f0310330
+MD5 291d06863e642e10c64ef82edb9c9e2c gvim-7.0.174.ebuild 1181
+RMD160 a711838f59aac808cde610550e56a086c916ab35 gvim-7.0.174.ebuild 1181
+SHA256 30006e5bde1b044373b87b0d2b070afb9e4ed621f54acbee60fd40a9f0310330 gvim-7.0.174.ebuild 1181
+EBUILD gvim-7.0.235.ebuild 1182 RMD160 e2fa013a2600e1cde6e6005f712ef02ac53a062f SHA1 5de8e371f40faf4dcd964d6728518e631f8ebaa9 SHA256 ed8ae7c706f8aeab09f9cd1e6e6e64a88255ca592e8187b0b8c05e4c1c1a9034
+MD5 08953890954cf5ab8ac13e7d61427fe4 gvim-7.0.235.ebuild 1182
+RMD160 e2fa013a2600e1cde6e6005f712ef02ac53a062f gvim-7.0.235.ebuild 1182
+SHA256 ed8ae7c706f8aeab09f9cd1e6e6e64a88255ca592e8187b0b8c05e4c1c1a9034 gvim-7.0.235.ebuild 1182
+MISC ChangeLog 31718 RMD160 3eccfbdd91e5db97e703b202572ae2cedbde1bf9 SHA1 c03997812c43b0afbaf90ee2632fb782b746aba5 SHA256 1c4382760dba0c718819d198e85bc425908f3554f09113d9a7540608d63e8d3e
+MD5 79ee98f3ce93a997411ecc5eb77964b8 ChangeLog 31718
+RMD160 3eccfbdd91e5db97e703b202572ae2cedbde1bf9 ChangeLog 31718
+SHA256 1c4382760dba0c718819d198e85bc425908f3554f09113d9a7540608d63e8d3e ChangeLog 31718
 MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500
 MD5 f3583430b2f7b0686cafd606b08bf203 metadata.xml 156
 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 metadata.xml 156
@@ -69,21 +57,19 @@ SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500 metadata
 MD5 513ae8916cbd1d1235ca675d9611e571 files/digest-gvim-6.4 738
 RMD160 d0cd507aac5f77c0dab6d69219ad38bbff12a8d6 files/digest-gvim-6.4 738
 SHA256 d88ca094a0a1f1dfdf837c4720b7ff281da0e89738e8e0a8b6880f23e37dd631 files/digest-gvim-6.4 738
-MD5 2948b19eec0c40fe6f1cdb9661dab279 files/digest-gvim-7.0.146 771
-RMD160 6a5e552134013d3ee81fd80178aec2bb0eb54acc files/digest-gvim-7.0.146 771
-SHA256 d901bc234a2dfe74e3984e7acd83a6b5c540904fae7053d1059f15e6201a696b files/digest-gvim-7.0.146 771
 MD5 b2cfd571cf47ba0f8ecf67fb0bf0262e files/digest-gvim-7.0.17 756
 RMD160 4bca73b51faeae2ef38cae690a0cd0b03d68d9cd files/digest-gvim-7.0.17 756
 SHA256 1b3d775e55d9827a57b1929e30c4aa16c62aa0527b393dc1bee7dd538517752b files/digest-gvim-7.0.17 756
 MD5 5b495d95495cd6025359b6f90f4ebd51 files/digest-gvim-7.0.174 771
 RMD160 6b93f7b8ec863bc8c11b5660982877a23d6ec6d7 files/digest-gvim-7.0.174 771
 SHA256 59f8c2039b7cd4db5847b1acd438a88a42e15dc8fa327df1ff0de5a029ebff13 files/digest-gvim-7.0.174 771
-MD5 8bf88614aa3380f617d57428708cda96 files/digest-gvim-7.0.201 771
-RMD160 225cd90706a9a3f17646e046dd6c2767ac52d26d files/digest-gvim-7.0.201 771
-SHA256 310cdb94903a866f3c63299566b88821d73a15f2a0c10baad928104ffe8c6f9f files/digest-gvim-7.0.201 771
 MD5 78e11585cae3c9eb5ada5e2e69b520ac files/digest-gvim-7.0.235 771
 RMD160 a8a3c435a71dc5c6bad949a619b1d6e7f3c4ba96 files/digest-gvim-7.0.235 771
 SHA256 b1bda3fa3d3953ec50943d5179d29304c5c89f58d46ffcb32f3a6bea390b9715 files/digest-gvim-7.0.235 771
-MD5 2ab1706a88671abe59ef65dc747e0c18 files/digest-gvim-7.0.91 759
-RMD160 e7854097907b79f8c3e9331ca3107dd5c714f4eb files/digest-gvim-7.0.91 759
-SHA256 52e4ba01fc225e264a74e475d621befdb33cebc0a36f44dde8f92ec5040a9ab0 files/digest-gvim-7.0.91 759
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGQRBHokMzJ47YCzoRAtCSAJ9XM3LOYYLMBK6Fyqndfrfojn7KhQCgkfOP
+eDLaYwhybbbuUJTJ7c17C4w=
+=425M
+-----END PGP SIGNATURE-----
diff --git a/app-editors/gvim/files/digest-gvim-7.0.146 b/app-editors/gvim/files/digest-gvim-7.0.146
deleted file mode 100644
index 5de50d2fd41d..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0.146
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a55e36b3c7a21a5835a35574d1f6595e vim-7.0-gentoo-patches-r1.tar.bz2 6749
-RMD160 88cead14b07bc3b7113a3e60f2b358caf501c789 vim-7.0-gentoo-patches-r1.tar.bz2 6749
-SHA256 17934badbe1288149a31ac309c17b579a0c33a409b5928a759620631c4a1ec7c vim-7.0-gentoo-patches-r1.tar.bz2 6749
-MD5 e8c8bb2b5c03f49d40e9736b7d479b9b vim-7.0-r1.tar.bz2 6117202
-RMD160 d24982a1b802dad9955940365665163a4641fd74 vim-7.0-r1.tar.bz2 6117202
-SHA256 e7383b2dfdc6f6df52fb45599eb6c5dc9037b1d3a4077bfe770cb98440b2589e vim-7.0-r1.tar.bz2 6117202
-MD5 491b26c5c1d616afe8feed5af74bb969 vim-patches-7.0.146.tar.gz 211729
-RMD160 b9e02bd64fa1a2ec0dc36ee8927da459c2c2897e vim-patches-7.0.146.tar.gz 211729
-SHA256 cda83c278df35510a343f689393965a3e5e585312e0989204832b02477f8110a vim-patches-7.0.146.tar.gz 211729
diff --git a/app-editors/gvim/files/digest-gvim-7.0.201 b/app-editors/gvim/files/digest-gvim-7.0.201
deleted file mode 100644
index d99c8041c81b..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0.201
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 a55e36b3c7a21a5835a35574d1f6595e vim-7.0-gentoo-patches-r1.tar.bz2 6749
-RMD160 88cead14b07bc3b7113a3e60f2b358caf501c789 vim-7.0-gentoo-patches-r1.tar.bz2 6749
-SHA256 17934badbe1288149a31ac309c17b579a0c33a409b5928a759620631c4a1ec7c vim-7.0-gentoo-patches-r1.tar.bz2 6749
-MD5 e8c8bb2b5c03f49d40e9736b7d479b9b vim-7.0-r1.tar.bz2 6117202
-RMD160 d24982a1b802dad9955940365665163a4641fd74 vim-7.0-r1.tar.bz2 6117202
-SHA256 e7383b2dfdc6f6df52fb45599eb6c5dc9037b1d3a4077bfe770cb98440b2589e vim-7.0-r1.tar.bz2 6117202
-MD5 2510c4704c38fccb1c0d3bcc5ff4f30f vim-patches-7.0.201.tar.gz 291618
-RMD160 62bcbd2a6ae0d1967e18eb62523c0141adce1c36 vim-patches-7.0.201.tar.gz 291618
-SHA256 031444112de567319e730b1de48fbb3188a0c843350840cd951c51d9d39c1ad6 vim-patches-7.0.201.tar.gz 291618
diff --git a/app-editors/gvim/files/digest-gvim-7.0.91 b/app-editors/gvim/files/digest-gvim-7.0.91
deleted file mode 100644
index 304eae0ebda0..000000000000
--- a/app-editors/gvim/files/digest-gvim-7.0.91
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 d31878de2f68cb21f910e0ae7d4cfbad vim-7.0-gentoo-patches.tar.bz2 6178
-RMD160 994b7405dd02366cdee252d455db97a0c35f17ae vim-7.0-gentoo-patches.tar.bz2 6178
-SHA256 f243a5d7f73b9a86f1a3ce6e7931bbc72b60b962158d82cf92c360170a20f6cc vim-7.0-gentoo-patches.tar.bz2 6178
-MD5 e8c8bb2b5c03f49d40e9736b7d479b9b vim-7.0-r1.tar.bz2 6117202
-RMD160 d24982a1b802dad9955940365665163a4641fd74 vim-7.0-r1.tar.bz2 6117202
-SHA256 e7383b2dfdc6f6df52fb45599eb6c5dc9037b1d3a4077bfe770cb98440b2589e vim-7.0-r1.tar.bz2 6117202
-MD5 5f0cc25c0d32ff4510d88f67f40b32b7 vim-patches-7.0.91.tar.gz 131624
-RMD160 ee65f753a9aaf42135ae206b6105adf5bbe9b493 vim-patches-7.0.91.tar.gz 131624
-SHA256 2a5c68c3c21721a48261cd3e6cd52b00dfe26695a3e7da95f061369b4e038fa8 vim-patches-7.0.91.tar.gz 131624
diff --git a/app-editors/gvim/gvim-7.0.146.ebuild b/app-editors/gvim/gvim-7.0.146.ebuild
deleted file mode 100644
index a76b8fa85796..000000000000
--- a/app-editors/gvim/gvim-7.0.146.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.146.ebuild,v 1.3 2006/10/24 17:14:06 pioto Exp $
-
-inherit vim
-
-VIM_VERSION="7.0"
-VIM_SNAPSHOT="vim-7.0-r1.tar.bz2"
-VIM_GENTOO_PATCHES="vim-7.0-gentoo-patches-r1.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
-GVIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}
-	mirror://gentoo/${VIM_ORG_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? (
-					|| ( x11-libs/libXaw virtual/x11 )
-				)
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.0.17.ebuild b/app-editors/gvim/gvim-7.0.17.ebuild
index 72ccb8c89979..541503755993 100644
--- a/app-editors/gvim/gvim-7.0.17.ebuild
+++ b/app-editors/gvim/gvim-7.0.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.17.ebuild,v 1.12 2006/10/05 21:25:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.17.ebuild,v 1.13 2007/05/09 00:05:19 pioto Exp $
 
 inherit vim
 
@@ -20,6 +20,7 @@ DESCRIPTION="GUI version of the Vim text editor"
 KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
+# gnome-2.18 block: Bug #176566
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	|| ( x11-libs/libXext virtual/x11 )
@@ -27,7 +28,10 @@ DEPEND="${DEPEND}
 		gtk? (
 			>=x11-libs/gtk+-2.6
 			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
+			gnome? (
+				>=gnome-base/libgnomeui-2.6
+				!>=gnome-base/libgnomeui-2.18
+			)
 		)
 		!gtk? (
 			motif? (
diff --git a/app-editors/gvim/gvim-7.0.174.ebuild b/app-editors/gvim/gvim-7.0.174.ebuild
index 9e899ab0142f..559071e7d07d 100644
--- a/app-editors/gvim/gvim-7.0.174.ebuild
+++ b/app-editors/gvim/gvim-7.0.174.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.174.ebuild,v 1.8 2007/03/21 16:03:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.174.ebuild,v 1.9 2007/05/09 00:05:19 pioto Exp $
 
 inherit vim
 
@@ -20,6 +20,7 @@ DESCRIPTION="GUI version of the Vim text editor"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
+# gnome-2.18 block: Bug #176566
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	|| ( x11-libs/libXext virtual/x11 )
@@ -27,7 +28,10 @@ DEPEND="${DEPEND}
 		gtk? (
 			>=x11-libs/gtk+-2.6
 			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
+			gnome? (
+				>=gnome-base/libgnomeui-2.6
+				!>=gnome-base/libgnomeui-2.18
+			)
 		)
 		!gtk? (
 			motif? (
diff --git a/app-editors/gvim/gvim-7.0.201.ebuild b/app-editors/gvim/gvim-7.0.201.ebuild
deleted file mode 100644
index 0f22a765135b..000000000000
--- a/app-editors/gvim/gvim-7.0.201.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.201.ebuild,v 1.1 2007/02/24 07:03:48 pioto Exp $
-
-inherit vim
-
-VIM_VERSION="7.0"
-VIM_SNAPSHOT="vim-7.0-r1.tar.bz2"
-VIM_GENTOO_PATCHES="vim-7.0-gentoo-patches-r1.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
-GVIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}
-	mirror://gentoo/${VIM_ORG_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? (
-					|| ( x11-libs/libXaw virtual/x11 )
-				)
-			)
-		)
-	)"
diff --git a/app-editors/gvim/gvim-7.0.235.ebuild b/app-editors/gvim/gvim-7.0.235.ebuild
index 7deb48c12c6c..923945c43320 100644
--- a/app-editors/gvim/gvim-7.0.235.ebuild
+++ b/app-editors/gvim/gvim-7.0.235.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.235.ebuild,v 1.9 2007/05/04 20:13:13 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.235.ebuild,v 1.10 2007/05/09 00:05:19 pioto Exp $
 
 inherit vim
 
@@ -20,6 +20,7 @@ DESCRIPTION="GUI version of the Vim text editor"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="aqua gnome gtk motif nextaw"
 PROVIDE="virtual/editor"
+# gnome-2.18 block: Bug #176566
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}
 	|| ( x11-libs/libXext virtual/x11 )
@@ -27,7 +28,10 @@ DEPEND="${DEPEND}
 		gtk? (
 			>=x11-libs/gtk+-2.6
 			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
+			gnome? (
+				>=gnome-base/libgnomeui-2.6
+				!>=gnome-base/libgnomeui-2.18
+			)
 		)
 		!gtk? (
 			motif? (
diff --git a/app-editors/gvim/gvim-7.0.91.ebuild b/app-editors/gvim/gvim-7.0.91.ebuild
deleted file mode 100644
index 9eb251b5c9f6..000000000000
--- a/app-editors/gvim/gvim-7.0.91.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.0.91.ebuild,v 1.6 2007/02/18 18:29:23 corsair Exp $
-
-inherit vim
-
-VIM_VERSION="7.0"
-VIM_SNAPSHOT="vim-7.0-r1.tar.bz2"
-VIM_GENTOO_PATCHES="vim-7.0-gentoo-patches.tar.bz2"
-VIM_ORG_PATCHES="vim-patches-${PV}.tar.gz"
-GVIMRC_FILE_SUFFIX="-r1"
-
-SRC_URI="${SRC_URI}
-	mirror://gentoo/${VIM_SNAPSHOT}
-	mirror://gentoo/${VIM_GENTOO_PATCHES}
-	mirror://gentoo/${VIM_ORG_PATCHES}"
-
-S=${WORKDIR}/vim${VIM_VERSION/.*}
-DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="alpha ~amd64 hppa ia64 ~ppc ppc64 sparc ~x86 ~x86-fbsd"
-IUSE="aqua gnome gtk motif nextaw"
-PROVIDE="virtual/editor"
-DEPEND="${DEPEND}
-	~app-editors/vim-core-${PV}
-	|| ( x11-libs/libXext virtual/x11 )
-	!aqua? (
-		gtk? (
-			>=x11-libs/gtk+-2.6
-			virtual/xft
-			gnome? ( >=gnome-base/libgnomeui-2.6 )
-		)
-		!gtk? (
-			motif? (
-				x11-libs/openmotif
-			)
-			!motif? (
-				nextaw? (
-					x11-libs/neXtaw
-				)
-				!nextaw? (
-					|| ( x11-libs/libXaw virtual/x11 )
-				)
-			)
-		)
-	)"