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