remove temp fix of 15593 and add instructions for fixing it. see post on m/ls.

3 files changed, 24 insertions, 6 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index ce736952a94d..08a3fda83cdc 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for kde-base/kdelibs
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.53 2003/02/13 12:43:07 hannes Exp $
+# ChangeLog for kde-basekdelibsChangeLog/
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.54 2003/02/13 18:54:52 danarmak Exp $
+
+  13 Feb 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.1-r1.ebuild:
+
+  Remove the change Hannes made below, it was just an emergency fix.
+  The proper fix, if you have a kde 3.1+3.0.x system, is to emerge
+  kdelibs-3.0.5a-r2 and kdebase-3.0.5aq-r1 if you are emerging kdelibs-3.1-r1
+  and kdebase-3.1-r1 (but don't get the new 3.0.5a's if for some reason you
+  aren't getting the new 3.1's !)
+  Or for a quick fix to avoid all that compiling, edit /etc/env.d65kdelibs-3.0.*
+  and remove the KDEDIRS= line, run env-update and restart kdm.
 
   13 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1-r2.ebuild:
   added KDEDIRS=${PREFIX} again to fix bug #15593
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.0.3a b/kde-base/kdelibs/files/digest-kdelibs-3.0.3a
deleted file mode 100644
index f8e44c40143c..000000000000
--- a/kde-base/kdelibs/files/digest-kdelibs-3.0.3a
+++ /dev/null
@@ -1 +0,0 @@
-MD5 02627f595af113f7d544561a7ff6ec85 kdelibs-3.0.3a.tar.bz2 7627677
diff --git a/kde-base/kdelibs/kdelibs-3.1-r2.ebuild b/kde-base/kdelibs/kdelibs-3.1-r2.ebuild
index b2d6f8d12558..88e6f606900c 100644
--- a/kde-base/kdelibs/kdelibs-3.1-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1-r2.ebuild,v 1.5 2003/02/13 12:43:07 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.1-r2.ebuild,v 1.6 2003/02/13 18:54:52 danarmak Exp $
 inherit kde kde.org 
 #don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
 
@@ -68,7 +68,6 @@ src_install() {
 echo "PATH=${PREFIX}/bin
 ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
 LDPATH=${PREFIX}/lib
-KDEDIRS=${PREFIX}
 CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/49kdelibs-${PV} # number goes down with version upgrade
 
 	echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/56kdedir-${PV} # number goes up with version upgrade
@@ -77,3 +76,13 @@ CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/49kdelibs-${PV} # number
 	# shouldn't install anything into kdelibs-apidocs (bug #15102)
 	rm -r ${D}/$KDEDIR/share/doc/HTML/en/kdelibs-apidocs
 }
+
+pkg_postinst() {
+
+einfo "NOTE: for things to work properly, please upgrade kdebase (if installed) to 3.1-r1
+or greater."
+einfo "If you have kde 3.0.x installed, please upgrade to kdeils-3.0.5a-r2 and kdebase-3.0.5a-r1.
+If they don't have your arch's keywords, edit /etc/env.d/65kdelibs-3.0.*, remove the KDEDIRS=
+line and env-update."
+
+}