Added several upstream patches: Un-break editable controls like zoom selectors. BSD patch that should fix startup problems. Incorrect username shortening in konqueror. Miscellaneous post-3.5.8 fixes.

Package-Manager: portage-2.1.3.16

4 files changed, 233 insertions, 15 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 1d44f1dc2f51..38ae65e0b567 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,16 @@
 # 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.491 2007/10/19 22:27:24 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.492 2007/11/03 16:11:18 philantrop Exp $
+
+*kdelibs-3.5.8-r1 (03 Nov 2007)
+
+  03 Nov 2007; Wulf C. Krueger <philantrop@gentoo.org> 
+  +kdelibs-3.5.8-r1.ebuild:
+  Added several upstream patches:
+  - Un-break editable controls like zoom selectors.
+  - BSD patch that should fix startup problems.
+  - Incorrect username shortening in konqueror.
+  - Miscellaneous post-3.5.8 fixes.
 
 *kdelibs-3.5.8 (19 Oct 2007)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 748e46dca274..9d98d380373c 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX CVE-2007-1564-kdelibs-3.5.6.diff 2835 RMD160 894a9c5f51da21022b9448da957893a57384c065 SHA1 a296f0dff11007f835bdbca23b259ad8483aa4c9 SHA256 2def5a86817220df9c701d9ad22059c9ef884273a44fee3e12d7b269d8b8e52c
 MD5 62872147c2d369feb3d9077e9b32b03d files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
 RMD160 894a9c5f51da21022b9448da957893a57384c065 files/CVE-2007-1564-kdelibs-3.5.6.diff 2835
@@ -62,6 +59,7 @@ DIST kdelibs-3.5-patchset-08.tar.bz2 19973 RMD160 ea2edb4973cca353baabc89559f11c
 DIST kdelibs-3.5-patchset-09.tar.bz2 19635 RMD160 c4b60c466ba1625c61259b075fd2b7815b5c1b06 SHA1 7bb4d04c5256d2ca2dc5acc8ea12d4b35a1c347c SHA256 d48a856f2fefe79d3b2064b506ba24cf37b5071cdbbb4eea3cdd78c65a38a94b
 DIST kdelibs-3.5-patchset-10.tar.bz2 19407 RMD160 ae0617dbff497751b51859d55ae45a756e69b0c0 SHA1 0289be2b16631b3dec61d738d208a189e175a592 SHA256 6fca1c1718bb628c5980da797858eeef003e57ae0f1ba89ffbd1afe20d9df975
 DIST kdelibs-3.5-patchset-11.tar.bz2 20053 RMD160 bb22719ee4aaf26a23057d2f459f738ad652c918 SHA1 759cfc225a29ef03ff6fec6e6ca1adba51f76e7d SHA256 c80843023f010b4971de0308105f47d08491794ff640d3c08b34d8bbdb6434a8
+DIST kdelibs-3.5-patchset-12.tar.bz2 21970 RMD160 9559e44e5d2205c2d5e0de8459eac898c3193933 SHA1 92452f667ed54d6a15f94d601f1544c8ad30de81 SHA256 0f936758437896ea6ee4332c64bd78ce0d03fd4924d53e29fad6a0de3cf63946
 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
@@ -105,14 +103,18 @@ EBUILD kdelibs-3.5.7.ebuild 6010 RMD160 7c16918e0bfacb4b293bdb5c729ec1c4c2e69ff6
 MD5 36327ad34df10d38d9db0845cae8b5a3 kdelibs-3.5.7.ebuild 6010
 RMD160 7c16918e0bfacb4b293bdb5c729ec1c4c2e69ff6 kdelibs-3.5.7.ebuild 6010
 SHA256 8c13c4ed11eeee80b3d98470f9cd18e1f8591dcc0e6a5ec70ab0a707264debd9 kdelibs-3.5.7.ebuild 6010
+EBUILD kdelibs-3.5.8-r1.ebuild 5974 RMD160 f424dcb99c98a8d7a5487e66594cc319b7c49768 SHA1 c6fbdf5a60013f8fd1884f96d9efe2b9b540285f SHA256 3f10fc8f08107c247261e9f1ef8b3b6abe6ae62f905b2399f6e8e6a6a20a47f8
+MD5 6f3de9ed1cdf1fa322c11fe9429d692c kdelibs-3.5.8-r1.ebuild 5974
+RMD160 f424dcb99c98a8d7a5487e66594cc319b7c49768 kdelibs-3.5.8-r1.ebuild 5974
+SHA256 3f10fc8f08107c247261e9f1ef8b3b6abe6ae62f905b2399f6e8e6a6a20a47f8 kdelibs-3.5.8-r1.ebuild 5974
 EBUILD kdelibs-3.5.8.ebuild 5971 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc SHA1 ce4c0049ab32e4bfc17ea9939c067f3c060aa3f2 SHA256 3202468c475c995413d4ce172effa49cc49b5e822b16536f2adbe77919fc65c7
 MD5 832f29cc7666ce4dd82b229e40a9a4bb kdelibs-3.5.8.ebuild 5971
 RMD160 550508c36f061d6826f0e5c2ab2891c83a56e8fc kdelibs-3.5.8.ebuild 5971
 SHA256 3202468c475c995413d4ce172effa49cc49b5e822b16536f2adbe77919fc65c7 kdelibs-3.5.8.ebuild 5971
