Depend on kdelibs 3.5.6, and then drop the xdg.sh env file, as we already set that in env.d.

Package-Manager: portage-2.1.2

4 files changed, 16 insertions, 23 deletions

diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 8bee14946919..eef41fbc563e 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.80 2007/01/18 00:26:29 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.81 2007/01/19 17:27:11 flameeyes Exp $
+
+  19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  kdebase-startkde-3.5.6.ebuild:
+  Depend on kdelibs 3.5.6, and then drop the xdg.sh env file, as we already
+  set that in env.d.
 
   18 Jan 2007; Carsten Lohrke <carlo@gentoo.org>
   kdebase-startkde-3.5.6.ebuild:
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.6.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.6.ebuild
index 24fcaba88e64..63210db628df 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.6.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.6.ebuild,v 1.2 2007/01/18 00:26:29 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.6.ebuild,v 1.3 2007/01/19 17:27:11 flameeyes Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -35,9 +35,7 @@ $(deprange $PV $MAXKDEVER kde-base/kreadconfig)
 $(deprange $PV $MAXKDEVER kde-base/ksplashml)"
 
 
-src_compile() {
-	elog "Nothing to compile"
-}
+src_compile() { :; }
 
 src_install() {
 	# startkde script
@@ -51,14 +49,6 @@ src_install() {
 	exeinto "${KDEDIR}/shutdown"
 	doexe "${FILESDIR}/agent-shutdown.sh"
 
-	# freedesktop environment variables
-	cat <<EOF > "${T}/xdg.sh"
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto "${KDEDIR}/env"
-	doins "${T}/xdg.sh"
-
 	# x11 session script
 	cat <<EOF > "${T}/kde-${SLOT}"
 #!/bin/sh
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 31fdc4c33cc9..116dd6cb5bda 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.334 2007/01/19 12:31:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.335 2007/01/19 17:23:01 flameeyes Exp $
+
+  19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kdebase-3.5.6.ebuild:
+  Depend on kdelibs 3.5.6, and then drop the xdg.sh env file, as we already
+  set that in env.d.
 
   19 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> kdebase-3.5.6.ebuild:
   Even if not keyworded, fix this for Gentoo/FreeBSD by not enabling shadow
diff --git a/kde-base/kdebase/kdebase-3.5.6.ebuild b/kde-base/kdebase/kdebase-3.5.6.ebuild
index bca359e55a5c..f1eff7bda92a 100644
--- a/kde-base/kdebase/kdebase-3.5.6.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6.ebuild,v 1.4 2007/01/19 12:31:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.6.ebuild,v 1.5 2007/01/19 17:23:01 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -75,6 +75,8 @@ DEPEND="${DEPEND}
 		) <virtual/x11-7 )
 	dev-util/pkgconfig"
 
+need-kde 3.5.6
+
 PATCHES="${FILESDIR}/kdebase-startkde-3.5.3-xinitrcd.patch
 	${FILESDIR}/nsplugins-3.5.5-npapi-64bit.patch"
 
@@ -138,14 +140,6 @@ src_install() {
 	exeinto ${KDEDIR}/shutdown
 	doexe "${FILESDIR}/agent-shutdown.sh"
 
-	# freedesktop environment variables
-	cat <<EOF > "${T}/xdg.sh"
-export XDG_DATA_DIRS="${KDEDIR}/share:/usr/share"
-export XDG_CONFIG_DIRS="${KDEDIR}/etc/xdg"
-EOF
-	insinto ${KDEDIR}/env
-	doins "${T}/xdg.sh"
-
 	# x11 session script
 	cat <<EOF > "${T}/kde-${SLOT}"
 #!/bin/sh