diff options
Diffstat (limited to 'app-editors')
87 files changed, 3108 insertions, 635 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 9ce135565815..cc7b51e46a47 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/ecrire/Manifest b/app-editors/ecrire/Manifest index 56f6699cff8a..666f6ec73148 100644 --- a/app-editors/ecrire/Manifest +++ b/app-editors/ecrire/Manifest @@ -1,3 +1,3 @@ DIST ecrire-0.2.0.tar.xz 43852 BLAKE2B 75c29848a2c849ae15bf8e14e59bfd9ec76281ca5f8d4be92d330abee5de0c024102f0aa69669df5f2ce5fa28a4b75f49281d4a437288762b0658cc4ebec0ff9 SHA512 6158ac063bdcecf13b2f45448aebcf624d9fe3029d8b2e4bbe40104fbfb5627b02f76112901dfe5617c27dce7ebbf95c277ec6def031efb8a8f1034c092836ef -EBUILD ecrire-0.2.0-r1.ebuild 575 BLAKE2B c9c9be81806d83844dd6a6d6d0348bed37e170b833bedbb29aafd37f6be856ebd8884ddba456fe03bebc0d06e40da35ce8b3780dbf7697224dd74d93034362f4 SHA512 b2688fcf3669f223b973f15e97ca1963c526ff1b9989e1b6c729effc59ea362e45f7fb13e16c21e0c6589dd35361f99b3f12808c8e030d2482e5f451d16091a6 +EBUILD ecrire-0.2.0-r1.ebuild 573 BLAKE2B 1acd4068085a0e673d962cc4d6dfe178336f1181efb02294b033b8e85a0b3d15476b736f4246e1be8ee76d103a523fa32ba1e9d9aea8ba34faaacfd8cc8f8d65 SHA512 f06d34cfda9926612defc9ff51c04e0caffb68086ca849ce6c63785fa6cb68351293de1db286131f0fa2e021555dfb43895ae1a6ffeaeb0da53183c7fefd6729 MISC metadata.xml 255 BLAKE2B 6fe10a1f843a8b2494606052a69206e32fdd5edf3ca6bdfb661cf6f8e39c0e16fb652acb8697d339770f3559c56a4ba964a0e959b3e0bb456d09ee7570f0d9e9 SHA512 235170971553178916cc484a07e1c665c94cd0a7ec442d2190d3608f7a3441dd2fe08fea666ca23d151077c10c908bc1da0e57355fab43be02711be35531b362 diff --git a/app-editors/ecrire/ecrire-0.2.0-r1.ebuild b/app-editors/ecrire/ecrire-0.2.0-r1.ebuild index 3b8035560242..b32f2534ad6b 100644 --- a/app-editors/ecrire/ecrire-0.2.0-r1.ebuild +++ b/app-editors/ecrire/ecrire-0.2.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://download.enlightenment.org/rel/apps/ecrire/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="nls" DEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] ) diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 2584c9abcb9e..031badff9bab 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -11,6 +11,7 @@ DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee7 DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B c03947780518ebf86994b1af20cc24377094c55c783e3cbb0230da5ecb4c92613c4e6d599cefe51b297cc117e3a832c6b34365cc983da0630a9ca6f39b58d10e SHA512 a72af0dd47989b5e4ceecc48d8dfd1a362cdda17070a6a5a9c53c0448a7bceed3b27efd0dd78a0cbe3eb503015b1475cd52fc01c5aca10a52ad30635f385b190 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9 DIST emacs-28.0.91.tar.xz 47651228 BLAKE2B 94cfd907cb602ab698ffaa5c29aa1db2ff1b8538e1d6a0e20aa72ac1cb77e3c07759cf28cbe47027b155a08ce305c9c6ae01a6b82eb3468b2f4d4b49d51a3430 SHA512 bc325b685c3bb783cae03209107572980197a4278a45b1546e1528d593a476556f227c979d6d6a55ab44f2ca0535ed912a284b89258157bd6c995ab555445133 +DIST emacs-28.0.92.tar.xz 47692892 BLAKE2B 3a0a1e6cec79dd56c36d7f3227654f10e1d0d1a7b933a269e25bdd0da6bcec6653500ee0775b70bafdb09bb59d0976474535b82316eee592fafc8fa9e4d7c0e7 SHA512 5e6800baf2ee5a8127956517578cbddcc8fe71fdd9925a04e53ae645b455bc49300c72604d4401c837a733eaeb54fa4ab43ed3bc2bc68e31d4c33ced6e6c9a33 EBUILD emacs-18.59-r14.ebuild 4351 BLAKE2B 43b9d632623afd061f1259166faebd1c5329a172c16c718623de60a3c7bf77762eb59e4e5e37f97ea84d3e9623277c83a9364d2af6bf5118b3143d3391da5fe7 SHA512 0527e11b681a053438c89d1576f3ea5967f7892fb79885d126aff1d38d4321d55c317a331cd48aee3464ce9f5a391439ff1dba8e47ac334ec2cc8645fb41b3f4 EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c23284652937e7635c853a34cf20116d2ebf651c629c7635a2b47072a025e645b344c0ad24f93b569341298856c42e8e096c07 SHA512 fdc01a8ca90039a86c06cac189b06d3370f218f5fe3cdc0cb614cde2fb9f4ec565264df1b96204613b7a767e5088550135899f1292737646152ab660c67d718c EBUILD emacs-24.5-r11.ebuild 10816 BLAKE2B 9968d323497774e9f864ff9f41e54b2cea4ed471836e9644ac675728cc83b955ddcf93d0a94af359beb722da5ec5d7c4e267a732fadc592fc00d740692ed65df SHA512 417cdbef740b8b6b122446547e87e527355208c3894fe88720114b9ec8ae22ce62cf44de5a571997601fa6cb17b208633c18a6017838386285302322ec3c8ea4 @@ -18,6 +19,7 @@ EBUILD emacs-25.3-r11.ebuild 11126 BLAKE2B 094e3beb2f13d6f9b16b29b0758eac7aec05e EBUILD emacs-26.3-r6.ebuild 11825 BLAKE2B 1df12880101fce336ded064f8e91840b9f1a66b213367f46503c0ec19fcd1db45f0fedfe0db895141d44a8d2bfcc506c8683dda949429b5910b8cad360d241c7 SHA512 0608d4f489447e4545c2510a446293cd34a4164e2f6348b143a158df78dc6e362d166cda25177d86daac52fb31c7a85d1519de9b8583b1a2b4fe8782bca4c785 EBUILD emacs-27.2-r5.ebuild 14528 BLAKE2B e38deb5d4f19d64279e151ed9a09e3b21010ca6347e9bc898297d048a84e5e2e00639094790e4383c16ab51af98b4e805f7018a3caa2cd6976fd5cfc44dc5cdc SHA512 5f61316ede791cdf52d6952c63da7a458311df49080f1502619477a0453112cbc08f8f2e8eebfa2586775655b50cb0cae1a951b2c47b038cbe54978fc99948e5 EBUILD emacs-28.0.91.ebuild 14952 BLAKE2B 830648e4cd3d0ceeb6bdf7b7f8d9f9e5f41be5266d15bcf124ede1155a11221cf101bbcf8966f606fe50d77728f7e80693dfc7f2237b1570ce16afa30063d812 SHA512 d9c8fa7467e9bc850940b320c0e77dd7ec32a031786e9b3088816f238ac43ed6deb6da3dc43e9b48a9b8e003d44a70febbfee98d9096fd27767699c0d6b7f9fb +EBUILD emacs-28.0.92.ebuild 14952 BLAKE2B 830648e4cd3d0ceeb6bdf7b7f8d9f9e5f41be5266d15bcf124ede1155a11221cf101bbcf8966f606fe50d77728f7e80693dfc7f2237b1570ce16afa30063d812 SHA512 d9c8fa7467e9bc850940b320c0e77dd7ec32a031786e9b3088816f238ac43ed6deb6da3dc43e9b48a9b8e003d44a70febbfee98d9096fd27767699c0d6b7f9fb EBUILD emacs-28.0.9999-r1.ebuild 14951 BLAKE2B e008a0398f8e8e83291f19cf67f018a7316edeb6cf9fd8b62ff0773c8b667989e189a984ff2b1a8a6ad3336af722e0ad65dfb55e2512fdea5481ea5559a268c0 SHA512 6063c3eaccdccb08512896c4eb76f61d2970613797641f4366fbe311be8ccc5f4a78eef0782664b50888cecc410627abea1651be593b24b486490514dc572608 -EBUILD emacs-29.0.9999.ebuild 16366 BLAKE2B 0cea0a7efd73f0d27de091e8bf35b67eccab897ce9230462b185d266804577aaa575e07ad9de819378d122d06974688088b33435a17581f2521dde67dd7ae59c SHA512 35c05560081f694153cdb728095e846a2081699a97d781acd9718e948a76255daf03d382e565b45429e61e775e6cc2203a7db285793047802c028bcc827f4c65 +EBUILD emacs-29.0.9999.ebuild 16433 BLAKE2B af35f6977afc4418f7dafefd9dd0d198e34fe9894cf0c19287e9931ebdbf810cfd87eb56602e2ee67e087bcae5d63b28ddd7d3dbdf92ec16dbda6dbcd5336436 SHA512 e710b91ced2efed78024793f00b6ea7504f70988defb7e860f62f79d286744a5ee986a9cfd2c057a02458dc2cb3a715bc8815519194d55abfdd48cdf563ff6b7 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee diff --git a/app-editors/emacs/emacs-28.0.92.ebuild b/app-editors/emacs/emacs-28.0.92.ebuild new file mode 100644 index 000000000000..89ae30752e40 --- /dev/null +++ b/app-editors/emacs/emacs-28.0.92.ebuild @@ -0,0 +1,459 @@ +# Copyright 1999-2022 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-28" + 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 gconf 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 wide-int Xaw3d xft +xpm xwidgets zlib" +RESTRICT="test" + +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(-)] ) + 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 ) + ssl? ( net-libs/gnutls:0= ) + systemd? ( sys-apps/systemd ) + zlib? ( sys-libs/zlib ) + gui? ( !aqua? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXinerama + 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= ) + 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 + cairo? ( >=x11-libs/cairo-1.12.18 ) + 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= + 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 + ) ) + ) + ) + ) )" + +DEPEND="${RDEPEND} + gui? ( !aqua? ( 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" + +src_prepare() { + if [[ ${PV##*.} = 9999 ]]; then + FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\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 + + if use jit; then + # 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 + # For now, work around the problem with an explicit LIBRARY_PATH + has ccache ${FEATURES} && tc-is-gcc \ + && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ + | sed -n '/^libraries:/{s:^[^/]*::;p}') + fi + + 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 +} + +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 + 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 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 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) \ + $(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 ssl gnutls) \ + $(use_with systemd libsystemd) \ + $(use_with threads) \ + $(use_with wide-int) \ + $(use_with zlib) \ + ${myconf} +} + +src_compile() { + 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 + emake -C lisp all EMACS="${S}-build/src/emacs" + fi + + emake +} + +src_install() { + emake 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 + + # move info dir to avoid collisions with the dir file generated by portage + mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die + touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir + docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig + + # 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/$(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 (setq Info-directory-list (prune-directory-list (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() { + # 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-29.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild index 52f966bf8a7d..b26146f171bc 100644 --- a/app-editors/emacs/emacs-29.0.9999.ebuild +++ b/app-editors/emacs/emacs-29.0.9999.ebuild @@ -40,7 +40,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed 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 motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d xft +xpm xwidgets zlib" +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 motif png selinux sound source sqlite ssl svg systemd +threads tiff toolkit-scroll-bars webp wide-int +X Xaw3d xft +xpm xwidgets zlib" RESTRICT="test" X_DEPEND="x11-libs/libICE @@ -110,6 +110,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] 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 ) zlib? ( sys-libs/zlib ) @@ -347,6 +348,7 @@ src_configure() { $(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) \ diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest index 038602ed4bbc..64693551769c 100644 --- a/app-editors/gedit-plugins/Manifest +++ b/app-editors/gedit-plugins/Manifest @@ -1,3 +1,4 @@ -DIST gedit-plugins-40.1.tar.xz 951024 BLAKE2B 8a5fa07d6b9a5848e66de995c05f389b288e7863fa506476fd82157dc203e472b8ac8b8bdd15b09513e5d819fc58ce4d1077e62e6c5b90f93b14775052bf2737 SHA512 71649d157ac5591e4dd317c44ae167c98fb59e253c45f8c1ff8ef397a9e3f0bb968f0ef2486f9021354269e77defb9e5e305f1538f69818480a250966143c7a3 -EBUILD gedit-plugins-40.1.ebuild 2717 BLAKE2B 5ca39394512387999dc672d688372a43f29ba1ce410e8f0c7654a478780caa614a61fb949fff8293d3e58b5c022d8adbc405b7d481bb8924966a32ed4a274c8f SHA512 d79253703e9bfcb340937608c6382131a545735fcd4dbc6a9282a97c914f68a4b1de28c24c7da6a0397681ad04e5376fdbd7c1e974e8896097848b073d7e176b +AUX gedit-plugins-40.1-meson-0.61.patch 7836 BLAKE2B 07a471c9b270487a10d042d1c0a6084d0f17efb9a697e980110e1256b326b62b52157400fb9cf708758826f9caefa7623de7130c20176d08ae0f4101d557f9f8 SHA512 da912025e69b5f4049382d5a53d505104fa3e0d1163d0ba82d230640ccf5c081d6f1a1569358be81e7e306549cac7fc07d2b705cae1ae41fed089758c40d3a05 +DIST gedit-plugins-41.0.tar.xz 948364 BLAKE2B d5efe779e1f0f70e23a7dadb01b0e5b22c47d3326df6530559698ace274e2a4a3647d34640e89bb250d76bee1f6369d5728316730ce9cf89f3a7db627b3c4d49 SHA512 e0389e8be68406fdcd3c9537b2d2dad0faf19d9a49804a7b5d9cf8e1006254906605dd0b14e2fa1eb7a22d6533d9b55d7f5593fe01a5b412df6361c8b9089f34 +EBUILD gedit-plugins-41.0.ebuild 2717 BLAKE2B 5ca39394512387999dc672d688372a43f29ba1ce410e8f0c7654a478780caa614a61fb949fff8293d3e58b5c022d8adbc405b7d481bb8924966a32ed4a274c8f SHA512 d79253703e9bfcb340937608c6382131a545735fcd4dbc6a9282a97c914f68a4b1de28c24c7da6a0397681ad04e5376fdbd7c1e974e8896097848b073d7e176b MISC metadata.xml 481 BLAKE2B 5fbf2df78aa40fce971741bb7d04de00cdc7a6371c2652ae0ae4bf253ee469c4bbb5e5a7c2b88226f95bb8865930dd19e9adedb191fd5a173ce915890ce40b32 SHA512 3b4b858659d1597e6c1ee574143de4864be8b75d4a6399d47bff85c4b18ec35472523bfeaa0815189a9008764405ee3b2fa53e73fcdc3edc8eda00a5f943f762 diff --git a/app-editors/gedit-plugins/files/gedit-plugins-40.1-meson-0.61.patch b/app-editors/gedit-plugins/files/gedit-plugins-40.1-meson-0.61.patch new file mode 100644 index 000000000000..d8661773ea0d --- /dev/null +++ b/app-editors/gedit-plugins/files/gedit-plugins-40.1-meson-0.61.patch @@ -0,0 +1,208 @@ +https://gitlab.gnome.org/GNOME/gedit-plugins/-/merge_requests/27.patch +https://bugs.gentoo.org/832315 + +From: Jan Beich <jbeich@FreeBSD.org> +Date: Tue, 25 Jan 2022 12:10:06 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +plugins/bookmarks/meson.build:43:0: ERROR: Function does not take positional arguments. +plugins/bracketcompletion/meson.build:32:0: ERROR: Function does not take positional arguments. +plugins/charmap/meson.build:28:0: ERROR: Function does not take positional arguments. +plugins/codecomment/meson.build:32:0: ERROR: Function does not take positional arguments. +plugins/colorpicker/meson.build:32:0: ERROR: Function does not take positional arguments. +plugins/colorschemer/meson.build:41:0: ERROR: Function does not take positional arguments. +plugins/commander/meson.build:37:0: ERROR: Function does not take positional arguments. +plugins/drawspaces/meson.build:58:0: ERROR: Function does not take positional arguments. +plugins/findinfiles/meson.build:64:0: ERROR: Function does not take positional arguments. +plugins/git/meson.build:28:0: ERROR: Function does not take positional arguments. +plugins/joinlines/meson.build:32:0: ERROR: Function does not take positional arguments. +plugins/multiedit/meson.build:28:0: ERROR: Function does not take positional arguments. +plugins/smartspaces/meson.build:36:0: ERROR: Function does not take positional arguments. +plugins/synctex/meson.build:28:0: ERROR: Function does not take positional arguments. +plugins/terminal/meson.build:40:0: ERROR: Function does not take positional arguments. +plugins/textsize/meson.build:28:0: ERROR: Function does not take positional arguments. +plugins/translate/meson.build:49:0: ERROR: Function does not take positional arguments. +plugins/wordcompletion/meson.build:57:0: ERROR: Function does not take positional arguments. +--- a/plugins/bookmarks/meson.build ++++ b/plugins/bookmarks/meson.build +@@ -41,7 +41,6 @@ bookmarks_plugin = custom_target( + ) + + bookmarks_metainfo = i18n.merge_file( +- 'gedit-bookmarks.metainfo.xml', + input: 'gedit-bookmarks.metainfo.xml.in', + output: 'gedit-bookmarks.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/bracketcompletion/meson.build ++++ b/plugins/bracketcompletion/meson.build +@@ -30,7 +30,6 @@ bracketcompletion_plugin = custom_target( + ) + + bracketcompletion_metainfo = i18n.merge_file( +- 'gedit-bracketcompletion.metainfo.xml', + input: 'gedit-bracketcompletion.metainfo.xml.in', + output: 'gedit-bracketcompletion.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/charmap/meson.build ++++ b/plugins/charmap/meson.build +@@ -26,7 +26,6 @@ charmap_plugin = custom_target( + ) + + charmap_metainfo = i18n.merge_file( +- 'gedit-charmap.metainfo.xml', + input: 'gedit-charmap.metainfo.xml.in', + output: 'gedit-charmap.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/codecomment/meson.build ++++ b/plugins/codecomment/meson.build +@@ -30,7 +30,6 @@ codecomment_plugin = custom_target( + ) + + codecomment_metainfo = i18n.merge_file( +- 'gedit-codecomment.metainfo.xml', + input: 'gedit-codecomment.metainfo.xml.in', + output: 'gedit-codecomment.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/colorpicker/meson.build ++++ b/plugins/colorpicker/meson.build +@@ -30,7 +30,6 @@ colorpicker_plugin = custom_target( + ) + + colorpicker_metainfo = i18n.merge_file( +- 'gedit-colorpicker.metainfo.xml', + input: 'gedit-colorpicker.metainfo.xml.in', + output: 'gedit-colorpicker.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/colorschemer/meson.build ++++ b/plugins/colorschemer/meson.build +@@ -39,7 +39,6 @@ colorschemer_plugin = custom_target( + ) + + colorschemer_metainfo = i18n.merge_file( +- 'gedit-colorschemer.metainfo.xml', + input: 'gedit-colorschemer.metainfo.xml.in', + output: 'gedit-colorschemer.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/commander/meson.build ++++ b/plugins/commander/meson.build +@@ -35,7 +35,6 @@ commander_plugin = custom_target( + ) + + commander_metainfo = i18n.merge_file( +- 'gedit-commander.metainfo.xml', + input: 'gedit-commander.metainfo.xml.in', + output: 'gedit-commander.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/drawspaces/meson.build ++++ b/plugins/drawspaces/meson.build +@@ -56,7 +56,6 @@ install_data( + ) + + drawspaces_metainfo = i18n.merge_file( +- 'gedit-drawspaces.metainfo.xml', + input: 'gedit-drawspaces.metainfo.xml.in', + output: 'gedit-drawspaces.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/findinfiles/meson.build ++++ b/plugins/findinfiles/meson.build +@@ -62,7 +62,6 @@ findinfiles_plugin = custom_target( + ) + + findinfiles_metainfo = i18n.merge_file( +- 'gedit-findinfiles.metainfo.xml', + input: 'gedit-findinfiles.metainfo.xml.in', + output: 'gedit-findinfiles.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/git/meson.build ++++ b/plugins/git/meson.build +@@ -26,7 +26,6 @@ git_plugin = custom_target( + ) + + git_metainfo = i18n.merge_file( +- 'gedit-git.metainfo.xml', + input: 'gedit-git.metainfo.xml.in', + output: 'gedit-git.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/joinlines/meson.build ++++ b/plugins/joinlines/meson.build +@@ -30,7 +30,6 @@ joinlines_plugin = custom_target( + ) + + joinlines_metainfo = i18n.merge_file( +- 'gedit-joinlines.metainfo.xml', + input: 'gedit-joinlines.metainfo.xml.in', + output: 'gedit-joinlines.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/multiedit/meson.build ++++ b/plugins/multiedit/meson.build +@@ -26,7 +26,6 @@ multiedit_plugin = custom_target( + ) + + multiedit_metainfo = i18n.merge_file( +- 'gedit-multiedit.metainfo.xml', + input: 'gedit-multiedit.metainfo.xml.in', + output: 'gedit-multiedit.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/smartspaces/meson.build ++++ b/plugins/smartspaces/meson.build +@@ -34,7 +34,6 @@ smartspaces_plugin = custom_target( + ) + + smartspaces_metainfo = i18n.merge_file( +- 'gedit-smartspaces.metainfo.xml', + input: 'gedit-smartspaces.metainfo.xml.in', + output: 'gedit-smartspaces.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/synctex/meson.build ++++ b/plugins/synctex/meson.build +@@ -26,7 +26,6 @@ synctex_plugin = custom_target( + ) + + synctex_metainfo = i18n.merge_file( +- 'gedit-synctex.metainfo.xml', + input: 'gedit-synctex.metainfo.xml.in', + output: 'gedit-synctex.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/terminal/meson.build ++++ b/plugins/terminal/meson.build +@@ -38,7 +38,6 @@ install_data( + ) + + terminal_metainfo = i18n.merge_file( +- 'gedit-terminal.metainfo.xml', + input: 'gedit-terminal.metainfo.xml.in', + output: 'gedit-terminal.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/textsize/meson.build ++++ b/plugins/textsize/meson.build +@@ -26,7 +26,6 @@ textsize_plugin = custom_target( + ) + + textsize_metainfo = i18n.merge_file( +- 'gedit-textsize.metainfo.xml', + input: 'gedit-textsize.metainfo.xml.in', + output: 'gedit-textsize.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/translate/meson.build ++++ b/plugins/translate/meson.build +@@ -47,7 +47,6 @@ install_data( + ) + + translate_metainfo = i18n.merge_file( +- 'gedit-translate.metainfo.xml', + input: 'gedit-translate.metainfo.xml.in', + output: 'gedit-translate.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +--- a/plugins/wordcompletion/meson.build ++++ b/plugins/wordcompletion/meson.build +@@ -55,7 +55,6 @@ install_data( + ) + + wordcompletion_metainfo = i18n.merge_file( +- 'gedit-wordcompletion.metainfo.xml', + input: 'gedit-wordcompletion.metainfo.xml.in', + output: 'gedit-wordcompletion.metainfo.xml', + po_dir: join_paths(srcdir, 'po'), +GitLab diff --git a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild b/app-editors/gedit-plugins/gedit-plugins-41.0.ebuild index d056232a64b2..d056232a64b2 100644 --- a/app-editors/gedit-plugins/gedit-plugins-40.1.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-41.0.ebuild diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest index bdbaa6a36771..d2c8ed12465e 100644 --- a/app-editors/gedit/Manifest +++ b/app-editors/gedit/Manifest @@ -2,6 +2,6 @@ AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01ba AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50 AUX 40.1-fix-meson-0.61.patch 904 BLAKE2B acd66d002974c2030408fa32176e327205b8901e1c41ecb409d0fd6d95dd4e9f8ae79093a5a2f782c595189add73abe76e0049632b6e92a51c99a3df5ce164ac SHA512 fab0dc53cbdaa579dc583ce90760fa1fde5a4ab91d35346646c10ff3d1563168bec59f8cda70119d160cec964dba437910c7cc02a63c15a6472760de303f8c49 AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e -DIST gedit-40.1.tar.xz 6850264 BLAKE2B 2baabac1254d56bf4c6a663012f88505c8f3cfcdd8fd8e020e05d807f727f71cf9088c398702f559e40ba7db31d3a9d135c1148f8a8b178c9107aa2675265910 SHA512 ac4cd2864af63625dbdb5c55fcc5e7ea403d84d7cc25d9f1c121f544ef1cf686ab9b7c0d50ef73b4bf24e573cdf528622a49d82f675b0c1673c46f691b79ac09 -EBUILD gedit-40.1.ebuild 2321 BLAKE2B 3022f5c55fb77f15e61d1f32860f8edb7844b019b0da297a48913f0391fb3a0b24e9da43dc511d930859e0216591a4e5103fbbf2009cf6bd8484deab7afefde2 SHA512 925fdcfbbe9111b67457cf6f07ded7d8dfb1addf0f73374800d14586085430ad656ee9cb948453e14959e33f1f7949cf9332b0b87d7dd6f019adcbdd45943bf3 +DIST gedit-41.0.tar.xz 6889320 BLAKE2B c4d2b923eab18cd27ffc0ff99882953e952c0956135fa7f6401ef01dd5cd0e1cf9a5a86c5751db9206fd88200c70434710881cd5b934a3620f14130a5066f18f SHA512 97c51ef24e53d6bd4b29350a8749eacbfcfb90b7c66c9f6d462101c53966282452f6a02043628e157e8179cf6260f103b41c61d7ba2a31da08b0687f8031974e +EBUILD gedit-41.0.ebuild 1885 BLAKE2B b0595f782edd0b276965eb4c42d3a73562e12bdbb83775b174f6e26f8befa22238a1e020dc0da55ce5f8fe09f18adda5c42e15d70098a541f82e3af8c105fbc1 SHA512 431b90921835a15040037a89cc9b95d9c9b393bb471fcbf36155e5ef3fd5a51fd18bc28abba269b8e57c54b0ff77797ea2a13af70b5277736909e404b8343daa MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/app-editors/gedit/gedit-40.1.ebuild b/app-editors/gedit/gedit-41.0.ebuild index 07697d136123..7db98cfaddf2 100644 --- a/app-editors/gedit/gedit-40.1.ebuild +++ b/app-editors/gedit/gedit-41.0.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_COMPAT=( python3_{8..10} ) VALA_MIN_API_VERSION="0.26" VALA_USE_DEPEND="vapigen" @@ -17,15 +17,15 @@ SLOT="0" IUSE="+python gtk-doc spell" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" DEPEND=" >=dev-libs/glib-2.64:2 - >=dev-libs/libpeas-1.14.1[gtk] - >=dev-libs/gobject-introspection-1.54:= >=x11-libs/gtk+-3.22.0:3[introspection] >=x11-libs/gtksourceview-4.0.2:4[introspection] - gui-libs/tepl:6 + >=dev-libs/libpeas-1.14.1[gtk] + >=dev-libs/libxml2-2.5.0:2 + >=dev-libs/gobject-introspection-1.54:= spell? ( >=app-text/gspell-0.2.5:0= ) python? ( @@ -51,16 +51,6 @@ BDEPEND=" >=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 - - "${FILESDIR}"/${PV}-fix-meson-0.61.patch -) pkg_setup() { use python && python-single-r1_pkg_setup @@ -73,17 +63,16 @@ src_prepare() { src_configure() { local emesonargs=( - $(meson_use python) $(meson_use gtk-doc gtk_doc) - -Duser_documentation=true + $(meson_use python) $(meson_feature spell) + -Duser_documentation=true + -Denable-gvfs-metadata=yes + ) 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/ghex/Manifest b/app-editors/ghex/Manifest index ccf5591d26c4..e83926aac043 100644 --- a/app-editors/ghex/Manifest +++ b/app-editors/ghex/Manifest @@ -1,8 +1,6 @@ -DIST ghex-3.18.4.tar.xz 1420268 BLAKE2B 70a3027a2c228481ecbc6ae44c0a707c9858453e3af7bfc268b6e32a8496722cf117c1b2ce4dd798795a429dccd24e1fa9cb9d1a8c9c8fb5998243369f76ccc4 SHA512 6121a5986ee7d7f96bf7f401e155f8aa37f076af455bc68e43d1b5b02b63bc9aed3eba5209511d1b659eb4c9093ab5d9601c14a5e868d979e92a6d0ca0cf9ce2 DIST ghex-3.41.1.tar.xz 1499804 BLAKE2B dd75dc1cc5d847ae3b932ed0bb98b8e15f44943f76f0ba9f053c6770d05e31d211c9f75a910c93c09cf2de143db8fa0eda4fdb876a0ea3ed0534650e7ac36a65 SHA512 5eccf81c41f5ae56bfe5eab0fb843db0095c75080e7dfc0b19a4c71f40f89931e1cbcd2c58744a6b249d16e2a2e4f96513aaac4c41f46d3b5ae8b2bc851851a0 DIST ghex-4.alpha.1.tar.gz 2165701 BLAKE2B f98758b657f2cc73913bb205439d265e8d8168c91080ca0e064decf277a7e300d9eb82a869951f846a66b5155016f69b0935b2877d24a0482a6b003a821adac2 SHA512 6e7e8d8ff0b981f14f48ed16d3b31ce51a0fb4c978c525cc9f3b2c06114bc1cfaf42e71ea98f1b0d33940a2f6b15a5e053228484259bdc4525bb18f2835b97c8 -EBUILD ghex-3.18.4-r1.ebuild 823 BLAKE2B 403643de580660f59a6c63dd1d29f9cbe8c788d56160f0b8f1a7799ec3e99581c2875674532b817c739749fca44cc89f585ecc98c2e34c7627344e0e896205d9 SHA512 5a65eaac8bea437d6487ec89663105abbe5b48fbf9c22923a1dc66033d9395644ea75f5627e3cc5ee538e69f8fda81da9d5bb615dc34f175d944a87098672a38 -EBUILD ghex-3.41.1.ebuild 692 BLAKE2B da5c75c533de4c03a53eb32080c76b515c759c0a91e5e5aa7ab23a6a52e37e59ab67344365eafe2d9f678ed594fa300d6fb46febc9a349c2b799606ddeb59628 SHA512 49148a59978f39b7abe6ff893a9a7d5af9e82b5512d9622b935eda18ade433432c1adabbdc8af9375988c2c8e9725092b9dbc24eb4a3d8e41530da4f11922579 +EBUILD ghex-3.41.1.ebuild 688 BLAKE2B eb2299b663b824da78475537d939b41f2d3be2f1f0c8d2f28852dc613d78b60221500ec592c0a93af2b0f865f9dd593a21e6f2d149077244695f13de0b68d996 SHA512 30750b262e0282ddc7e44b5f893e9dd4cbddf99acb2923d7c409884775a928b9d3ce1f7427d5060a66e62997989c4cee9b997e44c846430b02ff9b6e695bccfe EBUILD ghex-4.0.0_alpha.ebuild 959 BLAKE2B f45a28eec7b5a04229e6a46049df47d07b177ed2c756c90f045ac4c74867dd0a31c64435d49e4e402847c6a28b3417ef656220540369afbb97217b279b7c6604 SHA512 07164df7a6385410fc8f6e84e2ba26869d86b1dd76bc31fac4aad238b43c37b12cceb05473e24d75db55c02bb7ddf05f4b47f36c27ce9a6dc26cfc887df66eeb EBUILD ghex-9999.ebuild 959 BLAKE2B f45a28eec7b5a04229e6a46049df47d07b177ed2c756c90f045ac4c74867dd0a31c64435d49e4e402847c6a28b3417ef656220540369afbb97217b279b7c6604 SHA512 07164df7a6385410fc8f6e84e2ba26869d86b1dd76bc31fac4aad238b43c37b12cceb05473e24d75db55c02bb7ddf05f4b47f36c27ce9a6dc26cfc887df66eeb MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 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 ace90f503b91..000000000000 --- a/app-editors/ghex/ghex-3.18.4-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 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 ~riscv 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-3.41.1.ebuild b/app-editors/ghex/ghex-3.41.1.ebuild index 2cf48df68aff..399cf0f42e07 100644 --- a/app-editors/ghex/ghex-3.41.1.ebuild +++ b/app-editors/ghex/ghex-3.41.1.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 @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Ghex" LICENSE="GPL-2+ FDL-1.1+" SLOT="2" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux" RDEPEND=" >=dev-libs/atk-1.0.0 diff --git a/app-editors/gnome-text-editor/Manifest b/app-editors/gnome-text-editor/Manifest new file mode 100644 index 000000000000..f69b9645a97a --- /dev/null +++ b/app-editors/gnome-text-editor/Manifest @@ -0,0 +1,3 @@ +DIST gnome-text-editor-42.rc1.tar.xz 1093060 BLAKE2B 14bddc82e4dd410b357cff7274ed35c07b13da7648db5840eb2c8dae7c057935b9b6f5f249c8c04f3a8ed27543014de8f7fc38b98985cd481064752f28a0b623 SHA512 debebccceb4bbe2bfc87a1c1f0813b10fc0c565cc89c6b3a826daa0a3344c88b9f20135087335f61d7b736a8c8ada7e2f823795c1e6c8d3d03ac7325afd0a9ae +EBUILD gnome-text-editor-42_rc1.ebuild 1035 BLAKE2B 8dfae66f2828821092940062df160dac39b838083b95bf386a1285f96c30185b748278bd7d78eab632b00112a7d34120172fbfaa13322009f70d38ee4e94c3f9 SHA512 23da6adfe47b5cb4aef50dbad287a746947f5bab606b8862984acc8b06390ec4b115d29167dcb25cc2e8e527c8111fe420629c44e6e3051aec42af1e134dfc8a +MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8 diff --git a/app-editors/gnome-text-editor/gnome-text-editor-42_rc1.ebuild b/app-editors/gnome-text-editor/gnome-text-editor-42_rc1.ebuild new file mode 100644 index 000000000000..7f7de71f724e --- /dev/null +++ b/app-editors/gnome-text-editor/gnome-text-editor-42_rc1.ebuild @@ -0,0 +1,56 @@ +# Copyright 2022 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" +SRC_URI="mirror://gnome/sources/gnome-text-editor/42/gnome-text-editor-${PV/_/.}.tar.xz" +S="${WORKDIR}/gnome-text-editor-${PV/_/.}" + +LICENSE="GPL-3+ CC-BY-SA-3.0" +SLOT="0" + +IUSE="spell" + +KEYWORDS="~amd64" + +DEPEND=" + >=dev-libs/glib-2.69:2 + >=gui-libs/gtk-4.6:4 + >=gui-libs/gtksourceview-5.3.1:5 + gui-libs/libadwaita:1 + dev-libs/libpcre + 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) + ) + meson_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-editors/gnome-text-editor/metadata.xml b/app-editors/gnome-text-editor/metadata.xml new file mode 100644 index 000000000000..7b343b06be8a --- /dev/null +++ b/app-editors/gnome-text-editor/metadata.xml @@ -0,0 +1,8 @@ +<?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> +</pkgmetadata> diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index f0250e88cbc8..75fc3b40d5d1 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -8,6 +8,8 @@ DIST vim-8.2.3582.tar.gz 15778667 BLAKE2B c8eaa95fa4fde6514168a9f42a712a78442a7f DIST vim-8.2.3669.tar.gz 15810783 BLAKE2B edac6dabfbeb11057c7b15830b30ec555a10942494bc89d7d85b4c701b5ff8f7413887e4e33e7b812057177ffebd2cdc74e69e86080a86cfee529b1da45156bb SHA512 83d172f7e1a3c5a8ea6238f2766bf077463d32d429111c08e5b28b8aafb8aea584807023281abf3b1710d61820fec8d2b808b42b5c50058d5eb4eb917deb19ab DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df030c1334f989862b17b70d7859d751f79dcaf98eb5216c23df6ce63f3406cb5cb3c643f9e8170987f4f705a49833 SHA512 19ee7cc27642253ad989e6e32ab96faa46b5e1feebba00cadd018af2de186358d686cfa5efbc8e5da00a14ceb42c226acfc81cb11cd87f34ec7ca901c98df814 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be +DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec +DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651 EBUILD gvim-8.2.0814-r100.ebuild 10548 BLAKE2B 97622d1ec117107f2576a4b7f75097c3b4711402c3affbf433b2b317048b74697a0fb2b795f2ce6e388cf26885af9b972b68d7f0f73db5110a2bb9a43061ed4f SHA512 654432cab7092fadfabf35996a1ccd807eb76becdd8ed5eb95a5e153e8a6dd342debbd7fd28398bb9e83b4fbe87fa89995a619d4044a1a6300213c04f48325d6 EBUILD gvim-8.2.3428-r1.ebuild 10626 BLAKE2B 21872f8aebfe15e9b94620f3a36298a78c54d749dad73aabe5ed01c63e6fe19778e5be9485aa3bd4da440c2e02a82c395f350a643e320bbcd00d8d839e414646 SHA512 c1908d7918609f66d956392d31083a2521cc0ee8178b02af0a5591695772b1e1ff89a5c9cff4f2040b8b7bc1999c776ed633f8e14620a6fd7d28395ed287501f EBUILD gvim-8.2.3567.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439 @@ -15,5 +17,7 @@ EBUILD gvim-8.2.3582.ebuild 10692 BLAKE2B 1f6f50d88e1985c917dfe7dbab0c9d71bec007 EBUILD gvim-8.2.3669.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439 EBUILD gvim-8.2.3741.ebuild 10692 BLAKE2B 1f6f50d88e1985c917dfe7dbab0c9d71bec007bc8d057ad4b6c670f975a6e8b92ad4bec7447210c2eae43f8c039487bfc61a5fc161a3b6be11ac6c2751ae2440 SHA512 ecf615e9997ef893479928855634c9ad61eefccb334312229dd3d2079f50ad676c3c94769b8cdb798d1b760cc5420f1e30e011fdfa0b9eba4f8f9ed07e04600b EBUILD gvim-8.2.3950.ebuild 10699 BLAKE2B ce18ce82ae56c2d9a4ed744a02dbd63a606944d36deb3e7ee239011822e9a92db5363fad797afafc68708b18646192e8a74c14fc32c06e6c017efa185952d33c SHA512 4c414f797e134761db8da9d006093f7a71d470941f4d8e1b6dfc0b09676099e8dafabd364af1589cc9a83188f0b16441fdb3e62b401431ddad9e12eaf1e9b7d7 +EBUILD gvim-8.2.4285.ebuild 10699 BLAKE2B ce18ce82ae56c2d9a4ed744a02dbd63a606944d36deb3e7ee239011822e9a92db5363fad797afafc68708b18646192e8a74c14fc32c06e6c017efa185952d33c SHA512 4c414f797e134761db8da9d006093f7a71d470941f4d8e1b6dfc0b09676099e8dafabd364af1589cc9a83188f0b16441fdb3e62b401431ddad9e12eaf1e9b7d7 +EBUILD gvim-8.2.4328.ebuild 10694 BLAKE2B 5f76cb6574ac71786a47f0f4f8ffe5b44eedc6fbabe6d7685d33999bc2df07a0fa22d3734f2adcf3e4e7e5b3accaa9f1cccb6ad668005ec57edd9b972218215e SHA512 11c9792ae94a79104d3cf8e4ddc105b49fff996938ac4ae03de182066f3bbc8405d4806d0e0569f9e30975f97626ffd49511277df4675a59fc07e45eb0bf5d85 EBUILD gvim-9999.ebuild 10699 BLAKE2B 461bfc24a1267cb1037ef273d4c9d88556f518cb81ef8dbda78c417a5d0cd419e2e8760529f7be782d456757de954bf847cf19f01157f0d05d4d588a139b2895 SHA512 f51a04503239d7ec680391577a82a0f27039a2d096cf6850e2af90fb20f9b905cdc865faed74c5b8cf76b77fd9b1107b07a19d6b7ae139d2a0036d61c62ce439 MISC metadata.xml 717 BLAKE2B dd4eae2fc90d0a00452dd91391acb2e15538a956af6a2a423427dd4835292fb17c43d805bb32d119d3743a00a524e2216befdc32831339241d7285871798e7f7 SHA512 b0cc1bae40d3cfb51bcab00ea245688d68410c17220a3f3c80793b6fb62abb007251c2ee2abd7612ed507462a3c77de48f3ceaf622a75c54436298fd43b7df10 diff --git a/app-editors/gvim/gvim-8.2.4285.ebuild b/app-editors/gvim/gvim-8.2.4285.ebuild new file mode 100644 index 000000000000..3600cac317cd --- /dev/null +++ b/app-editors/gvim/gvim-8.2.4285.ebuild @@ -0,0 +1,383 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="8.2" +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +fi +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + ~app-editors/vim-core-${PV} + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2:0= + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + acl? ( kernel_linux? ( sys-apps/acl ) ) + !aqua? ( + gtk? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + !gtk? ( + gtk2? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + ) + !gtk2? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( x11-libs/libXaw ) + ) + ) + ) + ) + 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}" +# configure runs the Lua interpreter +BDEPEND=" + sys-devel/autoconf + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" + +# various failures (bugs #630042 and #682320) +RESTRICT="test" + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die + export HOME="${T}"/home + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches/ + fi + + # Fixup a script to use awk instead of nawk + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug 43885 (20 Mar 2004 agriffis) + sed -i -e \ + 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i -e \ + 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -v src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + local file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e ${file} ]]; then + addwrite $file + fi + done + + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --disable-gpm + --with-gnome=no + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable 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) + ) + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" + fi + + if use lua; then + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # gvim's GUI preference order is as follows: + # aqua CARBON (not tested) + # -aqua gtk GTK3 + # -aqua -gtk gtk2 GTK2 + # -aqua -gtk -gtk motif MOTIF + # -aqua -gtk -gtk -motif neXt NEXTAW + # -aqua -gtk -gtk -motif -neXt ATHENA + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use gtk; then + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) + elif use gtk2; then + myconf+=( --enable-gtk2-check ) + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) + elif use motif; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + elif use neXt; then + einfo "Building gvim with the neXtaw GUI" + myconf+=( --enable-gui=nextaw ) + else + einfo "Building gvim with the Athena GUI" + myconf+=( --enable-gui=athena ) + fi + echo ; echo + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if [[ ${CHOST} == *-interix* ]]; then + # avoid finding of this function, to avoid having to patch either + # configure or the source, which would be much more hackish. + # after all vim does it right, only interix is badly broken (again) + export ac_cv_func_sigaction=no + fi + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --with-vim-name=gvim \ + --with-x \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + # Make gvim not try to connect to X. See :help gui-x11-start in vim for how + # this evil trickery works. + ln -s "${S}"/src/gvim "${S}"/src/testvim || die + + # Make sure our VIMPROG is used. + sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die + + # Don't do additional GUI tests. + emake -j1 VIMPROG=../testvim -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dobin src/gvim + dosym gvim /usr/bin/gvimdiff + dosym gvim /usr/bin/evim + dosym gvim /usr/bin/eview + dosym gvim /usr/bin/gview + dosym gvim /usr/bin/rgvim + dosym gvim /usr/bin/rgview + + emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons + + dodir /usr/share/man/man1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed" + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed" + echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \ + die "echo failed" + + insinto /etc/vim + newins "${FILESDIR}"/gvimrc-r1 gvimrc + eprefixify "${ED}"/etc/vim/gvimrc + + # bash completion script, bug #79018. + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # don't install vim desktop file + rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" +} + +pkg_postinst() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update fdo mime stuff, bug #78394 + xdg_desktop_database_update + + # update icon cache + xdg_icon_cache_update + + # call eselect vi update + eselect_vi_update +} + +pkg_postrm() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update fdo mime stuff, bug #78394 + xdg_desktop_database_update + + # update icon cache + xdg_icon_cache_update + + # call eselect vi update + eselect_vi_update +} diff --git a/app-editors/gvim/gvim-8.2.4328.ebuild b/app-editors/gvim/gvim-8.2.4328.ebuild new file mode 100644 index 000000000000..972ffe7c049e --- /dev/null +++ b/app-editors/gvim/gvim-8.2.4328.ebuild @@ -0,0 +1,383 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="8.2" +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single + +if [[ ${PV} == 9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" + EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV} +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz + https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +fi +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="GUI version of the Vim text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" + +RDEPEND=" + ~app-editors/vim-core-${PV} + >=app-eselect/eselect-vi-1.1 + >=sys-libs/ncurses-5.2-r2:0= + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + acl? ( kernel_linux? ( sys-apps/acl ) ) + !aqua? ( + gtk? ( + x11-libs/gtk+:3 + x11-libs/libXft + ) + !gtk? ( + gtk2? ( + >=x11-libs/gtk+-2.6:2 + x11-libs/libXft + ) + !gtk2? ( + motif? ( >=x11-libs/motif-2.3:0 ) + !motif? ( + neXt? ( x11-libs/neXtaw ) + !neXt? ( x11-libs/libXaw ) + ) + ) + ) + ) + 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}" +# configure runs the Lua interpreter +BDEPEND=" + sys-devel/autoconf + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" + +# various failures (bugs #630042 and #682320) +RESTRICT="test" + +pkg_setup() { + # people with broken alphabets run into trouble. bug 82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die + export HOME="${T}"/home + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]]; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches/ + fi + + # Fixup a script to use awk instead of nawk + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug 29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug 43885 (20 Mar 2004 agriffis) + sed -i -e \ + 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug 37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i -e \ + 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm -v src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + local file + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e ${file} ]]; then + addwrite $file + fi + done + + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + --disable-gpm + --with-gnome=no + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable 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) + ) + + # --with-features=huge forces on cscope even if we --disable it. We need + # to sed this out to avoid screwiness. (1 Sep 2004 ciaranm) + if ! use cscope; then + sed -i -e \ + '/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope" + fi + + if use lua; then + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # gvim's GUI preference order is as follows: + # aqua CARBON (not tested) + # -aqua gtk GTK3 + # -aqua -gtk gtk2 GTK2 + # -aqua -gtk -gtk motif MOTIF + # -aqua -gtk -gtk -motif neXt NEXTAW + # -aqua -gtk -gtk -motif -neXt ATHENA + echo ; echo + if use aqua; then + einfo "Building gvim with the Carbon GUI" + myconf+=( + --enable-darwin + --enable-gui=carbon + ) + elif use gtk; then + myconf+=( --enable-gtk3-check ) + einfo "Building gvim with the gtk+-3 GUI" + myconf+=( --enable-gui=gtk3 ) + elif use gtk2; then + myconf+=( --enable-gtk2-check ) + einfo "Building gvim with the gtk+-2 GUI" + myconf+=( --enable-gui=gtk2 ) + elif use motif; then + einfo "Building gvim with the MOTIF GUI" + myconf+=( --enable-gui=motif ) + elif use neXt; then + einfo "Building gvim with the neXtaw GUI" + myconf+=( --enable-gui=nextaw ) + else + einfo "Building gvim with the Athena GUI" + myconf+=( --enable-gui=athena ) + fi + echo ; echo + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + if [[ ${CHOST} == *-interix* ]]; then + # avoid finding of this function, to avoid having to patch either + # configure or the source, which would be much more hackish. + # after all vim does it right, only interix is badly broken (again) + export ac_cv_func_sigaction=no + fi + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --with-vim-name=gvim \ + --with-x \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + # Make gvim not try to connect to X. See :help gui-x11-start in vim for how + # this evil trickery works. + ln -s "${S}"/src/gvim "${S}"/src/testvim || die + + # Make sure our VIMPROG is used. + sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die + + # Don't do additional GUI tests. + emake -j1 VIMPROG=../testvim -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dobin src/gvim + dosym gvim /usr/bin/gvimdiff + dosym gvim /usr/bin/evim + dosym gvim /usr/bin/eview + dosym gvim /usr/bin/gview + dosym gvim /usr/bin/rgvim + dosym gvim /usr/bin/rgview + + emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons + + dodir /usr/share/man/man1 + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed" + echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed" + echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \ + die "echo failed" + + insinto /etc/vim + newins "${FILESDIR}"/gvimrc-r1 gvimrc + eprefixify "${ED}"/etc/vim/gvimrc + + # bash completion script, bug #79018. + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # don't install vim desktop file + rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop" +} + +pkg_postinst() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update fdo mime stuff, bug #78394 + xdg_desktop_database_update + + # update icon cache + xdg_icon_cache_update + + # call eselect vi update + eselect_vi_update +} + +pkg_postrm() { + # update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # update fdo mime stuff, bug #78394 + xdg_desktop_database_update + + # update icon cache + xdg_icon_cache_update + + # call eselect vi update + eselect_vi_update +} diff --git a/app-editors/hexedit/Manifest b/app-editors/hexedit/Manifest index 232b42e277cf..382bbdde2e58 100644 --- a/app-editors/hexedit/Manifest +++ b/app-editors/hexedit/Manifest @@ -1,6 +1,3 @@ -AUX hexedit-1.2.13-tinfo.patch 329 BLAKE2B b82e7b0495a8ccac367501f530d52f8b2988a242206efd25e14c433a25e1742c2bc3d0c7b1d1613ec8beec530264ce7fb177f2d3d9338c90eaf921a366726a66 SHA512 21306eddc00720a22365b84181581bc89db2a1d422cf769c2b29585144ab87064a19696ba946e16cc56e2d2d45aa12ebb88b3054ea0167124d960afdaa5a7d8a -DIST hexedit-1.2.13.src.tgz 68778 BLAKE2B 377c4f0008f6e3b54e4cf2e0249fa344b684b11a6acea9daf7d8e6585524f9d11a4eb199d5289a57a72be5efbdf3060cc47269aad1d218784e7679a469ca4f50 SHA512 df9afb0b9b965e20ea8c427c1986b0200216601b157862199c35bae9e201ccc478ab0bfecd39d0dfaa85bf582f1cf372b0134fadcfeacf4734805a6e6dcaa2bb DIST hexedit-1.5.tar.gz 30544 BLAKE2B d7292a70819826fddd63f99ee9d05073b8a59f51477390af91151146ee1f5a75333560829f0351fa9e158ef932c07a3582a3e822f42e645917a7fa321055d14e SHA512 9d8e5c8c0cda0af17ffeaf528e3dacd7fc2878dfc0755cb055dae5c56f05c961353c1d1723b05897314b49a44a6eb96de5d3a599c6b29967425507eea7cc7ca5 -EBUILD hexedit-1.2.13.ebuild 702 BLAKE2B b2baa82ded8ca1e5d01f83aa763a4df04f527b653ac3bc8d7063974f684082dfc0a2276a505d28dbeb5a5085ab8feb1281c4dab40aa9e39290600ab47146e1a7 SHA512 1e8acb13a25382648b5593e75a347f954e3f229f3cd44d85d9b877a2bc140df3aae80defa708778db9e2d32879859efb41a33f1f2bbaff5abf71a5562c5f9834 -EBUILD hexedit-1.5.ebuild 742 BLAKE2B 9aea766dfb83143edbfed9386543a3d22a87b3b51ffce305eb681860e3ce10a8bbb94841bd7c141369777ef11cf30e7ebd59034e7ee976d747d1ea1b4519e1cd SHA512 f444f0490ed304a0c7e4962295f269fe1ab6010cb248d67ebdb2ec23caa049153f0caa9f4dde09f7d1b274e95acf5331703bf97196e6c39fba36b9109a02ec19 +EBUILD hexedit-1.5.ebuild 735 BLAKE2B ce7ae724f31b951a7a9e695274dbb82e3db4a517da61a35c69fe2dc20df6b8ba2f0f1658bf9a4d957bd309de42eaa9ee6312e2dbadc78ee59eccfd3951c1622a SHA512 34cc7032c292ed1aa1474afae9c524df3f532335f42c64d94e21ffc191c0d127b356b51b6940c7849b1e8b41d27c281d6474aa546607b0482a7b3657764744af MISC metadata.xml 351 BLAKE2B 0c74729ae34fd37946be2b370ec986ea6f894cc13c642865030ad8857b65bb5900cf3b822e2c9b16bfc33df955e3d747622dddf6b5344a5edd867a236988135a SHA512 1878b5fb1fe6d7e0c6af3a433d9dfd8e9f365a4bf52d15ff5aa01e4f8153924b6379edee442d98f2c0282fd19f7141ffc77d0ce53e8dd1428e5ac90643f84c9e 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.2.13.ebuild deleted file mode 100644 index 1acb531a9217..000000000000 --- a/app-editors/hexedit/hexedit-1.2.13.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~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 -} - -src_install() { - dobin hexedit - doman hexedit.1 - dodoc Changes -} diff --git a/app-editors/hexedit/hexedit-1.5.ebuild b/app-editors/hexedit/hexedit-1.5.ebuild index 7da44e6f5b51..438191a1dc21 100644 --- a/app-editors/hexedit/hexedit-1.5.ebuild +++ b/app-editors/hexedit/hexedit-1.5.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then 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 ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/app-editors/jove/Manifest b/app-editors/jove/Manifest index 07e9e7100299..3988f8b87e56 100644 --- a/app-editors/jove/Manifest +++ b/app-editors/jove/Manifest @@ -2,6 +2,8 @@ AUX jove-4.16.0.70.3.1-getline.patch 2058 BLAKE2B 53ac9a8221ed311e0b854b0e573f51 AUX jove-4.16.0.73-build.patch 5776 BLAKE2B 0b147601d48499076ae19a438861ca971142b8582228be3ad93ba4dc3ff2d2f36e85631152e681752405cdef9d077ffbd8503dc593f20bba79aaccc4bf73a77a SHA512 11398bf31dc4986f0708cd3321f0069d9af6a00c532431554b4433588be528f41b9003286e1d2300d74b314f05fc310aab8ed80fab22579c071cdd43d0a90d22 AUX jove-4.16.0.73-doc.patch 1004 BLAKE2B 64f69c7ad34f71dcfb9ccd4e15c40c408c2a79e31e490f6e3a951ccae76e439939442fcca4d4a94d44bdb45166f2ba3a8bd0403e9b07a427d89f54073aee8171 SHA512 c15d8ffc92292e8284aebe93311c14e5d157d25e75c2228497faf1121e370e738ee345f27cce187196fceb4eb26c3222a4b39f734deb13ff14b2a044225a715d AUX jove-4.16.0.73-sendmail.patch 675 BLAKE2B a4a7126f215dabfde8bc47b2b9539c90f6ffd1c1e89dd33a2e7e2dcaf9f4b202b1e8a807560ea898ee0df9e778ee3af2f16c3c8e4e22f44675712464bba5d121 SHA512 a0c7179b601c620aad5b6bea5e07ff620bec14d27c1f8b27b0a25cb8cd687066abacf2786a00d79913087c2c5330da99e154f325b39243e9a19323a5c7729f10 +DIST jove-4.17.3.7.tar.gz 490070 BLAKE2B bfe95cc8f78993438839b93ebf37567940449e3914dd1963728ee82dc601c371318a34ea0d5d13d9d4dccaf9c4750874c5e0d3af22dcb2421595dca2da7cafdf SHA512 90bd597bb4be3a4589f77ee331cee4fa2784264221fe6247c2535ae34c5689c08f55c2b2919bff34af5631b73b12883dab54df9770b4157ae801079a23222d9a DIST jove4.16.0.73.tgz 465214 BLAKE2B cc1eeca2cdbd7ca98a5deaf27c37bfcdc529f2b388361e0cd5fd6278b72740a06283abd1f60212e6dc0d1e540e4dc4d99edb99b781645b13e1675644db0f38eb SHA512 2198504f9a23590710acba7f27661fa5649fdbed559a4c6bde9d2c1d673c22ce7d99a690be45a4602d37cf6e70399230c4ae3a251d8451af0c5252bdca61b09d EBUILD jove-4.16.0.73-r1.ebuild 1094 BLAKE2B 2a1d9907647c73cb233bfcc58e70635b87eeef34e7b7e2f8a64077b9b306550d9a92d4584b5bc6538d439ac328fc45f770318e5811032f641c02da7207215aff SHA512 a85a1d119e5800b66890305666340d3eebbae6a6e90a85f63be17de7b0310907db646a5fb3d478622a6567d176a9d6c5eb1d06045584783e44b45a589e592598 +EBUILD jove-4.17.3.7.ebuild 1050 BLAKE2B f52d1af7cbf97b318602a594561c4f3417d3b0c8da52de167e5ed2909ef48cd87ca5d2fa635b9360d1245e2f23a29f3e698ba6fc3c1f5fd1b1d1c372eb8b5147 SHA512 140792ed656cd1dbaf4b4002e9132826b653069ad228fbc20b4b3cabf38320bce058309b628b27ecec8cb8674fcbb16ec2fe57176bce412398b9b2465fffaf61 MISC metadata.xml 624 BLAKE2B f7b7a8ec992ad32aec5efa363d8bb7ffe54f9ce000f26a63955f7d8faed6399c7317bb0bcd8c8ae86504781f65eded89dc56d9ba5e944992b4f1901de1bd07ff SHA512 bd76fab7da04579d8cff735b6546a55808944d7ebe5af6526d8ebef55534c8e450fabe9b554f1788756479cf8913d19c8782f2155fec1c2eeabb6e7aa4939dfd diff --git a/app-editors/jove/jove-4.17.3.7.ebuild b/app-editors/jove/jove-4.17.3.7.ebuild new file mode 100644 index 000000000000..3c41a1a75685 --- /dev/null +++ b/app-editors/jove/jove-4.17.3.7.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2022 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 + + 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 + # Full manual (*not* man page) + emake doc/jove.man + fi +} + +src_install() { + emake \ + JOVEHOME="${EPREFIX}/usr" \ + JMANDIR="${EPREFIX}/usr/share/man/man1" \ + DESTDIR="${D}" \ + install + keepdir /var/lib/jove/preserve + + dodoc README + if use doc; then + dodoc doc/jove.man + fi +} diff --git a/app-editors/levee/Manifest b/app-editors/levee/Manifest index 83ef12376ba9..03f263d1b090 100644 --- a/app-editors/levee/Manifest +++ b/app-editors/levee/Manifest @@ -2,5 +2,5 @@ AUX levee-3.4o-darwin.patch 265 BLAKE2B c099dca875658567a788cc1bfe3928c7969266b5 AUX levee-3.5-glibc210.patch 1683 BLAKE2B dafaf7b7bb8a8d11ef8c74f81800449d54b582ea1ab202539c7e630dd8aca7aa4d5b302a21292a3cfe978163b9c8d5089ec7e5931e43b75448a86faeb77db265 SHA512 8aabe959dc12e551128045cda1027498a4fd0b42eb7fc47888cfaab2f1a2fe15c3e600d1952dc78e43bc58252ff8f4e1552fbb5e7f83aae9ce77681b7e62649a AUX levee-3.5a-QA.patch 468 BLAKE2B ba4643a624b64c0a602c3717a1982af7436aa04cd17a05f5b353049fbbda30f08931d329a476ea17572c0c4e6338cb4e798e1105c8ba3f1c7d1cd8f4003c8c47 SHA512 23060c7b452b53ae6b354d4a727bc4e0430ea933ab7124be357432d46bf186a473b72f141406e834a492790057279126db6a60a51f2fd0a5522a7d2e586b4638 DIST levee-3.5a.tar.gz 67733 BLAKE2B 291b502a8c9581c2c0f2ca6714c17c86692067d5de66e987f8a7b506965a21ff149c6fe445532e9b065e40dd7e519d1ebc6b5ff69c5b4a4129138df224f71dfd SHA512 e95b4fc6370903dda07aff0a612c7f34425ab0b854d05a08f42b7e339d1a86a436316d31f3667748943e2ce2e68be7f2369e4a3b36c0715b00d31b8ab50cdaf1 -EBUILD levee-3.5a.ebuild 1014 BLAKE2B 6666b02a65fea1f47909faf22d13416375d689222d024e361845dd91924031cc8725fd138c9b36c8257b21007071b671d6dce7aa20cef24d42454da4eb0c2638 SHA512 1de1ca958e5886f005df829d33fd547efea2ae28ce915d523032b8ec117dfc7118a5427f172db7770978bbe21f0432123ebcc24ebabafd9067b95e1a1497c8b0 +EBUILD levee-3.5a.ebuild 1018 BLAKE2B 502b4d81c08812e0dab46d5e2b286c40d89f9ac201527c8cb37193f1ab7bf626eab52fde99d5908a59cfeb7787dc36673128ee9253138e643be3a0910555fc7c SHA512 0cf106238f39068a3a50d2c575bc02894839e0f6a0495d606947a7e04b3bf888fe02a13ef2b4f9e0f5d8dc6ed034c2d0608e308d587f9e9cf83213fe86112cd7 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-editors/levee/levee-3.5a.ebuild b/app-editors/levee/levee-3.5a.ebuild index e5a02aa046fb..b5d584d76cdd 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 @@ -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/mg/Manifest b/app-editors/mg/Manifest index 50498c3439e2..2a832b445a0b 100644 --- a/app-editors/mg/Manifest +++ b/app-editors/mg/Manifest @@ -1,5 +1,5 @@ -DIST mg-20210314.tar.gz 152749 BLAKE2B eec9740db1a543025450746913c1b07f0646f370906665122c7f5dd1ecc46b5cab102bd29aa51afb13972f4f17118ea20c33bb619e8dc4bc8982f8423ed189d6 SHA512 816b1bf8aec97dd790b0d5bf8836d46cb87f60d0bda94c2aecce4f8a6b8599ab2e90805fa6b129c9e40b54b340e33a47fec97c60e1b59b7706aa357d58b0e3f6 DIST mg-20210609.tar.gz 156850 BLAKE2B ed8061aa808a8570f24198fb32fa3d24d66decdd07dab871502456d734a8d7867f384122361294bda0155bc3fecea80983fd41c00a2ffe02d00e380bf94e2f43 SHA512 a17b470e5e192c1f62700c7b78b15c9403b25528a7d6603fda0b6e618196150329fe4889cedfc8dbf621053d45b78294ed5c2766604aaa4c3ddbaec545693043 -EBUILD mg-20210314-r1.ebuild 1038 BLAKE2B f4c2c48a27eacc4609ba665f1d6683628fd7f42bea4d5013c2b6a4cec45aee51d78c1d98f681c99559e0f085af5adfff5b11023e59a46895ad85d65ad2517dcf SHA512 12580025fe9cb63602ae518d1b814eacfea8dc83244c3f23d8ffdf454f93158db81ec4adfef5375c4004cc1df749a1d6a82dd75b9a520b7810670d02b20c60e7 +DIST mg-20220212.tar.gz 157828 BLAKE2B e3219efffef9c4da05965a0ed7a0f0bfdf5c34d607d25102a4d2ee9de6f9b9fd2da59050c6e56d1712875b2d129408200dde4c7305ffb2208c11b5d722b87270 SHA512 093736521e4bcaeff049594793474b9710e4cfe6db151032dc4413614566afce80db5b794dcf10082020dbb73f25742a0c7d49f45b6b4d2caa6865b20a9e574b EBUILD mg-20210609-r1.ebuild 1076 BLAKE2B e95ab621ef87cf6869a7ea5c16a2d13abeba717e683bfbce223be3c98f6debe22433842a754eb5732d596156faba388409e56d1ec0c7c3e748b455715b453ecc SHA512 6bc32e8cd88edee04db05e5ac2294879e6a7910511af007c5f07d547ede761a5d82b3faa87c387621900b42ddc43a0f3ffb57fa4902cfaa8f43ff867c2d9f15b +EBUILD mg-20220212.ebuild 1035 BLAKE2B b545c4da9ff597a264ffe657649795034cfb4cc0359c06200abf3342c4fe141bf9a14ec0a4fd9a269fae00cb0b52067efc0a059c4d37a87e4f2439ae4b9034b4 SHA512 8ca87fe2a6ee4937305097ee96fc04b4f19c2c8d67bf2aa186edde32287824a380f64f99e97fb9154c5e1efb5c1ead15627debbbe62106d295ac0b01d8ea9c6f MISC metadata.xml 619 BLAKE2B 746ed0d179b4fb8e40533411d3248b88c035a2f01ea6552af8e9bcf3d588a0e6a835ad12aa03a27052a7988646499538d991d05eb88c0125f3fc7d47e2ae217e SHA512 a1c066343bff1bd451d44850e8dd3f554fb330116a7e91b5a9c13f4c33e837018f81a9e77e1c9856651c877352aab68fe4f80f05a185996cce7eda91c45e6c8e diff --git a/app-editors/mg/mg-20210314-r1.ebuild b/app-editors/mg/mg-20220212.ebuild index 97f5a75b4174..24717b7b49cb 100644 --- a/app-editors/mg/mg-20210314-r1.ebuild +++ b/app-editors/mg/mg-20220212.ebuild @@ -1,17 +1,17 @@ # Copyright 1999-2022 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 ppc ~ppc64 ~riscv sparc x86" IUSE="livecd" RDEPEND=" diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest index d3d81893fda4..9d850f0b86f7 100644 --- a/app-editors/mousepad/Manifest +++ b/app-editors/mousepad/Manifest @@ -1,5 +1,3 @@ -DIST mousepad-0.5.7.tar.bz2 920371 BLAKE2B e019427316343a528786fc973b9aef4c63b5368140894212faea767311e6a18029aa093a9ac9f9ec831d637e0d8568bb76215a7c760162015309049b2ee10418 SHA512 0302fbf0d5e7ffe20a7f712dd0dc5878552572ec77798ed329b0e5688c0d4f80c5aa527f9fadb2de7452c8983bf1efd0e117ed7c170b0ca79e09006617f357ac DIST mousepad-0.5.8.tar.bz2 927756 BLAKE2B b0518cfbc72a4816765846dc55cedb13377047d39966ceb66d93943b6eed7191eb06c2d482f41e7356271a26f3e99a5a26d1f63b3e4ef490c777448f85dd7083 SHA512 6446927b564fe18c3127835e592d0248efa690c7b8fc2a7da92f237eb16184bd502c446a5b50aed8acd1d8233c22ee7e91c0b9ee512232f7d7a69c72f1dea9e9 -EBUILD mousepad-0.5.7.ebuild 870 BLAKE2B 15144f376ef5a925979daa79c54095a2e2f5eba8da6c095245795049f83e2e1b8818aeeb465aa16423dbc31de3c59d7ce0333ee8c5f25f517f60cc4180e936c1 SHA512 546f7dc02547fdaea1deb6779ac384f77c5e294d41991ad90de7d633d9ea4e1d67cdcb47ba72e3ffa42a1aa45dd2b6156e1686c2aac8ccb16ef8aa0b78cc09d5 -EBUILD mousepad-0.5.8.ebuild 872 BLAKE2B 49ab1136a3a2fd6b23d3584d288ff381d95e0091d38f87609837a3b7d2d91542a435329b8facc26f319de96376dc5eabe68887fe30e8a903eb2760766cffaef8 SHA512 746c581cb8391cdef76e9de6462faab71700a9dfbb5976fe6c5121b98c55e435f58e8fe0730ef201835de58bc1233441bfa19e5a3d82d3007132055e822fca27 +EBUILD mousepad-0.5.8.ebuild 870 BLAKE2B 6c7f7c5ee93f531233753a9076ac377e64cbfeaa00de2d2ff17e4660bc36013dd37657157c3920c1e945370be58db82ea342de007f6b96ade32959be39313fd6 SHA512 f17f2e243fffd6ea910f3449a9511aaebd4086a4cd118b0324a78e1bb47187e8a66f4833abc803c6a3db2084b10b7ffe1ecab9a1654f387bdeebbc1b792fb5ba MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3 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 ac6df5ed10f6..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 ~riscv 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.8.ebuild b/app-editors/mousepad/mousepad-0.5.8.ebuild index e2ae29f2f03f..9f4db17d0951 100644 --- a/app-editors/mousepad/mousepad-0.5.8.ebuild +++ b/app-editors/mousepad/mousepad-0.5.8.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 @@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~riscv x86" RDEPEND=">=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index 553ee6ba02d7..7a0b039e8818 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,9 +1,9 @@ AUX gentoo.nanorc 4206 BLAKE2B eacba1d5db1475aa53f177d9c04819ff2b81c5fa196365f65c75b1fbbcfa78f93d4537d33901a604753131a14978843ed588296dad37c626c125959e61f3650a SHA512 45afe49629f0fe232bae8a0ae8d3984b3add366b1f88e5859df7612ab0b47f4df8764c17e038bcb49b106b08bfc8a20356b6e62cb9cae9ac337adc37db97ffd0 -DIST nano-5.8.tar.gz 3038948 BLAKE2B 126976539e8ab3a7be986edc7422bc58d31e0c81dffbf34c9b701d09d268233ed0de4f07ac8d2dd0963b768cce4e2afe89a4f8ed9fd216a71ebac98c7f403deb SHA512 dd3a7e328f256052707c4d28f2ca32f9e44de123e3dee3c0747fbab222d215b2a895c403b9274fd286e19477b8be3314fc83167eec32194370105b1e70c05a3f DIST nano-5.9.tar.gz 3093675 BLAKE2B d4fa2f0e64b6ab243a2b127ff894e900098f6261f5d46657ff3459cc0b51683a63fc5de54bd4545b47bc16c633b09142f8501b84a09df3e8123da5233a063766 SHA512 61bf4de300579bc6f0028a2237e105228d8657819c02f32c7ef8f84f9c54734df8fb9a9cddbce0f7721ebc5ac8ae4799c118291ae15480082f8b1317019a485d -DIST nano-6.0.tar.gz 3114631 BLAKE2B d89abcbd3673867447bbfd4eedfcd7b7d5250a3ebc1048068cf03f690b2fbd072c0224c00bef9b829bff8343dacf669e8e784fa24dafaa6441746471b692c55a SHA512 fa5726810cfb53fd2cc451d5a34e8f5c316c496f8d649a3899fae0b61cc5ca0bffd28deb780e4e0c98169487b8c34468fd401534b9110ba968d2d4ab6847bc87 -EBUILD nano-5.8-r2.ebuild 2284 BLAKE2B 3de023e0cfdb8dd68560bf07d8a087d2fe6d0353301e7c4c9c5523678dd36d88a0c8b12aae748df5b84e7638aa05dd83f29586c53b250acd118280491594c62a SHA512 603dc715772e82eb32e1b639a4353869d29bdbd1dde767e7e6bb4b95cbb88d88f39ca48038f3c2a1dc988e8c74ba5bddab24060025fd8ebc89559f9d4a0f7b9d +DIST nano-6.1.tar.gz 3146292 BLAKE2B ade773182d12b6d6452c23896e564a097d850630c87b0af622fe7766931aa2e5ef5e9d868e521e46e029851cdd428cd60b6c3e95bdb28df0733cba8b432f202a SHA512 e034c9d7c96bf6d7ac22a2188fccf87693dd5d19ddbcfb907f817544fb2ddfce2ee9331842d885870718617ea4fd0c9151f62b3e8dc52a486cec9a30e84539c0 +DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4 EBUILD nano-5.9.ebuild 2284 BLAKE2B af8a47119587f66407d2b16815bdd79034d1ec7c84aa85739c32d9d1f0d0b9e4e15f7f149e4a84ce9f4dba02f83589546d26a4e5656366dc694878d27c4c2f67 SHA512 beec13ea4b555f016dbdd64312ad64c6cd73cba23e284d06e74aacf4d31cd9cda02f2521861c923bbf39d495e128a9171edad12ecc83aa3b21ba5d97cd46bc92 -EBUILD nano-6.0.ebuild 2350 BLAKE2B e18e223af668f1aa380d084842f625c53576e23a782c3c3230c8a76df2fb4170df55d338c15dd05a42bfaaeeac8d22e3e071477d8ea85e13ba5ffc986803f6bc SHA512 e0b7d9bb52f980ce56ac3cb14f6d8f844491633d2dd1619ec35008c75df36d2a80a22100c22b7a6bd14ead7d5262c142a46887943877e291bf7c5218c8e2838c +EBUILD nano-6.1.ebuild 2350 BLAKE2B 5d47d56bd321834d4b3f1415284b97263e644b9e3d077df18b3d875eb199fa53292061c3a44fb10423c430d3e15d9a43126c2b4299aabf4ee99df0fb6d206ab8 SHA512 b7a42524a544c06899d3ad6ea381d97f018aeb311f8965f0f7223cc5d58c5638c75b526c841435e1f4f0f18de0da559e3e525343c31369a961e90d5309f762fb +EBUILD nano-6.2.ebuild 2350 BLAKE2B 5d47d56bd321834d4b3f1415284b97263e644b9e3d077df18b3d875eb199fa53292061c3a44fb10423c430d3e15d9a43126c2b4299aabf4ee99df0fb6d206ab8 SHA512 b7a42524a544c06899d3ad6ea381d97f018aeb311f8965f0f7223cc5d58c5638c75b526c841435e1f4f0f18de0da559e3e525343c31369a961e90d5309f762fb EBUILD nano-9999.ebuild 2350 BLAKE2B e18e223af668f1aa380d084842f625c53576e23a782c3c3230c8a76df2fb4170df55d338c15dd05a42bfaaeeac8d22e3e071477d8ea85e13ba5ffc986803f6bc SHA512 e0b7d9bb52f980ce56ac3cb14f6d8f844491633d2dd1619ec35008c75df36d2a80a22100c22b7a6bd14ead7d5262c142a46887943877e291bf7c5218c8e2838c MISC metadata.xml 1643 BLAKE2B 0281963fbe6aff1bc6765b1c9964ac2a7e1237b4759c4ae34e83a9c79c86975d910a43edfec80f279ebf17beb58db2eeb430915a165ea252042900ecefa3c57e SHA512 8636fa9e9f1b2bbc72f3b7a4395a99a7158de48e6f10487f6b5d450e6c35226b0f4d4a68e5e995dd625065831a343070c4f227d1c4422a2140e09f9c003d8fdd diff --git a/app-editors/nano/nano-6.0.ebuild b/app-editors/nano/nano-6.1.ebuild index ad20434b2ed1..71abe2ce7b3e 100644 --- a/app-editors/nano/nano-6.0.ebuild +++ b/app-editors/nano/nano-6.1.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 diff --git a/app-editors/nano/nano-5.8-r2.ebuild b/app-editors/nano/nano-6.2.ebuild index 64cdf0ed0eba..71abe2ce7b3e 100644 --- a/app-editors/nano/nano-5.8-r2.ebuild +++ b/app-editors/nano/nano-6.2.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 flag-o-matic if [[ ${PV} == "9999" ]] ; then @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="GNU GPL'd Pico clone with more functionality" @@ -84,6 +84,9 @@ src_install() { local rcdir="/usr/share/nano" mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die rmdir "${ED}"${rcdir}/extra || die + + insinto "${rcdir}" + doins "${FILESDIR}/gentoo.nanorc" fi use split-usr && dosym ../../bin/nano /usr/bin/nano diff --git a/app-editors/ne/Manifest b/app-editors/ne/Manifest index 183b8543b394..5f39ca454312 100644 --- a/app-editors/ne/Manifest +++ b/app-editors/ne/Manifest @@ -1,6 +1,4 @@ AUX ne-3.3.1-respect-CFLAGS.patch 453 BLAKE2B 70436e0380dfad01abb57a28b1ce5dcc44832499ad64cb7de4e22589da768ffe592c705415c3a61d818911679352ebf129132e14d2dbabc880b6cf0403245ed2 SHA512 66fa5081a63d281df49588429af6837eb3299bc6c704bbf5ac71ed9387140b5d4941c5d2ebfe49577f8d5dbff5cf9adcabb69e8d83eb7197a8f3fe77f2524524 -DIST ne-3.3.0.tar.gz 1173159 BLAKE2B a4be3fd37a0a79b440290846184bc50551cfb9b73dc50c0376110f3603233879b396f67a87e2f9defe9c0cbc42c963e66bc43ab5396f8ccb27e5b6182c429006 SHA512 73a1bbc5a9f62354834288e25b8f4bf2b0d2ff6faf3408108b217305e2c9d8fed768b5a3c3fd21df7b3bf75a3f9c71ea899a8b3f528b560a8e5e66accd442919 DIST ne-3.3.1.tar.gz 1138072 BLAKE2B 8494ff955b456bbac2e82823ee155980f8fab5a1071d0bfd6a987f1ed0724129ab2ecb70737547836b592369b45daf5e499d50d7230b04c5eabfd1536a56271f SHA512 d8c1d8cd9bbafcc7c8c485ca4454d6979be3d33ae918139865ce5f76e428f165043707c95c2e440bd9bccd00c67ce81a41f87f94b85cae3518c4749233718123 -EBUILD ne-3.3.0.ebuild 1091 BLAKE2B 78860027854e0c4e21491f82c3a749775553ebdda8da81f72cdcc543dc44bb969f01126347376ef2df50663f7e9b0635ec9c383314177871c9ae4f971cee7d4d SHA512 2fdb544933a70387450e0ae2e601cacbe3642f3a06f1586254196738745390fac2086ac0b982674a209655478914320fbda1e95e9628c06ef4e8373a1e1c4c75 -EBUILD ne-3.3.1.ebuild 1178 BLAKE2B 02a0735074b5779ddc5eaeee498ec855e42691dd1ac40460a4f0340e883a20ed0abd73955b21b5fee4be4498ed8738fd517af761125a7ba00e2e69b939ddae6a SHA512 dd2b418676fcf1d3f51fe80d6e1ee4081a5f8cfbd6964d245ffd394124cb6daaa16a704a248380e34c0b013e801ee2448834ed586315723f656b8bc15fab65b1 +EBUILD ne-3.3.1.ebuild 1169 BLAKE2B fd5cddafed3ed186295fecf0b8a81bc8411c6260edbc77f1d1798db4bd2383bcf8653eaa8e893fc513322d5c375d85a30a6f9179a340e03dfce3fdbb37a44ad5 SHA512 4a61b70ce2d9908ba059d0a25a173cb545a2d63a3fca6320f95d6a2ba85c7b23a07fda041caa180ac1eaf7c08d356c4b52ad71b9cd0910d01d6121cbf04eb39b MISC metadata.xml 241 BLAKE2B f2a34a0b5cd4a0d080704beb40861ad791adc8bb9247b6f2325de22149c64014255241e7f52ab3fea6cc3297c344ee45a9be9fdc76b665bf5e098354cdab5345 SHA512 b7184fdd7455ee5c40cfcaba2405c7d7627abb2f04e298a098656674c101d2ba08e8522a5614a1968139e4beddcb35f0e22c93dc7c052d698ce0134409807315 diff --git a/app-editors/ne/ne-3.3.0.ebuild b/app-editors/ne/ne-3.3.0.ebuild deleted file mode 100644 index 87aaff065bf8..000000000000 --- a/app-editors/ne/ne-3.3.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools 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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" - -BDEPEND="virtual/pkgconfig" -DEPEND="sys-libs/ncurses:=" -RDEPEND=" - ${DEPEND} - dev-lang/perl -" - -HTML_DOCS=( doc/html/. ) - -src_prepare() { - default - - sed -i -e 's/-O3//' 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}" \ - "${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.1.ebuild b/app-editors/ne/ne-3.3.1.ebuild index 6fa202479207..01b23dac9558 100644 --- a/app-editors/ne/ne-3.3.1.ebuild +++ b/app-editors/ne/ne-3.3.1.ebuild @@ -1,15 +1,15 @@ -# 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 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index a2349ffab6d4..9034fba47657 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -9,6 +9,6 @@ DIST neovim-0.6.1.tar.gz 10597584 BLAKE2B 3e2da61b768f5cae44e08f0ef7f386ce4b878b EBUILD neovim-0.4.4-r101.ebuild 2830 BLAKE2B a9aa517c7409e373bf510aa9d4adbaa627b561ee309c08d67941c3f497edc5471d50055406aaca2ca903952975813d74f5eb5f7caba09846522dbb25a8bb3cec SHA512 23db154a68cbeb0f15771a0d196a517cde5b7979440896c145c9cda4176e5ca2040b5222fdbee62fd6d97cf58e52ed143edaf9da25ac1a4a8a43acad8190edff EBUILD neovim-0.5.1.ebuild 2889 BLAKE2B fbf3f4d3ecb5effa3c0a22eaddefbd68adf1fcacb40306d8960871c78b3c05d374c429d87d2b3207f6e89efa7474b1a5efa6a69e9f81c61a775fbd2d6a046ea3 SHA512 12e9d1834653344fe598b1fe5acffd91f5bf32fefc06e4fd36c0d017c19ef374ae9d0d685043c516980116e185a9aa8ba1ee844f74840926adc798ae51977d44 EBUILD neovim-0.6.0.ebuild 2928 BLAKE2B 32f7efda71fda938c0a278da9bfe7e54a870b536eb9a660b0f0f6ed72851b9b53147426a700948bfdebf8cc2a28b7343ad04014efb6c3d79000dd4ac3335dbeb SHA512 5eb55f224e87ea23461eaff00e93363a42e19b98e38f840e7d057c3eac36ba79c4717fcb543e623a85601bbe3de6e91a4761d04fa924fd1d585d9b896e01683b -EBUILD neovim-0.6.1.ebuild 2928 BLAKE2B 0b8b20183821a493d0a62cb5ee725795d3f014660ba8213d62dd5ae44be7d5d4dcac77951a885e98cb29f5eabaf7e89cdb4791d6fc04c96feb47c814f5c1377f SHA512 43cc3b307c40da7dae3771d938c1737b20eebd15682704d03305745ca7c908d5761ba534cd1accdc9539c005a33db081ab707b51b371fe54af736ded22ac66c3 -EBUILD neovim-9999.ebuild 2928 BLAKE2B 32f7efda71fda938c0a278da9bfe7e54a870b536eb9a660b0f0f6ed72851b9b53147426a700948bfdebf8cc2a28b7343ad04014efb6c3d79000dd4ac3335dbeb SHA512 5eb55f224e87ea23461eaff00e93363a42e19b98e38f840e7d057c3eac36ba79c4717fcb543e623a85601bbe3de6e91a4761d04fa924fd1d585d9b896e01683b +EBUILD neovim-0.6.1-r1.ebuild 3142 BLAKE2B 2c055a005eb094a25cf24fe56b53f63423896c42338a724acaf1b9c3940fcadda66bc3b85d6bf1658f9cc56a814ab7e5f4bd9705cad907ba3cd2a9c14a04f8af SHA512 87c65ca01d88b1a937031f080452d8e1c28a1f02645982a0dc9f5d9592ec91cd14c758bbb1fe78290d35ece2516bc122dde8702dccf3bf0fa9d7a9a220ef1d05 +EBUILD neovim-9999.ebuild 3142 BLAKE2B 6e913a187ac672eb84d3c7de98574962f71f82f7efbf8736302eb431ecf489f93c1b00cb223a4494e744aa5c242e71172e9a519326f13d691c7b405a0b769108 SHA512 7dac921fc021a8259ec12e8f80c18aeac1e195fe7b4cfc6f0cd394fdc24727f55e03d321c28a4841871bd411cd80016fae5720963e63f3f33d5be57ec38cf78c MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8 diff --git a/app-editors/neovim/neovim-0.6.1.ebuild b/app-editors/neovim/neovim-0.6.1-r1.ebuild index 2583a834c2fb..d7838343d030 100644 --- a/app-editors/neovim/neovim-0.6.1.ebuild +++ b/app-editors/neovim/neovim-0.6.1-r1.ebuild @@ -31,13 +31,15 @@ RESTRICT="!test? ( test ) test" # Upstream build scripts invoke the Lua interpreter BDEPEND="${LUA_DEPS} - dev-util/gperf + >=dev-util/gperf-3.1 virtual/libiconv virtual/libintl virtual/pkgconfig " +# 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.42.0[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] @@ -45,12 +47,12 @@ 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:= + >=dev-libs/libuv-1.42.0:= + >=dev-libs/libvterm-0.1.4 + >=dev-libs/msgpack-3.0.0:= + >=dev-libs/tree-sitter-0.20.1:= tui? ( - dev-libs/libtermkey + >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) " diff --git a/app-editors/neovim/neovim-9999.ebuild b/app-editors/neovim/neovim-9999.ebuild index 54ffbbed750b..69b26947a582 100644 --- a/app-editors/neovim/neovim-9999.ebuild +++ b/app-editors/neovim/neovim-9999.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 @@ -31,13 +31,15 @@ RESTRICT="!test? ( test ) test" # Upstream build scripts invoke the Lua interpreter BDEPEND="${LUA_DEPS} - dev-util/gperf + >=dev-util/gperf-3.1 virtual/libiconv virtual/libintl virtual/pkgconfig " +# 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.43.0[${LUA_SINGLE_USEDEP}] $(lua_gen_cond_dep ' dev-lua/lpeg[${LUA_USEDEP}] dev-lua/mpack[${LUA_USEDEP}] @@ -45,12 +47,12 @@ 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:= + >=dev-libs/libuv-1.43.0:= + >=dev-libs/libvterm-0.1.4 + >=dev-libs/msgpack-3.0.0:= + >=dev-libs/tree-sitter-0.20.1:= tui? ( - dev-libs/libtermkey + >=dev-libs/libtermkey-0.22 >=dev-libs/unibilium-2.0.0:0= ) " diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest index 404ff885403b..d9644eb7171c 100644 --- a/app-editors/okteta/Manifest +++ b/app-editors/okteta/Manifest @@ -1,3 +1,5 @@ DIST okteta-0.26.6.tar.xz 975720 BLAKE2B e9eaf258e9285dfcbf41cd0fcd3fa31e01a9d3b57b7d5c305d644aaeba2588351d0e212c7a6df7f06ab54da47728a916169dc2670772d445f5d34427fbf18946 SHA512 f489ddf1be6fe369b564b11cf8234c7a291b63101a00fb43163a1019609d1152735750946b2bd876080eff1697903ba02ada1ea641293a59f31d5edf34604b1a +DIST okteta-0.26.7.tar.xz 983388 BLAKE2B abe5abb678c0cae7538ac5bdf68b3e9285c405996194e03dcb3f74c397124805496a67ee1b9b2d8c2676dc3fca7d743a012898056aef82f5f1a1e998ee36ef60 SHA512 829294e0ed8b01be940b215334d9291bba1af01fded05511be33a813e9d090bc06f0af90dfb49d45d44814ae38de7c9cb6427215ea076b8401a66734aa42ea25 EBUILD okteta-0.26.6.ebuild 1760 BLAKE2B d46526993dd9807d460a3976e77041d782e245d97fc95109c02247f63a2501e8ce80d92cd61db2c625335ff7424155c615576556f7a562a96267bd88adce3dc3 SHA512 5e47fb1cd03eade146322ec5888296d2e00303099f5196577f171a993c96662c347403fcbd1e81d8c83d674a79ba75c43712afe287cb9211ced5911be8f99977 +EBUILD okteta-0.26.7.ebuild 1762 BLAKE2B c5dd1eb6329f206be08bacea292fd3ff2b12da6a1dbfb8674c0cfb4117ee3bb299358fce6c6cba6a54a5b817594851678f5fdfb2fe7ce9b7fd529e47ea6e3cd3 SHA512 443435661b95a9604d6f0a78bc5922774db888a43038180a1c1373001d38a337fd6ea2fa54dfbccc8d3bb6957d327ab06568875471e72d8f6192d2de26337da5 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b diff --git a/app-editors/okteta/okteta-0.26.7.ebuild b/app-editors/okteta/okteta-0.26.7.ebuild new file mode 100644 index 000000000000..cf8171388a8d --- /dev/null +++ b/app-editors/okteta/okteta-0.26.7.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=5.82.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Hex editor by KDE" +HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/" + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +LICENSE="GPL-2 handbook? ( FDL-1.2 )" +SLOT="5" +IUSE="crypt" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtscript-${QTMIN}:5[scripttools] + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + crypt? ( >=app-crypt/qca-2.3.0:2 ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DOMIT_EXAMPLES=ON + $(cmake_use_find_package crypt Qca-qt5) + ) + + ecm_src_configure +} + +src_test() { + local myctestargs=( -j1 ) + + ecm_src_test +} diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest index 1ff95567f4d1..99e68a4b9082 100644 --- a/app-editors/retext/Manifest +++ b/app-editors/retext/Manifest @@ -1,8 +1,4 @@ -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.2.tar.gz 522652 BLAKE2B f9b19f985c1381eade324758c4dc6bf2e5f74bc3f5bfc27afa10462b7387f64a3e72edd5875aabf1831f1f0a942f395e43b124c172cac8cec4b9f19334661484 SHA512 68345b57b2c5446158ed3a6f97b5ead103ef1c99a3aea9cbc69ef7d0807fb64546f38ebde2969b94429eeed6450abb345fecc566dcf6e0767fe84c4e27348e53 -EBUILD retext-7.1.0.ebuild 1817 BLAKE2B 2d9d2f42c16af2849031e8f43f73d9848268dc9b82f7a863d9b0b1679d9cc52f4d45ec836b637daef785abf0a26f90e621fe1fb85fdc17a0315f81acc74cf477 SHA512 a1160568d324e1a5d240f27d01a978e412ec8f49832dc1661be049f3608a0407ddb152ec1d1a0ef79b274010ba7e1168a0afd747203bd561f37345acdc8431c6 -EBUILD retext-7.2.1.ebuild 1978 BLAKE2B 61abf35246d654bb60de706c6275f4b463c8d60c3af04201f7846b2d916ff2633d421d5d38419ce1aceb90689109b64100ca9554cda225dbb3c9676db0e70184 SHA512 e0feaa922eb61bf68b049f3b56ad5e7324ca0ece7e48d081c952cc64b0d12e31b26fe3d0212bdb0d28e9aa10daa7f76dcb4d9292b804dfb2eeb0d1ed46c5a21c -EBUILD retext-7.2.2.ebuild 1978 BLAKE2B 2103f21e3e2fe6ca561bd0f7b2f6b4506205c77820d0af3a5648595bd79286dabfb53477eb48bce740bb4fdfcf4a7669770db50f74b12b33418007df37ebb1e4 SHA512 ef94587ec55d30254086a90cab157d31bdee07bbca4b1449e71f9d0d5877c3ff2256765ef731eb273b280eba6fd7fa0426e30ad016a552c1c0bfc6d7b27dcc48 +EBUILD retext-7.2.2.ebuild 1976 BLAKE2B e50052619b4664d384b13993041fa78b0eeca5f2fc084662c42f3912249863c5e079a8d4041f4f44e4913d1b9c2f06653d589600837cb934c116529fa562c58c SHA512 df0c32f8d6afcef5207ce9edba6ad2008078f1556f370d7708e41980f00dddd148aa867747b632bf96cb9494521474a6639d708570c269faa0379423e6846dc4 EBUILD retext-9999.ebuild 1978 BLAKE2B 2103f21e3e2fe6ca561bd0f7b2f6b4506205c77820d0af3a5648595bd79286dabfb53477eb48bce740bb4fdfcf4a7669770db50f74b12b33418007df37ebb1e4 SHA512 ef94587ec55d30254086a90cab157d31bdee07bbca4b1449e71f9d0d5877c3ff2256765ef731eb273b280eba6fd7fa0426e30ad016a552c1c0bfc6d7b27dcc48 MISC metadata.xml 298 BLAKE2B 82f3b1a76b71a731c76a61612a0e3a31634b08ab73d1ff9d57c9c68fdd68b0acf9387a5024772c9fe80d4f54d2134c591b17bc4c519d06b50491671042f4c635 SHA512 5e439ee1dae76ef108f8a5f28a5e4305181eacab14c9b239d5f3d4a6b25a25a59617eaa5d2df13b5fba8362d6b8f3af43af8fa9df22715867e170d29cf649c5c diff --git a/app-editors/retext/retext-7.1.0.ebuild b/app-editors/retext/retext-7.1.0.ebuild deleted file mode 100644 index 3d983b56ce76..000000000000 --- a/app-editors/retext/retext-7.1.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# 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_SETUPTOOLS=rdepend -inherit distutils-r1 optfeature virtualx xdg-utils - -MY_PN="ReText" -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} -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[${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}] -" -DEPEND="${RDEPEND}" - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - esetup.py test -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - 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_desktop_database_update - xdg_icon_cache_update -} diff --git a/app-editors/retext/retext-7.2.1.ebuild b/app-editors/retext/retext-7.2.1.ebuild deleted file mode 100644 index 8dccc7365c37..000000000000 --- a/app-editors/retext/retext-7.2.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# 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} ) - -inherit distutils-r1 optfeature virtualx xdg-utils - -MY_PN="ReText" -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 ~riscv x86" - S="${WORKDIR}/${MY_P}" -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/PyQt5[dbus,gui,printsupport,widgets,${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND="test? ( dev-python/PyQt5[testlib,${PYTHON_USEDEP}] )" - -src_test() { - virtx distutils-r1_src_test -} - -python_test() { - esetup.py test -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - - 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." - 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-7.2.2.ebuild b/app-editors/retext/retext-7.2.2.ebuild index ac4f08fb2467..5888d8950796 100644 --- a/app-editors/retext/retext-7.2.2.ebuild +++ b/app-editors/retext/retext-7.2.2.ebuild @@ -23,7 +23,7 @@ else SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~riscv ~x86" + KEYWORDS="amd64 ~riscv x86" fi LICENSE="GPL-2+" diff --git a/app-editors/vim-core/Manifest b/app-editors/vim-core/Manifest index 8a8ba234d63c..5227788a44ae 100644 --- a/app-editors/vim-core/Manifest +++ b/app-editors/vim-core/Manifest @@ -9,12 +9,16 @@ DIST vim-8.2.3582.tar.gz 15778667 BLAKE2B c8eaa95fa4fde6514168a9f42a712a78442a7f DIST vim-8.2.3669.tar.gz 15810783 BLAKE2B edac6dabfbeb11057c7b15830b30ec555a10942494bc89d7d85b4c701b5ff8f7413887e4e33e7b812057177ffebd2cdc74e69e86080a86cfee529b1da45156bb SHA512 83d172f7e1a3c5a8ea6238f2766bf077463d32d429111c08e5b28b8aafb8aea584807023281abf3b1710d61820fec8d2b808b42b5c50058d5eb4eb917deb19ab DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df030c1334f989862b17b70d7859d751f79dcaf98eb5216c23df6ce63f3406cb5cb3c643f9e8170987f4f705a49833 SHA512 19ee7cc27642253ad989e6e32ab96faa46b5e1feebba00cadd018af2de186358d686cfa5efbc8e5da00a14ceb42c226acfc81cb11cd87f34ec7ca901c98df814 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be -EBUILD vim-core-8.2.0814.ebuild 7164 BLAKE2B f244a235e78abd3dd0880b3c13be3780186634adc7588fabc86de6b7e33823a1b6dfecdd36dcc9e81c3e13e01594b3bd555f988d5f42636d666e5abfa10922bc SHA512 0bdae6503815e79347fcd7cc010813047a7333388e19b765a43aaab7b87f08dcefa46e3daea24fb82c0774732c39429bad53fc80d34ab0a9234ec8031b5a2ee2 -EBUILD vim-core-8.2.3428.ebuild 7230 BLAKE2B 03d7b91e062a4b33dbfd7226f90fc60f4f30b5c48014435e30172b0fb5adca2d40e3afdb3223e1025c0099357341e611605e6159807e9ec0ced8fbd540af9525 SHA512 99da825ebd14a43c36eb5329cdfe51fe22aa2414f9ef7cae2c02831bff24deff169b8919edf47327a1286140d4898842b0283ba4f446741950f09fb0ae206e35 -EBUILD vim-core-8.2.3567.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6 -EBUILD vim-core-8.2.3582.ebuild 7237 BLAKE2B 57401e1c87a3382822347e140eae2411526842a5b16689c862f13d34ddef830b234d3acccf6e6850a13b20a3c3e30c323e4c2b787a353ff4fd91521ee4259a3c SHA512 1d8fc9df2432fea0c46acdf38e12653326a88a505f870f34e4e3d3bbc5f82ec4063a5721e048e9ab523f097dc3c826347ff988e965951cce670f9b0efbc7bea2 -EBUILD vim-core-8.2.3669.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6 -EBUILD vim-core-8.2.3741.ebuild 7237 BLAKE2B 6330fc6e445586cba797557d304ffdbebf6c2e9040aa690fcb04d26409ae68861da8b34cea36a9cfb8d503dfdef8b90a0fc1c01954c22958f3464b922703e4fc SHA512 2737d15d22ef255abde5f2359bf0485ce8e9897d1d71ea4d227c49f3d359ff8b194bde8e0c1584079638a9c6f03ecf3e9899fcf1330af5f50099e877493b9359 -EBUILD vim-core-8.2.3950.ebuild 7245 BLAKE2B 5c9b4902c4fa4d74ca6d19cbfef053ef7c5a49b140acaef23426671c0e13f038bf718b1384192bba4f5f5d433cb05cd99b4de6c93e7b15687abc5f8a01332d30 SHA512 6ad5383121999226973559257d2013a5dd13df34ff1166d9bec6b4faaafd259504d2fe5f1928a6cdb65a12eb8e2875f5a9acfc3b706686781ae0e0d5a40905a2 -EBUILD vim-core-9999.ebuild 7245 BLAKE2B f2e57ff7b63e54789c2bfbb4cf4929e301f363424cd06bea9c8b7f4b519630e324961b078672123ef8499fa5418386c7c1e15e0b588f35e98190c979ebe59378 SHA512 669e5a657f4abbdf3261a068501c4bfe5492fd81fdc021cd409249a47c46babd327b0c122b19747f08161c028b45671967896f8b26ad1f94ebb6f866eeb5e8b6 +DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec +DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651 +EBUILD vim-core-8.2.0814.ebuild 7300 BLAKE2B aa73cad9bed04545abbfa8924022ec5e9a796b0f02f838bd5284d2da95de34b7665d24078a94e35e9d04bafcc2fa33a923c96c9a087081cb4d690fed25a6c3f5 SHA512 09b438dece9441fde5509fdc1091deccb4c5c90b12a71036eb71cdd45c320f50bb6abc6746b04eedf640e101c30c0c84cda9dbf3727c55254c1a5c448283db7e +EBUILD vim-core-8.2.3428.ebuild 7366 BLAKE2B c6a15417c64899f67f0b0d2f24e1aca6926567bf06aa0a3ad02b6d4e4e97b2a18a2519bd33a90812cbd74edee79771897d5c36a12e4e693279e5ba260f9f81a8 SHA512 9d7ba3b42a87e3b73a089e43befb8db1d6cf0319de605bcee5296feb83c516a32890409ed47caf20ede9593e1cf16f190f9c2d77a211f1398b0d71cdcad0047f +EBUILD vim-core-8.2.3567.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb +EBUILD vim-core-8.2.3582.ebuild 7373 BLAKE2B 6c783035fe60f08462e8047f0ef6373a532c1c9725857710a3ef1dd94cfc3b6c7da04f50e6b8c2a5ccc52e23a6c8723201a76ec6dfe72b8752e2dd8b1f647122 SHA512 0bc0a3a25c9dc412d28235ce1eb6472a8261e3803a2bf38d30d4d118d46b2943b1088a76c5fde23ce933ced9458d61c39e5cdbc59b67d1baa14c3e48727edef7 +EBUILD vim-core-8.2.3669.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb +EBUILD vim-core-8.2.3741.ebuild 7373 BLAKE2B 6c783035fe60f08462e8047f0ef6373a532c1c9725857710a3ef1dd94cfc3b6c7da04f50e6b8c2a5ccc52e23a6c8723201a76ec6dfe72b8752e2dd8b1f647122 SHA512 0bc0a3a25c9dc412d28235ce1eb6472a8261e3803a2bf38d30d4d118d46b2943b1088a76c5fde23ce933ced9458d61c39e5cdbc59b67d1baa14c3e48727edef7 +EBUILD vim-core-8.2.3950.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb +EBUILD vim-core-8.2.4285.ebuild 7381 BLAKE2B ed3bedeec4219c8daf109f3aa0830c64f84f4e7f0de84a07c8d749da92b72e996c8c9e779ce6693b6b94b815bd3a253e18d0e3100a28e53c6ca9355fccc2e3fa SHA512 30ecb645eb1723cd1fa38aba6f08b0ca0b45ac4085ee811df08b899f1feacaf336b28851fa43bf95b2b062b530f00f2ef82d9ef732795b4cf4ad6e52c5a29fcb +EBUILD vim-core-8.2.4328-r1.ebuild 7141 BLAKE2B 5dbd10e1b6301b82b99b047e17e60b21941ba9aebbf8ad4b3fc1a09ca0665aed704abdb58d388079a548a5cc6ae8bfa2313aa287f864f9871bc31152241ff210 SHA512 e45fbae1333a3704169896d29605603250746300a5d27955401832650722ada8a7a274c2de3abdcd332c85caf0067f3c3c8e7a837d82618d85cb578dd44a353f +EBUILD vim-core-9999.ebuild 7146 BLAKE2B a8bf436cf36628d415159028f71bf456c02a3871e345cc08d1cf4be133041d18700af2b97c8fbd333948adaa6a615d47a48d3864a62ea6812fbbe58eb003a5f0 SHA512 dd82509a8a805383eb3311a46f0cbed3440e2cc20f401b34550de6f8cc5245763e9e45fc38a7c8872e06faa1deb037c56364c6d5e406fa85999382137f1c2575 MISC metadata.xml 373 BLAKE2B ed379c0c7c1b4317edd219c1257015713213d1b19255435ad216273def371f59f88ea7f3e72caf99b6b8d53b7ace2691347c8b06e5961bc4e91ac34ae77d0622 SHA512 58485928380299dee5f390b2af01dd36f4d4ed2f30fc5d8e400f0bef18f00b62b060e865b3cd24292289264870ebe89397d19d8f068b402a5748f569eb75efe7 diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild index 5c1fb6f93cb3..c017b523925e 100644 --- a/app-editors/vim-core/vim-core-8.2.0814.ebuild +++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -191,9 +191,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -208,6 +205,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3428.ebuild b/app-editors/vim-core/vim-core-8.2.3428.ebuild index 40e298a032ae..a245749c90df 100644 --- a/app-editors/vim-core/vim-core-8.2.3428.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3428.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 @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3567.ebuild b/app-editors/vim-core/vim-core-8.2.3567.ebuild index a6ac59db33c3..eda637ba36f0 100644 --- a/app-editors/vim-core/vim-core-8.2.3567.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3567.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 @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3582.ebuild b/app-editors/vim-core/vim-core-8.2.3582.ebuild index d04960a41e81..2396c7131d36 100644 --- a/app-editors/vim-core/vim-core-8.2.3582.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3582.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 @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3669.ebuild b/app-editors/vim-core/vim-core-8.2.3669.ebuild index a6ac59db33c3..eda637ba36f0 100644 --- a/app-editors/vim-core/vim-core-8.2.3669.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3669.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 @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3741.ebuild b/app-editors/vim-core/vim-core-8.2.3741.ebuild index 9ce1dc4f86db..2396c7131d36 100644 --- a/app-editors/vim-core/vim-core-8.2.3741.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3741.ebuild @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3950.ebuild b/app-editors/vim-core/vim-core-8.2.3950.ebuild index bfac57e4caa8..eda637ba36f0 100644 --- a/app-editors/vim-core/vim-core-8.2.3950.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3950.ebuild @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.4285.ebuild b/app-editors/vim-core/vim-core-8.2.4285.ebuild new file mode 100644 index 000000000000..eda637ba36f0 --- /dev/null +++ b/app-editors/vim-core/vim-core-8.2.4285.ebuild @@ -0,0 +1,237 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="8.2" +inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="nls acl minimal" + +BDEPEND="sys-devel/autoconf" +# Avoid icon file collision, bug #673880 +RDEPEND="!!<app-editors/gvim-8.1.0648" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir -p failed" + export HOME="${T}"/home +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches + fi + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See 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 + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug #43885 (20 Mar 2004 agriffis) + sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf + + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug #18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r5 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + # Delete skip_defaults_vim config not supported by vim[minimal] + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" + + eshopts_pop + fi + + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + 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.4328-r1.ebuild b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild new file mode 100644 index 000000000000..09a0e4d7f51c --- /dev/null +++ b/app-editors/vim-core/vim-core-8.2.4328-r1.ebuild @@ -0,0 +1,231 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with app-editors/vim and app-editors/gvim + +VIM_VERSION="8.2" +inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop 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://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi +S="${WORKDIR}"/vim-${PV} + +DESCRIPTION="vim and gvim shared files" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +LICENSE="vim" +SLOT="0" +IUSE="nls acl minimal" + +BDEPEND="sys-devel/autoconf" +# Avoid icon file collision, bug #673880 +RDEPEND="!!<app-editors/gvim-8.1.0648 + !<app-editors/vim-8.2.4328-r1" +PDEPEND="!minimal? ( app-vim/gentoo-syntax )" + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir -p failed" + export HOME="${T}"/home +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches + fi + + # Fixup a script to use awk instead of nawk + sed -i \ + -e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "sed failed" + + # See 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 + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug #43885 (20 Mar 2004 agriffis) + sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + # Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0 + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf + + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug 57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug #18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + + # Remove src/auto/configure file. + rm -v src/auto/configure || die "rm configure failed" + + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug 24447). The hvc + # things are for ppc64, see bug 86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + # Let Portage do the stripping. Some people like that. + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # Keep Gentoo Prefix env contained within the EPREFIX + use prefix && myconf+=" --without-local-dir" + + econf \ + --with-modified-by=Gentoo-${PVR} \ + --enable-gui=no \ + --without-x \ + --disable-darwin \ + --disable-perlinterp \ + --disable-pythoninterp \ + --disable-rubyinterp \ + --disable-gpm \ + --disable-selinux \ + $(use_enable nls) \ + $(use_enable acl) \ + ${myconf} +} + +src_compile() { + emake -j1 -C src auto/osdef.h objects + emake tools +} + +src_test() { :; } + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + dodir /usr/{bin,share/{man/man1,vim}} + emake -C src \ + installruntime \ + installmanlinks \ + installmacros \ + installtutor \ + installtutorbin \ + installtools \ + install-languages \ + DESTDIR="${D}" \ + BINDIR="${EPREFIX}"/usr/bin \ + MANDIR="${EPREFIX}"/usr/share/man \ + DATADIR="${EPREFIX}"/usr/share + + keepdir ${vimfiles}/keymap + + # default vimrc is installed by vim-core since it applies to + # both vim and gvim + insinto /etc/vim/ + newins "${FILESDIR}"/vimrc-r5 vimrc + eprefixify "${ED}"/etc/vim/vimrc + + if use minimal; then + # To save space, install only a subset of the files. + # Helps minimalize the livecd, bug 65144. + eshopts_push -s extglob + + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" + rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" + + local keep_colors="default" + ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) + + local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" + # tinkering with the next line might make bad things happen ... + keep_syntax="${keep_syntax}|syntax|nosyntax|synload" + ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + + # Delete skip_defaults_vim config not supported by vim[minimal] + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" + + eshopts_pop + 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-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index a6ac59db33c3..37b1be63841c 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,7 +28,8 @@ IUSE="nls acl minimal" BDEPEND="sys-devel/autoconf" # Avoid icon file collision, bug #673880 -RDEPEND="!!<app-editors/gvim-8.1.0648" +RDEPEND="!!<app-editors/gvim-8.1.0648 + !<app-editors/vim-8.2.4328-r1" PDEPEND="!minimal? ( app-vim/gentoo-syntax )" pkg_setup() { @@ -193,9 +194,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index 677dc34a9e0c..858901ed49e2 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -7,12 +7,16 @@ DIST vim-8.2.3582.tar.gz 15778667 BLAKE2B c8eaa95fa4fde6514168a9f42a712a78442a7f DIST vim-8.2.3669.tar.gz 15810783 BLAKE2B edac6dabfbeb11057c7b15830b30ec555a10942494bc89d7d85b4c701b5ff8f7413887e4e33e7b812057177ffebd2cdc74e69e86080a86cfee529b1da45156bb SHA512 83d172f7e1a3c5a8ea6238f2766bf077463d32d429111c08e5b28b8aafb8aea584807023281abf3b1710d61820fec8d2b808b42b5c50058d5eb4eb917deb19ab DIST vim-8.2.3741.tar.gz 15812097 BLAKE2B 5cd90d4c86774a63a020ac8f245005e3f7df030c1334f989862b17b70d7859d751f79dcaf98eb5216c23df6ce63f3406cb5cb3c643f9e8170987f4f705a49833 SHA512 19ee7cc27642253ad989e6e32ab96faa46b5e1feebba00cadd018af2de186358d686cfa5efbc8e5da00a14ceb42c226acfc81cb11cd87f34ec7ca901c98df814 DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b11686f51f9a33898d92cf1d3927c6d49cd24024b6c5cbbad82b45ab8293f6d4663f14e66a56cc8b361a5fabdbb0b0 SHA512 d9176f74a1b753fb9118362350b3da16f176c7bc5cc57b41dab1f470c1e80830e4a6f4851d5a090d6efdb272186bd8f6a8a5e08e5da5ae0474560cb32dd626be -EBUILD vim-8.2.0814-r100.ebuild 9440 BLAKE2B dca3174687b35b94074b4dd1c6c33b663b1163204a349c64a19ba25e9a4227c9e5135dbd7491308a30dcd669339598fe86a6b779c2ba03378c049766a9e11f2b SHA512 af81e0e1e8eb32bbed0551440181d73b29308b3540d9b5b649ca4b29713b5e92572fd750262f3832589216590163a2067d8deb4fe99598e4165c4174049db7b3 -EBUILD vim-8.2.3428-r1.ebuild 10129 BLAKE2B 90c5110d69abc6e14bed2dab61fc8c944c47b6cc9931b16eaeb615e81945f65977c2fa89bf065ec5bda38ca99e0764ced63c0502824ab675df0c2bc9bf03b026 SHA512 e159ccca71dc187bb53d6d97db2f8401eba0b9ea0be129d7299019d3ee6566d416a29630f907a4a0c7dd196758eceb62cadf87ebc912f4ebb71b7283394e8525 -EBUILD vim-8.2.3567.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96 -EBUILD vim-8.2.3582.ebuild 10201 BLAKE2B 19b74948c229fed51d4a5d668f97b2f3320c274aaec01658e5b3fdab11d244bdcca10df3cd14760e01f380c4058ebf53937fb0da84cd739d4c6f6f9cbcdefb02 SHA512 833011e1b757031021804b6c36911358f508b9318c82030c260be99efc631dabb6c6cd5c71695d9c448c44475354d3106a50825dca98e41bdb58045048690f18 -EBUILD vim-8.2.3669.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96 -EBUILD vim-8.2.3741.ebuild 10201 BLAKE2B bb7832ea899f26ea0c1de4d86142a17a18097092bb1128f144a5fdb1f747891e25f62f20ece63c67adcc7e5e7f8382b2b9c6a96388e0a4bfddd52aec127af4ed SHA512 1d320804780c62cf5a1cdc0dd65ebb4e5f6b0a0746c4ea0d339983aaae33da1d87df82be949839a85b15906b59dbbad5e529dcc5e02763c668a4940be7c11117 -EBUILD vim-8.2.3950.ebuild 10209 BLAKE2B ec10b49d5a770f3334739e38447652bbd06c6266c481d3696327f8ef9cb32c42916c98755a74ba9edbf0a609004d43ebcdd9f1d4b3714670017aa9e76603c2c1 SHA512 f6c90b20a2042b6a6d79fa57e9eb03f226db02393a3c6cf07c333b2fc1d11ddaddc3b2f9c55d0fc1237a4b32001c944bafb3daae45771b990109a8776e98b49c -EBUILD vim-9999.ebuild 10209 BLAKE2B cd5cbbe715055703c3f650b20466d9454867089a73a58a0f65847bc4cbb9ba4471cf36faa1c13eb217046166227aab61675631c7168a99747d64d44d6050d59f SHA512 c94c183c4bc885f1c6e2e7670758f78448e0e85539b6b458c2f967f62553bb176e8abe627f59b77288c9c6c5b7e0487fc2ac452e4d3de6fcc5fcda1154c5da96 +DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec +DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651 +EBUILD vim-8.2.0814-r100.ebuild 9496 BLAKE2B 77b6188e1c207b82cb341659ad28b8179bfef3d431126caeaa8eb32500b927d9e63caf606e63890597d47959ec5ed29af40c3e8c0130486c90ce2016515cd742 SHA512 da1b4a8c8e07d5dee976d36a523788f74aa7bbf10b99bc2f7e3dfe66a93bde46999c39f10466b9a3f72fef927743fe63f16883874dfdcc31fa8d1a5b0606e393 +EBUILD vim-8.2.3428-r1.ebuild 10185 BLAKE2B 2db77b2dae20412a5e2ea1d2a0192b49312619518114ae9de7dd1436d24f4f0ce8f86e49b125605396e8128050f46d69fa539c8194838a784418356cd1cb0a80 SHA512 f58dcfe5f137f712f205691f67302fad5e4e72a5836cc5e64713b26a1a44ee1d4ed4862f8bb17938a1639e27edc25605efd7d3d2cbd1bc92fd95cde294664fcd +EBUILD vim-8.2.3567.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70 +EBUILD vim-8.2.3582.ebuild 10257 BLAKE2B d33c9e872586b4e9ad4cdae08ef20a2dc5aefbfbad33b6ac262daac88c0ca522d9ec35da43143dc5208915a1e95caff5ffeb750c5349c52440c32145b51c7a84 SHA512 2531fa382b1ea8632767cfb4aad8cecbe6137763eb89189ed58ebdc6958fa28a41a188e2be2ed7b8b18214ed1602930075dcc09b79fda082511641a153cb8d38 +EBUILD vim-8.2.3669.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70 +EBUILD vim-8.2.3741.ebuild 10257 BLAKE2B d33c9e872586b4e9ad4cdae08ef20a2dc5aefbfbad33b6ac262daac88c0ca522d9ec35da43143dc5208915a1e95caff5ffeb750c5349c52440c32145b51c7a84 SHA512 2531fa382b1ea8632767cfb4aad8cecbe6137763eb89189ed58ebdc6958fa28a41a188e2be2ed7b8b18214ed1602930075dcc09b79fda082511641a153cb8d38 +EBUILD vim-8.2.3950.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70 +EBUILD vim-8.2.4285.ebuild 10265 BLAKE2B 2da9c389b03afe7e2226c9dc06f7fb2699b61eb6c2d0698ad774366a28a237dbffc6cbd205f6b257ff6d1e4d504e0ae04faa85734abe3202575c0a7e2af6d3d7 SHA512 dcc3de6e12314c094e740fab48c3345291803a98bab460c890971811a0ab1c4ba323e331450b6af2e2ecba40a2e7778e62f004e5f615ddc741fe6f122d3b9b70 +EBUILD vim-8.2.4328-r1.ebuild 10089 BLAKE2B 3f7ec30b849bb9457e0ff55223913269c76cf4ed7aba2e2da29b50ea3c9bb269430dc93accab5df62cdf0959e9c12ab89e7772f8f2fd2b68586b3c2308fa053a SHA512 3347ed62ff99bc7d039f26a7bb7ea2975af9ebb5076493b17e10b41465aade46492a09b986d92f9ab39ce58652f6b2e7431e479d73eb8c12166715cc73e328b9 +EBUILD vim-9999.ebuild 10094 BLAKE2B 525197248b7938f4c79481cc3fa4a5920119e7c966a36b8d7d436e4f08aa8611e5c02c67ffdc182e662263348afd936c39f7ea7d508325c5e7ae0085f7cd4975 SHA512 d0187a2b5294cd1acc36f4324fb16199fecc7e3e02a8ea6d798d8b7b0233caa987f97a284df344b944235e06e3cecb39d66938e98241f71561bf4cc2d12494d9 MISC metadata.xml 951 BLAKE2B 10b867295bee9174e71d1df8a2a8a251c669fb2415893f2e90e361622520fa6b357a2098cb0184637a6f3078ed1873ed1d38f64be205d941de13040fb9f197e2 SHA512 683a03f6198c53c16874cfd8b50a265460a507afcb1bff104ce8932a9957cd4a3cc0cd6d0e494ea0757645162994c55a792d282fd6ad1278dd10659804d2f54c diff --git a/app-editors/vim/vim-8.2.0814-r100.ebuild b/app-editors/vim/vim-8.2.0814-r100.ebuild index 0f20c926a800..b0ae7e31e182 100644 --- a/app-editors/vim/vim-8.2.0814-r100.ebuild +++ b/app-editors/vim/vim-8.2.0814-r100.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 @@ -306,8 +306,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3428-r1.ebuild b/app-editors/vim/vim-8.2.3428-r1.ebuild index 6a4b59f53ef1..376604185e2d 100644 --- a/app-editors/vim/vim-8.2.3428-r1.ebuild +++ b/app-editors/vim/vim-8.2.3428-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 @@ -318,8 +318,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3567.ebuild b/app-editors/vim/vim-8.2.3567.ebuild index 3ce917bf8851..2b7c3b0992cc 100644 --- a/app-editors/vim/vim-8.2.3567.ebuild +++ b/app-editors/vim/vim-8.2.3567.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 @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3582.ebuild b/app-editors/vim/vim-8.2.3582.ebuild index a17b74f24534..53e69aee9488 100644 --- a/app-editors/vim/vim-8.2.3582.ebuild +++ b/app-editors/vim/vim-8.2.3582.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 @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3669.ebuild b/app-editors/vim/vim-8.2.3669.ebuild index 3ce917bf8851..2b7c3b0992cc 100644 --- a/app-editors/vim/vim-8.2.3669.ebuild +++ b/app-editors/vim/vim-8.2.3669.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 @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3741.ebuild b/app-editors/vim/vim-8.2.3741.ebuild index 08b5ddc82130..53e69aee9488 100644 --- a/app-editors/vim/vim-8.2.3741.ebuild +++ b/app-editors/vim/vim-8.2.3741.ebuild @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.3950.ebuild b/app-editors/vim/vim-8.2.3950.ebuild index a15f1260d55d..2b7c3b0992cc 100644 --- a/app-editors/vim/vim-8.2.3950.ebuild +++ b/app-editors/vim/vim-8.2.3950.ebuild @@ -320,8 +320,10 @@ src_install() { # Fix an issue of missing defaults.vim when USE=minimal. if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi fi domenu runtime/vim.desktop diff --git a/app-editors/vim/vim-8.2.4285.ebuild b/app-editors/vim/vim-8.2.4285.ebuild new file mode 100644 index 000000000000..2b7c3b0992cc --- /dev/null +++ b/app-editors/vim/vim-8.2.4285.ebuild @@ -0,0 +1,357 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="8.2" +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +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) + ) + !minimal? ( ~app-editors/vim-core-${PV} ) + vim-pager? ( app-editors/vim-core[-minimal] ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + racket? ( dev-scheme/racket ) + ruby? ( ${RUBY_DEPS} ) + selinux? ( sys-libs/libselinux ) + sound? ( media-libs/libcanberra ) + tcl? ( dev-lang/tcl:0= ) + X? ( x11-libs/libXt ) +" +DEPEND="${RDEPEND}" +# configure runs the Lua interpreter +BDEPEND=" + sys-devel/autoconf + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir failed" + export HOME="${T}"/home + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches/ + fi + + # Fixup a script to use awk instead of nawk + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug #43885 (20 Mar 2004 agriffis) + sed -i -e \ + 's/ libc\.h / /' \ + "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # conditionally make the manpager.sh script + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + _EOF_ + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug #57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug #24447). The hvc + # things are for ppc64, see bug #86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + if use minimal; then + myconf=( + --with-features=tiny + --disable-nls + --disable-canberra + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable 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 + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # don't test USE=X here ... see bug #19115 + # but need to provide a way to link against X ... see bug #20093 + myconf+=( + --enable-gui=no + --disable-darwin + $(use_with X x) + ) + fi + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + # 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. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)' + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug #187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + # Fix an issue of missing defaults.vim when USE=minimal. + if use minimal ; then + if [[ ! -f "${vimfiles}/defaults.vim" ]]; then + insinto ${vimfiles} + doins runtime/defaults.vim + fi + fi + + domenu runtime/vim.desktop + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} diff --git a/app-editors/vim/vim-8.2.4328-r1.ebuild b/app-editors/vim/vim-8.2.4328-r1.ebuild new file mode 100644 index 000000000000..67b5a1185774 --- /dev/null +++ b/app-editors/vim/vim-8.2.4328-r1.ebuild @@ -0,0 +1,350 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Please bump with app-editors/vim-core and app-editors/gvim + +VIM_VERSION="8.2" +LUA_COMPAT=( lua5-1 luajit ) +PYTHON_COMPAT=( python3_{7..10} ) +PYTHON_REQ_USE="threads(+)" +USE_RUBY="ruby24 ruby25 ruby26 ruby27" + +inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/vim/vim.git" +else + SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="Vim, an improved vi-style text editor" +HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim" + +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} + !<app-editors/vim-core-8.2.4328-r1 + 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=" + sys-devel/autoconf + lua? ( ${LUA_DEPS} ) + nls? ( sys-devel/gettext ) +" + +pkg_setup() { + # people with broken alphabets run into trouble. bug #82186. + unset LANG LC_ALL + export LC_COLLATE="C" + + # Gnome sandbox silliness. bug #114475. + mkdir -p "${T}"/home || die "mkdir failed" + export HOME="${T}"/home + + use lua && lua-single_pkg_setup + use python && python-single-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != 9999* ]] ; then + # Gentoo patches to fix runtime issues, cross-compile errors, etc + eapply "${WORKDIR}"/patches/ + fi + + # Fixup a script to use awk instead of nawk + sed -i -e \ + '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \ + "${S}"/runtime/tools/mve.awk || die "mve.awk sed failed" + + # Read vimrc and gvimrc from /etc/vim + echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \ + >> "${S}"/src/feature.h || die "echo failed" + + # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. + # Hopefully this pattern won't break for a while at least. + # This fixes bug #29398 (27 Sep 2003 agriffis) + sed -i -e \ + 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ + "${S}"/runtime/doc/syntax.txt \ + "${S}"/runtime/doc/tagsrch.txt \ + "${S}"/runtime/doc/usr_29.txt \ + "${S}"/runtime/menu.vim \ + "${S}"/src/configure.ac || die 'sed failed' + + # Don't be fooled by /usr/include/libc.h. When found, vim thinks + # this is NeXT, but it's actually just a file in dev-libs/9libs + # This fixes bug #43885 (20 Mar 2004 agriffis) + sed -i -e \ + 's/ libc\.h / /' \ + "${S}"/src/configure.ac || die 'sed failed' + + # gcc on sparc32 has this, uhm, interesting problem with detecting EOF + # correctly. To avoid some really entertaining error messages about stuff + # which isn't even in the source file being invalid, we'll do some trickery + # to make the error never occur. bug 66162 (02 October 2004 ciaranm) + find "${S}" -name '*.c' | while read c; do + echo >> "$c" || die "echo failed" + done + + # conditionally make the manpager.sh script + if use vim-pager; then + cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed" + #!/bin/sh + sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\ + vim \\ + -c 'let no_plugin_maps = 1' \\ + -c 'set nolist nomod ft=man ts=8' \\ + -c 'let g:showmarks_enable=0' \\ + -c 'runtime! macros/less.vim' - + _EOF_ + fi + + # Try to avoid sandbox problems. Bug #114475. + if [[ -d "${S}"/src/po ]]; then + sed -i -e \ + '/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \ + "${S}"/src/po/Makefile || die "sed failed" + fi + + cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed" + + sed -i -e \ + "s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \ + "${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed' + + eapply_user +} + +src_configure() { + local myconf=() + + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug #57859 suggests that we want to do this for all archs + filter-flags -funroll-all-loops + + # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for + # everyone since previous flag filtering bugs have turned out to affect + # multiple archs... + replace-flags -O3 -O2 + + # Fix bug 18245: Prevent "make" from the following chain: + # (1) Notice configure.ac is newer than auto/configure + # (2) Rebuild auto/configure + # (3) Notice auto/configure is newer than auto/config.mk + # (4) Run ./configure (with wrong args) to remake auto/config.mk + sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed" + rm src/auto/configure || die "rm failed" + emake -j1 -C src autoconf + + # This should fix a sandbox violation (see bug #24447). The hvc + # things are for ppc64, see bug #86433. + for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do + if [[ -e "${file}" ]]; then + addwrite ${file} + fi + done + + if use minimal; then + myconf=( + --with-features=tiny + --disable-nls + --disable-canberra + --disable-acl + --enable-gui=no + --without-x + --disable-darwin + --disable-luainterp + --disable-perlinterp + --disable-pythoninterp + --disable-mzschemeinterp + --disable-rubyinterp + --disable-selinux + --disable-tclinterp + --disable-gpm + ) + else + use debug && append-flags "-DDEBUG" + + myconf=( + --with-features=huge + $(use_enable sound canberra) + $(use_enable acl) + $(use_enable 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 + myconf+=( + --enable-luainterp + $(use_with lua_single_target_luajit luajit) + --with-lua-prefix="${EPREFIX}/usr" + ) + fi + + # don't test USE=X here ... see bug #19115 + # but need to provide a way to link against X ... see bug #20093 + myconf+=( + --enable-gui=no + --disable-darwin + $(use_with X x) + ) + fi + + # let package manager strip binaries + export ac_cv_prog_STRIP="$(type -P true ) faking strip" + + # keep prefix env contained within the EPREFIX + use prefix && myconf+=( --without-local-dir ) + + econf \ + --with-modified-by=Gentoo-${PVR} \ + "${myconf[@]}" +} + +src_compile() { + # The following allows emake to be used + emake -j1 -C src auto/osdef.h objects + + emake +} + +src_test() { + einfo + einfo "Starting vim tests. Several error messages will be shown" + einfo "while the tests run. This is normal behaviour and does not" + einfo "indicate a fault." + einfo + ewarn "If the tests fail, your terminal may be left in a strange" + ewarn "state. Usually, running 'reset' will fix this." + einfo + + # Don't let vim talk to X + unset DISPLAY + + # 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. + export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\)' + + emake -j1 -C src/testdir nongui +} + +# Call eselect vi update with --if-unset +# to respect user's choice (bug #187449) +eselect_vi_update() { + einfo "Calling eselect vi update..." + eselect vi update --if-unset + eend $? +} + +src_install() { + local vimfiles=/usr/share/vim/vim${VIM_VERSION/.} + + # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are + # managed by eselect-vi + dobin src/vim + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi + dosym vim /usr/bin/rvim + dosym vim /usr/bin/rview + if use vim-pager ; then + dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager + dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager + insinto ${vimfiles}/macros + doins runtime/macros/manpager.sh + fperms a+x ${vimfiles}/macros/manpager.sh + fi + + domenu runtime/vim.desktop + + newbashcomp "${FILESDIR}"/${PN}-completion ${PN} + + # keep in sync with 'complete ... -F' list + bashcomp_alias vim ex vi view rvim rview vimdiff +} + +pkg_postinst() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} + +pkg_postrm() { + # Update documentation tags (from vim-doc.eclass) + update_vim_helptags + + # Call eselect vi update + eselect_vi_update + + # update desktop file mime cache + xdg_desktop_database_update +} diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 3ce917bf8851..5d9a0aae046a 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.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 @@ -45,7 +45,8 @@ RDEPEND=" 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} ) @@ -318,12 +319,6 @@ src_install() { fperms a+x ${vimfiles}/macros/manpager.sh fi - # Fix an issue of missing defaults.vim when USE=minimal. - if use minimal ; then - insinto ${vimfiles} - doins runtime/defaults.vim - fi - domenu runtime/vim.desktop newbashcomp "${FILESDIR}"/${PN}-completion ${PN} diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest index 86404f9acde3..04b538a5a238 100644 --- a/app-editors/vscode/Manifest +++ b/app-editors/vscode/Manifest @@ -2,16 +2,16 @@ AUX vscode-url-handler-wayland.desktop 351 BLAKE2B 8b1d295572865fb25beeb14d9762c AUX vscode-url-handler.desktop 291 BLAKE2B 364ce7de060a947d48486a639aed515f5b17e1720ac1eaee1aa4e13559047622e2897c0426aed792e3d8aed440771c6f5bb3e36873140401c951ec3b749cd661 SHA512 4607346645781f67daeb6cff2425924133537d620bf7dac9c2619cd5a1a29252e7ecf1a27f27e7bb917c413d462f129f9ae26f50ec8b531e5ac872bc8b96dd93 AUX vscode-wayland.desktop 580 BLAKE2B fb70f6b28e975368550735f2dab8be6ccab9510481c794e6b44545a690224bc93b51cbc6beb809886eee1cde3648eb284374c87c0b74a1fcc3bdf0af0e700a9f SHA512 615cacda3121b4a839816722382c23bfa2cb162e2a772ba91bded9e161a92763bb536778ea8f716e4c6c46f4f6c289a9c922347523d278ba3714569eb64c0234 AUX vscode.desktop 451 BLAKE2B 3c0cbe4a9bf71d47c3534bf6f7a265a04a0949b0bb86e060a0ecccb3b9f242ba9b46f1fc0dea37ff0d982ec88417da980b31b9658906a8f23c707e9b100183c6 SHA512 334b8c025c4a99e0f1390c56dd89e529c23b0ea3f6ec5a83105eb6acc4ff62b4d25419353d7bf4bb69dec611bd98778e7b8c728d2392827aa97690b5b91c7fb8 -DIST vscode-1.61.2-amd64.tar.gz 112814371 BLAKE2B c297d27f12dbbf5bb752076881ae28100d1b051d14528425f8227c5c70ce779ab8db93b960bd4d4ff9788fa2e63167c4253324ba4413b0975d41608c541c6303 SHA512 52c3b89612f2d2f72ea9de9449d191130a23a3dbae1f2876e1716773abe9b6c7064a8eb6053d6bc94438b6e3753df2f00ccc4452b2404fcb2c052ea6090d83cc -DIST vscode-1.61.2-arm.tar.gz 94477034 BLAKE2B cecb63ed58a36fbbef13cf7de086f0f7f77efea03fc605801b3064c273736ea999b91ef84e0c900ca415955cd7a508d20c33e92a5acab0dcca388d9624743902 SHA512 9cfd10c4cc6d2e3eaa1323afc1b493448632f57681b1e7d595d7f52a7e7d4c4a2ce48d2e6b21b2380fb7be8d98d33d5848a91af178eed974f952bcd7cfbbcb3d -DIST vscode-1.61.2-arm64.tar.gz 108043274 BLAKE2B f512c85102b3e3858a5ba8f2a63ec9fc7fdee77ffbe768287cd72e89103880002fd2ca77bc72f0210f2f4c0e4cec2b7708404e7db874d7c87d97b17361a26d4e SHA512 dcac0d56bde8b1fd855d386da77e164354f8c819e994d395cfd6b9cf50d5ac96421745c6efc20ec89448e6020b61b0d4ed482e74ecb39422a6acf3662f905dfa -DIST vscode-1.62.3-amd64.tar.gz 113702793 BLAKE2B 0d5b79c0379bfc39f8ab356d6ae760d2b3bb32c41b308e5f78d824a8198201f1ea1c61034e2207bd674d00b1d5b52e75dbab07d2d7053adb17e9b64a4a47fd0c SHA512 5d69e7fda01c381b3a068a73f5506aee78f299b2a9a48fce46100d5f6d1f4558c4c0abbe17c8507e85711409052fdf9d590b12c0534e6e5cfe002f766df69c50 -DIST vscode-1.62.3-arm.tar.gz 94730175 BLAKE2B 176d2f39b1b8bc945b7fb03e4db834846a35afafe024a774326b15a1e083c06d08e4a7ac8c38233299869f7c02eed16e89335012202acb888cb0034042ec12ca SHA512 130471b46794e1fd202fb83b891577e1f6bd29b72637e4efb5822e33a5578a848b236fc6c8a4652841e7b28f29cc9ffca718a3ddfda3d78cceef9b04087861a5 -DIST vscode-1.62.3-arm64.tar.gz 108316120 BLAKE2B def07c01b4371b6e3ea1c47a45eb5763922fee650b83c3c9d9527d1323c602494b0e200543cbf527dbddb040ff786d88df5fac3d678d200d2a8768c7c3e0d135 SHA512 f1c91bdcef8f249bd4c81ec36ed5e0222eb1e6848206e33c3c7533a9805d594c8d64515317646f78a4d4b7cd7d89f05d499c5c82789c9b8ac3fbdb4451519ecd DIST vscode-1.63.2-amd64.tar.gz 113730849 BLAKE2B 8be0b450356db61d072be9ee7c932b32b70493617f56ebc82948264f78a3a32363f6c183d26aa4f4d06b4475a6b95d69441a0fca64185fcfaa01d19c05b252bc SHA512 c7f2b80d2fd7a4b420d248d6b9e325f77b460dce3e1d1748b63c18dd6983243601d967f65ffc72c79c0d7615c9e228fcfffa86d456a4ee27d3d027dec644eceb DIST vscode-1.63.2-arm.tar.gz 94756805 BLAKE2B 75502ca42e3720f79fa8da3a33843655d8db6c9ef12403cd9be119e93e4ce07b8b70f9b7d5dfeea53eb3d7b3fecb3e1b4e282cfaad2e4830e3b1ea396a20b2dc SHA512 3fb9673a481642d5c2317bdaa7e45efb9d26152e52a4bedd26a7a17fcfbbe5c4f772d8a6680c2c39dafc6a15a1510910e846cc8f67ee0dff6d590fb7d58c77f7 DIST vscode-1.63.2-arm64.tar.gz 108337529 BLAKE2B 8234fa92b1eac1b3a7c3297c50f730b73a2a4b0795868d91adc8898fff61e9f44780dbd94edf8c3ec6c9f3ec33b085e6855f6104ad9b927867d96412ec5bc038 SHA512 b474d54c75e62418e19f980e2a658ad82ffcba5927418f88123a7c12e6a19525c67260461764de56655fe1d964415b6de209628cdc264da41b2c2c9576815d03 -EBUILD vscode-1.61.2.ebuild 3037 BLAKE2B 5f538f6e379ee8092b77f0c9384b3dceac812c5cda15e43d52490bd5ce1a4251502d3f8690292e4d146d3fc6f14721bf14c404555ba9f655e6cb21c6a05394d2 SHA512 f5732bd74dfea9254c64ae1e6f1b991540302953b6e5bc6d72159d9341ad94645ed899bc6b54482cae49d12e82bf76475caa6196ffcdd8103bcdd375bf1c54ba -EBUILD vscode-1.62.3.ebuild 3037 BLAKE2B 5f538f6e379ee8092b77f0c9384b3dceac812c5cda15e43d52490bd5ce1a4251502d3f8690292e4d146d3fc6f14721bf14c404555ba9f655e6cb21c6a05394d2 SHA512 f5732bd74dfea9254c64ae1e6f1b991540302953b6e5bc6d72159d9341ad94645ed899bc6b54482cae49d12e82bf76475caa6196ffcdd8103bcdd375bf1c54ba +DIST vscode-1.64.2-amd64.tar.gz 112392185 BLAKE2B cc59dfc54167cc49b607d0131d81cdc922c120f06d40820cd13818bd280f40e55dc3ee5ec94284c48f91ac09904b1be1b3caa6c7380835745eafba3a860e36d8 SHA512 def09100c9b4a8ea772925fd89b9f26ea88835b27ddea203235bdfa13e28b1ed43ce0fccc8c799bd2b767998f7b9190856aae663c9a2e7e3226e43fb3b1bc8a7 +DIST vscode-1.64.2-arm.tar.gz 93473664 BLAKE2B c0f9df18d1750182385f7c2fa2fed2be93480406a5516597984d3f0ff488ad6cf98dcfab56f94b2a73badda2a5c1546a6ea7af6d245e15cc2e5ce3b522081866 SHA512 7f89a4f12951ced50d84a852aa8eecb52aba25d3aa549b656e35bec1a04f9f89eb5cdde1d5c04bfb072c469cfba8ea948a13470773b969d731d085d7812fdf91 +DIST vscode-1.64.2-arm64.tar.gz 107090187 BLAKE2B 15587ce30f15c393f78d5ea554da51557bb5d3392655c82476100451881d5dae3bb034e05d5e5e26aed2236b9199edd927a3af064a00d0ec82a7b24a6c501c6d SHA512 54f16d98c43f940d8cf989f2db90c161cdf84733788eca55fb0413279d291a4b2bb82a3f5fa7d0b01d5d265f32c3b5273fc131f4bd6a33b841f3bb1773d9f6c7 +DIST vscode-1.65.2-amd64.tar.gz 109564124 BLAKE2B 5b842253ed6438019de5f114f951651adc1773db93b408d3fec59b781ff32c0fb66f0e80ff0c02b6306ae46f541d55667f37d50ccf64709e810bf5e952af543e SHA512 1b5fd6c42966e66f963cb63a289414d3733cb64c051c36ad5a43481ccbd24996e99b58738b23be25a51890eb95593b7a2f224d61c3a21ea3195baed4f57cc761 +DIST vscode-1.65.2-arm.tar.gz 90793512 BLAKE2B 8e29cd51635408280a9f3e36cc7d8a0925feee6a2239352b9a44075454ae36d7b784be2ecf9eb310440e416511a0d38b801ae41bfae400edd06345f960d66b29 SHA512 9c10a9a6ed82d321228b41202ab1584d580596bea9aa9759db6500e41f1979d1e9e1fa3e3af4fd86bdbbd0844ec528a499dbeb2eee988bb87b549073f0d112de +DIST vscode-1.65.2-arm64.tar.gz 104431396 BLAKE2B 17251a994ba15b9293b4bebbc8b34b8351bf5d15ea047d8789492839ab902d9802afcd94c6a805f26be505c9f05077c395c6a5c73a8f3614668c042400e3f4b0 SHA512 7365d8bec81bbd8bf72d6073cfd9034b8afca7309044863a921b190aadbb8fe16d5b58f98beab7d24d77c1077c60a1761a68a12e01ea974855608006973ec739 EBUILD vscode-1.63.2.ebuild 3037 BLAKE2B 20cbcbd66b851538ded81989f63dc4e4a233d68dd2ad9381aedd92a13d894ebe90748952bc37867b8a60ff44c6a77ff1b3075140c823c6c6f47377e27b654579 SHA512 29e31a6f95beb7974b0751b74a6b06932283742ac771bcd36efa8da4bbf49167b7b6dffacac5b82bf3e3687ab34f0f59272c05a4d9343da6aa1ff2751892cdd6 +EBUILD vscode-1.64.2.ebuild 3038 BLAKE2B fc4a05b861e3f704872c17a476c6d2d3012717a9b4e677c3dad731b360bebbfddb836a4ea4953e3bcd98bf8b58a3935c13aba38b395a4308f3597f211c30618a SHA512 04829aa5fa4dd456fcb5a69f71f7a214f6645d83cd04152b94a466eb8b3d0b5db45f8fbc2ed18c4abf43b3fe2405c7bd521d46c0a72a0e1d42ee70989176ac5d +EBUILD vscode-1.65.2.ebuild 3371 BLAKE2B 965d066b8ca1ebfd4001edd4af59756db9c796a4cd9b16a40c8dc0793efa8caaf4c18e156c1d4123a1e2f2a2dfc2fea0fba8773e42bae09f480fbc8c33311128 SHA512 6eb57628ac4c04b0f4d7750817227e6d8105f19f3f0cb1c9c483534cf6a7bc24c97de529d32c9a528a91837eaa3a838b13aa75d03dfa09ca2d8f1e2b28dfa53b MISC metadata.xml 947 BLAKE2B d2c522407289299e1398799f6187e1c0d6621dfe29c1dd0e9d88281eafe44f4b4b3a0edad920268d220375f9330f0a62c015fb1e5085decf5ca5e485a92cc204 SHA512 6b27ac42f3d67203c46996388f6700c007a299557808505179cfa42deeb71098bf3a257f23c11835389fd7a59180f3536e420ed6cdb93b274d47e4c84a25f738 diff --git a/app-editors/vscode/vscode-1.62.3.ebuild b/app-editors/vscode/vscode-1.64.2.ebuild index dbed711c205a..55a4d92b3c0b 100644 --- a/app-editors/vscode/vscode-1.62.3.ebuild +++ b/app-editors/vscode/vscode-1.64.2.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 pax-utils xdg @@ -104,7 +104,7 @@ src_install() { 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 + 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" diff --git a/app-editors/vscode/vscode-1.61.2.ebuild b/app-editors/vscode/vscode-1.65.2.ebuild index dbed711c205a..35897d4b8b0c 100644 --- a/app-editors/vscode/vscode-1.61.2.ebuild +++ b/app-editors/vscode/vscode-1.65.2.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 pax-utils xdg @@ -104,7 +104,7 @@ src_install() { 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 + 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" @@ -118,4 +118,12 @@ 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" + + if has_version -r ">=gui-libs/wlroots-0.15"; then + elog + elog "The wayland backend of vscode crashes with >=gui-libs/wlroots-0.15" + elog "This will be fixed upstream in a later release" + elog "Please run the xwayland version for now, on wlroots based DEs." + elog "For more information, see https://bugs.gentoo.org/834082" + fi } diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest index f7e5a49c423c..2903c58a732c 100644 --- a/app-editors/vscodium/Manifest +++ b/app-editors/vscodium/Manifest @@ -2,16 +2,16 @@ AUX vscodium-url-handler-wayland.desktop 383 BLAKE2B c3e281318290826ce9451fe517b AUX vscodium-url-handler.desktop 315 BLAKE2B b514551e6256cb444f13bfda86a9e164ed926d8aedbfcb7de3a6b1c3d3c2e465c0ee158c74626814908a153c5f801434952865a708c89ffdf64bce24a83fcc20 SHA512 afcf89af009361b409330a223696013e1ee8973bc3b3068e778fb05c3355fed66063bd537a66685d6ad3578c2808532d4b9c5273a291c7d2f3a9c0b2f997f152 AUX vscodium-wayland.desktop 609 BLAKE2B 1b25dc9e98b5a12a10f85001b9c5acc9325368a2310a7d1e2aad20e22ae07fb000aa495b694612032e999f431c8f8e47f60eb162d0c7487fcfef6e37249622d4 SHA512 1d371978a5780c8d37e6e1359ca029659055a8d80de0d672d6eb3f21b890db2b92e368fd244be7cf83ec30935271cb269f1b9aef1c7deaaae36c3d739221d8f2 AUX vscodium.desktop 481 BLAKE2B 89f335edd1f7d0256f95eb96d335c2359d8fd984a29bdc3190218ea63ba9a19e64435eb50c7be818cf28243c8cdf9b385f8987f6917e52df565a4ca555a2a13b SHA512 234f79a5ea9b901b62fe0c094554de3b339a67e8f47ec4b3daa5c0653778b9f51d1ccd91e773b4ca27f27e30a5847d5a3172d0ed322ada4d47624028bd5d8c1b -DIST vscodium-1.61.2-amd64.tar.gz 114016604 BLAKE2B b9006b0a58adc08df31bbae08a46c233cd69ee80f89493e4564f8f3dbe595481582cb605ff472984f013e364bdafbdd2f587ea3d0065d8ca775eb723f0cd4cb0 SHA512 4a1016bc8e9fea5c76a0c87180ad641f4ec981dbde0b395267580d5207cf181a090d87e984a96c40f46298cbf8185c1afe4af6a8791bc47126f50f1ba95edacc -DIST vscodium-1.61.2-arm.tar.gz 97521784 BLAKE2B c81f5b607905d3be0aa27ee63a49c0ba2225724686d1afc25f7c15289c69fd10022d1ae83390183bd50c1db9c0b74e3c9144e622e81f2895eb891d6800d1bfd2 SHA512 f4f329155282e951273580247e3262b887164f2bedf409700f3a8326e9dd2e20ab95ab4b5fe8dbf2a177487e518c9fe98078a485c08b020b4d73cc7cb9a90431 -DIST vscodium-1.61.2-arm64.tar.gz 112085871 BLAKE2B 47c58659d6e4e9a468b014c9d0a8f6ca9739d722a21ec0b3add0a69849b18022dafdcadc759070e054492d6cf2db1bf07e11454fee5623647a54e367f5d94325 SHA512 cf893f6e04a0e657fb889b40069e042ad1b2a287a349c3f05e441ada00504f9ec693f20dfe17a01f6a7d2d298dbecfe94d62f12b8b26769e373f61ae9ffda8f7 -DIST vscodium-1.62.3-amd64.tar.gz 114303440 BLAKE2B d2c1c1a3a1a2dfe211db339adae44fd81c20747812a204d8c4d805ebe7ab3267d2041dc50c40b5e548a5ae003d830e841549ae71c688c107e57689fd7f773519 SHA512 f672dd4296a1ed9f0505e93ee5735663effc0fb51746d3ff70e90894fc0806ab2eec13e191190a9bf2c19464aa420f6c9d8d664e685df145b18faebb8870d2b2 -DIST vscodium-1.62.3-arm.tar.gz 97823307 BLAKE2B bcbf8c696eb959962cd66e1d02222585e945b4eff2ed4fccf781bd0d3da23810dfe9e30f68be7baacd7f495c3ef8d1f43ee58aee7cb4f8817228c14b01423e7a SHA512 8d69e0046b0b9a1c268bdeeda051ef2ef5e09106eadeb96735cd7c09af069ef4652b06dab2b549817f539607f286a79a679ec46cd1cdd28e778cee3b85b7e89c -DIST vscodium-1.62.3-arm64.tar.gz 112387259 BLAKE2B cc063392c4531269c0fbcbbda2896d23d2a781f8d56c9462885b1cbc5f81005bd22d94616853c29298105f46a517cb76520e2677d6599ca948c0018b32c1e2aa SHA512 e1a9183377a1e16ddbb7a14e70fa5b97b27a31fa52da6f142bf2e37af2a316d1e08d05270d7e77b672cda97bacdacf893264718e46f231eefeb367c16c8f5b3f DIST vscodium-1.63.2-amd64.tar.gz 114325091 BLAKE2B 2d05da02b67c52ec151611ef159f6c1f26f920c990e770630fbf59614f2f7982b3157855abc802b876ed49f513dc87ea387c39078c78375a59fdee0c276786be SHA512 13d309ac1427db6e924d667eb4f66c690f2bf26ae1dc307c22d76aceef5e1a997d57dd0f6458b40b7e0c88babe7bd3fe85b0efc2849aa672e8dc006cb09bc337 DIST vscodium-1.63.2-arm.tar.gz 97849895 BLAKE2B eae617edfe6bddeb4b4795c668006ffa299dca2cb22d92d1611a51e599993ad0435dd975faa408e169bec4fe0fc87c19702850de6dee2bee9c5339211e2afa7a SHA512 8f24876638f6b784fe08e53682e076c3fdfeee73971ab2f9657de5827d8bff86bea83c48e5d5e571e1a08fd184bc8b4937e90b51eb9679799f5c76868d43704e DIST vscodium-1.63.2-arm64.tar.gz 112417892 BLAKE2B 08c44c7dfa75c11f548e1b29b621352a6054f8caed33d8456fcfe722b41283a4986167ff507055f284cb3202508754752412af005fcd8bd4fc405a7d124664f1 SHA512 cbf44d86ced1b48e1d5d17b8c77713e8c9a2bfc6cf8a4029b12ee382c42fc8ebd9cd2d79daf4042de23c96f47e08241c1b93e1f9eba0a0a962d8212c3b84ebe6 -EBUILD vscodium-1.61.2.ebuild 2900 BLAKE2B 21acec4fc5e5e888996c6eb17d296454d133142127de85e365bca9817c008b32a5390c704695ad2d886fa701f5671a87c14fe401ab63dfac151c05acd42cabf6 SHA512 9c24c1dd25e1505aa6a47ec6f0a28d9ac20f49b80c76399175fdecf9074ce5075da11f7f171dd38d3f87d82723d1fd525e07f9b027a2e7ad5221d0820610d09f -EBUILD vscodium-1.62.3.ebuild 2900 BLAKE2B 21acec4fc5e5e888996c6eb17d296454d133142127de85e365bca9817c008b32a5390c704695ad2d886fa701f5671a87c14fe401ab63dfac151c05acd42cabf6 SHA512 9c24c1dd25e1505aa6a47ec6f0a28d9ac20f49b80c76399175fdecf9074ce5075da11f7f171dd38d3f87d82723d1fd525e07f9b027a2e7ad5221d0820610d09f +DIST vscodium-1.64.2-amd64.tar.gz 113590369 BLAKE2B 0e222e126d099e4af446c1c229f1ef7967b6836b6f4e85a440adc768b3bd7662a710e23d4f3da61ed9a45adf328805876fe20012e94f97a9fd92cbc89704f425 SHA512 45c7a22c499abbdae8305e241533f99ecc48d504c73ba1a43a669ba8aafad8aac60e1383e45882ff4dff7a97b232c172e0b3d89def00e85fc1d37e209d80f162 +DIST vscodium-1.64.2-arm.tar.gz 96564908 BLAKE2B 5e8b974e179639231cfba996ff9a4d0203e597f1be0b58766f9f532516e4a8d0eca390a90f2366f5db66a8d12b64f72f301490f07d01ec6b5c66516ad26695f5 SHA512 b2e986ca7ebc021bd147a0c9fb3cd46833f5b65e01ec07bf26d577cca35a6998666409ab7c0bad5351de3c5d7e5e9c91d029d6b05e149261397d183ac06d57ea +DIST vscodium-1.64.2-arm64.tar.gz 111168123 BLAKE2B 015163f9129e95cce5cb4df255cfa4bd69271362ba3782ed234e982ec849490cc4e15f8e8ed1dd1d942fb908026d93010f21a902b3c10b036e2a926d82893dc9 SHA512 7507080e2ac7bd4649fd87a52480900de229fe3c93df26d381ca34b472ddaa38852b5b8d14f06d4c9ee07d8f2fb3381b63c9c25b7e384d0da090e10a31f77df1 +DIST vscodium-1.65.2-amd64.tar.gz 110791055 BLAKE2B c6685f78c786dd36ddb79adce5485670016dc5bf8e72550a0d6f39425237dbdf75c36612e053f74db0c7e92cbc7f21dcd641a1573e03741eed8ae7573d7e6608 SHA512 5a79be254d8fd21e22ca1b557bf11138948793518e761f20cfcc9a8a142e5ae14845989e4a2341f4594a03df0ab9b03e4df971123136c636e1b56bb310397f2c +DIST vscodium-1.65.2-arm.tar.gz 93766888 BLAKE2B 23f1b4a5839b4d8ce35779ae7cd033cfa5ced68272fcb9783307d000ee58dd145d68e8f84e963a1a0dc33ccca81b47119f95cbe49ee788eac5921c9b6ad9071e SHA512 bfc20b5d3de19afb02c11c6dce5b06dec9d843ed7989e400a2d0d2a7f98289db2ae5e7c6262fd31b353eee4efb4f6455aeedffa44e0e7162be03d688ef42c0cb +DIST vscodium-1.65.2-arm64.tar.gz 108364942 BLAKE2B 05fe48a28f9d97487190725e52ef719db7487e27ec537be185bcb8e4ab56137047261b1221b3cf3909ab07fd95e50135a29a57c802e51c35511718c1822fd49a SHA512 42a2bde4685aecff7b15e8315ef5edf05150e9f1228cd55a62693dc5a03ed5154e01353367c29357d652c82c561477b9d6bad34c0aacf7638b3e4597c31312cc EBUILD vscodium-1.63.2.ebuild 2900 BLAKE2B 2674e6374578edec493eca8c5d3547ad89d54e0c1f42d6dfbedcb33b4875a69fd4d8e7929e9091d1208432fb119927f154cc6f769bd086b968d729f3a04dbed2 SHA512 742fa5b2d8d48af98435e30249d2368f344c754c1c5fbabc0ed41a7307df223f67e60fa62058d81593534bc52594ecf29b5bbf4ecc45a5cb93833d5e94db38e5 +EBUILD vscodium-1.64.2.ebuild 2901 BLAKE2B 13b3ac36b9b9718201e74637cb1ff6be3cebdd358106e129e4cf2bfd97f59f3c5a88011305b3de65d4dd8a037dde51491bf4d128007cb2cf0b9625b47032e6c1 SHA512 ba4029c8d718905c2ec6ca88cf1e5e39ffc0292688775898fc736b6e84ca957d89895b6195bc1d89a63f40bbc3fd132a53c8ae880c044abc822e2cc80daf7324 +EBUILD vscodium-1.65.2.ebuild 3236 BLAKE2B 3cb64418ae40ca572e8d00b29a83d2c51754648de49f4fba7939994675776e6510f536829689447cfc5d06e85718bfe686e83e57b6caebde16d62d702cc15bcb SHA512 823c050bb727ab3451af94acb155e408242ef1d4535d66470fde7d4b80f184bc3403671f00df49899b666404ac5ce42c6c80f1b8910f1d7edf2601e3b82f20ab MISC metadata.xml 1191 BLAKE2B ac8f365247fc710ade8a690da2a409352c20a886ad96b529ab0fc3f200dda28c2c7ca62fa78a922689373fa483e0a789836b887c8fccf2729ca6aa4c0e06aefe SHA512 e5b56663a757cdfff13ddc25c5d4f118f22d194fb051ae0bbe3264a4721c196a8820db1bfbd5a992827d8c97a81edfc30a97ca9610961ee46684a253d186449c diff --git a/app-editors/vscodium/vscodium-1.61.2.ebuild b/app-editors/vscodium/vscodium-1.64.2.ebuild index 1f66143c0bf3..bcd5b8fdae5d 100644 --- a/app-editors/vscodium/vscodium-1.61.2.ebuild +++ b/app-editors/vscodium/vscodium-1.64.2.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 pax-utils xdg @@ -96,7 +96,7 @@ src_install() { 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 + 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" diff --git a/app-editors/vscodium/vscodium-1.62.3.ebuild b/app-editors/vscodium/vscodium-1.65.2.ebuild index 1f66143c0bf3..906a2b847f99 100644 --- a/app-editors/vscodium/vscodium-1.62.3.ebuild +++ b/app-editors/vscodium/vscodium-1.65.2.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 pax-utils xdg @@ -96,7 +96,7 @@ src_install() { 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 + 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" @@ -110,4 +110,12 @@ 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" + + if has_version -r ">=gui-libs/wlroots-0.15"; then + elog + elog "The wayland backend of vscodium crashes with >=gui-libs/wlroots-0.15" + elog "This will be fixed upstream in a later release" + elog "Please run the xwayland version for now, on wlroots based DEs." + elog "For more information, see https://bugs.gentoo.org/834082" + fi } diff --git a/app-editors/wily/Manifest b/app-editors/wily/Manifest index 82294d6a2c73..5c05d8d69676 100644 --- a/app-editors/wily/Manifest +++ b/app-editors/wily/Manifest @@ -1,3 +1,3 @@ DIST wily-9libs.tar.gz 125247 BLAKE2B 94f93d081c90f6543bb26d17f8fe053135be2df983a2280fdd15243c5e448f5f3265666692e0635156217b0e759e0d6f3bbc123cb857f1d7880ee3ee4f913a37 SHA512 3c06ef1d9c6e77a00037570f8b8bdbcdfc7648f691675db679ba83ac0ce092762a4020b0483acd325aa57810e9a386800a94c5e6e2b5002a963b4751a4d30a5b -EBUILD wily-1.0-r2.ebuild 726 BLAKE2B 73a8184fc9095bf9a75c1ed75777b82bb179cb5b766054ae5d019c8596925be7f825b73b7f2eea78e233a23e1f936b62f20a05f974a92d18e59036ad722b3299 SHA512 bc63242c481eb93d79b0ac9c19349cc4ad16646b964da55f349438f65054479377a3600f5b084ca6b151ec6736eb164d5f581ac4abb76b1f93eaaf5df9e1e0bb +EBUILD wily-1.0-r2.ebuild 717 BLAKE2B 367116115efc8030793919d04f4ff1aba70c8323484ef2b36ba3d4054fbf90ad274c8389a8ea48365a623d26a9b4f22f2d4d5f4fe8e71467c2fc116d2a7fa1d2 SHA512 585aa02b6b543a4105b4a0cd2ff3efd75ef4a2014efc256ddb0ddb463d132d0d7d995db68a6e9f110ebaac56085d2b542b78d4fd8717da996f1eeea9d728169b MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a diff --git a/app-editors/wily/wily-1.0-r2.ebuild b/app-editors/wily/wily-1.0-r2.ebuild index 6ab975827e2e..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-2021 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}" diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest index 25698e6f4523..94ba98750fe3 100644 --- a/app-editors/xemacs/Manifest +++ b/app-editors/xemacs/Manifest @@ -16,8 +16,8 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4 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 -EBUILD xemacs-21.4.24-r3.ebuild 7093 BLAKE2B b110be14467c17919c72baeff5339dcc1d135f883047cf699e781b4302a0b37a6f6dfa0175de4a66e64fc0d457531ad85a20d83ca8e01d6660dcb0a5a83565ba SHA512 5f01488f2bc7155de34d0c8e7fde30f51584abbe45ad3f2d482b442df26305f8765c0940255e607bc09f9b914facaeb554e0d969bb72e2891fae944cb08c5f9c -EBUILD xemacs-21.4.24-r4.ebuild 7118 BLAKE2B 0b82604086f34a69a4a2b4105fd5cd4e9188ec5bf3dd3c8bac172cd755a4f254cc2b4fc39943f93ef1bee9600a12602b2bfa263baf497e0cc23557ea1125fe49 SHA512 917839337bc931d242c403c3a43c6e9e976f3b747bbb4d98b784064abbd66abe606dbb3c38c06e1d3294784a93fa71ccd804c088ad5ef94f5b6f2e582272fd96 +EBUILD xemacs-21.4.24-r3.ebuild 7095 BLAKE2B 0621c6ebb2fdff80e33642638c76af9e0df48bfa53614d61e37e8b3ff3e24c4d0ad199d3c577f4e6f456a69bdb7a99c6c9dfb69a4d344bacbd5b41a006a46892 SHA512 ed40badb583205ca5e82e0c8bac5b643f8645d47f810ba6232ca00b49c62fdfdc341b34561ed9ad3a6567e18b8f4ced2a4e1bf79fc01eba7a196a9a22e3d3ee5 +EBUILD xemacs-21.4.24-r4.ebuild 7120 BLAKE2B cc4c006ecbfb5c61564aad4bb2eb94db33f1eda9269c06110dc29d9143ce9e6caac814c559e5fc68172589fbe54e44e90e1178657a5868497003c397d346d97c SHA512 5d9e915364e74f3151d09aef9805e3855e72fb16358295140203f58b2243b496d1f3944aebad4d07ce4f027663c42c7212a30b1249596264ec6ccdb38a125bce EBUILD xemacs-21.5.34-r6.ebuild 7320 BLAKE2B 7899c64b324d0ee03e39c4bc0e99ff376716fb9dd26a229a902392a8cbe7864c2a2069bb1d852e1bf551d7fde1e0d5dcecb62e1fea667bfc644ea4f77b6e996b SHA512 83fba83ef8fa82697a181f9c8934132e03e9452bb891112a91ddc0f720a9649942c9c2c7ea1c0151c48de8d342d85f83039f69faf685973d0112acb1cc224173 EBUILD xemacs-21.5.34-r7.ebuild 7214 BLAKE2B 56ad56cfc2e4de8e0921093ae9bcf99071fca3eed7c39bce28124175b93aa7d37cc8fbcd589bf0752aa274a9c38f0e7f20f3fc39cb5e1f8d5f25baa2a765c9dd SHA512 32dea813c9ba64e33a3e04d2864e7363a520adfc9e33de509607fdec57512fef3d5980f772d4a1693f3260218ef4de5c88df30f38082409a29425e5b0ee458c4 EBUILD xemacs-21.5.9999.ebuild 7205 BLAKE2B fb003fd2ebb04236e2ca17c1a6ac7b6a99bd91ece52a54f87f6bc89e16934fc7f8ea20dfc9b3fdbf875e604490e12158a7d542b2d2d18d16d4a8d1963e7b88ff SHA512 0b69df0d74dd3e98f29ed72b40be881dec8be02cf1504f64e735d520e5e2939e46e1c23f297eaff07b80661e5cf6ea585ae7a1d96ca2ec054b284983b0a211b3 diff --git a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild b/app-editors/xemacs/xemacs-21.4.24-r3.ebuild index 9b7467a98c25..a0b28559a0a5 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r3.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-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 # Note: xemacs currently does not work with position independent code @@ -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.4.24-r4.ebuild b/app-editors/xemacs/xemacs-21.4.24-r4.ebuild index 53953b0528d1..ad783065d393 100644 --- a/app-editors/xemacs/xemacs-21.4.24-r4.ebuild +++ b/app-editors/xemacs/xemacs-21.4.24-r4.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 @@ -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/zile/Manifest b/app-editors/zile/Manifest index 0dcbb821c551..943bf5bce912 100644 --- a/app-editors/zile/Manifest +++ b/app-editors/zile/Manifest @@ -1,7 +1,5 @@ -AUX zile-2.3.24-gets.patch 904 BLAKE2B 7d5bca1774f2a507281b17213289bbc15a75e112b7e380cdb99ae20082209fbcb05e7c837553900f507fcba6faa7cf691dd66e2f7e32b7d987dc238a80259cc6 SHA512 5ab3ba3d31288c4cb2071796144e68d85c6bf29f215714980685dce75eeac199ea32bfea2c83619e997c2c90891a254179dd6e8763651e703f4a662b7871bab2 -AUX zile-2.3.24-userhome.patch 980 BLAKE2B c72dd7bd03325b93d9ef46cd76ad6bf463821fe611396743a64e161c3268086e252651b3fc05745fcd00ce614a94c776d7305251ea971adeb80e799d7edbfca1 SHA512 b1d0e4453771d36efe6547d9c30c807af0a05866bd728a94d30f25b8e9248d880a02143c5d1d9b47fa7a5cab9174804feeb3cc0f2956474c948349581d7a25e7 -DIST zile-2.3.24.tar.gz 953962 BLAKE2B 242f0f9532a536d5ba36664031cf86eba753239c0f6dcd47c086496628a730bdd0a9112dc1ffd26965068f6d66d35d3ad3c92fc2753e129adf9a5923321e2cdf SHA512 8361f42436ae9ca150f09d830096b7a3fb0089d58bffe5ad7538b5ec5cd4e0e50085213e938db1a95e2922db845d1d2f36841a65fe1b9b72f60cd930dd8f09b9 DIST zile-2.4.15.tar.gz 1490611 BLAKE2B 3744ab2459edf9b0dc9ca976c5f37625d06e0766e3a1fbb59112fe375af6f6cc5e8c068dcb127b338091f3130d32190ad4bc3a79eac7f9a4f87b46723d5a4a82 SHA512 e2a04c280ae0c0038e6ef18abec0be55063a472f77a511bf31459712be24659edcaa2d1c861d7c00bdab87a1881af03d14eb561047c386cbff5f90b13b1a2575 -EBUILD zile-2.3.24-r2.ebuild 1368 BLAKE2B 308ea08faf165d84b31d2930ecc0fa61bbb087dd009acdc0941743d2738bbd94633672f067854a40d1a207db58af3ca0aca8e704675543bb5185ff7548c47405 SHA512 f721e9f61105809c3eb463f9f0d6e42d3151f32ca98d8e5b26ef46151186bb513036b8be5cda37b3deea48b9713e4b8d9652c5564ef17b5acdefab813a753960 +DIST zile-2.6.2.tar.gz 1152751 BLAKE2B db51b534c8d76e1def91bbfe49cab501ff1bccd6fbeddd5622d8fca3695305c53e480eed1978e880621e09955e2b98519cfa02cf259006a08d1a8722122148ea SHA512 16d5cece403fc215d53b35c31fe6f743d53d7a01cdc7d101cabe6760173539c9c31e092b29c374f28a723708027f6de626fcfee302962848091f85078fa81761 EBUILD zile-2.4.15.ebuild 1093 BLAKE2B 5f94a7c04aeaa447571d806bcf4029d3c6cbdda2d31dcfdbcea2810800c1aa2a7e3b097df3edf923e6e30b223ce450154f2e4923ee501ee7e4b663099b5c072c SHA512 ea016a21bf45f2e2cbfcc09fb23ff25b39d63f8e96b01dcf45f3636c11f24be6cb3130d0b429a6bec4d956e893985228b3757440a1eed5bb5d9c3746962bfd3d -MISC metadata.xml 639 BLAKE2B 21089f59c450a6758090d4e7f1d9ec35834ec6e8883751c1043ae4b4267c0d7367435b774826152ce4d91d6762c17ad6c6f932cb78914a3b14b21a6496e6376d SHA512 6d06d8fde6d21edc99b065886194d252461680b23f367031d1b55fe52292f01ec5032f35c28f420c37b1c6225965f4b00d08cb5300837832727a5b802b9f8fc5 +EBUILD zile-2.6.2-r1.ebuild 1176 BLAKE2B 8223428bc7394d28e4eaa0bbfc95eb68a2dcbe1f0cf1f76ea2ae3380c5c702eff9257fa32983e63ca0371916bf970753a9a2751bc7de6510db2203a6f6b8b0be SHA512 b7e0d7e9fc225e04ec40aa4c9ef19d89019df4affe1c4d6eb758c4b943b05341e7ed6100ac5dcf2b7aa96050aa45fda202da26432522d1d488c9afb9c456bb91 +MISC metadata.xml 537 BLAKE2B 3a084218fac3dad29b7a80d6f707e7e8c769eb0e755a1a482814d67b0064c274fc80a50dac09cc6d04e963271fd526f34805dc9c49ffb6d5681dc6178ff43032 SHA512 d1de1757bd448535892b60dd6cc739c9b8cb92affd0c7a1cfffcddbcc1d18a1f17d054e751aa4362e26111e6e59206d086e3afb1552a2061503db6459ec34424 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..b90e6fc97258 100644 --- a/app-editors/zile/metadata.xml +++ b/app-editors/zile/metadata.xml @@ -11,8 +11,4 @@ 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> </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.6.2-r1.ebuild b/app-editors/zile/zile-2.6.2-r1.ebuild new file mode 100644 index 000000000000..b7fa5c7239ff --- /dev/null +++ b/app-editors/zile/zile-2.6.2-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +VALA_MIN_API_VERSION=0.52 + +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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" + +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 + +pkg_setup() { + vala_setup +} + +src_prepare() { + default + 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 +} |