Add new patch for the http delays. Remove old cruft.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 26 insertions, 235 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 3103b93dc201..9d89ea7a76dd 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.560 2009/02/06 00:29:50 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.561 2009/02/09 22:22:23 scarabeus Exp $
+
+*kdelibs-4.2.0-r2 (09 Feb 2009)
+
+  09 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/4.2.0-kio_http.patch, -kdelibs-4.2.0.ebuild,
+  -kdelibs-4.2.0-r1.ebuild, +kdelibs-4.2.0-r2.ebuild:
+  Add new patch for the http delays. Remove old cruft.
 
   06 Feb 2009; Theo Chatzimichos <tampakrap@gentoo.org>
   kdelibs-4.1.4.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 8564bca88bed..c67389d9ced7 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,7 @@
 AUX 4.1.3-cmake-config.patch 2356 RMD160 14f14e29038735ef105893d53cf1b3771e54ee22 SHA1 e69d8449c52df48408401e62b2acba4a6d60bd7f SHA256 06f7513ebb6d9a0507191f81ddf93f7abd47a4c2a300be22756a16425f9f1904
 AUX 4.2.0-kded.patch 2435 RMD160 66b98f6b532b2b45a4d7539b95088b473a3fe90d SHA1 89a3845b5ca33038cdbaa7a3a4bc2a12eb53bbc9 SHA256 4addbe384870d8ba2bdcb715b7b0fecc9b956201ba87e1c772e939b63e7cd538
 AUX 4.2.0-kio_copy.patch 5298 RMD160 64962cf9e6e276078719d78a055ee2a4ac7179c3 SHA1 9340fbce3a9ffe8b617ed62b25ca10ae0851133c SHA256 8ec02710151201d8de7c3b32bb165bfe55210a778cacfbdc571df9353dcb5381
+AUX 4.2.0-kio_http.patch 633 RMD160 cb947b8903920dedfeac64752f76b575b49a570a SHA1 ffd1ef4dd1d04e0752b0e64383d587ba71886dc1 SHA256 905c76b317c7eb7055dc053c3608481acda855510353a8d025fea51e89aa3815
 AUX 4.2.0-klauncher.patch 2877 RMD160 42432fc21fd08f725b3c0551eb1b2388376dadf5 SHA1 069afec796194d2fbb3b7730077ee10b5d48c6ef SHA256 624d16db755fd1efbc0121a25f3497eb4453212ca2f376f2ad62ba78a30b1d72
 AUX 4.2.0-klauncher_konsole.patch 5336 RMD160 a868d63ef51a0db8dd62fe3dbe0a7daa2b7a9618 SHA1 cc2ce868e8d138b296529dc163b06d02e7541fa9 SHA256 6255a8d94d7db8638d5022dce41d87f191eba9810a3ec0192a14fdece7ec6cfc
 AUX 4.2.0-kode_crash.patch 404 RMD160 ecb72bd6ef1a111b155780d85a2dde026ffdf2fc SHA1 08aecb72471af440b6e32c3a062fed6e12579004 SHA256 a2e7417cecb55b7fcd706703520233546210fe250e7846df04df911019acffc4
@@ -33,7 +34,6 @@ EBUILD kdelibs-3.5.9-r3.ebuild 6285 RMD160 0946a13cebba7c34600acaee2cb1b9be6341c
 EBUILD kdelibs-3.5.9-r4.ebuild 6370 RMD160 75c38e396b898acf3f90dc1533b500b7698c8628 SHA1 30ab876b29bb33d4aa0320949ea4cb2e4e6f575c SHA256 67ec9c7241faf95bd0614dd2309ce8f063078d047662ff5cd1300524cd0ad102
 EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7 SHA1 721388ab5fa4ee455bdadb189afa021bd336fc16 SHA256 f7acb5abb483ebeeaee7a8636073b85d4ea0b7e9badcd8f8073d5ac8dcd2167b
 EBUILD kdelibs-4.1.4.ebuild 5927 RMD160 6a7a5cedaff2a7a02ebdc6bbcd0719b2c995f89e SHA1 95c1ba3aa5aa23f8059ffd1b3a5bba79b4fe5d5e SHA256 fbd3b1dcf5ffe44d1cbf58af7ad946ad6eb72b373084f20da7764ce321466769
