From: Carsten Lohrke Date: Mon, 30 Apr 2007 20:02:38 +0000 (+0000) Subject: Remove virtual/x11 dependency, use new patch set. Minor fixes. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3282ca4707ca5628c9ab8b2b123ac4f11f3215c3;p=gentoo.git Remove virtual/x11 dependency, use new patch set. Minor fixes. Package-Manager: portage-2.1.2.5 --- diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog index 4deb54a12582..defafeb9bbb4 100644 --- a/kde-base/kdm/ChangeLog +++ b/kde-base/kdm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdm # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.90 2007/02/05 11:42:38 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.91 2007/04/30 20:02:38 carlo Exp $ + +*kdm-3.5.6-r1 (30 Apr 2007) + + 30 Apr 2007; Carsten Lohrke +kdm-3.5.6-r1.ebuild: + Remove virtual/x11 dependency, use new patch set. Minor fixes. 05 Feb 2007; Diego Pettenò -files/kdebase-3.4.3-noimake.patch, -files/kdebase-3.4.3-xdmcp.patch, diff --git a/kde-base/kdm/files/digest-kdm-3.5.6-r1 b/kde-base/kdm/files/digest-kdm-3.5.6-r1 new file mode 100644 index 000000000000..1d41d209c152 --- /dev/null +++ b/kde-base/kdm/files/digest-kdm-3.5.6-r1 @@ -0,0 +1,6 @@ +MD5 805dd677fdd09a260cac73b39c3171e3 kdebase-3.5-patchset-04.tar.bz2 8502 +RMD160 419e527c8c2b00ca49eb395793374b3459989897 kdebase-3.5-patchset-04.tar.bz2 8502 +SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961 kdebase-3.5-patchset-04.tar.bz2 8502 +MD5 a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 24155599 +RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c kdebase-3.5.6.tar.bz2 24155599 +SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e kdebase-3.5.6.tar.bz2 24155599 diff --git a/kde-base/kdm/kdm-3.5.6-r1.ebuild b/kde-base/kdm/kdm-3.5.6-r1.ebuild new file mode 100644 index 000000000000..e6626bfe001f --- /dev/null +++ b/kde-base/kdm/kdm-3.5.6-r1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.6-r1.ebuild,v 1.1 2007/04/30 20:02:38 carlo Exp $ + +KMNAME=kdebase +MAXKDEVER=$PV +KM_DEPRANGE="$PV $MAXKDEVER" +inherit kde-meta eutils + +SRC_URI="${SRC_URI} + mirror://gentoo/kdebase-3.5-patchset-04.tar.bz2" + +DESCRIPTION="KDE login manager, similar to xdm and gdm" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="elibc_glibc kdehiddenvisibility pam" + +KMEXTRA="kdmlib/" +# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on +# 3.5_beta1. +KMEXTRACTONLY="libkonq/konq_defaults.h" +# kioslave/thumbnail/configure.in.in" +KMCOMPILEONLY="kcontrol/background" +DEPEND="pam? ( kde-base/kdebase-pam ) + $(deprange $PV $MAXKDEVER kde-base/kcontrol)" + # Requires the desktop background settings and kdm kcontrol modules +RDEPEND="${DEPEND} + kde-base/kdepasswd + x11-apps/xinit + x11-apps/xmessage" +PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)" + + +src_compile() { + local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)" + + if ! use pam && use elibc_glibc; then + myconf="${myconf} --with-shadow" + fi + + export USER_LDFLAGS="${LDFLAGS}" + + kde-meta_src_compile myconf configure + kde_remove_flag kdm/kfrontend -fomit-frame-pointer + kde-meta_src_compile make +} + +src_install() { + kde-meta_src_install + cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install + + # Customize the kdmrc configuration + sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \ + ${D}/${KDEDIR}/share/config/kdm/kdmrc || die +} + +pkg_postinst() { + kde_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 +}