libxml update

38 files changed, 48 insertions, 540 deletions

diff --git a/app-office/dia/dia-0.88.1.ebuild b/app-office/dia/dia-0.88.1.ebuild
index 94edfe55e1fc..04c4fc3c382e 100644
--- a/app-office/dia/dia-0.88.1.ebuild
+++ b/app-office/dia/dia-0.88.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-office/dia/dia-0.88.1.ebuild,v 1.6 2001/07/29 11:02:25 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.88.1.ebuild,v 1.7 2001/10/06 14:36:55 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,13 +9,13 @@ DESCRIPTION="Diagram Creation Program"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
 
-DEPEND=">=gnome-base/libxml-1.8.13 nls? ( sys-devel/gettext )
+DEPEND=">=dev-libs/libxml-1.8.13 nls? ( sys-devel/gettext )
         >=media-libs/gdk-pixbuf-0.11.0
         >=dev-libs/popt-1.5
 	bonobo? ( >=gnome-base/bonobo-1.0.4 )
 	python? ( dev-lang/python-2.0 )"
 
-RDEPEND=">=gnome-base/libxml-1.8.13
+RDEPEND=">=dev-libs/libxml-1.8.13
         >=media-libs/gdk-pixbuf-0.11.0
         >=dev-libs/popt-1.5
 	bonobo? ( >=gnome-base/bonobo-1.0.4 )"
diff --git a/app-office/gnumeric/gnumeric-0.70-r1.ebuild b/app-office/gnumeric/gnumeric-0.70-r1.ebuild
index 0b1ee0f7cfb6..94be7ef63206 100644
--- a/app-office/gnumeric/gnumeric-0.70-r1.ebuild
+++ b/app-office/gnumeric/gnumeric-0.70-r1.ebuild
@@ -2,7 +2,7 @@
 # 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/gnumeric/gnumeric-0.66.ebuild,v 1.1 2001/06/28 09:47:57 hallski Exp
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-0.70-r1.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-0.70-r1.ebuild,v 1.4 2001/10/06 14:36:55 azarah Exp $
 
 
 A=${P}.tar.gz
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 
 DEPEND=">=gnome-base/gnome-print-0.29
         >=gnome-base/gal-0.8.0
-        >=gnome-base/libxml-1.8.14
+        >=dev-libs/libxml-1.8.15
 	>=gnome-libs/libole2-0.2.3
         >=dev-util/xml-i18n-tools-0.8.4
         perl? ( >=sys-devel/perl-5 )
diff --git a/app-office/mrproject/files/digest-mrproject-0.3.1 b/app-office/mrproject/files/digest-mrproject-0.3.1
deleted file mode 100644
index f6f7f5bc93a3..000000000000
--- a/app-office/mrproject/files/digest-mrproject-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72fb2bfdf3f0c781e713cc8bbc3bf276 mrproject-0.3.1.tar.gz
diff --git a/app-office/mrproject/files/digest-mrproject-0.3.2 b/app-office/mrproject/files/digest-mrproject-0.3.2
deleted file mode 100644
index cf6fdb342b7a..000000000000
--- a/app-office/mrproject/files/digest-mrproject-0.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 86ec49153ebf5cc699f6335d627f6080 mrproject-0.3.2.tar.gz
diff --git a/app-office/mrproject/files/digest-mrproject-0.4.0 b/app-office/mrproject/files/digest-mrproject-0.4.0-r1
index 6363e2df2b11..6363e2df2b11 100644
--- a/app-office/mrproject/files/digest-mrproject-0.4.0
+++ b/app-office/mrproject/files/digest-mrproject-0.4.0-r1
diff --git a/app-office/mrproject/mrproject-0.3.1.ebuild b/app-office/mrproject/mrproject-0.3.1.ebuild
deleted file mode 100644
index b9464e92e2f0..000000000000
--- a/app-office/mrproject/mrproject-0.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.3.1.ebuild,v 1.2 2001/07/29 10:29:28 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Project management application for GNOME"
-SRC_URI="ftp://ftp.codefactory.se/pub/software/mrproject/source/${A}"
-HOMEPAGE="http://mrproject.codefactory.se/"
-
-DEPEND="nls? ( sys-devel/gettext )
-        >=gnome-base/gal-0.7
-	>=gnome-base/bonobo-1.0.0
-	>=dev-util/xml-i18n-tools-0.8.4
-	>=media-libs/gdk-pixbuf-0.8.0
-	>=gnome-base/libglade-0.14
-	>=gnome-base/libxml-1.8.10
-	>=gnome-base/gnome-vfs-1.0.0
-	>=gnome-base/oaf-0.6.5
-	>=gnome-base/gnome-print-0.25"
-
-src_compile() {
-    local myconf
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome --disable-more-warnings $myconf
-    try pmake
-
-}
-
-src_install () {
-
-#    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-
-}
-
-
-
-
-
diff --git a/app-office/mrproject/mrproject-0.3.2.ebuild b/app-office/mrproject/mrproject-0.3.2.ebuild
deleted file mode 100644
index 4e990409abab..000000000000
--- a/app-office/mrproject/mrproject-0.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.3.2.ebuild,v 1.2 2001/07/29 10:29:28 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Project management application for GNOME"
-SRC_URI="ftp://ftp.codefactory.se/pub/software/mrproject/source/${A}"
-HOMEPAGE="http://mrproject.codefactory.se/"
-
-DEPEND="nls? ( sys-devel/gettext )
-        >=gnome-base/gal-0.7
-	>=gnome-base/bonobo-1.0.0
-	>=dev-util/xml-i18n-tools-0.8.4
-	>=media-libs/gdk-pixbuf-0.8.0
-	>=gnome-base/libglade-0.14
-	>=gnome-base/libxml-1.8.10
-	>=gnome-base/gnome-vfs-1.0.0
-	>=gnome-base/oaf-0.6.5
-	>=gnome-base/gnome-print-0.25"
-
-src_compile() {
-    local myconf
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
-    try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome --disable-more-warnings $myconf
-    try pmake
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog README NEWS TODO
-
-}
-
-
-
-
-
diff --git a/app-office/mrproject/mrproject-0.4.0.ebuild b/app-office/mrproject/mrproject-0.4.0-r1.ebuild
index 7f38eafd4532..ae0db8166ff9 100644
--- a/app-office/mrproject/mrproject-0.4.0.ebuild
+++ b/app-office/mrproject/mrproject-0.4.0-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 Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.4.0.ebuild,v 1.2 2001/09/28 11:08:45 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mrproject/mrproject-0.4.0-r1.ebuild,v 1.1 2001/10/06 14:36:55 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,16 +9,16 @@ DESCRIPTION="Project management application for GNOME"
 SRC_URI="ftp://ftp.codefactory.se/pub/software/mrproject/source/${A}"
 HOMEPAGE="http://mrproject.codefactory.se/"
 
