[PR PATCH] python3-docutils 0.17.1, remove python-docutils

[PR PATCH] python3-docutils 0.17.1, remove python-docutils

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages docu
https://github.com/void-linux/void-packages/pull/31532

python3-docutils 0.17.1, remove python-docutils
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31532.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-docu-31532.patch --]
[-- Type: text/x-diff, Size: 7135 bytes --]

From c7afde81c364402ab3b52b458208ed85351b1f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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             | 40 ++++++++++++
 4 files changed, 40 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 12c229716809..000000000000
--- a/srcpkgs/python-docutils/patches/test-import.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- test/DocutilsTestSupport.py
-+++ 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 <al3hex@gmail.com>"
-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..fe16d3fc1947
--- /dev/null
+++ b/srcpkgs/python3-docutils/template
@@ -0,0 +1,40 @@
+# 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 <al3hex@gmail.com>"
+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=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125
+conflicts="python-docutils>=0"
+
+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 aea93422edd07736cdd381b5e3c6f5f900cf971a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 0d5ea74d284b..0be620375b13 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=45
+revision=46
 build_style=meta
 short_desc="Uninstalls packages removed from repository"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -231,6 +231,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

Re: [PR PATCH] [Updated] python3-docutils 0.17.1, remove python-docutils

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages docu
https://github.com/void-linux/void-packages/pull/31532

python3-docutils 0.17.1, remove python-docutils
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31532.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-docu-31532.patch --]
[-- Type: text/x-diff, Size: 7109 bytes --]

From 968d4d855dcaff08a4752072be2b590c809994b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <al3hex@gmail.com>"
-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..482742ff3341
--- /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 <al3hex@gmail.com>"
+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=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 f62a432b659d450296e8632b4d5e6fc42d941d84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <chocimier@tlen.pl>"
@@ -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

Re: [PR PATCH] [Updated] python3-docutils 0.17.1, remove python-docutils

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages docu
https://github.com/void-linux/void-packages/pull/31532

python3-docutils 0.17.1, remove python-docutils
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31532.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-docu-31532.patch --]
[-- Type: text/x-diff, Size: 7102 bytes --]

From 710baf4d38f91095f86bfa5724985040c5d71807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
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 <al3hex@gmail.com>"
-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 <al3hex@gmail.com>"
+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?= <erico.erc@gmail.com>
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 <chocimier@tlen.pl>"
@@ -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

Re: [PR PATCH] [Merged]: python3-docutils 0.17.1, remove python-docutils

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1458 bytes --]

There's a merged pull request on the void-packages repository

python3-docutils 0.17.1, remove python-docutils
https://github.com/void-linux/void-packages/pull/31532

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->