[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/, app-editors/vim-qt/files/

2017-04-14 Thread Davide Pesavento
commit: 9d319a4451f0832cfb789f2aa9be8f549308eefa
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Apr 15 05:32:00 2017 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Apr 15 05:32:00 2017 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9d319a44

app-editors/vim-qt: remove unmaintained live ebuild

 app-editors/vim-qt/files/vim-qt.desktop   |   9 ---
 app-editors/vim-qt/metadata.xml   |  12 ---
 app-editors/vim-qt/vim-qt-.ebuild | 120 --
 3 files changed, 141 deletions(-)

diff --git a/app-editors/vim-qt/files/vim-qt.desktop 
b/app-editors/vim-qt/files/vim-qt.desktop
deleted file mode 100644
index 207bf332..
--- a/app-editors/vim-qt/files/vim-qt.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=vim-Qt
-Comment=A highly configurable text editor
-Exec=qvim -f %F
-Icon=vim-qt
-Terminal=false
-Type=Application
-MimeType=text/plain;
-Categories=Qt;TextEditor;Development;

diff --git a/app-editors/vim-qt/metadata.xml b/app-editors/vim-qt/metadata.xml
deleted file mode 100644
index 48b7e44d..
--- a/app-editors/vim-qt/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   q...@gentoo.org
-   Gentoo Qt Project
-   
-   
-   Use dev-lang/luajit instead of 
dev-lang/lua
-   Enable support for Scheme using 
dev-lang/racket
-   
-

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
deleted file mode 100644
index 77eced7e..
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE="threads"
-
-inherit eutils fdo-mime flag-o-matic prefix python-single-r1
-
-DESCRIPTION="Qt GUI version of the Vim text editor"
-HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home";
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://bitbucket.org/equalsraf/${PN}.git";
-   "https://github.com/equalsraf/${PN}.git";
-   )
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-   S=${WORKDIR}/${PN}-package-${PV}
-fi
-
-LICENSE="vim"
-SLOT="0"
-IUSE="acl cscope debug lua luajit nls perl python racket ruby"
-
-REQUIRED_USE="luajit? ( lua )
-   python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-   >=app-editors/vim-core-7.4.560[acl?]
-   >=app-eselect/eselect-vi-1.1.8
-   >=dev-qt/qtcore-4.7.0:4
-   >=dev-qt/qtgui-4.7.0:4
-   sys-libs/ncurses:0
-   acl? ( kernel_linux? ( sys-apps/acl ) )
-   cscope? ( dev-util/cscope )
-   lua? ( luajit? ( dev-lang/luajit )
-   !luajit? ( dev-lang/lua[deprecated] ) )
-   nls? ( virtual/libintl )
-   perl? ( dev-lang/perl:= )
-   python? ( ${PYTHON_DEPS} )
-   racket? ( dev-scheme/racket )
-   ruby? ( dev-lang/ruby:2.0 )"
-DEPEND="${RDEPEND}
-   dev-util/ctags
-   sys-devel/autoconf
-   virtual/pkgconfig
-   nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-   export LC_COLLATE="C" # prevent locale brokenness
-   use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-   default
-   # Read vimrc from /etc/vim/
-   echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> 
"${S}"/src/feature.h
-}
-
-src_configure() {
-   use debug && append-flags "-DDEBUG"
-
-   local myconf="--with-features=huge --disable-gpm --enable-multibyte"
-   myconf+=" $(use_enable acl)"
-   myconf+=" $(use_enable cscope)"
-   myconf+=" $(use_enable nls)"
-   myconf+=" $(use_enable lua luainterp)"
-   myconf+=" $(use_with luajit)"
-   myconf+=" $(use_enable perl perlinterp)"
-   myconf+=" $(use_enable racket mzschemeinterp)"
-   myconf+=" $(use_enable ruby rubyinterp)"
-
-   if ! use cscope ; then
-   sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die 'sed 
failed'
-   fi
-
-   # keep prefix env contained within the EPREFIX
-   use prefix && myconf+=" --without-local-dir"
-
-   if use python ; then
-   if [[ ${EPYTHON} == python3* ]] ; then
-   myconf+=" --enable-python3interp"
-   export vi_cv_path_python3="${PYTHON}"
-   else
-   myconf+=" --enable-pythoninterp"
-   export vi_cv_path_python="${PYTHON}"
-   fi
-   else
-   myconf+=" --disable-pythoninterp --disable-python3interp"
-   fi
-
-   econf ${myconf} --enable-gui=qt --with-vim-name=qvim 
--with-modified-by=Gentoo-${PVR}
-}
-
-src_install() {
-   dobin src/qvim
-   dosym qvim /usr/bin/qvimdiff
-
-   d

[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/, dev-python/shiboken/, dev-python/pyside/

2016-10-30 Thread Michael Palimaka
commit: 1663a1fbc9c2896334273593ea3b26b92eeffe5c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Oct 30 15:44:08 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Oct 30 15:44:15 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=1663a1fb

Python 3.3 is gone

 app-editors/vim-qt/vim-qt-.ebuild | 2 +-
 dev-python/pyside/pyside-.ebuild  | 2 +-
 dev-python/shiboken/shiboken-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index a4ecc62..4d1d7d1 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_COMPAT=( python{2_7,3_4} )
 PYTHON_REQ_USE="threads"
 
 inherit eutils fdo-mime flag-o-matic prefix python-single-r1

diff --git a/dev-python/pyside/pyside-.ebuild 
b/dev-python/pyside/pyside-.ebuild
index f86dcad..b03a6d0 100644
--- a/dev-python/pyside/pyside-.ebuild
+++ b/dev-python/pyside/pyside-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit cmake-utils flag-o-matic python-r1 virtualx git-r3
 

diff --git a/dev-python/shiboken/shiboken-.ebuild 
b/dev-python/shiboken/shiboken-.ebuild
index d04a967..67fbc43 100644
--- a/dev-python/shiboken/shiboken-.ebuild
+++ b/dev-python/shiboken/shiboken-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
 inherit cmake-utils python-r1 git-r3
 



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2016-10-28 Thread Michael Palimaka
commit: ca1b4b22916f52b3d19a0262d6b99cc43f775bc8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Oct 28 19:20:57 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Oct 28 19:21:58 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=ca1b4b22

app-editors/vim-qt: EAPI 6

Package-Manager: portage-2.3.2

 app-editors/vim-qt/vim-qt-.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index 7443cd1..a4ecc62 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE="threads"
 
@@ -58,6 +58,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+   default
# Read vimrc from /etc/vim/
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> 
"${S}"/src/feature.h
 }



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2016-02-09 Thread Davide Pesavento
commit: f285d0381e2ab9b9201e8bc9da9163e104dfe8ea
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Feb  9 17:36:13 2016 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Feb  9 17:36:13 2016 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=f285d038

app-editors/vim-qt: drop unsatisfiable SLOT in ruby dep

Package-Manager: portage-2.2.27

 app-editors/vim-qt/vim-qt-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index cb3aa25..7443cd1 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -42,10 +42,10 @@ RDEPEND="
lua? ( luajit? ( dev-lang/luajit )
!luajit? ( dev-lang/lua[deprecated] ) )
nls? ( virtual/libintl )
-   perl? ( dev-lang/perl )
+   perl? ( dev-lang/perl:= )
python? ( ${PYTHON_DEPS} )
racket? ( dev-scheme/racket )
-   ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )"
+   ruby? ( dev-lang/ruby:2.0 )"
 DEPEND="${RDEPEND}
