Restrict pypy (bug #397393), remove stale versions.

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

6 files changed, 10 insertions, 242 deletions

diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index 016917f434fd..885d3eb9b75f 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pycairo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.109 2012/05/12 20:19:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.110 2012/06/02 11:59:24 marienz Exp $
+
+  02 Jun 2012; Marien Zwart <marienz@gentoo.org>
+  -files/pycairo-1.8.10-cairo.version_info.patch, -pycairo-1.10.0-r1.ebuild,
+  -pycairo-1.10.0.ebuild, pycairo-1.10.0-r2.ebuild, pycairo-1.8.10.ebuild:
+  Restrict pypy (bug #397393), remove stale versions.
 
   12 May 2012; Alexis Ballier <aballier@gentoo.org> pycairo-1.10.0-r2.ebuild:
   keyword ~amd64-fbsd
diff --git a/dev-python/pycairo/files/pycairo-1.8.10-cairo.version_info.patch b/dev-python/pycairo/files/pycairo-1.8.10-cairo.version_info.patch
deleted file mode 100644
index 8518f94a53d5..000000000000
--- a/dev-python/pycairo/files/pycairo-1.8.10-cairo.version_info.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://cgit.freedesktop.org/py2cairo/patch/?id=3953265c398ccbd600b4d788f7c8f9a8e0e644a2
-
---- setup.py
-+++ setup.py
-@@ -64,8 +64,8 @@
- #define _CONFIG_H 1
- 
- #define PYCAIRO_VERSION_MAJOR %s
--#define PYCAIRO_VERSION_MICRO %s
- #define PYCAIRO_VERSION_MINOR %s
-+#define PYCAIRO_VERSION_MICRO %s
- #define VERSION "%s"
- 
- #endif // _CONFIG_H
diff --git a/dev-python/pycairo/pycairo-1.10.0-r1.ebuild b/dev-python/pycairo/pycairo-1.10.0-r1.ebuild
deleted file mode 100644
index 4590898b4986..000000000000
--- a/dev-python/pycairo/pycairo-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2012 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.2 2012/05/04 15:12:14 patrick 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}
-	virtual/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
-}
diff --git a/dev-python/pycairo/pycairo-1.10.0-r2.ebuild b/dev-python/pycairo/pycairo-1.10.0-r2.ebuild
index c4988295859c..40166a1da61a 100644
--- a/dev-python/pycairo/pycairo-1.10.0-r2.ebuild
+++ b/dev-python/pycairo/pycairo-1.10.0-r2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 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-r2.ebuild,v 1.9 2012/05/12 20:19:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r2.ebuild,v 1.10 2012/06/02 11:59:24 marienz 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"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython *-pypy-*"
 
 inherit eutils python waf-utils
 
diff --git a/dev-python/pycairo/pycairo-1.10.0.ebuild b/dev-python/pycairo/pycairo-1.10.0.ebuild
deleted file mode 100644
index acfe133f30bb..000000000000
--- a/dev-python/pycairo/pycairo-1.10.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.2 2012/05/04 15:12:14 patrick 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 multilib python waf-utils
-
-PYCAIRO_PYTHON2_VERSION="1.8.10"
-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.gz
-	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}
-	virtual/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}/pycairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null
-	epatch "${FILESDIR}/${PN}-1.8.8-svg_check.patch"
-	epatch "${FILESDIR}/${PN}-1.8.10-pkgconfig_dir.patch"
-	epatch "${FILESDIR}/${PN}-1.8.10-cairo.version_info.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}/pycairo-${PYCAIRO_PYTHON2_VERSION}" "${WORKDIR}/${P}-${PYTHON_ABI}"
-		fi
-	}
-	python_execute_function preparation
-}
-
-src_configure() {
-	if ! use svg; then
-		export PYCAIRO_DISABLE_SVG="1"
-	fi
-
-	configuration() {
-		if [[ "${PYTHON_ABI}" == 3.* ]]; then
-			waf-utils_src_configure --nopyc --nopyo
-		fi
-	}
-	python_execute_function -s configuration
-}
-
-src_compile() {
-	building() {
-		if [[ "${PYTHON_ABI}" == 3.* ]]; then
-			waf-utils_src_compile
-		else
-			echo ${_BOLD}"$(PYTHON)" setup.py build${_NORMAL}
-			"$(PYTHON)" setup.py build
-		fi
-	}
-	python_execute_function -s building
-}
-
-src_test() {
-	test_installation() {
-		if [[ "${PYTHON_ABI}" == 3.* ]]; then
-			./waf install --destdir="${T}/tests/${PYTHON_ABI}"
-		else
-			"$(PYTHON)" setup.py install --no-compile --root="${T}/tests/${PYTHON_ABI}"
-		fi
-	}
-	python_execute_function -q -s test_installation
-
-	python_execute_py.test -P '${T}/tests/${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)' -s
-}
-
-src_install() {
-	installation() {
-		if [[ "${PYTHON_ABI}" == 3.* ]]; then
-			waf-utils_src_install
-		else
-			echo ${_BOLD}"$(PYTHON)" setup.py install --no-compile --root="${D}"${_NORMAL}
-			PKGCONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" "$(PYTHON)" setup.py install --no-compile --root="${D}"
-		fi
-	}
-	python_execute_function -s installation
-
-	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
-}
diff --git a/dev-python/pycairo/pycairo-1.8.10.ebuild b/dev-python/pycairo/pycairo-1.8.10.ebuild
index 183f211a1564..8c52c65e558f 100644
--- a/dev-python/pycairo/pycairo-1.8.10.ebuild
+++ b/dev-python/pycairo/pycairo-1.8.10.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.10.ebuild,v 1.15 2012/05/04 15:12:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.10.ebuild,v 1.16 2012/06/02 11:59:24 marienz Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-pypy-*"
 DISTUTILS_SRC_TEST="py.test"
 
 inherit eutils distutils flag-o-matic multilib