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

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

7 files changed, 79 insertions, 10 deletions

diff --git a/app-editors/gvim/ChangeLog b/app-editors/gvim/ChangeLog
index 394b7a7fcba2..ab47809662a5 100644
--- a/app-editors/gvim/ChangeLog
+++ b/app-editors/gvim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/gvim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.309 2010/03/17 22:01:00 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/ChangeLog,v 1.310 2010/04/15 19:49:14 darkside Exp $
+
+  15 Apr 2010; Jeremy Olexa <darkside@gentoo.org>
+  +files/gvim-7.1.285-darwin-x11link.patch,
+  +files/gvim-7.1.319-interix-cflags.patch,
+  +files/gvim-7.1-interix-link.patch, gvim-7.2.402.ebuild, files/gvimrc-r1:
+  Import Gentoo Prefix changes, convert to EAPI3, add keywords. bug 310991
 
 *gvim-7.2.402 (17 Mar 2010)
 
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index f3736dd666ea..5a730a63b281 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,9 +1,12 @@
+AUX gvim-7.1-interix-link.patch 716 RMD160 8e556d87edec46a3af0a12646c60bc4381d14eb4 SHA1 b8ee0e3612e728d728352a5133446d25359adc22 SHA256 53459943e62247469f6fbaa30abd36d7629e02bd26bebe3e8947d45b23408bc9
+AUX gvim-7.1.285-darwin-x11link.patch 388 RMD160 80b51aae697c19ab39b7f5ac02220b08d8cfb545 SHA1 851a15de65eefd384a024699f1c44de001f109fc SHA256 0b935efbedabeab8439d42baa1d07b2f3d5e2964dea9e504ff2a4d4b9f3e6bcd
+AUX gvim-7.1.319-interix-cflags.patch 919 RMD160 4cd80e48816a37c3b3883a721aff21946ccca017 SHA1 5c49720e25e0b2a847f108b6f836833a61438347 SHA256 4823169ed87498ed4856e8c18e5ca4dd7d5cc9f8d899b2091b3c757579290a21
 AUX gvim-completion 1200 RMD160 cd8b51301dc544d51d974307c344ffa992e65186 SHA1 64d72bb63150745743fcddc396f425c8721d1af5 SHA256 e3976b6e6732002059129cfbe158ba43b2edc1ccd6e3753d1751211297c95ce8
 AUX gvim.desktop 849 RMD160 ea684b7ab22fc09ddf82eca4731f0cb1c2898f7b SHA1 1852ef02891f632745335e69fb7179a1928cd7fd SHA256 39ee015a712db38422385303ae05e7e652b08cb7405f2a2d4f7e1cb87845978a
 AUX gvim.desktop-r1 852 RMD160 58b9547aaba4d2b51761370567180007678aa049 SHA1 9e414b0c5430f0fd95c2a8b7373ad1aaf564d658 SHA256 ca5bc3dd6a14eefbfa570942766357da05f985bdc516cb7aa0c0ae8a5683c72f
 AUX gvim.desktop-r2 171 RMD160 4e3103d2a05310d8226b7f5103e41252b666ee5d SHA1 9ee9784d15d0976d36b91d181b5af3fda55e8382 SHA256 840e4bcac0b448566e26e53b8292f31a9e187360b6aaf75f37929e43c46f22ce
 AUX gvim.xpm 1371 RMD160 cd38d7371f10f3efcb571ecf7c5630c0fc8a6613 SHA1 f7262c7429c42b7c1ef9cf1eaa6aa12292933525 SHA256 adf603379740f509b0c543f9ac78a3eda7c804958c1a9086c50e7daecd059cc7
-AUX gvimrc-r1 1050 RMD160 dba9e2fe2a603b9b15466f530ba5621875a48b58 SHA1 fe7b7fd22448462813222fc78a14c837c3213a37 SHA256 e395d9311690b0c460784ddde565bd34a35a27534442679b682cb8a23eb7bf3c
+AUX gvimrc-r1 1099 RMD160 f51ab38d8f1512fcaff145ee18328af47f846885 SHA1 3d1b9015e2b750b9923194f55c46acfea6cced59 SHA256 d6a92cf8e9b7a3faf92285214c97adcae4fa6632a00e0c1a2bfa34caf167f17a
 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
 DIST vim-7.1-extra.tar.gz 713842 RMD160 e44bde407fb42233a8fbcc74d96a03650bf863d1 SHA1 65581f63ff3c665e0513ba578d9e80e9e9512aa3 SHA256 4f4a4809e0089fe7c3b8dc1ae96cc692ca4dd62f06bd1c542c83ef2a345fdf1b
