Gentoo Archives: gentoo-commits

From: "Carsten Lohrke (carlo)" <carlo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kdelibs: ChangeLog Manifest kdelibs-3.5.10.ebuild
Date: Sat, 13 Sep 2008 23:58:09
Message-Id: E1Kef0A-0000nv-MX@stork.gentoo.org
1 carlo 08/09/13 23:58:06
2
3 Modified: ChangeLog Manifest
4 Added: kdelibs-3.5.10.ebuild
5 Log:
6 Version bump.
7
8 Revision Changes Path
9 1.539 kde-base/kdelibs/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.539&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.539&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.538&r2=1.539
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
18 retrieving revision 1.538
19 retrieving revision 1.539
20 diff -u -r1.538 -r1.539
21 --- ChangeLog 27 Jul 2008 20:49:02 -0000 1.538
22 +++ ChangeLog 13 Sep 2008 23:58:06 -0000 1.539
23 @@ -1,6 +1,11 @@
24 # ChangeLog for kde-base/kdelibs
25 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.538 2008/07/27 20:49:02 carlo Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.539 2008/09/13 23:58:06 carlo Exp $
28 +
29 +*kdelibs-3.5.10 (13 Sep 2008)
30 +
31 + 13 Sep 2008; Carsten Lohrke <carlo@g.o> +kdelibs-3.5.10.ebuild:
32 + Version bump.
33
34 27 Jul 2008; Carsten Lohrke <carlo@g.o> kdelibs-3.5.8-r4.ebuild:
35 QA: Get rid of deprecated qt_min_version().
36
37
38
39 1.652 kde-base/kdelibs/Manifest
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/Manifest?rev=1.652&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/Manifest?rev=1.652&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/Manifest?r1=1.651&r2=1.652
44
45 Index: Manifest
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/Manifest,v
48 retrieving revision 1.651
49 retrieving revision 1.652
50 diff -u -r1.651 -r1.652
51 --- Manifest 23 Aug 2008 05:18:38 -0000 1.651
52 +++ Manifest 13 Sep 2008 23:58:06 -0000 1.652
53 @@ -9,11 +9,14 @@
54 AUX kdelibs-4.0.3-CVS-2008-1670.patch 739 RMD160 348782a28e75435c4b36548879d2d8d243fc0436 SHA1 c08f374abc2f44cd1ece01881b510ef83241f186 SHA256 41e219e50b652800a2ca892e70baeb40ee6e7cf0f981d098dbdf2ca0926ddf5f
55 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
56 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
57 +DIST kdelibs-3.5-patchset-15.tar.bz2 6707 RMD160 55958374bfc4ba27caf573e13337677c35cbe2c0 SHA1 e0a35642adfcf223ce7490b21af1fa2c3d922b93 SHA256 4a25bc340ce2567ea017456b4aa2292b288779d59d0dd012bd50f5189fe739ec
58 +DIST kdelibs-3.5.10.tar.bz2 15614607 RMD160 4c960664283c83ebc8e68932ca9044336fcff223 SHA1 c930a25f4419134def55b8466c3a6f737227fb82 SHA256 617e9cb01c70ed4c1b554b373f55deffbd0e12e2cdfeacd7b3d9409372285c72
59 DIST kdelibs-3.5.8-seli-xinerama.patch.bz2 5230 RMD160 26efc6620d176414b3b771145a7c00db11c3df6b SHA1 4f4daaa60fbf0c3c582400f33833b9d73c26af4a SHA256 389a31d7e3f44eca5984842d66fa19a8a9f6f11fd6dac134cfd1e4d24e7fb174
60 DIST kdelibs-3.5.8.tar.bz2 15557343 RMD160 e3524ca8613fca338a0530213e921fbfae56e866 SHA1 b524a5d9969e7319bb5ffb926a39fd6afb39b2ed SHA256 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6
61 DIST kdelibs-3.5.9.tar.bz2 15568675 RMD160 9ac02bf2314de387b2aa9664703c72b0613fcbb3 SHA1 b8197d94075a54f90f08a9ef7bed95ccf53e12ad SHA256 4f92553f3ff50de87a83435fce3bae440c43f0d37a8e80a1736d007f80d8f755
62 DIST kdelibs-4.0.4.tar.bz2 9073446 RMD160 4ec08b749c0a3e24a81d2df6f3ec83c468a97d42 SHA1 2d8e98a2ffdd1fb5b160a9facfb7f493af48b934 SHA256 215e8dc50dc6f1625fa40b029c9c6e2ba9ca775a9ac5438759a4f3b5a551d8b9
63 DIST kdelibs-4.0.5.tar.bz2 9115367 RMD160 9dd1bd6908722fe2ec5ac6415beb4a4d246df343 SHA1 df7d4175c81fa1cb842f437824e42137a0f7f28c SHA256 1dce80bec72eb560f76b3f274876605b55b5197ff19f282d62d1664e51652357
64 +EBUILD kdelibs-3.5.10.ebuild 7287 RMD160 013c830361cf1ad40a740a6361c0541814013a7f SHA1 62d7099d781d460ea93e84a4e31e61333605db44 SHA256 c6b3260e2fd8d17771f71461620fc0d7193f36393fc9c8ce6ee2b81ddf2d93fa
65 EBUILD kdelibs-3.5.8-r4.ebuild 6084 RMD160 65efd94088585e6123aa5f0961e1c8a76bd7d706 SHA1 82e2794807ef387577b14821dec668e2bd422acb SHA256 fc5268f37a0d0199cda60f5b9a301dc7a962cd7f1614db4721b519f9a6ee2b98
66 EBUILD kdelibs-3.5.9-r1.ebuild 6129 RMD160 5c3374dc64c90656d6cf8f30c7bcf8a95f5f3eeb SHA1 1d307fac7d9a6644d275cd0ccb8be566f01ddc1b SHA256 2f2d844853ed90df74a4c90ebf5f9cdc3e7c4aaf8f906437b09bfa84cf7f6e41
67 EBUILD kdelibs-3.5.9-r2.ebuild 6205 RMD160 a751f94f3026c1233e3ed10a110d950e60620f12 SHA1 886b2e2ac989d6f5934f28d7a7accb4bef5e5a35 SHA256 0fab24586d56dc98b53a4cbe934f2ac565b3a55580c206db4c28b19c3076f594
68 @@ -22,5 +25,5 @@
69 EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7 SHA1 721388ab5fa4ee455bdadb189afa021bd336fc16 SHA256 f7acb5abb483ebeeaee7a8636073b85d4ea0b7e9badcd8f8073d5ac8dcd2167b
70 EBUILD kdelibs-4.0.4.ebuild 6106 RMD160 359d839f456bccae1744e69e208433c4308c6287 SHA1 827e17ac4eda6a511a3af0e2798c89f8eca35ac2 SHA256 169991e54aff16bac9ade88269da7ce20dfbb60b80b68cb19b06fdbea4536755
71 EBUILD kdelibs-4.0.5.ebuild 6112 RMD160 7d16be93f8556088cfbdb71f45a8bb4253944a0f SHA1 ff8c5cc2d6146e3c8d320d17df39784e049802f6 SHA256 00339d01839c54f949d9f267a40cc8ac08566b6b5a832c213d6565054af3f248
72 -MISC ChangeLog 88526 RMD160 6ee8b81b9ebed9770b3b83161f45096135d2dd8c SHA1 45b49077dd2bbaa8268eb582cca600be3c5af6d5 SHA256 d8bf0bdc0190c403d66cf568a969f3f116e2155c8074f35eacb267d38b52465b
73 +MISC ChangeLog 88647 RMD160 f663f63fef2d80983aa4adc380fc6b17e09367ea SHA1 2bc0755cca6e9d7a8696a0567095857b06564fd5 SHA256 8ad077efcc016a2e0ba54dcdeaf7e762bbb06f5885d52d9d102eca3377902fda
74 MISC metadata.xml 602 RMD160 f3461a81b06ab9dce821783b4e361e0e9696bbf3 SHA1 09bee1c8127363de0066a652d7093759ca36631a SHA256 188f0ca9e181009fd720cbe1fff57f124c80524033c6cb591ea2789d755410e1
75
76
77
78 1.1 kde-base/kdelibs/kdelibs-3.5.10.ebuild
79
80 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10.ebuild?rev=1.1&view=markup
81 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10.ebuild?rev=1.1&content-type=text/plain
82
83 Index: kdelibs-3.5.10.ebuild
84 ===================================================================
85 # Copyright 1999-2008 Gentoo Foundation
86 # Distributed under the terms of the GNU General Public License v2
87 # $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10.ebuild,v 1.1 2008/09/13 23:58:06 carlo Exp $
88
89 EAPI="1"
90 inherit kde flag-o-matic eutils multilib
91 set-kdedir 3.5
92
93 DESCRIPTION="KDE libraries needed by all KDE programs."
94 HOMEPAGE="http://www.kde.org/"
95 SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
96 mirror://gentoo/kdelibs-3.5-patchset-15.tar.bz2
97 mirror://gentoo/kde-3.5.9-seli-xinerama.tar.bz2"
98
99 LICENSE="GPL-2 LGPL-2"
100 SLOT="3.5"
101 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
102 IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
103 avahi kernel_linux fam lua kdehiddenvisibility"
104
105 # Added aspell-en as dependency to work around bug 131512.
106 # Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
107 RDEPEND="x11-libs/libXext
108 arts? ( ~kde-base/arts-3.5.10 )
109 app-arch/bzip2
110 >=dev-libs/openssl-0.9.7d
111 >=dev-libs/libxslt-1.1.16
112 >=dev-libs/libxml2-2.6.6
113 >=dev-libs/libpcre-6.6
114 media-libs/fontconfig
115 >=media-libs/freetype-2
116 media-libs/libart_lgpl
117 net-dns/libidn
118 >=x11-libs/qt-3.3.3:3
119 acl? ( kernel_linux? ( sys-apps/acl ) )
120 alsa? ( media-libs/alsa-lib )
121 cups? ( >=net-print/cups-1.1.19 )
122 tiff? ( media-libs/tiff )
123 kerberos? ( virtual/krb5 )
124 jpeg2k? ( media-libs/jasper )
125 openexr? ( >=media-libs/openexr-1.2.2-r2 )
126 !avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
127 fam? ( virtual/fam )
128 virtual/ghostscript
129 utempter? ( sys-libs/libutempter )
130 !kde-base/kde-env
131 lua? ( dev-lang/lua )
132 spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
133 >=sys-apps/portage-2.1.2.11
134 !kde-base/ksync
135 !kde-base/kdebindings-meta
136 !=kde-base/artsplugin-mpeglib-3.5*
137 !=kde-base/artsplugin-mpg123-3.5*
138 !=kde-base/mpeglib-3.5*
139 !kde-base/kdeaccessibility
140 !kde-base/kdeaddons
141 !kde-base/kdeadmin
142 !kde-base/kdeartwork
143 !kde-base/kdebase
144 !kde-base/kdeedu
145 !kde-base/kdegames
146 !kde-base/kdegraphics
147 !kde-base/kde
148 !kde-base/kdemultimedia
149 !kde-base/kdenetwork
150 !kde-base/kdepim
151 !kde-base/kdesdk
152 !kde-base/kdetoys
153 !kde-base/kdeutils
154 !kde-base/kdewebdev"
155
156 DEPEND="${RDEPEND}
157 doc? ( app-doc/doxygen )
158 sys-devel/gettext"
159
160 RDEPEND="${RDEPEND}
161 x11-apps/rgb
162 x11-apps/iceauth"
163
164 PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
165 bindist? ( kde-misc/kdnssd-avahi )"
166
167 # Testing code is rather broken and merely for developer purposes, so disable it.
168 RESTRICT="test"
169
170 pkg_setup() {
171 if use legacyssl ; then
172 echo ""
173 elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
174 elog "sites, but breaks others instead. It is strongly discouraged to use it."
175 elog "For more information, see bug #128922."
176 echo ""
177 fi
178
179 if ! use utempter ; then
180 echo ""
181 elog "On some setups, which rely on the correct update of utmp records, not using"
182 elog "utempter might not update them correctly. If you experience unexpected"
183 elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
184 echo ""
185 fi
186
187 if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
188 eerror "The alsa USE flag in this package enables ALSA support"
189 eerror "for libkmid, KDE midi library."
190 eerror "For this reason, you have to merge media-libs/alsa-lib"
191 eerror "with the midi USE flag enabled, or disable alsa USE flag"
192 eerror "for this package."
193 die "Missing midi USE flag on media-libs/alsa-lib"
194 fi
195 }
196
197 src_unpack() {
198 kde_src_unpack
199
200 if use legacyssl ; then
201 # This patch won't be included upstream, see bug #128922.
202 epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
203 fi
204
205 if use utempter ; then
206 # Bug #135818 is the eternal reference.
207 epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
208 fi
209
210 if use branding ; then
211 # Add "(Gentoo)" to khtml user agent.
212 epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
213 fi
214
215 # Xinerama patch by Lubos Lunak.
216 # http://ktown.kde.org/~seli/xinerama/
217 epatch "${WORKDIR}/${PN}-xinerama.patch"
218 }
219
220 src_compile() {
221 rm -f "${S}/configure"
222
223 myconf="--with-distribution=Gentoo --disable-fast-malloc
224 --with-libart --with-libidn --with-ssl
225 --without-hspell
226 $(use_enable fam libfam) $(use_enable kernel_linux dnotify)
227 $(use_with acl) $(use_with alsa)
228 $(use_with arts) $(use_enable cups)
229 $(use_with kerberos gssapi) $(use_with tiff)
230 $(use_with jpeg2k jasper) $(use_with openexr)
231 $(use_with utempter) $(use_with lua)
232 $(use_enable kernel_linux sendfile) --enable-mitshm
233 $(use_with spell aspell)"
234
235 if use avahi || use bindist ; then
236 myconf="${myconf} --disable-dnssd"
237 else
238 myconf="${myconf} --enable-dnssd"
239 fi
240
241 if has_version x11-apps/rgb; then
242 myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
243 fi
244
245 # fix bug 58179, bug 85593
246 # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
247 # closer look... - corsair
248 use ppc64 && append-flags "-mminimal-toc"
249
250 # work around bug #120858, gcc 3.4.x -Os miscompilation
251 use x86 && replace-flags "-Os" "-O2" # see bug #120858
252
253 replace-flags "-O3" "-O2" # see bug #148180
254
255 kde_src_compile
256
257 if use doc; then
258 emake apidox || die
259 fi
260 }
261
262 src_install() {
263 kde_src_install
264
265 if use doc; then
266 emake DESTDIR="${D}" install-apidox || die
267 fi
268
269 # Needed to create lib -> lib64 symlink for amd64 2005.0 profile
270 if [ "${SYMLINK_LIB}" = "yes" ]; then
271 dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
272 fi
273
274 # Get rid of the disabled version of the kdnsd libraries
275 if use avahi || use bindist ; then
276 rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
277 fi
278
279 dodir /etc/env.d
280
281 # List all the multilib libdirs
282 local libdirs
283 for libdir in $(get_all_libdirs); do
284 libdirs="${libdirs}:${PREFIX}/${libdir}"
285 done
286
287 # KDE implies that the install path ist listed first in KDEDIRS and the user
288 # directory (implicitly added) to be the last entry. Doing otherwise breaks
289 # certain functionality. Do not break this (once again *sigh*), but read the code.
290 cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
291 PATH=${PREFIX}/bin
292 ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
293 LDPATH=${libdirs:1}
294 MANPATH=${PREFIX}/share/man
295 CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
296 KDEDIRS="${PREFIX}:/usr:/usr/local"
297 #KDE_IS_PRELINKED=1
298 # Excessive flushing to disk as in releases before KDE 3.5.10. Usually you don't want that.
299 #KDE_EXTRA_FSYNC=1
300 XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
301 COLON_SEPARATED="XDG_DATA_DIRS"
302 EOF
303
304
305 # Install shell script to run KDE 3 applications from outside of the KDE 3 desktop
306 # See http://lists.kde.org/?t=120569055200005&r=1&w=2 for reference
307
308 # List all the multilib libdirs
309 local _libdir _libdirs
310 for _libdir in $(get_all_libdirs); do
311 _libdirs="${_libdirs}:${PREFIX}/${_libdir}"
312 done
313 _libdirs=${_libdirs#:}
314
315 # Merge KDE prefix and LDPATH
316 sed -e "s#@REPLACE_PREFIX@#${PREFIX}#" \
317 -e "s#@REPLACE_LIBS@#${_libdirs}#" \
318 -i "${WORKDIR}/patches/kde3" || die "sed failed"
319 dobin "${WORKDIR}/patches/kde3"
320
321
322 # Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
323 dodir /etc/revdep-rebuild
324
325 cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
326 SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
327 EOF
328 }