summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-06-08 16:35:07 +0000
committerMike Gilbert <floppym@gentoo.org>2013-06-08 16:35:07 +0000
commitee2f6df0a6ca762a8bfac38608525bc013802dfc (patch)
treecd6a197aed7535bd6f23d126019ec30bc0d77f1d /dev-python/empy
parentFix installation of examples (diff)
downloadgentoo-2-ee2f6df0a6ca762a8bfac38608525bc013802dfc.tar.gz
gentoo-2-ee2f6df0a6ca762a8bfac38608525bc013802dfc.tar.bz2
gentoo-2-ee2f6df0a6ca762a8bfac38608525bc013802dfc.zip
Don't install em.py symlink in /usr/bin; this causes pythonpath conflicts.
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/empy')
-rw-r--r--dev-python/empy/ChangeLog5
-rw-r--r--dev-python/empy/empy-3.3-r1.ebuild10
2 files changed, 5 insertions, 10 deletions
diff --git a/dev-python/empy/ChangeLog b/dev-python/empy/ChangeLog
index 1a07883377d3..b500de32311d 100644
--- a/dev-python/empy/ChangeLog
+++ b/dev-python/empy/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/empy
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/ChangeLog,v 1.16 2013/06/08 16:03:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/ChangeLog,v 1.17 2013/06/08 16:35:07 floppym Exp $
+
+ 08 Jun 2013; Mike Gilbert <floppym@gentoo.org> empy-3.3-r1.ebuild:
+ Don't install em.py symlink in /usr/bin; this causes pythonpath conflicts.
*empy-3.3-r1 (08 Jun 2013)
diff --git a/dev-python/empy/empy-3.3-r1.ebuild b/dev-python/empy/empy-3.3-r1.ebuild
index 8f57b9c4e75f..b0c65e58582a 100644
--- a/dev-python/empy/empy-3.3-r1.ebuild
+++ b/dev-python/empy/empy-3.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.3-r1.ebuild,v 1.1 2013/06/08 16:03:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.3-r1.ebuild,v 1.2 2013/06/08 16:35:07 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
@@ -31,16 +31,8 @@ python_test() {
fi
}
-python_install() {
- distutils-r1_python_install
- python_export PYTHON_SITEDIR
- dosym "${PYTHON_SITEDIR}/em.py" /usr/bin/em.py-${EPYTHON}
-}
-
python_install_all() {
distutils-r1_python_install_all
- dosym python-exec /usr/bin/em.py
-
if use doc; then
dodir /usr/share/doc/"${PF}"/examples
insinto /usr/share/doc/"${PF}"/examples