*** empty log message ***

27 files changed, 97 insertions, 96 deletions

diff --git a/app-admin/modlogan/modlogan-0.5.7.ebuild b/app-admin/modlogan/modlogan-0.5.7.ebuild
index 24de93098aad..33436aaec5b9 100644
--- a/app-admin/modlogan/modlogan-0.5.7.ebuild
+++ b/app-admin/modlogan/modlogan-0.5.7.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/app-admin/modlogan/modlogan-0.5.7.ebuild,v 1.1 2000/11/26 20:54:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.5.7.ebuild,v 1.2 2000/11/27 22:48:58 achim Exp $
 
 A="${P}.tar.gz gd-1.8.1.tar.gz"
 S=${WORKDIR}/${P}
@@ -12,7 +12,7 @@ SRC_URI="http://www.kneschke.de/projekte/modlogan/download/${P}.tar.gz
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=media-libs/freetype-1.3.1
 	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.0.8
+	>=media-libs/libpng-1.0.7
 	>=dev-libs/libpcre-3.2
 	>=dev-db/mysql-3.23.26
 	>=x11-base/xfree-4.0.1"
diff --git a/app-admin/webalizer/webalizer-1.30.04-r1.ebuild b/app-admin/webalizer/webalizer-1.30.04-r1.ebuild
index 7ac4aad113ad..c81b972a38fb 100644
--- a/app-admin/webalizer/webalizer-1.30.04-r1.ebuild
+++ b/app-admin/webalizer/webalizer-1.30.04-r1.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/app-admin/webalizer/webalizer-1.30.04-r1.ebuild,v 1.3 2000/11/02 02:17:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webalizer/webalizer-1.30.04-r1.ebuild,v 1.4 2000/11/27 22:48:58 achim Exp $
 
 P=webalizer-1.30-04
 A=${P}-src.tar.bz2
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.mrunix.net/webalizer/"
 
 DEPEND=">=sys-libs/glibc-2.1.3
 	>=media-libs/libgd-1.8.3
