gentoo auto-resync : 17:06:2024 - 00:09:46

5 files changed, 30 insertions, 93 deletions

diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 3f1bb7025cfe..f3aa026e6565 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -1,11 +1,9 @@
-AUX airdcpp-webclient-2.11.2-fix-odr.patch 847 BLAKE2B 6d6789e1b587be53fd1d31ca5d06e4ae8a246807ec60afb2f618b0ca58d223f754ee5ebb2ee268cd9d5c024ac14f60945cb0afd5ccbb18b74de2a639bbdd7979 SHA512 70f9c57822a4f16297a022e21d67ca123d2b6b424b450e567327c4fdbc7b0c1ddc39b2265a5b4e273af0675c6966ff9966920f7a83c706186d441052ad977bf0
+AUX airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch 700 BLAKE2B 3e611b191e231ee4f3ab6e10b2eda7e4080b9001e01776129f844dd1a3e755e84c2b9f8a58d8f97679c815e4d5473ff59173aedf7f928e1c5917c09e7d6977f3 SHA512 07a971e8e883745007d8b07cdf790f38ece4821c1f6210b68fbca2507dc854e89b0f0be8ebe3535218435eb30814cb97d8ba69350149ff071e37e46671b5dd44
 AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef90c28b170b84ecd3a82da77b582b69ef442a9a455752192ba4b6b33aeb9a43587c0209fdf380342 SHA512 025ec93c208173771fe697574c9161b9af8d740eab0b1290c8d3857961dc3635339bdb9c18b97fdde6fa7dc8924f4453b9c609ca57e61f1cad9ff47683fb613e
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
 AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508
-DIST airdcpp-webclient-2.11.2.tar.gz 978294 BLAKE2B cb15e02dc5381cc5f0ecb1b4d65cdd1c4a3d007f3ea1e78a159b8a62af03831318b8f6d8c0692c5a9145dda616627ea97f4bd3eeb1270a7452c7d78bf01d147f SHA512 281d4a9da88f23a4c02eef7f09c4fc2c91c44ac93d932ea4bfe097029b45dbd12a8d04d4ef8b493d261f5dade15b62ed4d564197fbfb2d9d98b9dfcc9a9e6379
 DIST airdcpp-webclient-2.11.4.tar.gz 958611 BLAKE2B f0ff3a39c8615edbc541a952460b831eefd37f1825da4881da147c54a00612479382a9d69d4399f55fbdd77c77ab6716097594c8d10c6a3839db5ae14d11cc87 SHA512 0ab8fbdc6d1b815546724bfdcd436aa2e07ffdb499b91a3506db18c2f494f76bc1203d0d9d3cfd3ae6ad9d0f2fb4038df46aada0515747e2477c7f6595a05436
 DIST airdcpp-webclient-2.12.1.tar.gz 961603 BLAKE2B bc17fb3b3643b1d699f7c0ef958616759d87cd96467318a592c1460e355d512a3efc0e793a3098f8074f02d5af47b1ef33b65fbe7a6c9a955bbdc472d323f637 SHA512 0f662311d208b937c946b41a617c82a0e72442fb7c2bef09d56ec71931bde35bd1024ce53cb3bf7deda3eaaac31ecbe8fa2c66c337c0833db655f80f5e5156be
-EBUILD airdcpp-webclient-2.11.2.ebuild 1428 BLAKE2B 95090c5e23191743037206460d96ee0f75f35b4dd1917888315dbad1e56f25a7dc9d7bd500454cf5399186a84ea5d73ab1487b329f45cb9d00a34d43a4612dd4 SHA512 81c7eef1cfcd1be7da74724a50d93942a6ec02bc448f92127bfce52a08c9a7ea5ff00870ffabf644ca9a4a59ca043f97c202ce000f70b70f33da185d152493f0
 EBUILD airdcpp-webclient-2.11.4.ebuild 1381 BLAKE2B 0b64fcc853b9a9857dfe1a55145500903fb718753a737229e5a733f797f711b22aaa0bd2ad8d0ef96acb58cb59e6c100e5c5e852c13f7060e2ce39e5c00b5716 SHA512 f091e9945199d16e8ee3f90df23b9861552bd17c4b5b7480d9fd82e0fb161fbcefd83b9b5804c7d1474f9b15945f5029917cedf5fd8c120b730d8c24c17eb40f
