3 files changed, 5 insertions, 109 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/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
-}