From: Carsten Lohrke <carlo@gentoo.org>
Date: Wed, 25 Apr 2007 08:48:16 +0000 (+0000)
Subject: KJS and Kate fixes from branch, KDE bug #130896, fix bug #135818 (again), bug #153533... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fbadc34d523598886ffa969db3938efad886ebb;p=gentoo.git

KJS and Kate fixes from branch, KDE bug #130896, fix bug #135818 (again), bug #153533 and bug #155751.
Package-Manager: portage-2.1.2.4
---

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 40125bd148f7..49face7e3d01 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.450 2007/04/09 19:35:43 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.451 2007/04/25 08:48:16 carlo Exp $
+
+*kdelibs-3.5.6-r6 (25 Apr 2007)
+
+  25 Apr 2007; Carsten Lohrke <carlo@gentoo.org> +kdelibs-3.5.6-r6.ebuild:
+  KJS and Kate fixes from branch, KDE bug #130896, fix bug #135818 (again),
+  bug #153533 and bug #155751.
 
   09 Apr 2007; Marcus D. Hanwell <cryos@gentoo.org>
   kdelibs-3.5.5-r10.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index f44ea0aba23c..0fe07910a1cd 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX CVE-2007-1564-kdelibs-3.5.6.diff 2835 RMD160 894a9c5f51da21022b9448da957893a57384c065 SHA1 a296f0dff11007f835bdbca23b259ad8483aa4c9 SHA256 2def5a86817220df9c701d9ad22059c9ef884273a44fee3e12d7b269d8b8e52c
 MD5 62872147c2d369feb3d9077e9b32b03d files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
 RMD160 894a9c5f51da21022b9448da957893a57384c065 files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
@@ -43,6 +40,7 @@ RMD160 8dc78056fadc29ac324eb6daec27cf06a3f33a64 files/kdelibs-3.5.6-kjs-xss.diff
 SHA256 124ba2baf644585a7f348e232ff7f7b13949b5948bf7ce3cc6f3af220d3776e8 files/kdelibs-3.5.6-kjs-xss.diff 1339
 DIST kdelibs-3.5-patchset-05.tar.bz2 36423 RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 SHA1 138232cf05ab131a51f3b3febfdd8a3cbc42d45f SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a
 DIST kdelibs-3.5-patchset-06.tar.bz2 18862 RMD160 e7f59e24897d83432ba5bd908e8dae168c1ae3e1 SHA1 5798ee57ccc43a9e7f5d05a4c89be965ce39f28a SHA256 5b3ef71460779a0b16ec87628de7d3d76bae643e86c5b029c07b5541bf0cd16b
+DIST kdelibs-3.5-patchset-07.tar.bz2 23971 RMD160 9e404a2523fd4dbc13ef93803b0752979cb9dd95 SHA1 47e9263f6d580f4316f3188d3e6ecac9f4bb8fbd SHA256 00792cc883b9f8e9b88e1c9efecaac1cc6814f9e7f80b9fda67d3495f8758182
 DIST kdelibs-3.5.5-seli-xinerama.patch.bz2 5470 RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 SHA1 1f1e7a02e0dfc35fd2d27d8983a16e53e42397c0 SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c
 DIST kdelibs-3.5.5.tar.bz2 15486690 RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 SHA1 7961818e41e22cce7c58219c4eb63ed5fbb94307 SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3
 DIST kdelibs-3.5.6.tar.bz2 15509460 RMD160 ce8c088e13f0e59238719600da9c768eac58b57d SHA1 2cc15499bd2191bd9333cfd1892b5ecf1199fbfd SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c
@@ -90,10 +88,14 @@ EBUILD kdelibs-3.5.6-r5.ebuild 6153 RMD160 1101a5391608695a4abe5deaf42caa8af0ece
 MD5 29314504c485d4f21723a0eb704d16e7 kdelibs-3.5.6-r5.ebuild 6153
 RMD160 1101a5391608695a4abe5deaf42caa8af0ecedd9 kdelibs-3.5.6-r5.ebuild 6153
 SHA256 ac5dad37a46aeec439f742bdbf0959b773af39a94b0b332f82ecddd1a75aea6c kdelibs-3.5.6-r5.ebuild 6153
