1 |
commit: 1e2643d7d16cf3d38cd125a2964feed3df78dca6 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 25 07:53:34 2016 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 25 07:53:34 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2643d7 |
7 |
|
8 |
app-emacs/pymacs: Properly remove version from python command |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
app-emacs/pymacs/metadata.xml | 22 +++++++++++----------- |
14 |
app-emacs/pymacs/pymacs-0.25-r2.ebuild | 12 +++++++----- |
15 |
2 files changed, 18 insertions(+), 16 deletions(-) |
16 |
|
17 |
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml |
18 |
index f928f5e..1a14634 100644 |
19 |
--- a/app-emacs/pymacs/metadata.xml |
20 |
+++ b/app-emacs/pymacs/metadata.xml |
21 |
@@ -1,15 +1,15 @@ |
22 |
<?xml version="1.0" encoding="UTF-8"?> |
23 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
24 |
<pkgmetadata> |
25 |
-<maintainer type="project"> |
26 |
- <email>gnu-emacs@g.o</email> |
27 |
- <name>Gentoo GNU Emacs project</name> |
28 |
-</maintainer> |
29 |
-<maintainer type="project"> |
30 |
- <email>python@g.o</email> |
31 |
- <name>Python</name> |
32 |
-</maintainer> |
33 |
-<upstream> |
34 |
- <remote-id type="github">pinard/Pymacs</remote-id> |
35 |
-</upstream> |
36 |
+ <maintainer type="project"> |
37 |
+ <email>gnu-emacs@g.o</email> |
38 |
+ <name>Gentoo GNU Emacs project</name> |
39 |
+ </maintainer> |
40 |
+ <maintainer type="project"> |
41 |
+ <email>python@g.o</email> |
42 |
+ <name>Python</name> |
43 |
+ </maintainer> |
44 |
+ <upstream> |
45 |
+ <remote-id type="github">pinard/Pymacs</remote-id> |
46 |
+ </upstream> |
47 |
</pkgmetadata> |
48 |
|
49 |
diff --git a/app-emacs/pymacs/pymacs-0.25-r2.ebuild b/app-emacs/pymacs/pymacs-0.25-r2.ebuild |
50 |
index 15852ac..1ff5ae5 100644 |
51 |
--- a/app-emacs/pymacs/pymacs-0.25-r2.ebuild |
52 |
+++ b/app-emacs/pymacs/pymacs-0.25-r2.ebuild |
53 |
@@ -23,6 +23,13 @@ RDEPEND="" |
54 |
DISTUTILS_IN_SOURCE_BUILD=1 |
55 |
SITEFILE="50${PN}-gentoo.el" |
56 |
|
57 |
+python_prepare_all() { |
58 |
+ sed \ |
59 |
+ -e '/pymacs-python-command/s/@PYTHON@/python/' \ |
60 |
+ -i pymacs.el.in || die |
61 |
+ distutils-r1_python_prepare_all |
62 |
+} |
63 |
+ |
64 |
# called by distutils-r1 for every python implementation |
65 |
python_configure() { |
66 |
# pre-process the files but don't run distutils |
67 |
@@ -40,11 +47,6 @@ python_compile_all() { |
68 |
python_install_all() { |
69 |
elisp_src_install |
70 |
|
71 |
- sed \ |
72 |
- -e '/pymacs-python-command/s:"python.*:"python":g' \ |
73 |
- -i "${ED}"/${SITELISP}/pymacs/pymacs.el || die |
74 |
- elisp-compile "${ED}"/${SITELISP}/pymacs/pymacs.el |
75 |
- |
76 |
distutils-r1_python_install_all |
77 |
dodoc pymacs.rst |
78 |
use doc && dodoc pymacs.pdf |