fixed oxygen-air kdm theme installation

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 160 insertions, 2 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 6e14eca9fbfe..30dde2a9d891 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.173 2009/08/05 18:02:38 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.174 2009/08/05 18:07:08 wired Exp $
+
+*kdm-4.3.0-r1 (05 Aug 2009)
+
+  05 Aug 2009; Alex Alexander <wired@gentoo.org> +kdm-4.3.0-r1.ebuild,
+  +files/kdm-4.3.0-oxygen-theme-installation.patch:
+  fixed oxygen-air kdm theme installation
 
 *kdm-4.2.4-r1 (05 Aug 2009)
 
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 302b1ffe342f..bed17b863db9 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,6 +1,7 @@
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-3.5.7-bsd-shutdown.patch 486 RMD160 da3ef89c1783f9eb357a9404f083d696df0e51fa SHA1 df14c32baf6d105ad0b563c493bcf093129c3f1e SHA256 e7b1123b597f260ebbba5337a74648591bce19e332e6aaa61f9ea27f3f0bd8d8
 AUX kdm-3.5.9-respect-cflags.patch 669 RMD160 23bace1d034c9051fadf9d29886e824bff57dad3 SHA1 a3fff3c118266f999a91abfb7f4496694c311f5c SHA256 1dd4b590955dafd0484b04102872d0de58c3fd2bf0b6d44362d2ffc2d3244656
+AUX kdm-4.3.0-oxygen-theme-installation.patch 1650 RMD160 2f69528c4c5d087e6f5fec70e2d94d85ca59caf1 SHA1 ef7e7509e054e8b7a9518cf0f44f4b349895804c SHA256 14bca81419554379a99b70c47c8f104e414f7e9ad2dc4d8b48ebc91bb1530f95
 DIST kdebase-3.5-patchset-04.tar.bz2 8502 RMD160 419e527c8c2b00ca49eb395793374b3459989897 SHA1 f7549db15ffcf29fad372b00ab66f0b257225302 SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961
 DIST kdebase-3.5-patchset-13.tar.bz2 26504 RMD160 b723ba39de234131c3081be714d2919c5e5e38b5 SHA1 77d04b90d92ada8078263f2720f5e30d5ffdaa6e SHA256 78dc069a6d007d1dbf97147c368e7a4fda0dee5d41b15c471fde0589f0c377e0
 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
@@ -11,6 +12,7 @@ EBUILD kdm-3.5.10.ebuild 2237 RMD160 840ce6e0db74a268480b4aa26d23e2a381d4d703 SH
 EBUILD kdm-3.5.9.ebuild 2287 RMD160 bc60955051cf5c95e98814b8972c069cb7e512f0 SHA1 2043b37e057e887e5e2798c555481444f504796d SHA256 4732b7906c42f0b28f3fd2d27c7ca9713e3d2104d711ac530472afb809430cc1
 EBUILD kdm-4.2.4-r1.ebuild 2550 RMD160 62e1176d719675d308f626665cb1cecd440f828d SHA1 e001771859599e3d472596a7a3ffcff871302676 SHA256 0719d0590f2603a3d54c67084a23416f6c6a25d4f6ef877a66b4c56c15767013
 EBUILD kdm-4.2.4.ebuild 2492 RMD160 422fd2676797812034efb3dc9d8c416e46d0cbbd SHA1 b866eae428f3497890c29db3f16e71247033029b SHA256 0a6ced554851157eddb2f7162346467435901fbcc536742519ed7d6b0d51f313
+EBUILD kdm-4.3.0-r1.ebuild 2603 RMD160 0607e94d1538bb1499d3e9e9079aa22783ebd474 SHA1 9997a93d4e868454f601a278e3192610ec8eab5a SHA256 8adabc761112cf96db76cb53fbd3607861a58727ee5cd415b06fb63f11034d9e
 EBUILD kdm-4.3.0.ebuild 2547 RMD160 611ef84cfd22fe800a7fe6249ace23ba777c459c SHA1 2b26475428410ded2119664c592d91b5eaa35e32 SHA256 e92e9954c7b02f5f25fc5721fef6ea8f1ff5169e3832cdb8d77f15fb091f7f5a
-MISC ChangeLog 23168 RMD160 305090568244aa4cd5e79889b4d3fb519a4bb71f SHA1 54b6b760f1af7171563df1f0b5d40f7b69b2bdb6 SHA256 614dd686083fc64296054f723f9d108f38e538622501a9316bdb17bef1f6f4fd
+MISC ChangeLog 23363 RMD160 25822fd248c43b940d0cc1b75c589763e82c3212 SHA1 8cc672d550d6ddd3f94448fc68518cc017eec241 SHA256 062f9f0fd72b3219f54ac075344dd7ed70b1b38f4180d5e07f7c58a4e9678f5b
 MISC metadata.xml 252 RMD160 56180702ee9874bd7c3f227e7540c87ef0430e73 SHA1 1939a904e27c21473c94ffcdd38223c1125e61dd SHA256 5f5286d82a444e6a5d5c934c256ce2696bfbb118f059e0ae6dcf15c4bbdb7a01
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 000000000000..761c375c54b0
--- /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-r1.ebuild b/kde-base/kdm/kdm-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..673967edcbd0
--- /dev/null
+++ b/kde-base/kdm/kdm-4.3.0-r1.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-r1.ebuild,v 1.1 2009/08/05 18:07:08 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
+}