many many fixes. you MUST unmerge any old kde-env before merging the new one.

16 files changed, 38 insertions, 36 deletions

diff --git a/kde-base/kde-env/kde-env-2.2.1.ebuild b/kde-base/kde-env/kde-env-2.2.1.ebuild
index 9127d2b23e85..dd858b6582e2 100644
--- a/kde-base/kde-env/kde-env-2.2.1.ebuild
+++ b/kde-base/kde-env/kde-env-2.2.1.ebuild
@@ -1,13 +1,20 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 DESCRIPTION="KDE 2.2 environment settings (KDEDIR)"
 HOMEPAGE="http://www.kde.org/"
 
 src_install() {
 
+	if [ "`ls /etc/env.d/90kde2*`" ]; then
+		echo "ERROR: you MUST unmerge previous versions of kde, and of kde-env
+in particular, before merging this new one. Adieu!"
+		exit 1
+	fi
+	echo "Ignore any errors from the ls command above"
+
 	insinto /etc/env.d
-	doins ${FILESDIR}/90kde${PV}
+	doins ${FILESDIR}/90kde
 }
diff --git a/kde-base/kdeaddons/kdeaddons-2.2.1.ebuild b/kde-base/kdeaddons/kdeaddons-2.2.1.ebuild
index 3b04c0fe438c..555fe6089da7 100644
--- a/kde-base/kdeaddons/kdeaddons-2.2.1.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-2.2.1.ebuild,v 1.2 2001/09/19 17:18:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-2.2.1.ebuild,v 1.3 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Addons"
@@ -25,7 +25,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
     local myconf
     if [ "`use qtmt`" ]
     then
diff --git a/kde-base/kdeadmin/kdeadmin-2.2.1.ebuild b/kde-base/kdeadmin/kdeadmin-2.2.1.ebuild
index 054f714136f8..001aa4ef71be 100644
--- a/kde-base/kdeadmin/kdeadmin-2.2.1.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Administration"
@@ -27,7 +27,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
     local myconf
     if [ "`use pam`" ]
     then
diff --git a/kde-base/kdeartwork/kdeartwork-2.2.1.ebuild b/kde-base/kdeartwork/kdeartwork-2.2.1.ebuild
index 859dce6751a4..fa0981b6b023 100644
--- a/kde-base/kdeartwork/kdeartwork-2.2.1.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-2.2.1.ebuild,v 1.2 2001/09/19 17:18:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-2.2.1.ebuild,v 1.3 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Artwork"
@@ -23,7 +23,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
     local myconf
     if [ "`use qtmt`" ]
     then
