diff options
| -rw-r--r-- | dev-python/pycairo/Manifest | 32 | ||||
| -rw-r--r-- | dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch | 18 | ||||
| -rw-r--r-- | dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch | 126 | ||||
| -rw-r--r-- | dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch | 38 | ||||
| -rw-r--r-- | dev-python/pycairo/files/pycairo-1.10.0-svg_check.patch | 126 | ||||
| -rw-r--r-- | dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch | 11 | ||||
| -rw-r--r-- | dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch | 12 | ||||
| -rw-r--r-- | dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch | 41 | ||||
| -rw-r--r-- | dev-python/pycairo/metadata.xml | 8 | ||||
| -rw-r--r-- | dev-python/pycairo/pycairo-1.10.0-r4.ebuild | 202 |
10 files changed, 0 insertions, 614 deletions
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest deleted file mode 100644 index 1290227f0..000000000 --- a/dev-python/pycairo/Manifest +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX py2cairo-1.10.0-ppc-darwin.patch 446 SHA256 c957cd14eb2c3fce0169a54b13665522fe1ada1af61a865903aad595afa309b1 SHA512 003e3266542242d349baa522552392aa448738f91a37ef0e6c8dedc3e0c179ca98167ab2ea7d75bd7d708f24f286099440a7a6a784767530eca161486403b033 WHIRLPOOL 0695123f4c9b3e82c22f1ba632243226d1dfe50442ea515abe440632221984c10aff233b8407a0e8dd4f594a1464c4fb7f121e43cfd0d03a2529ed1163e1a649 -AUX py2cairo-1.10.0-svg_check.patch 2912 SHA256 c35d96be5be571c2f4c3415e4016a7e70a5edd6164818af80d16855e4e4efe72 SHA512 e0069738659db0fa3c0532efa7e53fed5f088ee4ce276fd6ddcfcd0ee1e8b4861a09330afe8a30bb45b912c7a93cf6e42dd6057ad7f5adabfdddeb58bc10bbe8 WHIRLPOOL 90ccae77f2641c1f9f4ad6f6497fd7912a952b7b948fe64845e8c60629d4f70c590fd33dd276c54cbc8251d45e8bd201841d7bc3fa04a37a314f1f375b8250c7 -AUX py2cairo-1.10.0-xpyb.patch 952 SHA256 d6809bf00608d007f866040025392174e0cf3efe3ac03277436e00bacdcef54a SHA512 45fa1d32a8a4fc79b10e9221af286eef3f9d2c2b4991c066b1e18bd329feb764d07c4ebc58e1926ae86c4cb4a2ed0fd172f75f7479cec0be51ec5c5da6d4f13d WHIRLPOOL f8818581d471735748b546ffa0f4ac42bc5f623ae0ab383a70cf5977727ba933509497d3071aeb572e764c5e164680c16f8d476b0d8f1b7659dda7190b226cda -AUX pycairo-1.10.0-svg_check.patch 2924 SHA256 f9d2bac70bcca57c523e69403cb7332bf4ade0427998b6a3dc16730bcc17b6c7 SHA512 a05fc725c9c8ac48b262795c6c6e56b3a432f73d69657565763292f74cbd8b3d4eaabc1a5dd5db0b74cad297cc330caed271c40fbb16d459019b4c75ab33ccef WHIRLPOOL ceaf8bf26f9783bd017fbfb6b81f00ece0122d1f57ad6ae3d87f40b39d7a4bbb47bab89891f3f12357f44f26039a6c63bf46b25765fac2412bd079c6e17dd6cf -AUX pycairo-1.10.0-waf-py3_4.patch 511 SHA256 a4c5526c045972087ec12f68192e14f3f6910b2c2ea4e7a7b742dfd8520cd475 SHA512 7f8b76483b8f193ba03b89030f9f418632d6a062e4026534404031612c870f206392c82f52f2c64a9960e3e5b43562155449baedd7e3dbd0562a65f32ab33315 WHIRLPOOL 23a846d28676cded354b1b3a9f3e9010fc955d47b4db7d6d6f3bc9247d37afb98f8b928a203d47e454113a5a69d228de36249b4d07d86eeade112c40cc0f23ea -AUX pycairo-1.10.0-waf-unpack.patch 262 SHA256 ad9f1b924397b5b14fcf2e903f4da9851f06414e25fa4d5fa1a4c36a0586b9ae SHA512 05ff350976729122238d97bf69ec5e55bc489404ec1d8cae478ecb28baa6676a100b520aedc0d3dd6bf77385bc6f34de6cd32d33a5c5b0c593059309e3628d0a WHIRLPOOL b66d080e98a5cb70634b90fb7922c13e7c2bc338b64e1a9f3a38ccd5111592e72668d55e3fbccdcfe904c1296150273005a7b93202b4300ff6f792476873a5f1 -AUX pycairo-1.10.0-xpyb.patch 1112 SHA256 5c6ae65a5f1b6eee0e56fb39f7fade34dc20dc38c7cefa5841a45d8c23bb9a0c SHA512 69c826970b36075b3a1ce63b2db89ac1779902a570af95b28c07536ce91c3c9adce234444a86b6211e9b53b0293a56173de88d76f50f77a0ed3aa17e2aefcfb3 WHIRLPOOL 30d18f9910ed29d798d5eae610f608af76d2b0c1fb89801f25b1ca9b97e58d2a15ab1c948386ad326d249ffe899e0187561c2708b692287b80039e21f5185b88 -DIST py2cairo-1.10.0.tar.bz2 402070 SHA256 d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431 SHA512 cb3d54de9af4134460ce731da8166a3127a642c8a2e6184109437ddec115cd55b8dd2413a5c81700277bfe2f22fcfe268db4f3ba0f7649751e85bb34295f79fc WHIRLPOOL 60b57d55b27f06acd62714ac6ad7973ab973d42995fb536ae800263a2e8c7451a24ccafd96fe30f5bfa26e1ae218934d4fafaafec3e9666a39b33c78672407e2 -DIST pycairo-1.10.0-waf-multilib.patch 761 SHA256 8e9e081bf7b4beced282a8de265b6e8901b113df7fbe892d7f0f93c63c771e5b SHA512 a30ee15ccfdf142dc8040fa2161ea20f135c97c3b64a2ff24d915707672c3dcadbfbeec85d5962c32936dbb232b2a27da1530be47baf12114a27031dcd29538a WHIRLPOOL 43e9736e2fd1944173affeed7dd0784f4d21184364298a21ba64e1f212290f7b56f95f76b42ff14105d4ae83e0e4d97f5ab8338607bd0324f56ce6e5643d58dc -DIST pycairo-1.10.0.tar.bz2 246556 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be SHA512 a03db6f04cea504985f390b0734042390f491f32ae2bee1299dabbafd369fde36bb506ebb941d22bbc11b0d008c4f758baeacf309a7336880529455092db829f WHIRLPOOL e779d56d67ef18bbd052d81acb38d8b610ca4bbf787f4b0e3982633de55ff54d6dfa3e5ce1957321fba09f0ec2d12ce12057335de9d5ff3f84c2bc0530415e76 -EBUILD pycairo-1.10.0-r4.ebuild 6238 SHA256 446066fd436f1568a4976b834f1fc5ea3e681a11118034cf261e0e4fe60123d9 SHA512 81f70e159ef97571165d8fea13733dc5a9ade846805ecdd6c84957c202ee0af08dca13ac0a10c0b6c1eb17848bc879a8d21ce9e8c35141d624f086e5c73d5ac3 WHIRLPOOL e0b3fcabccdd977c6f5f202c6d9789ac8102e06765e135dccc8b8e80fd01a2375fbc5ed14155d54ed68749270ef14d6e8badfee0f62bad8a1ffcb23f44b98f3e -MISC metadata.xml 244 SHA256 f5bde347c36c74889cbb32d29f06766c08eb3df6e0c468f00295681382c48457 SHA512 100f9b2326c73dff673bda4c5dfc0dd28bc756d80a039c1d3ac19124599a99e18b841ab28da191a79c6498c2dc157c0fed7639c855e2520cc3933f03e3de8a21 WHIRLPOOL 409c270895ffd477768bc9c329c9297c106d3f9572b84051ae66757f4d87c6f0a0b7d71aff602ff41b14400fc0afbf3990cbf1768a63f01fda6854043b66a35b ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iQIcBAEBCAAGBQJVXBqXAAoJEHQ6UuhrqBBQw/cP/3P6h7fk+SL7UN2GbRyOjLgE -0pA+iVVN087DSQXelTqtlGlQFhCn4eSh/E3f6J86c3itdZOhjzGLiJdD5nAbTzr/ -w8Q/msaB7RUEIX78nHftns0aUz0Lq3PJkc8DmrMso0F4VNho5DO6Y+xY0iZTiuvj -D5a9/HCHpTfgo33Y9V6Oq9a0NrRmHv3DsXFdRAtTRI5Hv6P845z2KKdiLWe/OzD5 -mRNnO505Uu8WZK5UtyIHrjGlqFtx5ZDxbNVUCQwnE7Xx5qibLHO9Qz/ZjOFqddE/ -WLiXh50lTiXfUVzrTzffoNmuKyamdTUC1hhwdJ8G0cp+uPYzwOVu7A0cHhgEwKK1 -/J+Fver8nv+6BdyS1GwBwuFF90SxqlNqoyjNJjqlOtPh+/M8zE+M46RpaOO7BWn8 -YWXWMcJOPbPg8P5tzIMTbYNUkaAl7SetpH3t9EFrwpGyYQ2m94rQFiVHPUEnSdLc -im7rAH1mVn/gCAMDQbkLipOsg1qUIbU2wgweopOXXqYPA6p3Kf3A3+AOQ+k/KrRn -VimNjz+BACVhryp0LqpGaJrEk3KJF9cXcx54FgYsiOSa5lN21EUOzcpg9SX+xd/O -TeMVno8twtWd3ItlAfq+/YzQz8B0vgdn6iu4Km9KyJwgcaBFKi26MVkHYYg8fxUK -Ax1H6rBVK37kvywCH7f4 -=wHbQ ------END PGP SIGNATURE----- diff --git a/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch b/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch deleted file mode 100644 index e921ac34a..000000000 --- a/dev-python/pycairo/files/py2cairo-1.10.0-ppc-darwin.patch +++ /dev/null @@ -1,18 +0,0 @@ -inspired by: -http://groups.google.com/group/waf-users/browse_thread/thread/2bd6774056c850bc/ -27bfdcac2fb9ec05?lnk=gst#27bfdcac2fb9ec05 - -we cannot "fix" the buildsystem, since it's bzip2-tarred *sigh* - - ---- waf -+++ waf -@@ -154,6 +154,8 @@ - - wafdir = find_lib() - sys.path.insert(0, wafdir) -+from waflib.Tools.c_config import MACRO_TO_DESTOS -+MACRO_TO_DESTOS['__POWERPC__'] = 'darwin' - - if __name__ == '__main__': - import waflib.extras.compat15 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 4cd755c8d..000000000 --- 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/py2cairo-1.10.0-xpyb.patch b/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch deleted file mode 100644 index c136cb0c3..000000000 --- a/dev-python/pycairo/files/py2cairo-1.10.0-xpyb.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- py2cairo-1.10.0/wscript -+++ py2cairo-1.10.0/wscript -@@ -10,6 +10,7 @@ - APPNAME='py2cairo' - VERSION='1.10.0' - cairo_version_required = '1.10.0' -+xpyb_version_required = '1.3' - - - def check_svg(): -@@ -23,6 +24,17 @@ - return False - - -+def check_xpyb(): -+ if os.environ.get('PYCAIRO_DISABLE_XPYB', None) is None: -+ return_code = subprocess.call(['pkg-config', '--exists', 'xpyb']) -+ if return_code == 0: -+ return True -+ else: -+ return False -+ else: -+ return False -+ -+ - def options(ctx): - print(' %s/options()' %d) - ctx.tool_options('gnu_dirs') -@@ -41,6 +53,9 @@ - ctx.check_python_headers() - ctx.check_cfg(package='cairo', atleast_version=cairo_version_required, - args='--cflags --libs') -+ if check_xpyb(): -+ ctx.check_cfg(package='xpyb', atleast_version=xpyb_version_required, -+ args='--cflags --libs', mandatory=False) - - # add gcc options - if env['CC_NAME'] == 'gcc': 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 572a5f6cc..000000000 --- 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.10.0-waf-py3_4.patch b/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch deleted file mode 100644 index 6e79db9ba..000000000 --- a/dev-python/pycairo/files/pycairo-1.10.0-waf-py3_4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/waflib/Tools/python.py -+++ b/waflib/Tools/python.py -@@ -169,7 +169,7 @@ - conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False) - includes=[] - if conf.env.PYTHON_CONFIG: -- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split(): -+ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split(): - if(incstr.startswith('-I')or incstr.startswith('/I')): - incstr=incstr[2:] - if incstr not in includes: diff --git a/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch b/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch deleted file mode 100644 index 7d54ba160..000000000 --- a/dev-python/pycairo/files/pycairo-1.10.0-waf-unpack.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/waf -+++ b/waf -@@ -153,6 +153,9 @@ - return dir - - wafdir = find_lib() -+if sys.argv[1:] == ['unpack']: -+ print(wafdir) -+ exit() - sys.path.insert(0, wafdir) - from waflib.Tools.c_config import MACRO_TO_DESTOS - MACRO_TO_DESTOS['__POWERPC__'] = 'darwin' diff --git a/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch b/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch deleted file mode 100644 index 33de2692f..000000000 --- a/dev-python/pycairo/files/pycairo-1.10.0-xpyb.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- pycairo-1.10.0/wscript -+++ pycairo-1.10.0/wscript -@@ -10,6 +10,7 @@ - APPNAME='pycairo' - VERSION='1.10.0' - cairo_version_required = '1.10.0' -+xpyb_version_required = '1.3' # optional - - - def check_svg(): -@@ -23,6 +24,17 @@ - return False - - -+def check_xpyb(): -+ if os.environ.get('PYCAIRO_DISABLE_XPYB', None) is None: -+ return_code = subprocess.call(['pkg-config', '--exists', 'xpyb']) -+ if return_code == 0: -+ return True -+ else: -+ return False -+ else: -+ return False -+ -+ - def options(ctx): - print(' %s/options()' %d) - ctx.tool_options('gnu_dirs') -@@ -42,6 +54,12 @@ - ctx.check_cfg(package='cairo', atleast_version=cairo_version_required, - args='--cflags --libs') - -+# xpyb for Python 3 is not available yet. -+# the Python 3 version should probably have a different name than 'xpyb' -+# if check_xpyb(): -+# ctx.check_cfg(package='xpyb', atleast_version=xpyb_version_required, -+# args='--cflags --libs', mandatory=False) -+ - # add gcc options - if env['CC_NAME'] == 'gcc': - env.append_unique('CCFLAGS', ['-std=c99', '-Wall']) diff --git a/dev-python/pycairo/metadata.xml b/dev-python/pycairo/metadata.xml deleted file mode 100644 index 548448307..000000000 --- a/dev-python/pycairo/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>binki@gentoo.org</email> - <name>Nathan Phillip Brink</name> - </maintainer> -</pkgmetadata> diff --git a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild b/dev-python/pycairo/pycairo-1.10.0-r4.ebuild deleted file mode 100644 index 06b1311df..000000000 --- a/dev-python/pycairo/pycairo-1.10.0-r4.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.21 2015/04/08 08:05:21 mgorny Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -PYTHON_REQ_USE='threads(+)' - -inherit eutils python-r1 waf-utils - -PYCAIRO_PYTHON2_VERSION="${PV}" -PYCAIRO_PYTHON3_VERSION="${PV}" - -DESCRIPTION="Python bindings for the cairo library" -HOMEPAGE="http://cairographics.org/pycairo/ http://pypi.python.org/pypi/pycairo" -SRC_URI="http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2 - http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2 - http://dev.gentoo.org/~binki/distfiles/dev-python/${PN}/${P}-waf-multilib.patch" - -# LGPL-3 for pycairo 1.10.0. -# || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10. -LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc examples +svg test xcb" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Note: xpyb is used as the C header, not Python modules -RDEPEND="${PYTHON_DEPS} - >=x11-libs/cairo-1.10.0[svg?,xcb?] - xcb? ( x11-libs/xpyb ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-python/pytest[${PYTHON_USEDEP}] ) -" - -# In case if waf-utils.eclass actually accepts waf-utils_waflibdir() as -# a function. -unset waf-utils_waflibdir 2>/dev/null - -# @FUNCTION: waf-utils_waflibdir -# @USAGE: [<waf-binary>] -# @DESCRIPTION: -# Echoes the absolute path to the directory containing waf-based -# project's waflib python module. Ensures that the waflib shipped with a -# project is unpacked if it isn't already. This waflib may be safely -# patched because waf-lite will not touch the waflib directory when it -# is run if it already exists. Uses the waf binary in WAF_BINARY or the -# first argument. -# -# @EXAMPLE -# @CODE -# pushd "$(waf-utils_waflibdir)" || die "Unable to patch waflib" -# epatch "${FILESDIR}"/${P}-waf-fix.patch -# popd -# @CODE -# -# Note that if you are using the python eclass, you must either call -# python_set_active_version or call waf-utils_waflibdir() from within a -# function run by python_execute(). -# -# @CODE -# SUPPORT_PYTHON_ABIS=1 -# inherit python -# -# src_prepare() { -# python_copy_sources -# -# myprepare() { -# epatch "${FILESDIR}"/${P}-sourcecode-fix.patch -# -# pushd "$(waf-utils_saflibdir "$(PYTHON)" waf)" || die "Unable to patch waflib" -# epatch "${FILESDIR}"/${P}-waf-fix.patch -# popd -# } -# python_execute_function -s myprepare -# } -# @CODE -waf-utils_waflibdir() { - debug-print-function ${FUNCNAME} "$@" - - # @ECLASS-VARIABLE: WAF_BINARY - # @DESCRIPTION: - # Eclass can use different waf executable. Usually it is located in "${S}/waf". - : ${WAF_BINARY:="${S}/waf"} - - local waf_binary=${WAF_BINARY} - [[ -n ${1} ]] && waf_binary=${1} - - python -c "import imp, sys; sys.argv[0] = '${waf_binary}'; waflite = imp.load_source('waflite', '${waf_binary}'); print(waflite.find_lib());" \ - || die "Unable to locate or unpack waflib module from the waf script at ${waf_binary}" -} - -# When moving between the different build dirs, we want to use the waf -# associated with each build dir. -WAF_BINARY=./waf - -src_prepare() { - - pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null - rm -f src/config.h || die - epatch "${FILESDIR}/${PN}-1.10.0-svg_check.patch" - epatch "${FILESDIR}/${PN}-1.10.0-xpyb.patch" - epatch "${FILESDIR}/${PN}-1.10.0-waf-unpack.patch" - epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch - cd "$(waf-utils_waflibdir waf)" || die "Unable to patch waflib" - epatch "${DISTDIR}"/${P}-waf-multilib.patch - popd > /dev/null - - pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null - rm -f src/config.h || die - epatch "${FILESDIR}/py2cairo-1.10.0-svg_check.patch" - epatch "${FILESDIR}/py2cairo-1.10.0-xpyb.patch" - epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch - cd "$(waf-utils_waflibdir waf)" || die "Unable to patch waflib" - epatch "${DISTDIR}"/${P}-waf-multilib.patch - popd > /dev/null - - preparation() { - if python_is_python3; then - cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" > /dev/null - wafdir="$(./waf unpack)" - pushd "${wafdir}" > /dev/null - epatch "${FILESDIR}/${PN}-1.10.0-waf-py3_4.patch" - popd > /dev/null - popd > /dev/null - else - cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die - fi - } - python_foreach_impl preparation -} - -src_configure() { - if ! use svg; then - export PYCAIRO_DISABLE_SVG=1 - fi - - if ! use xcb; then - export PYCAIRO_DISABLE_XPYB=1 - fi - - # Added by grobian: - # If WAF_BINARY is an absolute path, the configure is different and fails to - # find Python.h due to a compiler misconfiguration. If WAF_BINARY is just - # ./waf or python waf, it works fine. Hooray for reinvented buildsystems - - # floppym: - # pycairo and py2cairo bundle different versions of waf (bug 447856) - WAF_BINARY="./waf" - python_foreach_impl run_in_build_dir waf-utils_src_configure --nopyc --nopyo -} - -src_compile() { - MAKEOPTS="$MAKEOPTS -j1" - python_foreach_impl run_in_build_dir waf-utils_src_compile -} - -src_test() { - test_installation() { - ./waf install --destdir="${T}/tests/${BUILD_DIR}" - PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v - } - python_foreach_impl run_in_build_dir test_installation -} - -src_install() { - python_foreach_impl run_in_build_dir waf-utils_src_install - - dodoc AUTHORS NEWS README - - if use doc; then - pushd doc/_build/html > /dev/null || die - dohtml -r [a-z]* _static - popd > /dev/null || die - fi - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r examples/* - fi - - if [[ ${CHOST} == *-darwin* ]] ; then - # fix install_names; next to waf producing dylibs (not bundles) and - # calling them .bundle, it also has no idea what it should do to create - # proper ones (dylibs) - fix_darwin_install_names() { - local x="$(python_get_sitedir)/cairo/_cairo.bundle" - install_name_tool -id "${x}" "${ED}${x}" - } - python_foreach_impl fix_darwin_install_names - fi -} - -run_in_build_dir() { - pushd "${BUILD_DIR}" > /dev/null || die - "$@" - popd > /dev/null || die -} |