Version bump and remove old.

(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)

4 files changed, 40 insertions, 89 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/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
 }