10 files changed, 118 insertions, 16 deletions
diff --git a/app-misc/ttmkfdir/ttmkfdir-0.0.ebuild b/app-misc/ttmkfdir/ttmkfdir-0.0.ebuild
index 7b1bdef20fc1..50abfe32f739 100644
--- a/app-misc/ttmkfdir/ttmkfdir-0.0.ebuild
+++ b/app-misc/ttmkfdir/ttmkfdir-0.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 Peter Gavin <pete@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ttmkfdir/ttmkfdir-0.0.ebuild,v 1.1 2001/03/11 22:13:01 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ttmkfdir/ttmkfdir-0.0.ebuild,v 1.2 2001/05/27 02:58:36 achim Exp $
 
 #P=
 A=ttmkfdir.tar.gz
@@ -10,8 +10,7 @@ DESCRIPTION="a utility to create a fonts.scale file from a set of TrueType fonts
 SRC_URI="http://www.joerg-pommnitz.de/TrueType/ttmkfdir.tar.gz"
 HOMEPAGE="http://www.joerg-pommnitz.de/TrueType/xfsft.html"
 
-DEPEND=">=media-libs/freetype-1.1
-	<media-libs/freetype-2.0"
+DEPEND="=media-libs/freetype-1.3.1-r2"
 
 src_unpack() {
     mkdir ${P}
diff --git a/gnome-apps/evolution/evolution-0.10.ebuild b/gnome-apps/evolution/evolution-0.10.ebuild
index 5f458a77ad0e..3d53d0bc5bbc 100644
--- a/gnome-apps/evolution/evolution-0.10.ebuild
+++ b/gnome-apps/evolution/evolution-0.10.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/evolution/evolution-0.10.ebuild,v 1.1 2001/05/17 13:30:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-apps/evolution/evolution-0.10.ebuild,v 1.2 2001/05/27 02:58:36 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -23,7 +23,7 @@ src_compile() {
 #    else
 	myconf="--enable-ldap=no"
 #    fi
-    try ./configure --prefix=/opt/gnome --host=${CHOST} $myconf
+    try ./configure --prefix=/opt/gnome --host=${CHOST} --enable-file-locking=no $myconf
     try make
 
 }
diff --git a/gnome-base/oaf/oaf-0.6.5.ebuild b/gnome-base/oaf/oaf-0.6.5.ebuild
index f7bfd4ea887b..adcef896cd58 100644
--- a/gnome-base/oaf/oaf-0.6.5.ebuild
+++ b/gnome-base/oaf/oaf-0.6.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-base/oaf/oaf-0.6.5.ebuild,v 1.1 2001/04/13 16:59:03 pete Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/oaf/oaf-0.6.5.ebuild,v 1.2 2001/05/27 02:58:36 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -29,13 +29,14 @@ src_compile() {
   then
     myconf="--disable-nls"
   fi
-  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome ${myconf}
+  try ./configure --host=${CHOST} --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --datadir=/opt/gnome/share ${myconf}
   try make
 }
 
 src_install() {
   
-  try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
+  try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome \
+  	datadir=${D}/opt/gnome/share install
   dodoc AUTHORS COPYING* ChangeLog README
   dodoc NEWS TODO
 }
diff --git a/kde-base/kdelibs/kdelibs-2.1.1.ebuild b/kde-base/kdelibs/kdelibs-2.1.1.ebuild
index b4a39a13fc94..8d0f8b3f9ed6 100644
--- a/kde-base/kdelibs/kdelibs-2.1.1.ebuild
+++ b/kde-base/kdelibs/kdelibs-2.1.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.1.1.ebuild,v 1.4 2001/04/24 01:27:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-2.1.1.ebuild,v 1.5 2001/05/27 02:58:36 achim Exp $
 
 V=2.1
 A=${P}.tar.bz2
@@ -18,7 +18,7 @@ DEPEND=">=sys-devel/gcc-2.95.2
 	>=media-libs/audiofile-0.1.9
 	>=media-libs/tiff-3.5.5
 	>=x11-libs/qt-x11-2.3.0
-	app-text/sgml-common
+	>=app-text/docbook-sgml-1.0
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	mysql? ( >=dev-db/mysql-3.23.30 )
 	postgres? ( >=dev-db/postgresql-7.0.3 )
@@ -28,7 +28,7 @@ DEPEND=">=sys-devel/gcc-2.95.2
 RDEPEND=">=sys-devel/gcc-2.95.2
 	 >=media-libs/audiofile-0.1.9
 	 >=x11-libs/qt-x11-2.3.0
-     =kde-base/kde-env-2.1"
+         =kde-base/kde-env-2.1"
 
 src_unpack() {
     unpack ${A}
diff --git a/net-analyzer/nmap/files/digest-nmap-2.54_beta22-r1 b/net-analyzer/nmap/files/digest-nmap-2.54_beta22-r1
new file mode 100644
index 000000000000..d25e83505872
--- /dev/null
+++ b/net-analyzer/nmap/files/digest-nmap-2.54_beta22-r1
@@ -0,0 +1 @@
+MD5 325f553a42461b78ce65fc91418fa256 nmap-2.54BETA22.tgz
diff --git a/net-analyzer/nmap/nmap-2.54_beta22-r1.ebuild b/net-analyzer/nmap/nmap-2.54_beta22-r1.ebuild
new file mode 100644
index 000000000000..c34b459f4de0
--- /dev/null
+++ b/net-analyzer/nmap/nmap-2.54_beta22-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Achim Gottinger <achim@gentoo.org>
+# $Heade
+
+P=nmap-2.54BETA22
+A=${P}.tgz
+S=${WORKDIR}/${P}
+DESCRIPTION="Portscanner"
+SRC_URI="http://www.insecure.org/nmap/dist/"${A}
+HOMEPAGE="http://www.insecure.org/nmap/"
+
+DEPEND="virtual/glibc
+	gtk? ( >=x11-libs/gtk+-1.2.8 )"
+
+src_compile() {                           
+  try ./configure --host=${CHOST} --prefix=/usr --mandir=/usr/share/man 
+  if [ "`use gtk`" ] ; then
+    try make
+  else
+    try make nmap
+  fi
+}
+
+src_install() {                               
+
+  try make prefix=${D}/usr mandir=${D}/usr/share/man install
+
+  dodoc CHANGELOG COPYING HACKING README*
+  cd docs
+  dodoc *.txt
+  docinto html
+  dodoc *.html
+}
+
+
+
diff --git a/net-mail/evolution/evolution-0.10.ebuild b/net-mail/evolution/evolution-0.10.ebuild
index 90bf41a7b27b..1cdc8d0fcb43 100644
--- a/net-mail/evolution/evolution-0.10.ebuild
+++ b/net-mail/evolution/evolution-0.10.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-mail/evolution/evolution-0.10.ebuild,v 1.1 2001/05/17 13:30:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-0.10.ebuild,v 1.2 2001/05/27 02:58:36 achim Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -23,7 +23,7 @@ src_compile() {
 #    else
 	myconf="--enable-ldap=no"
 #    fi
-    try ./configure --prefix=/opt/gnome --host=${CHOST} $myconf
+    try ./configure --prefix=/opt/gnome --host=${CHOST} --enable-file-locking=no $myconf
     try make
 
 }
diff --git a/profiles/package.mask b/profiles/package.mask
index 9b95e7f32766..1def7792fa4a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -2,7 +2,6 @@
 >=sys-apps/procps-2.0.7
 >=sys-devel/gcc-2.96
 >=sys-libs/readline-4.2
->=sys-libs/glibc-2.2.3
 >sys-devel/automake-1.4-r2
 app-admin/powertweak
 app-admin/va-systemimager-server
diff --git a/sys-apps/baselayout/baselayout-1.5-r3.ebuild b/sys-apps/baselayout/baselayout-1.5-r3.ebuild
index b9014241194e..05a0918cf10d 100644
--- a/sys-apps/baselayout/baselayout-1.5-r3.ebuild
+++ b/sys-apps/baselayout/baselayout-1.5-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.5-r3.ebuild,v 1.8 2001/05/23 23:01:43 drobbins Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.5-r3.ebuild,v 1.9 2001/05/27 02:58:08 achim Exp $# Copyright 1999-2000 Gentoo Technologies, Inc.
 
 A=""
 S=${WORKDIR}/${P}
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gentoo.org"
 
 src_install()
 {
-	if [ "$MAINTAINER" != "yes" ]
+	if [ "$MAINTAINER" != "yes" ] && [ "$ROOT" = "/" ]
 	then
 	echo '!!! baselayout should only be merged if you know what youre doing.'
 	echo '!!! It will overwrite important system files (passwd/group and others) with their'
diff --git a/sys-apps/portage/files/1.5/man/emerge.1 b/sys-apps/portage/files/1.5/man/emerge.1
new file mode 100644
index 000000000000..10127ef2287e
--- /dev/null
+++ b/sys-apps/portage/files/1.5/man/emerge.1
@@ -0,0 +1,65 @@
+.TH emerge "1" "May 2001" "portage 1.5" 
+.SH NAME
+ebuild \- manual page for the emerge program, the main new and enhanced interface to the Portage system. 
+.SH SYNOPSIS
+.B emerge
+[\fIoptions\fR] \fIfile\fR ...
+.TP
+.B emerge
+[\fIoptions\fR] system
+.SH DESCRIPTION
+The emrge programe is the new main user interface to the portage system. It will
+replace the \fIebuild\fR in most areas. It can be used to build install packages
+from source or to install or build binary packages. Please take a look at the
+ebuild (1) manual also.
+.PP
+.SH OPTIONS 
+\fIfile\fR
+.TP
+This must be a valid ebuild script or a vaild tbz2 package. For further information read ebuild(5).
+.TP
+\fBsystem\fR
+.TP
+If system is used emerge will install all packages listed in /etc/make.profile/packages and also packages that are required from those.
+.TP
+\fB--pretend\fR 
+Only shows a list of packages emerge whould install. emerge does not install the
+packages.
+.TP
+\fB--autoclean\fR
+Clean the build dir after merging the package.
+.TP
+\fB--usepkg\fR
+emerge will install binary packages if avaliable. Otherwise it will build
+from source. All binaries must be in the \fIPKGDIR\fR (default /usr/portage/packages/All)
+.TP
+\fB--buildpkg\fR
+emerge will build a binary package for each package it builds and merges.
+The package will be created in the \fIPKGDIR\fR/[category] subdir and
+hardlinked to \fIPKGDIR\fR/All.
+.TP
+.SH AUTHOR
+Achim Gottinger <achim@gentoo.org>
+.SH "SEE ALSO"
+ebuild(1) ebuild(5) make.defaults(5) make.conf(5)
+.TP
+The helper apps in \fI/usr/lib/portage/bin\fR.
+.SH FILES
+\fB/etc/make.conf\fR 
+Contains variables for the build-process and 
+overwrites those in make.defaults
+.TP
+\fB/etc/make.profile/make.defaults\fR
+Contains the profile dependend variables for the build-process,
+you should edit \fI/etc/make.conf\fR instead.
+.TP
+\fB/etc/make.profile/virtuals\fR 
+Contains a list of packages used to resolve virtual dependencies
+.TP
+\fB/etc/make.profile/package\fR
+Contains a list of packages used for the base system
+.TP
+\fB/etc/make.globals\fR 
+Contains the default variables for the build-process, 
+you should edit \fI/etc/make.conf\fR instead.
+.TP