Version bump

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 80 insertions, 2 deletions

diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index dc749fdfcda5..057f4ed9ab3d 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,4 +1,6 @@
 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
-MISC ChangeLog 13905 RMD160 667346c736fec563d7d29e8fb4831d2774b13a48 SHA1 68e0667e9a62aeda9435aa35c9b719eee9689894 SHA256 6a40e6b747a210b1c0b9ad29a7b161e4a76dceb7d42cad0e19ee4ab9f7d22ab9
+EBUILD PyQt-3.18.ebuild 1507 RMD160 5d6194c08ac4009a1ed559b6f0d58670aa1dcef1 SHA1 fdb7524a4a514a85632daae7ec434e9a9ff60734 SHA256 e905befaf27b1573be3669d8b06a3e496e3d6aa05eaf6a39ef11bcf1871aa85e
+MISC ChangeLog 14021 RMD160 77a7de3e6bca3f340ca13a40233188a1c0e18bf4 SHA1 6b7a9e78a3bbd5da0bff60e9b0660deb44a51ea2 SHA256 355068ce80f3f02900966df102ec41c3ef947cfee855e3f3e0f58877d5654b77
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/dev-python/qscintilla-python/ChangeLog b/dev-python/qscintilla-python/ChangeLog
index c60f9d725a14..6db07f974184 100644
--- a/dev-python/qscintilla-python/ChangeLog
+++ b/dev-python/qscintilla-python/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/qscintilla-python
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.23 2009/06/01 22:10:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/ChangeLog,v 1.24 2009/06/09 19:03:20 hwoarang Exp $
+
+*qscintilla-python-2.4 (09 Jun 2009)
+
+  09 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
+  +qscintilla-python-2.4.ebuild, +files/qscintilla-python-2.4-nostrip.patch:
+  Version bump
 
   01 Jun 2009; Ben de Groot <yngwin@gentoo.org>
   qscintilla-python-2.3.2-r1.ebuild:
diff --git a/dev-python/qscintilla-python/files/qscintilla-python-2.4-nostrip.patch b/dev-python/qscintilla-python/files/qscintilla-python-2.4-nostrip.patch
new file mode 100644
index 000000000000..aa5f88a1e756
--- /dev/null
+++ b/dev-python/qscintilla-python/files/qscintilla-python-2.4-nostrip.patch
@@ -0,0 +1,22 @@
+--- Python/configure.py.orig	2009-05-13 23:54:57.000000000 +0200
++++ Python/configure.py	2009-05-13 23:56:26.000000000 +0200
+@@ -276,7 +276,8 @@
+             installs=installs,
+             static=opts.static,
+             debug=opts.debug,
+-            universal=pyqt.universal
++            universal=pyqt.universal,
++            strip=0
+         )
+     else:
+         makefile = Makefile(
+@@ -285,7 +286,8 @@
+             install_dir=opts.qscimoddir,
+             installs=installs,
+             static=opts.static,
+-            debug=opts.debug
++            debug=opts.debug,
++            strip=0
+         )
+
+     if qsci_define:
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild
new file mode 100644
index 000000000000..eee5996bfd71
--- /dev/null
+++ b/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.4.ebuild,v 1.1 2009/06/09 19:03:20 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils multilib python
+
+MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
+
+DESCRIPTION="Python bindings for Qscintilla"
+HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
+SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug +qt4"
+
+DEPEND=">=dev-python/sip-4.8
+	~x11-libs/qscintilla-${PV}[qt4=]
+	qt4? ( >=dev-python/PyQt4-4.5 )
+	!qt4? ( >=dev-python/PyQt-3.18 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}/Python
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4-nostrip.patch
+}
+
+src_configure() {
+	python_version
+
+	local myconf="${python} configure.py
+			--destdir=$(python_get_sitedir)/PyQt$(use qt4 && echo 4)
+			-n /usr/include
+			-o /usr/$(get_libdir)
+			-p $(use qt4 && echo 4 || echo 3)
+			$(use debug && echo '--debug')"
+	echo ${myconf}
+	${myconf} || die "configuration failed"
+}
+
+src_install() {
+	python_need_rebuild
+	emake DESTDIR="${D}" install || die "emake install failed"
+}