gentoo resync : 17.02.2021

9 files changed, 18 insertions, 21 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index edf384cd8b6a..c099f75bb23d 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 761546d9b4fa..de29067d3434 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -5,6 +5,6 @@ AUX eiskaltdcpp-2.2.10-miniupnpc2.patch 1123 BLAKE2B 146d4fc6cd84ee8c318871ea646
 AUX eiskaltdcpp-2.2.10-openssl-1.1.patch 5482 BLAKE2B c3e33ddd45458a02bcbd20696bf08ea343cd4044f8887d6c344005ee95ea77054e35fb0c4ecae137352e55178b85cdc35d0c817b0c01426b2f3118edb20dfe20 SHA512 52433c16a95aefa9e5fd36c812b6f4cc5729cd870885fada69fe5529da11ab1edf4701879c62db0befab17e60da1168bf724ae8c39ee5f22d24eafda4f808485
 AUX eiskaltdcpp-2.2.10-tray-close.patch 788 BLAKE2B 61cf8368a6aea0f7b69864a317ffc6cc97ca1b468a948d0a6264e3c49fb65bf83d634f8aa843357c1ba8eb0a8cad4eba8685b772650e816512d64ec35289f1f4 SHA512 f1f59590b7ded55bc6351450cbe1efcf15ca8db2c532d2871512c8866809f06572076a586c968fade8d0f2fe8d33eb06d1b0359fb810748b6ad9d812c188155d
 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-9999.ebuild 3584 BLAKE2B 6bafa839dce886a803a7510e47cd45048e0553ebea0c4d293cb1feef69beb2c034964d5a99029b60cd9a42fbe1f5598ce64dea9a6e8d44b850cb74221b2331d1 SHA512 cd95718e7e399220a30dca748161a47812f50f7fc33d79d39b44e2c5fb84a24ab5bfc8338650fff69289dea1242b6df24f34a118783d2725ecd2d3c60b577963
+EBUILD eiskaltdcpp-2.2.10-r100.ebuild 3426 BLAKE2B e96c25c5b3f6e7e1759a5673bc93cb88c50c9550ac113bd55097cc9587a6cb12c8f20a0e41b95132c653d1ca0838bbd8757cea5a3bca23e71c1653784986349f SHA512 dd1fe0e1ab0b26f4b531e838a19663e5a30690e540b1f25c8857cb552858dbdc639bcf2a4f70e65d4771f51b18711de35ec35cde61572c2bc22f8afee905a43b
+EBUILD eiskaltdcpp-9999.ebuild 3571 BLAKE2B c53be935a2f4a45bb2e8eec50d3124ac55610c0260066c1943b0557a0ed685599e9ede2a0d17a3941a146989b649a7b573f4f16f5e8f983370833ea59db1e99c SHA512 7d9f7423201f5cfd35dcb0b38db7f97fb69b54c75db54f703a4ebef4bf532f6aa69bd6c383e7da766e25bbd0d3de62ec4b47041862c2718c712fb4c29aa55a4f
 MISC metadata.xml 996 BLAKE2B aa14839e332a549f62b99fdf693388dc03988a316a5feb8da916008b4592d7ced6cc95062727a7f9e16ee8fd294a20124586b1e7c6a1b9d860065573f03bc9d0 SHA512 c36a94f827751c9a4ad080470d52576ea7a679a709605dec744f6bd55b0c4bb7566cc4e17aa499e09087cda45f839e0aa6a9e0d29ce5ce089fa25bf07a3e7325
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild
index 1355b15934bd..930dfe474fed 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.2.10-r100.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
@@ -32,7 +32,6 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
 fi
 
 RDEPEND="
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index f4478e0ca01e..50b6c2dfc1e3 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.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
@@ -34,7 +34,6 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
 fi
 
 RDEPEND="
diff --git a/net-p2p/nicotine+/Manifest b/net-p2p/nicotine+/Manifest
index 9b0743acbaa3..b46831b6c8c8 100644
--- a/net-p2p/nicotine+/Manifest
+++ b/net-p2p/nicotine+/Manifest
@@ -4,6 +4,6 @@ DIST nicotine+-2.2.0.tar.gz 3382047 BLAKE2B 64e83aee32f16ff8fcd298a4f876eca1903a
 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 915 BLAKE2B 9a53ba7e61b7d431ea9b0dbde2049c55056ca0b298e575ffd5080f50c3b9a1697c1816f22a543b9dbe59ca487b7ffd1f89eac3c0e1e41b82192a16a8c3c6c409 SHA512 2a8f6f5983f615005733293f7a69e76ec4bf5c6eb98d8070191501e18de094dff172c20d0d721647bcb40afd421b6bee0d27138d6894fa712b18e8597f1119bc
