summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2009-02-14 23:53:26 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2009-02-14 23:53:26 +0000
commitb13f6ee37e6356301ba07f5d4e9a50cba661c31c (patch)
tree78841eb0e1603b461fbba764c0bdac8e0a18e4ad /x11-libs
parentRemove trailing spaces, fixing typo (diff)
downloadgentoo-2-b13f6ee37e6356301ba07f5d4e9a50cba661c31c.tar.gz
gentoo-2-b13f6ee37e6356301ba07f5d4e9a50cba661c31c.tar.bz2
gentoo-2-b13f6ee37e6356301ba07f5d4e9a50cba661c31c.zip
fixing src_prepare. Thanks to Arfrever
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-core/ChangeLog6
-rw-r--r--x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild10
2 files changed, 9 insertions, 7 deletions
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index da3c238434b3..1ecec07025b4 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qt-core
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.30 2009/02/14 23:00:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.31 2009/02/14 23:53:26 hwoarang Exp $
+
+ 14 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
+ qt-core-4.5.0_rc1.ebuild:
+ fixing src_prepare. Thanks to Arfrever
14 Feb 2009; Markos Chandras <hwoarang@gentoo.org>
qt-core-4.5.0_rc1.ebuild:
diff --git a/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild b/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
index e30af6ebae71..a211fb303442 100644
--- a/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
+++ b/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild,v 1.5 2009/02/14 23:00:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.5.0_rc1.ebuild,v 1.6 2009/02/14 23:53:26 hwoarang Exp $
EAPI="2"
inherit qt4-build
@@ -112,14 +112,12 @@ src_unpack() {
}
src_prepare(){
+ qt4-build_src_prepare
# bug #172219
- if use custom-cxxflags;then
- sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
- "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
- fi
+ sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+ "${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
- qt4-build_src_prepare
}
src_configure() {