dev-util/ctags
sys-devel/autoconf



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2015-09-27 Thread Michael Palimaka
commit: 5c283001876385eaf97611c274b43d1c147276a9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Sep 27 19:01:34 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Sep 27 19:01:34 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=5c283001

app-editors/vim: set sys-libs/ncurses SLOT

Package-Manager: portage-2.2.20.1

 app-editors/vim-qt/vim-qt-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index e2d31b2..cb3aa25 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
>=app-eselect/eselect-vi-1.1.8
>=dev-qt/qtcore-4.7.0:4
>=dev-qt/qtgui-4.7.0:4
-   sys-libs/ncurses
+   sys-libs/ncurses:0
acl? ( kernel_linux? ( sys-apps/acl ) )
cscope? ( dev-util/cscope )
lua? ( luajit? ( dev-lang/luajit )



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2015-04-17 Thread Davide Pesavento
commit: 9c43d60fbaf28580224c75d0fb2f7782f37a3613
Author: Davide Pesavento  gentoo  org>
AuthorDate: Fri Apr 17 23:25:26 2015 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Fri Apr 17 23:25:26 2015 +
URL:https://gitweb.gentoo.org/proj/qt.git/commit/?id=9c43d60f

[app-editors/vim-qt] Sync.

Package-Manager: portage-2.2.18

 app-editors/vim-qt/vim-qt-.ebuild | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index ea64180..3ef357a 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20140827-r2.ebuild,v 1.1 
2014/11/24 12:51:50 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20150102.ebuild,v 
1.3 2015/04/17 23:23:53 pesa Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE="threads"
+
 inherit eutils fdo-mime flag-o-matic prefix python-single-r1
 
 DESCRIPTION="Qt GUI version of the Vim text editor"
@@ -15,13 +16,12 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI=(
"https://bitbucket.org/equalsraf/${PN}.git";
"https://github.com/equalsraf/${PN}.git";
-   "git://gitorious.org/${PN}/${PN}.git"
)
KEYWORDS=""
 else

SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
-   S="${WORKDIR}/${PN}-package-${PV}"
+   S=${WORKDIR}/${PN}-package-${PV}
 fi
 
 LICENSE="vim"
@@ -31,11 +31,12 @@ IUSE="acl cscope debug lua luajit nls perl python racket 
ruby"
 REQUIRED_USE="luajit? ( lua )
python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND=">=app-admin/eselect-vi-1.1.8
+RDEPEND="
>=app-editors/vim-core-7.4.560[acl?]
-   sys-libs/ncurses
+   >=app-eselect/eselect-vi-1.1.8
>=dev-qt/qtcore-4.7.0:4
>=dev-qt/qtgui-4.7.0:4
+   sys-libs/ncurses
acl? ( kernel_linux? ( sys-apps/acl ) )
cscope? ( dev-util/cscope )
lua? ( luajit? ( dev-lang/luajit )



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2015-01-04 Thread Ben de Groot
commit: 8e68131e817e18948293d4087b18cbc1f3e09ac3
Author: Ben de Groot  gentoo  org>
AuthorDate: Sun Jan  4 11:24:11 2015 +
Commit: Ben de Groot  gentoo  org>
CommitDate: Sun Jan  4 11:24:11 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=8e68131e

app-editors/vim-qt: update vim dependency version

---
 app-editors/vim-qt/vim-qt-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index bfca3eb..2bc5fe9 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="luajit? ( lua )
python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=app-admin/eselect-vi-1.1.8
-   >=app-editors/vim-core-7.4.417[acl?]
+   >=app-editors/vim-core-7.4.560[acl?]
sys-libs/ncurses
>=dev-qt/qtcore-4.7.0:4
>=dev-qt/qtgui-4.7.0:4



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2014-11-24 Thread Ben de Groot
commit: 13966b72927615889b002f20270d8679adb97d90
Author: Ben de Groot  gentoo  org>
AuthorDate: Mon Nov 24 12:54:37 2014 +
Commit: Ben de Groot  gentoo  org>
CommitDate: Mon Nov 24 12:54:37 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=13966b72

[app-editors/vim-qt] sync with gx86

---
 app-editors/vim-qt/vim-qt-.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index be64047..bfca3eb 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: 
/var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20140827-r2.ebuild,v 1.1 
2014/11/24 12:51:50 yngwin Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 PYTHON_REQ_USE="threads"
 inherit eutils fdo-mime flag-o-matic prefix python-single-r1
 
@@ -31,7 +31,7 @@ IUSE="acl cscope debug lua luajit nls perl python racket ruby"
 REQUIRED_USE="luajit? ( lua )
python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="app-admin/eselect-vi
+RDEPEND=">=app-admin/eselect-vi-1.1.8
>=app-editors/vim-core-7.4.417[acl?]
sys-libs/ncurses
>=dev-qt/qtcore-4.7.0:4



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2014-11-19 Thread Davide Pesavento
commit: 6009196b7679b24a8792464b644b22f79eb278ca
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Nov 20 03:19:37 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Nov 20 03:19:37 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=6009196b

[app-editors/vim-qt] Sync metadata.

Package-Manager: portage-2.2.14

---
 app-editors/vim-qt/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app-editors/vim-qt/metadata.xml b/app-editors/vim-qt/metadata.xml
index 1cca617..f9d6c82 100644
--- a/app-editors/vim-qt/metadata.xml
+++ b/app-editors/vim-qt/metadata.xml
@@ -4,5 +4,6 @@
   qt
   
 Use dev-lang/luajit instead of 
dev-lang/lua
+Enable support for Scheme using 
dev-lang/racket
   
 



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2014-11-15 Thread Ben de Groot
commit: aae7da0d24adf19d9685017360fb97922217fbe0
Author: Ben de Groot  gentoo  org>
AuthorDate: Sun Nov 16 01:12:29 2014 +
Commit: Ben de Groot  gentoo  org>
CommitDate: Sun Nov 16 01:12:29 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=aae7da0d

[app-editors/vim-qt] drop gpm, add system vimrc

---
 app-editors/vim-qt/vim-qt-.ebuild | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index d2e5597..be64047 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -26,7 +26,7 @@ fi
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl cscope debug gpm lua luajit nls perl python racket ruby"
+IUSE="acl cscope debug lua luajit nls perl python racket ruby"
 
 REQUIRED_USE="luajit? ( lua )
python? ( ${PYTHON_REQUIRED_USE} )"
@@ -38,7 +38,6 @@ RDEPEND="app-admin/eselect-vi
>=dev-qt/qtgui-4.7.0:4
acl? ( kernel_linux? ( sys-apps/acl ) )
cscope? ( dev-util/cscope )
-   gpm? ( sys-libs/gpm )
lua? ( luajit? ( dev-lang/luajit )
!luajit? ( dev-lang/lua[deprecated] ) )
nls? ( virtual/libintl )
@@ -53,10 +52,15 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )"
 
 pkg_setup() {
-   export LC_COLLATE="C" # prevent locale brokenness bug #82186
+   export LC_COLLATE="C" # prevent locale brokenness
use python && python-single-r1_pkg_setup
 }
 
+src_prepare() {
+   # Read vimrc from /etc/vim/
+   echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> 
"${S}"/src/feature.h
+}
+
 src_configure() {
use debug && append-flags "-DDEBUG"
 



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/files/, app-editors/vim-qt/

2014-11-15 Thread Ben de Groot
commit: f45eda3474309cbe8255e913cd44db9812f7297f
Author: Ben de Groot  gentoo  org>
AuthorDate: Sat Nov 15 12:07:40 2014 +
Commit: Ben de Groot  gentoo  org>
CommitDate: Sat Nov 15 12:07:40 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=f45eda34

[app-editors/vim-qt] ebuild improvements from Coacher in bug #526938

---
 app-editors/vim-qt/files/vim-qt.desktop   |  9 ++
 app-editors/vim-qt/vim-qt-.ebuild | 50 +++
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/app-editors/vim-qt/files/vim-qt.desktop 
b/app-editors/vim-qt/files/vim-qt.desktop
new file mode 100644
index 000..207bf33
--- /dev/null
+++ b/app-editors/vim-qt/files/vim-qt.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=vim-Qt
+Comment=A highly configurable text editor
+Exec=qvim -f %F
+Icon=vim-qt
+Terminal=false
+Type=Application
+MimeType=text/plain;
+Categories=Qt;TextEditor;Development;

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index f510276..d2e5597 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -3,9 +3,9 @@
 # $Header: $
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_3} )
 PYTHON_REQ_USE="threads"
