From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Aug 2021 07:02:28 +0100 Subject: gentoo resync : 11.08.2021 --- media-gfx/hydrus/Manifest | 12 +-- media-gfx/hydrus/hydrus-445.ebuild | 28 +++---- media-gfx/hydrus/hydrus-446.ebuild | 28 +++---- media-gfx/hydrus/hydrus-447.ebuild | 28 +++---- media-gfx/hydrus/hydrus-448-r1.ebuild | 139 ++++++++++++++++++++++++++++++++ media-gfx/hydrus/hydrus-448.ebuild | 145 ---------------------------------- media-gfx/hydrus/hydrus-9999.ebuild | 28 +++---- media-gfx/hydrus/metadata.xml | 8 -- 8 files changed, 189 insertions(+), 227 deletions(-) create mode 100644 media-gfx/hydrus/hydrus-448-r1.ebuild delete mode 100644 media-gfx/hydrus/hydrus-448.ebuild (limited to 'media-gfx/hydrus') diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest index d8fcbb58fcc4..efa91162393b 100644 --- a/media-gfx/hydrus/Manifest +++ b/media-gfx/hydrus/Manifest @@ -5,9 +5,9 @@ DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163 DIST hydrus-446.tar.gz 38830223 BLAKE2B 5ab44f9cfbd15eb10144135eb4cc1d8493c20f2a931db4332a61aa186fddff96cb3a3b29eb2b210f070bb4be8210d552beb2578a7287a169a7364f02363e05f4 SHA512 bdbcd1177c3bf6ee85089e1a653587bae41c524bc2313bb5d481dee074c7da1c533a91957dc3b03d1c0b515e705809887e290ac71b866a51664f2a9a34bbfb6b DIST hydrus-447.tar.gz 38833157 BLAKE2B 8d7cf37a1419ef40fa7816958a01421ecc335d2a8c975fcf16d3ea5dfbdb76d872e4e597bdbade28eff7727914de5de7fb6ffcc7ecc27a712410031efa8433fe SHA512 85eaab40f192f2414be828545464811af2590b55e1a2fea7bbf64f27e4bb9a8b6c6c86cb25c1f7e9f48449173f079dcd749ea25ed22559bebb11adddce62da94 DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3 -EBUILD hydrus-445.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547 -EBUILD hydrus-446.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547 -EBUILD hydrus-447.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547 -EBUILD hydrus-448.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547 -EBUILD hydrus-9999.ebuild 4153 BLAKE2B af53ea19c4e57bef37cf32b2b20a3b92e57728ca7ee493851e70c97dcce631160c429b282a0367fbf680a1e03f64ab099267bcb7ca8899accd8e3b8b2c87d7eb SHA512 11fd24be29eb7ab185f560e3a5df9f59a7ba2bad72a94e82ca412c011164ac0f5b66f0ca42cca50e20a2b70651c804f004fd9af95efb6284b32f8930f43d5547 -MISC metadata.xml 1168 BLAKE2B 6480f7938566059342a4b8eef89ee26e4f3843faab9b8c937f74e71a1a27b63630bc6e64482b7ff5ebc647c1247a030e62635a4c3a5bc42d6df87209e35ffb53 SHA512 9bb31694a8d1ce56741340431e82b0e7f35866d90dd1359062703809be331192e5ba4acca94b8c0fc146cbb6199335e724345924687c904795c3c2d0d917acb3 +EBUILD hydrus-445.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848 +EBUILD hydrus-446.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848 +EBUILD hydrus-447.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848 +EBUILD hydrus-448-r1.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848 +EBUILD hydrus-9999.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848 +MISC metadata.xml 750 BLAKE2B cd037e9ecd9d7ff2a50d3b306a8394ddab3cfdfc74e67940e6f1cff8f90c5ba20bae42118b2c0df9309d4d13ea55fa6e39a9fc6615e2b0d4fca9f568392b0a10 SHA512 5838ad0aaab213af703b44749dd36159b828226a2399f1366783084e918506de5e79c953358403e976bb8f4f2dced8cac6e05d3c91210f002a5a697b828a3f97 diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild index ff24bd7b24a3..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=" @@ -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/hydrus-446.ebuild b/media-gfx/hydrus/hydrus-446.ebuild index ff24bd7b24a3..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=" @@ -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/hydrus-447.ebuild b/media-gfx/hydrus/hydrus-447.ebuild index ff24bd7b24a3..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=" @@ -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/hydrus-448-r1.ebuild b/media-gfx/hydrus/hydrus-448-r1.ebuild new file mode 100644 index 000000000000..d52bbf98e3b2 --- /dev/null +++ b/media-gfx/hydrus/hydrus-448-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_REQ_USE="sqlite" + +inherit python-single-r1 desktop optfeature + +DESCRIPTION="A booru-like media organizer for the desktop" +HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git" +else + SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64" +fi + +# hydrus itself is WTFPL +# icons included are CC-BY-2.5 +LICENSE="WTFPL-2 CC-BY-2.5" +SLOT="0" +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RESTRICT="!test? ( test )" + +# RDEPEND is sorted as such: +# - No specific requirements +# - Specific version or slot +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,${PYTHON_USEDEP}] + dev-python/python-mpv[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/send2trash[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + 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}] + ') +" +BDEPEND=" + ${RDEPEND} + $(python_gen_cond_dep ' + test? ( + dev-python/httmock[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + ) + ') +" + +PATCHES=( + "${FILESDIR}/userpath-in-local-share.patch" +) + +src_prepare() { + default + + # Contains pre-built binaries for other systems and a broken swf renderer for linux + rm -r bin/ || die + # Build files used for CI, not actually needed + rm -r static/build_files || die + # Duplicate license file, not needed + rm license.txt || die + # Python requirements files, not needed + rm requirements_*.txt || die +} + +src_compile() { + python_optimize "${S}" +} + +src_test() { + # The tests use unittest, but are run with a custom runner script. + # QT_QPA_PLATFORM is required to make them run without X + local -x QT_QPA_PLATFORM=offscreen + "${EPYTHON}" "${S}/test.py" || die "Tests failed" +} + +src_install() { + local doc="${EPREFIX}/usr/share/doc/${PF}" + elog "Hydrus includes an excellent manual, that can either be viewed at" + elog "${doc}/html/help/index.html" + elog "or accessed through the hydrus help menu." + + mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die + + local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/) + local HTML_DOCS=("${S}"/help/) + einstalldocs + + # Files only needed for testing + rm test.py hydrus/hydrus_test.py || die + rm -r hydrus/test/ static/testing/ || die + + # 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" /opt/hydrus/help + + insinto /opt/hydrus + doins -r "${S}"/. + + exeinto /usr/bin + python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die) + python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die) + + make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \ + "AudioVideo;FileTools;Graphics;Network;" +} + +pkg_postinst() { + 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 deleted file mode 100644 index ff24bd7b24a3..000000000000 --- a/media-gfx/hydrus/hydrus-448.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="sqlite" - -inherit python-single-r1 desktop optfeature - -DESCRIPTION="A booru-like media organizer for the desktop" -HOMEPAGE="https://hydrusnetwork.github.io/hydrus/ https://github.com/hydrusnetwork/hydrus" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git" -else - SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - - KEYWORDS="~amd64" -fi - -# hydrus itself is WTFPL -# icons included are CC-BY-2.5 -LICENSE="WTFPL-2 CC-BY-2.5" -SLOT="0" -IUSE="+cloudscraper +ffmpeg +lz4 charts socks test +mpv" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -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/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/pyyaml[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/send2trash[${PYTHON_USEDEP}] - dev-python/service_identity[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/twisted[${PYTHON_USEDEP}] - media-libs/opencv[python,png,jpeg,${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=" - ${RDEPEND} - $(python_gen_cond_dep ' - test? ( - dev-python/httmock[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - ) - ') -" - -PATCHES=( - "${FILESDIR}/userpath-in-local-share.patch" -) - -src_prepare() { - default - - # Contains pre-built binaries for other systems and a broken swf renderer for linux - rm -r bin/ || die - # Build files used for CI, not actually needed - rm -r static/build_files || die - # Duplicate license file, not needed - rm license.txt || die - # Python requirements files, not needed - rm requirements_*.txt || die -} - -src_compile() { - python_optimize "${S}" -} - -src_test() { - # The tests use unittest, but are run with a custom runner script. - # QT_QPA_PLATFORM is required to make them run without X - local -x QT_QPA_PLATFORM=offscreen - "${EPYTHON}" "${S}/test.py" || die "Tests failed" -} - -src_install() { - local doc="${EPREFIX}/usr/share/doc/${PF}" - elog "Hydrus includes an excellent manual, that can either be viewed at" - elog "${doc}/html/help/index.html" - elog "or accessed through the hydrus help menu." - - mv "help my client will not boot.txt" "help_my_client_will_not_boot.txt" || die - - local DOCS=(COPYING README.md Readme.txt help_my_client_will_not_boot.txt db/) - local HTML_DOCS=("${S}"/help/) - einstalldocs - - # Files only needed for testing - rm test.py hydrus/hydrus_test.py || die - rm -r hydrus/test/ static/testing/ || die - - # 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 - - insinto /opt/hydrus - doins -r "${S}"/. - - exeinto /usr/bin - python_newexe - hydrus-server < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-server" || die) - python_newexe - hydrus-client < <(sed "s/python/${EPYTHON}/" "${FILESDIR}/hydrus-client" || die) - - make_desktop_entry "hydrus-client" "Hydrus Client" "/opt/hydrus/static/hydrus_non-transparent.png" \ - "AudioVideo;FileTools;Graphics;Network;" -} - -pkg_postinst() { - optfeature "support for automatic port forwarding" "net-libs/miniupnpc" -} 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 - - Support for bandwidth charts - Support working around cloudflare anti-bot page - Show duration and other information on video thumbnails - Enable memory compression in the client - Support playing videos with libmpv - Support SOCKS proxies - -- cgit v1.2.3