virtual/python updates

13 files changed, 82 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 0bad2c34cd18..74cf68d6f351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,33 @@
 date 01 Dec 2000
 
+upd gnome-office/gnumeric-0.59a to 0.59a-r1
+drobbins
+now depends on virtual/python-1.5.2
+
+upd dev-python/gnome-python-1.0.53-r1 to 1.0.53-r2
+drobbins
+now depends on virtual/python-1.5.2
+
+upd dev-lang/swig-1.3_alpha5 to 1.3_alpha5-r1
+drobbins
+now depends on virtual/python-1.5.2
+
+upd app-editors/vim-gtk-5.7-r1 to 5.7-r2
+drobbins
+now depends on virtual/python-1.5.2
+
+upd dev-lang/python-1.5.2-r2 to 1.5.2-r3
+drobbins
+now provides virtual/python-1.5.2
+
+upd sys-devel/python-basic-1.5.2-r2 to 1.5.2-r3
+drobbins
+now provides virtual/python-1.5.2
+
+upd app-admin/yup-0.6.5-r1 to 0.6.5-r2
+drobbins
+yup now depends on virtual/python-1.5.2
+
 upd sys-apps/portage-1.3-r1 to 1.3-r2
 drobbins
 Updated make.conf so that portage is production-ready
diff --git a/app-admin/yup/yup-0.6.5-r1.ebuild b/app-admin/yup/yup-0.6.5-r2.ebuild
index a612a29982e8..4781b05cc79a 100644
--- a/app-admin/yup/yup-0.6.5-r1.ebuild
+++ b/app-admin/yup/yup-0.6.5-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/app-admin/yup/yup-0.6.5-r1.ebuild,v 1.4 2000/11/01 04:44:10 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/yup/yup-0.6.5-r2.ebuild,v 1.1 2000/12/01 19:46:11 drobbins Exp $
 
 P=yup-0.6.5
 A=${P}.tar.gz
@@ -9,7 +9,7 @@ S=${WORKDIR}/${P}
 DESCRIPTION="Interactive automated package management program for RPM-based distributions"
 SRC_URI="ftp://ftp.yellowdoglinux.com/pub/yellowdog/software/yup/"${A}
 