+EBUILD nicotine+-2.2.0.ebuild 914 BLAKE2B bd3345e06b253455f66acd463e380fe61569c7051ef66b6d393e22e05276a5c0ced9296adb11c23201970bb61e4bd7c9f13e249ac2b54c3ffe9669592731116b SHA512 8d7b54cfce555201fe0694ebdfe70477b830cb1766f918bb72ce998ebb8387ad64978216842cb23568350dfa8a6026042b8672edb2b07b7643a3b5f82c5dbfb3
 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.0.ebuild b/net-p2p/nicotine+/nicotine+-2.2.0.ebuild
index 53dbb93a50ec..32b923c7ad64 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 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/net-p2p/opendchub/Manifest b/net-p2p/opendchub/Manifest
index 7ba0b797d7cf..b7349eb75b93 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-0.8.2-telnet.patch 347 BLAKE2B fdd3052d7b139bdee2398f0517ada047836f601d0b351055a34f4797d4f29d7e9f536d7b6fef5ff7a4f7dbcb18561aa286830b7aac13c30300af431e341f1a82 SHA512 b8b45dc232a2ca94bff9fc3ab8e80188a9072d38bad30233fab10292911d002e542c0dee58745a4c98c500866e748021a314ddc8abb42ebfd3a39e12cba177ae
 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 1000 BLAKE2B 328e0b9d5946629c07d8642ccdbcc1f92e8fc43b633bccd7ed137421273cf1fd8e6da1d3e4bad2abacb46a4cedd44680bc8066bfef31dce57f27bb0ac0a7adb2 SHA512 7b7ab262287bc68400740a80576a91b95c2768924c0ea460ca06397bc1787cc8db16baed1516395e5b26d727c835c3e48253e944fbf6c49530068951b6a3733d
+EBUILD opendchub-0.8.2.ebuild 976 BLAKE2B aa3706f30a40ae7ee8d28c945b4a2efb5ce06bd7663a18cad89703777942d2d68210fbe1195ef3483bb44f3013cecfd3296edabbb24ebca057518a37f334cc5e SHA512 2dfd4b1e27011bb86d8e98fa529ca2eb12f6eaed7eb9db14a7251048ba007442d8a4bc4f92b3cea3a8561c51ecee652db55c0d3feabca2c909df9d58006739ab
 MISC metadata.xml 251 BLAKE2B 68b20d7614882b61a212114e934513c1cfebbdbf3770c7d8e27ab72f3063da648b085ab138f7ed2221f352d34cfac07ca76f50eb73cc28945d3368d2261fb007 SHA512 9c335c29aef545c47822fa6c48c188e1e5f9ea1125253518078dce88639a828cbe0d6c0a7c5bfc38a662753dbb468d0fef17be88877890335e7320f44e509c62
diff --git a/net-p2p/opendchub/files/opendchub-0.8.2-telnet.patch b/net-p2p/opendchub/files/opendchub-0.8.2-telnet.patch
index f81bf44cbc69..c8efc525ed65 100644
--- a/net-p2p/opendchub/files/opendchub-0.8.2-telnet.patch
+++ b/net-p2p/opendchub/files/opendchub-0.8.2-telnet.patch
@@ -1,5 +1,5 @@
---- opendchub-0.8.2/src/main.c.orig
-+++ opendchub-0.8.2/src/main.c
+--- a/src/main.c
++++ b/src/main.c
 @@ -1073,7 +1073,7 @@
  	     /* The chat command, starts with <nick> */
  	     else if(*temp == '<')
diff --git a/net-p2p/opendchub/opendchub-0.8.2.ebuild b/net-p2p/opendchub/opendchub-0.8.2.ebuild
index 0e6df9059519..047e913aefc7 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-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="hub software for Direct Connect"
 HOMEPAGE="http://opendchub.sf.net"
@@ -17,34 +17,33 @@ IUSE="perl"
 RDEPEND="perl? ( dev-lang/perl )"
 DEPEND="${RDEPEND}"
 
-DOCS="NEWS TODO README AUTHORS Documentation/*"
+PATCHES=( "${FILESDIR}"/${P}-telnet.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-telnet.patch
+	default
 	eautoreconf
 }
 
 src_configure() {
-	add-flags -fcommon
+	append-cflags -fcommon
 	use perl || myconf="--disable-perl --enable-switch_user"
 	econf ${myconf}
 }
 
 src_install() {
 	default
+	dodoc -r Documentation/.
 
-	if use perl ; then
+	if use perl; then
 		dobin "${FILESDIR}"/opendchub_setup.sh
 		insinto /usr/share/opendchub/scripts
-		doins Samplescripts/*
+		doins -r Samplescripts/.
 	fi
 }
 
 pkg_postinst() {
 	if use perl ; then
-		echo
 		einfo "To set up perl scripts for opendchub to use, please run"
 		einfo "opendchub_setup.sh as the user you will be using opendchub as."
-		echo
 	fi
 }