From 76cba73c47c8694e74377004634daca18f2d9c08 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Apr 2018 01:05:40 +0100 Subject: gentoo resync : 14.04.2018 --- app-editors/Manifest.gz | Bin 14043 -> 14040 bytes app-editors/gvim/Manifest | 4 +- app-editors/gvim/gvim-8.0.1699.ebuild | 373 +++++++++++++++++++++ app-editors/gvim/gvim-9999.ebuild | 12 +- app-editors/juffed/Manifest | 3 +- .../files/juffed-0.10_p20160323-qt-5.11.patch | 28 ++ app-editors/juffed/juffed-0.10_p20160323-r1.ebuild | 5 +- app-editors/qemacs/Manifest | 2 +- app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild | 2 +- app-editors/vim-core/Manifest | 7 +- app-editors/vim-core/vim-core-8.0.0386.ebuild | 217 ------------ app-editors/vim-core/vim-core-8.0.1188.ebuild | 214 ------------ app-editors/vim-core/vim-core-8.0.1699.ebuild | 214 ++++++++++++ app-editors/vim/Manifest | 4 +- app-editors/vim/vim-8.0.1699.ebuild | 311 +++++++++++++++++ app-editors/vim/vim-9999.ebuild | 8 +- app-editors/yudit/Manifest | 2 +- app-editors/yudit/yudit-2.9.6.ebuild | 2 +- 18 files changed, 956 insertions(+), 452 deletions(-) create mode 100644 app-editors/gvim/gvim-8.0.1699.ebuild create mode 100644 app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch delete mode 100644 app-editors/vim-core/vim-core-8.0.0386.ebuild delete mode 100644 app-editors/vim-core/vim-core-8.0.1188.ebuild create mode 100644 app-editors/vim-core/vim-core-8.0.1699.ebuild create mode 100644 app-editors/vim/vim-8.0.1699.ebuild (limited to 'app-editors') diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index b658f7d7f85c..7ca9a8de42ff 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 7885ed04f383..b948c2f64886 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -5,8 +5,10 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085 +DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7 EBUILD gvim-8.0.1298.ebuild 10469 BLAKE2B b0f04d4d5a1df2854184d2d0f9b64129524af078e86096704348a86710b8b551b77f3d8b0a2071a56a650cd747b45cf437e58ec7a3259b5b1332c46de1dd7f2e SHA512 27f0671ee4de3ffbbd4d6d56c09550fe4774ec1d9b5b45513f6314719e1f1c6e0ea55215dfe5b88c253d16bd97bbcc7cbf734d7c9049b11df625da300e7c589c EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf EBUILD gvim-8.0.1645.ebuild 10502 BLAKE2B 47db270abf2ea71b92173df98377634c0b59d04383059ac557c0c8fcd8aeeb11ff8aaa1a7cb4b40819f386b040952ca356457e500d9b0a9a553e1bea60379a16 SHA512 da4f6c564a06f5f8eb50a56836235eddadd20515afe66a74efd0fce24a3a048db52a0cc0ae8d7e5fbf5fd57f0861e0a50e966a4a31f106059f0952ceccb7b589 -EBUILD gvim-9999.ebuild 10495 BLAKE2B 2c3e61a00479e7adf15fdd2bb32a3eb4c806c67b40aefa068bda7270a5af7cd27ed3bd02c04c07d60697b5710e47a30097e925d86a88062a3fb3bdcf35636b20 SHA512 6335c49298a9e01775b0baf9f52bb8aae61bd6cae0ecf51f43c1b5b9fc19fbd8b2919c02280e38cf391a80bce364ff83b7eddcc0acdf2f0c64e58ff8609c4296 +EBUILD gvim-8.0.1699.ebuild 10490 BLAKE2B 18c912fb875ea79a541ecdc6723714782520d9f6524dc9eced18b3704c46ece46f296c45ad8a817978755b9367b43b04bf82e1692996fd08027e1db6a45553ef SHA512 bdf28681e8503cde8067c013ab634bdc0dbfab4d6367b3bdd5c4f11cd90e3f8c49471a87cd50086e80f305f797a7c7d5203ab7cee30dd41436a7f787c1f32a35 +EBUILD gvim-9999.ebuild 10490 BLAKE2B 18c912fb875ea79a541ecdc6723714782520d9f6524dc9eced18b3704c46ece46f296c45ad8a817978755b9367b43b04bf82e1692996fd08027e1db6a45553ef SHA512 bdf28681e8503cde8067c013ab634bdc0dbfab4d6367b3bdd5c4f11cd90e3f8c49471a87cd50086e80f305f797a7c7d5203ab7cee30dd41436a7f787c1f32a35 MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126 diff --git a/app-editors/gvim/gvim-8.0.1699.ebuild b/app-editors/gvim/gvim-8.0.1699.ebuild new file mode 100644 index 000000000000..bb0c86ef868e --- /dev/null +++ b/app-editors/gvim/gvim-8.0.1699.ebuild @@ -0,0 +1,373 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.0" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE="threads" +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +fi + +DESCRIPTION="GUI version of the Vim text editor" +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" +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 + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + acl? ( kernel_linux? ( sys-apps/acl ) ) + !aqua? ( + gtk3? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + !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 ) + ) + ) + ) + ) + cscope? ( dev-util/cscope ) + lua? ( + luajit? ( dev-lang/luajit:2= ) + !luajit? ( dev-lang/lua:0[deprecated] ) + ) + nls? ( virtual/libintl ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( ${RUBY_DEPS} ) + selinux? ( sys-libs/libselinux ) + session? ( x11-libs/libSM ) + tcl? ( dev-lang/tcl:0= ) +" +DEPEND="${RDEPEND} + dev-util/ctags + sys-devel/autoconf + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +S=${WORKDIR}/vim-${PV} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches/ + fi + + # Fixup a script to use awk instead of nawk + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i -e \ + 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -v src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + local file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e ${file} ]]; then + addwrite $file + fi + done + + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --disable-gpm + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable lua luainterp) + $(use_with luajit) + $(use_enable netbeans) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable python pythoninterp) + $(use_enable python python3interp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable session xsmp) + $(use_enable tcl tclinterp) + ) + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" + 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 + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --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 + 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 + elif use motif; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + elif use neXt; then + einfo "Building gvim with the neXtaw GUI" + myconf+=( --enable-gui=nextaw ) + else + einfo "Building gvim with the Athena GUI" + myconf+=( --enable-gui=athena ) + fi + echo ; echo + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if [[ ${CHOST} == *-interix* ]]; then + # avoid finding of this function, to avoid having to patch either + # configure or the source, which would be much more hackish. + # after all vim does it right, only interix is badly broken (again) + export ac_cv_func_sigaction=no + fi + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --with-vim-name=gvim \ + --with-x \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + echo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + echo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + echo + + # Don't let vim talk to X + unset DISPLAY + + # Make gvim not try to connect to X. See :help gui-x11-start in vim for how + # this evil trickery works. + ln -s "${S}"/src/gvim "${S}"/src/testvim || die + + # Make sure our VIMPROG is used. + sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die + + # Don't do additional GUI tests. + emake -j1 VIMPROG=../testvim -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dobin src/gvim + dosym gvim /usr/bin/gvimdiff + dosym gvim /usr/bin/evim + dosym gvim /usr/bin/eview + dosym gvim /usr/bin/gview + dosym gvim /usr/bin/rgvim + dosym gvim /usr/bin/rgview + + emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons + + dodir /usr/share/man/man1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed" + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed" + echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \ + die "echo failed" + + insinto /etc/vim + newins "${FILESDIR}"/gvimrc-r1 gvimrc + eprefixify "${ED}"/etc/vim/gvimrc + + doicon -s scalable "${FILESDIR}"/gvim.svg + + # bash completion script, bug #79018. + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # don't install vim desktop file + rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Update fdo mime stuff, bug #78394 + xdg_desktop_database_update + + # Update icon cache + gnome2_icon_cache_update + + # Call eselect vi update + eselect_vi_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Update fdo mime stuff, bug #78394 + xdg_desktop_database_update + + # Update icon cache + gnome2_icon_cache_update + + # Call eselect vi update + eselect_vi_update +} diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 1de46facaa9c..bb0c86ef868e 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 VIM_VERSION="8.0" PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE=threads -inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 +PYTHON_REQ_USE="threads" +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +inherit vim-doc flag-o-matic xdg-utils gnome2-utils versionator bash-completion-r1 prefix python-single-r1 ruby-single if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -14,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" fi DESCRIPTION="GUI version of the Vim text editor" @@ -66,7 +68,7 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) + ruby? ( ${RUBY_DEPS} ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest index 9fc5b709f3db..54d609664106 100644 --- a/app-editors/juffed/Manifest +++ b/app-editors/juffed/Manifest @@ -1,5 +1,6 @@ AUX FindQtSingleApplication.cmake 4004 BLAKE2B e6c047be5112811430258e527a6d0ac5217838c9acbdbf6edf49909f3858c6fedb1c3da0471d4301cb918683b6194207650f9c4d06735e62993da3720b263356 SHA512 5ba7845f12a0e425fdeda180faab8b6e53ed3ae0ae291e5a33878a5f955f9295ea7058f1cce43ee4292fd00a6b8ddc45c71d050210ed4b26e1d3f4472df04f9e AUX juffed-0.10_p20160323-qscintilla-2.10.patch 565 BLAKE2B 92ee287c1dd3321ba706ea01656037e87a27a5cb6f43695a043481a0c4231b5753d9b4af74f82f9d37f2b2c137871f52d37a310fa9f75188955e761a46279762 SHA512 6b3f70930a3f7f5a59687b8484d5356804cff478da63732e5af261de12ced6e93f71bc53b93b3e286bf54e0cae61090729ccc54b42b37e2f97ee5a9640c18bd3 +AUX juffed-0.10_p20160323-qt-5.11.patch 719 BLAKE2B d9790a4a6a515a41a988949f8a0d1f52a0b19b53578138acd9d5ce141898317ab1776373f688a5c6fec059e67f14dfb5842c6367f9596df581a673a22e38567b SHA512 04174f544f040ba0cb4f28e1aed8e593d18fd4d7f53f94a6c99c5246a4603a234285959a887ffa155b72ce17f056eadd5dd31a041541c463630dd33d2a2a8952 DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5 -EBUILD juffed-0.10_p20160323-r1.ebuild 1351 BLAKE2B eb99907a7cfbccf8402246003677f51167c2cae499a7fc615eac39952349ac711b73be853052bf1da5fb8876249f7809dfce7729dcf39fbe57b92d949b5c6a2e SHA512 0909c90c605b7daf5937a6822c04a730d1a93a0edcc9737b8d50e94dfb1262e391b289d74b51d6a8c3581e98977160740a0d99506b13c8bad77f1fd9144022c7 +EBUILD juffed-0.10_p20160323-r1.ebuild 1386 BLAKE2B e88936ebe034967e5a6b1eb3b2b1855c1cf1bfad3160e21c6498773a774d9f1fc89db8743ae1686400657f95cfe97c024f41b9d89c53b10c6a3b1489ec0cc5a3 SHA512 60d4c2a48a2c91c3ec1e57245d02da45f0dd021538c82809c9608d5e5916d0f86160f1dc644007b0e7ed4c4c933fc45b00e02826063ed3aa3fceda6787f632b6 MISC metadata.xml 323 BLAKE2B d45bb12a8240e1b12594d50a1284b69b365e15f7a857b34b0ee12f4c9af0d7681ba22bbc959e7133780f682f6ae6dad53f6ecb2eb7db65cf1b6f4a64c742cdb3 SHA512 43f71ede8fa11b874c187d61b6f1c3949c10bd632e5a98f4094463f785be8f719a2d2205f3f0b7645047398e026fe71b1ef79366d762ff12f257d0a239e84a4d diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch new file mode 100644 index 000000000000..4dfa7fae31f7 --- /dev/null +++ b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch @@ -0,0 +1,28 @@ +From cb10c88a091c62c29054138a2da69d05cbf1e406 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 10 Apr 2018 19:43:17 +0200 +Subject: [PATCH] Fix build with Qt 5.11 + +--- + plugins/keybindings/KeysPage.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/plugins/keybindings/KeysPage.cpp b/plugins/keybindings/KeysPage.cpp +index 6579e3e..e68b039 100644 +--- a/plugins/keybindings/KeysPage.cpp ++++ b/plugins/keybindings/KeysPage.cpp +@@ -1,9 +1,10 @@ + #include "KeysPage.h" + +-#include ++#include + #include + #include + #include ++#include + + #include "KeySettings.h" + #include "Log.h" +-- +2.17.0 + diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild index e8118beedc92..97e18f2d896c 100644 --- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild +++ b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild @@ -29,7 +29,10 @@ DEPEND="${RDEPEND}" DOCS=( ChangeLog README ) -PATCHES=( "${FILESDIR}/${P}-qscintilla-2.10.patch" ) +PATCHES=( + "${FILESDIR}/${P}-qscintilla-2.10.patch" + "${FILESDIR}/${P}-qt-5.11.patch" +) src_prepare() { # Upstream version outdated/dysfunctional and CRLF terminated diff --git a/app-editors/qemacs/Manifest b/app-editors/qemacs/Manifest index bc1416f3d51f..5ece22ab8d8b 100644 --- a/app-editors/qemacs/Manifest +++ b/app-editors/qemacs/Manifest @@ -6,5 +6,5 @@ AUX qemacs-0.4.1_pre20170225-nostrip.patch 1771 BLAKE2B af8ad554ea5dbdcd8e7a3df3 DIST qemacs-0.4.1_pre20150916.tar.xz 1136592 BLAKE2B aff8875b81bd51f77bebcb4dfe60ed0d4396a05af1f42e6b8765e15f9e04e00162924c3514a9ea1e8cb8c0b9ecd2a4112b9d7a46b7d156c032d37d381f2ae0f0 SHA512 e9775ff3dfef6d6b6b263029a620e6575f9f4718b94c0acfcddc8e5da8cd835e57dfbd5fbd948778135b609ae0588924fc9a727b2e763a25148aa27886a9f467 DIST qemacs-0.4.1_pre20170225.tar.xz 1147408 BLAKE2B 369f3c5ff1b1f7b22bbd1f70f0c150e425a5b68828e62db427e4b41c58c8ee9ae0449a83693e9354d88fc482691d7a5f3661360ef602aeaba963776c4725b894 SHA512 a17c8901c917f91401e16b4f857735957ab0d3533d9dcc7a0decf768f453b68023f45e1241225a84d35ba793beb69754e0f2caa857165f8223882d5041d56c99 EBUILD qemacs-0.4.1_pre20150916.ebuild 1664 BLAKE2B 9bb83316a5059a92c0eb04a1c07336ac0976b11778f60b0898bc79ba1a3edc1eb722327b08ba3bf766b67cf5a5f33d3407cfe86329aca377a62234f69b083b8b SHA512 9ca5f4c41d4232051070547d8591235c1ac4d3e5dbba738d58b5668690935f9e106ce1a4921d7004cf4bbc7ef33f717b782a8246d7f402fc9c35a356baa720f9 -EBUILD qemacs-0.4.1_pre20170225.ebuild 1493 BLAKE2B 7f05bee8c264e4c3f246eaa4ce35fc443ba42db076a7fa5eb693ec3d75186824c3a0faa2d77d5d841a5c66e6670f6856818ba1fd465564235f89c591f9e7d9de SHA512 6665d0222f86f4bbd658d8ee754276f5bb9c828bb3e73ea0f9a93b30f7e8300074418d36d88036bcbcb8c67dc31e96f3b38c477003c1e617c781645741c723e6 +EBUILD qemacs-0.4.1_pre20170225.ebuild 1492 BLAKE2B 18fa0b7f651b1abeb0ab3f2058b55d5222dc444760e04c3df80ace38acf2c9e55d7d194a068fadc56a66efe4011cf56fcc4a1d9fdb3610d7980aef7d0e15ca97 SHA512 861abaebf7454b648f0150329a1f6008129aebc093ae94dfed80ae85242ea09cb2fe69a07c91215af31d3e357030429e08d567b554169dfe836c510a12173663 MISC metadata.xml 1937 BLAKE2B 1367de4b5e027102ce6a7720129bf21bd6d9556d748f0770d005ee0b9a4454f5ad0d27d0d25e8c7b97bc3c0bb796a78df636479d33bf6bd5acee36498e8a8a81 SHA512 a26f40107a0616980d3722685b1491eee4c606a685e78bbc23a62de6c9b67cf15ff3ac92cbc935a38d280844a0d15c21f92ee7bdbb28218f8ae664bbc526feac diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild index 051ef9875f76..f5ea8d347a27 100644 --- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild +++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" LICENSE="LGPL-2.1+ GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~x86" +KEYWORDS="amd64 ~arm ~ppc x86" IUSE="X png unicode xv" RESTRICT="test" diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index db67bb15656a..f7609e7e709d 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -1,16 +1,13 @@ AUX vimrc-r5 7337 BLAKE2B 3f28db016b3956b4c5e2833ff4440417d3ccdc446618a776119513549c0b9831d0eb4bfb9abf992e436508b95f0586f2b4fc30ddba7f2b595574a5c2ccc257c8 SHA512 b9cc07386b97e6042166b11cd6270d4c3134eb816ff396ad544cfb14b349d79b32b5a07b5995580aea607b7936eef0dfd5ab1dc7e158dea26afc0c944fae8e3c AUX xxd-completion 461 BLAKE2B 1f36c4877fffd68e951d80c1a64cd2d458d92555a99fd06e29513da8caa6c28c27e44131b2873258e3ff5a0ab232d66f75a8f051ccf7a4d940b3b0102e6967dd SHA512 fc92426ea657e86ff765aa5a60736cdc70db938156dd8946db0a30c54d3f557bd8af421f1713bd750e779ccacd73f8f290a12a5e71ed48259fe1e6dece2de19c -DIST vim-8.0.0106-gentoo-patches.tar.bz2 2281 BLAKE2B 8e10c0c56ad97cbae0677ec91b0b35359f6e08b5eb542b00028fd0e243a075551adab4e140a90930cbce4549c3c4bc79a40c0e1a6c13aae18f67d6fc55a80e0e SHA512 39edd9f518c230d2b0486b18aa155572a9eada4a5e21108573d6e66e2eef1276f23b77d766648f018c9cf973a7d03712d8861be6ea13255d7b389912d554a47a -DIST vim-8.0.0386.tar.gz 13000882 BLAKE2B c38c1b75334cae916f76562ec5a06d59c4f2df6123d4b27a0a854dd8ecd9ae6f5d008a94137abe6217fc28d233077d636d30f2c26a5a139ff35f50cb52204f79 SHA512 3169ea4dbc836c724f63d99cd345227f870a3a922beba84a6b42011685c0dd209f6bba8c69af0650c9a57bb47fc541e1150ca8cefb21fcada022259bf4c94a66 DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87c654b2040ad39f1555ddde7e0e6f473dc8b520916a795406bb6bbeaf5e7ae8748aacebe7a9679461e48802e69417e945eea827 SHA512 a6062be5e6a5c5b437081312df5742353242b5171bf26da04aa6ca216d2b142b2411a88bc1edd460d28e00a59a210c8e1729e801fac6f1efd86bb2e437a56a2b -DIST vim-8.0.1188.tar.gz 13363260 BLAKE2B 545b2d6e8322b27967c974bb960f4e5ea2c6811d2649ac4c008eb8e6af78fe555a035657704af40026f96f12f83e3cebe435e90d21d7da87980446710424f79f SHA512 9c3733aa894c276de593d6144ee0aaf251092a11f4d0ac603d3d49a282ac6176aa4e88eccfd2527ff53b386bdd0177a85c0942367d68a652b5ca4040390ba49b DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085 -EBUILD vim-core-8.0.0386.ebuild 6742 BLAKE2B 7c60a03815ee7bf63b9676c45d12f78511c526bc3dcd4eb7a3ece264e141650a15e9ce8fb0111b3f0aacd75056205ef7bbfed3d828c4592b43cb09eb3c90f4b1 SHA512 20b78ddb0bf153bc0e6111703d6a77f500ff8cf4cb71b1c01c22619027619f9dbbbc9b25163c888d5faf780dc5c4b05a2b8a8ec888ca592167e0ebee4b86b49d -EBUILD vim-core-8.0.1188.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38 +DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7 EBUILD vim-core-8.0.1298.ebuild 6638 BLAKE2B b57e18cf8bfb21288bba91782e5c0f61e361a62ad8a1a66fb3a278a6f2126dfc0944ee115bf44fabe80d98c79f0f7f75a533a7823dc01f579addec429d0dfa02 SHA512 46cde1a42d98f0459ea66a64657a6f88aa2e0a64ec2492ddbf0964938b566d3f7d9a4b03b640a21d9d1b364c6a0a3db53b1bf2c667ce9b18e5fcc4fd42147781 EBUILD vim-core-8.0.1428.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38 EBUILD vim-core-8.0.1645.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38 +EBUILD vim-core-8.0.1699.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38 EBUILD vim-core-9999.ebuild 6648 BLAKE2B 8513f6f21478c099566a70c56ba739abd46174373cb228e170fd4ff701ed153e44eeef181218a09a1d9a5593dbeb66ef77d89b0c6285dca2add63086110ffa41 SHA512 fe73d0fb57acbddb58740e95e919383f02d176169513b5e6f9774b351fa886d572cc7cdc60b787e305819716f544cca8fa3222b40975c8590dd346bddaff7a38 MISC metadata.xml 321 BLAKE2B 018b535f5c81e8df2ee4f38a61ab95f999fb7fcd07ab67f9d5f7d2459768dc7e771006f50f903e1d0ba6cbf42ba2ae299901c1edb951a6e1dcbe3decaac98c57 SHA512 7d4a40b09c24eb8f08e6c171a4cf0e332d82f06163846602db338a1ad2e51133ed18694f216ce061fd9964fba3380b9991d86b93f111c6f8d0bb62ac5e14f705 diff --git a/app-editors/vim-core/vim-core-8.0.0386.ebuild b/app-editors/vim-core/vim-core-8.0.0386.ebuild deleted file mode 100644 index f7d16fcf1349..000000000000 --- a/app-editors/vim-core/vim-core-8.0.0386.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VIM_VERSION="8.0" -inherit eutils vim-doc flag-o-matic versionator bash-completion-r1 prefix - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0106-gentoo-patches.tar.bz2" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="vim and gvim shared files" -HOMEPAGE="http://www.vim.org/ https://github.com/vim/vim" - -SLOT="0" -LICENSE="vim" -IUSE="nls acl minimal" - -DEPEND="sys-devel/autoconf" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" - -S=${WORKDIR}/vim-${PV} - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home - export HOME="${T}"/home -} - -src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi - - # Fixup a script to use awk instead of nawk - sed -i '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' "${S}"/runtime/tools/mve.awk \ - || die "mve.awk sed failed" - - # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i 's/\> "$c" ; done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]] ; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile - fi - - if version_is_at_least 7.3.122 ; then - cp "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk - fi - - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - if version_is_at_least 7.3 ; then - sed -i "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - fi - - eapply_user -} - -src_configure() { - local myconf - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - rm -f src/auto/configure - emake -j1 -C src autoconf - - # This should fix a sandbox violation (see bug 24447). The hvc - # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc* ; do - [[ -e ${file} ]] && addwrite $file - done - - # Let Portage do the stripping. Some people like that. - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # Keep Gentoo Prefix env contained within the EPREFIX - use prefix && myconf+=" --without-local-dir" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} -} - -src_compile() { - # The following allows emake to be used - emake -j1 -C src auto/osdef.h objects - - emake tools -} - -src_test() { :; } - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dodir /usr/{bin,share/{man/man1,vim}} - emake -C src \ - installruntime \ - installmanlinks \ - installmacros \ - installtutor \ - installtutorbin \ - installtools \ - install-languages \ - DESTDIR="${D}" \ - BINDIR="${EPREFIX}"/usr/bin \ - MANDIR="${EPREFIX}"/usr/share/man \ - DATADIR="${EPREFIX}"/usr/share - - keepdir ${vimfiles}/keymap - - # default vimrc is installed by vim-core since it applies to - # both vim and gvim - insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc - eprefixify "${ED}"/etc/vim/vimrc - - if use minimal ; then - # To save space, install only a subset of the files. - # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -fr "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} - rm -fr "${ED}${vimfiles}"/{macros,print,tools,tutor} - rm "${ED}"/usr/bin/vimtutor - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop - fi - - # These files might have slight security issues, so we won't - # install them. See bug #77841. We don't mind if these don't - # exist. - rm "${ED}${vimfiles}"/tools/{vimspell.sh,tcltags} 2>/dev/null - - newbashcomp "${FILESDIR}"/xxd-completion xxd - - # We shouldn't be installing the ex or view man page symlinks, as they - # are managed by eselect-vi - rm -f "${ED}"/usr/share/man/man1/{ex,view}.1 -} - -pkg_postinst() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags -} diff --git a/app-editors/vim-core/vim-core-8.0.1188.ebuild b/app-editors/vim-core/vim-core-8.0.1188.ebuild deleted file mode 100644 index 004a0a1c69e6..000000000000 --- a/app-editors/vim-core/vim-core-8.0.1188.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -VIM_VERSION="8.0" -inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/vim/vim.git" - EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} -else - SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz - https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -fi - -DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" - -SLOT="0" -LICENSE="vim" -IUSE="nls acl minimal" - -DEPEND="sys-devel/autoconf" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" - -S=${WORKDIR}/vim-${PV} - -pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. - unset LANG LC_ALL - export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home -} - -src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi - - # Fixup a script to use awk instead of nawk - sed -i \ - -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ - "${S}"/runtime/tools/mve.awk || die "sed failed" - - # See #77841. We remove this file after the tarball extraction. - rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" - - # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h - - # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. - # Hopefully this pattern won't break for a while at least. - # This fixes bug 29398 (27 Sep 2003 agriffis) - sed -i 's/\> "$c" || die "echo failed" - done - - # Try to avoid sandbox problems. Bug #114475. - if [[ -d "${S}"/src/po ]]; then - sed -i -e \ - '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ - "${S}"/src/po/Makefile || die "sed failed" - fi - - cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" - - # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 - sed -i -e \ - "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' - - eapply_user -} - -src_configure() { - local myconf - - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs - filter-flags -funroll-all-loops - - # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for - # everyone since previous flag filtering bugs have turned out to affect - # multiple archs... - replace-flags -O3 -O2 - - # Fix bug 18245: Prevent "make" from the following chain: - # (1) Notice configure.ac is newer than auto/configure - # (2) Rebuild auto/configure - # (3) Notice auto/configure is newer than auto/config.mk - # (4) Run ./configure (with wrong args) to remake auto/config.mk - sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" - - # Remove src/auto/configure file. - rm -v src/auto/configure || die "rm configure failed" - - emake -j1 -C src autoconf - - # This should fix a sandbox violation (see bug 24447). The hvc - # things are for ppc64, see bug 86433. - for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do - if [[ -e "${file}" ]]; then - addwrite $file - fi - done - - # Let Portage do the stripping. Some people like that. - export ac_cv_prog_STRIP="$(type -P true ) faking strip" - - # Keep Gentoo Prefix env contained within the EPREFIX - use prefix && myconf+=" --without-local-dir" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} -} - -src_compile() { - emake -j1 -C src auto/osdef.h objects - emake tools -} - -src_test() { :; } - -src_install() { - local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} - - dodir /usr/{bin,share/{man/man1,vim}} - emake -C src \ - installruntime \ - installmanlinks \ - installmacros \ - installtutor \ - installtutorbin \ - installtools \ - install-languages \ - DESTDIR="${D}" \ - BINDIR="${EPREFIX}"/usr/bin \ - MANDIR="${EPREFIX}"/usr/share/man \ - DATADIR="${EPREFIX}"/usr/share - - keepdir ${vimfiles}/keymap - - # default vimrc is installed by vim-core since it applies to - # both vim and gvim - insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc - eprefixify "${ED}"/etc/vim/vimrc - - if use minimal; then - # To save space, install only a subset of the files. - # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop - fi - - newbashcomp "${FILESDIR}"/xxd-completion xxd -} - -pkg_postinst() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags -} - -pkg_postrm() { - # Update documentation tags (from vim-doc.eclass) - update_vim_helptags -} diff --git a/app-editors/vim-core/vim-core-8.0.1699.ebuild b/app-editors/vim-core/vim-core-8.0.1699.ebuild new file mode 100644 index 000000000000..004a0a1c69e6 --- /dev/null +++ b/app-editors/vim-core/vim-core-8.0.1699.ebuild @@ -0,0 +1,214 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.0" +inherit estack vim-doc flag-o-matic versionator bash-completion-r1 prefix + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +SLOT="0" +LICENSE="vim" +IUSE="nls acl minimal" + +DEPEND="sys-devel/autoconf" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +S=${WORKDIR}/vim-${PV} + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir -p failed" + export HOME="${T}"/home +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches + fi + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i 's/\> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r5 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + eshopts_pop + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags +} diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 9363a718464a..059dfb9fdae0 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -3,8 +3,10 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87 DIST vim-8.0.1298.tar.gz 13395459 BLAKE2B 4b6e3c4443cd675dc3727e8609b89c422f66c7d32908b5136ee312d48427568a8236214c85135242269b6575e0e1336b0973395a6372664435f8bae4d7bee843 SHA512 7704c493359c1a922f876e4d6f3b4ad265d8ce974a59d51a39e5a4424251105250ffc803bcf6c6750daeb5e6376cbbfd24557b075eacf2b0274d7c432db2f681 DIST vim-8.0.1428.tar.gz 13415243 BLAKE2B 88f86c371d0a644212b9e4dc1a15d61244847037f36262a225c361bfc2799b741c128de21ac92bb3fb4a4955894e46d34dc01baa7cbf58f1371d772b36887103 SHA512 f635c53c7e2ca808dc1cb424e6e4b16d8c41c66a86c3c7584444dab3d2482904795fea7c071d65862ae6ac6b2b66b7ad5ac832e1e30f4624d46f220c6f41e2e9 DIST vim-8.0.1645.tar.gz 13535252 BLAKE2B a5c7463e85eed12825bdf46d15eb7e7513d62831eba76cbb90af875010b33662b7a6ef2c4c5cecddface415d75e97caf0a670e69835ecd3b4a89704f3b18b905 SHA512 367b9e205e776f84fcfbb92725afd5e7aa66898110d46dbea1a33f7b74c239559e829b5104c45360539c8f2b23c375ed59ccea7ee35a5dd10770400d9a7be085 +DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907ddf856f8644b466f1e0fbffefff3cd801b6bc5e49e62ffdf8805b0556058b9a913015a9f9fbe1a4f580132fd49 SHA512 b0fe8e1dc05fdc3758896caf4746da40988ca7604d77dbe78c47525cbf8f0d7e6c05f690687268eda581009050d4e02e93fb4d30734cbbab4cfd6a8a1488c1e7 EBUILD vim-8.0.1298.ebuild 8772 BLAKE2B 53c2fcb911fc27374cd00f4a1c5df9c30245540da78e4e3468d020fcd3149d0a0c57273eb1f4d38bd3f416604c1d29e08e49e8cf5a820f99bc28e82d1e999b6a SHA512 f200661012bc5505b0261aed18d360cfada37e93f84a30b74696c26175d7b369be9f0380c9b2db28324b4a8e0ae5fc888a328ae94a58e18d5112fc15b1d8cc5f EBUILD vim-8.0.1428.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065 EBUILD vim-8.0.1645.ebuild 8800 BLAKE2B 1eb5e4864b0e83c4c820b45e5791c2c22e8667799d9296d83f59b5cf07c263f2873deec04f6586e32bdca9dbd958876a971b67cc73b8f8bf3fd897692e60bcf0 SHA512 60d07415e38176b2ee9f16dc5c4f0d4da821e8505c0723791d1a38342bc1d1ab59ad8348f81950367859392849d69b385514fc16b1741cf95357f75291a84d83 -EBUILD vim-9999.ebuild 8800 BLAKE2B 1eb5e4864b0e83c4c820b45e5791c2c22e8667799d9296d83f59b5cf07c263f2873deec04f6586e32bdca9dbd958876a971b67cc73b8f8bf3fd897692e60bcf0 SHA512 60d07415e38176b2ee9f16dc5c4f0d4da821e8505c0723791d1a38342bc1d1ab59ad8348f81950367859392849d69b385514fc16b1741cf95357f75291a84d83 +EBUILD vim-8.0.1699.ebuild 8788 BLAKE2B 6f30fc561bc164d54c8b45d56f6589e4bd88bbaa87c419120ed5ae08a0821d4415062eb3e8002352f97faca2901048ff0ad9368485df95f0f41f6ee7bc55ebc2 SHA512 afa9c34b8bee7f3e5c066c48a70b61ef991e8ba56082254eb4796a62aef0bb01a250d813660d699c3814da1b343f97e69373474c9b0bb44064e1c841ca0de9a0 +EBUILD vim-9999.ebuild 8788 BLAKE2B 6f30fc561bc164d54c8b45d56f6589e4bd88bbaa87c419120ed5ae08a0821d4415062eb3e8002352f97faca2901048ff0ad9368485df95f0f41f6ee7bc55ebc2 SHA512 afa9c34b8bee7f3e5c066c48a70b61ef991e8ba56082254eb4796a62aef0bb01a250d813660d699c3814da1b343f97e69373474c9b0bb44064e1c841ca0de9a0 MISC metadata.xml 752 BLAKE2B 91fa465837da7fef20719826bbee3592d1d0f72f0015accaf425dad3999ee5f6d6f1ff6cdaa539dc1621d9735e1e97156824fb2e74e8707bae9c213719b20d4e SHA512 e49f531537dc14352cfd1550f77e830599addc6cfc9bc9f4a3a20449b0bab2ec5bfeb8923eab15a0585ff156c4b61cfcb5795caf0b9f6fcf14054559a1cd5476 diff --git a/app-editors/vim/vim-8.0.1699.ebuild b/app-editors/vim/vim-8.0.1699.ebuild new file mode 100644 index 000000000000..1fdeedc42c87 --- /dev/null +++ b/app-editors/vim/vim-8.0.1699.ebuild @@ -0,0 +1,311 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +VIM_VERSION="8.0" +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +PYTHON_REQ_USE="threads" +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~radhermit/vim/vim-8.0.0938-gentoo-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +SLOT="0" +LICENSE="vim" +IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby selinux tcl terminal vim-pager" +REQUIRED_USE=" + luajit? ( lua ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2:0= + nls? ( virtual/libintl ) + acl? ( kernel_linux? ( sys-apps/acl ) ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( + luajit? ( dev-lang/luajit:2= ) + !luajit? ( dev-lang/lua:0[deprecated] ) + ) + !minimal? ( + ~app-editors/vim-core-${PV} + dev-util/ctags + ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( ${RUBY_DEPS} ) + selinux? ( sys-libs/libselinux ) + tcl? ( dev-lang/tcl:0= ) + X? ( x11-libs/libXt ) +" + +DEPEND=" + ${RDEPEND} + sys-devel/autoconf + nls? ( sys-devel/gettext ) +" + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir failed" + export HOME="${T}"/home + + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches/ + fi + + # Fixup a script to use awk instead of nawk + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\> "$c" || die "echo failed" + done + + # conditionally make the manpager.sh script + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + _EOF_ + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite $file + fi + done + + if use minimal; then + myconf=( + --with-features=tiny + --disable-nls + --disable-multibyte + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --enable-multibyte + $(use_enable acl) + $(use_enable cscope) + $(use_enable gpm) + $(use_enable lua luainterp) + $(usex lua "--with-lua-prefix=${EPREFIX}/usr" "") + $(use_with luajit) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable python pythoninterp) + $(use_enable python python3interp) + $(use_enable racket mzschemeinterp) + $(use_enable ruby rubyinterp) + $(use_enable selinux) + $(use_enable tcl tclinterp) + $(use_enable terminal) + ) + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" + fi + + # don't test USE=X here ... see bug #19115 + # but need to provide a way to link against X ... see bug #20093 + myconf+=( + --enable-gui=no + --disable-darwin + $(use_with X x) + ) + fi + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + dosym vim /usr/bin/vimdiff + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update +} diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 01f04731da4a..1fdeedc42c87 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -4,8 +4,10 @@ EAPI=6 VIM_VERSION="8.0" PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -PYTHON_REQ_USE=threads -inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 +PYTHON_REQ_USE="threads" +USE_RUBY="ruby22 ruby23 ruby24 ruby25" + +inherit vim-doc flag-o-matic versionator bash-completion-r1 python-single-r1 ruby-single if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -45,7 +47,7 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) + ruby? ( ${RUBY_DEPS} ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) diff --git a/app-editors/yudit/Manifest b/app-editors/yudit/Manifest index 388161f88f6c..dc6c8a37bddd 100644 --- a/app-editors/yudit/Manifest +++ b/app-editors/yudit/Manifest @@ -1,5 +1,5 @@ DIST yudit-2.9.2.tar.gz 2831966 BLAKE2B a7ac8b3b538820e6101b57f8407fd99e9aaa4baf16fd3b09c4d4322b53b85fd631a3b36b6bfac214cc378fb4fd8b9ac30c2cb77959b680064e5ec625998ec6c0 SHA512 39bbd6f1696a97922a5db83b25b52609660ea77c7651cfde1d7189789e7d9a6298f6dd91acf17ab9d1bef1fabbdeb7bb1f9ab95a14198913c84c30154efd9e07 DIST yudit-2.9.6.tar.gz 2797142 BLAKE2B 76fb8e0ade65c84389db71b4100e458f5b70aebba27eea4b604bfcee08974060dcd2bab2d86586b5ba729d8d5090c943e825dfe58d71c609f0ca2f2e0c3900c9 SHA512 a9a0b6f6c44451cf2fefc4fc0bb1bbd9ffccd17c4c622dc35b08113245b3bb9f3ca949f3e7b9d2aa919ebf3840295c5e63c0297576e74a5f2d1fb99cfc97c46b EBUILD yudit-2.9.2.ebuild 774 BLAKE2B 5304e2e5e5f9dcaf5f8847f5709d5457b5d4ba2b15d3b4a555ace0cb9f91edc26e7d2521dc388c8a3f538d01ef92cc7416e8b6f5aa6c59ecbfb29e1e5bfbebf9 SHA512 7964bc24e1309add3b4a1a9368270db946cddab68ca27747f91122124cf9bb64e77e8d9f2ed366e29dee56e9dd174cf97118063585443ffe6e84af4028400744 -EBUILD yudit-2.9.6.ebuild 605 BLAKE2B 45d689a80e13e419d91ff82225d3187e8b0223085438f028c83eaf0b12220c3400367001b4bd698613bc68f5916b715c1dba13b6b511885350e269989bc92321 SHA512 e7282a4f3531726c3cc1d91d512f5681b0a88dfa149f8c5dfdaf984e34da7e3c357e710290ae38c73faf0f83bedee9ea8a23b78175080878c0778d8c9ce916fa +EBUILD yudit-2.9.6.ebuild 604 BLAKE2B 1aa89fd7b8a9aec721fa4b8a411b141ddcd4004b3bbc64b79ef558ebc76dae2ed8f3abf448a33f4647878aa820e1c7f49cc72d7cf810aaf43eab7e0e104f109b SHA512 44d0e87fb7aebb5b50b69d21179b83d3ff46b6ccb7f454f30dd7b8834d15699bd49446cdcbc6ee56e2cfd8de5a397d08069bac6c27247fe091a1283af5c32963 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/app-editors/yudit/yudit-2.9.6.ebuild b/app-editors/yudit/yudit-2.9.6.ebuild index 6fc40b09664c..e46388fb702c 100644 --- a/app-editors/yudit/yudit-2.9.6.ebuild +++ b/app-editors/yudit/yudit-2.9.6.ebuild @@ -9,7 +9,7 @@ SRC_URI="http://yudit.org/download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND="x11-libs/libX11" DEPEND="${RDEPEND} -- cgit v1.2.3