mirror://gentoo fixes, version bump

7 files changed, 65 insertions, 12 deletions

diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index 721f0dac0516..54caa35bf4f9 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/PyQt
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.35 2004/05/25 13:22:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.36 2004/05/26 19:55:06 carlo Exp $
+
+*PyQt-3.12 (26 May 2004)
+
+  26 May 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.11.ebuild,
+  PyQt-3.12.ebuild, PyQt-3.5.ebuild, PyQt-3.8.1.ebuild:
+  mirror://gentoo fixes, version bump
 
   25 May 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.10.ebuild,
   PyQt-3.8.1.ebuild, files/PyQt-3.10-qt-3.3.patch:
diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index 6e8bcf9e6a4d..017127512a3b 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,10 +1,12 @@
-MD5 dfff044a0e491e0b1be69354a7b0156c PyQt-3.5.ebuild 1164
-MD5 03b82b23eb727663b68b33809f800ce8 PyQt-3.11.ebuild 1487
-MD5 bdefcb3708676d274ca6bcaea7e941e1 PyQt-3.8.1.ebuild 1719
-MD5 b6d8cc4085f3f7eeff1e100d0e5a16b9 ChangeLog 4470
+MD5 b3bb772e8717afd934c90e9cb5e46139 PyQt-3.5.ebuild 1132
+MD5 abb26bb3abfc3a55699974583ff665d0 PyQt-3.12.ebuild 1160
+MD5 8bedd926498565a29af057c542a01c9a PyQt-3.11.ebuild 1456
+MD5 ffd396512235a1ac4e0eafcc6485dc21 PyQt-3.8.1.ebuild 1634
+MD5 e83b4b7753696fced58c0d7903299ab9 ChangeLog 4658
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
 MD5 94164eef52f16b805d3c252c02100d11 files/qt3.1.2-compilation-fix-3.5.diff 2151
 MD5 e548a5df6315f902d96d5b2d5afc2901 files/digest-PyQt-3.11 69
+MD5 1ce3d5a83afb717de48efb8050e66a1a files/digest-PyQt-3.12 69
 MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
 MD5 cfa5b5c9a44fc587bc3937b2d1335bb9 files/digest-PyQt-3.5 68
 MD5 c5e3a3d6c377558ef966905f47c9c947 files/PyQt-3.8.1-qt-3.3.patch 280
diff --git a/dev-python/PyQt/PyQt-3.11.ebuild b/dev-python/PyQt/PyQt-3.11.ebuild
index 3ac594210c62..dab9e88ebdc2 100644
--- a/dev-python/PyQt/PyQt-3.11.ebuild
+++ b/dev-python/PyQt/PyQt-3.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.11.ebuild,v 1.2 2004/04/21 12:05:45 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.11.ebuild,v 1.3 2004/05/26 19:55:06 carlo Exp $
 
 inherit distutils
 
@@ -8,7 +8,7 @@ IUSE=""
 MY_P="PyQt-x11-gpl-${PV}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
-SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
 SLOT="0"
 LICENSE="GPL-2"
@@ -19,7 +19,7 @@ DEPEND="virtual/glibc
 	x11-libs/qt
 	dev-lang/python
 	>=dev-python/sip-3.10.1
-	>=dev-python/qscintilla-1.54"
+	<=dev-python/qscintilla-1.54"
 
 src_compile() {
 	distutils_python_version
diff --git a/dev-python/PyQt/PyQt-3.12.ebuild b/dev-python/PyQt/PyQt-3.12.ebuild
new file mode 100644
index 000000000000..3d35b20f792a
--- /dev/null
+++ b/dev-python/PyQt/PyQt-3.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.12.ebuild,v 1.1 2004/05/26 19:55:06 carlo Exp $
+
+inherit distutils
+
+IUSE="doc"
+
+MY_P="PyQt-x11-gpl-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+DEPEND="virtual/glibc
+	sys-devel/libtool
+	x11-libs/qt
+	dev-lang/python
+	>=dev-python/sip-3.10.2
+	<=dev-python/qscintilla-1.60"
+
+src_compile() {
+	distutils_python_version
+	addpredict ${QTDIR}/etc/settings
+	sed -i -e "s/  check_license()/# check_license()/" configure.py
+	python configure.py \
+		-d /usr/lib/python${PYVER}/site-packages \
+		-b /usr/bin \
+		-v /usr/share/sip \
+		-c
+	emake || die
+}
+
+src_install() {
+	einstall DESTDIR=${D} || die
+	dodoc ChangeLog LICENSE NEWS README README.Linux THANKS
+	use doc && ( dohtml doc/PyQt.html
+			dodir /usr/share/doc/${PF}/examples
+			cp -r examples3/* ${D}/usr/share/doc/${PF}/examples )
+}
diff --git a/dev-python/PyQt/PyQt-3.5.ebuild b/dev-python/PyQt/PyQt-3.5.ebuild
index db32c4cccf32..7f08f32a8a4c 100644
--- a/dev-python/PyQt/PyQt-3.5.ebuild
+++ b/dev-python/PyQt/PyQt-3.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.5.ebuild,v 1.9 2004/05/04 11:08:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.5.ebuild,v 1.10 2004/05/26 19:55:06 carlo Exp $
 
 inherit eutils
 
 S="${WORKDIR}/PyQt-x11-gpl-${PV}"
 DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
-SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-${PV}.tar.gz"
+SRC_URI="mirror://gentoo/PyQt-x11-gpl-${PV}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
 
 IUSE=""
diff --git a/dev-python/PyQt/PyQt-3.8.1.ebuild b/dev-python/PyQt/PyQt-3.8.1.ebuild
index 37928a51ed44..3e8737acc4a1 100644
--- a/dev-python/PyQt/PyQt-3.8.1.ebuild
+++ b/dev-python/PyQt/PyQt-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.8.1.ebuild,v 1.8 2004/05/25 13:22:45 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.8.1.ebuild,v 1.9 2004/05/26 19:55:06 carlo Exp $
 
 inherit distutils eutils
 
@@ -9,7 +9,6 @@ S="${WORKDIR}/PyQt-x11-gpl-${PV}"
 DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
 SRC_URI="mirror://gentoo/PyQt-x11-gpl-${PV}.tar.gz"
-#SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/PyQt/files/digest-PyQt-3.12 b/dev-python/PyQt/files/digest-PyQt-3.12
new file mode 100644
index 000000000000..f8c624feeda4
--- /dev/null
+++ b/dev-python/PyQt/files/digest-PyQt-3.12
@@ -0,0 +1 @@
+MD5 0869e68c24ee6e46ae74d3244e7ec299 PyQt-x11-gpl-3.12.tar.gz 760165