-MISC ChangeLog 72742 RMD160 a38b80b6620852fe4880a1d3bfa7a1a30f781dea SHA1 0125a582f1b1083689be2b487352dcfe38e16719 SHA256 c4187eeeedd54203ac5a844f6b1bc82d2ca53da7a02003e908e6bd63ded6cdd9
-MD5 ebd2458023773080238d8d8f0acdda8e ChangeLog 72742
-RMD160 a38b80b6620852fe4880a1d3bfa7a1a30f781dea ChangeLog 72742
-SHA256 c4187eeeedd54203ac5a844f6b1bc82d2ca53da7a02003e908e6bd63ded6cdd9 ChangeLog 72742
+EBUILD kdelibs-3.5.6-r6.ebuild 6535 RMD160 c8eea1e7b0335aef9c74719c70a710e866f8238f SHA1 8fe80a0080dddf41639358f8454b8623f3411012 SHA256 01a21459bea501cee5408e756afcc27ae074f3bbf11201a7175febf11b1249bb
+MD5 0a04e8b84ddde168dea3f3bbf2677374 kdelibs-3.5.6-r6.ebuild 6535
+RMD160 c8eea1e7b0335aef9c74719c70a710e866f8238f kdelibs-3.5.6-r6.ebuild 6535
+SHA256 01a21459bea501cee5408e756afcc27ae074f3bbf11201a7175febf11b1249bb kdelibs-3.5.6-r6.ebuild 6535
+MISC ChangeLog 72958 RMD160 898439f3003e90c00b5d56e5acd59f2497a42c4d SHA1 a11b312e235c459a65001447b0c4bacdede57d01 SHA256 f41169096341d1751c62f9872604fca30a839e5cfd070974a58e8c20655f5116
+MD5 f24209e2974c243ea85611dfe6f5316b ChangeLog 72958
+RMD160 898439f3003e90c00b5d56e5acd59f2497a42c4d ChangeLog 72958
+SHA256 f41169096341d1751c62f9872604fca30a839e5cfd070974a58e8c20655f5116 ChangeLog 72958
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -131,10 +133,6 @@ SHA256 d5b5e2137db88c1c903fdff689b4dd29929f9e1e8b4336fb64fb0e82094d5d88 files/di
 MD5 a6b88c536ad0a3876cff52e9ef993e08 files/digest-kdelibs-3.5.6-r5 807
 RMD160 e0cf98b485540d3ed5d3c74c3c65f3637fb1b851 files/digest-kdelibs-3.5.6-r5 807
 SHA256 abf6d8962d3cd69375773bcc17af35186f8854af77d80c0155cb5c1b6bb1ea85 files/digest-kdelibs-3.5.6-r5 807
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGGpWWntT9W3vfTuoRAjWSAJ9SC57QJ3PBZmhyTDKCIO1lFOW7dgCePFny
-gXv+sRpC8apnin3nQNU3/G0=
-=3Rxx
------END PGP SIGNATURE-----
+MD5 ae0fba83125f960623dbc3031e3e7b8c files/digest-kdelibs-3.5.6-r6 807
+RMD160 e5835fbc3135389470c7ea8b7d983a94cfb2a60b files/digest-kdelibs-3.5.6-r6 807
+SHA256 7213f3a2cbc1374c5ed04c42309fa695291579a2a5c0851e761033eb8ecf2676 files/digest-kdelibs-3.5.6-r6 807
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r6 b/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r6
new file mode 100644
index 000000000000..f0752c68254d
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r6
@@ -0,0 +1,9 @@
+MD5 d2d9cb1640b374239995ed7d850e2547 kdelibs-3.5-patchset-07.tar.bz2 23971
+RMD160 9e404a2523fd4dbc13ef93803b0752979cb9dd95 kdelibs-3.5-patchset-07.tar.bz2 23971
+SHA256 00792cc883b9f8e9b88e1c9efecaac1cc6814f9e7f80b9fda67d3495f8758182 kdelibs-3.5-patchset-07.tar.bz2 23971
+MD5 d8ce997461cb1aa2255032f02fd14326 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+RMD160 46ed378f1ff2f7e2fa113aa0bf51eae1758264f9 kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+SHA256 8d002a55954aabdb91a534a1b1f1f37c706faebbae0398fb5a2ff29eeb66954c kdelibs-3.5.5-seli-xinerama.patch.bz2 5470
+MD5 e4d137879a66e92b895b3de5413a61d8 kdelibs-3.5.6.tar.bz2 15509460
+RMD160 ce8c088e13f0e59238719600da9c768eac58b57d kdelibs-3.5.6.tar.bz2 15509460
+SHA256 06766202c6ae21277b7879f363ed88fde8016586ec8c94deb59be260f2231b5c kdelibs-3.5.6.tar.bz2 15509460
diff --git a/kde-base/kdelibs/kdelibs-3.5.6-r6.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r6.ebuild
new file mode 100644
index 000000000000..3e79a3ff6881
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.6-r6.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.6-r6.ebuild,v 1.1 2007/04/25 08:48:16 carlo Exp $
+
+inherit kde flag-o-matic eutils multilib
+set-kdedir 3.5
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
+	mirror://gentoo/kdelibs-3.5-patchset-07.tar.bz2
+	mirror://gentoo/${PN}-3.5.5-seli-xinerama.patch.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl alsa arts branding cups doc jpeg2k kerberos legacyssl utempter openexr spell ssl tiff
+zeroconf avahi kernel_linux fam lua linguas_he kdehiddenvisibility"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+
+# Added aspell-en as dependency to work around bug 131512.
+RDEPEND="$(qt_min_version 3.3.3)
+	arts? ( >=kde-base/arts-3.5.5 )
+	app-arch/bzip2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	>=dev-libs/libxslt-1.1.16
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-4.2
+	media-libs/libart_lgpl
+	net-dns/libidn
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( >=net-print/cups-1.1.19 )
+	tiff? ( media-libs/tiff )
+	kerberos? ( virtual/krb5 )
+	jpeg2k? ( media-libs/jasper )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	zeroconf? (	!avahi? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
+	fam? ( virtual/fam )
+	virtual/ghostscript
+	utempter? ( sys-libs/libutempter )
+	!kde-base/kde-env
+	lua? ( dev-lang/lua )
+	spell? ( app-text/aspell app-dicts/aspell-en
+		linguas_he? ( >=app-text/hspell-1.0 ) )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+	|| ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 ) "
+
+PDEPEND="zeroconf? ( avahi? ( kde-misc/kdnssd-avahi ) )"
+
+# Testing code is rather broken and merely for developer purposes, so disable it.
+RESTRICT="test"
+
+pkg_setup() {
+	if use legacyssl ; then
+		echo ""
+		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
+		elog "sites, but breaks others instead. It is strongly discouraged to use it."
+		elog "For more information, see bug #128922."
+		echo ""
+	fi
+	if ! use utempter ; then
+		echo ""
+		elog "On some setups, which rely on the correct update of utmp records, not using"
+		elog "utempter might not update them correctly. If you experience unexpected"
+		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
+		echo ""
+	fi
+
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror "The alsa USE flag in this package enables ALSA support"
+		eerror "for libkmid, KDE midi library."
+		eerror "For this reason, you have to merge media-libs/alsa-lib"
+		eerror "with the midi USE flag enabled, or disable alsa USE flag"
+		eerror "for this package."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if use legacyssl ; then
+		# This patch won't be included upstream, see bug #128922
+		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
+	fi
+
+	if use utempter ; then
+		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch" || die "Failed to apply patch for utempter support."
+	fi
+
+	if use branding ; then
+		# add "(Gentoo)" to khtml user agent
+		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
+	fi
+
+	# xinerama patch from Lubos Lunak
+	# http://ktown.kde.org/~seli/xinerama/
+	epatch "${DISTDIR}/${PN}-3.5.5-seli-xinerama.patch.bz2"
+}
+
+src_compile() {
+	rm -f "${S}/configure"
+
+	myconf="--with-distribution=Gentoo --disable-fast-malloc
+			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+			--with-libart --with-libidn
+			$(use_with acl) $(use_with ssl)
+			$(use_with alsa) $(use_with arts)
+			$(use_with kerberos gssapi) $(use_with tiff)
+			$(use_with jpeg2k jasper) $(use_with openexr)
+			$(use_enable cups)
+			$(use_with utempter) $(use_with lua)
+			$(use_enable kernel_linux sendfile) --enable-mitshm
+			$(use_with spell aspell)"
+
+	if use zeroconf && ! use avahi; then
+		myconf="${myconf} --enable-dnssd"
+	else
+		myconf="${myconf} --disable-dnssd"
+	fi
+
+	if use spell; then
+		myconf="${myconf} $(use_with linguas_he hspell)"
+	else
+		myconf="${myconf} --without-hspell"
+	fi
+
+	if has_version x11-apps/rgb; then
+		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
+	fi
+
+	# fix bug 58179, bug 85593
+	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
+	# closer look... - corsair
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# work around bug #120858, gcc 3.4.x -Os miscompilation
+	use x86 && replace-flags "-Os" "-O2" # see bug #120858
+
+	use amd64 && replace-flags "-O3" "-O2" # see bug #148180
+
+	export BINDNOW_FLAGS="$(bindnow-flags)"
+
+	kde_src_compile
+
+	if use doc; then
+		make apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+
+	if use doc; then
+		make DESTDIR="${D}" install-apidox || die
+	fi
+
+	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
+	fi
+
+	# Get rid of the disabled version of the kdnsd libraries
+	if use zeroconf && use avahi; then
+		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
+	fi
+
+	dodir /etc/env.d
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	# Please note that the KDE install path has to be the last value in KDEDIRS.
+	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
+PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+MANPATH=${PREFIX}/share/man
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+KDEDIRS="/usr:/usr/local:${PREFIX}"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+XDG_CONFIG_DIRS="/etc/xdg:${PREFIX}/etc/xdg"
+COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"
+EOF
+
+cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+EOF
+}
+
+pkg_postinst() {
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
+		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+		elog "	hosts: files mdns dns"
+		echo
+	fi
+}