Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 30515009abcc605d111c7fb123fef4bdb709547a
  foo-overlay: 49364501b49e209c1e5602ddde1dd6531e118fab
  bar-overlay: 78a0865873ba50e93705d46779fd9344e60a9af3
  flora: 475c1be884ecb24c9925d6cb529178049dd27f2f
  mythtv: 00027cc812a879fe67e687843f201cd95e000a94
  • Loading branch information...
1 parent 0e40e80 commit 3992844163c68f4d5c54b7a2bf300d09ee4f29cf @danielrobbins danielrobbins committed Oct 1, 2012
Showing with 1,621 additions and 15 deletions.
  1. +1 −0 dev-lang/python/Manifest
  2. +70 −0 dev-lang/python/files/3.3.0-0/01_all_static_library_location.patch
  3. +57 −0 dev-lang/python/files/3.3.0-0/02_all_disable_modules_and_ssl.patch
  4. +174 −0 dev-lang/python/files/3.3.0-0/03_all_libdir.patch
  5. +31 −0 dev-lang/python/files/3.3.0-0/04_all_non-zero_exit_status_on_failure.patch
  6. +110 −0 dev-lang/python/files/3.3.0-0/05_all_regenerate_platform-specific_modules.patch
  7. +262 −0 dev-lang/python/files/3.3.0-0/21_all_distutils_c++.patch
  8. +191 −0 dev-lang/python/files/3.3.0-0/22_all_tests_environment.patch
  9. +167 −0 dev-lang/python/files/3.3.0-0/23_all_h2py_encoding.patch
  10. +166 −0 dev-lang/python/files/3.3.0-0/61_all_process_data.patch
  11. +349 −0 dev-lang/python/python-3.3.0-r1000.ebuild
  12. +1 −1 dev-python/fudge/Manifest
  13. +1 −1 dev-python/fudge/fudge-1.0.3.ebuild
  14. +1 −1 dev-python/libcloud/Manifest
  15. 0 dev-python/libcloud/{libcloud-0.11.1-r1000.ebuild → libcloud-0.11.3-r1000.ebuild}
  16. +2 −2 dev-python/pyro/Manifest
  17. +4 −3 dev-python/pyro/{pyro-4.14-r1000.ebuild → pyro-4.15-r1000.ebuild}
  18. +14 −0 metadata/md5-cache/dev-lang/python-3.3.0-r1000
  19. +1 −1 metadata/md5-cache/dev-python/fudge-1.0.3
  20. +1 −1 metadata/md5-cache/dev-python/{libcloud-0.11.1-r1000 → libcloud-0.11.3-r1000}
  21. +3 −3 metadata/md5-cache/dev-python/{pyro-4.14-r1000 → pyro-4.15-r1000}
  22. +1 −1 metadata/md5-cache/sys-apps/file-5.11
  23. +1 −1 metadata/md5-cache/sys-libs/cracklib-2.8.19-r1000
  24. +6 −0 sys-apps/file/file-5.11.ebuild
  25. +7 −0 sys-libs/cracklib/cracklib-2.8.19-r1000.ebuild
