diff --git a/app-misc/asciinema/asciinema-2.0.1.recipe b/app-misc/asciinema/asciinema-2.0.2.recipe similarity index 63% rename from app-misc/asciinema/asciinema-2.0.1.recipe rename to app-misc/asciinema/asciinema-2.0.2.recipe index e80dcedd3..7f7ed42b0 100644 --- a/app-misc/asciinema/asciinema-2.0.1.recipe +++ b/app-misc/asciinema/asciinema-2.0.2.recipe @@ -1,4 +1,4 @@ -SUMMARY="A terminal session recorder" +SUMMARY="Terminal session recorder" DESCRIPTION="asciinema lets you easily record terminal sessions and replay \ them in a terminal as well as in a web browser. It is the best companion of \ asciinema.org." @@ -7,12 +7,16 @@ COPYRIGHT="2011-2018 Marcin Kulik" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/asciinema/asciinema/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="7087b247dae36d04821197bc14ebd4248049592b299c9878d8953c025ac802e4" +CHECKSUM_SHA256="2578a1b5611e5375771ef6582a6533ef8d40cdbed1ba1c87786fd23af625ab68" SOURCE_FILENAME="asciinema-$portVersion.tar.gz" -PATCHES="asciinema-$portVersion.patchset" ARCHITECTURES="any" +USER_SETTINGS_FILES=" + settings/asciinema directory + settings/asciinema/config + " + PROVIDES=" asciinema = $portVersion cmd:asciinema @@ -34,9 +38,11 @@ BUILD_PREREQUIRES=" cmd:sed " -TEST_REQUIRES=" - nose_python3 - " +PATCH() +{ + sed -i "s|share/doc/asciinema|$relativeDocDir| + s|share/man|$relativeManDir|" setup.py +} BUILD() { @@ -46,14 +52,5 @@ BUILD() INSTALL() { - sed -i \ - -e "s|documentation/man|$relativeManDir|" \ - -e "s|documentation/packages/asciinema|$relativeDocDir|" \ - setup.py - python3 setup.py install --prefix=$prefix --root=/ --skip-build -} - -TEST() -{ - python3 setup.py test + python3 setup.py install --skip-build --prefix="$prefix" --root=/ } diff --git a/app-misc/asciinema/patches/asciinema-2.0.1.patchset b/app-misc/asciinema/patches/asciinema-2.0.1.patchset deleted file mode 100644 index 34fa80776..000000000 --- a/app-misc/asciinema/patches/asciinema-2.0.1.patchset +++ /dev/null @@ -1,49 +0,0 @@ -From b7a0f1c59b10f09c63828504facade963bf05ad5 Mon Sep 17 00:00:00 2001 -From: Crestwave -Date: Fri, 2 Nov 2018 07:55:00 +0000 -Subject: Add long_description, data_files and test_requires to setup.py - - -diff --git a/setup.py b/setup.py -index 588a6cd..6f6b91c 100644 ---- a/setup.py -+++ b/setup.py -@@ -7,6 +7,10 @@ if sys.version_info[0] < 3: - - url_template = 'https://github.com/asciinema/asciinema/archive/v%s.tar.gz' - requirements = [] -+test_requirements = ['nose'] -+ -+with open('README.md', encoding='utf8') as file: -+ long_description = file.read() - - setup( - name='asciinema', -@@ -14,6 +18,8 @@ setup( - packages=['asciinema', 'asciinema.commands', 'asciinema.asciicast'], - license='GNU GPLv3', - description='Terminal session recorder', -+ long_description=long_description, -+ long_description_content_type='text/markdown', - author=asciinema.__author__, - author_email='m@ku1ik.com', - url='https://asciinema.org', -@@ -23,7 +29,15 @@ setup( - 'asciinema = asciinema.__main__:main', - ], - }, -+ data_files=[('documentation/packages/asciinema', ['CHANGELOG.md', -+ 'CODE_OF_CONDUCT.md', -+ 'CONTRIBUTING.md', -+ 'README.md', -+ 'doc/asciicast-v1.md', -+ 'doc/asciicast-v2.md']), -+ ('documentation/man/man1', ['man/asciinema.1'])], - install_requires=requirements, -+ tests_require=test_requirements, - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Console', --- -2.19.1 - diff --git a/app-misc/asciinema/python3_asciinema-1.4.0.recipe b/app-misc/asciinema/python3_asciinema-1.4.0.recipe deleted file mode 100644 index 0fa3677de..000000000 --- a/app-misc/asciinema/python3_asciinema-1.4.0.recipe +++ /dev/null @@ -1,42 +0,0 @@ -SUMMARY="Command line recorder for asciinema.org service" -DESCRIPTION="asciinema lets you easily record terminal sessions and replay \ -them in a terminal as well as in a web browser." -HOMEPAGE="https://asciinema.org/" -COPYRIGHT="2011-2017 Marcin Kulik" -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="https://github.com/asciinema/asciinema/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="841a55b0f51988d5e155e99badbd6ce5cf3b43cca2ba15cd20c971a19719dc9a" -SOURCE_DIR="asciinema-$portVersion" - -ARCHITECTURES="any" - -PROVIDES=" - python3_asciinema = $portVersion - cmd:asciinema - " -REQUIRES=" - haiku - cmd:python3 - " - -BUILD_REQUIRES=" - haiku_devel - setuptools_python3 - " -BUILD_PREREQUIRES=" - cmd:make - cmd:python3 - " - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - pythonVersion=$(python3 --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $portPackageLinksDir/cmd~python3/bin/python3 setup.py install \ - --prefix=$prefix -}