gentoo resync : 07.05.2021

9 files changed, 22 insertions, 37 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5a8c764c9371..8efa869ead84 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbox-cli/Manifest b/net-misc/dropbox-cli/Manifest
index d93466658a37..7b7a6a7fc8d1 100644
--- a/net-misc/dropbox-cli/Manifest
+++ b/net-misc/dropbox-cli/Manifest
@@ -1,5 +1,4 @@
 AUX dropbox-cli-19-completion 161 BLAKE2B efbdc6b2ae9d8b0dbd5ee4ce833a323cb19c181a73e10a1d065b046e4a35db5a10270f55a6805d52f985be75766bdb56516ea787fd71f72609285455de9e85f2 SHA512 b54e326267ab5de72820be006ec02a0bb33286e6e577165cf0ad3ae3015bcd6f568f99a9866299b7ab64519907baa61a611514be067adaab3e11484d83d576df
 DIST dropbox-cli-2020.03.04.py.xz 14304 BLAKE2B 600378cbacd6e96c16e1c8464261b260f2d8919ef5f361c4f337386d3849294cf8557d44f1c5d4f5682eadb2f15885a16b0a8fa162929665e518801d23ec35cc SHA512 c6c8f2f3fb08818388f5ac812821a1530214ad18d58191b08092852aa953e2947871145b46a4df4debeb629a870e1182a47fd5a8bdf8b22144e686e19ede689a
-EBUILD dropbox-cli-2020.03.04-r1.ebuild 721 BLAKE2B 5e1c5977446e37755fb8e469e7706f63e1ecaf393e0aa284cf8df51799687b7b5cde30729e08e211b5917f733fe73ba9128ae5c8de26cc73787e3db45fe3ad2a SHA512 3231e7339c24951dfcf1ca9edfad9f368c091cc4c98f278fcacc7b9588dba30997440b6bc394f6459e5275def1df25a01c15d03c71a8d88636eea7f4ea81051f
-EBUILD dropbox-cli-2020.03.04.ebuild 718 BLAKE2B 31a79d7496637ac2dc9f0aa532b1d35971089e650bbfd1dd041bb2a48fbf604e2c4a373e2863029ba5d2838171b2c71b5c49bb5056fea15c2abccc0d1b32401c SHA512 88c544821af866e7a93a0fe581e20a088911fbe063bbcd3d05dcb00ec0d9cc4dc2cac69470d7df7fae24ba2681a2a9ba5a4ecdf603383148f1963e58dc3805aa
+EBUILD dropbox-cli-2020.03.04-r1.ebuild 719 BLAKE2B 4076d2c4d03df26eba5bfe9cbcf7bc63502fb7ff27699080486c0ad1b47f87c763db3623e8ea29f8d93635332ffaf258e0227476393c5e3075792fb53a339ea1 SHA512 463eb1ef0ab8619f9b064d2167c0a1ec366e813c11ce73315cb236d73c25972aaf4180d67ba58602e32e0e1311ec4ac1a71b0401bf278045e26ea10189df8702
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild b/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild
index f0fa39d2b7d8..44de1f5f0fb6 100644
--- a/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild
+++ b/net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild b/net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild
deleted file mode 100644
index 494529557a65..000000000000
--- a/net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit python-r1 bash-completion-r1
-
-DESCRIPTION="Cli interface for dropbox (python), part of nautilus-dropbox"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="https://dev.gentoo.org/~grozin/${P}.py.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="net-misc/dropbox
-	${PYTHON_DEPS}
-	dev-python/pygpgme[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin ${P}.py ${PN}
-	python_replicate_script "${D}"/usr/bin/${PN}
-	newbashcomp "${FILESDIR}"/${PN}-19-completion ${PN}
-}
diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index ec2896b5c4a4..afe516b681fc 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -2,5 +2,5 @@ AUX telnet-bsd-1.2-fbsd.patch 2523 BLAKE2B dd8625ecb4d2d82d80ce3ec14c56fc979e76c
 AUX telnet-bsd-1.2-format-security.patch 1419 BLAKE2B c605a5e4b92d009221ef9d9e54533779a66a6cb4d4f51684f7c366a35738c8e6ea38c3b2d3cf58c5e808808e1d61cedbd18205f332637c40c91a67b595565fdd SHA512 f5f4b2b7e6f3ec641f5160ab41427ea46a8dd83a9a00d9e15bbe08ed3ab4b7190db05476666e20967b225e63bbf4b43ff59471be7e8f26c0eeed433503bfb081
 AUX telnetd.xinetd 205 BLAKE2B 1d33ca9a921901a6e4d8c24ed168d3f9dcc77b156973b3d4580d8511f0549190cdccd565f2c43dcc893a0c0c62409eb66fff0f3429c1c52b00c7c1a09417444f SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c
 DIST telnet-bsd-1.2.tar.bz2 194518 BLAKE2B 59b46a4717dfbf2dffebbab96446ec020da1fab4838bae053e5539f3f85834e11f304ad9f8cb143aefb73cb3c6c0734430a4317df6e8a9a236a122a1268f3bd8 SHA512 e3867362e1a2bc46779bcbc7631ccf08a0bfae84b71653e39099dc2db42995e5fcd39a978595006053e688430445db7ebb7a7bfbbb02a8e4dba209acbf66a69d
