Add ebuild improvements from bug #526938. Remove old.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0F9C590B7FF324F6!

7 files changed, 151 insertions, 181 deletions

diff --git a/app-editors/vim-qt/ChangeLog b/app-editors/vim-qt/ChangeLog
index 20f0b146e0e9..ba5710fbb87b 100644
--- a/app-editors/vim-qt/ChangeLog
+++ b/app-editors/vim-qt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/vim-qt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.7 2014/10/25 02:10:14 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.8 2014/11/15 12:32:44 yngwin Exp $
+
+*vim-qt-20140827-r1 (15 Nov 2014)
+
+  15 Nov 2014; Ben de Groot <yngwin@gentoo.org> +files/vim-qt.desktop,
+  +vim-qt-20140827-r1.ebuild, -vim-qt-20130201-r1.ebuild,
+  -vim-qt-20130220-r1.ebuild, metadata.xml:
+  Add ebuild improvements from bug #526938. Remove old.
 
 *vim-qt-20140827 (25 Oct 2014)
 
diff --git a/app-editors/vim-qt/Manifest b/app-editors/vim-qt/Manifest
index 891587edb9ce..3d2ddeeb4d42 100644
--- a/app-editors/vim-qt/Manifest
+++ b/app-editors/vim-qt/Manifest
@@ -1,32 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST vim-qt-20130201.tar.gz 11620051 SHA256 676bc4a98d25fd80a3e4a3fdf60db26b1417e8a87eacbd8f03c464c4e68a2639 SHA512 9e9c3b16968b800598f47e9e9c81e8c7e13acf720c933883e704aa390980aa47bda2727714caf1aad27228e5a0e3b4eb0ecd19fc56961b49cc07936a272f6463 WHIRLPOOL 6acd6e6e8d889124cad94dfb8be01a2a64402cdaaee6fcfbd3e822e5a2692d4c326b42916a10937c4bfda3cb1c1cba629d1610f24fb9766b5fd2b0c6013a2895
-DIST vim-qt-20130220.tar.gz 11621543 SHA256 95870899f1dbefe5108ed8cbe7c462cf918954ee5dbf542cd626336488aa7d05 SHA512 05ad7cd0b109285a845653e27aa7a84f6fce1ee0a8ba63b6a8976fb65f5d1f502339aaea4c739626534b7fd936f68d8ccfd15b44c70cbefd0bd041122b647fdd WHIRLPOOL 90fb2b3852071e5df6b5f3d9337d116f3162a854b75f23e4245fd6b0af6c328db900c68414bf16d334e50339c3d894dc5229be0be452bc0b112ee54c95300698
+AUX vim-qt.desktop 189 SHA256 4a5d674a9015c114ee53db25b5a523c3393c909e3efcbc82953fd99737f95a6b SHA512 306540cffeda30908feb478aef0de16c378ccfff93c2be91319750342513c8b1f263ea65fa7e0468fc0d5ce5138b0256640d148eb235edb4948b0bd555c99ea0 WHIRLPOOL a626bc1ccd349316b50ac79ada2ae3eda75937b06662c4c9a940d52b806cd29fe5d5aa5ed071f6dd56ad68b2883f28cf505e8f064d7cae012ad278a0646f0a52
 DIST vim-qt-20131004.tar.gz 12095789 SHA256 791275d708f5de55a210ae13a4962586918f71c004c96ba6090fec98602de926 SHA512 65696d60c478c88b0dfd2e46e75747bc48a3ad535462babf88542a3e78755789594b8b7b39d33eed4eacfc1158293c41eea02bc38aeb02f69674c9e0b061b041 WHIRLPOOL 7fe3bbbf9e27d4dd9247452a5f83ff56166182ae4b7c833ac7052964afcf44d8bd9aba3a866987fcce65a9e81c06df473baacd7b236bea55dbfc81add8504133
 DIST vim-qt-20140827.tar.gz 12251966 SHA256 61eba646bf25fd3caa40943ecd91e5e7a813e11ca71d899e9e844e3f69e97a60 SHA512 0ab352a64f138e68059311908b2e4b0cbbec55c2fa889ff64f863670c3d1ee0022d26877175090d5c256eb1cdfaf7d23d385044a68e2eb8b50b1cdab2a20827f WHIRLPOOL ea397f465902796761c44e6521ab6b2660498d1e3ce4821d3265517ba1c72984b93e580549be921e156771f2ccbb86fce1c830035ad00513eb9e42c1f1ff6abd
