diff options
| author |   XU Benda <heroxbd@gmail.com> | 2012-08-11 16:59:31 +0900 |
|---|---|---|
| committer | XU Benda <heroxbd@gmail.com> | 2012-08-11 16:59:31 +0900 |
| commit | efd928d258a541200292ae0a8e55b9a97055b11c (patch) | |
| tree | 1a6e294fc06662cc1149f8246af76bf1beb980e0 /dev-python | |
| parent | initial commit (diff) | |
| download | android-efd928d258a541200292ae0a8e55b9a97055b11c.tar.gz android-efd928d258a541200292ae0a8e55b9a97055b11c.tar.bz2 android-efd928d258a541200292ae0a8e55b9a97055b11c.zip | |
update the repo
Diffstat (limited to 'dev-python')
36 files changed, 2327 insertions, 809 deletions
diff --git a/dev-python/pyopengl/ChangeLog b/dev-python/pyopengl/ChangeLog deleted file mode 100644 index d811f28..0000000 --- a/dev-python/pyopengl/ChangeLog +++ /dev/null @@ -1,337 +0,0 @@ -# ChangeLog for dev-python/pyopengl -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.63 2010/09/30 17:15:32 jlec Exp $ - - 30 Sep 2010; Justin Lecher <jlec@gentoo.org> pyopengl-3.0.1.ebuild: - keyworded for ~-linux prefix - - 16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> - pyopengl-3.0.1.ebuild: - virtual/glut -> media-libs/glut - - 05 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> pyopengl-3.0.1.ebuild: - ppc64 stable wrt #319171 - - 24 May 2010; <nixnut@gentoo.org> pyopengl-3.0.1.ebuild: - ppc stable #319171 - - 23 May 2010; Raúl Porcel <armin76@gentoo.org> pyopengl-3.0.1.ebuild: - alpha/arm/ia64/sh/sparc/x86 stable wrt #319171 - - 18 May 2010; Markos Chandras <hwoarang@gentoo.org> pyopengl-3.0.1.ebuild: - Stable on amd64 wrt bug #319171 - - 14 May 2010; Jeroen Roovers <jer@gentoo.org> pyopengl-3.0.1.ebuild: - Stable for HPPA (bug #319171). - - 18 Apr 2010; <nixnut@gentoo.org> pyopengl-3.0.1_beta2.ebuild: - ppc stable #302672 - -*pyopengl-3.0.1 (04 Apr 2010) - - 04 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +pyopengl-3.0.1.ebuild: - Version bump. - - 04 Apr 2010; Raúl Porcel <armin76@gentoo.org> - pyopengl-3.0.1_beta2.ebuild: - alpha/arm/ia64/sh/sparc stable wrt #302672 - - 23 Feb 2010; Christian Faulhammer <fauli@gentoo.org> - pyopengl-3.0.1_beta2.ebuild: - stable x86, bug 302672 - - 10 Feb 2010; Jeroen Roovers <jer@gentoo.org> pyopengl-3.0.1_beta2.ebuild: - Stable for HPPA (bug #302672). - - 25 Jan 2010; Raúl Porcel <armin76@gentoo.org> - pyopengl-3.0.1_beta2.ebuild: - Add ~alpha/~arm/~ia64/~sh/~sparc wrt #298612 - - 25 Jan 2010; Raúl Porcel <armin76@gentoo.org> - pyopengl-3.0.1_beta1.ebuild: - alpha/ia64/sh/sparc stable wrt #298132 - - 14 Jan 2010; Markus Meier <maekke@gentoo.org> pyopengl-3.0.1_beta1.ebuild: - arm/x86 stable, bug #298132 - - 14 Jan 2010; Brent Baude <ranger@gentoo.org> pyopengl-3.0.1_beta2.ebuild: - Marking pyopengl-3.0.1_beta2 ~ppc for bug 298612 - - 10 Jan 2010; Brent Baude <ranger@gentoo.org> pyopengl-3.0.1_beta1.ebuild: - stable ppc64, bug 298132 - - 10 Jan 2010; Brent Baude <ranger@gentoo.org> pyopengl-3.0.1_beta2.ebuild: - Marking pyopengl-3.0.1_beta2 ~ppc64 for bug 298612 - - 07 Jan 2010; Jeroen Roovers <jer@gentoo.org> pyopengl-3.0.1_beta1.ebuild: - Stable for HPPA (bug #298132). - - 07 Jan 2010; Jeroen Roovers <jer@gentoo.org> pyopengl-3.0.1_beta2.ebuild: - Marked ~hppa (bug #298612). - - 07 Jan 2010; Alexis Ballier <aballier@gentoo.org> - pyopengl-3.0.1_beta2.ebuild: - keyword ~x86-fbsd, bug #298612 - - 07 Jan 2010; Steve Dibb <beandog@gentoo.org> pyopengl-3.0.1_beta1.ebuild: - amd64 stable, bug 298132 - - 28 Dec 2009; nixnut <nixnut@gentoo.org> pyopengl-3.0.1_beta1.ebuild: - ppc stable #298132 - -*pyopengl-3.0.1_beta2 (28 Dec 2009) - - 28 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +pyopengl-3.0.1_beta2.ebuild: - Version bump. Add optional dependency on dev-tcltk/togl (bug #285352). - -*pyopengl-3.0.1_beta1 (21 Nov 2009) - - 21 Nov 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - -pyopengl-2.0.0.44.ebuild, -files/pyopengl-2.0.0.44-fix_togl.patch, - -pyopengl-3.0.1_alpha3.ebuild, +pyopengl-3.0.1_beta1.ebuild, - -files/config.diff: - Version bump. - - 08 Oct 2009; Raúl Porcel <armin76@gentoo.org> pyopengl-3.0.0.ebuild: - ia64/sh/sparc stable wrt #271976 - - 21 Sep 2009; Markus Meier <maekke@gentoo.org> pyopengl-3.0.0.ebuild: - arm stable, bug #271976 - -*pyopengl-3.0.1_alpha4 (13 Sep 2009) - - 13 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +pyopengl-3.0.1_alpha4.ebuild: - Version bump. - - 06 Sep 2009; Christian Ruppert <idl0r@gentoo.org> - pyopengl-2.0.0.44.ebuild, -files/pyopengl-2.0.1.09-malloc.patch: - Remove unused patch. Fix repoman complains. - - 04 Sep 2009; Patrick Lauer <patrick@gentoo.org> - -pyopengl-3.0.0_beta6.ebuild, -pyopengl-3.0.0_beta8.ebuild, - -pyopengl-3.0.1_alpha1.ebuild: - Remove old - -*pyopengl-3.0.1_alpha3 (29 Aug 2009) - - 29 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +pyopengl-3.0.1_alpha3.ebuild: - Version bump. - -*pyopengl-3.0.1_alpha1 (02 Aug 2009) - - 02 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +pyopengl-3.0.1_alpha1.ebuild: - Version bump. Set SUPPORT_PYTHON_ABIS. - - 19 Jun 2009; Brent Baude <ranger@gentoo.org> pyopengl-3.0.0.ebuild: - stable ppc64, bug 271976 - - 09 Jun 2009; Jeroen Roovers <jer@gentoo.org> pyopengl-3.0.0.ebuild: - Stable for HPPA (bug #271976). - - 07 Jun 2009; Tobias Klausmann <klausman@gentoo.org> pyopengl-3.0.0.ebuild: - Stable on alpha, bug #271976 - - 06 Jun 2009; nixnut <nixnut@gentoo.org> pyopengl-3.0.0.ebuild: - ppc stable #271976 - - 01 Jun 2009; Markus Meier <maekke@gentoo.org> pyopengl-3.0.0.ebuild: - amd64/x86 stable, bug #271976 - -*pyopengl-3.0.0 (16 May 2009) - - 16 May 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> - +pyopengl-3.0.0.ebuild: - Version bump. - - 25 Jan 2009; Patrick Lauer <patrick@gentoo.org> - pyopengl-3.0.0_beta8.ebuild: - Disabling doc useflag in beta8 as upstream does not ship the docs. Closes - #256297 - -*pyopengl-3.0.0_beta8 (24 Jan 2009) - - 24 Jan 2009; Patrick Lauer <patrick@gentoo.org> - +pyopengl-3.0.0_beta8.ebuild: - Bump to beta8, closes #256180 - -*pyopengl-3.0.0_beta6 (25 Oct 2008) - - 25 Oct 2008; Ali Polatel <hawking@gentoo.org> -pyopengl-2.0.1.09.ebuild, - -pyopengl-2.0.1.09-r1.ebuild, -pyopengl-3.0.0_beta1.ebuild, - +pyopengl-3.0.0_beta6.ebuild: - Version bump. Fix python dependency, bug 242688. Use use dependencies - instead of built_with_use. Drop old. - - 29 Jun 2008; Torsten Veller <tove@gentoo.org> pyopengl-3.0.0_beta1.ebuild: - Add missing die: || "..." -> || die "..." - - 24 Feb 2008; Tiziano Müller <dev-zero@gentoo.org> - pyopengl-3.0.0_beta1.ebuild: - Fixed typo in built_with_use. Added setuptools dependency (bug #211253). - -*pyopengl-3.0.0_beta1 (24 Feb 2008) - - 24 Feb 2008; Tiziano Müller <dev-zero@gentoo.org> - +pyopengl-3.0.0_beta1.ebuild: - Version bump (fixes bugs #199961, #137872, #133602 since ctype is being used - instead of swig and bug #202921). - - 22 Jul 2007; Hans de Graaff <graaff@gentoo.org> pyopengl-2.0.0.44.ebuild, - pyopengl-2.0.1.09.ebuild, pyopengl-2.0.1.09-r1.ebuild: - Drop virtual/x11 references. - - 03 Feb 2007; Lukasz Strzygowski <lucass@gentoo.org> - pyopengl-2.0.0.44.ebuild: - Fixed mistaken variable name (bug #157514). - -*pyopengl-2.0.1.09-r1 (27 Jan 2007) - - 27 Jan 2007; Lukasz Strzygowski <lucass@gentoo.org> - +pyopengl-2.0.1.09-r1.ebuild: - Added doc use-flag and fixed to install docs in /usr/share/doc (bug #158511). - - 12 Sep 2006; Marien Zwart <marienz@gentoo.org> pyopengl-2.0.0.44.ebuild, - pyopengl-2.0.1.09.ebuild: - built_with_use tcltk -> built_with_use tk. Thanks to Cardoe for reporting. - - 28 Jul 2006; Javier Villavicencio <the_paya@gentoo.org> - pyopengl-2.0.1.09.ebuild: - Added ~x86-fbsd keyword. - - 28 Jul 2006; Alastair Tse <liquidx@gentoo.org> - +files/pyopengl-2.0.1.09-malloc.patch, pyopengl-2.0.1.09.ebuild: - freebsd compat patch to remove use of malloc.h (#140940) - - 11 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; - pyopengl-2.0.1.09.ebuild: - Add modular X dependencies. - - 08 Feb 2005; Fernando Serboncini <fserb@gentoo.org> - pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild: - Fixed lib vars. Thanks to Tom Payne <twp@gentoo.org> for the diff. Closes - #81217 - - 07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> - pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild: - Fixed SED expression. Closes #81164 - - 31 Jan 2005; Fernando Serboncini <fserb@gentoo.org> - -files/pyopengl-2.0.0.44-disable_togl.patch, - +files/pyopengl-2.0.0.44-fix_togl.patch, pyopengl-2.0.0.44.ebuild, - pyopengl-2.0.1.09.ebuild: - removed virtualx eclass dependency on both ebuilds. Closes #80090. - - 28 Jan 2005; Mike Frysinger <vapier@gentoo.org> pyopengl-2.0.0.44.ebuild, - pyopengl-2.0.1.09.ebuild: - Remove opengl-update cruft. - - 25 Jan 2005; Fernando Serboncini <fserb@gentoo.org> - pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild: - Fixed opengl-update switch on both ebuilds. Fixes #76928 - - 25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org> - pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild: - Use proper env.d file. - -*pyopengl-2.0.1.09 (25 Jan 2005) - - 25 Jan 2005; Fernando Serboncini <fserb@gentoo.org> - +pyopengl-2.0.1.09.ebuild: - Version bump, closes #68921. - Thanks to Keith Lyon <kglyon@uwyo.edu> for the ebuild. - - 30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 05 Sep 2004; Sven Wegener <swegener@gentoo.org> : - Fixed ChangeLog header. - - 13 Aug 2004; Alastair Tse <liquidx@gentoo.org> pyopengl-2.0.0.44.ebuild: - stop unary warnings - - 29 Jul 2004; Tom Gall <tgall@gentoo.org> PyOpenGL-2.0.0.44.ebuild: - stable on ppc64, bug #57015 - -*pyopengl-2.0.0.44 (20 Jul 2004) - - 20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml, - +files/config.diff, +files/pyopengl-2.0.0.44-disable_togl.patch, - +pyopengl-2.0.0.44.ebuild: - Rename dev-python/PyOpenGL to dev-python/pyopengl. - - 13 May 2004; Stephen P. Becker <geoman@gentoo.org> PyOpenGL-2.0.0.44.ebuild: - Stable on mips. - - 07 May 2004; Bryan Østergaard <kloeri@gentoo.org> PyOpenGL-2.0.0.44.ebuild: - Add missing IUSE. - - 11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; - PyOpenGL-2.0.0.44.ebuild: - Fixes for xorg-x11 compatibility. - - 09 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> - PyOpenGL-2.0.0.44.ebuild: - don't assign default to S; inherit eutils for epatch - - 07 Apr 2004; Bart Lauwers <blauwers@gentoo.org> PyOpenGL-2.0.0.44.ebuild: - Fix for bug #45435: previous code broke non-nvidia opengl setups - - 16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> PyOpenGL-2.0.0.44.ebuild: - Added ~mips keyword. - - 17 Feb 2004; Aron Griffis <agriffis@gentoo.org> PyOpenGL-2.0.0.44.ebuild: - stable on ia64 - - 17 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> : - manifest fix - - 16 Jan 2004; Bartosch Pixa <darkspecter@gentoo.org> - PyOpenGL-2.0.0.44.ebuild: - set ppc in keywords - - 16 Jan 2004; Bart Lauwers <blauwers@gentoo.org) PyOpenGL-2.0.0.44.ebuild : - Fix for bug #37320: temporarily disable nvidia opengl driver during build, added - missing ChangeLog entry - - 05 Jan 2004; Jon Portnoy <avenj@gentoo.org> PyOpenGL-2.0.0.44.ebuild : - AMD64 keywords. - - 29 Dec 2003; Guy Martin <gmsoft@gentoo.org> PyOpenGL-2.0.0.44.ebuild: - Marked stable on hppa. - - 25 Dec 2003; Jason Wever <weeve@gentoo.org> PyOpenGL-2.0.0.44.ebuild: - Marked stable on sparc. - - 06 Dec 2003; Alastair Tse <liquidx@gentoo.org> PyOpenGL-2.0.0.44.ebuild, - files/PyOpenGL-2.0.0.44-disable_togl.patch: - temporarily disabled ToGL until we find a better solution for tk-8.4.4. please - note that this is going to be deprecated from PyOpenGL in the next release and - is not used by anything in portage. (#32070) Patch thanks to Eamon - Caddigan <ecaddiga@uiuc.edu> - - 30 May 2003; Jack Morgan <jmorgan@gentoo.org> PyOpenGL-2.0.0.44.ebuild: - Changed -sparc to ~sparc - - 16 May 2003; Stanislav Brabec <utx@gentoo.org> files/config.diff: - Patch updated to build with tk-8.4 (from Chad Netzer - <chad.netzer@stanfordalumni.org>, bugs #20248). - -*PyOpenGL-2.0.0.44 (29 Aug 2002) - - 11 Sep 2002; Nick Hadaway <raker@gentoo.org> PyOpenGL-2.0.0.44.ebuild : - Updated dependancies to include glut. This addresses bug #7563 - - 29 Aug 2002; Seemant Kulleen <seemant@gentoo.org> PyOpenGL-2.0.0.44.ebuild : - Adjusted so that an X server need not be running. It will use a virtual X - server. - - 29 Aug 2002; Nick Hadaway <raker@gentoo.org> PyOpenGL-2.0.0.44.ebuild, - files/digest-PyOpenGL-2.0.0.44, files/config.diff : - New ebuild added to support a wxPython opengl enabled build. This ebuild - requires a local or remote xserver running in order to complete the - build. diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest deleted file mode 100644 index f09a8a3..0000000 --- a/dev-python/pyopengl/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST PyOpenGL-3.0.1.tar.gz 698475 RMD160 cd9c3f20ae7154cc4fcb810dea3a24bd469d3c05 SHA1 3a5b4888b0c9f73513c9e41629c32e1279907524 SHA256 79065ba0fec47e9e9514f3be543866f07d7b08071336d566fbf3ab138c442635 -EBUILD pyopengl-3.0.1.ebuild 909 SHA1 59abd43012cd0e09228361caf6196449cf03c2db SHA256 20f3e6e2d88262746410523bac51b871c9ed1248d792680f3fd3909cffd12bcd -MISC ChangeLog 11833 SHA1 897f275c45f7df4aa024f4b5ea93f530cd338d6e SHA256 375dca6fc56f1da6f49f2a2e57392e8a4e656817c3faf182072a104e771c343c -MISC metadata.xml 159 SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 diff --git a/dev-python/pyopengl/metadata.xml b/dev-python/pyopengl/metadata.xml deleted file mode 100644 index de483c5..0000000 --- a/dev-python/pyopengl/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>python</herd> -</pkgmetadata> diff --git a/dev-python/pyopengl/pyopengl-3.0.1.ebuild b/dev-python/pyopengl/pyopengl-3.0.1.ebuild deleted file mode 100644 index fe3d70f..0000000 --- a/dev-python/pyopengl/pyopengl-3.0.1.ebuild +++ /dev/null @@ -1,37 +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/pyopengl/pyopengl-3.0.1.ebuild,v 1.10 2010/12/26 15:26:50 arfrever Exp $ - -EAPI="3" -PYTHON_DEPEND="2:2.5" -PYTHON_USE_WITH="tk" -PYTHON_USE_WITH_OPT="tk" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils - -MY_PN="PyOpenGL" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Python OpenGL bindings" -HOMEPAGE="http://pyopengl.sourceforge.net/ http://pypi.python.org/pypi/PyOpenGL" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz - mirror://sourceforge/pyopengl/${MY_P}.tar.gz" -LICENSE="BSD" - -SLOT="0" -KEYWORDS="~amd64-linux ~x86-linux" -IUSE="tk" - -RDEPEND="media-libs/freeglut - virtual/opengl - x11-libs/libXi - x11-libs/libXmu - tk? ( dev-tcltk/togl )" -DEPEND="${RDEPEND} - dev-python/setuptools" -RESTRICT_PYTHON_ABIS="2.4 3.*" - -S="${WORKDIR}/${MY_P}" - -PYTHON_MODNAME="OpenGL" diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog new file mode 100644 index 0000000..e6de16a --- /dev/null +++ b/dev-python/pypy/ChangeLog @@ -0,0 +1,99 @@ +# ChangeLog for dev-python/pypy +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.20 2012/06/08 16:52:09 djc Exp $ + +*pypy-1.9 (08 Jun 2012) + + 08 Jun 2012; Dirkjan Ochtman <djc@gentoo.org> + +files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.p + atch, +files/1.9-scripts-location.patch, +pypy-1.9.ebuild, + +files/1.9-no-bytecode-4151f9c406b6.patch, + +files/1.9-distutils-fix_handling_of_executables_and_flags.patch: + Version bump to 1.9. + + 08 Jun 2012; Dirkjan Ochtman <djc@gentoo.org> metadata.xml: + Remove unused USE flag. + + 08 Jun 2012; Dirkjan Ochtman <djc@gentoo.org> -files/1.7-patches.patch, + -pypy-1.7-r2.ebuild, -pypy-1.8.ebuild: + Remove old versions. + + 28 Feb 2012; Mike Gilbert <floppym@gentoo.org> pypy-1.7-r2.ebuild, + pypy-1.8-r1.ebuild: + Apply patch from Arfrever for bug 406129. Tested by Ian Delaney. + + 16 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> pypy-1.8-r1.ebuild: + Add fake xml useflag for dependencies (suggested by Arfrever). + +*pypy-1.8-r1 (16 Feb 2012) + + 16 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> +pypy-1.8-r1.ebuild, + +files/1.8-sext-instructions-02dc2f6160ee.patch, + +files/1.8-elf-metadata-26a8d3fc57a7.patch: + Made xml mandatory, stackless is built by default, split patches. + + 14 Feb 2012; Mike Gilbert <floppym@gentoo.org> pypy-1.7-r2.ebuild, + pypy-1.8.ebuild: + Adjust memory requirements. + + 12 Feb 2012; Mike Gilbert <floppym@gentoo.org> -pypy-1.7.ebuild, + pypy-1.7-r2.ebuild, pypy-1.8.ebuild: + Rename 1.7 tarball as well. Override src_unpack to avoid having to hardcode S. + Drop old version. + + 12 Feb 2012; Mike Gilbert <floppym@gentoo.org> pypy-1.8.ebuild: + Rename source tarball. + +*pypy-1.8 (12 Feb 2012) + + 12 Feb 2012; Dirkjan Ochtman <djc@gentoo.org> +pypy-1.8.ebuild, metadata.xml: + Version bump to 1.8. Some test failures, but seems to be okay. + + 02 Feb 2012; Mike Gilbert <floppym@gentoo.org> pypy-1.7-r2.ebuild: + Add sqlite USE flag, patch by Arfrever. Make several variables local. + +*pypy-1.7-r2 (01 Feb 2012) + + 01 Feb 2012; Mike Gilbert <floppym@gentoo.org> +pypy-1.7-r2.ebuild, + -pypy-1.7-r1.ebuild, + files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch: + Updated patch from Arfrever. + +*pypy-1.7-r1 (30 Jan 2012) + + 30 Jan 2012; Mike Gilbert <floppym@gentoo.org> + +files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch, +files/ + pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patc + h, +pypy-1.7-r1.ebuild: + Apply patches from Arfrever to resolve bug 397523. + + 15 Jan 2012; Markos Chandras <hwoarang@gentoo.org> pypy-1.7.ebuild: + Don't call use() in global scope. Patch by Arfrever. + + 13 Dec 2011; Nirbheek Chauhan <nirbheek@gentoo.org> pypy-1.7.ebuild, + metadata.xml: + Remove USE=stackless, which is not optional any longer. Add the ~x86 keyword. + Add myself as co-maintainer. + + 30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> pypy-1.7.ebuild: + Fix problems resulting from earlier failing ${S}. + + 30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> -files/1.5-patches.patch, + -pypy-1.5.ebuild: + Remove old version. + +*pypy-1.7 (30 Nov 2011) + + 30 Nov 2011; Dirkjan Ochtman <djc@gentoo.org> +files/1.7-patches.patch, + +files/1.7-scripts-location.patch, +pypy-1.7.ebuild: + Version bump to 1.7 (bugs fixed: 379791, 383063, 373487). + + 24 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> pypy-1.5.ebuild: + Fix bug 372641, bug 372639, bug 372517. + +*pypy-1.5 (06 Jun 2011) + + 06 Jun 2011; Dirkjan Ochtman <djc@gentoo.org> +files/1.5-patches.patch, + +pypy-1.5.ebuild, +metadata.xml: + Initial version of pypy (bug 300301). + diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest new file mode 100644 index 0000000..5653a8d --- /dev/null +++ b/dev-python/pypy/Manifest @@ -0,0 +1,16 @@ +AUX 1.7-scripts-location.patch 412 RMD160 811c3cc38370f97274f8ec5cc36f34b3e79dae56 SHA1 c03fa9679443ed9461829745f5bb00cfecd3eb22 SHA256 abc39fbbf69d1d6b478a4a16626950e8e0b607fb05c6e1e1c10618c59fccdda9 +AUX 1.8-elf-metadata-26a8d3fc57a7.patch 569 RMD160 de5a440cb41ab0249141304c12f9a35af1565c87 SHA1 57daa224b13ec3e6cf7f23d02d896527137dca6b SHA256 8c695811ca9eae7d3b81674e8de255dc84e242972041ca54093a3d96f40fe34b +AUX 1.8-sext-instructions-02dc2f6160ee.patch 1100 RMD160 c1f83411a70af07c0987ac51c81806de70a5d991 SHA1 8430932adfaadf903a1ad5a4635644157e04ee78 SHA256 599af03fb41902cb00b6c1768febd921276efbdc7b550d010676cc210f7564bb +AUX 1.9-distutils-fix_handling_of_executables_and_flags.patch 17956 RMD160 a9185e456eaa9a810d4f7b73a78feae944982bf7 SHA1 ffd5eef4f49cbffa3c383f1d06799017ee9f79db SHA256 4ed9800fc851377a45ebf72c759322ebb005dd87100e2ebf634c11b418a56acf +AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 RMD160 cb5ae5aca4c645c5c913dedf55ca267e02735976 SHA1 2c9011788abaa65ec1679ecb0ffd4c269b4cd12d SHA256 dc17421bd12e4df5fed2fb1d113c9a8ca691b127631c48350aea1801c52360f1 +AUX 1.9-no-bytecode-4151f9c406b6.patch 1114 RMD160 254806e80944589cc76caac92fb6b67ae3ebf5f3 SHA1 8d9c0ca17a242894e3347232bdf7995e5ab50536 SHA256 6c76b9456ef1e8460b80a55f82c688704de73fe0ab027a127fae634a7b087880 +AUX 1.9-scripts-location.patch 394 RMD160 e0324dd7cbdf0508c12cd63c2620f9d001e81ef6 SHA1 98b0e6e9182e38020fa9f95445bf27358c7f0356 SHA256 d02ef738b6c82a7a671b50bdc5dc623887e97c3cb033c11ea997b88e6ccb8bdc +AUX pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch 18064 RMD160 8e86cff09340448f3e49ccc626efa40e9463273a SHA1 533cad04bc8d96e2ba1a09e8249a3efd97e46b1d SHA256 43cbabdf5f7b094eb969c754bb6513fa324b1fadb40b37d78bd1ad47194d787a +AUX pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 569 RMD160 540aa0881ea1fef56cea3734fa09f5c3366d5bb0 SHA1 5f4939129a9a56c9f9da0e82851f675fd7c73209 SHA256 55ea809a5f3e264b1905b06aa3af78aae149451e7d74a98d11e87629ab69493e +AUX pypy-1.9-no-static-hack.patch 845 RMD160 300a5233e66815826c0b1ebbfedd51db2dee8c55 SHA1 099402f0602f09bfa263be5619cd791718e48a64 SHA256 cc96fe665c689ab079fa317e5d059c07e96884e47affe5279faea239ec349d7e +DIST pypy-1.8.tar.bz2 14927806 RMD160 70fe569b466357ee64685c8ce15278d24862c711 SHA1 4ff684619671d6076879eff88343184d7656c699 SHA256 ac98ad6d884207f8325ff4c783104ebea57a3fcddfef32abcdf97fd4307b6287 +DIST pypy-1.9.tar.bz2 13466551 RMD160 8ac2f53330ae450650f05753985bdbb42e07b526 SHA1 36a05432bbcee5d92a320fa27a627aeb281086b4 SHA256 9fd599acade49ef98017bbce4f179f19cf2680489ff15235d3bad5b20bde0d68 +EBUILD pypy-1.8-r1.ebuild 3156 RMD160 41bba9d37e47db4788bb3901c04c6cc5f210bdbd SHA1 2aef475bdd408dcd042f2c0fb865750a665963e2 SHA256 b97521f03d18b5a9fb5584dad78bf246e50a8712768b8684b2b8c1b9ba54ac80 +EBUILD pypy-1.9.ebuild 3151 RMD160 4301f974a0d9b069866b186b36b1d63c6733de06 SHA1 0b49a9700e8d17e85e80c56091008f8e7496b529 SHA256 713386b32b5e392e996e4704bfd993df901b2a01d82f9c2d79038007225de903 +MISC ChangeLog 3670 RMD160 c06ae32b25e359d73ca5e966fd537bffa24e8259 SHA1 7fbc1e9320a69894ca70af639a0e30a9c022fc5f SHA256 0a1bbeb70bf3b0e3482120a5fe98568a32a2d1a7ee1eb99dc4fa62680d8791be +MISC metadata.xml 434 RMD160 3c90cc70db73e1645c0a82a093084551e80ad311 SHA1 8942b6dc54c073f17f49afac40b6bad056692571 SHA256 2af0a575ae6cb4c00383bdb8a22774b3d5bc988c7f48cbcdddef781234fc54e5 diff --git a/dev-python/pypy/files/1.7-scripts-location.patch b/dev-python/pypy/files/1.7-scripts-location.patch new file mode 100644 index 0000000..91b5ced --- /dev/null +++ b/dev-python/pypy/files/1.7-scripts-location.patch @@ -0,0 +1,11 @@ +--- pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py ++++ pypy-pypy-release-1.7/lib-python/modified-2.7/distutils/command/install.py +@@ -87,7 +87,7 @@ + 'purelib': '$base/site-packages', + 'platlib': '$base/site-packages', + 'headers': '$base/include', +- 'scripts': '$base/bin', ++ 'scripts': '/usr/bin', + 'data' : '$base', + }, + } diff --git a/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch b/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch new file mode 100644 index 0000000..d581373 --- /dev/null +++ b/dev-python/pypy/files/1.8-elf-metadata-26a8d3fc57a7.patch @@ -0,0 +1,10 @@ +--- pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py.bak 2011-11-29 14:22:29.000000000 +0100 ++++ pypy-pypy-release-1.7/pypy/translator/c/gcc/trackgcroot.py 2011-11-29 14:22:55.000000000 +0100 +@@ -1694,6 +1694,7 @@ + } + """ + elif self.format in ('elf64', 'darwin64'): ++ print >> output, "\t.section .note.GNU-stack,\"\",%progbits" + print >> output, "\t.text" + print >> output, "\t.globl %s" % _globalname('pypy_asm_stackwalk') + _variant(elf64='.type pypy_asm_stackwalk, @function', diff --git a/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch b/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch new file mode 100644 index 0000000..6528479 --- /dev/null +++ b/dev-python/pypy/files/1.8-sext-instructions-02dc2f6160ee.patch @@ -0,0 +1,22 @@ +--- pypy/translator/c/gcc/trackgcroot.py.old 2012-02-15 14:11:38.551479431 -0800 ++++ pypy/translator/c/gcc/trackgcroot.py 2012-02-15 00:55:20.082136135 -0800 +@@ -471,8 +471,8 @@ + return [] + + IGNORE_OPS_WITH_PREFIXES = dict.fromkeys([ +- 'cmp', 'test', 'set', 'sahf', 'lahf', 'cltd', 'cld', 'std', +- 'rep', 'movs', 'lods', 'stos', 'scas', 'cwtl', 'cwde', 'prefetch', ++ 'cmp', 'test', 'set', 'sahf', 'lahf', 'cld', 'std', ++ 'rep', 'movs', 'lods', 'stos', 'scas', 'cwde', 'prefetch', + # floating-point operations cannot produce GC pointers + 'f', + 'cvt', 'ucomi', 'comi', 'subs', 'subp' , 'adds', 'addp', 'xorp', +@@ -485,6 +485,8 @@ + 'bswap', 'bt', 'rdtsc', + 'punpck', 'pshufd', 'pcmp', 'pand', 'psllw', 'pslld', 'psllq', + 'paddq', 'pinsr', ++ # sign-extending moves should not produce GC pointers ++ 'cbtw', 'cwtl', 'cwtd', 'cltd', 'cltq', 'cqto', + # zero-extending moves should not produce GC pointers + 'movz', + # locked operations should not move GC pointers, at least so far diff --git a/dev-python/pypy/files/1.9-distutils-fix_handling_of_executables_and_flags.patch b/dev-python/pypy/files/1.9-distutils-fix_handling_of_executables_and_flags.patch new file mode 100644 index 0000000..4a35ea8 --- /dev/null +++ b/dev-python/pypy/files/1.9-distutils-fix_handling_of_executables_and_flags.patch @@ -0,0 +1,391 @@ +--- lib-python/2.7/distutils/ccompiler.py ++++ lib-python/2.7/distutils/ccompiler.py +@@ -27,10 +27,16 @@ + varies across Unices and is stored in Python's Makefile. + """ + if compiler.compiler_type == "unix": +- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ +- _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SO', 'AR', +- 'ARFLAGS') ++ cc = ' '.join(compiler.compiler) ++ cxx = ' '.join(compiler.compiler_cxx) ++ ldshared = ' '.join(compiler.linker_so) ++ ldcxxshared = ' '.join(compiler.linker_so_cxx) ++ ar = compiler.archiver[0] ++ ++ cflags = '' ++ cxxflags = '' ++ ccshared = '-fPIC' ++ ar_flags = compiler.archiver[1] + + if 'CC' in os.environ: + cc = os.environ['CC'] +@@ -38,19 +44,27 @@ + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: +@@ -59,17 +73,19 @@ + archiver = ar + ' ' + ar_flags + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, + linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx, + archiver=archiver) + +- compiler.shared_lib_extension = so_ext +- + class CCompiler: + """Abstract base class to define the interface that must be implemented + by real compiler classes. Also has some utility methods used by +--- lib-python/2.7/distutils/cygwinccompiler.py ++++ lib-python/2.7/distutils/cygwinccompiler.py +@@ -135,9 +135,13 @@ + self.set_executables(compiler='gcc -mcygwin -O -Wall', + compiler_so='gcc -mcygwin -mdll -O -Wall', + compiler_cxx='g++ -mcygwin -O -Wall', ++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', + linker_exe='gcc -mcygwin', + linker_so=('%s -mcygwin %s' % +- (self.linker_dll, shared_option))) ++ (self.linker_dll, shared_option)), ++ linker_exe_cxx='g++ -mcygwin', ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll, shared_option))) + + # cygwin and mingw32 need different sets of libraries + if self.gcc_version == "2.91.57": +@@ -163,8 +167,12 @@ + raise CompileError, msg + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError, msg: + raise CompileError, msg + +@@ -325,10 +333,15 @@ + self.set_executables(compiler='gcc -mno-cygwin -O -Wall', + compiler_so='gcc -mno-cygwin -mdll -O -Wall', + compiler_cxx='g++ -mno-cygwin -O -Wall', ++ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall', + linker_exe='gcc -mno-cygwin', + linker_so='%s -mno-cygwin %s %s' + % (self.linker_dll, shared_option, +- entry_point)) ++ entry_point), ++ linker_exe_cxx='g++ -mno-cygwin', ++ linker_so_cxx='%s -mno-cygwin %s %s' ++ % (self.linker_dll, shared_option, ++ entry_point)) + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) + # (-mthreads: Support thread-safe exception handling on `Mingw32') +--- lib-python/2.7/distutils/emxccompiler.py ++++ lib-python/2.7/distutils/emxccompiler.py +@@ -65,8 +65,12 @@ + # XXX optimization, warnings etc. should be customizable. + self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', + compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', ++ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', ++ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', + linker_exe='gcc -Zomf -Zmt -Zcrtdll', +- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') ++ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', ++ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', ++ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') + + # want the gcc library statically linked (so that we don't have + # to distribute a version dependent on the compiler we have) +@@ -83,8 +87,12 @@ + raise CompileError, msg + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError, msg: + raise CompileError, msg + +--- lib-python/2.7/distutils/sysconfig_cpython.py ++++ lib-python/2.7/distutils/sysconfig_cpython.py +@@ -149,9 +149,12 @@ + varies across Unices and is stored in Python's Makefile. + """ + if compiler.compiler_type == "unix": +- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \ +- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SO') ++ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext) = \ ++ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', ++ 'LDCXXSHARED', 'SO') ++ ++ cflags = '' ++ cxxflags = '' + + if 'CC' in os.environ: + cc = os.environ['CC'] +@@ -159,28 +162,40 @@ + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, +- linker_exe=cc) ++ linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx) + + compiler.shared_lib_extension = so_ext + +@@ -506,7 +521,7 @@ + for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED', + # a number of derived variables. These need to be + # patched up as well. +- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'): ++ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'): + flags = _config_vars[key] + flags = re.sub('-arch\s+\w+\s', ' ', flags) + flags = re.sub('-isysroot [^ \t]*', ' ', flags) +@@ -525,7 +540,7 @@ + for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED', + # a number of derived variables. These need to be + # patched up as well. +- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'): ++ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'): + + flags = _config_vars[key] + flags = re.sub('-arch\s+\w+\s', ' ', flags) +@@ -549,7 +564,7 @@ + for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED', + # a number of derived variables. These need to be + # patched up as well. +- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'): ++ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'): + + flags = _config_vars[key] + flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags) +--- lib-python/2.7/distutils/sysconfig_pypy.py ++++ lib-python/2.7/distutils/sysconfig_pypy.py +@@ -114,13 +114,56 @@ + optional C speedup components. + """ + if compiler.compiler_type == "unix": +- compiler.compiler_so.extend(['-fPIC', '-Wimplicit']) ++ cc = ' '.join(compiler.compiler) ++ cxx = ' '.join(compiler.compiler_cxx) ++ ldshared = ' '.join(compiler.linker_so) ++ ldcxxshared = ' '.join(compiler.linker_so_cxx) ++ ++ cflags = '' ++ cxxflags = '' ++ ccshared = '-fPIC' ++ ++ if 'CC' in os.environ: ++ cc = os.environ['CC'] ++ if 'CXX' in os.environ: ++ cxx = os.environ['CXX'] ++ if 'LDSHARED' in os.environ: ++ ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] ++ if 'CPP' in os.environ: ++ cpp = os.environ['CPP'] ++ else: ++ cpp = cc + " -E" # not always ++ if 'LDFLAGS' in os.environ: ++ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] ++ if 'CFLAGS' in os.environ: ++ cflags = os.environ['CFLAGS'] ++ ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] ++ if 'CPPFLAGS' in os.environ: ++ cpp = cpp + ' ' + os.environ['CPPFLAGS'] ++ cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] ++ ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] ++ ++ cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags ++ compiler.set_executables( ++ preprocessor=cpp, ++ compiler=cc_cmd, ++ compiler_so=cc_cmd + ' ' + ccshared, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, ++ linker_so=ldshared, ++ linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx) + compiler.shared_lib_extension = get_config_var('SO') +- if "CFLAGS" in os.environ: +- cflags = os.environ["CFLAGS"] +- compiler.compiler.append(cflags) +- compiler.compiler_so.append(cflags) +- compiler.linker_so.append(cflags) + + + from sysconfig_cpython import ( +--- lib-python/2.7/distutils/unixccompiler.py ++++ lib-python/2.7/distutils/unixccompiler.py +@@ -114,14 +114,17 @@ + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). +- executables = {'preprocessor' : None, +- 'compiler' : ["cc"], +- 'compiler_so' : ["cc"], +- 'compiler_cxx' : ["cc"], +- 'linker_so' : ["cc", "-shared"], +- 'linker_exe' : ["cc"], +- 'archiver' : ["ar", "-cr"], +- 'ranlib' : None, ++ executables = {'preprocessor' : None, ++ 'compiler' : ["cc"], ++ 'compiler_so' : ["cc"], ++ 'compiler_cxx' : ["c++"], ++ 'compiler_so_cxx' : ["c++"], ++ 'linker_so' : ["cc", "-shared"], ++ 'linker_exe' : ["cc"], ++ 'linker_so_cxx' : ["c++", "-shared"], ++ 'linker_exe_cxx' : ["c++"], ++ 'archiver' : ["ar", "-cr"], ++ 'ranlib' : None, + } + + if sys.platform[:6] == "darwin": +@@ -186,11 +189,18 @@ + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = self.compiler_so ++ compiler_so_cxx = self.compiler_so_cxx + if sys.platform == 'darwin': + compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs) ++ compiler_so_cxx = _darwin_compiler_fixup(compiler_so_cxx, cc_args + ++ extra_postargs) + try: +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError, msg: + raise CompileError, msg + +@@ -247,23 +257,16 @@ + ld_args.extend(extra_postargs) + self.mkpath(os.path.dirname(output_filename)) + try: +- if target_desc == CCompiler.EXECUTABLE: +- linker = self.linker_exe[:] ++ if target_lang == "c++": ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe_cxx[:] ++ else: ++ linker = self.linker_so_cxx[:] + else: +- linker = self.linker_so[:] +- if target_lang == "c++" and self.compiler_cxx: +- # skip over environment variable settings if /usr/bin/env +- # is used to set up the linker's environment. +- # This is needed on OSX. Note: this assumes that the +- # normal and C++ compiler have the same environment +- # settings. +- i = 0 +- if os.path.basename(linker[0]) == "env": +- i = 1 +- while '=' in linker[i]: +- i = i + 1 +- +- linker[i] = self.compiler_cxx[i] ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe[:] ++ else: ++ linker = self.linker_so[:] + + if sys.platform == 'darwin': + linker = _darwin_compiler_fixup(linker, ld_args) diff --git a/dev-python/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch new file mode 100644 index 0000000..b3d5235 --- /dev/null +++ b/dev-python/pypy/files/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch @@ -0,0 +1,11 @@ +--- lib-python/2.7/distutils/unixccompiler.py ++++ lib-python/2.7/distutils/unixccompiler.py +@@ -297,7 +297,7 @@ + # this time, there's no way to determine this information from + # the configuration data stored in the Python installation, so + # we use this hack. +- compiler = os.path.basename(sysconfig.get_config_var("CC")) ++ compiler = os.path.basename(self.compiler[0]) + if sys.platform[:6] == "darwin": + # MacOSX's linker doesn't understand the -R flag at all + return "-L" + dir diff --git a/dev-python/pypy/files/1.9-no-bytecode-4151f9c406b6.patch b/dev-python/pypy/files/1.9-no-bytecode-4151f9c406b6.patch new file mode 100644 index 0000000..5fab3a5 --- /dev/null +++ b/dev-python/pypy/files/1.9-no-bytecode-4151f9c406b6.patch @@ -0,0 +1,27 @@ +# HG changeset patch +# User Armin Rigo <arigo@tunes.org> +# Date 1339165065 -7200 +# Node ID 4151f9c406b62f6c4a1fdd669389eb46eb90f9cb +# Parent 68f8d7152a45fa7856a2a013799874614fcd9c33 +issue1043 3rd issue fixed + +diff -r 68f8d7152a45fa7856a2a013799874614fcd9c33 -r 4151f9c406b62f6c4a1fdd669389eb46eb90f9cb pypy/translator/goal/app_main.py +--- a/pypy/translator/goal/app_main.py Fri Jun 08 16:06:33 2012 +0200 ++++ b/pypy/translator/goal/app_main.py Fri Jun 08 16:17:45 2012 +0200 +@@ -457,13 +457,13 @@ + + if PYTHON26 and not options["ignore_environment"]: + if os.getenv('PYTHONNOUSERSITE'): +- options["no_user_site"] = True ++ options["no_user_site"] = 1 + if os.getenv('PYTHONDONTWRITEBYTECODE'): +- options["dont_write_bytecode"] = True ++ options["dont_write_bytecode"] = 1 + + if (options["interactive"] or + (not options["ignore_environment"] and os.getenv('PYTHONINSPECT'))): +- options["inspect"] = True ++ options["inspect"] = 1 + + if PYTHON26 and we_are_translated(): + flags = [options[flag] for flag in sys_flags] diff --git a/dev-python/pypy/files/1.9-scripts-location.patch b/dev-python/pypy/files/1.9-scripts-location.patch new file mode 100644 index 0000000..5f0190d --- /dev/null +++ b/dev-python/pypy/files/1.9-scripts-location.patch @@ -0,0 +1,11 @@ +--- pypy-pypy-release-1.7/lib-python/2.7/distutils/command/install.py ++++ pypy-pypy-release-1.7/lib-python/2.7/distutils/command/install.py +@@ -87,7 +87,7 @@ + 'purelib': '$base/site-packages', + 'platlib': '$base/site-packages', + 'headers': '$base/include', +- 'scripts': '$base/bin', ++ 'scripts': '/usr/bin', + 'data' : '$base', + }, + } diff --git a/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch b/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch new file mode 100644 index 0000000..1252d27 --- /dev/null +++ b/dev-python/pypy/files/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch @@ -0,0 +1,391 @@ +--- lib-python/modified-2.7/distutils/ccompiler.py ++++ lib-python/modified-2.7/distutils/ccompiler.py +@@ -27,10 +27,16 @@ + varies across Unices and is stored in Python's Makefile. + """ + if compiler.compiler_type == "unix": +- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext, ar, ar_flags) = \ +- _sysconfig.get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SO', 'AR', +- 'ARFLAGS') ++ cc = ' '.join(compiler.compiler) ++ cxx = ' '.join(compiler.compiler_cxx) ++ ldshared = ' '.join(compiler.linker_so) ++ ldcxxshared = ' '.join(compiler.linker_so_cxx) ++ ar = compiler.archiver[0] ++ ++ cflags = '' ++ cxxflags = '' ++ ccshared = '-fPIC' ++ ar_flags = compiler.archiver[1] + + if 'CC' in os.environ: + cc = os.environ['CC'] +@@ -38,19 +44,27 @@ + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + if 'AR' in os.environ: + ar = os.environ['AR'] + if 'ARFLAGS' in os.environ: +@@ -59,17 +73,19 @@ + archiver = ar + ' ' + ar_flags + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, + linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx, + archiver=archiver) + +- compiler.shared_lib_extension = so_ext +- + class CCompiler: + """Abstract base class to define the interface that must be implemented + by real compiler classes. Also has some utility methods used by +--- lib-python/modified-2.7/distutils/cygwinccompiler.py ++++ lib-python/modified-2.7/distutils/cygwinccompiler.py +@@ -135,9 +135,13 @@ + self.set_executables(compiler='gcc -mcygwin -O -Wall', + compiler_so='gcc -mcygwin -mdll -O -Wall', + compiler_cxx='g++ -mcygwin -O -Wall', ++ compiler_so_cxx='g++ -mcygwin -mdll -O -Wall', + linker_exe='gcc -mcygwin', + linker_so=('%s -mcygwin %s' % +- (self.linker_dll, shared_option))) ++ (self.linker_dll, shared_option)), ++ linker_exe_cxx='g++ -mcygwin', ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll, shared_option))) + + # cygwin and mingw32 need different sets of libraries + if self.gcc_version == "2.91.57": +@@ -163,8 +167,12 @@ + raise CompileError, msg + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError, msg: + raise CompileError, msg + +@@ -325,10 +333,15 @@ + self.set_executables(compiler='gcc -mno-cygwin -O -Wall', + compiler_so='gcc -mno-cygwin -mdll -O -Wall', + compiler_cxx='g++ -mno-cygwin -O -Wall', ++ compiler_so_cxx='g++ -mno-cygwin -mdll -O -Wall', + linker_exe='gcc -mno-cygwin', + linker_so='%s -mno-cygwin %s %s' + % (self.linker_dll, shared_option, +- entry_point)) ++ entry_point), ++ linker_exe_cxx='g++ -mno-cygwin', ++ linker_so_cxx='%s -mno-cygwin %s %s' ++ % (self.linker_dll, shared_option, ++ entry_point)) + # Maybe we should also append -mthreads, but then the finished + # dlls need another dll (mingwm10.dll see Mingw32 docs) + # (-mthreads: Support thread-safe exception handling on `Mingw32') +--- lib-python/modified-2.7/distutils/emxccompiler.py ++++ lib-python/modified-2.7/distutils/emxccompiler.py +@@ -65,8 +65,12 @@ + # XXX optimization, warnings etc. should be customizable. + self.set_executables(compiler='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', + compiler_so='gcc -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', ++ compiler_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', ++ compiler_so_cxx='g++ -Zomf -Zmt -O3 -fomit-frame-pointer -mprobe -Wall', + linker_exe='gcc -Zomf -Zmt -Zcrtdll', +- linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll') ++ linker_so='gcc -Zomf -Zmt -Zcrtdll -Zdll', ++ linker_exe_cxx='g++ -Zomf -Zmt -Zcrtdll', ++ linker_so_cxx='g++ -Zomf -Zmt -Zcrtdll -Zdll') + + # want the gcc library statically linked (so that we don't have + # to distribute a version dependent on the compiler we have) +@@ -83,8 +87,12 @@ + raise CompileError, msg + else: # for other files use the C-compiler + try: +- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError, msg: + raise CompileError, msg + +--- lib-python/modified-2.7/distutils/sysconfig_cpython.py ++++ lib-python/modified-2.7/distutils/sysconfig_cpython.py +@@ -149,9 +149,12 @@ + varies across Unices and is stored in Python's Makefile. + """ + if compiler.compiler_type == "unix": +- (cc, cxx, opt, cflags, ccshared, ldshared, so_ext) = \ +- get_config_vars('CC', 'CXX', 'OPT', 'CFLAGS', +- 'CCSHARED', 'LDSHARED', 'SO') ++ (cc, cxx, ccshared, ldshared, ldcxxshared, so_ext) = \ ++ get_config_vars('CC', 'CXX', 'CCSHARED', 'LDSHARED', ++ 'LDCXXSHARED', 'SO') ++ ++ cflags = '' ++ cxxflags = '' + + if 'CC' in os.environ: + cc = os.environ['CC'] +@@ -159,28 +162,40 @@ + cxx = os.environ['CXX'] + if 'LDSHARED' in os.environ: + ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] + if 'CPP' in os.environ: + cpp = os.environ['CPP'] + else: + cpp = cc + " -E" # not always + if 'LDFLAGS' in os.environ: + ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] + if 'CFLAGS' in os.environ: +- cflags = opt + ' ' + os.environ['CFLAGS'] ++ cflags = os.environ['CFLAGS'] + ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] + if 'CPPFLAGS' in os.environ: + cpp = cpp + ' ' + os.environ['CPPFLAGS'] + cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] + ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] + + cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags + compiler.set_executables( + preprocessor=cpp, + compiler=cc_cmd, + compiler_so=cc_cmd + ' ' + ccshared, +- compiler_cxx=cxx, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, + linker_so=ldshared, +- linker_exe=cc) ++ linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx) + + compiler.shared_lib_extension = so_ext + +@@ -506,7 +521,7 @@ + for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED', + # a number of derived variables. These need to be + # patched up as well. +- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'): ++ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'): + flags = _config_vars[key] + flags = re.sub('-arch\s+\w+\s', ' ', flags) + flags = re.sub('-isysroot [^ \t]*', ' ', flags) +@@ -525,7 +540,7 @@ + for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED', + # a number of derived variables. These need to be + # patched up as well. +- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'): ++ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'): + + flags = _config_vars[key] + flags = re.sub('-arch\s+\w+\s', ' ', flags) +@@ -549,7 +564,7 @@ + for key in ('LDFLAGS', 'BASECFLAGS', 'LDSHARED', + # a number of derived variables. These need to be + # patched up as well. +- 'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'): ++ 'CFLAGS', 'CXXFLAGS', 'PY_CFLAGS', 'BLDSHARED'): + + flags = _config_vars[key] + flags = re.sub('-isysroot\s+\S+(\s|$)', ' ', flags) +--- lib-python/modified-2.7/distutils/sysconfig_pypy.py ++++ lib-python/modified-2.7/distutils/sysconfig_pypy.py +@@ -114,13 +114,56 @@ + optional C speedup components. + """ + if compiler.compiler_type == "unix": +- compiler.compiler_so.extend(['-fPIC', '-Wimplicit']) ++ cc = ' '.join(compiler.compiler) ++ cxx = ' '.join(compiler.compiler_cxx) ++ ldshared = ' '.join(compiler.linker_so) ++ ldcxxshared = ' '.join(compiler.linker_so_cxx) ++ ++ cflags = '' ++ cxxflags = '' ++ ccshared = '-fPIC' ++ ++ if 'CC' in os.environ: ++ cc = os.environ['CC'] ++ if 'CXX' in os.environ: ++ cxx = os.environ['CXX'] ++ if 'LDSHARED' in os.environ: ++ ldshared = os.environ['LDSHARED'] ++ if 'LDCXXSHARED' in os.environ: ++ ldcxxshared = os.environ['LDCXXSHARED'] ++ if 'CPP' in os.environ: ++ cpp = os.environ['CPP'] ++ else: ++ cpp = cc + " -E" # not always ++ if 'LDFLAGS' in os.environ: ++ ldshared = ldshared + ' ' + os.environ['LDFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] ++ if 'CFLAGS' in os.environ: ++ cflags = os.environ['CFLAGS'] ++ ldshared = ldshared + ' ' + os.environ['CFLAGS'] ++ if 'CXXFLAGS' in os.environ: ++ cxxflags = os.environ['CXXFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CXXFLAGS'] ++ if 'CPPFLAGS' in os.environ: ++ cpp = cpp + ' ' + os.environ['CPPFLAGS'] ++ cflags = cflags + ' ' + os.environ['CPPFLAGS'] ++ cxxflags = cxxflags + ' ' + os.environ['CPPFLAGS'] ++ ldshared = ldshared + ' ' + os.environ['CPPFLAGS'] ++ ldcxxshared = ldcxxshared + ' ' + os.environ['CPPFLAGS'] ++ ++ cc_cmd = cc + ' ' + cflags ++ cxx_cmd = cxx + ' ' + cxxflags ++ compiler.set_executables( ++ preprocessor=cpp, ++ compiler=cc_cmd, ++ compiler_so=cc_cmd + ' ' + ccshared, ++ compiler_cxx=cxx_cmd, ++ compiler_so_cxx=cxx_cmd + ' ' + ccshared, ++ linker_so=ldshared, ++ linker_exe=cc, ++ linker_so_cxx=ldcxxshared, ++ linker_exe_cxx=cxx) + compiler.shared_lib_extension = get_config_var('SO') +- if "CFLAGS" in os.environ: +- cflags = os.environ["CFLAGS"] +- compiler.compiler.append(cflags) +- compiler.compiler_so.append(cflags) +- compiler.linker_so.append(cflags) + + + from sysconfig_cpython import ( +--- lib-python/modified-2.7/distutils/unixccompiler.py ++++ lib-python/modified-2.7/distutils/unixccompiler.py +@@ -114,14 +114,17 @@ + # are pretty generic; they will probably have to be set by an outsider + # (eg. using information discovered by the sysconfig about building + # Python extensions). +- executables = {'preprocessor' : None, +- 'compiler' : ["cc"], +- 'compiler_so' : ["cc"], +- 'compiler_cxx' : ["cc"], +- 'linker_so' : ["cc", "-shared"], +- 'linker_exe' : ["cc"], +- 'archiver' : ["ar", "-cr"], +- 'ranlib' : None, ++ executables = {'preprocessor' : None, ++ 'compiler' : ["cc"], ++ 'compiler_so' : ["cc"], ++ 'compiler_cxx' : ["c++"], ++ 'compiler_so_cxx' : ["c++"], ++ 'linker_so' : ["cc", "-shared"], ++ 'linker_exe' : ["cc"], ++ 'linker_so_cxx' : ["c++", "-shared"], ++ 'linker_exe_cxx' : ["c++"], ++ 'archiver' : ["ar", "-cr"], ++ 'ranlib' : None, + } + + if sys.platform[:6] == "darwin": +@@ -186,11 +189,18 @@ + + def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): + compiler_so = self.compiler_so ++ compiler_so_cxx = self.compiler_so_cxx + if sys.platform == 'darwin': + compiler_so = _darwin_compiler_fixup(compiler_so, cc_args + extra_postargs) ++ compiler_so_cxx = _darwin_compiler_fixup(compiler_so_cxx, cc_args + ++ extra_postargs) + try: +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + +- extra_postargs) ++ if self.detect_language(src) == 'c++': ++ self.spawn(compiler_so_cxx + cc_args + [src, '-o', obj] + ++ extra_postargs) ++ else: ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + ++ extra_postargs) + except DistutilsExecError, msg: + raise CompileError, msg + +@@ -247,23 +257,16 @@ + ld_args.extend(extra_postargs) + self.mkpath(os.path.dirname(output_filename)) + try: +- if target_desc == CCompiler.EXECUTABLE: +- linker = self.linker_exe[:] ++ if target_lang == "c++": ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe_cxx[:] ++ else: ++ linker = self.linker_so_cxx[:] + else: +- linker = self.linker_so[:] +- if target_lang == "c++" and self.compiler_cxx: +- # skip over environment variable settings if /usr/bin/env +- # is used to set up the linker's environment. +- # This is needed on OSX. Note: this assumes that the +- # normal and C++ compiler have the same environment +- # settings. +- i = 0 +- if os.path.basename(linker[0]) == "env": +- i = 1 +- while '=' in linker[i]: +- i = i + 1 +- +- linker[i] = self.compiler_cxx[i] ++ if target_desc == CCompiler.EXECUTABLE: ++ linker = self.linker_exe[:] ++ else: ++ linker = self.linker_so[:] + + if sys.platform == 'darwin': + linker = _darwin_compiler_fixup(linker, ld_args) diff --git a/dev-python/pypy/files/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch b/dev-python/pypy/files/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch new file mode 100644 index 0000000..4422824 --- /dev/null +++ b/dev-python/pypy/files/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch @@ -0,0 +1,11 @@ +--- lib-python/modified-2.7/distutils/unixccompiler.py ++++ lib-python/modified-2.7/distutils/unixccompiler.py +@@ -297,7 +297,7 @@ + # this time, there's no way to determine this information from + # the configuration data stored in the Python installation, so + # we use this hack. +- compiler = os.path.basename(sysconfig.get_config_var("CC")) ++ compiler = os.path.basename(self.compiler[0]) + if sys.platform[:6] == "darwin": + # MacOSX's linker doesn't understand the -R flag at all + return "-L" + dir diff --git a/dev-python/pypy/files/pypy-1.9-no-static-hack.patch b/dev-python/pypy/files/pypy-1.9-no-static-hack.patch new file mode 100644 index 0000000..08cb42f --- /dev/null +++ b/dev-python/pypy/files/pypy-1.9-no-static-hack.patch @@ -0,0 +1,22 @@ +--- pypy/rlib/ropenssl.py 2012-06-07 21:24:48.000000000 +0900 ++++ pypy/rlib/ropenssl.py.new 2012-06-10 17:28:29.000000000 +0900 +@@ -19,18 +19,8 @@ if sys.platform == 'win32' and platform. + # so that openssl/ssl.h can repair this nonsense. + 'wincrypt.h'] + else: +- libraries = ['z'] ++ libraries = ['z', 'ssl', 'crypto'] + includes = [] +- if (sys.platform.startswith('linux') and +- os.path.exists('/usr/lib/libssl.a') and +- os.path.exists('/usr/lib/libcrypto.a')): +- # use static linking to avoid the infinite +- # amount of troubles due to symbol versions +- # and 0.9.8/1.0.0 +- link_files += ['/usr/lib/libssl.a', '/usr/lib/libcrypto.a'] +- testonly_libraries += ['ssl', 'crypto'] +- else: +- libraries += ['ssl', 'crypto'] + + includes += [ + 'openssl/ssl.h', diff --git a/dev-python/pypy/metadata.xml b/dev-python/pypy/metadata.xml new file mode 100644 index 0000000..3bc8fe3 --- /dev/null +++ b/dev-python/pypy/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<pkgmetadata> + <herd>python</herd> + <maintainer> + <email>djc@gentoo.org</email> + </maintainer> + <maintainer> + <email>nirbheek@gentoo.org</email> + </maintainer> + <use> + <flag name="jit">Enable the JIT compiler</flag> + <flag name="sandbox">Enable sandboxing functionality</flag> + <flag name="shadowstack">Use a shadow stack for finding GC roots</flag> + </use> +</pkgmetadata> diff --git a/dev-python/pypy/pypy-1.8-r1.ebuild b/dev-python/pypy/pypy-1.8-r1.ebuild new file mode 100644 index 0000000..d998d17 --- /dev/null +++ b/dev-python/pypy/pypy-1.8-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.8-r1.ebuild,v 1.3 2012/02/28 19:24:00 floppym Exp $ + +EAPI="4" + +inherit eutils toolchain-funcs check-reqs python versionator + +DESCRIPTION="PyPy is a fast, compliant alternative implementation of the Python language" +HOMEPAGE="http://pypy.org/" +SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2" +SLOTVER=$(get_version_component_range 1-2 ${PV}) + +LICENSE="MIT" +SLOT="${SLOTVER}" +PYTHON_ABI="2.7-pypy-${SLOTVER}" +KEYWORDS="~amd64 ~x86" +IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml" + +RDEPEND=">=sys-libs/zlib-1.1.3 + virtual/libffi + virtual/libintl + dev-libs/expat + bzip2? ( app-arch/bzip2 ) + ncurses? ( sys-libs/ncurses ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( dev-libs/openssl )" +DEPEND="${RDEPEND}" +PDEPEND="app-admin/python-updater" + +DOC="README LICENSE" + +pkg_pretend() { + CHECKREQS_MEMORY="2G" + use amd64 && CHECKREQS_MEMORY="4G" + check-reqs_pkg_pretend +} + +src_unpack() { + default + mv pypy-pypy-* "${S}" || die +} + +src_prepare() { + epatch "${FILESDIR}/${PV}-elf-metadata-26a8d3fc57a7.patch" + epatch "${FILESDIR}/${PV}-sext-instructions-02dc2f6160ee.patch" + epatch "${FILESDIR}/1.7-scripts-location.patch" + epatch "${FILESDIR}/pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" + epatch "${FILESDIR}/pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch" +} + +src_compile() { + local conf + if use jit; then + conf="-Ojit" + else + conf="-O2" + fi + if use shadowstack; then + conf+=" --gcrootfinder=shadowstack" + fi + if use sandbox; then + conf+=" --sandbox" + fi + + conf+=" ./pypy/translator/goal/targetpypystandalone.py" + # Avoid linking against libraries disabled by use flags + local optional_use=("bzip2" "ncurses" "ssl") + local optional_mod=("bz2" "_minimal_curses" "_ssl") + for ((i = 0; i < ${#optional_use[*]}; i++)); do + if use ${optional_use[$i]}; then + conf+=" --withmod-${optional_mod[$i]}" + else + conf+=" --withoutmod-${optional_mod[$i]}" + fi + done + + local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py --batch $conf" + echo ${_BOLD}"${translate_cmd}"${_NORMAL} + ${translate_cmd} || die "compile error" +} + +src_install() { + local INSPATH="/usr/$(get_libdir)/pypy${SLOT}" + insinto ${INSPATH} + doins -r include lib_pypy lib-python pypy-c + fperms a+x ${INSPATH}/pypy-c + dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT} + + if ! use sqlite; then + rm -fr "${ED}${INSPATH}/lib-python/2.7/sqlite3" + rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3" + rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py" + fi + + # Generate Grammar and PatternGrammar pickles. + PYTHONPATH="${ED}${INSPATH}/lib_pypy/__extensions__:${ED}${INSPATH}/lib_pypy:${ED}${INSPATH}/lib-python/modified-2.7:${ED}${INSPATH}/lib-python/2.7" "${ED}${INSPATH}/pypy-c" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" || die "Generation of Grammar and PatternGrammar pickles failed" +} + +src_test() { + $(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python +} diff --git a/dev-python/pypy/pypy-1.9.ebuild b/dev-python/pypy/pypy-1.9.ebuild new file mode 100644 index 0000000..e79e0e3 --- /dev/null +++ b/dev-python/pypy/pypy-1.9.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-1.9.ebuild,v 1.1 2012/06/08 16:52:09 djc Exp $ + +EAPI="4" + +inherit eutils toolchain-funcs check-reqs python versionator + +DESCRIPTION="PyPy is a fast, compliant alternative implementation of the Python language" +HOMEPAGE="http://pypy.org/" +SRC_URI="https://bitbucket.org/pypy/pypy/get/release-${PV}.tar.bz2 -> ${P}.tar.bz2" +SLOTVER=$(get_version_component_range 1-2 ${PV}) + +LICENSE="MIT" +SLOT="${SLOTVER}" +PYTHON_ABI="2.7-pypy-${SLOTVER}" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 doc examples +jit ncurses sandbox shadowstack sqlite ssl +xml" + +RDEPEND=">=sys-libs/zlib-1.1.3 + virtual/libffi + virtual/libintl + dev-libs/expat + bzip2? ( app-arch/bzip2 ) + ncurses? ( sys-libs/ncurses ) + sqlite? ( dev-db/sqlite:3 ) + ssl? ( dev-libs/openssl )" +DEPEND="${RDEPEND}" +PDEPEND="app-admin/python-updater" + +DOC="README LICENSE" + +pkg_pretend() { + CHECKREQS_MEMORY="2G" + use amd64 && CHECKREQS_MEMORY="4G" + check-reqs_pkg_pretend +} + +src_unpack() { + default + mv pypy-pypy-* "${S}" || die +} + +src_prepare() { + epatch "${FILESDIR}/${PV}-no-bytecode-4151f9c406b6.patch" + epatch "${FILESDIR}/${PV}-scripts-location.patch" + epatch "${FILESDIR}/${PV}-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" + epatch "${FILESDIR}/${PV}-distutils-fix_handling_of_executables_and_flags.patch" + epatch "${FILESDIR}/${P}-no-static-hack.patch" +} + +src_compile() { + local conf + if use jit; then + conf="-Ojit" + else + conf="-O2" + fi + if use shadowstack; then + conf+=" --gcrootfinder=shadowstack" + fi + if use sandbox; then + conf+=" --sandbox" + fi + + conf+=" ./pypy/translator/goal/targetpypystandalone.py" + # Avoid linking against libraries disabled by use flags + local optional_use=("bzip2" "ncurses" "ssl") + local optional_mod=("bz2" "_minimal_curses" "_ssl") + for ((i = 0; i < ${#optional_use[*]}; i++)); do + if use ${optional_use[$i]}; then + conf+=" --withmod-${optional_mod[$i]}" + else + conf+=" --withoutmod-${optional_mod[$i]}" + fi + done + + local translate_cmd="$(PYTHON -2) ./pypy/translator/goal/translate.py --batch $conf" + echo ${_BOLD}"${translate_cmd}"${_NORMAL} + ${translate_cmd} || die "compile error" +} + +src_install() { + local INSPATH="/usr/$(get_libdir)/pypy${SLOT}" + insinto ${INSPATH} + doins -r include lib_pypy lib-python pypy-c + fperms a+x ${INSPATH}/pypy-c + dosym ../$(get_libdir)/pypy${SLOT}/pypy-c /usr/bin/pypy-c${SLOT} + + if ! use sqlite; then + rm -fr "${ED}${INSPATH}/lib-python/2.7/sqlite3" + rm -fr "${ED}${INSPATH}/lib-python/modified-2.7/sqlite3" + rm -f "${ED}${INSPATH}/lib_pypy/_sqlite3.py" + fi + + # Generate Grammar and PatternGrammar pickles. + PYTHONPATH="${ED}${INSPATH}/lib_pypy/__extensions__:${ED}${INSPATH}/lib_pypy:${ED}${INSPATH}/lib-python/modified-2.7:${ED}${INSPATH}/lib-python/2.7" "${ED}${INSPATH}/pypy-c" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" || die "Generation of Grammar and PatternGrammar pickles failed" +} + +src_test() { + $(PYTHON -2) ./pypy/test_all.py --pypy=./pypy-c lib-python +} diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog deleted file mode 100644 index 743dc39..0000000 --- a/dev-python/rpy/ChangeLog +++ /dev/null @@ -1,201 +0,0 @@ -# ChangeLog for dev-python/rpy -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.41 2010/06/26 20:52:55 angelos Exp $ - - 26 Jun 2010; Christoph Mende <angelos@gentoo.org> rpy-2.1.3.ebuild: - Stable on amd64 wrt bug #325429 - -*rpy-2.1.3 (28 May 2010) - - 28 May 2010; Sébastien Fabbro <bicatali@gentoo.org> -rpy-2.1.1.ebuild, - +rpy-2.1.3.ebuild: - Bump - -*rpy-2.1.2 (25 May 2010) - - 25 May 2010; Sébastien Fabbro <bicatali@gentoo.org> -rpy-2.1.0.ebuild, - +rpy-2.1.2.ebuild: - Version bump - -*rpy-2.1.1 (03 May 2010) - - 03 May 2010; Sébastien Fabbro <bicatali@gentoo.org> -rpy-2.0.6.ebuild, - +rpy-2.1.1.ebuild: - Version bump - -*rpy-2.1.0 (26 Apr 2010) - - 26 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> +rpy-2.1.0.ebuild: - Version bump. Added python ABI support - - 15 Apr 2010; Sébastien Fabbro <bicatali@gentoo.org> rpy-1.0.2-r1.ebuild, - +files/rpy-1.0.2-R210.patch: - Added a fix for larger R versions - -*rpy-2.0.8 (14 Dec 2009) - - 14 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org> +rpy-2.0.8.ebuild: - Version bump - - 06 Sep 2009; Christian Ruppert <idl0r@gentoo.org> - -files/rpy-2.0.1-setup.patch: - Remove unused patch. - - 04 Sep 2009; Patrick Lauer <patrick@gentoo.org> -rpy-2.0.3.ebuild: - Remove old - -*rpy-2.0.6 (01 Aug 2009) - - 01 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> -rpy-2.0.2.ebuild, - +rpy-2.0.6.ebuild, +files/rpy-2.0.6-setup.patch: - Version bump - -*rpy-2.0.3 (07 Apr 2009) - - 07 Apr 2009; Sébastien Fabbro <bicatali@gentoo.org> -rpy-1.0.3.ebuild, - -rpy-2.0.1.ebuild, +rpy-2.0.3.ebuild: - Version bump, cleaning older versions (1.0.3 was wrongly slotted and - 1.0.2-r1 is actually the same thanks to the R-2.8 patch) - -*rpy-2.0.2 (15 Feb 2009) - - 15 Feb 2009; Patrick Lauer <patrick@gentoo.org> +rpy-2.0.2.ebuild: - Bump to 2.0.2 - -*rpy-2.0.1 (23 Jan 2009) -*rpy-1.0.3 (23 Jan 2009) - - 23 Jan 2009; Sébastien Fabbro <bicatali@gentoo.org> -files/90rpy, - +files/rpy-2.0.1-setup.patch, +rpy-1.0.3.ebuild, +rpy-2.0.1.ebuild: - Version bump, now slotted - - 27 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> - +files/rpy-1.0.2-R28.patch, rpy-1.0.2-r1.ebuild: - Add a patch for compatibility with R-2.8.0 - - 08 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> -rpy-0.4.6.ebuild: - Removed older version - - 01 Sep 2008; Raúl Porcel <armin76@gentoo.org> rpy-1.0.2-r1.ebuild: - ia64/x86 stable wrt #236208 - - 01 Sep 2008; Thomas Anderson <gentoofan23@gentoo.org> rpy-1.0.2-r1.ebuild: - stable amd64, bug 236208 - - 08 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> rpy-1.0.2-r1.ebuild: - Changed to virtual/texi2dvi - - 05 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org> -rpy-1.0.1.ebuild, - -rpy-1.0.2.ebuild, rpy-1.0.2-r1.ebuild: - Fixed lapack detection again (bug #224935) and switch texlive and tetex - order for doc flag. Cleaned for old versions. - -*rpy-1.0.2-r1 (07 May 2008) - - 07 May 2008; Sébastien Fabbro <bicatali@gentoo.org> - +files/rpy-1.0.2-rpymodule-R-2.7.patch, +rpy-1.0.2-r1.ebuild: - Patched for R >= 2.7, thanks dawe for his patch (bug #219522) - -*rpy-1.0.2 (11 Apr 2008) - - 11 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> +rpy-1.0.2.ebuild: - Version bump. Make lapack detection automatic - - 26 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org> - -files/rpy-0.99.2-version-detect.patch, - -files/rpy-1.0_rc3-lib-handling.patch, -files/rpy-lapack.patch, - -rpy-0.99.2-r1.ebuild, -rpy-1.0_rc3.ebuild, rpy-1.0.1.ebuild: - Re-fixes lapack dependencies when USE=-lapack is asked - -*rpy-1.0.1 (17 Jan 2008) - - 17 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> - +files/rpy-lapack.patch, +files/rpy-testfiles.patch, metadata.xml, - +rpy-1.0.1.ebuild: - Version bump, added a test function, doc flag. lapack is not needed anymore - because it links with the R module lapack, which always exists with R - (system libs or internal). Added sci as herd maintainers and a - longdescription - - 13 Oct 2007; Dirkjan Ochtman (djc) <mail@manuzhai.nl> +files/90rpy, - +files/rpy-0.99.2-version-detect.patch, - +files/rpy-1.0_rc3-lib-handling.patch, - +files/rpy-1.0_rc3-version-detect.patch, +metadata.xml, +rpy-0.4.6.ebuild, - +rpy-0.99.2-r1.ebuild, +rpy-1.0_rc3.ebuild: - New ebuild for bug 190615; thanks to genstef and dev-zero. - -*rpy-0.99.2-r1 (27 Sep 2007) - - 27 Sep 2007; Ali Polatel <hawking@gentoo.org> -rpy-0.99.2.ebuild, - +rpy-0.99.2-r1.ebuild: - revbump. fix lapack linking issue, bug 143396. added examples use flag. - added trailing slash to HOMEPAGE URI. drop old. - - 09 Apr 2007; Lukasz Strzygowski <lucass@gentoo.org> rpy-0.4.6.ebuild, - rpy-0.99.2.ebuild: - Use doenvd instead of insinto /etc/env.d, bug #173884. - - 21 Oct 2006; Aron Griffis <agriffis@gentoo.org> rpy-0.4.6.ebuild: - Mark 0.4.6 stable on ia64 - -*rpy-0.99.2 (28 Jul 2006) - - 28 Jul 2006; Alastair Tse <liquidx@gentoo.org> - +files/rpy-0.99.2-version-detect.patch, -rpy-0.4.1.ebuild, - rpy-0.4.6.ebuild, +rpy-0.99.2.ebuild: - version bump. new compatible version with R-2.3.x (#140842) - - 13 Apr 2006; Scott Stoddard <deltacow@gentoo.org> rpy-0.4.6.ebuild: - Added ~amd64 (bug #129796) - - 01 Apr 2006; Aron Griffis <agriffis@gentoo.org> rpy-0.4.6.ebuild: - Mark 0.4.6 ~ia64 - - 08 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org> - -files/rpy-0.3.5-cvs_backport.patch, -rpy-0.3.5-r1.ebuild: - clean old ebuild - -*rpy-0.4.6 (03 Nov 2005) - - 03 Nov 2005; Alastair Tse <liquidx@gentoo.org> +rpy-0.4.6.ebuild: - version bump (#102729) - - 12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> -rpy-0.3.5.ebuild: - Remove version 0.3.5, requested by Marcus Hanwell <cryos@gentoo.org> in bug - 95881. - -*rpy-0.4.1 (26 Apr 2005) - - 26 Apr 2005; Alastair Tse <liquidx@gentoo.org> +files/90rpy, - +rpy-0.4.1.ebuild: - version bump. added env.d file to add libpath for R libraries (needed for - rpy to work properly) - -*rpy-0.3.5-r1 (26 Apr 2005) - - 26 Apr 2005; Alastair Tse <liquidx@gentoo.org> - +files/rpy-0.3.5-cvs_backport.patch, rpy-0.3.5.ebuild, - +rpy-0.3.5-r1.ebuild: - revision bump to compile with R-2.0.0 via some ugly hack - - 31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> : - Change encoding to UTF-8 for GLEP 31 compliance - - 19 Oct 2004; Alastair Tse <liquidx@gentoo.org> rpy-0.3.5.ebuild: - pegging dep on dev-lang/R-1.91 because 2.0.0 doesn't work with these bindings - - 18 Oct 2004; Alastair Tse <liquidx@gentoo.org> rpy-0.3.5.ebuild: - fix problem with undefined reference to MAIN__ if using libf2c - - 18 Oct 2004; Alastair Tse <liquidx@gentoo.org> rpy-0.3.5.ebuild: - added dev-lang/R dep and fix to find libR properly - - 04 May 2004; Bryan Østergaard <kloeri@gentoo.org> rpy-0.3.5.ebuild: - Remove default S. - -*rpy-0.3.5 (21 Feb 2004) - - 21 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> metadata.xml, - rpy-0.3.5.ebuild: - Initial import. - diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest deleted file mode 100644 index 88dcba9..0000000 --- a/dev-python/rpy/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST rpy2-2.1.3.tar.gz 127887 RMD160 fb9354770fbbda39e07603f616bd9852f9573bc8 SHA1 cf067b0fbcc9589b442538ee89273e61973c6207 SHA256 624a742024c584ce0d215be65f48a47380b0e2ce5f9139db5e9bacde903597e6 -DIST rpy2-2.1.9.tar.gz 129184 SHA1 d068d985c573e93f9af5d0953be53c470f313cbc SHA256 a294f21739ab483b025655e36282692bf88ae908794694b03050b221ffec1c50 -EBUILD rpy-2.1.3.ebuild 913 SHA1 b5218133a4d754f11616a81383a91dbd6a6d3f44 SHA256 dcc76f9f29fe10e20b1ec643d9d9e3c98bdd211cb714044147279310f31aa468 -EBUILD rpy-2.1.9.ebuild 929 SHA1 01a36a365551fb1ba2096882e5337ad1cf471d6d SHA256 5c817d38034eee9bb11f0cba16add49d983a0304d57bcfe59a9c8c3e203fa89e -MISC ChangeLog 6770 SHA1 dae13271653baa3c95285e49e6a3a323214a9511 SHA256 921f73324b9e45d580f6117efccca47b707fcd993116f62c90dda4f54e1a6746 -MISC metadata.xml 435 SHA1 bb74a8f3c611f3f406b6343acb349d05e9765ad3 SHA256 cfbeb2f702e55ef46bef1a51dd78b7ceae7724a5ab5ccfd2daa65554e1a553de diff --git a/dev-python/rpy/metadata.xml b/dev-python/rpy/metadata.xml deleted file mode 100644 index 849436e..0000000 --- a/dev-python/rpy/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>python</herd> -<herd>sci</herd> -<longdescription lang="en"> - RPy provides a robust Python interface to the R programming - language. It can manage R objects and can execute arbitrary R - functions. All the errors from the R language are converted to - Python exceptions. -</longdescription> -</pkgmetadata> diff --git a/dev-python/rpy/rpy-2.1.3.ebuild b/dev-python/rpy/rpy-2.1.3.ebuild deleted file mode 100644 index e68e303..0000000 --- a/dev-python/rpy/rpy-2.1.3.ebuild +++ /dev/null @@ -1,39 +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/rpy/rpy-2.1.3.ebuild,v 1.2 2010/06/26 20:52:55 angelos Exp $ - -EAPI="2" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils eutils - -SLOT=2 -MYPN=${PN}${SLOT} -MYP=${MYPN}-${PV} - -DESCRIPTION="Python interface to the R Programming Language" -HOMEPAGE="http://rpy.sourceforge.net/ http://pypi.python.org/pypi/rpy2" -SRC_URI="http://pypi.python.org/packages/source/r/${MYPN}/${MYP}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 MPL-1.1" -SLOT="0" -KEYWORDS="~x86-linux" -IUSE="" - -RDEPEND=">=dev-lang/R-2.8 - dev-python/numpy - !<=dev-python/rpy-1.0.2-r2" -DEPEND="${RDEPEND}" - -RESTRICT_PYTHON_ABIS="3.*" -PYTHON_MODNAME="${MYPN}" - -S="${WORKDIR}/${MYP}" - -src_test() { - testing() { - PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \ - "$(PYTHON)" rpy/tests.py - } - python_execute_function testing -} diff --git a/dev-python/rpy/rpy-2.1.9.ebuild b/dev-python/rpy/rpy-2.1.9.ebuild deleted file mode 100644 index f151940..0000000 --- a/dev-python/rpy/rpy-2.1.9.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-2.1.9.ebuild,v 1.4 2011/01/29 16:41:33 armin76 Exp $ - -EAPI="2" -SUPPORT_PYTHON_ABIS="1" - -inherit distutils eutils - -SLOT=2 -MY_PN=${PN}${SLOT} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python interface to the R Programming Language" -HOMEPAGE="http://rpy.sourceforge.net/ http://pypi.python.org/pypi/rpy2" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1 MPL-1.1" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=dev-lang/R-2.8 - dev-python/numpy - !<=dev-python/rpy-1.0.2-r2" -DEPEND="${RDEPEND}" - -RESTRICT_PYTHON_ABIS="3.*" -PYTHON_MODNAME="${MY_PN}" - -S="${WORKDIR}/${MY_P}" - -src_test() { - testing() { - PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \ - "$(PYTHON)" rpy/tests.py - } - python_execute_function testing -} diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog index 5984a8f..58a806e 100644 --- a/dev-python/wxpython/ChangeLog +++ b/dev-python/wxpython/ChangeLog @@ -1,95 +1,6 @@ # ChangeLog for dev-python/wxpython -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.163 2012/02/28 18:45:32 ranger Exp $ - - 28 Feb 2012; Brent Baude <ranger@gentoo.org> wxpython-2.8.12.1.ebuild: - Marking wxpython-2.8.12.1 ppc for bug 403235 - - 22 Feb 2012; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.12.1.ebuild: - Stable for HPPA (bug #403235). - - 22 Feb 2012; Patrick Lauer <patrick@gentoo.org> wxpython-2.8.11.0.ebuild, - wxpython-2.8.12.0.ebuild, wxpython-2.8.12.1.ebuild, wxpython-2.9.1.1.ebuild, - wxpython-2.9.3.1.ebuild: - Restricting pypy - - 16 Feb 2012; Markus Meier <maekke@gentoo.org> wxpython-2.8.12.1.ebuild: - arm stable, bug #403235 - - 16 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> - wxpython-2.8.12.1.ebuild: - x86 stable wrt bug #403235 - - 13 Feb 2012; Agostino Sarubbo <ago@gentoo.org> wxpython-2.8.12.1.ebuild: - Stable for amd64, wrt bug #403235 - -*wxpython-2.9.3.1 (12 Feb 2012) - - 12 Feb 2012; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.9.3.1.ebuild: - Version bump (bug #384037 by radhermit). - - 08 Jan 2012; Markos Chandras <hwoarang@gentoo.org> wxpython-2.8.12.1.ebuild: - Fix a typo. Patch by Arfrever - - 06 Jan 2012; Markos Chandras <hwoarang@gentoo.org> wxpython-2.8.12.1.ebuild, - wxpython-2.9.1.1.ebuild: - Synchronize ebuilds. Use distutils.eclass. Patch by Arfrever. - - 06 Jan 2012; Markos Chandras <hwoarang@gentoo.org> wxpython-2.8.12.1.ebuild, - wxpython-2.9.1.1.ebuild: - Don't inherit unused eclass. Properly set local variables. Patch by Arfrever. - - 09 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> - -files/scripts-multiver-2.6.1.0.diff, -wxpython-2.6.4.0-r2.ebuild: - old - -*wxpython-2.8.12.1 (09 Dec 2011) - - 09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.8.12.1.ebuild: - Version bump. - - 09 Dec 2011; Ryan Hill <dirtyepic@gentoo.org> -wxpython-2.8.10.1.ebuild, - -files/wxpython-2.8-drop-editra.patch: - Remove old. - - 16 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> wxpython-2.8.11.0.ebuild: - ppc64 stable wrt #364203 - - 28 Jun 2011; Brent Baude <ranger@gentoo.org> wxpython-2.8.11.0.ebuild: - Marking wxpython-2.8.11.0 ppc for bug 364203 - - 04 Jun 2011; Raúl Porcel <armin76@gentoo.org> wxpython-2.8.11.0.ebuild: - alpha/ia64/sh/sparc stable wrt #364203 - - 21 May 2011; Thomas Kahle <tomka@gentoo.org> wxpython-2.8.11.0.ebuild: - x86 stable per bug 364203 - - 13 May 2011; Markus Meier <maekke@gentoo.org> wxpython-2.8.11.0.ebuild: - arm stable, bug #364203 - - 27 Apr 2011; Christoph Mende <angelos@gentoo.org> wxpython-2.8.11.0.ebuild: - Stable on amd64 wrt bug #364203 - - 26 Apr 2011; Jeroen Roovers <jer@gentoo.org> wxpython-2.8.11.0.ebuild: - Stable for HPPA (bug #364203). - - 22 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.11.0.ebuild, - wxpython-2.8.12.0.ebuild: - Don't install non-working binary stuff into DOCDIR (bug #364393 by ago). - -*wxpython-2.8.12.0 (20 Apr 2011) - - 20 Apr 2011; Ryan Hill <dirtyepic@gentoo.org> +wxpython-2.8.12.0.ebuild, - +files/wxpython-2.8.12-drop-editra.patch: - Version bump (bug #363319). - - 29 Mar 2011; Christoph Mende <angelos@gentoo.org> wxpython-2.6.4.0-r2.ebuild, - wxpython-2.8.10.1.ebuild: - Fixed slot deps - - 27 Feb 2011; Ryan Hill <dirtyepic@gentoo.org> wxpython-2.8.10.1.ebuild, - wxpython-2.8.11.0.ebuild, wxpython-2.9.1.1.ebuild: - Slot gnome stuff. +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.139 2011/01/23 01:12:36 dirtyepic Exp $ *wxpython-2.9.1.1 (23 Jan 2011) diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest index f23734d..074de7c 100644 --- a/dev-python/wxpython/Manifest +++ b/dev-python/wxpython/Manifest @@ -1,8 +1,27 @@ +AUX wxpython-2.8-cache-writable.patch 538 RMD160 1d627cfae8a819850d6f6807b6547b138e63e5a0 SHA1 e6c4e5732f2a3792bea50a9ff51d233569ca490e SHA256 caf371fdd36ae60b36754f6fa66df3887c3ee2e1dd509f8cc8bc92525942f429 +AUX wxpython-2.8-drop-editra.patch 2276 RMD160 dc3b1e9fbf57d5c5c4c97c6f6ccaf1bc00d5ebf9 SHA1 755549eea057f3f84ffdd19c3d7ea8f1ed7a3ca8 SHA256 b54b8ddf0f50e0d6c214d7e7d7105389a160a633ee2307b2f4a4c09b40a65f28 +AUX wxpython-2.8-wxversion-demo.patch 219 RMD160 5ec8b5179fe03493786965849494adb0f697eb23 SHA1 92ccb9e099def1ff9ff842b5bfbbd769c1d06c6e SHA256 19618386cf750f56051541c403153bf1c7e90764199e53818eb0c9557d026f1c AUX wxpython-2.8.11-drop-editra.patch 2197 RMD160 49364666c2c71f58bc89d63dbce7086cf786ea95 SHA1 9777b6e20a095249eb9a51f99ecefdea709c5066 SHA256 a0774e4c273485711cb3da4d70cf7bf0766a9f189fafdc7bae07186d553f341b +AUX wxpython-2.8.12-drop-editra.patch 2643 RMD160 11d3cda0646e79ec78fa720650d188cec452d2f7 SHA1 5ac5dd8506d86968a2b8621e8ee6b85f8e1757cc SHA256 bbe4960ab735f344916e36cb772a1a6c7e27d6540c7ee1dcd8437bff8fb6bee8 +AUX wxpython-2.8.9-wxversion-scripts.patch 7730 RMD160 e93c7b883b1ad22011df069d8d6ad24938ea8b07 SHA1 cf05e834a6e4325f51881f62113922e3aa20f5c4 SHA256 55b1caa38295338dda3cc9ebfa4e43eb3be76959a0ee9b23a7b81085d80d7ba6 AUX wxpython-2.9-wxversion-demo.patch 147 RMD160 5a666314fe5893d8246b73ebbc32e00b928c9e1a SHA1 73499356a2cd2f8262ca0624dea6f9b38f93a371 SHA256 79c0cb7455fe6947ba9b7278d98e2c6da156edd5e5c276b03cc7fff5d3073d14 AUX wxpython-2.9-wxversion-scripts.patch 4600 RMD160 6bc6f7966c39c2e072aec65412858843c957b4d0 SHA1 983db57bcfd143378cd81d28a1008f0d04733e1c SHA256 6c5cd5f3daa51bf3c033f1c934ac1ce219a421a7e993660c64ac532a9dd96675 -DIST wxPython-demo-2.9.3.1.tar.bz2 3959076 RMD160 3f12ba73e2a228d7b9fe46b8af410979447814a4 SHA1 2d9c83128eb78ee33a003d83e8c5bb82d12db0be SHA256 6e26ead8c780ecbcebb68593a72cd28432b2e756a42e019286d970d6a92ac340 -DIST wxPython-src-2.9.3.1.tar.bz2 49131100 RMD160 cd19b1d07d39c7918c72cf124f4f5cd48836d781 SHA1 0202f64e1e99fb69d22d7be0d38cf7dcf3d80d79 SHA256 7bae5bf45e98eba836472bdb358330f867c69de3a347860edd48fcb53690040d -EBUILD wxpython-2.9.3.1.ebuild 4363 RMD160 8d3092bd94f9c3b47f5df8a20dbe13428908ba7e SHA1 ed2ef215d4488734f063a3f57c611ad58170cb68 SHA256 02da994677dc4a0b4a6d3389be256c21b333d2e76142bde278ff1c99a5a43923 -MISC ChangeLog 29193 RMD160 edb060658eeb712d5da81cf8c6be5703417dd300 SHA1 98f164e8a80d7f67bb6b3205d68531ff73bcc13a SHA256 2b29efd38d148af3aa329b40763310073f87e34d81d4d8b4f496e60f2c56eefd +DIST wxPython-demo-2.8.10.1.tar.bz2 3605257 RMD160 00aa54621e3b0a16c2f77bb8b7663a64328c5e75 SHA1 2dc2df3ae3180866715ee7a2e9c2eb5bd7231ab2 SHA256 b2f15413e117547344a4b80db8bf6d2750c333454fcea427b38c9b62793643a0 +DIST wxPython-demo-2.8.11.0.tar.bz2 3894559 RMD160 74337736081d809e85e212c72a45cfd7bd23c236 SHA1 9e9a148bf8590d69bc652c535c8dc5b860f01043 SHA256 b4463d50bb597b66471e218f94e6e6f94e05689735038348f9689de941cc24d3 +DIST wxPython-demo-2.8.12.1.tar.bz2 3906851 RMD160 8274d1e227bceb76274776f8c42ffcb0f60fd39d SHA1 ca9e6a10c523e59fb9b0018c4862deeeb26c431d SHA256 252282193a80590b9eab436bef322701b21d35ad03b4b6ebb4824241ff947b5a +DIST wxPython-demo-2.9.1.1.tar.bz2 3925228 RMD160 082f1610dc2b2a9852d52077c09da54f3e162d73 SHA1 8b0fe8032d6e85950850d42dbd57882d1fda7fc9 SHA256 f3b689e17f347744b55fff948dc68f58905ba35a9647c3b3c2cf881374522371 +DIST wxPython-docs-2.8.10.1.tar.bz2 2331639 RMD160 c1eadac650401895ae32739b316cda3c06cd60bf SHA1 d096994904aabdc23ca6717af640b32963798a16 SHA256 3992384869dcb3c757da5f4e63e7ef4ab24f2fa1842edd5e126be4856bb951c0 +DIST wxPython-docs-2.8.11.0.tar.bz2 2331727 RMD160 da31b1da7e8f4862c404a14de2216216ab53aae4 SHA1 6d42177e72b93f286f55cc298bc7ab29531ffa7f SHA256 1e95cf1033902fd4c7abc1b9d34688179f8b699a0f74455fec541a6ad421590d +DIST wxPython-docs-2.8.12.1.tar.bz2 2331363 RMD160 245f1c20dcde4525f8fdcbfe2d82812ff8b4a92f SHA1 d83939f1f2d0592e2fa3000907d099ee8db32fd0 SHA256 1dfae3a74b91e2003856eed51698c51094f1a4e6688633ae61af7a22fa8a0ddb +DIST wxPython-newdocs-2.8.9.2.tar.bz2 1503913 RMD160 86084386383904972df15aa65ca26d1ad1a28a5d SHA1 eedef5ef87824b28a6fe4d338420cf6249ac1f2f SHA256 890b6b7ca37ba7aaa27f9716ea9992ac75ed8150e83939506e3c47f86e7f37a8 +DIST wxPython-src-2.8.10.1.tar.bz2 29770994 RMD160 bb606046d140623041b988e64ab268ced9aa958f SHA1 6598fbafd979a91f20100171fa23a91779f6dc62 SHA256 447690773279088e9d06dcfe56f00f310c0186de435969bb60b04ed0c3f25f5f +DIST wxPython-src-2.8.11.0.tar.bz2 30604503 RMD160 9e93b0acaf85ba1a4be9c324a872037c44a7694a SHA1 18982edc236a1d87e4eef018928358c925aa5b17 SHA256 210c568bdec811b10fbf8274e9659c8e52823d31fdda9010dbba725194f66661 +DIST wxPython-src-2.8.12.1.tar.bz2 31311482 RMD160 94eae06087bdd930e21bf90cc6672f93a1f5a17a SHA1 05688dc03d61631750f5904273122bb40a2115f5 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 +DIST wxPython-src-2.9.1.1.tar.bz2 40441688 RMD160 921fdd48c3a0c6fca86073a0588c357231d6fd5c SHA1 886196021bb7712ddf0f2a368137fde26e6e7823 SHA256 613ecb71dbb65b5938ea323bd5cd896b26853e46c4aa45fbf4837fc7e041583a +EBUILD wxpython-2.8.10.1.ebuild 5726 RMD160 6f25d8eb0db256a2ad7e9a6e03ab3a035e650c8c SHA1 09cf643c1dd15e5736f6ddb1bf22bdac03e0fa76 SHA256 487de05b2481c7e157204a73f4990b6c2051a4ab3b134defc734e2661929e414 +EBUILD wxpython-2.8.11.0.ebuild 5729 RMD160 2a09b118b817dfbd1b1f380b07e97c7b3786be3e SHA1 723129aa8089f03540d0875a321af09182ec3fd4 SHA256 3974f538f86094291348af2bb8eb8b1d1a0b8a1095248148b398869b9a5b6615 +EBUILD wxpython-2.8.12.1.ebuild 5125 RMD160 efb9c55fef3f62f84fec2f4eb421dc5c759167fc SHA1 aeadb1e081ee4d510c142144f5e72ef6bb85a848 SHA256 3667782a211e53a054b74db6d2adbcae539718f439b6d0d8d78200f0aa3eaf31 +EBUILD wxpython-2.9.1.1.ebuild 5274 RMD160 1cdad58904b4c4994b6f62a173bc5d504d538ca8 SHA1 7772b19fe3acc5176e74c2a2dbbb3f7bab4239e0 SHA256 a865cddcab9dff1f9ff3bc84a7eef9a41f56738a3fbbe4551bf6fa4de1516001 +MISC ChangeLog 26026 RMD160 ba1a8340cfa711b71900712d3b47db925bad1e1a SHA1 65c48f612562094d64596f580eb28dc8727de8b6 SHA256 71d49768f7b5a47f14fde25ccdf965f4e3a251c7b38296317ed541825e62a347 MISC metadata.xml 366 RMD160 3241adb1423f2ce702bc75172a071d7c24c335e3 SHA1 363953bc2e7c364bdc92278ce391df6820c8b063 SHA256 d90a8fa164deff1b8cfa28cf401483424addfceeca8cd35539b7f2bbb3280cff +MISC wxpython.patch 3985 RMD160 4c9ba1a03c2b0496fef104b3a6fdd591e56aec11 SHA1 073857020a27d30b9156b6a82d8153ef06e34367 SHA256 0645f59e19d623e7a5faac6a33d68a6ec4900bf1d9b941c2d09e687525d015de diff --git a/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch b/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch new file mode 100644 index 0000000..57f26b3 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8-cache-writable.patch @@ -0,0 +1,20 @@ +Use /tmp for cache files since the user won't have +write permissions on ${DOCDIR}. + +diff -Naurp docs-orig/viewdocs.py docs/viewdocs.py +--- docs-orig/viewdocs.py 2008-09-28 15:59:16.000000000 -0600 ++++ docs/viewdocs.py 2009-01-18 00:16:27.000000000 -0600 +@@ -16,11 +16,11 @@ if not basePath: + + + # test for write access +-if os.access(basePath, os.W_OK): ++if os.access('/tmp', os.W_OK): + + # setup the args + args = ['', +- '--cache='+basePath, ++ '--cache=/tmp', + os.path.join(basePath, 'wx.zip'), + ] + diff --git a/dev-python/wxpython/files/wxpython-2.8-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8-drop-editra.patch new file mode 100644 index 0000000..bd1705c --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8-drop-editra.patch @@ -0,0 +1,49 @@ +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/setup.py wxPython-src-2.8.9.2/wxPython/setup.py +--- wxPython-src-2.8.9.2-orig/wxPython/setup.py 2009-02-21 13:13:31.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/setup.py 2009-02-21 13:14:12.000000000 -0600 +@@ -878,12 +878,6 @@ WX_PKGLIST = [ 'wx', + 'wx.tools', + 'wx.tools.XRCed', + 'wx.tools.XRCed.plugins', +- 'wx.tools.Editra', +- 'wx.tools.Editra.src', +- 'wx.tools.Editra.src.autocomp', +- 'wx.tools.Editra.src.eclib', +- 'wx.tools.Editra.src.extern', +- 'wx.tools.Editra.src.syntax', + ] + + if not EGGing: +@@ -910,7 +904,6 @@ else: + opj('scripts/pywrap'), + opj('scripts/pywxrc'), + opj('scripts/xrced'), +- opj('scripts/editra'), + ] + + +@@ -922,16 +915,6 @@ DATA_FILES += find_data_files('wx/tools/ + DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx') + DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png') + +-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt') +-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo') +-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps', +- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING') +-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg') +-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README') +-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess') +-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*') +-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False) +- + + ## import pprint + ## pprint.pprint(DATA_FILES) +@@ -981,7 +964,6 @@ if EGGing: + 'pyshell = wx.py.PyShell:main', + 'pywrap = wx.py.PyWrap:main', + 'helpviewer = wx.tools.helpviewer:main', +- 'editra = wx.tools.Editra.launcher:main', + 'xrced = wx.tools.XRCed.xrced:main', + ], + }, diff --git a/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch new file mode 100644 index 0000000..9782919 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8-wxversion-demo.patch @@ -0,0 +1,10 @@ +--- demo/demo.org 2005-04-28 03:00:13.431583384 +0000 ++++ demo/demo.py 2005-04-28 03:00:31.886777768 +0000 +@@ -1,4 +1,7 @@ + #!/usr/bin/env python + ++import wxversion ++wxversion.select("2.8") ++ + import Main + Main.main() diff --git a/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch new file mode 100644 index 0000000..4b49f30 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8.12-drop-editra.patch @@ -0,0 +1,55 @@ +--- a/wxPython/setup.py ++++ b/wxPython/setup.py +@@ -887,20 +887,6 @@ WX_PKGLIST = [ 'wx', + 'wx.tools', + 'wx.tools.XRCed', + 'wx.tools.XRCed.plugins', +- 'wx.tools.Editra', +- 'wx.tools.Editra.src', +- 'wx.tools.Editra.src.autocomp', +- 'wx.tools.Editra.src.eclib', +- 'wx.tools.Editra.src.ebmlib', +- 'wx.tools.Editra.src.extern', +- 'wx.tools.Editra.src.extern.aui', +- 'wx.tools.Editra.src.extern.dexml', +- 'wx.tools.Editra.src.extern.pygments', +- 'wx.tools.Editra.src.extern.pygments.filters', +- 'wx.tools.Editra.src.extern.pygments.formatters', +- 'wx.tools.Editra.src.extern.pygments.lexers', +- 'wx.tools.Editra.src.extern.pygments.styles', +- 'wx.tools.Editra.src.syntax', + ] + + if not EGGing: +@@ -927,7 +913,6 @@ else: + opj('scripts/pywrap'), + opj('scripts/pywxrc'), + opj('scripts/xrced'), +- opj('scripts/editra'), + ] + if os.name == 'nt': + SCRIPTS.append( opj('scripts/genaxmodule') ) +@@ -941,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb') + DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx') + DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png') + +-DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt') +-DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo') +-DATA_FILES += find_data_files('wx/tools/Editra/pixmaps', +- '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING') +-DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg') +-DATA_FILES += find_data_files('wx/tools/Editra/src', 'README') +-DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess') +-DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*') +-DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False) + + + ## import pprint +@@ -1000,7 +976,6 @@ if EGGing: + 'pyshell = wx.py.PyShell:main', + 'pywrap = wx.py.PyWrap:main', + 'helpviewer = wx.tools.helpviewer:main', +- 'editra = wx.tools.Editra.launcher:main', + 'xrced = wx.tools.XRCed.xrced:main', + ], + }, diff --git a/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch new file mode 100644 index 0000000..6a45678 --- /dev/null +++ b/dev-python/wxpython/files/wxpython-2.8.9-wxversion-scripts.patch @@ -0,0 +1,191 @@ +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop +--- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyAlaMode.desktop 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/distrib/PyAlaMode.desktop 2009-02-21 15:04:55.000000000 -0600 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyAlaMode ++Name=PyAlaMode (2.8) + Comment=GUI Python Shell with Filling and editor windows +-Exec=pyalamode +-Icon=PyCrust.png ++Exec=pyalamode-2.8 ++Icon=/usr/share/pixmaps/PyCrust.png + Terminal=false + Type=Application + Categories=Application;Development; +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop +--- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyCrust.desktop 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/distrib/PyCrust.desktop 2009-02-21 15:06:42.000000000 -0600 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyCrust ++Name=PyCrust (2.8) + Comment=GUI Python Shell with Filling +-Exec=pycrust +-Icon=PyCrust.png ++Exec=pycrust-2.8 ++Icon=/usr/share/pixmaps/PyCrust.png + Terminal=false + Type=Application + Categories=Application;Development; +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop +--- wxPython-src-2.8.9.2-orig/wxPython/distrib/PyShell.desktop 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/distrib/PyShell.desktop 2009-02-21 15:08:19.000000000 -0600 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=PyShell ++Name=PyShell (2.8) + Comment=GUI Python Shell +-Exec=pyshell +-Icon=PyCrust.png ++Exec=pyshell-2.8 ++Icon=/usr/share/pixmaps/PyCrust.png + Terminal=false + Type=Application + Categories=Application;Development; +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop +--- wxPython-src-2.8.9.2-orig/wxPython/distrib/XRCed.desktop 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/distrib/XRCed.desktop 2009-02-21 15:09:22.000000000 -0600 +@@ -1,8 +1,8 @@ + [Desktop Entry] +-Name=XRCed ++Name=XRCed (2.8) + Comment=wxPython XRC resource editor +-Exec=xrced +-Icon=XRCed.png ++Exec=xrced-2.8 ++Icon=/usr/share/pixmaps/XRCed.png + Terminal=false + Type=Application + Categories=Application;Development; +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/editra wxPython-src-2.8.9.2/wxPython/scripts/editra +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/editra 2008-02-29 14:32:17.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/editra 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.Editra.launcher import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/genaxmodule 2008-02-29 14:32:17.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/genaxmodule 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.genaxmodule import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer wxPython-src-2.8.9.2/wxPython/scripts/helpviewer +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/helpviewer 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/helpviewer 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.helpviewer import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png wxPython-src-2.8.9.2/wxPython/scripts/img2png +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2png 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/img2png 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.img2png import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py wxPython-src-2.8.9.2/wxPython/scripts/img2py +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2py 2008-02-29 14:32:17.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/img2py 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.img2py import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm wxPython-src-2.8.9.2/wxPython/scripts/img2xpm +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/img2xpm 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/img2xpm 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.img2xpm import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalacarte 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pyalacarte 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyAlaCarte import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode wxPython-src-2.8.9.2/wxPython/scripts/pyalamode +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyalamode 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pyalamode 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyAlaMode import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust wxPython-src-2.8.9.2/wxPython/scripts/pycrust +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pycrust 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pycrust 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyCrust import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell wxPython-src-2.8.9.2/wxPython/scripts/pyshell +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pyshell 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pyshell 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyShell import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap wxPython-src-2.8.9.2/wxPython/scripts/pywrap +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywrap 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pywrap 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.py.PyWrap import main + main() +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc wxPython-src-2.8.9.2/wxPython/scripts/pywxrc +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/pywxrc 2008-02-29 14:32:17.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/pywxrc 2009-02-21 15:09:58.000000000 -0600 +@@ -1,5 +1,7 @@ + #!/usr/bin/env python + ++import wxversion ++wxversion.select("2.8") + from wx.tools.pywxrc import main + main() + +diff -Naurp wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced wxPython-src-2.8.9.2/wxPython/scripts/xrced +--- wxPython-src-2.8.9.2-orig/wxPython/scripts/xrced 2007-07-18 16:33:55.000000000 -0600 ++++ wxPython-src-2.8.9.2/wxPython/scripts/xrced 2009-02-21 15:03:24.000000000 -0600 +@@ -1,4 +1,6 @@ + #!/usr/bin/env python ++import wxversion ++wxversion.select("2.8") + + from wx.tools.XRCed.xrced import main + main() diff --git a/dev-python/wxpython/wxpython-2.8.10.1.ebuild b/dev-python/wxpython/wxpython-2.8.10.1.ebuild new file mode 100644 index 0000000..b6d7e75 --- /dev/null +++ b/dev-python/wxpython/wxpython-2.8.10.1.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.10.1.ebuild,v 1.17 2010/12/12 07:30:02 dirtyepic Exp $ + +EAPI="2" +PYTHON_DEPEND="2" +WX_GTK_VER="2.8" +SUPPORT_PYTHON_ABIS="1" + +inherit alternatives eutils fdo-mime flag-o-matic multilib python wxwidgets + +MY_P="${P/wxpython-/wxPython-src-}" + +DESCRIPTION="A blending of the wxWindows C++ class library with Python" +HOMEPAGE="http://www.wxpython.org/" +SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 + mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) + examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" + +LICENSE="wxWinLL-3" +SLOT="2.8" +KEYWORDS="~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="aqua cairo doc examples opengl" + +RDEPEND=" + dev-python/setuptools + aqua? ( >=x11-libs/wxGTK-${PV}:2.8[opengl?,aqua=] ) + !aqua? ( >=x11-libs/wxGTK-${PV}:2.8[X,opengl?] ) + >=x11-libs/gtk+-2.4[aqua=] + >=x11-libs/pango-1.2 + >=dev-libs/glib-2.0 + media-libs/libpng + virtual/jpeg + media-libs/tiff + cairo? ( >=dev-python/pycairo-1.8.4 ) + opengl? ( >=dev-python/pyopengl-2.0.0.44 ) + aqua? ( >=dev-lang/python-2.6[aqua?] )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +RESTRICT_PYTHON_ABIS="3.*" + +S="${WORKDIR}/${MY_P}/wxPython" +DOC_S="${WORKDIR}/wxPython-${PV}" + +src_prepare() { + sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" + + epatch "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch + # drop editra - we have it as a separate package now + epatch "${FILESDIR}"/${PN}-${SLOT}-drop-editra.patch + + if use doc; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch + fi + + if use examples; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch + fi + + python_copy_sources +} + +src_configure() { + need-wxwidgets unicode + + append-flags -fno-strict-aliasing + + use opengl \ + && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + + mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" + mypyconf="${mypyconf} UNICODE=1" + + use aqua \ + && mypyconf="${mypyconf} WXPORT=mac" \ + || mypyconf="${mypyconf} WXPORT=gtk2" +} + +src_compile() { + building() { + "$(PYTHON)" setup.py ${mypyconf} build + } + python_execute_function -s building +} + +src_install() { + local mypyconf + + mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" + use opengl \ + && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + + mypyconf="${mypyconf} UNICODE=1" + + use aqua \ + && mypyconf="${mypyconf} WXPORT=mac" \ + || mypyconf="${mypyconf} WXPORT=gtk2" + + installation() { + "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib "${EPREFIX}"$(python_get_sitedir) + } + python_execute_function -s installation + + # Collision protection. + for file in "${ED}"/usr/bin/*; do + mv "${file}" "${file}-${SLOT}" + done + rename_files() { + for file in "${ED}$(python_get_sitedir)/"wx{version.*,.pth}; do + mv "${file}" "${file}-${SLOT}" || return 1 + done + } + python_execute_function -q rename_files + + dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt + + insinto /usr/share/applications + doins "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop + insinto /usr/share/pixmaps + newins "${S}"/wx/py/PyCrust_32.png PyCrust.png + newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png + + if use doc; then + dodir /usr/share/doc/${PF}/docs + cp -R "${DOC_S}"/docs/* "${ED}"usr/share/doc/${PF}/docs/ + # For some reason 2.8.10.1 api docs are not available, so use 2.8.9.2's + cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${ED}"usr/share/doc/${PF}/docs/ + fi + + if use examples; then + dodir /usr/share/doc/${PF}/demo + dodir /usr/share/doc/${PF}/samples + cp -R "${DOC_S}"/demo/* "${ED}"/usr/share/doc/${PF}/demo/ + cp -R "${DOC_S}"/samples/* "${ED}"/usr/share/doc/${PF}/samples/ + fi +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_execute_function -q create_symlinks + + python_mod_optimize wx-${SLOT}-gtk2-unicode wxversion.py + + echo + elog "Gentoo uses the Multi-version method for SLOT'ing." + elog "Developers, see this site for instructions on using" + elog "2.6 or 2.8 with your apps:" + elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" + elog + if use doc; then + elog "To access the general wxWidgets documentation, run" + elog "/usr/share/doc/${PF}/docs/viewdocs.py" + elog + elog "wxPython documentation is available by pointing a browser" + elog "at /usr/share/doc/${PF}/docs/api/index.html" + elog + fi + if use examples; then + elog "The demo.py app which contains hundreds of demo modules" + elog "with documentation and source code has been installed at" + elog "/usr/share/doc/${PF}/demo/demo.py" + elog + elog "Many more example apps and modules can be found in" + elog "/usr/share/doc/${PF}/samples/" + fi + echo + ewarn "Editra is no longer packaged with wxpython in Gentoo." + ewarn "You can find it in the tree as app-editors/editra" + echo +} + +pkg_postrm() { + python_mod_cleanup wx-${SLOT}-gtk2-unicode wxversion.py + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_execute_function -q create_symlinks +} diff --git a/dev-python/wxpython/wxpython-2.8.11.0.ebuild b/dev-python/wxpython/wxpython-2.8.11.0.ebuild new file mode 100644 index 0000000..61d62dc --- /dev/null +++ b/dev-python/wxpython/wxpython-2.8.11.0.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.3 2010/12/12 07:30:02 dirtyepic Exp $ + +EAPI="2" +PYTHON_DEPEND="2" +WX_GTK_VER="2.8" +SUPPORT_PYTHON_ABIS="1" + +inherit alternatives eutils fdo-mime flag-o-matic multilib python wxwidgets + +MY_P="${P/wxpython-/wxPython-src-}" + +DESCRIPTION="A blending of the wxWindows C++ class library with Python" +HOMEPAGE="http://www.wxpython.org/" +SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 + mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) + examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" + +LICENSE="wxWinLL-3" +SLOT="2.8" +KEYWORDS="~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="aqua cairo doc examples opengl" + +RDEPEND=" + dev-python/setuptools + aqua? ( >=x11-libs/wxGTK-${PV}:2.8[opengl?,tiff,aqua=] ) + !aqua? ( >=x11-libs/wxGTK-${PV}:2.8[opengl?,tiff,X] ) + >=x11-libs/gtk+-2.4[aqua=] + >=x11-libs/pango-1.2 + >=dev-libs/glib-2.0 + media-libs/libpng + virtual/jpeg + media-libs/tiff + cairo? ( >=dev-python/pycairo-1.8.4 ) + opengl? ( >=dev-python/pyopengl-2.0.0.44 ) + aqua? ( >=dev-lang/python-2.6[aqua?] )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +RESTRICT_PYTHON_ABIS="3.*" + +S="${WORKDIR}/${MY_P}/wxPython" +DOC_S="${WORKDIR}/wxPython-${PV}" + +src_prepare() { + sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" + + epatch "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch + # drop editra - we have it as a separate package now + epatch "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch + + if use doc; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch + fi + + if use examples; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch + fi + + python_copy_sources +} + +src_configure() { + need-wxwidgets unicode + + append-flags -fno-strict-aliasing + + use opengl \ + && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + + mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" + mypyconf="${mypyconf} UNICODE=1" + + use aqua \ + && mypyconf="${mypyconf} WXPORT=mac" \ + || mypyconf="${mypyconf} WXPORT=gtk2" +} + +src_compile() { + building() { + "$(PYTHON)" setup.py ${mypyconf} build + } + python_execute_function -s building +} + +src_install() { + local mypyconf + + mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" + use opengl \ + && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + + mypyconf="${mypyconf} UNICODE=1" + + use aqua \ + && mypyconf="${mypyconf} WXPORT=mac" \ + || mypyconf="${mypyconf} WXPORT=gtk2" + + installation() { + "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib "${EPREFIX}"$(python_get_sitedir) + } + python_execute_function -s installation + + # Collision protection. + for file in "${ED}"/usr/bin/*; do + mv "${file}" "${file}-${SLOT}" + done + rename_files() { + for file in "${ED}$(python_get_sitedir)/"wx{version.*,.pth}; do + mv "${file}" "${file}-${SLOT}" || return 1 + done + } + python_execute_function -q rename_files + + dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt + + insinto /usr/share/applications + doins "${S}"/distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop + insinto /usr/share/pixmaps + newins "${S}"/wx/py/PyCrust_32.png PyCrust.png + newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed.png + + if use doc; then + dodir /usr/share/doc/${PF}/docs + cp -R "${DOC_S}"/docs/* "${ED}"usr/share/doc/${PF}/docs/ + # For some reason newer API docs aren't available so use 2.8.9.2's + cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${ED}"usr/share/doc/${PF}/docs/ + fi + + if use examples; then + dodir /usr/share/doc/${PF}/demo + dodir /usr/share/doc/${PF}/samples + cp -R "${DOC_S}"/demo/* "${ED}"/usr/share/doc/${PF}/demo/ + cp -R "${DOC_S}"/samples/* "${ED}"/usr/share/doc/${PF}/samples/ + fi +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_execute_function -q create_symlinks + + python_mod_optimize wx-${SLOT}-gtk2-unicode wxversion.py + + echo + elog "Gentoo uses the Multi-version method for SLOT'ing." + elog "Developers, see this site for instructions on using" + elog "2.6 or 2.8 with your apps:" + elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" + elog + if use doc; then + elog "To access the general wxWidgets documentation, run" + elog "/usr/share/doc/${PF}/docs/viewdocs.py" + elog + elog "wxPython documentation is available by pointing a browser" + elog "at /usr/share/doc/${PF}/docs/api/index.html" + elog + fi + if use examples; then + elog "The demo.py app which contains hundreds of demo modules" + elog "with documentation and source code has been installed at" + elog "/usr/share/doc/${PF}/demo/demo.py" + elog + elog "Many more example apps and modules can be found in" + elog "/usr/share/doc/${PF}/samples/" + fi + echo + ewarn "Editra is no longer packaged with wxpython in Gentoo." + ewarn "You can find it in the tree as app-editors/editra" + echo +} + +pkg_postrm() { + python_mod_cleanup wx-${SLOT}-gtk2-unicode wxversion.py + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_execute_function -q create_symlinks +} diff --git a/dev-python/wxpython/wxpython-2.9.3.1.ebuild b/dev-python/wxpython/wxpython-2.8.12.1.ebuild index 95eef56..8526b3e 100644 --- a/dev-python/wxpython/wxpython-2.9.3.1.ebuild +++ b/dev-python/wxpython/wxpython-2.8.12.1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.3.1.ebuild,v 1.2 2012/02/22 14:51:31 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.12.1.ebuild,v 1.15 2012/05/29 14:46:19 aballier Exp $ EAPI="4" -PYTHON_DEPEND="2:2.6" -WX_GTK_VER="2.9" +PYTHON_DEPEND="2" +WX_GTK_VER="2.8" SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython 2.7-pypy-*" +RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" inherit alternatives distutils eutils fdo-mime wxwidgets @@ -15,27 +15,31 @@ MY_P="${P/wxpython-/wxPython-src-}" DESCRIPTION="A blending of the wxWindows C++ class library with Python" HOMEPAGE="http://www.wxpython.org/" SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2 + doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 + mirror://sourceforge/wxpython/wxPython-newdocs-2.8.9.2.tar.bz2 ) examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" LICENSE="wxWinLL-3" -SLOT="2.9" -KEYWORDS="~x86-linux" -IUSE="cairo examples opengl" +SLOT="2.8" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="aqua cairo doc examples opengl" RDEPEND=" - >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] + aqua? ( >=dev-lang/python-2.6[aqua] + >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,aqua] ) + !aqua? ( >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] ) dev-libs/glib:2 dev-python/setuptools media-libs/libpng:0 media-libs/tiff:0 virtual/jpeg - x11-libs/gtk+:2 + x11-libs/gtk+:2[aqua=] x11-libs/pango[X] cairo? ( >=dev-python/pycairo-1.8.4 ) opengl? ( dev-python/pyopengl )" DEPEND="${RDEPEND} - dev-util/pkgconfig" + virtual/pkgconfig" S="${WORKDIR}/${MY_P}/wxPython" DOC_S="${WORKDIR}/wxPython-${PV}" @@ -43,14 +47,20 @@ DOC_S="${WORKDIR}/wxPython-${PV}" PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing") -PYTHON_MODNAME="wx-${PV%.*}-gtk2 wxversion.py" +PYTHON_MODNAME="wx-${SLOT}-gtk2-unicode wxversion.py" src_prepare() { sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" - epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-scripts.patch + epatch "${FILESDIR}"/${PN}-2.8.9-wxversion-scripts.patch # drop editra - we have it as a separate package now - epatch "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch + epatch "${FILESDIR}"/${PN}-2.8.12-drop-editra.patch + + if use doc; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-cache-writable.patch + [[ -e samples/embedded/embedded ]] && rm -f samples/embedded/embedded + fi if use examples; then cd "${DOC_S}" @@ -65,7 +75,7 @@ src_configure() { DISTUTILS_GLOBAL_OPTIONS=( "* WX_CONFIG=${WX_CONFIG}" - "* WXPORT=gtk2" + "* WXPORT=$(use aqua && echo mac || echo gtk2)" "* UNICODE=1" "* BUILD_GLCANVAS=$(use opengl && echo 1 || echo 0)" ) @@ -80,14 +90,10 @@ distutils_src_install_post_hook() { } src_install() { - local file x + local docdir file distutils_src_install - # this should be temporary - dobin "${S}"/scripts/pyslices || die - dobin "${S}"/scripts/pysliceshell || die - # Collision protection. rename_files() { for file in "${ED}$(python_get_sitedir)/"wx{version.*,.pth}; do @@ -99,19 +105,20 @@ src_install() { dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt insinto /usr/share/applications - for x in {Py{AlaMode,Crust,Shell,Slices{,Shell}},XRCed}; do - newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop - done + doins distrib/{Py{AlaMode,Crust,Shell},XRCed}.desktop insinto /usr/share/pixmaps - newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png - newins "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png - newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png + newins wx/py/PyCrust_32.png PyCrust.png + newins wx/tools/XRCed/XRCed_32.png XRCed.png + + if use doc; then + dodoc -r "${DOC_S}"/docs + # For some reason newer API docs aren't available so use 2.8.9.2's + dodoc -r "${WORKDIR}"/wxPython-2.8.9.2/docs + fi if use examples; then - dodir /usr/share/doc/${PF}/demo - dodir /usr/share/doc/${PF}/samples - cp -R "${DOC_S}"/demo/* "${ED}"/usr/share/doc/${PF}/demo/ || die - cp -R "${DOC_S}"/samples/* "${ED}"/usr/share/doc/${PF}/samples/ || die + dodoc -r "${DOC_S}"/demo + dodoc -r "${DOC_S}"/samples fi } @@ -129,17 +136,28 @@ pkg_postinst() { echo elog "Gentoo uses the Multi-version method for SLOT'ing." elog "Developers, see this site for instructions on using" - elog "2.8 or 2.9 with your apps:" + elog "2.6 or 2.8 with your apps:" elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" - elog + echo + if use doc; then + elog "To access the general wxWidgets documentation, run" + elog "/usr/share/doc/${PF}/docs/viewdocs.py" + elog + elog "wxPython documentation is available by pointing a browser" + elog "at /usr/share/doc/${PF}/docs/api/index.html" + fi if use examples; then - elog "The demo.py app which contains demo modules with" - elog "documentation and source code has been installed at" + elog + elog "The demo.py app which contains hundreds of demo modules" + elog "with documentation and source code has been installed at" elog "/usr/share/doc/${PF}/demo/demo.py" elog - elog "More example apps and modules can be found in" + elog "Many more example apps and modules can be found in" elog "/usr/share/doc/${PF}/samples/" + echo fi + elog "Editra is not packaged with wxpython in Gentoo." + elog "You can find it in the tree as app-editors/editra" echo } diff --git a/dev-python/wxpython/wxpython-2.9.1.1.ebuild b/dev-python/wxpython/wxpython-2.9.1.1.ebuild new file mode 100644 index 0000000..77d584d --- /dev/null +++ b/dev-python/wxpython/wxpython-2.9.1.1.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.9.1.1.ebuild,v 1.1 2011/01/23 01:12:36 dirtyepic Exp $ + +EAPI="3" +PYTHON_DEPEND="2" +WX_GTK_VER="2.9" +SUPPORT_PYTHON_ABIS="1" + +inherit alternatives eutils fdo-mime flag-o-matic multilib python wxwidgets + +MY_P="${P/wxpython-/wxPython-src-}" + +DESCRIPTION="A blending of the wxWindows C++ class library with Python" +HOMEPAGE="http://www.wxpython.org/" +SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.bz2 + examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )" + +LICENSE="wxWinLL-3" +SLOT="2.9" +KEYWORDS="~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +IUSE="aqua cairo examples opengl" + +RDEPEND=" + dev-python/setuptools + aqua? ( >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,aqua=] ) + !aqua? ( >=x11-libs/wxGTK-${PV}:${WX_GTK_VER}[opengl?,tiff,X] ) + >=x11-libs/gtk+-2.4[aqua=] + >=x11-libs/pango-1.2 + >=dev-libs/glib-2.0 + media-libs/libpng + virtual/jpeg + media-libs/tiff + cairo? ( >=dev-python/pycairo-1.8.4 ) + opengl? ( >=dev-python/pyopengl-2.0.0.44 ) + aqua? ( >=dev-lang/python-2.6[aqua?] )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +RESTRICT_PYTHON_ABIS="3.*" + +S="${WORKDIR}/${MY_P}/wxPython" +DOC_S="${WORKDIR}/wxPython-${PV}" + +src_prepare() { + sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed" + + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-scripts.patch + # drop editra - we have it as a separate package now + epatch "${FILESDIR}"/${PN}-2.8.11-drop-editra.patch + + if use examples; then + cd "${DOC_S}" + epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch + fi + + python_copy_sources +} + +src_configure() { + need-wxwidgets unicode + + append-flags -fno-strict-aliasing + + use opengl \ + && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + + mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" + mypyconf="${mypyconf} UNICODE=1" + + use aqua \ + && mypyconf="${mypyconf} WXPORT=mac" \ + || mypyconf="${mypyconf} WXPORT=gtk2" +} + +src_compile() { + building() { + "$(PYTHON)" setup.py ${mypyconf} build + } + python_execute_function -s building +} + +src_install() { + local mypyconf + + mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" + use opengl \ + && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + + mypyconf="${mypyconf} UNICODE=1" + + use aqua \ + && mypyconf="${mypyconf} WXPORT=mac" \ + || mypyconf="${mypyconf} WXPORT=gtk2" + + installation() { + "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib "${EPREFIX}"$(python_get_sitedir) + } + python_execute_function -s installation + + # this should be temporary + dobin "${S}"/scripts/pyslices || die + dobin "${S}"/scripts/pysliceshell || die + + # Collision protection. + for file in "${ED}"/usr/bin/*; do + mv "${file}" "${file}-${SLOT}" || die + done + rename_files() { + for file in "${ED}$(python_get_sitedir)/"wx{version.*,.pth}; do + mv "${file}" "${file}-${SLOT}" || return 1 + done + } + python_execute_function -q rename_files + + dodoc "${S}"/docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt + + insinto /usr/share/applications + for x in {Py{AlaMode,Crust,Shell,Slices{,Shell}},XRCed}; do + newins "${S}"/distrib/${x}.desktop ${x}-${SLOT}.desktop || die + done + insinto /usr/share/pixmaps + newins "${S}"/wx/py/PyCrust_32.png PyCrust-${SLOT}.png || die + newins "${S}"/wx/py/PySlices_32.png PySlices-${SLOT}.png || die + newins "${S}"/wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png || die + + if use examples; then + dodir /usr/share/doc/${PF}/demo || die + dodir /usr/share/doc/${PF}/samples || die + cp -R "${DOC_S}"/demo/* "${ED}"/usr/share/doc/${PF}/demo/ || die + cp -R "${DOC_S}"/samples/* "${ED}"/usr/share/doc/${PF}/samples/ || die + fi +} + +pkg_postinst() { + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_execute_function -q create_symlinks + + python_mod_optimize wx-2.9.1-gtk2 wxversion.py + + echo + elog "Gentoo uses the Multi-version method for SLOT'ing." + elog "Developers, see this site for instructions on using" + elog "2.6 or 2.8 with your apps:" + elog "http://wiki.wxpython.org/index.cgi/MultiVersionInstalls" + elog + if use examples; then + elog "The demo.py app which contains hundreds of demo modules" + elog "with documentation and source code has been installed at" + elog "/usr/share/doc/${PF}/demo/demo.py" + elog + elog "Many more example apps and modules can be found in" + elog "/usr/share/doc/${PF}/samples/" + fi + echo + elog "Editra is no longer packaged with wxpython in Gentoo." + elog "You can find it in the tree as app-editors/editra" + echo +} + +pkg_postrm() { + python_mod_cleanup wx-2.9.1-gtk2 wxversion.py + fdo-mime_desktop_database_update + + create_symlinks() { + alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]" + alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]" + } + python_execute_function -q create_symlinks +} diff --git a/dev-python/wxpython/wxpython.patch b/dev-python/wxpython/wxpython.patch new file mode 100644 index 0000000..bb73259 --- /dev/null +++ b/dev-python/wxpython/wxpython.patch @@ -0,0 +1,120 @@ +--- wxpython-2.8.11.0.ebuild.old 2012-05-07 02:31:12.000000000 +0900 ++++ wxpython-2.8.11.0.ebuild 2012-06-08 21:10:18.396556742 +0900 +@@ -1,6 +1,6 @@ +-# Copyright 1999-2012 Gentoo Foundation ++# Copyright 1999-2010 Gentoo Foundation + # Distributed under the terms of the GNU General Public License v2 +-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.16 2012/05/06 17:14:35 jlec Exp $ ++# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.8.11.0.ebuild,v 1.3 2010/12/12 07:30:02 dirtyepic Exp $ + + EAPI="2" + PYTHON_DEPEND="2" +@@ -20,25 +20,27 @@ SRC_URI="mirror://sourceforge/wxpython/$ + + LICENSE="wxWinLL-3" + SLOT="2.8" +-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" +-IUSE="cairo doc examples opengl" ++KEYWORDS="~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" ++IUSE="aqua cairo doc examples opengl" + + RDEPEND=" + dev-python/setuptools +- >=x11-libs/wxGTK-${PV}:2.8[opengl?,tiff,X] +- >=x11-libs/gtk+-2.4:2 ++ aqua? ( >=x11-libs/wxGTK-${PV}:2.8[opengl?,tiff,aqua=] ) ++ !aqua? ( >=x11-libs/wxGTK-${PV}:2.8[opengl?,tiff,X] ) ++ >=x11-libs/gtk+-2.4[aqua=] + >=x11-libs/pango-1.2 +- dev-libs/glib:2 ++ >=dev-libs/glib-2.0 + media-libs/libpng + virtual/jpeg + media-libs/tiff + cairo? ( >=dev-python/pycairo-1.8.4 ) +- opengl? ( >=dev-python/pyopengl-2.0.0.44 )" ++ opengl? ( >=dev-python/pyopengl-2.0.0.44 ) ++ aqua? ( >=dev-lang/python-2.6[aqua?] )" + + DEPEND="${RDEPEND} +- virtual/pkgconfig" ++ dev-util/pkgconfig" + +-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*" ++RESTRICT_PYTHON_ABIS="3.*" + + S="${WORKDIR}/${MY_P}/wxPython" + DOC_S="${WORKDIR}/wxPython-${PV}" +@@ -61,9 +63,6 @@ src_prepare() { + fi + + python_copy_sources +- +- # Workaround, buildsystem uses CFLAGS as CXXFLAGS +- export CFLAGS="${CXXFLAGS}" + } + + src_configure() { +@@ -76,7 +75,11 @@ src_configure() { + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + + mypyconf="${mypyconf} WX_CONFIG=${WX_CONFIG}" +- mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" ++ mypyconf="${mypyconf} UNICODE=1" ++ ++ use aqua \ ++ && mypyconf="${mypyconf} WXPORT=mac" \ ++ || mypyconf="${mypyconf} WXPORT=gtk2" + } + + src_compile() { +@@ -94,19 +97,23 @@ src_install() { + && mypyconf="${mypyconf} BUILD_GLCANVAS=1" \ + || mypyconf="${mypyconf} BUILD_GLCANVAS=0" + +- mypyconf="${mypyconf} WXPORT=gtk2 UNICODE=1" ++ mypyconf="${mypyconf} UNICODE=1" ++ ++ use aqua \ ++ && mypyconf="${mypyconf} WXPORT=mac" \ ++ || mypyconf="${mypyconf} WXPORT=gtk2" + + installation() { +- "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib $(python_get_sitedir) ++ "$(PYTHON)" setup.py ${mypyconf} install --root="${D}" --install-purelib "${EPREFIX}"$(python_get_sitedir) + } + python_execute_function -s installation + + # Collision protection. +- for file in "${D}"/usr/bin/*; do ++ for file in "${ED}"/usr/bin/*; do + mv "${file}" "${file}-${SLOT}" + done + rename_files() { +- for file in "${D}$(python_get_sitedir)/"wx{version.*,.pth}; do ++ for file in "${ED}$(python_get_sitedir)/"wx{version.*,.pth}; do + mv "${file}" "${file}-${SLOT}" || return 1 + done + } +@@ -122,17 +129,16 @@ src_install() { + + if use doc; then + dodir /usr/share/doc/${PF}/docs +- cp -R "${DOC_S}"/docs/* "${D}"usr/share/doc/${PF}/docs/ ++ cp -R "${DOC_S}"/docs/* "${ED}"usr/share/doc/${PF}/docs/ + # For some reason newer API docs aren't available so use 2.8.9.2's +- cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${D}"usr/share/doc/${PF}/docs/ ++ cp -R "${WORKDIR}"/wxPython-2.8.9.2/docs/* "${ED}"usr/share/doc/${PF}/docs/ + fi + + if use examples; then + dodir /usr/share/doc/${PF}/demo + dodir /usr/share/doc/${PF}/samples +- cp -R "${DOC_S}"/demo/* "${D}"/usr/share/doc/${PF}/demo/ +- cp -R "${DOC_S}"/samples/* "${D}"/usr/share/doc/${PF}/samples/ +- rm -f "${D}"usr/share/doc/${PF}/samples/embedded/embedded ++ cp -R "${DOC_S}"/demo/* "${ED}"/usr/share/doc/${PF}/demo/ ++ cp -R "${DOC_S}"/samples/* "${ED}"/usr/share/doc/${PF}/samples/ + fi + } + |