Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

20 files changed, 214 insertions, 185 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e973c2dcacdc..b51d29db4de0 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cgminer/Manifest b/net-misc/cgminer/Manifest
index 3b0c5f5d1919..12ce33132e73 100644
--- a/net-misc/cgminer/Manifest
+++ b/net-misc/cgminer/Manifest
@@ -1,5 +1,5 @@
 DIST cgminer-4.10.0.tar.bz2 1306225 BLAKE2B 29d34e5d9246fc5b0409a1647e4ddf291f1e7610888110c1917ddbc1c30a9d0301bb70dba187690f2685b2fd476d5c0b0cd65e87fafa56b62a7f3a0202a374de SHA512 ed39bffa51715756875c101f4aaf984cab566fc1c8b657f6da37d0cdf921faee752c3efadf97c98ca6e749175457fbc2c37e9332cd26d2ff1675752250ac21db
 DIST cgminer-4.9.2.tar.bz2 1476371 BLAKE2B 01ff700cb5dc2fb12709da41aeaa22c6fc6b9dc6fb1e12116eef3a382ad328961b8d6ddd6ac6fce47ab8084c96e1a7be74a697b3d885c7e78dfadf07b678ad24 SHA512 48371657c84f09ad8c500a29ca85f35af70eb8720d9d97b565cd8c5356289d889ee60c06f37c0507a53c8f50ae827a77fa0c41609bac6b1e8849ad26b55d67d4
-EBUILD cgminer-4.10.0.ebuild 2534 BLAKE2B d75fd59cd9076abdd5740744ed3e9272dbcc4604b8917d209757427173df5005eabf1af36cce65c7ec0034844f50c4545c808862a4b907ccd3e1c03773a47c7a SHA512 33598078656e46c892f4e9a03e1398e10f663eb760e28b5440673996a5a3cbe8738dadea5ff55e75670a891224ab0be1f080931cdb25107cabc85f2e9e4e935e
+EBUILD cgminer-4.10.0.ebuild 2472 BLAKE2B a115a700eed1cf043865c4cc83ca0bfee50feaad74e90d42ac70d1decf8b40a4de6bf8d8834d75021754872e0d16be4547a7d1f326a04734b874b966389c3d83 SHA512 23f365350fa8fec10adb922674fc1f4f6aa41cfeb9687df55a05593d19fdfc256b75ec2a960b4d5a2fd691349a58a6af53d4cd00cfb9394f15c4d172d2897f3f
 EBUILD cgminer-4.9.2.ebuild 2394 BLAKE2B 6ce5b161deb01d273c92b90bbc3f33cff3eec09df2ecabd00ca34540f76b433150e9e8f99180d2063fbcd112929e95a15cac84daa7c4b887958e5b58663e41c4 SHA512 b696ca5383154324826cb2aec76b8ba8db973001cd9dafd1a782edeb02ff65425c10161f8ba70d3a9033b7ce2727dd3b39bb68601a1e82207a112bc5ae4693e2
 MISC metadata.xml 2137 BLAKE2B 8bb2fd05a390c5c5ec5ca3dde384ab611311d50256668208184dfb978ac5a0debd75ec63cd35159dcde36b2a964d0bedf6aaf3422261f998f2262c1007c3ab29 SHA512 6cf1454188266ffdab67a7caa27ece041cfc4c3cb4fc76b7fe5fa24bed30002df717afe4e8693532a4f78b077374200cb2a9e91b460372193f1b623238d50b38
diff --git a/net-misc/cgminer/cgminer-4.10.0.ebuild b/net-misc/cgminer/cgminer-4.10.0.ebuild
index 9f112f4a838b..c635781c2f25 100644
--- a/net-misc/cgminer/cgminer-4.10.0.ebuild
+++ b/net-misc/cgminer/cgminer-4.10.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
-inherit flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic
 
 DESCRIPTION="Bitcoin CPU/GPU/FPGA/ASIC miner in C"
 HOMEPAGE="https://bitcointalk.org/?topic=28402.msg357369 https://github.com/ckolivas/cgminer"
