summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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-pkgconfig_dir.patch17
-rw-r--r--dev-python/pycairo/pycairo-1.8.8.ebuild91
4 files changed, 6 insertions, 113 deletions
diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index b0bce5630c6b..3ad778c86850 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/pycairo
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.97 2010/10/18 20:11:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.98 2010/10/23 12:21:38 arfrever Exp $
+
+ 23 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ -pycairo-1.8.8.ebuild, -files/pycairo-1.8.8-pkgconfig_dir.patch:
+ Delete.
18 Oct 2010; Jeroen Roovers <jer@gentoo.org> pycairo-1.8.10.ebuild:
Stable for PPC (bug #337146).
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 914be72f3ecc..6825442078a4 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,9 +1,6 @@
AUX pycairo-1.8.10-pkgconfig_dir.patch 339 RMD160 ebb914c2540dde93e99946ca7292ee9b23997444 SHA1 267f98a1203482e3bee742aceb2fb73b931c02d1 SHA256 9c3d630afa545825448a34b4bf0782c5bde94058fa2263f65054c525b8d585ed
-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 py2cairo-1.8.10.tar.gz 588459 RMD160 932e19f2f582bdf5735bdc92720b76edfb0a0c8e SHA1 6bb0b3e0249bce9fc0480aadad0c602d32f26ec1 SHA256 b15f71019e42e06d86f7e8fe5587f07c3de5a59a6c3a071b25fe100796dbcd56
-DIST pycairo-1.8.8.tar.gz 475651 RMD160 d7e40be061140992e05f714b45182c498ae19311 SHA1 b127ed59bd876ca0fe5d0cf0f69735835c599e9b SHA256 2f52599943ca03c8ff336a0e84b1c8b74f30e2a3de9cb6a9a42a93a848832860
EBUILD pycairo-1.8.10.ebuild 2233 RMD160 09c531269db883119a673511d38785a8ca670052 SHA1 75ff22f936d75943e89a8c96a716cf90d3fa6da2 SHA256 f1c94a660f20f6b25c6c85a5db7b45d945051fb423d124b25706fc63fb1a7d65
-EBUILD pycairo-1.8.8.ebuild 2589 RMD160 13042bfa00265e332eedf5215204d2632cbb48ad SHA1 025b907fc81abb4bfcc80003e65e9bca1165a0d2 SHA256 8c64cbef69323a3d4fcb7e5ce14a7b0e740646c4f962de8cbae4d84b5c3aad04
-MISC ChangeLog 12423 RMD160 062415fd5f2ebaf0f39a2e892f61ab8e418e0cd1 SHA1 8f9cf7b06dd76015e71ad503b03a743b0eab05a2 SHA256 e6887b8b8be7c475fdc6f624fc60bb4fc283f7c37d8bbd0e187beb6e8a978d54
+MISC ChangeLog 12579 RMD160 732cb6177b4b46eb890bc7ed9aead6239e476a62 SHA1 a3c4e518176d4c1c0158e77500572158639ae20c SHA256 5c70c5dde749caec59b65798e2d7765aad47819a8ad831fc98e75c373def87bb
MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
diff --git a/dev-python/pycairo/files/pycairo-1.8.8-pkgconfig_dir.patch b/dev-python/pycairo/files/pycairo-1.8.8-pkgconfig_dir.patch
deleted file mode 100644
index 27c24a89402e..000000000000
--- a/dev-python/pycairo/files/pycairo-1.8.8-pkgconfig_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- setup.py
-+++ setup.py
-@@ -4,6 +4,7 @@
- import distutils.dir_util as dut
- import distutils.file_util as fut
- import io
-+import os
- import subprocess
- import sys
-
-@@ -106,5 +107,5 @@
- description = "python interface for cairo",
- ext_modules = [cairo],
- data_files=[('include/pycairo',['src/pycairo.h']),
-- ('lib/pkgconfig',[pkgconfig_file])],
-+ (os.environ.get('PKGCONFIG_DIR', 'lib/pkgconfig'),[pkgconfig_file])],
- )
diff --git a/dev-python/pycairo/pycairo-1.8.8.ebuild b/dev-python/pycairo/pycairo-1.8.8.ebuild
deleted file mode 100644
index a6f1471742c7..000000000000
--- a/dev-python/pycairo/pycairo-1.8.8.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2010 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.17 2010/06/18 17:49:39 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-inherit eutils distutils multilib
-
-DESCRIPTION="Python wrapper for cairo vector graphics library"
-HOMEPAGE="http://cairographics.org/pycairo/ http://pypi.python.org/pypi/pycairo"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples svg"
-
-RDEPEND=">=x11-libs/cairo-1.8.8[svg?]"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- doc? ( >=dev-python/sphinx-0.6 )"
-
-DOCS="AUTHORS NEWS README"
-PYTHON_MODNAME="cairo"
-
-src_prepare() {
- # Don't run py-compile.
- sed -i \
- -e '/if test -n "$$dlist"; then/,/else :; fi/d' \
- 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() {
- distutils_src_compile
-
- if use doc; then
- emake html || die "emake html failed"
- fi
-}
-
-src_test() {
- testing() {
- cp src/__init__.py $(ls -d build-${PYTHON_ABI}/lib.*)/cairo
- pushd test > /dev/null
- # examples_test.test_snippets_png() calls os.chdir().
- PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*):../$(ls -d ../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" -c "import examples_test; examples_test.test_examples(); examples_test.test_snippets_png()" || return 1
- popd > /dev/null
- }
- python_execute_function testing
-}
-
-src_install() {
- PKGCONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" distutils_src_install
-
- if use doc; then
- dohtml -r doc/.build/html/ || die "dohtml -r doc/.build/html/ failed"
- fi
-
- if use examples; then
- # Delete files created by tests.
- find examples{,/cairo_snippets/snippets} -maxdepth 1 -name "*.png" | xargs rm -f
-
- insinto /usr/share/doc/${PF}/examples
- doins -r examples/*
- rm "${ED}"/usr/share/doc/${PF}/examples/Makefile*
- fi
-
- # dev-python/pycairo-1.8.8 doesn't install __init__.py automatically.
- # http://lists.cairographics.org/archives/cairo/2009-August/018044.html
- installation() {
- insinto "$(python_get_sitedir)/cairo"
- doins src/__init__.py
- }
- python_execute_function -q installation
-}