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

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

[Michał Górny]

commit:     1aff8d7da4e38c356c686ea05d9305317f12ca7f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 10:36:08 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 25 10:37:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aff8d7d

app-editors/vim-qt: Remove last-rited pkg, #607136

 app-editors/vim-qt/Manifest                  |   1 -
 app-editors/vim-qt/files/vim-qt.desktop      |   9 --
 app-editors/vim-qt/metadata.xml              |  17 ----
 app-editors/vim-qt/vim-qt-20150102-r1.ebuild | 129 ---------------------------
 profiles/package.mask                        |   5 --
 5 files changed, 161 deletions(-)

diff --git a/app-editors/vim-qt/Manifest b/app-editors/vim-qt/Manifest
deleted file mode 100644
index 98e341c3d00..00000000000
--- a/app-editors/vim-qt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST vim-qt-20150102.tar.gz 12285083 SHA256 1a3553f491e7990d4256c3c70f2d9d1804c2de5c6ac2c12845b173ff3d531157 SHA512 37434ff6cbac3dd97e3c5cb328a857afa8a8ddc4cea7b3879a06b4dd418e5b7516a68dc5c2b0c9c8b6332d316fc593b120400eab04c444c0065f3b74ae2d682d WHIRLPOOL 60d9838532b25ad8c31638e51ccf82769382dccb420c070068537ad7c15314dbc2b5fd177ed9d57674b3f593937f3c539bdd7a98e305eab40059a29ae4bf2b09

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 207bf332ed1..00000000000
--- 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 534d43f73c6..00000000000
--- a/app-editors/vim-qt/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <use>
-    <flag name="lto">Enable configure workaround for -flto</flag>
-    <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-scheme/racket</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">equalsraf/vim-qt</remote-id>
-    <remote-id type="bitbucket">equalsraf/vim-qt</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/app-editors/vim-qt/vim-qt-20150102-r1.ebuild b/app-editors/vim-qt/vim-qt-20150102-r1.ebuild
deleted file mode 100644
index 7b0d4dc9180..00000000000
--- a/app-editors/vim-qt/vim-qt-20150102-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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} == *9999* ]]; 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 lto 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
-	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.1 )"
-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() {
-	# Read vimrc from /etc/vim/
-	echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
-}
-
-src_configure() {
-	if use lto ; then
-		LDFLAGS_OLD="$LDFLAGS"
-		local LDFLAGS="${LDFLAGS} -fno-lto -fno-use-linker-plugin"
-	fi
-
-	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}
-
-	if use lto ; then
-		LDFLAGS="${LDFLAGS_OLD}"
-		sed -i -e "s|-fno-lto -fno-use-linker-plugin||g" src/auto/config.mk
-	fi
-}
-
-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
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index b9bc3ccdd31..a8a65cd8730 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -292,11 +292,6 @@ www-apache/mod_authnz_persona
 >=virtual/pypy-5.7
 >=virtual/pypy3-5.7
 
-# Michael Palimaka <kensington@gentoo.org> (23 Apr 2017)
-# Doesn't work with any in-tree versions of vim. Inactive upstream.
-# Bug 607136. Masked for removal in 30 days.
-app-editors/vim-qt
-
 # Rick Farina <zerochaos@gentoo.org> (17 Apr 2017)
 # Masking old versions because upstream changed versioning
 # Please keep this mask for 1 year to ease upgrades for users