split the env.d file into two to accomodate kde2 and kde3 side by side install.

4 files changed, 15 insertions, 11 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 0fc5ee14025b..3297aa7a5803 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.3 2002/03/21 11:57:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.4 2002/03/24 22:05:28 danarmak Exp $
 
-*kdelibs-2.2.2-r3 (21 Mar 2002)
+*kdelibs-2.2.2-r4 (24 Mar 2002)
+
+  24 Mar 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Split the env.d file into two, so that when both ked2 and kde3 are installed,
+  the KDEDIR of kde3 gets exported (was the other way around till now).
 
   21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> kdelibs-2.2.2-r3.ebuild :
 
diff --git a/kde-base/kdelibs/files/digest-kdelibs-2.2.2-r3 b/kde-base/kdelibs/files/digest-kdelibs-2.2.2-r4
index 46a8292384fa..46a8292384fa 100644
--- a/kde-base/kdelibs/files/digest-kdelibs-2.2.2-r3
+++ b/kde-base/kdelibs/files/digest-kdelibs-2.2.2-r4
diff --git a/kde-base/kdelibs/kdelibs-2.1.2.ebuild b/kde-base/kdelibs/kdelibs-2.1.2.ebuild
index 8d1c640d708c..a4352dea64e6 100644
--- a/kde-base/kdelibs/kdelibs-2.1.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.1.2.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # /home/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.1.2.ebuild,v 1.3 2001/06/07 01:45:52 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.1.2.ebuild,v 1.9 2001/09/29 21:03:26 danarmak Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.1.2.ebuild,v 1.10 2002/03/24 22:05:28 danarmak Exp $
 
 V=2.1
 A=${P}.tar.bz2
diff --git a/kde-base/kdelibs/kdelibs-2.2.2-r3.ebuild b/kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild
index 0298f9e03487..572bcc4a645d 100644
--- a/kde-base/kdelibs/kdelibs-2.2.2-r3.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.2-r3.ebuild,v 1.3 2002/03/21 11:57:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.2-r4.ebuild,v 1.1 2002/03/24 22:05:28 danarmak Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde kde.org || die
 #don't inherit kde-dist! it calls need-kde which adds kdelibs to depend -> circular deps!
@@ -78,17 +78,17 @@ src_install() {
 	dodir /etc/env.d
 	
 	if [ "$KDE2DIR" != "$KDE2LIBSDIR" ]; then
-	    echo "KDEDIR=${KDE2DIR}
-PATH=${KDE2LIBSDIR}/bin:${KDE2DIR}/bin
+echo "PATH=${KDE2LIBSDIR}/bin:${KDE2DIR}/bin
 ROOTPATH=${KDE2LIBSDIR}/bin:${KDE2DIR}/bin
-LDPATH=${KDE2LIBSDIR}/lib:${KDE2DIR}/lib" > ${D}/etc/env.d/70kdelibs-2.2.2
+LDPATH=${KDE2LIBSDIR}/lib:${KDE2DIR}/lib" > ${D}/etc/env.d/70kdelibs-${PV}
 	else
-	    echo "KDEDIR=${KDE2DIR}
-PATH=${KDE2LIBSDIR}/bin
+echo "PATH=${KDE2LIBSDIR}/bin
 ROOTPATH=${KDE2LIBSDIR}/bin
-LDPATH=${KDE2LIBSDIR}/lib" > ${D}/etc/env.d/70kdelibs-2.2.2
+LDPATH=${KDE2LIBSDIR}/lib" > ${D}/etc/env.d/70kdelibs-${PV}
 	fi
 
+	echo "KDEDIR=${KDE2DIR}" > ${D}/etc/env.d/40kdedir-${PV}
+
 }