-EBUILD vim-qt-20130201-r1.ebuild 2194 SHA256 9ea111cab253a060be126582cc99f5cf2fa7f6b1e6430690aa1c195fdf8916ce SHA512 c768776b763fb297a9bbed70a3a5019587db09e4ef8a50bfbf8a4fec485c969d1d70d502f6308dfd4dfafb618b8de10daf332480a1bda10e27f8d63878718bd6 WHIRLPOOL ce7a4fdccd52a4555c863f08334416df7a0b112444c0f688e70f4c8d9cf6d8ad87f8582b2caa2f9d4eefcf6364693168dd67fb4cbbc587f29e6f5b6d1491ac9b
-EBUILD vim-qt-20130220-r1.ebuild 2194 SHA256 e30e007da48b8e0594462fba22889f3ea2e23dc3958b03a7f907c3434c4a8de0 SHA512 a9d8c133179bb7cf946489acc699f9f17bc1310e8ecd7ab981a6be6ddc41601ebbd4671512a5124f475d3340fa1466bdefec694e7a0dabca0fb5d670cbd021db WHIRLPOOL 6a9b584849f3bada222305a5588b95b56752ad37cfeb976042bd7539612f0ed39c97485465218083105d5ea8890fac080c7326b7a3a9995addbb153ef95cc88e
 EBUILD vim-qt-20131004.ebuild 2421 SHA256 78c2c1cddee7d880e8b6be2dd8a67bb2c393904a41f949d1d52c7dff270e6ecc SHA512 b10121bce083748a69a9794fedc3a52ade4bfc3510367147b780883596f89d1feb15cff0d64bc99103bb082cae30cd2fc1b85b1a6b52def091e0d9cef7554e01 WHIRLPOOL e638f18ae1d83918f4c3c3961fa3f8970f8054656630b8437b8761ad4a09c3dc7836184c5c06cfc8ec62bdce98ba3a1bb1d7d4177b05ceb5f3d52c06f5212f88
+EBUILD vim-qt-20140827-r1.ebuild 3221 SHA256 3b38f2a71d1dd52891b40bd8054206657f661aeb65b77023f0ddf0fbaf559b03 SHA512 61ce9c2bc4afe9ee9ddaaadf4a34f9b1918e7ac50a735c08630ad1d4c91ab9598cd63bc8d8f6d92e4bf99a5f3e119bf77f4cac9a61b0d2d0e63b57914a0bff20 WHIRLPOOL ba6421cac925688aca9a0f7ae5b95728a593be3aac72b7aef60f42b27692f2d5922606cfc55d37ad994f25ba2803d10c918c6b9bafc46c70ecef77594a51f59a
 EBUILD vim-qt-20140827.ebuild 2422 SHA256 702385dc92eece97ebe914009cc33a08cef6940f90b7f06e1c5223c803e28f7d SHA512 490f3126dd7361148ab5d4fbac01ca9faa64eda037f939dc0aa56d32b357fff48648f57c35c94de8299154fffb4951fbf83f6782ae038f4bacbf50c370a4d448 WHIRLPOOL 33052f8dc5ad0846551293a556f8597b9ac1fc0fe1bc01d788ef870470129315b8e87af2cab7b6310365d7a85d72cc84b1d312289c08d9ee0f59dc1442a2f95f
