*** empty log message ***

4 files changed, 17 insertions, 12 deletions

diff --git a/kde-apps/kdeadmin/kdeadmin-2.1.1-r1.ebuild b/kde-apps/kdeadmin/kdeadmin-2.1.1-r1.ebuild
index affa79d67035..abb905079526 100644
--- a/kde-apps/kdeadmin/kdeadmin-2.1.1-r1.ebuild
+++ b/kde-apps/kdeadmin/kdeadmin-2.1.1-r1.ebuild
@@ -34,7 +34,7 @@ src_compile() {
       myconf="$myconf --enable-mitshm"
     fi
     QTBASE=/usr/X11R6/lib/qt
-    try ./configure --prefix=/opt/kde2.1 --host=${CHOST} \
+    try ./configure --prefix=$KDEDIR --host=${CHOST} \
 		--with-qt-dir=$QTBASE \
 		--with-rpm $myconf
     try make
diff --git a/kde-apps/kdegraphics/kdegraphics-2.1.1.ebuild b/kde-apps/kdegraphics/kdegraphics-2.1.1.ebuild
index 060ce092d9ea..1ba6b92d3490 100644
--- a/kde-apps/kdegraphics/kdegraphics-2.1.1.ebuild
+++ b/kde-apps/kdegraphics/kdegraphics-2.1.1.ebuild
@@ -11,10 +11,11 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 
 HOMEPAGE="http://www.kde.org"
 
-DEPEND=">=kde-base/kdelibs-${PV}
-	>=app-text/tetex-1.0.7"
+DEPEND=">=kde-base/kdelibs-${PV} sys-devel/perl
+	tex? ( >=app-text/tetex-1.0.7 )
+        gphoto2? ( >=gnome-apps/gphoto-2.0_beta1 >=media-libs/libgpio-20010607 )"
 
-RDEPEND=">=kde-base/kdelibs-${PV}"
+RDEPEND=">=kde-base/kdelibs-${PV} gphoto2? ( >=gnome-apps/gphoto-2.0_beta1 >=media-libs/libgpio-20010607 )"
 
 src_compile() {
     QTBASE=/usr/X11R6/lib/qt
@@ -23,10 +24,15 @@ src_compile() {
     then
       myconf="--enable-mt"
     fi
-    if [ "`use mitshm`" ]
+    if [ "`use mitshm`" ]                                                                   
     then
       myconf="$myconf --enable-mitshm"
     fi
+    if [ "`use gphoto2`" ] ; then
+      myconf="$myconf --with-gphoto2-includes=/usr/include/gphoto2 --with-gphoto2-libraries=/usr/lib/gphoto2"
+    else
+      myconf="$myconf --without-kamera"
+    fi
     try ./configure --prefix=/opt/kde2.1 --host=${CHOST} \
 		--with-qt-dir=$QTBASE $myconf
     try make
diff --git a/kde-apps/kdemultimedia/kdemultimedia-2.1.1.ebuild b/kde-apps/kdemultimedia/kdemultimedia-2.1.1.ebuild
index 73dc392dd483..430fc1121c6f 100644
--- a/kde-apps/kdemultimedia/kdemultimedia-2.1.1.ebuild
+++ b/kde-apps/kdemultimedia/kdemultimedia-2.1.1.ebuild
@@ -13,6 +13,8 @@ HOMEPAGE="http://www.kde.org"
 
 DEPEND=">=kde-base/kdelibs-${PV}
 	>=sys-libs/ncurses-5.2
+        >=media-sound/cdparanoia-3.9.8
+        >=media-libs/libvorbis-1.0_beta4
 	alsa? ( >=media-libs/alsa-lib-0.5.9 )
 	nas? ( >=media-sound/nas-1.4.1 )
 	esd? ( >=media-sound/esound-0.2.22 )
diff --git a/kde-apps/kdoc/kdoc-2.1.1.ebuild b/kde-apps/kdoc/kdoc-2.1.1.ebuild
index 0595ddd25bee..e04dec089f0c 100644
--- a/kde-apps/kdoc/kdoc-2.1.1.ebuild
+++ b/kde-apps/kdoc/kdoc-2.1.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-apps/kdoc/kdoc-2.1.1.ebuild,v 1.1 2001/04/28 15:38:51 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-apps/kdoc/kdoc-2.1.1.ebuild,v 1.2 2001/06/07 21:10:33 achim Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -12,19 +12,16 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 
 HOMEPAGE="http://www.kde.org"
 
-DEPEND=">=sys-devel/perl-5"
-RDEPEND=$DEPEND
+DEPEND=">=sys-devel/perl-5 kde-base/kde-env"
 
 src_compile() {
-    QTBASE=/usr/X11R6/lib/qt
-    try ./configure --prefix=/opt/kde2.1 --mandir=/opt/kde2.1/share/man --host=${CHOST} \
-		--with-qt-dir=$QTDIR
+
+    try ./configure --prefix=${KDEDIR} --host=${CHOST}
     try make
 }
 
 src_install() {
 
-  dodir /opt/kde2/share/man/man1
   try make install DESTDIR=${D}
   dodoc README TODO Version