gentoo resync : 18.12.2020

9 files changed, 30 insertions, 23 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 51cfa2c10413..8bfebcbdb352 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/airdcpp-webclient/Manifest b/net-p2p/airdcpp-webclient/Manifest
index 08b8c62b0eb9..09f6e0618572 100644
--- a/net-p2p/airdcpp-webclient/Manifest
+++ b/net-p2p/airdcpp-webclient/Manifest
@@ -2,7 +2,7 @@ AUX airdcppd.confd 198 BLAKE2B 7d3fbce6527a7f1971f544a37215fa73ed1f19bc5f6c4c3ef
 AUX airdcppd.initd 584 BLAKE2B 6e19d6088b26153527fa51e3789c3968647af3f7a2b1fbe2b355587b14eef94b8800a78565ce3bd54f0474542496bfd9f80566c36fcf6f1e51f55c48aa0654ee SHA512 f6de7a576eaef662e73dd488acd956371891278a6fa6c912be864c630a22435541deaca9055c6d7912bf483de228db2cd0bd9c9666a1a436de55112561783721
 AUX airdcppd.service 302 BLAKE2B 5e446eb4253c71648e8e6850da4d71e6f16bdb6d82b611882ba4b1ff755073ff611a5502f5f9dbfc94020610ccef9a022add2f85721d464cba94907320618e66 SHA512 79aa352d7943e5297835ec226142661f084a39bd8ccaebace8d4356db995e2eff7c77a9f04ee636bd50e61103bc5a30e83fa126ffa8d77ec068053da2c1b9508
 DIST airdcpp-webclient-2.10.0.tar.gz 963410 BLAKE2B 9cbc04d023d9478d48b177cfb457cdaff11a8079388078125ccecf5936cbac8e22aea3cddae9dd21b76b6d24d586ae4799bf2a8e67929d1134a2218a57aa9c3b SHA512 c80ec28198550846feda6d3dfd01ea0e0b402cab6753c1f7976df4bda0d8a8a2124d1ae7a437dbb15446665ec199decf897e49edd6aaf7f3983e7b7e7dc645e5
-DIST airdcpp-webclient-2.9.0.tar.gz 967670 BLAKE2B f10c4a44e724f178f55f79ca2a0711f29933a11112e18106bc12833d45971bb51867b00c6ef2a74f4c4eafaedbb7da47d7dcc97959d03794aeeb626ee727df4c SHA512 c0b6dc30aa5b2dbb40096b530c5cb7d5c46dc085b04e6277384d98ce9120988bd471a95995267def42323dafe0b99f760aba07f181d2211b27db20b31adad142
+DIST airdcpp-webclient-2.10.1.tar.gz 964433 BLAKE2B aa0db1c199e0546a35dddb7750ae9b2723afe09ab77a3ee17c02a1f592afc4075eab1017ea4114f07ee2e4d363aabfde510647f4e25569835312f120677cb1c6 SHA512 82a0ab406fa5861deea5be6a06682f2a756d3140ec85faf0cd1f9c5ddbae3a63acdad560f7196e7a25de0183e6647954ad7428fc327f81578a4b64a0e2ce088f
 EBUILD airdcpp-webclient-2.10.0.ebuild 1372 BLAKE2B d587238cf6b5e5970ba416d68aaa4e3b17f1160f57bd42db5a3f04a1370b27c516f7eec247925b82ad5ae58eb1bedb22c79cdef43f1c8b2370e18136f8d6bb43 SHA512 66ccc4ec8e94b5632eaf5bf632de02a2dc0078414b1dccc50696994450e8af7b4d80028d4109ae7b43a6c75ee3517924a5207c9e18897d80803a4582b6efb383
