Version bump

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

4 files changed, 132 insertions, 2 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index a65aaae771fd..e2508c9f534b 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.25 2009/06/01 22:28:49 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.26 2009/06/09 19:00:02 hwoarang Exp $
+
+*qscintilla-2.4 (09 Jun 2009)
+
+  09 Jun 2009; Markos Chandras <hwoarang@gentoo.org> +qscintilla-2.4.ebuild,
+  +files/qscintilla-2.4-designer.patch:
+  Version bump
 
   01 Jun 2009; Ben de Groot <yngwin@gentoo.org> qscintilla-2.3.2.ebuild:
   Move to EAPI=2, and add use dep
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index a2f37872e709..536e4d8a0608 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -4,11 +4,13 @@ AUX qscintilla-2.1-qt.patch 351 RMD160 99756fe8a0105c649c7666609625f942e2ff502c
 AUX qscintilla-2.1-qt4.patch 443 RMD160 d226eb16020ba1288e1b3c0fe418601f5134bd40 SHA1 14092204c892dbb19c1749ae629bf06944dc4cbb SHA256 0ca4ad564038c6241b80e3a48d444fd5431b478e964ab41100221580c8674a22
 AUX qscintilla-2.2-qt.patch 347 RMD160 8585ed1b9e525b57663ed5f4e0b0c6500e9b9a7d SHA1 8b97babbbd05ad7d22b1a93c105ac83eaf57ea02 SHA256 9ef628c4546be47ba1eb32e13f2d56c40c0b8c26ea6990b979bc5c73540c9545
 AUX qscintilla-2.2-qt4.patch 439 RMD160 4c97b91aa538fa2db7da3e0b7f0f99766e8f98ed SHA1 84a6e4cab7aaed4d7ffa3286e7e31809ba0367f2 SHA256 9996813f9c512bc702c85dea920351770becfbdc9034f7b4babad41de8eea14d
+AUX qscintilla-2.4-designer.patch 1042 RMD160 cfb80962caed15e4bb6c290edcc35d1acfc861a0 SHA1 d5586a13545be09e2d2126b6fcbef2f172470429 SHA256 af6c15f8cdc64041ddd692480d6bcc7d6c59aa7c1c5b963707b4d31e60288d78
 DIST QScintilla-1.71-gpl-1.7.1.tar.gz 1060119 RMD160 ba85db98e552b388510df5d1f7e0e78f52856ed2 SHA1 424415960e5cbcd58306e87d1d610bd8e72f3368 SHA256 437e5fc6e5905f9aa7d0f4ea8eb41c96fcddf7ce3cb9b786066a315c5b9ff70c
 DIST QScintilla-1.73-gpl-2.1.tar.gz 1866929 RMD160 ef114b468b3cea5d36346c915bc407ce2ad3ec65 SHA1 ca9ac61cc3d537d7b53202ff5d8565365c3f8734 SHA256 545fcefb75fe159b48e2a17485c12ba8ca548f387f594923664258b10831bf86
 DIST QScintilla-gpl-2.2.tar.gz 1873664 RMD160 8a1ad1dbad864d972259723cf308d2a779de346a SHA1 f570df8e7bcfc1281a477a21a12036023de6535a SHA256 307eef42f0f4910956f7260ab1f28752956b17af9014696a65660115cf3e7d37
 DIST QScintilla-gpl-2.3.2.tar.gz 2146902 RMD160 de7828d4b965156771034eb622ee9614b2aea9be SHA1 d34ae9907e6221d221c5b5c1324e9b263553d2cb SHA256 01318dd7745cf8d756683a60acf0f17f6c5c63edec0818f90c1c432d1bc27749
 DIST QScintilla-gpl-2.3.tar.gz 2126817 RMD160 9ecbc4d4ef9eddc1901152d4d0dcc08e7d704c01 SHA1 90c8c4b74e92b43fd8de350fe12f20c7f589e645 SHA256 43e051cb07b36b9cd455c781a421a8ed221a48d63455b6d00ea63be397be70c9
