diff --git a/srcpkgs/python-fasteners/patches/fasteners-monotonic.patch b/srcpkgs/python-fasteners/patches/fasteners-monotonic.patch new file mode 100644 index 00000000000..2f6cb630f83 --- /dev/null +++ b/srcpkgs/python-fasteners/patches/fasteners-monotonic.patch @@ -0,0 +1,34 @@ +--- fasteners/_utils.py.orig ++++ fasteners/_utils.py +@@ -19,7 +19,10 @@ + import logging + import time + +-from monotonic import monotonic as now # noqa ++try: ++ from time import monotonic as now ++except ImportError: ++ from monotonic import monotonic as now + + # log level for low-level debugging + BLATHER = 5 +--- setup.py.orig ++++ setup.py +@@ -26,7 +26,6 @@ + + install_requires = [ + 'six', +- 'monotonic>=0.1', + ] + + setup( +@@ -38,6 +37,9 @@ + url='https://github.com/harlowja/fasteners', + license="ASL 2.0", + install_requires=install_requires, ++ extras_require={ ++ ':python_version<"3.3"': ['monotonic'], ++ }, + classifiers=[ + "Development Status :: 4 - Beta", + "Topic :: Utilities", diff --git a/srcpkgs/python-fasteners/template b/srcpkgs/python-fasteners/template index 862e23d2b09..4647a226150 100644 --- a/srcpkgs/python-fasteners/template +++ b/srcpkgs/python-fasteners/template @@ -1,14 +1,14 @@ # Template file for 'python-fasteners' pkgname=python-fasteners version=0.14.1 -revision=2 +revision=3 noarch=yes wrksrc="fasteners-${version}" build_style=python-module hostmakedepends="python-setuptools python3-setuptools" depends="python-monotonic python-six" pycompile_module="fasteners" -short_desc="Python package that provides useful locks" +short_desc="Python2 package that provides useful locks" maintainer="Leah Neukirchen " homepage="https://pypi.python.org/pypi/fasteners" license="Apache-2.0" @@ -19,15 +19,8 @@ python3-fasteners_package() { noarch=yes depends="python3-six" pycompile_module="fasteners" - replaces="python3.4-fasteners>=0" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* } } -python3.4-fasteners_package() { - noarch=yes - build_style=meta - short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" - depends="python3-fasteners>=${version}_${revision}" -} diff --git a/srcpkgs/python3.4-fasteners b/srcpkgs/python3.4-fasteners deleted file mode 120000 index 0ca3f5f1810..00000000000 --- a/srcpkgs/python3.4-fasteners +++ /dev/null @@ -1 +0,0 @@ -python-fasteners \ No newline at end of file