@@ -24,50 +24,46 @@ RDEPEND="net-misc/curl
 	virtual/libusb:1[udev]
 	ncurses? ( sys-libs/ncurses:0= )
 	udev? ( virtual/libudev )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
 
 src_configure() {
 	use hardened && append-cflags "-nopie"
 
 	# PKG_CHECK_MODULES needs PKG_CONFIG for --with-system-jansson.
-	export PKG_CONFIG="$(tc-getPKG_CONFIG)"
-	local myeconfargs=(
-		$(use_with ncurses curses)
-		$(use_enable ants1)
-		$(use_enable ants2)
-		$(use_enable ants3)
-		$(use_enable avalon)
-		$(use_enable avalon2)
-		$(use_enable avalon4)
-		$(use_enable avalon7)
-		$(use_enable avalon-miner)
-		$(use_enable bab)
-		$(use_enable bitmine_A1)
-		$(use_enable bflsc)
-		$(use_enable bitforce)
-		$(use_enable bitfury)
-		$(use_enable blockerupter)
-		$(use_enable cointerra)
-		$(use_enable drillbit)
-		$(use_enable hashfast)
-		$(use_enable hashratio)
-		$(use_enable icarus)
-		$(use_enable klondike)
-		$(use_enable knc)
-		$(use_enable minion)
-		$(use_enable modminer)
-		$(use_enable sp10)
-		$(use_enable sp30)
-		$(use_enable udev)
-		--disable-forcecombo
-		--with-system-libusb
+	export PKG_CONFIG=/usr/bin/pkg-config
+	econf $(use_with ncurses curses) \
+		$(use_enable ants1) \
+		$(use_enable ants2) \
+		$(use_enable ants3) \
+		$(use_enable avalon) \
+		$(use_enable avalon2) \
+		$(use_enable avalon4) \
+		$(use_enable avalon7) \
+		$(use_enable avalon-miner) \
+		$(use_enable bab) \
+		$(use_enable bitmine_A1) \
+		$(use_enable bflsc) \
+		$(use_enable bitforce) \
+		$(use_enable bitfury) \
+		$(use_enable blockerupter) \
+		$(use_enable cointerra) \
+		$(use_enable drillbit) \
+		$(use_enable hashfast) \
+		$(use_enable hashratio) \
+		$(use_enable icarus) \
+		$(use_enable klondike) \
+		$(use_enable knc) \
+		$(use_enable minion) \
+		$(use_enable modminer) \
+		$(use_enable sp10) \
+		$(use_enable sp30) \
+		$(use_enable udev) \
+		--disable-forcecombo \
+		--with-system-libusb \
 		--with-system-jansson
-	)
-	econf "${myeconfargs[@]}" \
-	NCURSES_LIBS="$(${PKG_CONFIG} --libs ncurses)"
 	# sanitize directories (is this still needed?)
-	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h || die
+	sed -i 's~^\(\#define CGMINER_PREFIX \).*$~\1"'"${EPREFIX}/usr/lib/cgminer"'"~' config.h
 }
 
 src_install() { # How about using some make install?
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index b389e7b7cb41..c5a48509fdf8 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -8,6 +8,6 @@ DIST linuxx64-18.10.0.11.tar.gz 21976273 BLAKE2B 4d673f40a04e31bba94b2e0dda744f8
 DIST linuxx64-19.1.0.9.tar.gz 22074792 BLAKE2B aeeb8df5a63d08c94718d069c2f3e259d22309cab8ba3f046e9b1d6ecadbb9ddc7a7049bd6837944e42cfc9f625146218208802a2bf0f3bdc32f1f7d162a8700 SHA512 21539546fd24f7781e6a114e345392ee85e0f27f0f4b8a641e8b94f9a96c4a0e14f3d81838a3735c6098c251b022b3e30ce0c530b686f7587029cd2983516cfc
 DIST linuxx86-18.10.0.11.tar.gz 24095176 BLAKE2B 5e7b9bba57661216b0194ccca292a9e663fdca65439c86ea68c1857352f1ed7c5247e41eeb976bc306148cd78c71b069da3e65042331a0e601637db1fee2d6c6 SHA512 8e073b436454472799df283266ccd68652b519336bf74b558b1d0345147331c5e8f4c8900b8d94a13bd6b08b94298c9dbcc5a3a06edbe53722304de5b117f239
 DIST linuxx86-19.1.0.9.tar.gz 24175639 BLAKE2B d73d3d438ef272f9571587cd66e357bca4698d797ea813dafb47b6c61a86606b2021b5659908d160e3baec7b668265d4dccbf8f009c4c77c99e1258fec28c22f SHA512 110d1f160f6f4538bb589682bcbb8414b816d0669dc1fb4559243ee335a6e6129af8e50d47feadd7688808affef7bcaa300fc6c01fb05b84938fe449f7e9d05d
-EBUILD icaclient-18.10.0.11-r1.ebuild 4989 BLAKE2B c26e3af515365fab7ce09ac1938ab4e4379996075396d86004b7268502497ffaf2f75461f341c2252bfd91ae4a9ed437d7d66479f76f0c80e942d7938a78bcf6 SHA512 28e8147c102fb7a24cc47c2410aa8a863902a5525c741d756f919ff7cd4b7b7d2e8fcc0e2a1e642a00a7001dda75e9f18eedff459f24f1fca055083b6409eb6c
-EBUILD icaclient-19.1.0.9.ebuild 4991 BLAKE2B c54a0bebdce6b4d633315c3305a9bd6cd7f7423211e8254b92c0254230f732c6014aa68a76560ef346251590919bb5e7738afc000ba43a20240decb1f6f25514 SHA512 64ec9b3170350fd13f5046f84d650efa11dd41b9b4f41418757a483ef2e0f6fbe890947010706cd00311f92484572520ff8bc82baa0305fb3ffe473376fce2a7
+EBUILD icaclient-18.10.0.11-r1.ebuild 4999 BLAKE2B 72cea895bcfa9e8713d1cd740422838e5900a7bcf3c8a171acd7ccc2c14e80e4076dc51193b97295b71dd3ceaa96f9914f4227fbe887aa4f22ffbd3f0eb4af7e SHA512 1262b73337b7bd68d187c0d5aae8c84450633a2a5b8844f7358dee753504ed132bd27e290b38471f74e67dfe1b0d45af4335393a14a73ab8b644b396456d7038
+EBUILD icaclient-19.1.0.9.ebuild 5001 BLAKE2B 29a15d96b01be75869fddb51f7905bd19cfc8bc9f92f90fd8e53c507ca5ce5229563c0573304d6256da351531d56a642daf1a1d852fafdc0d30030be5e017af2 SHA512 8caf0fb0bef83be86a90ccdf6d3395895ffffed69c7a22c018886eda55b5da363a80722f20a2d1746dee6a6b235ac20382f30c8ccd9cee4a60d559ba2e423837
 MISC metadata.xml 678 BLAKE2B 7ca853d90b1492bd1c15b9e0109430afbedae032ef56a035cf75de74796f694b2ab955dca5f3ef93a97a1c61686ead93b1bd1579802b35e0bd381d0d0c35d5ff SHA512 a838a68c22e2f1585960a7699399285c0c9b47b79734a22adc5d74599380c7c7792428dd7287f1e62d1194a4f97c79e902910f4c1569fc227f0f7e1c39afc8d0
diff --git a/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild b/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
index e74facfe0cc5..bf40a7fc05de 100644
--- a/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
+++ b/net-misc/icaclient/icaclient-18.10.0.11-r1.ebuild
@@ -64,7 +64,7 @@ DEPEND=""
 pkg_nofetch() {
 	elog "Download the client file ${A} from
 	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
+	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
 }
 
 pkg_setup() {
diff --git a/net-misc/icaclient/icaclient-19.1.0.9.ebuild b/net-misc/icaclient/icaclient-19.1.0.9.ebuild
index 2d9d98b6226e..a54c5cd45c39 100644
--- a/net-misc/icaclient/icaclient-19.1.0.9.ebuild
+++ b/net-misc/icaclient/icaclient-19.1.0.9.ebuild
@@ -64,7 +64,7 @@ DEPEND=""
 pkg_nofetch() {
 	elog "Download the client file ${A} from
 	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
+	elog "and place it in ${DISTDIR:-/usr/portage/distfiles}."
 }
 
 pkg_setup() {
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index e4b61ddc7610..6005de57641d 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,5 +1,4 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
-EBUILD modemmanager-1.8.2-r1.ebuild 3651 BLAKE2B 03fb49b73b41164a6d8ffd0de8458589bdf304184c77f6f3f7f5386ae82103ee076ad4b4dccc912f558d30c2f5a4b191d96eaa4cc5b9e803e8d497ae4cbc09f1 SHA512 f21605bb5240034966628105955d7eaa5d481a9e1291f3173262c912f10da7e526fd4558124f6929bdf51531aa3ff478acb496295328fdf855eb26a0cf4968c2
 EBUILD modemmanager-1.8.2.ebuild 3354 BLAKE2B 46f7e3a076cecd6608f2d0c066029533ff0c4ed6afec43380ba3960f6b6077c90bcd5e660e7b65ebe2da8e427fef669c4af16cb269ad6033d804e1d4fb485dd8 SHA512 04ab770e46d2107985b0149f5aa1b86de5cefe0c47785f844bbc8e3cd1893187d04f7de328ec72b68e2b9d42aac8b1c6ecaa0fdedd8152807af3574840374a37
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
deleted file mode 100644
index a150c62736d1..000000000000
--- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 user readme.gentoo-r1 systemd udev vala
-
-DESCRIPTION="Modem and mobile broadband management libraries"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/"
-SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
-REQUIRED_USE="
-	?? ( elogind systemd )
-	vala? ( introspection )
-"
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	udev? ( >=virtual/libgudev-230:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	mbim? ( >=net-libs/libmbim-1.16.0 )
-	policykit? ( >=sys-auth/polkit-0.106[introspection] )
-	qmi? ( >=net-libs/libqmi-1.20.0:= )
-	elogind? ( sys-auth/elogind )
-	systemd? ( >=sys-apps/systemd-209 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-S="${WORKDIR}/ModemManager-${PV}"
-
-src_prepare() {
-	DOC_CONTENTS="
-		If your USB modem shows up only as a storage device when you plug it in,
-		then you should install sys-apps/usb_modeswitch, which will automatically
-		switch it over to USB modem mode whenever you plug it in.\n"
-
-	if use policykit; then
-		DOC_CONTENTS+="\nTo control your modem without needing to enter the root password,
-			add your user account to the 'plugdev' group."
-	fi
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf=(
-		--disable-more-warnings
-		--disable-static
-		--with-dist-version=${PVR}
-		--with-udev-base-dir="$(get_udevdir)"
-		$(use_with udev)
-		$(use_enable introspection)
-		$(use_with mbim)
-		$(use_with policykit polkit)
-		$(use_with systemd systemd-suspend-resume)
-		$(use_with systemd systemd-journal)
-		$(use_with qmi)
-		$(use_enable vala)
-	)
-	if use elogind; then
-		myconf+=(
-			--with-systemd-suspend-resume
-			LIBSYSTEMD_LOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			LIBSYSTEMD_LOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
-		)
-	fi
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Allow users in plugdev group full control over their modem
-	if use policykit; then
-		insinto /usr/share/polkit-1/rules.d/
-		doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	use policykit && enewgroup plugdev
-
-	# The polkit rules file moved to /usr/share
-	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* )
-			# Automatically delete the old rules.d file if the user did not change it
-			elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
-			;;
-		  * )
-			elog "The ${old_rules}"
-			elog "file moved to /usr/share/polkit-1/rules.d/ in >=modemmanager-0.5.2.0-r2"
-			elog "If you edited ${old_rules}"
-			elog "without changing its behavior, you may want to remove it."
-			;;
-		esac
-	fi
-
-	if ! use udev; then
-		ewarn "You have built ModemManager without udev support. You may have to teach it"
-		ewarn "about your modem port manually."
-	fi
-
-	systemd_reenable ModemManager.service
-
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 72dfa499d39a..564bd82b4094 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,5 +7,5 @@ DIST NetworkManager-1.14.6.tar.xz 4426540 BLAKE2B 29709005f4143bb4a9ef2348c2da06
 DIST NetworkManager-1.16.0.tar.xz 4793620 BLAKE2B 554559eefbfa489cf01067bd2c32e4b06fed076d38920b41f2d0005873ff913c0af2babcc3d9b463a4b636ca82e5c27ee20ab5768fcfb2c6b79e003d7fdc224d SHA512 e9d8365d8e59e5bc7c0bc13482139fb96b1d87183c8884e71e84eaf05fe121f2bcac519edd916bd242be4e9a9e2d2140a1065f529a9a02bda87b6d2bd4192584
 EBUILD networkmanager-1.14.4.ebuild 10965 BLAKE2B 833dd376a914bf626e0cdfc90449ee04f39039106948604a479548269b47d9dbed3ac30d7349cd724899b5185d2c24e38d0288a9c17daccd23892b1dc4f0351a SHA512 b3757b6bdbf99d94a4683eb4293d0588c16f6380d11e48ae52e5541dfee3ed44bb1560078822532c99353cb7f06da09dfb98a2cde7569fd3aa0b402fa96fb19d
 EBUILD networkmanager-1.14.6.ebuild 10967 BLAKE2B 60149db8fb3e9953e41dadaa6648ea8bb366dfd125592cd01e22d205aa0ab1f4971d53b7866338652bbeedb84cc995d86dcdab239906d16ea0b150091e9b2b4f SHA512 e7576a39e48be55a0dee111ae3be9a8d43b128a2ebb5983bd00971e98e615eb03aa9f077eb4ed87dd3c8622651b3e30f1a7fc992910df603c32b8cb8c532547c
-EBUILD networkmanager-1.16.0.ebuild 11126 BLAKE2B 6a87159301d369bfb66372c0f6c727f43a2d13bc4994467da365e42901cff26c7066a7c93dec6cfa8216cbeead0297dd603c685f76a637dad4a5ad19c9de904f SHA512 4fa88351f92efdaad305c9430c8b3325d39a756c9c5dda87c63bdf5c8cb2f00874e057cfbca2fb9f8c02c3e400bde24a873cef6f3e9f4a6dbd98f4eee7b1e2f3
+EBUILD networkmanager-1.16.0.ebuild 10992 BLAKE2B 6409943a55771e12dcb3ff05d81a7f163b5796b748117bc50c221ff8da7de3058ab84fa53ca2316b72f9945e08af4a39d78cb7a4bc34d77a80fb899fe1253738 SHA512 ddc01e9b4b65deef3b7885b4876133c53e0c990b780e7586e3fea90376c03b1131d3888e67e9917923a08d28db5160bcc0c5aaf0562733d6ebd705cb0fd3b489
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/networkmanager-1.16.0.ebuild b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
index 4e450bdaba30..7193fe03f25f 100644
--- a/net-misc/networkmanager/networkmanager-1.16.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.16.0.ebuild
@@ -177,8 +177,6 @@ multilib_src_configure() {
 		$(multilib_native_enable concheck)
 		--with-crypto=$(usex nss nss gnutls)
 		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
-		# ConsoleKit has no build-time dependency, so use it as the default case.
-		# There is no off switch, and we do not support upower.
 		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
 		$(multilib_native_use_with audit libaudit)
 		$(multilib_native_use_enable bluetooth bluez5-dun)
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 08e1d04b72df..f2eed2b7dcac 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,3 +1,4 @@
-DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
-EBUILD nextcloud-client-2.5.2.ebuild 2006 BLAKE2B 2e5da149dd376fef452c36eb7279ce4a0e7832219d5edc25f823bc691b2d5c37c838b148c2affef9854532625292a99282cfdfe073cc6e6ea3e0f9d67a7a6bfc SHA512 cdc60ee671e822eef98ec463382afe43997a0f220f7bde50cb0a20940131c4262384ccc767db2e5dcb86c7ba86eed1b7f80508764530569a122a648a9c0f83a7
+AUX nextcloud-client-2.5.1-missing_qt_include.patch 714 BLAKE2B 293838a7c40d19dabe68f566d8051b406ac4de3c6bf0de1da39fefba0c8539e10ce324df6b48ccf6d803c76021d03613d7eaa89d18f4f2382f61a19601b619eb SHA512 654f31d8545bc306a76105bbaaf7f13b0d95ba0e33c72b0c04c41f61d5bb8ce97c4ac6d8e04515397f7422a857102ad4ed5a6eb50054d36202c9c84c3ffa1157
+DIST nextcloud-client-2.5.1.tar.gz 18916053 BLAKE2B 98daa5abde8aa82e2d30be7c340f808c4cb7a1986bbb7e9e5208174b268ddacfaf08e91b54d6bce5039fd19f6729716285e2a45f913c0d0eb473bf753031678f SHA512 04301f4b6283c4003ec4fed7926e11e2a627903a1b20e0b7cb4bb24b522e133d41001f48c633cad4fe3b100496d3a7826893b78074c2e3985a4c9c90122e3108
+EBUILD nextcloud-client-2.5.1-r1.ebuild 2065 BLAKE2B 925f57b30f22ad41a3ad291f3be4dff34cd050bf96b170d136434a013886410c02c4f3a53072d292208a77ece73ef70c7bb40f0c327300abbfc8a77a159758a1 SHA512 82a896b06f3e6d9f54ed2b0aadb62791a501ce1585c895159fa408b4c0bb46671ef9691558410b19460100d86642df77a190d5691dfd06e7f0addb75c3062d2b
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch
new file mode 100644
index 000000000000..a5d6f03581b0
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.5.1-missing_qt_include.patch
@@ -0,0 +1,23 @@
+From 129588442041c32b0d98f2361a69e0e350592f70 Mon Sep 17 00:00:00 2001
+From: Oskar Kruschitz <okr@huemer-it.com>
+Date: Thu, 13 Dec 2018 16:13:01 +0100
+Subject: [PATCH] Added missing Include
+
+Fixing an error during Build with Qt5.12:
+error: member access into incomplete type 'const QWebEngineCertificateError'
+---
+ src/gui/wizard/webview.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gui/wizard/webview.cpp b/src/gui/wizard/webview.cpp
+index 15c1f314e..73e671b8f 100644
+--- a/src/gui/wizard/webview.cpp
++++ b/src/gui/wizard/webview.cpp
+@@ -10,6 +10,7 @@
+ #include <QProgressBar>
+ #include <QLoggingCategory>
+ #include <QLocale>
++#include <QWebEngineCertificateError>
+ 
+ #include "common/utility.h"
+ 
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild
index fed415b280bb..28db8da07422 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.1-r1.ebuild
@@ -49,6 +49,10 @@ DEPEND="${COMMON_DEPEND}
 		dev-qt/qttest:5
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-missing_qt_include.patch
+	)
+
 S=${WORKDIR}/desktop-${PV/_/-}
 
 src_prepare() {
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 22cf9df58c1f..91784dccf8b6 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -46,5 +46,5 @@ DIST openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 43356 BLAKE2B 776fa140d64a16
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
 EBUILD openssh-7.5_p1-r4.ebuild 11161 BLAKE2B e6276f34a75fbce06ebefa246786db15aff3bd9a59c77c41d96576b6aeb77c5e6fa17aceb573d4d1f0518aa703d298eb292d0d157fb843a702cbede1f42c0296 SHA512 446414c8961458b812b768d18afe46d60ef4dd54111d95b99654cfb3dfef592812b30527fdda352a595bba815e0ffea4a813e3291bcc96bacb368267ff837bdd
 EBUILD openssh-7.7_p1-r9.ebuild 15943 BLAKE2B 459a0f5920b3d5b4da2835e7f3c9f1edd185e48c509e5150a1306dbca3c2f17d0d9d3f41166c4263dd60c0218c11b278a4eaa6f53ae1429710fc749994f70d11 SHA512 3aa9018173cc53de22b1e4693daf4ca2716cd0bc0066f797b6b66926481aaabb3e82942beb305a95523ba64dc9ff95f54232c7538c1d30834f38d88dd94f18a2
-EBUILD openssh-7.9_p1-r4.ebuild 16291 BLAKE2B 2a766c87f8c9b696a6453e0e84b7cb2dd2d86c15d1e7bbe20bff2ce2725aa39977df1d70be9efcb45a2e39a37fee784b9a71064fa21528b2635d4fadb2952814 SHA512 d46aab38c2f426a03eb6b4f01ceb63baeffc587145100500c615999da1a88a19d359533de796f0e0357a42edaa80d8306447f28f6f2b0fcd0ea86c7ce3e5a036
+EBUILD openssh-7.9_p1-r4.ebuild 16288 BLAKE2B 14f5c4fd26e95abcc68f0c91592b45214048fb1fe78924380d77806696712d512efa6a14a3172d6f6cf3a5c9e0c638779d058f1e790eef51d9e86f2672c67644 SHA512 e30e04d553eab14ed526650ee6e174d482aa03bb83fee55be567efa3ce77603dfc0c4b4c1abacf3f20ef84452a2b00f2576f4395d7abd61f77b93b3d94230506
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.9_p1-r4.ebuild b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
index 22614b8fc651..13f4df87840c 100644
--- a/net-misc/openssh/openssh-7.9_p1-r4.ebuild
+++ b/net-misc/openssh/openssh-7.9_p1-r4.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://www.openssh.com/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	https://dev.gentoo.org/~whissi/dist/${PN}/${PATCH_SET}.tar.xz
 	${SCTP_PATCH:+sctp? ( https://dev.gentoo.org/~whissi/dist/openssh/${SCTP_PATCH} )}
-	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_P/p}/%s\n" "${HPN_PATCHES[@]}") )}
+	${HPN_VER:+hpn? ( $(printf "mirror://sourceforge/hpnssh/HPN-SSH%%20${HPN_VER/./v}%%20${HPN_PV/_}/%s\n" "${HPN_PATCHES[@]}") )}
 	${X509_PATCH:+X509? ( https://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
 	"
 
diff --git a/net-misc/sjphone/Manifest b/net-misc/sjphone/Manifest
index 15e2fe7dd6ab..e232fd335bd7 100644
--- a/net-misc/sjphone/Manifest
+++ b/net-misc/sjphone/Manifest
@@ -1,3 +1,3 @@
 DIST SJphoneLnx-1.60.2235.tar.gz 4390024 BLAKE2B ee9eeb4b358b258d962238bfc89ac64f767f00eaae577abc1c89bb9a01e625ab01b93eb1ec4ce362efad1f8df5bc7cfa446718fa18397e037540554ffd67b7d4 SHA512 f1c824c51cc4edfec2baf7c31c8afb71930851a96563b50ab8f7219f49b03a4233549e0a1bb4b53a55bd2b72cc3454e2f50625d2ba63491015fcbef27726b567
-EBUILD sjphone-1.60.2235.ebuild 821 BLAKE2B a9d6c03c85b375df8b7fba1c993181150f8d6791ed1b3ea1da4cdbec407339c8e3f08380bb67094f00013495ee4c5a059badb8c7d7f9d7399fd877b985265b52 SHA512 8436275de670d5456f39c60b700daa7a2acc531c1b76b93493849346f35127956f3bf2f32baff0bfac4411ec2be43279b37f0592a64a1364883f3164c9c0f51d
+EBUILD sjphone-1.60.2235.ebuild 810 BLAKE2B 6be5ff203a980081420f04c2e76c4d2a621edb61127bf5688f04131390996b4ec6bf12e77f2546f3ddf752a08119c64a4a54640dc09f032491b1945fa11db5f8 SHA512 e998d1978819b7c0c0e4402b50c190c06272c3648e92fbd31ea5f5c6c6dbad14206bf1091acd73a24c1b38d55bef43f0e3c07e2af1f4fba1a75094695a4c8451
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/sjphone/sjphone-1.60.2235.ebuild b/net-misc/sjphone/sjphone-1.60.2235.ebuild
index fa22405afa4d..9b44f78549e5 100644
--- a/net-misc/sjphone/sjphone-1.60.2235.ebuild
+++ b/net-misc/sjphone/sjphone-1.60.2235.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
@@ -14,7 +14,6 @@ LICENSE="SJ-Labs IJG libpng ZLIB RSA W3C BSD"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-RESTRICT="strip mirror bindist"
 
 RDEPEND="x11-libs/libSM
 	x11-libs/libICE
@@ -24,6 +23,8 @@ RDEPEND="x11-libs/libSM
 	x11-libs/libXdmcp"
 S=${WORKDIR}/${MY_P}
 
+RESTRICT="strip"
+
 src_install() {
 	insinto /opt/sjphone
 	doins -r lib/*
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 1b49c1221028..8c6c3e7f98f8 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,8 @@
+DIST youtube-dl-2019.03.01.tar.gz 3117441 BLAKE2B 92beb16920b6d9c3ead89d5ff930b73635f74d7aeba62a4ee8159e28b448931810f340857bc223ab587610704405083768137a62d7c92814a7525825adc60919 SHA512 ff037b2288b937ebc70bfa880a4c0cd10cb4a615725e25f8db998c828d4b505461088b5aaa926aa47f148189496275f1a70e03e187325c15d6ff425ed4da2dc7
+DIST youtube-dl-2019.03.09.tar.gz 3120854 BLAKE2B 83c9dd22636dec34be497d28e28dcf8e68ad3566603acb5902dc422672aa73e27811bf27779da093e54fcee8068f9a3377eb21e8810f1a3cad95d4bdc920c8a7 SHA512 a827d481057ff502064acd4c170c5320c63e0abb1048ef9d3563083478dc518f0755ecdc3179fe75a1a949aa162f9bebdd96a59f913b34f0b7ed54b168fc2903
 DIST youtube-dl-2019.03.18.tar.gz 3122206 BLAKE2B 8a94cf92ebce960fe9b074d5cc23047fbf326fe4511c55f0a1c4843386e4e3c65da4f89a2401243dbaf73882f68aadc768e653e8ed9e5c91244172c24e55d8bb SHA512 0a683631da7d67aa2f23eb6326664e483b71ef776b3ff63c732bdef54f58c7f615733023f8c4b948078f59d136414bd059bdc753d89aec630126bbe826db58ce
+EBUILD youtube-dl-2019.03.01.ebuild 2025 BLAKE2B b6a2160f963618319a13803e39385f2a0811103ae2a5c88882ba600d68125f7b3b862b3676d5fcfad823d51864d6fc301ea71903ff3c5d631fe393d8bb44caa9 SHA512 3aa94e29d976d5fbab4835ef6e5327a72a7bb99cc5b36fffb1ac637fb48ba8d13ecad633b4e159d3c6da9ddd1e6d2b1109e1e7bb6f1553bbab7068574a68f2f1
+EBUILD youtube-dl-2019.03.09-r1.ebuild 2123 BLAKE2B 30c7bf09ce71e92554aa3149fd27be0dbb3608bb35303a496dc4b1388be8a5e67bee450d6d1ca185637c2409f74f52e0aeaee3dcaac30a3f3c57de092c4e2d17 SHA512 d86d5fe4dcef4cd09f200ebc9ff39a9eecc578522c1bfe8914f41fb16ebf525897511ed9114688c9b2172421f728f6608effa3521c75d2b1d11c47972b481139
 EBUILD youtube-dl-2019.03.18.ebuild 2117 BLAKE2B 5083bf39fb89c96f03b9d4b68353e30716c2649a502024e3116ead883c4007fdf291eee380b94259df2fa319baf78905288288278ef4b91a1629ad7e51d73616 SHA512 d8adef117e465905f79aed2ae691e136a3bae7c8f530f771750a98e661a018852ab499f71baebd39047213813ed382ecd88c46efc0f592264713e18c893d5ea6
 EBUILD youtube-dl-99999999.ebuild 2012 BLAKE2B 7ad819e850d30622c7b7e4c6ab21a5f3a0e3a5cbf9ab8f3c12f7e6c93ff8074a63f4b69ac1fd7ccb5bc9453cf298853756778e841a3f8988ee5c24e4a79f5c62 SHA512 2e5bfc2fa48edd888371b396bb09ba84a239ee0cc89ea80c39a5dd05bde5177935f5744dd2d1f7e9c0a18eca9a2014253a4fb9485129bbc68875f0fa030e92f0
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild b/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild
new file mode 100644
index 000000000000..51dcb55b9d9f
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.03.01.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+RESTRICT="test"
+SLOT="0"
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "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 "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 ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.03.09-r1.ebuild b/net-misc/youtube-dl/youtube-dl-2019.03.09-r1.ebuild
new file mode 100644
index 000000000000..8249fc9c0e19
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2019.03.09-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6,3_7})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+LICENSE="public-domain"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+RESTRICT="test"
+SLOT="0"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${DEPEND}
+	|| (
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+		dev-python/pycrypto[${PYTHON_USEDEP}]
+	)
+"
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins ${PN}.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
+	elog
+	elog "${PN} works fine on its own on most sites. However, if you want"
+	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+	elog "videos can be retrieved in a higher quality format without sound."
+	elog "${PN} will detect whether avconv/ffmpeg is present and"
+	elog "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 "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 ${PN} to embed thumbnails from the metadata into the"
+	elog "resulting MP4 files, consider installing media-video/atomicparsley"
+}