gentoo resync : 08.01.2021

17 files changed, 62 insertions, 191 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 587c45f24e79..34d819887287 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index e3d652275f06..c12fd7c8d5ca 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,7 +1,7 @@
 AUX ktorrent-5.2.0-fix-start-in-systray.patch 769 BLAKE2B c9832a15f75bd5495fb59e2521bb82e0bb0fe530d3132ea52147c8dc531162f96e165011fd7f61fc046a4d5dc7e52ca1a9be74a0790b0b2b62ca968bd8c9d45d SHA512 67b9ce967fc295ece3607f909f80cf1362fdd88d7172c9ec556275fab2019d016440b9f605a49e50eb0fd82f7c7c0bc3b78195204215630aba0d848df6d4ba15
 AUX ktorrent-5.2.0-taglib-linking.patch 8105 BLAKE2B 232c167489c139973b1c57cd2330c4f27c5878843593ecfd3c5020384f5bf891c06ac21c0a5644d0881cf846ed712441e7501f560a711b8d4e72481599cb40d6 SHA512 4dc3d63e07c8f8c56019ab95230dadf3e9fbe37eb7d7f9ed31e58ebca9219b47e6bec78049e36ce1b783620b82b386e71ca9fc1d6bb797e56ac521daa5f0d996
-DIST ktorrent-20.12.0.tar.xz 2140524 BLAKE2B bfcdb8aa872dd4f974334bef2cfd794fc667dc08c270fcf0fae369e1ce6a899ad57105e2bdfa307d749b15aab928c8aa5ebac3fff17ccfa512aba39e92822f75 SHA512 bdfa0a67756169625668b2b062c9e4b980127923f7ce45ce7b47201bba9a6278c88f7a51be93055bcea0d21afeabc0203210171d996749c98e1f0662e26ff76d
+DIST ktorrent-20.12.1.tar.xz 2141692 BLAKE2B e23d1f679744121ada8ca1c612139983f0baf6011d28d2f0872a956f0fd5072de4d382dd0cc5d6052f9954fe9b962bdeecd4b98fcf832ccbbbdebe89106ebae7 SHA512 8ca993a9b34ea138b27f8afea91394763b48da2679e39a1a7b0f02ea2ee198c6a43a76b23b47d477fd5310e6c6e248a9f823fc73be3e34aee1b941e5c29b2c35
 DIST ktorrent-5.2.0.tar.xz 2056012 BLAKE2B c59cb34675b9c4e023b6c22f795bf146d64acaea069efa1f1663888a0ada6f7c8328a15bdc2fc453e31a9f451c6b0203dfdfd02098cc52f5d828b87c23d857b5 SHA512 141976612cfe6bf4bd06e96842d7bc51ced7a3ab8e13c25446a00c031054698f851fbb1a31f3425dda5a428408bb1ceb51a4a420eaf2e79193b17a0cc7d7a387
-EBUILD ktorrent-20.12.0.ebuild 3093 BLAKE2B 49e08a51826b81bde16d861d3d9d884e9b420c54965a20ddf1aa9fe5ea45b36d5afcd709aafbdead1004f2ac4091687024a042555b45e930a5edae9ca81423e5 SHA512 4d39094bf9cb70d0865da7eb781fae57e1845cb13700d5133ea4bb4cfbecd67b815d2a7631cd7577eff49ae2d222a1b868c431452913717c71132ca1604030f6
+EBUILD ktorrent-20.12.1.ebuild 3093 BLAKE2B 40f400fa742cec982e1503108af2c791d8a8178c433247834de6a1063f845aac408d0101e4696778708044d1ded72c1bb79a2c056b3275d0084201a8c49f0dc4 SHA512 9d2de1e2a251c6a3f68f53729260186d305e26cdaa3b2b9de18b2f942cf7b941441d8e7e8164db9de82c1eb70eaf03df9d60fae49a570a6d3435c4acba569005
 EBUILD ktorrent-5.2.0-r1.ebuild 3323 BLAKE2B 5ad47003adf805cc00c62ba4e64ef92ff5e8f65dddd7024478500d5805725ca5c73688c9990662cdccc2512899efd46e4f3f74bb32c6d75317c0ce32cffd4652 SHA512 ecaed570927d6181dd2cfa41a5c0dacafc65252f72e628b64b99a31cd2a0a179e3adcabab3c42b538ed014e5be45801d949edb86188dbfd80354983cde144457
 MISC metadata.xml 1389 BLAKE2B b928cdf2526433fcf48c5600049b27c9f7c12aa043a332931b5a567d1baff9fa0bb0ac6e4e8de056947637d1253ee338a8b6620e52b294b20cdd7127a3b1c81d SHA512 4cf5204afc5a9f451752efcf1bae64a947c3bbb0d259641a85771071a7c390ee50818518a15c38f47f7778cdb3ff10732428dfff3c99a09049ca8c2486736991