-MISC ChangeLog 1385 SHA256 6fd752fb495bd1de322f99a042f63f648ff18e2ac8deb259675007d4d529cae5 SHA512 6e8c6df0091a8bd2ada5a00f1367ce8976b66d3d0746ca1c8bf57f03d1f0d520c9a06a22c98e3a126b9a704a46054687ac116685f7a62394942dcb73137eae0c WHIRLPOOL d8a41d7cbd0b5ec823f8149410d5a815035c2069ed5e7d46fe762093f8eb8d9d4175256fa5c15ba58041a3c8cedcfae6896fade4032ead9e317029b319c96428
-MISC metadata.xml 271 SHA256 3f989c7ad92a34c27e64620f84f89d08079ea97e60bc3061accb8798090dc104 SHA512 673fa112d15056e50de5766ce54d7df9b6a6681a04dd8b9cc7eb047882ed1d01c3d51af7d94caf7b26203dd4021679cfbd9e8139338e7e2c2e7217716a7e826d WHIRLPOOL ef17a169d59def292126f573e70e9dc431ac1b4b2bedf9fbc423df600c84f1e82119994ad37817127dcf535204a11d24eca715f7f930009bbe064281fc8bf4d2
+MISC ChangeLog 1650 SHA256 c8654662f5756c5cd2d6817b6ebc435567a9c64e353cb9e4ccfdfb58afcc192e SHA512 8772bfff9c69eb18e3df66ddd34812c9d989d1dfca441cbe2bd940710aa56ea5a6e540d96a3fd0c3d9feeaab084ce7ec62a90cca9fdaf41de3ff96d9c8968650 WHIRLPOOL d2d22f8e19dd187c496bf42c1b31fbe308db9163b7e1bebbcf66dcc01b116d909aaaad8ce5d2e683bf4b1fd936846ff066fe6b06ed86cf1046444688af5a46d7
+MISC metadata.xml 361 SHA256 661ac577cc21c0085fdb689a4559a75e24103f63fd06e71a48677dd1db88ae21 SHA512 070c09cef6fdb2187c645d038847fc524d7bea1ccca32f4411b225b1abb05c60b1acfdb9d6fd8e74d2897aea21a485aac1b070fb8ee47f4bc79aad32c0d30867 WHIRLPOOL a5028fd53e73ac4b2012b62159a595704336b299fde0393e8d7794d66744b19dc161c7b3e0888360b6c25c676c757ecc8158ca537d5f44475685f8fa15d29278
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUSwaMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUZ0fxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
-RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2EnEQAInjpNbE3RKSMXJOWjyaDsT0
-YOOJjKEhNh1I+X1BZ2fJ3poRm4Sd/s55jUuG14INWWGxf25PBrtsHKYPlTvWR2IP
-TUrPUNfjp993IoNe3VdxDEjBlu0aoYVcqm/tYAnNuEORBDBglCK44aWA2Dv1HlP+
-2ZHMmvLRfVSbwW3KEQ+ZvVMHsdj+6e7fBvIMqisGsWDd88/Y5p+Lh8qaU5/wcNkn
-0L9EDGLlkHEp06qB6kvYi1AsGWe+NkSfRkSL33Zl6E8mjgEUs4v0NRUwctDN0DQE
-0hdCxFSKGB26Z1SyIhVrkH6vpH3aG5MMG4jplLVd+uHRDjSQ35UKAnff+owwXoBw
-l8dLIlsFmG5g238rcIDax8Zxs5A6gQD9kE4dj/Dy+RtGb4jSgcsiGjxoT2UG0LQr
-Z2flwu3GYxvkJt/UL/ZL0RiSsNaNsW6osxSLIrHIwwi2B6c1EcAy1Y+NumVo6ZpH
-1dbE4z/0C8FCEGMek+Zm2wWfSLZJIWgZr+TaMkeI63CMwvXO1eADjaFgX9GM8cQl
-kW5yqsJ+HcFrU3I0GwQB7C7qWuAX4Wbo5InGfSw1cf6GVKVTgZhDc9pZx7cwYI3H
-lDWKBwg6VYpJBcrnLujF5pW3N1VTB5V5guYaERMbaKcCHQnTGSdP1xRIfckNuXL/
-yjAfd9OvNioVm6KQ3aCP
-=mcg7
+RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT2ndIP/RqOQrK3KwArTnWlGm53UfPs
+O+O7GOqNI49WGOh4Qp8s5c/Q88/icGQegvYqd+O4a+OzJ0rcaTaX0uaBRJKSH1aL
+SdZvSJEajNeOjJPThtRJINfsYMmGGPrM6xguAIb4+LRmmLRTn0loZz0yduyXAYCP
+SVxGkOnQYwc0fHng0VETFNSWSRIHh3mTXFa3iZyC8M0xO0fGLYdCyQ/tc66n2Wlu
+M6BrOEs87ASQ61YcitGKNQ4CiL2YIMwZPbDNHgMHt+hxi9JCrRLP2EEFSN0aIDzX
+n8T+vBbaYqj80Xclq3pQST8RlOrOf33EAHfC5LLqOtFlvkj596J5FR5+hVKQeTx3
+lpTdw0ABKert4VocIPL367PPZ3OO+AVi+ptWYiJem20cGWa0NUnFE2bvdCQ6u4/n
+jjzpl8RIHa/peU18SlNKEjb8JryE1YC6ar+rXE42NkLV/vUSJOWzg8BguZb2qvWP
+zpYSFrObPUVUgloUxGwPpjpXbakH3IObL5KNe9s1kAd4FsTc/RtKhPCSAOZK7ql3
+UMlUmZKd5Knk3YfC3EfMhEU9bDlVScidPOgFhGPj2dlpOwADKOJjn7Xytm1e8qp+
+TBUDx4iHoH5n8DOslcHGu+Q2JxMEKEdLAeHl0brka8GMULVw/0mREK9Ag/0eEc2H
+3hu3DdMOReSRXJMljjyJ
+=YUBz
 -----END PGP SIGNATURE-----
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 000000000000..207bf332ed14
--- /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/metadata.xml b/app-editors/vim-qt/metadata.xml
index 1cca6173e11c..f9d6c82c525c 100644
--- a/app-editors/vim-qt/metadata.xml
+++ b/app-editors/vim-qt/metadata.xml
@@ -4,5 +4,6 @@
   <herd>qt</herd>
   <use>
     <flag name='luajit'>Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
