summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorabcd <abcd@gentoo.org>2010-03-04 16:52:31 -0500
committerabcd <abcd@gentoo.org>2010-03-04 16:53:13 -0500
commit408d853d4872025cf3df94ef898d37a71cc56d09 (patch)
tree0ee36cf256f424a50173f6f6d9df837b943ef6e7
parent96c2ed2485b274d487489a3098f6e92856496daf (diff)
downloadkde-408d853d4872025cf3df94ef898d37a71cc56d09.tar.gz
kde-408d853d4872025cf3df94ef898d37a71cc56d09.tar.bz2
kde-408d853d4872025cf3df94ef898d37a71cc56d09.zip
[kde-base/kdm] Call genkdmconf manually
Upstream disabled genkdmconf during make install because on one developer's system it went interactive in adduser (we create the user early, so it's not a problem for us)
-rw-r--r--kde-base/kdm/Manifest2
-rw-r--r--kde-base/kdm/kdm-9999.ebuild11
2 files changed, 11 insertions, 2 deletions
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index d54022dfc1d..37a94240316 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,5 +1,5 @@
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
EBUILD kdm-4.4.9999.ebuild 2434 RMD160 e6cffdae15a573b39ee3dae964e54690b5d8141c SHA1 2b393d8a97de87b900938dfc65c85de0dbb8e589 SHA256 081519274ec9b658854db6f5378c4e75eea40a057f4fc722631f2297f4cde3db
-EBUILD kdm-9999.ebuild 2699 RMD160 a6a716c05e3e507ab47a594ac98309e8d2192f6d SHA1 e4d0a84ec0e1c30c8766aff3e2e18b3f7ec96178 SHA256 07eef85a40aba42bb450c78aa3f85ba49c48066f82f9f86c4c595d5f66994273
+EBUILD kdm-9999.ebuild 3003 RMD160 dea68f6b347dc342a33100c24c7a46b7f02b78b1 SHA1 cc6b27233569c5354d5ebe5e82d30fe4df134799 SHA256 56d238298c6278a7b4b27894fdf67b5b7f056deff891645991a1d4f21a557339
MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 14bdc79189c..ace189c113c 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -71,9 +71,18 @@ src_install() {
kde4-meta_src_install
+ # Upstream no longer calls this... (remove when upstream decides what
+ # its going to do about it)
+ ${CMAKE_BUILD_DIR}/kdm/kfrontend/genkdmconf \
+ --in "${ED}${KDEDIR}/share/config/kdm" \
+ --no-in-notice \
+ --face-src "${S}/kdm/kfrontend/pics" \
+ ${GENKDMCONF_FLAGS} \
+ || die "genkdmconf failed"
+
# Customize the kdmrc configuration
sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \
- "${ED}"/${PREFIX}/share/config/kdm/kdmrc \
+ "${ED}"/${KDEDIR}/share/config/kdm/kdmrc \
|| die "Failed to set SessionsDirs correctly."
# Don't install empty dir