Revbump. Fixes bug 188405 and bug 274017

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

4 files changed, 83 insertions, 2 deletions

diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index 3bc8357702ed..f1ca3d86e2f0 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/PyQt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.116 2009/06/09 20:12:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.117 2009/06/13 16:23:35 hwoarang Exp $
+
+*PyQt-3.18-r1 (13 Jun 2009)
+
+  13 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
+  +files/python_2.5_build_fix.patch, +PyQt-3.18-r1.ebuild:
+  Revbump. Fixes pre-stripped files ( bug 188405 thanks to Victor Ostorga ).
+  Fixes python-2.5
+  compatibility ( bug 274017 ).
 
   09 Jun 2009; Markos Chandras <hwoarang@gentoo.org> PyQt-3.18.ebuild:
   Silently drop qt4 use dependency from qscintilla
diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index a904dc0cd627..b6c5519a0e6b 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,6 +1,8 @@
+AUX python_2.5_build_fix.patch 623 RMD160 f026dc2878fa6f184de503c6384294ada13fb3b2 SHA1 f651572448b2a4c7726183a3aaa7bbd72ee9652a SHA256 d045e66433b56417560ca99052a00e03b713d95064a14d9fccfc7045b6e6d7b3
 DIST PyQt-x11-gpl-3.17.6.tar.gz 813192 RMD160 a1ac4f40d666092242994bb855404a6e4c7f649f SHA1 68a6bbc0a8211a763165f2a4e8c79d9a3262a8d2 SHA256 9c8a51d296510a400ec82c64ac582b4adce30811e33b2222194c405217bca1a8
 DIST PyQt-x11-gpl-3.18.tar.gz 819353 RMD160 e7aba02c81a7998845daf56d83c6177a9339c1d6 SHA1 3460c54fa1baaf414aae64a47fe56bae45bda015 SHA256 13e7d439060c937304b3f9ccf39189c02d3fa678093ded0a95a09d927d914f90
 EBUILD PyQt-3.17.6.ebuild 1572 RMD160 b57f6545db24b64558734756d9d02c75a154dcf1 SHA1 a2caf2c58226a0e938302f2304578fd794c415c8 SHA256 87253f06e0b0d8b12592d25365ad3ceb67b93b67f2aee3920acc07b1e2c42766
+EBUILD PyQt-3.18-r1.ebuild 1560 RMD160 d943d19501736a8f64b3ae7d8de0ef2b496b1fc8 SHA1 097281b2fc2ca66aee16a7f9ae6af8eb6300c4bd SHA256 2e40a82e1e87bb616d105e902b0fc1dade63b4d2c0440fd8ed875b2839c59e5d
 EBUILD PyQt-3.18.ebuild 1502 RMD160 7994a689481b61a91bafe7d7759830c6fa09324c SHA1 63226b9deea34eb0486c3cd637226be8e19d690c SHA256 8d048294692ecc5be56382621358804c283e5273cbdab75e690d12e353234d78
-MISC ChangeLog 14144 RMD160 35f1fec9cf9e5c173d5fda0ac07f8f6eee551480 SHA1 baad0811a28e25e79e8d8f80ab8acff9ea3d5f8d SHA256 62f3d3269bf89e5f47053ef24194993efbea89092d34585ebf6b4e317b22552d
+MISC ChangeLog 14414 RMD160 23fcde0cd6d305ae0b304536351ebd81e12335f9 SHA1 475b215ae0a04d3a92680f715c028168fce686db SHA256 44fe32cbb20ff479705b1f82be915c6b7c685bef695c36dd83613ca0a067cc7d
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/dev-python/PyQt/PyQt-3.18-r1.ebuild b/dev-python/PyQt/PyQt-3.18-r1.ebuild
new file mode 100644
index 000000000000..e17c89699f3f
--- /dev/null
+++ b/dev-python/PyQt/PyQt-3.18-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.18-r1.ebuild,v 1.1 2009/06/13 16:23:35 hwoarang Exp $
+
+EAPI="2"
+inherit distutils
+
+MY_P="PyQt-x11-gpl-${PV/*_pre/snapshot-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A set of Python bindings for Qt3"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/intro/"
+SRC_URI="http://www.riverbankcomputing.com/static/Downloads/PyQt3/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc examples"
+
+RDEPEND="x11-libs/qt:3
+	>=dev-python/sip-4.8
+	>=x11-libs/qscintilla-2.4[python]"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+src_prepare() {
+	sed -i -e "s:  check_license():# check_license():" "${S}"/configure.py
+	epatch "${FILESDIR}"/python_2.5_build_fix.patch
+}
+
+src_configure() {
+	distutils_python_version
+	addpredict ${QTDIR}/etc/settings
+
+	local myconf="-d $(python_get_sitedir) \
+			-b /usr/bin \
+			-v /usr/share/sip \
+			-n /usr/include \
+			-o /usr/$(get_libdir) \
+			-w -y qt-mt
+			-u"
+	use debug && myconf="${myconf} -u"
+
+	"${python}" configure.py ${myconf} || die 'configure failed'
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	python_need_rebuild
+	make DESTDIR="${D}" install || die "install failed"
+	dodoc ChangeLog NEWS README THANKS
+	use doc && dohtml doc/PyQt.html
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -r examples3/* "${D}"/usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/PyQt/files/python_2.5_build_fix.patch b/dev-python/PyQt/files/python_2.5_build_fix.patch
new file mode 100644
index 000000000000..f52f56510e1a
--- /dev/null
+++ b/dev-python/PyQt/files/python_2.5_build_fix.patch
@@ -0,0 +1,11 @@
+--- PyQt-x11-gpl-3.18/sip/qt/qobject.sip	2009-06-05 11:58:25.000000000 +0300
++++ PyQt-x11-gpl-3.18.1-snapshot-20090610/sip/qt/qobject.sip	2009-06-11 05:30:14.000000000 +0300
+@@ -1649,7 +1649,7 @@
+ 	// universal slot a child of the transmitter.  This doesn't work as
+ 	// expected because QWidget destroys its children before emitting the
+ 	// destroyed signal.)
+-	if (tx && PyObject_TypeCheck(tx, (PyTypeObject *)sipClass_QObject))
++	if (tx && PyObject_TypeCheck((PyObject *)tx, (PyTypeObject *)sipClass_QObject))
+ 		qtx = reinterpret_cast<QObject *>(conn.sc_transmitter);
+ 
+ 	return new UniversalSlot(qtx, &conn, member);