+kde-libs-3.5.10-r7.ebuild:

  fix bug 271372 (konqueror crashing on my.ebay and site with problematic table-layout)
  fix googlemaps map-display
  (both taken from debians kdelibs)

	modified:   Documentation/package.unmask/kde-3.5
	modified:   kde-base/kdelibs/ChangeLog
	modified:   kde-base/kdelibs/Manifest
	new file:   kde-base/kdelibs/files/kdelibs-3.5.10-62_fix_googlemaps_backport.diff
	new file:   kde-base/kdelibs/files/kdelibs-3.5.10-63_fixed-layout-table.diff
	new file:   kde-base/kdelibs/kdelibs-3.5.10-r7.ebuild

5 files changed, 340 insertions, 0 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 36911a8a..21b9a82f 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.629 2009/10/14 06:24:37 scarabeus Exp $
 
+ 18 Jan 2010; Roman v. Gemmeren <strowi@hasnoname.de>
+ +kde-libs-3.5.10-r7.ebuild,
+  fix bug 271372 (konqueror + my.ebay-crash)
+  fix googlemaps map-display
+
 *kdelibs-4.3.2-r2 (14 Oct 2009)
 *kdelibs-4.3.1-r2 (14 Oct 2009)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 7c7c73e1..4511091c 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,4 +1,6 @@
 AUX kdelibs-3.5-perl.xml.patch 693 RMD160 514773871e20bf2a8aedfb420e48a4db035f9ee6 SHA1 689c35414e26947566cf675478b67352dbaf00c4 SHA256 bae4a95af9a20b0eff01c33478ff392fef3c6c8be490e3103928da28c0cc0755
+AUX kdelibs-3.5.10-62_fix_googlemaps_backport.diff 2081 RMD160 be1b859810565c7bce9dc89729972ab712a57c1e SHA1 0c3e7c54dc121978f8029a5e3a8768e92276cbfd SHA256 c288963287b50eb382abd80de928ad2396ee0e8891baee1e0f5c81238e4f9d99
+AUX kdelibs-3.5.10-63_fixed-layout-table.diff 1140 RMD160 0b855a6eef14d38690342623757920df11777aea SHA1 d334c782bf2b833c6388272ae2cec682afe48dcd SHA256 bf7cb42be5a322dc794253b883e49fa879d330fc7ab924b6089cb0ea62ab62cf
 AUX kdelibs-3.5.10-glibc-2.10.patch 887 RMD160 467ea27befe92e3cf11fd8104e450e49fa2640b3 SHA1 4bdc64469e3edc0fcc842ea86094766d082f7c6f SHA256 f85cc8f6e3aae14ba0824cb2666ff036022571c52bd3aca2734c411c1cc01596
 AUX kdelibs-3.5.10-kde4-apps.patch 2505 RMD160 5213545e46cc5aa9d0d49f821c42b75a1740ffff SHA1 3c63987dee7dece95ab244811e02895d4965aebe SHA256 d12787734c1c64f830d9ab9cdc1d46828a30d2a4d9cf369ae8fae7e12e5f541c
 AUX kdelibs-3.5.10-khtml.patch 457 RMD160 71012469caf76fbaa75b147c624a5df32eafae19 SHA1 749d5a64a7b49d2b92f30f16b840e79f6bea8d83 SHA256 94d024590f7f846b85fd95745782e4c3f14c5d42004b652bf8bb904622b35dad
@@ -7,5 +9,6 @@ DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021
 DIST kdelibs-3.5-patchset-15.tar.bz2 6707 RMD160 55958374bfc4ba27caf573e13337677c35cbe2c0 SHA1 e0a35642adfcf223ce7490b21af1fa2c3d922b93 SHA256 4a25bc340ce2567ea017456b4aa2292b288779d59d0dd012bd50f5189fe739ec
 DIST kdelibs-3.5.10.tar.bz2 15614607 RMD160 4c960664283c83ebc8e68932ca9044336fcff223 SHA1 c930a25f4419134def55b8466c3a6f737227fb82 SHA256 617e9cb01c70ed4c1b554b373f55deffbd0e12e2cdfeacd7b3d9409372285c72
 EBUILD kdelibs-3.5.10-r6.ebuild 7407 RMD160 5b14da6e63445a43c1729a0d75519374914ae08a SHA1 148a0d44109c743c99e11e996dc91f10ab7a1673 SHA256 8658f5a7e49e5849070396925edfc67260480de821048dced7ed0590964aad23
