Version bump to KDE 4.0.2.

(Portage version: 2.1.4.4)

4 files changed, 380 insertions, 1 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 9bf36e2b3c88..1126cfeeb3c8 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.436 2008/03/10 06:17:56 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.437 2008/03/10 23:23:34 philantrop Exp $
+
+*kdebase-4.0.1 (10 Mar 2008)
+
+  10 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kdebase-4.0.1-opengl.patch,
+  +files/kdebase-4.0.1-pam-optional.patch, +kdebase-4.0.1.ebuild:
+  Version bump to KDE 4.0.2
 
 *kdebase-3.5.9-r1 (10 Mar 2008)
 
diff --git a/kde-base/kdebase/files/kdebase-4.0.1-opengl.patch b/kde-base/kdebase/files/kdebase-4.0.1-opengl.patch
new file mode 100644
index 000000000000..eabca705f833
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-4.0.1-opengl.patch
@@ -0,0 +1,39 @@
+Index: workspace/kcontrol/screensaver/CMakeLists.txt
+===================================================================
+--- workspace/kcontrol/screensaver/CMakeLists.txt	(revision 769817)
++++ workspace/kcontrol/screensaver/CMakeLists.txt	(working copy)
+@@ -1,5 +1,7 @@
+ 
++if(OPENGL_FOUND)
+ check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
++endif(OPENGL_FOUND)
+ configure_file (config-screensaver.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-screensaver.h )
+ 
+ add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+Index: workspace/CMakeLists.txt
+===================================================================
+--- workspace/CMakeLists.txt	(revision 769817)
++++ workspace/CMakeLists.txt	(working copy)
+@@ -16,8 +16,6 @@
+ include (MacroLibrary)
+ include (KDE4Defaults)
+ 
+-macro_optional_find_package(OpenGL)
+-
+ include(ConfigureChecks.cmake)
+ configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h )
+ configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
+Index: workspace/krunner/lock/CMakeLists.txt
+===================================================================
+--- workspace/krunner/lock/CMakeLists.txt	(revision 769817)
++++ workspace/krunner/lock/CMakeLists.txt	(working copy)
+@@ -5,7 +5,9 @@
+ ########### next target ###############
+ 
+ check_library_exists(Xxf86misc XF86MiscSetGrabKeysState "" HAVE_XF86MISCSETGRABKEYSSTATE)
++if(OPENGL_FOUND)
+ check_library_exists(GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL)
++endif(OPENGL_FOUND)
+ 
+ configure_file(config-krunner-lock.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krunner-lock.h)
+ 
diff --git a/kde-base/kdebase/files/kdebase-4.0.1-pam-optional.patch b/kde-base/kdebase/files/kdebase-4.0.1-pam-optional.patch
new file mode 100644
index 000000000000..6fb54f05c547
--- /dev/null
+++ b/kde-base/kdebase/files/kdebase-4.0.1-pam-optional.patch
@@ -0,0 +1,29 @@
+diff --git a/kdebase/workspace/cmake/modules/FindPAM.cmake b/kdebase/workspace/cmake/modules/FindPAM.cmake
+index 3499836..cd1c2bb 100644
+--- a/kdebase/workspace/cmake/modules/FindPAM.cmake
++++ b/kdebase/workspace/cmake/modules/FindPAM.cmake
+@@ -5,6 +5,8 @@
+ #  PAM_INCLUDE_DIR - the pam include directory
+ #  PAM_LIBRARIES - libpam library
+ 
++if (WITH_PAM)
++
+ if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
+ 	# Already in cache, be silent
+ 	set(PAM_FIND_QUIETLY TRUE)
+@@ -72,3 +74,5 @@ else (PAM_FOUND)
+ endif (PAM_FOUND)
+ 
+ mark_as_advanced(PAM_INCLUDE_DIR PAM_LIBRARY DL_LIBRARY PAM_MESSAGE_CONST)
++
++endif (WITH_PAM)
+diff --git a/kdebase/workspace/cmake/modules/UnixAuth.cmake b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+index ed8ab9e..ce3bcc2 100644
+--- a/kdebase/workspace/cmake/modules/UnixAuth.cmake
++++ b/kdebase/workspace/cmake/modules/UnixAuth.cmake
+@@ -1,4 +1,4 @@
+-find_package(PAM)
++macro_optional_find_package(PAM)
+ 
+ set(UNIXAUTH_LIBRARIES)
+ set(UNIXAUTH_INCLUDE_DIRS)
diff --git a/kde-base/kdebase/kdebase-4.0.1.ebuild b/kde-base/kdebase/kdebase-4.0.1.ebuild
new file mode 100644
index 000000000000..2fe3cf2c3d85
--- /dev/null
+++ b/kde-base/kdebase/kdebase-4.0.1.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-4.0.1.ebuild,v 1.1 2008/03/10 23:23:34 philantrop Exp $
+
+EAPI="1"
+
+inherit multilib kde4-base
+
+DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
+HOMEPAGE="http://www.kde.org/"
+URI="${SRC_URI}"
+SRC_URI="${URI} ${URI/${PN}/${PN}-runtime} ${URI/${PN}/${PN}-workspace}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="3dnow altivec bluetooth +bzip2 captury debug ieee1394 htmlhandbook kerberos
+lm_sensors mmx networkmanager pam openexr opengl samba sse sse2
+ssl test +usb +xcb xcomposite +xine xinerama"
+
+LICENSE="GPL-2 LGPL-2"
+RESTRICT="test"
+
+COMMONDEPEND="
+	!kde-base/kdebase-runtime
+	!kde-base/kdebase-workspace
+	>=app-misc/strigi-0.5.7
+	dev-cpp/clucene
+	>=dev-libs/cyrus-sasl-2
+	>=dev-libs/glib-2
+	>=dev-libs/soprano-2.0.0
+	>=kde-base/qimageblitz-0.0.4
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/libpng
+	>=sys-apps/dbus-1.0.2
+	>=sys-apps/hal-0.5.9
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/libxklavier-3.2
+	>=x11-libs/libXrandr-1.2.1
+	x11-libs/libXrender
+	x11-libs/libXres
+	x11-libs/libXt
+	x11-libs/libXtst
+	x11-libs/libXxf86misc
+	bzip2? ( app-arch/bzip2 )
+	bluetooth? ( net-wireless/bluez-libs )
+	captury? ( media-libs/libcaptury )
+	ieee1394? ( sys-libs/libraw1394 )
+	kerberos? ( virtual/krb5 )
+	lm_sensors? ( sys-apps/lm_sensors )
+	networkmanager? ( =net-misc/networkmanager-0.6* )
+	samba? ( >=net-fs/samba-3.0.1 )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	opengl? ( virtual/glu virtual/opengl )
+	pam? ( >=kde-base/kdebase-pam-7
+		sys-libs/pam )
+	ssl? ( dev-libs/openssl )
+	usb? ( >=dev-libs/libusb-0.1.10a )
+	xcomposite? ( x11-libs/libXcomposite )
+	xine? ( >=media-libs/xine-lib-1.1.9
+		xcb? ( x11-libs/libxcb ) )
+	xinerama? ( x11-libs/libXinerama )
+"
+
+DEPEND="${COMMONDEPEND}
+	x11-apps/bdftopcf
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xf86miscproto
+	xcomposite? ( x11-proto/compositeproto
+		x11-proto/damageproto )
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	sys-apps/usbutils
+	sys-devel/gdb
+	>=www-misc/htdig-3.2.0_beta6-r1
+	x11-apps/mkfontdir
+	x11-apps/setxkbmap
+	>=x11-apps/xinit-1.0.5-r2
+	x11-apps/xmessage
+	x11-apps/xprop
+	>=x11-apps/xrandr-1.2.1
+	x11-apps/xset
+	x11-apps/xsetroot
+	|| ( x11-misc/xkeyboard-config
+		x11-misc/xkbdata )
+	virtual/ssh
+	kernel_linux? (
+		|| ( >=sys-apps/eject-2.1.5
+			sys-block/unieject ) )
+"
+
+PDEPEND="
+	|| ( kde-base/kdeartwork-iconthemes:${SLOT}
+		kde-base/kdeartwork:${SLOT} )"
+
+#IUSE="xscreensaver"
+#
+#COMMONDEPEND="
+#	xscreensaver? ( x11-libs/libXScrnSaver )
+#"
+#DEPEND="${COMMONDEPEND}
+#	x11-apps/xhost
+#	xscreensaver? ( x11-proto/scrnsaverproto )"
+
+PATCHES="${FILESDIR}/gentoo-startkde.patch
+	${FILESDIR}/${P}-pam-optional.patch
+	${FILESDIR}/${P}-opengl.patch"
+
+pkg_setup() {
+	KDE4_BUILT_WITH_USE_CHECK="--missing false kde-base/kdelibs:${SLOT} alsa semantic-desktop
+		app-misc/strigi dbus qt4"
+	if use xine && use xcb; then
+		KDE4_BUILT_WITH_USE_CHECK="${KDE4_BUILT_WITH_USE_CHECK}
+			media-libs/xine-lib xcb"
+	else
+		ewarn "You will _NOT_ have multimedia support unless you enable USE=\"xcb xine\""
+	fi
+
+	kde4-base_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	mv "${WORKDIR}/${PN}-runtime-${PV}" "${S}/runtime"
+	mv "${WORKDIR}/${PN}-workspace-${PV}" "${S}/workspace"
+
+	kde4-base_src_unpack
+}
+
+src_compile() {
+	if ! use captury; then
+		sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
+			-i "${S}"/workspace/kwin/effects/CMakeLists.txt || \
+			die "Making captury optional failed."
+	fi
+
+	# Patch the startkde script to setup the environment for KDE 4.0
+	# Add our KDEDIR
+	sed -e "s#@REPLACE_PREFIX@#${PREFIX}#" \
+		-i "${S}/workspace/startkde.cmake" || die "Sed for PREFIX failed."
+
+	# List all the multilib libdirs
+	local _libdir _libdirs
+	for _libdir in $(get_all_libdirs); do
+		_libdirs="${_libdirs}:${PREFIX}/${_libdir}"
+	done
+	_libdirs=${_libdirs#:}
+
+	# Complete LDPATH
+	sed -e "s#@REPLACE_LIBS@#${_libdirs}#" \
+		-i "${S}/workspace/startkde.cmake" || die "Sed for LDPATH failed."
+
+	# Upstream moved kdesu to libexec first, then decided to move it back
+	# to /${PREFIX}/bin/ , so I'm doing that now already.
+	sed -e '/kdesu_executable/s:LIBEXEC_INSTALL_DIR:BIN_INSTALL_DIR:' \
+		-i "${S}"/runtime/kdesu/kdesu/CMakeLists.txt || \
+		die "Moving kdesu from libexec to bin failed."
+
+	mycmakeargs="${mycmakeargs}
+		-DWITH_LibXKlavier=ON -DWITH_GLIB2=ON -DWITH_GObject=ON
+		$(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 bluetooth BlueZ)
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with ieee1394 RAW1394)
+		$(use kerberos && echo "-DKDE4_KRB5AUTH=ON" || echo "-DKDE4_KRB5AUTH=OFF")
+		$(cmake-utils_use_with lm_sensors Sensors)
+		$(cmake-utils_use_with networkmanager NetworkManager)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pam PAM)
+		$(cmake-utils_use_with samba Samba)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with usb USB)
+		$(cmake-utils_use_with xcomposite X11_Xcomposite)
+		$(cmake-utils_use_with xine Xine)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
+	"
+	if use xine; then
+		mycmakeargs="${mycmakeargs}
+			$(cmake-utils_use_with xcb XCB)"
+		use xcb || mycmakeargs="${mycmakeargs} -DKDE4_DISABLE_MULTIMEDIA=ON"
+	fi
+
+	# FIXME: there's no Xscreensaver argument at the moment
+	# FIXME There are more flags which currently aren't managed:
+	# KDE4_KDM_XCONSOLE -> Build KDM with built-in xconsole - Default OFF
+	# KDE4_KERBEROS4 ->  Compile KDM with Kerberos v4 support - Default OFF
+	#
+	# KDE4_KRB5AUTH -> Use Sun's secure RPC for Xauth cookies in KDM (? -
+	# probably an error in cmake help) - Default OFF
+	#
+	# KDE4_RPCAUTH ->  Use Sun's secure RPC for Xauth cookies in KDM - Default
+	# OFF
+	#
+	# KDE4_XDMCP ->  Build KDM with XDMCP support - Default ON
+	#
+	# KONSOLE_GENERATE_LINEFONT -> Konsole: regenerate linefont file - Default
+	# OFF
+	# WITH_XKB -> Enable/Disable building of Konsole with support for XKB
+
+	kde4-base_src_compile
+}
+
+src_test() {
+	sed -i -e "/testkioarchive/s/^#DONOTTEST /" \
+		"${S}"/runtime/kioslave/archive/tests/CMakeLists.txt
+	sed -i -e "/testtrash/s/^#DONOTTEST /" \
+		"${S}"/runtime/kioslave/trash/tests/CMakeLists.txt
+	sed -i -e "/kurifiltertest/s/^#DONOTTEST /" \
+		"${S}"/runtime/kurifilter-plugins/tests/CMakeLists.txt
+	sed -e "/konqpopupmenutest/s/^/#DONOTTEST /" \
+		-i "${S}"/apps/lib/konq/tests/CMakeLists.txt
+	sed -e '/guitest/s/^/#DONOTTEST/' \
+		-i "${S}"/workspace/libs/ksysguard/tests/CMakeLists.txt
+	sed -e "s/packagestructuretest//" \
+		-i "${S}"/workspace/libs/plasma/tests/CMakeLists.txt
+
+	kde4-base_src_test
+}
+
+src_install() {
+	export GENKDMCONF_FLAGS="--no-old --no-backup"
+
+	kde4-base_src_install
+
+	# Customize the kdmrc configuration
+	sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=/usr/share/xsessions:" \
+		"${D}"/${PREFIX}/share/config/kdm/kdmrc \
+		|| die "Failed to set SessionsDirs correctly."
+
+	# startup and shutdown scripts
+	insinto "${KDEDIR}/env"
+	doins "${FILESDIR}/agent-startup.sh"
+
+	exeinto "${KDEDIR}/shutdown"
+	doexe "${FILESDIR}/agent-shutdown.sh"
+
+	# freedesktop environment variables
+	cat <<-EOF > "${T}/xdg.sh"
+	export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
+	export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
+	EOF
+	insinto ${KDEDIR}/env
+	doins "${T}/xdg.sh"
+
+	# x11 session script
+	cat <<-EOF > "${T}/${SLOT}"
+	#!/bin/sh
+	exec ${KDEDIR}/bin/startkde
+	EOF
+	exeinto /etc/X11/Sessions
+	doexe "${T}/${SLOT}"
+
+	# freedesktop compliant session script
+	sed -e "s:\${KDE4_BIN_INSTALL_DIR}:${KDEDIR}/bin:g;s:Name=KDE:Name=${SLOT}:" \
+		"${S}/workspace/kdm/kfrontend/sessions/kde.desktop.cmake" > "${T}/${SLOT}.desktop"
+	insinto /usr/share/xsessions
+	doins "${T}/${SLOT}.desktop"
+}
+
+pkg_postinst() {
+	kde4-base_pkg_postinst
+
+	# set the default kdm face icon if it's not already set by the system admin
+	if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	fi
+	if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
+	fi
+
+	mkdir -p "${ROOT}${KDEDIR}/share/templates/.source/emptydir"
+
+	echo
+	elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
+	elog "edit ${KDEDIR}/env/agent-startup.sh and"
+	elog "${KDEDIR}/shutdown/agent-shutdown.sh"
+	echo
+	elog "If you can't open new konqueror windows and get something like"
+	elog "'WARNING: Outdated database found' when starting konqueror in a console, run"
+	elog "kbuildsycoca as the user you're running KDE under."
+	elog "This is NOT a bug."
+	echo
+	elog "To use Java on webpages: emerge >=virtual/jre-1.4"
+	echo
+}