Removed KDEDIRS from the env file, it is not needed any longer.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 251 insertions, 2 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 2d714169a046..f6f8caf98691 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.543 2008/10/07 12:13:53 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.544 2008/10/07 12:21:26 cryos Exp $
+
+*kdelibs-3.5.10-r1 (07 Oct 2008)
+
+  07 Oct 2008; Marcus D. Hanwell <cryos@gentoo.org>
+  +kdelibs-3.5.10-r1.ebuild:
+  Removed KDEDIRS from the env file, it is not needed any longer.
 
 *kdelibs-4.1.2-r1 (07 Oct 2008)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index b05fc165fdb1..7dc285881c07 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -18,6 +18,7 @@ DIST kdelibs-3.5.9.tar.bz2 15568675 RMD160 9ac02bf2314de387b2aa9664703c72b0613fc
 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
 DIST kdelibs-4.1.2.tar.bz2 9112474 RMD160 06989a49f062697ccd7ed22082ef04a3a7178ac0 SHA1 24c371f474686c16743a96bd369055fcf8231a54 SHA256 644093ef68ac07c4e2fdbf47bdc1934dd2d5708c99893b8153d1163f2fee3f9f
+EBUILD kdelibs-3.5.10-r1.ebuild 7372 RMD160 fbd9272c49760fcfc84e12fbd3af113fe4dc4b4f SHA1 691aea8b7e9f88fb82a4c3d55b92cf8619ff1398 SHA256 607c78baff407cecb104fa3d8809bc27b161c432a29f65e0aace5d045003e6c2
 EBUILD kdelibs-3.5.10.ebuild 7254 RMD160 165d69995b748d27157010c4631e0a4dff8c03ed SHA1 a0c01943703d7a2b783ea296fbb7a22546a1bc78 SHA256 2f59fd91be3011e2749527d6c6529bc53a67cd0df917cbc4ef9c276833a5ba5a
 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
@@ -29,5 +30,5 @@ EBUILD kdelibs-4.0.4.ebuild 6106 RMD160 359d839f456bccae1744e69e208433c4308c6287
 EBUILD kdelibs-4.0.5.ebuild 6112 RMD160 7d16be93f8556088cfbdb71f45a8bb4253944a0f SHA1 ff8c5cc2d6146e3c8d320d17df39784e049802f6 SHA256 00339d01839c54f949d9f267a40cc8ac08566b6b5a832c213d6565054af3f248
 EBUILD kdelibs-4.1.2-r1.ebuild 5738 RMD160 dea4263b9f899fcb0826e6b63cec1c5abe3a65cc SHA1 dac62e0d4604869442578ec94239d4770dd3ed09 SHA256 404cba32600fe4f8efc9b4be8e0a8ce8c5d9ac6859c224ca3002fa91dc289f69
 EBUILD kdelibs-4.1.2.ebuild 5478 RMD160 9475a9fc89d56baf527e601df9f07017f74cc7ba SHA1 265cb6d6ffecc9c18e36b4baa127547d4f80d37b SHA256 15cc28b69e3eb8a537340c2e3743b7fc3017a085fdda01bafe49d4729ad4a0c8
-MISC ChangeLog 89311 RMD160 bf2ed8abf4ac71cc142878574c6586615ebaaccc SHA1 b20cce66e8dcc3b8b175b74cf8ea082be7f6ee2b SHA256 2960b54c60c23e9dbb652cca7cc668a120974078dac087619807198d9947f94a
+MISC ChangeLog 89493 RMD160 5f44f03f2a6b7739f9f5e995633f881a6f2fbe34 SHA1 8127b0fba9ba2604ac8d33f3a8cb653e6aad86c1 SHA256 33fb9702c54815f33a2223e16679385bf95e5e415d054dbde66b1e93a13f6d07
 MISC metadata.xml 602 RMD160 f3461a81b06ab9dce821783b4e361e0e9696bbf3 SHA1 09bee1c8127363de0066a652d7093759ca36631a SHA256 188f0ca9e181009fd720cbe1fff57f124c80524033c6cb591ea2789d755410e1
diff --git a/kde-base/kdelibs/kdelibs-3.5.10-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5.10-r1.ebuild
new file mode 100644
index 000000000000..05b9f7c746a3
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.10-r1.ebuild
@@ -0,0 +1,242 @@
+# 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-r1.ebuild,v 1.1 2008/10/07 12:21:26 cryos 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/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 is 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.
+	# KDE saves the installed path implicitly and so this is not needed, /usr
+	# is set in ${PREFIX}/share/config/kdeglobals and so KDEDIRS is not needed.
+	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"
+#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
+}