-EBUILD kdelibs-4.2.0-r1.ebuild 6515 RMD160 15aa5c5fa06f769b3ed4d873392d8e8ff05d3b53 SHA1 fa0ef4c4f802d650d27abec73454837837ee0ede SHA256 90b832f84d8f919ce5547ca9c9e3d6f265380abcbc293b13f02ea689406a9254
-EBUILD kdelibs-4.2.0.ebuild 6156 RMD160 d7557f29192e37b8b13a513b4dba066d8e93d8d9 SHA1 db7c42391b40e32f43d5c7b6c34d51c9e201fee4 SHA256 7d880e4e0db76ad87f38c961bf13a0457a2bddce00c06197f3786965c35335e9
-MISC ChangeLog 92157 RMD160 236b2b291bb41af42ac36c52269b96086ba515e8 SHA1 c42525bcda4930717a4c45ca8d4d6eb6337f1eac SHA256 2b856cef6a2d2371b26dc432a84f8ca119958fda3d796359e3cc45e6b908574a
+EBUILD kdelibs-4.2.0-r2.ebuild 6547 RMD160 6edab5c95a6d20070079e12dcea57cbaee0e1ea3 SHA1 f24f3ae9432211a9ea605b0f8d366af10cb9534a SHA256 169b1a69b8f78e84c48a0b06dde262fa76d466fe0b01c99bddb8a09fbea123f2
+MISC ChangeLog 92406 RMD160 fa4447647fa163c323c4832eb548808cea45de9d SHA1 5a90e9747814eb7a5f70114f252827e3ce869ea8 SHA256 bd2c12f9de7b100c2fd98f92dc0a586494f98722819af5f7c89bf1f0c1aba2aa
 MISC metadata.xml 602 RMD160 f3461a81b06ab9dce821783b4e361e0e9696bbf3 SHA1 09bee1c8127363de0066a652d7093759ca36631a SHA256 188f0ca9e181009fd720cbe1fff57f124c80524033c6cb591ea2789d755410e1
