From: Justin Lecher <jlec@gentoo.org>
Date: Mon, 25 Jan 2016 07:53:34 +0000 (+0100)
Subject: app-emacs/pymacs: Properly remove version from python command
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e2643d7d16cf3d38cd125a2964feed3df78dca6;p=gentoo.git

app-emacs/pymacs: Properly remove version from python command

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec@gentoo.org>
---

diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index f928f5ea6cdb..1a14634c5b21 100644
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
-</maintainer>
-<upstream>
-  <remote-id type="github">pinard/Pymacs</remote-id>
-</upstream>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">pinard/Pymacs</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/pymacs/pymacs-0.25-r2.ebuild b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
index 15852acb6d49..1ff5ae5e018b 100644
--- a/app-emacs/pymacs/pymacs-0.25-r2.ebuild
+++ b/app-emacs/pymacs/pymacs-0.25-r2.ebuild
@@ -23,6 +23,13 @@ RDEPEND=""
 DISTUTILS_IN_SOURCE_BUILD=1
 SITEFILE="50${PN}-gentoo.el"
 
+python_prepare_all() {
+	sed \
+		-e '/pymacs-python-command/s/@PYTHON@/python/' \
+		-i pymacs.el.in || die
+	distutils-r1_python_prepare_all
+}
+
 # called by distutils-r1 for every python implementation
 python_configure() {
 	# pre-process the files but don't run distutils
@@ -40,11 +47,6 @@ python_compile_all() {
 python_install_all() {
 	elisp_src_install
 
-	sed \
-		-e '/pymacs-python-command/s:"python.*:"python":g' \
-		-i "${ED}"/${SITELISP}/pymacs/pymacs.el || die
-	elisp-compile "${ED}"/${SITELISP}/pymacs/pymacs.el
-
 	distutils-r1_python_install_all
 	dodoc pymacs.rst
 	use doc && dodoc pymacs.pdf