+DIST QScintilla-gpl-2.4.tar.gz 2304554 RMD160 19e5d5c331705c217c5192b1fcac5d298942db69 SHA1 17962bb64d2641f9e181b39fdca39228170488a3 SHA256 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
 DIST qscintilla-1.62-gpl-1.5.1.tar.gz 727606 RMD160 fe7fa31ec1ecbc7f4bbf887817830630dfbd5d88 SHA1 240bafd43f3f1f7c73f76daf98b23da3f071bc43 SHA256 5dfc860a8d91c15775ae03f40a57f0c26f51f90b8266236e457cb8cbb3f6e30e
 EBUILD qscintilla-1.5.1.ebuild 2059 RMD160 aba058df06336df7de6795a682a623bca8dfb8fb SHA1 42a32ef4eaac7264e3a9045e2eaa5ea5a77a78df SHA256 0a7fc83a53e1c43206367891168eb2eeb0d23437d6ec988b4e1ea618cbaaad9e
 EBUILD qscintilla-1.7.1.ebuild 2299 RMD160 99f53c4c41fc670e789f7ee55e5695adef29f3d3 SHA1 4a0b0e0aa66604d91d642082addc195684f51c9a SHA256 e3f092f98b44fde1a9de44a7ab2d6fa715206cd82e2967f46c311ed46ac37d59
@@ -16,5 +18,6 @@ EBUILD qscintilla-2.1-r1.ebuild 3899 RMD160 881eb02bfbd2980a65564d3d9d3523dc9b1d
 EBUILD qscintilla-2.2.ebuild 3857 RMD160 7e23a9df40d99c41466b56315948ed3f6759390c SHA1 2a8b689d0da65ff93770ad79b033f21409a90585 SHA256 51b4418cd951886be38dfa3b4907bf17346e7fca2b6cfc4cf535a43b33ba1c51
 EBUILD qscintilla-2.3.2.ebuild 3805 RMD160 d6d41d1213cc5ba0873a0c63fb40ba272a990637 SHA1 b92f0e444fca0696d9b4d9067b785a8ece6b2fb1 SHA256 57d00e7cd62d83a35c62aca509fb396f80dd0ab97ddf17e33da4dcf4535dc1f9
 EBUILD qscintilla-2.3.ebuild 3891 RMD160 c72559e488a59bc4c63a4354517389e9e1d13f56 SHA1 6bb488282ec3730136bead5adf1195cb0c5b42e0 SHA256 29a87b0e659ef37c16e3e2ba772328169629645a70049805e6592254586dd1ee