-MISC ChangeLog 79300 RMD160 350990bab08f0ee536f01b07d13cb2478f9f936d SHA1 10b0b6d9f4d8eacbd70a35b6493dd6e061161d94 SHA256 0e81fc2084207e3acb6fdee05ffc71387314d7018b172ee8dd8204441c861ab3
-MD5 914a684a67601e32b81c651ee1c90292 ChangeLog 79300
-RMD160 350990bab08f0ee536f01b07d13cb2478f9f936d ChangeLog 79300
-SHA256 0e81fc2084207e3acb6fdee05ffc71387314d7018b172ee8dd8204441c861ab3 ChangeLog 79300
+MISC ChangeLog 79636 RMD160 cc0e16b9e5c7fec168d9f90c74b6786156a88cb2 SHA1 1bb52cb3b7b5918da0b4e97786efb1df6f15d121 SHA256 2443d76383fd47651b7163f64002caeb47c5d7d0954c8867836dc906ca80d957
+MD5 19e1036921adc2157f61bd63efa4d933 ChangeLog 79636
+RMD160 cc0e16b9e5c7fec168d9f90c74b6786156a88cb2 ChangeLog 79636
+SHA256 2443d76383fd47651b7163f64002caeb47c5d7d0954c8867836dc906ca80d957 ChangeLog 79636
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -147,10 +149,6 @@ SHA256 7420f254fcd924e81010df1070f7311e63fe02931a44332de1fbf7a51adb66a9 files/di
 MD5 4fdfec85931ccb964e4eaf30b7d811ff files/digest-kdelibs-3.5.8 807
 RMD160 a8adf893fe3dccb99dddddbfa23c06dadb8f67e9 files/digest-kdelibs-3.5.8 807
 SHA256 dcb4b10aed20b014dcf94dda5f9c9f038725a3c2c76e025863abf7e327e297c0 files/digest-kdelibs-3.5.8 807
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHGS9hCkvF58q80IkRApO3AKCDQUzETr4pgPIjGdIN9UnLTaWzKwCfReVz
-S70XJfSOF19d8eDWag1j4FA=
-=zP3G
------END PGP SIGNATURE-----
+MD5 045d21239aae2d8475ecc135f0556897 files/digest-kdelibs-3.5.8-r1 807
+RMD160 a62a27af50bec9cd7997c5323ce601b983e9a7c2 files/digest-kdelibs-3.5.8-r1 807
+SHA256 72a97de753479bd8eef7faa3e43fe4c0881b386a78f16b009cb986c3524ccabf files/digest-kdelibs-3.5.8-r1 807
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.8-r1 b/kde-base/kdelibs/files/digest-kdelibs-3.5.8-r1
new file mode 100644
index 000000000000..eab1486250e7
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.8-r1
@@ -0,0 +1,9 @@
+MD5 0ebdc4a5bb60d0222c111e8a0a8365e2 kdelibs-3.5-patchset-12.tar.bz2 21970
+RMD160 9559e44e5d2205c2d5e0de8459eac898c3193933 kdelibs-3.5-patchset-12.tar.bz2 21970
+SHA256 0f936758437896ea6ee4332c64bd78ce0d03fd4924d53e29fad6a0de3cf63946 kdelibs-3.5-patchset-12.tar.bz2 21970
+MD5 f347ebd7259bdc2c0de9e1db2a09d2fd kdelibs-3.5.8-seli-xinerama.patch.bz2 5230
+RMD160 26efc6620d176414b3b771145a7c00db11c3df6b kdelibs-3.5.8-seli-xinerama.patch.bz2 5230
+SHA256 389a31d7e3f44eca5984842d66fa19a8a9f6f11fd6dac134cfd1e4d24e7fb174 kdelibs-3.5.8-seli-xinerama.patch.bz2 5230
+MD5 acaa37e79e840d10dca326277a20863c kdelibs-3.5.8.tar.bz2 15557343
+RMD160 e3524ca8613fca338a0530213e921fbfae56e866 kdelibs-3.5.8.tar.bz2 15557343
+SHA256 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6 kdelibs-3.5.8.tar.bz2 15557343
diff --git a/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.8-r1.ebuild
new file mode 100644
index 000000000000..c00e8120d40a
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.8-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.8-r1.ebuild,v 1.1 2007/11/03 16:11:19 philantrop 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-12.tar.bz2
+	mirror://gentoo/${P}-seli-xinerama.patch.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 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.11
+	!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 "${WORKDIR}/${P}-seli-xinerama.patch"
+}
+
+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
+}