gentoo resync : 29.12.2022

5 files changed, 195 insertions, 7 deletions

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 6f86faffe754..b65c2a4808c5 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,9 +1,11 @@
 AUX 60-transmission.conf 56 BLAKE2B 4c2aadb19b4c85ce8ecec4f190f83da81a8b9e27f02cb20b785251122b5a495d1b3b7425378c4e17d3cda3c1c5b92c4297140dcfc3d4973dfbd1ac8e713245ca SHA512 9f79cfb00fa92e6d9054aad615f0ca7a1ad9d57b750e40b8942b7987a4a93d97b1f1ba9774a64f2b16e7c49fe7ae5fb4978d7aca3c481431ff333d508ed36410
 AUX cmake-unused-command-line.patch 875 BLAKE2B 3f86d8cd5977504e89d09948120a09a152be54a5f705c3a0e44b35bb26610750f526e5dcff2f781215a66be3b3a1fba0be797187972adcbfacf41c5835d00341 SHA512 58278a26998f560f52b76bbc76bf4c2981464e2f5c8e13672c288b9eedd0944228ee104abb99422154ba23646135baabb8400344122ad13b1333156af73fea8f
+AUX transmission-3.00-openssl-3.patch 1136 BLAKE2B a9e2aa976145c8b08d05d464216695e6b0bd4f072f3d514e46840a0d5694ce870c6824a8c3ff3fb0f6178b3d7a54f3b0602518bed9980c18cf4c5abf1ca9b760 SHA512 aa184955ef483668690ffd3788a27bfdecd3968e331dbb8997b1fbfc6acda604bd7087ed49a63607128c61273e8177e8cc6d73d2b9aad88e5b8977ebbadb459b
 AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
 DIST transmission-3.00.tar.xz 3995080 BLAKE2B fb1be44aa630e6a1cf15511ab4ab40156edb16f9410b83058c53548f466fb9502c23157756a29e921e4468db1ebac7832b755cfcf98451c663c64401559f5498 SHA512 c8fb96086ba4b18f04d6181a29f6e2af85864840c533f3470a202dfa686e9431caeccd25f12c975a9a8f9b7802ca0bd73c4edc1ca06bdbada682326cad188a76
-EBUILD transmission-3.00-r1.ebuild 3221 BLAKE2B 2f1e00ac4ed9b4ea681b34a7cb96d26ba0838f6d179bf83df3bf456cb4e97332e8298c160d6be3df76aced2aa70f36e9580766e6a2ced7533fd47b999f3b968e SHA512 6f87a0be3c0d505b0123dddf18a0ef90a604dc8c7b633cc950351df2a3f43050f1c2640057f563360128b58dba48eebe58ae1d06be16697b254bce73d0e00f34
-EBUILD transmission-9999.ebuild 3247 BLAKE2B e4824817f5af0ea78a4e7626266635c92df57fef96ba49ab710b1bf6add660c44f666efd21d32f8b92d3fda58a1c7df5ae8eab3cbca11c98768b16844be1ebc5 SHA512 f73f427ff69261d1acf92f612146b4772b9014478c3522ec1b2082276edf2a549d73dc6fe4adadb31c75a8c0b67849132f74a3f9ab3314ceb82498c620efa77f
+EBUILD transmission-3.00-r1.ebuild 3202 BLAKE2B c093e0c41e133eb3e160e000aa11a1d770838c8854487eba439dd14f07ba426eda023b051102cf0df12b9a9bcdc4f4b6a1f492d4d0ab5c82d99d615f243bcc74 SHA512 4b01a479eb014d6fea216531bfaead80e85c911c5edabc33ae4da1cfc638303a76cf2856c2b744c5d2e1752b4ac770c83464fda5807b3fb6eecca872a47c8513
+EBUILD transmission-3.00-r4.ebuild 3226 BLAKE2B 04fd2f070ebce9d65cc8974881d7a1d429aecc13154f84924bfdd621241109ab4f7355e1712468157d09fb462d8aae8899eb2ff9bbd8c4d0740e208bf50bd9b7 SHA512 44d8084d18275708b774b15706eaba29be35cdce8dc1e71495801050540ebb6ecfb385ea0d8ac3ff2c2eac46587dcc7da09c4e0d35ac50f8fdcc8efe2e0e0dc4
+EBUILD transmission-9999.ebuild 3304 BLAKE2B b79c9371aceca10fe011a3c1e627c23e008eee02eaab1946cbaa968146022ddeada4bda8d6888120e033ed0c30c6df93f48ca6aa74d06ff18652885ededddaf6 SHA512 9ca215784353b02b2441cc6d860faed16cf30f9453df6f5703eae56b0bab75dbc807a8aec8fb17e56545148a925c7ca67a7fcd4b8adc43a0d215f4684cd3e00c
 MISC metadata.xml 564 BLAKE2B 708f42109f5c57d776242ad935684b78a7f6cc72c439e2bb76d2fb29fb770f5054c6765df0665244c650bc930eeb312957f4749967a9b2771b8a6d032767d3b0 SHA512 22f2e75b57b24f1367cdcfe28600cfa09dab9d741ff1ab84a25052dc455272b9d9d6d62d297bdbd23e9955d41cabb540f0348c0554c465371e81175525be1ddb
