Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 716856 Details for
Bug 716334
app-editors/emacs needs install-time dependency on app-eselect/eselect-emacs
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fix.patch
0001-app-editors-emacs-EAPI-8.patch (text/plain), 17.57 KB, created by
David Michael
on 2021-06-19 15:18:44 UTC
(
hide
)
Description:
fix.patch
Filename:
MIME Type:
Creator:
David Michael
Created:
2021-06-19 15:18:44 UTC
Size:
17.57 KB
patch
obsolete
>From 1760f8b3fa7a25f7171e4eda114dc6161c6cf2da Mon Sep 17 00:00:00 2001 >From: David Michael <fedora.dm0@gmail.com> >Date: Sat, 19 Jun 2021 11:11:20 -0400 >Subject: [PATCH] app-editors/emacs: EAPI 8 > >Closes: https://bugs.gentoo.org/716334 >Package-Manager: Portage-3.0.20, Repoman-3.0.2 >Signed-off-by: David Michael <fedora.dm0@gmail.com> >--- > app-editors/emacs/emacs-27.2-r2.ebuild | 448 +++++++++++++++++++++++ > app-editors/emacs/emacs-27.2.9999.ebuild | 14 +- > app-editors/emacs/emacs-28.0.9999.ebuild | 12 +- > 3 files changed, 462 insertions(+), 12 deletions(-) > create mode 100644 app-editors/emacs/emacs-27.2-r2.ebuild > >diff --git a/app-editors/emacs/emacs-27.2-r2.ebuild b/app-editors/emacs/emacs-27.2-r2.ebuild >new file mode 100644 >index 00000000000..560d70184a1 >--- /dev/null >+++ b/app-editors/emacs/emacs-27.2-r2.ebuild >@@ -0,0 +1,448 @@ >+# 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-27" >+ EGIT_CHECKOUT_DIR="${WORKDIR}/emacs" >+ S="${EGIT_CHECKOUT_DIR}" >+ SLOT="${PV%%.*}-vcs" >+else >+ # FULL_VERSION keeps the full version number, which is needed in >+ # order to determine some path information correctly for copy/move >+ # operations later on >+ FULL_VERSION="${PV%%_*}" >+ SRC_URI="mirror://gnu/emacs/${P}.tar.xz" >+ S="${WORKDIR}/emacs-${FULL_VERSION}" >+ # PV can be in any of the following formats: >+ # 27.1 released version (slot 27) >+ # 27.1_rc1 upstream release candidate (27) >+ # 27.0.9999 live ebuild (slot 27-vcs) >+ # 27.0.90 upstream prerelease snapshot (27-vcs) >+ # 27.0.50_pre20191223 snapshot by Gentoo developer (27-vcs) >+ if [[ ${PV} == *_pre* ]]; then >+ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz" >+ S="${WORKDIR}/emacs" >+ elif [[ ${PV//[0-9]} != "." ]]; then >+ SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz" >+ fi >+ # Patchset from proj/emacs-patches.git >+ SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz" >+ PATCHES=("${WORKDIR}/patch") >+ SLOT="${PV%%.*}" >+ [[ ${PV} == *.*.* ]] && SLOT+="-vcs" >+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" >+fi >+ >+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" >+HOMEPAGE="https://www.gnu.org/software/emacs/" >+ >+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" >+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib" >+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 ) ) >+ 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 )" >+ >+RDEPEND="${RDEPEND} >+ !app-editors/emacs-vcs:27" >+ >+IDEPEND="app-eselect/eselect-emacs" >+ >+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 >+ >+ 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" >+ 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 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}.appdata.xml || die >+ >+ # move info dir to avoid collisions with the dir file generated by portage >+ mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die >+ 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)" || 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 >+ if has_version -b app-eselect/eselect-emacs; then >+ eselect emacs update ifunset >+ fi >+} >diff --git a/app-editors/emacs/emacs-27.2.9999.ebuild b/app-editors/emacs/emacs-27.2.9999.ebuild >index 7089e4a9a73..2a9d4a722a1 100644 >--- a/app-editors/emacs/emacs-27.2.9999.ebuild >+++ b/app-editors/emacs/emacs-27.2.9999.ebuild >@@ -1,7 +1,7 @@ > # Copyright 1999-2021 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > >-EAPI=7 >+EAPI=8 > > inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs > >@@ -125,14 +125,14 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] > DEPEND="${RDEPEND} > gui? ( !aqua? ( x11-base/xorg-proto ) )" > >-BDEPEND="app-eselect/eselect-emacs >- sys-apps/texinfo >+BDEPEND="sys-apps/texinfo > virtual/pkgconfig > gzip-el? ( app-arch/gzip )" > > RDEPEND="${RDEPEND} >- !app-editors/emacs-vcs:27 >- app-eselect/eselect-emacs" >+ !app-editors/emacs-vcs:27" >+ >+IDEPEND="app-eselect/eselect-emacs" > > EMACS_SUFFIX="emacs-${SLOT}" > SITEFILE="20${EMACS_SUFFIX}-gentoo.el" >@@ -439,5 +439,7 @@ pkg_postinst() { > > pkg_postrm() { > elisp-site-regen >- eselect emacs update ifunset >+ if has_version -b app-eselect/eselect-emacs; then >+ eselect emacs update ifunset >+ fi > } >diff --git a/app-editors/emacs/emacs-28.0.9999.ebuild b/app-editors/emacs/emacs-28.0.9999.ebuild >index aeefea10ed8..6d5ba4dfe89 100644 >--- a/app-editors/emacs/emacs-28.0.9999.ebuild >+++ b/app-editors/emacs/emacs-28.0.9999.ebuild >@@ -1,7 +1,7 @@ > # Copyright 1999-2021 Gentoo Authors > # Distributed under the terms of the GNU General Public License v2 > >-EAPI=7 >+EAPI=8 > > inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs > >@@ -118,13 +118,11 @@ RDEPEND="app-emacs/emacs-common[games?,gui(-)?] > DEPEND="${RDEPEND} > gui? ( !aqua? ( x11-base/xorg-proto ) )" > >-BDEPEND="app-eselect/eselect-emacs >- sys-apps/texinfo >+BDEPEND="sys-apps/texinfo > virtual/pkgconfig > gzip-el? ( app-arch/gzip )" > >-RDEPEND="${RDEPEND} >- app-eselect/eselect-emacs" >+IDEPEND="app-eselect/eselect-emacs" > > EMACS_SUFFIX="emacs-${SLOT}" > SITEFILE="20${EMACS_SUFFIX}-gentoo.el" >@@ -429,5 +427,7 @@ pkg_postinst() { > > pkg_postrm() { > elisp-site-regen >- eselect emacs update ifunset >+ if has_version -b app-eselect/eselect-emacs; then >+ eselect emacs update ifunset >+ fi > } >-- >2.31.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 716334
:
715881
| 716856