| 1 |
commit: 7eab5531d6186d46c2597689b5e7a5f00b9ab0d9 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 14 19:04:31 2019 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 14 22:52:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7eab5531 |
| 7 |
|
| 8 |
app-xemacs/ebuild-mode: Inline functions from xemacs-elisp.eclass. |
| 9 |
|
| 10 |
Acked-by: Mats Lidell <matsl <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.81, Repoman-2.3.20 |
| 12 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 13 |
|
| 14 |
app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild | 23 +++++++++++++++++------ |
| 15 |
app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild | 23 +++++++++++++++++------ |
| 16 |
2 files changed, 34 insertions(+), 12 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild |
| 19 |
index e65982b198e..9ed99b9368d 100644 |
| 20 |
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild |
| 21 |
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.47.ebuild |
| 22 |
@@ -3,8 +3,6 @@ |
| 23 |
|
| 24 |
EAPI=7 |
| 25 |
|
| 26 |
-inherit xemacs-elisp |
| 27 |
- |
| 28 |
DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files" |
| 29 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs" |
| 30 |
SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz" |
| 31 |
@@ -15,11 +13,24 @@ KEYWORDS="amd64 hppa x86" |
| 32 |
|
| 33 |
RDEPEND=">=app-editors/xemacs-21.4.20-r5 |
| 34 |
app-xemacs/sh-script" |
| 35 |
-DEPEND="${RDEPEND}" |
| 36 |
+BDEPEND="${RDEPEND}" |
| 37 |
|
| 38 |
src_compile() { |
| 39 |
- ${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \ |
| 40 |
- -f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die |
| 41 |
- xemacs-elisp-make-autoload-file \ |
| 42 |
+ local XEMACS="${EPREFIX}/usr/bin/xemacs" |
| 43 |
+ |
| 44 |
+ "${XEMACS}" -batch -q --no-site-file \ |
| 45 |
+ -eval "(add-to-list 'load-path \".\")" \ |
| 46 |
+ -f batch-byte-compile \ |
| 47 |
+ ebuild-mode.el gentoo-newsitem-mode.el || die |
| 48 |
+ |
| 49 |
+ "${XEMACS}" -batch -q --no-site-file \ |
| 50 |
+ -eval "(setq autoload-package-name \"${PN}\")" \ |
| 51 |
+ -eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \ |
| 52 |
+ -l autoload -f batch-update-autoloads \ |
| 53 |
ebuild-mode.el gentoo-newsitem-mode.el || die |
| 54 |
} |
| 55 |
+ |
| 56 |
+src_install() { |
| 57 |
+ insinto /usr/share/xemacs/site-packages/lisp/${PN} |
| 58 |
+ doins *.el *.elc |
| 59 |
+} |
| 60 |
|
| 61 |
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild |
| 62 |
index ad5a9ccad6d..d329637b970 100644 |
| 63 |
--- a/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild |
| 64 |
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.48.ebuild |
| 65 |
@@ -3,8 +3,6 @@ |
| 66 |
|
| 67 |
EAPI=7 |
| 68 |
|
| 69 |
-inherit xemacs-elisp |
| 70 |
- |
| 71 |
DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files" |
| 72 |
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs" |
| 73 |
SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz" |
| 74 |
@@ -15,11 +13,24 @@ KEYWORDS="~amd64 ~hppa ~x86" |
| 75 |
|
| 76 |
RDEPEND=">=app-editors/xemacs-21.4.20-r5 |
| 77 |
app-xemacs/sh-script" |
| 78 |
-DEPEND="${RDEPEND}" |
| 79 |
+BDEPEND="${RDEPEND}" |
| 80 |
|
| 81 |
src_compile() { |
| 82 |
- ${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \ |
| 83 |
- -f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die |
| 84 |
- xemacs-elisp-make-autoload-file \ |
| 85 |
+ local XEMACS="${EPREFIX}/usr/bin/xemacs" |
| 86 |
+ |
| 87 |
+ "${XEMACS}" -batch -q --no-site-file \ |
| 88 |
+ -eval "(add-to-list 'load-path \".\")" \ |
| 89 |
+ -f batch-byte-compile \ |
| 90 |
+ ebuild-mode.el gentoo-newsitem-mode.el || die |
| 91 |
+ |
| 92 |
+ "${XEMACS}" -batch -q --no-site-file \ |
| 93 |
+ -eval "(setq autoload-package-name \"${PN}\")" \ |
| 94 |
+ -eval "(setq generated-autoload-file \"${S}/auto-autoloads.el\")" \ |
| 95 |
+ -l autoload -f batch-update-autoloads \ |
| 96 |
ebuild-mode.el gentoo-newsitem-mode.el || die |
| 97 |
} |
| 98 |
+ |
| 99 |
+src_install() { |
| 100 |
+ insinto /usr/share/xemacs/site-packages/lisp/${PN} |
| 101 |
+ doins *.el *.elc |
| 102 |
+} |
Archives