[kde-base/kdm] Added oxygen theme installation patch

3 files changed, 153 insertions, 0 deletions

diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index f98f5d1526b..ddd49c96906 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,7 +1,10 @@
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
+AUX kdm-4.3.0-oxygen-theme-installation.patch 1650 RMD160 2f69528c4c5d087e6f5fec70e2d94d85ca59caf1 SHA1 ef7e7509e054e8b7a9518cf0f44f4b349895804c SHA256 14bca81419554379a99b70c47c8f104e414f7e9ad2dc4d8b48ebc91bb1530f95
 DIST kdebase-workspace-4.2.98.tar.bz2 62286536 RMD160 227b3e70afeeec17bae16c298b9938e667e2debd SHA1 816efd3a922a7f7d5e44690f6a72d97d4cf497a6 SHA256 ae44a009913400c7a60a23e3aecb851bd712a0fc901a55587f0a872e8546c033
+DIST kdebase-workspace-4.3.0.tar.bz2 62293938 RMD160 08b3f5ca74c1b5688a1d26bf77acd42e9dd335c7 SHA1 9a27b91b2c8a673fbdd6ea88385de0327f10e248 SHA256 89e24bfccb442935779b777eed9401a7f4d45c464e44573ece6b65e636c21bad
 DIST kdebase-workspace-4.3.61.tar.lzma 61017375 RMD160 0fd3e2652d999bc95493255dba374c126724c5ea SHA1 5ceca099fef86a81a58e1aed6f219c036c397c55 SHA256 f4a0775ff331c5898dd335f18aa88023f2c92afa0263059b69fb6f350605abf8
 EBUILD kdm-4.2.98.ebuild 2457 RMD160 bf323ee41d8e388f1197a0845a605f78fa947ff8 SHA1 98a6c910aff962a3cd5fbf3a59f9ffcab0a69c78 SHA256 f0db4507a7031939619786650195eba4105da8c7efcf2b68ef47511ce7027a06
+EBUILD kdm-4.3.0.ebuild 2600 RMD160 c65466831b7073fb2e76875c0525f79da172ac66 SHA1 c51372f9f65000b25b7fdf46b900ba52c45bc7c1 SHA256 10455ea843dfd8522e9072abcc95ce983f30809b9c256eb1318209e2a0aec15a
 EBUILD kdm-4.3.61.ebuild 2457 RMD160 bf323ee41d8e388f1197a0845a605f78fa947ff8 SHA1 98a6c910aff962a3cd5fbf3a59f9ffcab0a69c78 SHA256 f0db4507a7031939619786650195eba4105da8c7efcf2b68ef47511ce7027a06
 EBUILD kdm-4.3.9999.ebuild 2415 RMD160 230b0181c4273cb2dfc102a325e5f56704e3a66d SHA1 a2755201f908975a704408a9dae5da852a697f76 SHA256 262fa81fa6a2078df16ccd8185aaeca86c19fc027258b878a01c1e023e58b61f
 EBUILD kdm-9999.ebuild 2415 RMD160 230b0181c4273cb2dfc102a325e5f56704e3a66d SHA1 a2755201f908975a704408a9dae5da852a697f76 SHA256 262fa81fa6a2078df16ccd8185aaeca86c19fc027258b878a01c1e023e58b61f
diff --git a/kde-base/kdm/files/kdm-4.3.0-oxygen-theme-installation.patch b/kde-base/kdm/files/kdm-4.3.0-oxygen-theme-installation.patch
new file mode 100644
index 00000000000..761c375c54b
--- /dev/null
+++ b/kde-base/kdm/files/kdm-4.3.0-oxygen-theme-installation.patch
@@ -0,0 +1,53 @@
+Index: kdm/config.def
+===================================================================
+--- kdm/config.def	(revision 1004103)
++++ kdm/config.def	(revision 1004104)
+@@ -2029,7 +2029,7 @@
+ Comment: &
+ Description:
+  Specify the widget style for the greeter. Empty means to use the
+- built-in default which currently is <literal>Oxygen</literal>.
++ built-in default which currently is <literal>Oxygen-air</literal>.
+ 
+ Key: ColorScheme
+ Type: string
+@@ -2039,7 +2039,7 @@
+ Comment: &
+ Description:
+  Specify the widget color scheme for the greeter. Empty means to use the
+- built-in default which currently is <literal>Oxygen</literal>.
++ built-in default which currently is <literal>Oxygen-air</literal>.
+ 
+ Key: LogoArea
+ Type: enum
+@@ -2657,7 +2657,7 @@
+ Type: string
+ Default: ""
+ User: greeter
+-Instance: */KDMDATA "/themes/oxygen"
++Instance: */KDMDATA "/themes/oxygen-air"
+ Comment: &
+ Description:
+  The theme to use for the greeter. Can point to either a directory or an XML
+Index: kdm/kfrontend/themes/oxygen-air/CMakeLists.txt
+===================================================================
+--- kdm/kfrontend/themes/oxygen-air/CMakeLists.txt	(revision 0)
++++ kdm/kfrontend/themes/oxygen-air/CMakeLists.txt	(revision 1004104)
+@@ -0,0 +1,17 @@
++install(FILES
++    KdmGreeterTheme.desktop
++    oxygen-air.xml
++    screenshot.png
++    1280x800.jpg
++    caps.png
++    icon-kde.png
++    pw-entry-li.png
++    pw-entry.png
++    session_button-li.png
++    session_button.png
++    system_button-li.png
++    system_button.png
++    user-entry-li.png
++    user-entry.png
++    win-login.png
++    DESTINATION ${DATA_INSTALL_DIR}/kdm/themes/oxygen-air)
diff --git a/kde-base/kdm/kdm-4.3.0.ebuild b/kde-base/kdm/kdm-4.3.0.ebuild
new file mode 100644
index 00000000000..affe6f8dd68
--- /dev/null
+++ b/kde-base/kdm/kdm-4.3.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.0.ebuild,v 1.1 2009/08/04 00:27:39 wired Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+inherit kde4-meta flag-o-matic
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="consolekit debug +handbook kerberos pam"
+
+DEPEND="
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXtst
+	consolekit? (
+		>=sys-apps/dbus-1.0.2
+		sys-auth/consolekit
+	)
+	kerberos? ( virtual/krb5 )
+	pam? (
+		>=kde-base/kcheckpass-${PV}:${SLOT}[kdeprefix=]
+		virtual/pam
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-base/kdepasswd-${PV}:${SLOT}[kdeprefix=]
+	>=x11-apps/xinit-1.0.5-r2
+	x11-apps/xmessage
+"
+
+KMEXTRACTONLY="
+	kcontrol/kdm/
+"
+KMEXTRA="
+	libs/kdm/
+"
+
+PATCHES=(
+	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+	"${FILESDIR}/${P}-oxygen-theme-installation.patch"
+)
+
+src_configure() {
+	# genkdmconf breaks with -O3
+	# last checked in 4.2.95
+	replace-flags -O3 -O2
+
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use kerberos KDE4_KRB5AUTH)
+		$(cmake-utils_use_with pam)
+		$(cmake-utils_use_with consolekit CkConnector)"
+
+	kde4-meta_src_configure
+}
+
+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."
+
+	# Don't install empty dir
+	rmdir "${D}${KDEDIR}"/share/config/kdm/sessions
+}
+
+pkg_postinst() {
+	kde4-meta_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
+
+	if use consolekit; then
+		echo
+		elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
+		elog "make sure consolekit daemon is running and started at login time"
+		elog
+		elog "rc-update add consolekit default && /etc/init.d/consolekit start"
+		echo
+	fi
+}