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

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

6 files changed, 75 insertions, 6 deletions

diff --git a/app-editors/vim/ChangeLog b/app-editors/vim/ChangeLog
index 9a6a206cf45f..679b7b91f615 100644
--- a/app-editors/vim/ChangeLog
+++ b/app-editors/vim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/vim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.344 2010/03/17 22:00:36 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/ChangeLog,v 1.345 2010/04/15 19:39:22 darkside Exp $
+
+  15 Apr 2010; Jeremy Olexa <darkside@gentoo.org>
+  +files/vim-7.1.285-darwin-x11link.patch,
+  +files/vim-7.1.319-interix-cflags.patch,
+  +files/vim-7.1-interix-link.patch, vim-7.2.402.ebuild:
+  Import Gentoo Prefix changes, convert to EAPI3, add keywords. bug 310991
 
 *vim-7.2.402 (17 Mar 2010)
 
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 5988186ecfdc..872fb16307b8 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,3 +1,6 @@
+AUX vim-7.1-interix-link.patch 716 RMD160 8e556d87edec46a3af0a12646c60bc4381d14eb4 SHA1 b8ee0e3612e728d728352a5133446d25359adc22 SHA256 53459943e62247469f6fbaa30abd36d7629e02bd26bebe3e8947d45b23408bc9
+AUX vim-7.1.285-darwin-x11link.patch 388 RMD160 80b51aae697c19ab39b7f5ac02220b08d8cfb545 SHA1 851a15de65eefd384a024699f1c44de001f109fc SHA256 0b935efbedabeab8439d42baa1d07b2f3d5e2964dea9e504ff2a4d4b9f3e6bcd
+AUX vim-7.1.319-interix-cflags.patch 919 RMD160 4cd80e48816a37c3b3883a721aff21946ccca017 SHA1 5c49720e25e0b2a847f108b6f836833a61438347 SHA256 4823169ed87498ed4856e8c18e5ca4dd7d5cc9f8d899b2091b3c757579290a21
 AUX vim-completion 998 RMD160 ac83dc3d9854f8c98ed3b888feb39dfa80aa08a3 SHA1 de5035a9a465ae3b58b1ebaa64fe6763692718a7 SHA256 bdca6069ef0fa995718f4b59fea85e58629259bb5a385d53e52d162d1463d4ff
 AUX vimrc 3004 RMD160 b135f006ee0cfc03bf51e5dbe00c0250dddec896 SHA1 56e970a49bfee6ea3fca1e7778044f83489d6437 SHA256 b91b72f527db7f4f09340cd1e1107f10522ff71886d2fb9abb8eef99672e1145
 DIST vim-7.0-gentoo-patches-r1.tar.bz2 6749 RMD160 88cead14b07bc3b7113a3e60f2b358caf501c789 SHA1 694d7567a7100478083207a77c0282365e3b4581 SHA256 17934badbe1288149a31ac309c17b579a0c33a409b5928a759620631c4a1ec7c
@@ -29,6 +32,6 @@ EBUILD vim-7.2.264.ebuild 730 RMD160 fde350e02eaf2f61cfcb7b0b1e3021269015b4de SH
 EBUILD vim-7.2.303.ebuild 721 RMD160 cbe1c7559db1046a483d752fb3948a6dfd28742b SHA1 60e20b88ab6071170d1ee0adb4528cd359647700 SHA256 d164925435b09985e1094346b8ad7f5c6cfa194f6b8307f17118a1f7248b633e
 EBUILD vim-7.2.359.ebuild 730 RMD160 797090c82af30e7aa469aa11bde0bc0daa6b82ea SHA1 295611ffd805bc5bad85cd2bbf83553360dcbc9a SHA256 1b64ebea2a71aee3a2ff8fbc065d82b53270cf08214f1d1ecb74a210110f9435
 EBUILD vim-7.2.376.ebuild 730 RMD160 08cebbe457417a56cd9fb8e6b3f8cb262ddf5589 SHA1 35c6be395a8e751a5a36428b2897615243f71324 SHA256 e4a2e8d15c6b93e8a3236180841efbec2c7e0bd4b443b750ecdd8d4bbb03a433
