Version bump for #107104

(Portage version: 2.0.52-r1)

9 files changed, 173 insertions, 20 deletions

diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index 60c137f3fb33..a45460c498d0 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.55 2005/04/21 18:56:51 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.56 2005/09/26 15:26:47 chrb Exp $
+
+*PyQt-3.15 (26 Sep 2005)
+
+  26 Sep 2005; Chris Bainbridge <chrb@gentoo.org> +PyQt-3.15.ebuild:
+  Version bump for #107104
 
   21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> PyQt-3.13.ebuild:
   Stable on ppc.
diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index ee7164b3a01f..2504a14979c8 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,18 +1,20 @@
-MD5 6398473d6e2090b0371a4ead4870faaa PyQt-3.14.ebuild 1735
-MD5 a02b919efb1b54d05c1ca87d5121b2d5 PyQt-3.14.1.ebuild 1737
+MD5 14bf5445e5e9fcef597da584baf64bfb ChangeLog 6749
+MD5 5839b01596e10f2cb747c3a15b56e5ae PyQt-3.11.ebuild 1472
 MD5 6d0db1c1bdefc35b47486d5e94c491a5 PyQt-3.12.ebuild 1175
-MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
-MD5 c09572c94845fc3ac1631e13afd92731 ChangeLog 6626
+MD5 cb24fd8fac577b864a59b281a4088cb2 PyQt-3.13-r1.ebuild 1740
 MD5 9c0aa7a56928e518d28c25f94c4bfa0e PyQt-3.13.ebuild 1520
-MD5 5839b01596e10f2cb747c3a15b56e5ae PyQt-3.11.ebuild 1472
+MD5 a02b919efb1b54d05c1ca87d5121b2d5 PyQt-3.14.1.ebuild 1737
+MD5 6398473d6e2090b0371a4ead4870faaa PyQt-3.14.ebuild 1735
+MD5 a02b919efb1b54d05c1ca87d5121b2d5 PyQt-3.15.ebuild 1737
 MD5 7ae8c9ca1c90ced05dea52063e8730a8 PyQt-3.8.1.ebuild 1652
-MD5 cb24fd8fac577b864a59b281a4088cb2 PyQt-3.13-r1.ebuild 1740
-MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13-r1 69
-MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
-MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13 69
-MD5 cd786c34663d5f5d09f27bb73551b6c9 files/digest-PyQt-3.14.1 71
+MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+MD5 c5e3a3d6c377558ef966905f47c9c947 files/PyQt-3.8.1-qt-3.3.patch 280
 MD5 e548a5df6315f902d96d5b2d5afc2901 files/digest-PyQt-3.11 69
-MD5 7323b7d1c141a1f065cb1b8646bec695 files/license-3.8.1.diff 960
 MD5 1ce3d5a83afb717de48efb8050e66a1a files/digest-PyQt-3.12 69
-MD5 c5e3a3d6c377558ef966905f47c9c947 files/PyQt-3.8.1-qt-3.3.patch 280
+MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13 69
+MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13-r1 69
 MD5 c24fadea19e9b29218b912e3ae2be0df files/digest-PyQt-3.14 69
