From d8c9da11303bdd0df49c208c0163eb8ff0aaa855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 28 Jul 2020 22:04:35 +0200 Subject: [PATCH] python3-nacl: remove as duplicate of python3-pynacl --- srcpkgs/python-pynacl/template | 13 +++++++++---- srcpkgs/python3-nacl | 1 + srcpkgs/python3-nacl/template | 24 ------------------------ 3 files changed, 10 insertions(+), 28 deletions(-) create mode 120000 srcpkgs/python3-nacl delete mode 100644 srcpkgs/python3-nacl/template diff --git a/srcpkgs/python-pynacl/template b/srcpkgs/python-pynacl/template index 7a7fe24682..6de29f2459 100644 --- a/srcpkgs/python-pynacl/template +++ b/srcpkgs/python-pynacl/template @@ -1,27 +1,32 @@ # Template file for 'python-pynacl' pkgname=python-pynacl version=1.3.0 -revision=2 +revision=4 wrksrc="PyNaCl-${version}" build_style=python-module -pycompile_module="nacl" hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi" makedepends="python-devel python3-devel python-cffi python3-cffi libsodium-devel" depends="python-cffi python-six" +checkdepends="${depends} python-hypothesis python-more-itertools python-parsing" short_desc="Python2 binding to the Networking and Cryptography (NaCl) library" maintainer="Alessio Sergi " -homepage="https://github.com/pyca/pynacl/" license="Apache-2.0" +homepage="https://github.com/pyca/pynacl/" distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz" checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c export SODIUM_INSTALL=system python3-pynacl_package() { - pycompile_module="nacl" depends="python3-cffi python3-six" short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* } } + +python3-nacl_package() { + build_style=meta + depends="python3-pynacl" + short_desc="${short_desc/Python2/Python3} - dummy transitional package" +} diff --git a/srcpkgs/python3-nacl b/srcpkgs/python3-nacl new file mode 120000 index 0000000000..5738ec6f9c --- /dev/null +++ b/srcpkgs/python3-nacl @@ -0,0 +1 @@ +python-pynacl \ No newline at end of file diff --git a/srcpkgs/python3-nacl/template b/srcpkgs/python3-nacl/template deleted file mode 100644 index cfbb29e03d..0000000000 --- a/srcpkgs/python3-nacl/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'python3-nacl' -pkgname=python3-nacl -version=1.3.0 -revision=3 -wrksrc="PyNaCl-${version}" -build_style=python3-module -pycompile_module="nacl" -hostmakedepends="python3-setuptools python3-pycparser python3-cffi" -makedepends="libsodium-devel python3-devel libffi-devel" -depends="python3-six python3-cffi" -short_desc="Python3 bindings for the NaCl library" -maintainer="Orphaned " -license="Apache-2.0" -homepage="https://github.com/pyca/pynacl/" -distfiles="${PYPI_SITE}/P/PyNaCl/PyNaCl-${version}.tar.gz" -checksum=0c6100edd16fefd1557da078c7a31e7b7d7a52ce39fdca2bec29d4f7b6e7600c - -pre_build() { - export SODIUM_INSTALL=system -} - -pre_install() { - export SODIUM_INSTALL=system -}