diff --git a/net-p2p/ktorrent/ktorrent-20.12.0.ebuild b/net-p2p/ktorrent/ktorrent-20.12.1.ebuild
index 627b5dd09646..add529cb19f0 100644
--- a/net-p2p/ktorrent/ktorrent-20.12.0.ebuild
+++ b/net-p2p/ktorrent/ktorrent-20.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-p2p/ncdc/Manifest b/net-p2p/ncdc/Manifest
index 7245e1ce7c42..bf0e4b8099df 100644
--- a/net-p2p/ncdc/Manifest
+++ b/net-p2p/ncdc/Manifest
@@ -1,7 +1,4 @@
-AUX ncdc-1.21-tinfo.patch 1502 BLAKE2B c7194f78dbf410ee5a3886277b472792808279fab2f957ea8dd8783b91f1520f20eea19acf3a302b59214de186e695852d370b4733bccc36f77febcc66914371 SHA512 1f66c98230d56331782c592ec61b55aa66ae375de1d2a6b6fee3449ac8ff07b9d2d55af01c8fd72848cfe166fba306bbd836ee7fceb743142e63520f9a09f6d4
-DIST ncdc-1.21.tar.gz 370452 BLAKE2B 55ee9943a7adec4c60d17a8782ed9b2337796c0875c3c316e4f1627015520c5b8b23673b183a0f1d7e4c7a367eac5d908fb30e6b2d08caa324d19caf93efc7a4 SHA512 de182e190e3fb26451aad403975ec232b14ce908633cb2d9713582e2af8555fb55e2ea7de160b5b7faa05558f25dac0700dabbf5b7d1acd1aaa26d1bfe033c0c
 DIST ncdc-1.22.1.tar.gz 371572 BLAKE2B 22125062a42f77e8a7a8afc699523b27a2b7ec566891676ca13b415e93cdae8e2d8d38f303070c7f098408f537266404a875b9ed7f9931a39933916a0ba576ab SHA512 b084ee28a799705009600c450016719ebb992cb0bf7e026513f4cd7e93b2566e7bf8e352eec92f3d69612ce06c930587759d7f7d20d14ee9fe1d5c4b8c4393af
