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