diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-03-24 01:50:30 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-03-24 01:50:30 +0000 |
| commit | 9db1183b8345e394ebc19155d701955f9dbb3b91 (patch) | |
| tree | 2b9133c5095df7fae5a12baa663df7b61ef72387 /dev-python | |
| parent | Remove sandbox workaround. (diff) | |
| download | gentoo-2-9db1183b8345e394ebc19155d701955f9dbb3b91.tar.gz gentoo-2-9db1183b8345e394ebc19155d701955f9dbb3b91.tar.bz2 gentoo-2-9db1183b8345e394ebc19155d701955f9dbb3b91.zip | |
Remove patch.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pyinotify/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pyinotify/files/pyinotify-0.9.4-workaround-sandbox-bug.patch | 34 |
2 files changed, 5 insertions, 35 deletions
diff --git a/dev-python/pyinotify/ChangeLog b/dev-python/pyinotify/ChangeLog index 2e52d9d12628..c2c47bd4e390 100644 --- a/dev-python/pyinotify/ChangeLog +++ b/dev-python/pyinotify/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pyinotify # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/ChangeLog,v 1.52 2013/03/24 01:44:40 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyinotify/ChangeLog,v 1.53 2013/03/24 01:50:30 floppym Exp $ + + 24 Mar 2013; Mike Gilbert <floppym@gentoo.org> + -files/pyinotify-0.9.4-workaround-sandbox-bug.patch: + Remove patch. 24 Mar 2013; Mike Gilbert <floppym@gentoo.org> pyinotify-0.9.4-r1.ebuild: Remove sandbox workaround. 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 deleted file mode 100644 index c19eac1f3e4a..000000000000 --- a/dev-python/pyinotify/files/pyinotify-0.9.4-workaround-sandbox-bug.patch +++ /dev/null @@ -1,34 +0,0 @@ -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. - |