summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-08-26 01:32:52 +0000
committerMike Gilbert <floppym@gentoo.org>2013-08-26 01:32:52 +0000
commit8741e0f104635f5c5e5413d6a2af2dfe8c25b4ff (patch)
tree5a2b14d93df932653181cb4ef3edc0c85c250ff7 /dev-python/twisted-core
parentRemove stale documentation reference #482118 (diff)
downloadgentoo-2-8741e0f104635f5c5e5413d6a2af2dfe8c25b4ff.tar.gz
gentoo-2-8741e0f104635f5c5e5413d6a2af2dfe8c25b4ff.tar.bz2
gentoo-2-8741e0f104635f5c5e5413d6a2af2dfe8c25b4ff.zip
Make previous change PyPy-compatible.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/twisted-core')
-rw-r--r--dev-python/twisted-core/ChangeLog5
-rw-r--r--dev-python/twisted-core/twisted-core-13.0.0-r2.ebuild7
2 files changed, 8 insertions, 4 deletions
diff --git a/dev-python/twisted-core/ChangeLog b/dev-python/twisted-core/ChangeLog
index 739749d73e91..8169e316f54f 100644
--- a/dev-python/twisted-core/ChangeLog
+++ b/dev-python/twisted-core/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/twisted-core
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/ChangeLog,v 1.6 2013/08/26 00:43:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/ChangeLog,v 1.7 2013/08/26 01:32:52 floppym Exp $
+
+ 26 Aug 2013; Mike Gilbert <floppym@gentoo.org> twisted-core-13.0.0-r2.ebuild:
+ Make previous change PyPy-compatible.
*twisted-core-13.0.0-r2 (26 Aug 2013)
diff --git a/dev-python/twisted-core/twisted-core-13.0.0-r2.ebuild b/dev-python/twisted-core/twisted-core-13.0.0-r2.ebuild
index 0850b5e93d9f..8f4790ff04e3 100644
--- a/dev-python/twisted-core/twisted-core-13.0.0-r2.ebuild
+++ b/dev-python/twisted-core/twisted-core-13.0.0-r2.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/twisted-core/twisted-core-13.0.0-r2.ebuild,v 1.2 2013/08/26 01:10:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-core/twisted-core-13.0.0-r2.ebuild,v 1.3 2013/08/26 01:32:52 floppym Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -92,8 +92,9 @@ python_install() {
local PYTHON_SITEDIR
python_export PYTHON_SITEDIR
- # Bug 299736, needs adjustment if pypy is added to PYTHON_COMPAT
- touch "${D%/}${PYTHON_SITEDIR}/Twisted-${PV}-py${EPYTHON#python}.egg-info"
+ # Bug 299736
+ local pyver=$("${PYTHON}" -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+ touch "${D%/}${PYTHON_SITEDIR}/Twisted-${PV}-py${pyver}.egg-info"
# own the dropin.cache so we don't leave orphans
touch "${D%/}${PYTHON_SITEDIR}/twisted/plugins/dropin.cache" || die