-EBUILD ncdc-1.21.ebuild 1016 BLAKE2B fc854ff462693ff026f5a84260e5151b795cca9e6edec9ce35da42a7d1060afeff6300213319f7412cd7da0f38b9890676975af1293bde9b1ada304c32f97778 SHA512 18b165b824a7c985b0ace337b784fd24a280f90719b3cd0b64b223d4d8da245910ee584f15411edf5d98728246aa2dcee17d38bbee1bb18cabfea24630936f92
-EBUILD ncdc-1.22.1.ebuild 993 BLAKE2B 7487f8aa5054cc5129a8047f7fadfe6d287607f5c8dc7eb8f0361a8334e28f3d511cbce7f12d9b4f1fcb7d9b03767bf9209f11aa507fd90ef672dd4cfecb5ad4 SHA512 8bf0bae2db3872eaadd57a79893ed58c8946e7cbe0f3d15822bdb6005d7f9264ab4745c75fd757698363e1cfdd56bea173fff6bcbc0bd56a21a8678f56fb125f
+EBUILD ncdc-1.22.1.ebuild 991 BLAKE2B baf7f6ba1c99d50bf3c06c2bb6ae6cbf538869406ee191390494e5eaa1b657abb03eef505a940c79eb57d550f4fd93ea645f756f8ce73b89cc20150299de47ea SHA512 b245637d25cb644e7ddc5bb9613f59cdb24227c5fd87104a49a9355b4311e883465e87e24dcf4d65cb42bc0b940d19a8d903979234e94443c1b819f040f37311
 EBUILD ncdc-9999.ebuild 993 BLAKE2B 7487f8aa5054cc5129a8047f7fadfe6d287607f5c8dc7eb8f0361a8334e28f3d511cbce7f12d9b4f1fcb7d9b03767bf9209f11aa507fd90ef672dd4cfecb5ad4 SHA512 8bf0bae2db3872eaadd57a79893ed58c8946e7cbe0f3d15822bdb6005d7f9264ab4745c75fd757698363e1cfdd56bea173fff6bcbc0bd56a21a8678f56fb125f
 MISC metadata.xml 458 BLAKE2B b26f2357e1b243dd7425edb1ac7a7bd3fa253a713e969c6f7387e79b24f4a31b7105920f0552437c48d33ebac806ddd5f1d3ec44fa21a500254ba1e33505c828 SHA512 737260611d6d3a7562eefd1ad477616572d1ce6b5bc2ab67b0685c7c8c09efd0f274da5576eec24fa714547b062232d7030e3d946bfaa94fd9db7eae271976c1
diff --git a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch b/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
deleted file mode 100644
index 0e5acac59d50..000000000000
--- a/net-p2p/ncdc/files/ncdc-1.21-tinfo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 16466392884a623fd93907f4d1071211e8ba48a4 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 8 Apr 2019 13:58:42 +0200
-Subject: [PATCH] Fix build against ncurses with separate libtinfo
-
-by using PKG_CHECK_MODULES instead of AC_CHECK_LIB
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 20 +++++---------------
- 1 file changed, 5 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c774316..d0c0430 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,12 +30,6 @@ AM_CONDITIONAL([HAVE_MH], [test "x$have_mh" = "xyes"])
- # Check for header files.
- AC_CHECK_HEADERS([zlib.h bzlib.h],[], AC_MSG_ERROR([Required header file not found]))
- 
--have_nch=no
--AC_CHECK_HEADERS([ncursesw/ncurses.h ncurses/ncurses.h ncurses.h],[have_nch=yes])
--if test "x$have_nch" = "xno"; then
--  AC_MSG_ERROR([Could not find a header files for ncurses.])
--fi
--
- 
- # Check for posix_fadvise()
- AC_CHECK_FUNCS([posix_fadvise])
-@@ -95,15 +89,11 @@ esac
- 
- 
- # Check for ncurses
--AC_CHECK_LIB([ncursesw], [get_wch], [
--    AC_SUBST([NCURSES_LIBS],[-lncursesw])
--  ], [
--    AC_CHECK_LIB([ncurses],
--                 [get_wch],
--                 [AC_SUBST([NCURSES_LIBS],[-lncurses])],
--                 [AC_MSG_ERROR(ncursesw library is required)])
--  ]
--)
-+PKG_CHECK_MODULES(NCURSES, ncursesw,,[
-+    PKG_CHECK_MODULES(NCURSES, ncurses,,[
-+	AC_MSG_ERROR(ncurses library is required)
-+    ])
-+])
- 
- # Check for zlib
- AC_CHECK_LIB([z],
--- 
-2.21.0
-
diff --git a/net-p2p/ncdc/ncdc-1.21.ebuild b/net-p2p/ncdc/ncdc-1.21.ebuild
deleted file mode 100644
index 33a396fa7dc8..000000000000
--- a/net-p2p/ncdc/ncdc-1.21.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs
-
-DESCRIPTION="ncurses directconnect client"
-HOMEPAGE="https://dev.yorhel.nl/ncdc"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
-else
-	SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-	KEYWORDS="amd64 ~ppc ~sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="geoip"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	net-libs/gnutls:=
-	sys-libs/ncurses:0=[unicode]
-	sys-libs/zlib:=
-	geoip? (
-		dev-libs/geoip
-		dev-libs/libmaxminddb
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/makeheaders
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.21-tinfo.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with geoip)
-	)
-	if [[ "${PV}" == *9999 ]] ; then
-		myeconfargs+=( --enable-git-version )
-	fi
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/net-p2p/ncdc/ncdc-1.22.1.ebuild b/net-p2p/ncdc/ncdc-1.22.1.ebuild
index 8377b413dc10..24e91e7af127 100644
--- a/net-p2p/ncdc/ncdc-1.22.1.ebuild
+++ b/net-p2p/ncdc/ncdc-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="git://g.blicky.net/ncdc.git"
 else
 	SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+	KEYWORDS="amd64 ~ppc ~sparc x86"
 fi
 
 LICENSE="MIT"
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 2bbc841458d6..8e7b6c65f8a2 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -1,7 +1,9 @@
 DIST nicotine+-2.0.1.tar.gz 5140065 BLAKE2B 01af7eb58ea6800c17042ef73b9caa8b3d5712e33226486e648fee824c0d0934440ee51f659199a5276f6a460005df89359b282b09aa07941c70e29bddc97a26 SHA512 0a16c0c289a4f4d54eba773ad40952baadf73333ea4a6b4a4524cc500d007f6de0bdd7a847e3f68978a3247c9bc4a6eab3b77db34605fda79da34c352e89a1b9
 DIST nicotine+-2.1.2.tar.gz 5091941 BLAKE2B 2fcfcc25645a194e1161502c1836d075732a833e1cca1f16cb939e960371c9a656c0044427ca381e8fb3d76de139af1f495b3c5ff208fe931571cfbe5ab0d219 SHA512 dc5ae656cb24efdd252475eefa63d471e44f9652650ca834acb358c195337c46c07ef5da873419d66235a8fbb3d2e290347aa47416c0017bea54423b485225c9
 DIST nicotine+-2.2.0.tar.gz 3382047 BLAKE2B 64e83aee32f16ff8fcd298a4f876eca1903a37879918bdf3d1e4684d17b1815caf991ffc0264273fb3b84ab77a300382050039b3c5977a38d1e94ba060f7b58e SHA512 1a3aa24fe09564dbd2cd454e081eb5198279a968a4ab8df0b7f42ea1da63b24ac28ea4000fabf4cf00c6b37d4395b927321d27c1502de3447001285d0c942439
