[gentoo-commits] repo/gentoo:master commit in: app-xemacs/ebuild-mode/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     7eab5531d6186d46c2597689b5e7a5f00b9ab0d9
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 19:04:31 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 22:52:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eab5531

app-xemacs/ebuild-mode: Inline functions from xemacs-elisp.eclass.

Acked-by: Mats Lidell <matsl <AT> gentoo.org>
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild | 23 +++++++++++++++++------
 app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild | 23 +++++++++++++++++------
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
index e65982b198e..9ed99b9368d 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit xemacs-elisp
-
 DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
 SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
@@ -15,11 +13,24 @@ KEYWORDS="amd64 hppa x86"
 
 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 
 src_compile() {
-	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
-	xemacs-elisp-make-autoload-file \
+	local XEMACS="${EPREFIX}/usr/bin/xemacs"
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(setq autoload-package-name \"${PN}\")" \
+		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
+		-l autoload -f batch-update-autoloads \
 		ebuild-mode.el gentoo-newsitem-mode.el || die
 }
+
+src_install() {
+	insinto /usr/share/xemacs/site-packages/lisp/${PN}
+	doins *.el *.elc
+}

diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild
index ad5a9ccad6d..d329637b970 100644
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit xemacs-elisp
-
 DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
 SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
@@ -15,11 +13,24 @@ KEYWORDS="~amd64 ~hppa ~x86"
 
 RDEPEND=">=app-editors/xemacs-21.4.20-r5
 	app-xemacs/sh-script"
-DEPEND="${RDEPEND}"
+BDEPEND="${RDEPEND}"
 
 src_compile() {
-	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
-		-f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
-	xemacs-elisp-make-autoload-file \
+	local XEMACS="${EPREFIX}/usr/bin/xemacs"
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+
+	"${XEMACS}" -batch -q --no-site-file \
+		-eval "(setq autoload-package-name \"${PN}\")" \
+		-eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \
+		-l autoload -f batch-update-autoloads \
 		ebuild-mode.el gentoo-newsitem-mode.el || die
 }
+
+src_install() {
+	insinto /usr/share/xemacs/site-packages/lisp/${PN}
+	doins *.el *.elc
+}