*** empty log message ***

author: Achim Gottinger <achim@gentoo.org> 2001-06-04 21:57:52 +0000
committer: Achim Gottinger <achim@gentoo.org> 2001-06-04 21:57:52 +0000
commit: eacf763410af084ceac6b6be5bb2dc0de092d40c (patch)
tree: 9dae403ac2aa9060f62e6fb9160e9116ec5923d3
parent: README contains basic installation instructions (diff)
download: historical-eacf763410af084ceac6b6be5bb2dc0de092d40c.tar.gz
historical-eacf763410af084ceac6b6be5bb2dc0de092d40c.tar.bz2
historical-eacf763410af084ceac6b6be5bb2dc0de092d40c.zip
31 files changed, 248 insertions, 135 deletions
diff --git a/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild b/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild
index d9ae846557a8..7457a5d6f30b 100644
--- a/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild
+++ b/app-arch/gnorpm/gnorpm-0.95.1-r1.ebuild
@@ -9,23 +9,22 @@ DESCRIPTION="A Gnome RPM Frontend"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-libs-1.2.4
+DEPEND="virtual/glibc nls? ( sys-devel/gettext )
+        >=gnome-base/gnome-libs-1.2.4 >=sys-libs/db-3.2.3h
 	>=gnome-base/libghttp-1.0.7
-	>=gnome-base/libxml-1.8.10
 	>=app-arch/rpm-3.0.5"
 
-src_unpack() {
-  unpack ${A}
-}
+DEPEND="virtual/glibc
+        >=gnome-base/gnome-libs-1.2.4 >=sys-libs/db-3.2.3h
+	>=gnome-base/libghttp-1.0.7
+	>=app-arch/rpm-3.0.5"
 
