gentoo auto-resync : 04:01:2025 - 06:31:29

6 files changed, 117 insertions, 30 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 30b7563d94e7..4d254a335167 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/cpuminer-opt/Manifest b/net-p2p/cpuminer-opt/Manifest
index 16d2a5ee1b4c..d95273dc84ae 100644
--- a/net-p2p/cpuminer-opt/Manifest
+++ b/net-p2p/cpuminer-opt/Manifest
@@ -3,9 +3,11 @@ DIST cpuminer-opt-24.4.tar.gz 1787907 BLAKE2B 73f1da98f64ab7048f12d22f16ea2c94e2
 DIST cpuminer-opt-24.5.tar.gz 1792866 BLAKE2B b9eba21088d967ecf85657f14873bb4b13214b4172071d22869d01d1b9f5acf9d7de56f20ed80ddce9c4cee1fbb59c65fab70893580e38978258b955a096eb80 SHA512 a29d9d479644511204534b680c0feaff6d232f24f70ceb77f5260f3aae35275a4823d0f75c6286013bbef5b30162e3807919e8c19a4c0ad932e1b091ce8c5428
 DIST cpuminer-opt-24.6.tar.gz 1794289 BLAKE2B 1d6fef86ec38351a88a98b5f2d574521ce9997ce9a11ffc709110ad906026f5a487dce8980550b182c066cc3c960ecf31571e884b04d523c90a91714cd71b6e7 SHA512 2c33a48827c3fe34222bc13e58f1a9582a4f77563047a48d386aa75f5364031f1bcc8561a5f7f1aed95138291417506e6f142b90bbb12fcfb3552935afb34035
 DIST cpuminer-opt-24.8.tar.gz 1796451 BLAKE2B 068eeab032c4539fa1d836f1f91467bc13f29a460263af1178fce74c150f9b4a6808368d6a30012eac8dfa83ce7f275327e7748bee175752563b738252c7bf7f SHA512 59b841e11c8ac784392b006e8edf0f3d3627abd65fc48aee73397abec4ea7f2723e7a5637735e4b5c5a87f7c0bcfd5e9c2c311021b9e756ab80acdcd73106310
+DIST cpuminer-opt-25.1.tar.gz 1782054 BLAKE2B 9f7c90096e332c8c0419e1d9851ceea06ad3537a6c69bf991236a5db0660a7f3aeaa217d9be862d4f3bf7a6807d71a530a69c740e0e7e6fbf9d699f9ccbee860 SHA512 bda22f5887fc106491181d375433f588504f498f5d5a1a7b631f66f1b95a80db4af58d1f23a3ec373ef8763752d4f1e21a2fbd9c6f57c52a0d9330bee40f67b7
 EBUILD cpuminer-opt-24.4.ebuild 972 BLAKE2B 0bb88178a6f002c1a9035f00bdf43279fe0b103abd8c03af71cb306109188e857491a2ccceb6ddf5ebecd11d3a204e1496a8e4d735039bd4696e7cee2430a0a3 SHA512 1072c9a542517da85b90329b2aa97f816ceb41b2788afbdd81946ff22a2d1d66db4d0f6ecfaacdd04514a4ae66a768de456117c7097419e36317de0b6f61f2f7
 EBUILD cpuminer-opt-24.5.ebuild 972 BLAKE2B 0bb88178a6f002c1a9035f00bdf43279fe0b103abd8c03af71cb306109188e857491a2ccceb6ddf5ebecd11d3a204e1496a8e4d735039bd4696e7cee2430a0a3 SHA512 1072c9a542517da85b90329b2aa97f816ceb41b2788afbdd81946ff22a2d1d66db4d0f6ecfaacdd04514a4ae66a768de456117c7097419e36317de0b6f61f2f7
 EBUILD cpuminer-opt-24.6.ebuild 972 BLAKE2B 0bb88178a6f002c1a9035f00bdf43279fe0b103abd8c03af71cb306109188e857491a2ccceb6ddf5ebecd11d3a204e1496a8e4d735039bd4696e7cee2430a0a3 SHA512 1072c9a542517da85b90329b2aa97f816ceb41b2788afbdd81946ff22a2d1d66db4d0f6ecfaacdd04514a4ae66a768de456117c7097419e36317de0b6f61f2f7
 EBUILD cpuminer-opt-24.8.ebuild 972 BLAKE2B 0bb88178a6f002c1a9035f00bdf43279fe0b103abd8c03af71cb306109188e857491a2ccceb6ddf5ebecd11d3a204e1496a8e4d735039bd4696e7cee2430a0a3 SHA512 1072c9a542517da85b90329b2aa97f816ceb41b2788afbdd81946ff22a2d1d66db4d0f6ecfaacdd04514a4ae66a768de456117c7097419e36317de0b6f61f2f7
