| 1 |
idella4 14/05/21 14:34:31 |
| 2 |
|
| 3 |
Modified: pycairo-1.10.0-r4.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
drop py2.6 add py3.4, patches to fix configure failure under py3.4, patch courtesy of Hristo Venev via Bug #504342 (early March) |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.19 dev-python/pycairo/pycairo-1.10.0-r4.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild?rev=1.19&view=markup |
| 13 |
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 |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild?r1=1.18&r2=1.19 |
| 15 |
|
| 16 |
Index: pycairo-1.10.0-r4.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r4.ebuild,v |
| 19 |
retrieving revision 1.18 |
| 20 |
retrieving revision 1.19 |
| 21 |
diff -u -r1.18 -r1.19 |
| 22 |
--- pycairo-1.10.0-r4.ebuild 5 Sep 2013 18:46:22 -0000 1.18 |
| 23 |
+++ pycairo-1.10.0-r4.ebuild 21 May 2014 14:34:31 -0000 1.19 |
| 24 |
@@ -1,9 +1,9 @@ |
| 25 |
-# Copyright 1999-2013 Gentoo Foundation |
| 26 |
+# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $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 $ |
| 29 |
+# $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 $ |
| 30 |
|
| 31 |
EAPI="5" |
| 32 |
-PYTHON_COMPAT=( python2_{6,7} python3_{2,3} ) |
| 33 |
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) |
| 34 |
|
| 35 |
inherit eutils python-r1 waf-utils |
| 36 |
|
| 37 |
@@ -27,8 +27,7 @@ |
| 38 |
# Note: xpyb is used as the C header, not Python modules |
| 39 |
RDEPEND="${PYTHON_DEPS} |
| 40 |
>=x11-libs/cairo-1.10.0[svg?,xcb?] |
| 41 |
- xcb? ( x11-libs/xpyb ) |
| 42 |
-" |
| 43 |
+ xcb? ( x11-libs/xpyb )" |
| 44 |
DEPEND="${RDEPEND} |
| 45 |
virtual/pkgconfig |
| 46 |
test? ( dev-python/pytest[${PYTHON_USEDEP}] ) |
| 47 |
@@ -40,6 +39,7 @@ |
| 48 |
rm -f src/config.h || die |
| 49 |
epatch "${FILESDIR}/${PN}-1.10.0-svg_check.patch" |
| 50 |
epatch "${FILESDIR}/${PN}-1.10.0-xpyb.patch" |
| 51 |
+ epatch "${FILESDIR}/${PN}-1.10.0-waf-unpack.patch" |
| 52 |
epatch "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch |
| 53 |
popd > /dev/null |
| 54 |
|
| 55 |
@@ -51,8 +51,14 @@ |
| 56 |
popd > /dev/null |
| 57 |
|
| 58 |
preparation() { |
| 59 |
- if [[ ${EPYTHON} == python3.* ]]; then |
| 60 |
+ if python_is_python3; then |
| 61 |
cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die |
| 62 |
+ pushd "${BUILD_DIR}" > /dev/null |
| 63 |
+ wafdir="$(./waf unpack)" |
| 64 |
+ pushd "${wafdir}" > /dev/null |
| 65 |
+ epatch "${FILESDIR}/${PN}-1.10.0-waf-py3_4.patch" |
| 66 |
+ popd > /dev/null |
| 67 |
+ popd > /dev/null |
| 68 |
else |
| 69 |
cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die |
| 70 |
fi |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.145 dev-python/pycairo/ChangeLog |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/ChangeLog?rev=1.145&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/ChangeLog?rev=1.145&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pycairo/ChangeLog?r1=1.144&r2=1.145 |
| 79 |
|
| 80 |
Index: ChangeLog |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v |
| 83 |
retrieving revision 1.144 |
| 84 |
retrieving revision 1.145 |
| 85 |
diff -u -r1.144 -r1.145 |
| 86 |
--- ChangeLog 5 Sep 2013 18:46:22 -0000 1.144 |
| 87 |
+++ ChangeLog 21 May 2014 14:34:31 -0000 1.145 |
| 88 |
@@ -1,6 +1,12 @@ |
| 89 |
# ChangeLog for dev-python/pycairo |
| 90 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 91 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.144 2013/09/05 18:46:22 mgorny Exp $ |
| 92 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 93 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.145 2014/05/21 14:34:31 idella4 Exp $ |
| 94 |
+ |
| 95 |
+ 21 May 2014; Ian Delaney <idella4@g.o> |
| 96 |
+ +files/pycairo-1.10.0-waf-py3_4.patch, +files/pycairo-1.10.0-waf-unpack.patch, |
| 97 |
+ pycairo-1.10.0-r4.ebuild: |
| 98 |
+ drop py2.6 add py3.4, patches to fix configure failure under py3.4, patch |
| 99 |
+ courtesy of Hristo Venev via Bug #504342 (early March) |
| 100 |
|
| 101 |
05 Sep 2013; Michał Górny <mgorny@g.o> pycairo-1.10.0-r4.ebuild: |
| 102 |
Clean up PYTHON_COMPAT from old implementations. |
Archives