+DIST nicotine+-2.2.2.tar.gz 3373462 BLAKE2B 6dbcf4e9d7f85bb2e03194047c8ca9c374ae762967414d888e764e84b25682148245cf84c27ab967279f4ac5e3bad680a7920d3da7896e61d12413194c9ad207 SHA512 5d863b94d1a899701f3d6cd98d875a4ca782778b00d77fe3c490af59168592011a83f823feac6c0e71bdd4c5cfd743e023066d542d8778b68854344b73c322a1
 EBUILD nicotine+-2.0.1-r1.ebuild 873 BLAKE2B 077b529f6a880d238122952fc0d49cb75cfc5742bd533d650f12c5a96c85efd7d3786fea0ca71e40f1223db37f8f0841ad43766190c447d3f2a55d5f9c4ed9aa SHA512 42b4d6da425430544e42027afe647da0a1b6c556fb3513b032fce0f2fd794c55a85bb709019c2bf085ba1f84f37c485cfb73574ab818fc7a7be45c72d4d30d6f
 EBUILD nicotine+-2.1.2.ebuild 912 BLAKE2B 26b89d4276aa9f49c6593fc40392f0d3f6d00d8abe6559e480004c4de5c04de7994cd63a152d099bee44b5610f6f9f5a16edc6573224b58d7446a41a453ca3d1 SHA512 080960a43cf346a13e78d67e9bce1a91b6be329ebee2f5bcd762f1ff2562def006145d0ea89e6fc0cf8e12c3851cf6bbecfb342c6c598a45927237d1a82a3250
 EBUILD nicotine+-2.2.0.ebuild 917 BLAKE2B 9737d9bd4e24ecdc7d036cf56964f6c16a4846b07a2408f1e028a9f9786ee9be405131a17e0a804416955058a41b73be0f8531ff7d4eae6424e79dafa1338c3c SHA512 3b4bfc2310d8b32ee88f88f5fc7adb78fed2875bd27b6853e7054a1bf2f900a4cdebee86ea7ce08b1cc57007282da9de8041d99aa3117329494558258bd513de
