Version bump to KDE 4.0.1.

Package-Manager: portage-2.1.4.1

3 files changed, 104 insertions, 1 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 7401fb5b5358..a51170563c91 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.122 2008/01/31 15:31:58 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.123 2008/02/07 00:12:22 philantrop Exp $
+
+*kdm-4.0.1 (06 Feb 2008)
+
+  06 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kdebase-4.0.1-pam-optional.patch, +kdm-4.0.1.ebuild:
+  Version bump to KDE 4.0.1.
 
   31 Jan 2008; Brent Baude <ranger@gentoo.org> kdm-3.5.8-r1.ebuild:
   Marking kdm-3.5.8-r1 ppc for bug 207634
diff --git a/kde-base/kdm/files/kdebase-4.0.1-pam-optional.patch b/kde-base/kdm/files/kdebase-4.0.1-pam-optional.patch
new file mode 100644
index 000000000000..6fb54f05c547
--- /dev/null
+++ b/kde-base/kdm/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/kdm/kdm-4.0.1.ebuild b/kde-base/kdm/kdm-4.0.1.ebuild
new file mode 100644
index 000000000000..051cb3d8a9da
--- /dev/null
+++ b/kde-base/kdm/kdm-4.0.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.0.1.ebuild,v 1.1 2008/02/07 00:12:22 philantrop Exp $
+
+EAPI="1"
+
+KMNAME=kdebase-workspace
+inherit kde4-meta
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug htmlhandbook kerberos pam"
+
+DEPEND="
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )
+	pam? ( >=kde-base/kcheckpass-${PV}:${SLOT}
+		sys-libs/pam )"
+RDEPEND="${DEPEND}
+	>=kde-base/kdepasswd-${PV}:${SLOT}
+	>=x11-apps/xinit-1.0.5-r2
+	x11-apps/xmessage"
+
+KMEXTRACTONLY="
+	kcontrol/background/
+	kcontrol/kdm/
+	kdm/frontend/sessions"
+# kde-base/kdebase-startkde installs the xession entry, so only extract here
+KMEXTRA="libs/kdm/"
+
+# Disable creating dirs in the live file system.
+PATCHES="${FILESDIR}/kdebase-${PV}-pam-optional.patch"
+
+src_compile() {
+	mycmakeargs="${mycmakeargs}
+		$(use kerberos && echo "-DKDE4_KRB5AUTH=ON" || echo "-DKDE4_KRB5AUTH=OFF")
+		$(cmake-utils_use_with pam PAM)"
+
+	kde4-meta_src_compile
+}
+
+src_install() {
+	export GENKDMCONF_FLAGS="--no-old --no-backup"
+
+	kde4-meta_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."
+}
+
+pkg_postinst() {
+	# Set the default kdm face icon if it's not already set by the system admin
+	# because this is user-overrideable in that way, it's not in src_install
+	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
+}