summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2013-01-18 23:10:21 +0000
committerPatrick McLean <chutzpah@gentoo.org>2013-01-18 23:10:21 +0000
commit5f2c88940560938f6a90aab6b15e29912cb86d7e (patch)
tree24b40488661cc3f6e257390b553aea8179ab3171 /dev-python/pyinotify
parentFix regression introduced by Sergey Popov in version bump unauthorized by Arf... (diff)
downloadgentoo-2-5f2c88940560938f6a90aab6b15e29912cb86d7e.tar.gz
gentoo-2-5f2c88940560938f6a90aab6b15e29912cb86d7e.tar.bz2
gentoo-2-5f2c88940560938f6a90aab6b15e29912cb86d7e.zip
Add python-3.3 to PYTHON_TARGETS with a patch to work around bug #438070 (works around bug #364877).
(Portage version: 2.1.11.42/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)
Diffstat (limited to 'dev-python/pyinotify')
-rw-r--r--dev-python/pyinotify/ChangeLog10
-rw-r--r--dev-python/pyinotify/files/pyinotify-0.9.4-workaround-sandbox-bug.patch34
-rw-r--r--dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild11
3 files changed, 50 insertions, 5 deletions
diff --git a/dev-python/pyinotify/ChangeLog b/dev-python/pyinotify/ChangeLog
index a665c6054084..c0295617a74b 100644
--- a/dev-python/pyinotify/ChangeLog
+++ b/dev-python/pyinotify/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/pyinotify
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/ChangeLog,v 1.49 2012/12/22 20:29:42 mgorny Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/ChangeLog,v 1.50 2013/01/18 23:10:21 chutzpah Exp $
+
+ 18 Jan 2013; Patrick McLean <chutzpah@gentoo.org>
+ +files/pyinotify-0.9.4-workaround-sandbox-bug.patch,
+ pyinotify-0.9.4-r1.ebuild:
+ Add python-3.3 to PYTHON_TARGETS with a patch to work around bug #438070
+ (works around bug #364877).
*pyinotify-0.9.4-r1 (22 Dec 2012)
diff --git a/dev-python/pyinotify/files/pyinotify-0.9.4-workaround-sandbox-bug.patch b/dev-python/pyinotify/files/pyinotify-0.9.4-workaround-sandbox-bug.patch
new file mode 100644
index 000000000000..c19eac1f3e4a
--- /dev/null
+++ b/dev-python/pyinotify/files/pyinotify-0.9.4-workaround-sandbox-bug.patch
@@ -0,0 +1,34 @@
+diff --git a/setup.py b/setup.py
+index c318749..f0a1884 100755
+--- a/setup.py
++++ b/setup.py
+@@ -61,14 +61,25 @@ else:
+
+ def should_compile_ext_mod():
+ try:
+- import ctypes
+- import ctypes.util
+- except:
++ if sys.hexversion >= 0x03030000:
++ from unittest.mock import patch
++ with patch('subprocess.Popen'):
++ import ctypes
++ import ctypes.util
++ else:
++ import ctypes
++ import ctypes.util
++
++ except OSError:
+ return True
+
+ libc_name = None
+ try:
+- libc_name = ctypes.util.find_library('c')
++ if sys.hexversion >= 0x03030000:
++ with patch('subprocess.Popen'):
++ libc_name = ctypes.util.find_library('c')
++ else:
++ libc_name = ctypes.util.find_library('c')
+ except:
+ pass # Will attemp to load it with None anyway.
+
diff --git a/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild b/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
index 642e8ac8af1d..a4355a6e50d5 100644
--- a/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
+++ b/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild,v 1.1 2012/12/22 20:29:42 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/pyinotify-0.9.4-r1.ebuild,v 1.2 2013/01/18 23:10:21 chutzpah Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_8,1_9} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9} )
inherit distutils-r1
@@ -19,6 +19,11 @@ IUSE="examples"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND=""
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-workaround-sandbox-bug.patch
+ distutils-r1_src_prepare
+}
+
python_install_all() {
if use examples; then
insinto /usr/share/doc/${PF}/examples