diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2010-02-01 17:48:01 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2010-02-01 17:48:01 +0000 |
commit | c0d77340f3f7eb7ce68366fc01aeef25bec2eefc (patch) | |
tree | d1f93bf4891a5daf596cee64b9fb92343a8470cb /dev-util | |
parent | Stable for HPPA too. (diff) | |
download | gentoo-2-c0d77340f3f7eb7ce68366fc01aeef25bec2eefc.tar.gz gentoo-2-c0d77340f3f7eb7ce68366fc01aeef25bec2eefc.tar.bz2 gentoo-2-c0d77340f3f7eb7ce68366fc01aeef25bec2eefc.zip |
Various clean up and installation fixes based on new qscintilla installation paths
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/kscope/ChangeLog | 6 | ||||
-rw-r--r-- | dev-util/kscope/kscope-1.9.4.ebuild | 22 |
2 files changed, 15 insertions, 13 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/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 } |