diff options
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/Manifest.gz | bin | 14056 -> 14058 bytes | |||
-rw-r--r-- | app-editors/gvim/Manifest | 6 | ||||
-rw-r--r-- | app-editors/gvim/gvim-8.0.1645.ebuild | 371 | ||||
-rw-r--r-- | app-editors/gvim/gvim-9999.ebuild | 2 | ||||
-rw-r--r-- | app-editors/gvim/metadata.xml | 1 | ||||
-rw-r--r-- | app-editors/neovim/Manifest | 2 | ||||
-rw-r--r-- | app-editors/neovim/metadata.xml | 2 | ||||
-rw-r--r-- | app-editors/scite/Manifest | 2 | ||||
-rw-r--r-- | app-editors/scite/scite-4.0.2.ebuild | 4 | ||||
-rw-r--r-- | app-editors/vim-core/Manifest | 2 | ||||
-rw-r--r-- | app-editors/vim-core/vim-core-8.0.1645.ebuild | 214 | ||||
-rw-r--r-- | app-editors/vim/Manifest | 6 | ||||
-rw-r--r-- | app-editors/vim/metadata.xml | 1 | ||||
-rw-r--r-- | app-editors/vim/vim-8.0.1645.ebuild | 309 | ||||
-rw-r--r-- | app-editors/vim/vim-9999.ebuild | 2 | ||||
-rw-r--r-- | app-editors/vis/Manifest | 6 | ||||
-rw-r--r-- | app-editors/vis/vis-0.5.ebuild (renamed from app-editors/vis/vis-0.4.ebuild) | 10 |
17 files changed, 919 insertions, 21 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 282483966109..b91d36da3030 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index 0a5c69330711..46720f3fd815 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -7,9 +7,11 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87 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 gvim-8.0.0386.ebuild 11569 BLAKE2B 2e9803cd0cad4f6d9ba86f7a4f9242a1850c4017a1b7cc894ab57d9c450f173d9f24f7deb2a2f7c26a4598bfb79d2bfecfc29c777473e0759c6e89fcd99cb5d6 SHA512 93d54860172f0e8caf22d129d55a26276e4ba0d68f91c74dcc969fb2f738f3197ee77de983d65c9533029a04e0cd74fbefabf6802ecba6bb0d4ba0807b68783c EBUILD gvim-8.0.1188.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf EBUILD gvim-8.0.1298.ebuild 10469 BLAKE2B b0f04d4d5a1df2854184d2d0f9b64129524af078e86096704348a86710b8b551b77f3d8b0a2071a56a650cd747b45cf437e58ec7a3259b5b1332c46de1dd7f2e SHA512 27f0671ee4de3ffbbd4d6d56c09550fe4774ec1d9b5b45513f6314719e1f1c6e0ea55215dfe5b88c253d16bd97bbcc7cbf734d7c9049b11df625da300e7c589c EBUILD gvim-8.0.1428.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf -EBUILD gvim-9999.ebuild 10477 BLAKE2B 764132ab93aa42aeef1f26fdfaf1095630ddcbdf148681d2ff929611a6fc736ab7c325947d39752dbe112c869cdf1ff51fb0419c9316f9e05eb0440a662cc38f SHA512 ca3474ac8e4ffa20bb0d96677f4bee91683cafeceb6db4d2654c4d3f3037adc7a5a78bf57bc019222fbde96d06a5731c4d6474324ac676941115e728dcc085bf -MISC metadata.xml 675 BLAKE2B 4c96806a5744b61f168512c28512c9c6114ca42522ff8ed266cb14c5e16ef538e4de8aa15ce233cf1044f98dabf27c6654592eb296e4a83175940f88ddd4b1a3 SHA512 df75c9e935ae47b8961c8b6b984483b8032e39d3833ffcf4784e2630cea870579d45ef5f104b71d6b35f4128ef689394edd72510fce82a76e596749ce69d835d +EBUILD gvim-8.0.1645.ebuild 10495 BLAKE2B 2c3e61a00479e7adf15fdd2bb32a3eb4c806c67b40aefa068bda7270a5af7cd27ed3bd02c04c07d60697b5710e47a30097e925d86a88062a3fb3bdcf35636b20 SHA512 6335c49298a9e01775b0baf9f52bb8aae61bd6cae0ecf51f43c1b5b9fc19fbd8b2919c02280e38cf391a80bce364ff83b7eddcc0acdf2f0c64e58ff8609c4296 +EBUILD gvim-9999.ebuild 10495 BLAKE2B 2c3e61a00479e7adf15fdd2bb32a3eb4c806c67b40aefa068bda7270a5af7cd27ed3bd02c04c07d60697b5710e47a30097e925d86a88062a3fb3bdcf35636b20 SHA512 6335c49298a9e01775b0baf9f52bb8aae61bd6cae0ecf51f43c1b5b9fc19fbd8b2919c02280e38cf391a80bce364ff83b7eddcc0acdf2f0c64e58ff8609c4296 +MISC metadata.xml 578 BLAKE2B a0b7e41324455706748f79109affec89e72dece0b41346d0cc804742cc7e5aa88f89556623b1aac4f53387afe6e6145049079b1cd44d3411bcf2f8ee8c7c2bfd SHA512 b2db961a6e59b803e2371c4e6dda496917d6c5e332f36062be8dbfa4fb47b4b640d8deb6871c9ff3c5a527fdf9c16aa13f14b9e0a37f93a3a10c6f6b57808126 diff --git a/app-editors/gvim/gvim-8.0.1645.ebuild b/app-editors/gvim/gvim-8.0.1645.ebuild new file mode 100644 index 000000000000..1de46facaa9c --- /dev/null +++ b/app-editors/gvim/gvim-8.0.1645.ebuild @@ -0,0 +1,371 @@ +# Copyright 1999-2017 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 + +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 ~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? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) + 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/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug 43885 (20 Mar 2004 agriffis) + sed -i -e \ + 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$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 b19e4d692308..1de46facaa9c 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -66,7 +66,7 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) + ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) session? ( x11-libs/libSM ) tcl? ( dev-lang/tcl:0= ) diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml index bd2205f57da1..aa4ea747bcc9 100644 --- a/app-editors/gvim/metadata.xml +++ b/app-editors/gvim/metadata.xml @@ -7,7 +7,6 @@ </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> </use> diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 4846db156e3d..72800c5979e9 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -4,4 +4,4 @@ DIST neovim-0.2.2.tar.gz 8325879 BLAKE2B dbf43c5927b8c8719adae9a3f73c57429de47f1 EBUILD neovim-0.2.0-r1.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5 EBUILD neovim-0.2.2-r1.ebuild 1878 BLAKE2B 8f2ddcdb916fe4ce6e83626c1b86ddad10253e1cf5ebc5f41789fc52d2a002e7ed8f07cac17a5551aae1050fa6f5e3b3214436d8f9a63afd67cadb982f974db5 SHA512 095e7760a09f76e1940dfd06b02a786b29c7647d123232287da673677b27b613c320507dc206d74fe9ad6420e2bc3115b266488529d83719f1f0105d692afb20 EBUILD neovim-9999.ebuild 1876 BLAKE2B 969233179105fd7dd23ffe4d4abf05db8276c8ff092651032731a6548778820805e8a4e4c0a2e40d463a11d1898e8c0e47ca76f38802df2119b70cf250932dba SHA512 3bd497e867430446993f46ad6eb038a57e0915703e8ce800040f76ae6b57e9c015241cdc8eff9a08d45f9ff71cbce2e99fc5bd7c91541e751817a54ad99498c5 -MISC metadata.xml 823 BLAKE2B 6aac695d8e1ceef11309dca9d529808f890b67665688450e683f1a980f09909d2e4c2ea165a2aeac623f6224bc00b7e67d9e67c27a623a13595710e60e7e49bf SHA512 b87aa5497b7c5e9b61647cfd3413e7c6d232698952b778d4ed3a39d4c2a39e6947a5b7e19ef803f4172dda0d2465651f19a127d4aa5b37004224e5c3ec86a94d +MISC metadata.xml 720 BLAKE2B fda1bb6780b08bc3eeef497f01932dde422aa9ef5bdf3e713248c5d1234b1511b6c534ec761b2979861526a1eac54d63b36543bf2b36d0a6a0a2edc9cc58caea SHA512 8ac4d9b779ee3b6c13c16a7071c0f3a67ce867ac9538f3e89a420e16d2a8d2671f901fad4df6e4709141e5af10290543dfb5e79150a0bffb994456150c4fc77f diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml index 158212f33e00..57f11481bec1 100644 --- a/app-editors/neovim/metadata.xml +++ b/app-editors/neovim/metadata.xml @@ -11,8 +11,6 @@ <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag> <flag name="remote">Enable support for remote options using nvr</flag> <flag name="tui">Build the neovim unix tui</flag> - <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of - <pkg>dev-lang/lua</pkg></flag> </use> <upstream> <remote-id type="github">neovim/neovim</remote-id> diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest index 9146ac240684..5792ae1b8f3c 100644 --- a/app-editors/scite/Manifest +++ b/app-editors/scite/Manifest @@ -4,5 +4,5 @@ DIST scite365.tgz 2391190 BLAKE2B 0cd2b1b24bcd15815357125725b1453935dc944ca1ddbd DIST scite402.tgz 2424648 BLAKE2B 84a331865310058d26ca45a25b99d98a7c3374d0463024e31694e2ebbd519a20e8e368dc1dfabc2534e8f015fc95ca53382bc223476b882a7be543ffdc44ae2b SHA512 97898cbb8675d013dd91828792de1c71e3f013b21c59c5112ddc00e7ee35c2ba8cc29e2c3256b91171e052145a25cddfd0034505e3c185999c734504bb702283 EBUILD scite-3.5.5.ebuild 2116 BLAKE2B 6804a7de3d7d491d901a7ed2c0acaded903864579b1045fea2845ff63754f35328ad39e1308e9c4462cbe63d147e3d22844dbef37b0469235a8356e4de722bad SHA512 3cb6bea06bb846d448eb5643037cf961d916fdcca96efce4202fb4eb351741300f170b91c777831129dab523fc1644bf1955b586811cdb3b02dcd4a93a9f98bb EBUILD scite-3.6.5-r1.ebuild 2242 BLAKE2B 2203a916c7e4b9eeb2c78dc15aa8bab6ba18021c8796ee5b3eb03f198d04360153622fbf031bfe5bac10ce1e1880cb1bea61d5ebca4b068daf272ece5f19ecee SHA512 1fa0330ecbaef2dd14b39eb5b285a6ce7db9ee227749675e9658d278b3c0cab26920f633525717e129e7a95ea134b8cd95aab839ea180c8099512d408c2c8969 -EBUILD scite-4.0.2.ebuild 2698 BLAKE2B e647063457f5c841dc7160673c21b9948cecb0d385153d36468db40af2ef01e8184adb46f84cd3d6bf1dca46a9183db73949a778a808395005ed26e0a8b31445 SHA512 3eb0d670b8a34f87ca2f7e8d1415f72884f07e5bb5815091db4380386b882b961ccf4273a0d48a1376cd32d8374f706e502eee9ba79bef83517f0c9ec6e0ec0b +EBUILD scite-4.0.2.ebuild 2697 BLAKE2B 6f4a3d594f4a98980006c4b9c4ff8e38ccd57440ba7813b780fdc9d2a8aa62a51eae65dd23d59ef01ed8b095f5e4f41f4aca03f1ff141dee76652ca661a85131 SHA512 4e45e4056e891f35ccd46518523d3cfa6f10fd7fcdd95c2d1aecc3abf88c1556538b0f80cddde7fd3cd8adb737a9575c5dd9c165b4a5560f8f7762b713e92554 MISC metadata.xml 446 BLAKE2B d239ff5dbfaf214b40d63422d94f2cabfb2b66946ad9ef51d69a03829fa73cff46fcaba07dd4dba740c7825e5afe84f6b5fed51e0cd2ebecbc12434d9f2af0e7 SHA512 a72f8d7de688aadff2bfabea5f61abc2d68768ef9d64feb45ccb002a9565cb329edfb951ba777add29356b7c8503b2a9637cb8a8661767480bc85f80724caa79 diff --git a/app-editors/scite/scite-4.0.2.ebuild b/app-editors/scite/scite-4.0.2.ebuild index 0134016bc35c..36a304e51703 100644 --- a/app-editors/scite/scite-4.0.2.ebuild +++ b/app-editors/scite/scite-4.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz" LICENSE="HPND lua? ( MIT )" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" IUSE="lua" RDEPEND="dev-libs/glib:= diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index b6dc7bf1169e..db67bb15656a 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -6,9 +6,11 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87 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 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-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.1645.ebuild b/app-editors/vim-core/vim-core-8.0.1645.ebuild new file mode 100644 index 000000000000..004a0a1c69e6 --- /dev/null +++ b/app-editors/vim-core/vim-core-8.0.1645.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/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug 43885 (20 Mar 2004 agriffis) + sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$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 759cc9a1aea9..322347e4aa7c 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -5,9 +5,11 @@ DIST vim-8.0.0938-gentoo-patches.tar.bz2 2316 BLAKE2B 05a87f32fc5cc65e7f5e4e5a87 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-8.0.0386.ebuild 10112 BLAKE2B be488042fead28b68b34d1a69e5243beca8815f298a01502bcf34d43f9845d760cd1f14eb4c2be5d73595fe20a53cad116a6009eab2a99c016f9c25280f45493 SHA512 7dd69bd0129c62720819eb65888c89b0e6670964d6558be11ad3a694a4d1d6c09e3d5c3c1f102d99fde71ac645cc6f026e4b2acfde9192f4b768dbaaf3a52d82 EBUILD vim-8.0.1188.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065 EBUILD vim-8.0.1298.ebuild 8772 BLAKE2B 53c2fcb911fc27374cd00f4a1c5df9c30245540da78e4e3468d020fcd3149d0a0c57273eb1f4d38bd3f416604c1d29e08e49e8cf5a820f99bc28e82d1e999b6a SHA512 f200661012bc5505b0261aed18d360cfada37e93f84a30b74696c26175d7b369be9f0380c9b2db28324b4a8e0ae5fc888a328ae94a58e18d5112fc15b1d8cc5f EBUILD vim-8.0.1428.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065 -EBUILD vim-9999.ebuild 8782 BLAKE2B d503bbec09a4710ecae79ed853f8ff733c89777ec23b08316d104d35fbedb81a1e8557aaaf69f104dab6969d9f09cdd0ea8ba223527a7e308de965ae923899cf SHA512 846b01412281def6ea63f4ec2bb313e8619849d4a8beedf7172f71c982000db7f3afb5e39662394609d95a3a537afd751cefacd49102e431a5a6ffe673dd0065 -MISC metadata.xml 849 BLAKE2B c0edeb64be8810f6aafa20ed67a4eec6a0961ff6af3b1390217fb185ceb03a405239dd1ebc4f1f76b1dfb3df3ef841796b0881eea8e8db810afdc828580d9b5f SHA512 a4369827eaaa72339f17b1c673aa5f71625b657afad9d2f6079ffc6fd23775aa8f6c52aca0cb193b4815bc6ca9918617c251767343f7044ab79b83b69038c58b +EBUILD vim-8.0.1645.ebuild 8800 BLAKE2B 1eb5e4864b0e83c4c820b45e5791c2c22e8667799d9296d83f59b5cf07c263f2873deec04f6586e32bdca9dbd958876a971b67cc73b8f8bf3fd897692e60bcf0 SHA512 60d07415e38176b2ee9f16dc5c4f0d4da821e8505c0723791d1a38342bc1d1ab59ad8348f81950367859392849d69b385514fc16b1741cf95357f75291a84d83 +EBUILD vim-9999.ebuild 8800 BLAKE2B 1eb5e4864b0e83c4c820b45e5791c2c22e8667799d9296d83f59b5cf07c263f2873deec04f6586e32bdca9dbd958876a971b67cc73b8f8bf3fd897692e60bcf0 SHA512 60d07415e38176b2ee9f16dc5c4f0d4da821e8505c0723791d1a38342bc1d1ab59ad8348f81950367859392849d69b385514fc16b1741cf95357f75291a84d83 +MISC metadata.xml 752 BLAKE2B 91fa465837da7fef20719826bbee3592d1d0f72f0015accaf425dad3999ee5f6d6f1ff6cdaa539dc1621d9735e1e97156824fb2e74e8707bae9c213719b20d4e SHA512 e49f531537dc14352cfd1550f77e830599addc6cfc9bc9f4a3a20449b0bab2ec5bfeb8923eab15a0585ff156c4b61cfcb5795caf0b9f6fcf14054559a1cd5476 diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml index fb8e0f11fb37..f65afcd7454c 100644 --- a/app-editors/vim/metadata.xml +++ b/app-editors/vim/metadata.xml @@ -6,7 +6,6 @@ <name>Gentoo Vim Project</name> </maintainer> <use> - <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> <flag name="terminal">Enable terminal emulation support</flag> <flag name="vim-pager">Install vimpager and vimmanpager links</flag> diff --git a/app-editors/vim/vim-8.0.1645.ebuild b/app-editors/vim/vim-8.0.1645.ebuild new file mode 100644 index 000000000000..01f04731da4a --- /dev/null +++ b/app-editors/vim/vim-8.0.1645.ebuild @@ -0,0 +1,309 @@ +# 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 versionator bash-completion-r1 python-single-r1 + +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? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) + 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/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug 43885 (20 Mar 2004 agriffis) + sed -i -e \ + 's/ libc\.h / /' \ + "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$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 5b4fa3b57665..01f04731da4a 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -45,7 +45,7 @@ RDEPEND=" perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) racket? ( dev-scheme/racket ) - ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) + ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) ) selinux? ( sys-libs/libselinux ) tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest index 1637dbf0d17e..b41762fede35 100644 --- a/app-editors/vis/Manifest +++ b/app-editors/vis/Manifest @@ -1,5 +1,5 @@ -DIST vis-0.4.tar.gz 381046 BLAKE2B 612d9f17c5ffb00be9e5c14da0d52257e55e53250cb9ba80750feaf5d90caa53aed0f02e32413a10f161e121019cf758902158ddeac09c2516d18779f4264cda SHA512 d8fcf667ecad7b32752d6c5dbd004544e1a9283775d54d93c24ce8f314b98154aed5c6014cc03223d8427c2b1e3fd0d4b348dfa12ce30236fddd93b34521ee5f -DIST vis-test-0.2.tar.gz 97770 BLAKE2B 9f8e31eb70ab8f9ce089f66ef29520e8250e02de375f9f8f0e33722c6a392bc6e04e7122728826708b305fb439c2b39f7fe3e233d7be162930aa46bf31bdb005 SHA512 892effa08c80c75e78eeb993ba8a0ddc110cc6f654fa1bf970454c35c839e9467b0ab41578f49af1fba0514c61f887fa044b9d01ab58f4dd749582a9550a2c29 -EBUILD vis-0.4.ebuild 1517 BLAKE2B b337caa62c91c870ffa172995a1ad5332cbfb7384447f7c7d45e7329565128161da6ed3ae17596c6d3cb8bd4387a6070c3845868da02554a6947935da57b82e3 SHA512 3cf83463343ec55e19422488f98ebb6c48d9144a9f6d0f2970ac4d9bbad36ff277f10e48f850bf4a533a88a5eed85e021db00b895bc0fa30c05a54a819e00ddc +DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780 +DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5 +EBUILD vis-0.5.ebuild 1594 BLAKE2B 6e2aef32562145a61f3ce5a55096d0802d8666b4d4d616c5244b4c0017f9e6d91c9fb8a53d5b2858821c8a183bf46195118e92c3c9e6fd8bfc216fc6ca9d9e64 SHA512 0dceedb365bd7543ed2f1f4462fa7020eebbc1e8cac6ac8ac83f0f52829d703f51b9faedafc73e1b4eda01aef4cb206e47703ce2702666069bd87be3d8c5bd03 EBUILD vis-9999.ebuild 1303 BLAKE2B 929cc3a3ee02777d1802dc646487ca33fe7896e3cd794693b2291451e7fee57be7f8c9627f2821daef411ecebd0e2569e383a570540c8301910bfe804ab3933c SHA512 64992a3c8dd0bc80115739bd441c89b089873d78edd273fd36164cf6449f66ee736970ea7dd24115a714489090b9c1605c9e0372e70b01a94aca0e918758228b MISC metadata.xml 593 BLAKE2B c1f2c845ed329592118b0424bdbd4ff75d690fc657b60d6c1340fb668f2dc32cc34d807e3be77916630ea1db55c8d8d84db5d98b7763f6c1a69555c7b028230c SHA512 c9fce79e630218ffd9300592ca35a700bc5291a2a8453b30a1e33a4e64d03d9c5cf4f95357fdd87fc7b206a5d113b52b182dfb34ae713273992dc5d295a89730 diff --git a/app-editors/vis/vis-0.4.ebuild b/app-editors/vis/vis-0.5.ebuild index 7d45b495cee2..33e87890b268 100644 --- a/app-editors/vis/vis-0.4.ebuild +++ b/app-editors/vis/vis-0.5.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -MY_PTV=0.2 +MY_PTV=0.3 DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" HOMEPAGE="https://github.com/martanne/vis" -SRC_URI="https://github.com/martanne/vis/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/martanne/vis-test/archive/v${MY_PTV}.tar.gz -> vis-test-${MY_PTV}.tar.gz )" +SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/vis-v${PV}.tar.gz -> ${P}.tar.gz + test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz -> vis-test-${MY_PTV}.tar.gz )" LICENSE="ISC" SLOT="0" KEYWORDS="~amd64 ~x86" @@ -22,6 +22,8 @@ DEPEND="dev-libs/libtermkey RDEPEND="${DEPEND} app-eselect/eselect-vi" +S="${WORKDIR}/vis-v${PV}" + src_prepare() { if use test; then rm -r test || die |