@@ -33,6 +36,6 @@ EBUILD gvim-7.2.264.ebuild 764 RMD160 e5890b5b44c227e67141d59b97877131ce17b108 S
 EBUILD gvim-7.2.303.ebuild 756 RMD160 7848f060c31ff11f056177e8aafbe3c08c64837a SHA1 cfb942871c3f22c483f75324ed0557b4289714aa SHA256 e2aa439404166543f4a6e85b3bd52d9ffecb0b81076fe5c51cc4ec81f3d837ba
 EBUILD gvim-7.2.359.ebuild 764 RMD160 f08e159958a4ac545009a3e7ca957a4b97aa46ad SHA1 03d1e795770dc6dc2367ab049d11fc1842757a0a SHA256 3608545079ab37cfd6b3c09b5149228f259ebbf3bb18e4ae245c07e835de1d4e
 EBUILD gvim-7.2.376.ebuild 761 RMD160 380e5f5ea13c183dcb163849879e32291dd2401b SHA1 86e87d461c56c8cc0159a7d6344dc48db34cd03e SHA256 a034d87806589d1b5972dbb645833748a1c3e3ab187c3afda70ef677ab84ac00
-EBUILD gvim-7.2.402.ebuild 761 RMD160 5d68604885111cf5f24a5ed9b89a9b4171a55211 SHA1 2a2b72005e6ba76b240c6d025a4aaf3cbb5e7e70 SHA256 34a640518c61f888762e9ad398c00079a6864c1042865434656f3159757f1690
-MISC ChangeLog 42123 RMD160 89ea994b9ad5d055efdf0b50b041a60d54eb60c0 SHA1 9f3f2855a179d8c8a004aacd8b809cdbc1b28947 SHA256 76834e65383443b0834266caf7d66157f5eb2b1e913dd35ba7fd7bc6a05f8e9d
+EBUILD gvim-7.2.402.ebuild 1084 RMD160 90ccaa8127ae86af7f0392eb3955ddbe57fe0de2 SHA1 e7ae16a282fb459c81db03c72610e48179891c99 SHA256 48f404e683b8f54bf89ff274bc612b649d2ca1064cb5dd41e59aa565f84610d1
+MISC ChangeLog 42417 RMD160 8b724a0176b5fcd971a128ea05eed2001898d7c8 SHA1 72982bb2a1d3c042e0739e1330b3349d003f6a30 SHA256 083bcd28e2f8610f400cc7bc493f6ddc05f83305dc2dc8e44fa43418fe2163df
 MISC metadata.xml 389 RMD160 61d125560aefd4f17d01a23dfdaab8e370551a4d SHA1 150c098bb2a619784b38f24f20f861999e46a1b4 SHA256 40d2b38972733e27a4646a9e61db42c0a581f57930b3efc23b728ef4381d4e66
