1 |
commit: d91658c607b4d4147e5c75c65b7f1baed5dd8776 |
2 |
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 20 13:41:30 2017 +0000 |
4 |
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 20 13:41:30 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91658c6 |
7 |
|
8 |
app-emacs/yc: update to EAPI 6 |
9 |
|
10 |
Gentoo-Bug: 621518 |
11 |
|
12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
13 |
|
14 |
app-emacs/yc/files/50yc-gentoo.el | 3 -- |
15 |
.../files/{sample.dot.emacs-4 => sample.dot.emacs} | 0 |
16 |
app-emacs/yc/metadata.xml | 16 ++++---- |
17 |
app-emacs/yc/yc-4.0.13.ebuild | 48 +++++++++++----------- |
18 |
4 files changed, 31 insertions(+), 36 deletions(-) |
19 |
|
20 |
diff --git a/app-emacs/yc/files/50yc-gentoo.el b/app-emacs/yc/files/50yc-gentoo.el |
21 |
index 33bd4a72a45..431f7e90ae7 100644 |
22 |
--- a/app-emacs/yc/files/50yc-gentoo.el |
23 |
+++ b/app-emacs/yc/files/50yc-gentoo.el |
24 |
@@ -1,4 +1 @@ |
25 |
- |
26 |
-;;; YC site-lisp configuration |
27 |
- |
28 |
(add-to-list 'load-path "@SITELISP@") |
29 |
|
30 |
diff --git a/app-emacs/yc/files/sample.dot.emacs-4 b/app-emacs/yc/files/sample.dot.emacs |
31 |
similarity index 100% |
32 |
rename from app-emacs/yc/files/sample.dot.emacs-4 |
33 |
rename to app-emacs/yc/files/sample.dot.emacs |
34 |
|
35 |
diff --git a/app-emacs/yc/metadata.xml b/app-emacs/yc/metadata.xml |
36 |
index 02fb2539160..2c9ca3c416d 100644 |
37 |
--- a/app-emacs/yc/metadata.xml |
38 |
+++ b/app-emacs/yc/metadata.xml |
39 |
@@ -1,12 +1,12 @@ |
40 |
<?xml version="1.0" encoding="UTF-8"?> |
41 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
42 |
<pkgmetadata> |
43 |
-<maintainer type="project"> |
44 |
- <email>gnu-emacs@g.o</email> |
45 |
- <name>Gentoo GNU Emacs project</name> |
46 |
-</maintainer> |
47 |
-<maintainer type="project"> |
48 |
- <email>cjk@g.o</email> |
49 |
- <name>Cjk</name> |
50 |
-</maintainer> |
51 |
+ <maintainer type="project"> |
52 |
+ <email>gnu-emacs@g.o</email> |
53 |
+ <name>Gentoo GNU Emacs project</name> |
54 |
+ </maintainer> |
55 |
+ <maintainer type="project"> |
56 |
+ <email>cjk@g.o</email> |
57 |
+ <name>Cjk</name> |
58 |
+ </maintainer> |
59 |
</pkgmetadata> |
60 |
|
61 |
diff --git a/app-emacs/yc/yc-4.0.13.ebuild b/app-emacs/yc/yc-4.0.13.ebuild |
62 |
index f2724d97396..a8179e6426b 100644 |
63 |
--- a/app-emacs/yc/yc-4.0.13.ebuild |
64 |
+++ b/app-emacs/yc/yc-4.0.13.ebuild |
65 |
@@ -1,7 +1,7 @@ |
66 |
-# Copyright 1999-2012 Gentoo Foundation |
67 |
+# Copyright 1999-2017 Gentoo Foundation |
68 |
# Distributed under the terms of the GNU General Public License v2 |
69 |
|
70 |
-EAPI=3 |
71 |
+EAPI="6" |
72 |
|
73 |
inherit elisp toolchain-funcs |
74 |
|
75 |
@@ -14,42 +14,40 @@ SLOT="0" |
76 |
KEYWORDS="alpha ~amd64 ppc x86" |
77 |
IUSE="" |
78 |
|
79 |
-DEPEND="" |
80 |
-RDEPEND=">=app-i18n/canna-3.6" |
81 |
+RDEPEND="app-i18n/canna" |
82 |
|
83 |
SITEFILE="50${PN}-gentoo.el" |
84 |
|
85 |
src_prepare() { |
86 |
- sed -e 's:$(CC) -o $(PROGRAM) $(OBJS):$(CC) ${CFLAGS} ${LDFLAGS} -o $(PROGRAM) $(OBJS):' -i Makefile || die |
87 |
+ sed -i '/$(CC)/s/ -o / $(CFLAGS) $(LDFLAGS) -o /' Makefile |
88 |
+ |
89 |
+ default |
90 |
} |
91 |
|
92 |
src_compile() { |
93 |
- emake CC="$(tc-getCC)" || die |
94 |
+ emake CC="$(tc-getCC)" |
95 |
} |
96 |
|
97 |
src_install() { |
98 |
- elisp-install ${PN} *.el *.elc || die |
99 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die |
100 |
- dobin icanna || die |
101 |
- newdoc "${FILESDIR}"/sample.dot.emacs-4 sample.dot.emacs || die |
102 |
- dodoc "${FILESDIR}"/sample.hosts.canna || die |
103 |
+ elisp_src_install |
104 |
+ |
105 |
+ dobin icanna |
106 |
+ dodoc "${FILESDIR}"/sample.{dot.emacs,hosts.canna} |
107 |
} |
108 |
|
109 |
pkg_postinst() { |
110 |
- elisp-site-regen |
111 |
- elog "See the sample.dot.emacs file in /usr/share/doc/${PF}/." |
112 |
+ elisp_pkg_postinst |
113 |
+ |
114 |
+ elog "See the sample.dot.emacs in ${EPREFIX}/usr/share/doc/${PF}." |
115 |
elog |
116 |
- elog "And If you use unix domain socket for connecting the canna server, " |
117 |
- elog " please confirm that there's *no* following line in your .emacs ." |
118 |
- elog " (setq yc-server-host \"localhost\")" |
119 |
+ elog "And If you use unix domain socket for connecting the canna server," |
120 |
+ elog "please confirm that there's *no* following line in your ~/.emacs:" |
121 |
+ elog ' (setq yc-server-host "localhost")' |
122 |
elog |
123 |
- elog "If you use inet domain socket for connecting the canna server, " |
124 |
- elog " please modify as following in /etc/conf.d/canna." |
125 |
- elog " CANNASERVER_OPTS=\"-inet\"" |
126 |
- elog " And create /etc/hosts.canna." |
127 |
- elog " (see the sample.hosts.canna file in /usr/share/doc/${PF}/)" |
128 |
-} |
129 |
- |
130 |
-pkg_postrm() { |
131 |
- elisp-site-regen |
132 |
+ elog "If you use inet domain socket for connecting the canna server," |
133 |
+ elog "please modify as following in ${EPREFIX}/etc/conf.d/canna:" |
134 |
+ elog ' CANNASERVER_OPTS="-inet"' |
135 |
+ elog |
136 |
+ elog "And create ${EPREFIX}/etc/hosts.canna." |
137 |
+ elog "See the sample.hosts.canna in ${EPREFIX}/usr/share/doc/${PF}." |
138 |
} |