Fix Assertions, thanks rei4dan for providing the patch

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 71 insertions, 10 deletions

diff --git a/sci-chemistry/bkchem/ChangeLog b/sci-chemistry/bkchem/ChangeLog
index 5f93aeed8d31..cccfa86ecd7a 100644
--- a/sci-chemistry/bkchem/ChangeLog
+++ b/sci-chemistry/bkchem/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/bkchem
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/ChangeLog,v 1.2 2010/06/18 06:28:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/ChangeLog,v 1.3 2010/06/18 18:09:45 jlec Exp $
+
+*bkchem-0.14.0_pre1-r2 (18 Jun 2010)
+
+  18 Jun 2010; Justin Lecher <jlec@gentoo.org>
+  +files/0.14.0_pre1-piddle-Fix-assertions.patch,
+  -bkchem-0.14.0_pre1-r1.ebuild, +bkchem-0.14.0_pre1-r2.ebuild:
+  Fix Assertions, thanks rei4dan for providing the patch
 
 *bkchem-0.14.0_pre1-r1 (18 Jun 2010)
 
diff --git a/sci-chemistry/bkchem/Manifest b/sci-chemistry/bkchem/Manifest
index b1c97012aaa3..7b46c8c8c0b1 100644
--- a/sci-chemistry/bkchem/Manifest
+++ b/sci-chemistry/bkchem/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.14.0_pre1-piddle-Fix-assertions.patch 2362 RMD160 17e5a6f3cdae0db6b4cd91f4392b4d1e73565e50 SHA1 77cb2025aec6ec787864fb957386d9fd409c1f58 SHA256 0d79a173bd5af1356cc85a4a68d7ef112543a161fb243160ec8af4b6940fc2fc
 DIST bkchem-0.14.0-pre1.tar.gz 1035224 RMD160 02dc1cd582d112e999bdfe93d2acd56ffb32fb7f SHA1 326682356d14334ff00ae89cfd6e85834f65380a SHA256 4a1db68f47cb76dd63fd9d8f56ab61ecdf229df022ae1c0063f333414d27b4d0
-EBUILD bkchem-0.14.0_pre1-r1.ebuild 813 RMD160 e157b5ce37d4a7945f35895839205be4c406932d SHA1 31fa3d0cd60e40955ec5f051087d1230e4e8d338 SHA256 480e800730429065e7b700a0d63e2219c31ecf04529901e655fff35fd6473880
-MISC ChangeLog 564 RMD160 d14ba1eb1fb7161e09cfd02792850d65a8718eff SHA1 f0658ca194f77205f75d9f7d0d31415140999b3e SHA256 2e206cc06c65f2254b4ef0aa65cece4fb4ad90d2bddbc5446b47a902c2600ba1
+EBUILD bkchem-0.14.0_pre1-r2.ebuild 908 RMD160 e617b84a58f934cba0578d91327220e8ed8f9d9f SHA1 eca03ade0c9f1374510dece78024d914ccf721bc SHA256 178d8201b4fdf06c796b79db9c7bdf73e764ff158e742bb23e29d14a6b15307d
+MISC ChangeLog 821 RMD160 fc34393fb634642c8cc41ca247816dae30e2bce9 SHA1 e1c98bb8134647cc4e41d5d40ff8fb2a0486a9fc SHA256 36a56035080c0c1cdf6e34de63d6ee4adff122cfddab3d77405d5b4f34e62e35
 MISC metadata.xml 155 RMD160 3461e0e8be85b18f167d6c09bd46051d3d1407d1 SHA1 b61e02ab96757b21564fe0c9d1c6ac85f3f4b4ea SHA256 dcbfd8047666ea8f6051e15ba815e96cfb5c03dcea941c16a709a9cdf761dd39
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwbEi4ACgkQgAnW8HDreRYh/gCfSzo8B/0rdum6A6CZr4kQQCTB
-YrcAoKtB1mPAfzUkccIGASQNSBlY4OMT
-=69+P
+iEYEARECAAYFAkwbtm4ACgkQgAnW8HDreRak9ACeMIp2X7SAmGqnJ2ckiQIo1U8x
+1CcAoJK+6h4kTiTzvG8rzHpjoeslpp1H
+=YkuW
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r1.ebuild b/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild
index 17f0dd9eee70..11006df5ef71 100644
--- a/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r1.ebuild
+++ b/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r1.ebuild,v 1.1 2010/06/18 06:28:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/bkchem/bkchem-0.14.0_pre1-r2.ebuild,v 1.1 2010/06/18 18:09:45 jlec Exp $
 
 EAPI="3"
 
