1 |
yngwin 08/10/01 20:13:14 |
2 |
|
3 |
Modified: ChangeLog qt-assistant-4.4.1.ebuild |
4 |
qt-assistant-4.4.2.ebuild metadata.xml |
5 |
Log: |
6 |
Adding webkit support and useflag, using patch supplied by Manuel Nickschas in bug 237055. |
7 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26.5 i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.15 x11-libs/qt-assistant/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.15&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?rev=1.15&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/ChangeLog?r1=1.14&r2=1.15 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v |
19 |
retrieving revision 1.14 |
20 |
retrieving revision 1.15 |
21 |
diff -u -r1.14 -r1.15 |
22 |
--- ChangeLog 19 Sep 2008 00:09:10 -0000 1.14 |
23 |
+++ ChangeLog 1 Oct 2008 20:13:13 -0000 1.15 |
24 |
@@ -1,6 +1,11 @@ |
25 |
# ChangeLog for x11-libs/qt-assistant |
26 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.14 2008/09/19 00:09:10 yngwin Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.15 2008/10/01 20:13:13 yngwin Exp $ |
29 |
+ |
30 |
+ 01 Oct 2008; Ben de Groot <yngwin@g.o> metadata.xml, |
31 |
+ qt-assistant-4.4.1.ebuild, qt-assistant-4.4.2.ebuild: |
32 |
+ Adding webkit support and useflag, using patch supplied by Manuel |
33 |
+ Nickschas in bug 237055. |
34 |
|
35 |
*qt-assistant-4.4.2 (18 Sep 2008) |
36 |
|
37 |
|
38 |
|
39 |
|
40 |
1.2 x11-libs/qt-assistant/qt-assistant-4.4.1.ebuild |
41 |
|
42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.1.ebuild?rev=1.2&view=markup |
43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.1.ebuild?rev=1.2&content-type=text/plain |
44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.1.ebuild?r1=1.1&r2=1.2 |
45 |
|
46 |
Index: qt-assistant-4.4.1.ebuild |
47 |
=================================================================== |
48 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.1.ebuild,v |
49 |
retrieving revision 1.1 |
50 |
retrieving revision 1.2 |
51 |
diff -u -r1.1 -r1.2 |
52 |
--- qt-assistant-4.4.1.ebuild 11 Aug 2008 12:56:22 -0000 1.1 |
53 |
+++ qt-assistant-4.4.1.ebuild 1 Oct 2008 20:13:13 -0000 1.2 |
54 |
@@ -1,6 +1,6 @@ |
55 |
# Copyright 1999-2008 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.1.ebuild,v 1.1 2008/08/11 12:56:22 yngwin Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.1.ebuild,v 1.2 2008/10/01 20:13:13 yngwin Exp $ |
59 |
|
60 |
EAPI="1" |
61 |
inherit qt4-build |
62 |
@@ -11,10 +11,11 @@ |
63 |
LICENSE="|| ( GPL-3 GPL-2 )" |
64 |
SLOT="4" |
65 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
66 |
-IUSE="" |
67 |
+IUSE="webkit" |
68 |
|
69 |
DEPEND="~x11-libs/qt-gui-${PV} |
70 |
~x11-libs/qt-sql-${PV} |
71 |
+ !alpha? ( !ia64? ( !ppc? ( webkit? ( ~x11-libs/qt-webkit-${PV} ) ) ) ) |
72 |
!<=x11-libs/qt-4.4.0_alpha:${SLOT}" |
73 |
RDEPEND="${DEPEND}" |
74 |
|
75 |
@@ -36,13 +37,17 @@ |
76 |
|
77 |
src_compile() { |
78 |
local myconf |
79 |
- |
80 |
myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr |
81 |
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl |
82 |
-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng |
83 |
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
84 |
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility -no-fontconfig |
85 |
- -no-glib -no-opengl -no-qt3support -no-svg" |
86 |
+ -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon |
87 |
+ -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility |
88 |
+ -no-fontconfig -no-glib -no-opengl -no-qt3support -no-svg" |
89 |
+ if use webkit; then |
90 |
+ myconf="$myconf -assistant-webkit" |
91 |
+ else |
92 |
+ myconf="$myconf -no-webkit" |
93 |
+ fi |
94 |
|
95 |
qt4-build_src_compile |
96 |
} |
97 |
|
98 |
|
99 |
|
100 |
1.2 x11-libs/qt-assistant/qt-assistant-4.4.2.ebuild |
101 |
|
102 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.2.ebuild?rev=1.2&view=markup |
103 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.2.ebuild?rev=1.2&content-type=text/plain |
104 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.2.ebuild?r1=1.1&r2=1.2 |
105 |
|
106 |
Index: qt-assistant-4.4.2.ebuild |
107 |
=================================================================== |
108 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.2.ebuild,v |
109 |
retrieving revision 1.1 |
110 |
retrieving revision 1.2 |
111 |
diff -u -r1.1 -r1.2 |
112 |
--- qt-assistant-4.4.2.ebuild 19 Sep 2008 00:09:10 -0000 1.1 |
113 |
+++ qt-assistant-4.4.2.ebuild 1 Oct 2008 20:13:13 -0000 1.2 |
114 |
@@ -1,6 +1,6 @@ |
115 |
# Copyright 1999-2008 Gentoo Foundation |
116 |
# Distributed under the terms of the GNU General Public License v2 |
117 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.2.ebuild,v 1.1 2008/09/19 00:09:10 yngwin Exp $ |
118 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.2.ebuild,v 1.2 2008/10/01 20:13:13 yngwin Exp $ |
119 |
|
120 |
EAPI="1" |
121 |
inherit qt4-build |
122 |
@@ -11,10 +11,11 @@ |
123 |
LICENSE="|| ( GPL-3 GPL-2 )" |
124 |
SLOT="4" |
125 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
126 |
-IUSE="" |
127 |
+IUSE="+webkit" |
128 |
|
129 |
DEPEND="~x11-libs/qt-gui-${PV} |
130 |
~x11-libs/qt-sql-${PV} |
131 |
+ !alpha? ( !ia64? ( !ppc? ( webkit? ( ~x11-libs/qt-webkit-${PV} ) ) ) ) |
132 |
!<=x11-libs/qt-4.4.0_alpha:${SLOT}" |
133 |
RDEPEND="${DEPEND}" |
134 |
|
135 |
@@ -36,13 +37,17 @@ |
136 |
|
137 |
src_compile() { |
138 |
local myconf |
139 |
- |
140 |
myconf="${myconf} -no-xkb -no-tablet -no-fontconfig -no-xrender -no-xrandr |
141 |
-no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm -no-opengl |
142 |
-no-nas-sound -no-dbus -iconv -no-cups -no-nis -no-gif -no-libpng |
143 |
- -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon |
144 |
- -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility -no-fontconfig |
145 |
- -no-glib -no-opengl -no-qt3support -no-svg" |
146 |
+ -no-libmng -no-libjpeg -no-openssl -system-zlib -no-phonon |
147 |
+ -no-xmlpatterns -no-freetype -no-libtiff -no-accessibility |
148 |
+ -no-fontconfig -no-glib -no-opengl -no-qt3support -no-svg" |
149 |
+ if use webkit; then |
150 |
+ myconf="$myconf -assistant-webkit" |
151 |
+ else |
152 |
+ myconf="$myconf -no-webkit" |
153 |
+ fi |
154 |
|
155 |
qt4-build_src_compile |
156 |
} |
157 |
|
158 |
|
159 |
|
160 |
1.2 x11-libs/qt-assistant/metadata.xml |
161 |
|
162 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/metadata.xml?rev=1.2&view=markup |
163 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/metadata.xml?rev=1.2&content-type=text/plain |
164 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-assistant/metadata.xml?r1=1.1&r2=1.2 |
165 |
|
166 |
Index: metadata.xml |
167 |
=================================================================== |
168 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/metadata.xml,v |
169 |
retrieving revision 1.1 |
170 |
retrieving revision 1.2 |
171 |
diff -u -r1.1 -r1.2 |
172 |
--- metadata.xml 24 Dec 2007 14:52:28 -0000 1.1 |
173 |
+++ metadata.xml 1 Oct 2008 20:13:14 -0000 1.2 |
174 |
@@ -1,5 +1,11 @@ |
175 |
<?xml version="1.0" encoding="UTF-8"?> |
176 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
177 |
<pkgmetadata> |
178 |
-<herd>qt</herd> |
179 |
+ <herd>qt</herd> |
180 |
+ <use> |
181 |
+ <flag name='webkit'> |
182 |
+ Enable <pkg>x11-libs/qt-webkit</pkg> support, for more |
183 |
+ sophisticated online help display using webkit’s HTML renderer. |
184 |
+ </flag> |
185 |
+ </use> |
186 |
</pkgmetadata> |