+EBUILD cpuminer-opt-25.1.ebuild 972 BLAKE2B 0bb88178a6f002c1a9035f00bdf43279fe0b103abd8c03af71cb306109188e857491a2ccceb6ddf5ebecd11d3a204e1496a8e4d735039bd4696e7cee2430a0a3 SHA512 1072c9a542517da85b90329b2aa97f816ceb41b2788afbdd81946ff22a2d1d66db4d0f6ecfaacdd04514a4ae66a768de456117c7097419e36317de0b6f61f2f7
 EBUILD cpuminer-opt-9999.ebuild 972 BLAKE2B 4bea6b716150282b920ceb4f563dc731a029a0856c81fe2d31c371cb9151c89f1cd45174738fc3c5c17cf4d04b3aac4e8c33b964a9ec76e32189a3f3febffc18 SHA512 d4eac5605963c1c02df9744811e50bc121fd9ee71149fd520f35282080f3bcfad6d4c83252aeac10a533781bebd70dfd7d02c81b3a54106f5033d83cc85a59db
 MISC metadata.xml 334 BLAKE2B f5b55d2366d5e2bc0fa04e0bbfd20fb8fb21993a352641b1f63b0d33075c97611fee985b6296cb1338a8b8b613f6835efcf8621cb8ca89d6598bd4a493673bb8 SHA512 a7b29760fbd65f440341fe862a157676a66caea1ac0d51b324e3cb79297a1293de9464ff1a460b9ee0b9399f3e637bf4ec8eb6022db957db792fe13282585ffa
diff --git a/net-p2p/cpuminer-opt/cpuminer-opt-25.1.ebuild b/net-p2p/cpuminer-opt/cpuminer-opt-25.1.ebuild
new file mode 100644
index 000000000000..2683d4bdc544
--- /dev/null
+++ b/net-p2p/cpuminer-opt/cpuminer-opt-25.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic systemd
+
+DESCRIPTION="Optimized multi algo CPU miner"
+HOMEPAGE="https://github.com/JayDDee/cpuminer-opt"
+IUSE="cpu_flags_x86_sse2 curl"
+LICENSE="GPL-2"
+SLOT="0"
+REQUIRED_USE="cpu_flags_x86_sse2"
+DEPEND="
+	dev-libs/gmp:=
+	dev-libs/jansson:=
+	>=net-misc/curl-7.15[ssl]
+"
+RDEPEND="${DEPEND}"
+if [[ ${PV} == "9999" ]] ; then
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/JayDDee/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/JayDDee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-z,noexecstack
+	econf --with-crypto --with-curl
+}
+
+src_install() {
+	default
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto "/etc/${PN}"
+	newins config-template.json cpuminer-conf.json
+}
+
+src_test() {
+	./cpuminer --cputest || die
+}
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index efb6082606cd..c32b356f8676 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,5 +1,6 @@
 AUX retroshare-0.6.7-fix-miniupnp-api-v18.patch 1168 BLAKE2B 35635a360183aaaa3fcf211bb2503cc5fcfaad76f4b9e6170985b7611f4b0de4734dba02956146dcdd734939d50a89f31e7a31e8132ebe151e2f8dbc3a26376d SHA512 22a2f32226498f18b7c0b0e36b11a677d048ede56a1e56fde1599fe410456bc5905e9300e5a0d93b8d808e0ade6e4be3bd9311dc5f4ed0b2e0dd90d038cfb8c1