diff --git a/app-editors/gvim/files/gvim-7.1-interix-link.patch b/app-editors/gvim/files/gvim-7.1-interix-link.patch
new file mode 100644
index 000000000000..da046665dfc5
--- /dev/null
+++ b/app-editors/gvim/files/gvim-7.1-interix-link.patch
@@ -0,0 +1,16 @@
+Interix 3.5 does link fine with some libraries removed from the link
+line (who knows why), but executing vim failes with unresolved
+references to things like _dlclose, _iconv and such...
+
+diff -ru vim71.orig/src/link.sh vim71/src/link.sh
+--- vim71.orig/src/link.sh	Wed Feb 27 15:29:29 2008
++++ vim71/src/link.sh	Wed Feb 27 15:32:07 2008
+@@ -41,7 +41,7 @@
+   if sh link.cmd; then
+     touch auto/link.sed
+     cp link.cmd linkit.sh
+-    for libname in SM ICE nsl dnet dnet_stub inet socket dir elf iconv Xt Xmu Xp Xpm X11 Xdmcp x w dl pthread thread readline m perl crypt attr; do
++    for libname in dummy; do
+       cont=yes
+       while test -n "$cont"; do
+         if grep "l$libname " linkit.sh >/dev/null; then
diff --git a/app-editors/gvim/files/gvim-7.1.285-darwin-x11link.patch b/app-editors/gvim/files/gvim-7.1.285-darwin-x11link.patch
new file mode 100644
index 000000000000..1cf00d6a8faa
--- /dev/null
+++ b/app-editors/gvim/files/gvim-7.1.285-darwin-x11link.patch
@@ -0,0 +1,11 @@
+--- src/configure.in
++++ src/configure.in
+@@ -2701,7 +2701,7 @@
+     AC_MSG_CHECKING(whether X_LOCALE needed)
+     AC_TRY_COMPILE([#include <X11/Xlocale.h>],,
+ 	AC_TRY_LINK_FUNC([_Xsetlocale], [AC_MSG_RESULT(yes)
+-		AC_DEFINE(X_LOCALE)], AC_MSG_RESULT(no)),
++		AC_DEFINE(X_LOCALE) ldflags_save="$ldflags_save -lX11"], AC_MSG_RESULT(no)),
+ 	AC_MSG_RESULT(no))
+   fi
+   CFLAGS=$cflags_save
diff --git a/app-editors/gvim/files/gvim-7.1.319-interix-cflags.patch b/app-editors/gvim/files/gvim-7.1.319-interix-cflags.patch
new file mode 100644
index 000000000000..630e0015ee0a
--- /dev/null
+++ b/app-editors/gvim/files/gvim-7.1.319-interix-cflags.patch
@@ -0,0 +1,23 @@
+diff -ru vim71.orig/src/Makefile vim71/src/Makefile
+--- vim71.orig/src/Makefile	2008-07-16 08:29:55 +0200
++++ vim71/src/Makefile	2008-07-16 08:53:44 +0200
+@@ -1282,10 +1282,6 @@
+ 
+ ALL_CFLAGS = $(PRE_DEFS) $(CFLAGS) $(PROFILE_CFLAGS) $(POST_DEFS)
+ 
+-# Exclude $CFLAGS for osdef.sh, for Mac 10.4 some flags don't work together
+-# with "-E".
+-OSDEF_CFLAGS = $(PRE_DEFS) $(POST_DEFS)
+-
+ LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) -Dinline= -D__extension__= -Dalloca=alloca
+ 
+ LINT_EXTRA = -DUSE_SNIFF -DHANGUL_INPUT -D"__attribute__(x)="
+@@ -2273,7 +2269,7 @@
+ 	    $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
+ 
+ auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
+-	CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
++	CC="$(CC) $(CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
+ 
+ QUOTESED = sed -e 's/[\\"]/\\&/g' -e 's/\\"/"/' -e 's/\\";$$/";/'
+ auto/pathdef.c: Makefile auto/config.mk
diff --git a/app-editors/gvim/files/gvimrc-r1 b/app-editors/gvim/files/gvimrc-r1
index 200f6150650b..1299a53c8a26 100644
--- a/app-editors/gvim/files/gvimrc-r1
+++ b/app-editors/gvim/files/gvimrc-r1
@@ -2,7 +2,7 @@ scriptencoding utf-8
 " ^^ Please leave the above line at the start of the file.
 
 " Default configuration file for gvim
-" $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/files/gvimrc-r1,v 1.1 2005/03/08 21:46:19 ciaranm Exp $
+" $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/files/gvimrc-r1,v 1.2 2010/04/15 19:49:14 darkside Exp $
 "
 " Written by Aron Griffis <agriffis@gentoo.org>
 "
@@ -24,6 +24,6 @@ endif
 " as expected in insert and command-line modes
 map! <s-insert> <c-r>*
 
-if filereadable("/etc/vim/gvimrc.local")
-  source /etc/vim/gvimrc.local
+if filereadable("@GENTOO_PORTAGE_EPREFIX@/etc/vim/gvimrc.local")
+  source @GENTOO_PORTAGE_EPREFIX@/etc/vim/gvimrc.local
 endif
diff --git a/app-editors/gvim/gvim-7.2.402.ebuild b/app-editors/gvim/gvim-7.2.402.ebuild
index 31bdcfba24b3..99daac975e09 100644
--- a/app-editors/gvim/gvim-7.2.402.ebuild
+++ b/app-editors/gvim/gvim-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/gvim/gvim-7.2.402.ebuild,v 1.1 2010/03/17 22:01:00 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/gvim/gvim-7.2.402.ebuild,v 1.2 2010/04/15 19:49:14 darkside Exp $
 
-EAPI=2
+EAPI=3
 inherit vim
 
 VIM_VERSION="7.2"
@@ -17,5 +17,15 @@ 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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
+
+src_prepare() {
+	vim_src_prepare
+
+	epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
+	if [[ ${CHOST} == *-interix* ]]; then
+		epatch "${FILESDIR}"/${PN}-7.1-interix-link.patch
+		epatch "${FILESDIR}"/${PN}-7.1.319-interix-cflags.patch
+	fi
+}