* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2012-09-11 16:40 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2012-09-11 16:40 UTC (permalink / raw
To: gentoo-commits
radhermit 12/09/11 16:40:05
Modified: ChangeLog vim.eclass
Log:
Allow vim to be built against ruby-1.9.
Revision Changes Path
1.393 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.393&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.393&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.392&r2=1.393
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -r1.392 -r1.393
--- ChangeLog 11 Sep 2012 08:15:08 -0000 1.392
+++ ChangeLog 11 Sep 2012 16:40:05 -0000 1.393
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.392 2012/09/11 08:15:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.393 2012/09/11 16:40:05 radhermit Exp $
+
+ 11 Sep 2012; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Allow vim to be built against ruby-1.9.
11 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> chromium.eclass:
Remove deprecated chromium_check_kernel_config.
1.203 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.203&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.203&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.202&r2=1.203
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- vim.eclass 2 May 2012 18:31:45 -0000 1.202
+++ vim.eclass 11 Sep 2012 16:40:05 -0000 1.203
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.202 2012/05/02 18:31:45 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.203 2012/09/11 16:40:05 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -87,13 +87,13 @@
gpm? ( >=sys-libs/gpm-1.19.3 )
perl? ( dev-lang/perl )
acl? ( kernel_linux? ( sys-apps/acl ) )
- ruby? ( =dev-lang/ruby-1.8* )"
+ ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )"
RDEPEND="${RDEPEND}
cscope? ( dev-util/cscope )
gpm? ( >=sys-libs/gpm-1.19.3 )
perl? ( dev-lang/perl )
acl? ( kernel_linux? ( sys-apps/acl ) )
- ruby? ( =dev-lang/ruby-1.8* )
+ ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )
!<app-vim/align-30-r1
!<app-vim/vimbuddy-0.9.1-r1
!<app-vim/autoalign-11
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2012-09-18 1:26 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2012-09-18 1:26 UTC (permalink / raw
To: gentoo-commits
radhermit 12/09/18 01:26:55
Modified: ChangeLog vim.eclass
Log:
Use has_version instead of built_with_use.
Revision Changes Path
1.404 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.404&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.404&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.403&r2=1.404
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.403
retrieving revision 1.404
diff -u -r1.403 -r1.404
--- ChangeLog 17 Sep 2012 19:32:49 -0000 1.403
+++ ChangeLog 18 Sep 2012 01:26:55 -0000 1.404
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.403 2012/09/17 19:32:49 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.404 2012/09/18 01:26:55 radhermit Exp $
+
+ 18 Sep 2012; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Use has_version instead of built_with_use.
17 Sep 2012; Joerg Bornkessel <hd_brummy@gentoo.org> vdr-plugin-2.eclass:
better LINGUAS detection, vdr-plugin-2.eclass
1.204 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.204&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.204&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.203&r2=1.204
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- vim.eclass 11 Sep 2012 16:40:05 -0000 1.203
+++ vim.eclass 18 Sep 2012 01:26:55 -0000 1.204
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.203 2012/09/11 16:40:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.204 2012/09/18 01:26:55 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -245,7 +245,7 @@
# python.eclass only defines python_pkg_setup for EAPIs that support
# USE dependencies
python_pkg_setup
- elif ! built_with_use =dev-lang/python-2* threads; then
+ elif ! has_version "=dev-lang/python-2*[threads]"; then
die "You must build dev-lang/python with USE=threads"
fi
fi
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-04-21 23:23 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-04-21 23:23 UTC (permalink / raw
To: gentoo-commits
radhermit 13/04/21 23:23:22
Modified: ChangeLog vim.eclass
Log:
Move EAPI check earlier (patch by mgorny, bug #458794).
Revision Changes Path
1.796 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.796&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.796&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.795&r2=1.796
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -r1.795 -r1.796
--- ChangeLog 20 Apr 2013 18:23:57 -0000 1.795
+++ ChangeLog 21 Apr 2013 23:23:22 -0000 1.796
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.795 2013/04/20 18:23:57 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.796 2013/04/21 23:23:22 radhermit Exp $
+
+ 21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Move EAPI check earlier (patch by mgorny, bug #458794).
20 Apr 2013; Ralph Sennhauser <sera@gentoo.org> java-ant-2.eclass:
Raise ant-core dep to version 1.8.2. #466558
1.207 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.207&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.207&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.206&r2=1.207
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- vim.eclass 10 Mar 2013 02:02:30 -0000 1.206
+++ vim.eclass 21 Apr 2013 23:23:22 -0000 1.207
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.206 2013/03/10 02:02:30 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.207 2013/04/21 23:23:22 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -22,6 +22,20 @@
# -aqua -gtk -motif neXt NEXTAW
# -aqua -gtk -motif -neXt ATHENA
+# Check for EAPI functions we need:
+case "${EAPI:-0}" in
+ 0|1)
+ die "vim.eclass no longer supports EAPI 0 or 1"
+ ;;
+ 2|3)
+ HAS_SRC_PREPARE=1
+ HAS_USE_DEP=1
+ ;;
+ *)
+ die "Unknown EAPI ${EAPI}"
+ ;;
+esac
+
# Support -cvs ebuilds, even though they're not in the official tree.
MY_PN=${PN%-cvs}
@@ -37,20 +51,6 @@
SLOT="0"
LICENSE="vim"
-# Check for EAPI functions we need:
-case "${EAPI:-0}" in
- 0|1)
- die "vim.eclass no longer supports EAPI 0 or 1"
- ;;
- 2|3)
- HAS_SRC_PREPARE=1
- HAS_USE_DEP=1
- ;;
- *)
- die "Unknown EAPI ${EAPI}"
- ;;
-esac
-
if [[ ${PN##*-} == "cvs" ]] ; then
inherit cvs
fi
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-04-21 23:24 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-04-21 23:24 UTC (permalink / raw
To: gentoo-commits
radhermit 13/04/21 23:24:24
Modified: ChangeLog vim.eclass
Log:
Disable python.eclass inherit in vim-core (patch by mgorny, bug #458794).
Revision Changes Path
1.797 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.797&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.797&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.796&r2=1.797
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.796
retrieving revision 1.797
diff -u -r1.796 -r1.797
--- ChangeLog 21 Apr 2013 23:23:22 -0000 1.796
+++ ChangeLog 21 Apr 2013 23:24:24 -0000 1.797
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.796 2013/04/21 23:23:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.797 2013/04/21 23:24:24 radhermit Exp $
+
+ 21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Disable python.eclass inherit in vim-core (patch by mgorny, bug #458794).
21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Move EAPI check earlier (patch by mgorny, bug #458794).
1.208 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.208&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.208&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.207&r2=1.208
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- vim.eclass 21 Apr 2013 23:23:22 -0000 1.207
+++ vim.eclass 21 Apr 2013 23:24:24 -0000 1.208
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.207 2013/04/21 23:23:22 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.208 2013/04/21 23:24:24 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -44,8 +44,9 @@
PYTHON_DEPEND="python? 2"
PYTHON_USE_WITH_OPT="python"
PYTHON_USE_WITH="threads"
+ inherit python
fi
-inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix python
+inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix
HOMEPAGE="http://www.vim.org/"
SLOT="0"
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-04-21 23:25 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-04-21 23:25 UTC (permalink / raw
To: gentoo-commits
radhermit 13/04/21 23:25:34
Modified: ChangeLog vim.eclass
Log:
Remove pre-EAPI 2 code blocks (patch by mgorny, bug #458794).
Revision Changes Path
1.798 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.798&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.798&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.797&r2=1.798
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -r1.797 -r1.798
--- ChangeLog 21 Apr 2013 23:24:24 -0000 1.797
+++ ChangeLog 21 Apr 2013 23:25:34 -0000 1.798
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.797 2013/04/21 23:24:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.798 2013/04/21 23:25:34 radhermit Exp $
+
+ 21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Remove pre-EAPI 2 code blocks (patch by mgorny, bug #458794).
21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Disable python.eclass inherit in vim-core (patch by mgorny, bug #458794).
1.209 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.209&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.209&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.208&r2=1.209
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- vim.eclass 21 Apr 2013 23:24:24 -0000 1.208
+++ vim.eclass 21 Apr 2013 23:25:34 -0000 1.209
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.208 2013/04/21 23:24:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.209 2013/04/21 23:25:34 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -28,8 +28,6 @@
die "vim.eclass no longer supports EAPI 0 or 1"
;;
2|3)
- HAS_SRC_PREPARE=1
- HAS_USE_DEP=1
;;
*)
die "Unknown EAPI ${EAPI}"
@@ -58,13 +56,8 @@
IUSE="nls acl"
-TO_EXPORT="pkg_setup src_compile src_install src_test pkg_postinst pkg_postrm"
-if [[ $HAS_SRC_PREPARE ]]; then
- TO_EXPORT="${TO_EXPORT} src_prepare src_configure"
-else
- TO_EXPORT="${TO_EXPORT} src_unpack"
-fi
-EXPORT_FUNCTIONS ${TO_EXPORT}
+EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_configure \
+ src_install src_test pkg_postinst pkg_postrm
DEPEND="${DEPEND}
>=app-admin/eselect-vi-1.1
@@ -243,13 +236,9 @@
if [[ ${MY_PN} != "vim-core" ]] && use python; then
# vim supports python-2 only
python_set_active_version 2
- if [[ $HAS_USE_DEP ]]; then
- # python.eclass only defines python_pkg_setup for EAPIs that support
- # USE dependencies
- python_pkg_setup
- elif ! has_version "=dev-lang/python-2*[threads]"; then
- die "You must build dev-lang/python with USE=threads"
- fi
+ # python.eclass only defines python_pkg_setup for EAPIs that support
+ # USE dependencies
+ python_pkg_setup
fi
}
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-04-21 23:26 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-04-21 23:26 UTC (permalink / raw
To: gentoo-commits
radhermit 13/04/21 23:26:59
Modified: ChangeLog vim.eclass
Log:
Use python-r1 in EAPI 5 (patch by mgorny, bug #458794).
Revision Changes Path
1.799 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.799&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.799&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.798&r2=1.799
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.798
retrieving revision 1.799
diff -u -r1.798 -r1.799
--- ChangeLog 21 Apr 2013 23:25:34 -0000 1.798
+++ ChangeLog 21 Apr 2013 23:26:59 -0000 1.799
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.798 2013/04/21 23:25:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.799 2013/04/21 23:26:59 radhermit Exp $
+
+ 21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Use python-r1 in EAPI 5 (patch by mgorny, bug #458794).
21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Remove pre-EAPI 2 code blocks (patch by mgorny, bug #458794).
1.210 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.210&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.210&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.209&r2=1.210
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- vim.eclass 21 Apr 2013 23:25:34 -0000 1.209
+++ vim.eclass 21 Apr 2013 23:26:59 -0000 1.210
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.209 2013/04/21 23:25:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.210 2013/04/21 23:26:59 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -29,6 +29,9 @@
;;
2|3)
;;
+ 5)
+ HAS_PYTHON_R1=1
+ ;;
*)
die "Unknown EAPI ${EAPI}"
;;
@@ -38,11 +41,16 @@
MY_PN=${PN%-cvs}
if [[ ${MY_PN} != "vim-core" ]] ; then
- # vim supports python-2 only
- PYTHON_DEPEND="python? 2"
- PYTHON_USE_WITH_OPT="python"
- PYTHON_USE_WITH="threads"
- inherit python
+ if [[ ${HAS_PYTHON_R1} ]]; then
+ PYTHON_REQ_USE=threads
+ inherit python-r1
+ else
+ # vim supports python-2 only
+ PYTHON_DEPEND="python? 2"
+ PYTHON_USE_WITH_OPT="python"
+ PYTHON_USE_WITH="threads"
+ inherit python
+ fi
fi
inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix
@@ -77,6 +85,20 @@
else
IUSE="${IUSE} cscope debug gpm perl python ruby"
+ if [[ ${HAS_PYTHON_R1} ]]; then
+ DEPEND="${DEPEND}
+ python? ( ${PYTHON_DEPS} )"
+ RDEPEND="${RDEPEND}
+ python? ( ${PYTHON_DEPS} )"
+ # at most one version of py2 and one of py3
+ REQUIRED_USE="${REQUIRED_USE}
+ python? (
+ || ( $(python_gen_useflags '*') )
+ ?? ( $(python_gen_useflags 'python2*') )
+ ?? ( $(python_gen_useflags 'python3*') )
+ )"
+ fi
+
DEPEND="${DEPEND}
cscope? ( dev-util/cscope )
gpm? ( >=sys-libs/gpm-1.19.3 )
@@ -233,12 +255,14 @@
mkdir -p "${T}/home"
export HOME="${T}/home"
- if [[ ${MY_PN} != "vim-core" ]] && use python; then
- # vim supports python-2 only
- python_set_active_version 2
- # python.eclass only defines python_pkg_setup for EAPIs that support
- # USE dependencies
- python_pkg_setup
+ if [[ ! ${HAS_PYTHON_R1} ]]; then
+ if [[ ${MY_PN} != "vim-core" ]] && use python; then
+ # vim supports python-2 only
+ python_set_active_version 2
+ # python.eclass only defines python_pkg_setup for EAPIs that support
+ # USE dependencies
+ python_pkg_setup
+ fi
fi
}
@@ -410,7 +434,25 @@
myconf="${myconf} `use_enable cscope`"
myconf="${myconf} `use_enable gpm`"
myconf="${myconf} `use_enable perl perlinterp`"
- myconf="${myconf} `use_enable python pythoninterp`"
+ if [[ ${HAS_PYTHON_R1} ]]; then
+ if use python; then
+ py_add_interp() {
+ local v
+
+ [[ ${EPYTHON} == python3* ]] && v=3
+
+ myconf="${myconf} --enable-python${v}interp
+ vi_cv_path_python${v}=${PYTHON}"
+ }
+
+ python_foreach_impl py_add_interp
+ else
+ myconf="${myconf} --disable-pythoninterp
+ --disable-python3interp"
+ fi
+ else
+ myconf="${myconf} `use_enable python pythoninterp`"
+ fi
myconf="${myconf} `use_enable ruby rubyinterp`"
# tclinterp is broken; when you --enable-tclinterp flag, then
# the following command never returns:
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-04-24 1:46 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-04-24 1:46 UTC (permalink / raw
To: gentoo-commits
radhermit 13/04/24 01:46:28
Modified: ChangeLog vim.eclass
Log:
Migrate from python-r1 to python-single-r1.
Revision Changes Path
1.800 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.800&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.800&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.799&r2=1.800
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -r1.799 -r1.800
--- ChangeLog 21 Apr 2013 23:26:59 -0000 1.799
+++ ChangeLog 24 Apr 2013 01:46:28 -0000 1.800
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.799 2013/04/21 23:26:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.800 2013/04/24 01:46:28 radhermit Exp $
+
+ 24 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Migrate from python-r1 to python-single-r1.
21 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Use python-r1 in EAPI 5 (patch by mgorny, bug #458794).
1.211 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.211&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.211&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.210&r2=1.211
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- vim.eclass 21 Apr 2013 23:26:59 -0000 1.210
+++ vim.eclass 24 Apr 2013 01:46:28 -0000 1.211
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.210 2013/04/21 23:26:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.211 2013/04/24 01:46:28 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -43,7 +43,7 @@
if [[ ${MY_PN} != "vim-core" ]] ; then
if [[ ${HAS_PYTHON_R1} ]]; then
PYTHON_REQ_USE=threads
- inherit python-r1
+ inherit python-single-r1
else
# vim supports python-2 only
PYTHON_DEPEND="python? 2"
@@ -90,13 +90,6 @@
python? ( ${PYTHON_DEPS} )"
RDEPEND="${RDEPEND}
python? ( ${PYTHON_DEPS} )"
- # at most one version of py2 and one of py3
- REQUIRED_USE="${REQUIRED_USE}
- python? (
- || ( $(python_gen_useflags '*') )
- ?? ( $(python_gen_useflags 'python2*') )
- ?? ( $(python_gen_useflags 'python3*') )
- )"
fi
DEPEND="${DEPEND}
@@ -255,8 +248,10 @@
mkdir -p "${T}/home"
export HOME="${T}/home"
- if [[ ! ${HAS_PYTHON_R1} ]]; then
- if [[ ${MY_PN} != "vim-core" ]] && use python; then
+ if [[ ${MY_PN} != "vim-core" ]] && use python; then
+ if [[ ${HAS_PYTHON_R1} ]]; then
+ python-single-r1_pkg_setup
+ else
# vim supports python-2 only
python_set_active_version 2
# python.eclass only defines python_pkg_setup for EAPIs that support
@@ -436,19 +431,15 @@
myconf="${myconf} `use_enable perl perlinterp`"
if [[ ${HAS_PYTHON_R1} ]]; then
if use python; then
- py_add_interp() {
- local v
-
- [[ ${EPYTHON} == python3* ]] && v=3
-
- myconf="${myconf} --enable-python${v}interp
- vi_cv_path_python${v}=${PYTHON}"
- }
-
- python_foreach_impl py_add_interp
+ if [[ ${EPYTHON} == python3* ]]; then
+ myconf="${myconf} --enable-python3interp"
+ export vi_cv_path_python3="${PYTHON}"
+ else
+ myconf="${myconf} --enable-pythoninterp"
+ export vi_cv_path_python="${PYTHON}"
+ fi
else
- myconf="${myconf} --disable-pythoninterp
- --disable-python3interp"
+ myconf="${myconf} --disable-pythoninterp --disable-python3interp"
fi
else
myconf="${myconf} `use_enable python pythoninterp`"
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-04-24 1:49 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-04-24 1:49 UTC (permalink / raw
To: gentoo-commits
radhermit 13/04/24 01:49:40
Modified: ChangeLog vim.eclass
Log:
Remove old, conditional src_configure call in src_compile.
Revision Changes Path
1.801 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.801&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.801&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.800&r2=1.801
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.800
retrieving revision 1.801
diff -u -r1.800 -r1.801
--- ChangeLog 24 Apr 2013 01:46:28 -0000 1.800
+++ ChangeLog 24 Apr 2013 01:49:40 -0000 1.801
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.800 2013/04/24 01:46:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.801 2013/04/24 01:49:40 radhermit Exp $
+
+ 24 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Remove old, conditional src_configure call in src_compile.
24 Apr 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Migrate from python-r1 to python-single-r1.
1.212 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.212&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.212&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.211&r2=1.212
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- vim.eclass 24 Apr 2013 01:46:28 -0000 1.211
+++ vim.eclass 24 Apr 2013 01:49:40 -0000 1.212
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.211 2013/04/24 01:46:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.212 2013/04/24 01:49:40 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -531,8 +531,6 @@
}
vim_src_compile() {
- has src_configure ${TO_EXPORT} || vim_src_configure
-
# The following allows emake to be used
emake -j1 -C src auto/osdef.h objects || die "make failed"
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-05-08 8:20 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-05-08 8:20 UTC (permalink / raw
To: gentoo-commits
radhermit 13/05/08 08:20:12
Modified: ChangeLog vim.eclass
Log:
Fix build with sys-libs/ncurses[tinfo] (bug #457564, patch by Ben Longbons).
Revision Changes Path
1.814 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.814&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.814&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.813&r2=1.814
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -r1.813 -r1.814
--- ChangeLog 5 May 2013 20:22:25 -0000 1.813
+++ ChangeLog 8 May 2013 08:20:12 -0000 1.814
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.813 2013/05/05 20:22:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.814 2013/05/08 08:20:12 radhermit Exp $
+
+ 08 May 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Fix build with sys-libs/ncurses[tinfo] (bug #457564, patch by Ben Longbons).
05 May 2013; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Support complete EAPI src_test().
1.213 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.213&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.213&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.212&r2=1.213
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- vim.eclass 24 Apr 2013 01:49:40 -0000 1.212
+++ vim.eclass 8 May 2013 08:20:12 -0000 1.213
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.212 2013/04/24 01:49:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.213 2013/05/08 08:20:12 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -505,10 +505,6 @@
myconf="${myconf} `use_enable nls` `use_enable acl`"
fi
- # Note: If USE=gpm, then ncurses will still be required. See bug #93970
- # for the reasons behind the USE flag change.
- myconf="${myconf} --with-tlib=curses"
-
myconf="${myconf} --disable-selinux"
# Let Portage do the stripping. Some people like that.
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-05-08 8:37 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-05-08 8:37 UTC (permalink / raw
To: gentoo-commits
radhermit 13/05/08 08:37:40
Modified: ChangeLog vim.eclass
Log:
Fix dangling gvim manpage symlinks (bug #455480, patch by Arfrever).
Revision Changes Path
1.815 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.815&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.815&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.814&r2=1.815
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -r1.814 -r1.815
--- ChangeLog 8 May 2013 08:20:12 -0000 1.814
+++ ChangeLog 8 May 2013 08:37:40 -0000 1.815
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.814 2013/05/08 08:20:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.815 2013/05/08 08:37:40 radhermit Exp $
+
+ 08 May 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Fix dangling gvim manpage symlinks (bug #455480, patch by Arfrever).
08 May 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Fix build with sys-libs/ncurses[tinfo] (bug #457564, patch by Ben Longbons).
1.214 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.214&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.214&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.213&r2=1.214
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- vim.eclass 8 May 2013 08:20:12 -0000 1.213
+++ vim.eclass 8 May 2013 08:37:40 -0000 1.214
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.213 2013/05/08 08:20:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.214 2013/05/08 08:37:40 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -611,9 +611,11 @@
dosym gvim /usr/bin/gview
dosym gvim /usr/bin/rgvim
dosym gvim /usr/bin/rgview
- dosym vim.1.gz /usr/share/man/man1/gvim.1.gz
- dosym vim.1.gz /usr/share/man/man1/gview.1.gz
- dosym vimdiff.1.gz /usr/share/man/man1/gvimdiff.1.gz
+
+ dodir /usr/share/man/man1
+ echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1
+ echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1
+ echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1
insinto /etc/vim
newins "${FILESDIR}"/gvimrc${GVIMRC_FILE_SUFFIX} gvimrc
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-05-17 0:33 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-05-17 0:33 UTC (permalink / raw
To: gentoo-commits
radhermit 13/05/17 00:33:16
Modified: ChangeLog vim.eclass
Log:
Migrate from supporting cvs to mercurial for live builds.
Revision Changes Path
1.827 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.827&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.827&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.826&r2=1.827
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- ChangeLog 16 May 2013 14:25:13 -0000 1.826
+++ ChangeLog 17 May 2013 00:33:16 -0000 1.827
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.826 2013/05/16 14:25:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.827 2013/05/17 00:33:16 radhermit Exp $
+
+ 17 May 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Migrate from supporting cvs to mercurial for live builds.
16 May 2013; Jeroen Roovers <jer@gentoo.org> nvidia-driver.eclass:
Check for lspci before use.
1.215 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.215&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.215&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.214&r2=1.215
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- vim.eclass 8 May 2013 08:37:40 -0000 1.214
+++ vim.eclass 17 May 2013 00:33:16 -0000 1.215
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.214 2013/05/08 08:37:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.215 2013/05/17 00:33:16 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -10,9 +10,7 @@
# Ciaran McCreesh <ciaranm@gentoo.org>
# Mike Kelly <pioto@gentoo.org>
-# This eclass handles vim, gvim and vim-core. Support for -cvs ebuilds is
-# included in the eclass, since it's rather easy to do, but there are no
-# official vim*-cvs ebuilds in the tree.
+# This eclass handles vim, gvim and vim-core.
# gvim's GUI preference order is as follows:
# aqua CARBON (not tested)
@@ -37,10 +35,7 @@
;;
esac
-# Support -cvs ebuilds, even though they're not in the official tree.
-MY_PN=${PN%-cvs}
-
-if [[ ${MY_PN} != "vim-core" ]] ; then
+if [[ ${PN} != "vim-core" ]] ; then
if [[ ${HAS_PYTHON_R1} ]]; then
PYTHON_REQ_USE=threads
inherit python-single-r1
@@ -52,16 +47,19 @@
inherit python
fi
fi
+
inherit eutils vim-doc flag-o-matic versionator fdo-mime bash-completion-r1 prefix
+if [[ ${PV} == 9999* ]] ; then
+ inherit mercurial
+ EHG_REPO_URI="https://vim.googlecode.com/hg/"
+ EHG_PROJECT="vim"
+fi
+
HOMEPAGE="http://www.vim.org/"
SLOT="0"
LICENSE="vim"
-if [[ ${PN##*-} == "cvs" ]] ; then
- inherit cvs
-fi
-
IUSE="nls acl"
EXPORT_FUNCTIONS pkg_setup src_prepare src_compile src_configure \
@@ -79,7 +77,7 @@
>=sys-libs/ncurses-5.2-r2
nls? ( virtual/libintl )"
-if [[ ${MY_PN} == "vim-core" ]] ; then
+if [[ ${PN} == "vim-core" ]] ; then
IUSE="${IUSE} livecd"
PDEPEND="!livecd? ( app-vim/gentoo-syntax )"
else
@@ -116,7 +114,7 @@
# RDEPEND="${RDEPEND}
# mzscheme? ( dev-scheme/mzscheme )"
- if [[ ${MY_PN} == vim ]] ; then
+ if [[ ${PN} == vim ]] ; then
IUSE="${IUSE} X minimal vim-pager"
DEPEND="${DEPEND}
X? ( x11-libs/libXt x11-libs/libX11
@@ -127,7 +125,7 @@
!minimal? ( ~app-editors/vim-core-${PV}
dev-util/ctags )
!<app-editors/nvi-1.81.5-r4"
- elif [[ ${MY_PN} == gvim ]] ; then
+ elif [[ ${PN} == gvim ]] ; then
IUSE="${IUSE} aqua gnome gtk motif neXt netbeans"
DEPEND="${DEPEND}
dev-util/ctags
@@ -161,6 +159,8 @@
fi
fi
+S=${WORKDIR}/vim${VIM_VERSION/.}
+
apply_vim_patches() {
local p
cd "${S}" || die "cd ${S} failed"
@@ -248,7 +248,7 @@
mkdir -p "${T}/home"
export HOME="${T}/home"
- if [[ ${MY_PN} != "vim-core" ]] && use python; then
+ if [[ ${PN} != "vim-core" ]] && use python; then
if [[ ${HAS_PYTHON_R1} ]]; then
python-single-r1_pkg_setup
else
@@ -263,13 +263,7 @@
vim_src_prepare() {
has "${EAPI:-0}" 0 1 2 && ! use prefix && EPREFIX=
- if [[ ${PN##*-} == cvs ]] ; then
- ECVS_SERVER="vim.cvs.sourceforge.net:/cvsroot/vim"
- ECVS_PASS=""
- ECVS_MODULE="vim7"
- ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src/${ECVS_MODULE}"
- cvs_src_unpack
- else
+ if [[ ${PV} != 9999* ]] ; then
# Apply any patches available from vim.org for this version
if [[ $VIM_ORG_PATCHES == *.patch.bz2 ]]; then
einfo "Applying monolithic patch ${VIM_ORG_PATCHES}"
@@ -296,7 +290,7 @@
if [[ -d "${WORKDIR}"/gentoo/patches-all/ ]]; then
EPATCH_SUFFIX="gz" EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/gentoo/patches-all/
- elif [[ ${MY_PN} == "vim-core" ]] && [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
+ elif [[ ${PN} == "vim-core" ]] && [[ -d "${WORKDIR}"/gentoo/patches-core/ ]]; then
# Patches for vim-core only (runtime/*)
EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/gentoo/patches-core/
@@ -343,7 +337,7 @@
find "${S}" -name '*.c' | while read c ; do echo >> "$c" ; done
# conditionally make the manpager.sh script
- if [[ ${MY_PN} == vim ]] && use vim-pager ; then
+ if [[ ${PN} == vim ]] && use vim-pager ; then
cat <<END > "${S}"/runtime/macros/manpager.sh
#!/bin/sh
sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
@@ -410,8 +404,8 @@
[[ -e ${file} ]] && addwrite $file
done
- if [[ ${MY_PN} == "vim-core" ]] ||
- ( [[ ${MY_PN} == vim ]] && use minimal ); then
+ if [[ ${PN} == "vim-core" ]] ||
+ ( [[ ${PN} == vim ]] && use minimal ); then
myconf="--with-features=tiny \
--enable-gui=no \
--without-x \
@@ -450,7 +444,7 @@
# VIMINIT='let OS=system("uname -s")' vim
# mzscheme support is currently broken. bug #91970
#myconf="${myconf} `use_enable mzscheme mzschemeinterp`"
- if [[ ${MY_PN} == gvim ]] ; then
+ if [[ ${PN} == gvim ]] ; then
myconf="${myconf} `use_enable netbeans`"
fi
@@ -461,12 +455,12 @@
die "couldn't disable cscope"
fi
- if [[ ${MY_PN} == vim ]] ; then
+ if [[ ${PN} == vim ]] ; then
# don't test USE=X here ... see bug #19115
# but need to provide a way to link against X ... see bug #20093
myconf="${myconf} --enable-gui=no --disable-darwin `use_with X x`"
- elif [[ ${MY_PN} == gvim ]] ; then
+ elif [[ ${PN} == gvim ]] ; then
myconf="${myconf} --with-vim-name=gvim --with-x"
echo ; echo
@@ -495,11 +489,11 @@
echo ; echo
else
- die "vim.eclass doesn't understand MY_PN=${MY_PN}"
+ die "vim.eclass doesn't understand PN=${PN}"
fi
fi
- if [[ ${MY_PN} == vim ]] && use minimal ; then
+ if [[ ${PN} == vim ]] && use minimal ; then
myconf="${myconf} --disable-nls --disable-multibyte --disable-acl"
else
myconf="${myconf} `use_enable nls` `use_enable acl`"
@@ -513,7 +507,7 @@
# Keep Gentoo Prefix env contained within the EPREFIX
use prefix && myconf="${myconf} --without-local-dir"
- if [[ ${MY_PN} == "*vim" ]] ; then
+ if [[ ${PN} == "*vim" ]] ; then
if [[ ${CHOST} == *-interix* ]]; then
# avoid finding of this function, to avoid having to patch either
# configure or the source, which would be much more hackish.
@@ -530,7 +524,7 @@
# The following allows emake to be used
emake -j1 -C src auto/osdef.h objects || die "make failed"
- if [[ ${MY_PN} == "vim-core" ]] ; then
+ if [[ ${PN} == "vim-core" ]] ; then
emake tools || die "emake tools failed"
rm -f src/vim
else
@@ -550,7 +544,7 @@
has "${EAPI:-0}" 0 1 2 && use !prefix && ED="${D}"
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
- if [[ ${MY_PN} == "vim-core" ]] ; then
+ if [[ ${PN} == "vim-core" ]] ; then
dodir /usr/{bin,share/{man/man1,vim}}
cd src || die "cd src failed"
make \
@@ -603,7 +597,7 @@
# exist.
rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null
- elif [[ ${MY_PN} == gvim ]] ; then
+ elif [[ ${PN} == gvim ]] ; then
dobin src/gvim
dosym gvim /usr/bin/gvimdiff
dosym gvim /usr/bin/evim
@@ -643,10 +637,10 @@
fi
# bash completion script, bug #79018.
- if [[ ${MY_PN} == "vim-core" ]] ; then
+ if [[ ${PN} == "vim-core" ]] ; then
newbashcomp "${FILESDIR}"/xxd-completion xxd
else
- newbashcomp "${FILESDIR}"/${MY_PN}-completion ${MY_PN}
+ newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
fi
# We shouldn't be installing the ex or view man page symlinks, as they
# are managed by eselect-vi
@@ -694,11 +688,11 @@
update_vim_helptags
# Update fdo mime stuff, bug #78394
- if [[ ${MY_PN} == gvim ]] ; then
+ if [[ ${PN} == gvim ]] ; then
fdo-mime_mime_database_update
fi
- if [[ ${MY_PN} == vim ]] ; then
+ if [[ ${PN} == vim ]] ; then
if use X; then
echo
elog "The 'X' USE flag enables vim <-> X communication, like"
@@ -717,8 +711,9 @@
echo
ewarn "Note that the English word lists are no longer installed by"
ewarn "default."
+ echo
- if [[ ${MY_PN} != "vim-core" ]] ; then
+ if [[ ${PN} != "vim-core" ]] ; then
echo
elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
fi
@@ -732,18 +727,8 @@
ewarn "happen again since the ebuild no longer sets VIMRUNTIME."
fi
- # Scream loudly if the user is using a -cvs ebuild
- if [[ -z "${PN/*-cvs/}" ]] ; then
- ewarn
- ewarn "You are using a -cvs ebuild. Be warned that this is not"
- ewarn "officially supported and may not work."
- ebeep 5
- fi
-
- echo
-
# Make convenience symlinks
- if [[ ${MY_PN} != "vim-core" ]] ; then
+ if [[ ${PN} != "vim-core" ]] ; then
# But only for vim/gvim, bug #252724
update_vim_symlinks
fi
@@ -754,20 +739,20 @@
update_vim_helptags
# Make convenience symlinks
- if [[ ${MY_PN} != "vim-core" ]] ; then
+ if [[ ${PN} != "vim-core" ]] ; then
# But only for vim/gvim, bug #252724
update_vim_symlinks
fi
# Update fdo mime stuff, bug #78394
- if [[ ${MY_PN} == gvim ]] ; then
+ if [[ ${PN} == gvim ]] ; then
fdo-mime_mime_database_update
fi
}
vim_src_test() {
- if [[ ${MY_PN} == "vim-core" ]] ; then
+ if [[ ${PN} == "vim-core" ]] ; then
einfo "No testing needs to be done for vim-core"
return
fi
@@ -785,7 +770,7 @@
# Don't let vim talk to X
unset DISPLAY
- if [[ ${MY_PN} == gvim ]] ; then
+ if [[ ${PN} == gvim ]] ; then
# Make gvim not try to connect to X. See :help gui-x11-start
# in vim for how this evil trickery works.
ln -s "${S}"/src/gvim "${S}"/src/testvim
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-05-17 0:52 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-05-17 0:52 UTC (permalink / raw
To: gentoo-commits
radhermit 13/05/17 00:52:46
Modified: ChangeLog vim.eclass
Log:
Remove unused src_unpack function.
Revision Changes Path
1.828 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.828&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.828&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.827&r2=1.828
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.827
retrieving revision 1.828
diff -u -r1.827 -r1.828
--- ChangeLog 17 May 2013 00:33:16 -0000 1.827
+++ ChangeLog 17 May 2013 00:52:46 -0000 1.828
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.827 2013/05/17 00:33:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.828 2013/05/17 00:52:46 radhermit Exp $
+
+ 17 May 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Remove unused src_unpack function.
17 May 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Migrate from supporting cvs to mercurial for live builds.
1.216 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.216&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.216&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.215&r2=1.216
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- vim.eclass 17 May 2013 00:33:16 -0000 1.215
+++ vim.eclass 17 May 2013 00:52:46 -0000 1.216
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.215 2013/05/17 00:33:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.216 2013/05/17 00:52:46 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -367,11 +367,6 @@
fi
}
-vim_src_unpack() {
- unpack ${A}
- vim_src_prepare
-}
-
vim_src_configure() {
local myconf
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-05-30 7:15 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-05-30 7:15 UTC (permalink / raw
To: gentoo-commits
radhermit 13/05/30 07:15:56
Modified: ChangeLog vim.eclass
Log:
Add PYTHON_REQUIRED_USE for python-single-r1.
Revision Changes Path
1.842 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.842&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.842&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.841&r2=1.842
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- ChangeLog 28 May 2013 03:29:50 -0000 1.841
+++ ChangeLog 30 May 2013 07:15:55 -0000 1.842
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.841 2013/05/28 03:29:50 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.842 2013/05/30 07:15:55 radhermit Exp $
+
+ 30 May 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Add PYTHON_REQUIRED_USE for python-single-r1.
28 May 2013; <anarchy@gentoo.org> mozextension.eclass, nsplugins.eclass:
Ensure plugins/extensions are in correct place for >=firefox{-bin}-21.0
1.217 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.217&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.217&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.216&r2=1.217
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- vim.eclass 17 May 2013 00:52:46 -0000 1.216
+++ vim.eclass 30 May 2013 07:15:55 -0000 1.217
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.216 2013/05/17 00:52:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.217 2013/05/30 07:15:55 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -88,6 +88,7 @@
python? ( ${PYTHON_DEPS} )"
RDEPEND="${RDEPEND}
python? ( ${PYTHON_DEPS} )"
+ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
fi
DEPEND="${DEPEND}
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-06-09 20:33 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-06-09 20:33 UTC (permalink / raw
To: gentoo-commits
radhermit 13/06/09 20:33:19
Modified: ChangeLog vim.eclass
Log:
Remove old runtime and netrw snapshot unpacking support.
Revision Changes Path
1.853 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.853&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.853&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.852&r2=1.853
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- ChangeLog 9 Jun 2013 02:08:23 -0000 1.852
+++ ChangeLog 9 Jun 2013 20:33:19 -0000 1.853
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.852 2013/06/09 02:08:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.853 2013/06/09 20:33:19 radhermit Exp $
+
+ 09 Jun 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Remove old runtime and netrw snapshot unpacking support.
09 Jun 2013; Luca Barbato <lu_zero@gentoo.org> font.eclass:
Do not require fontconfig at runtime, it isn't necessary for many purposes,
1.218 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.218&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.218&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.217&r2=1.218
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- vim.eclass 30 May 2013 07:15:55 -0000 1.217
+++ vim.eclass 9 Jun 2013 20:33:19 -0000 1.218
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.217 2013/05/30 07:15:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.218 2013/06/09 20:33:19 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -272,18 +272,6 @@
else
apply_vim_patches
fi
-
- # Unpack the runtime snapshot if available (only for vim-core)
- if [[ -n "$VIM_RUNTIME_SNAP" ]] ; then
- cd "${S}" || die
- ebegin "Unpacking vim runtime snapshot"
- rm -rf runtime
- # Changed this from bzip2 |tar to tar -j since the former broke for
- # some reason on freebsd.
- # --spb, 2004/12/18
- tar xjf "${DISTDIR}"/${VIM_RUNTIME_SNAP}
- eend $?
- fi
fi
# Another set of patches borrowed from src rpm to fix syntax errors etc.
@@ -297,14 +285,6 @@
epatch "${WORKDIR}"/gentoo/patches-core/
fi
- # Unpack an updated netrw snapshot if necessary. This is nasty. Don't
- # ask, you don't want to know.
- if [[ -n "${VIM_NETRW_SNAP}" ]] ; then
- ebegin "Unpacking updated netrw snapshot"
- tar xjf "${DISTDIR}"/${VIM_NETRW_SNAP} -C runtime/
- eend $?
- fi
-
# Fixup a script to use awk instead of nawk
sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \
|| die "mve.awk sed failed"
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-06-09 20:41 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-06-09 20:41 UTC (permalink / raw
To: gentoo-commits
radhermit 13/06/09 20:41:50
Modified: ChangeLog vim.eclass
Log:
Replace backticks with $(...).
Revision Changes Path
1.854 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.854&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.854&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.853&r2=1.854
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -r1.853 -r1.854
--- ChangeLog 9 Jun 2013 20:33:19 -0000 1.853
+++ ChangeLog 9 Jun 2013 20:41:50 -0000 1.854
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.853 2013/06/09 20:33:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.854 2013/06/09 20:41:50 radhermit Exp $
+
+ 09 Jun 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Replace backticks with $(...).
09 Jun 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Remove old runtime and netrw snapshot unpacking support.
1.219 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.219&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.219&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.218&r2=1.219
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- vim.eclass 9 Jun 2013 20:33:19 -0000 1.218
+++ vim.eclass 9 Jun 2013 20:41:50 -0000 1.219
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.218 2013/06/09 20:33:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.219 2013/06/09 20:41:50 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -396,9 +396,9 @@
myconf="--with-features=huge \
--enable-multibyte"
- myconf="${myconf} `use_enable cscope`"
- myconf="${myconf} `use_enable gpm`"
- myconf="${myconf} `use_enable perl perlinterp`"
+ myconf="${myconf} $(use_enable cscope)"
+ myconf="${myconf} $(use_enable gpm)"
+ myconf="${myconf} $(use_enable perl perlinterp)"
if [[ ${HAS_PYTHON_R1} ]]; then
if use python; then
if [[ ${EPYTHON} == python3* ]]; then
@@ -412,16 +412,16 @@
myconf="${myconf} --disable-pythoninterp --disable-python3interp"
fi
else
- myconf="${myconf} `use_enable python pythoninterp`"
+ myconf="${myconf} $(use_enable python pythoninterp)"
fi
- myconf="${myconf} `use_enable ruby rubyinterp`"
+ myconf="${myconf} $(use_enable ruby rubyinterp)"
# tclinterp is broken; when you --enable-tclinterp flag, then
# the following command never returns:
# VIMINIT='let OS=system("uname -s")' vim
# mzscheme support is currently broken. bug #91970
- #myconf="${myconf} `use_enable mzscheme mzschemeinterp`"
+ #myconf="${myconf} $(use_enable mzscheme mzschemeinterp)"
if [[ ${PN} == gvim ]] ; then
- myconf="${myconf} `use_enable netbeans`"
+ myconf="${myconf} $(use_enable netbeans)"
fi
# --with-features=huge forces on cscope even if we --disable it. We need
@@ -434,7 +434,7 @@
if [[ ${PN} == vim ]] ; then
# don't test USE=X here ... see bug #19115
# but need to provide a way to link against X ... see bug #20093
- myconf="${myconf} --enable-gui=no --disable-darwin `use_with X x`"
+ myconf="${myconf} --enable-gui=no --disable-darwin $(use_with X x)"
elif [[ ${PN} == gvim ]] ; then
myconf="${myconf} --with-vim-name=gvim --with-x"
@@ -472,7 +472,7 @@
if [[ ${PN} == vim ]] && use minimal ; then
myconf="${myconf} --disable-nls --disable-multibyte --disable-acl"
else
- myconf="${myconf} `use_enable nls` `use_enable acl`"
+ myconf="${myconf} $(use_enable nls) $(use_enable acl)"
fi
myconf="${myconf} --disable-selinux"
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2013-06-11 9:25 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2013-06-11 9:25 UTC (permalink / raw
To: gentoo-commits
radhermit 13/06/11 09:25:45
Modified: ChangeLog vim.eclass
Log:
Remove old VIMRUNTIME warning.
Revision Changes Path
1.855 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.855&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.855&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.854&r2=1.855
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.854
retrieving revision 1.855
diff -u -r1.854 -r1.855
--- ChangeLog 9 Jun 2013 20:41:50 -0000 1.854
+++ ChangeLog 11 Jun 2013 09:25:45 -0000 1.855
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.854 2013/06/09 20:41:50 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.855 2013/06/11 09:25:45 radhermit Exp $
+
+ 11 Jun 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
+ Remove old VIMRUNTIME warning.
09 Jun 2013; Tim Harder <radhermit@gentoo.org> vim.eclass:
Replace backticks with $(...).
1.220 eclass/vim.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.220&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?rev=1.220&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/vim.eclass?r1=1.219&r2=1.220
Index: vim.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- vim.eclass 9 Jun 2013 20:41:50 -0000 1.219
+++ vim.eclass 11 Jun 2013 09:25:45 -0000 1.220
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.219 2013/06/09 20:41:50 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.220 2013/06/11 09:25:45 radhermit Exp $
# Authors:
# Jim Ramsay <lack@gentoo.org>
@@ -694,15 +694,6 @@
elog "To see what's new in this release, use :help version${VIM_VERSION/.*/}.txt"
fi
- # Warn about VIMRUNTIME
- if [ -n "$VIMRUNTIME" -a "${VIMRUNTIME##*/vim}" != "${VIM_VERSION/./}" ] ; then
- echo
- ewarn "WARNING: You have VIMRUNTIME set in your environment from an old"
- ewarn "installation. You will need to either unset VIMRUNTIME in each"
- ewarn "terminal, or log out completely and back in. This problem won't"
- ewarn "happen again since the ebuild no longer sets VIMRUNTIME."
- fi
-
# Make convenience symlinks
if [[ ${PN} != "vim-core" ]] ; then
# But only for vim/gvim, bug #252724
^ permalink raw reply [flat|nested] 17+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass
@ 2015-01-04 18:24 Tim Harder (radhermit)
0 siblings, 0 replies; 17+ messages in thread
From: Tim Harder (radhermit) @ 2015-01-04 18:24 UTC (permalink / raw
To: gentoo-commits
radhermit 15/01/04 18:24:06
Modified: ChangeLog
Removed: vim.eclass
Log:
Remove unused eclass.
Revision Changes Path
1.1497 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1497&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1497&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1496&r2=1.1497
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1496
retrieving revision 1.1497
diff -u -r1.1496 -r1.1497
--- ChangeLog 3 Jan 2015 14:50:34 -0000 1.1496
+++ ChangeLog 4 Jan 2015 18:24:06 -0000 1.1497
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1496 2015/01/03 14:50:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1497 2015/01/04 18:24:06 radhermit Exp $
+
+ 04 Jan 2015; Tim Harder <radhermit@gentoo.org> -vim.eclass:
+ Remove unused eclass.
03 Jan 2015; Michał Górny <mgorny@gentoo.org> waf-utils.eclass:
Warn about unset EPYTHON.
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2015-01-04 18:24 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-09 20:33 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog vim.eclass Tim Harder (radhermit)
-- strict thread matches above, loose matches on Subject: below --
2015-01-04 18:24 Tim Harder (radhermit)
2013-06-11 9:25 Tim Harder (radhermit)
2013-06-09 20:41 Tim Harder (radhermit)
2013-05-30 7:15 Tim Harder (radhermit)
2013-05-17 0:52 Tim Harder (radhermit)
2013-05-17 0:33 Tim Harder (radhermit)
2013-05-08 8:37 Tim Harder (radhermit)
2013-05-08 8:20 Tim Harder (radhermit)
2013-04-24 1:49 Tim Harder (radhermit)
2013-04-24 1:46 Tim Harder (radhermit)
2013-04-21 23:26 Tim Harder (radhermit)
2013-04-21 23:25 Tim Harder (radhermit)
2013-04-21 23:24 Tim Harder (radhermit)
2013-04-21 23:23 Tim Harder (radhermit)
2012-09-18 1:26 Tim Harder (radhermit)
2012-09-11 16:40 Tim Harder (radhermit)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox