diff --git a/app-misc/corectrl/corectrl-1.3.8.ebuild b/app-misc/corectrl/corectrl-1.3.8.ebuild index d99dc875b7..530ee1ae9b 100644 --- a/app-misc/corectrl/corectrl-1.3.8.ebuild +++ b/app-misc/corectrl/corectrl-1.3.8.ebuild @@ -50,5 +50,5 @@ src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) ) - ecm_src_configure + cmake_src_configure } diff --git a/app-misc/corectrl/corectrl-9999.ebuild b/app-misc/corectrl/corectrl-9999.ebuild index 7f4910f5ec..3bb24f4bf7 100644 --- a/app-misc/corectrl/corectrl-9999.ebuild +++ b/app-misc/corectrl/corectrl-9999.ebuild @@ -50,5 +50,5 @@ src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) ) - ecm_src_configure + cmake_src_configure } diff --git a/app-shells/zsh-autocomplete/zsh-autocomplete-23.07.13.ebuild b/app-shells/zsh-autocomplete/zsh-autocomplete-23.07.13.ebuild index 42a4d55042..34b6f15a77 100644 --- a/app-shells/zsh-autocomplete/zsh-autocomplete-23.07.13.ebuild +++ b/app-shells/zsh-autocomplete/zsh-autocomplete-23.07.13.ebuild @@ -27,8 +27,6 @@ at the end of your ~/.zshrc" src_install() { # Move repo/tarball folder to zsh "plugin folder" - # Remove .git in 9999 (update using portage) - [[ ${PV} == 9999 ]] && rm -r "${S}/.git" ||die mkdir -p "${ED}/usr/share/zsh/site-functions/" || die mv "${S}" "${ED}/usr/share/zsh/site-functions/${PN}" diff --git a/dev-python/guidata/Manifest b/dev-python/guidata/Manifest index 1d99473bf6..c3889d4239 100644 --- a/dev-python/guidata/Manifest +++ b/dev-python/guidata/Manifest @@ -1,3 +1,2 @@ DIST guidata-2.3.1.tar.gz 504812 BLAKE2B 4b2e5e07ee76bbeb95a9a55a4cde1d409d2438fe5273a0f154d34e8beb9934f810b29a33ef508009e38c589d57402aef55d346b93856fc744e7a8236748f5e86 SHA512 7488ca8c761394dfd9d58a8ac3c96dc963adab6df278823fb1a7d9132febc16e275908034ef48381d696668add43f62438fab1ba22f70f5e08f33b14a81082c5 -DIST guidata-3.1.0.tar.gz 946229 BLAKE2B 50998faccdbb3db0128219d46aa950678628045d569b0eaa5d0e4216bcc94d6eb4c08b1000358b1ceae2593876c813cc1377bb01d2c2f95ccb8dd2197b1f9db9 SHA512 be6ba3a17b767d44371ca589fbf7eed425ebab9484afd62fa85fc485b84dd2f2cc043e0e7b041eb47663b748a1daf2b5321be3a5c81f9b94a1556cb8be349546 -DIST guidata-3.2.1.tar.gz 671793 BLAKE2B da557f74aedd1d2011056ff27f20ba4761e022e3dab458ce362aee0a2177e5e612c16cbe4a39577fd187956fff24a27eaa21f1f35958fba5ed18e9bdd961a7c1 SHA512 e9a0c7c7e0bcaaace378dcb056d1ce68afca49f607d6cb95ee640b739037c302c53fc034c948e6bca14562bdf262ece1d613c4fd28f9b04b27cc0bbe276ac449 +DIST guidata-3.2.2.tar.gz 672062 BLAKE2B ff8c06e1f97cc454136a3cb8857739cc223536456bb06a4ac3b3b86e2eaf894fc60a3bdc2d70ea62fdc2b85bbc9f546f614b5ad0b2c9bace584054377f5fbfb2 SHA512 a9f31e5c43bf203f9a5919dd574553ec14dcd317e06204be50bcd4f2cc7ac71a431145d33a6d3dfe076620d6cc753349b5fdb5436d89dfda18c9f7572aeec00f diff --git a/dev-python/guidata/guidata-3.2.1.ebuild b/dev-python/guidata/guidata-3.2.1.ebuild deleted file mode 100644 index c126da8919..0000000000 --- a/dev-python/guidata/guidata-3.2.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{11,12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Library for user interfaces for easy dataset editing and display" -HOMEPAGE="https://pypi.python.org/pypi/guidata" -LICENSE="BSD" - -SLOT="0" - -# No automated tests can be performed afaik -RESTRICT="test" - -RDEPEND=" - dev-python/PyQt5[${PYTHON_USEDEP}] - dev-python/QtPy[${PYTHON_USEDEP}] -" - -KEYWORDS="~amd64 ~x86" diff --git a/dev-python/guidata/guidata-3.1.0.ebuild b/dev-python/guidata/guidata-3.2.2.ebuild similarity index 58% rename from dev-python/guidata/guidata-3.1.0.ebuild rename to dev-python/guidata/guidata-3.2.2.ebuild index f0d1125b69..4fd5808b63 100644 --- a/dev-python/guidata/guidata-3.1.0.ebuild +++ b/dev-python/guidata/guidata-3.2.2.ebuild @@ -12,15 +12,29 @@ DESCRIPTION="Library for user interfaces for easy dataset editing and display" HOMEPAGE="https://pypi.python.org/pypi/guidata" LICENSE="BSD" -SLOT="0" -IUSE="" +KEYWORDS="~amd64 ~x86" -# No automated tests can be performed afaik -RESTRICT="test" +SLOT="0" +IUSE="test" RDEPEND=" + dev-python/h5py[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] dev-python/PyQt5[${PYTHON_USEDEP}] dev-python/QtPy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/tomli[${PYTHON_USEDEP}] " -KEYWORDS="~amd64 ~x86" +BDEPEND=" + test? ( + dev-python/pytest-qt[${PYTHON_USEDEP}] + dev-python/pytest-xvfb[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_test() { + epytest -p xvfb +} diff --git a/dev-python/python-socketio/Manifest b/dev-python/python-socketio/Manifest index 38c96ee631..ed02dbea62 100644 --- a/dev-python/python-socketio/Manifest +++ b/dev-python/python-socketio/Manifest @@ -1,3 +1,2 @@ DIST python-socketio-5.10.0.tar.gz 114300 BLAKE2B 134fc3a03f3923afb9ff96f3765c738cf296f875718fb35ccdeade77bae185ed2c5973e1adcdf69e3fcf4b98ecbe0177161c5405ef6782798c5ce355f427ca71 SHA512 e20a88d6031d69c64db777487bfc8cfe043d4e893e73194c82f529290d0852352b5d011d07f4ce82a51e71f34cf483be99a5851eb5969d520fc8126009d7363f -DIST python-socketio-5.8.0.tar.gz 47872 BLAKE2B 465593a89bb0504af485ec4c94a52159548ce3cace3f58c9174d694e35b40c6eb68e5a0350ee34551b6d01c47d571be63f7cc91a42ca9815c2a3a271825f3624 SHA512 653a6764e22738f0aaad3fb03ef193d820780d61fcffede117a2a2cf7097c722974bded7869639f4ac01dc9a121d90dcbeca70fcc9bbb4e96e3b87bd39e69180 -DIST python-socketio-5.9.0.tar.gz 47982 BLAKE2B 3fc120b597f92d404972807a40275a5cdb32a38e6e634034c6c4792cc94635dac1c0a911eec75aeaf961358399873c1de1ad6fcf43389ac96c6e5dc48746bced SHA512 145fbcc4a0d089f96d57aabea1b097badea1b9aaf64dc5401503908460e70400ce5c0581184ff574c97cfabce03fda89285223ec03814fa3d33557476d27ffc4 +DIST python-socketio-5.11.0.tar.gz 116482 BLAKE2B b55aec3c18d5313a82d6d430158fbe7e955295d36a363d4072c76cff71596e8b3e805e7a571fac343258a8576501f1f25fe92c5bf1aaffcc7272b4dea7cac2c2 SHA512 ed2068812cb7d2e74dcf9ff15a9c9b957ac07369f786a6db67d78286f0c49a7b860c5356040d405d50351c0ae49cf4f939f106d796a614c45743df1220a9b575 diff --git a/dev-python/python-socketio/python-socketio-5.8.0.ebuild b/dev-python/python-socketio/python-socketio-5.11.0.ebuild similarity index 96% rename from dev-python/python-socketio/python-socketio-5.8.0.ebuild rename to dev-python/python-socketio/python-socketio-5.11.0.ebuild index f02fa5f934..fba80ab748 100644 --- a/dev-python/python-socketio/python-socketio-5.8.0.ebuild +++ b/dev-python/python-socketio/python-socketio-5.11.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10,11} ) +PYTHON_COMPAT=( python3_{10,11,12} ) inherit distutils-r1 pypi DESCRIPTION="Python implementation of the Socket.IO realtime server." diff --git a/dev-python/python-socketio/python-socketio-5.9.0.ebuild b/dev-python/python-socketio/python-socketio-5.9.0.ebuild deleted file mode 100644 index f02fa5f934..0000000000 --- a/dev-python/python-socketio/python-socketio-5.9.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10,11} ) -inherit distutils-r1 pypi - -DESCRIPTION="Python implementation of the Socket.IO realtime server." -HOMEPAGE=" - https://python-socketio.readthedocs.org/ - https://github.com/miguelgrinberg/python-socketio/ - https://pypi.org/project/python-socketio" - -LICENSE="MIT" -SLOT="0" -#wait for dev-python/python-engineio -KEYWORDS="~amd64" -IUSE="client asyncio-client" - -RDEPEND="dev-python/bidict[${PYTHON_USEDEP}] - >=dev-python/python-engineio-4.0.0[${PYTHON_USEDEP}] - client? ( dev-python/requests[${PYTHON_USEDEP}] - dev-python/websocket-client[${PYTHON_USEDEP}] ) - asyncio-client? ( dev-python/aiohttp[${PYTHON_USEDEP}] - dev-python/websockets[${PYTHON_USEDEP}] )" -DEPEND="${RDEPEND}" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# pypi tarball does not contain tests -RESTRICT="test" diff --git a/dev-util/xmake/xmake-2.8.6.ebuild b/dev-util/xmake/xmake-2.8.6.ebuild index 28e4782756..6c3a300383 100644 --- a/dev-util/xmake/xmake-2.8.6.ebuild +++ b/dev-util/xmake/xmake-2.8.6.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit bash-completion-r1 optfeature +inherit optfeature shell-completion DESCRIPTION="A cross-platform build utility based on Lua" HOMEPAGE="https://xmake.io" @@ -59,12 +59,8 @@ src_install() { newbashcomp xmake/scripts/completions/register-completions.bash xmake bashcomp_alias xmake xrepo - - insinto /usr/share/zsh/site-functions - newins xmake/scripts/completions/register-completions.zsh xmake.zsh - - insinto /usr/share/fish/vendor_completions.d - newins xmake/scripts/completions/register-completions.fish xmake.fish + newzshcomp xmake/scripts/completions/register-completions.zsh _xmake + newfishcomp xmake/scripts/completions/register-completions.fish xmake.fish } pkg_postinst() { diff --git a/dev-util/xmake/xmake-9999.ebuild b/dev-util/xmake/xmake-9999.ebuild index 28e4782756..6c3a300383 100644 --- a/dev-util/xmake/xmake-9999.ebuild +++ b/dev-util/xmake/xmake-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit bash-completion-r1 optfeature +inherit optfeature shell-completion DESCRIPTION="A cross-platform build utility based on Lua" HOMEPAGE="https://xmake.io" @@ -59,12 +59,8 @@ src_install() { newbashcomp xmake/scripts/completions/register-completions.bash xmake bashcomp_alias xmake xrepo - - insinto /usr/share/zsh/site-functions - newins xmake/scripts/completions/register-completions.zsh xmake.zsh - - insinto /usr/share/fish/vendor_completions.d - newins xmake/scripts/completions/register-completions.fish xmake.fish + newzshcomp xmake/scripts/completions/register-completions.zsh _xmake + newfishcomp xmake/scripts/completions/register-completions.fish xmake.fish } pkg_postinst() { diff --git a/dev-vcs/gitahead/Manifest b/dev-vcs/gitahead/Manifest index 4a1b41fcf9..110740de28 100644 --- a/dev-vcs/gitahead/Manifest +++ b/dev-vcs/gitahead/Manifest @@ -1,5 +1,4 @@ -DIST gitahead-2.7.1-dep_cmark_cmark.tar.gz 231023 BLAKE2B b3e5768c04d33a6273befa8f1aa121b1f4df7ab1c4791c093681186b74b9a819824ff7d6369b456fe94e121344eecd704e71657d8004b1ef66b54ec4cb2a6abd SHA512 65fe291cfc9d163dff8ae69f98cb3449434405a50835056d2bf4aff43131f23d7d837c4ec7aa9bec93df184ff5d1210bff522d702fbddc96844dcf98f515d0b7 DIST gitahead-2.7.1-dep_git_git.tar.gz 7968616 BLAKE2B 7d2ea9e1ca1faa1a8b66a9db6b213c02be966cec74abe085139e3e966adcff9efbd74fb942ad145ddea64bab94a6006b91b512c96aa645cb124bcaf6e5a488eb SHA512 37a77870e0df748b023f5381aa969f1126b142a3470c9df4e01d86cf3418a0b0e4cb16a37ef7b162f285bdd540559a3511488ec8591b2f88e495626df019c03f -DIST gitahead-2.7.1-dep_libgit2_libgit2.tar.gz 5322459 BLAKE2B 2a5a4e98e3d6f2883f60604ea5721a56fbc9f3c2403686cda5b65e3fe859bbbe773d30d7fbf8a9d1549aeeda3367526d8604047a27cde490edc8f3fb982fa0c6 SHA512 068be7000e8c9f01073ffa315e398b687e937fbd63fb77021a307cfefc8382ddb085a36f6a2b40bade355d6ffcb1772de8551b9eb6f9eb56877805883804114d -DIST gitahead-2.7.1-dep_libssh2_libssh2.tar.gz 464738 BLAKE2B 6520c4df6584798505da8e14bfb4fe43389d0b3702d7eee6ce6b604d3260df7fda5c79cef8f69614035efeb31e516da63464313e11f64b6e8995a39c814683e8 SHA512 e86c0787e2aa7be5e9f19356e543493e53c7d1b51b585c46facfb05f769e6491209f820b207bf594348f4760c492c32dda3fcc94fc0af93cb09c736492a8e231 +DIST gitahead-2.7.1-dep_hunspell_hunspell.tar.gz 506908 BLAKE2B 810117701b16506ab18f3834cbbe6c75c970632a24b504b0fe914d77407e7379000826897aa03584edb7b87d207e26297709dd70613b6dd49731aa0aed1416b4 SHA512 6e0f4fe0a30e3824cff51ab507e3a836021e8b7542c86ed2950689fe9724b3c017648eb9928d1bb86fddcff113903164c25a1725a4fe7c8b94a833c4bf36279d +DIST gitahead-2.7.1-dep_libgit2_libgit2.tar.gz 7535416 BLAKE2B 220249adafac30fdd329e65eabc0a7dc0f533b2242d2e75743c781d80d427d8aca5abc7c7d6f6874ebb6b379cee1bf2569a57a769b8a00a4d15ff5a94a218ad0 SHA512 eb0d66840210d1a73b11c7374fa2745afded753d5e8a87483efb5dcf76973469b705279e3ddca15874423123f387384f752aec614951ef4185d334b171d78779 DIST gitahead-2.7.1.tar.gz 37248607 BLAKE2B 0f1399f84b92717c898708859a2b5c70d88dc52885b12ad915becb9943fc8037ec4ff498888b769603da163408a635bc111f0d5302a8631bb07c9683915e11e1 SHA512 c58ba55e0a0e9d11a0f777bd9d2e51cc7e2c93d0d58d266ae5a1c1271b962d5ac479124234b162983ff56870262e356969b841d59b375ae22e39301e689f3ab9 diff --git a/dev-vcs/gitahead/gitahead-2.7.1.ebuild b/dev-vcs/gitahead/gitahead-2.7.1.ebuild index 3023121df8..5408b298d4 100644 --- a/dev-vcs/gitahead/gitahead-2.7.1.ebuild +++ b/dev-vcs/gitahead/gitahead-2.7.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -9,9 +9,10 @@ DESCRIPTION="Graphical Git client to help understand and manage source code hist HOMEPAGE="https://github.com/gitahead/gitahead" SRC_URI=" https://github.com/gitahead/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/stinb/libgit2/archive/90af68bbe2690998f015f18b7c890f5868bcd3ee.tar.gz -> ${P}-dep_libgit2_libgit2.tar.gz - https://github.com/libssh2/libssh2/archive/42d37aa63129a1b2644bf6495198923534322d64.tar.gz -> ${P}-dep_libssh2_libssh2.tar.gz - https://github.com/commonmark/cmark/archive/f0793895eefc8ca14499831a24abee549a5af53e.tar.gz -> ${P}-dep_cmark_cmark.tar.gz + https://github.com/stinb/libgit2/archive/834d652bcb932af447d7f0acd1214a4057cb0771.tar.gz + -> ${P}-dep_libgit2_libgit2.tar.gz + https://github.com/hunspell/hunspell/archive/8a2fdfe5a6bb1cbafc04b0c8486abcefd17ad903.tar.gz + -> ${P}-dep_hunspell_hunspell.tar.gz gnome-keyring? ( https://github.com/git/git/archive/0d0ac3826a3bbb9247e39e12623bbcfdd722f24c.tar.gz -> ${P}-dep_git_git.tar.gz ) @@ -24,30 +25,23 @@ RESTRICT="test" IUSE="gnome-keyring" RDEPEND=" - app-crypt/mit-krb5 - app-text/cmark - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[jpeg] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qttest:5 - dev-qt/qtwidgets:5 + app-text/cmark:= + dev-libs/openssl:= + dev-qt/qt5compat:6 + dev-qt/qtbase:6[concurrent,gui,network,widgets] net-libs/libssh2 gnome-keyring? ( app-crypt/libsecret ) " -DEPEND=" - ${RDEPEND} - dev-qt/linguist-tools:5 +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/qttools:6[linguist] + virtual/pkgconfig " -QA_FLAGS_IGNORED=" - usr/share/GitAhead/Plugins/imageformats/libqjpeg.so - usr/share/GitAhead/Plugins/platforms/libqxcb.so - usr/share/GitAhead/Plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so -" +QA_FLAGS_IGNORED="usr/share/GitAhead/Plugins/.*" +QA_PRESTRIPPED="usr/share/GitAhead/Plugins/.*" src_unpack() { unpack "${P}.tar.gz" @@ -55,8 +49,7 @@ src_unpack() { cd "${S}" || die local i list=( dep_libgit2_libgit2 - dep_libssh2_libssh2 - dep_cmark_cmark + dep_hunspell_hunspell ) use gnome-keyring && list+=( dep_git_git ) for i in "${list[@]}"; do @@ -70,6 +63,8 @@ src_prepare() { sed -i 's/add_subdirectory(git)//' ./dep/CMakeLists.txt || die fi sed -i 's/add_subdirectory(openssl)//' ./dep/CMakeLists.txt || die + # Respect LDFLAGS + sed -i '/CMAKE_EXE_LINKER_FLAGS/d' CMakeLists.txt || die cmake_src_prepare }