+EBUILD nicotine+-2.2.2.ebuild 840 BLAKE2B 4c1a16f620db8656b3c74a57425368efc111b18f3171ad98a5b891216737b96ca328b590aacd24afb60bbc356b6e7fa3fea164c07f8474f6da8ae9506279b2c2 SHA512 0e7b479f78b315ad7ab215ddd6482bfb198d4ec249b8b67253110db11a62ada6e49c3160b4724b8cf2039e3f69429f6f7266c758a862cd3ee8b0804d9ea5054d
 MISC metadata.xml 344 BLAKE2B 3e990579dbb468a2dc76bf5ea791367f8009fd3a21508de4ec40e7cc5d4ddca825488a139a63f7424a05e92246ed7e8d193eb6d2aa58a68244169ae77f588472 SHA512 a62b54ffb9368e5a5aa8a119146ae5330797ac7034b1d403bed87550b976daa25bcc7d68b2089122f287c8ecb1ca3f3679609eee3bfac518abbd251545adc3f2
diff --git a/net-p2p/nicotine+/nicotine+-2.2.2.ebuild b/net-p2p/nicotine+/nicotine+-2.2.2.ebuild
new file mode 100644
index 000000000000..7ed3e7ea3cba
--- /dev/null
+++ b/net-p2p/nicotine+/nicotine+-2.2.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A fork of nicotine, a Soulseek client in Python"
+HOMEPAGE="https://github.com/Nicotine-Plus/nicotine-plus"
+SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	${DEPEND}
+"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/nicotine-plus-${PV}"
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}/usr/share/doc/nicotine" "${ED}/usr/share/doc/${PF}" || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-p2p/opendchub/Manifest b/net-p2p/opendchub/Manifest
index 2aab4195b9fb..7ba0b797d7cf 100644
--- a/net-p2p/opendchub/Manifest
+++ b/net-p2p/opendchub/Manifest
@@ -1,5 +1,5 @@
 AUX opendchub-0.8.2-telnet.patch 380 BLAKE2B 96cbc1c6a98c1cfae6b4ccaade25dc063658c74ff2277ec772772c087503d88bb62affd8afb9824b6eeed3b2386a715c2ed3566c2ef1ecf48b3825a06278bfce SHA512 3ccbc970544c37f545dde60286ef575160d9d4bda047f5e33b57f9e332d854dab51cb34dba7f253524a1cc87086c6034940bd1250a30af26099944d99c67d271
 AUX opendchub_setup.sh 556 BLAKE2B a09a961a7dadde775fb066c15fa665fe70faa86af66547f312f780f0c86ff7428e5984618a87aa676b0c4380049e16b3d9c682af5033737dfcd26cae52932df4 SHA512 392b0cca686b8a8ba43eeca43b109616ef29af38ffec1ae02e0a10fb45986a3f6141485dca708abe103080b9a38c867b0120bcf9cd83deb8f6c220b919ae29eb
 DIST opendchub-0.8.2.tar.gz 188551 BLAKE2B a92be519386a6582c955b9b4bff9c6accff700bc3707935004cc7312726c28d026965046aad27a2dbef1005e514c47f6f61d9de86ad69e5ee3a705be8c94a4be SHA512 ccb8c5c44ee1e2f4704d681a2f4e0f9fe4035f1984744ca40665abbaa41e8faa7a03b96fe39ca47c9683b4f64b4e833c186681090ac80d82202e7f68e6cb52df