+MD5 b40db534b17bda39b6adaf85b0003404 files/digest-PyQt-3.15 69
+MD5 7323b7d1c141a1f065cb1b8646bec695 files/license-3.8.1.diff 960
+MD5 cd786c34663d5f5d09f27bb73551b6c9 files/digest-PyQt-3.14.1 71
+MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
diff --git a/dev-python/PyQt/PyQt-3.15.ebuild b/dev-python/PyQt/PyQt-3.15.ebuild
new file mode 100644
index 000000000000..9d3199afe6a0
--- /dev/null
+++ b/dev-python/PyQt/PyQt-3.15.ebuild
@@ -0,0 +1,62 @@
+# 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.ebuild,v 1.1 2005/09/26 15:26:47 chrb 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"
+
+RDEPEND="virtual/libc
+	x11-libs/qt
+	dev-lang/python
+	>=dev-python/sip-4.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
+}
+
+src_compile() {
+	distutils_python_version
+	addpredict ${QTDIR}/etc/settings
+
+	local myconf="-d /usr/$(get_libdir)/python${PYVER}/site-packages -b /usr/bin \
+			-v /usr/share/sip -n /usr/include -o /usr/$(get_libdir)"
+	use debug && myconf="${myconf} -u"
+	has distcc ${FEATURES} || myconf="${myconf} -c"
+
+	if [ "$(echo $(free -m | grep Mem) | cut -d' ' -f2)" -lt "257" ] ; then
+		echo ""
+		einfo "Low on memory?! Use distcc or get a coffee. :)"
+		echo ""
+	fi
+
+	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
+	if use doc ; then
+		dohtml doc/PyQt.html
+		dodir /usr/share/doc/${PF}/examples
+		cp -r examples3/* ${D}/usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/PyQt/files/digest-PyQt-3.15 b/dev-python/PyQt/files/digest-PyQt-3.15
new file mode 100644
index 000000000000..90cc1dd2c9dd
--- /dev/null
+++ b/dev-python/PyQt/files/digest-PyQt-3.15
@@ -0,0 +1 @@
+MD5 8e70fac4f403fb759b537008170ff446 PyQt-x11-gpl-3.15.tar.gz 789772
diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index 331fcf260211..6831fb0d1668 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/qscintilla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.46 2005/08/18 18:51:05 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.47 2005/09/26 15:24:07 chrb Exp $
+
+*qscintilla-1.65 (26 Sep 2005)
+
+  26 Sep 2005; Chris Bainbridge <chrb@gentoo.org>
+  +files/qscintilla-1.65-sandbox.patch, +qscintilla-1.65.ebuild:
+  Version bump for #107104
 
   18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   qscintilla-1.5.1.ebuild:
diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index ad2c0fd3c201..a2a79bd43026 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,14 +1,17 @@
+MD5 eac55b282b9bf953b6ec5a3b067e6e9c ChangeLog 5894
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+MD5 a58f7a05c3ca36fe816b384fc8a426f9 qscintilla-1.5.1.ebuild 1902
 MD5 b31d285bc2996e4f58bf417fb5364aa0 qscintilla-1.54.ebuild 1063
 MD5 289dc572dec644ad8feb52b317834f8e qscintilla-1.60.ebuild 1259
-MD5 f1a311a356174553c558db8f7bccd621 ChangeLog 5719
 MD5 e15e08e9b7961e8f67815880840bc945 qscintilla-1.61.ebuild 1331
-MD5 a58f7a05c3ca36fe816b384fc8a426f9 qscintilla-1.5.1.ebuild 1902
-MD5 dc22cd37e5a193d127ad169db2cf6753 files/qscintilla-1.60-sandbox.patch 710
-MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
-MD5 e2ef183d503f0d553f92c182d655be67 files/qscintilla-1.61-sandbox.patch 710
-MD5 b3387e20eba70b27a4290523e89753e4 files/digest-qscintilla-1.5.1 77
+MD5 dd40e948596867dd94b5a52e2e924902 qscintilla-1.65.ebuild 1337
 MD5 367f1bef2c17aa8fbc890fa134776db0 files/digest-qscintilla-1.54 79
 MD5 a9d71d6103367fa01a62735815dbe6ca files/digest-qscintilla-1.60 75
 MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.61 75
+MD5 4f3a81db5affa3915e5d35de77364e97 files/digest-qscintilla-1.65 75
 MD5 bacbcf22f2420b5d982a6d04f171b44a files/qscintilla-1.5-sandbox.patch 1041
+MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
+MD5 dc22cd37e5a193d127ad169db2cf6753 files/qscintilla-1.60-sandbox.patch 710
+MD5 e2ef183d503f0d553f92c182d655be67 files/qscintilla-1.61-sandbox.patch 710
+MD5 f5f01b5ca1b6758b69a04a4897c0a370 files/qscintilla-1.65-sandbox.patch 710
+MD5 b3387e20eba70b27a4290523e89753e4 files/digest-qscintilla-1.5.1 77
diff --git a/dev-python/qscintilla/files/digest-qscintilla-1.65 b/dev-python/qscintilla/files/digest-qscintilla-1.65
new file mode 100644
index 000000000000..8438b423ec2e
--- /dev/null
+++ b/dev-python/qscintilla/files/digest-qscintilla-1.65
@@ -0,0 +1 @@
+MD5 8dbebef07cd2c934fbec3ee1bdfecfa3 qscintilla-1.65-gpl-1.6.tar.gz 821730
diff --git a/dev-python/qscintilla/files/qscintilla-1.65-sandbox.patch b/dev-python/qscintilla/files/qscintilla-1.65-sandbox.patch
new file mode 100644
index 000000000000..5b49c1685f41
--- /dev/null
+++ b/dev-python/qscintilla/files/qscintilla-1.65-sandbox.patch
@@ -0,0 +1,23 @@
+--- Makefile.orig	2005-09-26 16:18:10.808635240 +0000
++++ Makefile	2005-09-26 16:19:30.253557776 +0000
+@@ -370,7 +370,7 @@
+ QMAKE_TARGET = qscintilla
+ DESTDIR  = $(QTDIR)/lib/
+ TARGET   = libqscintilla.so.6.0.0
+-TARGETA	= $(QTDIR)/lib/libqscintilla.a
++TARGETA	= libqscintilla.a
+ TARGETD	= libqscintilla.so.6.0.0
+ TARGET0	= libqscintilla.so
+ TARGET1	= libqscintilla.so.6
+@@ -407,11 +407,6 @@
+ 	-ln -s $(TARGET) $(TARGET0)
+ 	-ln -s $(TARGET) $(TARGET1)
+ 	-ln -s $(TARGET) $(TARGET2)
+-	-$(DEL_FILE) $(QTDIR)/lib/$(TARGET)
+-	-$(DEL_FILE) $(QTDIR)/lib/$(TARGET0)
+-	-$(DEL_FILE) $(QTDIR)/lib/$(TARGET1)
+-	-$(DEL_FILE) $(QTDIR)/lib/$(TARGET2)
+-	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) $(QTDIR)/lib/
+ 
+ 
+ 
diff --git a/dev-python/qscintilla/qscintilla-1.65.ebuild b/dev-python/qscintilla/qscintilla-1.65.ebuild
new file mode 100644
index 000000000000..67f6c773eb56
--- /dev/null
+++ b/dev-python/qscintilla/qscintilla-1.65.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.65.ebuild,v 1.1 2005/09/26 15:24:07 chrb Exp $
+
+inherit eutils
+
+MY_P=${P}-gpl-1.6
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class."
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64 ~ppc64"
+IUSE="doc"
+
+DEPEND="virtual/libc
+	sys-apps/sed
+	=x11-libs/qt-3*"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/qt
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
+	sed -i -e "s/CFLAGS   = -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" Makefile
+	sed -i -e "s/CXXFLAGS = -pipe -w -O2/CXXFLAGS = ${CXXFLAGS} -w/" Makefile
+	epatch ${FILESDIR}/${P}-sandbox.patch
+}
+
+src_compile() {
+	cd ${S}/qt
+	make all staticlib
+}
+
+src_install() {
+	dodoc ChangeLog LICENSE NEWS README
+	dodir ${QTDIR}/{include,translations,lib}
+	cd ${S}/qt
+	cp qextscintilla*.h ${D}/$QTDIR/include
+	cp qscintilla*.qm ${D}/$QTDIR/translations
+	cp libqscintilla.a* ${D}/$QTDIR/lib
+	cp -d libqscintilla.so.* ${D}/$QTDIR/lib
+	if use doc ; then
+		dohtml ${S}/doc/html/*
+		insinto /usr/share/doc/${PF}/Scintilla
+		doins ${S}/doc/Scintilla/*
+	fi
+}