gentoo resync : 03.11.2021

5 files changed, 194 insertions, 0 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index d09f734894e9..83bd64167705 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 89799517ece4..374904de763f 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -4,11 +4,13 @@ DIST qbittorrent-4.3.4.1.tar.gz 8057119 BLAKE2B a5e59aab555feaa2638c3ff60df97ae0
 DIST qbittorrent-4.3.5.tar.gz 8128281 BLAKE2B 656b64cfcddba37197b7a87ff3281168649d51e127a69dd489c89f11d8ff6cca7de722f4a5188742cf4efb592e0acbf3b1be69dd804d52d25d8c3e13fdf39e32 SHA512 7bfc9e280e70093b74dafae9a6f921cf27f6828ea03ac3510c3419131b40a1610090d335a831697c9b690f47e396700f7b5a4b14dec47a9f12f4ed797f30d0dd
 DIST qbittorrent-4.3.7.tar.gz 8494224 BLAKE2B 68f402619069fea87c5120e97f381d589f2acdede125644feb6b9e57f334ffebe8d9f95dc3da2b819f783414249da78357fcba64910ca4e77af8860afbcc046c SHA512 53a7bd7b21f0439d9407e8c823086004c1f01d856903e22a7f5a5b97c5ef39f807d6168158af1eb008fab21c78f7c81b8d8e142a3f3f74d5232653f43559cafd
 DIST qbittorrent-4.3.8.tar.gz 8506355 BLAKE2B e59be1556ad0be697e32d69d890115df6ce20a46f883a9060994558db02f06cf87fbf68a17e6317e1b5819af523281bdd8cfdcc8ae68a0d707a238023dcc7840 SHA512 bb03f27f0807dfac867ddf5a6fcec1687946068a7e7d88483f0ded34d7279aa0d3324fe25f23c22ce80ee98437d8914229c5969ea8849eed1d4ad68e031601e2
+DIST qbittorrent-4.3.9.tar.gz 8510414 BLAKE2B de98aff6d81f43c3ad87f6c5f800a4488e18173fb96713d0a2420cf4d4708c9b1f2f54c8d0aa566e7738b4f94d192aad9f0196a05d43724582ef81833901727f SHA512 ec33f67895fbf47acc2f79d9c9e16db8b96c756cf493b76eb24b90e13a790a709104ea9aa378ee111d8c38b605bed5192b366d1917bbf160b21aa2ae3aacd2d1
 EBUILD qbittorrent-4.3.1.ebuild 1373 BLAKE2B f80102443904b86677882c4b85edab03040c0e76f4a945f9ac553f45b0bd6cf5f28eeeff7bf04a539dc6a61a0757575f99e4457a63000fcb9f15b362309ecd97 SHA512 44d8da906f797e3980dba865e605c90b7453325c0952cfad6cd470285b310190ff84d986e3b12a5c2448b2b9e87f5f82eec1debf4d85ba6cfd7fc88166b11f46
 EBUILD qbittorrent-4.3.3.ebuild 1376 BLAKE2B a9f617177948cdd0e0bf80ae66b3a4e92f08466580cc697f588f5cb989ed0c7627f219e8347d569f9db412e4d85fa4ed4abb514eb60678e686776a6eaa53b22f SHA512 4ae774141b8a94f39e1053a5662a10c25e108817902affe5093a382ad1d2aeecd8465d507f03c8585fb75c4c9421538d71e3d9912e21e64aba6b9b6ab362facd
 EBUILD qbittorrent-4.3.4.1.ebuild 1376 BLAKE2B e4d3db6ad2b1c0f65bb83d1fa010e6e71d84b90dfa4ebca700fe6a3232a64fd7773e728f8f9f68622c22afe2722a03c8589be9be378f5cfbc4de290275cb3009 SHA512 ba0d065a2e8f37ace657fa1d9f4ce16e5aaa4588c3677310206c6270c040d8c7c28daa0deb5c8575f40c9794609d10a6c43aa1b5a165cd89b8b11e6b702bd286
 EBUILD qbittorrent-4.3.5.ebuild 1376 BLAKE2B e4d3db6ad2b1c0f65bb83d1fa010e6e71d84b90dfa4ebca700fe6a3232a64fd7773e728f8f9f68622c22afe2722a03c8589be9be378f5cfbc4de290275cb3009 SHA512 ba0d065a2e8f37ace657fa1d9f4ce16e5aaa4588c3677310206c6270c040d8c7c28daa0deb5c8575f40c9794609d10a6c43aa1b5a165cd89b8b11e6b702bd286
 EBUILD qbittorrent-4.3.7.ebuild 1376 BLAKE2B e4d3db6ad2b1c0f65bb83d1fa010e6e71d84b90dfa4ebca700fe6a3232a64fd7773e728f8f9f68622c22afe2722a03c8589be9be378f5cfbc4de290275cb3009 SHA512 ba0d065a2e8f37ace657fa1d9f4ce16e5aaa4588c3677310206c6270c040d8c7c28daa0deb5c8575f40c9794609d10a6c43aa1b5a165cd89b8b11e6b702bd286
 EBUILD qbittorrent-4.3.8.ebuild 1374 BLAKE2B 1fcc975df8e24e9fd47e035247e0e8e81222a3c76059de959547845fdc2ebf14f003c3c31ff64049d58fab86f3bc4330d195c32a630463b9ba97cdf1c9488509 SHA512 f4d303fe3e71e8b734cf42f136d71c863ac89ea91d3ae68e0a112c77e4a296f27168d551a7ec1c9cfcd06ca974ecb84f3dbcda5aa19b33efa82f897232ebfa56