-DEPEND="|| ( >=sys-devel/python-basic-1.5.2 >=dev-lang/python-1.5.2 )"
+DEPEND=">=virtual/python-1.5.2"
 
 src_unpack() {
   unpack ${A}
diff --git a/app-editors/vim-gtk/vim-gtk-5.7-r1.ebuild b/app-editors/vim-gtk/vim-gtk-5.7-r2.ebuild
index 4869be0eccc9..3bed9334ac81 100644
--- a/app-editors/vim-gtk/vim-gtk-5.7-r1.ebuild
+++ b/app-editors/vim-gtk/vim-gtk-5.7-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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-gtk/vim-gtk-5.7-r1.ebuild,v 1.5 2000/11/15 16:33:15 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-gtk/vim-gtk-5.7-r2.ebuild,v 1.1 2000/12/01 19:46:11 drobbins Exp $
 
 P=vim-gtk-5.7
 A="vim-5.7-src.tar.gz vim-5.7-rt.tar.gz"
@@ -18,7 +18,7 @@ DEPEND=">=sys-libs/gdbm-1.8.0
 	>=dev-libs/glib-1.2.8
 	>=x11-libs/gtk+-1.2.8
 	>=x11-base/xfree-4.0.1
-	|| ( >=sys-devel/python-basic-1.5.2 >=dev-lang/python-1.5.2 )"
+	>=virtual/python-1.5.2"
 #	>=dev-lang/tcl-tk-8.1.1 does not work
 src_compile() {                           
     try ./configure --prefix=/usr --host=${CHOST} \
diff --git a/app-office/gnumeric/gnumeric-0.59a.ebuild b/app-office/gnumeric/gnumeric-0.59a-r1.ebuild
index 982e14c84829..c21544a6e1a5 100644
--- a/app-office/gnumeric/gnumeric-0.59a.ebuild
+++ b/app-office/gnumeric/gnumeric-0.59a-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/app-office/gnumeric/gnumeric-0.59a.ebuild,v 1.3 2000/11/25 18:59:38 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-0.59a-r1.ebuild,v 1.1 2000/12/01 19:46:12 drobbins Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/"${A}
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 
 DEPEND=">=sys-devel/perl-5
-	|| ( >=sys-devel/python-basic-1.5 >=dev-lang/python-1.5 )
+	>=virtual/python-1.5.2
 	>=gnome-base/gal-0.2.2
 	>=gnome-libs/gb-0.0.15
 	>=gnome-libs/libole2-0.1.7
diff --git a/current-packages b/current-packages
index 66b18d179afb..694ec1f98ce1 100644
--- a/current-packages
+++ b/current-packages
@@ -10,7 +10,7 @@
 #!./app-admin/sysstat-3.2.4.ebuild
 ./app-admin/usbview/usbview-0.9.0.ebuild
 ./app-admin/webalizer/webalizer-1.30.04-r1.ebuild
-./app-admin/yup/yup-0.6.5-r1.ebuild
+./app-admin/yup/yup-0.6.5-r2.ebuild
 ./app-arch/dump/dump-0.4.20_beta-r1.ebuild
 ./app-arch/rpm/rpm-3.0.5.ebuild
 #./app-arch/rpm/rpm-4.0.ebuild
@@ -22,7 +22,7 @@
 #./app-editors/gtk-xemacs/gtk-xemacs-21.1.12_p3.ebuild
 ./app-editors/joe/joe-2.8-r1.ebuild
 ./app-editors/nedit/nedit-5.1.1.ebuild
-./app-editors/vim-gtk/vim-gtk-5.7-r1.ebuild
+./app-editors/vim-gtk/vim-gtk-5.7-r2.ebuild
 #./app-emulation/wine/wine-20001002.ebuild
 ./app-misc/gfontview/gfontview-0.4.1-r1.ebuild
 ./app-misc/lhinv/lhinv-1.1-r1.ebuild
@@ -78,9 +78,9 @@
 ./dev-lang/nasm/nasm-0.98-r1.ebuild
 #./dev-lang/php-4/php-4.0.0-r1.ebuild
 ./dev-lang/php-4/php-4.0.3_p1.ebuild
-./dev-lang/python/python-1.5.2-r2.ebuild
+./dev-lang/python/python-1.5.2-r3.ebuild
 ./dev-lang/ruby/ruby-1.6.1.ebuild
-#!./dev-lang/swig/swig-1.3_alpha5.ebuild
+#!./dev-lang/swig/swig-1.3_alpha5-r1.ebuild
 #./dev-lang/tcl-tk-8.0/tcl-tk-8.0.5-r1.ebuild
 ./dev-lang/tcl-tk-8.1/tcl-tk-8.1.1-r1.ebuild
 ./dev-libs/g-wrap/g-wrap-0.9.5.ebuild
@@ -127,7 +127,7 @@
 ./dev-perl/mod_perl/mod_perl-1.24.1.ebuild
 #./dev-perl/mod_perl/mod_perl-1.24.ebuild
 ./dev-perl/perl-tk/perl-tk800-022.ebuild
-./dev-python/gnome-python/gnome-python-1.0.53-r1.ebuild
+./dev-python/gnome-python/gnome-python-1.0.53-r2.ebuild
 ./dev-ruby/amstd/amstd-1.9.5.ebuild
 ./dev-ruby/optparse/optparse-0.7.5.ebuild
 ./dev-ruby/racc/racc-1.2.4.ebuild
@@ -194,7 +194,7 @@
 #./gnome-office/eog/eog-0.5.ebuild
 ./gnome-office/gnome-db/gnome-db-0.2.0.ebuild
 ./gnome-office/gnome-pim/gnome-pim-1.2.0-r1.ebuild
-./gnome-office/gnumeric/gnumeric-0.59a.ebuild
+./gnome-office/gnumeric/gnumeric-0.59a-r1.ebuild
 ./kde-apps/cervisia/cervisia-0.7.1.ebuild
 ./kde-apps/kdeadmin/kdeadmin-2.0.ebuild
 ./kde-apps/kdegraphics/kdegraphics-2.0.ebuild
@@ -454,7 +454,7 @@
 ./sys-devel/make/make-3.79.1-r1.ebuild
 ./sys-devel/patch/patch-2.5.4-r1.ebuild
 ./sys-devel/perl/perl-5.6.0-r3.ebuild
-./sys-devel/python-basic/python-basic-1.5.2-r2.ebuild
+./sys-devel/python-basic/python-basic-1.5.2-r4.ebuild
 ./sys-kernel/linux-UP-2.2.17/linux-UP-2.2.17-r3.ebuild
 #./sys-kernel/linux-UP-2.2.17/linux-UP-2.2.17-r4.ebuild
 #./sys-kernel/linux-UP-2.2.17/linux-UP-nfs3-2.2.17-r1.ebuild
diff --git a/current-packages.new b/current-packages.new
index 25ac6e8f4e8c..cc047a1118c1 100644
--- a/current-packages.new
+++ b/current-packages.new
@@ -8,7 +8,7 @@
 ./app-admin/sysstat/sysstat-3.2.4.ebuild
 ./app-admin/usbview/usbview-0.9.0.ebuild
 ./app-admin/webalizer/webalizer-1.30.04-r1.ebuild
-./app-admin/yup/yup-0.6.5-r1.ebuild
+./app-admin/yup/yup-0.6.5-r2.ebuild
 ./app-arch/dump/dump-0.4.20_beta-r1.ebuild
 ./app-arch/rpm/rpm-3.0.5.ebuild
 ./app-arch/unzip/unzip-5.41-r1.ebuild
@@ -18,7 +18,7 @@
 ./app-doc/man-pages/man-pages-1.31.ebuild
 ./app-editors/joe/joe-2.8-r1.ebuild
 ./app-editors/nedit/nedit-5.1.1.ebuild
-./app-editors/vim-gtk/vim-gtk-5.7-r1.ebuild
+./app-editors/vim-gtk/vim-gtk-5.7-r2.ebuild
 #./app-emulation/wine/wine-20001002.ebuild
 ./app-misc/gfontview/gfontview-0.4.1-r1.ebuild
 ./app-misc/lhinv/lhinv-1.1-r1.ebuild
@@ -66,9 +66,9 @@
 ./dev-lang/nasm/nasm-0.98-r1.ebuild
 #./dev-lang/php-4/php-4.0.0-r1.ebuild
 ./dev-lang/php-4/php-4.0.3_p1.ebuild
-./dev-lang/python/python-1.5.2-r2.ebuild
+./dev-lang/python/python-1.5.2-r3.ebuild
 ./dev-lang/ruby/ruby-1.6.1.ebuild
-./dev-lang/swig/swig-1.3_alpha5.ebuild
+./dev-lang/swig/swig-1.3_alpha5-r1.ebuild
 #./dev-lang/tcl-tk-8.0/tcl-tk-8.0.5-r1.ebuild
 ./dev-lang/tcl-tk-8.1/tcl-tk-8.1.1-r1.ebuild
 ./dev-libs/g-wrap/g-wrap-0.9.5.ebuild
@@ -111,7 +111,7 @@
 ./dev-perl/mod_perl/mod_perl-1.24.1.ebuild
 #./dev-perl/mod_perl/mod_perl-1.24.ebuild
 ./dev-perl/perl-tk/perl-tk800-022.ebuild
-./dev-python/gnome-python/gnome-python-1.0.53-r1.ebuild
+./dev-python/gnome-python/gnome-python-1.0.53-r2.ebuild
 ./dev-ruby/amstd/amstd-1.9.5.ebuild
 ./dev-ruby/optparse/optparse-0.7.5.ebuild
 ./dev-ruby/racc/racc-1.2.4.ebuild
@@ -178,7 +178,7 @@
 #./gnome-office/eog/eog-0.5.ebuild
 ./gnome-office/gnome-db/gnome-db-0.2.0.ebuild
 ./gnome-office/gnome-pim/gnome-pim-1.2.0-r1.ebuild
-./gnome-office/gnumeric/gnumeric-0.59a.ebuild
+./gnome-office/gnumeric/gnumeric-0.59a-r1.ebuild
 ./kde-apps/cervisia/cervisia-0.7.1.ebuild
 ./kde-apps/kdeadmin/kdeadmin-2.0.ebuild
 ./kde-apps/kdegraphics/kdegraphics-2.0.ebuild
@@ -433,5 +433,5 @@
 ./sys-devel/make/make-3.79.1-r1.ebuild
 ./sys-devel/patch/patch-2.5.4-r1.ebuild
 ./sys-devel/perl/perl-5.6.0-r3.ebuild
-./sys-devel/python-basic/python-basic-1.5.2-r3.ebuild
+./sys-devel/python-basic/python-basic-1.5.2-r4.ebuild
 ./sys-kernel/linux/linux-2.4.0_rc10-r3.ebuild
diff --git a/dev-lang/python/python-1.5.2-r2.ebuild b/dev-lang/python/python-1.5.2-r3.ebuild
index bb1d218bdcad..2630790da61e 100644
--- a/dev-lang/python/python-1.5.2-r2.ebuild
+++ b/dev-lang/python/python-1.5.2-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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-1.5.2-r2.ebuild,v 1.5 2000/11/21 19:44:58 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-1.5.2-r3.ebuild,v 1.1 2000/12/01 19:46:11 drobbins Exp $
 
 P=python-1.5.2      
 A="py152.tgz python-fchksum-1.1.tar.gz"
@@ -21,7 +21,9 @@ DEPEND=">=sys-apps/bash-2.04
 	>=sys-libs/ncurses-5.1
 	>=dev-lang/tcl-tk-8.1
 	>=x11-base/xfree-4.0.1"
-	
+
+PROVIDE="virtual/python-1.5.2"
+
 # This does not work	>=dev-lang/tcl-tk-8.1.1
 src_compile() {                           
     try ./configure --prefix=/usr --with-threads
diff --git a/dev-lang/swig/swig-1.3_alpha5.ebuild b/dev-lang/swig/swig-1.3_alpha5-r1.ebuild
index 88c3db8c3b0d..cb256235bc13 100644
--- a/dev-lang/swig/swig-1.3_alpha5.ebuild
+++ b/dev-lang/swig/swig-1.3_alpha5-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-lang/swig/swig-1.3_alpha5.ebuild,v 1.1 2000/11/26 20:54:17 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swig/swig-1.3_alpha5-r1.ebuild,v 1.1 2000/12/01 19:46:12 drobbins Exp $
 
 P=swig1.3a5
 A=${P}.tar.gz
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.swig.org"
 
 DEPEND=">=sys-devel/gcc-2.95.2
 	>=sys-libs/glibc-2.1.3
-	|| ( >=sys-devel/python-basic-1.5.2 >=dev-lang/python-1.5.2 )
+	>=virtual/python-1.5.2
 	>=dev-lang/jdk-1.2.2
 	>=dev-lang/ruby-1.6.1
 	>=dev-util/guile-1.4
diff --git a/dev-python/gnome-python/gnome-python-1.0.53-r1.ebuild b/dev-python/gnome-python/gnome-python-1.0.53-r2.ebuild
index bd247258df68..0d90832f0ea3 100644
--- a/dev-python/gnome-python/gnome-python-1.0.53-r1.ebuild
+++ b/dev-python/gnome-python/gnome-python-1.0.53-r2.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/dev-python/gnome-python/gnome-python-1.0.53-r1.ebuild,v 1.5 2000/11/03 17:47:44 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.0.53-r2.ebuild,v 1.1 2000/12/01 19:46:12 drobbins Exp $
 
-P=gnome-python-1.0.53
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="gnome-python"
@@ -12,7 +11,7 @@ HOMEPAGE="http://www.gnome.org"
 
 DEPEND=">=gnome-base/libglade-0.14
 	>=gnome-base/gnome-core-1.2.2.1
-	|| ( sys-devel/python-basic dev-lang/python )"
+	>=virtual/python-1.5.2"
 
 src_compile() {                           
   cd ${S}
diff --git a/gnome-office/gnumeric/gnumeric-0.59a.ebuild b/gnome-office/gnumeric/gnumeric-0.59a-r1.ebuild
index 864c8aa7ae11..b23a2611925c 100644
--- a/gnome-office/gnumeric/gnumeric-0.59a.ebuild
+++ b/gnome-office/gnumeric/gnumeric-0.59a-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/gnome-office/gnumeric/gnumeric-0.59a.ebuild,v 1.3 2000/11/25 18:59:38 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-office/gnumeric/gnumeric-0.59a-r1.ebuild,v 1.1 2000/12/01 19:46:12 drobbins Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/gnumeric/"${A}
 HOMEPAGE="http://www.gnome.org/gnome-office/gnumeric.shtml"
 
 DEPEND=">=sys-devel/perl-5
-	|| ( >=sys-devel/python-basic-1.5 >=dev-lang/python-1.5 )
+	>=virtual/python-1.5.2
 	>=gnome-base/gal-0.2.2
 	>=gnome-libs/gb-0.0.15
 	>=gnome-libs/libole2-0.1.7
diff --git a/sys-apps/portage/files/ebuild b/sys-apps/portage/files/ebuild
index 5d629ef215e6..99f0fabaef5f 100644
--- a/sys-apps/portage/files/ebuild
+++ b/sys-apps/portage/files/ebuild
@@ -140,6 +140,18 @@ build_depend() {
 	fi
 }
 
+gen_depend() {
+	for x in $DEPEND
+	do 
+		echo "$x" >> ${FILESDIR}/depend-${PF}
+	done
+	for x in $RDEPEND
+	do
+		echo "$x" >> ${FILESDIR}/rdepend-${PF}
+	done
+	echo ">>> Completed generating dependencies for ${PF}."
+}
+
 merge_check() {
 	dopython portage.merge_check "${CATEGORY}/${PF}"
     if [ $? -ne 0 ]
@@ -792,7 +804,11 @@ src_menu() {
 		dyn_merge
 		runtime_depend
 	    ;;
-
+	gendeps)
+		#create DEPEND and RDEPEND files in the same directory as the .ebuild file
+		#this is used for the auto dependency resolving features of ebuild
+		gen_depend
+		;;
 	rpm)
 		build_depend
 		dyn_fetch
diff --git a/sys-apps/portage/portage-1.3-r2.ebuild b/sys-apps/portage/portage-1.3-r2.ebuild
index ec1f52e56909..83ea09ad28c3 100644
--- a/sys-apps/portage/portage-1.3-r2.ebuild
+++ b/sys-apps/portage/portage-1.3-r2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc. Distributed under the terms
-# of the GNU General Public License, v2 or later Author Daniel Robbins
-# <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-1.3-r2.ebuild,v 1.1 2000/12/01 17:21:17 drobbins Exp $
+# of the GNU General Public License, v2 or later 
+# Author Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-1.3-r2.ebuild,v 1.2 2000/12/01 19:46:12 drobbins Exp $
  
 A=""
 S=${WORKDIR}/${P}
 DESCRIPTION="Portage autobuild system"
 SRC_URI=""
 RDEPEND=">=sys-apps/bash-2.04
-	 >=sys-devel/perl-5.6.0
-	 || ( >=sys-devel/python-basic-1.5 >=dev-lang/python-1.5 )"
+	>=sys-devel/perl-5.6.0
+	>=virtual/python-1.5.2"
 
 src_unpack() {
   mkdir ${S}
diff --git a/sys-devel/python-basic/python-basic-1.5.2-r3.ebuild b/sys-devel/python-basic/python-basic-1.5.2-r4.ebuild
index 2e4eab6427e5..b1acecba4081 100644
--- a/sys-devel/python-basic/python-basic-1.5.2-r3.ebuild
+++ b/sys-devel/python-basic/python-basic-1.5.2-r4.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 Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/python-basic/python-basic-1.5.2-r3.ebuild,v 1.1 2000/11/30 23:15:06 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/python-basic/python-basic-1.5.2-r4.ebuild,v 1.1 2000/12/01 19:46:12 drobbins Exp $
 
 P=python-basic-1.5.2      
 A="py152.tgz python-fchksum-1.1.tar.gz"
@@ -18,7 +18,7 @@ DEPEND=">=sys-libs/db-1.85
 	>=sys-libs/gpm-1.19.3"
 RDEPEND="$DEPEND
 	 >=sys-apps/bash-2.04"
-
+PROVIDE="virtual/python-1.5.2"
 
 src_compile() {                           
     try ./configure --prefix=/usr --with-threads