From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-859582-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 628C258973
for <garchives@archives.gentoo.org>; Mon, 25 Jan 2016 08:31:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DB3F821C039;
Mon, 25 Jan 2016 08:31:08 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 19F5321C039
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jan 2016 08:31:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 4C82234094F
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jan 2016 08:31:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 44B8D10BF
for <gentoo-commits@lists.gentoo.org>; Mon, 25 Jan 2016 08:31:02 +0000 (UTC)
From: "Justin Lecher" <jlec@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" <jlec@gentoo.org>
Message-ID: <1453708414.1e2643d7d16cf3d38cd125a2964feed3df78dca6.jlec@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/pymacs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emacs/pymacs/metadata.xml app-emacs/pymacs/pymacs-0.25-r2.ebuild
X-VCS-Directories: app-emacs/pymacs/
X-VCS-Committer: jlec
X-VCS-Committer-Name: Justin Lecher
X-VCS-Revision: 1e2643d7d16cf3d38cd125a2964feed3df78dca6
X-VCS-Branch: master
Date: Mon, 25 Jan 2016 08:31:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a2f43ca8-3bff-49b2-a722-37fccc228c0c
X-Archives-Hash: d7d828b276fe7bce6e534904df72b38c
commit: 1e2643d7d16cf3d38cd125a2964feed3df78dca6
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 07:53:34 2016 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 07:53:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2643d7
app-emacs/pymacs: Properly remove version from python command
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
app-emacs/pymacs/metadata.xml | 22 +++++++++++-----------
app-emacs/pymacs/pymacs-0.25-r2.ebuild | 12 +++++++-----
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index f928f5e..1a14634 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 15852ac..1ff5ae5 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