*** empty log message ***

32 files changed, 117 insertions, 149 deletions

diff --git a/app-office/dia/dia-0.86.ebuild b/app-office/dia/dia-0.86.ebuild
index 0a208e4e751a..e7e896e09db5 100644
--- a/app-office/dia/dia-0.86.ebuild
+++ b/app-office/dia/dia-0.86.ebuild
@@ -1,21 +1,21 @@
 # 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.86.ebuild,v 1.4 2000/09/15 20:08:57 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.86.ebuild,v 1.5 2000/10/14 12:30:11 achim Exp $
 
-P=dia-0.86
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Diagram Creation Program"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/${A}"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
 
 
 src_compile() {
 
     cd ${S}
-try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-catgets
+    try ./configure --host=${CHOST} --prefix=/opt/gnome \
+	--with-catgets --enable-gnome --enable-gnome-print
+    # bonobo support does not work yet
     try make
 
 }
diff --git a/app-office/gnumeric/files/digest-gnumeric-0.56 b/app-office/gnumeric/files/digest-gnumeric-0.56
deleted file mode 100644
index 412cfeff0466..000000000000
--- a/app-office/gnumeric/files/digest-gnumeric-0.56
+++ /dev/null
@@ -1 +0,0 @@
-MD5 674581cf58fc5b5158fb5103327955be gnumeric-0.56.tar.gz
diff --git a/app-office/gnumeric/files/digest-gnumeric-0.57 b/app-office/gnumeric/files/digest-gnumeric-0.57
new file mode 100644
index 000000000000..d06b6ceb0832
--- /dev/null
+++ b/app-office/gnumeric/files/digest-gnumeric-0.57
@@ -0,0 +1 @@
+MD5 abe5002a4b812c86c85363cc24ac3a8a gnumeric-0.57.tar.gz
diff --git a/app-office/gnumeric/gnumeric-0.56.ebuild b/app-office/gnumeric/gnumeric-0.57.ebuild
index 84b09f7ae054..76dc92b8385d 100644
--- a/app-office/gnumeric/gnumeric-0.56.ebuild
+++ b/app-office/gnumeric/gnumeric-0.57.ebuild
@@ -1,9 +1,8 @@
 # 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.56.ebuild,v 1.3 2000/09/15 20:08:58 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-0.57.ebuild,v 1.1 2000/10/14 12:30:12 achim Exp $
 
-P=gnumeric-0.56
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="gnumeric"
@@ -12,8 +11,13 @@ HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 
 src_compile() {                           
   cd ${S}
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-catgets --without-bonobo
+  LDFLAGS="-L/opt/gnome/lib -lunicode" try ./configure --host=${CHOST} --prefix=/opt/gnome \
+	--with-catgets --without-bonobo --with-gb
+  cd plugins/perl
+  cp Makefile Makefile.orig
+  sed -e "s:perl Makefile\.PL:perl Makefile\.PL $PERLINSTALL:" \
+	Makefile.orig > Makefile
+  cd ${S}
   try make
 }
 
diff --git a/current-packages b/current-packages
index 3f0ec647a5ff..abdac126c695 100644
--- a/current-packages
+++ b/current-packages
@@ -138,6 +138,7 @@
 ./dev-libs/libpcre/libpcre-3.2-r1.ebuild
 ./dev-libs/librep/librep-0.13.1.ebuild
 ./dev-libs/libunicode/libunicode-0.7.ebuild
+./dev-libs/libwww/libwww-5.3.1.ebuild
 ./dev-libs/openssl/openssl-0.9.6-r1.ebuild
 ./dev-libs/rep-gtk/rep-gtk-0.14.ebuild 
 ./dev-libs/slib/slib-2.3.8.ebuild
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.0.95 b/gnome-extra/gnome-db/files/digest-gnome-db-0.0.95
deleted file mode 100644
index 57a27080e36e..000000000000
--- a/gnome-extra/gnome-db/files/digest-gnome-db-0.0.95
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e0be51920271f353b13acc6ab49f3544 gnome-db-0.0.95.tar.gz
diff --git a/gnome-extra/gnome-db/files/digest-gnome-db-0.1.0 b/gnome-extra/gnome-db/files/digest-gnome-db-0.1.0
new file mode 100644
index 000000000000..a00e1d7570c9
--- /dev/null
+++ b/gnome-extra/gnome-db/files/digest-gnome-db-0.1.0
@@ -0,0 +1 @@
+MD5 bb99ebc66771a09075a005733174824c gnome-db-0.1.0.tar.gz
diff --git a/gnome-extra/gnome-db/gnome-db-0.0.95.ebuild b/gnome-extra/gnome-db/gnome-db-0.1.0.ebuild
index 7e7ba5ad4869..f553f56fe005 100644
--- a/gnome-extra/gnome-db/gnome-db-0.0.95.ebuild
+++ b/gnome-extra/gnome-db/gnome-db-0.1.0.ebuild
@@ -1,14 +1,13 @@
 # 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/gnome-db/gnome-db-0.0.95.ebuild,v 1.3 2000/09/15 20:08:57 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-db/gnome-db-0.1.0.ebuild,v 1.1 2000/10/14 12:30:12 achim Exp $
 
