Python 2.5 fix. bug# 158510

Package-Manager: portage-2.1.2.2

4 files changed, 67 insertions, 15 deletions

diff --git a/dev-python/pyqwt/ChangeLog b/dev-python/pyqwt/ChangeLog
index 0638b3688195..0541ce86e2ae 100644
--- a/dev-python/pyqwt/ChangeLog
+++ b/dev-python/pyqwt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pyqwt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/ChangeLog,v 1.4 2007/02/21 17:02:27 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/ChangeLog,v 1.5 2007/03/13 19:17:30 pythonhead Exp $
+
+*pyqwt-4.2-r1 (13 Mar 2007)
+
+  13 Mar 2007; Rob Cakebread <pythonhead@gentoo.org> +pyqwt-4.2-r1.ebuild:
+  Python 2.5 fix. bug# 158510 Thanks to Troy Melhase <troy@gci.net>
 
   21 Feb 2007; Lukasz Strzygowski <lucass@gentoo.org>
   files/digest-pyqwt-4.2, Manifest:
diff --git a/dev-python/pyqwt/Manifest b/dev-python/pyqwt/Manifest
index 62e63cb83933..4e441c2ccda5 100644
--- a/dev-python/pyqwt/Manifest
+++ b/dev-python/pyqwt/Manifest
@@ -1,15 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST PyQwt-4.2.tar.gz 1416358 RMD160 e9f6ce51b6cbcbadb526f0fcac5035510882fd54 SHA1 ac5e0e6719ae77e73154f06dac3b0ae6728cec7b SHA256 6db14a2a89cbbbef515a4964e824b0f52f10427cef56cd6f3a7b3f1ef0a444d0
+EBUILD pyqwt-4.2-r1.ebuild 1453 RMD160 38e06ca8abe6fc0ffbcfc13a9bd27ba8e6708a20 SHA1 64846d7db23ab7bc60cd3c4aa32a16cc9174821f SHA256 473da3e2c2a67564d03e283ddff51c529f00feadf222d30001e69bdac0232ff6
+MD5 314808bef2938e889c4be05c7a6905fd pyqwt-4.2-r1.ebuild 1453
+RMD160 38e06ca8abe6fc0ffbcfc13a9bd27ba8e6708a20 pyqwt-4.2-r1.ebuild 1453
+SHA256 473da3e2c2a67564d03e283ddff51c529f00feadf222d30001e69bdac0232ff6 pyqwt-4.2-r1.ebuild 1453
 EBUILD pyqwt-4.2.ebuild 1242 RMD160 299c36d2e5cf22981f584f7c222ee21a0b96726c SHA1 4e87773b0068ae40d976fd9f479847b2c5af245a SHA256 5a83f0fd4b01029ef66f9da1d692bdf73819b51320f3cdb8df3b2dc9f3405417
 MD5 cd6b2e15890621990dbdeadab42bce99 pyqwt-4.2.ebuild 1242
 RMD160 299c36d2e5cf22981f584f7c222ee21a0b96726c pyqwt-4.2.ebuild 1242
 SHA256 5a83f0fd4b01029ef66f9da1d692bdf73819b51320f3cdb8df3b2dc9f3405417 pyqwt-4.2.ebuild 1242
-MISC ChangeLog 676 RMD160 8dca65502791a83e2c8d49afce4b7db3cfba67ad SHA1 06ba8a0481985157af71097241e5366717cd4155 SHA256 94182ac92740fcd7b2d48946fbcd8fcf0a30b18ca5f5746a5ed84bf23be025f5
-MD5 9412721ff478da942bc2bedae735237a ChangeLog 676
-RMD160 8dca65502791a83e2c8d49afce4b7db3cfba67ad ChangeLog 676
-SHA256 94182ac92740fcd7b2d48946fbcd8fcf0a30b18ca5f5746a5ed84bf23be025f5 ChangeLog 676
+MISC ChangeLog 853 RMD160 5db22624076207f4e354fa9f299c5588cd504d53 SHA1 5ce75afe194bee5af9afad3b70e5a071c1227293 SHA256 48806fb7c12a4efd8cb98160c497bf4191ebf3df17e0e91dabf05445a455cfcc
+MD5 a60114ae1bf4dacbb25b298b38c1e33e ChangeLog 853
+RMD160 5db22624076207f4e354fa9f299c5588cd504d53 ChangeLog 853
+SHA256 48806fb7c12a4efd8cb98160c497bf4191ebf3df17e0e91dabf05445a455cfcc ChangeLog 853
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 metadata.xml 175
@@ -17,10 +18,6 @@ SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d metadata
 MD5 746eb434fdcb351ad579d24b7cc347b7 files/digest-pyqwt-4.2 232
 RMD160 87970148c97b0d8b09c2c85e70a17285f2d1a921 files/digest-pyqwt-4.2 232
 SHA256 983eb8dcc0d37bf9965c98b6f7a3a1ce069b7e5098c3d08dc84919ebc2fe3150 files/digest-pyqwt-4.2 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF3Hsv2jLqHNfbg2URApnNAJ96be6/ndTWPL8LEplbTDM+NoA+OgCeKuT7
