version bump and other fixes

(Portage version: 2.0.53)

10 files changed, 396 insertions, 3 deletions

diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index 43a184d9d972..ab1f6668672e 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/PyQt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.59 2005/11/26 00:36:43 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.60 2005/12/09 22:07:41 carlo Exp $
+
+*PyQt-3.15.1 (09 Dec 2005)
+*PyQt-3.14.1-r1 (09 Dec 2005)
+*PyQt-3.13-r2 (09 Dec 2005)
+
+  09 Dec 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/PyQt-3.13-kde34.diff, +files/PyQt-3.14.1-examples.diff,
+  +PyQt-3.13-r2.ebuild, +PyQt-3.14.1-r1.ebuild, +PyQt-3.15.1.ebuild:
+  version bump and other fixes
 
   25 Nov 2005; Tom Gall <tgall@gentoo.org> PyQt-3.13.ebuild:
   stable on ppc64
diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index 13742945a117..c1c578b5763b 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,20 +1,28 @@
-MD5 555d0a74c2096bd5c7df1ae79189b170 ChangeLog 7037
+MD5 5863a0ae8cd480bfc34ea59f19e68924 ChangeLog 7338
 MD5 5839b01596e10f2cb747c3a15b56e5ae PyQt-3.11.ebuild 1472
 MD5 6d0db1c1bdefc35b47486d5e94c491a5 PyQt-3.12.ebuild 1175
 MD5 cb24fd8fac577b864a59b281a4088cb2 PyQt-3.13-r1.ebuild 1740
+MD5 c40a529f5278bc5307bf09d1512028d9 PyQt-3.13-r2.ebuild 1386
 MD5 d89d6cd78f1d1049dacba9b1017bdd98 PyQt-3.13.ebuild 1519
+MD5 6593127a531e2ebede73f8d9e6cd855b PyQt-3.14.1-r1.ebuild 1380
 MD5 a02b919efb1b54d05c1ca87d5121b2d5 PyQt-3.14.1.ebuild 1737
 MD5 6398473d6e2090b0371a4ead4870faaa PyQt-3.14.ebuild 1735
+MD5 3a554458ff8940773dd545811b897cfd PyQt-3.15.1.ebuild 1485
 MD5 780272ef9748281b9b87488aaf515dc5 PyQt-3.15.ebuild 1690
 MD5 7ae8c9ca1c90ced05dea52063e8730a8 PyQt-3.8.1.ebuild 1652
-MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+MD5 50a0986bb92509e8b08c31ce73a4f8c1 files/PyQt-3.13-kde34.diff 8042
+MD5 dcfd0955765670c05f403bef8aaf540e files/PyQt-3.14.1-examples.diff 939
 MD5 c5e3a3d6c377558ef966905f47c9c947 files/PyQt-3.8.1-qt-3.3.patch 280
 MD5 e548a5df6315f902d96d5b2d5afc2901 files/digest-PyQt-3.11 69
 MD5 1ce3d5a83afb717de48efb8050e66a1a files/digest-PyQt-3.12 69
 MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13 69
 MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13-r1 69
+MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13-r2 69
 MD5 c24fadea19e9b29218b912e3ae2be0df files/digest-PyQt-3.14 69
 MD5 cd786c34663d5f5d09f27bb73551b6c9 files/digest-PyQt-3.14.1 71
+MD5 cd786c34663d5f5d09f27bb73551b6c9 files/digest-PyQt-3.14.1-r1 71
 MD5 b40db534b17bda39b6adaf85b0003404 files/digest-PyQt-3.15 69
+MD5 4871357df2d75975ed54980e42c766f5 files/digest-PyQt-3.15.1 71
 MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
 MD5 7323b7d1c141a1f065cb1b8646bec695 files/license-3.8.1.diff 960
+MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
diff --git a/dev-python/PyQt/PyQt-3.13-r2.ebuild b/dev-python/PyQt/PyQt-3.13-r2.ebuild
new file mode 100644
index 000000000000..4046d77b4a9e
--- /dev/null
+++ b/dev-python/PyQt/PyQt-3.13-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.13-r2.ebuild,v 1.1 2005/12/09 22:07:41 carlo Exp $
+
+inherit distutils eutils
+
+MY_P="PyQt-x11-gpl-${PV/*_pre/snapshot-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc -alpha ~amd64 ~ppc64"
+IUSE="debug doc examples"
+
+RDEPEND="=x11-libs/qt-3*
+	>=dev-python/sip-3.10.2
+	<dev-python/qscintilla-1.6"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s:  check_license():# check_license():" ${S}/configure.py
+	cd ${S}
+	epatch ${FILESDIR}/PyQt-3.13-kde34.diff
+}
+
+src_compile() {
+	distutils_python_version
+	addpredict ${QTDIR}/etc/settings
+
+	local myconf="-d ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages \
+			-b ${ROOT}/usr/bin \
+			-v ${ROOT}/usr/share/sip \
+			-n ${ROOT}/usr/include \
+			-o ${ROOT}/usr/$(get_libdir)"
+	use debug && myconf="${myconf} -u"
+
+	python configure.py ${myconf}
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	dodoc ChangeLog LICENSE NEWS README README.Linux 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.14.1-r1.ebuild b/dev-python/PyQt/PyQt-3.14.1-r1.ebuild
new file mode 100644
index 000000000000..bbf11990b92a
--- /dev/null
+++ b/dev-python/PyQt/PyQt-3.14.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.14.1-r1.ebuild,v 1.1 2005/12/09 22:07:41 carlo Exp $
+
+inherit distutils eutils
+
+MY_P="PyQt-x11-gpl-${PV/*_pre/snapshot-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
+IUSE="debug doc examples"
+
+RDEPEND="=x11-libs/qt*
+	~dev-python/sip-4.2.1
+	<dev-python/qscintilla-1.6"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s:  check_license():# check_license():" ${S}/configure.py
+	epatch "${FILESDIR}/PyQt-3.14.1-examples.diff"
+}
+
+src_compile() {
+	distutils_python_version
+	addpredict ${QTDIR}/etc/settings
+
+	local myconf="-d ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages \
+			-b ${ROOT}/usr/bin \
+			-v ${ROOT}/usr/share/sip \
+			-n ${ROOT}/usr/include \
+			-o ${ROOT}/usr/$(get_libdir)"
+	use debug && myconf="${myconf} -u"
+
+	python configure.py ${myconf}
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	dodoc ChangeLog LICENSE NEWS README README.Linux 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.15.1.ebuild b/dev-python/PyQt/PyQt-3.15.1.ebuild
new file mode 100644
index 000000000000..f6f9c7a363c3
--- /dev/null
+++ b/dev-python/PyQt/PyQt-3.15.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.15.1.ebuild,v 1.1 2005/12/09 22:07:41 carlo Exp $
+
+inherit distutils
+
+MY_P="PyQt-x11-gpl-${PV/*_pre/snapshot-}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+#SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/${MY_P}.tar.gz"
+#SRC_URI="http://www.river-bank.demon.co.uk/download/snapshots/PyQt/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
+IUSE="debug doc examples"
+
+RDEPEND="=x11-libs/qt-3*
+	>=dev-python/sip-4.2
+	<dev-python/qscintilla-1.10"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s:  check_license():# check_license():" ${S}/configure.py
+}
+
+src_compile() {
+	distutils_python_version
+	addpredict ${QTDIR}/etc/settings
+
+	local myconf="-d ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages \
+			-b ${ROOT}/usr/bin \
+			-v ${ROOT}/usr/share/sip \
+			-n ${ROOT}/usr/include \
+			-o ${ROOT}/usr/$(get_libdir)"
+	use debug && myconf="${myconf} -u"
+
+	python configure.py ${myconf}
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+	dodoc ChangeLog LICENSE NEWS README README.Linux 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/PyQt-3.13-kde34.diff b/dev-python/PyQt/files/PyQt-3.13-kde34.diff
new file mode 100644
index 000000000000..17d2dbeda321
--- /dev/null
+++ b/dev-python/PyQt/files/PyQt-3.13-kde34.diff
@@ -0,0 +1,182 @@
+diff -Bru PyQt-3.13-r1/work/PyQt-x11-gpl-3.13/examples3/SQL/connect.ui pykde-3.4.0/work/pykde-3.4.0/python/pyqt/examples3/SQL/connect.ui
+--- examples3/SQL/connect.ui	2004-09-21 16:17:41.000000000 +0200
++++ pykde-3.4.0/work/pykde-3.4.0/python/pyqt/examples3/SQL/connect.ui	2005-03-28 17:32:11.000000000 +0200
+@@ -13,7 +13,7 @@
+         </rect>
+     </property>
+     <property name="caption">
+-        <string>Connect...</string>
++        <string>Connect</string>
+     </property>
+     <vbox>
+         <property name="name">
+@@ -30,7 +30,7 @@
+                 <cstring>GroupBox3</cstring>
+             </property>
+             <property name="title">
+-                <string>Connection settings</string>
++                <string>Connection Settings</string>
+             </property>
+             <grid>
+                 <property name="name">
+@@ -52,7 +52,7 @@
+                         <cstring>TextLabel3</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>Database Name:</string>
++                        <string>Database name:</string>
+                     </property>
+                     <property name="buddy" stdset="0">
+                         <cstring>comboDatabase</cstring>
+@@ -71,7 +71,7 @@
+                         <cstring>TextLabel4</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>&amp;Username:</string>
++                        <string>&amp;User name:</string>
+                     </property>
+                     <property name="buddy" stdset="0">
+                         <cstring>editUsername</cstring>
+@@ -108,7 +108,7 @@
+                         <cstring>TextLabel5</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>&amp;Hostname:</string>
++                        <string>&amp;Host name:</string>
+                     </property>
+                     <property name="buddy" stdset="0">
+                         <cstring>editHostname</cstring>
+@@ -147,7 +147,7 @@
+                         <cstring>TextLabel2</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>D&amp;river</string>
++                        <string>D&amp;river:</string>
+                     </property>
+                     <property name="buddy" stdset="0">
+                         <cstring>comboDriver</cstring>
+diff -Bru PyQt-3.13-r1/work/PyQt-x11-gpl-3.13/examples3/SQL/form1.ui pykde-3.4.0/work/pykde-3.4.0/python/pyqt/examples3/SQL/form1.ui
+--- examples3/SQL/form1.ui	2004-09-21 16:17:41.000000000 +0200
++++ pykde-3.4.0/work/pykde-3.4.0/python/pyqt/examples3/SQL/form1.ui	2005-03-28 17:32:11.000000000 +0200
+@@ -12,9 +12,6 @@
+             <height>370</height>
+         </rect>
+     </property>
+-    <property name="caption">
+-        <string>Form1</string>
+-    </property>
+     <widget class="QDataTable">
+         <column>
+             <property name="text">
+diff -Bru PyQt-3.13-r1/work/PyQt-x11-gpl-3.13/examples3/SQL/form2.ui pykde-3.4.0/work/pykde-3.4.0/python/pyqt/examples3/SQL/form2.ui
+--- examples3/SQL/form2.ui	2004-09-21 16:17:41.000000000 +0200
++++ pykde-3.4.0/work/pykde-3.4.0/python/pyqt/examples3/SQL/form2.ui	2005-03-28 17:32:11.000000000 +0200
+@@ -12,9 +12,6 @@
+             <height>152</height>
+         </rect>
+     </property>
+-    <property name="caption">
+-        <string>Form2</string>
+-    </property>
+     <widget class="QDataBrowser">
+         <property name="name">
+             <cstring>DataBrowser1</cstring>
+@@ -68,7 +65,7 @@
+                             <cstring>labelSurname</cstring>
+                         </property>
+                         <property name="text">
+-                            <string>Surname</string>
++                            <string>Surname:</string>
+                         </property>
+                     </widget>
+                     <widget class="QSpinBox" row="1" column="3">
+@@ -103,7 +100,7 @@
+                             <cstring>labelStatusid</cstring>
+                         </property>
+                         <property name="text">
+-                            <string>Statusid</string>
++                            <string>Statusid:</string>
+                         </property>
+                     </widget>
+                     <widget class="QLabel" row="0" column="0">
+@@ -111,7 +108,7 @@
+                             <cstring>labelForename</cstring>
+                         </property>
+                         <property name="text">
+-                            <string>Forename</string>
++                            <string>Forename:</string>
+                         </property>
+                     </widget>
+                     <widget class="QLineEdit" row="0" column="3">
+@@ -134,7 +131,7 @@
+                             <cstring>labelSalary</cstring>
+                         </property>
+                         <property name="text">
+-                            <string>Salary</string>
++                            <string>Salary:</string>
+                         </property>
+                     </widget>
+                     <widget class="QLineEdit" row="0" column="1">
+diff -Bru PyQt-3.13-r1/work/PyQt-x11-gpl-3.13/examples3/SQL/frmconnect.ui pykde-3.4.0/work/pykde-3.4.0/python/pyqt/examples3/SQL/frmconnect.ui
+--- examples3/SQL/frmconnect.ui	2004-09-21 16:17:41.000000000 +0200
++++ pykde-3.4.0/work/pykde-3.4.0/python/pyqt/examples3/SQL/frmconnect.ui	2005-03-28 17:32:11.000000000 +0200
+@@ -127,7 +127,7 @@
+                         <cstring>lblDatabase</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>&amp;Database</string>
++                        <string>&amp;Database:</string>
+                     </property>
+                     <property name="buddy" stdset="0">
+                         <cstring>cmbDatabase</cstring>
+@@ -138,7 +138,7 @@
+                         <cstring>lblServer</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>&amp;Server</string>
++                        <string>&amp;Server:</string>
+                     </property>
+                     <property name="buddy" stdset="0">
+                         <cstring>cmbServer</cstring>
+@@ -149,7 +149,7 @@
+                         <cstring>lblName</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>&amp;Name</string>
++                        <string>&amp;Name:</string>
+                     </property>
+                     <property name="buddy" stdset="0">
+                         <cstring>txtName</cstring>
+@@ -191,7 +191,7 @@
+                         <cstring>lblPasswd</cstring>
+                     </property>
+                     <property name="text">
+-                        <string>&amp;Password</string>
++                        <string>&amp;Password:</string>
+                     </property>
+                     <property name="buddy" stdset="0">
+                         <cstring>txtPasswd</cstring>
+diff -Bru PyQt-3.13-r1/work/PyQt-x11-gpl-3.13/sip/qt/qlist.sip pykde-3.4.0/work/pykde-3.4.0/python/pyqt/sip/qt/qlist.sip
+--- sip/qt/qlist.sip	2004-09-21 16:17:45.000000000 +0200
++++ pykde-3.4.0/work/pykde-3.4.0/python/pyqt/sip/qt/qlist.sip	2004-06-19 22:33:31.000000000 +0200
+@@ -37,7 +37,7 @@
+ %MappedType QList<QNetworkOperation>
+ {
+ %TypeHeaderCode
+-#include <qlist.h>
++#include <qptrlist.h>
+ %End
+ 
+ %ConvertFromTypeCode
+diff -Bru PyQt-3.13-r1/work/PyQt-x11-gpl-3.13/sip/qtpe/qpelist.sip pykde-3.4.0/work/pykde-3.4.0/python/pyqt/sip/qtpe/qpelist.sip
+--- sip/qtpe/qpelist.sip	2004-09-21 16:17:45.000000000 +0200
++++ pykde-3.4.0/work/pykde-3.4.0/python/pyqt/sip/qtpe/qpelist.sip	2004-06-19 22:33:33.000000000 +0200
+@@ -27,7 +27,7 @@
+ %MappedType QList<AppLnk>
+ {
+ %TypeHeaderCode
+-#include <qlist.h>
++#include <qptrlist.h>
+ %End
+ 
+ %ConvertFromTypeCode
diff --git a/dev-python/PyQt/files/PyQt-3.14.1-examples.diff b/dev-python/PyQt/files/PyQt-3.14.1-examples.diff
new file mode 100644
index 000000000000..6e5a4785f4a5
--- /dev/null
+++ b/dev-python/PyQt/files/PyQt-3.14.1-examples.diff
@@ -0,0 +1,24 @@
+--- PyQt-x11-gpl-3.14.1/examples3/SQL/form1.ui	2005-03-06 11:30:50.000000000 +0100
++++ /var/tmp/portage/pykde-3.5.0/work/pykde-3.5.0/python/pyqt/examples3/SQL/form1.ui	2005-11-30 15:59:01.000000000 +0100
+@@ -12,9 +12,6 @@
+             <height>370</height>
+         </rect>
+     </property>
+-    <property name="caption">
+-        <string>Form1</string>
+-    </property>
+     <widget class="QDataTable">
+         <column>
+             <property name="text">
+--- PyQt-x11-gpl-3.14.1/examples3/SQL/form2.ui	2005-03-06 11:30:50.000000000 +0100
++++ /var/tmp/portage/pykde-3.5.0/work/pykde-3.5.0/python/pyqt/examples3/SQL/form2.ui	2005-11-30 15:59:01.000000000 +0100
+@@ -12,9 +12,6 @@
+             <height>152</height>
+         </rect>
+     </property>
+-    <property name="caption">
+-        <string>Form2</string>
+-    </property>
+     <widget class="QDataBrowser">
+         <property name="name">
+             <cstring>DataBrowser1</cstring>
diff --git a/dev-python/PyQt/files/digest-PyQt-3.13-r2 b/dev-python/PyQt/files/digest-PyQt-3.13-r2
new file mode 100644
index 000000000000..c64660b67669
--- /dev/null
+++ b/dev-python/PyQt/files/digest-PyQt-3.13-r2
@@ -0,0 +1 @@
+MD5 a4145b39742a4d9df9b6bf06495f75f5 PyQt-x11-gpl-3.13.tar.gz 763066
diff --git a/dev-python/PyQt/files/digest-PyQt-3.14.1-r1 b/dev-python/PyQt/files/digest-PyQt-3.14.1-r1
new file mode 100644
index 000000000000..a7791cbd39b4
--- /dev/null
+++ b/dev-python/PyQt/files/digest-PyQt-3.14.1-r1
@@ -0,0 +1 @@
+MD5 bf6d939ec77e48a2db7561e7bac61d19 PyQt-x11-gpl-3.14.1.tar.gz 782274
diff --git a/dev-python/PyQt/files/digest-PyQt-3.15.1 b/dev-python/PyQt/files/digest-PyQt-3.15.1
new file mode 100644
index 000000000000..30bc50ae6cfa
--- /dev/null
+++ b/dev-python/PyQt/files/digest-PyQt-3.15.1
@@ -0,0 +1 @@
+MD5 835d49f219b3c0b7f60bf6b2b47c5320 PyQt-x11-gpl-3.15.1.tar.gz 790366