Stable on x86 wrt bug #216151; fix gvim.desktop

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 18 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index abc67e386825..e37bd19797bc 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/gvim
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.263 2008/03/21 18:57:16 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.264 2008/04/04 09:19:10 cla Exp $
+
+  04 Apr 2008; Dawid Węgliński <cla@gentoo.org> files/gvim.desktop,
+  gvim-7.1.266.ebuild:
+  Stable on x86 (bug #216151); fixed gvim.desktop
 
 *gvim-7.1.285 (21 Mar 2008)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index cfc6dda69206..e3f3cfed7788 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gvim-completion 1200 RMD160 cd8b51301dc544d51d974307c344ffa992e65186 SHA1 64d72bb63150745743fcddc396f425c8721d1af5 SHA256 e3976b6e6732002059129cfbe158ba43b2edc1ccd6e3753d1751211297c95ce8
-AUX gvim.desktop 848 RMD160 06f5d54d00ad7ee03603211a98c1fbf111d8e2cf SHA1 4e621edff21a99cb9457a025de683d71b76d8521 SHA256 c0b544a290e7d875e3ae18e4e26d33ddb4253192c820a4cfaa81976f908a13da
+AUX gvim.desktop 849 RMD160 ea684b7ab22fc09ddf82eca4731f0cb1c2898f7b SHA1 1852ef02891f632745335e69fb7179a1928cd7fd SHA256 39ee015a712db38422385303ae05e7e652b08cb7405f2a2d4f7e1cb87845978a
 AUX gvim.desktop-r1 852 RMD160 58b9547aaba4d2b51761370567180007678aa049 SHA1 9e414b0c5430f0fd95c2a8b7373ad1aaf564d658 SHA256 ca5bc3dd6a14eefbfa570942766357da05f985bdc516cb7aa0c0ae8a5683c72f
 AUX gvim.xpm 1371 RMD160 cd38d7371f10f3efcb571ecf7c5630c0fc8a6613 SHA1 f7262c7429c42b7c1ef9cf1eaa6aa12292933525 SHA256 adf603379740f509b0c543f9ac78a3eda7c804958c1a9086c50e7daecd059cc7
 AUX gvimrc-r1 1050 RMD160 dba9e2fe2a603b9b15466f530ba5621875a48b58 SHA1 fe7b7fd22448462813222fc78a14c837c3213a37 SHA256 e395d9311690b0c460784ddde565bd34a35a27534442679b682cb8a23eb7bf3c
@@ -20,7 +17,7 @@ DIST vim-patches-7.1.042.tar.gz 64204 RMD160 da6ea2b6fc8c41c35a82a0f5faf59c37d01
 DIST vim-patches-7.1.123.tar.gz 180251 RMD160 a710946be2a0b5784254ccc35533956e17a04d07 SHA1 8cb94c84b6da964f185e3e9f9fbaa9126cae0822 SHA256 994311b5f1ca0739958f0087ec6a99bd779266ebb74dde3fc6d3ad6c8befd2f7
 DIST vim-patches-7.1.164.tar.gz 238946 RMD160 6c3f79c7113e5f988128bf415b1c163fa6156545 SHA1 383b268ff01bc25c27ff29ac4f6f36d2e158c756 SHA256 2d57637bd5c2ace5d2ce09dd3e4eb26f2fca11fbd6e1663a504c9579b8b51a7f
 DIST vim-patches-7.1.213.tar.gz 303979 RMD160 dcc58c2b2b1f7431786f5ec5dd07f02bdc18a8eb SHA1 db37637afbdf4cdc3662e566add4ae087c524b5a SHA256 07ca5a2f2e47c89bf370ed1e57fc538437b86423f44bb9a78a181a3d0b33208c
-DIST vim-patches-7.1.266.tar.gz 392450 RMD160 2e14ab4d55b9ed5688ace32ee3328e66caf17d8a SHA1 d865101f15e368b7202de81e9bbabe725e8a68ec SHA256 3935dcbc2012df977ff6fccf255e262c0c79af40978a3f40ab86501baed4ccd8
+DIST vim-patches-7.1.266.tar.gz 392450 RMD160 5bc9aaa1d0e506afb5b5246e38290cdef293a5b9 SHA1 a60a93c41f47fd38f056efd4e98cba99932599d2 SHA256 fc16121eae0495584e5191a371588e7bd2cd1f74dec410057ca5e6482903cc23
 DIST vim-patches-7.1.285.tar.gz 435024 RMD160 1e9790646b43b2ccb7d20e3589224c98ae60a3ec SHA1 8a2abbb80dfa97a052805c245ad7bc72291acaf2 SHA256 745ecbfeb6c5b61d8d94d368c62720e20f63786b3139d8b3a735315d59b55af4
 EBUILD gvim-6.4.ebuild 1086 RMD160 3415170b64197db312f5998d87a66f34b50d2472 SHA1 e7b38ae13cfcc008daa9e6a10387f6c77f6413b3 SHA256 b4fba1c1eec5a8f034d66ca397b50c767b30cc3d7f81c02d999c6ffd0bf24afb
 EBUILD gvim-7.0.235.ebuild 1043 RMD160 0376951c3b5f53a2b134d1e67db486e5cba7e581 SHA1 289d4c5b2056825233871c20306cf026abdb1351 SHA256 7cc988c56b06921207303a1b137b2f759e8722fe8e07354c22cc900fce251ef7
@@ -28,14 +25,7 @@ EBUILD gvim-7.1.042.ebuild 1163 RMD160 fb42ce3ed1e3d1df05786b20acfb0600c15f45bb
 EBUILD gvim-7.1.123.ebuild 1191 RMD160 1ede0ba4f03786d31e5554c4b1c882e637b00c58 SHA1 3e060b9929aaad51cbd1226e4f0da20f99b37acf SHA256 7573fc94c89a2036d742cb1034eaaaa440f2f8e758456c1f58d434de45df1b08
 EBUILD gvim-7.1.164.ebuild 1199 RMD160 a1965eb886139eed6415c8e9731e1ca3b7780578 SHA1 a880c1c083fb28a20caa1e069d76bdf76dfab184 SHA256 fe3ad943692904aa0f239377222ddd739df55684aed3fb5f7a0b1c52e1c7c5e0
 EBUILD gvim-7.1.213.ebuild 1199 RMD160 c74ca21d7ffb165d8630a159db08e042f48df183 SHA1 2aa4bdbe13b6ba83e51f50b46966eb5ac8b435a8 SHA256 2c0fd50ae96899316dca3227f3fdd006853008184b2291ca571ae952ef9f4cc4
-EBUILD gvim-7.1.266.ebuild 1199 RMD160 bdcf8ff8a5921ec1295fc1a59b85be41b416f0de SHA1 ce50adb55d2f885a253fe8605b414ff77946e935 SHA256 bcce1114a1a9385d7a88c0d15907a8c66e7fc12c634dc95507b6af2f1b6373fb
+EBUILD gvim-7.1.266.ebuild 1194 RMD160 d37029b662564a4f09aeff76911034765affd592 SHA1 ac8932231a04d8867616aecea0055c2fda7a67fa SHA256 59bb7d0398c3a2f74e789dc44cdd869503926c2839f8c5a3fd11b78acc8b507b
 EBUILD gvim-7.1.285.ebuild 1199 RMD160 6bea5c716284bd3db12c79a400301746c7bc001e SHA1 c60f94a3987cdca688e4cfab2df585cf131c57b9 SHA256 f195c2e4b390f0a4a81aa21f14e98b38398a1650ba7f1229bb4714e74b1cfe63
-MISC ChangeLog 36306 RMD160 18e25937083ad03b60eddfb0499aa5fc0380fccd SHA1 0b4c879fd956079cba6c349fa7c3676f18ebf67e SHA256 5a184f1e9be8f197c74910b6ffc8394d1a7c49e002afa546efa4e857abda6e02
+MISC ChangeLog 36446 RMD160 415d8d4f94803ca257616a31a40dfeeda11c7003 SHA1 1dcf07c8b119eed5b18784065ca8643ef8ae7b8b SHA256 320419182dee3b38796ee71416cbddad45be73244618bb4bd8bedde0518d92de
 MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH5ATuQU4yORhF8iARAnLwAKDNzLhwAnX+7AGlv6tFhHpWV4NusACgsKYq
-Ox6iI40XH/tVs2TmvzPGeOs=
-=Yf+f
------END PGP SIGNATURE-----
diff --git a/app-editors/gvim/files/gvim.desktop b/app-editors/gvim/files/gvim.desktop
index c0a2e64a3191..0cee4df1edd1 100644
--- a/app-editors/gvim/files/gvim.desktop
+++ b/app-editors/gvim/files/gvim.desktop
@@ -6,5 +6,5 @@ Exec=gvim -f
 Icon=gvim
 Terminal=false
 Type=Application
-MimeType=text/css;text/html;text/htmlh;text/plain;text/rss;text/sgml;text/x-adasrc;text/x-authors;text/x-c++hdr;text/x-c++src;text/x-copying;text/x-credits;text/x-csharp;text/x-csrc;text/x-dtd;text/x-fortran;text/x-gettext-translation-template;text/x-gettext-translation;text/x-gtkrc;text/x-haskell;text/x-idl;text/x-install;text/x-java;text/x-js;text/x-ksh;text/x-ksysv-log;text/x-literate-haskell;text/x-log;text/x-makefile;text/x-moc;text/x-msil;text/x-nemerle;text/x-objcsrc;text/x-pascal;text/x-patch;text/x-readme;text/x-scheme;text/x-setext;text/x-sql;text/x-tcl;text/x-tex;text/x-texinfo;text/x-troff-me;text/x-troff-mm;text/x-troff-ms;text/x-uil;text/x-vb;text/xml
+MimeType=text/css;text/html;text/htmlh;text/plain;text/rss;text/sgml;text/x-adasrc;text/x-authors;text/x-c++hdr;text/x-c++src;text/x-copying;text/x-credits;text/x-csharp;text/x-csrc;text/x-dtd;text/x-fortran;text/x-gettext-translation-template;text/x-gettext-translation;text/x-gtkrc;text/x-haskell;text/x-idl;text/x-install;text/x-java;text/x-js;text/x-ksh;text/x-ksysv-log;text/x-literate-haskell;text/x-log;text/x-makefile;text/x-moc;text/x-msil;text/x-nemerle;text/x-objcsrc;text/x-pascal;text/x-patch;text/x-readme;text/x-scheme;text/x-setext;text/x-sql;text/x-tcl;text/x-tex;text/x-texinfo;text/x-troff-me;text/x-troff-mm;text/x-troff-ms;text/x-uil;text/x-vb;text/xml;
 Categories=Application;Development;
diff --git a/app-editors/gvim/gvim-7.1.266.ebuild b/app-editors/gvim/gvim-7.1.266.ebuild
index 2f4bbe86e9d2..6c16246e6628 100644
--- a/app-editors/gvim/gvim-7.1.266.ebuild
+++ b/app-editors/gvim/gvim-7.1.266.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.266.ebuild,v 1.1 2008/03/03 15:03:19 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.1.266.ebuild,v 1.2 2008/04/04 09:19:10 cla Exp $
 
 inherit vim
 
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unstable/unix/vim-${VIM_VERSION}.tar.bz2
 
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="GUI version of the Vim text editor"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="aqua gnome gtk motif nextaw"
 DEPEND="${DEPEND}
 	~app-editors/vim-core-${PV}