gentoo resync : 22.10.2018

5 files changed, 51 insertions, 62 deletions

diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 2325414669df..51fe12d678bd 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,6 +1,5 @@
-AUX pytextile-2.1.8-sanitizer.patch 606 BLAKE2B c916c46156ae5f01b7d6714b7c9acd078119a561fee2159cd54ae4db6859ef2be0664b8cc7ae4c3034302b9edd57244e31a2506ecbf0c9d81c7497f393279157 SHA512 3c7a568e64cd28cc0666f06e6b2022454126a654f4ae0d0c82edada69ca7ec1ebce1582961ac84667b3a0c932c5e9d98521c100e1d62df100d276ae33417ba13
 DIST pytextile-2.3.3.tar.gz 42277 BLAKE2B a6e6e1d96695f3ada03f5da9bd8bd19b99da345d83c62b1d4f2e765303dfbbbee072da4611f1b29b46d28ed334373c809117940ff0c1238dea3b12fb9076656c SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60
-DIST textile-2.1.8.tar.gz 34002 BLAKE2B 0f4643da3cf47cd9b27e7b3237c6eac8b951caab9f6f36da929e159d582ae9e8ac04b835bd9006d7392ed935a875e169eef276caa52e25d618cdeafa27cef626 SHA512 b1675a131b482f4926efb45312b16c722ff158d9296704918b56316d470056f986ce18d495525a8e9f236bdd62e09ca6a17b443a7db8c8c36e5d05fcffce67da
-EBUILD pytextile-2.1.8.ebuild 924 BLAKE2B f30969b7afc0102a049e25f6943e37adead616a6d579f07754e351826d347320034895264457bfdaccb7ba388a370ea3c24bf11903c39562fba6df1cb0ad13bf SHA512 7a38a87b3459aeaf5af5c07db276d5b2bfa931d8fbd340b45d27e80aabbaab096e6dfdf2702c18416ae978015b2787b62ea4d1133234b842c40c8144ee389e73
-EBUILD pytextile-2.3.3.ebuild 1010 BLAKE2B 51a8857dacb5589ef8a296c8682acc1aea131e7f8f3d46b42c471c4348aa8cf3328f126c4e8dd6e1c35d2cc861e3601463b3f518dff1ae4104962e022755d533 SHA512 81bf94b7819e48bed1128e71c73b2e16cdedc339ed3ec8ee9f37fd33dfafe9ee152a995799d84cbc33002f10f0a062eac710819577e44ee3af25a2fe6f14dcdf
+DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
+EBUILD pytextile-2.3.3.ebuild 1022 BLAKE2B 37b4074eb8fe9107d61b1c26a8f24f41efd69646eaa52cdcba0feac1f74b1255bb5d7953ebffdb6456033b4ba3600fb73dea3b1200d1616396decaeaf542e811 SHA512 555e58af6e404fecbc93372a064c208d27303f78c7607baded5bcb7267ec38bea4bfac24bf3a0b10909c6edd5de557b662d5d144673e190ede513d942f6cb941
+EBUILD pytextile-3.0.3.ebuild 1020 BLAKE2B 0891ae2944fa0a4338bcc67ae47cddcf5578e5e9f1b0ac3959753168aee4c480598354a0c90b38102573572a1f71af32e34b7d5f6b9d3aaa36c775bd8d69515a SHA512 58b533104b2efdb6a2fc07c6a546c2fd303781ac1efde727cc4302e8e0bdaa02fb4a8c9a881e79d452796f8b9073a5b2027c7c44628686393a075b76e36791c6
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/files/pytextile-2.1.8-sanitizer.patch b/app-text/pytextile/files/pytextile-2.1.8-sanitizer.patch
deleted file mode 100644
index 1a9e696f21e9..000000000000
--- a/app-text/pytextile/files/pytextile-2.1.8-sanitizer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/textile/python-textile/commit/83c81db387fa5f0c5ca25c27b8bc36d105bce599
-diff --git a/textile/tools/sanitizer.py b/textile/tools/sanitizer.py
-index 83b6799..4fc8fb2 100644
---- a/textile/tools/sanitizer.py
-+++ b/textile/tools/sanitizer.py
-@@ -12,7 +12,7 @@ def sanitize(string):
-     p = html5lib.HTMLParser(tokenizer=sanitizer.HTMLSanitizer)
-     tree = p.parseFragment(string)
- 
--    walker = treewalkers.getTreeWalker("simpletree")
-+    walker = treewalkers.getTreeWalker("etree")
-     stream = walker(tree)
- 
-     s = serializer.htmlserializer.HTMLSerializer(omit_optional_tags=False,
-
diff --git a/app-text/pytextile/pytextile-2.1.8.ebuild b/app-text/pytextile/pytextile-2.1.8.ebuild
deleted file mode 100644
index 583464ba033b..000000000000
--- a/app-text/pytextile/pytextile-2.1.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-MY_PN="textile"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Python port of Textile, A humane web text generator"
-HOMEPAGE="https://github.com/ikirudennis/python-textile"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-sanitizer.patch )
-
-python_prepare_all() {
-	# This resolves a nasty race condition noted and observed by Arfrever
-	sed -e 's:with-id = 1::' -i setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests textile/tests/ || die "Tests failed under ${EPYTHON}"
-}
diff --git a/app-text/pytextile/pytextile-2.3.3.ebuild b/app-text/pytextile/pytextile-2.3.3.ebuild
index 3a17b6c192d4..0cf0146b654e 100644
--- a/app-text/pytextile/pytextile-2.3.3.ebuild
+++ b/app-text/pytextile/pytextile-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,10 +20,7 @@ IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pytest-runner[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-	)
-	"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 RDEPEND="
 	dev-python/regex[${PYTHON_USEDEP}]
 	"
@@ -33,6 +30,8 @@ S="${WORKDIR}/${MY_P}"
 python_prepare_all() {
 	# This resolves a nasty race condition, courtesy of Arfrever
 	sed -e 's:with-id = 1::' -i setup.cfg || die
+	# remove useless --cov arg injection
+	rm pytest.ini || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/app-text/pytextile/pytextile-3.0.3.ebuild b/app-text/pytextile/pytextile-3.0.3.ebuild
new file mode 100644
index 000000000000..ffe603741631
--- /dev/null
+++ b/app-text/pytextile/pytextile-3.0.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} pypy )
+
+inherit distutils-r1
+
+MY_PN="python-textile"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python port of Textile, A humane web text generator"
+HOMEPAGE="https://github.com/textile/python-textile"
+SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	# remove useless --cov arg injection
+	rm pytest.ini || die
+	# remove useless pytest-runner dep
+	sed -e "s/pytest-runner//g" -i setup.py || die
+}
+
+python_test() {
+	pytest || die "Testsuite failed under ${EPYTHON}"
+}