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-3.5.9-r3.ebuild
Date: Mon, 28 Apr 2008 13:56:27
Message-Id: E1JqTqB-0004gt-Cm@stork.gentoo.org
1 ingmar 08/04/28 13:56:23
2
3 Modified: ChangeLog
4 Added: kdelibs-3.5.9-r3.ebuild
5 Log:
6 Same for ~arch.
7 (Portage version: 2.1.5_rc6)
8
9 Revision Changes Path
10 1.524 kde-base/kdelibs/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.524&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.524&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.523&r2=1.524
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v
19 retrieving revision 1.523
20 retrieving revision 1.524
21 diff -u -r1.523 -r1.524
22 --- ChangeLog 28 Apr 2008 12:32:23 -0000 1.523
23 +++ ChangeLog 28 Apr 2008 13:56:22 -0000 1.524
24 @@ -1,6 +1,12 @@
25 # ChangeLog for kde-base/kdelibs
26 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.523 2008/04/28 12:32:23 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.524 2008/04/28 13:56:22 ingmar Exp $
29 +
30 +*kdelibs-3.5.9-r3 (28 Apr 2008)
31 +
32 + 28 Apr 2008; Ingmar Vanhassel <ingmar@g.o>
33 + +kdelibs-3.5.9-r3.ebuild:
34 + Same for ~arch.
35
36 *kdelibs-3.5.8-r4 (28 Apr 2008)
37
38
39
40
41 1.1 kde-base/kdelibs/kdelibs-3.5.9-r3.ebuild
42
43 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.9-r3.ebuild?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.9-r3.ebuild?rev=1.1&content-type=text/plain
45
46 Index: kdelibs-3.5.9-r3.ebuild
47 ===================================================================
48 # Copyright 1999-2008 Gentoo Foundation
49 # Distributed under the terms of the GNU General Public License v2
50 # $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.9-r3.ebuild,v 1.1 2008/04/28 13:56:22 ingmar Exp $
51
52 EAPI="1"
53 inherit kde flag-o-matic eutils multilib
54 set-kdedir 3.5
55
56 DESCRIPTION="KDE libraries needed by all KDE programs."
57 HOMEPAGE="http://www.kde.org/"
58 SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
59 mirror://gentoo/kdelibs-3.5-patchset-14.tar.bz2
60 mirror://gentoo/kde-3.5.9-seli-xinerama.tar.bz2"
61
62 LICENSE="GPL-2 LGPL-2"
63 SLOT="3.5"
64 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
65 IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
66 avahi kernel_linux fam lua kdehiddenvisibility"
67
68 # Added aspell-en as dependency to work around bug 131512.
69 # Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
70 RDEPEND="
71 arts? ( >=kde-base/arts-3.5.5 )
72 app-arch/bzip2
73 >=dev-libs/openssl-0.9.7d
74 >=dev-libs/libxslt-1.1.16
75 >=dev-libs/libxml2-2.6.6
76 >=dev-libs/libpcre-6.6
77 media-libs/fontconfig
78 >=media-libs/freetype-2
79 media-libs/libart_lgpl
80 net-dns/libidn
81 >=x11-libs/qt-3.3.3:3
82 acl? ( kernel_linux? ( sys-apps/acl ) )
83 alsa? ( media-libs/alsa-lib )
84 cups? ( >=net-print/cups-1.1.19 )
85 tiff? ( media-libs/tiff )
86 kerberos? ( virtual/krb5 )
87 jpeg2k? ( media-libs/jasper )
88 openexr? ( >=media-libs/openexr-1.2.2-r2 )
89 !avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
90 fam? ( virtual/fam )
91 virtual/ghostscript
92 utempter? ( sys-libs/libutempter )
93 !kde-base/kde-env
94 lua? ( dev-lang/lua )
95 spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
96 >=sys-apps/portage-2.1.2.11
97 !kde-base/ksync"
98
99 DEPEND="${RDEPEND}
100 doc? ( app-doc/doxygen )
101 sys-devel/gettext"
102
103 RDEPEND="${RDEPEND}
104 x11-apps/rgb
105 x11-apps/iceauth"
106
107 PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
108 bindist? ( kde-misc/kdnssd-avahi )"
109
110 # Testing code is rather broken and merely for developer purposes, so disable it.
111 RESTRICT="test"
112
113 pkg_setup() {
114 if use legacyssl ; then
115 echo ""
116 elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
117 elog "sites, but breaks others instead. It is strongly discouraged to use it."
118 elog "For more information, see bug #128922."
119 echo ""
120 fi
121
122 if ! use utempter ; then
123 echo ""
124 elog "On some setups, which rely on the correct update of utmp records, not using"
125 elog "utempter might not update them correctly. If you experience unexpected"
126 elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
127 echo ""
128 fi
129
130 if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
131 eerror "The alsa USE flag in this package enables ALSA support"
132 eerror "for libkmid, KDE midi library."
133 eerror "For this reason, you have to merge media-libs/alsa-lib"
134 eerror "with the midi USE flag enabled, or disable alsa USE flag"
135 eerror "for this package."
136 die "Missing midi USE flag on media-libs/alsa-lib"
137 fi
138 }
139
140 src_unpack() {
141 kde_src_unpack
142
143 if use legacyssl ; then
144 # This patch won't be included upstream, see bug #128922.
145 epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
146 fi
147
148 if use utempter ; then
149 # Bug #135818 is the eternal reference.
150 epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
151 fi
152
153 if use branding ; then
154 # Add "(Gentoo)" to khtml user agent.
155 epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
156 fi
157
158 # Xinerama patch by Lubos Lunak.
159 # http://ktown.kde.org/~seli/xinerama/
160 epatch "${WORKDIR}/${PN}-xinerama.patch"
161
162 # Fixes bug 212749 (upstream bug 158069)
163 epatch "${FILESDIR}/${P}-cursor.patch"
164
165 # Fixes bug 203433 (upstream bug 125206)
166 epatch "${FILESDIR}/${P}-bug_203433_khtml.patch"
167
168 # Security bug 218933
169 epatch "${FILESDIR}/${PN}-3.5.8-kinit-CVE-2008-1671.patch"
170 }
171
172 src_compile() {
173 rm -f "${S}/configure"
174
175 myconf="--with-distribution=Gentoo --disable-fast-malloc
176 --with-libart --with-libidn --with-ssl
177 --without-hspell
178 $(use_enable fam libfam) $(use_enable kernel_linux dnotify)
179 $(use_with acl) $(use_with alsa)
180 $(use_with arts) $(use_enable cups)
181 $(use_with kerberos gssapi) $(use_with tiff)
182 $(use_with jpeg2k jasper) $(use_with openexr)
183 $(use_with utempter) $(use_with lua)
184 $(use_enable kernel_linux sendfile) --enable-mitshm
185 $(use_with spell aspell)"
186
187 if use avahi || use bindist ; then
188 myconf="${myconf} --disable-dnssd"
189 else
190 myconf="${myconf} --enable-dnssd"
191 fi
192
193 if has_version x11-apps/rgb; then
194 myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
195 fi
196
197 # fix bug 58179, bug 85593
198 # kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
199 # closer look... - corsair
200 use ppc64 && append-flags "-mminimal-toc"
201
202 # work around bug #120858, gcc 3.4.x -Os miscompilation
203 use x86 && replace-flags "-Os" "-O2" # see bug #120858
204
205 replace-flags "-O3" "-O2" # see bug #148180
206
207 kde_src_compile
208
209 if use doc; then
210 emake apidox || die
211 fi
212 }
213
214 src_install() {
215 kde_src_install
216
217 if use doc; then
218 emake DESTDIR="${D}" install-apidox || die
219 fi
220
221 # Needed to create lib -> lib64 symlink for amd64 2005.0 profile
222 if [ "${SYMLINK_LIB}" = "yes" ]; then
223 dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
224 fi
225
226 # Get rid of the disabled version of the kdnsd libraries
227 if use avahi || use bindist ; then
228 rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
229 fi
230
231 dodir /etc/env.d
232
233 # List all the multilib libdirs
234 local libdirs
235 for libdir in $(get_all_libdirs); do
236 libdirs="${libdirs}:${PREFIX}/${libdir}"
237 done
238
239 # Please note that the KDE install path has to be the last value in KDEDIRS.
240 cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
241 PATH=${PREFIX}/bin
242 ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
243 LDPATH=${libdirs:1}
244 MANPATH=${PREFIX}/share/man
245 CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
246 KDEDIRS="/usr:/usr/local:${PREFIX}"
247 #KDE_IS_PRELINKED=1
248 XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
249 COLON_SEPARATED="XDG_DATA_DIRS"
250 EOF
251
252 # Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
253 dodir /etc/revdep-rebuild
254
255 cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
256 SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
257 EOF
258 }
259
260
261
262 --
263 gentoo-commits@l.g.o mailing list