Add patch to fix timeouts on cups connection. THanks to Jochen Trumpf for reporting in bug #151261.

Package-Manager: portage-2.1.2_pre3-r2

5 files changed, 226 insertions, 8 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 627dbd33b9cd..1da794a990bd 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.367 2006/10/11 09:59:54 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.368 2006/10/15 15:10:30 flameeyes Exp $
+
+*kdelibs-3.5.5-r1 (15 Oct 2006)
+
+  15 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch,
+  +kdelibs-3.5.5-r1.ebuild:
+  Add patch to fix timeouts on cups connection. THanks to Jochen Trumpf for
+  reporting in bug #151261.
 
   11 Oct 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
   +files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff, kdelibs-3.5.5.ebuild:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 02c0c1c880d9..c7e98d18b164 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -41,6 +41,10 @@ AUX kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544 RMD160 cb5fea95022dd92b448a
 MD5 1f60e79966e99e68401ce1b0cf3609d9 files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544
 RMD160 cb5fea95022dd92b448a8bf2b8e7ea49e9f3225d files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544
 SHA256 b4364d77149ef699b7724c1102a08a0240df5e19c2b0b1202459b8f97cf8268b files/kdelibs-3.5.5-kate-cstyle-indenter-fix.diff 1544
+AUX kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch 936 RMD160 0fe9c0da715f82ffec5234bca842e40e5b60bde0 SHA1 7207af706d8bce0e3b1b9626ef8d6f8ca02e60ca SHA256 584a9eeb447c745940acffe725c52e63e98f4ead19476b395c63516d9409bdb6
+MD5 3fe4a6223c6ba82f3b6a0ce06db9baed files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch 936
+RMD160 0fe9c0da715f82ffec5234bca842e40e5b60bde0 files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch 936
+SHA256 584a9eeb447c745940acffe725c52e63e98f4ead19476b395c63516d9409bdb6 files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch 936
 AUX post-3.4.3-kdelibs-kjs.diff 1570 RMD160 95a341acfe20ac53f528c31be17e50dba2163f8d SHA1 4869c00f7f725a87d0223d684f09fe7e08c0e46d SHA256 2031efa2a5e4a747d5e2630ccd0cae62d7413de025786069931c01b07fc5a724
 MD5 ecc0ec13ce3b06e94e35aa8e937e02bf files/post-3.4.3-kdelibs-kjs.diff 1570
 RMD160 95a341acfe20ac53f528c31be17e50dba2163f8d files/post-3.4.3-kdelibs-kjs.diff 1570
@@ -70,14 +74,18 @@ EBUILD kdelibs-3.5.4-r2.ebuild 5230 RMD160 3fd6f678c273923960cbf26cc59a876591148
 MD5 491a91146391b500614636c9f73b2e35 kdelibs-3.5.4-r2.ebuild 5230
 RMD160 3fd6f678c273923960cbf26cc59a8765911485de kdelibs-3.5.4-r2.ebuild 5230
 SHA256 9bcda2e6109ae6ca39e33dd6886d06d70b843f0806b96ee4bfae54f7d46ae566 kdelibs-3.5.4-r2.ebuild 5230
+EBUILD kdelibs-3.5.5-r1.ebuild 5358 RMD160 dcc506a7742f85d199ea720dcda97727d214a55e SHA1 d3cbe6950ec2bb51b5ac95c3da2310a43bc02e60 SHA256 3aa3640a161f6dae7f3890efc68618ac4dbe503694d1b9480bcbefec1ee7b1ce
+MD5 e2887988637e22770b306e671e114997 kdelibs-3.5.5-r1.ebuild 5358
+RMD160 dcc506a7742f85d199ea720dcda97727d214a55e kdelibs-3.5.5-r1.ebuild 5358
+SHA256 3aa3640a161f6dae7f3890efc68618ac4dbe503694d1b9480bcbefec1ee7b1ce kdelibs-3.5.5-r1.ebuild 5358
 EBUILD kdelibs-3.5.5.ebuild 5226 RMD160 a94842be41b41fba0769262ba8c40fa2ea3671d5 SHA1 47579463860ce4d0ddfc1bbd996e1a6b827583a3 SHA256 918e138be1d720c36312e22a140abf74a141a0864c1cff97c391cbf46ec69938
 MD5 973be63836556a69d870bcb58d7ca9eb kdelibs-3.5.5.ebuild 5226
 RMD160 a94842be41b41fba0769262ba8c40fa2ea3671d5 kdelibs-3.5.5.ebuild 5226
 SHA256 918e138be1d720c36312e22a140abf74a141a0864c1cff97c391cbf46ec69938 kdelibs-3.5.5.ebuild 5226
