diff --git a/dev-python/html2text/html2text-2020.1.16.recipe b/dev-python/html2text/html2text-2020.1.16.recipe
index 226658813..c7eecb878 100644
--- a/dev-python/html2text/html2text-2020.1.16.recipe
+++ b/dev-python/html2text/html2text-2020.1.16.recipe
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/html2text/html2text.py
https://pypi.python.org/pypi/html2text"
COPYRIGHT="2004-2008 Aaron Swartz"
LICENSE="GNU GPL v3"
-REVISION="2"
+REVISION="3"
SOURCE_URI="https://github.com/Alir3z4/html2text/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="209a2c4d7897e83a6999160ef51ae71bdb8c3eede99e103f12edb25199d4d11e"
@@ -25,13 +25,16 @@ BUILD_REQUIRES="
haiku_devel
"
-PYTHON_PACKAGES=(python38 python39)
-PYTHON_VERSIONS=(3.8 3.9)
+PYTHON_PACKAGES=(python38 python39 python310)
+PYTHON_VERSIONS=(3.8 3.9 3.10)
+commandSuffixes=(3.8 "" 3.10)
for i in "${!PYTHON_PACKAGES[@]}"; do
pythonPackage=${PYTHON_PACKAGES[i]}
pythonVersion=${PYTHON_VERSIONS[$i]}
+commandSuffix=${commandSuffixes[$i]}
eval "PROVIDES_${pythonPackage}=\"\
- ${portName}_$pythonPackage = $portVersion\
+ ${portName}_$pythonPackage = $portVersion\n\
+ cmd:html2text$commandSuffix = $portVersion\n\
\"; \
REQUIRES_$pythonPackage=\"\
haiku\n\
@@ -43,28 +46,30 @@ BUILD_PREREQUIRES="$BUILD_PREREQUIRES
cmd:python$pythonVersion"
done
-PROVIDES_python38="$PROVIDES_python38
- cmd:html2text3.8
- "
-PROVIDES_python39="$PROVIDES_python39
- cmd:html2text3.9
- "
INSTALL()
{
for i in "${!PYTHON_PACKAGES[@]}"; do
pythonPackage=${PYTHON_PACKAGES[i]}
pythonVersion=${PYTHON_VERSIONS[$i]}
+ commandSuffix=${commandSuffixes[$i]}
python=python$pythonVersion
installLocation=$prefix/lib/$python/vendor-packages/
export PYTHONPATH=$installLocation:$PYTHONPATH
+
mkdir -p $installLocation
rm -rf build
+
$python setup.py build install \
--root=/ --prefix=$prefix
- mv $binDir/html2text $binDir/html2text$pythonVersion
+ if [ "$pythonVersion" = "$commandSuffix" ]; then
+ for f in $binDir/*; do
+ mv $f ${f}$commandSuffix
+ done
+ fi
+
packageEntries $pythonPackage \
$prefix/lib/python* \
$binDir
diff --git a/dev-python/html2text/html2text_python-2019.8.11.recipe b/dev-python/html2text/html2text_python-2019.8.11.recipe
deleted file mode 100644
index fac2a875b..000000000
--- a/dev-python/html2text/html2text_python-2019.8.11.recipe
+++ /dev/null
@@ -1,46 +0,0 @@
-SUMMARY="Convert HTML to Markdown-formatted text"
-DESCRIPTION="
- html2text is a Python script that converts a page of HTML into clean,
- easy-to-read plain ASCII text. Better yet, that ASCII also happens to be
- valid Markdown (a text-to-HTML format)."
-HOMEPAGE="https://github.com/html2text/html2text.py
- https://github.com/Alir3z4/html2text
- https://pypi.python.org/pypi/html2text"
-COPYRIGHT="2004-2008 Aaron Swartz"
-LICENSE="GNU GPL v3"
-REVISION="1"
-SOURCE_URI="https://github.com/Alir3z4/html2text/archive/$portVersion.tar.gz"
-SOURCE_DIR="html2text-$portVersion"
-CHECKSUM_SHA256="aeffe2b403ddf242f43aba6b91b77791a489b32e6e8fa108f7963d11cb85c862"
-
-ARCHITECTURES="any"
-
-PROVIDES="
- $portName = $portVersion
- cmd:html2text
- "
-REQUIRES="
- haiku
- cmd:python2.7
- "
-
-BUILD_REQUIRES="
- haiku_devel
- setuptools_python
- "
-BUILD_PREREQUIRES="
- cmd:python2.7
- "
-
-INSTALL()
-{
- pythonVersion=2.7
-
- python=python$pythonVersion
- installLocation=$prefix/lib/$python/vendor-packages/
- export PYTHONPATH=$installLocation:$PYTHONPATH
- mkdir -p $installLocation
- rm -rf build
- $python setup.py build install \
- --root=/ --prefix=$prefix
-}