*** empty log message ***

2 files changed, 67 insertions, 2 deletions

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