diff options
Diffstat (limited to 'app-editors')
88 files changed, 1570 insertions, 518 deletions
diff --git a/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild b/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild index 525dbf8eacc4..d32f09c9db74 100644 --- a/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild +++ b/app-editors/curses-hexedit/curses-hexedit-0.9.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # There's already a "hexedit" package in the tree, so name this one differently @@ -13,7 +13,7 @@ SRC_URI="http://www.rogoyski.com/adam/programs/hexedit/${MY_P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" sys-libs/ncurses:= diff --git a/app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild b/app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild deleted file mode 100644 index ec30084e82d0..000000000000 --- a/app-editors/curses-hexedit/curses-hexedit-0.9.7.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# There's already a "hexedit" package in the tree, so name this one differently - -EAPI="5" - -inherit toolchain-funcs eutils autotools - -MY_P=${P/curses-} -DESCRIPTION="full screen curses hex editor (with insert/delete support)" -HOMEPAGE="https://www.rogoyski.com/adam/programs/hexedit/" -SRC_URI="http://www.rogoyski.com/adam/programs/hexedit/${MY_P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="sys-libs/ncurses:=" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-ncurses-pkg-config.patch - eautoreconf -} - -src_configure() { - econf --program-prefix=curses- -} diff --git a/app-editors/elvis/elvis-2.2.0-r6.ebuild b/app-editors/elvis/elvis-2.2.0-r6.ebuild index 2317c7acda26..fba833b8c828 100644 --- a/app-editors/elvis/elvis-2.2.0-r6.ebuild +++ b/app-editors/elvis/elvis-2.2.0-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris" +KEYWORDS="amd64 ppc ppc64 x86 ~ppc-macos ~sparc-solaris" IUSE="X" RDEPEND=">=sys-libs/ncurses-5.7-r7:0= diff --git a/app-editors/elvis/elvis-2.2.0-r7.ebuild b/app-editors/elvis/elvis-2.2.0-r7.ebuild index aefc68845c36..c0d8cacf6415 100644 --- a/app-editors/elvis/elvis-2.2.0-r7.ebuild +++ b/app-editors/elvis/elvis-2.2.0-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris" IUSE="X" RDEPEND=" diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild index f00248229d78..5b8d53fb3710 100644 --- a/app-editors/elvis/elvis-2.2.0-r8.ebuild +++ b/app-editors/elvis/elvis-2.2.0-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cs.pdx.edu/pub/elvis/${PN}-${MY_PV}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~sparc-solaris" IUSE="X doc" RDEPEND=" diff --git a/app-editors/emacs/emacs-23.4-r20.ebuild b/app-editors/emacs/emacs-23.4-r20.ebuild index 32bef55e4fff..9c7889a4cadf 100644 --- a/app-editors/emacs/emacs-23.4-r20.ebuild +++ b/app-editors/emacs/emacs-23.4-r20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="23" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="alsa aqua athena dbus games gconf gif gpm gtk gui gzip-el jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars Xaw3d xft +xpm" RDEPEND="acct-group/mail diff --git a/app-editors/emacs/emacs-24.5-r9.ebuild b/app-editors/emacs/emacs-24.5-r9.ebuild index f52f447b679e..62c7cd0a20a5 100644 --- a/app-editors/emacs/emacs-24.5-r9.ebuild +++ b/app-editors/emacs/emacs-24.5-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" RDEPEND="acct-group/mail diff --git a/app-editors/emacs/emacs-25.3-r8.ebuild b/app-editors/emacs/emacs-25.3-r8.ebuild index 466ee76552fb..e43700a2f211 100644 --- a/app-editors/emacs/emacs-25.3-r8.ebuild +++ b/app-editors/emacs/emacs-25.3-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="25" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm zlib" RDEPEND="acct-group/mail diff --git a/app-editors/emacs/emacs-26.3-r3.ebuild b/app-editors/emacs/emacs-26.3-r3.ebuild index 80915e9112bc..60641dd7a88c 100644 --- a/app-editors/emacs/emacs-26.3-r3.ebuild +++ b/app-editors/emacs/emacs-26.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="26" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gui gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?] diff --git a/app-editors/emacs/emacs-27.1-r2.ebuild b/app-editors/emacs/emacs-27.1-r2.ebuild index e6c3aef737c4..b78766488d2d 100644 --- a/app-editors/emacs/emacs-27.1-r2.ebuild +++ b/app-editors/emacs/emacs-27.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ else fi SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" diff --git a/app-editors/emacs/emacs-27.1-r3.ebuild b/app-editors/emacs/emacs-27.1-r3.ebuild index f97171f9c250..87ed9455b8fd 100644 --- a/app-editors/emacs/emacs-27.1-r3.ebuild +++ b/app-editors/emacs/emacs-27.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ else fi SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" diff --git a/app-editors/emacs/emacs-27.1.9999-r1.ebuild b/app-editors/emacs/emacs-27.1.9999-r1.ebuild index 3b09fd2768c3..f4d96c1f74fc 100644 --- a/app-editors/emacs/emacs-27.1.9999-r1.ebuild +++ b/app-editors/emacs/emacs-27.1.9999-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ else fi SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild index e6f3ac9b3448..57cb4bc23cf8 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ else fi SLOT="${PV%%.*}" [[ ${PV} == *.*.* ]] && SLOT+="-vcs" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" fi DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest index e9433da16461..a6aa3a829921 100644 --- a/app-editors/gedit-plugins/Manifest +++ b/app-editors/gedit-plugins/Manifest @@ -1 +1,2 @@ DIST gedit-plugins-3.36.2.tar.xz 980648 BLAKE2B 37f55b742258b233d161ce808483ba10f158b951f06eaee53d966edc275dad67a2d11eae342fed7bc9b185d1309c5795f645eabf24db99a6e6551a3dae19ddb6 SHA512 d46a5ec69f69838144333ca3e66abc7c64cdb3248877b38298f869027dd3bab16102957e723ad1b0d3c6af55745c2b7ce321949acb2575734c649a388bb0100b +DIST gedit-plugins-3.38.1.tar.xz 957616 BLAKE2B 9cf5fe5343b513bd841add5d4e85f8fe2e8f62524af7c124bdfc41b81e653a41d1a7417f8cc06f764cca730927f471598cae914a1581c5cd3712b89c464a075d SHA512 d5cc3e82ac6a488f5ab06eaf4eb5ad32bdbe50b74f2f215e114b5cb3bb0a089da00caa3815d6638a679c1c902983a0754a16ef88e15ff88d8321a247288ad237 diff --git a/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild index 6675bc00061b..810f4cc9a3d5 100644 --- a/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-3.36.2.ebuild @@ -34,7 +34,7 @@ RDEPEND=" python? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' - >=app-editors/gedit-3.36[introspection,python,${PYTHON_SINGLE_USEDEP}] + >=app-editors/gedit-3.36[introspection(+),python,${PYTHON_SINGLE_USEDEP}] dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}] >=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}] dev-python/pycairo[${PYTHON_MULTI_USEDEP}] @@ -94,7 +94,7 @@ src_configure() { src_install() { meson_src_install - python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" + use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" } pkg_postinst() { diff --git a/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild new file mode 100644 index 000000000000..56fca12c9a17 --- /dev/null +++ b/app-editors/gedit-plugins/gedit-plugins-3.38.1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE="xml" +VALA_MIN_API_VERSION="0.28" + +inherit gnome.org gnome2-utils meson python-single-r1 vala xdg + +DESCRIPTION="Collection of extra plugins for the gedit Text Editor" +HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins" + +LICENSE="GPL-2+" +KEYWORDS="~amd64 ~x86" +SLOT="0" + +IUSE="charmap git +python terminal vala" +REQUIRED_USE=" + charmap? ( python ) + git? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + terminal? ( python ) +" + +RDEPEND=" + >=dev-libs/libpeas-1.14.1[gtk] + >=app-editors/gedit-3.38 + + >=dev-libs/glib-2.32:2 + >=x11-libs/gtk+-3.9:3 + >=x11-libs/gtksourceview-4.0.2:4 + + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=app-editors/gedit-3.36[python,${PYTHON_SINGLE_USEDEP}] + dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}] + >=dev-python/dbus-python-0.82[${PYTHON_MULTI_USEDEP}] + dev-python/pycairo[${PYTHON_MULTI_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}] + ') + >=x11-libs/gtk+-3.9:3[introspection] + >=x11-libs/gtksourceview-4.0.2:4[introspection] + x11-libs/pango[introspection] + x11-libs/gdk-pixbuf:2[introspection] + ) + charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] ) + git? ( >=dev-libs/libgit2-glib-0.0.6[python] ) + terminal? ( >=x11-libs/vte-0.52:2.91[introspection] ) +" # vte-0.52+ for feed_child API compatibility +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxml2 + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + use vala && vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + -Dplugin_bookmarks=true + $(meson_use python plugin_bracketcompletion) + $(meson_use charmap plugin_charmap) + $(meson_use python plugin_codecomment) + $(meson_use python plugin_colorpicker) + $(meson_use python plugin_colorschemer) + $(meson_use python plugin_commander) + -Dplugin_drawspaces=true + $(meson_use vala plugin_findinfiles) + $(meson_use git plugin_git) + $(meson_use python plugin_joinlines) + $(meson_use python plugin_multiedit) + $(meson_use python plugin_sessionsaver) + $(meson_use python plugin_smartspaces) + $(meson_use python plugin_synctex) + $(meson_use terminal plugin_terminal) + $(meson_use python plugin_textsize) + $(meson_use python plugin_translate) + -Dplugin_wordcompletion=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index a226fc44cd02..25c9e8d17193 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1,2 +1,3 @@ DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d DIST gedit-3.36.2.tar.xz 14770004 BLAKE2B 505c01aa60e64e418a09c9fbd0c397a487c612117c3068e35a41b075a8d5440cf85daf6e011eeacee7b228306342cc5c4a3dc1af24d52583c9a896531355f6d0 SHA512 20c3592aaf08ad4a5842b14ecb1eb0c9ddbef190412dc3f70b60bbf6125c9c4791a48260c89402ce4773720ae65b36fab510f9d1e104f548e243d11bc49279b5 +DIST gedit-3.38.1.tar.xz 6861368 BLAKE2B 3b202dbb7df8e91b58bd345fcaa309546af07bce60dc4638a3c344996d6c04ef7fe8a4824360c0f55970b759f9d7e2929c207992a9c80ad686d39e94ff741b7a SHA512 cd52cbcece3b007692294ab01b95fae7deb744b08a44da2d3cafa82a86d94c104abcdd4dcbe10630e0d633c8cc3c75f5e5dc6c8452a8c4bc2e6bb3c0de7d5547 diff --git a/app-editors/gedit/files/3.38-make-gspell-optional.patch b/app-editors/gedit/files/3.38-make-gspell-optional.patch new file mode 100644 index 000000000000..f1197ebb5222 --- /dev/null +++ b/app-editors/gedit/files/3.38-make-gspell-optional.patch @@ -0,0 +1,59 @@ +From 4f32833325a6c95ec451adf1a8d9691cceb14dd8 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sun, 16 Aug 2020 23:20:31 +0300 +Subject: [PATCH 1/2] build: Make gspell optional + +--- + meson.build | 3 ++- + meson_options.txt | 4 ++++ + plugins/spell/meson.build | 4 ++++ + 3 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index acaad0dad..2c5dccb82 100644 +--- a/meson.build ++++ b/meson.build +@@ -54,7 +54,7 @@ deps_basic_list = [ + dependency('gobject-introspection-1.0'), + ] + +-gspell_dep = dependency('gspell-1', version: '>= 1.0') ++gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell')) + python3 = python.find_installation('python3') + + # Configurations +@@ -94,3 +94,4 @@ summary('Prefix', get_option('prefix')) + summary('API documentation', get_option('gtk_doc')) + summary('User documentation', get_option('user_documentation')) + summary('Require all tests', get_option('require_all_tests')) ++summary('Spell checker plugin', get_option('spell').enabled().to_string()) +diff --git a/meson_options.txt b/meson_options.txt +index 4e842d1ea..bb3923dd1 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -14,6 +14,10 @@ option( + description: 'Require that all tests can be run, even those that depend on third party programs' + ) + ++option('spell', ++ type: 'feature', value: 'enabled', ++ description: 'Build spell checking plugin') ++ + # This option exists for the developers, to speed up the install. + option( + 'user_documentation', +diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build +index 8ce7634b7..cccb42fc1 100644 +--- a/plugins/spell/meson.build ++++ b/plugins/spell/meson.build +@@ -1,3 +1,7 @@ ++if not gspell_dep.found() ++ subdir_done() ++endif ++ + libspell_sources = files( + 'gedit-spell-app-activatable.c', + 'gedit-spell-plugin.c', +-- +2.26.2 + diff --git a/app-editors/gedit/files/3.38-make-python-optional.patch b/app-editors/gedit/files/3.38-make-python-optional.patch new file mode 100644 index 000000000000..7dccb18191cd --- /dev/null +++ b/app-editors/gedit/files/3.38-make-python-optional.patch @@ -0,0 +1,86 @@ +From 9ed333a94ea15f74c420cbb2766909953aa6acb6 Mon Sep 17 00:00:00 2001 +From: Mart Raudsepp <leio@gentoo.org> +Date: Sun, 16 Aug 2020 23:34:42 +0300 +Subject: [PATCH 2/2] build: Make python optional + +--- + gedit/meson.build | 2 ++ + meson.build | 2 ++ + meson_options.txt | 4 ++++ + plugins/meson.build | 9 ++++++--- + 4 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/gedit/meson.build b/gedit/meson.build +index 9fc81468e..5e808a2d8 100644 +--- a/gedit/meson.build ++++ b/gedit/meson.build +@@ -197,10 +197,12 @@ libgedit_gir = gnome.generate_gir( + install_dir_typelib: get_option('libdir') / 'gedit/girepository-1.0', + ) + ++if get_option('python') + python3.install_sources( + 'Gedit.py', + subdir: 'gi/overrides', + ) ++endif + + # Vala API + libgedit_vapi = gnome.generate_vapi( +diff --git a/meson.build b/meson.build +index 2c5dccb82..5e1e9340a 100644 +--- a/meson.build ++++ b/meson.build +@@ -55,7 +55,9 @@ deps_basic_list = [ + ] + + gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell')) ++if get_option('python') + python3 = python.find_installation('python3') ++endif + + # Configurations + config_h = configuration_data() +diff --git a/meson_options.txt b/meson_options.txt +index bb3923dd1..962b82934 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -14,6 +14,10 @@ option( + description: 'Require that all tests can be run, even those that depend on third party programs' + ) + ++option('python', ++ type: 'boolean', value: true, ++ description: 'Install GIR python overrides and python plugins') ++ + option('spell', + type: 'feature', value: 'enabled', + description: 'Build spell checking plugin') +diff --git a/plugins/meson.build b/plugins/meson.build +index 50bc5d393..63bb7c094 100644 +--- a/plugins/meson.build ++++ b/plugins/meson.build +@@ -18,14 +18,17 @@ msgfmt_plugin_cmd = [ + subdir('docinfo') + subdir('filebrowser') + subdir('modelines') +-subdir('pythonconsole') + subdir('quickhighlight') +-subdir('quickopen') +-subdir('snippets') + subdir('sort') + subdir('spell') + subdir('time') + ++if get_option('python') + if get_option('plugin_externaltools') + subdir('externaltools') + endif ++ ++ subdir('pythonconsole') ++ subdir('quickopen') ++ subdir('snippets') ++endif +-- +2.26.2 + diff --git a/app-editors/gedit/gedit-3.38.1.ebuild b/app-editors/gedit/gedit-3.38.1.ebuild new file mode 100644 index 000000000000..af9ead028ff2 --- /dev/null +++ b/app-editors/gedit/gedit-3.38.1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +VALA_MIN_API_VERSION="0.26" +VALA_USE_DEPEND="vapigen" + +inherit gnome.org gnome2-utils meson python-single-r1 vala xdg + +DESCRIPTION="A text editor for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Gedit" + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0" + +IUSE="+python gtk-doc spell" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + +# X libs are not needed for OSX (aqua) +DEPEND=" + >=dev-libs/glib-2.64:2 + >=dev-libs/libpeas-1.14.1[gtk] + >=dev-libs/gobject-introspection-1.54:= + >=x11-libs/gtk+-3.22.0:3[introspection] + >=x11-libs/gtksourceview-4.0.2:4[introspection] + gui-libs/tepl:5 + + spell? ( >=app-text/gspell-0.2.5:0= ) + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pycairo[${PYTHON_USEDEP}] + >=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}] + dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}] + ') + ) +" +RDEPEND="${DEPEND} + x11-themes/adwaita-icon-theme + gnome-base/gsettings-desktop-schemas + gnome-base/gvfs +" +BDEPEND=" + ${vala_depend} + app-text/docbook-xml-dtd:4.1.2 + dev-util/glib-utils + gtk-doc? ( >=dev-util/gtk-doc-1 ) + dev-util/itstool + >=sys-devel/gettext-0.18 + virtual/pkgconfig +" +PATCHES=( + # Don't force off overlay scrollbars for dubious reasons that GNOME designers heavily + # disagree with; those wanting them off in general would set that globally for gtk + "${FILESDIR}"/restore-overlay-scrollbars.patch + # Make gspell and python optional + "${FILESDIR}"/3.38-make-gspell-optional.patch + "${FILESDIR}"/3.38-make-python-optional.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + vala_src_prepare + xdg_src_prepare +} + +src_configure() { + local emesonargs=( + $(meson_use python) + $(meson_use gtk-doc gtk_doc) + -Duser_documentation=true + $(meson_feature spell) + ) + meson_src_configure +} + +# Only appdata and desktop file validation in v3.32.2 +src_test() { :; } + +src_install() { + meson_src_install + if use python; then + python_optimize + python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" + fi +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-editors/gvim/gvim-8.2.0360.ebuild b/app-editors/gvim/gvim-8.2.0360.ebuild index 1a2908df6444..1bfd16682176 100644 --- a/app-editors/gvim/gvim-8.2.0360.ebuild +++ b/app-editors/gvim/gvim-8.2.0360.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,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.2.0210-gentoo-patches.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" fi DESCRIPTION="GUI version of the Vim text editor" diff --git a/app-editors/gvim/gvim-8.2.0508.ebuild b/app-editors/gvim/gvim-8.2.0508.ebuild index 3988e0e80749..1c76bae8ffc9 100644 --- a/app-editors/gvim/gvim-8.2.0508.ebuild +++ b/app-editors/gvim/gvim-8.2.0508.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" fi DESCRIPTION="GUI version of the Vim text editor" diff --git a/app-editors/gvim/gvim-8.2.0638.ebuild b/app-editors/gvim/gvim-8.2.0638.ebuild index 63238e735ac2..6edff6f8b56a 100644 --- a/app-editors/gvim/gvim-8.2.0638.ebuild +++ b/app-editors/gvim/gvim-8.2.0638.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" fi DESCRIPTION="GUI version of the Vim text editor" diff --git a/app-editors/gvim/gvim-8.2.0814-r100.ebuild b/app-editors/gvim/gvim-8.2.0814-r100.ebuild new file mode 100644 index 000000000000..0a642867ab41 --- /dev/null +++ b/app-editors/gvim/gvim-8.2.0814-r100.ebuild @@ -0,0 +1,378 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VIM_VERSION="8.2" +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single 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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-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 gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + 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? ( + gtk? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + !gtk? ( + gtk2? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + ) + !gtk2? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( x11-libs/libXaw ) + ) + ) + ) + ) + cscope? ( dev-util/cscope ) + lua? ( + ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + 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 ) + sound? ( media-libs/libcanberra ) + tcl? ( dev-lang/tcl:0= ) +" +DEPEND="${RDEPEND} + sys-devel/autoconf + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +# configure runs the Lua interpreter +BDEPEND="lua? ( ${LUA_DEPS} )" + +# various failures (bugs #630042 and #682320) +RESTRICT="test" + +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 lua && lua-single_pkg_setup + 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 + --with-gnome=no + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable cscope) + $(use_enable netbeans) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable python python3interp) + $(use_with python python3-command "${PYTHON}") + $(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 + + if use lua; then + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # gvim's GUI preference order is as follows: + # aqua CARBON (not tested) + # -aqua gtk GTK3 + # -aqua -gtk gtk2 GTK2 + # -aqua -gtk -gtk motif MOTIF + # -aqua -gtk -gtk -motif neXt NEXTAW + # -aqua -gtk -gtk -motif -neXt ATHENA + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use gtk; then + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) + elif use gtk2; then + myconf+=( --enable-gtk2-check ) + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) + elif use motif; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + 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() { + 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 + + # 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 + + # 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 + xdg_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 + xdg_icon_cache_update + + # call eselect vi update + eselect_vi_update +} diff --git a/app-editors/gvim/gvim-8.2.0814.ebuild b/app-editors/gvim/gvim-8.2.0814.ebuild index f9ba35026b6d..53dc7e38ecb6 100644 --- a/app-editors/gvim/gvim-8.2.0814.ebuild +++ b/app-editors/gvim/gvim-8.2.0814.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" fi DESCRIPTION="GUI version of the Vim text editor" diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 3988e0e80749..0a642867ab41 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 VIM_VERSION="8.2" +LUA_COMPAT=( lua5-{1..4} luajit ) PYTHON_COMPAT=( python3_{6,7,8,9,10} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby24 ruby25 ruby26 ruby27" -inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix python-single-r1 ruby-single +inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -16,7 +17,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" fi DESCRIPTION="GUI version of the Vim text editor" @@ -24,8 +25,9 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" SLOT="0" LICENSE="vim" -IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session sound tcl" +IUSE="acl aqua cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) " @@ -59,8 +61,8 @@ RDEPEND=" ) cscope? ( dev-util/cscope ) lua? ( - luajit? ( dev-lang/luajit:2= ) - !luajit? ( dev-lang/lua:0[deprecated] ) + ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) ) nls? ( virtual/libintl ) perl? ( dev-lang/perl:= ) @@ -77,6 +79,8 @@ DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext ) " +# configure runs the Lua interpreter +BDEPEND="lua? ( ${LUA_DEPS} )" # various failures (bugs #630042 and #682320) RESTRICT="test" @@ -92,6 +96,7 @@ pkg_setup() { mkdir -p "${T}"/home || die export HOME="${T}"/home + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } @@ -194,13 +199,11 @@ src_configure() { $(use_enable sound canberra) $(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 python3interp) - $(use_with python python3-command $(type -P $(eselect python show --python3))) + $(use_with python python3-command "${PYTHON}") $(use_enable racket mzschemeinterp) $(use_enable ruby rubyinterp) $(use_enable selinux) @@ -215,6 +218,14 @@ src_configure() { '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" fi + if use lua; then + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + # gvim's GUI preference order is as follows: # aqua CARBON (not tested) # -aqua gtk GTK3 diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild index c35fdc11b3b8..4127a9a51b8a 100644 --- a/app-editors/hexcurse/hexcurse-1.55.ebuild +++ b/app-editors/hexcurse/hexcurse-1.55.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.jewfish.net/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm ~hppa ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=">=sys-libs/ncurses-5.2:0=" DEPEND=" diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.2.13.ebuild index cef10aed2356..6641229e74d2 100644 --- a/app-editors/hexedit/hexedit-1.2.13.ebuild +++ b/app-editors/hexedit/hexedit-1.2.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ SRC_URI="http://rigaux.org/${P}.src.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" DEPEND="sys-libs/ncurses:=" RDEPEND="${DEPEND}" diff --git a/app-editors/jed/jed-0.99.19-r1.ebuild b/app-editors/jed/jed-0.99.19-r1.ebuild index 2a076f5541f1..8c8fd24f5118 100644 --- a/app-editors/jed/jed-0.99.19-r1.ebuild +++ b/app-editors/jed/jed-0.99.19-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ SRC_URI="ftp://space.mit.edu/pub/davis/jed/v${PV%.*}/${MY_P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="gpm gui xft" RDEPEND=">=sys-libs/slang-2 diff --git a/app-editors/joe/joe-4.2.ebuild b/app-editors/joe/joe-4.2.ebuild index 913080d78e83..4a399380f488 100644 --- a/app-editors/joe/joe-4.2.ebuild +++ b/app-editors/joe/joe-4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz" LICENSE="GPL-1+ CC-BY-3.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" IUSE="xterm" DEPEND=">=sys-libs/ncurses-5.2-r2" diff --git a/app-editors/joe/joe-4.3-r1.ebuild b/app-editors/joe/joe-4.3-r1.ebuild index 59e1e2d38a2c..6f21f2fe2ff1 100644 --- a/app-editors/joe/joe-4.3-r1.ebuild +++ b/app-editors/joe/joe-4.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz" LICENSE="GPL-1+ CC-BY-3.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" IUSE="xterm" DEPEND=">=sys-libs/ncurses-5.2-r2:0=" diff --git a/app-editors/joe/joe-4.4.ebuild b/app-editors/joe/joe-4.4.ebuild index 59e1e2d38a2c..6f21f2fe2ff1 100644 --- a/app-editors/joe/joe-4.4.ebuild +++ b/app-editors/joe/joe-4.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz" LICENSE="GPL-1+ CC-BY-3.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" IUSE="xterm" DEPEND=">=sys-libs/ncurses-5.2-r2:0=" diff --git a/app-editors/joe/joe-4.6.ebuild b/app-editors/joe/joe-4.6.ebuild index dcd75491611a..0bf861b42de7 100644 --- a/app-editors/joe/joe-4.6.ebuild +++ b/app-editors/joe/joe-4.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz" LICENSE="GPL-1+ CC-BY-3.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" IUSE="xterm" DEPEND=">=sys-libs/ncurses-5.2-r2:0=" diff --git a/app-editors/jupp/Manifest b/app-editors/jupp/Manifest index b64114a80130..622c24fd9d02 100644 --- a/app-editors/jupp/Manifest +++ b/app-editors/jupp/Manifest @@ -1,2 +1,2 @@ -DIST joe-3.1jupp30.tgz 468421 BLAKE2B 630ef1cd3f3c73060b331126ec8e6a24d7277b3f2bfb293eb6110d1dade34ffe6efc502d0985e603b2c86a10bf27faa6151e28b777189332b805e387b756dea6 SHA512 673d48da41f61797d6aeb548e62720d1a60e3e000445558be88fb0d7ca8a1a7ce7c8bdd5b5bd58ac2c16d46dd4541da7922999256669f693a570a11562d6550f DIST joe-3.1jupp38.tgz 498068 BLAKE2B 46909c5f0f14b1d0ec30219b8ddfe9c0ad76b726f7178f7527ad5fad0cec40b7ac663e93645187220280572fa3bbde9bcb621f8816672e69c36587410fd98c7f SHA512 1d21ee5bbd1a042c58a89dd2bed8ec711c59fc383ff0dfd94d3a0eaccb999734915abc202e2112c5d573d8073e748b8024cd710b21803fed7422f5a8bccbc0c5 +DIST joe-3.1jupp40.tgz 503318 BLAKE2B 34452784f145f81158dc6a9223a365cd04fce2f3a669f99bf5571e8f33ecf8ff34d7f8495f6c6803ab1e734890c95d9fe9f88be38738b2b2111a9512db2f7872 SHA512 d61b7b9c5cc5c17925ef27f8f7942bc4e4d283e49b02f4962a7e3c5d3122868aadffe108f884164ae61e86776584374a2b5220c313a323efb9d3820268402ead diff --git a/app-editors/jupp/jupp-3.1_p30.ebuild b/app-editors/jupp/jupp-3.1_p40.ebuild index f2d4cfe084ce..d8bdab27bf57 100644 --- a/app-editors/jupp/jupp-3.1_p30.ebuild +++ b/app-editors/jupp/jupp-3.1_p40.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -DESCRIPTION="portable version of JOE's Own Editor" +DESCRIPTION="Portable version of Joe's Own Editor" HOMEPAGE="https://www.mirbsd.org/jupp.htm" SRC_URI="https://www.mirbsd.org/MirOS/dist/${PN}/joe-${PV/_p/${PN}}.tgz" @@ -16,11 +16,12 @@ RDEPEND="ncurses? ( sys-libs/ncurses:0= ) !app-editors/joe" DEPEND="${RDEPEND}" -S=${WORKDIR}/${PN} +S="${WORKDIR}/${PN}" +DOCS="HINTS INFO LIST NEWS README TODO" src_prepare() { default - chmod +x configure + chmod +x configure || die } src_configure() { @@ -29,8 +30,3 @@ src_configure() { --enable-termcap \ $(use_enable ncurses curses) } - -src_install() { - default - dodoc HINTS INFO LIST -} diff --git a/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch b/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch new file mode 100644 index 000000000000..2cc68157ed53 --- /dev/null +++ b/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/707188 +--- a/src/cfg.c ++++ b/src/cfg.c +@@ -22,6 +22,7 @@ + #include <string.h> + #endif + ++extern char *LPE_CONFIG_FILE; + int cfg_errno; + + void +--- a/src/lpe.c ++++ b/src/lpe.c +@@ -25,6 +25,7 @@ + #include "strfuncs.h" + #include "exports.h" + ++char *LPE_CONFIG_FILE; + /* A flag indicating a desire to quit the editor. This is set whenever a + * command should cause an exit. + */ +--- a/src/options.h ++++ b/src/options.h +@@ -38,6 +38,6 @@ + /* + * Other things that are used in some places... + */ +-char *LPE_CONFIG_FILE; ++extern char *LPE_CONFIG_FILE; + + #endif /* LPE_OPTIONS_H */ diff --git a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch index f8d96ef087e9..2e93042570aa 100644 --- a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch +++ b/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch @@ -1,7 +1,6 @@ http://bugs.gentoo.org/335324 - ---- intl/Makefile.in -+++ intl/Makefile.in +--- a/intl/Makefile.in ++++ b/intl/Makefile.in @@ -202,12 +202,12 @@ # The dependency for intlh.inst is different in gettext and all other # packages. Because we cannot you GNU make features we have to solve diff --git a/app-editors/lpe/lpe-1.2.6.13.ebuild b/app-editors/lpe/lpe-1.2.6.13.ebuild index 463f48e14e24..4a9bb25d8011 100644 --- a/app-editors/lpe/lpe-1.2.6.13.ebuild +++ b/app-editors/lpe/lpe-1.2.6.13.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit eutils ltprune multilib toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="a lightweight programmers editor" HOMEPAGE="https://packages.qa.debian.org/l/lpe.html" @@ -13,14 +14,21 @@ SLOT="0" KEYWORDS="amd64 ppc sparc x86 ~x86-linux" IUSE="nls" -RDEPEND=">=sys-libs/slang-2.2.4 - >=sys-libs/ncurses-5.7-r7:0=" -DEPEND="${RDEPEND} +RDEPEND=" + sys-libs/ncurses:0= + sys-libs/slang" +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig nls? ( sys-devel/gettext )" +PATCHES=( + "${FILESDIR}"/${P}-make-382.patch + "${FILESDIR}"/${P}-fno-common.patch +) + src_prepare() { - epatch "${FILESDIR}"/${P}-make-382.patch + default # You should add PKG_CHECK_MODULES(NCURSES, ncurses) to configure.in and # replace -lncurses in src/Makefile.am with $(NCURSES_LIBS) @@ -45,5 +53,5 @@ src_install() { exdir="${ED}/usr/share/doc/${PF}/examples" \ install - prune_libtool_files --all + find "${ED}" -name '*.la' -delete || die } diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest index 146459d9c677..1466de3577f2 100644 --- a/app-editors/mg/Manifest +++ b/app-editors/mg/Manifest @@ -1,3 +1,2 @@ -DIST mg-20171014.tar.gz 141045 BLAKE2B a5b3bda6ff3b6416093069b471762687c2279737aa05b297ccd3077aff195cf52831566768613a81dcc977a27ac5ffd6e8a1874aa1010b6d90f4c678b6825cee SHA512 d55818308421aa523fb30b6e4725bb122f37637a822fabafeba9f9da3b97fd7f6af6431fce3015c969d0e656a48e89ed49b790deefc69fbdbb7e257f8a1aeb56 -DIST mg-20180408.tar.gz 141988 BLAKE2B db7da46fb0160acf8695f05234ed0c8e9a45e4239dc3abd433ddfb8b66e2b1aa550ffc4b409486a8990881d791ed73269a8ab78f6846cd4f0bee67761c11d281 SHA512 25fceb18fcbe63010e7a2e107aa5c30356938be2e04ff48869a12b5018dbb83bcf4dc70b03674713516616037247952a51454a28ca418cdc7b020d1f415f8701 DIST mg-20200215.tar.gz 152254 BLAKE2B 89e47aaa94fd95b9409a53b09c9017e26d3f1cc73ce616e1c29ed22fbaed42cb78e7c9fbcd2424d98f86725fb00cee5160be4fe40abc97a927201557b684f800 SHA512 c6cda5544210bc3d3fa3cbb8494e60949e10ed3716d96b76d0c9e7f5671c7a85f6e7e7a860cfd05466f1bf52112053c722441ff338210c0ada89f10515ac170a +DIST mg-20200723.tar.gz 152271 BLAKE2B 5fcbe2699da60c68a0c464bb337741d7797e9da3e2ab148a821aed46f661e5f5efbe7ceb14b153dcdd51185d22d0a2b2c7ad3525fc531192ecc0c0697e483b77 SHA512 8e481cf4981b93dba95b3b318f44dda15e580962216d452ce2fddcd19b86e4686673ba84d092bfaa540533b227428bd3bc9e6becda69be881d930937b0ea7add diff --git a/app-editors/mg/mg-20171014.ebuild b/app-editors/mg/mg-20171014.ebuild deleted file mode 100644 index da406b5556a2..000000000000 --- a/app-editors/mg/mg-20171014.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="MicroGnuEmacs, a port from the BSDs" -HOMEPAGE="https://homepage.boetes.org/software/mg/" -SRC_URI="https://homepage.boetes.org/software/mg/${P}.tar.gz" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86" -IUSE="livecd" - -RDEPEND="sys-libs/ncurses:0 - !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - # fix path to tutorial in man page - sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die - - eapply_user -} - -src_compile() { - emake CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - PKG_CONFIG="$(tc-getPKG_CONFIG)" -} - -src_install() { - dobin mg - doman mg.1 - dodoc README tutorial - # don't compress the tutorial, otherwise mg cannot open it - docompress -x /usr/share/doc/${PF}/tutorial -} - -pkg_postinst() { - if use livecd; then - [[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs - fi -} diff --git a/app-editors/mg/mg-20180408.ebuild b/app-editors/mg/mg-20200723.ebuild index c1f6b5cda47e..20816904f732 100644 --- a/app-editors/mg/mg-20180408.ebuild +++ b/app-editors/mg/mg-20200723.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="livecd" RDEPEND="sys-libs/ncurses:0 diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest index 3584a6f7b9da..2968cd6c2e6c 100644 --- a/app-editors/mousepad/Manifest +++ b/app-editors/mousepad/Manifest @@ -1,3 +1,4 @@ DIST mousepad-0.4.2.tar.bz2 696014 BLAKE2B 2591f177b59147e01502329939365c5f18031f3dc9100baa29cb1da04afbff26cc91cc612ea1e5ebbc2d15754375da6afbd4ae9d96399f41cf06191d7d8d7082 SHA512 f3266018ce61683dc62b6866649f3674cc363ea652de04d3f087341c61cf24fb5eb730411948e354d085792f88b59e3dba7e7712715d92711f750b33d8bfb69a DIST mousepad-0.4.90.tar.bz2 808320 BLAKE2B 5a639001663d24a9d0ae126f672adb5d3a72825893e0f0d90e263596f214d76f973e0743248efee8562dc04afb09c0519ed649ca5d36b9221569490e289d687f SHA512 e839584782b09ee9d485ca4dcf05e22afb459cba269b3a15fe2dc0e3f3240bc15b1a8d7db92160b735d97d7293e67b0484b50ac3e72946b499dc65ac1097390b DIST mousepad-0.5.0.tar.bz2 810533 BLAKE2B c98fe38d65923fca2a5f2a769ad8fd0c92f77c6aff2c658e2ecd3bc3081988cb10b5dd49ba36020fe05c6f172e08f6efb825eb2c38b630dbcc6fd4d639313e15 SHA512 06cab143a3a0f98ad2aeecb0c7f034b8dede355de09632217da27dfb0675909c6cb284b227644c9ab3513a67fb23594ee63f0112ade69830d46559a8e7d65842 +DIST mousepad-0.5.1.tar.bz2 826973 BLAKE2B 6e0ae6570221b8e7ecfc5b7bf513eb7bf6efd745f977d46a1bc78d9ef4d59984964abc423f381d5170edc4a44f6672f1fa44f4bdc898260c43d0685c3603da30 SHA512 2b9403332f370bb75bf03a0e0aeab2b2f889fcd2fcef54e6d958e82933f5b6044dbf9416cf0ca5b43f4c304bb93dec185c647ebb40ed3915a87a15b76cf2e634 diff --git a/app-editors/mousepad/mousepad-0.5.1.ebuild b/app-editors/mousepad/mousepad-0.5.1.ebuild new file mode 100644 index 000000000000..799f077cd25d --- /dev/null +++ b/app-editors/mousepad/mousepad-0.5.1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit gnome2-utils xdg-utils + +DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment" +HOMEPAGE="https://git.xfce.org/apps/mousepad/about/" +SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" + +RDEPEND=">=dev-libs/glib-2.52 + >=xfce-base/xfconf-4.12:= + >=x11-libs/gtk+-3.22:3 + >=x11-libs/gtksourceview-3.24:3.0" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-lang/perl + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig" + +pkg_postinst() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + gnome2_schemas_update + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index 9cdab2674317..e32ffbe83249 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,3 +1,4 @@ DIST nano-4.9.3.tar.gz 2999198 BLAKE2B a96f707936934a965a9a41dfe13ac1ebbe1a5e38db714df6d219b2c6539f24924d4c4f0451508718f66259854806032b84dc89850a7fd55d157f28ae23531d0e SHA512 233e6ed103441bd2c85ed21c50547f85dc0838cc750a5e9b16ecfb393e3b7b978e971af4a4164062c7c267c98895ecb696c02cbd2e4c2eb1ceee657fd026c30a DIST nano-5.3.tar.gz 2874796 BLAKE2B d266018f2508153369e10c6f9cf4c53eaeafdf0efe88da6de19efd76ef13fedebe4b9339ae594b751a12cf18a8c4dcd57466ceedfabf61406f63b69c75fceff1 SHA512 019b58779f5a7d9a9472b415715876d0daac313a02b794900339469ee0b5a27ce202e397c00ad6396b7e26a7c303e52c28d981fff85cf774c79a5a8a9835836d DIST nano-5.4.tar.gz 2898561 BLAKE2B 7e5e48f1e85253a7a4a9be2be2b7663e8798655d9e9e2505df1d1752512058734062af953652c1d11dca464ca06d7c90faf2e54cdb65ba01d0f76cfca0282c18 SHA512 711b1a890649e3a2b62c778e6d54813ed98a8261c47a92aa6d7baa690f86d8563813a764f5dffcc6c259fe9b05f8fe76cf48a3178b09666ba55ee035c91cbe28 +DIST nano-5.5.tar.gz 2943973 BLAKE2B cecc4b3bb74c6ca35a249052cc58df618b6a0445781813d1b06164afb3d119bedf49bdb0a04c327d4db968eeb5b0f1087b84184b83d4b92548c3146a4400389d SHA512 968eac59db2889ba1cb75bc83a30fd0c0ae370a05c668da0f3a20768158f3be0962034737924ea49f06e696e68625bc6841f41aae86aebbe8ba7c00b2627c056 diff --git a/app-editors/nano/nano-4.9.3.ebuild b/app-editors/nano/nano-4.9.3.ebuild index 5e77b11f1a70..869ecf6995d1 100644 --- a/app-editors/nano/nano-4.9.3.ebuild +++ b/app-editors/nano/nano-4.9.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" diff --git a/app-editors/nano/nano-5.3-r1.ebuild b/app-editors/nano/nano-5.3-r1.ebuild index 25cf3962ed7e..6f1437da2a77 100644 --- a/app-editors/nano/nano-5.3-r1.ebuild +++ b/app-editors/nano/nano-5.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" diff --git a/app-editors/nano/nano-5.4.ebuild b/app-editors/nano/nano-5.4.ebuild index 58e6b0821478..92473ae856c8 100644 --- a/app-editors/nano/nano-5.4.ebuild +++ b/app-editors/nano/nano-5.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" diff --git a/app-editors/nano/nano-5.5.ebuild b/app-editors/nano/nano-5.5.ebuild new file mode 100644 index 000000000000..64c74e70f9b1 --- /dev/null +++ b/app-editors/nano/nano-5.5.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.sv.gnu.org/nano.git" + inherit git-r3 autotools +else + MY_P="${PN}-${PV/_}" + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="GNU GPL'd Pico clone with more functionality" +HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" + +LICENSE="GPL-3" +SLOT="0" +IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" + +LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] + sys-libs/ncurses:0=[static-libs(+)] + magic? ( sys-apps/file[static-libs(+)] ) + nls? ( virtual/libintl )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" +BDEPEND=" + nls? ( sys-devel/gettext ) + virtual/pkgconfig +" + +REQUIRED_USE=" + magic? ( !minimal ) +" + +src_prepare() { + default + if [[ ${PV} == "9999" ]] ; then + eautoreconf + fi +} + +src_configure() { + use static && append-ldflags -static + local myconf=( + --bindir="${EPREFIX}"/bin + --htmldir=/trash + $(use_enable !minimal color) + $(use_enable !minimal multibuffer) + $(use_enable !minimal nanorc) + $(use_enable magic libmagic) + $(use_enable spell speller) + $(use_enable justify) + $(use_enable debug) + $(use_enable nls) + $(use_enable unicode utf8) + $(use_enable minimal tiny) + ) + econf "${myconf[@]}" +} + +src_install() { + default + # don't use "${ED}" here or things break (#654534) + rm -r "${D}"/trash || die + + dodoc doc/sample.nanorc + docinto html + dodoc doc/faq.html + insinto /etc + newins doc/sample.nanorc nanorc + if ! use minimal ; then + # Enable colorization by default. + sed -i \ + -e '/^# include /s:# *::' \ + "${ED}"/etc/nanorc || die + + # Since nano-5.0 these are no longer being "enabled" by default + # (bug #736848) + local rcdir="/usr/share/nano" + mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die + rmdir "${ED}"${rcdir}/extra || die + fi + + use split-usr && dosym ../../bin/nano /usr/bin/nano +} diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index 58e6b0821478..64c74e70f9b1 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" @@ -18,13 +18,12 @@ HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_ LICENSE="GPL-3" SLOT="0" -IUSE="debug justify magic minimal ncurses nls slang +spell +split-usr static unicode" +IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" LIB_DEPEND=">=sys-libs/ncurses-5.9-r1:0=[unicode?] sys-libs/ncurses:0=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl ) - !ncurses? ( slang? ( sys-libs/slang[static-libs(+)] ) )" + nls? ( virtual/libintl )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} )" @@ -34,7 +33,6 @@ BDEPEND=" " REQUIRED_USE=" - !ncurses? ( slang? ( minimal ) ) magic? ( !minimal ) " @@ -60,7 +58,6 @@ src_configure() { $(use_enable nls) $(use_enable unicode utf8) $(use_enable minimal tiny) - $(usex ncurses --without-slang $(use_with slang)) ) econf "${myconf[@]}" } diff --git a/app-editors/ne/ne-3.1.1.ebuild b/app-editors/ne/ne-3.1.1.ebuild index ba020cf684bb..dfda125216f3 100644 --- a/app-editors/ne/ne-3.1.1.ebuild +++ b/app-editors/ne/ne-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://ne.di.unimi.it/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="tinfo" DEPEND="sys-libs/ncurses:0=[tinfo?]" diff --git a/app-editors/ne/ne-3.3.0.ebuild b/app-editors/ne/ne-3.3.0.ebuild index a860c65d8678..710d79b286d0 100644 --- a/app-editors/ne/ne-3.3.0.ebuild +++ b/app-editors/ne/ne-3.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="http://ne.di.unimi.it/${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="" DEPEND="sys-libs/ncurses:0=[tinfo]" diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch b/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch deleted file mode 100644 index 62c6a84eae13..000000000000 --- a/app-editors/neovim/files/neovim-0.4.4-cmake_multiimpl_luv.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/FindLibLUV.cmake -+++ b/cmake/FindLibLUV.cmake -@@ -6,7 +6,7 @@ - - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) -- pkg_check_modules(PC_LIBLUV QUIET luv) -+ pkg_check_modules(PC_LIBLUV QUIET "libluv-${LUA_PRG}") - endif() - - set(LIBLUV_DEFINITIONS ${PC_LIBLUV_CFLAGS_OTHER}) diff --git a/app-editors/neovim/neovim-0.4.4-r100.ebuild b/app-editors/neovim/neovim-0.4.4-r100.ebuild index c5a0f1bf7baf..fdd586c9a389 100644 --- a/app-editors/neovim/neovim-0.4.4-r100.ebuild +++ b/app-editors/neovim/neovim-0.4.4-r100.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..2} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit cmake lua-single optfeature xdg @@ -38,9 +38,9 @@ BDEPEND="${LUA_DEPS} # TODO: add tests, dev-lua/busted has now got luajit support. # bug #584694 DEPEND="${LUA_DEPS} + dev-lua/luv[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] - dev-lua/luv[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] ') $(lua_gen_cond_dep ' @@ -62,7 +62,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch - "${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.patch ) src_prepare() { diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 38e9b6a6c5bc..79fac55b9874 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..2} luajit ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit cmake lua-single optfeature xdg @@ -38,9 +38,9 @@ BDEPEND="${LUA_DEPS} # TODO: add tests, dev-lua/busted has now got luajit support. # bug #584694 DEPEND="${LUA_DEPS} + dev-lua/luv[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] - dev-lua/luv[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] ') $(lua_gen_cond_dep ' @@ -64,7 +64,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.4.4-cmake_lua_version.patch - "${FILESDIR}"/${PN}-0.4.4-cmake_multiimpl_luv.patch ) src_prepare() { diff --git a/app-editors/ng/files/ng-1.5beta1-ncurses.patch b/app-editors/ng/files/ng-1.5beta1-ncurses.patch index 6808d911152b..a31ddccd6614 100644 --- a/app-editors/ng/files/ng-1.5beta1-ncurses.patch +++ b/app-editors/ng/files/ng-1.5beta1-ncurses.patch @@ -1,12 +1,16 @@ ---- a/configure 2004-05-12 09:26:44.000000000 +0900 -+++ b/configure 2004-05-12 09:27:06.000000000 +0900 -@@ -1077,3+1077,3 @@ - rm -f conftest* --test "$ac_cv_search_tgetstr" = "no" && for i in curses ncurses termlib; do -+test "$ac_cv_search_tgetstr" = "no" && for i in ncurses termlib; do - LIBS="-l$i $ac_func_search_save_LIBS" -@@ -1140,3 +1140,3 @@ - rm -f conftest* --test "$ac_cv_search_tgetstr" = "no" && for i in termcap curses ncurses; do -+test "$ac_cv_search_tgetstr" = "no" && for i in termcap ncurses; do - LIBS="-l$i $ac_func_search_save_LIBS" +--- ng-1.5beta1/sys/unix/configure.in ++++ ng-1.5beta1/sys/unix/configure.in +@@ -33,9 +33,11 @@ + [ --with-termcap Build with termcap library. (default)], + [ts_with_terminfo="no"]) + if test "$ts_with_terminfo" = "yes"; then +- AC_SEARCH_LIBS(tgetstr, curses ncurses termlib) ++ AC_SEARCH_LIBS(tgetstr, ncurses termlib) ++ AC_SEARCH_LIBS(tputs, tinfo ncurses termlib) + else +- AC_SEARCH_LIBS(tgetstr, termcap curses ncurses) ++ AC_SEARCH_LIBS(tgetstr, termcap ncurses) ++ AC_SEARCH_LIBS(tputs, termcap tinfo ncurses) + fi + + dnl Checks for header files. diff --git a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild index 55064b0e2564..ca0db1807aa3 100644 --- a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild +++ b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,7 +48,11 @@ src_prepare() { } src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro + eqmake5 \ + LRELEASE="$(qt5_get_bindir)/lrelease" \ + QMAKE="$(qt5_get_bindir)/qmake" \ + PREFIX="${EPREFIX}/usr" \ + ${PN}.pro } src_install() { diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild index 55064b0e2564..ca0db1807aa3 100644 --- a/app-editors/notepadqq/notepadqq-9999.ebuild +++ b/app-editors/notepadqq/notepadqq-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -48,7 +48,11 @@ src_prepare() { } src_configure() { - eqmake5 PREFIX="${EPREFIX}/usr" ${PN}.pro + eqmake5 \ + LRELEASE="$(qt5_get_bindir)/lrelease" \ + QMAKE="$(qt5_get_bindir)/qmake" \ + PREFIX="${EPREFIX}/usr" \ + ${PN}.pro } src_install() { diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild b/app-editors/pyvim/pyvim-3.0.2.ebuild index 87822a6cf83e..982653a815b3 100644 --- a/app-editors/pyvim/pyvim-3.0.2.ebuild +++ b/app-editors/pyvim/pyvim-3.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" SLOT="0" LICENSE="BSD" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" app-eselect/eselect-vi diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild index efbed2aa6c70..d64a4d89ed71 100644 --- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild +++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild @@ -13,7 +13,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" -IUSE="gui png unicode xv" +IUSE="gui png xv" RESTRICT="test" RDEPEND=" diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml index 2e990c56c979..3c4f061864c0 100644 --- a/app-editors/qhexedit2/metadata.xml +++ b/app-editors/qhexedit2/metadata.xml @@ -5,10 +5,6 @@ <email>ktrace@yandex.ru</email> <name>Victor Kustov</name> </maintainer> - <maintainer type="person"> - <email>maksbotan@gentoo.org</email> - <name>Maxim Koltsov</name> - </maintainer> <maintainer type="project"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/app-editors/scite/scite-4.4.4-r10.ebuild b/app-editors/scite/scite-4.4.4-r10.ebuild index cc44dcb5cad6..20783d8d7db6 100644 --- a/app-editors/scite/scite-4.4.4-r10.ebuild +++ b/app-editors/scite/scite-4.4.4-r10.ebuild @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-1 ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua-single toolchain-funcs xdg-utils diff --git a/app-editors/texworks/files/texworks-0.6.5-cmake_lua_version.patch b/app-editors/texworks/files/texworks-0.6.5-cmake_lua_version.patch new file mode 100644 index 000000000000..630443d5f119 --- /dev/null +++ b/app-editors/texworks/files/texworks-0.6.5-cmake_lua_version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -297,7 +297,7 @@ + # ------------------------------- + + IF ( WITH_LUA ) +- FIND_PACKAGE(Lua) ++ FIND_PACKAGE(Lua ${LUA_VERSION} EXACT REQUIRED) + ENDIF() + + IF ( WITH_PYTHON ) diff --git a/app-editors/texworks/texworks-0.6.5-r100.ebuild b/app-editors/texworks/texworks-0.6.5-r100.ebuild new file mode 100644 index 000000000000..898865671bc3 --- /dev/null +++ b/app-editors/texworks/texworks-0.6.5-r100.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) + +inherit lua-single python-single-r1 cmake virtualx xdg-utils + +DESCRIPTION="A simple interface for working with TeX documents" +HOMEPAGE="https://tug.org/texworks/" +SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="lua python" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="app-text/hunspell:= + app-text/poppler[qt5] + dev-qt/designer:5 + dev-qt/qtcore:5 + dev-qt/qtconcurrent:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtscript:5[scripttools] + lua? ( ${LUA_DEPS} ) + python? ( ${PYTHON_DEPS} ) " + +DEPEND="dev-qt/linguist-tools:5 + ${RDEPEND}" + +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/qt5.15-support.patch + "${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch +) + +S=${WORKDIR}/${PN}-release-${PV} + +RESTRICT="!test? ( test )" + +CMAKE_REMOVE_MODULES_LIST="FindLua" + +pkg_setup() { + use lua && lua-single_pkg_setup + python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -Wno-dev + -DPREFER_BUNDLED_SYNCTEX=ON + -DWITH_LUA=$(usex lua ON OFF) + -DWITH_PYTHON=$(usex python ON OFF) + -DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks" + -DTeXworks_DOCS_DIR="/share/doc/${PF}" + -DQTPDF_VIEWER=ON + -DBUILD_SHARED_LIBS=ON + -DBUILD_SHARED_PLUGINS=ON + ) + use lua && mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" ) + cmake_src_configure +} + +src_test() { + virtx default_src_test +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild index c526622b9492..d39413bfc5f8 100644 --- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild +++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/app-editors/vile/vile-9.8t.ebuild b/app-editors/vile/vile-9.8t.ebuild index 36834959d075..41c4ef2224ed 100644 --- a/app-editors/vile/vile-9.8t.ebuild +++ b/app-editors/vile/vile-9.8t.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="perl" RDEPEND=">=sys-libs/ncurses-5.2:0= diff --git a/app-editors/vim-core/vim-core-8.2.0360.ebuild b/app-editors/vim-core/vim-core-8.2.0360.ebuild index 21ea460ef5bd..d5485457d7ed 100644 --- a/app-editors/vim-core/vim-core-8.2.0360.ebuild +++ b/app-editors/vim-core/vim-core-8.2.0360.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,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.2.0210-gentoo-patches.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="vim and gvim shared files" diff --git a/app-editors/vim-core/vim-core-8.2.0508.ebuild b/app-editors/vim-core/vim-core-8.2.0508.ebuild index 28ba2d3038ab..f141342833a8 100644 --- a/app-editors/vim-core/vim-core-8.2.0508.ebuild +++ b/app-editors/vim-core/vim-core-8.2.0508.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="vim and gvim shared files" diff --git a/app-editors/vim-core/vim-core-8.2.0638.ebuild b/app-editors/vim-core/vim-core-8.2.0638.ebuild index 28ba2d3038ab..f141342833a8 100644 --- a/app-editors/vim-core/vim-core-8.2.0638.ebuild +++ b/app-editors/vim-core/vim-core-8.2.0638.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="vim and gvim shared files" diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild index 4d07d8c37442..5ef38f9a81c2 100644 --- a/app-editors/vim-core/vim-core-8.2.0814.ebuild +++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="vim and gvim shared files" diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index d1dbef9e8f10..361565c7977c 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,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.2.0210-gentoo-patches.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="vim and gvim shared files" diff --git a/app-editors/vim/vim-8.2.0360.ebuild b/app-editors/vim/vim-8.2.0360.ebuild index 3f8bb26ac356..3985d0587802 100644 --- a/app-editors/vim/vim-8.2.0360.ebuild +++ b/app-editors/vim/vim-8.2.0360.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~radhermit/vim/vim-8.2.0210-gentoo-patches.tar.bz2" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" diff --git a/app-editors/vim/vim-8.2.0508.ebuild b/app-editors/vim/vim-8.2.0508.ebuild index fc960f9b0a1f..4cfa9361d8c9 100644 --- a/app-editors/vim/vim-8.2.0508.ebuild +++ b/app-editors/vim/vim-8.2.0508.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" diff --git a/app-editors/vim/vim-8.2.0638.ebuild b/app-editors/vim/vim-8.2.0638.ebuild index fc960f9b0a1f..4cfa9361d8c9 100644 --- a/app-editors/vim/vim-8.2.0638.ebuild +++ b/app-editors/vim/vim-8.2.0638.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild b/app-editors/vim/vim-8.2.0814-r100.ebuild new file mode 100644 index 000000000000..4176383ac3f4 --- /dev/null +++ b/app-editors/vim/vim-8.2.0814-r100.ebuild @@ -0,0 +1,329 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VIM_VERSION="8.2" +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{6,7,8,9,10} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils + +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/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + vim-pager? ( !minimal ) +" + +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? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + !minimal? ( ~app-editors/vim-core-${PV} ) + vim-pager? ( app-editors/vim-core[-minimal] ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( ${RUBY_DEPS} ) + selinux? ( sys-libs/libselinux ) + sound? ( media-libs/libcanberra ) + tcl? ( dev-lang/tcl:0= ) + X? ( x11-libs/libXt ) +" + +DEPEND=" + ${RDEPEND} + sys-devel/autoconf + nls? ( sys-devel/gettext ) +" +# configure runs the Lua interpreter +BDEPEND="lua? ( ${LUA_DEPS} )" + +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 lua && lua-single_pkg_setup + 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-canberra + --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 + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable cscope) + $(use_enable gpm) + $(use_enable nls) + $(use_enable perl perlinterp) + $(use_enable python python3interp) + $(use_with python python3-command "${PYTHON}") + $(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 + + if use lua; then + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + 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 + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi + 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 + + domenu runtime/vim.desktop + + 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 + + # update desktop file mime cache + xdg_desktop_database_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} diff --git a/app-editors/vim/vim-8.2.0814.ebuild b/app-editors/vim/vim-8.2.0814.ebuild index 6b02911fd539..5d6957181b56 100644 --- a/app-editors/vim/vim-8.2.0814.ebuild +++ b/app-editors/vim/vim-8.2.0814.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index fc960f9b0a1f..4176383ac3f4 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 VIM_VERSION="8.2" +LUA_COMPAT=( lua5-{1..4} luajit ) PYTHON_COMPAT=( python3_{6,7,8,9,10} ) PYTHON_REQ_USE="threads(+)" USE_RUBY="ruby24 ruby25 ruby26 ruby27" -inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -15,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" @@ -23,8 +24,9 @@ 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 sound tcl terminal vim-pager" +IUSE="X acl cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) vim-pager? ( !minimal ) " @@ -36,9 +38,8 @@ RDEPEND=" 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] ) + lua? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) ) !minimal? ( ~app-editors/vim-core-${PV} ) vim-pager? ( app-editors/vim-core[-minimal] ) @@ -57,6 +58,8 @@ DEPEND=" sys-devel/autoconf nls? ( sys-devel/gettext ) " +# configure runs the Lua interpreter +BDEPEND="lua? ( ${LUA_DEPS} )" pkg_setup() { # people with broken alphabets run into trouble. bug 82186. @@ -67,6 +70,7 @@ pkg_setup() { mkdir -p "${T}"/home || die "mkdir failed" export HOME="${T}"/home + use lua && lua-single_pkg_setup use python && python-single-r1_pkg_setup } @@ -198,13 +202,10 @@ src_configure() { $(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 python3interp) - $(use_with python python3-command $(type -P $(eselect python show --python3))) + $(use_with python python3-command "${PYTHON}") $(use_enable racket mzschemeinterp) $(use_enable ruby rubyinterp) $(use_enable selinux) @@ -219,6 +220,14 @@ src_configure() { '/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed" fi + if use lua; then + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + # don't test USE=X here ... see bug #19115 # but need to provide a way to link against X ... see bug #20093 myconf+=( diff --git a/app-editors/vis/vis-0.7.ebuild b/app-editors/vis/vis-0.7.ebuild index 4d2ac5754f60..b3b43a62a309 100644 --- a/app-editors/vis/vis-0.7.ebuild +++ b/app-editors/vis/vis-0.7.ebuild @@ -4,7 +4,7 @@ EAPI=7 MY_PTV=0.5 -LUA_COMPAT=( lua5-2 lua5-3 lua5-4 ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua-single optfeature diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild index bb8d1be8d88a..0dd8e3a4d1ae 100644 --- a/app-editors/vis/vis-9999.ebuild +++ b/app-editors/vis/vis-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LUA_COMPAT=( lua5-2 lua5-3 lua5-4 ) +LUA_COMPAT=( lua5-{1..4} luajit ) inherit lua-single git-r3 optfeature diff --git a/app-editors/vscodium-bin/Manifest b/app-editors/vscodium-bin/Manifest index 8e7eb3f276c5..be34ce1c9b63 100644 --- a/app-editors/vscodium-bin/Manifest +++ b/app-editors/vscodium-bin/Manifest @@ -1,4 +1,4 @@ -DIST VSCodium-linux-arm64-1.51.1.tar.gz 98199987 BLAKE2B eeb13d861376b8bdcd508250c27eb74a93a7a9788ef6afcc2bd81b25ec9a6fc393d5baf7265f74a9af006d667fe657fcb0d5961fc449bda52db6e6e52783a8b4 SHA512 c0b1f4d49b73290e041a6ab4d1951c93a86a4371099485689a63a8d341f6eda845a1d7a84e1749e6d82a5395dc612ce66b42ab8290a9a6b035b05dff907aaa3b DIST VSCodium-linux-arm64-1.52.0.tar.gz 99023187 BLAKE2B 651cce4bdcb9466408fe6322dd7c4c1aa7a2416ea1f63e159ad7c5aad305ac6db0029afe3b9dc74feee6c4cd9fa17fe729e6012a45d61cea1253d324b4be5a43 SHA512 8b82e3e1fb701bcce9071e1a839081b6c217d186e42915a40ac33b91990b3e8663843745783edbff1bba4bb6290e078fff35f6d8a9fa2d3264f7fdf7d4c0d978 -DIST VSCodium-linux-x64-1.51.1.tar.gz 95441022 BLAKE2B 39b149ff5b0aa2617e45ceaf277145151ab0d81e5b42667a26886ec8cb9f1747ca9f39a25cbe86752fb62a0ffcdaf6b9d34aafcb23d64d310e6ff1f58976acf4 SHA512 07e80031006d6d93273b34723801b4a848be30d99fd5ae4772c76ceb29221cf443a7006a797de81ff1f67de4b4eabca6d1682f1ae125fe591e62acdbcda09be7 +DIST VSCodium-linux-arm64-1.52.1.tar.gz 99006948 BLAKE2B 933e5b283e011873b7da60a838e7778d8ff1cf69006e5bf370fdeba7aa6709c2b8ea427936d353c75c0331d1a78defb7c0983d73d59c71163cde6ca32cf1ac32 SHA512 e96c79b1176a07f6cbd1a1d30d4a4d0d66d519d854bc0aa0e24e9baa4b0f6fe959e12b4888330188210957763febc644601f958b635deaa7e900f55f0eb5550f DIST VSCodium-linux-x64-1.52.0.tar.gz 96038183 BLAKE2B 7439d6ac5abc643952d51c3e178e6b5aa58cb5bc3b02cdadad0660f0cc80f32f58a0f0f349ff73676c314ba699ab28fdcc41a4e2f5238cd8354fc8fff61ff6f3 SHA512 75b1a1348aac91e0ba7791190e5f9680f2c64cab597173150a2bc776f3b93a828fbf2f7398cf36de88660c5fe234b8824c8eb7b287fa9600cd4140bcc2f3f4ad +DIST VSCodium-linux-x64-1.52.1.tar.gz 96026417 BLAKE2B 0d06ddef0de3af3d22de4757bd5b81742cdfb6605192c61374857fdacfd8df374adf180aaa1f31f0397ead97e7f668320125ef1f806c71689348ac4a3c8bab8d SHA512 9a60f6821e7a796eaca842817fd3853c8099d74418ccabeacabed01c4f7b46b49c52bb11a032c317c27e3cef7ef2c49d2cf967ca2d2d79013790994a6aa9159f diff --git a/app-editors/vscodium-bin/vscodium-bin-1.51.1.ebuild b/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild index 3917f5c5d7b9..3917f5c5d7b9 100644 --- a/app-editors/vscodium-bin/vscodium-bin-1.51.1.ebuild +++ b/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild diff --git a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch b/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch new file mode 100644 index 000000000000..ff17f6b62411 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch @@ -0,0 +1,11 @@ +--- a/tests/automated/process-tests.el 2021-01-16 15:42:20.195864978 +0100 ++++ b/tests/automated/process-tests.el 2021-01-16 15:43:27.840426754 +0100 +@@ -49,7 +49,7 @@ + (goto-char (point-min)) + (Assert (looking-at "foo"))): + +- (Assert (= 127 (shell-command "unknown_command"))) ++ (Assert (= 127 (shell-command "unknown_command > /dev/null 2>&1"))) + (Assert (= 2 (shell-command "exit 2"))) + (Assert (equal "(Shell command failed with code 2 and no output)" (message-displayed-p t))) + diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild deleted file mode 100644 index e9fe35ad2e93..000000000000 --- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Note: xemacs currently does not work with position independent code -# so the build forces the use of the -no-pie option - -EAPI=5 - -inherit eutils flag-o-matic multilib xdg-utils - -DESCRIPTION="highly customizable open source text editor and application development system" -HOMEPAGE="https://www.xemacs.org/" -SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz - http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb" - -X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" - -RDEPEND=" - berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) - gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) - >=sys-libs/zlib-1.1.4 - !libressl? ( >=dev-libs/openssl-0.9.6:0 ) - libressl? ( dev-libs/libressl ) - >=media-libs/audiofile-0.2.3 - gpm? ( >=sys-libs/gpm-1.19.6 ) - postgres? ( dev-db/postgresql:= ) - ldap? ( net-nds/openldap ) - alsa? ( media-libs/alsa-lib ) - nas? ( media-libs/nas ) - X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) - dnd? ( x11-libs/dnd ) - motif? ( >=x11-libs/motif-2.3:0[xft=] ) - athena? ( x11-libs/libXaw ) - Xaw3d? ( x11-libs/libXaw3d ) - xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) - neXt? ( x11-libs/neXtaw ) - xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) - png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( virtual/jpeg:0 ) - canna? ( app-i18n/canna ) - freewnn? ( app-i18n/freewnn ) - >=sys-libs/ncurses-5.2:= - >=app-eselect/eselect-emacs-1.15" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" - -src_unpack() { - default_src_unpack - - use neXt && unpack NeXT_XEmacs.tar.gz -} - -src_prepare() { - use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ - find "${S}"/lisp -name '*.elc' -exec rm {} \; || die - epatch "${FILESDIR}/${P}-ncurses-tinfo.patch" - epatch "${FILESDIR}/${P}-gcc5.patch" - epatch "${FILESDIR}/${P}-glibc-macro.patch" - epatch "${FILESDIR}/${P}-as-needed.patch" - - # Some binaries and man pages are installed under suffixed names - # to avoid collions with their GNU Emacs counterparts (see below). - # Fix internal filename references. - sed -i -e 's/exec gnuclient/&-xemacs/' lib-src/gnudoit || die - sed -i -e '/^\.so/s/etags/&-xemacs/' etc/ctags.1 || die - sed -i -e '/^\.so/s/gnuserv/&-xemacs/' etc/gnu{client,doit,attach}.1 || die -} - -src_configure() { - local myconf="" - - # bug #639642 - test-flags -no-pie >/dev/null && append-flags -no-pie - filter-flags -pie - - if use X; then - - myconf="${myconf} --with-widgets=athena" - myconf="${myconf} --with-dialogs=athena" - myconf="${myconf} --with-menubars=lucid" - myconf="${myconf} --with-scrollbars=lucid" - if use motif ; then - myconf="--with-widgets=motif" - myconf="${myconf} --with-dialogs=motif" - myconf="${myconf} --with-scrollbars=motif" - myconf="${myconf} --with-menubars=lucid" - fi - if use athena or use Xaw3d ; then - myconf="--with-scrollbars=athena" - fi - - if use Xaw3d; then - myconf="${myconf} --with-athena=3d" - elif use neXt; then - myconf="${myconf} --with-athena=next" - else - myconf="${myconf} --with-athena=xaw" - fi - - use dnd && myconf="${myconf} --with-dragndrop --with-offix" - - myconf="${myconf} $(use_with tiff )" - myconf="${myconf} $(use_with png )" - myconf="${myconf} $(use_with jpeg )" - myconf="${myconf} $(use_with xface )" - - use xft && myconf="${myconf} --with-xft=emacs,tabs,menubars,gauges" || - myconf="${myconf} --with-xft=no" - - else - myconf="${myconf} - --without-x - --without-xpm - --without-dragndrop - --with-xft=no - --with-gif=no" - fi - - if use mule ; then - myconf="${myconf} --with-mule" - - if use xim ; then - if use motif ; then - myconf="${myconf} --with-xim=motif" - else - myconf="${myconf} --with-xim=xlib" - fi - else - myconf="${myconf} --with-xim=no" - fi - - myconf="${myconf} $(use_with canna )" - myconf="${myconf} $(use_with freewnn wnn )" - fi - - # This determines the type of sounds we are playing - local soundconf="native" - - # This determines how these sounds should be played - use nas && soundconf="${soundconf},nas" - use alsa && soundconf="${soundconf},alsa" - - myconf="${myconf} --with-sound=${soundconf}" - - if use gdbm || use berkdb ; then - use gdbm && mydb="gdbm" - use berkdb && mydb="${mydb},berkdb" - - myconf="${myconf} --with-database=${mydb}" - else - myconf="${myconf} --without-database" - fi - - use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" - - econf ${myconf} \ - $(use_with gif ) \ - $(use_with gpm ) \ - $(use_with postgres postgresql ) \ - $(use_with ldap ) \ - $(use_with eolconv file-coding ) \ - $(use_with pop ) \ - --prefix=/usr \ - --with-ncurses \ - --with-msw=no \ - --with-mail-locking=flock \ - --with-site-lisp=yes \ - --with-site-modules=yes \ - --with-newgc \ - --with-system-malloc \ - --enable-option-checking=no \ - --with-last-packages=/usr/lib/xemacs -} - -src_compile() { - emake EMACSLOADPATH="${S}"/lisp -} - -src_install() { - emake prefix="${D}"/usr \ - mandir="${D}"/usr/share/man/man1 \ - infodir="${D}"/usr/share/info \ - libdir="${D}"/usr/$(get_libdir) \ - datadir="${D}"/usr/share \ - install - - # Rename some applications installed in bin so that it is clear - # which application installed them and so that conflicting - # packages (emacs) can't clobber the actual applications. - # Addresses bug #62991. - for i in b2m ctags etags gnuclient gnudoit gnuattach; do - mv "${D}"/usr/bin/${i} "${D}"/usr/bin/${i}-xemacs || die "mv ${i} failed" - done - - # rename man pages - for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do - mv "${D}"/usr/share/man/man1/${i}{,-xemacs}.1 || die "mv ${i}.1 failed" - done - - # install base packages directories - dodir /usr/lib/xemacs/xemacs-packages/ - dodir /usr/lib/xemacs/site-packages/ - dodir /usr/lib/xemacs/site-modules/ - dodir /usr/lib/xemacs/site-lisp/ - - if use mule; - then - dodir /usr/lib/xemacs/mule-packages - fi - - # remove extraneous info files - cd "${D}"/usr/share/info - rm -f dir info.info texinfo* termcap* standards* - - cd "${S}" - dodoc CHANGES-* ChangeLog INSTALL Installation PROBLEMS README* - - newicon "${S}"/etc/${PN}-icon.xpm ${PN}.xpm - - domenu "${FILESDIR}"/${PN}.desktop -} - -pkg_postinst() { - eselect emacs update ifunset - eselect gnuclient update ifunset - xdg_desktop_database_update - - einfo "If you are upgrading from XEmacs 21.4 you should note the following" - einfo "incompatibilities:" - einfo "- Mule-UCS is no longer supported due to proper UTF-8 support in XEmacs 21.5" - einfo "- The X resource class has changed from Emacs to XEmacs," - einfo " settings in your .Xdefaults file should be updated accordingly." - - if use xft; - then - einfo "You have enabled Xft font support. Xft requires font names to be provided" - einfo "in a different way, so you may need to adjust your .Xdefaults accordingly." - fi -} - -pkg_postrm() { - eselect emacs update ifunset - eselect gnuclient update ifunset - xdg_desktop_database_update -} diff --git a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild index 29f18e22891e..9ab02600bc11 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r5.ebuild +++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with position independent code @@ -70,6 +70,7 @@ src_prepare() { eapply "${FILESDIR}/${P}-configure-libc-version.patch" eapply "${FILESDIR}/${P}-ar.patch" eapply "${FILESDIR}/${P}-strsignal.patch" + eapply "${FILESDIR}/${P}-process-test-qa.patch" eapply_user diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild index 675bde278cc8..7c2abbbe6386 100644 --- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild +++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" IUSE="aqua nls" RDEPEND=" diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest index 70e83d7e2d8a..639d68d90875 100644 --- a/app-editors/zile/Manifest +++ b/app-editors/zile/Manifest @@ -1,2 +1,3 @@ DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9 DIST zile-2.4.14.tar.gz 1385314 BLAKE2B 43815e87bb037a8de42b00510ce8addd748fe2a639f78e736c7fe6220c972ce600a8db557dd592065bb27e1d35a5d3a42b6a4a8d5d76eefc4274a8ce27b1d9c2 SHA512 0dea56fd13a82015ec73de3139a4b2c27ad4c001ed535f1bae557ee49f9d8a188610a08160998d0a36b95fec42b46a019fd43634ef6502ebd27e162164de98cc +DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575 diff --git a/app-editors/zile/zile-2.3.24-r2.ebuild b/app-editors/zile/zile-2.3.24-r2.ebuild index c796a61701ff..a283c37c087d 100644 --- a/app-editors/zile/zile-2.3.24-r2.ebuild +++ b/app-editors/zile/zile-2.3.24-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="test valgrind" RESTRICT="!test? ( test )" diff --git a/app-editors/zile/zile-2.4.14.ebuild b/app-editors/zile/zile-2.4.14.ebuild index 06dc725535f0..38cea8b08e8b 100644 --- a/app-editors/zile/zile-2.4.14.ebuild +++ b/app-editors/zile/zile-2.4.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/zile/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" IUSE="acl test" RESTRICT="!test? ( test )" diff --git a/app-editors/zile/zile-2.4.15.ebuild b/app-editors/zile/zile-2.4.15.ebuild new file mode 100644 index 000000000000..07c97a015ba0 --- /dev/null +++ b/app-editors/zile/zile-2.4.15.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="Zile is a small Emacs clone" +HOMEPAGE="https://www.gnu.org/software/zile/" +SRC_URI="mirror://gnu/zile/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +IUSE="acl" + +RDEPEND=">=dev-libs/boehm-gc-7.2:= + sys-libs/ncurses:0= + acl? ( virtual/acl )" + +DEPEND="${RDEPEND}" + +BDEPEND="dev-lang/perl + sys-apps/help2man + virtual/pkgconfig" + +# AUTHORS, FAQ, and NEWS are installed by the build system +DOCS="README THANKS" + +QA_AM_MAINTAINER_MODE=".*help2man.*" #450278 + +src_configure() { + econf \ + $(use_enable acl) \ + CURSES_LIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" +} + +src_test() { + if tput cup 0 0 >/dev/null || tput cuu1 >/dev/null; then + # We have a sane terminal that can move the cursor + emake check + else + ewarn "Terminal type \"${TERM}\" is too stupid to run zile" + ewarn "Running the tests with unset TERM instead" + ( unset TERM; emake check ) + fi +} |