-EBUILD vim-7.2.402.ebuild 730 RMD160 2389242cbabe100e24277cc820d0c0c49e911e16 SHA1 a50baacae03de506d084411ab49c9afe8ec518f2 SHA256 10b358f26781b5198a208890d2496b8bb71413b2e10a905c078e344a4f345441
-MISC ChangeLog 46330 RMD160 651b5a52830653725d80fb8aa274b8c57909cab8 SHA1 a87144d1cef1bf3c55d352b82d9de532e76feb6d SHA256 83a065a307d7b387478bd8f07a005d4f39afaa7387bca1d054faa9035227372b
+EBUILD vim-7.2.402.ebuild 1166 RMD160 fd9181d01ada1dce125c4e7fa6a3b64e5fbf848f SHA1 d0aeb1479e7cac5c79818d85ec626b94616552a1 SHA256 5f113491020dcccc70f8f3da1b89426fd4a69dce704e90779c99b1cc7fd00b4a
+MISC ChangeLog 46603 RMD160 a297bfaeafb18b3c877635232c19b72bf96fac00 SHA1 0be3a24dad510848e970e77e0245a65ff4385143 SHA256 2632d6c78432927ad69c2cb67d6ddd6d627dc52a9553477e6a56b0f92d0096f7
 MISC metadata.xml 364 RMD160 b9eb36037375babb9210221e8ab76e801ff9be62 SHA1 4ce615eb24a7f832e50b397b45bd80857b225332 SHA256 e6fef2a0b3409118b17d947ab13d50eb8f1d62518199003387bf3ba5801e8e58
diff --git a/app-editors/vim/files/vim-7.1-interix-link.patch b/app-editors/vim/files/vim-7.1-interix-link.patch
new file mode 100644
index 000000000000..da046665dfc5
--- /dev/null
+++ b/app-editors/vim/files/vim-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/vim/files/vim-7.1.285-darwin-x11link.patch b/app-editors/vim/files/vim-7.1.285-darwin-x11link.patch
new file mode 100644
index 000000000000..1cf00d6a8faa
--- /dev/null
+++ b/app-editors/vim/files/vim-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/vim/files/vim-7.1.319-interix-cflags.patch b/app-editors/vim/files/vim-7.1.319-interix-cflags.patch
new file mode 100644
index 000000000000..630e0015ee0a
--- /dev/null
+++ b/app-editors/vim/files/vim-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/vim/vim-7.2.402.ebuild b/app-editors/vim/vim-7.2.402.ebuild
index 5968c2b5c9af..3ae971b870fa 100644
--- a/app-editors/vim/vim-7.2.402.ebuild
+++ b/app-editors/vim/vim-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/vim-7.2.402.ebuild,v 1.1 2010/03/17 22:00:36 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim/vim-7.2.402.ebuild,v 1.2 2010/04/15 19:39:22 darkside Exp $
 
-EAPI=2
+EAPI=3
 inherit vim
 
 VIM_VERSION="7.2"
@@ -15,5 +15,15 @@ SRC_URI="ftp://ftp.vim.org/pub/vim/unix/vim-${VIM_VERSION}.tar.bz2
 
 S="${WORKDIR}/vim${VIM_VERSION/.}"
 DESCRIPTION="Vim, an improved vi-style text editor"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
+
+src_prepare() {
+	vim_src_prepare
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		epatch "${FILESDIR}"/${PN}-7.1-interix-link.patch
+		epatch "${FILESDIR}"/${PN}-7.1.319-interix-cflags.patch
+	fi
+	epatch "${FILESDIR}"/${PN}-7.1.285-darwin-x11link.patch
+}