Version bump.

3 files changed, 254 insertions, 2 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index e8b9163f3133..71f90f64fd5f 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.538 2008/07/27 20:49:02 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.539 2008/09/13 23:58:06 carlo Exp $
+
+*kdelibs-3.5.10 (13 Sep 2008)
+
+  13 Sep 2008; Carsten Lohrke <carlo@gentoo.org> +kdelibs-3.5.10.ebuild:
+  Version bump.
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> kdelibs-3.5.8-r4.ebuild:
   QA: Get rid of deprecated qt_min_version().
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 09db1a18a877..1f64e6518fd7 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -9,11 +9,14 @@ AUX kdelibs-4.0.2-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec
 AUX kdelibs-4.0.3-CVS-2008-1670.patch 739 RMD160 348782a28e75435c4b36548879d2d8d243fc0436 SHA1 c08f374abc2f44cd1ece01881b510ef83241f186 SHA256 41e219e50b652800a2ca892e70baeb40ee6e7cf0f981d098dbdf2ca0926ddf5f
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
+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
 DIST kdelibs-3.5.8-seli-xinerama.patch.bz2 5230 RMD160 26efc6620d176414b3b771145a7c00db11c3df6b SHA1 4f4daaa60fbf0c3c582400f33833b9d73c26af4a SHA256 389a31d7e3f44eca5984842d66fa19a8a9f6f11fd6dac134cfd1e4d24e7fb174
 DIST kdelibs-3.5.8.tar.bz2 15557343 RMD160 e3524ca8613fca338a0530213e921fbfae56e866 SHA1 b524a5d9969e7319bb5ffb926a39fd6afb39b2ed SHA256 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6
 DIST kdelibs-3.5.9.tar.bz2 15568675 RMD160 9ac02bf2314de387b2aa9664703c72b0613fcbb3 SHA1 b8197d94075a54f90f08a9ef7bed95ccf53e12ad SHA256 4f92553f3ff50de87a83435fce3bae440c43f0d37a8e80a1736d007f80d8f755
 DIST kdelibs-4.0.4.tar.bz2 9073446 RMD160 4ec08b749c0a3e24a81d2df6f3ec83c468a97d42 SHA1 2d8e98a2ffdd1fb5b160a9facfb7f493af48b934 SHA256 215e8dc50dc6f1625fa40b029c9c6e2ba9ca775a9ac5438759a4f3b5a551d8b9
 DIST kdelibs-4.0.5.tar.bz2 9115367 RMD160 9dd1bd6908722fe2ec5ac6415beb4a4d246df343 SHA1 df7d4175c81fa1cb842f437824e42137a0f7f28c SHA256 1dce80bec72eb560f76b3f274876605b55b5197ff19f282d62d1664e51652357
+EBUILD kdelibs-3.5.10.ebuild 7287 RMD160 013c830361cf1ad40a740a6361c0541814013a7f SHA1 62d7099d781d460ea93e84a4e31e61333605db44 SHA256 c6b3260e2fd8d17771f71461620fc0d7193f36393fc9c8ce6ee2b81ddf2d93fa
 EBUILD kdelibs-3.5.8-r4.ebuild 6084 RMD160 65efd94088585e6123aa5f0961e1c8a76bd7d706 SHA1 82e2794807ef387577b14821dec668e2bd422acb SHA256 fc5268f37a0d0199cda60f5b9a301dc7a962cd7f1614db4721b519f9a6ee2b98
 EBUILD kdelibs-3.5.9-r1.ebuild 6129 RMD160 5c3374dc64c90656d6cf8f30c7bcf8a95f5f3eeb SHA1 1d307fac7d9a6644d275cd0ccb8be566f01ddc1b SHA256 2f2d844853ed90df74a4c90ebf5f9cdc3e7c4aaf8f906437b09bfa84cf7f6e41
 EBUILD kdelibs-3.5.9-r2.ebuild 6205 RMD160 a751f94f3026c1233e3ed10a110d950e60620f12 SHA1 886b2e2ac989d6f5934f28d7a7accb4bef5e5a35 SHA256 0fab24586d56dc98b53a4cbe934f2ac565b3a55580c206db4c28b19c3076f594
@@ -22,5 +25,5 @@ EBUILD kdelibs-3.5.9-r4.ebuild 6370 RMD160 75c38e396b898acf3f90dc1533b500b7698c8
 EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7 SHA1 721388ab5fa4ee455bdadb189afa021bd336fc16 SHA256 f7acb5abb483ebeeaee7a8636073b85d4ea0b7e9badcd8f8073d5ac8dcd2167b
 EBUILD kdelibs-4.0.4.ebuild 6106 RMD160 359d839f456bccae1744e69e208433c4308c6287 SHA1 827e17ac4eda6a511a3af0e2798c89f8eca35ac2 SHA256 169991e54aff16bac9ade88269da7ce20dfbb60b80b68cb19b06fdbea4536755
 EBUILD kdelibs-4.0.5.ebuild 6112 RMD160 7d16be93f8556088cfbdb71f45a8bb4253944a0f SHA1 ff8c5cc2d6146e3c8d320d17df39784e049802f6 SHA256 00339d01839c54f949d9f267a40cc8ac08566b6b5a832c213d6565054af3f248
-MISC ChangeLog 88526 RMD160 6ee8b81b9ebed9770b3b83161f45096135d2dd8c SHA1 45b49077dd2bbaa8268eb582cca600be3c5af6d5 SHA256 d8bf0bdc0190c403d66cf568a969f3f116e2155c8074f35eacb267d38b52465b
+MISC ChangeLog 88647 RMD160 f663f63fef2d80983aa4adc380fc6b17e09367ea SHA1 2bc0755cca6e9d7a8696a0567095857b06564fd5 SHA256 8ad077efcc016a2e0ba54dcdeaf7e762bbb06f5885d52d9d102eca3377902fda
 MISC metadata.xml 602 RMD160 f3461a81b06ab9dce821783b4e361e0e9696bbf3 SHA1 09bee1c8127363de0066a652d7093759ca36631a SHA256 188f0ca9e181009fd720cbe1fff57f124c80524033c6cb591ea2789d755410e1
diff --git a/kde-base/kdelibs/kdelibs-3.5.10.ebuild b/kde-base/kdelibs/kdelibs-3.5.10.ebuild
new file mode 100644
index 000000000000..d31abf45fae0
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.10.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/09/13 23:58:06 carlo 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 ~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="x11-libs/libXext
+	arts? ( ~kde-base/arts-3.5.10 )
+	app-arch/bzip2
+	>=dev-libs/openssl-0.9.7d
+	>=dev-libs/libxslt-1.1.16
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-6.6
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/libart_lgpl
+	net-dns/libidn
+	>=x11-libs/qt-3.3.3:3
+	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? ( !bindist? ( 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
+	!kde-base/kdebindings-meta
+	!=kde-base/artsplugin-mpeglib-3.5*
+	!=kde-base/artsplugin-mpg123-3.5*
+	!=kde-base/mpeglib-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"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth"
+
+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
+
+	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 by Lubos Lunak.
+	# http://ktown.kde.org/~seli/xinerama/
+	epatch "${WORKDIR}/${PN}-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 || 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="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	# KDE implies that the install path ist 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.
+	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="${PREFIX}:/usr:/usr/local"
+#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="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+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
+}