-MISC ChangeLog 60067 RMD160 817ba91e965933b885fcb83a98acd22ff41079c7 SHA1 6e217f6593f31678f5dda40f20c6293dfa43a920 SHA256 547de61810d344bec3ca9092f366d86b66a4c0b5197f4ad7f430f85c1615bfdd
-MD5 c6eaf222d1874ff846fb9d5ba9ee4724 ChangeLog 60067
-RMD160 817ba91e965933b885fcb83a98acd22ff41079c7 ChangeLog 60067
-SHA256 547de61810d344bec3ca9092f366d86b66a4c0b5197f4ad7f430f85c1615bfdd ChangeLog 60067
+MISC ChangeLog 60341 RMD160 2a9f73298c931942ec026c7c35d5fb6701b515a4 SHA1 34461d8118714a36df4120ab082fb4c09263ea40 SHA256 9f0da02d893f0130b752dd56877dafd26299b87b1114d1c8d1c0b3cbeabdeab0
+MD5 06d2e660135cb26f96e39824a94a24ba ChangeLog 60341
+RMD160 2a9f73298c931942ec026c7c35d5fb6701b515a4 ChangeLog 60341
+SHA256 9f0da02d893f0130b752dd56877dafd26299b87b1114d1c8d1c0b3cbeabdeab0 ChangeLog 60341
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -97,10 +105,13 @@ SHA256 fb79303e81273305eb5bb81189d9f567820e481cdd446d8d62b8cd49b71f4b59 files/di
 MD5 4e084c981a53be48eb4df82f46649e60 files/digest-kdelibs-3.5.5 521
 RMD160 b35a8ed3374893328cf91746946b98d833051692 files/digest-kdelibs-3.5.5 521
 SHA256 8c59629509a40001ff71b42db7096bb8c7a4f78bb8e43b60baf2e205cd843c81 files/digest-kdelibs-3.5.5 521