-EBUILD airdcpp-webclient-2.9.0.ebuild 1374 BLAKE2B 60939f3eb247d73a9d9f428d92743b5623603a61c55567910caa253d2789026fe29fe05fed70222f325ad21eb2c4a66e6783d0fd26b4d7eb157d47a390704d45 SHA512 abdb3ab03605fe5d5dee77c1ab08d43bfe071b6c9f25a3b42aaccd597d3dd9801c43151c80dce6903de9042db5c3221d04a67484febe35b1fe52b8166927e8c2
+EBUILD airdcpp-webclient-2.10.1.ebuild 1372 BLAKE2B d587238cf6b5e5970ba416d68aaa4e3b17f1160f57bd42db5a3f04a1370b27c516f7eec247925b82ad5ae58eb1bedb22c79cdef43f1c8b2370e18136f8d6bb43 SHA512 66ccc4ec8e94b5632eaf5bf632de02a2dc0078414b1dccc50696994450e8af7b4d80028d4109ae7b43a6c75ee3517924a5207c9e18897d80803a4582b6efb383
 MISC metadata.xml 804 BLAKE2B 4d7003fed4a4fcf24fcf30ecf7d5e2c8970f4c76e6b37444721d09da8413a1d1aeb3a2d4c22174f02bfb7fff7b38e35f23c85a9070625a3eaf63bf0f68fc20e7 SHA512 1408ae27ba8cce6f6f6d53a5fade6d4bf2ce0587cd0b829c3426d88257e83dcd6c69ba5e3cb143d7ac7a31ad7a59e7324a6faf489162f88b62932b4bf8129268
diff --git a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.9.0.ebuild b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.1.ebuild
index acb5cd4995b0..1f5aa45d38d6 100644
--- a/net-p2p/airdcpp-webclient/airdcpp-webclient-2.9.0.ebuild
+++ b/net-p2p/airdcpp-webclient/airdcpp-webclient-2.10.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit cmake python-any-r1 systemd
 
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index e6ccc1316d97..9cb5a1e6b7c9 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -7,5 +7,5 @@ AUX eiskaltdcpp-2.2.10-tray-close.patch 788 BLAKE2B 61cf8368a6aea0f7b69864a317ff
 DIST eiskaltdcpp-2.2.10.tar.gz 3843143 BLAKE2B 907b54271e7bf990a7826168728619020fd05b3d7826ba155763a3a2bef1154978e94978082513ca32a40866e275a8ea0da71f1eca0d77353320c0aefb7065ac SHA512 97c39287b9568aebc5ab21aeabefb63ea32bde8744242bb8647b742c933de9cf74a7fbb2e6df7be6046319bbc660e8abdec0fa332ee91ec5048492af0d763818
 EBUILD eiskaltdcpp-2.2.10-r100.ebuild 3439 BLAKE2B e8c9d1897066682738c270fd215b59fd8ec2bf3c6a1ebb6cf688ece922743910abe84038f9d61b10a734063bf9eb617f88c673e093e69fe9e1aa6d03e6dbdc3a SHA512 62fe7f8ff043a5a2f05ba1b4f7d0d1242b0929e9164b1680792ca4c6cfcbf708cf4d0bf43b70d0cd64d18daa3c6aaff58d1a5ace8cd957791830affb6cadc926
 EBUILD eiskaltdcpp-2.2.10.ebuild 3258 BLAKE2B fdd869a1ddd5f3e4b33ab576e6515088420c343c3fd90ab2527c0112b71dfb2b88ff8fbdbeaff32598f92096a87a407acae01b751117433e09b8c2117e166a59 SHA512 7a43cf259e3ca2dcdd0c8f6522c12f14c9ddbe091b067f230e533249e5efa390378dbbf896b31526101165b4cc38569c5eba61244a66683e83c2afa83c18935f
