idella4 14/05/21 14:34:31 Modified: pycairo-1.10.0-r4.ebuild ChangeLog Log: drop py2.6 add py3.4, patches to fix configure failure under py3.4, patch courtesy of Hristo Venev via Bug #504342 (early March) (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.19 dev-python/pycairo/pycairo-1.10.0-r4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild?rev=1.19&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild?rev=1.19&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild?r1=1.18&r2=1.19 Index: pycairo-1.10.0-r4.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- pycairo-1.10.0-r4.ebuild 5 Sep 2013 18:46:22 -0000 1.18 +++ pycairo-1.10.0-r4.ebuild 21 May 2014 14:34:31 -0000 1.19 @@ -1,9 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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-r4.ebuild,v 1.18 2013/09/05 18:46:22 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v 1.19 2014/05/21 14:34:31 idella4 Exp $ EAPI="5" -PYTHON_COMPAT=( python2_{6,7} python3_{2,3} ) +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) inherit eutils python-r1 waf-utils @@ -27,8 +27,7 @@ # Note: xpyb is used as the C header, not Python modules RDEPEND="${PYTHON_DEPS} >=x11-libs/cairo-1.10.0[svg?,xcb?] - xcb? ( x11-libs/xpyb ) -" + xcb? ( x11-libs/xpyb )" DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-python/pytest[${PYTHON_USEDEP}] ) @@ -40,6 +39,7 @@ rm -f src/config.h || die epatch "${FILESDIR}/${PN}-1.10.0-svg_check.patch" epatch "${FILESDIR}/${PN}-1.10.0-xpyb.patch" + epatch "${FILESDIR}/${PN}-1.10.0-waf-unpack.patch" epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch popd > /dev/null @@ -51,8 +51,14 @@ popd > /dev/null preparation() { - if [[ ${EPYTHON} == python3.* ]]; then + if python_is_python3; then cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die + pushd "${BUILD_DIR}" > /dev/null + wafdir="$(./waf unpack)" + pushd "${wafdir}" > /dev/null + epatch "${FILESDIR}/${PN}-1.10.0-waf-py3_4.patch" + popd > /dev/null + popd > /dev/null else cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die fi 1.145 dev-python/pycairo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/ChangeLog?rev=1.145&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/ChangeLog?rev=1.145&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/ChangeLog?r1=1.144&r2=1.145 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- ChangeLog 5 Sep 2013 18:46:22 -0000 1.144 +++ ChangeLog 21 May 2014 14:34:31 -0000 1.145 @@ -1,6 +1,12 @@ # ChangeLog for dev-python/pycairo -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.144 2013/09/05 18:46:22 mgorny Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.145 2014/05/21 14:34:31 idella4 Exp $ + + 21 May 2014; Ian Delaney <[email protected]> + +files/pycairo-1.10.0-waf-py3_4.patch, +files/pycairo-1.10.0-waf-unpack.patch, + pycairo-1.10.0-r4.ebuild: + drop py2.6 add py3.4, patches to fix configure failure under py3.4, patch + courtesy of Hristo Venev via Bug #504342 (early March) 05 Sep 2013; Michał Górny <[email protected]> pycairo-1.10.0-r4.ebuild: Clean up PYTHON_COMPAT from old implementations.
