Import Gentoo Prefix changes, convert to EAPI3, add keywords. bug 310991

Package-Manager: portage-2.1.8.3/cvs/Linux armv7l

4 files changed, 17 insertions, 13 deletions

diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 4ebe04a513d1..fe19cc35da6c 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/vim-core
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.327 2010/03/17 22:00:16 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.328 2010/04/15 19:30:32 darkside Exp $
+
+  15 Apr 2010; Jeremy Olexa <darkside@gentoo.org> vim-core-7.2.402.ebuild,
+  files/vimrc-r4:
+  Import Gentoo Prefix changes, convert to EAPI3, add keywords. bug 310991
 
 *vim-core-7.2.402 (17 Mar 2010)
 
diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest
index 77b30768bcc6..21765cd17c4b 100644
--- a/app-editors/vim-core/Manifest
+++ b/app-editors/vim-core/Manifest
@@ -1,5 +1,5 @@
 AUX vimrc-r3 6047 RMD160 9f68b2f2ce125db1f8ca10a6e0b8c5796549a029 SHA1 55311d40eeab5732c8d0d1be109858ccb4e7927e SHA256 ec156b3f51aadbf20ad17248d918e61153f08fb14402c05b1255042468e7c5de
-AUX vimrc-r4 6771 RMD160 d9d42c9b4a42fdbb2a9f230c9935d873c52da261 SHA1 30b5f51a5886b6948ab639beffd2596ecf3ab1a2 SHA256 07bb93ab7df08a5f05f77f9bb075a846890aa2a6b3eea5b28c548aeabff40c79
+AUX vimrc-r4 6919 RMD160 f0ec382aab46d0e4c1dc78eca6c577a2ebfd15f7 SHA1 5d0eed25ba705e9dfc87a3feff39db2e8a5e8aff SHA256 9c59acc4c486a2aca5c6e5e297f13521a8ec57ebd540ec9ab846112fbb3e5c39
 AUX xxd-completion 461 RMD160 504f96c4b37a770678a74b16b871d410a3fcb82d SHA1 936780dfb0c938b5f48df6f827a31526f74d5dbd SHA256 580064ca4db3ac149fd89c743bd9946241220c211721f978f7a3ef97b3c171df
 DIST vim-7.0-gentoo-patches-r1.tar.bz2 6749 RMD160 88cead14b07bc3b7113a3e60f2b358caf501c789 SHA1 694d7567a7100478083207a77c0282365e3b4581 SHA256 17934badbe1288149a31ac309c17b579a0c33a409b5928a759620631c4a1ec7c
 DIST vim-7.0-r1.tar.bz2 6117202 RMD160 d24982a1b802dad9955940365665163a4641fd74 SHA1 cac7d8980804dff1a3615e0e6a0bdc07cbe31b53 SHA256 e7383b2dfdc6f6df52fb45599eb6c5dc9037b1d3a4077bfe770cb98440b2589e
@@ -33,6 +33,6 @@ EBUILD vim-core-7.2.264-r1.ebuild 872 RMD160 df37a29b50f584b23b9e21e4a7c009d9e6c
 EBUILD vim-core-7.2.303.ebuild 1056 RMD160 2e53e5607a1c10150e6d2669794004fcfa26ed17 SHA1 77092519e7b309952d54167ac66fd5bf8aced5c3 SHA256 c2581e66105b95d4e4a68b643056a6f813e7affebd415b8bb7ea4a166ce1b1c8
 EBUILD vim-core-7.2.359.ebuild 1068 RMD160 5c77531a7c9826c4e9cb4f312db96599ada6d3ed SHA1 d130d220b78d946680b5ec4bec47ffc085a3f918 SHA256 8427771b366d1455ef7b099e490d49a291ee3668b91a077b187dd1e0107d74f2
 EBUILD vim-core-7.2.376.ebuild 1068 RMD160 ff5eac7349bdc539002a8841e7a5e661820ebca0 SHA1 00627347634c1ac72088c20cc05045787461cc89 SHA256 43a9df40aaba1c4ba3c90d38e3efe1bc50c156ab1adf92253d052301d745d1d3