-inherit eutils fdo-mime flag-o-matic python-single-r1
+inherit eutils fdo-mime flag-o-matic prefix python-single-r1
 
 DESCRIPTION="Qt GUI version of the Vim text editor"
 HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home";
@@ -26,7 +26,10 @@ fi
 
 LICENSE="vim"
 SLOT="0"
-IUSE="acl cscope debug gpm lua luajit nls perl python ruby"
+IUSE="acl cscope debug gpm lua luajit nls perl python racket ruby"
+
+REQUIRED_USE="luajit? ( lua )
+   python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="app-admin/eselect-vi
>=app-editors/vim-core-7.4.417[acl?]
@@ -37,17 +40,17 @@ RDEPEND="app-admin/eselect-vi
cscope? ( dev-util/cscope )
gpm? ( sys-libs/gpm )
lua? ( luajit? ( dev-lang/luajit )
-   !luajit? ( dev-lang/lua ) )
+   !luajit? ( dev-lang/lua[deprecated] ) )
nls? ( virtual/libintl )
-   perl? ( >=dev-lang/perl-5.16.0 )
+   perl? ( dev-lang/perl )
python? ( ${PYTHON_DEPS} )
+   racket? ( dev-scheme/racket )
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
@@ -57,27 +60,50 @@ pkg_setup() {
 src_configure() {
use debug && append-flags "-DDEBUG"
 
-   local myconf="--with-features=huge --enable-multibyte"
+   local myconf="--with-features=huge --disable-gpm --enable-multibyte"
myconf+=" $(use_enable acl)"
-   myconf+=" $(use_enable gpm)"
+   myconf+=" $(use_enable cscope)"
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 racket mzschemeinterp)"
myconf+=" $(use_enable ruby rubyinterp)"
-   myconf+=" --enable-gui=qt --with-vim-name=qvim --with-x"
 
if ! use cscope ; then
sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die 'sed 
failed'
fi
-   econf ${myconf}
+
+   # keep prefix env contained within the EPREFIX
+   use prefix && myconf+=" --without-local-dir"
+
+   if use python ; then
+   if [[ ${EPYTHON} == python3* ]] ; then
+   myconf+=" --enable-python3interp"
+   export vi_cv_path_python3="${PYTHON}"
+   else
+   myconf+=" --enable-pythoninterp"
+   export vi_cv_path_python="${PYTHON}"
+   fi
+   else
+   myconf+=" --disable-pythoninterp --disable-python3interp"
+   fi
+
+   econf ${myconf} --enable-gui=qt --with-vim-name=qvim 
--with-modified-by=Gentoo-${PVR}
 }
 
 src_install() {
dobin src/qvim
+   dosym qvim /usr/bin/qvimdiff
+
+   dodir /usr/share/man/man1
+   echo ".so vim.1" > "${ED}"/usr/share/man/man1/qvim.1
+   echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/qvimdiff.1
+
+   # track 
https://bitbucket.org/equalsraf/vim-qt/issue/93/include-desktop-file-in-source
+   # for inclusion of desktop file
+   newmenu "${FILESDIR}"/vim-qt.desktop vim-qt.desktop
doicon -s 64 src/qt/icons/vim-qt.png
-   make_desktop_entry qvim Vim-qt vim-qt "Qt;TextEditor;Development;"
 }
 
 pkg_postinst() {



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2014-10-25 Thread Davide Pesavento
commit: 1ba88fff8eaae466d3161f3b22aca51ca527bc3a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Oct 25 17:15:14 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Oct 25 17:15:14 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=1ba88fff

[app-editors/vim-qt] Re-remove python2_6; switch to git-r3; sync metadata.

Package-Manager: portage-2.2.14

---
 app-editors/vim-qt/metadata.xml   |  3 +++
 app-editors/vim-qt/vim-qt-.ebuild | 12 +++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app-editors/vim-qt/metadata.xml b/app-editors/vim-qt/metadata.xml
index 3cbebd8..1cca617 100644
--- a/app-editors/vim-qt/metadata.xml
+++ b/app-editors/vim-qt/metadata.xml
@@ -2,4 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 
   qt
+  
+Use dev-lang/luajit instead of 
dev-lang/lua
+  
 

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index fe30111..f510276 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit eutils fdo-mime flag-o-matic python-single-r1
 
@@ -11,10 +11,12 @@ DESCRIPTION="Qt GUI version of the Vim text editor"
 HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home";
 
 if [[ ${PV} == ** ]]; then
-   inherit git-2
-   EGIT_REPO_URI="https://bitbucket.org/equalsraf/${PN}.git
-   git://github.com/equalsraf/${PN}.git
-   git://gitorious.org/${PN}/${PN}.git"
+   inherit git-r3
+   EGIT_REPO_URI=(
+   "https://bitbucket.org/equalsraf/${PN}.git";
+   "https://github.com/equalsraf/${PN}.git";
+   "git://gitorious.org/${PN}/${PN}.git"
+   )
KEYWORDS=""
 else

SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> 
${P}.tar.gz"



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2014-10-24 Thread Ben de Groot
commit: e20abcf379e40d729d2d6a84ba329d86afe964fa
Author: Ben de Groot  gentoo  org>
AuthorDate: Sat Oct 25 02:23:56 2014 +
Commit: Ben de Groot  gentoo  org>
CommitDate: Sat Oct 25 02:23:56 2014 +
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-.ebuild | 23 +++
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index d6c1c61..fe30111 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.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)"



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2014-10-19 Thread Davide Pesavento
commit: e8e68f95b860269bcac7e8ff71f0ec1d1f82f0bf
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Oct 19 22:28:33 2014 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Oct 19 22:28:33 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e8e68f95

