From: Carsten Lohrke <carlo@gentoo.org>
Date: Sat, 31 Mar 2007 20:39:24 +0000 (+0000)
Subject: Fix bug 172527, the KDE bugs 103741, 126812, 133937, 134101, 141253, 141392, 141621... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=713ee0921b8109643784c173488107c71d7e69d3;p=gentoo.git

Fix bug 172527, the KDE bugs 103741, 126812, 133937, 134101, 141253, 141392, 141621, 142050, 142202 and address some other issues.
Package-Manager: portage-2.1.2.3
---

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 1cd63814dff1..5081ffc3f8de 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.441 2007/03/31 18:07:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.442 2007/03/31 20:39:23 carlo Exp $
+
+*kdelibs-3.5.6-r5 (31 Mar 2007)
+
+  31 Mar 2007; Carsten Lohrke <carlo@gentoo.org> +kdelibs-3.5.6-r5.ebuild:
+  Fix bug 172527, the KDE bugs 103741, 126812, 133937, 134101, 141253, 141392,
+  141621, 142050, 142202 and address some other issues.
 
   31 Mar 2007; Raúl Porcel <armin76@gentoo.org> kdelibs-3.5.5-r10.ebuild:
   ia64 + x86 stable wrt security bug 172527
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 150c15bba0a3..bef01ffc9638 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -39,6 +39,7 @@ MD5 a54d2a43e3dfca929a0911c73d9f8de6 files/kdelibs-3.5.6-kjs-xss.diff 1339
 RMD160 8dc78056fadc29ac324eb6daec27cf06a3f33a64 files/kdelibs-3.5.6-kjs-xss.diff 1339
 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.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
@@ -82,10 +83,14 @@ EBUILD kdelibs-3.5.6-r4.ebuild 6095 RMD160 99e40946bb1b1f4f97418c009315ed6699697
 MD5 95410947a63ed7933013dc1a3b52b8ed kdelibs-3.5.6-r4.ebuild 6095
 RMD160 99e40946bb1b1f4f97418c009315ed6699697f42 kdelibs-3.5.6-r4.ebuild 6095
 SHA256 7a5d657746e6e0786edfe4370662c1271bd1c71b884413c0aeab6a3af474e616 kdelibs-3.5.6-r4.ebuild 6095
-MISC ChangeLog 71599 RMD160 7bc3f0e6a0dc6250aa0ef3e3e93a5cb6848ac854 SHA1 43137a5ef4a183930b35c06285492a99c2c56fd8 SHA256 05efd452945ec07deb360da778f00f07573a8ba96e07a10218994b26e441e4c8
-MD5 d8c2b86efcfa4bf579c213da76a363c2 ChangeLog 71599
-RMD160 7bc3f0e6a0dc6250aa0ef3e3e93a5cb6848ac854 ChangeLog 71599
-SHA256 05efd452945ec07deb360da778f00f07573a8ba96e07a10218994b26e441e4c8 ChangeLog 71599
+EBUILD kdelibs-3.5.6-r5.ebuild 6100 RMD160 3429e06e8fcc81610857fba7f6332b2973c370d0 SHA1 ecb91eb6ed34476327e90a16025b7501bf58bccb SHA256 8c2bcb586d045d50dc7944dc1cf28b91935c4f8a77dc73fc2ff3a3dff9e1912c
+MD5 1050a091d6fcf23ba9998669181d7e08 kdelibs-3.5.6-r5.ebuild 6100
+RMD160 3429e06e8fcc81610857fba7f6332b2973c370d0 kdelibs-3.5.6-r5.ebuild 6100
+SHA256 8c2bcb586d045d50dc7944dc1cf28b91935c4f8a77dc73fc2ff3a3dff9e1912c kdelibs-3.5.6-r5.ebuild 6100
+MISC ChangeLog 71841 RMD160 e89f45df0925ec28a98409f740dce1bfc717b3b3 SHA1 a4b93182f9bb401f8a7faa64a138357cc10f050d SHA256 1c63b8a37558194c4cbfee58010d359a2e4a2c41711fe7418fa88e225351b2f0
+MD5 6347e8ca9389f130f6902b2199cc0796 ChangeLog 71841
+RMD160 e89f45df0925ec28a98409f740dce1bfc717b3b3 ChangeLog 71841
+SHA256 1c63b8a37558194c4cbfee58010d359a2e4a2c41711fe7418fa88e225351b2f0 ChangeLog 71841
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -120,3 +125,6 @@ SHA256 d5b5e2137db88c1c903fdff689b4dd29929f9e1e8b4336fb64fb0e82094d5d88 files/di
 MD5 b82df77d8d947cfd51e3fad1ce093674 files/digest-kdelibs-3.5.6-r4 807
 RMD160 e5e25e17340fbe888f9c28829d332c34148d1f06 files/digest-kdelibs-3.5.6-r4 807
 SHA256 d5b5e2137db88c1c903fdff689b4dd29929f9e1e8b4336fb64fb0e82094d5d88 files/digest-kdelibs-3.5.6-r4 807
+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
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r5 b/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r5
new file mode 100644
index 000000000000..5e996a9a69f1
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.6-r5
@@ -0,0 +1,9 @@
+MD5 2aa1485ed4aa2fbf38ad3d97d4022829 kdelibs-3.5-patchset-06.tar.bz2 18862
+RMD160 e7f59e24897d83432ba5bd908e8dae168c1ae3e1 kdelibs-3.5-patchset-06.tar.bz2 18862
+SHA256 5b3ef71460779a0b16ec87628de7d3d76bae643e86c5b029c07b5541bf0cd16b kdelibs-3.5-patchset-06.tar.bz2 18862
+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-r5.ebuild b/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild
new file mode 100644
index 000000000000..0e3d865d991a
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.6-r5.ebuild
@@ -0,0 +1,201 @@
+# 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-r5.ebuild,v 1.1 2007/03/31 20:39:23 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-06.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 that relies 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 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
+
+	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
+
+	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="${PREFIX}:/usr:/usr/local"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+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
+}