-P=gnome-db-0.0.95
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Framework for creating database applications"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/"${A}
-HOMEPAGE="http://www.gnome.org/gnome_db/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
+HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
 
 
 src_compile() {                           
@@ -22,6 +21,7 @@ src_compile() {
 src_install() {                               
   cd ${S}
   try make prefix=${D}/opt/gnome install
+  dodoc AUTHORS COPYING ChangeLog README
 }
 
 
diff --git a/gnome-office/dia/dia-0.86.ebuild b/gnome-office/dia/dia-0.86.ebuild
index 47b2efd8a2b2..d7bb118ef603 100644
--- a/gnome-office/dia/dia-0.86.ebuild
+++ b/gnome-office/dia/dia-0.86.ebuild
@@ -1,21 +1,21 @@
 # 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/dia/dia-0.86.ebuild,v 1.4 2000/09/15 20:08:57 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/dia/dia-0.86.ebuild,v 1.5 2000/10/14 12:30:11 achim Exp $
 
-P=dia-0.86
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Diagram Creation Program"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/${A}"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
 HOMEPAGE="http://www.gnome.org/gnome-office/dia.shtml"
 
 
 src_compile() {
 
     cd ${S}
-try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-catgets
+    try ./configure --host=${CHOST} --prefix=/opt/gnome \
+	--with-catgets --enable-gnome --enable-gnome-print
+    # bonobo support does not work yet
     try make
 
 }
diff --git a/gnome-office/eog/eog-0.3.ebuild b/gnome-office/eog/eog-0.3.ebuild
deleted file mode 100644
index 0fa0c6be0ebd..000000000000
--- a/gnome-office/eog/eog-0.3.ebuild
+++ /dev/null
@@ -1,30 +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/gnome-office/eog/eog-0.3.ebuild,v 1.3 2000/09/15 20:08:57 drobbins Exp $
-
-P=eog-0.3
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Eye of GNOME"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/"${A}
-HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
-
-src_compile() {                           
-  cd ${S}
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-catgets --without-bonobo
-  try make
-}
-
-src_install() {                               
-  cd ${S}
-  try make prefix=${D}/opt/gnome install
-  dodoc AUTHORS COPYING DEPENDS ChangeLog HACKING NEWS README TODO MAINTAINERS
-
-}
-
-
-
-
-
diff --git a/gnome-office/eog/eog-0.5.ebuild b/gnome-office/eog/eog-0.5.ebuild
index 495bf18dadf6..f6a5ff63f0ad 100644
--- a/gnome-office/eog/eog-0.5.ebuild
+++ b/gnome-office/eog/eog-0.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-office/eog/eog-0.5.ebuild,v 1.2 2000/09/15 20:08:57 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/eog/eog-0.5.ebuild,v 1.3 2000/10/14 12:30:11 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
 src_compile() {                           
   cd ${S}
   try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-catgets --without-bonobo
+	--with-catgets --with-bonobo
   try make
 }
 
diff --git a/gnome-office/eog/files/digest-eog-0.3 b/gnome-office/eog/files/digest-eog-0.3
deleted file mode 100644
index 9f0d775b0923..000000000000
--- a/gnome-office/eog/files/digest-eog-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78a814a9f7b2de19b6eb0b44ad5ff9ff eog-0.3.tar.gz
diff --git a/gnome-office/gnome-db/files/digest-gnome-db-0.0.95 b/gnome-office/gnome-db/files/digest-gnome-db-0.0.95
deleted file mode 100644
index 57a27080e36e..000000000000
--- a/gnome-office/gnome-db/files/digest-gnome-db-0.0.95
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e0be51920271f353b13acc6ab49f3544 gnome-db-0.0.95.tar.gz
diff --git a/gnome-office/gnome-db/files/digest-gnome-db-0.1.0 b/gnome-office/gnome-db/files/digest-gnome-db-0.1.0
new file mode 100644
index 000000000000..a00e1d7570c9
--- /dev/null
+++ b/gnome-office/gnome-db/files/digest-gnome-db-0.1.0
@@ -0,0 +1 @@
+MD5 bb99ebc66771a09075a005733174824c gnome-db-0.1.0.tar.gz
diff --git a/gnome-office/gnome-db/gnome-db-0.0.95.ebuild b/gnome-office/gnome-db/gnome-db-0.1.0.ebuild
index c77fad39b86e..b4e4b9985cb8 100644
--- a/gnome-office/gnome-db/gnome-db-0.0.95.ebuild
+++ b/gnome-office/gnome-db/gnome-db-0.1.0.ebuild
@@ -1,14 +1,13 @@
 # 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/gnome-db/gnome-db-0.0.95.ebuild,v 1.3 2000/09/15 20:08:57 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnome-db/gnome-db-0.1.0.ebuild,v 1.1 2000/10/14 12:30:12 achim Exp $
 
-P=gnome-db-0.0.95
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="Framework for creating database applications"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnome-db/"${A}
-HOMEPAGE="http://www.gnome.org/gnome_db/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${A}"
+HOMEPAGE="http://www.gnome.org/gnome-office/gnomedb.shtml"
 
 
 src_compile() {                           
@@ -22,6 +21,7 @@ src_compile() {
 src_install() {                               
   cd ${S}
   try make prefix=${D}/opt/gnome install
+  dodoc AUTHORS COPYING ChangeLog README
 }
 
 
diff --git a/gnome-office/gnumeric/files/digest-gnumeric-0.56 b/gnome-office/gnumeric/files/digest-gnumeric-0.56
deleted file mode 100644
index 412cfeff0466..000000000000
--- a/gnome-office/gnumeric/files/digest-gnumeric-0.56
+++ /dev/null
@@ -1 +0,0 @@
-MD5 674581cf58fc5b5158fb5103327955be gnumeric-0.56.tar.gz
diff --git a/gnome-office/gnumeric/files/digest-gnumeric-0.57 b/gnome-office/gnumeric/files/digest-gnumeric-0.57
new file mode 100644
index 000000000000..d06b6ceb0832
--- /dev/null
+++ b/gnome-office/gnumeric/files/digest-gnumeric-0.57
@@ -0,0 +1 @@
+MD5 abe5002a4b812c86c85363cc24ac3a8a gnumeric-0.57.tar.gz
diff --git a/gnome-office/gnumeric/gnumeric-0.56.ebuild b/gnome-office/gnumeric/gnumeric-0.57.ebuild
index 65828dbfe8b2..a535f9871ba0 100644
--- a/gnome-office/gnumeric/gnumeric-0.56.ebuild
+++ b/gnome-office/gnumeric/gnumeric-0.57.ebuild
@@ -1,9 +1,8 @@
 # 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.56.ebuild,v 1.3 2000/09/15 20:08:58 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.57.ebuild,v 1.1 2000/10/14 12:30:12 achim Exp $
 
-P=gnumeric-0.56
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="gnumeric"
@@ -12,8 +11,13 @@ HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 
 src_compile() {                           
   cd ${S}
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-catgets --without-bonobo
+  LDFLAGS="-L/opt/gnome/lib -lunicode" try ./configure --host=${CHOST} --prefix=/opt/gnome \
+	--with-catgets --without-bonobo --with-gb
+  cd plugins/perl
+  cp Makefile Makefile.orig
+  sed -e "s:perl Makefile\.PL:perl Makefile\.PL $PERLINSTALL:" \
+	Makefile.orig > Makefile
+  cd ${S}
   try make
 }
 
diff --git a/media-gfx/eog/eog-0.3.ebuild b/media-gfx/eog/eog-0.3.ebuild
deleted file mode 100644
index ca55d8fee6c0..000000000000
--- a/media-gfx/eog/eog-0.3.ebuild
+++ /dev/null
@@ -1,30 +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/media-gfx/eog/eog-0.3.ebuild,v 1.3 2000/09/15 20:08:57 drobbins Exp $
-
-P=eog-0.3
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="Eye of GNOME"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/eog/"${A}
-HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
-
-src_compile() {                           
-  cd ${S}
-  try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-catgets --without-bonobo
-  try make
-}
-
-src_install() {                               
-  cd ${S}
-  try make prefix=${D}/opt/gnome install
-  dodoc AUTHORS COPYING DEPENDS ChangeLog HACKING NEWS README TODO MAINTAINERS
-
-}
-
-
-
-
-
diff --git a/media-gfx/eog/eog-0.5.ebuild b/media-gfx/eog/eog-0.5.ebuild
index aa60959d06e2..1fc55bcaa555 100644
--- a/media-gfx/eog/eog-0.5.ebuild
+++ b/media-gfx/eog/eog-0.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.5.ebuild,v 1.2 2000/09/15 20:08:57 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/eog/eog-0.5.ebuild,v 1.3 2000/10/14 12:30:11 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnome.org/gnome-office/eog.shtml"
 src_compile() {                           
   cd ${S}
   try ./configure --host=${CHOST} --prefix=/opt/gnome \
-	--with-catgets --without-bonobo
+	--with-catgets --with-bonobo
   try make
 }
 
diff --git a/media-gfx/eog/files/digest-eog-0.3 b/media-gfx/eog/files/digest-eog-0.3
deleted file mode 100644
index 9f0d775b0923..000000000000
--- a/media-gfx/eog/files/digest-eog-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78a814a9f7b2de19b6eb0b44ad5ff9ff eog-0.3.tar.gz
diff --git a/media-sound/alsa-utils/files/digest-alsa-utils-0.5.9 b/media-sound/alsa-utils/files/digest-alsa-utils-0.5.9
deleted file mode 100644
index a760ae6ec4d9..000000000000
--- a/media-sound/alsa-utils/files/digest-alsa-utils-0.5.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3834bafbf4b50b88fd5e1a74270d078b alsa-utils-0.5.9.tar.bz2
diff --git a/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12 b/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12
new file mode 100644
index 000000000000..e039716b3fe0
--- /dev/null
+++ b/media-sound/gtk-gnutella/files/digest-gtk-gnutella-0.12
@@ -0,0 +1 @@
+MD5 2e87deca651122dea2b9ed15748bac9b gtk-gnutella-0.12.tar.gz
diff --git a/media-sound/gtk-gnutella/gtk-gnutella-0.12.ebuild b/media-sound/gtk-gnutella/gtk-gnutella-0.12.ebuild
new file mode 100644
index 000000000000..df1cf80690a1
--- /dev/null
+++ b/media-sound/gtk-gnutella/gtk-gnutella-0.12.ebuild
@@ -0,0 +1,27 @@
+# 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/gtk-gnutella/gtk-gnutella-0.12.ebuild,v 1.1 2000/10/14 12:30:13 achim Exp $
+
+A=${P}.tar.gz
+S=${WORKDIR}/${P}
+DESCRIPTION="A GTk gnutella Client"
+SRC_URI="ftp://${PN}.sourceforge.net/pub/${PN}/${A}"
+HOMEPAGE="http://${PN}.sourceforge.net/"
+
+
+src_compile() {
+
+    cd ${S}
+    try ./configure --prefix=/usr/X11R6 --host=${CHOST}
+    try make
+
+}
+
+src_install () {
+
+    cd ${S}
+    try make DESTDIR=${D} install
+    dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+}
+
diff --git a/media-sound/xmnap/files/digest-xmnap-0.1.2 b/media-sound/xmnap/files/digest-xmnap-0.1.2
deleted file mode 100644
index b7261001114e..000000000000
--- a/media-sound/xmnap/files/digest-xmnap-0.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 622fe64e3aaddd20546cb5344f37303f xmnap-0.1.2.tar.gz
diff --git a/media-sound/xmnap/xmnap-0.1.2.ebuild b/media-sound/xmnap/xmnap-0.1.2.ebuild
deleted file mode 100644
index 569f3d6dea11..000000000000
--- a/media-sound/xmnap/xmnap-0.1.2.ebuild
+++ /dev/null
@@ -1,32 +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/media-sound/xmnap/xmnap-0.1.2.ebuild,v 1.1 2000/09/16 16:46:53 achim Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="A Motif based Napster Client"
-SRC_URI="http://home.swipnet.se/~w-10246/linux/${A}"
-HOMEPAGE="http://home.swipnet.se/~w-10246/linux/"
-
-
-src_compile() {
-
-    cd ${S}
-    try xmkmf -a
-    try make
-
-}
-
-src_install () {
-
-    cd ${S}
-    into /usr/X11R6
-    dobin xmnap
-    insinto /etc/X11/app-defaults/XmNap
-    doins XmNap.ad
-    insinto /usr/X11R6/include/bitmaps/xmnap
-    doins images/*.xpm
-
-}
-
diff --git a/net-www/apache-ssl/apache-ssl-1.3.12.2.6.6.ebuild b/net-www/apache-ssl/apache-ssl-1.3.14.2.7.0.ebuild
index 2bee8d9ddccd..f2bfd8380f29 100644
--- a/net-www/apache-ssl/apache-ssl-1.3.12.2.6.6.ebuild
+++ b/net-www/apache-ssl/apache-ssl-1.3.14.2.7.0.ebuild
@@ -1,20 +1,19 @@
 # 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/apache-ssl/apache-ssl-1.3.12.2.6.6.ebuild,v 1.4 2000/09/15 20:09:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache-ssl/apache-ssl-1.3.14.2.7.0.ebuild,v 1.1 2000/10/14 12:30:17 achim Exp $
 
-P=apache-ssl-1.3.12-2.6.6
-A="apache_1.3.12.tar.gz mod_ssl-2.6.6-1.3.12.tar.gz"
-S=${WORKDIR}/apache_1.3.12
-DESCRIPTION="The Apache Web Server v1.3.12 with mod_ssl"
-SRC_URI="http://www.apache.de/dist/apache_1.3.12.tar.gz
-	 ftp://ftp.modssl.org/source/mod_ssl-2.6.6-1.3.12.tar.gz"
+A="apache_1.3.14.tar.gz mod_ssl-2.7.0-1.3.14.tar.gz"
+S=${WORKDIR}/apache_1.3.14
+DESCRIPTION="The Apache Web Server v1.3.14 with mod_ssl"
+SRC_URI="http://httpd.apache.org/dist/apache_1.3.14.tar.gz
+	 ftp://ftp.modssl.org/source/mod_ssl-2.7.0-1.3.14.tar.gz"
 HOMEPAGE="http://www.apache.org http://www.modssl.org"
 
 
 src_compile() {                           
    export SSL_BASE=SYSTEM
-   cd ${S}/../mod_ssl-2.6.6-1.3.12
+   cd ${S}/../mod_ssl-2.7.0-1.3.14
     try ./configure --with-apache=${S} --with-ssl=SYSTEM
    cd ${S}
    try ./configure --prefix=/usr/local/httpd --bindir=/usr/bin \
@@ -36,7 +35,7 @@ src_install() {
 
     dodoc ABOUT_APACHE Announcement INSTALL* KEYS LICENSE* README* WARNING*
     docinto mod_ssl
-    cd ../mod_ssl-2.6.6-1.3.12
+    cd ../mod_ssl-2.7.0-1.3.14
     dodoc ANNOUNCE CHANGES CREDITS INSTALL* LICENSE NEWS README*
     dodir /etc/rc.d/init.d
     cp ${O}/files/httpd.conf ${D}/etc/httpd
diff --git a/net-www/apache-ssl/files/digest-apache-ssl-1.3.12.2.6.6 b/net-www/apache-ssl/files/digest-apache-ssl-1.3.12.2.6.6
deleted file mode 100644
index ec49a4258189..000000000000
--- a/net-www/apache-ssl/files/digest-apache-ssl-1.3.12.2.6.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 de3ccff384b0d4ab94c3251cb85d49d2 apache_1.3.12.tar.gz
-MD5 573b4d89c1f203216a55fb5c2aece009 mod_ssl-2.6.6-1.3.12.tar.gz
diff --git a/net-www/apache-ssl/files/digest-apache-ssl-1.3.14.2.7.0 b/net-www/apache-ssl/files/digest-apache-ssl-1.3.14.2.7.0
new file mode 100644
index 000000000000..85b03814f9f7
--- /dev/null
+++ b/net-www/apache-ssl/files/digest-apache-ssl-1.3.14.2.7.0
@@ -0,0 +1,2 @@
+MD5 34803e3d83a0a9ed981b571657b33109 apache_1.3.14.tar.gz
+MD5 65aae4a18dcd0e36140dbfda4584f8d7 mod_ssl-2.7.0-1.3.14.tar.gz
diff --git a/net-www/htdig/files/CONFIG b/net-www/htdig/files/CONFIG.in
index 09abf0c425a7..20f455a756aa 100644
--- a/net-www/htdig/files/CONFIG
+++ b/net-www/htdig/files/CONFIG.in
@@ -8,11 +8,11 @@
 # These variables are set by configure
 #
 # This specifies the root of the directory tree to be used by ht://Dig
-prefix=                 ${DESTDIR}/usr
+prefix=                 $(DESTDIR)@prefix@
 
 # This specifies the root of the directory tree to be used for programs
 # installed by ht://Dig
-exec_prefix=            ${prefix}
+exec_prefix=            $(DESTDIR)@exec_prefix@
 
 #
 # Please modify the variables below to reflect your preferences.
@@ -35,20 +35,20 @@ BIN_DIR=               $(exec_prefix)/bin
 # CONFIG_DIR
 # This is the directory that contains ht://Dig configuration files
 #
-CONFIG_DIR=            $(DESTDIR)/etc/httpd/htdig/
+CONFIG_DIR=            $(DESTDIR)/etc/httpd/
 
 #
 # COMMON_DIR
 # This is the directory for files that can be shared between different
 # databases.
 #
-COMMON_DIR=            $(DESTDIR)/var/htdig/common
+COMMON_DIR=            $(DESTDIR)/usr/lib/htdig/common
 
 #
 # DATABASE_DIR
 # The default directory where the search databases will reside.
 #
-DATABASE_DIR=          $(DESTDIR/var/htdig/db
+DATABASE_DIR=          $(DESTDIR)/var/htdig/db
 
 #
 # DEFAULT_CONFIG_FILE
@@ -62,14 +62,14 @@ DEFAULT_CONFIG_FILE=   $(CONFIG_DIR)/htdig.conf
 # The directory where your HTTP server looks for CGI programs.  This is where
 # htsearch will get installed.
 #
-CGIBIN_DIR=             ${ÐESTDIR}/usr/local/httpd/cgi-bin
+CGIBIN_DIR=             @CGIBIN_DIR@
 
 #
 # IMAGE_DIR
 # Define this to be a place that can be accessed by your web server.  This is
 # where a couple of images will be placed.
 #
-IMAGE_DIR=              ${DESTDIR}/usr/local/httpd/images/htdig
+IMAGE_DIR=              @IMAGE_DIR@
 
 #
 # IMAGE_URL_PREFIX
@@ -82,7 +82,7 @@ IMAGE_URL_PREFIX=        /images/htdig
 # Set this to the absolute path where you want the sample search form to
 # be installed.
 #
-SEARCH_DIR=		${DESTDIR}/usr/local/httpd/htdig/htdocs
+SEARCH_DIR=		@SEARCH_DIR@
 
 #
 # SEARCH_FORM
diff --git a/net-www/mozilla/files/digest-mozilla-milestone-18 b/net-www/mozilla/files/digest-mozilla-milestone-18
new file mode 100644
index 000000000000..085c07fe9f42
--- /dev/null
+++ b/net-www/mozilla/files/digest-mozilla-milestone-18
@@ -0,0 +1 @@
+MD5 532934635ad426255036ee070bad03c8 mozilla-source-M18.tar.gz
diff --git a/net-www/mozilla/mozilla-milestone-18.ebuild b/net-www/mozilla/mozilla-milestone-18.ebuild
new file mode 100644
index 000000000000..578fff48b8e7
--- /dev/null
+++ b/net-www/mozilla/mozilla-milestone-18.ebuild
@@ -0,0 +1,27 @@
+# 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/mozilla/mozilla-milestone-18.ebuild,v 1.1 2000/10/14 12:30:18 achim Exp $
+
+A=mozilla-source-M${PV}.tar.gz
+S=${WORKDIR}/mozilla
+DESCRIPTION=""
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/m${PV}/src/${A}"
+HOMEPAGE="http://www.mozilla.org"
+
+
+src_compile() {
+
+    cd ${S}
+    try ./configure --prefix=/opt/mozilla --host=${CHOST}
+    try make
+
+}
+
+src_install () {
+
+    cd ${S}
+    try make DESTDIR=${D} install
+
+}
+