Attachment #124131 for bug #167606

View | Details | Raw Unified | Return to bug 167606
Collapse All | Expand All

Lines 7-13 Link Here

(-)py-docutils/Makefile (-1 / +1 lines)
7	#	7	#
8		8
9	PORTNAME= docutils	9	PORTNAME= docutils
10	PORTVERSION= 0.8.1	10	PORTVERSION= 0.9
11	CATEGORIES= textproc python	11	CATEGORIES= textproc python
12	MASTER_SITES= SF \	12	MASTER_SITES= SF \
13	CHEESESHOP	13	CHEESESHOP

Lines 1-2 Link Here

(-)py-docutils/distinfo (-2 / +2 lines)
1	SHA256 (docutils-0.8.1.tar.gz) = 5a3b776518257a59fefaf48ef1e0635bc1179f8cafb02a9cc84c9644bb25df71	1	SHA256 (docutils-0.9.tar.gz) = ff49bf77e9135490a73740d884b418ab8b982ad16ee52cfe796d059c592ea245
2	SIZE (docutils-0.8.1.tar.gz) = 1499832	2	SIZE (docutils-0.9.tar.gz) = 1534138




--- setup.py.orig	2011-12-20 17:39:10.000000000 +0100
+++ setup.py	2012-05-05 08:45:22.000000000 +0200
@@ -22,6 +22,14 @@
     print ('system using your package manager.')
     sys.exit(1)
 
+def rename_scripts(files):
+    import shutil
+
+    if files:
+        dirname = os.path.abspath(os.path.join('tools', '_scripts'))
+        if not os.path.exists(dirname):
+            os.makedirs(dirname)
+            for file in files:
+                shutil.copyfile(file, os.path.join(dirname, os.path.basename(file[:-3])))
+
 
 if sys.version_info >= (3,):
     # copy-convert auxiliary python sources
@@ -89,6 +97,8 @@
 def do_setup():
     kwargs = package_data.copy()
     kwargs['classifiers'] = classifiers
+    # Rename scripts files (without .py).
+    rename_scripts(glob.glob('tools/rst*.py'))
     # Install data files properly.
     kwargs['cmdclass'] = {'build_data': build_data,
                           'install_data': smart_install_data}
@@ -161,17 +171,7 @@
                      ['docutils/writers/odf_odt/styles.odt']),
                      ]
                    + s5_theme_files),