-EBUILD opendchub-0.8.2.ebuild 970 BLAKE2B 5b3d1a9834d60025a1171866e6742fd04cb3dec469d7f1c6e182661effaaef5e113d0b30e077ac39ae4aaec375c7c723ff0389601fa63b4272685464ff1fe79c SHA512 db425a503b5f35259ece3d7078c644568011026f22a9c6fc19a47c154ad54dbd34448f77b4fb8f83e9102f04b795d636745eda9584db9c8b5f5479896d2cac8d
+EBUILD opendchub-0.8.2.ebuild 1000 BLAKE2B 328e0b9d5946629c07d8642ccdbcc1f92e8fc43b633bccd7ed137421273cf1fd8e6da1d3e4bad2abacb46a4cedd44680bc8066bfef31dce57f27bb0ac0a7adb2 SHA512 7b7ab262287bc68400740a80576a91b95c2768924c0ea460ca06397bc1787cc8db16baed1516395e5b26d727c835c3e48253e944fbf6c49530068951b6a3733d
 MISC metadata.xml 251 BLAKE2B 68b20d7614882b61a212114e934513c1cfebbdbf3770c7d8e27ab72f3063da648b085ab138f7ed2221f352d34cfac07ca76f50eb73cc28945d3368d2261fb007 SHA512 9c335c29aef545c47822fa6c48c188e1e5f9ea1125253518078dce88639a828cbe0d6c0a7c5bfc38a662753dbb468d0fef17be88877890335e7320f44e509c62
diff --git a/net-p2p/opendchub/opendchub-0.8.2.ebuild b/net-p2p/opendchub/opendchub-0.8.2.ebuild
index 2fd66e533b52..0e6df9059519 100644
--- a/net-p2p/opendchub/opendchub-0.8.2.ebuild
+++ b/net-p2p/opendchub/opendchub-0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit autotools eutils
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="hub software for Direct Connect"
 HOMEPAGE="http://opendchub.sf.net"
@@ -25,6 +25,7 @@ src_prepare() {
 }
 
 src_configure() {
+	add-flags -fcommon
 	use perl || myconf="--disable-perl --enable-switch_user"
 	econf ${myconf}
 }
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index 0b4e37b2787f..2d705c7ec2cf 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -6,7 +6,7 @@ AUX rtorrentd.init 871 BLAKE2B 3f83e6bb52044e293127aaf7ae505c1dc6422698360537edb
 AUX rtorrentd_at.service 308 BLAKE2B 2aac1f49a25d35136db25a13c08d1847d21701272d56a6ca06eee6a8426719c340a041568cc1d575fae341a49fa1f53a132ba11ff73180b1bee246197d8119c2 SHA512 cc707500af2dbb0cc0c8297512807f9312445cf70de00bcf2f7267388834f1d0454eaaa9a8b52387e5f84288400286414225c55af0f560f61a8d0858971a8615
 DIST rtorrent-0.9.7.tar.gz 610149 BLAKE2B 3f1316b0142dade9662630ad40132c5968d7b0ded32d7ae13d1ec1fdb7fec794812203fece367bf6abfd02212ed94d308046d40eb3e7562c408e8da13b23c23d SHA512 e663bd8984bcec91868beaf16d215708bdea8872338365ba6a05c9ea830b2aff045257bbc8bd0414d84009ee85852822c97bb073dfb41c21e3b0081ecaeecc00
 DIST rtorrent-0.9.8.tar.gz 647523 BLAKE2B 3562ed03dee3baa4a702d20c7c91b9248d9de0f25d1f8cd182863101f293a0ef13cb49164e4d16b25e72a4fbe1cc1a2fbde176d3068c749edbcb2287ef260b2b SHA512 016685948d0290694ab9635ae218c7acd876e6d45bea1bdba3a29c545e64f5d824c5e2f6693a4c2e9200196177881d54f312d72e0a19742bd74a03bd19ca05c7
