commit:     0e16641ce3de78542eb63e4442fbc124cbeb0a47
Author:     Filip Kobierski <fkobi <AT> fsfe <DOT> org>
AuthorDate: Sat Nov 22 12:26:53 2025 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Nov 22 22:06:01 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e16641c

app-emacs/org-mode: improve live ebuild

1. Add missing KEYWORDS
   - allows for copying 9999 for version bumps
2. Add src_configure
  - Configuration should be done in src_configure, not partially
  in src_prepare and partially in src_install
3. Use newer query function

Signed-off-by: Filip Kobierski <fkobi <AT> fsfe.org>
Part-of: https://github.com/gentoo/gentoo/pull/44726
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-emacs/org-mode/org-mode-9999.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app-emacs/org-mode/org-mode-9999.ebuild 
b/app-emacs/org-mode/org-mode-9999.ebuild
index 9ce0a3ef0fd9..62007b56c10c 100644
--- a/app-emacs/org-mode/org-mode-9999.ebuild
+++ b/app-emacs/org-mode/org-mode-9999.ebuild
@@ -20,7 +20,7 @@ else
        
SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz";
        S="${WORKDIR}/${MY_P}"
 
-       KEYWORDS="~amd64 ~ppc ~x86"
+       KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~riscv ~x86"
 fi
 
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
@@ -42,10 +42,16 @@ src_prepare() {
        # Remove failing tests.
        rm ./testing/lisp/test-{ob,ob-exp,ob-tangle,ob-shell,org-clock}.el \
                || die "failed to remove some test files"
+}
+
+src_configure() {
+       elisp_src_configure
+
+       use doc && DOCS+=( doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf )
 
        EMAKEARGS=(
                ORGVERSION="${PV}"
-               ETCDIRS="styles csl $(use odt-schema && echo schema)"
+               ETCDIRS="styles csl $(usev odt-schema schema)"
                lispdir="${EPREFIX}${SITELISP}/${PN}"
                datadir="${EPREFIX}${SITEETC}/${PN}"
                infodir="${EPREFIX}/usr/share/info"
@@ -68,10 +74,6 @@ src_test() {
 }
 
 src_install() {
-       if use doc ; then
-               DOCS+=( doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf )
-       fi
-
        emake -j1 "${EMAKEARGS[@]}" DESTDIR="${D}" install
        elisp-site-file-install "${FILESDIR}/${SITEFILE}"
        einstalldocs

Reply via email to