Fixes for the KDE bugs #113057, #121528, #131596, #133677, #123941, #131369 among others. Changed env handling.

(Portage version: 2.1.1)

3 files changed, 200 insertions, 1 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 82f64904e6f2..afeb9e147cdd 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.360 2006/09/18 16:17:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.361 2006/09/19 22:27:35 carlo Exp $
+
+*kdelibs-3.5.4-r2 (19 Sep 2006)
+
+  19 Sep 2006; Carsten Lohrke <carlo@gentoo.org> +kdelibs-3.5.4-r2.ebuild:
+  Fixes for the KDE bugs #113057, #121528, #131596, #133677, #123941, #131369
+  among others. Changed env handling.
 
   18 Sep 2006; Carsten Lohrke <carlo@gentoo.org> kdelibs-3.5.2-r6.ebuild,
   kdelibs-3.5.3-r4.ebuild, kdelibs-3.5.4-r1.ebuild:
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.4-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.5.4-r2
new file mode 100644
index 000000000000..2dfe8bb2da7d
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.4-r2
@@ -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 979d056ca0e21c12caed270126e60e3e kdelibs-3.5.4.tar.bz2 15450025
+RMD160 a80ce24ee485bcfc7f2f06c3a798401b3188670d kdelibs-3.5.4.tar.bz2 15450025
+SHA256 9458d94d842855b4f0ea30520dc9ed0988563564bc72c8a86a5c40d57ab6887e kdelibs-3.5.4.tar.bz2 15450025
diff --git a/kde-base/kdelibs/kdelibs-3.5.4-r2.ebuild b/kde-base/kdelibs/kdelibs-3.5.4-r2.ebuild
new file mode 100644
index 000000000000..15071c16b377
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.4-r2.ebuild
@@ -0,0 +1,187 @@
+# 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.4-r2.ebuild,v 1.1 2006/09/19 22:27: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-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"
+
+# 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"
+
+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 ) )"
+
+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
+
+	if use cups && has_version '>=net-print/cups-1.2_pre'; then
+		cd "${S}"
+
+		EPATCH_EXCLUDE="kubuntu_39_cups12_compile_fixes.diff" \
+		EPATCH_SUFFIX="diff" \
+		EPATCH_MULTI_MSG="Applying KUbuntu patches for CUPS 1.2 support ..." \
+		EPATCH_FORCE="yes" \
+		epatch "${WORKDIR}/kdeprint-3.5.2-cups-1.2-patches/"
+	fi
+
+	# TODO - fix broken tests
+	sed -i -e "s:client tests:client:" ${S}/dcop/Makefile.am
+	sed -i -e "s:SUBDIRS = . ui tests:SUBDIRS = . ui:" ${S}/kspell2/Makefile.am
+
+	# 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"
+}
+
+src_compile() {
+	rm -f ${S}/configure
+
+	myconf="--with-distribution=Gentoo
+			$(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)
+			--without-hspell
+			--without-aspell"
+	if use noutempter ; then
+		myconf="${myconf} --without-utempter"
+	else
+		myconf="${myconf} --with-utempter"
+	fi
+
+	if use spell && has_version app-text/aspell; then
+		myconf="${myconf} --with-aspell"
+	else
+		myconf="${myconf} --without-aspell"
+	fi
+
+	if has_version x11-apps/rgb; then
+		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
+	fi
+
+	myconf="${myconf} --disable-fast-malloc"
+
+	# 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
+}