diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-23 00:07:27 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-23 00:07:27 +0000 |
| commit | 4a6b60815e329654752d57b7babbaefb764b2964 (patch) | |
| tree | dc1a9c8ac2a404abc2c2eb885d08027e366260f0 /kde-base/kdm | |
| parent | Pull in changes from overlay and prefix support (diff) | |
| download | gentoo-2-4a6b60815e329654752d57b7babbaefb764b2964.tar.gz gentoo-2-4a6b60815e329654752d57b7babbaefb764b2964.tar.bz2 gentoo-2-4a6b60815e329654752d57b7babbaefb764b2964.zip | |
Pull in changes from overlay and prefix support
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base/kdm')
| -rw-r--r-- | kde-base/kdm/ChangeLog | 5 | ||||
| -rw-r--r-- | kde-base/kdm/kdm-4.3.4.ebuild | 29 |
2 files changed, 19 insertions, 15 deletions
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog index 3fd224c671c9..4c41c4f17662 100644 --- a/kde-base/kdm/ChangeLog +++ b/kde-base/kdm/ChangeLog @@ -1,6 +1,9 @@ # 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.196 2009/12/10 20:45:08 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.197 2009/12/23 00:07:27 abcd Exp $ + + 23 Dec 2009; Jonathan Callen <abcd@gentoo.org> kdm-4.3.4.ebuild: + Pull in changes from overlay and prefix support 10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kdm-4.3.1-r2.ebuild: Drop KDE SC-4.3.1. diff --git a/kde-base/kdm/kdm-4.3.4.ebuild b/kde-base/kdm/kdm-4.3.4.ebuild index 21733a88adbc..bb4da80dbba6 100644 --- a/kde-base/kdm/kdm-4.3.4.ebuild +++ b/kde-base/kdm/kdm-4.3.4.ebuild @@ -1,6 +1,6 @@ # 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.4.ebuild,v 1.1 2009/12/01 10:33:05 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.4.ebuild,v 1.2 2009/12/23 00:07:27 abcd Exp $ EAPI="2" @@ -49,10 +49,11 @@ src_configure() { # last checked in 4.2.95 replace-flags -O3 -O2 - mycmakeargs="${mycmakeargs} + mycmakeargs=( $(cmake-utils_use kerberos KDE4_KRB5AUTH) $(cmake-utils_use_with pam) - $(cmake-utils_use_with consolekit CkConnector)" + $(cmake-utils_use_with consolekit CkConnector) + ) kde4-meta_src_configure } @@ -63,12 +64,12 @@ src_install() { kde4-meta_src_install # Customize the kdmrc configuration - sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=/usr/share/xsessions:" \ - "${D}"/${PREFIX}/share/config/kdm/kdmrc \ + sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \ + "${ED}"/${PREFIX}/share/config/kdm/kdmrc \ || die "Failed to set SessionsDirs correctly." # Don't install empty dir - rmdir "${D}${KDEDIR}"/share/config/kdm/sessions + rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions } pkg_postinst() { @@ -76,15 +77,15 @@ 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" + if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then + mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \ + "${EROOT}${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" + if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then + mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces" + cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \ + "${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" fi if use consolekit; then |