diff --git a/net-p2p/transmission/files/transmission-3.00-openssl-3.patch b/net-p2p/transmission/files/transmission-3.00-openssl-3.patch
new file mode 100644
index 000000000000..f288298cbf3d
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-3.00-openssl-3.patch
@@ -0,0 +1,37 @@
+From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 15 May 2022 10:54:38 -0400
+Subject: [PATCH] openssl: load "legacy" provider for RC4
+
+---
+ libtransmission/crypto-utils-openssl.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c
+index 45fd71913..14d680654 100644
+--- a/libtransmission/crypto-utils-openssl.c
++++ b/libtransmission/crypto-utils-openssl.c
+@@ -20,6 +20,9 @@
+ #include <openssl/rand.h>
+ #include <openssl/ssl.h>
+ #include <openssl/x509.h>
++#if OPENSSL_VERSION_MAJOR >= 3
++#include <openssl/provider.h>
++#endif
+ 
+ #include "transmission.h"
+ #include "crypto-utils.h"
+@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle)
+ 
+ tr_rc4_ctx_t tr_rc4_new(void)
+ {
++#if OPENSSL_VERSION_MAJOR >= 3
++    OSSL_PROVIDER_load(NULL, "default");
++    OSSL_PROVIDER_load(NULL, "legacy");
++#endif
+     EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new();
+ 
+     if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1)))
+-- 
+2.35.1
+
diff --git a/net-p2p/transmission/transmission-3.00-r1.ebuild b/net-p2p/transmission/transmission-3.00-r1.ebuild
index bf200a7a2c74..0c0ebb69824e 100644
--- a/net-p2p/transmission/transmission-3.00-r1.ebuild
+++ b/net-p2p/transmission/transmission-3.00-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
diff --git a/net-p2p/transmission/transmission-3.00-r4.ebuild b/net-p2p/transmission/transmission-3.00-r4.ebuild
new file mode 100644
index 000000000000..6065a88c228a
--- /dev/null
+++ b/net-p2p/transmission/transmission-3.00-r4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 2006-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd xdg-utils
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/transmission/transmission"
+else
+	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="A fast, easy, and free BitTorrent client"
+HOMEPAGE="https://transmissionbt.com/"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT="0"
+IUSE="appindicator cli gtk lightweight nls mbedtls qt5 systemd test"
+RESTRICT="!test? ( test )"
+
+ACCT_DEPEND="
+	acct-group/transmission
+	acct-user/transmission
+"
+BDEPEND="${ACCT_DEPEND}
+	virtual/pkgconfig
+	nls? (
+		gtk? (
+			sys-devel/gettext
+		)
+		qt5? (
+			dev-qt/linguist-tools:5
+		)
+	)
+"
+COMMON_DEPEND="
+	>=dev-libs/libevent-2.0.10:=
+	!mbedtls? ( dev-libs/openssl:0= )
+	mbedtls? ( net-libs/mbedtls:0= )
+	net-libs/libnatpmp
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.16.3[ssl]
+	sys-libs/zlib:=
+	nls? ( virtual/libintl )
+	gtk? (
+		>=dev-libs/glib-2.32:2
+		>=x11-libs/gtk+-3.4:3
+		appindicator? ( >=dev-libs/libappindicator-0.4.30:3 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtdbus:5
+	)
+	systemd? ( >=sys-apps/systemd-209:= )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? (
+		virtual/libintl
+		gtk? (
+			sys-devel/gettext
+		)
+		qt5? (
+			dev-qt/linguist-tools:5
+		)
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	${ACCT_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/cmake-unused-command-line.patch
+	"${FILESDIR}"/transmission-3.00-openssl-3.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+
+		-DENABLE_CLI=$(usex cli ON OFF)
+		-DENABLE_GTK=$(usex gtk ON OFF)
+		-DENABLE_LIGHTWEIGHT=$(usex lightweight ON OFF)
+		-DENABLE_NLS=$(usex nls ON OFF)
+		-DENABLE_QT=$(usex qt5 ON OFF)
+		-DENABLE_TESTS=$(usex test ON OFF)
+
+		-DUSE_SYSTEM_EVENT2=ON
+		-DUSE_SYSTEM_DHT=OFF
+		-DUSE_SYSTEM_MINIUPNPC=ON
+		-DUSE_SYSTEM_NATPMP=ON
+		-DUSE_SYSTEM_UTP=OFF
+		-DUSE_SYSTEM_B64=OFF
+
+		-DWITH_CRYPTO=$(usex mbedtls polarssl openssl)
+		-DWITH_INOTIFY=ON
+		-DWITH_LIBAPPINDICATOR=$(usex appindicator ON OFF)
+		-DWITH_SYSTEMD=$(usex systemd ON OFF)
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
+	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
+
+	if use systemd; then
+		# Service sets Type=notify
+		systemd_dounit daemon/transmission-daemon.service
+		systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
+	fi
+
+	insinto /usr/lib/sysctl.d
+	doins "${FILESDIR}"/60-transmission.conf
+
+	if [[ ${EUID} == 0 ]]; then
+		diropts -o transmission -g transmission
+	fi
+	keepdir /var/lib/transmission
+}
+
+pkg_postrm() {
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postinst() {
+	if use gtk || use qt5; then
+		xdg_desktop_database_update
+		xdg_icon_cache_update
+	fi
+}
diff --git a/net-p2p/transmission/transmission-9999.ebuild b/net-p2p/transmission/transmission-9999.ebuild
index ba7fb0024bd0..d5a07df0a9a8 100644
--- a/net-p2p/transmission/transmission-9999.ebuild
+++ b/net-p2p/transmission/transmission-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/transmission/transmission"
 else
 	SRC_URI="https://github.com/transmission/transmission-releases/raw/master/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A fast, easy, and free BitTorrent client"
@@ -44,14 +44,14 @@ COMMON_DEPEND="
 	!mbedtls? ( dev-libs/openssl:0= )
 	mbedtls? ( net-libs/mbedtls:0= )
 	net-libs/libnatpmp
+	>=net-libs/libpsl-0.21.1
 	>=net-libs/miniupnpc-1.7:=
 	>=net-misc/curl-7.16.3[ssl]
 	sys-libs/zlib:=
 	nls? ( virtual/libintl )
 	gtk? (
-		>=dev-libs/dbus-glib-0.100
-		>=dev-libs/glib-2.32:2
-		>=x11-libs/gtk+-3.4:3
+		>=dev-cpp/gtkmm-3.24.0:3.0
+		>=dev-cpp/glibmm-2.50.1:2
 		appindicator? ( >=dev-libs/libappindicator-0.4.30:3 )
 	)
 	qt5? (
@@ -91,11 +91,15 @@ src_configure() {
 		-DENABLE_WEB=$(usex web ON OFF)
 
 		-DUSE_SYSTEM_EVENT2=ON
+		-DUSE_SYSTEM_DEFLATE=OFF
 		-DUSE_SYSTEM_DHT=OFF
 		-DUSE_SYSTEM_MINIUPNPC=ON
 		-DUSE_SYSTEM_NATPMP=ON
 		-DUSE_SYSTEM_UTP=OFF
 		-DUSE_SYSTEM_B64=OFF
+		-DUSE_SYSTEM_PSL=ON
+		-DUSE_QT_VERSION=5
+
 		-DRUN_CLANG_TIDY=OFF
 
 		-DWITH_CRYPTO=$(usex mbedtls polarssl openssl)