Version bump. Convert to distutils-r1. Resolve bug 318233.

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 61 insertions, 41 deletions

diff --git a/dev-python/reportlab/ChangeLog b/dev-python/reportlab/ChangeLog
index 0cb45009e07e..3ed25e2b7046 100644
--- a/dev-python/reportlab/ChangeLog
+++ b/dev-python/reportlab/ChangeLog
@@ -1,6 +1,12 @@
 # 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.83 2012/12/06 17:37:57 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.84 2013/01/22 20:28:47 floppym Exp $
+
+*reportlab-2.6 (22 Jan 2013)
+
+  22 Jan 2013; Mike Gilbert <floppym@gentoo.org> +reportlab-2.6.ebuild,
+  -reportlab-2.5.ebuild, reportlab-2.5-r1.ebuild:
+  Version bump. Convert to distutils-r1. Resolve bug 318233.
 
   06 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> reportlab-2.5-r1.ebuild:
   Keyword amd64-linux and x86-linux
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 4c182b635f72..6087f46efd23 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 AUX reportlab-2.2_qa_msg.patch 736 SHA256 e4913decadf05228b1cb76da8cade26b76feb4d69c317c828ee0ba1eb8d66a58 SHA512 91a4800cd760aef02cac6d9a50b3fef7884a0bb079463ad0a8588f639dd9b9bd805f6d1b295f0d4b72dfa9bb015c82a12779c4789e33c6b631713c9e13656aff WHIRLPOOL f8228cf341949695b064414d2fa7995edf4f2df1cc1dd164503c2224d6cd9b75a79eb47cfc82614a296bb73986656308a6f974bb4e3bb64521e159cc0f4ca07c
 AUX reportlab-2.4-external_libart_lgpl.patch 3304 SHA256 93a5afda9e4bee650545912362dd3a23c12a5aebcec3ef2691ab675fe114af01 SHA512 6b13e41b9b070e726c3eb440f2162bf61db91110f198fe97e7ca6adab238718f2d055048980d60402139b62ed10e95a63ee931a270927cae1240be882e418789 WHIRLPOOL a1ff03a8a0e14b1257c96436d197914722990a667302040c53c0d83a2c9f2883837c0618dc52608972d1893ade11bac97a7483e89c2d0546195bfa8e93d60be8
 AUX reportlab-2.5-pypy-implicit-PyArg_NoArgs.patch 395 SHA256 45f7e7414e38bc4c7c9de9d0c72e8e8883934a50ce81b0a28403a41f560ce40e SHA512 93ed5a71f7be21ca21a7da7b8eec45a52d4ef0b67138556f56b55c890893d33db9cc8b1476b892cd1128edf591aa97cc9c8f6e46bb6c7a4ff5167eb1bbdfc5f8 WHIRLPOOL 237e73684234ffbeb256c33f2bcfcd0ebcc21515b72904f7039b37716dc3ea11261688f2119b80a387ccbb6fa76ce374f148dd643ad6db9f4656d690969d177c
+DIST pfbfer-20070710.zip 677333 SHA256 fb1462ff6ce8efae58a0c496f0537c5ac16d4895c68f1640c2973db574ddb376 SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2 WHIRLPOOL 5aad616d063cab1862d77fbbf9f625f20c4bcbf09e45688719e312c1e8d3815f1b295d290b78f6c4789919cef39856ec223c30a2e424eeb1c8137cccc5ceb90f
 DIST reportlab-2.5.tar.gz 1917306 SHA256 805152084cc8421104a5e1e705482a1034598ecb4c266670dfba31996de6ff69 SHA512 9fd043aeb94e1531156b40766e262af2976ef1f55009eaf42ea713d8cde0452ed1c17bbb98d28babf24177552ef9a1d2e9d149ac1f4db904ab806c20114f8766 WHIRLPOOL e7edf7a58be0267319af5672fd8394b93142787c15d43d47d9ebf14d7fd3149edce38699dabde823cf3a5662a948ede008929c820fb1c3cdf0fc29479cebe720