+AUX retroshare-0.6.7_fix-old-rapidjson.patch 1114 BLAKE2B dff2082304e03859a6bedf0575302b5d23ecdee8585f39f24537030c68c7475c0d6f10eb12c7d11e93672ad9c1190f2a09b40cbbf2ea78ace3a205ea6687913c SHA512 58f96a38484c5c22ba775c5741a4846821911aaee3fb118ab15c76b0b7432df0d9e0b7558831bf54cd36b37ca33550c7d6ce4c58a652acbd48b0e955dd6c3343
 DIST retroshare-0.6.7.tar.gz 26506259 BLAKE2B 3c0963c8afbbf741c8c5d22dc9c9f86f82d1a338a9f0dd02065617d16e96738a4d22c2bc30c1ba32c61fcc7beedaa15ac3c185aab429882b0947aa28b8c037b1 SHA512 ff5455b97519878d83c6872dfce457804430938864259f7d0fa5b06ebae161e62ea8300e809a03a821b2ecdf755a3de7465a580882709ae79bfb9c1de855e347
-EBUILD retroshare-0.6.7-r1.ebuild 3558 BLAKE2B 3cd498c88a0f4e7bf8acb091a8f8179fb5fb54b2f880c8ff38b7a6d3a86d4b189fcce78b9e282ec1af301b23f4f0eb7e540007927144f5d08f3cc99dbb42d9f5 SHA512 dd58700fae6eade35f183718dc50277e0687fff2e1f01455bd4aa36628f1d000ea60bf390549d7564b120b5e0e13d1144ec2b40b28485cb855829cd9c5185036
 EBUILD retroshare-0.6.7-r2.ebuild 3482 BLAKE2B cf9cc2156a000518e780e0970d2a39b35754f38faae1940833ec899147726a42ff4d55e947fb106628f9932c5770d5f8b98fc19deb0fa3106989dc888baab2d7 SHA512 b4783c5de5a118a8cd36d687837fcb805fb28700325414b60e548fad179debeacb9076c0524518cdf8dee4dcbdb893f18e7c1811a22ba469e7873e93ecb2addb
+EBUILD retroshare-0.6.7-r3.ebuild 3578 BLAKE2B 57fee4c6ed4d53fb2700d9404c342db48015d5b85e39782211c439f66ac2807c985380aa1de733859689319850cbb6edbbb127b406f5f958c3cc91e21f6ad361 SHA512 3a13fed146f677ed110b6bb67f0b35b13485ec114d60fae8ca08cda73f57bc24871f926ee7ea64fbfc023f3c23609c59eb0af67df04d42ddf51266e674a198e9
 MISC metadata.xml 1754 BLAKE2B 3b2f907deeb4e3b5fb55a3e6500eec33410fee84ff041899941d3915347054e471df88eeebf46219eab8684968dfdd367c10e5d512dca5e10c508e45570edebb SHA512 96b3e87ea2eeed2f9ffdeca6d1fdfd13c97f135edbc754e69f23c0416cb45ed7d22dbe333681879df644cec94d380225cf6930754cd401c2753c090eaae66eca
diff --git a/net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch b/net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch
new file mode 100644
index 000000000000..90c973c53493
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch
@@ -0,0 +1,24 @@
+This fixes a c23 issue in the rapidjson library:
+
+     error: assignment of read-only member 'rapidjson::GenericStringRef::length'
+
+This was fixed upstream in 2016 and this patch combines two commit from PR
+https://github.com/Tencent/rapidjson/pull/719
+We are using OpenBuildService as the tarball source and it bundles libraries that old.
+
+For Gentoo details see https://bugs.gentoo.org/945721
+--- a/supportlibs/rapidjson/include/rapidjson/document.h
++++ b/supportlibs/rapidjson/include/rapidjson/document.h
+@@ -316,10 +316,10 @@
+ 
+     GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
+ 
+-    GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
+-
+     //! implicit conversion to plain CharType pointer
+     operator const Ch *() const { return s; }
++    //! Copy assignment operator not permitted - immutable type
++    GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */;
+ 
+     const Ch* const s; //!< plain CharType pointer
+     const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
diff --git a/net-p2p/retroshare/retroshare-0.6.7-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r3.ebuild
index 515696241dc3..a9cec116ed37 100644
--- a/net-p2p/retroshare/retroshare-0.6.7-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,62 +10,68 @@ 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
+# but they squash point releases and include 3rd party libraries in the tarball
 
 LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="keyring cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher plugins"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli +gui +jsonapi keyring libupnp +miniupnp plugins +service +sqlcipher"
 
 REQUIRED_USE="
 	|| ( gui service )
 	?? ( libupnp miniupnp )
 	plugins? ( gui )