View
@@ -8,6 +8,7 @@ DIST Python-3.1.5.tar.xz 8189536 SHA256 035c4370354d901924ce0fd8df65c5452839f590
DIST Python-3.2.2.tar.xz 8923224 RMD160 f28dc7a6b8a6ed1cc359791b1c70367d36ae0af3 SHA1 5e654dbd48476193ccdef4d604ed4f45b48c6769 SHA256 1072d13d846373e7eaa4f94c21f0985d2965e916ff1096abe72d1af67c5f55f9
DIST Python-3.2.3.tar.xz 8970368 SHA256 23c16f621f21e54987079765c060196cbe50235c7867147c6126d433054b1754 SHA512 80a84cc0818b28e0d52828cf23e3618dc25bde5d40dad3d76f1f66d36bdbe14845d6a8582659b304320564ba53cbd5e917f7d435998bbb4c4e2004474d1e7154 WHIRLPOOL 2bdf34a09b12d7b0d7c2df921b74d355eb2ac5dd9d9d979e493f1dba5bbc11034a5b8dfaf11c4210952a56165f8e1d7c0b9badad374fb7ac2236851f93035d0f
DIST Python-3.2.tar.xz 8877208 RMD160 25e958dbb17223d6c2060520e0921e6d9c9f7906 SHA1 55a3a9d39f31563370d0c494373bb6d38e4d1a00 SHA256 38a3de4ed38e92e1c3dd81e230caf6569d41bf8df6537d099541a6d3dca1b132
+DIST Python-3.3.0.tar.xz 11720732 SHA256 09994d2885a8ef61b4b2389527a9805a4a05e3e0f121dbc8e4222f9010f5bbd7 SHA512 36aacc516d7486c8123656171a9400e3881146464abaa56b8dd1c8e3d0c1c31e305529157eacf6e29e3dd0a065c7ff8452addd1d178578bf8db4c9f5c1b7380f WHIRLPOOL 8da50fd249718d6090da9c75af39fa8e925fa91caf828d8067b7f9697cbe98409635b71f05c337f479499b19783257fc5c89844649d48df60ed24d35b42b68a1
DIST python-gentoo-patches-2.6.6-r1.tar.bz2 15729 RMD160 9f0e1f5ead8b1ff1a3a3aedf2fb70d10fe4c6c3b SHA1 2a1fd29501c0f5a424e670e5d6a60c67007f23e7 SHA256 17d7fd6c4de686d41403322bc26bd306607f03843c4f9ab6365a985ded4f4ebb
DIST python-gentoo-patches-2.7.1-r2.tar.bz2 13610 RMD160 13163307b7bebae8eff27ef47859ce449d50aa4b SHA1 54a1d1d1412cd231d039134dfff179f60a7bcda6 SHA256 f56bca3ef0dca20bfd43a130ba8ecc06f062d1457092070a3e97ee2d3315b29b
DIST python-gentoo-patches-3.0.1-r1.tar.bz2 9237 SHA256 2a8ad6df5f6a5bc27d0b9a9ac98768b1107626217bfcd3af5a3ea11272e74a21 SHA512 827ab13dacaf37c9b0a51597a2a686ca063571c750cc0af5b3c0d4ac3f6182d9ea5e84d1a1224a8c6b06b5b0b558246b24e47c90bf298fd6a0ffd054c70b7bf8 WHIRLPOOL b09cd5d41d491dd67c7c783b4ed25ba7f977d11417f82cdf2c7119c90e72826c3134165092db4149ce4d2a4dbf63d6415f41b0ee6d95ea43bef2bfb27ce20c03
@@ -0,0 +1,70 @@
+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); \
+@@ -1148,18 +1161,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'))
+ if not getvar('PYTHONFRAMEWORK'):
+ 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
@@ -0,0 +1,57 @@
+--- 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)
+@@ -455,6 +465,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.
+@@ -764,7 +775,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:
+@@ -775,7 +786,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,
+@@ -808,7 +820,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)
+
@@ -0,0 +1,174 @@
+--- 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
+@@ -140,7 +140,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,10 +303,10 @@
+ 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, "@@GENTOO_LIBDIR@@", "site-python"))
+ 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), 2)
+- 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)
+@@ -677,7 +677,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];
+@@ -687,7 +687,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
+@@ -527,8 +527,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 = []
+@@ -740,11 +739,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:
@@ -0,0 +1,31 @@
+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:
+@@ -297,6 +299,8 @@
+ print()
+
+ if self.failed:
++ global exit_status
++ exit_status = 1
+ failed = self.failed[:]
+ print()
+ print("Failed to build these modules:")
+@@ -2157,6 +2161,7 @@
+ scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
+ "Tools/scripts/2to3", "Tools/scripts/pyvenv"]
+ )
++ sys.exit(exit_status)
+
+ # --install-platlib
+ if __name__ == '__main__':
Oops, something went wrong.

0 comments on commit 3992844

Please sign in to comment.