Version bump

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

3 files changed, 93 insertions, 2 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index f83a9b453a49..1639bee1f187 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,11 @@
 # 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.41 2010/01/17 23:11:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.42 2010/01/21 21:14:38 hwoarang Exp $
+
+*qscintilla-2.4.2 (21 Jan 2010)
+
+  21 Jan 2010; <hwoarang@gentoo.org> +qscintilla-2.4.2.ebuild:
+  Version bump
 
   17 Jan 2010; Ben de Groot <yngwin@gentoo.org> qscintilla-2.4.1.ebuild:
   Add some einfo messages to prevent confusing output.
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 43f5c328626a..cc14f8d3ae2c 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -2,9 +2,11 @@ AUX qscintilla-1.7.1.patch 398 RMD160 ebbd518a1bf6068f143fa902390ab772feea9627 S
 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-gpl-2.4.1.tar.gz 2365084 RMD160 489d01c29e93d6d52085254c8431734fa601eab3 SHA1 5b263eee02ac0303bed362c9311acf975aea66c1 SHA256 488b28970edb5e3f807fc506deebc38140dee06ded6d7a4375e763eed24860b5
+DIST QScintilla-gpl-2.4.2.tar.gz 2367724 RMD160 a0a9d6a187b95a1ed5f6128caaf0d07140f9f658 SHA1 17852eedaf3dfc8e8af32249d72130ddd3564019 SHA256 42c9868c355a8feab5e404353693cabc11ec5fa1e0b306c714d893f21e495d73
 DIST QScintilla-gpl-2.4.tar.gz 2304554 RMD160 19e5d5c331705c217c5192b1fcac5d298942db69 SHA1 17962bb64d2641f9e181b39fdca39228170488a3 SHA256 0497fef84763c6d8cbce570401f7ca38e439a76ee358e3050f8dada85adfb213
 EBUILD qscintilla-1.7.1.ebuild 2300 RMD160 96542d9c579ef2e81ea8ef1f893c0445a83fb136 SHA1 f0aa09572e6933dffd436c30547b4e4e68030154 SHA256 5d5a6b12c2dba8d784ddba803ada081312ccb144202fc6d18d80ca67a6213a23
 EBUILD qscintilla-2.4.1.ebuild 2097 RMD160 ce6c3ccac21ed916b85f0756cfb85cbeb5cc5ec3 SHA1 70d3bcfce860855c905e5a07dc09efe2c3f72d61 SHA256 c550e6dc43ad85bd6da9a28d0a295bfbf50a0287b7fa6fefb9d6964cd19a4260
+EBUILD qscintilla-2.4.2.ebuild 2099 RMD160 af10f252a973e95b44c202c451373cff2d38a638 SHA1 9e0fcc3dedd2f9662b5afd3cb51f330da2dbbfc6 SHA256 939775bb92b3512763dfc28c34875c7095a29dd95270d23e50aa205d7575e920
 EBUILD qscintilla-2.4.ebuild 2094 RMD160 93ed0b11045e66282e969ed702a3d72b0cff09fb SHA1 9cd4c0de6a1708cca0951ebd3e9597ba66878a39 SHA256 e50de8c269ba9d8cb247eef2e8120d49df22769d7b26966aaa17abb10576366b
-MISC ChangeLog 16158 RMD160 a70c49349c01cc6473a626793a9b482ddf89da7c SHA1 6492a75cfe610ebe48097438c8810f8f6f2693f2 SHA256 ee3ea283b33ea959d9136f0dc69e671dcdb1bc3f08922114e84866a3e38a8a9b
+MISC ChangeLog 16272 RMD160 a228e08441887965b956a61b4c302c42e3056a63 SHA1 6ca6469dc367e0702faf56d1af0afb444d06caa3 SHA256 a7d95a044412b9dc11bc69ed72089a1cdf47a22878b7691fb82351ebe6abaea7
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
diff --git a/x11-libs/qscintilla/qscintilla-2.4.2.ebuild b/x11-libs/qscintilla/qscintilla-2.4.2.ebuild
new file mode 100644
index 000000000000..a6c9beb2ed9c
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.4.2.ebuild
@@ -0,0 +1,84 @@
+# 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.2.ebuild,v 1.1 2010/01/21 21:14:38 hwoarang Exp $
+
+EAPI="2"
+
+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 ~hppa ~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() {
+	cd "${S}"/Qt4
+	einfo "Configuring qscintilla"
+	eqmake4 qscintilla.pro
+
+	cd "${S}"/designer-Qt4
+	einfo "Configuring designer plugin"
+	eqmake4 designer.pro
+}
+
+src_compile() {
+	cd "${S}"/Qt4
+	einfo "Building qscintilla"
+	emake all staticlib || die "emake failed"
+
+	cd "${S}"/designer-Qt4
+	einfo "Building designer plugin"
+	emake || die "failed to build designer plugin"
+}
+
+src_install() {
+	cd "${S}"/Qt4
+
+	# 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
+	for trans in qscintilla_*.qm; do
+		doins ${trans} || die
+		dosym /usr/share/${PN}/translations/${trans} \
+			/usr/share/qt4/translations/${trans} || die
+	done
+
+	# designer plugin
+	cd "${S}"/designer-Qt4
+	emake INSTALL_ROOT="${D}" install || die "designer plugin installation failed"
+
+	# documentation
+	cd "${S}"
+	dodoc ChangeLog NEWS
+	if use doc; then
+		dohtml doc/html-Qt4/* || die
+		insinto /usr/share/doc/${PF}/Scintilla
+		doins doc/Scintilla/* || die
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Please remerge dev-python/PyQt4 if you have problems with eric or other"
+	ewarn "qscintilla related packages before submitting bug reports."
+}