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

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

diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild
index e65982b198ea94caf81caf38e734383ae9234714..9ed99b9368d94b6e77672440866de451649684c5 100644 (file)
--- 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 ad5a9ccad6d05dfd0ddf996660cea02c12eb9f1d..d329637b970d15b888ad50348d0e281a9cde7ad9 100644 (file)
--- 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
+}