From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AAD281388B6 for ; Sat, 25 Oct 2014 02:24:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27292E0837; Sat, 25 Oct 2014 02:24:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B31B1E0837 for ; Sat, 25 Oct 2014 02:24:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A20B7340428 for ; Sat, 25 Oct 2014 02:24:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3BE228AD5 for ; Sat, 25 Oct 2014 02:24:14 +0000 (UTC) From: "Ben de Groot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben de Groot" Message-ID: <1414203836.e20abcf379e40d729d2d6a84ba329d86afe964fa.yngwin@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/ X-VCS-Repository: proj/qt X-VCS-Files: app-editors/vim-qt/vim-qt-99999999.ebuild X-VCS-Directories: app-editors/vim-qt/ X-VCS-Committer: yngwin X-VCS-Committer-Name: Ben de Groot X-VCS-Revision: e20abcf379e40d729d2d6a84ba329d86afe964fa X-VCS-Branch: master Date: Sat, 25 Oct 2014 02:24:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d8c14763-57f0-4a42-ad67-0dfb9f3b3853 X-Archives-Hash: fc57270b9eb5363c7a7c6ab2589318bd commit: e20abcf379e40d729d2d6a84ba329d86afe964fa Author: Ben de Groot gentoo org> AuthorDate: Sat Oct 25 02:23:56 2014 +0000 Commit: Ben de Groot gentoo org> CommitDate: Sat Oct 25 02:23:56 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e20abcf3 app-editors/vim-qt: sync with in tree changes --- app-editors/vim-qt/vim-qt-99999999.ebuild | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/app-editors/vim-qt/vim-qt-99999999.ebuild b/app-editors/vim-qt/vim-qt-99999999.ebuild index d6c1c61..fe30111 100644 --- a/app-editors/vim-qt/vim-qt-99999999.ebuild +++ b/app-editors/vim-qt/vim-qt-99999999.ebuild @@ -3,9 +3,9 @@ # $Header: $ EAPI=5 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" -inherit eutils fdo-mime flag-o-matic python-any-r1 +inherit eutils fdo-mime flag-o-matic python-single-r1 DESCRIPTION="Qt GUI version of the Vim text editor" HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home" @@ -24,26 +24,32 @@ fi LICENSE="vim" SLOT="0" -IUSE="acl cscope debug gpm lua nls perl python ruby" +IUSE="acl cscope debug gpm lua luajit nls perl python ruby" RDEPEND="app-admin/eselect-vi - >=app-editors/vim-core-7.3.762[acl?] + >=app-editors/vim-core-7.4.417[acl?] sys-libs/ncurses >=dev-qt/qtcore-4.7.0:4 >=dev-qt/qtgui-4.7.0:4 acl? ( kernel_linux? ( sys-apps/acl ) ) cscope? ( dev-util/cscope ) gpm? ( sys-libs/gpm ) - lua? ( dev-lang/lua ) + lua? ( luajit? ( dev-lang/luajit ) + !luajit? ( dev-lang/lua ) ) nls? ( virtual/libintl ) perl? ( >=dev-lang/perl-5.16.0 ) python? ( ${PYTHON_DEPS} ) - ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )" -DEPEND="${RDEPEND}" + ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )" +DEPEND="${RDEPEND} + dev-util/ctags + sys-devel/autoconf + virtual/pkgconfig + nls? ( sys-devel/gettext )" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" pkg_setup() { export LC_COLLATE="C" # prevent locale brokenness bug #82186 - use python && python-any-r1_pkg_setup + use python && python-single-r1_pkg_setup } src_configure() { @@ -54,6 +60,7 @@ src_configure() { myconf+=" $(use_enable gpm)" myconf+=" $(use_enable nls)" myconf+=" $(use_enable lua luainterp)" + myconf+=" $(use_with luajit)" myconf+=" $(use_enable perl perlinterp)" myconf+=" $(use_enable python pythoninterp)" myconf+=" $(use_enable ruby rubyinterp)"