gentoo resync : 29.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-29 10:15:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-29 10:15:54 +0100
commit: 9aa80713372911cec499b3adb2cd746790920916 (patch)
tree: b8e99dc5dd60ac2094a27cc52f74aada8df38f05 /net-misc
parent: b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (diff)
54 files changed, 2207 insertions, 512 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a91e0ef55253..87682f8b6d0f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 598390c09534..c5e5a3559e55 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -19,9 +19,9 @@ AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b5738
 DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
 DIST asterisk-16.18.0.tar.gz 27843069 BLAKE2B 643c371b4747111e233c0758efb529e7f54f1deeff10e65fb05f3a1a58c4ba5c139bdb583d2a2552e29aacac5d0f3980fd9aeb19fda2513843fbe0c849dec217 SHA512 025a30a1eed1d2cd14eb1345e1e0edfcc23b4c517e0d33da7d06d97b3ffa3c9ce9c2fe9449109eefade6d62b6205b598fecb69245adb04f03bd53f8482fbd7ad
 DIST asterisk-18.4.0.tar.gz 27926601 BLAKE2B 1a4089ee274732462a8e480d449e4043f7393a6df0b78dd3ea341d3996b9e433066e6d7c53b3ab334db5946a4b847ac02abb4afc5747b6f541cad81a6d58d468 SHA512 024d0a5c75d55fe614ba6219aece62778e9522a0f8365d57192aa5aa22be94d45a3bed69ac14659738e97dd98967533c13096a855366083e6df2b7800e684602
-EBUILD asterisk-13.38.2-r2.ebuild 10791 BLAKE2B 378bdbcd0cc936a195a72d61ad3bd8e074130fbb6bb7bf2b41eaffe89c2ced1606a53fe8d9d1fab986bedf12622d323bc46395e0914792b7b03911d9384c6193 SHA512 12caa9d74f34658a6888c043a3ce682a67671dfe1528a91712f8a72c73686ddcd881f138c8eff34f6fa4d1fdd0fc43e7a69a9c4e41ee11463e770681200d8192
-EBUILD asterisk-13.38.2-r3.ebuild 10793 BLAKE2B 9882ff88ad7d5afa2dc9372d4dec8975b5def601ad3b590df91cdeeb3c189f6672ed93781e73ccaef76fe1decd15421a8434aad92ace456dfc92e4dfe0c8007a SHA512 9ce8934d879c44e4218701390e35475eea4f7e5a336a113cc5067720d6ab1b5bc0f01a5b49083b55ad8b1ac2af936ff0330a2b618981a54fb52e6ccbe900eebd
-EBUILD asterisk-13.38.2.ebuild 9664 BLAKE2B 7b5018e14e5fd93fe92b96a2ba20c39e061dee93a7c3491601ac1a051498fefa6914b5c259576537e1d9c96be1ef45e85d7b742bdc62d40390d824f08cb617cb SHA512 5c82cef460eebf4fb1cf1bbc1824b050855dfb2e8d8a8b0e42cfbff85a761e97843a1ff4bfc38dcb235475db7f2ea36536e031978dd861a9de4d84cddba829f3
-EBUILD asterisk-16.18.0-r1.ebuild 9855 BLAKE2B d17ca05051bfb2a28c4bac764226bcc285dfbc01d60e409ed1cc4ec00e430a0ba68768352dc66924bc8627f2f797be074f150b74da6176a319b069761d8081f4 SHA512 4db4384d0adf42c5201529fc032e7ce7570900cf83c16708841f64341b5673cf5adc7a4ee1f1306b6542049fd24f2bdc0669789ac0ab57a66c38952d40f9dd5d
-EBUILD asterisk-18.4.0-r1.ebuild 11216 BLAKE2B 1267a0d61d27b7bb7793367115cb9e365b017f062d4d3879ec14d80d6b74bccf2d4daa69bbaffc2570bba129ac0b8fd6b3f7d97039737f95ec59b05cd5c3778b SHA512 08a6c80558aa9d45ecc3f10aab7aea1956f95c020b99e6010c92f3965636af6545b8e2fba9f9ab6485776cd40dd04a2f1ee348cd3eaf849bed27aa0e788a3907
+EBUILD asterisk-13.38.2-r1.ebuild 9682 BLAKE2B 59116ae296d6506307e01059a3925f6a3c5e5faab53ea264817a006b2abea0ba7579377b3c55a254d402a05676e11957715c1c64c160d1aa13a8b4a1d34f3998 SHA512 1c1662f449aa828ac2b9215fffb37e499f818ef94ce4927fa16eb2d5181a60d3489db025641118e94943844ceee646138e95526988a90e87dff7eb5882730410
+EBUILD asterisk-13.38.2-r4.ebuild 10809 BLAKE2B 8e47dca23cbd7496fb96f02b7a5378d30c91843bd0e6742f6bd86e6e358b351a9f8b2b2c20cbca93b341a8b6d53d5c62fa6fd3b8545439ad237337c7d20fcb86 SHA512 2d37bf064823b4e5f9607ef52cd0494829442ef9d765d7fca586555a521030b1ba59dd4f9ae680bfdb33cb386a3308f66243375cc75ad3a4537a3273acba68c9
+EBUILD asterisk-13.38.2-r5.ebuild 10811 BLAKE2B db87d4b4a0103d66951ab699ddabed115b16143c5f841f6b6e1e42bccaafc4ccae72c17ba2b90fef21940f7ee2ae9d1b7090a26be88f851183fdfb4b925ff817 SHA512 0a2efd82cf5dd7d03fee02c0d2813981a366eaca95a8d7de654608809af62bd1700875eab247642ffe68d1d07ce40d82268ce02769610c640b0d6854b89da1f6
+EBUILD asterisk-16.18.0-r2.ebuild 9873 BLAKE2B 7362765c0c7efe69c7ad1b9ca79a8a82ded26d36067c48cca30ebe8537f9fd8ebd5e4f6afd78102c8eb77ab4f598f6f65a9a15847fd1454f2d6b14073b6fe96c SHA512 ac50f130938c13dccd9575ac1c78dc9277bf3d964751a0e717b0b1d92d646286ac001a6889c1670bbdd5042983f01a55225a975c20ff41a26b2d73bc9b220e17
+EBUILD asterisk-18.4.0-r2.ebuild 11234 BLAKE2B 26543c5d82e172047b5fdc3129defa36f2508b791f8a2cd132fb7f78494d12cb406c52ad2cb544589bc959754e35ca7e1edf3117a36857c95a3edda816c1841d SHA512 f2e84a8c058440b529fbaaebbbd13f7a8d85d4bf8af573f4318532ca53e650b153d8610180ffe9bfdf32594387f83b56219332849a404f2626cea8ccfe88ee2e
 MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-13.38.2.ebuild b/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
index 11711cfbe6b4..b6fc143048fd 100644
--- a/net-misc/asterisk/asterisk-13.38.2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
@@ -41,6 +41,7 @@ DEPEND="acct-user/asterisk
 	dev-libs/libedit
 	dev-libs/libxml2:2
 	dev-libs/libxslt