-src_compile() {                           
-  cd ${S}
+src_compile() {
   try ./configure --host=${CHOST} --prefix=/opt/gnome --disable-rpmfind
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
   try make prefix=${D}/opt/gnome install
 
   dodoc AUTHORS COPYING ChangeLog NEWS README TODO
diff --git a/app-crypt/seahorse/seahorse-0.5.0.ebuild b/app-crypt/seahorse/seahorse-0.5.0.ebuild
index 2121d1ecc31e..98d9a86efef1 100644
--- a/app-crypt/seahorse/seahorse-0.5.0.ebuild
+++ b/app-crypt/seahorse/seahorse-0.5.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-crypt/seahorse/seahorse-0.5.0.ebuild,v 1.2 2001/05/09 04:37:31 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.5.0.ebuild,v 1.3 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,18 +9,16 @@ DESCRIPTION="gnome front end to gnupg"
 SRC_URI="http://download.sourceforge.net/seahorse/${A}"
 HOMEPGAE="http://seahorse.sourceforge.net/"
 
-DEPEND=">=x11-libs/gtk+-1.2.10
+DEPEND="virtual/glibc virtual/x11
 	>=app-crypt/gnupg-1.0.4
 	>=gnome-base/gnome-libs-1.2"
 
 src_compile() {                           
-  cd ${S}
   try ./configure --host=${CHOST} --prefix=/opt/gnome
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
   try make prefix=${D}/opt/gnome install
   dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 
diff --git a/app-editors/gedit/gedit-0.9.6.ebuild b/app-editors/gedit/gedit-0.9.6.ebuild
index b69e7ead4afb..ba9fa4b3b354 100644
--- a/app-editors/gedit/gedit-0.9.6.ebuild
+++ b/app-editors/gedit/gedit-0.9.6.ebuild
@@ -11,8 +11,12 @@ HOMEPAGE="http://gedit.sourceforge.net/"
 
 DEPEND=">=gnome-base/libglade-0.15
 	>=gnome-base/gnome-print-0.25
+        >=gnome-base/gnome-vfs-1.0
         nls? ( sys-devel/gettext )"
 
+RDEPEND=">=gnome-base/libglade-0.15
+	>=gnome-base/gnome-print-0.25
+        >=gnome-base/gnome-vfs-1.0"
 
 
 src_compile() {
diff --git a/app-office/abiword/abiword-0.7.14.ebuild b/app-office/abiword/abiword-0.7.14.ebuild
index a343d450ed10..cfd64bd42a47 100644
--- a/app-office/abiword/abiword-0.7.14.ebuild
+++ b/app-office/abiword/abiword-0.7.14.ebuild
@@ -1,37 +1,54 @@
 # 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/abiword/abiword-0.7.14.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-0.7.14.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
-A="abi-${PV}.tar.gz abidistfiles-${PV}.tar.gz expat-${PV}.tar.gz
+A="abi-${PV}.tar.gz abidistfiles-${PV}.tar.gz expat-${PV}.tar.gz psiconv-${PV}.tar.gz
    unixfonts-${PV}.tar.gz wv-${PV}.tar.gz"
-S=${WORKDIR}/abi-${PV}
+S=${WORKDIR}/abi
 DESCRIPTION="Framework for creating database applications"
 SRC_URI="http://www.abisource.com/downloads/Version-${PV}/abi-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/abidistfiles-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/expat-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/expat-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/psiconv-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/unixfonts-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/wv-${PV}.tar.gz"
 
-	
+
 HOMEPAGE="http://www.gnome.org/gnome-office/abiword.shtml/"
 
 DEPEND="virtual/glibc
 	>=sys-devel/gcc-2.95.2
-	=media-libs/freetype-1.3.1-r2
+        =media-libs/freetype-1.3.1-r2
 	>=media-libs/libpng-1.0.7
 	>=x11-libs/gtk+-1.2.8
+        gnome? ( >=gnome-base/gnome-libs-1.2.10 >=gnome-base/libunicode-0.4
+                 >=gnome-base/bonobo-1.0.4 >=gnome-base/gal-0.8 )
+        spell? ( app-text/pspell-0.11.2 )
 	virtual/x11"
-	
 
-src_compile() {                           
-  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0
+
+  if [ "`use gnome`" ] ; then
+    myconf="ABI_OPT_GNOME=1 ABI_OPT_BONOBO=1 "
+  fi
+  if [ "`use spell`" ] ; then
+    myconf="$myconf ABI_OPT_PSPELL=1"
+  fi
+
+src_compile() {
+  if [ "`use spell`" ] ; then
+    cd ${S}/src/config
+    cp abi_defs.mk abi_defs.orig
+    sed -e "s:-lltdl::" abi_defs.orig >  abi_defs.mk
+  fi
+  cd ${S}
+  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER=\"$CFLAGS\"
+
 }
 
 src_install() {
-  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 install
+
+  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER=\"$CFLAGS\" install
   cp ${D}/opt/gnome/AbiSuite/bin/AbiWord AbiWord.orig
   sed -e "s:${D}::" AbiWord.orig > ${D}/opt/gnome/AbiSuite/bin/AbiWord
   cd ${D}/opt/gnome/bin
diff --git a/app-office/abiword/files/digest-abiword-0.7.14 b/app-office/abiword/files/digest-abiword-0.7.14
index ba15c3e10fdc..937aac2736cd 100644
--- a/app-office/abiword/files/digest-abiword-0.7.14
+++ b/app-office/abiword/files/digest-abiword-0.7.14
@@ -1,5 +1,6 @@
 MD5 60902c1142c6a2cc136cef2fcc2ff925 abi-0.7.14.tar.gz
 MD5 c6585585cd9b3a4832f97bd71fcb81df abidistfiles-0.7.14.tar.gz
 MD5 1007c612a4a5ff992e7e9a138d1bd8df expat-0.7.14.tar.gz
+MD5 5e4eaf05c9cb3da5e1cc97f7e34ef009 psiconv-0.7.14.tar.gz
 MD5 f8644723b7077a95736d6df24598aef4 unixfonts-0.7.14.tar.gz
 MD5 3a4b9b91a6620cbbc788e077b06cfb65 wv-0.7.14.tar.gz
diff --git a/app-office/gnofin/gnofin-0.8.4.ebuild b/app-office/gnofin/gnofin-0.8.4.ebuild
index bfbc4113e8c0..a0d1afd59109 100644
--- a/app-office/gnofin/gnofin-0.8.4.ebuild
+++ b/app-office/gnofin/gnofin-0.8.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/app-office/gnofin/gnofin-0.8.4.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnofin/gnofin-0.8.4.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -15,8 +15,8 @@ HOMEPAGE="http://gnofin.sourceforge.net"
 DEPEND=">=gnome-base/gnome-libs-1.2.4
 	>=gnome-base/libxml-1.8.10"
 
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
+src_compile() {
+  try ./configure --host=${CHOST} --prefix=/opt/gnome 
   try make
 }
 
diff --git a/app-office/gnucash/gnucash-1.4.12.ebuild b/app-office/gnucash/gnucash-1.4.12.ebuild
index ecfc5168f7ef..46708354b73c 100644
--- a/app-office/gnucash/gnucash-1.4.12.ebuild
+++ b/app-office/gnucash/gnucash-1.4.12.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.12.ebuild,v 1.1 2001/05/06 18:10:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnucash/gnucash-1.4.12.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -15,14 +15,17 @@ DEPEND=">=gnome-base/gnome-libs-1.2.4
 	>=dev-lang/swig-1.3_alpha4
 	>=dev-libs/slib-2.3.8
 	nls? ( sys-devel/gettext )"
+DEPEND=">=gnome-base/gnome-libs-1.2.4
+	>=gnome-base/libxml-1.8.10
+	>=dev-libs/slib-2.3.8"
 
 src_compile() {
 
     local myconf
     if [ -z "`use nls`" ] ; then
-        myconf="--disable-nls" 
+        myconf="--disable-nls"
     fi
-    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --mandir=/opt/gnome/share/man --host=${CHOST} $myconf
+    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --mandir=/opt/gnome/man --host=${CHOST} $myconf
     try make
 
 }
@@ -31,7 +34,7 @@ src_install () {
 
     try make DESTDIR=${D} install
     dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-        
+
 
 }
 
diff --git a/dev-lang/entity/entity-0.7.2.ebuild b/dev-lang/entity/entity-0.7.2.ebuild
index 8221f4d19416..abf263011107 100644
--- a/dev-lang/entity/entity-0.7.2.ebuild
+++ b/dev-lang/entity/entity-0.7.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 Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2.ebuild,v 1.3 2001/05/10 01:52:55 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/entity/entity-0.7.2.ebuild,v 1.4 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -16,23 +16,38 @@ DEPEND=">=media-libs/imlib-1.9.8.1
 	python? ( >=dev-lang/python-2.0 )
 	sdl? ( >=media-libs/libsdl-1.1.7 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	gnome? ( >=gnome-base/gnome-core-1.4 )"
-
+        opengl? ( >=x11-libs/gtkglarea-1.2.2 )
+	gnome? ( >=gnome-base/gnome-core-1.4.0.4 )"
 
+DEPEND=">=media-libs/imlib-1.9.8.1
+	>=dev-libs/libpcre-3.2
+	tcltk? ( >=dev-lang/tcl-tk-8.1.1 )
+	perl? ( >=sys-devel/perl-5.6 )
+	python? ( >=dev-lang/python-2.0 )
+	sdl? ( >=media-libs/libsdl-1.1.7 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+        opengl? ( >=x11-libs/gtkglarea-1.2.2 )
+	gnome? ( >=gnome-base/gnome-libs-1.2.4 )"
 src_compile() {
-    echo $USE
+
     local myconf
     if [ "`use tcltk`" ]
     then
         myconf="--enable-tcl=module --with-tcl=/usr/lib"
+    else
+        myconf="--enable-tcl=no"
     fi
     if [ "`use perl`" ]
     then
         myconf="$myconf --enable-perl=static"
+    else
+        myconf="$myconf --enable-perl=no"
     fi
     if [ "`use python`" ]
     then
 	myconf="$myconf --enable-python=static"
+    else
+        myconf="$myconf --enable-python=no"
     fi
     if [ "`use ssl`" ]
     then
@@ -44,9 +59,13 @@ src_compile() {
     fi
     if [ "`use gnome`" ]
     then
-	myconf="$myconf --enable-gnome"
+	myconf="$myconf --enable-gnome --enable-gdkimlib"
+    fi
+    if [ "`use opengl`" ]
+    then
+	myconf="$myconf --enable-gtkgl"
     fi
-    try DEBIAN_ENTITY_MAGIC=\"voodoo\" ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
+    try DEBIAN_ENTITY_MAGIC=\"voodoo\" CFLAGS=\"$CFLAGS -I/usr/X11R6/include\" ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \
 	--enable-exec-class=yes \
 	--enable-gtk=module \
 	--enable-c=module $myconf \
diff --git a/dev-libs/slib/slib-2.4.1.ebuild b/dev-libs/slib/slib-2.4.1.ebuild
index 1dbfe2dde43b..43c948337e39 100644
--- a/dev-libs/slib/slib-2.4.1.ebuild
+++ b/dev-libs/slib/slib-2.4.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/dev-libs/slib/slib-2.4.1.ebuild,v 1.1 2001/05/06 16:43:00 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/slib/slib-2.4.1.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
 P=slib2d1
 A=${P}.zip
@@ -13,12 +13,13 @@ HOMEPAGE="http://swissnet.ai.mit.edu/~jaffer/SLIB.html"
 DEPEND=">=app-arch/unzip-5.21
 	>=dev-util/guile-1.4
 	>=dev-libs/g-wrap-0.9.5"
-
+RDEPEND=">=dev-util/guile-1.4
+	>=dev-libs/g-wrap-0.9.5"
 src_install () {
 
     insinto /usr/share/guile/site/slib
     doins *.scm
-    dodoc ANNOUNCE ChangeLog FAQ README 
+    dodoc ANNOUNCE ChangeLog FAQ README
     doinfo slib.info
 }
 
diff --git a/dev-python/gnome-python/gnome-python-1.4.1.ebuild b/dev-python/gnome-python/gnome-python-1.4.1.ebuild
index 7bf43ed26f8a..6d9700e40c5b 100644
--- a/dev-python/gnome-python/gnome-python-1.4.1.ebuild
+++ b/dev-python/gnome-python/gnome-python-1.4.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/dev-python/gnome-python/gnome-python-1.4.1.ebuild,v 1.3 2001/06/04 06:41:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.1.ebuild,v 1.4 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,8 +9,8 @@ DESCRIPTION="gnome-python"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/latest/sources/"${A}
 HOMEPAGE="http://www.gnome.org"
 
-DEPEND=">=gnome-base/libglade-0.16
-	>=gnome-base/gnome-core-1.4.0
+DEPEND=">=gnome-base/gnome-core-1.4.0
+        opengl? ( >=x11-libs/gtkglarea-1.2.2 )
 	virtual/python"
 
 src_compile() {
diff --git a/dev-util/glade/glade-0.6.2.ebuild b/dev-util/glade/glade-0.6.2.ebuild
index 3070889cc8b3..1b4cefafaccf 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.2 2001/05/11 13:07:05 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.2.ebuild,v 1.3 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,30 +10,38 @@ 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-office/gnome-db-0.2.0 
-		 >=gnome-base/scrollkeeper-0.2 )"
+        	 >=gnome-base/scrollkeeper-0.2 )"
+ #gnome-db stuff disabled atm
+ #>=gnome-office/gnome-db-0.2.0
+
+src_compile() {
 
-src_compile() {                           
-  cd ${S}
   local myopts
   if [ -n "`use gnome`" ]
   then
     echo "Using Gnome"
-    myopts="--prefix=/opt/gnome --without-bonobo"
+    myopts="--prefix=/opt/gnome"
+
   else
     myopts="--prefix=/usr/X11R6 --disable-gnome"
   fi
+  if [ "`use bonobo`" ] ; then
+    myopts="$myopts --with-bonobo"
+  else
+    myopts="$myopts --without-bonobo"
+  fi
   try ./configure --host=${CHOST} ${myopts}
   # bonobo support does not work with 0.28 requires around 0.18
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
+
   local myopts
   if [ -n "`use gnome`" ]
-  then 
+  then
     try make prefix=${D}/opt/gnome install
   else
     try make prefix=${D}/usr/X11R6 install
diff --git a/gnome-apps/bug-buddy/bug-buddy-2.0.1.ebuild b/gnome-apps/bug-buddy/bug-buddy-2.0.1.ebuild
index 38e7ce84c53d..e1ace02fd6c0 100644
--- a/gnome-apps/bug-buddy/bug-buddy-2.0.1.ebuild
+++ b/gnome-apps/bug-buddy/bug-buddy-2.0.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/gnome-apps/bug-buddy/bug-buddy-2.0.1.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/bug-buddy/bug-buddy-2.0.1.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,16 +9,19 @@ DESCRIPTION="bug-buddy"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/libglade-0.15"
+DEPEND="virtual/glibc nls? ( sys-devel/gettext)
+        >=gnome-base/gnome-core"
 
-src_compile() {                           
-  cd ${S}
-  try ./configure --host=${CHOST} --prefix=/opt/gnome 
+src_compile() {
+  local myconf
+  if [ -z "`use nls`" ] ; then
+    myconf="--disbale-nls"
+  fi
+  try ./configure --host=${CHOST} --prefix=/opt/gnome  $myconf
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
   try make prefix=${D}/opt/gnome install
   dodoc AUTHORS COPYING* NEWS
   dodoc README* TODO
diff --git a/gnome-apps/gedit/gedit-0.9.6.ebuild b/gnome-apps/gedit/gedit-0.9.6.ebuild
index b69e7ead4afb..ba9fa4b3b354 100644
--- a/gnome-apps/gedit/gedit-0.9.6.ebuild
+++ b/gnome-apps/gedit/gedit-0.9.6.ebuild
@@ -11,8 +11,12 @@ HOMEPAGE="http://gedit.sourceforge.net/"
 
 DEPEND=">=gnome-base/libglade-0.15
 	>=gnome-base/gnome-print-0.25
+        >=gnome-base/gnome-vfs-1.0
         nls? ( sys-devel/gettext )"
 
+RDEPEND=">=gnome-base/libglade-0.15
+	>=gnome-base/gnome-print-0.25
+        >=gnome-base/gnome-vfs-1.0"
 
 
 src_compile() {
diff --git a/gnome-apps/glade/glade-0.6.2.ebuild b/gnome-apps/glade/glade-0.6.2.ebuild
index 0f580028cfa8..d8ce7c4f3ac2 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.2 2001/05/11 13:07:05 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/glade/glade-0.6.2.ebuild,v 1.3 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,30 +10,38 @@ 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-office/gnome-db-0.2.0 
-		 >=gnome-base/scrollkeeper-0.2 )"
+        	 >=gnome-base/scrollkeeper-0.2 )"
+ #gnome-db stuff disabled atm
+ #>=gnome-office/gnome-db-0.2.0
+
+src_compile() {
 
-src_compile() {                           
-  cd ${S}
   local myopts
   if [ -n "`use gnome`" ]
   then
     echo "Using Gnome"
-    myopts="--prefix=/opt/gnome --without-bonobo"
+    myopts="--prefix=/opt/gnome"
+
   else
     myopts="--prefix=/usr/X11R6 --disable-gnome"
   fi
+  if [ "`use bonobo`" ] ; then
+    myopts="$myopts --with-bonobo"
+  else
+    myopts="$myopts --without-bonobo"
+  fi
   try ./configure --host=${CHOST} ${myopts}
   # bonobo support does not work with 0.28 requires around 0.18
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
+
   local myopts
   if [ -n "`use gnome`" ]
-  then 
+  then
     try make prefix=${D}/opt/gnome install
   else
     try make prefix=${D}/usr/X11R6 install
diff --git a/gnome-apps/gnofin/gnofin-0.8.4.ebuild b/gnome-apps/gnofin/gnofin-0.8.4.ebuild
index be80449984a0..d415bc907616 100644
--- a/gnome-apps/gnofin/gnofin-0.8.4.ebuild
+++ b/gnome-apps/gnofin/gnofin-0.8.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/gnome-apps/gnofin/gnofin-0.8.4.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/gnofin/gnofin-0.8.4.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -15,8 +15,8 @@ HOMEPAGE="http://gnofin.sourceforge.net"
 DEPEND=">=gnome-base/gnome-libs-1.2.4
 	>=gnome-base/libxml-1.8.10"
 
-src_compile() {                           
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
+src_compile() {
+  try ./configure --host=${CHOST} --prefix=/opt/gnome 
   try make
 }
 
diff --git a/gnome-apps/gnome-games/gnome-games-1.4.0.1.ebuild b/gnome-apps/gnome-games/gnome-games-1.4.0.1.ebuild
index c6d637d8f08b..c1bc85f18f49 100644
--- a/gnome-apps/gnome-games/gnome-games-1.4.0.1.ebuild
+++ b/gnome-apps/gnome-games/gnome-games-1.4.0.1.ebuild
@@ -9,9 +9,11 @@ DESCRIPTION="gnome-utils"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/"${A}
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-core-1.2.4
-        >=sys-libs/ncurses-5.2
-        nls? ( sys-devel/gettext )"
+DEPEND=">=gnome-base/gnome-core-1.4.0.4
+        >=dev-util/guile-1.4
+        nls? ( sys-devel/gettext )
+        >=gnome-base/scrollkeeper-0.2"
+RDEPEND=">=gnome-base/gnome-core-1.4.0.4 >=dev-util/guile-1.4"
 
 src_compile() {
   local myconf
diff --git a/gnome-apps/gnome-media/gnome-media-1.2.2.ebuild b/gnome-apps/gnome-media/gnome-media-1.2.2.ebuild
index 9ad084cbdb23..cb867024a4c3 100644
--- a/gnome-apps/gnome-media/gnome-media-1.2.2.ebuild
+++ b/gnome-apps/gnome-media/gnome-media-1.2.2.ebuild
@@ -9,9 +9,12 @@ DESCRIPTION="gnome-media"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-media/"${A}
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-core-1.2.4
+DEPEND=">=gnome-base/gnome-libs-1.2.4
+        >=gnome-base/scrollkeeper-0.2
         nls? ( sys-devel/gettext )"
 
+RDEPEND=">=gnome-base/gnome-libs-1.2.4"
+
 src_compile() {                           
   local myconf
   if [ -z "`use nls`" ] ; then
diff --git a/gnome-apps/gnorpm/gnorpm-0.95.1-r1.ebuild b/gnome-apps/gnorpm/gnorpm-0.95.1-r1.ebuild
index d9ae846557a8..7457a5d6f30b 100644
--- a/gnome-apps/gnorpm/gnorpm-0.95.1-r1.ebuild
+++ b/gnome-apps/gnorpm/gnorpm-0.95.1-r1.ebuild
@@ -9,23 +9,22 @@ DESCRIPTION="A Gnome RPM Frontend"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-libs-1.2.4
+DEPEND="virtual/glibc nls? ( sys-devel/gettext )
+        >=gnome-base/gnome-libs-1.2.4 >=sys-libs/db-3.2.3h
 	>=gnome-base/libghttp-1.0.7
-	>=gnome-base/libxml-1.8.10
 	>=app-arch/rpm-3.0.5"
 
-src_unpack() {
-  unpack ${A}
-}
+DEPEND="virtual/glibc
+        >=gnome-base/gnome-libs-1.2.4 >=sys-libs/db-3.2.3h
+	>=gnome-base/libghttp-1.0.7
+	>=app-arch/rpm-3.0.5"
 
-src_compile() {                           
-  cd ${S}
+src_compile() {
   try ./configure --host=${CHOST} --prefix=/opt/gnome --disable-rpmfind
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
   try make prefix=${D}/opt/gnome install
 
   dodoc AUTHORS COPYING ChangeLog NEWS README TODO
diff --git a/gnome-apps/gnucash/gnucash-1.4.12.ebuild b/gnome-apps/gnucash/gnucash-1.4.12.ebuild
index 5e49d950e054..637f2f00f5d9 100644
--- a/gnome-apps/gnucash/gnucash-1.4.12.ebuild
+++ b/gnome-apps/gnucash/gnucash-1.4.12.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.12.ebuild,v 1.1 2001/05/06 18:10:12 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/gnucash/gnucash-1.4.12.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -15,14 +15,17 @@ DEPEND=">=gnome-base/gnome-libs-1.2.4
 	>=dev-lang/swig-1.3_alpha4
 	>=dev-libs/slib-2.3.8
 	nls? ( sys-devel/gettext )"
+DEPEND=">=gnome-base/gnome-libs-1.2.4
+	>=gnome-base/libxml-1.8.10
+	>=dev-libs/slib-2.3.8"
 
 src_compile() {
 
     local myconf
     if [ -z "`use nls`" ] ; then
-        myconf="--disable-nls" 
+        myconf="--disable-nls"
     fi
-    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --mandir=/opt/gnome/share/man --host=${CHOST} $myconf
+    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --mandir=/opt/gnome/man --host=${CHOST} $myconf
     try make
 
 }
@@ -31,7 +34,7 @@ src_install () {
 
     try make DESTDIR=${D} install
     dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-        
+
 
 }
 
diff --git a/gnome-apps/seahorse/seahorse-0.5.0.ebuild b/gnome-apps/seahorse/seahorse-0.5.0.ebuild
index 0cc90c2275e2..3c42fbae68ae 100644
--- a/gnome-apps/seahorse/seahorse-0.5.0.ebuild
+++ b/gnome-apps/seahorse/seahorse-0.5.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/gnome-apps/seahorse/seahorse-0.5.0.ebuild,v 1.2 2001/05/09 04:37:31 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/seahorse/seahorse-0.5.0.ebuild,v 1.3 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,18 +9,16 @@ DESCRIPTION="gnome front end to gnupg"
 SRC_URI="http://download.sourceforge.net/seahorse/${A}"
 HOMEPGAE="http://seahorse.sourceforge.net/"
 
-DEPEND=">=x11-libs/gtk+-1.2.10
+DEPEND="virtual/glibc virtual/x11
 	>=app-crypt/gnupg-1.0.4
 	>=gnome-base/gnome-libs-1.2"
 
 src_compile() {                           
-  cd ${S}
   try ./configure --host=${CHOST} --prefix=/opt/gnome
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
   try make prefix=${D}/opt/gnome install
   dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 
diff --git a/gnome-base/gnome-applets/gnome-applets-1.4.0.1.ebuild b/gnome-base/gnome-applets/gnome-applets-1.4.0.1.ebuild
index 529c042e15ab..7038f8e29288 100644
--- a/gnome-base/gnome-applets/gnome-applets-1.4.0.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-1.4.0.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/gnome-base/gnome-applets/gnome-applets-1.4.0.1.ebuild,v 1.1 2001/04/15 21:45:13 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-1.4.0.1.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -14,7 +14,12 @@ DEPEND="nls? ( sys-devel/gettext )
         >=gnome-base/gnome-core-1.4
 	>=gnome-base/libgtop-1.0.12
 	>=gnome-base/libghttp-1.0.9
-        >=gnome-base/scrollkeeper-0.2"
+        >=gnome-base/scrollkeeper-0.2
+        >=dev-util/xml-i18n-tools-0.8.4"
+
+RDEPEND=">=gnome-base/gnome-core-1.4
+	>=gnome-base/libgtop-1.0.12
+	>=gnome-base/libghttp-1.0.9"
 
 src_compile() {
 
diff --git a/gnome-base/gnome-core/gnome-core-1.4.0.4.ebuild b/gnome-base/gnome-core/gnome-core-1.4.0.4.ebuild
index 563eb76aafca..e060f436d45e 100644
--- a/gnome-base/gnome-core/gnome-core-1.4.0.4.ebuild
+++ b/gnome-base/gnome-core/gnome-core-1.4.0.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/gnome-base/gnome-core/gnome-core-1.4.0.4.ebuild,v 1.2 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core/gnome-core-1.4.0.4.ebuild,v 1.3 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,16 +10,13 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}
          ftp://gnome.eazel.com/pub/gnome/unstable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-RDEPEND=">=gnome-base/control-center-1.2.4
-	>=gnome-base/glibwww-0.2-r1
-        >=gnome-base/libghttp-1.0.9
-	>=gnome-base/libglade-0.16-r1
-	>=gnome-base/scrollkeeper-0.2"
+RDEPEND=">=gnome-base/control-center-1.2.4 >=gnome-base/libglade-0.16-r1"
 
 #gtkhtml? ( >=gnome-base/gtkhtml-0.7 )
 DEPEND="${RDEPEND}
         nls? ( sys-devel/gettext )
         >=sys-apps/tcp-wrappers-7.6
+        >=gnome-base/scrollkeeper-0.2
 	>=dev-util/xml-i18n-tools-0.8.4"
 
 
diff --git a/gnome-base/librsvg/librsvg-1.0.0.ebuild b/gnome-base/librsvg/librsvg-1.0.0.ebuild
index cf8612056fcb..702a50455859 100644
--- a/gnome-base/librsvg/librsvg-1.0.0.ebuild
+++ b/gnome-base/librsvg/librsvg-1.0.0.ebuild
@@ -12,7 +12,10 @@ HOMEPAGE="http://www.gnome.org/"
 DEPEND=">=gnome-base/gnome-libs-1.2.10
 	>=media-libs/freetype-2.0.1
 	>=gnome-base/libxml-1.8
-	>=gnome-base/gdk-pixbuf-0.10"
+	>=gnome-base/gdk-pixbuf-0.10
+        >=app-arch/rpm-3.0.6"
+RDEPEND="virtual/glibc"
+
 
 src_compile() {                           
   try ./configure --host=${CHOST} --prefix=/opt/gnome \
@@ -20,7 +23,7 @@ src_compile() {
   try make
 }
 
-src_install() {                               
+src_install() {
   try make DESTDIR=${D} install
   dodoc AUTHORS COPYING ChangeLog NEWS README*
 }
diff --git a/gnome-extra/bug-buddy/bug-buddy-2.0.1.ebuild b/gnome-extra/bug-buddy/bug-buddy-2.0.1.ebuild
index f177d659acfc..10e55af57218 100644
--- a/gnome-extra/bug-buddy/bug-buddy-2.0.1.ebuild
+++ b/gnome-extra/bug-buddy/bug-buddy-2.0.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/gnome-extra/bug-buddy/bug-buddy-2.0.1.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/bug-buddy/bug-buddy-2.0.1.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,16 +9,19 @@ DESCRIPTION="bug-buddy"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/libglade-0.15"
+DEPEND="virtual/glibc nls? ( sys-devel/gettext)
+        >=gnome-base/gnome-core"
 
-src_compile() {                           
-  cd ${S}
-  try ./configure --host=${CHOST} --prefix=/opt/gnome 
+src_compile() {
+  local myconf
+  if [ -z "`use nls`" ] ; then
+    myconf="--disbale-nls"
+  fi
+  try ./configure --host=${CHOST} --prefix=/opt/gnome  $myconf
   try make
 }
 
-src_install() {                               
-  cd ${S}
+src_install() {
   try make prefix=${D}/opt/gnome install
   dodoc AUTHORS COPYING* NEWS
   dodoc README* TODO
diff --git a/gnome-extra/gnome-games/gnome-games-1.4.0.1.ebuild b/gnome-extra/gnome-games/gnome-games-1.4.0.1.ebuild
index c6d637d8f08b..c1bc85f18f49 100644
--- a/gnome-extra/gnome-games/gnome-games-1.4.0.1.ebuild
+++ b/gnome-extra/gnome-games/gnome-games-1.4.0.1.ebuild
@@ -9,9 +9,11 @@ DESCRIPTION="gnome-utils"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/"${A}
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-core-1.2.4
-        >=sys-libs/ncurses-5.2
-        nls? ( sys-devel/gettext )"
+DEPEND=">=gnome-base/gnome-core-1.4.0.4
+        >=dev-util/guile-1.4
+        nls? ( sys-devel/gettext )
+        >=gnome-base/scrollkeeper-0.2"
+RDEPEND=">=gnome-base/gnome-core-1.4.0.4 >=dev-util/guile-1.4"
 
 src_compile() {
   local myconf
diff --git a/gnome-extra/gnome-media/gnome-media-1.2.2.ebuild b/gnome-extra/gnome-media/gnome-media-1.2.2.ebuild
index 9ad084cbdb23..cb867024a4c3 100644
--- a/gnome-extra/gnome-media/gnome-media-1.2.2.ebuild
+++ b/gnome-extra/gnome-media/gnome-media-1.2.2.ebuild
@@ -9,9 +9,12 @@ DESCRIPTION="gnome-media"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-media/"${A}
 HOMEPAGE="http://www.gnome.org/"
 
-DEPEND=">=gnome-base/gnome-core-1.2.4
+DEPEND=">=gnome-base/gnome-libs-1.2.4
+        >=gnome-base/scrollkeeper-0.2
         nls? ( sys-devel/gettext )"
 
+RDEPEND=">=gnome-base/gnome-libs-1.2.4"
+
 src_compile() {                           
   local myconf
   if [ -z "`use nls`" ] ; then
diff --git a/gnome-libs/ammonite/ammonite-1.0.2.ebuild b/gnome-libs/ammonite/ammonite-1.0.2.ebuild
index 742d1169c6ea..7ebcd859c1e1 100644
--- a/gnome-libs/ammonite/ammonite-1.0.2.ebuild
+++ b/gnome-libs/ammonite/ammonite-1.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/gnome-libs/ammonite/ammonite-1.0.2.ebuild,v 1.1 2001/05/10 01:50:35 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-libs/ammonite/ammonite-1.0.2.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -14,6 +14,11 @@ HOMEPAGE="http://www.gnome.org/"
 DEPEND="nls? ( sys-devel/gettext )
         >=gnome-base/gnome-libs-1.2.12
         >=gnome-base/gconf-0.50
+        >=dev-libs/openssl-0.9.6
+        >=dev-libs/xml-i18n-tools-0.8.4"
+
+DEPEND=">=gnome-base/gnome-libs-1.2.12
+        >=gnome-base/gconf-0.50
         >=dev-libs/openssl-0.9.6"
 
 src_unpack() {
diff --git a/gnome-libs/librsvg/librsvg-1.0.0.ebuild b/gnome-libs/librsvg/librsvg-1.0.0.ebuild
index cf8612056fcb..702a50455859 100644
--- a/gnome-libs/librsvg/librsvg-1.0.0.ebuild
+++ b/gnome-libs/librsvg/librsvg-1.0.0.ebuild
@@ -12,7 +12,10 @@ HOMEPAGE="http://www.gnome.org/"
 DEPEND=">=gnome-base/gnome-libs-1.2.10
 	>=media-libs/freetype-2.0.1
 	>=gnome-base/libxml-1.8
-	>=gnome-base/gdk-pixbuf-0.10"
+	>=gnome-base/gdk-pixbuf-0.10
+        >=app-arch/rpm-3.0.6"
+RDEPEND="virtual/glibc"
+
 
 src_compile() {                           
   try ./configure --host=${CHOST} --prefix=/opt/gnome \
@@ -20,7 +23,7 @@ src_compile() {
   try make
 }
 
-src_install() {                               
+src_install() {
   try make DESTDIR=${D} install
   dodoc AUTHORS COPYING ChangeLog NEWS README*
 }
diff --git a/gnome-office/abiword/abiword-0.7.14.ebuild b/gnome-office/abiword/abiword-0.7.14.ebuild
index 8bf83b0f792f..a8285c3f972c 100644
--- a/gnome-office/abiword/abiword-0.7.14.ebuild
+++ b/gnome-office/abiword/abiword-0.7.14.ebuild
@@ -1,37 +1,54 @@
 # 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/abiword/abiword-0.7.14.ebuild,v 1.1 2001/06/04 10:34:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/abiword/abiword-0.7.14.ebuild,v 1.2 2001/06/04 21:57:52 achim Exp $
 
-A="abi-${PV}.tar.gz abidistfiles-${PV}.tar.gz expat-${PV}.tar.gz
+A="abi-${PV}.tar.gz abidistfiles-${PV}.tar.gz expat-${PV}.tar.gz psiconv-${PV}.tar.gz
    unixfonts-${PV}.tar.gz wv-${PV}.tar.gz"
-S=${WORKDIR}/abi-${PV}
+S=${WORKDIR}/abi
 DESCRIPTION="Framework for creating database applications"
 SRC_URI="http://www.abisource.com/downloads/Version-${PV}/abi-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/abidistfiles-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/expat-${PV}.tar.gz
-	 http://www.abisource.com/downloads/Version-${PV}/expat-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/psiconv-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/unixfonts-${PV}.tar.gz
 	 http://www.abisource.com/downloads/Version-${PV}/wv-${PV}.tar.gz"
 
-	
+
 HOMEPAGE="http://www.gnome.org/gnome-office/abiword.shtml/"
 
 DEPEND="virtual/glibc
 	>=sys-devel/gcc-2.95.2
-	=media-libs/freetype-1.3.1-r2
+        =media-libs/freetype-1.3.1-r2
 	>=media-libs/libpng-1.0.7
 	>=x11-libs/gtk+-1.2.8
+        gnome? ( >=gnome-base/gnome-libs-1.2.10 >=gnome-base/libunicode-0.4
+                 >=gnome-base/bonobo-1.0.4 >=gnome-base/gal-0.8 )
+        spell? ( app-text/pspell-0.11.2 )
 	virtual/x11"
-	
 
-src_compile() {                           
-  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0
+
+  if [ "`use gnome`" ] ; then
+    myconf="ABI_OPT_GNOME=1 ABI_OPT_BONOBO=1 "
+  fi
+  if [ "`use spell`" ] ; then
+    myconf="$myconf ABI_OPT_PSPELL=1"
+  fi
+
+src_compile() {
+  if [ "`use spell`" ] ; then
+    cd ${S}/src/config
+    cp abi_defs.mk abi_defs.orig
+    sed -e "s:-lltdl::" abi_defs.orig >  abi_defs.mk
+  fi
+  cd ${S}
+  try make prefix=/opt/gnome/ UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER=\"$CFLAGS\"
+
 }
 
 src_install() {
-  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 install
+
+  try make prefix=${D}/opt/gnome  UNIX_CAN_BUILD_STATIC=0 $myconf OPTIMIZER=\"$CFLAGS\" install
   cp ${D}/opt/gnome/AbiSuite/bin/AbiWord AbiWord.orig
   sed -e "s:${D}::" AbiWord.orig > ${D}/opt/gnome/AbiSuite/bin/AbiWord
   cd ${D}/opt/gnome/bin
diff --git a/gnome-office/abiword/files/digest-abiword-0.7.14 b/gnome-office/abiword/files/digest-abiword-0.7.14
index ba15c3e10fdc..937aac2736cd 100644
--- a/gnome-office/abiword/files/digest-abiword-0.7.14
+++ b/gnome-office/abiword/files/digest-abiword-0.7.14
@@ -1,5 +1,6 @@
 MD5 60902c1142c6a2cc136cef2fcc2ff925 abi-0.7.14.tar.gz
 MD5 c6585585cd9b3a4832f97bd71fcb81df abidistfiles-0.7.14.tar.gz
 MD5 1007c612a4a5ff992e7e9a138d1bd8df expat-0.7.14.tar.gz
+MD5 5e4eaf05c9cb3da5e1cc97f7e34ef009 psiconv-0.7.14.tar.gz
 MD5 f8644723b7077a95736d6df24598aef4 unixfonts-0.7.14.tar.gz
 MD5 3a4b9b91a6620cbbc788e077b06cfb65 wv-0.7.14.tar.gz
diff --git a/net-im/gtk+licq/gtk+licq-0.50.1.ebuild b/net-im/gtk+licq/gtk+licq-0.50.1.ebuild
index 40f7b9815d7b..1c4019c410f6 100644
--- a/net-im/gtk+licq/gtk+licq-0.50.1.ebuild
+++ b/net-im/gtk+licq/gtk+licq-0.50.1.ebuild
@@ -7,16 +7,17 @@ DESCRIPTION="gtk+licq"
 SRC_URI="http://gtk.licq.org/download/${A}"
 HOMEPAGE="http://gtk.licq.org"
 
-DEPEND="virtual/glibc sys-devel/perl
-        >=net-im/licq-1.0.2
-	>=x11-libs/gtk+-1.2.0"
+DEPEND="virtual/glibc sys-devel/perl nls? ( sys-devel/gettext )
+        >=net-im/licq-1.0.2 gnome? ( >=gnome-base/gnome-core-1.4.0.4 )
+	>=x11-libs/gtk+-1.2.0
+        spell? ( >=app-text/pspell-0.11.2 )"
 
 RDEPEND="virtual/glibc >=net-im/licq-1.0.2
-	>=x11-libs/gtk+-1.2.0
-        gnome? ( gnome-base/gnome-core )"
+	>=x11-libs/gtk+-1.2.0 gnome? ( >=gnome-base/gnome-core-1.4.0.4 )
+        spell? ( >=app-text/pspell-0.11.2 )"
 
 
-src_compile() {                           
+src_compile() {
   local myconf
   local myprefix
   myprefix="/opt/gnome"
@@ -25,6 +26,9 @@ src_compile() {
     myconf="--disable-gnome"
     myprefix="/usr/X11R6"
   fi
+  if [ -z "`use spell`" ] ; then
+    myconf="$myconf --disable-pspell"
+  fi
   if [ -z "`use nls`" ]
   then
     myconf="${myconf} --disable-nls"
@@ -36,8 +40,8 @@ src_compile() {
 
 src_install() {
   local myprefix
-  myprefix="opt/gnome" 
-  if [ -z "`use gnome`"]
+  myprefix="opt/gnome"
+  if [ -z "`use gnome`" ]
   then
     myprefix="usr/X11R6"
   fi
author	Achim Gottinger <achim@gentoo.org>	2001-06-04 21:57:52 +0000
committer	Achim Gottinger <achim@gentoo.org>	2001-06-04 21:57:52 +0000
commit	eacf763410af084ceac6b6be5bb2dc0de092d40c (patch)
tree	9dae403ac2aa9060f62e6fb9160e9116ec5923d3
parent	README contains basic installation instructions (diff)
download	historical-eacf763410af084ceac6b6be5bb2dc0de092d40c.tar.gz historical-eacf763410af084ceac6b6be5bb2dc0de092d40c.tar.bz2 historical-eacf763410af084ceac6b6be5bb2dc0de092d40c.zip