From 4eeee822487f780361d7d47b4c1b999f93e15b27 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 18 Sep 2023 23:07:14 +0100 Subject: gentoo auto-resync : 18:09:2023 - 23:07:14 --- media-gfx/Manifest.gz | Bin 37519 -> 37510 bytes media-gfx/hydrus/Manifest | 6 +- media-gfx/hydrus/hydrus-531.ebuild | 150 ------------------------------------ media-gfx/hydrus/hydrus-538.ebuild | 149 +++++++++++++++++++++++++++++++++++ media-gfx/hydrus/hydrus-9999.ebuild | 19 +++-- 5 files changed, 161 insertions(+), 163 deletions(-) delete mode 100644 media-gfx/hydrus/hydrus-531.ebuild create mode 100644 media-gfx/hydrus/hydrus-538.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index e62b30470d73..c17d1a25405f 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest index e853f472e668..d4c9b1cb0c86 100644 --- a/media-gfx/hydrus/Manifest +++ b/media-gfx/hydrus/Manifest @@ -1,9 +1,9 @@ AUX hydrus-client 105 BLAKE2B cb1c55f0831eda122eebb9363eab50180b8746038405ba514a6821c8e4e892e59f18b9b29b5f3117d62d758ad6e5d06fdacde7fe0d8ad59a8e674134c945c77d SHA512 56dc21cd54d0fbf95d1a127ac387d29ae99583210c97a1e77233e1bfc08fb631caf1ac3be1034c43e0485e4238ecc96009533d4079560807ff1126d37b75fe6f AUX hydrus-server 69 BLAKE2B 245851a0bfd7ed4e947d229cae980daaaf213e2ff4238b5bc6c75b12832f3fbf7c95d34d72f4fc7b6194ed06df8652e5042bc69ab40367d09c55796e9013392b SHA512 70fa7877b7d5efc7786926af6a02a468a0c8ebbb553a61bc7e049622ddf00b5ca67876af74e17d0d9408e5f950acf8aa0fc007baaf1a656d3fb5368fa15fcd22 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467 -DIST hydrus-531.tar.gz 41507932 BLAKE2B 388bc87bedf46ce2e8b4a26bfe744a80382d2c87985950db4458834e4bb8acaa50d04c50d8321db6c35400079d88c6f8c62f68084f5b1d8503fa4c93e280b9bb SHA512 8083b37d7b99c9f5e2679d64e40bc90a2144878746454aea01d9548705c767889b3f895abde5d172a72e4edcaca1feca450ba2ed99389eecfc8467491dafac1c DIST hydrus-534.tar.gz 41548094 BLAKE2B bec115deae4202869f34ed205d4b6f10b63b17fcb3d950250c1cfb2752f021c57487172deb0cebf29a349822d02ee520f3761320f49214ff8adcde7716eda984 SHA512 52f21ae2121fefd83efa2c0df8087fc6872fcb5a89ef1bab71ab968e148b51326f521dcc0f7636a45a9a9ce7661921402d1fc792de1f0c9251efb49e86cb08f7 -EBUILD hydrus-531.ebuild 4662 BLAKE2B e8ea3f9971318f96a1ea3ba789d12dbec7e882723c4afdf2e8d40aa0636ea885c0e4fb912e852567098db8a39aaa71d5a7bdbe8ab470552c638497482050ac20 SHA512 4d1f850cb07dbc045ed40941a57d930bacd0591e00c6ab228190436a99d892887409b0fa98ded6ca16ee1d0aa2581043b5e108ee628db294fe2c6b1c520b1e5f +DIST hydrus-538.tar.gz 41659526 BLAKE2B 4e6f4058fc8eefb154ec08667d9d586e48df688de2e887bae05cc381dc15c56ba2da4a97d1194bac2547af24a690e8d6962f05792babb68a9f0d5fb9ca23047e SHA512 da7bebf294356455597d8397391edcd3c7af032ef2d494ed2e91277c58bd29516068ba9ed99fa5df8d7bbfc47beb3488b3d73a0d99cb946d57546b095b6d6cd6 EBUILD hydrus-534.ebuild 4662 BLAKE2B e8ea3f9971318f96a1ea3ba789d12dbec7e882723c4afdf2e8d40aa0636ea885c0e4fb912e852567098db8a39aaa71d5a7bdbe8ab470552c638497482050ac20 SHA512 4d1f850cb07dbc045ed40941a57d930bacd0591e00c6ab228190436a99d892887409b0fa98ded6ca16ee1d0aa2581043b5e108ee628db294fe2c6b1c520b1e5f -EBUILD hydrus-9999.ebuild 4662 BLAKE2B e8ea3f9971318f96a1ea3ba789d12dbec7e882723c4afdf2e8d40aa0636ea885c0e4fb912e852567098db8a39aaa71d5a7bdbe8ab470552c638497482050ac20 SHA512 4d1f850cb07dbc045ed40941a57d930bacd0591e00c6ab228190436a99d892887409b0fa98ded6ca16ee1d0aa2581043b5e108ee628db294fe2c6b1c520b1e5f +EBUILD hydrus-538.ebuild 4694 BLAKE2B 991178a1b0492857c85fecc15e840887a63c33f1b9ed6cd8f5b7c3bdf27dbf1b6a5b8e09af0a4f9541dda9ee9dadb26d5f1b8ec4e7d77d0b8a2a5c3c24354e0a SHA512 37d888d5423c395fb77652275e44a952bd22f6b36e44aea612a2ed7d373eb925e0a3d8a9376ba2978e0468def104b6c8465cdbcc2f8ba6acf758b40e449bfaae +EBUILD hydrus-9999.ebuild 4694 BLAKE2B 991178a1b0492857c85fecc15e840887a63c33f1b9ed6cd8f5b7c3bdf27dbf1b6a5b8e09af0a4f9541dda9ee9dadb26d5f1b8ec4e7d77d0b8a2a5c3c24354e0a SHA512 37d888d5423c395fb77652275e44a952bd22f6b36e44aea612a2ed7d373eb925e0a3d8a9376ba2978e0468def104b6c8465cdbcc2f8ba6acf758b40e449bfaae MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb diff --git a/media-gfx/hydrus/hydrus-531.ebuild b/media-gfx/hydrus/hydrus-531.ebuild deleted file mode 100644 index 851d373d97a8..000000000000 --- a/media-gfx/hydrus/hydrus-531.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE="sqlite" - -DOCS_BUILDER=mkdocs -DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex" - -inherit python-single-r1 desktop docs 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/cbor2[${PYTHON_USEDEP}] - 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},lcms] - 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 - - >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - ') -" -BDEPEND=" - ${RDEPEND} - $(python_gen_cond_dep ' - test? ( - dev-python/httmock[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - - dev-python/pyside2[widgets,gui,multimedia,${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 - # Python requirements file, not needed - rm requirements.txt || die - # Remove unneeded additional scripts - rm *.command *.sh *.bat || die -} - -src_compile() { - python_optimize "${S}" - docs_compile -} - -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}/hydrus_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 help_my_client_will_not_boot.txt db/) - einstalldocs - - # Files only needed for testing - rm hydrus_test.py hydrus/hydrus_test_boot.py || die - rm -r hydrus/test/ static/testing/ || die - # Build files used for CI and development, not actually needed. Has to be deleted after src_compile. - # because it contains documentation - rm -r static/build_files static/requirements || die - - # ${DOCS[@]} files are copied into doc - # ${S}/docs/ is the markdown source code for documentation - # .gitignore/.github files aren't needed for the program to work, same with mkdocs files - rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die - if use doc; then - # ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation - rm -r "${S}/_build" || die - # The program expects to find documentation here, so add a symlink to doc - dosym "${doc}/html" /opt/hydrus/help - fi - - 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-538.ebuild b/media-gfx/hydrus/hydrus-538.ebuild new file mode 100644 index 000000000000..6c1cb6719c2e --- /dev/null +++ b/media-gfx/hydrus/hydrus-538.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_REQ_USE="sqlite" + +DOCS_BUILDER=mkdocs +DOCS_DEPEND="dev-python/mkdocs-material dev-python/regex" + +inherit python-single-r1 desktop docs 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: +# Python libraries with no specific requirements +# Python libraries with specific version, slot, or use requirements +# Non-python dependencies +RDEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/beautifulsoup4[${PYTHON_USEDEP}] + dev-python/cbor2[${PYTHON_USEDEP}] + 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},lcms] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pyopenssl[${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/twisted[${PYTHON_USEDEP}] + + dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] + || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] ) + + media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] + media-video/ffmpeg + ') +" +BDEPEND=" + ${RDEPEND} + $(python_gen_cond_dep ' + test? ( + dev-python/httmock[${PYTHON_USEDEP}] + dev-python/mock[${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 + # Python requirements file, not needed + rm requirements.txt || die + # Remove unneeded additional scripts + rm *.command *.sh *.bat || die +} + +src_compile() { + python_optimize "${S}" + docs_compile +} + +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}/hydrus_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 help_my_client_will_not_boot.txt db/) + einstalldocs + + # Files only needed for testing + rm hydrus_test.py hydrus/hydrus_test_boot.py || die + rm -r hydrus/test/ static/testing/ || die + # Build files used for CI and development, not actually needed. Has to be deleted after src_compile. + # because it contains documentation + rm -r static/build_files static/requirements || die + + # ${DOCS[@]} files are copied into doc + # ${S}/docs/ is the markdown source code for documentation + # .gitignore/.github files aren't needed for the program to work, same with mkdocs files + rm -r "${DOCS[@]}" "${S}/docs/" .gitignore .github/ mkdocs.yml mkdocs-gh-pages.yml || die + if use doc; then + # ${S}/_build = ${DOCS_OUTDIR}/.. , these have already been copied, remove before installation + rm -r "${S}/_build" || die + # The program expects to find documentation here, so add a symlink to doc + dosym "${doc}/html" /opt/hydrus/help + fi + + 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 "memory compression in the client" "dev-python/lz4" + optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks" + optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]" +} diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild index 851d373d97a8..6c1cb6719c2e 100644 --- a/media-gfx/hydrus/hydrus-9999.ebuild +++ b/media-gfx/hydrus/hydrus-9999.ebuild @@ -34,11 +34,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="!test? ( test )" # RDEPEND is sorted as such: -# - No specific requirements -# - Specific version or slot +# Python libraries with no specific requirements +# Python libraries with specific version, slot, or use requirements +# Non-python dependencies RDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' + dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/cbor2[${PYTHON_USEDEP}] dev-python/chardet[${PYTHON_USEDEP}] dev-python/cloudscraper[${PYTHON_USEDEP}] @@ -48,19 +50,18 @@ RDEPEND=" dev-python/pillow[${PYTHON_USEDEP},lcms] 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}] + + dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] + || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] ) + media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] media-video/ffmpeg - - >=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}] - dev-python/beautifulsoup4[${PYTHON_USEDEP}] ') " BDEPEND=" @@ -69,8 +70,6 @@ BDEPEND=" test? ( dev-python/httmock[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] - - dev-python/pyside2[widgets,gui,multimedia,${PYTHON_USEDEP}] ) ') " @@ -144,7 +143,7 @@ src_install() { 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" + optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]" } -- cgit v1.2.3