[app-editors/vim-qt] Delete redundant ebuild.

Package-Manager: portage-2.2.14_rc1

---
 app-editors/vim-qt/vim-qt-.ebuild | 80 ---
 1 file changed, 80 deletions(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
deleted file mode 100644
index d6c1c61..000
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-inherit eutils fdo-mime flag-o-matic python-any-r1
-
-DESCRIPTION="Qt GUI version of the Vim text editor"
-HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home";
-
-if [[ ${PV} == ** ]]; then
-   inherit git-2
-   EGIT_REPO_URI="https://bitbucket.org/equalsraf/${PN}.git
-   git://github.com/equalsraf/${PN}.git
-   git://gitorious.org/${PN}/${PN}.git"
-   KEYWORDS=""
-else
-   
SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-   S="${WORKDIR}/${PN}-package-${PV}"
-fi
-
-LICENSE="vim"
-SLOT="0"
-IUSE="acl cscope debug gpm lua nls perl python ruby"
-
-RDEPEND="app-admin/eselect-vi
-   >=app-editors/vim-core-7.3.762[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 )
-   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}"
-
-pkg_setup() {
-   export LC_COLLATE="C" # prevent locale brokenness bug #82186
-   use python && python-any-r1_pkg_setup
-}
-
-src_configure() {
-   use debug && append-flags "-DDEBUG"
-
-   local myconf="--with-features=huge --enable-multibyte"
-   myconf+=" $(use_enable acl)"
-   myconf+=" $(use_enable gpm)"
-   myconf+=" $(use_enable nls)"
-   myconf+=" $(use_enable lua luainterp)"
-   myconf+=" $(use_enable perl perlinterp)"
-   myconf+=" $(use_enable python pythoninterp)"
-   myconf+=" $(use_enable ruby rubyinterp)"
-   myconf+=" --enable-gui=qt --with-vim-name=qvim --with-x"
-
-   if ! use cscope ; then
-   sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die 'sed 
failed'
-   fi
-   econf ${myconf}
-}
-
-src_install() {
-   dobin src/qvim
-   doicon -s 64 src/qt/icons/vim-qt.png
-   make_desktop_entry qvim Vim-qt vim-qt "Qt;TextEditor;Development;"
-}
-
-pkg_postinst() {
-   fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-   fdo-mime_mime_database_update
-}



[gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/

2014-06-10 Thread Michael Palimaka
commit: 32d4c83ab09ed0b1cab5af3d8d76e9c8a2d2071f
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Jun 10 07:56:24 2014 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Jun 10 07:56:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=32d4c83a

[app-editors/vim-qt] Remove Python 2.6 support.

Package-Manager: portage-2.2.10

---
 app-editors/vim-qt/vim-qt-.ebuild | 2 +-
 app-editors/vim-qt/vim-qt-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index d6c2652..d6c1c61 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit eutils fdo-mime flag-o-matic python-any-r1
 

diff --git a/app-editors/vim-qt/vim-qt-.ebuild 
b/app-editors/vim-qt/vim-qt-.ebuild
index d6c2652..d6c1c61 100644
--- a/app-editors/vim-qt/vim-qt-.ebuild
+++ b/app-editors/vim-qt/vim-qt-.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads"
 inherit eutils fdo-mime flag-o-matic python-any-r1