+MD5 4e084c981a53be48eb4df82f46649e60 files/digest-kdelibs-3.5.5-r1 521
+RMD160 b35a8ed3374893328cf91746946b98d833051692 files/digest-kdelibs-3.5.5-r1 521
+SHA256 8c59629509a40001ff71b42db7096bb8c7a4f78bb8e43b60baf2e205cd843c81 files/digest-kdelibs-3.5.5-r1 521
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLMCgQVeVlgLp4x8RApgvAJ9U6FE9phP/WC7F3skFpdLmQoR+2gCeIttU
-7LJYIswHFOthl2nzoViKVUw=
-=82Fs
+iD8DBQFFMk90AiZjviIA2XgRApMYAJ4wbagHPFWYi4bUHELWr7x+/QtmagCeJfCd
+O7bEkJL3VSTPq7qZFEDvZH8=
+=rJs2
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r1
new file mode 100644
index 000000000000..79c37c4a8348
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.5-r1
@@ -0,0 +1,6 @@
+MD5 6f8254317dd43af7aea2a347656f552a kdelibs-3.5-patchset-05.tar.bz2 36423
+RMD160 684bb235f3b5b3cb900632e11aa912670f641b96 kdelibs-3.5-patchset-05.tar.bz2 36423
+SHA256 f237ccd3a35c629740355fbcf69b0d706690acac832a4d35db5c0d3a30235e0a kdelibs-3.5-patchset-05.tar.bz2 36423
+MD5 2cba792e3b0a766431b837c8ef924117 kdelibs-3.5.5.tar.bz2 15486690
+RMD160 8e389869f9a53445754c76a0f7535ef2fffc6d03 kdelibs-3.5.5.tar.bz2 15486690
+SHA256 e487cdd56aa14eec3e100501a5e14658c6329fac30ea0ce812c860e3564c31e3 kdelibs-3.5.5.tar.bz2 15486690
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch b/kde-base/kdelibs/files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch
new file mode 100644
index 000000000000..976c823ff202
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.5-kdeprint-cupsd-timeout-fix.patch
@@ -0,0 +1,20 @@
+--- kdelibs-3.5.5/kdeprint/cups/kmcupsmanager.cpp	2006/09/20 15:38:41	586782
++++ kdelibs-3.5.5/kdeprint/cups/kmcupsmanager.cpp	2006/10/10 12:34:30	594190
+@@ -920,7 +920,7 @@
+ 	kdDebug(500) << "Checking for update possible" << endl;
+ 	delete m_socket;
+         m_socket = new KNetwork::KBufferedSocket;
+-	m_socket->setTimeout( 1 );
++	m_socket->setTimeout( 1500 );
+ 	connect( m_socket, SIGNAL( connected(const KResolverEntry&) ), 
+                 SLOT( slotConnectionSuccess() ) );
+ 	connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) );
+@@ -958,7 +958,7 @@
+ 
+ void KMCupsManager::slotAsyncConnect()
+ {
+-	kdDebug(500) << "Starting async connect" << endl;
++	kdDebug(500) << "Starting async connect to " << CupsInfos::self()->hostaddr() << endl;
+ 	//m_socket->startAsyncConnect();
+         if (CupsInfos::self()->host().startsWith("/"))
+             m_socket->connect( QString(), CupsInfos::self()->host());
diff --git a/kde-base/kdelibs/kdelibs-3.5.5-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..9bb97e8767e7
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.5-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.5-r1.ebuild,v 1.1 2006/10/15 15:10:30 flameeyes 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-05.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 cups doc jpeg2k kerberos legacyssl noutempter openexr spell ssl tiff
+zeroconf kernel_linux fam lua"
+
+# 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-${PV} )
+	app-arch/bzip2
+	>=media-libs/freetype-2
+	media-libs/fontconfig
+	>=dev-libs/libxslt-1.1.15
+	>=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? ( net-misc/mDNSResponder )
+	fam? ( virtual/fam )
+	virtual/ghostscript
+	!noutempter? ( sys-libs/libutempter )
+	!kde-base/kde-env
+	lua? ( dev-lang/lua )"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+	|| ( ( x11-apps/rgb x11-apps/iceauth ) <virtual/x11-7 )
+	spell? ( || (  ( app-text/aspell app-dicts/aspell-en )
+			  app-text/ispell ) )"
+
+# Testing code is rather broken and merely for developer purposes, so disable it.
+RESTRICT="test"
+
+pkg_setup() {
+	if use legacyssl ; then
+		echo ""
+		ewarn "You have the legacyssl use flag enabled, which fixes issues with some broken"
+		ewarn "sites, but breaks others instead. It is strongly discouraged to use it."
+		ewarn "For more information, see bug #128922."
+		echo ""
+	fi
+	if use noutempter ; then
+		echo ""
+		ewarn "Not using utempter, KDE applications won't create login records. Don't remove"
+		ewarn "this functionality, unless you know exactly what you're doing."
+		echo ""
+	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" || die "Patch did not apply."
+	fi
+
+	# TODO - kspell2 Xspell plugins are automagically detected.
+	#		 As nothing uses kspell2, don't install them.
+	sed -i -e "s:plugins::" "${S}/kspell2/Makefile.am" || die "sed failed"
+
+	# Apply the following patch on the next revision of kdelibs-3.5.5 (fixes kde
+	# bug #135409), which corrects a nasty regression in the cstyle indenter.
+	# Revision bump was not forced for this patch. If users want it before the
+	# next revision bump, they should simply reemerge kdelibs.
+	epatch "${FILESDIR}/${P}-kate-cstyle-indenter-fix.diff"
+
+	# Fix kdeprint timeout when trying to connect to cupsd. Bug #151261.
+	epatch "${FILESDIR}/${P}-kdeprint-cupsd-timeout-fix.patch"
+}
+
+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_enable zeroconf dnssd)
+			$(use_with !noutempter utempter) $(use_with lua)
+			--without-hspell --without-aspell"
+
+	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
+
+	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}
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+KDEDIRS="${PREFIX}:/usr:/usr/local"
+#KDE_IS_PRELINKED=1
+EOF
+}
+
+pkg_postinst() {
+	if use zeroconf; then
+		echo
+		einfo "To make zeroconf support available in KDE"
+		einfo "make sure that the 'mdnsd' daemon is running."
+		einfo "Make sure also that multicast dns lookups are"
+		einfo "enabled by editing the 'hosts:' line in"
+		einfo "/etc/nsswitch.conf to include 'mdns', e.g.:"
+		einfo "hosts: files mdns dns"
+		echo
+	fi
+}