+EBUILD kdelibs-3.5.10-r7.ebuild 7577 RMD160 ad460ef1634a7329ad6e43f86e917ed683346edc SHA1 6655cbe397c3d97598b91e00f24f57e0ccdcc8d8 SHA256 41ba655b0e6d81f6125d975e8341b435ae1441082a864041988df53b30a594ba
 MISC ChangeLog 105724 RMD160 9437b1a080fdfeb6c52137e8a8da701011ef8309 SHA1 b7b58e1c807a312881890b645fed3a26d73360e0 SHA256 2a783572d9f9c576fd78959f06d2d7b16e1b137271bafcb4c12d4869ca72c829
 MISC metadata.xml 375 RMD160 0a16bbd99eb0c4f3d89dbede17c5d6feea41c6ba SHA1 531b56c08557857a57c7833d2bab42cdf879b9a8 SHA256 3b5a8f2ca27aa45532679f3ab64756b02a953c5c11e86d9539cec95bab292b9b
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.10-62_fix_googlemaps_backport.diff b/kde-base/kdelibs/files/kdelibs-3.5.10-62_fix_googlemaps_backport.diff
new file mode 100644
index 00000000..c678a48d
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.10-62_fix_googlemaps_backport.diff
@@ -0,0 +1,39 @@
+backport fix for google maps
+
+--- kdelibs/khtml/ecma/kjs_dom.cpp	2007-05-14 09:52:40.000000000 +0200
++++ kdelibs/khtml/ecma/kjs_dom.cpp	2008-10-08 22:10:23.000000000 +0200
+@@ -335,26 +335,26 @@
+ 
+     switch (token) {
+     case OffsetLeft:
+-      return rend ? static_cast<Value>( Number( rend->offsetLeft() ) ) : Undefined();
++      return rend ? static_cast<Value>( Number( rend->offsetLeft() ) ) : Number(0);
+     case OffsetTop:
+-      return rend ? static_cast<Value>(  Number( rend->offsetTop() ) ) : Undefined();
++      return rend ? static_cast<Value>(  Number( rend->offsetTop() ) ) : Number(0);
+     case OffsetWidth:
+-      return rend ? static_cast<Value>(  Number( rend->offsetWidth() ) ) : Undefined();
++      return rend ? static_cast<Value>(  Number( rend->offsetWidth() ) ) : Number(0);
+     case OffsetHeight:
+-      return rend ? static_cast<Value>(  Number( rend->offsetHeight() ) ) : Undefined();
++      return rend ? static_cast<Value>(  Number( rend->offsetHeight() ) ) : Number(0);
+     case OffsetParent:
+     {
+       khtml::RenderObject* par = rend ? rend->offsetParent() : 0;
+       return getDOMNode( exec, par ? par->element() : 0 );
+     }
+     case ClientWidth:
+-      return rend ? static_cast<Value>( Number( rend->clientWidth() ) ) : Undefined();
++      return rend ? static_cast<Value>( Number( rend->clientWidth() ) ) : Number(0);
+     case ClientHeight:
+-      return rend ? static_cast<Value>( Number( rend->clientHeight() ) ) : Undefined();
++      return rend ? static_cast<Value>( Number( rend->clientHeight() ) ) : Number(0);
+     case ScrollWidth:
+-      return rend ? static_cast<Value>( Number(rend->scrollWidth()) ) : Undefined();
++      return rend ? static_cast<Value>( Number(rend->scrollWidth()) ) : Number(0);
+     case ScrollHeight:
+-      return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Undefined();
++      return rend ? static_cast<Value>( Number(rend->scrollHeight()) ) : Number(0);
+     case ScrollLeft:
+       if (rend && rend->layer()) {
+           if (rend->isRoot() && !rend->style()->hidesOverflow())
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.10-63_fixed-layout-table.diff b/kde-base/kdelibs/files/kdelibs-3.5.10-63_fixed-layout-table.diff
new file mode 100644
index 00000000..7dff0e33
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.10-63_fixed-layout-table.diff
@@ -0,0 +1,24 @@
+Index: kdelibs/khtml/rendering/table_layout.cpp
+===================================================================
+--- kdelibs/khtml/rendering/table_layout.cpp	(revisión: 874967)
++++ kdelibs/khtml/rendering/table_layout.cpp	(revisión: 874968)
+@@ -297,7 +297,8 @@
+ #endif
+         for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
+             if ( width[i].isPercent() ) {
+-                int w = base * width[i].value() / totalPercent;
++                // totalPercent may be 0 below if all %-width specifed are 0%. (#172557)
++                int w = totalPercent ? base * width[i].value() / totalPercent : 0;
+                 available -= w;
+                 calcWidth[i] = w;
+             }
+@@ -313,7 +314,8 @@
+ 
+         for ( int i = 0; available > 0 && i < nEffCols; i++ ) {
+             if ( width[i].isVariable() ) {
+-                int w = available / totalVariable;
++                // totalVariable may be 0 below if all the variable widths specified are 0.
++                int w = totalVariable ? available / totalVariable : 0;
+                 available -= w;
+                 calcWidth[i] = w;
+ 		totalVariable--;
diff --git a/kde-base/kdelibs/kdelibs-3.5.10-r7.ebuild b/kde-base/kdelibs/kdelibs-3.5.10-r7.ebuild
new file mode 100644
index 00000000..15e49c5f
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.10-r7.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r6.ebuild,v 1.8 2009/08/01 07:12:04 ssuominen Exp $
+
+EAPI="1"
+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-15.tar.bz2
+	mirror://gentoo/kde-3.5.9-seli-xinerama.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl alsa arts bindist 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="
+	!=kde-base/artsplugin-mpeglib-3.5*
+	!=kde-base/artsplugin-mpg123-3.5*
+	!kde-base/kdeaccessibility
+	!kde-base/kdeaddons
+	!kde-base/kdeadmin
+	!kde-base/kdeartwork
+	!kde-base/kdebase
+	!kde-base/kdeedu
+	!kde-base/kdegames
+	!kde-base/kdegraphics
+	!kde-base/kde
+	!kde-base/kdemultimedia
+	!kde-base/kdenetwork
+	!kde-base/kdepim
+	!kde-base/kdesdk
+	!kde-base/kdetoys
+	!kde-base/kdeutils
+	!kde-base/kdewebdev
+	!kde-base/ksync
+	!=kde-base/mpeglib-3.5*
+	app-arch/bzip2
+	>=dev-libs/libxslt-1.1.16
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-6.6
+	>=dev-libs/openssl-0.9.7d
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/libart_lgpl
+	net-dns/libidn
+	>=sys-apps/portage-2.1.2.11
+	virtual/ghostscript
+	x11-libs/libXext
+	>=x11-libs/qt-3.3.3:3
+	acl? (
+		virtual/acl
+	)
+	alsa? ( media-libs/alsa-lib )
+	arts? ( ~kde-base/arts-3.5.10 )
+	!avahi? (
+		!bindist? (
+			!kde-misc/kdnssd-avahi
+			net-misc/mDNSResponder
+		)
+	)
+	cups? ( >=net-print/cups-1.1.19 )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	lua? ( dev-lang/lua )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	spell? (
+		>=app-dicts/aspell-en-6.0.0
+		>=app-text/aspell-0.60.5
+	)
+	tiff? ( media-libs/tiff )
+	utempter? ( sys-libs/libutempter )
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="${RDEPEND}
+	!<=kde-base/kdebase-startkde-3.5.10-r3
+	x11-apps/rgb
+	x11-apps/iceauth
+	>=x11-misc/xdg-utils-1.0.2-r3
+"
+PDEPEND="
+	avahi? ( kde-misc/kdnssd-avahi )
+	bindist? ( 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
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	# remove this symlink, bug 264767
+	rm -f "${WORKDIR}/${P}"/kdeprint/kdeprint
+
+	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 by Lubos Lunak.
+	# http://ktown.kde.org/~seli/xinerama/
+	epatch "${WORKDIR}/${PN}-xinerama.patch"
+
+	# patch that fixes kde4 in menus (adapted from archlinux)
+	epatch "${FILESDIR}/${P}-kde4-apps.patch"
+
+	#Fix glibc-2.10 compilation ( Bug 270404 )
+	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
+
+	# bug 247817
+	epatch "${FILESDIR}/${PN}-3.5-perl.xml.patch"
+
+	# bug 270926
+	epatch "${FILESDIR}/${P}-kjs-gcc44.patch"
+
+	# bug 243476
+	epatch "${FILESDIR}/${P}-khtml.patch"
+
+        # bug 271372 + googlemaps
+        epatch "${FILESDIR}/${P}-62_fix_googlemaps_backport.diff"
+        epatch "${FILESDIR}/${P}-63_fixed-layout-table.diff"
+}
+
+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 || use bindist ; then
+		myconf="${myconf} --disable-dnssd"
+	else
+		myconf="${myconf} --enable-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
+
+	kde_src_compile
+
+	if use doc; then
+		emake apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+
+	if use doc; then
+		emake 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 || use bindist ; 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="${PREFIX}/${libdir}:${libdirs}"
+	done
+
+	# KDE implies that the install path is listed first in KDEDIRS and the user
+	# directory (implicitly added) to be the last entry. Doing otherwise breaks
+	# certain functionality. Do not break this (once again *sigh*), but read the code.
+	# KDE saves the installed path implicitly and so this is not needed, /usr
+	# is set in ${PREFIX}/share/config/kdeglobals and so KDEDIRS is not needed.
+	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
+PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs}
+MANPATH=${PREFIX}/share/man
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+#KDE_IS_PRELINKED=1
+# Excessive flushing to disk as in releases before KDE 3.5.10. Usually you don't want that.
+#KDE_EXTRA_FSYNC=1
+XDG_DATA_DIRS="${PREFIX}/share"
+EOF
+
+	# Install shell script to run KDE 3 applications from outside of the KDE 3 desktop
+	# See http://lists.kde.org/?t=120569055200005&r=1&w=2 for reference
+
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	# Merge KDE prefix and LDPATH
+	sed -e "s#@REPLACE_PREFIX@#${PREFIX}#" \
+		-e  "s#@REPLACE_LIBS@#${_libdirs}#" \
+		-i "${WORKDIR}/patches/kde3" || die "sed failed"
+	dobin "${WORKDIR}/patches/kde3"
+
+	# 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
+}