Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/dev-python/pycairo
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-09-19 13:50:04 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-09-19 13:50:04 +0000
commitaf76e8b59b72cd59d4a006b38e3173036d610107 (patch)
tree51b93f81c34c718b5d7cb70fb7abb8b4bbe66cfa /dev-python/pycairo
parentBump to 1.4.0, fixes #284733 (diff)
downloadhistorical-af76e8b59b72cd59d4a006b38e3173036d610107.tar.gz
historical-af76e8b59b72cd59d4a006b38e3173036d610107.tar.bz2
historical-af76e8b59b72cd59d4a006b38e3173036d610107.zip
Improve dependencies (bug #269682).
Package-Manager: portage-14280-svn/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pycairo')
-rw-r--r--dev-python/pycairo/ChangeLog6
-rw-r--r--dev-python/pycairo/Manifest5
-rw-r--r--dev-python/pycairo/files/pycairo-1.8.8-svg_check.patch116
-rw-r--r--dev-python/pycairo/pycairo-1.8.8.ebuild9
4 files changed, 131 insertions, 5 deletions
diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index ad3b4cfd5f57..fc652050329b 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/pycairo
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.75 2009/09/17 10:54:35 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.76 2009/09/19 13:50:04 arfrever Exp $
+
+ 19 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ pycairo-1.8.8.ebuild, +files/pycairo-1.8.8-svg_check.patch:
+ Improve dependencies (bug #269682).
17 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.8.ebuild:
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index cd2e8160a030..14dc0f8703a8 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,4 +1,5 @@
AUX pycairo-1.8.8-pkgconfig_dir.patch 456 RMD160 c7fea264be6026a03098d75d90e3ffc2ba9f11ce SHA1 a5c2f16fbd0b9d2522dd1cf0e2a5d0a1cd2672e3 SHA256 42b3df1d890aae80a9b59ec47e1b84442b6b49f39decec0901c7d70761281dd7
+AUX pycairo-1.8.8-svg_check.patch 3009 RMD160 5335b1dd097022bae1fcb1eb1c3bc3e0706a3186 SHA1 a40017c41e7a984ccf0dc308076ff1827a7e0587 SHA256 eff2f24f5bf93ca45b18d57287ced0a1241391ece20dd57d21842f2ca820fd72
DIST pycairo-1.4.12.tar.gz 490053 RMD160 f44bb6bcc6b366568e0297689164537dc891b278 SHA1 580255db6f3ab4c44ac44dfe0a9f7d1f598c2ab3 SHA256 318308cdff7fa5ff7587ecf39ee302292f93193506af06e176d228cd47c9012e
DIST pycairo-1.8.2.tar.gz 519064 RMD160 ce48a6b71b802f07d0e0d3cfa140fd39ab5fe4d7 SHA1 b457949ccfa3af82afcffae8a396a1c840a9428a SHA256 77a8cbe388fd66825056744f2fc5c58b3afc247748bc2c777751cc0c2eb30a2f
DIST pycairo-1.8.4.tar.gz 521136 RMD160 1be18a8516d797694d370f0d02273cad18115320 SHA1 450b59376ffea41910f60a0dfc9fd01d277e3950 SHA256 98ad99680850af767ba3bcc0cf65500ebf3f991872b859ab9a00a0b064fdecc1
@@ -8,6 +9,6 @@ EBUILD pycairo-1.4.12.ebuild 1162 RMD160 dc5761691510a4b9f7367833995f5ed59f5f36a
EBUILD pycairo-1.8.2.ebuild 1160 RMD160 00692b37885fd4f3d72acf9690f4ebda758c3d44 SHA1 8bea2c3b09dfe0287c8d4cb5134a1db64c1739cd SHA256 fa493cd7ce52f867a50f92382cc3f6edb4bbc6e7b3494ca62d438f72e5349f92
EBUILD pycairo-1.8.4.ebuild 1176 RMD160 d2d3358f4f2249d86917ef96fa702c1d098bad4d SHA1 00f6a7f487accd6c45e72d1c11980b47ac3c7ecf SHA256 28a03fed3ee7aeb61ee42c884f860b00e503a31c62dc09655078e72271ceedac
EBUILD pycairo-1.8.6.ebuild 1594 RMD160 3678ee67e114c1189753e2b06cb164e018536e71 SHA1 99c0beb8b037548eec0c4cf96a212ae9b5c01c20 SHA256 d756ba09327a634137a88f13d9ad9df0b967457ba70a790a56f9e716a01b387d
-EBUILD pycairo-1.8.8.ebuild 2175 RMD160 36d45f70b47bea1b3eb46827c3ffd8089fcab95c SHA1 3be44cdff27abfabc2b6427bc67ea728826ecebd SHA256 e29ae14db409250fa24f3043c1357894ed809c1a84f5866c196072aa71654730
-MISC ChangeLog 9811 RMD160 5c88fbcad096c3dc6be369ba552a63e0f3923218 SHA1 667aa0603421c228ed9fa535eda803b8a1cf38f9 SHA256 dbebafa415403a543d3e0cd65d522bd63d5ef8782002bd46430c9e3d90477559
+EBUILD pycairo-1.8.8.ebuild 2281 RMD160 478c080772cbf4b1cda2c36bc5efcdcbba11257c SHA1 6c07b46e0d2d2f6464cda1acd956fa66d1487d73 SHA256 131243940a790ed0e43d722510a3974c4ce8b204bacda5bdced903e438b61add
+MISC ChangeLog 9985 RMD160 8d0e8b3869483609da48b3be51563b14b542e65c SHA1 c16ad0ab64c4ee819063633d1a963755220c6fa0 SHA256 d20f68a6d166cc9894b7cfaceb09cb7028e61195d7e0228d7124ecf33bde1265
MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
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
new file mode 100644
index 000000000000..78dc13bd1749
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.8.8-svg_check.patch
@@ -0,0 +1,116 @@
+--- 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) -------------------------------------------- */
diff --git a/dev-python/pycairo/pycairo-1.8.8.ebuild b/dev-python/pycairo/pycairo-1.8.8.ebuild
index 9e8ce50d1540..0c772c20767d 100644
--- a/dev-python/pycairo/pycairo-1.8.8.ebuild
+++ b/dev-python/pycairo/pycairo-1.8.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.8.ebuild,v 1.6 2009/09/18 03:07:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.8.ebuild,v 1.7 2009/09/19 13:50:04 arfrever Exp $
EAPI="2"
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="doc examples svg"
-RDEPEND=">=x11-libs/cairo-1.8.8[svg=]"
+RDEPEND=">=x11-libs/cairo-1.8.8[svg?]"
DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( >=dev-python/sphinx-0.6 )"
@@ -35,12 +35,17 @@ src_prepare() {
src/Makefile.in || die "sed in src/Makefile.in failed"
epatch "${FILESDIR}/${P}-pkgconfig_dir.patch"
+ epatch "${FILESDIR}/${P}-svg_check.patch"
}
src_configure() {
if use doc; then
econf
fi
+
+ if ! use svg; then
+ export PYCAIRO_DISABLE_SVG="1"
+ fi
}
src_compile() {