Revision: 3078
http://gar.svn.sourceforge.net/gar/?rev=3078&view=rev
Author: valholla
Date: 2009-02-12 14:49:54 +0000 (Thu, 12 Feb 2009)
Log Message:
-----------
prep for python 2.6
Modified Paths:
--------------
csw/mgar/pkg/pysetuptools/trunk/Makefile
csw/mgar/pkg/pysetuptools/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.depend
csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.gspec
csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.prototype
csw/mgar/pkg/pysetuptools/trunk/files/pyversion.diff
Modified: csw/mgar/pkg/pysetuptools/trunk/Makefile
===================================================================
--- csw/mgar/pkg/pysetuptools/trunk/Makefile 2009-02-12 14:42:49 UTC (rev
3077)
+++ csw/mgar/pkg/pysetuptools/trunk/Makefile 2009-02-12 14:49:54 UTC (rev
3078)
@@ -11,14 +11,16 @@
MASTER_SITES = http://cheeseshop.python.org/packages/source/s/setuptools/
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWpysetuptools,depend prototype)
-# We define upstream file regex so we can be notifed of new upstream software
release
-UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
+REQUIRED_PKGS_CSWpysetuptools = CSWpython
+PACKAGES = CSWpysetuptools
+CATALOGNAME_CSWpysetuptools = py_setuptools
+SPKG_DESC = Distribution Utiltiies for Python
-# Use versionless python lib
-PATCHFILES += pyversion.diff
+# We define upstream file regex so we can be notifed of new upstream software
release
+UFILES_REGEX = $(GARNAME)(\d+(?:\.\d+)*)
+
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS = $(WORKSRC)/setup.py
TEST_SCRIPTS = $(WORKSRC)/setup.py
@@ -29,10 +31,3 @@
include gar/category.mk
-PYTHONPATH = $(DESTDIR)$(libdir)/python/site-packages/
-export PYTHONPATH
-
-pre-install:
- install -d $(PYTHONPATH)
- $(DONADA)
-
Modified: csw/mgar/pkg/pysetuptools/trunk/checksums
===================================================================
--- csw/mgar/pkg/pysetuptools/trunk/checksums 2009-02-12 14:42:49 UTC (rev
3077)
+++ csw/mgar/pkg/pysetuptools/trunk/checksums 2009-02-12 14:49:54 UTC (rev
3078)
@@ -1,5 +1 @@
dedbf6a4f71cd6deaf13ee885054f16b download/setuptools-0.6c7.tar.gz
-e43523c3d7ef6a365b4ca3fc5af40ecf download/CSWpysetuptools.gspec
-36c5aa67998847e4cda35af7f52059b0 download/CSWpysetuptools.depend
-c2aa574f3e309b658e8c64bc3c4e1719 download/CSWpysetuptools.prototype
-c892107d0212679667a725e385106fe3 download/pyversion.diff
Deleted: csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.depend
===================================================================
--- csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.depend
2009-02-12 14:42:49 UTC (rev 3077)
+++ csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.depend
2009-02-12 14:49:54 UTC (rev 3078)
@@ -1 +0,0 @@
-P CSWpython python - The Python 2.3 language interpreter
Deleted: csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.gspec
===================================================================
--- csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.gspec 2009-02-12
14:42:49 UTC (rev 3077)
+++ csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.gspec 2009-02-12
14:49:54 UTC (rev 3078)
@@ -1,8 +0,0 @@
-%var bitname pysetuptools
-%var pkgname CSWpysetuptools
-%var arch all
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-Author: Phillip J. Eby <peak at eby-sarna.com>
-License: PSF (http://www.python.org/2.3.2/license.html) or
- ZPL (http://www.zope.org/Resources/ZPL)
Deleted: csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.prototype
===================================================================
--- csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.prototype
2009-02-12 14:42:49 UTC (rev 3077)
+++ csw/mgar/pkg/pysetuptools/trunk/files/CSWpysetuptools.prototype
2009-02-12 14:49:54 UTC (rev 3078)
@@ -1,88 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/easy_install 0755 root bin
-f none /opt/csw/bin/easy_install-2.5 0755 root bin
-d none /opt/csw/lib 0755 root bin
-d none /opt/csw/lib/python 0755 root bin
-d none /opt/csw/lib/python/site-packages 0755 root bin
-f none /opt/csw/lib/python/site-packages/easy_install.py 0644 root bin
-f none /opt/csw/lib/python/site-packages/easy_install.pyc 0644 root bin
-f none /opt/csw/lib/python/site-packages/pkg_resources.py 0644 root bin
-f none /opt/csw/lib/python/site-packages/pkg_resources.pyc 0644 root bin
-d none /opt/csw/lib/python/site-packages/setuptools 0755 root bin
-d none /opt/csw/lib/python/site-packages/setuptools-0.6c7-py2.5.egg-info 0755
root bin
-f none
/opt/csw/lib/python/site-packages/setuptools-0.6c7-py2.5.egg-info/PKG-INFO 0644
root bin
-f none
/opt/csw/lib/python/site-packages/setuptools-0.6c7-py2.5.egg-info/SOURCES.txt
0644 root bin
-f none
/opt/csw/lib/python/site-packages/setuptools-0.6c7-py2.5.egg-info/dependency_links.txt
0644 root bin
-f none
/opt/csw/lib/python/site-packages/setuptools-0.6c7-py2.5.egg-info/entry_points.txt
0755 root bin
-f none
/opt/csw/lib/python/site-packages/setuptools-0.6c7-py2.5.egg-info/top_level.txt
0644 root bin
-f none
/opt/csw/lib/python/site-packages/setuptools-0.6c7-py2.5.egg-info/zip-safe 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/__init__.py 0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/__init__.pyc 0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/archive_util.py 0644 root
bin
-f none /opt/csw/lib/python/site-packages/setuptools/archive_util.pyc 0644 root
bin
-f none /opt/csw/lib/python/site-packages/setuptools/cli.exe 0755 root bin
-d none /opt/csw/lib/python/site-packages/setuptools/command 0755 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/__init__.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/__init__.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/alias.py 0644 root
bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/alias.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/bdist_egg.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/bdist_egg.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/bdist_rpm.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/bdist_rpm.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/bdist_wininst.py
0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/bdist_wininst.pyc
0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/build_ext.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/build_ext.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/build_py.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/build_py.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/develop.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/develop.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/easy_install.py
0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/easy_install.pyc
0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/egg_info.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/egg_info.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/install.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/install.pyc 0644
root bin
-f none
/opt/csw/lib/python/site-packages/setuptools/command/install_egg_info.py 0644
root bin
-f none
/opt/csw/lib/python/site-packages/setuptools/command/install_egg_info.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/install_lib.py
0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/install_lib.pyc
0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/install_scripts.py
0644 root bin
-f none
/opt/csw/lib/python/site-packages/setuptools/command/install_scripts.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/register.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/register.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/rotate.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/rotate.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/saveopts.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/saveopts.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/sdist.py 0644 root
bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/sdist.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/setopt.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/setopt.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/test.py 0644 root
bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/test.pyc 0644 root
bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/upload.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/command/upload.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/depends.py 0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/depends.pyc 0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/dist.py 0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/dist.pyc 0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/extension.py 0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/extension.pyc 0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/gui.exe 0755 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/package_index.py 0644 root
bin
-f none /opt/csw/lib/python/site-packages/setuptools/package_index.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/sandbox.py 0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/sandbox.pyc 0644 root bin
-d none /opt/csw/lib/python/site-packages/setuptools/tests 0755 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/tests/__init__.py 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/tests/__init__.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/tests/doctest.py 0644 root
bin
-f none /opt/csw/lib/python/site-packages/setuptools/tests/doctest.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/tests/test_packageindex.py
0644 root bin
-f none
/opt/csw/lib/python/site-packages/setuptools/tests/test_packageindex.pyc 0644
root bin
-f none /opt/csw/lib/python/site-packages/setuptools/tests/test_resources.py
0644 root bin
-f none /opt/csw/lib/python/site-packages/setuptools/tests/test_resources.pyc
0644 root bin
-f none /opt/csw/lib/python/site-packages/site.py 0644 root bin
-f none /opt/csw/lib/python/site-packages/site.pyc 0644 root bin
Deleted: csw/mgar/pkg/pysetuptools/trunk/files/pyversion.diff
===================================================================
--- csw/mgar/pkg/pysetuptools/trunk/files/pyversion.diff 2009-02-12
14:42:49 UTC (rev 3077)
+++ csw/mgar/pkg/pysetuptools/trunk/files/pyversion.diff 2009-02-12
14:49:54 UTC (rev 3078)
@@ -1,42 +0,0 @@
-diff --speed-large-files --minimal -Nru
setuptools-0.6c7.orig/setuptools/command/easy_install.py
setuptools-0.6c7/setuptools/command/easy_install.py
---- setuptools-0.6c7.orig/setuptools/command/easy_install.py 2007-09-04
12:18:45.000000000 -0400
-+++ setuptools-0.6c7/setuptools/command/easy_install.py 2007-10-06
00:19:59.860256000 -0400
-@@ -1107,7 +1107,7 @@
-
- INSTALL_SCHEMES = dict(
- posix = dict(
-- install_dir = '$base/lib/python$py_version_short/site-packages',
-+ install_dir = '$base/lib/python/site-packages',
- script_dir = '$base/bin',
- ),
- )
-diff --speed-large-files --minimal -Nru
setuptools-0.6c7.orig/virtual-python.py setuptools-0.6c7/virtual-python.py
---- setuptools-0.6c7.orig/virtual-python.py 2006-09-20 17:05:04.000000000
-0400
-+++ setuptools-0.6c7/virtual-python.py 2007-10-06 00:16:48.138770000 -0400
-@@ -64,7 +64,7 @@
- global verbose
-
- home_dir = os.path.expanduser(options.prefix)
-- lib_dir = join(home_dir, 'lib', py_version)
-+ lib_dir = join(home_dir, 'lib', 'python')
- inc_dir = join(home_dir, 'include', py_version)
- bin_dir = join(home_dir, 'bin')
-
-@@ -82,7 +82,7 @@
-
- prefix = sys.prefix
- mkdir(lib_dir)
-- stdlib_dir = join(prefix, 'lib', py_version)
-+ stdlib_dir = join(prefix, 'lib', 'python')
- for fn in os.listdir(stdlib_dir):
- if fn != 'site-packages':
- symlink(join(stdlib_dir, fn), join(lib_dir, fn))
-@@ -99,7 +99,7 @@
- symlink(join(stdinc_dir, fn), join(inc_dir, fn))
-
- if sys.exec_prefix != sys.prefix:
-- exec_dir = join(sys.exec_prefix, 'lib', py_version)
-+ exec_dir = join(sys.exec_prefix, 'lib', 'python')
- for fn in os.listdir(exec_dir):
- symlink(join(exec_dir, fn), join(lib_dir, fn))
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
