From 166956ad91d99f2090974bf3fb22236e6d66d21d Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Tue, 11 Jun 2024 12:37:08 +0800 Subject: [PATCH] qspectrumanalyzer: fix python 3.12, deps, cleanup --- dev-python/pyFFTW/Manifest | 2 +- dev-python/pyFFTW/files/370_python312.patch | 92 +++++++++++++++++++ ....ebuild => pyFFTW-0.13.1_p20240117.ebuild} | 26 ++++-- dev-python/pyFFTW/pyFFTW-9999.ebuild | 24 ++++- dev-python/pydecomp/metadata.xml | 17 ---- dev-python/pydecomp/pydecomp-9999.ebuild | 43 --------- dev-python/qt-py/Manifest | 2 +- ...{qt-py-1.3.3.ebuild => qt-py-1.4.1.ebuild} | 16 ++-- dev-python/simplesoapy/Manifest | 2 +- .../simplesoapy/simplesoapy-1.5.1-r1.ebuild | 15 +-- .../simplesoapy/simplesoapy-9999.ebuild | 27 ------ dev-python/simplespectral/Manifest | 2 +- .../simplespectral-1.0.0.ebuild | 16 ++-- .../simplespectral/simplespectral-9999.ebuild | 29 ------ net-wireless/qspectrumanalyzer/Manifest | 2 +- net-wireless/qspectrumanalyzer/metadata.xml | 12 +++ .../qspectrumanalyzer-2.2.0.ebuild | 30 +++++- .../qspectrumanalyzer-9999.ebuild | 31 ------- net-wireless/soapy_power/Manifest | 2 +- net-wireless/soapy_power/metadata.xml | 1 + .../soapy_power/soapy_power-1.6.1-r1.ebuild | 12 +-- .../soapy_power/soapy_power-9999.ebuild | 29 ------ .../base/package.accept_keywords/dev-python | 8 -- 23 files changed, 201 insertions(+), 239 deletions(-) create mode 100644 dev-python/pyFFTW/files/370_python312.patch rename dev-python/pyFFTW/{pyFFTW-0.13.1.ebuild => pyFFTW-0.13.1_p20240117.ebuild} (61%) delete mode 100644 dev-python/pydecomp/metadata.xml delete mode 100644 dev-python/pydecomp/pydecomp-9999.ebuild rename dev-python/qt-py/{qt-py-1.3.3.ebuild => qt-py-1.4.1.ebuild} (69%) delete mode 100644 dev-python/simplesoapy/simplesoapy-9999.ebuild delete mode 100644 dev-python/simplespectral/simplespectral-9999.ebuild create mode 100644 net-wireless/qspectrumanalyzer/metadata.xml mode change 120000 => 100644 net-wireless/qspectrumanalyzer/qspectrumanalyzer-2.2.0.ebuild delete mode 100644 net-wireless/qspectrumanalyzer/qspectrumanalyzer-9999.ebuild delete mode 100644 net-wireless/soapy_power/soapy_power-9999.ebuild diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest index c43b60fad..d341542a7 100644 --- a/dev-python/pyFFTW/Manifest +++ b/dev-python/pyFFTW/Manifest @@ -1 +1 @@ -DIST pyFFTW-0.13.1.gh.tar.gz 159314 BLAKE2B c493720171db465224476a399fb45a3a1211e3b11a11b09e3c7029eed3a9f42cc2466bd73af68427df8cd03842709ed6804c574f6d02ddf9e3404a0e676985f0 SHA512 30a627e3abf62ac045478964265d7d675765354c118ad38f44c49748a86c8d7cf83eca872ae156f3a14219190140bfa04b8745a092e481f3df2a8ba417116b42 +DIST pyFFTW-0.13.1_p20240117.gh.tar.gz 160318 BLAKE2B 4053f626142eb33c8e8614f418e5ca28b42dab92d5437bbf368e5f6703fd09bed0e31289ff92ab2e6b123bd7f8f71f6e826cdc05f597d3fea80ced75f05384ac SHA512 d13473dca33af515f18db83f07abfdb1770e83be2c089f3473525b50c637992802001b3987ee1fade79e37740ef52dc8580ee69baf03451a25ff2d43d3d65e7f diff --git a/dev-python/pyFFTW/files/370_python312.patch b/dev-python/pyFFTW/files/370_python312.patch new file mode 100644 index 000000000..afdc4ad91 --- /dev/null +++ b/dev-python/pyFFTW/files/370_python312.patch @@ -0,0 +1,92 @@ +From b61c8be64e3c48b483558106e17fe76087134a32 Mon Sep 17 00:00:00 2001 +From: Julien Salort +Date: Thu, 25 Jan 2024 11:20:04 +0100 +Subject: [PATCH 1/2] Upgrade setuptools and configparser for Python 3.12 + +--- + pyproject.toml | 2 +- + setup.py | 2 ++ + versioneer.py | 6 +++--- + 3 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 51639424..42cec0d9 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -166,7 +166,7 @@ test-command = "pytest --import-mode=append {project}" + [build-system] + requires = [ + "wheel", +- "setuptools<=59.4.0", ++ "setuptools", #<=59.4.0", + "Cython>=3", + + # NumPy dependencies - to update these, sync from +diff --git a/setup.py b/setup.py +index 4e0fac37..4143937f 100755 +--- a/setup.py ++++ b/setup.py +@@ -811,6 +811,7 @@ def setup_package(): + 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', ++ 'Programming Language :: Python :: 3.12', + 'Development Status :: 4 - Beta', + 'License :: OSI Approved :: BSD License', + 'Operating System :: OS Independent', +@@ -824,6 +825,7 @@ def setup_package(): + ], + 'cmdclass': cmdclass, + 'python_requires': ">=3.8", ++ 'py_modules': ['pyfftw'], + } + + setup_args['setup_requires'] = build_requires +diff --git a/versioneer.py b/versioneer.py +index 64fea1c8..1e461ba0 100644 +--- a/versioneer.py ++++ b/versioneer.py +@@ -339,9 +339,9 @@ def get_config_from_root(root): + # configparser.NoOptionError (if it lacks "VCS="). See the docstring at + # the top of versioneer.py for instructions on writing your setup.cfg . + setup_cfg = os.path.join(root, "setup.cfg") +- parser = configparser.SafeConfigParser() ++ parser = configparser.ConfigParser() + with open(setup_cfg, "r") as f: +- parser.readfp(f) ++ parser.read_file(f) + VCS = parser.get("versioneer", "VCS") # mandatory + + def get(parser, name): +@@ -418,7 +418,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False, + return stdout, p.returncode + + +-LONG_VERSION_PY['git'] = ''' ++LONG_VERSION_PY['git'] = r''' + # This file helps to compute a version number in source trees obtained from + # git-archive tarball (such as those provided by githubs download-from-tag + # feature). Distribution tarballs (built by setup.py sdist) and build + +From 95a9ad27df781f09c105a2b9834156866267a628 Mon Sep 17 00:00:00 2001 +From: Julien Salort +Date: Mon, 13 May 2024 10:43:07 +0200 +Subject: [PATCH 2/2] Remove useless comment + +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 42cec0d9..caaf0acb 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -166,7 +166,7 @@ test-command = "pytest --import-mode=append {project}" + [build-system] + requires = [ + "wheel", +- "setuptools", #<=59.4.0", ++ "setuptools", + "Cython>=3", + + # NumPy dependencies - to update these, sync from diff --git a/dev-python/pyFFTW/pyFFTW-0.13.1.ebuild b/dev-python/pyFFTW/pyFFTW-0.13.1_p20240117.ebuild similarity index 61% rename from dev-python/pyFFTW/pyFFTW-0.13.1.ebuild rename to dev-python/pyFFTW/pyFFTW-0.13.1_p20240117.ebuild index c838a75f2..f0a66114e 100644 --- a/dev-python/pyFFTW/pyFFTW-0.13.1.ebuild +++ b/dev-python/pyFFTW/pyFFTW-0.13.1_p20240117.ebuild @@ -1,25 +1,35 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) - inherit distutils-r1 +if [[ ${PV} == "9999" ]] ; then + EGIT_BRANCH="master" + EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git" + inherit git-r3 +else + HASH_COMMIT="82ae9eafac5fdd411f38852a1d379bb013526460" + + SRC_URI="https://github.com/pyFFTW/pyFFTW/archive/${HASH_COMMIT}.tar.gz -> ${P}.gh.tar.gz" + KEYWORDS="amd64 ~arm64 ~x86" + S="${WORKDIR}"/${PN}-${HASH_COMMIT} + PATCHES=( "${FILESDIR}/370_python312.patch" ) + +fi + DESCRIPTION="A pythonic python wrapper around FFTW" HOMEPAGE=" https://github.com/pyFFTW/pyFFTW/ https://pypi.org/project/pyFFTW/ " -SRC_URI=" - https://github.com/pyFFTW/pyFFTW/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" DEPEND=" >=dev-python/numpy-1.20[${PYTHON_USEDEP}] @@ -29,7 +39,7 @@ RDEPEND=" ${DEPEND} " BDEPEND=" - >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] =dev-python/cython-3[${PYTHON_USEDEP}] test? ( >=dev-python/dask-1.0[${PYTHON_USEDEP}] >=dev-python/scipy-1.8.0[${PYTHON_USEDEP}] diff --git a/dev-python/pyFFTW/pyFFTW-9999.ebuild b/dev-python/pyFFTW/pyFFTW-9999.ebuild index 219469532..fed60c31f 100644 --- a/dev-python/pyFFTW/pyFFTW-9999.ebuild +++ b/dev-python/pyFFTW/pyFFTW-9999.ebuild @@ -1,18 +1,32 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools +#wait for the fix: https://github.com/pyFFTW/pyFFTW/issues/372 +PYTHON_COMPAT=( python3_{10..11} ) +inherit distutils-r1 -inherit distutils-r1 git-r3 +if [[ ${PV} == "9999" ]] ; then + EGIT_BRANCH="master" + #lock to a current commit temporary until python 3.12 patch is merged +# EGIT_OVERRIDE_COMMIT_PYFFTW_PYFFTW="82ae9eafac5fdd411f38852a1d379bb013526460" + EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git" + inherit git-r3 +# PATCHES=( "{FILESDIR}/370_python312.patch" ) +else + PYPI_NO_NORMALIZE=1 + inherit pypi + KEYWORDS="amd64 ~arm64 ~x86" +fi DESCRIPTION="A pythonic python wrapper around FFTW" HOMEPAGE=" https://github.com/pyFFTW/pyFFTW/ https://pypi.org/project/pyFFTW/ " -EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git" LICENSE="BSD" SLOT="0" @@ -25,7 +39,7 @@ RDEPEND=" ${DEPEND} " BDEPEND=" - >=dev-python/cython-0.29.18[${PYTHON_USEDEP}] =dev-python/cython-3[${PYTHON_USEDEP}] test? ( >=dev-python/dask-1.0[${PYTHON_USEDEP}] >=dev-python/scipy-1.8.0[${PYTHON_USEDEP}] diff --git a/dev-python/pydecomp/metadata.xml b/dev-python/pydecomp/metadata.xml deleted file mode 100644 index 7824aa925..000000000 --- a/dev-python/pydecomp/metadata.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - sidhayn@gmail.com - Zero_Chaos - - A python interface library for common compression , - decompression and contents generation. It aims to create a simple, - easily extended and configurable common interface to various compressison - routines. It can easily be extended with custom compression, - decompression, and contents definitions. - - - pentoo/pyDeComp - - diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild deleted file mode 100644 index 693af584a..000000000 --- a/dev-python/pydecomp/pydecomp-9999.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_SETUPTOOLS=no - -inherit distutils-r1 python-r1 - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/pentoo/pyDeComp.git" - inherit git-r3 -else - #SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz" - #KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - S="${WORKDIR}/pyDeComp-${PV}" -fi - -DESCRIPTION="A python library of common (de)compression and contents handling" -HOMEPAGE="https://github.com/dol-sen/pyDeComp" - -LICENSE="BSD" -SLOT="0" -IUSE="" - -python_install_all() { - distutils-r1_python_install_all -} - -pkg_postinst() { - einfo - einfo "This is new software." - einfo "The API's it installs should be considered unstable" - einfo "and are subject to change." - einfo - einfo "Please file any enhancement requests, or bugs" - einfo "at https://github.com/dol-sen/pyDeComp/issues" - einfo "I am also on IRC @ #gentoo-releng of the freenode network" - einfo - ewarn "There may be some python 3 compatibility issues still." - ewarn "Please help debug/fix/report them in github or bugzilla." -} diff --git a/dev-python/qt-py/Manifest b/dev-python/qt-py/Manifest index 85d0de835..90eafe3ee 100644 --- a/dev-python/qt-py/Manifest +++ b/dev-python/qt-py/Manifest @@ -1 +1 @@ -DIST qt-py-1.3.3.tar.gz 58074 BLAKE2B e23c455989941887872055831fe39712e0bd62400c3556ab335a5905f3e2d43837a7f89b19b5732ae8021c746d58cbfa6d0627ccb8d1d6d1eafa5bc9b72960e4 SHA512 00bed0c81b22c1365f79222f312e02b50915f2ba9e039fc87e2f2695114c20b26def45ab7fb71f12e36cf6b2e10df9329bdbc27cf49135d651e43a16f5252f10 +DIST Qt.py-1.4.1.tar.gz 49400 BLAKE2B f20f46359d6041a7cbe407365b103d627f7e846f514b8cb7fe07b97b525a3b06e2833fff672e712762c41c38cfd657886ace5b22452806b5f15d1212e574ff07 SHA512 d388421120c4f19b8af264a637ed6dac81c23bb7e3a4c5bbeb8cdbcc9012340f8006eba1cf678e3e19ea06233ff283211c845429d9bbac1c5015da03b04c0a63 diff --git a/dev-python/qt-py/qt-py-1.3.3.ebuild b/dev-python/qt-py/qt-py-1.4.1.ebuild similarity index 69% rename from dev-python/qt-py/qt-py-1.3.3.ebuild rename to dev-python/qt-py/qt-py-1.4.1.ebuild index 3fd0fc128..e7d5eee1f 100644 --- a/dev-python/qt-py/qt-py-1.3.3.ebuild +++ b/dev-python/qt-py/qt-py-1.4.1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) inherit distutils-r1 @@ -16,11 +17,14 @@ SLOT="0" if [ "${PV}" = "9999" ]; then inherit git-r3 EGIT_REPO_URI="https://github.com/mottosso/Qt.py.git" - KEYWORDS="" else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/mottosso/Qt.py/archive/${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}"/Qt.py-"${PV}" + PYPI_NO_NORMALIZE=1 + PYPI_PN="Qt.py" + inherit pypi + + KEYWORDS="amd64 ~arm64 ~x86" + #SRC_URI="https://github.com/mottosso/Qt.py/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" + #S="${WORKDIR}"/Qt.py-"${PV}" fi REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-python/simplesoapy/Manifest b/dev-python/simplesoapy/Manifest index c2d2fb474..563619600 100644 --- a/dev-python/simplesoapy/Manifest +++ b/dev-python/simplesoapy/Manifest @@ -1 +1 @@ -DIST simplesoapy-1.5.1.gh.tar.gz 6129 BLAKE2B 766369677208a1cd58939e917fa16a30c87340fb6b76c5667913431625b89a8e97684ad4ba0af14fb4043ba42b2cec7f2b84eb968f128c3c3fc0e178c610cda5 SHA512 5ef0a4fcd84e1da9207154d4b8c4679e8aa2c9885ca76eacb17c4fbd39f489be459f52bfd42ee9b369790c33a02ecc5d776735cf1665f3ee034c1e315fdbb818 +DIST SimpleSoapy-1.5.1.tar.gz 6633 BLAKE2B 10597cd9db541d47a24de6041d73be119bcd6396452139c726b5e96cc6ca91f0fdc88880bc118817a19e56092049c331d0170e6aa30e2135b18142150f48120f SHA512 7a7ca4eec11e48f82f071e304536194ff8ee01bdafb6c5dc7871448a640796e0f2f3d6e7e0238730ed77675dfcd415343b2ddb079f281449d1e57c4321e96548 diff --git a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild index 37fb6fd7f..fe80740cb 100644 --- a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild +++ b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild @@ -3,23 +3,18 @@ EAPI=8 +PYPI_NO_NORMALIZE=1 +PYPI_PN="SimpleSoapy" + PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Simple pythonic wrapper for SoapySDR library" HOMEPAGE="https://github.com/xmikos/simplesoapy" - LICENSE="MIT" SLOT="0" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xmikos/simplesoapy.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xmikos/simplesoapy/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" -fi +KEYWORDS="amd64 ~arm64 ~x86" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" RDEPEND="${DEPEND} diff --git a/dev-python/simplesoapy/simplesoapy-9999.ebuild b/dev-python/simplesoapy/simplesoapy-9999.ebuild deleted file mode 100644 index 37fb6fd7f..000000000 --- a/dev-python/simplesoapy/simplesoapy-9999.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -DISTUTILS_USE_PEP517=setuptools -inherit distutils-r1 - -DESCRIPTION="Simple pythonic wrapper for SoapySDR library" -HOMEPAGE="https://github.com/xmikos/simplesoapy" - -LICENSE="MIT" -SLOT="0" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xmikos/simplesoapy.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xmikos/simplesoapy/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" -fi - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -RDEPEND="${DEPEND} - dev-python/numpy[${PYTHON_USEDEP}] - net-wireless/soapysdr[python]" diff --git a/dev-python/simplespectral/Manifest b/dev-python/simplespectral/Manifest index 01c21d5e9..56ecd7eb4 100644 --- a/dev-python/simplespectral/Manifest +++ b/dev-python/simplespectral/Manifest @@ -1 +1 @@ -DIST simplespectral-1.0.0.tar.gz 5750 BLAKE2B 04ee4c90f9cda35ade1d250162ab1bcc278ae82a4d7f9a22d1aee6a1eceac7819ce6aa19f52e024469c51e08c00dc5f19253ff2b85d9b668dafdcd7a18c78d6f SHA512 16da3cb19cd7c567b64709a26ed5def7eb3047b08e2cb48db6962036a6c3e34c122dadf71821b6a22df55ebcf3c2ff95e3af3898efc8b4a6d5902e48de8e050c +DIST SimpleSpectral-1.0.0.tar.gz 6116 BLAKE2B 36d1b70fa14ecbe93c311a118c91f49659dd4d506a97acf362f9ff76b274fa73f5a9ff53e8bc96193051241dad378c0318d73dac4c7fdd8af51d1b6398072db7 SHA512 d0d87061dbe8f819f2823bd887668d9e82dd5683f10ed570a38374d84c45b453a8dcd38d5cfbce149fea713ee994c8ae216b0c76c7bd23892844350bb1951994 diff --git a/dev-python/simplespectral/simplespectral-1.0.0.ebuild b/dev-python/simplespectral/simplespectral-1.0.0.ebuild index a9a100964..c2735776a 100644 --- a/dev-python/simplespectral/simplespectral-1.0.0.ebuild +++ b/dev-python/simplespectral/simplespectral-1.0.0.ebuild @@ -3,22 +3,18 @@ EAPI=8 +PYPI_NO_NORMALIZE=1 +PYPI_PN="SimpleSpectral" + +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Heavily simplified scipy.signal.spectral module" HOMEPAGE="https://github.com/xmikos/simplespectral" - LICENSE="MIT" SLOT="0" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xmikos/simplespectral.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xmikos/simplespectral/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi +KEYWORDS="amd64 ~arm64 ~x86" IUSE="+faster fastest" diff --git a/dev-python/simplespectral/simplespectral-9999.ebuild b/dev-python/simplespectral/simplespectral-9999.ebuild deleted file mode 100644 index a9a100964..000000000 --- a/dev-python/simplespectral/simplespectral-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 - -DESCRIPTION="Heavily simplified scipy.signal.spectral module" -HOMEPAGE="https://github.com/xmikos/simplespectral" - -LICENSE="MIT" -SLOT="0" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xmikos/simplespectral.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xmikos/simplespectral/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -IUSE="+faster fastest" - -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - faster? ( dev-python/scipy[${PYTHON_USEDEP}] ) - fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/net-wireless/qspectrumanalyzer/Manifest b/net-wireless/qspectrumanalyzer/Manifest index ef4d66e87..c74edaea4 100644 --- a/net-wireless/qspectrumanalyzer/Manifest +++ b/net-wireless/qspectrumanalyzer/Manifest @@ -1 +1 @@ -DIST qspectrumanalyzer-2.2.0.tar.gz 54636 BLAKE2B 283d9df864c83ce3f04a5e24f2dd9263795e4eb227804387ff56453c62c008e514d39b401485862023110f666d42cd991f48769d96488503cf4db1d51c1644ac SHA512 8aad19d4f02fac579a65279eb0a26bab18f9e1243a626419640b91eab488eb21c96b0a9c83e6cc0141760c887b2481b533d0a32432de0919e41904c5b279c627 +DIST qspectrumanalyzer-2.2.0.gh.tar.gz 54636 BLAKE2B 283d9df864c83ce3f04a5e24f2dd9263795e4eb227804387ff56453c62c008e514d39b401485862023110f666d42cd991f48769d96488503cf4db1d51c1644ac SHA512 8aad19d4f02fac579a65279eb0a26bab18f9e1243a626419640b91eab488eb21c96b0a9c83e6cc0141760c887b2481b533d0a32432de0919e41904c5b279c627 diff --git a/net-wireless/qspectrumanalyzer/metadata.xml b/net-wireless/qspectrumanalyzer/metadata.xml new file mode 100644 index 000000000..475ce62ee --- /dev/null +++ b/net-wireless/qspectrumanalyzer/metadata.xml @@ -0,0 +1,12 @@ + + + + + unknown@pentoo.ch + Author Unknown + + + xmikos/qspectrumanalyzer + qspectrumanalyzer + + diff --git a/net-wireless/qspectrumanalyzer/qspectrumanalyzer-2.2.0.ebuild b/net-wireless/qspectrumanalyzer/qspectrumanalyzer-2.2.0.ebuild deleted file mode 120000 index 76740e9b5..000000000 --- a/net-wireless/qspectrumanalyzer/qspectrumanalyzer-2.2.0.ebuild +++ /dev/null @@ -1 +0,0 @@ -qspectrumanalyzer-9999.ebuild \ No newline at end of file diff --git a/net-wireless/qspectrumanalyzer/qspectrumanalyzer-2.2.0.ebuild b/net-wireless/qspectrumanalyzer/qspectrumanalyzer-2.2.0.ebuild new file mode 100644 index 000000000..e42c4b96e --- /dev/null +++ b/net-wireless/qspectrumanalyzer/qspectrumanalyzer-2.2.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2024 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +#PYPI_NO_NORMALIZE=1 +#PYPI_PN="QSpectrumAnalyzer" + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..12} ) + +inherit distutils-r1 + +DESCRIPTION="vendor and platform neutral SDR support library" +HOMEPAGE="https://github.com/xmikos/qspectrumanalyzer" +SRC_URI="https://github.com/xmikos/qspectrumanalyzer/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm64 ~x86" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" +# The depend on soapy_power can be removed if patched out of setup.py +RDEPEND="${DEPEND} + net-wireless/soapy_power[${PYTHON_USEDEP}] + dev-python/pyqtgraph[${PYTHON_USEDEP}] + dev-python/qt-py[${PYTHON_USEDEP}]" diff --git a/net-wireless/qspectrumanalyzer/qspectrumanalyzer-9999.ebuild b/net-wireless/qspectrumanalyzer/qspectrumanalyzer-9999.ebuild deleted file mode 100644 index 2172df287..000000000 --- a/net-wireless/qspectrumanalyzer/qspectrumanalyzer-9999.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit distutils-r1 - -DESCRIPTION="vendor and platform neutral SDR support library" -HOMEPAGE="https://github.com/xmikos/qspectrumanalyzer" - -LICENSE="GPL-3" -SLOT="0" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xmikos/qspectrumanalyzer.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xmikos/qspectrumanalyzer/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -# The depend on soapy_power can be removed if patched out of setup.py -RDEPEND="${DEPEND} - net-wireless/soapy_power[${PYTHON_USEDEP}] - dev-python/pyqtgraph[${PYTHON_USEDEP}] - dev-python/qt-py[${PYTHON_USEDEP}]" diff --git a/net-wireless/soapy_power/Manifest b/net-wireless/soapy_power/Manifest index 2a98d84b3..ae4a3a89d 100644 --- a/net-wireless/soapy_power/Manifest +++ b/net-wireless/soapy_power/Manifest @@ -1 +1 @@ -DIST soapy_power-1.6.1.tar.gz 14672 BLAKE2B 7cc16fed02a02f91cb62d3937a1cf73144f8a427acbba1bacf4c8949f8d270d7bf5a443ddd227b0a53183d79f62fa2fc5e13f67ac188dfc3a2a385d22634076a SHA512 19aa0e80a7b67cb29d842343c09b8ca2e3068583c8117a8151c5b47f1a34369f0ec833f038595323712986c9348b14a43dc1fdc6516adb40de6b42a281d782e1 +DIST soapy_power-1.6.1.tar.gz 18956 BLAKE2B 64232d0ced07eebb6ebf5e38fc722287355aca2a294d5ec79fb6f47d2d7c920a9c2d88862d3d4e01bd5b7d34d9d045562fc310dc9b6c16b9051efb49236bf7fb SHA512 1bf175e14a6d84b2c05eb4494fd988957c97eace71d5007c5a1f9763758c8c927b52e49839210ea1cfc20a25d15c4be8c9247baf47b68e9d18114c83ba63c7c7 diff --git a/net-wireless/soapy_power/metadata.xml b/net-wireless/soapy_power/metadata.xml index 629b11e53..a8ff3258e 100644 --- a/net-wireless/soapy_power/metadata.xml +++ b/net-wireless/soapy_power/metadata.xml @@ -7,5 +7,6 @@ xmikos/soapy_power + soapy_power diff --git a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild index a472ea6b8..2db3dedf9 100644 --- a/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild +++ b/net-wireless/soapy_power/soapy_power-1.6.1-r1.ebuild @@ -3,22 +3,16 @@ EAPI=8 +DISTUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 +inherit distutils-r1 pypi DESCRIPTION="Obtain power spectrum from SoapySDR devices" HOMEPAGE="https://github.com/xmikos/soapy_power" LICENSE="MIT" SLOT="0" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xmikos/soapy_power.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xmikos/soapy_power/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi +KEYWORDS="amd64 ~arm64 ~x86" IUSE="+faster fastest" diff --git a/net-wireless/soapy_power/soapy_power-9999.ebuild b/net-wireless/soapy_power/soapy_power-9999.ebuild deleted file mode 100644 index a472ea6b8..000000000 --- a/net-wireless/soapy_power/soapy_power-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit distutils-r1 - -DESCRIPTION="Obtain power spectrum from SoapySDR devices" -HOMEPAGE="https://github.com/xmikos/soapy_power" - -LICENSE="MIT" -SLOT="0" - -if [ "${PV}" = "9999" ]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/xmikos/soapy_power.git" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/xmikos/soapy_power/archive/v${PV}.tar.gz -> ${P}.tar.gz" -fi - -IUSE="+faster fastest" - -RDEPEND="dev-python/numpy[${PYTHON_USEDEP}] - dev-python/simplespectral[${PYTHON_USEDEP}] - >=dev-python/simplesoapy-1.5.0[${PYTHON_USEDEP}] - faster? ( dev-python/scipy[${PYTHON_USEDEP}] ) - fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )" diff --git a/profiles/pentoo/base/package.accept_keywords/dev-python b/profiles/pentoo/base/package.accept_keywords/dev-python index fd50f53a1..e3a3d690d 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-python +++ b/profiles/pentoo/base/package.accept_keywords/dev-python @@ -22,14 +22,6 @@ dev-python/simplekml dev-python/pygeoif dev-python/fastkml -#qspectrumanalyzer -dev-python/pyFFTW -dev-python/qt-py -dev-python/simplespectral -dev-python/simplesoapy -dev-python/pyqtgraph amd64 - - #required by veil-evasion =dev-python/pyinstaller-3*