backport the fix for #16329 to 3.0.x: env.d files now owned by arts not kdelibs

4 files changed, 25 insertions, 11 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 6a06a9a1456e..71c8fc1a9807 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.37 2003/03/14 19:14:08 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.38 2003/03/14 21:34:07 danarmak Exp $
+
+  14 Mar 2003; Dan Armak <danarmak@gentoo.org> arts-1.0.5a.ebuild:
+  
+  Add fix for #16329 to this versionn as well, without creating a new revision.
+  Added matching change to latest revision of kdelibs-3.0.5a.
 
 *arts-1.1.1 (14 Mar 2003)
 
diff --git a/kde-base/arts/arts-1.0.5a.ebuild b/kde-base/arts/arts-1.0.5a.ebuild
index 1b3ea0cce0cd..0aa85f3feb68 100644
--- a/kde-base/arts/arts-1.0.5a.ebuild
+++ b/kde-base/arts/arts-1.0.5a.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/arts/arts-1.0.5a.ebuild,v 1.8 2003/02/13 12:24:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.0.5a.ebuild,v 1.9 2003/03/14 21:34:07 danarmak Exp $
 inherit kde-base flag-o-matic
 
 IUSE="alsa"
@@ -40,4 +40,14 @@ src_unpack() {
 src_install() {
 	kde_src_install
 	dodoc ${S}/doc/{NEWS,README,TODO}
+
+	# Moved here from kdelibs
+	dodir /etc/env.d
+	echo "PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/bin
+LDPATH=${PREFIX}/lib
+CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/65kdelibs-3.0.5a # number goes down with version upgrade
+
+	echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/50kdedir-3.0.5a # number goes up with version upgrade
+
 }
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index b20a68de6f45..eda623ffb84a 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.64 2003/03/14 19:29:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.65 2003/03/14 21:33:14 danarmak Exp $
+
+  14 Mar 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.0.5a-r1.ebuild:
+  
+  Add fix for #16329 to this version as well. Added the other part of the fix
+  to arts-1.0.5a. No new revisions.
 
   14 Mar 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.1-r3.ebuild:
   
diff --git a/kde-base/kdelibs/kdelibs-3.0.5a-r1.ebuild b/kde-base/kdelibs/kdelibs-3.0.5a-r1.ebuild
index f2e3f1e5606a..fda461bd5932 100644
--- a/kde-base/kdelibs/kdelibs-3.0.5a-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.0.5a-r1.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.0.5a-r1.ebuild,v 1.7 2003/03/11 21:11:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.0.5a-r1.ebuild,v 1.8 2003/03/14 21:33:14 danarmak Exp $
 inherit kde kde.org eutils
 #don't inherit  kde-base or kde-dist! it calls need-kde which adds kdelibs to depend!
 
@@ -63,14 +63,8 @@ src_unpack() {
 
 
 src_install() {
+
 	kde_src_install
 	dohtml *.html
 
-	dodir /etc/env.d
-	echo "PATH=${PREFIX}/bin
-ROOTPATH=${PREFIX}/bin
-LDPATH=${PREFIX}/lib
-CONFIG_PROTECT=${PREFIX}/share/config" > ${D}/etc/env.d/65kdelibs-${PV} # number goes down with version upgrade
-
-	echo "KDEDIR=$PREFIX" > ${D}/etc/env.d/50kdedir-${PV} # number goes up with version upgrade
 }