Skip to content

Commit

Permalink
app-emacs/pymacs: Properly remove version from python command
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <[email protected]>
  • Loading branch information
jlec committed Jan 25, 2016
1 parent 7a89ba5 commit 1e2643d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
22 changes: 11 additions & 11 deletions app-emacs/pymacs/metadata.xml
Original file line number Diff line number Diff line change
@@ -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>[email protected]</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
<maintainer type="project">
<email>[email protected]</email>
<name>Python</name>
</maintainer>
<upstream>
<remote-id type="github">pinard/Pymacs</remote-id>
</upstream>
<maintainer type="project">
<email>[email protected]</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
<maintainer type="project">
<email>[email protected]</email>
<name>Python</name>
</maintainer>
<upstream>
<remote-id type="github">pinard/Pymacs</remote-id>
</upstream>
</pkgmetadata>
12 changes: 7 additions & 5 deletions app-emacs/pymacs/pymacs-0.25-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 1e2643d

Please sign in to comment.