1 |
caleb 07/12/21 19:34:08 |
2 |
|
3 |
Modified: qt-webkit-4.4.0_rc1.ebuild |
4 |
Log: |
5 |
Use new eclass for build |
6 |
(Portage version: 2.1.3.16) |
7 |
|
8 |
Revision Changes Path |
9 |
1.5 x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild?rev=1.5&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild?rev=1.5&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild?r1=1.4&r2=1.5 |
14 |
|
15 |
Index: qt-webkit-4.4.0_rc1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild,v |
18 |
retrieving revision 1.4 |
19 |
retrieving revision 1.5 |
20 |
diff -u -r1.4 -r1.5 |
21 |
--- qt-webkit-4.4.0_rc1.ebuild 20 Dec 2007 22:08:12 -0000 1.4 |
22 |
+++ qt-webkit-4.4.0_rc1.ebuild 21 Dec 2007 19:34:07 -0000 1.5 |
23 |
@@ -1,11 +1,11 @@ |
24 |
# Copyright 1999-2007 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild,v 1.4 2007/12/20 22:08:12 mr_bones_ Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.4.0_rc1.ebuild,v 1.5 2007/12/21 19:34:07 caleb Exp $ |
28 |
|
29 |
-inherit eutils flag-o-matic toolchain-funcs multilib |
30 |
+inherit qt4-build |
31 |
|
32 |
SRCTYPE="preview-opensource-src" |
33 |
-DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework." |
34 |
+DESCRIPTION="The Webkit module for the Qt toolkit." |
35 |
HOMEPAGE="http://www.trolltech.com/" |
36 |
|
37 |
MY_PV=${PV/_rc/-tp} |
38 |
@@ -17,116 +17,44 @@ |
39 |
SLOT="4" |
40 |
KEYWORDS="~x86" |
41 |
|
42 |
-IUSE="debug pch" |
43 |
+IUSE="debug" |
44 |
|
45 |
-RDEPEND="=x11-libs/qt-4.4.0_rc1" |
46 |
+RDEPEND="~x11-libs/qt-gui-${PV}" |
47 |
|
48 |
DEPEND="${RDEPEND}" |
49 |
|
50 |
-pkg_setup() { |
51 |
- QTBASEDIR=/usr/$(get_libdir)/qt4 |
52 |
- QTPREFIXDIR=/usr |
53 |
- QTBINDIR=/usr/bin |
54 |
- QTLIBDIR=/usr/$(get_libdir)/qt4 |
55 |
- QTPCDIR=/usr/$(get_libdir)/pkgconfig |
56 |
- QTDATADIR=/usr/share/qt4 |
57 |
- QTDOCDIR=/usr/share/doc/${PF} |
58 |
- QTHEADERDIR=/usr/include/qt4 |
59 |
- QTPLUGINDIR=${QTLIBDIR}/plugins |
60 |
- QTSYSCONFDIR=/etc/qt4 |
61 |
- QTTRANSDIR=${QTDATADIR}/translations |
62 |
- QTEXAMPLESDIR=${QTDATADIR}/examples |
63 |
- QTDEMOSDIR=${QTDATADIR}/demos |
64 |
-} |
65 |
|
66 |
src_unpack() { |
67 |
+ qt4-build_src_unpack |
68 |
|
69 |
- unpack ${A} |
70 |
- cd "${S}" |
71 |
- |
72 |
- # Don't let the user go too overboard with flags. If you really want to, uncomment |
73 |
- # out the line below and give 'er a whirl. |
74 |
- strip-flags |
75 |
- replace-flags -O3 -O2 |
76 |
- |
77 |
- if [[ $( gcc-fullversion ) == "3.4.6" && gcc-specs-ssp ]] ; then |
78 |
- ewarn "Appending -fno-stack-protector to CFLAGS/CXXFLAGS" |
79 |
- append-flags -fno-stack-protector |
80 |
- fi |
81 |
- |
82 |
- # Override the creation of qmake and copy over the one from the system. This speeds up compilation time a lot. |
83 |
- epatch "${FILESDIR}"/configure.patch |
84 |
- cp ${QTBINDIR}/qmake "${S}"/bin/qmake |
85 |
+ skip_qmake_build_patch |
86 |
+ skip_project_generation_patch |
87 |
+ install_binaries_to_buildtree |
88 |
} |
89 |
|
90 |
src_compile() { |
91 |
- export PATH="${S}/bin:${PATH}" |
92 |
- export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" |
93 |
- |
94 |
- [ $(get_libdir) != "lib" ] && myconf="${myconf} -L/usr/$(get_libdir)" |
95 |
+ local myconf=$(standard_configure_options) |
96 |
|
97 |
- # Disable visibility explicitly if gcc version isn't 4 |
98 |
- if [[ "$(gcc-major-version)" != "4" ]]; then |
99 |
- myconf="${myconf} -no-reduce-exports" |
100 |
- fi |
101 |
- |
102 |
- # Add a switch that will attempt to use recent binutils to reduce relocations. Should be harmless for other |
103 |
- # cases. From bug #178535 |
104 |
- myconf="${myconf} -fast -reduce-relocations -webkit" |
105 |
- use debug && myconf="${myconf} -debug -no-separate-debug-info" || myconf="${myconf} -release -no-separate-debug-info" |
106 |
- use pch && myconf="${myconf} -pch" || myconf="${myconf} -no-pch" |
107 |
- myconf="${myconf} -nomake examples -nomake demos" |
108 |
- |
109 |
- myconf="-stl -verbose -largefile -confirm-license \ |
110 |
- -no-rpath \ |
111 |
- -prefix ${QTPREFIXDIR} -bindir ${QTBINDIR} -libdir ${QTLIBDIR} -datadir ${QTDATADIR} \ |
112 |
- -docdir ${QTDOCDIR} -headerdir ${QTHEADERDIR} -plugindir ${QTPLUGINDIR} \ |
113 |
- -sysconfdir ${QTSYSCONFDIR} -translationdir ${QTTRANSDIR} \ |
114 |
- -examplesdir ${QTEXAMPLESDIR} -demosdir ${QTDEMOSDIR} ${myconf}" |
115 |
+ myconf="${myconf} -webkit" |
116 |
|
117 |
echo ./configure ${myconf} |
118 |
./configure ${myconf} || die |
119 |
|
120 |
- # Edit the .qmake.cache file |
121 |
- sed -i -e "s:QMAKE_MOC:\#QMAKE_MOC:g" "${S}"/.qmake.cache |
122 |
- sed -i -e "s:QMAKE_UIC:\#QMAKE_UIC:g" "${S}"/.qmake.cache |
123 |
- sed -i -e "s:QMAKE_RCC:\#QMAKE_RCC:g" "${S}"/.qmake.cache |
124 |
- |
125 |
- cd "${S}"/src/3rdparty/webkit/WebCore |
126 |
- qmake "LIBS+=-L${QTLIBDIR}" && emake || die |
127 |
- |
128 |
- cd "${S}"/tools/designer/src/plugins/qwebview |
129 |
- qmake "LIBS+=-L${QTLIBDIR}" && emake || die |
130 |
+ build_directories src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview |
131 |
} |
132 |
|
133 |
src_install() { |
134 |
- cd "${S}"/src/3rdparty/webkit/WebCore |
135 |
- emake INSTALL_ROOT="${D}" install || die |
136 |
- |
137 |
- cd "${S}"/tools/designer/src/plugins/qwebview |
138 |
- emake INSTALL_ROOT="${D}" install || die |
139 |
+ install_directories src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview |
140 |
|
141 |
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.la |
142 |
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/*.prl |
143 |
- sed -i -e "s:${S}/lib:${QTLIBDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc |
144 |
- |
145 |
- # pkgconfig files refer to WORKDIR/bin as the moc and uic locations. Fix: |
146 |
- sed -i -e "s:${S}/bin:${QTBINDIR}:g" "${D}"/${QTLIBDIR}/pkgconfig/*.pc |
147 |
- |
148 |
- # Move .pc files into the pkgconfig directory |
149 |
- dodir ${QTPCDIR} |
150 |
- mv "${D}"/${QTLIBDIR}/pkgconfig/*.pc "${D}"/${QTPCDIR} |
151 |
+ fix_library_files |
152 |
} |
153 |
|
154 |
pkg_postinst() |
155 |
{ |
156 |
- # Need to add webkit to QT_CONFIG line |
157 |
- sed -i -e "s:webkit ::g" ${QTDATADIR}/mkspecs/qconfig.pri |
158 |
- sed -i -e "s:QT_CONFIG += :QT_CONFIG += webkit :g" ${QTDATADIR}/mkspecs/qconfig.pri |
159 |
+ qconfig_add_option webkit |
160 |
} |
161 |
|
162 |
pkg_postrm() |
163 |
{ |
164 |
- # Need to add qdbus to QT_CONFIG line |
165 |
- sed -i -e "s:webkit ::g" ${QTDATADIR}/mkspecs/qconfig.pri |
166 |
+ qconfig_remove_option webkit |
167 |
} |
168 |
|
169 |
|
170 |
|
171 |
-- |
172 |
gentoo-commits@g.o mailing list |