-EBUILD eiskaltdcpp-9999.ebuild 3489 BLAKE2B 600f24fab78110d082e088b9074f681bac7366dcfaa3fe64502cd3a1fd88709353606c1d0e075eadfe46279ae00927eba7d09a88a823b6aea628377278829ae4 SHA512 1e42ac5f1ff745f48299088953bedcddeadb4cfd74a11ddb5ac52748861d97f3811c127d721b6d687cb544fc26fb423e1e0101d8e5581ebaf844f6a53e93576c
+EBUILD eiskaltdcpp-9999.ebuild 3584 BLAKE2B 6bafa839dce886a803a7510e47cd45048e0553ebea0c4d293cb1feef69beb2c034964d5a99029b60cd9a42fbe1f5598ce64dea9a6e8d44b850cb74221b2331d1 SHA512 cd95718e7e399220a30dca748161a47812f50f7fc33d79d39b44e2c5fb84a24ab5bfc8338650fff69289dea1242b6df24f34a118783d2725ecd2d3c60b577963
 MISC metadata.xml 996 BLAKE2B aa14839e332a549f62b99fdf693388dc03988a316a5feb8da916008b4592d7ced6cc95062727a7f9e16ee8fd294a20124586b1e7c6a1b9d860065573f03bc9d0 SHA512 c36a94f827751c9a4ad080470d52576ea7a679a709605dec744f6bd55b0c4bb7566cc4e17aa499e09087cda45f839e0aa6a9e0d29ce5ce089fa25bf07a3e7325
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index 8a00e9cfb49d..f4478e0ca01e 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+LUA_COMPAT=( lua5-1 )
 
 PLOCALES="be bg cs de el en es eu fr hu it pl pt_BR ru sk sr sr@latin sv_SE tr uk vi zh_CN"
 
-inherit cmake-utils gnome2-utils l10n xdg-utils
+inherit cmake l10n lua-single xdg-utils
 [[ ${PV} = *9999* ]] && inherit git-r3
 
 DESCRIPTION="Qt/DC++ based client for DirectConnect and ADC protocols"
@@ -22,6 +24,7 @@ REQUIRED_USE="
 	javascript? ( qt5 )
 	libcanberra? ( gtk )
 	libnotify? ( gtk )
+	lua? ( ${LUA_REQUIRED_USE} )
 	spell? ( qt5 )
 	sqlite? ( qt5 )
 "
@@ -60,7 +63,7 @@ RDEPEND="
 		libnotify? ( x11-libs/libnotify )
 	)
 	idn? ( net-dns/libidn )
-	lua? ( dev-lang/lua:= )
+	lua? ( ${LUA_DEPS} )
 	pcre? ( dev-libs/libpcre )
 	qt5? (
 		dev-qt/qtconcurrent:5
@@ -88,8 +91,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog.txt )
 
+CMAKE_REMOVE_MODULES_LIST="FindLua"
+
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 	l10n_find_plocales_changes 'eiskaltdcpp-qt/translations' '' '.ts'
 }
 
