Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

glorious funtoo updates

merged:

  gentoo: 37f9ad461abef640c90c2d8a95542d38095a3326
  funtoo-overlay: 4023fc5b61b05a0ef51a1c96a9a3fa007e745691
  foo-overlay: 456b688c3863d3f6862ad065b3200ec5c66e1814
  bar-overlay: fb087c5a693ccc4195a2b824a60290a724802b2c
  flora: cdd353877f1a3c8497a4bca95c9bb3aedf9b74ad
  • Loading branch information...
commit cbb4c9b6dabbbdf18e430e8906d451335dad72ee 1 parent c9589ef
@danielrobbins danielrobbins authored
View
4 dev-python/reportlab/reportlab-2.5.ebuild → dev-python/reportlab/reportlab-2.5-r1000.ebuild
@@ -9,8 +9,8 @@ PYTHON_RESTRICTED_ABIS="3.* *-jython"
inherit distutils eutils versionator
DESCRIPTION="Tools for generating printable PDF documents from any data source."
-HOMEPAGE="http://www.reportlab.org/ http://pypi.python.org/pypi/reportlab"
-SRC_URI="http://www.reportlab.org/ftp/${P}.tar.gz"
+HOMEPAGE="http://www.reportlab.com/ http://pypi.python.org/pypi/reportlab"
+SRC_URI="http://www.reportlab.com/ftp/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
View
38 dev-python/sphinx/files/sphinx-1.1.3-python3.patch
@@ -0,0 +1,38 @@
+https://bitbucket.org/birkenfeld/sphinx/changeset/8aba132b1337
+
+--- sphinx/ext/graphviz.py
++++ sphinx/ext/graphviz.py
+@@ -121,9 +121,11 @@
+
+ def render_dot(self, code, options, format, prefix='graphviz'):
+ """Render graphviz code into a PNG or PDF output file."""
+- hashkey = code.encode('utf-8') + str(options) + \
++ hashkey = (code + str(options) + \
+ str(self.builder.config.graphviz_dot) + \
+ str(self.builder.config.graphviz_dot_args)
++ ).encode('utf-8')
++
+ fname = '%s-%s.%s' % (prefix, sha(hashkey).hexdigest(), format)
+ if hasattr(self.builder, 'imgpath'):
+ # HTML
+--- sphinx/ext/inheritance_diagram.py
++++ sphinx/ext/inheritance_diagram.py
+@@ -39,7 +39,7 @@
+ import re
+ import sys
+ import inspect
+-import __builtin__
++import __builtin__ as __builtin__ # as __builtin__ is for lib2to3 compatibility
+ try:
+ from hashlib import md5
+ except ImportError:
+@@ -314,7 +314,8 @@
+
+
+ def get_graph_hash(node):
+- return md5(node['content'] + str(node['parts'])).hexdigest()[-10:]
++ encoded = (node['content'] + str(node['parts'])).encode('utf-8')
++ return md5(encoded).hexdigest()[-10:]
+
+
+ def html_visit_inheritance_diagram(self, node):
View
3  dev-python/sphinx/sphinx-1.1.3-r1000.ebuild → dev-python/sphinx/sphinx-1.1.3-r1001.ebuild
@@ -7,7 +7,7 @@ PYTHON_MULTIPLE_ABIS="1"
PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*-jython"
DISTUTILS_SRC_TEST="nosetests"
-inherit distutils
+inherit distutils eutils
MY_PN="Sphinx"
MY_P="${MY_PN}-${PV}"
@@ -37,6 +37,7 @@ DOCS="CHANGES"
src_prepare() {
distutils_src_prepare
+ epatch "${FILESDIR}/${P}-python3.patch"
prepare_tests() {
cp -r tests tests-${PYTHON_ABI}
View
116 dev-python/wxpython/files/wxpython-2.8.12.1-c++.patch
@@ -0,0 +1,116 @@
+--- config.py
++++ config.py
+@@ -702,113 +702,6 @@
+
+ return ep
+
+-#----------------------------------------------------------------------
+-# These functions and class are copied from distutils in Python 2.5
+-# and then grafted back into the distutils modules so we can change
+-# how the -arch and -isysroot compiler args are handled. Basically if
+-# -arch is specified in our compiler args then we need to strip all of
+-# the -arch and -isysroot args provided by Python.
+-
+-import distutils.unixccompiler
+-import distutils.sysconfig
+-from distutils.errors import DistutilsExecError, CompileError
+-
+-def _darwin_compiler_fixup(compiler_so, cc_args):
+- """
+- This function will strip '-isysroot PATH' and '-arch ARCH' from the
+- compile flags if the user has specified one them in extra_compile_flags.
+-
+- This is needed because '-arch ARCH' adds another architecture to the
+- build, without a way to remove an architecture. Furthermore GCC will
+- barf if multiple '-isysroot' arguments are present.
+- """
+- stripArch = stripSysroot = 0
+-
+- compiler_so = list(compiler_so)
+- kernel_version = os.uname()[2] # 8.4.3
+- major_version = int(kernel_version.split('.')[0])
+-
+- if major_version < 8:
+- # OSX before 10.4.0, these don't support -arch and -isysroot at
+- # all.
+- stripArch = stripSysroot = True
+- else:
+- stripArch = '-arch' in cc_args
+- stripSysroot = '-isysroot' in cc_args or stripArch # <== This line changed
+-
+- if stripArch:
+- while 1:
+- try:
+- index = compiler_so.index('-arch')
+- # Strip this argument and the next one:
+- del compiler_so[index:index+2]
+- except ValueError:
+- break
+-
+- if stripSysroot:
+- try:
+- index = compiler_so.index('-isysroot')
+- # Strip this argument and the next one:
+- del compiler_so[index:index+2]
+- except ValueError:
+- pass
+-
+- # Check if the SDK that is used during compilation actually exists,
+- # the universal build requires the usage of a universal SDK and not all
+- # users have that installed by default.
+- sysroot = None
+- if '-isysroot' in cc_args:
+- idx = cc_args.index('-isysroot')
+- sysroot = cc_args[idx+1]
+- elif '-isysroot' in compiler_so:
+- idx = compiler_so.index('-isysroot')
+- sysroot = compiler_so[idx+1]
+-
+- if sysroot and not os.path.isdir(sysroot):
+- log.warn("Compiling with an SDK that doesn't seem to exist: %s",
+- sysroot)
+- log.warn("Please check your Xcode installation")
+-
+- return compiler_so
+-
+-
+-def _darwin_compiler_fixup_24(compiler_so, cc_args):
+- compiler_so = _darwin_compiler_fixup(compiler_so, cc_args)
+- return compiler_so, cc_args
+-
+-
+-class MyUnixCCompiler(distutils.unixccompiler.UnixCCompiler):
+- def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
+- compiler_so = self.compiler_so
+- if sys.platform == 'darwin':
+- compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs)
+- try:
+- self.spawn(compiler_so + cc_args + [src, '-o', obj] +
+- extra_postargs)
+- except DistutilsExecError, msg:
+- raise CompileError, msg
+-
+-
+-_orig_parse_makefile = distutils.sysconfig.parse_makefile
+-def _parse_makefile(filename, g=None):
+- rv = _orig_parse_makefile(filename, g)
+-
+- # If a different deployment target is specified in the
+- # environment then make sure it is put in the global
+- # config dict.
+- if os.getenv('MACOSX_DEPLOYMENT_TARGET'):
+- val = os.getenv('MACOSX_DEPLOYMENT_TARGET')
+- rv['MACOSX_DEPLOYMENT_TARGET'] = val
+- rv['CONFIGURE_MACOSX_DEPLOYMENT_TARGET'] = val
+-
+- return rv
+-
+-
+-distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler
+-distutils.unixccompiler._darwin_compiler_fixup = _darwin_compiler_fixup
+-distutils.unixccompiler._darwin_compiler = _darwin_compiler_fixup_24
+-distutils.sysconfig.parse_makefile = _parse_makefile
+-
+
+ #----------------------------------------------------------------------
+ # Another hack-job for the CygwinCCompiler class, this time replacing
View
5 dev-python/wxpython/wxpython-2.8.12.1.ebuild
@@ -53,6 +53,11 @@ src_prepare() {
# drop editra - we have it as a separate package now
epatch "${FILESDIR}"/${PN}-2.8.12-drop-editra.patch
+ epatch "${FILESDIR}"/${P}-c++.patch
+ pushd wx/build > /dev/null
+ epatch "${FILESDIR}"/${P}-c++.patch
+ popd > /dev/null
+
if use doc; then
cd "${DOC_S}"
epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch
View
6 metadata/md5-cache/dev-python/reportlab-2.5 → metadata/md5-cache/dev-python/reportlab-2.5-r1000
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile install postinst postrm prepare setup test
DEPEND=dev-python/imaging[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.7?,python_abis_2.7-pypy-1.8?] media-fonts/ttf-bitstream-vera media-libs/libart_lgpl sys-libs/zlib 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.7? ( dev-python/pypy:1.7 ) python_abis_2.7-pypy-1.8? ( dev-python/pypy:1.8 )
DESCRIPTION=Tools for generating printable PDF documents from any data source.
EAPI=4-python
-HOMEPAGE=http://www.reportlab.org/ http://pypi.python.org/pypi/reportlab
+HOMEPAGE=http://www.reportlab.com/ http://pypi.python.org/pypi/reportlab
IUSE=doc examples test python_abis_2.5 python_abis_2.6 python_abis_2.7 python_abis_2.7-pypy-1.7 python_abis_2.7-pypy-1.8
KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd
LICENSE=BSD
RDEPEND=dev-python/imaging[python_abis_2.5?,python_abis_2.6?,python_abis_2.7?,python_abis_2.7-pypy-1.7?,python_abis_2.7-pypy-1.8?] media-fonts/ttf-bitstream-vera media-libs/libart_lgpl sys-libs/zlib 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.7? ( dev-python/pypy:1.7 ) python_abis_2.7-pypy-1.8? ( dev-python/pypy:1.8 )
REQUIRED_USE=|| ( python_abis_2.5 python_abis_2.6 python_abis_2.7 python_abis_2.7-pypy-1.7 python_abis_2.7-pypy-1.8 )
SLOT=0
-SRC_URI=http://www.reportlab.org/ftp/reportlab-2.5.tar.gz
+SRC_URI=http://www.reportlab.com/ftp/reportlab-2.5.tar.gz
_eclasses_=distutils 82a876811ffd4907daba6062958daa26 eutils 74d9118e657da5b1db0c36f5dea88e57 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python cb2844e25e38800105564c14a716c805 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=cab5412875b033123ffa5a4dfac1012f
+_md5_=48f82e847634a020cc0154194cabb060
View
4 metadata/md5-cache/dev-python/sphinx-1.1.3-r1000 → metadata/md5-cache/dev-python/sphinx-1.1.3-r1001
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/docutils-0.7[python_abis_2.5?,python_abis_2.6?,python_abis_
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 python_abis_2.5-jython python_abis_2.6-jython python_abis_2.7-pypy-1.7 python_abis_2.7-pypy-1.8 )
SLOT=0
SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
-_eclasses_=distutils 82a876811ffd4907daba6062958daa26 python cb2844e25e38800105564c14a716c805
-_md5_=a0f117dd40f3bb3e420f540ff912ad4e
+_eclasses_=distutils 82a876811ffd4907daba6062958daa26 eutils 74d9118e657da5b1db0c36f5dea88e57 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python cb2844e25e38800105564c14a716c805 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 32a09e82e2f592bf88ad2fd08525166e
+_md5_=9591fd6276213ebaa8a767c711a2a9a7
View
2  metadata/md5-cache/dev-python/wxpython-2.8.12.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_abis_2.5 python_abis_2.6 python_abis_2.7 )
SLOT=2.8
SRC_URI=mirror://sourceforge/wxpython/wxPython-src-2.8.12.1.tar.bz2 doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.8.12.1.tar.bz2 mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) examples? ( mirror://sourceforge/wxpython/wxPython-demo-2.8.12.1.tar.bz2 )
_eclasses_=alternatives 7a734a903498a04a0722152a124aa3a5 distutils 82a876811ffd4907daba6062958daa26 eutils 74d9118e657da5b1db0c36f5dea88e57 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib 5f4ad6cf85e365e8f0c6050ddd21659e python cb2844e25e38800105564c14a716c805 toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 32a09e82e2f592bf88ad2fd08525166e wxwidgets fb1a306837717dfa2af841ecdf929565
-_md5_=a84b9e235ae1e4defc4d00976af83540
+_md5_=2904ec494f909255c7ce9af017be5166
Please sign in to comment.
Something went wrong with that request. Please try again.