diff options
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/Manifest.gz | bin | 13423 -> 13412 bytes | |||
-rw-r--r-- | app-editors/emacs/Manifest | 7 | ||||
-rw-r--r-- | app-editors/emacs/emacs-27.2-r5.ebuild (renamed from app-editors/emacs/emacs-27.2-r4.ebuild) | 2 | ||||
-rw-r--r-- | app-editors/emacs/emacs-27.2.9999.ebuild | 2 | ||||
-rw-r--r-- | app-editors/emacs/emacs-28.0.9999-r1.ebuild | 441 | ||||
-rw-r--r-- | app-editors/emacs/emacs-29.0.9999.ebuild (renamed from app-editors/emacs/emacs-28.0.9999.ebuild) | 2 | ||||
-rw-r--r-- | app-editors/hteditor/Manifest | 2 | ||||
-rw-r--r-- | app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild | 4 | ||||
-rw-r--r-- | app-editors/kakoune/Manifest | 4 | ||||
-rw-r--r-- | app-editors/kakoune/kakoune-2021.08.28-r1.ebuild (renamed from app-editors/kakoune/kakoune-2021.08.28.ebuild) | 2 | ||||
-rw-r--r-- | app-editors/neovim/Manifest | 2 | ||||
-rw-r--r-- | app-editors/neovim/neovim-0.5.1.ebuild | 113 |
12 files changed, 569 insertions, 12 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz Binary files differindex 52089dc24048..d121b836cc52 100644 --- a/app-editors/Manifest.gz +++ b/app-editors/Manifest.gz diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 06e168942c1a..6dd00e81ca93 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -15,7 +15,8 @@ EBUILD emacs-23.4-r21.ebuild 11065 BLAKE2B ec01f02640ccef8349bef30f81c2328465293 EBUILD emacs-24.5-r11.ebuild 10816 BLAKE2B 9968d323497774e9f864ff9f41e54b2cea4ed471836e9644ac675728cc83b955ddcf93d0a94af359beb722da5ec5d7c4e267a732fadc592fc00d740692ed65df SHA512 417cdbef740b8b6b122446547e87e527355208c3894fe88720114b9ec8ae22ce62cf44de5a571997601fa6cb17b208633c18a6017838386285302322ec3c8ea4 EBUILD emacs-25.3-r11.ebuild 11126 BLAKE2B 094e3beb2f13d6f9b16b29b0758eac7aec05e5dd90d90b202fb36c0d8c247487d19cc8614c9c938b81598c0f97ef43f846dc14e3160b06f10d2608b5a517ba58 SHA512 2de603b0688d3648908b86ce0c7737e8f8e31500a07fe84c57a19d53e0b3d8039a949d88ea097d40074ab1eae0780cba164a3e8e03ae94a94e1d90298360cf6a EBUILD emacs-26.3-r6.ebuild 11825 BLAKE2B 1df12880101fce336ded064f8e91840b9f1a66b213367f46503c0ec19fcd1db45f0fedfe0db895141d44a8d2bfcc506c8683dda949429b5910b8cad360d241c7 SHA512 0608d4f489447e4545c2510a446293cd34a4164e2f6348b143a158df78dc6e362d166cda25177d86daac52fb31c7a85d1519de9b8583b1a2b4fe8782bca4c785 -EBUILD emacs-27.2-r4.ebuild 14415 BLAKE2B 3ba0a0bb5066670fc671deece5fee4480aca1a088f98830d9c6d7f01928d531f41ec0c050eb590d89545af4a7f63195b7b08cd7de115b78ee0c79fac44064fb2 SHA512 94b84e6a8c0d0711f77de7ac5102150cebae6040a2b744cbdd445f6c884825be9b4a897574d15781c33a80017aa0bdcc05ba4bd861b4193fc641f1458dab2fce -EBUILD emacs-27.2.9999.ebuild 14283 BLAKE2B 12dbe5a161e22524bb4d02d0d659b62a8f1940a9a6382b898e6e23c268112f583938225b4f94c8ccbe2bf2e7b70356539a8623eea12e58ce5d2ee272fea16a20 SHA512 1e70761bb0b13dd24515f0e7e9e0e1676d80ff5bf7bd0138d8cc7518a8ae1b20907ba7b12c27b904ec871576a634ee265cd894a7c2e2235c7d7101c16b0f6dbb -EBUILD emacs-28.0.9999.ebuild 14448 BLAKE2B 88fc7d442c04c87045b2715fe72845289acbaae4e5586965fb58353e48c30950090b6550e75781f9d1c3ffe135bf97d504409e7247ad933a0866bf4e53627901 SHA512 646f9df3bd50ced09b21d28b045c7bd88f6b7dfaf7c341100d4a7c8696de1235c7b410ae559378824a150896eb17b2d420fdaaa32552b3047e6d1de0a4231fa7 +EBUILD emacs-27.2-r5.ebuild 14417 BLAKE2B caf2f97a6ee109d0bb460f076408a10bde808758d7b19a6d0641f3aa73996681b4eab5b99e8bdec4127dab08eae848da8a3358a1e8a8a9086199d78793987335 SHA512 bb9411a6d90dac795b446ad86a5b586ed4aa8140534860ecaece4a738b7c7d801ec0b42c1e4a0793483be5a070a040aa0af484eed63ee561743b6a8e3361e04c +EBUILD emacs-27.2.9999.ebuild 14285 BLAKE2B 87ca6c37fccc5e6d24111d6167920d28de47dbd3a77bc50003c0c3a89f6e654c1f51a05b9dbf4a1a200e4f40fd1cb4cab30f3c2f53d3aefe6e676b175db7cb84 SHA512 c2b9c90534fa1a9d67d7f50044b94c6136e572d9cbda836fd9a046434ee65d3e64e5b88a123496a4bbeb487156d66e2960461f82a71d0c59f3229273c3616af9 +EBUILD emacs-28.0.9999-r1.ebuild 14452 BLAKE2B 68d57670ac0d6b470e259fc709b2f3e855db9c2dbe64ea5d65a383eebe2e4f82b2fc13dce1fc8a6119e5189843d1337ffc5cd73425c46c20478f45e0aef9364e SHA512 b365d7c1a75a95ec3e9b6341c204436ebb67de08ff6514fca960c32ed2da1db460fd0641dd4492b02ea8d2abe47dbe39c30a92f60c06aa0edda3cd6fec529cff +EBUILD emacs-29.0.9999.ebuild 14450 BLAKE2B 64ccaa69ef1ef032c58f1d54b1f8f5c45ea6e7d443792e19b440541e1fda9c167ba6d7863f33fd648289cd53864c817cba5af0322c00512b48e732fb81252218 SHA512 71a8bef26f44970ae7dcb63ae1dfdbba2f0bfaed6a31e5311a6197447afe3511b66a927c1f449ced7213a88ff9000d1cc4c46578c157c3379c50d0e2e3e193e1 MISC metadata.xml 3130 BLAKE2B 162f49aa253a87b89e80dcbc961cacf659220c16c5b9d83e96b1eb90c40f828b87830173a80fb24cbfae50efb2ddfe51aed3e334c8c0f8e5cd30b63569e991cb SHA512 71a1b4b298ae915a33c7876a20892799c3c7b39f913b7b2606c18e6c14a4169b60f17c41742cdaab870cb60bceee14c0d10ea6f345739b1e9c3d07a14d9d60ee diff --git a/app-editors/emacs/emacs-27.2-r4.ebuild b/app-editors/emacs/emacs-27.2-r5.ebuild index e0f01a2c3216..e2efcba31d59 100644 --- a/app-editors/emacs/emacs-27.2-r4.ebuild +++ b/app-editors/emacs/emacs-27.2-r5.ebuild @@ -55,7 +55,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - json? ( dev-libs/jansson ) + json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild index d3ca04ad9dd8..9dd86d34a32b 100644 --- a/app-editors/emacs/emacs-27.2.9999.ebuild +++ b/app-editors/emacs/emacs-27.2.9999.ebuild @@ -52,7 +52,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) - json? ( dev-libs/jansson ) + json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) diff --git a/app-editors/emacs/emacs-28.0.9999-r1.ebuild b/app-editors/emacs/emacs-28.0.9999-r1.ebuild new file mode 100644 index 000000000000..156f7ef44d15 --- /dev/null +++ b/app-editors/emacs/emacs-28.0.9999-r1.ebuild @@ -0,0 +1,441 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common flag-o-matic readme.gentoo-r1 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 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="https://www.gnu.org/software/emacs/" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" +RESTRICT="test" + +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? ( + 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 + toolkit instead. + EOF + myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)" + for f in Xaw3d athena; do + use ${f} && ewarn \ + "USE flag \"${f}\" has no effect if \"gtk\" 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" + 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-28.0.9999.ebuild b/app-editors/emacs/emacs-29.0.9999.ebuild index 9050791f1d9d..cc1da333c7fd 100644 --- a/app-editors/emacs/emacs-28.0.9999.ebuild +++ b/app-editors/emacs/emacs-29.0.9999.ebuild @@ -53,7 +53,7 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] ) - json? ( dev-libs/jansson ) + json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) diff --git a/app-editors/hteditor/Manifest b/app-editors/hteditor/Manifest index 0718c7b037ce..8895af48ca85 100644 --- a/app-editors/hteditor/Manifest +++ b/app-editors/hteditor/Manifest @@ -1,5 +1,5 @@ AUX hteditor-2.1.0-gcc-6-uchar.patch 1443 BLAKE2B e08ca71c4c0499f8344174ea09fa3252c4199367904b9d1b937f13d95e36f48a2d5c687d5e3d39edd56fba4fda74190facffbc7a8bc8b8ebfcf0bba9cd820226 SHA512 2bf1b8b6b945f9a153b2ee2afa03facbcebad36405bbe07c16230a2269595836fd802770b9209ce8a018195d77be553817352d99da6acdf0e7d8989a4ce09431 AUX hteditor-2.1.0-tinfo.patch 176 BLAKE2B 936f60f54424b9d69986b7b9564abd3c5de2a321611e66e386aac47ea504f7a40d3c6614f4430a70052b39dcdf68f4540cf1ae4a2dd0a4b237857cd611bbf8fe SHA512 1800a7010f0d94da473bd10e3ab36bea2b99c2d9b78b01f0c3ce7c35d2f9ee33eb3da9a2b091482f213136f23c97bc3afd9a10f59c7e56b36817cb5ba34f4c36 DIST ht-2.1.1_pre20161206.tar.gz 1082309 BLAKE2B 4fb00b0aa6115da3b561436f9f9905c48d93d6768bcf207931bb46840727c85fb5c9a1afda8ed805f71e9ce242161a2b95e26add02ff5aedc407df7f11c6ddec SHA512 33d681ee8c978568dd0d187d6846994362625d000c316baab10c237175fa6a47dc0e7b61cfd503c4dfad8a01d27af7fc87cbf20109087e1d9280048c898fa621 -EBUILD hteditor-2.1.1_pre20161206.ebuild 1064 BLAKE2B 4d4b1c02c3d0a0484dc0e12d32303f8977af7ac972b4b5df3147594c0a9cba6434f6745bb00eb7fe40e34de7d0c72f8d836c02902f857306c9af198dea5d53b3 SHA512 c36e1528a6e79f222ada5c97a8c0f49e4e338b597369ca768312efeaf33cb919d96fac1f7bf5477ccb0b4f25c29e0aff8f7f78817f8cc99496e77a7fd6bc2528 +EBUILD hteditor-2.1.1_pre20161206.ebuild 1061 BLAKE2B baddd36402c3db59a937daac681c9a452ec528c37e3920f260367d8f66edade7827ac19d6682ca132c2356c5b82ec6a451334a9e3f2d8f1db9c5219d1e9f874b SHA512 b1a6a701ff9a2ee77a76fffc4a89ead2c8dd6c5fb52c94800a2010bd1ad5cd7b5249f6854ad6657706af348cb84ecaee56bca42f0b05d88aea6e27b78a99deab MISC metadata.xml 376 BLAKE2B 95d795c64db08ec029ca3e697d144fc92efa003e34d08b5e47143fcce22c53bde664b17147c88d55e21cc1ed7999c83f0c3e77e6528147d4b47b1c7ae4b86f83 SHA512 e728a6956ccce1324699fc0c5496cb5428f7a1d130647a3331be2e21f89cc9f21fa49ab412b9b0a48f993f2e3bcb601276f8124e0dd38ef656f3dc0cf376dfac diff --git a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild index 9b87e74ff978..d74e18c724cd 100644 --- a/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild +++ b/app-editors/hteditor/hteditor-2.1.1_pre20161206.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ DESCRIPTION="A file viewer, editor and analyzer for text, binary, and executable HOMEPAGE="http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/" #SRC_URI="mirror://sourceforge/hte/${MY_P}.tar.bz2" # tarball is done as: 'make dist' and then rename to mention latest commt -SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.gz" +SRC_URI="https://dev.gentoo.org/~sam/distfiles/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/app-editors/kakoune/Manifest b/app-editors/kakoune/Manifest index 1979cb832b19..710ae17fd6c2 100644 --- a/app-editors/kakoune/Manifest +++ b/app-editors/kakoune/Manifest @@ -1,4 +1,4 @@ AUX kakoune-2021.08.28-php-filetype-fix.patch 738 BLAKE2B d9f940a06b03b65c3936120823c98412a303032804f31725edaa591c4dd02d204c64fb440f03b72c62e268f99c7333b8d6be345ce254ed5ffc1c36dbe942be88 SHA512 be24943903e4e2cc728234be29119b5e2f81aad80c8ba88d400d31daa008045e7a81aa4c89670293e0b7267ee0e6e79ab9ac1480ced41dadbcffd6f22c46dc90 -DIST kakoune-2021.08.28.tar.gz 654429 BLAKE2B 8cf769d2dea74fd8bab8261e4d79276af089d73753052fdd3776bff0adc72bc20c43f840350076e675c633de2175ad83960fa2ccf85fc852c7c81bd4888ced2b SHA512 1f4f0648959e94e45eb00f2398aa6897595457ef3ee4d1c6e18d494f3e68f8d3a0c4d0dbed88b6588fda61137a060c648ff635972731c0f29faef4cdc03c829f -EBUILD kakoune-2021.08.28.ebuild 824 BLAKE2B 12458c9944844d80e0de4141772f4efceac95d50a3f7ef01f09e4f808ff99b9fe74f060246d7b8d6aec59bb39636bc0e67e027d3a37360de15cbde40cf4133a2 SHA512 f75555899e6d3a54f9a543a1a61520caaab162adbfef69e6112ed2785f20821c31bf12ebfc8dcec2ea505604b0684b95f3200bc8fd634760cbf43dfdf538514f +DIST kakoune-2021.08.28.tar.bz2 535791 BLAKE2B b04f23b29def72659925b104a203033cd547ec9483225e35a216276716b2d31da76e1c4a239b60a1e72f3e3f4777997bc59560f6ccd4a0e3eaf509e537ed85ad SHA512 a304f1ce3295196468784e27f019d155b5aa0305d90adf5ae65c74a9be4ee740df400ebeb819eb059bb42efee503daa988a2ea929fa6d60ec63ad408be9b575a +EBUILD kakoune-2021.08.28-r1.ebuild 825 BLAKE2B 096cd7bc5e73144917c58bbc9fc16ee54c3079a59340bcbaff8f5904a3e6b6526342a3dc95d93433d869d8f1a0f257cef24593c8bde8c2fb10e371719dc241e4 SHA512 1c1cd3bf0b0187a1cac36d4e48ef9ccbb8975e9271e301b5ecc11767b61f7638de460cd02659fa547d2bc218bb12cceba5d6d274157717cc147373901d65f861 MISC metadata.xml 512 BLAKE2B afa8631f092bca6c3307dcd610340b39e41da979781f0f1ac391e873ae063088599cfc96c99bc81cca0c1244905ced51e3736b1fc387d0d9fdb8233be2810427 SHA512 a7e4da11480bc3f8bd09253901d9528235ce9a4f00a418cd5f58c898244850cafe944d6a828e1b871a2d98faba179fd9f4ddab99695a6762a4a7a290f1311a2f diff --git a/app-editors/kakoune/kakoune-2021.08.28.ebuild b/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild index f44978e99739..66fdc47a76c7 100644 --- a/app-editors/kakoune/kakoune-2021.08.28.ebuild +++ b/app-editors/kakoune/kakoune-2021.08.28-r1.ebuild @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Modal editor inspired by vim" HOMEPAGE="http://kakoune.org/ https://github.com/mawww/kakoune" -SRC_URI="https://github.com/mawww/kakoune/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/mawww/kakoune/releases/download/v${PV}/${P}.tar.bz2" LICENSE="Unlicense" SLOT="0" diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest index 04d8e92d6186..4f498a65647c 100644 --- a/app-editors/neovim/Manifest +++ b/app-editors/neovim/Manifest @@ -4,7 +4,9 @@ AUX neovim-0.4.4-cmake_lua_version.patch 419 BLAKE2B 73477d7fdc2705f2e93cd6dd355 AUX sysinit.vim 3408 BLAKE2B 50da5ecb83fb38af20d484dbc5f3e417efc083cde339070b07ff4c2fa4ebd080189f975478d82fa977bc763d5e8d7f29c7703a515ecf6fff62772be4ef160170 SHA512 79b574ef42fbdd9c7fe26cffb1fadea3c31becf22f4be441acbdc75068a00f809a23f3a886e1cb6e30bb92c780bd04aea7b94f655f5c9f0d10c547fb10dd6e8a DIST neovim-0.4.4.tar.gz 9558246 BLAKE2B b1d44898bb1e1ab40a7e1d7fb4448076c991ebe1a0956674548de82fe7a931d9eaffbf35ba03cf9c88466dcd628a55f1d7bf9e7a13f3dad74424d6d653ded60c SHA512 ca5c2fe1784ac7b0d2117948ba2e9ae5d94e36d22ff9e0967047e1e03e605537672d85543897af335103215ad462c86962f25267d352a77d61bc3d1cafb3c183 DIST neovim-0.5.0.tar.gz 10337976 BLAKE2B e7630e96fdd1a159ca68c8f61ed473a7fa7d0c5ebf7485e42c47f314f1a3031ac3f63519f4789d7244b9677f9fa9b2aabbffa1e11d97456255c44348acb814d3 SHA512 f6649f804faabb4104d3b28283932e40358c23990961f4ca7b380089318da312e59242746cee06387f4d881dd6514abbfec79c4063482383adfb4106e9e7a3a4 +DIST neovim-0.5.1.tar.gz 10349190 BLAKE2B eb7e0c6a0742369c4a0fbc32a0f0e5d595f03470fb10287c39dde2f86db433a21798acee49d2cc363f18843950ef76d1376f5e52358d0b19a4b1e090c0d620a6 SHA512 a5a976c4998e821e0d9a9038d3f0c9e7c424a951f6bfc6d75898916d6a004ac668f31a34c3472fc4fca6b1d9652ac662b06780dd04dc6a77ecdc81564ec05709 EBUILD neovim-0.4.4-r101.ebuild 2831 BLAKE2B a40b6c9e26029ad0576b02980b2110ea5c4d4472d412f316d70124b4780cd1d63268c7e86f4115674697605b1af1171a8da43a985dcf629f5376a6e0377525a9 SHA512 f368803117ef4db403ea11dfba1c626bfc638e1ef278ec77e38de69043045632ed0aa2d40356ea8bc7a2ce74fef1086a879afc4da6cadcd820b5585ec1cd57ec EBUILD neovim-0.5.0.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e +EBUILD neovim-0.5.1.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e EBUILD neovim-9999.ebuild 2885 BLAKE2B c1897e51862089f380d35a3d54cef1c7105661b7987d0b5f9423910ea81d1d6c29af312398e22f7765b1496ebb695c4f50461b4a437837785127139be988da39 SHA512 48de0cc9496fd2c4f589abddc0c19c161535b69d3900bfe528a36e746774f98dc28e32f6698671943540a37a9227b756be5fadd605d39f29bcbe654dedb6f56e MISC metadata.xml 536 BLAKE2B 48c85cdbe749584904a6719545308b55f130375464c55d6f458171707a2b72586bca6780b52bab3b379a2e0c471ec47026c1203edd4696fe38639f5718cc4896 SHA512 114c7fe41230c2aade3de44b37e51ae84a907b6fcb899732991f8013126214540f4b72e60b44c0993312ec8d7c8cc8c96eae8b9e0f78bd0d2cefb7497e5d16e8 diff --git a/app-editors/neovim/neovim-0.5.1.ebuild b/app-editors/neovim/neovim-0.5.1.ebuild new file mode 100644 index 000000000000..99aa8bbbb72f --- /dev/null +++ b/app-editors/neovim/neovim-0.5.1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} luajit ) + +inherit cmake lua-single optfeature xdg + +DESCRIPTION="Vim-fork focused on extensibility and agility." +HOMEPAGE="https://neovim.io" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/neovim/neovim.git" +else + SRC_URI="https://github.com/neovim/neovim/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" +fi + +LICENSE="Apache-2.0 vim" +SLOT="0" +IUSE="+lto +nvimpager +tui" + +REQUIRED_USE="${LUA_REQUIRED_USE}" +# Upstream say the test library needs LuaJIT +# https://github.com/neovim/neovim/blob/91109ffda23d0ce61cec245b1f4ffb99e7591b62/CMakeLists.txt#L377 +#REQUIRED_USE="test? ( lua_single_target_luajit )" +#RESTRICT="!test? ( test )" + +# Upstream build scripts invoke the Lua interpreter +BDEPEND="${LUA_DEPS} + dev-util/gperf + virtual/libiconv + virtual/libintl + virtual/pkgconfig +" +# TODO: add tests, dev-lua/busted has now got luajit support. +# bug #584694 +DEPEND="${LUA_DEPS} + dev-lua/luv[${LUA_SINGLE_USEDEP}] + $(lua_gen_cond_dep ' + dev-lua/lpeg[${LUA_USEDEP}] + dev-lua/mpack[${LUA_USEDEP}] + ') + $(lua_gen_cond_dep ' + dev-lua/LuaBitOp[${LUA_USEDEP}] + ' lua5-{1,2}) + dev-libs/libuv:0= + >=dev-libs/libvterm-0.1.2 + dev-libs/msgpack:0= + dev-libs/tree-sitter:= + tui? ( + dev-libs/libtermkey + >=dev-libs/unibilium-2.0.0:0= + ) +" +RDEPEND=" + ${DEPEND} + app-eselect/eselect-vi +" + +PATCHES=( + "${FILESDIR}/${PN}-0.4.4-cmake_lua_version.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-release-type.patch" + "${FILESDIR}/${PN}-0.4.4-cmake-darwin.patch" +) + +src_prepare() { + # use our system vim dir + sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \ + -i src/nvim/globals.h || die + + cmake_src_prepare +} + +src_configure() { + # Upstream default to LTO on non-debug builds + # Let's expose it as a USE flag because upstream + # have preferences for how we should use LTO + # if we want it on (not just -flto) + # ... but allow turning it off. + # TODO: Investigate USE_BUNDLED, doesn't seem to be needed right now + local mycmakeargs=( + -DENABLE_LTO=$(usex lto) + -DFEAT_TUI=$(usex tui) + -DPREFER_LUA=$(usex lua_single_target_luajit no "$(lua_get_version)") + -DLUA_PRG="${ELUA}" + -DMIN_LOG_LEVEL=3 + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # install a default configuration file + insinto /etc/vim + doins "${FILESDIR}"/sysinit.vim + + # conditionally install a symlink for nvimpager + if use nvimpager; then + dosym ../share/nvim/runtime/macros/less.sh /usr/bin/nvimpager + fi +} + +pkg_postinst() { + xdg_pkg_postinst + optfeature "clipboard support" x11-misc/xsel x11-misc/xclip gui-apps/wl-clipboard + optfeature "Python plugin support" dev-python/pynvim + optfeature "Ruby plugin support" dev-ruby/neovim-ruby-client + optfeature "remote/nvr support" dev-python/neovim-remote +} |