-EBUILD vim-core-7.2.402.ebuild 1068 RMD160 85509b7fc75a60525950053cb2d422dc733ad94f SHA1 31191d8e94abcce8622583f5c9937b8eb49d2e63 SHA256 0e3651d9e8d1e2784eebd5e623595f4732dc47e6be09007ab80689705584e27b
-MISC ChangeLog 44281 RMD160 1b4e3ac2b43d1c5935845efec81057646f9ace26 SHA1 7233592ff858194d4c2622a487a01b0fc87d3614 SHA256 d1346b7c6a0a594fe5c2da54ee1c34501558a98205831c7dca1db583c1ea87bb
+EBUILD vim-core-7.2.402.ebuild 1072 RMD160 04e09c7a666453f054b94b54af7ca6ecd3c39254 SHA1 77476e33704e07ff0b191ecc2e794eaa0d1be605 SHA256 cc3263e0b4e2baf39d47826e99bf767e26bc480b27005f6ca75d3373a83dcb92
+MISC ChangeLog 44454 RMD160 d935d3ef31ad1f3a3c5780a29dbe196c601ad255 SHA1 fcdd269acc47655a7b4db199eee5ea7db08eadb3 SHA256 568d61780ac3a8ab66ac63925f7f7b3c88bf998aa6058e84925eace784ee0961
 MISC metadata.xml 156 RMD160 3e105a159e09ab3231aaa16b01919bcfbf58a0a8 SHA1 fe63ba71f6fd04f1e293fb238af2eba994b0335d SHA256 64d20c782589b423a6e75ba6fff7edead1ec8fbae742d27dd57f5299e8328500
diff --git a/app-editors/vim-core/files/vimrc-r4 b/app-editors/vim-core/files/vimrc-r4
index 5273ff3248e2..f54e5a39f909 100644
--- a/app-editors/vim-core/files/vimrc-r4
+++ b/app-editors/vim-core/files/vimrc-r4
@@ -2,7 +2,7 @@ scriptencoding utf-8
 " ^^ Please leave the above line at the start of the file.
 
 " Default configuration file for Vim
-" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r4,v 1.2 2010/03/09 18:47:21 lack Exp $
+" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r4,v 1.3 2010/04/15 19:30:32 darkside Exp $
 
 " Written by Aron Griffis <agriffis@gentoo.org>
 " Modified by Ryan Phillips <rphillips@gentoo.org>
@@ -126,10 +126,10 @@ endif
 
 " {{{ Fix &shell, see bug #101665.
 if "" == &shell
-  if executable("/bin/bash")
-    set shell=/bin/bash
-  elseif executable("/bin/sh")
-    set shell=/bin/sh
+  if executable("@GENTOO_PORTAGE_EPREFIX@/bin/bash")
+    set shell=@GENTOO_PORTAGE_EPREFIX@/bin/bash
+  elseif executable("@GENTOO_PORTAGE_EPREFIX@/bin/sh")
+    set shell=@GENTOO_PORTAGE_EPREFIX@/bin/sh
   endif
 endif
 "}}}
@@ -191,8 +191,8 @@ endif " has("autocmd")
 " }}}
 
 " {{{ vimrc.local
-if filereadable("/etc/vim/vimrc.local")
-  source /etc/vim/vimrc.local
+if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local")
+  source @GENTOO_PORTAGE_EPREFIX@/etc/vim/vimrc.local
 endif
 " }}}
 
diff --git a/app-editors/vim-core/vim-core-7.2.402.ebuild b/app-editors/vim-core/vim-core-7.2.402.ebuild
index 74871e749dd4..acab0751ada9 100644
--- a/app-editors/vim-core/vim-core-7.2.402.ebuild
+++ b/app-editors/vim-core/vim-core-7.2.402.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.2.402.ebuild,v 1.1 2010/03/17 22:00:16 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/vim-core-7.2.402.ebuild,v 1.2 2010/04/15 19:30:32 darkside Exp $
 
-EAPI=2
+EAPI=3
 inherit vim
 
 VIM_VERSION="7.2"