[gentoo-commits] repo/gentoo:master commit in: app-emacs/cape/

[Maciej Barć]

commit:     82fc9160e97aebfc0f341215a27c7f799163174c
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 18:14:46 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 18:16:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82fc9160

app-emacs/cape: use elisp-org-export-to

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../cape/{cape-0.17.ebuild => cape-0.17-r1.ebuild} | 14 ++++++++----
 app-emacs/cape/cape-9999.ebuild                    | 25 +++++++++++-----------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app-emacs/cape/cape-0.17.ebuild 
b/app-emacs/cape/cape-0.17-r1.ebuild
similarity index 77%
rename from app-emacs/cape/cape-0.17.ebuild
rename to app-emacs/cape/cape-0.17-r1.ebuild
index 16b63bbdfda8..42896ab1f608 100644
--- a/app-emacs/cape/cape-0.17.ebuild
+++ b/app-emacs/cape/cape-0.17-r1.ebuild
@@ -22,13 +22,19 @@ fi
 LICENSE="GPL-3+"
 SLOT="0"
 
-RDEPEND=">=app-emacs/compat-29.1.4.0"
-DEPEND="${RDEPEND}"
+RDEPEND="
+       >=app-emacs/compat-29.1.4.0
+"
+DEPEND="
+       ${RDEPEND}
+"
 
 DOCS=( CHANGELOG.org README.org )
+ELISP_TEXINFO="${PN}.texi"
 SITEFILE="50${PN}-gentoo.el"
 
-src_install() {
+src_compile() {
+       elisp-org-export-to texinfo README.org
+       elisp_src_compile
        elisp-make-autoload-file
-       elisp_src_install
 }

diff --git a/app-emacs/cape/cape-9999.ebuild b/app-emacs/cape/cape-9999.ebuild
index f7f6e19f558b..42896ab1f608 100644
--- a/app-emacs/cape/cape-9999.ebuild
+++ b/app-emacs/cape/cape-9999.ebuild
@@ -4,19 +4,19 @@
 EAPI=8
 
 NEED_EMACS=27.1
+
 inherit elisp
 
 DESCRIPTION="Completion At Point Extensions"
-HOMEPAGE="https://github.com/minad/cape";
+HOMEPAGE="https://github.com/minad/cape/";
 
 if [[ ${PV} == 9999 ]]; then
        inherit git-r3
-       EGIT_REPO_URI="https://github.com/minad/cape.git";
+       EGIT_REPO_URI="https://github.com/minad/${PN}.git";
 else
-       # Recompressed from ELPA.
-       SRC_URI="https://dev.gentoo.org/~arsen/${P}.tar.xz";
+       SRC_URI="https://github.com/minad/${PN}/archive/refs/tags/${PV}.tar.gz
+               -> ${P}.tar.gz"
        KEYWORDS="~amd64"
-       ELISP_REMOVE="${PN}-pkg.el"
 fi
 
 LICENSE="GPL-3+"
@@ -25,15 +25,16 @@ SLOT="0"
 RDEPEND="
        >=app-emacs/compat-29.1.4.0
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+       ${RDEPEND}
+"
 
+DOCS=( CHANGELOG.org README.org )
+ELISP_TEXINFO="${PN}.texi"
 SITEFILE="50${PN}-gentoo.el"
 
-src_install() {
+src_compile() {
+       elisp-org-export-to texinfo README.org
+       elisp_src_compile
        elisp-make-autoload-file
-       elisp_src_install
-
-       if [[ ${PV} != 9999 ]]; then
-               doinfo cape.info
-       fi
 }