| 1 |
wired 10/11/09 09:12:02 |
| 2 |
|
| 3 |
Modified: qt-assistant-4.7.0.ebuild ChangeLog metadata.xml |
| 4 |
Log: |
| 5 |
added qt3support USE, fixes bug #342423 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha3/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: qt-assistant-4.7.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- qt-assistant-4.7.0.ebuild 1 Nov 2010 12:29:46 -0000 1.7 |
| 23 |
+++ qt-assistant-4.7.0.ebuild 9 Nov 2010 09:12:02 -0000 1.8 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2010 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild,v 1.7 2010/11/01 12:29:46 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.7.0.ebuild,v 1.8 2010/11/09 09:12:02 wired Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
inherit qt4-build |
| 32 |
@@ -8,13 +8,13 @@ |
| 33 |
DESCRIPTION="The assistant help module for the Qt toolkit" |
| 34 |
SLOT="4" |
| 35 |
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" |
| 36 |
-IUSE="compat doc +glib trace" |
| 37 |
+IUSE="compat doc +glib qt3support trace" |
| 38 |
SRC_URI+=" compat? ( ftp://ftp.qt.nokia.com/qt/source/${PN}-qassistantclient-library-compat-src-4.6.3.tar.gz )" |
| 39 |
|
| 40 |
-DEPEND="~x11-libs/qt-gui-${PV}[aqua=,glib=,trace?] |
| 41 |
- ~x11-libs/qt-sql-${PV}[aqua=,sqlite] |
| 42 |
+DEPEND="~x11-libs/qt-gui-${PV}[aqua=,glib=,qt3support=,trace?] |
| 43 |
+ ~x11-libs/qt-sql-${PV}[aqua=,qt3support=,sqlite] |
| 44 |
~x11-libs/qt-webkit-${PV}[aqua=] |
| 45 |
- ~x11-libs/qt-declarative-${PV}" |
| 46 |
+ ~x11-libs/qt-declarative-${PV}[qt3support=]" |
| 47 |
RDEPEND="${DEPEND}" |
| 48 |
|
| 49 |
pkg_setup() { |
| 50 |
@@ -66,7 +66,7 @@ |
| 51 |
-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng |
| 52 |
-no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon |
| 53 |
-no-xmlpatterns -no-freetype -no-libtiff -no-accessibility |
| 54 |
- -no-fontconfig -no-multimedia -no-qt3support -no-svg" |
| 55 |
+ -no-fontconfig -no-multimedia -no-svg $(qt_use qt3support)" |
| 56 |
! use glib && myconf="${myconf} -no-glib" |
| 57 |
qt4-build_src_configure |
| 58 |
} |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
1.98 x11-libs/qt-assistant/ChangeLog |
| 63 |
|
| 64 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.98&view=markup |
| 65 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.98&content-type=text/plain |
| 66 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.97&r2=1.98 |
| 67 |
|
| 68 |
Index: ChangeLog |
| 69 |
=================================================================== |
| 70 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v |
| 71 |
retrieving revision 1.97 |
| 72 |
retrieving revision 1.98 |
| 73 |
diff -u -r1.97 -r1.98 |
| 74 |
--- ChangeLog 5 Nov 2010 18:05:30 -0000 1.97 |
| 75 |
+++ ChangeLog 9 Nov 2010 09:12:02 -0000 1.98 |
| 76 |
@@ -1,6 +1,10 @@ |
| 77 |
# ChangeLog for x11-libs/qt-assistant |
| 78 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 79 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.97 2010/11/05 18:05:30 jer Exp $ |
| 80 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.98 2010/11/09 09:12:02 wired Exp $ |
| 81 |
+ |
| 82 |
+ 09 Nov 2010; Alex Alexander <wired@g.o> qt-assistant-4.7.0.ebuild, |
| 83 |
+ metadata.xml: |
| 84 |
+ added qt3support USE, fixes bug #342423 |
| 85 |
|
| 86 |
05 Nov 2010; Jeroen Roovers <jer@g.o> qt-assistant-4.5.3.ebuild, |
| 87 |
qt-assistant-4.6.2.ebuild, qt-assistant-4.6.2-r2.ebuild, |
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
1.9 x11-libs/qt-assistant/metadata.xml |
| 92 |
|
| 93 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/metadata.xml?rev=1.9&view=markup |
| 94 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/metadata.xml?rev=1.9&content-type=text/plain |
| 95 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-assistant/metadata.xml?r1=1.8&r2=1.9 |
| 96 |
|
| 97 |
Index: metadata.xml |
| 98 |
=================================================================== |
| 99 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/metadata.xml,v |
| 100 |
retrieving revision 1.8 |
| 101 |
retrieving revision 1.9 |
| 102 |
diff -u -r1.8 -r1.9 |
| 103 |
--- metadata.xml 9 Oct 2010 20:26:38 -0000 1.8 |
| 104 |
+++ metadata.xml 9 Nov 2010 09:12:02 -0000 1.9 |
| 105 |
@@ -8,6 +8,8 @@ |
| 106 |
http://labs.qt.nokia.com/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/</flag> |
| 107 |
<flag name='exceptions'>Add support for exceptions - like catching them |
| 108 |
inside the event loop (recommended by Nokia)</flag> |
| 109 |
+ <flag name='qt3support'>Enable the Qt3Support libraries for Qt4. Note that |
| 110 |
+ this does not mean you can compile pure Qt3 programs with Qt4.</flag> |
| 111 |
<flag name='trace'>Build the qttracereplay utility which is required to |
| 112 |
play drawings recorded with the trace graphicssystem engine</flag> |
| 113 |
<flag name='glib'>Enable <pkg>dev-libs/glib</pkg> eventloop support</flag> |
Archives