Gentoo Archives: gentoo-commits

From: Ben de Groot <yngwin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: app-editors/vim-qt/
Date: Fri, 01 Feb 2013 19:15:35
Message-Id: 1359746116.4f603f823235dfe6a76bacf062597b447c5fa35a.yngwin@gentoo
1 commit: 4f603f823235dfe6a76bacf062597b447c5fa35a
2 Author: Ben de Groot <yngwin <AT> gmail <DOT> com>
3 AuthorDate: Fri Feb 1 19:15:16 2013 +0000
4 Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 1 19:15:16 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4f603f82
7
8 app-editors/vim-qt: update live ebuild, preparing for upstream tagged version ebuild
9
10 ---
11 app-editors/vim-qt/metadata.xml | 7 +----
12 app-editors/vim-qt/vim-qt-9999.ebuild | 50 +++++++++++++++++++++++----------
13 2 files changed, 36 insertions(+), 21 deletions(-)
14
15 diff --git a/app-editors/vim-qt/metadata.xml b/app-editors/vim-qt/metadata.xml
16 index be850cb..3cbebd8 100644
17 --- a/app-editors/vim-qt/metadata.xml
18 +++ b/app-editors/vim-qt/metadata.xml
19 @@ -1,10 +1,5 @@
20 <?xml version="1.0" encoding="UTF-8"?>
21 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
22 <pkgmetadata>
23 - <herd>qt</herd>
24 - <maintainer>
25 - <email>ThyArmageddon+Gentoo@×××××.com</email>
26 - <name>Elijah El Lazkani</name>
27 - </maintainer>
28 - <longdescription lang="en">The well known vim editor with a Qt based front-end interface</longdescription>
29 + <herd>qt</herd>
30 </pkgmetadata>
31
32 diff --git a/app-editors/vim-qt/vim-qt-9999.ebuild b/app-editors/vim-qt/vim-qt-9999.ebuild
33 index 1534986..6b08006 100644
34 --- a/app-editors/vim-qt/vim-qt-9999.ebuild
35 +++ b/app-editors/vim-qt/vim-qt-9999.ebuild
36 @@ -3,23 +3,31 @@
37 # $Header: $
38
39 EAPI=5
40 -
41 -inherit eutils toolchain-funcs flag-o-matic git-2
42 +PYTHON_COMPAT=( python{2_5,2_6,2_7} )
43 +PYTHON_REQ_USE="threads"
44 +inherit eutils fdo-mime python-any-r1
45
46 DESCRIPTION="Qt GUI version of the Vim text editor"
47 -HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wii/Home"
48 -EGIT_REPO_URI="https://bitbucket.org/equalsraf/${PN}.git
49 - git://github.com/equalsraf/${PN}.git
50 - git://gitorious.org/${PN}/${PN}.git"
51 +HOMEPAGE="https://bitbucket.org/equalsraf/vim-qt/wiki/Home"
52 +
53 +if [[ ${PV} == *9999* ]]; then
54 + inherit git-2
55 + EGIT_REPO_URI="https://bitbucket.org/equalsraf/${PN}.git
56 + git://github.com/equalsraf/${PN}.git
57 + git://gitorious.org/${PN}/${PN}.git"
58 + KEYWORDS=""
59 +else
60 + SRC_URI="https://github.com/equalsraf/${PN}/archive/package-${PV}.tar.gz -> ${P}.tar.gz"
61 + KEYWORDS="~amd64 ~x86"
62 + S="${WORKDIR}/${PN}-package-${PV}"
63 +fi
64
65 LICENSE="vim"
66 SLOT="0"
67 -KEYWORDS=""
68 IUSE="acl cscope debug gpm nls perl python ruby"
69
70 -RDEPEND="
71 - app-admin/eselect-vi
72 - >=app-editors/vim-core-7.3.487
73 +RDEPEND="app-admin/eselect-vi
74 + >=app-editors/vim-core-7.3.762[acl?]
75 sys-libs/ncurses
76 >=x11-libs/qt-core-4.7.0:4
77 >=x11-libs/qt-gui-4.7.0:4
78 @@ -28,9 +36,14 @@ RDEPEND="
79 gpm? ( sys-libs/gpm )
80 nls? ( virtual/libintl )
81 perl? ( dev-lang/perl )
82 - ruby? ( dev-lang/ruby:1.8 )"
83 -DEPEND="${RDEPEND}
84 - sys-devel/autoconf"
85 + python? ( ${PYTHON_DEPS} )
86 + ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )"
87 +DEPEND="${RDEPEND}"
88 +
89 +pkg_setup() {
90 + export LC_COLLATE="C" # prevent locale brokenness bug #82186
91 + use python && python-any-r1_pkg_setup
92 +}
93
94 src_configure() {
95 use debug && append-flags "-DDEBUG"
96 @@ -45,8 +58,7 @@ src_configure() {
97 myconf+=" --enable-gui=qt --with-vim-name=qvim --with-x"
98
99 if ! use cscope ; then
100 - sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || \
101 - die "couldn't disable cscope"
102 + sed -i -e '/# define FEAT_CSCOPE/d' src/feature.h || die 'sed failed'
103 fi
104 econf ${myconf}
105 }
106 @@ -56,3 +68,11 @@ src_install() {
107 doicon -s 64 src/qt/icons/vim-qt.png
108 make_desktop_entry qvim Vim-qt vim-qt "Qt;TextEditor;Development;"
109 }
110 +
111 +pkg_postinst() {
112 + fdo-mime_mime_database_update
113 +}
114 +
115 +pkg_postrm() {
116 + fdo-mime_mime_database_update
117 +}