From 9b9eef4b1a456fb9e919a15b567be1a5758ea40a Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Wed, 16 Oct 2013 12:20:28 +0000 Subject: Fix Python support, use python-single-r1 since the package links to a specific version of Python. (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) --- app-editors/vim-qt/ChangeLog | 10 +++- app-editors/vim-qt/vim-qt-20130201-r1.ebuild | 80 ++++++++++++++++++++++++++++ app-editors/vim-qt/vim-qt-20130201.ebuild | 78 --------------------------- app-editors/vim-qt/vim-qt-20130220-r1.ebuild | 80 ++++++++++++++++++++++++++++ app-editors/vim-qt/vim-qt-20130220.ebuild | 78 --------------------------- 5 files changed, 169 insertions(+), 157 deletions(-) create mode 100644 app-editors/vim-qt/vim-qt-20130201-r1.ebuild delete mode 100644 app-editors/vim-qt/vim-qt-20130201.ebuild create mode 100644 app-editors/vim-qt/vim-qt-20130220-r1.ebuild delete mode 100644 app-editors/vim-qt/vim-qt-20130220.ebuild (limited to 'app-editors') diff --git a/app-editors/vim-qt/ChangeLog b/app-editors/vim-qt/ChangeLog index 552fb65c85e0..56bfac12fd6e 100644 --- a/app-editors/vim-qt/ChangeLog +++ b/app-editors/vim-qt/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-editors/vim-qt # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.4 2013/09/05 18:18:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-qt/ChangeLog,v 1.5 2013/10/16 12:20:28 mgorny Exp $ + +*vim-qt-20130201-r1 (16 Oct 2013) +*vim-qt-20130220-r1 (16 Oct 2013) + + 16 Oct 2013; Michał Górny +vim-qt-20130201-r1.ebuild, + +vim-qt-20130220-r1.ebuild, -vim-qt-20130201.ebuild, -vim-qt-20130220.ebuild: + Fix Python support, use python-single-r1 since the package links to a specific + version of Python. 05 Sep 2013; Michał Górny vim-qt-20130201.ebuild, vim-qt-20130220.ebuild: diff --git a/app-editors/vim-qt/vim-qt-20130201-r1.ebuild b/app-editors/vim-qt/vim-qt-20130201-r1.ebuild new file mode 100644 index 000000000000..c07d68823d44 --- /dev/null +++ b/app-editors/vim-qt/vim-qt-20130201-r1.ebuild @@ -0,0 +1,80 @@ +# 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-20130201.ebuild b/app-editors/vim-qt/vim-qt-20130201.ebuild deleted file mode 100644 index 4d26c04d5f0c..000000000000 --- a/app-editors/vim-qt/vim-qt-20130201.ebuild +++ /dev/null @@ -1,78 +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.ebuild,v 1.3 2013/09/05 18:18:05 mgorny Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_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} == *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}" - -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 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 new file mode 100644 index 000000000000..840a3125767e --- /dev/null +++ b/app-editors/vim-qt/vim-qt-20130220-r1.ebuild @@ -0,0 +1,80 @@ +# 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-20130220.ebuild b/app-editors/vim-qt/vim-qt-20130220.ebuild deleted file mode 100644 index bd247cfe2659..000000000000 --- a/app-editors/vim-qt/vim-qt-20130220.ebuild +++ /dev/null @@ -1,78 +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.ebuild,v 1.3 2013/09/05 18:18:05 mgorny Exp $ - -EAPI=5 -PYTHON_COMPAT=( python{2_6,2_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} == *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}" - -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 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 -} -- cgit v1.2.3-65-gdbad