diff options
Diffstat (limited to 'app-editors')
401 files changed, 15805 insertions, 7693 deletions
diff --git a/app-editors/aee/aee-2.2.21.ebuild b/app-editors/aee/aee-2.2.21.ebuild index b4b1aa5d647e..9c616e016bc5 100644 --- a/app-editors/aee/aee-2.2.21.ebuild +++ b/app-editors/aee/aee-2.2.21.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://gentoo/${P}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux" +KEYWORDS="amd64 ~riscv x86 ~amd64-linux" IUSE="X" RDEPEND="X? ( x11-libs/libX11 )" diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest index 91678c89959b..05061820cb85 100644 --- a/app-editors/bluefish/Manifest +++ b/app-editors/bluefish/Manifest @@ -1 +1,2 @@ DIST bluefish-2.2.12.tar.bz2 4180228 BLAKE2B 9e05a4618c37951da6a669e9bd4e0dd7e9993ea764dd467f875039b28cdc6d71ae70d1a87df7f0c63f850ebbff6ceeb8550d1d036bab32b7435f362d5b137147 SHA512 f0eb6496d371db8a9b4aee33ddf67e5e87bcc86ff283704cac115be7f00609b1ccbd47ff2d8f8b0bc30f234a339069cc1f7cb1f8809d97f94f0b0e09e4f16754 +DIST bluefish-2.2.13.tar.bz2 4254294 BLAKE2B 7d830fa19cfeaac56c7823760e789b32306d74156a8c106a2ba847c2ecc535a47eae59a76594afea1c013bd2f8d40107cd02f46b0871e69d6db9307fae77a606 SHA512 959a260f32c7e90ad5b3acc52eaa4a1cc979c7a41d2fa8e3b1f9bd139232c1af940bdc92c84d00b30c53389e25b2b92188cde569bc39bdda5208e1ebec20eb68 diff --git a/app-editors/bluefish/bluefish-2.2.12-r2.ebuild b/app-editors/bluefish/bluefish-2.2.12-r2.ebuild new file mode 100644 index 000000000000..97d13fcb5744 --- /dev/null +++ b/app-editors/bluefish/bluefish-2.2.12-r2.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +MY_P=${P/_/-} +inherit autotools python-single-r1 xdg + +DESCRIPTION="GTK HTML editor for the experienced web designer or programmer" +HOMEPAGE="https://bluefish.openoffice.nl/" +SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2" + +LICENSE="GPL-3+" +KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +SLOT="0" +IUSE="gucharmap nls python spell" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="sys-libs/zlib + x11-libs/gtk+:3 + gucharmap? ( gnome-extra/gucharmap:2.90 ) + python? ( ${PYTHON_DEPS} ) + spell? ( app-text/enchant:2 )" +DEPEND="${RDEPEND} + x11-libs/pango" +BDEPEND=">=dev-libs/glib-2.24:2 + dev-libs/libxml2:2 + virtual/pkgconfig + nls? ( + dev-util/intltool + sys-devel/gettext + )" + +S="${WORKDIR}/${MY_P}" + +# there actually is just some broken manpage checkup -> not bother +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" + "${FILESDIR}/${PN}-2.2.9-fix-incompatible-pointer.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # eautoreconf seems to no longer kill translation files. + eautoreconf + sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile" +} + +src_configure() { + CONFIG_SHELL="${BROOT}/bin/bash" econf \ + --disable-update-databases \ + --disable-xml-catalog-update \ + --with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \ + --without-gtk2 \ + $(use_with gucharmap charmap) \ + $(use_enable nls) \ + $(use_enable spell spell-check) \ + $(use_enable python) +} + +src_install() { + default + + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + xdg_pkg_postinst + + einfo "Adding XML catalog entries..." + "${EPREFIX}"/usr/bin/xmlcatalog --noout \ + --add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \ + --add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \ + --add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \ + "${EROOT}"/etc/xml/catalog \ + || ewarn "Failed to add XML catalog entries." +} + +pkg_postrm() { + xdg_pkg_postrm + + einfo "Removing XML catalog entries..." + "${EPREFIX}"/usr/bin/xmlcatalog --noout \ + --del 'Bluefish/DTD/Bflang' \ + --del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \ + --del 'http://bluefish.openoffice.nl/DTD' \ + "${EROOT}"/etc/xml/catalog \ + || ewarn "Failed to remove XML catalog entries." +} diff --git a/app-editors/bluefish/bluefish-2.2.12.ebuild b/app-editors/bluefish/bluefish-2.2.13.ebuild index 625cc993be5c..4893fb9098ca 100644 --- a/app-editors/bluefish/bluefish-2.2.12.ebuild +++ b/app-editors/bluefish/bluefish-2.2.13.ebuild @@ -1,37 +1,36 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{9..11} ) MY_P=${P/_/-} inherit autotools python-single-r1 xdg -DESCRIPTION="A GTK HTML editor for the experienced web designer or programmer" -HOMEPAGE="http://bluefish.openoffice.nl/" +DESCRIPTION="GTK HTML editor for the experienced web designer or programmer" +HOMEPAGE="https://bluefish.openoffice.nl/" SRC_URI="https://www.bennewitz.com/bluefish/stable/source/${MY_P}.tar.bz2" -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" +LICENSE="GPL-3+" +KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" SLOT="0" IUSE="gucharmap nls python spell" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND=" - sys-libs/zlib +RDEPEND="sys-libs/zlib x11-libs/gtk+:3 gucharmap? ( gnome-extra/gucharmap:2.90 ) python? ( ${PYTHON_DEPS} ) - spell? ( >=app-text/enchant-1.4:0 )" + spell? ( app-text/enchant:2 )" DEPEND="${RDEPEND} x11-libs/pango" BDEPEND=">=dev-libs/glib-2.24:2 dev-libs/libxml2:2 virtual/pkgconfig nls? ( - sys-devel/gettext dev-util/intltool + sys-devel/gettext )" S="${WORKDIR}/${MY_P}" @@ -39,21 +38,24 @@ S="${WORKDIR}/${MY_P}" # there actually is just some broken manpage checkup -> not bother RESTRICT="test" +PATCHES=( + "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" +) + pkg_setup() { use python && python-single-r1_pkg_setup } -PATCHES=( "${FILESDIR}/${PN}-2.2.9-charmap_configure.patch" ) - -# eautoreconf seems to no longer kill translation files. src_prepare() { default + + # eautoreconf seems to no longer kill translation files. eautoreconf sed -i 's:gzip -n $< -c:gzip -n -c $<:' data/bflib/Makefile.* || die "Cannot fix makefile" } src_configure() { - econf \ + CONFIG_SHELL="${BROOT}/bin/bash" econf \ --disable-update-databases \ --disable-xml-catalog-update \ --with-freedesktop_org-appdata="${EPREFIX}"/usr/share/metainfo \ @@ -66,27 +68,30 @@ src_configure() { src_install() { default + find "${ED}" -name '*.la' -delete || die } pkg_postinst() { xdg_pkg_postinst + einfo "Adding XML catalog entries..." - /usr/bin/xmlcatalog --noout \ + "${EPREFIX}"/usr/bin/xmlcatalog --noout \ --add 'public' 'Bluefish/DTD/Bflang' 'bflang.dtd' \ --add 'system' 'http://bluefish.openoffice.nl/DTD/bflang.dtd' 'bflang.dtd' \ --add 'rewriteURI' 'http://bluefish.openoffice.nl/DTD' '/usr/share/xml/bluefish-unstable' \ - /etc/xml/catalog \ + "${EROOT}"/etc/xml/catalog \ || ewarn "Failed to add XML catalog entries." } pkg_postrm() { xdg_pkg_postrm + einfo "Removing XML catalog entries..." - /usr/bin/xmlcatalog --noout \ + "${EPREFIX}"/usr/bin/xmlcatalog --noout \ --del 'Bluefish/DTD/Bflang' \ --del 'http://bluefish.openoffice.nl/DTD/bflang.dtd' \ --del 'http://bluefish.openoffice.nl/DTD' \ - /etc/xml/catalog \ + "${EROOT}"/etc/xml/catalog \ || ewarn "Failed to remove XML catalog entries." } diff --git a/app-editors/bluefish/files/bluefish-2.2.9-fix-incompatible-pointer.patch b/app-editors/bluefish/files/bluefish-2.2.9-fix-incompatible-pointer.patch new file mode 100644 index 000000000000..7cf8900d4f9f --- /dev/null +++ b/app-editors/bluefish/files/bluefish-2.2.9-fix-incompatible-pointer.patch @@ -0,0 +1,20 @@ +Clang16 will not allow to assign incompatible pointer types by default. +Therefore we need to and const to the third parameter of this function +to match the pointer XmlHashScanner this function is later assigned to. + +Bug: https://bugs.gentoo.org/882207 +Patch has been sent to upstream here: https://sourceforge.net/p/bluefish/tickets/66/ + +Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-07) + +--- a/src/plugin_infbrowser/infb_dtd.c ++++ b/src/plugin_infbrowser/infb_dtd.c +@@ -80,7 +80,7 @@ static gchar *infb_dtd_str_content(xmlElementContentPtr ct,gchar *sofar) { + return ret; + } + +-static void infb_dtd_element_to_group(void *payload, void *data, xmlChar *name) { ++static void infb_dtd_element_to_group(void *payload, void *data,const xmlChar *name) { + xmlElementPtr el = (xmlElementPtr)payload; + switch(name[0]) { + case 'a':case 'b':case 'c':case 'd':case 'e': diff --git a/app-editors/bvi/Manifest b/app-editors/bvi/Manifest index c20356e5e654..d6c7ca99d841 100644 --- a/app-editors/bvi/Manifest +++ b/app-editors/bvi/Manifest @@ -1 +1,2 @@ DIST bvi-1.4.1.src.tar.gz 143181 BLAKE2B ad4ae885b1b85ebfc4fc842e0b072383b6755eeaf1d8a71ffb461c5caf0c4c97d1906a7762b66ae4a5ede9ac8a204543bc0aed8630a3ea52ca452e8c645ad616 SHA512 f7a3f07e6bcefe566a101c4db85192f0d2e3580be0ab10bc297e6c0192e79d29061a7c9f1a57cf5a628f03962deb8c2ed52e33effc1d5198d458627d70d882e6 +DIST bvi-1.4.2.src.tar.gz 148323 BLAKE2B 8431b8cdb322a5a3bd011fb28cacc62f30bf02fa66bdb1e1e0993728fac28bd80da161c1011e9adbdf26d093374130b5413f3d2a739663d91b22403a5a740e2a SHA512 e2b23b75e5984e222060d3ad99381e1c54f45c28796b0dfe781072c406191272ffff2849218f90c29a398b245af604aa8f0f5448791bc5f3a2ef0f8395ca92c3 diff --git a/app-editors/bvi/bvi-1.4.1.ebuild b/app-editors/bvi/bvi-1.4.1.ebuild index 8d2f302a7bcc..a4c996ebb707 100644 --- a/app-editors/bvi/bvi-1.4.1.ebuild +++ b/app-editors/bvi/bvi-1.4.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=7 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz" LICENSE="GPL-3+" SLOT="0" IUSE="" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" DEPEND="sys-libs/ncurses:0=" RDEPEND="${DEPEND}" diff --git a/app-editors/bvi/bvi-1.4.2.ebuild b/app-editors/bvi/bvi-1.4.2.ebuild new file mode 100644 index 000000000000..d8c3fcd39c1a --- /dev/null +++ b/app-editors/bvi/bvi-1.4.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Display-oriented editor for binary files, based on the vi texteditor" +HOMEPAGE="http://bvi.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="" +KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" + +DEPEND="sys-libs/ncurses:0=" +RDEPEND="${DEPEND}" + +src_configure() { + append-cflags -DANSI -std=gnu89 + default +} 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 af9d0b852813..c2c5b7047b82 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 @@ -14,7 +14,7 @@ SRC_URI="https://www.rogoyski.com/adam/programs/hexedit/${MY_P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" RDEPEND=" sys-libs/ncurses:= diff --git a/app-editors/dav/dav-0.8.5-r2.ebuild b/app-editors/dav/dav-0.8.5-r2.ebuild index bab3b72d4bdf..7ca8b35cdd7e 100644 --- a/app-editors/dav/dav-0.8.5-r2.ebuild +++ b/app-editors/dav/dav-0.8.5-r2.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit toolchain-funcs -DESCRIPTION="A minimal console text editor" -HOMEPAGE="http://dav-text.sourceforge.net/" +DESCRIPTION="Minimal console text editor" +HOMEPAGE="https://dav-text.sourceforge.net/" # The maintainer does not keep sourceforge's mirrors up-to-date, # so we point to the website's store of files. -SRC_URI="http://dav-text.sourceforge.net/files/${P}.tar.gz" +SRC_URI="https://dav-text.sourceforge.net/files/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" BDEPEND="virtual/pkgconfig" RDEPEND="sys-libs/ncurses:0=" diff --git a/app-editors/dhex/dhex-0.69.ebuild b/app-editors/dhex/dhex-0.69.ebuild index 653613c88304..35029c783c1f 100644 --- a/app-editors/dhex/dhex-0.69.ebuild +++ b/app-editors/dhex/dhex-0.69.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.dettus.net/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~mips x86" +KEYWORDS="amd64 ~arm ~mips ~riscv x86" IUSE="" DEPEND="sys-libs/ncurses:=" diff --git a/app-editors/diakonos/Manifest b/app-editors/diakonos/Manifest index 045292cca7c5..6fd115fffe4d 100644 --- a/app-editors/diakonos/Manifest +++ b/app-editors/diakonos/Manifest @@ -1 +1 @@ -DIST diakonos-0.9.4.tar.bz2 102282 BLAKE2B f8625d87924815e816c2f5a07e5c1d35df4df6126531caf5c98a9fdcb20eb9543c028363344a3c20f2f8a0335fa9d071b168640d9bd4738b1d51737bcc548c12 SHA512 8aab6173c40b9a182853977ed7631c391a10d3339918fa96866da8c9fa8e36e40f1c5093465c734a9ce36a69c5d994d6b2d1c0306f1e57bff708fd7a64a62db7 +DIST diakonos-0.9.7.tar.gz 129807 BLAKE2B 26c3a72a00e1d41b4a7b2916b37024658d7607ac657d4f71a12b939830578d7939a4f9f4c3886693eae9eeaf91bfe1abe055be7bcc7681619448e298acb5c546 SHA512 ec23d93ed6871d18b6a91e02bc6916ac667ca773be5f093a68fffa5c9cbe89b123e80b18762c8649620eda23b1b9ba582a5236eb9eaefc0e22a411390cd30c73 diff --git a/app-editors/diakonos/diakonos-0.9.4.ebuild b/app-editors/diakonos/diakonos-0.9.4.ebuild deleted file mode 100644 index d769980e0233..000000000000 --- a/app-editors/diakonos/diakonos-0.9.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -USE_RUBY="ruby23 ruby24 ruby25 ruby26" - -inherit ruby-ng - -DESCRIPTION="A Linux editor for the masses" -HOMEPAGE="http://diakonos.pist0s.ca" -SRC_URI="http://diakonos.pist0s.ca/archives/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" - -ruby_add_rdepend "dev-ruby/curses" - -ruby_add_bdepend "doc? ( dev-ruby/yard ) - test? ( dev-ruby/bacon )" - -each_ruby_install() { - ${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${P} || die "install failed" -} - -all_ruby_install() { - if use doc; then - rake docs || die - dodoc -r doc/* - fi -} - -each_ruby_test() { - ${RUBY} -S bacon -Ilib spec/*.rb spec/*/*.rb || die -} diff --git a/app-editors/diakonos/diakonos-0.9.4-r1.ebuild b/app-editors/diakonos/diakonos-0.9.7.ebuild index 8ad31aa4fdc0..ffde7aefebca 100644 --- a/app-editors/diakonos/diakonos-0.9.4-r1.ebuild +++ b/app-editors/diakonos/diakonos-0.9.7.ebuild @@ -1,28 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -USE_RUBY="ruby26 ruby27 ruby30" +USE_RUBY="ruby27 ruby30 ruby31" inherit ruby-ng DESCRIPTION="A Linux editor for the masses" -HOMEPAGE="http://diakonos.pist0s.ca" -SRC_URI="http://diakonos.pist0s.ca/archives/${P}.tar.bz2" +HOMEPAGE="https://git.sr.ht/~pistos/diakonos" +SRC_URI="https://github.com/Pistos/diakonos/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="doc test" ruby_add_rdepend "dev-ruby/curses" ruby_add_bdepend "doc? ( dev-ruby/yard ) - test? ( dev-ruby/bacon )" + test? ( dev-ruby/rspec )" + +each_ruby_test() { + ${RUBY} -S rspec -Ilib spec/*.rb spec/*/*.rb || die +} each_ruby_install() { - ${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${P} || die "install failed" + ${RUBY} install.rb --dest-dir "${D}" --doc-dir /usr/share/doc/${PF} || die "install failed" } all_ruby_install() { @@ -31,7 +35,3 @@ all_ruby_install() { dodoc -r doc/* fi } - -each_ruby_test() { - ${RUBY} -S bacon -Ilib spec/*.rb spec/*/*.rb || die -} diff --git a/app-editors/diakonos/metadata.xml b/app-editors/diakonos/metadata.xml index 85e4ed814fa2..412aa2db5d01 100644 --- a/app-editors/diakonos/metadata.xml +++ b/app-editors/diakonos/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="sourcehut">~pistos/diakonos</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/e3/e3-2.8.2.ebuild b/app-editors/e3/e3-2.8.2.ebuild index b6a0ab831345..02569310fc46 100644 --- a/app-editors/e3/e3-2.8.2.ebuild +++ b/app-editors/e3/e3-2.8.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs @@ -18,10 +18,14 @@ BDEPEND=">=dev-lang/nasm-2.09.04" S="${WORKDIR}/${MY_P}" PATCHES=("${FILESDIR}"/${P}-makefile.patch) -QA_FLAGS_IGNORED="/usr/bin/e3" #726484 + +# Suppress false positive QA warnings #726484 #924244 +QA_FLAGS_IGNORED="/usr/bin/e3" +QA_PRESTRIPPED="/usr/bin/e3" src_compile() { - emake -- $(usex amd64 64 32) LD="$(tc-getLD)" DEBUG=true + emake -- $(usev amd64 64 || usev x86 32 || die) \ + LD="$(tc-getLD)" DEBUG=true } src_install() { diff --git a/app-editors/ecrire/Manifest b/app-editors/ecrire/Manifest new file mode 100644 index 000000000000..0a1193635efd --- /dev/null +++ b/app-editors/ecrire/Manifest @@ -0,0 +1 @@ +DIST ecrire-0.2.0.tar.xz 43852 BLAKE2B 75c29848a2c849ae15bf8e14e59bfd9ec76281ca5f8d4be92d330abee5de0c024102f0aa69669df5f2ce5fa28a4b75f49281d4a437288762b0658cc4ebec0ff9 SHA512 6158ac063bdcecf13b2f45448aebcf624d9fe3029d8b2e4bbe40104fbfb5627b02f76112901dfe5617c27dce7ebbf95c277ec6def031efb8a8f1034c092836ef diff --git a/app-editors/ecrire/ecrire-0.2.0-r1.ebuild b/app-editors/ecrire/ecrire-0.2.0-r1.ebuild new file mode 100644 index 000000000000..b32f2534ad6b --- /dev/null +++ b/app-editors/ecrire/ecrire-0.2.0-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg + +DESCRIPTION="A simple Notepad-like text editor using EFL" +HOMEPAGE="https://www.enlightenment.org" +SRC_URI="https://download.enlightenment.org/rel/apps/ecrire/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="nls" + +DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) + >=dev-libs/efl-1.26.1" +RDEPEND="${DEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +src_configure() { + local emesonargs=( $(meson_use nls) ) + meson_src_configure +} diff --git a/app-editors/elvis/metadata.xml b/app-editors/ecrire/metadata.xml index 6be55e0ac363..a1fbf3c0c993 100644 --- a/app-editors/elvis/metadata.xml +++ b/app-editors/ecrire/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>vim@gentoo.org</email> - <name>Gentoo Vim Project</name> -</maintainer> + <maintainer type="person"> + <email>juippis@gentoo.org</email> + <name>Joonas Niilola</name> + </maintainer> </pkgmetadata> diff --git a/app-editors/ee/ee-1.5.2-r1.ebuild b/app-editors/ee/ee-1.5.2-r1.ebuild index 3abbc7fc930c..5d83f47692db 100644 --- a/app-editors/ee/ee-1.5.2-r1.ebuild +++ b/app-editors/ee/ee-1.5.2-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.src.tgz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" RDEPEND=" diff --git a/app-editors/elvis/Manifest b/app-editors/elvis/Manifest deleted file mode 100644 index 03ab34d3a5ad..000000000000 --- a/app-editors/elvis/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST elvis-2.2_0.tar.gz 1439293 BLAKE2B c061370a3a9a9d24bcdba65f1d16b5b8d7dd6a5a9e777949c80862f8e9ce879dac6685f625c0fd86cae26efbbf58277d9626be2f4e513d1b1bed131cc60eb95d SHA512 847cc9ac0af170798abd4725f7dc2ec74d4931fb761b58836d4016d36da5657176bd8cdcdae02bc08438b18e8ce2433eb3340ec2503630fd2992e83ba06adf42 diff --git a/app-editors/elvis/elvis-2.2.0-r8.ebuild b/app-editors/elvis/elvis-2.2.0-r8.ebuild deleted file mode 100644 index 969cfb24e3c5..000000000000 --- a/app-editors/elvis/elvis-2.2.0-r8.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit versionator toolchain-funcs - -MY_PV=$(replace_version_separator 2 '_') - -DESCRIPTION="A vi/ex clone" -HOMEPAGE="http://elvis.the-little-red-haired-girl.org" -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 ~sparc-solaris" -IUSE="X doc" - -RDEPEND=" - sys-libs/ncurses:0= - app-eselect/eselect-vi - X? ( - >=x11-libs/libX11-1.0.0 - >=x11-libs/libXt-1.0.0 - >=x11-libs/libXpm-3.5.4.2 - >=x11-libs/libXft-2.1.8.2 - )" - -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) - virtual/pkgconfig" - -S="${WORKDIR}/${PN}-${MY_PV}" - -PATCHES=( - "${FILESDIR}"/ft2.3-symbol-collision-fix.patch - "${FILESDIR}"/${P}-glibc-2.10.patch - "${FILESDIR}"/${P}-interix.patch -) - -src_configure() { - export CC="$(tc-getCC)" - ./configure \ - --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \ - --prefix="${EPREFIX}"/usr \ - --bindir="${EPREFIX}"/usr/bin \ - --datadir="${EPREFIX}"/usr/share/elvis \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_with X x) \ - || die - - # Some Makefile fixups (must happen after configure) - # Use our CFLAGS - sed -e "s#^CFLAGS=\(.*\)#CFLAGS=\1 ${CFLAGS}#g;" -i Makefile || \ - die "sed 1 failed" - - # We'll install the man-pages ourselves - sed -i -e '/^ sh instman.sh/d' Makefile || die "sed 2 failed" - - # Don't try to write to /etc - sed -i -e 's,/etc/elvis,${ED}/etc/elvis,g' Makefile || die "sed 3 failed" - - # Use LDFLAGS - sed -i -e "s#\$(CC) \$(CFLAGS)#\$(CC) \$(CFLAGS) ${LDFLAGS}#" Makefile || \ - die "sed 4 failed" -} - -src_install() { - dodir /usr/bin - dodir /usr/share/man/man1 - dodir /usr/share/elvis - dodir /usr/share/doc/${PF} - dodir /etc - - local docdir="${ED}/usr/share/doc/${PF}" - if ! use doc; then - docdir="${T}/doc-discard" - fi - - emake install \ - PREFIX="${ED}"/usr \ - BINDIR="${ED}"/usr/bin \ - DATADIR="${ED}"/usr/share/elvis \ - DOCDIR="${docdir}" - - # Install the man-pages - mv doc/elvis.man doc/elvis.1 || die - mv doc/elvtags.man doc/elvtags.1 || die - mv doc/ref.man doc/ref.1 || die - doman doc/*.1 - - # Fixup some READMEs - sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \ - || die 'sed /etc/elvis/README failed' - sed -i -e "s,${ED},,g" "${ED}"/usr/share/elvis/README \ - || die 'sed /usr/share/elvis/README failed' -} - -pkg_postinst() { - einfo "Setting /usr/bin/vi symlink" - eselect vi set "${PN}" -} - -pkg_postrm() { - einfo "Updating /usr/bin/vi symlink" - eselect vi update -} diff --git a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch b/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch deleted file mode 100644 index 1a3d1affb303..000000000000 --- a/app-editors/elvis/files/elvis-2.2.0-glibc-2.10.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ur elvis-2.2_0.orig/ref.c elvis-2.2_0/ref.c ---- elvis-2.2_0.orig/ref.c 2003-10-21 05:32:25.000000000 +0300 -+++ elvis-2.2_0/ref.c 2009-08-05 21:28:30.000000000 +0300 -@@ -42,7 +42,7 @@ - - #if USE_PROTOTYPES - static void usage(char *argv0); --static char *getline(FILE *fp); -+static char *get_line(FILE *fp); - static void store(char *line, char **list); - static LINECLS classify(char *line, LINECLS prev); - static void lookup(TAG *tag); -@@ -171,7 +171,7 @@ - /* This function reads a single line, and replaces the terminating newline with - * a '\0' byte. The string will be in a static buffer. Returns NULL at EOF. - */ --static char *getline(fp) -+static char *get_line(fp) - FILE *fp; - { - int ch; -@@ -348,7 +348,7 @@ - } - - /* for each line... */ -- for (lnum = 1, lc = LC_COMPLETE; (line = getline(fp)) != NULL; lnum++) -+ for (lnum = 1, lc = LC_COMPLETE; (line = get_line(fp)) != NULL; lnum++) - { - /* is this the tag definition? */ - if (taglnum > 0 ? taglnum == lnum : !strncmp(tagline, line, len)) -@@ -377,7 +377,7 @@ - { - if (strchr(line, '(') != NULL) - { -- while ((line = getline(fp)) != NULL -+ while ((line = get_line(fp)) != NULL - && *line - && ((*line != '#' && *line != '{') - || line[strlen(line) - 1] == '\\')) -@@ -387,7 +387,7 @@ - } - else if ((lc = classify(line, lc)) == LC_PARTIAL) - { -- while ((line = getline(fp)) != NULL -+ while ((line = get_line(fp)) != NULL - && (lc = classify(line, lc)) == LC_PARTIAL) - { - puts(line); diff --git a/app-editors/elvis/files/elvis-2.2.0-interix.patch b/app-editors/elvis/files/elvis-2.2.0-interix.patch deleted file mode 100644 index e16024374716..000000000000 --- a/app-editors/elvis/files/elvis-2.2.0-interix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ru -x '*.Po' -x '*.Plo' elvis-2.2_0.orig/osunix/osblock.c elvis-2.2_0/osunix/osblock.c ---- elvis-2.2_0.orig/osunix/osblock.c 2008-04-03 12:00:26 +0200 -+++ elvis-2.2_0/osunix/osblock.c 2008-04-03 12:01:53 +0200 -@@ -293,5 +293,7 @@ - return; - #endif - -+#ifndef __INTERIX - sync(); -+#endif - } diff --git a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch b/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch deleted file mode 100644 index aac099e56ef7..000000000000 --- a/app-editors/elvis/files/ft2.3-symbol-collision-fix.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -ur elvis-2.2_0-orig/guix11/tags elvis-2.2_0/guix11/tags ---- elvis-2.2_0-orig/guix11/tags 2003-10-20 19:32:26.000000000 -0700 -+++ elvis-2.2_0/guix11/tags 2007-08-17 12:56:28.000000000 -0700 -@@ -31,7 +31,7 @@ - DEFAULT_TOOLFG guix11.c 40;" d ln:40 file: - DEFAULT_XENCODING guix11.c 48;" d ln:48 file: - FT_DEFAULT xdialog.h 10;" ln:10 enum:X_FIELDTYPE --FT_FILE xdialog.h 10;" ln:10 enum:X_FIELDTYPE -+FT_FILEC xdialog.h 10;" ln:10 enum:X_FIELDTYPE - FT_LOCKED xdialog.h 10;" ln:10 enum:X_FIELDTYPE - FT_NUMBER xdialog.h 10;" ln:10 enum:X_FIELDTYPE - FT_ONEOF xdialog.h 10;" ln:10 enum:X_FIELDTYPE -diff -ur elvis-2.2_0-orig/guix11/xdialog.c elvis-2.2_0/guix11/xdialog.c ---- elvis-2.2_0-orig/guix11/xdialog.c 2003-10-20 19:32:26.000000000 -0700 -+++ elvis-2.2_0/guix11/xdialog.c 2007-08-17 12:56:28.000000000 -0700 -@@ -387,7 +387,7 @@ - case 'o': ft = FT_ONEOF, limit = scan; break; - case 'n': ft = FT_NUMBER, limit = scan; break; - case 's': ft = FT_STRING; break; -- case 'f': ft = FT_FILE; break; -+ case 'f': ft = FT_FILEC; break; - case 'l': ft = FT_LOCKED; break; - } - -@@ -556,7 +556,7 @@ - break; - - case FT_STRING: -- case FT_FILE: -+ case FT_FILEC: - button = addbutton(dia, "<", 'l', ELVCTRL('L')); - button->y = dia->y0 + dia->rowh * i; - button->x = dia->x0 + 3; -@@ -1111,7 +1111,7 @@ - newvalue = keystring(dia, key); - break; - -- case FT_FILE: -+ case FT_FILEC: - #ifdef FEATURE_COMPLETE - if (key == '\t') - { -@@ -1179,7 +1179,7 @@ - switch (dia->field[row].ft) - { - case FT_STRING: -- case FT_FILE: -+ case FT_FILEC: - case FT_NUMBER: - case FT_LOCKED: - drawtext(dia, row); -@@ -1207,7 +1207,7 @@ - break; - - case FT_STRING: -- case FT_FILE: -+ case FT_FILEC: - if (button->shape == 'l') - if (row == dia->current - ? dia->shift > 0 -diff -ur elvis-2.2_0-orig/guix11/xdialog.h elvis-2.2_0/guix11/xdialog.h ---- elvis-2.2_0-orig/guix11/xdialog.h 2003-10-20 19:32:26.000000000 -0700 -+++ elvis-2.2_0/guix11/xdialog.h 2007-08-17 12:56:28.000000000 -0700 -@@ -5,7 +5,7 @@ - FT_ONEOF, /* one of a preset list; includes boolean */ - FT_NUMBER, /* numeric field */ - FT_STRING, /* string field */ -- FT_FILE, /* string field where <Tab> does filename completion */ -+ FT_FILEC, /* string field where <Tab> does filename completion */ - FT_LOCKED /* non-editable field */ - } X_FIELDTYPE; - typedef struct - diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index f7a1257f643e..488bad4ae26d 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,12 +1,15 @@ -DIST emacs-18.59-patches-13.tar.xz 33532 BLAKE2B 17682fb03c3606794743e702f8389a9476fe09a8c0cc970828aa515a5fc2b1d2df620cdc168d4727635492b38da81ab525c05e20cb77c86d5ae691976deb8d94 SHA512 912afbb4e42efb9e42df4e06c21bcf1d7e2f203d35edb2b410b80c9e25f2e4b37dbb28e6fa36691ce44c53da9f3eb57518da164ecca1599147072219244a8b35 +DIST emacs-18.59-patches-15.tar.xz 34104 BLAKE2B 9d14004d5188ec0ffe11099ae1beb431adfe159d220fc1b6f1d0be67da19b88911b66a206386beee9498bdcaa48e40a185755734cad2d60927c79bc8ddf0fa7d SHA512 c82cd8e81acf63addd137716a60191b916ee9ac9f8176661be1e8dd0f347f63f8ca8bf9d4d225141499dcbf4c20444eb6526cc3a3912a2d4136fb2bd295e2c26 DIST emacs-18.59.tar.gz 2962652 BLAKE2B d617636daff41e672af2dcda26ec24b2495cf0a3e6373561ee26a2a922b7252c074dd6b79289d771853a4720c60f084f5726b904bf65989718173232ac874b0b SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 -DIST emacs-23.4-patches-23.tar.xz 19932 BLAKE2B 941d939d1a66af162016eb7f4a34a3a6d19736ecbd06e2499ccb0bf8806b2b3583de324308698b00d0b47a3d0b8a046e5d5dcb2d681c2bba90ec40b58b4e9855 SHA512 83e2cef7ebe07fc69806d01946c6e96fa0e92b363e9c6531992593eeb29413518217fef05bba48729356af7d1326c3667748185aad971a625daccb803b2bfe58 -DIST emacs-23.4.tar.bz2 38646508 BLAKE2B 33dac5d27a63b7aab6b4053964a0ecf7f7939c7aea5af15103f2da7bd34fbb18dba7a1bf44cc4fcc2e3fb1439cdf7085d8dfc4b0005f5485748996e75ca6872d SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 -DIST emacs-24.5-patches-5.tar.xz 14796 BLAKE2B 3e097f9cdf96a8b0255ce69770f79259ac9bdddbf5aa77c381973e4348d0900ee6dc6ed4af26021811afbb14eff84bc2a370bc8e803d112476554d03b074ce66 SHA512 fe9f9c19ff760e61dcbf1828d4e9e2806c141b47372bdd736be8237183660a28e2ef86a97034d060e244ff81540a2503a1b47655ef84222fddacb3a87f0f34ae -DIST emacs-24.5.tar.xz 39759804 BLAKE2B aec253528038686822d1f8ed9a52dff276789ef7744053fc9b6176fceba4d4d8684fe979cf97e756b3feaf734d2377baef81f5efaa5450930a4e94d9f3bca355 SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 -DIST emacs-25.3-patches-3.tar.xz 2828 BLAKE2B 9a367a545d889d2edf0ee95edb856a7367ec6c10ae6c6fe6b2b452f548184a2a721eb72c448f303a639d5210366c11cf64af33fa322496ff1fd6f7a7e995a154 SHA512 fd65b768be3e3b7b6e280324ff5dd9f790a1279775defea370be5a2555fd64c134c004723e0722331e32117901281dfa2ca2ba42ee4fb33037a3eb83617e222b -DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099b6174725d79b15a5b16d5c886eaf8ff3f75cf561e989ebb092ab9e98ba7503e720a9db7560758b30d5116f23 SHA512 1cce656451b6ca8502ebb229e88bd3ef48b7f9444a10eeac4ea43bd5491b2efacd641dfa35227a33362c3866493d3449cf1df81606563eef44bba0ed668e457f -DIST emacs-26.3-patches-1.tar.xz 1076 BLAKE2B 1218c9a69deae0e3a55e061bd0cd2ab2b7099c86ebe861cc0b3c61a6d7a0756dce13553c861c41a9d2943b5ae78f3c607f099663e90b504d349d2a0be0f34682 SHA512 0e989e760e08675fdedb2cfca39ce63255dd092af38e0dd7febebb54aba10f5a186e1d360edecec3a4dd0ccc480dcc4430b3b9a73bdc84f8dc977591c3da395e +DIST emacs-26.3-patches-6.tar.xz 6264 BLAKE2B 0973df2f34d623a5478a01ab18c80d38e864d7bfb15bc5d3dac3ecb31911eb9edfc622f5ed407d9f418ed6d85e96d5881ffb53a94766aec144a3089ac1332bbf SHA512 b9c833ccd0505f2b78e30c17b43549fcaca3bc767b18e5260160a3aa7063504030e58e848a78f83e76ace7d64db13bfbc69281c3eab9c6e413c3adef06803c9d +DIST emacs-26.3-patches-7.tar.xz 6724 BLAKE2B df984126b09099b625ae4b2e8eae0f38dcea0b1395752924a1f19beab1f2dfe46e04af74e0cc4c1f5893f4f67bbdcbc5c47852e72fc5e6bea39538c06d9bec98 SHA512 22d864713b60ddc535e815c0c24161dbf35bf0a8df8ea5f9b57c91a2ff1f659c662247c8ce3be9ddef361f3608269e5099b1ef98a344e20427ec23f58155692a DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9 -DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e SHA512 a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190 +DIST emacs-27.2-patches-7.tar.xz 12356 BLAKE2B 8d991bd3e87d2fc0086b535d481dbe8399e42d15b21417d19341c5ef8426c65cb471f23eb6e41067750a1ad6dced8cb7b2fd4a6b34bd911913ccfe858e9257f9 SHA512 285c0ca69fc5c7fd398d4ca0a8c5a2a4412a858504445c415cb6eeca9eb170680f6d9bf0dfcd2ae4925e75f01d1d1858c194760a22ee98ad16ebcc347fa588ec +DIST emacs-27.2-patches-8.tar.xz 13884 BLAKE2B 0adfac5586134eea17ed3f333fa21f70d93ecb4569d2bcb06959236c14e7519cd64594859cb6abac9635526b737eee8aaaa8f40915213d2ce671d5eb3464ce5e SHA512 0b50b3c36bdeb678bd08f31fc37ecf96491522cde4b74b8c1b657e52e269077e2f87beaa2a60c82986680e48f4c62375c6a53e9891bcb7a77720d6a976027734 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9 +DIST emacs-28.2-patches-5.tar.xz 6932 BLAKE2B 1cf79142b3031d377b5ba56996a41c44801a114e993ed7e93f937fd88cd35cf142fbc8d98c7970984f44df9fd267d8032f9c6e559d69c18c945510b2e93029bd SHA512 9a246680045868029d9f67652d60d0859d44c3f016ba57cae5ba991c138ece39890230ad303220e2558ccca904b2053b691874da04c6529faa0e8e4f6ea4b6f2 +DIST emacs-28.2-patches-6.tar.xz 9068 BLAKE2B 267f9ade4fb36cdf336c684ceca95fe636cc9ab2f50742442b957504ddaa7a144950926095c75edef5f39cc3dbaf580831129c7004fe906f78b8a97250540c72 SHA512 abba35ee23e4f01100b443d2442ed4323a8d67b993f51b1822ce8e369c11e98a44b760a257e6373287975575b40b92046a4157c84d79cff1db0928e28c315a25 +DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8 +DIST emacs-29.2-patches-2.tar.xz 2232 BLAKE2B 5a74b286a47a03a7b24298fb9da69135485a25351a1451351412825f7b570e9ab40e988e03218eef8b6345124b982a6ea7c67ac03adbb72061e74438a5910836 SHA512 efc5855a66b1895145b9eb792c790850f319cdfaf8c03579aecfc51940a3e010d825e68003d218929278c9cbfa7e0039a8244838126e67db15cb52718dddf35c +DIST emacs-29.2.tar.xz 52162080 BLAKE2B d634fbd94a2fde4824daf5d4d44d6f9e9693900af9ebeda75488fd4d14b7f6cd22e0c9fc15a4c73b4b90843aa782dbd698ba0d40c50465eb4b902105cd9e2c2c SHA512 293fdc2387d58dfa506ae1960b05ccdb4c16ec53c4f55a1a6b665a4fe2815cabfad6257f2b62231040889ab3843d56a01ef62fc9efc1118bf833d7773c64820a +DIST emacs-29.3-patches-1.tar.xz 1552 BLAKE2B 5f9ddd816b03b4a2fe077cef23d76b0c41e2e7dafac35d0dd718ee406e6e57dcb102223251dddc68280f9f2bd41f5b141cda46dca8ccc78258d5939a84ee1665 SHA512 d61dfc6944d58b6ea5749f3089e5c575cf60c8138962aa5c8131274504124505db87489a4d3806e69b646ffffd4c924ef94018c4d7bdcbb2c84322fad6441ffc +DIST emacs-29.3.tar.xz 52203168 BLAKE2B 73651c52e508d5341f66659bbaf98e839040239198cb66f62239f489a961794adf837d9a14e9b605f059b7b612803e0ce5998ec47100ba545db642baacdb55ec SHA512 efaecfc46a0b88f61de477d92c08ee592b8838e6c34724151a3b1502efa7ebd4d4837733c694807e6de1ba4b8d37d2ec382c6bb2ed000b67ad8f0e11c7df2a6b diff --git a/app-editors/emacs/emacs-18.59-r14.ebuild b/app-editors/emacs/emacs-18.59-r15.ebuild index 053a862305ea..466b031d91a4 100644 --- a/app-editors/emacs/emacs-18.59-r14.ebuild +++ b/app-editors/emacs/emacs-18.59-r15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic multilib DESCRIPTION="The extensible self-documenting text editor" HOMEPAGE="https://www.gnu.org/software/emacs/" SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz - https://dev.gentoo.org/~ulm/emacs/${P}-patches-13.tar.xz" + https://dev.gentoo.org/~ulm/emacs/${P}-patches-15.tar.xz" LICENSE="GPL-1+ GPL-2+ BSD HPND" SLOT="18" @@ -29,9 +29,7 @@ DEPEND="${RDEPEND} )" BDEPEND="virtual/pkgconfig" - IDEPEND="app-eselect/eselect-emacs" - RDEPEND+=" ${IDEPEND}" PATCHES=("${WORKDIR}/patch") @@ -76,11 +74,13 @@ src_configure() { src/s-linux.h || die # -O3 and -finline-functions cause segmentation faults at run time. - # -Wno-implicit will quieten GCC 5; feel free to submit a patch - # adding all those missing prototypes. + # -Wno-implicit, -Wno-return-type and -Wno-return-mismatch will + # quieten newer versions of GCC; feel free to submit a patch adding + # all those missing prototypes. strip-flags filter-flags -finline-functions -fpie - append-flags -Wno-implicit + append-flags -fno-strict-aliasing -Wno-implicit -Wno-return-type \ + -Wno-return-mismatch append-ldflags $(test-flags -no-pie) #639562 replace-flags -O[3-9] -O2 } @@ -113,10 +113,8 @@ src_install() { # move executables to the correct place mv "${D}"/usr/bin/emacs{,-${SLOT}} || die - for i in etags ctags emacsclient; do - mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die - rm "${D}"${basedir}/etc/${i} || die - done + mv "${D}"/usr/bin/emacsclient{,-emacs-${SLOT}} || die + rm "${D}"${basedir}/etc/emacsclient || die dodir /usr/libexec/emacs/${PV} for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \ @@ -138,8 +136,7 @@ src_install() { dosym -r /usr/share/info/emacs-${SLOT} ${basedir}/info docompress -x /usr/share/info - # move Info dir to avoid collisions with the dir file generated by portage - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die + # dissuade Portage from removing our dir file #257260 touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir dodir /var/lib/emacs @@ -150,10 +147,9 @@ src_install() { } pkg_preinst() { - # move Info dir file to correct name - if [[ -d "${D}"/usr/share/info ]]; then - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die - fi + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/emacs-${SLOT}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die } pkg_postinst() { diff --git a/app-editors/emacs/emacs-23.4-r21.ebuild b/app-editors/emacs/emacs-23.4-r21.ebuild deleted file mode 100644 index e491036d0785..000000000000 --- a/app-editors/emacs/emacs-23.4-r21.ebuild +++ /dev/null @@ -1,355 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -WANT_AUTOMAKE="none" - -inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="https://www.gnu.org/software/emacs/" -SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 - https://dev.gentoo.org/~ulm/emacs/${P}-patches-23.tar.xz" - -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" -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 - app-emacs/emacs-common[games?,gui(-)?] - net-libs/liblockfile - sys-libs/ncurses:0= - kerberos? ( virtual/krb5 ) - alsa? ( media-libs/alsa-lib ) - games? ( acct-group/gamestat ) - gpm? ( sys-libs/gpm ) - dbus? ( sys-apps/dbus ) - gui? ( !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) - png? ( >=media-libs/libpng-1.4:0= ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) - xpm? ( x11-libs/libXpm ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - x11-libs/libXrender - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) - gtk? ( x11-libs/gtk+:2 ) - !gtk? ( - motif? ( - >=x11-libs/motif-2.3:0 - x11-libs/libXpm - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ) - !motif? ( - Xaw3d? ( - x11-libs/libXaw3d - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ) - !Xaw3d? ( athena? ( - x11-libs/libXaw - x11-libs/libXext - x11-libs/libXmu - x11-libs/libXt - ) ) - ) - ) - ) )" - -DEPEND="${RDEPEND} - gui? ( !aqua? ( x11-base/xorg-proto ) )" - -BDEPEND="virtual/pkgconfig - gzip-el? ( app-arch/gzip )" - -IDEPEND="app-eselect/eselect-emacs" - -RDEPEND+=" ${IDEPEND}" - -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${EMACS_SUFFIX}-gentoo.el" -# FULL_VERSION keeps the full version number, which is needed in -# order to determine some path information correctly for copy/move -# operations later on -FULL_VERSION="${PV%%_*}" -S="${WORKDIR}/emacs-${FULL_VERSION}" -PATCHES=("${WORKDIR}/patch") - -src_prepare() { - default - - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ - || die "unable to sed ctags.1" - - if ! use alsa; then - # ALSA is detected even if not requested by its USE flag. - # Suppress it by supplying pkg-config with a wrong library name. - sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \ - || die "unable to sed configure.in" - fi - if ! use gzip-el; then - # Emacs' build system automatically detects the gzip binary and - # compresses el files. We don't want that so confuse it with a - # wrong binary name - sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \ - || die "unable to sed configure.in" - fi - - mv configure.in configure.ac || die - eautoreconf - touch src/stamp-h.in || die -} - -src_configure() { - strip-flags - filter-flags -fstrict-aliasing -pie - append-flags $(test-flags -fno-strict-aliasing) - append-ldflags $(test-flags -no-pie) #639568 - - if use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - - # Don't trigger a floating point exception for NaNs on alpha - use alpha && append-flags -mieee - - local myconf - - if use alsa && ! use sound; then - einfo "Although sound USE flag is disabled you chose to have alsa," - einfo "so sound is switched on anyway." - myconf+=" --with-sound" - else - myconf+=" $(use_with sound)" - fi - - if ! use gui; then - einfo "Configuring to build without window system support" - myconf+=" --without-x --without-ns" - elif use aqua; then - einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" - else - myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - - if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" - else - myconf+=" --without-xft" - myconf+=" --without-libotf --without-m17n-flt" - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." - fi - - # GTK+ is the default toolkit if USE=gtk is chosen with other - # possibilities. Emacs upstream thinks this should be standard - # policy on all distributions - local f - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - myconf+=" --with-x-toolkit=gtk" - for f in motif Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"gtk\" is set." - done - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" - for f in Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"motif\" is set." - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - else - einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" - fi - fi - - # According to configure, this option is only used for GNU/Linux - # (x86_64 and s390). For Gentoo Prefix we have to explicitly spell - # out the location because $(get_libdir) does not necessarily return - # something that matches the host OS's libdir naming (e.g. RHEL). - local crtdir=$($(tc-getCC) -print-file-name=crt1.o) - crtdir=${crtdir%/*} - - econf \ - --program-suffix="-${EMACS_SUFFIX}" \ - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ - --localstatedir="${EPREFIX}"/var \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-crt-dir="${crtdir}" \ - --with-gameuser=":gamestat" \ - --without-hesiod \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with gpm) \ - $(use_with dbus) \ - ${myconf} -} - -src_compile() { - # Disable sandbox when dumping. For the unbelievers, see bug #131505 - emake CC="$(tc-getCC)" \ - AR="$(tc-getAR) cq" \ - RANLIB="$(tc-getRANLIB)" \ - RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs" -} - -src_install() { - emake DESTDIR="${D}" install - - rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \ - || die "removing duplicate emacs executable failed" - mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - - # move man pages to the correct place - local m - mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \ - || die "moving emacs man page failed" - for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do - mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \ - || die "moving ${m} man page failed" - done - - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig - - # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - - # avoid collision between slots, see bug #169033 e.g. - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die - rm -rf "${ED}"/usr/share/{applications,icons} || die - rm -rf "${ED}"/var || die - - # remove unused <version>/site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die - - # remove COPYING file (except for etc/COPYING used by describe-copying) - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die - - local cdir - if use source; then - cdir="/usr/share/emacs/${FULL_VERSION}/src" - insinto "${cdir}" - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.{c,h,m} - doins -r src/{m,s} - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c || die - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README || die - elif has installsources ${FEATURES}; then - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" - fi - - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die - X - ;;; ${EMACS_SUFFIX} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - Y (setq find-function-C-source-directory - Y "${EPREFIX}${cdir}") - X (let ((path (getenv "INFOPATH")) - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) - X (and path - X ;; move Emacs Info dir before anything else in /usr/share - X (let* ((p (cons nil (split-string path ":" t))) (q p)) - X (while (and (cdr q) (not (string-match re (cadr q)))) - X (setq q (cdr q))) - X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) - EOF - elisp-site-file-install "${T}/${SITEFILE}" || die - - dodoc README BUGS - - if use gui && use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die - fi - - local DOC_CONTENTS="You can set the version to be started by - /usr/bin/emacs through the Emacs eselect module, which also - redirects man and info pages. Therefore, several Emacs versions can - be installed at the same time. \"man emacs.eselect\" for details. - \\n\\nIf you upgrade from a previous major version of Emacs, then - it is strongly recommended that you use app-admin/emacs-updater - to rebuild all byte-compiled elisp files of the installed Emacs - packages." - if use gui; then - DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. - Installing media-fonts/font-adobe-{75,100}dpi on the X server's - machine would satisfy basic Emacs requirements under X11. - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs - for how to enable anti-aliased fonts." - use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or - symlink it into /Applications by yourself." - fi - readme.gentoo_create_doc -} - -pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi -} - -pkg_postinst() { - elisp-site-regen - readme.gentoo_print_elog - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-24.5-r11.ebuild b/app-editors/emacs/emacs-24.5-r11.ebuild deleted file mode 100644 index 3f9cc7860442..000000000000 --- a/app-editors/emacs/emacs-24.5-r11.ebuild +++ /dev/null @@ -1,347 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools elisp-common flag-o-matic readme.gentoo-r1 - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="https://www.gnu.org/software/emacs/" -SRC_URI="mirror://gnu/emacs/${P}.tar.xz - https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.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" -IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk 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 - app-emacs/emacs-common[games?,gui(-)?] - net-libs/liblockfile - sys-libs/ncurses:0= - acl? ( virtual/acl ) - alsa? ( media-libs/alsa-lib ) - dbus? ( sys-apps/dbus ) - games? ( acct-group/gamestat ) - gpm? ( sys-libs/gpm ) - !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - kerberos? ( virtual/krb5 ) - libxml2? ( >=dev-libs/libxml2-2.2.0 ) - selinux? ( sys-libs/libselinux ) - ssl? ( net-libs/gnutls:0= ) - zlib? ( sys-libs/zlib ) - gui? ( !aqua? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXrandr - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gsettings? ( >=dev-libs/glib-2.28.6 ) - gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) - png? ( >=media-libs/libpng-1.4:0= ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) - xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - x11-libs/libXrender - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) - gtk? ( x11-libs/gtk+:3 ) - !gtk? ( - motif? ( - >=x11-libs/motif-2.3:0 - x11-libs/libXpm - x11-libs/libXmu - x11-libs/libXt - ) - !motif? ( - Xaw3d? ( - x11-libs/libXaw3d - x11-libs/libXmu - x11-libs/libXt - ) - !Xaw3d? ( athena? ( - x11-libs/libXaw - x11-libs/libXmu - x11-libs/libXt - ) ) - ) - ) - ) )" - -DEPEND="${RDEPEND} - gui? ( !aqua? ( x11-base/xorg-proto ) )" - -BDEPEND="virtual/pkgconfig - gzip-el? ( app-arch/gzip )" - -IDEPEND="app-eselect/eselect-emacs" - -RDEPEND+=" ${IDEPEND}" - -EMACS_SUFFIX="emacs-${SLOT}" -SITEFILE="20${EMACS_SUFFIX}-gentoo.el" -# FULL_VERSION keeps the full version number, which is needed in -# order to determine some path information correctly for copy/move -# operations later on -FULL_VERSION="${PV%%_*}" -S="${WORKDIR}/emacs-${FULL_VERSION}" -PATCHES=("${WORKDIR}/patch") - -src_prepare() { - default - - # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ - || die "unable to sed ctags.1" - - AT_M4DIR=m4 eautoreconf - touch src/stamp-h.in || die -} - -src_configure() { - strip-flags - filter-flags -pie #526948 - append-ldflags $(test-flags -no-pie) #639570 - - if use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - - # Don't trigger a floating point exception for NaNs on alpha - use alpha && append-flags -mieee - - local myconf - - if use alsa; then - use sound || ewarn \ - "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." - myconf+=" --with-sound=alsa" - else - myconf+=" --with-sound=$(usex sound oss)" - fi - - if ! use gui; then - einfo "Configuring to build without window system support" - myconf+=" --without-x --without-ns" - elif use aqua; then - einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" - myconf+=" --with-ns --disable-ns-self-contained" - myconf+=" --without-x" - else - myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" - myconf+=" $(use_with gsettings)" - myconf+=" $(use_with toolkit-scroll-bars)" - myconf+=" $(use_with gif)" - myconf+=" $(use_with jpeg)" - myconf+=" $(use_with png)" - myconf+=" $(use_with svg rsvg)" - myconf+=" $(use_with tiff)" - myconf+=" $(use_with xpm)" - myconf+=" $(use_with imagemagick)" - - if use xft; then - myconf+=" --with-xft" - myconf+=" $(use_with m17n-lib libotf)" - myconf+=" $(use_with m17n-lib m17n-flt)" - else - myconf+=" --without-xft" - myconf+=" --without-libotf --without-m17n-flt" - use m17n-lib && ewarn \ - "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." - fi - - local f line - if use gtk; then - einfo "Configuring to build with GIMP Toolkit (GTK+)" - while read line; do ewarn "${line}"; done <<-EOF - Your version of GTK+ will have problems with closing open - displays. This is no problem if you just use one display, but - if you use more than one and close one of them Emacs may crash. - See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and - <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. - If you intend to use more than one display, then it is strongly - recommended that you compile Emacs with the Athena/Lucid or the - Motif toolkit instead. - EOF - myconf+=" --with-x-toolkit=gtk3" - for f in motif Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"gtk\" is set." - done - elif use motif; then - einfo "Configuring to build with Motif toolkit" - myconf+=" --with-x-toolkit=motif" - for f in Xaw3d athena; do - use ${f} && ewarn \ - "USE flag \"${f}\" has no effect if \"motif\" is set." - done - elif use athena || use Xaw3d; then - einfo "Configuring to build with Athena/Lucid toolkit" - myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" - else - einfo "Configuring to build with no toolkit" - myconf+=" --with-x-toolkit=no" - fi - fi - - econf \ - --program-suffix="-${EMACS_SUFFIX}" \ - --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ - --localstatedir="${EPREFIX}"/var \ - --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-gameuser=":gamestat" \ - --without-compress-install \ - --without-hesiod \ - --with-file-notification=$(usev inotify || usev gfile || echo no) \ - $(use_enable acl) \ - $(use_with dbus) \ - $(use_with gpm) \ - $(use_with kerberos) $(use_with kerberos kerberos5) \ - $(use_with libxml2 xml2) \ - $(use_with selinux) \ - $(use_with ssl gnutls) \ - $(use_with wide-int) \ - $(use_with zlib) \ - ${myconf} -} - -src_compile() { - # Disable sandbox when dumping. For the unbelievers, see bug #131505 - emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs" -} - -src_install() { - emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install - - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ - || die "moving emacs man page failed" - - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" - touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig - - # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - - # avoid collision between slots, see bug #169033 e.g. - rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die - rm -rf "${ED}"/usr/share/{applications,icons} || die - rm -rf "${ED}"/var || die - - # remove unused <version>/site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die - - # remove COPYING file (except for etc/COPYING used by describe-copying) - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die - - if use gzip-el; then - # compress .el files when a corresponding .elc exists - find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ - -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n - assert "gzip .el failed" - fi - - local cdir - if use source; then - cdir="/usr/share/emacs/${FULL_VERSION}/src" - insinto "${cdir}" - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.{c,h,m} - elif has installsources ${FEATURES}; then - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" - fi - - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die - X - ;;; ${EMACS_SUFFIX} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - Y (setq find-function-C-source-directory - Y "${EPREFIX}${cdir}") - X (let ((path (getenv "INFOPATH")) - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) - X (and path - X ;; move Emacs Info dir before anything else in /usr/share - X (let* ((p (cons nil (split-string path ":" t))) (q p)) - X (while (and (cdr q) (not (string-match re (cadr q)))) - X (setq q (cdr q))) - X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) - EOF - elisp-site-file-install "${T}/${SITEFILE}" || die - - dodoc README BUGS - - if use gui && use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die - fi - - local DOC_CONTENTS="You can set the version to be started by - /usr/bin/emacs through the Emacs eselect module, which also - redirects man and info pages. Therefore, several Emacs versions can - be installed at the same time. \"man emacs.eselect\" for details. - \\n\\nIf you upgrade from Emacs version 24.2 or earlier, then it is - strongly recommended that you use app-admin/emacs-updater to rebuild - all byte-compiled elisp files of the installed Emacs packages." - if use gui; then - DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. - Installing media-fonts/font-adobe-{75,100}dpi on the X server's - machine would satisfy basic Emacs requirements under X11. - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs - for how to enable anti-aliased fonts." - use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or - symlink it into /Applications by yourself." - fi - readme.gentoo_create_doc -} - -pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi -} - -pkg_postinst() { - elisp-site-regen - readme.gentoo_print_elog - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-26.3-r6.ebuild b/app-editors/emacs/emacs-26.3-r16.ebuild index d196a1b19509..fecc2455801d 100644 --- a/app-editors/emacs/emacs-26.3-r6.ebuild +++ b/app-editors/emacs/emacs-26.3-r16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,12 +8,17 @@ inherit autotools elisp-common flag-o-matic readme.gentoo-r1 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" HOMEPAGE="https://www.gnu.org/software/emacs/" SRC_URI="mirror://gnu/emacs/${P}.tar.xz - https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz" + https://dev.gentoo.org/~ulm/emacs/${P}-patches-6.tar.xz" +# FULL_VERSION keeps the full version number, which is needed in +# order to determine some path information correctly for copy/move +# operations later on +FULL_VERSION="${PV%%_*}" +S="${WORKDIR}/emacs-${FULL_VERSION}" 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" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk 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" +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 gfile gif gpm gsettings gtk 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 valgrind wide-int Xaw3d xft +xpm xwidgets zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -31,6 +36,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) + valgrind? ( dev-debug/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE @@ -42,21 +48,20 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender - cairo? ( >=x11-libs/cairo-1.12.18 ) + cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 @@ -65,7 +70,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gtk? ( x11-libs/gtk+:3 xwidgets? ( - net-libs/webkit-gtk:4= + net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) @@ -103,20 +108,18 @@ RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" -# FULL_VERSION keeps the full version number, which is needed in -# order to determine some path information correctly for copy/move -# operations later on -FULL_VERSION="${PV%%_*}" -S="${WORKDIR}/emacs-${FULL_VERSION}" PATCHES=("${WORKDIR}/patch") +# Suppress false positive QA warnings #898304 +QA_CONFIG_IMPL_DECL_SKIP=( malloc_{set,get}_state MIN ) + src_prepare() { default # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die - #AT_M4DIR=m4 eautoreconf + AT_M4DIR=m4 eautoreconf } src_configure() { @@ -148,7 +151,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" @@ -239,6 +242,8 @@ src_configure() { } src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + # Disable sandbox when dumping. For the unbelievers, see bug #131505 emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs" } @@ -250,10 +255,9 @@ src_install() { mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die + # dissuade Portage from removing our dir file #257260 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir # movemail must be setgid mail if ! use mailutils; then @@ -316,7 +320,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die @@ -351,10 +355,9 @@ src_install() { } pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die } pkg_postinst() { diff --git a/app-editors/emacs/emacs-25.3-r11.ebuild b/app-editors/emacs/emacs-26.3-r17.ebuild index 00a361aa4b9e..c80cf16709c8 100644 --- a/app-editors/emacs/emacs-25.3-r11.ebuild +++ b/app-editors/emacs/emacs-26.3-r17.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,16 +8,19 @@ inherit autotools elisp-common flag-o-matic readme.gentoo-r1 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" HOMEPAGE="https://www.gnu.org/software/emacs/" SRC_URI="mirror://gnu/emacs/${P}.tar.xz - https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz" + https://dev.gentoo.org/~ulm/emacs/${P}-patches-7.tar.xz" +# FULL_VERSION keeps the full version number, which is needed in +# order to determine some path information correctly for copy/move +# operations later on +FULL_VERSION="${PV%%_*}" +S="${WORKDIR}/emacs-${FULL_VERSION}" 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" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk 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" +SLOT="26" +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 gfile gif gpm gsettings gtk 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 valgrind wide-int Xaw3d xft +xpm xwidgets zlib" -RDEPEND="acct-group/mail - app-emacs/emacs-common[games?,gui(-)?] - net-libs/liblockfile +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) @@ -26,9 +29,14 @@ RDEPEND="acct-group/mail gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) kerberos? ( virtual/krb5 ) + lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) + mailutils? ( net-mail/mailutils[clients] ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) + systemd? ( sys-apps/systemd ) + valgrind? ( dev-debug/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE @@ -40,27 +48,32 @@ RDEPEND="acct-group/mail x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender - cairo? ( >=x11-libs/cairo-1.12.18 ) + cairo? ( >=x11-libs/cairo-1.12.18[X] ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) - gtk? ( x11-libs/gtk+:3 ) + gtk? ( + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4.1= + x11-libs/libXcomposite + ) + ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 @@ -95,22 +108,18 @@ RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" -# FULL_VERSION keeps the full version number, which is needed in -# order to determine some path information correctly for copy/move -# operations later on -FULL_VERSION="${PV%%_*}" -S="${WORKDIR}/emacs-${FULL_VERSION}" PATCHES=("${WORKDIR}/patch") +# Suppress false positive QA warnings #898304 +QA_CONFIG_IMPL_DECL_SKIP=( malloc_{set,get}_state MIN ) + src_prepare() { default # Fix filename reference in redirected man page - sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \ - || die "unable to sed ctags.1" + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die AT_M4DIR=m4 eautoreconf - touch src/stamp-h.in || die } src_configure() { @@ -123,9 +132,6 @@ src_configure() { replace-flags "-O[3-9]" -O2 fi - # Don't trigger a floating point exception for NaNs on alpha - use alpha && append-flags -mieee - local myconf if use alsa; then @@ -145,7 +151,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" @@ -184,8 +190,7 @@ src_configure() { recommended that you compile Emacs with the Athena/Lucid or the Motif toolkit instead. EOF - myconf+=" --with-x-toolkit=gtk3" - myconf+=" --without-xwidgets" + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." @@ -204,31 +209,41 @@ src_configure() { einfo "Configuring to build with no toolkit" myconf+=" --with-x-toolkit=no" fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." fi econf \ --program-suffix="-${EMACS_SUFFIX}" \ + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ --localstatedir="${EPREFIX}"/var \ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ - --with-gameuser=":gamestat" \ --without-compress-install \ --without-hesiod \ + --without-pop \ --with-file-notification=$(usev inotify || usev gfile || echo no) \ $(use_enable acl) \ $(use_with dbus) \ $(use_with dynamic-loading modules) \ + $(use_with games gameuser ":gamestat") \ $(use_with gpm) \ $(use_with kerberos) $(use_with kerberos kerberos5) \ + $(use_with lcms lcms2) \ $(use_with libxml2 xml2) \ + $(use_with mailutils) \ $(use_with selinux) \ $(use_with ssl gnutls) \ + $(use_with systemd libsystemd) \ + $(use_with threads) \ $(use_with wide-int) \ $(use_with zlib) \ ${myconf} } src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + # Disable sandbox when dumping. For the unbelievers, see bug #131505 emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs" } @@ -236,24 +251,24 @@ src_compile() { src_install() { emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install - mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \ - || die "moving emacs executable failed" - mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \ - || die "moving emacs man page failed" + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \ - || die "moving info dir failed" + # dissuade Portage from removing our dir file #257260 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir # movemail must be setgid mail - fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail - fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + if ! use mailutils; then + fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fi # avoid collision between slots, see bug #169033 e.g. rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die - rm -rf "${ED}"/usr/share/{appdata,applications,icons} || die + rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}/usr/$(get_libdir)" || die rm -rf "${ED}"/var || die # remove unused <version>/site-lisp dir @@ -262,6 +277,15 @@ src_install() { # remove COPYING file (except for etc/COPYING used by describe-copying) rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die + if use systemd; then + insinto /usr/lib/systemd/user + sed -e "/^##/d" \ + -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \ + -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \ + etc/emacs.service | newins - ${EMACS_SUFFIX}.service + assert + fi + if use gzip-el; then # compress .el files when a corresponding .elc exists find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ @@ -296,7 +320,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die @@ -331,10 +355,9 @@ src_install() { } pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die } pkg_postinst() { diff --git a/app-editors/emacs/emacs-27.2-r5.ebuild b/app-editors/emacs/emacs-27.2-r14.ebuild index e2efcba31d59..e78f3b3c6a1b 100644 --- a/app-editors/emacs/emacs-27.2-r5.ebuild +++ b/app-editors/emacs/emacs-27.2-r14.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs +inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs if [[ ${PV##*.} = 9999 ]]; then inherit git-r3 @@ -32,18 +32,18 @@ else SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" fi # Patchset from proj/emacs-patches.git - SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz" + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-7.tar.xz" PATCHES=("${WORKDIR}/patch") 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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" HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json 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" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -64,6 +64,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) + valgrind? ( dev-debug/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE @@ -75,21 +76,20 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender - cairo? ( >=x11-libs/cairo-1.12.18 ) + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 @@ -99,7 +99,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gtk? ( x11-libs/gtk+:3 xwidgets? ( - net-libs/webkit-gtk:4= + net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) @@ -134,12 +134,17 @@ BDEPEND="sys-apps/texinfo IDEPEND="app-eselect/eselect-emacs" -RDEPEND+=" ${IDEPEND} - !app-editors/emacs-vcs:27" +RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" +# Suppress false positive QA warnings #898304 #925449 +QA_CONFIG_IMPL_DECL_SKIP=( + malloc_set_state malloc_get_state MIN + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + src_prepare() { if [[ ${PV##*.} = 9999 ]]; then FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ @@ -157,19 +162,10 @@ src_prepare() { # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die - #AT_M4DIR=m4 eautoreconf + AT_M4DIR=m4 eautoreconf } src_configure() { - strip-flags - filter-flags -pie #526948 - - if use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - local myconf if use alsa; then @@ -189,7 +185,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" @@ -259,6 +255,9 @@ src_configure() { popd >/dev/null || die # Don't try to execute the binary for dumping during the build myconf+=" --with-dumping=none" + elif use m68k; then + # Workaround for https://debbugs.gnu.org/44531 + myconf+=" --with-dumping=unexec" else myconf+=" --with-dumping=pdumper" fi @@ -295,6 +294,8 @@ src_configure() { } src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + if tc-is-cross-compiler; then # Build native tools for compiling lisp etc. emake -C "${S}-build" src @@ -315,10 +316,9 @@ src_install() { mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die + # dissuade Portage from removing our dir file #257260 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir # movemail must be setgid mail if ! use mailutils; then @@ -381,7 +381,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die @@ -421,10 +421,9 @@ src_install() { } pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die } pkg_postinst() { diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2-r15.ebuild index 9dd86d34a32b..4d486f602867 100644 --- a/app-editors/emacs/emacs-27.2.9999.ebuild +++ b/app-editors/emacs/emacs-27.2-r15.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs +inherit autotools elisp-common readme.gentoo-r1 toolchain-funcs if [[ ${PV##*.} = 9999 ]]; then inherit git-r3 @@ -31,16 +31,19 @@ else elif [[ ${PV//[0-9]} != "." ]]; then SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" fi + # Patchset from proj/emacs-patches.git + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-8.tar.xz" + PATCHES=("${WORKDIR}/patch") 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" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~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" HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json 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" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] @@ -61,6 +64,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) + valgrind? ( dev-debug/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE @@ -72,21 +76,20 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender - cairo? ( >=x11-libs/cairo-1.12.18 ) + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 @@ -96,7 +99,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gtk? ( x11-libs/gtk+:3 xwidgets? ( - net-libs/webkit-gtk:4= + net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) @@ -131,12 +134,17 @@ BDEPEND="sys-apps/texinfo IDEPEND="app-eselect/eselect-emacs" -RDEPEND+=" ${IDEPEND} - !app-editors/emacs-vcs:27" +RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" +# Suppress false positive QA warnings #898304 #925449 +QA_CONFIG_IMPL_DECL_SKIP=( + malloc_set_state malloc_get_state MIN + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + src_prepare() { if [[ ${PV##*.} = 9999 ]]; then FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ @@ -158,15 +166,6 @@ src_prepare() { } src_configure() { - strip-flags - filter-flags -pie #526948 - - if use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - local myconf if use alsa; then @@ -186,7 +185,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" @@ -256,6 +255,9 @@ src_configure() { popd >/dev/null || die # Don't try to execute the binary for dumping during the build myconf+=" --with-dumping=none" + elif use m68k; then + # Workaround for https://debbugs.gnu.org/44531 + myconf+=" --with-dumping=unexec" else myconf+=" --with-dumping=pdumper" fi @@ -292,6 +294,8 @@ src_configure() { } src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + if tc-is-cross-compiler; then # Build native tools for compiling lisp etc. emake -C "${S}-build" src @@ -312,10 +316,9 @@ src_install() { mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die + # dissuade Portage from removing our dir file #257260 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir # movemail must be setgid mail if ! use mailutils; then @@ -378,7 +381,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die @@ -418,10 +421,9 @@ src_install() { } pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die } pkg_postinst() { diff --git a/app-editors/emacs/emacs-28.0.9999-r1.ebuild b/app-editors/emacs/emacs-28.2-r10.ebuild index 156f7ef44d15..586ed615a6f0 100644 --- a/app-editors/emacs/emacs-28.0.9999-r1.ebuild +++ b/app-editors/emacs/emacs-28.2-r10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,17 +31,19 @@ else elif [[ ${PV//[0-9]} != "." ]]; then SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" fi + # Patchset from proj/emacs-patches.git + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-5.tar.xz" + PATCHES=("${WORKDIR}/patch") 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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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" HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" -RESTRICT="test" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -52,7 +54,10 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - jit? ( sys-devel/gcc:=[jit(-)] ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) @@ -62,6 +67,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) + valgrind? ( dev-debug/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE @@ -73,21 +79,20 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender - cairo? ( >=x11-libs/cairo-1.12.18 ) + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 @@ -97,21 +102,29 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gtk? ( x11-libs/gtk+:3 xwidgets? ( - net-libs/webkit-gtk:4= + net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( - Xaw3d? ( - x11-libs/libXaw3d + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) - !Xaw3d? ( athena? ( - x11-libs/libXaw - x11-libs/libXmu - x11-libs/libXt - ) ) + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt + ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) ) ) )" @@ -129,9 +142,15 @@ RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" +# Suppress false positive QA warnings #898304 #925449 +QA_CONFIG_IMPL_DECL_SKIP=( + malloc_set_state malloc_get_state MIN + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + src_prepare() { if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ configure.ac) [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" einfo "Emacs branch: ${EGIT_BRANCH}" @@ -142,13 +161,16 @@ src_prepare() { fi if use jit; then + export NATIVE_FULL_AOT=1 + find lisp -type f -name "*.elc" -delete || die + # These files ignore LDFLAGS. We assign the variable here, because # for live ebuilds FULL_VERSION doesn't exist in global scope QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" - # gccjit doesn't play well with ccache #801580 + # gccjit doesn't play well with ccache or distcc #801580 # For now, work around the problem with an explicit LIBRARY_PATH - has ccache ${FEATURES} && tc-is-gcc \ + has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ | sed -n '/^libraries:/{s:^[^/]*::;p}') fi @@ -158,21 +180,21 @@ src_prepare() { # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die + # Tests that use bubblewrap don't work in the sandbox: + # "bwrap: setting up uid map: Permission denied" + # So, disrupt the search for the bwrap executable. + sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ + test/lisp/emacs-lisp/bytecomp-tests.el || die + AT_M4DIR=m4 eautoreconf } src_configure() { - strip-flags - filter-flags -pie #526948 - - if use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - local myconf + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." @@ -181,6 +203,14 @@ src_configure() { myconf+=" --with-sound=$(usex sound oss)" fi + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + if ! use gui; then einfo "Configuring to build without window system support" myconf+=" --without-x --without-ns" @@ -190,7 +220,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" @@ -227,14 +257,21 @@ src_configure() { See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. If you intend to use more than one display, then it is strongly - recommended that you compile Emacs with the Athena/Lucid - toolkit instead. + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. EOF myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" - for f in Xaw3d athena; do + for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf+=" --with-x-toolkit=motif" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"motif\" is set." + done elif use athena || use Xaw3d; then einfo "Configuring to build with Athena/Lucid toolkit" myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" @@ -253,6 +290,9 @@ src_configure() { popd >/dev/null || die # Don't try to execute the binary for dumping during the build myconf+=" --with-dumping=none" + elif use m68k; then + # Workaround for https://debbugs.gnu.org/44531 + myconf+=" --with-dumping=unexec" else myconf+=" --with-dumping=pdumper" fi @@ -285,11 +325,13 @@ src_configure() { $(use_with systemd libsystemd) \ $(use_with threads) \ $(use_with wide-int) \ - $(use_with zlib) \ ${myconf} } src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + append-cppflags -DUSE_VALGRIND=$(usex valgrind) + if tc-is-cross-compiler; then # Build native tools for compiling lisp etc. emake -C "${S}-build" src @@ -303,6 +345,61 @@ src_compile() { emake } +src_test() { + # List .el test files with a comment above listing the exact + # subtests which caused failure. Elements should begin with a %. + # e.g. %lisp/gnus/mml-sec-tests.el. + local exclude_tests=( + # Reason: not yet known + # mml-secure-en-decrypt-{1,2,3,4} + # mml-secure-find-usable-keys-{1,2} + # mml-secure-key-checks + # mml-secure-select-preferred-keys-4 + # mml-secure-sign-verify-1 + %lisp/gnus/mml-sec-tests.el + + # Reason: race condition + # Looks like it should be fixed in 29.x at least: + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706 + # files-tests-file-name-non-special-file-in-directory-p + %lisp/files-tests.el + + # Reason: permission denied on /nonexistent + # (vc-*-bzr only fails if breezy is installed, as they + # try to access cache dirs under /nonexistent) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: some copyright years differ + %lisp/emacs-lisp/copyright-tests.el + + # Reason: quoting issues (fixed in Emacs 29) + %lib-src/emacsclient-tests.el + ) + use threads || exclude_tests+=( + %src/emacs-module-tests.el + %src/keyboard-tests.el + %src/thread-tests.el + ) + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + src_install() { emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install @@ -310,10 +407,9 @@ src_install() { mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die + # dissuade Portage from removing our dir file #257260 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir # movemail must be setgid mail if ! use mailutils; then @@ -376,7 +472,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die @@ -416,10 +512,9 @@ src_install() { } pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die } pkg_postinst() { diff --git a/app-editors/emacs/emacs-29.0.9999.ebuild b/app-editors/emacs/emacs-28.2-r11.ebuild index cc1da333c7fd..61afdfc41640 100644 --- a/app-editors/emacs/emacs-29.0.9999.ebuild +++ b/app-editors/emacs/emacs-28.2-r11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs if [[ ${PV##*.} = 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" - EGIT_BRANCH="master" + EGIT_BRANCH="emacs-28" EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" S="${EGIT_CHECKOUT_DIR}" SLOT="${PV%%.*}-vcs" @@ -31,17 +31,19 @@ else elif [[ ${PV//[0-9]} != "." ]]; then SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" fi + # Patchset from proj/emacs-patches.git + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-6.tar.xz" + PATCHES=("${WORKDIR}/patch") 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" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~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" HOMEPAGE="https://www.gnu.org/software/emacs/" LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" -RESTRICT="test" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars valgrind wide-int Xaw3d xft +xpm xwidgets zlib" RDEPEND="app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= @@ -52,7 +54,10 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - jit? ( sys-devel/gcc:=[jit(-)] ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) @@ -62,6 +67,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) + valgrind? ( dev-debug/valgrind ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE @@ -73,21 +79,20 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) - jpeg? ( virtual/jpeg:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) xpm? ( x11-libs/libXpm ) - imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) xft? ( media-libs/fontconfig media-libs/freetype - x11-libs/libXft x11-libs/libXrender - cairo? ( >=x11-libs/cairo-1.12.18 ) + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 @@ -97,21 +102,29 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gtk? ( x11-libs/gtk+:3 xwidgets? ( - net-libs/webkit-gtk:4= + net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( - Xaw3d? ( - x11-libs/libXaw3d + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) - !Xaw3d? ( athena? ( - x11-libs/libXaw - x11-libs/libXmu - x11-libs/libXt - ) ) + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt + ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) ) ) )" @@ -129,9 +142,15 @@ RDEPEND+=" ${IDEPEND}" EMACS_SUFFIX="emacs-${SLOT}" SITEFILE="20${EMACS_SUFFIX}-gentoo.el" +# Suppress false positive QA warnings #898304 #925449 +QA_CONFIG_IMPL_DECL_SKIP=( + malloc_set_state malloc_get_state MIN + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + src_prepare() { if [[ ${PV##*.} = 9999 ]]; then - FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \ + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ configure.ac) [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" einfo "Emacs branch: ${EGIT_BRANCH}" @@ -142,13 +161,16 @@ src_prepare() { fi if use jit; then + export NATIVE_FULL_AOT=1 + find lisp -type f -name "*.elc" -delete || die + # These files ignore LDFLAGS. We assign the variable here, because # for live ebuilds FULL_VERSION doesn't exist in global scope QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" - # gccjit doesn't play well with ccache #801580 + # gccjit doesn't play well with ccache or distcc #801580 # For now, work around the problem with an explicit LIBRARY_PATH - has ccache ${FEATURES} && tc-is-gcc \ + has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ | sed -n '/^libraries:/{s:^[^/]*::;p}') fi @@ -158,21 +180,21 @@ src_prepare() { # Fix filename reference in redirected man page sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die + # Tests that use bubblewrap don't work in the sandbox: + # "bwrap: setting up uid map: Permission denied" + # So, disrupt the search for the bwrap executable. + sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ + test/lisp/emacs-lisp/bytecomp-tests.el || die + AT_M4DIR=m4 eautoreconf } src_configure() { - strip-flags - filter-flags -pie #526948 - - if use ia64; then - replace-flags "-O[2-9]" -O1 #325373 - else - replace-flags "-O[3-9]" -O2 - fi - local myconf + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + if use alsa; then use sound || ewarn \ "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." @@ -181,6 +203,14 @@ src_configure() { myconf+=" --with-sound=$(usex sound oss)" fi + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + if ! use gui; then einfo "Configuring to build without window system support" myconf+=" --without-x --without-ns" @@ -190,7 +220,7 @@ src_configure() { myconf+=" --without-x" else myconf+=" --with-x --without-ns" - myconf+=" $(use_with gconf)" + myconf+=" --without-gconf" myconf+=" $(use_with gsettings)" myconf+=" $(use_with toolkit-scroll-bars)" myconf+=" $(use_with gif)" @@ -227,14 +257,21 @@ src_configure() { See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. If you intend to use more than one display, then it is strongly - recommended that you compile Emacs with the Athena/Lucid - toolkit instead. + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. EOF myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" - for f in Xaw3d athena; do + for f in motif Xaw3d athena; do use ${f} && ewarn \ "USE flag \"${f}\" has no effect if \"gtk\" is set." done + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf+=" --with-x-toolkit=motif" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"motif\" is set." + done elif use athena || use Xaw3d; then einfo "Configuring to build with Athena/Lucid toolkit" myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" @@ -253,6 +290,9 @@ src_configure() { popd >/dev/null || die # Don't try to execute the binary for dumping during the build myconf+=" --with-dumping=none" + elif use m68k; then + # Workaround for https://debbugs.gnu.org/44531 + myconf+=" --with-dumping=unexec" else myconf+=" --with-dumping=pdumper" fi @@ -285,11 +325,13 @@ src_configure() { $(use_with systemd libsystemd) \ $(use_with threads) \ $(use_with wide-int) \ - $(use_with zlib) \ ${myconf} } src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + append-cppflags -DUSE_VALGRIND=$(usex valgrind) + if tc-is-cross-compiler; then # Build native tools for compiling lisp etc. emake -C "${S}-build" src @@ -303,6 +345,65 @@ src_compile() { emake } +src_test() { + # List .el test files with a comment above listing the exact + # subtests which caused failure. Elements should begin with a %. + # e.g. %lisp/gnus/mml-sec-tests.el. + local exclude_tests=( + # Reason: not yet known + # mml-secure-en-decrypt-{1,2,3,4} + # mml-secure-find-usable-keys-{1,2} + # mml-secure-key-checks + # mml-secure-select-preferred-keys-4 + # mml-secure-sign-verify-1 + %lisp/gnus/mml-sec-tests.el + + # Reason: race condition + # Looks like it should be fixed in 29.x at least: + # https://debbugs.gnu.org/cgi/bugreport.cgi?bug=55706 + # files-tests-file-name-non-special-file-in-directory-p + %lisp/files-tests.el + + # Reason: permission denied on /nonexistent + # (vc-*-bzr only fails if breezy is installed, as they + # try to access cache dirs under /nonexistent) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: some copyright years differ + %lisp/emacs-lisp/copyright-tests.el + + # Reason: quoting issues (fixed in Emacs 29) + %lib-src/emacsclient-tests.el + + # Reason: tries to access network + # internet-is-working + %src/process-tests.el + ) + use threads || exclude_tests+=( + %src/emacs-module-tests.el + %src/keyboard-tests.el + %src/thread-tests.el + ) + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + src_install() { emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install @@ -310,10 +411,9 @@ src_install() { mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die - # move info dir to avoid collisions with the dir file generated by portage - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die + # dissuade Portage from removing our dir file #257260 touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir - docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir # movemail must be setgid mail if ! use mailutils; then @@ -376,7 +476,7 @@ src_install() { X (while (and (cdr q) (not (string-match re (cadr q)))) X (setq q (cdr q))) X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) EOF elisp-site-file-install "${T}/${SITEFILE}" || die @@ -416,10 +516,9 @@ src_install() { } pkg_preinst() { - # move Info dir file to correct name - if [[ -d ${ED}/usr/share/info ]]; then - mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die - fi + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die } pkg_postinst() { diff --git a/app-editors/emacs/emacs-29.2-r2.ebuild b/app-editors/emacs/emacs-29.2-r2.ebuild new file mode 100644 index 000000000000..970be5ea8634 --- /dev/null +++ b/app-editors/emacs/emacs-29.2-r2.ebuild @@ -0,0 +1,619 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" + EGIT_BRANCH="emacs-29" + EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" + S="${EGIT_CHECKOUT_DIR}" + SLOT="${PV%%.*}-vcs" +else + # FULL_VERSION keeps the full version number, which is needed in + # order to determine some path information correctly for copy/move + # operations later on + FULL_VERSION="${PV%%_*}" + SRC_URI="mirror://gnu/emacs/${P}.tar.xz" + S="${WORKDIR}/emacs-${FULL_VERSION}" + # PV can be in any of the following formats: + # 27.1 released version (slot 27) + # 27.1_rc1 upstream release candidate (27) + # 27.0.9999 live ebuild (slot 27-vcs) + # 27.0.90 upstream prerelease snapshot (27-vcs) + # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) + if [[ ${PV} == *_pre* ]]; then + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + S="${WORKDIR}/emacs" + elif [[ ${PV//[0-9]} != "." ]]; then + SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" + fi + # Patchset from proj/emacs-patches.git + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-2.tar.xz" + PATCHES=("${WORKDIR}/patch") + SLOT="${PV%%.*}" + [[ ${PV} == *.*.* ]] && SLOT+="-vcs" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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" +HOMEPAGE="https://www.gnu.org/software/emacs/" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib" + +X_DEPEND="x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libxcb + x11-libs/xcb-util + x11-misc/xbitmaps + xpm? ( x11-libs/libXpm ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXrender + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + ) + gtk? ( + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4.1= + x11-libs/libXcomposite + ) + ) + !gtk? ( + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXpm + x11-libs/libXmu + x11-libs/libXt + ) + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt + ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) + )" + +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] + sys-libs/ncurses:0= + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + dbus? ( sys-apps/dbus ) + games? ( acct-group/gamestat ) + gmp? ( dev-libs/gmp:0= ) + gpm? ( sys-libs/gpm ) + !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) + json? ( dev-libs/jansson:= ) + kerberos? ( virtual/krb5 ) + lcms? ( media-libs/lcms:2 ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + mailutils? ( net-mail/mailutils[clients] ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) + selinux? ( sys-libs/libselinux ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( net-libs/gnutls:0= ) + systemd? ( sys-apps/systemd ) + tree-sitter? ( dev-libs/tree-sitter:= ) + valgrind? ( dev-debug/valgrind ) + zlib? ( sys-libs/zlib ) + gui? ( + gif? ( media-libs/giflib:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + png? ( >=media-libs/libpng-1.4:0= ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff:= ) + webp? ( media-libs/libwebp:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) + !aqua? ( + gsettings? ( + app-emacs/emacs-common[gsettings(-)] + >=dev-libs/glib-2.28.6 + ) + gtk? ( !X? ( + media-libs/fontconfig + media-libs/freetype + >=x11-libs/cairo-1.12.18 + x11-libs/gtk+:3 + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + xwidgets? ( net-libs/webkit-gtk:4.1= ) + ) ) + !gtk? ( ${X_DEPEND} ) + X? ( ${X_DEPEND} ) + ) + )" + +DEPEND="${RDEPEND} + gui? ( !aqua? ( + !gtk? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) + ) )" + +BDEPEND="sys-apps/texinfo + virtual/pkgconfig + gzip-el? ( app-arch/gzip )" + +IDEPEND="app-eselect/eselect-emacs" + +RDEPEND+=" ${IDEPEND}" + +EMACS_SUFFIX="emacs-${SLOT}" +SITEFILE="20${EMACS_SUFFIX}-gentoo.el" + +# Suppress false positive QA warnings #898304 #925091 +QA_CONFIG_IMPL_DECL_SKIP=( + malloc_set_state malloc_get_state MIN static_assert alignof + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + +src_prepare() { + if [[ ${PV##*.} = 9999 ]]; then + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ + configure.ac) + [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" + einfo "Emacs branch: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" + einfo "Emacs version number: ${FULL_VERSION}" + [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ + || die "Upstream version number changed to ${FULL_VERSION}" + fi + + default + + if use jit; then + find lisp -type f -name "*.elc" -delete || die + + # These files ignore LDFLAGS. We assign the variable here, because + # for live ebuilds FULL_VERSION doesn't exist in global scope + QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" + + # gccjit doesn't play well with ccache or distcc #801580 + # For now, work around the problem with an explicit LIBRARY_PATH + has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ + && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ + | sed -n '/^libraries:/{s:^[^/]*::;p}') + fi + + # Fix filename reference in redirected man page + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die + + # libseccomp is detected by configure but doesn't appear to have any + # effect on the installed image. Suppress it by supplying pkg-config + # with a wrong library name. + sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die + + # Tests that use bubblewrap don't work in the sandbox: + # "bwrap: setting up uid map: Permission denied" + # So, disrupt the search for the bwrap executable. + sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ + test/lisp/emacs-lisp/bytecomp-tests.el || die + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + local myconf + + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + + if use alsa; then + use sound || ewarn \ + "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." + myconf+=" --with-sound=alsa" + else + myconf+=" --with-sound=$(usex sound oss)" + fi + + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + + # Emacs supports these window systems: + # X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa). + # General GUI support is enabled by the "gui" USE flag, then + # the window system is selected as follows: + # "aqua" -> Nextstep + # "gtk -X" -> pure GTK + # otherwise -> X11 + # For X11 there is the further choice of toolkits GTK, Motif, + # Athena (Lucid), or no toolkit. They are enabled (in order of + # preference) with the "gtk", "motif", "Xaw3d", and "athena" flags. + + if ! use gui; then + einfo "Configuring to build without window system support" + myconf+=" --without-x --without-pgtk --without-ns" + elif use aqua; then + einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" + myconf+=" --with-ns --disable-ns-self-contained" + myconf+=" --without-x --without-pgtk" + elif use gtk && ! use X; then + einfo "Configuring to build with pure GTK (without X11) support" + myconf+=" --with-pgtk --without-x --without-ns" + myconf+=" --with-toolkit-scroll-bars" #836392 + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=" $(use_with xwidgets)" + else + # X11 + myconf+=" --with-x --without-pgtk --without-ns" + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with toolkit-scroll-bars)" + myconf+=" $(use_with xpm)" + + if use xft; then + myconf+=" --with-xft" + myconf+=" $(use_with cairo)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + else + myconf+=" --without-xft" + myconf+=" --without-cairo" + myconf+=" --without-libotf --without-m17n-flt" + use cairo && ewarn \ + "USE flag \"cairo\" has no effect if \"xft\" is not set." + use m17n-lib && ewarn \ + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." + fi + + local f line + if use gtk; then + einfo "Configuring to build with GIMP Toolkit (GTK+)" + while read line; do ewarn "${line}"; done <<-EOF + Your version of GTK+ will have problems with closing open + displays. This is no problem if you just use one display, but + if you use more than one and close one of them Emacs may crash. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. + If you intend to use more than one display, then it is strongly + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. + EOF + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + for f in motif Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"gtk\" is set." + done + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf+=" --with-x-toolkit=motif" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"motif\" is set." + done + elif use athena || use Xaw3d; then + einfo "Configuring to build with Athena/Lucid toolkit" + myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" + else + einfo "Configuring to build with no toolkit" + myconf+=" --with-x-toolkit=no" + fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." + fi + + if use gui; then + # Common flags recognised for all GUIs + myconf+=" $(use_with gif)" + myconf+=" $(use_with jpeg)" + myconf+=" $(use_with png)" + myconf+=" $(use_with svg rsvg)" + myconf+=" $(use_with tiff)" + myconf+=" $(use_with webp)" + myconf+=" $(use_with imagemagick)" + fi + + if tc-is-cross-compiler; then + # Configure a CBUILD directory when cross-compiling to make tools + mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die + ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit + popd >/dev/null || die + # Don't try to execute the binary for dumping during the build + myconf+=" --with-dumping=none" + elif use m68k; then + # Workaround for https://debbugs.gnu.org/44531 + myconf+=" --with-dumping=unexec" + else + myconf+=" --with-dumping=pdumper" + fi + + econf \ + --program-suffix="-${EMACS_SUFFIX}" \ + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ + --localstatedir="${EPREFIX}"/var \ + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ + --without-compress-install \ + --without-hesiod \ + --without-pop \ + --with-file-notification=$(usev inotify || usev gfile || echo no) \ + --with-pdumper \ + $(use_enable acl) \ + $(use_with dbus) \ + $(use_with dynamic-loading modules) \ + $(use_with games gameuser ":gamestat") \ + $(use_with gmp libgmp) \ + $(use_with gpm) \ + $(use_with jit native-compilation aot) \ + $(use_with json) \ + $(use_with kerberos) $(use_with kerberos kerberos5) \ + $(use_with lcms lcms2) \ + $(use_with libxml2 xml2) \ + $(use_with mailutils) \ + $(use_with selinux) \ + $(use_with sqlite sqlite3) \ + $(use_with ssl gnutls) \ + $(use_with systemd libsystemd) \ + $(use_with threads) \ + $(use_with tree-sitter) \ + $(use_with wide-int) \ + ${myconf} +} + +src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + append-cppflags -DUSE_VALGRIND=$(usex valgrind) + + if tc-is-cross-compiler; then + # Build native tools for compiling lisp etc. + emake -C "${S}-build" src + emake lib # Cross-compile dependencies first for timestamps + # Save native build tools in the cross-directory + cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die + # Specify the native Emacs to compile lisp + EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) + emake "${EMACS_EMAKE_ARGS[@]}" actual-all + else + EMACS_EMAKE_ARGS=() + emake + fi +} + +src_test() { + # List .el test files with a comment above listing the exact + # subtests which caused failure. Elements should begin with a %. + # e.g. %lisp/gnus/mml-sec-tests.el. + local exclude_tests=( + # Reason: permission denied on /nonexistent + # (vc-*-bzr only fails if breezy is installed, as they + # try to access cache dirs under /nonexistent) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: tries to access network + # internet-is-working + %src/process-tests.el + + # Reason: fails with stable version of tree-sitter-json due to + # ast changes. Bug #922525 + %src/treesit-tests.log + + # Reason: test is not skipped if tree-sitter-tsx is not installed + # Bug #922525 + %lisp/progmodes/typescript-ts-mode-tests.el + ) + use threads || exclude_tests+=( + %lisp/server-tests.el + %lisp/progmodes/eglot-tests.el + %src/emacs-module-tests.el + %src/keyboard-tests.el + ) + use xpm || exclude_tests+=( %src/image-tests.el ) + + # Some tests hang with gnupg-2.2.42 + local gpgver=$(best_version app-crypt/gnupg) + gpgver=${gpgver#*gnupg-} + [[ -n ${gpgver} ]] \ + && ver_test "${gpgver}" -ge 2.2.42 && ver_test "${gpgver}" -lt 2.3 \ + && exclude_tests+=( + %lisp/epg-tests.el + %lisp/gnus/mml-sec-tests.el + ) + + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${T}"/gpg || die + local f + for f in browser extra ssh; do + printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \ + > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die + done + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + +src_install() { + emake \ + "${EMACS_EMAKE_ARGS[@]}" \ + DESTDIR="${D}" \ + NO_BIN_LINK=t \ + BLESSMAIL_TARGET="" \ + install + + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die + + # dissuade Portage from removing our dir file #257260 + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir + + # movemail must be setgid mail + if ! use mailutils; then + fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fi + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die + rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 + rm -rf "${ED}/usr/$(get_libdir)/systemd" || die + rm -rf "${ED}"/var || die + + # remove unused <version>/site-lisp dir + rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die + + # remove COPYING file (except for etc/COPYING used by describe-copying) + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die + + if use systemd; then + insinto /usr/lib/systemd/user + sed -e "/^##/d" \ + -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \ + -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \ + etc/emacs.service | newins - ${EMACS_SUFFIX}.service + assert + fi + + if use gzip-el; then + # compress .el files when a corresponding .elc exists + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el failed" + fi + + local cdir + if use source; then + cdir="/usr/share/emacs/${FULL_VERSION}/src" + insinto "${cdir}" + # This is not meant to install all the source -- just the + # C source you might find via find-function + doins src/*.{c,h,m} + elif has installsources ${FEATURES}; then + cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" + fi + + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die + X + ;;; ${EMACS_SUFFIX} site-lisp configuration + X + (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + Y (setq find-function-C-source-directory + Y "${EPREFIX}${cdir}") + X (let ((path (getenv "INFOPATH")) + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) + X (and path + X ;; move Emacs Info dir before anything else in /usr/share + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS CONTRIBUTE + + if use gui && use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + mv nextstep/Emacs.app \ + "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + fi + + local DOC_CONTENTS="You can set the version to be started by + /usr/bin/emacs through the Emacs eselect module, which also + redirects man and info pages. Therefore, several Emacs versions can + be installed at the same time. \"man emacs.eselect\" for details. + \\n\\nIf you upgrade from a previous major version of Emacs, then + it is strongly recommended that you use app-admin/emacs-updater + to rebuild all byte-compiled elisp files of the installed Emacs + packages." + if use gui; then + DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. + Installing media-fonts/font-adobe-{75,100}dpi on the X server's + machine would satisfy basic Emacs requirements under X11. + See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs + for how to enable anti-aliased fonts." + use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi + tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write + a portable dump file due to being cross-compiled. + To create this file at run time, execute the following command: + \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable + \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" + readme.gentoo_create_doc +} + +pkg_preinst() { + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die +} + +pkg_postinst() { + elisp-site-regen + readme.gentoo_print_elog + + if use livecd; then + # force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd + eselect emacs update + else + eselect emacs update ifunset + fi +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} diff --git a/app-editors/emacs/emacs-29.3-r1.ebuild b/app-editors/emacs/emacs-29.3-r1.ebuild new file mode 100644 index 000000000000..b827e1c7f472 --- /dev/null +++ b/app-editors/emacs/emacs-29.3-r1.ebuild @@ -0,0 +1,627 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" + EGIT_BRANCH="emacs-29" + EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" + S="${EGIT_CHECKOUT_DIR}" + SLOT="${PV%%.*}-vcs" +else + # FULL_VERSION keeps the full version number, which is needed in + # order to determine some path information correctly for copy/move + # operations later on + FULL_VERSION="${PV%%_*}" + SRC_URI="mirror://gnu/emacs/${P}.tar.xz" + S="${WORKDIR}/emacs-${FULL_VERSION}" + # PV can be in any of the following formats: + # 27.1 released version (slot 27) + # 27.1_rc1 upstream release candidate (27) + # 27.0.9999 live ebuild (slot 27-vcs) + # 27.0.90 upstream prerelease snapshot (27-vcs) + # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) + if [[ ${PV} == *_pre* ]]; then + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + S="${WORKDIR}/emacs" + elif [[ ${PV//[0-9]} != "." ]]; then + SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" + fi + # Patchset from proj/emacs-patches.git + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz" + PATCHES=("${WORKDIR}/patch") + SLOT="${PV%%.*}" + [[ ${PV} == *.*.* ]] && SLOT+="-vcs" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~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" +HOMEPAGE="https://www.gnu.org/software/emacs/" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib" + +X_DEPEND="x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libxcb + x11-libs/xcb-util + x11-misc/xbitmaps + xpm? ( x11-libs/libXpm ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXrender + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + ) + gtk? ( + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4.1= + x11-libs/libXcomposite + ) + ) + !gtk? ( + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXpm + x11-libs/libXmu + x11-libs/libXt + ) + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt + ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) + )" + +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] + sys-libs/ncurses:0= + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + dbus? ( sys-apps/dbus ) + games? ( acct-group/gamestat ) + gmp? ( dev-libs/gmp:0= ) + gpm? ( sys-libs/gpm ) + !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) + json? ( dev-libs/jansson:= ) + kerberos? ( virtual/krb5 ) + lcms? ( media-libs/lcms:2 ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + mailutils? ( net-mail/mailutils[clients] ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) + selinux? ( sys-libs/libselinux ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( net-libs/gnutls:0= ) + systemd? ( sys-apps/systemd ) + tree-sitter? ( dev-libs/tree-sitter:= ) + valgrind? ( dev-debug/valgrind ) + zlib? ( sys-libs/zlib ) + gui? ( + gif? ( media-libs/giflib:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + png? ( >=media-libs/libpng-1.4:0= ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff:= ) + webp? ( media-libs/libwebp:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) + !aqua? ( + gsettings? ( + app-emacs/emacs-common[gsettings(-)] + >=dev-libs/glib-2.28.6 + ) + gtk? ( !X? ( + media-libs/fontconfig + media-libs/freetype + >=x11-libs/cairo-1.12.18 + x11-libs/gtk+:3 + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + xwidgets? ( net-libs/webkit-gtk:4.1= ) + ) ) + !gtk? ( ${X_DEPEND} ) + X? ( ${X_DEPEND} ) + ) + )" + +DEPEND="${RDEPEND} + gui? ( !aqua? ( + !gtk? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) + ) )" + +BDEPEND="sys-apps/texinfo + virtual/pkgconfig + gzip-el? ( app-arch/gzip )" + +IDEPEND="app-eselect/eselect-emacs" + +RDEPEND+=" ${IDEPEND}" + +EMACS_SUFFIX="emacs-${SLOT}" +SITEFILE="20${EMACS_SUFFIX}-gentoo.el" + +# Suppress false positive QA warnings #898304 #925091 +QA_CONFIG_IMPL_DECL_SKIP=( + malloc_set_state malloc_get_state MIN static_assert alignof + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + +src_prepare() { + if [[ ${PV##*.} = 9999 ]]; then + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ + configure.ac) + [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" + einfo "Emacs branch: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" + einfo "Emacs version number: ${FULL_VERSION}" + [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ + || die "Upstream version number changed to ${FULL_VERSION}" + fi + + default + + if use jit; then + find lisp -type f -name "*.elc" -delete || die + + # These files ignore LDFLAGS. We assign the variable here, because + # for live ebuilds FULL_VERSION doesn't exist in global scope + QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" + + # gccjit doesn't play well with ccache or distcc #801580 + # For now, work around the problem with an explicit LIBRARY_PATH + has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ + && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ + | sed -n '/^libraries:/{s:^[^/]*::;p}') + fi + + # Fix filename reference in redirected man page + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die + + # libseccomp is detected by configure but doesn't appear to have any + # effect on the installed image. Suppress it by supplying pkg-config + # with a wrong library name. + sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die + + # Tests that use bubblewrap don't work in the sandbox: + # "bwrap: setting up uid map: Permission denied" + # So, disrupt the search for the bwrap executable. + sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ + test/lisp/emacs-lisp/bytecomp-tests.el || die + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + local myconf + + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + + if use alsa; then + use sound || ewarn \ + "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." + myconf+=" --with-sound=alsa" + else + myconf+=" --with-sound=$(usex sound oss)" + fi + + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + + # Emacs supports these window systems: + # X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa). + # General GUI support is enabled by the "gui" USE flag, then + # the window system is selected as follows: + # "aqua" -> Nextstep + # "gtk -X" -> pure GTK + # otherwise -> X11 + # For X11 there is the further choice of toolkits GTK, Motif, + # Athena (Lucid), or no toolkit. They are enabled (in order of + # preference) with the "gtk", "motif", "Xaw3d", and "athena" flags. + + if ! use gui; then + einfo "Configuring to build without window system support" + myconf+=" --without-x --without-pgtk --without-ns" + elif use aqua; then + einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" + myconf+=" --with-ns --disable-ns-self-contained" + myconf+=" --without-x --without-pgtk" + elif use gtk && ! use X; then + einfo "Configuring to build with pure GTK (without X11) support" + myconf+=" --with-pgtk --without-x --without-ns" + myconf+=" --with-toolkit-scroll-bars" #836392 + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=" $(use_with xwidgets)" + else + # X11 + myconf+=" --with-x --without-pgtk --without-ns" + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with toolkit-scroll-bars)" + myconf+=" $(use_with xpm)" + + if use xft; then + myconf+=" --with-xft" + myconf+=" $(use_with cairo)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + else + myconf+=" --without-xft" + myconf+=" --without-cairo" + myconf+=" --without-libotf --without-m17n-flt" + use cairo && ewarn \ + "USE flag \"cairo\" has no effect if \"xft\" is not set." + use m17n-lib && ewarn \ + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." + fi + + local f line + if use gtk; then + einfo "Configuring to build with GIMP Toolkit (GTK+)" + while read line; do ewarn "${line}"; done <<-EOF + Your version of GTK+ will have problems with closing open + displays. This is no problem if you just use one display, but + if you use more than one and close one of them Emacs may crash. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. + If you intend to use more than one display, then it is strongly + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. + EOF + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + for f in motif Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"gtk\" is set." + done + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf+=" --with-x-toolkit=motif" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"motif\" is set." + done + elif use athena || use Xaw3d; then + einfo "Configuring to build with Athena/Lucid toolkit" + myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" + else + einfo "Configuring to build with no toolkit" + myconf+=" --with-x-toolkit=no" + fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." + fi + + if use gui; then + # Common flags recognised for all GUIs + myconf+=" $(use_with gif)" + myconf+=" $(use_with jpeg)" + myconf+=" $(use_with png)" + myconf+=" $(use_with svg rsvg)" + myconf+=" $(use_with tiff)" + myconf+=" $(use_with webp)" + myconf+=" $(use_with imagemagick)" + fi + + if tc-is-cross-compiler; then + # Configure a CBUILD directory when cross-compiling to make tools + mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die + ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit + popd >/dev/null || die + # Don't try to execute the binary for dumping during the build + myconf+=" --with-dumping=none" + elif use m68k; then + # Workaround for https://debbugs.gnu.org/44531 + myconf+=" --with-dumping=unexec" + else + myconf+=" --with-dumping=pdumper" + fi + + econf \ + --program-suffix="-${EMACS_SUFFIX}" \ + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ + --localstatedir="${EPREFIX}"/var \ + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ + --without-compress-install \ + --without-hesiod \ + --without-pop \ + --with-file-notification=$(usev inotify || usev gfile || echo no) \ + --with-pdumper \ + $(use_enable acl) \ + $(use_with dbus) \ + $(use_with dynamic-loading modules) \ + $(use_with games gameuser ":gamestat") \ + $(use_with gmp libgmp) \ + $(use_with gpm) \ + $(use_with jit native-compilation aot) \ + $(use_with json) \ + $(use_with kerberos) $(use_with kerberos kerberos5) \ + $(use_with lcms lcms2) \ + $(use_with libxml2 xml2) \ + $(use_with mailutils) \ + $(use_with selinux) \ + $(use_with sqlite sqlite3) \ + $(use_with ssl gnutls) \ + $(use_with systemd libsystemd) \ + $(use_with threads) \ + $(use_with tree-sitter) \ + $(use_with wide-int) \ + ${myconf} +} + +src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + append-cppflags -DUSE_VALGRIND=$(usex valgrind) + + if tc-is-cross-compiler; then + # Build native tools for compiling lisp etc. + emake -C "${S}-build" src + emake lib # Cross-compile dependencies first for timestamps + # Save native build tools in the cross-directory + cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die + # Specify the native Emacs to compile lisp + EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) + emake "${EMACS_EMAKE_ARGS[@]}" actual-all + else + EMACS_EMAKE_ARGS=() + emake + fi +} + +src_test() { + # List .el test files with a comment above listing the exact + # subtests which caused failure. Elements should begin with a %. + # e.g. %lisp/gnus/mml-sec-tests.el. + local exclude_tests=( + # Reason: permission denied on /nonexistent + # (vc-*-bzr only fails if breezy is installed, as they + # try to access cache dirs under /nonexistent) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: tries to access network + # internet-is-working + %src/process-tests.el + + # Reason: fails with stable version of tree-sitter-json due to + # ast changes. Bug #922525 + %src/treesit-tests.log + + # Reason: test is not skipped if tree-sitter-tsx is not installed + # Bug #922525 + %lisp/progmodes/typescript-ts-mode-tests.el + ) + use threads || exclude_tests+=( + %lisp/server-tests.el + %lisp/progmodes/eglot-tests.el + %src/emacs-module-tests.el + %src/keyboard-tests.el + ) + use xpm || exclude_tests+=( %src/image-tests.el ) + + # Some tests hang with gnupg-2.2.42 + local gpgver=$(best_version app-crypt/gnupg) + gpgver=${gpgver#*gnupg-} + [[ -n ${gpgver} ]] \ + && ver_test "${gpgver}" -ge 2.2.42 && ver_test "${gpgver}" -lt 2.3 \ + && exclude_tests+=( + %lisp/epg-tests.el + %lisp/gnus/mml-sec-tests.el + ) + + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${T}"/gpg || die + local f + for f in browser extra ssh; do + printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \ + > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die + done + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + +src_install() { + emake \ + "${EMACS_EMAKE_ARGS[@]}" \ + DESTDIR="${D}" \ + NO_BIN_LINK=t \ + BLESSMAIL_TARGET="" \ + install + + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die + + # dissuade Portage from removing our dir file #257260 + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir + + # movemail must be setgid mail + if ! use mailutils; then + fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fi + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die + rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 + rm -rf "${ED}/usr/$(get_libdir)/systemd" || die + rm -rf "${ED}"/var || die + + # remove unused <version>/site-lisp dir + rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die + + # remove COPYING file (except for etc/COPYING used by describe-copying) + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die + + if use systemd; then + insinto /usr/lib/systemd/user + sed -e "/^##/d" \ + -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \ + -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \ + etc/emacs.service | newins - ${EMACS_SUFFIX}.service + assert + fi + + if use gzip-el; then + # compress .el files when a corresponding .elc exists + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el failed" + fi + + local cdir + if use source; then + cdir="/usr/share/emacs/${FULL_VERSION}/src" + insinto "${cdir}" + # This is not meant to install all the source -- just the + # C source you might find via find-function + doins src/*.{c,h,m} + elif has installsources ${FEATURES}; then + cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" + fi + + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die + X + ;;; ${EMACS_SUFFIX} site-lisp configuration + X + (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + Y (setq find-function-C-source-directory + Y "${EPREFIX}${cdir}") + X (let ((path (getenv "INFOPATH")) + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) + X (and path + X ;; move Emacs Info dir before anything else in /usr/share + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS CONTRIBUTE + + if use gui && use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + mv nextstep/Emacs.app \ + "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + fi + + local DOC_CONTENTS="You can set the version to be started by + /usr/bin/emacs through the Emacs eselect module, which also + redirects man and info pages. Therefore, several Emacs versions can + be installed at the same time. \"man emacs.eselect\" for details. + \\n\\nIf you upgrade from a previous major version of Emacs, then + it is strongly recommended that you use app-admin/emacs-updater + to rebuild all byte-compiled elisp files of the installed Emacs + packages." + if use gui; then + DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. + Installing media-fonts/font-adobe-{75,100}dpi on the X server's + machine would satisfy basic Emacs requirements under X11. + See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs + for how to enable anti-aliased fonts." + use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi + if ! use mailutils; then + DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs' + own e-mail features are going to be used as an e-mail client + (e.g. Rmail), you are strongly encouraged to enable it. If not, + Emacs will use its own implementation of movemail; which has + fewer features and is less secure. For more information see: + https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html" + fi + tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write + a portable dump file due to being cross-compiled. + To create this file at run time, execute the following command: + \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable + \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" + readme.gentoo_create_doc +} + +pkg_preinst() { + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die +} + +pkg_postinst() { + elisp-site-regen + readme.gentoo_print_elog + + if use livecd; then + # force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd + eselect emacs update + else + eselect emacs update ifunset + fi +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} diff --git a/app-editors/emacs/emacs-29.3.9999.ebuild b/app-editors/emacs/emacs-29.3.9999.ebuild new file mode 100644 index 000000000000..fbd5febcfaa7 --- /dev/null +++ b/app-editors/emacs/emacs-29.3.9999.ebuild @@ -0,0 +1,614 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" + EGIT_BRANCH="emacs-29" + EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" + S="${EGIT_CHECKOUT_DIR}" + SLOT="${PV%%.*}-vcs" +else + # FULL_VERSION keeps the full version number, which is needed in + # order to determine some path information correctly for copy/move + # operations later on + FULL_VERSION="${PV%%_*}" + SRC_URI="mirror://gnu/emacs/${P}.tar.xz" + S="${WORKDIR}/emacs-${FULL_VERSION}" + # PV can be in any of the following formats: + # 27.1 released version (slot 27) + # 27.1_rc1 upstream release candidate (27) + # 27.0.9999 live ebuild (slot 27-vcs) + # 27.0.90 upstream prerelease snapshot (27-vcs) + # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) + if [[ ${PV} == *_pre* ]]; then + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + S="${WORKDIR}/emacs" + elif [[ ${PV//[0-9]} != "." ]]; then + SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" + fi + SLOT="${PV%%.*}" + [[ ${PV} == *.*.* ]] && SLOT+="-vcs" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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" +HOMEPAGE="https://www.gnu.org/software/emacs/" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X Xaw3d xft +xpm xwidgets zlib" + +X_DEPEND="x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libxcb + x11-libs/xcb-util + x11-misc/xbitmaps + xpm? ( x11-libs/libXpm ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXrender + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + ) + gtk? ( + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4.1= + x11-libs/libXcomposite + ) + ) + !gtk? ( + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXpm + x11-libs/libXmu + x11-libs/libXt + ) + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt + ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) + )" + +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] + sys-libs/ncurses:0= + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + dbus? ( sys-apps/dbus ) + games? ( acct-group/gamestat ) + gmp? ( dev-libs/gmp:0= ) + gpm? ( sys-libs/gpm ) + !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) + json? ( dev-libs/jansson:= ) + kerberos? ( virtual/krb5 ) + lcms? ( media-libs/lcms:2 ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + mailutils? ( net-mail/mailutils[clients] ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) + selinux? ( sys-libs/libselinux ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( net-libs/gnutls:0= ) + systemd? ( sys-apps/systemd ) + tree-sitter? ( dev-libs/tree-sitter:= ) + valgrind? ( dev-debug/valgrind ) + zlib? ( sys-libs/zlib ) + gui? ( + gif? ( media-libs/giflib:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + png? ( >=media-libs/libpng-1.4:0= ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff:= ) + webp? ( media-libs/libwebp:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) + !aqua? ( + gsettings? ( + app-emacs/emacs-common[gsettings(-)] + >=dev-libs/glib-2.28.6 + ) + gtk? ( !X? ( + media-libs/fontconfig + media-libs/freetype + >=x11-libs/cairo-1.12.18 + x11-libs/gtk+:3 + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + xwidgets? ( net-libs/webkit-gtk:4.1= ) + ) ) + !gtk? ( ${X_DEPEND} ) + X? ( ${X_DEPEND} ) + ) + )" + +DEPEND="${RDEPEND} + gui? ( !aqua? ( + !gtk? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) + ) )" + +BDEPEND="sys-apps/texinfo + virtual/pkgconfig + gzip-el? ( app-arch/gzip )" + +IDEPEND="app-eselect/eselect-emacs" + +RDEPEND+=" ${IDEPEND}" + +EMACS_SUFFIX="emacs-${SLOT}" +SITEFILE="20${EMACS_SUFFIX}-gentoo.el" + +# Suppress false positive QA warnings #898304 #925091 +QA_CONFIG_IMPL_DECL_SKIP=( + malloc_set_state malloc_get_state MIN static_assert alignof + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + +src_prepare() { + if [[ ${PV##*.} = 9999 ]]; then + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ + configure.ac) + [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" + einfo "Emacs branch: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" + einfo "Emacs version number: ${FULL_VERSION}" + [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ + || die "Upstream version number changed to ${FULL_VERSION}" + fi + + default + + if use jit; then + find lisp -type f -name "*.elc" -delete || die + + # These files ignore LDFLAGS. We assign the variable here, because + # for live ebuilds FULL_VERSION doesn't exist in global scope + QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" + + # gccjit doesn't play well with ccache or distcc #801580 + # For now, work around the problem with an explicit LIBRARY_PATH + has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ + && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ + | sed -n '/^libraries:/{s:^[^/]*::;p}') + fi + + # Fix filename reference in redirected man page + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die + + # libseccomp is detected by configure but doesn't appear to have any + # effect on the installed image. Suppress it by supplying pkg-config + # with a wrong library name. + sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die + + # Tests that use bubblewrap don't work in the sandbox: + # "bwrap: setting up uid map: Permission denied" + # So, disrupt the search for the bwrap executable. + sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ + test/lisp/emacs-lisp/bytecomp-tests.el || die + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + local myconf + + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + + if use alsa; then + use sound || ewarn \ + "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." + myconf+=" --with-sound=alsa" + else + myconf+=" --with-sound=$(usex sound oss)" + fi + + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + + # Emacs supports these window systems: + # X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa). + # General GUI support is enabled by the "gui" USE flag, then + # the window system is selected as follows: + # "aqua" -> Nextstep + # "gtk -X" -> pure GTK + # otherwise -> X11 + # For X11 there is the further choice of toolkits GTK, Motif, + # Athena (Lucid), or no toolkit. They are enabled (in order of + # preference) with the "gtk", "motif", "Xaw3d", and "athena" flags. + + if ! use gui; then + einfo "Configuring to build without window system support" + myconf+=" --without-x --without-pgtk --without-ns" + elif use aqua; then + einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" + myconf+=" --with-ns --disable-ns-self-contained" + myconf+=" --without-x --without-pgtk" + elif use gtk && ! use X; then + einfo "Configuring to build with pure GTK (without X11) support" + myconf+=" --with-pgtk --without-x --without-ns" + myconf+=" --with-toolkit-scroll-bars" #836392 + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=" $(use_with xwidgets)" + else + # X11 + myconf+=" --with-x --without-pgtk --without-ns" + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with toolkit-scroll-bars)" + myconf+=" $(use_with xpm)" + + if use xft; then + myconf+=" --with-xft" + myconf+=" $(use_with cairo)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + else + myconf+=" --without-xft" + myconf+=" --without-cairo" + myconf+=" --without-libotf --without-m17n-flt" + use cairo && ewarn \ + "USE flag \"cairo\" has no effect if \"xft\" is not set." + use m17n-lib && ewarn \ + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." + fi + + local f line + if use gtk; then + einfo "Configuring to build with GIMP Toolkit (GTK+)" + while read line; do ewarn "${line}"; done <<-EOF + Your version of GTK+ will have problems with closing open + displays. This is no problem if you just use one display, but + if you use more than one and close one of them Emacs may crash. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. + If you intend to use more than one display, then it is strongly + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. + EOF + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + for f in motif Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"gtk\" is set." + done + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf+=" --with-x-toolkit=motif" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"motif\" is set." + done + elif use athena || use Xaw3d; then + einfo "Configuring to build with Athena/Lucid toolkit" + myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" + else + einfo "Configuring to build with no toolkit" + myconf+=" --with-x-toolkit=no" + fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." + fi + + if use gui; then + # Common flags recognised for all GUIs + myconf+=" $(use_with gif)" + myconf+=" $(use_with jpeg)" + myconf+=" $(use_with png)" + myconf+=" $(use_with svg rsvg)" + myconf+=" $(use_with tiff)" + myconf+=" $(use_with webp)" + myconf+=" $(use_with imagemagick)" + fi + + if tc-is-cross-compiler; then + # Configure a CBUILD directory when cross-compiling to make tools + mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die + ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit + popd >/dev/null || die + # Don't try to execute the binary for dumping during the build + myconf+=" --with-dumping=none" + elif use m68k; then + # Workaround for https://debbugs.gnu.org/44531 + myconf+=" --with-dumping=unexec" + else + myconf+=" --with-dumping=pdumper" + fi + + econf \ + --program-suffix="-${EMACS_SUFFIX}" \ + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ + --localstatedir="${EPREFIX}"/var \ + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ + --without-compress-install \ + --without-hesiod \ + --without-pop \ + --with-file-notification=$(usev inotify || usev gfile || echo no) \ + --with-pdumper \ + $(use_enable acl) \ + $(use_with dbus) \ + $(use_with dynamic-loading modules) \ + $(use_with games gameuser ":gamestat") \ + $(use_with gmp libgmp) \ + $(use_with gpm) \ + $(use_with jit native-compilation aot) \ + $(use_with json) \ + $(use_with kerberos) $(use_with kerberos kerberos5) \ + $(use_with lcms lcms2) \ + $(use_with libxml2 xml2) \ + $(use_with mailutils) \ + $(use_with selinux) \ + $(use_with sqlite sqlite3) \ + $(use_with ssl gnutls) \ + $(use_with systemd libsystemd) \ + $(use_with threads) \ + $(use_with tree-sitter) \ + $(use_with wide-int) \ + ${myconf} +} + +src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + append-cppflags -DUSE_VALGRIND=$(usex valgrind) + + if tc-is-cross-compiler; then + # Build native tools for compiling lisp etc. + emake -C "${S}-build" src + emake lib # Cross-compile dependencies first for timestamps + # Save native build tools in the cross-directory + cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die + # Specify the native Emacs to compile lisp + EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) + emake "${EMACS_EMAKE_ARGS[@]}" actual-all + else + EMACS_EMAKE_ARGS=() + emake + fi +} + +src_test() { + # List .el test files with a comment above listing the exact + # subtests which caused failure. Elements should begin with a %. + # e.g. %lisp/gnus/mml-sec-tests.el. + local exclude_tests=( + # Reason: permission denied on /nonexistent + # (vc-*-bzr only fails if breezy is installed, as they + # try to access cache dirs under /nonexistent) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: tries to access network + # internet-is-working + %src/process-tests.el + + # Reason: fails with stable version of tree-sitter-json due to + # ast changes. Bug #922525 + %src/treesit-tests.log + + # Reason: test is not skipped if tree-sitter-tsx is not installed + # Bug #922525 + %lisp/progmodes/typescript-ts-mode-tests.el + ) + use threads || exclude_tests+=( + %lisp/server-tests.el + %lisp/progmodes/eglot-tests.el + %src/emacs-module-tests.el + %src/keyboard-tests.el + ) + use xpm || exclude_tests+=( %src/image-tests.el ) + + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${T}"/gpg || die + local f + for f in browser extra ssh; do + printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \ + > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die + done + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + +src_install() { + emake \ + "${EMACS_EMAKE_ARGS[@]}" \ + DESTDIR="${D}" \ + NO_BIN_LINK=t \ + BLESSMAIL_TARGET="" \ + install + + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die + + # dissuade Portage from removing our dir file #257260 + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir + + # movemail must be setgid mail + if ! use mailutils; then + fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fi + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die + rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 + rm -rf "${ED}/usr/$(get_libdir)/systemd" || die + rm -rf "${ED}"/var || die + + # remove unused <version>/site-lisp dir + rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die + + # remove COPYING file (except for etc/COPYING used by describe-copying) + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die + + if use systemd; then + insinto /usr/lib/systemd/user + sed -e "/^##/d" \ + -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \ + -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \ + etc/emacs.service | newins - ${EMACS_SUFFIX}.service + assert + fi + + if use gzip-el; then + # compress .el files when a corresponding .elc exists + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el failed" + fi + + local cdir + if use source; then + cdir="/usr/share/emacs/${FULL_VERSION}/src" + insinto "${cdir}" + # This is not meant to install all the source -- just the + # C source you might find via find-function + doins src/*.{c,h,m} + elif has installsources ${FEATURES}; then + cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" + fi + + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die + X + ;;; ${EMACS_SUFFIX} site-lisp configuration + X + (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + Y (setq find-function-C-source-directory + Y "${EPREFIX}${cdir}") + X (let ((path (getenv "INFOPATH")) + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) + X (and path + X ;; move Emacs Info dir before anything else in /usr/share + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS CONTRIBUTE + + if use gui && use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + mv nextstep/Emacs.app \ + "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + fi + + local DOC_CONTENTS="You can set the version to be started by + /usr/bin/emacs through the Emacs eselect module, which also + redirects man and info pages. Therefore, several Emacs versions can + be installed at the same time. \"man emacs.eselect\" for details. + \\n\\nIf you upgrade from a previous major version of Emacs, then + it is strongly recommended that you use app-admin/emacs-updater + to rebuild all byte-compiled elisp files of the installed Emacs + packages." + if use gui; then + DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. + Installing media-fonts/font-adobe-{75,100}dpi on the X server's + machine would satisfy basic Emacs requirements under X11. + See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs + for how to enable anti-aliased fonts." + use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi + if ! use mailutils; then + DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs' + own e-mail features are going to be used as an e-mail client + (e.g. Rmail), you are strongly encouraged to enable it. If not, + Emacs will use its own implementation of movemail; which has + fewer features and is less secure. For more information see: + https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html" + fi + tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write + a portable dump file due to being cross-compiled. + To create this file at run time, execute the following command: + \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable + \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" + readme.gentoo_create_doc +} + +pkg_preinst() { + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die +} + +pkg_postinst() { + elisp-site-regen + readme.gentoo_print_elog + + if use livecd; then + # force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd + eselect emacs update + else + eselect emacs update ifunset + fi +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild new file mode 100644 index 000000000000..572a28d32bdb --- /dev/null +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -0,0 +1,614 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs + +if [[ ${PV##*.} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git" + EGIT_BRANCH="master" + EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" + S="${EGIT_CHECKOUT_DIR}" + SLOT="${PV%%.*}-vcs" +else + # FULL_VERSION keeps the full version number, which is needed in + # order to determine some path information correctly for copy/move + # operations later on + FULL_VERSION="${PV%%_*}" + SRC_URI="mirror://gnu/emacs/${P}.tar.xz" + S="${WORKDIR}/emacs-${FULL_VERSION}" + # PV can be in any of the following formats: + # 27.1 released version (slot 27) + # 27.1_rc1 upstream release candidate (27) + # 27.0.9999 live ebuild (slot 27-vcs) + # 27.0.90 upstream prerelease snapshot (27-vcs) + # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) + if [[ ${PV} == *_pre* ]]; then + SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" + S="${WORKDIR}/emacs" + elif [[ ${PV//[0-9]} != "." ]]; then + SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" + fi + SLOT="${PV%%.*}" + [[ ${PV} == *.*.* ]] && SLOT+="-vcs" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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" +HOMEPAGE="https://www.gnu.org/software/emacs/" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars tree-sitter valgrind webp wide-int +X xattr Xaw3d xft +xpm xwidgets zlib" + +X_DEPEND="x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libxcb + x11-libs/xcb-util + x11-misc/xbitmaps + xpm? ( x11-libs/libXpm ) + xft? ( + media-libs/fontconfig + media-libs/freetype + x11-libs/libXrender + cairo? ( >=x11-libs/cairo-1.12.18[X] ) + !cairo? ( x11-libs/libXft ) + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + ) + gtk? ( + x11-libs/gtk+:3 + xwidgets? ( + net-libs/webkit-gtk:4.1= + x11-libs/libXcomposite + ) + ) + !gtk? ( + motif? ( + >=x11-libs/motif-2.3:0 + x11-libs/libXpm + x11-libs/libXmu + x11-libs/libXt + ) + !motif? ( + Xaw3d? ( + x11-libs/libXaw3d + x11-libs/libXmu + x11-libs/libXt + ) + !Xaw3d? ( athena? ( + x11-libs/libXaw + x11-libs/libXmu + x11-libs/libXt + ) ) + ) + )" + +RDEPEND="app-emacs/emacs-common[games?,gui(-)?] + sys-libs/ncurses:0= + acl? ( virtual/acl ) + alsa? ( media-libs/alsa-lib ) + dbus? ( sys-apps/dbus ) + games? ( acct-group/gamestat ) + gmp? ( dev-libs/gmp:0= ) + gpm? ( sys-libs/gpm ) + !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) + jit? ( + sys-devel/gcc:=[jit(-)] + sys-libs/zlib + ) + kerberos? ( virtual/krb5 ) + lcms? ( media-libs/lcms:2 ) + libxml2? ( >=dev-libs/libxml2-2.2.0 ) + mailutils? ( net-mail/mailutils[clients] ) + !mailutils? ( acct-group/mail net-libs/liblockfile ) + selinux? ( sys-libs/libselinux ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( net-libs/gnutls:0= ) + systemd? ( sys-apps/systemd ) + tree-sitter? ( dev-libs/tree-sitter:= ) + valgrind? ( dev-debug/valgrind ) + xattr? ( sys-apps/attr ) + zlib? ( sys-libs/zlib ) + gui? ( + gif? ( media-libs/giflib:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + png? ( >=media-libs/libpng-1.4:0= ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff:= ) + webp? ( media-libs/libwebp:0= ) + imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) + !aqua? ( + gsettings? ( + app-emacs/emacs-common[gsettings(-)] + >=dev-libs/glib-2.28.6 + ) + gtk? ( !X? ( + media-libs/fontconfig + media-libs/freetype + >=x11-libs/cairo-1.12.18 + x11-libs/gtk+:3 + harfbuzz? ( media-libs/harfbuzz:0= ) + m17n-lib? ( + >=dev-libs/libotf-0.9.4 + >=dev-libs/m17n-lib-1.5.1 + ) + xwidgets? ( net-libs/webkit-gtk:4.1= ) + ) ) + !gtk? ( ${X_DEPEND} ) + X? ( ${X_DEPEND} ) + ) + )" + +DEPEND="${RDEPEND} + gui? ( !aqua? ( + !gtk? ( x11-base/xorg-proto ) + X? ( x11-base/xorg-proto ) + ) )" + +BDEPEND="sys-apps/texinfo + virtual/pkgconfig + gzip-el? ( app-arch/gzip )" + +IDEPEND="app-eselect/eselect-emacs" + +RDEPEND+=" ${IDEPEND}" + +EMACS_SUFFIX="emacs-${SLOT}" +SITEFILE="20${EMACS_SUFFIX}-gentoo.el" + +# Suppress false positive QA warnings #898304 #925091 +QA_CONFIG_IMPL_DECL_SKIP=( + malloc_set_state malloc_get_state MIN static_assert alignof unreachable + statvfs64 re_set_syntax re_compile_pattern re_search re_match +) + +src_prepare() { + if [[ ${PV##*.} = 9999 ]]; then + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ + configure.ac) + [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" + einfo "Emacs branch: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" + einfo "Emacs version number: ${FULL_VERSION}" + [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ + || die "Upstream version number changed to ${FULL_VERSION}" + fi + + default + + if use jit; then + find lisp -type f -name "*.elc" -delete || die + + # These files ignore LDFLAGS. We assign the variable here, because + # for live ebuilds FULL_VERSION doesn't exist in global scope + QA_FLAGS_IGNORED="usr/$(get_libdir)/emacs/${FULL_VERSION}/native-lisp/.*" + + # gccjit doesn't play well with ccache or distcc #801580 + # For now, work around the problem with an explicit LIBRARY_PATH + has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ + && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ + | sed -n '/^libraries:/{s:^[^/]*::;p}') + fi + + # Fix filename reference in redirected man page + sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die + + # libseccomp is detected by configure but doesn't appear to have any + # effect on the installed image. Suppress it by supplying pkg-config + # with a wrong library name. + sed -i -e "/CHECK_MODULES/s/libseccomp/DiSaBlE&/" configure.ac || die + + # Tests that use bubblewrap don't work in the sandbox: + # "bwrap: setting up uid map: Permission denied" + # So, disrupt the search for the bwrap executable. + sed -i -e 's/(executable-find "bwrap")/nil/' test/src/emacs-tests.el \ + test/lisp/emacs-lisp/bytecomp-tests.el || die + + AT_M4DIR=m4 eautoreconf +} + +src_configure() { + local myconf + + # Prevents e.g. tests interfering with running Emacs. + unset EMACS_SOCKET_NAME + + if use alsa; then + use sound || ewarn \ + "USE flag \"alsa\" overrides \"-sound\"; enabling sound support." + myconf+=" --with-sound=alsa" + else + myconf+=" --with-sound=$(usex sound oss)" + fi + + if use jit; then + use zlib || ewarn \ + "USE flag \"jit\" overrides \"-zlib\"; enabling zlib support." + myconf+=" --with-zlib" + else + myconf+=" $(use_with zlib)" + fi + + # Emacs supports these window systems: + # X11, pure GTK (without X11), or Nextstep (Aqua/Cocoa). + # General GUI support is enabled by the "gui" USE flag, then + # the window system is selected as follows: + # "aqua" -> Nextstep + # "gtk -X" -> pure GTK + # otherwise -> X11 + # For X11 there is the further choice of toolkits GTK, Motif, + # Athena (Lucid), or no toolkit. They are enabled (in order of + # preference) with the "gtk", "motif", "Xaw3d", and "athena" flags. + + if ! use gui; then + einfo "Configuring to build without window system support" + myconf+=" --without-x --without-pgtk --without-ns" + elif use aqua; then + einfo "Configuring to build with Nextstep (Macintosh Cocoa) support" + myconf+=" --with-ns --disable-ns-self-contained" + myconf+=" --without-x --without-pgtk" + elif use gtk && ! use X; then + einfo "Configuring to build with pure GTK (without X11) support" + myconf+=" --with-pgtk --without-x --without-ns" + myconf+=" --with-toolkit-scroll-bars" #836392 + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + myconf+=" $(use_with xwidgets)" + else + # X11 + myconf+=" --with-x --without-pgtk --without-ns" + myconf+=" --without-gconf" + myconf+=" $(use_with gsettings)" + myconf+=" $(use_with toolkit-scroll-bars)" + myconf+=" $(use_with xpm)" + + if use xft; then + myconf+=" --with-xft" + myconf+=" $(use_with cairo)" + myconf+=" $(use_with harfbuzz)" + myconf+=" $(use_with m17n-lib libotf)" + myconf+=" $(use_with m17n-lib m17n-flt)" + else + myconf+=" --without-xft" + myconf+=" --without-cairo" + myconf+=" --without-libotf --without-m17n-flt" + use cairo && ewarn \ + "USE flag \"cairo\" has no effect if \"xft\" is not set." + use m17n-lib && ewarn \ + "USE flag \"m17n-lib\" has no effect if \"xft\" is not set." + fi + + local f line + if use gtk; then + einfo "Configuring to build with GIMP Toolkit (GTK+)" + while read line; do ewarn "${line}"; done <<-EOF + Your version of GTK+ will have problems with closing open + displays. This is no problem if you just use one display, but + if you use more than one and close one of them Emacs may crash. + See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and + <https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>. + If you intend to use more than one display, then it is strongly + recommended that you compile Emacs with the Athena/Lucid or the + Motif toolkit instead. + EOF + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + for f in motif Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"gtk\" is set." + done + elif use motif; then + einfo "Configuring to build with Motif toolkit" + myconf+=" --with-x-toolkit=motif" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"motif\" is set." + done + elif use athena || use Xaw3d; then + einfo "Configuring to build with Athena/Lucid toolkit" + myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)" + else + einfo "Configuring to build with no toolkit" + myconf+=" --with-x-toolkit=no" + fi + ! use gtk && use xwidgets && ewarn \ + "USE flag \"xwidgets\" has no effect if \"gtk\" is not set." + fi + + if use gui; then + # Common flags recognised for all GUIs + myconf+=" $(use_with gif)" + myconf+=" $(use_with jpeg)" + myconf+=" $(use_with png)" + myconf+=" $(use_with svg rsvg)" + myconf+=" $(use_with tiff)" + myconf+=" $(use_with webp)" + myconf+=" $(use_with imagemagick)" + fi + + if tc-is-cross-compiler; then + # Configure a CBUILD directory when cross-compiling to make tools + mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die + ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit + popd >/dev/null || die + # Don't try to execute the binary for dumping during the build + myconf+=" --with-dumping=none" + elif use m68k; then + # Workaround for https://debbugs.gnu.org/44531 + myconf+=" --with-dumping=unexec" + else + myconf+=" --with-dumping=pdumper" + fi + + econf \ + --program-suffix="-${EMACS_SUFFIX}" \ + --includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \ + --infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \ + --localstatedir="${EPREFIX}"/var \ + --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \ + --without-compress-install \ + --without-hesiod \ + --without-pop \ + --with-file-notification=$(usev inotify || usev gfile || echo no) \ + --with-pdumper \ + $(use_enable acl) \ + $(use_enable xattr) \ + $(use_with dbus) \ + $(use_with dynamic-loading modules) \ + $(use_with games gameuser ":gamestat") \ + $(use_with gmp libgmp) \ + $(use_with gpm) \ + $(use_with jit native-compilation aot) \ + $(use_with kerberos) $(use_with kerberos kerberos5) \ + $(use_with lcms lcms2) \ + $(use_with libxml2 xml2) \ + $(use_with mailutils) \ + $(use_with selinux) \ + $(use_with sqlite sqlite3) \ + $(use_with ssl gnutls) \ + $(use_with systemd libsystemd) \ + $(use_with threads) \ + $(use_with tree-sitter) \ + $(use_with wide-int) \ + ${myconf} +} + +src_compile() { + export ac_cv_header_valgrind_valgrind_h=$(usex valgrind) + append-cppflags -DUSE_VALGRIND=$(usex valgrind) + + if tc-is-cross-compiler; then + # Build native tools for compiling lisp etc. + emake -C "${S}-build" src + emake lib # Cross-compile dependencies first for timestamps + # Save native build tools in the cross-directory + cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die + # Specify the native Emacs to compile lisp + EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) + emake "${EMACS_EMAKE_ARGS[@]}" actual-all + else + EMACS_EMAKE_ARGS=() + emake + fi +} + +src_test() { + # List .el test files with a comment above listing the exact + # subtests which caused failure. Elements should begin with a %. + # e.g. %lisp/gnus/mml-sec-tests.el. + local exclude_tests=( + # Reason: permission denied on /nonexistent + # (vc-*-bzr only fails if breezy is installed, as they + # try to access cache dirs under /nonexistent) + # + # rmail-undigest-test-multipart-mixed-digest + # rmail-undigest-test-rfc1153-less-strict-digest + # rmail-undigest-test-rfc1153-sloppy-digest + # rmail-undigest-test-rfc934-digest + # vc-test-bzr02-state + # vc-test-bzr05-rename-file + # vc-test-bzr06-version-diff + # vc-bzr-test-bug9781 + %lisp/mail/undigest-tests.el + %lisp/vc/vc-tests.el + %lisp/vc/vc-bzr-tests.el + + # Reason: tries to access network + # internet-is-working + %src/process-tests.el + + # Reason: fails with stable version of tree-sitter-json due to + # ast changes. Bug #922525 + %src/treesit-tests.log + + # Reason: test is not skipped if tree-sitter-tsx is not installed + # Bug #922525 + %lisp/progmodes/typescript-ts-mode-tests.el + ) + use threads || exclude_tests+=( + %lisp/server-tests.el + %lisp/progmodes/eglot-tests.el + %src/emacs-module-tests.el + %src/keyboard-tests.el + ) + use xpm || exclude_tests+=( %src/image-tests.el ) + + # Redirect GnuPG's sockets, in order not to exceed the 108 char limit + # for socket paths on Linux. + mkdir "${T}"/gpg || die + local f + for f in browser extra ssh; do + printf "%%Assuan%%\nsocket=%s\n" "${T}/gpg/S.${f}" \ + > "test/lisp/gnus/mml-sec-resources/S.gpg-agent.${f}" || die + done + + # See test/README for possible options + emake \ + EMACS_TEST_VERBOSE=1 \ + EXCLUDE_TESTS="${exclude_tests[*]}" \ + TEST_BACKTRACE_LINE_LENGTH=nil \ + check +} + +src_install() { + emake \ + "${EMACS_EMAKE_ARGS[@]}" \ + DESTDIR="${D}" \ + NO_BIN_LINK=t \ + BLESSMAIL_TARGET="" \ + install + + mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die + mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die + mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.metainfo.xml || die + + # dissuade Portage from removing our dir file #257260 + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir + + # movemail must be setgid mail + if ! use mailutils; then + fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail + fi + + # avoid collision between slots, see bug #169033 e.g. + rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el || die + rm -rf "${ED}"/usr/share/{applications,icons} || die + rm -rf "${ED}"/usr/share/glib-2.0 || die #911117 + rm -rf "${ED}/usr/$(get_libdir)/systemd" || die + rm -rf "${ED}"/var || die + + # remove unused <version>/site-lisp dir + rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp || die + + # remove COPYING file (except for etc/COPYING used by describe-copying) + rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING || die + + if use systemd; then + insinto /usr/lib/systemd/user + sed -e "/^##/d" \ + -e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \ + -e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \ + etc/emacs.service | newins - ${EMACS_SUFFIX}.service + assert + fi + + if use gzip-el; then + # compress .el files when a corresponding .elc exists + find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \ + -name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n + assert "gzip .el failed" + fi + + local cdir + if use source; then + cdir="/usr/share/emacs/${FULL_VERSION}/src" + insinto "${cdir}" + # This is not meant to install all the source -- just the + # C source you might find via find-function + doins src/*.{c,h,m} + elif has installsources ${FEATURES}; then + cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" + fi + + sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die + X + ;;; ${EMACS_SUFFIX} site-lisp configuration + X + (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) + Y (setq find-function-C-source-directory + Y "${EPREFIX}${cdir}") + X (let ((path (getenv "INFOPATH")) + X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") + X (re "\\\\\`${EPREFIX}/usr/share\\\\>")) + X (and path + X ;; move Emacs Info dir before anything else in /usr/share + X (let* ((p (cons nil (split-string path ":" t))) (q p)) + X (while (and (cdr q) (not (string-match re (cadr q)))) + X (setq q (cdr q))) + X (setcdr q (cons dir (delete dir (cdr q)))) + X (setenv "INFOPATH" (mapconcat 'identity (cdr p) ":")))))) + EOF + elisp-site-file-install "${T}/${SITEFILE}" || die + + dodoc README BUGS CONTRIBUTE + + if use gui && use aqua; then + dodir /Applications/Gentoo + rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + mv nextstep/Emacs.app \ + "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die + fi + + local DOC_CONTENTS="You can set the version to be started by + /usr/bin/emacs through the Emacs eselect module, which also + redirects man and info pages. Therefore, several Emacs versions can + be installed at the same time. \"man emacs.eselect\" for details. + \\n\\nIf you upgrade from a previous major version of Emacs, then + it is strongly recommended that you use app-admin/emacs-updater + to rebuild all byte-compiled elisp files of the installed Emacs + packages." + if use gui; then + DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. + Installing media-fonts/font-adobe-{75,100}dpi on the X server's + machine would satisfy basic Emacs requirements under X11. + See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs + for how to enable anti-aliased fonts." + use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in + \"${EPREFIX}/Applications/Gentoo\". You may want to copy or + symlink it into /Applications by yourself." + fi + if ! use mailutils; then + DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs' + own e-mail features are going to be used as an e-mail client + (e.g. Rmail), you are strongly encouraged to enable it. If not, + Emacs will use its own implementation of movemail; which has + fewer features and is less secure. For more information see: + https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html" + fi + tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write + a portable dump file due to being cross-compiled. + To create this file at run time, execute the following command: + \\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable + \"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'" + readme.gentoo_create_doc +} + +pkg_preinst() { + # verify that the PM hasn't removed our Info directory index #257260 + local infodir="${ED}/usr/share/info/${EMACS_SUFFIX}" + [[ -f ${infodir}/dir || ! -d ${infodir} ]] || die +} + +pkg_postinst() { + elisp-site-regen + readme.gentoo_print_elog + + if use livecd; then + # force an update of the emacs symlink for the livecd/dvd, + # because some microemacs packages set it with USE=livecd + eselect emacs update + else + eselect emacs update ifunset + fi +} + +pkg_postrm() { + elisp-site-regen + eselect emacs update ifunset +} diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml index aca16631d5e5..95c39fd0d0a7 100644 --- a/app-editors/emacs/metadata.xml +++ b/app-editors/emacs/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnu-emacs@gentoo.org</email> - <name>Gentoo GNU Emacs project</name> -</maintainer> -<longdescription> + <maintainer type="project"> + <email>gnu-emacs@gentoo.org</email> + <name>Gentoo GNU Emacs project</name> + </maintainer> + <longdescription> GNU Emacs is an extensible, customizable text editor - and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming language with extensions to support text editing. The features of GNU Emacs include: @@ -18,43 +18,46 @@ project planner, mail and news reader, debugger interface, calendar, and more. Many of these extensions are distributed with GNU Emacs; others are available separately. -</longdescription> -<use> - <flag name="athena">Enable the MIT Athena widget set + </longdescription> + <use> + <flag name="athena">Enable the MIT Athena widget set (<pkg>x11-libs/libXaw</pkg>)</flag> - <flag name="dynamic-loading">Enable loading of dynamic libraries (modules) + <flag name="dynamic-loading">Enable loading of dynamic libraries (modules) at runtime</flag> - <flag name="games">Support shared score files for games</flag> - <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system - font name</flag> - <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file + <flag name="games">Support shared score files for games</flag> + <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file notification</flag> - <flag name="gmp">Use the GNU multiple precision arithmetic library + <flag name="gmp">Use the GNU multiple precision arithmetic library (<pkg>dev-libs/gmp</pkg>) instead of the bundled mini-gmp subset</flag> - <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the + <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the system font name</flag> - <flag name="gzip-el">Compress bundled Emacs Lisp source</flag> - <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> as text shaping + <flag name="gzip-el">Compress bundled Emacs Lisp source</flag> + <flag name="harfbuzz">Use <pkg>media-libs/harfbuzz</pkg> as text shaping engine</flag> - <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image + <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image processing</flag> - <flag name="jit">Compile with Emacs Lisp native compiler support via + <flag name="jit">Compile with Emacs Lisp native compiler support via libgccjit</flag> - <flag name="json">Compile with native JSON support using + <flag name="json">Compile with native JSON support using <pkg>dev-libs/jansson</pkg></flag> - <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead + <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead of the internal Lisp implementations</flag> - <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg> + <flag name="mailutils">Retrieve e-mail using <pkg>net-mail/mailutils</pkg> instead of the internal movemail substitute</flag> - <flag name="source">Install C source files and make them available for + <flag name="source">Install C source files and make them available for find-function</flag> - <flag name="threads">Add elisp threading support</flag> - <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in + <flag name="threads">Add elisp threading support</flag> + <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in preference to Emacs' own scrollbars</flag> - <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). + <flag name="tree-sitter">Support the <pkg>dev-libs/tree-sitter</pkg> + parsing library</flag> + <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit). This option has an effect only on architectures where "long" and "long long" types have different size.</flag> - <flag name="xwidgets">Enable use of GTK widgets in Emacs buffers + <flag name="xwidgets">Enable use of GTK widgets in Emacs buffers (requires GTK3)</flag> -</use> + </use> + <upstream> + <remote-id type="savannah">emacs</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/emact/emact-2.58.0-r1.ebuild b/app-editors/emact/emact-2.58.0-r1.ebuild index 2667c067d36c..f7c54eb6aead 100644 --- a/app-editors/emact/emact-2.58.0-r1.ebuild +++ b/app-editors/emact/emact-2.58.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2+ BSD" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" IUSE="gui" RDEPEND="sys-libs/ncurses:0= diff --git a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild index bd82fcd95ff9..185a4109cb00 100644 --- a/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild +++ b/app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -8,19 +8,18 @@ inherit toolchain-funcs DESCRIPTION="A very minimal imitation of the famous GNU Emacs editor" HOMEPAGE="https://web.archive.org/web/20171126221613/http://hunter.apana.org.au/~cjb/Code/" # taken from http://hunter.apana.org.au/~cjb/Code/ersatz.tar.gz -SRC_URI="mirror://gentoo/${P}.tar.gz" +SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.gz" +S="${WORKDIR}" LICENSE="public-domain" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" DEPEND="sys-libs/ncurses:0=" RDEPEND="${DEPEND} !app-editors/ee" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}" - src_prepare() { eapply "${FILESDIR}"/${P}-gentoo.patch sed -i -e "s%/usr/local/share/%/usr/share/doc/${PF}/%" ee.1 \ diff --git a/app-editors/fe/Manifest b/app-editors/fe/Manifest index b6eecacc98f8..048e137f607a 100644 --- a/app-editors/fe/Manifest +++ b/app-editors/fe/Manifest @@ -1 +1 @@ -DIST fe-2.0.tar.gz 217430 BLAKE2B bbc886abdb54d5fe05f031a5e5700907586c4bae8812f4edd5bf6d35fa0ce16edb93a6f988a597e1b4aba69bde4019f3044091ab9285ee6138d913498816453b SHA512 85afa800466376e59aa8de4af06db51c5df8566109a1f632b30a366f944be3237f88a639329d44114360747836ed75c31746c7d6bf1568b7b4ff3e11d595a6e7 +DIST fe-2.0.tar.gz 237890 BLAKE2B 9fb2ad310016b52ebc807854c942c248b75a9e543aa919ccee0a1963d9a12b23ad9cbc4df884422654e2efb0b97ba2d590ac2d70be48dec3a19e7a455de5c168 SHA512 6967362b8ff9ce91e0480dfa8538e3d13b43748283423923a4ba19efc76fbe007975318d9fde758f9c9f0b8bd084ff49e45bfd5b9773a79ee85a2153646e0143 diff --git a/app-editors/fe/fe-2.0.ebuild b/app-editors/fe/fe-2.0-r1.ebuild index 207e9ec3f773..9df4b0b4567a 100644 --- a/app-editors/fe/fe-2.0.ebuild +++ b/app-editors/fe/fe-2.0-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit autotools toolchain-funcs DESCRIPTION="A small and easy to use folding editor" HOMEPAGE="http://www.moria.de/~michael/fe/" SRC_URI="http://www.moria.de/~michael/fe/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" IUSE="sendmail" RDEPEND="sys-libs/ncurses:0= @@ -22,8 +22,14 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-1.8-makefile.patch "${FILESDIR}"/${P}-ar.patch + "${FILESDIR}"/${P}-ncurses.patch ) +src_prepare() { + default + AT_NOEAUTOHEADER=yes eautoreconf +} + src_configure() { econf \ $(use_enable sendmail) \ @@ -37,7 +43,7 @@ src_compile() { src_install() { emake \ prefix="${D}"/usr \ - datadir="${D}"/usr/share \ + datarootdir="${D}"/usr/share \ MANDIR="${D}"/usr/share/man \ install diff --git a/app-editors/fe/files/fe-2.0-ncurses.patch b/app-editors/fe/files/fe-2.0-ncurses.patch new file mode 100644 index 000000000000..dfe720b02e6e --- /dev/null +++ b/app-editors/fe/files/fe-2.0-ncurses.patch @@ -0,0 +1,32 @@ +https://bugs.gentoo.org/818415 + +--- fe-2.0/configure.in ++++ fe-2.0/configure.in +@@ -55,19 +55,6 @@ + AC_CHECK_FUNCS(strdup) + AC_CHECK_FUNCS(strndup) + +-AC_CHECK_LIB(ncursesw, get_wch, [have_utf8_ncurses=yes; LIBS="-lncursesw $LIBS"]) +-if test "$have_utf8_ncurses" = yes +-then +- AC_DEFINE(HAVE_UTF8_NCURSES) +- AC_CHECK_HEADERS(ncurses/ncurses.h,have_ncurses_ncurses_h=yes) +- if test "$have_ncurses_ncurses_h" != yes +- then +- AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes) +- fi +-fi +- +-if test "$have_utf8_ncurses" != yes +-then + AC_CHECK_LIB(ncurses, get_wch, [have_utf8_ncurses=yes; LIBS="-lncurses $LIBS"]) + if test "$have_utf8_ncurses" = yes + then +@@ -78,7 +65,6 @@ + AC_CHECK_HEADERS(ncurses.h,have_ncurses_h=yes) + fi + fi +-fi + + if test "$have_utf8_ncurses" != yes + then diff --git a/app-editors/featherpad/Manifest b/app-editors/featherpad/Manifest index 4c7622319098..5cc369b92d37 100644 --- a/app-editors/featherpad/Manifest +++ b/app-editors/featherpad/Manifest @@ -1,2 +1 @@ -DIST featherpad-0.18.0.tar.gz 967643 BLAKE2B a8a84fa71232bdd9448ec4a9c921f8f452212dfb52ec518c3f340e9b600858a9cfca2d7729a0f58c9d1465b77bd28c836de78026c58ff94297de704e7bf670d8 SHA512 3e0d008792dd55bc5e57654f9b032f0a66a60c682499c684cfc3b182fdc57a654bb5fb195b458af66ddd8db929b31e7bfa789bd9bdf33d32454fbbcb090bcd91 -DIST featherpad-1.0.0.tar.gz 1010200 BLAKE2B 22a11a0655ed57f7a7d53949e59c3b989a304b7c3db1f7308af0a52cc00a151cee505b02c19ece286da1be37e76c8874cee4102db3d881ef2c4ad48ecbb2f20a SHA512 9f7e24fa5e89e269693bc0a37f79d987e4914dde2d2b46bd0385886383dab8b35556fbc0f5c5b7b9a2c3a41694174ffa8532c48def87d2972fbc73c1e9c38bf3 +DIST featherpad-1.5.0.tar.gz 1087068 BLAKE2B aef468f426c9c635624fe16f8180647a9f62a12c98d654dfb340758ff524e629341469ec3f37cfe8a481def99ba6c99672aa31c49b03226e2e895dce11e9b5e6 SHA512 984d1fba0e4bcb1eda8c2dd3bee34cf2ee0ba5604dd2c9328cc67531099b8a806e8ab79020510049eb788764cf0ad4486c128eefb43d9ab1ccdc4a3c06c48497 diff --git a/app-editors/featherpad/featherpad-0.18.0.ebuild b/app-editors/featherpad/featherpad-0.18.0.ebuild deleted file mode 100644 index 6c98ead81b19..000000000000 --- a/app-editors/featherpad/featherpad-0.18.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit xdg cmake - -DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux" -HOMEPAGE="https://github.com/tsujan/FeatherPad" -SRC_URI="https://github.com/tsujan/FeatherPad/archive/V${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND="app-text/hunspell - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" - -S="${WORKDIR}/FeatherPad-${PV}" diff --git a/app-editors/featherpad/featherpad-1.0.0.ebuild b/app-editors/featherpad/featherpad-1.5.0.ebuild index dc209562867b..229b5bbfe620 100644 --- a/app-editors/featherpad/featherpad-1.0.0.ebuild +++ b/app-editors/featherpad/featherpad-1.5.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2021-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit xdg cmake +inherit cmake xdg DESCRIPTION="Lightweight Qt5 Plain-Text Editor for Linux" HOMEPAGE="https://github.com/tsujan/FeatherPad" @@ -12,22 +12,19 @@ S="${WORKDIR}/FeatherPad-${PV}" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" IUSE="+X" -RDEPEND="app-text/hunspell:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - )" -DEPEND="${RDEPEND}" -BDEPEND="dev-qt/linguist-tools:5" +RDEPEND=" + app-text/hunspell:= + dev-qt/qtbase:6[cups,dbus,gui,widgets] + dev-qt/qtsvg:6 + X? ( x11-libs/libX11 ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" +BDEPEND="dev-qt/qttools:6[linguist]" src_configure() { local mycmakeargs=( diff --git a/app-editors/featherpad/metadata.xml b/app-editors/featherpad/metadata.xml index e0685038b115..ef220843828f 100644 --- a/app-editors/featherpad/metadata.xml +++ b/app-editors/featherpad/metadata.xml @@ -5,6 +5,10 @@ <email>hansfn@gmail.com</email> <name>Hans Fredrik Nordhaug</name> </maintainer> + <maintainer type="person"> + <email>arthurzam@gentoo.org</email> + <name>Arthur Zamarin</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> diff --git a/app-editors/focuswriter/Manifest b/app-editors/focuswriter/Manifest index f1d1561f5d16..8b98baf38514 100644 --- a/app-editors/focuswriter/Manifest +++ b/app-editors/focuswriter/Manifest @@ -1,2 +1 @@ -DIST focuswriter-1.7.2-src.tar.bz2 10310759 BLAKE2B 92f0cd0ec2bb29c41f2c98e52dcb2187a70bc1c0641aed521b3d577302937cf6560f3adf422372019c8726ca29a9978b5b4d9e56e4c0c26a65fdc5d6aa0b7767 SHA512 195ddf6579aa00af120644ef1ddc88a6aaf0a6003feefb7b3dd3ca72c4bb17440553a171ad469f2d25d90416fc0e1a03f1b9d43e3b5790dac180f18b4ed657bf DIST focuswriter-1.7.6-src.tar.bz2 10311965 BLAKE2B a1f1627df988d7660f6b90cf984d725ff2366754f01b0ce78e23756a98c716acafa8b4076f4749f117cba6eaabcb6ec61516c032a7ae770eb1b06466a358595e SHA512 45e0bc9b20c73b260aa42dcc9ee79515d3ad95d4c9586f60ab75fb404f73c7443484f238b3705ba3224b852a0d9b8b8db17d9145aebb77513f8597a01ab01d3b diff --git a/app-editors/focuswriter/focuswriter-1.7.2.ebuild b/app-editors/focuswriter/focuswriter-1.7.2.ebuild deleted file mode 100644 index 1a03c4dc455e..000000000000 --- a/app-editors/focuswriter/focuswriter-1.7.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg - -DESCRIPTION="Fullscreen and distraction-free word processor" -HOMEPAGE="https://gottcode.org/focuswriter/" -SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2" - -LICENSE="GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" -RDEPEND=" - app-text/hunspell:= - >=dev-qt/qtcore-5.11:5 - >=dev-qt/qtgui-5.11:5 - >=dev-qt/qtmultimedia-5.11:5 - >=dev-qt/qtprintsupport-5.11:5 - dev-qt/qtsingleapplication[qt5(+),X] - >=dev-qt/qtwidgets-5.11:5 - sys-libs/zlib -" -DEPEND="${RDEPEND} - dev-qt/qtconcurrent:5 -" - -DOCS=( ChangeLog CREDITS README ) - -PATCHES=( "${FILESDIR}/${PN}-1.6.0-unbundle-qtsingleapplication.patch" ) - -src_configure() { - eqmake5 PREFIX="${EPREFIX}"/usr -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs -} diff --git a/app-editors/focuswriter/focuswriter-1.7.6.ebuild b/app-editors/focuswriter/focuswriter-1.7.6.ebuild index 1809229cfbcc..09d03a6ecc88 100644 --- a/app-editors/focuswriter/focuswriter-1.7.6.ebuild +++ b/app-editors/focuswriter/focuswriter-1.7.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" IUSE="" BDEPEND=" diff --git a/app-editors/fte/Manifest b/app-editors/fte/Manifest deleted file mode 100644 index ff4fbf95bc65..000000000000 --- a/app-editors/fte/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST fte-20110708-common.zip 200007 BLAKE2B ce1ac0f2bd68b2bb7ef1d96a46bd9a481cd46f5cde00607c64f752d5e87f6edefd8a92c8210e1ac7629ef8bc5720a8a2d75bd61f292f344e211b88a2462989fa SHA512 0bb59a5b6b4a5ef6c1234dadd8922cd50a13ad1f0c06d6046b74a95592ad55f720b43bbc78a42cab63dfc68c5e073d44d5179bd6ed72f346563f43f3c5c146f1 -DIST fte-20110708-src.zip 504199 BLAKE2B 42bb3cc4ae9be4b64c0b161488d91d4a260a2e6a1574fccb0fc652359e34f7b6b881f170dfd85a8954f2b2fdbe4fecaaf2fc68cd5244f185dde36fe1a694004e SHA512 2d59fadcdd988ee85b87425c343341e1b768a7e9ef838c5f8a1f22c4adc5bf2cc37d547f36354ca1740bce07b33d5ae93d14e24001b9dbd3b1b267986564a089 diff --git a/app-editors/fte/files/fte b/app-editors/fte/files/fte deleted file mode 100644 index 2e4621b92a62..000000000000 --- a/app-editors/fte/files/fte +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# simple wrapper shell script which selects appropriate fte executable -# - -if [ -n "$DISPLAY" ]; then - if which xfte >/dev/null; then - exec xfte "$@" - elif which sfte >/dev/null; then - exec sfte "$@" - elif which vfte >/dev/null; then - echo "Only Console version installed!" - fi -else - if [ "$TERM" = linux ] && which vfte >/dev/null; then - exec vfte "$@" - elif which sfte >/dev/null; then - exec sfte "$@" - elif which xfte >/dev/null; then - echo "Only X-Window version installed!" - fi - -fi - -echo "No binary executable from the FTE family has been found!" -echo "Please install one of them." diff --git a/app-editors/fte/fte-20110708-r1.ebuild b/app-editors/fte/fte-20110708-r1.ebuild deleted file mode 100644 index 96de0620957a..000000000000 --- a/app-editors/fte/fte-20110708-r1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs vcs-clean - -DESCRIPTION="Lightweight text-mode editor" -HOMEPAGE="http://fte.sourceforge.net" -SRC_URI=" - mirror://sourceforge/${PN}/${P}-src.zip - mirror://sourceforge/${PN}/${P}-common.zip" - -LICENSE="|| ( GPL-2 Artistic )" -SLOT="0" -KEYWORDS="~alpha amd64 ppc -sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="gpm slang X" - -S="${WORKDIR}/${PN}" - -RDEPEND=" - sys-libs/ncurses:0= - X? ( - x11-libs/libXdmcp - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXpm - ) - gpm? ( >=sys-libs/gpm-1.20 )" -DEPEND="${RDEPEND} - slang? ( >=sys-libs/slang-2.1.3 ) - app-arch/unzip" - -HTML_DOCS=( doc/. ) - -set_targets() { - export TARGETS="" - use slang && TARGETS="${TARGETS} s${PN}" - use X && TARGETS="${TARGETS} x${PN}" - - [[ ${CHOST} == *-linux-gnu* ]] \ - && TARGETS="${TARGETS} v${PN}" \ - || TARGETS="${TARGETS} n${PN}" -} - -src_prepare() { - default - - if [[ -e "${EPREFIX}"/usr/include/linux/keyboard.h ]]; then - sed "${EPREFIX}"/usr/include/linux/keyboard.h \ - -e '/wait.h/d' > src/hacked_keyboard.h || die - fi - - sed \ - -e "s:<linux/keyboard.h>:\"hacked_keyboard.h\":" \ - -i src/con_linux.cpp || die "sed keyboard" - sed \ - -e 's:^OPTIMIZE:#&:g' \ - -e '/^LDFLAGS/s:=:+=:g' \ - -e 's:= g++:= $(CXX):g' \ - -i src/${PN}-unix.mak || die "sed CFLAGS, LDFLAGS, CC" - ecvs_clean -} - -src_configure() { - set_targets - sed \ - -e "s:@targets@:${TARGETS}:" \ - -e '/^XINCDIR =/c\XINCDIR =' \ - -e '/^XLIBDIR =/c\XLIBDIR = -lstdc++' \ - -e '/^SINCDIR =/c\SINCDIR = -I'"${EPREFIX}"'/usr/include/slang' \ - -i src/${PN}-unix.mak || die "sed targets" - - if ! use gpm; then - sed \ - -e "s:#define USE_GPM://#define USE_GPM:" \ - -i src/con_linux.cpp || die "sed USE_GPM" - sed \ - -e "s:-lgpm::" \ - -i src/fte-unix.mak || die "sed -lgpm" - fi -} - -src_compile() { - local os="-DLINUX" # by now the default in makefile - [[ ${CHOST} == *-interix* ]] && os= - - DEFFLAGS="PREFIX='${EPREFIX}'/usr CONFIGDIR='${EPREFIX}'/usr/share/${PN} \ - DEFAULT_FTE_CONFIG=../config/main.${PN} UOS=${os}" - - set_targets - emake CXX="$(tc-getCXX)" OPTIMIZE="${CXXFLAGS}" "${DEFFLAGS}" TARGETS="${TARGETS}" all -} - -src_install() { - keepdir /etc/${PN} - into /usr - - set_targets - - local i files="${TARGETS} c${PN}" - for i in ${files}; do - dobin src/${i} - done - - dobin "${FILESDIR}/${PN}" - - einstalldocs - - insinto /usr/share/${PN} - doins -r config/. -} - -pkg_postinst() { - ebegin "Compiling configuration" - cd "${EPREFIX}"/usr/share/${PN} || die "missing configuration dir" - "${EPREFIX}"/usr/bin/c${PN} main.${PN} "${EPREFIX}"/etc/${PN}/system.${PN}rc || die - eend $? -} diff --git a/app-editors/fte/metadata.xml b/app-editors/fte/metadata.xml deleted file mode 100644 index 1a3b29f46396..000000000000 --- a/app-editors/fte/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">fte</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest index 0b10f6559558..1241bdb28837 100644 --- a/app-editors/gedit-plugins/Manifest +++ b/app-editors/gedit-plugins/Manifest @@ -1 +1 @@ -DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3 +DIST gedit-plugins-46.0.tar.xz 897216 BLAKE2B 9dac94c03147fa3a949df5d924a2a18d9cf29a7928f088a0ab6bd07538dc316c28f9f6a5f7cb91b386d25b4a15b5178265c808a7d327367902c7077980a56be8 SHA512 fe9d975273df1ec7d3729d76d3e652b04ec90595f2fcd90a64f9bc01de6bf7955aa96fb663966d8dab5952a01552a70123eecee81861c4c6d219199ca2ada579 diff --git a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-46.0-r1.ebuild index 266db95b91a9..e481f4437f5a 100644 --- a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-46.0-r1.ebuild @@ -1,18 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="xml" -VALA_MIN_API_VERSION="0.28" +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="xml(+)" 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" +HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ThirdPartyPlugins" LICENSE="GPL-2+" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" SLOT="0" IUSE="charmap git +python terminal vala" @@ -24,24 +23,21 @@ REQUIRED_USE=" " RDEPEND=" - >=dev-libs/libpeas-1.14.1[gtk] - >=app-editors/gedit-40.0 - + >=dev-libs/libpeas-1.14.1:0[gtk] + >=app-editors/gedit-46 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.9:3 - >=x11-libs/gtksourceview-4.0.2:4 - + gui-libs/libgedit-gtksourceview:300 python? ( ${PYTHON_DEPS} $(python_gen_cond_dep ' app-editors/gedit[python,${PYTHON_SINGLE_USEDEP}] - dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}] + dev-libs/libpeas:0[python,${PYTHON_SINGLE_USEDEP}] >=dev-python/dbus-python-0.82[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pygobject:3[cairo,${PYTHON_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] ) @@ -63,8 +59,9 @@ pkg_setup() { } src_prepare() { - use vala && vala_src_prepare - xdg_src_prepare + default + use vala && vala_setup + xdg_environment_reset } src_configure() { @@ -74,19 +71,14 @@ src_configure() { $(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) + -Dplugin_smartspaces=true $(meson_use terminal plugin_terminal) $(meson_use python plugin_textsize) - $(meson_use python plugin_translate) -Dplugin_wordcompletion=true ) meson_src_configure diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml index eb35a3df50f2..2695ac239950 100644 --- a/app-editors/gedit-plugins/metadata.xml +++ b/app-editors/gedit-plugins/metadata.xml @@ -1,14 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="charmap">Insert special characters just by clicking on - them</flag> - <flag name="git">Shows document changes related to git's HEAD</flag> - <flag name="terminal">Embed a terminal in the bottom pane</flag> -</use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="charmap">Insert special characters just by clicking on them</flag> + <flag name="git">Shows document changes related to git's HEAD</flag> + <flag name="terminal">Embed a terminal in the bottom pane</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gedit-plugins</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index 88246b56777a..b7e59712b7c5 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -1 +1 @@ -DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09 +DIST gedit-46.2.tar.xz 2756340 BLAKE2B 832694a69562b6e8e0dda03be313ccae936645f19812a8244b0eb1f62b43b838fd5decac6a3f7d958017623a63bc857151d3f02dfe7a3aeeb1a0867f7854cfec SHA512 47aa160172d1af8cbb0f7ba270364ab7fe7527fd07819efea570afe67f3684a6df2e093f4b6fb85802e29c11bbe029a0515422d4ebd6e11ae78ae7359d82497f diff --git a/app-editors/gedit/files/3.38-make-gspell-optional.patch b/app-editors/gedit/files/3.38-make-gspell-optional.patch deleted file mode 100644 index f1197ebb5222..000000000000 --- a/app-editors/gedit/files/3.38-make-gspell-optional.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 7dccb18191cd..000000000000 --- a/app-editors/gedit/files/3.38-make-python-optional.patch +++ /dev/null @@ -1,86 +0,0 @@ -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/files/restore-overlay-scrollbars.patch b/app-editors/gedit/files/restore-overlay-scrollbars.patch deleted file mode 100644 index 55a353a796bf..000000000000 --- a/app-editors/gedit/files/restore-overlay-scrollbars.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 189ee4514107e70a62d44766f8ca39d815d48581 Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro <mcatanzaro@gnome.org> -Date: Fri, 20 Mar 2020 11:32:59 -0500 -Subject: [PATCH] Revert "ViewFrame: disable overlay scrolling for the - GtkScrolledWindow" - -This reverts commit 5e0909c19f267b4023131881fac89c58a2a17453. ---- - gedit/resources/ui/gedit-view-frame.ui | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui -index ebf70b013..4c783c711 100644 ---- a/gedit/resources/ui/gedit-view-frame.ui -+++ b/gedit/resources/ui/gedit-view-frame.ui -@@ -11,7 +11,6 @@ - <property name="visible">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> -- <property name="overlay_scrolling">False</property> - <child> - <object class="GeditView" id="view"> - <property name="visible">True</property> --- -2.25.1 - diff --git a/app-editors/gedit/gedit-40.1.ebuild b/app-editors/gedit/gedit-46.2.ebuild index 415abe4e1829..18ca8844219a 100644 --- a/app-editors/gedit/gedit-40.1.ebuild +++ b/app-editors/gedit/gedit-46.2.ebuild @@ -1,10 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) -VALA_MIN_API_VERSION="0.26" -VALA_USE_DEPEND="vapigen" +EAPI=8 +PYTHON_COMPAT=( python3_{10..12} ) inherit gnome.org gnome2-utils meson python-single-r1 vala xdg @@ -13,29 +11,29 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gedit" LICENSE="GPL-2+ CC-BY-SA-3.0" SLOT="0" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" -IUSE="+python gtk-doc spell" +IUSE="+python gtk-doc" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" - DEPEND=" - >=dev-libs/glib-2.64:2 - >=dev-libs/libpeas-1.14.1[gtk] - >=dev-libs/gobject-introspection-1.54:= + >=dev-libs/glib-2.70:2 >=x11-libs/gtk+-3.22.0:3[introspection] - >=x11-libs/gtksourceview-4.0.2:4[introspection] - gui-libs/tepl:6 - - spell? ( >=app-text/gspell-0.2.5:0= ) + >=gui-libs/libgedit-amtk-5.6:= + >=gui-libs/tepl-6.8.0:= + >=dev-libs/libpeas-1.14.1:0[gtk] + >=dev-libs/gobject-introspection-1.54:= + >=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}] + dev-libs/libpeas:0[python,${PYTHON_SINGLE_USEDEP}] ') ) + + gui-libs/libgedit-gtksourceview:300 " RDEPEND="${DEPEND} x11-themes/adwaita-icon-theme @@ -44,44 +42,32 @@ RDEPEND="${DEPEND} " 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 + default + vala_setup + xdg_environment_reset } 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 diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml index 7b343b06be8a..25826770e3dd 100644 --- a/app-editors/gedit/metadata.xml +++ b/app-editors/gedit/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/gedit</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/ghex/Manifest b/app-editors/ghex/Manifest index 7190209b5e9c..db47f33ba468 100644 --- a/app-editors/ghex/Manifest +++ b/app-editors/ghex/Manifest @@ -1 +1 @@ -DIST ghex-3.18.4.tar.xz 1420268 BLAKE2B 70a3027a2c228481ecbc6ae44c0a707c9858453e3af7bfc268b6e32a8496722cf117c1b2ce4dd798795a429dccd24e1fa9cb9d1a8c9c8fb5998243369f76ccc4 SHA512 6121a5986ee7d7f96bf7f401e155f8aa37f076af455bc68e43d1b5b02b63bc9aed3eba5209511d1b659eb4c9093ab5d9601c14a5e868d979e92a6d0ca0cf9ce2 +DIST ghex-45.2.tar.xz 902616 BLAKE2B 24e42b6d719280ab459d0ed7b96a502df7a5502e3d6cf385c0aa73b11808e40cac6112a3e0c3a228d5363578ccb875836efd8a13d6fc6c7e8ea4fe5a76bdb9c7 SHA512 2843b23a0673457ec72bd2aad20888fbc2ca890d3d859e6c2657af24cedc6185f6e11244574b603c0e32db2f54968e6584adf2c7e5abee84521c55148f536496 diff --git a/app-editors/ghex/ghex-3.18.4-r1.ebuild b/app-editors/ghex/ghex-3.18.4-r1.ebuild deleted file mode 100644 index 8ed29ffd0ff8..000000000000 --- a/app-editors/ghex/ghex-3.18.4-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit gnome.org gnome2-utils meson xdg -DESCRIPTION="GNOME hexadecimal editor" -HOMEPAGE="https://wiki.gnome.org/Apps/Ghex" - -LICENSE="GPL-2+ FDL-1.1+" -SLOT="2" -KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=dev-libs/atk-1.0.0 - >=dev-libs/glib-2.31.10:2 - >=x11-libs/gtk+-3.3.8:3 -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-libs/appstream-glib - dev-libs/libxml2:2 - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -# Requires unreleased appstream-glib-0.7.16 for tests to pass.. -RESTRICT="test" # https://gitlab.gnome.org/GNOME/ghex/issues/18 - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-editors/ghex/ghex-45.2.ebuild b/app-editors/ghex/ghex-45.2.ebuild new file mode 100644 index 000000000000..504d9010a46e --- /dev/null +++ b/app-editors/ghex/ghex-45.2.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="GNOME hexadecimal editor" +HOMEPAGE="https://wiki.gnome.org/Apps/Ghex" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git" + SRC_URI="" +else + KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2+ FDL-1.1+" +IUSE="gtk-doc test" +RESTRICT="!test? ( test )" +SLOT="4" + +RDEPEND=" + >=dev-libs/glib-2.68.0:2 + >=gui-libs/gtk-4.4.0:4[introspection] + gui-libs/libadwaita:1 + dev-libs/gobject-introspection + !app-editors/ghex:2 +" +DEPEND="${RDEPEND}" +BDEPEND=" + gtk-doc? ( dev-util/gi-docgen ) + test? ( + dev-util/desktop-file-utils + dev-libs/appstream-glib + ) + dev-util/gtk-update-icon-cache + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/gtk-doc/ + -Ddevelopment=false + -Dmmap-buffer-backend=true + -Ddirect-buffer-backend=true + -Dintrospection=enabled + $(meson_use gtk-doc gtk_doc) + -Dstatic-html-help=false + -Dvapi=false + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-editors/ghex/ghex-9999.ebuild b/app-editors/ghex/ghex-9999.ebuild new file mode 100644 index 000000000000..6bc800a0f081 --- /dev/null +++ b/app-editors/ghex/ghex-9999.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="GNOME hexadecimal editor" +HOMEPAGE="https://wiki.gnome.org/Apps/Ghex" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/ghex.git" + SRC_URI="" +else + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="GPL-2+ FDL-1.1+" +IUSE="gtk-doc test" +RESTRICT="!test? ( test )" +SLOT="4" + +RDEPEND=" + >=dev-libs/glib-2.68.0:2 + >=gui-libs/gtk-4.4.0:4[introspection] + gui-libs/libadwaita:1 + dev-libs/gobject-introspection + !app-editors/ghex:2 +" +DEPEND="${RDEPEND}" +BDEPEND=" + gtk-doc? ( dev-util/gi-docgen ) + test? ( + dev-util/desktop-file-utils + dev-libs/appstream-glib + ) + dev-util/gtk-update-icon-cache + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/gtk-doc/ + -Ddevelopment=false + -Dmmap-buffer-backend=true + -Ddirect-buffer-backend=true + -Dintrospection=enabled + $(meson_use gtk-doc gtk_doc) + -Dstatic-html-help=false + -Dvapi=false + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-editors/ghex/metadata.xml b/app-editors/ghex/metadata.xml index 7b343b06be8a..ffc72ffa12d6 100644 --- a/app-editors/ghex/metadata.xml +++ b/app-editors/ghex/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <upstream> + <remote-id type="gnome-gitlab">GNOME/ghex</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/ghostwriter/Manifest b/app-editors/ghostwriter/Manifest index a6bed456afc1..5ac8909ae90e 100644 --- a/app-editors/ghostwriter/Manifest +++ b/app-editors/ghostwriter/Manifest @@ -1,2 +1,2 @@ -DIST ghostwriter-1.8.1.tar.gz 1220000 BLAKE2B 3fa3d95ed819bc8f7b76b396e6634658a8bda23e9100cbb298d301fc382db451430a4a31fbd092326af198825c83d2c998172c90a7e318aeb57ef7799751995a SHA512 9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521 -DIST ghostwriter-2.0.2.tar.gz 7802654 BLAKE2B a52a96ba6aecb8c6b8ff565bd9b3b7622d15ae68af5e393da4f1e1c8dae70a8053228e302e87e2530c907be825df5e7eebc7de14bb23e0e46f4b4308b9ae6e63 SHA512 1e51b86b8afae41c47e5e7ec96752d356dd9dca8a44d1aab6a541e1ce188cb40add52f96a52da7a689df47a2e7a9a1dc7211f480c3456f4a11c81f80e2779a7e +DIST ghostwriter-23.08.5.tar.xz 3626836 BLAKE2B 19977d1c8341812d4bff70fa246b1f0300ff871880b9959ac39dd702e33661c6e8ec79d5353f29a10da00f03cc95457e5182e2b46ed7d01964b924606f885ca0 SHA512 b548710cd5066b8ff29410577b2e5c11178ea2661793bfedec1b2379046735f4320ba47ee3d560d8041171f1244d541213ecd5f2a8e0ae69ae0f0718094d5d20 +DIST ghostwriter-24.02.2.tar.xz 3629096 BLAKE2B f167301849348ee59d45fea07286d3e0c1cacd4eeb84769d4bb6182fc508aaa0f8b749f2553054a6054ffc48706ec53f05ec164b1a913b0f926395134e72ac7a SHA512 ebe605f82710ced4fecf4effd5c257e5d6bc274bbbc6cb36138423ef05b14504dd5d39d698eb23640838df53bc55f9ba3523280731482b1eb1b1ad6d46178381 diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch deleted file mode 100644 index 514ab6262e5a..000000000000 --- a/app-editors/ghostwriter/files/ghostwriter-1.8.1-appdata-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5e63fa9cb6d4020413db071ed68aa85f3e79fd9e Mon Sep 17 00:00:00 2001 -From: David Roman <davidroman96@gmail.com> -Date: Mon, 9 Mar 2020 21:42:58 +0100 -Subject: [PATCH] update appdata path - -The previous location is deprecated -see https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html ---- - ghostwriter.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ghostwriter.pro b/ghostwriter.pro -index d399fb5..7f5f22c 100644 ---- a/ghostwriter.pro -+++ b/ghostwriter.pro -@@ -264,7 +264,7 @@ macx { - desktop.path = $$DATADIR/applications/ - - appdata.files = resources/linux/ghostwriter.appdata.xml -- appdata.path = $$DATADIR/appdata/ -+ appdata.path = $$DATADIR/metainfo/ - - man.files = resources/linux/ghostwriter.1 - man.path = $$PREFIX/share/man/man1 --- -2.25.1 - diff --git a/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch b/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch deleted file mode 100644 index 0f7425ff35e7..000000000000 --- a/app-editors/ghostwriter/files/ghostwriter-1.8.1-qt-5.15.patch +++ /dev/null @@ -1,21 +0,0 @@ -From f8f4ec0a1b53d1f3e670817f051c59444851cf7f Mon Sep 17 00:00:00 2001 -From: Jakob Gahde <j5lx@fmail.co.uk> -Date: Tue, 9 Jun 2020 10:30:44 +0200 -Subject: [PATCH] Fix build error with Qt 5.15 - ---- - src/MarkdownEditor.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/MarkdownEditor.cpp b/src/MarkdownEditor.cpp -index c5e46d5..c103173 100644 ---- a/src/MarkdownEditor.cpp -+++ b/src/MarkdownEditor.cpp -@@ -30,6 +30,7 @@ - #include <QUrl> - #include <QPixmap> - #include <QPainter> -+#include <QPainterPath> - #include <QFileInfo> - #include <QDir> - diff --git a/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild b/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild deleted file mode 100644 index eb51f8371cc7..000000000000 --- a/app-editors/ghostwriter/ghostwriter-1.8.1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg-utils - -DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor" -HOMEPAGE="https://wereturtle.github.io/ghostwriter/" -SRC_URI="https://github.com/wereturtle/ghostwriter/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -BDEPEND="dev-qt/linguist-tools:5" - -RDEPEND=" - app-text/hunspell:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 -" -DEPEND="${RDEPEND}" - -DOCS=( CREDITS.md README.md ) - -PATCHES=( - "${FILESDIR}/${P}-appdata-path.patch" - "${FILESDIR}/${P}-qt-5.15.patch" # git master -) - -src_prepare() { - default - - sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version" -} - -src_configure() { - eqmake5 \ - CONFIG+=$(usex debug debug release) \ - PREFIX="${EPREFIX}"/usr -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild b/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild deleted file mode 100644 index 9f9908a37a0f..000000000000 --- a/app-editors/ghostwriter/ghostwriter-2.0.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg-utils - -DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor" -HOMEPAGE="https://wereturtle.github.io/ghostwriter/" -SRC_URI="https://github.com/wereturtle/ghostwriter/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -BDEPEND="dev-qt/linguist-tools:5" - -RDEPEND=" - app-text/hunspell:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 -" -DEPEND="${RDEPEND}" - -DOCS=( CREDITS.md README.md ) - -src_prepare() { - default - - sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version" -} - -src_configure() { - eqmake5 \ - CONFIG+=$(usex debug debug release) \ - PREFIX="${EPREFIX}"/usr -} - -src_install() { - emake INSTALL_ROOT="${D}" install - einstalldocs -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/app-editors/ghostwriter/ghostwriter-23.08.5.ebuild b/app-editors/ghostwriter/ghostwriter-23.08.5.ebuild new file mode 100644 index 000000000000..37b1e000cb6c --- /dev/null +++ b/app-editors/ghostwriter/ghostwriter-23.08.5.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY="office" +ECM_HANDBOOK="optional" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor" +HOMEPAGE="https://ghostwriter.kde.org/" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 arm64 ~x86" +IUSE="" + +RDEPEND=" + app-text/hunspell:= + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwebchannel-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + virtual/opengl +" +DEPEND="${RDEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 +" +BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 + virtual/pkgconfig +" + +DOCS=( CHANGELOG.md README.md ) diff --git a/app-editors/ghostwriter/ghostwriter-24.02.2.ebuild b/app-editors/ghostwriter/ghostwriter-24.02.2.ebuild new file mode 100644 index 000000000000..5742655537f8 --- /dev/null +++ b/app-editors/ghostwriter/ghostwriter-24.02.2.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_CATEGORY="office" +ECM_HANDBOOK="optional" +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm gear.kde.org + +DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor" +HOMEPAGE="https://ghostwriter.kde.org/" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +RDEPEND=" + app-text/hunspell:= + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwebchannel-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/sonnet-${KFMIN}:5 + virtual/opengl +" +DEPEND="${RDEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 +" +BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 + virtual/pkgconfig +" + +DOCS=( CHANGELOG.md README.md ) diff --git a/app-editors/ghostwriter/metadata.xml b/app-editors/ghostwriter/metadata.xml index 6e74fad5a416..ec38f0e7f74d 100644 --- a/app-editors/ghostwriter/metadata.xml +++ b/app-editors/ghostwriter/metadata.xml @@ -1,19 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>reagentoo@gmail.com</email> - <name>Dmitry Baranov</name> - </maintainer> - <maintainer type="person" proxied="yes"> - <email>davidroman96@gmail.com</email> - <name>David Roman</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> </maintainer> <upstream> - <remote-id type="github">wereturtle/ghostwriter</remote-id> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">office/ghostwriter</remote-id> </upstream> </pkgmetadata> diff --git a/app-editors/gnome-latex/Manifest b/app-editors/gnome-latex/Manifest index ffe12a3b6f19..0c4f5046e124 100644 --- a/app-editors/gnome-latex/Manifest +++ b/app-editors/gnome-latex/Manifest @@ -1 +1 @@ -DIST gnome-latex-3.38.0.tar.xz 1094376 BLAKE2B 0c02996dbac48c3859d33a0d504a64462e306d346ca22397820231fa8fe7ce2aa621a1435a02d78ea424fc8e9f5b7ac6e3e60180d8212c170d52eb4baee3b94a SHA512 c42cc1ff2c59afe4d995e9f13d9a858e2297827d5f9359cecd969d305224fc4b4d0306e0ab6aa1d9b7fc92acc25e597319299afe176cff1903f734fbc2ddf29b +DIST gnome-latex-3.46.0.tar.xz 1216344 BLAKE2B 09255b263a886f3e7c50c44765e2399ddd148a807997531cdebb19c2cd4e320d970aba61dcad25413c50cfaa2cfc5c46a7bce3c768ff0ecf77d77921094bdcaa SHA512 a2c85f240bdb90633f7e0b8710095ee6db5f6f4b67ac831376bc3741e34d53ab37b76ca33dd26f8080f03eaab436040a33db30c07965cd5998b929f37c43929b diff --git a/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild b/app-editors/gnome-latex/gnome-latex-3.46.0.ebuild index ff16b60f733d..40a487b6b3b6 100644 --- a/app-editors/gnome-latex/gnome-latex-3.38.0.ebuild +++ b/app-editors/gnome-latex/gnome-latex-3.46.0.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit gnome2 DESCRIPTION="Integrated LaTeX environment for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX" +HOMEPAGE="https://gitlab.gnome.org/swilmet/gnome-latex" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" IUSE="+introspection +latexmk rubber" DEPEND=" + >=dev-libs/glib-2.70:2 + >=x11-libs/gtk+-3.22:3 >=app-text/gspell-1.8:0= - >=dev-libs/glib-2.56:2 + >=gui-libs/libgedit-amtk-5:= + >=gui-libs/tepl-6.8:= >=dev-libs/libgee-0.10:0.8= gnome-base/gsettings-desktop-schemas - >=x11-libs/gtk+-3.22:3 - >=x11-libs/gtksourceview-4.0:4 - >=gui-libs/amtk-5.2:5 - >=gui-libs/tepl-5.0:5 x11-libs/gdk-pixbuf:2 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) @@ -36,15 +35,14 @@ RDEPEND="${DEPEND} BDEPEND=" dev-util/gdbus-codegen dev-util/glib-utils - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.50.1 + >=dev-build/gtk-doc-am-1.14 dev-util/itstool + >=sys-devel/gettext-0.19.6:0 virtual/pkgconfig " src_configure() { gnome2_src_configure \ $(use_enable introspection) \ - --enable-dconf_migration \ - APPSTREAM_UTIL="$(type -P true)" # Fails strict validation in 3.32.0 + --enable-dconf_migration } diff --git a/app-editors/gnome-latex/metadata.xml b/app-editors/gnome-latex/metadata.xml index 6c684e071d5f..eb53c84a44e7 100644 --- a/app-editors/gnome-latex/metadata.xml +++ b/app-editors/gnome-latex/metadata.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>gnome@gentoo.org</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -<use> - <flag name="latexmk">Install <pkg>dev-tex/latexmk</pkg> (used by default - for the build tools)</flag> - <flag name="rubber">Install <pkg>dev-tex/rubber</pkg> (can be used for the - build tools)</flag> -</use> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> + </maintainer> + <use> + <flag name="latexmk">Install <pkg>dev-tex/latexmk</pkg> (used by default for the build tools)</flag> + <flag name="rubber">Install <pkg>dev-tex/rubber</pkg> (can be used for the build tools)</flag> + </use> + <upstream> + <remote-id type="gnome-gitlab">swilmet/gnome-latex</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest new file mode 100644 index 000000000000..823994d035b3 --- /dev/null +++ b/app-editors/gnome-text-editor/Manifest @@ -0,0 +1 @@ +DIST gnome-text-editor-45.3.tar.xz 618756 BLAKE2B 45a6a78a665f833b0fb2e179125224e1d3757390deee5845b750bbc13368cd9b0b8521b290e42a2c5be82e2e7d78bab5e3aad256d1c87eade22547696807a8ba SHA512 d9fbdbb0dfbb5d10dc1b817f9ebf114a63e20724c3c230da683c8b7f1332371acf869c723a7067dbdafb5b4df23529944b40e5ec212e52a5a3220ca725388c95 diff --git a/app-editors/gnome-text-editor/gnome-text-editor-45.3.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-45.3.ebuild new file mode 100644 index 000000000000..5c84d35e67dc --- /dev/null +++ b/app-editors/gnome-text-editor/gnome-text-editor-45.3.ebuild @@ -0,0 +1,57 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome.org gnome2-utils meson xdg + +DESCRIPTION="A simple text editor for the GNOME desktop" +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-text-editor" +S="${WORKDIR}/gnome-text-editor-${PV/_/.}" + +LICENSE="GPL-3+ CC-BY-SA-3.0" +SLOT="0" + +IUSE="spell" + +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" + +DEPEND=" + >=dev-libs/glib-2.73.0:2 + >=gui-libs/gtk-4.7:4 + >=gui-libs/gtksourceview-5.5.0:5 + >=gui-libs/libadwaita-1.4_alpha:1 + app-text/editorconfig-core-c + x11-libs/cairo + spell? ( + >=app-text/enchant-2.2.0:2 + dev-libs/icu:= + ) +" +RDEPEND="${DEPEND} + gnome-base/gsettings-desktop-schemas +" +BDEPEND=" + dev-util/glib-utils + dev-util/itstool + >=sys-devel/gettext-0.21 + virtual/pkgconfig +" + +src_configure() { + local emesonargs=( + $(meson_feature spell enchant) + -Dbugreport_url="https://bugs.gentoo.org" + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-editors/notepadqq/metadata.xml b/app-editors/gnome-text-editor/metadata.xml index 959a5e4986fb..b96389a37794 100644 --- a/app-editors/notepadqq/metadata.xml +++ b/app-editors/gnome-text-editor/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> + <maintainer type="project"> + <email>gnome@gentoo.org</email> + <name>Gentoo GNOME Desktop</name> </maintainer> <upstream> - <remote-id type="github">notepadqq/notepadqq</remote-id> + <remote-id type="gnome-gitlab">GNOME/gnome-text-editor</remote-id> </upstream> </pkgmetadata> diff --git a/app-editors/gummi/Manifest b/app-editors/gummi/Manifest index d7f56fa46a92..aee993906ab2 100644 --- a/app-editors/gummi/Manifest +++ b/app-editors/gummi/Manifest @@ -1 +1 @@ -DIST gummi-0.8.2.tar.gz 595733 BLAKE2B 9c7366df2b8fe40f7876f065a1156eb4992048b3eaec5dde332c50ccb98ef2a5d8d2cbe73ebb56eb3736bbce49f3168f165db82f562ee7265ce0859952801a2c SHA512 3882f1e2779b94348cc0cc243c3968a78165c16de41029f9fcb8ba2fa942d329c43f5ecc8ba8327590e14343556ca472a51d1e824ce0985a415ab92aa2cbbc42 +DIST gummi-0.8.3.tar.gz 590485 BLAKE2B d919544eca87e22da49afc879933b5b54b23ed0a21303c95deb405c5ecdec57981d19f526e7cef27f904a6cc1fb5e1bea7af1131578b0f4275460035a5d9167f SHA512 c8c7b5427ed37a995bc8c6f814a5af2926595acfe4dea649e02af424291b8dff0d7264f1e68c7a86b457a9710ad6b18fed2238f1adeec91360921a242a7cb980 diff --git a/app-editors/gummi/gummi-0.8.2.ebuild b/app-editors/gummi/gummi-0.8.3.ebuild index 1fa127ba4ab1..30dd96701486 100644 --- a/app-editors/gummi/gummi-0.8.2.ebuild +++ b/app-editors/gummi/gummi-0.8.3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit xdg-utils @@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexandervdm/${PN}/releases/download/${PV}/${P}.tar. LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" RDEPEND=" app-text/gtkspell:3 diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index ba93bb167e09..c7237f377374 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -1,3 +1,8 @@ -DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b -DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2 -DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b +DIST vim-9.0.1503.tar.gz 17010118 BLAKE2B 4f74d52a3fcf7875031378f86fc3411c64c92e4b82bee371148b19042478d3f974793477c3fc2d9ddff9233fa1ec3c864962880840867544e92464f1a0876f51 SHA512 2f3242ec0f79cf6affc2f7fdaf689c35d8597706ac1689dbbdc01352676199605bb37f22bd901f1e8d59f312237d3fce4bee8b979b28a744ea9e40558621980e +DIST vim-9.0.1627.tar.gz 17048824 BLAKE2B 3fa583cf676c2388641b1240ed4b90c2e42cd9f50ea44a943cce86bba4bf278adf54837bb5c4530471fd57cfcd08cd39be78b17a5e907435a02dc5874ff7f571 SHA512 d2fb863e03d4ad773fcba8917f3cd1e373f661aa8b8a20bd3e416a73788997d31c6dd106a1bf59d72475bb577bbe6d52eb079fff9c7152d96bb6e5c9aa6e2f3b +DIST vim-9.0.1678.tar.gz 17069551 BLAKE2B e83cea77513eb0d8b3ed02bd508333fb97357d2d7a91a90c5a9376b03b444a0b65b6ce04b14e191e33445132845af71193ab140ea615bb03a2c24a904b726cb4 SHA512 c5ffb7ca56ff4eee70f06599dd84db2eb28ddadac229d4f7faf01174805923636a4ce61486bdf5a47910c929613dc9b9290dfc9288006222b4bc4ac891548bb8 +DIST vim-9.0.1777.tar.gz 17177555 BLAKE2B ad6d785f4c6b112199bd2f34e0b7f6070615fba8dce25354a7ded40ff8536388e7b7120c1f2fad790c8dc7134d74649697b6e95777e79dcf1e208ead81b229d6 SHA512 702781b6a9cf540d22aa0bc1e25a4fb785ff2b22e9c6a59643e87fd6f7b3e5444adbee1816bfaa0b45b9655bb56dc2d13904230840a0ecea56f5453034d81a2e +DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 3a4b2bc57712de3b92b0e8d9b2d428e4d576665a183927051eddd53d019a5ca413c74dc10aff09917ee3120bd2e2ba441219d7238994f0d5ba14fc9c31180199 SHA512 ec27e4056460948ff86bc48a21de239a84b53757a8283144ec121654096796d970ad832234d6591a132bcd38bc12dc507cc7795a11cd383d20f08b4d9bcb051f +DIST vim-9.0.2092.tar.gz 17359377 BLAKE2B eeb50de7e4876ce0e2a1e8b241ea2c7c472898495ef5517fa115e01f29ef8922fb7ef970f2c1a3ffe65a8274e2c59bd5a939f397048c6b486683c29c01484d1e SHA512 1c3e78ee1bb507858e0d30a8a1e646c16dd6d8d666ea587e91d1c90e490aef46387d6dfadc01e80f9aa807f7b109e4072efa8d8115fcd2a81dd62cabc30a8001 +DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034b2875e728406b318c8b12e2d8d4ee3423ce94f8749679f07d36f229954f7ef0b12ce7bc4d71ccf6637ce2d6029 SHA512 6a9a785b1915dc167210b0da4d5e4401c71ee49b3554c8a22566378658ddcc3493562897ea39035852399cc5ffb55a73355ab13390c27a4d00ffd76bcd10ddf0 +DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a diff --git a/app-editors/gvim/gvim-8.2.0814-r100.ebuild b/app-editors/gvim/gvim-9.0.1503.ebuild index 249f42765281..bf09149d4a15 100644 --- a/app-editors/gvim/gvim-8.2.0814-r100.ebuild +++ b/app-editors/gvim/gvim-9.0.1503.ebuild @@ -1,14 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/vim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby27 ruby30 ruby31" -inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single +inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -16,19 +21,21 @@ if [[ ${PV} == 9999* ]]; then 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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi +S="${WORKDIR}"/vim-${PV} DESCRIPTION="GUI version of the Vim text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org 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" +SLOT="0" +IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) + aqua? ( !motif ) " RDEPEND=" @@ -41,24 +48,13 @@ RDEPEND=" x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( - gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( 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 ) - ) - ) - ) ) + crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) lua? ( ${LUA_DEPS} @@ -75,36 +71,45 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) " DEPEND="${RDEPEND} - sys-devel/autoconf + x11-base/xorg-proto" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf virtual/pkgconfig + lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " -# configure runs the Lua interpreter -BDEPEND="lua? ( ${LUA_DEPS} )" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi # various failures (bugs #630042 and #682320) RESTRICT="test" -S=${WORKDIR}/vim-${PV} +# platform-specific checks (bug #898450): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) 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 + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -128,12 +133,6 @@ src_prepare() { "${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 @@ -151,16 +150,24 @@ src_prepare() { 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 + # 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:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -v src/auto/configure || die "rm failed" - eapply_user + # --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 } 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 @@ -171,14 +178,6 @@ src_configure() { # 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 @@ -192,12 +191,13 @@ src_configure() { use debug && append-flags "-DDEBUG" - myconf=( + local myconf=( --with-features=huge --disable-gpm --with-gnome=no $(use_enable sound canberra) $(use_enable acl) + $(use_enable crypt libsodium) $(use_enable cscope) $(use_enable netbeans) $(use_enable nls) @@ -211,14 +211,11 @@ src_configure() { $(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 + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + myconf+=( --enable-luainterp $(use_with lua_single_target_luajit luajit) @@ -226,13 +223,7 @@ src_configure() { ) 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 + # Default is gtk unless aqua or motif are enabled echo ; echo if use aqua; then einfo "Building gvim with the Carbon GUI" @@ -240,23 +231,13 @@ src_configure() { --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 ) + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) fi echo ; echo @@ -266,11 +247,12 @@ src_configure() { # 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 + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no fi econf \ @@ -314,7 +296,7 @@ src_test() { # Call eselect vi update with --if-unset # to respect user's choice (bug 187449) eselect_vi_update() { - einfo "Calling eselect vi update..." + ebegin "Calling eselect vi update" eselect vi update --if-unset eend $? } diff --git a/app-editors/gvim/gvim-8.2.3428-r1.ebuild b/app-editors/gvim/gvim-9.0.1627.ebuild index 0a202597784e..3baf872227e8 100644 --- a/app-editors/gvim/gvim-8.2.3428-r1.ebuild +++ b/app-editors/gvim/gvim-9.0.1627.ebuild @@ -1,14 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/vim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby27 ruby30 ruby31" -inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single +inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -16,19 +21,21 @@ if [[ ${PV} == 9999* ]]; then 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi +S="${WORKDIR}"/vim-${PV} DESCRIPTION="GUI version of the Vim text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" -IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" +SLOT="0" +IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) + aqua? ( !motif ) " RDEPEND=" @@ -41,23 +48,11 @@ RDEPEND=" x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( - gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( 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 ) - ) - ) - ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) @@ -76,36 +71,45 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) " DEPEND="${RDEPEND} - sys-devel/autoconf + x11-base/xorg-proto" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf virtual/pkgconfig + lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " -# configure runs the Lua interpreter -BDEPEND="lua? ( ${LUA_DEPS} )" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi # various failures (bugs #630042 and #682320) RESTRICT="test" -S=${WORKDIR}/vim-${PV} +# platform-specific checks (bug #898450): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) 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 + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -129,12 +133,6 @@ src_prepare() { "${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 @@ -152,16 +150,24 @@ src_prepare() { 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 + # 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:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -v src/auto/configure || die "rm failed" - eapply_user + # --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 } 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 @@ -172,14 +178,6 @@ src_configure() { # 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 @@ -193,7 +191,7 @@ src_configure() { use debug && append-flags "-DDEBUG" - myconf=( + local myconf=( --with-features=huge --disable-gpm --with-gnome=no @@ -213,14 +211,11 @@ src_configure() { $(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 + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + myconf+=( --enable-luainterp $(use_with lua_single_target_luajit luajit) @@ -228,13 +223,7 @@ src_configure() { ) 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 + # Default is gtk unless aqua or motif are enabled echo ; echo if use aqua; then einfo "Building gvim with the Carbon GUI" @@ -242,23 +231,13 @@ src_configure() { --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 ) + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) fi echo ; echo @@ -268,11 +247,12 @@ src_configure() { # 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 + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no fi econf \ @@ -316,7 +296,7 @@ src_test() { # Call eselect vi update with --if-unset # to respect user's choice (bug 187449) eselect_vi_update() { - einfo "Calling eselect vi update..." + ebegin "Calling eselect vi update" eselect vi update --if-unset eend $? } diff --git a/app-editors/gvim/gvim-9.0.1678.ebuild b/app-editors/gvim/gvim-9.0.1678.ebuild new file mode 100644 index 000000000000..91813ab71f13 --- /dev/null +++ b/app-editors/gvim/gvim-9.0.1678.ebuild @@ -0,0 +1,360 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/vim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby27 ruby30 ruby31" + +inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils + +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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + aqua? ( !motif ) +" + +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? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + ) + crypt? ( dev-libs/libsodium:= ) + 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} + x11-base/xorg-proto" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# various failures (bugs #630042 and #682320) +RESTRICT="test" + +# platform-specific checks (bug #898450): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # 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' + + # 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" + + # 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" + + # --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 +} + +src_configure() { + + # 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 + + 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" + + local myconf=( + --with-features=huge + --disable-gpm + --with-gnome=no + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable crypt libsodium) + $(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) + ) + + if use lua; then + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # Default is gtk unless aqua or motif are enabled + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use motif; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + else + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) + 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 tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ + --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() { + ebegin "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-9.0.1777.ebuild b/app-editors/gvim/gvim-9.0.1777.ebuild new file mode 100644 index 000000000000..5d9b88f5d4f7 --- /dev/null +++ b/app-editors/gvim/gvim-9.0.1777.ebuild @@ -0,0 +1,360 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/vim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby27 ruby30 ruby31" + +inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils + +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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + aqua? ( !motif ) +" + +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? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + ) + crypt? ( dev-libs/libsodium:= ) + 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} + x11-base/xorg-proto" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# various failures (bugs #630042 and #682320) +RESTRICT="test" + +# platform-specific checks (bug #898450): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # 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' + + # 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" + + # 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" + + # --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 +} + +src_configure() { + + # 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 + + 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" + + local myconf=( + --with-features=huge + --disable-gpm + --with-gnome=no + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable crypt libsodium) + $(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) + ) + + if use lua; then + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # Default is gtk unless aqua or motif are enabled + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use motif; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + else + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) + 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 tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ + --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() { + ebegin "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-9.0.2092.ebuild b/app-editors/gvim/gvim-9.0.2092.ebuild new file mode 100644 index 000000000000..b4393c4f6a4c --- /dev/null +++ b/app-editors/gvim/gvim-9.0.2092.ebuild @@ -0,0 +1,360 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/vim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.2092" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby27 ruby30 ruby31" + +inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils + +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://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + aqua? ( !motif ) +" + +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? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + ) + crypt? ( dev-libs/libsodium:= ) + 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} + x11-base/xorg-proto" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# various failures (bugs #630042 and #682320) +RESTRICT="test" + +# platform-specific checks (bug #898450): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # 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' + + # 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" + + # 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" + + # --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 +} + +src_configure() { + + # 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 + + 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" + + local myconf=( + --with-features=huge + --disable-gpm + --with-gnome=no + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable crypt libsodium) + $(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) + ) + + if use lua; then + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # Default is gtk unless aqua or motif are enabled + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use motif; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + else + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) + 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 tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ + --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() { + ebegin "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-9.0.2167.ebuild b/app-editors/gvim/gvim-9.0.2167.ebuild new file mode 100644 index 000000000000..20fcedbb1b9e --- /dev/null +++ b/app-editors/gvim/gvim-9.0.2167.ebuild @@ -0,0 +1,365 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/vim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.2092" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby31 ruby32" + +inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils + +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://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) + aqua? ( !motif ) +" + +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? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + ) + crypt? ( dev-libs/libsodium:= ) + 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} + x11-base/xorg-proto" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# various failures (bugs #630042 and #682320) +RESTRICT="test" + +# platform-specific checks (bug #898450): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # 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' + + # 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" + + # 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" + + # --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 + + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi +} + +src_configure() { + + # 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 + + 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" + + local myconf=( + --with-features=huge + --disable-gpm + --with-gnome=no + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable crypt libsodium) + $(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) + ) + + if use lua; then + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # Default is gtk unless aqua or motif are enabled + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use motif; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + else + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) + 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 tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ + --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() { + ebegin "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-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 0a202597784e..9f2b67d6fdc0 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -1,14 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/vim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby27 ruby30 ruby31" -inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single +inherit bash-completion-r1 flag-o-matic lua-single prefix python-single-r1 ruby-single toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]]; then inherit git-r3 @@ -16,19 +21,21 @@ if [[ ${PV} == 9999* ]]; then 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" fi +S="${WORKDIR}"/vim-${PV} DESCRIPTION="GUI version of the Vim text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" -IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" +SLOT="0" +IUSE="acl aqua crypt cscope debug lua minimal motif netbeans nls perl python racket ruby selinux session sound tcl" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) + aqua? ( !motif ) " RDEPEND=" @@ -41,23 +48,11 @@ RDEPEND=" x11-libs/libXt acl? ( kernel_linux? ( sys-apps/acl ) ) !aqua? ( - gtk? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( 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 ) - ) - ) - ) ) crypt? ( dev-libs/libsodium:= ) cscope? ( dev-util/cscope ) @@ -75,37 +70,45 @@ RDEPEND=" sound? ( media-libs/libcanberra ) tcl? ( dev-lang/tcl:0= ) " -DEPEND="${RDEPEND} - sys-devel/autoconf +DEPEND="${RDEPEND}" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf virtual/pkgconfig + lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " -# configure runs the Lua interpreter -BDEPEND="lua? ( ${LUA_DEPS} )" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi # various failures (bugs #630042 and #682320) RESTRICT="test" -S=${WORKDIR}/vim-${PV} +# platform-specific checks (bug #898450): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) 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 + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -129,12 +132,6 @@ src_prepare() { "${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 @@ -152,16 +149,29 @@ src_prepare() { 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 + # 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:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ - "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -v src/auto/configure || die "rm failed" + + # --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 - eapply_user + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi } 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 @@ -172,14 +182,6 @@ src_configure() { # 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 @@ -193,7 +195,7 @@ src_configure() { use debug && append-flags "-DDEBUG" - myconf=( + local myconf=( --with-features=huge --disable-gpm --with-gnome=no @@ -213,14 +215,11 @@ src_configure() { $(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 + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + myconf+=( --enable-luainterp $(use_with lua_single_target_luajit luajit) @@ -228,13 +227,7 @@ src_configure() { ) 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 + # Default is gtk unless aqua or motif are enabled echo ; echo if use aqua; then einfo "Building gvim with the Carbon GUI" @@ -242,23 +235,13 @@ src_configure() { --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 ) + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) fi echo ; echo @@ -268,11 +251,12 @@ src_configure() { # 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 + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no fi econf \ @@ -316,7 +300,7 @@ src_test() { # Call eselect vi update with --if-unset # to respect user's choice (bug 187449) eselect_vi_update() { - einfo "Calling eselect vi update..." + ebegin "Calling eselect vi update" eselect vi update --if-unset eend $? } diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml index 81f9a4724bf6..7a9a9815c21b 100644 --- a/app-editors/gvim/metadata.xml +++ b/app-editors/gvim/metadata.xml @@ -1,14 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>xxc3ncoredxx@gmail.com</email> + <name>Oskari Pirhonen</name> + </maintainer> <maintainer type="project"> <email>vim@gentoo.org</email> <name>Gentoo Vim Project</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto support</flag> <flag name="cscope">Enable cscope interface</flag> - <flag name="gtk2">Enable GTK+2 interface</flag> <flag name="netbeans">Include netbeans external editor integration support</flag> <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag> </use> diff --git a/app-editors/helix/Manifest b/app-editors/helix/Manifest new file mode 100644 index 000000000000..3df839cd2c1c --- /dev/null +++ b/app-editors/helix/Manifest @@ -0,0 +1,494 @@ +DIST addr2line-0.20.0.crate 39558 BLAKE2B 1f66fcb361161599a87f874a3bf28a05614e235488d02205d4c8e207ae193280949ad957fd0eb383a49f4c1bc287569454d3c6872ed6e31c081e6fd03f8d460e SHA512 f9794772a31dd01096b168b4b4ffe311d4850c69fd77dd72c1e532a94ef7b23c31cccb9033848822521510f1fcc2ad0fdd824cf7efb9ed43828dc0165165b319 +DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 +DIST ahash-0.7.6.crate 38030 BLAKE2B aca3661477fcd7822d6d10970151e05c28e1615f8cd7ddaac064b15102027e404b19b0f3f16dd76145048594ea1c22ae27dd08cc05c411efbae9ec7a1ef55ce9 SHA512 61354688b6fb096359faefb6f34be958cd2215d56b88c22c737d24183eaad433f811bc9e64f927e4852c87d2799c22fda82b55cfbef2ed6357ff74f0c4ffec68 +DIST ahash-0.8.11.crate 43607 BLAKE2B 7dff8e41798ba25df8c4827ff414a182bb25da4825f0119a74916fe775db5445b87be8fc87f7c7f98d3b5053e1d47546f98873de1a942d36e5f308a3fb7dd620 SHA512 47d211b2422de0b381dfe32229faa346406eb7a22dff867dc04c22389609a8671ce3218e662000c49891a06c259d82e0ff4413740f007729d80e097a6c3f0d9d +DIST ahash-0.8.3.crate 42416 BLAKE2B 84836a4e33451012ff32c1a1a90500d87eb7ce649b60dff4eecfb0d25b9782a186376c154673c3121b154ff4616016d1718dfd687b88f4772c2c89eeb2f119b6 SHA512 cf2d2f1201ac0969cf4e2a0c47090bee971b2287ac44b5e091c90a9eced03cf6ff56d7900cc0f529d4acedc30bd400261c15e50efabdd1731f79951b449af53e +DIST ahash-0.8.5.crate 42783 BLAKE2B 161cefac13ec889e288f4913f1918fc6581095a2877977eb32ea1c601ac1d33f2c7521f1b4a1cb79a950f86530208b8b4f61e8b169954886bc97a7f8d1546d0e SHA512 ade5bf9df6c3e5fa28f3ffe807b3dba3fb21250027e68d2e2d58aaf516f2648fe1cf5e20c2f66daef8fb032df9638dbc1d10d3b2c88cb6f3a0d279019d737163 +DIST aho-corasick-0.7.20.crate 111440 BLAKE2B 3f5d54fea2793ce1c2c4d5b3049b910f45a5721e7538cb2557df63dc3069ab3f6b66aceb5e9a48f21c43ae29778fd045428ea103b2a6de81659e605e30e64ca6 SHA512 ad31f3d1b3fe41e593d4ca7e721bbad62936f2e6a17fd1e0997353edb6fc906d1bef2b79f0ac7c7676abe637bbabb23ff22059947be379a2441011f8178983c5 +DIST aho-corasick-1.0.1.crate 167320 BLAKE2B f148004140d4f705e93f448020b97c434b93fea6ae34fd74b1f394b076c2727a87f5ec54542a0f52822d716c10ada3c68ae8f50a46c455fc6e828b10b5650ecc SHA512 7cea5b2305b90aebc54f78446cfc91f275b1be8489d2d80c3baa9ff8b913f9b2296adbdf4aefb0d8fce8f57812963fb9450b200d133a9d61e100cef324068070 +DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b +DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c +DIST allocator-api2-0.2.14.crate 57689 BLAKE2B b3895370e5e73ed339b2dccb875275150dac29f717ce67e8c3375bbbc963b20dfa87b346dca9261aa1d386f37f4315bc5fdfe08843c560cce75d379ec711f7cb SHA512 3bbe0fb71e0dc2a2fa6739d5917f4686ceb94084c6fc10067ad585e7418772478396012fb6e3e9bd874a48adc7894554479a8c5041eee7bd1cca99ea049b2cd2 +DIST android-tzdata-0.1.1.crate 7674 BLAKE2B 4385a4875aadaacd5284a9ca7d1bf8a7bf14bf8925d1563d52fbabacc3af2c1ea08bfcf77106f3648f4fa052ac295158a21e7a0131d31eb9aecd99ea4ba20055 SHA512 4294024c21ddd0090c42c8eedf708d40d917f55ad5a4cb7aa3e64cfb6551b6df60f2e36bc08620c1d2fc8c7ba7207411518ee5c8635f60ed8ad9efdd458a2077 +DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 86f68ec3bdabf8c6ec47881d794970f08a9eefc7417fc8a2bf4fe9faf9bdd2a2024a94adb0cbf96673409f5fbbd4d0111a1ac371339e7a90a277b6cd5003524e SHA512 b09f51339f9772c0e2e4241b36cf51573c6b96b19ffc1fbbc94b1c1d1d2fdfe8eac3134af54174a675ab05d18ef4f6bcb2c7fcc20114bbeef6e17e3692202191 +DIST anyhow-1.0.71.crate 43808 BLAKE2B 1ec6b440758e26b2328738bab7c6b1fe8670959793cc24f61cecd0d8b0ebe60b9855ee1cdac9b5f5a5b238daf796eae5b7c82b903e7c822a5625d95130f8b61f SHA512 401b1c5d04fa0581f303395fcb3af5e7684ead367e2a173b4d90db9c04ac20010c5330a686f3ba91a541e1526a7185091b7dbfddce5134b5a74cc749b0338da5 +DIST anyhow-1.0.75.crate 43901 BLAKE2B 6353557d7ec2cbfdd001c039fad62c95fea9e02b113149f726fd14bb36b31e637e8609dd5ee20a900e9c11bb783d9958d664b31ba7c467382fa7f51d477ad3aa SHA512 190d6be8ede0af9808210db53e4dc31ce69b126a26b0357220c4705a11e83cab2c2c09c59964a35794f3c434f717eaa6bb669e9e8f16012535c14246b17e8d40 +DIST anyhow-1.0.81.crate 45142 BLAKE2B 9b8678c5336fe5fd2823c58eae827f7aba726e12fb6edfa958c6e3b38a96dc3310bc8d044ee2e9db0bc611548f0be9a7b664b75321bd0b8a7e168d27dd3d7e78 SHA512 3d328c6b45a4780cfb6fc8daa5581cb5e45b230cb5f55837b0fcc8331c8d53630950c281115c06b21e655821a46d360c4aa667cbb24e87f3a534206361b08af5 +DIST arc-swap-1.6.0.crate 67342 BLAKE2B 6afd6570c3cef4ae722d4168c3320be1343c4f6043892e5e5b52879b8210a896e083d720797b41a41db04a08eefdcfbacbfdee1a7f2180e9755c868d6fded872 SHA512 5e09cef9fa12d1204db24f3397158a3f45d12dd0fa61eadd691bba120a43fdaa916ab09997e7a63d61a3fb7dada4e3266181f4ef413850c4bc5e59d2c6c5b9df +DIST arc-swap-1.7.1.crate 68512 BLAKE2B 5ddeffd2ae8af4125a5b43d4a0a1afc7948533bf037d8cd3e47603c13b57b156618280d99b840bf318b25b6eb29400ad68499695e182acdc05bc5f621c42ee16 SHA512 070fa8dd17b380b6d7d72f6f45c84e591de9a9770b9662351e7a41af03798bf5e34d185a5fcb948f4d8ac5e210a33acd465c39eff6097662c2442b34ee3dbdff +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST backtrace-0.3.68.crate 79891 BLAKE2B 38ec5881bdd8f2ee55db9da423e030603a6ad0b50edeb37e0899ca781bbc9f54fdd00e4f27f8589cc34ceaefac05f26fdcdf693cc08d9d06a2811783ba7c5c2a SHA512 4c4e5d47154e64d2192a6358d0861097e31b5a53d5863b03dd38562dccda7cbec584e006ce29563cadfd03b0031ed7a16fa43328f515cc66a296048c9a2f5d89 +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.2.1.crate 35798 BLAKE2B 9ed2e0764edb3f164385e4420e8c9a133757194ee2763743692520d2389ee81c987a081db68510963d66a02555d20bc6decd83f707309040a7295522ddfa35f3 SHA512 413b602edb82f8a4553735e46feefe323137b742d003368e037406157f916e5a5ea002d015a27cf8d41accca75f103c6712e2268fe2853d4d5e93e7264682182 +DIST bitflags-2.4.1.crate 37043 BLAKE2B f61c45b142265e9c2944c7054e01704de47510735e9ee5351cd02b98676cc4eb42d68b1fc4849ad5f54654617a74f20cb533b4207c2fe76516b724ba9318b414 SHA512 d3fd7abc95acc1cb5bf16d6acc12dbb8eadd250f069268df13c2e8dc3d5f5c15a929cd17ca931c77393b64dce0516ef8674c469789ed32d78e315b5faada062b +DIST bitflags-2.5.0.crate 43821 BLAKE2B 2d2a78b0a19dcb39580e6f73ed6c468b0626043010b34661084944c83561fe49db24bee1ab57fd692d57617be6506d529e095aea27b753a77e26d0b1ebf7ed78 SHA512 75d7a89e53e5e7582591932bc430e6a1db7ed0f914ded6dbcf957125be52975598df7fee14ef816f66544432ef0505f0a081f3794d17138ec429e283fe14fcf9 +DIST bstr-1.4.0.crate 345921 BLAKE2B 39a3cb366a7ceb784b7a6626f81338e8047498c5755ed60fce1f6460ea5aa907ab5df4bcf30a07ed699c7af7d2d0dbc48b2c5cb674b863c22fd63b5080b52fae SHA512 98dc7bdcc1a307eae2ed202b2b785a4ad27719c4b3289408edc710beabedb78d16b3042b41de04fca5dbdba19d8567df69c35431e33a3c02924820e1a601df36 +DIST bstr-1.6.0.crate 385877 BLAKE2B c83895b56381b066d17bfed179fca86f69b1284299887d7590be1cf6821cb6ae21e07fdbaeac65cab4a8b2310ea18a316e25c2e5d05c0fbfb926193183cef046 SHA512 094e914ae7087caa6f340a1e26d0ca94927b1c92f0d7f907e4472b3b5c142b63b14759056d537d04be6a7901103fdd47b14f3c6315f68e8c8266155d133cb1dc +DIST bstr-1.8.0.crate 380176 BLAKE2B 017ba2818bd636297cfb16fa975b34aa83367aef6df2cc321443754e5fbf4a9afa8ec9e99328e0cb0e5929268d6a4c2301e55aa2a6516e43e87280789c8d159f SHA512 9b8828790f3e342e69bb92cb9231c7134188c168a9b67a8705dc2e3370b86885f99e4d47f21ff68afc9147968b0fbf5a293307b09f132dddc550d8cd576f1048 +DIST btoi-0.4.3.crate 10007 BLAKE2B 60a4c0511afc23ec3bdd07a905e82b501f1000081e6dbfca9ee6a0d6aad40ade84ab09d740fbc8e9656653a7f5a9a12a68ffa732618e8dc87f9cf00a90b6d3cd SHA512 35d54183a37c8adb11838724a061b38d286a92603a557ee8b4b80dd230649a0ceb165fcab4b6e41402284f2153e18fad5c246f83d99accb2fdaa8f32f854bd22 +DIST bumpalo-3.12.0.crate 81604 BLAKE2B 2370094f0c23a3e9b75c8e523e54637189543d9df90ae7ddc349d316054d3d1abd1319e51cf1578f1630be0673fd7f65d130469b2729aa32617372e8bc5dd5f7 SHA512 37f2228f251340e82c27f2b34da2af6eb520077b3809331547cbe4887c0b4791b1a7d75a017decccef162cd02a088d504214b7a44b484a7d93eb6a278b329ee4 +DIST bytecount-0.6.3.crate 12416 BLAKE2B 462e41d5a4ee23a6c9ff2bf350171e309cbc32f14bbdbde25a5743072a6511634d6c0429903edcfa8df4b9ef3c7bd95d73fff8a7b2018f3b4a8147de2bbfd3f4 SHA512 0c5f424329883726589e69842d2ac0767dc0b440d744a4452a14cbd449b8ca2e8117fa2978b4aa9b803a1a7cf79e9cf67e948057e8ee521e2422ca2e145ea670 +DIST bytes-1.4.0.crate 58080 BLAKE2B 99a9d343424e04649bd209bf2a6c3a089a6cc9fdb799968f8c3a711189328e4499df2e09cc6a2a8ce05d2cc668149b364cf30cb3b09e96e21d50a39519c2f49f SHA512 502c63b9fdcd36ed28ede55a63cd359dc7b28658ecd43020511d17d48d7c34e45aa8ff7e4b17770f12197451040c2b724fe68d2aa3ab4f81c9171d052f2aa000 +DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8 +DIST cc-1.0.79.crate 62624 BLAKE2B b3cbed3bd6fcac1c6ea258ec96cd107f859947a35dc89c3dc8f314741b0f668e61518f896ec32ce10c9a7eb20dd350bc177a71810d53ebea59fda062ed9d27db SHA512 cbf0a25f3a23fc540e9d638fabc23f761f1c240ebb4814e761e90437d71fc559cd155768ab9e78fc192220d8a605c66c3af342ed736b719181656170b98d7bf5 +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cc-1.0.90.crate 73954 BLAKE2B 840417889519dec96a745c49ecbc8b0d3da9b37a4b6b0165ee8983c07b8150061690b34409381365ae4c70c5780923d19cddce29d5fbc370eb6b6fff29121436 SHA512 349f3c3f8208632f8754cc05d70976eb14f3f13a14d59413994c656efc36bb32b7310adc7d5f3a6745f15e0aaa88334644c9aba8d29fb961215d74bec605307e +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST chardetng-0.1.17.crate 56362 BLAKE2B c99d2f1044fc652858e6de0f2be9a24bec68550bc79fc8a7424c3a97a8cc5e28e859c2577d7969bad744dd8adc640c5f79a0fb8ba6043975f048f305f8745df6 SHA512 0b537b68e6da14e4a8b63cd069b3e9d6b09a4df5e473157f3ddce91d7a01f755c7b5278bfc9dc09ded92f660535c5944712f0ffa2737fbfaafbf5b95e29c7aa7 +DIST chrono-0.4.24.crate 191330 BLAKE2B 492a5f1a458db9d6eaf244ac6ee750fee5b4e2586b7c675f87f2515143080774f13f9c163bcfc84b08ec70b90c7fab2ffa438f9b2b8b4ec1e691fbf9a104ad50 SHA512 1a9121870aa4d76448a1b118a2e135a145a55c7784c4f5a4f25732f8597b8655f32cbce174bdd65c2dc7b17dcc3a608454d0e3dc29b86338e42a839f8be1e4fd +DIST chrono-0.4.31.crate 214513 BLAKE2B 2ac43852ea14cb7b129adf68ff62adac1763b3f4802dd3d23c43cb131377b501b4adb22aa93818d7ceded8eb10c17f94a7836257ce2876d0513b063276129c54 SHA512 23276daa2c1bc3b7b2327dc84200fb40cc995a8b599d1a537e92e08138ab8a0d1548a510a8155dcdda18820120d7204e89a4686c866fc3a8d2460cdb30ac6089 +DIST chrono-0.4.35.crate 234267 BLAKE2B 92552b9c8fb40160de9ee62ed8c5bea12bf8bae393caf91c1c64596d6b2efd09dce94355fb757ed46eaf4a13d27ee3ebb43af91e2d8c26df1f9a9f429869f319 SHA512 aed8bc3298c8f8dd8146c6a919610b6dda52c038a28b56c837a21590e41fda605cd466dc1b85e407f365e116d741cb82afbeff5d29f95f3f5bce4a62abf80812 +DIST clipboard-win-4.5.0.crate 13476 BLAKE2B bfe3e9c21d58e0001b85c69d724b03b2bc7128fe67420948dffe0b9709504924339c93b5acc2a572a7780bb1adcb51ab10ac172b972c26d325f3ceb7f7f6dde7 SHA512 2dfaf30119eb77c9f069310417f11e836e158ba43f988ff49f79647f5fe44bacf7e28dcc11ba2cd95389c685a69be0f5ef8b033ef09b94c9a3e484952e891d8e +DIST clipboard-win-5.3.0.crate 19597 BLAKE2B 1f61d0c7049e6b2d9f09d6ef47196153ca4f592cb0eff7602317cb871cf06a54ecf7b49a121f45842cf49555c171f27db38e41975ba13920e5eed456283b6c10 SHA512 decd0b73e2d879c7b650f525b74e2ff20d271ac21598a64d447d863cd3d1fe344b3f4b4420514644c777d1d1793b585336e877759734c7234627ada0510daffc +DIST clru-0.6.1.crate 16507 BLAKE2B 6379e70a2d75530bde76e82c370c4481ce84d8196a395e94b30dddc1126529774e7ac662da2611e4da10cad6dd54fbe55e1bca4d554369ec5f4798bab59a9d53 SHA512 bb9303ea245e3df6321bbf3c4cf9f899648067f8d3950638387badc79ab37e7570ee73c90af96dfe4eefc004d116c5fc77cc8d89a2809defa2107cde530cd192 +DIST codespan-reporting-0.11.1.crate 48963 BLAKE2B 39deb717a853ffbe3585e20a67fd7a75b62e2d796a66b5004876501fd7476acde9f126804f2ef6220ebab66821a3ccf058d544d689a2705eae44285f34b510cb SHA512 0869789f5c50d3523d3ee16a8fe64756498a13704efbe82bb0845eaa87c7b6b1d075b3b6b80567cd9fce6cb09c5179e9c07e485fd17ce56c8139ade0f8bc6844 +DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f +DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 +DIST cov-mark-1.1.0.crate 9801 BLAKE2B b0bf83bacaa1ea42adec1e476fa31b022f682853c925043729b9e31616adacf5a29842edc976b0b0493c167db2f1a56f7d74902ea19a7d3332dbfb3216d404b9 SHA512 500bb4d1484fe83468d2d304967a25927ffda55fbd300948476472192a8efc71fd924b31a72120f8b838630913d4a72d15094f204be3ef09e19da4e6bbd3a258 +DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357 +DIST crossbeam-channel-0.5.8.crate 90455 BLAKE2B 017132056f1b40e55fbc7a09b75509d72b0a6123a0e5ea5d6104fe822f73b3ccce670d711d3b84b5ce743dcab5f10445297a6701b71213b77c0d56e2c3fd7160 SHA512 47677d6fe63050c51393e4a0537a3c65d7055c9eae118ebe60c5d716b4f47f23c2b1947b1e1b66bfb34a57c4db3a44631d323e996dd545565fe4f58c25863ff4 +DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f SHA512 f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672 +DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8 SHA512 d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde +DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7 SHA512 4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831 +DIST crossterm-0.26.1.crate 122317 BLAKE2B 0f7c2af125b6e4abc09df134acbdddef62699654670f21fae490c360de139473917350643a217cfa69dd59bef2f2e887a2b1fa0278831f000ce015d8e592d811 SHA512 598431aee3067c071cc2561def7055f15f5bb91c70246f975d6227bb385fe8b1aa6b59096c465a92e09c8a934bd2a6d45790edc453d5c820a96b8fae1f66e81b +DIST crossterm-0.27.0.crate 125311 BLAKE2B 93724dddcfcce9249db721213985fbd9b30eeabf0e8c1c8626744eae3a15f181cc2bb871a77fdefdb2b1a7139453b1c81081c6d82a62233f3574ccadcef18686 SHA512 b7b2b7d8affd845902e0dfa06edbcba9c7794e0839895998f39ea1b118de5251fb87c6b5de27e85c490a436b04943ff51d609cecb780674c3768c12ec401d2eb +DIST crossterm_winapi-0.9.0.crate 15561 BLAKE2B f84604f1da9cfdd0fc69742eef8088e7d0959073c6f7f37507b065b8537faa20bea8e349bcb1d6836be97f06b4a2c55c4dc63f50eb2f2aba1f34df9b8c9abf1a SHA512 b8c32a82cc83244e8991931e3fe0d85527ee2cc5e6b4a0839d633448dfa8a137c87684e8e079f44edf5a994355e0106bb573b36b57c7420ac5cb6fb0ce20ce8d +DIST crossterm_winapi-0.9.1.crate 16027 BLAKE2B ea63abf751aeab203f326e77260cfbd1de286be26acf714a083ae1262b0cc2a35b5cb6d0bd54f45b33c1942eb22f916141c5870aab34149fdb30faccf4d4642e SHA512 48eee242f477f43b69c00e3a5d4d255de2ce1774f6e73d869c5472b35d85af0b63f3a607097da8ace437b1e52a524ded4106767b83d4ec53c30c2e37ac4b46a7 +DIST cxx-1.0.94.crate 196058 BLAKE2B f504685292650a076c3689540cbb5906721fcba1cda0391e855d75b9b1270249805986b501291d91c947c124ba8affa1659e43e040bb264d3ab3aa23b98d9718 SHA512 fb66c3d53dfa1fdfe8fa31ffb6ffe0f53fc87d5f56038b5d2f588fc56668f96954e75db1fc7304d183ebae2735f0c7297b396936d588242556f40557854f22be +DIST cxx-build-1.0.94.crate 84842 BLAKE2B 39b8a11b925244410ac2dca3be5a27576ea67f5386588e768d9ac1041336170834c7c2d0cd0a61b3e6eadea4d6364e98bf4dca64204126ef815235a17f1edef3 SHA512 4e2b7ccb8ca2ba35d14fda222595528d3e7abf6b4bf5b8e23f19f9668377103808151ddf63bc1c5f725fa362dc3f33a827b026edab176cc99a36e0f890c13adf +DIST cxxbridge-flags-1.0.94.crate 5253 BLAKE2B f7746ca703e95f8b6197655aae08b88509132b89d035c62420e3d0cc4857687171063e2da69a787938188dc5e40fccd2b50713ed929f3f097efbc5b5956b5263 SHA512 9d577cf6bd2afa2301e8c227f201c138a379457624833c3cad4e75c7ed046544b363ac4bd0f7a1a2142ab1c9d879b56ccfd681a3962be917099db5ee4c63fb02 +DIST cxxbridge-macro-1.0.94.crate 59873 BLAKE2B 9a29a2818cdd6047b49002c10542e2d04702ceb41823a12e27b151bcc524a05377390c65164e53062630d7ad9f849ec71070118de5eb348c98072e301dbd1416 SHA512 59120f8d0f498539a16921d18e0e53a745f4ee58f4ed40465b13722188d28975820adc3c632a4592c6813771056fe084674daee6c56940e50f6e9c492c4fd90d +DIST dirs-5.0.1.crate 12255 BLAKE2B eadd38e85211ed5aee7fab964e90342273320644c36262aa7b436e493512851a4751a09d22aa8bae0495f4b22df6e7395d13715ca8b8c6196107b1be03af9328 SHA512 cfc329518e85a25c296521b9aeb6e5d5f60b4525aa786ebfa8b9f198446a1ff5892160d1bb4790d7f3fc4a0abdb5921b2e4896e271a3fc3a3225897313b77bd1 +DIST dirs-sys-0.4.1.crate 10719 BLAKE2B 30334f2192698d7d03bd4e8bc8a682482da7d13baacb8547a132f55019d3727ac35579926ba4367fe0a5b7fa917945abc03e010cb7363683753c87440581df42 SHA512 53c7c8bc76d7211d08a0e6b25caaed12eeb7283cb4b352c12311db3c796794330943259a08e48ff9d3a280917920a088e5aede32677a4b2f9f819c2dca6adb9a +DIST dunce-1.0.4.crate 8034 BLAKE2B e1e7ffbcf1e3632036c03303ab46fc37b2b0a991598790b2dc65d7a61341a78bf555230ccded8fbb87d6288282af3ed2a8641212a0f1fab929bf99298e878b6b SHA512 f57d9c53c177bac8e10a4b56ae421c604085aef0f264b8d6871abb7e1ff713b55f396c5c5f24422763319c504c6ea6a774416af1c2ba23ba7b67b2282f6731f8 +DIST either-1.8.1.crate 16027 BLAKE2B 2fad54b5f20bb8540fff5959ca7b2f9021c814ee610895d770f7081b12ebe2c93ce754c462df9d81824d479ca75e07f4a9e398c07a655f4abe2740b9c9de9c62 SHA512 5e4da301a605e0bc1ee3a269fe449aef044df05b5e833940c7f79bed61bbff4fc248e9c82b45dab92b2688d578ada000b271aaf67f2f4f7c82b35f05663cfe7e +DIST either-1.9.0.crate 16660 BLAKE2B ad61038bfacb16f678fff5dd9ccf8f345e1bef18bd7aa0aa9c99d44abf8428939362f32fc8dbb1b60ac56016e0096201071d0bf8c0431b660605d0dfa97da466 SHA512 4978d50842386f51e31a47ad037d5e491106a668bc701bb833e6ec3998afe3ebd80efddc47756b2f300f534b39b26fc01386dc878d3b02cc8c1fec6a474c2177 +DIST encoding_rs-0.8.32.crate 1370046 BLAKE2B ca9c15eb521434daef94de5eecefb487e2b4053ac002f0fa24e3ad101b89fd4a19cbc05b2e52a85599a45d50869a5671dca0786254138b7a5e9d5dddd2be712e SHA512 8a695aedf388dc90b039277fb8a88cd0fe157002554ef478b820e962b6fb19f3fecd5940d0720cc820d07c77e64f7415271a119c87b72c740e6e370ee8cc418a +DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc +DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c +DIST equivalent-1.0.0.crate 6621 BLAKE2B 5e2c461898c2b029430c526db25188ca37b5c1f9f562c1950a7cb26b824c8b06d0ce62542c234e909873c329982641abe091f99074b6e40f13898b39fc4a5a86 SHA512 006fd57e6829b1dd9644abaa6f650098f22302e9882fa5b852c695aecdead8e353426626c56b772ab362303dff23777cc7012ec04f9618403d54f0e03e29278e +DIST errno-0.3.1.crate 10348 BLAKE2B 72831d0b69f95884a69918249cc0e814eb5eade3205331bec6d2021f8b01a42c4c9b494f2717033d65a4c5230c8490b6ce250d349c1e8e177b20e7e84a860020 SHA512 00d64157d066f1e7601c522c0f4e777eb662ca5cce64682f616de0734857765c343396f7161ac2908c3db0c474995ae157bfe9d8a9880743724d9bd428dfdf54 +DIST errno-0.3.8.crate 10645 BLAKE2B 4a7af10845f11b3d8f177a75a692be468e8ef0ee53fb84a4d212335f1499456b6739a59af260894b5c3853d3bf21ef3490d1e3a613305561203ca334a636c3b3 SHA512 29753c421c6f929760cd7565f8171696e4f70e677654a7507253f4fc495edbcf214ace27be46bdfe5c1a0d782f4b688f591476e56f4a1096471cb353c643328d +DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 +DIST error-code-2.3.1.crate 5324 BLAKE2B 3e6c18560c4f30d9fa8e5487453432b220b88acf59a421d2c2ec29bd77bba75ad8bca63e99d384442c7d458b5936dcae149897c2b0c57ad6e621f9b7928b2331 SHA512 a3953c854f7fba48dc34c35ca841d6f0671e8bde19f5dc36cbdc167fcc7c22c143dcd071a35c1866f5bbf05cedcdbcba3f1902d93aa21d19993b426c458af46e +DIST error-code-3.0.0.crate 6176 BLAKE2B 569fbc0fe97c3e9369ea751e04b5cb7e523bb00e6b2f5e7b866c4eec2e98b453b85f5efdcb4efeab8da6399cd7a9e77965896233c0cae668d0bf1514ccfe41ee SHA512 86a9c6ab7d7e229646ba193d5376bc9e705315858e3920c2cf6b284f1fa529942764b68f0a95ccb1bc92f8e2b73f4fd138654dfb03bba7e4361549aee620c908 +DIST etcetera-0.8.0.crate 13295 BLAKE2B 33069c496eb846bc3e602812cd2ed182c660ae06b8a33ecea294a5ec9e37a1fc15391cadc9fde23f3e885e506031cbfb6b7d036b94cc4f94d42b8dfa8ad0ec7b SHA512 857151a9af143c7149feff2aecee8fceec45a7a2ff64a8c1a482aef89ce2f91de05123afd7d22d67cd664d9ec3800652c7800affdde4ec317437f5d925883b3a +DIST faster-hex-0.8.1.crate 12556 BLAKE2B 78826a9f89db41545019449fcacdba5e995de296a801c31d9623e381bbe3c35ef5b546dde403c584afcb77e7aa4253317ae15ff6f2a745128f50cc29da8e9c76 SHA512 3bd0ba6fbdc68518e94a9ab937d2e935b07f16eb9a800a5d887c3536d7161ef0a5c77c9a7d184e059d6854fa425ab2f84297db53abe11b68da23bbb663d5a9a0 +DIST faster-hex-0.9.0.crate 13053 BLAKE2B 36e07a1b08544f273b30b6c8b79eb97bb0e97efc29c570f59fbe9fb4c818dfc0cbd9f42ccd4e196845c5d1f39db1a49cf61d1931ea5c1f761da2b0da49b03430 SHA512 7713b0929ffe5596823d001a83a40fe1c4c500b7cc4218921ebb65f69826a9a9fd6e7b948fbd093cb921bea52e9f2cf3285c9d1d11f2a321dcfba0fb3c9aa5d9 +DIST fastrand-1.9.0.crate 11910 BLAKE2B 570c66ec1d4ace08b9790299759e3b6f0394aca52c4ec2e02258229c198846cba7c0627807548bac3ef1f86c7e512c4bd105f1e18e35ac0ea6934f76a6838e1f SHA512 321567b5fad8552c0efc4393b1e77d1bce288b0a88c475d432f79e91b3457ee6eb5db9e4d65ac6381b9990c9916f4651b6a76250df44d51ea3e25bd8184bdc52 +DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc +DIST fastrand-2.0.1.crate 14664 BLAKE2B 7a5812153500170dcc53ca8d66384fef46eeb5a8f970be43863f22f82bf427672d07cb053f4e04b0fea358ca89178399871235680f57223b8561c07b8d21cf13 SHA512 79a1e1b3f39264f037def236afbd87b732f5e0a2154b1d9e721b3c7990c52be45138320e2571fe628f482e0da7e3cf867abb745e3c277b19015fc031fd4410d9 +DIST fern-0.6.2.crate 304626 BLAKE2B 7dbfc8a1cf0adc288732a1dcc23e30bfea6668b01e162b60e867b67b995b7eeea5399b9e9a630510e3f56c8f36b79b34913342b7c8834783ddacb2cd7b94e140 SHA512 f9c44d1387f803b567b7254d91cd942c55d30a1c3cd37786101d7d49d346bc2bbc593fa8a3b2e59711c5320c1496354e8d2f3ecf0967030ac1e5199650523fba +DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65 +DIST filetime-0.2.21.crate 15026 BLAKE2B 069f38a2c3c25c53b288e3af7372cc314f7b5aa7a094f88d231cbd9fcf935f0bd17c72cdf9c038bc2e78a35e6cb768a66f659aa535c72b7fca5452bb28a1fa99 SHA512 5adbeadc9b93811aac7e8a91b2999006e5022689c7772fc2f231d905b8c1210e1b1e14eee327a081eb70e351b3ba7f8973f492d99a138ce83eed45f7b4a8b013 +DIST filetime-0.2.23.crate 14942 BLAKE2B e4d2d9c11745dfa5592903f3c3c6a9871292a02f9862607b610ead7562b5d1fc3b64d37e779cad0630bde8012efda72d86af5e687cd2ef5d3627d8a89bca517c SHA512 8d5ac82482758577d1d0669abbe7b880efc44958687bba745c9ee4a5c16bddb44ec0fbe9c29cf424e7120905f3c3da607f3a7ca1e50287154c0475ddf2148bf3 +DIST flate2-1.0.25.crate 70210 BLAKE2B 992525ffeeb4433a222487cdfb0c3927ad77f914e1db94f612d80e81faef4a2c955c755c2b800251e3416d0b22726d5f7d7e432a81c3582c54b7de95ab7a324e SHA512 d81a463360ee2778f609ff297e04548120d1fda1f9e020fb2f429ea51189b8fe6cae57252fcd924d71fb65ad0f93ff7cdc7235913f8b78fa82925939cf884af7 +DIST flate2-1.0.27.crate 73460 BLAKE2B 5603848098ac02c9c83893df79ea9d9ad3df5b7e02ffa155ac74602bda7e28e14e6b7de2ff321b38d24fa3741ccea8a4c811abb47690cc295f90d4cf2bdd0bbf SHA512 e76e76444686433acabd16513e6e5860d4d6fa53a810f37266f36900f154acacac6dcd77b0373599a6d33a09175f5f02146d84726b982c59a78926950e19ff09 +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 +DIST form_urlencoded-1.1.0.crate 8734 BLAKE2B eaca73d73d16242f3fa3e38e23531c67c01404697bc7b7eb7c64fa04167dcb403a41818487fc46c5d9118842818472d549a2f5fcef5e4d962461e1c103d895d1 SHA512 9e245495dbf235b147e4216b313f2e6a96357d2782a66d71c08c2902c6a065701ca8ecdbb6b2035983a83c44cf36c921b5c71d63af0e02dd39bf5f8347117e11 +DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104 +DIST form_urlencoded-1.2.1.crate 8969 BLAKE2B 383d3a197b73fba199220b7708e16d770591ac16725faf4efc1a8c230c569c381870d4a11b8fba623e761e68f9d318630b22101d461e67dd26c67e13a73358a1 SHA512 c65104e2dc08fad572bb31f981700fd43dd29fcff42b01c7ccdbd3d4c23dec12360aed3f1b5fc4766fee386d418a65349b2941b8735f788cb0d35d631a6a8dd1 +DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0 +DIST futures-core-0.3.30.crate 14071 BLAKE2B 76a9fa5aedd0d4ae8dd9db9639839b6b342125759c1b9f9bbf58aacb4ecca316ff1f24ff8f3c15f559ffbf974e4c2cd02a5418cb4c4d7612dac8449c8234eeb8 SHA512 3c7259ddacbe02e47a84178b75e5f13523bd0c8f8bc0b2375f7ecca60b7075695ee0a5cc4e1c1de26665cf250271173be803661e2f2f53e2a3b96380a8efe7c4 +DIST futures-executor-0.3.28.crate 17743 BLAKE2B b192025f0838c924783090e7b0bd7806edae0502172e5f961d4cab5a4a5c074050ab6a707a50baa0ac2f505deb1e3ace4259349570beab0bff34b7bf6849e9ef SHA512 1404717a512f1968e3ac6c53bb6c428fa049b0f6c61565ddc4859407cf16c56735cddf7a2931b2816c6c8dc8809f76e7f98ff05d4f80e4567488c2aa7b424a50 +DIST futures-executor-0.3.30.crate 17744 BLAKE2B 927abec40eab31251409149179baa95a8d025f9cdb848afa83f95439c4768abbf6da8e2163291a086ea0b83b0b650d1e19cb8e15f70369b70efdc70eb3121f6b SHA512 fa65c038e5eeee695b2673cd65cf7529713bef47da373290595b554bc287267ee5cd015ddeda5a22169cc8828717987364584a91a69685cdbfc0fc779abd764f +DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82 +DIST futures-task-0.3.30.crate 11126 BLAKE2B c2ded9b9b709fc10c44cfeaa72d4e7477e43331b14f3e72433b25126fef93f2812a09b4fdc3c246b7379d41d3764ba17fa87c3e9c131095864cbb5f54771a204 SHA512 c190fa0acf7ff15fa67fe172911cfae803b2a8c08168570a5518a40767d08134f147259a413ab25c45cac5dbf2f601a9753c77ab0eb2c180cad2fe48cfe3867d +DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4 +DIST futures-util-0.3.30.crate 159977 BLAKE2B 9012edf76336952dab02cb61db48dfc74b6cfc17c137c36372709e8d575b306a4d7c4da89328067c9482a645aceb7b44ef57deb21a0c25964a5515e738a039d0 SHA512 7faae5aa35641d858d0f5430e4a69acd4ba9037852ad73c5a890bffeed411d28820883e18bad4ca8f7b0a765f9f4c5dbeaf5d0cfaaf90c2c69846434ae091951 +DIST fuzzy-matcher-0.3.7.crate 18047 BLAKE2B 934b90a74826393ceccc3e433df7cbc056a10744077e7a2178df9d9edc9db5d4cbc86d006c0ef1f7d82f4fb8ea0d52df71be1c7cc9ee39b433207d7f2126404e SHA512 ebcb6de06dd66da952183c75e4a44988bc60df17f035fe541c134f1c4e3c33d18a7385a9867fc23a99c07cef2b2737edd6128dea6546e243985da2f3a55dd8e3 +DIST getrandom-0.2.9.crate 34457 BLAKE2B ccf7232ece1047000140ed6bb9a1afa784be87b5cf83e2f58dff77abcd79e34120b45336cb05e47fbfde36407957fe9da8b04971092ec05f67b321fde9142d29 SHA512 48e341125223945d1c02c4dfc54df303ae27d3ceca0d5a30b42065f5e40da600cb2010bb59e88af6b990d54b5eb4bf83ae5bbd27e13e56363f5f68be03ea9082 +DIST gimli-0.27.3.crate 287904 BLAKE2B 97ba399c72cde7b11f0a103598747b58b242ebb808c60c037292b992e30d8fc5e212e5620c233e485adbca61cfc433a4697de3ca76c183ed517a93cad4f75c25 SHA512 b3782d510bbfcbcfd8801b4343a6864b91cf954808e935745caaf1b7e7b3f2f94814f1543de9a36a8d4e5c29d08d69be9361aa2b31e7a261d5dc6e7b66ef4ccd +DIST gix-0.44.1.crate 239451 BLAKE2B f9eb4d0ce1a9a4095a1f9a9889a083dcefc2c4664a773ace3171b57005829943da9208e8522bd7d7ce58068df6390c914af6fe428290a5b6521f392b6f63d9a9 SHA512 75d137145014196981a68d1881ee38143a7d63ecbf669223ee03994efe3a0df5617a7417edfffea611543b05cf52de8bfd846a22589f51bbde4f1e8225fc15dd +DIST gix-0.55.2.crate 303079 BLAKE2B abab4db4b963186acd8bc64a373e48f6a6725a202497f6927d577fc4ff51f6ce99ebd7e6da2befd9b2c28025daff75352a753e0cc3f8002387ca9c025dc7ba42 SHA512 6cbb2abea3bd87c18b92e6b70e2f75950a2cb0bd701a029a4c96d0467689b43694b6c2af4a8e4ce6b958c54e6cf834cb3005e6194b6f3fd4355ce07cf85ba8f5 +DIST gix-0.61.0.crate 270542 BLAKE2B b92e232eebc99b21252652bc93825d68c77faf83682bd54449af07a76295cdda1b8460c1877f5833935c691a9733610f6b8fb74bba58bb65408e4078ac3eefdf SHA512 361a751d66f3fe454791e190e5f809f30f255f6ed248cb0b6f12311b296b60f48b925049164f4a00f0ad8e967e1323cac133c11500ceb8286ac586fd52d60b12 +DIST gix-actor-0.20.0.crate 4127 BLAKE2B 98d227f2ab5eded19e285f79e153a454450af76f78885a873e84ea2a77accb90c235ce1877038173b64dd0926a949f9d1677fb78ab00c38519e83564ebfa9107 SHA512 b73e9719b9b8d182909e62cc836c1a4da70c6f67ddb3482dd669bbfcafe5afcbc0dffd1e155882a1ce6edbb0b47b3595d81f824ee21f3322e3446f813f5b4d99 +DIST gix-actor-0.28.0.crate 29420 BLAKE2B d5a18f96ddf29d1432b827595dec2224210d255987bbd4cad50b09da8d934ef26034cf9f7524dc79e77af0ffc37f746636c8fa149008534a392931d3783c53d0 SHA512 c458078e2008773460add33c2093d79ef21c2fa788419d79c31bbde13d1d2ede1161a491e33200ba71419f08b6ab2c35319627b6671b7ffc4e8521cbfdd0dec4 +DIST gix-actor-0.31.1.crate 8952 BLAKE2B e582c415e9c7b13f9b92cca97777e2097de6884c2f1c10e71d9076981bfe809d8f46a140d1d2328e443b835fceb7954ff1c5ddc3e807c86a86ea9607e391a17b SHA512 fdf59aad0880ea94e5d9deb4308e2a1ad6e4facb3ec16aef06f04317c01925cd93ffc634803234973c6862ede44d280b3f634570d118763b74f40c73b9eabfaf +DIST gix-attributes-0.12.0.crate 30259 BLAKE2B 549517bd639c19e7b460629f4736ce142717e475c0aa7de5f9d72ec9adc87315ae685791ef6e13842068a6843ede8175dc1e5c0bc272746f728330a629568635 SHA512 90f543638becbb77c5bbaa903d9becc1311eac25008f7f965fd87d9038a2e007cbe852acc0f528ac455f5b61a08e2a7545fc7499891c93890d48a92269fa3865 +DIST gix-attributes-0.22.2.crate 19043 BLAKE2B 0f6043ff1ed46be4cae9f38c57069c7de2424f09757971b38d728f9329f6aceb58e9ee5e1e63203e1cb718c49726dfa786b11dbfa0fdecf013052269fd898ce2 SHA512 2dd8cb1e1b3fdd0bd9f6b6fdfb77a710d81e85d86605a17d4e173de6969013ca954ec7ce255349a6336f76b0c65c9f0ae12fe56fd27d6c817c30f99ebdd6f60d +DIST gix-bitmap-0.2.11.crate 6920 BLAKE2B eebacb07d6150bc16d4068fb0d5d1646f78cac93ab6cc82b64f3fd9d4ec928f5e904a3ab2bb66f697df2ca51c17eb586d873bec73380e894b66f05b94b7ed690 SHA512 889e0195b9c16f6cafe6d66a7d18da1dcc5f3aaebeb63415665102d838bf702eabe142fcbbebc28f3b69372eec5f51a9dace3d333caa6f5fe8158df89eddc40b +DIST gix-bitmap-0.2.3.crate 9818 BLAKE2B 2f0116017b7713ac6d27b864c43fa05dedcaae62357d88492d018f78ff11ef783dc9e3cf22bd8267bd8dc1f13fc8b0a8405d491e0cc6c2bc24a5e0e09e3695d9 SHA512 2b17c0876a20d23d3658b360cfd745b1a1b01046754dada21bb5ab8e84ca98f0421f456f40c547f1f4d13e10034587d51ed7895e0dfd798f95e58d289132e3e7 +DIST gix-chunk-0.4.1.crate 12248 BLAKE2B 49a55d3ab4391b343ac3b42af93be8117de5946a0dbd5eaaff45d24ee456d8d6336f84e9f72fbaebdc03861a764fadd9e0c2ae856d6eebde54637d07ea298b44 SHA512 6fd5ed914389573f59f8fdff47cb47050309de385996456004ad8a9e4ae67426288272715df712a3e6124b81d456354684cdea1f892624ed3961abf3f73683f6 +DIST gix-chunk-0.4.4.crate 18016 BLAKE2B 5bd0963f239678759455767012b048f28484dc2ce376c436324f1c28c7082682986dbeac3e4dbc020df176780e4a47e64899c89878ce2865b8c0b6b61844b544 SHA512 f42a32049c6383f28b9ca941af2cd77e8febb46cb2f9e3435f05c78edcf18eb331f64f4dd7d1d616ec617de0615d267805a1d3aeea2369575b258fc4d590a8e7 +DIST gix-chunk-0.4.8.crate 9358 BLAKE2B 6034c836716906e7b8cf490c9f066ea6a995d384be6b931df3db96c6e71ee53dc4e2efc065d1eaae130528f23ebbddda27608f0d08afb9a8cabb106bf053dd5b SHA512 3c0bf0b9aa998907f1f2c3e610f86f250c4f9bcc9384f4c636d3c8d637e9011b48f7ee33f21dd8b91fa66c01209410886ac68c2f04fcd4262c37fca0ff9ea6cf +DIST gix-command-0.2.4.crate 9212 BLAKE2B 889247edc864c9ffc3ce4eaa189654f9a599b9adc1d83cdefabebab4295951da1ce48ccbb386e400ad2ab850f484fd5acc4e93f2705bab7cd86a9ff9aedef4e5 SHA512 7a777ab4d557fee97e067cb602b80d55f824347b2c7c18c46abadb4f644dc891c926d6060c0a93823fb21caebba8830ae65ef0b4569d4c5856b7303dc8343852 +DIST gix-command-0.3.6.crate 10757 BLAKE2B eeb6238b355cc8f2e1b285fe3538dde2b8bd3d6a1d65c9ee44de54afd38778bc7689c205a81fc1afd03552ee3a8b0c77ac7f52f4dd5b9556c58a41b7afe3c3ee SHA512 74c5047e1df08deac03638e8905fc83c301ed238455c5926ba74872ab56ff78ffddf94950fbfea3f27e8b7d372e5a13114936f467bd221a874ebc28eb908a0fa +DIST gix-commitgraph-0.22.0.crate 39358 BLAKE2B 7514c439dadeac4881117b0a0d8bb31216dcb358cc42617360a76e81618d3dd776b4155cf16cd0f2bda6cb008902fa8987d6abb64992662750b89c20e3fc7d25 SHA512 60369709e66c32a80eedc52ab939e644d72479350c6493a69f4f3d3f5f9c27279a793c54a350cf2981f6577d79e517693cd14cfae57557e095afabe6feccca8e +DIST gix-commitgraph-0.24.2.crate 18187 BLAKE2B e536c5abcd1736eb800ce48d4fd6ad919a70aee5d210d086f35d1fd6aba309d3f3446429eb102dd41dedcbe1fe578429fa70a94679c50784490172e4a22a32e6 SHA512 3ddb2e78bf47c1e3d0803d5b7387eefd6c5a0ed046bf042523e49d3bebbf156c9ab213b7b4ad270849a760dddd2d8fb37425dfc0d3250446a368947dfc85185c +DIST gix-config-0.22.0.crate 136539 BLAKE2B 884d0b160e9f18283a3f8f19d50288428ffebe6e7e2680044698cdadd3d446b2ca4e61f66de02de825602cc491cf1f45c17675c902a64b0920fe741ced6e1f81 SHA512 8b6e72a3f5a476987cf82b283ab3e96e231d142bed8756d1153fd78514ac5d00798c285321ada864d7bbe2f3b4e2ea259402b44bde27029ccc2dccf158f315ce +DIST gix-config-0.31.0.crate 142539 BLAKE2B 398aeded7e5cda4456226ebc2e7132e3f95405f2e842fba90e3cb006c34a5393a6dcdcf344663ba2df3476e998905df41394b047f073cdd502c81c914e782b67 SHA512 0142cbdeff1aec3551c935a58b13241c8b71154e1703bbc401a793ec7516cfadf417025df74f765bce022505b26e8dffa6888081a763c3d3a58526ec451db457 +DIST gix-config-0.36.0.crate 61643 BLAKE2B f1f931bdf0e5d1a7cb71342f73465d414a690206c77c17aae5230e5d1604454a2d6736d1c7053426e7c92875710f52a634bea3b7afc1e184e99cb66bafcbe56d SHA512 ec3998cee2314a0e51421d83fdea904790d9645074b4cbe3b9b76109ad5a210cdfaf7d1ffebe389ee4ffd12c8f5681a4d390786be74076fdee8cfcdfef68f5dd +DIST gix-config-value-0.12.0.crate 18537 BLAKE2B 21101f38fe681edb7ef958977ccdabf9dfc6b13dbeb34275ac450a16f1c80c1ce1f18e212839c1b54af759b5b579d91df1a0fe2db823842c016e660e7d2483db SHA512 bc7633ecf3af9ea2b4d454067ada412cfb0c6a12c5ba77c7579092e3aa9885632126098b97e1cb57c6a0b91549a84630b893c070df0b5050054825e57e713e16 +DIST gix-config-value-0.14.0.crate 25547 BLAKE2B aa7ccba82bbcb743801705350f651c22cc0cbb3ff46f1278215d096e6292dca8b6cec8c92d4651c1f92309cd12c3c977743c432fde6bbbadaa463e3e59b18cf9 SHA512 98c9bb4e40a9278141da20e8eb0e59553c11a35ad1dc0ca27fc61df89846d7d9563b6ad372aacec08464003d719ee5cd924bfcc2ad734f0b456fe0284c024c57 +DIST gix-config-value-0.14.6.crate 12769 BLAKE2B bd807a037a74905f7575c295567207a5200830fefcc802e11ec271d238af0f391b3f639cd2686e77c267bc4b4d2a15aff290d926bea194a25473f7c87e12dddb SHA512 547d527c248016135504b4544ff8958168279fe20720da9e2ce6e2f148741f8e870875515ce4f069509583186e0c0e9856e8c08ae1e14620a001482fbcc8f8b3 +DIST gix-credentials-0.14.0.crate 38689 BLAKE2B 7d071c9ec8e38b094bf98ddd8123bc6608c07ff5b9155aa264963e25e426d6aa9e755a9658ff992a15c9590fd3acd449371450876e8605e67294c51e4c9b9404 SHA512 db16acb01d41163417e2287c3bef58996b0ad8caaf20cc603cec5ee4e129cc2e17f011edd15da73751ebf1bad9f96416e760634c710dc2995b2cabbef6eba245 +DIST gix-date-0.5.0.crate 19994 BLAKE2B 451c10b799d65a3ee3ff352f14a68cd99d82c25784a6bb5bbe6a66a67bd276464f49c2f1d2bd82705a120f0de59bf7d4fd8a80e2af7429ba713f4336363fac4d SHA512 d6ce8b185f9d6edb3392d91a481eeb04a39d61e0bc3ae3ee3d59be9c77f502d444cad089e743af4e7638b815e36669a9372d50fb160b68b61373028958f32288 +DIST gix-date-0.8.0.crate 27572 BLAKE2B baf677478c0e4828c33f0aefd7736e00156cfe3d017c75dbbfa6b4a88c77dd7876afc5cde848f462c02104492ee2b5c014e7e487a9b18cf76ed349de0a9ef739 SHA512 23f24ed24c0ac09d898fb123d8ddd1c725e6c22c46caf055ab68b1b9314da225b6f11a3151f1b8ee6c02593705789cc022169ac5451139bc9002787f0ea2a81f +DIST gix-date-0.8.5.crate 10185 BLAKE2B 564d90bf3f6c4adc2b731772132ba6e984271d62114c682e66eb49fa3b31e7bead40822901a182e2f25ee9f82303a867bae9052fa5d74d3929e7de2f79899e94 SHA512 f2b7a283f3884ea1a569e02deb10659b80a44e330a9e7b648dc7b3d38bcc54c66d2c5abbb238eaae4e1e7516092379151d43d2b927f4428936b357ce913dfef6 +DIST gix-diff-0.29.0.crate 7019 BLAKE2B fd50b7f4aaadbfc2e2f80a8145b47299a88bfe3d7b76d27675d3f57814164f873f6ede6f2b1cc9301396566160fb4c371842b757efc2945fef338a385efec193 SHA512 2d02e0b00a92523a8122b29327ed57c327a617f01527286bde532ddcafd48cb29c9366b67aad5ad232c8a544d5eff8b068272efa58c3ddcc85d661de06e4fa1a +DIST gix-diff-0.37.0.crate 38486 BLAKE2B 50547bce6ef246d56cc71d74f55a4ebcf21d9f060eb08f93e5cd50585fdfa6175f946d5ed50a3ae7f413e5352973ea6449ef62552981c5a1142c105117c6f436 SHA512 34cf3390d8d051d15a31383b20f718b5c071c6c7e96b13a7560a064983cbd9d071fbf3aead1a63ac351a23e1bb6c9753768037544f031ac54a1ee76b52ef1850 +DIST gix-diff-0.42.0.crate 32151 BLAKE2B 9b35116bfe05089fe50052d03f2e3964d787e8d39370e412194168700b8ed3ffa8ddc7d66c4dcb29b8a4231e7e85f3241fcf6dcf544ef813c0f6e933a50b2924 SHA512 8f953276818965840513127e51e0b12485e41059199ee33dc52dc2b6f40b776de7c89f8b7a21fd4d5530c1ce2c6f9d179d76f897d887cf064c668445928cd4c5 +DIST gix-discover-0.18.1.crate 32989 BLAKE2B d86dae7539eef6ff640805b0186101665336e7d215a2abcae871268b485a9a9823bce4ea6b0d9eeb52622010c5461ccc2c32dc67dbaf7590c15fea5b96693af1 SHA512 7a61c6c306a66d4baf81f37e905f8d4302386bb366325791f778832347694c140dce772d8e93d1c3ec9078a7136954c48f4abacb224c79bf0fabbaca7cc6988b +DIST gix-discover-0.26.0.crate 42580 BLAKE2B 0e54bd4f39aa76ed65b119a04291fd159a3ca1c4d404d4612873199718a09b46a0d51022d32d6aee7be7b977729555c0ac37819b056fb696077bbef75cb82990 SHA512 06592c75732adb629e25118c15e5ed2a2d88263608f06756723434b6524970df0c96b5875f5117a99d822c59dc8a397b6a8d07d2fa0a098f944a7c06cdc70c5e +DIST gix-discover-0.31.0.crate 16644 BLAKE2B ce1de90ebefcd71cf80fc154a156a2f4ed40cf3bab85f1bd1e1d8171962f20c10dc905006486f55479448288a103edc300f2166257795173e45fc37d2adae1ea SHA512 fa2c0f0112384e202f3c4a82a65c27460c5b941b94a67d13e13ecd49ddc0e811f35f2a0121fd24add6acde8d8742f7aa56a173bc6b78e1b5e98db6236157bce5 +DIST gix-features-0.29.0.crate 62359 BLAKE2B 947daa561181f81830e15705d385a9f91f59ac9e88a9f755bb4957250a8268d9bad0cc8e31485675735398b6509b79bcb814b43b52a2614d0079684450cab5e0 SHA512 50a4ec1c62229876a77d6f73b0fb6fe34dc1a72c64caf28a8738ca0dea0161de1efbf8273e0fa83a445e366430dd7519d57a126f3e27220382146febb753e19d +DIST gix-features-0.36.0.crate 74095 BLAKE2B f472e7d6e8bd7f2cff9643ff07427fc3bdf170db7633d3e8afcd5fd906b47015876aeba5e06794b16d1b02100b2ef779593be592dc48a74a687b0b0d6f38ae35 SHA512 4795f5a168427b9b1b5db3d8cfec41771d9b7b349b6b3ced929798ac200febf56d0be12d1c97560d4c78756ecb0e284941e35beb41ecc866b4b1124f5e124b8c +DIST gix-features-0.38.1.crate 30596 BLAKE2B 9b0a6957566abdf7a11a9ad9df245f88d1b03cce4d6e23432bf3ed12314043c43518ae0be2048f28dfac1b99b196fb131751949d8ac2d2639f827e3d832f738a SHA512 8a405dca152a4c913153b458646632097edcbb0a57320837f7e7fbb1d6f0e5293e9148f77a65ac19a1869203636c17c1d5aebcfabb5b3f31e8cc6e71da7827ec +DIST gix-filter-0.11.0.crate 35851 BLAKE2B e810c145e5be9189faab9f90ab2d9ae4f07d132ad096296f0e97ef45f3a9fe2178f8b3665e6338c9f697302cc883a4ac51b4846f8e18fd1b60714e22ee37d66c SHA512 f463a694bdde34eac62497df2b80f8acaa08d5c778d70bda52e04e0a058e076b47d1fa09cc6e5d8c571d50058dec7260f48e354e6453a3c4361a41328e4a5277 +DIST gix-fs-0.1.1.crate 13364 BLAKE2B 203963008fc2b76702757d544e1cff41cf4883bb83ab8d400d4dcacce847dac6cf785cfc3e14704aada33056b1588ebe5765c46acefa3161312d12e140b2f29c SHA512 b84e7541ea5f55a4cd6f71a789ef655ff59875e169ca7b13865af1a972433d2d302330eb18e1871497f2f5bc2627981afa820b7aeebee8f418a175cb33c745f9 +DIST gix-fs-0.10.1.crate 14369 BLAKE2B c2ce356b6a578c3503b6cf3f23301bc32dd3837e4995154fee6f0c1e17623e9494db5df2b40e928bf010de80172c3f8adb711667057d79003d1b7fd5538cfe03 SHA512 3a93fb80d9eb331c45d0644b6b120531abadc8ad173c00a214d2e42a99caf614074382fd4819d2a239488797337e0ae519c2c9680fd52cae1516565914f6a14b +DIST gix-fs-0.8.0.crate 21390 BLAKE2B e0c0bf39aa4145e51fa55fcc1c0b3950c02a68e2f95c80e5c823ff79f12c9618b3c51805d880c083634972799a0fd2b3e94dde95c2b7beb84fd0f2b7fec77762 SHA512 a0888c0ed19c34a817c2d0d9653cb9fb31fb99355f99bb61a2649b68dd3df52b17138092e163e3279aa1f7841b6ec2e0d651ade5d0a14f94c2fee04eb71c8b7a +DIST gix-glob-0.14.0.crate 52116 BLAKE2B ed133816be3119b427219cf5eb64b9629fb3eb9d55073215078bcb2cad2a3f804940dc4387a14819c89dd5a7474763d2cd7433db1a94791dd3e85819c207dc74 SHA512 941e74d236865b06b2771614752d081a366b43a88e22525eac7444a818dc8ce2114745c6777cc0e358b68abd654f21ff4a4149ab042c4ccfaf95d7032461348f +DIST gix-glob-0.16.2.crate 13261 BLAKE2B 9274187d3af9a770abb5b31258182003d44756f0639220c6475098964ba517cb8db651d15ea1ac18c38b2f9d47ae05d589bb7b18e6766717b9b30522a9889477 SHA512 9d540eed9995395f3987831d5d6e8bfc6349c712692cf5aef41d216e923eff84e14f528552d611bdbfe25e9cbf79b34d514ef4e3e98c38dae6244cac66312f07 +DIST gix-glob-0.7.0.crate 43527 BLAKE2B c0e636f1ef5e154c8e38162069200effc8accb04baef26c5881bbad70e125176f08555bd514e1a2c399a57f37b1923279cd7d244a9315e93cc54d10fabf0dbaa SHA512 093f75bad08a4bdd30708ec27cabe71d22dc40d21fe8b922e563af2775d8034a4a0041baa99a886c8c743d7415da1745672b00acc0609fdb054c885856b4ab73 +DIST gix-hash-0.11.1.crate 27218 BLAKE2B 19b0e478ddb9bc0c955a839d23ce3a944f1df28f7b1cff88ca1f7cc36fa69cebb9fee083b46aebe60119502e6963a92376f4198ba4221c93a8ab749530e75ccd SHA512 bafb9d6d6f0fe165585a5e4327a4beaefb14ca144b7a222fb9f003fc2a8f7e6d89e48331afc1c70dd707eed6d16d9d122f6af46fc844c189b7cc7eced4817b94 +DIST gix-hash-0.13.1.crate 33944 BLAKE2B 1bbc2e4603679b0c8ccea0d48099af6b99b6469ad0d85068fc3a6ca2f4a258bb05b21510a6ddd36321a2165e1bf0492ffec90f1f7c1fb7e27102bcbf0dc19730 SHA512 3dd18418945e52c316a3d28da40e3bbda97e9e6d302327c3cdb8c71db54bb3e4fa0084e9174118fbf91aa4ec1b02b5e91c2dedf434afdfc647994a1c3c2bb371 +DIST gix-hash-0.14.2.crate 12759 BLAKE2B 033f46ba342fea5e2a7b5b91eeeac06aabaae527d10ed665ef1d2d7f34362ae7ea27df652012c5ae25872ab18175aefe15de3e981647086d8008a32bdffb2d0e SHA512 32ba5cc7805146fa858501bdf0cd75bd000550aacee258fdd63572323cdd06e54c78b4a71761d410c46471dc1bcf856e5564586f24ca2cca03c60b9e08b4386d +DIST gix-hashtable-0.2.0.crate 2242 BLAKE2B 9eb77d65b5dec7e4ebfd91c300f9fcb789bdf0af6d851a82099b19d40a5aa23233c432cfc3ca2e9a29a4792027da2010c56e28568765de4c541b8251469b5ead SHA512 df18224d430cbfa6a273a89264942189291153eb44fa90322948e1d3f37a79605b3914160f854d6add0398effeacf020e046806529cfbd5e3fe500331fc746f5 +DIST gix-hashtable-0.4.0.crate 11825 BLAKE2B 12c1661465c58a3f091cc0daf5bdc0257702f8d9f66488d45d2156f08d440664230b1219c2753cf37dd2e0ce2bf5c4b7db3fbe48afea3419d8a631689674ae2e SHA512 ffaef88820e82ac9c42ad822d35d0e4867c2f448befcf08f039c02b7c89583eef7670203194e4002ea35bffb76341ca86bf365f24c105e5c6657cfecba5ebae7 +DIST gix-hashtable-0.5.2.crate 6421 BLAKE2B 483871bb398815c4be337e494244a9f9f6bfcf2788bcc975c96a5095f213f6b70a19902bf00987d3f16316625617727cb84408431398d32e5bc1fffdeeb84340 SHA512 d3b963cf2e82dd034bfa5912bdd0fa384cdd501efa6a0dacc70838245ad072daaf49e2f7a84d2d41360c0677af9c0162831423b4a903a77f5f7f8027034bc36a +DIST gix-ignore-0.11.2.crate 9090 BLAKE2B 9b9ceb2679d7d0f500741f481354c66b552bb1a858fa1be2de02eddb3ec751090fcc252ce597e6b8b6ea77e004dacba04b71c7b2097e58f442158d27ce9b4035 SHA512 6ea8f39d50a0ad46f043fbc15c1c7372ecdfcdd75208a71dbae1215e6bc4914e64564e9828c8b4333f3727a49b1141719e015d97c0d7d00a42f32c2764ffa3de +DIST gix-ignore-0.2.0.crate 6087 BLAKE2B 83d0b11710f68f41782657ffdbabecd6da86b0e8bebf695670dc08a8e791e5078531c34767a779c0055cef27ce6247da2bd41c495b3cd44690222054908c2677 SHA512 6790ff9c5823a1d1c70b49630b5916f8d2637040c99153b07c40761631d9491167fb762565b3c51c945bb7540dbbb41c23af095aa91d990a5412358eccd50608 +DIST gix-index-0.16.0.crate 64998 BLAKE2B a4e80aebcf9f86fab151aa1409ffb3ad0ca6e523e010635c09293d7a9c414319d4110eeecc6ce6981d77e98aa3c04819e213ad912d2674ca8028096f14c5e12e SHA512 a9ca239e9ce25dfd12601cc816e4e1007639c26187a743e4ffabac5017ac15df1bb71d159afee61beb757cec7ceac7363a394169ac1631a3cc024d13e451e130 +DIST gix-index-0.31.1.crate 44358 BLAKE2B 347fbe9252e4c38f1adc5a137e43952afbd709132d156dfe4a842e7be8aec00ae155264096b812159c49da058d0f9aa6a09e35090326c35b5dde376798fd5314 SHA512 3b79229dacfa293f2de7e2e437f8b0f40752465e774a88fc944e8f30661cb09a50c41481e64c75f06c8809c215e353092335ed9466f8c8ee98569a0dc8ce4b43 +DIST gix-lock-11.0.0.crate 23432 BLAKE2B b04c72d7e62665a39ea3dcdec9405f8e1de53122385972fa486ca252cee0782395a865a1660df5e9f9a6d87bf80b8a00e6d306b5f54f2620bd90731164420d90 SHA512 79f75ed576adf3d3eb2cace954291cea1374fce73b8f1c82c65298ac5453150815f3f65ee9b325fab1d00f724e78e3f00d71d072c7233b9f469cbd130d55f210 +DIST gix-lock-13.0.0.crate 9441 BLAKE2B 21e19c8cd6c43b05c72a93987ba56f9ce45a637b1aeb021200fdf81142e45c115505a02084a9091b7388c2519a794032fc2d434af3625f09d3298314fc6e1cad SHA512 b0d1bf9a783ce3cde9da5df89e0238891044b9a0d6de2a1b75e306e8bdb142b2fff139c51025becd28362e9d542d59624f2070e9e807fab39f2ccaf18b0003b8 +DIST gix-lock-5.0.0.crate 20807 BLAKE2B 22a4a87386e0fd2065823b29ec76369c9e7c644084f1f3759a099c32ed9d22f6f2db2ba950726ba45bdde6852be8b95fdd5d4e134eb3dfe9d9438ba71dd2b9fc SHA512 cb0b92bf9ba734987889231968b99a8779c1d98567498f5f96e1d2b340753a7cced75febd1d064fa990a003ac474df24ba27140a7605fae1e2c8899af56eac74 +DIST gix-macros-0.1.0.crate 9902 BLAKE2B fb163b93ed38bfc7f4f5f95948f6f996e3a9e2438ecf2e2c4fec55e9d5212428401420831e02a8897004d49309143d1e7953f80ded227eb570a414ab76ad2dd8 SHA512 537991837a7b515ff1bbb252d0e11895a2ee1c2b3e7ab644a2f8d8ce22cc5349316589d86f8575a9792c1be99a4c6cc3889002ea0cc515eb61eb8bdcab16cd22 +DIST gix-macros-0.1.4.crate 8582 BLAKE2B b4c09240fc6b3447192253691d40c48e8166f4223b76ea9de7e532983571981f1f847ebd227d522be2272ef6587151a68e8e8fb7ac83ab5b85c403fc537b3180 SHA512 3780c2b1736747a66b9ba5d13b943ec545662d91f3c85ba39918ebefadb69b6de684154a552647420e06e12d92bf33a53de99b2a354d7f8100ee55423ca16f66 +DIST gix-mailmap-0.12.0.crate 20329 BLAKE2B 3c05bed4ebaaba724f9e8eb0e2816918a399696558e05ee332ac09567223ec20cccd0f1ad8b1b9f0e15b5d39bb66c95d5563f75abe0cb915f539be4088082604 SHA512 681c7c4a786e792b14d031bc8b9e8ca2b04f82aabe003f50b17ecd3e742f6a1bde5db1f85fbbef213ce54edeafacd57895c27e19a150ac474d08aae47132caa5 +DIST gix-object-0.29.1.crate 23648 BLAKE2B 0465150cc3a07fdbe2f8933cd17b7265625dfacc06e3c48412b520b7cb9b5e70903814d4169e8d8dc7200bf4a8a9335b87778567129d14ce17a0701327518bdd SHA512 9ab74a680493a0902cb6d73df70cfbc3fd039df9f3995ee6439b2a57ab3ca18bfef2c5c84e4694ef0372142cb0db0390b7cd9fdbf7b80e710aaeb10da5f050d2 +DIST gix-object-0.38.0.crate 71600 BLAKE2B 001aa11f2451021c52bcc74637d8b2fd830445637b679bf3469c20ad8ce239c4dbc7350ad78720ef5f3fd21ec96efb74480d0c13b83c36f0333c2b79a9e367cc SHA512 183ed8bee65c02a6efb9f385677e065c2fb17b6f63d7d43a7da7901459db41b3daa8f248da891eadd8fc56c05f3c7feca8e0c9a93c5669781ae2e3b2e1be8c3b +DIST gix-object-0.42.1.crate 32453 BLAKE2B 51857a49286c81f240deb67441bbd42d1ed4df23f377bd5bfb8b893284d16c365cacf24a15836dfcdcbdde4e5124e169bb68460c1ff87b9869e07097fb1b9b47 SHA512 8fce352ea0519cfdca1faeb09a4478020357bde519ddccd49793d281ee4cc254bd989c5d8d3e555713f740547adb9432c03c6e7e398065a9c787063ee55d6cd2 +DIST gix-odb-0.45.0.crate 137565 BLAKE2B 7ee4f96de1322f8387af2f4e467e48bc298b6cd1e5b5ca6b0b59f3f8a9f9e28dff2d6cd3fb4644107db1ea65819dfe0c69797398879c5c7c3faae55c52ef7472 SHA512 5a05fa826c53c74fdb09048588ca0390dc8bcf2306be23654c427a7a306fe2e4b50058578b8c4c58592a55e13a4db8f1d8a38371dda0b91199f8b572b61b71c2 +DIST gix-odb-0.54.0.crate 147975 BLAKE2B de5eee2ba39e2eb5b4d64594f227851d75c535d35677e13bc58573ed95f8c083a585e125e3d0fc5562a9762b505f1f85ec419da2f4efa7efb23ab5cc77fa2b66 SHA512 2d17e092a132dfee2172b7e714a72ff006cac3ec41858ef29ecba4c4fb9d0d9afb1c20cfed4f3d0e898bd6e80a6447e835a4eb2891c8e8ee704b1d6c9022dddb +DIST gix-odb-0.59.0.crate 54132 BLAKE2B c393e871eae85b28f9525a1ba0923ac87f498e390baae9d0038df4a09912015231a4d160083ec832d1f5272f9aa269080fb125b8363a542eab0e5982edfef08b SHA512 4d6357caef64e7253e9c2046432fe8cacdf1a0d77c0bb6ed6f30ffbc1757fb0c915c75e4d899ce48740b3293ff7654982883b5451fbdfe3572d588185ae39c59 +DIST gix-pack-0.35.0.crate 136956 BLAKE2B 1c137b0cd6d87b9d29253c64b4a7a6f8a433e33f7b88ecd100a7970c93367d8e5888f51b348ad21d3d3d7e11eb677569fe141be742cb581446d97e5407c7d551 SHA512 b07ea84bf8361c972bd8f6ab94bdb54238b4d39fd634b78152af5c8c50cd513aedbfb0f8f88393655080d4e6920e24be064029b000c08ae233b67fd1149653e4 +DIST gix-pack-0.44.0.crate 152873 BLAKE2B 819ded1512c6e5906034323479e1b834e3103eeb49cab237292eb9ef34bfa7d5a618555a6ad6ccb88abf2e4a9d82f144a35b5de69d0f6a69b17ca47b2078a648 SHA512 172615be848161ff12c6c5e87fdd58fe97ebb8c4896e93efb8674cc1fa5d66eb20500ee7337082000e1a07e9b00c68417b5d5a6ca9efb86c0a0c58c393198fcb +DIST gix-pack-0.49.0.crate 96264 BLAKE2B 18ca8b0e1d9f1ff38dcace4b047a5c0432f39fe8eca1f822bd20f2f343b41dac1ee223fda2fa7c99f92b2f80a7a3a49067004954bf2bd2eb82285e92b30d32e4 SHA512 9cffae623b9c404b204f07c846f0bd435b4243bde49f92e33a3cde9cf932262c76aac9880ebbf99168163f5c7cadf8105c1f80edcb5b9e902bf022e9dac4ed7a +DIST gix-packetline-blocking-0.17.3.crate 20044 BLAKE2B 7e18c011b1890ec0fa8e757250ea5058b0ace5c4f9038e0fe12f2580632389bff3150ac60b3fa1a4b9db0b33ab9d18de48a5d5ac08521da88777a478084c631b SHA512 bbeba4fee83371b9a7b2cd14739b3674e1f6c7995063ee4055dd590877e172a0e002c8c9e8f6a1ae8da1aa3d31746df42fadd74fcbacac89b417bfab13b4db60 +DIST gix-path-0.10.0.crate 32050 BLAKE2B 9900590c96f5d680da481ccd4722dc61be83b6ef770f4b90e6139b978fec3334e0e397289cbb6c8369475a8fb080d0aefb8d518c223eeacd1081d298255f1f49 SHA512 d6bee153099bd542388f7ea26d388d3f478f7c8dd94a7b1c815daa70c57181f62dce6382036a4058e243ee65ba287e9fd0aa83fb655e537ae502a6b67223b181 +DIST gix-path-0.10.7.crate 14406 BLAKE2B 4c1fa71116d42c75ac0a19c3b9580b20a64eb6c0a100532b97b5202194341600788d14c9d98d36ab22ca56c1279dfb0d61af3ff1fe18d39533b67ce93fc64a8f SHA512 f5aa7af04b98082a2e28545d024196ddfb2fcf0aef8aa3a051e4c9eb35f75217a1716f3323d86c484e522252efa25fea9970afcc1ca81767e886cf4509123c24 +DIST gix-path-0.8.0.crate 25881 BLAKE2B 93ca6de7f392e6ae8682f9a7d3d79c062590ab4a6682f313e6368e082c7f7e131b379ae7a4ef97d1347a5a69acbdcbaa55092c99b90f03933c980b8d61f71659 SHA512 27665f2e37cb3bc578b1a5c18344cc11be55d65ae77f74d2b2ab391a6e8404986d7530bd8eadf760ccaa636701fdfbc03d407e3095d82eda3722d35311066532 +DIST gix-pathspec-0.7.2.crate 18087 BLAKE2B c63a5df6f8ae758530cd40518c4b8c80235944cf5164ff94ce9688142e1dc3093a13d17e0e80237ae5554c85786d37f6379c8188f417c104776fa8019affa9ea SHA512 da67057e25154cb29129e98504cc08271b22c99635c4ca2a7bccfd16a00adc97cbfb8e7b80e655402e8bc241d160a0b2cf05202e6395de7bf5edd39c040744f3 +DIST gix-prompt-0.5.0.crate 16678 BLAKE2B f0d6b87c20fb4b1d8c909640ece77d254365faff510f1c9176b8fca4a19efa93903d6a1bfbd1935b7946800cfbcbba47c93d78eaa46b471e14bd495bf1015808 SHA512 47f406982eae271f6e3942805c7994010f2c9e40f713aa8a1fc90fbe396b38a352d9b4a707202cb59b8c3e080e63ceeeedd8e5bd96281c64df6c34a5fe0b352a +DIST gix-quote-0.4.12.crate 7055 BLAKE2B e3bbcc1bc1ec169a4d9b36b1fa23caf559bf70bef14a485c2652d59b4562c514457c14ee4d2178e0f564560c310e5d304af993c587d6d352d0d6906dde4e4bbf SHA512 904da737aca01dfda12453b3593410e9aa49b852b91a7d25298ca885be0922d9498fd622e36f0601de0fbc7b2706e73e79f8281e74417b3b7084dbcefaa3cbec +DIST gix-quote-0.4.3.crate 9769 BLAKE2B 28ff4050178eb0711387a5a4ae8ce6e33b0c7063427411134752adcaee578aba4ad6cbaead8ebaa5047e2255e76f8994a01e9e8d5de39934cfc7f525c7e1a619 SHA512 4b1296be473a022926f67ff2412308954bf19f0233a4fea1ee44b605a76cdfb06f036591709e8b9dc6307d106267031ce034107a490fd63843227f681cd87d4c +DIST gix-quote-0.4.7.crate 15811 BLAKE2B 72c5df3242ccb04b13cd068da4edca390f7415c35276b37cec973a30051182a37fd9a8cf59ed76fe9c1794dbef4692fca6882a8571ed07400e3c269e7067b61d SHA512 73065ff5282a0b408b07d2bf33ea72a2c7c9a5fb8771c34c3cac7da58fb77b57f1f04e6aa0daca97306f68f7d9740b4a223e463e82b3bb11d970ffb9851dad05 +DIST gix-ref-0.29.1.crate 50026 BLAKE2B a657b084c2ef24cacc95c1a148688db6df28d077f7afea96c1afe01898061473fe94fc7ac2928f444b373001d1e49899f631b83db3dc2983f26ec73fde5fe087 SHA512 58c8fa836efe4de9129760704eb22b149c003e9542968489eb2b949fa53e79be4f0c8c696bb50dba549e3c3fdafebd7be7689560f123d06005857bfd79916b0a +DIST gix-ref-0.38.0.crate 122861 BLAKE2B b6aeb287afff51f46cc70835f018b303489c460baf6e553cd4ccc4619f394d80fd4d5e2d17c46736dbfbc60d0a05157eb541709a182dc443513288c9f4536f17 SHA512 94a416e5bce0fe31e89d886da84a7a1638d59f167ff2ba32ec2f321bf0cd4397bf674a8471673bbf0066cc6eb4f965c570a739d973ce77778d3c1ad32a394483 +DIST gix-ref-0.43.0.crate 55990 BLAKE2B 0286c019294065623ca0ada9de065e4b3f2d22621397ff103eb0b6bea5eef9aa97e356569762cd859fee70d4858c632b17f52c7f5f82e66ae666066f4e9aeb85 SHA512 b035a094f589e3e9a9ea0aea76856843d83948e7def921ff4dde4b9a3025c91ed53fdd4603ab89cc2de8cea2f5836c85cacd79d6f364bd3eab071279afd8ec0b +DIST gix-refspec-0.10.1.crate 28910 BLAKE2B 601264734f48cff8dd0408c672d4357e850128d55331441851ce3e325a5724e00c1fce6343e3700a2378ea1f91cbe38cea5d6debd7eda621f23ce89ff16b3300 SHA512 3c4165f8cacd9d5763791b8d08e7832bfaffc967a36fb8303ea5a3c8a2558477e498b6fb900b9692ac8c9f92ddeebb2e9332a3daa33ab2ee7c903e65aeb398b1 +DIST gix-refspec-0.19.0.crate 36873 BLAKE2B 1911247e0bb765bae484adefee947d08fc18c9eead349661264633f9952616e870e4a70838b3de2c3643acd99363819aad56dd4f41ecb53d32ceb6ec52760ca9 SHA512 1031094918672e3a3a177f5d2b52f3b2e71115b1a72ea7d1360a8cc71beae761f4e894f3c00d422d4417014a3dfbe6e26ddd48fa745785de46d74df98d55baed +DIST gix-refspec-0.23.0.crate 16129 BLAKE2B 36df095d841bf4eaa6c6ea700b493efb35c419fa7f4183a80634850c88f13f2e912cadd9a8aa3755a05efc3184a9cc071202bdaddf3db6803c44de5a3267d212 SHA512 d4649f1046bc8b3ca1a5f5729b515a7e9a442d24defd98b526f6b22c2f36cc73638ab7cd26aec234dcee72ab9621ef3f55fd3c009b2e02635d6b481a699247d3 +DIST gix-revision-0.13.0.crate 37993 BLAKE2B cf71150e4a89d5ff4f63294f2d696018c2dfa674f709d91332aff8c7663a6839fbaf6d798204da122db191fd763bde4398e54b466760c0f2ce0776a9cde55458 SHA512 b4fe7ce72d42270ff04c9312ec4e071e17ed12b61f9a398edcefd46c1d65d8ccd80a9f142dfdff79d73c3fac66913aeeebfa021399b21590de800c5b7aa649f5 +DIST gix-revision-0.23.0.crate 49397 BLAKE2B 915ecd67367c6a56319cf18a3a449dc668f3bc18c1ed95bcebc3b42cc6f2189b2294dc88e954d0422418c2c28519b30f5d56d1351e08720a73f05cd85567096f SHA512 67336830c7a2c579a5c9529c45d7d4c0ad8ca55bf9966e801c73e62a22a4972487838794e9704f642ffd27de111b9055448775801471de16f48e94775384fc99 +DIST gix-revision-0.27.0.crate 19138 BLAKE2B e0628502830ea9f69ff03151e605c760f6005f01e269b8de772604072d500c9343e412eaadbf5ee103f83f33b8473f2a25ebffef5b94f4cd1638a36c5dfadbfb SHA512 d3a581bc85688a6d802109048863987dc958db298eee3fe38104db1b0c2c66763d3931188662343bde8d590767e924c9ebfcbb07e58903cfee7ebcf343cfbbe2 +DIST gix-revwalk-0.13.0.crate 11797 BLAKE2B 70337d619571fc8e0897b5c95eec339cd535ed95dcd1abf0f3ec2d150b82dce6ab6d31b3d4ca1a197b0de1313dd7549a8b0b238fd10c25beac7a8947ed026ee8 SHA512 bc4d5f49ae63f6f037bdb01c2061481294fb2d7b0975a49f4bf21306df11bd7117110380e71f196ddc5d7d3e0c406e9e164c968b5e224352ba11286bd00e7b9d +DIST gix-revwalk-0.9.0.crate 16395 BLAKE2B 094ec6792a9a3f1b8b144a9b96696201d400b475023a6dd6b27f90b7fce63c0f2c77d0ae12eb86bec7bc2115d067798c8ec9e0d6bc1e9006e3eddb60446db5a0 SHA512 304547481d82db8c918c50460a7d198be5504ef796b979b02e33eaae64b86367dc4290fec494951ed8860fd0c5240746355471a4c51f3ab583105cd85ee3ccbe +DIST gix-sec-0.10.0.crate 25195 BLAKE2B b8f2de79cb1f370ae0e3ee412ddc04c785f85ddb25f02628646fc5b55ae690d36e69bb3580e1397a7adad1f27a0d659a37eebdf8459dc6f4b639ac27bdd72a84 SHA512 d3c7ccc5d354b8ecd3212128356dd73a42b31c1282d802a09cb090c5e951c7e33a683938230818b4b24677e326b5b5b6323f6b72b9273020c1d2aa6fcdcecc35 +DIST gix-sec-0.10.6.crate 9356 BLAKE2B 1892b97a2755d3fe5736db392331c1822c3afcf573c22a67e849ccd7e8c32e01d526062f960fd193aa968317327a7b282c442de02e774b1a729f7e4ade3ea1be SHA512 92240898c2f90f371bbd3dcd3fe6a0e3e6c6e516ce943a531712f391e613445d256bb61d5ef132d9391d58d20a0771c3949008e74cf35404b5d41e69bf5cd9fa +DIST gix-sec-0.8.0.crate 18726 BLAKE2B 901f0cce163f46a925329aee76ae282de784dd9d234c078bce2a31ac39d9a70b628df30c1fb8de381dc7d48514f394bc858b05300007f824406a30c57510ebc2 SHA512 f91715b6d39d852da4ef01a4e9b5e9952246e687ff7e596336fa8496230ecec03f522918f7f493a98bb7ee052838ae4e5b7ea2332e677b9178861568a13c2579 +DIST gix-submodule-0.10.0.crate 12089 BLAKE2B 85bfe9de3d51849b585af15e76e54e93bf94aacc3aa793c3556578021e8fccd99ae27ce0270062e3db5f1204ca6fffd25836d8fd46ec8bcf5f9c845e9500f99e SHA512 4540e2b7fdd0c2642be53f766efdc517adce57dc791e7955af6e20727d5a55780d1130184275579fa942f622f42c61aa6d6a503d8b1e318e524133361ee308b6 +DIST gix-tempfile-11.0.0.crate 37703 BLAKE2B fc9a699316a3d8f02d0a44ebd2dd24a531239ffe29991fdb9259a474d544ed1fc3a0236301a0655064ef3911805c61041a370fd02bac89d0e089d3ce099048bc SHA512 f46da0e9ca9301640deaffefb8546ec6f2c9b4ff329bc094b144adfaf57eaa0bf8e180536226595ffb314a0677e4cbc486c3091b55f1689fdcbf8f27573f0824 +DIST gix-tempfile-13.0.0.crate 17778 BLAKE2B 929126e3e73f73280af8e8272ae04f2e176dbf1d23931c58ed01ff9c789d7fabf9ca40bb8b202eaa9ebe2bde9d016005f3fde39c0d99f11c73b5e4b7a3f93301 SHA512 32dc76483612ecc75fa6009402bd0aeac909bfdfd4e26ec549165856c15b9a398ecc5bc634da5f17a8e97ce3b430853b067b321d78c51edb8c2a284356a89d0f +DIST gix-tempfile-5.0.2.crate 36260 BLAKE2B 2f221048787aaf64f7d1f4fcdf17ee69f060af8acd435cc4a517f6799bf47fb874398d4944aeb376a7ac76a7aedf875a58bc3a217308196a4f1995ea204942ea SHA512 180334e1a6336cc6f36bbb001848aed9da8ea2d4ac3395296221570380bd53eeee6933459b4dd2a5f08b2b5dcd33a411f972d827338a45f71fd0b12476124e23 +DIST gix-trace-0.1.3.crate 12486 BLAKE2B 231a7b7da09ae5e37d8e1b011f4d6130d04398970e0bfaf448a03ddb52cc11937ad4dafc685e6b554167d034f6b7c88856bd57b5ee11fe1f5ad9722b9b8312f4 SHA512 16f1781b50bd95e0b4b1a8724ba263da937022b5968d7c35f2ed2ba706f0b7fd429422f73c5643d8a119301f9e45c78f38659c963994c88e5c125788db08841a +DIST gix-trace-0.1.8.crate 9657 BLAKE2B 357dc34cebb04e7a190bb4d8c348ff535b313ba52dea952b3226af2206a2795b160547759beffa914372ce4e23b3dc5898e62f4266242a0f0eaa24462ae6a099 SHA512 2ab5ce97df70c0eac7cde8c2eb963659d22335f9de9874e61a9cb8491271e170cc014ed18e82ff2f63862ad55a273544b4debeb5687702477a8fb1c7d22c5291 +DIST gix-traverse-0.25.0.crate 7209 BLAKE2B 7dfccdc55f99818fabbc0b15331db2e55b5d565574b41e89ff23db3867a3077dc2f0488739a15ae8f8671aa868576d0bb720eec44343ed52ea87ad3a23faeb5d SHA512 5c7cc444bcdf103184285d3ff9ce8816e1613ff00a17d57653f49083251da7b5fdecb4230193c74c09d1320a90e8ce00c46022fc5fd7930406c4d621a177c788 +DIST gix-traverse-0.34.0.crate 37889 BLAKE2B ac78cacf42190fbeaf0eff8031be20c3d3f9a5591730da49a772559c0de2bba92cca945a5f0f8327af4f647320701ef4514046e720469c634433db4c62444775 SHA512 8ed405de94eca49911b1df90d5dbe3d4640573d2df2017bf195da62b9c900ef607430154c9e8200abceba9309269340ed47ddc66051368c4534bc3a8568efe7a +DIST gix-traverse-0.38.0.crate 12475 BLAKE2B ce7b69ac470c29fadb577f40897e49f2e1033cb9cbaef0bae880d7d3767b7320d79f115951c46862a5514637c81d49ec5d1814aaa65450bdd83574245ebb8aa8 SHA512 262d0da11a99e7c5b1d6e19ad276f3b171c9d5837b8bd6dea420731d47efcb9b4495ae3d02b59e4d97677e9240cb3baa26c9fad00838c837f96b28aae6c735da +DIST gix-url-0.18.0.crate 30077 BLAKE2B 65ec8f06e15d26f7787af8b338490e47f5b4f5e9f88fd0a071bd44d2a1cfcf4a6c03064a2fec569482a15e24e66edf51024851295f18d89e9e459e850a942ff7 SHA512 0e058c19f79671f3564f60643b69135f0b2477822336f241b0a9ba71b7c663991ee63f08ac01ad2c2055b96a0a95ae970e9a03da44105e2963455aab8538ac1b +DIST gix-url-0.25.1.crate 44407 BLAKE2B 654e752b9e356f583743ec3a71157e6aa495621eadf1bb4a933128842cca3de7f4f1589c4c57bad2307b61f0c16ef44724a69c6d3dc3cf640ffab92d2c52539f SHA512 5eaf1b18f9db5cae43d3f9cd4adaefb96d673ba3da91f2c89159f92cc9b5e9703436d364455dec3eb3d195b9847416f5b850859e26df1d02d5b133add74632da +DIST gix-url-0.27.2.crate 13552 BLAKE2B 8e960eef64ea65042676bc3317ab5d4094d1a6b8f142800f94c5dd3147867c38430b20058a6a3c575aa16f7ee2a2189b9a8117e05b02b860f9d52c70eebd7ce5 SHA512 a8482c8d34ac1a0a6b1f7915d0e7f6249e5547e664334ef587b782e26c71c2cd7525b4638c8de80774a91c992e213beaea6ae15148273c257029820029df2c1e +DIST gix-utils-0.1.1.crate 3877 BLAKE2B decafe90beb0bf63ccf9e027e1816730b34931c3a2981f92ff23e2453590545d9e88840e18c08829c1dc2f9b3d533e6e465eedef68d6bdf61379c64b2106a916 SHA512 b578bbbc435478e565dbdcc6bc091eb70f5441dcc9e84133d7e02502ba8a7ca1dedc0bd615455427f782addfa9f9494a7d6b702b67821a87d0c321a1043e4425 +DIST gix-utils-0.1.11.crate 9426 BLAKE2B 9f087b7f62f11b8eee291c3a45fe002ac4a884d9b43e1a295914a9b54e5e32250d3450ff4324c43d71596242ae1d110f7ec3f1b815d84656dc34d0cdcf6a200c SHA512 8335eedda865c4d0057ce01f65a07d23863803c80ce2ae3b656f3b8bb3a14b81977d30b88b34b883f58739bdfee9ab5b9e380577a4d9296259178cbfe1de824e +DIST gix-utils-0.1.5.crate 10006 BLAKE2B bc8ab3f43f4355d65cb31af3fac5d68c206277aefdb41a5b774436c9cbbb0da09f814ba7176f9e197467f739fa70253577bfec58556c73915884d8123b4a2bd6 SHA512 cd23b089c6ce047d19db74aae28c266cf1878a6196f8b7dd3f868deaa6bc66d05f50fce3b6789e8f411ecd90a2c449102919756f9b06018d467b805b09474bc2 +DIST gix-validate-0.7.4.crate 2529 BLAKE2B e16506a3d21a9499b3e5a851815b9367f5d6050a3a697587cfeb0e05659bd4ad42774f62227654d18b585a4ab85aa4698cd4da0482bace7a65f7df6e3f2ebe83 SHA512 f877571639b2e86853d408b3ba6abbe83d33fac81a3b6c7eb0b15b13f382d512996e5ade85abbddd72881bf3ab506b9b3f3e8c3af6a8e158464122c415bf0b3f +DIST gix-validate-0.8.0.crate 17881 BLAKE2B b5d8a1ec78ffc6087c2917d640696ab5c1b6b3cf270167d471ec3b5c02360184cc7ea5541b9085bca1c24e4c847d905feb2c2b9a8710f0377d01e33bab16948e SHA512 90888fdade9501df35b5a50d30ce19be724f20c03a57b43a97a4e06c8c7d2a614ad5eda21cb2090f556ea2f4e15cad670f102787658768e6fcc8f5b2cca7fa24 +DIST gix-validate-0.8.4.crate 6960 BLAKE2B d827080de6f3980feea9198f1e6d87e866673bb040c7be31d2d29ed5bd68e42556dd6ad363a48399dd172fe5dd3de23654ca2c9438f76f3a905d734f8d611cbb SHA512 fc1db05c00f1259ad9c431d12c8eb0958be4ac003708b3423af2428a086627590fee57e942ce4259fbfd824c81a195e1ef77e33d1c4de7fdeef101b38ca88f5a +DIST gix-worktree-0.17.0.crate 47448 BLAKE2B 49f3cdc8ec2ea4bffc51d58d5ec96b9c2b4158a4918b18326c86afafa7cee006f01c1cda87720e5643254345ca8288d92667b632973c7487caa50f7f9d529529 SHA512 06a27fe32ea88768e2d180a95fff4cf3e352741050dd56802df2d242b6ef9ba91facd4acfcbf5c1568c03647af258dc7199f0e467e0cc61c35c0ce0035943174 +DIST gix-worktree-0.32.0.crate 16320 BLAKE2B 7469e31447ab02b56e2dbe09a4f94d6f43ab154a7dceeeffe80d931e75bfec13fa5357b2c73ebfc01f81af24f6b46e099675b26d5cef0e01a35f9940fceef2b8 SHA512 5fb4c4109ae760cd3098d78cb64e178b1095ca1eb2a759d1cc759d2d920d8d6b1d25dd8947771faf77e76e571312947503b1e99bdb40d946981ca6140a75b8f9 +DIST globset-0.4.10.crate 22923 BLAKE2B 10bb8db9ceae039143e36c2f1c3cef92848277ae7b4bff6669f1c25aeb3ae1d322da7d88ec13cf9b0ba5edc0e27a52843a5672a8dac225d3c37bc1785c04e6fe SHA512 85a1213fd3ec55ffd87fde25f4cdbd2e8ed4056132d3c516eb117f107a744d733e1ad8fa06f296a60084a23ee968c3c0899399fd3ab9bbf72e217638a5cf165e +DIST globset-0.4.13.crate 24031 BLAKE2B 64e28ff329eb4013f5f4a94a805092197d072fe479cf7c99132dfc63a6ae7c8e8c3ed9fe4c506a239edc615196f5329fe796db825accb1e2a012f62b33567305 SHA512 1573911bcd22242ed4bfb96968b6324a67c5602f8460155d1600091e38028c4fee35cc6ec9e706a3f292b6bb14057ef97c5701fba07b213ee7b9653170c616d4 +DIST globset-0.4.14.crate 25090 BLAKE2B 2c3e6f8384a066ebfa1f36bf03125b5eae79329255674e32c58963451d4b342ada10f17524232a953bee133b3c77b678a141543759ebc622b5fd659fe55622ae SHA512 e83e4f5e42a97609e2579b09f49c2cb0a76a94e7e2975c5871f2c5af5d3b809736e0a7b220404c582f4a0c7eebdbfad6cb432e89b26401b58f2b253f8c0151bc +DIST grep-matcher-0.1.6.crate 15682 BLAKE2B 0f02b061ffac2ea7d56a6f199aa8ce2bdfe1e6314ab67bc02557d453cbf1302152f9f5a0c1ee35c9777f2dbaad4c490eb80aeafb03a53e6657f4c02a20a16750 SHA512 d47975b56e651f72ce59f0e0e86f73f126a4c9a2eb7a597c4b0a5de8e3cde6c7f44492a6b42560677ce4aeb6cd853934409910a1d0e00c0bda54f0b2ca66e882 +DIST grep-matcher-0.1.7.crate 15609 BLAKE2B 3899303670eccd6a4dd6f6582358f94bc204e8977fa18646b83f4d034575c7ec5fa56a77169f8a7f519b87b960f191de4d756b99b4ec419fc727878069a2a90b SHA512 bc15eec0b6f409926099f2aa46f040c8de240e50537358a50d12ce7cfaff4894ec43910d2e01ec087c2c0777773ef25e2f0d653c33a59c5162e23e85e76ec9f8 +DIST grep-regex-0.1.11.crate 29451 BLAKE2B 44415760ce0c9fd26bcc4b0f7a2fe59e990e15e1ff145caeeb611f4a45bc8979005556110da220cd2075344e72e8fbd54660456b525556b8c3834142aa78801e SHA512 41465203eeb1622287a0c67d210aa5187be4a846c818accc92eabbcc161a4476221a73adf420e7dabe206726f49fb421c8dade51112e18c6903dfc7b7f6c7cf2 +DIST grep-regex-0.1.12.crate 27844 BLAKE2B 0eba374ac05c22fb4fc2a2ccc20019fbdf61e1f94f36c867c40fe7838f3049c845aff938d1ab4e3cb34d35ffef65f841222f927354bdf23cf198de2c0e610169 SHA512 95df80807aa14cdbefa4d8d8cb8fd91263fe26009ba3ecb4a30acff1332bd51b87c94935a489405c6bf98e76126a5a06cfe7f5b677001da4e18c18375c00f142 +DIST grep-searcher-0.1.11.crate 44853 BLAKE2B 42f02228dc7e47ec2db39d44ce8d50c434c0eebeb8cc1dd52b66bac4de84aa9d315956cf6a98c4b7028510a8577c3fb23501b87e68ecaf3b44b48a0a374cf2c8 SHA512 2ecc99328bbbfbe05924c4c4f8ded0a790eb486c88a67803596c6f185c938912e11ee9d0330760ed67581ff1f2e84dadfc19524bea6065286fc05c4303ce519f +DIST grep-searcher-0.1.13.crate 45303 BLAKE2B bacd658e73323c83edb10d260bfdb0ff4eb6da82b291a99fea0db65cf2fee699e8b5ca44eab04805d4137f5ff1f09fe97c19b352ff98117834a1dfdff8ab281e SHA512 8e7ecbcbe09f5a57fad71e0010d2cc29f3b622bf6ff80cd2d75a8898b43ec7ca43a1d8efb4921032f865a81c38176c694faf6627cc747350a31510bef662cf9f +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hashbrown-0.13.2.crate 105265 BLAKE2B e9ff7e6e753166ab3051a834df6f2da81a19ac6997ba269ab13a65e0abb9ce00839311785aefb451553284ad5ef3a0cda925dc2bc188d2a138a78578e530969c SHA512 21dae7a283326d21e16bb32ae0dd1481c4936939a32a06478a3351c2dec97941be532437b808e99ac40e7900a75433fe0efbd852158659a682461245e19d0e70 +DIST hashbrown-0.14.2.crate 140080 BLAKE2B 4a9fc89d77940d116d781ac6ca2a07a8ba3146fed54bd5d304d5ccb7722d27c053bbd83ec5ef897f1a25db50f838b73421677fd92be5d534a91909a7ad390d3b SHA512 a611359ccc8d859a72e812b94123ff162f5653caa1839c5f5e3269ed18b5fe2b2c7b15b4f03ae8076a622d08090a90e747d8cbcdfce9cf7f317592f1a3695351 +DIST hashbrown-0.14.3.crate 141425 BLAKE2B 23c63a99c6c6b7a6b9b9e8bbbc7f1e342e1eb9d7582fc9eb408d3eec50c99f34502d450170bcfef4da7f2b1e743e1d1619875ec879e4753dffcb84f3c10dc3b2 SHA512 4d344e5c89ce58e04668b80ef10e4e110a3a5daf4d610c52d980577795d0e2050c7d0b151d8ba97128117665e27b92ab0300f85b88bd6e1de943c62d49249356 +DIST helix-23.05.tar.xz 115474436 BLAKE2B d81a81862142a0f70c0fe0a6225418eef2f5e8fe889d965806439dc1b7eb5dea23a6ecacb0c5b4f2657534bb5a809f1ec970cb99b4cd58d4515d45a81d1ff54e SHA512 203ff50d93cac640d7ab9b0dc4b7ddf0ee77fde892f010bd3f2e8139d08cacde76600b1d0c22a56c24b721130a84445e7fab570f66bb49764d8d7f08756f7d91 +DIST helix-23.10.tar.xz 106234736 BLAKE2B 70e2ce4515f47fdf434540152a526baf2d535b625fb13f81fdbc91ab69132cb916048a2bb47f13e357c7cbfc2a66faaf5ad392ded68457a8e4d2eeb89efe386a SHA512 6069ab57f3cba38a891b5d198544098a3f2d3809b0d199d6b0a800a386b68262bc8676b379f002c2f7e57dcdd39526d1e1636c9da744c5101860d0c32c7db2fa +DIST helix-24.03.tar.xz 133067920 BLAKE2B c033892e4a4d0e5f03c100e74c251d37af01c94deb67a683ebbe7e4de67c773d8de0348fb16b51752af65747cf365941f0f040dafd85f355d6a5fcd067ab6b7e SHA512 0954d0a85dae36a987b3ddddd8599fe9607eb29b77bc965730dbf8394ba6aa2c70c6180decac2302a2b53517eefebc9903b103c8c441e6e4d1d75be53b5b3558 +DIST hermit-abi-0.2.6.crate 13027 BLAKE2B 4df5306639511a5f69594e903f8ce62482cbbfbfe272a91a12f407483dbac4e87c2d7e5668cc06ca5c0fc149ca93a3152fe6ad4bb3b96cacf56a22cb635e5b7f SHA512 bad8442bb822a9c99f6536db16523c80f5139af6a139bcc359c03725c59ff935816e2ecc5c491dc362ac75ab2dff41ab1e9dd29431f5e9a109b60eb9b7a8dc28 +DIST hermit-abi-0.3.1.crate 13793 BLAKE2B ece7865a09f566a95bfba5f1fba380bf12836c3761fc6d5a3d5543d3e50ca0eac81bb567d50b5643849cf1a752aa651a0db4c053c60faa8f1c74fe2f12819d71 SHA512 a55fe9230e4e8fef63284befff74108f206e76067257439d334d33068875368902dc690926a1feea15611f14123073867d7e9cd21397bc484cef849d6e1dfbf9 +DIST hex-0.4.3.crate 13299 BLAKE2B deab49bf3d97f6fd7c0a0855b50232422443b226362bc7a4a19e57c2e662fff2cb046d4c5bd7618ddd523045f3d8c78754508f862f9a8ca29ca9247da6d6ec79 SHA512 fd8ff33b68eea2d6f2c6b02a6d82a2807cbcdc209ca5a76e3e3e5d006917ee151f236b6d18e2646cc9a9674bcdda1d6ce6ee363a89cadd99bef00d0eea9989e6 +DIST home-0.5.4.crate 8538 BLAKE2B 1512afc063cc31104e24a744aefc2a28f07d4ded12b4500480610124289e5b7c7f2fa3f1e66da36832cc45874c4bd2d08c1a584fed25aab4ecc962abc6675e33 SHA512 2494111301bd1281c89dc77f4f78d3bc6e3a04d1969938cf4584d465c01af12ad85022832b4a99a5c0ce6adc31a83c00820df2d513a09bf5c0d4fe44c53812a4 +DIST home-0.5.9.crate 8760 BLAKE2B 02277a6d0e54a88e62a50ceb5b50b08cd5dc1ca5ddc17a799db0f49a17fee8560df53f616ae22cd16020ae2a89ce7c6ec22e5e2c0d513405bc2859a6e3ec61f9 SHA512 3f1f7b619f1a47694cda92321a11d66ebbb2dc0b0c33446a7a4b886f547ee88231b61c038de04bb82acd50e617f19b5085893b8401206d32cd54502033e04bf1 +DIST iana-time-zone-0.1.56.crate 19517 BLAKE2B 88a83a65b2e17afff6491953c1ec508168e3cb0d720992c7958aa98ffec263d3b32f4ad07664703b1e429d96faa211a50c557d5a1398a849c45ab9df796f8e4c SHA512 d1bc3ccc17c6d3abc44f8662a15b5c84f5381f90dceb5e14a826595706178ba0f8cbf7cfa86d3b7e967a51ef75a27cb868fda7a3531be9bd6e77e813580131e8 +DIST iana-time-zone-haiku-0.1.1.crate 7200 BLAKE2B 9e748694423cadd6edebc1daef2aa4126904f5597202874d68066a15580cade77f48f1e6f2a77e17c7de0fae5204ef1262ad5b6f30bd95f4faec77748aa2ae0a SHA512 daa7570aaf5a07c990b07fdc2153b63d947598ed35aa9c35c4773772a6c67997143b120a18ff4c7c13474d296e81a92975ebf5b9aa9d204c1820e9629cb2e369 +DIST idna-0.3.0.crate 271128 BLAKE2B cf8a2c43760f03e94953c6692423a12f28fe763aabea8785b93cd247b3aedd2aeef2cd99978a027186290016ed924db39d19fe7d397da1ab570be9646bbb630a SHA512 9b7cee27811ee52ed9bb39fe82f724742eef2e5370642b6c756bd134c8cbc20bb6faa9f296053672dba8a66f7356a08b2ca99f176407b173e2d566d85d066441 +DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb +DIST idna-0.5.0.crate 271940 BLAKE2B 0b781c2e9bf717af429efb53bdfd18244f2b8c58e5111c3bd3bee50c8a01cc747513fe20db75c38b6b771d5845647bf6c1849ae6667766c9623e018c1f399a9b SHA512 bee6cfbfc99859b113aa8c7b487429a836dabc4e317980f132d28ff8333336f33480bf9f8b186a07115eff33024cd855bc85d346fce85e17c4132e886769c54c +DIST ignore-0.4.20.crate 53551 BLAKE2B 9c2b8d729ac7952e84fad82935183face8f6397f925dbea37b83b438fb327534c64c565e2f5cdb98d0820413f5c50062173887f1cce93a50805ec5e2df43a807 SHA512 e90c5c356252fa1c573bb92971477f2805e4167c3e7878e7da6756ae14463cca328a6614d448cf9a3a28abc5bf0f7c62313a8cb8103a04bb1c3bac0d0924f658 +DIST ignore-0.4.22.crate 55462 BLAKE2B a9a29e5286c9a9c132f2fa319226bfa85c9555150afd18e34bd3b37915250842c46f6079208dce75674fef448450dfd23242858ee2e4e2bdb7eb65f89d689d0c SHA512 9647a4887258dd970c87798dee32a16c1cda75ce3e352829f78d97e1b786d67f74d89b2fd76d48a607fe795213965c04c9dfb47713f8fa80561f87ac465956d9 +DIST imara-diff-0.1.5.crate 154821 BLAKE2B 5be6954d53e1787e6c88b23c7cbc8848f92aa7892a4590fa7d55269550dd7e0a355ea13ff646abb4f91467ef4fca12e74da60958181ff0c6800d9965f6a536d6 SHA512 9c8254012958869cb4845f76d34849b140dd1604d14dc9822f969ffd66c32a94ae6151a1b11052817e1ef60fb94ec52ac9bd0a122b5a1e6a994952445e4d869e +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST indexmap-2.0.0.crate 64038 BLAKE2B e7a1b2bbd790f1446f77262b5b0799c2a816a01295a9a4db66f10e6c0502f8970982fb808581472e840cc34dc70e7938b89408799ed0d91aa50d3dd0b4807995 SHA512 59bc19653436389e1408e21b0933e5ca6f9fe228f0f5fbe9a7e4fb461b9712ba82983cbf22c0581eaf7913298b9ef5842702946152b493c1dc651381d6bce1a3 +DIST indoc-2.0.1.crate 14335 BLAKE2B 2ffe06d7ad8ad84e13d0338f7f9ca8d7dc9fe7d5a605d4855353edad129a01a9df7e1ea587fb9f01a96b9f4c85bae2e736b20c90ee8df23298595ce519d9d54b SHA512 74e4e3f85b70afde588fd009ed7fbece4506d52f589b0cbd2b6633771e7e0e989e2389fa8fadd6beeee3c6f90f4d54b1843ab8981736ad2c15318d6f0b77c148 +DIST indoc-2.0.4.crate 14311 BLAKE2B 8d604e20825ae64530014081c627abe4ecec6447e1e214408743aca79ed217531baad4bd7021137ae6628555d769a248f06acc556cc3254d2626074aab110a44 SHA512 ef1b8d19d89d848c1133f2865247e0ce23cbe5552454805910ed0478ac4acb11b11629aa4a5ce8756d0ed5cbc0644abedeac0246f433166c68f47cf58cf4487a +DIST indoc-2.0.5.crate 14396 BLAKE2B fe838c6a855d6ff7396675a3fe9b2e0b06a93cfd4013b0b843d24d2fb81f6566528bfd1753c649646f06cb7e59262bd6ec3ed79d4e6f01d740cf0682355f2e5a SHA512 095fb56a3d87946c42a63065a8b276c2d4b9b835800014b400bb987593bf56701bad9f55d947f090740fdb7641a4f3c87fe8bfa5724709e95254d1e8e2e3616f +DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407 +DIST io-close-0.3.7.crate 8025 BLAKE2B 3ae34374d194407200f327695e7525268d03e5c2e8a051c99aecd1d395407197f9e6ba39339f67ad4ac249b8be63e4595993e6cfefb2f0b421bfaf8d655099bc SHA512 0cc06245da4ad9f8708ab03619734dda41d1cbb2777a7944df10e2efb0ed0a6d34aab3ee55210b05eb4507c802d01a301b6718ddd6cb8e2b4abdd2e1be11303b +DIST io-lifetimes-1.0.10.crate 37294 BLAKE2B 9b8836c4bf30e6d102fd9973ac66f067c3ff8bc2806e55f26368ebdc9854f2e9cc6eecc8014f9a0b22a968a6eea8be243fcb7a641d2d0dfc747ee08a6a1450bb SHA512 4b2cde9522780a408c5d4e6406286bc5dd3a0de1a99675129e9856e5d889498a127fd5dd7c937a7542135abc2213b60bfb6258b7871b8709dcdd79d60455bea9 +DIST is-docker-0.2.0.crate 2664 BLAKE2B 6c3b10a805bb077b9d0c54155fb9e72a15304fb3d6f0ebfc3efea8b42e02b99737d22c16a5352ee0c1f820699f765673bf0ca8f46c6a49b45796796c01015b84 SHA512 759e00292710b685954df031ef96bb650993cc3384cf03760ebaec377524cadc929c6561dde5fd3e14d71f9f122c86495dcf9893d1216d99055048542123ff06 +DIST is-wsl-0.4.0.crate 3264 BLAKE2B bb9842ea007d5ff132c77b719c877c370eb5cdf63aebea8f3165ab49fbf6c68d624a3809de2b374cc4c6c86dfd0fb23b9dc32c2e7cc5f2378b2efc918dd710c5 SHA512 69ffd419eb4de2e50ef4e61efca76ec4547216957d5422ac7b2bde85264080c2f522714aa40b5a6566c25eaf791d12ec0df09afe3060cc43087d18510f33d049 +DIST itoa-1.0.6.crate 10410 BLAKE2B 8b1dc9ae9d55a006bb2abe3b0282e5e77397814b692a87b9becdc2bb74deabf5db09e3d5a2f604964cbff046148025988a5d916480e0402b2b80646fbed32875 SHA512 e1fb82fe16e1248141d48de9e05e7abed0c6fef58f2ff8b77b52aca5f16f3600c46707ff4c7a0f0307047610f29775bda74948d6d1efceb74b37cdd22e1fcf31 +DIST js-sys-0.3.61.crate 80158 BLAKE2B 07980db627a1f4f385586ad0609b5daf30d590931d2ca0c123f2d84f6c97be0ea935aaae3ccd082440c7e7da1adb4eccfd054a3598d99351fafdfa748f567b5b SHA512 f97bb546af2111fe072a23cbdc71e4fbfd39fbfc6be37132b306853d5737175d4c9c0c4661096012f7fce3612f81509e62a97df8bcb21d7cc796a8084e5b2e16 +DIST kstring-2.0.0.crate 22063 BLAKE2B 71e58489a167d57326ce974c8e05dd4d2e18f7fa142249aea86594b56b83d566e14fdd79b7202a20ca9dc9e0911f7f873454925fed642d51241e6fc920775831 SHA512 17cf8f86f0a1df9de75ded552c4bfb9f7f0567802c83c0a8fa71625aa33cc537b498c3a247716a7b91b01c609a3722233d6316322210aa44850fd564ca16f624 +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST libc-0.2.144.crate 682092 BLAKE2B 1f699cb880a65baf9210527789abb35fe8be9565828d061e12b5c76330e21babab67b21e9a44be6a706f643f3c8b98503a3b40482183188b49f33f96a2489a68 SHA512 576da68e3845a7149f64bee425529ffec4bbb8df0272790182e49c8bad5b9744de21ffb5c1206753b57b7fe45af02c6c429e16522b72a77e5262482d64df5692 +DIST libc-0.2.149.crate 715592 BLAKE2B 21dd5d4f9351f3c75790077c7b025046db665f2d48d7a72cda7667bc60febf79d82708cf7d39a323a594397cd590bd3d2a2f85349b4473b90ea4da918382ed0a SHA512 0def64d400d473d6eed30e985522d36801ee6472b15f90e74dc4592e0a8ffbaf30b731be280de52b30255cf60aeca8efe817b67049227dc7000c807e007d7289 +DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4 +DIST libloading-0.8.0.crate 27845 BLAKE2B c98317a94f297d56c547bd136eeaa03c34a238d86c98d19f4c2651a324839ac691de0cd732845dec9ddb39a237dc8ccc1de655807e9e4663bf65bab1dabd8e13 SHA512 dc6de5b5eefdc93532be4b5604836a8cda2a50b663d10ad06d3b51697fdd2339e040418f151c73bf5a85d184429da060dbdaaed52716fff0b01e3088e64b52f8 +DIST libloading-0.8.1.crate 27893 BLAKE2B afabb6e07ecd390918344388b5fa63e5aa9223bf3ce513d1ed94cf02b1defe9909d94f0fa05e1516a39dfe4f41636834d3de0386b3c58212103263f2b1423f76 SHA512 f17ca367ef8e62fe80f43e5f3e2d1585be7b78b0fe4a733d80acdde38c20f9f72e710cff082442de6afa323aaafa17eda4491c4430b2d12f398d420e057cadab +DIST libloading-0.8.3.crate 28480 BLAKE2B b8588be0e7034e94c808490adb8ee6e81c29e962aec436a0d8f8c7617b3ba9177887ce59b95b2f0af00ab030bc77b73e0a889d8a77b84deb437245211a969c94 SHA512 af8fa5fe2428fa98177d6adfc01bcd6e701b0d77ac18c95b8b8d5abb3a6376f16241ccc71b9fe100782c73c843ca53c9bad465545d8bb7def52320dad0eecef9 +DIST link-cplusplus-1.0.8.crate 7674 BLAKE2B cbb93184d9deadd4912f6e03dfb7bb9d37f01b6d8d47dc9744724c848f297adb9cafb1599c2bbaffbff336f883e9a24c3cb4f11745ec4716a9a2c8cfa05f6305 SHA512 690afe063eb9726faa03443bfd01789a559aa10ded4bb3714ef7b13095005c817ad019fcc62b5f7b286c974a81e387ca3342d238e60ed7ab237c3628383a661e +DIST linux-raw-sys-0.3.4.crate 1007150 BLAKE2B c13475f95b539992e3675b9c59a46f649501ef19a7c83342c4b6195d4444d34c3861d677f40720fe17a362469c9065bbfa5c0fc884c48da45edfe35bc26cdc10 SHA512 fa058a39be583baf32f0425e7f3ed2a2f51dced89af7f9864ac3f172c1dd5708f75f5a4ca4e124c9b4fb78025417a4c119234c5493a59ebf76c05314594f1a84 +DIST linux-raw-sys-0.4.10.crate 1407767 BLAKE2B 8bc633d99bc1ee1a6fdfa19501fd034a4475fa9ebe18a206e4254309d91aee7a91fc70faf9775efa5157a1b2fb7e5f827bde40a770b066643356113f2cf38b5d SHA512 107f61add087bff55869798d5c71bc6ac9ecb27a603d8f9071b856189de8b7b0a7f9243fa1433700f52a0c3020eff5604dbf6e0653109d0dd277b98ab45fae21 +DIST linux-raw-sys-0.4.12.crate 1465800 BLAKE2B 2f70a344c427093fd55732b68239f771cf6563edfe2db4b2f50cdbc904dfc7565b30bf06454b91482eaeea787b9cd4214979665bfa32f3c1c586551333cf4d2e SHA512 d9564d02d5f41356478066592e438629adb3275df0e5a1a44030cc99bf8856b8af64f18f27371f84122a828b34712aae16495a1a16050fbdbece6d95e9cdace9 +DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990 +DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST log-0.4.21.crate 43442 BLAKE2B 8429b3270794d3e2c7f7d5b58bd4fa1abb9d4807ab3a1ac980ac81c11d9544635003d8cf2e608c2c0094865459108a2879f280278e121df68d09bc1561d604ba SHA512 0becc1a06b6e7048cff6c0bb8df49a16ac4772133c00239e9e9459c0811e7715c500f440cf1a9aef8d7ad74f57434559ca9b55917f588b8e476cf36eb6d4e10b +DIST lsp-types-0.94.0.crate 64191 BLAKE2B 0e89ff714e48c275860972145d609ffac119aa80fd8337392cbaee6a800e00e620c1de1c743520710c110f657ac71e2b2bc44058570f0ca7ca715da9d1d3c72b SHA512 9b7bb90819f5c4ec66765c31471acce9d76c402f3b6596ab75f32d2e43026081ae0307485b4fa1c18228f60f8a88135e4d242f0b13db8304a6ee3333e9f76742 +DIST lsp-types-0.94.1.crate 66997 BLAKE2B e2d42d50b18ec19cde95cf2e63ed0005b2b9696c4d8c2b8a3e8d405f69a6aefac9681f5c67ed0aff03beb8119fa98a575219f5a37d1a764dfa5c8e174747c09d SHA512 b336c441aad501c5cc80b06ecdc696554c5f76848143da19e534f1915e2390f53d0dc36ad43458e70cafa0ee817aaea1db2eff4949af28553c42cdacd3d2b27b +DIST lsp-types-0.95.1.crate 68324 BLAKE2B 3275136692d7d722d1adfaf7f051534ffc04a10d70cef470820cf15bbb6c6feb56636ae536ef28b0997611efc235c345004752bbbf10f1bbbc57d61642cd3adb SHA512 5358645b22a4e43cfd227c2266333a019bf9ac4b4e3d42d0bbdfbeaa25a6f02c405cae89a0caed719103ed87c4e68ee270f13a43f614008e753ad69ad6f34414 +DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa +DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc +DIST memmap2-0.5.10.crate 26847 BLAKE2B 1cf50f710ffedcebade4f131b8c3103b036778b320da671305c0244077743c53da155d444bcc4d0eece294234bb6e86bffe67da67aaf12a116573c64ce0ebc50 SHA512 39bd2734ce4f16c7f5a5e771f9ef92272b26f511421d5f39dfd2aaca072400ee38f2cd38352005c0c8c359095131770ce1c14570790bfe19ce6a17f711deff8a +DIST memmap2-0.7.1.crate 30741 BLAKE2B bbeb8199ad5f004837c9fbd7b0984010ef73b6959dac537a5b0265b6e16720a220bbd37b39cbae3c576a39bb2fd4b43bccaf7eb59203eb304e29e7e2b25d0a30 SHA512 a264ee152bca45af4ebe22fe30330c1984a65b064dbad2bd14c66eaac5053f35cd7569cf10517d9ba98fda64e468e3a8e599cebb107a627975417283e3530e17 +DIST memmap2-0.9.0.crate 31529 BLAKE2B 555a4160470a4f71ae3f72a8dc1de963b7df89ba83d0a50438a27a6df0d875c4fb1ce6454883b24cce3a8e8ec77b663eace08fd9d531b3c4af7393e71831e0dc SHA512 f46dcb4159fce188bb247a568ca3d86488c379bc18c8c24ce5cac5c34963f9da39af9dc9436c3d741ad364bc3b9d6d6a65b2c724aca3e6caea921127ac807e93 +DIST memoffset-0.9.0.crate 9033 BLAKE2B 19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed SHA512 2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55 +DIST minimal-lexical-0.2.1.crate 94841 BLAKE2B e6b8919b80d938d0b98d60d4f5f29ce43d77ebfcf8b18bde08909141915c6ef4f0d07a543538d4f3ba8527a9f55926d4a8e83473248469d087e80b274d701d61 SHA512 385fab51884bdcc7b0f2728a219ab164d0dc8efe42160b918f2c09f79ecf853fb12bda006d11e649f097bae1499dcd41ddf2a8784ee7d178cf2c28059e46078c +DIST miniz_oxide-0.6.2.crate 54536 BLAKE2B 8127ebec5a2cee1c2101d9533da573e01ef1a0fcb169bb0fb1419973ddd2e6953d8dfe85f9509a5d1226643ad290f0ee1479fc68f1788ade7ddf9633d90bfe1e SHA512 250782e214572acdd11df87c2788cd5f78e8388d9b285d0a850918219678e262e8b9905cc88728f5b70d13920ef9d19c43d243dad8fbcc18f8c8462662ce1419 +DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c +DIST mio-0.8.11.crate 102983 BLAKE2B 913a8e0e4843b3b19cce3eeaaff0a0024eaf1bdb4784a710e54ee95b6631edbd763e37669ec7d269e45157907663dd2eb6c9279db850fa47ef4c1eee867ea24a SHA512 9a2806ea78b0637d0cf92448abcd50bc5d09bd80da0f37752c847bc98d014baae7a5cc4d929de98be6283c76d82ccab1f1467aa6ab583a4e782d97d5592b0bb1 +DIST mio-0.8.6.crate 93658 BLAKE2B 32b10be05ef5d1ed44da41cd03c1624ccec78b6a89b5104ab7a1a3b84dfd299bc7bf7f3671aaae0a2759a56120740915d380aff05af5f5f8b9e8e22fbcfa8203 SHA512 45b3d2a911b66be556dfb79d87ffcc57ee5f33a03fb30f319631796090caf8779e94cda37fc7a76685c69483f1cc7616c15440b71bfcc51239928d8879873f6e +DIST nom-7.1.3.crate 117570 BLAKE2B 5643b67990b7305e101b16b8cd27c447e162a7adc6d0dfac00920b0cb50fea98c9d4edca63c34f6845cba05f8d0acb407cf3045cf64a4cb28e53c8b6bc9090cf SHA512 1ffce08dde299bc0e0367ad59c7b6a83e23decfa11115ee076ab91ec53cdd9ef37e4c2103c96eff23a7b6b8b5c3f67c83ce1917928c7d4c6462083bdfa0c9cad +DIST nucleo-0.2.1.crate 34742 BLAKE2B e84952894f2dfd5bacef1ca6a5c9be7aaee5a3a14836dad81cb4fa866da7c8578f9e27445676c32360b2797a796d4ddd6d07370c076438918987cdac221b8423 SHA512 8f094375f07105b4ab1040c47c6e8f43538cd0fc6bf6b42fda6f79870db1b36b64048695644494adef8664c87825eb519ca503af0584887023cf771a8eb9234f +DIST nucleo-matcher-0.2.0.crate 44472 BLAKE2B e16f19f6004e493a554db16bdf0a71dac29be543ef630a49a3195a2896949662f334512d78cf316ab46f7546ae8bb62501d98ebed857bcff5013b053cb4723e2 SHA512 d2c685201e9235bcdfd55b3b49f627e48fcd461890e2ffc59d0fb958a05cd6440e44faec705e18e8c76bf0e4c0a16ec1cedfedc023235fbbb3a599b88900140b +DIST num-integer-0.1.45.crate 22529 BLAKE2B 4da3e801f71ba8f92c692497e200bfc8d32183c94eaad91260683b09f4697c03175fec7cff5a9ff3782d5db5d514d74f22f7a61a102c0f0d2e67a7a4b4f29222 SHA512 731bdc09c3af7f9d8b171041f2957aa60facef93b06886000d8ba60d410aabbbee358d700bf31b2588b2e077464f290f24a0b712df7bb7f12972675b6c9bd735 +DIST num-traits-0.2.15.crate 49262 BLAKE2B 942ab170b2acce1cb40e6847f766bf810a79edd293d34f3a27864f464c16fe2b99fb13171ba429cc6d584248de879434beaadf1b231a4001b0e8389ed6c1be04 SHA512 5228498af0f15daeac3c9210f3e6e71cfaaeb30beea81dd37f8eb06b9592c8bf3226a47597cd8592ad4c513964a9a40f1ab2c33102ef3dfe3800d22c8d4528e8 +DIST num_cpus-1.15.0.crate 15680 BLAKE2B a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d SHA512 fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f +DIST num_threads-0.1.6.crate 7334 BLAKE2B 416efdf395b0299b6b01e1508823afdda08cf67ca54e1d644fc5accbb0490945a492a34bc5ba70c3e838e6405d17ddce164ef87468bd9da27097de8994ad9577 SHA512 b2d9897e29e59353379b6372a629fc7f9afc89f777b4410eaeac7b4729527948a8dbecb175f056899f9076693ef855cc0d40e725cc54f28af588fbac5f7ce3b6 +DIST object-0.31.1.crate 272843 BLAKE2B 1f2e8ce0bfc2f428889df856bf8fcefcdc754d5c9a934a65b65903ed10c143daa1408e97a1f190996ea451541d215d4e4d7a53c5d2c8d9a6c9ffe4ac6513a56c SHA512 e9cc2eb5ba516e4a08cf3fd5f496d05bc74ddbf1846d6b6ad6fd25a689aa315652fc5710be6bc68fdd678673b7ec8d63b4ce999f1fcfd5b281154bc25a915e9c +DIST once_cell-1.17.1.crate 32856 BLAKE2B 8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc SHA512 1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST once_cell-1.19.0.crate 33046 BLAKE2B c14b374eaf4ac0f60acc2e02f7bba270a0e8e0a6978d749cd3cb0ab3eb26907e4fbea70dd5132982f90290381ed18ff8a87fd530f1415fabffac864f157ea380 SHA512 4154876afd34a699ee650d1a8a1c5ee5a25f0ebd9388b8bef2564e33629fae68f113d7507488c68abbe7ea1acf9bbc41813cbbf3ef3e464e3f3b9cc7a51d870c +DIST open-5.1.2.crate 23336 BLAKE2B 1ef8cfd66073be63f6d9c71d68e2f4cf79c70d70b533a92a67f88aab0411ac35423832edca34c110136ac5cc9bac56a5145aae4a89a375b51fb4e06e26bf4f7a SHA512 bd2aa675f7eb25362179354735a3c03856697af1dcbef1383e425196c77080be829b8ffc0edc4d343172ad2876e169764944b2b76a8ed32cf7f66ccb7590c933 +DIST option-ext-0.2.0.crate 7345 BLAKE2B cbfc03e7c960fe3023512a4ad816d657b4f54f8ecbde9f9c4df4c5fee3b36b68ab463c67ad650778279e01c7ffaa63a0dacbd0c080c8c3d15b1611de0e71f92d SHA512 f8539f97b01af97e0b80fc96556002251befa60f8ddd19613311e62f9dc9834d71c22f5d8e7c53c4925046e38cdcf834c3c28042a4da862d6f6a21ddff8d8e56 +DIST parking_lot-0.12.1.crate 40967 BLAKE2B 940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4 SHA512 07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c +DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72 SHA512 1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0 +DIST pathdiff-0.2.1.crate 7142 BLAKE2B 7f9a162c2add4acd69a81171fdb31aa9a67beb4e1be0fe93d76dc46b320729257240fca5d65dee38901f6b6ed1e536e3fff09c93cf3482859e6ba27e7206fc5b SHA512 a646f271ce81d5f6d4a8e0d98a2c802a8796a961cf8fe8177911e7757bdaecd8b156ff22046f1663a9efcd5fef1e6f000e5509d3949dbaeb494126b7e8a546b7 +DIST percent-encoding-2.2.0.crate 10075 BLAKE2B 397e59acc3953868c709244b89a2e0db3304c0b574ecba761026b570a485f2cb5b0b2a0159586d1f342ec395ef02ace536da3bc1c72093e1cf93f8b37b26b0ec SHA512 890a5256d2b4290e12e04a02c3529f3a017faa2b6016a4dd0f08b36509f0b1107eacfcb4702024d6a21ff8852a11f263c1adc096b16ef8d12c45a734c087fe68 +DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd +DIST percent-encoding-2.3.1.crate 10235 BLAKE2B cf8e2fd7b359a05b7bdaf731f9ae84c7fe6f468a53482eb2db7f93dfdaab64ac812b3664899db260055a93449462e6d219c695942fc5b030517b197b4df9b95f SHA512 5951ea8315e52cf3acfbaa023cb9e13a136b114c54a7da0bd44619ae24cd2159d4a96469d7572a2fdabd94e19513a033387117d7ca81d0eb409fb383e4acda44 +DIST pin-project-lite-0.2.12.crate 29073 BLAKE2B ab66a6dad606804eb6121fac25bfbca3ad00e8d80af2e7d1ab38add91c3f76761fd1864f0fb184cb305cd216cc92e81c2f73f0cd2e6f210ede3bde4cbdeff77c SHA512 9d2eb190169819fadece7fcf33d006863ebe2c298066ad97d97ba96ced6229892b4087ec1f364d5c6150cc80b0ded8f431d9d4285adceb5fc9ae1da8e1a6d82e +DIST pin-project-lite-0.2.9.crate 27713 BLAKE2B d6985b5add432fb6287d1b0c9fb0cc91a195f82c5a748a9ea430e4ba884717ec7b16d730b5ea62de5b2bfead1771da2d115b3776e12e605f70f2538f374a28fa SHA512 cef0b77233adca712db1183f780732ea577cf1b27c2643de221d54c837c75ce749f907e24a967be7474812c7682cba613a3fc5d553a9578a1b80569da0e562e4 +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST proc-macro2-1.0.56.crate 44454 BLAKE2B b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad SHA512 511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03 +DIST proc-macro2-1.0.69.crate 44271 BLAKE2B 9d1531a0b123e6238363d574bee03ad050454b65710b9800c12597f3a9ae2f9bf50c617da0472b7ac0b549afaca19c546ccd6519e648598500efda9c0db2ef6d SHA512 d197cbe9b6100c3193a01fd7dd6b4e49d440290012ababb5d9f139409f0afe816f213d67a03abeb1f3227228e0a1f2446d1dc0a2775363a15d1237c38b45d6a1 +DIST proc-macro2-1.0.76.crate 45660 BLAKE2B 40b538d9d9fec10b9e4b147ce0a86efb10feedf9e0452e5568e8ad7d2b88a201ca6ffd2cd62d8815a1ee72d557fe6280120a913868c3d868c1235686742cd8b8 SHA512 2ea7ade475171166489ab3e745e8c526e49c7521bc39b1bfec6dd2fd0807fd3cc5579235f77534be855f9ecab481205e77e66b14ebb22e66d2c3cff842567247 +DIST prodash-23.1.2.crate 83797 BLAKE2B 6407d22f46020a7c1b2d78a17d05bcc4b8088a913ee31a778f0f403530e908ba3eecbb4f677eaf8dbb7e90bfb3485dbde47720203119aff0696e555c07d339de SHA512 733c3a072fd544c151e5e1298ac4cacfc4356813e454978ba526adec8c9fd00af6c37c84ebf156e5761776d07cc4142bbbf414ed19b01533a90222e64cf0fcea +DIST prodash-26.2.2.crate 88268 BLAKE2B 2b8a13c35e08ae0bb12625430eab0f9057c3467551dd2efe4150f18c9bc1880ea19df8d9d835791774fcdf78b6020920d1dcacc26557be75c5eba15ec1388216 SHA512 46961db2625c5064dc073e31257758b4b9133c8169380f7e7e30143e648677ae62f3dbd16fe96d1999aa8b94824297184e99baede5f25ddf198535c3f9ec4a6b +DIST prodash-28.0.0.crate 90695 BLAKE2B c4a78e86174003e2aa18899fc9214acfeb04637d2b90d64eed17d5dd2569fdb4a58991c23f6e6fc21549e4412eacfab9dccc50a8e62683e8d91a922075968f4a SHA512 36a9099fdb61f604d902d28f7082195891056af916727f7d7b78986dca35539238de0c4816c96ca2c3e74fd04f503c59599988e95be46f0ed87af70ae8ef3c70 +DIST pulldown-cmark-0.10.0.crate 139056 BLAKE2B 72974ca5b8fa8de1dccadb65900295ea3a0adf9f86913c89ab16c5c49f65d4f3368453dc2fae807f5cfda5646b26a822e3f7e4b7f6f15bdd7ef058365f3eafef SHA512 cf6dd2f0a3a4a9a1f4032ae7f6084ca7805d54576de8083951c50dfff7a426ee5b0846bc7719ecf07c43a298a02e85ff1fcd891d0a163528361baf19a0b19044 +DIST pulldown-cmark-0.9.2.crate 115824 BLAKE2B cc8b8cac890b333a864ecb1444128b1aa187392b296c54ccb0c3048d79d17aa7f53bd0ac31f0c6492544ea78636deefaf3ad44804a1c79008e17b27fe1e61fad SHA512 2268a3284da5def75b906373a3c70927bc68ecde7b641231d96ff9437785732134568abaf0b6f81c582dc56498da4e677a7b2e2f1914cd42b345db0a06d75c60 +DIST pulldown-cmark-0.9.3.crate 117339 BLAKE2B 0b4105a9452139865723a66e434804da7fec35771a90335debe579164ce7ddd78192949db77ad5427ff80b44805a8fa5ca497e6b4111344aaa014faaa508904f SHA512 2f5acf1b6f345ea2f82c6daeb4b73c93c2772dcfb7ccff6fba9e51b8840b0662202eb3bd1c917f8f81be1ba86b58fb3d5f87616dbdca991e0ef6fc249dc888fe +DIST quickcheck-1.0.3.crate 28069 BLAKE2B 5f0ddc8e22fec55e879745a95024abaa03d7bcfc6453286eec072663b36a5d6ae247b3c1622c4743e1ca9b7c4bb21da0d095aa5247f32b0bedc393f92cda6bc0 SHA512 07dd707c9d3fd0b9cedbba545bc8b4fc1ca2770d169e444f8c96f8306d3161a6a3e9189cc5d0d6b3dc4221f7dbc05887dfe2dedc914f88d5e69ab2b94179185a +DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5 +DIST quote-1.0.29.crate 28345 BLAKE2B 3aeb637a4139730348775caab4d48173650d8bdce08247263d741ccc657dfff7f2facff05725bcaa73486818d394c392c64ecbc61bae3f5b612104aec16ff289 SHA512 d686a3943dca059a8e79689c77e6e8f6dbfa9b16a1a7ecdd27099339b77a55334252eaa8b4340e79c35ebb1f6e4deeb3f6356dfd02484f9c724e66a74387e30b +DIST quote-1.0.35.crate 28136 BLAKE2B 81424245e1e2b94459df68bb3a9a866c6a364102b5e1d010ede9c5f8278f8406d7b651957d091c5914e936b494b0f6e9a6a1dd8b7d35cd7d7100f86dee4ec12e SHA512 f5314fb6af17cf36c228e1970c569c29ec248954a450a5f90ba9e2896d04f74904c9cec5a1f74325f2489295a94491eee4ce8fb461e22cd4b34e53f1f881efd2 +DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 +DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 +DIST rayon-1.7.0.crate 169488 BLAKE2B 518f0eda1fcbd1b1b230587ea18cab0023a699e796c819bf35a6492b7edb051137446bfbc49aaab0a68aef8280c970ad14301a9f8f7461d537af119a65b33a38 SHA512 d999c811b701d0aa4e547234bdc20a7df56728e142c4aa882bae081b7b057e8c3a72f4a62fb35535e57501e8c2ba7ff072068b59d6b5374e9ca6bb66cc0984d3 +DIST rayon-core-1.11.0.crate 73118 BLAKE2B 313d65bb6e3a010569b317b32ac91c72e38282f4fcddbcb56ffa97de42d88c0d34f35f76b62e1ad60ee96b596aa681caf2071a8d5dfdca085fb1fbafb07c3ee4 SHA512 00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800 +DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27 +DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde +DIST redox_syscall-0.4.1.crate 24858 BLAKE2B c3301137a0b84e03b09d28dfa377ab3bea74d574a08cee21d35713b278d8b5b30ca2a1d73a0981baeb4644cbb88c86c8eb15ab3bb2692e38b93e6b35fab4e0da SHA512 073ed9d96090cf46eab9877742277a013c62d8da86d9caf2310b4fa868af306511936553579e01309f27067d344226cc8dc5e3aef01d9b900da2febd33848f8d +DIST redox_users-0.4.3.crate 15353 BLAKE2B 5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633 SHA512 0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda +DIST regex-1.10.2.crate 252839 BLAKE2B 4be7bede72d41634c52eea25566fb13337a84a055aae6fb73d3b18ab9168085ed04ffbfd5b6f87c2f85c9922893b9c9a253a8c874eae9185b2100850443b1517 SHA512 e594f70cc540586e4039e7b905ede9e507757b531f22a94aae185e47732ae0d54bceb2c6aceb815819a9652c01ccf697798d372631f2f864c04ca2eec59759d3 +DIST regex-1.10.4.crate 253191 BLAKE2B 08bdb925efbea1ee9f885a89ec6b4692e39d7b17039f788e5b3c1dbfb7847d4f53b67f0c61e4085af7ef4901e67e33ea94948668bf706fef19b4102a06ef0447 SHA512 88ef121a51759f418d5dc01607a6e02651bd00343dae92962c02a80f30343d3f079a0375457780ce46bf205ca38f279b03989154638199fe2fcede10554bf21b +DIST regex-1.8.1.crate 248412 BLAKE2B 4f1355104def09ec8f7a7d604fb08d0a39af36cdbb5160c63329e8c06ef2d2ad1063fc7280c90ba3748e1766b65f52fd6da24e439d5262209a6137bcbe2eda9c SHA512 fe83c2497b786314cbd9ead0d85a39ca87ae92225e444a41ba381fe80aa381a88806e2c20e1c468b8b59503fdf1c2b7e5bf6eaae0ddf9f14a70c1ca2773e8830 +DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f +DIST regex-automata-0.3.9.crate 610489 BLAKE2B 6eccdf930979ff4e8657cdb8fc67feebe18d16f6deefda7e1692c6cb6f311bd3c360d9dc091938bdaba061669b003ff7689d7717489326aba70aee563a4f0e20 SHA512 c404677bf470f913c1ca70385a1b9694ec4c048d306380c23001bb746803ff70999c7e215efdf02c6bf03cd9a922e98a6ecb3be588fd4f05c1f57836dbe54c0f +DIST regex-automata-0.4.3.crate 617011 BLAKE2B e685724eb037411c1a73d6d355c76e9e32c40f1c9029acaf86477796d3f5ad092b0c5619f4df2fc1ce34243f2ad8af147aa31f83a435e5b5adf55b4c9c8a9359 SHA512 4fc82fe3556f829956c3172447589555ef286fd66ee9a445cbdcdbe57970655e35b6eb0895ba02c344d826609257e0c95d3f7f51858aa260103bed7b08d8c1a8 +DIST regex-automata-0.4.5.crate 617406 BLAKE2B 21826731ed5439a12cdda5a1ef217dc3239a0884d038170855985bf830f2782bdf4dbfd1b1a8812812db3a2399dadf8c173e75db635dfabc97382fda0561bba3 SHA512 0e9681d5c4529d49ff2555b7b73cf234b1f321a7fc634beccdf76c2bce5094e8501403e8caee2b3a16ac299cbe4701d891f1efa380b54f9dc2d92bbacd4de611 +DIST regex-cursor-0.1.4.crate 151904 BLAKE2B 1c0981932017a3cd91defef9b4ab74a70c38341717f5733129b398df2a5af7be58a76686a5aeb231f9ea88ed71b6da9ee566cc683e1f134d70af786190c16c65 SHA512 d3113342c44890b095fa4c41669c2f426bbb074dc3381a75096eb690f596a827ce59d8994f6400c9611722afbe958c3908ae99f3c00e2e341ecdb42edaf680be +DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e +DIST regex-syntax-0.7.1.crate 339705 BLAKE2B 59dcdb9e0f5a2008db491756fb353745bf4dbaba0d3a8a6782960c990065e1870cc120d7a7e220991b78f89053aa63b1a9c326f5ae3526d47679e4ae30ae5e66 SHA512 ff61e4a075550fce3a16e516f8222a489dfe2bdf9431220c98c33b1f9e6b19da7bc1ca6bf34031235d6f1ad06882b63d606874a14d2e27c615701ecc2f4cdd9a +DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e5a1608f2f16ba2333641b154624e378419daf8d1c955f21ff5f40f6d49c89569b7e11ea5649850846d0fe447a675c SHA512 301dde555f300298f2594490ccd8b92033e4917fe9b8671b8a97db6c827793c73969be85a92999964dcaf3177edda51abeb576811ad6cab9772964dc0a77e728 +DIST ropey-1.6.0.crate 118667 BLAKE2B 3315f497324df5cc53359257490c600ef94b58c0c53e176c3ac93a2a459ddd16604380073f11357d6c173bd201a865b4bcc59b52ecade0c6f3c3a8c9e34b32f8 SHA512 f7fe9303107372579eacdcd30f94384293f2884ea7551469260bb87620d8de496a37a4654b97692828217d912af270f29782cb78386d234ef9485afd924393e4 +DIST ropey-1.6.1.crate 119463 BLAKE2B a0d02ada75d96381b02715ddf28ceff9dc6ce718054d11eef5710d0b044d42c4d324cb136e69719806b0441be47c2d94f67eb5668aad344806f31a9f96c36974 SHA512 2c7d4379fd3c8058d25e746a830357f1e0740bcab99da58274b2ac54c17999d166768f4c366c85fbf56507841a2526c5a0a69290ccf3f9879c0df39204b094b3 +DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 +DIST rustix-0.37.15.crate 315957 BLAKE2B 5408272b771078203261aaad4c3329e3f1eb7631c239beb0bac5d884ad74867629a690fe841d31d79e7b4939abacdd979af26dae7aa91989ca4f9f430624145d SHA512 cad1f85061670cc391226a93a387439f2ea8cde9279297105efe2961dac53d1ca4941ae57b5b1eeda897f19e7ebd12a9f84c243516a1d68205552309dc20efae +DIST rustix-0.38.20.crate 358266 BLAKE2B f309485e34f6cab911f2c679f60ac5432c4dd03cf7d32c9c8da741cd6c445c594cf2b0cafde1a7c47b10754b4696b38247d538bc2b3b3a3808c074c87f42a604 SHA512 474d2ad32ec99eeac0d410a886e37c1e2bb0af4f35f56321b3d763682f48efe9f23a3a151bda13a12674d9082157705a67c783ba0ceb706e7d7939b9bb9f6756 +DIST rustix-0.38.32.crate 376999 BLAKE2B 681ea50f5405b3a749a26a481995d3a85800378067734bb857e32e5d3764687b0da4b3749d227174440e432b374ae9ada154a8288e4353ca2ff1b851698477f4 SHA512 8f028b4df785aa78fc798f3e053d0a4fb9b3c552a47f66f52f1666f4c1324441be6581ed643c4ef0f56d92e1a078c6d3b45be183fc3df0ed1fc89de0d610cad6 +DIST ryu-1.0.13.crate 46823 BLAKE2B c6d661cbff5e7b273da5a6bb704bb1910b897c55d854b05bd417f53853a832791afc351e5a5aeaa94ba99a8fe64c8a930221c52a8784519728da748371a4ae04 SHA512 25f60216d91e68cb47695ce4e966fae674d5b3e4b0cf33e740248c1605fdcf0c963acd278a485c5b4bb0a1c1144002e73173592222af4989df7a4ba402508c13 +DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c +DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d +DIST scratch-1.0.5.crate 8013 BLAKE2B 64bad5081da3765fab34b582c679fdb345d592adbdba09071357dd3306eaa55d885a4f282732972b6f856ef9cfbcf73a18e9f5b2591ab05ef9104119299d4159 SHA512 522e24868568e9e3c4c6a9b0af4e1890d5ca6753ea68660e13bdc95b98c30576058dc949d20a5df95a6313378083ca138c7bfbde5c60916a011cf9697180692d +DIST serde-1.0.163.crate 77030 BLAKE2B 0d7ead66faab8ae01c693c9bbcadfd0a7a736c8bf46f50ef43ba261eec9e0f0c43477feadb2e134f0ed6dda3115dcbc3d22daa28592f343739f1ea03d9c25723 SHA512 752738ef5f67f1b4435bdd4e76e740ba192bd93e83cac55fd667809af26ceaf02db7083aaf7b2074644b38964021af206000b6130199e7994c12c9c57cd31a34 +DIST serde-1.0.189.crate 76276 BLAKE2B e4cf8d9608f341007f9a92af434395659511238040ddd2cec137539a51c05b949f79c4965ad9ec25f67a72fe8341573f2d1075766f7ab5842a107b12e0468a3a SHA512 3fb1732f6866db8412cbc4ceb57bc8f90cbee005e2687a388b052e5b94dd464aebff57a91cc8ce5da62508bfbd6cc4e14a524090a5fa60724cc9bd1bb5ea1035 +DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410 +DIST serde_derive-1.0.163.crate 54447 BLAKE2B 284d02fcbdd05c53c8da737fac422fd61ff53669b140686d1732ef727a1e873945b1ebdb85fbda1d79f2c563b2c7b81d3ac51c76fe0cf5205dc6ab4d46a9d4d8 SHA512 744c4235330781c8d9c6ab4f49f6ddd11fcd70b97c97fcbf1434ccac02ba7d29eacfed21ee8e005f5541dd8ab4a34023e95d85231f11c5f4d6e24fcf806f7283 +DIST serde_derive-1.0.189.crate 55708 BLAKE2B 6f49c1a8ef5402251d6bdbfcc03fa411c0440d292fb03bbe38e9d4f9eacc128c60a33bbdcdb5fceeb4e0a6f6eace56b8da16f90fffda08c580b87409ac5c3d29 SHA512 54bf81d6a18297d57122d8eca3fa4fd60a13907fe65bb68081c6f9c0f8c13f3f3206f74a0e9e3c3546c8581b8f7d4af92dd74fe4172f039d3022eda031e1e342 +DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994 +DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc +DIST serde_json-1.0.114.crate 146986 BLAKE2B 229f0a8e2c0bc35435b49774fab9d4cec4e2323e85e2f97ccaa2a18277ecfb9cff9e9b165786e782cba043e9ac670717364b0f9c145254eefd74582b728f2186 SHA512 2c35cd0e29ee2af6046ce849b5854b82b90f402b51c04ea86b32ce7d67869736f17a4d028dd8245c31201036bcca7a1d3df11d842a92a45b0eaebd809687d436 +DIST serde_json-1.0.96.crate 144652 BLAKE2B 2754e63479aa07507015dcb0f989d6447f5b2c01e5f02cf8a843d90c90c6fd0acd3ecb68d80d76c249efdabe0bd0670649a9e576269928d2276ba00a3153131d SHA512 39779419900e1d395d81e70cff0e7a688564a66124b08e74da54ac30f389c912707f4bf5e29afab6fa106faf4bf4e0b841f42fef125cf7bec185482ff6bbba0e +DIST serde_repr-0.1.12.crate 9549 BLAKE2B 03f1fecd3edd4c2e14f936db0c1a4452784da327eae63af4086d38323a56ef06b34bf49bd10ca4afe35afa67db4cfd119cdcf98532a57d6badd055bc931f4dff SHA512 c0897efb6ee046b29c810bfa28c6aa5d8cf10ab33e220ee7e1747e9abd2ea0721585f267060cf0a1b03c8f3e5588a48d344079bee2fc9d7472ba2ed61461c714 +DIST serde_spanned-0.6.1.crate 7828 BLAKE2B 78d39bca0850b78f0835167ca7786c0bf356d668389aaaf3ace946e91d9a7db8dcba895e833d87e88502b2ba969cac9aad6c1a053c5ecb37f845ebb3b0bb5b32 SHA512 6271aa2af243021002a10cdbd16cb081bf10ab53a61cace104182eb4f28e0c0d7c447b7dcedb350ce78debf5ed6ce6502cb823ae9177d98c5288310094eb22d9 +DIST serde_spanned-0.6.3.crate 7737 BLAKE2B 957352cb24d5cb1173613a48de7e411d768c61a73dd57572530490be0569e133e7c8eb62ec34e542a17010871562a53e37b296386c54dee8ea61d175dd0b05e3 SHA512 5c4f4a861dba2af7f0ad0c585859f845a7ea6c0a8ff8b63985503c9da27f313ba15b904b0aa56a59043c44a87c75fd317b23006a3804d332b84855189e436610 +DIST serde_spanned-0.6.5.crate 8349 BLAKE2B f4f8f798ae3a02c0d5178aa12a94bd1bc08fef88b6a81d782ba07ba36fb0d89927ecf621087faf376b6e53de12f6a96e0880ce0cd01ecc31c5dab7dadc6f3ff4 SHA512 bffe2398629ae5a5a5bb6d5fc2fa0f4b94d02c96e25d1be2fb9ad95d8ca2fa9bfdeb3af11049ee9c050e497f3beca108f03020f88f6de29b208063c3898af354 +DIST sha1_smol-1.0.0.crate 9782 BLAKE2B 214b58f6a8681399b9c925815f4ff48974466b399e96e372c9592cb139ba9306ba162b3b426dc12b585ea15b616fb58a60d253b4d928dde46217de6ddf7d0437 SHA512 75d6809a2aafd47cd5f5888f42283985895a9c82b53ead7529a23cd6f2484f32654094dda7a9e5d93e82afc9d0049938def1bdc28803502d140d06a3496adea7 +DIST shell-words-1.1.0.crate 9871 BLAKE2B 7923b36f0ba50c17ac4eebfdda34566b615291253b7b41879b3f64b3fc1325e63948d3d44801e40748b11ddd2ab201b81d238af2a2007c7a57d71f5dcd0667f6 SHA512 05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00 +DIST signal-hook-0.3.15.crate 50138 BLAKE2B feade39b877523dd138a5df3114e13c35d6a2ca281ed4cb7774dc970b3cc88b9dc011db2914c87655c0962ad1cc72293fd105f06fa4297e02fe28d78bc56c1c8 SHA512 8b7703c8ef683868e4b0c315a73fcf6802f3e28730db6b79301e9818532ea62d6d218c9ff3ba465e02ed5c19a33e733ec5f7750ae9e0f823a2ebb35bb911a3cb +DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298 +DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08 +DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1 +DIST signal-hook-tokio-0.3.1.crate 7984 BLAKE2B 9e45b63cb335ce3c449deb085db7154c90a717151dcb7ec81ad393d0c040f2d816573203632eca47249306754935ba7ecccad5c039b8383e997a9c713b9e5f31 SHA512 14df27bb3b210480a26cedfc453cff92329f22f4783b2803482137abca396dd3c268ae114e54c6287b0d55e5f8f1a6851146b1623febf4ccf7f209ef4d83f639 +DIST slab-0.4.8.crate 16928 BLAKE2B f20603e1331a767c3f55b56d58bbdb9fc126794a116db128fce6d204122c420e9a65478f9f10a26f86c045dbd55a62556862f4339f3a41419f810bcfa9fd145d SHA512 1d713a217b3816a1e6c230d4bb52c32c90f600e64520f0c339ea8255ee8aefd887d969fa23497f1bd8b2b1f7dcb4b220957889746f04dc3453240b5f28517192 +DIST slotmap-1.0.6.crate 58954 BLAKE2B b00f328a8ac4738bfa4f0bc25ac7ef91fba9d5006d4806a351d21119f23c98d39c5120c2fee0a622b8229abea6dd9a08a3ebd7a34a8a64ba172c2d6f9c53b2cc SHA512 1e0fad77d39cf937fbbf32913595e836b9d8067a81e8ad9a6653cdea023f2c8ce511c0216a1222c056e57419cdfd56977af7a6e83a9cc8b5708310a17353b145 +DIST slotmap-1.0.7.crate 61390 BLAKE2B 56f7ee840f848f2331bee7d7e31aa66f2185db5b57fc72694e1514b462dab8f673442c36f7b9260d5db7b68a522ca76f7748aab774246bb12c2ecfbfd3e7bb8f SHA512 f130275c506a3d648b5d66acddf7ed88274fc381d8d0101ea5b3ad931069d4ca46b856d75311e95e09a23c009af343c7a4321023bd1d065d3d516a0b4b8a3080 +DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae +DIST smallvec-1.11.1.crate 34831 BLAKE2B bad85ddb1d3a1fcec0cb6aba413f90695e0aa0c16b2b231d6d15095bdd6de1731720ea2b394c3f9a444d6d4763bbf44cff389a01aef3488dc599d2ea63ddbc36 SHA512 d4ed45e8867366072e77f23ebe8b31be96be37e5beed30fc2b5ffea81ab04a2ad2aa34fb4f29724b02a5eb90f8b1d8c40b800ee915453947f90758ce999704b5 +DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679 +DIST smartstring-1.0.1.crate 29555 BLAKE2B e6706bff07889a39e40c764c51f0f3271570e2ddeaa2d11c510ffc9a07dc34005b62078abb7dc6f0bec5439f0bfb26d7b20be48a5189f6a468e4977352bcc941 SHA512 18e359d869bf006d49d6981c26a31ed73424c2734d8225c235b5f3c65124e5ca9d5f5bc95f4b190dc65746b73f31e2588bf9f50eb2b30535e5d05ebcd23ad760 +DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f +DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f +DIST socket2-0.5.3.crate 52588 BLAKE2B 03692b67f27530670048db0920e26da4d95373a3aaa81ffe840b09e73a5730e2cec4fa43c25e63db0a6164c67d6fe555b0fcf1c9f7ce6a231d2972f5224a4d50 SHA512 63cb78d66b057587e4b3b50b9c618db1a202102c72b52b79c2e9f9a401dc1c28fe4523a0f6483b38ca8a3d24d1e2fca0b7176d96fef6ec1b922ae7c4afacc324 +DIST socket2-0.5.5.crate 54863 BLAKE2B 4237b540dfaa96d3f8a8b9178519e5ea37b6b96480a2aed5287f462845231427a18f5add26756c7b03c18d4d4aa617a5a36c5462258ebd8be326e8fed1c48641 SHA512 afa8df546234d4e8f89289622448aa42d8c2ba74a0a3a4b13c0ff7bc30fa435a7d6d6e8c9e2a6933cfa23ebdfb4908c865e82c657611defbc16e1f1bf66f9f8c +DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee +DIST str-buf-1.0.6.crate 3828 BLAKE2B 85be4bde1989634b3c9934554aecab4bedfc2c627be119af0d3608e41f3831abad8133b0d008f46656610d019fd0e20665002a1401c080fb5c4c07cb58c6469d SHA512 d7fb6ffd00eb2796bb4f31dab8aa8ed422d5d3dce435d6aa975ec97f4b637db8f62c419eb1f069aa232d22376540057a64f23110cfa660aad45bc41fa0a551d5 +DIST str_indices-0.4.1.crate 17658 BLAKE2B 2b09383bb3c330819d9bd13d72924c924017258538c029d73cab5951ac808789f8c4084df3cefc5d9ba9b69e69e2229305823386008b367ed69cdf42bc20af49 SHA512 3ef64bde04a57e5946854f7b2adc7fb8cd01d885046b0b31d02f2155e3c3b29d2004d55cf69d54c3bbba661487a9dfd351a41144603838cc15391e3dcacf69a0 +DIST syn-1.0.109.crate 237611 BLAKE2B e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9 SHA512 12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d +DIST syn-2.0.15.crate 240785 BLAKE2B ee2a2250e7083770f8fcb5ac0b387a28bab041e56dc9a835bdc366d39830cbd464aec156b47947331864220d78856f74e94c24061bd0c4fc908584efd355bce6 SHA512 19520d13b417ad2cabaf7e31f45271d41f26158607d0ab21e76a04e824133c64f4acba0f8c044c675028832563ed7cc73fd88d519520ef3834008dbb3d04663b +DIST syn-2.0.38.crate 243284 BLAKE2B 660de454989016dbb352c262d5d066ddc663eafcb928a2f62f61e6faf14cceed5cfbc37559e3795e1ce7886c78842be71eaa82ddced0cd6dd99ad99f95ab8ca4 SHA512 84fd4f4bc6de97cdb63a1ee9161daf8fb8fd1fa0f3c3bba4a29c463cd62cffd292c45b8cf17fd0911e580098cadc7b167e4e686595d31d72e7b53ee7df6d5f04 +DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325 +DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39 +DIST tempfile-3.5.0.crate 31129 BLAKE2B 6d32584819794dbbb1f30970577ca2c82cf79979f94b070327285ae8bca6f8e3ea2402d2034290472f284ce039a3a578bfdfa81a53b5c49b587dbdb40960f6fe SHA512 8e8775a9727e32f6931b3289d2b8aefa5ede7b224ae2e1937da3aff371ef5f6078587f060eb36793e9779249992a97acc39c02c6095c41467929e39ada12c7db +DIST tempfile-3.8.0.crate 31720 BLAKE2B ac975555bb4957f91e7d5733ef737bf25c62a738096457afa05079ed038de5e7144cbfd0e28bacd3eeb832de611616fb39ec07866481205c1f5c1005b2869d31 SHA512 8bc8e954bc0c6af46cf6e77d70f93583baea39fce54b111f4bba51fe5d5e5c184753ae2a2ea68a882b6ba5a157a57aeffeecc3e3cae86d78d952f3aa025fdf7f +DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 +DIST termini-1.0.0.crate 14075 BLAKE2B 3b69d3b7518c077b96a9f451efcdb376045aff3bfc2c9d8af5a41d302b68cc633303852a8bcab531d99a2a6820c9dd0bde7193c79a9036263e2007699c0253e3 SHA512 3296af101d3687d3863881e96e0344fa9ec6b14f997791cafef99616af646a71e2369fc3f08e40d08a0a7d25c01a9e17149291dc95ee210e37c501a087ae9f4d +DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3 +DIST textwrap-0.16.1.crate 56012 BLAKE2B 9b5a7c76eca64d089f4fab7095f2d35624527ca223e53b03cc807c6bfe913a99b55197b973a3102e3e5c4055bcd6ab580a0c9d67657180b61435bd6eb7631211 SHA512 3a8d2036c8e4b88866d68b8066a2991756f6bd4ac5c726e63fdffbc894fbdc03bf8b6e0ece4b96684c8e1facb6413190768d51a8539094efe47977c120d31f1b +DIST thiserror-1.0.40.crate 18709 BLAKE2B 8057ebcd11546f8b3ae5d760c1dd1764386f3c29dc43bc7a4aef20604970c65356daef137734e80260051d41e39979943bfda496459696b924a95f455159704c SHA512 db1b1fab3aa61dc6bbc672670eb70cee2f838fa713d3a927022900eddde253108d123bded1aa6df8d314e1aa2f8ff37bc72fc9b0803fe3a56447a64290ab2a91 +DIST thiserror-1.0.50.crate 19414 BLAKE2B a093f66ad191a8c4b15356f8d29578273b36f9f11b5843195eaa15b70bd4c8eaf6dffb631564386acf35a9ddf856e05055b419af52d4e008f582ae444f3dd5d2 SHA512 65605a9cfbc43447a50980739259a45d933f1eb315926dce909892f7162c79bd04bfcee7b38b5a9fa71b24fbe4416d050ae8e2443932577541513a23ebeeac46 +DIST thiserror-1.0.58.crate 21025 BLAKE2B 2915ed6ab691fe94e97a834ce5874d37a388c3240499889cff633ee6c67d46a2ca88098ba40c225ca0e2e3c1ac7bdcfafcfde3dcefc50867e299dc49505d6fc0 SHA512 3cba2d1f4965bc56bac8fc70540d8cd442ab6b8c7d25d328bde7f4cc108535d83c75f293316d730bbd86eb247400b6e35107d610c7caf47f43a28b1f52fed578 +DIST thiserror-impl-1.0.40.crate 15138 BLAKE2B 7590428b5a97efde6a823440a9c91e1d1835b20df4ad8a700c1eeddd98516f1203605853fc6dc65528c5fd92480d04f9a8412aa7c20a524cb94435b0a0032f1d SHA512 9027f2d4127864c34d2d92ad3b2753a95893d26f5b2dcdec869884a98232c5304db1700a38112ced258e5f3832218cdea3a4bb21223098e1b20d06af1fd7edd2 +DIST thiserror-impl-1.0.50.crate 15357 BLAKE2B 41309507014a2c628b7e91d250335070e4cca6c6c452c90ee7e6173bed049df83ca197b37c16537cf15415550919c248e0f6c798aead760e7bbcd25eab701d50 SHA512 8555e010f94390e93ba757bce9ef25d066ed542f23b843db431a66fbab722584ea0ce6c9d4b6f4d92cea3d91c190336abd567c4a0aa4a27893db25720c5b89c9 +DIST thiserror-impl-1.0.58.crate 15645 BLAKE2B 9c6f643a582666ee4eb43330340888e7141f0dd89d927e3345268c3eaca02fa42b018514ef38b3db3ff9722b25ebdd43c36b11ecfc7bcb36950ce2c204ff78e1 SHA512 9bbc623f54c71595e48b33bdb3e4f12eb2e48074b15ebe400d6faab43410b363e5af94df071aaa324c59dc6958173e3c301fd51b216969f095e19cb98a27292b +DIST thread_local-1.1.7.crate 13585 BLAKE2B f497dbcdfaf7dbc8b4b0dd97f77ba93df15b63303e7894c9032c9822a5b8111e0a21db2fa8cfdce5a503f70959ac9cdf48c840b925bdd850dc15e8436ba72379 SHA512 3772452c2a349fb564d29bb06e13c8ae64807db27c3ee217fa04fd0e9847e94adeea582b82ffc2d9116f31ff478eb088550caf1346c263de49b55fa17b431c31 +DIST threadpool-1.8.1.crate 14408 BLAKE2B 8bd64ede19184e18460f6b2ad5bc888d6facd5fcaa5b43c35269e35909c9c68a884203f5c4b92619c097ad48c19ec29f73085755ee348cc637233ff3b5b50ccc SHA512 adaa5aecdeec25848af15b160e5b39833978454d834974211bd586d81837f2ce89e5590f08b7e0d4868346cf57056913a5d41bc8bf92b89109ed769cce4a8be0 +DIST time-0.3.20.crate 111856 BLAKE2B d4fd3d3f9fb164b26317fa26788014419902147c7f17816a09565590245acf72019fb57e88d4f4ad4a399c5dc92247af9e915fc5d2168710f81673ed609a055d SHA512 689099bcd5cfea6b92d88584d92e7c15163f427f621c653026e3b3f8066a3932836de3f8be9716a41b77f1d36a9fa6c3e2a42ab011d21ca38efeb55522a39145 +DIST time-0.3.23.crate 115028 BLAKE2B 2d3782aaad37156d6a51fd98c6f69955410e3bcbd313a4739c4e68260fc0fff4bebb05a02e2a0acc5d68a4f2f9583b0fd8d4d5b7b1cae23fbf99c9eb597fa60a SHA512 cb3671ade408daf3b8f929ec412bc2eaf7cdd2486673269e83c381c277eba8ff04450ebdbc73af35c3abc6a822dde10b767a800434621c697363558a42c88ff3 +DIST time-core-0.1.0.crate 6597 BLAKE2B 43137c5cbeb61a89c1cbbef325f2e2dc4b907d4c576553b202d178a64d46396958745b00c9f2aa60a6eb609d663e48b1f9bd1f7ebe58ff6e22540e96b2b1c7f2 SHA512 f7e181a40a0052d7aedf78219a46f8876618342c710e819748a87a5bc0728e5b2fc7ba08e38ebfa6a17d6fb60382003bb35745ff1eabac1c8f8b47d186a383db +DIST time-core-0.1.1.crate 7197 BLAKE2B 9d0be2ef7111a8b66e5c750b2c372627ae4acfb2c68b0c6ed44b3c23bea1cdca4f65b24d2f2027b4d334667b1620019f4cb8c6d9799c1c2c537e6cfe692ab88a SHA512 a29d6619581d3fed73d6bc66a2c18805b80a3d54197feac5ad987a2c31d003bf4fef88a312d5315d2fa5c7d3e509066a65c1732be2ce280cf937bb4eff012e14 +DIST time-macros-0.2.10.crate 23680 BLAKE2B 44b755081cb2cfe8af1bd4fdcfcedf40e4b37261a9a72a70c45fea72af9eac32dca795002845a0be6b62274ef17fd99ed9a27ffd943b9c9e8b36168949ae0e6a SHA512 b325eaa48c7fcc30a478e05e92b9db15b825e21ae77351941b9557824ffc810aea554c61d4b057fe28f3b209d307e96f1a33dd21b52eefec77857645b88c8654 +DIST time-macros-0.2.8.crate 24295 BLAKE2B 6b54c83b11db8c8490383764a0e6f3a2c3f17c44adab2d19e69dc3fc5b27c5a44bd57bd0e6885c54ae493bd5e2c05a6237f72be93a3a2fbf297c47c02d28c61d SHA512 4e604f926a620b1caeba90bc5de1129f6a6bb4548890d6e31306ac419c7b6d421b548b3887a929da3209fad28cba8d57b989503e52f16af243375d545b5aefde +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST tokio-1.28.1.crate 660516 BLAKE2B f105b7e5bce5dee04bab237186f55df8cc08b10d4145e52c4146fa111ee6127a32efe79a8a401b5c4d7bdcda09c894bf6f355c3b3a82813a59b2eb75be145277 SHA512 b82f4db671136db18696936c137f7244bfa4baa2a4cfee23f7481ec06235ca8a2878f91ded8e77f6c103eaa4af5297662c0db1dde842fb3d3f723df51367595d +DIST tokio-1.33.0.crate 733783 BLAKE2B 6869ecfa08015d61780e0467e4f4063ef14a134d8901c0dbae3ae25fb79a3661916c90b8fd1faa507389abbcb7de4ec493b1c65344b781b2cda48817007a2326 SHA512 49fc49106064a637988619fdc5f949654b64b26e956801cdfcd46d8441bc4825683969bf65421e1466b5e2c8bff7212f738d8d5182980e4133e84d0187999b70 +DIST tokio-1.36.0.crate 757286 BLAKE2B be9fccb7c41fa6a48f500509ce7b7ce0e1c831a5ee51772ed10fdf054b5872395d0037864f10da4d8cd160d15e8dd8e2445446de75b8e8613debd01e530fd0b8 SHA512 0687980dd375965647c89cd6f569f74ded6400dbbf73318f02d8221e8f49a03151a4f023fced542cf63197d7bb150ca45417c10dfd91517d10bafe0d329d6848 +DIST tokio-macros-2.1.0.crate 11472 BLAKE2B ae03d8812bc2b8f833e0ca77f1df8edeb8e0476c06f8f5104fa632ce77369ec54a80ff3da86439192971bf2e11147eade3765c447d76238b768732702004db95 SHA512 e2a24c1befd512d68b5d8b26a3f1d940dd10bfe0979b5d61a71052478d9fd19b28eb7bcbeaca4cf3c9736fd3da0386c899e3a619f47c2d9f7e6b497140586b9d +DIST tokio-macros-2.2.0.crate 11520 BLAKE2B b688669f8bcb44967fe0d3db51fc5d5f86da3cd0c7eb7b5803feb250ea3444d134ecc7f79345f0b947cd3479a46659f3a158a04e0edaaa52deb8d343deac4761 SHA512 7e33fa62e0cf4b829638553a51f849242788d217264437444b3bf478fb40be26800d5cfd954b1bcdca1e5191b3c6c60879050f0f7e707461f7b090ae5025e0c6 +DIST tokio-stream-0.1.14.crate 35881 BLAKE2B ae77512f93bb58c33036c1c0e7b8f29dd1d56274b6168a51b262c39184f0a3d366375414a3fca2a7c6c836f618e236189fdea3dbec39a861155409ffc9a77d3f SHA512 b600ef2dd90e0f46d21e94cd04baba91ec3f586832125cc2f51f350b47e7f9cc1ff5bc7529843347fc60043a61243e5b846d8db8406014969a8935385f161303 +DIST tokio-stream-0.1.15.crate 36284 BLAKE2B e12d50652cb39227da004ce6850413d21294142fff229dede50f2d6736753cce87a6b0d864b0446fd878b4cfbf715ce94a9a7fdde0ca6fceff3d5d5fa402553f SHA512 3e6b0ecedd45fe6333689b9dff06c85a5dd9beae461879278c795782bdad0680c6744cadca9ef64d30abddcf1bc83b04b489768a0777f7c6a621d2ea7cb1328b +DIST toml-0.7.3.crate 47227 BLAKE2B 8e0709bfe7c26e15b0c5ed4f3f908977242a52cf813e6175195b662792baa91f104da357876b711158d4b55b2426228e278cb9a2057de26d9b167d99208d7d04 SHA512 4f3f7534d07e4f5bc14310c4030b89ae3d42c9e6d7a5d3aefa33ff9bab3d73625367fe9c74fd1ccb8350b7bb3a78f1181654e69736cb7280b89e632c29aa81b5 +DIST toml-0.7.6.crate 49220 BLAKE2B 805bd9928fc3d05a1658188d4b858df62347cc93bf870a3846b9509c1dbdfc4123bc29a26019efa04e98699239ca7bb95ce63c802badffd86246266cebc65d7a SHA512 e51c49af63e37d1682892b84e74d48e171591c36dccb26e26bbf136385181ea9cbb94809b8900eae82b15e1cb79f844ae1cf0b00f0a6ac3afd5ebd02d554f9bc +DIST toml-0.8.12.crate 51145 BLAKE2B bbd5b7c536c16b23f26bc520298172a61a61cf72195191d1d3eddcf54ef0ceef781902ad2c0033fab5aed11229400ec537e3cf86c24645a6d111b387ca8d54c7 SHA512 dd8054e20aac5320a2a6a7d47640cc56e48c2b6db01069786382fe5ae19e9b307fe7f4811ce5b8fd283a307c0aabb2b7f57101e05edadf79636785128b5cc265 +DIST toml_datetime-0.6.1.crate 10765 BLAKE2B d31627732a1a70dce5142ecf6dafa2b52e56b7df7d865b64dc477affbb2cdf148fe4acdba84373c4fa1b8bb8de06380e2a105c10fe34e7591683697d78b17c78 SHA512 024fc32f5c3b8efa764bc3fc59af710627513ba2e536f01f227d36661eaee099ed78320ea65b15a15e39c0fc30ff2b44c501f96d5a2618034daeb290524694e0 +DIST toml_datetime-0.6.3.crate 10770 BLAKE2B fc1754eb7c3a7073cfe41e5ccba152ff09891a8de8afe38991cf2dd7b93aacf07f1075fd24d7aa643238cf31e3df1fc3162335b2c475438178b4a4d8a2055471 SHA512 cabf5dce24ed3bf4674008743180a21e86286d999cdce79f934de48b1e1fe0f16a7f3d2498bf059acdb823b51bc01986faf47139f8100ae272e6bd19095cfa9b +DIST toml_datetime-0.6.5.crate 10910 BLAKE2B 93a21ab2784e96ee2e6b56c7b4f733f6ac4c68c1e7d7dac3fbd8aceedb3580e25b4a9c7d9c3f9b5ed152560353b3e80906e37824956dc4ea90bc6f039768f6cb SHA512 502bdedbcbd2ac9fbaa5f4b51f2e409af185f3633f01f8845de5e3b007f2400215ddeb82ac588bc915ed5a5f9d7251ccf93fe2a57cd40fca2927f4c0966357e6 +DIST toml_edit-0.19.12.crate 96151 BLAKE2B 13e6a13543b660d4b4f6e035c63d223016567cb36486e8b9dcca29ef26b3559bbb001e670b8ff444f50fd5b037a745e0890de9bc9c8a8a5c24878d85807ce475 SHA512 79726b5bbe4d350868409f6a9b828a5c9cb0fe48c18461d17943e97accce67d5c5123d49cae8ce8ecf7c2b98fa41a119e6299a2469fc76bfdeb0443f83ba2a30 +DIST toml_edit-0.19.8.crate 94457 BLAKE2B 8fb45302a44f48a5a75db4dd6e3c7c2b3e4cbc357d67e247da36fe631ba66ee64a6786c8a2f9d915a260aa15bafe986ea8085f9dbce5e03fce92330c782b8b65 SHA512 467454b0b55514e039e8049bfe41ffbee7677a0c4fed4cacd96cd8d91d14cbbb2ce77ba3f356d486ddd8deee9b9939ebf519dcb087aa3d5413eb709f7f003ff6 +DIST toml_edit-0.22.8.crate 104016 BLAKE2B 6dcdc076e7662bfbf21096baed32b6a7859311670824eef01b5df21c543f9a7c30c6d17a77a9b2708ba62c9a7d147cb1ab37043deb82817b28480064d3cf6014 SHA512 36f1fab6dd0c7e0d20171cb556b59c683e29aa8fe1bd50d4e745593217bdae467e01ca51a8122623f44bdf0d6fecd24c0f1b4b648e9c48d3985b77f907b54f0e +DIST tree-sitter-0.20.10.crate 134502 BLAKE2B 58b88a985e52e87f7fa6d27da04f46c08bf68368f48e3e5bfb4a584372f66c81ed4c7de4871bb5a109d0a3fde1fa26f99d3ccfca9e1658fba575cc73c48e2294 SHA512 247274c285493886a4ba5e6bc6590f04d6644a0c9a8fe06b2e65f887e2d0dd5475a907d8b2922d9a65055a59534091faab92fb3d245b547420f209bdeb284ea3 +DIST tree-sitter-0.22.2.crate 178270 BLAKE2B 6d76fdc92744923ee4b856954fe18c8c197345181b1ea113f92d53bd82f9718f7681192af5ddd4b146dc1fd1880481603a42fc4bf782366c65cc53da9515c33b SHA512 e5241d0ad6beb7d86f611a4a2aa43461083e37d60ac37455860f5fd21184e17174e147e361ea98b125c8a8d2d7c90921e1f3eee2dde678ec9e6edf4d1b986d2d +DIST unicase-2.6.0.crate 23478 BLAKE2B 6e580108ac81b1cbee70e5bd331f43b12f266dae4f4f758bb8f5f073bd1af61943ee0de34cc27769525b19da8c24f8dea4941d0f5454594ab0cc8b78071ff053 SHA512 7e76a5f344e32c56cf87223585d87a56c79627b52bba0b29eb6de82de874b2964accededa8e9b5741f57944b6750fba5c61e679a50d4fd5a5646f431e2f4f188 +DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9 +DIST unicode-bom-2.0.2.crate 10717 BLAKE2B 9029e45504ff6c535ae6b78a797d5cfb85c2733f16ecacf87abfd69b64460ff75c80eabdb670cec0d8d6d79501879614395db6d7c88ba37584cbfef6bc62a8b8 SHA512 3ba6ac52d2fd356134f0c3be2b29098b189a791b2256d62100687fae07ef9b104be8e7dbc1a496d3f18b3e7349081ca3609d6c1d481dcc2bebd5a4bd52b1197b +DIST unicode-general-category-0.6.0.crate 35177 BLAKE2B 35106d8138989da4950c17cf68d85e492499ebd33e2ea46811a05bf8e9dc740fd8dc75ddff19dc8b8782663b592d35d86f99eac457c8419f2cb603286e1c7713 SHA512 3e4b50b64ce992fa488441105c1264ca84b1f09181e393dfb6843da2f6e2ec294024cf8b62161aa6e8757bedad360ef99b6ca838379c38fba8b08c5da9cce1d5 +DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237 SHA512 8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088 +DIST unicode-linebreak-0.1.4.crate 74962 BLAKE2B 2b6b1f262da1100a06552ae24588a6a1f6d34cd9cf398ff182da48116644807cdfbd703770659d70a375102f9526c77ea3e7fc80e7fe5405ccf93bd8153af518 SHA512 4c4a1cb4d8d9563740a6a5bc8ea5db8bab88b1cfbd751fdf33dbdb3923478a4bb716e3ce7441aca0d84426894834959cbc845f3cc2bc1379c5935019dc3f703d +DIST unicode-linebreak-0.1.5.crate 15324 BLAKE2B dc560d5b36ed01357c22750feb7f09fd0f57fb0ea543180f6e31c0b71b51df4faaa70ac8482f9cd60e5d1faa5bfd4bebfbfd628dd5913c2c4a858ec04beeca3f SHA512 f37be2f7b04b886e95bb7d0f33bd392b78bb940ef9a01cec487062cf31ec0367306650fad7004df556887a324c714eeb28f697044aad9a429ce07b7b7344af60 +DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c +DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014 SHA512 e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b +DIST unicode-segmentation-1.11.0.crate 102740 BLAKE2B 6ab5de53073ff56da4924e8c6ecbfa4bbd72a66b8d86f2c32b2f0ccfefee8064997a6b5311af5de2b71943089c9f52862e3cb13cf366cd645f57c96f2ac8673a SHA512 4914543cf022680f341c4a235f6d9204b3ac9a9098f34a80ee8c94e3d8ccbb82e78af016978eda910987533044593ac629a35286dc80707d349b33e405e86bef +DIST unicode-width-0.1.10.crate 18968 BLAKE2B 6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31 SHA512 9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b +DIST unicode-width-0.1.11.crate 19187 BLAKE2B 6baf7f3b32eb838925e591792abfe11968206d177facefb89ef51daf44c18f3fef1e41c19a47b88b81be50667af626af2024ccc540b240fb6e1d83fdea57076f SHA512 ee06f4144525424327a17578642565f396802f0eea539b3bebc8d9627376a8bc6c5376d83a6ee577068e99fe75815bd765e6d49fb9ab9b253d00594bb15a5ffe +DIST url-2.3.1.crate 72777 BLAKE2B 6ca0e537baf373b92269b2531945c1cdf360f1566cae4734dfb96f05a605e5c6c82e3192a1b9dde0ff22b92b87aba2d56e32a1bf17882b4de15efd7cdf52bc76 SHA512 8224010bef067574481e5d84100d944782d52b49db7c396ae2b4dfc145ed58769c15440d97a0fed4d2f9857592a8601417cc5b1bdea959c47a3e7a1f7182ed0d +DIST url-2.4.1.crate 78228 BLAKE2B 6e324237af50605e9285889d967e6a66e258982c5e78ec99b2df68cbcc555574c0b0d650724ecb015e1065c737c88e3c04205973c35b0afcd63f222e91dde3f9 SHA512 ff2aed100e405f4474e17dcc01d59b63460e7a8babeb7cdcf9df6c1c65216c425e24d557f76c7097702b2befc381656107bef755ce929089b52a3901c46aa185 +DIST url-2.5.0.crate 78605 BLAKE2B f3fec3477248cbbe67866577eebb03f517c284a5e5cb783132b11ef3ad156a03524f4730f188d822dec85169d7474e265099296d6bdd4adf5ffaa0a118821617 SHA512 4aedbc48b85bcc2853189f5fe8265a01c76516b5507f4e958d8d0b860fe2590c69c95f0f4b9fd6fac9b8d5911bcb0a5e9ab7f8e8b600f37a12db1438976ee5c3 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST walkdir-2.3.3.crate 23125 BLAKE2B 3bd354b9796a31bd4c8f4ca695514101a7837ae2134fa1ffec20df1cc946a67b38c6b50affbc2cb79ffee0934474d8269378dab5ac49a4943ccf8c7aaa51db11 SHA512 2b6e1e27c16e310f636eb1c9ee58435509fb8f7a6c5beba4dd13d87aa1d91599a593bfe720a675d536ce63e217c31e240a57122455d8e18de1282a9e7fc3defe +DIST walkdir-2.4.0.crate 23550 BLAKE2B b4298c01cb38be0479b7ddfee627af01f889b6b6ff432e368bb67f65134c3958a4fe271a5a7dd61b19259ae88f5680e5ce8e12e50a872b05fcba68f59b7073ec SHA512 09e1bc852c01b452c95b26a369831a97bc5c9e0ada3111c73774570dd73bb5b9e4735317d5572304fb48dca44ce7b9f77bbd17c418b6b047b2ab17b8bb42d9d9 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.84.crate 172947 BLAKE2B 90c9b846bcea9d099a394b42f126990db82d1dcbe247f8b63f8c91cdfbb5e2d184d36daedaf8fcee58c34afe89bf9a30454063693d64806ead3427680a87e7af SHA512 20f8c9e4f8d81c66e34d9ca2b266fabaae30da9015d139cd4eba3f314c67c17cb562c6eec5127c41302c11c2f314237add2524a8b9a4d5346b8822a37e467b2d +DIST wasm-bindgen-backend-0.2.84.crate 26344 BLAKE2B 5686a252082afe128ded295584d972fe4af11a30fe37a80e142d213eb2e4bca567182bfc5addf1571696bd12e68e029148cffaa9af088d1269a1201af72e64d1 SHA512 afb06e21d916cf1af137159ac86924fbee3a958ef73725bdf6bf205e15465857791070c721e0fc0164eb6e37d195bbb6a3f03661c81e1e5a9ab8502bc3704058 +DIST wasm-bindgen-macro-0.2.84.crate 12857 BLAKE2B 23ae9963cc2cf9bc589f5d77c8d3819aeb9d671f0bddd17093b2df096cc800d2130bd2a994b786a5f446e9194947199b3f0cdf1c16f15e7283a4ae319ca849a1 SHA512 23b69ff601c149909d81200bc2902018ec71efad8aec9cd84a0653025aaf852cc86d93e28c5f60144ba6ce5aeff04b90d23761e263e3783d45097316525d6f43 +DIST wasm-bindgen-macro-support-0.2.84.crate 19076 BLAKE2B 4f779d7d0a406f376092ea8193851dbc86e9dbb822464db66a2022274665b03b9bf6552f79263014510cfaf4284847e98e8173263a6565f1af0c29054bd33fff SHA512 f2a8b6e0170dcea0d2f4a50361f036ad6604c499a89f0cf602578d0958d47c193aecebbd98e63310f592b08f8fe53da6c3d7a124b433ee384aa22371d9c963e5 +DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29 SHA512 fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010 +DIST which-4.4.0.crate 10889 BLAKE2B 3118f923319f260d6574ee0fd28d641f858a1885c3082090f079ca64acd2a3dd996aafd84803f0f2ae2e58b87d5cadf63059d75e72ff836dbf3ebcf4cee82602 SHA512 8380e5ea79f7768c8b1479c2fbb6e6c8b232f3a8d43b6554b78a370f302fb396d53842678d760ce9fc720fe607cfb9da3e0da4180e4a6ecfef48119105555fd7 +DIST which-4.4.1.crate 11466 BLAKE2B 86b791788d53dc329dbff947e93cef3da70cd5af946d856e86d86b0aa61950391a4e030f1d7199d6d190ebf84296114ea9490a184149e9b9541461f7923caef2 SHA512 79ae2265eb316f07a2e403fa9ab65068ea7f23f2216ba59bdf682359f816c16c2d9f9d4618081984182ed7813864c42d2cb160b4cd9039bbd7f1fdb8fcdceaf1 +DIST which-6.0.1.crate 16542 BLAKE2B 20fc6e56405a9774569f315703b2d8f20029c225e7839ad620121aca7e1e0ee3a0295e402b6a0f504d18774f3266b98b56ffcafbda153321b1947f44205ae51e SHA512 6a80b7bf46a7fde1fd4ec6cddb7bafdf9b9878a493fc5fb6ed425827206100bb45850541b42113be43aa7b336a30f98e14a5fa20d09a6411e3f420b96f7273af +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-0.48.0.crate 11864177 BLAKE2B 39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d SHA512 7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c +DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f SHA512 f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47 +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-sys-0.52.0.crate 2576877 BLAKE2B 69d6b560ccfc8f679e2678663ba606060d71fa28efa82c8aef8cceaa2c63b06f2052764d60163964f939649a26bbec6361ee4b094555e941fae92070db566980 SHA512 24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 +DIST windows-targets-0.42.2.crate 5492 BLAKE2B 42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0 SHA512 84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9 +DIST windows-targets-0.48.0.crate 7466 BLAKE2B 4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116 SHA512 1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22 +DIST windows-targets-0.52.0.crate 6229 BLAKE2B 4b1efdd32202f112d3782b586ce60667f5d3b6f97ccae0d7da833aee2ae81ceece88b5ef4126db2448c9019de3f77e4fe66ed4286bb6275d9a5e8ab74725b804 SHA512 0ea09552d89b802ec0d419b640fa02d0af7af602704a0e88ba10f81d123dee0c907460f6ec91224177ec9a948970abd7414740eb219148a4d66c269c2362740e +DIST windows_aarch64_gnullvm-0.42.2.crate 364071 BLAKE2B 97c4e3b2a2dd3f936f9bfcdad23639c9c4c499eed220aec361d26d6013d798efa118e6b298f9cf841ac149d2ae5d58ca653731718450fcf2910bb5f6fa39159f SHA512 75cd7eb1def8ce9d0ff3d7468d2b1cc31cc76c08f981a2460c3d1eb09cff7100d7442863a3591621c1f5f3b3f4badf0b5c95285b6ed583e37283a8403f1095f1 +DIST windows_aarch64_gnullvm-0.48.0.crate 366543 BLAKE2B 9b10f65089fe6da3ff38a1061783f635644ae84f567f891eaced280af68f7ff3919b34289e8850aa34554bb0346903273ff0a7fa743ca8794c2d23a9f1b0185f SHA512 80c5aa74c5669f7acff3882a8e7575f15e8d7cc58c11a1cb731ff423eb9cc9ba43cc6b80e52803c0d44e6a9001655ba87de6f43a9fe858da6d6e3a5c983a2711 +DIST windows_aarch64_gnullvm-0.52.0.crate 430182 BLAKE2B f23370c62c4ab3fd885e3ee22e8ec2fb5a3a837a57044c1df3f9986dd4e7e9d0a44ec58be1648a41e1ea4d037afa3077f0f03de0204199a82fb8395731815a4a SHA512 b7c3fe0a2ad5149be0df48fc7a4d15879eb130bd9441c58c25fc71b8a91483f0b553fb1bf29a9302acd348e9083a547430a840b059b0cfe19867ecaffcae986f +DIST windows_aarch64_msvc-0.42.2.crate 666981 BLAKE2B 9f3cc5592cdede08bcdc1e7c455325279e3b763d96942695e10dccf1dfc37a81c749b69a7d6de883d4c0fa6e8a0d2f578fe2a8d6c42ad8ef6282590bf8fc87b7 SHA512 d2dafa8c94d01c1b65ca1bd631d31f2ef842f1db7accb132ff78c3f8483221b991afd3391563e03dcec42bbc9cbdc0ebdab47b991d25af85b5ba2ac1bbf8db63 +DIST windows_aarch64_msvc-0.48.0.crate 671479 BLAKE2B 0c80f210437628e1d878d1d14e884fea532c7539b3030aa76d46f27d02372c715c6e33d7efdbbd770666472b44a66c30711a33d819ede9cdcd51c96355802d45 SHA512 617e47a7202f1db4dbd3ecea509682135ccd85e3a458c0331b9bc7aa1d84e5756b59c881cb098d5c6d4c951248d13c8253a8e8a50938e1997bd19ceba77262df +DIST windows_aarch64_msvc-0.52.0.crate 821663 BLAKE2B e6f772858205f7cd871722136aec4d00daea4793ff9dcae53e6311e74526c46aa11c2b3df7a85e6c577757254cbfa5a713e68c694625ca274b64e7a1c5532c23 SHA512 8446bfe5b9fe538415762c8129ab3bf2fe45482e045bce367475747786602ad4ae1187c6e508dd9d7b6be81bfc8d430e0db9c624e35c7cc52e823023e46f5cf1 +DIST windows_i686_gnu-0.42.2.crate 736236 BLAKE2B 4ef0496462afc73d9d72af7e5da1e6d3506a92f8172930e88ae64ab97596ffd31c4f97fb969e9b677e30159c27f00a8e756deb006b630fb98ce83f03c8b762e2 SHA512 ad09d650a05cb91cb6b40f59025c023a4c286bc1194586697c506016df2b9b0d5b02606b81687bc634795a0d9a9b8a73e486599328ae09c853e8e5ba662fc59c +DIST windows_i686_gnu-0.48.0.crate 741490 BLAKE2B 5a4a584f8d8ee5bbd2d4c5b6749a66f2d43fc9e4ef90faab2227709b270f0d46fc26578c029edd96877c71309316ddb32d91c39f46d88f9a484c614f866e3dbe SHA512 15149fdd48b61b6d993acd392dbd353d0280d984ea88745217e4207937174bb90cdd9701f69ff0fe06a842f03607cbb57937d20d79ab577181e605a8a8fadc68 +DIST windows_i686_gnu-0.52.0.crate 870285 BLAKE2B a7688062a128a1b1394b3978210334e4e2aaa10dce131457c4a11ce0cb3f551e7f4962d1ece1846d8e9526983ced0e0a3ee8c933858e9314b62e76381e086ef9 SHA512 fe993f5bb6e039c257be9b35337e0221f718d23866818bfd19c76aaae236aafc2de4bb5014fcdf919563b5901cdaa14a2136cd086eeed3c83e46a5d02f6aa77e +DIST windows_i686_msvc-0.42.2.crate 724951 BLAKE2B b084286cd4927efd2889b149abf8a9fe9d3d777130db9e592982660dbf9a96a0f5e723ca121465787aa11877d2d29a5a7d7cf066cdc8fa7e90d7ca7dcb7677f1 SHA512 c1706fc36d4b157c020744a11b3eb5d7dfbf05a0b56775bc717e94b7fd725816b20154fdbcd69ac08dbfb8b8bbfa74fab72d7a9c10399aad6a1cc54cf597e804 +DIST windows_i686_msvc-0.48.0.crate 730056 BLAKE2B 4e4ad6ed94948145199c2ed50fc65e4af08455a0fd058bb0f763d481f30b029f99a2b8dbac087b29e762500a19270f6683baf62ba99d141eb002a5b0b5c8ea05 SHA512 11a50800e709712dbea907275bc0faa46d2eb2969118445ed5b932d9c5957a09592a5b26a40e554c1f5fd56c6d074a07637e6f88eedd2224e1001e62df7b469b +DIST windows_i686_msvc-0.52.0.crate 888693 BLAKE2B 7a6e9d03e503c8f543e80a8c7bcf3f50cfa7eed462e487ae7b581746d7cc4d871b33e307110d3a3a75226d88e837f9452ac56bf3baf71b66cfab2626cc15558a SHA512 817ac796fd00bed51d80133ec873cf3d3d582ba41fec8a6f6407fbd7544f198e928aa5d710f70c13bbf74a1dde4c91c54e65eb9d3b7518a7f011ea42725eb671 +DIST windows_x86_64_gnu-0.42.2.crate 699373 BLAKE2B 01c70809d564b16b268656e47295e99c992d8f9839fac8a51338a0e7c3b9cdcd0429c456ca8c1c139a8c687ed7ed6c43a82250889d881aadaa65bd037223e0a6 SHA512 5767af3c86e717f93137a89d442230e6b60a649057edb3ab104b1f82c0bcd64fe089dcdf2f4fd486a799bece1ddb5f0449641536b678211945e749ae24f35c1f +DIST windows_x86_64_gnu-0.48.0.crate 703595 BLAKE2B b227efb78a99c43d0538cceadada3fa1840df29adc665787fdcf845b73e77d782da8a9f9aa602e1da61401b550d0107176feb6c397c922a6240b38cc8f04a180 SHA512 38eff1164fb37dbd2bbe53404b20cba92de84cbbd5e4eb9ad60d51fb43d6fdb8b87a1488e2c88ebd4b3ff3b708f93fdc05df4b14a285d3ff11c33ff0d9828602 +DIST windows_x86_64_gnu-0.52.0.crate 826213 BLAKE2B 3ca03285ef289fc844261142154e710e996c29940b1c0a7dc3016906ff6452fa50b24f8668fce0ca44bf169ab1228c217fece9f7bddac9ab8bdc54fddafaf8a8 SHA512 2d81af56ad0bc9536f6e066776642a546ce6c6d99551edc0603ffcafe6db15d5d5a32a642b204bbfadf34231daa3894ad7897a9c0c575c2b6bc1e3e58a9a3eb7 +DIST windows_x86_64_gnullvm-0.42.2.crate 364068 BLAKE2B 64bc53e98eb3fc649c9b43a6e734de4e65088e41edacabd49f7afcc5dc6e1065c563ecfc682747dda05978dea2dba4f45c16fcc18c3b00684c3d93681e5a7deb SHA512 d39a8bc948110fe612d3f8d6628b3f0d56620df11d8a49e0fabb6c90389ad407582b3af10e4eab46c79b3d11d2e10753d73d9e55963fbeac085f41e9749bdba3 +DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d1579978045f4058b1a315083a8ab842bddf5800ec3460b1530ad88c3464acab712a229290aca235810de8a3b6a253859a354d9fa97277e58 SHA512 8d82fad4c8445030844708aa026a62f1ca43362b8e15f14b0d226c7e9cda04ffa0715087b6a025dbb738e8891de24fcc4a2df071a532917cf03c4a46f934f396 +DIST windows_x86_64_gnullvm-0.52.0.crate 430165 BLAKE2B af9345a1f6e0ed1392ca1534c68d23f3be0fbb6a42b3c5518cee14373e645038526da15e849d14abe45c53766a30c6c2042a626482ba4a05409f325eb6aa36b1 SHA512 e88af35fd1c694dc189783e5c81aafa61aeffbddce4d7130e1125d0ce3d932fafeb345990ffd98477c41b578b7f5090f4f9c0457b02146309b95549c9f8f44f0 +DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788 +DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795 +DIST windows_x86_64_msvc-0.52.0.crate 821600 BLAKE2B cc448b65f98fc0fc4949ae622b7020d2dae927ae45310649f6ef71809740eda9d3db0fc035676c201fd9ab9639e9e7f21e2e992b4c789542f12b419d2c752179 SHA512 3aaee31533a1a48a6ab5cd15b3cadfbd906a93a153e53919d0aa74e440d11e29830554e4e014c215f5b88a475bb733fa8ba4ce9d773d3e23a40ea9ad37ddd0a7 +DIST winnow-0.4.1.crate 138177 BLAKE2B 9fb55dc5dbca2250c5921aebc42fd8dff7da6fc70656d5690475cf9d81d569b01e68c5134401f70759a9edbe1704cf76727efe5442961b1d220827130497b735 SHA512 390b3da6688d61d90d9bb221d95c7243968209b692737999b13326204954d1e916b390ac8a3a0e0864695ad9a073ed8a79e592ca565be374cc6e909b4166d52a +DIST winnow-0.4.6.crate 142565 BLAKE2B 671c643bdf03d8533998224bccb375614bbc0192e3d9b45a580db9aea04f60f1f5fada06c454e705bfc1f82bc52067db8d3d45cec1e898c6ace689845cb21884 SHA512 cf194bfa3e6ca3a79b6940cb3a9fbbcdac2b10f997a0c15f58b570281c4651a6b3f4a32df6ee4da579d6cbb40b19b38d1123b6f7fc116f1171bb5f51270f6698 +DIST winnow-0.5.17.crate 147147 BLAKE2B 09adb991e02214666f6e2117bddd144b2ff6c93a044387d86cd01a37593c9c191a8e74e53be482805e31e4dd60ecb5f7228c010492993695e55fd8cad994e261 SHA512 632b9610a41626103583e7981f2621b79cecccb7cb4c9e003538be19f9f12dae0c4a3d94fcd55a3b0f62e7305d6de56668a6d672fa9739bf044cd30db8c093bc +DIST winnow-0.6.5.crate 159316 BLAKE2B d28c6a069e3d557335c09ae04f1d90a9086b1744d711e259da230c031a0302e270e304f8f9e8bc690c01cedcf07b46e05938ab3468b3e388ae8c51ac361b6408 SHA512 5395db16797beb158e9458099279abf53c5ea62c65584bbb9e0111213ab21c88cd0b0674062757e57ceb6c762a349f22db6ef60deef866fe15ebb0818287ab99 +DIST winsafe-0.0.19.crate 492820 BLAKE2B 4eba26861f85f668e134b08c60e9522b698aed61eaa5e6d4e89ef31c1b97953fa08a5157add52d9a306075df4ad97e9aaf1767eea4208b72401ec0bc1c3eb0e9 SHA512 0555ec74c5acbb69ab08e54d920094e806258079bffaff3f90297bb94a000c7da36d6eba0eae445d425c781465235dd70a198437cf83a1f113438bfd9baf4c21 +DIST zerocopy-0.7.11.crate 91526 BLAKE2B ace55fa19ffe035ab9afdd47627284bc1fdcf097ee025d00d7b9b940a53d01c04f373bd89e5b35a823d43e14eda71499b6d1b94d38f9054a4d388b656aaa7401 SHA512 25313e2ba7865251ed45b9541f98bb91667fff7696d1b93b5df3634f79d1afdb210401e049426129ad0e524c4e94427656114e70e441767e611306491451fc74 +DIST zerocopy-0.7.31.crate 151100 BLAKE2B 0363306c4b0f024bf87d8d689bfa63b7a12fcbf670cfb07a27a69d5b8269c38eadb73319b8788842d292bc73eb41a2a16820cb265cdf40f6a1f9dade3aa44d5c SHA512 672c71003c26a6cae1fc0704e13210b20055e66ccb1682e590effda094ab6c0409d56060c7dc8e94e4a0295b55e476f50bd2145096cbdad7b14c4abf613a251e +DIST zerocopy-derive-0.7.11.crate 523743 BLAKE2B c112d9078d0cb8c69e4d8f287cd3bc362f673f4e615d7810211d344e41f022fd90c975b112661981a3bcbb4be234c56328648c7902650a1b399be2c586b74bf1 SHA512 245ce3fc87886440d9c6b68f1e4553ac6c8ce076186546b83990f1591cf2614779fcc53035e62d5eb594493b2c565f4df071876335ed4c87d93437fb91755071 +DIST zerocopy-derive-0.7.31.crate 533507 BLAKE2B e0872636d43956d1405e296f51f313989b1cddd9911adc5f1c2a59274f9668003356bbc942cbe7f339d7173f8caca8378e7ba11461c181fa1b51e582bf833a5f SHA512 33a0e2b1045c6f584fd67c34a64d4262c848090acbeafbc75e4c553ec2e2d14dcb70285a1a2d840257757b1836fdb44778737aa06199cd4e831ac74623932827 diff --git a/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch b/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch new file mode 100644 index 000000000000..bb108f000b2f --- /dev/null +++ b/app-editors/helix/files/helix-23.10-tree-sitter-gemini-path.patch @@ -0,0 +1,23 @@ +From 41eca94bb6bf3642b1cdb80e89845813a9d03edc Mon Sep 17 00:00:00 2001 +From: Nimrod <ndh42@cornell.edu> +Date: Mon, 27 Nov 2023 20:31:20 -0500 +Subject: [PATCH] Update git source of Gemini grammar + +The author's username changed from "sfr" to "nbsp" +--- + languages.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/languages.toml b/languages.toml +index ef4687af8a71..33b27626e720 100644 +--- a/languages.toml ++++ b/languages.toml +@@ -2916,7 +2916,7 @@ file-types = ["gmi"] + + [[grammar]] + name = "gemini" +-source = { git = "https://git.sr.ht/~sfr/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" } ++source = { git = "https://git.sr.ht/~nbsp/tree-sitter-gemini", rev = "3cc5e4bdf572d5df4277fc2e54d6299bd59a54b3" } + + [[language]] + name = "templ" diff --git a/app-editors/helix/helix-23.05.ebuild b/app-editors/helix/helix-23.05.ebuild new file mode 100644 index 000000000000..74e224996d9b --- /dev/null +++ b/app-editors/helix/helix-23.05.ebuild @@ -0,0 +1,312 @@ +# Copyright 2023-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CRATES=" + adler-1.0.2 + ahash-0.7.6 + ahash-0.8.3 + aho-corasick-0.7.20 + aho-corasick-1.0.1 + android_system_properties-0.1.5 + anyhow-1.0.71 + arc-swap-1.6.0 + autocfg-1.1.0 + bitflags-1.3.2 + bitflags-2.2.1 + bstr-1.4.0 + btoi-0.4.3 + bumpalo-3.12.0 + bytecount-0.6.3 + bytes-1.4.0 + cassowary-0.3.0 + cc-1.0.79 + cfg-if-1.0.0 + chardetng-0.1.17 + chrono-0.4.24 + clipboard-win-4.5.0 + clru-0.6.1 + codespan-reporting-0.11.1 + content_inspector-0.2.4 + core-foundation-sys-0.8.4 + crc32fast-1.3.2 + crossterm-0.26.1 + crossterm_winapi-0.9.0 + cxx-1.0.94 + cxx-build-1.0.94 + cxxbridge-flags-1.0.94 + cxxbridge-macro-1.0.94 + dunce-1.0.4 + either-1.8.1 + encoding_rs-0.8.32 + encoding_rs_io-0.1.7 + errno-0.3.1 + errno-dragonfly-0.1.2 + error-code-2.3.1 + etcetera-0.8.0 + fastrand-1.9.0 + fern-0.6.2 + filetime-0.2.21 + flate2-1.0.25 + fnv-1.0.7 + form_urlencoded-1.1.0 + futures-core-0.3.28 + futures-executor-0.3.28 + futures-task-0.3.28 + futures-util-0.3.28 + fuzzy-matcher-0.3.7 + getrandom-0.2.9 + gix-0.44.1 + gix-actor-0.20.0 + gix-attributes-0.12.0 + gix-bitmap-0.2.3 + gix-chunk-0.4.1 + gix-command-0.2.4 + gix-config-0.22.0 + gix-config-value-0.12.0 + gix-credentials-0.14.0 + gix-date-0.5.0 + gix-diff-0.29.0 + gix-discover-0.18.1 + gix-features-0.29.0 + gix-fs-0.1.1 + gix-glob-0.7.0 + gix-hash-0.11.1 + gix-hashtable-0.2.0 + gix-ignore-0.2.0 + gix-index-0.16.0 + gix-lock-5.0.0 + gix-mailmap-0.12.0 + gix-object-0.29.1 + gix-odb-0.45.0 + gix-pack-0.35.0 + gix-path-0.8.0 + gix-prompt-0.5.0 + gix-quote-0.4.3 + gix-ref-0.29.1 + gix-refspec-0.10.1 + gix-revision-0.13.0 + gix-sec-0.8.0 + gix-tempfile-5.0.2 + gix-traverse-0.25.0 + gix-url-0.18.0 + gix-utils-0.1.1 + gix-validate-0.7.4 + gix-worktree-0.17.0 + globset-0.4.10 + grep-matcher-0.1.6 + grep-regex-0.1.11 + grep-searcher-0.1.11 + hashbrown-0.12.3 + hashbrown-0.13.2 + hermit-abi-0.2.6 + hermit-abi-0.3.1 + hex-0.4.3 + home-0.5.4 + iana-time-zone-0.1.56 + iana-time-zone-haiku-0.1.1 + idna-0.3.0 + ignore-0.4.20 + imara-diff-0.1.5 + indexmap-1.9.3 + indoc-2.0.1 + instant-0.1.12 + io-close-0.3.7 + io-lifetimes-1.0.10 + itoa-1.0.6 + js-sys-0.3.61 + kstring-2.0.0 + lazy_static-1.4.0 + libc-0.2.144 + libloading-0.8.0 + link-cplusplus-1.0.8 + linux-raw-sys-0.3.4 + lock_api-0.4.9 + log-0.4.17 + lsp-types-0.94.0 + memchr-2.5.0 + memmap2-0.5.10 + minimal-lexical-0.2.1 + miniz_oxide-0.6.2 + mio-0.8.6 + nom-7.1.3 + num-integer-0.1.45 + num-traits-0.2.15 + num_cpus-1.15.0 + num_threads-0.1.6 + once_cell-1.17.1 + parking_lot-0.12.1 + parking_lot_core-0.9.7 + percent-encoding-2.2.0 + pin-project-lite-0.2.9 + pin-utils-0.1.0 + proc-macro2-1.0.56 + prodash-23.1.2 + pulldown-cmark-0.9.2 + quickcheck-1.0.3 + quote-1.0.26 + rand-0.8.5 + rand_core-0.6.4 + redox_syscall-0.2.16 + redox_syscall-0.3.5 + regex-1.8.1 + regex-automata-0.1.10 + regex-syntax-0.6.29 + regex-syntax-0.7.1 + ropey-1.6.0 + rustix-0.37.15 + ryu-1.0.13 + same-file-1.0.6 + scopeguard-1.1.0 + scratch-1.0.5 + serde-1.0.163 + serde_derive-1.0.163 + serde_json-1.0.96 + serde_repr-0.1.12 + serde_spanned-0.6.1 + sha1_smol-1.0.0 + signal-hook-0.3.15 + signal-hook-mio-0.2.3 + signal-hook-registry-1.4.1 + signal-hook-tokio-0.3.1 + slab-0.4.8 + slotmap-1.0.6 + smallvec-1.10.0 + smartstring-1.0.1 + smawk-0.3.1 + socket2-0.4.9 + static_assertions-1.1.0 + str-buf-1.0.6 + str_indices-0.4.1 + syn-1.0.109 + syn-2.0.15 + tempfile-3.5.0 + termcolor-1.2.0 + termini-1.0.0 + textwrap-0.16.0 + thiserror-1.0.40 + thiserror-impl-1.0.40 + thread_local-1.1.7 + threadpool-1.8.1 + time-0.3.20 + time-core-0.1.0 + time-macros-0.2.8 + tinyvec-1.6.0 + tinyvec_macros-0.1.1 + tokio-1.28.1 + tokio-macros-2.1.0 + tokio-stream-0.1.14 + toml-0.7.3 + toml_datetime-0.6.1 + toml_edit-0.19.8 + tree-sitter-0.20.10 + unicase-2.6.0 + unicode-bidi-0.3.13 + unicode-bom-2.0.2 + unicode-general-category-0.6.0 + unicode-ident-1.0.8 + unicode-linebreak-0.1.4 + unicode-normalization-0.1.22 + unicode-segmentation-1.10.1 + unicode-width-0.1.10 + url-2.3.1 + version_check-0.9.4 + walkdir-2.3.3 + wasi-0.11.0+wasi-snapshot-preview1 + wasm-bindgen-0.2.84 + wasm-bindgen-backend-0.2.84 + wasm-bindgen-macro-0.2.84 + wasm-bindgen-macro-support-0.2.84 + wasm-bindgen-shared-0.2.84 + which-4.4.0 + winapi-0.3.9 + winapi-i686-pc-windows-gnu-0.4.0 + winapi-util-0.1.5 + winapi-x86_64-pc-windows-gnu-0.4.0 + windows-0.48.0 + windows-sys-0.45.0 + windows-sys-0.48.0 + windows-targets-0.42.2 + windows-targets-0.48.0 + windows_aarch64_gnullvm-0.42.2 + windows_aarch64_gnullvm-0.48.0 + windows_aarch64_msvc-0.42.2 + windows_aarch64_msvc-0.48.0 + windows_i686_gnu-0.42.2 + windows_i686_gnu-0.48.0 + windows_i686_msvc-0.42.2 + windows_i686_msvc-0.48.0 + windows_x86_64_gnu-0.42.2 + windows_x86_64_gnu-0.48.0 + windows_x86_64_gnullvm-0.42.2 + windows_x86_64_gnullvm-0.48.0 + windows_x86_64_msvc-0.42.2 + windows_x86_64_msvc-0.48.0 + winnow-0.4.1 +" + +inherit bash-completion-r1 cargo desktop xdg + +DESCRIPTION="A post-modern text editor" +HOMEPAGE=" + https://helix-editor.com/ + https://github.com/helix-editor/helix +" +SRC_URI=" + https://github.com/helix-editor/helix/releases/download/${PV}/${P}-source.tar.xz -> ${P}.tar.xz + $(cargo_crate_uris) +" + +S="${WORKDIR}" + +LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+grammar" + +QA_FLAGS_IGNORED=" + usr/bin/hx + usr/share/helix/runtime/grammars/.*\.so +" + +DOCS=( + README.md + CHANGELOG.md + book/ + docs/ +) + +src_compile() { + use grammar || local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1 + + cargo_src_compile +} + +src_install() { + cargo_src_install --path helix-term + + rm -r runtime/grammars/.gitkeep || die + rm -r runtime/grammars/sources || die + + insinto /usr/share/helix + doins -r runtime + + dodoc -r "${DOCS[@]}" + + doicon -s 256x256 contrib/${PN}.png + domenu contrib/Helix.desktop + + insinto /usr/share/metainfo + doins contrib/Helix.appdata.xml + + newbashcomp contrib/completion/hx.bash hx + + insinto /usr/share/zsh/site-functions + newins contrib/completion/hx.zsh _hx + + insinto /usr/share/fish/vendor_completions.d + doins contrib/completion/hx.fish + + newenvd - 99helix <<< 'HELIX_RUNTIME="/usr/share/helix/runtime"' +} diff --git a/app-editors/helix/helix-23.10-r2.ebuild b/app-editors/helix/helix-23.10-r2.ebuild new file mode 100644 index 000000000000..e28a697c495b --- /dev/null +++ b/app-editors/helix/helix-23.10-r2.ebuild @@ -0,0 +1,344 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.10 + +EAPI=8 + +CRATES=" + addr2line@0.20.0 + adler@1.0.2 + ahash@0.8.5 + aho-corasick@0.7.20 + aho-corasick@1.0.2 + allocator-api2@0.2.14 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anyhow@1.0.75 + arc-swap@1.6.0 + autocfg@1.1.0 + backtrace@0.3.68 + bitflags@1.3.2 + bitflags@2.4.1 + bstr@1.6.0 + btoi@0.4.3 + bumpalo@3.12.0 + bytecount@0.6.3 + bytes@1.4.0 + cassowary@0.3.0 + cc@1.0.83 + cfg-if@1.0.0 + chardetng@0.1.17 + chrono@0.4.31 + clipboard-win@4.5.0 + clru@0.6.1 + codespan-reporting@0.11.1 + content_inspector@0.2.4 + core-foundation-sys@0.8.4 + cov-mark@1.1.0 + crc32fast@1.3.2 + crossbeam-channel@0.5.8 + crossbeam-deque@0.8.3 + crossbeam-epoch@0.9.15 + crossbeam-utils@0.8.16 + crossterm@0.27.0 + crossterm_winapi@0.9.1 + cxx-build@1.0.94 + cxx@1.0.94 + cxxbridge-flags@1.0.94 + cxxbridge-macro@1.0.94 + dirs-sys@0.4.1 + dirs@5.0.1 + dunce@1.0.4 + either@1.8.1 + encoding_rs@0.8.33 + encoding_rs_io@0.1.7 + equivalent@1.0.0 + errno-dragonfly@0.1.2 + errno@0.3.1 + error-code@2.3.1 + etcetera@0.8.0 + faster-hex@0.8.1 + fastrand@2.0.0 + fern@0.6.2 + filedescriptor@0.8.2 + flate2@1.0.27 + fnv@1.0.7 + form_urlencoded@1.2.0 + futures-core@0.3.28 + futures-executor@0.3.28 + futures-task@0.3.28 + futures-util@0.3.28 + getrandom@0.2.9 + gimli@0.27.3 + gix-actor@0.28.0 + gix-chunk@0.4.4 + gix-commitgraph@0.22.0 + gix-config-value@0.14.0 + gix-config@0.31.0 + gix-date@0.8.0 + gix-diff@0.37.0 + gix-discover@0.26.0 + gix-features@0.36.0 + gix-fs@0.8.0 + gix-glob@0.14.0 + gix-hash@0.13.1 + gix-hashtable@0.4.0 + gix-lock@11.0.0 + gix-macros@0.1.0 + gix-object@0.38.0 + gix-odb@0.54.0 + gix-pack@0.44.0 + gix-path@0.10.0 + gix-quote@0.4.7 + gix-ref@0.38.0 + gix-refspec@0.19.0 + gix-revision@0.23.0 + gix-revwalk@0.9.0 + gix-sec@0.10.0 + gix-tempfile@11.0.0 + gix-trace@0.1.3 + gix-traverse@0.34.0 + gix-url@0.25.1 + gix-utils@0.1.5 + gix-validate@0.8.0 + gix@0.55.2 + globset@0.4.13 + grep-matcher@0.1.6 + grep-regex@0.1.11 + grep-searcher@0.1.11 + hashbrown@0.12.3 + hashbrown@0.14.2 + hermit-abi@0.2.6 + home@0.5.4 + iana-time-zone-haiku@0.1.1 + iana-time-zone@0.1.56 + idna@0.4.0 + ignore@0.4.20 + imara-diff@0.1.5 + indexmap@2.0.0 + indoc@2.0.4 + itoa@1.0.6 + js-sys@0.3.61 + lazy_static@1.4.0 + libc@0.2.149 + libloading@0.8.1 + link-cplusplus@1.0.8 + linux-raw-sys@0.4.10 + lock_api@0.4.9 + log@0.4.20 + lsp-types@0.94.1 + memchr@2.6.3 + memmap2@0.5.10 + memmap2@0.7.1 + memoffset@0.9.0 + miniz_oxide@0.7.1 + mio@0.8.6 + nucleo-matcher@0.2.0 + nucleo@0.2.1 + num-traits@0.2.15 + num_cpus@1.15.0 + num_threads@0.1.6 + object@0.31.1 + once_cell@1.18.0 + option-ext@0.2.0 + parking_lot@0.12.1 + parking_lot_core@0.9.7 + percent-encoding@2.3.0 + pin-project-lite@0.2.12 + pin-utils@0.1.0 + proc-macro2@1.0.69 + prodash@26.2.2 + pulldown-cmark@0.9.3 + quickcheck@1.0.3 + quote@1.0.29 + rand@0.8.5 + rand_core@0.6.4 + rayon-core@1.11.0 + rayon@1.7.0 + redox_syscall@0.2.16 + redox_syscall@0.3.5 + redox_users@0.4.3 + regex-automata@0.3.9 + regex-automata@0.4.3 + regex-syntax@0.6.29 + regex-syntax@0.8.2 + regex@1.10.2 + ropey@1.6.1 + rustc-demangle@0.1.23 + rustix@0.38.20 + ryu@1.0.13 + same-file@1.0.6 + scopeguard@1.1.0 + scratch@1.0.5 + serde@1.0.189 + serde_derive@1.0.189 + serde_json@1.0.107 + serde_repr@0.1.12 + serde_spanned@0.6.3 + sha1_smol@1.0.0 + signal-hook-mio@0.2.3 + signal-hook-registry@1.4.1 + signal-hook-tokio@0.3.1 + signal-hook@0.3.17 + slab@0.4.8 + slotmap@1.0.6 + smallvec@1.11.1 + smartstring@1.0.1 + smawk@0.3.1 + socket2@0.5.3 + static_assertions@1.1.0 + str-buf@1.0.6 + str_indices@0.4.1 + syn@1.0.109 + syn@2.0.38 + tempfile@3.8.0 + termcolor@1.2.0 + termini@1.0.0 + textwrap@0.16.0 + thiserror-impl@1.0.50 + thiserror@1.0.50 + thread_local@1.1.7 + threadpool@1.8.1 + time-core@0.1.1 + time-macros@0.2.10 + time@0.3.23 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-macros@2.1.0 + tokio-stream@0.1.14 + tokio@1.33.0 + toml@0.7.6 + toml_datetime@0.6.3 + toml_edit@0.19.12 + tree-sitter@0.20.10 + unicase@2.6.0 + unicode-bidi@0.3.13 + unicode-bom@2.0.2 + unicode-general-category@0.6.0 + unicode-ident@1.0.8 + unicode-linebreak@0.1.5 + unicode-normalization@0.1.22 + unicode-segmentation@1.10.1 + unicode-width@0.1.11 + url@2.4.1 + version_check@0.9.4 + walkdir@2.3.3 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.84 + wasm-bindgen-macro-support@0.2.84 + wasm-bindgen-macro@0.2.84 + wasm-bindgen-shared@0.2.84 + wasm-bindgen@0.2.84 + which@4.4.1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.45.0 + windows-sys@0.48.0 + windows-targets@0.42.2 + windows-targets@0.48.0 + windows@0.48.0 + windows_aarch64_gnullvm@0.42.2 + windows_aarch64_gnullvm@0.48.0 + windows_aarch64_msvc@0.42.2 + windows_aarch64_msvc@0.48.0 + windows_i686_gnu@0.42.2 + windows_i686_gnu@0.48.0 + windows_i686_msvc@0.42.2 + windows_i686_msvc@0.48.0 + windows_x86_64_gnu@0.42.2 + windows_x86_64_gnu@0.48.0 + windows_x86_64_gnullvm@0.42.2 + windows_x86_64_gnullvm@0.48.0 + windows_x86_64_msvc@0.42.2 + windows_x86_64_msvc@0.48.0 + winnow@0.4.6 + winnow@0.5.17 + zerocopy-derive@0.7.11 + zerocopy@0.7.11 +" + +inherit cargo desktop shell-completion xdg + +DESCRIPTION="A post-modern text editor" +HOMEPAGE=" + https://helix-editor.com/ + https://github.com/helix-editor/helix +" +SRC_URI=" + https://github.com/helix-editor/helix/releases/download/${PV}/${P}-source.tar.xz -> ${P}.tar.xz + ${CARGO_CRATE_URIS} +" + +S="${WORKDIR}" + +LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +KEYWORDS="amd64" +IUSE="+grammar" + +BDEPEND="grammar? ( dev-vcs/git )" +RDEPEND="dev-vcs/git" + +QA_FLAGS_IGNORED=" + usr/bin/hx + usr/share/helix/runtime/grammars/.*\.so +" + +DOCS=( + README.md + CHANGELOG.md + book/ + docs/ +) + +PATCHES=( + "${FILESDIR}/helix-23.10-tree-sitter-gemini-path.patch" +) + +src_compile() { + use grammar || local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1 + + cargo_src_compile +} + +src_install() { + cargo_src_install --path helix-term + + rm -r runtime/grammars/.gitkeep || die + rm -r runtime/grammars/sources || die + + insinto /usr/share/helix + doins -r runtime + + dodoc -r "${DOCS[@]}" + + doicon -s 256x256 contrib/${PN}.png + domenu contrib/Helix.desktop + + insinto /usr/share/metainfo + doins contrib/Helix.appdata.xml + + newbashcomp contrib/completion/hx.bash hx + newzshcomp contrib/completion/hx.zsh _hx + dofishcomp contrib/completion/hx.fish + + newenvd - 99helix <<< 'HELIX_RUNTIME="/usr/share/helix/runtime"' +} + +pkg_postinst() { + einfo "The runtime files (grammars, queries, themes) have been" + einfo "installed in '/usr/share/helix/runtime'. The environment variable" + einfo "HELIX_RUNTIME was also installed on your system. In running shell instances" + einfo "you need to run 'source /etc/profile' to pick up the new variable" + einfo "or manually set the environment variable HELIX_RUNTIME=/usr/share/helix/runtime." + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/app-editors/helix/helix-24.03.ebuild b/app-editors/helix/helix-24.03.ebuild new file mode 100644 index 000000000000..b989a0d04ed8 --- /dev/null +++ b/app-editors/helix/helix-24.03.ebuild @@ -0,0 +1,353 @@ +# Copyright 2024-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Autogenerated by pycargoebuild 0.13.2 + +EAPI=8 + +CRATES=" + addr2line@0.20.0 + adler@1.0.2 + ahash@0.8.11 + aho-corasick@1.1.2 + allocator-api2@0.2.14 + android-tzdata@0.1.1 + android_system_properties@0.1.5 + anyhow@1.0.81 + arc-swap@1.7.1 + autocfg@1.1.0 + backtrace@0.3.68 + bitflags@1.3.2 + bitflags@2.5.0 + bstr@1.8.0 + bumpalo@3.12.0 + bytes@1.4.0 + cassowary@0.3.0 + cc@1.0.90 + cfg-if@1.0.0 + chardetng@0.1.17 + chrono@0.4.35 + clipboard-win@5.3.0 + clru@0.6.1 + codespan-reporting@0.11.1 + content_inspector@0.2.4 + core-foundation-sys@0.8.4 + cov-mark@1.1.0 + crc32fast@1.3.2 + crossbeam-channel@0.5.8 + crossbeam-deque@0.8.3 + crossbeam-epoch@0.9.15 + crossbeam-utils@0.8.16 + crossterm@0.27.0 + crossterm_winapi@0.9.1 + cxx-build@1.0.94 + cxx@1.0.94 + cxxbridge-flags@1.0.94 + cxxbridge-macro@1.0.94 + dunce@1.0.4 + either@1.9.0 + encoding_rs@0.8.33 + encoding_rs_io@0.1.7 + equivalent@1.0.0 + errno@0.3.8 + error-code@3.0.0 + etcetera@0.8.0 + faster-hex@0.9.0 + fastrand@2.0.1 + fern@0.6.2 + filedescriptor@0.8.2 + filetime@0.2.23 + flate2@1.0.27 + fnv@1.0.7 + form_urlencoded@1.2.1 + futures-core@0.3.30 + futures-executor@0.3.30 + futures-task@0.3.30 + futures-util@0.3.30 + getrandom@0.2.9 + gimli@0.27.3 + gix-actor@0.31.1 + gix-attributes@0.22.2 + gix-bitmap@0.2.11 + gix-chunk@0.4.8 + gix-command@0.3.6 + gix-commitgraph@0.24.2 + gix-config-value@0.14.6 + gix-config@0.36.0 + gix-date@0.8.5 + gix-diff@0.42.0 + gix-discover@0.31.0 + gix-features@0.38.1 + gix-filter@0.11.0 + gix-fs@0.10.1 + gix-glob@0.16.2 + gix-hash@0.14.2 + gix-hashtable@0.5.2 + gix-ignore@0.11.2 + gix-index@0.31.1 + gix-lock@13.0.0 + gix-macros@0.1.4 + gix-object@0.42.1 + gix-odb@0.59.0 + gix-pack@0.49.0 + gix-packetline-blocking@0.17.3 + gix-path@0.10.7 + gix-pathspec@0.7.2 + gix-quote@0.4.12 + gix-ref@0.43.0 + gix-refspec@0.23.0 + gix-revision@0.27.0 + gix-revwalk@0.13.0 + gix-sec@0.10.6 + gix-submodule@0.10.0 + gix-tempfile@13.0.0 + gix-trace@0.1.8 + gix-traverse@0.38.0 + gix-url@0.27.2 + gix-utils@0.1.11 + gix-validate@0.8.4 + gix-worktree@0.32.0 + gix@0.61.0 + globset@0.4.14 + grep-matcher@0.1.7 + grep-regex@0.1.12 + grep-searcher@0.1.13 + hashbrown@0.12.3 + hashbrown@0.14.3 + hermit-abi@0.2.6 + home@0.5.9 + iana-time-zone-haiku@0.1.1 + iana-time-zone@0.1.56 + idna@0.5.0 + ignore@0.4.22 + imara-diff@0.1.5 + indexmap@2.0.0 + indoc@2.0.5 + is-docker@0.2.0 + is-wsl@0.4.0 + itoa@1.0.6 + js-sys@0.3.61 + kstring@2.0.0 + libc@0.2.153 + libloading@0.8.3 + link-cplusplus@1.0.8 + linux-raw-sys@0.4.12 + lock_api@0.4.9 + log@0.4.21 + lsp-types@0.95.1 + memchr@2.6.3 + memmap2@0.9.0 + memoffset@0.9.0 + miniz_oxide@0.7.1 + mio@0.8.11 + nucleo-matcher@0.2.0 + nucleo@0.2.1 + num-traits@0.2.15 + num_cpus@1.15.0 + num_threads@0.1.6 + object@0.31.1 + once_cell@1.19.0 + open@5.1.2 + parking_lot@0.12.1 + parking_lot_core@0.9.7 + pathdiff@0.2.1 + percent-encoding@2.3.1 + pin-project-lite@0.2.12 + pin-utils@0.1.0 + proc-macro2@1.0.76 + prodash@28.0.0 + pulldown-cmark@0.10.0 + quickcheck@1.0.3 + quote@1.0.35 + rand@0.8.5 + rand_core@0.6.4 + rayon-core@1.11.0 + rayon@1.7.0 + redox_syscall@0.2.16 + redox_syscall@0.4.1 + regex-automata@0.4.5 + regex-cursor@0.1.4 + regex-syntax@0.8.2 + regex@1.10.4 + ropey@1.6.1 + rustc-demangle@0.1.23 + rustix@0.38.32 + ryu@1.0.13 + same-file@1.0.6 + scopeguard@1.1.0 + scratch@1.0.5 + serde@1.0.197 + serde_derive@1.0.197 + serde_json@1.0.114 + serde_repr@0.1.12 + serde_spanned@0.6.5 + sha1_smol@1.0.0 + shell-words@1.1.0 + signal-hook-mio@0.2.3 + signal-hook-registry@1.4.1 + signal-hook-tokio@0.3.1 + signal-hook@0.3.17 + slab@0.4.8 + slotmap@1.0.7 + smallvec@1.13.2 + smartstring@1.0.1 + smawk@0.3.1 + socket2@0.5.5 + static_assertions@1.1.0 + str_indices@0.4.1 + syn@1.0.109 + syn@2.0.48 + tempfile@3.10.1 + termcolor@1.2.0 + termini@1.0.0 + textwrap@0.16.1 + thiserror-impl@1.0.58 + thiserror@1.0.58 + threadpool@1.8.1 + time-core@0.1.1 + time-macros@0.2.10 + time@0.3.23 + tinyvec@1.6.0 + tinyvec_macros@0.1.1 + tokio-macros@2.2.0 + tokio-stream@0.1.15 + tokio@1.36.0 + toml@0.8.12 + toml_datetime@0.6.5 + toml_edit@0.22.8 + tree-sitter@0.22.2 + unicase@2.6.0 + unicode-bidi@0.3.13 + unicode-bom@2.0.2 + unicode-general-category@0.6.0 + unicode-ident@1.0.8 + unicode-linebreak@0.1.5 + unicode-normalization@0.1.22 + unicode-segmentation@1.11.0 + unicode-width@0.1.11 + url@2.5.0 + version_check@0.9.4 + walkdir@2.4.0 + wasi@0.11.0+wasi-snapshot-preview1 + wasm-bindgen-backend@0.2.84 + wasm-bindgen-macro-support@0.2.84 + wasm-bindgen-macro@0.2.84 + wasm-bindgen-shared@0.2.84 + wasm-bindgen@0.2.84 + which@6.0.1 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + winapi@0.3.9 + windows-sys@0.45.0 + windows-sys@0.48.0 + windows-sys@0.52.0 + windows-targets@0.42.2 + windows-targets@0.48.0 + windows-targets@0.52.0 + windows@0.48.0 + windows_aarch64_gnullvm@0.42.2 + windows_aarch64_gnullvm@0.48.0 + windows_aarch64_gnullvm@0.52.0 + windows_aarch64_msvc@0.42.2 + windows_aarch64_msvc@0.48.0 + windows_aarch64_msvc@0.52.0 + windows_i686_gnu@0.42.2 + windows_i686_gnu@0.48.0 + windows_i686_gnu@0.52.0 + windows_i686_msvc@0.42.2 + windows_i686_msvc@0.48.0 + windows_i686_msvc@0.52.0 + windows_x86_64_gnu@0.42.2 + windows_x86_64_gnu@0.48.0 + windows_x86_64_gnu@0.52.0 + windows_x86_64_gnullvm@0.42.2 + windows_x86_64_gnullvm@0.48.0 + windows_x86_64_gnullvm@0.52.0 + windows_x86_64_msvc@0.42.2 + windows_x86_64_msvc@0.48.0 + windows_x86_64_msvc@0.52.0 + winnow@0.6.5 + winsafe@0.0.19 + zerocopy-derive@0.7.31 + zerocopy@0.7.31 +" + +inherit cargo desktop shell-completion xdg + +DESCRIPTION="A post-modern text editor" +HOMEPAGE=" + https://helix-editor.com/ + https://github.com/helix-editor/helix +" +SRC_URI=" + https://github.com/helix-editor/helix/releases/download/${PV}/${P}-source.tar.xz -> ${P}.tar.xz + ${CARGO_CRATE_URIS} +" + +S="${WORKDIR}" + +LICENSE="0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+grammar" + +BDEPEND="grammar? ( dev-vcs/git )" +RDEPEND="dev-vcs/git" + +QA_FLAGS_IGNORED=" + usr/bin/hx + usr/share/helix/runtime/grammars/.*\.so +" + +DOCS=( + README.md + CHANGELOG.md + book/ + docs/ +) + +src_compile() { + use grammar || local -x HELIX_DISABLE_AUTO_GRAMMAR_BUILD=1 + + cargo_src_compile +} + +src_install() { + cargo_src_install --path helix-term + + rm -r runtime/grammars/.gitkeep || die + rm -r runtime/grammars/sources || die + + insinto /usr/share/helix + doins -r runtime + + dodoc -r "${DOCS[@]}" + + doicon -s 256x256 contrib/${PN}.png + domenu contrib/Helix.desktop + + insinto /usr/share/metainfo + doins contrib/Helix.appdata.xml + + newbashcomp contrib/completion/hx.bash hx + newzshcomp contrib/completion/hx.zsh _hx + dofishcomp contrib/completion/hx.fish + + newenvd - 99helix <<< 'HELIX_RUNTIME="/usr/share/helix/runtime"' +} + +pkg_postinst() { + einfo "The runtime files (grammars, queries, themes) have been" + einfo "installed in '/usr/share/helix/runtime'. The environment variable" + einfo "HELIX_RUNTIME was also installed on your system. In running shell instances" + einfo "you need to run 'source /etc/profile' to pick up the new variable" + einfo "or manually set the environment variable HELIX_RUNTIME=/usr/share/helix/runtime." + xdg_desktop_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update +} diff --git a/app-editors/helix/metadata.xml b/app-editors/helix/metadata.xml new file mode 100644 index 000000000000..07edb24ed94b --- /dev/null +++ b/app-editors/helix/metadata.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>chutzpah@gentoo.org</email> + <name>Patrick McLean</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>freijon@pm.me</email> + <name>Jonas Frei</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="grammar">Build and install grammar language files</flag> + </use> + <upstream> + <bugs-to>https://github.com/helix-editor/helix/issues</bugs-to> + <changelog>https://github.com/helix-editor/helix/commits/master</changelog> + <remote-id type="github">helix-editor/helix</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest index 792220b96ded..949cb6d596a1 100644 --- a/app-editors/hexedit/Manifest +++ b/app-editors/hexedit/Manifest @@ -1 +1 @@ -DIST hexedit-1.2.13.src.tgz 68778 BLAKE2B 377c4f0008f6e3b54e4cf2e0249fa344b684b11a6acea9daf7d8e6585524f9d11a4eb199d5289a57a72be5efbdf3060cc47269aad1d218784e7679a469ca4f50 SHA512 df9afb0b9b965e20ea8c427c1986b0200216601b157862199c35bae9e201ccc478ab0bfecd39d0dfaa85bf582f1cf372b0134fadcfeacf4734805a6e6dcaa2bb +DIST hexedit-1.6.tar.gz 31085 BLAKE2B e576de6aaed35449adbc430c95e8ba3a8ccfba587ef5c4d347d95b84c9764cb644323af23d46ff16429b93e0348c8d310afbad482219aa1b2c1b582332bd06fe SHA512 9783406f253a67fe048ec12306df1a601b7ba92cd7a0399ad2f103aed5a3164cd21ad7c1d547a4c55192cfb7da2b2517152015a4c3db402a9217548b435f602d diff --git a/app-editors/hexedit/files/hexedit-1.2.13-tinfo.patch b/app-editors/hexedit/files/hexedit-1.2.13-tinfo.patch deleted file mode 100644 index 86e7dba4e88e..000000000000 --- a/app-editors/hexedit/files/hexedit-1.2.13-tinfo.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -37,6 +37,7 @@ - AC_CHECK_LIB(curses, initscr, LIBS="$LIBS -lcurses", - AC_CHECK_LIB(ncurses, initscr, LIBS="$LIBS -lncurses") - ) -+AC_SEARCH_LIBS(nodelay, tinfo) - AC_CHECK_FUNC(use_default_colors, - AC_DEFINE(HAVE_COLORS, , "Define if you want colored (fruit salad) display option") - ) diff --git a/app-editors/hexedit/hexedit-1.2.13.ebuild b/app-editors/hexedit/hexedit-1.6.ebuild index d0b42fcc75f5..605cb66f658d 100644 --- a/app-editors/hexedit/hexedit-1.2.13.ebuild +++ b/app-editors/hexedit/hexedit-1.6.ebuild @@ -1,31 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools DESCRIPTION="View and edit files in hex or ASCII" HOMEPAGE="http://rigaux.org/hexedit.html" -SRC_URI="http://rigaux.org/${P}.src.tgz" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 +EGIT_REPO_URI="https://github.com/pixel/hexedit.git" +else +SRC_URI="https://github.com/pixel/hexedit/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +fi LICENSE="GPL-2" SLOT="0" -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}" -S="${WORKDIR}"/${PN} - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.13-tinfo.patch -) - src_prepare() { default - - mv configure.in configure.ac || die eautoreconf } diff --git a/app-editors/hexedit/metadata.xml b/app-editors/hexedit/metadata.xml index 001997549c54..c51d7729677b 100644 --- a/app-editors/hexedit/metadata.xml +++ b/app-editors/hexedit/metadata.xml @@ -5,4 +5,11 @@ <email>tomjbe@gentoo.org</email> <name>Thomas Beierlein</name> </maintainer> + <maintainer type="person"> + <email>dlan@gentoo.org</email> + <name>Yixun Lan</name> + </maintainer> + <upstream> + <remote-id type="github">pixel/hexedit</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild index d74e18c724cd..652a062b5597 100644 --- a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild +++ b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild @@ -1,27 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 MY_P=${P/editor} -DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable files" -HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/" +DESCRIPTION="File viewer, editor and analyzer for text, binary, and executable files" +HOMEPAGE="https://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/" #SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2" # tarball is done as: 'make dist' and then rename to mention latest commt SRC_URI="https://dev.gentoo.org/~sam/distfiles/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ppc ppc64 ~riscv x86" IUSE="X" RDEPEND="sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2" DEPEND="${RDEPEND} - virtual/yacc - sys-devel/flex" + app-alternatives/yacc + app-alternatives/lex" DOCS=( AUTHORS ChangeLog KNOWNBUGS README TODO ) diff --git a/app-editors/hyx/Manifest b/app-editors/hyx/Manifest new file mode 100644 index 000000000000..8505c8b69dda --- /dev/null +++ b/app-editors/hyx/Manifest @@ -0,0 +1 @@ +DIST hyx-2021.06.09.tar.xz 13864 BLAKE2B 2c97364e1ae185e7dd63fdfb452637cb68b8ab0d76d0009ce515d6f0fe709d38b910f86dfa465ac6843c88feb997dfdc3c736e21bb0b4265a39440c054f75251 SHA512 43f990e29ce097f8e2378a4511a3097e2576fd72e16f3b5c81688702487c8715e7189cb4a368e344c5440a90a1c759d2f76e7831ab401fa814f7e5ff7e145bd8 diff --git a/app-editors/hyx/files/hyx-ldflags.patch b/app-editors/hyx/files/hyx-ldflags.patch new file mode 100644 index 000000000000..714e76a795db --- /dev/null +++ b/app-editors/hyx/files/hyx-ldflags.patch @@ -0,0 +1,27 @@ +diff -Naur hyx-2021.06.09.org/Makefile hyx-2021.06.09/Makefile +--- hyx-2021.06.09.org/Makefile 2021-06-09 18:09:18.000000000 +0200 ++++ hyx-2021.06.09/Makefile 2022-08-31 08:20:27.711819466 +0200 +@@ -1,18 +1,19 @@ + + all: CFLAGS ?= -O2 -Wl,-s \ +- -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all +-all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG ++ -std=c99 -pedantic -Wall -Wextra -DNDEBUG ++all: LDFLAGS ?= -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all + all: hyx + + debug: CFLAGS ?= -O0 -g \ + -fsanitize=undefined \ +- -Wl,-z,relro,-z,now -fpic -pie -fstack-protector-all +-debug: CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror ++ -std=c99 -pedantic -Wall -Wextra -Werror ++debug: LDFLAGS ?= -Wl,-z,relro,-z,now -fpic -pie -fstack-protector-all + debug: hyx + + hyx: *.h *.c + $(CC) \ + $(CFLAGS) \ ++ $(LDFLAGS) \ + hyx.c common.c blob.c history.c view.c input.c \ + -o hyx + diff --git a/app-editors/hyx/hyx-2021.06.09.ebuild b/app-editors/hyx/hyx-2021.06.09.ebuild new file mode 100644 index 000000000000..4877bc384b3b --- /dev/null +++ b/app-editors/hyx/hyx-2021.06.09.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="A minimalistic console hex editor with vim-like controls" +HOMEPAGE="https://yx7.cc/code/" +SRC_URI="https://yx7.cc/code/hyx/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 x86" + +PATCHES=( + # Avoid complaining about not respecting LDFLAGS + "${FILESDIR}/${PN}-ldflags.patch" +) + +src_compile() { + CC=$(tc-getCC) emake +} + +src_install() { + dobin hyx +} diff --git a/app-editors/le/metadata.xml b/app-editors/hyx/metadata.xml index 9eb3e811ea8e..daba394f5855 100644 --- a/app-editors/le/metadata.xml +++ b/app-editors/hyx/metadata.xml @@ -2,8 +2,8 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> - <email>gentoo@schellstede.de</email> - <name>Gerold Schellstede</name> + <email>mario.haustein@hrz.tu-chemnitz.de</email> + <name>Mario Haustein</name> </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild index b6d09c14ac20..8cfbe0462f16 100644 --- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild +++ b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r4.ebuild @@ -17,7 +17,7 @@ S="${WORKDIR}/me${PV:2}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="gui nanoemacs xpm" RDEPEND="sys-libs/ncurses:0= diff --git a/app-editors/jed/jed-0.99.19-r1.ebuild b/app-editors/jed/jed-0.99.19-r1.ebuild index 2eef627357ee..8b113486d5e2 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-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,7 +40,7 @@ src_prepare() { src_configure() { econf \ $(use_enable gpm) \ - $(use_enable xft) \ + $(usex gui $(use_enable xft) --disable-xft) \ JED_ROOT="${EPREFIX}"/usr/share/jed } diff --git a/app-editors/jed/metadata.xml b/app-editors/jed/metadata.xml index aff74631c869..a66165354832 100644 --- a/app-editors/jed/metadata.xml +++ b/app-editors/jed/metadata.xml @@ -12,4 +12,7 @@ Jed has a multitude of programming modes and couples with the Slang library for powerful extensions. </longdescription> +<upstream> + <remote-id type="github">jedsoft/jed</remote-id> +</upstream> </pkgmetadata> diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest index e18bb3da8221..f97cbc3f22ea 100644 --- a/app-editors/jedit/Manifest +++ b/app-editors/jedit/Manifest @@ -1,2 +1 @@ -DIST jedit5.2.0source.tar.bz2 2456541 BLAKE2B 82723b5e5670324fe3acff6d6958a83331bf67ab5453eaa1109de192586e4bcce3832456fdfd493e233f30ccbbf256e48b60398f256d9cf4c0cc366816d8b23f SHA512 5af99ac864dd70701f24435840e26f73077ba02d155319965122bd24871e6825b82383054d29dfec72bbbedaac72bfb2d86097de6a0c79341f0a279dacd60126 -DIST jedit5.4.0source.tar.bz2 2535992 BLAKE2B 1560f680437e89cea789f2b0540225b0cbf92bc22f975c6d1850a7b3aa06a2b95d61a254fd0d4c0e7da916ee9de3a095ab5190ae5df3ad27e55c2f0ccef57db2 SHA512 2120370c54f8bd415f90b979c42bfca6101f76ba33f0ec6a8172adeb33173ba9c73cbd7f06b5dc8c12aa3eedf51f007752cdbf0c7423d77a1ac591beb5493112 +DIST jedit5.6.0source.tar.bz2 2572329 BLAKE2B d9815feef6fb03cb4a15e7101383944776ca593884de6965aaa3e74a411f8915d0542ab62be8e4551e04dd410c1da4ebedfb8a2c2869d33eb205100d6bd84352 SHA512 89e65998ea49b5b3da4f1daad001d7cf763e196e7110b604e99e3fad038ca126cf108a471ee611ef76b5491b91d618f47cdc24b270cabccb6a80858a37720af7 diff --git a/app-editors/jedit/files/jedit-5.2.0-build-xml.patch b/app-editors/jedit/files/jedit-5.2.0-build-xml.patch deleted file mode 100644 index da0a91d54d22..000000000000 --- a/app-editors/jedit/files/jedit-5.2.0-build-xml.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4dc53a4c320af0894bd600c77d4432c414cdee16 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sat, 8 Aug 2015 00:05:20 +0200 -Subject: [PATCH] Do not have target "build" call target "test" - ---- - build.xml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/build.xml b/build.xml -index f34934f..da5272a 100644 ---- a/build.xml -+++ b/build.xml -@@ -504,7 +504,6 @@ - </copy> - </contrib:then> - </contrib:if> -- <antcall target="test" /> - </target> - - <target name="build-exe-launcher" --- -2.5.0 - diff --git a/app-editors/jedit/files/jedit-5.4.0-build-xml.patch b/app-editors/jedit/files/jedit-5.4.0-build-xml.patch deleted file mode 100644 index 6a686a6f4a72..000000000000 --- a/app-editors/jedit/files/jedit-5.4.0-build-xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build.xml -+++ b/build.xml -@@ -505,7 +505,7 @@ - </target> - - <target name="build" -- depends="init,retrieve,setup,compile,test" -+ depends="init,retrieve,setup,compile" - description="build the jEdit JAR-file with full debug-information"> - <mkdir dir="${jar.location}"/> - <jar destfile="${jar.location}/${jar.filename}" diff --git a/app-editors/jedit/files/jedit-5.6.0-skip-failing-test.patch b/app-editors/jedit/files/jedit-5.6.0-skip-failing-test.patch new file mode 100644 index 000000000000..628e944136db --- /dev/null +++ b/app-editors/jedit/files/jedit-5.6.0-skip-failing-test.patch @@ -0,0 +1,36 @@ +# There was 1 failure: +# 1) abbreviateUserHomeWindows(org.gjt.sp.jedit.MiscUtilitiesTest) +# java.lang.AssertionError +# at org.junit.Assert.fail(Assert.java:87) +# at org.junit.Assert.assertTrue(Assert.java:42) +# at org.junit.Assert.assertTrue(Assert.java:53) +# at org.gjt.sp.jedit.MiscUtilitiesTest.abbreviateUserHomeWindows(MiscUtilitiesTest.java:227) +# +# FAILURES!!! +# Tests run: 353, Failures: 1 +--- a/test/org/gjt/sp/jedit/MiscUtilitiesTest.java ++++ b/test/org/gjt/sp/jedit/MiscUtilitiesTest.java +@@ -24,6 +24,7 @@ package org.gjt.sp.jedit; + import org.junit.After; + import org.junit.BeforeClass; + import org.junit.Test; ++import org.junit.Ignore; + import org.junit.runner.RunWith; + import org.mockito.Mock; + import org.mockito.junit.MockitoJUnitRunner; +@@ -218,7 +219,7 @@ public class MiscUtilitiesTest + assertEquals("${" + key, MiscUtilities.expandVariables("${" + key)); + } + +- @Test ++ @Test @Ignore + public void abbreviateUserHomeWindows() throws Exception + { + updateOS(WINDOWS_NT); +@@ -736,4 +737,4 @@ public class MiscUtilitiesTest + os.set(OperatingSystem.class, newValue); + return oldValue; + } +-} +\ No newline at end of file ++} diff --git a/app-editors/jedit/jedit-5.2.0-r1.ebuild b/app-editors/jedit/jedit-5.2.0-r1.ebuild deleted file mode 100644 index e6ff8beafda0..000000000000 --- a/app-editors/jedit/jedit-5.2.0-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -JAVA_PKG_IUSE="doc test" - -inherit epatch java-pkg-2 java-ant-2 xdg-utils - -DESCRIPTION="Programmer's editor written in Java" -HOMEPAGE="http://www.jedit.org" -SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2" - -LICENSE="BSD GPL-2" -KEYWORDS="amd64 ppc64 x86" -SLOT="0" -IUSE="" - -CDEPEND=" - dev-java/bsh:0 - dev-java/jsr305:0 - dev-java/ant-contrib:0 - dev-java/ant-apache-bsf:0" - -RDEPEND=" - ${CDEPEND} - >=virtual/jre-1.7" - -DEPEND=" - ${CDEPEND} - >=virtual/jdk-1.7" - -S="${WORKDIR}/jEdit" - -JEDIT_HOME="/usr/share/${PN}" - -java_prepare() { - mkdir -p lib/{ant-contrib,compile,default-plugins,scripting} || die - - epatch "${FILESDIR}"/${P}-build-xml.patch - - java-ant_xml-rewrite -f "${S}/build.xml" -c \ - -e javadoc \ - -a failonerror \ - -v no || die -} - -JAVA_ANT_REWRITE_CLASSPATH="true" - -EANT_ANT_TASKS="ant-apache-bsf ant-contrib bsh" -EANT_GENTOO_CLASSPATH="jsr305" -EANT_EXTRA_ARGS="-Divy.jar.present=true -Divy.done=true" -EANT_BUILD_TARGET="build" -# TODO could build more docs, ie generate-doc-faq generate-doc-news -# generate-doc-users-guide ua. -EANT_DOC_TARGET="generate-javadoc" -# in fact needed only for docs, but shouldn't hurt -EANT_NEEDS_TOOLS="true" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - dodir ${JEDIT_HOME} - - cp -R build/${PN}.jar jars doc keymaps macros modes properties startup \ - "${D}${JEDIT_HOME}" || die - - java-pkg_regjar "${JEDIT_HOME}/${PN}.jar" - - java-pkg_dolauncher "${PN}" --main org.gjt.sp.jedit.jEdit - - use doc && java-pkg_dojavadoc build/classes/javadoc/api - - make_desktop_entry ${PN} \ - jEdit \ - ${JEDIT_HOME}/doc/${PN}.png \ - "Development;Utility;TextEditor" - - # keep the plugin directory - keepdir ${JEDIT_HOME}/jars -} - -pkg_postinst() { - xdg_desktop_database_update - elog "The system directory for jEdit plugins is" - elog "${JEDIT_HOME}/jars" - elog "If you get plugin related errors on startup, first try updating them." -} - -pkg_postrm() { - if [[ -z ${REPLACED_BY_VERSION} ]]; then - xdg_desktop_database_update - elog "jEdit plugins installed into /usr/share/jedit/jars" - elog "(after installation of jEdit itself) haven't been" - elog "removed. To get rid of jEdit completely, you may" - elog "want to run" - elog "" - elog " rm -r ${JEDIT_HOME}" - fi -} diff --git a/app-editors/jedit/jedit-5.4.0.ebuild b/app-editors/jedit/jedit-5.4.0.ebuild deleted file mode 100644 index c4a52eee362a..000000000000 --- a/app-editors/jedit/jedit-5.4.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc test" -inherit desktop java-pkg-2 java-ant-2 xdg-utils - -DESCRIPTION="Programmer's editor written in Java" -HOMEPAGE="http://www.jedit.org" -SRC_URI="mirror://sourceforge/${PN}/${PN}${PV}source.tar.bz2" - -LICENSE="BSD GPL-2" -KEYWORDS="amd64 ~ppc64 x86" -SLOT="0" - -CP_DEPEND="dev-java/jsr305:0" - -RDEPEND=" - ${CP_DEPEND} - >=virtual/jre-1.8" - -DEPEND=" - ${CP_DEPEND} - >=virtual/jdk-1.8 - dev-java/ant-contrib:0 - dev-java/ant-apache-bsf:0 - dev-java/bsh:0 - test? ( - dev-java/ant-junit:0 - dev-java/hamcrest-library:1.3 - )" - -S="${WORKDIR}/jEdit" - -JEDIT_HOME="/usr/share/${PN}" - -src_prepare() { - mkdir -p lib/{ant-contrib,compile,default-plugins,scripting,test} || die - - eapply "${FILESDIR}"/${P}-build-xml.patch - - java-ant_xml-rewrite -f "${S}/build.xml" -c \ - -e javadoc \ - -a failonerror \ - -v no || die - - java-pkg-2_src_prepare -} - -JAVA_ANT_REWRITE_CLASSPATH="true" - -EANT_ANT_TASKS="ant-apache-bsf ant-contrib bsh" -EANT_TEST_GENTOO_CLASSPATH="hamcrest-library-1.3" -EANT_EXTRA_ARGS="-Divy.jar.present=true -Divy.done=true" -EANT_BUILD_TARGET="build" -# TODO could build more docs, ie generate-doc-faq generate-doc-news -# generate-doc-users-guide ua. -EANT_DOC_TARGET="generate-javadoc" -# in fact needed only for docs, but shouldn't hurt -EANT_NEEDS_TOOLS="true" - -src_test() { - java-pkg-2_src_test -} - -src_install() { - dodir ${JEDIT_HOME} - - cp -R build/${PN}.jar jars doc keymaps macros modes properties startup \ - "${D}${JEDIT_HOME}" || die - - java-pkg_regjar "${JEDIT_HOME}/${PN}.jar" - - java-pkg_dolauncher "${PN}" --main org.gjt.sp.jedit.jEdit - - use doc && java-pkg_dojavadoc build/classes/javadoc/api - - make_desktop_entry ${PN} \ - jEdit \ - ${JEDIT_HOME}/doc/${PN}.png \ - "Development;Utility;TextEditor" - - # keep the plugin directory - keepdir ${JEDIT_HOME}/jars -} - -pkg_postinst() { - xdg_desktop_database_update - elog "The system directory for jEdit plugins is" - elog "${JEDIT_HOME}/jars" - elog "If you get plugin related errors on startup, first try updating them." -} - -pkg_postrm() { - if [[ -z ${REPLACED_BY_VERSION} ]]; then - xdg_desktop_database_update - elog "jEdit plugins installed into /usr/share/jedit/jars" - elog "(after installation of jEdit itself) haven't been" - elog "removed. To get rid of jEdit completely, you may" - elog "want to run" - elog "" - elog " rm -r ${JEDIT_HOME}" - fi -} diff --git a/app-editors/jedit/jedit-5.6.0-r1.ebuild b/app-editors/jedit/jedit-5.6.0-r1.ebuild new file mode 100644 index 000000000000..ff797fc8ae3e --- /dev/null +++ b/app-editors/jedit/jedit-5.6.0-r1.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit desktop java-pkg-2 java-pkg-simple xdg-utils + +DESCRIPTION="Programmer's editor written in Java" +HOMEPAGE="https://www.jedit.org" +SRC_URI="mirror://sourceforge/project/jedit/jedit/${PV}/jedit${PV}source.tar.bz2" +S="${WORKDIR}/jEdit" + +LICENSE="BSD GPL-2" +KEYWORDS="amd64 ppc64 x86" +SLOT="0" + +BDEPEND=" + app-text/docbook-xsl-stylesheets:0 + dev-libs/libxslt:0 +" +CP_DEPEND="dev-java/jsr305:0" +DEPEND="${CP_DEPEND} + >=virtual/jdk-11:* + test? ( + dev-java/hamcrest:0 + dev-java/mockito:2 + )" +RDEPEND="${CP_DEPEND} + >=virtual/jre-11:*" + +PATCHES=( "${FILESDIR}/jedit-5.6.0-skip-failing-test.patch" ) + +JAVA_MAIN_CLASS="org.gjt.sp.jedit.jEdit" +JAVA_RESOURCE_DIRS="resources" +JAVA_SRC_DIR="src" +JAVA_TEST_GENTOO_CLASSPATH=" + hamcrest + junit-4 + mockito-2 +" +JAVA_TEST_SRC_DIR="test" +JEDIT_HOME="/usr/share/${PN}/lib" + +src_prepare() { + default #780585 + java-pkg-2_src_prepare + mkdir -v src resources || die + find org doclet -type f -name '*.java' \ + | xargs cp --parent -t "${JAVA_SRC_DIR}" || die + find org -type f \ + ! -name '*.java' \ + ! -name 'package.html' \ + ! -name 'README.html' \ + ! -name 'jedit.manifest' \ + ! -name 'Reflect.last' \ + ! -name 'bsh.jj*' \ + ! -name '*.scripted' \ + | xargs cp --parent -t "${JAVA_RESOURCE_DIRS}" || die + + einfo "Creating the docs" + mv doc/{FAQ,whatsnew} . || die + mkdir doc/{FAQ,whatsnew} || die + # build.xml 734-804 + xsltproc \ + -xinclude \ + -o doc/FAQ/ \ + doc/jedithtml.xsl \ + FAQ/faq.xml || die + xsltproc \ + -o doc/whatsnew/ \ + doc/jedithtml.xsl \ + whatsnew/news.xml || die + + einfo "Creating users-guide" + ln -s /usr/share/sgml/docbook/ . || die + # This is the part which does not work with xmlto. So we use xsltproc. + # TODO: + # Try "XIncludes with Xalan and Xerces" according to + # http://www.sagehill.net/docbookxsl/Xinclude.html#d0e40343 + xsltproc \ + -xinclude \ + -o doc/users-guide/users-guide.html \ + docbook/xsl-stylesheets/html/docbook.xsl \ + doc/jedithtml.xsl \ + doc/users-guide/users-guide.xml || die + # Cleanup. The xml files were processed and need not get installed. + rm doc/users-guide/*.xml || die +} + +src_install() { + java-pkg-simple_src_install + # The application wants all this stuff in /usr/share/jedit/lib/ + # Using java-pkg_dolauncher with --pwd cannot solve it. + # If we change the location the application fails to start: + # "System keymap folder do not exist, your installation is broken." + cp -R jars doc keymaps macros modes properties startup \ + "${D}${JEDIT_HOME}" || die + + make_desktop_entry "${PN}" jEdit \ + "${JEDIT_HOME}/doc/${PN}.png" \ + "Development;Utility;TextEditor" + + # keep the plugin directory + keepdir "${JEDIT_HOME}/jars" +} + +pkg_postinst() { + xdg_desktop_database_update + elog "The system directory for jEdit plugins is" + elog "${JEDIT_HOME}/jars" + elog "If you get plugin related errors on startup, first try updating them." +} + +pkg_postrm() { + if [[ -z ${REPLACED_BY_VERSION} ]]; then + xdg_desktop_database_update + elog "jEdit plugins installed into /usr/share/jedit/jars" + elog "(after installation of jEdit itself) haven't been" + elog "removed. To get rid of jEdit completely, you may" + elog "want to run" + elog "" + elog " rm -r ${JEDIT_HOME}" + fi +} diff --git a/app-editors/joe/Manifest b/app-editors/joe/Manifest index 15f8bc779608..8bb267823845 100644 --- a/app-editors/joe/Manifest +++ b/app-editors/joe/Manifest @@ -1,4 +1 @@ -DIST joe-4.2.tar.gz 1341048 BLAKE2B 112163e67311051dad8714e19cdee1a11ff3bbe297341c89a4023f7d68fac7eecde57d1d522f72407b0a77c227c7af424ce20567c0c47dea6c14ac41f2f2301b SHA512 7c34f4467d89330ac195cfa76481d9ede4ee3764d0b1b24d091d1e6325bff451d2a9bc9f86a73404c9909587bcbe3e0c14511b739ec121edb7595ea1fcba028f -DIST joe-4.3.tar.gz 1270523 BLAKE2B 442e05dd29a0a8d4a26500c89a2cafee88bf2d1ed00a4cb539d940e2e849456e6c4c5bf347b4803ee02ab38311b225cc8034177a1e0b7a1967a2629fd283b7e2 SHA512 a711ce129518863856b8f581ac7acdd7661f5e571cb77c5411317e0db0344c9ba44e73ec2ca9a307e639170a7914d53352eebcd00a33c9270809551f12376e69 -DIST joe-4.4.tar.gz 1350062 BLAKE2B eb58117e313ef4abc31026a2800f2b9258c12d0d865c768138ec42a97c1f7fedcd8e397f7aaf13f8bb3776f2571d5a85e27ea7f9a6fbd6710d935a2b80afcd1f SHA512 ef31443dda30569c5193cd1907e06f1caba349f746dedf3611b5527080e49a4026001d3d06629f3c9c712ae9265866efbdbba6f51d110c0e6ee95f39f0e3059d DIST joe-4.6.tar.gz 1895046 BLAKE2B fbf53d3b5b066cb32bb26b08d7d314a3bb89ac5ae22db498cdf3597bf8cb322bd9aa05543debd47ac7380a33982c388e13f38c60747503494c582393ae8eb13d SHA512 3dd64a994fb3d352a12bf027ef16d57d14ac2577fd63fb6b6e25cae46052befaa7c15dc029bff2f8c3275df90f0343bd46313601055d97277ea4540e109fbe82 diff --git a/app-editors/joe/files/joe-4.6-c99.patch b/app-editors/joe/files/joe-4.6-c99.patch new file mode 100644 index 000000000000..8d7a64a6419f --- /dev/null +++ b/app-editors/joe/files/joe-4.6-c99.patch @@ -0,0 +1,59 @@ +https://bugs.gentoo.org/900164 +Patch from https://sourceforge.net/p/joe-editor/mercurial/merge-requests/3/ + +commit 26e83257075789d901cadbe280ff7f1bd7602983 +Authored by: Nikita Popov 2023-01-31 + + Port to C99 + + Ensure that functions are declared before use for compatibility + with newer compiler versions. + +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -9,7 +9,7 @@ + int main() { + int a = 0; + isblank(a++); +- exit(a != 1); ++ return a != 1; + } + ], + [joe_cv_isblank=yes], +@@ -34,7 +34,7 @@ + #endif + int main() { + /* exit succesfully if setpgrp() takes two args (*BSD systems) */ +- exit(setpgrp(0, 0) != 0); ++ return setpgrp(0, 0) != 0; + }], + [joe_cv_setpgrp_void=no], + [joe_cv_setpgrp_void=yes], +@@ -95,7 +95,7 @@ + kill((int)getpid(), SIGINT); + kill((int)getpid(), SIGINT); + /* exit succesfully if don't have to reinstall sighandler when invoked */ +- exit(nsigint != 2); ++ return nsigint != 2; + }], + [joe_cv_reinstall_sighandlers=no], + [joe_cv_reinstall_sighandlers=yes], +--- a/joe/selinux.c ++++ b/joe/selinux.c +@@ -6,6 +6,7 @@ + + #ifdef WITH_SELINUX + #include <selinux/selinux.h> ++#include <error.h> + static int selinux_enabled = -1; + #endif + +@@ -108,7 +109,7 @@ + return 0; + + if (setfscreatecon(0) < 0) { +- error(0, errno, joe_gettext(_("Could not reset default security context"))); ++ error(0, errno, "%s", joe_gettext(_("Could not reset default security context"))); + return 1; + } + #endif diff --git a/app-editors/joe/files/joe-4.6-prototypes.patch b/app-editors/joe/files/joe-4.6-prototypes.patch new file mode 100644 index 000000000000..f37d18f650ab --- /dev/null +++ b/app-editors/joe/files/joe-4.6-prototypes.patch @@ -0,0 +1,409 @@ + +Bug: https://bugs.gentoo.org/870769 + +Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com> + +--- joe-4.6/joe/b.c ++++ joe-4.6-prototypes/joe/b.c +@@ -23,8 +23,6 @@ + #endif + #endif + +-extern int errno; +- + #ifdef WITH_SELINUX + #include <selinux/selinux.h> + static int selinux_enabled = -1; +@@ -147,7 +145,7 @@ static void pfree(P *p) + B bufs = { {&bufs, &bufs} }; + static B frebufs = { {&frebufs, &frebufs} }; + +-void set_file_pos_orphaned() ++void set_file_pos_orphaned(void) + { + B *b; + for (b = bufs.link.next; b != &bufs; b = b->link.next) +@@ -324,7 +322,7 @@ void brm(B *b) + } + } + +-void brmall() ++void brmall(void) + { + while (!qempty(B, link, &bufs)) + brm(bufs.link.next); +--- joe-4.6/joe/b.h ++++ joe-4.6-prototypes/joe/b.h +@@ -171,7 +171,7 @@ extern const char *msgs[]; /* File acces + + B *bmk(B *prop); + void brm(B *b); +-void brmall(); ++void brmall(void); + + B *bfind(const char *s); + B *bfind_scratch(const char *s); +@@ -330,7 +330,7 @@ extern int break_links; /* Break hard li + extern int break_symlinks; /* Break symbolic links on write */ + extern int nodeadjoe; /* Prevent creation of DEADJOE files */ + +-void set_file_pos_orphaned(); ++void set_file_pos_orphaned(void); + + void breplace(B *b, B *n); + +--- joe-4.6/joe/charmap.c ++++ joe-4.6-prototypes/joe/charmap.c +@@ -1423,7 +1423,7 @@ main(int argc,char *argv[]) + + /* Get names of available encodings (for tab completion of ^T E prompt) */ + +-char **get_encodings() ++char **get_encodings(void) + { + int y; + char **encodings = 0; +@@ -1591,7 +1591,7 @@ struct charmap *locale_map; + struct charmap *locale_map_non_utf8; + /* Old, non-utf8 version of locale */ + +-void joe_locale() ++void joe_locale(void) + { + const char *sc; + char *s, *t, *u; +--- joe-4.6/joe/charmap.h ++++ joe-4.6-prototypes/joe/charmap.h +@@ -80,7 +80,7 @@ int from_utf8(struct charmap *map,const + int to_uni(struct charmap *cset, int c); + void to_utf8(struct charmap *map,char *s,int c); + +-void joe_locale(); ++void joe_locale(void); + extern struct charmap *locale_map; /* Character map of terminal */ + extern struct charmap *utf8_map; /* UTF-8 character map */ + extern struct charmap *utf16_map; /* UTF-16 character map */ +--- joe-4.6/joe/cmd.c ++++ joe-4.6-prototypes/joe/cmd.c +@@ -476,7 +476,7 @@ int execmd(CMD *cmd, int k) + return ret; + } + +-void do_auto_scroll() ++void do_auto_scroll(void) + { + static CMD *myscrup = 0; + static CMD *myscrdn = 0; +--- joe-4.6/joe/cmd.h ++++ joe-4.6-prototypes/joe/cmd.h +@@ -42,7 +42,7 @@ void addcmd(const char *s, MACRO *m); + + /* Execute a command. Returns return value of command */ + int execmd(CMD *cmd, int k); +-void do_auto_scroll(); ++void do_auto_scroll(void); + + extern B *cmdhist; /* Command history buffer */ + +--- joe-4.6/joe/kbd.c ++++ joe-4.6-prototypes/joe/kbd.c +@@ -425,7 +425,7 @@ static int dokeymap(W *w,char *s,void *o + return 0; + } + +-static char **get_keymap_list() ++static char **get_keymap_list(void) + { + char **lst = 0; + struct context *c; +--- joe-4.6/joe/main.c ++++ joe-4.6-prototypes/joe/main.c +@@ -95,7 +95,7 @@ time_t cur_time; + time_t timer_macro_delay; + MACRO *timer_macro; + +-MACRO *timer_play() ++MACRO *timer_play(void) + { + cur_time = time(NULL); + if (timer_macro && timer_macro_delay && cur_time >= last_timer_time + timer_macro_delay) { +--- joe-4.6/joe/mouse.c ++++ joe-4.6-prototypes/joe/mouse.c +@@ -136,7 +136,7 @@ int uextmouse(W *w, int k) + return mouse_event(w); + } + +-long mnow() ++long mnow(void) + { + struct timeval tv; + gettimeofday(&tv, NULL); +@@ -245,7 +245,7 @@ static void ttputs64(char *pp, ptrdiff_t + } + } + +-static void ttputs64_flush() ++static void ttputs64_flush(void) + { + char x; + switch (base64_count) { +@@ -449,7 +449,7 @@ int utomouse(W *xx, int k) + * position that utomouse would use into tmspos. */ + static off_t tmspos; + +-static int tomousestay() ++static int tomousestay(void) + { + BW *bw; + ptrdiff_t x = Cx - 1,y = Cy - 1; +@@ -556,7 +556,7 @@ int udefmdown(W *xx, int k) + return 0; + } + +-void reset_trig_time() ++void reset_trig_time(void) + { + if (!auto_rate) + auto_rate = 1; +@@ -761,7 +761,7 @@ int udefm3up(W *w, int k) + return 0; + } + +-void mouseopen() ++void mouseopen(void) + { + #ifdef MOUSE_XTERM + if (usexmouse) { +@@ -774,7 +774,7 @@ void mouseopen() + #endif + } + +-void mouseclose() ++void mouseclose(void) + { + #ifdef MOUSE_XTERM + if (usexmouse) { +--- joe-4.6/joe/mouse.h ++++ joe-4.6-prototypes/joe/mouse.h +@@ -21,12 +21,12 @@ JOE; see the file COPYING. If not, writ + #define MOUSE_MULTI_THRESH 300 + + #ifdef MOUSE_GPM +-int gpmopen(); /* initialize the connection. returns 0 on failure. */ +-void gpmclose(); /* close the connection. */ ++int gpmopen(void); /* initialize the connection. returns 0 on failure. */ ++void gpmclose(void); /* close the connection. */ + #endif + +-void mouseopen(); /* initialize mouse */ +-void mouseclose(); /* de-initialize mouse */ ++void mouseopen(void); /* initialize mouse */ ++void mouseclose(void); /* de-initialize mouse */ + + /* mousedn(int x, int y, int middle) - handle a mouse-down event */ + void mousedn(ptrdiff_t x, ptrdiff_t y, int middle); +@@ -56,8 +56,8 @@ int udefm3drag(W *, int); + int udefmiddledown(W *, int); + int udefmiddleup(W *, int); + +-long mnow(); +-void reset_trig_time(); ++long mnow(void); ++void reset_trig_time(void); + + /* options */ + extern int floatmouse; /* Allow mouse to set cursor past end of lines */ +--- joe-4.6/joe/rc.c ++++ joe-4.6-prototypes/joe/rc.c +@@ -9,7 +9,7 @@ + + /* Validate joerc file */ + +-int validate_rc() ++int validate_rc(void) + { + KMAP *k; + if (!(k = ngetcontext("main")) || kmap_empty(k)) { +--- joe-4.6/joe/rc.h ++++ joe-4.6-prototypes/joe/rc.h +@@ -14,4 +14,4 @@ + int procrc(CAP *cap, char *name); + + /* Validate rc file: return -1 if it's bad (call this after rc file has been loaded) */ +-int validate_rc(); ++int validate_rc(void); +--- joe-4.6/joe/selinux.c ++++ joe-4.6-prototypes/joe/selinux.c +@@ -98,7 +98,7 @@ int match_default_security_context(const + } + + +-int reset_default_security_context() ++int reset_default_security_context(void) + { + #ifdef WITH_SELINUX + if (selinux_enabled == -1) +--- joe-4.6/joe/selinux.h ++++ joe-4.6-prototypes/joe/selinux.h +@@ -1,4 +1,4 @@ + int copy_security_context(const char *from_file, const char *to_file); + int match_default_security_context(const char *from_file); +-int reset_default_security_context(); ++int reset_default_security_context(void); + int output_security_context(const char *from_file); +--- joe-4.6/joe/state.c ++++ joe-4.6-prototypes/joe/state.c +@@ -79,7 +79,7 @@ static void load_hist(FILE *f,B **bp) + + #define STATE_ID "# JOE state file v1.0\n" + +-void save_state() ++void save_state(void) + { + char *home = getenv("HOME"); + mode_t old_mask; +@@ -117,7 +117,7 @@ void save_state() + + /* Load state */ + +-void load_state() ++void load_state(void) + { + char *home = getenv("HOME"); + char buf[1024]; +--- joe-4.6/joe/state.h ++++ joe-4.6-prototypes/joe/state.h +@@ -12,8 +12,8 @@ extern int joe_state; + + /* Load state from file */ + +-void load_state(); ++void load_state(void); + + /* Save state to file */ + +-void save_state(); ++void save_state(void); +--- joe-4.6/joe/syntax.c ++++ joe-4.6-prototypes/joe/syntax.c +@@ -450,7 +450,7 @@ static void iz_cmd(struct high_cmd *cmd) + cmd->call = 0; + } + +-static struct high_cmd *mkcmd() ++static struct high_cmd *mkcmd(void) + { + struct high_cmd *cmd = (struct high_cmd *)joe_malloc(SIZEOF(struct high_cmd)); + iz_cmd(cmd); +--- joe-4.6/joe/tty.c ++++ joe-4.6-prototypes/joe/tty.c +@@ -520,7 +520,7 @@ static void pauseit(void) + + /* Check for type-ahead */ + +-int ttcheck() ++int ttcheck(void) + { + /* Ack previous packet */ + if (ackkbd != -1 && acceptch != NO_MORE_DATA && !have) { +@@ -710,7 +710,7 @@ char ttgetc(void) + + static struct utf8_sm main_utf8_sm; + +-int ttgetch() ++int ttgetch(void) + { + if (locale_map->type) { + int utf8_char; +--- joe-4.6/joe/umath.c ++++ joe-4.6-prototypes/joe/umath.c +@@ -1645,7 +1645,7 @@ B *mathhist = NULL; + + static char **math_word_list; + +-static void get_math_list() ++static void get_math_list(void) + { + struct var *v; + char *s; +--- joe-4.6/joe/unicode.c ++++ joe-4.6-prototypes/joe/unicode.c +@@ -191,7 +191,7 @@ Convenient character classes: + cclass_notword: \W opposite + */ + +-void joe_iswinit() ++void joe_iswinit(void) + { + int x; + +--- joe-4.6/joe/unicode.h ++++ joe-4.6-prototypes/joe/unicode.h +@@ -47,7 +47,7 @@ extern struct Cclass cclass_word[1]; + extern struct Cclass cclass_notword[1]; + extern struct Cclass cclass_combining[1]; + +-void joe_iswinit(); ++void joe_iswinit(void); + + int joe_iswupper(struct charmap *,int c); + int joe_iswlower(struct charmap *,int c); +--- joe-4.6/joe/ushell.c ++++ joe-4.6-prototypes/joe/ushell.c +@@ -114,7 +114,7 @@ static void cfollow(B *b, VT *vt, off_t + } + } + +-void vt_scrdn() ++void vt_scrdn(void) + { + W *w; + if ((w = maint->topwin) != NULL) { +--- joe-4.6/joe/ushell.h ++++ joe-4.6-prototypes/joe/ushell.h +@@ -17,4 +17,4 @@ extern B *runhist; /* Shell command hist + extern B *buildhist; /* Build command history */ + extern B *grephist; /* Grep command history */ + +-void vt_scrdn(); ++void vt_scrdn(void); +--- joe-4.6/joe/utag.c ++++ joe-4.6-prototypes/joe/utag.c +@@ -33,7 +33,7 @@ static void freetag(TAG *n) + enquef(TAG, link, &tagnodes, n); + } + +-static void clrtags() ++static void clrtags(void) + { + while (!qempty(TAG, link, &tags)) { + freetag(deque_f(TAG, link, tags.link.next)); +@@ -386,7 +386,7 @@ static int dotag(W *w, char *s, void *ob + static char **tag_word_list; + static time_t last_update; + +-static void get_tag_list() ++static void get_tag_list(void) + { + char buf[512]; + char tag[512]; +--- joe-4.6/joe/util/checkwidths.c ++++ joe-4.6-prototypes/joe/util/checkwidths.c +@@ -87,7 +87,7 @@ int full_read(unsigned char *p, int tota + + int get_line(char *buf, int timeout) + { +- char c; ++ unsigned char c; + for (;;) { + int x; + for (x = 0; x != timeout; ++x) +@@ -104,7 +104,7 @@ int get_line(char *buf, int timeout) + + } + +-int main() ++int main(int argc, char **argv) + { + struct termios org_attr; + struct termios attr; diff --git a/app-editors/joe/joe-4.2.ebuild b/app-editors/joe/joe-4.2.ebuild deleted file mode 100644 index 4a399380f488..000000000000 --- a/app-editors/joe/joe-4.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="A free ASCII-Text Screen Editor for UNIX" -HOMEPAGE="https://sourceforge.net/projects/joe-editor/" -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="xterm" - -DEPEND=">=sys-libs/ncurses-5.2-r2" -RDEPEND="xterm? ( >=x11-terms/xterm-239 )" - -DOCS=( README.md NEWS.md docs/hacking.md docs/man.md ) - -src_prepare() { - default - # Enable xterm mouse support in the rc files - if use xterm; then - cd "${S}"/rc - for i in *rc*.in; do - sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die "sed failed" - done - fi -} - -pkg_postinst() { - if use xterm; then - elog "To enable full xterm clipboard you need to set the allowWindowOps" - elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm" - elog "This is false by default due to potential security problems on some" - elog "architectures (see bug #91453)." - fi -} diff --git a/app-editors/joe/joe-4.3-r1.ebuild b/app-editors/joe/joe-4.3-r1.ebuild deleted file mode 100644 index 6f21f2fe2ff1..000000000000 --- a/app-editors/joe/joe-4.3-r1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="A free ASCII-Text Screen Editor for UNIX" -HOMEPAGE="https://sourceforge.net/projects/joe-editor/" -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="xterm" - -DEPEND=">=sys-libs/ncurses-5.2-r2:0=" -RDEPEND="${DEPEND} - xterm? ( >=x11-terms/xterm-239 )" - -DOCS=( README.md NEWS.md docs/hacking.md docs/man.md ) - -PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" ) - -src_prepare() { - default - # Enable xterm mouse support in the rc files - if use xterm; then - pushd "${S}"/rc &>/dev/null || die - local i - for i in *rc*.in; do - sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die - done - popd &>/dev/null - fi - eautoreconf -} - -pkg_postinst() { - if use xterm; then - elog "To enable full xterm clipboard you need to set the allowWindowOps" - elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm" - elog "This is false by default due to potential security problems on some" - elog "architectures (see bug #91453)." - fi -} diff --git a/app-editors/joe/joe-4.4.ebuild b/app-editors/joe/joe-4.4.ebuild deleted file mode 100644 index 6f21f2fe2ff1..000000000000 --- a/app-editors/joe/joe-4.4.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools - -DESCRIPTION="A free ASCII-Text Screen Editor for UNIX" -HOMEPAGE="https://sourceforge.net/projects/joe-editor/" -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris" -IUSE="xterm" - -DEPEND=">=sys-libs/ncurses-5.2-r2:0=" -RDEPEND="${DEPEND} - xterm? ( >=x11-terms/xterm-239 )" - -DOCS=( README.md NEWS.md docs/hacking.md docs/man.md ) - -PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" ) - -src_prepare() { - default - # Enable xterm mouse support in the rc files - if use xterm; then - pushd "${S}"/rc &>/dev/null || die - local i - for i in *rc*.in; do - sed -e 's/^ -\(mouse\|joexterm\)/-\1/' -i "${i}" || die - done - popd &>/dev/null - fi - eautoreconf -} - -pkg_postinst() { - if use xterm; then - elog "To enable full xterm clipboard you need to set the allowWindowOps" - elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm" - elog "This is false by default due to potential security problems on some" - elog "architectures (see bug #91453)." - fi -} diff --git a/app-editors/joe/joe-4.6.ebuild b/app-editors/joe/joe-4.6-r2.ebuild index 0bf861b42de7..776051fdf7f1 100644 --- a/app-editors/joe/joe-4.6.ebuild +++ b/app-editors/joe/joe-4.6-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools gnome2-utils +inherit autotools xdg-utils DESCRIPTION="A free ASCII-Text Screen Editor for UNIX" HOMEPAGE="https://sourceforge.net/projects/joe-editor/" @@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris" +KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="xterm" DEPEND=">=sys-libs/ncurses-5.2-r2:0=" @@ -21,6 +21,8 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${PN}-4.3-tinfo.patch" "${FILESDIR}/${P}-db.patch" + "${FILESDIR}/${P}-prototypes.patch" + "${FILESDIR}/${P}-c99.patch" ) DOCS=( README.md NEWS.md docs/hacking.md docs/man.md ) @@ -41,7 +43,7 @@ src_prepare() { pkg_postinst() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update if use xterm; then elog "To enable full xterm clipboard you need to set the allowWindowOps" elog "resources to true. This is usually found in /etc/X11/app-defaults/XTerm" @@ -52,5 +54,5 @@ pkg_postinst() { pkg_postrm() { xdg_desktop_database_update - gnome2_icon_cache_update + xdg_icon_cache_update } diff --git a/app-editors/joe/metadata.xml b/app-editors/joe/metadata.xml index 773ba43bc9e6..cd22587519d6 100644 --- a/app-editors/joe/metadata.xml +++ b/app-editors/joe/metadata.xml @@ -2,7 +2,7 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>amynka@gentoo.org</email> + <email>amynka@gentoo.org</email> </maintainer> <maintainer type="project"> <email>emacs@gentoo.org</email> @@ -15,7 +15,7 @@ user should expect: full use of termcap/terminfo, excellent screen update optimizations, simple installation, and all of the UNIX-integration features of VI. -</longdescription> +</longdescription> <use> <flag name="xterm">Enable full xterm clipboard support</flag> </use> diff --git a/app-editors/jove/Manifest b/app-editors/jove/Manifest index f8f0ce69df7f..8ee24206e392 100644 --- a/app-editors/jove/Manifest +++ b/app-editors/jove/Manifest @@ -1 +1,2 @@ -DIST jove4.16.0.73.tgz 465214 BLAKE2B cc1eeca2cdbd7ca98a5deaf27c37bfcdc529f2b388361e0cd5fd6278b72740a06283abd1f60212e6dc0d1e540e4dc4d99edb99b781645b13e1675644db0f38eb SHA512 2198504f9a23590710acba7f27661fa5649fdbed559a4c6bde9d2c1d673c22ce7d99a690be45a4602d37cf6e70399230c4ae3a251d8451af0c5252bdca61b09d +DIST jove-4.17.3.7.tar.gz 490070 BLAKE2B bfe95cc8f78993438839b93ebf37567940449e3914dd1963728ee82dc601c371318a34ea0d5d13d9d4dccaf9c4750874c5e0d3af22dcb2421595dca2da7cafdf SHA512 90bd597bb4be3a4589f77ee331cee4fa2784264221fe6247c2535ae34c5689c08f55c2b2919bff34af5631b73b12883dab54df9770b4157ae801079a23222d9a +DIST jove-4.17.5.3.tar.gz 548835 BLAKE2B 12b1f16d82e84cc2d099e2f45f5a42e2d1e811e5a9685c7ee162280ef49ecef8f7955a98679b60c49bbeaa30e3a430b1d6fc969270bee02862ff284a932829d9 SHA512 f91bdf3145ad243cfe8a4d9aca497a3d2cc58711488fa6b845d0d5e70dece6939046743aae1f18fd2614d75420bb747b00e61bb60b13ff35b26409068df40127 diff --git a/app-editors/jove/files/jove-4.16.0.70.3.1-getline.patch b/app-editors/jove/files/jove-4.16.0.70.3.1-getline.patch deleted file mode 100644 index 98cef6011f8c..000000000000 --- a/app-editors/jove/files/jove-4.16.0.70.3.1-getline.patch +++ /dev/null @@ -1,81 +0,0 @@ -http://bugs.gentoo.org/274352 -Fix build failure with glibc-2.10 - ---- jove4.16.0.70-orig/insert.c -+++ jove4.16.0.70/insert.c -@@ -504,7 +504,7 @@ - atchar = 0; - } - -- getline(atline->l_dline, genbuf); -+ get_line(atline->l_dline, genbuf); - atchar += tchar; - linecopy(genbuf, atchar, save); - atline->l_dline = putline(genbuf); ---- jove4.16.0.70-orig/io.c -+++ jove4.16.0.70/io.c -@@ -1347,9 +1347,9 @@ - - void - #ifdef USE_PROTOTYPES --getline proto((daddr addr, register char *buf)) -+get_line proto((daddr addr, register char *buf)) - #else --getline(addr, buf) -+get_line(addr, buf) - daddr addr; - register char *buf; - #endif ---- jove4.16.0.70-orig/io.h -+++ jove4.16.0.70/io.h -@@ -40,7 +40,7 @@ - close_file proto((File *fp)), - d_cache_init proto((void)), - file_write proto((char *fname, bool app)), -- getline proto((daddr addr, char *buf)), -+ get_line proto((daddr addr, char *buf)), - lsave proto((void)), - putreg proto((File *fp,LinePtr line1,int char1,LinePtr line2,int char2,bool makesure)), - read_file proto((char *file, bool is_insert)), ---- jove4.16.0.70-orig/recover.c -+++ jove4.16.0.70/recover.c -@@ -165,7 +165,7 @@ - private char *getblock proto((daddr atl)); - - void --getline(tl, buf) -+get_line(tl, buf) - daddr tl; - char *buf; - { -@@ -580,7 +580,7 @@ - Nchars = Nlines = 0L; - while (--nlines >= 0) { - addr = getaddr(ptrs_fp); -- getline(addr, buf); -+ get_line(addr, buf); - Nlines += 1; - Nchars += 1 + strlen(buf); - fputs(buf, out); ---- jove4.16.0.70-orig/util.c -+++ jove4.16.0.70/util.c -@@ -280,7 +280,7 @@ - strcpy(buf, linebuf); - Jr_Len = strlen(linebuf); - } else -- getline(line->l_dline, buf); -+ get_line(line->l_dline, buf); - return buf; - } - ---- jove4.16.0.70-orig/util.h -+++ jove4.16.0.70/util.h -@@ -18,7 +18,7 @@ - #define eobp() (lastp(curline) && eolp()) - #define eolp() (linebuf[curchar] == '\0') - #define firstp(line) ((line) == curbuf->b_first) --#define getDOT() getline(curline->l_dline, linebuf) -+#define getDOT() get_line(curline->l_dline, linebuf) - #define lastp(line) ((line) == curbuf->b_last) - - extern UnivPtr diff --git a/app-editors/jove/files/jove-4.16.0.73-build.patch b/app-editors/jove/files/jove-4.16.0.73-build.patch deleted file mode 100644 index 105d163d32be..000000000000 --- a/app-editors/jove/files/jove-4.16.0.73-build.patch +++ /dev/null @@ -1,188 +0,0 @@ -Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz - ---- jove4.16.0.73-orig/doc/jove.rc -+++ jove4.16.0.73/doc/jove.rc -@@ -74,6 +74,6 @@ - 1 source jove.rc.$TERM - - # source local custom rc file, if present --1 source jove-local.rc -+1 source /etc/jove/jove-local.rc - - popd ---- jove4.16.0.73-orig/jove.c -+++ jove4.16.0.73/jove.c -@@ -1576,7 +1576,7 @@ - char Joverc[FILESIZE]; - - if (dosys) { -- PathCat(Joverc, sizeof(Joverc), ShareDir, "jove.rc"); -+ PathCat(Joverc, sizeof(Joverc), CONFIGDIR, "jove.rc"); - (void) joverc(Joverc); /* system wide jove.rc */ - } - ---- jove4.16.0.73-orig/Makefile -+++ jove4.16.0.73/Makefile -@@ -21,13 +21,14 @@ - # If they don't exist, this makefile will try to create the directories - # LIBDIR and SHAREDIR. All others must already exist. - --JOVEHOME = /usr/local --SHAREDIR = $(JOVEHOME)/lib/jove -+JOVEHOME = ${DESTDIR}/usr -+SHAREDIR = $(JOVEHOME)/share/jove - LIBDIR = $(JOVEHOME)/lib/jove - BINDIR = $(JOVEHOME)/bin - XEXT= --MANDIR = $(JOVEHOME)/man/man$(MANEXT) -+MANDIR = $(JOVEHOME)/share/man/man$(MANEXT) - MANEXT = 1 -+CONFIGDIR=${DESTDIR}/etc/jove - - # TMPDIR is where the tmp files get stored, usually /tmp, /var/tmp, or - # /usr/tmp. If you wish to be able to recover buffers after a system -@@ -38,11 +39,11 @@ - # (in case the system startup salvages tempfiles by moving them, - # which is probably a good idea). - --TMPDIR = /tmp --RECDIR = /var/preserve -+TMPDIR = /var/tmp -+RECDIR = ${DESTDIR}/var/lib/jove/preserve - - # DFLTSHELL is the default shell invoked by JOVE and TEACHJOVE. --DFLTSHELL = /bin/csh -+DFLTSHELL = /bin/sh - - # The install commands of BSD and System V differ in unpleasant ways: - # -c: copy (BSD); -c dir: destination directory (SysV) -@@ -56,15 +57,18 @@ - INSTALLFLAGS = # -g bin -o root - - # to install executable files --XINSTALL=cp -+XINSTALL=install -m 755 - #XINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 755 # -s - #CYGWIN32: XINSTALL=install $(INSTALLFLAGS) -c -m 755 - - # to install text files --TINSTALL=cp -+TINSTALL=install -m 644 - #TINSTALL=/usr/ucb/install $(INSTALLFLAGS) -c -m 644 - #CYGWIN32: TINSTALL=install $(INSTALLFLAGS) -c -m 644 - -+# to install directories -+DINSTALL=install -d 755 -+ - # These should all just be right if the above ones are. - # You will confuse JOVE if you move anything from LIBDIR or SHAREDIR. - -@@ -72,7 +76,7 @@ - TEACHJOVE = $(BINDIR)/teachjove$(XEXT) - RECOVER = $(LIBDIR)/recover$(XEXT) - PORTSRV = $(LIBDIR)/portsrv$(XEXT) --JOVERC = $(SHAREDIR)/jove.rc -+JOVERC = $(CONFIGDIR)/jove.rc - TERMSDIR = $(SHAREDIR) - CMDS.DOC = $(SHAREDIR)/cmds.doc - TEACH-JOVE = $(SHAREDIR)/teach-jove -@@ -160,7 +164,7 @@ - # SCO UNIX: TERMCAPLIB = -lcurses - # AIX on the R6000s: TERMCAPLIB = -lcurses -ltermcap -ls - --TERMCAPLIB = -ltermcap -+TERMCAPLIB = -lncurses - - # Extra libraries flags needed by oddball systems. - # Modern BSD systems using openpty need its library. -@@ -181,7 +185,7 @@ - # PDP-11 with separate I&D: -i - # PDP-11 without separate I&D: -n - --LDFLAGS = -+#LDFLAGS = - - # for SCO Xenix, set - # MEMFLAGS = -Mle -@@ -236,7 +240,8 @@ - TROFF = troff -Tpost - TROFFPOST = | /usr/lib/lp/postscript/dpost - - --MANUALS = $(JOVEM) $(TEACHJOVEM) $(XJOVEM) $(JOVETOOLM) -+MANUALS = $(JOVEM) $(TEACHJOVEM) -+# $(XJOVEM) $(JOVETOOLM) - - C_SRC = commands.c commands.tab abbrev.c argcount.c ask.c buf.c c.c case.c jctype.c \ - delete.c disp.c extend.c fp.c fmt.c insert.c io.c iproc.c \ -@@ -283,8 +288,7 @@ - # all: default target. - # Builds everything that "install" needs. - all: jjove$(XEXT) recover$(XEXT) teachjove$(XEXT) portsrv$(XEXT) \ -- doc/cmds.doc doc/jove.$(MANEXT) doc/teachjove.$(MANEXT) \ -- doc/jovetool.$(MANEXT) -+ doc/cmds.doc doc/jove.$(MANEXT) doc/teachjove.$(MANEXT) - - jjove$(XEXT): $(OBJECTS) - $(LDCC) $(LDFLAGS) $(OPTFLAGS) -o jjove$(XEXT) $(OBJECTS) $(TERMCAPLIB) $(EXTRALIBS) -@@ -341,6 +345,7 @@ - @echo \#define LIBDIR \"$(LIBDIR)\" >> paths.h - @echo \#define SHAREDIR \"$(SHAREDIR)\" >> paths.h - @echo \#define DFLTSHELL \"$(DFLTSHELL)\" >> paths.h -+ @echo \#define CONFIGDIR \"$(CONFIGDIR)\" >> paths.h - - makexjove: - ( cd xjove ; make CC="$(CC)" OPTFLAGS="$(OPTFLAGS)" SYSDEFS="$(SYSDEFS)" $(TOOLMAKEEXTRAS) xjove ) -@@ -358,18 +363,31 @@ - # Thus, if "all" is done first, "install" can be invoked with - # JOVEHOME pointing at a playpen where files are to be marshalled. - # This property is fragile. --install: $(LIBDIR) $(SHAREDIR) \ -+install: $(BINDIR) $(LIBDIR) $(SHAREDIR) $(CONFIGDIR) $(RECDIR) \ - $(TEACH-JOVE) $(CMDS.DOC) $(TERMSDIR)docs \ - $(PORTSRVINST) $(RECOVER) $(JOVE) $(TEACHJOVE) $(MANUALS) -- $(TINSTALL) doc/jove.rc $(JOVERC) -+ $(TINSTALL) doc/jove.rc $(CONFIGDIR) - @echo See the README about changes to /etc/rc or /etc/rc.local - @echo so that the system recovers jove files on reboot after a crash - -+$(BINDIR):: -+ $(DINSTALL) $(BINDIR) -+ - $(LIBDIR):: -- test -d $(LIBDIR) || mkdir -p $(LIBDIR) -+ $(DINSTALL) $(LIBDIR) - - $(SHAREDIR):: -- test -d $(SHAREDIR) || mkdir -p $(SHAREDIR) -+ $(DINSTALL) $(SHAREDIR) -+ -+$(CONFIGDIR):: -+ $(DINSTALL) $(CONFIGDIR) -+ -+$(RECDIR):: -+ $(DINSTALL) $(RECDIR) -+ chmod 1777 $(RECDIR) -+ -+$(MANDIR):: -+ $(DINSTALL) $(MANDIR) - - $(TEACH-JOVE): doc/teach-jove - $(TINSTALL) doc/teach-jove $(TEACH-JOVE) -@@ -410,7 +428,7 @@ - -e 's;<SHAREDIR>;$(SHAREDIR);' \ - -e 's;<SHELL>;$(DFLTSHELL);' doc/jove.nr > doc/jove.$(MANEXT) - --$(JOVEM): doc/jove.$(MANEXT) -+$(JOVEM): $(MANDIR) doc/jove.$(MANEXT) - $(TINSTALL) doc/jove.$(MANEXT) $(JOVEM) - - # doc/jove.doc is the formatted manpage (only needed by DOS) -@@ -427,7 +445,7 @@ - -e 's;<SHAREDIR>;$(SHAREDIR);' \ - -e 's;<SHELL>;$(DFLTSHELL);' doc/teachjove.nr > doc/teachjove.$(MANEXT) - --$(TEACHJOVEM): doc/teachjove.$(MANEXT) -+$(TEACHJOVEM): $(MANDIR) doc/teachjove.$(MANEXT) - $(TINSTALL) doc/teachjove.$(MANEXT) $(TEACHJOVEM) - - $(XJOVEM): doc/xjove.nr diff --git a/app-editors/jove/files/jove-4.16.0.73-doc.patch b/app-editors/jove/files/jove-4.16.0.73-doc.patch deleted file mode 100644 index d62add543af6..000000000000 --- a/app-editors/jove/files/jove-4.16.0.73-doc.patch +++ /dev/null @@ -1,34 +0,0 @@ -Originally based on Debian patch jove_4.16.0.70-3.1.diff.gz - ---- jove4.16.0.73-orig/doc/intro.nr -+++ jove4.16.0.73/doc/intro.nr -@@ -56,9 +56,8 @@ - .. - . - .\" Change the extra vertical spacing around .DS/.DE --.\" Does not work with groff's version of MS (GS is 1 iff groff MS) --.if !\n(GS .if n .nr DD 0v --.if !\n(GS .if t .nr DD \n(PD/2u -+.if n .nr DD 0v -+.if t .nr DD \n(PD/2u - . - .nr LL 6.5i - .nr LT 6.5i -@@ -152,7 +151,7 @@ - } - - _ --\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "hello.c"\ \ \(**\ \ /home/foo\fP <\ the Mode Line -+\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "hello.c"\ \ \(**\ \ /home/foo\ \ \ \ 15:23\fP <\ the Mode Line - _ - : write-file (default hello.c) aloha.c\^\(sq <\ the Message Line - = -@@ -1978,7 +1977,7 @@ - \ \ \ \ return 0; <\ second Window - }\^\(sq - _ --\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "aloha.c"\ \ \-\-\ \ /home/foo\fP <\ the Mode Line -+\fBJOVE\ (C OvrWt)\ \ \ [Main:1]\ \ "aloha.c"\ \ \-\-\ \ /home/foo\ \ \ \ 15:28\fP <\ the Mode Line - _ - [Point pushed] <\ the Message Line - = diff --git a/app-editors/jove/files/jove-4.16.0.73-sendmail.patch b/app-editors/jove/files/jove-4.16.0.73-sendmail.patch deleted file mode 100644 index 072dd1f843ce..000000000000 --- a/app-editors/jove/files/jove-4.16.0.73-sendmail.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- jove4.16.0.73-orig/recover.c -+++ jove4.16.0.73/recover.c -@@ -776,7 +776,7 @@ - - last_update = ctime(&(rec->UpdTime)); - /* Start up mail */ -- sprintf(mail_cmd, "/bin/mail %s", pw->pw_name); -+ sprintf(mail_cmd, "/usr/sbin/sendmail -t %s", pw->pw_name); - setuid(getuid()); - if ((mail_pipe = popen(mail_cmd, "w")) == NULL) - return; -@@ -784,6 +784,7 @@ - setbuf(mail_pipe, mail_cmd); - /* Let's be grammatically correct! */ - buf_string = rec->Nbuffers == 1? "buffer" : "buffers"; -+ fprintf(mail_pipe, "To: %s\n", pw->pw_name); - fprintf(mail_pipe, "Subject: Jove saved %d %s after \"%s\" crashed\n", - rec->Nbuffers, buf_string, hname()); - fprintf(mail_pipe, " \n"); diff --git a/app-editors/jove/jove-4.16.0.73-r1.ebuild b/app-editors/jove/jove-4.17.3.7.ebuild index c6f1bdcef2e3..3c41a1a75685 100644 --- a/app-editors/jove/jove-4.16.0.73-r1.ebuild +++ b/app-editors/jove/jove-4.17.3.7.ebuild @@ -1,37 +1,32 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs DESCRIPTION="Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings" -HOMEPAGE="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/" -SRC_URI="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/${PN}${PV}.tgz" +HOMEPAGE="https://github.com/jonmacs/jove" +SRC_URI="https://github.com/jonmacs/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="JOVE" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="doc" RDEPEND="sys-libs/ncurses:0=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/${PN}${PV}" - -PATCHES=( - "${FILESDIR}"/${PN}-4.16.0.70.3.1-getline.patch - "${FILESDIR}"/${P}-build.patch - "${FILESDIR}"/${P}-sendmail.patch - "${FILESDIR}"/${P}-doc.patch -) - src_compile() { tc-export CC - emake OPTFLAGS="${CFLAGS}" \ - SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500 -D_XOPEN_STREAMS=-1" \ + emake \ + JOVEHOME="${EPREFIX}/usr" \ + JMANDIR="${EPREFIX}/usr/share/man/man1" \ + OPTFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + SYSDEFS="-DLinux" \ TERMCAPLIB="$("$(tc-getPKG_CONFIG)" --libs ncurses)" if use doc; then @@ -41,7 +36,11 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install + emake \ + JOVEHOME="${EPREFIX}/usr" \ + JMANDIR="${EPREFIX}/usr/share/man/man1" \ + DESTDIR="${D}" \ + install keepdir /var/lib/jove/preserve dodoc README diff --git a/app-editors/jove/jove-4.17.5.3.ebuild b/app-editors/jove/jove-4.17.5.3.ebuild new file mode 100644 index 000000000000..45d502a5e15a --- /dev/null +++ b/app-editors/jove/jove-4.17.5.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Jonathan's Own Version of Emacs, a light emacs-like editor without LISP bindings" +HOMEPAGE="https://github.com/jonmacs/jove" +SRC_URI="https://github.com/jonmacs/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="JOVE" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="doc" + +RDEPEND="sys-libs/ncurses:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_compile() { + tc-export CC + + myopts=( + JOVEHOME="${EPREFIX}/usr" \ + JMANDIR="${EPREFIX}/usr/share/man/man1" \ + JDOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ + OPTFLAGS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + LDLIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \ + SYSDEFS="-DLinux" \ + $(usev !doc FREFDOCS="") + ) + emake "${myopts[@]}" +} + +src_install() { + # The Makefile triggers a rebuild if any of the options have changed + # (see recipe for keys.c). So we must pass identical options even if + # they're not needed for installation. + emake "${myopts[@]}" DESTDIR="${D}" install + + keepdir /var/lib/jove/preserve + dodoc README +} diff --git a/app-editors/jove/metadata.xml b/app-editors/jove/metadata.xml index 7fc03da65063..33e460068827 100644 --- a/app-editors/jove/metadata.xml +++ b/app-editors/jove/metadata.xml @@ -12,4 +12,7 @@ language specific modes) while weighing in with CPU, memory, and disk requirements comparable to vi. </longdescription> +<upstream> + <remote-id type="github">jonmacs/jove</remote-id> +</upstream> </pkgmetadata> diff --git a/app-editors/juffed/juffed-0.10_p20200103.ebuild b/app-editors/juffed/juffed-0.10_p20200103-r1.ebuild index a53f1c7ee35d..072f2f904791 100644 --- a/app-editors/juffed/juffed-0.10_p20200103.ebuild +++ b/app-editors/juffed/juffed-0.10_p20200103-r1.ebuild @@ -23,7 +23,7 @@ RDEPEND=" dev-qt/qtsingleapplication[X] dev-qt/qtwidgets:5 dev-qt/qtxml:5 - x11-libs/qscintilla + x11-libs/qscintilla[qt5(+)] " DEPEND="${RDEPEND}" BDEPEND="dev-qt/linguist-tools:5" diff --git a/app-editors/jupp/Manifest b/app-editors/jupp/Manifest index 622c24fd9d02..349928cbf0f3 100644 --- a/app-editors/jupp/Manifest +++ b/app-editors/jupp/Manifest @@ -1,2 +1,2 @@ -DIST joe-3.1jupp38.tgz 498068 BLAKE2B 46909c5f0f14b1d0ec30219b8ddfe9c0ad76b726f7178f7527ad5fad0cec40b7ac663e93645187220280572fa3bbde9bcb621f8816672e69c36587410fd98c7f SHA512 1d21ee5bbd1a042c58a89dd2bed8ec711c59fc383ff0dfd94d3a0eaccb999734915abc202e2112c5d573d8073e748b8024cd710b21803fed7422f5a8bccbc0c5 DIST joe-3.1jupp40.tgz 503318 BLAKE2B 34452784f145f81158dc6a9223a365cd04fce2f3a669f99bf5571e8f33ecf8ff34d7f8495f6c6803ab1e734890c95d9fe9f88be38738b2b2111a9512db2f7872 SHA512 d61b7b9c5cc5c17925ef27f8f7942bc4e4d283e49b02f4962a7e3c5d3122868aadffe108f884164ae61e86776584374a2b5220c313a323efb9d3820268402ead +DIST joe-3.1jupp41.tgz 505002 BLAKE2B 4b354bb2643896b68dc6f270ee7a030703e168b9e8b98ab537878a53b00faad6809ff48eb9c24fa68a0d6e436222f745eef69290e803c1fcace5e6ca0278a6c9 SHA512 9a07946984b64fff4ad8174f9fa437073543cd6af357caf9674571ed787709b3cc2b16fd571d7b8b50b8bb9c7e7bf49dff010d162b76324818be130ab37e06cf diff --git a/app-editors/jupp/jupp-3.1_p38.ebuild b/app-editors/jupp/jupp-3.1_p41.ebuild index d8bdab27bf57..3e6e016b519c 100644 --- a/app-editors/jupp/jupp-3.1_p38.ebuild +++ b/app-editors/jupp/jupp-3.1_p41.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 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" +HOMEPAGE="http://www.mirbsd.org/jupp.htm" +SRC_URI="http://www.mirbsd.org/MirOS/dist/${PN}/joe-${PV/_p/"${PN}"}.tgz" +S="${WORKDIR}/${PN}" LICENSE="GPL-1" SLOT="0" @@ -16,15 +17,10 @@ RDEPEND="ncurses? ( sys-libs/ncurses:0= ) !app-editors/joe" DEPEND="${RDEPEND}" -S="${WORKDIR}/${PN}" DOCS="HINTS INFO LIST NEWS README TODO" -src_prepare() { - default - chmod +x configure || die -} - src_configure() { + chmod +x configure || die econf \ --enable-search_libs \ --enable-termcap \ diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest index 290b402984cf..27da3bad8af1 100644 --- a/app-editors/kakoune/Manifest +++ b/app-editors/kakoune/Manifest @@ -1 +1,2 @@ -DIST kakoune-2021.08.28.tar.bz2 535791 BLAKE2B b04f23b29def72659925b104a203033cd547ec9483225e35a216276716b2d31da76e1c4a239b60a1e72f3e3f4777997bc59560f6ccd4a0e3eaf509e537ed85ad SHA512 a304f1ce3295196468784e27f019d155b5aa0305d90adf5ae65c74a9be4ee740df400ebeb819eb059bb42efee503daa988a2ea929fa6d60ec63ad408be9b575a +DIST kakoune-2022.10.31.tar.bz2 556473 BLAKE2B 36489de5e4fa4406a847f43bf0f966c082e5c4a97e3c31d04c61fb8c4137fed4b6d1ce96ac921a85dc03fe7b90d8de172b6720ac32846507a3d0c996fe01191c SHA512 9a02a1a6bbb0b71a579b0286b4dfb6359b856183862b3e17354d2685b8215fa24c196b570a21dfd627e3d5a5b91e20ce0b74caff19e5772ab911cc42677bf720 +DIST kakoune-2023.08.05.tar.bz2 568612 BLAKE2B bbedc16f361a242c4319a852c3b688186e1e2b204990aff8434ad8a169d4c62171d2d3424e3bf65a4b5b6b17e21205e84077198091687094f88235e27c544bbd SHA512 f29b787ab6f04bc5a1a3ab31d189128745c967b5eec15fce07ae7dbaf29247f7413499d9925cf0561173feb0fe634f3423ac43da0d6c1ba5d679ee38b80ac679 diff --git a/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch b/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch deleted file mode 100644 index b4a7cc439f36..000000000000 --- a/app-editors/kakoune/files/kakoune-2021.08.28-php-filetype-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/rc/filetype/php.kak b/rc/filetype/php.kak -index be03de9e..97bdbfe3 100644 ---- a/rc/filetype/php.kak -+++ b/rc/filetype/php.kak -@@ -85,7 +85,7 @@ define-command -hidden php-indent-on-char %< - define-command -hidden php-insert-on-new-line %< - evaluate-commands -draft -itersel %< - # copy // comments or docblock * prefix and following white spaces -- try %{ execute-keys -draft s [^/] <ret> k <a-x> s ^\h*\K(?://|[*][^/])\h* <ret> y gh j P -+ try %{ execute-keys -draft s [^/] <ret> k <a-x> s ^\h*\K(?://|[*][^/])\h* <ret> y gh j P } - # append " * " on lines starting a multiline /** or /* comment - try %{ execute-keys -draft k <a-x> s ^\h*/[*][* ]? <ret> j gi i <space>*<space> } - > diff --git a/app-editors/kakoune/files/kakoune-2022.10.31-gcc13.patch b/app-editors/kakoune/files/kakoune-2022.10.31-gcc13.patch new file mode 100644 index 000000000000..6c093bcdb2eb --- /dev/null +++ b/app-editors/kakoune/files/kakoune-2022.10.31-gcc13.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/895264 +https://github.com/mawww/kakoune/issues/4854 + +diff --git a/src/keys.hh b/src/keys.hh +index 0af1a5a8..ccafe336 100644 +--- a/src/keys.hh ++++ b/src/keys.hh +@@ -9,6 +9,8 @@ + #include "unicode.hh" + #include "vector.hh" + ++#include <cstdint> ++ + namespace Kakoune + { + +diff --git a/src/ranked_match.hh b/src/ranked_match.hh +index ec7fe626..62d6b8f0 100644 +--- a/src/ranked_match.hh ++++ b/src/ranked_match.hh +@@ -4,6 +4,8 @@ + #include "string.hh" + #include "meta.hh" + ++#include <cstdint> ++ + namespace Kakoune + { + diff --git a/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild b/app-editors/kakoune/kakoune-2022.10.31.ebuild index 66fdc47a76c7..9293c946c84a 100644 --- a/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild +++ b/app-editors/kakoune/kakoune-2022.10.31.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2021 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${P}-php-filetype-fix.patch + "${FILESDIR}"/${P}-gcc13.patch ) src_prepare() { diff --git a/app-editors/kakoune/kakoune-2023.08.05.ebuild b/app-editors/kakoune/kakoune-2023.08.05.ebuild new file mode 100644 index 000000000000..ea2fb090fb4a --- /dev/null +++ b/app-editors/kakoune/kakoune-2023.08.05.ebuild @@ -0,0 +1,40 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Modal editor inspired by vim" +HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune" +SRC_URI="https://github.com/mawww/kakoune/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + +BDEPEND="virtual/pkgconfig" + +src_prepare() { + sed -i '/CXXFLAGS += -O3/d' src/Makefile || die + default +} + +src_configure() { + tc-export CXX +} + +src_compile() { + emake -C src all +} + +src_test() { + emake -C src test +} + +src_install() { + emake PREFIX="${D}"/usr docdir="${ED}/usr/share/doc/${PF}" install + + rm "${ED}/usr/share/man/man1/kak.1.gz" || die + doman doc/kak.1 +} diff --git a/app-editors/kile/Manifest b/app-editors/kile/Manifest index 83e824de2f59..6b54e8a4c12d 100644 --- a/app-editors/kile/Manifest +++ b/app-editors/kile/Manifest @@ -1 +1,2 @@ -DIST kile-2.9.93.tar.bz2 8580239 BLAKE2B a43f160240dfdffc23c6898385994ee4e49e1f3d793915d1f392e41f606350269f2b9e80592c373680adb56454510abdd0b7e69131f20737fb5efa54d4eaa111 SHA512 d87277b8ef16c82cfd415dd191916641fa1a25e316e1eb2c463b275d3654dcfe180bea03027589ab30cd8b769d92d97005846a78aff8058bcfb20eed76287504 +DIST kile-2.9.93_p20221123-1ca67389.tar.gz 9507069 BLAKE2B 61770aeafe6604b8a45ae9e49fc79a375815fce5e11a189aef962172f60d0182984f6908a626cb95b493f1fe894958ec0816420096a12efbd03233114e0a5dcc SHA512 ed16cfb7cee3d08ad21fabecd5536981c68431261c02f66cc979f5f01229fa33c192c33f5d1ef78d61c37e643ab313eb432fd580aea61f5a918d3de76d2dcadc +DIST kile-2.9.94.tar.bz2 7505095 BLAKE2B b42d7237f612f2d6017bdde3cfea29a74b4756b96cc707b178217e0ab5b599d86b2ffc8e0283fcd6e351746151738bcbff65183b93a347c6fb11250233b7fe5a SHA512 4638e81374243a8b2716183bf28cec02bcb455f2b1a9295e7e04f20833b77c962bddfeb81e527606209c338862af48a38d9f6009a9f7b96aac37f874ae3f725c diff --git a/app-editors/kile/files/kile-2.9.93-cmake.patch b/app-editors/kile/files/kile-2.9.93-cmake.patch deleted file mode 100644 index 94e39c463517..000000000000 --- a/app-editors/kile/files/kile-2.9.93-cmake.patch +++ /dev/null @@ -1,20 +0,0 @@ -I know upstream wants to help us but it doesn't work... - ---- a/CMakeLists.txt 2019-10-19 14:23:41.000000000 +0200 -+++ b/CMakeLists.txt 2019-10-20 15:50:52.606325681 +0200 -@@ -116,15 +116,6 @@ - kile2.0-5_upd.pl - DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update) - --install(FILES -- AUTHORS -- ChangeLog -- README -- README.cwl -- kile-remote-control.txt -- README.MacOSX -- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile) -- - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) - find_package(KF5I18n CONFIG REQUIRED) - ki18n_install(po) diff --git a/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch b/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch deleted file mode 100644 index 232bd3894833..000000000000 --- a/app-editors/kile/files/kile-2.9.93-fix-crash-when-deleting-templates.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 483743aa9f194376a8b496ac4e58a946070a36af Mon Sep 17 00:00:00 2001 -From: Michel Ludwig <michel.ludwig@kdemail.net> -Date: Sun, 1 Dec 2019 09:09:55 +0100 -Subject: [PATCH] Don't crash when deleting templates - -BUG: 413506 ---- - src/dialogs/managetemplatesdialog.cpp | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp -index fe6537ad..c5298b21 100644 ---- a/src/dialogs/managetemplatesdialog.cpp -+++ b/src/dialogs/managetemplatesdialog.cpp -@@ -317,17 +317,6 @@ bool ManageTemplatesDialog::removeTemplate() - - KileTemplate::Info templateInfo = templateItem->getTemplateInfo(); - -- KIO::StatJob* statJob = KIO::stat(QUrl::fromUserInput(templateInfo.path), KIO::StatJob::DestinationSide, 0); -- KIO::StatJob* statJob2 = KIO::stat(QUrl::fromUserInput(templateInfo.icon), KIO::StatJob::DestinationSide, 0); -- KJobWidgets::setWindow(statJob, this); -- KJobWidgets::setWindow(statJob2, this); -- statJob->exec(); -- statJob2->exec(); -- if ((statJob->error() && statJob2->error()) || !QFileInfo(templateInfo.icon).exists()) { -- KMessageBox::error(this, i18n("Sorry, but you do not have the necessary permissions to remove the selected template.")); -- return false; -- } -- - if (KMessageBox::warningYesNo(this, i18n("You are about to remove the template \"%1\"; are you sure?", templateInfo.name)) == KMessageBox::No) { - return false; - } --- -GitLab - diff --git a/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch b/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch deleted file mode 100644 index 2afd0622ea3d..000000000000 --- a/app-editors/kile/files/kile-2.9.93-fix-ktoolbar-usage.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5c268679da2fb2cdc414890bdd79a5592e37cb22 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu> -Date: Tue, 15 Sep 2020 15:33:51 +0100 -Subject: [PATCH] Fix KToolbar usage. - ---- - src/widgets/scriptsmanagementwidget.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/widgets/scriptsmanagementwidget.cpp b/src/widgets/scriptsmanagementwidget.cpp -index 79552da3..94f58f18 100644 ---- a/src/widgets/scriptsmanagementwidget.cpp -+++ b/src/widgets/scriptsmanagementwidget.cpp -@@ -66,7 +66,7 @@ ScriptsManagement::ScriptsManagement(KileInfo *kileInfo, QWidget *parent, const - baseLayout->setContentsMargins(0, 0, 0, 0); - setLayout(baseLayout); - -- m_toolBar = new KToolBar(this, "scriptControlToolBar"); -+ m_toolBar = new KToolBar("scriptControlToolBar", this); - m_toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly); - m_toolBar->setIconDimensions(KIconLoader::SizeSmall); - --- -GitLab - diff --git a/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch b/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch deleted file mode 100644 index f303cff0b0f0..000000000000 --- a/app-editors/kile/files/kile-2.9.93-fix-overriding-existing-templates.patch +++ /dev/null @@ -1,164 +0,0 @@ -From 7a55cf2d93c9daa13f2fa2ec1ae25646507cfc0c Mon Sep 17 00:00:00 2001 -From: Michel Ludwig <michel.ludwig@kdemail.net> -Date: Sun, 1 Dec 2019 15:56:05 +0100 -Subject: [PATCH] Fix overriding of existing templates - -Also, don't delete the original file after the template has been -created from it. - -BUG: 413473 - -* asturm 2020-10-17: backport to 2.9.93 (drop unnecessary string change) - ---- - src/dialogs/managetemplatesdialog.cpp | 7 ++- - src/templates.cpp | 78 ++------------------------- - src/templates.h | 10 ++-- - 3 files changed, 12 insertions(+), 83 deletions(-) - -diff --git a/src/dialogs/managetemplatesdialog.cpp b/src/dialogs/managetemplatesdialog.cpp -index c5298b21..77d5d6ff 100644 ---- a/src/dialogs/managetemplatesdialog.cpp -+++ b/src/dialogs/managetemplatesdialog.cpp -@@ -292,11 +292,10 @@ void ManageTemplatesDialog::addTemplate() - reject(); - return; - } -- returnValue = m_templateManager->replace(templateInfo, m_sourceURL, templateName, iconURL); -- } -- else { -- returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL); - } -+ -+ returnValue = m_templateManager->add(m_sourceURL, templateName, iconURL); -+ - if (!returnValue) { - KMessageBox::error(this, i18n("Failed to create the template.")); - reject(); -diff --git a/src/templates.cpp b/src/templates.cpp ---- a/src/templates.cpp -+++ b/src/templates.cpp -@@ -82,7 +82,10 @@ bool Manager::copyAppData(const QUrl &src, const QString& subdir, const QString& - testDir.mkpath(dir); - } - // copy file -- KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL); -+ if(src == targetURL) { // copying a file over itself -+ return true; -+ } -+ KIO::FileCopyJob* copyJob = KIO::file_copy(src, targetURL, -1, KIO::Overwrite); - KJobWidgets::setWindow(copyJob, m_kileInfo->mainWindow()); - return copyJob->exec(); - } -@@ -130,77 +133,6 @@ bool Manager::remove(Info ti) { - return removeAppData(ti.path) && removeAppData(ti.icon); - } - --bool Manager::replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon) { -- KileDocument::Type type = m_kileInfo->extensions()->determineDocumentType(newTemplateSourceURL); -- -- //start by copying the files that belong to the new template to a safe place -- QString templateTempFile, iconTempFile; -- -- if( newTemplateSourceURL.isLocalFile() ) { -- // file protocol. We do not need the network -- templateTempFile = newTemplateSourceURL.toLocalFile(); -- } -- else { -- QTemporaryFile tmpFile; -- tmpFile.setAutoRemove( false ); -- tmpFile.open(); -- -- templateTempFile = tmpFile.fileName(); -- m_TempFilePath = tmpFile.fileName(); -- KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newTemplateSourceURL, QUrl::fromLocalFile(templateTempFile), -1, KIO::Overwrite ); -- KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() ); -- -- if( ! fileCopyJob->exec() ) { -- return false; -- } -- } -- -- if( newIcon.isLocalFile() ) { -- // file protocol. We do not need the network -- iconTempFile = newIcon.toLocalFile(); -- } -- else { -- QTemporaryFile tmpFile; -- tmpFile.setAutoRemove( false ); -- tmpFile.open(); -- -- iconTempFile = tmpFile.fileName(); -- m_TempFilePath = tmpFile.fileName(); -- KIO::FileCopyJob* fileCopyJob = KIO::file_copy( newIcon, QUrl::fromLocalFile(iconTempFile), -1, KIO::Overwrite ); -- KJobWidgets::setWindow( fileCopyJob, m_kileInfo->mainWindow() ); -- -- if( ! fileCopyJob->exec() ) { -- if( ! templateTempFile.isEmpty() ) -- QFile::remove( templateTempFile ); -- return false; -- } -- } -- -- //now delete the template that should be replaced -- if(!remove(toBeReplaced)) { -- if( ! templateTempFile.isEmpty() ) -- QFile::remove( templateTempFile ); -- if( ! iconTempFile.isEmpty() ) -- QFile::remove( iconTempFile ); -- } -- -- //finally, create the new template -- if(!add(QUrl::fromUserInput(templateTempFile), type, newName, QUrl::fromUserInput(iconTempFile))) { -- if( ! templateTempFile.isEmpty() ) -- QFile::remove( templateTempFile ); -- if( ! iconTempFile.isEmpty() ) -- QFile::remove( iconTempFile ); -- return false; -- } -- -- if( ! templateTempFile.isEmpty() ) -- QFile::remove( templateTempFile ); -- if( ! iconTempFile.isEmpty() ) -- QFile::remove( iconTempFile ); -- -- return true; --} -- - void Manager::scanForTemplates() { - KILE_DEBUG_MAIN << "===scanForTemplates()==================="; - QStringList dirs = KileUtilities::locateAll(QStandardPaths::AppDataLocation, "templates", QStandardPaths::LocateDirectory); -diff --git a/src/templates.h b/src/templates.h ---- a/src/templates.h -+++ b/src/templates.h -@@ -1,7 +1,7 @@ - /*************************************************************************************** - begin : Sat Apr 26 2003 - copyright : (C) 2003 by Jeroen Wijnhout (wijnhout@science.uva.nl) -- 2007, 2008 by Michel Ludwig (michel.ludwig@kdemail.net) -+ 2007-2019 by Michel Ludwig (michel.ludwig@kdemail.net) - ***************************************************************************************/ - - /*************************************************************************** -@@ -79,15 +79,13 @@ public: - **/ - bool searchForTemplate(const QString& name, KileDocument::Type& type) const; - -- // add a template in $HOME/kile/templates/ -+ // Add a template in .kde/share/kile/templates/ -+ // This function will override any existing template. - bool add(const QUrl &templateSourceURL, const QString &name, const QUrl &icon); - -- // remove a template from $HOME/kile/templates/ -+ // Remove a template from .kde/share/kile/templates/ - bool remove(KileTemplate::Info ti); - -- // replaces a template -- bool replace(const KileTemplate::Info& toBeReplaced, const QUrl &newTemplateSourceURL, const QString& newName, const QUrl& newIcon); -- - // these have to be methods as we cannot use i18n calls in global objects - static QString defaultEmptyTemplateCaption(); - static QString defaultEmptyLaTeXTemplateCaption(); --- -GitLab - diff --git a/app-editors/kile/files/kile-2.9.93-no-khtml.patch b/app-editors/kile/files/kile-2.9.93-no-khtml.patch deleted file mode 100644 index cf055fc84490..000000000000 --- a/app-editors/kile/files/kile-2.9.93-no-khtml.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7c050b5e306cab115573aea1bfc951aaaa1203e9 Mon Sep 17 00:00:00 2001 -From: Michel Ludwig <michel.ludwig@kdemail.net> -Date: Fri, 22 Nov 2019 09:40:53 +0100 -Subject: [PATCH] Remove dependency on KHTML - ---- - CMakeLists.txt | 1 - - src/CMakeLists.txt | 2 -- - src/kilelauncher.cpp | 1 - - 3 files changed, 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1bea621f..1b25e3a4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,7 +46,6 @@ find_package(KF5 5.31 REQUIRED COMPONENTS - I18n - IconThemes - Init -- KHtml - KIO - Parts - TextEditor -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 77626894..e23480fd 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -55,7 +55,6 @@ set(kile_SRCS - dialogs/usermenu/usermenuitem.cpp - dialogs/usermenu/usermenutree.cpp - dialogs/validatorinputdialog.cpp -- docpart.cpp - documentinfo.cpp - editorcommands.cpp - editorextension.cpp -@@ -238,7 +237,6 @@ PUBLIC - KF5::Crash - KF5::DBusAddons - KF5::GuiAddons -- KF5::KHtml - KF5::I18n - KF5::IconThemes - KF5::KIOCore -diff --git a/src/kilelauncher.cpp b/src/kilelauncher.cpp -index c0bcdf9d..24a1f5b4 100644 ---- a/src/kilelauncher.cpp -+++ b/src/kilelauncher.cpp -@@ -16,7 +16,6 @@ - - #include <config.h> - --#include "docpart.h" - #include "kileconfig.h" - #include "kileinfo.h" - #include "kiletool.h" --- -GitLab - diff --git a/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch b/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch new file mode 100644 index 000000000000..0095adf9548c --- /dev/null +++ b/app-editors/kile/files/kile-2.9.93_p20221123-cmake.patch @@ -0,0 +1,31 @@ +From 2974fba837aef46711d9e1b26cd367aab68ba53a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 19 Dec 2018 13:36:12 +0100 +Subject: [PATCH] Disable install misc files by cmake + +AUTHORS, README, Changelog etc. are handled by distribution packages. +--- + CMakeLists.txt | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 91a732ab..c69c168c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,13 +114,6 @@ install( + kile2.0-5_upd.pl + DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kconf_update) + +-install(FILES +- AUTHORS +- ChangeLog +- README +- README.cwl +- kile-remote-control.txt +- DESTINATION ${KDE_INSTALL_DATAROOTDIR}/doc/kile) + + ki18n_install(po) + +-- +2.38.1 + diff --git a/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch b/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch new file mode 100644 index 000000000000..7a66dfcc4f80 --- /dev/null +++ b/app-editors/kile/files/kile-2.9.93_p20221123-okularpart.patch @@ -0,0 +1,70 @@ +From 6cf4549217e95659c8dfd14f9166fb8b80bad333 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 15 Mar 2024 12:45:51 +0100 +Subject: [PATCH] Switch okular headers to okular5 + +Otherwise it will be using okular6's. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/configtester.cpp | 2 +- + src/kileviewmanager.cpp | 2 +- + src/kileviewmanager.h | 2 +- + src/livepreview.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/configtester.cpp b/src/configtester.cpp +index 35ce3e71..cd7ed588 100644 +--- a/src/configtester.cpp ++++ b/src/configtester.cpp +@@ -14,7 +14,7 @@ + + #include "configtester.h" + +-#include <okular/interfaces/viewerinterface.h> ++#include <okular5/interfaces/viewerinterface.h> + + #include <QTimer> + +diff --git a/src/kileviewmanager.cpp b/src/kileviewmanager.cpp +index 34f84397..f5ac0cdc 100644 +--- a/src/kileviewmanager.cpp ++++ b/src/kileviewmanager.cpp +@@ -15,7 +15,7 @@ + #include "kileviewmanager.h" + #include <config.h> + +-#include <okular/interfaces/viewerinterface.h> ++#include <okular5/interfaces/viewerinterface.h> + + #include <KAcceleratorManager> + #include <KActionCollection> +diff --git a/src/kileviewmanager.h b/src/kileviewmanager.h +index 42367291..e0b3ca09 100644 +--- a/src/kileviewmanager.h ++++ b/src/kileviewmanager.h +@@ -15,7 +15,7 @@ + #ifndef KILEVIEWKILEVIEWMANAGER_H + #define KILEVIEWKILEVIEWMANAGER_H + +-#include <okular/interfaces/viewerinterface.h> ++#include <okular5/interfaces/viewerinterface.h> + + #include <KTextEditor/Cursor> + #include <KTextEditor/ModificationInterface> +diff --git a/src/livepreview.cpp b/src/livepreview.cpp +index dbd7ff13..fcfa2a6d 100644 +--- a/src/livepreview.cpp ++++ b/src/livepreview.cpp +@@ -40,7 +40,7 @@ + #include <KParts/MainWindow> + #include <KXMLGUIFactory> + +-#include <okular/interfaces/viewerinterface.h> ++#include <okular5/interfaces/viewerinterface.h> + + #include "errorhandler.h" + #include "kiledebug.h" +-- +2.44.0 + diff --git a/app-editors/kile/kile-2.9.93-r1.ebuild b/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild index bd4e9a081820..3c11cf77aae7 100644 --- a/app-editors/kile/kile-2.9.93-r1.ebuild +++ b/app-editors/kile/kile-2.9.93_p20221123-r1.ebuild @@ -1,24 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" KDE_ORG_CATEGORY="office" -KFMIN=5.74.0 -QTMIN=5.14.2 +KDE_ORG_COMMIT="1ca67389327d63fdc5a4c65ab6dd1cf7fbf597af" +KFMIN=5.82.0 +QTMIN=5.15.5 inherit ecm kde.org DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks" HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/" -if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - KEYWORDS="amd64 x86" -fi - LICENSE="FDL-1.2 GPL-2" SLOT="5" +KEYWORDS="amd64 ~arm64 ~riscv x86" IUSE="+pdf +png" DEPEND=" @@ -26,7 +23,10 @@ DEPEND=" >=dev-qt/qtscript-${QTMIN}:5 >=dev-qt/qttest-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - kde-apps/okular:5 + || ( + media-gfx/okularpart:5[pdf?] + kde-apps/okular:5[pdf?] + ) >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kcrash-${KFMIN}:5 @@ -35,7 +35,6 @@ DEPEND=" >=kde-frameworks/kguiaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/ktexteditor-${KFMIN}:5 @@ -44,8 +43,10 @@ DEPEND=" pdf? ( app-text/poppler[qt5] ) " RDEPEND="${DEPEND} - kde-apps/konsole:5 - kde-apps/okular:5[pdf?] + || ( + kde-apps/konsolepart:5 + kde-apps/konsole:5 + ) virtual/latex-base virtual/tex-base pdf? ( @@ -58,15 +59,17 @@ RDEPEND="${DEPEND} ) " -DOCS=( AUTHORS ChangeLog kile-remote-control.txt README{,.cwl} ) +DOCS=( kile-remote-control.txt ) -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${P}-no-khtml.patch" - "${FILESDIR}/${P}-fix-crash-when-deleting-templates.patch" - "${FILESDIR}/${P}-fix-overriding-existing-templates.patch" - "${FILESDIR}/${P}-fix-ktoolbar-usage.patch" -) +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) + +src_prepare() { + if has_version "media-gfx/okularpart:5"; then + eapply "${FILESDIR}/${P}-okularpart.patch" + fi + + ecm_src_prepare +} src_configure() { local mycmakeargs=( diff --git a/app-editors/kile/kile-2.9.94.ebuild b/app-editors/kile/kile-2.9.94.ebuild new file mode 100644 index 000000000000..ea470a7fedce --- /dev/null +++ b/app-editors/kile/kile-2.9.94.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KDE_ORG_CATEGORY="office" +KFMIN=6.0.0 +QTMIN=6.6.2 +MY_P=${P/_beta/b} +inherit ecm kde.org + +DESCRIPTION="Latex Editor and TeX shell based on KDE Frameworks" +HOMEPAGE="https://apps.kde.org/kile/ https://kile.sourceforge.io/" + +if [[ ${KDE_BUILD_TYPE} == release ]]; then + SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" + S="${WORKDIR}/${MY_P}" + KEYWORDS="~amd64" +fi + +LICENSE="FDL-1.2 GPL-2" +SLOT="0" +IUSE="+pdf +png" + +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + kde-apps/okular:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdoctools-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/ktexteditor-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + pdf? ( >=app-text/poppler-23.12.0[qt6] ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 + kde-apps/konsole:6 + kde-apps/okular:6[pdf?] + virtual/latex-base + virtual/tex-base + pdf? ( + app-text/ghostscript-gpl + app-text/texlive-core + ) + png? ( + app-text/dvipng + virtual/imagemagick-tools[png?] + ) +" + +DOCS=( kile-remote-control.txt ) + +PATCHES=( "${FILESDIR}/${PN}-2.9.93_p20221123-cmake.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package pdf Poppler) + ) + ecm_src_configure +} diff --git a/app-editors/kile/metadata.xml b/app-editors/kile/metadata.xml index 84ab11c2e4b4..d7c15bc148fe 100644 --- a/app-editors/kile/metadata.xml +++ b/app-editors/kile/metadata.xml @@ -10,7 +10,8 @@ <name>Gentoo TeX Project</name> </maintainer> <upstream> - <remote-id type="sourceforge">kile</remote-id> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="sourceforge">kile</remote-id> + <remote-id type="kde-invent">office/kile</remote-id> </upstream> </pkgmetadata> diff --git a/app-editors/le/Manifest b/app-editors/le/Manifest deleted file mode 100644 index d1b7553a5ab6..000000000000 --- a/app-editors/le/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST le-1.16.5.tar.gz 1012934 BLAKE2B c3e037f701e5e8916258fd55a02550f0bae42f56a0a464c7e45e5365e89475bd76ee74aae48cbdb7f5c8d7a665279a63a885007a88a556e86bec875584438f0a SHA512 2c74267f9d02944e0c72f109d9be024d1ec1de84dd6f381f7f8667be1d68b8ebd107ac970f1901f2c77e3150897562d42b9b10ec321356ca1e1ee45728941660 diff --git a/app-editors/le/le-1.16.5.ebuild b/app-editors/le/le-1.16.5.ebuild deleted file mode 100644 index 1ae40439e62c..000000000000 --- a/app-editors/le/le-1.16.5.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DESCRIPTION="Terminal text editor" -HOMEPAGE="http://lav.yar.ru/programs.html" -SRC_URI="http://lav.yar.ru/download/le/le-${PV}.tar.gz" - -DOCS="AUTHORS ChangeLog FEATURES HISTORY INSTALL NEWS README THANKS TODO" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -RDEPEND="sys-libs/ncurses:0=" -DEPEND="${RDEPEND}" - -src_install() { - emake DESTDIR="${D}" install - einstalldocs -} diff --git a/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild b/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild index c53c582660ba..c451a3b39dbc 100644 --- a/app-editors/leafpad/leafpad-0.8.18.1-r1.ebuild +++ b/app-editors/leafpad/leafpad-0.8.18.1-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 @@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" IUSE="emacs" BDEPEND=" diff --git a/app-editors/leafpad/metadata.xml b/app-editors/leafpad/metadata.xml index 29f6abd3c713..00dd62d025d7 100644 --- a/app-editors/leafpad/metadata.xml +++ b/app-editors/leafpad/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!--maintainer-needed--> - <use> - <flag name="emacs">Enable Emacs key theme</flag> - </use> + <!--maintainer-needed--> + <use> + <flag name="emacs">Enable Emacs key theme</flag> + </use> + <upstream> + <remote-id type="savannah-nongnu">leafpad</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/levee/Manifest b/app-editors/levee/Manifest index 4374662abc16..516d4b7c9884 100644 --- a/app-editors/levee/Manifest +++ b/app-editors/levee/Manifest @@ -1 +1,3 @@ DIST levee-3.5a.tar.gz 67733 BLAKE2B 291b502a8c9581c2c0f2ca6714c17c86692067d5de66e987f8a7b506965a21ff149c6fe445532e9b065e40dd7e519d1ebc6b5ff69c5b4a4129138df224f71dfd SHA512 e95b4fc6370903dda07aff0a612c7f34425ab0b854d05a08f42b7e339d1a86a436316d31f3667748943e2ce2e68be7f2369e4a3b36c0715b00d31b8ab50cdaf1 +DIST levee-4.0-patches.tar.xz 12292 BLAKE2B b5ff5dbd4e9a5be0aab747ca557cd4e8235057a23ad9f10ec6aad921c4cb5da3086315162dcd0a6db97102cfc573da5ae13e4ca4738cb5875f0bf6f32ae244b2 SHA512 fe8c9f781e63b1b800e754ffda5322a266a51e905e105b5f4b2e604f3ec922f9bf5fb6657b89f290c4ecff80f7bcdce88a2c03cac3082dc5c4d70e23b10bd931 +DIST levee-4.0.tar.bz2 80596 BLAKE2B c38325a04cadb78e2961d26dff605943ccc8214232ce9bf3fb61bf7ee8f91b1e6a43631326e21e38be73d8917a290d92790cc9bc2a4ca7b186b740674fbc5f8f SHA512 7551963018674431167ee2635dccfed1648268c33ec3ae1f11c0ced89dcba280ae1f6d3ab678ad4ba8331e0928b47f6c5953758da7516bae10df9e3edd65c22c diff --git a/app-editors/levee/levee-3.5a.ebuild b/app-editors/levee/levee-3.5a.ebuild index e5a02aa046fb..ea8be6cb53cb 100644 --- a/app-editors/levee/levee-3.5a.ebuild +++ b/app-editors/levee/levee-3.5a.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="http://www.pell.chi.il.us/~orc/Code/levee/${P}.tar.gz" LICENSE="levee" SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" !app-text/lv @@ -27,7 +27,7 @@ PATCHES=( ) src_configure() { - export AC_CPP_PROG=$(tc-getCPP) + export AC_CPP_PROG="$(tc-getCPP)" export AC_PATH="${PATH}" export AC_LIBDIR="$($(tc-getPKG_CONFIG) --libs ncurses)" @@ -38,7 +38,7 @@ src_configure() { src_compile() { emake \ CFLAGS="${CFLAGS} -Wall -Wextra ${LDFLAGS}" \ - CC=$(tc-getCC) + CC="$(tc-getCC)" } src_install() { diff --git a/app-editors/levee/levee-4.0.ebuild b/app-editors/levee/levee-4.0.ebuild new file mode 100644 index 000000000000..e45cd0871d9c --- /dev/null +++ b/app-editors/levee/levee-4.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Really tiny vi clone, for things like rescue disks" +HOMEPAGE="https://www.pell.portland.or.us/~orc/Code/levee/" +SRC_URI="https://www.pell.portland.or.us/~orc/Code/levee/${P}.tar.bz2" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz" + +LICENSE="levee" +SLOT="0" +KEYWORDS="amd64 ~arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + !app-text/lv + sys-libs/ncurses:0= +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${WORKDIR}"/${P}-patches +) + +src_configure() { + export AC_CPP_PROG="$(tc-getCPP)" + export AC_PATH="${PATH}" + export AC_LIBDIR="$($(tc-getPKG_CONFIG) --libs ncurses)" + + # --sive=256000 because configure.sh expects size to be a number and not the + # tool lize "llvm-size" or "x86_64-pc-linux-gnu-size". + # See #729264 + ./configure.sh \ + --prefix="${PREFIX}"/usr --size=256000 || die "configure failed" +} + +src_compile() { + emake \ + CFLAGS="${CFLAGS} ${LDFLAGS}" \ + CC="$(tc-getCC)" +} + +src_install() { + emake PREFIX="${D}/${EPREFIX}" install +} diff --git a/app-editors/levee/metadata.xml b/app-editors/levee/metadata.xml index 85e4ed814fa2..1b85a753289c 100644 --- a/app-editors/levee/metadata.xml +++ b/app-editors/levee/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">Orc/levee</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/logseq-desktop-bin/Manifest b/app-editors/logseq-desktop-bin/Manifest new file mode 100644 index 000000000000..a7cfe3cb8cd8 --- /dev/null +++ b/app-editors/logseq-desktop-bin/Manifest @@ -0,0 +1,2 @@ +DIST logseq-desktop-bin-0.10.7.zip 189638441 BLAKE2B a2e81edca960f4efd3bd93634b57a1791a505a5aabcb43a1a551fb9270023f024cad704321c2a080af1f0e20b57848949eff2f4d7ddbcaf5a001048c7c2cec2e SHA512 c0bf76bb8ea9b58cfd229650a480b0f197c8d6c7780a146d73bcd4b439446a9bfd006154686b2e40f11d433d5f781f70f16e5b2e00fb8373c5dae57ebb679550 +DIST logseq-desktop-bin-0.10.8.zip 189513360 BLAKE2B 851b9a5b8b7a5b1c94ecc71cab87dfe6b94a55f8c320b81e80647499741661e1f220b9077acb6f1cdd61e2a6c7dc646fb832cdc80e504a8a4015531d81875cee SHA512 64a31ce323d7f0e9640a6c1b386631b0a9571bf9677effc3e0d1fd0fb8e68da3b95d37ef1db97bb2c7a12f3c1a75de7db44af566fcdfa62eb8aa76390330bf42 diff --git a/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.7.ebuild b/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.7.ebuild new file mode 100644 index 000000000000..bc4f1ec885d5 --- /dev/null +++ b/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.7.ebuild @@ -0,0 +1,91 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CHROMIUM_LANGS=" + af am ar bg bn ca cs da de el en-GB en-US es-419 es et fa fil fi fr gu he hi + hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw + ta te th tr uk ur vi zh-CN zh-TW +" + +inherit chromium-2 desktop unpacker xdg + +DESCRIPTION="A privacy-first, open-source platform for knowledge sharing and management." +HOMEPAGE="https://github.com/logseq/logseq" +SRC_URI="https://github.com/logseq/logseq/releases/download/${PV}/logseq-linux-x64-${PV}.zip -> ${P}.zip" +S="${WORKDIR}/Logseq-linux-x64" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="-* ~amd64" + +RESTRICT="mirror splitdebug" + +RDEPEND=" + dev-libs/nss + dev-libs/openssl:0/3 + media-libs/alsa-lib + media-libs/mesa + net-misc/curl + net-print/cups + sys-apps/dbus + sys-libs/glibc + sys-libs/zlib + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libdrm + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/pango +" +BDEPEND=" + app-arch/unzip +" + +QA_PREBUILT="*" + +src_configure() { + default + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + default + pushd locales > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die +} + +src_install() { + exeinto /opt/logseq-desktop + doexe Logseq chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so libvulkan.so.1 + + insinto /opt/logseq-desktop + doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin \ + v8_context_snapshot.bin version vk_swiftshader_icd.json + insopts -m0755 + doins -r locales resources + + # Chrome-sandbox requires the setuid bit to be specifically set + # see https://github.com/electron/electron/issues/17972 + fowners root /opt/logseq-desktop/chrome-sandbox + fperms 4711 /opt/logseq-desktop/chrome-sandbox + + # Crashpad is included in the package once in a while and when it does, it must be installed. + # See #903616 and #890595 + [[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler + + dosym ../logseq-desktop/Logseq /opt/bin/logseq + + make_desktop_entry "/opt/bin/logseq %U" Logseq logseq Office \ + "StartupWMClass=logseq\nTerminal=false\nMimeType=x-scheme-handler/logseq" + # some releases do not have an icon included, but we dont fail if that happens + doicon resources/app/icons/logseq.png || true +} diff --git a/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.8.ebuild b/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.8.ebuild new file mode 100644 index 000000000000..bc4f1ec885d5 --- /dev/null +++ b/app-editors/logseq-desktop-bin/logseq-desktop-bin-0.10.8.ebuild @@ -0,0 +1,91 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CHROMIUM_LANGS=" + af am ar bg bn ca cs da de el en-GB en-US es-419 es et fa fil fi fr gu he hi + hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw + ta te th tr uk ur vi zh-CN zh-TW +" + +inherit chromium-2 desktop unpacker xdg + +DESCRIPTION="A privacy-first, open-source platform for knowledge sharing and management." +HOMEPAGE="https://github.com/logseq/logseq" +SRC_URI="https://github.com/logseq/logseq/releases/download/${PV}/logseq-linux-x64-${PV}.zip -> ${P}.zip" +S="${WORKDIR}/Logseq-linux-x64" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="-* ~amd64" + +RESTRICT="mirror splitdebug" + +RDEPEND=" + dev-libs/nss + dev-libs/openssl:0/3 + media-libs/alsa-lib + media-libs/mesa + net-misc/curl + net-print/cups + sys-apps/dbus + sys-libs/glibc + sys-libs/zlib + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libdrm + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/pango +" +BDEPEND=" + app-arch/unzip +" + +QA_PREBUILT="*" + +src_configure() { + default + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + default + pushd locales > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die +} + +src_install() { + exeinto /opt/logseq-desktop + doexe Logseq chrome-sandbox libEGL.so libffmpeg.so libGLESv2.so libvk_swiftshader.so libvulkan.so.1 + + insinto /opt/logseq-desktop + doins chrome_100_percent.pak chrome_200_percent.pak icudtl.dat resources.pak snapshot_blob.bin \ + v8_context_snapshot.bin version vk_swiftshader_icd.json + insopts -m0755 + doins -r locales resources + + # Chrome-sandbox requires the setuid bit to be specifically set + # see https://github.com/electron/electron/issues/17972 + fowners root /opt/logseq-desktop/chrome-sandbox + fperms 4711 /opt/logseq-desktop/chrome-sandbox + + # Crashpad is included in the package once in a while and when it does, it must be installed. + # See #903616 and #890595 + [[ -x chrome_crashpad_handler ]] && doins chrome_crashpad_handler + + dosym ../logseq-desktop/Logseq /opt/bin/logseq + + make_desktop_entry "/opt/bin/logseq %U" Logseq logseq Office \ + "StartupWMClass=logseq\nTerminal=false\nMimeType=x-scheme-handler/logseq" + # some releases do not have an icon included, but we dont fail if that happens + doicon resources/app/icons/logseq.png || true +} diff --git a/app-editors/logseq-desktop-bin/metadata.xml b/app-editors/logseq-desktop-bin/metadata.xml new file mode 100644 index 000000000000..0a67e594f20b --- /dev/null +++ b/app-editors/logseq-desktop-bin/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>mschiff@gentoo.org</email> + <name>Marc Schiffbauer</name> + </maintainer> + <upstream> + <remote-id type="github">logseq/logseq</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-editors/lpe/Manifest b/app-editors/lpe/Manifest index 99347eb254e1..1bd43eb9570b 100644 --- a/app-editors/lpe/Manifest +++ b/app-editors/lpe/Manifest @@ -1,2 +1 @@ DIST lpe-1.2.8_p20210401.tar.gz 840016 BLAKE2B 81fa0b1c3f9a7164eb219692a2e7bc092d0ee09c9de15f6fd2a4f66cc486be5b744eaa2fb0569a9f44f45d6a19159c55286be76d9ae0f4947f5b7c749e84a8fb SHA512 0b40f2f3fc1241e07291dfdbfcf2466cf5dedc1c91bf36c4f36c8af792ce718be2ad66884b049e25d7b9f9e796d60ce25ca42b37610d26894cd1dc6b74e51157 -DIST lpe_1.2.6.13-0.1.tar.gz 600523 BLAKE2B 8866aff63276d5e39ed48b4d9e8b9a23d541c13e196815c29586df83f8c6b5895a8dde8fb16b0929bffc49416907d74d48fdbc5ce736a855f2d2daad6472fb96 SHA512 f02769baca396285fe8f98c934f6274185d2bf8b08f3b007cbfa4e6aadb455abfb7cab13d53a3d1fa71ea0c29c4222784dcbc9a7508501c7d1839671503758ed 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 deleted file mode 100644 index 2cc68157ed53..000000000000 --- a/app-editors/lpe/files/lpe-1.2.6.13-fno-common.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index 2e93042570aa..000000000000 --- a/app-editors/lpe/files/lpe-1.2.6.13-make-382.patch +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.gentoo.org/335324 ---- 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 - # the problem while rewriting Makefile.in. --@GT_YES@intlh.inst: intlh.inst.in ../config.status --@GT_YES@ cd .. \ --@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ --@GT_YES@ $(SHELL) ./config.status --@GT_NO@.PHONY: intlh.inst --@GT_NO@intlh.inst: -+intlh.inst: intlh.inst.in ../config.status -+ cd .. \ -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ -+ $(SHELL) ./config.status -+.PHONY: intlh.inst -+intlh.inst: - - # Tell versions [3.59,3.63) of GNU make not to export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/app-editors/lpe/lpe-1.2.6.13.ebuild b/app-editors/lpe/lpe-1.2.6.13.ebuild deleted file mode 100644 index 4a9bb25d8011..000000000000 --- a/app-editors/lpe/lpe-1.2.6.13.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="a lightweight programmers editor" -HOMEPAGE="https://packages.qa.debian.org/l/lpe.html" -SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}-0.1.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~x86-linux" -IUSE="nls" - -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() { - default - - # You should add PKG_CHECK_MODULES(NCURSES, ncurses) to configure.in and - # replace -lncurses in src/Makefile.am with $(NCURSES_LIBS) - # That is, if you need eautoreconf - sed -i \ - -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs-only-l ncurses):" \ - src/Makefile.in || die -} - -src_configure() { - econf $(use_enable nls) -} - -src_install() { - emake \ - libdir="${ED}/usr/$(get_libdir)" \ - prefix="${ED}/usr" \ - datadir="${ED}/usr/share" \ - mandir="${ED}/usr/share/man" \ - infodir="${ED}/usr/share/info" \ - docdir="${ED}/usr/share/doc/${PF}" \ - exdir="${ED}/usr/share/doc/${PF}/examples" \ - install - - find "${ED}" -name '*.la' -delete || die -} diff --git a/app-editors/lpe/lpe-1.2.8_p20210401.ebuild b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild index 23557f0d1a8a..5c157e7146ee 100644 --- a/app-editors/lpe/lpe-1.2.8_p20210401.ebuild +++ b/app-editors/lpe/lpe-1.2.8_p20210401.ebuild @@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${COMMIT}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc sparc x86 ~x86-linux" +KEYWORDS="amd64 ppc ~riscv sparc x86 ~x86-linux" IUSE="nls" RDEPEND=" diff --git a/app-editors/lpe/metadata.xml b/app-editors/lpe/metadata.xml index 85e4ed814fa2..a62b3a23b59d 100644 --- a/app-editors/lpe/metadata.xml +++ b/app-editors/lpe/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">AdamMajer/lpe</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest index bf42cdbcec07..ec6ffec6c1d8 100644 --- a/app-editors/mg/Manifest +++ b/app-editors/mg/Manifest @@ -1,2 +1,2 @@ -DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6 -DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043 +DIST mg-20220614.tar.gz 157904 BLAKE2B 88141274b379c6117158f85d91d0d643709437f0292fe2f82569c33d85694b39f957e279e262839ef0ba2a7e81e8a9ad6512c621e68f42b0929805028898637a SHA512 bed455cda856e54fae28592ac0a520841d5d542880a7405dadf702d7407ac33ae7fb7b63880805a7e166e0e0a87c76b9fca1700c444f1b999a5af66732c69b65 +DIST mg-20230501.tar.gz 158315 BLAKE2B b8f68d4cd80a1735ce171bf653281104f7c8b5510a45088a136955d6649e969285914d27d2ee5bd4400643507943576e3c42959949aebb81bc1bb2f99a8e660e SHA512 db7b9815a01dc9fb1ff92741748d24d558c329135e591c24450d0a3bc10e38a992ef346dd744854864538f330a018415df539d06543570a3566dbabc6c88a8fd diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml index 7a6f27c8ff88..d00cadd0ef61 100644 --- a/app-editors/mg/metadata.xml +++ b/app-editors/mg/metadata.xml @@ -13,4 +13,7 @@ This is a portable version of the Mg maintained by the OpenBSD team. </longdescription> +<upstream> + <remote-id type="github">hboetes/mg</remote-id> +</upstream> </pkgmetadata> diff --git a/app-editors/mg/mg-20210609-r1.ebuild b/app-editors/mg/mg-20220614.ebuild index 55c7cae6f7a9..47a79e0e9dae 100644 --- a/app-editors/mg/mg-20210609-r1.ebuild +++ b/app-editors/mg/mg-20220614.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,17 +6,17 @@ EAPI=8 inherit toolchain-funcs DESCRIPTION="MicroGnuEmacs, a port from the BSDs" -HOMEPAGE="https://homepage.boetes.org/software/mg/ - https://github.com/hboetes/mg" +HOMEPAGE="https://github.com/hboetes/mg" SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv sparc x86" IUSE="livecd" -RDEPEND="sys-libs/ncurses:0= - !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )" +RDEPEND=" + sys-libs/ncurses:0= + >=dev-libs/libbsd-0.7.0" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" diff --git a/app-editors/mg/mg-20210314-r1.ebuild b/app-editors/mg/mg-20230501.ebuild index 59dc39a0a994..e99dca006195 100644 --- a/app-editors/mg/mg-20210314-r1.ebuild +++ b/app-editors/mg/mg-20230501.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs DESCRIPTION="MicroGnuEmacs, a port from the BSDs" -HOMEPAGE="https://homepage.boetes.org/software/mg/" +HOMEPAGE="https://github.com/hboetes/mg" SRC_URI="https://github.com/hboetes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv sparc x86" IUSE="livecd" -RDEPEND="sys-libs/ncurses:0= - !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND=" + sys-libs/ncurses:0= + >=dev-libs/libbsd-0.7.0" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { # fix path to tutorial in man page diff --git a/app-editors/micro/Manifest b/app-editors/micro/Manifest index 138eb4d8bb40..434cf98c2c76 100644 --- a/app-editors/micro/Manifest +++ b/app-editors/micro/Manifest @@ -1,91 +1,2 @@ -DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297 -DIST github.com%2Fblang%2Fsemver%2F@v%2Fv3.5.1+incompatible.zip 19948 BLAKE2B 3f604e82647eb2a4a4c309622080fd07701d032a430999f13da727cc01d455cd3d0e31a7079e0bd833fd17d84a228f9e3f588719c4491ba83e50aa442080acf3 SHA512 e1c0c9251b0c7f05bcfad6f73cab4215cbd550d98065ccf8553dc04a56d7f6153ee70a477230a0e7cd8adc3707c8bfba279676902300537eb056fd912d75b51c -DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2 -DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d -DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556 -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e -DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb -DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b -DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965 -DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75 -DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3 -DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.mod 35 BLAKE2B 088adc516e2f6f0a693c745963d6daaee2c196b1407e36a469eec392b232ed26b03f9c515d422b8e536c2b2ac8bf199cb3db5ba4ad19ab71fc338919f57a3a53 SHA512 787962ce037cb9143f496d5a7dd11ab1a487180cb57ad498e6c24a8da7a5bf36737b0b2730d2e0837c60a08bc7467ffba744026ce6962885fecdcdd1bb6c07b7 -DIST github.com%2Fgo-errors%2Ferrors%2F@v%2Fv1.0.1.zip 11197 BLAKE2B fbc5efeb39aa911465f17b41e15574564dd9f6711ddac8fefb6db2fcdcb1c9da86d352aea7ed9ec53ffc01d16361985cefa171c240e55a8689d3f16e01f3a64d SHA512 c11ab427de7456beca56fe2c3539161bd92c20dfc345e8b52f5752bad387e93396929bc42057e09f82038f0e59471f0a0450b66693d11e2199a7ad69eba79f01 -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d -DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f -DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce -DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f -DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011 -DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.zip 442291 BLAKE2B 02ee4982a588e0fd1575206340bd97663147459664a2942edf151c4aec2bd20da83984c68c76e1c505c1ef930b77f934a8210f6c0ca106a0c0c91ff63733b92d SHA512 8e275955eb9e5034c155c6e469e2a3117bee30fbe42e8ae394f496b83f473a1568847707707716dd5a3c57dd0e0a4bb4f4cc9af04940218ce24420493e923f14 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99 -DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f -DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee -DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2 -DIST github.com%2Fp-e-w%2Fgo-runewidth%2F@v%2Fv0.0.10-0.20200613030200-3e1705c5c059.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61 -DIST github.com%2Fp-e-w%2Fgo-runewidth%2F@v%2Fv0.0.10-0.20200613030200-3e1705c5c059.zip 21092 BLAKE2B 579b1fdbade64918255fe8b2386bd04fb6bed839a7ab22a1a77eeb7d2152148db90b91249961198ea03478e4a649e0119b3ebbc97f6cc66d05cc8165edb158a3 SHA512 aea53f79712ba0a901f2d33899bf76df697afe02a1df8efc986bed75b3aa83d3ffa16f52397fd387ba3cc21a31d9c8c048953e67597010e3c5c5b5cdf1fd7cfa -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902 -DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2 -DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc -DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.1.0.zip 45664 BLAKE2B 300a1f32c514f6857be8cffe884b9fc29091a709746c83567f82413b0e64d7f42ff3aa6bc34846745489f98e10045736e3571797e715fad87cec937df28d0fc9 SHA512 f9a98001ee97894e319b82f4c190f93ce7a60e109b991691f3a90cd51818596b1baefcc1c24793aa3c8c9d4505f809fbc689037b1a929e21e17fcf134134118b -DIST github.com%2Frobertkrimen%2Fotto%2F@v%2Fv0.0.0-20191219234010-c382bd3c16ff.mod 36 BLAKE2B 34795f3802c4ad11528fd865cc7887ac749cb2b29bb944f1f6ef74e553ab725f47bacf85dc7c684bf0c1b057f0c7c719dc098409e2dc8f3b2a032a31ed802bb4 SHA512 9851e978cd2e098142c8491596594283dd801fcf5bce896d3a322c76b12718ec1377772ca6a187b049f63a9395dbe37f213bd24ba061661adb4dc3191ab4ae60 -DIST github.com%2Frobertkrimen%2Fotto%2F@v%2Fv0.0.0-20191219234010-c382bd3c16ff.zip 315566 BLAKE2B d79708f86589c07185c9250defce96eb9df47257275cd2dffa456c33ba87381c37df99b2ba08ce41cc5e06cd09eb241dd46ac0c05e9abe92bf427058bc4d391d SHA512 7b92a1a14177fdfc31713bb5fc4d72e90673ce934bac5ed2b55d52feaa434211270ccb5474b9333b5e1d426cee99df0624c8ecc9bc2c4361e281517c1693beb6 -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051 -DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb70ef29156c1d31247bcab91ca7cc02f4164ed28a98769f1eede3e680b9b41dc55371a4dcbfe27b92bfce546ee2f1ca447f8623fb3fd88174888 SHA512 908f2454a0722d403aa33ea6cd1d40617ae8b84c62efc9a5de0bcf9c40413b6ba8412ac831e4b54b237190131be56e23266a9e18b0b680da5fd588e889985da3 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5 -DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52 -DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db -DIST github.com%2Fxo%2Fterminfo%2F@v%2Fv0.0.0-20200218205459-454e5b68f9e8.mod 30 BLAKE2B f34dc4736d35b48624f793cec1a79b2a84abb314ad9563734e2768d6f175f117119c06397dcc57880e068b0f9c1d97f4353201450c3ea004eca4d76549d06acb SHA512 a79c50ffbd2e6c4bc4907c302e2811afcd5640c7e35e8d4f211e071e42b9aed218510f190d759a408509a61457259fd6a59be658eec49751910108e8e8537e8c -DIST github.com%2Fxo%2Fterminfo%2F@v%2Fv0.0.0-20200218205459-454e5b68f9e8.zip 43813 BLAKE2B 2e4ca99aad9b097ba75abb865b95b7ea616435306aef8b64cf6f79dc1793e7bca11d363d594d09bacc299bdf9bf3628c9ce5283e5a0b8c600bc6955850f2aa6b SHA512 c0845c9113dc3fc9a7214c929766c6ec136915f5485b0b5bdf5694db24cc82dd13c771de7699c7511312e3b7ea3823eb690c44dcd5d634c83a10ca5e20b4765c -DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20190206043414-8bfc7677f583.mod 291 BLAKE2B 76046d47d2745d1da7da59fc3567bb62dd625a3434a1c0d083ad2652c841444ef764da918b3d89ab9d5161599d7b390524fbe13129fc834b2185ef3c133dc3ea SHA512 b5b090f05e4fea6333bbc9681c7486be621c92074bbc894c405991c297e43d96f2522f14298a42e4b912aa71d274b35912cc39be5d224157f50e1090c4789977 -DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20191220021717-ab39c6098bdb.mod 291 BLAKE2B 76046d47d2745d1da7da59fc3567bb62dd625a3434a1c0d083ad2652c841444ef764da918b3d89ab9d5161599d7b390524fbe13129fc834b2185ef3c133dc3ea SHA512 b5b090f05e4fea6333bbc9681c7486be621c92074bbc894c405991c297e43d96f2522f14298a42e4b912aa71d274b35912cc39be5d224157f50e1090c4789977 -DIST github.com%2Fyuin%2Fgopher-lua%2F@v%2Fv0.0.0-20191220021717-ab39c6098bdb.zip 196162 BLAKE2B b07fe77e46150aedb02428bf26921cd46b9818446ad129e71478cc59febd868355ffa1e73dfda310f783765e9fdc3d03693d80f71d30787f16e2aeb3b1a590f2 SHA512 9da71aaa66cfd01cbfe3294b669eb2d516e9ade363fef0d4e028da9d8e2b404d3f617d9ac5a2b84a791b0b6546105395ce8bfb59624c86cfb3db21c99583ae9b -DIST github.com%2Fzyedidia%2Fclipboard%2F@v%2Fv1.0.3.mod 46 BLAKE2B 9d8cbb00d9f6e7efd1acec5ce1c75cd3d9e1cd097625d94c34b2132a395ea623e14cff0e13eb89fce1f6c7940ea623aac279499b33d362e9b7a4156eb0bb2503 SHA512 2967c53c72950c1503ee0c5ec1814808c807bb68eb1dacc67871c60d03224687778004d4353cf41c3773c09cab7f477a4c0353ce92cbe5ac67fbd1e623ea871e -DIST github.com%2Fzyedidia%2Fclipboard%2F@v%2Fv1.0.3.zip 7638 BLAKE2B 17814d723c39dc7ae047f0e6d8667bbd6f81ad8fa23982240f4b25ea1eb6005de13a8cf52d161316e29c3775d30f5570bb916ff340d891e3eecdb748542a1ba2 SHA512 28e6575547feb8308d4e6c630dae834299da6d620f37cccc5a115661bf742b7c27089e408ab3c5d696f1fecf7190efc74b13a2e6552a0f851652270999d27d13 -DIST github.com%2Fzyedidia%2Fglob%2F@v%2Fv0.0.0-20170209203856-dd4023a66dc3.mod 32 BLAKE2B dd6f710f737ddb96e0f847c78cd94524c0c82d77c8042766f07face129b37e7c2e28d12c938d6baa9c1757fd7d5517720f7e42d43350391e07e4929483708ca4 SHA512 780ba1883bab7821c31b97046b8ee86729bff9e4b64e3895101dd163cb00fa099c9644734d3cc3f1a2147a60748b1d0f5b8897d744db4a8f4b6353c312377706 -DIST github.com%2Fzyedidia%2Fglob%2F@v%2Fv0.0.0-20170209203856-dd4023a66dc3.zip 3415 BLAKE2B 4d21307cd67ffec142c5e17e634f2e6f6f2f09f3775faca0c386b4c047d152e0a793a98815a59bc97070e6e9773f4ef02325c194e079d265ef8edd59a54df876 SHA512 df4e5fcc8334273a8e75e39f35a4655a9643cf6f335184be62139f79412bf218739238ee7e13599efdcfe1c7b2d64c4aad4d053d1a80624cbfe847cf31df3582 -DIST github.com%2Fzyedidia%2Fgo-runewidth%2F@v%2Fv0.0.12.mod 87 BLAKE2B 926b47deeb1e94761b5c974828d9311037decfcaf1a4b304db756d1d3348f6b6c76cd5ac532332ff0d129adaa65733d99017bb102ef9a1bbb8827ba1406ceb77 SHA512 98ea5d7c9916c2c11377fea22bdb80d91ffd63084c2f1c820d15fbaac5617bb790feaef23516c5d74f164b5186e09467adde8b6ffef93f017820ecfe6d2cdcd1 -DIST github.com%2Fzyedidia%2Fgo-runewidth%2F@v%2Fv0.0.12.zip 20565 BLAKE2B c086b0569da04740dcc5cf823e2e880ca719bb27769d4c315699818ba708886e6aed4a2c3ac8de25a36b957913ed005229436d462cb0f83c5ab66ec275850fda SHA512 6c3556d1bb1673e264b0ed14be57487fc596f3e6e5d8e7912a62bb521bbdb5767e2f78afb020e04bf319c0194dde78629893f7963a63e11818c3931732db367e -DIST github.com%2Fzyedidia%2Fgo-shellquote%2F@v%2Fv0.0.0-20200613203517-eccd813c0655.mod 41 BLAKE2B b91ca86f50359fa2e7e9ba54d0602f41e3d492d532893db01351235a478c3dbbb2951bd74242467ae0eac3c0ecd0bb3b074ed5f5e9e8d95f1f514385332cc1a1 SHA512 169bd9584e7561fd046d68c3ba89262ed44328b82057441d5bd3d1ac23ac0fc87421dac1d5f3f05dd640f929a1b92825bf99dc5fcd2274d835869b2d78ccb618 -DIST github.com%2Fzyedidia%2Fgo-shellquote%2F@v%2Fv0.0.0-20200613203517-eccd813c0655.zip 7113 BLAKE2B f6202f64f26b52d0d2fceda72739f038e2afa031b9ef582ca6e866b498d2d73d813a31e31af9c00aeb5c9eb78612e2c2a8ec66c9442c7e195039d7633b6fb02a SHA512 8f00d4deb9132b086ce684e44f13e82b26f5563af0f4dbdf04d6c4c8a2fef971df1c4eb22bddd4a3df9ed72fc44f7b23391f75166c6b0470790aa47a7c2083e1 -DIST github.com%2Fzyedidia%2Fhighlight%2F@v%2Fv0.0.0-20170330143449-201131ce5cf5.mod 37 BLAKE2B bdd14542b3e217fc4e87a7ab03be614823c10a7aebd9fda814ea15d87593d3994b5dd32801ce9e156b5d477d2092c5b84cce3ee029192cafd4fabeb9d0d57885 SHA512 24c4a29fb24be0fb63d65e57655d52a61fb0242063b1c09f20056c2e173e27b5e7ddffc613746bc17ad3cb05c5d5d19fab46b25e56eea3384f176849658d0267 -DIST github.com%2Fzyedidia%2Fhighlight%2F@v%2Fv0.0.0-20170330143449-201131ce5cf5.zip 111801 BLAKE2B 9d3f07e9744ce99a02740c01f532b34d2d59c2e4811bd375d06c4ae4bd31ab2bdbd0ac81de9ad1c321a2aefbb17479c7a8984f849c84c16be1f37df6899884e3 SHA512 09b32cae2105a294eccfc276c3026b7943dd1cc3c6908cc5cb02d3784fe4d37576ddb1b256f52d431290209a4b590c72e840f1f3754a8ef61c05960f19d4a3a7 -DIST github.com%2Fzyedidia%2Fjson5%2F@v%2Fv0.0.0-20200102012142-2da050b1a98d.mod 33 BLAKE2B 48918ee4bfcf3068539ad3f438cd4a51db586b6e3d8d468557a3d5484c8938e0394e05e5278f574631da39ecfcb5875663724280d27c9c4adc61a1ea80beaa3f SHA512 04e721b0cfb6338d1bdeaee8a3abc5c0ae2075f9abf92a66b2954e1d9464fdc71321237d9fbb6486002374925bddc487b2c340643bacb6e4e9da05c9088f0051 -DIST github.com%2Fzyedidia%2Fjson5%2F@v%2Fv0.0.0-20200102012142-2da050b1a98d.zip 81515 BLAKE2B 17abd39f209386757e5d8e3edb912b6f71f5ecce3f1cee31f1cac2b46f254d14f07dd262f54fa6f0c6ded359c8d30798a99a2964e4d2ed0cf6372495d3512c66 SHA512 fa1b78d2b42eaa619bf950fa01973c8c5a21b6b647d73f2ee74f9687f473927f6bc0cf7c2a272d10b80a90cfd0d2b82a5f01aa639471b584d13cbfa13a899ea4 -DIST github.com%2Fzyedidia%2Fpoller%2F@v%2Fv1.0.1.mod 34 BLAKE2B 22d6340dbabd18dd078d1ceba0ec6f17b15680007822b628a0bad52ac9388745cbb253661aef08d58c63850fa5a478a46b635a8e314a37286de505daf7c4eb35 SHA512 daf83940cc17a02565aa383103449e60cb06ad55c8e7bb42ea4374cf9d4783a8c1b4be8da2d38933c528bf4a558a75e6b96d9e09171c87128c3e650d68c74286 -DIST github.com%2Fzyedidia%2Fpoller%2F@v%2Fv1.0.1.zip 25272 BLAKE2B 50eee92c460dfff99f8261c1b5bd45d8ddd029396fff85acb67afe0eb25e0120a683c575d8f331daeb2c9b74e829d418700cc937655fdd8545153e947b3034e8 SHA512 0234099663b08401480685679a73e322bd506791e058423516d0cd6670c6c1ac0999d613a442fa7b1f7846086df0f92d83659e116b713c17709f804003097fd1 -DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv1.1.15.mod 40 BLAKE2B aff997dcc39cacc15c2c70f9c55b59423e04a0d674c16f69650844da8eaef71d07407db21acbc90e4ca223007572a6d0cdafa8027f3392da97b682c040302eb3 SHA512 ac31a74f5618ad145697ab02ce101f6fab35ae2518ed3ba1f160024b370f9741ebf3fa2831527fe0fcf08b54d81b9793ef096b39a33992c8412ef514bdb0ced5 -DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv1.1.15.zip 24480 BLAKE2B c12522ff9844ba6cd151074d938f2be36d19c4e5cac4906ee0373116c7b8c3241dac349282c11c3c021c9f4416e3c36a8cd91418eeff29f8406bd8b4a8cb3ba9 SHA512 cd4a9dfd077afeda2c1c501c8d010ff7b51dad6c79354db10be3e869e665ae90f60992132f91d91a8754b8124cb902d91ecfdb5a9fc1aaf7df2d036c720c6023 -DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv2.0.0+incompatible.mod 31 BLAKE2B 0d0decd07c2ebd17e899f2c4032a6dab06ea54a764b90997442d29d5b7464bb993cbeb9a842b547424e8b187717895ad811e589784a213e4d00fabf0b8e28db8 SHA512 919c519a4fb1d1f3d13f1217f59f82aaaa202a65ac201c64ef0ebde46a4e5f6c977282b5afcd11778ad38d35b4591c1190bb94be66010a346a47253d1ee32db2 -DIST github.com%2Fzyedidia%2Fpty%2F@v%2Fv2.0.0+incompatible.zip 15796 BLAKE2B d4cb2490b6b8d1914f802e7e767e0d29be06b6946012c4d84f9e7a898a4a2d20d64b9cd84eb5ab729ff8c1d1925a8f3ccab78f56f249d56a7cc5feacadd82ea7 SHA512 a51787e01adcedd20ddbba543351904bdde3c25f44f9621cfe0ffa73ed28d0b21327aadbe529a73374ffbd315b91b4d0d0d7f2c9fcc033d67f21158ce486e2f1 -DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.6.mod 348 BLAKE2B ea7eb55e01e85f76b88f072b02e36bbeb800eaec4ce39404f4acc409ac05af51e78c3e26d317cfdade2a3adb28bfddbd5233db60c300bc5f3a8e5eeb7f09eeac SHA512 b3db94f2a7c44d7350d89acb9a118c6f8d3c39530a1af23c5e1aa9f9fa842a06ec5e7f5af4e87901cb08c841e7f953b3f83a3ae6488f9f3d14d4ee063b53ffcb -DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.6.zip 187590 BLAKE2B a3b641b2aa2af33386e1abf651265ae2193dce91b99c2736b494de20b80c7ce546882c980ca2893e96a845a93dbb11db6e79a6c50ed15388aecb7f72d4c8c4d4 SHA512 85c0d085eccf722bc9bf0b1fa077e1d639523c97ffe0445d3b2bd5025520be9a4250db2f897dfaf65b4aa8db41901bd214d0c85da51f76e9c0be6d8361d561ec -DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.7.mod 348 BLAKE2B ea7eb55e01e85f76b88f072b02e36bbeb800eaec4ce39404f4acc409ac05af51e78c3e26d317cfdade2a3adb28bfddbd5233db60c300bc5f3a8e5eeb7f09eeac SHA512 b3db94f2a7c44d7350d89acb9a118c6f8d3c39530a1af23c5e1aa9f9fa842a06ec5e7f5af4e87901cb08c841e7f953b3f83a3ae6488f9f3d14d4ee063b53ffcb -DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.7.zip 187662 BLAKE2B 527b4656a565d47adbfe9315d8632d4b4782811a4a05b63b1a02f19d4e33c30515cae9a7a383eb563abbd4a508e5538ca8dd922edb6304f4075a6df9eeacd485 SHA512 ccf387f4fc5218a017ff1edc5ed9ab2456472cfc8a8418a2664b587fb81ff234fee3f69ca9d4d7620e904eee274996aea05a52541c94e52eac605b61d6358a60 -DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.8.mod 348 BLAKE2B ea7eb55e01e85f76b88f072b02e36bbeb800eaec4ce39404f4acc409ac05af51e78c3e26d317cfdade2a3adb28bfddbd5233db60c300bc5f3a8e5eeb7f09eeac SHA512 b3db94f2a7c44d7350d89acb9a118c6f8d3c39530a1af23c5e1aa9f9fa842a06ec5e7f5af4e87901cb08c841e7f953b3f83a3ae6488f9f3d14d4ee063b53ffcb -DIST github.com%2Fzyedidia%2Ftcell%2Fv2%2F@v%2Fv2.0.8.zip 187655 BLAKE2B 9bb3b50d2124d2dc8eceb173683a9e5b9bb8c03818fe8fa2b8d468ad27a81b92468f239717de28791a49461d830ab9f0467e7eca90fc223aa57bde764277bdde SHA512 3e18af5b738b0159867cf0d16b4b2a6976c22370279681f7263ba226c66205c92f800ab76e5529776c2967dc144fdb327e94dbab83ee051ac8f2cbd1346850e0 -DIST github.com%2Fzyedidia%2Fterminal%2F@v%2Fv0.0.0-20180726154117-533c623e2415.mod 36 BLAKE2B 3cb28ee3349be36d7ce15690d16e2f0d17e60e2bf3bf6ad506e591338d3787c7a9d2d658347c3a3c5e858b091ab41f59e261647a0e2738c91c3ee8508b680493 SHA512 84a84f76d05e19cd18dc80abc820fc4209c9a85eef25444a9afcb90a7bb9cfbf15aa233d8ce9592681e78083dbd1b6311b3043884fa0260c03490a6e0318ac73 -DIST github.com%2Fzyedidia%2Fterminal%2F@v%2Fv0.0.0-20180726154117-533c623e2415.zip 19567 BLAKE2B 673ddc13e6530cfbd25fe67179b310f0462632b0b711e74a25eea49ded6885e079f05bf292982440c55d818e9e1988ca7a05c12e19fd6020a65b34d28979e73c SHA512 a4936b6534317e3840e78d6af3ecaf92b2311541a191b3fd84a85e22c3717d7bb688bc0f95a3dd9753c673706980bd00a219f11432155d53984a839b3d3abdf0 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190204203706-41f3e6584952.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip 1867927 BLAKE2B bd890b16f2adb601f5655ca3f4815bbb335fe48c961b06f316ec579ff6efa2fc8f360d7c0bf272dc2d35e9a0470235c36cee331399ed01d8c455172f39921194 SHA512 59a4db96e438a1f03af9b00070f4d3772f1eeeff72334e6bc8ad1774bf202d39f7129572cd75fb9e1ecdfc7a532c5cd91bfdbfab3ebd10228bc6733e9556f70c -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884 -DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa -DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2 -DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d -DIST gopkg.in%2Fsourcemap.v1%2F@v%2Fv1.0.5.mod 29 BLAKE2B 4d2c59657c3367fe4f7a4b4be4d6b067ae908b24173121a92d8be3dc60d0b6ef70e66e2b9a46fb254c52c3e45930dd510701cb53eef08762f3ccb16bee893eae SHA512 007886ad618ada8246c9a297a88be315d25fd6702cf82b6d2de75546336670829a4acfe4c49515b2aa58a04d6bffed185b1aec1bd635a532461f310156ff5f32 -DIST gopkg.in%2Fsourcemap.v1%2F@v%2Fv1.0.5.zip 8093 BLAKE2B 09c16b7dccba5b759eaa4f0f5697bb66a572b0db7fd5d69cb279053ba18a4ed4a47d1513a7c600a43cdc6688b29b747cbf439d008318795413dd6161e020af51 SHA512 f90b6e201e75afbe9bc228b8909944e0f2509cfc6463ac7bd1572d644352b19dda9c5219e217706bc230ca9f15b2bf086b7721e86fac1b5c47b6bb9d2da194a3 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379 -DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920 -DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.mod 109 BLAKE2B 08629b072202d338d461af7142fd4049b4db1c2df5997c995edfa9b12b2db2df0da8160db7032bc84215c742ad67021910b2fa3ec87c33c14fec309a137cb174 SHA512 b2ec68ffa8d8e747ebfc1f6103ec980c0e02d372a50d44c1ca289688cceb41006443c02c937975bf5847460a6a071d17f1f0c8ee7549fa1cf4eccdf848020ac2 -DIST layeh.com%2Fgopher-luar%2F@v%2Fv1.0.7.zip 36857 BLAKE2B c4ff2a1bbc2dc984fc24065f71b560cbdda220b78d88cff9ed5a91654984cd56c9e85b64a416c140e4b01bfda75734f7c77f882e3fb45a0227b3f47cc02781c8 SHA512 94b70a83a31acde7232223ca82d6588716b39d6463baf5f15d921a5bc24a7d9b98307b8d44d3bbc9a5a82f6e4111b2b9ba1c15ee313a3784a30d63fe5d198bd3 -DIST micro-2.0.10.tar.gz 814030 BLAKE2B 8becaf7caa167747443e1aa3af32e96588af275d2b921fa88fe9d55b4eec22622cf7a68d85d47834159042100414855c5bb3f8b9f7c8d934f762ec63f4d40435 SHA512 06796270a6d99578ac36f3313dffb6ba56c5e8963c6b59562b4ef9e65036ae2ed21ce602b39ee08d2f3c54c501089166fdecc5719a1ca535d84960b3b4b67f72 -DIST micro-2.0.9.tar.gz 811560 BLAKE2B 2e461593e71fda69a6f75e5adfaedd7bcf052b8bda9899f03a1e25e3db3bb8071bec80716d14a0ff7a381728871f0705076ef69e4de58f40499a7501343b4063 SHA512 5dbf81deb734618ec0a8ccaffc65f972d8da1d28b761c31bf3f5433c02ad6daa2360b1ea825c0a2cfce2f8d31d6481d468bbe29b42e1c96083c7a941fe42bc3a +DIST micro-2.0.13-deps.tar.xz 10314120 BLAKE2B 45b7c6ecbf5af8f234bfe612cff3ab33bb7115b3ff55395632cdfb89ac7645f599802460ae17271bf8279a189fe51d3e4d47039849dac23885ea0c344a0d100c SHA512 c592e37c7673d172d4c1c60a0689af886fd551b8c812370c3312d474d3cc0e81b299a1d1d339fff4edb3c0feed93c330109fa3433865fd888b845f0739cc1ade +DIST micro-2.0.13.tar.gz 563438 BLAKE2B f3d1876e9eff95fa59d52cc324c4682609c80fff4be8b37fdc701c452df54f35fe57502b0dac7d8aa07f7d02496c3c7ed8f06bba515466a631a39b1816eceba3 SHA512 b4b1dd3b03c906ee5c0bf9d0b576efea2a527fcdb0fe40338c78515fd5f6a4eb22bd9541567bb5956c4087e749775a1e8c33a73d185f7a6b00ba91e405d6a117 diff --git a/app-editors/micro/files/micro-2.0.12-no-strip.patch b/app-editors/micro/files/micro-2.0.12-no-strip.patch new file mode 100644 index 000000000000..48700182bd18 --- /dev/null +++ b/app-editors/micro/files/micro-2.0.12-no-strip.patch @@ -0,0 +1,25 @@ +--- a/Makefile ++++ b/Makefile +@@ -16,18 +16,18 @@ VSCODE_TESTS_BASE_URL = 'https://raw.githubusercontent.com/microsoft/vscode/e6a4 + build: generate build-quick + + build-quick: +- go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro ++ go build -trimpath -ldflags "-w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro + + build-dbg: +- go build -trimpath -ldflags "-s -w $(ADDITIONAL_GO_LINKER_FLAGS) $(DEBUGVAR)" ./cmd/micro ++ go build -trimpath -ldflags "-w $(ADDITIONAL_GO_LINKER_FLAGS) $(DEBUGVAR)" ./cmd/micro + + build-tags: fetch-tags generate +- go build -trimpath -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro ++ go build -trimpath -ldflags "-w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro + + build-all: build + + install: generate +- go install -ldflags "-s -w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro ++ go install -ldflags "-w $(GOVARS) $(ADDITIONAL_GO_LINKER_FLAGS)" ./cmd/micro + + install-all: install + diff --git a/app-editors/micro/metadata.xml b/app-editors/micro/metadata.xml index 7128365b1861..87b4441bb04c 100644 --- a/app-editors/micro/metadata.xml +++ b/app-editors/micro/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>telans@posteo.de</email> - <name>James Beddek</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <name>Proxy Maintainers</name> - <email>proxy-maint@gentoo.org</email> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="github">zyedidia/micro</remote-id> </upstream> diff --git a/app-editors/micro/micro-2.0.10.ebuild b/app-editors/micro/micro-2.0.10.ebuild deleted file mode 100644 index 330643ba0fac..000000000000 --- a/app-editors/micro/micro-2.0.10.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit go-module optfeature desktop xdg - -# Building this list can be done by: -# cd $(mktemp -d) -# PV="2.0.10" -# wget "https://github.com/zyedidia/micro/archive/v${PV}.tar.gz" -# tar -xvzf "v${PV}.tar.gz" -# sed -Ee 's/^(.+) h1:.+$/\t"\1"/g' "micro-${PV}/go.sum" > go.sum.out -EGO_SUM=( - "github.com/blang/semver v3.5.1+incompatible" - "github.com/blang/semver v3.5.1+incompatible/go.mod" - "github.com/chzyer/logex v1.1.10/go.mod" - "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" - "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/dustin/go-humanize v1.0.0" - "github.com/dustin/go-humanize v1.0.0/go.mod" - "github.com/gdamore/encoding v1.0.0" - "github.com/gdamore/encoding v1.0.0/go.mod" - "github.com/go-errors/errors v1.0.1" - "github.com/go-errors/errors v1.0.1/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/lucasb-eyer/go-colorful v1.0.3" - "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod" - "github.com/mattn/go-isatty v0.0.11" - "github.com/mattn/go-isatty v0.0.11/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/rivo/uniseg v0.1.0" - "github.com/rivo/uniseg v0.1.0/go.mod" - "github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff" - "github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod" - "github.com/sergi/go-diff v1.1.0" - "github.com/sergi/go-diff v1.1.0/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.4.0" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8" - "github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8/go.mod" - "github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod" - "github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb" - "github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod" - "github.com/zyedidia/clipboard v1.0.3" - "github.com/zyedidia/clipboard v1.0.3/go.mod" - "github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3" - "github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3/go.mod" - "github.com/zyedidia/go-runewidth v0.0.12" - "github.com/zyedidia/go-runewidth v0.0.12/go.mod" - "github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655" - "github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655/go.mod" - "github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5" - "github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5/go.mod" - "github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d" - "github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d/go.mod" - "github.com/zyedidia/poller v1.0.1" - "github.com/zyedidia/poller v1.0.1/go.mod" - "github.com/zyedidia/pty v1.1.15" - "github.com/zyedidia/pty v1.1.15/go.mod" - "github.com/zyedidia/tcell/v2 v2.0.8" - "github.com/zyedidia/tcell/v2 v2.0.8/go.mod" - "github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415" - "github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415/go.mod" - "golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod" - "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod" - "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037" - "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.2" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/sourcemap.v1 v1.0.5" - "gopkg.in/sourcemap.v1 v1.0.5/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.2.7" - "gopkg.in/yaml.v2 v2.2.7/go.mod" - "layeh.com/gopher-luar v1.0.7" - "layeh.com/gopher-luar v1.0.7/go.mod" -) - -go-module_set_globals - -DESCRIPTION="Modern and intuitive terminal-based text editor" -HOMEPAGE="https://github.com/zyedidia/micro" -SRC_URI=" - https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI} -" - -LICENSE="MIT Apache-2.0 BSD MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -BDEPEND="dev-vcs/git" - -src_compile() { - go build -v -work -x -o ${PN} -ldflags \ - "-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${PV} -X github.com/zyedidia/micro/v2/internal/util.CompileDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \ - ./cmd/micro || die -} - -src_install() { - dobin ${PN} - doman ./assets/packaging/micro.1 - domenu assets/packaging/micro.desktop - einstalldocs -} - -pkg_postinst() { - # update desktop file mime cache - xdg_pkg_postinst - - optfeature_header "Clipboard support with display servers:" - optfeature "Xorg" x11-misc/xsel x11-misc/xclip - optfeature "Wayland" gui-apps/wl-clipboard -} diff --git a/app-editors/micro/micro-2.0.13-r1.ebuild b/app-editors/micro/micro-2.0.13-r1.ebuild new file mode 100644 index 000000000000..228d3d9cecc8 --- /dev/null +++ b/app-editors/micro/micro-2.0.13-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module optfeature desktop xdg + +DESCRIPTION="Modern and intuitive terminal-based text editor" +HOMEPAGE="https://github.com/zyedidia/micro" +SRC_URI="https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz" + +LICENSE="MIT Apache-2.0 BSD MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + +BDEPEND="dev-vcs/git" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.12-no-strip.patch +) + +src_compile() { + # We build/install this way for bug #915628 (highlighting) + emake VERSION=${PV} build +} + +src_install() { + dodir /usr/bin + emake VERSION=${PV} GOBIN="${ED}"/usr/bin install + doman ./assets/packaging/micro.1 + domenu assets/packaging/micro.desktop + einstalldocs +} + +pkg_postinst() { + # Update desktop file mime cache + xdg_pkg_postinst + + optfeature_header "Clipboard support with display servers:" + optfeature "Xorg" x11-misc/xsel x11-misc/xclip + optfeature "Wayland" gui-apps/wl-clipboard +} diff --git a/app-editors/micro/micro-2.0.9.ebuild b/app-editors/micro/micro-2.0.9.ebuild deleted file mode 100644 index eb2eaab1c676..000000000000 --- a/app-editors/micro/micro-2.0.9.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module optfeature - -EGO_SUM=( - "github.com/blang/semver v3.5.1+incompatible" - "github.com/blang/semver v3.5.1+incompatible/go.mod" - "github.com/chzyer/logex v1.1.10/go.mod" - "github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod" - "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/dustin/go-humanize v1.0.0" - "github.com/dustin/go-humanize v1.0.0/go.mod" - "github.com/gdamore/encoding v1.0.0" - "github.com/gdamore/encoding v1.0.0/go.mod" - "github.com/go-errors/errors v1.0.1" - "github.com/go-errors/errors v1.0.1/go.mod" - "github.com/kr/pretty v0.1.0" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0" - "github.com/kr/text v0.1.0/go.mod" - "github.com/lucasb-eyer/go-colorful v1.0.3" - "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod" - "github.com/mattn/go-isatty v0.0.11" - "github.com/mattn/go-isatty v0.0.11/go.mod" - "github.com/mitchellh/go-homedir v1.1.0" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/p-e-w/go-runewidth v0.0.10-0.20200613030200-3e1705c5c059" - "github.com/p-e-w/go-runewidth v0.0.10-0.20200613030200-3e1705c5c059/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/rivo/uniseg v0.1.0" - "github.com/rivo/uniseg v0.1.0/go.mod" - "github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff" - "github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod" - "github.com/sergi/go-diff v1.1.0" - "github.com/sergi/go-diff v1.1.0/go.mod" - "github.com/stretchr/objx v0.1.0" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/testify v1.4.0" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8" - "github.com/xo/terminfo v0.0.0-20200218205459-454e5b68f9e8/go.mod" - "github.com/yuin/gopher-lua v0.0.0-20190206043414-8bfc7677f583/go.mod" - "github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb" - "github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod" - "github.com/zyedidia/clipboard v1.0.3" - "github.com/zyedidia/clipboard v1.0.3/go.mod" - "github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3" - "github.com/zyedidia/glob v0.0.0-20170209203856-dd4023a66dc3/go.mod" - "github.com/zyedidia/go-runewidth v0.0.12" - "github.com/zyedidia/go-runewidth v0.0.12/go.mod" - "github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655" - "github.com/zyedidia/go-shellquote v0.0.0-20200613203517-eccd813c0655/go.mod" - "github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5" - "github.com/zyedidia/highlight v0.0.0-20170330143449-201131ce5cf5/go.mod" - "github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d" - "github.com/zyedidia/json5 v0.0.0-20200102012142-2da050b1a98d/go.mod" - "github.com/zyedidia/poller v1.0.1" - "github.com/zyedidia/poller v1.0.1/go.mod" - "github.com/zyedidia/pty v2.0.0+incompatible" - "github.com/zyedidia/pty v2.0.0+incompatible/go.mod" - "github.com/zyedidia/tcell/v2 v2.0.6" - "github.com/zyedidia/tcell/v2 v2.0.6/go.mod" - "github.com/zyedidia/tcell/v2 v2.0.7" - "github.com/zyedidia/tcell/v2 v2.0.7/go.mod" - "github.com/zyedidia/tcell/v2 v2.0.8" - "github.com/zyedidia/tcell/v2 v2.0.8/go.mod" - "github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415" - "github.com/zyedidia/terminal v0.0.0-20180726154117-533c623e2415/go.mod" - "golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod" - "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod" - "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037" - "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.2" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15" - "gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod" - "gopkg.in/sourcemap.v1 v1.0.5" - "gopkg.in/sourcemap.v1 v1.0.5/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.2.7" - "gopkg.in/yaml.v2 v2.2.7/go.mod" - "layeh.com/gopher-luar v1.0.7" - "layeh.com/gopher-luar v1.0.7/go.mod" -) - -go-module_set_globals - -DESCRIPTION="Modern and intuitive terminal-based text editor" -HOMEPAGE="https://github.com/zyedidia/micro" -SRC_URI=" - https://github.com/zyedidia/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI} -" - -LICENSE="MIT Apache-2.0 BSD MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -src_compile() { - go build -v -work -x -o ${PN} ./cmd/micro || die -} - -src_install() { - dobin ${PN} - doman ./assets/packaging/micro.1 - einstalldocs -} - -pkg_postinst() { - optfeature_header "Clipboard support with display servers:" - optfeature "Xorg" x11-misc/xsel x11-misc/xclip - optfeature "Wayland" gui-apps/wl-clipboard -} diff --git a/app-editors/moe/Manifest b/app-editors/moe/Manifest index fda80cb2889c..d14cfd3430ca 100644 --- a/app-editors/moe/Manifest +++ b/app-editors/moe/Manifest @@ -1,3 +1 @@ -DIST moe-1.10.tar.lz 84050 BLAKE2B 2e49aba27cdd603fbc9a4eb0fef5e086a527087d72f30f68beb4e3389de0ccdd85fec5bf753b3187d64cd6549ac5738c89e94c543c141f88896c580e7c33ad42 SHA512 3908d7906aa7dcb8bd4a5d340fe94b06fc91814098c20e8939906c2b0e03e1a8a3c95847b5f8111a5d9f37636a2fafa52f9105e0e8fa0ad8b16c2f9e9dede748 -DIST moe-1.11.tar.lz 89532 BLAKE2B 8479c8bb0504e614b4ad87e47ae89d1f0eb23141ff71ef3e46eb316424dfe87150f2d9474e1dbd3510fa9b1da517bd6afe47b2cd36f1aa70630b371f0f6bec3a SHA512 147f3500909739371290fc2f703ef5fab286d2ca385f6808ee3e0cb1cbae2ed58a0b5046d30ad5d24215dc28d77f0bba4efacb144c116209d89d023e731e8a39 -DIST moe-1.9.tar.lz 82046 BLAKE2B 9144dfc4ce17bc04f3ad9aa9ec271f173df6c581705e5d922a346f94c086a97af9429478c016d7081c1fd38787055666504f04d25a8b9f5c1020dc147aaafdb0 SHA512 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929 +DIST moe-1.12.tar.lz 87917 BLAKE2B b036b24193045cd5c64812af13e6cf542700e649e78f3ba416501d0915c0ac2eef09bebdb333d145e0428dfacdccef431588ce93b1f407a41a7bd7e0acbc163c SHA512 f0d5daba70d0018ce82d6673749b8f688c0bac58de7684cc24f5badffd6868d425c9f771404186ab5cec12ab94c3e20af870bd920bfef0432a622925838ebed7 diff --git a/app-editors/moe/files/moe-1.12-respect-user-flags.patch b/app-editors/moe/files/moe-1.12-respect-user-flags.patch new file mode 100644 index 000000000000..2a83cb7d4c2f --- /dev/null +++ b/app-editors/moe/files/moe-1.12-respect-user-flags.patch @@ -0,0 +1,17 @@ +--- a/configure ++++ b/configure +@@ -21,11 +21,9 @@ + infodir='$(datarootdir)/info' + mandir='$(datarootdir)/man' + sysconfdir='$(prefix)/etc' +-CXX=g++ +-CPPFLAGS= +-CXXFLAGS='-Wall -W -O2' +-LDFLAGS= +-LIBS=-lncurses ++CPPFLAGS="$(${PKG_CONFIG} --cflags ncurses) ${CPPFLAGS}" ++CXXFLAGS="-Wall -W ${CXXFLAGS}" ++LIBS="$(${PKG_CONFIG} --libs ncurses) ${LIBS}" + + # checking whether we are using GNU C++. + /bin/sh -c "${CXX} --version" > /dev/null 2>&1 || { CXX=c++ ; CXXFLAGS=-O2 ; } diff --git a/app-editors/moe/files/moe-1.6-tinfo.patch b/app-editors/moe/files/moe-1.6-tinfo.patch deleted file mode 100644 index 5a94ec599e89..000000000000 --- a/app-editors/moe/files/moe-1.6-tinfo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in.orig 2014-11-03 00:33:57.152593136 +0300 -+++ b/Makefile.in 2014-11-03 00:34:21.121592519 +0300 -@@ -4,7 +4,7 @@ - INSTALL_PROGRAM = $(INSTALL) -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_DIR = $(INSTALL) -d -m 755 --LIBS = -lncurses -+LIBS = $(shell ${PKG_CONFIG} --libs ncurses) - SHELL = /bin/sh - - edobjs = basic_buffer.o block.o buffer.o buffer_handle.o \ diff --git a/app-editors/moe/metadata.xml b/app-editors/moe/metadata.xml index 2c47fcf00594..984552d70fc8 100644 --- a/app-editors/moe/metadata.xml +++ b/app-editors/moe/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> - </maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="savannah">moe</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/moe/moe-1.10.ebuild b/app-editors/moe/moe-1.10.ebuild deleted file mode 100644 index 6d9028d722c4..000000000000 --- a/app-editors/moe/moe-1.10.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs unpacker - -DESCRIPTION="A powerful and user-friendly console text editor" -HOMEPAGE="https://www.gnu.org/software/moe/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm x86 amd64-linux ~x86-linux" - -RDEPEND=" - sys-libs/ncurses:0= -" -DEPEND=" - $(unpacker_src_uri_depends) - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - tc-export CXX PKG_CONFIG - sed -i \ - -e "/^CXXFLAGS=/d" \ - -e "/^LDFLAGS=/d" \ - -e "/^CXX=/d" \ - configure || die "sed on configure failed" - - eapply_user - - eapply "${FILESDIR}/${PN}-1.6-tinfo.patch" -} diff --git a/app-editors/moe/moe-1.11.ebuild b/app-editors/moe/moe-1.11.ebuild deleted file mode 100644 index 690bdeff4576..000000000000 --- a/app-editors/moe/moe-1.11.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs unpacker - -DESCRIPTION="A powerful and user-friendly console text editor" -HOMEPAGE="https://www.gnu.org/software/moe/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - sys-libs/ncurses:0= -" -DEPEND=" - $(unpacker_src_uri_depends) - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - tc-export CXX PKG_CONFIG - sed -i \ - -e "/^CXXFLAGS=/d" \ - -e "/^LDFLAGS=/d" \ - -e "/^CXX=/d" \ - configure || die "sed on configure failed" - - eapply_user - - eapply "${FILESDIR}/${PN}-1.6-tinfo.patch" -} diff --git a/app-editors/moe/moe-1.12.ebuild b/app-editors/moe/moe-1.12.ebuild new file mode 100644 index 000000000000..83d00419afd1 --- /dev/null +++ b/app-editors/moe/moe-1.12.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs unpacker + +DESCRIPTION="A powerful and user-friendly console text editor" +HOMEPAGE="https://www.gnu.org/software/moe/" +SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 arm ~riscv x86 ~amd64-linux ~x86-linux" + +RDEPEND="sys-libs/ncurses:=" +DEPEND="${RDEPEND}" +BDEPEND=" + $(unpacker_src_uri_depends) + virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-1.12-respect-user-flags.patch ) + +src_configure() { + tc-export CXX PKG_CONFIG + default +} diff --git a/app-editors/moe/moe-1.9.ebuild b/app-editors/moe/moe-1.9.ebuild deleted file mode 100644 index 0e627addb662..000000000000 --- a/app-editors/moe/moe-1.9.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs unpacker - -DESCRIPTION="A powerful and user-friendly console text editor" -HOMEPAGE="https://www.gnu.org/software/moe/" -SRC_URI="mirror://gnu/${PN}/${P}.tar.lz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - sys-libs/ncurses:0= -" -DEPEND=" - $(unpacker_src_uri_depends) - ${RDEPEND} - virtual/pkgconfig -" - -src_prepare() { - tc-export CXX PKG_CONFIG - sed -i \ - -e "/^CXXFLAGS=/d" \ - -e "/^LDFLAGS=/d" \ - -e "/^CXX=/d" \ - configure || die "sed on configure failed" - - eapply_user - - eapply "${FILESDIR}/${PN}-1.6-tinfo.patch" -} diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest index 5fe2ed4f8f04..c1b0861653a8 100644 --- a/app-editors/mousepad/Manifest +++ b/app-editors/mousepad/Manifest @@ -1,2 +1 @@ -DIST mousepad-0.5.6.tar.bz2 916738 BLAKE2B 59506a5eb362259889e580de52ed3135c339da4148dc1c99d7c7e6aee04d776f7ef67959a54aabfa29b7b174279f205cdaa0932199b407528019def24c4915c4 SHA512 24e974f793fd8660d39fc00156f8f8f07bae44133c6f58d705b1665f0b8d333f2248a6780b48794edb56e7faf7f206069a7866f76cbf91f6ce6b8b2ac7121f34 -DIST mousepad-0.5.7.tar.bz2 920371 BLAKE2B e019427316343a528786fc973b9aef4c63b5368140894212faea767311e6a18029aa093a9ac9f9ec831d637e0d8568bb76215a7c760162015309049b2ee10418 SHA512 0302fbf0d5e7ffe20a7f712dd0dc5878552572ec77798ed329b0e5688c0d4f80c5aa527f9fadb2de7452c8983bf1efd0e117ed7c170b0ca79e09006617f357ac +DIST mousepad-0.6.2.tar.bz2 1402314 BLAKE2B c783ec58317ca3c0eaa0023ade3043f4aa4f020a12c0258fe0cf1e2303aa07dfbc67b9aa0178ca9282da98754103fda6c90ba034fa4057dd855b400c0d371085 SHA512 086f60f6f405290ed76366f4c5195e9c8f9c5058d1892200a73e48d6378428efe47f2038e3eddb81186e22dd87d57580559a556b1b22f202b6f056c7f90b64ea diff --git a/app-editors/mousepad/metadata.xml b/app-editors/mousepad/metadata.xml index fb3a6777ad9f..7ff48004695c 100644 --- a/app-editors/mousepad/metadata.xml +++ b/app-editors/mousepad/metadata.xml @@ -5,4 +5,7 @@ <email>xfce@gentoo.org</email> <name>XFCE Team</name> </maintainer> + <use> + <flag name="shortcuts">Build the "shortcuts" plugin</flag> + </use> </pkgmetadata> diff --git a/app-editors/mousepad/mousepad-0.5.6.ebuild b/app-editors/mousepad/mousepad-0.5.6.ebuild deleted file mode 100644 index ea82a7eeeb5a..000000000000 --- a/app-editors/mousepad/mousepad-0.5.6.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 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 - >=x11-libs/gtk+-3.22:3 - >=x11-libs/gtksourceview-4.0.0:4" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/perl - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - local myconf=( - --enable-gtksourceview4 - ) - econf "${myconf[@]}" -} - -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/mousepad/mousepad-0.5.7.ebuild b/app-editors/mousepad/mousepad-0.5.7.ebuild deleted file mode 100644 index 1dee543de886..000000000000 --- a/app-editors/mousepad/mousepad-0.5.7.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 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 - >=x11-libs/gtk+-3.22:3 - >=x11-libs/gtksourceview-4.0.0:4" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-lang/perl - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - local myconf=( - --enable-gtksourceview4 - ) - econf "${myconf[@]}" -} - -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/mousepad/mousepad-0.6.2.ebuild b/app-editors/mousepad/mousepad-0.6.2.ebuild new file mode 100644 index 000000000000..5f5d41db5276 --- /dev/null +++ b/app-editors/mousepad/mousepad-0.6.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit gnome2-utils xdg-utils + +DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment" +HOMEPAGE=" + https://docs.xfce.org/apps/mousepad/start + https://gitlab.xfce.org/apps/mousepad/ +" +SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~ppc ppc64 ~riscv x86" +IUSE="policykit spell +shortcuts" + +DEPEND=" + >=dev-libs/glib-2.56.2 + >=x11-libs/gtk+-3.22:3 + >=x11-libs/gtksourceview-4.0.0:4 + policykit? ( sys-auth/polkit ) + spell? ( app-text/gspell ) + shortcuts? ( >=xfce-base/libxfce4ui-4.17.5:= ) +" +RDEPEND=" + ${DEPEND} +" +BDEPEND=" + dev-lang/perl + dev-util/intltool + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + local myconf=( + --enable-gtksourceview4 + $(use_enable policykit polkit) + $(use_enable spell plugin-gspell) + $(use_enable shortcuts plugin-shortcuts) + ) + econf "${myconf[@]}" +} + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +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 27609301a35e..dbc18247066b 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,3 +1 @@ -DIST nano-5.6.1.tar.gz 2957693 BLAKE2B dbd1a63b6e0997a30a2ef40ad3248a7f53e2613d4662d5b9fc585bd0e2dfe78f8e8c71354e1a5bbf043ca99e0a69742df7846656d1f0706af79bcbfc53b6d1a6 SHA512 e27ca4411472409bd6ff8d812405e4d8aa869c1348c0a6adbb1c538fb5bdd112b322ef6d8a13df0b43c472d925b94111ac676d03f360d79181dee335a4fd09cf -DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f -DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d +DIST nano-7.2.tar.xz 1608444 BLAKE2B c7e3b18383e9f2f9db1f6059c875ddd164d730ea0e5b363e66fb8e5f30e8598ba49a5afd8eea3a55e295f1e43fb136019f60cc9154ae276c5d589002c0e5298a SHA512 a6dfa70edab62e439a9a998ca214f2415d57dbdc01766ad2e4b14048836557a32755f8b09de13c6a89023f215b61d2854017b389eae8d097ca6f3ba73ce2f583 diff --git a/app-editors/nano/files/gentoo.nanorc-r1 b/app-editors/nano/files/gentoo.nanorc-r1 new file mode 100644 index 000000000000..100877dd16d4 --- /dev/null +++ b/app-editors/nano/files/gentoo.nanorc-r1 @@ -0,0 +1,98 @@ +## Syntax highlighting for Gentoo ebuilds/eclasses, +## and (further down) for Portage control files. + +syntax ebuild "\.e(build|class)$" +comment "#" + +linter bash -n + +## All the standard portage functions: +color brightgreen "(^|\<default_)src_(unpack|prepare|configure|compile|install|test)\>" +color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>" +color brightgreen "\<default(_pkg_nofetch|_src_(unpack|prepare|configure|compile|test))?\>" +## Bash-related syntax: +color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>" +color green "\<(declare|eval|exec|export|let|local)\>" +color green "[][{}():;|`$<>!=&\]" +color green "-[defhnrsuwxzL]\>" +color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>" + +## Variables... official portage ones in red, all others in bright red: +color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*" +color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})" +color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT)\>" +color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>" +color red "\<(T|TMPDIR|HOME)\>" +color red "\<(AS|C(PP|XX)?|FF|GO|LD|RUST)FLAGS\>" "\<C(HOST|TARGET|BUILD)\>" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>" +color red "\<EBUILD_PHASE(_FUNC)?\>" +color red "\<QA_((TEXTRELS|EXECSTACK|WX_LOAD)(_[a-zA-Z_0-9]+)?|DT_HASH|PRESTRIPPED)\>" +color red "\<(PATCHES|(HTML_)?DOCS)\>" "\<WANT_(AUTO(CONF|MAKE)|LIBTOOL)\>" "\<AUTOTOOLS_(AUTO_)?DEPEND\>" "\<AM_OPTS\>" "\<AT_(NOEAUTOHEADER|NOEAUTOMAKE|NOELIBTOOLIZE|M4DIR)\>" +color red "\<ECONF_SOURCE\>" + +## Portage commands: +color magenta "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*" +color brightblue "\<e(apply(_user)?|begin|end|conf|install(docs)?|make|ninja|qmake5|ant|(qa)?warn|infon?|error|log|patch(_user)?|new(group|user))\>" +color brightblue "\<e(pause|beep|mktemp|(cvs|svn)_clean|punt_cxx)\>" "\<e(aclocal|auto(reconf|header|conf|make)|libtoolize)\>" +color brightblue "\<e(stack|shopts|umask)_(push|pop)\>" "\<get_libdir\>" "\<ver_(cut|rs|test)\>" "\<version_is_at_least\>" +color brightblue "\<make_desktop_entry\>" "\<unpack(_(makeself|pdv))?\>" +color brightblue "\<(assert|die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse)\>" "\<(has|best)_version\>" +color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>" +color brightblue "\<do(compress|dir|html|mo|strip|sym)\>" "\<keepdir\>" +color brightblue "\<prepall(docs|info|man|strip)?\>" "\<prep(info|lib|lib\.(so|a)|man|strip)\>" +color brightblue "\<(doc|ins|exe)?into\>" "\<f(owners|perms)\>" "\<(exe|ins|dir)opts\>" +color brightblue "\<add(read|write|predict|deny)\>" +### common eclasses +color brightblue "\<edo(b)?\>" +### flag-o-matic.eclass, toolchain-funcs.eclass +color brightblue "\<(all-flag-vars)\>" +color brightblue "\<(filter-(flags|lfs-flags|lto|mfpmath))\>" +color brightblue "\<strip-flags\>" +color brightblue "\<append-(cpp|c|cxx|f|lfs|ld)?flags\>" +color brightblue "\<replace-flags\>" "\<replace-cpu-flags\>" +color brightblue "\<is-(ld?)flagq?\>" +color brightblue "\<(append-atomic-flags|no-as-needed|raw-ldflags|append-libs|replace-sparc64-flags|get-flag|strip-unsupported-flags)\>" +color brightblue "\<tc-get(BUILD_)?(AR|AS|CC|CPP|CXX|DLLWRAP|F77|FC|GCJ|GO|LD|STRINGS|STRIP|NM|OBJCOPY|OBJDUMP|PKG_CONFIG|RANLIB|RC|READELF)\>" +color brightblue "\<test-flag(s)?-(CC|CXX|F77|FC|CCLD)\>" +color brightblue "\<tc-ld-(is-(gold|lld)|disable-gold|force-bfd)\>" +color brightblue "\<tc-(arch(-kernel)?|check-openmp|export|has-(tls|openmp)|is-cross-compiler)\>" +color brightblue "\<tc-is-(clang|gcc)\>" +color brightblue "\<(clang|gcc)-(fullversion|(major-|minor|micro-)version)\>" +### debugging +color brightblue "\<debug-print(-function|-section)\>" + +## Common commands used in ebuilds: +color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>" +## Comments (doesn't work that well): +color yellow "(^|[[:space:]])#.*" +## Strings (doesn't work that well): +color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'" +## Trailing space is bad! +color ,green "[[:space:]]+$" +## Mixed whitespace is also bad. +color ,green " " + + +syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$" +comment "#" + +## Base text: +color green ".+" +## Likely version and slot numbers: +color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)" +color magenta ":[^[:space:]]+([[:space:]]|$)" +## Use flags (must come after version/slot): +color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+" +color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+" +## Accepted arches: +color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(linux|macos|solaris))?\>" +color white "[[:space:]][*~-]?\*" +## Categories: +color cyan "^[[:space:]]*[^/]*/" +## Masking regulators: +color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)" +## Comments: +color yellow "#.*" +## Trailing space is bad! +color ,green "[[:space:]]+$" +## Mixed whitespace is also bad. +color ,green " " diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml index 6ec35ae205da..0e05c7d4c62f 100644 --- a/app-editors/nano/metadata.xml +++ b/app-editors/nano/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> -</maintainer> -<longdescription> + <maintainer type="project"> + <email>base-system@gentoo.org</email> + <name>Gentoo Base System</name> + </maintainer> + <longdescription> GNU nano - an enhanced clone of the Pico text editor. The nano project was started because of a few "problems" with the @@ -21,22 +21,19 @@ require a command line flag. Yuck. nano aims to solve these problems by emulating the functionality of Pico as closely as possible while addressing the problems above and perhaps providing other extra functionality. -</longdescription> -<use> - <flag name="justify">Enable justify/unjustify functions for text formatting.</flag> - <flag name="debug"> - Enable debug messages and assert warnings. Note that these will all be sent - straight to stderr rather than some logging facility. - </flag> - <flag name="magic"> - Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting - </flag> - <flag name="minimal"> - Disable all fancy features, including ones that otherwise have a dedicated - USE flag (such as spelling). - </flag> - <flag name="split-usr"> - Enable this if /bin and /usr/bin are separate directories - </flag> -</use> + </longdescription> + <use> + <flag name="justify">Enable justify/unjustify functions for text formatting.</flag> + <flag name="debug"> + Enable debug messages and assert warnings. Note that these will all be sent + straight to stderr rather than some logging facility. + </flag> + <flag name="magic"> + Add magic file support (<pkg>sys-apps/file</pkg>) to automatically detect appropriate syntax highlighting + </flag> + <flag name="minimal"> + Disable all fancy features, including ones that otherwise have a dedicated + USE flag (such as spelling). + </flag> + </use> </pkgmetadata> diff --git a/app-editors/nano/nano-5.6.1-r2.ebuild b/app-editors/nano/nano-5.6.1-r2.ebuild deleted file mode 100644 index 64cdf0ed0eba..000000000000 --- a/app-editors/nano/nano-5.6.1-r2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# 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="https://git.savannah.gnu.org/git/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:=[unicode(+)?] - sys-libs/ncurses:=[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-5.8-r2.ebuild b/app-editors/nano/nano-5.8-r2.ebuild deleted file mode 100644 index 64cdf0ed0eba..000000000000 --- a/app-editors/nano/nano-5.8-r2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# 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="https://git.savannah.gnu.org/git/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:=[unicode(+)?] - sys-libs/ncurses:=[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-5.9.ebuild b/app-editors/nano/nano-7.2-r1.ebuild index 188b7842b16e..4f09eadd022b 100644 --- a/app-editors/nano/nano-5.9.ebuild +++ b/app-editors/nano/nano-7.2-r1.ebuild @@ -1,33 +1,37 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit flag-o-matic -if [[ ${PV} == "9999" ]] ; then + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit git-r3 autotools + inherit autotools git-r3 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" + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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" +HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Guide" -LICENSE="GPL-3" +LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" +IUSE="debug justify magic minimal ncurses nls +spell static unicode" LIB_DEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig @@ -39,14 +43,16 @@ REQUIRED_USE=" src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + + if [[ ${PV} == 9999 ]] ; then eautoreconf fi } src_configure() { use static && append-ldflags -static - local myconf=( + + local myconfargs=( --bindir="${EPREFIX}"/bin --htmldir=/trash $(use_enable !minimal color) @@ -60,12 +66,14 @@ src_configure() { $(use_enable unicode utf8) $(use_enable minimal tiny) ) - econf "${myconf[@]}" + + econf "${myconfargs[@]}" } src_install() { default - # don't use "${ED}" here or things break (#654534) + + # Don't use "${ED}" here or things break (#654534) rm -r "${D}"/trash || die dodoc doc/sample.nanorc @@ -73,6 +81,7 @@ src_install() { dodoc doc/faq.html insinto /etc newins doc/sample.nanorc nanorc + if ! use minimal ; then # Enable colorization by default. sed -i \ @@ -84,7 +93,19 @@ src_install() { local rcdir="/usr/share/nano" mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die rmdir "${ED}"${rcdir}/extra || die + + insinto "${rcdir}" + newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc fi +} + +pkg_postrm() { + [[ -n ${REPLACED_BY_VERSION} ]] && return - use split-usr && dosym ../../bin/nano /usr/bin/nano + local e + e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") + if [[ ${e##*/} == nano ]]; then + ewarn "The EDITOR variable is still set to ${e}." + ewarn "You can update it with \"eselect editor\"." + fi } diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index 188b7842b16e..80da99c51009 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -1,33 +1,37 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit flag-o-matic -if [[ ${PV} == "9999" ]] ; then + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit git-r3 autotools + inherit autotools git-r3 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" + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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" +HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Guide" -LICENSE="GPL-3" +LICENSE="GPL-3+ LGPL-2.1+ || ( GPL-3+ FDL-1.2+ )" SLOT="0" -IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" +IUSE="debug justify magic minimal ncurses nls +spell static unicode" LIB_DEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig @@ -39,14 +43,16 @@ REQUIRED_USE=" src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + + if [[ ${PV} == 9999 ]] ; then eautoreconf fi } src_configure() { use static && append-ldflags -static - local myconf=( + + local myconfargs=( --bindir="${EPREFIX}"/bin --htmldir=/trash $(use_enable !minimal color) @@ -60,12 +66,14 @@ src_configure() { $(use_enable unicode utf8) $(use_enable minimal tiny) ) - econf "${myconf[@]}" + + econf "${myconfargs[@]}" } src_install() { default - # don't use "${ED}" here or things break (#654534) + + # Don't use "${ED}" here or things break (#654534) rm -r "${D}"/trash || die dodoc doc/sample.nanorc @@ -73,6 +81,7 @@ src_install() { dodoc doc/faq.html insinto /etc newins doc/sample.nanorc nanorc + if ! use minimal ; then # Enable colorization by default. sed -i \ @@ -84,7 +93,19 @@ src_install() { local rcdir="/usr/share/nano" mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die rmdir "${ED}"${rcdir}/extra || die + + insinto "${rcdir}" + newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc fi +} + +pkg_postrm() { + [[ -n ${REPLACED_BY_VERSION} ]] && return - use split-usr && dosym ../../bin/nano /usr/bin/nano + local e + e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") + if [[ ${e##*/} == nano ]]; then + ewarn "The EDITOR variable is still set to ${e}." + ewarn "You can update it with \"eselect editor\"." + fi } diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest index f8c4a374195d..2b9232daa17f 100644 --- a/app-editors/ne/Manifest +++ b/app-editors/ne/Manifest @@ -1,2 +1,3 @@ -DIST ne-3.3.0.tar.gz 1173159 BLAKE2B a4be3fd37a0a79b440290846184bc50551cfb9b73dc50c0376110f3603233879b396f67a87e2f9defe9c0cbc42c963e66bc43ab5396f8ccb27e5b6182c429006 SHA512 73a1bbc5a9f62354834288e25b8f4bf2b0d2ff6faf3408108b217305e2c9d8fed768b5a3c3fd21df7b3bf75a3f9c71ea899a8b3f528b560a8e5e66accd442919 DIST ne-3.3.1.tar.gz 1138072 BLAKE2B 8494ff955b456bbac2e82823ee155980f8fab5a1071d0bfd6a987f1ed0724129ab2ecb70737547836b592369b45daf5e499d50d7230b04c5eabfd1536a56271f SHA512 d8c1d8cd9bbafcc7c8c485ca4454d6979be3d33ae918139865ce5f76e428f165043707c95c2e440bd9bccd00c67ce81a41f87f94b85cae3518c4749233718123 +DIST ne-3.3.2.tar.gz 1154326 BLAKE2B 8c11abac9a960a41de2faed9b2e948cca9ca7f8345757796fb7daa112e62d565096b1cd3a4ca2e76cfb1616ee8c0dad01bb2fe5306bac6f0aadca0644b91eb6d SHA512 6c4fabb0ecade31322d5f96203f3bba3316264d8f98a46188796ce88f4b7fd17af8569832ae2638770f8ceb59138b0395b0e03817db961bfe94c917fa390ebf3 +DIST ne-3.3.3.tar.gz 1162423 BLAKE2B 72db1088757eb752e94480e0d0f02a85edc2df8b45bb6de732c43a6b6bfbcf0d54038462f8730ef3772a81f13ce0ca6154cced5aa10f1a0aa96ddc8697a0aaff SHA512 13bf4fae6977230cd7f3b46d12a25a605d2e83e363cf54202dc4b9e8fb19cc51bac5f30611166839bc1f717c5367db272c8d215b8006f7aa9eec312a817d35c7 diff --git a/app-editors/ne/ne-3.3.1.ebuild b/app-editors/ne/ne-3.3.1.ebuild index 242892b33de8..a0ce06a3a43c 100644 --- a/app-editors/ne/ne-3.3.1.ebuild +++ b/app-editors/ne/ne-3.3.1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="The nice editor, easy to use for the beginner and powerful for the wizard" HOMEPAGE="https://ne.di.unimi.it/" SRC_URI="https://ne.di.unimi.it/${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" BDEPEND="virtual/pkgconfig" DEPEND="sys-libs/ncurses:=" diff --git a/app-editors/ne/ne-3.3.2.ebuild b/app-editors/ne/ne-3.3.2.ebuild new file mode 100644 index 000000000000..4743055eb679 --- /dev/null +++ b/app-editors/ne/ne-3.3.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="The nice editor, easy to use for the beginner and powerful for the wizard" +HOMEPAGE="https://ne.di.unimi.it/" +SRC_URI="https://ne.di.unimi.it/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +DEPEND="sys-libs/ncurses:=" +RDEPEND=" + ${DEPEND} + dev-lang/perl +" +BDEPEND="virtual/pkgconfig" + +HTML_DOCS=( doc/html/. ) + +PATCHES=( + "${FILESDIR}"/${PN}-3.3.1-respect-CFLAGS.patch +) + +src_prepare() { + default + + sed -i \ + -e 's/-O3//' \ + -e 's/-Wp,-D_FORTIFY_SOURCE=2//' \ + src/makefile || die +} + +src_configure() { + # bug #776799 + sed -i -e "s/-lcurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" src/makefile || die +} + +src_compile() { + append-cflags -std=c11 + + emake -C src CC="$(tc-getCC)" \ + NE_GLOBAL_DIR="/usr/share/${PN}" \ + OPTS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + "${PN}" +} + +src_install() { + dobin src/${PN} + + insinto /usr/share/${PN}/syntax + doins syntax/*.jsf + + doman doc/${PN}.1 + dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.* +} diff --git a/app-editors/ne/ne-3.3.0.ebuild b/app-editors/ne/ne-3.3.3.ebuild index 87aaff065bf8..0c90f784c008 100644 --- a/app-editors/ne/ne-3.3.0.ebuild +++ b/app-editors/ne/ne-3.3.3.ebuild @@ -1,31 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools flag-o-matic toolchain-funcs +inherit flag-o-matic toolchain-funcs DESCRIPTION="The nice editor, easy to use for the beginner and powerful for the wizard" HOMEPAGE="https://ne.di.unimi.it/" SRC_URI="https://ne.di.unimi.it/${P}.tar.gz" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -BDEPEND="virtual/pkgconfig" DEPEND="sys-libs/ncurses:=" RDEPEND=" ${DEPEND} dev-lang/perl " +BDEPEND="virtual/pkgconfig" HTML_DOCS=( doc/html/. ) src_prepare() { default - sed -i -e 's/-O3//' src/makefile || die + sed -i \ + -e 's/-O3//' \ + -e 's/-Wp,-D_FORTIFY_SOURCE=2//' \ + -e '/-flto/d' \ + src/makefile || die } src_configure() { @@ -35,18 +39,20 @@ src_configure() { src_compile() { append-cflags -std=c11 + emake -C src CC="$(tc-getCC)" \ NE_GLOBAL_DIR="/usr/share/${PN}" \ OPTS="${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ "${PN}" } src_install() { - dobin "src/${PN}" + dobin src/${PN} - insinto "/usr/share/${PN}/syntax" + insinto /usr/share/${PN}/syntax doins syntax/*.jsf - doman "doc/${PN}.1" + doman doc/${PN}.1 dodoc CHANGES README.md NEWS doc/*.{txt,pdf,texinfo} doc/default.* } diff --git a/app-editors/nedit/nedit-5.7.ebuild b/app-editors/nedit/nedit-5.7.ebuild index f8a265fc947a..77e32da20175 100644 --- a/app-editors/nedit/nedit-5.7.ebuild +++ b/app-editors/nedit/nedit-5.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,14 +13,14 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~mips ppc ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc" RDEPEND=">=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11" DEPEND="${RDEPEND} - || ( dev-util/yacc sys-devel/bison ) + || ( dev-util/yacc app-alternatives/yacc ) dev-lang/perl" S="${WORKDIR}/${PN}-${PV}" diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index e0a3ebb99498..ee8308abaa48 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -1,3 +1,2 @@ -DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183 -DIST neovim-0.5.0.tar.gz 10337976 BLAKE2B e7630e96fdd1a159ca68c8f61ed473a7fa7d0c5ebf7485e42c47f314f1a3031ac3f63519f4789d7244b9677f9fa9b2aabbffa1e11d97456255c44348acb814d3 SHA512 f6649f804faabb4104d3b28283932e40358c23990961f4ca7b380089318da312e59242746cee06387f4d881dd6514abbfec79c4063482383adfb4106e9e7a3a4 -DIST neovim-0.5.1.tar.gz 10349190 BLAKE2B eb7e0c6a0742369c4a0fbc32a0f0e5d595f03470fb10287c39dde2f86db433a21798acee49d2cc363f18843950ef76d1376f5e52358d0b19a4b1e090c0d620a6 SHA512 a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709 +DIST neovim-0.9.4.tar.gz 11585425 BLAKE2B f98b9737df537be9a6f9bfba0e48f47f33cacdf5aa5f9fb3b47a693ea9fa5fbe32aa8628403fdb136b625ccad30c8aad1c25abe280384515df603e92d9ed898a SHA512 a9bac18aeecd99dfeab79b367c3f0c46003b95d057edb6fd18ba178d6b6f22434689508d0bfe91b2f771ef0a23a4888815e8c4001abb76f2a60357bab0cd7004 +DIST neovim-0.9.5.tar.gz 11590180 BLAKE2B a982ea5704a8e5810c42475198157c3d2255c033f47cba940f9f6414c649167ecafe08c7fe9aeb3154a15566fdf8f5db8d535fa752e467e36ff5d552a7aa2179 SHA512 6e20d0a1d506dc292dd68dabe4b5635f86c019ca832f9927e907377e6d21fe7765b3010f5bba644bb2d7a76c178d55b290af24856a7e3c4083a1aa60bc496775 diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch deleted file mode 100644 index 4fa8bf45bcbd..000000000000 --- a/app-editors/neovim/files/neovim-0.4.4-cmake-darwin.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 07928e3..08881ee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,23 +58,6 @@ endif() - # used for check_c_compiler_flag - include(CheckCCompilerFlag) - --if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") -- # CMake tries to treat /sw and /opt/local as extension of the system path, but -- # that doesn't really work out very well. Once you have a dependency that -- # resides there and have to add it as an include directory, then any other -- # dependency that could be satisfied from there must be--otherwise you can end -- # up with conflicting versions. So, let's make them more of a priority having -- # them be included as one of the first places to look for dependencies. -- list(APPEND CMAKE_PREFIX_PATH /sw /opt/local) -- -- # Work around some old, broken detection by CMake for knowing when to use the -- # isystem flag. Apple's compilers have supported this for quite some time -- # now. -- if(CMAKE_COMPILER_IS_GNUCC) -- set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ") -- endif() --endif() -- - if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") - # Enable fixing case-insensitive filenames for Windows and Mac. - set(USE_FNAME_CASE TRUE) -diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt -index aa81008..0570dc7 100644 ---- a/src/nvim/CMakeLists.txt -+++ b/src/nvim/CMakeLists.txt -@@ -192,10 +192,6 @@ get_directory_property(gen_includes INCLUDE_DIRECTORIES) - foreach(gen_include ${gen_includes} ${LUA_PREFERRED_INCLUDE_DIRS}) - list(APPEND gen_cflags "-I${gen_include}") - endforeach() --if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND CMAKE_OSX_SYSROOT) -- list(APPEND gen_cflags "-isysroot") -- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") --endif() - string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type) - separate_arguments(C_FLAGS_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS}) - separate_arguments(C_FLAGS_${build_type}_ARRAY UNIX_COMMAND ${CMAKE_C_FLAGS_${build_type}}) -diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt -index edd5882..e503434 100644 ---- a/third-party/CMakeLists.txt -+++ b/third-party/CMakeLists.txt -@@ -105,13 +105,6 @@ if(CMAKE_CXX_COMPILER) - set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") - endif() - --if(CMAKE_OSX_SYSROOT) -- set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- if(DEPS_CXX_COMPILER) -- set(DEPS_CXX_COMPILER "${DEPS_CXX_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") -- endif() --endif() -- - # Cross compiling: use these for dependencies built for the - # HOST system, when not crosscompiling these should be the - # same as DEPS_*. Except when targeting Unix in which case
\ No newline at end of file diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch deleted file mode 100644 index 2c9c80a7a690..000000000000 --- a/app-editors/neovim/files/neovim-0.4.4-cmake-release-type.patch +++ /dev/null @@ -1,13 +0,0 @@ -Ensure that :checkhealth is happy with the Gentoo build type. -https://bugs.gentoo.org/757744 ---- a/runtime/autoload/health/nvim.vim -+++ b/runtime/autoload/health/nvim.vim -@@ -118,7 +118,7 @@ function! s:check_performance() abort - let buildtype = matchstr(execute('version'), '\v\cbuild type:?\s*[^\n\r\t ]+') - if empty(buildtype) - call health#report_error('failed to get build type from :version') -- elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo)' -+ elseif buildtype =~# '\v(MinSizeRel|Release|RelWithDebInfo|Gentoo)' - call health#report_ok(buildtype) - else - call health#report_info(buildtype) diff --git a/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch deleted file mode 100644 index 4703dee52613..000000000000 --- a/app-editors/neovim/files/neovim-0.4.4-cmake_lua_version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -384,7 +384,7 @@ - option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) - - if(PREFER_LUA) -- find_package(Lua 5.1 REQUIRED) -+ find_package(Lua ${PREFER_LUA} EXACT REQUIRED) - set(LUA_PREFERRED_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) - set(LUA_PREFERRED_LIBRARIES ${LUA_LIBRARIES}) - # Passive (not REQUIRED): if LUAJIT_FOUND is not set, nvim-test is skipped. diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch b/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch new file mode 100644 index 000000000000..b6026437f7bf --- /dev/null +++ b/app-editors/neovim/files/neovim-0.9.0-cmake-release-type.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 521ef93..a637866 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -114,12 +114,6 @@ set(NVIM_API_LEVEL 11) # Bump this after any API change. + set(NVIM_API_LEVEL_COMPAT 0) # Adjust this after a _breaking_ API change. + set(NVIM_API_PRERELEASE false) + +-# Default to -O2 on release builds. +-if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3") +- message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2") +- string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}") +-endif() +- + # Build-type: RelWithDebInfo + + # /Og means something different in MSVC diff --git a/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch b/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch new file mode 100644 index 000000000000..b14b3b992349 --- /dev/null +++ b/app-editors/neovim/files/neovim-0.9.0-cmake_lua_version.patch @@ -0,0 +1,11 @@ +--- a/src/nvim/CMakeLists.txt ++++ b/src/nvim/CMakeLists.txt +@@ -464,7 +464,7 @@ endif() + # The unit test lib requires LuaJIT; it will be skipped if LuaJIT is missing. + option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF) + if(PREFER_LUA) +- find_package(Lua 5.1 EXACT REQUIRED) ++ find_package(Lua ${PREFER_LUA} EXACT REQUIRED) + target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUA_INCLUDE_DIR}) + target_link_libraries(main_lib INTERFACE ${LUA_LIBRARIES}) + # Passive (not REQUIRED): if LUAJIT_FOUND is not set, fixtures for unittests is skipped. diff --git a/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch b/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch new file mode 100644 index 000000000000..1488148298bd --- /dev/null +++ b/app-editors/neovim/files/neovim-0.9.1-cmake-darwin.patch @@ -0,0 +1,14 @@ +--- a/src/nvim/CMakeLists.txt ++++ b/src/nvim/CMakeLists.txt +@@ -415,11 +415,7 @@ foreach(gen_include ${prop}) + list(APPEND gen_cflags "-I${gen_include}") + endforeach() + endforeach() + +-if(APPLE AND CMAKE_OSX_SYSROOT) +- list(APPEND gen_cflags "-isysroot") +- list(APPEND gen_cflags "${CMAKE_OSX_SYSROOT}") +-endif() + set(gen_cflags ${gen_cflags} -O2) + + set(NVIM_VERSION_GIT_H ${PROJECT_BINARY_DIR}/cmake.config/auto/versiondef_git.h) diff --git a/app-editors/neovim/files/neovim-9999-cmake-darwin.patch b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch new file mode 100644 index 000000000000..7d2352c6a18b --- /dev/null +++ b/app-editors/neovim/files/neovim-9999-cmake-darwin.patch @@ -0,0 +1,13 @@ +Patch author: mortezadadgar <mortezadadgar97@gmail.com> +--- a/src/nvim/CMakeLists.txt ++++ b/src/nvim/CMakeLists.txt +@@ -477,9 +477,6 @@ foreach(target ${targets}) + endforeach() + endforeach() + +-if(APPLE AND CMAKE_OSX_SYSROOT) +- list(APPEND gen_cflags "-isysroot" "${CMAKE_OSX_SYSROOT}") +-endif() + if(MSVC) + list(APPEND gen_cflags -wd4003) + endif() diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml index 555238c9fc17..5c58332c3ce4 100644 --- a/app-editors/neovim/metadata.xml +++ b/app-editors/neovim/metadata.xml @@ -1,14 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>brahmajit.xyz@gmail.com</email> + <name>Brahmajit Das</name> + </maintainer> <maintainer type="project"> <email>vim@gentoo.org</email> <name>Gentoo Vim Project</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> - <flag name="lto">Build with Link Time Optimization (LTO)</flag> <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag> - <flag name="tui">Build the neovim unix tui</flag> </use> <upstream> <remote-id type="github">neovim/neovim</remote-id> diff --git a/app-editors/neovim/neovim-0.4.4-r101.ebuild b/app-editors/neovim/neovim-0.4.4-r101.ebuild deleted file mode 100644 index a87ddc4c40e5..000000000000 --- a/app-editors/neovim/neovim-0.4.4-r101.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} luajit ) - -inherit cmake lua-single optfeature xdg - -DESCRIPTION="Vim-fork focused on extensibility and agility." -HOMEPAGE="https://neovim.io" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/neovim/neovim.git" -else - SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos" -fi - -LICENSE="Apache-2.0 vim" -SLOT="0" -IUSE="+lto +nvimpager +tui" - -REQUIRED_USE="${LUA_REQUIRED_USE}" -# Upstream say the test library needs LuaJIT -# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 -#REQUIRED_USE="test? ( lua_single_target_luajit )" -#RESTRICT="!test? ( test )" - -# Upstream build scripts invoke the Lua interpreter -BDEPEND="${LUA_DEPS} - dev-util/gperf - virtual/libiconv - virtual/libintl - virtual/pkgconfig -" -# 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/mpack[${LUA_USEDEP}] - ') - $(lua_gen_cond_dep ' - dev-lua/LuaBitOp[${LUA_USEDEP}] - ' lua5-{1,2}) - dev-libs/libuv:0= - >=dev-libs/libvterm-0.1.2 - dev-libs/msgpack:0= - !kernel_Darwin? ( - net-libs/libnsl:= - ) - tui? ( - dev-libs/libtermkey - >=dev-libs/unibilium-2.0.0:0= - ) -" -RDEPEND=" - ${DEPEND} - app-eselect/eselect-vi -" - -PATCHES=( - "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" -) - -src_prepare() { - # use our system vim dir - sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ - -i src/nvim/globals.h || die - - cmake_src_prepare -} - -src_configure() { - # Upstream default to LTO on non-debug builds - # Let's expose it as a USE flag because upstream - # have preferences for how we should use LTO - # if we want it on (not just -flto) - # ... but allow turning it off. - local mycmakeargs=( - -DENABLE_LTO=$(usex lto) - -DFEAT_TUI=$(usex tui) - -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") - -DLUA_PRG="${ELUA}" - -DMIN_LOG_LEVEL=3 - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # install a default configuration file - insinto /etc/vim - doins "${FILESDIR}"/sysinit.vim - - # conditionally install a symlink for nvimpager - if use nvimpager; then - dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager - fi -} - -pkg_postinst() { - xdg_pkg_postinst - optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard - optfeature "Python plugin support" dev-python/pynvim - optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client - optfeature "remote/nvr support" dev-python/neovim-remote -} diff --git a/app-editors/neovim/neovim-0.5.1.ebuild b/app-editors/neovim/neovim-0.9.4.ebuild index 6e99dc9e54d6..c1f5cc554988 100644 --- a/app-editors/neovim/neovim-0.5.1.ebuild +++ b/app-editors/neovim/neovim-0.9.4.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +# RelWithDebInfo sets -Og -g +CMAKE_BUILD_TYPE=Release LUA_COMPAT=( lua5-{1..2} luajit ) - inherit cmake lua-single optfeature xdg -DESCRIPTION="Vim-fork focused on extensibility and agility." +DESCRIPTION="Vim-fork focused on extensibility and agility" HOMEPAGE="https://neovim.io" if [[ ${PV} == 9999 ]]; then @@ -15,30 +16,31 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/neovim/neovim.git" else SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos" + KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~x64-macos" fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+lto +nvimpager +tui" +IUSE="+nvimpager test" -REQUIRED_USE="${LUA_REQUIRED_USE}" # Upstream say the test library needs LuaJIT # https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 -#REQUIRED_USE="test? ( lua_single_target_luajit )" -#RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )" +# TODO: Get tests running +RESTRICT="!test? ( test ) test" # Upstream build scripts invoke the Lua interpreter BDEPEND="${LUA_DEPS} - dev-util/gperf + >=dev-util/gperf-3.1 + >=sys-devel/gettext-0.20.1 virtual/libiconv virtual/libintl virtual/pkgconfig " -# TODO: add tests, dev-lua/busted has now got luajit support. -# bug #584694 +# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for +# new dependency bounds and so on on bumps (obviously adjust for right branch/tag). DEPEND="${LUA_DEPS} - dev-lua/luv[${LUA_SINGLE_USEDEP}] + >=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] @@ -46,47 +48,46 @@ DEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' dev-lua/LuaBitOp[${LUA_USEDEP}] ' lua5-{1,2}) - dev-libs/libuv:0= - >=dev-libs/libvterm-0.1.2 - dev-libs/msgpack:0= - dev-libs/tree-sitter:= - tui? ( - dev-libs/libtermkey - >=dev-libs/unibilium-2.0.0:0= - ) + >=dev-libs/libuv-1.46.0:= + >=dev-libs/libvterm-0.3.3 + >=dev-libs/msgpack-3.0.0:= + >=dev-libs/tree-sitter-0.20.8:= + >=dev-libs/libtermkey-0.22 + >=dev-libs/unibilium-2.0.0:0= " RDEPEND=" ${DEPEND} app-eselect/eselect-vi " +BDEPEND+=" + test? ( + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') + ) +" PATCHES=( - "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch" ) src_prepare() { - # use our system vim dir + # Use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ -i src/nvim/globals.h || die + # https://forums.gentoo.org/viewtopic-p-8750050.html + xdg_environment_reset cmake_src_prepare } src_configure() { - # Upstream default to LTO on non-debug builds - # Let's expose it as a USE flag because upstream - # have preferences for how we should use LTO - # if we want it on (not just -flto) - # ... but allow turning it off. # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now local mycmakeargs=( - -DENABLE_LTO=$(usex lto) - -DFEAT_TUI=$(usex tui) + # appends -flto + -DENABLE_LTO=OFF -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") -DLUA_PRG="${ELUA}" - -DMIN_LOG_LEVEL=3 ) cmake_src_configure } @@ -106,6 +107,7 @@ src_install() { pkg_postinst() { xdg_pkg_postinst + optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard optfeature "Python plugin support" dev-python/pynvim optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client diff --git a/app-editors/neovim/neovim-0.5.0.ebuild b/app-editors/neovim/neovim-0.9.5.ebuild index 99aa8bbbb72f..59f60e257bdd 100644 --- a/app-editors/neovim/neovim-0.5.0.ebuild +++ b/app-editors/neovim/neovim-0.9.5.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +# RelWithDebInfo sets -Og -g +CMAKE_BUILD_TYPE=Release LUA_COMPAT=( lua5-{1..2} luajit ) - inherit cmake lua-single optfeature xdg -DESCRIPTION="Vim-fork focused on extensibility and agility." +DESCRIPTION="Vim-fork focused on extensibility and agility" HOMEPAGE="https://neovim.io" if [[ ${PV} == 9999 ]]; then @@ -15,30 +16,31 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/neovim/neovim.git" else SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" + KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86 ~x64-macos" fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+lto +nvimpager +tui" +IUSE="+nvimpager test" -REQUIRED_USE="${LUA_REQUIRED_USE}" # Upstream say the test library needs LuaJIT # https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 -#REQUIRED_USE="test? ( lua_single_target_luajit )" -#RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )" +# TODO: Get tests running +RESTRICT="!test? ( test ) test" # Upstream build scripts invoke the Lua interpreter BDEPEND="${LUA_DEPS} - dev-util/gperf + >=dev-util/gperf-3.1 + >=sys-devel/gettext-0.20.1 virtual/libiconv virtual/libintl virtual/pkgconfig " -# TODO: add tests, dev-lua/busted has now got luajit support. -# bug #584694 +# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for +# new dependency bounds and so on on bumps (obviously adjust for right branch/tag). DEPEND="${LUA_DEPS} - dev-lua/luv[${LUA_SINGLE_USEDEP}] + >=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] @@ -46,31 +48,36 @@ DEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' dev-lua/LuaBitOp[${LUA_USEDEP}] ' lua5-{1,2}) - dev-libs/libuv:0= - >=dev-libs/libvterm-0.1.2 - dev-libs/msgpack:0= - dev-libs/tree-sitter:= - tui? ( - dev-libs/libtermkey - >=dev-libs/unibilium-2.0.0:0= - ) + >=dev-libs/libuv-1.46.0:= + >=dev-libs/libvterm-0.3.3 + >=dev-libs/msgpack-3.0.0:= + >=dev-libs/tree-sitter-0.20.8:= + >=dev-libs/libtermkey-0.22 + >=dev-libs/unibilium-2.0.0:0= " RDEPEND=" ${DEPEND} app-eselect/eselect-vi " +BDEPEND+=" + test? ( + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') + ) +" PATCHES=( - "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.9.1-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.0-cmake-release-type.patch" ) src_prepare() { - # use our system vim dir + # Use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ -i src/nvim/globals.h || die + # https://forums.gentoo.org/viewtopic-p-8750050.html + xdg_environment_reset cmake_src_prepare } @@ -82,11 +89,10 @@ src_configure() { # ... but allow turning it off. # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now local mycmakeargs=( - -DENABLE_LTO=$(usex lto) - -DFEAT_TUI=$(usex tui) + # appends -flto + -DENABLE_LTO=OFF -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") -DLUA_PRG="${ELUA}" - -DMIN_LOG_LEVEL=3 ) cmake_src_configure } @@ -106,6 +112,7 @@ src_install() { pkg_postinst() { xdg_pkg_postinst + optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard optfeature "Python plugin support" dev-python/pynvim optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 99aa8bbbb72f..f0c3aab23120 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.ebuild @@ -1,13 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +# RelWithDebInfo sets -Og -g +CMAKE_BUILD_TYPE=Release LUA_COMPAT=( lua5-{1..2} luajit ) - inherit cmake lua-single optfeature xdg -DESCRIPTION="Vim-fork focused on extensibility and agility." +DESCRIPTION="Vim-fork focused on extensibility and agility" HOMEPAGE="https://neovim.io" if [[ ${PV} == 9999 ]]; then @@ -15,30 +16,31 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/neovim/neovim.git" else SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" fi LICENSE="Apache-2.0 vim" SLOT="0" -IUSE="+lto +nvimpager +tui" +IUSE="+nvimpager test" -REQUIRED_USE="${LUA_REQUIRED_USE}" # Upstream say the test library needs LuaJIT # https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 -#REQUIRED_USE="test? ( lua_single_target_luajit )" -#RESTRICT="!test? ( test )" +REQUIRED_USE="${LUA_REQUIRED_USE} test? ( lua_single_target_luajit )" +# TODO: Get tests running +RESTRICT="!test? ( test ) test" # Upstream build scripts invoke the Lua interpreter BDEPEND="${LUA_DEPS} - dev-util/gperf + >=dev-util/gperf-3.1 + >=sys-devel/gettext-0.20.1 virtual/libiconv virtual/libintl virtual/pkgconfig " -# TODO: add tests, dev-lua/busted has now got luajit support. -# bug #584694 +# Check https://github.com/neovim/neovim/blob/master/third-party/CMakeLists.txt for +# new dependency bounds and so on on bumps (obviously adjust for right branch/tag). DEPEND="${LUA_DEPS} - dev-lua/luv[${LUA_SINGLE_USEDEP}] + >=dev-lua/luv-1.45.0[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] @@ -46,47 +48,46 @@ DEPEND="${LUA_DEPS} $(lua_gen_cond_dep ' dev-lua/LuaBitOp[${LUA_USEDEP}] ' lua5-{1,2}) - dev-libs/libuv:0= - >=dev-libs/libvterm-0.1.2 - dev-libs/msgpack:0= - dev-libs/tree-sitter:= - tui? ( - dev-libs/libtermkey - >=dev-libs/unibilium-2.0.0:0= - ) + >=dev-libs/libuv-1.46.0:= + >=dev-libs/libvterm-0.3.3 + >=dev-libs/msgpack-3.0.0:= + >=dev-libs/tree-sitter-0.20.9:= + >=dev-libs/libtermkey-0.22 + >=dev-libs/unibilium-2.0.0:0= " RDEPEND=" ${DEPEND} app-eselect/eselect-vi " +BDEPEND+=" + test? ( + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') + ) +" PATCHES=( - "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" - "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" + "${FILESDIR}/${PN}-0.9.0-cmake_lua_version.patch" + "${FILESDIR}/${PN}-9999-cmake-darwin.patch" ) src_prepare() { - # use our system vim dir + # Use our system vim dir sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ -i src/nvim/globals.h || die + # https://forums.gentoo.org/viewtopic-p-8750050.html + xdg_environment_reset cmake_src_prepare } src_configure() { - # Upstream default to LTO on non-debug builds - # Let's expose it as a USE flag because upstream - # have preferences for how we should use LTO - # if we want it on (not just -flto) - # ... but allow turning it off. + ln -s "${BROOT}"/usr/bin/luajit "${BUILD_DIR}"/luajit || die # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now local mycmakeargs=( - -DENABLE_LTO=$(usex lto) - -DFEAT_TUI=$(usex tui) + # appends -flto + -DENABLE_LTO=OFF -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") -DLUA_PRG="${ELUA}" - -DMIN_LOG_LEVEL=3 ) cmake_src_configure } @@ -106,6 +107,7 @@ src_install() { pkg_postinst() { xdg_pkg_postinst + optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard optfeature "Python plugin support" dev-python/pynvim optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client diff --git a/app-editors/ng/ng-1.5_beta1-r3.ebuild b/app-editors/ng/ng-1.5_beta1-r3.ebuild index 92a75d620f79..515e4a09db0d 100644 --- a/app-editors/ng/ng-1.5_beta1-r3.ebuild +++ b/app-editors/ng/ng-1.5_beta1-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://tt.sakura.ne.jp/~amura/archives/${PN}/${MY_P}.tar.gz" LICENSE="Emacs" SLOT="0" -KEYWORDS="amd64 ppc x86" +KEYWORDS="amd64 ppc ~riscv x86" RDEPEND="sys-libs/ncurses:0=" DEPEND="${RDEPEND}" diff --git a/app-editors/notepadqq/Manifest b/app-editors/notepadqq/Manifest deleted file mode 100644 index a401586ab2e0..000000000000 --- a/app-editors/notepadqq/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST notepadqq-2.0.0_beta.tar.gz 4516680 BLAKE2B 9a16ab64134ab0d33a68cc528db6a50b8860c391130667a9213e3aa941e115b1e3acae5833ce4b8b52fc81aa8997c5389f5920cde86171cf5d960a7f58dbea99 SHA512 b2ae3493da1512f5f2e42ffc90529f3acfe81d75b7dd6e476f41b94e9b39e02c6fe355ea5ad40460d644ed76bca695d451721e19738c251c8ecb8acc0c0fb061 diff --git a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild b/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild deleted file mode 100644 index ca0db1807aa3..000000000000 --- a/app-editors/notepadqq/notepadqq-2.0.0_beta.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg - -DESCRIPTION="Notepad++-like editor for Linux" -HOMEPAGE="https://notepadqq.com/s/" -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${P/_/-}" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="" - -RDEPEND=" - app-i18n/uchardet - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5 - dev-qt/qtwidgets:5 -" -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - dev-qt/qtwebsockets:5 -" - -src_prepare() { - default - - # Silence a QA warning - sed '/^OnlyShowIn/d' \ - -i support_files/shortcuts/notepadqq.desktop \ - || die -} - -src_configure() { - eqmake5 \ - LRELEASE="$(qt5_get_bindir)/lrelease" \ - QMAKE="$(qt5_get_bindir)/qmake" \ - PREFIX="${EPREFIX}/usr" \ - ${PN}.pro -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} diff --git a/app-editors/notepadqq/notepadqq-9999.ebuild b/app-editors/notepadqq/notepadqq-9999.ebuild deleted file mode 100644 index ca0db1807aa3..000000000000 --- a/app-editors/notepadqq/notepadqq-9999.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils xdg - -DESCRIPTION="Notepad++-like editor for Linux" -HOMEPAGE="https://notepadqq.com/s/" -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/notepadqq/notepadqq.git" -else - SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${P/_/-}" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="" - -RDEPEND=" - app-i18n/uchardet - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5 - dev-qt/qtwidgets:5 -" -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - dev-qt/qtwebsockets:5 -" - -src_prepare() { - default - - # Silence a QA warning - sed '/^OnlyShowIn/d' \ - -i support_files/shortcuts/notepadqq.desktop \ - || die -} - -src_configure() { - eqmake5 \ - LRELEASE="$(qt5_get_bindir)/lrelease" \ - QMAKE="$(qt5_get_bindir)/qmake" \ - PREFIX="${EPREFIX}/usr" \ - ${PN}.pro -} - -src_install() { - emake INSTALL_ROOT="${D}" install -} diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest index f08c70a7e9aa..c962fbeda598 100644 --- a/app-editors/okteta/Manifest +++ b/app-editors/okteta/Manifest @@ -1 +1 @@ -DIST okteta-0.26.6.tar.xz 975720 BLAKE2B e9eaf258e9285dfcbf41cd0fcd3fa31e01a9d3b57b7d5c305d644aaeba2588351d0e212c7a6df7f06ab54da47728a916169dc2670772d445f5d34427fbf18946 SHA512 f489ddf1be6fe369b564b11cf8234c7a291b63101a00fb43163a1019609d1152735750946b2bd876080eff1697903ba02ada1ea641293a59f31d5edf34604b1a +DIST okteta-0.26.15.tar.xz 1090764 BLAKE2B 3e96aca3bc1ec1aceb22de23f7aa954c7a41b1b074207bf59acb3be27ababb7a368044b231f587604c42dba16c002fd8f0df488b1828f564b0eb79cd64622fec SHA512 8e63b20ad3e1d238a6006fca834b355825015088a3dff82866e1197c2802e4a3cc57644d50b44407203bea2c2d4a132c89d402e52e4525d257de9a8cde87f1db diff --git a/app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch b/app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch new file mode 100644 index 000000000000..65beb70faae9 --- /dev/null +++ b/app-editors/okteta/files/okteta-0.26.13-doctools-optional.patch @@ -0,0 +1,35 @@ +From 5ca1bc18272c0ddbb3496fa29076ac2d65c034cf Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Sun, 27 Aug 2023 21:55:17 +0200 +Subject: [PATCH] Search for KF5DocTools individually + +Makes our ECM_HANDBOOK=forceoptional facility work while upstream is against it. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17203b22f..3c914f178 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -93,7 +93,6 @@ if( BUILD_DESKTOPPROGRAM ) + list(APPEND ADDITIONAL_REQUIRED_KF_COMPONENTS + Crash + DBusAddons +- DocTools + ) + endif() + find_package(KF5 ${REQUIRED_KF_VERSION} REQUIRED +@@ -117,6 +116,7 @@ ecm_set_disabled_deprecation_versions( + # helper libs + add_subdirectory( libs ) + if( BUILD_DESKTOPPROGRAM ) ++ find_package(KF5DocTools ${REQUIRED_KF_VERSION} REQUIRED) + add_subdirectory( doc ) + endif() + +-- +2.42.0 + diff --git a/app-editors/okteta/okteta-0.26.6.ebuild b/app-editors/okteta/okteta-0.26.15.ebuild index 0374acdcbe03..d7827f1dbd5b 100644 --- a/app-editors/okteta/okteta-0.26.6.ebuild +++ b/app-editors/okteta/okteta-0.26.15.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_HANDBOOK="forceoptional" ECM_TEST="true" -KFMIN=5.74.0 -QTMIN=5.15.2 +KFMIN=5.92.0 +QTMIN=5.15.5 VIRTUALX_REQUIRED="test" inherit ecm kde.org DESCRIPTION="Hex editor by KDE" -HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/" +HOMEPAGE="https://apps.kde.org/okteta/" if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - KEYWORDS="amd64 ~arm64 x86" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" fi LICENSE="GPL-2 handbook? ( FDL-1.2 )" @@ -49,10 +49,12 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - crypt? ( >=app-crypt/qca-2.3.0:2 ) + crypt? ( >=app-crypt/qca-2.3.0:2[qt5(+)] ) " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-0.26.13-doctools-optional.patch" ) # downstream + src_configure() { local mycmakeargs=( -DOMIT_EXAMPLES=ON diff --git a/app-editors/padre/files/padre-1.0.0-utf8.patch b/app-editors/padre/files/padre-1.0.0-utf8.patch new file mode 100644 index 000000000000..946750747553 --- /dev/null +++ b/app-editors/padre/files/padre-1.0.0-utf8.patch @@ -0,0 +1,23 @@ +From a3df4d7b8a765f1d0303410cdc686d4bf8adabdc Mon Sep 17 00:00:00 2001 +From: Tim Lapawa <git@lapawa.de> +Date: Mon, 5 Mar 2018 11:24:36 +0100 +Subject: [PATCH] The tiniest patch you can get to acquire perl 5.26 + compatibility. It just replaces a malformed UTF8 character. + +--- + lib/Padre/Wx/Main.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Padre/Wx/Main.pm b/lib/Padre/Wx/Main.pm +index f75cc17ea..b9005d40f 100644 +--- a/lib/Padre/Wx/Main.pm ++++ b/lib/Padre/Wx/Main.pm +@@ -5561,7 +5561,7 @@ sub on_prev_pane { + + $main->on_join_lines; + +-Join current line with next one (à la B<vi> with C<Ctrl+J>). No return value. ++Join current line with next one (a la B<vi> with C<Ctrl+J>). No return value. + + =cut + diff --git a/app-editors/padre/padre-1.0.0-r1.ebuild b/app-editors/padre/padre-1.0.0-r1.ebuild deleted file mode 100644 index aae5b0669614..000000000000 --- a/app-editors/padre/padre-1.0.0-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DIST_NAME=Padre -DIST_AUTHOR=PLAVEN -DIST_VERSION=1.00 -inherit perl-module - -DESCRIPTION="Perl Application Development and Refactoring Environment" -HOMEPAGE="http://padre.perlide.org/" - -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -# Test Deps -TDEPEND=" - >=dev-perl/Test-MockObject-1.09 - >=dev-perl/Test-Script-1.07 - >=dev-perl/Test-Exception-0.27 - >=dev-perl/Test-NoWarnings-0.084 - >=virtual/perl-Test-Simple-0.88 - >=dev-perl/Test-Warn-0.240.0 -" - -RDEPEND=" - dev-lang/perl[ithreads] - >=dev-lang/perl-5.10.1 - >=dev-perl/Algorithm-Diff-1.190.0 - >=dev-perl/Capture-Tiny-0.06 - >=dev-perl/Class-Adapter-1.05 - >=dev-perl/Class-Inspector-1.22 - >=dev-perl/Class-XSAccessor-1.130.0 - >=dev-perl/DBD-SQLite-1.350.0 - >=dev-perl/DBI-1.58 - >=dev-perl/Devel-Dumpvar-0.04 - >=dev-perl/Debug-Client-0.200.0 - >=dev-perl/Devel-Refactor-0.05 - >=dev-perl/File-Copy-Recursive-0.37 - >=dev-perl/File-Find-Rule-0.30 - >=dev-perl/File-HomeDir-0.91 - >=virtual/perl-File-Path-2.08 - >=dev-perl/File-Remove-1.40 - >=dev-perl/File-ShareDir-1.00 - >=virtual/perl-File-Spec-3.27.01 - >=virtual/perl-File-Temp-0.20 - >=dev-perl/File-Which-1.08 - dev-perl/File-pushd - virtual/perl-Getopt-Long - >=dev-perl/HTML-Parser-3.58 - >=dev-perl/IO-stringy-2.110 - virtual/perl-IO - >=dev-perl/IO-String-1.08 - >=dev-perl/IPC-Run-0.83 - >=dev-perl/JSON-XS-2.2.9 - >=virtual/perl-Scalar-List-Utils-1.18 - >=dev-perl/libwww-perl-5.815 - >=dev-perl/List-MoreUtils-0.22 - >=dev-perl/Locale-Msgfmt-0.15 - >=dev-perl/Module-Manifest-0.07 - >=dev-perl/ORLite-1.960.0 - >=dev-perl/ORLite-Migrate-1.100.0 - >=dev-perl/PAR-0.989 - >=dev-perl/Params-Util-0.33 - >=dev-perl/Parse-ErrorString-Perl-0.14 - >=dev-perl/Parse-ExuberantCTags-1.00 - >=dev-perl/Pod-Abstract-0.16 - >=dev-perl/Pod-POM-0.17 - >=virtual/perl-Pod-Simple-3.07 - >=dev-perl/PPI-1.205 - >=dev-perl/PPIx-EditorTools-0.130.0 - >=dev-perl/PPIx-Regexp-0.011 - dev-perl/Probe-Perl - >=dev-perl/Sort-Versions-1.500.0 - >=virtual/perl-Storable-2.16 - >=dev-perl/Template-Tiny-0.11 - >=virtual/perl-Text-Balanced-0.80 - >=dev-perl/Text-Diff-1.410.0 - >=dev-perl/Text-FindIndent-0.10 - >=dev-perl/Text-Patch-1.800.0 - >=virtual/perl-threads-1.71 - >=virtual/perl-threads-shared-1.33 - >=virtual/perl-Time-HiRes-1.97.18 - >=dev-perl/URI-0 - >=dev-perl/Wx-0.990.100 - >=dev-perl/Wx-Perl-ProcessStream-0.28 - >=dev-perl/Wx-Scintilla-0.340.0 - >=dev-perl/YAML-Tiny-1.32 - >=virtual/perl-version-0.79 -" -DEPEND="${RDEPEND}" -# test? ( -# ${TDEPEND} -# ) -#" - -DIST_TEST=skip - -PATCHES=( - "${FILESDIR}/${P}-DBD-Sqlite.patch" -) - -src_configure() { - unset DISPLAY - perl-module_src_configure -} -src_prepare() { - sed -i -e 's/^use inc::Module::Install/use lib q[.];\nuse inc::Module::Install/' Makefile.PL || - die "Can't patch Makefile.PL for 5.26 dot-in-inc" - perl-module_src_prepare -} diff --git a/app-editors/padre/padre-1.0.0-r2.ebuild b/app-editors/padre/padre-1.0.0-r2.ebuild new file mode 100644 index 000000000000..f583d1929264 --- /dev/null +++ b/app-editors/padre/padre-1.0.0-r2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DIST_NAME=Padre +DIST_AUTHOR=PLAVEN +DIST_VERSION=1.00 +inherit perl-module + +DESCRIPTION="Perl Application Development and Refactoring Environment" +HOMEPAGE="https://padre.perlide.org/" + +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="" + +# Test Deps +TDEPEND=" + >=dev-perl/Test-MockObject-1.90.0 + >=dev-perl/Test-Script-1.70.0 + >=dev-perl/Test-Exception-0.270.0 + >=dev-perl/Test-NoWarnings-0.84.0 + >=virtual/perl-Test-Simple-0.880.0 + >=dev-perl/Test-Warn-0.240.0 +" + +RDEPEND=" + dev-lang/perl[ithreads] + >=dev-lang/perl-5.10.1 + >=dev-perl/Algorithm-Diff-1.190.0 + >=dev-perl/Capture-Tiny-0.60.0 + >=dev-perl/Class-Adapter-1.50.0 + >=dev-perl/Class-Inspector-1.220.0 + >=dev-perl/Class-XSAccessor-1.130.0 + >=dev-perl/DBD-SQLite-1.350.0 + >=dev-perl/DBI-1.580.0 + >=dev-perl/Devel-Dumpvar-0.40.0 + >=dev-perl/Debug-Client-0.200.0 + >=dev-perl/Devel-Refactor-0.50.0 + >=dev-perl/File-Copy-Recursive-0.370.0 + >=dev-perl/File-Find-Rule-0.300.0 + >=dev-perl/File-HomeDir-0.910.0 + >=virtual/perl-File-Path-2.80.0 + >=dev-perl/File-Remove-1.400.0 + >=dev-perl/File-ShareDir-1.0.0 + >=virtual/perl-File-Spec-3.27.1 + >=virtual/perl-File-Temp-0.200.0 + >=dev-perl/File-Which-1.80.0 + dev-perl/File-pushd + virtual/perl-Getopt-Long + >=dev-perl/HTML-Parser-3.580.0 + >=dev-perl/IO-stringy-2.110.0 + virtual/perl-IO + >=dev-perl/IO-String-1.80.0 + >=dev-perl/IPC-Run-0.830.0 + >=dev-perl/JSON-XS-2.2.9 + >=virtual/perl-Scalar-List-Utils-1.180.0 + >=dev-perl/libwww-perl-5.815.0 + >=dev-perl/List-MoreUtils-0.220.0 + >=dev-perl/Locale-Msgfmt-0.150.0 + >=dev-perl/Module-Manifest-0.70.0 + >=dev-perl/ORLite-1.960.0 + >=dev-perl/ORLite-Migrate-1.100.0 + >=dev-perl/PAR-0.989.0 + >=dev-perl/Params-Util-0.330.0 + >=dev-perl/Parse-ErrorString-Perl-0.140.0 + >=dev-perl/Parse-ExuberantCTags-1.0.0 + >=dev-perl/Pod-Abstract-0.160.0 + >=dev-perl/Pod-POM-0.170.0 + >=virtual/perl-Pod-Simple-3.70.0 + >=dev-perl/PPI-1.205.0 + >=dev-perl/PPIx-EditorTools-0.130.0 + >=dev-perl/PPIx-Regexp-0.11.0 + dev-perl/Probe-Perl + >=dev-perl/Sort-Versions-1.500.0 + >=virtual/perl-Storable-2.160.0 + >=dev-perl/Template-Tiny-0.110.0 + >=virtual/perl-Text-Balanced-0.800.0 + >=dev-perl/Text-Diff-1.410.0 + >=dev-perl/Text-FindIndent-0.100.0 + >=dev-perl/Text-Patch-1.800.0 + >=virtual/perl-threads-1.710.0 + >=virtual/perl-threads-shared-1.330.0 + >=virtual/perl-Time-HiRes-1.97.18 + dev-perl/URI + >=dev-perl/Wx-0.990.100 + >=dev-perl/Wx-Perl-ProcessStream-0.280.0 + >=dev-perl/Wx-Scintilla-0.340.0 + >=dev-perl/YAML-Tiny-1.320.0 + >=virtual/perl-version-0.790.0 +" +BDEPEND="${RDEPEND} + test? ( + ${TDEPEND} + ) +" + +#DIST_TEST=skip + +PATCHES=( + "${FILESDIR}/${P}-DBD-Sqlite.patch" + "${FILESDIR}/${P}-utf8.patch" +) + +src_configure() { + unset DISPLAY + perl-module_src_configure +} + +src_prepare() { + sed -i -e 's/^use inc::Module::Install/use lib q[.];\nuse inc::Module::Install/' Makefile.PL || + die "Can't patch Makefile.PL for 5.26 dot-in-inc" + perl-module_src_prepare +} diff --git a/app-editors/pluma-plugins/Manifest b/app-editors/pluma-plugins/Manifest new file mode 100644 index 000000000000..9eeb0b88a346 --- /dev/null +++ b/app-editors/pluma-plugins/Manifest @@ -0,0 +1 @@ +DIST pluma-plugins-1.26.0.tar.xz 505652 BLAKE2B 09d34a3205796aab0b94b6e4d1c44b9902091b46511735b74a9cc1d1bee8a28352bf673ea7788eb4522e1dd0614a0399471aa8a076fd50f70bf1cf66e80326ad SHA512 ee59d52e0f879a5adf745c4be4a274f5c5b5403d7a9485236879e6e6db1c8f743de74be379fe84d2da73efe3eeb63bfa089a28f73762a6f0ceee0dbbbc464fa4 diff --git a/app-editors/pluma-plugins/metadata.xml b/app-editors/pluma-plugins/metadata.xml new file mode 100644 index 000000000000..694df975ee24 --- /dev/null +++ b/app-editors/pluma-plugins/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<!-- maintainer-needed --> +<use> + <flag name="bracketcompletion">Auto complete bracket pairs</flag> + <flag name="codecomment">Comment code blocks</flag> + <flag name="smartspaces">Insert smart spaces</flag> + <flag name="synctex">Enable synctex support for pdflatex</flag> + <flag name="terminal">Embed a terminal in the bottom pane</flag> +</use> +</pkgmetadata> diff --git a/app-editors/pluma-plugins/pluma-plugins-1.26.0-r1.ebuild b/app-editors/pluma-plugins/pluma-plugins-1.26.0-r1.ebuild new file mode 100644 index 000000000000..1969a87f5e98 --- /dev/null +++ b/app-editors/pluma-plugins/pluma-plugins-1.26.0-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MATE_LA_PUNT="yes" + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit mate python-single-r1 + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="amd64 x86" +fi + +DESCRIPTION="A set of plugins for Pluma, the MATE text editor." +LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" +SLOT="0" + +IUSE="+python bracketcompletion codecomment smartspaces synctex terminal" +REQUIRED_USE=" + "${PYTHON_REQUIRED_USE}" + bracketcompletion? ( python ) + codecomment? ( python ) + smartspaces? ( python ) + synctex? ( python ) + terminal? ( python ) + " + +RDEPEND=" + >=dev-libs/libpeas-1.14.1:0[gtk] + >=app-editors/gedit-40.0 + + >=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[python,${PYTHON_SINGLE_USEDEP}] + dev-libs/libpeas:0[python,${PYTHON_SINGLE_USEDEP}] + >=dev-python/dbus-python-0.82[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[cairo,${PYTHON_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] + synctex? ( >=dev-python/dbus-python-0.82 ) + terminal? ( >=x11-libs/vte-0.52:2.91[introspection] ) + + )" + +DEPEND="${RDEPEND}" +BDEPEND=" + dev-libs/libxml2 + dev-util/itstool + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig +" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_install() { + mate_src_install + use python && python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/" +} diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest index 6a160fe74bb3..07fec3ac564c 100644 --- a/app-editors/pluma/Manifest +++ b/app-editors/pluma/Manifest @@ -1,2 +1,2 @@ -DIST pluma-1.24.1.tar.xz 3679636 BLAKE2B e792433b93862c8b0c47145255311c3a3386c1b99ec1ac87ed91608d839ece4430205f83fcc3c0f5145f986105d4c5d8803393035fcaaea08155197bbcf15d03 SHA512 0cfd6a035fc95993dce3e556c49641e799888f20159b29f2c0712c54ee772aa6df1ce755f329414c94efdb2cb3819ce633b92e6559b0c8cb064dab3c74729ab3 -DIST pluma-1.24.2.tar.xz 3745160 BLAKE2B ed855b19f1ab80cb6ef9bc175eea3c2af386b1e45123bc0e3ad93d1964efb4822fe1b3d7490308357fcff96557bb6189f081a467f41a6907e76a1961de8f23d3 SHA512 588640744f8a0bec08d0c51c0309380a57cb6319c98124885e30d05e7dd8488ba7bd5acec1bf21fb0d6832626ae8925b24cd241202265af1a631a91313cdad2b +DIST pluma-1.26.1.tar.xz 3824664 BLAKE2B e5ee5c2efeec90fb6733fac1077c870c79a386b3ab28d71a17929f144ecf9ae73ab66dc1a806504d7cb244bdd3c9ad63b7cccb5fb8f1f44b7b44a1076948a0e7 SHA512 bc4f621736d93df07fc2dc434a25c5a5acaf0d2c958eac43bd0061d4b664cae9b9eac1fffc47afa1509fd64b3c93a77ca62737428b034ca25997ebee432d5eb3 +DIST pluma-1.28.0.tar.xz 3866800 BLAKE2B 10813717b7d18a0836059a10deb67a61b00a73cf3d5b18f12a9e760b8b65053b3a82dc0ac9af898d9f2bb4d6998db536bcaef143024ae91f9035fe6e1ee72fea SHA512 8f21aabed46a70dfe8446ddf6db5cc4326782328d0b8dd3689c8b906cc8d4b746712c6b9decfa48ef028bdbb8a0b1c6a2ec43def23488ae55cfd59aafd5a691a diff --git a/app-editors/pluma/metadata.xml b/app-editors/pluma/metadata.xml index c28d596be470..fbb8c2a0c1a3 100644 --- a/app-editors/pluma/metadata.xml +++ b/app-editors/pluma/metadata.xml @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>mate@gentoo.org</email> - <name>Gentoo MATE Desktop</name> - </maintainer> + <maintainer type="person" proxied="yes"> + <email>immoloism@gmail.com</email> + <name>Ian Jordan</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">mate-desktop/pluma</remote-id> </upstream> diff --git a/app-editors/pluma/pluma-1.24.1.ebuild b/app-editors/pluma/pluma-1.26.1.ebuild index 0757d29b3b3c..92953d64b895 100644 --- a/app-editors/pluma/pluma-1.24.1.ebuild +++ b/app-editors/pluma/pluma-1.26.1.ebuild @@ -1,38 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MATE_LA_PUNT="yes" +PYTHON_COMPAT=( python3_{10..12} ) +inherit mate python-single-r1 virtualx gnome2-utils -PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} ) - -inherit mate python-single-r1 virtualx +DESCRIPTION="Pluma text editor for the MATE desktop" -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86" fi -DESCRIPTION="Pluma text editor for the MATE desktop" LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" -SLOT="0" - +SLOT=0 IUSE="+introspection spell test" - REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" -# Tests require gvfs sftp fs mounted and schema's installed. Disable tests. -# https://github.com/mate-desktop/mate-text-editor/issues/33 -RESTRICT="test" - -COMMON_DEPEND="dev-libs/atk +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 >=dev-libs/glib-2.50:2 - >=dev-libs/libpeas-1.2.0[gtk] + >=dev-libs/libpeas-1.2.0:0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] - >=x11-libs/gtksourceview-3.0.0:3.0 + >=x11-libs/gtksourceview-4.0.2:4 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 @@ -42,28 +38,33 @@ COMMON_DEPEND="dev-libs/atk >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) - !!app-editors/mate-text-editor " - -RDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND} +RDEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} >=mate-base/mate-desktop-1.9[introspection?] virtual/libintl " - DEPEND="${COMMON_DEPEND} ~app-text/docbook-xml-dtd-4.1.2 - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-util/glib-utils dev-util/gtk-doc - dev-util/gtk-doc-am - >=sys-devel/libtool-2.2.6:2 + dev-build/gtk-doc-am + >=dev-build/libtool-2.2.6:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig " +MATE_FORCE_AUTORECONF=true + +src_prepare() { + # Test require gvfs sftp fs mounted and schema's installed. Skip this one. + # https://github.com/mate-desktop/mate-text-editor/issues/33 + sed -e '/+= document-saver/d' -i tests/Makefile.am || die + + mate_src_prepare +} + src_configure() { mate_src_configure \ $(use_enable introspection) \ @@ -73,9 +74,9 @@ src_configure() { src_test() { # FIXME: This should be handled at eclass level. - "${EPREFIX%/}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die + "${EPREFIX}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die unset DBUS_SESSION_BUS_ADDRESS - - GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check + local -x GSETTINGS_SCHEMA_DIR="${S}/data" + virtx emake check } diff --git a/app-editors/pluma/pluma-1.24.2.ebuild b/app-editors/pluma/pluma-1.28.0.ebuild index 849ab407ba6e..209753262d10 100644 --- a/app-editors/pluma/pluma-1.24.2.ebuild +++ b/app-editors/pluma/pluma-1.28.0.ebuild @@ -1,38 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 MATE_LA_PUNT="yes" - -PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9,3_10} ) - +PYTHON_COMPAT=( python3_{10..12} ) inherit mate python-single-r1 virtualx -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" +DESCRIPTION="Pluma text editor for the MATE desktop" + +MINOR=$(($(ver_cut 2) % 2)) +if [[ ${MINOR} -eq 0 ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86" fi -DESCRIPTION="Pluma text editor for the MATE desktop" LICENSE="FDL-1.1+ GPL-2+ LGPL-2+" -SLOT="0" - +SLOT=0 IUSE="+introspection spell test" - REQUIRED_USE="${PYTHON_REQUIRED_USE}" +RESTRICT="!test? ( test )" -# Tests require gvfs sftp fs mounted and schema's installed. Disable tests. -# https://github.com/mate-desktop/mate-text-editor/issues/33 -RESTRICT="test" - -COMMON_DEPEND="dev-libs/atk +COMMON_DEPEND=" + >=app-accessibility/at-spi2-core-2.46.0 >=dev-libs/glib-2.50:2 - >=dev-libs/libpeas-1.2.0[gtk] + >=dev-libs/libpeas-1.2.0:0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] - >=x11-libs/gtksourceview-3.0.0:3.0 + >=x11-libs/gtksourceview-4.0.2:4 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 @@ -42,28 +38,33 @@ COMMON_DEPEND="dev-libs/atk >=app-text/enchant-1.6:= >=app-text/iso-codes-0.35 ) - !!app-editors/mate-text-editor " - -RDEPEND="${PYTHON_DEPS} - ${COMMON_DEPEND} +RDEPEND="${COMMON_DEPEND} + ${PYTHON_DEPS} >=mate-base/mate-desktop-1.9[introspection?] virtual/libintl " - DEPEND="${COMMON_DEPEND} ~app-text/docbook-xml-dtd-4.1.2 - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools dev-util/glib-utils dev-util/gtk-doc - dev-util/gtk-doc-am - >=sys-devel/libtool-2.2.6:2 + dev-build/gtk-doc-am + >=dev-build/libtool-2.2.6:2 >=sys-devel/gettext-0.19.8 virtual/pkgconfig " +MATE_FORCE_AUTORECONF=true + +src_prepare() { + # Test require gvfs sftp fs mounted and schema's installed. Skip this one. + # https://github.com/mate-desktop/mate-text-editor/issues/33 + sed -e '/+= document-saver/d' -i tests/Makefile.am || die + + mate_src_prepare +} + src_configure() { mate_src_configure \ $(use_enable introspection) \ @@ -73,9 +74,9 @@ src_configure() { src_test() { # FIXME: This should be handled at eclass level. - "${EPREFIX%/}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die + "${EPREFIX}/${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die unset DBUS_SESSION_BUS_ADDRESS - - GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check + local -x GSETTINGS_SCHEMA_DIR="${S}/data" + virtx emake check } diff --git a/app-editors/pyvim/Manifest b/app-editors/pyvim/Manifest index ed95aecc3d88..d03a12272a13 100644 --- a/app-editors/pyvim/Manifest +++ b/app-editors/pyvim/Manifest @@ -1 +1 @@ -DIST pyvim-3.0.2.tar.gz 35227 BLAKE2B 8edc2218b3a0f2ba922531b75f65a5273ad9a2697f72ecf994cf7d2406c6311c3f28b22b6adb1243150a90db74962256ceaa7cf47ec99c2388299742451d6efb SHA512 da961342ba52e5beca44a607cbb923953388e8674409db9ca2b152017eeedce84f92e42a9f6d0e5019c5c4d88d82f4a987cb378f311cf84a169cefa54dc5efce +DIST pyvim-3.0.3.gh.tar.gz 492633 BLAKE2B d62f1db2ec4af635841d18c860c5ac571c664116c539bab87b5f00a9c15b1f37f9dd53649d98a3d21d3bec9df0af46d18443eb1b34961d0971a7ed75df6a8c74 SHA512 0af9b772b97c21b8a9fe966497849eb83c6f770a212b98c7f261309f2f70d6cc8bcf2175660bee5c44850d6c805570946a79fbe9db7f1ffa8e20e19ef61a0635 diff --git a/app-editors/pyvim/metadata.xml b/app-editors/pyvim/metadata.xml index fd901d010bd6..e99fedebbfd8 100644 --- a/app-editors/pyvim/metadata.xml +++ b/app-editors/pyvim/metadata.xml @@ -5,10 +5,6 @@ <email>vim@gentoo.org</email> <name>Gentoo Vim Project</name> </maintainer> - <maintainer type="person"> - <email>monsieurp@gentoo.org</email> - <name>Patrice Clement</name> - </maintainer> <upstream> <remote-id type="pypi">pyvim</remote-id> <remote-id type="github">prompt-toolkit/pyvim</remote-id> diff --git a/app-editors/pyvim/pyvim-3.0.2.ebuild b/app-editors/pyvim/pyvim-3.0.2.ebuild deleted file mode 100644 index cd50a4a019fe..000000000000 --- a/app-editors/pyvim/pyvim-3.0.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit distutils-r1 - -DESCRIPTION="An implementation of Vim in Python" -HOMEPAGE="https://pypi.org/project/pyvim https://github.com/prompt-toolkit/pyvim" -SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="amd64 x86" - -RDEPEND=" - app-eselect/eselect-vi - dev-python/docopt[${PYTHON_USEDEP}] - dev-python/prompt_toolkit[${PYTHON_USEDEP}] - dev-python/pyflakes[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/wcwidth[${PYTHON_USEDEP}] -" - -eselect_vi_update() { - einfo "Calling eselect vi update..." - eselect vi update --if-unset - eend $? -} - -pkg_postinst() { - eselect_vi_update -} - -pkg_postrm() { - eselect_vi_update -} diff --git a/app-editors/pyvim/pyvim-3.0.3.ebuild b/app-editors/pyvim/pyvim-3.0.3.ebuild new file mode 100644 index 000000000000..984c32f845ed --- /dev/null +++ b/app-editors/pyvim/pyvim-3.0.3.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 edo + +COMMIT="14118ad2e4d0da2e955fd9069b8772408307618b" +DESCRIPTION="An implementation of Vim in Python" +HOMEPAGE="https://pypi.org/project/pyvim/ https://github.com/prompt-toolkit/pyvim" +SRC_URI="https://github.com/prompt-toolkit/${PN}/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="amd64 ~riscv x86" + +RDEPEND=" + dev-python/docopt[${PYTHON_USEDEP}] + dev-python/prompt-toolkit[${PYTHON_USEDEP}] + dev-python/pyflakes[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/wcwidth[${PYTHON_USEDEP}] +" +IDEPEND=" + app-eselect/eselect-vi +" + +distutils_enable_tests pytest + +eselect_vi_update() { + edob eselect vi update --if-unset +} + +pkg_postinst() { + eselect_vi_update +} + +pkg_postrm() { + eselect_vi_update +} diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml index fd4cdb06be09..579725de06cb 100644 --- a/app-editors/qemacs/metadata.xml +++ b/app-editors/qemacs/metadata.xml @@ -35,4 +35,7 @@ * Small! Full version is about 150KB. Smaller custom versions can be built by removing modules. </longdescription> +<upstream> + <remote-id type="savannah-nongnu">qemacs</remote-id> +</upstream> </pkgmetadata> diff --git a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild b/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild index d64a4d89ed71..bebc3f453493 100644 --- a/app-editors/qemacs/qemacs-0.4.1_pre20170225.ebuild +++ b/app-editors/qemacs/qemacs-0.4.1_pre20170225.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="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" LICENSE="LGPL-2.1+ GPL-2+" SLOT="0" -KEYWORDS="amd64 arm ~ppc x86" +KEYWORDS="amd64 arm ~ppc ~riscv x86" IUSE="gui png xv" RESTRICT="test" diff --git a/app-editors/qhexedit2/Manifest b/app-editors/qhexedit2/Manifest index 31427cf34c3b..98fe22b61571 100644 --- a/app-editors/qhexedit2/Manifest +++ b/app-editors/qhexedit2/Manifest @@ -1 +1 @@ -DIST qhexedit2-0.8.6_p20190316.tar.gz 355512 BLAKE2B a7edc8d05a7788f3a3f2202762ca3dc436cafbde1b1216ff1bb342055600a2e9d53c27fe324380331b8182904545c698106129238065cd2416d244fdfa176446 SHA512 4ef288c8a220c308d38c41fee83fe962e213cdfa448445ef73c3d2fe1952b68f2096732e78d2aa0a87eddd3cf2f47bed3e77807e12d2b7616c1447b3bf1b0e7d +DIST qhexedit2-0.8.9_p20210525.tar.gz 342178 BLAKE2B baffe5b5e1130476162f23a91420cc86675a162c39539c9f07685cecc82571817625202814006221f96b56e94c0325fd7a6d8f2294041b426054f809c9967bad SHA512 d8a5159433a1212085371473cc7a89c4888c6af6b1416a34e3ea9d1ef9ae19411af32bea2e2fb256a024d6f2d05c733d285314cfc17f37dae065d7407a9c0d2c diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip.patch new file mode 100644 index 000000000000..56ae97159030 --- /dev/null +++ b/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/820473 +From bdb22d3542099d7e1933aaffa80e044375466914 Mon Sep 17 00:00:00 2001 +From: Huang Rui <vowstar@gmail.com> +Date: Sat, 7 May 2022 14:49:35 +0800 +Subject: [PATCH] setup.py: fix pyqt_sip_dir on modern Linux distributions + +QtCore/QtCoremod.sip may be installed to: +/usr/lib/python3.9/site-packages/PyQt5/bindings/QtCore/QtCoremod.sip +See also: https://github.com/qgis/QGIS/blob/master/cmake/FindPyQt5.py + +Closes: https://bugs.gentoo.org/820473 +Signed-off-by: Huang Rui <vowstar@gmail.com> +--- + setup.py | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/setup.py b/setup.py +index 1a0d912..1906a07 100644 +--- a/setup.py ++++ b/setup.py +@@ -10,6 +10,14 @@ + + cfg = sipconfig.Configuration() + pyqt_sip_dir = cfg.default_sip_dir ++for p in (os.path.join(pyqt_sip_dir, "PyQt5"), ++ os.path.join(pyqt_sip_dir, "PyQt5-3"), ++ os.path.join(pyqt_sip_dir, "PyQt4"), ++ pyqt_sip_dir, ++ os.path.join(cfg.default_mod_dir, "PyQt5", "bindings")): ++ if os.path.exists(os.path.join(p, "QtCore", "QtCoremod.sip")): ++ pyqt_sip_dir = p ++ break + + try: + import PyQt5 diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip5.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip5.patch new file mode 100644 index 000000000000..0cc134e32358 --- /dev/null +++ b/app-editors/qhexedit2/files/qhexedit2-0.8.6-sip5.patch @@ -0,0 +1,82 @@ +https://bugs.gentoo.org/820473 +https://bugs.gentoo.org/815133 +https://github.com/Simsys/qhexedit2/pull/137 +https://src.fedoraproject.org/rpms/qhexedit2/blob/rawhide/f/sip5.patch +From ce17d35586de1b9fdc21e3f8450dd1d2b76d5bcc Mon Sep 17 00:00:00 2001 +From: Scott Talbert <swt@techie.net> +Date: Mon, 18 Jan 2021 21:06:46 -0500 +Subject: [PATCH] Add support for building with sip 5 + +--- + project.py | 29 +++++++++++++++++++++++++++++ + pyproject.toml | 14 ++++++++++++++ + src/qhexedit.sip | 2 +- + 3 files changed, 44 insertions(+), 1 deletion(-) + create mode 100644 project.py + create mode 100644 pyproject.toml + +diff --git a/project.py b/project.py +new file mode 100644 +index 0000000..c9ee67f +--- /dev/null ++++ b/project.py +@@ -0,0 +1,29 @@ ++"""The build configuration file for QHexEdit, used by sip.""" ++ ++import os ++from os.path import abspath, join ++from sipbuild import Option ++from pyqtbuild import PyQtBindings, PyQtProject ++import PyQt5 ++ ++ ++class QHexEditProject(PyQtProject): ++ """The QHexEdit Project class.""" ++ ++ def __init__(self): ++ super().__init__() ++ self.bindings_factories = [QHexEditBindings] ++ ++ def update(self, tool): ++ """Allows SIP to find PyQt5 .sip files.""" ++ super().update(tool) ++ self.sip_include_dirs.append(join(PyQt5.__path__[0], 'bindings')) ++ ++ ++class QHexEditBindings(PyQtBindings): ++ """The QHexEdit Bindings class.""" ++ ++ def __init__(self, project): ++ super().__init__(project, name='QHexEdit', ++ sip_file='qhexedit.sip', ++ qmake_QT=['widgets']) +diff --git a/pyproject.toml b/pyproject.toml +new file mode 100644 +index 0000000..b5edaa4 +--- /dev/null ++++ b/pyproject.toml +@@ -0,0 +1,14 @@ ++[build-system] ++requires = ["sip >=5, <7", "PyQt-builder >=1.1.0, <2", "PyQt5"] ++build-backend = "sipbuild.api" ++ ++[tool.sip.metadata] ++name = "QHexEdit" ++version = "0.8.9" ++ ++[tools.sip] ++abi-version = "12.8" ++project-factory = "pyqtbuild:PyQtProject" ++ ++[tool.sip.project] ++sip-files-dir = "src" +diff --git a/src/qhexedit.sip b/src/qhexedit.sip +index f7db293..6d4ebae 100644 +--- a/src/qhexedit.sip ++++ b/src/qhexedit.sip +@@ -1,4 +1,4 @@ +-%Module(name=qhexedit, version=1) ++%Module(name=qhexedit) + + %Import QtCore/QtCoremod.sip + %Import QtGui/QtGuimod.sip diff --git a/app-editors/qhexedit2/files/qhexedit2-0.8.9-fix-crash.patch b/app-editors/qhexedit2/files/qhexedit2-0.8.9-fix-crash.patch new file mode 100644 index 000000000000..9c3099b06d28 --- /dev/null +++ b/app-editors/qhexedit2/files/qhexedit2-0.8.9-fix-crash.patch @@ -0,0 +1,37 @@ +https://github.com/Simsys/qhexedit2/pull/139 +From d314aab25eeab0db131fc87f20daf7c4ad587ee2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E8=AF=B7=E5=8F=AB=E6=88=91=E8=88=B9=E9=95=BF?= + <38233142+thinkSJ@users.noreply.github.com> +Date: Sat, 13 Nov 2021 18:35:25 +0800 +Subject: [PATCH] Update qhexedit.cpp + +crashed when press ctrl alt keys.... +--- + src/qhexedit.cpp | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/src/qhexedit.cpp b/src/qhexedit.cpp +index d7e532c..4137192 100644 +--- a/src/qhexedit.cpp ++++ b/src/qhexedit.cpp +@@ -766,11 +766,15 @@ void QHexEdit::keyPressEvent(QKeyEvent *event) + (QApplication::keyboardModifiers() == Qt::GroupSwitchModifier)) + { + /* Hex and ascii input */ +- int key; +- if (_editAreaIsAscii) +- key = (uchar)event->text().at(0).toLatin1(); +- else +- key = int(event->text().at(0).toLower().toLatin1()); ++ int key = 0; ++ QString text = event->text(); ++ if (!text.isEmpty()) ++ { ++ if (_editAreaIsAscii) ++ key = (uchar)text.at(0).toLatin1(); ++ else ++ key = int(text.at(0).toLower().toLatin1()); ++ } + + if ((((key >= '0' && key <= '9') || (key >= 'a' && key <= 'f')) && _editAreaIsAscii == false) + || (key >= ' ' && _editAreaIsAscii)) diff --git a/app-editors/qhexedit2/metadata.xml b/app-editors/qhexedit2/metadata.xml index b21f150a2481..f7e7eb3ae5ad 100644 --- a/app-editors/qhexedit2/metadata.xml +++ b/app-editors/qhexedit2/metadata.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>ktrace@yandex.ru</email> - <name>Victor Kustov</name> + <maintainer type="person"> + <email>vowstar@gmail.com</email> + <name>Huang Rui</name> </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <use> <flag name="gui">Install Qt5 hex editor</flag> diff --git a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild deleted file mode 100644 index bc6a9f42909e..000000000000 --- a/app-editors/qhexedit2/qhexedit2-0.8.6_p20190316.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 qmake-utils - -EGIT_COMMIT="ba5af8616b3a6c916e718914225a483267c01356" -DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings" -HOMEPAGE="https://github.com/lancos/qhexedit2/" -SRC_URI="https://github.com/lancos/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc +gui python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}/${PN}-0.8.4-setup.py.patch" -) - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - python? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] - <dev-python/sip-5[${PYTHON_USEDEP}] - ${PYTHON_DEPS} - ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}" - -src_prepare() { - default - sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \ - -e "\$aINSTALLS += target" src/qhexedit.pro \ - || die "src/qhexedit.pro: sed failed" - use python && distutils-r1_src_prepare -} - -src_configure() { - eqmake5 src/qhexedit.pro - if use gui; then - cd example || die "can't cd example" - eqmake5 qhexedit.pro - fi -} - -src_compile() { - default - use python && distutils-r1_src_compile - use gui && emake -C example -} - -python_compile() { - use python && distutils-r1_python_compile build_ext --library-dirs="${S}" -} - -src_test() { - cd test || die "can't cd test" - mkdir logs || die "can't create logs dir" - eqmake5 chunks.pro - emake - ./chunks || die "test run failed" - grep -q "^NOK" logs/Summary.log && die "test failed" -} - -src_install() { - emake INSTALL_ROOT="${D}" install - doheader src/*.h - use python && distutils-r1_src_install - use gui && dobin example/qhexedit - if use doc; then - dodoc -r doc/html - dodoc doc/release.txt - fi -} diff --git a/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild new file mode 100644 index 000000000000..34d3906f4682 --- /dev/null +++ b/app-editors/qhexedit2/qhexedit2-0.8.9_p20210525-r2.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit python-r1 qmake-utils + +EGIT_COMMIT="541139125be034b90b6811a84faa1413e357fd94" +DESCRIPTION="Hex editor library, Qt application written in C++ with Python bindings" +HOMEPAGE="https://github.com/Simsys/qhexedit2/" +SRC_URI="https://github.com/Simsys/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~riscv x86" +IUSE="doc +gui python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}/${PN}-0.8.4-setup.py.patch" + "${FILESDIR}/${PN}-0.8.6-sip.patch" #820473 + "${FILESDIR}/${PN}-0.8.6-sip5.patch" #820473 + "${FILESDIR}/${PN}-0.8.9-fix-crash.patch" +) + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + python? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/PyQt5-5.15.6[gui,widgets,${PYTHON_USEDEP}] + ') + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + python? ( + $(python_gen_cond_dep ' + >=dev-python/PyQt-builder-1.10[${PYTHON_USEDEP}] + >=dev-python/sip-5:=[${PYTHON_USEDEP}] + ') + ) +" + +S="${WORKDIR}/${PN}-${EGIT_COMMIT}" + +src_prepare() { + default + sed -i -e '/^unix:DESTDIR/ d' -e "\$atarget.path = /usr/$(get_libdir)" \ + -e "\$aINSTALLS += target" src/qhexedit.pro \ + || die "src/qhexedit.pro: sed failed" +} + +src_configure() { + eqmake5 src/qhexedit.pro + if use gui; then + cd example || die "can't cd example" + eqmake5 qhexedit.pro + fi +} + +src_compile() { + emake + use gui && emake -C example + if use python; then + export PATH="$(qt5_get_bindir):${PATH}" + python_build() { + pushd "${S}" || die + sip-build || die + popd || die + } + python_foreach_impl run_in_build_dir python_build + fi +} + +src_test() { + cd test || die "can't cd test" + mkdir logs || die "can't create logs dir" + eqmake5 chunks.pro + emake + ./chunks || die "test run failed" + grep -q "^NOK" logs/Summary.log && die "test failed" +} + +src_install() { + doheader src/*.h + dolib.so libqhexedit.so* + if use python; then + python_install() { + pushd "${S}"/build || die + emake INSTALL_ROOT="${D}" install + popd || die + } + python_foreach_impl run_in_build_dir python_install + fi + if use gui; then + dobin example/qhexedit + insinto /usr/share/${PN}/ + doins example/translations/*.qm + fi + if use doc; then + dodoc -r doc/html + dodoc doc/release.txt + fi +} diff --git a/app-editors/qxmledit/Manifest b/app-editors/qxmledit/Manifest index 8f6ea74897be..dcf32d3b6f56 100644 --- a/app-editors/qxmledit/Manifest +++ b/app-editors/qxmledit/Manifest @@ -1 +1,2 @@ DIST qxmledit-0.9.12-src.tgz 22582822 BLAKE2B 66cf57e8cd1cbf712c28e55ee39685ea907216ff397b9f6ad5307e768bbd22a16b1f32dbbd309ae186479c35bd57d0aa1a1d5b4e174d1230c3b52f844be7e9f7 SHA512 996f1a656c6191950eb18bd3df13574f6bd85ad58132b5662cce5b6538fe81597359d3a7f69cff5c252c2efceb749ee079bed7165b3c142d33e0c4cb500231cc +DIST qxmledit-0.9.18-src.tgz 19725693 BLAKE2B f895a0981efcbf5071a38b7b02ad0063f0aa55b31c8329ad9b39167b853cc5d1ab4c2f0e75a48c4354a1808a96e7987c55063fc4b7c3f1012173d28d8e301eb2 SHA512 1122021d27561309c70946862a67ea2ba1045038b1ec8469ae61c7c9a67b13689179078ae3a0dd6222d30e3c30cd35a15ba6f4ef27273bbe87d26ec5a215c65c diff --git a/app-editors/qxmledit/qxmledit-0.9.12.ebuild b/app-editors/qxmledit/qxmledit-0.9.12.ebuild index 88123d4bf620..ba8f660a4384 100644 --- a/app-editors/qxmledit/qxmledit-0.9.12.ebuild +++ b/app-editors/qxmledit/qxmledit-0.9.12.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=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" IUSE="" DEPEND=" diff --git a/app-editors/qxmledit/qxmledit-0.9.18-r1.ebuild b/app-editors/qxmledit/qxmledit-0.9.18-r1.ebuild new file mode 100644 index 000000000000..ee4baa01ebfb --- /dev/null +++ b/app-editors/qxmledit/qxmledit-0.9.18-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop qmake-utils xdg + +DESCRIPTION="Simple Qt-based XML editor" +HOMEPAGE="https://qxmledit.org/" +SRC_URI="mirror://sourceforge/${PN}/${P}-src.tgz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" + +DEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5[jpeg] + dev-qt/qtimageformats:5[mng] + dev-qt/qtnetwork:5 + dev-qt/qtopengl:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscxml:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + dev-qt/qtxmlpatterns:5 + media-libs/glu + virtual/opengl +" +RDEPEND="${DEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +DOCS=( AUTHORS NEWS README ) + +src_configure() { + export \ + QXMLEDIT_INST_DIR="${EPREFIX}/usr/bin" \ + QXMLEDIT_INST_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \ + QXMLEDIT_INST_INCLUDE_DIR="${EPREFIX}/usr/include/${PN}" \ + QXMLEDIT_INST_DATA_DIR="${EPREFIX}/usr/share/${PN}" \ + QXMLEDIT_INST_DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + + # avoid -Werror (affecting src/coptions.pri) bug #925324 + export QXMLEDIT_INST_DISABLE_COMPILE_WARNINGS=Y + + # avoid internal compiler errors + use x86 && export QXMLEDIT_INST_AVOID_PRECOMP_HEADERS=Y + + eqmake5 +} + +src_install() { + emake INSTALL_ROOT="${D}" install + + doicon install_scripts/environment/icon/qxmledit.png + domenu install_scripts/environment/desktop/QXmlEdit.desktop + einstalldocs +} diff --git a/app-editors/remarkable/Manifest b/app-editors/remarkable/Manifest new file mode 100644 index 000000000000..9a5732e15b1a --- /dev/null +++ b/app-editors/remarkable/Manifest @@ -0,0 +1 @@ +DIST remarkable-1.9.0_pre20210320.tar.gz 132617 BLAKE2B e3146ad354ebbe7972556d5952a576a1e242bd2aefca91948d75ae6c571fe3e1956e40184db4c5ca6a47f01130a7745101fe556c49854058b9fd110cb74783ae SHA512 0cfe1a01a198396dbc6f30d9e4ca4fa2de6624f29557d60053a7e446a0a3da3a577b32b25ba6eb93300316ede6afad4140ff75bd3e411e15cb1e5221d2b095d9 diff --git a/app-editors/remarkable/files/README.gentoo b/app-editors/remarkable/files/README.gentoo new file mode 100644 index 000000000000..9533e5f0de44 --- /dev/null +++ b/app-editors/remarkable/files/README.gentoo @@ -0,0 +1,10 @@ + +Known Gentoo-related issues: +============================ + +- export to HTML/PDF does not work (this feature would need the python module + "wkhtmltopdf" which is not packaged for gentoo and most probably will + never be - it depends on deprecated Qt WebKit) +- spellchecking is disabled (would need python module pygtkspellcheck which) + is also not packaged for gentoo yet) + diff --git a/app-editors/remarkable/files/fix-custom-css-issue.patch b/app-editors/remarkable/files/fix-custom-css-issue.patch new file mode 100644 index 000000000000..4d45f18a01b4 --- /dev/null +++ b/app-editors/remarkable/files/fix-custom-css-issue.patch @@ -0,0 +1,29 @@ +From 09459c2e577a0ae2561e4f785efc026dcfb65809 Mon Sep 17 00:00:00 2001 +From: Nikita Zlobin <cook60020tmp@mail.ru> +Date: Fri, 4 Aug 2023 23:56:43 +0500 +Subject: [PATCH] Fix issue #345 - apply custom css on start + +Just a typo, when default empty css was used on application start +instead of configured. + +Fixes #345 +--- + remarkable/RemarkableWindow.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/remarkable/RemarkableWindow.py b/remarkable/RemarkableWindow.py +index d54aa32..45134ab 100755 +--- a/remarkable/RemarkableWindow.py ++++ b/remarkable/RemarkableWindow.py +@@ -331,7 +331,7 @@ class RemarkableWindow(Window): + elif self.style == "solarized_light": + styles.set(styles.solarized_light) + elif self.style == "custom": +- styles.set(styles.custom_css) ++ styles.set(self.custom_css) + else: + print("Style key error") + +-- +2.39.3 + diff --git a/app-editors/remarkable/files/remarkable-1.9.0_pre20210320-disable-spellcheck.patch b/app-editors/remarkable/files/remarkable-1.9.0_pre20210320-disable-spellcheck.patch new file mode 100644 index 000000000000..6dbd4cf48a8d --- /dev/null +++ b/app-editors/remarkable/files/remarkable-1.9.0_pre20210320-disable-spellcheck.patch @@ -0,0 +1,23 @@ +Remove the spellcheck option permanently unless someone is packaging +pygtkspellcheck for Gentoo + +Signed-off-by: Martin Dummer <martin.dummer@gmx.net> + +--- a/remarkable/RemarkableWindow.py ++++ b/remarkable/RemarkableWindow.py +@@ -41,13 +41,8 @@ + import warnings + from findBar import FindBar + +-# Check if gtkspellcheck is installed +-try: +- from gtkspellcheck import SpellChecker +- spellcheck_enabled = True +-except: +- print("*Spellchecking not enabled.\n*To enable spellchecking install pygtkspellcheck\n*https://pypi.python.org/pypi/pygtkspellcheck/") +- spellcheck_enabled = False ++# spellcheck permanently disabled ++spellcheck_enabled = False + + import logging + logger = logging.getLogger('remarkable') diff --git a/app-editors/remarkable/files/webkit-version.patch b/app-editors/remarkable/files/webkit-version.patch new file mode 100644 index 000000000000..6b64a9f8b6e6 --- /dev/null +++ b/app-editors/remarkable/files/webkit-version.patch @@ -0,0 +1,11 @@ +--- a/remarkable/RemarkableWindow.py 2023-03-11 19:50:14.183333326 +0100 ++++ b/remarkable/RemarkableWindow.py 2023-03-11 19:57:02.033333327 +0100 +@@ -24,7 +24,7 @@ + import gi + gi.require_version('Gtk', '3.0') + gi.require_version('GtkSource', '3.0') +-gi.require_version('WebKit2', '4.0') ++gi.require_version('WebKit2', '4.1') + + from bs4 import BeautifulSoup + from gi.repository import Gdk, Gtk, GtkSource, Pango, WebKit2 diff --git a/app-editors/remarkable/metadata.xml b/app-editors/remarkable/metadata.xml new file mode 100644 index 000000000000..0aa3bb718657 --- /dev/null +++ b/app-editors/remarkable/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>martin.dummer@gmx.net</email> + <name>Martin Dummer</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">jamiemcg/remarkable</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-editors/remarkable/remarkable-1.9.0_pre20210320-r2.ebuild b/app-editors/remarkable/remarkable-1.9.0_pre20210320-r2.ebuild new file mode 100644 index 000000000000..c3b373f0dc21 --- /dev/null +++ b/app-editors/remarkable/remarkable-1.9.0_pre20210320-r2.ebuild @@ -0,0 +1,69 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit desktop gnome2-utils python-single-r1 readme.gentoo-r1 + +DESCRIPTION="Fully featured markdown editor, supports github markdown dialect" +HOMEPAGE="https://remarkableapp.github.io/ https://github.com/jamiemcg/remarkable" +GIT_COMMIT="7b0b3dacef270a00c28e8852a88d74f72a3544d7" +SRC_URI="https://github.com/jamiemcg/remarkable/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/Remarkable-${GIT_COMMIT}" + +LICENSE="BSD-2 GPL-2+ LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + net-libs/webkit-gtk:4.1[introspection] + x11-libs/gtk+:3[introspection] + x11-libs/gtksourceview:3.0[introspection] + $(python_gen_cond_dep ' + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ')" +RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-disable-spellcheck.patch + "${FILESDIR}"/webkit-version.patch +) + +src_prepare() { + default + sed -i -e "s|import styles|from remarkable import styles|" \ + -e "s|from findBar|from remarkable.findBar|" \ + remarkable/RemarkableWindow.py || die +} + +src_install() { + default + + python_domodule markdown pdfkit remarkable remarkable_lib + python_doscript bin/remarkable + doicon data/ui/remarkable.png + domenu ${PN}.desktop + + insinto /usr/share/${PN} + doins -r data/ui + doins -r data/media + + insinto /usr/share/glib-2.0/schemas + doins data/glib-2.0/schemas/* + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_schemas_update + readme.gentoo_print_elog +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/app-editors/remarkable/remarkable-1.9.0_pre20210320-r3.ebuild b/app-editors/remarkable/remarkable-1.9.0_pre20210320-r3.ebuild new file mode 100644 index 000000000000..1525913a442f --- /dev/null +++ b/app-editors/remarkable/remarkable-1.9.0_pre20210320-r3.ebuild @@ -0,0 +1,70 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +inherit desktop gnome2-utils python-single-r1 readme.gentoo-r1 + +DESCRIPTION="Fully featured markdown editor, supports github markdown dialect" +HOMEPAGE="https://remarkableapp.github.io/ https://github.com/jamiemcg/remarkable" +GIT_COMMIT="7b0b3dacef270a00c28e8852a88d74f72a3544d7" +SRC_URI="https://github.com/jamiemcg/remarkable/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/Remarkable-${GIT_COMMIT}" + +LICENSE="BSD-2 GPL-2+ LGPL-2.1+ MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND=" + ${PYTHON_DEPS} + net-libs/webkit-gtk:4.1[introspection] + x11-libs/gtk+:3[introspection] + x11-libs/gtksourceview:3.0[introspection] + $(python_gen_cond_dep ' + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + ')" +RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-disable-spellcheck.patch + "${FILESDIR}"/webkit-version.patch + "${FILESDIR}"/fix-custom-css-issue.patch +) + +src_prepare() { + default + sed -i -e "s|import styles|from remarkable import styles|" \ + -e "s|from findBar|from remarkable.findBar|" \ + remarkable/RemarkableWindow.py || die +} + +src_install() { + default + + python_domodule markdown pdfkit remarkable remarkable_lib + python_doscript bin/remarkable + doicon data/ui/remarkable.png + domenu ${PN}.desktop + + insinto /usr/share/${PN} + doins -r data/ui + doins -r data/media + + insinto /usr/share/glib-2.0/schemas + doins data/glib-2.0/schemas/* + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_schemas_update + readme.gentoo_print_elog +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest index b431069e1862..1cefd03873f6 100644 --- a/app-editors/retext/Manifest +++ b/app-editors/retext/Manifest @@ -1,2 +1,3 @@ -DIST ReText-7.1.0.tar.gz 484989 BLAKE2B 74f07218cba1d76d011e5347c65ec03ef84da29119c177f35cca206cb269ae4755fdb85448562a378d2ab610930d23b4eccb62a39807409c6e80a68102be2034 SHA512 92333f31f7a57440d642246ed30156384285bb44640a0d6e7654e82749681893eaef3cb16e41fa2d7b618aa59f1ea8cb07d431736b00f35cb9130d7294e3d105 -DIST ReText-7.2.1.tar.gz 522364 BLAKE2B 6334fd6dc1c625378426e408a0d4ad6bb9c02dcba18fcfa566d61ce006a44c34327686a8eb756f2195620e644e096b9393a7cfa73229aa0dab7d29ddf715edaa SHA512 1a375acb40792e3cae9f955a75ebac7c30c9e5cc719477989b28d8d7f06e18ad14d98f1a600a5b6d050b3276ef22bd46b5f1f07af90d561cca500674ff461604 +DIST ReText-7.2.3.tar.gz 527428 BLAKE2B 3c710769a881275d74018ba319b174020dda0b65da22ae926231af56901b56c31b3cff69119a9bb378cd218d7b793f002bb08bf1483cc1e55c95a4963cbe1598 SHA512 eb337866f5dfacad2f23435f09b550f4378df5bb261d6f79b1708fed9e7bd93e96e8f06f940cb7109fe02aa6df0592b151f11dfe13853799f0b1ac2c1065a0da +DIST ReText-8.0.0.tar.gz 492823 BLAKE2B ba80f01f1a40981220c0b3e16dd04bf551319a35c1a5c7f6d5e70135404537e74fa4625fe4c05c7ee54202de9ae16d181c110fcae9b9172761ca5ecf6400f7de SHA512 0f2480bcc8569cf60ebfe55847a2a068d1e5dd262a4ff212873bf58660ec31e9c37d9b21bdc66229d681c065a0d96b6ff11652e8d9a7c77841ea551480d1154c +DIST ReText-8.0.1.tar.gz 538968 BLAKE2B 6ee18b4becf47ed3edae9e1d3ea8167a5db2685ae55b206be1ffca78bb765a559f53575da8aa105eae5d1b1fb87419723cdfd02cfff2eb422de9722589a0b97a SHA512 a2a03a821ac06e0408cd036189e9fce18f4b693085aaa15e0d95f2a80157f6ab09b0bcecd9574673ce57fc9cde937457e8d62971f1553cbc26c681039401178a diff --git a/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch b/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch new file mode 100644 index 000000000000..0ff685b89152 --- /dev/null +++ b/app-editors/retext/files/retext-8.0.1-fix-set-desktop-entry.patch @@ -0,0 +1,15 @@ +# Set desktop file name to correspond to the one installed by +# the ebuild ("retext.desktop"). +# Bug: https://bugs.gentoo.org/925726 + +--- a/ReText/__main__.py ++++ b/ReText/__main__.py +@@ -65,7 +65,7 @@ def main(): + app.setApplicationDisplayName("ReText") + app.setApplicationVersion(app_version) + app.setOrganizationDomain('mitya57.me') +- app.setDesktopFileName('me.mitya57.ReText.desktop') ++ app.setDesktopFileName('retext') + QNetworkProxyFactory.setUseSystemConfiguration(True) + + RtTranslator = QTranslator() diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml index b1491bfcc579..469bc89b126c 100644 --- a/app-editors/retext/metadata.xml +++ b/app-editors/retext/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>rndxelement@protonmail.com</email> + <name>Philipp Rösner</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">retext-project/retext</remote-id> <remote-id type="pypi">ReText</remote-id> diff --git a/app-editors/retext/retext-7.2.1.ebuild b/app-editors/retext/retext-7.2.3.ebuild index ecca89965b21..700a1e8d40b0 100644 --- a/app-editors/retext/retext-7.2.1.ebuild +++ b/app-editors/retext/retext-7.2.3.ebuild @@ -1,14 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # Please don't add pypy support before testing if it's actually supported. The # old compat matrix is no longer accessible as of 2021-02-13 but stated back # in 2020-07-05 that PyQt5 was explicitly not supported. -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{9,10} ) +PYPI_NO_NORMALIZE=1 +PYPI_PN="ReText" -inherit distutils-r1 optfeature virtualx xdg-utils +inherit distutils-r1 optfeature qmake-utils virtualx xdg MY_PN="ReText" MY_P="${MY_PN}-${PV/_/~}" @@ -16,14 +18,12 @@ MY_P="${MY_PN}-${PV/_/~}" DESCRIPTION="Simple editor for Markdown and reStructuredText" HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" -if [[ ${PV} == *9999 ]] - then - inherit git-r3 - EGIT_REPO_URI="https://github.com/retext-project/retext.git" - else - SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - KEYWORDS="amd64 x86" - S="${WORKDIR}/${MY_P}" +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/retext-project/retext.git" +else + inherit pypi + KEYWORDS="amd64 ~riscv ~x86" fi LICENSE="GPL-2+" @@ -40,19 +40,28 @@ RDEPEND=" dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )" +BDEPEND=" + dev-qt/linguist-tools + test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] ) +" + +distutils_enable_tests unittest + +pkg_setup() { + # Needed for lrelease + export PATH="$(qt5_get_bindir):${PATH}" +} src_test() { virtx distutils-r1_src_test } python_test() { - esetup.py test + eunittest || die } pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update + xdg_pkg_postinst optfeature "dictionary support" dev-python/pyenchant # See https://bugs.gentoo.org/772197. @@ -63,8 +72,3 @@ pkg_postinst() { einfo "For more details take a look at:" einfo "https://github.com/mitya57/python-markdown-math#math-delimiters" } - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update -} diff --git a/app-editors/retext/retext-8.0.0.ebuild b/app-editors/retext/retext-8.0.0.ebuild new file mode 100644 index 000000000000..aab3e1702773 --- /dev/null +++ b/app-editors/retext/retext-8.0.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please don't add pypy support before testing if it's actually supported. The +# old compat matrix is no longer accessible as of 2021-02-13 but stated back +# in 2020-07-05 that PyQt5 was explicitly not supported. +PYTHON_COMPAT=( python3_{9..11} ) +PYPI_NO_NORMALIZE=1 +PYPI_PN="ReText" + +inherit distutils-r1 optfeature qmake-utils virtualx xdg + +DESCRIPTION="Simple editor for Markdown and reStructuredText" +HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/retext-project/retext.git" +else + inherit pypi + KEYWORDS="amd64" +fi + +LICENSE="GPL-2+" +SLOT="0" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + >=dev-python/markups-3.1.1[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/python-markdown-math[${PYTHON_USEDEP}] + dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/linguist-tools + test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] ) +" + +distutils_enable_tests unittest + +pkg_setup() { + # Needed for lrelease + export PATH="$(qt5_get_bindir):${PATH}" +} + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + virtx eunittest +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "dictionary support" dev-python/pyenchant + # See https://bugs.gentoo.org/772197. + optfeature "rendering with webengine" dev-python/PyQt6-WebEngine + + einfo "Starting with retext-7.0.4 the markdown-math plugin is installed." + einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math." + einfo "For more details take a look at:" + einfo "https://github.com/mitya57/python-markdown-math#math-delimiters" +} diff --git a/app-editors/retext/retext-8.0.1-r1.ebuild b/app-editors/retext/retext-8.0.1-r1.ebuild new file mode 100644 index 000000000000..8e3e6c409fc7 --- /dev/null +++ b/app-editors/retext/retext-8.0.1-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{9..11} ) +PYPI_NO_NORMALIZE=1 +PYPI_PN="ReText" + +inherit desktop distutils-r1 optfeature qmake-utils virtualx xdg + +DESCRIPTION="Simple editor for Markdown and reStructuredText" +HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/retext-project/retext.git" +else + inherit pypi + KEYWORDS="~amd64" +fi + +LICENSE="GPL-2+" +SLOT="0" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/docutils[${PYTHON_USEDEP}] + dev-python/markdown[${PYTHON_USEDEP}] + >=dev-python/markups-3.1.1[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + dev-python/python-markdown-math[${PYTHON_USEDEP}] + dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/linguist-tools + test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}"/${P}-fix-set-desktop-entry.patch +) + +distutils_enable_tests unittest + +pkg_setup() { + # Needed for lrelease + export PATH="$(qt5_get_bindir):${PATH}" +} + +src_test() { + virtx distutils-r1_src_test +} + +python_test() { + virtx eunittest +} + +src_install() { + distutils-r1_src_install + + newicon data/retext-kde5.png retext.png + + # Fixme: The application actually provides a desktop file which theoretically + # could be used. So far though I could not make it install properly. + make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor" +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "dictionary support" dev-python/pyenchant + + einfo "Starting with retext-7.0.4 the markdown-math plugin is installed." + einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math." + einfo "For more details take a look at:" + einfo "https://github.com/mitya57/python-markdown-math#math-delimiters" +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/app-editors/retext/retext-7.1.0.ebuild b/app-editors/retext/retext-8.0.1.ebuild index 3d983b56ce76..0deb07a931c0 100644 --- a/app-editors/retext/retext-7.1.0.ebuild +++ b/app-editors/retext/retext-8.0.1.ebuild @@ -1,29 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# no pypy{,3} support as PyQt5 does not support it at 2020-07-05 (towelday) -# https://bitbucket.org/pypy/compatibility/wiki/Home#!gui-library-bindings -PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{9..11} ) +PYPI_NO_NORMALIZE=1 +PYPI_PN="ReText" -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 optfeature virtualx xdg-utils - -MY_PN="ReText" -MY_P="${MY_PN}-${PV/_/~}" +inherit desktop distutils-r1 optfeature qmake-utils virtualx xdg DESCRIPTION="Simple editor for Markdown and reStructuredText" HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" -if [[ ${PV} == *9999 ]] - then - inherit git-r3 - EGIT_REPO_URI="https://github.com/retext-project/retext.git" - else - SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - KEYWORDS="amd64 x86" - S="${WORKDIR}"/${MY_P} +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/retext-project/retext.git" +else + inherit pypi + KEYWORDS="amd64" fi LICENSE="GPL-2+" @@ -34,25 +29,41 @@ RDEPEND=" dev-python/chardet[${PYTHON_USEDEP}] dev-python/docutils[${PYTHON_USEDEP}] dev-python/markdown[${PYTHON_USEDEP}] - dev-python/markups[${PYTHON_USEDEP}] + >=dev-python/markups-3.1.1[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/python-markdown-math[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,network,printsupport,widgets,${PYTHON_USEDEP}] - dev-python/PyQtWebEngine[${PYTHON_USEDEP}] + dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/linguist-tools + test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] ) +" + +distutils_enable_tests unittest + +pkg_setup() { + # Needed for lrelease + export PATH="$(qt5_get_bindir):${PATH}" +} + +python_install() { + distutils-r1_python_install + + newicon data/retext-kde5.png retext.png + make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor" +} src_test() { virtx distutils-r1_src_test } python_test() { - esetup.py test + virtx eunittest } pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update + xdg_pkg_postinst optfeature "dictionary support" dev-python/pyenchant @@ -63,6 +74,5 @@ pkg_postinst() { } pkg_postrm() { - xdg_desktop_database_update xdg_icon_cache_update } diff --git a/app-editors/retext/retext-9999.ebuild b/app-editors/retext/retext-9999.ebuild index 13399224b736..38c1165fb129 100644 --- a/app-editors/retext/retext-9999.ebuild +++ b/app-editors/retext/retext-9999.ebuild @@ -1,29 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -# Please don't add pypy support before testing if it's actually supported. The -# old compat matrix is no longer accessible as of 2021-02-13 but stated back -# in 2020-07-05 that PyQt5 was explicitly not supported. -PYTHON_COMPAT=( python3_{8,9} ) +DISTUTILS_USE_PEP517="setuptools" +PYTHON_COMPAT=( python3_{9..11} ) +PYPI_NO_NORMALIZE=1 +PYPI_PN="ReText" -inherit distutils-r1 optfeature virtualx xdg-utils - -MY_PN="ReText" -MY_P="${MY_PN}-${PV/_/~}" +inherit desktop distutils-r1 optfeature qmake-utils virtualx xdg DESCRIPTION="Simple editor for Markdown and reStructuredText" HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki" -if [[ ${PV} == *9999 ]] - then - inherit git-r3 - EGIT_REPO_URI="https://github.com/retext-project/retext.git" - else - SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_P}" +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/retext-project/retext.git" +else + inherit pypi + KEYWORDS="~amd64" fi LICENSE="GPL-2+" @@ -37,26 +32,43 @@ RDEPEND=" >=dev-python/markups-3.1.1[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/python-markdown-math[${PYTHON_USEDEP}] - dev-python/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] + dev-python/PyQt6[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] " DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )" +BDEPEND=" + dev-qt/linguist-tools + test? ( dev-python/PyQt6[testlib,${PYTHON_USEDEP}] ) +" + +distutils_enable_tests unittest + +pkg_setup() { + # Needed for lrelease + export PATH="$(qt5_get_bindir):${PATH}" +} src_test() { virtx distutils-r1_src_test } python_test() { - esetup.py test + virtx eunittest +} + +src_install() { + distutils-r1_src_install + + newicon data/retext-kde5.png retext.png + + # Fixme: The application actually provides a desktop file which theoretically + # could be used, so far though I could not make it install properly. + make_desktop_entry ${PN} "ReText" ${PN} "Office;WordProcessor" } pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update + xdg_pkg_postinst optfeature "dictionary support" dev-python/pyenchant - # See https://bugs.gentoo.org/772197. - optfeature "rendering with webengine" dev-python/PyQtWebEngine einfo "Starting with retext-7.0.4 the markdown-math plugin is installed." einfo "Note that you can use different math delimiters, e.g. \(...\) for inline math." @@ -65,6 +77,5 @@ pkg_postinst() { } pkg_postrm() { - xdg_desktop_database_update xdg_icon_cache_update } diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest index 8c3caadf3bd2..89177a5a6bac 100644 --- a/app-editors/scite/Manifest +++ b/app-editors/scite/Manifest @@ -1,3 +1 @@ -DIST scite-4.4.4.tgz 2775628 BLAKE2B a7607b53bf529c56f6525d44b052a08c914d8aa1d90d475dcf46927ac5ce83c06d68b70e8d8e8969c77c367240ba1e7ac10d599c77002575e84b9baf6445d03b SHA512 1e8529286206d542e0c07353b73ab38aa9ee2e2256ed8e15328965e00a33eb026f79bd7d330253e8743cf5503fadb32c64162973ad21da16993f11e124842ec0 -DIST scite-5.1.1.tgz 3374717 BLAKE2B b7a45a86008eb592adacc8fde90cb637cc7cac821f339bb65920aaf912ee10d52badde3ed2e71118a7ce4690a0536b298c5fe5f673b886902ad4634b3a1ffaa6 SHA512 4d6c9b3ca4caed4fcb70a6b1c86a2ace13b023241f16d6faa01b3f692bcbfa14e0ce186bb08776ee0cf62768b2b77c4ffcae610ddbb6b04dcb7584fd8b3f27bb -DIST scite-5.1.3.tgz 3427245 BLAKE2B ca765b61cb1fa96934c1e28d76a97cd7086a6c692ae33bb57591dfbc8637ffc94c4a3f20f9c6b55d11da8a76664f1d521f7e393bf6f31db55cbe02e0bf5052ba SHA512 ef86a18f739062598d3c7bf19bcd2f38ca012e890b9b4685c1f1b809e928762ab60d24c33a1f45ca33133ce5007e3a22a76e80222b121c9a4089d3c57aa0bc4c +DIST scite-5.3.5.tgz 3535798 BLAKE2B 16bd6331b8ab5ef2d700a121d8d85078f6eea2f8c45cfd62c5b27c7c9622f853a871e98402ee3833c09652d869271ed05a61374ee1f55d58dbdcc0f5fcbd681c SHA512 18ed3e802f6f5e66573f72c4ad42d592ea3f79e191e828a32d2d55aaf285a2cb9961e206c9e99f82c77f0975494e9105ac925394d7cf48223b954e253f1dee9c diff --git a/app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch b/app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch new file mode 100644 index 000000000000..935fbdf0b8cd --- /dev/null +++ b/app-editors/scite/files/scite-5.3.5-gcc-13-fix-bgo892431.patch @@ -0,0 +1,40 @@ +--- a/scite/scripts/HeaderOrder.txt 2023-05-28 04:10:36.897378314 +0300 ++++ b/scite/scripts/HeaderOrder.txt 2023-05-28 04:11:48.740712313 +0300 +@@ -30,6 +30,7 @@ +
+ // C++ standard library
+ #include <stdexcept>
++#include <system_error>
+ #include <tuple>
+ #include <string>
+ #include <string_view>
+--- a/scite/src/MultiplexExtension.cxx 2023-05-28 04:16:48.680714993 +0300 ++++ b/scite/src/MultiplexExtension.cxx 2023-05-28 04:17:58.230715597 +0300 +@@ -5,6 +5,7 @@ + // Copyright 1998-2003 by Neil Hodgson <neilh@scintilla.org> + // The License.txt file describes the conditions under which this software may be distributed. + ++#include <cstdint> + #include <string> + #include <string_view> + #include <vector> +--- a/scite/src/SciTEBase.cxx 2023-05-28 04:20:08.850716714 +0300 ++++ b/scite/src/SciTEBase.cxx 2023-05-28 04:21:35.867384145 +0300 +@@ -15,6 +15,7 @@ + #include <ctime> + #include <cmath> + ++#include <system_error> + #include <tuple> + #include <string> + #include <string_view> +--- a/scite/src/SciTEProps.cxx 2023-05-28 04:22:53.904051478 +0300 ++++ b/scite/src/SciTEProps.cxx 2023-05-28 04:23:43.374051910 +0300 +@@ -13,6 +13,7 @@ + #include <ctime> + #include <clocale> + ++#include <stdexcept> + #include <tuple> + #include <string> + #include <string_view> diff --git a/app-editors/scite/metadata.xml b/app-editors/scite/metadata.xml index 7694337e8744..ae6d6c4b2c1f 100644 --- a/app-editors/scite/metadata.xml +++ b/app-editors/scite/metadata.xml @@ -1,14 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>ervin.peters@ervnet.de</email> - <name>Ervin Peters</name> - </maintainer> - <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> + <!-- maintainer-needed --> <upstream> <remote-id type="sourceforge">scintilla</remote-id> </upstream> diff --git a/app-editors/scite/scite-4.4.4-r10.ebuild b/app-editors/scite/scite-4.4.4-r10.ebuild deleted file mode 100644 index 1f2fd9e64c95..000000000000 --- a/app-editors/scite/scite-4.4.4-r10.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-1 ) - -inherit lua-single toolchain-funcs xdg-utils - -DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring" -HOMEPAGE="https://www.scintilla.org/SciTE.html" -SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz" - -LICENSE="HPND lua? ( MIT )" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="lua" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/pango - lua? ( ${LUA_DEPS} )" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig" - -DOCS=("../README") - -S="${WORKDIR}/${PN}/gtk" - -pkg_pretend() { - if tc-is-clang ; then - # need c++17 features - [[ "${MERGE_TYPE}" != "binary" && - $(clang-major-version) -lt 5 ]] && - die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5 - ($(clang-major-version))." - - elif tc-is-gcc; then - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && - $(gcc-major-version) -lt 7 ]] && - die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7." - else - die "Either gcc or clang should be configured for building scite" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX RANLIB - - # remove hardcoded CC, Optimizations and clang unknown flags - sed -i "${WORKDIR}/scintilla/gtk/makefile" \ - -e "s#^CC = gcc#CC = ${CC}#" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-Os##" \ - -e "s#-Wno-misleading-indentation##" \ - || die "error patching /scintilla/gtk/makefile" - - sed -i "${S}/makefile" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \ - -e "s#-Os##" \ - || die "error patching gtk/makefile" - - # repair and enhance the .desktop file - sed -i "${S}/SciTE.desktop" \ - -e "s#text/plain#text/\*;application/xhtml+xml#" \ - -e "s#^Categories=\(.*\)#Categories=Development;#" \ - || die "error patching /scite/gtk/SciTe.desktop" - - # add the ebuild suffix as shell type for working with ebuilds - sed -i "${WORKDIR}/scite/src/perl.properties" \ - -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \ - || die "error patching /scite/src/perl.properties" - - # it seems that pwd here is ${S}, but user patches are relative to ${workdir} - # Bug #576162 - - cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}" - eapply_user -} - -src_compile() { - # prepare make options - local emake_pars=("GTK3=1") - - tc-is-clang && emake_pars+=("CLANG=1") - use !lua && emake_pars+=("NO_LUA=1") - - emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}" - emake "${emake_pars[@]}" -} - -# want to use the base src_install() as base_src_install() - -src_install() { - default - dosym SciTE /usr/bin/scite -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} diff --git a/app-editors/scite/scite-5.1.3.ebuild b/app-editors/scite/scite-5.1.3.ebuild deleted file mode 100644 index d206fb1266de..000000000000 --- a/app-editors/scite/scite-5.1.3.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-1 ) - -inherit lua-single toolchain-funcs xdg - -DESCRIPTION="A very powerful, highly configurable, small editor with syntax coloring" -HOMEPAGE="https://www.scintilla.org/SciTE.html" -SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz" - -LICENSE="HPND lua? ( MIT )" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="lua" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" - -RDEPEND=" - dev-libs/atk - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/pango - lua? ( ${LUA_DEPS} )" - -DEPEND="${RDEPEND}" - -BDEPEND=" - virtual/pkgconfig" - -DOCS=("../README") - -S="${WORKDIR}/${PN}/gtk" - -pkg_pretend() { - if tc-is-clang ; then - # need c++17 features - [[ "${MERGE_TYPE}" != "binary" && - $(clang-major-version) -lt 5 ]] && - die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5 - ($(clang-major-version))." - - elif tc-is-gcc; then - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && - $(gcc-major-version) -lt 7 ]] && - die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7." - else - die "Either gcc or clang should be configured for building scite" - fi -} - -pkg_setup() { - use lua && lua-single_pkg_setup -} - -src_prepare() { - tc-export AR CC CXX RANLIB - - # remove hardcoded CC, Optimizations and clang unknown flags - sed -i "${WORKDIR}/scintilla/gtk/makefile" \ - -e "s#^CC = gcc#CC = ${CC}#" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-Os##" \ - -e "s#-Wno-misleading-indentation##" \ - || die "error patching /scintilla/gtk/makefile" - - sed -i "${S}/makefile" \ - -e "s#^CC = clang#CC = ${CC}#" \ - -e "s#^CXX = clang++#CXX = ${CXX}#" \ - -e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \ - -e "s#-Os##" \ - || die "error patching gtk/makefile" - - # repair and enhance the .desktop file - sed -i "${S}/SciTE.desktop" \ - -e "s#text/plain#text/\*;application/xhtml+xml#" \ - -e "s#^Categories=\(.*\)#Categories=Development;#" \ - || die "error patching /scite/gtk/SciTe.desktop" - - # add the ebuild suffix as shell type for working with ebuilds - sed -i "${WORKDIR}/scite/src/perl.properties" \ - -e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \ - || die "error patching /scite/src/perl.properties" - - # it seems that pwd here is ${S}, but user patches are relative to ${workdir} - # Bug #576162 - - cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}" - eapply_user -} - -src_compile() { - # prepare make options - local emake_pars=("GTK3=1") - - tc-is-clang && emake_pars+=("CLANG=1") - use !lua && emake_pars+=("NO_LUA=1") - - emake -C "${WORKDIR}/lexilla/src" "${emake_pars[@]}" - emake -C "${WORKDIR}/scintilla/gtk" "${emake_pars[@]}" - emake "${emake_pars[@]}" -} - -# want to use the base src_install() as base_src_install() - -src_install() { - default - dosym SciTE /usr/bin/scite -} diff --git a/app-editors/scite/scite-5.1.1.ebuild b/app-editors/scite/scite-5.3.5.ebuild index c3e280ecf802..1242ae6a372f 100644 --- a/app-editors/scite/scite-5.1.1.ebuild +++ b/app-editors/scite/scite-5.3.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -LUA_COMPAT=( lua5-1 ) +LUA_COMPAT=( lua5-4 ) inherit lua-single toolchain-funcs xdg @@ -13,46 +13,28 @@ SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz" LICENSE="HPND lua? ( MIT )" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="lua" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" RDEPEND=" - dev-libs/atk + >=app-accessibility/at-spi2-core-2.46.0 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/pango - lua? ( ${LUA_DEPS} )" - + lua? ( ${LUA_DEPS} ) +" DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" -BDEPEND=" - virtual/pkgconfig" - -DOCS=("../README") +DOCS=( "../README" ) S="${WORKDIR}/${PN}/gtk" -pkg_pretend() { - if tc-is-clang ; then - # need c++17 features - [[ "${MERGE_TYPE}" != "binary" && - $(clang-major-version) -lt 5 ]] && - die "Sorry, SCiTE uses C++17 Features and needs >sys-devel/clang-5 - ($(clang-major-version))." - - elif tc-is-gcc; then - # older gcc is not supported - [[ "${MERGE_TYPE}" != "binary" && - $(gcc-major-version) -lt 7 ]] && - die "Sorry, Scite uses C++17 Features, need >sys-devel/gcc-7." - else - die "Either gcc or clang should be configured for building scite" - fi -} +PATCHES=( "${FILESDIR}"/scite-5.3.5-gcc-13-fix-bgo892431.patch ) pkg_setup() { use lua && lua-single_pkg_setup @@ -92,7 +74,7 @@ src_prepare() { # Bug #576162 cd "${WORKDIR}" || die "couldn't cd into ${WORKDIR}" - eapply_user + default } src_compile() { @@ -110,6 +92,6 @@ src_compile() { # want to use the base src_install() as base_src_install() src_install() { - default + GTK3=1 default dosym SciTE /usr/bin/scite } diff --git a/app-editors/shed/Manifest b/app-editors/shed/Manifest index 5250ae6ee2e8..06487aa06f5e 100644 --- a/app-editors/shed/Manifest +++ b/app-editors/shed/Manifest @@ -1 +1,2 @@ DIST shed-1.15.tar.gz 87777 BLAKE2B 7c23f01e649de6ad15b870ef3786bd1747b6ab765f19a748d08bad878325f11e38483b957ed6a791ae4a7de752e96cca2057fd69838625c3fe660d2ba3fbc984 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78 +DIST shed-1.16.tar.gz 104323 BLAKE2B 30c4d6ec7d497a64cc4e313496d26e3a4b8a8050bcfd05c50d9eef865d987df76cd1d7fa13509bdfed184159676dfc2c8bb8d3eb98f64573845e543d174cae7b SHA512 0c807205540b17ee977c157c8edd916b34ba6c4ace280f59c10a92abbe820ef7fe24c4a64c2fc8b5fcd3d86f71e26672cef469340ddce393d370b53aa8785e7c diff --git a/app-editors/shed/files/shed-1.15-interix.patch b/app-editors/shed/files/shed-1.15-interix.patch deleted file mode 100644 index 46c5eb6b26b1..000000000000 --- a/app-editors/shed/files/shed-1.15-interix.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://sourceforge.net/tracker/?func=detail&aid=3554634&group_id=21862&atid=374571 ---- a/shed.c -+++ b/shed.c -@@ -31,6 +31,10 @@ - #include <ctype.h> /* tolower */ - #include <unistd.h> /* dup, dup2 */ - -+#ifdef __INTERIX -+# include <sys/time.h> -+#endif -+ - #include "util.h" - - /* function prototypes */ diff --git a/app-editors/shed/files/shed-1.16-tinfo.patch b/app-editors/shed/files/shed-1.16-tinfo.patch new file mode 100644 index 000000000000..840b17f1f875 --- /dev/null +++ b/app-editors/shed/files/shed-1.16-tinfo.patch @@ -0,0 +1,13 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -42,9 +42,8 @@ + fi + + ERR="Required package missing!" +-AC_CHECK_HEADER(ncurses.h,:,AC_MSG_ERROR([$ERR])) ++PKG_CHECK_MODULES(ncurses,ncurses,[LIBS="$LIBS $ncurses_LIBS"],AC_MSG_ERROR([$ERR])) + AC_CHECK_HEADER(getopt.h,:,AC_MSG_ERROR([$ERR])) +-AC_CHECK_LIB(ncurses,initscr) + AC_CHECK_LIB(m,pow) + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT diff --git a/app-editors/shed/shed-1.15.ebuild b/app-editors/shed/shed-1.15.ebuild index 3c907f678988..da49bc414e0d 100644 --- a/app-editors/shed/shed-1.15.ebuild +++ b/app-editors/shed/shed-1.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -6,12 +6,12 @@ EAPI="7" inherit autotools DESCRIPTION="Simple Hex EDitor" -HOMEPAGE="http://shed.sourceforge.net/" +HOMEPAGE="https://shed.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="sys-libs/ncurses:0=" DEPEND="${RDEPEND}" @@ -19,7 +19,6 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-cflags.patch - "${FILESDIR}"/${P}-interix.patch "${FILESDIR}"/${P}-tinfo.patch ) diff --git a/app-editors/shed/shed-1.16.ebuild b/app-editors/shed/shed-1.16.ebuild new file mode 100644 index 000000000000..66bf648a2a7d --- /dev/null +++ b/app-editors/shed/shed-1.16.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools + +DESCRIPTION="Simple Hex EDitor" +HOMEPAGE="https://shed.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND="sys-libs/ncurses:0=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-tinfo.patch ) + +src_prepare() { + default + + eautoreconf +} diff --git a/app-editors/sublime-text/Manifest b/app-editors/sublime-text/Manifest index 3dde261a7062..84b4d3ca7ac7 100644 --- a/app-editors/sublime-text/Manifest +++ b/app-editors/sublime-text/Manifest @@ -1,4 +1,7 @@ DIST sublime_text_3_build_3211_x32.tar.bz2 13806489 BLAKE2B 1e07df2fc9fb9fb60a6fbfe27a3d657ff80ef46ae91967fa384cfc84bfdc2b5952aea8dbfd9ff015f669b148c1a302cbe01521a72b584abccd51efdab51ac0d8 SHA512 4d19947459046407316382d187ea6fa4cff9b7d3e7ae3c46667d691b6ca425a1f1dfc8599a26cf61b970290a58924a3b605e111ff2802ed124683872c1802803 DIST sublime_text_3_build_3211_x64.tar.bz2 13677324 BLAKE2B e2ac54c1e8ab90c0fcefb4baf225b02d13a3405e846f08163773ed52c6278f8e89a7b13c15e6c2d6241139d58be9c2c5a1201abb04a3cd68efdffc723075c5af SHA512 a6a068119eff95c5360e9ccbe1d845e7a93e4ad13b3659073752a7bd0e87f4691555820185514875649e677a4e8702e2338f74f5584fc80f69c16b323685d6f1 -DIST sublime_text_build_4107_x64.tar.xz 17096632 BLAKE2B 37c1839ef1edecb1f3017e4d99d2b8b0bf5c0aa1490495fe19a48cf38bb436e94913572a4dd5ad5f84e6b5445b6a9a2df35fec607beb0b520471b2dde7ef63fd SHA512 552051b34c612aa6ff53ef6275488467061221715de054dc1e657519c82899e24df1a9f8000086b68c5c1c6e0c98341c641f19a2d97c880efb25aa93ad82f8aa -DIST sublime_text_build_4113_x64.tar.xz 17105200 BLAKE2B 6a23e9eb7ec5b7b5dfef2ef496e0b7fcf053be3349c8318e85373bc9c3d4d69da3e4e94971ae83832aa254c175a58062a33ffb14d2103c1cdb6888c1223f28ed SHA512 f0e5e8e28754c21bf5c9fc3e50502d22d72fec4819c68d8444cb341aa7ee4d6bc43edfda594fba3c446c2b252bd7a65340dd7a407d81f875971c219bb2236479 +DIST sublime_text_build_4126_x64.tar.xz 17313756 BLAKE2B 16a036e15b920f72b47a6425540efcbc5ac5c44d3f3c79fa0a106128857f6fa6775a244d6497c814448a3f42cfe1515546b372475b22b47364a759ad0412bfdc SHA512 1f7a1543e68e67bd507f2f4b65f53085c96796287521878011e183df26579cd593c333d53b5ee9bc5adb41dd5344c62875fea869d11962ba80a39dfb63a80652 +DIST sublime_text_build_4143_x64.tar.xz 17480384 BLAKE2B 37617568f9ff0090a8f4f66c34f07d997c1f3405d31554ebb0d7c5791209713d236ee329714b452d69e474bda13f2ad7fb0c4b9abb2a5112ed36acffdee51371 SHA512 5aba1d587b2f61cc7aa6aa7b1eb37990a2385d51fac92945aa3e991616617c73f6fbe71af3a06a219323ff4656f78c2d27f582e60ea97171b88c0197899845f1 +DIST sublime_text_build_4152_x64.tar.xz 16454288 BLAKE2B b6fa58c94cc24214abe5b3d85abdf850b8cd116001a739a9d1ddcb3fab70913882c7731dc4a856c32979695f77b1465e2e7ec0785255a1ced9b55637f2c30368 SHA512 447a3219841150e22c66b45c8a6d0415e1b309512764060f4310c7f685c93a5b4cba2dd7f202ced01f2a3d910c30784bbf5bbb85bae915296845005a69b0bdf4 +DIST sublime_text_build_4166_x64.tar.xz 16572860 BLAKE2B ede62590f2913edd644b02dfd9e14fd68ac0387bc75946c1206dd7709f985ce6b584ce8f74f05c3961d2ea43590a084e2947c9586c16ced40cccfd82a3847e5a SHA512 a4e5a957160cc47e6c5fc71f3162edea5d6fe03e6a7af33f52074a49dbbd2cd49460b35e0924d38d4083561291469bc0ff43e7aea81232dbc97be6847612c4e1 +DIST sublime_text_build_4169_x64.tar.xz 16572760 BLAKE2B 1760e6a763b58e24c7360bb0068704b820b0ba91169c1e80b9b46ca728eaedd04bd2bca75d602b24034fff895c093131d30209c48c3e7b1c56941da7cf1d3296 SHA512 6764363f8f92f65532d64ba014023e28b18f40dc62a1b114239b59360257d445494f9a2f57580174b5f4994c8fa06cd8f562c9419cfda92324c9ebf25d15e576 diff --git a/app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild b/app-editors/sublime-text/sublime-text-3_p3211-r2.ebuild index 97148c436c35..0990d91e8c53 100644 --- a/app-editors/sublime-text/sublime-text-3_p3211-r1.ebuild +++ b/app-editors/sublime-text/sublime-text-3_p3211-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,6 +23,7 @@ RESTRICT="bindist mirror strip" RDEPEND=" dev-libs/glib:2 + sys-libs/glibc x11-libs/gtk+:3 x11-libs/libX11 dbus? ( sys-apps/dbus )" diff --git a/app-editors/sublime-text/sublime-text-4_p4113.ebuild b/app-editors/sublime-text/sublime-text-4_p4126-r1.ebuild index 6b349eca211e..3f2823912619 100644 --- a/app-editors/sublime-text/sublime-text-4_p4113.ebuild +++ b/app-editors/sublime-text/sublime-text-4_p4126-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit desktop wrapper xdg @@ -23,6 +23,7 @@ RESTRICT="bindist mirror strip" RDEPEND=" dev-libs/glib:2 + sys-libs/glibc x11-libs/gtk+:3 x11-libs/libX11 dbus? ( sys-apps/dbus )" diff --git a/app-editors/sublime-text/sublime-text-4_p4107.ebuild b/app-editors/sublime-text/sublime-text-4_p4143-r1.ebuild index cd603261aae8..3f2823912619 100644 --- a/app-editors/sublime-text/sublime-text-4_p4107.ebuild +++ b/app-editors/sublime-text/sublime-text-4_p4143-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit desktop xdg-utils wrapper +inherit desktop wrapper xdg # get the major version from PV MY_PV=$(ver_cut 3) @@ -13,6 +13,7 @@ DESCRIPTION="Sophisticated text editor for code, markup and prose" HOMEPAGE="https://www.sublimetext.com" SRC_URI=" amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )" +S="${WORKDIR}/${MY_PN}" LICENSE="Sublime" SLOT="0" @@ -22,6 +23,7 @@ RESTRICT="bindist mirror strip" RDEPEND=" dev-libs/glib:2 + sys-libs/glibc x11-libs/gtk+:3 x11-libs/libX11 dbus? ( sys-apps/dbus )" @@ -32,7 +34,6 @@ PATCHES=( ) QA_PREBUILT="*" -S="${WORKDIR}/${MY_PN}" # Sublime bundles the kitchen sink, which includes python and other assorted # modules. Do not try to unbundle these because you are guaranteed to fail. @@ -55,18 +56,13 @@ src_install() { local size for size in 16 32 48 128 256; do - doicon --size "${size}" Icon/${size}x${size}/${PN}.png + doicon --size ${size} Icon/${size}x${size}/${PN}.png done } -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} - pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update + xdg_pkg_postinst + elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to' elog 'WM_CLASS="sublime_text" matching other distributions.' } diff --git a/app-editors/sublime-text/sublime-text-4_p4152.ebuild b/app-editors/sublime-text/sublime-text-4_p4152.ebuild new file mode 100644 index 000000000000..a417eaeb1067 --- /dev/null +++ b/app-editors/sublime-text/sublime-text-4_p4152.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop wrapper xdg + +# get the major version from PV +MY_PV=$(ver_cut 3) +MY_PN=${PN/-/_} + +DESCRIPTION="Sophisticated text editor for code, markup and prose" +HOMEPAGE="https://www.sublimetext.com" +SRC_URI=" + amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )" +S="${WORKDIR}/${MY_PN}" + +LICENSE="Sublime" +SLOT="0" +KEYWORDS="~amd64" +IUSE="dbus" +RESTRICT="bindist mirror strip" + +RDEPEND=" + dev-libs/glib:2 + sys-libs/glibc + x11-libs/gtk+:3 + x11-libs/libX11 + dbus? ( sys-apps/dbus )" + +PATCHES=( + "${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch + "${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch +) + +QA_PREBUILT="*" + +# Sublime bundles the kitchen sink, which includes python and other assorted +# modules. Do not try to unbundle these because you are guaranteed to fail. + +src_install() { + insinto /opt/${MY_PN} + doins -r Packages Lib Icon # /Icon is used at runtime by the application + doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 libsqlite3.so sublime_text.desktop + + # sublime_merge looks for /opt/sublime_text/sublime_text + exeinto /opt/${MY_PN} + doexe crash_reporter plugin_host-3.3 plugin_host-3.8 sublime_text + + # sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is + # used instead of a symlink to preserve a consistent WM_CLASS regardless of + # how the application is launched. This causes the WM_CLASS to be + # "sublime_text" which matches the .desktop entry. + make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\"" + domenu sublime_text.desktop + + local size + for size in 16 32 48 128 256; do + doicon --size ${size} Icon/${size}x${size}/${PN}.png + done +} + +pkg_postinst() { + xdg_pkg_postinst + + elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to' + elog 'WM_CLASS="sublime_text" matching other distributions.' +} diff --git a/app-editors/sublime-text/sublime-text-4_p4166.ebuild b/app-editors/sublime-text/sublime-text-4_p4166.ebuild new file mode 100644 index 000000000000..fdb6b4c6c4bb --- /dev/null +++ b/app-editors/sublime-text/sublime-text-4_p4166.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop wrapper xdg + +# get the major version from PV +MY_PV=$(ver_cut 3) +MY_PN=${PN/-/_} + +DESCRIPTION="Sophisticated text editor for code, markup and prose" +HOMEPAGE="https://www.sublimetext.com" +SRC_URI=" + amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )" +S="${WORKDIR}/${MY_PN}" + +LICENSE="Sublime" +SLOT="0" +KEYWORDS="~amd64" +IUSE="dbus" +RESTRICT="bindist mirror strip" + +RDEPEND=" + dev-libs/glib:2 + sys-libs/glibc + x11-libs/gtk+:3 + x11-libs/libX11 + dbus? ( sys-apps/dbus )" + +PATCHES=( + "${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch + "${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch +) + +QA_PREBUILT="*" + +# Sublime bundles the kitchen sink, which includes python and other assorted +# modules. Do not try to unbundle these because you are guaranteed to fail. + +src_install() { + insinto /opt/${MY_PN} + doins -r Packages Lib Icon # /Icon is used at runtime by the application + doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 libsqlite3.so sublime_text.desktop + + # sublime_merge looks for /opt/sublime_text/sublime_text + exeinto /opt/${MY_PN} + doexe crash_handler plugin_host-3.3 plugin_host-3.8 sublime_text + + # sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is + # used instead of a symlink to preserve a consistent WM_CLASS regardless of + # how the application is launched. This causes the WM_CLASS to be + # "sublime_text" which matches the .desktop entry. + make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\"" + domenu sublime_text.desktop + + local size + for size in 16 32 48 128 256; do + doicon --size ${size} Icon/${size}x${size}/${PN}.png + done +} + +pkg_postinst() { + xdg_pkg_postinst + + elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to' + elog 'WM_CLASS="sublime_text" matching other distributions.' +} diff --git a/app-editors/sublime-text/sublime-text-4_p4169.ebuild b/app-editors/sublime-text/sublime-text-4_p4169.ebuild new file mode 100644 index 000000000000..fdb6b4c6c4bb --- /dev/null +++ b/app-editors/sublime-text/sublime-text-4_p4169.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop wrapper xdg + +# get the major version from PV +MY_PV=$(ver_cut 3) +MY_PN=${PN/-/_} + +DESCRIPTION="Sophisticated text editor for code, markup and prose" +HOMEPAGE="https://www.sublimetext.com" +SRC_URI=" + amd64? ( https://download.sublimetext.com/sublime_text_build_${MY_PV}_x64.tar.xz )" +S="${WORKDIR}/${MY_PN}" + +LICENSE="Sublime" +SLOT="0" +KEYWORDS="~amd64" +IUSE="dbus" +RESTRICT="bindist mirror strip" + +RDEPEND=" + dev-libs/glib:2 + sys-libs/glibc + x11-libs/gtk+:3 + x11-libs/libX11 + dbus? ( sys-apps/dbus )" + +PATCHES=( + "${FILESDIR}"/${PN}-4_p4107-remove-deprecated-key-onlyshowin-from-launcher.patch + "${FILESDIR}"/${PN}-4_p4107-set-explicit-startupwmclass-in-launcher.patch +) + +QA_PREBUILT="*" + +# Sublime bundles the kitchen sink, which includes python and other assorted +# modules. Do not try to unbundle these because you are guaranteed to fail. + +src_install() { + insinto /opt/${MY_PN} + doins -r Packages Lib Icon # /Icon is used at runtime by the application + doins changelog.txt libcrypto.so.1.1 libssl.so.1.1 libsqlite3.so sublime_text.desktop + + # sublime_merge looks for /opt/sublime_text/sublime_text + exeinto /opt/${MY_PN} + doexe crash_handler plugin_host-3.3 plugin_host-3.8 sublime_text + + # sublime-text sets its WM_CLASS based on its argv[0]. A wrapper script is + # used instead of a symlink to preserve a consistent WM_CLASS regardless of + # how the application is launched. This causes the WM_CLASS to be + # "sublime_text" which matches the .desktop entry. + make_wrapper subl "/opt/${MY_PN}/sublime_text --fwdargv0 \"\$0\"" + domenu sublime_text.desktop + + local size + for size in 16 32 48 128 256; do + doicon --size ${size} Icon/${size}x${size}/${PN}.png + done +} + +pkg_postinst() { + xdg_pkg_postinst + + elog 'Sublime Text 4'"'"'s window class changes from WM_CLASS="subl" to' + elog 'WM_CLASS="sublime_text" matching other distributions.' +} diff --git a/app-editors/tea/Manifest b/app-editors/tea/Manifest index f99875f7c8fc..a27b6e87f7d5 100644 --- a/app-editors/tea/Manifest +++ b/app-editors/tea/Manifest @@ -1 +1,3 @@ DIST tea-47.0.0.tar.bz2 437273 BLAKE2B 8ed36526dedc6df4af74ef0e400c2ee2e19bb533cf2a4fa51df83f21ad78abb0e8e90bce3469e2e8db5f780ba8a900aedf2737c736945431b836ba0a76574b26 SHA512 7136d59383bf43c6a024a31aa29860a3e89893ff091a42f44f9e7088fb318920ab886cd1fdabc8ff6e3c30f8eb3d46d707228d2d45fb085ed7c822a4ffd89d13 +DIST tea-qt-62.1.1.tar.gz 675996 BLAKE2B 2219a7f61fe54426b0216e5612b05048ee6f1451084d4aa66c0744110ce6151c2ba46acf1c7e7b5916ae6194516391fa1c23cb797ecd7ac423e3005a88da85f4 SHA512 1d81b83a6f25f385959a507342f4a79c24be5af20c2841d851f0d233cbd77142c672c9f147a185e3088000172d5d943bd290497dfcbec87c1a3e0b96a40a5217 +DIST tea-qt-62.2.1.tar.gz 676570 BLAKE2B f4fa2756d6016d84c0c20c572dc2e03013d8f5b12d726d6d0aa4edbdcb5784552c8330c52f4016dcb85c0d8e1923bfdc90d39dd4dee4f378ac8c07182f1e7eee SHA512 0e2adf21023867466b7a4228c56ac1d05533b27f4abee672529c1f506f8d5e2880216bae35e1ff5ad0e0dc64c22c7536144c54c347c9d8f1d569fb74261101d0 diff --git a/app-editors/tea/files/tea-62.1.1-fix-desktop.patch b/app-editors/tea/files/tea-62.1.1-fix-desktop.patch new file mode 100644 index 000000000000..36af0b5c0027 --- /dev/null +++ b/app-editors/tea/files/tea-62.1.1-fix-desktop.patch @@ -0,0 +1,26 @@ +From 8fb78950cd2e50c76cbf34b5245a413a5f3477f0 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Sun, 19 Nov 2023 12:56:05 +0200 +Subject: [PATCH] Remove whitespace at the end the desktop file + + * QA Notice: This package installs one or more .desktop files that do not + * pass validation. + * + * /usr/share/applications/tea.desktop: error: (will be fatal in the future): value "text/plain;application/epub+zip;application/fb2;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.oasis.opendocument.text;application/rtf;application/x-tex; " for key "MimeType" in group "Desktop Entry" contains value " " which is an invalid MIME type: " " does not contain a subtype + * + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/desktop/tea.desktop ++++ b/desktop/tea.desktop +@@ -6,7 +6,7 @@ Icon=tea + Exec=tea %F + Categories=Utility;TextEditor; + StartupNotify=false +-MimeType=text/plain;application/epub+zip;application/fb2;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.oasis.opendocument.text;application/rtf;application/x-tex; ++MimeType=text/plain;application/epub+zip;application/fb2;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.oasis.opendocument.text;application/rtf;application/x-tex; + NoDisplay=false + Version=1.1 + Keywords=text editor;text;editor; +-- +2.42.1 + diff --git a/app-editors/tea/files/tea-62.1.1-qt-option.patch b/app-editors/tea/files/tea-62.1.1-qt-option.patch new file mode 100644 index 000000000000..e4f2a580c6e9 --- /dev/null +++ b/app-editors/tea/files/tea-62.1.1-qt-option.patch @@ -0,0 +1,41 @@ +From 2ca1a29e67c9cee591dbab5a323764e435d46b2c Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Sun, 19 Nov 2023 12:53:11 +0200 +Subject: [PATCH] Make qt6 a cmake option instead of letting automagic + handle it + +* qt_standard_project_setup() is >=qt-6.3 only, so put it under + Qt6_Found. + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,8 +11,11 @@ set(CMAKE_AUTORCC ON) + enable_language(CXX) + enable_language(C) + +-find_package(Qt6 COMPONENTS Core Widgets) +-if (NOT Qt6_FOUND) ++option(USE_QT6 "Build against QT6" ON) ++ ++if (USE_QT6) ++ find_package(Qt6 REQUIRED COMPONENTS Core Widgets) ++else() + find_package(Qt5 5.15 REQUIRED COMPONENTS Core Widgets) + endif() + +@@ -22,10 +25,8 @@ message("+ Qt6 found") + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + find_package(Qt6 COMPONENTS Core5Compat REQUIRED) +-endif() +- +- + qt_standard_project_setup() ++endif() + + + set(PROJECT "tea-qt") +-- +2.42.1 + diff --git a/app-editors/tea/metadata.xml b/app-editors/tea/metadata.xml index 7bd9ca773d36..f905158e4e39 100644 --- a/app-editors/tea/metadata.xml +++ b/app-editors/tea/metadata.xml @@ -10,6 +10,9 @@ highlighting and a built in file manager as well as a built in image viewer. It can also read lots of 'other' filetypes. </longdescription> + <upstream> + <remote-id type="github">psemiletov/tea-qt</remote-id> + </upstream> <use> <flag name="aspell">Enable spellchecking using <pkg>app-text/aspell</pkg></flag> <flag name="hunspell">Enable spellchecking using <pkg>app-text/hunspell</pkg></flag> diff --git a/app-editors/tea/tea-47.0.0.ebuild b/app-editors/tea/tea-47.0.0.ebuild index 312522fb992d..16f6139622f0 100644 --- a/app-editors/tea/tea-47.0.0.ebuild +++ b/app-editors/tea/tea-47.0.0.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=7 @@ -11,7 +11,7 @@ SRC_URI="https://tea.ourproject.org/dloads/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" IUSE="aspell djvu hunspell pdf +qml" BDEPEND=" diff --git a/app-editors/tea/tea-62.1.1.ebuild b/app-editors/tea/tea-62.1.1.ebuild new file mode 100644 index 000000000000..98ca7bb80309 --- /dev/null +++ b/app-editors/tea/tea-62.1.1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +MY_P="tea-qt-${PV}" + +DESCRIPTION="Small, lightweight Qt text editor" +HOMEPAGE="https://tea.ourproject.org/" +SRC_URI="https://github.com/psemiletov/tea-qt/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="aspell djvu pdf" + +# qt6 blocked by poppler[qt6] +DEPEND=" + app-text/hunspell:= + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + sys-libs/zlib + aspell? ( app-text/aspell ) + djvu? ( app-text/djvu ) + pdf? ( app-text/poppler:=[qt5] ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO ) + +PATCHES=( + "${FILESDIR}/tea-62.1.1-qt-option.patch" + "${FILESDIR}/tea-62.1.1-fix-desktop.patch" +) + +src_prepare() { + cmake_src_prepare + + # Replace AUR link with p.g.o link + sed -i \ + -e 's,AUR: aur.archlinux.org/packages/tea-qt-git,Gentoo: https://packages.gentoo.org/packages/app-editors/tea,' \ + tea.cpp translations/{de,es,fr,pl,ru}.ts || die + + # Rename tea to tea-qt to avoid file conflict with dev-util/tea + # bug #917587 + # https://github.com/psemiletov/tea-qt/issues/50 + sed -i -e '/set_target_properties(tea PROPERTIES$/ a\ + OUTPUT_NAME \"tea-qt\"' \ + CMakeLists.txt || die + sed -i -e '/Exec/ { s/tea/tea-qt/ }' desktop/tea.desktop || die +} + +src_configure() { + local mycmakeargs=( + -DUSE_ASPELL=$(usex aspell) + -DUSE_PDF=$(usex pdf) + -DUSE_DJVU=$(usex djvu) + -DUSE_QT6=OFF # blocked by poppler-qt6 + -DUSE_PRINTER=OFF # only for qt6 + ) + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ "${REPLACING_VERSIONS}" == "47.0.0" ]]; then + elog "Executable 'tea' has been renamed to 'tea-qt'" + fi +} diff --git a/app-editors/tea/tea-62.2.1.ebuild b/app-editors/tea/tea-62.2.1.ebuild new file mode 100644 index 000000000000..b0c1f115ab1c --- /dev/null +++ b/app-editors/tea/tea-62.2.1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +MY_P="tea-qt-${PV}" + +DESCRIPTION="Small, lightweight Qt text editor" +HOMEPAGE="https://tea.ourproject.org/" +SRC_URI="https://github.com/psemiletov/tea-qt/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~riscv ~x86" +IUSE="aspell djvu qt6 pdf" + +RESTRICT="test" # no tests + +DEPEND=" + app-text/hunspell:= + sys-libs/zlib + aspell? ( app-text/aspell ) + djvu? ( app-text/djvu ) + qt6? ( + dev-qt/qtbase:6[widgets] + dev-qt/qt5compat:6 + pdf? ( app-text/poppler:=[qt6(-)] ) + ) + !qt6? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + pdf? ( app-text/poppler:=[qt5] ) + ) +" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS NEWS-RU TODO ) + +PATCHES=( + "${FILESDIR}/tea-62.1.1-fix-desktop.patch" +) + +src_prepare() { + cmake_src_prepare + + # Replace AUR link with p.g.o link + sed -i \ + -e 's,AUR: aur.archlinux.org/packages/tea-qt-git,Gentoo: https://packages.gentoo.org/packages/app-editors/tea,' \ + tea.cpp translations/{de,es,fr,pl,ru}.ts || die + + # Rename tea to tea-qt to avoid file conflict with dev-util/tea + # bug #917587 + # https://github.com/psemiletov/tea-qt/issues/50 + sed -i -e '/set_target_properties(tea PROPERTIES$/ a\ + OUTPUT_NAME \"tea-qt\"' \ + CMakeLists.txt || die + sed -i -e '/Exec/ { s/tea/tea-qt/ }' desktop/tea.desktop || die +} + +src_configure() { + local mycmakeargs=( + -DUSE_ASPELL=$(usex aspell) + -DUSE_PDF=$(usex pdf) + -DUSE_DJVU=$(usex djvu) + -DUSE_PRINTER=OFF # appears to be setup wrong + $(cmake_use_find_package qt6 Qt6) + ) + + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + + if [[ "${REPLACING_VERSIONS}" == "47.0.0" ]]; then + elog "Executable 'tea' has been renamed to 'tea-qt'" + fi +} diff --git a/app-editors/teco/files/teco-more-warnings.patch b/app-editors/teco/files/teco-more-warnings.patch new file mode 100644 index 000000000000..dd072e6f97eb --- /dev/null +++ b/app-editors/teco/files/teco-more-warnings.patch @@ -0,0 +1,149 @@ +https://bugs.gentoo.org/879041 + +--- teco/te_defs.h ++++ teco/te_defs.h +@@ -320,7 +320,72 @@ + extern char mapch[], mapch_l[]; /* char mapping tables */ + extern unsigned char spec_chars[]; /* special character table */ + +-extern char skipto(), getcmdc(), getcmdc0(); /* routines that return chars */ ++extern void block_inter(int func); ++extern void crlf(void); ++extern void delete1(int nchars); ++extern void dly_free_blist(struct buffcell *p); ++extern void do_ctlp(void); ++extern void do_e(void); ++extern void do_f(void); ++extern void do_o(void); ++extern void do_window(int ref_flag); ++extern void exec_cmds1(void); ++extern void exec_cmdstr(void); ++extern void find_enditer(void); ++extern void free_blist(struct buffcell *p); ++extern void insert1(void); ++extern void insert2(int count); ++extern void kill_output(struct outfiledata *outptr); ++extern void make_buffer(struct qh *p); ++extern void movenchars(struct qp *from, struct qp *to, int n); ++extern void moveuntil(struct qp *from, struct qp *to, char c, ++ int *n, int max, int trace); ++extern void panic(void); ++extern void pop_iteration(int arg); ++extern void retype_cmdstr(char c); ++extern void set_pointer(int pos, struct qp *ptr); ++extern void set_term_par(int lines, int cols); ++extern void set_var(int *arg); ++extern void setup_tty(int arg); ++extern void te_fx(void); ++extern void type_char(char c); ++extern void vt(int func); ++extern void window(int arg); ++extern void write_file(struct qp *wbuff, int nchars, int ffsw); ++extern char getcmdc(int trace); ++extern char getcmdc0(int trace); ++extern char gettty(void); ++extern char skipto(int arg); ++extern int backc(struct qp *arg); ++extern int build_string(struct qh *sbuff); ++extern int do_en(void); ++extern int do_eq(void); ++extern int do_eq1(char *shell); ++extern int do_fb(void); ++extern int do_glob(struct qh *gbuff); ++extern int do_nsearch(char arg); ++extern int do_search(int count); ++extern int end_search(int result); ++extern int fwdc(struct qp *arg); ++extern int fwdcx(struct qp *arg); ++extern int get_value(int d); ++extern int getqspec(int fors, char c); ++extern int gettty_nowait(void); ++extern int line_args(int d, struct qp *p); ++extern int lines(int arg); ++extern int peekcmdc(char arg); ++extern int read_cmdstr(void); ++extern int read_file(struct qp *rbuff, int *nchars, int endsw); ++extern int read_filename(int flag, char func); ++extern int read_stream(FILE *file, int *ff_found, struct qp *rbuff, ++ int *nchars, int endsw, int crlf_sw, int ff_sw); ++extern int setup_search(void); ++extern int srch_cmp(void); ++extern int tgetent(char *bp, const char *name); ++extern int tgetnum(const char *id); ++extern int w_lines(int n, struct qp *ps, struct qp *pd); ++extern int w_setptr(int loc, struct qp *pp); ++extern int w_overflow(int wd); + + extern FILE *eisw; /* indirect command file pointer */ + extern FILE *fopen(); +--- teco/te_exec2.c ++++ teco/te_exec2.c +@@ -8,10 +8,15 @@ + /* version for multiple buffers 04/19/89 11.29 */ + + #include "te_defs.h" ++#include <unistd.h> + #include <sys/wait.h> + #include <sys/types.h> + #include <sys/stat.h> + ++/* these shouldn't be necessary, since we include unistd.h and sys/stat.h */ ++extern int fchmod(int fd, mode_t mode); ++extern pid_t vfork(void); ++ + void do_en_next(), set_var(), write_file(), write_stream(); + void kill_output(), pop_iteration(), find_enditer(), find_endcond(); + +--- teco/te_fxstub.c ++++ teco/te_fxstub.c +@@ -10,7 +10,7 @@ + + #include "te_defs.h" + +-te_fx() ++void te_fx() + { + ERROR(E_IFC); + } +--- teco/te_main.c ++++ teco/te_main.c +@@ -46,6 +46,7 @@ + + void cleanup(), print_string(), save_args(), read_startup(), get_term_par(); + ++int + main(argc, argv) + int argc; /* arg count */ + char *argv[]; /* array of string pointers */ +--- teco/te_rdcmd.c ++++ teco/te_rdcmd.c +@@ -7,6 +7,7 @@ + #include "te_defs.h" + + void retype_cmdstr(char c); ++int find_lasteol(void); + int ccount; /* count of chars read in */ + + int read_cmdstr() +--- teco/te_srch.c ++++ teco/te_srch.c +@@ -156,7 +156,7 @@ + /* routine to do N, _, E_ searches: search, if search fails, then get */ + /* next page and continue */ + +-do_nsearch(arg) ++int do_nsearch(arg) + char arg; /* arg is 'n', '_', or 'e' to define which search */ + { + int scount; /* search count */ +--- teco/te_utils.c ++++ teco/te_utils.c +@@ -144,7 +144,7 @@ + return(1); + } + +-fwdcx(arg) ++int fwdcx(arg) + struct qp *arg; + { + if ((*arg).c >= CELLSIZE-1) /* test char count for max */ diff --git a/app-editors/teco/files/teco-void-functions.patch b/app-editors/teco/files/teco-void-functions.patch index f8a1d7ad346e..ee08d1ace9ea 100644 --- a/app-editors/teco/files/teco-void-functions.patch +++ b/app-editors/teco/files/teco-void-functions.patch @@ -6,7 +6,7 @@ https://bugs.gentoo.org/729254 #define SIGINTMASK 2 #endif -+void crlf(), type_char(); ++void crlf(), type_char(char c); + int lf_sw; /* nonzero: make up a LF following an entered CR */ int ttyflags; /* flags for (stdin) file descriptor */ @@ -178,16 +178,18 @@ https://bugs.gentoo.org/729254 register int icnt; --- teco-orig/te_main.c +++ teco/te_main.c -@@ -44,6 +44,8 @@ +@@ -44,6 +44,10 @@ #include "te_defs.h" -+void cleanup(), print_string(), save_args(), read_startup(), get_term_par(); ++void cleanup(), read_startup(), get_term_par(); ++void print_string(int arg); ++void save_args(int argc, char *argv[], struct qh *q); + main(argc, argv) int argc; /* arg count */ char *argv[]; /* array of string pointers */ -@@ -103,6 +105,7 @@ +@@ -103,6 +107,7 @@ /* reset screen state, keyboard state; remove open output files */ @@ -195,7 +197,7 @@ https://bugs.gentoo.org/729254 cleanup() { window(WIN_OFF); /* restore screen */ -@@ -115,6 +118,7 @@ +@@ -115,6 +120,7 @@ /* print string for error message */ /* argument is subscript of a qreg qh, prints text from that buffer */ @@ -203,7 +205,7 @@ https://bugs.gentoo.org/729254 print_string(arg) int arg; { -@@ -137,6 +141,7 @@ +@@ -137,6 +143,7 @@ /* copy invocation command line to a text buffer */ @@ -211,7 +213,7 @@ https://bugs.gentoo.org/729254 save_args(argc, argv, q) int argc; char *argv[]; -@@ -171,6 +176,7 @@ +@@ -171,6 +178,7 @@ char startup_name[] = "/.tecorc"; /* name of startup file */ @@ -219,7 +221,7 @@ https://bugs.gentoo.org/729254 read_startup() { char *hp, *getenv(); -@@ -192,6 +198,7 @@ +@@ -192,6 +200,7 @@ /* routine to get terminal height and width from termcap */ @@ -233,7 +235,7 @@ https://bugs.gentoo.org/729254 /* version for multiple buffers 04/13/89 10.22 */ #include "te_defs.h" -+void retype_cmdstr(); ++void retype_cmdstr(char c); int ccount; /* count of chars read in */ int read_cmdstr() diff --git a/app-editors/teco/metadata.xml b/app-editors/teco/metadata.xml index 2e545ee8b3f1..63946c6a87e5 100644 --- a/app-editors/teco/metadata.xml +++ b/app-editors/teco/metadata.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>ulm@gentoo.org</email> - <name>Ulrich Müller</name> +<maintainer type="project"> + <email>emacs@gentoo.org</email> + <name>Gentoo Emacs project</name> </maintainer> <longdescription lang="en"> TECO /tee'koh/ /n.,v. obs./ 1. [originally an acronym for `[paper] diff --git a/app-editors/teco/teco-36_p19940820.ebuild b/app-editors/teco/teco-36_p19940820-r1.ebuild index d37ed3f84e1f..54833cb9bbb6 100644 --- a/app-editors/teco/teco-36_p19940820.ebuild +++ b/app-editors/teco/teco-36_p19940820-r1.ebuild @@ -1,32 +1,32 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit toolchain-funcs flag-o-matic readme.gentoo-r1 DESCRIPTION="Classic TECO editor, Predecessor to EMACS" -HOMEPAGE="https://www.ibiblio.org/pub/linux/apps/editors/tty/ https://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco" +HOMEPAGE="https://www.ibiblio.org/pub/linux/apps/editors/tty/ https://www.ibiblio.org/pub/academic/computer-science/history/pdp-11/teco/" SRC_URI="https://www.ibiblio.org/pub/linux/apps/editors/tty/teco.tar.gz -> ${P}.tar.gz doc? ( https://dev.gentoo.org/~ulm/distfiles/tecodoc.tar.gz )" +S="${WORKDIR}" LICENSE="freedist" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc" RDEPEND="sys-libs/ncurses:0=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}" - PATCHES=( "${FILESDIR}"/${PN}-double-free.patch "${FILESDIR}"/${PN}-gcc4.patch "${FILESDIR}"/${PN}-warnings.patch "${FILESDIR}"/${PN}-no-common.patch "${FILESDIR}"/${PN}-void-functions.patch + "${FILESDIR}"/${PN}-more-warnings.patch ) src_prepare() { @@ -48,7 +48,7 @@ src_install() { dodoc sample.tecorc sample.tecorc2 READ.ME use doc && dodoc doc/* - DOC_CONTENTS="The TECO binary is called te. + local DOC_CONTENTS="The TECO binary is called te. \nSample configurations and documentation are available in /usr/share/doc/${PF}/." readme.gentoo_create_doc diff --git a/app-editors/ted/ted-2.23-r1.ebuild b/app-editors/ted/ted-2.23-r3.ebuild index 6ad6952c107d..014951358fd3 100644 --- a/app-editors/ted/ted-2.23-r1.ebuild +++ b/app-editors/ted/ted-2.23-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,17 +11,17 @@ S="${WORKDIR}/Ted-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc sparc x86" +KEYWORDS="amd64 ppc ~riscv sparc x86" RDEPEND=" - app-text/libpaper + app-text/libpaper:= dev-libs/libpcre2 media-libs/fontconfig media-libs/freetype + media-libs/libjpeg-turbo:= media-libs/libpng:= media-libs/tiff:= sys-libs/zlib - virtual/jpeg virtual/libiconv x11-libs/libXft x11-libs/libXpm diff --git a/app-editors/texworks/Manifest b/app-editors/texworks/Manifest index eefbc10c4021..a5b724486bf8 100644 --- a/app-editors/texworks/Manifest +++ b/app-editors/texworks/Manifest @@ -1,2 +1 @@ -DIST texworks-0.6.5.tar.gz 12140935 BLAKE2B 660606fe2e53d5f2a53e80792efbee368f5f2f402ab974761efc6e11a6f2233fd04672dcc3bf0155a070162616c1d5a9c7313825890e6fb0c6c4dc7af2c62d29 SHA512 d97bb7c3ad7bbb402be80556027ef19076dae91bb9449df2b45d54e89b492e32b8d6f109d1bda9388424af6218866d84a8c296c9bc2ef644cf2fac0d4b24939e -DIST texworks-0.6.6.tar.gz 12385550 BLAKE2B 241a9e4649e489964c62bd44ca310ffa7d67ebcb6187568dbf5e5b7916d81e3d846f0492a22e35d2c8a57d182d32d129600570e3836c671ae723c236f82d6bd8 SHA512 65300dfbe4e0e2f3b387c868e343f6caeff4602b47afee5a02cce82e0e23b74fe559b4b54fb65d778748de56f38581305a9b3a53d743c957b7dc14ecce4546d1 +DIST texworks-0.6.8.tar.gz 12486607 BLAKE2B a7de78adc0746c57b721a400a704d3912574933604e01124a99f5a60ba377ba66ce8d57f5f0a87e336de715d981146db6b8ae61a78c744b385c698fcdad2f7fe SHA512 23164f9ab2f611a705b533f4c435891f1279d1e0e0de2d7f947864f8919a6513cb696881dc1dcf93345471599f113d264ced57cbd2dceae343b9dde46ee80482 diff --git a/app-editors/texworks/files/qt5.15-support.patch b/app-editors/texworks/files/qt5.15-support.patch deleted file mode 100644 index 9c77c157e463..000000000000 --- a/app-editors/texworks/files/qt5.15-support.patch +++ /dev/null @@ -1,21 +0,0 @@ -From a5352a3a94e3685125650b65e6197de060326cc2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> -Date: Fri, 1 May 2020 08:05:46 +0200 -Subject: [PATCH] <QtPDF> Fix compilation with Qt 5.15 - ---- - modules/QtPDF/src/PDFBackend.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules/QtPDF/src/PDFBackend.cpp b/modules/QtPDF/src/PDFBackend.cpp -index 0305d87a..500d20aa 100644 ---- a/modules/QtPDF/src/PDFBackend.cpp -+++ b/modules/QtPDF/src/PDFBackend.cpp -@@ -14,6 +14,7 @@ - - #include <PDFBackend.h> - #include <QPainter> -+#include <QPainterPath> - #include <QApplication> - - namespace QtPDF { diff --git a/app-editors/texworks/files/texworks-0.6.8-optional-qtscript.patch b/app-editors/texworks/files/texworks-0.6.8-optional-qtscript.patch new file mode 100644 index 000000000000..460c4f4f7e2d --- /dev/null +++ b/app-editors/texworks/files/texworks-0.6.8-optional-qtscript.patch @@ -0,0 +1,25 @@ +It doesn't work like that. + +--- a/CMakeLists.txt 2023-02-18 11:42:11.000000000 +0100 ++++ b/CMakeLists.txt 2023-10-21 20:00:29.144638825 +0200 +@@ -281,9 +281,11 @@ + set(QT_VERSION_PATCH "${Qt6_VERSION_PATCH}") + else () + # Check for Qt5 +- find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools Concurrent Xml LinguistTools Qml OPTIONAL_COMPONENTS Script ScriptTools) ++ find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools Concurrent Xml LinguistTools Qml) + set(QT_LIBRARIES Qt5::Core Qt5::Widgets Qt5::Gui Qt5::UiTools Qt5::Concurrent Qt5::Xml Qt5::Qml) + ++ find_package(Qt5Script) ++ find_package(Qt5ScriptTools) + if (Qt5Script_FOUND AND Qt5ScriptTools_FOUND) + list(APPEND QT_LIBRARIES Qt5::ScriptTools Qt5::Script) + set(WITH_QTSCRIPT ON) +@@ -311,7 +313,6 @@ + set(QT_VERSION_MAJOR "${Qt5_VERSION_MAJOR}") + set(QT_VERSION_MINOR "${Qt5_VERSION_MINOR}") + set(QT_VERSION_PATCH "${Qt5_VERSION_PATCH}") +- set(WITH_QTSCRIPT ON) + endif () + + # Expose the major version number of Qt to the preprocessor. This is necessary diff --git a/app-editors/texworks/metadata.xml b/app-editors/texworks/metadata.xml index 48d3ded01150..d88999c90d1a 100644 --- a/app-editors/texworks/metadata.xml +++ b/app-editors/texworks/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>zlogene@gentoo.org</email> - <name>Mikle Kolyada</name> -</maintainer> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">TeXworks/texworks</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/texworks/texworks-0.6.5-r100.ebuild b/app-editors/texworks/texworks-0.6.5-r100.ebuild deleted file mode 100644 index 39f076553e6a..000000000000 --- a/app-editors/texworks/texworks-0.6.5-r100.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9} ) -CMAKE_REMOVE_MODULES_LIST="FindLua" -inherit lua-single python-single-r1 cmake virtualx xdg-utils - -DESCRIPTION="A simple interface for working with TeX documents" -HOMEPAGE="http://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 )" - -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/texworks/texworks-0.6.6.ebuild b/app-editors/texworks/texworks-0.6.6.ebuild deleted file mode 100644 index e8ad1634456a..000000000000 --- a/app-editors/texworks/texworks-0.6.6.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..3} ) -PYTHON_COMPAT=( python3_{7,8,9} ) -CMAKE_REMOVE_MODULES_LIST="FindLua" -inherit lua-single python-single-r1 cmake virtualx xdg-utils - -DESCRIPTION="A simple interface for working with TeX documents" -HOMEPAGE="http://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}"/${PN}-0.6.5-cmake_lua_version.patch -) - -S=${WORKDIR}/${PN}-release-${PV} - -RESTRICT="!test? ( test )" - -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/texworks/texworks-0.6.8.ebuild b/app-editors/texworks/texworks-0.6.8.ebuild new file mode 100644 index 000000000000..65ac3d6842d0 --- /dev/null +++ b/app-editors/texworks/texworks-0.6.8.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..3} ) +PYTHON_COMPAT=( python3_{9..12} ) +CMAKE_REMOVE_MODULES_LIST=( FindLua ) +inherit lua-single python-single-r1 cmake xdg + +DESCRIPTION="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" +S="${WORKDIR}"/${PN}-release-${PV} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~riscv x86" +IUSE="lua python test" +RESTRICT="!test? ( test )" + +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/qtdeclarative:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + sys-libs/zlib + lua? ( ${LUA_DEPS} ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.5-cmake_lua_version.patch + "${FILESDIR}"/${P}-optional-qtscript.patch +) + +pkg_setup() { + use lua && lua-single_pkg_setup + + python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -Wno-dev + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=ON + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=ON + -DPREFER_BUNDLED_SYNCTEX=ON + -DWITH_LUA=$(usex lua) + -DWITH_PYTHON=$(usex python) + -DWITH_TESTS=$(usex test) + -DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks" + -DTeXworks_DOCS_DIR="/share/doc/${PF}" + -DQTPDF_VIEWER=ON + -DBUILD_SHARED_PLUGINS=ON + ) + + use lua && mycmakeargs+=( -DLUA_VERSION="$(lua_get_version)" ) + + cmake_src_configure +} + +src_test() { + local -x QT_QPA_PLATFORM=offscreen + cmake_src_test +} diff --git a/app-editors/uemacs-pk/Manifest b/app-editors/uemacs-pk/Manifest index dc21550f5685..f3254286f52b 100644 --- a/app-editors/uemacs-pk/Manifest +++ b/app-editors/uemacs-pk/Manifest @@ -1,2 +1 @@ -DIST uemacs-4.0.15_p20180117.tar.xz 151600 BLAKE2B 76a6a3cd3d0abf720721c7c09687c1964958e6c1c05ad8db07e6e561d6714e436d31659d118af85d069ad77da2606b0ac86005824e2ac56db8040a0ea739aabf SHA512 aadf3f9e8ab3f2c9c7bccf305f7a37e75ac1c92c5c388ce35a10b24cedf886f7d9b0ce8b1196c2f96a0d874bd5af130edb3ecb1ccf571d8e8c00753564e38aa7 DIST uemacs-4.0.15_p20180719.tar.xz 151748 BLAKE2B 66572d3b4eb54310b7468a43fa718faa78aae8070a8675018f8dccc38d2dcb8e93b41942f49ca28b7c8ee5d100b541ecebfa2adc9a84f121a178ade0903029b1 SHA512 0baa273d5f8df75976d01acbe69b2bca7ec803c8a40364ebded39d16874426874af7b7547774c211fbbb96c82fcb69aaf75f8fa5fd3e95422ee105e6be7f9564 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 deleted file mode 100644 index d39413bfc5f8..000000000000 --- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180117.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS" -HOMEPAGE="https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary - ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK" -# snapshot from git repo -SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz" - -LICENSE="free-noncomm" -SLOT="0" -KEYWORDS="amd64 x86" - -RDEPEND="sys-libs/ncurses:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/uemacs" -PATCHES=("${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch) - -src_compile() { - emake V=1 \ - CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" -} - -src_install() { - dobin em - insinto /usr/share/${PN} - doins emacs.hlp - newins emacs.rc .emacsrc - dodoc README readme.39e emacs.ps UTF-8-demo.txt -} diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild index 0955ecca90cd..00464e0143a4 100644 --- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild +++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20180719.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,20 +6,19 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS" -HOMEPAGE="https://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary - ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK" +HOMEPAGE="https://git.kernel.org/pub/scm/editors/uemacs/uemacs.git" # snapshot from git repo SRC_URI="https://dev.gentoo.org/~ulm/distfiles/uemacs-${PV}.tar.xz" +S="${WORKDIR}/uemacs" LICENSE="free-noncomm" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" RDEPEND="sys-libs/ncurses:0=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -S="${WORKDIR}/uemacs" PATCHES=("${FILESDIR}"/${PN}-4.0.15_p20110825-gentoo.patch) src_compile() { diff --git a/app-editors/vile/Manifest b/app-editors/vile/Manifest index 16b6f6700ba0..a9cd6fd654ee 100644 --- a/app-editors/vile/Manifest +++ b/app-editors/vile/Manifest @@ -1,2 +1,4 @@ -DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229 -DIST vile-9.8u.tgz 2375989 BLAKE2B 86e2bb01fab7c429233484493aa33c0b807f7babedf6e69f4c526a6677471ff8e43287114073d22ebb229a801ef003779ab587c9a17474519148e1f64d58460e SHA512 fad06c8e341feec7e9aed1e53cd9a1e7fe79fdeb050aba743ac4edfb6096db88c1ef63377d6ecbeddd0eb8ad46a323bcc55d09b1ff221a75cd74a3f991e3f24d +DIST vile-9.8y.tgz 2477410 BLAKE2B 993f43a8e033e40d95c6d762daafebf328cae291380d448ec14b2a335569d5de7f628308433cb5abec15958bf1fc47c29f3f0ed49282f22cf7affd839c6ac2c6 SHA512 ce3c7178f6aecfd152e487d0053399739cf8880aa9c38283c9e4e7b95606fa2484f3cf9f7e797f538a47555be5257fbd34b112210e68a39d74f6b8ae7d968c32 +DIST vile-9.8y.tgz.asc 729 BLAKE2B 224cc75c025eb81b898990cb9f44a24e340664c658cead90f16d9103ed3bd3f15ce2c5dcf278c25f4a82069be2d39905f241c5d263b3170a731fb7e865cc45f7 SHA512 5475819801b6dcf3259811b5d3e29584a89baf574ca5685e61c6f98ba15c088ac6843bef66d2a9008b18fb4013fb40aa963ee48b15a786d6724f9ad7a599bd13 +DIST vile-9.8z.tgz 2491799 BLAKE2B a581d269931b2f14307a37e9ec9166cd66d6b48aea15405b6805d6ef2ff448342ff4027d10ef67ed9eace1083484ff282edd8f13341ed515a2f11efed9f8e74d SHA512 f5ff6f3d239f993d7b060e89650567e1c622cec1a024901e29d15cd9a588e8603097e12087d54e88beca91a3a7cd7328a541bac62889368da6636f143d6380ff +DIST vile-9.8z.tgz.asc 729 BLAKE2B 62c9a5b34f3c1018df7e702dfc8e2bc24012aefb305abc1f21a58181a4ec89df6358d601ced10b41942c2bd63dc4e97f56987f90293deb4c8783dc0b98c38065 SHA512 0c7f5b64425f3f28833e54e072709687730e10fab7e231c1850335aa736ddeb5a6c800b66bab2ad6c79460d13987ee6803f9abb0606cd79682e2e1026b3ece25 diff --git a/app-editors/vile/metadata.xml b/app-editors/vile/metadata.xml index 5156eb857fef..d110c3ebb42b 100644 --- a/app-editors/vile/metadata.xml +++ b/app-editors/vile/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <changelog>https://invisible-island.net/vile/CHANGES.html</changelog> + <remote-id type="github">ThomasDickey/vile-snapshots</remote-id> </upstream> </pkgmetadata> diff --git a/app-editors/vile/vile-9.8t-r1.ebuild b/app-editors/vile/vile-9.8t-r1.ebuild deleted file mode 100644 index fa2cb4f2acc2..000000000000 --- a/app-editors/vile/vile-9.8t-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone" -HOMEPAGE="https://invisible-island.net/vile/" -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" -IUSE="perl" - -RDEPEND=">=sys-libs/ncurses-5.2:0= - virtual/libcrypt:= - perl? ( dev-lang/perl )" -DEPEND="${RDEPEND} - sys-devel/flex - app-eselect/eselect-vi" - -src_configure() { - econf \ - --with-ncurses \ - $(use_with perl ) -} - -src_install() { - emake DESTDIR="${D}" INSTALL_OPT_S="" install - dodoc CHANGES* README doc/*.doc - docinto html - dodoc doc/*.html -} - -pkg_postinst() { - einfo "Updating ${EPREFIX}/usr/bin/vi symlink" - eselect vi update --if-unset -} - -pkg_postrm() { - einfo "Updating ${EPREFIX}/usr/bin/vi symlink" - eselect vi update --if-unset -} diff --git a/app-editors/vile/vile-9.8u-r1.ebuild b/app-editors/vile/vile-9.8y.ebuild index 480383dbd0b2..f4b5095f953e 100644 --- a/app-editors/vile/vile-9.8u-r1.ebuild +++ b/app-editors/vile/vile-9.8y.ebuild @@ -1,25 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +# Bump with app-editors/xvile + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone" HOMEPAGE="https://invisible-island.net/vile/" -SRC_URI="ftp://ftp.invisible-island.net/vile/current/${P}.tgz" +SRC_URI="https://invisible-island.net/archives/vile/current/${P}.tgz" +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/vile/current/${P}.tgz.asc )" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~ia64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="perl iconv" -RDEPEND="app-eselect/eselect-vi - >=sys-libs/ncurses-5.2:0= +RDEPEND=">=sys-libs/ncurses-5.2:= virtual/libcrypt:= iconv? ( virtual/libiconv ) - perl? ( dev-lang/perl )" + perl? ( dev-lang/perl:= )" DEPEND="${RDEPEND}" -BDEPEND="sys-devel/flex - virtual/pkgconfig" +BDEPEND=" + app-alternatives/lex + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) +" +IDEPEND="app-eselect/eselect-vi" src_configure() { econf \ diff --git a/app-editors/vile/vile-9.8z.ebuild b/app-editors/vile/vile-9.8z.ebuild new file mode 100644 index 000000000000..6c0c78fa7e56 --- /dev/null +++ b/app-editors/vile/vile-9.8z.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bump with app-editors/xvile + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig + +DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone" +HOMEPAGE="https://invisible-island.net/vile/" +SRC_URI="https://invisible-island.net/archives/vile/current/${P}.tgz" +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/vile/current/${P}.tgz.asc )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~ia64 ppc ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="perl iconv" + +RDEPEND=">=sys-libs/ncurses-5.2:= + virtual/libcrypt:= + iconv? ( virtual/libiconv ) + perl? ( dev-lang/perl:= )" +DEPEND="${RDEPEND}" +BDEPEND=" + app-alternatives/lex + virtual/pkgconfig + verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 ) +" +IDEPEND="app-eselect/eselect-vi" + +src_configure() { + econf \ + --disable-stripping \ + --with-ncurses \ + --with-pkg-config \ + $(use_with iconv) \ + $(use_with perl) +} + +src_install() { + emake DESTDIR="${D}" install + + dodoc CHANGES* README doc/*.doc + docinto html + dodoc doc/*.html +} + +pkg_postinst() { + einfo "Updating ${EPREFIX}/usr/bin/vi symlink" + eselect vi update --if-unset +} + +pkg_postrm() { + einfo "Updating ${EPREFIX}/usr/bin/vi symlink" + eselect vi update --if-unset +} diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index ba93bb167e09..c7237f377374 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -1,3 +1,8 @@ -DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b -DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2 -DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b +DIST vim-9.0.1503.tar.gz 17010118 BLAKE2B 4f74d52a3fcf7875031378f86fc3411c64c92e4b82bee371148b19042478d3f974793477c3fc2d9ddff9233fa1ec3c864962880840867544e92464f1a0876f51 SHA512 2f3242ec0f79cf6affc2f7fdaf689c35d8597706ac1689dbbdc01352676199605bb37f22bd901f1e8d59f312237d3fce4bee8b979b28a744ea9e40558621980e +DIST vim-9.0.1627.tar.gz 17048824 BLAKE2B 3fa583cf676c2388641b1240ed4b90c2e42cd9f50ea44a943cce86bba4bf278adf54837bb5c4530471fd57cfcd08cd39be78b17a5e907435a02dc5874ff7f571 SHA512 d2fb863e03d4ad773fcba8917f3cd1e373f661aa8b8a20bd3e416a73788997d31c6dd106a1bf59d72475bb577bbe6d52eb079fff9c7152d96bb6e5c9aa6e2f3b +DIST vim-9.0.1678.tar.gz 17069551 BLAKE2B e83cea77513eb0d8b3ed02bd508333fb97357d2d7a91a90c5a9376b03b444a0b65b6ce04b14e191e33445132845af71193ab140ea615bb03a2c24a904b726cb4 SHA512 c5ffb7ca56ff4eee70f06599dd84db2eb28ddadac229d4f7faf01174805923636a4ce61486bdf5a47910c929613dc9b9290dfc9288006222b4bc4ac891548bb8 +DIST vim-9.0.1777.tar.gz 17177555 BLAKE2B ad6d785f4c6b112199bd2f34e0b7f6070615fba8dce25354a7ded40ff8536388e7b7120c1f2fad790c8dc7134d74649697b6e95777e79dcf1e208ead81b229d6 SHA512 702781b6a9cf540d22aa0bc1e25a4fb785ff2b22e9c6a59643e87fd6f7b3e5444adbee1816bfaa0b45b9655bb56dc2d13904230840a0ecea56f5453034d81a2e +DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 3a4b2bc57712de3b92b0e8d9b2d428e4d576665a183927051eddd53d019a5ca413c74dc10aff09917ee3120bd2e2ba441219d7238994f0d5ba14fc9c31180199 SHA512 ec27e4056460948ff86bc48a21de239a84b53757a8283144ec121654096796d970ad832234d6591a132bcd38bc12dc507cc7795a11cd383d20f08b4d9bcb051f +DIST vim-9.0.2092.tar.gz 17359377 BLAKE2B eeb50de7e4876ce0e2a1e8b241ea2c7c472898495ef5517fa115e01f29ef8922fb7ef970f2c1a3ffe65a8274e2c59bd5a939f397048c6b486683c29c01484d1e SHA512 1c3e78ee1bb507858e0d30a8a1e646c16dd6d8d666ea587e91d1c90e490aef46387d6dfadc01e80f9aa807f7b109e4072efa8d8115fcd2a81dd62cabc30a8001 +DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034b2875e728406b318c8b12e2d8d4ee3423ce94f8749679f07d36f229954f7ef0b12ce7bc4d71ccf6637ce2d6029 SHA512 6a9a785b1915dc167210b0da4d5e4401c71ee49b3554c8a22566378658ddcc3493562897ea39035852399cc5ffb55a73355ab13390c27a4d00ffd76bcd10ddf0 +DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a diff --git a/app-editors/vim-core/files/vimrc-r5 b/app-editors/vim-core/files/vimrc-r6 index 2409822e628c..0197f057d233 100644 --- a/app-editors/vim-core/files/vimrc-r5 +++ b/app-editors/vim-core/files/vimrc-r6 @@ -190,8 +190,11 @@ endif " has("autocmd") " }}} " We don't want VIM to load their own built-in defaults, preferring ours here -" instead: -let g:skip_defaults_vim = 1 +" instead. This option cannot apply to minimal builds, so it is guarded by a +" test that's guaranteed to fail for those, owing to the lack of +eval. +if 1 + let g:skip_defaults_vim = 1 +endif " Enable Omni completion when opening a file only if a specific plugin does " not already exist for that filetype. This allows Omni completion diff --git a/app-editors/vim-core/metadata.xml b/app-editors/vim-core/metadata.xml index 841e5550d72b..9c318632e59c 100644 --- a/app-editors/vim-core/metadata.xml +++ b/app-editors/vim-core/metadata.xml @@ -1,10 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>xxc3ncoredxx@gmail.com</email> + <name>Oskari Pirhonen</name> + </maintainer> <maintainer type="project"> <email>vim@gentoo.org</email> <name>Gentoo Vim Project</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <upstream> <remote-id type="github">vim/vim</remote-id> <remote-id type="cpe">cpe:/a:vim:vim</remote-id> diff --git a/app-editors/vim-core/vim-core-8.2.3428.ebuild b/app-editors/vim-core/vim-core-9.0.1503.ebuild index f141342833a8..a54e0738beed 100644 --- a/app-editors/vim-core/vim-core-8.2.3428.ebuild +++ b/app-editors/vim-core/vim-core-9.0.1503.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,55 +15,61 @@ if [[ ${PV} == 9999* ]] ; then 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 ~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" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="nls acl minimal" -DEPEND="sys-devel/autoconf" -# avoid icon file collision bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" -S=${WORKDIR}/vim-${PV} +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898406): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home } src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi + default # Fixup a script to use awk instead of nawk sed -i \ -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ "${S}"/runtime/tools/mve.awk || die "sed failed" - # See #77841. We remove this file after the tarball extraction. + # See bug #77841. We remove this file after the tarball extraction. rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die # 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ @@ -67,17 +77,12 @@ src_prepare() { "${S}"/runtime/menu.vim \ "${S}"/src/configure.ac || die 'sed failed' - # Don't be fooled by /usr/include/libc.h. When found, vim thinks - # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. @@ -89,27 +94,12 @@ src_prepare() { 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 + # 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: + # 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 @@ -118,6 +108,12 @@ src_configure() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" +} + +src_configure() { + # 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 emake -j1 -C src autoconf @@ -125,29 +121,39 @@ src_configure() { # 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 + addwrite ${file} fi done # Let Portage do the stripping. Some people like that. export ac_cv_prog_STRIP="$(type -P true ) faking strip" + local myconf=( + --with-modified-by=Gentoo-${PVR} + --enable-gui=no + --without-x + --disable-darwin + --disable-perlinterp + --disable-pythoninterp + --disable-rubyinterp + --disable-gpm + --disable-selinux + $(use_enable nls) + $(use_enable acl) + ) + # Keep Gentoo Prefix env contained within the EPREFIX - use prefix && myconf+=" --without-local-dir" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} + use prefix && myconf+=( --without-local-dir ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf "${myconf[@]}" } src_compile() { @@ -179,27 +185,27 @@ src_install() { # default vimrc is installed by vim-core since it applies to # both vim and gvim insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc + newins "${FILESDIR}"/vimrc-r6 vimrc eprefixify "${ED}"/etc/vim/vimrc if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die fi newbashcomp "${FILESDIR}"/xxd-completion xxd diff --git a/app-editors/vim-core/vim-core-9.0.1627.ebuild b/app-editors/vim-core/vim-core-9.0.1627.ebuild new file mode 100644 index 000000000000..6cb4710f79e9 --- /dev/null +++ b/app-editors/vim-core/vim-core-9.0.1627.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils + +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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +S="${WORKDIR}/vim-${PV}" + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="nls acl minimal" + +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898406): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" +} + +src_prepare() { + default + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See bug #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug #18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" +} + +src_configure() { + # 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 + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + local myconf=( + --with-modified-by=Gentoo-${PVR} + --enable-gui=no + --without-x + --disable-darwin + --disable-perlinterp + --disable-pythoninterp + --disable-rubyinterp + --disable-gpm + --disable-selinux + $(use_enable nls) + $(use_enable acl) + ) + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf "${myconf[@]}" +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r6 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # install gvim icon since both vim/gvim desktop files reference it + doicon -s scalable "${FILESDIR}"/gvim.svg +} + +pkg_postinst() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} diff --git a/app-editors/vim-core/vim-core-9.0.1678.ebuild b/app-editors/vim-core/vim-core-9.0.1678.ebuild new file mode 100644 index 000000000000..66de9fc233f0 --- /dev/null +++ b/app-editors/vim-core/vim-core-9.0.1678.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils + +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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +S="${WORKDIR}/vim-${PV}" + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="nls acl minimal" + +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898406): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" +} + +src_prepare() { + default + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See bug #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug #18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" +} + +src_configure() { + # 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 + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + local myconf=( + --with-modified-by="Gentoo-${PVR} (RIP Bram)" + --enable-gui=no + --without-x + --disable-darwin + --disable-perlinterp + --disable-pythoninterp + --disable-rubyinterp + --disable-gpm + --disable-selinux + $(use_enable nls) + $(use_enable acl) + ) + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf "${myconf[@]}" +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r6 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # install gvim icon since both vim/gvim desktop files reference it + doicon -s scalable "${FILESDIR}"/gvim.svg +} + +pkg_postinst() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} diff --git a/app-editors/vim-core/vim-core-9.0.1777.ebuild b/app-editors/vim-core/vim-core-9.0.1777.ebuild new file mode 100644 index 000000000000..b29cfe232334 --- /dev/null +++ b/app-editors/vim-core/vim-core-9.0.1777.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils + +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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +S="${WORKDIR}/vim-${PV}" + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="nls acl minimal" + +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898406): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" +} + +src_prepare() { + default + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See bug #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug #18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" +} + +src_configure() { + # 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 + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + local myconf=( + --with-modified-by="Gentoo-${PVR} (RIP Bram)" + --enable-gui=no + --without-x + --disable-darwin + --disable-perlinterp + --disable-pythoninterp + --disable-rubyinterp + --disable-gpm + --disable-selinux + $(use_enable nls) + $(use_enable acl) + ) + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf "${myconf[@]}" +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r6 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # install gvim icon since both vim/gvim desktop files reference it + doicon -s scalable "${FILESDIR}"/gvim.svg +} + +pkg_postinst() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} diff --git a/app-editors/vim-core/vim-core-9.0.2092.ebuild b/app-editors/vim-core/vim-core-9.0.2092.ebuild new file mode 100644 index 000000000000..2c34d0a6f525 --- /dev/null +++ b/app-editors/vim-core/vim-core-9.0.2092.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.2092" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils + +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://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi +S="${WORKDIR}/vim-${PV}" + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="nls acl minimal" + +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898406): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" +} + +src_prepare() { + default + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See bug #77841. We remove this file after the tarball extraction. + rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug #18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" +} + +src_configure() { + # 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 + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + local myconf=( + --with-modified-by="Gentoo-${PVR} (RIP Bram)" + --enable-gui=no + --without-x + --disable-darwin + --disable-perlinterp + --disable-pythoninterp + --disable-rubyinterp + --disable-gpm + --disable-selinux + $(use_enable nls) + $(use_enable acl) + ) + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf "${myconf[@]}" +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r6 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + fi + + newbashcomp "${FILESDIR}"/xxd-completion xxd + + # install gvim icon since both vim/gvim desktop files reference it + doicon -s scalable "${FILESDIR}"/gvim.svg +} + +pkg_postinst() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update icon cache + xdg_icon_cache_update +} diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-9.0.2167.ebuild index 7cccceadd8e4..6a93ef6b0442 100644 --- a/app-editors/vim-core/vim-core-8.2.0814.ebuild +++ b/app-editors/vim-core/vim-core-9.0.2167.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.2092" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,55 +15,61 @@ if [[ ${PV} == 9999* ]] ; then 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 ~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" + https://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="nls acl minimal" -DEPEND="sys-devel/autoconf" -# avoid icon file collision bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" -S=${WORKDIR}/vim-${PV} +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898406): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home } src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi + default # Fixup a script to use awk instead of nawk sed -i \ -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ "${S}"/runtime/tools/mve.awk || die "sed failed" - # See #77841. We remove this file after the tarball extraction. + # See bug #77841. We remove this file after the tarball extraction. rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die # 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ @@ -67,17 +77,12 @@ src_prepare() { "${S}"/runtime/menu.vim \ "${S}"/src/configure.ac || die 'sed failed' - # Don't be fooled by /usr/include/libc.h. When found, vim thinks - # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. @@ -89,27 +94,12 @@ src_prepare() { 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 + # 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: + # 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 @@ -119,35 +109,56 @@ src_configure() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi +} + +src_configure() { + # 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 + 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 + addwrite ${file} fi done # Let Portage do the stripping. Some people like that. export ac_cv_prog_STRIP="$(type -P true ) faking strip" + local myconf=( + --with-modified-by="Gentoo-${PVR} (RIP Bram)" + --enable-gui=no + --without-x + --disable-darwin + --disable-perlinterp + --disable-pythoninterp + --disable-rubyinterp + --disable-gpm + --disable-selinux + $(use_enable nls) + $(use_enable acl) + ) + # Keep Gentoo Prefix env contained within the EPREFIX - use prefix && myconf+=" --without-local-dir" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} + use prefix && myconf+=( --without-local-dir ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf "${myconf[@]}" } src_compile() { @@ -179,27 +190,27 @@ src_install() { # default vimrc is installed by vim-core since it applies to # both vim and gvim insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc + newins "${FILESDIR}"/vimrc-r6 vimrc eprefixify "${ED}"/etc/vim/vimrc if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die fi newbashcomp "${FILESDIR}"/xxd-completion xxd diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index f141342833a8..acfd3ab4aab3 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -1,9 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +EAPI=8 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" +inherit bash-completion-r1 desktop flag-o-matic prefix toolchain-funcs vim-doc xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -11,55 +15,61 @@ if [[ ${PV} == 9999* ]] ; then 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 ~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" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi +S="${WORKDIR}/vim-${PV}" DESCRIPTION="vim and gvim shared files" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="nls acl minimal" -DEPEND="sys-devel/autoconf" -# avoid icon file collision bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" -PDEPEND="!minimal? ( app-vim/gentoo-syntax )" +# ncurses is only needed by ./configure, so no subslot operator required +DEPEND=">=sys-libs/ncurses-5.2-r2:0" +BDEPEND="dev-build/autoconf" -S=${WORKDIR}/vim-${PV} +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898406): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" - - # Gnome sandbox silliness. bug #114475. - mkdir -p "${T}"/home || die "mkdir -p failed" - export HOME="${T}"/home } src_prepare() { - if [[ ${PV} != 9999* ]] ; then - # Gentoo patches to fix runtime issues, cross-compile errors, etc - eapply "${WORKDIR}"/patches - fi + default # Fixup a script to use awk instead of nawk sed -i \ -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ "${S}"/runtime/tools/mve.awk || die "sed failed" - # See #77841. We remove this file after the tarball extraction. + # See bug #77841. We remove this file after the tarball extraction. rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed" # Read vimrc and gvimrc from /etc/vim - echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h - echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h || die + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h || die # 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ "${S}"/runtime/doc/tagsrch.txt \ @@ -67,17 +77,12 @@ src_prepare() { "${S}"/runtime/menu.vim \ "${S}"/src/configure.ac || die 'sed failed' - # Don't be fooled by /usr/include/libc.h. When found, vim thinks - # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) - sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' - # gcc on sparc32 has this, uhm, interesting problem with detecting EOF # correctly. To avoid some really entertaining error messages about stuff # which isn't even in the source file being invalid, we'll do some trickery # to make the error never occur. bug 66162 (02 October 2004 ciaranm) find "${S}" -name '*.c' | while read c; do - echo >> "$c" || die "echo failed" + echo >> "$c" || die "echo failed" done # Try to avoid sandbox problems. Bug #114475. @@ -89,27 +94,12 @@ src_prepare() { 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 + # 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: + # 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 @@ -119,35 +109,56 @@ src_configure() { # Remove src/auto/configure file. rm -v src/auto/configure || die "rm configure failed" + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi +} + +src_configure() { + # 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 + 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 + addwrite ${file} fi done # Let Portage do the stripping. Some people like that. export ac_cv_prog_STRIP="$(type -P true ) faking strip" + local myconf=( + --with-modified-by=Gentoo-${PVR} + --enable-gui=no + --without-x + --disable-darwin + --disable-perlinterp + --disable-pythoninterp + --disable-rubyinterp + --disable-gpm + --disable-selinux + $(use_enable nls) + $(use_enable acl) + ) + # Keep Gentoo Prefix env contained within the EPREFIX - use prefix && myconf+=" --without-local-dir" - - econf \ - --with-modified-by=Gentoo-${PVR} \ - --enable-gui=no \ - --without-x \ - --disable-darwin \ - --disable-perlinterp \ - --disable-pythoninterp \ - --disable-rubyinterp \ - --disable-gpm \ - --disable-selinux \ - $(use_enable nls) \ - $(use_enable acl) \ - ${myconf} + use prefix && myconf+=( --without-local-dir ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf "${myconf[@]}" } src_compile() { @@ -179,27 +190,27 @@ src_install() { # default vimrc is installed by vim-core since it applies to # both vim and gvim insinto /etc/vim/ - newins "${FILESDIR}"/vimrc-r5 vimrc + newins "${FILESDIR}"/vimrc-r6 vimrc eprefixify "${ED}"/etc/vim/vimrc if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - eshopts_pop + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die fi newbashcomp "${FILESDIR}"/xxd-completion xxd diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index ba93bb167e09..c7237f377374 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -1,3 +1,8 @@ -DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b -DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2 -DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b +DIST vim-9.0.1503.tar.gz 17010118 BLAKE2B 4f74d52a3fcf7875031378f86fc3411c64c92e4b82bee371148b19042478d3f974793477c3fc2d9ddff9233fa1ec3c864962880840867544e92464f1a0876f51 SHA512 2f3242ec0f79cf6affc2f7fdaf689c35d8597706ac1689dbbdc01352676199605bb37f22bd901f1e8d59f312237d3fce4bee8b979b28a744ea9e40558621980e +DIST vim-9.0.1627.tar.gz 17048824 BLAKE2B 3fa583cf676c2388641b1240ed4b90c2e42cd9f50ea44a943cce86bba4bf278adf54837bb5c4530471fd57cfcd08cd39be78b17a5e907435a02dc5874ff7f571 SHA512 d2fb863e03d4ad773fcba8917f3cd1e373f661aa8b8a20bd3e416a73788997d31c6dd106a1bf59d72475bb577bbe6d52eb079fff9c7152d96bb6e5c9aa6e2f3b +DIST vim-9.0.1678.tar.gz 17069551 BLAKE2B e83cea77513eb0d8b3ed02bd508333fb97357d2d7a91a90c5a9376b03b444a0b65b6ce04b14e191e33445132845af71193ab140ea615bb03a2c24a904b726cb4 SHA512 c5ffb7ca56ff4eee70f06599dd84db2eb28ddadac229d4f7faf01174805923636a4ce61486bdf5a47910c929613dc9b9290dfc9288006222b4bc4ac891548bb8 +DIST vim-9.0.1777.tar.gz 17177555 BLAKE2B ad6d785f4c6b112199bd2f34e0b7f6070615fba8dce25354a7ded40ff8536388e7b7120c1f2fad790c8dc7134d74649697b6e95777e79dcf1e208ead81b229d6 SHA512 702781b6a9cf540d22aa0bc1e25a4fb785ff2b22e9c6a59643e87fd6f7b3e5444adbee1816bfaa0b45b9655bb56dc2d13904230840a0ecea56f5453034d81a2e +DIST vim-9.0.2092-patches.tar.xz 2640 BLAKE2B 3a4b2bc57712de3b92b0e8d9b2d428e4d576665a183927051eddd53d019a5ca413c74dc10aff09917ee3120bd2e2ba441219d7238994f0d5ba14fc9c31180199 SHA512 ec27e4056460948ff86bc48a21de239a84b53757a8283144ec121654096796d970ad832234d6591a132bcd38bc12dc507cc7795a11cd383d20f08b4d9bcb051f +DIST vim-9.0.2092.tar.gz 17359377 BLAKE2B eeb50de7e4876ce0e2a1e8b241ea2c7c472898495ef5517fa115e01f29ef8922fb7ef970f2c1a3ffe65a8274e2c59bd5a939f397048c6b486683c29c01484d1e SHA512 1c3e78ee1bb507858e0d30a8a1e646c16dd6d8d666ea587e91d1c90e490aef46387d6dfadc01e80f9aa807f7b109e4072efa8d8115fcd2a81dd62cabc30a8001 +DIST vim-9.0.2167.tar.gz 17405049 BLAKE2B 496c8f9672bc4ecce743a145bc2b671bf09034b2875e728406b318c8b12e2d8d4ee3423ce94f8749679f07d36f229954f7ef0b12ce7bc4d71ccf6637ce2d6029 SHA512 6a9a785b1915dc167210b0da4d5e4401c71ee49b3554c8a22566378658ddcc3493562897ea39035852399cc5ffb55a73355ab13390c27a4d00ffd76bcd10ddf0 +DIST vim-patches-vim-9.0.1000-patches.tar.bz2 3245 BLAKE2B 3bf3d0e314cc3f96d5d9675de196a62c4c8a72645d56ef94b80768571c99cba5cc556442e3bd2dfa8818460fd851fe7bd1ae15999af7225fb271b81c43105843 SHA512 2883441a2001bf7ce89a7f0862f780b71cc0164c8fcb8dbdf7040e1bcbcf408d138d3d77f308aa54c762e9975fa5ec89cfceeabbf721344dfc938870a363667a diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml index 4f3a37faf97f..840594c92fb7 100644 --- a/app-editors/vim/metadata.xml +++ b/app-editors/vim/metadata.xml @@ -1,14 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>xxc3ncoredxx@gmail.com</email> + <name>Oskari Pirhonen</name> + </maintainer> <maintainer type="project"> <email>vim@gentoo.org</email> <name>Gentoo Vim Project</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <use> <flag name="crypt">Use <pkg>dev-libs/libsodium</pkg> for crypto support</flag> <flag name="cscope">Enable cscope interface</flag> - <flag name="ipv6">Enable IPv6 support in channel</flag> <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag> <flag name="terminal">Enable terminal emulation support</flag> <flag name="vim-pager">Install vimpager and vimmanpager links</flag> diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild b/app-editors/vim/vim-9.0.1503.ebuild index edd131772b0f..b589d64dbde0 100644 --- a/app-editors/vim/vim-8.2.0814-r100.ebuild +++ b/app-editors/vim/vim-9.0.1503.ebuild @@ -1,30 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby27 ruby30 ruby31" -inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs 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" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" -IUSE="X acl cscope debug gpm lua ipv6 minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" +SLOT="0" +IUSE="X acl crypt 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} ) @@ -36,12 +41,14 @@ RDEPEND=" >=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) acl? ( kernel_linux? ( sys-apps/acl ) ) + crypt? ( dev-libs/libsodium:= ) 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} ) + ~app-editors/vim-core-${PV} + !<app-editors/vim-core-8.2.4328-r1 vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) @@ -52,33 +59,41 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " - -DEPEND=" - ${RDEPEND} - sys-devel/autoconf +DEPEND="${RDEPEND}" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " -# configure runs the Lua interpreter -BDEPEND="lua? ( ${LUA_DEPS} )" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898452): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. + # 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 + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -93,7 +108,7 @@ src_prepare() { # 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i -e \ 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ @@ -102,19 +117,12 @@ src_prepare() { "${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" + echo >> "$c" || die "echo failed" done # conditionally make the manpager.sh script @@ -139,18 +147,19 @@ src_prepare() { 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 + # 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" } 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 + # 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 @@ -158,23 +167,17 @@ src_configure() { # 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. + # 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 + addwrite ${file} fi done + local myconf=() if use minimal; then myconf=( --with-features=tiny @@ -200,6 +203,7 @@ src_configure() { --with-features=huge $(use_enable sound canberra) $(use_enable acl) + $(use_enable crypt libsodium) $(use_enable cscope) $(use_enable gpm) $(use_enable nls) @@ -221,6 +225,10 @@ src_configure() { fi if use lua; then + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + myconf+=( --enable-luainterp $(use_with lua_single_target_luajit luajit) @@ -228,12 +236,6 @@ src_configure() { ) fi - if ! use ipv6; then - myconf+=( - vim_cv_ipv6_networking=no - ) - fi - # don't test USE=X here ... see bug #19115 # but need to provide a way to link against X ... see bug #20093 myconf+=( @@ -249,6 +251,14 @@ src_configure() { # keep prefix env contained within the EPREFIX use prefix && myconf+=( --without-local-dir ) + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + econf \ --with-modified-by=Gentoo-${PVR} \ "${myconf[@]}" @@ -274,13 +284,39 @@ src_test() { # Don't let vim talk to X unset DISPLAY + # Arch and opensuse seem to do this and at this point, I'm willing + # to try anything to avoid random test hangs! + export TERM=xterm + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # Looks in wrong location? (bug #742710) + # - Test_job_tty_in_out + # Fragile and depends on TERM(?) + # - Test_spelldump_bang + # Hangs. + # - Test_fuzzy_completion_env + # Too sensitive to leaked environment variables. + # - Test_term_mouse_multiple_clicks_to_select_mode + # Hangs. + # - Test_spelldump + # Hangs. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' + emake -j1 -C src/testdir nongui } # Call eselect vi update with --if-unset -# to respect user's choice (bug 187449) +# to respect user's choice (bug #187449) eselect_vi_update() { - einfo "Calling eselect vi update..." + ebegin "Calling eselect vi update" eselect vi update --if-unset eend $? } diff --git a/app-editors/vim/vim-8.2.3428-r1.ebuild b/app-editors/vim/vim-9.0.1627.ebuild index d15fa2f9dcc8..be5a1d92a8f8 100644 --- a/app-editors/vim/vim-8.2.3428-r1.ebuild +++ b/app-editors/vim/vim-9.0.1627.ebuild @@ -1,29 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby27 ruby30 ruby31" -inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs 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" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) @@ -42,7 +47,7 @@ RDEPEND=" lua? ( ${LUA_DEPS} $(lua_gen_impl_dep 'deprecated' lua5-1) ) - !minimal? ( ~app-editors/vim-core-${PV} ) + ~app-editors/vim-core-${PV} vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) @@ -53,33 +58,41 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " - -DEPEND=" - ${RDEPEND} - sys-devel/autoconf +DEPEND="${RDEPEND}" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " -# configure runs the Lua interpreter -BDEPEND="lua? ( ${LUA_DEPS} )" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898452): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. + # 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 + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -94,7 +107,7 @@ src_prepare() { # 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i -e \ 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ @@ -103,19 +116,12 @@ src_prepare() { "${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" + echo >> "$c" || die "echo failed" done # conditionally make the manpager.sh script @@ -140,18 +146,19 @@ src_prepare() { 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 + # 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" } 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 + # 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 @@ -159,23 +166,17 @@ src_configure() { # 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. + # 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 + addwrite ${file} fi done + local myconf=() if use minimal; then myconf=( --with-features=tiny @@ -223,6 +224,10 @@ src_configure() { fi if use lua; then + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + myconf+=( --enable-luainterp $(use_with lua_single_target_luajit luajit) @@ -245,6 +250,14 @@ src_configure() { # keep prefix env contained within the EPREFIX use prefix && myconf+=( --without-local-dir ) + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + econf \ --with-modified-by=Gentoo-${PVR} \ "${myconf[@]}" @@ -270,13 +283,39 @@ src_test() { # Don't let vim talk to X unset DISPLAY + # Arch and opensuse seem to do this and at this point, I'm willing + # to try anything to avoid random test hangs! + export TERM=xterm + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # Looks in wrong location? (bug #742710) + # - Test_job_tty_in_out + # Fragile and depends on TERM(?) + # - Test_spelldump_bang + # Hangs. + # - Test_fuzzy_completion_env + # Too sensitive to leaked environment variables. + # - Test_term_mouse_multiple_clicks_to_select_mode + # Hangs. + # - Test_spelldump + # Hangs. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' + emake -j1 -C src/testdir nongui } # Call eselect vi update with --if-unset -# to respect user's choice (bug 187449) +# to respect user's choice (bug #187449) eselect_vi_update() { - einfo "Calling eselect vi update..." + ebegin "Calling eselect vi update" eselect vi update --if-unset eend $? } diff --git a/app-editors/vim/vim-9.0.1678.ebuild b/app-editors/vim/vim-9.0.1678.ebuild new file mode 100644 index 000000000000..f23090161473 --- /dev/null +++ b/app-editors/vim/vim-9.0.1678.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby27 ruby30 ruby31" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs 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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="X acl crypt 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 ) ) + crypt? ( dev-libs/libsodium:= ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + ~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}" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898452): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # 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' + + # 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" + + # 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" +} + +src_configure() { + + # 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 + + 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 + + local myconf=() + 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 crypt libsodium) + $(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 + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + + 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 ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ + "${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 + + # Arch and opensuse seem to do this and at this point, I'm willing + # to try anything to avoid random test hangs! + export TERM=xterm + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # Looks in wrong location? (bug #742710) + # - Test_job_tty_in_out + # Fragile and depends on TERM(?) + # - Test_spelldump_bang + # Hangs. + # - Test_fuzzy_completion_env + # Too sensitive to leaked environment variables. + # - Test_term_mouse_multiple_clicks_to_select_mode + # Hangs. + # - Test_spelldump + # Hangs. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug #187449) +eselect_vi_update() { + ebegin "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-9.0.1777.ebuild b/app-editors/vim/vim-9.0.1777.ebuild new file mode 100644 index 000000000000..c50f55589810 --- /dev/null +++ b/app-editors/vim/vim-9.0.1777.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby27 ruby30 ruby31" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs 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://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="X acl crypt 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 ) ) + crypt? ( dev-libs/libsodium:= ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + ~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}" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898452): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # 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' + + # 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" + + # 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" +} + +src_configure() { + + # 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 + + 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 + + local myconf=() + 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 crypt libsodium) + $(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 + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + + 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 ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ + "${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 + + # Arch and opensuse seem to do this and at this point, I'm willing + # to try anything to avoid random test hangs! + export TERM=xterm + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # Looks in wrong location? (bug #742710) + # - Test_job_tty_in_out + # Fragile and depends on TERM(?) + # - Test_spelldump_bang + # Hangs. + # - Test_fuzzy_completion_env + # Too sensitive to leaked environment variables. + # - Test_term_mouse_multiple_clicks_to_select_mode + # Hangs. + # - Test_spelldump + # Hangs. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug #187449) +eselect_vi_update() { + ebegin "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-9.0.2092.ebuild b/app-editors/vim/vim-9.0.2092.ebuild new file mode 100644 index 000000000000..1b1136741494 --- /dev/null +++ b/app-editors/vim/vim-9.0.2092.ebuild @@ -0,0 +1,370 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.2092" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby27 ruby30 ruby31" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs 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://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="X acl crypt 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 ) ) + crypt? ( dev-libs/libsodium:= ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + ~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}" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898452): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # 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' + + # 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" + + # 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" +} + +src_configure() { + + # 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 + + 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 + + local myconf=() + 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 crypt libsodium) + $(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 + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + + 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 ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ + "${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 + + # Arch and opensuse seem to do this and at this point, I'm willing + # to try anything to avoid random test hangs! + export TERM=xterm + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # Looks in wrong location? (bug #742710) + # - Test_job_tty_in_out + # Fragile and depends on TERM(?) + # - Test_spelldump_bang + # Hangs. + # - Test_fuzzy_completion_env + # Too sensitive to leaked environment variables. + # - Test_term_mouse_multiple_clicks_to_select_mode + # Hangs. + # - Test_spelldump + # Hangs. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug #187449) +eselect_vi_update() { + ebegin "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-9.0.2167.ebuild b/app-editors/vim/vim-9.0.2167.ebuild new file mode 100644 index 000000000000..d55e2ca5e177 --- /dev/null +++ b/app-editors/vim/vim-9.0.2167.ebuild @@ -0,0 +1,377 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.2092" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby31 ruby32" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs 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://git.sr.ht/~xxc3nsoredxx/vim-patches/refs/download/vim-${VIM_PATCHES_VERSION}-patches/vim-${VIM_PATCHES_VERSION}-patches.tar.xz" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="X acl crypt 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 ) ) + crypt? ( dev-libs/libsodium:= ) + cscope? ( dev-util/cscope ) + gpm? ( >=sys-libs/gpm-1.19.3 ) + lua? ( ${LUA_DEPS} + $(lua_gen_impl_dep 'deprecated' lua5-1) + ) + ~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} + X? ( x11-base/xorg-proto ) +" +# configure runs the Lua interpreter +BDEPEND=" + dev-build/autoconf + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898452): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # 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' + + # 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" + + # 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" + + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi +} + +src_configure() { + + # 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 + + 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 + + local myconf=() + 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 crypt libsodium) + $(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 + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + + 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 ) + + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + + econf \ + --with-modified-by="Gentoo-${PVR} (RIP Bram)" \ + "${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 + + # Arch and opensuse seem to do this and at this point, I'm willing + # to try anything to avoid random test hangs! + export TERM=xterm + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # Looks in wrong location? (bug #742710) + # - Test_job_tty_in_out + # Fragile and depends on TERM(?) + # - Test_spelldump_bang + # Hangs. + # - Test_fuzzy_completion_env + # Too sensitive to leaked environment variables. + # - Test_term_mouse_multiple_clicks_to_select_mode + # Hangs. + # - Test_spelldump + # Hangs. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug #187449) +eselect_vi_update() { + ebegin "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-9999.ebuild b/app-editors/vim/vim-9999.ebuild index d15fa2f9dcc8..850c5dab10c6 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -1,29 +1,34 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -VIM_VERSION="8.2" -LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{7..10} ) +EAPI=8 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="9.0" +VIM_PATCHES_VERSION="9.0.1000" + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby27 ruby30 ruby31" -inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single toolchain-funcs 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" + https://gitweb.gentoo.org/proj/vim-patches.git/snapshot/vim-patches-vim-${VIM_PATCHES_VERSION}-patches.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" fi DESCRIPTION="Vim, an improved vi-style text editor" -HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" +HOMEPAGE="https://www.vim.org https://github.com/vim/vim" -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) @@ -42,7 +47,7 @@ RDEPEND=" lua? ( ${LUA_DEPS} $(lua_gen_impl_dep 'deprecated' lua5-1) ) - !minimal? ( ~app-editors/vim-core-${PV} ) + ~app-editors/vim-core-${PV} vim-pager? ( app-editors/vim-core[-minimal] ) perl? ( dev-lang/perl:= ) python? ( ${PYTHON_DEPS} ) @@ -53,33 +58,43 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " - -DEPEND=" - ${RDEPEND} - sys-devel/autoconf - nls? ( sys-devel/gettext ) +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) " # configure runs the Lua interpreter -BDEPEND="lua? ( ${LUA_DEPS} )" +BDEPEND=" + dev-build/autoconf + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + PATCHES=( + "${WORKDIR}/vim-patches-vim-${VIM_PATCHES_VERSION}-patches" + ) +fi + +# platform-specific checks (bug #898452): +# - acl() -- Solaris +# - statacl() -- AIX +QA_CONFIG_IMPL_DECL_SKIP=( + 'acl' + 'statacl' +) pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. + # 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 + default # Fixup a script to use awk instead of nawk sed -i -e \ @@ -94,7 +109,7 @@ src_prepare() { # 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) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i -e \ 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ @@ -103,19 +118,12 @@ src_prepare() { "${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" + echo >> "$c" || die "echo failed" done # conditionally make the manpager.sh script @@ -140,18 +148,24 @@ src_prepare() { 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' + # 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" - eapply_user + # bug 908961 + if use elibc_musl ; then + sed -i -e '/ja.sjis/d' src/po/Make_all.mak || die + fi } 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 + # 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 @@ -159,23 +173,17 @@ src_configure() { # 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. + # 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 + addwrite ${file} fi done + local myconf=() if use minimal; then myconf=( --with-features=tiny @@ -223,6 +231,10 @@ src_configure() { fi if use lua; then + # -DLUA_COMPAT_OPENLIB=1 is required to enable the + # deprecated (in 5.1) luaL_openlib API (#874690) + use lua_single_target_lua5-1 && append-cppflags -DLUA_COMPAT_OPENLIB=1 + myconf+=( --enable-luainterp $(use_with lua_single_target_luajit luajit) @@ -245,6 +257,14 @@ src_configure() { # keep prefix env contained within the EPREFIX use prefix && myconf+=( --without-local-dir ) + if tc-is-cross-compiler ; then + export vim_cv_getcwd_broken=no \ + vim_cv_memmove_handles_overlap=yes \ + vim_cv_stat_ignores_slash=yes \ + vim_cv_terminfo=yes \ + vim_cv_toupper_broken=no + fi + econf \ --with-modified-by=Gentoo-${PVR} \ "${myconf[@]}" @@ -270,13 +290,39 @@ src_test() { # Don't let vim talk to X unset DISPLAY + # Arch and opensuse seem to do this and at this point, I'm willing + # to try anything to avoid random test hangs! + export TERM=xterm + + # See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5 + # for more information on test variables we can use. + # Note that certain variables need vim-compatible regex (not PCRE), see e.g. + # http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml. + # + # Skipped tests: + # - Test_expand_star_star + # Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680) + # - Test_exrc + # Looks in wrong location? (bug #742710) + # - Test_job_tty_in_out + # Fragile and depends on TERM(?) + # - Test_spelldump_bang + # Hangs. + # - Test_fuzzy_completion_env + # Too sensitive to leaked environment variables. + # - Test_term_mouse_multiple_clicks_to_select_mode + # Hangs. + # - Test_spelldump + # Hangs. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\|Test_spelldump\)' + emake -j1 -C src/testdir nongui } # Call eselect vi update with --if-unset -# to respect user's choice (bug 187449) +# to respect user's choice (bug #187449) eselect_vi_update() { - einfo "Calling eselect vi update..." + ebegin "Calling eselect vi update" eselect vi update --if-unset eend $? } diff --git a/app-editors/vis/Manifest b/app-editors/vis/Manifest index b6d7a71c35d4..1d57d4db3820 100644 --- a/app-editors/vis/Manifest +++ b/app-editors/vis/Manifest @@ -1,4 +1,2 @@ -DIST vis-0.5.tar.gz 390461 BLAKE2B e628891c48dbbd11ed706768a3c625ffe9edf4fea3cd77452b4b41ae0d50194a31647e4cc945b69fb3af8fe7fd76ebf5f7afd8c2baa356f5f9fd3cc04be129ca SHA512 fe6b0394006562177efdf06713d7b95cd12fabf90b171c262eb2620d2b0944e73d3d8bb61f4f0d43d32154f0490c338bbc161a89455b14bb8a9d22cd75097780 -DIST vis-0.7.tar.gz 403918 BLAKE2B 5e4930fdb14ed42a2daf6682a99107ee6eb59e99e348abab5262bdbc53956dd9ccd094695d7f53c6770d10e46b2812b0e07ff90184ff920790f5b95f4091a610 SHA512 ccc6a054fea6917e7751882468a74c30c712f7ec400a913c95c0084691f706e2bee54efb86b75be8b121c9a209c7e587e72e5474c55271d9943e91fc8aaf9bac -DIST vis-test-0.3.tar.gz 97814 BLAKE2B f62b216df3d846bb8bfdb14f6092309b55f6571cbc980e7a9aed46b1672fbaa65c007ac4617266dff3d5ad0293e3f5e7bd8390252817ebcdd6f64edb350f82ee SHA512 5f68a70cf6f1fb64f9b50c1a56940c966f205e51240c7dd1175bc15f3e42b475fb6842a53e36547113955c2efa359de0cc71e0800305b0e45881c319a14564e5 +DIST vis-0.8.tar.gz 404496 BLAKE2B eafb7098a6c8e0d8f277be66984d5fd298ac86d524a4219a7d7730599157ca68c040615622cd1680b101e1cd003eba03343496762d0d4dc2766a079116f21eea SHA512 ab4eda075034955411bdbc0ade2fe9149a48c644fa2f70add8d3b9d749f86b98a4e429745b5cae7fdbc0a1e07c8587539a055cd1c6734bb59e43c580c949e0aa DIST vis-test-0.5.tar.gz 99314 BLAKE2B 988d7e93d0f3c58d2fc8fbe9293049c6a3cc44dfcbfbd4f42f7992815cf33a604340b59171dcd880f7180ae56e3f73f46684b7aacd96438480db6c4592851f2c SHA512 c41b40f23a45a7ebd9c16aa853d9c3b517767cb88ff8dc268da44276a02aa8c77de0fc6aa243a1e4cdfbc27182870b82d0b9bc892bb87ea74d5275d76c554ed1 diff --git a/app-editors/vis/metadata.xml b/app-editors/vis/metadata.xml index 07e6ce2a8cbd..9bc3451307bd 100644 --- a/app-editors/vis/metadata.xml +++ b/app-editors/vis/metadata.xml @@ -14,4 +14,7 @@ Vis aims to be a modern, legacy free, simple yet efficient editor combining the <use> <flag name="tre">more memory efficient regex search using <pkg>dev-libs/tre</pkg></flag> </use> +<upstream> + <remote-id type="github">martanne/vis</remote-id> +</upstream> </pkgmetadata> diff --git a/app-editors/vis/vis-0.5.ebuild b/app-editors/vis/vis-0.5.ebuild deleted file mode 100644 index e7cf08742d4e..000000000000 --- a/app-editors/vis/vis-0.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PTV=0.3 - -DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" -HOMEPAGE="https://github.com/martanne/vis" -SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/vis-v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz -> vis-test-${MY_PTV}.tar.gz )" -LICENSE="ISC" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="+ncurses selinux test tre" -RESTRICT="!test? ( test )" - -#Note: vis is reported to also work with NetBSD curses -#TODO: >=dev-lang/lua-5.2 (needed for syntax highlighting and settings) -DEPEND="dev-libs/libtermkey - ncurses? ( sys-libs/ncurses:0= ) - tre? ( dev-libs/tre:= )" -RDEPEND="${DEPEND} - app-eselect/eselect-vi" - -S="${WORKDIR}/vis-v${PV}" - -src_prepare() { - if use test; then - rm -r test || die - mv "${WORKDIR}/vis-test-${MY_PTV}" test || die - if ! type -P vim &>/dev/null; then - sed -i 's/.*vim.*//' test/Makefile || die - fi - - # https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22 - sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die - fi - - sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die - sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die - sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die - - default -} - -src_configure() { - export CFLAGS="$CFLAGS -fcommon" # https://github.com/martanne/vis-test/issues/21 - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable ncurses curses) \ - $(use_enable selinux) \ - $(use_enable tre) || die -} - -update_symlinks() { - einfo "Calling eselect vi update --if-unset" - eselect vi update --if-unset -} - -pkg_postrm() { - update_symlinks -} - -pkg_postinst() { - update_symlinks -} diff --git a/app-editors/vis/vis-0.7.ebuild b/app-editors/vis/vis-0.8-r1.ebuild index ae3e241b5b45..4d51439d30ad 100644 --- a/app-editors/vis/vis-0.7.ebuild +++ b/app-editors/vis/vis-0.8-r1.ebuild @@ -1,33 +1,47 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PTV=0.5 -LUA_COMPAT=( lua5-2 lua5-3 ) +LUA_COMPAT=( lua5-2 lua5-3 lua5-4 ) -inherit lua-single optfeature +inherit lua-single + +if [ "${PV}" == "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/martanne/vis.git" +else + SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz + test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )" + KEYWORDS="amd64 arm ~arm64 ~riscv x86" +fi DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" HOMEPAGE="https://github.com/martanne/vis" -SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz - test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )" -LICENSE="ISC" +LICENSE="ISC MIT" SLOT="0" -KEYWORDS="amd64 arm x86" IUSE="+ncurses +lua selinux test tre" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" RESTRICT="!test? ( test )" # - Known to also work with NetBSD curses DEPEND="dev-libs/libtermkey + sys-apps/acl ncurses? ( sys-libs/ncurses:0= ) lua? ( ${LUA_DEPS} ) - tre? ( dev-libs/tre:= )" + tre? ( dev-libs/tre )" RDEPEND="${DEPEND} - app-eselect/eselect-vi" -# https://github.com/martanne/vis-test/issues/28 -BDEPEND="test? ( $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') )" + app-eselect/eselect-vi + lua? ( + $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') + ) +" +# lpeg: https://github.com/martanne/vis-test/issues/28 +BDEPEND="test? ( + $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') +)" pkg_setup() { use lua && lua-single_pkg_setup @@ -35,12 +49,17 @@ pkg_setup() { src_prepare() { if use test; then - rm -r test || die - mv "${WORKDIR}/vis-test-${MY_PTV}" test || die + if [ ! "${PV}" == "9999" ]; then + rm -r test || die + mv "${WORKDIR}/vis-test-${MY_PTV}" test || die + fi # https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22 sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die + # https://github.com/martanne/vis-test/pull/29 + sed -i 's;cpp -P;${CPP:-cpp} -P;' test/vim/test.sh || die + # https://github.com/martanne/vis-test/issues/27 a Werror clone sed -i 's;|| strstr(output, "warning");;' test/core/ccan-config.c || die fi @@ -56,6 +75,7 @@ src_configure() { ./configure \ --prefix="${EPREFIX}"/usr \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --disable-lpeg-static \ $(use_enable lua) \ $(use_enable ncurses curses) \ $(use_enable selinux) \ @@ -73,5 +93,4 @@ pkg_postrm() { pkg_postinst() { update_symlinks - optfeature "syntax highlighting support" dev-lua/lpeg } diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild index 9f919a60fc33..09bd443398c8 100644 --- a/app-editors/vis/vis-9999.ebuild +++ b/app-editors/vis/vis-9999.ebuild @@ -1,36 +1,69 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -LUA_COMPAT=( lua5-2 lua5-3 ) +EAPI=8 -inherit lua-single git-r3 optfeature +MY_PTV=0.5 +LUA_COMPAT=( lua5-2 lua5-3 lua5-4 ) + +inherit lua-single + +if [ "${PV}" == "9999" ]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/martanne/vis.git" +else + SRC_URI="https://github.com/martanne/vis/releases/download/v${PV}/${P}.tar.gz + test? ( https://github.com/martanne/vis-test/releases/download/v${MY_PTV}/vis-test-${MY_PTV}.tar.gz )" + KEYWORDS="~amd64 ~arm ~riscv ~x86" +fi DESCRIPTION="modern, legacy free, simple yet efficient vim-like editor" HOMEPAGE="https://github.com/martanne/vis" -EGIT_REPO_URI="https://github.com/martanne/vis.git" -LICENSE="ISC" +LICENSE="ISC MIT" SLOT="0" -KEYWORDS="" IUSE="+ncurses +lua selinux test tre" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" RESTRICT="!test? ( test )" # - Known to also work with NetBSD curses DEPEND="dev-libs/libtermkey + sys-apps/acl ncurses? ( sys-libs/ncurses:0= ) lua? ( ${LUA_DEPS} ) - tre? ( dev-libs/tre:= )" + tre? ( dev-libs/tre )" RDEPEND="${DEPEND} - app-eselect/eselect-vi" -# https://github.com/martanne/vis-test/issues/28 -BDEPEND="test? ( $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') )" + app-eselect/eselect-vi + lua? ( + $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') + ) +" +# lpeg: https://github.com/martanne/vis-test/issues/28 +BDEPEND="test? ( + $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') + $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') +)" pkg_setup() { use lua && lua-single_pkg_setup } src_prepare() { + if use test; then + if [ ! "${PV}" == "9999" ]; then + rm -r test || die + mv "${WORKDIR}/vis-test-${MY_PTV}" test || die + fi + + # https://bugs.gentoo.org/722014 https://github.com/martanne/vis-test/pull/22 + sed -i 's;./ccan-config > config.h;./ccan-config "${CC}" ${CFLAGS} > config.h;' test/core/Makefile || die + + # https://github.com/martanne/vis-test/pull/29 + sed -i 's;cpp -P;${CPP:-cpp} -P;' test/vim/test.sh || die + + # https://github.com/martanne/vis-test/issues/27 a Werror clone + sed -i 's;|| strstr(output, "warning");;' test/core/ccan-config.c || die + fi + sed -i 's|STRIP?=.*|STRIP=true|' Makefile || die sed -i 's|${DOCPREFIX}/vis|${DOCPREFIX}|' Makefile || die sed -i 's|DOCUMENTATION = LICENSE|DOCUMENTATION =|' Makefile || die @@ -42,6 +75,7 @@ src_configure() { ./configure \ --prefix="${EPREFIX}"/usr \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --disable-lpeg-static \ $(use_enable lua) \ $(use_enable ncurses curses) \ $(use_enable selinux) \ @@ -59,5 +93,4 @@ pkg_postrm() { pkg_postinst() { update_symlinks - optfeature "syntax highlighting support" dev-lua/lpeg } diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest index 1cebfe418295..f7c8381acc28 100644 --- a/app-editors/vscode/Manifest +++ b/app-editors/vscode/Manifest @@ -1,9 +1,3 @@ -DIST vscode-1.58.2-amd64.tar.gz 105591644 BLAKE2B bc130bfeab48f60f4149aa9d44aebbfba121cb629f1295acb23361a06e5071ddb2dc147c7d161b67f57d45fdb1337784a85bb4f08c6f82a48675c35be0037047 SHA512 00e4012d133e8755b13b1b0136078db872b7f202c59663ea46b137451338ca77f8020cc7fffa807ba5e5963105f0ce8ea0d2a0f29702078a64ace5743da6c83e -DIST vscode-1.58.2-arm.tar.gz 96167069 BLAKE2B 1c19cf29c9419663216e3ccf521314e0102efcd18a69b0e3668259f8172a377300f1ca900e2d0cda325619a855fdcd6def5db34ebab0e6f79bc0ffd1cb2eb609 SHA512 32c4011c0a10827b73388b469246c179fc3aa06e883c1264f215cd96695821945401b4d0bfc7cf324768977eeb0c785ab4948fdb50899b26b9ca469087ab3b45 -DIST vscode-1.58.2-arm64.tar.gz 110942132 BLAKE2B 3fb2a83087789690ba930ae0910b931f8f2ed129049e536d172bd67be6d928afb2e17ba09756c1dd3f9c145354fa8eface31928f419f74df165bb0c60588dc57 SHA512 f1ae69955251b6e8e92eebf01edfd820cdbf06c887349ba1cb6db2ff8aee170183029a0f2b5075b8a07ed9a26e982b87d63fe0fe4a193fa71ff5ebb52fdf1221 -DIST vscode-1.59.1-amd64.tar.gz 106142213 BLAKE2B eed73d0e98ea0275ed005586f18e14b3671a4dea301f44f469798bae3c298d8eb7e819c896957f9a1cd3e978ce171ff9d3a7433ede540b0647cae735b2d53bcd SHA512 c7ae7417bd233498b6be0dbcbc67ee44283a14938bfecb3b61d224533a4edf31c291bebdb90e87d769cb52afb9ac17f2fb20ba64dab7773d1ce965aa9d7bfae6 -DIST vscode-1.59.1-arm.tar.gz 97705768 BLAKE2B daf2b56ecbf45b57d6b147e4b839000621e367caac66189151b9021ade6901941a8d641291a132d1c1bbdf40bb411bc65d8663743307e896670cfaf24d335feb SHA512 ade1499986a4cefad933cbcf9a073230e74b1a554248e41f1b58480d53b68f6ed0fa0e8faa6f52e59eebc94dcc5127bdbedf77deeab0b108ec7832c71cfd3f6f -DIST vscode-1.59.1-arm64.tar.gz 111284699 BLAKE2B c349c47208a6caf868070f9bb5bb6b23ff6eaa11de8d754edf8bec8fdd6fdd81c0ff246829a7ef4a92697ecb6356b779456aa8c1781f50ca4c7891297788aa43 SHA512 27b8aeac5ed2bac8bc6dc502ca39cac94f7e8ea4ea6baedffaa3b44dea451738e798674976444268db5543b6a144d55cadd47ded755a66c484c4c05cd5d20ad8 -DIST vscode-1.60.2-amd64.tar.gz 105537736 BLAKE2B 395cbea3c7522749423d8b79d7461189dbb04b1d751bb4a70b6ce7782e971c1dac0e51cda91e961cab0fceeef16e073803d2f54bd6d8840596a2ea45f9f34369 SHA512 caf8acea129533a6cb5824d5ed97f9e9f740dcdc67c3a0c3cf778d58a8fddebe870892d25ad74116c5311a53497db933ff70e5e250480c3a0d76e5fc62733b02 -DIST vscode-1.60.2-arm.tar.gz 94232609 BLAKE2B eb896cc316dfc96d6d523d15da735b18eb6e6011d7ec92b5f9fa8732f574097579c8af4601312c831a9f4aa752087188e203b761e86df31b688838b45354deb1 SHA512 8261b71740344f927091dadd28bcb06d17b70551da0fd0b3c20378ec744cc31660ae32aadedd87a8942c410da381dbf7e023c27af913a62a1bba774d6de241ea -DIST vscode-1.60.2-arm64.tar.gz 107827801 BLAKE2B aff930e81534972f2dc3d7d0d5cc489ec77818c0304859d64838317fbaf9225f4325a8b237268569f88eca7c76ea7a73275d90747b4485eff30d5f59a9cdd977 SHA512 cc50c7ec44d546b227c271f621be87120a1c36c2ed8236421e9c7227c1cb83bf970d5673191afc1383c4479393b5fae873fd6829179d1d9139b6c3ec32c5c1fd +DIST vscode-1.88.1-amd64.tar.gz 142835966 BLAKE2B f78ed2a0a68d9c632ac1b8c811647696da2f9d86d1c171fdc1a0ea75f77872bb5e9a860020a49c0e3a3cfcafd85f9cf9da3300326b1e08077bc6f1eeb1c53f64 SHA512 5730981a13d72a317c180b566ec0d3408e75bb80eb37dd7de58e2beb4492ab59df9009cff92b3ac1cb4283f66868d793bdffc0689248fb3630e9cf55bfcc7bab +DIST vscode-1.88.1-arm.tar.gz 128139341 BLAKE2B 36da83b891554c2e4090e70635f7c241e20dd5be0beddcf15df32563ef47e20e5de3f4cef874b2b0ebf49702582cb604e7a4e2355d5a46ecc8f934de42b49c1e SHA512 79e181b0c8603c06605eaa1901527bb5da593c40ce2a830b36f80911648736125c5f12ec98fe9ca61edeea051f5ab8cd172983a0228800b32a718ef4a00ef089 +DIST vscode-1.88.1-arm64.tar.gz 139073832 BLAKE2B 884231acc011963151ca6121243c459415b261158ee01056cbc7316f4ac7f05fe65583500d6f2cc9967975fd5ff063b02c2b7bd85aa2e2614d844f72385cb672 SHA512 af02536c815e78c12ffeb5f472e63f7390cb619e772256d00cf130898fb836a853fe9fd6362540d1dd1384949e13ca261a98da6abdf8781e62e981ab47847eaf diff --git a/app-editors/vscode/files/vscode-url-handler.desktop b/app-editors/vscode/files/code-url-handler.desktop index 73e3834801b4..fe65d7527069 100644 --- a/app-editors/vscode/files/vscode-url-handler.desktop +++ b/app-editors/vscode/files/code-url-handler.desktop @@ -2,7 +2,7 @@ Name=VSCode - URL Handler Comment=Editing evolved GenericName=Code Editor -Exec=/usr/bin/vscode --open-url %U +Exec=/usr/bin/vscode @exec_extra_flags@ --open-url %U Icon=vscode Type=Application NoDisplay=true diff --git a/app-editors/vscode/files/vscode.desktop b/app-editors/vscode/files/code.desktop index d648416a26ca..ec697eca68b6 100644 --- a/app-editors/vscode/files/vscode.desktop +++ b/app-editors/vscode/files/code.desktop @@ -2,7 +2,7 @@ Name=VSCode Comment=Editing evolved GenericName=Code Editor -Exec=/usr/bin/vscode --unity-launch %F +Exec=/usr/bin/vscode @exec_extra_flags@ --unity-launch %F Icon=vscode Type=Application StartupNotify=false @@ -14,5 +14,5 @@ Keywords=vscode;code; [Desktop Action new-empty-window] Name=New Empty Window -Exec=/usr/bin/vscode --new-window %F +Exec=/usr/bin/vscode @exec_extra_flags@ --new-window %F Icon=vscode diff --git a/app-editors/vscode/files/vscode-url-handler-wayland.desktop b/app-editors/vscode/files/vscode-url-handler-wayland.desktop deleted file mode 100644 index a3214afa7d32..000000000000 --- a/app-editors/vscode/files/vscode-url-handler-wayland.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=VSCode - URL Handler -Comment=Editing evolved -GenericName=Code Editor -Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --open-url %U -Icon=vscode -Type=Application -NoDisplay=true -StartupNotify=true -Categories=Utility;TextEditor;Development;IDE; -MimeType=x-scheme-handler/vscode; -Keywords=vscode;code; diff --git a/app-editors/vscode/files/vscode-wayland.desktop b/app-editors/vscode/files/vscode-wayland.desktop deleted file mode 100644 index 1c12a97ffd01..000000000000 --- a/app-editors/vscode/files/vscode-wayland.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Name=VSCode Wayland -Comment=Editing evolved -GenericName=Code Editor -Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --unity-launch %F -Icon=vscode -Type=Application -StartupNotify=false -StartupWMClass=Code -Categories=Utility;TextEditor;Development;IDE; -MimeType=text/plain;inode/directory;application/x-code-workspace; -Actions=new-empty-window; -Keywords=vscode;code; - -[Desktop Action new-empty-window] -Name=New Empty Window -Exec=/usr/bin/vscode --enable-features=UseOzonePlatform --ozone-platform=wayland --new-window %F -Icon=vscode diff --git a/app-editors/vscode/metadata.xml b/app-editors/vscode/metadata.xml index 70a9316b5281..52921d6c9411 100644 --- a/app-editors/vscode/metadata.xml +++ b/app-editors/vscode/metadata.xml @@ -5,10 +5,18 @@ <email>adel.ks@zegrapher.com</email> <name>Adel KARA SLIMANE</name> </maintainer> + <maintainer type="person"> + <email>arthurzam@gentoo.org</email> + <name>Arthur Zamarin</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <use> + <flag name="egl">Use EGL platform, enables smooth rending in high refresh rate monitors on X11/Xwayland</flag> + <flag name="wayland">Run in wayland mode under wayland sessions, xwayland otherwise. This flag doesn't affect x11 sessions.</flag> + </use> <longdescription> Visual Studio Code is a lightweight but powerful source code editor which runs on your desktop and is available for Windows, macOS and Linux. It diff --git a/app-editors/vscode/vscode-1.58.2.ebuild b/app-editors/vscode/vscode-1.58.2.ebuild deleted file mode 100644 index 044c01c33002..000000000000 --- a/app-editors/vscode/vscode-1.58.2.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop pax-utils xdg - -DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" -HOMEPAGE="https://code.visualstudio.com" -SRC_URI=" - amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz ) - arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz ) - arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz ) -" -S="${WORKDIR}" - -RESTRICT="mirror strip bindist" - -LICENSE=" - Apache-2.0 - BSD - BSD-1 - BSD-2 - BSD-4 - CC-BY-4.0 - ISC - LGPL-2.1+ - Microsoft-vscode - MIT - MPL-2.0 - openssl - PYTHON - TextMate-bundle - Unlicense - UoI-NCSA - W3C -" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64" - -RDEPEND=" - app-accessibility/at-spi2-atk - app-crypt/libsecret[crypt] - dev-libs/nss - media-libs/alsa-lib - media-libs/libpng:0/16 - x11-libs/cairo - x11-libs/gtk+:3 - x11-libs/libnotify - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/pango -" - -QA_PREBUILT=" - /opt/vscode/code - /opt/vscode/libEGL.so - /opt/vscode/libffmpeg.so - /opt/vscode/libGLESv2.so - /opt/vscode/libvulkan.so* - /opt/vscode/chrome-sandbox - /opt/vscode/libvk_swiftshader.so - /opt/vscode/swiftshader/libEGL.so - /opt/vscode/swiftshader/libGLESv2.so - /opt/vscode/resources/app/extensions/* - /opt/vscode/resources/app/node_modules.asar.unpacked/* -" - -src_install() { - if use amd64; then - cd "${WORKDIR}/VSCode-linux-x64" || die - elif use arm; then - cd "${WORKDIR}/VSCode-linux-armhf" || die - elif use arm64; then - cd "${WORKDIR}/VSCode-linux-arm64" || die - else - die "Visual Studio Code only supports amd64, arm and arm64" - fi - - # Cleanup - rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die - - # Install - pax-mark m code - insinto "/opt/${PN}" - doins -r * - fperms +x /opt/${PN}/{,bin/}code - fperms +x /opt/${PN}/chrome-sandbox - fperms -R +x /opt/${PN}/resources/app/out/vs/base/node - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg - dosym "../../opt/${PN}/bin/code" "usr/bin/vscode" - domenu "${FILESDIR}/vscode.desktop" - domenu "${FILESDIR}/vscode-url-handler.desktop" - newicon "resources/app/resources/linux/code.png" "vscode.png" -} - -pkg_postinst() { - xdg_pkg_postinst - elog "You may want to install some additional utils, check in:" - elog "https://code.visualstudio.com/Docs/setup#_additional-tools" -} diff --git a/app-editors/vscode/vscode-1.59.1.ebuild b/app-editors/vscode/vscode-1.59.1.ebuild deleted file mode 100644 index 0004959b3c58..000000000000 --- a/app-editors/vscode/vscode-1.59.1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop pax-utils xdg - -DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" -HOMEPAGE="https://code.visualstudio.com" -SRC_URI=" - amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz ) - arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz ) - arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz ) -" -S="${WORKDIR}" - -RESTRICT="mirror strip bindist" - -LICENSE=" - Apache-2.0 - BSD - BSD-1 - BSD-2 - BSD-4 - CC-BY-4.0 - ISC - LGPL-2.1+ - Microsoft-vscode - MIT - MPL-2.0 - openssl - PYTHON - TextMate-bundle - Unlicense - UoI-NCSA - W3C -" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64" - -RDEPEND=" - app-accessibility/at-spi2-atk - app-crypt/libsecret[crypt] - dev-libs/nss - media-libs/alsa-lib - media-libs/libpng:0/16 - x11-libs/cairo - x11-libs/gtk+:3 - x11-libs/libnotify - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/pango -" - -QA_PREBUILT=" - /opt/vscode/code - /opt/vscode/libEGL.so - /opt/vscode/libffmpeg.so - /opt/vscode/libGLESv2.so - /opt/vscode/libvulkan.so* - /opt/vscode/chrome-sandbox - /opt/vscode/libvk_swiftshader.so - /opt/vscode/swiftshader/libEGL.so - /opt/vscode/swiftshader/libGLESv2.so - /opt/vscode/resources/app/extensions/* - /opt/vscode/resources/app/node_modules.asar.unpacked/* -" - -src_install() { - if use amd64; then - cd "${WORKDIR}/VSCode-linux-x64" || die - elif use arm; then - cd "${WORKDIR}/VSCode-linux-armhf" || die - elif use arm64; then - cd "${WORKDIR}/VSCode-linux-arm64" || die - else - die "Visual Studio Code only supports amd64, arm and arm64" - fi - - # Cleanup - rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die - - # Install - pax-mark m code - insinto "/opt/${PN}" - doins -r * - fperms +x /opt/${PN}/{,bin/}code - fperms 4711 /opt/${PN}/chrome-sandbox - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh - fperms -R +x /opt/${PN}/resources/app/out/vs/base/node - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg - dosym "../../opt/${PN}/bin/code" "usr/bin/vscode" - domenu "${FILESDIR}/vscode.desktop" - domenu "${FILESDIR}/vscode-url-handler.desktop" - newicon "resources/app/resources/linux/code.png" "vscode.png" -} - -pkg_postinst() { - xdg_pkg_postinst - elog "You may want to install some additional utils, check in:" - elog "https://code.visualstudio.com/Docs/setup#_additional-tools" -} diff --git a/app-editors/vscode/vscode-1.60.2.ebuild b/app-editors/vscode/vscode-1.88.1.ebuild index dbed711c205a..f803279f6a02 100644 --- a/app-editors/vscode/vscode-1.60.2.ebuild +++ b/app-editors/vscode/vscode-1.88.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit desktop pax-utils xdg +inherit desktop pax-utils xdg optfeature DESCRIPTION="Multiplatform Visual Studio Code from Microsoft" HOMEPAGE="https://code.visualstudio.com" @@ -14,8 +14,6 @@ SRC_URI=" " S="${WORKDIR}" -RESTRICT="mirror strip bindist" - LICENSE=" Apache-2.0 BSD @@ -36,22 +34,27 @@ LICENSE=" W3C " SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64" +KEYWORDS="-* amd64 ~arm ~arm64" +IUSE="egl kerberos wayland" +RESTRICT="mirror strip bindist" RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-accessibility/at-spi2-core:2 + >=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret[crypt] - dev-libs/atk + app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib + media-libs/libcanberra[gtk3] + media-libs/libglvnd media-libs/mesa + net-misc/curl sys-apps/dbus + sys-libs/zlib + sys-process/lsof x11-libs/cairo - x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 @@ -63,23 +66,13 @@ RDEPEND=" x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr - x11-libs/libxshmfence + x11-libs/libXScrnSaver x11-libs/pango + x11-misc/xdg-utils + kerberos? ( app-crypt/mit-krb5 ) " -QA_PREBUILT=" - /opt/vscode/code - /opt/vscode/libEGL.so - /opt/vscode/libffmpeg.so - /opt/vscode/libGLESv2.so - /opt/vscode/libvulkan.so* - /opt/vscode/chrome-sandbox - /opt/vscode/libvk_swiftshader.so - /opt/vscode/swiftshader/libEGL.so - /opt/vscode/swiftshader/libGLESv2.so - /opt/vscode/resources/app/extensions/* - /opt/vscode/resources/app/node_modules.asar.unpacked/* -" +QA_PREBUILT="*" src_install() { if use amd64; then @@ -93,29 +86,47 @@ src_install() { fi # Cleanup - rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die + rm -r ./resources/app/ThirdPartyNotices.txt || die + + # Disable update server + sed -e "/updateUrl/d" -i ./resources/app/product.json || die + + if ! use kerberos; then + rm -r ./resources/app/node_modules.asar.unpacked/kerberos || die + fi # Install pax-mark m code - insinto "/opt/${PN}" - doins -r * - fperms +x /opt/${PN}/{,bin/}code + mkdir -p "${ED}/opt/${PN}" || die + cp -r . "${ED}/opt/${PN}" || die fperms 4711 /opt/${PN}/chrome-sandbox - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh - fperms -R +x /opt/${PN}/resources/app/out/vs/base/node - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg - dosym "../../opt/${PN}/bin/code" "usr/bin/vscode" - dosym "../../opt/${PN}/bin/code" "usr/bin/code" - domenu "${FILESDIR}/vscode.desktop" - domenu "${FILESDIR}/vscode-url-handler.desktop" - domenu "${FILESDIR}/vscode-wayland.desktop" - domenu "${FILESDIR}/vscode-url-handler-wayland.desktop" + + dosym -r "/opt/${PN}/bin/code" "usr/bin/vscode" + dosym -r "/opt/${PN}/bin/code" "usr/bin/code" + + local EXEC_EXTRA_FLAGS=() + if use wayland; then + EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" "--enable-wayland-ime" ) + fi + if use egl; then + EXEC_EXTRA_FLAGS+=( "--use-gl=egl" ) + fi + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/code-url-handler.desktop" \ + > "${T}/code-url-handler.desktop" || die + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/code.desktop" \ + > "${T}/code.desktop" || die + + domenu "${T}/code.desktop" + domenu "${T}/code-url-handler.desktop" newicon "resources/app/resources/linux/code.png" "vscode.png" } pkg_postinst() { xdg_pkg_postinst - elog "You may want to install some additional utils, check in:" - elog "https://code.visualstudio.com/Docs/setup#_additional-tools" + optfeature "desktop notifications" x11-libs/libnotify + optfeature "keyring support inside vscode" "virtual/secret-service" } diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest index 665af0e4625e..5853d89ea0c6 100644 --- a/app-editors/vscodium/Manifest +++ b/app-editors/vscodium/Manifest @@ -1,9 +1,6 @@ -DIST vscodium-1.58.2-amd64.tar.gz 109733827 BLAKE2B 0ada13724f2d4255a9ce58d0fd47415f2f5b4adfed144dae884914888df1f9bb735472e378fc2d4dd74fd1168c3361ad4e945a48607aeb3e095658a7b3e0df2c SHA512 dd98dbd88e64e526f78624e2e42bd116a689174d801412f7750c895794b0658b20b9451d336d0837f4030c11ce35368fb3dd0ade078bac393ada813c912a9a8d -DIST vscodium-1.58.2-arm.tar.gz 98395232 BLAKE2B 74bb7a07f9d6a9f107cd74a1a593e7770d67d1f0b2e4b809dab420c8b17fe3902a05a26caf59e2474afdfd01a2d65b0889f2d4298cdf512cfa44df8321a8e65a SHA512 58a08f2a5be9c42410772b97d5456d75044454ace5de92e03ac5bd7ff2dcef284e1e747869752f548bb1237e248981e06a9f9a9b6be99f8e8a50cf52fe6dd2c4 -DIST vscodium-1.58.2-arm64.tar.gz 115052512 BLAKE2B d1047b34bf6132f47b7423e35a7cb92b98cbac782db1a086c068d0bd60fcc59c16852f18451ac860c8e8940fce08e6e7671fed3db3e19f7c80e34411865c7b5b SHA512 d34b53f9679006c30f2f422a8311a336eea778995fc8dc7cb0c24ecc02c88bbb2cd442f426fa88afd78f7175c16ce6c9f912eaa900d76fa25081824f91cabe0f -DIST vscodium-1.59.1-amd64.tar.gz 110191208 BLAKE2B e7cc44d690fb0f3c25e0ef39198784ac651bcdc13e84918d44fdfb99b48d918dae8a1c7b9129b482cbe34e98a26bd44d9eb47d5df5daf73fdcffae7b5482b506 SHA512 401df889b5dea5c045fccb3d93fa5f5bcfaeb162977e434498e7600f67efb877c64effac7371f29f51e297c713640df2cad1f4db9540797f7146608e4d8f530b -DIST vscodium-1.59.1-arm.tar.gz 100781835 BLAKE2B 36f463f93b03afc9a191aebaf96cc6eb9c43feb0274a167cca6a983d85381821e10c9cdcba3f384a09d431bb3c4b55fcdd248b9ce93614ac3ddf2129c80f6f87 SHA512 3df672daa85b838bc45a4cb4da3e9001a008ff66ce469f6b9f25d066bdbfaad951f4e8e392cde59fa90024d3977f707b2c5d1d079797803caa538ddc56133b73 -DIST vscodium-1.59.1-arm64.tar.gz 115349031 BLAKE2B 9762a344b490ea0278cbb36e0f27a5d62417b8b356b08c62bc1577a4c959f5c65997676a4c8555832bd62ec6af4c3ce253a1c277881cf0430e0af15d56071201 SHA512 b47c2718889cc6bacb79fd73e3e4090a94078768992ca0bb2be77030266d547ad8c8d884deaa7d3925e4c94e74ed3bda8a5fca678459dfd6e64c3d2a752ee9c0 -DIST vscodium-1.60.2-amd64.tar.gz 106735938 BLAKE2B e1441fb95829f23adcab06e4ed9b4baefca6ae377570e0759d7327533818ffbf2cc08c8d94b832d6de2e29564e5e26a0f59bb991c6b4ee40007807f2fffb2df7 SHA512 a4c7434cfc0db6dc3f866f8acf2c3f3265dc353d1592582bc3cb9acca76961a3bebf76f7e3487a9a98545b43f800c241a4f51e8cbd7512183450008656ba0f1b -DIST vscodium-1.60.2-arm.tar.gz 97317796 BLAKE2B eb0baee908ed059f16a4e3093e59b6823208fe0e627b1dfd1c9489a655c53735a1bd3d67970e50feef907dec3cc76252eff5e6509fcf5ab8c5255b52182f2cf8 SHA512 b5ed07a61ca468e32a08b27238c8b50b4b76a004dee7a47ca8c98051871c44ba2d9f29296d959f13b80edeeb1a88ec3624c61dee356b8d8727071098f500aea3 -DIST vscodium-1.60.2-arm64.tar.gz 111897534 BLAKE2B cf5ae8cd8e98342b0eccbf2fb1385c844f2f1d2fb27b964d455ddcf873ac0f545e5da55530bac11a99ee5e5d962e467a3c61f8848d8312142c6051da0b29db86 SHA512 b07554b8f5eb9865ee2086d68d65494368d2906634055d02e6fe843c8042ef093cd79eed31b5da87fd36a7a26324f37f79daafcbcd463c175a251b3345d9c1f1 +DIST vscodium-1.88.1.24102-amd64.tar.gz 129277427 BLAKE2B 5b1584a4b1707e4616515cf242d097a09b83fde6326d2d6ca43bf4f321b299d930e0d3744603ee1a1b6affa72aeecb7a231423116a631aa10b2660efc1f72638 SHA512 e30b983f11ed7567c4e3f21fa9d3574cb60675ac0c1a1b4764c4eea8baa40099d54377a398ad13972f77aab72880789deefbf9f559a8773c62be4fafe954ae48 +DIST vscodium-1.88.1.24102-arm.tar.gz 118175032 BLAKE2B e1d53eecbfed89f48cbc65674261bb76470dbcac2c4a4a2e5a554beae42643d9a3b4a629872d9f220db0ac0fe7115385ce56663ef86b2d25d940b5ec000c8c21 SHA512 52ea09c2d761860febc1aa7bbb5edc0c6b6a2b8225e49d1c863de774bb6600cecc90bcdad25489d9eb99d4e2cf94f638d4482d539631126603ef5ffa8af1548d +DIST vscodium-1.88.1.24102-arm64.tar.gz 128995378 BLAKE2B 1a44737c071687a8126789caae088230c593a39bd49d915fc5b65431a36ccb7685c2f0ddeab8cc7a090acb6264c2b7fac0d6b8fcd270f4ba2ddfd0e3f3c1e02d SHA512 7c9d4f2acf07474fff03d129a8c63a9e663cb0ad0dc9a88020ea04c616f0bbd50586d690e2f7b4ebce6e0dcb5fdae8d620ef566abb5af14e1f7d0b6cc30968b1 +DIST vscodium-1.88.1.24104-amd64.tar.gz 129280084 BLAKE2B 2d08d9008ef1c0f5890ddce171823cb6dd91b6b5cfdc4136783b8b97a50e7826e95b947b67bcdffb5900dea8718d20ccde6f46d73de295e48444790582ee7805 SHA512 0f7bfb93dabe29ae008d6bc8c571fa3fc7bc97b68eb5725a485dca283c019a7b9dd9ded5c55a9ce7e6ca58f48de1390a542068734acca1060b481cb1e3cb553c +DIST vscodium-1.88.1.24104-arm.tar.gz 118167766 BLAKE2B 3b992242adbb8271f7b647ebe2f36c3e3fb30539e69b921cbe981fe92c345f272b465123c4eb789e9e830b2517759deefa8d0bf0cd6ec75a72664a67c4499c53 SHA512 d8a63d8c78931937f487f35f3e4f56405b32d2813855c9752478639cb9abea374749cb22cad54bc5c395c6841032b4b42ce26b754161f91de9b1711ef1fdf1f1 +DIST vscodium-1.88.1.24104-arm64.tar.gz 128990828 BLAKE2B 4cc567c7c6923a171a133a3176a24855cf5162a35f7d4160812f403fc66367950ee5dad58c08ae3028038dec850af9f42ef542e8698e0bb38b9c45873b3bec74 SHA512 d1e59e057d8882878260630bbf8373445c7c2812068af501a4f883d521f6868866d78a87423f96e51273f8c3f76169dbc4ed408c4c9cf085768e74a0c2d9d092 diff --git a/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop b/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop deleted file mode 100644 index d853f3e5c908..000000000000 --- a/app-editors/vscodium/files/vscodium-url-handler-wayland.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Name=VSCodium Wayland - URL Handler -Comment=Editing evolved -GenericName=Code Editor -Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform --ozone-platform=wayland --open-url %U -Icon=vscodium -Type=Application -NoDisplay=true -StartupNotify=true -Categories=Utility;TextEditor;Development;IDE; -MimeType=x-scheme-handler/vscodium; -Keywords=vscode;vscodium;code;codium; diff --git a/app-editors/vscodium/files/vscodium-url-handler.desktop b/app-editors/vscodium/files/vscodium-url-handler.desktop index 48c7d3d369cb..0ca181bf7960 100644 --- a/app-editors/vscodium/files/vscodium-url-handler.desktop +++ b/app-editors/vscodium/files/vscodium-url-handler.desktop @@ -2,7 +2,7 @@ Name=VSCodium - URL Handler Comment=Editing evolved GenericName=Code Editor -Exec=/usr/bin/vscodium --open-url %U +Exec=/usr/bin/vscodium @exec_extra_flags@ --open-url %U Icon=vscodium Type=Application NoDisplay=true diff --git a/app-editors/vscodium/files/vscodium-wayland.desktop b/app-editors/vscodium/files/vscodium-wayland.desktop deleted file mode 100644 index 7719bf19ad74..000000000000 --- a/app-editors/vscodium/files/vscodium-wayland.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Name=VSCodium Wayland -Comment=Editing evolved -GenericName=Code Editor -Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform --ozone-platform=wayland --unity-launch %F -Icon=vscodium -Type=Application -StartupNotify=false -StartupWMClass=VSCodium -Categories=Utility;TextEditor;Development;IDE; -MimeType=text/plain;inode/directory;application/x-code-workspace; -Actions=new-empty-window; -Keywords=vscode;vscodium;code;codium; - -[Desktop Action new-empty-window] -Name=New Empty Window -Exec=/usr/bin/vscodium --enable-features=UseOzonePlatform --ozone-platform=wayland --new-window %F -Icon=vscodium diff --git a/app-editors/vscodium/files/vscodium.desktop b/app-editors/vscodium/files/vscodium.desktop index f3557c1adf7e..e12a430172ae 100644 --- a/app-editors/vscodium/files/vscodium.desktop +++ b/app-editors/vscodium/files/vscodium.desktop @@ -2,7 +2,7 @@ Name=VSCodium Comment=Editing evolved GenericName=Code Editor -Exec=/usr/bin/vscodium --unity-launch %F +Exec=/usr/bin/vscodium @exec_extra_flags@ --unity-launch %F Icon=vscodium Type=Application StartupNotify=false @@ -14,5 +14,5 @@ Keywords=vscode;vscodium;code;codium; [Desktop Action new-empty-window] Name=New Empty Window -Exec=/usr/bin/vscodium --new-window %F +Exec=/usr/bin/vscodium @exec_extra_flags@ --new-window %F Icon=vscodium diff --git a/app-editors/vscodium/metadata.xml b/app-editors/vscodium/metadata.xml index 155628c5d905..8d4e8c9c718e 100644 --- a/app-editors/vscodium/metadata.xml +++ b/app-editors/vscodium/metadata.xml @@ -5,10 +5,18 @@ <email>adel.ks@zegrapher.com</email> <name>Adel KARA SLIMANE</name> </maintainer> + <maintainer type="person"> + <email>arthurzam@gentoo.org</email> + <name>Arthur Zamarin</name> + </maintainer> <maintainer type="project" proxied="proxy"> <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + <use> + <flag name="egl">Use EGL platform, enables smooth rending in high refresh rate monitors on X11/Xwayland</flag> + <flag name="wayland">Run in wayland mode under wayland sessions, xwayland otherwise. This flag doesn't affect x11 sessions.</flag> + </use> <longdescription> Microsoft’s vscode source code is open source (MIT-licensed), but the product available for download (Visual Studio Code) is licensed under the Microsoft-vscode license (a copy can be found in the licenses folder of your gentoo repository) and contains telemetry/tracking. The VSCodium project exists so that you don’t have to download+build from source. This project includes special build scripts that clone Microsoft’s vscode repo, run the build commands, and upload the resulting binaries for you to GitHub releases. These binaries are licensed under the MIT license. Telemetry is disabled. </longdescription> diff --git a/app-editors/vscodium/vscodium-1.58.2.ebuild b/app-editors/vscodium/vscodium-1.58.2.ebuild deleted file mode 100644 index e25a3967ed49..000000000000 --- a/app-editors/vscodium/vscodium-1.58.2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop pax-utils xdg - -DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode" -HOMEPAGE="https://vscodium.com/" -SRC_URI=" - amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz ) - arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz ) - arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz ) -" - -RESTRICT="mirror strip bindist" - -LICENSE=" - Apache-2.0 - BSD - BSD-1 - BSD-2 - BSD-4 - CC-BY-4.0 - ISC - LGPL-2.1+ - MIT - MPL-2.0 - openssl - PYTHON - TextMate-bundle - Unlicense - UoI-NCSA - W3C -" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64" -IUSE="" - -RDEPEND=" - app-accessibility/at-spi2-atk - app-crypt/libsecret[crypt] - dev-libs/nss - media-libs/alsa-lib - media-libs/libpng:0/16 - net-print/cups - x11-libs/cairo - x11-libs/gtk+:3 - x11-libs/libnotify - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/pango -" - -QA_PREBUILT=" - /opt/vscodium/codium - /opt/vscodium/libEGL.so - /opt/vscodium/libffmpeg.so - /opt/vscodium/libGLESv2.so - /opt/vscodium/libvulkan.so* - /opt/vscodium/chrome-sandbox - /opt/vscodium/libvk_swiftshader.so - /opt/vscodium/swiftshader/libEGL.so - /opt/vscodium/swiftshader/libGLESv2.so - /opt/vscodium/resources/app/extensions/* - /opt/vscodium/resources/app/node_modules.asar.unpacked/* -" - -S="${WORKDIR}" - -src_install() { - # Cleanup - rm "${S}/resources/app/LICENSE.txt" || die - - # Install - pax-mark m codium - insinto "/opt/${PN}" - doins -r * - fperms +x /opt/${PN}/{,bin/}codium - fperms +x /opt/${PN}/chrome-sandbox - fperms -R +x /opt/${PN}/resources/app/out/vs/base/node - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg - dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium" - domenu "${FILESDIR}/vscodium.desktop" - domenu "${FILESDIR}/vscodium-url-handler.desktop" - newicon "resources/app/resources/linux/code.png" "vscodium.png" -} - -pkg_postinst() { - xdg_pkg_postinst - elog "When compared to the regular VSCode, VSCodium has a few quirks" - elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md" -} diff --git a/app-editors/vscodium/vscodium-1.59.1.ebuild b/app-editors/vscodium/vscodium-1.59.1.ebuild deleted file mode 100644 index 547387b61b8c..000000000000 --- a/app-editors/vscodium/vscodium-1.59.1.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop pax-utils xdg - -DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode" -HOMEPAGE="https://vscodium.com/" -SRC_URI=" - amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz ) - arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz ) - arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz ) -" - -RESTRICT="mirror strip bindist" - -LICENSE=" - Apache-2.0 - BSD - BSD-1 - BSD-2 - BSD-4 - CC-BY-4.0 - ISC - LGPL-2.1+ - MIT - MPL-2.0 - openssl - PYTHON - TextMate-bundle - Unlicense - UoI-NCSA - W3C -" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64" -IUSE="" - -RDEPEND=" - app-accessibility/at-spi2-atk - app-crypt/libsecret[crypt] - dev-libs/nss - media-libs/alsa-lib - media-libs/libpng:0/16 - net-print/cups - x11-libs/cairo - x11-libs/gtk+:3 - x11-libs/libnotify - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/pango -" - -QA_PREBUILT=" - /opt/vscodium/codium - /opt/vscodium/libEGL.so - /opt/vscodium/libffmpeg.so - /opt/vscodium/libGLESv2.so - /opt/vscodium/libvulkan.so* - /opt/vscodium/chrome-sandbox - /opt/vscodium/libvk_swiftshader.so - /opt/vscodium/swiftshader/libEGL.so - /opt/vscodium/swiftshader/libGLESv2.so - /opt/vscodium/resources/app/extensions/* - /opt/vscodium/resources/app/node_modules.asar.unpacked/* -" - -S="${WORKDIR}" - -src_install() { - # Cleanup - rm "${S}/resources/app/LICENSE.txt" || die - - # Install - pax-mark m codium - insinto "/opt/${PN}" - doins -r * - fperms +x /opt/${PN}/{,bin/}codium - fperms 4711 /opt/${PN}/chrome-sandbox - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh - fperms -R +x /opt/${PN}/resources/app/out/vs/base/node - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg - dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium" - domenu "${FILESDIR}/vscodium.desktop" - domenu "${FILESDIR}/vscodium-url-handler.desktop" - newicon "resources/app/resources/linux/code.png" "vscodium.png" -} - -pkg_postinst() { - xdg_pkg_postinst - elog "When compared to the regular VSCode, VSCodium has a few quirks" - elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md" -} diff --git a/app-editors/vscodium/vscodium-1.60.2.ebuild b/app-editors/vscodium/vscodium-1.60.2.ebuild deleted file mode 100644 index 1f66143c0bf3..000000000000 --- a/app-editors/vscodium/vscodium-1.60.2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop pax-utils xdg - -DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode" -HOMEPAGE="https://vscodium.com/" -SRC_URI=" - amd64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz -> ${P}-amd64.tar.gz ) - arm? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz -> ${P}-arm.tar.gz ) - arm64? ( https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz -> ${P}-arm64.tar.gz ) -" - -RESTRICT="mirror strip bindist" - -LICENSE=" - Apache-2.0 - BSD - BSD-1 - BSD-2 - BSD-4 - CC-BY-4.0 - ISC - LGPL-2.1+ - MIT - MPL-2.0 - openssl - PYTHON - TextMate-bundle - Unlicense - UoI-NCSA - W3C -" -SLOT="0" -KEYWORDS="-* ~amd64 ~arm ~arm64" -IUSE="" - -RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-accessibility/at-spi2-core:2 - app-crypt/libsecret[crypt] - dev-libs/atk - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - media-libs/alsa-lib - media-libs/mesa - net-print/cups - sys-apps/dbus - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libdrm - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libxkbcommon - x11-libs/libxkbfile - x11-libs/libXrandr - x11-libs/libxshmfence - x11-libs/pango -" - -QA_PREBUILT=" - /opt/vscodium/codium - /opt/vscodium/libEGL.so - /opt/vscodium/libffmpeg.so - /opt/vscodium/libGLESv2.so - /opt/vscodium/libvulkan.so* - /opt/vscodium/chrome-sandbox - /opt/vscodium/libvk_swiftshader.so - /opt/vscodium/swiftshader/libEGL.so - /opt/vscodium/swiftshader/libGLESv2.so - /opt/vscodium/resources/app/extensions/* - /opt/vscodium/resources/app/node_modules.asar.unpacked/* -" - -S="${WORKDIR}" - -src_install() { - # Cleanup - rm "${S}/resources/app/LICENSE.txt" || die - - # Install - pax-mark m codium - insinto "/opt/${PN}" - doins -r * - fperms +x /opt/${PN}/{,bin/}codium - fperms 4711 /opt/${PN}/chrome-sandbox - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass.sh - fperms 755 /opt/${PN}/resources/app/extensions/git/dist/askpass-empty.sh - fperms -R +x /opt/${PN}/resources/app/out/vs/base/node - fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg - dosym "../../opt/${PN}/bin/codium" "usr/bin/vscodium" - dosym "../../opt/${PN}/bin/codium" "usr/bin/codium" - domenu "${FILESDIR}/vscodium.desktop" - domenu "${FILESDIR}/vscodium-url-handler.desktop" - domenu "${FILESDIR}/vscodium-wayland.desktop" - domenu "${FILESDIR}/vscodium-url-handler-wayland.desktop" - newicon "resources/app/resources/linux/code.png" "vscodium.png" -} - -pkg_postinst() { - xdg_pkg_postinst - elog "When compared to the regular VSCode, VSCodium has a few quirks" - elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md" -} diff --git a/app-editors/vscodium/vscodium-1.88.1.24102.ebuild b/app-editors/vscodium/vscodium-1.88.1.24102.ebuild new file mode 100644 index 000000000000..e22d9d5645b8 --- /dev/null +++ b/app-editors/vscodium/vscodium-1.88.1.24102.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop pax-utils xdg optfeature + +# Usage: arch_src_uri <gentoo arch> <upstream arch> +arch_src_uri() { + echo "${1}? ( + https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-${2}-${PV}.tar.gz + -> ${P}-${1}.tar.gz + )" +} + +DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode" +HOMEPAGE="https://vscodium.com/" +SRC_URI=" + $(arch_src_uri amd64 x64) + $(arch_src_uri arm armhf) + $(arch_src_uri arm64 arm64) +" +S="${WORKDIR}" + +LICENSE=" + Apache-2.0 + BSD + BSD-1 + BSD-2 + BSD-4 + CC-BY-4.0 + ISC + LGPL-2.1+ + MIT + MPL-2.0 + openssl + PYTHON + TextMate-bundle + Unlicense + UoI-NCSA + W3C +" +SLOT="0" +KEYWORDS="-* amd64 ~arm ~arm64" +IUSE="egl kerberos wayland" +RESTRICT="strip bindist" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret[crypt] + app-misc/ca-certificates + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/libcanberra[gtk3] + media-libs/libglvnd + media-libs/mesa + net-misc/curl + net-print/cups + sys-apps/dbus + sys-libs/zlib + sys-process/lsof + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon + x11-libs/libxkbfile + x11-libs/libXrandr + x11-libs/libXScrnSaver + x11-libs/pango + x11-misc/xdg-utils + kerberos? ( app-crypt/mit-krb5 ) +" + +QA_PREBUILT="*" + +src_install() { + # Cleanup license file - it exists only in amd64 tarball + rm -f "${S}/resources/app/LICENSE.txt" || die + + if ! use kerberos; then + rm -rf "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die + fi + + # Install + pax-mark m codium + mkdir -p "${ED}/opt/${PN}" || die + cp -r . "${ED}/opt/${PN}" || die + fperms 4711 /opt/${PN}/chrome-sandbox + + dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium" + dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium" + + local EXEC_EXTRA_FLAGS=() + if use wayland; then + EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" ) + fi + if use egl; then + EXEC_EXTRA_FLAGS+=( "--use-gl=egl" ) + fi + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/vscodium-url-handler.desktop" \ + > "${T}/vscodium-url-handler.desktop" || die + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/vscodium.desktop" \ + > "${T}/vscodium.desktop" || die + + domenu "${T}/vscodium.desktop" + domenu "${T}/vscodium-url-handler.desktop" + newicon "resources/app/resources/linux/code.png" "vscodium.png" +} + +pkg_postinst() { + xdg_pkg_postinst + elog "When compared to the regular VSCode, VSCodium has a few quirks" + elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md" + optfeature "desktop notifications" x11-libs/libnotify + optfeature "keyring support inside vscode" "virtual/secret-service" +} diff --git a/app-editors/vscodium/vscodium-1.88.1.24104.ebuild b/app-editors/vscodium/vscodium-1.88.1.24104.ebuild new file mode 100644 index 000000000000..e22d9d5645b8 --- /dev/null +++ b/app-editors/vscodium/vscodium-1.88.1.24104.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop pax-utils xdg optfeature + +# Usage: arch_src_uri <gentoo arch> <upstream arch> +arch_src_uri() { + echo "${1}? ( + https://github.com/VSCodium/${PN}/releases/download/${PV}/VSCodium-linux-${2}-${PV}.tar.gz + -> ${P}-${1}.tar.gz + )" +} + +DESCRIPTION="A community-driven, freely-licensed binary distribution of Microsoft's VSCode" +HOMEPAGE="https://vscodium.com/" +SRC_URI=" + $(arch_src_uri amd64 x64) + $(arch_src_uri arm armhf) + $(arch_src_uri arm64 arm64) +" +S="${WORKDIR}" + +LICENSE=" + Apache-2.0 + BSD + BSD-1 + BSD-2 + BSD-4 + CC-BY-4.0 + ISC + LGPL-2.1+ + MIT + MPL-2.0 + openssl + PYTHON + TextMate-bundle + Unlicense + UoI-NCSA + W3C +" +SLOT="0" +KEYWORDS="-* amd64 ~arm ~arm64" +IUSE="egl kerberos wayland" +RESTRICT="strip bindist" + +RDEPEND=" + >=app-accessibility/at-spi2-core-2.46.0:2 + app-crypt/libsecret[crypt] + app-misc/ca-certificates + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + media-libs/alsa-lib + media-libs/libcanberra[gtk3] + media-libs/libglvnd + media-libs/mesa + net-misc/curl + net-print/cups + sys-apps/dbus + sys-libs/zlib + sys-process/lsof + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libdrm + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libxkbcommon + x11-libs/libxkbfile + x11-libs/libXrandr + x11-libs/libXScrnSaver + x11-libs/pango + x11-misc/xdg-utils + kerberos? ( app-crypt/mit-krb5 ) +" + +QA_PREBUILT="*" + +src_install() { + # Cleanup license file - it exists only in amd64 tarball + rm -f "${S}/resources/app/LICENSE.txt" || die + + if ! use kerberos; then + rm -rf "${S}/resources/app/node_modules.asar.unpacked/kerberos" || die + fi + + # Install + pax-mark m codium + mkdir -p "${ED}/opt/${PN}" || die + cp -r . "${ED}/opt/${PN}" || die + fperms 4711 /opt/${PN}/chrome-sandbox + + dosym -r "/opt/${PN}/bin/codium" "usr/bin/vscodium" + dosym -r "/opt/${PN}/bin/codium" "usr/bin/codium" + + local EXEC_EXTRA_FLAGS=() + if use wayland; then + EXEC_EXTRA_FLAGS+=( "--ozone-platform-hint=auto" ) + fi + if use egl; then + EXEC_EXTRA_FLAGS+=( "--use-gl=egl" ) + fi + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/vscodium-url-handler.desktop" \ + > "${T}/vscodium-url-handler.desktop" || die + + sed "s|@exec_extra_flags@|${EXEC_EXTRA_FLAGS[*]}|g" \ + "${FILESDIR}/vscodium.desktop" \ + > "${T}/vscodium.desktop" || die + + domenu "${T}/vscodium.desktop" + domenu "${T}/vscodium-url-handler.desktop" + newicon "resources/app/resources/linux/code.png" "vscodium.png" +} + +pkg_postinst() { + xdg_pkg_postinst + elog "When compared to the regular VSCode, VSCodium has a few quirks" + elog "More information at: https://github.com/VSCodium/vscodium/blob/master/DOCS.md" + optfeature "desktop notifications" x11-libs/libnotify + optfeature "keyring support inside vscode" "virtual/secret-service" +} diff --git a/app-editors/wily/wily-1.0-r2.ebuild b/app-editors/wily/wily-1.0-r2.ebuild index eafceb60d927..b2ee14fbcb16 100644 --- a/app-editors/wily/wily-1.0-r2.ebuild +++ b/app-editors/wily/wily-1.0-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit multilib toolchain-funcs +inherit toolchain-funcs MY_P="${P/1.0/9libs}" @@ -12,7 +12,7 @@ SRC_URI="https://www.netlib.org/research/9libs/${MY_P}.tar.gz" LICENSE="Artistic" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 ~riscv x86" DEPEND=" dev-libs/9libs diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild index a31c4b0aa439..e1458645feaf 100644 --- a/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild +++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="" DEPEND=" diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index 793589c73091..d30897871d36 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -1,3 +1,3 @@ DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213 -DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a +DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019 diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch b/app-editors/xemacs/files/xemacs-21.5.34-ar.patch deleted file mode 100644 index fff6f5578733..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-ar.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -r 3ca291c0f7e3 configure ---- a/configure Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure Sun Apr 19 18:46:45 2020 +0200 -@@ -778,6 +778,5 @@ - INSTALL_SCRIPT - INSTALL_PROGRAM - RANLIB --AR - lib_gcc - ld -@@ -10296,47 +10307,6 @@ - fi - - --# Extract the first word of "ar", so it can be a program name with args. --set dummy ar; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_prog_AR+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test -n "$AR"; then -- ac_cv_prog_AR="$AR" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_AR="ar" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="not_found" --fi --fi --AR=$ac_cv_prog_AR --if test -n "$AR"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 --$as_echo "$AR" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- --if test "$AR" = "not_found"; then -- { echo "Error:" "ar not found -- is PATH set correctly?" >&2; exit 1; } --fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -diff -r 3ca291c0f7e3 configure.ac ---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure.ac Sun Apr 19 18:46:45 2020 +0200 -@@ -2557,12 +2557,6 @@ - dnl should make an entry in src/config.h, do not forget to add an - dnl #undef clause to src/config.h.in for autoconf to modify. - --dnl Sun likes to hide these utilities. Steve Baur asked that we make --dnl the failure occur at configure time, not at use time. --AC_CHECK_PROG(AR,ar,ar,not_found) --if test "$AR" = "not_found"; then -- XE_DIE(["ar not found -- is PATH set correctly?"]) --fi - dnl These tests don't necessarily check that the program exists. - AC_PROG_RANLIB - AC_PROG_INSTALL diff --git a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch b/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch deleted file mode 100644 index 542ce14c36af..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-as-needed.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -r 30910ee1cf8c configure ---- a/configure Tue Jun 18 10:37:46 2019 +0100 -+++ b/configure Mon Jul 08 20:38:49 2019 +0200 -@@ -16668,7 +16668,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-l$athena_variant $LIBS" -+LIBS="-l$athena_variant $libs_x $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -diff -r 30910ee1cf8c configure.ac ---- a/configure.ac Tue Jun 18 10:37:46 2019 +0100 -+++ b/configure.ac Mon Jul 08 20:38:49 2019 +0200 -@@ -4068,7 +4068,8 @@ - athena_lib=Xaw; - AC_MSG_WARN([Assuming that libXaw is actually $athena_variant.]); - ], -- [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])])) -+ [AC_MSG_WARN([Could not find a 3d Athena widget library that looked like $athena_variant.])]), -+ $libs_x) - fi - - dnl Now we locate the Athena headers that we need. diff --git a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch deleted file mode 100644 index fdea052fba19..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-configure-libc-version.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -r 3ca291c0f7e3 configure ---- a/configure Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure Fri Mar 06 21:27:48 2020 +0100 -@@ -9987,7 +9987,7 @@ - libc_version="GNU libc $libc_version (Debian)" - fi - if test -z "$libc_version"; then -- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` -+ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'` - fi - ;; - -diff -r 3ca291c0f7e3 configure.ac ---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure.ac Fri Mar 06 21:27:48 2020 +0100 -@@ -2347,7 +2347,7 @@ - fi - dnl #### Tested on Debian, does this actually work elsewhere? ;-) - if test -z "$libc_version"; then -- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` -+ libc_version=`ls /lib{64,}/libc-*.so 2>/dev/null | head -n1 | sed -e 's,/lib\(64\|\)/libc-\(.*\)\.so,\2,'` - fi - ;; - diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch deleted file mode 100644 index 025a390f3335..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/lisp.h b/src/lisp.h ---- a/src/lisp.h -+++ b/src/lisp.h -@@ -1154,6 +1154,8 @@ - - /* ------------------------ alignment definitions ------------------- */ - -+#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \ -+ (!defined (__cplusplus) || __cplusplus < 201103L) - /* No type has a greater alignment requirement than max_align_t. - (except perhaps for types we don't use, like long double) */ - typedef union -@@ -1163,6 +1165,7 @@ - struct { void (*f)(void); } f; - struct { double d; } d; - } max_align_t; -+#endif - - /* ALIGNOF returns the required alignment of a type -- i.e. a value such - that data of this type must begin at a memory address which is a -@@ -1170,7 +1173,11 @@ - as the type itself. */ - - #ifndef ALIGNOF --# if defined (__GNUC__) && (__GNUC__ >= 2) -+# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L -+# define ALIGNOF(type) _Alignof(type) -+# elif defined (__cplusplus) && __cplusplus >= 201103L -+# define ALIGNOF(type) alignof(type) -+# elif defined (__GNUC__) && (__GNUC__ >= 2) - /* gcc has an extension that gives us exactly what we want. */ - # define ALIGNOF(type) __alignof__ (type) - # elif ! defined (__cplusplus) - - diff --git a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch b/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch deleted file mode 100644 index b611b15fd8b1..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-glibc-macro.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -r f412e9f093d4 configure ---- a/configure Wed Jan 25 00:47:06 2017 +0000 -+++ b/configure Sun Jan 29 19:32:47 2017 +0100 -@@ -13507,7 +13507,10 @@ - -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;; - * ) val=1 ;; - esac -- if grep "^#define $sym " confdefs.h >/dev/null; then :; else -+ if grep "^#define $sym " confdefs.h >/dev/null || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE"; -+ then :; else - if test "$val" = "1" - then cat >>confdefs.h <<_ACEOF - #define $sym 1 -diff -r f412e9f093d4 configure.ac ---- a/configure.ac Wed Jan 25 00:47:06 2017 +0000 -+++ b/configure.ac Sun Jan 29 19:32:47 2017 +0100 -@@ -3136,7 +3136,12 @@ - * ) val=1 ;; - esac - dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above. -- if grep "^#define $sym " confdefs.h >/dev/null; then :; else -+dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf -+dnl likes us to define; ignore them if appropriate. -+ if grep "^#define $sym " confdefs.h >/dev/null || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_BSD_SOURCE" || \ -+ test "$have_glibc" = "yes" -a "$sym" = "_SVID_SOURCE"; -+ then :; else - if test "$val" = "1" - then AC_DEFINE_UNQUOTED($sym) - else AC_DEFINE_UNQUOTED($sym,$val) diff --git a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch deleted file mode 100644 index a08eda3c8a83..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-ncurses-tinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -r 6355de501637 configure ---- a/configure Thu Jan 23 15:03:16 2014 +0000 -+++ b/configure Fri Jan 31 23:55:12 2014 +0100 -@@ -19699,7 +19699,8 @@ - extra_objs="$extra_objs terminfo.o" && if test "$verbose" = "yes"; then - echo " xemacs will be linked with \"terminfo.o\"" - fi -- LIBS="-lncurses $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-lncurses\" to \$LIBS"; fi -+ ncurses_libs=$(pkg-config ncurses --libs) -+ LIBS="$ncurses_libs $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"$ncurses_libs\" to \$LIBS"; fi - - if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then - save_c_switch_site="$c_switch_site" 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 deleted file mode 100644 index ff17f6b62411..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-process-test-qa.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/files/xemacs-21.5.34-strsignal.patch b/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch deleted file mode 100644 index 464c6a542e8c..000000000000 --- a/app-editors/xemacs/files/xemacs-21.5.34-strsignal.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -r 3ca291c0f7e3 configure ---- a/configure Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure Thu Aug 27 00:15:50 2020 +0200 -@@ -18090,7 +18090,7 @@ - esac - - --for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen -+for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -diff -r 3ca291c0f7e3 configure.ac ---- a/configure.ac Sun Jul 28 10:17:08 2019 +0100 -+++ b/configure.ac Thu Aug 27 00:15:50 2020 +0200 -@@ -4563,7 +4563,7 @@ - dnl Check for POSIX functions. - dnl ---------------------------------------------------------------- - --AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) -+AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp fsync ftime ftruncate getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setsid sigblock sighold sigprocmask snprintf strerror strlwr strsignal strupr symlink tzset ulimit umask usleep vlimit vsnprintf waitpid wcscmp wcslen) - - dnl getaddrinfo() is borked under hpux11 - if test "$ac_cv_func_getaddrinfo" != "no" ; then -diff -r 3ca291c0f7e3 src/config.h.in ---- a/src/config.h.in Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/config.h.in Thu Aug 27 00:15:50 2020 +0200 -@@ -417,6 +417,7 @@ - #undef HAVE_SNPRINTF - #undef HAVE_STRERROR - #undef HAVE_STRLWR -+#undef HAVE_STRSIGNAL - #undef HAVE_STRUPR - #undef HAVE_SYMLINK - #undef HAVE_TZSET -diff -r 3ca291c0f7e3 src/process.c ---- a/src/process.c Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/process.c Thu Aug 27 00:15:50 2020 +0200 -@@ -1646,7 +1646,11 @@ - signal_name (int signum) - { - if (signum >= 0 && signum < NSIG) -+#ifdef HAVE_STRSIGNAL -+ return strsignal (signum); -+#else - return (const char *) sys_siglist[signum]; -+#endif - - return (const char *) GETTEXT ("unknown signal"); - } -diff -r 3ca291c0f7e3 src/s/linux.h ---- a/src/s/linux.h Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/s/linux.h Thu Aug 27 00:15:50 2020 +0200 -@@ -36,10 +36,6 @@ - - /* Deleted GNU_LIBRARY_PENDING_OUTPUT_COUNT -- unused in XEmacs */ - --/* This is needed for sysdep.c */ -- --#define HAVE_SYS_SIGLIST -- - /* #define POSIX -- not used in XEmacs */ - - /* Deleted TERM stuff -- probably hugely obsolete */ -diff -r 3ca291c0f7e3 src/sysdep.c ---- a/src/sysdep.c Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/sysdep.c Thu Aug 27 00:15:50 2020 +0200 -@@ -3520,7 +3520,7 @@ - /* Strings corresponding to defined signals */ - /************************************************************************/ - --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - - #if defined(WIN32_NATIVE) || defined(CYGWIN) - const char *sys_siglist[] = -diff -r 3ca291c0f7e3 src/syssignal.h ---- a/src/syssignal.h Sun Jul 28 10:17:08 2019 +0100 -+++ b/src/syssignal.h Thu Aug 27 00:15:50 2020 +0200 -@@ -263,10 +263,8 @@ - # endif - #endif - --/* HAVE_DECL_SYS_SIGLIST is determined by configure. On Linux, it seems, -- configure incorrectly fails to find it, so s/linux.h defines -- HAVE_SYS_SIGLIST. */ --#if (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) && !defined (HAVE_SYS_SIGLIST) -+/* Systems that have sys_siglist but do not declare it. */ -+#if !defined(HAVE_STRSIGNAL) && (!defined(HAVE_DECL_SYS_SIGLIST) || !HAVE_DECL_SYS_SIGLIST ) - extern const char *sys_siglist[]; - #endif - diff --git a/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch new file mode 100644 index 000000000000..e744d3952b10 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-configure-libc-version.patch @@ -0,0 +1,73 @@ +diff -r 3761ed745bc6 configure.ac +--- a/configure.ac Sat Mar 02 17:26:00 2024 +0100 ++++ b/configure.ac Fri Mar 08 22:25:23 2024 +0100 +@@ -2192,7 +2192,6 @@ + + compiler_version="" + gcc_compiler_specs="" +-libc_version="" + + AC_MSG_CHECKING([for compiler version information]) + +@@ -2255,53 +2254,6 @@ + fi + AC_MSG_RESULT([$compiler_version]) + +-AC_MSG_CHECKING(for standard C library version information) +- +-case "$ac_cv_build" in +- *-*-linux*) +- dnl #### who would ever _not_ be running the distro's libc? +- dnl Maybe it would be better to get/augment this info with ldd? +- if test -f /etc/redhat-release ; then +- libc_version=`rpm -q glibc` +- elif test -f /etc/debian_version ; then +- libc_version=`dpkg-query --showformat='${version}' --show libc6` +- libc_version="GNU libc $libc_version (Debian)" +- dnl need SuSE et al checks here... +- fi +- dnl #### Tested on Debian, does this actually work elsewhere? ;-) +- if test -z "$libc_version"; then +- libc_version=`ls /lib/libc-*.so | sed -e 's,/lib/libc-\(.*\)\.so,\1,'` +- fi +- ;; +- +- *-*-aix*) +- libc_version="bos.rte.libc `lslpp -Lqc bos.rte.libc | cut -f3 -d:`" +- ;; +- +- *-*-solaris*) +- libc=`pkginfo -l SUNWcsl | grep VERSION: | awk '{print $2}'` +- libc_version="SUNWcsl $libc" +- +- ;; +- +- mips-sgi-irix*) +- libc_version="IRIX libc `uname -sRm`" +- ;; +- +- alpha*-dec-osf*) +- dnl Another ugly case +- (cd /usr/.smdb.; +- libc_version=` grep -h libc.so *.inv | awk '$9 == "f" {print $12}' | tr '\n' ','` +- ) +- ;; +-esac +- +-dnl Awww, shucks. +-if test -z "libc_version"; then +- libc_version="detection failed (please report this)" +-fi +-AC_MSG_RESULT([$libc_version]) +- + dnl --------------------------------------------------------- + dnl These directories are used to search for include subdirs. + dnl --------------------------------------------------------- +@@ -6122,7 +6074,6 @@ + echo " WARNING: CC and XEMACS_CC mismatched; check CFLAGS carefully." + fi + fi +-echo " libc version: $libc_version" + echo " Relocating allocator for buffers: $with_rel_alloc" + echo " + Package Search (a 'root' contains '{xemacs,mule,site}-packages'):" diff --git a/app-editors/xemacs/files/xemacs-21.5.35-configure.patch b/app-editors/xemacs/files/xemacs-21.5.35-configure.patch new file mode 100644 index 000000000000..5648e0a38fcf --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-configure.patch @@ -0,0 +1,42 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -3792,8 +3792,7 @@ + XE_PREPEND("$libpath_xpm", LDFLAGS) + AC_MSG_CHECKING(for Xpm - no older than 3.4f) + xe_check_libs="$libname_xpm" +- AC_RUN_IFELSE([AC_LANG_SOURCE([#define XPM_NUMBERS +-#include <X11/xpm.h> ++ AC_RUN_IFELSE([AC_LANG_SOURCE([#include <X11/xpm.h> + int main(int c, char **v) { + return c == 1 ? 0 : + XpmIncludeVersion != XpmLibraryVersion() ? 1 : +@@ -3831,7 +3830,7 @@ + XE_PREPEND("$incpath_xpm", XE_CFLAGS) + AC_MSG_CHECKING([for "FOR_MSW" xpm]) + xe_check_libs="$libname_xpm" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[XpmCreatePixmapFromData();])], ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <X11/xpm.h>],[XpmCreatePixmapFromData(0, 0, 0, 0, 0, 0);])], + [xpm_for_msw=no], + [xpm_for_msw=yes]) + xe_check_libs= +@@ -4620,9 +4619,7 @@ + AC_CACHE_VAL(emacs_cv_localtime_cache, + [if test "$ac_cv_func_tzset" = "yes"; then + AC_RUN_IFELSE([AC_LANG_SOURCE([#include <time.h> +-#if STDC_HEADERS +-# include <stdlib.h> +-#endif ++#include <stdlib.h> + extern char **environ; + unset_TZ () + { +@@ -4733,6 +4730,8 @@ + void *alloca (); + #endif /* C_ALLOCA */ + #endif /* !defined (alloca) */ ++#include <string.h> ++#include <stdlib.h> + + void + f1 (double a, void *ptr, int b) diff --git a/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch b/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch new file mode 100644 index 000000000000..d650d86e6944 --- /dev/null +++ b/app-editors/xemacs/files/xemacs-21.5.35-mule-tests.patch @@ -0,0 +1,124 @@ +diff --git a/tests/automated/mule-tests.el b/tests/automated/mule-tests.el +--- a/tests/automated/mule-tests.el ++++ b/tests/automated/mule-tests.el +@@ -85,14 +85,15 @@ + (insert string) + (assert (equal (buffer-string) string)))))) + +-(when (compiled-function-p (symbol-function 'test-chars)) +- ;; Run #'test-chars in byte-compiled mode only. +- (test-chars t +- ;; unicode-internal has a value of #x40000000, (expt 2 30), for +- ;; char-code-limit and even re-writing the above to avoid +- ;; allocating the list and the string means I run out of memory +- ;; when I attempt to run this. +- (min char-code-limit #x200000))) ++;; Crashes XEmacs ... ++;; (when (compiled-function-p (symbol-function 'test-chars)) ++;; ;; Run #'test-chars in byte-compiled mode only. ++;; (test-chars t ++;; ;; unicode-internal has a value of #x40000000, (expt 2 30), for ++;; ;; char-code-limit and even re-writing the above to avoid ++;; ;; allocating the list and the string means I run out of memory ++;; ;; when I attempt to run this. ++;; (min char-code-limit #x200000))) + + (defun unicode-code-point-to-utf-8-string (code-point) + "Convert a Unicode code point to the equivalent UTF-8 string. +@@ -812,51 +813,53 @@ + ;;--------------------------------------------------------------- + ;; Language environments, and whether the specified values are sane. + ;;--------------------------------------------------------------- +- (loop +- for language in (mapcar #'car language-info-alist) +- with language-input-method = nil +- with native-coding-system = nil +- with original-language-environment = current-language-environment +- do +- ;; s-l-e can call #'require, which says "Loading ..." +- (Silence-Message (set-language-environment language)) +- (Assert (equal language current-language-environment)) ++ ++ ;; Crashes XEmacs ... ++ ;; (loop ++ ;; for language in (mapcar #'car language-info-alist) ++ ;; with language-input-method = nil ++ ;; with native-coding-system = nil ++ ;; with original-language-environment = current-language-environment ++ ;; do ++ ;; ;; s-l-e can call #'require, which says "Loading ..." ++ ;; (Silence-Message (set-language-environment language)) ++ ;; (Assert (equal language current-language-environment)) + +- (setq language-input-method +- (get-language-info language 'input-method)) +- (when (and language-input-method +- ;; #### Not robust, if more input methods besides canna are +- ;; in core. The intention of this is that if *any* of the +- ;; packages' input methods are available, we check that *all* +- ;; of the language environments' input methods actually +- ;; exist, which goes against the spirit of non-monolithic +- ;; packages. But I don't have a better approach to this. +- (> (length input-method-alist) 1)) +- (Assert (assoc language-input-method input-method-alist)) +- (Skip-Test-Unless +- (assoc language-input-method input-method-alist) +- "input method unavailable" +- (format "check that IM %s can be activated" language-input-method) +- ;; s-i-m can load files. +- (Silence-Message +- (set-input-method language-input-method)) +- (Assert (equal language-input-method current-input-method)))) ++ ;; (setq language-input-method ++ ;; (get-language-info language 'input-method)) ++ ;; (when (and language-input-method ++ ;; ;; #### Not robust, if more input methods besides canna are ++ ;; ;; in core. The intention of this is that if *any* of the ++ ;; ;; packages' input methods are available, we check that *all* ++ ;; ;; of the language environments' input methods actually ++ ;; ;; exist, which goes against the spirit of non-monolithic ++ ;; ;; packages. But I don't have a better approach to this. ++ ;; (> (length input-method-alist) 1)) ++ ;; (Assert (assoc language-input-method input-method-alist)) ++ ;; (Skip-Test-Unless ++ ;; (assoc language-input-method input-method-alist) ++ ;; "input method unavailable" ++ ;; (format "check that IM %s can be activated" language-input-method) ++ ;; ;; s-i-m can load files. ++ ;; (Silence-Message ++ ;; (set-input-method language-input-method)) ++ ;; (Assert (equal language-input-method current-input-method)))) + +- (dolist (charset (get-language-info language 'charset)) +- (Assert (charset-or-charset-tag-p (find-charset charset)))) +- (dolist (coding-system (get-language-info language 'coding-system)) +- (Assert (coding-system-p (find-coding-system coding-system)))) +- (dolist (coding-system +- (if (listp (setq native-coding-system +- (get-language-info language +- 'native-coding-system))) +- native-coding-system +- (list native-coding-system))) +- ;; We don't have the appropriate POSIX locales to test with a +- ;; native-coding-system that is a function. +- (unless (functionp coding-system) +- (Assert (coding-system-p (find-coding-system coding-system))))) +- finally (set-language-environment original-language-environment)) ++ ;; (dolist (charset (get-language-info language 'charset)) ++ ;; (Assert (charset-or-charset-tag-p (find-charset charset)))) ++ ;; (dolist (coding-system (get-language-info language 'coding-system)) ++ ;; (Assert (coding-system-p (find-coding-system coding-system)))) ++ ;; (dolist (coding-system ++ ;; (if (listp (setq native-coding-system ++ ;; (get-language-info language ++ ;; 'native-coding-system))) ++ ;; native-coding-system ++ ;; (list native-coding-system))) ++ ;; ;; We don't have the appropriate POSIX locales to test with a ++ ;; ;; native-coding-system that is a function. ++ ;; (unless (functionp coding-system) ++ ;; (Assert (coding-system-p (find-coding-system coding-system))))) ++ ;; finally (set-language-environment original-language-environment)) + + (with-temp-buffer + (labels diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml index ae715cbedf7b..b96ffa800d92 100644 --- a/app-editors/xemacs/metadata.xml +++ b/app-editors/xemacs/metadata.xml @@ -13,5 +13,6 @@ <flag name="mule">Add multi-language support to XEmacs</flag> <flag name="pop">Support POP for mail retrieval</flag> <flag name="xim">Enable X11 XiM input method</flag> + <flag name="bignum">Support for OpenSSL bignum implementation</flag> </use> </pkgmetadata> diff --git a/app-editors/xemacs/xemacs-21.4.24-r10.ebuild b/app-editors/xemacs/xemacs-21.4.24-r10.ebuild new file mode 100644 index 000000000000..7d1252abe2f3 --- /dev/null +++ b/app-editors/xemacs/xemacs-21.4.24-r10.ebuild @@ -0,0 +1,254 @@ +# Copyright 1999-2023 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=7 + +WANT_AUTOCONF="2.1" +inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop + +DESCRIPTION="highly customizable open source text editor and application development system" +HOMEPAGE="https://www.xemacs.org/" +SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz + neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn 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:= ) + gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] ) + >=sys-libs/zlib-1.1.4 + >=dev-libs/openssl-0.9.6:0= + >=media-libs/audiofile-0.2.3 + gpm? ( >=sys-libs/gpm-1.19.6 ) + postgres? ( dev-db/postgresql:= ) + ldap? ( net-nds/openldap:= ) + nas? ( media-libs/nas ) + X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) + dnd? ( x11-libs/dnd ) + motif? ( >=x11-libs/motif-2.3:0 ) + athena? ( x11-libs/libXaw ) + Xaw3d? ( x11-libs/libXaw3d[unicode(+)] ) + neXt? ( x11-libs/neXtaw ) + xface? ( media-libs/compface ) + tiff? ( media-libs/tiff:= ) + png? ( >=media-libs/libpng-1.2:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + !amd64? ( freewnn? ( app-i18n/freewnn ) ) + >=sys-libs/ncurses-5.2:= + >=app-eselect/eselect-emacs-1.15" + +DEPEND="${RDEPEND} + >=sys-apps/texinfo-5" + +PDEPEND="app-xemacs/xemacs-base + mule? ( app-xemacs/mule-base )" + +src_unpack() { + unpack ${P}.tar.gz + use neXt && unpack NeXT_XEmacs.tar.gz +} + +src_prepare() { + # see bug 58350, 102540 and 143580 + eapply "${FILESDIR}"/xemacs-21.4.19-db.patch + # see bug 576512 + eapply "${FILESDIR}"/xemacs-21.4.24-gcc5.patch + eapply "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch + # see bug 615544 + eapply "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch + eapply "${FILESDIR}"/xemacs-21.4.24-strsignal.patch + + # Convert to utf-8 + iconv -f iso-8859-1 -t utf-8 -o man/xemacs-faq.texi.tmp man/xemacs-faq.texi \ + && mv -f man/xemacs-faq.texi.tmp man/xemacs-faq.texi || die + iconv -f iso-8859-1 -t utf-8 -o man/lispref/ldap.texi.tmp man/lispref/ldap.texi \ + && mv -f man/lispref/ldap.texi.tmp man/lispref/ldap.texi || die + + eapply_user + + # 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 + + # Run autoconf. XEmacs tries to be smart by providing a stub + # configure.ac file for autoconf 2.59 but this throws our + # autotools eclass so it must be removed first. + rm "${S}"/configure.ac || die + eautoconf + + use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ +} + +src_configure() { + local myconf="" + + # Can't build with pie. See bug #75028 + 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 ; 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 ) $(use_with png )" + myconf="${myconf} $(use_with jpeg ) $(use_with xface )" + else + myconf="${myconf} + --without-x + --without-xpm + --without-dragndrop + --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 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" + + 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 + + # Enabling modules will cause segfaults outside the XEmacs build directory + use ia64 && myconf="${myconf} --without-modules" + + einfo "${myconf}" + + # see bug 576512 + append-cflags -fgnu89-inline + + use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn" + + # Don't use econf because it uses options which this configure + # script does not understand (like --host). + ./configure ${myconf} ${EXTRA_ECONF} \ + $(use_with gif ) \ + $(use_with gpm ) \ + $(use_with postgres postgresql ) \ + $(use_with ldap ) \ + $(use_with eolconv file-coding ) \ + $(use_with pop ) \ + --compiler="$(tc-getCC)" \ + --prefix=/usr \ + --without-canna \ + --with-ncurses \ + --with-system-malloc \ + --with-msw=no \ + --mail-locking=flock \ + --with-site-lisp=yes \ + --with-site-modules=yes \ + || die "The configure script failed to run properly" +} + +src_install() { + emake prefix="${D}"/usr \ + mandir="${D}"/usr/share/man/man1 \ + infodir="${D}"/usr/share/info \ + install gzip-el || die "emake install failed" + + # 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 rcs-checkin 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 BUGS CHANGES-* ChangeLog GETTING* INSTALL PROBLEMS README* + dodoc "${FILESDIR}"/README.Gentoo + + 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 +} + +pkg_postrm() { + eselect emacs update ifunset + eselect gnuclient update ifunset + xdg_desktop_database_update +} diff --git a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild b/app-editors/xemacs/xemacs-21.4.24-r9.ebuild index 9b7467a98c25..ce257c1934e4 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Note: xemacs currently does not work with position independent code @@ -10,7 +10,7 @@ WANT_AUTOCONF="2.1" inherit autotools flag-o-matic toolchain-funcs xdg-utils desktop DESCRIPTION="highly customizable open source text editor and application development system" -HOMEPAGE="http://www.xemacs.org/" +HOMEPAGE="https://www.xemacs.org/" SRC_URI="http://ftp.xemacs.org/xemacs-21.4/${P}.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz" @@ -23,13 +23,13 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" RDEPEND=" berkdb? ( sys-libs/db:= ) - gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) + gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb] ) >=sys-libs/zlib-1.1.4 - >=dev-libs/openssl-0.9.6:0 + >=dev-libs/openssl-0.9.6:0= >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) - ldap? ( net-nds/openldap ) + ldap? ( net-nds/openldap:= ) nas? ( media-libs/nas ) X? ( $X_DEPEND !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) @@ -38,9 +38,9 @@ RDEPEND=" Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15" @@ -184,7 +184,7 @@ src_configure() { $(use_with ldap ) \ $(use_with eolconv file-coding ) \ $(use_with pop ) \ - --compiler=$(tc-getCC) \ + --compiler="$(tc-getCC)" \ --prefix=/usr \ --without-canna \ --with-ncurses \ diff --git a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild b/app-editors/xemacs/xemacs-21.5.35-r1.ebuild index b1ec1ecf51e1..505fb03625a3 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r6.ebuild +++ b/app-editors/xemacs/xemacs-21.5.35-r1.ebuild @@ -1,77 +1,74 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 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=7 +EAPI=8 -inherit autotools flag-o-matic xdg-utils desktop +inherit flag-o-matic xdg-utils desktop autotools DESCRIPTION="highly customizable open source text editor and application development system" -HOMEPAGE="http://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" +HOMEPAGE="https://www.xemacs.org/" + +SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz + neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 -riscv ~sparc ~x86" -IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn xft xim athena neXt Xaw3d gdbm berkdb" +KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum" 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(+)] ) + gdbm? ( >=sys-libs/gdbm-1.8.3:=[berkdb(+)] ) >=sys-libs/zlib-1.1.4 - >=dev-libs/openssl-0.9.6:0 + >=dev-libs/openssl-0.9.6:0= >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) - ldap? ( net-nds/openldap ) + 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 ) + Xaw3d? ( x11-libs/libXaw3d[unicode(+)] ) 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 ) + tiff? ( media-libs/tiff:= ) png? ( >=media-libs/libpng-1.2:0 ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) freewnn? ( app-i18n/freewnn ) >=sys-libs/ncurses-5.2:= - >=app-eselect/eselect-emacs-1.15" + >=app-eselect/eselect-emacs-1.15 + bignum? ( dev-libs/openssl )" DEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="app-xemacs/xemacs-base - mule? ( app-xemacs/mule-base )" + 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 - eapply "${FILESDIR}/${P}-ncurses-tinfo.patch" - eapply "${FILESDIR}/${P}-gcc5.patch" - eapply "${FILESDIR}/${P}-glibc-macro.patch" - eapply "${FILESDIR}/${P}-as-needed.patch" + eapply "${FILESDIR}/${P}-configure.patch" + eapply "${FILESDIR}/${P}-mule-tests.patch" 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 + eautoconf + # Some binaries and man pages are installed under suffixed names # to avoid collions with their GNU Emacs counterparts (see below). # Fix internal filename references. @@ -111,7 +108,7 @@ src_configure() { myconf="${myconf} --with-athena=xaw" fi - use dnd && myconf="${myconf} --with-dragndrop --with-offix" + use dnd && myconf="${myconf} --with-dragndrop" myconf="${myconf} $(use_with tiff )" myconf="${myconf} $(use_with png )" @@ -130,22 +127,18 @@ src_configure() { --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 + if use xim ; then + if use motif ; then + myconf="${myconf} --with-xim=motif" else - myconf="${myconf} --with-xim=no" + myconf="${myconf} --with-xim=xlib" fi - - myconf="${myconf} $(use_with freewnn wnn )" + else + myconf="${myconf} --with-xim=no" fi + myconf="${myconf} $(use_with freewnn wnn )" + # This determines the type of sounds we are playing local soundconf="native" @@ -164,25 +157,34 @@ src_configure() { myconf="${myconf} --without-database" fi - use debug && myconf="${myconf} --with-debug" || - myconf="${myconf} --with-optimization" + if use debug ; then + myconf="${myconf} --with-debug" + # bug #924339 + append-flags -fno-strict-aliasing + else + myconf="${myconf} --with-optimization --with-cflags-debugging=" + fi + + use bignum && myconf="${myconf} --with-bignum=openssl" || + myconf="${myconf} --with-bignum=no" + + use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn" 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-mule \ + --with-unicode-internal \ --without-canna \ --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 } @@ -217,11 +219,7 @@ src_install() { 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 + dodir /usr/lib/xemacs/mule-packages # remove extraneous info files cd "${ED}"/usr/share/info diff --git a/app-editors/xemacs/xemacs-21.5.35.ebuild b/app-editors/xemacs/xemacs-21.5.35.ebuild new file mode 100644 index 000000000000..81c8ab501cb5 --- /dev/null +++ b/app-editors/xemacs/xemacs-21.5.35.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2023 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=8 + +inherit flag-o-matic xdg-utils desktop autotools + +DESCRIPTION="highly customizable open source text editor and application development system" +HOMEPAGE="https://www.xemacs.org/" + +SRC_URI="http://ftp.xemacs.org/pub/xemacs/xemacs-$(ver_cut 1-2)/${P}.tar.gz + neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha amd64 arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" +IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum" + +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 + >=dev-libs/openssl-0.9.6:0= + >=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[unicode(+)] ) + 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:= ) + png? ( >=media-libs/libpng-1.2:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + freewnn? ( app-i18n/freewnn ) + >=sys-libs/ncurses-5.2:= + >=app-eselect/eselect-emacs-1.15 + bignum? ( dev-libs/openssl )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PDEPEND="app-xemacs/xemacs-base + app-xemacs/mule-base" + +src_unpack() { + default_src_unpack +} + +src_prepare() { + use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ + find "${S}"/lisp -name '*.elc' -exec rm {} \; || die + eapply "${FILESDIR}/${P}-configure.patch" + eapply "${FILESDIR}/${P}-mule-tests.patch" + + eapply_user + + eautoconf + + # 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" + + 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 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 freewnn wnn )" + + # 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 --with-cflags-debugging=" + + use bignum && myconf="${myconf} --with-bignum=openssl" || + myconf="${myconf} --with-bignum=no" + + use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn" + + econf ${myconf} \ + $(use_with gif ) \ + $(use_with gpm ) \ + $(use_with postgres postgresql ) \ + $(use_with ldap ) \ + $(use_with pop ) \ + --prefix=/usr \ + --with-mule \ + --with-unicode-internal \ + --without-canna \ + --with-ncurses \ + --with-msw=no \ + --with-mail-locking=flock \ + --with-site-lisp=yes \ + --with-site-modules=yes \ + --enable-option-checking=no \ + --with-last-packages=/usr/lib/xemacs +} + +src_compile() { + emake EMACSLOADPATH="${S}"/lisp +} + +src_install() { + emake prefix="${ED}"/usr \ + mandir="${ED}"/usr/share/man/man1 \ + infodir="${ED}"/usr/share/info \ + libdir="${ED}"/usr/$(get_libdir) \ + datadir="${ED}"/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 "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed" + done + + # rename man pages + for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do + mv "${ED}"/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/ + dodir /usr/lib/xemacs/mule-packages + + # remove extraneous info files + cd "${ED}"/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.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild new file mode 100644 index 000000000000..172643503b1d --- /dev/null +++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild @@ -0,0 +1,259 @@ +# Copyright 1999-2024 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=8 + +inherit flag-o-matic xdg-utils desktop autotools + +DESCRIPTION="highly customizable open source text editor and application development system" +HOMEPAGE="https://www.xemacs.org/" +SRC_URI="neXt? ( http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz )" + +inherit mercurial +EHG_REPO_URI="https://foss.heptapod.net/xemacs/xemacs" + +LICENSE="GPL-3+" +SLOT="0" +IUSE="alsa debug gif gpm pop postgres ldap xface nas dnd X jpeg tiff png motif freewnn xft xim athena neXt Xaw3d gdbm berkdb +bignum" + +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 + >=dev-libs/openssl-0.9.6:0= + >=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[unicode(+)] ) + 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:= ) + png? ( >=media-libs/libpng-1.2:0 ) + jpeg? ( media-libs/libjpeg-turbo:= ) + freewnn? ( app-i18n/freewnn ) + >=sys-libs/ncurses-5.2:= + >=app-eselect/eselect-emacs-1.15 + bignum? ( dev-libs/openssl )" + +DEPEND="${RDEPEND} + virtual/pkgconfig" + +PDEPEND="app-xemacs/xemacs-base + app-xemacs/mule-base" + +src_unpack() { + mercurial_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 + eapply "${FILESDIR}/${PN}-21.5.35-mule-tests.patch" + eapply "${FILESDIR}/${PN}-21.5.35-configure-libc-version.patch" + + eapply_user + + eautoconf + + # 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" + + 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 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 freewnn wnn )" + + # 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 + + if use debug ; then + myconf="${myconf} --with-debug" + # bug #924339 + append-flags -fno-strict-aliasing + else + myconf="${myconf} --with-optimization --with-cflags-debugging=" + fi + + use bignum && myconf="${myconf} --with-bignum=openssl" || + myconf="${myconf} --with-bignum=no" + + use freewnn && append-cppflags "-I. -I${ESYSROOT}/usr/include/wnn" + + econf ${myconf} \ + $(use_with gif ) \ + $(use_with gpm ) \ + $(use_with postgres postgresql ) \ + $(use_with ldap ) \ + $(use_with pop ) \ + --prefix=/usr \ + --with-mule \ + --with-unicode-internal \ + --without-canna \ + --with-ncurses \ + --with-msw=no \ + --with-mail-locking=flock \ + --with-site-lisp=yes \ + --with-site-modules=yes \ + --enable-option-checking=no \ + --with-last-packages=/usr/lib/xemacs +} + +src_compile() { + emake EMACSLOADPATH="${S}"/lisp +} + +src_install() { + emake prefix="${ED}"/usr \ + mandir="${ED}"/usr/share/man/man1 \ + infodir="${ED}"/usr/share/info \ + libdir="${ED}"/usr/$(get_libdir) \ + datadir="${ED}"/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 "${ED}"/usr/bin/${i} "${ED}"/usr/bin/${i}-xemacs || die "mv ${i} failed" + done + + # rename man pages + for i in ctags etags gnuserv gnuclient gnudoit gnuattach; do + mv "${ED}"/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/ + dodir /usr/lib/xemacs/mule-packages + + # remove extraneous info files + cd "${ED}"/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/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest index 528164aaae89..b9fdce0a81de 100644 --- a/app-editors/xmlcopyeditor/Manifest +++ b/app-editors/xmlcopyeditor/Manifest @@ -1,2 +1 @@ -DIST xmlcopyeditor-1.2.1.3.tar.gz 4266907 BLAKE2B 52e8c27a37edbcc0da46b52443f5b6754252a62f1abb7746e724270dd5cd9a2db4de60e68d495008ef55a18e9c25149825c9b26c5fd6e20d8e3937931de64e74 SHA512 1adda58bc262cd22898ba22eed3cad9f4a51f199e779172af2d51c5d7bf6dac072b9015b90906236de83d7acebe29d0aae6ae73998ec9d9b3c58b02f081e0b4d -DIST xmlcopyeditor-1.3.0.0.tar.gz 4981894 BLAKE2B decaf8d08bcf6392624160f512e02c0e1b8924df1147d2fb19b744357077f9b23a99781c0f47c5800feffa600aea7b1fadb65282b5da438521be079aeb917de4 SHA512 5feebc56124601c1a8b7a3079b8f766c6282c256e39a2e34cdf64156ba910195a1b64fecea41d0a4022f00dcd3cd4f46f433fff3766acb6239ca70d7675b14c0 +DIST xmlcopyeditor-1.3.1.0.tar.gz 5273837 BLAKE2B e3174587defb1941f4d40d91eec101e7de3996b5faf81061f66cdc6b7d092637a273a9b4ed5a83e72c5b0fcfd5d12e80420cb6890d71a667f0440ab818098df8 SHA512 ea262e1ac6536b71e3328e695ae5825a9aff7db7a8024eedc1b3f568a75deda06f0aaff838438f91ba44de5280d6288dc8dc2d85f74f1eb638ecc01e60481be7 diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch deleted file mode 100644 index 435b777b43d7..000000000000 --- a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.1.3-no-automagic-enchant.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- xmlcopyeditor-1.2.1.3.orig/configure.ac -+++ xmlcopyeditor-1.2.1.3/configure.ac -@@ -139,13 +139,9 @@ - AC_CHECK_HEADER(expat.h, , - AC_MSG_ERROR([Expat headers not found])) - --# Check enchant is available --PKG_CHECK_MODULES(ENCHANT, [enchant], [CXXFLAGS="$CXXFLAGS -DUSE_ENCHANT"], -- # otherwise Check ASPELL is available -- [AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"], -- AC_MSG_ERROR([Aspell headers not found]))] --) -- -+# Check Aspell is available -+AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"], -+ AC_MSG_ERROR([Aspell headers not found])) - AC_SUBST(ASPELL_LIBS) - - # Check gtk diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch deleted file mode 100644 index e07b90c5eafe..000000000000 --- a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.3.0.0-no-automagic-enchant.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 30bdf60..034bb26 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -105,13 +105,9 @@ AC_LANG(C++) - AC_CHECK_HEADER(expat.h, , - AC_MSG_ERROR([Expat headers not found])) - --# Check enchant is available --PKG_CHECK_MODULES(ENCHANT, [enchant], [CXXFLAGS="$CXXFLAGS -DUSE_ENCHANT"], -- # otherwise Check ASPELL is available -- [AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"], -- AC_MSG_ERROR([Aspell headers not found]))] --) -- -+# Check Aspell is available -+AC_CHECK_HEADER(aspell.h, [ASPELL_LIBS="-laspell"], -+ AC_MSG_ERROR([Aspell headers not found])) - AC_SUBST(ASPELL_LIBS) - - AC_MSG_CHECKING([the GTK version to use]) diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild deleted file mode 100644 index 740c3a09313e..000000000000 --- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.1.3-r1.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WX_GTK_VER="3.0" -inherit autotools wxwidgets xdg - -DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor" -HOMEPAGE="http://xml-copy-editor.sourceforge.net/" -SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="aqua nls" - -RDEPEND=" - app-text/aspell - dev-libs/libxml2 - dev-libs/libxslt - dev-libs/xerces-c[icu] - dev-libs/libpcre - x11-libs/wxGTK:${WX_GTK_VER}[X]" -DEPEND="${RDEPEND} - dev-libs/boost" -BDEPEND="dev-util/intltool" - -PATCHES=( "${FILESDIR}"/${P}-no-automagic-enchant.patch ) - -src_prepare() { - default - - # bug #440744 - sed -i -e 's/ -Wall -g -fexceptions//g' configure.ac || die - eautoreconf -} - -src_configure() { - setup-wxwidgets unicode - econf \ - --with-wx-config="${WX_CONFIG}" \ - $(use_enable nls) -} diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0.ebuild index a4f5153d85c8..a3f1bb036466 100644 --- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.0.0.ebuild +++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.3.1.0.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -WX_GTK_VER="3.0-gtk3" +WX_GTK_VER="3.2-gtk3" inherit autotools wxwidgets xdg DESCRIPTION="XML Copy Editor is a fast, free, validating XML editor" -HOMEPAGE="http://xml-copy-editor.sourceforge.net/" +HOMEPAGE="https://xml-copy-editor.sourceforge.io" SRC_URI="mirror://sourceforge/xml-copy-editor/${P}.tar.gz" LICENSE="GPL-2" @@ -16,20 +16,20 @@ KEYWORDS="~amd64 -ppc ~x86 ~amd64-linux ~x86-linux" # -ppc due SSE2 requirement IUSE="aqua nls" RDEPEND=" - app-text/aspell + app-text/enchant:2 dev-libs/libxml2 dev-libs/libxslt dev-libs/xerces-c[cpu_flags_x86_sse2,icu] dev-libs/libpcre - x11-libs/wxGTK:${WX_GTK_VER}[X]" + x11-libs/wxGTK:${WX_GTK_VER}[X] +" DEPEND="${RDEPEND} - dev-libs/boost" -BDEPEND="dev-util/intltool - virtual/pkgconfig" - -S="${WORKDIR}"/${PN} - -PATCHES=( "${FILESDIR}"/${P}-no-automagic-enchant.patch ) + dev-libs/boost +" +BDEPEND=" + dev-util/intltool + virtual/pkgconfig +" src_prepare() { default diff --git a/app-editors/xvile/Manifest b/app-editors/xvile/Manifest index 2d066198a07c..a9cd6fd654ee 100644 --- a/app-editors/xvile/Manifest +++ b/app-editors/xvile/Manifest @@ -1 +1,4 @@ -DIST vile-9.8t.tgz 2352119 BLAKE2B fc1c75eba09e8be99945ba0d178fd150576d8108f906afb20dba265adaee9e5bea4869415d3ebceabf0b6b56c147add79e9c7e4fe34d7f4744930c3728e4a4a4 SHA512 4be4e37c7231395cae9236796073c2c3e428f1945283785a931c5d4cce94e0f970efa6634b0f9053679a00f4b4577704ea38ded2129e444b26ee9935a1c3d229 +DIST vile-9.8y.tgz 2477410 BLAKE2B 993f43a8e033e40d95c6d762daafebf328cae291380d448ec14b2a335569d5de7f628308433cb5abec15958bf1fc47c29f3f0ed49282f22cf7affd839c6ac2c6 SHA512 ce3c7178f6aecfd152e487d0053399739cf8880aa9c38283c9e4e7b95606fa2484f3cf9f7e797f538a47555be5257fbd34b112210e68a39d74f6b8ae7d968c32 +DIST vile-9.8y.tgz.asc 729 BLAKE2B 224cc75c025eb81b898990cb9f44a24e340664c658cead90f16d9103ed3bd3f15ce2c5dcf278c25f4a82069be2d39905f241c5d263b3170a731fb7e865cc45f7 SHA512 5475819801b6dcf3259811b5d3e29584a89baf574ca5685e61c6f98ba15c088ac6843bef66d2a9008b18fb4013fb40aa963ee48b15a786d6724f9ad7a599bd13 +DIST vile-9.8z.tgz 2491799 BLAKE2B a581d269931b2f14307a37e9ec9166cd66d6b48aea15405b6805d6ef2ff448342ff4027d10ef67ed9eace1083484ff282edd8f13341ed515a2f11efed9f8e74d SHA512 f5ff6f3d239f993d7b060e89650567e1c622cec1a024901e29d15cd9a588e8603097e12087d54e88beca91a3a7cd7328a541bac62889368da6636f143d6380ff +DIST vile-9.8z.tgz.asc 729 BLAKE2B 62c9a5b34f3c1018df7e702dfc8e2bc24012aefb305abc1f21a58181a4ec89df6358d601ced10b41942c2bd63dc4e97f56987f90293deb4c8783dc0b98c38065 SHA512 0c7f5b64425f3f28833e54e072709687730e10fab7e231c1850335aa736ddeb5a6c800b66bab2ad6c79460d13987ee6803f9abb0606cd79682e2e1026b3ece25 diff --git a/app-editors/xvile/metadata.xml b/app-editors/xvile/metadata.xml index 5156eb857fef..d110c3ebb42b 100644 --- a/app-editors/xvile/metadata.xml +++ b/app-editors/xvile/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <changelog>https://invisible-island.net/vile/CHANGES.html</changelog> + <remote-id type="github">ThomasDickey/vile-snapshots</remote-id> </upstream> </pkgmetadata> diff --git a/app-editors/xvile/xvile-9.8t-r1.ebuild b/app-editors/xvile/xvile-9.8t-r1.ebuild deleted file mode 100644 index f36ba9af2292..000000000000 --- a/app-editors/xvile/xvile-9.8t-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${PN/x/}-${PV}" -DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone" -HOMEPAGE="https://invisible-island.net/vile/" -SRC_URI="ftp://ftp.invisible-island.net/vile/current/${MY_P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86" -IUSE="perl" - -RDEPEND="perl? ( dev-lang/perl ) - ~app-editors/vile-${PV} - virtual/libcrypt:= - >=x11-libs/libX11-1.0.0 - >=x11-libs/libXt-1.0.0 - >=x11-libs/libICE-1.0.0 - >=x11-libs/libSM-1.0.0 - >=x11-libs/libXaw-1.0.1 - >=x11-libs/libXpm-3.5.4.2" -DEPEND="${RDEPEND} - x11-base/xorg-proto - sys-devel/flex" - -S=${WORKDIR}/${MY_P} - -src_configure() { - econf \ - --with-ncurses \ - --with-x \ - $(use_with perl) -} - -src_install() { - dobin xvile - dodoc CHANGES* README doc/*.doc - docinto html - dodoc doc/*.html -} diff --git a/app-editors/xvile/xvile-9.8y.ebuild b/app-editors/xvile/xvile-9.8y.ebuild new file mode 100644 index 000000000000..70e771e477e2 --- /dev/null +++ b/app-editors/xvile/xvile-9.8y.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bump with app-editors/vile + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig + +MY_P="${PN/x/}-${PV}" +DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone" +HOMEPAGE="https://invisible-island.net/vile/" +SRC_URI="https://invisible-island.net/archives/vile/current/${MY_P}.tgz" +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/vile/current/${MY_P}.tgz.asc )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~ia64 ppc ~riscv sparc x86" +IUSE="perl" + +RDEPEND=" + ~app-editors/vile-${PV} + virtual/libcrypt:= + >=x11-libs/libX11-1.0.0 + >=x11-libs/libXt-1.0.0 + >=x11-libs/libICE-1.0.0 + >=x11-libs/libSM-1.0.0 + >=x11-libs/libXaw-1.0.1 + >=x11-libs/libXpm-3.5.4.2 + perl? ( dev-lang/perl:= ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-alternatives/lex + virtual/pkgconfig + verify-sig? ( sec-keys/openpgp-keys-thomasdickey ) +" + +S="${WORKDIR}"/${MY_P} + +src_configure() { + econf \ + --disable-stripping \ + --with-ncurses \ + --with-pkg-config \ + --with-x \ + $(use_with perl) +} + +src_install() { + dobin xvile + dodoc CHANGES* README doc/*.doc + docinto html + dodoc doc/*.html +} diff --git a/app-editors/xvile/xvile-9.8z.ebuild b/app-editors/xvile/xvile-9.8z.ebuild new file mode 100644 index 000000000000..6cd5f2976846 --- /dev/null +++ b/app-editors/xvile/xvile-9.8z.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bump with app-editors/vile + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/thomasdickey.asc +inherit verify-sig + +MY_P="${PN/x/}-${PV}" +DESCRIPTION="VI Like Emacs -- yet another full-featured vi clone" +HOMEPAGE="https://invisible-island.net/vile/" +SRC_URI="https://invisible-island.net/archives/vile/current/${MY_P}.tgz" +SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/vile/current/${MY_P}.tgz.asc )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 ~ia64 ppc ~riscv sparc x86" +IUSE="perl" + +RDEPEND=" + ~app-editors/vile-${PV} + virtual/libcrypt:= + >=x11-libs/libX11-1.0.0 + >=x11-libs/libXt-1.0.0 + >=x11-libs/libICE-1.0.0 + >=x11-libs/libSM-1.0.0 + >=x11-libs/libXaw-1.0.1 + >=x11-libs/libXpm-3.5.4.2 + perl? ( dev-lang/perl:= ) +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" +BDEPEND=" + app-alternatives/lex + virtual/pkgconfig + verify-sig? ( >=sec-keys/openpgp-keys-thomasdickey-20240114 ) +" + +S="${WORKDIR}"/${MY_P} + +src_configure() { + econf \ + --disable-stripping \ + --with-ncurses \ + --with-pkg-config \ + --with-x \ + $(use_with perl) +} + +src_install() { + dobin xvile + dodoc CHANGES* README doc/*.doc + docinto html + dodoc doc/*.html +} diff --git a/app-editors/yudit/Manifest b/app-editors/yudit/Manifest index b5f4f3c24507..93e80c06ad1c 100644 --- a/app-editors/yudit/Manifest +++ b/app-editors/yudit/Manifest @@ -1 +1,2 @@ DIST yudit-2.9.6.tar.gz 2797142 BLAKE2B 76fb8e0ade65c84389db71b4100e458f5b70aebba27eea4b604bfcee08974060dcd2bab2d86586b5ba729d8d5090c943e825dfe58d71c609f0ca2f2e0c3900c9 SHA512 a9a0b6f6c44451cf2fefc4fc0bb1bbd9ffccd17c4c622dc35b08113245b3bb9f3ca949f3e7b9d2aa919ebf3840295c5e63c0297576e74a5f2d1fb99cfc97c46b +DIST yudit-3.1.0.tar.gz 4317815 BLAKE2B fdcec8402bd87f800b0e2712f74d5d546d7ba0733b36fec720e46ef0c5efc0be340ec8db7ffe101c5596d054cc10e1364bf2d5a70f25b234e57165b5116edd80 SHA512 07b89cdea29971fe49a7e61e2919261d6a39a6420c2587fad160a78885513460cb210b63dbfc1320f993d38e56e4104f77911530b9b7da210bfb7390e37ed352 diff --git a/app-editors/yudit/metadata.xml b/app-editors/yudit/metadata.xml index 85e4ed814fa2..115e9d64a669 100644 --- a/app-editors/yudit/metadata.xml +++ b/app-editors/yudit/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-editors/yudit/yudit-2.9.6.ebuild b/app-editors/yudit/yudit-2.9.6.ebuild index e46388fb702c..e9bbd2b8ef67 100644 --- a/app-editors/yudit/yudit-2.9.6.ebuild +++ b/app-editors/yudit/yudit-2.9.6.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DESCRIPTION="Free (Y)unicode text editor for all unices" HOMEPAGE="http://www.yudit.org/" @@ -12,10 +12,11 @@ SLOT="0" KEYWORDS="amd64 x86" RDEPEND="x11-libs/libX11" -DEPEND="${RDEPEND} - >=sys-devel/gettext-0.10" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" src_prepare() { + default #Don't strip binaries, let portage do that. sed -i "/^INSTALL_PROGRAM/s: -s::" Makefile.conf.in || die "sed failed" } diff --git a/app-editors/yudit/yudit-3.1.0-r1.ebuild b/app-editors/yudit/yudit-3.1.0-r1.ebuild new file mode 100644 index 000000000000..faaae1391bc4 --- /dev/null +++ b/app-editors/yudit/yudit-3.1.0-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Free (Y)unicode text editor for all unices" +HOMEPAGE="https://www.yudit.org/" +SRC_URI="https://yudit.org/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +DOCS=( {BUGS,CHANGELOG,NEWS,TODO}.TXT ) + +src_prepare() { + default + # Don't strip binaries, let portage do that. + # Don't call ar / ranlib directly + sed -i \ + -e "/^INSTALL_PROGRAM/s| -s||" \ + -e "s|ar cr|$(tc-getAR) cr|g" \ + -e "s|ranlib|$(tc-getRANLIB)|g" \ + Makefile.conf.in || die "sed failed" +} diff --git a/app-editors/yudit/yudit-3.1.0.ebuild b/app-editors/yudit/yudit-3.1.0.ebuild new file mode 100644 index 000000000000..d8a33c321865 --- /dev/null +++ b/app-editors/yudit/yudit-3.1.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Free (Y)unicode text editor for all unices" +HOMEPAGE="https://www.yudit.org/" +SRC_URI="https://yudit.org/download/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" + +RDEPEND="x11-libs/libX11" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext" + +src_prepare() { + default + # Don't strip binaries, let portage do that. + sed -i "/^INSTALL_PROGRAM/s: -s::" Makefile.conf.in || die "sed failed" +} + +src_install() { + emake DESTDIR="${D}" install + dodoc {BUGS,CHANGELOG,NEWS,TODO}.TXT +} diff --git a/app-editors/zile/Manifest b/app-editors/zile/Manifest index ec186e19f4ea..fb9194a4c5e5 100644 --- a/app-editors/zile/Manifest +++ b/app-editors/zile/Manifest @@ -1,2 +1,2 @@ -DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9 DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575 +DIST zile-2.6.2.tar.gz 1152751 BLAKE2B db51b534c8d76e1def91bbfe49cab501ff1bccd6fbeddd5622d8fca3695305c53e480eed1978e880621e09955e2b98519cfa02cf259006a08d1a8722122148ea SHA512 16d5cece403fc215d53b35c31fe6f743d53d7a01cdc7d101cabe6760173539c9c31e092b29c374f28a723708027f6de626fcfee302962848091f85078fa81761 diff --git a/app-editors/zile/files/zile-2.3.24-gets.patch b/app-editors/zile/files/zile-2.3.24-gets.patch deleted file mode 100644 index 9060c4bcf921..000000000000 --- a/app-editors/zile/files/zile-2.3.24-gets.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/623218 -Backported from gnulib in zile-2.4.11. - ---- zile-2.3.24-orig/lib/stdio.in.h -+++ zile-2.3.24/lib/stdio.in.h -@@ -717,22 +717,11 @@ - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - diff --git a/app-editors/zile/files/zile-2.3.24-userhome.patch b/app-editors/zile/files/zile-2.3.24-userhome.patch deleted file mode 100644 index 37f605ccf610..000000000000 --- a/app-editors/zile/files/zile-2.3.24-userhome.patch +++ /dev/null @@ -1,26 +0,0 @@ -http://lists.gnu.org/archive/html/bug-zile/2011-08/msg00030.html - ---- zile-2.3.24-orig/src/file.c -+++ zile-2.3.24/src/file.c -@@ -177,14 +177,15 @@ compact_path (astr path) - { - /* Replace `/userhome/' (if found) with `~/'. */ - size_t homelen = strlen (pw->pw_dir); -- if (astr_len (path) >= homelen && -- !strncmp (pw->pw_dir, astr_cstr (path), homelen)) -+ if (homelen > 0 && pw->pw_dir[homelen - 1] == '/') -+ homelen--; -+ -+ if (astr_len (path) > homelen && -+ !strncmp (pw->pw_dir, astr_cstr (path), homelen) && -+ astr_get (path, homelen) == '/') - { - astr buf = astr_new_cstr ("~/"); -- if (STREQ (pw->pw_dir, "/")) -- astr_cat_cstr (buf, astr_cstr (path) + 1); -- else -- astr_cat_cstr (buf, astr_cstr (path) + homelen + 1); -+ astr_cat_cstr (buf, astr_cstr (path) + homelen + 1); - astr_cpy (path, buf); - astr_delete (buf); - } diff --git a/app-editors/zile/metadata.xml b/app-editors/zile/metadata.xml index b55d67a17365..26b23325a7f0 100644 --- a/app-editors/zile/metadata.xml +++ b/app-editors/zile/metadata.xml @@ -1,18 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>emacs@gentoo.org</email> - <name>Gentoo Emacs project</name> -</maintainer> -<longdescription> + <maintainer type="project"> + <email>emacs@gentoo.org</email> + <name>Gentoo Emacs project</name> + </maintainer> + <longdescription> Zile is a small, fast, and powerful Emacs clone. It is useful for small footprint installations (e.g. on floppy disk), machines with little memory, or quick editing sessions, especially on remote machines or as a different user, e.g. root. -</longdescription> -<use> - <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> - in tests</flag> -</use> + </longdescription> + <upstream> + <remote-id type="savannah">zile</remote-id> + </upstream> </pkgmetadata> diff --git a/app-editors/zile/zile-2.3.24-r2.ebuild b/app-editors/zile/zile-2.3.24-r2.ebuild deleted file mode 100644 index a283c37c087d..000000000000 --- a/app-editors/zile/zile-2.3.24-r2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" -IUSE="test valgrind" -RESTRICT="!test? ( test )" - -RDEPEND="sys-libs/ncurses:0=" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( valgrind? ( dev-util/valgrind ) )" - -PATCHES=("${FILESDIR}"/${P}-{userhome,gets}.patch) - -src_configure() { - # --without-emacs to suppress tests for GNU Emacs #630652 - econf \ - --without-emacs \ - $(use test && use_with valgrind || echo "--without-valgrind") \ - 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 TERM=vt100 instead" - TERM=vt100 emake check - fi -} - -src_install() { - emake DESTDIR="${D}" install - - # FAQ is installed by the build system in /usr/share/zile - dodoc AUTHORS BUGS NEWS README THANKS - - # Zile should never install charset.alias (even on non-glibc arches) - rm -f "${ED}"/usr/lib/charset.alias -} diff --git a/app-editors/zile/zile-2.4.15.ebuild b/app-editors/zile/zile-2.4.15.ebuild index 0a31cf744593..05b1686856f7 100644 --- a/app-editors/zile/zile-2.4.15.ebuild +++ b/app-editors/zile/zile-2.4.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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-solaris" +KEYWORDS="~alpha amd64 arm arm64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="acl" RDEPEND=">=dev-libs/boehm-gc-7.2:= @@ -28,6 +28,7 @@ BDEPEND="dev-lang/perl DOCS="README THANKS" QA_AM_MAINTAINER_MODE=".*help2man.*" #450278 +QA_CONFIG_IMPL_DECL_SKIP=(MIN) #923835 (false positive) src_configure() { econf \ diff --git a/app-editors/zile/zile-2.6.2-r2.ebuild b/app-editors/zile/zile-2.6.2-r2.ebuild new file mode 100644 index 000000000000..3293dc270cea --- /dev/null +++ b/app-editors/zile/zile-2.6.2-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs vala + +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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND="dev-libs/glib:2 + dev-libs/libgee:0.8= + sys-libs/ncurses:0=" + +DEPEND="${RDEPEND}" + +BDEPEND="dev-lang/perl + sys-apps/help2man + virtual/pkgconfig + $(vala_depend)" + +# AUTHORS, FAQ, and NEWS are installed by the build system +DOCS="README THANKS" + +QA_AM_MAINTAINER_MODE=".*help2man.*" #450278 + +src_prepare() { + default + vala_setup + rm *_vala.stamp || die +} + +src_configure() { + econf 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 +} |