From d39b2406e1496a2848b3f450a5737ae3dbd8c6f7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Oct 2024 01:26:11 +0100 Subject: gentoo auto-resync : 02:10:2024 - 01:26:10 --- net-p2p/Manifest.gz | Bin 6751 -> 6757 bytes net-p2p/mldonkey/Manifest | 4 +- net-p2p/mldonkey/metadata.xml | 1 - net-p2p/mldonkey/mldonkey-3.2.1.ebuild | 128 +++++++++++++++++++++++ net-p2p/qbittorrent/Manifest | 10 +- net-p2p/qbittorrent/metadata.xml | 10 +- net-p2p/qbittorrent/qbittorrent-4.6.5.ebuild | 145 --------------------------- net-p2p/qbittorrent/qbittorrent-5.0.0.ebuild | 135 +++++++++++++++++++++++++ net-p2p/qbittorrent/qbittorrent-9999.ebuild | 50 ++++----- 9 files changed, 300 insertions(+), 183 deletions(-) create mode 100644 net-p2p/mldonkey/mldonkey-3.2.1.ebuild delete mode 100644 net-p2p/qbittorrent/qbittorrent-4.6.5.ebuild create mode 100644 net-p2p/qbittorrent/qbittorrent-5.0.0.ebuild (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index 10c32d06bcb5..3e3c557ef259 100644 Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest index b108191ebb1d..d8483d7e0fb3 100644 --- a/net-p2p/mldonkey/Manifest +++ b/net-p2p/mldonkey/Manifest @@ -3,6 +3,8 @@ AUX mldonkey.confd 573 BLAKE2B 35ed4b2648f550ffaf0108485a89b8b2f49d7241b581cbe69 AUX mldonkey.initd 1488 BLAKE2B 062bc7f00dc798bab4da0a0bdef87c5d2a3388a67ceddbbbb73b2fd702225198fe575972785689201073bf2e6ff678e2ba8bc7567e54c65230c16285f94cd7e3 SHA512 2e7f9a42c3dd6f50c62ea5c031c89d0b13000d6be768d374d1ffe063f1d5d598c15862c683c989c7539f77da083ba2a86eee0154aae06b89be74d60e5e136909 AUX mldonkey.service 274 BLAKE2B 2ff70c85d4f8f07435ce973d4b8bd3f90999b433187060ebb1500f9964a5df7b3aa05cd0391efa748201b5d3ce496f985b971200bdf19e36a9edc6cf66f24fa2 SHA512 62fab67f8ca13e539b3ecfefe8d16a8cfbaad296f1a9d3f16dea8dcaa189946f2631545c940bb88e29ae119ad7285fbd7cd1cd047fe7a85b746d1ee36e13d8ce DIST mldonkey-3.1.7-2.tar.bz2 2801815 BLAKE2B f914648b4e2a358e51518f3b58dc0df803cdb28d7706783504644266690514c17c2cae0688011073391db221eb8f38c7cbaf1e913220d824e41ca2e23d4c8587 SHA512 11cb0fa0db95e918c291009f4121a1b34cf485e5ac6826a72a4dc520dd78d21ced40d205fa26eb451c7d3eb31f2193cbb64e46c99c85dc932762c1bcc4da4934 +DIST mldonkey-3.2.1.tar.bz2 2839613 BLAKE2B 87d02fb4dd81a894b241793cfe872a0e0860ca33c2dceae7c6a6b2e17b2dc8bf0352e5a8a573dc0088b62acc1e9b7ff8608514355dc96397b997117bcf7e06bf SHA512 7f2657ea3e5eedf2429b157f8157178d8357c19d323f812f3bf1cd965ee209aaa760b8af6983603eeccf53efea7321f41910eca1c5649ce1baf5bc6cf0284f0c EBUILD mldonkey-3.1.7-r3.ebuild 4795 BLAKE2B a415301f6dcb17181fca4cec52a32f605cb2962bb08a118b232fd7f981442b1e55d8cfe5caa036e80f6b2373d0ba244a8ad4e3aa4048cca8315f753da67a5f39 SHA512 98da370749cdb90c868c291344f4ffd1976f77ab4a70eb5ed39229c7c78ff3fd6a5b27eef0af2f9dca844822620b1ca132e3b4b6d43d8da4273f1b47cddb0d77 EBUILD mldonkey-3.1.7-r4.ebuild 3537 BLAKE2B 9c366a9012176eab584d6d3c9441a3d408a5127fbac2da6c9374028b221ff856e459bb588d6d169a6a7abcf30ea8b14e3d0f1196b0785d08146d0a24a64d379f SHA512 8a2254cfd4bcd00704ce5b8884e591bdb9ab7d433092a483cdab566d8d485844127319f5509862cb1b6ec946da22b43a820e770873adcff4fb845d4692b6ec1a -MISC metadata.xml 810 BLAKE2B 111ab6f9b165a59465beb7ac8c7cdf6651c72484dc2a5f77f0b6cbad44d6a71d44ca27aeb3785af9b2cbb0a5ae624b784db88b7790abdae98b36bf393a1cca08 SHA512 e59c710af7fab80b1da8ec97acd5d43cf8e725bc97c6b1d6257134e689ef6abdf9a8b5716131e512ee1ae4abc1fdb2f15a36dc09f40ef7aa726d414e2e0614a6 +EBUILD mldonkey-3.2.1.ebuild 3420 BLAKE2B 0a106d5897e56fcdb9ae8789dc117a9c9f4f573457bc7022d30a6ff0b2772eca3b036cb5457e99ab6104d471db5258be6eb8cfe4b3c346e32b5c4606b8d34196 SHA512 a9cb8cf5232a3cbd67188a1e77db9ea7498e093afb6b907d8484126f20518ddee51df49681c582b76f95edfc3b0ee0c9401779cd19c1a5342b161fa96f6b8547 +MISC metadata.xml 755 BLAKE2B eefbad9b7c93e1ceb2b95297219ba74010d3a55ba424d9567fcf3bdcd8bb56891c778d5e6fe421aca67443a7ca8e1d753247bb63ddf0c7295926c731712ff67e SHA512 39ca04ab21dda0856dcc95ad3489b1b7427fc60b18949e916c5f38fe00cfe0eae30b95280ab3806fd4f0ce72b5ababd7fb30728ff8f4a2fd76ddde2b5bc7b7a3 diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml index 1ee19fe7c50a..9faf0e9d2cc9 100644 --- a/net-p2p/mldonkey/metadata.xml +++ b/net-p2p/mldonkey/metadata.xml @@ -16,7 +16,6 @@ enable client build only - mldonkey ygrek/mldonkey diff --git a/net-p2p/mldonkey/mldonkey-3.2.1.ebuild b/net-p2p/mldonkey/mldonkey-3.2.1.ebuild new file mode 100644 index 000000000000..c918a08fe99c --- /dev/null +++ b/net-p2p/mldonkey/mldonkey-3.2.1.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit autotools flag-o-matic systemd toolchain-funcs + +DESCRIPTION="Multi-network P2P application written in Ocaml, with Gtk, web & telnet interface" +HOMEPAGE="https://github.com/ygrek/mldonkey" +SRC_URI="https://github.com/ygrek/mldonkey/releases/download/release-${PV//./-}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + +IUSE="bittorrent doc fasttrack gd gnutella magic +ocamlopt upnp" + +RDEPEND="dev-lang/perl + dev-ml/camlp4:= + gd? ( media-libs/gd:2=[truetype] ) + magic? ( sys-apps/file ) + upnp? ( + net-libs/libnatpmp + net-libs/miniupnpc:= + ) + acct-user/p2p + app-arch/bzip2 + sys-libs/zlib +" +# Can't yet use newer OCaml +# -unsafe-string usage: +# https://github.com/ygrek/mldonkey/issues/46 +DEPEND="${RDEPEND} + eschwartz@gentoo.org Eli Schwartz + + fkobi@pm.me + Filip Kobierski + Install qBittorrent Web UI (qbittorrent-nox) and systemd/OpenRC service - qbittorrent/qBittorrent + https://github.com/qbittorrent/qBittorrent/issues https://www.qbittorrent.org/news + https://github.com/qbittorrent/qBittorrent/wiki + qbittorrent/qBittorrent + diff --git a/net-p2p/qbittorrent/qbittorrent-4.6.5.ebuild b/net-p2p/qbittorrent/qbittorrent-4.6.5.ebuild deleted file mode 100644 index d003502d13d5..000000000000 --- a/net-p2p/qbittorrent/qbittorrent-4.6.5.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake edo multibuild systemd verify-sig xdg - -DESCRIPTION="BitTorrent client in C++ and Qt" -HOMEPAGE="https://www.qbittorrent.org" - -if [[ ${PV} == *9999 ]]; then - EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git" - inherit git-r3 -else - SRC_URI=" - https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz - verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc ) - " - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" - - BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )" - VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+dbus +gui qt6 systemd test webui" -RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( gui webui ) - dbus? ( gui ) -" - -RDEPEND=" - >=dev-libs/openssl-1.1.1:= - >=net-libs/libtorrent-rasterbar-1.2.19:= - >=sys-libs/zlib-1.2.11 - qt6? ( >=dev-qt/qtbase-6.2:6[network,ssl,sql,sqlite,xml] ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtxml:5 - ) - gui? ( - !qt6? ( - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dbus? ( dev-qt/qtdbus:5 ) - ) - qt6? ( - >=dev-qt/qtbase-6.2:6[dbus?,gui,widgets] - >=dev-qt/qtsvg-6.2:6 - ) - ) - webui? ( - acct-group/qbittorrent - acct-user/qbittorrent - ) -" -DEPEND=" - ${RDEPEND} - >=dev-libs/boost-1.71 - test? ( - !qt6? ( dev-qt/qttest:5 ) - )" -BDEPEND+=" - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( >=dev-qt/qttools-6.2:6[linguist] ) - virtual/pkgconfig" - -DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md ) - -src_prepare() { - MULTIBUILD_VARIANTS=() - use gui && MULTIBUILD_VARIANTS+=( gui ) - use webui && MULTIBUILD_VARIANTS+=( nogui ) - - cmake_src_prepare -} - -src_configure() { - my_src_configure() { - local mycmakeargs=( - # musl lacks execinfo.h - -DSTACKTRACE=$(usex !elibc_musl) - # More verbose build logs are preferable for bug reports - -DVERBOSE_CONFIGURE=ON - -DQT6=$(usex qt6) - -DWEBUI=$(usex webui) - -DTESTING=$(usex test) - ) - - if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then - # We do this in multibuild, see bug #839531 for why. - # Fedora has to do the same thing. - mycmakeargs+=( - -DGUI=ON - -DDBUS=$(usex dbus) - -DSYSTEMD=OFF - ) - else - mycmakeargs+=( - -DGUI=OFF - -DDBUS=OFF - ) - - use systemd && mycmakeargs+=( - # The systemd service calls qbittorrent-nox, which is only - # installed when GUI=OFF. - -DSYSTEMD=ON - -DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)" - ) - fi - - cmake_src_configure - } - - multibuild_foreach_variant my_src_configure -} - -src_compile() { - multibuild_foreach_variant cmake_src_compile -} - -src_test() { - my_src_test() { - # cmake does not detect tests by default, if you use enable_testing - # in a subdirectory instead of the root CMakeLists.txt - cd "${BUILD_DIR}"/test || die - edo ctest . - } - - multibuild_foreach_variant my_src_test -} - -src_install() { - multibuild_foreach_variant cmake_src_install - einstalldocs - - if use webui; then - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - fi -} diff --git a/net-p2p/qbittorrent/qbittorrent-5.0.0.ebuild b/net-p2p/qbittorrent/qbittorrent-5.0.0.ebuild new file mode 100644 index 000000000000..e40ab0f8d98e --- /dev/null +++ b/net-p2p/qbittorrent/qbittorrent-5.0.0.ebuild @@ -0,0 +1,135 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake edo multibuild optfeature systemd verify-sig xdg + +DESCRIPTION="BitTorrent client in C++ and Qt" +HOMEPAGE="https://www.qbittorrent.org" + +if [[ ${PV} == *9999 ]]; then + EGIT_REPO_URI="https://github.com/qbittorrent/qBittorrent.git" + inherit git-r3 +else + SRC_URI=" + https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz + verify-sig? ( https://downloads.sourceforge.net/qbittorrent/${P}.tar.xz.asc ) + " + KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-qbittorrent )" + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc +fi + +LICENSE="GPL-2+ GPL-3+" +SLOT="0" +IUSE="+dbus +gui systemd test webui" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( gui webui ) + dbus? ( gui ) +" + +RDEPEND=" + >=dev-libs/openssl-3.0.2:= + >=net-libs/libtorrent-rasterbar-1.2.19:= + >=sys-libs/zlib-1.2.11 + >=dev-qt/qtbase-6.5:6[network,ssl,sql,sqlite,xml] + gui? ( + >=dev-qt/qtbase-6.5:6[dbus?,gui,widgets] + >=dev-qt/qtsvg-6.5:6 + ) + webui? ( + acct-group/qbittorrent + acct-user/qbittorrent + ) +" +DEPEND=" + ${RDEPEND} + >=dev-libs/boost-1.76 +" +BDEPEND+=" + >=dev-qt/qttools-6.5:6[linguist] + virtual/pkgconfig +" + +DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md ) + +src_prepare() { + MULTIBUILD_VARIANTS=() + use gui && MULTIBUILD_VARIANTS+=( gui ) + use webui && MULTIBUILD_VARIANTS+=( nogui ) + + cmake_src_prepare +} + +src_configure() { + my_src_configure() { + local mycmakeargs=( + # musl lacks execinfo.h + -DSTACKTRACE=$(usex !elibc_musl) + # More verbose build logs are preferable for bug reports + -DVERBOSE_CONFIGURE=ON + -DWEBUI=$(usex webui) + -DTESTING=$(usex test) + ) + + if [[ ${MULTIBUILD_VARIANT} == "gui" ]]; then + # We do this in multibuild, see bug #839531 for why. + # Fedora has to do the same thing. + mycmakeargs+=( + -DGUI=ON + -DDBUS=$(usex dbus) + -DSYSTEMD=OFF + ) + else + mycmakeargs+=( + -DGUI=OFF + -DDBUS=OFF + ) + + use systemd && mycmakeargs+=( + # The systemd service calls qbittorrent-nox, which is only + # installed when GUI=OFF. + -DSYSTEMD=ON + -DSYSTEMD_SERVICES_INSTALL_DIR="$(systemd_get_systemunitdir)" + ) + fi + + cmake_src_configure + } + + multibuild_foreach_variant my_src_configure +} + +src_compile() { + multibuild_foreach_variant cmake_src_compile +} + +src_test() { + my_src_test() { + # cmake does not detect tests by default, if you use enable_testing + # in a subdirectory instead of the root CMakeLists.txt + cd "${BUILD_DIR}"/test || die + edo ctest . + } + + multibuild_foreach_variant my_src_test +} + +src_install() { + multibuild_foreach_variant cmake_src_install + einstalldocs + + if use webui; then + newconfd "${FILESDIR}/${PN}.confd" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + fi +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "I2P anonymyzing network support" net-vpn/i2pd net-vpn/i2p +} diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild index 534975068940..e40ab0f8d98e 100644 --- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit cmake edo multibuild systemd verify-sig xdg +inherit cmake edo multibuild optfeature systemd verify-sig xdg DESCRIPTION="BitTorrent client in C++ and Qt" HOMEPAGE="https://www.qbittorrent.org" @@ -22,36 +22,23 @@ else VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qBittorrent.asc fi -LICENSE="GPL-2" +LICENSE="GPL-2+ GPL-3+" SLOT="0" -IUSE="+dbus +gui qt6 systemd test webui" +IUSE="+dbus +gui systemd test webui" RESTRICT="!test? ( test )" -REQUIRED_USE="|| ( gui webui ) +REQUIRED_USE=" + || ( gui webui ) dbus? ( gui ) " RDEPEND=" - >=dev-libs/openssl-1.1.1:= + >=dev-libs/openssl-3.0.2:= >=net-libs/libtorrent-rasterbar-1.2.19:= >=sys-libs/zlib-1.2.11 - qt6? ( >=dev-qt/qtbase-6.2:6[network,ssl,sql,sqlite,xml] ) - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtxml:5 - ) + >=dev-qt/qtbase-6.5:6[network,ssl,sql,sqlite,xml] gui? ( - !qt6? ( - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dbus? ( dev-qt/qtdbus:5 ) - ) - qt6? ( - >=dev-qt/qtbase-6.2:6[dbus?,gui,widgets] - >=dev-qt/qtsvg-6.2:6 - ) + >=dev-qt/qtbase-6.5:6[dbus?,gui,widgets] + >=dev-qt/qtsvg-6.5:6 ) webui? ( acct-group/qbittorrent @@ -60,14 +47,12 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - >=dev-libs/boost-1.71 - test? ( - !qt6? ( dev-qt/qttest:5 ) - )" + >=dev-libs/boost-1.76 +" BDEPEND+=" - !qt6? ( dev-qt/linguist-tools:5 ) - qt6? ( >=dev-qt/qttools-6.2:6[linguist] ) - virtual/pkgconfig" + >=dev-qt/qttools-6.5:6[linguist] + virtual/pkgconfig +" DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md ) @@ -86,7 +71,6 @@ src_configure() { -DSTACKTRACE=$(usex !elibc_musl) # More verbose build logs are preferable for bug reports -DVERBOSE_CONFIGURE=ON - -DQT6=$(usex qt6) -DWEBUI=$(usex webui) -DTESTING=$(usex test) ) @@ -143,3 +127,9 @@ src_install() { newinitd "${FILESDIR}/${PN}.initd" "${PN}" fi } + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "I2P anonymyzing network support" net-vpn/i2pd net-vpn/i2p +} -- cgit v1.2.3