Version bump.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

4 files changed, 36 insertions, 7 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index d3ffc531647b..04fc0651ec7d 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/qscintilla
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.100 2014/04/15 19:44:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.101 2014/07/18 19:50:08 pesa Exp $
+
+*qscintilla-2.8.3 (18 Jul 2014)
+
+  18 Jul 2014; Davide Pesavento <pesa@gentoo.org>
+  +files/qscintilla-2.8.3-designer.patch, +qscintilla-2.8.3.ebuild,
+  -qscintilla-2.8-r1.ebuild, metadata.xml:
+  Version bump.
 
   15 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> qscintilla-2.8-r1.ebuild:
   Keyword arm
diff --git a/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch
new file mode 100644
index 000000000000..1dbae09a51b4
--- /dev/null
+++ b/x11-libs/qscintilla/files/qscintilla-2.8.3-designer.patch
@@ -0,0 +1,18 @@
+This patch causes the designer plugin to be built against the just-built
+qscintilla, rather than trying to build against the system qscintilla
+which may not be installed yet.
+
+--- QScintilla-gpl-2.8.3.orig/designer-Qt4Qt5/designer.pro	2014-07-18 21:42:30.822408448 +0200
++++ QScintilla-gpl-2.8.3/designer-Qt4Qt5/designer.pro	2014-07-18 21:42:56.153048772 +0200
+@@ -4,7 +4,10 @@
+ TEMPLATE = lib
+ TARGET = qscintillaplugin
+ 
+-CONFIG += release plugin qscintilla2
++CONFIG += release plugin
++
++INCLUDEPATH += ../Qt4Qt5
++LIBS += -L../Qt4Qt5 -lqscintilla2
+ 
+ greaterThan(QT_MAJOR_VERSION, 4) {
+     QT += designer
diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index a789e7bbe9ee..2b23b45efd14 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
 <herd>qt</herd>
+<herd>python</herd>
 </pkgmetadata>
diff --git a/x11-libs/qscintilla/qscintilla-2.8-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.8.3.ebuild
index 62572a17141b..3d853399c422 100644
--- a/x11-libs/qscintilla/qscintilla-2.8-r1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.8.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8-r1.ebuild,v 1.3 2014/04/15 19:44:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.3.ebuild,v 1.1 2014/07/18 19:50:08 pesa Exp $
 
 EAPI=5
 
-inherit qt4-r2
+inherit eutils qmake-utils
 
 MY_P=QScintilla-gpl-${PV}
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0/11"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND="
@@ -27,11 +27,11 @@ RDEPEND="${DEPEND}"
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.7.1-designer.patch"
+	"${FILESDIR}/${PN}-2.8.3-designer.patch"
 )
 
 src_unpack() {
-	qt4-r2_src_unpack
+	default
 
 	# Sub-slot sanity check
 	local subslot=${SLOT#*/}
@@ -47,6 +47,10 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+}
+
 src_configure() {
 	pushd Qt4Qt5 > /dev/null
 	einfo "Configuration of qscintilla"