media-gfx/hydrus: Drop use flags for optfeature, make some mandatory

Signed-off-by: Ekaterina Vaartis <vaartis@kotobank.ch>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

6 files changed, 51 insertions, 89 deletions

diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index 177f1a8b9423..d52bbf98e3b2 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }
diff --git a/media-gfx/hydrus/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild
index 177f1a8b9423..d52bbf98e3b2 100644
--- a/media-gfx/hydrus/hydrus-446.ebuild
+++ b/media-gfx/hydrus/hydrus-446.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }
diff --git a/media-gfx/hydrus/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild
index 177f1a8b9423..d52bbf98e3b2 100644
--- a/media-gfx/hydrus/hydrus-447.ebuild
+++ b/media-gfx/hydrus/hydrus-447.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }
diff --git a/media-gfx/hydrus/hydrus-448.ebuild b/media-gfx/hydrus/hydrus-448.ebuild
index 177f1a8b9423..d52bbf98e3b2 100644
--- a/media-gfx/hydrus/hydrus-448.ebuild
+++ b/media-gfx/hydrus/hydrus-448.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index ff24bd7b24a3..d52bbf98e3b2 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -25,7 +25,7 @@ fi
 # icons included are CC-BY-2.5
 LICENSE="WTFPL-2 CC-BY-2.5"
 SLOT="0"
-IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv"
+IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="!test? ( test )"
@@ -33,18 +33,19 @@ RESTRICT="!test? ( test )"
 # RDEPEND is sorted as such:
 # - No specific requirements
 # - Specific version or slot
-# - Depends on use flags
 RDEPEND="
 	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/cloudscraper[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/pyside2[widgets,gui,charts?,${PYTHON_USEDEP}]
+		dev-python/pyside2[widgets,gui,${PYTHON_USEDEP}]
+		dev-python/python-mpv[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/requests[${PYTHON_USEDEP}]
 		dev-python/send2trash[${PYTHON_USEDEP}]
@@ -52,21 +53,11 @@ RDEPEND="
 		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/twisted[${PYTHON_USEDEP}]
 		media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}]
+		media-video/ffmpeg
+		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
 		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-
-		cloudscraper? ( dev-python/cloudscraper[${PYTHON_USEDEP}] )
-		ffmpeg? ( media-video/ffmpeg )
-		lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-		mpv? (
-			media-video/mpv[libmpv,${PYTHON_USEDEP}]
-			dev-python/python-mpv[${PYTHON_USEDEP}]
-		)
-		socks? (
-			|| ( dev-python/requests[socks5,${PYTHON_USEDEP}]
-				dev-python/PySocks[${PYTHON_USEDEP}] )
-		)
 	')
 "
 BDEPEND="
@@ -127,7 +118,7 @@ src_install() {
 	# These files are copied into doc
 	rm -r "${DOCS[@]}" "${HTML_DOCS[@]}" || die
 	# The program expects to find documentation here, so add a symlink to doc
-	dosym "${doc}/html/help" help
+	dosym "${doc}/html/help" /opt/hydrus/help
 
 	insinto /opt/hydrus
 	doins -r "${S}"/.
@@ -141,5 +132,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	optfeature "support for automatic port forwarding" "net-libs/miniupnpc"
+	optfeature "automatic port forwarding support" "net-libs/miniupnpc"
+	optfeature "bandwidth charts support" "dev-python/pyside2[charts]"
+	optfeature "memory compression in the client" "dev-python/lz4"
+	optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks"
 }
diff --git a/media-gfx/hydrus/metadata.xml b/media-gfx/hydrus/metadata.xml
index 0b2b3b928087..d2078fe39450 100644
--- a/media-gfx/hydrus/metadata.xml
+++ b/media-gfx/hydrus/metadata.xml
@@ -14,13 +14,5 @@
 		with tags instead of folders, a little like a booru on your desktop. Advanced users can share tags and files
 		anonymously through custom servers that any user may run
 	</longdescription>
-	<use>
-		<flag name="charts">Support for bandwidth charts</flag>
-		<flag name="cloudscraper">Support working around cloudflare anti-bot page</flag>
-		<flag name="ffmpeg">Show duration and other information on video thumbnails</flag>
-		<flag name="lz4">Enable memory compression in the client</flag>
-		<flag name="mpv">Support playing videos with libmpv</flag>
-		<flag name="socks">Support SOCKS proxies</flag>
-	</use>
 	<stabilize-allarches/>
 </pkgmetadata>