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 1RSFK1-0000rB-43 for garchives@archives.gentoo.org; Sun, 20 Nov 2011 21:53:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 20ED921C197; Sun, 20 Nov 2011 21:53:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D6E3F21C197 for ; Sun, 20 Nov 2011 21:53:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53B261B4001 for ; Sun, 20 Nov 2011 21:53:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id AF9AC80042 for ; Sun, 20 Nov 2011 21:53:00 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdm/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdm/kdm-4.7.3-r1.ebuild kde-base/kdm/kdm-4.7.49.9999.ebuild kde-base/kdm/kdm-4.7.80.ebuild kde-base/kdm/kdm-9999.ebuild X-VCS-Directories: kde-base/kdm/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: d353f4c1104ce336e22a22cf34c376d689144270 Date: Sun, 20 Nov 2011 21:53:00 +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: 5d671e10-b268-455d-854c-c26695407ddf X-Archives-Hash: 0744ec177feeaa4ba026bbe326d0903b commit: d353f4c1104ce336e22a22cf34c376d689144270 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun Nov 20 22:53:49 2011 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Nov 20 22:53:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dd353f4c1 [kde-base/kdm] Moved 4.7.3 to tree, added patch in newer (Portage version: 2.1.10.36/git/Linux x86_64, unsigned Manifest commit) --- kde-base/kdm/kdm-4.7.3-r1.ebuild | 161 -----------------------------= ------ kde-base/kdm/kdm-4.7.49.9999.ebuild | 3 +- kde-base/kdm/kdm-4.7.80.ebuild | 3 +- kde-base/kdm/kdm-9999.ebuild | 3 +- 4 files changed, 6 insertions(+), 164 deletions(-) diff --git a/kde-base/kdm/kdm-4.7.3-r1.ebuild b/kde-base/kdm/kdm-4.7.3-r1= .ebuild deleted file mode 100644 index 7e04b3f..0000000 --- a/kde-base/kdm/kdm-4.7.3-r1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2= 011/11/02 20:48:16 alexxy Exp $ - -EAPI=3D4 - -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 -" - -KMEXTRA=3D" - libs/kdm/ -" - -PATCHES=3D( - "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" - "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" - "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.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 - - # an equivalent file is already installed by kde-base/startkde, bug 377= 151 - rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die - - # 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= /apps/kdm/sessions,${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}"/usr/share/config/kdm/kdmrc \ - || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmr= c." - - # Don't install empty dir - rmdir "${ED}"/usr/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}/usr/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 -} diff --git a/kde-base/kdm/kdm-4.7.49.9999.ebuild b/kde-base/kdm/kdm-4.7.4= 9.9999.ebuild index a63e162..ce9a6a7 100644 --- a/kde-base/kdm/kdm-4.7.49.9999.ebuild +++ b/kde-base/kdm/kdm-4.7.49.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2= 011/11/02 20:48:16 alexxy Exp $ =20 EAPI=3D4 =20 @@ -40,6 +40,7 @@ KMEXTRA=3D" PATCHES=3D( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" + "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" ) =20 pkg_setup() { diff --git a/kde-base/kdm/kdm-4.7.80.ebuild b/kde-base/kdm/kdm-4.7.80.ebu= ild index 19ea40e..d3a5af4 100644 --- a/kde-base/kdm/kdm-4.7.80.ebuild +++ b/kde-base/kdm/kdm-4.7.80.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2= 011/11/02 20:48:16 alexxy Exp $ =20 EAPI=3D4 =20 @@ -40,6 +40,7 @@ KMEXTRA=3D" PATCHES=3D( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" + "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" ) =20 pkg_setup() { diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild index a63e162..ce9a6a7 100644 --- a/kde-base/kdm/kdm-9999.ebuild +++ b/kde-base/kdm/kdm-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2= 011/11/02 20:48:16 alexxy Exp $ =20 EAPI=3D4 =20 @@ -40,6 +40,7 @@ KMEXTRA=3D" PATCHES=3D( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch" + "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch" ) =20 pkg_setup() {