-	>=media-libs/libpng-1.0.8"
+	>=media-libs/libpng-1.0.7"
 
 src_unpack() {
   unpack ${A}
diff --git a/app-office/gnucash/gnucash-1.4.7-r2.ebuild b/app-office/gnucash/gnucash-1.4.7-r2.ebuild
index ed01c7397fcc..c6177c5b6827 100644
--- a/app-office/gnucash/gnucash-1.4.7-r2.ebuild
+++ b/app-office/gnucash/gnucash-1.4.7-r2.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/app-office/gnucash/gnucash-1.4.7-r2.ebuild,v 1.2 2000/11/25 18:30:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.4.7-r2.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,7 +11,7 @@ HOMEPAGE="http://gnucash.sourceforge.net"
 
 DEPEND=">=gnome-base/gnome-libs-1.2.4
 	>=gnome-base/libxml-1.8.10
-	>=dev-libs/swig-1.3_alpha4
+	>=dev-lang/swig-1.3_alpha4
 	>=dev-libs/slib-2.3.8"
 
 src_compile() {
diff --git a/app-office/koffice/koffice-2.0.ebuild b/app-office/koffice/koffice-2.0.ebuild
index 7648cee6e218..ed7113f4ae76 100644
--- a/app-office/koffice/koffice-2.0.ebuild
+++ b/app-office/koffice/koffice-2.0.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/app-office/koffice/koffice-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice/koffice-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -18,9 +18,9 @@ RDEPEND=$DEPEND
 src_compile() {
  
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/app-text/ghostscript/files/digest-ghostscript-6.31 b/app-text/ghostscript/files/digest-ghostscript-6.31
index 08c9987517ab..a4c526114631 100644
--- a/app-text/ghostscript/files/digest-ghostscript-6.31
+++ b/app-text/ghostscript/files/digest-ghostscript-6.31
@@ -1,3 +1,3 @@
 MD5 24231b31b5bcad79001566b8a19cff06 ghostscript-6.31.tar.gz
 MD5 8250132d6fcc6eb1419f505f06c7690b ghostscript-fonts-std-6.0.tar.gz
-MD5 d84085ffa2423ab742092fd61d222d89 print-4.0.2.tar.gz
+MD5 162790709852395d2794bd45226156fa print-4.0.3.tar.gz
diff --git a/gnome-apps/gnucash/gnucash-1.4.7-r2.ebuild b/gnome-apps/gnucash/gnucash-1.4.7-r2.ebuild
index e724734ba45b..e4982ef89f8b 100644
--- a/gnome-apps/gnucash/gnucash-1.4.7-r2.ebuild
+++ b/gnome-apps/gnucash/gnucash-1.4.7-r2.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/gnome-apps/gnucash/gnucash-1.4.7-r2.ebuild,v 1.2 2000/11/25 18:30:59 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/gnucash/gnucash-1.4.7-r2.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -11,7 +11,7 @@ HOMEPAGE="http://gnucash.sourceforge.net"
 
 DEPEND=">=gnome-base/gnome-libs-1.2.4
 	>=gnome-base/libxml-1.8.10
-	>=dev-libs/swig-1.3_alpha4
+	>=dev-lang/swig-1.3_alpha4
 	>=dev-libs/slib-2.3.8"
 
 src_compile() {
diff --git a/kde-apps/kdeadmin/kdeadmin-2.0.ebuild b/kde-apps/kdeadmin/kdeadmin-2.0.ebuild
index 3cd5d48415dd..16d248c3a7e2 100644
--- a/kde-apps/kdeadmin/kdeadmin-2.0.ebuild
+++ b/kde-apps/kdeadmin/kdeadmin-2.0.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-apps/kdeadmin/kdeadmin-2.0.ebuild,v 1.2 2000/11/07 10:21:02 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdeadmin/kdeadmin-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -19,9 +19,9 @@ RDEPEND=$DEPEND
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib \
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib \
 		--with-rpm --with-pam
     try make
 }
diff --git a/kde-apps/kdegraphics/kdegraphics-2.0.ebuild b/kde-apps/kdegraphics/kdegraphics-2.0.ebuild
index efea94990181..ca38276e68fe 100644
--- a/kde-apps/kdegraphics/kdegraphics-2.0.ebuild
+++ b/kde-apps/kdegraphics/kdegraphics-2.0.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-apps/kdegraphics/kdegraphics-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdegraphics/kdegraphics-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -20,9 +20,9 @@ RDEPEND=">=kde-base/kdelibs-2.0
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-apps/kdemultimedia/kdemultimedia-2.0.ebuild b/kde-apps/kdemultimedia/kdemultimedia-2.0.ebuild
index a0b6e01954a8..e2e9cf627688 100644
--- a/kde-apps/kdemultimedia/kdemultimedia-2.0.ebuild
+++ b/kde-apps/kdemultimedia/kdemultimedia-2.0.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-apps/kdemultimedia/kdemultimedia-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdemultimedia/kdemultimedia-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -20,10 +20,10 @@ src_unpack () {
 }
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib \
-		--with-alsa --enable-audio=alsa,oss,nas
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib \
+		--with-alsa --enable-audio=alsa,nas
     cp Makefile Makefile.orig
     try make
 }
diff --git a/kde-apps/kdenetwork/kdenetwork-2.0.ebuild b/kde-apps/kdenetwork/kdenetwork-2.0.ebuild
index a00e30a750c8..3f27151f0d5e 100644
--- a/kde-apps/kdenetwork/kdenetwork-2.0.ebuild
+++ b/kde-apps/kdenetwork/kdenetwork-2.0.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-apps/kdenetwork/kdenetwork-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdenetwork/kdenetwork-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -19,9 +19,9 @@ RDEPEND=$DEPEND
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-                --with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-                --with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-                --with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+                --with-qt-dir=/usr/lib/qt \
+                --with-qt-includes=/usr/lib/qt/include \
+                --with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-apps/kdepim/kdepim-2.0.ebuild b/kde-apps/kdepim/kdepim-2.0.ebuild
index 147d4034c14a..91567c70572a 100644
--- a/kde-apps/kdepim/kdepim-2.0.ebuild
+++ b/kde-apps/kdepim/kdepim-2.0.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-apps/kdepim/kdepim-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdepim/kdepim-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -17,9 +17,9 @@ RDEPEND=$DEPEND
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-apps/kdeutils/kdeutils-2.0.ebuild b/kde-apps/kdeutils/kdeutils-2.0.ebuild
index 7878e3711366..40a846e68841 100644
--- a/kde-apps/kdeutils/kdeutils-2.0.ebuild
+++ b/kde-apps/kdeutils/kdeutils-2.0.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-apps/kdeutils/kdeutils-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdeutils/kdeutils-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -17,9 +17,9 @@ RDEPEND="$DEPEND"
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-                --with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-                --with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-                --with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+                --with-qt-dir=/usr/lib/qt \
+                --with-qt-includes=/usr/lib/qt/include \
+                --with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-apps/kdoc/kdoc-2.0.ebuild b/kde-apps/kdoc/kdoc-2.0.ebuild
index b9f8660717fa..0f74ac08f8ef 100644
--- a/kde-apps/kdoc/kdoc-2.0.ebuild
+++ b/kde-apps/kdoc/kdoc-2.0.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-apps/kdoc/kdoc-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdoc/kdoc-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -18,9 +18,9 @@ RDEPEND=$DEPEND
 src_compile() {
     try autoconf
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib \
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib \
 		--with-rpm --with-pam
     try make
 }
diff --git a/kde-apps/koffice/koffice-2.0.ebuild b/kde-apps/koffice/koffice-2.0.ebuild
index 3ad536294b74..86e1d2a1e0cf 100644
--- a/kde-apps/koffice/koffice-2.0.ebuild
+++ b/kde-apps/koffice/koffice-2.0.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-apps/koffice/koffice-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/koffice/koffice-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -18,9 +18,9 @@ RDEPEND=$DEPEND
 src_compile() {
  
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-base/kde-i18n/kde-i18n-2.0.ebuild b/kde-base/kde-i18n/kde-i18n-2.0.ebuild
index 5c8641e5487d..267652fb0649 100644
--- a/kde-base/kde-i18n/kde-i18n-2.0.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-2.0.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/kde-i18n/kde-i18n-2.0.ebuild,v 1.2 2000/11/07 11:16:08 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -26,9 +26,9 @@ src_compile() {
     find /usr/share/sgml -name "catalog" -print -exec install-catalog -a catalog {} \;
     export SGML_CATALOG_FILES=${S}/catalog
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib
     cp Makefile Makefile.orig
     sed -e "s:^TOPSUBDIRS = .*:TOPSUBDIRS = ca cs da de el en_GB eo es et fi fr he hr hu is it mk nl no no_NY pl pt pt_BR ro ru sk sl sv ta tr uk:" Makefile.orig > Makefile
     try SGML_CATALOG_FILES=${S}/catalog make
diff --git a/kde-base/kdeadmin/kdeadmin-2.0.ebuild b/kde-base/kdeadmin/kdeadmin-2.0.ebuild
index eae2be07fb93..fbc8bc880b35 100644
--- a/kde-base/kdeadmin/kdeadmin-2.0.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-2.0.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/kdeadmin/kdeadmin-2.0.ebuild,v 1.2 2000/11/07 10:21:02 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -19,9 +19,9 @@ RDEPEND=$DEPEND
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib \
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib \
 		--with-rpm --with-pam
     try make
 }
diff --git a/kde-base/kdebase/kdebase-2.0-r2.ebuild b/kde-base/kdebase/kdebase-2.0-r2.ebuild
index 3097af4fba2a..9fc35595e649 100644
--- a/kde-base/kdebase/kdebase-2.0-r2.ebuild
+++ b/kde-base/kdebase/kdebase-2.0-r2.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.0-r2.ebuild,v 1.1 2000/11/22 06:37:43 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-2.0-r2.ebuild,v 1.2 2000/11/27 22:48:59 achim Exp $
 
 A="${P}.tar.bz2"
 S=${WORKDIR}/${P}
@@ -22,9 +22,9 @@ src_compile() {
     export CPPFLAGS="${CXXFLAGS} -I/usr/X11R6/include"
     try ./configure --prefix=/opt/kde2 --host=${CHOST} --with-shadow --with-x \
 		--with-pam=yes --with-ldap \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-base/kdegraphics/kdegraphics-2.0.ebuild b/kde-base/kdegraphics/kdegraphics-2.0.ebuild
index be59ebcd4075..a5a742b8fc09 100644
--- a/kde-base/kdegraphics/kdegraphics-2.0.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-2.0.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/kdegraphics/kdegraphics-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -20,9 +20,9 @@ RDEPEND=">=kde-base/kdelibs-2.0
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-base/kdelibs/kdelibs-2.0.ebuild b/kde-base/kdelibs/kdelibs-2.0.ebuild
index ec29b63942ed..7006f8a85f44 100644
--- a/kde-base/kdelibs/kdelibs-2.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.0.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.0.ebuild,v 1.2 2000/11/06 12:28:04 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -29,9 +29,9 @@ src_unpack() {
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} --with-ssl-dir=/usr \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-base/kdemultimedia/kdemultimedia-2.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-2.0.ebuild
index af22525177ea..03e74023c920 100644
--- a/kde-base/kdemultimedia/kdemultimedia-2.0.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-2.0.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/kdemultimedia/kdemultimedia-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -20,10 +20,10 @@ src_unpack () {
 }
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib \
-		--with-alsa --enable-audio=alsa,oss,nas
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib \
+		--with-alsa --enable-audio=alsa,nas
     cp Makefile Makefile.orig
     try make
 }
diff --git a/kde-base/kdenetwork/kdenetwork-2.0.ebuild b/kde-base/kdenetwork/kdenetwork-2.0.ebuild
index dcf786cbfab4..4d29fb32ba99 100644
--- a/kde-base/kdenetwork/kdenetwork-2.0.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-2.0.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/kdenetwork/kdenetwork-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -19,9 +19,9 @@ RDEPEND=$DEPEND
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-                --with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-                --with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-                --with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+                --with-qt-dir=/usr/lib/qt \
+                --with-qt-includes=/usr/lib/qt/include \
+                --with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-base/kdepim/kdepim-2.0.ebuild b/kde-base/kdepim/kdepim-2.0.ebuild
index 3b01bc08beae..3ccb8e2b67a4 100644
--- a/kde-base/kdepim/kdepim-2.0.ebuild
+++ b/kde-base/kdepim/kdepim-2.0.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/kdepim/kdepim-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -17,9 +17,9 @@ RDEPEND=$DEPEND
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-base/kdesupport/kdesupport-2.0.ebuild b/kde-base/kdesupport/kdesupport-2.0.ebuild
index c75a4cd5137d..e547f822acd9 100644
--- a/kde-base/kdesupport/kdesupport-2.0.ebuild
+++ b/kde-base/kdesupport/kdesupport-2.0.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/kdesupport/kdesupport-2.0.ebuild,v 1.2 2000/11/06 12:28:04 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesupport/kdesupport-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -15,7 +15,8 @@ HOMEPAGE="http://www.kde.org/"
 
 DEPEND=">=sys-devel/gcc-2.95.2
 	>=kde-base/qt-x11-2.2.1
-	>=net-print/cups-1.1.4"
+	>=net-print/cups-1.1.4
+	>=media-libs/audiofile-0.1.9"
 
 RDEPEND=">=sys-libs/glibc-2.1.3
  	 >=sys-devel/gcc-2.95.2"
@@ -23,9 +24,9 @@ RDEPEND=">=sys-libs/glibc-2.1.3
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} --enable-threads \
 		--without-audiofile \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt \
+		--with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-base/kdeutils/kdeutils-2.0.ebuild b/kde-base/kdeutils/kdeutils-2.0.ebuild
index 0106d72c7184..69aa997bf45e 100644
--- a/kde-base/kdeutils/kdeutils-2.0.ebuild
+++ b/kde-base/kdeutils/kdeutils-2.0.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/kdeutils/kdeutils-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -17,9 +17,9 @@ RDEPEND="$DEPEND"
 
 src_compile() {
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-                --with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-                --with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-                --with-qt-libs=/usr/lib/qt-x11-2.2.1/lib
+                --with-qt-dir=/usr/lib/qt \
+                --with-qt-includes=/usr/lib/qt/include \
+                --with-qt-libs=/usr/lib/qt/lib
     try make
 }
 
diff --git a/kde-base/kdoc/kdoc-2.0.ebuild b/kde-base/kdoc/kdoc-2.0.ebuild
index f00b43a336f6..326fc3fd6ab2 100644
--- a/kde-base/kdoc/kdoc-2.0.ebuild
+++ b/kde-base/kdoc/kdoc-2.0.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/kdoc/kdoc-2.0.ebuild,v 1.2 2000/11/07 10:21:03 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdoc/kdoc-2.0.ebuild,v 1.3 2000/11/27 22:48:59 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -18,9 +18,9 @@ RDEPEND=$DEPEND
 src_compile() {
     try autoconf
     try ./configure --prefix=/opt/kde2 --host=${CHOST} \
-		--with-qt-dir=/usr/lib/qt-x11-2.2.1 \
-		--with-qt-includes=/usr/lib/qt-x11-2.2.1/include \
-		--with-qt-libs=/usr/lib/qt-x11-2.2.1/lib \
+		--with-qt-dir=/usr/lib/qt \
+		--with-qt-includes=/usr/lib/qt/include \
+		--with-qt-libs=/usr/lib/qt/lib \
 		--with-rpm --with-pam
     try make
 }
diff --git a/media-gfx/imagemagick/imagemagick-5.2.5.ebuild b/media-gfx/imagemagick/imagemagick-5.2.5.ebuild
index 2507832b8c2b..58ccac682929 100644
--- a/media-gfx/imagemagick/imagemagick-5.2.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-5.2.5.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/media-gfx/imagemagick/imagemagick-5.2.5.ebuild,v 1.1 2000/11/26 20:54:18 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-5.2.5.ebuild,v 1.2 2000/11/27 22:48:59 achim Exp $
 
 P=ImageMagick-${PV}
 A=${P}.tar.gz
@@ -20,7 +20,7 @@ DEPEND=">=app-text/dgs-0.5.9.1
 	app-text/ghostscript
 	app-text/tetex
 	media-gfx/gimp
-	media-libs/mpeg2vidcodec
+	media-video/mpeg2vidcodec
 	net-misc/wget
 	|| ( net-print/LPRng net-print/cups )
 	|| ( net-www/navigator net-www/netscape )"
diff --git a/media-libs/mesa/mesa-glu-3.4.ebuild b/media-libs/mesa/mesa-glu-3.4.ebuild
index c54a6cc24e15..4b43870fba90 100644
--- a/media-libs/mesa/mesa-glu-3.4.ebuild
+++ b/media-libs/mesa/mesa-glu-3.4.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/media-libs/mesa/mesa-glu-3.4.ebuild,v 1.1 2000/11/26 20:54:18 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-glu-3.4.ebuild,v 1.2 2000/11/27 22:48:59 achim Exp $
 
 P=MesaLib-${PV}
 A=${P}.tar.gz
@@ -32,7 +32,7 @@ src_install () {
 #    rm -f ${D}/usr/X11R6/include/GL/osmesa.h
     cd ${D}/usr/X11R6/lib
     ln -s libGLU.so.1.1.030400 libMesaGLU.so.3
-    ln -s libGL.so.1.1.030400 libMesaGL.so.3
+    ln -s libGL.so.2.1.030400 libMesaGL.so.3
 
     cd ${S}
     dodoc docs/*