From 9b55c1bd600df28af7b9f6ee044b714873e19b49 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Feb 2023 09:56:20 +0000 Subject: gentoo auto-resync : 26:02:2023 - 09:56:20 --- media-gfx/Manifest.gz | Bin 37954 -> 37949 bytes media-gfx/hydrus/Manifest | 7 +- media-gfx/hydrus/hydrus-515.ebuild | 147 ---------------------------------- media-gfx/hydrus/hydrus-518.ebuild | 152 ++++++++++++++++++++++++++++++++++++ media-gfx/hydrus/hydrus-9999.ebuild | 10 ++- 5 files changed, 163 insertions(+), 153 deletions(-) delete mode 100644 media-gfx/hydrus/hydrus-515.ebuild create mode 100644 media-gfx/hydrus/hydrus-518.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 739378bbb71d..70ae825a0f95 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 220a84356ba9..e5371993e51d 100644 --- a/media-gfx/hydrus/Manifest +++ b/media-gfx/hydrus/Manifest @@ -1,9 +1,10 @@ AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467 -DIST hydrus-515.tar.gz 41096030 BLAKE2B 47f09ef0b0a0c83960f7feadac28d14a051235a3f4601d6a0518b05c7c62ba4b0ec0093a474b232cc2bbca77c21579a69d963eb8372d7bab3d8ddd67a6067f1b SHA512 b8d330b546de1f8b4aa319783893d3fdfda7926faa05fd9494713e0a9f975b507eb1e42d56917a71721836162929f9bab78579f291aa72150f6e124c63bc259d +DIST hydrus-3.11-test-fixes.patch 8493 BLAKE2B 598c9a82ced8c181ac2c9f91bef34ad9136444f40d909a69c0c0d3a5f620bb2818a684ed221ae62f1e6226d6b534b6ac06cedb3f65a5f3be8fc2b12612a9daad SHA512 6dd8206b02f5f209cf86d2b8cd65952cc3d449352d3cb91c654d325077306415e6482191a4e64cba6aec2c4f1ff358c01e2ecbe7d3b56c9027673757a3590051 DIST hydrus-516.tar.gz 41098992 BLAKE2B 4195ade87f9f42f5aaf592ae502e49404d3fb188f7921c137973e7df31af8bb346c243a375e99014cfa9e3d6821a187b254cfe79f88c470cf54aa45e50e9bb22 SHA512 941cb81fba305708a1c33250aae366ae3bf8ba83d9aab90475bec09109608c86b68fdcc84d18a4fe324f57b2b91b8531887d9792b9d9130c5234f9cfa96e106f -EBUILD hydrus-515.ebuild 4504 BLAKE2B c8660a2692d3537ea6cbc336b7b1b565fab71b02c600e32c59988e8bc30fe62d8b8e54f07c70ee382ece1f0faaf9093c6f74161553f3d344aba1ee81e2bcca5a SHA512 36a37a1ec4646142ece09d2113dab26c1e78d6c584d3e30a6d0351673dd7888c34c46124f56110fddacaddfc2c0ec364b357c70d30d68b68e0ace60885507bd5 +DIST hydrus-518.tar.gz 41105373 BLAKE2B e766cdb7e8ffdc1148f5970724a6d3293522a0ae750c4e5c996d5cdbabc837dc3a9c002251080b6253a869b2cf87a17cb9c7b99ad912d68b6b5c4207e1d3ae7a SHA512 7e551ba83e97b490c98bf1858b87c78e9d5564cfaecfc83426ad2d802005e7cb84c9aadc61b762f3dca1916b8e786ca044bb310c93462e4c4f953f60f3291ed2 EBUILD hydrus-516.ebuild 4504 BLAKE2B c8660a2692d3537ea6cbc336b7b1b565fab71b02c600e32c59988e8bc30fe62d8b8e54f07c70ee382ece1f0faaf9093c6f74161553f3d344aba1ee81e2bcca5a SHA512 36a37a1ec4646142ece09d2113dab26c1e78d6c584d3e30a6d0351673dd7888c34c46124f56110fddacaddfc2c0ec364b357c70d30d68b68e0ace60885507bd5 -EBUILD hydrus-9999.ebuild 4547 BLAKE2B 99069804b75ef0efae630d91e7ed502a738a6d5c4c96ab4579be1721b750f735a8469f460018118d93a5df07ee5984570d6be93fb2f030805ac8f42e335432e7 SHA512 f0b9a90b433e5deb934f3172dd1f85e8df3c8b43ebec78457b75a9eb622f918428ffe5fcec5fd592229c31566ab5ca30b175ab1db65e5fba978f33120af74312 +EBUILD hydrus-518.ebuild 4800 BLAKE2B 3a573ba85b4fc71b38c2b60b42501e131a364e425221911c53b083a9ba6f9482a769a4d18e2bd58b7983dd3f1936aeed9766ea6ef62af61ed5ecbd9587f4482c SHA512 2520868ad133903ed058470c8508c777b9735e9a2772d5a5933064dd51b90f9935c2aacedd036f28fa8596bba35176da5d2d3d2ab8a588db96a5bbd6ddfb1df6 +EBUILD hydrus-9999.ebuild 4800 BLAKE2B 3a573ba85b4fc71b38c2b60b42501e131a364e425221911c53b083a9ba6f9482a769a4d18e2bd58b7983dd3f1936aeed9766ea6ef62af61ed5ecbd9587f4482c SHA512 2520868ad133903ed058470c8508c777b9735e9a2772d5a5933064dd51b90f9935c2aacedd036f28fa8596bba35176da5d2d3d2ab8a588db96a5bbd6ddfb1df6 MISC metadata.xml 836 BLAKE2B 049faa70763ba176b6e4930abcdb5f4b4b87bd243759aba42dec32b9f2a199b3f2c33f0415ffdd1a392af3b461d939e633ec1f9333b0ff538f74d24306790fbe SHA512 0404c79e85e51eaba13fef930e695f168074e69734d3d8a604515f77196706bae9d36a2df9b3db0530c9f17b32881602509c7e22e7383c957a67e13c2a46e7bb diff --git a/media-gfx/hydrus/hydrus-515.ebuild b/media-gfx/hydrus/hydrus-515.ebuild deleted file mode 100644 index 6036cc0f1d38..000000000000 --- a/media-gfx/hydrus/hydrus-515.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..10} ) -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}] - ) - ') -" - -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 and development, not actually needed - rm -r static/build_files static/requirements || 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}/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 test.py hydrus/hydrus_test.py || die - rm -r hydrus/test/ static/testing/ || 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-518.ebuild b/media-gfx/hydrus/hydrus-518.ebuild new file mode 100644 index 000000000000..072c47dfe381 --- /dev/null +++ b/media-gfx/hydrus/hydrus-518.ebuild @@ -0,0 +1,152 @@ +# 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" + SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch" +else + SRC_URI=" + https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch + " + + 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}] + ) + ') +" + +PATCHES=( + "${FILESDIR}/userpath-in-local-share.patch" + "${DISTDIR}/${PN}-3.11-test-fixes.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 and development, not actually needed + rm -r static/build_files static/requirements || 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}/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 test.py hydrus/hydrus_test.py || die + rm -r hydrus/test/ static/testing/ || 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-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild index e447f565f37b..072c47dfe381 100644 --- a/media-gfx/hydrus/hydrus-9999.ebuild +++ b/media-gfx/hydrus/hydrus-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..10} ) +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs @@ -18,8 +18,12 @@ if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/hydrusnetwork/hydrus.git" + SRC_URI="https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch" else - SRC_URI="https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/hydrusnetwork/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://github.com/vaartis/hydrus/commit/106a55b3aca945d047685eb53bd1d2aa8b8a7c50.diff -> ${PN}-3.11-test-fixes.patch + " KEYWORDS="~amd64" fi @@ -58,7 +62,6 @@ RDEPEND=" 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/beautifulsoup4[${PYTHON_USEDEP}] @@ -76,6 +79,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/userpath-in-local-share.patch" + "${DISTDIR}/${PN}-3.11-test-fixes.patch" ) src_prepare() { -- cgit v1.2.3