Version bump and remove old.

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

5 files changed, 64 insertions, 94 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index 46a2f4edf28d..098fe53a8210 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.72 2012/05/23 04:46:39 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.73 2012/06/27 13:31:54 pesa Exp $
+
+*qscintilla-2.6.2 (27 Jun 2012)
+
+  27 Jun 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/qscintilla-2.6.2-designer.patch, +qscintilla-2.6.2.ebuild,
+  -qscintilla-2.4.6.ebuild, -qscintilla-2.6.ebuild:
+  Version bump and remove old.
 
   23 May 2012; Jeff Horelick <jdhore@gentoo.org> qscintilla-2.6.1.ebuild:
   marked x86 per bug 412929
@@ -588,4 +595,3 @@
   19 Dec 2002; Bart Verwilst <verwilst@gentoo.org>
 
   initial ebuild.
-
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 58f0299aa4f4..e2b56b0ed56e 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,13 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX qscintilla-2.4-designer.patch 1042 RMD160 cfb80962caed15e4bb6c290edcc35d1acfc861a0 SHA1 d5586a13545be09e2d2126b6fcbef2f172470429 SHA256 af6c15f8cdc64041ddd692480d6bcc7d6c59aa7c1c5b963707b4d31e60288d78
+AUX qscintilla-2.6.2-designer.patch 458 RMD160 2f5f14ba3be02ec84a27a9a4937948eda60c6799 SHA1 7733200f771d5a11a5a4048575cf088baf2b2d73 SHA256 bb73f63a41c86691058f10deb8d6429ed344c29613a2bb6b49e61ed6cc1c9b95
 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
 DIST QScintilla-gpl-2.5.1.tar.gz 2638790 RMD160 4cd5eaf87d831fa77212494e19624308dbd00900 SHA1 ff8eb7c49c949109abc434650f4b8215757574bd SHA256 982a3ea9cd42cd2bad65cd88c2cbf47c55397983ab11a7101215bca466ff9ac4
 DIST QScintilla-gpl-2.6.1.tar.gz 2657005 RMD160 f3e3eeb0ffb30f0a388309d46874983ff0ef8e3d SHA1 c68dbeaafb4f5dbe0d8200ae907cced0c7762e19 SHA256 34b7052b820dfedd4af897d6865d94e81a7aeb7f037f70f5516e9b0ea88afb63
-DIST QScintilla-gpl-2.6.tar.gz 2655263 RMD160 5a04e13b2642d5611b15e4a1e49a3021f5dc25f3 SHA1 f55dfc6804b2140a5c3e69bd85eb64caa1a5c2ce SHA256 21bc3c0b970935c5d45ea2493e629ea3740b0290be43fed37bb389c94aaa1f41
+DIST QScintilla-gpl-2.6.2.tar.gz 2662469 RMD160 ab123d98487f6c8565721127dd0e593e94ac3cde SHA1 6106c9e13983c086daf1fb0dba1180abed17588c SHA256 fac245ecfa11676b0003ef605489f87332c2efe039a4111821aec61bb936c264
 EBUILD qscintilla-2.4.5.ebuild 1662 RMD160 7807de99248f827a418b250baabd8f00655263d2 SHA1 f3a441e5332cb9ca4e8c244ff6109e4bc888b393 SHA256 3e5c5ae24fe0b3c7989f7ff10fb8475e90d558c99345877369d7ad2b5a74cf00