-RDEPEND=">=media-libs/gdk-pixbuf-0.8.0
-	 >=gnome-base/ORBit-0.5.7
-         >=gnome-base/gal-0.12
-	 >=gnome-base/bonobo-1.0.7
-	 >=gnome-base/libglade-0.14
-	 >=gnome-base/libxml-1.8.14
-	 >=gnome-base/gconf-1.0.4
-	 >=gnome-base/gnome-vfs-1.0.0
-	 >=gnome-base/oaf-0.6.5
-	 >=gnome-base/gnome-print-0.25"
+RDEPEND=">=media-libs/gdk-pixbuf-0.11.0-r1
+	 >=gnome-base/ORBit-0.5.10-r1
+         >=gnome-base/gal-0.13-r1
+	 >=gnome-base/bonobo-1.0.9-r1
+	 >=gnome-base/libglade-0.17-r1
+	 >=dev-libs/libxml-1.8.15
+	 >=gnome-base/gconf-1.0.4-r1
+	 >=gnome-base/gnome-vfs-1.0.2-r1
+	 >=gnome-base/oaf-0.6.6-r1
+	 >=gnome-base/gnome-print-0.30"
 
 
 DEPEND="${RDEPEND}
@@ -31,8 +31,8 @@ src_compile() {
     if [ -z "`use nls`" ] ; then
       myconf="--disable-nls"
     fi
-    try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--sysconfdir=/etc/opt/gnome --disable-more-warnings \
+    try ./configure --host=${CHOST} --prefix=/usr \
+	--sysconfdir=/etc/gnome --disable-more-warnings \
 	--without-python $myconf
     try pmake
 
diff --git a/dev-lang/php/files/digest-php-4.0.5 b/dev-lang/php/files/digest-php-4.0.5
deleted file mode 100644
index 84b7f9739a68..000000000000
--- a/dev-lang/php/files/digest-php-4.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 763739f64eeac7099035fd86c1d39ad2 php-4.0.5.tar.gz
diff --git a/dev-lang/php/files/digest-php-4.0.6-r1 b/dev-lang/php/files/digest-php-4.0.6-r1
deleted file mode 100644
index b0cf774d4f6c..000000000000
--- a/dev-lang/php/files/digest-php-4.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5f698521cf2b392cf9bfa87fc1a0fe90 php-4.0.6.tar.gz
diff --git a/dev-lang/php/files/digest-php-4.0.6 b/dev-lang/php/files/digest-php-4.0.6-r2
index b0cf774d4f6c..b0cf774d4f6c 100644
--- a/dev-lang/php/files/digest-php-4.0.6
+++ b/dev-lang/php/files/digest-php-4.0.6-r2
diff --git a/dev-lang/php/php-4.0.5.ebuild b/dev-lang/php/php-4.0.5.ebuild
deleted file mode 100644
index 8d5d7d2c26f0..000000000000
--- a/dev-lang/php/php-4.0.5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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-lang/php/php-4.0.5.ebuild,v 1.9 2001/08/31 21:01:32 g2boojum Exp $
-
-A=${PN}-4.0.5.tar.gz
-S=${WORKDIR}/${PN}-4.0.5
-DESCRIPTION="HTML embedded scripting language"
-SRC_URI="http://www.php.net/distributions/${A}"
-HOMEPAGE="http://www.php.net/"
-
-DEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
-        >=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.0.7
-        >=media-libs/libgd-1.8.3
-	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	gettext? ( sys-devel/gettext )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( >=x11-libs/qt-x11-2.3.0 )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imap )"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
- 	>=media-libs/libpng-1.0.7
- 	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( >=x11-libs/qt-x11-2.3.0 )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imap )"
-
-src_compile() {
-
-    local myconf
-    if [ "`use readline`" ] ; then
-      myconf="--with-readline"
-    fi
-    if [ "`use pam`" ] ; then
-      myconf="$myconf --with-pam"
-    fi
-    if [ "`use gettext`" ] ; then
-      myconf="$myconf --with-gettext"
-    fi
-    if [ "`use gdbm`" ] ; then
-      myconf="$myconf --with-gdbm=/usr"
-    fi
-    if [ "`use berkdb`" ] ; then
-      myconf="$myconf --with-db3=/usr"
-    fi
-    if [ "`use mysql`" ] ; then
-      myconf="$myconf --with-mysql=/usr"
-    fi
-    if [ "`use postgres`" ] ; then
-      myconf="$myconf --with-pgsql=/usr"
-    fi
-    if [ "`use odbc`" ] ; then
-      myconf="$myconf --with-unixODBC=/usr"
-    fi
-    if [ "`use ldap`" ] ; then
-      myconf="$myconf --with-ldap" 
-    fi
-    if [ "`use qt`" ] ; then
-      myconf="$myconf --with-qtdom" 
-    fi
-    if [ "`use imap`" ] ; then
-      myconf="$myconf --with-imap" 
-    fi
-    if [ "`use libwww`" ] ; then
-      myconf="$myconf --with-xml" 
-    else
-      myconf="$myconf --disable-xml"
-    fi
-    if [ "`use xml`" ] ; then
-      export LIBS="-lxmlparse -lxmltok"
-      myconf="$myconf --with-sablot=/usr"
-    fi
-
-    LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-    if [ "`use X`" ] ; then
-      myconf="$myconf --with-xpm-dir=/usr/X11R6"
-      LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-    fi
-    
-
-    
-    ./configure --enable-safe-mode --enable-ftp --enable-track-vars --with-gmp \
-	--enable-dbase --enable-sysvsem --enable-sysvshm --with-zlib=yes --enable-bcmath \
-	--enable-calendar --enable-versioning --enable-inline-optimization --enable-trans-sid \
-	--with-gd --with-ttf --with-t1lib --with-jpeg-dir=/usr/lib \
-	--with-config-file-path=`/usr/sbin/apxs -q SYSCONFDIR` --host=${CHOST} \
-	--with-apxs="/usr/sbin/apxs -ltiff" --with-exec-dir="/usr/lib/apache/bin" $myconf
-    try make
-}
-
-
-src_install() {                 
-  cd ${S}
-  dodir /usr/lib/apache
-  cp .libs/libphp4.so ${D}/usr/lib/apache
-  dodir /etc/httpd
-  cp php.ini-dist ${D}/etc/httpd/php.ini
-  into /usr
-  dodoc CODING_STANDARDS FUNCTION_LIST.txt LICENSE
-  dodoc README.* TODO NEWS
-}
-
-pkg_config() {
-
-  . ${ROOT}/etc/rc.d/config/functions
-
-  if [ -f "${ROOT}/etc/httpd/httpd.conf" ]
-  then
-
-    # Activate PHP-Extension in httpd.conf
-    echo "Activate PHP in httpd.conf..."
-    cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig
-    sed -e "s/^#LoadModule php4_module/LoadModule php4_module/" \
-      -e "s/^#AddModule mod_php4.c/AddModule mod_php4.c/" \
-      -e "s/#AddType application\/x-httpd-php /AddType application\/x-httpd-php /" \
-      -e "s/#AddType application\/x-httpd-php-/AddType application\/x-httpd-php-/" \
-	${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf
-
-  fi
-}
-
-
-
diff --git a/dev-lang/php/php-4.0.6-r1.ebuild b/dev-lang/php/php-4.0.6-r2.ebuild
index 2c89e67000ba..a4606eb4b16c 100644
--- a/dev-lang/php/php-4.0.6-r1.ebuild
+++ b/dev-lang/php/php-4.0.6-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/dev-lang/php/php-4.0.6-r1.ebuild,v 1.5 2001/08/31 21:01:32 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.0.6-r2.ebuild,v 1.1 2001/10/06 14:36:55 azarah Exp $
 
 A=${PN}-4.0.6.tar.gz
 S=${WORKDIR}/${PN}-4.0.6
@@ -34,7 +34,7 @@ DEPEND="virtual/glibc
 	libwww? ( >=net-libs/libwww-5.3.2 )
 	imap? ( virtual/imap )
 	flash? ( media-libs/libswf media-libs/ming )
-	xml2? ( gnome-libs/libxml2 )"
+	xml2? ( dev-libs/libxml2 )"
 
 RDEPEND="virtual/glibc
 	>=dev-libs/gmp-3.1.1
diff --git a/dev-lang/php/php-4.0.6.ebuild b/dev-lang/php/php-4.0.6.ebuild
deleted file mode 100644
index ab2cf9918c6d..000000000000
--- a/dev-lang/php/php-4.0.6.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# 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-lang/php/php-4.0.6.ebuild,v 1.3 2001/08/31 21:01:32 g2boojum Exp $
-
-A=${PN}-4.0.6.tar.gz
-S=${WORKDIR}/${PN}-4.0.6
-DESCRIPTION="HTML embedded scripting language"
-SRC_URI="http://www.php.net/distributions/${A}"
-HOMEPAGE="http://www.php.net/"
-
-DEPEND="virtual/glibc
-
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
-        >=media-libs/tiff-3.5.5
-	>=media-libs/libpng-1.0.7
-        >=media-libs/libgd-1.8.3
-	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 )
-	gettext? ( sys-devel/gettext )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( >=x11-libs/qt-x11-2.3.0 )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imap )"
-
-RDEPEND="virtual/glibc
-	>=dev-libs/gmp-3.1.1
-	~media-libs/freetype-1.3.1
-	>=media-libs/jpeg-6b
- 	>=media-libs/libpng-1.0.7
- 	>=media-libs/t1lib-1.0.1
-	>=net-www/apache-1.3
-	pam? ( >=sys-libs/pam-0.75 )
-	gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	berkdb? ( >=sys-libs/db-3 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	odbc? ( >=dev-db/unixODBC-1.8.13 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	X? ( virtual/x11 )
-	qt? ( >=x11-libs/qt-x11-2.3.0 )
-	xml? ( >=app-text/sablotron-0.44 )
-	libwww? ( >=net-libs/libwww-5.3.2 )
-	imap? ( virtual/imap )"
-
-src_compile() {
-
-    local myconf
-    if [ "`use readline`" ] ; then
-      myconf="--with-readline"
-    fi
-    if [ "`use pam`" ] ; then
-      myconf="$myconf --with-pam"
-    fi
-    if [ "`use gettext`" ] ; then
-      myconf="$myconf --with-gettext"
-    fi
-    if [ "`use gdbm`" ] ; then
-      myconf="$myconf --with-gdbm=/usr"
-    fi
-    if [ "`use berkdb`" ] ; then
-      myconf="$myconf --with-db3=/usr"
-    fi
-    if [ "`use mysql`" ] ; then
-      myconf="$myconf --with-mysql=/usr"
-    fi
-    if [ "`use postgres`" ] ; then
-      myconf="$myconf --with-pgsql=/usr"
-    fi
-    if [ "`use odbc`" ] ; then
-      myconf="$myconf --with-unixODBC=/usr"
-    fi
-    if [ "`use ldap`" ] ; then
-      myconf="$myconf --with-ldap" 
-    fi
-    if [ "`use qt`" ] ; then
-      myconf="$myconf --with-qtdom" 
-    fi
-    if [ "`use imap`" ] ; then
-      myconf="$myconf --with-imap" 
-    fi
-    if [ "`use libwww`" ] ; then
-      myconf="$myconf --with-xml" 
-    else
-      myconf="$myconf --disable-xml"
-    fi
-    if [ "`use xml`" ] ; then
-      export LIBS="-lxmlparse -lxmltok"
-      myconf="$myconf --with-sablot=/usr"
-    fi
-
-    LDFLAGS="$LDFLAGS -ltiff -ljpeg"
-
-    if [ "`use X`" ] ; then
-      myconf="$myconf --with-xpm-dir=/usr/X11R6"
-      LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-    fi
-    
-
-    
-    ./configure --enable-safe-mode --enable-ftp --enable-track-vars --with-gmp \
-	--enable-dbase --enable-sysvsem --enable-sysvshm --with-zlib=yes --enable-bcmath \
-	--enable-calendar --enable-versioning --enable-inline-optimization --enable-trans-sid \
-	--with-gd --with-ttf --with-t1lib --with-jpeg-dir=/usr/lib \
-	--with-config-file-path=`/usr/sbin/apxs -q SYSCONFDIR` --host=${CHOST} \
-	--with-apxs="/usr/sbin/apxs -ltiff" --with-exec-dir="/usr/lib/apache/bin" $myconf
-    try make
-}
-
-
-src_install() {                 
-  cd ${S}
-  dodir /usr/lib/apache
-  cp .libs/libphp4.so ${D}/usr/lib/apache
-  dodir /etc/httpd
-  cp php.ini-dist ${D}/etc/httpd/php.ini
-  into /usr
-  dodoc CODING_STANDARDS LICENSE EXTENSIONS 
-  dodoc RELEASE_PROCESS README.* TODO NEWS
-  dodoc ChangeLog* *.txt
-}
-
-pkg_config() {
-
-  . ${ROOT}/etc/rc.d/config/functions
-
-  if [ -f "${ROOT}/etc/httpd/httpd.conf" ]
-  then
-
-    # Activate PHP-Extension in httpd.conf
-    echo "Activate PHP in httpd.conf..."
-    cp ${ROOT}/etc/httpd/httpd.conf ${ROOT}/etc/httpd/httpd.conf.orig
-    sed -e "s/^#LoadModule php4_module/LoadModule php4_module/" \
-      -e "s/^#AddModule mod_php4.c/AddModule mod_php4.c/" \
-      -e "s/#AddType application\/x-httpd-php /AddType application\/x-httpd-php /" \
-      -e "s/#AddType application\/x-httpd-php-/AddType application\/x-httpd-php-/" \
-	${ROOT}/etc/httpd/httpd.conf.orig > ${ROOT}/etc/httpd/httpd.conf
-
-  fi
-}
-
-
-
diff --git a/dev-perl/XML-LibXML/XML-LibXML-0.91.ebuild b/dev-perl/XML-LibXML/XML-LibXML-0.91-r1.ebuild
index 26c56f13bb26..1ad387ffab63 100644
--- a/dev-perl/XML-LibXML/XML-LibXML-0.91.ebuild
+++ b/dev-perl/XML-LibXML/XML-LibXML-0.91-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/dev-perl/XML-LibXML/XML-LibXML-0.91.ebuild,v 1.1 2001/06/04 06:41:14 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-0.91-r1.ebuild,v 1.1 2001/10/06 14:36:55 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ SRC_URI="http://cpan.valueclick.com/modules/by-category/11_String_Lang_Text_Proc
 HOMEPAGE="http://cpan.valueclick.com/modules/by-category/11_String_Lang_Text_Proc/XML/${P}.readme"
 
 DEPEND=">=sys-devel/perl-5
-	>=gnome-libs/libxml2-2.3.9"
+	>=dev-libs/libxml2-2.4.1"
 
 src_compile() {
 
diff --git a/dev-perl/XML-LibXML/files/digest-XML-LibXML-0.91 b/dev-perl/XML-LibXML/files/digest-XML-LibXML-0.91-r1
index 989480787de0..989480787de0 100644
--- a/dev-perl/XML-LibXML/files/digest-XML-LibXML-0.91
+++ b/dev-perl/XML-LibXML/files/digest-XML-LibXML-0.91-r1
diff --git a/incoming/powertweak-0.99.1.ebuild b/incoming/powertweak-0.99.1.ebuild
index 046025c52b70..722e45e4dda7 100644
--- a/incoming/powertweak-0.99.1.ebuild
+++ b/incoming/powertweak-0.99.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
 # /home/cvsroot/gentoo-x86/app-admin/powerteak/powertweak-0.99.1.ebuild
-# $Header: /var/cvsroot/gentoo-x86/incoming/powertweak-0.99.1.ebuild,v 1.4 2001/10/06 11:24:06 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/incoming/powertweak-0.99.1.ebuild,v 1.5 2001/10/06 14:36:55 azarah Exp $
 
 
 A=${P}.tar.bz2
@@ -12,7 +12,7 @@ SRC_URI="http://download.sourceforge.net/powertweak/${A}"
 HOMEPAGE="http://powertweak.sourceforge.net"
 
 DEPEND=">=x11-libs/gtk+-1.2.10-r4
-	>=dev-libs/libxml-1.8.10"
+	>=dev-libs/libxml-1.8.15"
 
 src_compile() {
 # fix minor bug in textmode/Makefile.am with no -L<path> to libxml.so
diff --git a/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild b/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild
index d75c9d2e5f3b..d323a173f98f 100644
--- a/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.2.1-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 Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild,v 1.1 2001/10/03 17:10:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.1-r1.ebuild,v 1.2 2001/10/06 14:36:55 azarah Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
@@ -17,7 +17,7 @@ COMMONDEPEND=">=sys-devel/gcc-2.95.2
 			>=x11-libs/qt-x11-2.3.0
 			>=sys-apps/bzip2-1.0.1
 			>=dev-libs/libpcre-3.4
-			>=gnome-libs/libxml2-2.4.1
+			>=dev-libs/libxml2-2.4.1
 			ssl? ( >=dev-libs/openssl-0.9.6 )
 			alsa? ( >=media-libs/alsa-lib-0.5.9 )
 			cups? ( net-print/cups )
diff --git a/kde-base/kdelibs/kdelibs-2.2.1.ebuild b/kde-base/kdelibs/kdelibs-2.2.1.ebuild
index 8604f31cd904..52d5716012ae 100644
--- a/kde-base/kdelibs/kdelibs-2.2.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.1.ebuild,v 1.6 2001/10/03 01:23:06 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.1.ebuild,v 1.7 2001/10/06 14:36:55 azarah Exp $
 # NOTE: Now we install into /usr
 # ANOTHER NOTE: we now rely on env.d to provide KDEDIR and QTDIR settings,
 # instead of hardcoding them here
@@ -20,7 +20,7 @@ DEPEND=">=sys-devel/gcc-2.95.2  sys-devel/perl
 	>=x11-libs/qt-x11-2.3.0
         >=sys-apps/bzip2-1.0.1
 	>=dev-libs/libpcre-3.4
-	>=gnome-libs/libxml2-2.4.1
+	>=dev-libs/libxml2-2.4.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	alsa? ( >=media-libs/alsa-lib-0.5.9 )
 	cups? ( net-print/cups )
diff --git a/kde-base/kdelibs/kdelibs-2.2.ebuild b/kde-base/kdelibs/kdelibs-2.2.ebuild
index fc49897ead2e..5caa4c0aed36 100644
--- a/kde-base/kdelibs/kdelibs-2.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.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.2.ebuild,v 1.10 2001/09/29 21:03:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.2.ebuild,v 1.11 2001/10/06 14:36:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="KDE ${PV} - Libraries"
@@ -18,7 +18,7 @@ DEPEND=">=sys-devel/gcc-2.95.2  sys-devel/perl
 	>=x11-libs/qt-x11-2.3.0
         >=sys-apps/bzip2-1.0.1
 	>=dev-libs/libpcre-3.4
-	>=gnome-libs/libxml2-2.4.1
+	>=dev-libs/libxml2-2.4.1
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	alsa? ( >=media-libs/alsa-lib-0.5.9 )
 	cups? ( net-print/cups )
diff --git a/media-sound/glame/files/digest-glame-0.5.2 b/media-sound/glame/files/digest-glame-0.5.2-r1
index f729c6b3522e..f729c6b3522e 100644
--- a/media-sound/glame/files/digest-glame-0.5.2
+++ b/media-sound/glame/files/digest-glame-0.5.2-r1
diff --git a/media-sound/glame/glame-0.5.2.ebuild b/media-sound/glame/glame-0.5.2-r1.ebuild
index 2d2ba94e4fc2..06f6275c52e6 100644
--- a/media-sound/glame/glame-0.5.2.ebuild
+++ b/media-sound/glame/glame-0.5.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Chris Arndt <arndtc@mailandnews.com>
 # /home/cvsroot/gentoo-x86/skel.build,v 1.5 2001/07/24 22:30:35 lordjoe Exp
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.5.2.ebuild,v 1.3 2001/08/31 03:23:39 pm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.5.2-r1.ebuild,v 1.1 2001/10/06 14:36:55 azarah Exp $
 
 
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://glame.sourceforge.net/glame/"
 
 #build-time dependencies
 DEPEND=">=dev-util/guile-1.4-r3
-         >=gnome-base/libxml-1.8.14
+         >=dev-libs/libxml-1.8.15
          >=media-libs/audiofile-0.2.1"
 
 
diff --git a/media-sound/xmms/xmms-1.2.5-r1.ebuild b/media-sound/xmms/xmms-1.2.5-r1.ebuild
index 0a23c2f77959..4cec6c6efb56 100644
--- a/media-sound/xmms/xmms-1.2.5-r1.ebuild
+++ b/media-sound/xmms/xmms-1.2.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.5-r1.ebuild,v 1.1 2001/10/06 10:08:19 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.5-r1.ebuild,v 1.2 2001/10/06 14:36:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="X MultiMedia System"
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
 HOMEPAGE="http://www.xmms.org/"
 
 DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	>=dev-libs/libxml-1.8.10
+	>=dev-libs/libxml-1.8.15
 	>=media-libs/libmikmod-3.1.9
     >=media-sound/esound-0.2.22
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
@@ -17,7 +17,7 @@ DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
 	virtual/opengl"
 
 RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	 >=dev-libs/libxml-1.8.10
+	 >=dev-libs/libxml-1.8.15
   	 >=media-libs/libmikmod-3.1.9
 	 >=media-sound/esound-0.2.22
 	 vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
diff --git a/net-misc/neon/files/digest-neon-0.15.3 b/net-misc/neon/files/digest-neon-0.15.3-r1
index 9400f5f295a6..9400f5f295a6 100644
--- a/net-misc/neon/files/digest-neon-0.15.3
+++ b/net-misc/neon/files/digest-neon-0.15.3-r1
diff --git a/net-misc/neon/neon-0.15.3.ebuild b/net-misc/neon/neon-0.15.3-r1.ebuild
index 93dce40f7685..b0573094664f 100644
--- a/net-misc/neon/neon-0.15.3.ebuild
+++ b/net-misc/neon/neon-0.15.3-r1.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 Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.15.3.ebuild,v 1.1 2001/09/15 23:06:03 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/neon/neon-0.15.3-r1.ebuild,v 1.1 2001/10/06 14:36:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.webdav.org/neon/neon-0.15.3.tar.gz"
 
 HOMEPAGE="http://www.webdav.org/neon"
 
-DEPEND="gnome-libs/libxml2"
+DEPEND="dev-libs/libxml2"
 
 src_compile() {
 	local myconf
diff --git a/net-misc/sitecopy/files/digest-sitecopy-0.10.12 b/net-misc/sitecopy/files/digest-sitecopy-0.10.12-r1
index 04841e8bb441..04841e8bb441 100644
--- a/net-misc/sitecopy/files/digest-sitecopy-0.10.12
+++ b/net-misc/sitecopy/files/digest-sitecopy-0.10.12-r1
diff --git a/net-misc/sitecopy/sitecopy-0.10.12.ebuild b/net-misc/sitecopy/sitecopy-0.10.12-r1.ebuild
index 3a092d506747..e04777a0e1d7 100644
--- a/net-misc/sitecopy/sitecopy-0.10.12.ebuild
+++ b/net-misc/sitecopy/sitecopy-0.10.12-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/net-misc/sitecopy/sitecopy-0.10.12.ebuild,v 1.5 2001/06/09 00:48:47 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sitecopy/sitecopy-0.10.12-r1.ebuild,v 1.1 2001/10/06 14:36:55 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="sitecopy is for easily maintaining remote web sites"
@@ -9,7 +9,7 @@ SRC_URI="http://www.lyra.org/sitecopy/${P}.tar.gz"
 HOMEPAGE="http://www.lyr.org/sitecopy/"
 DEPEND="virtual/glibc
 	>=sys-libs/zlib-1.1.3
-	>=gnome-base/libxml-1.8.10
+	>=dev-libs/libxml-1.8.15
         ssl? ( >=dev-libs/openssl-0.9.6 )"
 
 src_compile() {
diff --git a/net-www/galeon/files/digest-galeon-0.10.6 b/net-www/galeon/files/digest-galeon-0.10.6
deleted file mode 100644
index fefce40168fc..000000000000
--- a/net-www/galeon/files/digest-galeon-0.10.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eda0f7dc904298dcdff09e871825eaf7 galeon-0.10.6.tar.gz
diff --git a/net-www/galeon/files/digest-galeon-0.11.0 b/net-www/galeon/files/digest-galeon-0.11.0
deleted file mode 100644
index cda89734f1d3..000000000000
--- a/net-www/galeon/files/digest-galeon-0.11.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3dbc697e5c0266fec0687a95ce9caa17 galeon-0.11.0.tar.gz
diff --git a/net-www/galeon/files/digest-galeon-0.11.1 b/net-www/galeon/files/digest-galeon-0.11.1
deleted file mode 100644
index 545096f22576..000000000000
--- a/net-www/galeon/files/digest-galeon-0.11.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ea44321a7661f95815f77923622d29d galeon-0.11.1.tar.gz
diff --git a/net-www/galeon/files/digest-galeon-0.11.3 b/net-www/galeon/files/digest-galeon-0.11.3
deleted file mode 100644
index 6e0581ba605d..000000000000
--- a/net-www/galeon/files/digest-galeon-0.11.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1668f0686f2497b200ad82c56bcb94cb galeon-0.11.3.tar.gz
diff --git a/net-www/galeon/files/digest-galeon-0.11.5 b/net-www/galeon/files/digest-galeon-0.11.5
deleted file mode 100644
index 13eaa6b8c4b2..000000000000
--- a/net-www/galeon/files/digest-galeon-0.11.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 199762bc10ae58b8fa98aa87d02bf338 galeon-0.11.5.tar.gz
diff --git a/net-www/galeon/files/digest-galeon-0.12 b/net-www/galeon/files/digest-galeon-0.12
deleted file mode 100644
index da5b5eac1058..000000000000
--- a/net-www/galeon/files/digest-galeon-0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd66bf27c06ecb8a764760f4bd1ae98b galeon-0.12.tar.gz
diff --git a/net-www/galeon/files/digest-galeon-0.12.1 b/net-www/galeon/files/digest-galeon-0.12.1
deleted file mode 100644
index c0640dca3bec..000000000000
--- a/net-www/galeon/files/digest-galeon-0.12.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 969458a54c3bdf0486403ccbe0b8d9e1 galeon-0.12.1.tar.gz
diff --git a/net-www/galeon/files/digest-galeon-0.12.2 b/net-www/galeon/files/digest-galeon-0.12.2-r1
index 6271b16b6557..6271b16b6557 100644
--- a/net-www/galeon/files/digest-galeon-0.12.2
+++ b/net-www/galeon/files/digest-galeon-0.12.2-r1
diff --git a/net-www/galeon/galeon-0.12.1.ebuild b/net-www/galeon/galeon-0.12.1.ebuild
deleted file mode 100644
index e16ceabd4ade..000000000000
--- a/net-www/galeon/galeon-0.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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/net-www/galeon/galeon-0.12.1.ebuild,v 1.1 2001/09/22 09:07:26 blocke Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A small webbrowser for gnome that uses mozillas render engine"
-SRC_URI="http://prdownloads.sourceforge.net/galeon/${A}"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-DEPEND=">=net-www/mozilla-0.9.4
-	>=gnome-base/libglade-0.13
-	>=gnome-base/gnome-core-1.4.0
-	>=gnome-base/libxml-1.8.13
-	>=gnome-base/gnome-vfs-0.6.0
-	>=gnome-base/gconf-1.0.4
-    >=dev-util/xml-i18n-tools-0.8.4
-	>=gnome-base/oaf-0.6.2
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-    local myconf
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
-
-    ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome        \
-		--host=${CHOST}                                        \
-		--with-mozilla-libs=/opt/mozilla                       \
-		--with-mozilla-includes=/opt/mozilla/include $myconf
-
-    assert "Configuration failed."
-
-    emake || die
-}
-
-src_install () {
-    gconftool --shutdown
-    make DESTDIR=${D} install || die
-    dodoc AUTHORS ChangeLog COPYING* FAQ NEWS README TODO THANKS
-}
-
diff --git a/net-www/galeon/galeon-0.12.2.ebuild b/net-www/galeon/galeon-0.12.2-r1.ebuild
index 1130becc7362..73b4ceb44841 100644
--- a/net-www/galeon/galeon-0.12.2.ebuild
+++ b/net-www/galeon/galeon-0.12.2-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/net-www/galeon/galeon-0.12.2.ebuild,v 1.1 2001/09/24 15:24:43 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-0.12.2-r1.ebuild,v 1.1 2001/10/06 14:36:55 azarah Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -9,14 +9,14 @@ DESCRIPTION="A small webbrowser for gnome that uses mozillas render engine"
 SRC_URI="http://prdownloads.sourceforge.net/galeon/${A}"
 HOMEPAGE="http://galeon.sourceforge.net"
 
-DEPEND=">=net-www/mozilla-0.9.4
-	>=gnome-base/libglade-0.13
-	>=gnome-base/gnome-core-1.4.0
-	>=gnome-base/libxml-1.8.13
-	>=gnome-base/gnome-vfs-0.6.0
-	>=gnome-base/gconf-1.0.4
+DEPEND=">=net-www/mozilla-0.9.4-r2
+	>=gnome-base/libglade-0.17-r1
+	>=gnome-base/gnome-core-1.4.0.4-r1
+	>=dev-libs/libxml-1.8.15
+	>=gnome-base/gnome-vfs-1.0.2-r1
+	>=gnome-base/gconf-1.0.4-r2
         >=dev-util/xml-i18n-tools-0.8.4
-	>=gnome-base/oaf-0.6.2
+	>=gnome-base/oaf-0.6.6-r1
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
@@ -25,7 +25,7 @@ src_compile() {
       myconf="--disable-nls"
     fi
 
-    ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome        	\
+    ./configure --prefix=/usr --sysconfdir=/etc/gnome  			\
 		--host=${CHOST}                                        	\
 		--with-mozilla-libs=${MOZILLA_FIVE_HOME}		\
 		--with-mozilla-includes=${MOZILLA_FIVE_HOME}/include	\
diff --git a/net-www/galeon/galeon-0.12.ebuild b/net-www/galeon/galeon-0.12.ebuild
deleted file mode 100644
index fc8fdc76a0d5..000000000000
--- a/net-www/galeon/galeon-0.12.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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/net-www/galeon/galeon-0.12.ebuild,v 1.3 2001/09/24 15:11:15 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A small webbrowser for gnome that uses mozillas render engine"
-SRC_URI="http://prdownloads.sourceforge.net/galeon/${A}"
-HOMEPAGE="http://galeon.sourceforge.net"
-
-DEPEND="~net-www/mozilla-0.9.3
-	>=gnome-base/libglade-0.13
-	>=gnome-base/gnome-core-1.4.0
-	>=gnome-base/libxml-1.8.13
-	>=gnome-base/gnome-vfs-0.6.0
-	>=gnome-base/gconf-1.0.4
-        >=dev-util/xml-i18n-tools-0.8.4
-	>=gnome-base/oaf-0.6.2
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-    local myconf
-    if [ -z "`use nls`" ] ; then
-      myconf="--disable-nls"
-    fi
-
-    ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome        \
-		--host=${CHOST}                                        \
-		--with-mozilla-libs=/opt/mozilla                       \
-		--with-mozilla-includes=/opt/mozilla/include $myconf
-
-    assert "Configuration failed."
-
-    emake || die
-}
-
-src_install () {
-    gconftool --shutdown
-    make DESTDIR=${D} install || die
-    dodoc AUTHORS ChangeLog COPYING* FAQ NEWS README TODO THANKS
-}
-