Bump to KDE 4.0.0.

Package-Manager: portage-2.1.4
RepoMan-Options: --force

7 files changed, 413 insertions, 15 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index d00ede8d11d1..2c6a743b3d2d 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,18 @@
 # 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.495 2008/01/11 20:32:37 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.496 2008/01/18 00:42:53 philantrop Exp $
+
+  18 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kdelibs-4.0.0-X11-optional.patch,
+  +files/kdelibs-4.0.0-alsa-optional.patch, +files/e-tempdir.patch,
+  +kdelibs-4.0.0.ebuild:
+  Added patches.
+
+*kdelibs-4.0.0 (17 Jan 2008)
+
+  17 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +kdelibs-4.0.0.ebuild:
+  Added KDE 4.0.0's kdelibs.
 
 *kdelibs-3.5.8-r3 (11 Jan 2008)
 
diff --git a/kde-base/kdelibs/files/digest-kdelibs-4.0.0 b/kde-base/kdelibs/files/digest-kdelibs-4.0.0
new file mode 100644
index 000000000000..8813a25e297c
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-4.0.0
@@ -0,0 +1,3 @@
+MD5 79d0f83ca81fc4a135663943340c0b8f kdelibs-4.0.0.tar.bz2 9047472
+RMD160 9261a9138069d2ad85a47d9b86ba528a6fb58f77 kdelibs-4.0.0.tar.bz2 9047472
+SHA256 ea6700bd200725bca504214f5e186487ad62894879e534cf6955d049c6cacc2d kdelibs-4.0.0.tar.bz2 9047472
diff --git a/kde-base/kdelibs/files/e-tempdir.patch b/kde-base/kdelibs/files/e-tempdir.patch
new file mode 100644
index 000000000000..33f72439a606
--- /dev/null
+++ b/kde-base/kdelibs/files/e-tempdir.patch
@@ -0,0 +1,27 @@
+The cmake command create_symlink doesn't work correctly with the sandbox,
+so we prefix the symlink's destination with ${E_TEMPDIR},
+and pass "-DE_TEMPDIR=${D}" to cmake during the configure step.
+
+--- a/cmake/modules/KDE4Macros.cmake.orig	2007-08-31 20:29:51.000000000 +0200
++++ b/cmake/modules/KDE4Macros.cmake	2007-08-31 20:30:01.000000000 +0200
+@@ -303,7 +303,7 @@
+       # TODO symlinks on non-unix platforms
+       if (UNIX)
+          # execute some cmake code on make install which creates the symlink
+-         install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\"  \"${_installDest}/${dirname}/common\" )" )
++         install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${_installDest}/common\"  \"$ENV{D}/${_installDest}/${dirname}/common\" )" )
+       endif (UNIX)
+    endif(_installDest)
+    
+--- a/kio/misc/CMakeLists.txt.orig	2007-10-03 12:49:42.000000000 +0200
++++ b/kio/misc/CMakeLists.txt	2007-10-19 18:35:43.000000000 +0200
+@@ -44,7 +44,7 @@
+ if (UNIX)
+    install(PROGRAMS fileshareset DESTINATION ${LIBEXEC_INSTALL_DIR} )
+    # write a cmake script file which creates the symlink
+-   file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIBEXEC_INSTALL_DIR}/fileshareset ${LIBEXEC_INSTALL_DIR}/filesharelist)\n")
++   file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake "exec_program(${CMAKE_COMMAND} ARGS -E create_symlink ${LIBEXEC_INSTALL_DIR}/fileshareset $ENV{D}/${LIBEXEC_INSTALL_DIR}/filesharelist)\n")
+    # and add it as post-install script to any of the installed targets, so it will be executed during "make install"
+    set_target_properties(ktelnetservice PROPERTIES POST_INSTALL_SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/make_fileshare_symlink.cmake)
+ endif (UNIX)
+
diff --git a/kde-base/kdelibs/files/kdelibs-4.0.0-X11-optional.patch b/kde-base/kdelibs/files/kdelibs-4.0.0-X11-optional.patch
new file mode 100644
index 000000000000..9a3c680f59b0
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.0.0-X11-optional.patch
@@ -0,0 +1,102 @@
+ cmake/modules/FindX11.cmake |   44 +++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 38 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/modules/FindX11.cmake b/cmake/modules/FindX11.cmake
+index 5fdbe82..b56f594 100644
+--- a/cmake/modules/FindX11.cmake
++++ b/cmake/modules/FindX11.cmake
+@@ -39,6 +39,34 @@
+ # Copyright (c) 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
+ # See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details.
+ 
++
++# Look for an optional X11 package, and provide a cmake switch to disable searching for it.
++# 
++# Example usage: FIND_X11(X11_Xinerama X11/extensions/Xinerama.h Xinerama)
++# which provides: `cmake -DWITH_X11_Xinerama=OFF` to disable the check.
++#
++# You need to pass a header _and_ a library, in that order.
++MACRO (FIND_X11 _name _header _library )
++   OPTION(WITH_${_name} "Search for X11 package ${_name}" ON)
++
++   IF (WITH_${_name})
++      FIND_PATH(${_name}_INCLUDE_PATH  ${_header}    ${X11_INC_SEARCH_PATH})
++
++      FIND_LIBRARY(${_name}_LIB        ${_library}   ${X11_LIB_SEARCH_PATH})
++
++      IF (${_name}_INCLUDE_PATH AND ${_name}_LIB)
++         SET(${_name}_FOUND TRUE)
++         SET(_temp ${${_name}_INCLUDE_PATH})
++         SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${_temp})
++      ENDIF (${_name}_INCLUDE_PATH AND ${_name}_LIB)
++
++   ELSE (WITH_${_name})
++      SET(${_name}_FOUND         FALSE     CACHE  BOOL      "${_name} found")
++      SET(${_name}_LIB           NOTFOUND  CACHE  FILEPATH  "Path to ${_name} library")
++      SET(${_name}_INCLUDE_PATH  NOTFOUND  CACHE  PATH      "Path to ${_name}")
++   ENDIF (WITH_${_name})
++ENDMACRO (FIND_X11)
++
+ IF (UNIX)
+   SET(X11_FOUND 0)
+   # X11 is never a framework and some header files may be
+@@ -75,7 +103,7 @@ IF (UNIX)
+   FIND_PATH(X11_Xaccessrules_INCLUDE_PATH X11/extensions/XKBrules.h  ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xaccessstr_INCLUDE_PATH X11/extensions/XKBstr.h      ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xau_INCLUDE_PATH X11/Xauth.h                         ${X11_INC_SEARCH_PATH})
+-  FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h  ${X11_INC_SEARCH_PATH})
++  #FIND_PATH(X11_Xcomposite_INCLUDE_PATH X11/extensions/Xcomposite.h  ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xcursor_INCLUDE_PATH X11/Xcursor/Xcursor.h           ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xdamage_INCLUDE_PATH X11/extensions/Xdamage.h        ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xdmcp_INCLUDE_PATH X11/Xdmcp.h                       ${X11_INC_SEARCH_PATH})
+@@ -84,7 +112,7 @@ IF (UNIX)
+   FIND_PATH(X11_xf86vmode_INCLUDE_PATH X11/extensions/xf86vmode.h    ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xfixes_INCLUDE_PATH X11/extensions/Xfixes.h          ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xft_INCLUDE_PATH X11/Xft/Xft.h                       ${X11_INC_SEARCH_PATH})
+-  FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h      ${X11_INC_SEARCH_PATH})
++  #FIND_PATH(X11_Xinerama_INCLUDE_PATH X11/extensions/Xinerama.h      ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xinput_INCLUDE_PATH X11/extensions/XInput.h          ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xkb_INCLUDE_PATH X11/extensions/XKB.h                ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xkblib_INCLUDE_PATH X11/XKBlib.h                     ${X11_INC_SEARCH_PATH})
+@@ -94,7 +122,7 @@ IF (UNIX)
+   FIND_PATH(X11_XShm_INCLUDE_PATH X11/extensions/XShm.h              ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xrandr_INCLUDE_PATH X11/extensions/Xrandr.h          ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xrender_INCLUDE_PATH X11/extensions/Xrender.h        ${X11_INC_SEARCH_PATH})
+-  FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH})
++  #FIND_PATH(X11_Xscreensaver_INCLUDE_PATH X11/extensions/scrnsaver.h ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xshape_INCLUDE_PATH X11/extensions/shape.h           ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xutil_INCLUDE_PATH X11/Xutil.h                       ${X11_INC_SEARCH_PATH})
+   FIND_PATH(X11_Xt_INCLUDE_PATH X11/Intrinsic.h                      ${X11_INC_SEARCH_PATH})
+@@ -107,25 +135,29 @@ IF (UNIX)
+   # Find additional X libraries. Keep list sorted by library name.
+   FIND_LIBRARY(X11_ICE_LIB ICE               ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xau_LIB Xau               ${X11_LIB_SEARCH_PATH})
+-  FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
++  #FIND_LIBRARY(X11_Xcomposite_LIB Xcomposite ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xcursor_LIB Xcursor       ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xdamage_LIB Xdamage       ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xdmcp_LIB Xdmcp           ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xext_LIB Xext             ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xfixes_LIB Xfixes         ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xft_LIB Xft               ${X11_LIB_SEARCH_PATH})
+-  FIND_LIBRARY(X11_Xinerama_LIB Xinerama     ${X11_LIB_SEARCH_PATH})
++  #FIND_LIBRARY(X11_Xinerama_LIB Xinerama     ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xinput_LIB Xi             ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xkbfile_LIB xkbfile       ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xpm_LIB Xpm               ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xrandr_LIB Xrandr         ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xrender_LIB Xrender       ${X11_LIB_SEARCH_PATH})
+-  FIND_LIBRARY(X11_Xscreensaver_LIB Xss      ${X11_LIB_SEARCH_PATH})
++  #FIND_LIBRARY(X11_Xscreensaver_LIB Xss      ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xt_LIB Xt                 ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_XTest_LIB Xtst            ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xv_LIB Xv                 ${X11_LIB_SEARCH_PATH})
+   FIND_LIBRARY(X11_Xxf86misc_LIB Xxf86misc   ${X11_LIB_SEARCH_PATH})
+ 
++  FIND_X11(X11_Xcomposite X11/extensions/Xcomposite.h Xcomposite)
++  FIND_X11(X11_Xinerama X11/extensions/Xinerama.h Xinerama)
++  FIND_X11(X11_Xscreensaver X11/extensions/scrnsaver.h Xss)
++
+   SET(X11_LIBRARY_DIR "")
+   IF(X11_X11_LIB)
+     GET_FILENAME_COMPONENT(X11_LIBRARY_DIR ${X11_X11_LIB} PATH)
diff --git a/kde-base/kdelibs/files/kdelibs-4.0.0-alsa-optional.patch b/kde-base/kdelibs/files/kdelibs-4.0.0-alsa-optional.patch
new file mode 100644
index 000000000000..77e9ae04dc16
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.0.0-alsa-optional.patch
@@ -0,0 +1,51 @@
+--- a/cmake/modules/FindAlsa.cmake
++++ b/cmake/modules/FindAlsa.cmake
+@@ -13,10 +13,14 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
++OPTION(WITH_Alsa "Support for the ALSA sound system." ON)
++
+ include(CheckIncludeFiles)
+ include(CheckIncludeFileCXX)
+ include(CheckLibraryExists)
+ 
++if(WITH_Alsa)
++
+ # Already done by toplevel
+ find_library(ASOUND_LIBRARY asound)
+ check_library_exists(asound snd_seq_create_simple_port ${ASOUND_LIBRARY} HAVE_LIBASOUND2)
+@@ -29,19 +33,22 @@
+ 
+ find_path(ALSA_INCLUDES alsa/version.h)
+ 
++endif(WITH_Alsa)
++
+ macro(ALSA_VERSION_STRING _result)
+     # check for version in alsa/version.h
+-    if(ALSA_INCLUDES)
++    if(WITH_Alsa AND ALSA_INCLUDES)
+         file(READ "${ALSA_INCLUDES}/alsa/version.h" _ALSA_VERSION_CONTENT)
+         string(REGEX REPLACE ".*SND_LIB_VERSION_STR.*\"(.*)\".*" "\\1" ${_result} ${_ALSA_VERSION_CONTENT})
+-    else(ALSA_INCLUDES)
++    else(WITH_Alsa AND ALSA_INCLUDES)
+         message(STATUS "ALSA version not known. ALSA output will probably not work correctly.")
+-    endif(ALSA_INCLUDES)
++    endif(WITH_Alsa AND ALSA_INCLUDES)
+ endmacro(ALSA_VERSION_STRING _result)
+ 
+ 
+ get_filename_component(_FIND_ALSA_MODULE_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+ macro(ALSA_CONFIGURE_FILE _destFile)
++	if(WITH_Alsa)
+     check_include_files(sys/soundcard.h HAVE_SYS_SOUNDCARD_H)
+     check_include_files(machine/soundcard.h HAVE_MACHINE_SOUNDCARD_H)
+ 
+@@ -58,6 +65,7 @@
+         set(HAVE_SND_PCM_RESUME 1)
+     endif(ASOUND_HAS_SND_PCM_RESUME)
+ 
++	endif(WITH_Alsa)
+     configure_file(${_FIND_ALSA_MODULE_DIR}/config-alsa.h.cmake ${_destFile})
+ endmacro(ALSA_CONFIGURE_FILE _destFile)
+ 
diff --git a/kde-base/kdelibs/kdelibs-4.0.0.ebuild b/kde-base/kdelibs/kdelibs-4.0.0.ebuild
new file mode 100644
index 000000000000..ef6c03d6f502
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-4.0.0.ebuild
@@ -0,0 +1,201 @@
+# 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-4.0.0.ebuild,v 1.1 2008/01/18 00:42:53 philantrop Exp $
+
+#FIXME: alsa,pam,x11-automagic,tests + sync live ebuild
+
+EAPI="1"
+
+inherit kde4-base
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="3dnow acl alsa altivec bindist +bzip2 debug doc fam htmlhandbook jpeg2k
+kerberos mmx nls openexr opengl +pcre +semantic-desktop spell sse sse2 ssl test zeroconf"
+LICENSE="GPL-2 LGPL-2"
+RESTRICT="test"
+
+COMMONDEPEND="
+	!<kde-base/kdebase-3.5.7-r6
+	!<kde-base/kdebase-startkde-3.5.7-r1
+	!=kde-base/kdebase-3.5.8
+	!=kde-base/kdebase-3.5.8-r1
+	!=kde-base/kdebase-3.5.8-r2
+	!=kde-base/kdebase-startkde-3.5.8
+	>=app-misc/strigi-0.5.7
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libxslt-1.1.17
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/giflib
+	media-libs/jpeg
+	media-libs/libpng
+	>=sys-apps/dbus-0.91
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXpm
+	x11-libs/libXrender
+	x11-libs/libXtst
+	>=x11-misc/shared-mime-info-0.18
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a )
+	fam? ( virtual/fam )
+	jpeg2k? ( media-libs/jasper )
+	kerberos? ( virtual/krb5 )
+	nls? ( virtual/libintl )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 media-libs/ilmbase )
+	opengl? ( virtual/opengl )
+	pcre? ( >=dev-libs/libpcre-4.2 )
+	semantic-desktop? ( >=dev-libs/soprano-2.0.0 )
+	spell? ( app-text/aspell app-dicts/aspell-en app-text/enchant )
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	zeroconf? ( || ( net-dns/avahi
+		!bindist? ( net-misc/mDNSResponder ) ) )
+"
+
+DEPEND="${COMMONDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${COMMONDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth"
+
+# Patch to respect the sandbox when cmake tries to create symlinks,
+# or executes an external program that tries to write files.
+PATCHES="${FILESDIR}/e-tempdir.patch
+${FILESDIR}/${P}-X11-optional.patch
+${FILESDIR}/${P}-alsa-optional.patch"
+# Create CMake switches to make Xcomposite, Xinerama & Xscreensaver optional.
+
+pkg_setup() {
+	KDE4_BUILT_WITH_USE_CHECK="--missing true sys-apps/dbus X"
+	use alsa && KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
+		--missing true media-libs/alsa-lib midi"
+	if use zeroconf && has_version net-dns/avahi; then
+		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
+			net-dns/avahi mdnsresponder-compat"
+	fi
+
+	kde4-base_pkg_setup
+}
+
+src_compile() {
+	if use zeroconf; then
+		if has_version net-dns/avahi; then
+			mycmakeargs="${mycmakeargs} -DWITH_Avahi=ON -DWITH_DNSSD=OFF"
+		elif has_version net-misc/mDNSResponder; then
+			mycmakeargs="${mycmakeargs} -DWITH_Avahi=OFF -DWITH_DNSSD=ON"
+		else
+			die "USE=\"zeroconf\" enabled but neither net-dns/avahi nor net-misc/mDNSResponder were found."
+		fi
+	fi
+
+	mycmakeargs="${mycmakeargs}
+		-DWITH_HSPELL=OFF
+		$(cmake-utils_has 3dnow X86_3DNOW)
+		$(cmake-utils_has altivec PPC_ALTIVEC)
+		$(cmake-utils_has mmx X86_MMX)
+		$(cmake-utils_has sse X86_SSE)
+		$(cmake-utils_has sse2 X86_SSE2)
+		$(cmake-utils_use_with acl ACL)
+		$(cmake-utils_use_with alsa Alsa)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with fam FAM)
+		$(cmake-utils_use_with jpeg2k Jasper)
+		$(cmake-utils_use_with kerberos GSSAPI)
+		$(cmake-utils_use_with nls Libintl)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pcre PCRE)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with spell ASPELL)
+		$(cmake-utils_use_with spell ENCHANT)
+		$(cmake-utils_use_with ssl OpenSSL)
+	"
+
+	kde4-base_src_compile
+
+	# The building of apidox is not managed anymore by the build system
+	if use doc; then
+		einfo "Building API documentation"
+		cd "${S}"/doc/api/
+		./doxygen.sh "${S}" || die "APIDOX generation failed"
+	fi
+}
+
+src_install() {
+	kde4-base_src_install
+
+	if use doc; then
+		einfo "Installing API documentation. This could take a bit of time."
+		cd "${S}"/doc/api/
+		docinto /HTML/en/kdelibs-apidox
+		dohtml -r ${P}-apidocs/* || die "Install phase of KDE4 API Documentation failed"
+	fi
+
+	dodir /etc/env.d
+	dodir /etc/revdep-rebuild
+
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	cat <<-EOF > "${T}"/44kdepaths-${SLOT} # number goes down with version bump
+	PATH="${PREFIX}/bin"
+	ROOTPATH="${PREFIX}/sbin:${PREFIX}/bin"
+	LDPATH="${_libdirs}"
+	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
+	doenvd "${T}"/44kdepaths-${SLOT}
+
+	# make sure 'source /etc/profile' doesn't hose the PATH
+	dodir /etc/profile.d
+	cat <<-'EOF' > "${D}"/etc/profile.d/44kdereorderpaths-${SLOT}.sh
+	if [ -n "${KDEDIR}" ]; then
+		export PATH=${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
+		export ROOTPATH=${KDEDIR}/sbin:${KDEDIR}/bin:$(echo ${PATH} | sed "s#${KDEDIR}/s\?bin:##g")
+	fi
+	EOF
+
+	cat <<-EOF > "${D}/etc/revdep-rebuild/50-kde-${SLOT}"
+	SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+	EOF
+}
+
+src_test() {
+	# FIXME: Disable kate tests
+	mycmakeargs="${mycmakeargs}
+		-DKHTML_BUILD_TESTREGRESSION=ON"
+	kde4-base_src_test
+}
+
+pkg_postinst() {
+	if use zeroconf; then
+		echo
+		elog "To make zeroconf support available in KDE make sure that the 'mdnsd' daemon"
+		elog "is running. Make sure also that multicast dns lookups are enabled by editing"
+		elog "the 'hosts:' line in /etc/nsswitch.conf to include 'mdns', e.g.:"
+		elog "	hosts: files mdns dns"
+		echo
+	fi
+
+	kde4-base_pkg_postinst
+}
diff --git a/kde-base/kstars/Manifest b/kde-base/kstars/Manifest
index e641bbcedf6e..97620bf721df 100644
--- a/kde-base/kstars/Manifest
+++ b/kde-base/kstars/Manifest
@@ -1,10 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX kstars-4.0.0-destdir.patch 1440 RMD160 fd6f3c895be42182017c812ca3f4170f460751e8 SHA1 02c1136812b0aaf1cb0ef4419ee73130caf06a9b SHA256 cad8aa86d2c7490f92873e4ed28d6e74f15c65f8bf5e436b68deb121d3da2c5c
+MD5 baea48e5b970f3b9b9fbf272a2262efb files/kstars-4.0.0-destdir.patch 1440
+RMD160 fd6f3c895be42182017c812ca3f4170f460751e8 files/kstars-4.0.0-destdir.patch 1440
+SHA256 cad8aa86d2c7490f92873e4ed28d6e74f15c65f8bf5e436b68deb121d3da2c5c files/kstars-4.0.0-destdir.patch 1440
 DIST kdeedu-3.5.5.tar.bz2 30016358 RMD160 f431bd83c17a483e9cacbbfdc19bee4bcc692e49 SHA1 38bc64e6e0683e3c0e0218c534d10dc3a4b6455a SHA256 f02dba5ed31d58e34c21c33989c70ce6cb185a8bebd407237175a144b3d89891
 DIST kdeedu-3.5.6.tar.bz2 30049452 RMD160 ca70c9c9d9637154736c9f8978cbde8bfd2460ee SHA1 c081f33f8333fdf25cfd602facd511252152109a SHA256 d3b8471f26c83c05cadfb0ff48b5d8170034c5e6e436d514529e640037350a61
 DIST kdeedu-3.5.7.tar.bz2 30158516 RMD160 7fb9d10314d2617cb40b51cc4e8663838780633a SHA1 9a27207e63721da4869f4196b45ad1bbec2660d0 SHA256 59e8638f9fc3481159c8f841ab7493f978464e288ce43ea9e13ea1178ded059b
 DIST kdeedu-3.5.8.tar.bz2 30158456 RMD160 e15dc74c572da3035b3daceb66c75b14d6e14818 SHA1 7e225d8e9c6c0d69b780f96babbed569d31b0b70 SHA256 dddd4bef001ece864afe9502fe82c460dcf6329b9522ae0a4a2d0b94b5648b9b
+DIST kdeedu-4.0.0.tar.bz2 41887194 RMD160 468d00e6eee05ec62ae1c42199067597de92b661 SHA1 2328dd356a8de7814ed2cf6f28bc9ae797a2fa8c SHA256 9fa5f6af13a4101f0c83a428624f22835d2f5696157ccd0e23944beacf86a0d1
 EBUILD kstars-3.5.5.ebuild 712 RMD160 157cb254175535d9238cc44f6acedbc303efec37 SHA1 64ca3da9316209e4b6435ff305f6b54d88494ca3 SHA256 7d4dd5527ce5fa343a9ee47273cc01b552ddc291ad9b4f364963a628c89abe13
 MD5 aa366fde0bba7b5ae2976484d2d34c05 kstars-3.5.5.ebuild 712
 RMD160 157cb254175535d9238cc44f6acedbc303efec37 kstars-3.5.5.ebuild 712
@@ -21,10 +23,14 @@ EBUILD kstars-3.5.8.ebuild 722 RMD160 11c89ffa2592113bdca55bcfaf17a8bccdf42979 S
 MD5 c1ecfc1a2476b785f14f9a91515a2fee kstars-3.5.8.ebuild 722
 RMD160 11c89ffa2592113bdca55bcfaf17a8bccdf42979 kstars-3.5.8.ebuild 722
 SHA256 12da62dbde1332b4872291f647a05130fab7ee65e41061d67fda89dfae0938ea kstars-3.5.8.ebuild 722
-MISC ChangeLog 8976 RMD160 1b77e03adc7b6127021c595907544f98952bad36 SHA1 20f1e44b17f1201ba64dbd5dce542efa6d0572a3 SHA256 440f75aaa30410be74b3b838bf934af3dec1a5fc642541910e6fa711169208d1
-MD5 e7780044f2483089d9cec507f9d6f58f ChangeLog 8976
-RMD160 1b77e03adc7b6127021c595907544f98952bad36 ChangeLog 8976
-SHA256 440f75aaa30410be74b3b838bf934af3dec1a5fc642541910e6fa711169208d1 ChangeLog 8976
+EBUILD kstars-4.0.0.ebuild 1242 RMD160 3fa5f18fb36df7726201478ecf325260631971f2 SHA1 1fe0e88cbe9fcb4c35cfd8acfa1cc646c15eed46 SHA256 3f279300f89204048a42c91f1062d7bcb961697ec616b671321b1ee32f2af053
+MD5 fa049ab99ac2dc1bd3b78ce5be4062b7 kstars-4.0.0.ebuild 1242
+RMD160 3fa5f18fb36df7726201478ecf325260631971f2 kstars-4.0.0.ebuild 1242
+SHA256 3f279300f89204048a42c91f1062d7bcb961697ec616b671321b1ee32f2af053 kstars-4.0.0.ebuild 1242
+MISC ChangeLog 9141 RMD160 e70fef52a5828112dcb2c44e083939e18717b515 SHA1 4a67a43f32d8c53a75669e7a66cdae55e522476a SHA256 e84905648ee34fd5bfd08812a28772cf782ff30dedf86f2406901eab313d4713
+MD5 269166c9c184d60d0605f5bed406588e ChangeLog 9141
+RMD160 e70fef52a5828112dcb2c44e083939e18717b515 ChangeLog 9141
+SHA256 e84905648ee34fd5bfd08812a28772cf782ff30dedf86f2406901eab313d4713 ChangeLog 9141
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -41,10 +47,6 @@ SHA256 3b5556c639688cef33f35757e5dc39d97f9a16862b063b9e9b950dfd58b28e63 files/di
 MD5 5484ccc30043075426937f14d11f88fd files/digest-kstars-3.5.8 247
 RMD160 791421a5ab7fd2d85121e253e20bd0a7ff1497dc files/digest-kstars-3.5.8 247
 SHA256 4f40ebcf2b46f22bb6712d559d81040c6c20c0a0257afd0b5becc1bf3e138dca files/digest-kstars-3.5.8 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHGT9ICkvF58q80IkRAiTpAKCW7j5ifZ+AddDRqsLeZte/ChxaPQCgjvVa
-6CpFhnxByErepFOvEarR8Fw=
-=oy/2
------END PGP SIGNATURE-----
+MD5 70d65b92c383d3d585d00b989dcf489d files/digest-kstars-4.0.0 247
+RMD160 4aff9ab69ac965d94a6d8bbc383dc1813129e349 files/digest-kstars-4.0.0 247
+SHA256 5fe3f0264323a1c9ff8e52228a5bab53675725391f9c1818d425ab5fc868d204 files/digest-kstars-4.0.0 247