Synthetic commit for incomplete tag portage_2_0_47_r9portage_2_0_47_r9

2 files changed, 17 insertions, 9 deletions

diff --git a/bin/g-cpan.pl b/bin/g-cpan.pl
index 9f4269f..891b41e 100755
--- a/bin/g-cpan.pl
+++ b/bin/g-cpan.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/Attic/g-cpan.pl,v 1.5 2003/03/08 20:05:39 jrray Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/Attic/g-cpan.pl,v 1.4 2003/02/23 23:10:03 alain Exp $
 
 # History: 
 
@@ -292,8 +292,8 @@ sub get_globals {
     # let's not beat around the bush here, make.conf isn't the
     # only place these variables can be defined
 
-    $OVERLAY_DIR=qx(/usr/lib/portage/bin/portageq portdir_overlay);
-    $PORTAGE_DIR=qx(/usr/lib/portage/bin/portageq portdir);
+    OVERLAY_DIR=$(/usr/lib/portage/bin/portageq portdir_overlay)
+    PORTAGE_DIR=$(/usr/lib/portage/bin/portageq portdir)
     
     unless ( length $OVERLAY_DIR && -d $OVERLAY_DIR ) {
         $OVERLAY_DIR = "";
diff --git a/man/ebuild.5 b/man/ebuild.5
index 5dc1177..0a9b7f3 100644
--- a/man/ebuild.5
+++ b/man/ebuild.5
@@ -365,7 +365,8 @@ Useful for creating custom options to pass to a configure script. If
 not in the \fBUSE\fR variable, then the string
 \fI--without-[configure option]\fR will be echoed.  If
 \fIconfigure option\fR is not specified, than \fIUSE item\fR will be
-used in its place.
+used instead. You should depend on >=sys-apps/portage-2.0.46-r12 to
+use this feature for the time being. It is a new feature.
 .RS
 .TP
 .I Example:
@@ -394,13 +395,17 @@ Useful for creating custom options to pass to a configure script. If
 \fI--enable-[configure option]\fR will be echoed.  If \fIUSE item\fR is
 not in the \fBUSE\fR variable, then the string
 \fI--disable-[configure option]\fR will be echoed. If \fIconfigure option\fR
-is not specified, than \fIUSE item\fR will be used in its place.
+is not specified, than \fIUSE item\fR will be used instead. You should
+depend on >=sys-apps/portage-2.0.46-r12 to use this feature for the
+time being. It is a new feature.
 .br
 See \fBuse_with\fR for an example.
 .TP
 \fBhas\fR \fI<item>\fR \fI<item list>\fR
 If \fIitem\fR is in \fIitem list\fR, then \fIitem\fR is echoed and \fBhas\fR
-returns 0.  Otherwise, nothing is echoed and 1 is returned.
+returns 0.  Otherwise, nothing is echoed and 1 is returned. You should
+depend on >=sys-apps/portage-2.0.46-r12 to use this feature for the
+time being. It is a new feature.
 .br
 The \fIitem list\fR is delimited by the \fIIFS\fR variable.  This variable
 has a default value of ' ', or a space.  It is a \fBbash\fR(1) setting.
@@ -409,13 +414,16 @@ has a default value of ' ', or a space.  It is a \fBbash\fR(1) setting.
 Check to see if \fIcategory/package-version\fR is installed on the system.
 The parameter accepts all values that are acceptable in the \fBDEPEND\fR
 variable.  The function returns 0 if \fIcategory/package-version\fR is
-installed, 1 otherwise.
+installed, 1 otherwise. You should depend on >=sys-apps/portage-2.0.46-r12
+to use this feature for the time being. It is a new feature.
 .TP
 \fBbest_version\fR \fI<package name>\fR
 This function will look up \fIpackage name\fR in the database of currently
 installed programs and echo the "best version" of the package that is
 currently installed.  The function returns 0 if there is a package that
-matches \fIpackage name\fR.  Otherwise, the function will return 1.
+matches \fIpackage name\fR.  Otherwise, the function will return 1. You
+should depend on >=sys-apps/portage-2.0.46-r12 to use this feature for the
+time being. It is a new feature.
 .RS
 .TP
 .I Example:
@@ -733,4 +741,4 @@ Nicholas Jones <carpaski@gentoo.org>
 .br
 Mike Frysinger <vapier@gentoo.org>
 .SH "CVS HEADER"
-$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/man/ebuild.5,v 1.41 2003/03/07 16:27:15 vapier Exp $
+$Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/man/ebuild.5,v 1.40 2003/02/28 09:02:13 carpaski Exp $