aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <della5@iinet.com.au>2014-06-17 10:42:55 +0800
committerIan Delaney <della5@iinet.com.au>2014-06-17 10:42:55 +0800
commit8291ea80c141d7cca70d4de3cc67e045bda71e36 (patch)
treea0004117dbcdd90372a39c96f0cff70bd2939fca /dev-python/pycairo/files
parentlong overdue update (diff)
downloadimprovise-8291ea80c141d7cca70d4de3cc67e045bda71e36.tar.gz
improvise-8291ea80c141d7cca70d4de3cc67e045bda71e36.tar.bz2
improvise-8291ea80c141d7cca70d4de3cc67e045bda71e36.zip
mass purge of old ebuilds mostly in portage
Diffstat (limited to 'dev-python/pycairo/files')
-rw-r--r--dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch126
-rw-r--r--dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch126
-rw-r--r--dev-python/pycairo/files/pycairo-1.8.10-pkgconfig_dir.patch11
-rw-r--r--dev-python/pycairo/files/pycairo-1.8.8-svg_check.patch116
4 files changed, 0 insertions, 379 deletions
diff --git a/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch b/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch
deleted file mode 100644
index 4cd755c..0000000
--- a/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- src/cairomodule.c
-+++ src/cairomodule.c
-@@ -127,7 +127,7 @@
- #else
- 0,
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- &PycairoSVGSurface_Type,
- #else
- 0,
-@@ -223,7 +223,7 @@
- if (PyType_Ready(&PycairoPSSurface_Type) < 0)
- return;
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- if (PyType_Ready(&PycairoSVGSurface_Type) < 0)
- return;
- #endif
-@@ -305,7 +305,7 @@
- PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type);
- #endif
-
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- Py_INCREF(&PycairoSVGSurface_Type);
- PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type);
- #endif
-@@ -379,7 +379,7 @@
- #else
- PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0);
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1);
- #else
- PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0);
---- src/private.h
-+++ src/private.h
-@@ -86,7 +86,7 @@
- extern PyTypeObject PycairoPSSurface_Type;
- #endif
-
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- extern PyTypeObject PycairoSVGSurface_Type;
- #endif
-
---- src/pycairo.h
-+++ src/pycairo.h
-@@ -182,7 +182,7 @@
- #define PycairoPSSurface_Type *(Pycairo_CAPI->PSSurface_Type)
- #endif
-
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- #define PycairoSVGSurface_Type *(Pycairo_CAPI->SVGSurface_Type)
- #endif
-
---- src/surface.c
-+++ src/surface.c
-@@ -83,7 +83,7 @@
- type = &PycairoPSSurface_Type;
- break;
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- case CAIRO_SURFACE_TYPE_SVG:
- type = &PycairoSVGSurface_Type;
- break;
-@@ -1015,7 +1015,7 @@
-
-
- /* Class SVGSurface(Surface) ----------------------------------------------- */
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- #include <cairo-svg.h>
-
- static PyObject *
-@@ -1125,7 +1125,7 @@
- 0, /* tp_is_gc */
- 0, /* tp_bases */
- };
--#endif /* CAIRO_HAS_SVG_SURFACE */
-+#endif /* PYCAIRO_ENABLE_SVG */
-
-
- #if CAIRO_HAS_WIN32_SURFACE
---- wscript
-+++ wscript
-@@ -1,6 +1,7 @@
- # -*- python -*-
-
- import os
-+import subprocess
-
- top = '.'
- out = 'build_directory'
-@@ -11,6 +12,17 @@
- cairo_version_required = '1.10.0'
-
-
-+def check_svg():
-+ if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None:
-+ return_code = subprocess.call(['pkg-config', '--exists', 'cairo-svg'])
-+ if return_code == 0:
-+ return True
-+ else:
-+ return False
-+ else:
-+ return False
-+
-+
- def options(ctx):
- print(' %s/options()' %d)
- ctx.tool_options('gnu_dirs')
-@@ -39,6 +51,8 @@
- ctx.define('PYCAIRO_VERSION_MAJOR', version[0])
- ctx.define('PYCAIRO_VERSION_MINOR', version[1])
- ctx.define('PYCAIRO_VERSION_MICRO', version[2])
-+ if check_svg():
-+ ctx.define('PYCAIRO_ENABLE_SVG', 1)
-
- ctx.write_config_header('src/config.h')
-
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch b/dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch
deleted file mode 100644
index 572a5f6..0000000
--- a/dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- src/cairomodule.c
-+++ src/cairomodule.c
-@@ -116,7 +116,7 @@
- #else
- 0,
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- &PycairoSVGSurface_Type,
- #else
- 0,
-@@ -247,7 +247,7 @@
- if (PyType_Ready(&PycairoPSSurface_Type) < 0)
- return NULL;
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- if (PyType_Ready(&PycairoSVGSurface_Type) < 0)
- return NULL;
- #endif
-@@ -337,7 +337,7 @@
- PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type);
- #endif
-
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- Py_INCREF(&PycairoSVGSurface_Type);
- PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type);
- #endif
-@@ -399,7 +399,7 @@
- #else
- PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0);
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1);
- #else
- PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0);
---- src/private.h
-+++ src/private.h
-@@ -75,7 +75,7 @@
- extern PyTypeObject PycairoPSSurface_Type;
- #endif
-
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- extern PyTypeObject PycairoSVGSurface_Type;
- #endif
-
---- src/py3cairo.h
-+++ src/py3cairo.h
-@@ -171,7 +171,7 @@
- #define PycairoPSSurface_Type *(Pycairo_CAPI->PSSurface_Type)
- #endif
-
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- #define PycairoSVGSurface_Type *(Pycairo_CAPI->SVGSurface_Type)
- #endif
-
---- src/surface.c
-+++ src/surface.c
-@@ -72,7 +72,7 @@
- type = &PycairoPSSurface_Type;
- break;
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- case CAIRO_SURFACE_TYPE_SVG:
- type = &PycairoSVGSurface_Type;
- break;
-@@ -1022,7 +1022,7 @@
-
-
- /* Class SVGSurface(Surface) ----------------------------------------------- */
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- #include <cairo-svg.h>
-
- static PyObject *
-@@ -1133,7 +1133,7 @@
- 0, /* tp_is_gc */
- 0, /* tp_bases */
- };
--#endif /* CAIRO_HAS_SVG_SURFACE */
-+#endif /* PYCAIRO_ENABLE_SVG */
-
-
- #if CAIRO_HAS_WIN32_SURFACE
---- wscript
-+++ wscript
-@@ -1,6 +1,7 @@
- # -*- python -*-
-
- import os
-+import subprocess
-
- top = '.'
- out = 'build_directory'
-@@ -11,6 +12,17 @@
- cairo_version_required = '1.10.0'
-
-
-+def check_svg():
-+ if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None:
-+ return_code = subprocess.call(['pkg-config', '--exists', 'cairo-svg'])
-+ if return_code == 0:
-+ return True
-+ else:
-+ return False
-+ else:
-+ return False
-+
-+
- def options(ctx):
- print(' %s/options()' %d)
- ctx.tool_options('gnu_dirs')
-@@ -39,6 +51,8 @@
- ctx.define('PYCAIRO_VERSION_MAJOR', version[0])
- ctx.define('PYCAIRO_VERSION_MINOR', version[1])
- ctx.define('PYCAIRO_VERSION_MICRO', version[2])
-+ if check_svg():
-+ ctx.define('PYCAIRO_ENABLE_SVG', 1)
-
- ctx.write_config_header('src/config.h')
-
diff --git a/dev-python/pycairo/files/pycairo-1.8.10-pkgconfig_dir.patch b/dev-python/pycairo/files/pycairo-1.8.10-pkgconfig_dir.patch
deleted file mode 100644
index 13015af..0000000
--- a/dev-python/pycairo/files/pycairo-1.8.10-pkgconfig_dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -109,7 +109,7 @@
- ext_modules = [cairo],
- data_files = [
- ('include/pycairo', ['src/pycairo.h']),
-- ('lib/pkgconfig', [pkgconfig_file]),
-+ (os.environ.get('PKGCONFIG_DIR', 'lib/pkgconfig'), [pkgconfig_file]),
- (os.path.join(dsy.get_python_lib(), 'cairo'),
- ['src/__init__.py']),
- ],
diff --git a/dev-python/pycairo/files/pycairo-1.8.8-svg_check.patch b/dev-python/pycairo/files/pycairo-1.8.8-svg_check.patch
deleted file mode 100644
index 78dc13b..0000000
--- a/dev-python/pycairo/files/pycairo-1.8.8-svg_check.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -29,6 +30,16 @@
- print pipe.stderr.read()
- raise SystemExit('Error: %s >= %s not found' % (pkg, version))
-
-+def pkg_config_svg_check():
-+ if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None:
-+ pipe = call('pkg-config --exists cairo-svg')
-+ if pipe.returncode == 0:
-+ return [('PYCAIRO_ENABLE_SVG', None)]
-+ else:
-+ return []
-+ else:
-+ return []
-+
- def pkg_config_parse(opt, pkg):
- pipe = call("pkg-config %s %s" % (opt, pkg))
- output = pipe.stdout.read()
-@@ -94,6 +105,7 @@
- 'src/pattern.c',
- 'src/surface.c',
- ],
-+ define_macros = pkg_config_svg_check(),
- include_dirs = pkg_config_parse('--cflags-only-I', 'cairo'),
- library_dirs = pkg_config_parse('--libs-only-L', 'cairo'),
- libraries = pkg_config_parse('--libs-only-l', 'cairo'),
---- src/cairomodule.c
-+++ src/cairomodule.c
-@@ -122,7 +122,7 @@
- #else
- 0,
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- &PycairoSVGSurface_Type,
- #else
- 0,
-@@ -209,7 +209,7 @@
- if (PyType_Ready(&PycairoPSSurface_Type) < 0)
- return;
- #endif
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- if (PyType_Ready(&PycairoSVGSurface_Type) < 0)
- return;
- #endif
-@@ -285,7 +285,7 @@
- PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type);
- #endif
-
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- Py_INCREF(&PycairoSVGSurface_Type);
- PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type);
- #endif
-@@ -350,7 +350,7 @@
- #else
- PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0);
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1);
- #else
- PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0);
---- src/private.h
-+++ src/private.h
-@@ -86,7 +86,7 @@
- extern PyTypeObject PycairoPSSurface_Type;
- #endif
-
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- extern PyTypeObject PycairoSVGSurface_Type;
- #endif
-
---- src/pycairo.h
-+++ src/pycairo.h
-@@ -178,7 +178,7 @@
- #define PycairoPSSurface_Type *(Pycairo_CAPI->PSSurface_Type)
- #endif
-
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- #define PycairoSVGSurface_Type *(Pycairo_CAPI->SVGSurface_Type)
- #endif
-
---- src/surface.c
-+++ src/surface.c
-@@ -80,7 +80,7 @@
- type = &PycairoPSSurface_Type;
- break;
- #endif
--#if CAIRO_HAS_SVG_SURFACE
-+#if PYCAIRO_ENABLE_SVG
- case CAIRO_SURFACE_TYPE_SVG:
- type = &PycairoSVGSurface_Type;
- break;
-@@ -965,7 +965,7 @@
-
-
- /* Class SVGSurface(Surface) ----------------------------------------------- */
--#ifdef CAIRO_HAS_SVG_SURFACE
-+#ifdef PYCAIRO_ENABLE_SVG
- #include <cairo-svg.h>
-
- static PyObject *
-@@ -1067,7 +1067,7 @@
- 0, /* tp_is_gc */
- 0, /* tp_bases */
- };
--#endif /* CAIRO_HAS_SVG_SURFACE */
-+#endif /* PYCAIRO_ENABLE_SVG */
-
-
- /* Class Win32Surface(Surface) -------------------------------------------- */