summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Tennis <caleb@gentoo.org>2006-05-30 12:05:31 +0000
committerCaleb Tennis <caleb@gentoo.org>2006-05-30 12:05:31 +0000
commit307bef62c03b7df90ab96b260c31ee5fa6caddd8 (patch)
treee50659de001e0dfdb9247ae425bf86cb26130efa /x11-libs
parentupdated opera license (diff)
downloadgentoo-2-307bef62c03b7df90ab96b260c31ee5fa6caddd8.tar.gz
gentoo-2-307bef62c03b7df90ab96b260c31ee5fa6caddd8.tar.bz2
gentoo-2-307bef62c03b7df90ab96b260c31ee5fa6caddd8.zip
Don't warn about nodoc anymore
(Portage version: 2.1_rc3-r2)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt/ChangeLog5
-rw-r--r--x11-libs/qt/qt-4.1.3.ebuild7
2 files changed, 5 insertions, 7 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index c7cf3cedd249..8fd4f12c23e5 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.324 2006/05/30 04:13:03 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.325 2006/05/30 12:05:31 caleb Exp $
+
+ 30 May 2006; Caleb Tennis <caleb@gentoo.org> qt-4.1.3.ebuild:
+ Don't warn about nodoc anymore
30 May 2006; Joseph Jezak <josejx@gentoo.org> qt-4.1.2.ebuild:
Marked ppc stable for bug #134341.
diff --git a/x11-libs/qt/qt-4.1.3.ebuild b/x11-libs/qt/qt-4.1.3.ebuild
index 58017f52e8cd..6c97ede01f66 100644
--- a/x11-libs/qt/qt-4.1.3.ebuild
+++ b/x11-libs/qt/qt-4.1.3.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.1.3.ebuild,v 1.2 2006/05/28 21:57:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.1.3.ebuild,v 1.3 2006/05/30 12:05:31 caleb Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -42,11 +42,6 @@ DEPEND="|| ( ( x11-libs/libXrandr
zlib? ( sys-libs/zlib )"
pkg_setup() {
- if has nodoc ${FEATURES}; then
- eerror "Qt-4 is incompatible with the 'nodoc' feature of portage. Please disable this feature and retry"
- die
- fi
-
QTBASEDIR=/usr/$(get_libdir)/qt4
QTPREFIXDIR=/usr
QTBINDIR=/usr/bin