-EBUILD rtorrent-0.9.7-r1.ebuild 1904 BLAKE2B 11d517d63d3c2f6ee14a6b20a2b5f9d18f82e35989f0c98aab345c2a69da11f30c2f83f1a0294d5f31c74dca946e0745a54218901f143d2b18520c7388d917df SHA512 c7af7a5f7d64969bf8c3c72524664bf4d4d9a661c5431ddd1d4545330cf68af323431b71745bbe411974b9fcda8bf6d7d07607247c821e1f0141425d14efdba0
-EBUILD rtorrent-0.9.7.ebuild 1854 BLAKE2B 25515629843a6d9a927c639c09aaf500d22659d2dd5ed8ec8c1afe5970e9c16220aad1214bbb2afaff2ecfe7e37739eacf3f5d5a048f58368343c4992ff0300d SHA512 804454f0ab73c5eda1d8988119a0a4643ef6c14caae5d7407a01ad07c2cc657c12466c38f1d947e406c83418b927024f7f51f387d038aed8c676c415bb2a8fce
-EBUILD rtorrent-0.9.8.ebuild 1777 BLAKE2B e0af7257bca0927893bfccaea14d700afd444d1acb4a0fd66d5350cd3a015f44ee3fcf9fe1386e357dfc02253943fc659a54e58d400a899ab4a0da06d30ec045 SHA512 782d80641d9a9110c97c260271e3bfb7c22e5b7389b42e8e59c4403b9f3942106bc20625f10fe014375adea9bd818b23da53c62611a5887dbf5b16ebedb9cac5
+EBUILD rtorrent-0.9.7-r1.ebuild 1893 BLAKE2B cf0a16d4c9547ada31a1297fad23f65f7865e08842281a32d178c4beada790bdfe717dc193a0d7d09ec7d95cb0bc5478381a069a5c29df8e269b88f8d224dd36 SHA512 89063b232670f661643c7534dc4b122217d5bb5bf39a4516eb3be0f1357617a0f15bc847a4df41e7fccd433c4237c260a66778d02fa6c042adce21310fd25a31
+EBUILD rtorrent-0.9.7.ebuild 1843 BLAKE2B bcb4bbfd122212f1f8a17d0a3d1b514dc71da3e72a855272555c871cb0e955ee8151e8a044ab92ac109c402cc4856d032ced0c7e25ca4b07ae5ea1c28b670b79 SHA512 5f6576c0a3731864e81bef9fb884647c3def4941c6308c1193ecea7094d2a6cd8e8a620a037c1b01f2b359e9ee6c3a55b60c23b9927a46c4bef030d4d1f23816
+EBUILD rtorrent-0.9.8.ebuild 1766 BLAKE2B e1e69c53f546f53dac9bed54f2bab9d3b59f8650a58ae4a4e3bcbff2fd30bd016adbdcd025b47170a07aa4ee15c66b563f6164ae15cefa673ddd2989cf5900fb SHA512 abca852f08f1f905d3ce0dfd5dd78e25d3d35c79432890344a18a16e945912130093f44d3ca8dfbc86515e9b56b1de6b84fc0c85403b4327cbddd1f7c17d2c7c
 MISC metadata.xml 548 BLAKE2B 70665091f8888c495c4c2ddabd96b3e3157400dfa304ac15b219b8f87aeb230f335a89520d77588f66a40614c2a6de9b95aeb06d972b6b5d0538848d1047dafa SHA512 cd7f07fabdffee2de7dc3a2a1833a66d0bf6315763c0daf3995831f482b96a1b919f98cd077af0bce1361bc4fd1e316f679ad02f06e26882bce8869750d5e367
diff --git a/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
index d6c8d7ab36f4..b2501a16acab 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug selinux test xmlrpc"
 RESTRICT="!test? ( test )"
 
diff --git a/net-p2p/rtorrent/rtorrent-0.9.7.ebuild b/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
index 6eb4ec073f79..84fb4eb95fa9 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug selinux test xmlrpc"
 RESTRICT="!test? ( test )"
 
diff --git a/net-p2p/rtorrent/rtorrent-0.9.8.ebuild b/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
index 89c75bbe962e..9b0b9c50eb59 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug selinux test xmlrpc"
 RESTRICT="!test? ( test )"
 
diff --git a/net-p2p/transmission-remote-gtk/Manifest b/net-p2p/transmission-remote-gtk/Manifest
index dccd51e80179..4b786982fc60 100644
--- a/net-p2p/transmission-remote-gtk/Manifest
+++ b/net-p2p/transmission-remote-gtk/Manifest
@@ -1,6 +1,4 @@
 AUX transmission-remote-gtk-1.4.1-gcc10-fno-common.patch 748 BLAKE2B f22473d0f56a3cfbf207a1fa946d1095873a63582b65593d4758a583d7817b1b8d046af718f079543e2bf82453d7f21da128dba14608416e18f51ca78f65c28d SHA512 d2f762c10fa72b25dfaf0623a880f7694d405f933e3285b845c6f7ea416c745b1ee7bcbd686caf0381f61a547edddd82bdf50ccb415ec0c394059125983aaa45
-DIST transmission-remote-gtk-1.3.1.tar.xz 459260 BLAKE2B 3e1e184ce6fe0698996763419e5d8b1fc187d7c17ba42e9d75463d6b772bdde554fc1d4b6da6f19a936762b315caa0cea64c47e587d10c592402fb87a518cf66 SHA512 ce723d51f8f769e59fb539241996ff0204a654f52696963044f8535731cc2b8ec69cf454a15253f9ba214e0879498f3c19519b5b1b303273d667592887ee45f5
 DIST transmission-remote-gtk-1.4.1.tar.xz 543620 BLAKE2B dea556138a7f554a6cbe5c3e0d5bdd9057cb61d2d80e2d89beb96b2926218e19ce85759fd079375ba8896e185bbdec74979372a9413dc5c513204f47b93e4304 SHA512 c1a2c26d01bc2557bafae9baa370f713e0412ac8445e12b19e9b3027c1a269745dbb865195d683af397d43a2956f51aad8bdfcaff93e4f07015e33715770de48
-EBUILD transmission-remote-gtk-1.3.1.ebuild 1356 BLAKE2B 7e14191b28c54a9f773ad05ecc8a1bdd5d62704061657e319e4b5eb8da7b56bd1673b9923499d22848849faa05b59b1e8e8d6f4cfbb17caa35b2141b76f0dbb1 SHA512 c89c23aa0bbd750e614c81eb56c67df212b9ee66fd6f40a3c4276465a14aaff7defea205cb2acd8e39e29bcbfd7e7fa2bcd1cb3941e9eefd2203b9309e42cca8
 EBUILD transmission-remote-gtk-1.4.1.ebuild 1334 BLAKE2B 536071d1ae9ba0c7bf7e1418a9cc784c43577caf0edc6a3a8ac6346cfd466fca0ee9a97ccc98ef88ddd08ade36aa8b04d959fcc4b21b5d53a052bf76766891ed SHA512 9068003a0475c25b6391a30d58891ca2734fce87b8309f8bcb1cc0aa063a61f91db6406711ea2b83267ca4ca926abb34627489e02d6d4117015af9a2e8835e17
 MISC metadata.xml 493 BLAKE2B 91125c81c02f7249d6d99436f02900f5bb559ebdec3634d8c2ad3e341f9a98849dc051be6fc8c4ff4b77146a1f66977d04ce88588f4f0691322ece06e7bb8aa3 SHA512 722a8a74d8afcf72ddfbe0d092bef518da4ed2e146c6215736f07deac15bf159b5793548de2409a8dea6dda5b1ca033b4bce92b63e11ad7b290b4b8bc99fc45e
diff --git a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.3.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.3.1.ebuild
deleted file mode 100644
index bef684ca11f2..000000000000
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.3.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="GTK+ client for management of the Transmission BitTorrent client, over HTTP RPC"
-HOMEPAGE="https://github.com/transmission-remote-gtk/transmission-remote-gtk"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ayatana debug geoip libnotify libproxy rss"
-
-# RESTRICT="test"
-
-# FIXME: bundles rss-glib-0.2.3
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/json-glib-0.12.6
-	net-misc/curl
-	>=x11-libs/gtk+-3.16:3
-	ayatana? ( dev-libs/libappindicator:3 )
-	geoip? ( dev-libs/geoip )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	libproxy? ( net-libs/libproxy )
-	rss? ( >=net-libs/libmrss-0.18 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50.1
-	sys-devel/autoconf-archive
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	sed -i -e '/-Werror/d' configure.ac || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Disable overly strict appdata validation
-	gnome2_src_configure \
-		$(use_enable debug) \
-		$(use_with geoip libgeoip) \
-		$(use_with libnotify) \
-		$(use_with libproxy) \
-		$(use_with ayatana libappindicator) \
-		$(use_with rss libmrss) \
-		APPSTREAM_UTIL="$(type -P true)"
-}