diff options
Diffstat (limited to 'media-gfx')
22 files changed, 256 insertions, 191 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex d750faf4a31f..b94414ed257e 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/cairosvg/Manifest b/media-gfx/cairosvg/Manifest index bd17cf46d9d1..c156a14fcef1 100644 --- a/media-gfx/cairosvg/Manifest +++ b/media-gfx/cairosvg/Manifest @@ -1,4 +1,4 @@ AUX cairosvg-2.5.1-no-ref.patch 923 BLAKE2B 4a14bdd5f19f9abbb9415c19cb15aecc6dee8bf34feef0cb551f4185c16e4a93ac29d6e46f81dab03f479b2e982c9d0a85a622c1292cfe6d52c6acc1c896aa7f SHA512 f1a45ba47fc3f1f4b91799d6d45b2388a2ac6b0be08695f2507b4bf34818b6a7e8c23cbfbb270c3d603d81acbe3c9bc0a867e5864b684f67540b449d684e6f0e DIST CairoSVG-2.5.2.tar.gz 8397659 BLAKE2B f2f45aa01015f5ccebe3dede303b6a701c0183b7b53f0d69c8756d5f0e6c0898826939f0b5bcc9e00e4185c83ff507d6fa886a020ad0b63c80a565a181807f58 SHA512 070fbb549614401a7d8290497b0eb7702330ee264c5f625cd1e7aac4aea7d71ee7d2d8899297212e1a3c11c93903b191c0c699336d9000796318b11f4e075576 -EBUILD cairosvg-2.5.2.ebuild 1096 BLAKE2B a993a4f1a60334cb070c5576539858b63f2a18a872672178a6f0557de7b9caa0b10d1a7b1cb64bf409625b722cf6bbda0332635fa57840cab467b58f8b28722e SHA512 7682b39fd248423dae300933887731575da4293712aa39cee5ce5d5c99c304dd55434196e44c3d531d03d925162c370ebb4d1e0fa71fa09c45ebee5f24e62781 -MISC metadata.xml 328 BLAKE2B 168e60e4dbd12e2b99ba4ad8a6f8f42ef5a4de12f8f1edc68ba4d1d4252b24995da5d0e4ef9e1db09b3934ba42b042685db625439425a6e98cde2f52050c4af1 SHA512 ebb7d9d27e014fd083d0abe9508040730f980ba8a0bc89670ee5418af2c3af036d0ec16b5607a8805944d3b7eeb835e8806ab059fed68c52268df1cd10d7bbb0 +EBUILD cairosvg-2.5.2.ebuild 1064 BLAKE2B bc2397faea5ba26a79ed7c44b197196636b436f5a1739fd9e105ed5f2d426c79b908ab1083de5380a19c998d6e78866f7fd639f2145ea743aaa4ce44b7fb3851 SHA512 e059668b4c4d162bf0e7e4d589120b5a0cbb4b98db1d2a63e5568d0c54562582376c3fba5db11f710c66ff619689fda8b02f3057fd5db2961ccd921757031f31 +MISC metadata.xml 353 BLAKE2B 501a4d516e9a63d6dcc62b7f37d590a8e84749cf2ccdec635eb305c84c176c79cfb512007f2e4f7c2f7cb167796b1d1343fcb424d954676721134f91dbc074f7 SHA512 2826a22e5a8ef96b3c0bb8af57517057ac0b6b8d4d4e98ec25779cb583499268dd1f5a488c62fc293b664d0e3dc30989f15982c877c58d83a7f13810dfec3f2a diff --git a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild b/media-gfx/cairosvg/cairosvg-2.5.2.ebuild index ee2e49f8cf67..cc2283c89dd2 100644 --- a/media-gfx/cairosvg/cairosvg-2.5.2.ebuild +++ b/media-gfx/cairosvg/cairosvg-2.5.2.ebuild @@ -3,8 +3,7 @@ EAPI=7 -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 diff --git a/media-gfx/cairosvg/metadata.xml b/media-gfx/cairosvg/metadata.xml index d688975002b3..8837afb446d5 100644 --- a/media-gfx/cairosvg/metadata.xml +++ b/media-gfx/cairosvg/metadata.xml @@ -5,6 +5,7 @@ <email>mgorny@gentoo.org</email> <name>Michał Górny</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">CairoSVG</remote-id> </upstream> diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index dadc629a709e..3f9016382b8a 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -2,5 +2,5 @@ AUX exiv2-0.27.4-gtest-1.11.patch 1489 BLAKE2B b20cee53dfd712389f553402779d839dc DIST exiv2-0.27.3-Source.tar.gz 26447901 BLAKE2B ac13e6d8fce83923278cfeb628f143310a3c62b42936c8ed8b302a2c3df4c36f5666fa749adfb1d745e42da8f519762532e6fc281993aa55bcd7ce56e08c6e3e SHA512 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9 DIST exiv2-0.27.4-Source.tar.gz 32055837 BLAKE2B 9c31c08fafb38895fa7812a8c7a195335e80a6b9c15f7b5f3750f5ab30903c4c3bbf9aee5a7293a7d437d15a49a9cb7b45a3133cbb36ee62081efae0dd67b61a SHA512 f6798baafb36a54ba5bc65c2d28d4f4469e298582c90b417eb437b5dbda8e11963fb3314e8419717b3815ee8c3a68955cddc79e45351d9f2c165a0b73eb7b7be EBUILD exiv2-0.27.3.ebuild 2452 BLAKE2B a0e2c3a195f3dc70ae61d4ee17726fb41b2f1fa0446e156062fdda693dc9ffe0ff3bf3ae27dbe234d468cfb16d79ca16b4b7aadd81234f07af6af64a8a4ac57c SHA512 092f563cd4486ccacfae803cb00400e5e6609ad8505d9eff41de6e63a469b5359c0567985f78c0b16f77ee1cc1982aa541159971a189a6a15755aeab43d26b82 -EBUILD exiv2-0.27.4.ebuild 2753 BLAKE2B e729f43c4e5cd2509ddf07c7929e9c9b51e68cc0f952c8c104855c91e1e2722c4fdbe2da74baef2033217f061df16781b05fe12029edf028e3411009befbba19 SHA512 9dfd1c8790b9c1f1296a2c15edaa696d43a380f7417c9bb72e3de41dc2822536ab162c77f26df5c931ba947e5f74b4bcda1534216f0788baae81d25d081313e3 +EBUILD exiv2-0.27.4.ebuild 2751 BLAKE2B 8ef658cb004d33c665b691a59b73f3746126f3e5fa0ab1059c709a46ad6e349c72ab5c339de305c3bd6701fea0c2adba2d147b57e90ee6233cf972d2074053f7 SHA512 454804b54e3e7cde2f1bcabaf8d793ba8614c4e57b5afbac65ea45ee72f95cdca1c7a2a7ad2ed4e9d1b6f5d8c66f4d9746cb145fbdc53cc1df24d1492a5eff8c MISC metadata.xml 492 BLAKE2B 06b2f7b1d7b50e853ae116ad18f254103116c88c7d6957c1c9323083f0f87d7ed268ee188e91edf8b42b02a996e5c85017fffc12b0680f7522a0eda07ecbf74a SHA512 d0e56dd6585c3f10b14043764313de11545380fb15b18ca1627bbd92db357219aef801af050cbf3466b0b4e97fce25a55293068d21db93c1b6003a802944886f diff --git a/media-gfx/exiv2/exiv2-0.27.4.ebuild b/media-gfx/exiv2/exiv2-0.27.4.ebuild index 9ee65a76efe1..14190ea43cdd 100644 --- a/media-gfx/exiv2/exiv2-0.27.4.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.4.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} = *9999 ]]; then inherit git-r3 else SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" S="${WORKDIR}/${P}-Source" fi 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.ebuild b/media-gfx/hydrus/hydrus-448-r1.ebuild index ff24bd7b24a3..d52bbf98e3b2 100644 --- a/media-gfx/hydrus/hydrus-448.ebuild +++ b/media-gfx/hydrus/hydrus-448-r1.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-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> diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index b4bd9f4962d6..b3c1a0c738b1 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,7 +1,10 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5 -AUX krita-4.4.5-pykrita-crash-on-exit.patch 2029 BLAKE2B 82b5146f25165416ac6e3f2ea46315e87bf53f5b34a3c3820bddd2e975f782e945db6f985a5fa347a8a2f644e15ea7f60854ea0874f1a71e213819aaea70c454 SHA512 9848301759c51724c3bd2f9c67f38073e6043d3bbeb8c557fe7ab6261c9664f97215ab602808f6c495cf7a23c6e91f19823b3d3cdac8f135ff878dc0fd63a653 +AUX krita-4.4.5-pykrita-crash-on-exit.patch 1197 BLAKE2B bebb54df49f02056acc43232bcebf6c98a6e93fb7b28fdb6450ebc0b882f0fed13f24ab13b8227de99effea00ae29b7752b17bb07e1bec0a0fd9c4acbcc874f2 SHA512 bfa7cb10c8f81ac119bacfaaec7207a71a5cdd45cf53270f8edbd8164af790ee931b24f6caacf3c66e44a7984503b7c90b0bd80447e1fb2ed680da92893a76d1 +AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4 -EBUILD krita-4.4.5-r1.ebuild 3498 BLAKE2B 157ab6af565cfe24f58b871aff9e067ab5613cd953d2556c18d7023f372b6c4ff601b078ad4d9e69b2c39e553a7f75e71f09a23f695e7a64174625ba787442a3 SHA512 c33a0d672f8a1b844e93c034a23399322a82116c3721f3e52b6b519802a700d121a5fa458ec5d752670bd9e0e39f87d3a23f764e9e7df9b8c91acb14a70df7dd +DIST krita-4.4.7.tar.gz 254871508 BLAKE2B c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695 SHA512 b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5 +EBUILD krita-4.4.5-r1.ebuild 3566 BLAKE2B 2ed6de5f9a8cf257d63397647621c51b716a1be2e5147ab1e22d4b698acc026b1ed1b5b09ba4ca45a6deaa7e53de87bb28b9ef1ae92a5c5c6f052d5f5863fa41 SHA512 004b3e83eb730b8212c9c50134e378e36cbf60cabfa7672a29c139b512daf2f73ab214cf8685f73e257b2dd0aec7d8b0f69c6a5db78f0ce08329a0098af10c7e +EBUILD krita-4.4.7.ebuild 3511 BLAKE2B 26a779a209dfc361e5f80b44b266eadca7af2f9c2f6f0b9ef6db88f87e40afdc9fbca812bd9029bf9f192cd2962ef45eef96659d950f6771311454af84ef5293 SHA512 3618ebb0d61ed181ddb11b7ea614e7f0721d63c50c7fe674c3aa2517cd8fadfd30bca6a63b1c056e6bdc6dbe6c2651e57f86e80dc64be8413ec03fe4294166c0 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch index 1939c962815e..12ebb2fa95a7 100644 --- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch +++ b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch @@ -1,42 +1,18 @@ -From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001 -From: Alvin Wong <alvin@alvinhc.com> -Date: Sat, 19 Jun 2021 16:29:45 +0800 -Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash +From 86a38621fbbf96edf489a0efd2b9c24c123e2051 Mon Sep 17 00:00:00 2001 +From: Dmitry Kazakov <dimula73@gmail.com> +Date: Tue, 3 Aug 2021 11:57:33 +0300 +Subject: [PATCH] Disable finalizing of the PyQt to prevent crash on exit -Suspecting that we can't have Python clean up its QObject's inside -QCoreApplication's destructor, but must be done before it. - -BUG: 417465 - -* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a +CCBUG:417465 --- - plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) + plugins/extensions/pykrita/plugin/plugin.cpp | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp -index ef0e27eb65..66f552b007 100644 +index 028798e2f4..cc06c07fbe 100644 --- a/plugins/extensions/pykrita/plugin/plugin.cpp +++ b/plugins/extensions/pykrita/plugin/plugin.cpp -@@ -13,6 +13,8 @@ - #include <kis_preference_set_registry.h> - #include "pyqtpluginsettings.h" - -+#include <QCoreApplication> -+ - #include <Krita.h> - - K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin<KritaPyQtPlugin>();) -@@ -74,15 +76,18 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &) - Q_FOREACH (Extension *extension, Krita::instance()->extensions()) { - extension->setup(); - } -+ -+ // This ensures that QObject's owned by Python are destructed before -+ // the destructor of QCoreApplication is called, in order to prevent -+ // a crash on exit. -+ // See https://bugs.kde.org/show_bug.cgi?id=417465 -+ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, []() { PyKrita::finalize(); }); - } +@@ -89,11 +89,10 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &) KritaPyQtPlugin::~KritaPyQtPlugin() { @@ -45,11 +21,12 @@ index ef0e27eb65..66f552b007 100644 -#if QT_VERSION < QT_VERSION_CHECK(5,14,0) - PyKrita::finalize(); -#endif -+ // Don't call PyKrita::finalize here, because that can result in a crash -+ // deep inside Qt. ++ /// XXX: Don't call PyKrita::finalize here, because that can result in a crash ++ /// deep inside Qt. See https://bugs.kde.org/show_bug.cgi?id=417465 ++ ++ // PyKrita::finalize(); } #include "plugin.moc" -- GitLab - diff --git a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch new file mode 100644 index 000000000000..f896a3920efc --- /dev/null +++ b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch @@ -0,0 +1,41 @@ +From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001 +From: Alvin Wong <alvin@alvinhc.com> +Date: Sat, 19 Jun 2021 16:29:45 +0800 +Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash + +Suspecting that we can't have Python clean up its QObject's inside +QCoreApplication's destructor, but must be done before it. + +BUG: 417465 +--- + plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) + +diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp +index ef0e27eb65..66f552b007 100644 +--- a/plugins/extensions/pykrita/plugin/plugin.cpp ++++ b/plugins/extensions/pykrita/plugin/plugin.cpp +@@ -13,6 +13,8 @@ + #include <kis_preference_set_registry.h> + #include "pyqtpluginsettings.h" + ++#include <QCoreApplication> ++ + #include <Krita.h> + + K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin<KritaPyQtPlugin>();) +@@ -74,6 +76,12 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &) + Q_FOREACH (Extension *extension, Krita::instance()->extensions()) { + extension->setup(); + } ++ ++ // This ensures that QObject's owned by Python are destructed before ++ // the destructor of QCoreApplication is called, in order to prevent ++ // a crash on exit. ++ // See https://bugs.kde.org/show_bug.cgi?id=417465 ++ connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, []() { PyKrita::finalize(); }); + } + + KritaPyQtPlugin::~KritaPyQtPlugin() +-- +GitLab diff --git a/media-gfx/krita/krita-4.4.5-r1.ebuild b/media-gfx/krita/krita-4.4.5-r1.ebuild index fe539d739267..5c4bd6209e5d 100644 --- a/media-gfx/krita/krita-4.4.5-r1.ebuild +++ b/media-gfx/krita/krita-4.4.5-r1.ebuild @@ -92,6 +92,7 @@ PATCHES=( "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch "${FILESDIR}"/${PN}-4.4.2-quazip1.patch "${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465 + "${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # git master ) pkg_setup() { diff --git a/media-gfx/krita/krita-4.4.7.ebuild b/media-gfx/krita/krita-4.4.7.ebuild new file mode 100644 index 000000000000..c80ed32f9980 --- /dev/null +++ b/media-gfx/krita/krita-4.4.7.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{8,9,10} ) +KFMIN=5.74.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org python-single-r1 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz + https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" +HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/" + +LICENSE="GPL-3" +SLOT="5" +IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# bug 630508 +RESTRICT+=" test" + +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:= + dev-libs/quazip:0= + $(python_gen_cond_dep ' + dev-python/PyQt5[${PYTHON_USEDEP}] + dev-python/sip:=[${PYTHON_USEDEP}] + ') + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + media-gfx/exiv2:= + media-libs/lcms + media-libs/libpng:0= + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXi + color-management? ( =media-libs/opencolorio-1* ) + fftw? ( sci-libs/fftw:3.0= ) + gif? ( media-libs/giflib ) + gsl? ( sci-libs/gsl:= ) + jpeg? ( virtual/jpeg:0 ) + heif? ( media-libs/libheif:= ) + openexr? ( + media-libs/ilmbase:= + <media-libs/openexr-3.0.0:0= + ) + pdf? ( app-text/poppler[qt5] ) + qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) + raw? ( media-libs/libraw:= ) + tiff? ( media-libs/tiff:0 ) +" +DEPEND="${RDEPEND} + vc? ( >=dev-libs/vc-1.1.0 ) +" +BDEPEND=" + dev-cpp/eigen:3 + dev-lang/perl + sys-devel/gettext +" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch + "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch + "${FILESDIR}"/${PN}-4.4.2-quazip1.patch + "${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master +) + +pkg_setup() { + python-single-r1_pkg_setup + ecm_pkg_setup +} + +src_prepare() { + ecm_src_prepare + sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die +} + +src_configure() { + # Prevent sandbox violation from FindPyQt5.py module + # See Gentoo-bug 655918 + addpredict /dev/dri + + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged + $(cmake_use_find_package color-management OCIO) + $(cmake_use_find_package fftw FFTW3) + $(cmake_use_find_package gif GIF) + $(cmake_use_find_package gsl GSL) + $(cmake_use_find_package heif HEIF) + $(cmake_use_find_package jpeg JPEG) + $(cmake_use_find_package openexr OpenEXR) + $(cmake_use_find_package pdf Poppler) + $(cmake_use_find_package qtmedia Qt5Multimedia) + $(cmake_use_find_package raw LibRaw) + $(cmake_use_find_package tiff TIFF) + $(cmake_use_find_package vc Vc) + ) + + ecm_src_configure +} diff --git a/media-gfx/povtree/Manifest b/media-gfx/povtree/Manifest deleted file mode 100644 index 6d373403d9dd..000000000000 --- a/media-gfx/povtree/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX povtree 326 BLAKE2B f59e166a4c62e9f7a78a611b49966a30f82b369034ed9c780372e896fc774402ef369a76f048a406df45b3523a68d804138447098a01d8bc2a977b912684ff74 SHA512 9456ed3360de5f57d8d8f25c7f9986c631d90c73829df4be31f3eb7dc4fa1750e8b3e8ed986043bdfc01215a86a675fecdcfcd1c3279bb5df4f98ade57f57679 -DIST povtree1.5.zip 917548 BLAKE2B b8ba7c3006273c67d0c245a76d84a87160153ae35e35d9baf094b9de54d75e93237906c08d92d3442706c33396ad9ab87cb445898a92084bbaf84b5897e213b7 SHA512 ef8de1e1d9b5ffde782bd6bba39a11b57928bdb2b3359613a0ae1bc6ad012876a3a80d8cbbba1df77b366e44a7d2f0b48929f12e18853ec556f5af5780ea7d34 -EBUILD povtree-1.5-r1.ebuild 753 BLAKE2B 7251b5f524b0dd5547e42e449efea013b8f01b83d20a646882ffeef24b695e1cde505f33386ccf0af59a1f26702dd97df4be3859a5915da27e910aa9c6dc6f77 SHA512 29f85aa95b92ab55ce7a7f45423e4cc581cdffdcfcc47e9a1aca3f3ee1da0920a6884b29649b24e082fee5279d22019b8d5735505c10f2ea5d808799cddb0d47 -MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-gfx/povtree/files/povtree b/media-gfx/povtree/files/povtree deleted file mode 100644 index 61e1e75c9ce1..000000000000 --- a/media-gfx/povtree/files/povtree +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -which java > /dev/null 2>&1 && \ - java -jar /usr/lib/povtree/povtree.jar $* && \ - exit 0 - -echo "No \"java\" binary found in your PATH." -echo "You should run \"java-config\" to choose your default VM." -exit 1 diff --git a/media-gfx/povtree/metadata.xml b/media-gfx/povtree/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/media-gfx/povtree/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/media-gfx/povtree/povtree-1.5-r1.ebuild b/media-gfx/povtree/povtree-1.5-r1.ebuild deleted file mode 100644 index a531b33bc6f2..000000000000 --- a/media-gfx/povtree/povtree-1.5-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -S="${WORKDIR}" -MY_P="${PN}${PV}" -DESCRIPTION="Tree generator for POVray based on TOMTREE macro" -HOMEPAGE="http://propro.ru/go/Wshop/povtree/povtree.html" -SRC_URI="http://propro.ru/go/Wshop/povtree/${MY_P}.zip" - -# Free for non-commercial use, according to e-mail from authors #446168 -LICENSE="free-noncomm" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos" - -RDEPEND=">=virtual/jre-1.3" -DEPEND="app-arch/unzip" - -src_install() { - # wrapper - sed "s:/usr/:${EPREFIX}&:" "${FILESDIR}"/povtree > "${T}"/povtree || die - dobin "${T}"/povtree - # package - insinto /usr/lib/povtree - doins povtree.jar - dodoc TOMTREE-${PV}.inc help.jpg -} |