From 6fcdccbe589d724b6c268b49f66414e40eb0d807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 13 Sep 2024 12:31:46 +0100 Subject: gentoo auto-resync : 13:09:2024 - 12:31:45 --- net-p2p/Manifest.gz | Bin 6764 -> 6761 bytes net-p2p/ktorrent/Manifest | 4 +- net-p2p/ktorrent/ktorrent-24.08.0.ebuild | 91 --------------- net-p2p/ktorrent/ktorrent-24.08.1.ebuild | 91 +++++++++++++++ net-p2p/retroshare/Manifest | 4 +- .../retroshare-0.6.7-fix-miniupnp-api-v18.patch | 32 +++++ net-p2p/retroshare/metadata.xml | 8 +- net-p2p/retroshare/retroshare-0.6.7-r2.ebuild | 129 +++++++++++++++++++++ net-p2p/rtorrent/Manifest | 6 +- net-p2p/rtorrent/rtorrent-0.9.8-r1.ebuild | 2 +- net-p2p/rtorrent/rtorrent-0.9.8-r2.ebuild | 2 +- net-p2p/rtorrent/rtorrent-0.9.8-r3.ebuild | 2 +- 12 files changed, 270 insertions(+), 101 deletions(-) delete mode 100644 net-p2p/ktorrent/ktorrent-24.08.0.ebuild create mode 100644 net-p2p/ktorrent/ktorrent-24.08.1.ebuild create mode 100644 net-p2p/retroshare/files/retroshare-0.6.7-fix-miniupnp-api-v18.patch create mode 100644 net-p2p/retroshare/retroshare-0.6.7-r2.ebuild (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index cc1b2b5cfdb6..a4b42856ddaf 100644 Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index 448832b07484..8b13d52b4853 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,5 +1,5 @@ DIST ktorrent-24.05.2.tar.xz 2181476 BLAKE2B 6276eb27c37255cb0ecf72785c990c3dac93b178cba8a1425cfad82b596f8efb87dcc12a6ec09b81064e3e3e2c06e0acc9c8507394ac2e0e148a7591dfbf2617 SHA512 4dd106c1ff1068100d4694b8dbc2e2b2475b8cb4dfbbc892fac1a31d619fce87c1f96dab6137f9430357b4b462ce9a34f1a5ab1dcb35b319ce46df11747dfee7 -DIST ktorrent-24.08.0.tar.xz 2183900 BLAKE2B f115afb180584379b9ac7f1c8524958a3a0f047d5c04643665afab18d9d56e13d7098c814d13b45ff8734314150a0c8955f41eb41ed89ac79c8d7b9d2c094bda SHA512 d64d61931e4fd793f6d044039438294f351da897c0420664cfb6a001a9557dcf35e81ad25888e223f24bf2fc835218a6a722ccb4d64870bdf635ea0c8f46bb32 +DIST ktorrent-24.08.1.tar.xz 2186628 BLAKE2B d4f92e9b9a649572c59fc53068a7afff1c437581fd313b9e57847e7a4032eef257939065b138173d7e2a2003ad59fa5356af52dcda88b92b686f090e6a458d26 SHA512 3edd4825329ee40a61dfbbad12b605cbb5a73d9d7c9debb363e34033ce22221f7fb5b967e42c77e688d849a8add06bc7e31bd1d9d0b8660d4ce47f967eda2936 EBUILD ktorrent-24.05.2.ebuild 2846 BLAKE2B 55476f81bca13041991417ace474c667a583de66a355f9250b1885a20e3bcfba0820179f6740b34d58e4c54d7970e6c2fd6ec69858c293a192e539b5da6bb5fb SHA512 13761c568cf5401263c93c23e467cb360c9ca2344ec43ff1e691520e30f96b6f4bc08e08feceb666207c4d2d1b4bc6f6936c4a6760f6a9b808c1f6465ed5b278 -EBUILD ktorrent-24.08.0.ebuild 2848 BLAKE2B fdcbc221ae3ee9741b7f387339d1dbe78a3775317bd4a1012883b64af902ed3c83bfb94fdc3b6681cd50f678e39617edc07d7c533be9d6e6e657e799daff180a SHA512 df07a18ecbacea9c9f6fba8d738d6635c125dd156ee31aff96a32aa0366bdf651e7d9129ff035c811be078f6c43d67ae555e18f6633356190fed5d6ac5f6d44c +EBUILD ktorrent-24.08.1.ebuild 2851 BLAKE2B 81dbe9437789cc422c5a6358cbd66c404ae675b939560ca03ebb92b048f21c137241e0e8609f151db360f073d7c1be55344742ba365d580bf2684dacaf9fdb92 SHA512 8d79f3b4ac8afa08bfa39b0d8f611b5baf3c829024ea0bc8143ccadd5c4ca0726ca1cf8817b9f59565812fb18bf7f7523479dead51567342838bf545ec2fee36 MISC metadata.xml 1460 BLAKE2B 51ebe2b5f66b522da72da170d514b03cfb03756c9006e1b722fa6346d693082dda487299d356a011484c7217bf94cda5233e7a561450114ee1be063bc2e850f9 SHA512 075e0d77256155dceacf5df0dd6e0ddab45c93d2914da9a16f2ca9895a563bf1cdced2931436c772d4915661d0bdff32bb531901b8b8e4b99af00b5ff45fab68 diff --git a/net-p2p/ktorrent/ktorrent-24.08.0.ebuild b/net-p2p/ktorrent/ktorrent-24.08.0.ebuild deleted file mode 100644 index db8e6dae8125..000000000000 --- a/net-p2p/ktorrent/ktorrent-24.08.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=6.5.0 -PVCUT=$(ver_cut 1-3) -QTMIN=6.7.2 -inherit ecm gear.kde.org - -DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks" -HOMEPAGE="https://apps.kde.org/ktorrent/" - -LICENSE="GPL-2" -SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +logviewer +magnetgenerator -+mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf" - -COMMON_DEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] - >=kde-frameworks/kcmutils-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kglobalaccel-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/knotifyconfig-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/solid-${KFMIN}:6 - >=net-libs/libktorrent-${PVCUT}:6 - infowidget? ( dev-libs/geoip ) - ipfilter? ( >=kde-frameworks/karchive-${KFMIN}:6 ) - mediaplayer? ( - >=media-libs/phonon-4.12.0[qt6] - >=media-libs/taglib-1.5:= - ) - rss? ( - >=dev-qt/qtwebengine-${QTMIN}:6 - >=kde-frameworks/syndication-${KFMIN}:6 - ) - stats? ( >=kde-frameworks/kplotting-${KFMIN}:6 ) - upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:6 ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 ) - zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:6 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.71 -" -RDEPEND="${COMMON_DEPEND} - ipfilter? ( - app-arch/bzip2 - app-arch/unzip - kde-apps/kio-extras:6 - >=kde-frameworks/ktextwidgets-${KFMIN}:6 - ) -" -BDEPEND="sys-devel/gettext" - -src_configure() { - local mycmakeargs=( - -DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler) - -DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder) - -DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget) - -DENABLE_IPFILTER_PLUGIN=$(usex ipfilter) - -DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer) - -DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator) - -DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer) - $(cmake_use_find_package rss KF6Syndication) - -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder) - -DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown) - -DENABLE_STATS_PLUGIN=$(usex stats) - -DENABLE_UPNP_PLUGIN=$(usex upnp) - -DENABLE_SEARCH_PLUGIN=$(usex webengine) - -DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf) - ) -# add back when ported -# -DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface) - ecm_src_configure -} diff --git a/net-p2p/ktorrent/ktorrent-24.08.1.ebuild b/net-p2p/ktorrent/ktorrent-24.08.1.ebuild new file mode 100644 index 000000000000..b02da35cc7ba --- /dev/null +++ b/net-p2p/ktorrent/ktorrent-24.08.1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +KFMIN=6.5.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="Powerful BitTorrent client based on KDE Frameworks" +HOMEPAGE="https://apps.kde.org/ktorrent/" + +LICENSE="GPL-2" +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="+bwscheduler +downloadorder +infowidget +ipfilter +logviewer +magnetgenerator ++mediaplayer rss +scanfolder +shutdown +stats +upnp +webengine +zeroconf" + +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=net-libs/libktorrent-${PVCUT}:6 + infowidget? ( dev-libs/geoip ) + ipfilter? ( >=kde-frameworks/karchive-${KFMIN}:6 ) + mediaplayer? ( + >=media-libs/phonon-4.12.0[qt6(+)] + >=media-libs/taglib-1.5:= + ) + rss? ( + >=dev-qt/qtwebengine-${QTMIN}:6 + >=kde-frameworks/syndication-${KFMIN}:6 + ) + stats? ( >=kde-frameworks/kplotting-${KFMIN}:6 ) + upnp? ( >=kde-frameworks/kcompletion-${KFMIN}:6 ) + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 ) + zeroconf? ( >=kde-frameworks/kdnssd-${KFMIN}:6 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.71 +" +RDEPEND="${COMMON_DEPEND} + ipfilter? ( + app-arch/bzip2 + app-arch/unzip + kde-apps/kio-extras:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + ) +" +BDEPEND="sys-devel/gettext" + +src_configure() { + local mycmakeargs=( + -DENABLE_BWSCHEDULER_PLUGIN=$(usex bwscheduler) + -DENABLE_DOWNLOADORDER_PLUGIN=$(usex downloadorder) + -DENABLE_INFOWIDGET_PLUGIN=$(usex infowidget) + -DENABLE_IPFILTER_PLUGIN=$(usex ipfilter) + -DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer) + -DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator) + -DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer) + $(cmake_use_find_package rss KF6Syndication) + -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder) + -DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown) + -DENABLE_STATS_PLUGIN=$(usex stats) + -DENABLE_UPNP_PLUGIN=$(usex upnp) + -DENABLE_SEARCH_PLUGIN=$(usex webengine) + -DENABLE_ZEROCONF_PLUGIN=$(usex zeroconf) + ) +# add back when ported +# -DENABLE_WEBINTERFACE_PLUGIN=$(usex webinterface) + ecm_src_configure +} diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest index dd7e9c3fd703..29f69e6e17b5 100644 --- a/net-p2p/retroshare/Manifest +++ b/net-p2p/retroshare/Manifest @@ -1,3 +1,5 @@ +AUX retroshare-0.6.7-fix-miniupnp-api-v18.patch 1168 BLAKE2B 35635a360183aaaa3fcf211bb2503cc5fcfaad76f4b9e6170985b7611f4b0de4734dba02956146dcdd734939d50a89f31e7a31e8132ebe151e2f8dbc3a26376d SHA512 22a2f32226498f18b7c0b0e36b11a677d048ede56a1e56fde1599fe410456bc5905e9300e5a0d93b8d808e0ade6e4be3bd9311dc5f4ed0b2e0dd90d038cfb8c1 DIST retroshare-0.6.7.tar.gz 26506259 BLAKE2B 3c0963c8afbbf741c8c5d22dc9c9f86f82d1a338a9f0dd02065617d16e96738a4d22c2bc30c1ba32c61fcc7beedaa15ac3c185aab429882b0947aa28b8c037b1 SHA512 ff5455b97519878d83c6872dfce457804430938864259f7d0fa5b06ebae161e62ea8300e809a03a821b2ecdf755a3de7465a580882709ae79bfb9c1de855e347 EBUILD retroshare-0.6.7-r1.ebuild 3558 BLAKE2B 3cd498c88a0f4e7bf8acb091a8f8179fb5fb54b2f880c8ff38b7a6d3a86d4b189fcce78b9e282ec1af301b23f4f0eb7e540007927144f5d08f3cc99dbb42d9f5 SHA512 dd58700fae6eade35f183718dc50277e0687fff2e1f01455bd4aa36628f1d000ea60bf390549d7564b120b5e0e13d1144ec2b40b28485cb855829cd9c5185036 -MISC metadata.xml 1507 BLAKE2B 3850886e6d5e70ad585ec4083d5fb86a01b962a421cfbeac26862e47dada0adf0cbfa53e31bbbd34b968da72e6395560a6c48b6125e9996f82df2089e383f9a7 SHA512 26cd8010b552892041a688525345922a3412f50d060c319b3c5bf9f135e21d5b1e7bd61b09b91431f716d695471e70b1c9a2c62772b0d3847806e4a923c48382 +EBUILD retroshare-0.6.7-r2.ebuild 3484 BLAKE2B 84031ecba0b5be6f4b64d334ee947a04b16ddc5fb7da4a0e479bf05196fc57dec1745a6abd5cb31a01f1ecb794a3da9494c94ccdbea58013dbb8ad886695a473 SHA512 eaca5329144145d652ff56981925d3665fae18ffaeab2dba69d34f0829b4dbb357721d586f174421848aa9b19897422b7920b5ecb1afd0bdcd2ae6184900a526 +MISC metadata.xml 1754 BLAKE2B 3b2f907deeb4e3b5fb55a3e6500eec33410fee84ff041899941d3915347054e471df88eeebf46219eab8684968dfdd367c10e5d512dca5e10c508e45570edebb SHA512 96b3e87ea2eeed2f9ffdeca6d1fdfd13c97f135edbc754e69f23c0416cb45ed7d22dbe333681879df644cec94d380225cf6930754cd401c2753c090eaae66eca diff --git a/net-p2p/retroshare/files/retroshare-0.6.7-fix-miniupnp-api-v18.patch b/net-p2p/retroshare/files/retroshare-0.6.7-fix-miniupnp-api-v18.patch new file mode 100644 index 000000000000..37d38b11c548 --- /dev/null +++ b/net-p2p/retroshare/files/retroshare-0.6.7-fix-miniupnp-api-v18.patch @@ -0,0 +1,32 @@ +From f1b89c4f87d77714571b4135c301bf0429096a20 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= +Date: Wed, 12 Jun 2024 01:00:41 +0200 +Subject: [PATCH] Support the miniupnpc-2.2.8 API change +# NOTE: Taken from the official libretroshare repo +# https://github.com/RetroShare/libretroshare/commit/c54e0266e4483797c1d6bacee6f563979d683464 +index 7178a8e39..5e5358fb9 100644 +--- a/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc ++++ b/libretroshare/src/rs_upnp/upnphandler_miniupnp.cc +@@ -41,6 +41,9 @@ class uPnPConfigData + struct UPNPUrls urls; + struct IGDdatas data; + char lanaddr[16]; /* my ip address on the LAN */ ++#if MINIUPNPC_API_VERSION >= 18 ++ char wanaddr[16]; /* my ip address on the WAN */ ++#endif + }; + + #include +@@ -139,6 +142,10 @@ bool upnphandler::initUPnPState() + putchar('\n'); + if(UPNP_GetValidIGD(upcd->devlist, &(upcd->urls), + &(upcd->data), upcd->lanaddr, +- sizeof(upcd->lanaddr))) ++ sizeof(upcd->lanaddr) ++#if MINIUPNPC_API_VERSION >= 18 ++ , upcd->wanaddr, sizeof(upcd->wanaddr) ++#endif ++ )) + { + printf("Found valid IGD : %s\n", + upcd->urls.controlURL); \ No newline at end of file diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml index 4388bd9dcb1d..a91c546333c8 100644 --- a/net-p2p/retroshare/metadata.xml +++ b/net-p2p/retroshare/metadata.xml @@ -5,11 +5,15 @@ gio@eigenlab.org Gioacchino Mazzurco + + fkobi@pm.me + Filip Kobierski + proxy-maint@gentoo.org Proxy Maintainers - + RetroShare is a Free and Open Source cross-platform, Friend-2-Friend secure decentralised communication platform. It lets you to securely chat and share files with your friends, family @@ -28,6 +32,8 @@ https://github.com/RetroShare/RetroShare/issues + + https://retrosharedocs.readthedocs.io/en/latest/ RetroShare/RetroShare diff --git a/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild new file mode 100644 index 000000000000..e33f7eb5f234 --- /dev/null +++ b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic desktop qmake-utils xdg + +DESCRIPTION="Friend to Friend secure communication and sharing application" +HOMEPAGE="https://retroshare.cc" +SRC_URI="https://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/RetroShare" +# NOTE: GitHub releases/archive is impractical to build so we use the OBS repo +# but they squash point releases which is bad for us + +LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli +gui +jsonapi keyring libupnp +miniupnp plugins +service +sqlcipher" + +REQUIRED_USE=" + || ( gui service ) + ?? ( libupnp miniupnp ) + plugins? ( gui ) + service? ( || ( cli jsonapi ) ) +" +RDEPEND=" + app-arch/bzip2 + dev-libs/openssl:0= + sys-libs/zlib + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + x11-libs/libX11 + x11-libs/libXScrnSaver + ) + keyring? ( app-crypt/libsecret ) + libupnp? ( net-libs/libupnp:= ) + miniupnp? ( net-libs/miniupnpc:= ) + plugins? ( + media-libs/speex + media-libs/speexdsp +