summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2010-02-01 17:48:01 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2010-02-01 17:48:01 +0000
commitae4466d7e3c537c3382f0f954332de5d800c1319 (patch)
tree0a2393b15852610922963273fe4f7b3a7b0ff207 /dev-util/kscope
parentStable for HPPA too. (diff)
downloadhistorical-ae4466d7e3c537c3382f0f954332de5d800c1319.tar.gz
historical-ae4466d7e3c537c3382f0f954332de5d800c1319.tar.bz2
historical-ae4466d7e3c537c3382f0f954332de5d800c1319.zip
Various clean up and installation fixes based on new qscintilla installation paths
Package-Manager: portage-2.2_rc62/cvs/Linux x86_64
Diffstat (limited to 'dev-util/kscope')
-rw-r--r--dev-util/kscope/ChangeLog6
-rw-r--r--dev-util/kscope/Manifest4
-rw-r--r--dev-util/kscope/kscope-1.9.4.ebuild22
3 files changed, 17 insertions, 15 deletions
diff --git a/dev-util/kscope/ChangeLog b/dev-util/kscope/ChangeLog
index ad708ded6607..cb81d178a33d 100644
--- a/dev-util/kscope/ChangeLog
+++ b/dev-util/kscope/ChangeLog
@@ -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@gentoo.org> kscope-1.9.4.ebuild:
+ Various clean up and installation fixes based on new qscintilla
+ installation paths
02 Jan 2010; Ben de Groot <yngwin@gentoo.org> kscope-1.9.4.ebuild:
Drop no longer needed use dep on qt4
diff --git a/dev-util/kscope/Manifest b/dev-util/kscope/Manifest
index 6d622ec70906..b2d4c209606d 100644
--- a/dev-util/kscope/Manifest
+++ b/dev-util/kscope/Manifest
@@ -1,4 +1,4 @@
DIST kscope-1.9.4.tar.gz 127892 RMD160 a86bc524664390e6f3f076567370f4106542f4f4 SHA1 60b00601539367e60367ba9bd2532e7d8fbfee0c SHA256 7bd35960afa29026f8e0c4a827868e93b4d7c6e81796ceb89f086efbc24636df
-EBUILD kscope-1.9.4.ebuild 860 RMD160 06b2e2da81aefcfa89930a3ddcb19a515034ed4f SHA1 4d6da2f87a12d014853420096f19e1e0b9f36e43 SHA256 215efa99fa9ad714fa9ca1229f337ae18dba68b7d79ec6c2c1d7af70b9f1acd4
-MISC ChangeLog 6125 RMD160 a2a5008c458a084d0424499d587cc1b24b9b2a52 SHA1 cf0c66f771c1c7402a15bd4d642dcae82848b542 SHA256 7ab368156e7a1c333312a520a6242c050ed31712c81afc979482eaa979c6cd53
+EBUILD kscope-1.9.4.ebuild 961 RMD160 174ac02468c57e1cf5b523c83b614cb307d1710b SHA1 c0d2c468e80f702d9e081c3244120728b70cbc5d SHA256 092f539ecd056698269d407774de02a1fa1b48e9a76b2aba0ea0470fe42c3c2d
+MISC ChangeLog 6289 RMD160 fbd04c81df23aeeada7ca018f3867e523a1b23f8 SHA1 988aace48f8e5906b7c13641544c8e1e2e2f7533 SHA256 bad284110a4a37f6d796a6b7cbbc7a58b494ff69d9e8c9455b2922b386dd873d
MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/dev-util/kscope/kscope-1.9.4.ebuild b/dev-util/kscope/kscope-1.9.4.ebuild
index 986271c9f457..afae5ae5e833 100644
--- a/dev-util/kscope/kscope-1.9.4.ebuild
+++ b/dev-util/kscope/kscope-1.9.4.ebuild
@@ -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 @@ RDEPEND="x11-libs/qt-core:4
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
}