diff options
Diffstat (limited to 'net-misc')
34 files changed, 144 insertions, 238 deletions
diff --git a/net-misc/electron-cash/electron-cash-4.2.11.ebuild b/net-misc/electron-cash/electron-cash-4.2.11.ebuild index a7548ba8264c..29c18e34d5e1 100644 --- a/net-misc/electron-cash/electron-cash-4.2.11.ebuild +++ b/net-misc/electron-cash/electron-cash-4.2.11.ebuild @@ -42,7 +42,7 @@ RDEPEND=" dev-python/pathvalidate[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] dev-python/pyaes[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/pysocks[${PYTHON_USEDEP}] dev-python/qrcode[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] @@ -52,7 +52,7 @@ RDEPEND=" amodem? ( dev-python/amodem[${PYTHON_USEDEP}] ) qrcode? ( media-gfx/zbar[v4l] ) qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}] ) ncurses? ( dev-lang/python ) dev-libs/libsecp256k1 diff --git a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild index f0fbe6de5776..80f4379be020 100644 --- a/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild +++ b/net-misc/electrum-ltc/electrum-ltc-4.2.2.1.ebuild @@ -30,7 +30,7 @@ RDEPEND=" dev-python/cryptography[${PYTHON_USEDEP}] >=dev-python/dnspython-2[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/pysocks[${PYTHON_USEDEP}] dev-python/qrcode[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] @@ -38,7 +38,7 @@ RDEPEND=" >=dev-python/protobuf-3.12[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}] ) ncurses? ( $(python_gen_impl_dep 'ncurses') ) " diff --git a/net-misc/electrum/electrum-4.5.8.ebuild b/net-misc/electrum/electrum-4.5.8.ebuild index 0a23222fa6e1..7a63e2d4f444 100644 --- a/net-misc/electrum/electrum-4.5.8.ebuild +++ b/net-misc/electrum/electrum-4.5.8.ebuild @@ -36,7 +36,7 @@ RDEPEND=" dev-python/jsonpatch[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] dev-python/pyperclip[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/pysocks[${PYTHON_USEDEP}] dev-python/qrcode[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] @@ -44,7 +44,7 @@ RDEPEND=" >=dev-python/protobuf-3.20[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( - dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}] ) ncurses? ( $(python_gen_impl_dep 'ncurses') ) " diff --git a/net-misc/gallery-dl/gallery-dl-1.27.6.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.6.ebuild index c785e9eeb31f..c166188396ab 100644 --- a/net-misc/gallery-dl/gallery-dl-1.27.6.ebuild +++ b/net-misc/gallery-dl/gallery-dl-1.27.6.ebuild @@ -20,7 +20,7 @@ else SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86" fi LICENSE="GPL-2" diff --git a/net-misc/gns3-gui/gns3-gui-2.2.49-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.49-r1.ebuild index 2f66a77ac412..d72934069f01 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.49-r1.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.49-r1.ebuild @@ -23,7 +23,7 @@ RDEPEND=" >=dev-python/psutil-6.0.0[${PYTHON_USEDEP}] >=dev-python/truststore-0.9.1[${PYTHON_USEDEP}] ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] " distutils_enable_tests pytest diff --git a/net-misc/gns3-gui/gns3-gui-2.2.50.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.50.ebuild index 2f66a77ac412..d72934069f01 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.50.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.50.ebuild @@ -23,7 +23,7 @@ RDEPEND=" >=dev-python/psutil-6.0.0[${PYTHON_USEDEP}] >=dev-python/truststore-0.9.1[${PYTHON_USEDEP}] ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] " distutils_enable_tests pytest diff --git a/net-misc/gns3-gui/gns3-gui-2.2.51.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.51.ebuild index 7b9e4e2fc6da..ee747469d0c2 100644 --- a/net-misc/gns3-gui/gns3-gui-2.2.51.ebuild +++ b/net-misc/gns3-gui/gns3-gui-2.2.51.ebuild @@ -23,7 +23,7 @@ RDEPEND=" >=dev-python/psutil-6.1.0[${PYTHON_USEDEP}] >=dev-python/truststore-0.10.0[${PYTHON_USEDEP}] ~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}] - dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}] " distutils_enable_tests pytest diff --git a/net-misc/gsasl/gsasl-2.2.1.ebuild b/net-misc/gsasl/gsasl-2.2.1.ebuild index f0891ad0138c..54e17ead5ade 100644 --- a/net-misc/gsasl/gsasl-2.2.1.ebuild +++ b/net-misc/gsasl/gsasl-2.2.1.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-3" SLOT="0" # Before giving keywords (or ideally even bumping), please check https://www.gnu.org/software/gsasl/ to see # if it's a stable release or not! -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="+client gcrypt gnutls idn kerberos nls ntlm +server static-libs" REQUIRED_USE="|| ( client server )" diff --git a/net-misc/htbinit/htbinit-0.8.5-r8.ebuild b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild index f76c703881dc..5e37d2c38d6c 100644 --- a/net-misc/htbinit/htbinit-0.8.5-r8.ebuild +++ b/net-misc/htbinit/htbinit-0.8.5-r8.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ~ppc x86" IUSE="esfq" DEPEND="sys-apps/iproute2" diff --git a/net-misc/httpie/httpie-3.2.3.ebuild b/net-misc/httpie/httpie-3.2.3.ebuild index ba88195f0cd2..968f126843cb 100644 --- a/net-misc/httpie/httpie-3.2.3.ebuild +++ b/net-misc/httpie/httpie-3.2.3.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}"/cli-${PV} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" dev-python/charset-normalizer[${PYTHON_USEDEP}] diff --git a/net-misc/ndisc6/ndisc6-1.0.8.ebuild b/net-misc/ndisc6/ndisc6-1.0.8.ebuild index 4718530be728..e5f75a52cf97 100644 --- a/net-misc/ndisc6/ndisc6-1.0.8.ebuild +++ b/net-misc/ndisc6/ndisc6-1.0.8.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.remlab.net/files/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 arm arm64 ~loong ~riscv x86 ~x64-macos" IUSE="debug" BDEPEND=" diff --git a/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild b/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild index c8e3cead188d..924a03ec380e 100644 --- a/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild +++ b/net-misc/netkit-talk/netkit-talk-0.17-r8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ S="${WORKDIR}"/netkit-ntalk-${PV} LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm64 ~hppa ~mips ppc ~ppc64 sparc x86" DEPEND=">=sys-libs/ncurses-5.2:=" BDEPEND="virtual/pkgconfig" diff --git a/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild index 87ea9b1011ae..b863fe62f7f4 100644 --- a/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild +++ b/net-misc/networkmanager/networkmanager-1.48.10-r1.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/NetworkManager/NetworkManager" LICENSE="GPL-2+ LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm arm64 ~loong ppc ~ppc64 ~riscv ~sparc x86" IUSE="audit bluetooth +concheck connection-sharing debug dhclient dhcpcd elogind gnutls +gtk-doc +introspection iptables iwd psl libedit +nss nftables +modemmanager ofono ovs policykit +ppp resolvconf selinux syslog systemd teamd test +tools vala +wext +wifi" RESTRICT="!test? ( test )" diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch deleted file mode 100644 index 3898dcbcef3c..000000000000 --- a/net-misc/nextcloud-client/files/nextcloud-client-3.13.2-fix_build_kf6.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b2974a504f67e4af9c376927d1d0fd3c99de3255 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Mon, 1 Apr 2024 20:00:25 +0200 -Subject: [PATCH] Fix build with KF6 - -Set QT_NO_CREATE_VERSIONLESS_FUNCTIONS, otherwise Qt5 and Qt6 conflict - -Signed-off-by: Nicolas Fella <nicolas.fella@gmx.de> ---- - CMakeLists.txt | 1 + - src/gui/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 687733588813..07d3266cb9dc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,6 +9,7 @@ endif() - - set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED 17) -+set(QT_NO_CREATE_VERSIONLESS_FUNCTIONS ON) - - include(FeatureSummary) - -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 6e4acf203d19..37f459db4384 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -58,7 +58,7 @@ set(client_UI_SRCS - if(QUICK_COMPILER) - qtquick_compiler_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc) - else() -- qt_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc) -+ qt5_add_resources(client_UI_SRCS ../../resources.qrc ${CMAKE_SOURCE_DIR}/theme.qrc) - endif() - - set(client_SRCS diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild index 2268d6f6574a..f33d7bdfd5d0 100644 --- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild @@ -20,7 +20,7 @@ else https://ftp.ntpsec.org/pub/releases/${P}.tar.gz verify-sig? ( https://ftp.ntpsec.org/pub/releases/${P}.tar.gz.asc ) " - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" + KEYWORDS="amd64 arm arm64 ~riscv ~x86" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-ntpsec )" fi diff --git a/net-misc/rclone/rclone-1.68.0.ebuild b/net-misc/rclone/rclone-1.68.0.ebuild index b59ebe324c66..5b509729465d 100644 --- a/net-misc/rclone/rclone-1.68.0.ebuild +++ b/net-misc/rclone/rclone-1.68.0.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~riscv x86" RDEPEND=" sys-fs/fuse:3 diff --git a/net-misc/sshpass/sshpass-1.10.ebuild b/net-misc/sshpass/sshpass-1.10.ebuild index 5f9c807632cf..5c5fe90f7960 100644 --- a/net-misc/sshpass/sshpass-1.10.ebuild +++ b/net-misc/sshpass/sshpass-1.10.ebuild @@ -9,6 +9,6 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${PV}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos" RDEPEND="virtual/openssh" diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index 2b414e1aa049..d88c7c1c490d 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1,3 +1,4 @@ DIST streamlink-6.10.0.tar.gz 759416 BLAKE2B 384d943ff22bc1b351f46022bee99f3749bde48a5af40bb61707bdb26052ec41bd28e76c87dfd9f25c3b279541735dd978cdb75e69dae7cdc0821d7727b1b600 SHA512 39142c01d973a5be76f25fe711f1f36ad2581a0bab0265bc91d44644764b1c15f076809663bc821fd20ced282f5c185af2b6a5b91c12febda82dc03d000c6522 DIST streamlink-6.11.0.tar.gz 763094 BLAKE2B 7fb0a84088991bc5a7514e0a40d5c05d3a14da5cffbcb255c5e5767fcae8c745a6397cbe79b0b0fd5bebab32b0d8d6c015931af03e6eaa199b5ed9437d0f3a7e SHA512 e6d6e49d2df0aa76ebca76c0b3ada085eac59553423a5ccaa3d5cb62f6be0a679da36c4f78a3e1fea48b22144e705b8de9e46fc146c1c93889ef0c056d59fc7b DIST streamlink-6.9.0.tar.gz 758696 BLAKE2B 14baa37903c4b3084206a59959e47e5c764603da24084361b76a21d013b833ecb49df7d6baa45eb93f3491469deda828553439cc91a0ba6af07f96ce92c13764 SHA512 7ace33553dfdf7e45642347cc468c746ef9a7e400cd5629e326a93d5c0e57d77da1538b00ebf01665f147d41e5b8cc3de241dcc0b6b1b83329ecfb46950f8d00 +DIST streamlink-7.0.0.tar.gz 765957 BLAKE2B ef0d5cc402c623856c620306fa0095daf5786813021a310d79e3b5fbcc84c12a60b3f686fef669fcd33626ce58a23293b1015f53e4a82bfb48b8b1bbcdcf160d SHA512 0d0834b19718862ac7efd16680920ec632b9c2db512c57e9eb4bc9bc6a27f7cbf0ceba557bbeb4c55a5e9680b5519961e526209ccc4b8499273daaf1cd837e4f diff --git a/net-misc/streamlink/streamlink-6.10.0.ebuild b/net-misc/streamlink/streamlink-6.10.0.ebuild index 9f91275dbba4..efa4944f223a 100644 --- a/net-misc/streamlink/streamlink-6.10.0.ebuild +++ b/net-misc/streamlink/streamlink-6.10.0.ebuild @@ -47,7 +47,7 @@ RDEPEND=" >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] - >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >dev-python/pysocks-1.5.7[${PYTHON_USEDEP}] >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] diff --git a/net-misc/streamlink/streamlink-6.11.0.ebuild b/net-misc/streamlink/streamlink-6.11.0.ebuild index 78a98d44f408..bc7ffb74e0d9 100644 --- a/net-misc/streamlink/streamlink-6.11.0.ebuild +++ b/net-misc/streamlink/streamlink-6.11.0.ebuild @@ -26,7 +26,7 @@ fi LICENSE="BSD-2 Apache-2.0" SLOT="0" if [[ ${PV} != 9999* ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~x86" fi # See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep @@ -47,7 +47,7 @@ RDEPEND=" >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] - >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >dev-python/pysocks-1.5.7[${PYTHON_USEDEP}] >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] diff --git a/net-misc/streamlink/streamlink-6.9.0.ebuild b/net-misc/streamlink/streamlink-6.9.0.ebuild index 9f91275dbba4..efa4944f223a 100644 --- a/net-misc/streamlink/streamlink-6.9.0.ebuild +++ b/net-misc/streamlink/streamlink-6.9.0.ebuild @@ -47,7 +47,7 @@ RDEPEND=" >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] - >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >dev-python/pysocks-1.5.7[${PYTHON_USEDEP}] >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] diff --git a/net-misc/streamlink/streamlink-7.0.0.ebuild b/net-misc/streamlink/streamlink-7.0.0.ebuild new file mode 100644 index 000000000000..38bb73a0d640 --- /dev/null +++ b/net-misc/streamlink/streamlink-7.0.0.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/streamlink/${PN}.git" + inherit git-r3 +fi + +DISTUTILS_SINGLE_IMPL=1 +# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools +# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7 +DISTUTILS_USE_PEP517=standalone +PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_REQ_USE='xml(+),threads(+)' +inherit distutils-r1 + +DESCRIPTION="CLI for extracting streams from websites to a video player of your choice" +HOMEPAGE="https://streamlink.github.io/" + +if [[ ${PV} != 9999* ]]; then + SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz" +fi + +LICENSE="BSD-2 Apache-2.0" +SLOT="0" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep +RDEPEND=" + media-video/ffmpeg + $(python_gen_cond_dep ' + dev-python/exceptiongroup[${PYTHON_USEDEP}] + ' 3.10) + $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] + || ( + dev-python/chardet[${PYTHON_USEDEP}] + dev-python/charset-normalizer[${PYTHON_USEDEP}] + ) + >=dev-python/requests-2.26.0[${PYTHON_USEDEP}] + dev-python/isodate[${PYTHON_USEDEP}] + >=dev-python/lxml-4.6.4[${PYTHON_USEDEP}] + >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] + dev-python/pycountry[${PYTHON_USEDEP}] + >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] + >dev-python/pysocks-1.5.7[${PYTHON_USEDEP}] + >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] + >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] + >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] + ') +" +BDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/setuptools-64[${PYTHON_USEDEP}] + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + test? ( + >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + dev-python/pytest-trio[${PYTHON_USEDEP}] + dev-python/requests-mock[${PYTHON_USEDEP}] + ) + ') +" + +if [[ ${PV} == 9999* ]]; then + RDEPEND+=" + $(python_gen_cond_dep ' + >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] + ') + " +fi + +distutils_enable_tests pytest diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild index 78a98d44f408..25e719ca00a3 100644 --- a/net-misc/streamlink/streamlink-9999.ebuild +++ b/net-misc/streamlink/streamlink-9999.ebuild @@ -47,7 +47,7 @@ RDEPEND=" >=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}] dev-python/pycountry[${PYTHON_USEDEP}] >=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}] - >dev-python/PySocks-1.5.7[${PYTHON_USEDEP}] + >dev-python/pysocks-1.5.7[${PYTHON_USEDEP}] >=dev-python/trio-0.22.0[${PYTHON_USEDEP}] >=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}] >=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}] @@ -59,6 +59,7 @@ BDEPEND=" >=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}] test? ( >=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}] + dev-python/pytest-asyncio[${PYTHON_USEDEP}] dev-python/pytest-trio[${PYTHON_USEDEP}] dev-python/requests-mock[${PYTHON_USEDEP}] ) diff --git a/net-misc/sysrepo/sysrepo-2.2.150.ebuild b/net-misc/sysrepo/sysrepo-2.2.150.ebuild index 0594007d2f3d..a72726f44f8d 100644 --- a/net-misc/sysrepo/sysrepo-2.2.150.ebuild +++ b/net-misc/sysrepo/sysrepo-2.2.150.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/sysrepo/sysrepo/archive/v${PV}.tar.gz -> ${P}.tar.gz LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="doc test" RESTRICT="!test? ( test )" diff --git a/net-misc/tinyssh/Manifest b/net-misc/tinyssh/Manifest index 2bd2ee5a59e1..ba2bf36ba47a 100644 --- a/net-misc/tinyssh/Manifest +++ b/net-misc/tinyssh/Manifest @@ -1 +1 @@ -DIST tinyssh-20240101.tar.gz 249848 BLAKE2B 228547c6f4acae3b77a338df1ced3a49e0b4c72257ce081b3b50941c29c5a39a0b1623f6aefce2721b9dde9fae03cb8c1c87b6b019658d578ddcca99e0a021f5 SHA512 b48561cfc11bb6d2e9b1c805c9dfc36be5f1bbbf04a455b8db3f02b5b8df15e420fcd93d58fb23526baaf0fd70e9969deca261152a656015f12a433a61092e90 +DIST tinyssh-20241111.tar.gz 263324 BLAKE2B 81fbf6b3af4f6ef72acf1a339c4b0b6e7dce0aa3afee4947aa93ac45120836ff0febcf13dcbaea43be0dc4eb1e80c47a0a3b7dcfc8e4b00ad6577c1b366593ae SHA512 52716b6f8998f41180080a33cce0bcb3ff5eb1648b4c61b9ff99c3070f95c1900ab62bc23b30353905d146d557b2550b393c940f25a51d174648951cbc7ec2fc diff --git a/net-misc/tinyssh/files/tinyssh-20240101_c99.patch b/net-misc/tinyssh/files/tinyssh-20240101_c99.patch deleted file mode 100644 index 38b2e845eaa5..000000000000 --- a/net-misc/tinyssh/files/tinyssh-20240101_c99.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ae059fda00c11236a32499f105e803f962d1e243 Mon Sep 17 00:00:00 2001 -From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me> -Date: Tue, 9 Jan 2024 19:51:14 +0100 -Subject: [PATCH] packet_put: Add missing bug.h include for global_die - -``` -packet_put.c:53:9: error: call to undeclared function 'global_die'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] - global_die(111); - ^ -1 error generated. -``` - -Upstream: https://github.com/janmojzis/tinyssh/pull/84 - ---- - tinyssh/packet_put.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tinyssh/packet_put.c b/tinyssh/packet_put.c -index 17e8d84..7f46ff6 100644 ---- a/tinyssh/packet_put.c -+++ b/tinyssh/packet_put.c -@@ -6,6 +6,7 @@ Public domain. - - #include "uint32_pack_big.h" - #include "buf.h" -+#include "bug.h" - #include "sshcrypto.h" - #include "ssh.h" - #include "log.h" --- -2.41.0 - diff --git a/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch b/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch deleted file mode 100644 index 8dd35d91b828..000000000000 --- a/net-misc/tinyssh/files/tinyssh-20240101_conf_cflags.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/conf-cflags b/conf-cflags ---- a/conf-cflags -+++ b/conf-cflags -@@ -15,6 +15,3 @@ - -fstack-protector-strong - -fwrapv - -fno-strict-overflow ---Os ---fomit-frame-pointer ---funroll-loops diff --git a/net-misc/tinyssh/tinyssh-20240101-r2.ebuild b/net-misc/tinyssh/tinyssh-20241111.ebuild index db7411fdc4a4..e1c07e90c588 100644 --- a/net-misc/tinyssh/tinyssh-20240101-r2.ebuild +++ b/net-misc/tinyssh/tinyssh-20241111.ebuild @@ -28,39 +28,35 @@ RDEPEND=" sys-apps/ucspi-tcp " -PATCHES=( - "${FILESDIR}/tinyssh-20240101_c99.patch" - "${FILESDIR}/tinyssh-20240101_conf_cflags.patch" -) - src_prepare() { - # Use make-tinysshcc.sh script, which has no tests and doesn't execute - # binaries. See https://github.com/janmojzis/tinyssh/issues/2 - sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die - default + + echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile || die } -src_compile() { - tc-export PKG_CONFIG +src_configure() { + tc-export PKG_CONFIG CC if use sodium then - # -I${includedir}/sodium needed as tinyssh uses `#include "crypto_auth_hmacsha256.h"` rather than `#include <sodium.h>` - emake \ - CC="$(tc-getCC)" \ - LIBS="$("${PKG_CONFIG}" --libs libsodium)" \ - CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" \ - LDFLAGS="${LDFLAGS}" - else - emake CC="$(tc-getCC)" + # -I${includedir}/sodium needed as tinyssh uses `#include <randombytes.h>` rather than `#include <sodium.h>` + export CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" + export LDFLAGS="${LDFLAGS} $("${PKG_CONFIG}" --libs libsodium)" fi + + emake gentoo-autoheaders + + local i + for i in has*.log + do + einfo "$i" + cat "$i" + done } src_install() { - dosbin build/bin/tinysshd{,-makekey} - dobin build/bin/tinysshd-printkey - doman man/* + einstalldocs + emake install DESTDIR="${D}" PREFIX=/usr newinitd "${FILESDIR}/${PN}.initd" "${PN}" newconfd "${FILESDIR}/${PN}.confd" "${PN}" diff --git a/net-misc/tinyssh/tinyssh-99999999.ebuild b/net-misc/tinyssh/tinyssh-99999999.ebuild index 9d2ed3e6c433..e1c07e90c588 100644 --- a/net-misc/tinyssh/tinyssh-99999999.ebuild +++ b/net-misc/tinyssh/tinyssh-99999999.ebuild @@ -28,38 +28,35 @@ RDEPEND=" sys-apps/ucspi-tcp " -PATCHES=( - "${FILESDIR}/tinyssh-20240101_conf_cflags.patch" -) - src_prepare() { - # Use make-tinysshcc.sh script, which has no tests and doesn't execute - # binaries. See https://github.com/janmojzis/tinyssh/issues/2 - sed -i 's/make-tinyssh\.sh/make-tinysshcc.sh/g' ./Makefile || die - default + + echo 'gentoo-autoheaders: $(AUTOHEADERS)' >> Makefile || die } -src_compile() { - tc-export PKG_CONFIG +src_configure() { + tc-export PKG_CONFIG CC if use sodium then - # -I${includedir}/sodium needed as tinyssh uses `#include "crypto_auth_hmacsha256.h"` rather than `#include <sodium.h>` - emake \ - CC="$(tc-getCC)" \ - LIBS="$("${PKG_CONFIG}" --libs libsodium)" \ - CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" \ - LDFLAGS="${LDFLAGS}" - else - emake CC="$(tc-getCC)" + # -I${includedir}/sodium needed as tinyssh uses `#include <randombytes.h>` rather than `#include <sodium.h>` + export CFLAGS="${CFLAGS} $("${PKG_CONFIG}" --cflags libsodium) -I$("${PKG_CONFIG}" --variable=includedir libsodium)/sodium/" + export LDFLAGS="${LDFLAGS} $("${PKG_CONFIG}" --libs libsodium)" fi + + emake gentoo-autoheaders + + local i + for i in has*.log + do + einfo "$i" + cat "$i" + done } src_install() { - dosbin build/bin/tinysshd{,-makekey} - dobin build/bin/tinysshd-printkey - doman man/* + einstalldocs + emake install DESTDIR="${D}" PREFIX=/usr newinitd "${FILESDIR}/${PN}.initd" "${PN}" newconfd "${FILESDIR}/${PN}.confd" "${PN}" diff --git a/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild b/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild index 766b4da94e0b..5be727be8366 100644 --- a/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild +++ b/net-misc/vncsnapshot/vncsnapshot-1.2a-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc ~x86" +KEYWORDS="~amd64 ~arm64 ppc x86" DEPEND=" media-libs/libjpeg-turbo:= diff --git a/net-misc/ytmdl/ytmdl-2024.08.15.1.ebuild b/net-misc/ytmdl/ytmdl-2024.08.15.1.ebuild index f73f070585ef..bfc65d4ded7b 100644 --- a/net-misc/ytmdl/ytmdl-2024.08.15.1.ebuild +++ b/net-misc/ytmdl/ytmdl-2024.08.15.1.ebuild @@ -28,13 +28,13 @@ SLOT="0" RDEPEND=" >=net-misc/yt-dlp-2022.3.8.2[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/pysocks[${PYTHON_USEDEP}] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/colorama[${PYTHON_USEDEP}] dev-python/ffmpeg-python[${PYTHON_USEDEP}] dev-python/itunespy[${PYTHON_USEDEP}] dev-python/musicbrainzngs[${PYTHON_USEDEP}] - dev-python/pyDes[${PYTHON_USEDEP}] + dev-python/pydes[${PYTHON_USEDEP}] dev-python/pyxdg[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] dev-python/rich[${PYTHON_USEDEP}] diff --git a/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch b/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch deleted file mode 100644 index 2888577d13ba..000000000000 --- a/net-misc/zerotier/files/zerotier-1.12.2-noexecstack.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/zerotier/ZeroTierOne/pull/2161 - -From e171384c19bb0c0dfe0368e4f249dd6a30d33748 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Sun, 29 Oct 2023 13:48:07 +0200 -Subject: [PATCH] Append noexecstack to linker flags instead of assembler flags - -* Better compatibility with LLVM toolchain where clang -c doesn't - support the flag, but the linker does. LLD already defaults to - noexecstack, but adding it in the linker phase will avoid errors about - unsupported options. - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/make-linux.mk -+++ b/make-linux.mk -@@ -358,7 +358,7 @@ override CFLAGS+=-fPIC -fPIE - override CXXFLAGS+=-fPIC -fPIE - - # Non-executable stack --override ASFLAGS+=--noexecstack -+override LDFLAGS+=-Wl,-z,noexecstack - - .PHONY: all - all: one diff --git a/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch b/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch deleted file mode 100644 index 12e00b598975..000000000000 --- a/net-misc/zerotier/files/zerotier-1.14.0-respect-ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://github.com/zerotier/ZeroTierOne/pull/2162 - -From 55485ad51e5de6a344f7dc7f352df1876fa747ea Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Sun, 29 Oct 2023 14:11:13 +0200 -Subject: [PATCH 1/2] Respect user LDFLAGS - -* Respect user LDFLAGS instead of replacing them. - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/make-linux.mk -+++ b/make-linux.mk -@@ -71,7 +71,7 @@ else - override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS) - CXXFLAGS?=-O3 -fstack-protector - override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS) -- LDFLAGS=-pie -Wl,-z,relro,-z,now -+ LDFLAGS?=-pie -Wl,-z,relro,-z,now - ZT_CARGO_FLAGS=--release - endif - --- -2.45.1 - diff --git a/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch b/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch deleted file mode 100644 index 27a991cf719b..000000000000 --- a/net-misc/zerotier/files/zerotier-1.14.0-update-time.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://bugs.gentoo.org/938204 -https://github.com/zerotier/ZeroTierOne/issues/2345 -https://github.com/zerotier/ZeroTierOne/pull/2349 -https://github.com/zerotier/ZeroTierOne/commit/e915d109530a34370af948a04cac91b2f049c486 -https://github.com/time-rs/time/issues/681 -https://github.com/time-rs/time/pull/671 - -diff --git a/rustybits/Cargo.lock b/rustybits/Cargo.lock -index 1b01a0df3..09d9ced0c 100644 ---- a/rustybits/Cargo.lock -+++ b/rustybits/Cargo.lock -@@ -2855,9 +2855,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.34" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -@@ -2876,9 +2876,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.17" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ - "num-conv", - "time-core", - |