PyQt ebuild sync

6 files changed, 32 insertions, 139 deletions

diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index c543c7cd..c34b633d 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,32 @@
 # 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.120 2009/06/16 17:58:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.129 2009/10/18 14:45:55 armin76 Exp $
+
+  18 Oct 2009; Raúl Porcel <armin76@gentoo.org> PyQt-3.18.1.ebuild:
+  alpha/ia64/sparc stable wrt #284707
+
+  12 Oct 2009; Jeroen Roovers <jer@gentoo.org> PyQt-3.18.1.ebuild:
+  Stable for HPPA (bug #284707).
+
+  27 Sep 2009; nixnut <nixnut@gentoo.org> PyQt-3.18.1.ebuild:
+  ppc stable #284707
+
+  22 Sep 2009; Markus Meier <maekke@gentoo.org> PyQt-3.18.1.ebuild:
+  amd64 stable, bug #284707
+
+  16 Sep 2009; Jesus Rivero <neurogeek@gentoo.org> PyQt-3.18.1.ebuild:
+  Fixed RDEPEND (QScintilla)
+
+  16 Sep 2009; Christian Faulhammer <fauli@gentoo.org> PyQt-3.18.1.ebuild:
+  stable x86, bug 284707
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/python_2.5_build_fix.patch:
+  Remove unused patch.
+
+  05 Sep 2009; Patrick Lauer <patrick@gentoo.org> -PyQt-3.18.ebuild,
+  -PyQt-3.18-r1.ebuild:
+  Remove old
 
   16 Jun 2009; Markos Chandras <hwoarang@gentoo.org> PyQt-3.18.1.ebuild:
   Raise sip dependency to 4.8.1
diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index b912cfbf..435c0bf8 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,10 +1,6 @@
-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.1.tar.gz 819441 RMD160 1278b805bcd0a3e34e68a07849c052382c452096 SHA1 310c17bd3b0f81f8b516c5b755250171fa9c9a04 SHA256 7eb635f04f9b1853b6e9f969ddd9392d677083f462a27ec19285e1487c72c061
-DIST PyQt-x11-gpl-3.18.tar.gz 819353 RMD160 e7aba02c81a7998845daf56d83c6177a9339c1d6 SHA1 3460c54fa1baaf414aae64a47fe56bae45bda015 SHA256 13e7d439060c937304b3f9ccf39189c02d3fa678093ded0a95a09d927d914f90
 EBUILD PyQt-3.17.6.ebuild 1576 RMD160 8265f598a25b8b36da2f150e4c95fe5a13d09acd SHA1 e58ec30c9957d251d531a13f9221f5c38edafe2f SHA256 121110edc64f49f59aad6c3f77dbfb96d46cc49690fee30fd82af590aaf4be28
-EBUILD PyQt-3.18-r1.ebuild 1560 RMD160 d943d19501736a8f64b3ae7d8de0ef2b496b1fc8 SHA1 097281b2fc2ca66aee16a7f9ae6af8eb6300c4bd SHA256 2e40a82e1e87bb616d105e902b0fc1dade63b4d2c0440fd8ed875b2839c59e5d
-EBUILD PyQt-3.18.1.ebuild 1512 RMD160 f3cbceca5276cc716b0cd19b48fcfeca50455dbb SHA1 2f5a16049824d9e4a702b476ddf530035e7e88d2 SHA256 29a97098fdb2df1215019874d7cc54c6488c0b5c002e860b17e881715c4068b7
-EBUILD PyQt-3.18.ebuild 1502 RMD160 7994a689481b61a91bafe7d7759830c6fa09324c SHA1 63226b9deea34eb0486c3cd637226be8e19d690c SHA256 8d048294692ecc5be56382621358804c283e5273cbdab75e690d12e353234d78
-MISC ChangeLog 14752 RMD160 cc1422d799f328b22ed9f8375ac2285c7be2571a SHA1 0d24e4df0e436bdbd0e464e30e1d0c0d2ad525f8 SHA256 16149ba14fe980b20614ed5b88ef28db8be53c32aa8391548b15906ac82b5881
+EBUILD PyQt-3.18.1.ebuild 1504 RMD160 19259cdfb5ac579944b1c3f6bcc2e06a2993c1e5 SHA1 9376237c27942e87c7d6329712ec9f32bb0fca2f SHA256 4d604ad1db7c9b0c7ef6e1914fddd7c24f1daf0610530591b26d1a6f1a99dec5
+MISC ChangeLog 15563 RMD160 d371c1a93db25fd0f2c5cb30bd5e2e1c17dc8054 SHA1 d3533435a06bec94f2424ad017eee46fbf03ce5f SHA256 a8a7b3af4e98cbd5f434141e1c9d23a15be6e595daeb5adc419ba6ccc0e1554b
 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
deleted file mode 100644
index e17c8969..00000000
--- a/dev-python/PyQt/PyQt-3.18-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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/PyQt-3.18.1.ebuild b/dev-python/PyQt/PyQt-3.18.1.ebuild
index f2972603..0deb1d6f 100644
--- a/dev-python/PyQt/PyQt-3.18.1.ebuild
+++ b/dev-python/PyQt/PyQt-3.18.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.ebuild,v 1.2 2009/06/16 17:58:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.18.1.ebuild,v 1.8 2009/10/18 14:41:15 armin76 Exp $
 
 EAPI="2"
 inherit distutils
@@ -14,12 +14,12 @@ 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"
+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.1
-	>=x11-libs/qscintilla-2.4[python]"
+	>=x11-libs/qscintilla-2.3[python]"
 DEPEND="${RDEPEND}
 	sys-devel/libtool"
 
diff --git a/dev-python/PyQt/PyQt-3.18.ebuild b/dev-python/PyQt/PyQt-3.18.ebuild
deleted file mode 100644
index 4a89ec96..00000000
--- a/dev-python/PyQt/PyQt-3.18.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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.ebuild,v 1.2 2009/06/09 20:12:15 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
-}
-
-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"
-	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
deleted file mode 100644
index f52f5651..00000000
--- a/dev-python/PyQt/files/python_2.5_build_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);