More complete fix for bug #466120. Thanks to Arfrever in comment #6.

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

3 files changed, 13 insertions, 33 deletions

diff --git a/x11-libs/qscintilla/ChangeLog b/x11-libs/qscintilla/ChangeLog
index a04c3037329b..a05177ed332d 100644
--- a/x11-libs/qscintilla/ChangeLog
+++ b/x11-libs/qscintilla/ChangeLog
@@ -1,6 +1,12 @@
 # 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.102 2014/09/13 01:07:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/ChangeLog,v 1.103 2014/09/21 13:39:23 pesa Exp $
+
+*qscintilla-2.8.4-r1 (21 Sep 2014)
+
+  21 Sep 2014; Davide Pesavento <pesa@gentoo.org> +qscintilla-2.8.4-r1.ebuild,
+  -files/qscintilla-2.8.4-designer.patch, -qscintilla-2.8.4.ebuild:
+  More complete fix for bug #466120. Thanks to Arfrever in comment #6.
 
 *qscintilla-2.8.4 (13 Sep 2014)
 
diff --git a/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch b/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch
deleted file mode 100644
index 5b5eacdfcdee..000000000000
--- a/x11-libs/qscintilla/files/qscintilla-2.8.4-designer.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This patch causes the designer plugin to be built against the just-built
-libqscintilla2.so, rather than trying to build against the system library
-which may either (a) not be installed yet, or (b) belong to an older
-installation and thus have a different soname (bug 466120).
-
-diff --git a/designer-Qt4Qt5/designer.pro b/designer-Qt4Qt5/designer.pro
-index e3432ff..2b7fa6a 100644
---- a/designer-Qt4Qt5/designer.pro
-+++ b/designer-Qt4Qt5/designer.pro
-@@ -4,7 +4,11 @@
- TEMPLATE = lib
- TARGET = qscintillaplugin
- 
--CONFIG += release plugin qscintilla2
-+CONFIG += release plugin
-+
-+INCLUDEPATH  += ../Qt4Qt5
-+QMAKE_LIBDIR += ../Qt4Qt5
-+LIBS         += -lqscintilla2
- 
- greaterThan(QT_MAJOR_VERSION, 4) {
-     QT += designer
diff --git a/x11-libs/qscintilla/qscintilla-2.8.4.ebuild b/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild
index 94aa85aff8bc..b0c96001edf3 100644
--- a/x11-libs/qscintilla/qscintilla-2.8.4.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.8.4-r1.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.4.ebuild,v 1.1 2014/09/13 01:07:02 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild,v 1.1 2014/09/21 13:39:23 pesa Exp $
 
 EAPI=5
 
-inherit eutils qmake-utils
+inherit flag-o-matic qmake-utils
 
 MY_P=QScintilla-gpl-${PV}
 
@@ -26,10 +26,6 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=(
-	"${FILESDIR}/${PN}-2.8.4-designer.patch"
-)
-
 src_unpack() {
 	default
 
@@ -47,16 +43,16 @@ src_unpack() {
 	fi
 }
 
-src_prepare() {
-	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
-}
-
 src_configure() {
 	pushd Qt4Qt5 > /dev/null
 	eqmake4
 	popd > /dev/null
 
 	if use designer; then
+		# prevent building against system version (bug 466120)
+		append-cxxflags -I../Qt4Qt5
+		append-ldflags -L../Qt4Qt5
+
 		pushd designer-Qt4Qt5 > /dev/null
 		eqmake4
 		popd > /dev/null