1 |
commit: dd486c071062789d2c715380150b04591912c085 |
2 |
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 8 16:09:23 2022 +0000 |
4 |
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 8 16:10:12 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd486c07 |
7 |
|
8 |
app-emacs/yasnippet-snippets: install el library files |
9 |
|
10 |
some libraries want to acess "yasnippet-snippets--fixed-indent" or |
11 |
"yasnippet-snippets-initialize", so let's install the missing |
12 |
"yasnippet-snippets.el" files providing those functions, also change |
13 |
how site-gentoo autoloads are handled - call |
14 |
"yasnippet-snippets-initialize" |
15 |
|
16 |
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> |
17 |
|
18 |
.../files/50yasnippet-snippets-gentoo.el | 9 ++++---- |
19 |
.../files/yasnippet-snippets-dir.patch | 18 +++++++++++++++ |
20 |
...-r1.ebuild => yasnippet-snippets-0.3-r1.ebuild} | 16 ++++++++++--- |
21 |
...0.3.ebuild => yasnippet-snippets-1.0-r2.ebuild} | 26 +++++++++++++++++----- |
22 |
4 files changed, 56 insertions(+), 13 deletions(-) |
23 |
|
24 |
diff --git a/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el |
25 |
index 2db51796990b..4c85ffac5510 100644 |
26 |
--- a/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el |
27 |
+++ b/app-emacs/yasnippet-snippets/files/50yasnippet-snippets-gentoo.el |
28 |
@@ -1,4 +1,5 @@ |
29 |
-(eval-after-load "yasnippet" |
30 |
- '(let ((snippets-dir "@SITEETC@")) |
31 |
- (add-to-list 'yas-snippet-dirs snippets-dir t) |
32 |
- (yas-load-directory snippets-dir t))) |
33 |
+(add-to-list 'load-path "@SITELISP@") |
34 |
+(autoload 'yasnippet-snippets-initialize "yasnippet-snippets" |
35 |
+ "Load the `yasnippet-snippets' snippets directory." t) |
36 |
+(eval-after-load 'yasnippet |
37 |
+ '(yasnippet-snippets-initialize)) |
38 |
|
39 |
diff --git a/app-emacs/yasnippet-snippets/files/yasnippet-snippets-dir.patch b/app-emacs/yasnippet-snippets/files/yasnippet-snippets-dir.patch |
40 |
new file mode 100644 |
41 |
index 000000000000..2d5c8f2e483b |
42 |
--- /dev/null |
43 |
+++ b/app-emacs/yasnippet-snippets/files/yasnippet-snippets-dir.patch |
44 |
@@ -0,0 +1,18 @@ |
45 |
+index 078ac04..1c84318 100644 |
46 |
+--- a/yasnippet-snippets.el |
47 |
++++ b/yasnippet-snippets.el |
48 |
+@@ -35,13 +35,7 @@ |
49 |
+ (defconst yasnippet-snippets-dir |
50 |
+ (expand-file-name |
51 |
+ "snippets" |
52 |
+- (file-name-directory |
53 |
+- ;; Copied from ‘f-this-file’ from f.el. |
54 |
+- (cond |
55 |
+- (load-in-progress load-file-name) |
56 |
+- ((and (boundp 'byte-compile-current-file) byte-compile-current-file) |
57 |
+- byte-compile-current-file) |
58 |
+- (:else (buffer-file-name)))))) |
59 |
++ "@SITEETC@")) |
60 |
+ |
61 |
+ ;;;###autoload |
62 |
+ (defun yasnippet-snippets-initialize () |
63 |
|
64 |
diff --git a/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r1.ebuild b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3-r1.ebuild |
65 |
similarity index 74% |
66 |
rename from app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r1.ebuild |
67 |
rename to app-emacs/yasnippet-snippets/yasnippet-snippets-0.3-r1.ebuild |
68 |
index 3b465cd3954b..e1d0818702d5 100644 |
69 |
--- a/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r1.ebuild |
70 |
+++ b/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3-r1.ebuild |
71 |
@@ -16,16 +16,26 @@ KEYWORDS="~amd64 ~x86" |
72 |
RDEPEND="app-emacs/yasnippet" |
73 |
BDEPEND="${RDEPEND}" |
74 |
|
75 |
+DOCS=( README.md ) |
76 |
+PATCHES=( "${FILESDIR}"/${PN}-dir.patch ) |
77 |
SITEFILE="50${PN}-gentoo.el" |
78 |
|
79 |
+src_prepare() { |
80 |
+ elisp_src_prepare |
81 |
+ |
82 |
+ sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die |
83 |
+} |
84 |
+ |
85 |
src_compile() { |
86 |
+ elisp_src_compile |
87 |
+ |
88 |
${EMACS} ${EMACSFLAGS} --eval "(require 'yasnippet)" \ |
89 |
--eval "(yas-compile-directory \"${S}/snippets\")" || die |
90 |
} |
91 |
|
92 |
src_install() { |
93 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
94 |
+ elisp_src_install |
95 |
+ |
96 |
insinto "${SITEETC}/${PN}" |
97 |
- doins -r snippets/. |
98 |
- dodoc README.md |
99 |
+ doins -r snippets |
100 |
} |
101 |
|
102 |
diff --git a/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild b/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r2.ebuild |
103 |
similarity index 51% |
104 |
rename from app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild |
105 |
rename to app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r2.ebuild |
106 |
index 693935e3fecf..e1d0818702d5 100644 |
107 |
--- a/app-emacs/yasnippet-snippets/yasnippet-snippets-0.3.ebuild |
108 |
+++ b/app-emacs/yasnippet-snippets/yasnippet-snippets-1.0-r2.ebuild |
109 |
@@ -1,7 +1,7 @@ |
110 |
-# Copyright 1999-2018 Gentoo Foundation |
111 |
+# Copyright 1999-2022 Gentoo Authors |
112 |
# Distributed under the terms of the GNU General Public License v2 |
113 |
|
114 |
-EAPI=7 |
115 |
+EAPI=8 |
116 |
|
117 |
inherit elisp |
118 |
|
119 |
@@ -14,14 +14,28 @@ SLOT="0" |
120 |
KEYWORDS="~amd64 ~x86" |
121 |
|
122 |
RDEPEND="app-emacs/yasnippet" |
123 |
+BDEPEND="${RDEPEND}" |
124 |
|
125 |
+DOCS=( README.md ) |
126 |
+PATCHES=( "${FILESDIR}"/${PN}-dir.patch ) |
127 |
SITEFILE="50${PN}-gentoo.el" |
128 |
|
129 |
-src_compile() { :; } |
130 |
+src_prepare() { |
131 |
+ elisp_src_prepare |
132 |
+ |
133 |
+ sed "s|@SITEETC@|${EPREFIX}${SITEETC}/${PN}|" -i ${PN}.el || die |
134 |
+} |
135 |
+ |
136 |
+src_compile() { |
137 |
+ elisp_src_compile |
138 |
+ |
139 |
+ ${EMACS} ${EMACSFLAGS} --eval "(require 'yasnippet)" \ |
140 |
+ --eval "(yas-compile-directory \"${S}/snippets\")" || die |
141 |
+} |
142 |
|
143 |
src_install() { |
144 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
145 |
+ elisp_src_install |
146 |
+ |
147 |
insinto "${SITEETC}/${PN}" |
148 |
- doins -r snippets/. |
149 |
- dodoc README.md |
150 |
+ doins -r snippets |
151 |
} |