From 710baf4d38f91095f86bfa5724985040c5d71807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 16 Jun 2021 23:52:24 -0300 Subject: [PATCH 1/2] python3-docutils: update to 0.17.1, remove python-docutils. --- .../python-docutils/patches/test-import.patch | 20 ------ srcpkgs/python-docutils/template | 62 ------------------- srcpkgs/python3-docutils | 1 - srcpkgs/python3-docutils/template | 39 ++++++++++++ 4 files changed, 39 insertions(+), 83 deletions(-) delete mode 100644 srcpkgs/python-docutils/patches/test-import.patch delete mode 100644 srcpkgs/python-docutils/template delete mode 120000 srcpkgs/python3-docutils create mode 100644 srcpkgs/python3-docutils/template diff --git a/srcpkgs/python-docutils/patches/test-import.patch b/srcpkgs/python-docutils/patches/test-import.patch deleted file mode 100644 index 9521dab29d9b..000000000000 --- a/srcpkgs/python-docutils/patches/test-import.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/test/DocutilsTestSupport.py -+++ b/test/DocutilsTestSupport.py -@@ -51,14 +51,9 @@ - - testroot = os.path.abspath(os.path.dirname(__file__) or os.curdir) - os.chdir(testroot) --if sys.version_info >= (3, 0): -- sys.path.insert(0, os.path.normpath(os.path.join(testroot, -- '..', 'build', 'lib'))) -- sys.path.append(os.path.normpath(os.path.join(testroot, '..', -- 'build', 'lib', 'extras'))) --else: -- sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..'))) -- sys.path.append(os.path.normpath(os.path.join(testroot, '..', 'extras'))) -+builddir = 'build-%d.%d' % (sys.version_info.major, sys.version_info.minor) -+sys.path.insert(0, os.path.normpath(os.path.join(testroot, '..', builddir, 'lib'))) -+sys.path.append(os.path.normpath(os.path.join(testroot, '..', builddir, 'lib', 'extras'))) - sys.path.insert(0, testroot) - - try: diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template deleted file mode 100644 index 02232f31a266..000000000000 --- a/srcpkgs/python-docutils/template +++ /dev/null @@ -1,62 +0,0 @@ -# Template file for 'python-docutils' -pkgname=python-docutils -version=0.16 -revision=3 -wrksrc="docutils-${version}" -build_style=python-module -hostmakedepends="python-setuptools python3-setuptools" -# docutils/writers/odf_odt/pygmentsformatter.py -depends="python python-Pygments" -short_desc="Python2 documentation utilities" -maintainer="Alessio Sergi " -license="custom:Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0" -homepage="http://docutils.sourceforge.net" -distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz" -checksum=c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc -checkdepends+="$depends python3-Pygments" - -alternatives=" - docutils:rst2html:/usr/bin/rst2html.py2 - docutils:rst2html4:/usr/bin/rst2html4.py2 - docutils:rst2html5:/usr/bin/rst2html5.py2 - docutils:rst2latex:/usr/bin/rst2latex.py2 - docutils:rst2man:/usr/bin/rst2man.py2 - docutils:rst2odt:/usr/bin/rst2odt.py2 - docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2 - docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2 - docutils:rst2s5:/usr/bin/rst2s5.py2 - docutils:rst2xetex:/usr/bin/rst2xetex.py2 - docutils:rst2xml:/usr/bin/rst2xml.py2 - docutils:rstpep2html:/usr/bin/rstpep2html.py2" - -do_check() { - cd test - python3 alltests.py -} - -post_install() { - vlicense COPYING.txt COPYING -} - -python3-docutils_package() { - alternatives=" - docutils:rst2html:/usr/bin/rst2html.py3 - docutils:rst2html4:/usr/bin/rst2html4.py3 - docutils:rst2html5:/usr/bin/rst2html5.py3 - docutils:rst2latex:/usr/bin/rst2latex.py3 - docutils:rst2man:/usr/bin/rst2man.py3 - docutils:rst2odt:/usr/bin/rst2odt.py3 - docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3 - docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3 - docutils:rst2s5:/usr/bin/rst2s5.py3 - docutils:rst2xetex:/usr/bin/rst2xetex.py3 - docutils:rst2xml:/usr/bin/rst2xml.py3 - docutils:rstpep2html:/usr/bin/rstpep2html.py3" - depends="python3 python3-Pygments" - short_desc="${short_desc/Python2/Python3}" - pkg_install() { - vmove "usr/bin/*3" - vmove "usr/lib/python3*" - vlicense COPYING.txt COPYING - } -} diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils deleted file mode 120000 index 8876054b3b55..000000000000 --- a/srcpkgs/python3-docutils +++ /dev/null @@ -1 +0,0 @@ -python-docutils \ No newline at end of file diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template new file mode 100644 index 000000000000..6ffd111a0a12 --- /dev/null +++ b/srcpkgs/python3-docutils/template @@ -0,0 +1,39 @@ +# Template file for 'python3-docutils' +pkgname=python3-docutils +version=0.17.1 +revision=1 +wrksrc="docutils-${version}" +build_style=python3-module +hostmakedepends="python3-setuptools" +# docutils/writers/odf_odt/pygmentsformatter.py +depends="python3-Pygments" +checkdepends="${depends}" +short_desc="Python3 documentation utilities" +maintainer="Alessio Sergi " +license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0" +homepage="http://docutils.sourceforge.net" +distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz" +checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125 + +alternatives=" + docutils:rst2html:/usr/bin/rst2html.py + docutils:rst2html4:/usr/bin/rst2html4.py + docutils:rst2html5:/usr/bin/rst2html5.py + docutils:rst2latex:/usr/bin/rst2latex.py + docutils:rst2man:/usr/bin/rst2man.py + docutils:rst2odt:/usr/bin/rst2odt.py + docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py + docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py + docutils:rst2s5:/usr/bin/rst2s5.py + docutils:rst2xetex:/usr/bin/rst2xetex.py + docutils:rst2xml:/usr/bin/rst2xml.py + docutils:rstpep2html:/usr/bin/rstpep2html.py" + +do_check() { + cd test + python3 alltests.py +} + +post_install() { + vlicense COPYING.txt COPYING +} From b68e2122dcb08b8956049a89b3ac21fc996381f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 16 Jun 2021 23:53:05 -0300 Subject: [PATCH 2/2] removed-packages: add python-docutils. We ship only python3-docutils now. --- srcpkgs/removed-packages/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 566536002191..fa919b6de59b 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=47 +revision=48 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -234,6 +234,7 @@ replaces=" python-PyQt4<=4.12.1_4 python-SecretStorage<=2.3.1_4 python-audit<=2.8.5_2 + python-docutils<=0.16_3 python-enchant<=2.0.0_4 python-gntp<=1.0.3_7 python-jellyfish<=0.6.1_2