summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-05-08 21:28:41 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2011-05-08 21:28:41 +0000
commit614adc3fa2ccd4a374c6a5db6fa3ad706f5e7c8a (patch)
tree0e2bc64f2ec91f07e679ef6845562e9e5783dd64 /dev-python/pycairo
parentRe-add phonon-gstreamer-4.5.0 as it is in the stable request and has just bee... (diff)
downloadhistorical-614adc3fa2ccd4a374c6a5db6fa3ad706f5e7c8a.tar.gz
historical-614adc3fa2ccd4a374c6a5db6fa3ad706f5e7c8a.tar.bz2
historical-614adc3fa2ccd4a374c6a5db6fa3ad706f5e7c8a.zip
1.10.0 version bump for Python 2.
Package-Manager: portage-2.2.0_alpha31_p22/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pycairo')
-rw-r--r--dev-python/pycairo/ChangeLog8
-rw-r--r--dev-python/pycairo/Manifest31
-rw-r--r--dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch126
-rw-r--r--dev-python/pycairo/pycairo-1.10.0-r1.ebuild98
4 files changed, 248 insertions, 15 deletions
diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index d5e42c0bb8a0..a731f370aba4 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-python/pycairo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.99 2011/04/24 20:31:13 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.100 2011/05/08 21:28:41 arfrever Exp $
+
+*pycairo-1.10.0-r1 (08 May 2011)
+
+ 08 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ +pycairo-1.10.0-r1.ebuild, +files/py2cairo-1.10.0-svg_check.patch:
+ 1.10.0 version bump for Python 2.
*pycairo-1.10.0 (24 Apr 2011)
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 669a51bb5b0d..39a8decb46ef 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,30 +1,33 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX py2cairo-1.10.0-svg_check.patch 2912 RMD160 79cbae6b38baeb1a55309aa41cb40bd0bb2ad1b2 SHA1 fdd5a4f9b9f17aa0f48e62ef97359f57046da46e SHA256 c35d96be5be571c2f4c3415e4016a7e70a5edd6164818af80d16855e4e4efe72
AUX pycairo-1.10.0-svg_check.patch 2924 RMD160 e0a01e9587ad47dc00a0d449fb3d00fcfbacfe7a SHA1 3969a610e8431938605c7eae5a86b43ef0c9881c SHA256 f9d2bac70bcca57c523e69403cb7332bf4ade0427998b6a3dc16730bcc17b6c7
AUX pycairo-1.8.10-cairo.version_info.patch 337 RMD160 4b53e98616327cdd444e3a09a6776601106211c5 SHA1 26177aa695eb56a874be2068db4f31d803562541 SHA256 9a831057d86d1d630ef542aee9ab1c48e3b400c292021b78f9fdbaadd994a73f
AUX pycairo-1.8.10-pkgconfig_dir.patch 339 RMD160 ebb914c2540dde93e99946ca7292ee9b23997444 SHA1 267f98a1203482e3bee742aceb2fb73b931c02d1 SHA256 9c3d630afa545825448a34b4bf0782c5bde94058fa2263f65054c525b8d585ed
AUX pycairo-1.8.8-svg_check.patch 3009 RMD160 5335b1dd097022bae1fcb1eb1c3bc3e0706a3186 SHA1 a40017c41e7a984ccf0dc308076ff1827a7e0587 SHA256 eff2f24f5bf93ca45b18d57287ced0a1241391ece20dd57d21842f2ca820fd72
+DIST py2cairo-1.10.0.tar.bz2 402070 RMD160 ce75db9af32ef1a3e90f6aaa649cbb2493a941a4 SHA1 2efa8dfafbd6b8e492adaab07231556fec52d6eb SHA256 d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431
DIST py2cairo-1.8.10.tar.gz 588459 RMD160 932e19f2f582bdf5735bdc92720b76edfb0a0c8e SHA1 6bb0b3e0249bce9fc0480aadad0c602d32f26ec1 SHA256 b15f71019e42e06d86f7e8fe5587f07c3de5a59a6c3a071b25fe100796dbcd56
DIST pycairo-1.10.0.tar.bz2 246556 RMD160 7d1c1c05113e5bbad32dbe96c65c918b170cac33 SHA1 b4283aa1cc9aafd12fd72ad371303a486da1d014 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be
+EBUILD pycairo-1.10.0-r1.ebuild 2801 RMD160 355700e79ebf9dff164f72a01d24874a39cb9fc2 SHA1 422da72a61ac45a5b69be124667b4197a046cd7e SHA256 20a837c90e669c67bab1b1c6c2cabde1561059f18e934a098c1633a83259463e
EBUILD pycairo-1.10.0.ebuild 3581 RMD160 4d91f83b9809ecfd64400889253cd1dd701a32b0 SHA1 f128a9bc4e4a24a367062b55eb52da78574e27c0 SHA256 388b1dc3dee5d629ef256c0f34f04a7557655623c5d6aa1a64dc59948f36344e
EBUILD pycairo-1.8.10.ebuild 2233 RMD160 09c531269db883119a673511d38785a8ca670052 SHA1 75ff22f936d75943e89a8c96a716cf90d3fa6da2 SHA256 f1c94a660f20f6b25c6c85a5db7b45d945051fb423d124b25706fc63fb1a7d65
-MISC ChangeLog 12970 RMD160 bbf4423d5a473e5655f52c4495b074779a233682 SHA1 80fa410b393540788c8244b4283166a79bc8d3da SHA256 077778f9e01d5eb2efab7691dafd72e6c5e4d7c54ed000cccf9805376706efb8
+MISC ChangeLog 13184 RMD160 c9122413c01cacebdde1da762953875c826e316d SHA1 ff8f80eda412b871b03cb561c452b1614c86b588 SHA256 71b07a92fb00e450a1a9baa0fa9a0d6e25f861c1c0e709d145f7220455ddaaa0
MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJNtIieAAoJENgZr6v6gHY0H38P/3P3onvw5MF9nq7k6vmnXBpl
-UQHb/2pVehUzIHN3fIlEgRPwAEIk9B/9Q6SXkcwuWn5vRo8i+OG12oXTWfv+mwIY
-5YrTZHSRO6EvKacTBWNAzci4+t60rYUhKNAcHaJDtqODm4C1382MIgzS739xMr9N
-YJJhwArcYO45/lI/1s9ioHLjQqipzjxOemFPI2pRvLjK9FaSISG/lTjfvLzP8cZX
-HrS0cuQ0xjprGVMncMngphx13GgjKHW6NsW/U1NSEcoK8lZ8rUeHiwgQngft3VOs
-14ZcqaX3O/ii4VFOHivhzeSRQveGp2DgkWfMpWnzHFSU4Ly4ob8ORvtEGZvZz+ru
-s7DCPxRN6zmuIt62puXuYX3EPeOu15mSXf4iV5ku1lhkrwwBH+sjA+kn90jsDHZG
-z22+Qi7nAeGd5AuzCpbxleMnvcSsEGHcbdSaswqNV079VpTbHMXMk0baRHVu6OAe
-FLzfzkKKuOZbGtchYyTXxaLr4Bia3Ms+poB0PRjbpe7MzIY4BUtRhQd7B30iD3j7
-cK6gaFO9sx3oQ1zRvwRMGbCahN51EEMugpj8gAbgG13OQ7jlrulzMPY82Qu6Yevn
-2biKVKhJjn1WOf/BVQ7mbjX7E/ABq0pvSx2nJawI2DK7edgNGheyGymjsqX94lsH
-nwcgR7fiYlY9kF7JgRx1
-=iOWa
+iQIcBAEBAgAGBQJNxwsaAAoJENgZr6v6gHY0SfgQAKywzqpJPEDcCFjMQOPyUxfo
+sISW9qLO3sbs2w/ernPOOsmK6TlrfwWrLXRwpeTnu3vjfdZ+xMsBemuCgWdAiEj/
+NvHmsFdXVFn/Kvx1ceNI+XJrDs6/MEi32jWMEUaFz93Gn15CFZr4w9PjtnnyXGto
+L9IOK67wstv5PhivI+yskN+nLroKZ1XMn7H9dCwY0baHcRv+T5gn512MGXr9jWpC
+D6foUvfrK9Y8TTOv0nRUzxil1Acjbp7XVI3PWm4Tg9eGZfWIs2XRuqrAcOsdH8hG
+i/ImvWJMpG9cv28epDXHOJWf/dmSCWnoegb8kCFUe8QQ27LB9zPTm8FMt1Pz6Oym
+tGlvYsrEY/rL1jcXQXGsOICG2WNzappamR86lnMNufa9l0hNA19otXRksQ2RkskF
+fVg7qnGb8ltZrlXB8J/OT1GaElNgEUvD0cYcxRD4kn9XiL41pSemPYcA+PG9R+JY
+J6NrHi0XNrV98aLsjo4GsAKUdnwDfqvNEqRsvbS+CLvplIVUJ7ZuPNv0B6Gm8nWN
+azxvE+FzLz2TwSHUEvf0Y4roUMlPltwgESCE8c2TG7dlgMpGZXi1iUMozHUAKFP9
+9TEQEWlPcucRvwPCHlFDwHT8xVZM1IdHibqqq7BfQH9dYq6NQBiTqrBIO/CefWbr
+njZfXIau5kFhm0s63TEu
+=Ta0e
-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..4cd755c8d574
--- /dev/null
+++ b/dev-python/pycairo/files/py2cairo-1.10.0-svg_check.patch
@@ -0,0 +1,126 @@
+--- 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/pycairo-1.10.0-r1.ebuild b/dev-python/pycairo/pycairo-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..2b5b7487a5ee
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.10.0-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/05/08 21:28:41 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6 3:3.1"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython"
+
+inherit eutils python 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"
+
+# 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 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples +svg test"
+
+RDEPEND=">=x11-libs/cairo-1.10.0[svg?]"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ test? ( dev-python/pytest )"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_prepare() {
+ pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null
+ epatch "${FILESDIR}/${PN}-1.10.0-svg_check.patch"
+ popd > /dev/null
+
+ pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null
+ epatch "${FILESDIR}/py2cairo-1.10.0-svg_check.patch"
+ popd > /dev/null
+
+ preparation() {
+ if [[ "${PYTHON_ABI}" == 3.* ]]; then
+ cp -r "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${WORKDIR}/${P}-${PYTHON_ABI}"
+ else
+ cp -r "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${WORKDIR}/${P}-${PYTHON_ABI}"
+ fi
+ }
+ python_execute_function preparation
+}
+
+src_configure() {
+ if ! use svg; then
+ export PYCAIRO_DISABLE_SVG="1"
+ fi
+
+ python_execute_function -s waf-utils_src_configure --nopyc --nopyo
+}
+
+src_compile() {
+ python_execute_function -s waf-utils_src_compile
+}
+
+src_test() {
+ test_installation() {
+ ./waf install --destdir="${T}/tests/${PYTHON_ABI}"
+ }
+ python_execute_function -q -s test_installation
+
+ python_execute_py.test -P '${T}/tests/${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)' -s
+}
+
+src_install() {
+ python_execute_function -s waf-utils_src_install
+
+ dodoc AUTHORS NEWS README || die "dodoc failed"
+
+ if use doc; then
+ pushd doc/_build/html > /dev/null
+ insinto /usr/share/doc/${PF}/html
+ doins -r [a-z]* _static || die "Installation of documentation failed"
+ popd > /dev/null
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r examples/* || die "Installation of examples failed"
+ fi
+}
+
+pkg_postinst() {
+ python_mod_optimize cairo
+}
+
+pkg_postrm() {
+ python_mod_cleanup cairo
+}