-EBUILD telnet-bsd-1.2-r1.ebuild 1157 BLAKE2B 254e4b0ad2c2e24a9a2fa5f3ef20a0157939208f4da5e5967b1efa01f77bfaeee6b2793003d952eb9a638756269c6f17836e70959cb4e79ab6f10bf351af2c10 SHA512 53e1c91543ad0bfe1459515afeb536e95dc4040f7a1365f05a3645c2d7cf94d2f353697eb8e3225c82c341e6f518e2d8d9559ee8c9d511304ea9925e1b8bd927
+EBUILD telnet-bsd-1.2-r1.ebuild 1156 BLAKE2B d3b517c24ff44ff191336d590a4eaff4dc9aa8f7bfbcb409aba57793496f3f74899cbc6e98e47fcb16bd46dedce9ee3de72c90ad90f3ec207ef9c12d0860b8dc SHA512 99295d2270c3d9b14ea3a51c6dcdad06179dedc0f29c6e33f1b8d6bcf6e3d6cae69d91ca033293ee9d8279ae64e25dd7b998ae0a412ba8b191eab1339a7c71d3
 MISC metadata.xml 218 BLAKE2B 48f6dc072d599bb422bd1033c1b1ecc05aba8ac787c9a10425ecf89d08140c859a122f19502f1de050ea7341f4947aee0b88d10ee605b2a60ec4542ff29ac489 SHA512 c1894fa0ad03968827a0eb6410381bdaa9491a4b450f9a50959a93700f803ddc83f020040f4db06ed3ba68c12adb4a73b192525ef7e70c0bd10125e3da578c65
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
index f2de7105394a..d9185075752c 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="nls xinetd"
 
 RDEPEND="sys-libs/ncurses:="
