Fix a problem with colon in path name, multiple kio issues, a crash fix and a minor mem leak closed. Kate cursor and code folding as well as a KHTML rendering fix. KDE bugs 94693, 111760, 130104, 139578, 145428, 146105 among others.

Package-Manager: portage-2.1.3_rc9

4 files changed, 231 insertions, 5 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 61e35301a64e..6b0154bec199 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.469 2007/07/22 10:50:03 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.470 2007/07/25 17:09:36 carlo Exp $
+
+*kdelibs-3.5.7-r1 (25 Jul 2007)
+
+  25 Jul 2007; Carsten Lohrke <carlo@gentoo.org> +kdelibs-3.5.7-r1.ebuild:
+  Fix a problem with colon in path name, multiple kio issues, a crash fix and
+  a minor mem leak closed. Kate cursor and code folding as well as a KHTML
+  rendering fix. KDE bugs 94693, 111760, 130104, 139578, 145428, 146105 among
+  others.
 
   22 Jul 2007; Denis Dupeyron <calchan@gentoo.org> kdelibs-3.5.5-r4.ebuild,
   kdelibs-3.5.5-r10.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 532a65ebf86e..5c9bc2714a30 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -48,6 +48,7 @@ RMD160 99e287e3629e0eb8533ef56006005f3c588460d8 files/kdelibs-3.5.7-html-style.p
 SHA256 f306c01fa0da370ecfec9887e9b8c4828437e4bfbc30c84cf5ff2bc5939a1c18 files/kdelibs-3.5.7-html-style.patch 517
 DIST kdelibs-3.5-patchset-05.tar.bz2 36423 RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 SHA1 138232cf05ab131a51f3b3febfdd8a3cbc42d45f SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a
 DIST kdelibs-3.5-patchset-08.tar.bz2 19973 RMD160 ea2edb4973cca353baabc89559f11c3db76c9ab2 SHA1 4c17a0b5577e98e28444f5e038ed06e3b2382c12 SHA256 24461470100d91c1374f5257be5e73767389df9ce8fb9e26af8b6b2030c3963a
+DIST kdelibs-3.5-patchset-09.tar.bz2 19635 RMD160 c4b60c466ba1625c61259b075fd2b7815b5c1b06 SHA1 7bb4d04c5256d2ca2dc5acc8ea12d4b35a1c347c SHA256 d48a856f2fefe79d3b2064b506ba24cf37b5071cdbbb4eea3cdd78c65a38a94b
 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
@@ -73,14 +74,18 @@ EBUILD kdelibs-3.5.6-r9.ebuild 6025 RMD160 464715139e3f458519f69cebc1aa0e49b4bda
 MD5 fb6efd1a99fce245cedf0236e07586ad kdelibs-3.5.6-r9.ebuild 6025
 RMD160 464715139e3f458519f69cebc1aa0e49b4bdadae kdelibs-3.5.6-r9.ebuild 6025
 SHA256 a74869f86741dd13cbae755dcbc6338e31cc4bb74b2bed1707d4e713dfd6d589 kdelibs-3.5.6-r9.ebuild 6025
+EBUILD kdelibs-3.5.7-r1.ebuild 5980 RMD160 1673334736bb6614a898c258b7cf6fa26f52f4cf SHA1 e48266a2af3d20ab9419e7ba2dc212b8316379c4 SHA256 7dca1e34f8c60a58aaf129488139477b9391465f4f5708e48a756b5a669ecf27
+MD5 5589304fd343c047d499b661987cc089 kdelibs-3.5.7-r1.ebuild 5980
+RMD160 1673334736bb6614a898c258b7cf6fa26f52f4cf kdelibs-3.5.7-r1.ebuild 5980
+SHA256 7dca1e34f8c60a58aaf129488139477b9391465f4f5708e48a756b5a669ecf27 kdelibs-3.5.7-r1.ebuild 5980
 EBUILD kdelibs-3.5.7.ebuild 6010 RMD160 7c16918e0bfacb4b293bdb5c729ec1c4c2e69ff6 SHA1 fe2cd018d634674f793aa38ebdc13d8dec6708a7 SHA256 8c13c4ed11eeee80b3d98470f9cd18e1f8591dcc0e6a5ec70ab0a707264debd9
 MD5 36327ad34df10d38d9db0845cae8b5a3 kdelibs-3.5.7.ebuild 6010
 RMD160 7c16918e0bfacb4b293bdb5c729ec1c4c2e69ff6 kdelibs-3.5.7.ebuild 6010
 SHA256 8c13c4ed11eeee80b3d98470f9cd18e1f8591dcc0e6a5ec70ab0a707264debd9 kdelibs-3.5.7.ebuild 6010
