Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ingmar Vanhassel (ingmar)" <ingmar@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: ChangeLog kdelibs-4.0.3-r1.ebuild kdelibs-4.0.3.ebuild
Date: Mon, 28 Apr 2008 14:10:35
Message-Id: E1JqU3r-0004oW-IA@stork.gentoo.org
1 ingmar 08/04/28 14:10:31
2
3 Modified: ChangeLog
4 Added: kdelibs-4.0.3-r1.ebuild
5 Removed: kdelibs-4.0.3.ebuild
6 Log:
7 Fix security bug 218848, CVS-2008-1670.
8 (Portage version: 2.1.5_rc6)
9
10 Revision Changes Path
11 1.525 kde-base/kdelibs/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.525&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.525&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.524&r2=1.525
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
20 retrieving revision 1.524
21 retrieving revision 1.525
22 diff -u -r1.524 -r1.525
23 --- ChangeLog 28 Apr 2008 13:56:22 -0000 1.524
24 +++ ChangeLog 28 Apr 2008 14:10:31 -0000 1.525
25 @@ -1,6 +1,13 @@
26 # ChangeLog for kde-base/kdelibs
27 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.524 2008/04/28 13:56:22 ingmar Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.525 2008/04/28 14:10:31 ingmar Exp $
30 +
31 +*kdelibs-4.0.3-r1 (28 Apr 2008)
32 +
33 + 28 Apr 2008; Ingmar Vanhassel <ingmar@g.o>
34 + +files/kdelibs-4.0.3-CVS-2008-1670.patch, -kdelibs-4.0.3.ebuild,
35 + +kdelibs-4.0.3-r1.ebuild:
36 + Fix security bug 218848, CVS-2008-1670.
37
38 *kdelibs-3.5.9-r3 (28 Apr 2008)
39
40
41
42
43 1.1 kde-base/kdelibs/kdelibs-4.0.3-r1.ebuild
44
45 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.0.3-r1.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-4.0.3-r1.ebuild?rev=1.1&content-type=text/plain
47
48 Index: kdelibs-4.0.3-r1.ebuild
49 ===================================================================
50 # Copyright 1999-2008 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.0.3-r1.ebuild,v 1.1 2008/04/28 14:10:31 ingmar Exp $
53
54 EAPI="1"
55
56 CPPUNIT_REQUIRED="optional"
57 OPENGL_REQUIRED="optional"
58 inherit kde4-base
59
60 DESCRIPTION="KDE libraries needed by all KDE programs."
61 HOMEPAGE="http://www.kde.org/"
62
63 KEYWORDS="~amd64 ~x86"
64 IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k
65 kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
66 LICENSE="GPL-2 LGPL-2"
67 RESTRICT="test"
68
69 COMMONDEPEND="
70 !<kde-base/kdebase-3.5.7-r6
71 !<kde-base/kdebase-startkde-3.5.7-r1
72 !=kde-base/kdebase-3.5.8
73 !=kde-base/kdebase-3.5.8-r1
74 !=kde-base/kdebase-3.5.8-r2
75 !=kde-base/kdebase-startkde-3.5.8
76 >=app-misc/strigi-0.5.7
77 >=dev-libs/libxml2-2.6.6
78 >=dev-libs/libxslt-1.1.17
79 media-libs/fontconfig
80 >=media-libs/freetype-2
81 media-libs/giflib
82 media-libs/jpeg
83 media-libs/libpng
84 >=sys-apps/dbus-0.91
85 x11-libs/libICE
86 x11-libs/libSM
87 x11-libs/libX11
88 x11-libs/libXau
89 x11-libs/libXcursor
90 x11-libs/libXdmcp
91 x11-libs/libXext
92 x11-libs/libXfixes
93 x11-libs/libXft
94 x11-libs/libXpm
95 x11-libs/libXrender
96 x11-libs/libXtst
97 >=x11-misc/shared-mime-info-0.20
98 acl? ( kernel_linux? ( sys-apps/acl ) )
99 alsa? ( >=media-libs/alsa-lib-1.0.14a )
100 fam? ( virtual/fam )
101 jpeg2k? ( media-libs/jasper )
102 kerberos? ( virtual/krb5 )
103 nls? ( virtual/libintl )
104 openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase )
105 opengl? ( virtual/opengl )
106 >=dev-libs/libpcre-4.5
107 semantic-desktop? ( >=dev-libs/soprano-2.0.0 )
108 spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant )
109 ssl? ( >=dev-libs/openssl-0.9.7d )
110 zeroconf? ( || ( net-dns/avahi
111 !bindist? ( net-misc/mDNSResponder ) ) )
112 "
113
114 DEPEND="${COMMONDEPEND}
115 doc? ( app-doc/doxygen )
116 sys-devel/gettext"
117
118 RDEPEND="${COMMONDEPEND}
119 x11-apps/rgb
120 x11-apps/iceauth"
121
122 # Patch to respect the sandbox when cmake tries to create symlinks,
123 # or executes an external program that tries to write files.
124 PATCHES="${FILESDIR}/e-tempdir.patch
125 ${FILESDIR}/${PN}-4.0.2-X11-optional.patch
126 ${FILESDIR}/${PN}-4.0.2-alsa-optional.patch
127 ${FILESDIR}/${P}-CVS-2008-1670.patch"
128 # Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional.
129
130 pkg_setup() {
131 if has_version x11-libs/qt-core:4; then
132 ewarn "KDE ${PV} doesn't work well with Qt-4.4, expect strange bugs."
133 ewarn "It is highly recommend, that you install x11-libs/qt-4.3.4,"
134 ewarn "recompile ${P} and all of its dependencies if you want"
135 ewarn "to use KDE 4.0.2."
136 fi
137 KDE4_BUILT_WITH_USE_CHECK="--missing true sys-apps/dbus X"
138 use alsa && KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
139 --missing true media-libs/alsa-lib midi"
140 if use zeroconf && has_version net-dns/avahi; then
141 KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
142 net-dns/avahi mdnsresponder-compat"
143 fi
144
145 kde4-base_pkg_setup
146 }
147
148 src_compile() {
149 if use zeroconf; then
150 if has_version net-dns/avahi; then
151 mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
152 elif has_version net-misc/mDNSResponder; then
153 mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
154 else
155 die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
156 fi
157 fi
158
159 mycmakeargs="${mycmakeargs}
160 -DWITH_HSPELL=OFF
161 $(cmake-utils_has 3dnow X86_3DNOW)
162 $(cmake-utils_has altivec PPC_ALTIVEC)
163 $(cmake-utils_has mmx X86_MMX)
164 $(cmake-utils_has sse X86_SSE)
165 $(cmake-utils_has sse2 X86_SSE2)
166 $(cmake-utils_use_with acl ACL)
167 $(cmake-utils_use_with alsa Alsa)
168 $(cmake-utils_use_with bzip2 BZip2)
169 $(cmake-utils_use_with fam FAM)
170 $(cmake-utils_use_with jpeg2k Jasper)
171 $(cmake-utils_use_with kerberos GSSAPI)
172 $(cmake-utils_use_with nls Libintl)
173 $(cmake-utils_use_with openexr OpenEXR)
174 $(cmake-utils_use_with opengl OpenGL)
175 $(cmake-utils_use_with semantic-desktop Soprano)
176 $(cmake-utils_use_with spell ASPELL)
177 $(cmake-utils_use_with spell ENCHANT)
178 $(cmake-utils_use_with ssl OpenSSL)
179 "
180
181 kde4-base_src_compile
182
183 # The building of apidox is not managed anymore by the build system
184 if use doc; then
185 einfo "Building API documentation"
186 cd "${S}"/doc/api/
187 ./doxygen.sh "${S}" || die "APIDOX generation failed"
188 fi
189 }
190
191 src_install() {
192 kde4-base_src_install
193
194 # Some external applications need FindXine.cmake. Therefore upstream moved it
195 # to kdelibs in trunk. Doing the same for :kde-4. See bug #209701.
196 insinto ${KDEDIR}/share/apps/cmake/modules/
197 doins "${FILESDIR}"/FindXine.cmake || die "doins FindXine failed."
198
199 if use doc; then
200 einfo "Installing API documentation. This could take a bit of time."
201 cd "${S}"/doc/api/
202 docinto /HTML/en/kdelibs-apidox
203 dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
204 fi
205
206 dodir /etc/env.d
207 dodir /etc/revdep-rebuild
208
209 # List all the multilib libdirs
210 local _libdir _libdirs
211 for _libdir in $(get_all_libdirs); do
212 _libdirs="${_libdirs}:${PREFIX}/${_libdir}"
213 done
214 _libdirs=${_libdirs#:}
215
216 cat <<-EOF > "${T}"/44kdepaths-${SLOT} # number goes down with version bump
217 PATH="${PREFIX}/bin"
218 ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
219 LDPATH="${_libdirs}"
220 MANPATH="${PREFIX}/share/man"
221 CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
222 KDEDIRS="/usr:/usr/local:${PREFIX}"
223 #KDE_IS_PRELINKED=1
224 XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
225 COLON_SEPARATED="XDG_DATA_DIRS"
226 EOF
227 doenvd "${T}"/44kdepaths-${SLOT}
228
229 # make sure 'source /etc/profile' doesn't hose the PATH
230 dodir /etc/profile.d
231 cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh
232 if [ -n "${KDEDIR}" ]; then
233 export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
234 export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
235 fi
236 EOF
237
238 cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
239 SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
240 EOF
241 }
242
243 src_test() {
244 # FIXME: Disable kate tests
245 mycmakeargs="${mycmakeargs}
246 -DKHTML_BUILD_TESTREGRESSION=ON"
247 kde4-base_src_test
248 }
249
250 pkg_postinst() {
251 if use zeroconf; then
252 echo
253 elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
254 elog "is running. Make sure also that multicast dns lookups are enabled by editing"
255 elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
256 elog " hosts: files mdns dns"
257 echo
258 fi
259
260 kde4-base_pkg_postinst
261 }
262
263
264
265 --
266 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups