1 |
cryos 08/10/12 00:59:15 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: kdelibs-3.5.10-r2.ebuild |
5 |
Removed: kdelibs-3.5.10.ebuild |
6 |
Log: |
7 |
Moving kdeglobals to kdelibs for non-KDE users using KDE apps. |
8 |
(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.545 kde-base/kdelibs/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.545&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?rev=1.545&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/ChangeLog?r1=1.544&r2=1.545 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v |
20 |
retrieving revision 1.544 |
21 |
retrieving revision 1.545 |
22 |
diff -u -r1.544 -r1.545 |
23 |
--- ChangeLog 7 Oct 2008 12:21:26 -0000 1.544 |
24 |
+++ ChangeLog 12 Oct 2008 00:59:15 -0000 1.545 |
25 |
@@ -1,6 +1,12 @@ |
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.544 2008/10/07 12:21:26 cryos Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.545 2008/10/12 00:59:15 cryos Exp $ |
30 |
+ |
31 |
+*kdelibs-3.5.10-r2 (12 Oct 2008) |
32 |
+ |
33 |
+ 12 Oct 2008; Marcus D. Hanwell <cryos@g.o> -kdelibs-3.5.10.ebuild, |
34 |
+ +kdelibs-3.5.10-r2.ebuild: |
35 |
+ Moving kdeglobals to kdelibs for non-KDE users using KDE apps. |
36 |
|
37 |
*kdelibs-3.5.10-r1 (07 Oct 2008) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 kde-base/kdelibs/kdelibs-3.5.10-r2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r2.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r2.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: kdelibs-3.5.10-r2.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2008 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r2.ebuild,v 1.1 2008/10/12 00:59:15 cryos Exp $ |
52 |
|
53 |
EAPI="1" |
54 |
inherit kde flag-o-matic eutils multilib |
55 |
set-kdedir 3.5 |
56 |
|
57 |
DESCRIPTION="KDE libraries needed by all KDE programs." |
58 |
HOMEPAGE="http://www.kde.org/" |
59 |
SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2 |
60 |
mirror://gentoo/kdelibs-3.5-patchset-15.tar.bz2 |
61 |
mirror://gentoo/kde-3.5.9-seli-xinerama.tar.bz2" |
62 |
|
63 |
LICENSE="GPL-2 LGPL-2" |
64 |
SLOT="3.5" |
65 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
66 |
IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff |
67 |
avahi kernel_linux fam lua kdehiddenvisibility" |
68 |
|
69 |
# Added aspell-en as dependency to work around bug 131512. |
70 |
# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984 |
71 |
RDEPEND="x11-libs/libXext |
72 |
arts? ( ~kde-base/arts-3.5.10 ) |
73 |
app-arch/bzip2 |
74 |
>=dev-libs/openssl-0.9.7d |
75 |
>=dev-libs/libxslt-1.1.16 |
76 |
>=dev-libs/libxml2-2.6.6 |
77 |
>=dev-libs/libpcre-6.6 |
78 |
media-libs/fontconfig |
79 |
>=media-libs/freetype-2 |
80 |
media-libs/libart_lgpl |
81 |
net-dns/libidn |
82 |
>=x11-libs/qt-3.3.3:3 |
83 |
acl? ( kernel_linux? ( sys-apps/acl ) ) |
84 |
alsa? ( media-libs/alsa-lib ) |
85 |
cups? ( >=net-print/cups-1.1.19 ) |
86 |
tiff? ( media-libs/tiff ) |
87 |
kerberos? ( virtual/krb5 ) |
88 |
jpeg2k? ( media-libs/jasper ) |
89 |
openexr? ( >=media-libs/openexr-1.2.2-r2 ) |
90 |
!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) ) |
91 |
fam? ( virtual/fam ) |
92 |
virtual/ghostscript |
93 |
utempter? ( sys-libs/libutempter ) |
94 |
!kde-base/kde-env |
95 |
lua? ( dev-lang/lua ) |
96 |
spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 ) |
97 |
>=sys-apps/portage-2.1.2.11 |
98 |
!kde-base/ksync |
99 |
!=kde-base/artsplugin-mpeglib-3.5* |
100 |
!=kde-base/artsplugin-mpg123-3.5* |
101 |
!=kde-base/mpeglib-3.5* |
102 |
!kde-base/kdeaccessibility |
103 |
!kde-base/kdeaddons |
104 |
!kde-base/kdeadmin |
105 |
!kde-base/kdeartwork |
106 |
!kde-base/kdebase |
107 |
!kde-base/kdeedu |
108 |
!kde-base/kdegames |
109 |
!kde-base/kdegraphics |
110 |
!kde-base/kde |
111 |
!kde-base/kdemultimedia |
112 |
!kde-base/kdenetwork |
113 |
!kde-base/kdepim |
114 |
!kde-base/kdesdk |
115 |
!kde-base/kdetoys |
116 |
!kde-base/kdeutils |
117 |
!kde-base/kdewebdev" |
118 |
|
119 |
DEPEND="${RDEPEND} |
120 |
doc? ( app-doc/doxygen ) |
121 |
sys-devel/gettext" |
122 |
|
123 |
RDEPEND="${RDEPEND} |
124 |
x11-apps/rgb |
125 |
x11-apps/iceauth |
126 |
!<=kde-base/kdebase-startkde-3.5.10-r3" |
127 |
|
128 |
PDEPEND="avahi? ( kde-misc/kdnssd-avahi ) |
129 |
bindist? ( kde-misc/kdnssd-avahi )" |
130 |
|
131 |
# Testing code is rather broken and merely for developer purposes, so disable it. |
132 |
RESTRICT="test" |
133 |
|
134 |
pkg_setup() { |
135 |
if use legacyssl ; then |
136 |
echo "" |
137 |
elog "You have the legacyssl use flag enabled, which fixes issues with some broken" |
138 |
elog "sites, but breaks others instead. It is strongly discouraged to use it." |
139 |
elog "For more information, see bug #128922." |
140 |
echo "" |
141 |
fi |
142 |
|
143 |
if ! use utempter ; then |
144 |
echo "" |
145 |
elog "On some setups, which rely on the correct update of utmp records, not using" |
146 |
elog "utempter might not update them correctly. If you experience unexpected" |
147 |
elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled." |
148 |
echo "" |
149 |
fi |
150 |
|
151 |
if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then |
152 |
eerror "The alsa USE flag in this package enables ALSA support" |
153 |
eerror "for libkmid, KDE midi library." |
154 |
eerror "For this reason, you have to merge media-libs/alsa-lib" |
155 |
eerror "with the midi USE flag enabled, or disable alsa USE flag" |
156 |
eerror "for this package." |
157 |
die "Missing midi USE flag on media-libs/alsa-lib" |
158 |
fi |
159 |
} |
160 |
|
161 |
src_unpack() { |
162 |
kde_src_unpack |
163 |
|
164 |
if use legacyssl ; then |
165 |
# This patch won't be included upstream, see bug #128922. |
166 |
epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch" |
167 |
fi |
168 |
|
169 |
if use utempter ; then |
170 |
# Bug #135818 is the eternal reference. |
171 |
epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch" |
172 |
fi |
173 |
|
174 |
if use branding ; then |
175 |
# Add "(Gentoo)" to khtml user agent. |
176 |
epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff" |
177 |
fi |
178 |
|
179 |
# Xinerama patch by Lubos Lunak. |
180 |
# http://ktown.kde.org/~seli/xinerama/ |
181 |
epatch "${WORKDIR}/${PN}-xinerama.patch" |
182 |
} |
183 |
|
184 |
src_compile() { |
185 |
rm -f "${S}/configure" |
186 |
|
187 |
myconf="--with-distribution=Gentoo --disable-fast-malloc |
188 |
--with-libart --with-libidn --with-ssl |
189 |
--without-hspell |
190 |
$(use_enable fam libfam) $(use_enable kernel_linux dnotify) |
191 |
$(use_with acl) $(use_with alsa) |
192 |
$(use_with arts) $(use_enable cups) |
193 |
$(use_with kerberos gssapi) $(use_with tiff) |
194 |
$(use_with jpeg2k jasper) $(use_with openexr) |
195 |
$(use_with utempter) $(use_with lua) |
196 |
$(use_enable kernel_linux sendfile) --enable-mitshm |
197 |
$(use_with spell aspell)" |
198 |
|
199 |
if use avahi || use bindist ; then |
200 |
myconf="${myconf} --disable-dnssd" |
201 |
else |
202 |
myconf="${myconf} --enable-dnssd" |
203 |
fi |
204 |
|
205 |
if has_version x11-apps/rgb; then |
206 |
myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt" |
207 |
fi |
208 |
|
209 |
# fix bug 58179, bug 85593 |
210 |
# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a |
211 |
# closer look... - corsair |
212 |
use ppc64 && append-flags "-mminimal-toc" |
213 |
|
214 |
# work around bug #120858, gcc 3.4.x -Os miscompilation |
215 |
use x86 && replace-flags "-Os" "-O2" # see bug #120858 |
216 |
|
217 |
replace-flags "-O3" "-O2" # see bug #148180 |
218 |
|
219 |
kde_src_compile |
220 |
|
221 |
if use doc; then |
222 |
emake apidox || die |
223 |
fi |
224 |
} |
225 |
|
226 |
src_install() { |
227 |
kde_src_install |
228 |
|
229 |
if use doc; then |
230 |
emake DESTDIR="${D}" install-apidox || die |
231 |
fi |
232 |
|
233 |
# Needed to create lib -> lib64 symlink for amd64 2005.0 profile |
234 |
if [ "${SYMLINK_LIB}" = "yes" ]; then |
235 |
dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib |
236 |
fi |
237 |
|
238 |
# Get rid of the disabled version of the kdnsd libraries |
239 |
if use avahi || use bindist ; then |
240 |
rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.* |
241 |
fi |
242 |
|
243 |
dodir /etc/env.d |
244 |
|
245 |
# List all the multilib libdirs |
246 |
local libdirs |
247 |
for libdir in $(get_all_libdirs); do |
248 |
libdirs="${libdirs}:${PREFIX}/${libdir}" |
249 |
done |
250 |
|
251 |
# KDE implies that the install path is listed first in KDEDIRS and the user |
252 |
# directory (implicitly added) to be the last entry. Doing otherwise breaks |
253 |
# certain functionality. Do not break this (once again *sigh*), but read the code. |
254 |
# KDE saves the installed path implicitly and so this is not needed, /usr |
255 |
# is set in ${PREFIX}/share/config/kdeglobals and so KDEDIRS is not needed. |
256 |
cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade |
257 |
PATH=${PREFIX}/bin |
258 |
ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin |
259 |
LDPATH=${libdirs:1} |
260 |
MANPATH=${PREFIX}/share/man |
261 |
CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config" |
262 |
#KDE_IS_PRELINKED=1 |
263 |
# Excessive flushing to disk as in releases before KDE 3.5.10. Usually you don't want that. |
264 |
#KDE_EXTRA_FSYNC=1 |
265 |
XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share" |
266 |
COLON_SEPARATED="XDG_DATA_DIRS" |
267 |
EOF |
268 |
|
269 |
# kdeglobals needed to make third party apps installed in /usr work |
270 |
# Moved from kdebase-startkde-3.5.10-r3 |
271 |
cat <<EOF > "${D}/${PREFIX}/share/config/kdeglobals" |
272 |
[Directories][\$i] |
273 |
dir_lib=/usr/$(get_libdir) |
274 |
dir_apps=/usr/share/applnk |
275 |
dir_data=/usr/share/apps |
276 |
dir_icon=/usr/share/icons |
277 |
dir_module=/usr/$(get_libdir)/kde3 |
278 |
dir_config=/usr/share/config |
279 |
dir_kcfg=/usr/share/config.kcfg |
280 |
dir_exe=/usr/bin |
281 |
dir_mime=/usr/share/mimelnk |
282 |
dir_services=/usr/share/services |
283 |
dir_servicetypes=/usr/share/servicetypes |
284 |
dir_templates=/usr/share/templates |
285 |
EOF |
286 |
|
287 |
# Install shell script to run KDE 3 applications from outside of the KDE 3 desktop |
288 |
# See http://lists.kde.org/?t=120569055200005&r=1&w=2 for reference |
289 |
|
290 |
# List all the multilib libdirs |
291 |
local _libdir _libdirs |
292 |
for _libdir in $(get_all_libdirs); do |
293 |
_libdirs="${_libdirs}:${PREFIX}/${_libdir}" |
294 |
done |
295 |
_libdirs=${_libdirs#:} |
296 |
|
297 |
# Merge KDE prefix and LDPATH |
298 |
sed -e "s#@REPLACE_PREFIX@#${PREFIX}#" \ |
299 |
-e "s#@REPLACE_LIBS@#${_libdirs}#" \ |
300 |
-i "${WORKDIR}/patches/kde3" || die "sed failed" |
301 |
dobin "${WORKDIR}/patches/kde3" |
302 |
|
303 |
# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441. |
304 |
dodir /etc/revdep-rebuild |
305 |
|
306 |
cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3 |
307 |
SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*" |
308 |
EOF |
309 |
} |