+EBUILD qbittorrent-4.3.9.ebuild 1376 BLAKE2B 250eb1242bc7eaa19313bb7377b189058664f391a988c1cfe46a2b1cbb14188c1019f960bd8f750bc801c6b6d25446771d812e18bfc64958cd46ced852cb223f SHA512 2d0452357a77cef2e966411284be0da1c483bd8374e7346b0ec7c41de57d48f54d780bf31020c6d8ad53f78bed021972d861074811ae23bbffc70493206b362e
 EBUILD qbittorrent-9999.ebuild 1374 BLAKE2B 22fe3c5a8a78935ab23ef55b7d420f5cedf68c25a2e65001a21dfeb2de0db612e750b10a874556421910aa9b9bc162ce4df7d40adeda0b58513ef2b7d23a0f67 SHA512 cfcf64fccaa84c2171cb23091097dc699114f94f86268861b0f9c4fc03e361f6c04e06e055e69c1ffa69555f674660d9342b327999a26a92e44c5ed4c9930b1e
 MISC metadata.xml 453 BLAKE2B 0a68996aacf4ff1e56423417f8808bb66aa9563aaa3ef87c863539edd8173f32cc4a1b0061a5c9ecd63801c51ec52c54bd61ffcd869fc74dc24c2b042ec218d5 SHA512 90d52e221f153737c99b353a052683e0340f098f773b28e0d5b9d0c729b747beedadb4193c45a1f4c3df998436d194e089434aa621421bf127d049d90a14a434
