Permalink
Browse files

glorious funtoo updates

merged:

  gentoo: e55934dfa3d69f049a1635e4b1fb9c9748c1881a
  funtoo-overlay: 2c0839ce7998dbb8fecaae2b52b7aaa58af7f1c0
  foo-overlay: 4e928d47e22991dc209ec57d02372c56ceff4275
  bar-overlay: 6c956f1ca6178fed85bda46013da787239706d7c
  flora: 19e4f26bfcc59bd95e10a3a55fa9c40cf83e02d4
  lcd-filtering: dd3d9b094dbfc726ee9b3d886783a18b92f899fd
  mythtv: 1500bdb1a6ca4b93a7bd05e4266e0b4c7d094a34
  • Loading branch information...
1 parent 244563f commit fbd881181bfed9f021b0de1efb98eceed1c51bea @danielrobbins danielrobbins committed Aug 13, 2012
Showing with 80 additions and 1,483 deletions.
  1. +0 −70 dev-lang/python/files/3.3-20120701/01_all_static_library_location.patch
  2. +0 −57 dev-lang/python/files/3.3-20120701/02_all_disable_modules_and_ssl.patch
  3. +0 −21 dev-lang/python/files/3.3-20120701/03_all_add_portage_search_path.patch
  4. +0 −176 dev-lang/python/files/3.3-20120701/04_all_libdir.patch
  5. +0 −13 dev-lang/python/files/3.3-20120701/05_all_verbose_building_of_extensions.patch
  6. +0 −31 dev-lang/python/files/3.3-20120701/06_all_non-zero_exit_status_on_failure.patch
  7. +0 −110 dev-lang/python/files/3.3-20120701/07_all_regenerate_platform-specific_modules.patch
  8. +0 −269 dev-lang/python/files/3.3-20120701/21_all_distutils_c++.patch
  9. +0 −187 dev-lang/python/files/3.3-20120701/22_all_tests_environment.patch
  10. +0 −167 dev-lang/python/files/3.3-20120701/23_all_h2py_encoding.patch
  11. +0 −166 dev-lang/python/files/3.3-20120701/61_all_process_data.patch
  12. +2 −2 dev-lang/python/{python-2.7.4_pre20120715.ebuild → python-2.7.4_pre20120812.ebuild}
  13. +3 −3 dev-lang/python/{python-3.2.4_pre20120715.ebuild → python-3.2.4_pre20120812.ebuild}
  14. +3 −3 dev-lang/python/{python-3.3_pre20120715.ebuild → python-3.3_pre20120812.ebuild}
  15. +1 −1 dev-python/anyvc/Manifest
  16. +1 −1 dev-python/anyvc/anyvc-0.3.7.1-r1000.ebuild
  17. +1 −1 dev-python/oct2py/oct2py-0.3.2-r1000.ebuild
  18. +0 −1 dev-python/pyside-tools/Manifest
  19. +2 −3 dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch
  20. +0 −5 dev-python/pyside-tools/metadata.xml
  21. +0 −91 dev-python/pyside-tools/pyside-tools-0.2.13-r2.ebuild
  22. +12 −17 dev-python/pyside-tools/{pyside-tools-0.2.14.ebuild → pyside-tools-0.2.14-r1000.ebuild}
  23. +1 −1 dev-python/pyside/files/rpath.cmake
  24. +0 −20 dev-python/pyside/metadata.xml
  25. +10 −11 dev-python/pyside/{pyside-1.1.1.ebuild → pyside-1.1.1-r1000.ebuild}
  26. +1 −1 metadata/md5-cache/dev-lang/{python-2.7.4_pre20120715 → python-2.7.4_pre20120812}
  27. +1 −1 metadata/md5-cache/dev-lang/{python-3.2.4_pre20120715 → python-3.2.4_pre20120812}
  28. +1 −1 metadata/md5-cache/dev-lang/{python-3.3_pre20120715 → python-3.3_pre20120812}
  29. +5 −5 metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1000
  30. +5 −5 metadata/md5-cache/dev-python/oct2py-0.3.2-r1000
  31. +0 −14 metadata/md5-cache/dev-python/pyside-1.1.1
  32. +14 −0 metadata/md5-cache/dev-python/pyside-1.1.1-r1000
  33. +0 −13 metadata/md5-cache/dev-python/pyside-tools-0.2.13-r2
  34. +0 −13 metadata/md5-cache/dev-python/pyside-tools-0.2.14
  35. +14 −0 metadata/md5-cache/dev-python/pyside-tools-0.2.14-r1000
  36. +3 −3 profiles/package.mask/funtoo-python
