From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-901416-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F087138331 for <garchives@archives.gentoo.org>; Thu, 15 Sep 2016 04:34:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98F9EE0B62; Thu, 15 Sep 2016 04:34:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D511E0B78 for <gentoo-commits@lists.gentoo.org>; Thu, 15 Sep 2016 04:33:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4179340961 for <gentoo-commits@lists.gentoo.org>; Thu, 15 Sep 2016 04:33:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0BE42486 for <gentoo-commits@lists.gentoo.org>; Thu, 15 Sep 2016 04:33:55 +0000 (UTC) From: "Tim Harder" <radhermit@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" <radhermit@gentoo.org> Message-ID: <1473913988.ea536b92f5e1ec6b338b7c5946791fb90e05ab0c.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/gvim/Manifest app-editors/gvim/gvim-8.0.0004.ebuild app-editors/gvim/gvim-9999.ebuild app-editors/gvim/metadata.xml X-VCS-Directories: app-editors/gvim/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: ea536b92f5e1ec6b338b7c5946791fb90e05ab0c X-VCS-Branch: master Date: Thu, 15 Sep 2016 04:33:55 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: de18c15a-2585-4565-a71c-be3dd278e5ff X-Archives-Hash: f288f0298437eca08ecc3d8b8a8ce714 commit: ea536b92f5e1ec6b338b7c5946791fb90e05ab0c Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Thu Sep 15 04:30:02 2016 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Thu Sep 15 04:33:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea536b92 app-editors/gvim: version bump to 8.0.0004 app-editors/gvim/Manifest | 1 + .../{gvim-9999.ebuild => gvim-8.0.0004.ebuild} | 51 ++++++++++++++-------- app-editors/gvim/gvim-9999.ebuild | 51 ++++++++++++++-------- app-editors/gvim/metadata.xml | 1 + 4 files changed, 66 insertions(+), 38 deletions(-) diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 02bfaa9..f4588e3 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -5,3 +5,4 @@ DIST vim-7.4.2102.tar.gz 12838026 SHA256 19c059b2d0e61effcd288e2a18969017cbbc031 DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2 DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed +DIST vim-8.0.0004.tar.gz 12909073 SHA256 3ba0aeaf86c9f89ea55d6144b82f36f82d3ad5b7efcd393d0689e6ec2ca970ef SHA512 d52a30df952e6b3a5b3ee6c3dd2a5ee48573286fab9ae6955ac79c67087f22748a910a35cfed1badff99614daf28eecefd3b16eb2e0da0fae184eee32e09dfd6 WHIRLPOOL 7053e543ff2437a3f46e47e7af02cdec74f2f25a9a519872c0dfe207c828b51279af62dbc4a06977bac782e91a4d59c51d96ec16d3c22c7373f6a3a87f320e2d diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.0.0004.ebuild similarity index 91% copy from app-editors/gvim/gvim-9999.ebuild copy to app-editors/gvim/gvim-8.0.0004.ebuild index 7bdb323..19d0717 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-8.0.0004.ebuild @@ -3,8 +3,8 @@ # $Id$ EAPI=6 -VIM_VERSION="7.4" -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) +VIM_VERSION="8.0" +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1 @@ -23,7 +23,7 @@ HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" SLOT="0" LICENSE="vim" -IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" +IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" REQUIRED_USE=" luajit? ( lua ) python? ( @@ -37,20 +37,28 @@ RDEPEND=" ~app-editors/vim-core-${PV} >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= + x11-libs/libICE + x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( - gtk? ( - >=x11-libs/gtk+-2.6:2 + gtk3? ( + x11-libs/gtk+:3 x11-libs/libXft - gnome? ( >=gnome-base/libgnomeui-2.6 ) ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - neXt? ( x11-libs/neXtaw ) - !neXt? ( x11-libs/libXaw ) + !gtk3? ( + gtk? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + gnome? ( >=gnome-base/libgnomeui-2.6 ) + ) + !gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( x11-libs/libXaw ) + ) ) ) ) @@ -138,7 +146,7 @@ src_prepare() { "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' fi - default + eapply_user } src_configure() { @@ -216,11 +224,12 @@ src_configure() { # gvim's GUI preference order is as follows: # aqua CARBON (not tested) - # -aqua gtk gnome GNOME2 - # -aqua gtk -gnome GTK2 - # -aqua -gtk motif MOTIF - # -aqua -gtk -motif neXt NEXTAW - # -aqua -gtk -motif -neXt ATHENA + # -aqua gtk3 GTK3 + # -aqua -gtk3 gnome GNOME2 + # -aqua -gtk3 -gnome gtk GTK2 + # -aqua -gtk -gtk3 motif MOTIF + # -aqua -gtk -gtk3 -motif neXt NEXTAW + # -aqua -gtk -gtk3 -motif -neXt ATHENA echo ; echo if use aqua ; then einfo "Building gvim with the Carbon GUI" @@ -228,6 +237,10 @@ src_configure() { --enable-darwin --enable-gui=carbon ) + elif use gtk3 ; then + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) elif use gtk ; then myconf+=( --enable-gtk2-check ) if use gnome ; then @@ -249,10 +262,10 @@ src_configure() { fi echo ; echo - # Let Portage do the stripping. Some people like that. + # let package manager strip binaries export ac_cv_prog_STRIP="$(type -P true ) faking strip" - # Keep Gentoo Prefix env contained within the EPREFIX + # keep prefix env contained within the EPREFIX use prefix && myconf+=( --without-local-dir ) if [[ ${CHOST} == *-interix* ]]; then diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 7bdb323..19d0717 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -3,8 +3,8 @@ # $Id$ EAPI=6 -VIM_VERSION="7.4" -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) +VIM_VERSION="8.0" +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) PYTHON_REQ_USE=threads inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1 @@ -23,7 +23,7 @@ HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" SLOT="0" LICENSE="vim" -IUSE="acl aqua cscope debug gnome gtk lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" +IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" REQUIRED_USE=" luajit? ( lua ) python? ( @@ -37,20 +37,28 @@ RDEPEND=" ~app-editors/vim-core-${PV} >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= + x11-libs/libICE + x11-libs/libSM x11-libs/libXext x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( - gtk? ( - >=x11-libs/gtk+-2.6:2 + gtk3? ( + x11-libs/gtk+:3 x11-libs/libXft - gnome? ( >=gnome-base/libgnomeui-2.6 ) ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - neXt? ( x11-libs/neXtaw ) - !neXt? ( x11-libs/libXaw ) + !gtk3? ( + gtk? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + gnome? ( >=gnome-base/libgnomeui-2.6 ) + ) + !gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( x11-libs/libXaw ) + ) ) ) ) @@ -138,7 +146,7 @@ src_prepare() { "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' fi - default + eapply_user } src_configure() { @@ -216,11 +224,12 @@ src_configure() { # gvim's GUI preference order is as follows: # aqua CARBON (not tested) - # -aqua gtk gnome GNOME2 - # -aqua gtk -gnome GTK2 - # -aqua -gtk motif MOTIF - # -aqua -gtk -motif neXt NEXTAW - # -aqua -gtk -motif -neXt ATHENA + # -aqua gtk3 GTK3 + # -aqua -gtk3 gnome GNOME2 + # -aqua -gtk3 -gnome gtk GTK2 + # -aqua -gtk -gtk3 motif MOTIF + # -aqua -gtk -gtk3 -motif neXt NEXTAW + # -aqua -gtk -gtk3 -motif -neXt ATHENA echo ; echo if use aqua ; then einfo "Building gvim with the Carbon GUI" @@ -228,6 +237,10 @@ src_configure() { --enable-darwin --enable-gui=carbon ) + elif use gtk3 ; then + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) elif use gtk ; then myconf+=( --enable-gtk2-check ) if use gnome ; then @@ -249,10 +262,10 @@ src_configure() { fi echo ; echo - # Let Portage do the stripping. Some people like that. + # let package manager strip binaries export ac_cv_prog_STRIP="$(type -P true ) faking strip" - # Keep Gentoo Prefix env contained within the EPREFIX + # keep prefix env contained within the EPREFIX use prefix && myconf+=( --without-local-dir ) if [[ ${CHOST} == *-interix* ]]; then diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml index 8191c69..bd2205f 100644 --- a/app-editors/gvim/metadata.xml +++ b/app-editors/gvim/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo Vim Project</name> </maintainer> <use> + <flag name="gtk3">Enable GTK+3 interface</flag> <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag> <flag name="netbeans">Include netbeans external editor integration support</flag> <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>