Install default user/root faces in new location correctly (/var/lib/kdm-${SLOT}/faces...

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

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 74ab3be1a0ffa146b09fb87e54b5653de1b7cb5a..15b53f3591bfc13272232bd82e436dcd4415fe81 100644 (file)
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.222 2010/06/27 19:05:24 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.223 2010/06/29 04:12:48 reavertm Exp $
+
+*kdm-4.4.4-r2 (29 Jun 2010)
+
+  29 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> +kdm-4.4.4-r2.ebuild:
+  Install default user/root faces in new location correctly
+  (/var/lib/kdm-${SLOT}/faces - was ${PREFIX}/share/apps/kdm/faces)
 
   27 Jun 2010; Christian Faulhammer <fauli@gentoo.org> kdm-4.4.4-r1.ebuild:
   x86 stable, bug 322791

diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 62ddfce403be26f7e29e07f8f90c9cc54ce8e9d6..0e4262a87320ae3bfad04272984355e7f64b60da 100644 (file)
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-4-gentoo-xinitrc.d.patch 793 RMD160 1e22f23d7cbd4764b4a7675968e0a387de2fc09a SHA1 226db506807a31b565da598458faed4a3ce3ddb7 SHA256 7ddeaa5b5446ed9e4f94cfc474032ee7d450df3748b378a4803c5b7b2bdce684
 AUX kdm-4.3.1-set-grub-default.patch 953 RMD160 c5cae2d7e2dd6dc8592ba257442cb6074d65d8c3 SHA1 c0610cd3442c11290a203c5cab9d59a7f353ebfc SHA256 0c890850869d048d15e13687d3bb889c2941280cc9ca3d62c57a2d0ea3674273
@@ -11,12 +8,6 @@ DIST kdebase-workspace-4.3.5.tar.bz2 62525359 RMD160 dcf04a40412ba236365423afc87
 DIST kdebase-workspace-4.4.4.tar.bz2 77036111 RMD160 26df3ddc22611f50d29818d27079dfe4bacf6910 SHA1 7b20bc91a5969b4c42c83076926cf6838b2ba47b SHA256 132df024801fff623d3e97f366dff0ed0fae7a653ac483184c0c65f8ea4adee7
 EBUILD kdm-4.3.5-r1.ebuild 2673 RMD160 753b7c04d5d12fdf3255668b34df16b7ded7cc49 SHA1 67a2deefa01b9c998f9880d3643d7e7c2ba8a9c5 SHA256 9e90e93fd9f64f4bf695be31e68ab3d0c62935899744ed40a6bfb070e4894657
 EBUILD kdm-4.4.4-r1.ebuild 3245 RMD160 64c645dde07e319baecb0e6fffe3b8e79c082539 SHA1 4fc0c686fd8a6c23a3095f62425e9a1ce543d630 SHA256 d65172ccedd4e340d01523cb469f6040e834c3e9660e130332cc38b6f25b5b6e
-MISC ChangeLog 29442 RMD160 dda73dea7a6aebb08b6c18d39ac0fcdd22186222 SHA1 19e626c0e30dc96d9bf4d8b6fd5d0213e02ee6b4 SHA256 ff8c4bc68267aac16c595f0d8e56ad5ee910b9fd7b7f5e61340b1b1313e76a7c
+EBUILD kdm-4.4.4-r2.ebuild 3184 RMD160 544eb70485c9ef438749e6e36ba22dd078d93d4c SHA1 908172ec02eab5f85498cf256395881f15d15352 SHA256 e76c960691c5d0f702bd90213910e10a64ac040533444d551371d6e4bb8f8a94
+MISC ChangeLog 29679 RMD160 e58a68cc67165bd96743f72961594a557be29112 SHA1 927e8b7ee13c1f8c81857ced21e941611be45bf1 SHA256 75d88d47a6cb253bd113e79616bb9a1d3448bd0a34c0443760f7408cba7f267e
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwnoS4ACgkQNQqtfCuFneORKACgnIvS4OL2lvcG2xvn2YNPmAbn
-zIQAmQGr0komf6G1JR8Mc17sQDr5CN5G
-=56fu
------END PGP SIGNATURE-----

diff --git a/kde-base/kdm/kdm-4.4.4-r2.ebuild b/kde-base/kdm/kdm-4.4.4-r2.ebuild
new file mode 100644 (file)
index 0000000..1a0f2b1
--- /dev/null
+++ b/kde-base/kdm/kdm-4.4.4-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.4-r2.ebuild,v 1.1 2010/06/29 04:12:48 reavertm Exp $
+
+EAPI="3"
+
+KMNAME="kdebase-workspace"
+inherit kde4-meta flag-o-matic
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~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? (
+               $(add_kdebase_dep kcheckpass)
+               virtual/pam
+       )
+"
+RDEPEND="${DEPEND}
+       $(add_kdebase_dep kdepasswd)
+       >=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}/${PN}-4-gentoo-xinitrc.d.patch"
+       "${FILESDIR}/${PN}-4.3.5-xdm-restart.patch"
+)
+
+pkg_setup() {
+       kde4-meta_pkg_setup
+
+       KDM_HOME=/var/lib/kdm-${SLOT}
+}
+
+src_configure() {
+       # genkdmconf breaks with -O3
+       # last checked in 4.2.95
+       replace-flags -O3 -O2
+
+       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:
+       # - SessionDirs set to /usr/share/xsessions
+       # - increase server timeout to 30s
+       # - TerminateServer=true to workaround X server regen bug, bug 278473
+       # - DataDir set to /var/lib/kdm-${SLOT}
+       # - FaceDir set to /var/lib/kdm-${SLOT}/faces
+       sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions|" \
+               -e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
+               -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
+               -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
+               -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
+               -i "${ED}"/${KDEDIR}/share/config/kdm/kdmrc \
+               || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
+
+       # Don't install empty dir
+       rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions
+
+       # Set up kdm work directory
+       keepdir "${KDM_HOME}"
+}
+
+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 "${EPREFIX}${KDM_HOME}/faces/.default.face.icon" ]]; then
+               mkdir -p "${EPREFIX}${KDM_HOME}/faces"
+               cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+                       "${EPREFIX}${KDM_HOME}/faces/.default.face.icon"
+       fi
+       if [[ ! -e "${EPREFIX}${KDM_HOME}/faces/root.face.icon" ]]; then
+               mkdir -p "${EPREFIX}${KDM_HOME}/faces"
+               cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
+                       "${EPREFIX}${KDM_HOME}/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
+}