diff --git a/kde-base/kdebase/kdebase-2.2.1.ebuild b/kde-base/kdebase/kdebase-2.2.1.ebuild
index a2a99f179fbd..cb6e101d30a1 100644
--- a/kde-base/kdebase/kdebase-2.2.1.ebuild
+++ b/kde-base/kdebase/kdebase-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-2.2.1.ebuild,v 1.2 2001/09/19 08:10:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-2.2.1.ebuild,v 1.3 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Base"
@@ -30,9 +30,7 @@ src_unpack() {
 }
 
 src_compile() {
-    
-    source /etc/env.d/90{kde${PV},qt}
-    
+
     local myconf
     if [ "`use ldap`" ] ; then
       myconf="--with-ldap"
diff --git a/kde-base/kdebindings/kdebindings-2.2.1.ebuild b/kde-base/kdebindings/kdebindings-2.2.1.ebuild
index 94772d4c0e45..6b4e54107a82 100644
--- a/kde-base/kdebindings/kdebindings-2.2.1.ebuild
+++ b/kde-base/kdebindings/kdebindings-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-2.2.1.ebuild,v 1.2 2001/09/19 17:18:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-2.2.1.ebuild,v 1.3 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Bindings"
@@ -29,7 +29,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
      local myconf
     if [ "`use qtmt`" ]
     then
diff --git a/kde-base/kdegames/kdegames-2.2.1.ebuild b/kde-base/kdegames/kdegames-2.2.1.ebuild
index 107e48b7577f..a89f9a89cbfe 100644
--- a/kde-base/kdegames/kdegames-2.2.1.ebuild
+++ b/kde-base/kdegames/kdegames-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Games"
@@ -24,7 +24,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
     ./configure --host=${CHOST} \
                  --with-xinerama || die
     make || die
diff --git a/kde-base/kdegraphics/kdegraphics-2.2.1.ebuild b/kde-base/kdegraphics/kdegraphics-2.2.1.ebuild
index 1d0060cf2912..c1ee975dce7e 100644
--- a/kde-base/kdegraphics/kdegraphics-2.2.1.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Graphics"
@@ -29,7 +29,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
     local myconf
     if [ "`use qtmt`" ]
     then
diff --git a/kde-base/kdelibs/kdelibs-2.2.1.ebuild b/kde-base/kdelibs/kdelibs-2.2.1.ebuild
index 75eac657e4a5..11e6b1e48aac 100644
--- a/kde-base/kdelibs/kdelibs-2.2.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 # NOTE: Now we install into /usr
 # ANOTHER NOTE: we now rely on env.d to provide KDEDIR and QTDIR settings,
 # instead of hardconding them here
@@ -51,9 +51,6 @@ src_unpack() {
 
 src_compile() {
 
-    # in case we haven't relogged in since merging kde-env or qt
-    source /etc/env.d/90{kde${PV},qt}
-
     local myopts
     if [ "`use ssl`" ] ; then
       myopts="--with-ssl-dir=/usr"
diff --git a/kde-base/kdemultimedia/kdemultimedia-2.2.1.ebuild b/kde-base/kdemultimedia/kdemultimedia-2.2.1.ebuild
index 02cc2d130ebe..ad059d89da88 100644
--- a/kde-base/kdemultimedia/kdemultimedia-2.2.1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Multimedia"
@@ -37,7 +37,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
     local myconf
     local myaudio
     local myinteface
diff --git a/kde-base/kdenetwork/kdenetwork-2.2.1.ebuild b/kde-base/kdenetwork/kdenetwork-2.2.1.ebuild
index d0ff4a961faf..27e1c46f50f4 100644
--- a/kde-base/kdenetwork/kdenetwork-2.2.1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Network"
@@ -25,7 +25,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
     local myconf
     if [ "`use qtmt`" ]
     then
diff --git a/kde-base/kdepim/kdepim-2.2.1.ebuild b/kde-base/kdepim/kdepim-2.2.1.ebuild
index 8550c2fa014a..026ba8cf0c79 100644
--- a/kde-base/kdepim/kdepim-2.2.1.ebuild
+++ b/kde-base/kdepim/kdepim-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias  <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - PIM"
@@ -25,7 +25,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
      local myconf
     if [ "`use qtmt`" ]
     then
diff --git a/kde-base/kdesdk/kdesdk-2.2.1.ebuild b/kde-base/kdesdk/kdesdk-2.2.1.ebuild
index 577d38c565f4..801cc3025e8a 100644
--- a/kde-base/kdesdk/kdesdk-2.2.1.ebuild
+++ b/kde-base/kdesdk/kdesdk-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - SDK"
@@ -25,7 +25,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
      local myconf
     if [ "`use qtmt`" ]
     then
diff --git a/kde-base/kdetoys/kdetoys-2.2.1.ebuild b/kde-base/kdetoys/kdetoys-2.2.1.ebuild
index 9d84a676fdef..b256f35554f3 100644
--- a/kde-base/kdetoys/kdetoys-2.2.1.ebuild
+++ b/kde-base/kdetoys/kdetoys-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Toys"
@@ -24,7 +24,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
  	if [ "`use objprelink`" ] ; then
 	  myconf="--enable-objprelink"
 	fi
diff --git a/kde-base/kdeutils/kdeutils-2.2.1.ebuild b/kde-base/kdeutils/kdeutils-2.2.1.ebuild
index 518fccd8756f..25f253e1ad8c 100644
--- a/kde-base/kdeutils/kdeutils-2.2.1.ebuild
+++ b/kde-base/kdeutils/kdeutils-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-2.2.1.ebuild,v 1.1 2001/09/19 06:24:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Utilities"
@@ -25,7 +25,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
 	if [ "`use objprelink`" ] ; then
 	  myconf="--enable-objprelink"
 	fi
diff --git a/kde-base/kdoc/kdoc-2.2.1.ebuild b/kde-base/kdoc/kdoc-2.2.1.ebuild
index 391921580a02..a9e01df68da8 100644
--- a/kde-base/kdoc/kdoc-2.2.1.ebuild
+++ b/kde-base/kdoc/kdoc-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Philippe Namias <pnamias@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdoc/kdoc-2.2.1.ebuild,v 1.1 2001/09/19 06:24:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdoc/kdoc-2.2.1.ebuild,v 1.2 2001/09/19 18:56:33 danarmak Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Utilities"
@@ -26,7 +26,7 @@ src_unpack() {
 }
 
 src_compile() {
-    . /etc/env.d/90{kde${PV},qt}
+
 	if [ "`use objprelink`" ] ; then
 	  myconf="--enable-objprelink"
 	fi