-MISC ChangeLog 76114 RMD160 4bc66e486459c9bcd5f091f7829b7574d1707706 SHA1 a3027675c269cd482a61c6ffa0da363000016590 SHA256 cb1c0e75afaa96f3114721249e4b89abfe4358208e2913cf5680dd61ee43d471
-MD5 02a277c43fd1fd975e37e95b2bfbd421 ChangeLog 76114
-RMD160 4bc66e486459c9bcd5f091f7829b7574d1707706 ChangeLog 76114
-SHA256 cb1c0e75afaa96f3114721249e4b89abfe4358208e2913cf5680dd61ee43d471 ChangeLog 76114
+MISC ChangeLog 76462 RMD160 7d688db066b68310ca6f8281c7b96a7c27fbde61 SHA1 6d6578822f9abd296991614040550420706c86ad SHA256 ea8a42b7f388b7291ad4d4899fae964cdc40421318cc72fd6ad2866bc853a3af
+MD5 c46b12e2fae989b0b5c52c674c50e795 ChangeLog 76462
+RMD160 7d688db066b68310ca6f8281c7b96a7c27fbde61 ChangeLog 76462
+SHA256 ea8a42b7f388b7291ad4d4899fae964cdc40421318cc72fd6ad2866bc853a3af ChangeLog 76462
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -103,3 +108,6 @@ SHA256 c8d07b98bd3c441e1b22c0221e8436cb5bf3c97a7b448739f70f9915d933f982 files/di
 MD5 e5be708b0dc275f2d227e4a0e3a48953 files/digest-kdelibs-3.5.7 807
 RMD160 fd9d08f9dc9732d5691da910dcb4b35f7bfff3eb files/digest-kdelibs-3.5.7 807
 SHA256 f177c1614b6bc2ef9225d6221ed5137738c80fe934658a0666e124bd54d45460 files/digest-kdelibs-3.5.7 807
+MD5 567dc6a13cb89a7708e5a36b394b0e81 files/digest-kdelibs-3.5.7-r1 807
+RMD160 1540da4be0e19a71be31448d673d341dec0839af files/digest-kdelibs-3.5.7-r1 807
+SHA256 d3a2c8324dcefa65441e567e04ee6433e738901062ade18d9f9c3ce1ce0aa294 files/digest-kdelibs-3.5.7-r1 807
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.7-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.5.7-r1
new file mode 100644
index 000000000000..3ebc80f10485
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.7-r1
@@ -0,0 +1,9 @@
+MD5 11858109ea90e26d34e48a6f0595872a kdelibs-3.5-patchset-09.tar.bz2 19635
+RMD160 c4b60c466ba1625c61259b075fd2b7815b5c1b06 kdelibs-3.5-patchset-09.tar.bz2 19635
+SHA256 d48a856f2fefe79d3b2064b506ba24cf37b5071cdbbb4eea3cdd78c65a38a94b kdelibs-3.5-patchset-09.tar.bz2 19635
+MD5 34110d31ae3f56fb37c8a789bffdf65d kdelibs-3.5.7-seli-xinerama.patch.bz2 5226
+RMD160 9eab19cc60cb71d66c0e074242b691c5e8c0c391 kdelibs-3.5.7-seli-xinerama.patch.bz2 5226
+SHA256 6f710ca8d0b3c4789751a1e4630442d04830a8f5aef163d9fd6823bbd6e4e202 kdelibs-3.5.7-seli-xinerama.patch.bz2 5226
+MD5 50ed644f2ec91963570fe2b155652957 kdelibs-3.5.7.tar.bz2 15576038
+RMD160 006c57ef85956ed3903749cace254bdfdf2f347e kdelibs-3.5.7.tar.bz2 15576038
+SHA256 05bc5d0d18b787d964f7c45cc078b047d450d3ddc28b1bde839a26a2eda2c5d9 kdelibs-3.5.7.tar.bz2 15576038
diff --git a/kde-base/kdelibs/kdelibs-3.5.7-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..337b4e5f076f
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.7-r1.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.7-r1.ebuild,v 1.1 2007/07/25 17:09:36 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-09.tar.bz2
+	mirror://gentoo/${PN}-3.5.7-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 tiff
+avahi kernel_linux fam lua kdehiddenvisibility"
+
+# Added aspell-en as dependency to work around bug 131512.
+# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
+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-6.6
+	media-libs/libart_lgpl
+	net-dns/libidn
+	>=dev-libs/openssl-0.9.7d
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	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 )
+	!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-0.60.5 >=app-dicts/aspell-en-6.0.0 )
+	>=sys-apps/portage-2.1.2.6
+	!kde-base/ksync"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth"
+
+PDEPEND="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
+		# Bug #135818 is the eternal reference.
+		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.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.7-seli-xinerama.patch.bz2"
+}
+
+src_compile() {
+	rm -f "${S}/configure"
+
+	myconf="--with-distribution=Gentoo --disable-fast-malloc
+			--with-libart --with-libidn --with-ssl
+			--without-hspell
+			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+			$(use_with acl) $(use_with alsa)
+			$(use_with arts) $(use_enable cups)
+			$(use_with kerberos gssapi) $(use_with tiff)
+			$(use_with jpeg2k jasper) $(use_with openexr)
+			$(use_with utempter) $(use_with lua)
+			$(use_enable kernel_linux sendfile) --enable-mitshm
+			$(use_with spell aspell)"
+
+	if ! use avahi; then
+		myconf="${myconf} --enable-dnssd"
+	else
+		myconf="${myconf} --disable-dnssd"
+	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
+
+	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 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"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+
+	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
+	dodir /etc/revdep-rebuild
+
+cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+EOF
+}