-    'scripts' : ['tools/rst2html.py',
-                 'tools/rst2s5.py',
-                 'tools/rst2latex.py',
-                 # 'tools/rst2newlatex.py',
-                 'tools/rst2xetex.py',
-                 'tools/rst2man.py',
-                 'tools/rst2xml.py',

-                 'tools/rst2odt.py',
-                 'tools/rst2odt_prepstyles.py',
-                 ],}
+    'scripts' : glob.glob('tools/_scripts/*'),} 
 """Distutils setup parameters."""
 
 classifiers = [

Lines 110-118 Link Here

(-)py-docutils/pkg-plist (-9 / +19 lines)
110	%%PYTHON_SITELIBDIR%%/docutils/math/math2html.py	110	%%PYTHON_SITELIBDIR%%/docutils/math/math2html.py
111	%%PYTHON_SITELIBDIR%%/docutils/math/math2html.pyc	111	%%PYTHON_SITELIBDIR%%/docutils/math/math2html.pyc
112	%%PYTHON_SITELIBDIR%%/docutils/math/math2html.pyo	112	%%PYTHON_SITELIBDIR%%/docutils/math/math2html.pyo
113	%%PYTHON_SITELIBDIR%%/docutils/math/unimathsymbols2tex.py	113	%%PYTHON_SITELIBDIR%%/docutils/math/tex2unichar.py
114	%%PYTHON_SITELIBDIR%%/docutils/math/unimathsymbols2tex.pyc	114	%%PYTHON_SITELIBDIR%%/docutils/math/tex2unichar.pyc
115	%%PYTHON_SITELIBDIR%%/docutils/math/unimathsymbols2tex.pyo	115	%%PYTHON_SITELIBDIR%%/docutils/math/tex2unichar.pyo
		116	%%PYTHON_SITELIBDIR%%/docutils/math/unichar2tex.py
		117	%%PYTHON_SITELIBDIR%%/docutils/math/unichar2tex.pyc
		118	%%PYTHON_SITELIBDIR%%/docutils/math/unichar2tex.pyo
116	%%PYTHON_SITELIBDIR%%/docutils/nodes.py	119	%%PYTHON_SITELIBDIR%%/docutils/nodes.py
117	%%PYTHON_SITELIBDIR%%/docutils/nodes.pyc	120	%%PYTHON_SITELIBDIR%%/docutils/nodes.pyc
118	%%PYTHON_SITELIBDIR%%/docutils/nodes.pyo	121	%%PYTHON_SITELIBDIR%%/docutils/nodes.pyo
Lines 309-317 Link Here
309	%%PYTHON_SITELIBDIR%%/docutils/urischemes.py	312	%%PYTHON_SITELIBDIR%%/docutils/urischemes.py
310	%%PYTHON_SITELIBDIR%%/docutils/urischemes.pyc	313	%%PYTHON_SITELIBDIR%%/docutils/urischemes.pyc
311	%%PYTHON_SITELIBDIR%%/docutils/urischemes.pyo	314	%%PYTHON_SITELIBDIR%%/docutils/urischemes.pyo
312	%%PYTHON_SITELIBDIR%%/docutils/utils.py	315	%%PYTHON_SITELIBDIR%%/docutils/utils/__init__.py
313	%%PYTHON_SITELIBDIR%%/docutils/utils.pyc	316	%%PYTHON_SITELIBDIR%%/docutils/utils/__init__.pyc
314	%%PYTHON_SITELIBDIR%%/docutils/utils.pyo	317	%%PYTHON_SITELIBDIR%%/docutils/utils/__init__.pyo
		318	%%PYTHON_SITELIBDIR%%/docutils/utils/code_analyzer.py
		319	%%PYTHON_SITELIBDIR%%/docutils/utils/code_analyzer.pyc
		320	%%PYTHON_SITELIBDIR%%/docutils/utils/code_analyzer.pyo
		321	%%PYTHON_SITELIBDIR%%/docutils/utils/punctuation_chars.py
		322	%%PYTHON_SITELIBDIR%%/docutils/utils/punctuation_chars.pyc
		323	%%PYTHON_SITELIBDIR%%/docutils/utils/punctuation_chars.pyo
		324	%%PYTHON_SITELIBDIR%%/docutils/utils/roman.py
		325	%%PYTHON_SITELIBDIR%%/docutils/utils/roman.pyc
		326	%%PYTHON_SITELIBDIR%%/docutils/utils/roman.pyo
315	%%PYTHON_SITELIBDIR%%/docutils/writers/__init__.py	327	%%PYTHON_SITELIBDIR%%/docutils/writers/__init__.py
316	%%PYTHON_SITELIBDIR%%/docutils/writers/__init__.pyc	328	%%PYTHON_SITELIBDIR%%/docutils/writers/__init__.pyc
317	%%PYTHON_SITELIBDIR%%/docutils/writers/__init__.pyo	329	%%PYTHON_SITELIBDIR%%/docutils/writers/__init__.pyo
Lines 380-388 Link Here
380	%%PYTHON_SITELIBDIR%%/docutils/writers/xetex/__init__.py	392	%%PYTHON_SITELIBDIR%%/docutils/writers/xetex/__init__.py
381	%%PYTHON_SITELIBDIR%%/docutils/writers/xetex/__init__.pyc	393	%%PYTHON_SITELIBDIR%%/docutils/writers/xetex/__init__.pyc
382	%%PYTHON_SITELIBDIR%%/docutils/writers/xetex/__init__.pyo	394	%%PYTHON_SITELIBDIR%%/docutils/writers/xetex/__init__.pyo
383	%%PYTHON_SITELIBDIR%%/roman.py
384	%%PYTHON_SITELIBDIR%%/roman.pyc
385	%%PYTHON_SITELIBDIR%%/roman.pyo
386	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/xetex	395	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/xetex
387	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/s5_html/themes/small-white	396	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/s5_html/themes/small-white
388	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/s5_html/themes/small-black	397	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/s5_html/themes/small-black
Lines 398-403 Link Here
398	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/latex2e	407	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/latex2e
399	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/html4css1	408	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers/html4css1
400	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers	409	@dirrm %%PYTHON_SITELIBDIR%%/docutils/writers
		410	@dirrm %%PYTHON_SITELIBDIR%%/docutils/utils
401	@dirrm %%PYTHON_SITELIBDIR%%/docutils/transforms	411	@dirrm %%PYTHON_SITELIBDIR%%/docutils/transforms
402	@dirrm %%PYTHON_SITELIBDIR%%/docutils/readers	412	@dirrm %%PYTHON_SITELIBDIR%%/docutils/readers
403	@dirrm %%PYTHON_SITELIBDIR%%/docutils/parsers/rst/languages	413	@dirrm %%PYTHON_SITELIBDIR%%/docutils/parsers/rst/languages

Return to bug 167606

Lines 1-39 Link Here

(-)py-docutils/files/patch-setup.py (-12 / +9 lines)
1	--- setup.py.orig 2011-06-27 13:38:56.000000000 +0200	1	--- setup.py.orig 2011-12-20 17:39:10.000000000 +0100
2	+++ setup.py 2011-08-06 18:16:54.000000000 +0200	2	+++ setup.py 2012-05-05 08:45:22.000000000 +0200
3	@@ -22,6 +22,16 @@	3	@@ -22,6 +22,14 @@
4	print ('system using your package manager.')	4	print ('system using your package manager.')
5	sys.exit(1)	5	sys.exit(1)
6		6
7	+def rename_scripts(files):	7	+def rename_scripts(files):
8	+ import shutil	8	+ import shutil
9	+
10	+ if files:	9	+ if files:
11	+ dirname = os.path.abspath(os.path.join('tools', '_scripts'))	10	+ dirname = os.path.abspath(os.path.join('tools', '_scripts'))
12	+ if not os.path.exists(dirname):	11	+ if not os.path.exists(dirname):
13	+ os.makedirs(dirname)	12	+ os.makedirs(dirname)
14	+ for file in files:	13	+ for file in files:
15	+ shutil.copyfile(file, os.path.join(dirname, os.path.basename(file[:-3])))	14	+ shutil.copyfile(file, os.path.join(dirname, os.path.basename(file[:-3])))
16	+
17		15
18	if sys.version_info >= (3,):	16	if sys.version_info >= (3,):
19	# copy-convert auxiliary python sources	17	# copy-convert auxiliary python sources
20	@@ -92,6 +102,8 @@	18	@@ -89,6 +97,8 @@
21	if extras:	19	def do_setup():
22	kwargs['py_modules'] = extras	20	kwargs = package_data.copy()
23	kwargs['classifiers'] = classifiers	21	kwargs['classifiers'] = classifiers
24	+ # Rename scripts files (without .py)	22	+ # Rename scripts files (without .py).
25	+ rename_scripts(glob.glob('tools/rst*.py'))	23	+ rename_scripts(glob.glob('tools/rst*.py'))
26	# Install data files properly.	24	# Install data files properly.
27	kwargs['cmdclass'] = {'build_data': build_data,	25	kwargs['cmdclass'] = {'build_data': build_data,
28	'install_data': smart_install_data}	26	'install_data': smart_install_data}
29	@@ -166,18 +178,7 @@	27	@@ -161,17 +171,7 @@
30	['docutils/writers/odf_odt/styles.odt']),	28	['docutils/writers/odf_odt/styles.odt']),
31	]	29	]
32	+ s5_theme_files),	30	+ s5_theme_files),
33	- 'scripts' : ['tools/rst2html.py',	31	- 'scripts' : ['tools/rst2html.py',
34	- 'tools/rst2s5.py',	32	- 'tools/rst2s5.py',
35	- 'tools/rst2latex.py',	33	- 'tools/rst2latex.py',
36	- # 'tools/rst2newlatex.py',
37	- 'tools/rst2xetex.py',	34	- 'tools/rst2xetex.py',
38	- 'tools/rst2man.py',	35	- 'tools/rst2man.py',
39	- 'tools/rst2xml.py',	36	- 'tools/rst2xml.py',
Lines 42-48 Link Here
42	- 'tools/rst2odt.py',	39	- 'tools/rst2odt.py',
43	- 'tools/rst2odt_prepstyles.py',	40	- 'tools/rst2odt_prepstyles.py',
44	- ],}	41	- ],}
45	+ 'scripts' : glob.glob('tools/_scripts/*'),}	42	+ 'scripts' : glob.glob('tools/_scripts/*'),}
46	"""Distutils setup parameters."""	43	"""Distutils setup parameters."""
47		44
48	classifiers = [	45	classifiers = [