summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-libs/qt/ChangeLog5
-rw-r--r--x11-libs/qt/qt-4.2.2.ebuild6
2 files changed, 6 insertions, 5 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 377782102339..dafff49fdbde 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-libs/qt
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.399 2006/12/04 20:32:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.400 2006/12/05 13:13:29 caleb Exp $
+
+ 05 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.2.ebuild:
+ Can just use -confirm-license now instead of saying yes to the prompt
04 Dec 2006; Caleb Tennis <caleb@gentoo.org> qt-4.2.2.ebuild:
Qt configuration seems to do a lot with pkgconfig, so we need to dep on it
diff --git a/x11-libs/qt/qt-4.2.2.ebuild b/x11-libs/qt/qt-4.2.2.ebuild
index 948434fe0593..3b3213944db4 100644
--- a/x11-libs/qt/qt-4.2.2.ebuild
+++ b/x11-libs/qt/qt-4.2.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.4 2006/12/04 20:32:24 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.2.ebuild,v 1.5 2006/12/05 13:13:29 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -109,8 +109,6 @@ src_unpack() {
# epatch ${FILESDIR}/qt4-parisc-linux.diff
epatch ${FILESDIR}/qt-4.1.4-sparc.patch
- sed -i -e 's:read acceptance:acceptance=yes:' configure
-
cd mkspecs/$(qt_mkspecs_dir)
# set c/xxflags and ldflags
@@ -174,7 +172,7 @@ src_compile() {
myconf="${myconf} -xrender -xrandr -xkb -xshape -sm"
- ./configure -stl -verbose -largefile \
+ ./configure -stl -verbose -largefile -confirm-license \
-platform ${PLATFORM} -xplatform ${PLATFORM} \
-prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \
-docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \