From 4b4d352fc9761396c68812d8eccc63b7b14d6558 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Aug 2022 13:53:01 +0100 Subject: gentoo auto-resync : 03.08.2022 - 13:42:43 --- app-editors/Manifest.gz | Bin 13907 -> 13904 bytes app-editors/emacs/Manifest | 2 + app-editors/emacs/emacs-28.1.91.ebuild | 452 +++++++++++++++++++++++ app-editors/focuswriter/Manifest | 2 +- app-editors/focuswriter/focuswriter-1.7.6.ebuild | 4 +- app-editors/nano/Manifest | 7 +- app-editors/nano/files/gentoo.nanorc | 2 +- app-editors/nano/files/gentoo.nanorc-r1 | 98 +++++ app-editors/nano/nano-6.4.ebuild | 113 ++++++ app-editors/nano/nano-9999.ebuild | 34 +- 10 files changed, 696 insertions(+), 18 deletions(-) create mode 100644 app-editors/emacs/emacs-28.1.91.ebuild create mode 100644 app-editors/nano/files/gentoo.nanorc-r1 create mode 100644 app-editors/nano/nano-6.4.ebuild (limited to 'app-editors') diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz index e38630979fad..092590ce7510 100644 Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index 67320aeca573..076b68b27e8f 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -12,6 +12,7 @@ DIST emacs-27.2-patches-3.tar.xz 7776 BLAKE2B c03947780518ebf86994b1af20cc243770 DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf1176937e08157eae12cdde5a0f35fc77f7119272ed812974358e5e95abb05e1c2e4f3b501cf5401ea9274f62156 SHA512 0f63a5a8709b113ef790c1a64845dad05ead096f93f62164ff221c517a35b91ea7bced75a992d794981a85382cda03cca7338da2f5ef8f6ef1459b88018a4ce9 DIST emacs-28.1-patches-1.tar.xz 960 BLAKE2B a717923a1b022ff4dafaa27a7198a287b7d5ea5765cef9b719e17c622796707dce855d12d634f836aa1196557e7f780b884027ccc4467fb56d48d710fdd2b82e SHA512 67a393891c3834855b05d4722026bce9da6e68cc15143a7887884e8aba4f78d8daca7d3796b25c68e23f19c300a036db9b91961c50aff901e5d9da448c9c72e9 DIST emacs-28.1.90.tar.xz 47712688 BLAKE2B 00aa886946de3247954ad3b113d8f5861ffe4d46757ff4d33f4a88d688e9ffa86733316ae73809dd3017d4f8c3fe755bca658a752975a4c1ca716dcc4c206528 SHA512 50452ad29919f63d11b751ac4bc082e877e5792dc53f27ff90c22924f2b504f1049d138a8a31072cab0542bb552f9ecb356a04a570fd7754f285cfe494c0bea2 +DIST emacs-28.1.91.tar.xz 47726940 BLAKE2B 98445c49d8709f0262a98f904828e604094f4f703548993e5d090c214e4bc7d19c174098f40a003aa2fe1f92aa8e44657d7b4ead9c81f0299cb25b7f5c78bc16 SHA512 4c8505c90f65d410ae11877b6873e0d45f40ab0253592a93d9deb335009c4306b533c7c8ca5c0980ceb5ea8d64c72be3f503f249f1d30f856d6ac33f6e63d149 DIST emacs-28.1.tar.xz 47699512 BLAKE2B 42a12bec2dc74f4838ae79b5589fb7439ff415d8ddd34f2ff7a8c503f909ddd4144ad35ae19c758d8627cfa9ed29276b326c5bec3853a77cd179e9fb17d22ad7 SHA512 c146ff7086aba49fa6c18adf4e485a59eb4c6525fddb9d385034446830b8bb0ac9e6fb76e7b6d94a9fddc41643415f36acad57a1ae16a841c97f61bc211459d9 EBUILD emacs-18.59-r14.ebuild 4426 BLAKE2B 836c0e10eb9bee637d215bc13d695a631ba495728b5c8da1a2b6a29e31f17be8de4bb0aebe6401fecaee8488da0d5302b898b1a8b528eb18a0ebb46b3ed04e43 SHA512 4540d9bb492309c983c75c2cfb2f3aad2653252303d7d25c5d59723f43b9ece3ee43a216e3775c86f75714b29d2387371aab734c94cbe59d29cde64e077f27cf EBUILD emacs-23.4-r21.ebuild 11040 BLAKE2B 5743514f4e5be8649ed1b2a8bafaa873876c71e5035632f61bc4ef808e540edf144af1277c355bbb215f922be7dd7ac843af34a42f6b6109aaecb2ef2027a6dd SHA512 049dfb3eff159a1cfe6e62e4ecbe04df614b5cbb79b9a8619bb9793e08191754270e36295124e6fa6fe79832c2d20e55138d42080d5cf7fc4dce5bbd8ad6fe54 @@ -21,6 +22,7 @@ EBUILD emacs-26.3-r7.ebuild 11779 BLAKE2B 69ef04e1707478913d6d574cc9569e1b7eece4 EBUILD emacs-27.2-r5.ebuild 14310 BLAKE2B 8875ffdd3002c88240d58891d67c840ea67bba108009e7fbf5963050a36b9e4f1cc4903e38c37a7456c3becf9a5c42c29bb910e8797940b9389b3fad8747948d SHA512 e47f5035c3d687b7a58ef3a05952ec301a00d17ae7633a9d5055c15f8fe9631d7d60927966eaf0b3e9fb1a3f0d892e3830269dc995efc2ff3400aad23815df1c EBUILD emacs-28.1-r2.ebuild 14934 BLAKE2B 0d81ef8eddbc2aeeace9071b7ce9214f539dd7bb3657ce0b066ea85bb0b38e4ec09d921ee01ed0dc6d4cfc6ab5fc2d25109105e318339b0e4ced569ff1c3c17b SHA512 d0692d7227f44052d2996468d59b4a16dafc55ebd73d84b53c15728701af81b281d126bc50fe1c7994151ec8e5c3a98b505be7e7f8146fd2e18e1edcfb101a60 EBUILD emacs-28.1.90-r2.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af +EBUILD emacs-28.1.91.ebuild 14940 BLAKE2B b6bb7cf14803f2649554168191d2533a2912212d399a31c1095c1b463356a7284ce135d648b1378042f20ae780cadac6b848efacecc1cda5c190fa2f925fb7aa SHA512 b7d7852e3f7367f18500132317ab0c95a076ace63080cfa805ed638266cbd7171ddd6814911bed3532f0c5740300689f2773790744e9cccbc426ac7d1867c2af EBUILD emacs-28.1.9999.ebuild 15037 BLAKE2B 61cbff92ed83808be6868a4451f6e7f4064474da368f7e93295a3b23ff8a9f3a6ceb6c78ebc3955a3aa506ccf01e096b6a906b0ae4225c532b649b7492c865dd SHA512 37e7756db860b4564557b7f93c6a46e3b390dd899568802296ea2416cf9b23c408843192e5f9793a2968eff9bf622138c09858210efb85f16da0f006a912693d EBUILD emacs-28.1.ebuild 14790 BLAKE2B 9555b8b3d692fd33b9575e5666a63345369070187799e1a33556565c15a4f1c07b91197223e9db311911ca9ee4e797e9840b525fe8a2e8a9255f153c1bb541a5 SHA512 22757ca82108d2a47ee187119e82460a33c1df1d7b6cfd543a7bedd87e22aaff63083b2dffe47bcbb795430fa40e0a43477d0ef415a0de6e8b6bc5aaae425670 EBUILD emacs-29.0.9999.ebuild 16519 BLAKE2B ad8023a343f5b3809ac1a1b361c6213921931c2afa9eeca1d57d77b925f56c319ca10880ab7d70a33488e44c35969475b14442989c50147b7722e3d9cf44ee03 SHA512 50c3e8308f7627dd0da511104fcf3dc93e6095ad8334fa425de17b597e44e6feba58e0851cf15a8e1deb280b4957fce2ae173688f519b5e27bd4be25c42ffcb7 diff --git a/app-editors/emacs/emacs-28.1.91.ebuild b/app-editors/emacs/emacs-28.1.91.ebuild new file mode 100644 index 000000000000..52d3b54aba86 --- /dev/null +++ b/app-editors/emacs/emacs-28.1.91.ebuild @@ -0,0 +1,452 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools elisp-common 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 + # Patchset from proj/emacs-patches.git + SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${PN}-28.1-patches-1.tar.xz" + PATCHES=("${WORKDIR}/patch") + SLOT="${PV%%.*}" + [[ ${PV} == *.*.* ]] && SLOT+="-vcs" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +fi + +DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" +HOMEPAGE="https://www.gnu.org/software/emacs/" + +LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" +IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jit jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source 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 + gsettings? ( >=dev-libs/glib-2.28.6 ) + gif? ( media-libs/giflib:0= ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + png? ( >=media-libs/libpng-1.4:0= ) + svg? ( >=gnome-base/librsvg-2.0 ) + tiff? ( media-libs/tiff: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([^,]*,[^0-9.]*\([0-9.]*\).*/\1/p' \ + configure.ac) + [[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version" + einfo "Emacs branch: ${EGIT_BRANCH}" + einfo "Commit: ${EGIT_VERSION}" + einfo "Emacs version number: ${FULL_VERSION}" + [[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \ + || die "Upstream version number changed to ${FULL_VERSION}" + fi + + 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 or distcc #801580 + # For now, work around the problem with an explicit LIBRARY_PATH + has ccache ${FEATURES} || has distcc ${FEATURES} && tc-is-gcc \ + && export LIBRARY_PATH=$("$(tc-getCC)" -print-search-dirs \ + | sed -n '/^libraries:/{s:^[^/]*::;p}') + fi + + 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() { + 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+=" --without-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 and + . + 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 /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/focuswriter/Manifest b/app-editors/focuswriter/Manifest index 8c3a107dd365..aa3597e37a4d 100644 --- a/app-editors/focuswriter/Manifest +++ b/app-editors/focuswriter/Manifest @@ -1,4 +1,4 @@ AUX focuswriter-1.6.0-unbundle-qtsingleapplication.patch 1108 BLAKE2B b17d04cfb5833d485a421244228ef36601320ddcdad1e744e4a83fee2633154c4bd642053e09bf97ee79aab2b11a82df4afcb4a70823cb5df24b5232c9b0a8d6 SHA512 5f272a4c65b1eb58cc87732fbe82f2c6b925562e77b2280a8b9a0a8b0a41716567051ebd4f6ed32caa8ce7f14edff4e20666f6ad4e464cc8d308640efa4a3c19 DIST focuswriter-1.7.6-src.tar.bz2 10311965 BLAKE2B a1f1627df988d7660f6b90cf984d725ff2366754f01b0ce78e23756a98c716acafa8b4076f4749f117cba6eaabcb6ec61516c032a7ae770eb1b06466a358595e SHA512 45e0bc9b20c73b260aa42dcc9ee79515d3ad95d4c9586f60ab75fb404f73c7443484f238b3705ba3224b852a0d9b8b8db17d9145aebb77513f8597a01ab01d3b -EBUILD focuswriter-1.7.6.ebuild 921 BLAKE2B 58280ead08cd671423371125732e36453a2b10bb474d1c9aa4c6fa90090171fc732744e47fd58d1cac2ecbb73222fd3c8b318ce8517a8ccb148db2a57c22a268 SHA512 7db62b7dc05997233673bf5fdee26d6a147722aced275ed8dd5041fc19bda80c394d6ebcd41255ab2ce7e7f1a98daacbc0a66d54d40f8eb9c3511a64039fbb1b +EBUILD focuswriter-1.7.6.ebuild 928 BLAKE2B 9297d46d557cd2d86eeffbdb1b747beb1286044a78637ef39be4d4de1bda26eda15bd287b0e65d804101f28ffff48e14e1bdf530a3d95cce056c1949b29e17be SHA512 7d4cc807b2464597b001bba1b21dcd01a7a25d131a6677426db8afabc73b0c367f8caef4fa2bfc2f7553340c01e3c3bcc0470bf1985b565ac594024a6f5ad260 MISC metadata.xml 393 BLAKE2B c479d3b5787d156fd03b2db6eb73ad9d151ca64ee6e018afec12dd0ac5d4269c9d38570b98813fc601f5ac9d4615e844b257c07089bf8d8ed59d690c1961c36b SHA512 a166c49cb67ed6968930db5af5151540ba78c7412ce96738d510a10074bfddd7b906a745ea6c9abe3a49822d6fe8a259042b56a819ff4dee12dd52d7171cc326 diff --git a/app-editors/focuswriter/focuswriter-1.7.6.ebuild b/app-editors/focuswriter/focuswriter-1.7.6.ebuild index e509c5be66d9..09d03a6ecc88 100644 --- a/app-editors/focuswriter/focuswriter-1.7.6.ebuild +++ b/app-editors/focuswriter/focuswriter-1.7.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="amd64 ~riscv x86" +KEYWORDS="amd64 ~arm64 ~riscv x86" IUSE="" BDEPEND=" diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index 3c08bfa4ef5c..73d868c4de0e 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -1,7 +1,10 @@ -AUX gentoo.nanorc 4206 BLAKE2B eacba1d5db1475aa53f177d9c04819ff2b81c5fa196365f65c75b1fbbcfa78f93d4537d33901a604753131a14978843ed588296dad37c626c125959e61f3650a SHA512 45afe49629f0fe232bae8a0ae8d3984b3add366b1f88e5859df7612ab0b47f4df8764c17e038bcb49b106b08bfc8a20356b6e62cb9cae9ac337adc37db97ffd0 +AUX gentoo.nanorc 4212 BLAKE2B e8e50c1b98f0b593d83bc35c84e79d5d0db6b076862635498bbe81c4413d4818cae3027c163556335c6ae7284545c99477c7269a0df78a9ac694912b28de1939 SHA512 b347ab4e92b2418f59e1f2e0f1d6993102fd2c237eb4cb7daac373f48cc0071f0c3b47f4354e2e4fef00285fe5df22958694238fb4b017f7eff745c84166dc10 +AUX gentoo.nanorc-r1 5378 BLAKE2B 0d9a506a87ec75eab5cf04d94f65c3089f0cb442e705fbefc70b4a5b1d08fd360bfc136b6e1cdc4ed480f4ffb6b37b81a019869aa7e322b3f96219241a2d1569 SHA512 bc8db27b8509059833ce1939a3c63d8389968366118596f2a832e188ea5f3e8eb2b66e781ceaabd58c941bbb8ca6818b363189ac267a96f0943bbd64983b5c65 DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4 DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3 +DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b EBUILD nano-6.2.ebuild 2349 BLAKE2B 53dc3860dd5366d797e3cae3943de67c960ebb626c932d91743897c67ba1bfd99280f9bf5ceb707cdc452b29cf15c2ec84dba2b38ee42297e655bd02d85954c4 SHA512 ab0772726974a97039bdd42bfc6d94b1b1e57f70b082e6bd8a37f88659d2382c031fc7cb8df7187ecbbb8a9129c0cf5f7aa5574c08bf6f16695ec49918eb5641 EBUILD nano-6.3.ebuild 2636 BLAKE2B 79f9097ec7bb0052b66c476767c7d1e5ccfdd96f4c8b5ff539b7a1d65f7f171b88c124c88e31ed99ce1f39742ec1cec34e1e254d2541faec5fbef6ed8a173c39 SHA512 8ab371ea08c4afce84d74962a61bdb62e30cb5a1a1db049e6a9493b9b8fde6dce6d67424938f335654af7b997f0c239a61b69aa93fa55382599d6c9eac4915f7 -EBUILD nano-9999.ebuild 2637 BLAKE2B b9f2db1e3fc8556067f5bf400fa25cbb590346a82522f62e885a0828b3829cc81be2ab8267cce53c9cbd046b092be31bfbb5840bcc0566ecfed8e12231b50eca SHA512 9787aca7f721fd1e08addf7ce8105217433346912e195009e9fabfdb958206e785de7705675df7cd3b4b959c697c22162b390f535e2e86591547138faaf4b9b6 +EBUILD nano-6.4.ebuild 2677 BLAKE2B 5b2697a9c63c708506d47657c7cc599edbe1779250e42625c8862510c5d526a6ff73b62b040a930021e1f1cc2c58aff3cf76c85e9da1bd5cbc3987f49fdef5dd SHA512 d7f0aa86e0f655e796a78622c216ea8fb4047791234ec3d0e77e736763a76c675267f51ed5a3cdc0cd0bf5a32855bf434886c5119dd29eb6c5ebe6ce3c05adb1 +EBUILD nano-9999.ebuild 2677 BLAKE2B 5b2697a9c63c708506d47657c7cc599edbe1779250e42625c8862510c5d526a6ff73b62b040a930021e1f1cc2c58aff3cf76c85e9da1bd5cbc3987f49fdef5dd SHA512 d7f0aa86e0f655e796a78622c216ea8fb4047791234ec3d0e77e736763a76c675267f51ed5a3cdc0cd0bf5a32855bf434886c5119dd29eb6c5ebe6ce3c05adb1 MISC metadata.xml 1666 BLAKE2B ee53e5f23c192741ff6d59594105a9365fa8fddff9547dc7bbc14fe967d49c0d294bb56fa2e6d0c40d53dc64e8a031fea3294e62ca6ea2fc31dd028b00a423ee SHA512 58691db7bb106774da8b59db6afb199e2c61444a6feedbef09a22d6fef184512102f1fa4d7cfe7edf9171f3e7a542fac294eacc5eb1a3cb7de724b986b6884a0 diff --git a/app-editors/nano/files/gentoo.nanorc b/app-editors/nano/files/gentoo.nanorc index 84e9bcf28ebf..edf4ae109b1e 100644 --- a/app-editors/nano/files/gentoo.nanorc +++ b/app-editors/nano/files/gentoo.nanorc @@ -60,7 +60,7 @@ color magenta ":[^[:space:]]+([[:space:]]|$)" color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+" color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+" ## Accepted arches: -color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>" +color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>" color white "[[:space:]][*~-]?\*" ## Categories: color cyan "^[[:space:]]*[^/]*/" diff --git a/app-editors/nano/files/gentoo.nanorc-r1 b/app-editors/nano/files/gentoo.nanorc-r1 new file mode 100644 index 000000000000..26767774a0e3 --- /dev/null +++ b/app-editors/nano/files/gentoo.nanorc-r1 @@ -0,0 +1,98 @@ +## Syntax highlighting for Gentoo ebuilds/eclasses, +## and (further down) for Portage control files. + +syntax ebuild "\.e(build|class)$" +comment "#" + +linter bash -n + +## All the standard portage functions: +color brightgreen "(^|\" +color brightgreen "^pkg_(config|nofetch|info|pretend|setup|(pre|post)(inst|rm))\>" +color brightgreen "\" +## Bash-related syntax: +color green "\<(break|case|continue|do|done|elif|else|esac|exit|fi|for|function|if|in|read|return|select|shift|then|time|until|while)\>" +color green "\<(declare|eval|exec|export|let|local)\>" +color green "[][{}():;|`$<>!=&\]" +color green "-[defhnrsuwxzL]\>" +color green "-(eq|ne|gt|lt|ge|le|ef|ot|nt)\>" + +## Variables... official portage ones in red, all others in bright red: +color brightred "\$[-0-9@*#?$!]" "\$[[:alpha:]_][[:alnum:]_]*" +color brightred "\$\{[#!]?([-@*#?$!]|[0-9]+|[[:alpha:]_][[:alnum:]_]*)(\[([[:digit:]]|@)+\])?(([#%/]|:?[-=?+])[^}]*\}|\[|\})" +color red "\<(EAPI|ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|[BIPR]?DEPEND|PROVIDE|PROPERTIES|REQUIRED_USE|RESTRICT|USERLAND)\>" +color red "\<(S|E?D|T|PV|PF|P|PN|PR|PVR|A|CATEGORY|DISTDIR|FILESDIR|EPREFIX|(B|E|E?SYS)?ROOT|WORKDIR)\>" +color red "\<(T|TMPDIR|HOME)\>" +color red "\<(AS|C(PP|XX)?|FF|GO|LD|RUST)FLAGS\>" "\" "\<(MERGE_TYPE|REPLACING_VERSIONS|REPLACED_BY_VERSION)\>" +color red "\" +color red "\" +color red "\<(PATCHES|(HTML_)?DOCS)\>" "\" "\" "\" "\" +color red "\" + +## Portage commands: +color magenta "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse) [!a-zA-Z0-9_+ -]*" "inherit.*" +color brightblue "\" +color brightblue "\" "\" +color brightblue "\" "\" "\" "\" +color brightblue "\" "\" +color brightblue "\<(assert|die|hasv?|inherit|nonfatal)\>" "\<(use(_(with|enable|if_iuse)|x|v)?|in_iuse)\>" "\<(has|best)_version\>" +color brightblue "\<(do|new)(ins|s?bin|doc|header|lib(\.so|\.a)?|man|info|exe|initd|confd|envd|pam|menu|icon)\>" +color brightblue "\" "\" +color brightblue "\" "\" +color brightblue "\<(doc|ins|exe)?into\>" "\" "\<(exe|ins|dir)opts\>" +color brightblue "\" +### common eclasses +color brightblue "\" +### flag-o-matic.eclass, toolchain-funcs.eclass +color brightblue "\<(all-flag-vars)\>" +color brightblue "\<(filter-(flags|lfs-flags|lto|mfpmath))\>" +color brightblue "\" +color brightblue "\" +color brightblue "\" "\" +color brightblue "\" +color brightblue "\<(append-atomic-flags|no-as-needed|raw-ldflags|append-libs|replace-sparc64-flags|get-flag|strip-unsupported-flags)\>" +color brightblue "\" +color brightblue "\" +color brightblue "\" +color brightblue "\" +color brightblue "\" +color brightblue "\<(clang|gcc)-(fullversion|(major-|minor|micro-)version)\>" +### debugging +color brightblue "\" + +## Common commands used in ebuilds: +color blue "\<(awk|cat|cd|chmod|chown|cp|echo|env|find|e?grep|ln|make|mkdir|mv|popd|printf|pushd|rm|rmdir|sed|set|tar|touch|unset|xargs)\>" +## Comments (doesn't work that well): +color yellow "(^|[[:space:]])#.*" +## Strings (doesn't work that well): +color brightyellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'" +## Trailing space is bad! +color ,green "[[:space:]]+$" +## Mixed whitespace is also bad. +color ,green " " + + +syntax /etc/portage "\.(accept_keywords|env|keywords|mask|unmask|use)(/.+)?$" +comment "#" + +## Base text: +color green ".+" +## Likely version and slot numbers: +color magenta "-[[:digit:].]+(_(alpha|beta|pre|rc|p)[[:digit:]]*)*(-r[[:digit:]]+)?([:[:space:]]|$)" +color magenta ":[^[:space:]]+([[:space:]]|$)" +## Use flags (must come after version/slot): +color brightred "[[:space:]]+\+?[A-Za-z0-9+_@-]+" +color brightblue "[[:space:]]+-[A-Za-z0-9+_@-]+" +## Accepted arches: +color white "[~-]?\<(alpha|amd64|arm(64)?|hppa|ia64|loong|m68k|mips|ppc(64)?|riscv|s390|sparc|x86)(-(cygwin|linux|macos|solaris|winnt))?\>" +color white "[[:space:]][*~-]?\*" +## Categories: +color cyan "^[[:space:]]*[^/]*/" +## Masking regulators: +color brightmagenta "^[[:space:]]*(=|~|<|<=|>|>=)" +## Comments: +color yellow "#.*" +## Trailing space is bad! +color ,green "[[:space:]]+$" +## Mixed whitespace is also bad. +color ,green " " diff --git a/app-editors/nano/nano-6.4.ebuild b/app-editors/nano/nano-6.4.ebuild new file mode 100644 index 000000000000..1422c12825ff --- /dev/null +++ b/app-editors/nano/nano-6.4.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" + inherit autotools git-r3 +else + MY_P="${PN}-${PV/_}" + SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="GNU GPL'd Pico clone with more functionality" +HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide" + +LICENSE="GPL-3" +SLOT="0" +IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode" + +LIB_DEPEND=" + >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] + sys-libs/ncurses:=[static-libs(+)] + magic? ( sys-apps/file[static-libs(+)] ) + nls? ( virtual/libintl ) +" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) + virtual/pkgconfig +" + +REQUIRED_USE=" + magic? ( !minimal ) +" + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + fi +} + +src_configure() { + use static && append-ldflags -static + + local myconfargs=( + --bindir="${EPREFIX}"/bin + --htmldir=/trash + $(use_enable !minimal color) + $(use_enable !minimal multibuffer) + $(use_enable !minimal nanorc) + $(use_enable magic libmagic) + $(use_enable spell speller) + $(use_enable justify) + $(use_enable debug) + $(use_enable nls) + $(use_enable unicode utf8) + $(use_enable minimal tiny) + ) + + econf "${myconfargs[@]}" +} + +src_install() { + default + + # Don't use "${ED}" here or things break (#654534) + rm -r "${D}"/trash || die + + dodoc doc/sample.nanorc + docinto html + dodoc doc/faq.html + insinto /etc + newins doc/sample.nanorc nanorc + + if ! use minimal ; then + # Enable colorization by default. + sed -i \ + -e '/^# include /s:# *::' \ + "${ED}"/etc/nanorc || die + + # Since nano-5.0 these are no longer being "enabled" by default + # (bug #736848) + local rcdir="/usr/share/nano" + mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die + rmdir "${ED}"${rcdir}/extra || die + + insinto "${rcdir}" + newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc + fi + + use split-usr && dosym ../../bin/nano /usr/bin/nano +} + +pkg_postrm() { + [[ -n ${REPLACED_BY_VERSION} ]] && return + + local e + e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") + if [[ ${e##*/} == nano ]]; then + ewarn "The EDITOR variable is still set to ${e}." + ewarn "You can update it with \"eselect editor\"." + fi +} diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild index c2da47a585b9..1422c12825ff 100644 --- a/app-editors/nano/nano-9999.ebuild +++ b/app-editors/nano/nano-9999.ebuild @@ -4,13 +4,14 @@ EAPI=8 inherit flag-o-matic -if [[ ${PV} == "9999" ]] ; then + +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git" - inherit git-r3 autotools + inherit autotools git-r3 else MY_P="${PN}-${PV/_}" SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.xz" - 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 ~loong ~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" @@ -24,10 +25,13 @@ LIB_DEPEND=" >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) - nls? ( virtual/libintl )" + nls? ( virtual/libintl ) +" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND="${RDEPEND} - static? ( ${LIB_DEPEND} )" +DEPEND=" + ${RDEPEND} + static? ( ${LIB_DEPEND} ) +" BDEPEND=" nls? ( sys-devel/gettext ) virtual/pkgconfig @@ -39,14 +43,16 @@ REQUIRED_USE=" src_prepare() { default - if [[ ${PV} == "9999" ]] ; then + + if [[ ${PV} == 9999 ]] ; then eautoreconf fi } src_configure() { use static && append-ldflags -static - local myconf=( + + local myconfargs=( --bindir="${EPREFIX}"/bin --htmldir=/trash $(use_enable !minimal color) @@ -60,12 +66,14 @@ src_configure() { $(use_enable unicode utf8) $(use_enable minimal tiny) ) - econf "${myconf[@]}" + + econf "${myconfargs[@]}" } src_install() { default - # don't use "${ED}" here or things break (#654534) + + # Don't use "${ED}" here or things break (#654534) rm -r "${D}"/trash || die dodoc doc/sample.nanorc @@ -73,6 +81,7 @@ src_install() { dodoc doc/faq.html insinto /etc newins doc/sample.nanorc nanorc + if ! use minimal ; then # Enable colorization by default. sed -i \ @@ -86,15 +95,16 @@ src_install() { rmdir "${ED}"${rcdir}/extra || die insinto "${rcdir}" - doins "${FILESDIR}/gentoo.nanorc" + newins "${FILESDIR}/gentoo.nanorc-r1" gentoo.nanorc fi use split-usr && dosym ../../bin/nano /usr/bin/nano } pkg_postrm() { - local e [[ -n ${REPLACED_BY_VERSION} ]] && return + + local e e=$(unset EDITOR; . "${EROOT}"/etc/profile &>/dev/null; echo "${EDITOR}") if [[ ${e##*/} == nano ]]; then ewarn "The EDITOR variable is still set to ${e}." -- cgit v1.2.3