*** empty log message ***

30 files changed, 357 insertions, 141 deletions

diff --git a/app-office/gnumeric/gnumeric-0.65.ebuild b/app-office/gnumeric/gnumeric-0.65.ebuild
index 9df77e53551d..e88abe808b69 100644
--- a/app-office/gnumeric/gnumeric-0.65.ebuild
+++ b/app-office/gnumeric/gnumeric-0.65.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/gnumeric/gnumeric-0.65.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-0.65.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,13 +9,22 @@ DESCRIPTION="gnumeric"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/"${A}
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 
-DEPEND=">=sys-devel/perl-5
-	>=dev-lang/python-2.0
-	>=gnome-base/gal-0.3.0
-	>=gnome-libs/gb-0.0.17
-	>=gnome-libs/libole2-0.1.7
-	bonobo? ( >=gnome-base/bonobo-0.28 
-		  >=gnome-libs/libgda-0.2.0 ) "
+DEPEND=">=gnome-base/gnome-print-0.29
+        >=gnome-base/gal-0.8.0
+	>=gnome-libs/libole2-0.2.3
+        >=dev-util/xml-i18n-tools-0.8.4
+        perl? ( >=sys-devel/perl-5 )
+	python? ( >=dev-lang/python-2.0 )
+        gb? ( >=gnome-libs/gb-0.0.19 )
+        libgda? ( >=gnome-libs/libgda-0.2.9 )
+        nls? ( sys-devel/gettext )
+	bonobo? ( >=gnome-base/bonobo-1.0 )"
+
+RDEPEND=">=gnome-base/gnome-print-0.29
+        >=gnome-base/gal-0.8.0
+        gb? ( >=gnome-libs/gb-0.0.19 )
+        libgda? ( >=gnome-libs/libgda-0.2.9 )
+	bonobo? ( >=gnome-base/bonobo-1.0 ) "
 
 src_unpack() {
   unpack ${A}
@@ -24,21 +33,43 @@ src_unpack() {
   sed -e 's:"%d,:"%d",:' configure.orig > configure
 }
 
-src_compile() {                           
-  cd ${S}
+src_compile() {
   local myconf
-  if [ "`use bonobo`" ]
-  then
-    myconf="--with-bonobo"
+  if [ -z "`use nls`" ] ; then
+    myconf="--disable-nls"
+  fi
+  if [ "`use bonobo`" ] ; then
+    myconf="$myconf --with-bonobo"
+  else
+    myconf="$myconf --without-bonobo"
+  fi
+  if [ "`use gb`" ]; then
+    #does not work atm
+    myconf="$myconf --without-gb"
+  else
+    myconf="$myconf --without-gb"
   fi
-  LDFLAGS="-L/opt/gnome/lib -lunicode" try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	${myconf}  --with-gb
+  if [ "`use perl`" ]; then
+    myconf="$myconf --with-perl"
+  else
+    myconf="$myconf --without-perl"
+  fi
+  if [ "`use python`" ]; then
+    myconf="$myconf --with-python"
+  else
+    myconf="$myconf --without-python"
+  fi
+  if [ "`use libgda`" ]; then
+    myconf="$myconf --with-gda"
+  else
+    myconf="$myconf --without-gda"
+  fi
+  try ./configure --host=${CHOST} --prefix=/opt/gnome ${myconf}
   cd ${S}
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
   try make prefix=${D}/opt/gnome PREFIX=${D}/usr install
   dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
 
diff --git a/app-text/sgml-common/sgml-common-0.6.1.ebuild b/app-text/sgml-common/sgml-common-0.6.1.ebuild
index cf2887abe54a..0d4e8fef7e02 100644
--- a/app-text/sgml-common/sgml-common-0.6.1.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.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/app-text/sgml-common/sgml-common-0.6.1.ebuild,v 1.4 2001/05/28 14:32:32 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgml-common/sgml-common-0.6.1.ebuild,v 1.5 2001/06/06 16:55:51 achim Exp $
 
 A=${P}.tgz
 S=${WORKDIR}/${P}
@@ -28,13 +28,17 @@ src_install () {
 }
 
 pkg_postinst() {
+  if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
     install-catalog --add /etc/sgml/sgml-ent.cat /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
     install-catalog --add /etc/sgml/sgml-docbook.cat /etc/sgml/sgml-ent.cat
+  else
+    echo "install-catalog not found!"
+  fi
 }
 
 pkg_prerm() {
-    if [ "$ROOT" = "/" ] ; then
-    install-catalog --remove /etc/sgml/sgml-ent.cat /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
-    install-catalog --remove /etc/sgml/sgml-docbook.cat /etc/sgml/sgml-ent.cat
+    if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
+      [ -e "etc/sgml/sgml-docbook.cat" ] && install-catalog --remove /etc/sgml/sgml-docbook.cat /etc/sgml/sgml-ent.cat
+      [ -e "etc/sgml/sgml-ent.cat" ] && install-catalog --remove /etc/sgml/sgml-ent.cat /usr/share/sgml/sgml-iso-entities-8879.1986/catalog
     fi
 }
\ No newline at end of file
diff --git a/dev-perl/gtk-perl-glade/gtk-perl-glade-0.7004.ebuild b/dev-perl/gtk-perl-glade/gtk-perl-glade-0.7004.ebuild
index 9784cc113c6c..68ba1dbca044 100644
--- a/dev-perl/gtk-perl-glade/gtk-perl-glade-0.7004.ebuild
+++ b/dev-perl/gtk-perl-glade/gtk-perl-glade-0.7004.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/dev-perl/gtk-perl-glade/gtk-perl-glade-0.7004.ebuild,v 1.3 2001/05/18 20:00:39 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk-perl-glade/gtk-perl-glade-0.7004.ebuild,v 1.4 2001/06/06 16:55:51 achim Exp $
 
 A=Gtk-Perl-${PV}.tar.gz
 S=${WORKDIR}/Gtk-Perl-${PV}
@@ -9,7 +9,7 @@ DESCRIPTION="Perl bindings for GTK"
 SRC_URI="ftp://ftp.rz.ruhr-uni-bochum.de/pub/CPAN/authors/id/L/LU/LUPUS/${A}"
 HOEMPAGE="http://www.perl.org/"
 
-DEPEND=">=x11-libs/gtk+-1.2.8
+DEPEND="sys-devel/perl
         =dev-perl/gtk-perl-${PV}
 	gnome-apps/glade"
 
diff --git a/dev-perl/gtk-perl/gtk-perl-0.7004.ebuild b/dev-perl/gtk-perl/gtk-perl-0.7004.ebuild
index 01bf62e2a87d..f6b16c3aa197 100644
--- a/dev-perl/gtk-perl/gtk-perl-0.7004.ebuild
+++ b/dev-perl/gtk-perl/gtk-perl-0.7004.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/dev-perl/gtk-perl/gtk-perl-0.7004.ebuild,v 1.3 2001/05/03 16:38:58 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk-perl/gtk-perl-0.7004.ebuild,v 1.4 2001/06/06 16:55:51 achim Exp $
 
 A=Gtk-Perl-${PV}.tar.gz
 S=${WORKDIR}/Gtk-Perl-${PV}
@@ -9,7 +9,7 @@ DESCRIPTION="Perl bindings for GTK"
 SRC_URI="ftp://ftp.rz.ruhr-uni-bochum.de/pub/CPAN/authors/id/L/LU/LUPUS/${A}"
 HOEMPAGE="http://www.perl.org/"
 
-DEPEND=">=x11-libs/gtk+-1.2.8"
+DEPEND=">=x11-libs/gtk+-1.2.8 sys-devel/perl"
 
 
 src_compile() {                           
diff --git a/dev-util/glade/glade-0.6.2.ebuild b/dev-util/glade/glade-0.6.2.ebuild
index 1b4cefafaccf..1833fe2a5809 100644
--- a/dev-util/glade/glade-0.6.2.ebuild
+++ b/dev-util/glade/glade-0.6.2.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/dev-util/glade/glade-0.6.2.ebuild,v 1.3 2001/06/04 21:57:52 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.2.ebuild,v 1.4 2001/06/06 16:55:51 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,21 +9,25 @@ DESCRIPTION="glade"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/"${A}
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=x11-libs/gtk+-1.2.8
-        bonobo? ( >=gnome-base/bonobo-1.0.4 )
-	gnome? ( >=gnome-base/gnome-libs-1.2.8
-        	 >=gnome-base/scrollkeeper-0.2 )"
+DEPEND=">=x11-libs/gtk+-1.2.8 nls? ( sys-devel/gettext )
+        >=dev-util/xml-i18n-tools-0.8.4
+        >=gnome-base/scrollkeeper-0.2
+	gnome? ( >=gnome-base/gnome-libs-1.2.8 )
+        bonobo? ( >=gnome-base/bonobo-1.0.4 )"
+
+RDEPEND=">=x11-libs/gtk+-1.2.8 
+	gnome? ( >=gnome-base/gnome-libs-1.2.8 )
+        bonobo? ( >=gnome-base/bonobo-1.0.4 )"
+
  #gnome-db stuff disabled atm
  #>=gnome-office/gnome-db-0.2.0
 
 src_compile() {
 
   local myopts
-  if [ -n "`use gnome`" ]
-  then
+  if [ -n "`use gnome`" ] ; then
     echo "Using Gnome"
     myopts="--prefix=/opt/gnome"
-
   else
     myopts="--prefix=/usr/X11R6 --disable-gnome"
   fi
@@ -32,8 +36,14 @@ src_compile() {
   else
     myopts="$myopts --without-bonobo"
   fi
-  try ./configure --host=${CHOST} ${myopts}
-  # bonobo support does not work with 0.28 requires around 0.18
+  if [ -z "`use nls`" ] ; then
+    myopts="$myopts --disable-nls"
+  fi
+  if [ "$DEBUG" ] ; then
+    myopts="$myopts --enable-debug"
+  fi
+  try ./configure --disable-gnome-db --host=${CHOST} ${myopts}
+  # gnome-db support is only experimental
   try make
 }
 
diff --git a/gnome-apps/glade/glade-0.6.2.ebuild b/gnome-apps/glade/glade-0.6.2.ebuild
index d8ce7c4f3ac2..fb4004aa5eff 100644
--- a/gnome-apps/glade/glade-0.6.2.ebuild
+++ b/gnome-apps/glade/glade-0.6.2.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/glade/glade-0.6.2.ebuild,v 1.3 2001/06/04 21:57:52 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/glade/glade-0.6.2.ebuild,v 1.4 2001/06/06 16:55:51 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,21 +9,25 @@ DESCRIPTION="glade"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/"${A}
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=x11-libs/gtk+-1.2.8
-        bonobo? ( >=gnome-base/bonobo-1.0.4 )
-	gnome? ( >=gnome-base/gnome-libs-1.2.8
-        	 >=gnome-base/scrollkeeper-0.2 )"
+DEPEND=">=x11-libs/gtk+-1.2.8 nls? ( sys-devel/gettext )
+        >=dev-util/xml-i18n-tools-0.8.4
+        >=gnome-base/scrollkeeper-0.2
+	gnome? ( >=gnome-base/gnome-libs-1.2.8 )
+        bonobo? ( >=gnome-base/bonobo-1.0.4 )"
+
+RDEPEND=">=x11-libs/gtk+-1.2.8 
+	gnome? ( >=gnome-base/gnome-libs-1.2.8 )
+        bonobo? ( >=gnome-base/bonobo-1.0.4 )"
+
  #gnome-db stuff disabled atm
  #>=gnome-office/gnome-db-0.2.0
 
 src_compile() {
 
   local myopts
-  if [ -n "`use gnome`" ]
-  then
+  if [ -n "`use gnome`" ] ; then
     echo "Using Gnome"
     myopts="--prefix=/opt/gnome"
-
   else
     myopts="--prefix=/usr/X11R6 --disable-gnome"
   fi
@@ -32,8 +36,14 @@ src_compile() {
   else
     myopts="$myopts --without-bonobo"
   fi
-  try ./configure --host=${CHOST} ${myopts}
-  # bonobo support does not work with 0.28 requires around 0.18
+  if [ -z "`use nls`" ] ; then
+    myopts="$myopts --disable-nls"
+  fi
+  if [ "$DEBUG" ] ; then
+    myopts="$myopts --enable-debug"
+  fi
+  try ./configure --disable-gnome-db --host=${CHOST} ${myopts}
+  # gnome-db support is only experimental
   try make
 }
 
diff --git a/gnome-apps/gnome-utils/gnome-utils-1.4.0.ebuild b/gnome-apps/gnome-utils/gnome-utils-1.4.0.ebuild
index 9219cc634cc3..eded7179336b 100644
--- a/gnome-apps/gnome-utils/gnome-utils-1.4.0.ebuild
+++ b/gnome-apps/gnome-utils/gnome-utils-1.4.0.ebuild
@@ -11,7 +11,13 @@ HOMEPAGE="http://www.gnome.org/"
 
 DEPEND=">=gnome-base/gnome-core-1.2.4
 	>=gnome-base/libgtop-1.0.10
+        >=sys-apps/e2fsprogs-1.19-r2
+        >=dev-util/guile-1.4
+        >=sys-apps/shadow-20000000
         nls? ( sys-devel/gettext )"
+RDEPEND=">=gnome-base/gnome-core-1.2.4
+	>=gnome-base/libgtop-1.0.10
+        >=sys-apps/e2fsprogs-1.19-r2"
 
 src_compile() {                           
   local myconf
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.2.9 b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.9
new file mode 100644
index 000000000000..e5856d5f798e
--- /dev/null
+++ b/gnome-extra/gnome-db/files/digest-gnome-db-0.2.9
@@ -0,0 +1 @@
+MD5 44eebf935cf0a716e9f75e3551e59a2b gnome-db-0.2.9.tar.gz
diff --git a/gnome-extra/gnome-db/gnome-db-0.2.9.ebuild b/gnome-extra/gnome-db/gnome-db-0.2.9.ebuild
new file mode 100644
index 000000000000..d1055b4f274b
--- /dev/null
+++ b/gnome-extra/gnome-db/gnome-db-0.2.9.ebuild
@@ -0,0 +1,37 @@
+# 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>
+# /home/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="Framework for creating database applications"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
+HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
+
+DEPEND=">=gnome-base/bonobo-0.30
+	>=gnome-libs/libgda-0.2.3
+        >=gnome-base/gal-0.8
+        >=dev-util/xml-i18n-tools-0.8.4"
+
+RDEPEND=">=gnome-base/bonobo-0.30
+	>=gnome-libs/libgda-0.2.3"
+
+src_compile() {
+
+  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
+        --datadir=/opt/gnome/share --disable-bonobotest
+  try make
+}
+
+src_install() {                               
+  try make prefix=${D}/opt/gnome \
+	GNOME_sysconfdir=${D}/opt/gnome/etc \
+	GNOME_datadir=${D}/opt/gnome/share \
+	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
+	install
+  dodoc AUTHORS COPYING ChangeLog README
+}
+
+
+
diff --git a/gnome-extra/gnome-utils/gnome-utils-1.4.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-1.4.0.ebuild
index 9219cc634cc3..eded7179336b 100644
--- a/gnome-extra/gnome-utils/gnome-utils-1.4.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-1.4.0.ebuild
@@ -11,7 +11,13 @@ HOMEPAGE="http://www.gnome.org/"
 
 DEPEND=">=gnome-base/gnome-core-1.2.4
 	>=gnome-base/libgtop-1.0.10
+        >=sys-apps/e2fsprogs-1.19-r2
+        >=dev-util/guile-1.4
+        >=sys-apps/shadow-20000000
         nls? ( sys-devel/gettext )"
+RDEPEND=">=gnome-base/gnome-core-1.2.4
+	>=gnome-base/libgtop-1.0.10
+        >=sys-apps/e2fsprogs-1.19-r2"
 
 src_compile() {                           
   local myconf
diff --git a/gnome-office/gnome-db/files/digest-gnome-db-0.2.9 b/gnome-office/gnome-db/files/digest-gnome-db-0.2.9
new file mode 100644
index 000000000000..e5856d5f798e
--- /dev/null
+++ b/gnome-office/gnome-db/files/digest-gnome-db-0.2.9
@@ -0,0 +1 @@
+MD5 44eebf935cf0a716e9f75e3551e59a2b gnome-db-0.2.9.tar.gz
diff --git a/gnome-office/gnome-db/gnome-db-0.2.9.ebuild b/gnome-office/gnome-db/gnome-db-0.2.9.ebuild
new file mode 100644
index 000000000000..d1055b4f274b
--- /dev/null
+++ b/gnome-office/gnome-db/gnome-db-0.2.9.ebuild
@@ -0,0 +1,37 @@
+# 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>
+# /home/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.2.3.ebuild,v 1.1 2001/04/29 16:17:43 achim Exp
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="Framework for creating database applications"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
+HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
+
+DEPEND=">=gnome-base/bonobo-0.30
+	>=gnome-libs/libgda-0.2.3
+        >=gnome-base/gal-0.8
+        >=dev-util/xml-i18n-tools-0.8.4"
+
+RDEPEND=">=gnome-base/bonobo-0.30
+	>=gnome-libs/libgda-0.2.3"
+
+src_compile() {
+
+  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome \
+        --datadir=/opt/gnome/share --disable-bonobotest
+  try make
+}
+
+src_install() {                               
+  try make prefix=${D}/opt/gnome \
+	GNOME_sysconfdir=${D}/opt/gnome/etc \
+	GNOME_datadir=${D}/opt/gnome/share \
+	GNOMEDB_oafinfodir=${D}/opt/gnome/share/oaf \
+	install
+  dodoc AUTHORS COPYING ChangeLog README
+}
+
+
+
diff --git a/gnome-office/gnumeric/gnumeric-0.65.ebuild b/gnome-office/gnumeric/gnumeric-0.65.ebuild
index af8e6c8c239e..e851cabddcfc 100644
--- a/gnome-office/gnumeric/gnumeric-0.65.ebuild
+++ b/gnome-office/gnumeric/gnumeric-0.65.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-office/gnumeric/gnumeric-0.65.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.65.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,13 +9,22 @@ DESCRIPTION="gnumeric"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/"${A}
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 
-DEPEND=">=sys-devel/perl-5
-	>=dev-lang/python-2.0
-	>=gnome-base/gal-0.3.0
-	>=gnome-libs/gb-0.0.17
-	>=gnome-libs/libole2-0.1.7
-	bonobo? ( >=gnome-base/bonobo-0.28 
-		  >=gnome-libs/libgda-0.2.0 ) "
+DEPEND=">=gnome-base/gnome-print-0.29
+        >=gnome-base/gal-0.8.0
+	>=gnome-libs/libole2-0.2.3
+        >=dev-util/xml-i18n-tools-0.8.4
+        perl? ( >=sys-devel/perl-5 )
+	python? ( >=dev-lang/python-2.0 )
+        gb? ( >=gnome-libs/gb-0.0.19 )
+        libgda? ( >=gnome-libs/libgda-0.2.9 )
+        nls? ( sys-devel/gettext )
+	bonobo? ( >=gnome-base/bonobo-1.0 )"
+
+RDEPEND=">=gnome-base/gnome-print-0.29
+        >=gnome-base/gal-0.8.0
+        gb? ( >=gnome-libs/gb-0.0.19 )
+        libgda? ( >=gnome-libs/libgda-0.2.9 )
+	bonobo? ( >=gnome-base/bonobo-1.0 ) "
 
 src_unpack() {
   unpack ${A}
@@ -24,21 +33,43 @@ src_unpack() {
   sed -e 's:"%d,:"%d",:' configure.orig > configure
 }
 
-src_compile() {                           
-  cd ${S}
+src_compile() {
   local myconf
-  if [ "`use bonobo`" ]
-  then
-    myconf="--with-bonobo"
+  if [ -z "`use nls`" ] ; then
+    myconf="--disable-nls"
+  fi
+  if [ "`use bonobo`" ] ; then
+    myconf="$myconf --with-bonobo"
+  else
+    myconf="$myconf --without-bonobo"
+  fi
+  if [ "`use gb`" ]; then
+    #does not work atm
+    myconf="$myconf --without-gb"
+  else
+    myconf="$myconf --without-gb"
   fi
-  LDFLAGS="-L/opt/gnome/lib -lunicode" try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	${myconf}  --with-gb
+  if [ "`use perl`" ]; then
+    myconf="$myconf --with-perl"
+  else
+    myconf="$myconf --without-perl"
+  fi
+  if [ "`use python`" ]; then
+    myconf="$myconf --with-python"
+  else
+    myconf="$myconf --without-python"
+  fi
+  if [ "`use libgda`" ]; then
+    myconf="$myconf --with-gda"
+  else
+    myconf="$myconf --without-gda"
+  fi
+  try ./configure --host=${CHOST} --prefix=/opt/gnome ${myconf}
   cd ${S}
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
   try make prefix=${D}/opt/gnome PREFIX=${D}/usr install
   dodoc AUTHORS COPYING *ChangeLog HACKING NEWS README TODO
 
diff --git a/kde-base/kdelibs/kdelibs-2.1.2.ebuild b/kde-base/kdelibs/kdelibs-2.1.2.ebuild
index 3a65aa4a7297..d9a3c8c21591 100644
--- a/kde-base/kdelibs/kdelibs-2.1.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.1.2.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.1.2.ebuild,v 1.1 2001/05/18 20:05:35 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.1.2.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
 
 V=2.1
 A=${P}.tar.bz2
@@ -14,11 +14,11 @@ SRC_URI="ftp://ftp.kde.org/pub/$SRC_PATH
 
 HOMEPAGE="http://www.kde.org/"
 
-DEPEND=">=sys-devel/gcc-2.95.2
+DEPEND=">=sys-devel/gcc-2.95.2  sys-devel/perl
 	>=media-libs/audiofile-0.1.9
 	>=media-libs/tiff-3.5.5
 	>=x11-libs/qt-x11-2.3.0
-	app-text/sgml-common
+        >=sys-apps/bzip2-1.0.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	mysql? ( >=dev-db/mysql-3.23.30 )
 	postgres? ( >=dev-db/postgresql-7.0.3 )
@@ -27,8 +27,12 @@ DEPEND=">=sys-devel/gcc-2.95.2
 
 RDEPEND=">=sys-devel/gcc-2.95.2
 	 >=media-libs/audiofile-0.1.9
+         >=sys-apps/bzip2-1.0.1
 	 >=x11-libs/qt-x11-2.3.0
-     =kde-base/kde-env-2.1"
+         =kde-base/kde-env-2.1
+         app-text/sgml-common
+         alsa? ( >=media-libs/alsa-lib-0.5.9 )
+         ssl? ( >=dev-libs/openssl-0.9.6 )"
 
 src_unpack() {
     unpack ${A}
@@ -43,7 +47,7 @@ src_compile() {
     QTBASE=/usr/X11R6/lib/qt
 
     local myopts
-    if [ "`use ssl`" ] 
+    if [ "`use ssl`" ]
     then
       myopts="--with-ssl-dir=/usr"
     else
@@ -88,11 +92,17 @@ src_install() {
 
 
 pkg_postinst() {
-    install-catalog --add /etc/sgml/kde-docbook.cat /usr/share/sgml/docbook/kde-customizations/catalog
-    install-catalog --add /etc/sgml/kde-docbook.cat /etc/sgml/sgml-docbook.cat
+     if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
+      install-catalog --add /etc/sgml/kde-docbook.cat /usr/share/sgml/docbook/kde-customizations/catalog
+      install-catalog --add /etc/sgml/kde-docbook.cat /etc/sgml/sgml-docbook.cat
+    fi
 }
 
 pkg_prerm() {
-    install-catalog --remove /etc/sgml/kde-docbook.cat /usr/share/sgml/docbook/kde-customizations/catalog
-    install-catalog --remove /etc/sgml/kde-docbook.cat /etc/sgml/sgml-docbook.cat
+    if [ -x  "/usr/bin/install-catalog" ] && [ "$ROOT" = "/" ] ; then
+      if [ -e "/etc/sgml/kde-docbook.cat" ] ; then
+        install-catalog --remove /etc/sgml/kde-docbook.cat /usr/share/sgml/docbook/kde-customizations/catalog
+        install-catalog --remove /etc/sgml/kde-docbook.cat /etc/sgml/sgml-docbook.cat
+      fi
+    fi
 }
diff --git a/media-sound/gkrellm-volume/gkrellm-volume-0.8.ebuild b/media-sound/gkrellm-volume/gkrellm-volume-0.8.ebuild
index 9c7f19bc725c..faf5397328d7 100644
--- a/media-sound/gkrellm-volume/gkrellm-volume-0.8.ebuild
+++ b/media-sound/gkrellm-volume/gkrellm-volume-0.8.ebuild
@@ -11,8 +11,8 @@ DESCRIPTION="A mixer control plugin for gkrellm"
 SRC_URI="http://gkrellm.luon.net/files/volume-${PV}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/volume.phtml"
 
-DEPEND=">=app-admin/gkrellm-1.0.6
-        >=media-sound/xmms-1.2.4"
+DEPEND=">=app-admin/gkrellm-1.0.6"
+        #>=media-sound/xmms-1.2.4"
 
 src_compile() {
 
@@ -22,7 +22,8 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    exeinto /usr/share/gkrellm/plugins
+    doexe volume.so
     dodoc README Changelog
 }
 
diff --git a/media-sound/gkrellmms/gkrellmms-0.5.5.ebuild b/media-sound/gkrellmms/gkrellmms-0.5.5.ebuild
index dbb3d7c18e11..6c4a555abba0 100644
--- a/media-sound/gkrellmms/gkrellmms-0.5.5.ebuild
+++ b/media-sound/gkrellmms/gkrellmms-0.5.5.ebuild
@@ -22,7 +22,8 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    exeinto /usr/share/gkrellm/plugins
+    doexe gkrellmms.so
     dodoc README ChangeLog FAQ Themes
 }
 
diff --git a/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r2.ebuild b/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r2.ebuild
index 2445f00c813e..532f73f6ac26 100644
--- a/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r2.ebuild
+++ b/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r2.ebuild,v 1.1 2001/04/23 01:00:39 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-aalsa/xmms-aalsa-0.5.4-r2.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
 
 S=${WORKDIR}/xmms-aalsa_0.5.4
 DESCRIPTION="This output plugin allows xmms to work with arts, KDE's sound system"
 SRC_URI="http://www1.tcnet.ne.jp/fmurata/linux/aalsa/xmms-aalsa_0.5.4.tar.gz"
-DEPEND=">=sys-libs/glibc-2.1.3 >=media-sound/xmms-1.2.3 >=media-libs/alsa-lib-0.5.9"
+DEPEND="virtual/glibc >=media-sound/xmms-1.2.3 >=media-libs/alsa-lib-0.5.9"
 
 if [ -n "`use gnome`" ]
 then
@@ -27,7 +27,7 @@ src_compile() {
 	try make
 }
 
-src_install() {    
+src_install() {
 	try make DESTDIR=${D} libdir=${myprefix}/lib/xmms/Output install
 	dodoc AUTHORS COPYING NEWS README
 }
diff --git a/media-sound/xmms-nas/xmms-nas-0.2.ebuild b/media-sound/xmms-nas/xmms-nas-0.2.ebuild
index ca10bd7f4ff6..9790b332ed65 100644
--- a/media-sound/xmms-nas/xmms-nas-0.2.ebuild
+++ b/media-sound/xmms-nas/xmms-nas-0.2.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-sound/xmms-nas/xmms-nas-0.2.ebuild,v 1.2 2001/05/09 10:21:22 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-nas/xmms-nas-0.2.ebuild,v 1.3 2001/06/06 16:55:51 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A xmms plugin for NAS"
@@ -33,7 +33,6 @@ src_compile() {
 
 src_install () {
 
-    cd ${S}
     try make DESTDIR=${D} install
     dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
diff --git a/media-sound/xmms-shn/xmms-shn-2.2.3.ebuild b/media-sound/xmms-shn/xmms-shn-2.2.3.ebuild
index e59653f7e216..3ea0f3030b2e 100644
--- a/media-sound/xmms-shn/xmms-shn-2.2.3.ebuild
+++ b/media-sound/xmms-shn/xmms-shn-2.2.3.ebuild
@@ -1,31 +1,27 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-shn/xmms-shn-2.2.3.ebuild,v 1.3 2001/02/04 21:18:10 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-shn/xmms-shn-2.2.3.ebuild,v 1.4 2001/06/06 16:55:51 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="This input plugin allows xmms to play .shn compressed (lossless) files"
 SRC_URI="http://shnutils.freeshell.org/xmms-shn/source/xmms-shn-2.2.3.tar.bz2"
 HOMEPAGE="http://shnutils.freeshell.org/xmms-shn"
-DEPEND=">=sys-libs/glibc-2.1.3 >=media-sound/xmms-1.2.3"
+DEPEND="virtual/glibc >=media-sound/xmms-1.2.3"
 
-src_unpack() {
-	unpack ${A}
-}
-
-src_compile() {     
+src_compile() {
 	if [ "`use gnome`" ]
 	then
-	  echo /opt/gnome > ${T}/mydest
+	  echo /opt/gnome > ${S}/mydest
 	else
-	  echo /usr/X11R6 > ${T}/mydest
+	  echo /usr/X11R6 > ${S}/mydest
 	fi
-	try ./configure --prefix=`cat ${T}/mydest` --host=${CHOST}
+	try ./configure --prefix=`cat ${S}/mydest` --host=${CHOST}
 	try make
 }
 
-src_install() {                               
-	try make DESTDIR=${D} libdir=`cat ${T}/mydest`/lib/xmms/Input install
+src_install() {
+	try make DESTDIR=${D} libdir=`cat ${S}/mydest`/lib/xmms/Input install
 	dodoc AUTHORS COPYING NEWS README
 }
 
diff --git a/media-sound/xmms/xmms-1.2.4-r3.ebuild b/media-sound/xmms/xmms-1.2.4-r3.ebuild
index ea1a446eddc1..03ac25b40194 100644
--- a/media-sound/xmms/xmms-1.2.4-r3.ebuild
+++ b/media-sound/xmms/xmms-1.2.4-r3.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-sound/xmms/xmms-1.2.4-r3.ebuild,v 1.1 2001/05/29 23:05:43 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.4-r3.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="X MultiMedia System"
@@ -24,16 +24,40 @@ RDEPEND="gnome? ( >=gnome-base/gnome-core-1.2.2.1 )
 	 >=x11-libs/gtk+-1.2.8
 	 virtual/opengl"
 
-src_compile() {                           
+src_unpack() {
+  unpack ${A}
   cd ${S}
+  cp configure configure.orig
+  sed -e "s:-m486::" configure.orig > configure
+}
+src_compile() {
+
   local myopts
   if [ -n "`use gnome`" ]
   then
 	myopts="--prefix=/opt/gnome --with-gnome"
+        export CFLAGS="$CFLAGS -I/opt/gnome/include"
   else
 	myopts="--prefix=/usr/X11R6 --without-gnome"
   fi
-  CFLAGS="$CFLAGS -I/opt/gnome/include" try ./configure --host=${CHOST} ${myopts}
+  if [ "`use 3dnow`" ] ; then
+    myopts=$myopts --enable-3dnow"
+  else
+    myopts=$myopts --disable-3dnow"
+  fi
+  if [ "`use ogg`" ] ; then
+    myopts=$myopts --with-ogg"
+  else
+    myopts=$myopts --disable-ogg-test"
+  fi
+if [ "`use vorbis`" ] ; then
+    myopts=$myopts --with-vorbis"
+  else
+    myopts=$myopts --disable-vorbis-test"
+  fi
+
+
+  try ./configure --host=${CHOST} ${myopts}
   try make
 
 }
diff --git a/net-im/gnomeicu/gnomeicu-0.96.1-r1.ebuild b/net-im/gnomeicu/gnomeicu-0.96.1-r1.ebuild
index 90c9e61b514d..8bb0abb2caec 100644
--- a/net-im/gnomeicu/gnomeicu-0.96.1-r1.ebuild
+++ b/net-im/gnomeicu/gnomeicu-0.96.1-r1.ebuild
@@ -8,8 +8,11 @@ DESCRIPTION="Gnome ICQ Client"
 SRC_URI="http://download.sourceforge.net/gnomeicu/${A}"
 HOMEPAGE="http://gnomeicu.sourceforge.net/"
 
-DEPEND=">=x11-libs/gtk+-1.2.0
-	>=gnome-base/gnome-core-1.2.4"
+DEPEND="virtual/glibc sys-devel/gettext
+	>=gnome-base/gnome-core-1.2.4
+        >=sys-libs/gdbm-1.8.0"
+RDEPEND="=gnome-base/gnome-core-1.2.4
+        >=sys-libs/gdbm-1.8.0"
 
 src_unpack() {
   unpack ${A}
diff --git a/net-irc/bitchx/bitchx-1.0.18-r2.ebuild b/net-irc/bitchx/bitchx-1.0.18-r2.ebuild
index 6fe478a58ea3..653edc24e78b 100644
--- a/net-irc/bitchx/bitchx-1.0.18-r2.ebuild
+++ b/net-irc/bitchx/bitchx-1.0.18-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 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/net-irc/bitchx/bitchx-1.0.18-r2.ebuild,v 1.2 2001/06/01 14:00:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.0.18-r2.ebuild,v 1.3 2001/06/06 16:55:51 achim Exp $
 
 P=
 A=ircii-pana-1.0c18.tar.gz
@@ -10,12 +10,12 @@ DESCRIPTION="An IRC Client"
 SRC_URI="ftp://ftp.bitchx.com/pub/BitchX/source/${A}"
 HOMEPAGE="http://www.bitchx.com/"
 
-DEPEND=">=sys-libs/glibc-2.1.3
-	>=sys-libs/gpm-1.19.3
+DEPEND="virtual/glibc
 	>=sys-libs/ncurses-5.1
-	>=dev-libs/openssl-0.9.6
-	gnome? ( >=gnome-base/gnome-libs-1.2.4 
-		 >=media-sound/esound-0.2.22 )"
+        >=media-libs/audiofile-0.2.1
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	gnome? ( >=gnome-base/gnome-libs-1.2.4 )
+        esd? ( >=media-sound/esound-0.2.22 )"
 
 src_unpack() {
   unpack ${A}
@@ -28,12 +28,20 @@ src_compile() {
     local myopts
     if [ -n "`use gnome`" ]
     then
-	myopts="--with-gtk --with-sound --prefix=/opt/gnome --with-esd"
+	myopts="--with-gtk  --prefix=/opt/gnome"
     else
 	myopts="--prefix=/usr"
     fi
-    try ./configure ${myopts} --host=${CHOST} \
-	--enable-cdrom --with-plugins
+    if [ -n "`use esd`" ]
+    then
+	myopts="$myopts --with-esd"
+    fi
+    if [ -n "`use ssl`" ]
+    then
+	myopts="$myopts --with-ssl"
+    fi
+    try ./configure ${myopts} --host=${CHOST}  --build=${CHOST}\
+	--enable-cdrom --enable-ipv6 --with-plugins --enable-sound
     try make
 
 }
diff --git a/net-misc/gkrellmwireless/gkrellmwireless-0.0.4.ebuild b/net-misc/gkrellmwireless/gkrellmwireless-0.0.4.ebuild
index 31f032684a43..9ddd7b88aad3 100644
--- a/net-misc/gkrellmwireless/gkrellmwireless-0.0.4.ebuild
+++ b/net-misc/gkrellmwireless/gkrellmwireless-0.0.4.ebuild
@@ -21,7 +21,8 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    exeinto /usr/share/gkrellm/plugins
+    doexe wireless.so
     dodoc README ChangeLog
 }
 
diff --git a/x11-base/xfree/xfree-4.1.0.ebuild b/x11-base/xfree/xfree-4.1.0.ebuild
index 52a4b824a8b0..c9bb1bcf9de5 100644
--- a/x11-base/xfree/xfree-4.1.0.ebuild
+++ b/x11-base/xfree/xfree-4.1.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/x11-base/xfree/xfree-4.1.0.ebuild,v 1.1 2001/06/05 23:50:00 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.1.0.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
 
 A="X410src-1.tgz X410src-2.tgz X410src-3.tgz truetype.tar.gz"
 S=${WORKDIR}/xc
@@ -24,7 +24,7 @@ DEPEND=">=sys-libs/ncurses-5.1
 
 RDEPEND=">=sys-libs/ncurses-5.1"
 
-PROVIDE="virtual/x11 virtual/opengl"
+PROVIDE="virtual/x11 virtual/opengl virtual/glu"
 
 src_unpack () {
 
@@ -66,6 +66,7 @@ src_install() {
     tar xzf ${DISTDIR}/truetype.tar.gz
 
     dosym /usr/X11R6/lib/libGL.so.1.2 /usr/lib/libMesaGL.so
+    dosym /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
 
     insinto /etc/env.d
     doins ${FILESDIR}/10xfree
diff --git a/x11-libs/qt-x11/qt-x11-2.3.0.ebuild b/x11-libs/qt-x11/qt-x11-2.3.0.ebuild
index 02dfd29cb063..d35fa446f5c5 100644
--- a/x11-libs/qt-x11/qt-x11-2.3.0.ebuild
+++ b/x11-libs/qt-x11/qt-x11-2.3.0.ebuild
@@ -54,20 +54,16 @@ src_compile() {
       myconf="${myconf} -release"
     fi
 
+    try SYSCONF_CFLAGS=\"$CFLAGS\" SYSCONF_CXXFLAGS=\"$CXXFLAGS\" \
     ./configure -sm -thread -system-zlib -system-jpeg ${myconf} \
-	-system-libmng -system-libpng -gif -platform linux-g++ -ldl -lpthread
-
-    cd ${S}/src
-    cp Makefile Makefile.orig
-    sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile
-    cd ${S}/tools
-    cp Makefile Makefile.orig
-    sed -e "s/-O2/${CFLAGS}/" Makefile.orig > Makefile
-    cd ${S}/src/moc
-    cp Makefile Makefile.orig
-    sed -e "s/-pipe -O2/${CFLAGS}/" Makefile.orig > Makefile
+	-system-libmng -system-libpng -gif -platform linux-g++ \
+        -ldl -lpthread -no-g++-exceptions
+
     cd ${S}
-    try make symlinks src-moc src-mt sub-src sub-tools
+    try make SYSCONF_CFLAGS=\"$CFLAGS\" SYSCONF_CXXFLAGS=\"$CXXFLAGS\" \
+    symlinks src-moc src-mt sub-src sub-tools
+
+    # leave out src-tools for testing !
 }
 
 src_install() {
diff --git a/x11-misc/gkrellm-volume/gkrellm-volume-0.8.ebuild b/x11-misc/gkrellm-volume/gkrellm-volume-0.8.ebuild
index 9c7f19bc725c..faf5397328d7 100644
--- a/x11-misc/gkrellm-volume/gkrellm-volume-0.8.ebuild
+++ b/x11-misc/gkrellm-volume/gkrellm-volume-0.8.ebuild
@@ -11,8 +11,8 @@ DESCRIPTION="A mixer control plugin for gkrellm"
 SRC_URI="http://gkrellm.luon.net/files/volume-${PV}.tar.gz"
 HOMEPAGE="http://gkrellm.luon.net/volume.phtml"
 
-DEPEND=">=app-admin/gkrellm-1.0.6
-        >=media-sound/xmms-1.2.4"
+DEPEND=">=app-admin/gkrellm-1.0.6"
+        #>=media-sound/xmms-1.2.4"
 
 src_compile() {
 
@@ -22,7 +22,8 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    exeinto /usr/share/gkrellm/plugins
+    doexe volume.so
     dodoc README Changelog
 }
 
diff --git a/x11-misc/gkrellmms/gkrellmms-0.5.5.ebuild b/x11-misc/gkrellmms/gkrellmms-0.5.5.ebuild
index dbb3d7c18e11..6c4a555abba0 100644
--- a/x11-misc/gkrellmms/gkrellmms-0.5.5.ebuild
+++ b/x11-misc/gkrellmms/gkrellmms-0.5.5.ebuild
@@ -22,7 +22,8 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    exeinto /usr/share/gkrellm/plugins
+    doexe gkrellmms.so
     dodoc README ChangeLog FAQ Themes
 }
 
diff --git a/x11-misc/gkrellmwireless/gkrellmwireless-0.0.4.ebuild b/x11-misc/gkrellmwireless/gkrellmwireless-0.0.4.ebuild
index 31f032684a43..9ddd7b88aad3 100644
--- a/x11-misc/gkrellmwireless/gkrellmwireless-0.0.4.ebuild
+++ b/x11-misc/gkrellmwireless/gkrellmwireless-0.0.4.ebuild
@@ -21,7 +21,8 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
+    exeinto /usr/share/gkrellm/plugins
+    doexe wireless.so
     dodoc README ChangeLog
 }
 
diff --git a/x11-wm/enlightenment/enlightenment-0.16.5-r1.ebuild b/x11-wm/enlightenment/enlightenment-0.16.5-r1.ebuild
index 63a7f8da9fb8..c7c217021f38 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.5-r1.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.5-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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.5-r1.ebuild,v 1.4 2001/06/05 22:15:42 blutgens Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.5-r1.ebuild,v 1.5 2001/06/06 16:55:51 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -14,19 +14,15 @@ DEPEND=">=media-libs/fnlib-0.5
 	=media-libs/freetype-1.3.1-r2
 	>=gnome-base/libghttp-1.0.7"
 
-src_unpack() {
-  unpack ${A}
-}
 
-src_compile() {                           
-  cd ${S}
+src_compile() {
+  
   try CFLAGS="\"${CFLAGS} -I/opt/gnome/include\"" LDFLAGS="-L/opt/gnome/lib" \
-	./configure --host=${CHOST} --prefix=/usr/X11R6 --with-catgets
+	./configure --host=${CHOST} --prefix=/usr/X11R6
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
   try make prefix=${D}/usr/X11R6 localedir=${D}/usr/X11R6/enlightenment/locale \
 	gnulocaledir=${D}/usr/X11R6/enlightenment/locale install
   insinto /etc/env.d
diff --git a/x11-wm/sawfish/sawfish-0.38.ebuild b/x11-wm/sawfish/sawfish-0.38.ebuild
index fc4c223e5d26..792df0bc534f 100644
--- a/x11-wm/sawfish/sawfish-0.38.ebuild
+++ b/x11-wm/sawfish/sawfish-0.38.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-0.38.ebuild,v 1.1 2001/04/15 21:45:13 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-0.38.ebuild,v 1.2 2001/06/06 16:55:51 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,13 +9,16 @@ DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 SRC_URI="ftp://sawmill.sourceforge.net/pub/sawmill/"${A}
 HOMEPAGE="http://sawmill.sourceforge.net/"
 DEPEND=">=dev-libs/rep-gtk-0.15-r1
+        >=dev-libs/librep-0.13.6
 	esd? ( >=media-sound/esound-0.2.22 )
         readline? ( >=sys-libs/readline-4.1 )
         nls? ( sys-devel/gettext )
-        >=media-libs/audiofile-0.2.1
-	>=media-libs/imlib-1.9.9
-	gnome? ( >=gnome-base/gnome-core-1.4.0
-		 >=gnome-base/libglade-0.16-r1 )"
+	gnome? ( >=gnome-base/gnome-core-1.4.0 )"
+DEPEND=">=dev-libs/rep-gtk-0.15-r1
+        >=dev-libs/librep-0.13.6
+        >=x11-libs/gtk+-1.2.10
+	esd? ( >=media-sound/esound-0.2.22 )
+	gnome? ( >=gnome-base/gnome-core-1.4.0 )"
 
 src_compile() {
 
@@ -43,7 +46,7 @@ src_compile() {
           myconf="${myconf} --disable-linguas"
         fi
 
- 	try ./configure --host=${CHOST} --prefix=/usr/X11R6 --infodir=/usr/X11R6/share/info --libexecdir=/usr/X11R6/lib --with-audiofile ${myconf}
+ 	try ./configure --host=${CHOST} --prefix=/usr/X11R6 --infodir=/usr/X11R6/info --libexecdir=/usr/X11R6/lib --with-audiofile ${myconf}
 
 	#pmake doesn't work, stick with make
 	try make