From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QOkdY-0000Oc-Ou for garchives@archives.gentoo.org; Tue, 24 May 2011 05:58:37 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC4A21C393; Tue, 24 May 2011 05:57:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9899C1C392 for ; Tue, 24 May 2011 05:57:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 244081B4002 for ; Tue, 24 May 2011 05:57:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8751580508 for ; Tue, 24 May 2011 05:57:38 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <164ee8b3825e0eaa77a317d9abd1ad4cb2fe66cb.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdm/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdm/kdm-4.6.80.ebuild X-VCS-Directories: kde-base/kdm/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: 164ee8b3825e0eaa77a317d9abd1ad4cb2fe66cb Date: Tue, 24 May 2011 05:57:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7e7176f818035b894d515330587439fd commit: 164ee8b3825e0eaa77a317d9abd1ad4cb2fe66cb Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) ge= ntoo org> AuthorDate: Tue May 24 05:45:47 2011 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org= > CommitDate: Tue May 24 05:45:47 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D164ee8b3 [kde-base/kdm] 4.6.80 version bump. (Portage version: 2.2.0_alpha34/git/Linux x86_64, signed Manifest commit = with key BB0E6E98) --- kde-base/kdm/kdm-4.6.80.ebuild | 159 ++++++++++++++++++++++++++++++++++= ++++++ 1 files changed, 159 insertions(+), 0 deletions(-) diff --git a/kde-base/kdm/kdm-4.6.80.ebuild b/kde-base/kdm/kdm-4.6.80.ebu= ild new file mode 100644 index 0000000..210f6fd --- /dev/null +++ b/kde-base/kdm/kdm-4.6.80.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3D"4" + +KDE_HANDBOOK=3D"optional" +KMNAME=3D"kde-workspace" +inherit kde4-meta flag-o-matic + +DESCRIPTION=3D"KDE login manager, similar to xdm and gdm" +KEYWORDS=3D"~amd64 ~arm ~ppc ~ppc64 ~x86" +IUSE=3D"+consolekit debug kerberos pam" + +DEPEND=3D" + $(add_kdebase_dep libkworkspace) + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXtst + consolekit? ( + >=3Dsys-apps/dbus-1.0.2 + sys-auth/consolekit + ) + kerberos? ( virtual/krb5 ) + pam? ( + $(add_kdebase_dep kcheckpass) + virtual/pam + ) +" +RDEPEND=3D"${DEPEND} + $(add_kdebase_dep kdepasswd) + >=3Dx11-apps/xinit-1.0.5-r2 + x11-apps/xmessage +" + +add_blocker systemsettings '<4.5.80' + +KMEXTRA=3D" + libs/kdm/ +" + +PATCHES=3D( + "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" + "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" +) + +pkg_setup() { + kde4-meta_pkg_setup + + # Create kdm:kdm user + KDM_HOME=3D/var/lib/kdm + enewgroup kdm + enewuser kdm -1 -1 "${KDM_HOME}" kdm +} + +src_configure() { + # genkdmconf breaks with -O3 + # last checked in 4.2.95 + replace-flags -O3 -O2 + + mycmakeargs=3D( + $(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=3D"--no-old --no-backup" + + kde4-meta_src_install + + # Customize the kdmrc configuration: + # - SessionDirs set to /usr/share/xsessions + # - increase server timeout to 30s + # - TerminateServer=3Dtrue to workaround X server regen bug, bug 278473 + # - DataDir set to /var/lib/kdm + # - FaceDir set to /var/lib/kdm/faces + sed -e "s|^.*SessionsDirs=3D.*$|#&\nSessionsDirs=3D${EPREFIX}/usr/share= /xsessions|" \ + -e "/#ServerTimeout=3D/s/^.*$/ServerTimeout=3D30/" \ + -e "/#TerminateServer=3D/s/^.*$/TerminateServer=3Dtrue/" \ + -e "s|^.*DataDir=3D.*$|#&\nDataDir=3D${EPREFIX}${KDM_HOME}|" \ + -e "s|^.*FaceDir=3D.*$|#&\nFaceDir=3D${EPREFIX}${KDM_HOME}/faces|" \ + -i "${ED}"/${KDEDIR}/share/config/kdm/kdmrc \ + || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmr= c." + + # Don't install empty dir + rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions + + # Set up permissions to kdm work directory + keepdir "${KDM_HOME}" + fowners root:kdm "${KDM_HOME}" + fperms 1770 "${KDM_HOME}" + + # install logrotate file + insinto /etc/logrotate.d + newins "${FILESDIR}"/kdm-logrotate kdm +} + +pkg_postinst() { + kde4-meta_pkg_postinst + + local file src dest dir old_dirs=3D( + /var/lib/kdm-live + /var/lib/kdm-4.6 + /var/lib/kdm-4.5 + /var/lib/kdm-4.4 + /usr/share/apps/kdm + /usr/kde/4.4/share/apps/kdm + /usr/kde/4.3/share/apps/kdm + /usr/kde/4.2/share/apps/kdm + ) + + mkdir -p "${EROOT}${KDM_HOME}/faces" + # Set the default kdm face icon if it's not already set by the system a= dmin + # because this is user-overrideable in that way, it's not in src_instal= l + for file in faces/.default.face.icon:default1.png faces/root.face.icon:= root1.png kdmsts: ; do + src=3D${file#*:} + dest=3D${file%:*} + if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then + for dir in "${old_dirs[@]}"; do + if [[ -e ${EROOT}${dir}/${dest} ]]; then + cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}" + break 2 + fi + done + if [[ -n ${src} ]]; then + cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/${src}" \ + "${EROOT}${KDM_HOME}/${dest}" + fi + fi + done + for dir in "${old_dirs[@]}"; do + if [[ ${dir} !=3D /usr/* && -d ${EROOT}${dir} ]]; then + echo + elog "The directory ${EROOT%/}${dir} still exists from an older insta= llation of KDE." + elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOM= E}." + echo + elog "After doing so, you may delete the directory." + echo + fi + done + + # Make sure permissions are correct -- old installations may have + # gotten this wrong + use prefix || chown root:kdm "${EROOT}${KDM_HOME}" + chmod 1770 "${EROOT}${KDM_HOME}" + + 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 +}