-PYTHON_DEPEND="2:2.5:2.5"
+PYTHON_DEPEND="2"
 PYTHON_USE_WITH="tk"
 
-inherit distutils versionator
+inherit distutils eutils versionator
 
 MY_P="${PN}-$(replace_version_separator 3 -)"
 
@@ -26,7 +26,12 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}"/${MY_P}
 
 pkg_setup() {
-	python_set_active_version 2.5
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-piddle-Fix-assertions.patch
+	distutils_src_prepare
 }
 
 src_install() {
diff --git a/sci-chemistry/bkchem/files/0.14.0_pre1-piddle-Fix-assertions.patch b/sci-chemistry/bkchem/files/0.14.0_pre1-piddle-Fix-assertions.patch
new file mode 100644
index 000000000000..6270e59d5320
--- /dev/null
+++ b/sci-chemistry/bkchem/files/0.14.0_pre1-piddle-Fix-assertions.patch
@@ -0,0 +1,48 @@
+diff --git a/bkchem/plugins/piddle/pdfgen.py b/bkchem/plugins/piddle/pdfgen.py
+index 5213672..4c056c7 100644
+--- a/bkchem/plugins/piddle/pdfgen.py
++++ b/bkchem/plugins/piddle/pdfgen.py
+@@ -639,7 +639,7 @@ class Canvas:
+ 
+             #use a flate filter and Ascii Base 85 to compress
+             raw = myimage.tostring()
+-            assert(len(raw) == imgwidth * imgheight, "Wrong amount of data for image")
++            assert len(raw) == imgwidth * imgheight, "Wrong amount of data for image"
+             compressed = zlib.compress(raw)   #this bit is very fast...
+             encoded = pdfutils._AsciiBase85Encode(compressed) #...sadly this isn't
+ 
+diff --git a/bkchem/plugins/piddle/pdfutils.py b/bkchem/plugins/piddle/pdfutils.py
+index ebde677..4a7675d 100644
+--- a/bkchem/plugins/piddle/pdfutils.py
++++ b/bkchem/plugins/piddle/pdfutils.py
+@@ -27,7 +27,7 @@ def cacheImageFile(filename):
+     code.append('ID')
+     #use a flate filter and Ascii Base 85
+     raw = img.tostring()
+-    assert(len(raw) == imgwidth * imgheight, "Wrong amount of data for image")
++    assert len(raw) == imgwidth * imgheight, "Wrong amount of data for image"
+     compressed = zlib.compress(raw)   #this bit is very fast...
+     encoded = _AsciiBase85Encode(compressed) #...sadly this isn't
+     
+diff --git a/bkchem/plugins/piddle/piddlePS.py b/bkchem/plugins/piddle/piddlePS.py
+index 4d3c327..3afa361 100644
+--- a/bkchem/plugins/piddle/piddlePS.py
++++ b/bkchem/plugins/piddle/piddlePS.py
+@@ -866,7 +866,7 @@ translate
+        # piddlePDF again
+ 
+        rawimage = myimage.tostring()
+-       assert(len(rawimage) == imgwidth*imgheight, 'Wrong amount of data for image') 
++       assert len(rawimage) == imgwidth*imgheight, 'Wrong amount of data for image'
+        #compressed = zlib.compress(rawimage) # no zlib at moment
+        hex_encoded = self._AsciiHexEncode(rawimage)
+        
+@@ -957,7 +957,7 @@ translate
+                           'image'])
+         # after image operator just need to dump image dat to file as hexstring
+         rawimage = myimage.tostring()
+-        assert(len(rawimage) == imwidth*imheight, 'Wrong amount of data for image') 
++        assert len(rawimage) == imwidth*imheight, 'Wrong amount of data for image'
+         #compressed = zlib.compress(rawimage) # no zlib at moment
+         hex_encoded = self._AsciiHexEncode(rawimage)
+