[gentoo-commits] repo/proj/emacs:master commit in: app-emacs/org-mode/

[Ulrich Müller]

commit:     d68b3e97b247dd9b0805c29fc6c4cdc9ca2a97f8
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 13 06:24:55 2021 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 13 06:24:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/emacs.git/commit/?id=d68b3e97

app-emacs/org-mode: Sync ebuild from Gentoo repository

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-emacs/org-mode/org-mode-9999.ebuild | 36 +++++++++++++++++----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/app-emacs/org-mode/org-mode-9999.ebuild 
b/app-emacs/org-mode/org-mode-9999.ebuild
index 9f05c29..aa1dee5 100644
--- a/app-emacs/org-mode/org-mode-9999.ebuild
+++ b/app-emacs/org-mode/org-mode-9999.ebuild
@@ -1,33 +1,31 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+NEED_EMACS=24
 
-inherit elisp
+inherit elisp readme.gentoo-r1
 
-if [[ ${PV} = 9999 ]]; then
-       EGIT_REPO_URI="git://orgmode.org/org-mode.git"
+if [[ ${PV} == 9999 ]]; then
+       EGIT_REPO_URI="https://code.orgmode.org/bzg/org-mode.git";
        EGIT_CHECKOUT_DIR="${WORKDIR}/org"
        inherit git-r3
        S="${WORKDIR}/org"
 else
-       SRC_URI="http://orgmode.org/org-${PV}.tar.gz";
+       SRC_URI="https://orgmode.org/org-${PV}.tar.gz";
        S="${WORKDIR}/org-${PV}"
 fi
 
 DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="http://www.orgmode.org/";
+HOMEPAGE="https://www.orgmode.org/";
 
 LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
 SLOT="0"
+KEYWORDS="amd64 ppc x86"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
-DEPEND="doc? ( virtual/texi2dvi )"
-if [[ ${PV} = 9999 ]]; then
-       DEPEND="${DEPEND}
-               dev-lang/perl"
-fi
+BDEPEND="doc? ( virtual/texi2dvi )"
 
 SITEFILE="50${PN}-gentoo.el"
 
@@ -45,12 +43,11 @@ src_install() {
                infodir="${EPREFIX}/usr/share/info" \
                install
 
-       cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}"
+       cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
 
        if use contrib; then
                elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-               insinto /usr/share/doc/${PF}/contrib
-               doins -r contrib/README contrib/scripts
+               ( docinto contrib; dodoc -r contrib/README contrib/scripts )
                find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
                        -exec rm -f '{}' '+'
                # add the contrib subdirectory to load-path
@@ -59,7 +56,12 @@ src_install() {
        fi
 
        elisp-site-file-install "${T}/${SITEFILE}"
-       dodoc README doc/library-of-babel.org etc/ORG-NEWS
-       [[ ${PV} = 9999 ]] || dodoc doc/orgcard.txt
+       dodoc README etc/ORG-NEWS
        use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+       DOC_CONTENTS="Org mode has a large variety of run-time dependencies,
+               so you may have to install one or more additional packages.
+               A non-exhaustive list of these dependencies may be found at
+               <http://orgmode.org/worg/org-dependencies.html>."
+       readme.gentoo_create_doc
 }