+    <flag name='racket'>Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/app-editors/vim-qt/vim-qt-20130201-r1.ebuild b/app-editors/vim-qt/vim-qt-20130201-r1.ebuild
deleted file mode 100644
index c07d68823d44..000000000000
--- a/app-editors/vim-qt/vim-qt-20130201-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130201-r1.ebuild,v 1.1 2013/10/16 12:20:28 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="threads"
-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"
-
-if [[ ${PV} == *9999* ]]; 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 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 )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	export LC_COLLATE="C" # prevent locale brokenness bug #82186
-	use python && python-single-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 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
-}
diff --git a/app-editors/vim-qt/vim-qt-20130220-r1.ebuild b/app-editors/vim-qt/vim-qt-20130220-r1.ebuild
deleted file mode 100644
index 840a3125767e..000000000000
--- a/app-editors/vim-qt/vim-qt-20130220-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/vim-qt-20130220-r1.ebuild,v 1.1 2013/10/16 12:20:28 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="threads"
-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"
-
-if [[ ${PV} == *9999* ]]; 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 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 )
-	nls? ( virtual/libintl )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( || ( dev-lang/ruby:1.9 dev-lang/ruby:1.8 ) )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	export LC_COLLATE="C" # prevent locale brokenness bug #82186
-	use python && python-single-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 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
-}
diff --git a/app-editors/vim-qt/vim-qt-20140827-r1.ebuild b/app-editors/vim-qt/vim-qt-20140827-r1.ebuild
new file mode 100644
index 000000000000..43043c0b208a
--- /dev/null
+++ b/app-editors/vim-qt/vim-qt-20140827-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2014 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-r1.ebuild,v 1.1 2014/11/15 12:32:44 yngwin Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3} )
+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} == *9999* ]]; then
+	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"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-package-${PV}"
+fi
+
+LICENSE="vim"
+SLOT="0"
+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?]
+	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? ( 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 dev-lang/ruby:1.9 ) )"
+DEPEND="${RDEPEND}
+	dev-util/ctags
+	sys-devel/autoconf
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	export LC_COLLATE="C" # prevent locale brokenness bug #82186
+	use python && python-single-r1_pkg_setup
+}
+
+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
+
+	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
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+}