View
70 dev-lang/python/files/3.3-20120701/01_all_static_library_location.patch
@@ -1,70 +0,0 @@
-Install libpythonX.Y.a in /usr/lib instead of /usr/lib/pythonX.Y/config.
-https://bugs.gentoo.org/show_bug.cgi?id=252372
-http://bugs.python.org/issue6103
-
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -928,6 +928,19 @@
- fi; \
- else true; \
- fi
-+ @if test -f $(LIBRARY) && test $(LIBRARY) != $(LDLIBRARY); then \
-+ if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
-+ if test "$(SO)" = .dll; then \
-+ $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBDIR); \
-+ else \
-+ $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBDIR); \
-+ $(RANLIB) $(DESTDIR)$(LIBDIR)/$(LIBRARY); \
-+ fi; \
-+ else \
-+ echo "Skipped install of $(LIBRARY) - use make frameworkinstall"; \
-+ fi; \
-+ else true; \
-+ fi
-
- bininstall: altbininstall
- -if test -f $(DESTDIR)$(BINDIR)/python3$(EXE) -o -h $(DESTDIR)$(BINDIR)/python3$(EXE); \
-@@ -1146,18 +1159,6 @@
- else true; \
- fi; \
- done
-- @if test -d $(LIBRARY); then :; else \
-- if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
-- if test "$(SO)" = .dll; then \
-- $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
-- else \
-- $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
-- $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \
-- fi; \
-- else \
-- echo Skip install of $(LIBRARY) - use make frameworkinstall; \
-- fi; \
-- fi
- $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c
- $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o
- $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in
---- Misc/python-config.in
-+++ Misc/python-config.in
-@@ -47,11 +47,7 @@
- elif opt in ('--libs', '--ldflags'):
- libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
- libs.append('-lpython' + pyver + sys.abiflags)
-- # add the prefix/lib/pythonX.Y/config dir, but only if there is no
-- # shared library in prefix/lib/.
- if opt == '--ldflags':
-- if not getvar('Py_ENABLE_SHARED'):
-- libs.insert(0, '-L' + getvar('LIBPL'))
- libs.extend(getvar('LINKFORSHARED').split())
- print(' '.join(libs))
-
---- Modules/makesetup
-+++ Modules/makesetup
-@@ -89,7 +89,7 @@
- then
- ExtraLibDir=.
- else
-- ExtraLibDir='$(LIBPL)'
-+ ExtraLibDir='$(LIBDIR)'
- fi
- ExtraLibs="-L$ExtraLibDir -lpython\$(VERSION)";;
- esac
View
57 dev-lang/python/files/3.3-20120701/02_all_disable_modules_and_ssl.patch
@@ -1,57 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -31,7 +31,17 @@
- COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
-
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+pdm_env = "PYTHON_DISABLE_MODULES"
-+if pdm_env in os.environ:
-+ disabled_module_list = os.environ[pdm_env].split()
-+else:
-+ disabled_module_list = []
-+
-+pds_env = "PYTHON_DISABLE_SSL"
-+if pds_env in os.environ:
-+ disable_ssl = os.environ[pds_env]
-+else:
-+ disable_ssl = 0
-
- # File which contains the directory for shared mods (for sys.path fixup
- # when running from the build dir, see Modules/getpath.c)
-@@ -432,6 +442,7 @@
- os.unlink(tmpfile)
-
- def detect_modules(self):
-+ global disable_ssl
- # Ensure that /usr/local is always used, but the local build
- # directories (i.e. '.' and 'Include') must be first. See issue
- # 10520.
-@@ -741,7 +752,7 @@
- ssl_incs = find_file('openssl/ssl.h', inc_dirs,
- search_for_ssl_incs_in
- )
-- if ssl_incs is not None:
-+ if ssl_incs is not None and not disable_ssl:
- krb5_h = find_file('krb5.h', inc_dirs,
- ['/usr/kerberos/include'])
- if krb5_h:
-@@ -752,7 +763,8 @@
- ] )
-
- if (ssl_incs is not None and
-- ssl_libs is not None):
-+ ssl_libs is not None and
-+ not disable_ssl):
- exts.append( Extension('_ssl', ['_ssl.c'],
- include_dirs = ssl_incs,
- library_dirs = ssl_libs,
-@@ -785,7 +797,7 @@
-
- #print('openssl_ver = 0x%08x' % openssl_ver)
- min_openssl_ver = 0x00907000
-- have_any_openssl = ssl_incs is not None and ssl_libs is not None
-+ have_any_openssl = ssl_incs is not None and ssl_libs is not None and not disable_ssl
- have_usable_openssl = (have_any_openssl and
- openssl_ver >= min_openssl_ver)
-
View
21 dev-lang/python/files/3.3-20120701/03_all_add_portage_search_path.patch
@@ -1,21 +0,0 @@
---- Lib/site.py
-+++ Lib/site.py
-@@ -307,6 +307,7 @@
- "python" + sys.version[:3],
- "site-packages"))
- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
-+ sitepackages.append(os.path.join(prefix, "lib", "portage", "pym"))
- else:
- sitepackages.append(prefix)
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
---- Lib/test/test_site.py
-+++ Lib/test/test_site.py
-@@ -239,7 +239,7 @@
- self.assertEqual(dirs[2], wanted)
- elif os.sep == '/':
- # OS X non-framwework builds, Linux, FreeBSD, etc
-- self.assertEqual(len(dirs), 2)
-+ self.assertEqual(len(dirs), 3)
- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
- 'site-packages')
- self.assertEqual(dirs[0], wanted)
View
176 dev-lang/python/files/3.3-20120701/04_all_libdir.patch
@@ -1,176 +0,0 @@
---- Lib/distutils/command/install.py
-+++ Lib/distutils/command/install.py
-@@ -44,8 +44,8 @@
-
- INSTALL_SCHEMES = {
- 'unix_prefix': {
-- 'purelib': '$base/lib/python$py_version_short/site-packages',
-- 'platlib': '$platbase/lib/python$py_version_short/site-packages',
-+ 'purelib': '$base/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages',
-+ 'platlib': '$platbase/@@GENTOO_LIBDIR@@/python$py_version_short/site-packages',
- 'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
- 'scripts': '$base/bin',
- 'data' : '$base',
---- Lib/distutils/sysconfig.py
-+++ Lib/distutils/sysconfig.py
-@@ -139,7 +139,7 @@
-
- if os.name == "posix":
- libpython = os.path.join(prefix,
-- "lib", "python" + get_python_version())
-+ "@@GENTOO_LIBDIR@@", "python" + get_python_version())
- if standard_lib:
- return libpython
- else:
---- Lib/site.py
-+++ Lib/site.py
-@@ -303,11 +303,11 @@
- if sys.platform in ('os2emx', 'riscos'):
- sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
- elif os.sep == '/':
-- sitepackages.append(os.path.join(prefix, "lib",
-+ sitepackages.append(os.path.join(prefix, "@@GENTOO_LIBDIR@@",
- "python" + sys.version[:3],
- "site-packages"))
-- sitepackages.append(os.path.join(prefix, "lib", "site-python"))
-- sitepackages.append(os.path.join(prefix, "lib", "portage", "pym"))
-+ sitepackages.append(os.path.join(prefix, "@@GENTOO_LIBDIR@@", "site-python"))
-+ sitepackages.append(os.path.join(prefix, "@@GENTOO_LIBDIR@@", "portage", "pym"))
- else:
- sitepackages.append(prefix)
- sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
---- Lib/sysconfig.py
-+++ Lib/sysconfig.py
-@@ -21,10 +21,10 @@
-
- _INSTALL_SCHEMES = {
- 'posix_prefix': {
-- 'stdlib': '{installed_base}/lib/python{py_version_short}',
-- 'platstdlib': '{platbase}/lib/python{py_version_short}',
-- 'purelib': '{base}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-+ 'stdlib': '{installed_base}/@@GENTOO_LIBDIR@@/python{py_version_short}',
-+ 'platstdlib': '{platbase}/@@GENTOO_LIBDIR@@/python{py_version_short}',
-+ 'purelib': '{base}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages',
-+ 'platlib': '{platbase}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages',
- 'include':
- '{installed_base}/include/python{py_version_short}{abiflags}',
- 'platinclude':
-@@ -81,10 +81,10 @@
- 'data': '{userbase}',
- },
- 'posix_user': {
-- 'stdlib': '{userbase}/lib/python{py_version_short}',
-- 'platstdlib': '{userbase}/lib/python{py_version_short}',
-- 'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
-- 'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
-+ 'stdlib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}',
-+ 'platstdlib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}',
-+ 'purelib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages',
-+ 'platlib': '{userbase}/@@GENTOO_LIBDIR@@/python{py_version_short}/site-packages',
- 'include': '{userbase}/include/python{py_version_short}',
- 'scripts': '{userbase}/bin',
- 'data': '{userbase}',
---- Lib/test/test_site.py
-+++ Lib/test/test_site.py
-@@ -240,10 +240,10 @@
- elif os.sep == '/':
- # OS X non-framwework builds, Linux, FreeBSD, etc
- self.assertEqual(len(dirs), 3)
-- wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
-+ wanted = os.path.join('xoxo', '@@GENTOO_LIBDIR@@', 'python' + sys.version[:3],
- 'site-packages')
- self.assertEqual(dirs[0], wanted)
-- wanted = os.path.join('xoxo', 'lib', 'site-python')
-+ wanted = os.path.join('xoxo', '@@GENTOO_LIBDIR@@', 'site-python')
- self.assertEqual(dirs[1], wanted)
- else:
- # other platforms
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -108,7 +108,7 @@
- MANDIR= @mandir@
- INCLUDEDIR= @includedir@
- CONFINCLUDEDIR= $(exec_prefix)/include
--SCRIPTDIR= $(prefix)/lib
-+SCRIPTDIR= $(prefix)/@@GENTOO_LIBDIR@@
- ABIFLAGS= @ABIFLAGS@
-
- # Detailed destination directories
---- Modules/getpath.c
-+++ Modules/getpath.c
-@@ -122,8 +122,8 @@
- #endif
-
- #ifndef PYTHONPATH
--#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
-+#define PYTHONPATH PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION ":" \
-+ EXEC_PREFIX "/@@GENTOO_LIBDIR@@/python" VERSION "/lib-dynload"
- #endif
-
- #ifndef LANDMARK
-@@ -135,7 +135,7 @@
- static wchar_t progpath[MAXPATHLEN+1];
- static wchar_t *module_search_path = NULL;
- static int module_search_path_malloced = 0;
--static wchar_t *lib_python = L"lib/python" VERSION;
-+static wchar_t *lib_python = L"@@GENTOO_LIBDIR@@/python" VERSION;
-
- static void
- reduce(wchar_t *dir)
-@@ -669,7 +669,7 @@
- }
- else
- wcsncpy(zip_path, _prefix, MAXPATHLEN);
-- joinpath(zip_path, L"lib/python00.zip");
-+ joinpath(zip_path, L"@@GENTOO_LIBDIR@@/python00.zip");
- bufsz = wcslen(zip_path); /* Replace "00" with version */
- zip_path[bufsz - 6] = VERSION[0];
- zip_path[bufsz - 5] = VERSION[2];
-@@ -679,7 +679,7 @@
- fprintf(stderr,
- "Could not find platform dependent libraries <exec_prefix>\n");
- wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
-- joinpath(exec_prefix, L"lib/lib-dynload");
-+ joinpath(exec_prefix, L"@@GENTOO_LIBDIR@@/lib-dynload");
- }
- /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */
-
---- Modules/Setup.dist
-+++ Modules/Setup.dist
-@@ -354,7 +354,7 @@
- # Andrew Kuchling's zlib module.
- # This require zlib 1.1.3 (or later).
- # See http://www.gzip.org/zlib/
--#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
-+#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/@@GENTOO_LIBDIR@@ -lz
-
- # Interface to the Expat XML parser
- #
---- setup.py
-+++ setup.py
-@@ -504,8 +504,7 @@
- # be assumed that no additional -I,-L directives are needed.
- if not cross_compiling:
- lib_dirs = self.compiler.library_dirs + [
-- '/lib64', '/usr/lib64',
-- '/lib', '/usr/lib',
-+ '/@@GENTOO_LIBDIR@@', '/usr/@@GENTOO_LIBDIR@@',
- ]
- inc_dirs = self.compiler.include_dirs + ['/usr/include']
- exts = []
-@@ -717,11 +716,11 @@
- elif curses_library:
- readline_libs.append(curses_library)
- elif self.compiler.find_library_file(lib_dirs +
-- ['/usr/lib/termcap'],
-+ ['/usr/@@GENTOO_LIBDIR@@/termcap'],
- 'termcap'):
- readline_libs.append('termcap')
- exts.append( Extension('readline', ['readline.c'],
-- library_dirs=['/usr/lib/termcap'],
-+ library_dirs=['/usr/@@GENTOO_LIBDIR@@/termcap'],
- extra_link_args=readline_extra_link_args,
- libraries=readline_libs) )
- else:
View
13 dev-lang/python/files/3.3-20120701/05_all_verbose_building_of_extensions.patch
@@ -1,13 +0,0 @@
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -475,9 +475,8 @@
-
- # Build the shared modules
- sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
-- case $$MAKEFLAGS in *s*) quiet=-q; esac; \
- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
-+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
-
- # Build static library
- # avoid long command lines, same as LIBRARY_OBJS
View
31 dev-lang/python/files/3.3-20120701/06_all_non-zero_exit_status_on_failure.patch
@@ -1,31 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=281968
-http://bugs.python.org/issue6731
-
---- setup.py
-+++ setup.py
-@@ -47,6 +47,8 @@
- # when running from the build dir, see Modules/getpath.c)
- _BUILDDIR_COOKIE = "pybuilddir.txt"
-
-+exit_status = 0
-+
- def add_dir_to_list(dirlist, dir):
- """Add the directory 'dir' to the list 'dirlist' (after any relative
- directories) if:
-@@ -295,6 +297,8 @@
- print()
-
- if self.failed:
-+ global exit_status
-+ exit_status = 1
- failed = self.failed[:]
- print()
- print("Failed to build these modules:")
-@@ -2134,6 +2138,7 @@
- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
- "Tools/scripts/2to3", "Tools/scripts/pyvenv"]
- )
-+ sys.exit(exit_status)
-
- # --install-platlib
- if __name__ == '__main__':
View
110 dev-lang/python/files/3.3-20120701/07_all_regenerate_platform-specific_modules.patch
@@ -1,110 +0,0 @@
-http://bugs.python.org/issue12619
-
---- Lib/plat-aix4/regen
-+++ Lib/plat-aix4/regen
-@@ -5,4 +5,4 @@
- exit 1;;
- esac
- set -v
--h2py.py -i '(u_long)' /usr/include/netinet/in.h
-+python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
---- Lib/plat-linux/regen
-+++ Lib/plat-linux/regen
-@@ -5,4 +5,4 @@
- exit 1;;
- esac
- set -v
--h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h
-+python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/dlfcn.h /usr/include/linux/cdrom.h
---- Lib/plat-sunos5/regen
-+++ Lib/plat-sunos5/regen
-@@ -5,5 +5,4 @@
- exit 1;;
- esac
- set -v
--h2py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/sys/stropts.h /usr/include/dlfcn.h
--
-+python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/sys/types.h /usr/include/netinet/in.h /usr/include/sys/stropts.h /usr/include/dlfcn.h
---- Lib/plat-unixware7/regen
-+++ Lib/plat-unixware7/regen
-@@ -5,5 +5,5 @@
- exit 1;;
- esac
- set -v
--h2py -i '(u_long)' /usr/include/netinet/in.h
--h2py /usr/include/sys/stropts.h
-+python$EXE ../../Tools/scripts/h2py.py -i '(u_long)' /usr/include/netinet/in.h
-+python$EXE ../../Tools/scripts/h2py.py /usr/include/sys/stropts.h
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -432,7 +432,7 @@
-
- # Default target
- all: build_all
--build_all: $(BUILDPYTHON) $(SYSCONFIGDATA) oldsharedmods sharedmods gdbhooks Modules/_testembed
-+build_all: $(BUILDPYTHON) $(SYSCONFIGDATA) oldsharedmods sharedmods platformspecificmods gdbhooks Modules/_testembed
-
- # Compile a binary with gcc profile guided optimization.
- profile-opt:
-@@ -478,6 +478,26 @@
- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
-
-+# Build the platform-specific modules
-+platformspecificmods: $(BUILDPYTHON) sharedmods
-+ @PLATDIR=$(PLATDIR); \
-+ if test ! -f $(srcdir)/Lib/$(PLATDIR)/regen; then \
-+ $(INSTALL) -d $(srcdir)/Lib/$(PLATDIR); \
-+ if test -f $(srcdir)/Lib/$${PLATDIR%?}/regen; then \
-+ cp $(srcdir)/Lib/$${PLATDIR%?}/regen $(srcdir)/Lib/$(PLATDIR)/regen; \
-+ else \
-+ cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen; \
-+ fi \
-+ fi
-+ @EXE="$(BUILDEXE)"; export EXE; \
-+ PATH="`pwd`:$$PATH"; export PATH; \
-+ PYTHONPATH="`pwd`/Lib"; export PYTHONPATH; \
-+ cd $(srcdir)/Lib/$(PLATDIR); \
-+ $(RUNSHARED) ./regen || exit 1; \
-+ for module in *.py; do \
-+ $(RUNSHARED) $(BUILDPYTHON) -c "import py_compile; py_compile.compile('$$module', cfile='/dev/null', doraise=True)" || exit 1; \
-+ done
-+
- # Build static library
- # avoid long command lines, same as LIBRARY_OBJS
- $(LIBRARY): $(LIBRARY_OBJS)
-@@ -1028,7 +1048,7 @@
- unittest unittest/test unittest/test/testmock \
- venv venv/scripts venv/scripts/posix \
- curses pydoc_data $(MACHDEPS)
--libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
-+libinstall: build_all $(srcdir)/Modules/xxmodule.c
- @for i in $(SCRIPTDIR) $(LIBDEST); \
- do \
- if test ! -d $(DESTDIR)$$i; then \
-@@ -1109,16 +1129,6 @@
- -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- $(PYTHON_FOR_BUILD) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"
-
--# Create the PLATDIR source directory, if one wasn't distributed..
--$(srcdir)/Lib/$(PLATDIR):
-- mkdir $(srcdir)/Lib/$(PLATDIR)
-- cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
-- export PATH; PATH="`pwd`:$$PATH"; \
-- export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
-- export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \
-- export EXE; EXE="$(BUILDEXE)"; \
-- cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
--
- python-config: $(srcdir)/Misc/python-config.in
- # Substitution happens here, as the completely-expanded BINDIR
- # is not available in configure
-@@ -1416,7 +1426,7 @@
- Python/thread.o: @THREADHEADERS@
-
- # Declare targets that aren't real files
--.PHONY: all build_all sharedmods oldsharedmods test quicktest
-+.PHONY: all build_all sharedmods oldsharedmods platformspecificmods test quicktest
- .PHONY: install altinstall oldsharedinstall bininstall altbininstall
- .PHONY: maninstall libinstall inclinstall libainstall sharedinstall
- .PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure
View
269 dev-lang/python/files/3.3-20120701/21_all_distutils_c++.patch
@@ -1,269 +0,0 @@
-http://bugs.python.org/issue1222585
-
---- Lib/distutils/cygwinccompiler.py
-+++ Lib/distutils/cygwinccompiler.py
-@@ -136,9 +136,13 @@
- self.set_executables(compiler='gcc -mcygwin -O -Wall',
- compiler_so='gcc -mcygwin -mdll -O -Wall',
- compiler_cxx='g++ -mcygwin -O -Wall',
-+ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall',
- linker_exe='gcc -mcygwin',
- linker_so=('%s -mcygwin %s' %
-- (self.linker_dll, shared_option)))
-+ (self.linker_dll, shared_option)),
-+ linker_exe_cxx='g++ -mcygwin',
-+ linker_so_cxx=('%s -mcygwin %s' %
-+ (self.linker_dll, shared_option)))
-
- # cygwin and mingw32 need different sets of libraries
- if self.gcc_version == "2.91.57":
-@@ -162,8 +166,12 @@
- raise CompileError(msg)
- else: # for other files use the C-compiler
- try:
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-- extra_postargs)
-+ if self.detect_language(src) == 'c++':
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+ extra_postargs)
-+ else:
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+ extra_postargs)
- except DistutilsExecError as msg:
- raise CompileError(msg)
-
-@@ -294,10 +302,15 @@
- self.set_executables(compiler='gcc -mno-cygwin -O -Wall',
- compiler_so='gcc -mno-cygwin -mdll -O -Wall',
- compiler_cxx='g++ -mno-cygwin -O -Wall',
-+ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall',
- linker_exe='gcc -mno-cygwin',
- linker_so='%s -mno-cygwin %s %s'
- % (self.linker_dll, shared_option,
-- entry_point))
-+ entry_point),
-+ linker_exe_cxx='g++ -mno-cygwin',
-+ linker_so_cxx='%s -mno-cygwin %s %s'
-+ % (self.linker_dll, shared_option,
-+ entry_point))
- # Maybe we should also append -mthreads, but then the finished
- # dlls need another dll (mingwm10.dll see Mingw32 docs)
- # (-mthreads: Support thread-safe exception handling on `Mingw32')
---- Lib/distutils/emxccompiler.py
-+++ Lib/distutils/emxccompiler.py
-@@ -63,8 +63,12 @@
- # XXX optimization, warnings etc. should be customizable.
- self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
- compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
-+ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall',
- linker_exe='gcc -Zomf -Zmt -Zcrtdll',
-- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll')
-+ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll',
-+ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll',
-+ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll')
-
- # want the gcc library statically linked (so that we don't have
- # to distribute a version dependent on the compiler we have)
-@@ -81,8 +85,12 @@
- raise CompileError(msg)
- else: # for other files use the C-compiler
- try:
-- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-- extra_postargs)
-+ if self.detect_language(src) == 'c++':
-+ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] +
-+ extra_postargs)
-+ else:
-+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] +
-+ extra_postargs)
- except DistutilsExecError as msg:
- raise CompileError(msg)
-
---- Lib/distutils/sysconfig.py
-+++ Lib/distutils/sysconfig.py
-@@ -171,9 +171,12 @@
- varies across Unices and is stored in Python's Makefile.
- """
- if compiler.compiler_type == "unix":
-- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \
-- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS',
-- 'CCSHARED', 'LDSHARED', 'SO', 'AR', 'ARFLAGS')
-+ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext, ar, ar_flags) = \
-+ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED',
-+ 'LDCXXSHARED', 'SO', 'AR', 'ARFLAGS')
-+
-+ cflags = ''
-+ cxxflags = ''
-
- newcc = None
- if 'CC' in os.environ:
-@@ -182,19 +185,27 @@
- cxx = os.environ['CXX']
- if 'LDSHARED' in os.environ:
- ldshared = os.environ['LDSHARED']
-+ if 'LDCXXSHARED' in os.environ:
-+ ldcxxshared = os.environ['LDCXXSHARED']
- if 'CPP' in os.environ:
- cpp = os.environ['CPP']
- else:
- cpp = cc + " -E" # not always
- if 'LDFLAGS' in os.environ:
- ldshared = ldshared + ' ' + os.environ['LDFLAGS']
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS']
- if 'CFLAGS' in os.environ:
-- cflags = opt + ' ' + os.environ['CFLAGS']
-+ cflags = os.environ['CFLAGS']
- ldshared = ldshared + ' ' + os.environ['CFLAGS']
-+ if 'CXXFLAGS' in os.environ:
-+ cxxflags = os.environ['CXXFLAGS']
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS']
- if 'CPPFLAGS' in os.environ:
- cpp = cpp + ' ' + os.environ['CPPFLAGS']
- cflags = cflags + ' ' + os.environ['CPPFLAGS']
-+ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS']
- ldshared = ldshared + ' ' + os.environ['CPPFLAGS']
-+ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS']
- if 'AR' in os.environ:
- ar = os.environ['AR']
- if 'ARFLAGS' in os.environ:
-@@ -203,13 +214,17 @@
- archiver = ar + ' ' + ar_flags
-
- cc_cmd = cc + ' ' + cflags
-+ cxx_cmd = cxx + ' ' + cxxflags
- compiler.set_executables(
- preprocessor=cpp,
- compiler=cc_cmd,
- compiler_so=cc_cmd + ' ' + ccshared,
-- compiler_cxx=cxx,
-+ compiler_cxx=cxx_cmd,
-+ compiler_so_cxx=cxx_cmd + ' ' + ccshared,
- linker_so=ldshared,
- linker_exe=cc,
-+ linker_so_cxx=ldcxxshared,
-+ linker_exe_cxx=cxx,
- archiver=archiver)
-
- compiler.shared_lib_extension = so_ext
-@@ -627,7 +642,7 @@
- for key in ('LDFLAGS', 'BASECFLAGS',
- # a number of derived variables. These need to be
- # patched up as well.
-- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
-+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
- flags = _config_vars[key]
- flags = re.sub('-arch\s+\w+\s', ' ', flags, re.ASCII)
- flags = re.sub('-isysroot [^ \t]*', ' ', flags)
-@@ -655,7 +670,8 @@
- for key in ('LDFLAGS', 'BASECFLAGS',
- # a number of derived variables. These need to be
- # patched up as well.
-- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED', 'LDSHARED'):
-+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED',
-+ 'LDSHARED', 'LDCXXSHARED'):
-
- flags = _config_vars[key]
- flags = re.sub('-arch\s+ppc\w*\s', ' ', flags)
-@@ -672,7 +688,8 @@
- for key in ('LDFLAGS', 'BASECFLAGS',
- # a number of derived variables. These need to be
- # patched up as well.
-- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED', 'LDSHARED'):
-+ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED',
-+ 'LDSHARED', 'LDCXXSHARED'):
-
- flags = _config_vars[key]
- flags = re.sub('-arch\s+\w+\s', ' ', flags)
---- Lib/distutils/unixccompiler.py
-+++ Lib/distutils/unixccompiler.py
-@@ -124,14 +124,17 @@
- # are pretty generic; they will probably have to be set by an outsider
- # (eg. using information discovered by the sysconfig about building
- # Python extensions).
-- executables = {'preprocessor' : None,
-- 'compiler' : ["cc"],
-- 'compiler_so' : ["cc"],
-- 'compiler_cxx' : ["cc"],
-- 'linker_so' : ["cc", "-shared"],
-- 'linker_exe' : ["cc"],
-- 'archiver' : ["ar", "-cr"],
-- 'ranlib' : None,
-+ executables = {'preprocessor' : None,
-+ 'compiler' : ["cc"],
-+ 'compiler_so' : ["cc"],
-+ 'compiler_cxx' : ["c++"],
-+ 'compiler_so_cxx' : ["c++"],
-+ 'linker_so' : ["cc", "-shared"],
-+ 'linker_exe' : ["cc"],
-+ 'linker_so_cxx' : ["c++", "-shared"],
-+ 'linker_exe_cxx' : ["c++"],
-+ 'archiver' : ["ar", "-cr"],
-+ 'ranlib' : None,
- }
-
- if sys.platform[:6] == "darwin":
-@@ -180,11 +183,18 @@
-
- def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
- compiler_so = self.compiler_so
-+ compiler_so_cxx = self.compiler_so_cxx
- if sys.platform == 'darwin':
- compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
-+ compiler_so_cxx = _darwin_compiler_fixup(compiler_so_cxx, cc_args +
-+ extra_postargs)
- try:
-- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-- extra_postargs)
-+ if self.detect_language(src) == 'c++':
-+ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] +
-+ extra_postargs)
-+ else:
-+ self.spawn(compiler_so + cc_args + [src, '-o', obj] +
-+ extra_postargs)
- except DistutilsExecError as msg:
- raise CompileError(msg)
-
-@@ -242,22 +252,16 @@
- ld_args.extend(extra_postargs)
- self.mkpath(os.path.dirname(output_filename))
- try:
-- if target_desc == CCompiler.EXECUTABLE:
-- linker = self.linker_exe[:]
-+ if target_lang == "c++":
-+ if target_desc == CCompiler.EXECUTABLE:
-+ linker = self.linker_exe_cxx[:]
-+ else:
-+ linker = self.linker_so_cxx[:]
- else:
-- linker = self.linker_so[:]
-- if target_lang == "c++" and self.compiler_cxx:
-- # skip over environment variable settings if /usr/bin/env
-- # is used to set up the linker's environment.
-- # This is needed on OSX. Note: this assumes that the
-- # normal and C++ compiler have the same environment
-- # settings.
-- i = 0
-- if os.path.basename(linker[0]) == "env":
-- i = 1
-- while '=' in linker[i]:
-- i += 1
-- linker[i] = self.compiler_cxx[i]
-+ if target_desc == CCompiler.EXECUTABLE:
-+ linker = self.linker_exe[:]
-+ else:
-+ linker = self.linker_so[:]
-
- if sys.platform == 'darwin':
- linker = _darwin_compiler_fixup(linker, ld_args)
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -475,7 +475,7 @@
-
- # Build the shared modules
- sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
-- $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
-+ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' CFLAGS='$(PY_CFLAGS)' \
- $(PYTHON_FOR_BUILD) $(srcdir)/setup.py build
-
- # Build the platform-specific modules
View
187 dev-lang/python/files/3.3-20120701/22_all_tests_environment.patch
@@ -1,187 +0,0 @@
-http://bugs.python.org/issue1674555
-
---- Lib/site.py
-+++ Lib/site.py
-@@ -594,8 +594,9 @@
- known_paths = venv(known_paths)
- if ENABLE_USER_SITE is None:
- ENABLE_USER_SITE = check_enableusersite()
-- known_paths = addusersitepackages(known_paths)
-- known_paths = addsitepackages(known_paths)
-+ if os.environ.get("_PYTHONNOSITEPACKAGES") is None:
-+ known_paths = addusersitepackages(known_paths)
-+ known_paths = addsitepackages(known_paths)
- if sys.platform == 'os2emx':
- setBEGINLIBPATH()
- setquit()
---- Lib/test/regrtest.py
-+++ Lib/test/regrtest.py
-@@ -185,6 +185,7 @@
- import unittest
- import warnings
- from inspect import isabstract
-+from subprocess import Popen, PIPE
-
- try:
- import threading
-@@ -571,6 +572,62 @@
- support.use_resources = use_resources
- save_modules = sys.modules.keys()
-
-+ opt_args = support.args_from_interpreter_flags()
-+ base_cmd = [sys.executable] + opt_args + ['-m', 'test.regrtest']
-+ debug_output_pat = re.compile(r"\[\d+ refs\]$")
-+
-+ def get_args_tuple(test, verbose, quiet, huntrleaks, debug, use_resources,
-+ output_on_failure, failfast, match_tests, timeout):
-+ return (
-+ (test, verbose, quiet),
-+ dict(huntrleaks=huntrleaks, debug=debug,
-+ use_resources=use_resources,
-+ output_on_failure=output_on_failure, failfast=failfast,
-+ match_tests=match_tests, timeout=timeout)
-+ )
-+
-+ def _runtest(test, verbose, quiet, huntrleaks=False, debug=False,
-+ use_resources=None, output_on_failure=False, failfast=False,
-+ match_tests=None, timeout=None):
-+ if test == "test_site":
-+ args_tuple = get_args_tuple(test, verbose, quiet, huntrleaks, debug,
-+ use_resources, output_on_failure,
-+ failfast, match_tests, timeout)
-+ env = os.environ.copy()
-+ try:
-+ del env["_PYTHONNOSITEPACKAGES"]
-+ except KeyError:
-+ pass
-+ popen = Popen(base_cmd + ['--slaveargs', json.dumps(args_tuple)],
-+ stdout=PIPE, stderr=PIPE,
-+ universal_newlines=True,
-+ close_fds=(os.name != 'nt'),
-+ env=env)
-+ stdout, stderr = popen.communicate()
-+ retcode = popen.wait()
-+ # Strip last refcount output line if it exists, since it
-+ # comes from the shutdown of the interpreter in the subcommand.
-+ stderr = debug_output_pat.sub("", stderr)
-+ stdout, _, result = stdout.strip().rpartition("\n")
-+ if retcode != 0:
-+ result = (CHILD_ERROR, "Exit code %s" % retcode)
-+ else:
-+ result = json.loads(result)
-+ if stdout:
-+ print(stdout)
-+ if stderr:
-+ print(stderr, file=sys.stderr)
-+ if result[0] == INTERRUPTED:
-+ assert result[1] == 'KeyboardInterrupt'
-+ raise KeyboardInterrupt
-+ return result
-+ else:
-+ return runtest(test, verbose, quiet, huntrleaks=huntrleaks,
-+ debug=debug, use_resources=use_resources,
-+ output_on_failure=output_on_failure,
-+ failfast=failfast, match_tests=match_tests,
-+ timeout=timeout)
-+
- def accumulate_result(test, result):
- ok, test_time = result
- test_times.append((test_time, test))
-@@ -608,22 +665,14 @@
- print("Multiprocess option requires thread support")
- sys.exit(2)
- from queue import Queue
-- from subprocess import Popen, PIPE
-- debug_output_pat = re.compile(r"\[\d+ refs\]$")
- output = Queue()
- def tests_and_args():
- for test in tests:
-- args_tuple = (
-- (test, verbose, quiet),
-- dict(huntrleaks=huntrleaks, use_resources=use_resources,
-- debug=debug, output_on_failure=verbose3,
-- timeout=timeout, failfast=failfast,
-- match_tests=match_tests)
-- )
-+ args_tuple = get_args_tuple(test, verbose, quiet, huntrleaks,
-+ debug, use_resources, verbose3,
-+ failfast, match_tests, timeout)
- yield (test, args_tuple)
- pending = tests_and_args()
-- opt_args = support.args_from_interpreter_flags()
-- base_cmd = [sys.executable] + opt_args + ['-m', 'test.regrtest']
- def work():
- # A worker thread.
- try:
-@@ -700,14 +749,14 @@
- if trace:
- # If we're tracing code coverage, then we don't exit with status
- # if on a false return value from main.
-- tracer.runctx('runtest(test, verbose, quiet, timeout=timeout)',
-+ tracer.runctx('_runtest(test, verbose, quiet, timeout=timeout)',
- globals=globals(), locals=vars())
- else:
- try:
-- result = runtest(test, verbose, quiet, huntrleaks, debug,
-- output_on_failure=verbose3,
-- timeout=timeout, failfast=failfast,
-- match_tests=match_tests)
-+ result = _runtest(test, verbose, quiet, huntrleaks, debug,
-+ output_on_failure=verbose3,
-+ timeout=timeout, failfast=failfast,
-+ match_tests=match_tests)
- accumulate_result(test, result)
- except KeyboardInterrupt:
- interrupted = True
-@@ -778,7 +827,7 @@
- sys.stdout.flush()
- try:
- verbose = True
-- ok = runtest(test, True, quiet, huntrleaks, debug, timeout=timeout)
-+ ok = _runtest(test, True, quiet, huntrleaks, debug, timeout=timeout)
- except KeyboardInterrupt:
- # print a newline separate from the ^C
- print()
-@@ -1156,8 +1205,9 @@
- for name, get, restore in self.resource_info():
- current = get()
- original = saved_values.pop(name)
-- # Check for changes to the resource's value
-- if current != original:
-+ # Check for changes to the resource's value. test_site is always run
-+ # in a subprocess and is allowed to change os.environ and sys.path.
-+ if current != original and self.testname != "test_site":
- self.changed = True
- restore(original)
- if not self.quiet:
---- Lib/test/test_site.py
-+++ Lib/test/test_site.py
-@@ -8,6 +8,7 @@
- from test.support import run_unittest, TESTFN, EnvironmentVarGuard
- from test.support import captured_stderr
- import builtins
-+import imp
- import os
- import sys
- import re
-@@ -21,6 +22,9 @@
- # already.
- if "site" in sys.modules:
- import site
-+ if "_PYTHONNOSITEPACKAGES" in os.environ:
-+ del os.environ["_PYTHONNOSITEPACKAGES"]
-+ imp.reload(site)
- else:
- raise unittest.SkipTest("importation of site.py suppressed")
-
---- Makefile.pre.in
-+++ Makefile.pre.in
-@@ -839,7 +839,7 @@
- ######################################################################
-
- TESTOPTS= $(EXTRATESTOPTS)
--TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS)
-+TESTPYTHON= _PYTHONNOSITEPACKAGES=1 $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS)
- TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py
- TESTTIMEOUT= 3600
-
View
167 dev-lang/python/files/3.3-20120701/23_all_h2py_encoding.patch
@@ -1,167 +0,0 @@
-http://bugs.python.org/issue13032
-
---- Tools/scripts/h2py.py
-+++ Tools/scripts/h2py.py
-@@ -23,55 +23,56 @@
-
- import sys, re, getopt, os
-
--p_define = re.compile('^[\t ]*#[\t ]*define[\t ]+([a-zA-Z0-9_]+)[\t ]+')
-+p_define = re.compile(b'^[\t ]*#[\t ]*define[\t ]+([a-zA-Z0-9_]+)[\t ]+')
-
- p_macro = re.compile(
-- '^[\t ]*#[\t ]*define[\t ]+'
-- '([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+')
-+ b'^[\t ]*#[\t ]*define[\t ]+'
-+ b'([a-zA-Z0-9_]+)\(([_a-zA-Z][_a-zA-Z0-9]*)\)[\t ]+')
-
--p_include = re.compile('^[\t ]*#[\t ]*include[\t ]+<([a-zA-Z0-9_/\.]+)')
-+p_include = re.compile(b'^[\t ]*#[\t ]*include[\t ]+<([a-zA-Z0-9_/\.]+)')
-
--p_comment = re.compile(r'/\*([^*]+|\*+[^/])*(\*+/)?')
--p_cpp_comment = re.compile('//.*')
-+p_comment = re.compile(br'/\*([^*]+|\*+[^/])*(\*+/)?')
-+p_cpp_comment = re.compile(b'//.*')
-
- ignores = [p_comment, p_cpp_comment]
-
--p_char = re.compile(r"'(\\.[^\\]*|[^\\])'")
-+p_char = re.compile(br"'(\\.[^\\]*|[^\\])'")
-
--p_hex = re.compile(r"0x([0-9a-fA-F]+)L?")
-+p_hex = re.compile(br"0x([0-9a-fA-F]+)L?")
-
- filedict = {}
- importable = {}
-
- try:
-- searchdirs=os.environ['include'].split(';')
-+ searchdirs=os.environb[b'include'].split(b';')
- except KeyError:
- try:
-- searchdirs=os.environ['INCLUDE'].split(';')
-+ searchdirs=os.environb[b'INCLUDE'].split(b';')
- except KeyError:
-- searchdirs=['/usr/include']
-+ searchdirs=[b'/usr/include']
-
- def main():
- global filedict
- opts, args = getopt.getopt(sys.argv[1:], 'i:')
- for o, a in opts:
- if o == '-i':
-- ignores.append(re.compile(a))
-+ ignores.append(re.compile(a.encode()))
- if not args:
- args = ['-']
- for filename in args:
- if filename == '-':
- sys.stdout.write('# Generated by h2py from stdin\n')
-- process(sys.stdin, sys.stdout)
-+ process(sys.stdin.buffer, sys.stdout.buffer)
- else:
-- fp = open(filename, 'r')
-+ filename = filename.encode()
-+ fp = open(filename, 'rb')
- outfile = os.path.basename(filename)
-- i = outfile.rfind('.')
-+ i = outfile.rfind(b'.')
- if i > 0: outfile = outfile[:i]
- modname = outfile.upper()
-- outfile = modname + '.py'
-- outfp = open(outfile, 'w')
-- outfp.write('# Generated by h2py from %s\n' % filename)
-+ outfile = modname + b'.py'
-+ outfp = open(outfile, 'wb')
-+ outfp.write(b'# Generated by h2py from ' + filename + b'\n')
- filedict = {}
- for dir in searchdirs:
- if filename[:len(dir)] == dir:
-@@ -85,9 +86,9 @@
- def pytify(body):
- # replace ignored patterns by spaces
- for p in ignores:
-- body = p.sub(' ', body)
-+ body = p.sub(b' ', body)
- # replace char literals by ord(...)
-- body = p_char.sub("ord('\\1')", body)
-+ body = p_char.sub(b"ord('\\1')", body)
- # Compute negative hexadecimal constants
- start = 0
- UMAX = 2*(sys.maxsize+1)
-@@ -98,7 +99,7 @@
- val = int(body[slice(*m.span(1))], 16)
- if val > sys.maxsize:
- val -= UMAX
-- body = body[:s] + "(" + str(val) + ")" + body[e:]
-+ body = body[:s] + b"(" + str(val).encode() + b")" + body[e:]
- start = s + 1
- return body
-
-@@ -111,7 +112,7 @@
- match = p_define.match(line)
- if match:
- # gobble up continuation lines
-- while line[-2:] == '\\\n':
-+ while line[-2:] == b'\\\n':
- nextline = fp.readline()
- if not nextline: break
- lineno = lineno + 1
-@@ -120,11 +121,11 @@
- body = line[match.end():]
- body = pytify(body)
- ok = 0
-- stmt = '%s = %s\n' % (name, body.strip())
-+ stmt = name + b' = ' + body.strip() + b'\n'
- try:
- exec(stmt, env)
- except:
-- sys.stderr.write('Skipping: %s' % stmt)
-+ sys.stderr.buffer.write(b'Skipping: ' + stmt)
- else:
- outfp.write(stmt)
- match = p_macro.match(line)
-@@ -132,11 +133,11 @@
- macro, arg = match.group(1, 2)
- body = line[match.end():]
- body = pytify(body)
-- stmt = 'def %s(%s): return %s\n' % (macro, arg, body)
-+ stmt = b'def ' + macro + b'(' + arg + b'): return ' + body + b'\n'
- try:
- exec(stmt, env)
- except:
-- sys.stderr.write('Skipping: %s' % stmt)
-+ sys.stderr.buffer.write(b'Skipping: ' + stmt)
- else:
- outfp.write(stmt)
- match = p_include.match(line)
-@@ -145,23 +146,24 @@
- a, b = regs[1]
- filename = line[a:b]
- if filename in importable:
-- outfp.write('from %s import *\n' % importable[filename])
-+ outfp.write(b'from ' + importable[filename] + b' import *\n')
- elif filename not in filedict:
- filedict[filename] = None
- inclfp = None
- for dir in searchdirs:
- try:
-- inclfp = open(dir + '/' + filename)
-+ inclfp = open(dir + b'/' + filename, 'rb')
- break
- except IOError:
- pass
- if inclfp:
- outfp.write(
-- '\n# Included from %s\n' % filename)
-+ b'\n# Included from ' + filename + b'\n')
- process(inclfp, outfp, env)
-+ inclfp.close()
- else:
-- sys.stderr.write('Warning - could not find file %s\n' %
-- filename)
-+ sys.stderr.buffer.write(b'Warning - could not find file ' +
-+ filename + b'\n')
-
- if __name__ == '__main__':
- main()
View
166 dev-lang/python/files/3.3-20120701/61_all_process_data.patch
@@ -1,166 +0,0 @@
-GENTOO_PYTHON_PROCESS_NAME environmental variable is set by python-wrapper and wrapper scripts generated by
-python_generate_wrapper_scripts() and specifies process name.
-GENTOO_PYTHON_WRAPPER_SCRIPT_PATH environmental variable is set by wrapper scripts generated by
-python_generate_wrapper_scripts() and specifies sys.argv[0] in target executables.
-GENTOO_PYTHON_TARGET_SCRIPT_PATH environmental variable is set by wrapper scripts generated by
-python_generate_wrapper_scripts() and specifies paths to actually executed scripts.
-GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION environmental variable is used by wrapper scripts generated by
-python_generate_wrapper_scripts() to check if Python supports GENTOO_PYTHON_TARGET_SCRIPT_PATH environmental variable.
-
---- Modules/main.c
-+++ Modules/main.c
-@@ -330,6 +330,7 @@
- int version = 0;
- int saw_unbuffered_flag = 0;
- PyCompilerFlags cf;
-+ char *target_script_name = getenv("GENTOO_PYTHON_TARGET_SCRIPT_PATH");
-
- cf.cf_flags = 0;
-
-@@ -549,7 +550,17 @@
- filename = argv[_PyOS_optind];
-
- #else
-- filename = argv[_PyOS_optind];
-+ if (target_script_name != NULL && *target_script_name != '\0') {
-+ size_t length = strlen(target_script_name);
-+ wchar_t *wcs_target_script_name = (wchar_t *) calloc(length + 1, sizeof(wchar_t));
-+ char *old_locale = setlocale(LC_CTYPE, NULL);
-+ setlocale(LC_CTYPE, "");
-+ if (mbstowcs(wcs_target_script_name, target_script_name, length) >= 0)
-+ filename = wcs_target_script_name;
-+ setlocale(LC_CTYPE, old_locale);
-+ }
-+ if (filename == NULL)
-+ filename = argv[_PyOS_optind];
- #endif
- }
-
---- Modules/posixmodule.c
-+++ Modules/posixmodule.c
-@@ -1016,6 +1016,10 @@
- char *p = strchr(*e, '=');
- if (p == NULL)
- continue;
-+ if ((strlen("GENTOO_PYTHON_PROCESS_NAME") == (int)(p-*e) && strncmp("GENTOO_PYTHON_PROCESS_NAME", *e, (int)(p-*e)) == 0) ||
-+ (strlen("GENTOO_PYTHON_TARGET_SCRIPT_PATH") == (int)(p-*e) && strncmp("GENTOO_PYTHON_TARGET_SCRIPT_PATH", *e, (int)(p-*e)) == 0) ||
-+ (strlen("GENTOO_PYTHON_WRAPPER_SCRIPT_PATH") == (int)(p-*e) && strncmp("GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", *e, (int)(p-*e)) == 0))
-+ continue;
- k = PyBytes_FromStringAndSize(*e, (int)(p-*e));
- if (k == NULL) {
- PyErr_Clear();
---- Modules/python.c
-+++ Modules/python.c
-@@ -7,6 +7,14 @@
- #include <floatingpoint.h>
- #endif
-
-+#ifdef __linux__
-+#include <linux/prctl.h>
-+#include <sys/prctl.h>
-+#ifndef PR_SET_NAME
-+#define PR_SET_NAME 15
-+#endif
-+#endif
-+
- #ifdef MS_WINDOWS
- int
- wmain(int argc, wchar_t **argv)
-@@ -22,6 +30,11 @@
- int
- main(int argc, char **argv)
- {
-+ if (getenv("GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION")) {
-+ printf("GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n");
-+ return 0;
-+ }
-+
- wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*(argc+1));
- /* We need a second copies, as Python might modify the first one. */
- wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*(argc+1));
-@@ -63,6 +76,16 @@
-
- setlocale(LC_ALL, oldloc);
- free(oldloc);
-+
-+#ifdef __linux__
-+ char *process_name = getenv("GENTOO_PYTHON_PROCESS_NAME");
-+#ifdef HAVE_UNSETENV
-+ unsetenv("GENTOO_PYTHON_PROCESS_NAME");
-+#endif
-+ if (process_name != NULL && *process_name != '\0')
-+ prctl(PR_SET_NAME, process_name);
-+#endif
-+
- res = Py_Main(argc, argv_copy);
- for (i = 0; i < argc; i++) {
- PyMem_Free(argv_copy2[i]);
---- Python/sysmodule.c
-+++ Python/sysmodule.c
-@@ -1770,6 +1770,10 @@
- makeargvobject(int argc, wchar_t **argv)
- {
- PyObject *av;
-+ char *wrapper_script_name = getenv("GENTOO_PYTHON_WRAPPER_SCRIPT_PATH");
-+#ifdef HAVE_UNSETENV
-+ unsetenv("GENTOO_PYTHON_WRAPPER_SCRIPT_PATH");
-+#endif
- if (argc <= 0 || argv == NULL) {
- /* Ensure at least one (empty) argument is seen */
- static wchar_t *empty_argv[1] = {L""};
-@@ -1794,7 +1798,16 @@
- } else
- v = PyUnicode_FromString(argv[i]);
- #else
-- PyObject *v = PyUnicode_FromWideChar(argv[i], -1);
-+ PyObject *v = NULL;
-+ if (i == 0 && wrapper_script_name != NULL && *wrapper_script_name != '\0') {
-+ size_t length = strlen(wrapper_script_name);
-+ wchar_t *wcs_wrapper_script_name = (wchar_t *) calloc(length + 1, sizeof(wchar_t));
-+ if (mbstowcs(wcs_wrapper_script_name, wrapper_script_name, length) >= 0)
-+ v = PyUnicode_FromWideChar(wcs_wrapper_script_name, -1);
-+ free(wcs_wrapper_script_name);
-+ }
-+ if (v == NULL)
-+ v = PyUnicode_FromWideChar(argv[i], -1);
- #endif
- if (v == NULL) {
- Py_DECREF(av);
-@@ -1814,7 +1827,12 @@
- static void
- sys_update_path(int argc, wchar_t **argv)
- {
-- wchar_t *argv0;
-+ char *target_script_name = getenv("GENTOO_PYTHON_TARGET_SCRIPT_PATH");
-+#ifdef HAVE_UNSETENV
-+ unsetenv("GENTOO_PYTHON_TARGET_SCRIPT_PATH");
-+#endif
-+ wchar_t *wcs_target_script_name = NULL;
-+ wchar_t *argv0 = NULL;
- wchar_t *p = NULL;
- Py_ssize_t n = 0;
- PyObject *a;
-@@ -1834,7 +1852,14 @@
- if (path == NULL)
- return;
-
-- argv0 = argv[0];
-+ if (target_script_name != NULL && *target_script_name != '\0') {
-+ size_t length = strlen(target_script_name);
-+ wcs_target_script_name = (wchar_t *) calloc(length + 1, sizeof(wchar_t));
-+ if (mbstowcs(wcs_target_script_name, target_script_name, length) >= 0)
-+ argv0 = wcs_target_script_name;
-+ }
-+ if (argv0 == NULL)
-+ argv0 = argv[0];
-
- #ifdef HAVE_READLINK
- if (_HAVE_SCRIPT_ARGUMENT(argc, argv))
-@@ -1910,6 +1935,7 @@
- if (PyList_Insert(path, 0, a) < 0)
- Py_FatalError("sys.path.insert(0) failed");
- Py_DECREF(a);
-+ free(wcs_target_script_name);
- }
-
- void
View
4 ...ng/python/python-2.7.4_pre20120715.ebuild → ...ng/python/python-2.7.4_pre20120812.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == *_pre* ]]; then
inherit mercurial
EHG_REPO_URI="http://hg.python.org/cpython"
- EHG_REVISION="814927ff4ef2"
+ EHG_REVISION="a82fc1f366b4"
else
MY_PV="${PV%_p*}"
MY_P="Python-${MY_PV}"
@@ -226,7 +226,7 @@ src_configure() {
dbmliborder+="${dbmliborder:+:}bdb"
fi
- OPT="" econf \
+ ac_cv_path_PKG_CONFIG="$(tc-getPKG_CONFIG)" OPT="" econf \
--with-fpectl \
--enable-shared \
$(use_enable ipv6) \
View
6 ...ng/python/python-3.2.4_pre20120715.ebuild → ...ng/python/python-3.2.4_pre20120812.ebuild
@@ -11,13 +11,13 @@ if [[ "${PV}" == *_pre* ]]; then
inherit mercurial
EHG_REPO_URI="http://hg.python.org/cpython"
- EHG_REVISION="4880aac5c665"
+ EHG_REVISION="3654c711019a"
else
MY_PV="${PV%_p*}"
MY_P="Python-${MY_PV}"
fi
-PATCHSET_REVISION="20120401"
+PATCHSET_REVISION="20120729"
DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
HOMEPAGE="http://www.python.org/"
@@ -207,7 +207,7 @@ src_configure() {
dbmliborder+="${dbmliborder:+:}gdbm"
fi
- OPT="" econf \
+ ac_cv_path_PKG_CONFIG="$(tc-getPKG_CONFIG)" OPT="" econf \
--with-fpectl \
--enable-shared \
$(use_enable ipv6) \
View
6 ...lang/python/python-3.3_pre20120715.ebuild → ...lang/python/python-3.3_pre20120812.ebuild
@@ -11,13 +11,13 @@ if [[ "${PV}" == *_pre* ]]; then
inherit mercurial
EHG_REPO_URI="http://hg.python.org/cpython"
- EHG_REVISION="e4dc8be9a72f"
+ EHG_REVISION="34d5ec8a1019"
else
MY_PV="${PV%_p*}"
MY_P="Python-${MY_PV}"
fi
-PATCHSET_REVISION="20120701"
+PATCHSET_REVISION="20120729"
DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
HOMEPAGE="http://www.python.org/"
@@ -184,7 +184,7 @@ src_configure() {
dbmliborder+="${dbmliborder:+:}gdbm"
fi
- OPT="" econf \
+ ac_cv_path_PKG_CONFIG="$(tc-getPKG_CONFIG)" OPT="" econf \
--with-fpectl \
--enable-shared \
$(use_enable ipv6) \
View
2 dev-python/anyvc/Manifest
@@ -1 +1 @@
-DIST anyvc-0.3.7.1.tar.gz 45890 RMD160 d1983650c4f475e1963f07be14728cddafcd5cb7 SHA1 5a445d36cca2eece5649ba2751cfbdb2c7a0b265 SHA256 264ccd659269ff62ca983d48c7affd27194992880d094e32fff58225a9b6311c
+DIST anyvc-0.3.7.1.tar.gz 45890 SHA256 264ccd659269ff62ca983d48c7affd27194992880d094e32fff58225a9b6311c SHA512 90151133b4da41acb10c2d8e421963e5ccb1e8da1e5327d5a69a77ccc647086683f1ff8ef600c69e01cfda28193c69166fa5717af3dbd13761d95ab3f1c7be46 WHIRLPOOL 5f6500d069eafa56434d57c225e566e55aedadaad0c1d4afc7ff76c0481f3e797f6ea64e88d3001e06d6a529dc01d6c38cbb9e2324245c103d7031b7ef00278a
View
2 dev-python/anyvc/anyvc-0.3.7.1-r1000.ebuild
@@ -4,7 +4,7 @@
EAPI="4-python"
PYTHON_MULTIPLE_ABIS="1"
-PYTHON_RESTRICTED_ABIS="3.* *-jython"
+PYTHON_RESTRICTED_ABIS="2.5 3.* *-jython"
inherit distutils
View
2 dev-python/oct2py/oct2py-0.3.2-r1000.ebuild
@@ -4,7 +4,7 @@
EAPI="4-python"
PYTHON_MULTIPLE_ABIS="1"
-PYTHON_RESTRICTED_ABIS="*-jython *-pypy-*"
+PYTHON_RESTRICTED_ABIS="2.5 *-jython *-pypy-*"
PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*"
DISTUTILS_SRC_TEST="nosetests"
View
1 dev-python/pyside-tools/Manifest
@@ -1,2 +1 @@
-DIST pyside-tools-0.2.13.tar.bz2 75634 SHA256 091e8d09f144626d64671ce8c59e165d81b3443a8538102729fc72fb5b5b364c SHA512 7759bc7087651d2a18053d9a5b9e791711c1c706024dad8ebd35f7824ecf60a9468c114e09ddf63337880feb668c63002ddeaadd270ba421c7d841a45bbc67e0 WHIRLPOOL 10a4ce259489c078ac2a78e2b3eef62f83f207df59ea5c5df048561247b1c4970a844bb8b60b9e7dd25224e97a9883753404201b73259a1a99c1a871a8c53264
DIST pyside-tools-0.2.14.tar.bz2 76575 SHA256 cbd5d2ecf872434442f095766d5abf29733e3cc474da3e2e679e93b6bc0bb600 SHA512 8da71d0ddf03d5bd974d944a9282fced4602458f4d31dcd119f085ae7555e80518b30def97c73545d5ce3df475567a14ba14b12687b24e822747711bc69c9d59 WHIRLPOOL 33eccfdb8ad582973e80fb98b91b1af818b0eeb6de832c168e9293cf36db41bd08aca8dca1a1e674253b0e57bdc0cce800da5c39cbe8dcad2341b38d23746435
View
5 dev-python/pyside-tools/files/0.2.13-fix-pysideuic-test-and-install.patch
@@ -1,6 +1,5 @@
-diff -Naur pyside-tools-0.2.13.orig/CMakeLists.txt pyside-tools-0.2.13/CMakeLists.txt
---- pyside-tools-0.2.13.orig/CMakeLists.txt 2012-03-09 00:46:56.377462594 +0100
-+++ pyside-tools-0.2.13/CMakeLists.txt 2012-03-09 00:48:08.888556082 +0100
+--- CMakeLists.txt
++++ CMakeLists.txt
@@ -11,7 +11,7 @@
set(pyside_tools_MICRO_VERSION "13")
set(pyside_tools_VERSION "${pyside_tools_MAJOR_VERSION}.${pyside_tools_MINOR_VERSION}.${pyside_tools_MICRO_VERSION}")
View
5 dev-python/pyside-tools/metadata.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>qt</herd>
-</pkgmetadata>
View
91 dev-python/pyside-tools/pyside-tools-0.2.13-r2.ebuild
@@ -1,91 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.2.13-r2.ebuild,v 1.5 2012/05/04 15:12:16 patrick Exp $
-
-EAPI=4
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
-
-VIRTUALX_COMMAND="cmake-utils_src_test"
-
-inherit eutils cmake-utils python virtualx
-
-DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
-HOMEPAGE="http://www.pyside.org/"
-SRC_URI="http://www.pyside.org/files/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
- >=dev-python/pyside-1.1.0-r1[X]
- >=dev-python/shiboken-1.1.0-r1
- >=x11-libs/qt-core-4.7.0:4
- >=x11-libs/qt-gui-4.7.0:4
-"
-DEPEND="${RDEPEND}
- test? ( virtual/pkgconfig )
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PV}-fix-pysideuic-test-and-install.patch
-
- python_copy_sources
-
- preparation() {
- sed -i -e "/pkg-config/ s:shiboken:&-python${PYTHON_ABI}:" \
- tests/rcc/run_test.sh || die
- }
- python_execute_function -s preparation
-}
-
-src_configure() {
- configuration() {
- local mycmakeargs=(
- -DPYTHON_BASENAME="-python${PYTHON_ABI}"
- -DPYTHON_SUFFIX="-python${PYTHON_ABI}"
- -DSITE_PACKAGE="$(python_get_sitedir)"
- $(cmake-utils_use_build test TESTS)
- )
- CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_configure
- }
- python_execute_function -s configuration
-}
-
-src_compile() {
- compilation() {
- CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_make
- }
- python_execute_function -s compilation
-}
-
-src_test() {
- testing() {
- CMAKE_USE_DIR="${BUILDDIR}" virtualmake
- }
- python_execute_function -s testing
-}
-
-src_install() {
- installation() {
- CMAKE_USE_DIR="${BUILDDIR}" cmake-utils_src_install DESTDIR="${T}/images/${PYTHON_ABI}"
- }
- python_execute_function -s installation
- python_merge_intermediate_installation_images "${T}/images"
-
- dodoc AUTHORS ChangeLog
-}
-
-pkg_postinst() {
- python_mod_optimize pysideuic
-}
-
-pkg_postrm() {
- python_mod_cleanup pysideuic
-}
View
29 ...n/pyside-tools/pyside-tools-0.2.14.ebuild → ...de-tools/pyside-tools-0.2.14-r1000.ebuild
@@ -1,19 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright owners: Gentoo Foundation
+# Arfrever Frehtes Taifersar Arahesis
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside-tools/pyside-tools-0.2.14.ebuild,v 1.4 2012/07/03 14:04:11 ago Exp $
-
-EAPI=4
+EAPI="4-python"
CMAKE_IN_SOURCE_BUILD="1"
-
-PYTHON_DEPEND="2:2.6 3:3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.1 *-jython 2.7-pypy-*"
-PYTHON_TESTS_RESTRICTED_ABIS="3.*"
-
+PYTHON_MULTIPLE_ABIS="1"
+PYTHON_RESTRICTED_ABIS="2.5 3.1 *-jython *-pypy-*"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="3.*"
VIRTUALX_COMMAND="cmake-utils_src_test"
-inherit eutils cmake-utils python virtualx
+inherit cmake-utils eutils python virtualx
DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
HOMEPAGE="http://www.pyside.org/"
@@ -25,8 +21,8 @@ KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
- >=dev-python/pyside-1.1.0-r1[X]
- >=dev-python/shiboken-1.1.0-r1
+ $(python_abi_depend ">=dev-python/pyside-1.1.0-r1[X]")
+ $(python_abi_depend ">=dev-python/shiboken-1.1.0-r1")
>=x11-libs/qt-core-4.7.0:4
>=x11-libs/qt-gui-4.7.0:4
"
@@ -35,19 +31,18 @@ DEPEND="${RDEPEND}
"
src_prepare() {
- epatch "${FILESDIR}"/0.2.13-fix-pysideuic-test-and-install.patch
+ epatch "${FILESDIR}/0.2.13-fix-pysideuic-test-and-install.patch"
python_copy_sources
preparation() {
- if [[ $(python_get_version -l --major) == 3 ]]; then
+ if [[ "$(python_get_version -l --major)" == "3" ]]; then
rm -fr pysideuic/port_v2
else
rm -fr pysideuic/port_v3
fi
- sed -i -e "/pkg-config/ s:shiboken:&-python${PYTHON_ABI}:" \
- tests/rcc/run_test.sh || die
+ sed -e "/pkg-config/s:shiboken:&-python${PYTHON_ABI}:" -i tests/rcc/run_test.sh || die "sed failed"
}
python_execute_function -s preparation
}
View
2 dev-python/pyside/files/rpath.cmake
@@ -1,5 +1,5 @@
# use, i.e. don't skip the full RPATH for the build tree
-SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+SET(CMAKE_SKIP_BUILD_RPATH FALSE)
# when building, don't use the install RPATH already
# (but later on when installing)
View
20 dev-python/pyside/metadata.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>qt</herd>
- <use>
- <flag name="X">Build QtGui, QtDesigner, QtTest and QtUiTools modules</flag>
- <flag name="declarative">Build QtDeclarative module</flag>
- <flag name="help">Build QtHelp module</flag>
- <flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
- <flag name="multimedia">Build QtMultimedia module</flag>
- <flag name="opengl">Build QtOpenGL module</flag>
- <flag name="phonon">Build phonon module</flag>
- <flag name="script">Build QtScript module</flag>
- <flag name="scripttools">Build QtScriptTools module</flag>
- <flag name="sql">Build QtSql module</flag>
- <flag name="svg">Build QtSvg module</flag>
- <flag name="webkit">Build QtWebKit module</flag>
- <flag name="xmlpatterns">Build QtXmlPatterns module</flag>
- </use>
-</pkgmetadata>
View
21 dev-python/pyside/pyside-1.1.1.ebuild → dev-python/pyside/pyside-1.1.1-r1000.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright owners: Gentoo Foundation
+# Arfrever Frehtes Taifersar Arahesis
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-1.1.1.ebuild,v 1.8 2012/07/27 21:32:49 steev Exp $
-EAPI=4
-
-PYTHON_DEPEND="2:2.6 3:3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.1 *-jython 2.7-pypy-*"
+EAPI="4-python"
+PYTHON_MULTIPLE_ABIS="1"
+PYTHON_RESTRICTED_ABIS="2.5 3.1 *-jython *-pypy-*"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*"
VIRTUALX_COMMAND="cmake-utils_src_test"
-inherit multilib cmake-utils python virtualx
+inherit cmake-utils multilib python virtualx
MY_P="${PN}-qt4.8+${PV}"
@@ -39,7 +38,7 @@ REQUIRED_USE="
QT_PV="4.7.0:4"
RDEPEND="
- >=dev-python/shiboken-${PV}
+ $(python_abi_depend ">=dev-python/shiboken-${PV}")
>=x11-libs/qt-core-${QT_PV}
X? (
>=x11-libs/qt-gui-${QT_PV}[accessibility]
@@ -67,7 +66,7 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
-DOCS=( ChangeLog )
+DOCS=(ChangeLog)
src_prepare() {
# Fix generated pkgconfig file to require the shiboken
@@ -128,7 +127,7 @@ src_test() {
src_install() {
installation() {
CMAKE_BUILD_DIR="${S}_${PYTHON_ABI}" cmake-utils_src_install
- mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc || die
+ mv "${ED}"usr/$(get_libdir)/pkgconfig/${PN}{,-python${PYTHON_ABI}}.pc
}
python_execute_function installation
}
View
2 ...5-cache/dev-lang/python-2.7.4_pre20120715 → ...5-cache/dev-lang/python-2.7.4_pre20120812
@@ -10,4 +10,4 @@ PDEPEND=app-admin/python-updater
RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 ) >=app-admin/eselect-python-20091230 >=app-shells/bash-4
SLOT=2.7
_eclasses_=autotools d89996a2048bc6d1ae72bfa4c04517fe eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool a83de71c2123161fc5a8323cb275f8e5 mercurial add64e64d758a9618d46a08a95f77483 multilib 5782800349f728f725f9378105c6a2ab multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3765279594d75d87b5b06b324c97ad7b
+_md5_=4924950f0ffd8aab5dc3f88d285858f9
View
2 ...5-cache/dev-lang/python-3.2.4_pre20120715 → ...5-cache/dev-lang/python-3.2.4_pre20120812
@@ -10,4 +10,4 @@ PDEPEND=app-admin/python-updater
RDEPEND=app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230 >=app-shells/bash-4
SLOT=3.2
_eclasses_=autotools d89996a2048bc6d1ae72bfa4c04517fe eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool a83de71c2123161fc5a8323cb275f8e5 mercurial add64e64d758a9618d46a08a95f77483 multilib 5782800349f728f725f9378105c6a2ab multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=26b3f456145ef47a4269211a3a3294ec
+_md5_=4ffbd131eb64b5be3d0b5753284cd1ef
View
2 ...md5-cache/dev-lang/python-3.3_pre20120715 → ...md5-cache/dev-lang/python-3.3_pre20120812
@@ -10,4 +10,4 @@ PDEPEND=app-admin/python-updater
RDEPEND=app-arch/bzip2 app-arch/xz-utils >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2.1 ) ) !build? ( app-misc/mime-types ) >=app-admin/eselect-python-20091230 >=app-shells/bash-4
SLOT=3.3
_eclasses_=autotools d89996a2048bc6d1ae72bfa4c04517fe eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f libtool a83de71c2123161fc5a8323cb275f8e5 mercurial add64e64d758a9618d46a08a95f77483 multilib 5782800349f728f725f9378105c6a2ab multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=735d827199b8739dc3db41f415af054c
+_md5_=8b5c9af925d23c046b41f57b92cf9942
View
10 metadata/md5-cache/dev-python/anyvc-0.3.7.1-r1000
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=dev-python/apipkg[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] dev-python/execnet[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] dev-python/py[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] git? ( dev-python/dulwich[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) mercurial? ( dev-vcs/mercurial[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) subversion? ( dev-python/subvertpy[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) dev-python/setuptools[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] doc? ( dev-python/sphinx[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) python_abis_2.5? ( dev-lang/python:2.5 ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_2.7-pypy-1.8? ( dev-python/pypy:1.8 ) python_abis_2.7-pypy-1.9? ( dev-python/pypy:1.9 )
+DEPEND=dev-python/apipkg[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] dev-python/execnet[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] dev-python/py[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] git? ( dev-python/dulwich[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) mercurial? ( dev-vcs/mercurial[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) subversion? ( dev-python/subvertpy[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) dev-python/setuptools[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] doc? ( dev-python/sphinx[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_2.7-pypy-1.8? ( dev-python/pypy:1.8 ) python_abis_2.7-pypy-1.9? ( dev-python/pypy:1.9 )
DESCRIPTION=Library to access any version control system
EAPI=4-python
HOMEPAGE=http://pypi.python.org/pypi/anyvc
-IUSE=doc git mercurial subversion python_abis_2.5 python_abis_2.6 python_abis_2.7 python_abis_2.7-pypy-1.8 python_abis_2.7-pypy-1.9
+IUSE=doc git mercurial subversion python_abis_2.6 python_abis_2.7 python_abis_2.7-pypy-1.8 python_abis_2.7-pypy-1.9
KEYWORDS=amd64 x86
LICENSE=GPL-2
-RDEPEND=dev-python/apipkg[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] dev-python/execnet[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] dev-python/py[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] git? ( dev-python/dulwich[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) mercurial? ( dev-vcs/mercurial[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) subversion? ( dev-python/subvertpy[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) python_abis_2.5? ( dev-lang/python:2.5 ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_2.7-pypy-1.8? ( dev-python/pypy:1.8 ) python_abis_2.7-pypy-1.9? ( dev-python/pypy:1.9 )
-REQUIRED_USE=|| ( python_abis_2.5 python_abis_2.6 python_abis_2.7 python_abis_2.7-pypy-1.8 python_abis_2.7-pypy-1.9 )
+RDEPEND=dev-python/apipkg[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] dev-python/execnet[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] dev-python/py[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] git? ( dev-python/dulwich[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) mercurial? ( dev-vcs/mercurial[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) subversion? ( dev-python/subvertpy[python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.8?,python_abis_2.7-pypy-1.9?] ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_2.7-pypy-1.8? ( dev-python/pypy:1.8 ) python_abis_2.7-pypy-1.9? ( dev-python/pypy:1.9 )
+REQUIRED_USE=|| ( python_abis_2.6 python_abis_2.7 python_abis_2.7-pypy-1.8 python_abis_2.7-pypy-1.9 )
SLOT=0
SRC_URI=mirror://pypi/a/anyvc/anyvc-0.3.7.1.tar.gz
_eclasses_=distutils 82a876811ffd4907daba6062958daa26 python 1a2be1ad82e0d83243e3808e4edb70c5
-_md5_=39791646c5f7e1bff0f8fb084345a0fc
+_md5_=cbe13e5fb06c02bd7aead96d6d6bb35f
View
10 metadata/md5-cache/dev-python/oct2py-0.3.2-r1000
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile install postinst postrm prepare setup test
-DEPEND=dev-python/numpy[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] sci-libs/scipy[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] sci-mathematics/octave doc? ( dev-python/sphinx[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] ) python_abis_2.5? ( dev-lang/python:2.5 ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.1? ( dev-lang/python:3.1 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 ) test? ( dev-python/nose[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] )
+DEPEND=dev-python/numpy[python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] sci-libs/scipy[python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] sci-mathematics/octave doc? ( dev-python/sphinx[python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.1? ( dev-lang/python:3.1 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 ) test? ( dev-python/nose[python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] )
DESCRIPTION=Python to GNU Octave bridge
EAPI=4-python
HOMEPAGE=http://pypi.python.org/pypi/oct2py
-IUSE=doc examples python_abis_2.5 python_abis_2.6 python_abis_2.7 python_abis_3.1 python_abis_3.2 python_abis_3.3 test
+IUSE=doc examples python_abis_2.6 python_abis_2.7 python_abis_3.1 python_abis_3.2 python_abis_3.3 test
KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=MIT
-RDEPEND=dev-python/numpy[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] sci-libs/scipy[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] sci-mathematics/octave python_abis_2.5? ( dev-lang/python:2.5 ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.1? ( dev-lang/python:3.1 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 )
-REQUIRED_USE=|| ( python_abis_2.5 python_abis_2.6 python_abis_2.7 python_abis_3.1 python_abis_3.2 python_abis_3.3 )
+RDEPEND=dev-python/numpy[python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] sci-libs/scipy[python_abis_2.6?,python_abis_2.7?,python_abis_3.1?,python_abis_3.2?,python_abis_3.3?] sci-mathematics/octave python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.1? ( dev-lang/python:3.1 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 )
+REQUIRED_USE=|| ( python_abis_2.6 python_abis_2.7 python_abis_3.1 python_abis_3.2 python_abis_3.3 )
SLOT=0
SRC_URI=mirror://pypi/o/oct2py/oct2py-0.3.2.tar.gz
_eclasses_=distutils 82a876811ffd4907daba6062958daa26 python 1a2be1ad82e0d83243e3808e4edb70c5
-_md5_=9c64cf6fbfb83ce3d8c553f1ad27f519
+_md5_=b2a662e937c655300b216badd94cd45e
View
14 metadata/md5-cache/dev-python/pyside-1.1.1
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-python/shiboken-1.1.1 >=x11-libs/qt-core-4.7.0:4 X? ( >=x11-libs/qt-gui-4.7.0:4[accessibility] >=x11-libs/qt-test-4.7.0:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) help? ( >=x11-libs/qt-assistant-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-4.7.0:4 media-libs/phonon ) ) ) script? ( >=x11-libs/qt-script-4.7.0:4 ) sql? ( >=x11-libs/qt-sql-4.7.0:4 ) svg? ( >=x11-libs/qt-svg-4.7.0:4[accessibility] ) webkit? ( >=x11-libs/qt-webkit-4.7.0:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) >=x11-libs/qt-gui-4.7.0:4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Python bindings for the Qt framework
-EAPI=4
-HOMEPAGE=http://www.pyside.org/
-IUSE=X declarative help multimedia kde opengl phonon script scripttools sql svg test webkit xmlpatterns test
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-python/shiboken-1.1.1 >=x11-libs/qt-core-4.7.0:4 X? ( >=x11-libs/qt-gui-4.7.0:4[accessibility] >=x11-libs/qt-test-4.7.0:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) help? ( >=x11-libs/qt-assistant-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-4.7.0:4 media-libs/phonon ) ) ) script? ( >=x11-libs/qt-script-4.7.0:4 ) sql? ( >=x11-libs/qt-sql-4.7.0:4 ) svg? ( >=x11-libs/qt-svg-4.7.0:4[accessibility] ) webkit? ( >=x11-libs/qt-webkit-4.7.0:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-REQUIRED_USE=declarative? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) test? ( X ) webkit? ( X )
-SLOT=0
-SRC_URI=http://www.pyside.org/files/pyside-qt4.8+1.1.1.tar.bz2
-_eclasses_=base 9ef3e1720046c9c90326cc357ab51a77 cmake-utils a18284c48239b2b3c02951d6dadf8fe3 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28 virtualx 0c41ff55e46b959d9457dde69e7a09d9
-_md5_=e5a59774815395c61a62c3f30b53ad06
View
14 metadata/md5-cache/dev-python/pyside-1.1.1-r1000
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-python/shiboken-1.1.1[python_abis_2.6?,python_abis_2.7?,python_abis_3.2?,python_abis_3.3?] >=x11-libs/qt-core-4.7.0:4 X? ( >=x11-libs/qt-gui-4.7.0:4[accessibility] >=x11-libs/qt-test-4.7.0:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) help? ( >=x11-libs/qt-assistant-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-4.7.0:4 media-libs/phonon ) ) ) script? ( >=x11-libs/qt-script-4.7.0:4 ) sql? ( >=x11-libs/qt-sql-4.7.0:4 ) svg? ( >=x11-libs/qt-svg-4.7.0:4[accessibility] ) webkit? ( >=x11-libs/qt-webkit-4.7.0:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) >=x11-libs/qt-gui-4.7.0:4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Python bindings for the Qt framework
+EAPI=4-python
+HOMEPAGE=http://www.pyside.org/
+IUSE=X declarative help multimedia kde opengl phonon script scripttools sql svg test webkit xmlpatterns python_abis_2.6 python_abis_2.7 python_abis_3.2 python_abis_3.3 test
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/shiboken-1.1.1[python_abis_2.6?,python_abis_2.7?,python_abis_3.2?,python_abis_3.3?] >=x11-libs/qt-core-4.7.0:4 X? ( >=x11-libs/qt-gui-4.7.0:4[accessibility] >=x11-libs/qt-test-4.7.0:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.0:4 ) help? ( >=x11-libs/qt-assistant-4.7.0:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.0:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.0:4 ) phonon? ( kde? ( media-libs/phonon ) !kde? ( || ( >=x11-libs/qt-phonon-4.7.0:4 media-libs/phonon ) ) ) script? ( >=x11-libs/qt-script-4.7.0:4 ) sql? ( >=x11-libs/qt-sql-4.7.0:4 ) svg? ( >=x11-libs/qt-svg-4.7.0:4[accessibility] ) webkit? ( >=x11-libs/qt-webkit-4.7.0:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.0:4 ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 )
+REQUIRED_USE=declarative? ( X ) help? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) scripttools? ( X script ) sql? ( X ) svg? ( X ) test? ( X ) webkit? ( X ) || ( python_abis_2.6 python_abis_2.7 python_abis_3.2 python_abis_3.3 )
+SLOT=0
+SRC_URI=http://www.pyside.org/files/pyside-qt4.8+1.1.1.tar.bz2
+_eclasses_=base 9ef3e1720046c9c90326cc357ab51a77 cmake-utils a18284c48239b2b3c02951d6dadf8fe3 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28 virtualx 0c41ff55e46b959d9457dde69e7a09d9
+_md5_=479a4973b0af1466f4b9c7217b027830
View
13 metadata/md5-cache/dev-python/pyside-tools-0.2.13-r2
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-python/pyside-1.1.0-r1[X] >=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 test? ( virtual/pkgconfig ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=PySide development tools (lupdate, rcc, uic)
-EAPI=4
-HOMEPAGE=http://www.pyside.org/
-IUSE=test test
-KEYWORDS=amd64 x86
-LICENSE=BSD GPL-2
-RDEPEND=>=dev-python/pyside-1.1.0-r1[X] >=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://www.pyside.org/files/pyside-tools-0.2.13.tar.bz2
-_eclasses_=base 9ef3e1720046c9c90326cc357ab51a77 cmake-utils a18284c48239b2b3c02951d6dadf8fe3 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28 virtualx 0c41ff55e46b959d9457dde69e7a09d9
-_md5_=3b995b6a8d593b16674fb7574aa461fc
View
13 metadata/md5-cache/dev-python/pyside-tools-0.2.14
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-python/pyside-1.1.0-r1[X] >=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 test? ( virtual/pkgconfig ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=PySide development tools (lupdate, rcc, uic)
-EAPI=4
-HOMEPAGE=http://www.pyside.org/
-IUSE=test test
-KEYWORDS=amd64 x86
-LICENSE=BSD GPL-2
-RDEPEND=>=dev-python/pyside-1.1.0-r1[X] >=dev-python/shiboken-1.1.0-r1 >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=http://www.pyside.org/files/pyside-tools-0.2.14.tar.bz2
-_eclasses_=base 9ef3e1720046c9c90326cc357ab51a77 cmake-utils a18284c48239b2b3c02951d6dadf8fe3 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28 virtualx 0c41ff55e46b959d9457dde69e7a09d9
-_md5_=4c94565b95c8675c46af796ca2537696
View
14 metadata/md5-cache/dev-python/pyside-tools-0.2.14-r1000
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-python/pyside-1.1.0-r1[X,python_abis_2.6?,python_abis_2.7?,python_abis_3.2?,python_abis_3.3?] >=dev-python/shiboken-1.1.0-r1[python_abis_2.6?,python_abis_2.7?,python_abis_3.2?,python_abis_3.3?] >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 test? ( virtual/pkgconfig ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=PySide development tools (lupdate, rcc, uic)
+EAPI=4-python
+HOMEPAGE=http://www.pyside.org/
+IUSE=test python_abis_2.6 python_abis_2.7 python_abis_3.2 python_abis_3.3 test
+KEYWORDS=amd64 x86
+LICENSE=BSD GPL-2
+RDEPEND=>=dev-python/pyside-1.1.0-r1[X,python_abis_2.6?,python_abis_2.7?,python_abis_3.2?,python_abis_3.3?] >=dev-python/shiboken-1.1.0-r1[python_abis_2.6?,python_abis_2.7?,python_abis_3.2?,python_abis_3.3?] >=x11-libs/qt-core-4.7.0:4 >=x11-libs/qt-gui-4.7.0:4 python_abis_2.6? ( dev-lang/python:2.6 ) python_abis_2.7? ( dev-lang/python:2.7 ) python_abis_3.2? ( dev-lang/python:3.2 ) python_abis_3.3? ( dev-lang/python:3.3 )
+REQUIRED_USE=|| ( python_abis_2.6 python_abis_2.7 python_abis_3.2 python_abis_3.3 )
+SLOT=0
+SRC_URI=http://www.pyside.org/files/pyside-tools-0.2.14.tar.bz2
+_eclasses_=base 9ef3e1720046c9c90326cc357ab51a77 cmake-utils a18284c48239b2b3c02951d6dadf8fe3 eutils 327b713e2d6949c42cd96bc4898fd280 flag-o-matic 2c938a1fe61ea9899a2b97ea1e065f5f multilib 5782800349f728f725f9378105c6a2ab python 1a2be1ad82e0d83243e3808e4edb70c5 toolchain-funcs d3b5812eeab360bc41aa48b6cdbbc142 user d0a4d0735a6c0183d707ca919bd72f28 virtualx 0c41ff55e46b959d9457dde69e7a09d9
+_md5_=837f3fa15ff9b5e88e65edf2e37892d1
View
6 profiles/package.mask/funtoo-python
@@ -1,12 +1,12 @@
+=dev-lang/python-3.2.4_pre20120812
=dev-lang/python-2.7.4_pre20120729
=dev-lang/python-3.2.4_pre20120722
-=dev-lang/python-2.7.4_pre20120715
=dev-lang/python-3.3_pre20120805
-=dev-lang/python-3.3_pre20120715
=dev-lang/python-3.2.4_pre20120729
=dev-lang/python-2.7.4_pre20120805
+=dev-lang/python-3.3_pre20120812
=dev-lang/python-2.7.4_pre20120722
=dev-lang/python-3.3_pre20120729
-=dev-lang/python-3.2.4_pre20120715
+=dev-lang/python-2.7.4_pre20120812
=dev-lang/python-3.3_pre20120722
=dev-lang/python-3.2.4_pre20120805

0 comments on commit fbd8811

Please sign in to comment.