commit: 23da79bd9b80d2e092e0210cd3e22b1845470014 Author: Tim Harder <radhermit <AT> gentoo <DOT> org> AuthorDate: Fri Apr 12 05:58:16 2019 +0000 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> CommitDate: Fri Apr 12 06:10:32 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23da79bd
app-editors/gvim: version bump to 8.1.1155 Drop gnome USE flag, disable support, and rename gtk USE flags, now gtk enables gtk3 support while gtk2 enables the older gtk2-based UI. Closes: https://bugs.gentoo.org/647602 Restrict tests until various failures are skipped and/or resolved. Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> app-editors/gvim/Manifest | 1 + .../{gvim-9999.ebuild => gvim-8.1.1155.ebuild} | 48 +++++++++++----------- app-editors/gvim/gvim-9999.ebuild | 45 ++++++++++---------- app-editors/gvim/metadata.xml | 1 + 4 files changed, 46 insertions(+), 49 deletions(-) diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 03ef5c341e2..948bccea5da 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -4,3 +4,4 @@ DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907 DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19 DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454 +DIST vim-8.1.1155.tar.gz 14141750 BLAKE2B f15470768fbdc4e02552b8711626c3ad9647ec5b74ebaa3f82a4f32c050405ef0cf3f29d1e5bdbb4de008bf16262b8cdc81ff153e2694a184523cd913624e8e0 SHA512 0cdc42090958f4c91c13aeeefac0abc4feaa629d8b90c04bd01d5e23efefe21e6316e1b2c3b6015ecf9577573faea9a1b6660de8a2959642e65582dbe9c7f5c6 diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.1.1155.ebuild similarity index 92% copy from app-editors/gvim/gvim-9999.ebuild copy to app-editors/gvim/gvim-8.1.1155.ebuild index 59218d3f5dc..35aedc92a30 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-8.1.1155.ebuild @@ -3,9 +3,9 @@ EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25 ruby26" inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single @@ -24,14 +24,13 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"; SLOT="0" LICENSE="vim" -IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" +IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" REQUIRED_USE=" luajit? ( lua ) python? ( ${PYTHON_REQUIRED_USE} ) " RDEPEND=" - ~app-editors/vim-core-${PV} >=app-eselect/eselect-vi-1.1 >=sys-libs/ncurses-5.2-r2:0= x11-libs/libICE @@ -40,16 +39,16 @@ RDEPEND=" x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( - gtk3? ( + gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) - !gtk3? ( - gtk? ( + !gtk? ( + gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) - !gtk? ( + !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) @@ -73,11 +72,15 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) " DEPEND="${RDEPEND} - dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) " +# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880 +PDEPEND="~app-editors/vim-core-${PV}" + +# various failures (bugs #630042 and #682320) +RESTRICT="test" S=${WORKDIR}/vim-${PV} @@ -189,6 +192,7 @@ src_configure() { --with-features=huge --disable-gpm --enable-multibyte + --with-gnome=no $(use_enable acl) $(use_enable cscope) $(use_enable lua luainterp) @@ -215,13 +219,12 @@ src_configure() { fi # gvim's GUI preference order is as follows: - # aqua CARBON (not tested) - # -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 + # aqua CARBON (not tested) + # -aqua gtk GTK3 + # -aqua -gtk gtk2 GTK2 + # -aqua -gtk -gtk motif MOTIF + # -aqua -gtk -gtk -motif neXt NEXTAW + # -aqua -gtk -gtk -motif -neXt ATHENA echo ; echo if use aqua; then einfo "Building gvim with the Carbon GUI" @@ -229,19 +232,14 @@ src_configure() { --enable-darwin --enable-gui=carbon ) - elif use gtk3; then + elif use gtk; then myconf+=( --enable-gtk3-check ) einfo "Building gvim with the gtk+-3 GUI" myconf+=( --enable-gui=gtk3 ) - elif use gtk; then + elif use gtk2; then myconf+=( --enable-gtk2-check ) - if use gnome; then - einfo "Building gvim with the Gnome 2 GUI" - myconf+=( --enable-gui=gnome2 ) - else - einfo "Building gvim with the gtk+-2 GUI" - myconf+=( --enable-gui=gtk2 ) - fi + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) elif use motif; then einfo "Building gvim with the MOTIF GUI" myconf+=( --enable-gui=motif ) diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 59218d3f5dc..ff138f4e695 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -3,9 +3,9 @@ EAPI=6 VIM_VERSION="8.1" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby23 ruby24 ruby25" +USE_RUBY="ruby24 ruby25 ruby26" inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single @@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"; SLOT="0" LICENSE="vim" -IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" +IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl" REQUIRED_USE=" luajit? ( lua ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -40,16 +40,16 @@ RDEPEND=" x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( - gtk3? ( + gtk? ( x11-libs/gtk+:3 x11-libs/libXft ) - !gtk3? ( - gtk? ( + !gtk? ( + gtk2? ( >=x11-libs/gtk+-2.6:2 x11-libs/libXft ) - !gtk? ( + !gtk2? ( motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) @@ -73,12 +73,14 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) " DEPEND="${RDEPEND} - dev-util/ctags sys-devel/autoconf virtual/pkgconfig nls? ( sys-devel/gettext ) " +# various failures (bugs #630042 and #682320) +RESTRICT="test" + S=${WORKDIR}/vim-${PV} pkg_setup() { @@ -189,6 +191,7 @@ src_configure() { --with-features=huge --disable-gpm --enable-multibyte + --with-gnome=no $(use_enable acl) $(use_enable cscope) $(use_enable lua luainterp) @@ -215,13 +218,12 @@ src_configure() { fi # gvim's GUI preference order is as follows: - # aqua CARBON (not tested) - # -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 + # aqua CARBON (not tested) + # -aqua gtk GTK3 + # -aqua -gtk gtk2 GTK2 + # -aqua -gtk -gtk motif MOTIF + # -aqua -gtk -gtk -motif neXt NEXTAW + # -aqua -gtk -gtk -motif -neXt ATHENA echo ; echo if use aqua; then einfo "Building gvim with the Carbon GUI" @@ -229,19 +231,14 @@ src_configure() { --enable-darwin --enable-gui=carbon ) - elif use gtk3; then + elif use gtk; then myconf+=( --enable-gtk3-check ) einfo "Building gvim with the gtk+-3 GUI" myconf+=( --enable-gui=gtk3 ) - elif use gtk; then + elif use gtk2; then myconf+=( --enable-gtk2-check ) - if use gnome; then - einfo "Building gvim with the Gnome 2 GUI" - myconf+=( --enable-gui=gnome2 ) - else - einfo "Building gvim with the gtk+-2 GUI" - myconf+=( --enable-gui=gtk2 ) - fi + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) elif use motif; then einfo "Building gvim with the MOTIF GUI" myconf+=( --enable-gui=motif ) diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml index e0d65e43e29..435a3f0120b 100644 --- a/app-editors/gvim/metadata.xml +++ b/app-editors/gvim/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <use> <flag name="cscope">Enable cscope interface</flag> + <flag name="gtk2">Enable GTK+2 interface</flag> <flag name="gtk3">Enable GTK+3 interface</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>