+	virtual/libcrypt:=
 	sys-libs/ncurses:0=
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -303,10 +304,10 @@ src_install() {
 pkg_postinst() {
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
 		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
 		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	fi
 }
diff --git a/net-misc/asterisk/asterisk-13.38.2-r2.ebuild b/net-misc/asterisk/asterisk-13.38.2-r4.ebuild
index 623c8dfd0f21..555ccbc9e75b 100644
--- a/net-misc/asterisk/asterisk-13.38.2-r2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2-r4.ebuild
@@ -43,6 +43,7 @@ DEPEND="acct-user/asterisk
 	dev-libs/libedit
 	dev-libs/libxml2:2
 	dev-libs/libxslt
+	virtual/libcrypt:=
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
 	bluetooth? ( net-wireless/bluez:= )
@@ -323,11 +324,11 @@ src_install() {
 pkg_postinst() {
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
 		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
 		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	fi
 
 	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
diff --git a/net-misc/asterisk/asterisk-13.38.2-r3.ebuild b/net-misc/asterisk/asterisk-13.38.2-r5.ebuild
index c41ddbf6577a..c350ab4c288c 100644
--- a/net-misc/asterisk/asterisk-13.38.2-r3.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2-r5.ebuild
@@ -43,6 +43,7 @@ DEPEND="acct-user/asterisk
 	dev-libs/libedit
 	dev-libs/libxml2:2
 	dev-libs/libxslt
+	virtual/libcrypt:=
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
 	bluetooth? ( net-wireless/bluez:= )
@@ -323,11 +324,11 @@ src_install() {
 pkg_postinst() {
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
 		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
 		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	fi
 
 	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
diff --git a/net-misc/asterisk/asterisk-16.18.0-r1.ebuild b/net-misc/asterisk/asterisk-16.18.0-r2.ebuild
index 520bcc0b1569..585768206f3d 100644
--- a/net-misc/asterisk/asterisk-16.18.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-16.18.0-r2.ebuild
@@ -40,6 +40,7 @@ DEPEND="acct-user/asterisk
 	dev-libs/libedit
 	dev-libs/libxml2:2
 	dev-libs/libxslt
+	virtual/libcrypt:=
 	sys-apps/util-linux
 	sys-libs/ncurses:0=
 	sys-libs/zlib
@@ -310,10 +311,10 @@ src_install() {
 pkg_postinst() {
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
 		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
 		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	fi
 }
diff --git a/net-misc/asterisk/asterisk-18.4.0-r1.ebuild b/net-misc/asterisk/asterisk-18.4.0-r2.ebuild
index 5bd2a374d9aa..d17925736937 100644
--- a/net-misc/asterisk/asterisk-18.4.0-r1.ebuild
+++ b/net-misc/asterisk/asterisk-18.4.0-r2.ebuild
@@ -38,6 +38,7 @@ DEPEND="acct-user/asterisk
 	dev-libs/libedit
 	dev-libs/libxml2:2
 	dev-libs/libxslt
+	virtual/libcrypt:=
 	sys-apps/util-linux
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -332,11 +333,11 @@ src_install() {
 pkg_postinst() {
 	if [ -z "${REPLACING_VERSIONS}" ]; then
 		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
 		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
 		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
-		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.libera.chat"
 	fi
 
 	if use deprecated; then
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index 6d32aa9657dc..2ebebb3a21fa 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -1,19 +1,7 @@
 AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad3294a927d8cbd708427e4aba8b6f62157a5b6e7cec8d7631a6d79ccd55616a9bca63003ef72f5 SHA512 100a9480dc086e18972c25bbf554e47737dae43989fc7fe1d01173c2570e64792e64fa7d52a93ca53f3e1248b3b335fd838b5c7713dae937e919f0e6a99bb132
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-122.4.4867.tar.gz 98758165 BLAKE2B bb9fac6670cb384e5417ad6f73d0894ba35cc8471ccaec3dbb37d99fb0ec36810051856bc674b5291e654c4c4626f82963335ad92190318f3765bfc33b47703e SHA512 7606f21b56df4e894611b30566538007715e9598f0ac45377e8bbda4a649f4ab6df6b9b0f4da467c9a9aa632d38f78a632c3c879cb21bbd13bcc46faca450689
-DIST dropbox-lnx.x86-123.4.4832.tar.gz 98431455 BLAKE2B 6838420baeb330b6d0a611564e28f13d65b5b9ed1f616afb440af57b31ffab2275b615e5346856d485aeacb691603999430fa8eb6d6299231f02951f2d017b69 SHA512 bba088d2123a8b3a3263d4c1c2ddd24b21e573d938920a07c15bf18cd89be02fe3cde76f68939a18ca5a80bc3a0d729adcaec095e7cba9ed234081d75d0275b7
-DIST dropbox-lnx.x86-124.4.4910.tar.gz 98766012 BLAKE2B d682dfc402a7b1133702331130d76c0dfbb2e70642aeed318eb77425593671dbbaaf10f889fb44c018bfe345336952363b72d27f8a093bdc717559ef67c98dd2 SHA512 e643b3f4d017d4388c3746faa4168d4cf5fe1b9944b4b65ea4191aa37b8786cb37d15faadab94271064b0f59ecd9503b81dfcdadbed5907b8a81afdace5627d4
-DIST dropbox-lnx.x86-124.4.4912.tar.gz 98764776 BLAKE2B cade38bf4f65331bd232fb87c3fb31aedc0df59a1f8ad4521cbbbc73a1383b2e719c7e942f23f7f7ab02cbec176a01e56027b367ce63c1262354526da4978757 SHA512 6fdd503735e3c71e3dfe7c6174884b4c27fa3051f596c8b7f29acf5bc3a505d6b3e627cc510e97747aece27ff52bc874d6378313b0d89eea086e1bb4613c6d1e
 DIST dropbox-lnx.x86-125.4.3474.tar.gz 98803434 BLAKE2B 9416f95e297ba5f278dde845c5f4b0b6e2d5c53dd8336017b27bfad8546d685a5f7ab4a953a0db471e87cab6a544178fd92dfd737aeb9f9b052364da41f18305 SHA512 2e3a8843d083a754513cf2d8c897910ccad9591d939bce84026e39a5cf4a9fc3489dc05ed7981fedd194c078a45bac412217cc5f629cdf1d77e70cbcdf7f9c5a
-DIST dropbox-lnx.x86_64-122.4.4867.tar.gz 102022157 BLAKE2B ce68823f184d9ff9a7378f6c7248ba73bd76f120cf095386bd6f43a701849f380c849ae3e7e6e035594d480e59bb9c98b0d23774c6083e97122af657c2860e46 SHA512 5b2252a07b63a0805445bda486039a07c267e280cead8519de88a35b8d877cc4276e3ce91421b3bd4a64cbcab125edc519d067974c64de012d59a74d06324d39
-DIST dropbox-lnx.x86_64-123.4.4832.tar.gz 101557451 BLAKE2B f30778a81fcbee0989c7ec4b5ff5337179138a50cea56a7b4d38e940e263ac849ac1a2db58978634a1bbd75c1eac6f87b04be6a7c3c5dfdc531ae48ec558bb55 SHA512 42411274863c0262a0623ff1cb3ae2d776bf342121f6f47351d61645b0b5096bdade08084208e7f73f5fd08be6152c0971b9208dd2a083a5229f5bd0519ab089
-DIST dropbox-lnx.x86_64-124.4.4910.tar.gz 101929245 BLAKE2B 414efc58bf155545bf3a708de602bcb227e2c5ab87f206c78a125c7ec2bd4e99d5342592cfe9f4ec4e19928020bbf127277fa7d9c38c66c19b39377bd55c3f01 SHA512 383d11e9d879c6c8d970ffbb23d9d2f9f7523e5c5e92d4dc568eba62567ac37904a3a3e4b85cf6d463a52b55608eb28a7bd2f3798d63546239ad4a82693118b9
-DIST dropbox-lnx.x86_64-124.4.4912.tar.gz 101928148 BLAKE2B 535127b4a4d160e60f1f3e97a0e4689f38728a6e0324de64dd08e37ab566be79ec103e1a8ca69f28ba9b9fc8d7b8e522dfc889b076693e263f1beba5dba58bcf SHA512 1bfcdfc656cef947be940c6d392c96ee39f1e611b1ccd1b5490fb9406eb32972a7339ba213135aab4e9bbbe818fcd82322258ec129e324f89ec9ac9e73d5ffea
 DIST dropbox-lnx.x86_64-125.4.3474.tar.gz 101953751 BLAKE2B 5ef621e2dba90ac08e52678eb8a63eaf3c97d3e294bd237499ef988a17a16d6b9425e5b0c17caa1dccc3d81ea7b558b0103f9120eb31ca1ff28baa487e43cd20 SHA512 dca1088d3e2467b54eb7494276cc3b97eb83ef8089bba513f7abb6e0007807f549615d41d3574ac9b53f74c84203d5863018dc374f883a485d60450e9a6c0a07
-EBUILD dropbox-122.4.4867.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
-EBUILD dropbox-123.4.4832.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
-EBUILD dropbox-124.4.4910.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
-EBUILD dropbox-124.4.4912.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
-EBUILD dropbox-125.4.3474.ebuild 2675 BLAKE2B ef9670920b69e453586b466a78fc7d4f0fa11dc91348a0adaacc9783d245eac634408d7c308d084e4aeb2df7c09511874bda6b42168de57002ae946cd25cd71e SHA512 f98d4a16cb2663b76a632ee690eb3ae3270894e1414ebd2dfa7c9a3944c11f66b36e98a3d328f8c8f05b9cdcd594f62632193fd840faeb417ea772f461fdb220
+EBUILD dropbox-125.4.3474.ebuild 2673 BLAKE2B 6e031fb04250842de2b31700ca9f5c68a2ee605ed8d55a0a1b07247fafc85179968da4cca5f55e7231a6024d5cdc7c8d691003cdf00e3352985aa245e3ddea59 SHA512 fda0adb204f8899a4355e9d618989b0772ae987fd2694e7a099aad4b8ec3c6f45cc6af63d74bf68728668724251ee56e83eecf7452b084c89c50a10191189869
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-122.4.4867.ebuild b/net-misc/dropbox/dropbox-122.4.4867.ebuild
deleted file mode 100644
index 17ace6762e14..000000000000
--- a/net-misc/dropbox/dropbox-122.4.4867.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-123.4.4832.ebuild b/net-misc/dropbox/dropbox-123.4.4832.ebuild
deleted file mode 100644
index be2fed244fff..000000000000
--- a/net-misc/dropbox/dropbox-123.4.4832.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-124.4.4910.ebuild b/net-misc/dropbox/dropbox-124.4.4910.ebuild
deleted file mode 100644
index be2fed244fff..000000000000
--- a/net-misc/dropbox/dropbox-124.4.4910.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-124.4.4912.ebuild b/net-misc/dropbox/dropbox-124.4.4912.ebuild
deleted file mode 100644
index be2fed244fff..000000000000
--- a/net-misc/dropbox/dropbox-124.4.4912.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop pax-utils systemd xdg
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
-
-LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="selinux X"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-BDEPEND="dev-util/patchelf"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-RDEPEND="
-	X? (
-		x11-themes/hicolor-icon-theme
-	)
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/glib:2
-	dev-libs/libffi-compat:6
-	media-libs/fontconfig
-	media-libs/freetype
-	net-misc/wget
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5
-	virtual/opengl
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libxcb
-"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	default
-	# we supply all of these in RDEPEND
-	rm -vf libGL.so.1 libX11* libffi.so.6 || die
-	# some of these do not appear to be used
-	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
-		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
-		wmctrl libdrm.so.2 libpopt.so.0 || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf images || die
-	fi
-	patchelf --set-rpath '$ORIGIN' \
-		apex._apex.*.so \
-		nucleus_python.*.so \
-		tprt.*.so \
-		|| die
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_postinst() {
-	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
-	einfo " your user's home directory.  To prevent this, run the following as"
-	einfo " each user who will run dropbox:"
-	einfo ""
-	einfo "install -dm0 ~/.dropbox-dist"
-}
diff --git a/net-misc/dropbox/dropbox-125.4.3474.ebuild b/net-misc/dropbox/dropbox-125.4.3474.ebuild
index be2fed244fff..83389e2d0ede 100644
--- a/net-misc/dropbox/dropbox-125.4.3474.ebuild
+++ b/net-misc/dropbox/dropbox-125.4.3474.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="selinux X"
 
 RESTRICT="mirror strip"
diff --git a/net-misc/netkit-rsh/Manifest b/net-misc/netkit-rsh/Manifest
index 068a3ea3efd3..201603420f47 100644
--- a/net-misc/netkit-rsh/Manifest
+++ b/net-misc/netkit-rsh/Manifest
@@ -1,3 +1,27 @@
+AUX patches/000_all_sectty.patch 1127 BLAKE2B b06c2474614c83a01e83cdcaba86ffb7c492d8ca531037ea68ca9a7c9cb975693cea03bfdace575e2e61947e3a40ae0163c5a2e1ca5604209291cbec4b35c9b5 SHA512 42eff4843b2b8d69958d19da451600fac977fc7f6248cec103de017af9ef40ee61c9cf80a253e20690263ce0c1506c2f2d666af4a3f96aeca6c7f519f6e59de2
+AUX patches/010_all_rexec.patch 1447 BLAKE2B 28630dc02dc2d576b259adcc07a19c1feb25c326403f8dde84f479c9fa0d82f16432b3cbff904bb8c18813ebc92731175e850c5e1ee6c4e0e34192475e33fd52 SHA512 0096637aa402c3a38226d18cbfb6b30c54887ea42acaecc417b0a8e51e5d6e7fb64e4484118e1095f76dd71ab253e417bcb75ac1fb2d170d9a620811d391d8c8
+AUX patches/020_all_stdarg.patch 874 BLAKE2B 8189183e13c50ec7a4c84eb80674b77bd1899132035577f89a191aaf08209052bfe4369a008fc5a6036ed9008703b8cf6906831ed9b5d0f5e712d9855a202aa1 SHA512 8fe353d9ead494f3f20801235a04c73f7459caefbc4d693ade6e53940a6a3751d644b580ffdc976aa25b5affd2c308c135a768a9fd19d1ca52e9e50b02a7d574
+AUX patches/030_all_jbj.patch 859 BLAKE2B 489067b5599ae0daf515cc3f84ccc02253648325e38a225af4e26028947d9dd4b202c1748ab313d484859f73367ec2938f0cb59acc6da132fb308f98959e670b SHA512 10edaf2a4c91c6836d7527840014868e1472afb19cd0cecd37a42e2944cb3fe431b0a2557529ac4297dcca1847735a5fac050df69ccf44228fbdc4eb9bb1156f
+AUX patches/040_all_jbj4.patch 231 BLAKE2B b033b095bb038e3fd0851afbd36e1eebc086fc41609a4a320067b417ddbb330d8ec9cfc63810848d9fa2028ffc2af9b0bb0d312f30ea81f076b837083d98c9cb SHA512 3bd62bf156e2bc3981fdb9de5652edc8bf8c0d0721cdd6c45c44c7b516c64746e320cf7b1227b28bba1dc1e9fe5b67ea8a237d49e9276fdf8a1c242eef75ea9d
+AUX patches/050_all_prompt.patch 1060 BLAKE2B 02ee3ab83939dbe1536781fac726bdb5b6ad496e80cbf379b26411d191942ab3634aeb1d231a064df4d6319b0b779915cebc8e468bb8342fb84ae2c4212a5fad SHA512 4ff8be40004d77a07edda71b58307d4112f867b162f696e42efe0ce49897dc55d44219f1f86a414bc846ebf1cd7fb7d0f218634a9cb09534469cf0a120886967
+AUX patches/060_all_rlogin-rsh.patch 183 BLAKE2B b7306c5acd2eea9dddbce9451211bb843bc17043788fd32dec38e030284c14f2848d68b228460f2bfa7b93978e226b64f60040b374f968ad7307119852125b01 SHA512 bda846e32f0865039ea4253dedda2f4bd84fbd7bc9b745436e4721ff5203fd077806e05407b91eaa3a9e3fcb84aea0b87ce39484425ccd50ea2276561b75886f
+AUX patches/070_all_nokrb.patch 4799 BLAKE2B 77e97b8baec045abc8fa24526aeac490c8eae3d6876260c033ee4627dd9c8a037c5397f047843d6ee464d330b636d28a6a10dcd2de2c3be4516b658ad986a3fb SHA512 a73a54c0b8b46e1c80670d0a2745a7afe55f698767d6ddd0f0cbfd9b780c1f2014dc3e7755741131ab774ed7b4b5830255b0da71d4cadd39fbf0a7ec1bc18db2
+AUX patches/080_all_jbj5.patch 896 BLAKE2B 598688041ebca392daf44f6a5a6bae67ab1c8fd07d7438a98b1ad839138eccb20af64aedede429da8b8747cb8b92bde0ca813b6cb27f20cc098c95ceea86d5d8 SHA512 dac6316b8ac32bada3f8d4f05559fc6f6eede01f0924268ce78a8502ca72f48c655854e2eb5d3283330c66b9d149ac42fb26051613389426a23ae0b9473ae577
+AUX patches/090_all_userandhost.patch 1964 BLAKE2B 9ea3e9f7a7761f2d89a64c24c69300b9b7d4a96d05e3981ff2891a6e451b1d4c6c40dba666a49191252c16c57a3c3432c3a73f3be159666511e16d1072c787e7 SHA512 a21ab6e0f2802459ff5a75ea663c689fe2d94a85670e098fde3cc2bb27baa7f873927822ad1dd7bd5b10e25c410916fbd4880961c1b9d7f92ddbca4d42c957c9
+AUX patches/100_all_strip.patch 1955 BLAKE2B a5c9a5e2259e02836a6738933babfffde89b73f017787863a58a5d33d274ec97ca4e16c989aaa0aa7c9d12ffb128b80b222b70f2a8811252fd28375386a87c60 SHA512 ea7ab1de9000db11bf8985930a5a37cfa62032c40ecbe6efcff3d0f2e72e6c31de99f619f2a454762588579f393dde7bbc8151423c3689036cd4c6e37a8232ac
+AUX patches/110_all_lfs.patch 666 BLAKE2B e724c4aade06e001ad55d698092a2c345592bdc1f6074f009311373f6bd251f572ba2dc479bb75dbe47c1924e58165d9a61e2aef44f9c26bf9cd0cde0ba6c307 SHA512 c4def42cbb06a9bfaf0f03144a1937fcbefade6f871faa0bd25d50b9f78ad4fc6819528bd2696399102e1283b867c3a28b162a0819338b4477d24fe6281a1605
+AUX patches/120_all_chdir.patch 1128 BLAKE2B b5dc604291c11797225a0b38937cef5a540d86c509e425a57701af625d03913cd414832762881e4cc44cc340650bfa0b0011e452aff0dc5f62a06de3161e256c SHA512 fb7e4af8edb416f7fb0c53de8442be6f821e51356d866692d198d01e69e6408d0e9e028b66e755033371dc005d416fc41321d82c8712a76c8b30789df1fb147b
+AUX patches/130_all_pam-nologin.patch 424 BLAKE2B 425b9885b874a9671211bf36250ee87e51ed56c540adfc449d2eafe2ffa72cb2e90428d8566051f849c8666cbf046bf3edc9c402ebcaceb151518b4970328257 SHA512 cd48ffab0584c28673182f136369a61d4115ed04ce78b2171f0fbe21611051c9f9d9cc2b2b9362db40c88e7037ce205601a6dd48d157b78302c702204da76c91
+AUX patches/140_all_nohostcheck.patch 3590 BLAKE2B c0af0eb5f378c3d001bb60f1f1a03d8d11905f929da45a91cf10395837cb0e9f5417afd9831a050d3532e740c80fd6c30cd552006d19481ee26b28cec74fc9dd SHA512 03af6b852ca3ef6bb604b3355821d56448de84946b554dc01ec7c9b980c8d6bd50750a8cda9cfdf1ef2e416a03f4e59dfd933ee111d34a10b1cb2bbeab1706ab
+AUX patches/150_all_rexec-netrc.patch 6532 BLAKE2B 4c3a50ad8a1bf897ad68f75f1dba6dfc459b9712d6fad980a6d83a13cdd592880af34cc082eb1036c210f30a7e78555e330ed1bd461da4e2c154bc5bd33d69e3 SHA512 15fa63ce95101dc9067bffc9738a48c39e99a1349d59df68983190b8c3d178ba2953dc1b57e0cf1afb3e29bf6c62549008c7c9db03fa3ec5f33c16492ce88615
+AUX patches/160_all_pam-sess.patch 389 BLAKE2B 56a5a8947b46c34dfacf55a3829000ebf7f6e091f8933cc5cf50e5530cd99112c1d1c6596ea7ba035ee698942a77b7414c8f4b933e1e402f6399032d38832785 SHA512 77af7acdeab881f8f9005b0729c8358701425682c64934a56be74569a539a275e3b0f7a20c6b7f55958d9d8b7df61195a315c281f55f45b0d5e511653d046009
+AUX patches/170_all_errno.patch 1195 BLAKE2B 90431e9919c42aadd118930a2f48dfa52449dbb4c415ab1a2f7cf28ab0548e8a3b60f4dd49551fde6a876282c1a162962a9e3ae5acaa011ad3276d70b2a73397 SHA512 d460073db4311046a4eb38b14c5bb2aa01c994e898908c83b35f40a3bbe855231b54904b2599fcaeea40a9e3b7a08c73dda3f8acd60fb4641e269cda0f3f2750
+AUX patches/180_all_rexec-sig.patch 421 BLAKE2B 4bb79d6ba234c5c25b67cd033e81cb05a5c6042a2561c1b0b6d26ff4c6ee4db69ea9036106891248d63dd12c1e36c55ad902ea1ed5ecffe480fc6bc41053a4ba SHA512 2094e34742bbbb2543e250b6571a6a550df12dbaa5b74bdf7749ce8c6834cf885d23c42537ff708937b90a85e28a7021968990347fdcbbcf43ce71a5dde6f6f5
+AUX patches/190_all_nohost.patch 1433 BLAKE2B 2188cad20e8b5300301bbd8ebd928bd9869c8de62c28bf1e08e6de8df5442b68a1ace409d5ddc06631ed584439a32ffe813126bcbc8da41e4872920b3b1503c6 SHA512 f811ce446bb421dfcbbd569b429e6ab59f8f8d6fcb22ccd649d900184f6057702a94d469a65ffac7d3e3e50f1821d76afb6a2e780345b3de14d2555bc0bde4a2
+AUX patches/200_all_ignchld.patch 490 BLAKE2B 20f78355dc89a8b71e78eef75548ead425c043a8702fbea8c0e0cd4dd36cec49ed417158a7583ab87d38fcfcad8a96af797c81e57826e3c0c0e3c1524c3ab132 SHA512 eb28d704b503c040892df92fe1908e517f24a75efa380f1bce4622c45353eaf0053ad32cd60d81492873002a07ff253260b8dd61b794d38272d1a06e94482d23
+AUX patches/210_all_checkdir-r1.patch 636 BLAKE2B 186a3e40def64ffe85f78bb3f6bcda4fc8f0579a42fceb399fa24c46cffbe7e27c2e30ed635ce0381c882ecdf25ef32ad4ae5a9c5b459868c89a542854221532 SHA512 d6c799132028d14771099ef10f394a2e23e83c20537f62afc27425aa63f855a169b6cbee827195e6ede21dd9aade0e53040af97601f20f5b9534567008733f24
+AUX patches/220_all_fbsd.patch 4563 BLAKE2B 8367347c98f36d0dfd084af02a576a222a09b745ed31b7f3d56ff7bfe3f0bbd99969af16f46abe58ccb3e461a1b4605605571bcf9394be9cb59eb1e326fbd5d2 SHA512 388c6bc3174baf2aa28201d425bf5e8de6a1335433cef8801059ead9ea6bd34a2238e2c8bd0ea52f228f35e5741f49101ba14813a96ddc99278edf2e69c8e115
+AUX patches/230_all_MAX_ARG.patch 2676 BLAKE2B 08ac4287ad0955a11bc06d0d202f22d7b12f8638e6d38dd4f6b7d212a3fa65ed604fabaa4bad5a078650cc3ba5b219457d75d64b3847a033977c604c0962321f SHA512 bc9fcf87da46d9fa76500c86622ba38a340ee0c7fc72e226ca6daece561032b00e8a5140e477a62a448e6f284b081f0d8762691ef22fe676869ded68a334a11c
 AUX rexec.pamd-pambase 251 BLAKE2B 3592ce9fdb78eca4a86a24fe57394f70eb50f3f5dd5c2a20309d71f663e63cbe8b71878925ad3a7a82510a3ec2fe3e38225dfa9c087eb52b0035b4d0b19e74d9 SHA512 f787317e812f8308c19554b3868d2ccd67e1f6fd017c40fad911c43bc383d9b521cc597477e48d7e082901f2af1c8125cc0476e9a697469244a62b306ab35dc6
 AUX rexec.xinetd 280 BLAKE2B e03b835c3cf6528f55329e65332ae0ea401db5fa032b8880b56f34c693b60a4e9f7c58aad6fdb080ad25cb8184ca9e87bce909e150b919026481e4760076d43f SHA512 3443858e0d0f3f97669338b1f800ddb736a975a56af62dd553f4a41a4c6e4bd35149399c37734144de9076c1c7e7058c403d2b7af63fc79e8f3e6e1cc9d58ffb
 AUX rlogin.pamd-pambase 343 BLAKE2B cc9aadbbb9ec6d9bdbba996e4388ec75292b137f7843dd0fb111c0b568a36fe706e72fe52da512f63553f2d781315d8d8748eb0e644f54864d595fa7dd9337cb SHA512 639bd648ca75c854a23f18716568c23ee61e7358ac098e315e2d7ab2bd5f047c0bcbc878096225d86198f139a1fcbf9a51544f52e83e043422c6c29efb37902d
@@ -8,4 +32,5 @@ DIST netkit-rsh-0.17-patches-3.tar.lzma 13875 BLAKE2B 80470c4a9fdbfebd351217e48e
 DIST netkit-rsh-0.17.tar.gz 58268 BLAKE2B 7790a91f95c51f4aa538ad614e65ecba5a565e4761c7d8167f4d175bb8bcc27cb48b569f93064285dad983e602f03bcb816da58b02b54290adcd9cabe73cd88e SHA512 0d8da4a779da137f7b3f158ad010b71f2357c86a2160dbd19331cbf45f86a46110cdfdfd3c4ba2d19ddf3634917bf981eb91bfde02c3cdbc946df8695db75218
 DIST rexec-1.5.tar.gz 18469 BLAKE2B cbb694520332a0768b8337e854baf232271a30ac328dcf4b8b16d28dc3710ad58173e135cb9eb9726b07709bcd78ef627cea550c98e00dc86bea7c64e52aa3d1 SHA512 7ed455a921ad71749154bd8e586ac2a624f357b56be17db73b9ed7c1ca1bc19cfb9aee748f79cc649184dfb535ffe5e887643b73a25c3fb6520d4e19fae7333a
 EBUILD netkit-rsh-0.17-r11.ebuild 1757 BLAKE2B 80cacb4f88bd0cc40943649113331a251ef5f03d51b74c3177feb2197955f491d8e7ab3da2b6ec7c5f42c03b8a333373650b60a157535eb516f7b45251faeed4 SHA512 710c2554c034b08ee0768bba1c7ad92fa7feedd5d3b077a3e2e242917731670c8ac7ca06382bd62bc54e48c9bbbe34ee8138a0764731b94df314683b8ea87090
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD netkit-rsh-0.17-r12.ebuild 1728 BLAKE2B 7a3d6ba5b86bab6202a6f17fc7c54714f2d1fc697852b0ae516627b3f8e1bf9e6884aeaa8e4cca9988d1ba006f6070367ef7ff3d7a9a9020f71572488643c810 SHA512 209e0811832da3bb7a33cb3d1b1a8e1974a5842a1fc403d93cbf247ac1b979600563848a808736bb5862d8d25965540e5914ea191b97ec0a4d423ee67eeaac92
+MISC metadata.xml 396 BLAKE2B 2faf6277d8d91f7637052da914eda7083abdbca00344f668abb0064162a278b41bd1ac954873188ddcb858721a3cebd49d699346ed4b4bb1b7769e636ef771e9 SHA512 e99d549aed9466e8dba8999404556f63ff51c9b47703020c67d2002f4940c6d0484d6c70420a51c9c389fc1269a10b7e283af15e569a1e9a58fe4af93e07ac32
diff --git a/net-misc/netkit-rsh/files/patches/000_all_sectty.patch b/net-misc/netkit-rsh/files/patches/000_all_sectty.patch
new file mode 100644
index 000000000000..fdd761bd9912
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/000_all_sectty.patch
@@ -0,0 +1,32 @@
+--- a/rexecd/rexecd.c
++++ b/rexecd/rexecd.c
+@@ -300,6 +300,7 @@
+        PAM_password = pass;
+        pam_error = pam_start("rexec", PAM_username, &PAM_conversation,&pamh);
+        PAM_BAIL;
++       (void) pam_set_item (pamh, PAM_TTY, "rexec");   /* we don't have a tty yet! */
+        pam_error = pam_authenticate(pamh, 0);
+        PAM_BAIL;
+        pam_error = pam_acct_mgmt(pamh, 0);
+--- a/rlogind/auth.c
++++ b/rlogind/auth.c
+@@ -123,7 +123,7 @@
+     pam_set_item(pamh, PAM_USER, localuser);
+     pam_set_item(pamh, PAM_RUSER, remoteuser);
+     pam_set_item(pamh, PAM_RHOST, host);
+-    pam_set_item(pamh, PAM_TTY, "tty");   /* ? */
++    pam_set_item(pamh, PAM_TTY, "rlogin");   /* we don't have a tty yet! */
+ 	
+     network_confirm();
+     retval = attempt_auth();
+--- a/rshd/rshd.c
++++ b/rshd/rshd.c
+@@ -243,7 +243,7 @@
+     }
+     pam_set_item (pamh, PAM_RUSER, remuser);
+     pam_set_item (pamh, PAM_RHOST, hostname);
+-    pam_set_item (pamh, PAM_TTY, "tty");
++    pam_set_item (pamh, PAM_TTY, "rsh");  /* we don't use a tty, so punt */
+     
+     retcode = pam_authenticate(pamh, 0);
+     if (retcode == PAM_SUCCESS) {
diff --git a/net-misc/netkit-rsh/files/patches/010_all_rexec.patch b/net-misc/netkit-rsh/files/patches/010_all_rexec.patch
new file mode 100644
index 000000000000..ffdbdfffebc7
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/010_all_rexec.patch
@@ -0,0 +1,55 @@
+--- a/rexecd/rexecd.8
++++ b/rexecd/rexecd.8
+@@ -68,8 +68,9 @@
+ it is interpreted as the port number of a secondary
+ stream to be used for the 
+ .Em stderr .
+-A second connection is then created to the specified
+-port on the client's machine.
++A second connection will be created to the specified
++port on the client's machine after receiving and authenticating
++the user, password, and command from the client.
+ .It
+ A NUL terminated user name of at most 16 characters
+ is retrieved on the initial socket.
+--- a/rexec/Makefile
++++ b/rexec/Makefile
+@@ -1,30 +1,23 @@
+ 
+ SHELL = /bin/sh
+ 
+-BINDIR = /usr/local/bin
+-MANDIR = /usr/local/man/man1
++include ../MCONFIG
++include ../MRULES
+ 
+ # Uncomment this line if you get link errors under Solaris
+ #LDLIBS=-lsocket -lnsl
+ 
+ .PHONY: all
+ 
+-all: rexec install
++all: rexec
+ 
+ rexec: rexec.c
+ 
+ rexec.1:
+ 
++clean:
++	rm -f *.o rexec
++
+ install: rexec rexec.1
+-	@ echo "Installation:  Press enter for defaults."; \
+-	echo -n "Enter the location to install executable "; \
+-	echo -n " (default: $(BINDIR)): "; \
+-	read bindir; \
+-	bindir=$${bindir:-$(BINDIR)}; \
+-	echo -n "Enter the manpage location (default $(MANDIR)): ";\
+-	read mandir; \
+-	mandir=$${mandir:-$(MANDIR)}; \
+-	cp rexec $$bindir; \
+-	chmod a+rx $${bindir}/rexec; \
+-	cp rexec.1 $$mandir; \
+-	chmod a+r $${mandir}/rexec.1
++	install -m 0755 rexec $(INSTALLROOT)/$(BINDIR)/rexec
++	install -m 0644 rexec.1 $(INSTALLROOT)/$(MANDIR)/man1/rexec.1
diff --git a/net-misc/netkit-rsh/files/patches/020_all_stdarg.patch b/net-misc/netkit-rsh/files/patches/020_all_stdarg.patch
new file mode 100644
index 000000000000..a9ec010330ab
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/020_all_stdarg.patch
@@ -0,0 +1,43 @@
+--- a/rcp/rcp.c
++++ b/rcp/rcp.c
+@@ -836,19 +836,33 @@
+ error(const char *fmt, ...)
+ {
+ 	static FILE *fp;
+-	va_list ap;
+-
+-	va_start(ap, fmt);
++	char buf[1000];
+ 
+ 	++errs;
+ 	if (!fp && !(fp = fdopen(rem, "w")))
+ 		return;
+-	fprintf(fp, "%c", 0x01);
+-	vfprintf(fp, fmt, ap);
++	
++	/* (fmt,...) might need to go to two streams.
++	 *
++	 * In { va_start ; vfprintf ; vfprintf ; va_end }, second
++	 * vfprintf didn't restart (ie: vfprintf affects ap) (glibc)
++	 *
++	 * Is { va_start ; vfprintf ; va_end} * 2 even allowed?
++	 *
++	 * => Dump (fmt,...) to buffer.  */
++	
++	{
++	    va_list ap;
++	    va_start(ap, fmt);
++	    vsnprintf(buf, sizeof(buf), fmt, ap);
++	    buf[sizeof(buf)-1] = 0;
++	    va_end(ap);
++	}
++	
++	fprintf(fp, "%c%s", 0x01, buf);
+ 	fflush(fp);
+-	if (!iamremote)	vfprintf(stderr, fmt, ap);
+ 
+-	va_end(ap);
++	if (!iamremote)	fputs(buf, stderr);
+ }
+ 
+ static void 
diff --git a/net-misc/netkit-rsh/files/patches/030_all_jbj.patch b/net-misc/netkit-rsh/files/patches/030_all_jbj.patch
new file mode 100644
index 000000000000..3f5e661b705f
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/030_all_jbj.patch
@@ -0,0 +1,33 @@
+--- a/rcp/Makefile
++++ b/rcp/Makefile
+@@ -7,7 +7,7 @@
+ 	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ install: rcp
+-	install -s -o root -m$(SUIDMODE) rcp $(INSTALLROOT)$(BINDIR)
++	install -s rcp $(INSTALLROOT)$(BINDIR)
+ 	install -m$(MANMODE) rcp.1 $(INSTALLROOT)$(MANDIR)/man1
+ 
+ clean:
+--- a/rlogin/Makefile
++++ a/rlogin/Makefile
+@@ -10,7 +10,7 @@
+ 	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ install: $(PROG)
+-	install -s -o root -m$(SUIDMODE) $(PROG) $(INSTALLROOT)$(BINDIR)
++	install -s $(PROG) $(INSTALLROOT)$(BINDIR)
+ 	install -m $(MANMODE) $(PROG).1 $(INSTALLROOT)$(MANDIR)/man1
+ 
+ clean:
+--- a/rsh/Makefile
++++ b/rsh/Makefile
+@@ -9,7 +9,7 @@
+ 	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ install: rsh
+-	install -s -o root -m$(SUIDMODE) rsh $(INSTALLROOT)$(BINDIR)
++	install -s rsh $(INSTALLROOT)$(BINDIR)
+ 	install -m$(MANMODE) rsh.1 $(INSTALLROOT)$(MANDIR)/man1
+ 
+ clean:
diff --git a/net-misc/netkit-rsh/files/patches/040_all_jbj4.patch b/net-misc/netkit-rsh/files/patches/040_all_jbj4.patch
new file mode 100644
index 000000000000..41c98d27606d
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/040_all_jbj4.patch
@@ -0,0 +1,14 @@
+--- a/rshd/Makefile
++++ b/rshd/Makefile
+@@ -6,9 +6,8 @@
+ OBJS = rshd.o
+ 
+ ifeq ($(USE_PAM),1)
+-# ?
+-CFLAGS += # -DUSE_PAM
+-LIBS += -ldl # -lpam -lpam_misc
++CFLAGS += -DUSE_PAM
++LIBS += -ldl -lpam -lpam_misc
+ endif
+ 
+ rshd: $(OBJS)
diff --git a/net-misc/netkit-rsh/files/patches/050_all_prompt.patch b/net-misc/netkit-rsh/files/patches/050_all_prompt.patch
new file mode 100644
index 000000000000..5f6a89dc1d94
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/050_all_prompt.patch
@@ -0,0 +1,37 @@
+--- a/rexec/rexec.c
++++ b/rexec/rexec.c
+@@ -164,12 +164,30 @@
+     user_name[strlen(user_name)-1] = '\0'; /* Hopefully fgets always adds
+ 					      a newline. */
+     passwd = getpass("Password: ");
++  } else {
++
++    if ( user_name == NULL )
++      user_name = getenv("REXEC_USER");
++    if ( user_name == NULL ) {
++      uid_t uid = getuid();
++      struct passwd *pw = getpwuid(uid);
++      if (!(pw && pw->pw_name)) {
++        fprintf(stderr, "Can't lookup uid %d\n", uid);
++	exit(1);
++      }
++      user_name = strdup(pw->pw_name);
++    }
++    if ( passwd == NULL )
++      passwd = getenv("REXEC_PASS");
++    if ( passwd == NULL )
++       passwd = getpass("Password: ");
+   }
+ 
+-  if ( user_name == NULL )
+-    user_name = getenv("REXEC_USER");
+-  if ( passwd == NULL )
+-    passwd = getenv("REXEC_PASS");
++  if (!(user_name && passwd)) {
++    fprintf(stderr, "Can't use %s without supplying a user and password\n",
++    	progname);
++    exit(1);
++  }
+ 
+   if ( (sock = rexec(&host, port_exec, user_name, passwd, command, 
+ 		     p_to_aux_sock)) < 0 )
diff --git a/net-misc/netkit-rsh/files/patches/060_all_rlogin-rsh.patch b/net-misc/netkit-rsh/files/patches/060_all_rlogin-rsh.patch
new file mode 100644
index 000000000000..83a530765a9c
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/060_all_rlogin-rsh.patch
@@ -0,0 +1,10 @@
+--- a/rlogin/rlogin.c
++++ b/rlogin/rlogin.c
+@@ -194,6 +194,7 @@
+ 		p = argv[0];
+ 
+ 	if (strcmp(p, "rlogin"))
++	if (strcmp(p, "rsh"))
+ 		host = p;
+ 
+ 	/* handle "rlogin host flags" */
diff --git a/net-misc/netkit-rsh/files/patches/070_all_nokrb.patch b/net-misc/netkit-rsh/files/patches/070_all_nokrb.patch
new file mode 100644
index 000000000000..2d7029374405
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/070_all_nokrb.patch
@@ -0,0 +1,231 @@
+diff -uNr a/rcp/rcp.1 a/rcp/rcp.1
+--- a/rcp/rcp.1
++++ b/rcp/rcp.1
+@@ -41,12 +41,10 @@
+ .Sh SYNOPSIS
+ .Nm rcp
+ .Op Fl px
+-.Op Fl k Ar realm
+ .Ar file1 file2
+ .Nm rcp
+ .Op Fl px
+ .Op Fl r
+-.Op Fl k Ar realm
+ .Ar file ...
+ .Ar directory
+ .Sh DESCRIPTION
+@@ -79,27 +77,6 @@
+ modified by the
+ .Xr umask  2
+ on the destination host is used.
+-.It Fl k
+-The
+-.Fl k
+-option requests
+-.Nm rcp
+-to obtain tickets
+-for the remote host in realm
+-.Ar realm
+-instead of the remote host's realm as determined by
+-.Xr krb_realmofhost  3  .
+-.It Fl x
+-The
+-.Fl x
+-option turns on
+-.Tn DES
+-encryption for all data passed by
+-.Nm rcp .
+-This may impact response time and
+-.Tn CPU
+-utilization, but provides
+-increased security.
+ .El
+ .Pp
+ If
+@@ -134,11 +111,6 @@
+ .Nm rcp
+ command appeared in
+ .Bx 4.2 .
+-The version of
+-.Nm rcp
+-described here
+-has been reimplemented with Kerberos in
+-.Bx 4.3 Reno .
+ .Sh BUGS
+ Doesn't detect all cases where the target of a copy might
+ be a file in cases where only a directory should be legal.
+diff -uNr a/rlogin/rlogin.1 a/rlogin/rlogin.1
+--- a/rlogin/rlogin.1
++++ b/rlogin/rlogin.1
+@@ -42,7 +42,6 @@
+ .Ar rlogin
+ .Op Fl 8EKLdx
+ .Op Fl e Ar char
+-.Op Fl k Ar realm
+ .Op Fl l Ar username
+ .Ar host
+ .Sh DESCRIPTION
+@@ -50,9 +49,7 @@
+ starts a terminal session on a remote host
+ .Ar host  .
+ .Pp
+-.Nm Rlogin
+-first attempts to use the Kerberos authorization mechanism, described below.
+-If the remote host does not supporting Kerberos the standard Berkeley
++The standard Berkeley
+ .Pa rhosts
+ authorization mechanism is used.
+ The options are as follows:
+@@ -71,10 +68,6 @@
+ When used with the
+ .Fl 8
+ option, this provides a completely transparent connection.
+-.It Fl K
+-The
+-.Fl K
+-option turns off all Kerberos authentication.
+ .It Fl L
+ The
+ .Fl L
+@@ -94,25 +87,6 @@
+ ``~'' by default.
+ This specification may be as a literal character, or as an octal
+ value in the form \ennn.
+-.It Fl k
+-The
+-.FL k
+-option requests rlogin to obtain tickets for the remote host
+-in realm
+-.Ar realm
+-instead of the remote host's realm as determined by
+-.Xr krb_realmofhost  3  .
+-.It Fl x
+-The
+-.Fl x
+-option turns on
+-.Tn DES
+-encryption for all data passed via the
+-rlogin session.
+-This may impact response time and
+-.Tn CPU
+-utilization, but provides
+-increased security.
+ .El
+ .Pp
+ A line of the form ``<escape char>.'' disconnects from the remote host.
+@@ -129,35 +103,6 @@
+ is transparent.
+ Flow control via ^S/^Q and flushing of input and output on interrupts
+ are handled properly.
+-.Sh KERBEROS AUTHENTICATION
+-Each user may have a private authorization list in the file
+-.Pa .klogin
+-in their home directory.
+-Each line in this file should contain a Kerberos principal name of the
+-form
+-.Ar principal.instance@realm  .
+-If the originating user is authenticated to one of the principals named
+-in
+-.Pa .klogin ,
+-access is granted to the account.
+-The principal
+-.Ar accountname.@localrealm
+-is granted access if
+-there is no
+-.Pa .klogin
+-file.
+-Otherwise a login and password will be prompted for on the remote machine
+-as in
+-.Xr login  1  .
+-To avoid certain security problems, the
+-.Pa .klogin
+-file must be owned by
+-the remote user.
+-.Pp
+-If Kerberos authentication fails, a warning message is printed and the
+-standard Berkeley
+-.Nm rlogin
+-is used instead.
+ .Sh ENVIRONMENT
+ The following environment variable is utilized by
+ .Nm rlogin :
+@@ -167,9 +112,6 @@
+ .El
+ .Sh SEE ALSO
+ .Xr rsh 1 ,
+-.Xr kerberos 3 ,
+-.Xr krb_sendauth 3 ,
+-.Xr krb_realmofhost 3
+ .Sh HISTORY
+ The
+ .Nm rlogin
+diff -uNr a/rsh/rsh.1 a/rsh/rsh.1
+--- a/rsh/rsh.1
++++ b/rsh/rsh.1
+@@ -41,7 +41,6 @@
+ .Sh SYNOPSIS
+ .Nm rsh
+ .Op Fl Kdnx
+-.Op Fl k Ar realm
+ .Op Fl l Ar username
+ .Ar host
+ .Op command
+@@ -62,10 +61,6 @@
+ normally terminates when the remote command does.
+ The options are as follows:
+ .Bl -tag -width flag
+-.It Fl K
+-The
+-.Fl K
+-option turns off all Kerberos authentication.
+ .It Fl d
+ The
+ .Fl d
+@@ -74,23 +69,11 @@
+ on the
+ .Tn TCP
+ sockets used for communication with the remote host.
+-.It Fl k
+-The
+-.Fl k
+-option causes
+-.Nm rsh
+-to obtain tickets for the remote host in
+-.Ar realm
+-instead of the remote host's realm as determined by
+-.Xr krb_realmofhost  3  .
+ .It Fl l
+ By default, the remote username is the same as the local username.
+ The
+ .Fl l
+ option allows the remote name to be specified.
+-Kerberos authentication is used, and authorization is determined
+-as in
+-.Xr rlogin  1  .
+ .It Fl n
+ The
+ .Fl n
+@@ -99,13 +82,6 @@
+ (see the
+ .Sx BUGS
+ section of this manual page).
+-.It Fl x
+-The
+-.Fl x
+-option turns on
+-.Tn DES
+-encryption for all data exchange.
+-This may introduce a significant delay in response time.
+ .El
+ .Pp
+ If no
+@@ -142,9 +118,6 @@
+ .El
+ .Sh SEE ALSO
+ .Xr rlogin 1 ,
+-.Xr kerberos 3 ,
+-.Xr krb_sendauth 3 ,
+-.Xr krb_realmofhost 3
+ .Sh HISTORY
+ The
+ .Nm rsh
diff --git a/net-misc/netkit-rsh/files/patches/080_all_jbj5.patch b/net-misc/netkit-rsh/files/patches/080_all_jbj5.patch
new file mode 100644
index 000000000000..5bfd70ac91af
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/080_all_jbj5.patch
@@ -0,0 +1,29 @@
+--- a/rlogind/auth.c
++++ b/rlogind/auth.c
+@@ -37,6 +37,7 @@
+ #include "rlogind.h"
+ 
+ #ifdef USE_PAM
++#include <grp.h>
+ 
+ /*
+  * Modifications for Linux-PAM: Al Longyear <longyear@netcom.com>
+@@ -158,18 +159,14 @@
+     pwd = getpwnam(localuser);
+     if (pwd==NULL) {
+         syslog(LOG_ERR, "user returned by PAM does not exist\n");
+-	/* don't print this - it tells people which accounts exist */
+-	/*fprintf(stderr, "rlogind: internal error\n");*/
+ 	return -1;
+     }
+     if (setgid(pwd->pw_gid) != 0) {
+         syslog(LOG_ERR, "cannot assume gid for user returned by PAM\n");
+-	fprintf(stderr, "rlogind: internal error\n");
+ 	return -1;
+     }
+     if (initgroups(localuser, pwd->pw_gid) != 0) {
+         syslog(LOG_ERR, "initgroups failed for user returned by PAM\n");
+-	fprintf(stderr, "rlogind: internal error\n");
+ 	return -1;
+     }
+     retval = pam_setcred(pamh, PAM_ESTABLISH_CRED);
diff --git a/net-misc/netkit-rsh/files/patches/090_all_userandhost.patch b/net-misc/netkit-rsh/files/patches/090_all_userandhost.patch
new file mode 100644
index 000000000000..42f135b6e2c2
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/090_all_userandhost.patch
@@ -0,0 +1,70 @@
+--- a/rlogind/rlogind.c
++++ b/rlogind/rlogind.c
+@@ -333,9 +333,10 @@
+ 
+ 
+ static void child(const char *hname, const char *termtype,
+-		  const char *localuser, int authenticated)
++		  const char *localuser, int authenticated,
++		  const char *rusername)
+ {
+-    char *termenv[2];
++    char *termenv[4];
+ 
+     setup_term(0, termtype);
+ 
+@@ -344,7 +345,17 @@
+ 	strcpy(termenv[0], "TERM=");
+ 	strcat(termenv[0], termtype);
+     }
+-    termenv[1] = NULL;
++    termenv[1] = malloc(strlen(rusername)+12);
++    if (termenv[1]) {   /* shouldn't ever fail, mind you */
++	strcpy(termenv[1], "REMOTEUSER=");
++	strcat(termenv[1], rusername);
++    }
++    termenv[2] = malloc(strlen(hname)+12);
++    if (termenv[2]) {   /* shouldn't ever fail, mind you */
++	strcpy(termenv[2], "REMOTEHOST=");
++	strcat(termenv[2], hname);
++    }
++    termenv[3] = NULL;
+ 
+     if (authenticated) {
+ 	auth_finish();
+@@ -420,7 +431,7 @@
+     if (pid == 0) {
+ 	/* netfd should always be 0, but... */ 
+ 	if (netfd > 2) close(netfd);
+-	child(hname, termtype, lusername, authenticated);
++	child(hname, termtype, lusername, authenticated, rusername);
+     }
+     on = 1;
+     ioctl(netfd, FIONBIO, &on);
+--- a/rshd/rshd.c
++++ b/rshd/rshd.c
+@@ -102,8 +102,10 @@
+ char	homedir[64] = "HOME=";
+ char	shell[64] = "SHELL=";
+ char	path[100] = "PATH=";
++char	remoteuser[20] = "REMOTEUSER=";
++char	remotehost[50] = "REMOTEHOST=";
+ char	*envinit[] =
+-	    {homedir, shell, path, username, 0};
++	    {homedir, shell, path, username, remoteuser, remotehost, 0};
+ extern	char	**environ;
+ 
+ static void error(const char *fmt, ...);
+@@ -460,6 +462,12 @@
+ 	strncat(homedir, pwd->pw_dir, sizeof(homedir)-6);
+ 	homedir[sizeof(homedir)-1] = 0;
+ 
++	strncat(remoteuser, remuser, sizeof(remoteuser)-12);
++	remoteuser[sizeof(remoteuser)-1] = 0;
++
++	strncat(remotehost, hostname, sizeof(remotehost)-12);
++	remotehost[sizeof(remotehost)-1] = 0;
++
+ 	strcat(path, _PATH_DEFPATH);
+ 
+ 	strncat(shell, theshell, sizeof(shell)-7);
diff --git a/net-misc/netkit-rsh/files/patches/100_all_strip.patch b/net-misc/netkit-rsh/files/patches/100_all_strip.patch
new file mode 100644
index 000000000000..c22765b10dcd
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/100_all_strip.patch
@@ -0,0 +1,66 @@
+--- a/rcp/Makefile
++++ b/rcp/Makefile
+@@ -7,7 +7,7 @@
+ 	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ install: rcp
+-	install -s rcp $(INSTALLROOT)$(BINDIR)
++	install rcp $(INSTALLROOT)$(BINDIR)
+ 	install -m$(MANMODE) rcp.1 $(INSTALLROOT)$(MANDIR)/man1
+ 
+ clean:
+--- a/rexecd/Makefile
++++ b/rexecd/Makefile
+@@ -27,7 +27,7 @@
+ 	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ install: rexecd
+-	install -s -m$(DAEMONMODE) rexecd $(INSTALLROOT)$(SBINDIR)/in.rexecd
++	install -m$(DAEMONMODE) rexecd $(INSTALLROOT)$(SBINDIR)/in.rexecd
+ 	install -m$(MANMODE) rexecd.8 $(INSTALLROOT)$(MANDIR)/man8/in.rexecd.8
+ 	ln -sf in.rexecd.8 $(INSTALLROOT)$(MANDIR)/man8/rexecd.8
+ ifeq ($(USE_PAM),1)
+--- a/rlogin/Makefile
++++ b/rlogin/Makefile
+@@ -10,7 +10,7 @@
+ 	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ install: $(PROG)
+-	install -s $(PROG) $(INSTALLROOT)$(BINDIR)
++	install $(PROG) $(INSTALLROOT)$(BINDIR)
+ 	install -m $(MANMODE) $(PROG).1 $(INSTALLROOT)$(MANDIR)/man1
+ 
+ clean:
+--- a/rlogind/Makefile
++++ b/rlogind/Makefile
+@@ -20,7 +20,7 @@
+ auth.o network.o: rlogind.h
+ 
+ install: rlogind
+-	install -s -m$(DAEMONMODE) rlogind $(INSTALLROOT)$(SBINDIR)/in.rlogind
++	install -m$(DAEMONMODE) rlogind $(INSTALLROOT)$(SBINDIR)/in.rlogind
+ 	install -m$(MANMODE) rlogind.8 $(INSTALLROOT)$(MANDIR)/man8/in.rlogind.8
+ 	ln -sf in.rlogind.8 $(INSTALLROOT)$(MANDIR)/man8/rlogind.8
+ 
+--- a/rsh/Makefile
++++ b/rsh/Makefile
+@@ -9,7 +9,7 @@
+ 	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ install: rsh
+-	install -s rsh $(INSTALLROOT)$(BINDIR)
++	install rsh $(INSTALLROOT)$(BINDIR)
+ 	install -m$(MANMODE) rsh.1 $(INSTALLROOT)$(MANDIR)/man1
+ 
+ clean:
+--- a/rshd/Makefile
++++ b/rshd/Makefile
+@@ -14,7 +14,7 @@
+ 	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ install: rshd
+-	install -s -m$(DAEMONMODE) rshd $(INSTALLROOT)$(SBINDIR)/in.rshd
++	install -m$(DAEMONMODE) rshd $(INSTALLROOT)$(SBINDIR)/in.rshd
+ 	install -m$(MANMODE) rshd.8 $(INSTALLROOT)$(MANDIR)/man8/in.rshd.8
+ 	ln -sf in.rshd.8 $(INSTALLROOT)$(MANDIR)/man8/rshd.8
+ 
diff --git a/net-misc/netkit-rsh/files/patches/110_all_lfs.patch b/net-misc/netkit-rsh/files/patches/110_all_lfs.patch
new file mode 100644
index 000000000000..49a3970a03fb
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/110_all_lfs.patch
@@ -0,0 +1,25 @@
+--- a/rcp/rcp.c
++++ b/rcp/rcp.c
+@@ -482,7 +482,7 @@
+ 			}
+ 		}
+ 		(void)snprintf(buf, sizeof(buf),
+-		    "C%04o %ld %s\n", stb.st_mode&07777, stb.st_size, last);
++		    "C%04o %lld %s\n", stb.st_mode&07777, (long long)(stb.st_size), last);
+ 		(void)write(rem, buf, (int)strlen(buf));
+ 		if (response() < 0) {
+ 			(void)close(f);
+@@ -614,11 +614,11 @@
+ 	struct timeval tv[2];
+ 	enum { YES, NO, DISPLAYED } wrerr;
+ 	BUF *bp;
+-	off_t i, j;
++	off_t i, j, size;
+ 	char ch, *targ;
+ 	const char *why;
+ 	int amt, count, exists, first, mask, mode;
+-	int ofd, setimes, size, targisdir;
++	int ofd, setimes, targisdir;
+ 	char *np, *vect[1], buf[BUFSIZ];
+ 
+ #define	atime	tv[0]
diff --git a/net-misc/netkit-rsh/files/patches/120_all_chdir.patch b/net-misc/netkit-rsh/files/patches/120_all_chdir.patch
new file mode 100644
index 000000000000..2309a118385c
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/120_all_chdir.patch
@@ -0,0 +1,57 @@
+--- a/rshd/rshd.c
++++ b/rshd/rshd.c
+@@ -388,15 +388,6 @@
+ 		     remuser, hostname, locuser, cmdbuf);
+ 	}
+ 
+-	if (chdir(pwd->pw_dir) < 0) {
+-		chdir("/");
+-		/*
+-		 * error("No remote directory.\n");
+-		 * exit(1);
+-		 */
+-	}
+-
+-
+ 	if (pwd->pw_uid != 0 && !access(_PATH_NOLOGIN, F_OK)) {
+ 		error("Logins currently disabled.\n");
+ 		exit(1);
+@@ -456,6 +447,14 @@
+ 		exit(1);
+ 	}
+ 	environ = envinit;
++
++	if (chdir(pwd->pw_dir) < 0) {
++		chdir("/");
++		/*
++		 * error("No remote directory.\n");
++		 * exit(1);
++		 */
++	}
+ 
+ 	strncat(homedir, pwd->pw_dir, sizeof(homedir)-6);
+ 	homedir[sizeof(homedir)-1] = 0;
+--- a/rexecd/rexecd.c
++++ b/rexecd/rexecd.c
+@@ -375,10 +375,6 @@
+ 	/* Log successful attempts. */
+ 	syslog(LOG_INFO, "login from %.128s as %s", remote, user);
+ 
+-	if (chdir(pwd->pw_dir) < 0) {
+-		fatal("No remote directory.\n");
+-	}
+-
+ 	write(2, "\0", 1);
+ 	if (port) {
+ 		/* If we have a port, dup STDERR on that port KRH */
+@@ -408,6 +404,10 @@
+ 	if (setuid(pwd->pw_uid)) {
+ 		perror("setuid");
+ 		exit(1);
++	}
++
++	if (chdir(pwd->pw_dir) < 0) {
++		fatal("No remote directory.\n");
+ 	}
+ 
+ 	strcat(path, _PATH_DEFPATH);
diff --git a/net-misc/netkit-rsh/files/patches/130_all_pam-nologin.patch b/net-misc/netkit-rsh/files/patches/130_all_pam-nologin.patch
new file mode 100644
index 000000000000..b9e8cb147f34
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/130_all_pam-nologin.patch
@@ -0,0 +1,14 @@
+--- a/rlogind/auth.c
++++ b/rlogind/auth.c
+@@ -127,7 +127,10 @@
+ 	
+     network_confirm();
+     retval = attempt_auth();
+-    if (retval != PAM_SUCCESS) {
++    if ((retval == PAM_ACCT_EXPIRED) || (retval == PAM_PERM_DENIED)) {
++	syslog(LOG_ERR, "PAM authentication denied for in.rlogind");
++	exit(1);
++    } else if (retval != PAM_SUCCESS) {
+ 	syslog(LOG_ERR, "PAM authentication failed for in.rlogind");
+ 	return -1;
+     }
diff --git a/net-misc/netkit-rsh/files/patches/140_all_nohostcheck.patch b/net-misc/netkit-rsh/files/patches/140_all_nohostcheck.patch
new file mode 100644
index 000000000000..022fc7fd3bca
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/140_all_nohostcheck.patch
@@ -0,0 +1,134 @@
+--- a/rlogind/network.c
++++ b/rlogind/network.c
+@@ -90,7 +90,7 @@
+ 
+ 
+ static char *
+-find_hostname(const struct sockaddr_in *fromp, int *hostokp)
++find_hostname(const struct sockaddr_in *fromp, int no_host_check, int *hostokp)
+ {
+ 	struct hostent *hop;
+ 	char *hname;
+@@ -102,7 +102,7 @@
+ 		hname = strdup(inet_ntoa(fromp->sin_addr));
+ 		hostok = 1;
+ 	} 
+-	else if (check_all || local_domain(hop->h_name)) {
++	else if ((check_all || local_domain(hop->h_name )) && !no_host_check ) {
+ 		/*
+ 		 * If name returned by gethostbyaddr is in our domain,
+ 		 * attempt to verify that we haven't been fooled by someone
+@@ -143,7 +143,7 @@
+ 
+ 
+ char * 
+-network_init(int f, int *hostokp)
++network_init(int f, int no_host_check, int *hostokp)
+ {
+ 	struct sockaddr_in from, *fromp;
+ 	socklen_t fromlen;
+@@ -177,7 +177,7 @@
+ 
+ 	alarm(0);
+ 
+-	hname = find_hostname(fromp, hostokp);
++	hname = find_hostname(fromp,no_host_check, hostokp);
+ 
+ 	port = ntohs(fromp->sin_port);
+ 	if (fromp->sin_family != AF_INET ||
+--- a/rlogind/rlogind.c
++++ b/rlogind/rlogind.c
+@@ -84,6 +84,7 @@
+ int use_rhosts = 1;
+ int allow_root_rhosts = 0;
+ int deny_all_rhosts_hequiv = 0;
++static int no_host_check = 0;
+ 
+ static char oobdata[] = {(char)TIOCPKT_WINDOW};
+ static char line[MAXPATHLEN];
+@@ -386,7 +387,7 @@
+     int hostok;
+     char lusername[32], rusername[32], termtype[256];
+ 
+-    hname = network_init(netfd, &hostok);
++    hname = network_init(netfd, no_host_check, &hostok);
+ 
+     getstr(rusername, sizeof(rusername), "remuser too long");
+     getstr(lusername, sizeof(lusername), "locuser too long");
+@@ -439,15 +440,16 @@
+     openlog("rlogind", LOG_PID | LOG_CONS, LOG_AUTH);
+ 
+     opterr = 0;
+-    while ((ch = getopt(argc, argv, "ahLln")) != EOF) {
++    while ((ch = getopt(argc, argv, "ahLlDn")) != EOF) {
+ 	switch (ch) {
+ 	    case 'a': check_all = 1; break;
+ 	    case 'h': allow_root_rhosts = 1; break;
+ 	    case 'L': deny_all_rhosts_hequiv = 1; break;
+ 	    case 'l': use_rhosts = 0; break;
++	    case 'D': no_host_check = 1; break;			      
+ 	    case 'n': keepalive = 0; break;
+ 	    case '?': default:
+-		syslog(LOG_ERR, "usage: rlogind [-ahLln]");
++		syslog(LOG_ERR, "usage: rlogind [-ahLlDn]");
+ 		break;
+ 	}
+     }
+--- a/rlogind/rlogind.h
++++ b/rlogind/rlogind.h
+@@ -3,7 +3,7 @@
+ void fatal(int f, const char *msg, int syserr);
+ 
+ /* network.c */
+-char *network_init(int fd, int *hostokp);
++char *network_init(int fd, int no_host_check, int *hostokp);
+ void network_confirm(void);
+ void network_anticonfirm(void);
+ void network_close(void);
+--- a/rshd/rshd.c
++++ b/rshd/rshd.c
+@@ -90,13 +90,14 @@
+ static pam_handle_t *pamh;
+ #endif /* USE_PAM */
+ 
+-#define	OPTIONS	"ahlLn"
++#define	OPTIONS	"ahlLnD"
+ 
+ static int keepalive = 1;
+ static int check_all = 0;
+ static int paranoid = 0;
+ static int sent_null;
+-static int allow_root_rhosts=0;
++static int allow_root_rhosts = 0;
++static int no_host_check = 0;
+ 
+ char	username[20] = "USER=";
+ char	homedir[64] = "HOME=";
+@@ -305,6 +306,7 @@
+ 	/*
+ 	 * Attempt to confirm the DNS. 
+ 	 */
++
+ #ifdef	RES_DNSRCH
+ 	_res.options &= ~RES_DNSRCH;
+ #endif
+@@ -323,6 +325,8 @@
+ 	}
+ 	syslog(LOG_NOTICE, "Host addr %s not listed for host %s",
+ 	       inet_ntoa(fromp->sin_addr), hp->h_name);
++	if ( no_host_check == 1 ) 
++		return hostname;
+ 	fail("Host address mismatch for %s\n", 
+ 	     remuser, inet_ntoa(fromp->sin_addr), locuser, cmdbuf);
+ 	return NULL; /* not reachable */
+@@ -596,6 +600,10 @@
+ 			paranoid = 1;
+ 			break;
+ 
++		case 'D':
++			no_host_check = 1;
++			break;	
++			
+ 		case '?':
+ 		default:
+ 			syslog(LOG_ERR, "usage: rshd [-%s]", OPTIONS);
diff --git a/net-misc/netkit-rsh/files/patches/150_all_rexec-netrc.patch b/net-misc/netkit-rsh/files/patches/150_all_rexec-netrc.patch
new file mode 100644
index 000000000000..13b4b84fad10
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/150_all_rexec-netrc.patch
@@ -0,0 +1,251 @@
+--- a/rexec/ruserpass.c
++++ b/rexec/ruserpass.c
+@@ -0,0 +1,214 @@
++/*
++ * Copyright (c) 1985 Regents of the University of California.
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. All advertising materials mentioning features or use of this software
++ *    must display the following acknowledgement:
++ *	This product includes software developed by the University of
++ *	California, Berkeley and its contributors.
++ * 4. Neither the name of the University nor the names of its contributors
++ *    may be used to endorse or promote products derived from this software
++ *    without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++ * SUCH DAMAGE.
++ */
++
++/*
++ * from: @(#)ruserpass.c	5.3 (Berkeley) 3/1/91
++ */
++char ruserpass_rcsid[] = 
++  "$Id: 150_all_rexec-netrc.patch,v 1.1 2006/10/14 23:09:28 drizzt Exp $";
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <utmp.h>
++#include <ctype.h>
++#include <sys/stat.h>
++#include <sys/param.h>
++#include <errno.h>
++#include <string.h>
++#include <unistd.h>
++
++static FILE *cfile;
++static int token(void);
++
++#define MACBUF_LEN 4096
++
++#define	DEFAULT	1
++#define	LOGIN	2
++#define	PASSWD	3
++#define	ACCOUNT 4
++#define MACDEF  5
++#define	ID	10
++#define	MACH	11
++
++static char tokval[100];
++
++static struct toktab {
++	const char *tokstr;
++	int tval;
++} toktab[]= {
++	{ "default",	DEFAULT },
++	{ "login",	LOGIN },
++	{ "password",	PASSWD },
++	{ "passwd",	PASSWD },
++	{ "account",	ACCOUNT },
++	{ "machine",	MACH },
++	{ "macdef",	MACDEF },
++	{ NULL,		0 }
++};
++
++int
++xruserpass(const char *host, char **aname, char **apass)
++{
++	const char *hdir;
++	char buf[BUFSIZ], *tmp;
++	char myname[MAXHOSTNAMELEN];
++	const char *mydomain;
++	int t, usedefault = 0;
++	struct stat stb;
++
++	hdir = getenv("HOME");
++	if (hdir == NULL)
++		hdir = ".";
++	snprintf(buf, sizeof(buf), "%s/.netrc", hdir);
++	cfile = fopen(buf, "r");
++	if (cfile == NULL) {
++		if (errno != ENOENT)
++			perror(buf);
++		return(0);
++	}
++	if (gethostname(myname, sizeof(myname)) < 0)
++		myname[0] = '\0';
++	if ((mydomain = strchr(myname, '.')) == NULL)
++		mydomain = "";
++next:
++	while ((t = token())) switch(t) {
++
++	case DEFAULT:
++		usedefault = 1;
++		/* FALL THROUGH */
++
++	case MACH:
++		if (!usedefault) {
++			if (token() != ID)
++				continue;
++			/*
++			 * Allow match of incompletely-specified host in 
++			 * local domain.
++			 */
++			if (strcasecmp(host, tokval) == 0)
++				goto match;
++			if ((tmp = index(host, '.')) != NULL &&
++			    strcasecmp(tmp, mydomain) == 0 &&
++			    strncasecmp(host, tokval, tmp - host) == 0 &&
++			    tokval[tmp - host] == '\0')
++				goto match;
++			continue;
++		}
++	match:
++		while ((t = token()) && t != MACH && t != DEFAULT) switch(t) {
++
++		case LOGIN:
++			if (token()) {
++				if (*aname == 0) { 
++					*aname = malloc((unsigned) strlen(tokval) + 1);
++					(void) strcpy(*aname, tokval);
++				} else {
++					if (strcmp(*aname, tokval))
++						goto next;
++				}
++			}
++			break;
++		case PASSWD:
++			if (*aname==NULL) {
++	fprintf(stderr, "Error: `password' must follow `login' in .netrc\n");
++				goto bad;
++			}
++			if (strcmp(*aname, "anonymous") &&
++			    fstat(fileno(cfile), &stb) >= 0 &&
++			    (stb.st_mode & 077) != 0) {
++	fprintf(stderr, "Error - .netrc file not correct permissions.\n");
++	fprintf(stderr, "Remove password or correct mode (should be 600).\n");
++				goto bad;
++			}
++			if (token() && *apass == 0) {
++				*apass = malloc((unsigned) strlen(tokval) + 1);
++				(void) strcpy(*apass, tokval);
++			}
++			break;
++		case ACCOUNT:
++			break;
++		case MACDEF:
++			break;
++		default:
++	fprintf(stderr, "Unknown .netrc keyword %s\n", tokval);
++			break;
++		}
++		goto done;
++	}
++done:
++	(void) fclose(cfile);
++	return(0);
++bad:
++	(void) fclose(cfile);
++	return(-1);
++}
++
++static 
++int
++token(void)
++{
++	char *cp;
++	int c;
++	struct toktab *t;
++
++	if (feof(cfile))
++		return (0);
++	while ((c = getc(cfile)) != EOF &&
++	    (c == '\n' || c == '\t' || c == ' ' || c == ','))
++		continue;
++	if (c == EOF)
++		return (0);
++	cp = tokval;
++	if (c == '"') {
++		while ((c = getc(cfile)) != EOF && c != '"') {
++			if (c == '\\')
++				c = getc(cfile);
++			*cp++ = c;
++		}
++	} else {
++		*cp++ = c;
++		while ((c = getc(cfile)) != EOF
++		    && c != '\n' && c != '\t' && c != ' ' && c != ',') {
++			if (c == '\\')
++				c = getc(cfile);
++			*cp++ = c;
++		}
++	}
++	*cp = 0;
++	if (tokval[0] == 0)
++		return (0);
++	for (t = toktab; t->tokstr; t++)
++		if (!strcmp(t->tokstr, tokval))
++			return (t->tval);
++	return (ID);
++}
+--- a/rexec/rexec.c
++++ b/rexec/rexec.c
+@@ -100,6 +100,8 @@
+ void echo_sig(int sig);
+ void safe_write_error(const char *message);
+ 
++int xruserpass(const char *host, char **aname, char **apass);
++
+ /* These need to be global for signal passing. */
+ int aux_sock=-1; /* Socket for auxiliary channel. */
+ int extra_error = 1; /* Setup special channel for standard error? */
+@@ -165,7 +167,10 @@
+ 					      a newline. */
+     passwd = getpass("Password: ");
+   } else {
+-
++    if (xruserpass(host, &user_name, &passwd) < 0) {
++	user_name = NULL;
++	passwd = NULL;
++    }
+     if ( user_name == NULL )
+       user_name = getenv("REXEC_USER");
+     if ( user_name == NULL ) {
+--- a/rexec/Makefile.netrc
++++ b/rexec/Makefile
+@@ -11,7 +11,7 @@
+ 
+ all: rexec
+ 
+-rexec: rexec.c
++rexec: rexec.o ruserpass.o
+ 
+ rexec.1:
+ 
diff --git a/net-misc/netkit-rsh/files/patches/160_all_pam-sess.patch b/net-misc/netkit-rsh/files/patches/160_all_pam-sess.patch
new file mode 100644
index 000000000000..e0d416576d18
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/160_all_pam-sess.patch
@@ -0,0 +1,12 @@
+--- a/rexecd/rexecd.c
++++ b/rexecd/rexecd.c
+@@ -307,6 +307,9 @@
+        PAM_BAIL;
+        pam_error = pam_setcred(pamh, PAM_ESTABLISH_CRED);
+        PAM_BAIL;
++       pam_error = pam_open_session(pamh, 0);
++       PAM_BAIL;
++       pam_close_session(pamh, 0);
+        pam_end(pamh, PAM_SUCCESS);
+        /* If this point is reached, the user has been authenticated. */
+        setpwent();
diff --git a/net-misc/netkit-rsh/files/patches/170_all_errno.patch b/net-misc/netkit-rsh/files/patches/170_all_errno.patch
new file mode 100644
index 000000000000..32b1d0ee01d3
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/170_all_errno.patch
@@ -0,0 +1,51 @@
+--- a/rcp/rcp.c
++++ b/rcp/rcp.c
+@@ -613,6 +613,7 @@
+ 	struct stat stb;
+ 	struct timeval tv[2];
+ 	enum { YES, NO, DISPLAYED } wrerr;
++	int werrno = 0;
+ 	BUF *bp;
+ 	off_t i, j, size;
+ 	char ch, *targ;
+@@ -766,6 +767,7 @@
+ 		cp = bp->buf;
+ 		count = 0;
+ 		wrerr = NO;
++		werrno = 0;
+ 		for (i = 0; i < size; i += BUFSIZ) {
+ 			amt = BUFSIZ;
+ 			if (i + amt > size)
+@@ -784,16 +786,20 @@
+ 			} while (amt > 0);
+ 			if (count == bp->cnt) {
+ 				if (wrerr == NO &&
+-				    write(ofd, bp->buf, count) != count)
++				    write(ofd, bp->buf, count) != count) {
+ 					wrerr = YES;
++					werrno = errno;
++				}
+ 				count = 0;
+ 				cp = bp->buf;
+ 			}
+ 		}
+ 		if (count != 0 && wrerr == NO &&
+-		    write(ofd, bp->buf, count) != count)
++		    write(ofd, bp->buf, count) != count) {
+ 			wrerr = YES;
+-		if (ftruncate(ofd, size)) {
++			werrno = errno;
++		}
++		if (wrerr == NO && ftruncate(ofd, size)) {
+ 			error("rcp: can't truncate %s: %s\n", np,
+ 			    strerror(errno));
+ 			wrerr = DISPLAYED;
+@@ -810,7 +816,7 @@
+ 		}
+ 		switch(wrerr) {
+ 		case YES:
+-			error("rcp: %s: %s\n", np, strerror(errno));
++			error("rcp: %s: %s\n", np, strerror(werrno));
+ 			break;
+ 		case NO:
+ 			(void)write(rem, "", 1);
diff --git a/net-misc/netkit-rsh/files/patches/180_all_rexec-sig.patch b/net-misc/netkit-rsh/files/patches/180_all_rexec-sig.patch
new file mode 100644
index 000000000000..4896bfa2349f
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/180_all_rexec-sig.patch
@@ -0,0 +1,17 @@
+--- a/rexec/rexec.c
++++ b/rexec/rexec.c
+@@ -434,10 +434,10 @@
+     break;
+   default:
+     if ( sigaction(sig, NULL, &action) < 0 )
+-    {
+-      perror(progname);
+-      exit(1);
+-    }
++	    /* in the signal(7) you can found "...except SIGKILL and SIGSTOP",
++	     * but we detect problems with more signals...
++	     */
++	    return;
+     if ( action.sa_handler != SIG_IGN )
+     {
+       action.sa_handler = handler;
diff --git a/net-misc/netkit-rsh/files/patches/190_all_nohost.patch b/net-misc/netkit-rsh/files/patches/190_all_nohost.patch
new file mode 100644
index 000000000000..8258eb10576c
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/190_all_nohost.patch
@@ -0,0 +1,63 @@
+--- a/rexecd/rexecd.8
++++ b/rexecd/rexecd.8
+@@ -40,6 +40,16 @@
+ .Nd remote execution server
+ .Sh SYNOPSIS
+ .Nm rexecd
++[
++\fB\-D\fP
++]
++.Sh OPTIONS
++.Nm Rexec
++accepts one option:
++.Pp
++.Bl -tag -width Ds
++.It Sy -D
++Disable reverse DNS look up and in the log will be used client IP addresses.
+ .Sh DESCRIPTION
+ .Nm Rexecd
+ is the server for the 
+--- a/rexecd/rexecd.c
++++ b/rexecd/rexecd.c
+@@ -82,7 +82,9 @@
+ #include <string.h>
+ #include <paths.h>
+ #include <grp.h>
+-
++#include <arpa/inet.h>
++  
++  
+ #ifdef USE_SHADOW
+ #include <shadow.h>
+ #endif
+@@ -141,16 +143,22 @@
+ 		refuse(&from_host);
+ 	remote = hosts_info(&from_host);
+ #else
++	if (argc > 1 && argv[1] && strcmp(argv[1], "-D")==0)
+ 	{
+-	struct hostent *h = gethostbyaddr((const char *)&from.sin_addr,
+-					  sizeof(struct in_addr),
+-					  AF_INET);
+-	if (!h || !h->h_name) {
+-		write(0, "\1Where are you?\n", 16);
+-		return 1;
++		/* use IP in logs -- this is workaround */
++		remote = strdup(inet_ntoa(from.sin_addr));
+ 	}
+-	/* Be advised that this may be utter nonsense. */
+-	remote = strdup(h->h_name);
++	else
++	{
++		struct hostent *h = gethostbyaddr((const char *)&from.sin_addr,
++				  sizeof(struct in_addr),
++				  AF_INET);
++		if (!h || !h->h_name) {
++			write(0, "\1Where are you?\n", 16);
++			return 1;
++		}
++		/* Be advised that this may be utter nonsense. */
++		remote = strdup(h->h_name);
+ 	}
+ #endif
+ 	syslog(allow_severity, "connect from %.128s", remote);
diff --git a/net-misc/netkit-rsh/files/patches/200_all_ignchld.patch b/net-misc/netkit-rsh/files/patches/200_all_ignchld.patch
new file mode 100644
index 000000000000..f916458d47d4
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/200_all_ignchld.patch
@@ -0,0 +1,22 @@
+--- a/rlogind/rlogind.c
++++ b/rlogind/rlogind.c
+@@ -440,7 +440,7 @@
+     ioctl(master, TIOCPKT, &on);
+     signal(SIGCHLD, cleanup);
+     protocol(netfd, master);
+-    signal(SIGCHLD, SIG_IGN);
++    signal(SIGCHLD, SIG_DFL);
+     cleanup(0);
+ }
+ 
+--- a/rlogin/rlogin.c
++++ b/rlogin/rlogin.c
+@@ -523,7 +523,7 @@
+ stop(char cmdc)
+ {
+ 	mode(0);
+-	signal(SIGCHLD, SIG_IGN);
++	signal(SIGCHLD, SIG_DFL);
+ 	kill(cmdc == defsusp ? 0 : getpid(), SIGTSTP);
+ 	signal(SIGCHLD, catch_child);
+ 	mode(1);
diff --git a/net-misc/netkit-rsh/files/patches/210_all_checkdir-r1.patch b/net-misc/netkit-rsh/files/patches/210_all_checkdir-r1.patch
new file mode 100644
index 000000000000..4fde40315503
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/210_all_checkdir-r1.patch
@@ -0,0 +1,23 @@
+--- a/rcp/rcp.c
++++ b/rcp/rcp.c
+@@ -716,6 +716,11 @@
+ 			size = size * 10 + (*cp++ - '0');
+ 		if (*cp++ != ' ')
+ 			SCREWUP("size not delimited");
++		if (*cp == '\0' || strchr(cp, '/') != NULL ||
++		    strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
++			error("error: unexpected filename: %s", cp);
++			exit(1);
++		}
+ 		if (targisdir) {
+ 			static char *namebuf;
+ 			static int cursize;
+@@ -735,6 +739,8 @@
+ 			np = targ;
+ 		exists = stat(np, &stb) == 0;
+ 		if (buf[0] == 'D') {
++			if (!iamrecursive)
++				SCREWUP("received directory without -r");
+ 			if (exists) {
+ 				if ((stb.st_mode&S_IFMT) != S_IFDIR) {
+ 					errno = ENOTDIR;
diff --git a/net-misc/netkit-rsh/files/patches/220_all_fbsd.patch b/net-misc/netkit-rsh/files/patches/220_all_fbsd.patch
new file mode 100644
index 000000000000..3b108c17f4a2
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/220_all_fbsd.patch
@@ -0,0 +1,222 @@
+--- a/configure
++++ b/configure
+@@ -368,9 +368,35 @@
+ 
+ ##################################################
+ 
++echo -n 'Checking for rexec... '
++cat <<EOF >__conftest.c
++int main() { rexec(0, 0, 0, 0, 0, 0); }
++
++EOF
++
++if (
++      $CC $CFLAGS  __conftest.c  -o __conftest || exit 1
++   ) >/dev/null 2>&1; then
++    echo 'yes'
++else
++    if (
++          $CC $CFLAGS  __conftest.c -lcompat -o __conftest || exit 1
++       ) >/dev/null 2>&1; then
++        echo '-lcompat'
++        LIBS="$LIBS -lcompat"
++    else
++            echo 'no'
++            echo 'This package requires rexec.'
++            rm -f __conftest*
++            exit
++    fi
++fi
++rm -f __conftest*
++
++##################################################
++
+ echo -n 'Checking for forkpty... '
+ cat <<EOF >__conftest.c
+-#include <pty.h>
+ int main() { forkpty(0, 0, 0, 0); }
+ 
+ EOF
+--- a/rcp/rcp.c
++++ b/rcp/rcp.c
+@@ -50,6 +50,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/wait.h>
++#include <netinet/in_systm.h>
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <dirent.h>
+@@ -100,7 +101,7 @@
+ static void error(const char *fmt, ...);
+ 
+ int
+-main(int argc, char *argv[])
++main(int argc, char *argv[], char **env)
+ {
+ 	struct servent *sp;
+ 	int ch, fflag, tflag;
+@@ -108,8 +109,8 @@
+ 	const char *shell;
+ 	char *null = NULL;
+ 
+-	saved_environ = __environ;
+-	__environ = &null;
++	saved_environ = env;
++	env = &null;
+ 
+ 	fflag = tflag = 0;
+ 	while ((ch = getopt(argc, argv, OPTIONS)) != EOF)
+--- a/rexec/Makefile
++++ b/rexec/Makefile
+@@ -12,6 +12,7 @@
+ all: rexec
+ 
+ rexec: rexec.o ruserpass.o
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
+ 
+ rexec.1:
+ 
+--- a/rexec/ruserpass.c
++++ b/rexec/ruserpass.c
+@@ -39,6 +39,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <utmp.h>
+ #include <ctype.h>
+ #include <sys/stat.h>
+--- a/rexecd/rexecd.c
++++ b/rexecd/rexecd.c
+@@ -76,7 +76,9 @@
+ #include <errno.h>
+ #include <syslog.h>
+ #include <unistd.h>
++#if defined(__GLIBC__)
+ #include <crypt.h>    /* apparently necessary in some glibcs */
++#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- a/rlogin/rlogin.c
++++ b/rlogin/rlogin.c
+@@ -56,6 +56,7 @@
+ #include <sys/resource.h>
+ #include <sys/wait.h>
+ #include <sys/ioctl.h>
++#include <netinet/in_systm.h>
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <netdb.h>
+@@ -96,6 +97,13 @@
+ #define	SIGUSR1	30
+ #endif
+ 
++#ifndef TABDLY
++#define TABDLY OXTABS
++#endif
++#ifndef TAB3
++#define TAB3 OXTABS
++#endif
++
+ struct termios defmodes;
+ struct termios ixon_state;
+ static int eight, litout, rem;
+@@ -172,7 +180,7 @@
+ }
+ 
+ int
+-main(int argc, char **argv)
++main(int argc, char **argv, char **env)
+ {
+ 	struct passwd *pw;
+ 	struct servent *sp;
+@@ -265,7 +273,7 @@
+   	}
+ 	else snprintf(term, sizeof(term), "%.256s", t);
+ 
+-	__environ = &null;
++	env = &null;
+ 
+ 	get_window_size(0, &winsize);
+ 
+@@ -421,7 +429,7 @@
+ void
+ catch_child(int ignore)
+ {
+-	union wait status;
++	int status;
+ 	int pid;
+ 
+ 	(void)ignore;
+@@ -432,7 +440,7 @@
+ 			return;
+ 		/* if the child (reader) dies, just quit */
+ 		if (pid < 0 || (pid == childpid && !WIFSTOPPED(status)))
+-			done((int)(status.w_termsig | status.w_retcode));
++			done((int)(WTERMSIG(status) | WEXITSTATUS(status)));
+ 	}
+ 	/* NOTREACHED */
+ }
+--- a/rlogind/auth.c
++++ b/rlogind/auth.c
+@@ -31,6 +31,7 @@
+  * SUCH DAMAGE.
+  */
+ 
++#include <stdio.h>
+ #include <sys/types.h>
+ #include <pwd.h>
+ 
+@@ -190,7 +191,7 @@
+ #include <sys/socket.h>   /* for ruserok() in libc5 (!) */
+ #include <netdb.h>        /* for ruserok() in glibc (!) */
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
++#if !(defined(__GLIBC__) && (__GLIBC__ < 2))
+ #define _check_rhosts_file  __check_rhosts_file
+ #endif
+ extern int _check_rhosts_file;
+--- a/rsh/rsh.c
++++ b/rsh/rsh.c
+@@ -69,7 +69,7 @@
+ static void usage(void);
+ 
+ int
+-main(int argc, char *argv[])
++main(int argc, char *argv[], char **env)
+ {
+ 	struct passwd *pw;
+ 	struct servent *sp;
+@@ -80,8 +80,8 @@
+ 	char *null = NULL;
+ 	char **saved_environ;
+ 
+-	saved_environ = __environ;
+-	__environ = &null;
++	saved_environ = env;
++	env = &null;
+ 
+ 	argoff = asrsh = dflag = nflag = 0;
+ 	one = 1;
+--- a/rshd/rshd.c
++++ b/rshd/rshd.c
+@@ -80,7 +80,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+ 
+-#if defined(__GLIBC__) && (__GLIBC__ >= 2)
++#if !(defined(__GLIBC__) && (__GLIBC__ < 2))
+ #define _check_rhosts_file  __check_rhosts_file
+ #endif
+ 
+@@ -420,7 +420,7 @@
+ 			stderr_parent(sock, pv[0], pid);
+ 			/* NOTREACHED */
+ 		}
+-		setpgrp();
++		setpgid(0,0);
+ 		close(sock); 
+ 		close(pv[0]);
+ 		dup2(pv[1], 2);
diff --git a/net-misc/netkit-rsh/files/patches/230_all_MAX_ARG.patch b/net-misc/netkit-rsh/files/patches/230_all_MAX_ARG.patch
new file mode 100644
index 000000000000..1b069b5c5e42
--- /dev/null
+++ b/net-misc/netkit-rsh/files/patches/230_all_MAX_ARG.patch
@@ -0,0 +1,96 @@
+fix building when ARG_MAX is not defined
+
+patch by Tom-Steve Watzke
+
+http://bugs.gentoo.org/225341
+
+--- a/rexecd/rexecd.c
++++ b/rexecd/rexecd.c
+@@ -85,6 +85,7 @@ char rcsid[] =
+ #include <paths.h>
+ #include <grp.h>
+ #include <arpa/inet.h>
++#include <limits.h>
+   
+   
+ #ifdef USE_SHADOW
+@@ -233,7 +234,8 @@ static struct pam_conv PAM_conversation = {
+ static void
+ doit(struct sockaddr_in *fromp)
+ {
+-	char cmdbuf[ARG_MAX+1];
++	char *cmdbuf;
++	int cmdbuflen;
+ 	char user[16], pass[16];
+ 	struct passwd *pwd;
+ 	int s = -1;
+@@ -252,6 +254,15 @@ doit(struct sockaddr_in *fromp)
+ #endif
+ #endif /* USE_PAM */
+ 
++	cmdbuflen = sysconf(_SC_ARG_MAX);
++	if (cmdbuflen < _POSIX_ARG_MAX)
++		cmdbuflen = _POSIX_ARG_MAX;
++	cmdbuf = malloc(cmdbuflen);
++	if (cmdbuf == NULL) {
++		syslog(LOG_ERR, "unable to malloc(%i) for command buffer: %s", cmdbuflen, strerror(errno));
++		fatal("out of memory\n");
++	}
++
+ 	signal(SIGINT, SIG_DFL);
+ 	signal(SIGQUIT, SIG_DFL);
+ 	signal(SIGTERM, SIG_DFL);
+@@ -301,7 +312,7 @@ doit(struct sockaddr_in *fromp)
+ 
+ 	getstr(user, sizeof(user), "username too long\n");
+ 	getstr(pass, sizeof(pass), "password too long\n");
+-	getstr(cmdbuf, sizeof(cmdbuf), "command too long\n");
++	getstr(cmdbuf, cmdbuflen, "command too long\n");
+ #ifdef USE_PAM
+        #define PAM_BAIL if (pam_error != PAM_SUCCESS) { \
+ 	       pam_end(pamh, pam_error); exit(1); \
+--- a/rshd/rshd.c
++++ b/rshd/rshd.c
+@@ -79,6 +79,7 @@ char rcsid[] =
+ #include <stdarg.h>
+ #include <ctype.h>
+ #include <assert.h>
++#include <limits.h>
+ 
+ #if !(defined(__GLIBC__) && (__GLIBC__ < 2))
+ #define _check_rhosts_file  __check_rhosts_file
+@@ -337,7 +338,8 @@ static const char *findhostname(struct sockaddr_in *fromp,
+ static void
+ doit(struct sockaddr_in *fromp)
+ {
+-	char cmdbuf[ARG_MAX+1];
++	char *cmdbuf;
++	int cmdbuflen;
+ 	const char *theshell, *shellname;
+ 	char locuser[16], remuser[16];
+ 	struct passwd *pwd;
+@@ -346,6 +348,15 @@ doit(struct sockaddr_in *fromp)
+ 	u_short port;
+ 	int pv[2], pid, ifd;
+ 
++	cmdbuflen = sysconf(_SC_ARG_MAX);
++	if (cmdbuflen < _POSIX_ARG_MAX)
++		cmdbuflen = _POSIX_ARG_MAX;
++	cmdbuf = malloc(cmdbuflen);
++	if (cmdbuf == NULL) {
++		syslog(LOG_ERR, "unable to malloc(%i) for command buffer: %s", cmdbuflen, strerror(errno));
++		exit(1);
++	}
++
+ 	signal(SIGINT, SIG_DFL);
+ 	signal(SIGQUIT, SIG_DFL);
+ 	signal(SIGTERM, SIG_DFL);
+@@ -382,7 +393,7 @@ doit(struct sockaddr_in *fromp)
+ 
+ 	getstr(remuser, sizeof(remuser), "remuser");
+ 	getstr(locuser, sizeof(locuser), "locuser");
+-	getstr(cmdbuf, sizeof(cmdbuf), "command");
++	getstr(cmdbuf, cmdbuflen, "command");
+ 	if (!strcmp(locuser, "root")) paranoid = 1;
+ 
+ 	hostname = findhostname(fromp, remuser, locuser, cmdbuf);
diff --git a/net-misc/netkit-rsh/metadata.xml b/net-misc/netkit-rsh/metadata.xml
index 7a38bb900964..d095ed4b8f81 100644
--- a/net-misc/netkit-rsh/metadata.xml
+++ b/net-misc/netkit-rsh/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/netkit-rsh/netkit-rsh-0.17-r12.ebuild b/net-misc/netkit-rsh/netkit-rsh-0.17-r12.ebuild
new file mode 100644
index 000000000000..d8a316de1ce4
--- /dev/null
+++ b/net-misc/netkit-rsh/netkit-rsh-0.17-r12.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam toolchain-funcs fcaps
+
+DESCRIPTION="Netkit's Remote Shell Suite: rexec{,d} rlogin{,d} rsh{,d}"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz
+	mirror://gentoo/rexec-1.5.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="pam"
+
+RDEPEND="
+	sys-libs/ncurses:=
+	pam? ( >=sys-auth/pambase-20080219.1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/xz-utils"
+
+PATCHES=(
+	"${FILESDIR}"/patches/
+)
+
+FILECAPS=( cap_net_bind_service usr/bin/r{cp,login,sh} )
+
+src_prepare() {
+	# This must happen before patches are applied
+	rm -r rexec || die
+	mv ../rexec rexec || die
+
+	default
+
+	if tc-is-cross-compiler ; then
+		# Can't do runtime tests when cross-compiling
+		sed -i -e "s|./__conftest|: ./__conftest|" configure || die
+	fi
+}
+
+src_configure() {
+	tc-export CC
+	${CONFIG_SHELL:-/bin/sh} ./configure $(usex pam '' '--without-pam') || die
+
+	sed -i \
+		-e "s|-pipe -O2|${CFLAGS}|" \
+		-e "/^LDFLAGS=$/d" \
+		-e "s|-Wpointer-arith||" \
+		MCONFIG || die
+}
+
+src_install() {
+	insinto /etc/xinetd.d
+
+	local b
+	for b in rcp rexec{,d} rlogin{,d} rsh{,d} ; do
+		if [[ ${b} == *d ]] ; then
+			dosbin ${b}/${b}
+			dosym ${b} /usr/sbin/in.${b}
+			doman ${b}/${b}.8
+		else
+			dobin ${b}/${b}
+			doman ${b}/${b}.1
+			if [[ ${b} != rcp ]]; then
+				newins "${FILESDIR}"/${b}.xinetd ${b}
+
+				if use pam; then
+					newpamd "${FILESDIR}/${b}.pamd-pambase" ${b}
+				fi
+			fi
+		fi
+	done
+
+	dodoc README ChangeLog BUGS
+	newdoc rexec/README README.rexec
+}
diff --git a/net-misc/oidc-agent/Manifest b/net-misc/oidc-agent/Manifest
index ce6cf4d353a1..b43cff54f8b6 100644
--- a/net-misc/oidc-agent/Manifest
+++ b/net-misc/oidc-agent/Manifest
@@ -2,5 +2,5 @@ AUX oidc-agent-4.0.2_install-perms.patch 1931 BLAKE2B 9061a41dc805f98c4813f967f2
 AUX oidc-agent-4.0.2_makefile-liblist-automagic.patch 448 BLAKE2B df7716192364c71619af14cdd88323a2b6ac7b382d76326aacafa0814dc141416fdda87fc3a11eae8c333e0ac4fcad4386d2e902e13a300a12bd5cbe25df11d7 SHA512 b1145a26fe837a06291067c62bb939b76993e10194a0fc155cfc892677e4f432e0744410dee23eaf14f3a04a9a0c5d8629abaa7c40e3e1abe28ccb2868a41ceb
 AUX oidc-agent-4.0.2_makefile-toolchain-vars.patch 1214 BLAKE2B 2e2c78973049160a9b6210d2180bb851c11a31ce90c8c1af5f05b0d86cd7cdce572c564c4117ec23f286c72a4d701b52ec815f6f30e68c58353fe5394bd210e6 SHA512 22c561c057be1de9ba1747a0234225954ec953f2bdecb0cc05149891e6fc43fede14808dbf59e9e27e5e5e8041d22b16ba4d46e366bd5b96a2b567b2d26a0f8d
 DIST oidc-agent-4.0.2.tar.gz 802872 BLAKE2B bbee872f0b029f4289a4805d1a5f8fe2fe2b8c297a918cf7821aec6bf4dbe634882425c888cb0e784778b56754af1c8b5a34d5282f84090cccf6315897ccb461 SHA512 fef440cd4b72055d8175f9f33c735235bb87bfca38b53bc4e049b1644f74f6a683d312297efa04cbacfe55190c5d6b588fa37475e5a55acff540909865389037
-EBUILD oidc-agent-4.0.2.ebuild 2123 BLAKE2B b6e3857511ef297bfc0b677df0b6ab343bd57c6c55ead807129e59930888f93074872359da9cbe46ce40b163ad36c50000b2df67e315aa19a815ea69abe277db SHA512 af0a22e5cca7196203c74a6edca8167ecd4b60011b52cf075a27f8bb90a91424b85613799a6401d5410e2bed8b3f5a42e122d3b97851892392ef717667af8600
+EBUILD oidc-agent-4.0.2.ebuild 2130 BLAKE2B 32d3eb8dfca12421f40b086dd79cce36ccf3c2b45c003a4642369245e28270cf1df8d9e7b8f870d6c606e11a19a59d1f0d78e111cc6f9e458289808ebbe6f314 SHA512 5915027ae1d15ee1394af98780133b18a0b20a0c9a6f372a138c4aea1083596d807b3426c5b42932c5ecfbd0a35f0b6cf4ebc9f8c15cf1d6a666654ab572f2b4
 MISC metadata.xml 779 BLAKE2B ef7a040559363a8012380b3f8568f963a612078c2d5e5129f54db724d414d6c7864e79e480eba5574fd36847caa13a09a7ac7013f5ceb406d83e3be5ebdb47e9 SHA512 f9465b4e88418ec276071683b5abbe8f7601e54daf0cb74da2d24d142e2307b1bb994ee4191eee48ed1b3fef724ad49b548cef12cc4c77088c2f2d07e1b8a776
diff --git a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
index 31efe94451d4..4e919397b10d 100644
--- a/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
+++ b/net-misc/oidc-agent/oidc-agent-4.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/indigo-dc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 ~riscv"
 IUSE="test"
 
 DEPEND="app-crypt/libsecret
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index fa94992856e5..2a3cf0d5dd94 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -1,5 +1,5 @@
 DIST ownCloud-2.7.6.3261.tar.xz 14237692 BLAKE2B 914b069b10fa2f169677768e1578c5b8569836eb574889c72c0ea1ca3e16e6b7c65bcdd1f4a5ce4259eab6ec56110e3b45799d010921e47c7f64ccfd0ed545bf SHA512 1f647dd0b33472e31719651fa22b5864867d98fa1e2f11f9eadb6ce15382f5f97ac49d726af079716b6fac573367485a6f11a5b2e5e5c95d4d063f6caab51dcd
 DIST ownCloud-2.8.2.4246.tar.xz 15044652 BLAKE2B ee1ee412667266273a9a9722940559562c6c43213b013fe7c21328e04ac967afb16f460e6fa711f37d1d4ea7d0fc15fc398d835cf6a939f4c8dfd54cd4846fed SHA512 0ab2ef72191cc2d5c2621c97c09cb1d25472a30f511235a190465e246a8312f13a255011abb9690c481887f2f15094414c87ce594252eb8debcb39b9cbc8a178
 EBUILD owncloud-client-2.7.6.3261.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
-EBUILD owncloud-client-2.8.2.4246.ebuild 1852 BLAKE2B 896e6adc0fda698804334fcbff6e8494ad368d8adb80a680967829fbb0eac9b70b5249e1fe226573da1107613c18b81adbda3726a5e8edb504a0ffd0692c191b SHA512 043b7b52181e1ac358b214d73c79a37c96e36115ef7c1a00139a262b9b8d402f6f1ea18b2f1f3c82e4affa8fa8d36ab05df5e1694328b0737ebb9850099bdd8b
+EBUILD owncloud-client-2.8.2.4246.ebuild 1859 BLAKE2B 424772bdbf79268cd0f5fbd26fe3fdac8cfa2d39407a6d89ee787c446ab8f0ceebf742dbbfa395beddc06d52f6768c1433fe70f19a3ffa6c5bdc6877f3d3fea9 SHA512 75a68396594feb6f1e4cedcea377b90e9b4c1e2ac0926985632e5d1b0473a60885f3ecd545518751b1a738b4fc1563b74468aba6e0793bf36b44791362aad0ab
 MISC metadata.xml 431 BLAKE2B 9b495fdaa517bd56e7333305fbe7a9447fea599b96a3fe92121d4114812c1e6822b0095f65cee2207a0d2a8a667e4b4e9658d2e6a2a1c2563fe58397a9919b20 SHA512 0f8487e586ea6e6580dfcb816e7b17944cf822978b275b2e8e5f7feffc360bc69230236406a8b95aa5bd1342a14cb763fb39b9e1244d524bfea6d8f5ce831f49
diff --git a/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild b/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
index 4afe35f947d5..36e5f6e64222 100644
--- a/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
+++ b/net-misc/owncloud-client/owncloud-client-2.8.2.4246.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.owncloud.com/desktop/${MY_PN}/stable/${PV}/source/${MY
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc dolphin gnome-keyring nautilus test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index e3365aae43d8..8dac235438f1 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -10,5 +10,5 @@ DIST teamviewer_15.19.3_i386.tar.xz 62513708 BLAKE2B 959286f2e265204f703c9e6efcb
 EBUILD teamviewer-15.15.5.ebuild 4027 BLAKE2B 8c597b6b34f440ce5fed8e6fab07d57fd6e70d9a78392e435a0133e7d6f6f4bc51e99fc80598f632eab8d0713fe153a4d4984b51cecbabff04744ac952d7f7a3 SHA512 87a8087b5e4de9fe6b618abc1effdc6abcff605214ff90d804324353f0a9c6e9fdb29fae1a02315fd5a0ba3843b2e004285ab0350ef1b361295c1794714da239
 EBUILD teamviewer-15.17.6-r1.ebuild 4042 BLAKE2B 43fc88ba97e92ee98398d072d926e7b344dc904996f424270fb558d2edbac287724df3c082461ce8eee8411f0c54a676ff1f069e784a100f7f912363b187fc21 SHA512 949265ca6c08ad52e503563b7be381a42e800474a3def791fe49411770b4a788941b4b2a22413ed407f21d0f521511dddda75baecd490d89494d95ce7843f52b
 EBUILD teamviewer-15.18.5.ebuild 4045 BLAKE2B 2039a40e0bb5181fe210ea82e33f532eeeb5211fd27ea801f4a497b0e5b7f54edbff44ea05cfd96aa9c09b3d2ed9e1f13cccd2b45875eb191e44cd01552450d6 SHA512 ca2f9b1907f6723d296f5a40e9b5e87b548b347a8aa323739e9abdd4947b51dbe58fe879127197026b3d625a69bfc81f99487c9b05796a3fcc7d8566af473f41
-EBUILD teamviewer-15.19.3-r1.ebuild 4521 BLAKE2B d7ebc342c81a6b227fe5311ef8d6ff7ccace17d61a787365d5b40c79d940f44e532388c86dec38a8316b47eda926bd0b70d8720632fa521896e6116a048c50a5 SHA512 80f33f364e9a09a42b21d09f3b23938ee8e3b77f9eaeeb406eff12c10c1b8e958c81283da853c3dd68b25bf2c9015e2d61c65f31477513b01ada0997bb3e6c46
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD teamviewer-15.19.3-r2.ebuild 4527 BLAKE2B 2738a5bec353c27344ef053b8ca73169420528c6408d9ca7f01d465d0e041c09806d569f98f184e87a17a6b786005b17e449d9e414967e0f1a3bd171fc9bde2f SHA512 eafd6402451d9b27084efcef084a20ad4c5658857499899f5898db9ec37e496be976d542e580d515cfd4b6076ef833ad9be45957197928a762fa2e41979fbde9
+MISC metadata.xml 397 BLAKE2B 085e3a2bbb0db2ab42db784c18f8c1871f32a3e135226163d8a1ca3f612baf1efe6977a3dd8407fe850de154cb64de26520e3ba4ed5b3dd143cd422eefe5c750 SHA512 7b013dd022005f5b76a6e6dad9422565f4018736f013da5f4870bf2b51c0fd9f1f6c1127e0c31282125507e05011469e43f2efe48714ec0b2481f1e0da164657
diff --git a/net-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index 7a38bb900964..807eeb2b38c2 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/teamviewer/teamviewer-15.19.3-r1.ebuild b/net-misc/teamviewer/teamviewer-15.19.3-r2.ebuild
index 2cdfb0f817d1..ac275a91ce85 100644
--- a/net-misc/teamviewer/teamviewer-15.19.3-r1.ebuild
+++ b/net-misc/teamviewer/teamviewer-15.19.3-r2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	dev-libs/nspr
 	media-libs/fontconfig
 	media-libs/freetype
-	media-libs/libglvnd
+	media-libs/libglvnd[X]
 	sys-apps/dbus
 	sys-apps/util-linux
 	sys-libs/zlib:0/1[minizip]
@@ -32,7 +32,7 @@ RDEPEND="
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libxcb
-	x11-libs/libxkbcommon
+	x11-libs/libxkbcommon[X]
 	x11-libs/libXcomposite
 	x11-libs/libXcursor
 	x11-libs/libXdamage
@@ -112,7 +112,7 @@ src_install() {
 	dosym ../../usr/share/doc/${PF}/doc ${dst}/doc
 
 	# We need to keep docs uncompressed, bug #778617
-	docompress -x /usr/share/doc/${PF}/*
+	docompress -x /usr/share/doc/${PF}/.
 
 	keepdir /etc/${MY_P}
 	dosym ../../etc/${MY_P} ${dst}/config
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 4893478c470d..9a0546ad1337 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -8,5 +8,7 @@ DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 4935f78154ea1567d58f542962f1a87688cd
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 EBUILD tigervnc-1.11.0-r2.ebuild 4119 BLAKE2B 4391703cb314cf923b455ba36270f7a12f5f8d89f441d9cacc57d8b2a9e5b73c6b087941ec4238f61d937b8fd193a9324d3820942bc7b57140d826fe2427cbab SHA512 6c7d465314a4b12699cbfd68e9ec07a84d719f25c57b5f97cceb8f15ab44c2b1dda1bce4243520422ffcf177c1773bd0c8310acdf214042dea51e15df4bdc70a
+EBUILD tigervnc-1.11.0-r3.ebuild 4113 BLAKE2B 09995fb98a43899b50d2f6ca7051d713fb0c76593c405d1b36c5f5b37b23513493bd9ee67eda9704a2ac44ec394dfab9ae1d6889778c254f14ca8759ec9f04f7 SHA512 7ec990a1747655c78051c782034bde44bb2cf89b3c7a4e521b38cb085a8f4ba480415f6f32590f2b6cbaaa083c9c728243e7f3191e30a2eb804880dd06735283
 EBUILD tigervnc-1.9.0-r1.ebuild 4481 BLAKE2B d6e4025f83ae516bacd9f11b141f523405e0e5d3b9a5421b6c6cbe2a89c51a6cf6346583220391a0743bf6e8e34a4f7e92bf09f8275917a925419af4e76855cd SHA512 dab32c975d04ec1e0a534c53c03766901645bc2336776cc4dc0f3a0e13d970a57a1434bb0502514af1a5378104c0db1ea0b267cc89a6b2445a0f6f45d90d57e4
+EBUILD tigervnc-1.9.0-r2.ebuild 4439 BLAKE2B ed49b0953b26816c7019e358daf5a366ae4317fb554e345f932f8be64d1fa8d2205b0916fc21fab3e5ca9be08b44e358e61fe235ac4f70cb0c0d418f0633ad1e SHA512 e131576ac239a6a8dee16a8dc11979d5504512b8db91ad6e9d0ef8afbd88af434ee54c87d6e9178980a709dee83e0b49613aaff8a837409f01dc201f4b166108
 MISC metadata.xml 470 BLAKE2B de3d7d8fab83908aa664760afe1d401f016be431c67eee547127f3ee94f290d0127cc972e2d27f31b9adc0d48786f755a94ac8d1e605ce3e8e02fcf7144b7af3 SHA512 b31d1126757d68a177817cfa7069e07277742222c02dbb0e0a26ed5a144f68eeda94db5cdaec760a2b8abb491fe420867dbf06d89b6a4c1a3edfdbb1461999c3
diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild
new file mode 100644
index 000000000000..576dcb604f1f
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
+
+XSERVER_VERSION="1.20.0"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
+
+CDEPEND="
+	virtual/jpeg:0
+	sys-libs/zlib:=
+	>=x11-libs/fltk-1.3.1
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	pam? ( sys-libs/pam )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/pixman
+	server? (
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+		dev-libs/openssl:0=
+	)
+	xinerama? ( x11-libs/libXinerama )
+	"
+
+RDEPEND="${CDEPEND}
+	!net-misc/tightvnc
+	!net-misc/vnc
+	!net-misc/xf4vnc
+	java? ( virtual/jre:1.8 )"
+
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	java? ( virtual/jdk:1.8 )
+	x11-base/xorg-proto
+	media-libs/fontconfig
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	server? (
+		dev-libs/libbsd
+		x11-libs/libxkbfile
+		x11-libs/libxshmfence
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-libs/xtrans-1.3.3
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply "${FILESDIR}"/xserver120.patch
+		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
+		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PAM=$(usex pam)
+		-DBUILD_JAVA=$(usex java)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--disable-xwayland \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
+		else
+			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+	else
+		local f
+		for f in x0vncserver vncconfig; do
+			rm "${ED}"/usr/bin/${f} || die
+			rm "${ED}"/usr/share/man/man1/${f}.1 || die
+		done
+		rm -r "${ED}"/usr/{sbin,libexec} || die
+		rm -r "${ED}"/usr/share/man/man8 || die
+	fi
+}
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
new file mode 100644
index 000000000000..35e3507950d2
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils
+
+XSERVER_VERSION="1.20.0"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
+
+CDEPEND="
+	virtual/jpeg:0
+	sys-libs/zlib:=
+	>=x11-libs/fltk-1.3.1
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	pam? ( sys-libs/pam )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	server? (
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		>=x11-libs/pixman-0.27.2
+		>=x11-apps/xauth-1.0.3
+		x11-apps/xsetroot
+		>=x11-misc/xkeyboard-config-2.4.1-r3
+		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+		drm? ( x11-libs/libdrm )
+		dev-libs/openssl:0=
+	)
+	xinerama? ( x11-libs/libXinerama )
+	"
+
+RDEPEND="${CDEPEND}
+	!net-misc/tightvnc
+	!net-misc/vnc
+	!net-misc/xf4vnc
+	java? ( virtual/jre:1.8 )"
+
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )
+	java? ( virtual/jdk:1.8 )
+	x11-base/xorg-proto
+	media-libs/fontconfig
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	server? (
+		dev-libs/libbsd
+		x11-libs/libxkbfile
+		x11-libs/libxshmfence
+		virtual/pkgconfig
+		media-fonts/font-util
+		x11-misc/util-macros
+		>=x11-libs/xtrans-1.3.3
+		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-030_manpages.patch
+	"${FILESDIR}"/${P}-055_xstartup.patch
+)
+
+src_prepare() {
+	if use server ; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	# do not rely on the build system to install docs
+	sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \
+		cmake/BuildPackages.cmake || die
+
+	cmake_src_prepare
+
+	if use server ; then
+		cd unix/xserver || die
+		eapply "${FILESDIR}"/xserver120.patch
+		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
+		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa ; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PAM=$(usex pam)
+		-DBUILD_JAVA=$(usex java)
+	)
+
+	cmake_src_configure
+
+	if use server ; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dmx \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--disable-xwayland \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server ; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb
+			composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server ; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		if ! use xorgmodule; then
+			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
+		else
+			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+		fi
+
+		newconfd "${FILESDIR}"/${PN}.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		systemd_douserunit contrib/systemd/user/vncserver@.service
+	else
+		local f
+		cd "${ED}" || die
+		for f in vncserver x0vncserver vncconfig; do
+			rm usr/bin/$f || die
+			rm usr/share/man/man1/$f.1 || die
+		done
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 1dd9aa555f10..2aa1f89e68eb 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,6 @@
 DIST youtube-dl-2021.05.16.tar.gz 3336051 BLAKE2B b73206355187a9f61c51749ce01db40757937f79f988a3b81513a5cbe2c854d1b7f2268d7e02c4a0eb3d46c0852990950dfd400acc09f7616aeccb2e8cba6cf9 SHA512 a78ebfc16cc52458e2a036deb48693110f20c046ca3a509be9adbca76d23429953fcf3cd3aab8390a19af747291950bb9261e5339e5cbb0903b98848216c7aca
 DIST youtube-dl-2021.06.06.tar.gz 3336227 BLAKE2B f30252927ddd79062995ec78d45854e1723fe561ca34777fb0a337750bf09c76da8c205af63869c68c6bc09bfe8f6de1d3f5ee240914ae871bb7920076d8d16c SHA512 7b4d453723d03c3fde46451277d5c44be01469ed1b414ce94e782d6228c132c982835805207222862d0d7b8ba162157196f976400fd15cea7ea513e3595aeea3
-EBUILD youtube-dl-2021.05.16.ebuild 2132 BLAKE2B aca117606444a348e36c1899222b24c091ed717dfa799f48a92de68c4ad07b9671719eaa15e084843d4fead0905d00302884da3ebd56e6e39297da42b446a38b SHA512 9f0f20088a069af5f33ffcab5c4db0bf850e01c34b70bd72279140b9485f838e4f947d48adbe8fc8a30ee064078aae02c08d7c7a5632d42803ae47d39431e99d
-EBUILD youtube-dl-2021.06.06.ebuild 2104 BLAKE2B 569aa65da08a7dd77d3988ff9583a5af8f8c8f556d4d6b7742ddc7c7b11d8266a969cbd40a39f0fb22a245cb4d5a93ad5bdc771fb54b421f25f2cb2719bc387a SHA512 9d91adeafb7ad3f3caca35c5e65b7caaf86cdaa37b5b7c1a7312175dcd7665a4ac84bd5e72d2c7c3f81c6b33fabec9829ead0e94c3f7e3739019c045220ed47a
-EBUILD youtube-dl-9999.ebuild 2097 BLAKE2B 193cf2464a2d5f7fe0f6fcbbeefa919884d8bfff551446930a12a98afa0827ff178a9e8af7bc9df827d09ce539a824781b155286b57cd2e7f3e7e1629b08be1b SHA512 a51572c892c8774eccc3ebe098ba634a9c60d3b68e956e980e62313e0ddce524c5cf3e686b820f6a12ee60ef849512004d9677eeea6b54b0d3d1c2504a7ec801
+EBUILD youtube-dl-2021.05.16.ebuild 2185 BLAKE2B ae2b6ad60b6ec44cceeb957c121976720ef9eea4e446e604e598e3e69eb3ed981c838f1bebd16d30c559ec1c1366eca418f6594a34ea64cfc6b407298d62f51e SHA512 2c7917b52f4b75ac4429ff546bf099057ca7d4d4c3ddc9ad9a05b6d07a5ddec6bd3df7530362d6973002776656847905c0e8dd01f60bac56b2495697474272e5
+EBUILD youtube-dl-2021.06.06.ebuild 2157 BLAKE2B 63acd2a5c3cc48f9cd3dd9edaeb9c6c6dd29f2d58222fd6cd9f870c25e6e284bcfd7ce78efc422f82a60f7e8fd605d797f8b79774b6229345d20a8618d8d0044 SHA512 154191b8d145b9669ce427bfcb918b5bd69f2c8417b236b2485687d0f3a71927404203ac5ef11519a3289491d98b909a26d21d7cba64dbcde9870178a18071eb
+EBUILD youtube-dl-9999.ebuild 2150 BLAKE2B 845e5d04d4ce84654c07ac59a7d3ee585fd8c514fc26ef6bf6d768c9812e8f72a8be6c41b76c74d995b8e0cef84e5d5e9dc3a4f20d6789c7160bc287cf0a011f SHA512 bc42946c393450632744e8c2e06a2defaa4066322756caccf8010a6d3c9db12d9296f9f366b7e8375283d166655089f06beb4cb3be313c1a7ec2bc74f4d576f0
 MISC metadata.xml 377 BLAKE2B dde3a782cb62c9f3b65479ba2496706e5c02b19b32aa3ed4be66a8d819485f04d62d6d0c383eaa65409551f6696d990077af553f1095163db8226cc9bfcc8339 SHA512 367f0cec4f63096ea8832cc8a8eb3bbc4c5b14b26f8a9bf4189ae7337381ec9f2444475521156e3f3965242f5b1a9bce456a286c80c22b9f05a11d41ac73b623
diff --git a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
index 3d701ad41fa9..f6c4602df69f 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.05.16.ebuild
@@ -51,21 +51,26 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+	if ! has_version media-video/ffmpeg; then
+		elog "${PN} works fine on its own on most sites. However, if you want"
+		elog "to convert video/audio, you'll need media-video/ffmpeg."
+		elog "On some sites - most notably YouTube - videos can be retrieved in"
+		elog "a higher quality format without sound. ${PN} will detect whether"
+		elog "ffmpeg is present and automatically pick the best option."
+	fi
+	if ! has_version media-video/rtmpdump; then
+		elog
+		elog "Videos or video formats streamed via RTMP protocol can only be"
+		elog "downloaded when media-video/rtmpdump is installed."
+	fi
+	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
+		elog
+		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
+		elog "or media-video/mpv to be installed."
+	fi
+	if ! has_version media-video/atomicparsley; then
+		elog
+		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
+		elog "from the metadata into the resulting MP4/M4A files."
+	fi
 }
diff --git a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
index 8ec79bfd981f..5d46a59d125b 100644
--- a/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2021.06.06.ebuild
@@ -48,21 +48,26 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+	if ! has_version media-video/ffmpeg; then
+		elog "${PN} works fine on its own on most sites. However, if you want"
+		elog "to convert video/audio, you'll need media-video/ffmpeg."
+		elog "On some sites - most notably YouTube - videos can be retrieved in"
+		elog "a higher quality format without sound. ${PN} will detect whether"
+		elog "ffmpeg is present and automatically pick the best option."
+	fi
+	if ! has_version media-video/rtmpdump; then
+		elog
+		elog "Videos or video formats streamed via RTMP protocol can only be"
+		elog "downloaded when media-video/rtmpdump is installed."
+	fi
+	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
+		elog
+		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
+		elog "or media-video/mpv to be installed."
+	fi
+	if ! has_version media-video/atomicparsley; then
+		elog
+		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
+		elog "from the metadata into the resulting MP4/M4A files."
+	fi
 }
diff --git a/net-misc/youtube-dl/youtube-dl-9999.ebuild b/net-misc/youtube-dl/youtube-dl-9999.ebuild
index 50bd1337b3fd..6ea8ff1593c3 100644
--- a/net-misc/youtube-dl/youtube-dl-9999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-9999.ebuild
@@ -52,21 +52,26 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
-	elog
-	elog "youtube-dl works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need ffmpeg (media-video/ffmpeg)."
-	elog "On some sites - most notably YouTube - videos can be retrieved in"
-	elog "a higher quality format without sound. youtube-dl will detect whether"
-	elog "ffmpeg is present and automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want youtube-dl to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+	if ! has_version media-video/ffmpeg; then
+		elog "${PN} works fine on its own on most sites. However, if you want"
+		elog "to convert video/audio, you'll need media-video/ffmpeg."
+		elog "On some sites - most notably YouTube - videos can be retrieved in"
+		elog "a higher quality format without sound. ${PN} will detect whether"
+		elog "ffmpeg is present and automatically pick the best option."
+	fi
+	if ! has_version media-video/rtmpdump; then
+		elog
+		elog "Videos or video formats streamed via RTMP protocol can only be"
+		elog "downloaded when media-video/rtmpdump is installed."
+	fi
+	if ! has_version media-video/mplayer && ! has_version media-video/mpv; then
+		elog
+		elog "Downloading MMS and RTSP videos requires either media-video/mplayer"
+		elog "or media-video/mpv to be installed."
+	fi
+	if ! has_version media-video/atomicparsley; then
+		elog
+		elog "Install media-video/atomicparsley if you want ${PN} to embed thumbnails"
+		elog "from the metadata into the resulting MP4/M4A files."
+	fi
 }
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-29 10:15:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-29 10:15:54 +0100
commit	9aa80713372911cec499b3adb2cd746790920916 (patch)
tree	b8e99dc5dd60ac2094a27cc52f74aada8df38f05 /net-misc
parent	b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (diff)