Version bump.

Package-Manager: portage-2.2.0_alpha10_p5/cvs/Linux x86_64

3 files changed, 80 insertions, 2 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 80baf0b1e388..252f9a1067a1 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.56 2010/12/19 18:59:29 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.57 2010/12/24 17:15:24 arfrever Exp $
+
+*qscintilla-2.4.6 (24 Dec 2010)
+
+  24 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +qscintilla-2.4.6.ebuild:
+  Version bump.
 
   19 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -qscintilla-2.4.ebuild:
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 6581b6a9fbd9..e92b3b57154a 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,7 +1,9 @@
 AUX qscintilla-2.4-designer.patch 1042 RMD160 cfb80962caed15e4bb6c290edcc35d1acfc861a0 SHA1 d5586a13545be09e2d2126b6fcbef2f172470429 SHA256 af6c15f8cdc64041ddd692480d6bcc7d6c59aa7c1c5b963707b4d31e60288d78
 DIST QScintilla-gpl-2.4.3.tar.gz 2368919 RMD160 a6272cb36d60e43e1bca8973c64513282e1d80f8 SHA1 772bb3cfca8716e035f2cdc4536d5d8025b855a8 SHA256 a61deeded122ba83e8fea53fefad2f18b4d6a32d8b04ea28e3699ea3b6b60aa9
 DIST QScintilla-gpl-2.4.5.tar.gz 2372380 RMD160 d96cf05c879f314ee828ec6a1609bd1864692bd6 SHA1 2401c2214ba0377ad61855c0fac6f6c7c95801d6 SHA256 cd73960e3c93e84b013cd5ec350f4a2810e3b95d9506083acf3608f7ccf43c09
+DIST QScintilla-gpl-2.4.6.tar.gz 2442792 RMD160 b48880e3e0fa0d285f04bf7ceb509f509d684929 SHA1 0527feedf74186a02ca0757d71be0c790149f674 SHA256 ad4dcc34922358aab8b0ce643e38e12188b41d00a87513ebfd2d6186c5824eab
 EBUILD qscintilla-2.4.3.ebuild 1671 RMD160 53fe3c587a25bac824d482accc5a4a99be0677cd SHA1 b72eed0a02fb5b123f541cb38c5e19be7d93374b SHA256 b17a1c02046014e79e91169ec254f4b927d0372e6ed53d6c8a2b083dd96c7b33
 EBUILD qscintilla-2.4.5.ebuild 1678 RMD160 859b579b2c7af7de4153db6e860ccec35f0e1db0 SHA1 542bdbc45d903d0b43715a0a74ba9f9b0e59bef2 SHA256 ee9c7a3d7e5a660cf0b4f23f7d0ae0e972634a24305ae6d5faea84664232f6c7
-MISC ChangeLog 18073 RMD160 d2bd919010680bec2de0e05790910a28c48fd28f SHA1 14b60416f3de97661317589a08f34ad189180977 SHA256 624355bc088cc57948427be774fd2fe5d74df897cf2e5fd4c32225ddef3bc003
+EBUILD qscintilla-2.4.6.ebuild 1926 RMD160 310d02202cd8be508a393e7b58f76bec881a72af SHA1 f5e2b991b9944af86fe4b9fbb1c549d55c91531e SHA256 602ddb0e94e7c9f8767f7b56b10854faa55a8fcac6f7d0b6ec6ba91843dd3a5a
+MISC ChangeLog 18224 RMD160 bc0b332aaf34c67aeea3a4d821cd9bcf3a6fe5fb SHA1 4b1b3e8a8b5c39bd22855663919139d4125e6864 SHA256 d720ac4452a84120519946ab6080c7f368d1e31b7a270baadbeb7274bb7106de
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/x11-libs/qscintilla/qscintilla-2.4.6.ebuild b/x11-libs/qscintilla/qscintilla-2.4.6.ebuild
new file mode 100644
index 000000000000..f123fc3150cc
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.4.6.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.4.6.ebuild,v 1.1 2010/12/24 17:15:24 arfrever Exp $
+
+EAPI="3"
+
+inherit qt4-r2
+
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc python"
+
+DEPEND="x11-libs/qt-gui:4"
+RDEPEND="${DEPEND}"
+PDEPEND="python? ( ~dev-python/qscintilla-python-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=("${FILESDIR}/${PN}-2.4-designer.patch")
+
+src_configure() {
+	pushd Qt4 > /dev/null
+	einfo "Configuration of qscintilla"
+	eqmake4 qscintilla.pro
+	popd > /dev/null
+
+	pushd designer-Qt4 > /dev/null
+	einfo "Configuration of designer plugin"
+	eqmake4 designer.pro
+	popd > /dev/null
+}
+
+src_compile() {
+	pushd Qt4 > /dev/null
+	einfo "Building of qscintilla"
+	emake || die "Building of qscintilla failed"
+	popd > /dev/null
+
+	pushd designer-Qt4 > /dev/null
+	einfo "Building of designer plugin"
+	emake || die "Building of designer plugin failed"
+	popd > /dev/null
+}
+
+src_install() {
+	pushd Qt4 > /dev/null
+	einfo "Installation of qscintilla"
+	emake INSTALL_ROOT="${D}" install || die "Installation of qscintilla failed"
+	popd > /dev/null
+
+	pushd designer-Qt4 > /dev/null
+	einfo "Installation of designer plugin"
+	emake INSTALL_ROOT="${D}" install || die "Installation of designer plugin failed"
+	popd > /dev/null
+
+	dodoc NEWS || die "dodoc failed"
+	if use doc; then
+		einfo "Installation of documentation"
+		dohtml doc/html-Qt4/* || die "dohtml failed"
+		insinto /usr/share/doc/${PF}/Scintilla
+		doins doc/Scintilla/* || die "doins failed"
+	fi
+}