-EBUILD reportlab-2.5-r1.ebuild 2250 SHA256 3ebf31fb4d2c4874765a24e11e22d2516452a4cdbb85bae902adbe95df8b9a4a SHA512 12ff6057420f412505e86b156c819c92e5694b520789584720b98d446d7411d5fc88ce25dd36a529b43200943bb2353433feee0bd0f281a10baff579bb799ab3 WHIRLPOOL 01e47df6c88b728da4bac424208915b90e7d22f2a4e7d1d8963bbfc02161baaa720db0b3eb04c176b7a2b4da7964f7cad0406d75a0eeb4daed091d4ecee57fba
-EBUILD reportlab-2.5.ebuild 2148 SHA256 240ec8c610de5841584439c768e0a1fea07697064ac5739748bb75f0627fd08b SHA512 68566d310e8970a18899a2854d9d0885d871f70cfeff42d4ed9806d22c57adfed6f05f2e8a264c4d86c1de344771cef0ddc6964f91f99632afeab6aab7795fe3 WHIRLPOOL 5489f4d035a36104567255368d26817c1ebbe4201922bd39318356bf6e3215befa0cb802b236a1550488635751d59d7d0f25a5e66880daaa5430b0222396efd9
-MISC ChangeLog 11195 SHA256 fdb8330b3023bd9b6ec6ddc88e82d7c8fd786235eb299838d56090ead7013a85 SHA512 952fdbfcd5066fce0d37b2692fcef6dc5e8b26180771e23a7567eb4e5ca946b56ad22a03405d6e59314de1f629ad4435ed0249dbb37d8af92d1a83a6a4d8961e WHIRLPOOL 22a019e0f69b6fac31478dc42d348afb9039c47015fb81f799a2e8768492c33926337cc85c6662a3c7e7a7e38180f6baea86f01c9a559e19d55975aea5bd737c
+DIST reportlab-2.6.tar.gz 1954170 SHA256 76c3cda08f6eac9b0adf0e3c86202fe5e9cb075c00503bef5760cd9e75ec34ff SHA512 d1173231ec6924c225808607edd287b11095cda1856554ff42efb5911285b766f43b79d8747ea2867221aa5c158455ee864dbe903ceffeae535938d2fef59131 WHIRLPOOL ff177ec570d581eee76f9a54ee95b16c928a1351e85f1906baa36aa270dda6ea41d4da6441274cf4eee00624b5ddb2eb855bf4792b1cba658cc4729399598358
+EBUILD reportlab-2.5-r1.ebuild 2407 SHA256 8149b38b2560a106bb64822ce16a191de8cde0f9e994e17c4ca394ec2a75651f SHA512 12fbc8402372b45f601cb524a7ca693c5c28e470c817b320dd270d919d3c6810f698c0525b35dfa63fc5c3a7d2a663a533c317b40520ea23b98e1fddd2333fa1 WHIRLPOOL c3b65e0229ef00669b5622000b30babf9fae3c24fd452edbc43fc252b9420220d0eddb317108fc625088c2235f77f8c32b954149060ffbe52ce4bb9533327650
+EBUILD reportlab-2.6.ebuild 2274 SHA256 5443212398c75fb7aeaaaad737ad646d5ca60082fcce088a6ee86c30409365f0 SHA512 c53d1e0739aa491faaf34ee4925100d7e4cf3ea38046ecdf3e2765e3c1bc7e026185b6dc837d00a05fb96e9395c71b2dafcb111e22b65b5c84a52ced90712675 WHIRLPOOL 32850fe01c4c1435b230b7c3efe5a2369dc520ea26144fe5080a4c1a3768a6238ba47f5bc19fb5f37dd17a8f2aa0ad2968fab85f5d94a7a100fdad70cd11cff2
+MISC ChangeLog 11408 SHA256 34d406ddd971ce76071f420337481faea9ec034b59812e9cd9a9b09aeee70552 SHA512 eb7900c69b02e1f72d780f304fbe496a1516c510f4f65834ae428109babedfa8ff00dfe77b497fb0dba1f0845824ad938d1faa654d836be20eaccfe5b9099ff1 WHIRLPOOL a8ac452c022d68c750d90543a72d87825df9fe9b675c387c8e8fe286438437942b60ef7b13f6406aa4dc370a2f4c08f2edf29b80a4f87cf422584822a00c2071
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDA1/cACgkQ1ycZbhPLE2CH3QCdHviwdSdO7XvFVP8IJB2fTJbJ
-aD4An32cJU4fx2jvBUuR9kYdYzIORRqO
-=tohY
+iF4EAREIAAYFAlD+9oEACgkQC77qH+pIQ6QSLQD7BuxzjnPaN8BOGWEVO3M+22en
+7/9wHDc54gAdS4Dsp7YA/RDmGrMudreL3lKcC7F5wCl/F9kFgNFMimQ1tLPCImbv
+=tGMn
 -----END PGP SIGNATURE-----
