From 5fa0d4659f561ba4e65b70f968ea70bcc42a8769 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Mon, 10 Jun 2024 19:55:49 -0400 Subject: [PATCH] drop improperly tested chirp and wxpython --- dev-python/wxpython/Manifest | 1 - .../files/wxpython-4.2.0-cython-3.patch | 19 --- .../wxpython/files/wxpython-4.2.0-flags.patch | 16 --- .../files/wxpython-4.2.0-no-attrdict.patch | 13 -- .../files/wxpython-4.2.0-no-webkit.patch | 27 ---- dev-python/wxpython/metadata.xml | 8 -- dev-python/wxpython/wxpython-4.2.1.ebuild | 127 ------------------ media-radio/chirp/Manifest | 1 - media-radio/chirp/chirp-20240404.ebuild | 61 --------- media-radio/chirp/metadata.xml | 11 -- 10 files changed, 284 deletions(-) delete mode 100644 dev-python/wxpython/Manifest delete mode 100644 dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch delete mode 100644 dev-python/wxpython/files/wxpython-4.2.0-flags.patch delete mode 100644 dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch delete mode 100644 dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch delete mode 100644 dev-python/wxpython/metadata.xml delete mode 100644 dev-python/wxpython/wxpython-4.2.1.ebuild delete mode 100644 media-radio/chirp/Manifest delete mode 100644 media-radio/chirp/chirp-20240404.ebuild delete mode 100644 media-radio/chirp/metadata.xml diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest deleted file mode 100644 index fa6b641e4..000000000 --- a/dev-python/wxpython/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST wxPython-4.2.1.tar.gz 73724359 BLAKE2B d9569ea172c7279e0b2cfcb3cdcd5d1faab5324e2648c9b0f8c8b838fb2355dc6af28c4593e5dd0cfa02573133bf15a58a6ffa9711d854925a9cada0985dc7f8 SHA512 ee9ab8effb3c71de004c3d61ec583b9980c6b75fe9bb04cf2c76025ea70afc206bc3073c44d1c83c7ba604afed9fd38c01b9ef506617ba279a4ac58e3cf34438 diff --git a/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch b/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch deleted file mode 100644 index aff380108..000000000 --- a/dev-python/wxpython/files/wxpython-4.2.0-cython-3.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://bugs.gentoo.org/911703 -https://github.com/wxWidgets/Phoenix/pull/2441 - -From aeb557d01e7cd37176ebbf0f1ae6d0b53c115378 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Tue, 25 Jul 2023 12:42:32 -0400 -Subject: [PATCH] Fix compatibility with Cython 3.0.0 - -Remove unused import which seems to be removed in Cython 3. ---- a/wx/svg/_nanosvg.pyx -+++ b/wx/svg/_nanosvg.pyx -@@ -42,7 +42,6 @@ for manipulating the SVG shape info in memory. - - import sys - --cimport cython.object - from cpython.buffer cimport ( - Py_buffer, PyObject_CheckBuffer, PyObject_GetBuffer, PyBUF_SIMPLE, - PyBuffer_Release) diff --git a/dev-python/wxpython/files/wxpython-4.2.0-flags.patch b/dev-python/wxpython/files/wxpython-4.2.0-flags.patch deleted file mode 100644 index 12af1e211..000000000 --- a/dev-python/wxpython/files/wxpython-4.2.0-flags.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/buildtools/config.py -+++ b/buildtools/config.py -@@ -236,9 +236,12 @@ class Configuration(object): - for lst in [self.cflags, self.cxxflags]: - lst.append('-O3') - -+ self.cflags += os.environ.get('CFLAGS', '').split() -+ self.cxxflags += os.environ.get('CXXFLAGS', '').split() -+ - lflags = self.getWxConfigValue('--libs') - self.MONOLITHIC = (lflags.find("_xrc") == -1) -- self.lflags = lflags.split() -+ self.lflags = lflags.split() + os.environ.get('LDFLAGS', '').split() - - self.WXBASENAME = self.getWxConfigValue('--basename') - self.WXRELEASE = self.getWxConfigValue('--release') diff --git a/dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch b/dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch deleted file mode 100644 index b3e4beff2..000000000 --- a/dev-python/wxpython/files/wxpython-4.2.0-no-attrdict.patch +++ /dev/null @@ -1,13 +0,0 @@ -As in https://src.fedoraproject.org/rpms/python-wxpython4/raw/rawhide/f/no-attrdict.patch. ---- a/buildtools/config.py -+++ b/buildtools/config.py -@@ -27,8 +27,6 @@ from distutils.dep_util import newer - - import distutils.sysconfig - --from attrdict import AttrDict -- - runSilently = False - - #---------------------------------------------------------------------- - diff --git a/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch b/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch deleted file mode 100644 index 5ab48cef7..000000000 --- a/dev-python/wxpython/files/wxpython-4.2.0-no-webkit.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/wscript -+++ b/wscript -@@ -244,15 +244,6 @@ - uselib_store='WXGL', mandatory=True, - msg='Finding libs for WXGL') - -- if cfg.checkSetup(wxConfigDir, 'wxUSE_WEBVIEW'): -- wv_libs = '--libs webview,core,net' -- else: -- wv_libs = '--libs core,net' -- conf.check_cfg(path=conf.options.wx_config, package='', -- args='--cxxflags ' + wv_libs + rpath, -- uselib_store='WXWEBVIEW', mandatory=True, -- msg='Finding libs for WXWEBVIEW') -- - conf.check_cfg(path=conf.options.wx_config, package='', - args='--cxxflags --libs xml,core,net' + rpath, - uselib_store='WXXML', mandatory=True, -@@ -600,7 +591,6 @@ - makeETGRule(bld, 'etg/_stc.py', '_stc', 'WXSTC') - makeETGRule(bld, 'etg/_html.py', '_html', 'WXHTML') - makeETGRule(bld, 'etg/_glcanvas.py', '_glcanvas', 'WXGL') -- makeETGRule(bld, 'etg/_html2.py', '_html2', 'WXWEBVIEW') - makeETGRule(bld, 'etg/_xml.py', '_xml', 'WXXML') - makeETGRule(bld, 'etg/_xrc.py', '_xrc', 'WXXRC') - makeETGRule(bld, 'etg/_richtext.py', '_richtext', 'WXHTML WXRICHTEXT') - diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml deleted file mode 100644 index 20ce407eb..000000000 --- a/dev-python/wxpython/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - wxWidgets/Phoenix - wxPython - - diff --git a/dev-python/wxpython/wxpython-4.2.1.ebuild b/dev-python/wxpython/wxpython-4.2.1.ebuild deleted file mode 100644 index 7046c4f2f..000000000 --- a/dev-python/wxpython/wxpython-4.2.1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -#DISTUTILS_IN_SOURCE_BUILD="1" -PYTHON_COMPAT=( python3_{10..12} ) -PYPI_NO_NORMALIZE=1 -PYPI_PN="wxPython" -WX_GTK_VER="3.2-gtk3" -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 multiprocessing virtualx wxwidgets pypi - -DESCRIPTION="A blending of the wxWindows C++ class library with Python" -HOMEPAGE=" - https://www.wxpython.org/ - https://github.com/wxWidgets/Phoenix/ - https://pypi.org/project/wxPython/ -" - -LICENSE="wxWinLL-3" -SLOT="4.0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc ~x86" -IUSE="test webkit" -RESTRICT="!test? ( test )" - -# wxPython doesn't seem to be able to optionally disable features. webkit is -# optionally patched out because it's so huge, but other elements are not, -# which makes us have to require all features from wxGTK -DEPEND=" - >=x11-libs/wxGTK-3.0.4-r301:${WX_GTK_VER}=[gstreamer,libnotify,opengl,sdl,tiff,webkit?,X] - media-libs/libpng:= - media-libs/tiff:= - media-libs/libjpeg-turbo:= -" -RDEPEND=" - ${DEPEND} -" -BDEPEND=" - app-text/doxygen - dev-python/cython[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/sip-6.6.2[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - test? ( - ${VIRTUALX_DEPEND} - dev-python/appdirs[${PYTHON_USEDEP}] - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.0-flags.patch" - "${FILESDIR}/${PN}-4.2.0-cython-3.patch" -) - -python_prepare_all() { - if ! use webkit; then - eapply "${FILESDIR}/${PN}-4.2.0-no-webkit.patch" - fi - - distutils-r1_python_prepare_all -} - -src_configure() { - setup-wxwidgets -} - -python_compile() { - DOXYGEN="$(type -P doxygen)" ${PYTHON} build.py dox etg --nodoc || die - - # Refresh the bundled/pregenerated sip files - "${EPYTHON}" build.py sip || die - - # Build the bindings - "${EPYTHON}" build.py build_py \ - --use_syswx \ - --no_magic \ - --jobs="$(makeopts_jobs)" \ - --verbose \ - --release || die -} - -python_test() { - local EPYTEST_DESELECT=( - # virtx probably - unittests/test_display.py::display_Tests::test_display - unittests/test_frame.py::frame_Tests::test_frameRestore - unittests/test_mousemanager.py::mousemanager_Tests::test_mousemanager1 - unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardChar - unittests/test_uiaction.py::uiaction_KeyboardTests::test_uiactionKeyboardKeyDownUp - unittests/test_uiaction.py::uiaction_MouseTests - - # assertion (TODO) - unittests/test_aboutdlg.py::aboutdlg_Tests::test_aboutdlgGeneric - unittests/test_lib_agw_piectrl.py::lib_agw_piectrl_Tests::test_lib_agw_piectrlCtor - - # seems to rely on state from a previous test (sigh) - unittests/test_lib_agw_persist_persistencemanager.py::lib_agw_persist_persistencemanager_Tests::test_persistencemanagerRestore - - # requires Spanish localization - unittests/test_intl.py::intl_Tests::test_intlGetString - - # TODO - unittests/test_tipwin.py::tipwin_Tests::test_tipwinCtor - unittests/test_lib_pubsub_provider.py::lib_pubsub_Except::test1 - unittests/test_windowid.py::IdManagerTest::test_newIdRef03 - ) - local EPYTEST_IGNORE=() - if ! use webkit; then - EPYTEST_IGNORE+=( unittests/test_webview.py ) - fi - - # We use pytest-forked as opensuse does to avoid tests corrupting each - # other. - virtx epytest --forked -n "$(makeopts_jobs)" unittests -} - -python_install() { - distutils-r1_python_install --skip-build -} diff --git a/media-radio/chirp/Manifest b/media-radio/chirp/Manifest deleted file mode 100644 index 02d5b2d01..000000000 --- a/media-radio/chirp/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST chirp-20240404.tar.gz 1973257 BLAKE2B 566c0ed4ff9b0fe03bb1863e402b27b1b9a29c50b5467ca22bedf62e3b5584e82cde0c8cd430b92a223e0720e6b8c4ed5aa6b6632f660d7a01fc2f8dc7c78af9 SHA512 fc975eca574f2a230caeae7479675749b9d74340ebd7352069e4c51410b4c7c082f6fa3c027c499cdd58eed40479d1c4bfef75d29f2c4f809c88b4f8018f1feb diff --git a/media-radio/chirp/chirp-20240404.ebuild b/media-radio/chirp/chirp-20240404.ebuild deleted file mode 100644 index c9efe3116..000000000 --- a/media-radio/chirp/chirp-20240404.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# py3.12 blocked by wxpython -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools - -inherit distutils-r1 - -DESCRIPTION="A free, open-source tool for programming your radio" -HOMEPAGE="https://chirpmyradio.com/" -SRC_URI="https://archive.chirpmyradio.com/${PN}_next/next-${PV}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+gui radioreference" - -RDEPEND="$(python_gen_cond_dep ' - dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - gui? ( - dev-python/wxpython:4.0[${PYTHON_USEDEP}] - dev-python/yattag[${PYTHON_USEDEP}] - ) - radioreference? ( dev-python/suds-community[${PYTHON_USEDEP}] ) -')" -BDEPEND="test? ( $(python_gen_cond_dep ' - dev-python/ddt[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] -') )" - -distutils_enable_tests pytest - -# The alias map is an internal developer file not included in release tarballs. -# Other disabled tests require Internet access. -EPYTEST_DESELECT=( - tests/unit/test_directory.py::TestAliasMap - tests/unit/test_network_sources.py - tests/unit/test_repeaterbook.py -) - -python_test() { - # From the contents of tests/ upstream currently only runs unit and driver - # tests, and the latter can take so long that they have even got a special - # script for only running them on drivers whose code has changed - # with respect to origin/master. - epytest tests/unit/ -} - -src_install() { - distutils-r1_src_install - if ! use gui; then - rm "${ED}"/usr/bin/${PN} || die - fi -} diff --git a/media-radio/chirp/metadata.xml b/media-radio/chirp/metadata.xml deleted file mode 100644 index 335c39123..000000000 --- a/media-radio/chirp/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - pull in optional deps for query of radioreference - - - kk7ds/chirp - -