@@ -99,9 +104,9 @@ src_configure() {
 		-Dlinguas="$(l10n_get_locales)"
 		-DLOCAL_MINIUPNP=OFF
 		-DUSE_GTK=OFF
+		-DUSE_LIBGNOME2=OFF
 		-DUSE_QT=OFF
 		-DUSE_QT_QML=OFF
-		-DUSE_LIBGNOME2=OFF
 		-DNO_UI_DAEMON=$(usex daemon)
 		-DDBUS_NOTIFY=$(usex dbus)
 		-DWITH_DHT=$(usex dht)
@@ -111,8 +116,6 @@ src_configure() {
 		-DUSE_JS=$(usex javascript)
 		-DUSE_LIBCANBERRA=$(usex libcanberra)
 		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DLUA_SCRIPT=$(usex lua)
-		-DWITH_LUASCRIPTS=$(usex lua)
 		-DWITH_DEV_FILES=$(usex !minimal)
 		-DPERL_REGEX=$(usex pcre)
 		-DUSE_QT5=$(usex qt5)
@@ -132,6 +135,13 @@ src_configure() {
 			-DXMLRPC_DAEMON=$(usex xmlrpc)
 		)
 	fi
+	if use lua; then
+		mycmakeargs+=(
+			-DLUA_SCRIPT=ON
+			-DWITH_LUASCRIPTS=ON
+			-DLUA_VERSION=$(ver_cut 1-2 $(lua_get_version))
+		)
+	fi
 	if use qt5 || use gtk; then
 		mycmakeargs+=(
 			-DWITH_EMOTICONS=ON
@@ -143,19 +153,15 @@ src_configure() {
 			-DWITH_SOUNDS=OFF
 		)
 	fi
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
+	cmake_src_configure
 }
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 875e1ef503b4..2bbc841458d6 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -3,5 +3,5 @@ DIST nicotine+-2.1.2.tar.gz 5091941 BLAKE2B 2fcfcc25645a194e1161502c1836d075732a
 DIST nicotine+-2.2.0.tar.gz 3382047 BLAKE2B 64e83aee32f16ff8fcd298a4f876eca1903a37879918bdf3d1e4684d17b1815caf991ffc0264273fb3b84ab77a300382050039b3c5977a38d1e94ba060f7b58e SHA512 1a3aa24fe09564dbd2cd454e081eb5198279a968a4ab8df0b7f42ea1da63b24ac28ea4000fabf4cf00c6b37d4395b927321d27c1502de3447001285d0c942439
 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 912 BLAKE2B 26b89d4276aa9f49c6593fc40392f0d3f6d00d8abe6559e480004c4de5c04de7994cd63a152d099bee44b5610f6f9f5a16edc6573224b58d7446a41a453ca3d1 SHA512 080960a43cf346a13e78d67e9bce1a91b6be329ebee2f5bcd762f1ff2562def006145d0ea89e6fc0cf8e12c3851cf6bbecfb342c6c598a45927237d1a82a3250
+EBUILD nicotine+-2.2.0.ebuild 917 BLAKE2B 9737d9bd4e24ecdc7d036cf56964f6c16a4846b07a2408f1e028a9f9786ee9be405131a17e0a804416955058a41b73be0f8531ff7d4eae6424e79dafa1338c3c SHA512 3b4bfc2310d8b32ee88f88f5fc7adb78fed2875bd27b6853e7054a1bf2f900a4cdebee86ea7ce08b1cc57007282da9de8041d99aa3117329494558258bd513de
 MISC metadata.xml 344 BLAKE2B 3e990579dbb468a2dc76bf5ea791367f8009fd3a21508de4ec40e7cc5d4ddca825488a139a63f7424a05e92246ed7e8d193eb6d2aa58a68244169ae77f588472 SHA512 a62b54ffb9368e5a5aa8a119146ae5330797ac7034b1d403bed87550b976daa25bcc7d68b2089122f287c8ecb1ca3f3679609eee3bfac518abbd251545adc3f2
diff --git a/net-p2p/nicotine+/nicotine+-2.2.0.ebuild b/net-p2p/nicotine+/nicotine+-2.2.0.ebuild
index 96b50ea7f31d..c33364d48dd7 100644
--- a/net-p2p/nicotine+/nicotine+-2.2.0.ebuild
+++ b/net-p2p/nicotine+/nicotine+-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Nicotine-Plus/nicotine-plus/archive/${PV}.tar.gz ->
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/net-p2p/transmission-remote-gtk/Manifest b/net-p2p/transmission-remote-gtk/Manifest
index b667e0d07596..dccd51e80179 100644
--- a/net-p2p/transmission-remote-gtk/Manifest
+++ b/net-p2p/transmission-remote-gtk/Manifest
@@ -2,5 +2,5 @@ AUX transmission-remote-gtk-1.4.1-gcc10-fno-common.patch 748 BLAKE2B f22473d0f56
 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 1335 BLAKE2B d15bb13084c28d455e3162cbef3e3f2d16c5e1ad8c873d4c7f3e3193d79dbb272d8a271e4f3c70b34c6483cc7796330ee8db96dd84f9cab452078d0876afc5c0 SHA512 500420fd254906e8115e918678c278c3de39fa6bf89bc5e0320764c1d7a1bf57848c2f2577953766191381a563a353c51840a279b1e60d1b922501c57f618e8e
+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.4.1.ebuild b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
index 4383f8c7b077..f950df1a888b 100644
--- a/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
+++ b/net-p2p/transmission-remote-gtk/transmission-remote-gtk-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="ayatana debug geoip libnotify libproxy rss"
 
 # RESTRICT="test"