diff --git a/dev-python/reportlab/reportlab-2.5-r1.ebuild b/dev-python/reportlab/reportlab-2.5-r1.ebuild
index 6d35c30461ee..c19110306b75 100644
--- a/dev-python/reportlab/reportlab-2.5-r1.ebuild
+++ b/dev-python/reportlab/reportlab-2.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.2 2012/12/06 17:37:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.5-r1.ebuild,v 1.3 2013/01/22 20:28:47 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -10,8 +10,9 @@ 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"
+HOMEPAGE="http://www.reportlab.com/ http://pypi.python.org/pypi/reportlab"
+SRC_URI="http://www.reportlab.com/ftp/${P}.tar.gz
+	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
 
 LICENSE="BSD"
 SLOT="0"
@@ -26,6 +27,12 @@ RDEPEND="${DEPEND}"
 
 PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
 
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
 src_prepare() {
 	distutils_src_prepare
 
diff --git a/dev-python/reportlab/reportlab-2.5.ebuild b/dev-python/reportlab/reportlab-2.6.ebuild
index af3448d3d94c..5b5a6fb418fa 100644
--- a/dev-python/reportlab/reportlab-2.5.ebuild
+++ b/dev-python/reportlab/reportlab-2.6.ebuild
@@ -1,34 +1,39 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.5.ebuild,v 1.8 2012/02/22 07:18:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-2.6.ebuild,v 1.1 2013/01/22 20:28:47 floppym Exp $
 
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+# Tests crash with pypy
 
-inherit distutils eutils versionator
+inherit distutils-r1 eutils flag-o-matic
 
 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"
+HOMEPAGE="http://www.reportlab.com/ http://pypi.python.org/pypi/reportlab"
+SRC_URI="http://www.reportlab.com/ftp/${P}.tar.gz
+	http://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc examples test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux"
+IUSE="doc examples"
 
-DEPEND="dev-python/imaging
+RDEPEND="dev-python/imaging
 	media-fonts/ttf-bitstream-vera
 	media-libs/libart_lgpl
 	sys-libs/zlib"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
+DISTUTILS_NO_PARALLEL_BUILD=1
 
-src_prepare() {
-	distutils_src_prepare
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
 
+python_prepare_all() {
 	sed -i \
 		-e 's|/usr/lib/X11/fonts/TrueType/|/usr/share/fonts/ttf-bitstream-vera/|' \
 		-e 's|/usr/local/Acrobat|/opt/Acrobat|g' \
@@ -39,28 +44,28 @@ src_prepare() {
 
 	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
+	append-cflags -fno-strict-aliasing
+	distutils-r1_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"
+python_compile_all() {
+	if use doc; then
+		cd docs || die
+		"${PYTHON}" genAll.py || die "docs generation failed"
 	fi
 }
 
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py tests-preinstall
-	}
-	python_execute_function testing
+python_test() {
+	cd tests || die
+	"${PYTHON}" runAll.py || die
 }
 
-src_install() {
-	distutils_src_install
-
+python_install_all() {
 	if use doc; then
 		# docs/reference/reportlab-reference.pdf is identical with docs/reportlab-reference.pdf
 		rm -f docs/reference/reportlab-reference.pdf