diff --git a/net-misc/udpxy/Manifest b/net-misc/udpxy/Manifest
index 4e325ebaed91..763642c89196 100644
--- a/net-misc/udpxy/Manifest
+++ b/net-misc/udpxy/Manifest
@@ -1,6 +1,7 @@
+AUX udpxy-1.0.23.7-cflags.patch 378 BLAKE2B aeb4f499db0c0aeb877c4093d01640cc8ac0068f16787a18507b9a9c831e49597840cdd6c555fd83d80dc3c77c5ffd406a3190e13c35a2f54eae80b59a0387d5 SHA512 77815d7b42d1d6aaa6aded205c39666b72bfa622af6ad891b61ba33528eb77cd4ae7cfb418eb46b43abb3489817bc30d91fd66454a64345ae376aafb9c42ebe0
 AUX udpxy.confd 1196 BLAKE2B 78326f508631bf0c83380ef7c7fd7768212b4efb6fcccd6a33efb3067b4ec7da28080ad2a903998a4eda90583d0085ade595f99224672df0a7e02d923f442599 SHA512 e9b96fd4402f951918633578a2fc78b7730366bc3db64dd45127fe06a9fd945c92a4dbb9dcdc70defa53bf28dd5e8bd7c3e1c8516bb1707972f547ee02de438e
 AUX udpxy.initd 357 BLAKE2B 9a697e689787d0e560dc452d1cf8df42d2ecb3007cb107cbe42c1b68b891939eb5a5142aa8df499d1908908990a358d32c0392a06d0ee8a9c5f1580345e1bccf SHA512 0fbd4235e585d3d23e238e30060a3968ad17090a3232ca6ef316115ec98b8ae1528f8da757bc3e1dde1ce529ba159463f4814b0f13ef3c3f88b74164e389f379
 AUX udpxy.service 182 BLAKE2B 278fc90835dffc38142dad570a6a6898d39b8a622bc69a2f2b53d913303e58f4d1c15909d25754ec0f263097d250788d70324e3b9fbaf4ed1e51fd4ee7b27e9e SHA512 b9d32158657ec27362e9dea4704757a91543eff4b15aa0d256c934ae119545053ee21f32c87e0da85fc30c53bd807de19a26593cd63472edd5819601fd2b0ac9
 DIST udpxy.1.0.23-7-prod.tar.gz 77591 BLAKE2B b1bbe71a5104db7e74710c2f9a7f3e0a43ecb4bf13bc6ae2cd02d71059e2ed2f78aafda348858de54ce57da7b1bfef60aae7819ebd1bf6907ac9183f3c3b7725 SHA512 5bd37822f1d861b3828339175b7daebbf3ccb3969e808a319d3d3f054afbf7769d5f2705d25780a76819b3b7963af3a81af7d71556ba61274141142167907a23
-EBUILD udpxy-1.0.23.7-r2.ebuild 735 BLAKE2B 47af5069b3c352cb646d03af9ab09dbcea606bc93a78e86e30dbf519bdf9a78a537f55a22e6c862a5812ae5d2cf0e147f725f332d29bc8d3d97a98e40668c8d1 SHA512 9d14e7f1b9c65e143177463ab993beb97685d64f92188de03e621fe2f3be5b493e9287e551131765de444ababa580bf83ea081ac810abac35f5cc5f657923d57
+EBUILD udpxy-1.0.23.7-r2.ebuild 781 BLAKE2B f5204adf6345ffe5a8245195fa62950f106702f8fc0c8a3be12468a6a7435839db3479ffa9834444ab422e0ab6cefeb361d4832455ff2062bfa2710bec733311 SHA512 89b5ddc046a7d6cd661e3e98a0bd036f8b57ac0346e6c0bc6739a5ff302f534faba7e09350b68f855a055d138499aaef9c12a21d765cf03c3ca8d97164f2f59d
 MISC metadata.xml 247 BLAKE2B 69a36917942ca9f4fd06674f7729501b7adfb5a6aa8bf896009e7ae6207621a7f3badce46aa52b8fc1ae31e7320c96db3ff6904fd2b552ef939d4098a89998f1 SHA512 56a7183705aa925bc656b1dcf564cad1074bf122c8c00b6436fba46e321110c3f6fd8f1a3f75fff04323f2ea334d24f772699d2061366dabc7d7cb8ef6f625f9
diff --git a/net-misc/udpxy/files/udpxy-1.0.23.7-cflags.patch b/net-misc/udpxy/files/udpxy-1.0.23.7-cflags.patch
new file mode 100644
index 000000000000..b2b8ba1c3b82
--- /dev/null
+++ b/net-misc/udpxy/files/udpxy-1.0.23.7-cflags.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/725238
+--- a/Makefile
++++ b/Makefile
+@@ -100,7 +100,7 @@ CORES := core.* core
+ debug ldebug rdebug lean verify touch incbuild 
+ 
+ .c.o :
+-	$(CC) $(ALL_CFLAGS) $(CPPFLAGS) $(CDEFS) $(COPT) -c $< -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(CDEFS) $(COPT) -c $< -o $@
+ 
+ release:
+ 	@echo -e "\nMaking a [release] version (use 'debug' target as an alternative)\n"
diff --git a/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild b/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
index 73364f910479..ab57d61e4a3f 100644
--- a/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
+++ b/net-misc/udpxy/udpxy-1.0.23.7-r2.ebuild
@@ -15,6 +15,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
 src_prepare() {
 	default