-	service? ( || ( cli jsonapi ) )"
-
+	service? ( || ( cli jsonapi ) )
+"
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/openssl:0=
 	sys-libs/zlib
-	keyring? ( app-crypt/libsecret )
 	gui? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
 		dev-qt/qtmultimedia:5
 		dev-qt/qtnetwork:5
 		dev-qt/qtprintsupport:5
-		dev-qt/qtxml: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-2.2.8:= )
-	sqlcipher? ( dev-db/sqlcipher )
-	!sqlcipher? ( dev-db/sqlite:3 )
+	miniupnp? ( net-libs/miniupnpc:= )
 	plugins? (
 		media-libs/speex
 		media-libs/speexdsp
 		<media-video/ffmpeg-5
-	)" # REVIEW: miniupnp pinned because retroshare does not support API 18 yet
-
-# NOTE(setan): rapidjson might not be needed if not using jsonapi. This is to be tested
-DEPEND="${RDEPEND}
-	>=dev-libs/rapidjson-1.1.0
-	gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-build/cmake
+	)
+	sqlcipher? ( dev-db/sqlcipher )
+	!sqlcipher? ( dev-db/sqlite:3 )
+"
+DEPEND="
+	${RDEPEND}
+	gui? ( dev-qt/designer:5 )
+	jsonapi? ( >=dev-libs/rapidjson-1.1.0 )
+"
+BDEPEND="
+	dev-build/cmake
 	dev-qt/qtcore:5
 	virtual/pkgconfig
 	gui? ( x11-base/xorg-proto )
-	jsonapi? ( app-text/doxygen )"
+	jsonapi? ( app-text/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-miniupnp-api-v18.patch
+	"${FILESDIR}"/${P}_fix-old-rapidjson.patch
+)
 
 src_configure() {
 	local qconfigs=(
-		$(usex cli '' 'no_')rs_service_terminal_login
+		$(usex cli     '' 'no_')rs_service_terminal_login
 		$(usex keyring '' 'no_')rs_autologin
-		$(usex gui '' 'no_')retroshare_gui
+		$(usex gui     '' 'no_')retroshare_gui
 		$(usex jsonapi '' 'no_')rs_jsonapi
 		$(usex service '' 'no_')retroshare_service
 		$(usex sqlcipher '' 'no_')sqlcipher
@@ -73,8 +79,11 @@ src_configure() {
 	)
 
 	local qupnplibs="none"
-	use miniupnp && qupnplibs="miniupnpc"
-	use libupnp && qupnplibs="upnp ixml"
+	if use miniupnp; then
+		qupnplibs="miniupnpc"
+	elif use libupnp; then
+		qupnplibs="upnp ixml"
+	fi
 
 	# bug 907898
 	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
@@ -82,24 +91,27 @@ src_configure() {
 	# REVIEW: qmake is deprecated
 	# https://github.com/RetroShare/RetroShare/tree/master/jsonapi-generator
 	eqmake5 CONFIG+="${qconfigs[*]}" \
-		RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \
-		RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \
+		RS_MAJOR_VERSION=$(ver_cut 1) \
+		RS_MINOR_VERSION=$(ver_cut 2) \
+		RS_MINI_VERSION=$(ver_cut 3) \
+		RS_EXTRA_VERSION="-gentoo-${PR}" \
 		RS_UPNP_LIB="${qupnplibs}"
 }
 
 src_install() {
-	use gui && dobin retroshare-gui/src/retroshare
 	use service && dobin retroshare-service/src/retroshare-service
 
 	insinto /usr/share/retroshare
 	doins libbitdht/src/bitdht/bdboot.txt
-	use gui && doins -r retroshare-gui/src/qss
 
 	dodoc README.asciidoc
 
 	if use gui; then
-		make_desktop_entry retroshare
+		dobin retroshare-gui/src/retroshare
+		doins -r retroshare-gui/src/qss
 
+		doicon data/${PN}.xpm
+		domenu data/${PN}.desktop
 		for i in 24 48 64 128 ; do
 			doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
 		done