[gentoo-commits] gentoo-x86 commit in dev-util/kscope: kscope-1.9.4.ebuild ChangeLog

[Markos Chandras (hwoarang)]

hwoarang    10/02/01 17:48:02

  Modified:             kscope-1.9.4.ebuild ChangeLog
  Log:
  Various clean up and installation fixes based on new qscintilla installation paths
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  dev-util/kscope/kscope-1.9.4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kscope/kscope-1.9.4.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kscope/kscope-1.9.4.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kscope/kscope-1.9.4.ebuild?r1=1.4&r2=1.5

Index: kscope-1.9.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/kscope/kscope-1.9.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kscope-1.9.4.ebuild	2 Jan 2010 21:05:10 -0000	1.4
+++ kscope-1.9.4.ebuild	1 Feb 2010 17:48:01 -0000	1.5
@@ -1,9 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/kscope-1.9.4.ebuild,v 1.4 2010/01/02 21:05:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/kscope-1.9.4.ebuild,v 1.5 2010/02/01 17:48:01 hwoarang Exp $
 
 EAPI=2
-inherit multilib qt4
+
+inherit multilib qt4-r2
 
 DESCRIPTION="Source Editing Environment for KDE"
 HOMEPAGE="http://kscope.sourceforge.net/"
@@ -19,20 +20,17 @@
 	x11-libs/qscintilla"
 DEPEND="${RDEPEND}"
 
-MAKEOPTS="${MAKEOPTS} -j1"
+DOCS="ChangeLog"
 
 src_prepare() {
 	sed -i -e "s:/usr/local:/usr:" config || die
 	sed -i \
+		-e "s:\$\${QSCI_ROOT_PATH}/include/Qsci:& /usr/include/qt4/Qsci:g" \
+		-e "s:\$\${QSCI_ROOT_PATH}/lib:& -L/usr/lib/qt4:g" \
 		-e "s:/lib:/$(get_libdir):g" \
-		core/core.pro cscope/cscope.pro editor/editor.pro || die
-}
-
-src_configure() {
-	eqmake4 ${PN}.pro
-}
+		app/app.pro core/core.pro cscope/cscope.pro editor/editor.pro \
+		|| die
 
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die
-	dodoc ChangeLog
+	# fix build failure with parallel make
+	echo "CONFIG += ordered" >> kscope.pro
 }



1.50                 dev-util/kscope/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kscope/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kscope/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/kscope/ChangeLog?r1=1.49&r2=1.50

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/kscope/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog	2 Jan 2010 21:05:10 -0000	1.49
+++ ChangeLog	1 Feb 2010 17:48:01 -0000	1.50
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kscope
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/ChangeLog,v 1.49 2010/01/02 21:05:10 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kscope/ChangeLog,v 1.50 2010/02/01 17:48:01 hwoarang Exp $
+
+  01 Feb 2010; Markos Chandras <hwoarang@g.o> kscope-1.9.4.ebuild:
+  Various clean up and installation fixes based on new qscintilla
+  installation paths
 
   02 Jan 2010; Ben de Groot <yngwin@g.o> kscope-1.9.4.ebuild:
   Drop no longer needed use dep on qt4