-EBUILD qscintilla-2.4.6.ebuild 1912 RMD160 fefadab9badab21f5a5a005d428471a9d9d6d151 SHA1 ac00ca7676d5ed3e67162765c472060e292e0110 SHA256 dc7c782332dc8fac64e2b774847f5625eeeb8d2c2bb51cbf8f810a367269e1c0
 EBUILD qscintilla-2.5.1.ebuild 1908 RMD160 04add00bf9df5d241047ce05641ba0caea0867ea SHA1 72fa632e35fd644971ce3b22965f6caef63bf1d1 SHA256 18b5c8d826bf7775c8f4b51bab5468fd57a710e834da11f5c932aa8bfdab2418
 EBUILD qscintilla-2.6.1.ebuild 1912 RMD160 4f07847257ef4482d4ae5a46a0e8534ab311672c SHA1 892fc92f2a3f685e2f7fa1d6816166a4629e0687 SHA256 5e94d59fca0782ce0c6ce431971870805b5b744a0aef02fa8ca9da1254de8923
-EBUILD qscintilla-2.6.ebuild 1910 RMD160 4c99f9f8c1fa017587b2fa52fd7199cdae096bfb SHA1 fb9a5a89b2228156631914f2de91d7c449f81436 SHA256 15629b40b41d960fc7a83a5265977d488134bdbbc77491654a54228eb96e1136
-MISC ChangeLog 20094 RMD160 cb0fa8173e72cd3440e5ad995963da95441814aa SHA1 72f801265283598e9dd813cf7b7d9b97990377ba SHA256 d1ac346b20d742b31c1bb260498cffcf902fdac33161300ea5f9cf7a3766d8b6
+EBUILD qscintilla-2.6.2.ebuild 1643 RMD160 f165feeefd5f3d92658502c7e3baeb20dd86b1fe SHA1 d865436e9bed6e531e6438db7a0a1ea1b0df869c SHA256 650825cc46c3b41bafa4efb0543da53dab5a984784f40fcea855fe8c3bdd9887
+MISC ChangeLog 20326 RMD160 32a82b962e72a0f2fcda04dbd372026b6479f631 SHA1 3e65eef0d1bafa052c8f2cb0fa029171107bcf68 SHA256 d5fc4356aabcc257857084ece2c87ec448e2a352b98412ed98b3fbf632fc2746
 MISC metadata.xml 175 RMD160 74ecde8b999da503a2733b49ed618d5d50d26476 SHA1 ec86e15b85c2bc4429ad67bb52238b44f2b16cbd SHA256 26b18db06b1665422af8905fb70f8f48920a048578172d62b9689e273ee39a2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJP6wtPAAoJENXLsxwXqFxy+9cP/0sYAek9xLt8ZOjgCl3TDIka
