Fix implicit declaration of PyArg_NoArgs when building against PyPy.

Patch ported from sed statement in Progress overlay by Ian Delaney.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 115 insertions, 2 deletions

diff --git a/dev-python/reportlab/ChangeLog b/dev-python/reportlab/ChangeLog
index ad75f18be498..29af0dab90e1 100644
--- a/dev-python/reportlab/ChangeLog
+++ b/dev-python/reportlab/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/reportlab
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.79 2012/02/22 07:18:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.80 2012/05/06 17:39:31 floppym Exp $
+
+*reportlab-2.5-r1 (06 May 2012)
+
+  06 May 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/reportlab-2.5-pypy-implicit-PyArg_NoArgs.patch,
+  +reportlab-2.5-r1.ebuild:
+  Fix implicit declaration of PyArg_NoArgs when building against PyPy. Patch
+  ported from sed statement in Progress overlay by Ian Delaney.
 
   22 Feb 2012; Patrick Lauer <patrick@gentoo.org> reportlab-2.5.ebuild:
   Restricting jython
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index e26d5bdce376..029e28bb7900 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX reportlab-2.2_qa_msg.patch 736 RMD160 3ee7043a9c5f999b097e4800c5fcda57d732e4b4 SHA1 4f8b90dee2c9e5cf71c05af91484c0440009581d SHA256 e4913decadf05228b1cb76da8cade26b76feb4d69c317c828ee0ba1eb8d66a58
 AUX reportlab-2.4-external_libart_lgpl.patch 3304 RMD160 4881b7e8914630c87c642fa704ebbfd869550af7 SHA1 daad396df4711d75b0aeae4ae13288de95f19519 SHA256 93a5afda9e4bee650545912362dd3a23c12a5aebcec3ef2691ab675fe114af01
+AUX reportlab-2.5-pypy-implicit-PyArg_NoArgs.patch 426 RMD160 c12531051e159baf07f018fed1c3dbc86b56df67 SHA1 380adff29220671b4d8916b077ba97aa6e931f2b SHA256 16c908050155e671df113c65e99bc2bb48018302c6ba06c4186b57c0596a09d5
 DIST reportlab-2.5.tar.gz 1917306 RMD160 adc6db9f724c18988acbc85595acc95b8511f40b SHA1 49bd7c2c0b42569323fe4726cac696d4249cd1a5 SHA256 805152084cc8421104a5e1e705482a1034598ecb4c266670dfba31996de6ff69
+EBUILD reportlab-2.5-r1.ebuild 2225 RMD160 e175a674d0846b114ed62b48a2ac55fbd2f6bd1e SHA1 6c206f50e01cd3d19397f78bc6d6f93d998e5775 SHA256 dfe56a6335dbf56acac638d18e9d11204992946153e5d681ede28c3b35b6952f
 EBUILD reportlab-2.5.ebuild 2148 RMD160 0dca06b7361ec0fe43f39c87dd4bda1d7c562ea2 SHA1 cb2f0de4d471aca713ea2b2dfc439ef7b05949fa SHA256 240ec8c610de5841584439c768e0a1fea07697064ac5739748bb75f0627fd08b
-MISC ChangeLog 10634 RMD160 a847062ee90d3e67409270298d1ce08f52cb79d2 SHA1 7787fdb848e563f2f13030644aff4397d87a0fdb SHA256 6b3ff4a80749622f656d0c1803def687c3d9476c0ce3042969cf03cb72c60d2e
+MISC ChangeLog 10943 RMD160 0b6bfc884556ef11699b1a99895d65a26ec35a0f SHA1 15e4e03091bc2babe27174c8f28bd37047188181 SHA256 f01a522571c426173a33d400a179432222012904dc5b438fab45e65434044872
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk+mt14ACgkQC77qH+pIQ6RJTgD/Wo5MCeze6q2wsdvBv3S8JPdh
+17vtLPVBWvarAm1JOhAA/iQEO3aI3HTk/4yA0GmaSdwIt7kwDFjkY+QtNNAdBDbk
+=PP0r
+-----END PGP SIGNATURE-----
diff --git a/dev-python/reportlab/files/reportlab-2.5-pypy-implicit-PyArg_NoArgs.patch b/dev-python/reportlab/files/reportlab-2.5-pypy-implicit-PyArg_NoArgs.patch
new file mode 100644
index 000000000000..1c8c98d696de
--- /dev/null
+++ b/dev-python/reportlab/files/reportlab-2.5-pypy-implicit-PyArg_NoArgs.patch
@@ -0,0 +1,13 @@
+PyPy does not provide the PyArg_NoArgs function, substitute it with a macro.
+--- a/src/rl_addons/rl_accel/sgmlop.c
++++ b/src/rl_addons/rl_accel/sgmlop.c
+@@ -52,6 +52,9 @@
+  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  */
+ 
+ #include "Python.h"
++#ifndef PyArg_NoArgs
++#define PyArg_NoArgs(v) PyArg_Parse(v, "")
++#endif
+ #if PY_VERSION_HEX < 0x02050000
+ #	define Py_ssize_t int
+ #	define lenfunc inquiry
diff --git a/dev-python/reportlab/reportlab-2.5-r1.ebuild b/dev-python/reportlab/reportlab-2.5-r1.ebuild
new file mode 100644
index 000000000000..81e8f3bd28a9
--- /dev/null
+++ b/dev-python/reportlab/reportlab-2.5-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.5-r1.ebuild,v 1.1 2012/05/06 17:39:31 floppym Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils versionator
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source."
+HOMEPAGE="http://www.reportlab.org/ http://pypi.python.org/pypi/reportlab"
+SRC_URI="http://www.reportlab.org/ftp/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples test"
+
+DEPEND="dev-python/imaging
+	media-fonts/ttf-bitstream-vera
+	media-libs/libart_lgpl
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+
+src_prepare() {
+	distutils_src_prepare
+
+	sed -i \
+		-e 's|/usr/lib/X11/fonts/TrueType/|/usr/share/fonts/ttf-bitstream-vera/|' \
+		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
+		-e 's|%(HOME)s/fonts|%(HOME)s/.fonts|g' \
+		src/reportlab/rl_config.py || die "sed failed"
+
+	epatch "${FILESDIR}/${PN}-2.2_qa_msg.patch"
+
+	rm -fr src/rl_addons/renderPM/libart_lgpl
+	epatch "${FILESDIR}/${PN}-2.4-external_libart_lgpl.patch"
+
+	epatch "${FILESDIR}/${PN}-2.5-pypy-implicit-PyArg_NoArgs.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+
+	# One of tests already builds documentation.
+	if use doc && ! use test; then
+		cd docs
+		PYTHONPATH="$(ls -d ../build-$(PYTHON -f --ABI)/lib.*)" "$(PYTHON -f)" genAll.py || die "genAll.py failed"
+	fi
+}
+
+src_test() {
+	testing() {
+		"$(PYTHON)" setup.py tests-preinstall
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		# docs/reference/reportlab-reference.pdf is identical with docs/reportlab-reference.pdf
+		rm -f docs/reference/reportlab-reference.pdf
+
+		insinto /usr/share/doc/${PF}
+		doins -r docs/* || die "Installation of documentation failed"
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r demos || die "Installation of examples failed"
+		insinto /usr/share/doc/${PF}/tools/pythonpoint
+		doins -r tools/pythonpoint/demos || die "Installation of examples failed"
+	fi
+}