summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/qt-assistant/ChangeLog6
-rw-r--r--x11-libs/qt-assistant/files/qt-assistant-4.6.3-tools.patch40
2 files changed, 5 insertions, 41 deletions
diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index c4ee335f6797..2227544d5c33 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/qt-assistant
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.146 2012/07/09 11:33:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.147 2012/07/09 12:09:38 johu Exp $
+
+ 09 Jul 2012; Johannes Huber <johu@gentoo.org>
+ -files/qt-assistant-4.6.3-tools.patch:
+ Remove old.
09 Jul 2012; Johannes Huber <johu@gentoo.org> -qt-assistant-4.6.3.ebuild:
Drop Qt-4.6.3
diff --git a/x11-libs/qt-assistant/files/qt-assistant-4.6.3-tools.patch b/x11-libs/qt-assistant/files/qt-assistant-4.6.3-tools.patch
deleted file mode 100644
index 7f5a54370abe..000000000000
--- a/x11-libs/qt-assistant/files/qt-assistant-4.6.3-tools.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: qt-everywhere-opensource-src-4.6.3/tools/tools.pro
-===================================================================
---- qt-everywhere-opensource-src-4.6.3.orig/tools/tools.pro
-+++ qt-everywhere-opensource-src-4.6.3/tools/tools.pro
-@@ -4,34 +4,9 @@ no-png {
- message("Some graphics-related tools are unavailable without PNG support")
- } else {
- SUBDIRS += assistant \
-- pixeltool \
-- porting \
-- qtestlib \
-- qttracereplay
-- contains(QT_EDITION, Console) {
-- SUBDIRS += designer/src/uitools # Linguist depends on this
-- } else {
-- SUBDIRS += designer
-- }
-- SUBDIRS += linguist
-- symbian: SUBDIRS = designer
-- wince*: SUBDIRS = qtestlib designer
-- unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
-- win32:!wince*:SUBDIRS += activeqt
-+ pixeltool
- }
-
--mac {
-- SUBDIRS += macdeployqt
--}
--
--embedded:SUBDIRS += kmap2qmap
--
--contains(QT_CONFIG, declarative):SUBDIRS += qmlviewer qmldebugger
--contains(QT_CONFIG, dbus):SUBDIRS += qdbus
--# We don't need these command line utilities on embedded platforms.
--!wince*:!symbian:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns xmlpatternsvalidator
--embedded: SUBDIRS += makeqpf
--
- !wince*:!cross_compile:SUBDIRS += qdoc3
-
- CONFIG+=ordered