+t0S4ogVN8gwvVlIZlgJHBDawXmhEQJrME1XBMEfx72HDH7Cp7Szxs+AB9pySVvMg
+PllDbejIDdMT7jSQQq40FVW6EV/inof8HRrQLgsVYaw8dZhTvmzse3i7RWSLB7xd
+XD8cnN3e8P2ek7aiF42T4wsMJucKjEjlSjqFo0Rk3fHUBDbAT+wMLTg9ko3/6G8m
+7g4uTOT1sOjPMo+21VUZa6TaQtUhUtS/V1u9XMU+IbQtNDk+qdYUeu9d6eVK1mlh
+CeuOdIKmWBRCkwYXg2vigfCVZbMl7LM7m4+vRr7/FGo9DKnLz1tLN4whe+sd060F
+W15+xJzYZuY5MJYRN4ISZvaErbZykf2+xpefF1zDhMuO+xmnohFvXPJ+pbBfPVrT
+qGhPHBq5Ni1X1SfdhF79O8SK0mT8yqxTpmqy8sxVoj21QIhH/5zbQrLmMP8HNkB8
+9jig7UUr0YNt/kivzKR/kjJL+otfAdYksngNK/CrRirUJPd/w1nQ6t6M15a79vP5
+hGg9PaOt9VyuIj5i7FuNqXBP5wa3JDB4eQefEiqS351Qiz9YUCdWsq60Kxjrj3JG
+PqjNZ/FfcmS2EnAc47qIQiOpKyju3B/FfTPM5vc4FBRcTyONhk/lkvgcokXyw9Tu
+saWZuAj4wjNxOxwgOoCQ
+=/9O5
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qscintilla/files/qscintilla-2.6.2-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.6.2-designer.patch
new file mode 100644
index 000000000000..978d068937da
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-2.6.2-designer.patch
@@ -0,0 +1,10 @@
+diff -urN QScintilla-gpl-2.6.2.orig/designer-Qt4/designer.pro QScintilla-gpl-2.6.2/designer-Qt4/designer.pro
+--- QScintilla-gpl-2.6.2.orig/designer-Qt4/designer.pro	2012-06-27 15:22:31.980241792 +0200
++++ QScintilla-gpl-2.6.2/designer-Qt4/designer.pro	2012-06-27 15:23:39.802393898 +0200
+@@ -12,4 +12,5 @@
+ target.path = $$[QT_INSTALL_PLUGINS]/designer
+ INSTALLS += target
+ 
+-LIBS += -lqscintilla2
++INCLUDEPATH = ../Qt4Qt5
++LIBS += -L../Qt4Qt5 -lqscintilla2
diff --git a/x11-libs/qscintilla/qscintilla-2.4.6.ebuild b/x11-libs/qscintilla/qscintilla-2.4.6.ebuild
deleted file mode 100644
index d1cd74da894d..000000000000
--- a/x11-libs/qscintilla/qscintilla-2.4.6.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 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.2 2012/03/25 18:05:49 pesa 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"
-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
-}
diff --git a/x11-libs/qscintilla/qscintilla-2.6.ebuild b/x11-libs/qscintilla/qscintilla-2.6.2.ebuild
index b1ec276c851a..6ed9f94c556f 100644
--- a/x11-libs/qscintilla/qscintilla-2.6.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.6.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.6.ebuild,v 1.2 2012/03/25 18:05:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.6.2.ebuild,v 1.1 2012/06/27 13:31:54 pesa Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit qt4-r2
 
-MY_P="QScintilla-gpl-${PV/_pre/-snapshot-}"
+MY_P=QScintilla-gpl-${PV}
 
 DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
@@ -17,16 +17,21 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc python"
 
-DEPEND="x11-libs/qt-gui:4"
+DEPEND="
+	x11-libs/qt-core:4
+	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")
+PATCHES=(
+	"${FILESDIR}/${PN}-2.6.2-designer.patch"
+)
 
 src_configure() {
-	pushd Qt4 > /dev/null
+	pushd Qt4Qt5 > /dev/null
 	einfo "Configuration of qscintilla"
 	eqmake4 qscintilla.pro
 	popd > /dev/null
@@ -38,33 +43,33 @@ src_configure() {
 }
 
 src_compile() {
-	pushd Qt4 > /dev/null
+	pushd Qt4Qt5 > /dev/null
 	einfo "Building of qscintilla"
-	emake || die "Building of qscintilla failed"
+	emake
 	popd > /dev/null
 
 	pushd designer-Qt4 > /dev/null
 	einfo "Building of designer plugin"
-	emake || die "Building of designer plugin failed"
+	emake
 	popd > /dev/null
 }
 
 src_install() {
-	pushd Qt4 > /dev/null
+	pushd Qt4Qt5 > /dev/null
 	einfo "Installation of qscintilla"
-	emake INSTALL_ROOT="${D}" install || die "Installation of qscintilla failed"
+	emake INSTALL_ROOT="${D}" install
 	popd > /dev/null
 
 	pushd designer-Qt4 > /dev/null
 	einfo "Installation of designer plugin"
-	emake INSTALL_ROOT="${D}" install || die "Installation of designer plugin failed"
+	emake INSTALL_ROOT="${D}" install
 	popd > /dev/null
 
-	dodoc NEWS || die "dodoc failed"
+	dodoc NEWS
+
 	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"
+		dohtml doc/html-Qt4Qt5/*
+		insinto /usr/share/doc/${PF}
+		doins -r doc/Scintilla
 	fi
 }