-EBUILD airdcpp-webclient-2.12.1.ebuild 1382 BLAKE2B d51183ee0d5d58bbcc470805afd987e9484a20115c513824d0d76ac18a8b154b1cc0c476457cd8b4b3dfe12b1d73bfff1b6f28ec270938cc0b94eef0b474cec5 SHA512 a6740503ea7e0b2d702bc793db24c806bb1ec45e5e331f6a7e95c02058b2ee26734f89c5ebe53c318ae1120c4c4e167955629ebffb0dd31346ea9bb34ae9f8bf
+EBUILD airdcpp-webclient-2.12.1.ebuild 1437 BLAKE2B 7544123224affe4db124c5907d062ccb693804564d0039c5844180c0a547b8863d073e28e2430dd39bac3044be8660cb1e2615373da9715584c942e3f8ffe51a SHA512 c00edc017997091b882a2fdf07e734964d79be06206b0c398f033d08467e0722d15f0517deb87587eabf4590c0b3b3f19f009a511aa9c8b80bef25f91fc8d337
 MISC metadata.xml 805 BLAKE2B f62a540005c5d447e9ddd18b31eb88b1e875161af3b54e8c8753034700a70f28b3d4059d34988a8cf9225c2588ac921b39293e30ed2abf65a2bd0970b75a4628 SHA512 f8ff1e2d21ad685843abdb11672450b08c190203fbaead9170985dcf14332b7deebefb1565df6ce88671a87eb5e22ae80df5eaccf4c42ad49e882dd00b7ec81d
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
deleted file mode 100644
index 9b5fdb2338b8..000000000000
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.11.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{9..11} )
-
-inherit cmake python-any-r1 systemd
-
-DESCRIPTION="Cross-platform Direct Connect client"
-HOMEPAGE="https://airdcpp-web.github.io/"
-SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug nat-pmp +tbb +webui"
-
-RDEPEND="
-	acct-user/airdcppd
-	acct-group/airdcppd
-	app-arch/bzip2
-	dev-cpp/websocketpp
-	dev-libs/boost:=
-	dev-libs/leveldb:=
-	dev-libs/libmaxminddb:=
-	dev-libs/openssl:0=[-bindist(-)]
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	virtual/libiconv
-	nat-pmp? ( net-libs/libnatpmp:= )
-	tbb? ( dev-cpp/tbb:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-"
-PDEPEND="webui? ( www-apps/airdcpp-webui )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-odr.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_NATPMP=$(usex nat-pmp)
-		-DENABLE_TBB=$(usex tbb)
-		-DINSTALL_WEB_UI=OFF
-	)
-	CMAKE_BUILD_TYPE=$(usex debug Debug Gentoo) cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	newconfd "${FILESDIR}/airdcppd.confd" airdcppd
-	newinitd "${FILESDIR}/airdcppd.initd" airdcppd
-	systemd_dounit "${FILESDIR}/airdcppd.service"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		elog "Run 'airdcppd --configure' to set up ports and authentication"
-	fi
-}
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild
index 848b7f674f46..e6d1af1f4eed 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
 
 inherit cmake python-any-r1 systemd
 
@@ -11,9 +11,9 @@ DESCRIPTION="Cross-platform Direct Connect client"
 HOMEPAGE="https://airdcpp-web.github.io/"
 SRC_URI="https://github.com/airdcpp-web/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~riscv x86"
 LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
 IUSE="debug nat-pmp +tbb +webui"
 
 RDEPEND="
@@ -38,6 +38,10 @@ BDEPEND="
 "
 PDEPEND="webui? ( www-apps/airdcpp-webui )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-miniupnpc-2.2.8.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_NATPMP=$(usex nat-pmp)
diff --git a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch
deleted file mode 100644
index e44365ca1bd2..000000000000
--- a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.11.2-fix-odr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5f12f803c2fc0450111152e2ea5f649ed92f4b7f Mon Sep 17 00:00:00 2001
-From: maksis <maksis@adrenaline-network.com>
-Date: Thu, 13 Oct 2022 22:05:35 +0300
-Subject: [PATCH] Build: define the HAVE_POSIX_FADVISE flag correctly
-
-Fixes https://github.com/airdcpp-web/airdcpp-webclient/issues/425
----
- airdcpp-core/CMakeLists.txt | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
---- a/airdcpp-core/CMakeLists.txt
-+++ b/airdcpp-core/CMakeLists.txt
-@@ -75,8 +75,7 @@ if (HAVE_MNTENT_H)
- endif (HAVE_MNTENT_H)
- 
- if (HAVE_POSIX_FADVISE)
--    set_property(SOURCE ${PROJECT_SOURCE_DIR}/airdcpp/File.cpp PROPERTY COMPILE_DEFINITIONS HAVE_POSIX_FADVISE APPEND)
--		set_property(SOURCE ${PROJECT_SOURCE_DIR}/airdcpp/File.h PROPERTY COMPILE_DEFINITIONS HAVE_POSIX_FADVISE APPEND)
-+    add_definitions (-DHAVE_POSIX_FADVISE)
- endif (HAVE_POSIX_FADVISE)
- 
- 
diff --git a/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch
new file mode 100644
index 000000000000..64dcce950d48
--- /dev/null
+++ b/net-p2p/airdcpp-webclient/files/airdcpp-webclient-2.12.1-miniupnpc-2.2.8.patch
@@ -0,0 +1,22 @@
+https://github.com/airdcpp/airdcpp-windows/commit/2b1cd3d05774ce8134186bb9977a45cf00aaaef5
+
+From 2b1cd3d05774ce8134186bb9977a45cf00aaaef5 Mon Sep 17 00:00:00 2001
+From: maksis <maksis@adrenaline-network.com>
+Date: Thu, 13 Jun 2024 20:05:17 +0300
+Subject: [PATCH] Add support for miniupnpc 2.2.8
+
+--- a/airdcpp-core/airdcpp/Mapper_MiniUPnPc.cpp
++++ b/airdcpp-core/airdcpp/Mapper_MiniUPnPc.cpp
+@@ -108,7 +108,12 @@ bool Mapper_MiniUPnPc::init() {
+ 	UPNPUrls urls;
+ 	IGDdatas data;
+ 
++#if (MINIUPNPC_API_VERSION >= 18)
++	auto ret = UPNP_GetValidIGD(devices, &urls, &data, 0, 0, nullptr, 0);
++#else
+ 	auto ret = UPNP_GetValidIGD(devices, &urls, &data, 0, 0);
++#endif
++
+ 
+ 	bool ok = ret == 1;
+ 	if(ok) {