-MISC ChangeLog 14003 RMD160 61bf5e880a79a7a9fc5d0990e17fd13aad711c1b SHA1 54c89689db8be1a2dc8d8f108d90cc4e727f24dd SHA256 fdb01369b262dcf494b8a2bf32bc190b0518d98c85ada86657ffc5a6e185cc09
+EBUILD qscintilla-2.4.ebuild 2422 RMD160 b32b8788803d37587221a056042b54a93f17f2a4 SHA1 195df9c50c0a21d3b006e50ae0c3c9f3716fc7d5 SHA256 c9cc674ed1a5ecb6bc822239ec5980d7678922a1a8793c246ca2a9afb42e380b
+MISC ChangeLog 14169 RMD160 1e93b0c3dbde09a88c59cb75dacad0c224be3189 SHA1 48bba112d3587c2ffc6c016aea46a5ff75df0a4c SHA256 f8f6f60af5f93e4708be359f3226a5763bbbd9c5edd27f6cd2d596793581b018
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/x11-libs/qscintilla/files/qscintilla-2.4-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.4-designer.patch
new file mode 100644
index 000000000000..b4e7d2210c0a
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-2.4-designer.patch
@@ -0,0 +1,29 @@
+diff -Naur QScintilla-gpl-2.4.orig/designer-Qt3/designer.pro QScintilla-gpl-2.4/designer-Qt3/designer.pro
+--- QScintilla-gpl-2.4.orig/designer-Qt3/designer.pro	2009-06-07 21:55:35.000000000 +0200
++++ QScintilla-gpl-2.4/designer-Qt3/designer.pro	2009-06-07 22:01:14.000000000 +0200
+@@ -3,10 +3,13 @@
+ 
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+-DESTDIR = $(QTDIR)/plugins/designer
+ 
+ CONFIG += qt warn_on release plugin
+ 
+ SOURCES += qscintillaplugin.cpp
+ 
+-LIBS += -lqscintilla2
++target.path = $(QTDIR)/plugins/designer
++INSTALLS += target
++
++INCLUDEPATH = ../Qt3
++LIBS += -L../Qt3 -lqscintilla2
+diff -Naur QScintilla-gpl-2.4.orig/designer-Qt4/designer.pro QScintilla-gpl-2.4/designer-Qt4/designer.pro
+--- QScintilla-gpl-2.4.orig/designer-Qt4/designer.pro	2009-06-07 21:55:35.000000000 +0200
++++ QScintilla-gpl-2.4/designer-Qt4/designer.pro	2009-06-07 21:57:46.000000000 +0200
+@@ -12,4 +12,5 @@
+ target.path = $$[QT_INSTALL_PLUGINS]/designer
+ INSTALLS += target
+ 
+-LIBS += -lqscintilla2
++INCLUDEPATH = ../Qt4
++LIBS += -L../Qt4 -lqscintilla2
diff --git a/x11-libs/qscintilla/qscintilla-2.4.ebuild b/x11-libs/qscintilla/qscintilla-2.4.ebuild
new file mode 100644
index 000000000000..caa12e974f51
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.ebuild,v 1.1 2009/06/09 19:00:02 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils multilib qt3 qt4
+
+MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+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="doc python +qt4"
+
+RDEPEND="qt4? ( x11-libs/qt-gui:4 )
+	!qt4? ( x11-libs/qt:3 )"
+DEPEND="${RDEPEND}"
+# dev-python/PyQt needs qscintilla to build and qscintilla's python bindings
+# need dev-python/PyQt, bug 199543
+PDEPEND="python? ( ~dev-python/qscintilla-python-${PV}[qt4=] )"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}/${PN}-2.4-designer.patch" )
+
+src_configure() {
+	if use qt4; then
+		myqtver=4
+		myqtdir=/usr/share/qt4
+	else
+		myqtver=3
+		myqtdir=${QTDIR}
+	fi
+
+	cd "${S}"/Qt${myqtver}
+	eqmake${myqtver} qscintilla.pro
+
+	cd "${S}"/designer-Qt${myqtver}
+	eqmake${myqtver} designer.pro
+}
+
+src_compile() {
+	cd "${S}"/Qt${myqtver}
+	emake all staticlib || die "emake failed"
+
+	cd "${S}"/designer-Qt${myqtver}
+	emake || die "failed to build designer plugin"
+}
+
+src_install() {
+	cd "${S}"/Qt${myqtver}
+	# header files
+	insinto /usr/include/Qsci
+	doins Qsci/*.h || die
+	# libraries
+	dolib.so libqscintilla2.so* || die
+	dolib.a libqscintilla2.a || die
+	# translations
+	insinto /usr/share/${PN}/translations
+	doins qscintilla_*.qm || die
+	for trans in $(ls -1 qscintilla_*.qm); do
+		dosym /usr/share/${PN}/translations/${trans} \
+			${myqtdir}/translations/${trans} || die
+	done
+
+	# designer plugin
+	cd "${S}"/designer-Qt${myqtver}
+	emake INSTALL_ROOT="${D}" install || die "designer plugin installation failed"
+
+	# documentation
+	cd "${S}"
+	dodoc ChangeLog NEWS
+	if use doc; then
+		dohtml doc/html-Qt${myqtver}/* || die
+		insinto /usr/share/doc/${PF}/Scintilla
+		doins doc/Scintilla/* || die
+	fi
+}
+
+pkg_postinst() {
+	if use qt4; then
+		ewarn "Please remerge dev-python/PyQt4 if you have problems with eric or other"
+	else
+		ewarn "Please remerge dev-python/PyQt if you have problems with"
+	fi
+	ewarn "qscintilla related packages before submitting bug reports."
+}