-kfOUVKnZSc3UkAlcE4h8X4c=
-=qzj5
------END PGP SIGNATURE-----
+MD5 746eb434fdcb351ad579d24b7cc347b7 files/digest-pyqwt-4.2-r1 232
+RMD160 87970148c97b0d8b09c2c85e70a17285f2d1a921 files/digest-pyqwt-4.2-r1 232
+SHA256 983eb8dcc0d37bf9965c98b6f7a3a1ce069b7e5098c3d08dc84919ebc2fe3150 files/digest-pyqwt-4.2-r1 232
diff --git a/dev-python/pyqwt/files/digest-pyqwt-4.2-r1 b/dev-python/pyqwt/files/digest-pyqwt-4.2-r1
new file mode 100644
index 000000000000..11cad0fa743e
--- /dev/null
+++ b/dev-python/pyqwt/files/digest-pyqwt-4.2-r1
@@ -0,0 +1,3 @@
+MD5 70cf89765cc51c3e9e2e5d1eef9522f1 PyQwt-4.2.tar.gz 1416358
+RMD160 e9f6ce51b6cbcbadb526f0fcac5035510882fd54 PyQwt-4.2.tar.gz 1416358
+SHA256 6db14a2a89cbbbef515a4964e824b0f52f10427cef56cd6f3a7b3f1ef0a444d0 PyQwt-4.2.tar.gz 1416358
diff --git a/dev-python/pyqwt/pyqwt-4.2-r1.ebuild b/dev-python/pyqwt/pyqwt-4.2-r1.ebuild
new file mode 100644
index 000000000000..a15dc804ba24
--- /dev/null
+++ b/dev-python/pyqwt/pyqwt-4.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-4.2-r1.ebuild,v 1.1 2007/03/13 19:17:30 pythonhead Exp $
+
+
+inherit distutils eutils
+
+MY_P=PyQwt-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Python bindings for the Qwt library"
+SRC_URI="mirror://sourceforge/pyqwt/${MY_P}.tar.gz"
+HOMEPAGE="http://pyqwt.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="debug"
+
+DEPEND=">=dev-lang/python-2.3.2
+	~x11-libs/qwt-4.2.0
+	>=dev-python/PyQt-3.14
+	>=dev-python/sip-4.2
+	>=dev-python/numarray-1.1.1
+	>=dev-python/numeric-23.7"
+
+src_compile() {
+	cd ${S}/sip
+	sed -i s/"[[:space:]]*const QLabel \*titleLabel() const\;"// qwtplot.sip
+	sed -i s/"[[:space:]]*const QwtPlotCanvas \*canvas() const\;"// qwtplot.sip
+	cd ${S}/configure
+	local myconf="-d /usr/$(get_libdir)/python${PYVER}/site-packages -l /usr/$(get_libdir) \
+			-i /usr/include/qwt -v /usr/share/sip  -x /usr/share/sip"
+	use debug && myconf="${myconf} -u"
+	has distcc ${FEATURES} || myconf="${myconf} -c"
+	python configure.py ${myconf}
+	emake || die "emake failed"
+}
+
+src_install() {
+	cd ${S}
+	sed -i s/2,4,9/2,5,9/ setup.py
+	python setup.py install --prefix=/usr --root=${D} || die "install failed"
+	dodoc ANNOUNCEMENT-4.2.TXT AUTHORS COPYING* README THANKS
+	use doc && mv ${D}/usr/share/doc/${MY_P}/* ${D}/usr/share/doc/${PF}
+	rm -rf ${D}/usr/share/doc/${MY_P}
+}