diff --git a/kde-base/kdelibs/files/4.2.0-kio_http.patch b/kde-base/kdelibs/files/4.2.0-kio_http.patch
new file mode 100644
index 000000000000..e4be0248077e
--- /dev/null
+++ b/kde-base/kdelibs/files/4.2.0-kio_http.patch
@@ -0,0 +1,13 @@
+diff -urN kdelibs-4.2.0.old/kioslave/http/http.cpp kdelibs-4.2.0/kioslave/http/http.cpp
+--- kdelibs-4.2.0.old/kioslave/http/http.cpp	2009-01-01 17:28:03.000000000 +0100
++++ kdelibs-4.2.0/kioslave/http/http.cpp	2009-02-09 22:45:45.000000000 +0100
+@@ -1868,6 +1868,9 @@
+             buf[i] = m_unreadBuf.constData()[bufSize - i - 1];
+         }
+         m_unreadBuf.truncate(bufSize - bytesRead);
++		// we actualy have to return the data
++		// they might be complete already and we dont want to wait
++		return bytesRead;
+     }
+     if (bytesRead < size) {
+         int rawRead = TCPSlaveBase::read(buf + bytesRead, size - bytesRead);
diff --git a/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild b/kde-base/kdelibs/kdelibs-4.2.0-r2.ebuild
index 7404ecf91d00..7781c9302191 100644
--- a/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-4.2.0-r1.ebuild,v 1.5 2009/02/05 17:47:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r2.ebuild,v 1.1 2009/02/09 22:22:23 scarabeus Exp $
 
 EAPI="2"
 
@@ -106,6 +106,7 @@ PATCHES=(
 	"$FILESDIR/$PV-klauncher.patch"
 	"$FILESDIR/$PV-klauncher_konsole.patch"
 	"$FILESDIR/$PV-kode_crash.patch"
+	"$FILESDIR/$PV-kio_http.patch"
 )
 
 src_configure() {
diff --git a/kde-base/kdelibs/kdelibs-4.2.0.ebuild b/kde-base/kdelibs/kdelibs-4.2.0.ebuild
deleted file mode 100644
index e3db296bb285..000000000000
--- a/kde-base/kdelibs/kdelibs-4.2.0.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# 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-4.2.0.ebuild,v 1.4 2009/02/03 22:57:36 scarabeus Exp $
-
-EAPI="2"
-
-CPPUNIT_REQUIRED="optional"
-OPENGL_REQUIRED="optional"
-inherit kde4-base fdo-mime
-
-DESCRIPTION="KDE libraries needed by all KDE programs."
-HOMEPAGE="http://www.kde.org/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k
-kerberos mmx nls openexr +semantic-desktop spell sse sse2 ssl zeroconf"
-LICENSE="LGPL-2.1"
-RESTRICT="test"
-
-# Blockers added for !kdeprefix? due to packages from old versions,
-# removed in the meanwhile
-# kde-base/libplasma
-# kde-base/knewsticker
-# kde-base/kpercentage
-# kde-base/ktnef
-COMMONDEPEND="
-	!<=kde-base/kdebase-3.5.9-r4
-	!<=kde-base/kdebase-startkde-3.5.10
-	!<kde-base/kdelibs-3.5.10
-	!x11-libs/qt-phonon
-	!kdeprefix? (
-		!kde-base/kitchensync:4.1[kdeprefix=]
-		!kde-base/knewsticker:4.1[kdeprefix=]
-		!kde-base/kpercentage:4.1[kdeprefix=]
-		!kde-base/ktnef:4.1[kdeprefix=]
-		!kde-base/libplasma[kdeprefix=]
-		!<=kde-misc/kdnssd-avahi-0.1.2:0
-	)
-	>=app-misc/strigi-0.6.3[qt4,dbus]
-	dev-libs/libpcre
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=kde-base/automoc-0.9.87
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/giflib
-	media-libs/jpeg
-	media-libs/libpng
-	>=media-sound/phonon-4.3.0[xcb]
-	sys-apps/dbus[X]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcursor
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-misc/shared-mime-info
-	acl? (
-		kernel_linux? ( sys-apps/acl )
-	)
-	alsa? ( media-libs/alsa-lib[midi] )
-	fam? ( virtual/fam )
-	jpeg2k? ( media-libs/jasper )
-	kerberos? ( virtual/krb5 )
-	nls? ( virtual/libintl )
-	openexr? (
-		media-libs/openexr
-		media-libs/ilmbase
-	)
-	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=dev-libs/soprano-2.1.64 )
-	spell? (
-		app-dicts/aspell-en
-		app-text/aspell
-		app-text/enchant
-	)
-	ssl? ( dev-libs/openssl )
-	zeroconf? (
-		|| (
-			net-dns/avahi[mdnsresponder-compat]
-			!bindist? ( net-misc/mDNSResponder )
-		)
-	)
-"
-
-DEPEND="${COMMONDEPEND}
-	sys-devel/gettext
-	doc? ( app-doc/doxygen )
-"
-
-RDEPEND="${COMMONDEPEND}
-	x11-apps/iceauth
-	x11-apps/rgb
-"
-
-src_configure() {
-	if use zeroconf; then
-		if has_version net-dns/avahi; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
-		elif has_version net-misc/mDNSResponder; then
-			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
-		else
-			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
-		fi
-	fi
-	if use kdeprefix; then
-		HME=".kde${SLOT}"
-	else
-		HME=".kde4"
-	fi
-	mycmakeargs="${mycmakeargs}
-		-DWITH_HSPELL=OFF
-		-DKDE_DEFAULT_HOME=${HME}
-		$(cmake-utils_has 3dnow X86_3DNOW)
-		$(cmake-utils_has altivec PPC_ALTIVEC)
-		$(cmake-utils_has mmx X86_MMX)
-		$(cmake-utils_has sse X86_SSE)
-		$(cmake-utils_has sse2 X86_SSE2)
-		$(cmake-utils_use_with acl ACL)
-		$(cmake-utils_use_with alsa Alsa)
-		$(cmake-utils_use_with bzip2 BZip2)
-		$(cmake-utils_use_with fam FAM)
-		$(cmake-utils_use_with jpeg2k Jasper)
-		$(cmake-utils_use_with kerberos GSSAPI)
-		$(cmake-utils_use_with nls Libintl)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with spell ASPELL)
-		$(cmake-utils_use_with spell ENCHANT)
-		$(cmake-utils_use_with ssl OpenSSL)
-	"
-	kde4-base_src_configure
-}
-
-src_compile() {
-	kde4-base_src_compile
-
-	# The building of apidox is not managed anymore by the build system
-	if use doc; then
-		einfo "Building API documentation"
-		cd "${S}"/doc/api/
-		./doxygen.sh "${S}" || die "APIDOX generation failed"
-	fi
-}
-
-src_install() {
-	kde4-base_src_install
-
-	if use doc; then
-		einfo "Installing API documentation. This could take a bit of time."
-		cd "${S}"/doc/api/
-		docinto /HTML/en/kdelibs-apidox
-		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
-	fi
-
-	dodir /etc/env.d
-	dodir /etc/revdep-rebuild
-
-	# List all the multilib libdirs
-	local _libdir _libdirs
-	for _libdir in $(get_all_libdirs); do
-		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
-	done
-	_libdirs=${_libdirs#:}
-
-	if use kdeprefix; then
-		cat <<-EOF > "${T}"/43kdepaths-${SLOT} # number goes down with version
-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
-XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-EOF
-		doenvd "${T}"/43kdepaths-${SLOT}
-
-		# make sure 'source /etc/profile' doesn't hose the PATH
-		dodir /etc/profile.d
-		cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh
-if [ -n "${KDEDIR}" ]; then
-	export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
-	export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
-fi
-EOF
-
-		cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
-SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
-EOF
-	else # Much simpler for the FHS compliant -kdeprefix install
-		cat <<-EOF > "${T}"/43kdepaths # number goes down with version
-CONFIG_PROTECT="/usr/share/config"
-#KDE_IS_PRELINKED=1
-XDG_DATA_DIRS="/usr/share:/usr/local/share"
-COLON_SEPARATED="XDG_DATA_DIRS"
-		EOF
-		doenvd "${T}"/43kdepaths
-	fi
-	# Ensure that the correct permissions are set on ${PREFIX}/share/config
-	fperms 755 "${PREFIX}"/share/config
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	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
-	elog "your homedir is set to "'${HOME}'"/${HME}"
-
-	kde4-base_pkg_postinst
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-
-	kde4-base_pkg_postrm
-}