diff --git a/net-p2p/qbittorrent/qbittorrent-4.3.9.ebuild b/net-p2p/qbittorrent/qbittorrent-4.3.9.ebuild
new file mode 100644
index 000000000000..43ca7eae242b
--- /dev/null
+++ b/net-p2p/qbittorrent/qbittorrent-4.3.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit xdg-utils
+
+DESCRIPTION="BitTorrent client in C++ and Qt"
+HOMEPAGE="https://www.qbittorrent.org
+	  https://github.com/qbittorrent"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git"
+else
+	SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+	S="${WORKDIR}/qBittorrent-release-${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+dbus debug webui +X"
+REQUIRED_USE="dbus? ( X )"
+
+RDEPEND="
+	>=dev-libs/boost-1.62.0-r1:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtxml:5
+	>=net-libs/libtorrent-rasterbar-1.2.12:0=
+	sys-libs/zlib
+	dbus? ( dev-qt/qtdbus:5 )
+	X? (
+		dev-libs/geoip
+		dev-qt/qtgui:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO )
+
+src_configure() {
+	econf \
+	$(use_enable dbus qt-dbus) \
+	$(use_enable debug) \
+	$(use_enable webui) \
+	$(use_enable X gui)
+}
+
+src_install() {
+	emake STRIP="/bin/false" INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index a82a5ffd8a9a..ebdb09abc1e5 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -4,5 +4,6 @@ DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4e
 DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d
 EBUILD retroshare-0.6.5-r2.ebuild 4114 BLAKE2B dbc08ddaf55fe725e61f03f85458d334b73e5d641a050d418b63b1b5368d6447b4cd3a6ca45f75a7d8cdffd089814adc62e24243507d72a9438ff2afff1f9784 SHA512 4dfb1b8cb8e941a593e806136823602974b1f9fd8a3fdfd4541ed4253404d9a679fb7f75bba5072e0f8302d75d57de5d3240d98145eaae59b026c04eec4b8e39
 EBUILD retroshare-0.6.5-r3.ebuild 3734 BLAKE2B f085af9005a35f126d45ad579cff0b907301ee6d3ed1280e4668c51a0db170e681cd2cc246d0306842c01e19dc1548407f38a4139c48498a28262bbabbb365df SHA512 cc3d8766f874e35365995ed5758d2711db05590ee76cf65f6ce2807ad4de611e45adec9c9fa486e60d55974fb3691c66f24b4889abcf0b059256968f5a3b39ad
+EBUILD retroshare-0.6.6-r1.ebuild 3525 BLAKE2B d7ebd23b5690ce5e67e01adeb7f5dd8606bab999a162dbf86a6dcde03b882806f9dc072c1e4e47c16a1ac298c11590245b1898edcc1b77a5b96ba8fe3113d292 SHA512 004647ff26344ea1602ae5dba0ecc8844ad12a93248e0d1ef5d2f0e0f41dc3d43b77bc7e37f4034e93d1566f9c8870404fefc1e25d676c6998a5d83222a8a7ec
 EBUILD retroshare-0.6.6.ebuild 3481 BLAKE2B 4888c2ac8c7733dba086f0616d3a6e6421daeeadf2ed30c16043dc88a06fbb66e2812740c0ff3ddaa2f376858d2cef81580b6ea14245d4cafeb83d5a61ebd42e SHA512 50d1083dbd9fcd0e2333193473903b828e7b04341da6655bcefc8b249ab591f016731de2ef0ac61aa5e95b13532017d62505df2931ba31453a43657f8e9d05ad
 MISC metadata.xml 1936 BLAKE2B 09abd24c20a06e479e8212558b70a8c08b737df830d68242f07e88fb1f070de620eeb8bf0a047317f9661b8af9d213720041f25dd06f8f01ac6454eca3f4bb9b SHA512 f4365576e75eb0de36b4c1bff1e73fd87f8cbb1d0d6ecf6ae64081d9cca3c534c7ba577b1209aac287699f25d852cca8e316a4ed0f91b852527f27f9b0b80b57
diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
new file mode 100644
index 000000000000..1fedc3f34d4b
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="https://retroshare.cc"
+SRC_URI="http://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/RetroShare"
+
+LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher"
+
+REQUIRED_USE="
+	|| ( gui service )
+	?? ( libupnp miniupnp )
+	service? ( || ( cli jsonapi ) )"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/openssl:0=
+	>=dev-libs/rapidjson-1.1.0
+	sys-libs/zlib
+	autologin? ( app-crypt/libsecret )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtxml:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+	libupnp? ( net-libs/libupnp:= )
+	miniupnp? ( net-libs/miniupnpc:= )
+	service? ( dev-qt/qtcore:5 )
+	sqlcipher? ( dev-db/sqlcipher )
+	!sqlcipher? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	dev-qt/qtcore:5
+	gui? ( dev-qt/designer:5 )"
+
+BDEPEND="dev-util/cmake
+	virtual/pkgconfig
+	jsonapi? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-cxx17-compilation.patch" )
+
+src_configure() {
+	local qconfigs=(
+		$(usex cli '' 'no_')rs_service_terminal_login
+		$(usex autologin '' 'no_')rs_autologin
+		$(usex gui '' 'no_')retroshare_gui
+		$(usex jsonapi '' 'no_')rs_jsonapi
+		$(usex service '' 'no_')retroshare_service
+		$(usex sqlcipher '' 'no_')sqlcipher
+	)
+
+	local qupnplibs="none"
+	use miniupnp && qupnplibs="miniupnpc"
+	use libupnp && qupnplibs="upnp ixml"
+
+	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_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
+
+		for i in 24 48 64 128 ; do
+			doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
+		done
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	if ! use sqlcipher && ! has_version "net-p2p/retroshare[-sqlcipher]"; then
+		ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
+		ewarn "instead of SQLCipher for GXS databases."
+		ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
+		ewarn "database format, so you will need to manually delete GXS"
+		ewarn "database (loosing all your GXS data and identities) when you"
+		ewarn "toggle sqlcipher USE flag."
+	fi
+
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		if ver_test ${REPLACING_VERSIONS} -lt 0.6; then
+			ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
+			ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
+			ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
+			ewarn "It's recommended to drop all your configuration and either"
+			ewarn "generate a new certificate or import existing from a backup"
+			break
+		fi
+		if ver_test ${REPLACING_VERSIONS} -ge 0.6.0 && ver_test ${REPLACING_VERSIONS} -lt 0.6.4; then
+			elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
+			break
+		fi
+	fi
+}