diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-11-10 03:03:09 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-10 03:03:09 +0000 |
| commit | be94ae04eee564451203d45977c2ef7c7ace1580 (patch) | |
| tree | 616ffc0ad9aee18dc7d5e9e62bf62394e8e520ba /media-gfx | |
| parent | 2be329ae14bbf99f0fc4de7567e2386bbb529fdc (diff) | |
gentoo auto-resync : 10:11:2024 - 03:03:09
Diffstat (limited to 'media-gfx')
27 files changed, 650 insertions, 144 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 691cc6fba7ee..2f61d1c4cb2f 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 941095c1ae3b..1ed07832d4af 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -10,7 +10,7 @@ DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 98094ed8288be092ec9c0398bf DIST darktable-usermanual-4.4.uk.pdf 33796107 BLAKE2B 060218ec9b7fbcec947506ea9fdf355411d0b1242d41b9ffb7abd8dd991ece29e75c06231251d2ec2701e319e1b1e8134c08603649fe7e933d21b4aef597f7c3 SHA512 f2a6837a05114d4254fade358382be5fabcbd980a3c4fad702b1102176c7e261fd8646aeef1c0328001da8f7cb25d50b06c9f1163a54987985f556c616728bf5 DIST darktable-usermanual-4.6.en.pdf 26844087 BLAKE2B 5bdb5e012cd8ba7bace733006136b1f9e510214179e84a9cba0664a3c2e4b19828e2cc54addaf5999579b910b592bf0e9cd9796cf89f3a4e6ae369e8187fbfce SHA512 a1d610c42ae3d1ae4d0bf3e827ed9ccae6faeea20cbc03e7c12d74c3c41175bf3f61d9eba43406b9ba86750edf976c1539357ddf774733f566a076418c34f558 DIST darktable-usermanual-4.6.uk.pdf 27013345 BLAKE2B 4c0da0038576e8ea97da88a4481e1afdf4e5b5df6b8a52475d18b488ac10066db4ef679681a38a194dd84771e340f58beea0450ec60726abd19d600e73fc40f1 SHA512 6e2f036e3f845791aa8b6eb565230136bfb6ae7f9b1ee56a9201cd25bb09391fd2ec45ba7fa1ddd11b4c193ab6b097fae32107af6c11b6cd6eeada60b002d4b3 -EBUILD darktable-4.6.0.ebuild 5785 BLAKE2B 564d6a22f7ea68d29164d9b64b026183557469c1c0c2d387522f1c32c905cb44698506df084eb8e24d7730d4a6cb4d9e8b85924001a09f5a439d866af0689349 SHA512 1814f05967b57c9511cc9d07a7e1896ff1bf894029b1c5e063a3576eaeb0a4370a9e0d4b9b8f1e2f1050587664da822f307418042d89a93b333c54fc3926a3a8 -EBUILD darktable-4.6.1.ebuild 5900 BLAKE2B f2e7c0dfc905193fb4caac74365a32954e5ef27037b05823fc229f308d8538e3957aa2be23f20be1e4b3e7aea4b2869d26b7ef2815e8645e2312ae921e16c7d9 SHA512 90c7866efa1204b966f8186ff9ff16cd9d4f8705a019ad5324991b0c1be174f969da12b9b794db1ea71eaf8ae2f47424a705db94704a319615801e06915e0018 -EBUILD darktable-4.8.0.ebuild 5894 BLAKE2B a51122ab23f81573affe8b99e0ee4dd185bf04bccf90af79eea86d0873834fb2f7c48bd0a9e6bfe1578960d8ad525f07f7247d16a00460808f39dd95b36fcba5 SHA512 cf0bbdbff7d844fd7a8916453d31da3ed28628ec06fc6b50f2766202fda0cbfae72e460c35cc7341fcf8db4bd807ee16efcedb2c0a54bddeb2a91ddacbfcba44 +EBUILD darktable-4.6.0.ebuild 5786 BLAKE2B eef4acd635264e81a7f024bf6c5477bf1b054b1fea30f94b5f8b330eb4a0062c154f4d00a3944f2b3f387bb98a9f563acd1f85a95fff5a0e0123525bab4571a4 SHA512 e0d22df5a7fe3f58c91901a6d746524318cf56e9fc064d4973ccbbdc1cb3ecfb6350e020fa702e656317f12b8c46be676aebe2b185ca7b4adff30185b7a81470 +EBUILD darktable-4.6.1.ebuild 5901 BLAKE2B 35dd099f66cc85658114fb2d91db584c8c2d386689064a23964ccb09393e4ca4d13d8e693959401be8716e5519b5efd9e803e7828cac563047e1bb6164ccc187 SHA512 3e69773fc944d8f6246f8ab65df647815bbb1a19c7140de24205e853a72e92d76aa89b0c5173647723d001c33d0b36d60fcf2e8d68aaa631e9bd7c611d73ff44 +EBUILD darktable-4.8.0.ebuild 5895 BLAKE2B c7434dab8b80b7833a918ff5c22904abeec0d2403e092f1fd0a3a08c9479c2f7a14b6545be975364a63ebde0997b2e917d4a52781af7b8fa26a12aa83ee53bb9 SHA512 cc806847b6dc85dce87a5f8d4a0dbb65eaf0153069c096acea19968ca348da1f945a08a1415f4edd420da492d9c712ffcc84dc9c1d867014b5cbc1dff7427143 MISC metadata.xml 911 BLAKE2B ae7f5d92e5a9bfd96ff14f531d7a54db3db85c6c310a97e9fde57e74dcb6940192d35f98c7ff17d44f627b53252106b5f917dd2123fa80b1d668b6e0f6865081 SHA512 a7bcb43a1859d366eb557c468b23eb60ed4ef250cc0179fa9c823b3d27347ef3692134ef336836b01ebfc9b53165c60ac88f28d6452b9bcfa6a94b32b5b6177d diff --git a/media-gfx/darktable/darktable-4.6.0.ebuild b/media-gfx/darktable/darktable-4.6.0.ebuild index 860bbe9e07a7..1271ff136222 100644 --- a/media-gfx/darktable/darktable-4.6.0.ebuild +++ b/media-gfx/darktable/darktable-4.6.0.ebuild @@ -47,7 +47,7 @@ RESTRICT="!test? ( test )" # in BDEPEND. This has not been done *on purpose*, for the following reason: # - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative, # in BDEPEND too -# - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which +# - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which # by default pull in sys-devel/clang # - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op # (and curiously enough, empirical observations suggest current versions of Portage are diff --git a/media-gfx/darktable/darktable-4.6.1.ebuild b/media-gfx/darktable/darktable-4.6.1.ebuild index 43f3c82865fb..9bbb75a3f2c2 100644 --- a/media-gfx/darktable/darktable-4.6.1.ebuild +++ b/media-gfx/darktable/darktable-4.6.1.ebuild @@ -47,7 +47,7 @@ RESTRICT="!test? ( test )" # in BDEPEND. This has not been done *on purpose*, for the following reason: # - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative, # in BDEPEND too -# - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which +# - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which # by default pull in sys-devel/clang # - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op # (and curiously enough, empirical observations suggest current versions of Portage are diff --git a/media-gfx/darktable/darktable-4.8.0.ebuild b/media-gfx/darktable/darktable-4.8.0.ebuild index b3eeef397175..0fe2792ac25b 100644 --- a/media-gfx/darktable/darktable-4.8.0.ebuild +++ b/media-gfx/darktable/darktable-4.8.0.ebuild @@ -47,7 +47,7 @@ RESTRICT="!test? ( test )" # in BDEPEND. This has not been done *on purpose*, for the following reason: # - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative, # in BDEPEND too -# - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which +# - there are at least two darktable dependencies (media-libs/mesa and dev-lang/rust) which # by default pull in sys-devel/clang # - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op # (and curiously enough, empirical observations suggest current versions of Portage are diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest index 0b67736de69d..369855f3f519 100644 --- a/media-gfx/exact-image/Manifest +++ b/media-gfx/exact-image/Manifest @@ -6,5 +6,5 @@ AUX exact-image-1.2.1-libjxl-9.patch 522 BLAKE2B 96f1967d0fb0cab93f3b55c9b185f9b DIST exact-image-1.0.2.tar.bz2 322174 BLAKE2B 67afefb4c5a52416459cd4ac6198012eb6d7895a73ea8363fae05286c7e7f62aa1a02166985f53b5638c7dc7b23b4dc1fb1c7b2272a9dc595ce329a7083ee1b9 SHA512 8ba5a198a236ddf5fa58f40c80f32ba9d300376c637a13a7acf3d2db7906fced373b33a7ecff9cff4d09d8b21de9ce1fb9f5bfb1f4522557bd01af0e3d6dcc65 DIST exact-image-1.2.1.tar.bz2 320849 BLAKE2B 615884f2501b3e9ff00410d3569c8aa7d0131610f990591eb77a11cf6d7249342b4a2ece0f2dd62ea7a1cdd213ae1a98bf6da0817b74d8c8e78cbca5b8e67e33 SHA512 34af0575d8564dd5942f0e3ec5b6fe7fb234a96e621a737359406a2571ed8ac2c15ef2e7655a7d260b37b68138e071342583f47ad7ef0e3b3511e5ebc1a873a8 EBUILD exact-image-1.0.2-r8.ebuild 2529 BLAKE2B ba0ee3fadcf7c780b20847064f993ce5c9fec51953488b92f3fe5677ac9f0e924ed809bf5a5d6877c9a5167ea29ccb70fdc0ee6e962387a69a31e73c926e4ff9 SHA512 b2a37c8a265078a5ee42434b467434c6347720eb95b6ac8f40c6838776ec8d7ad24ae407c64eae04a56ed04ae775e3f93e69b1cf047564d3d4b6bfa54a818a2e -EBUILD exact-image-1.2.1-r2.ebuild 2272 BLAKE2B fb48f269b8bb08f9a47ed1fe0c09fe6646ac6d8a2228336d9549b04ace9a14d24e991a4f6b96dc022107310497b3fc1afaa97e2098de40f48d5cca87ed1fc78e SHA512 a61b6e0c9696659aeda0eb2e57acffbb3c5639ad262f0c4fc520c1021ca57c297ec9fd05896d82faf5316fb53137c518f0f674b8cc6f903506b81a5a4704f630 +EBUILD exact-image-1.2.1-r2.ebuild 2271 BLAKE2B 2aa90166a38c2d4caaad624855cfdf27d22d2e7bfcc46cbefd48bf1b0fa0e97081654a93d67ae01c669d2daab48d3861ea708b85ccb2652177862e34eaac6477 SHA512 90f1b701cd89af0c9fca2a1ecd363d412587a908d71d270eeeff6cff42d3c441cbafe7bc84705186b168bc7f1ded830e286795e728ec4501fc181a4571df010a MISC metadata.xml 330 BLAKE2B 468dfd9c9bc2687f285c5a7496aa989843c32929b4c410253f1d046df2e2416604f6ff8b1cb4622e85e27f13f26cede91825d04b7748cb4f74fdff13478046c1 SHA512 01bc80b3dc7ed3ff2f3402ecd3214793d18267be1e1e4c4b42718b6f6a4982404e243771917fbbae7a1bd6b12a1cd80534d9738149ec9b2a88bbc1ad62fcdf14 diff --git a/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild index 09f63e97b42e..5d41f6680a15 100644 --- a/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild +++ b/media-gfx/exact-image/exact-image-1.2.1-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://dl.exactcode.de/oss/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="expat jpeg jpegxl lua openexr perl png swig tiff truetype X" REQUIRED_USE="lua? ( swig ) perl? ( swig )" # Tests are broken; 'make check' fails and referenced testsuite dir not found diff --git a/media-gfx/fotema/Manifest b/media-gfx/fotema/Manifest index ed7ba3f789d2..e7b05c824e8c 100644 --- a/media-gfx/fotema/Manifest +++ b/media-gfx/fotema/Manifest @@ -1,7 +1,7 @@ DIST fotema-1.14.2.tar.xz 78468972 BLAKE2B 59974a873381dd40cf80f274bb2fcd3763fbf946f168491e25f76f56c1646754b7cf49dd174a25726133fd774d04a9cee370c81d3c01f9d276e588d42b232f82 SHA512 27d96b0a47e312b2a7674f140646f24785dbfae47ea1bde74630fbb979946f23b1e1f5fab5ba20edb38ef91790003e138dcf4043ff371e3bf458c691dfd2db56 DIST fotema-1.14.3.tar.xz 78412372 BLAKE2B 821ebb70e14e3e0d1a72ab712ecfe50da2299c2050593af0d6c64a2fc04ae904d56a4448fbcc022e9c7b1604e7a7ed8e55d8cba34aae4f1e6023fdea221a1c6d SHA512 461b84de9b4636cfed2d4e5132e18c831341cbddf8decfc856f85fa18fa7e4ead9d4d210a6795e077f7b7532aca51fc7835cd648cd9d7f7d8f9cc17e18b1f7e6 DIST fotema-1.14.4.tar.xz 78458268 BLAKE2B 4f8cc8f1ba3df27eca16b41e11ae947fe15b83321bc2da23f01a16012d862999a0cf6572353bc74cf2868a91404b199712b4f4d9df63ed87970469d57bb5be16 SHA512 189638c8d7e4466b1318ec06324cd1bfb3eaa36b9b7116b7e44a654d4cd09fb38961c0a5fa02469180f66844614555773e2306becd590eb7b8ba8fb074e9c3cc -EBUILD fotema-1.14.2-r1.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf -EBUILD fotema-1.14.3.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf -EBUILD fotema-1.14.4.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf +EBUILD fotema-1.14.2-r2.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf +EBUILD fotema-1.14.3-r1.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf +EBUILD fotema-1.14.4-r1.ebuild 1688 BLAKE2B 765c563f6e95998ef1f2557ae3044f01e12f1cf896cda117ab0c4cdfa9a1eabb8ee0f43c4e94aa4e52dd296922a6e3ca64e11c0fa1bb8062256ec0843eaee83e SHA512 ead13df6fcf02f163f97a8b13797208b048c5461bd9dd7183368da836ebb60c6ccf39f0cfdc334fc4ecfcbbabade7a4b10e512e89912e1047a7ddc05cf0edfbf MISC metadata.xml 326 BLAKE2B 4ae1a2fadba80e1886d73fb01d493fbbaabae2b97dbffaa10d46e0dbec690e3cb6f8e604675aeb9d0167e50d53cb3f1ffcc2d2ec6c6aed14c36acfe8d6bc31bb SHA512 1f8f3199af710dd344962c425a5af0936be2f52cb41123bee1aba249c356c5c0cb74f3ac6ff7f0fdf71a7e6f8552269abb20cda7d6685e3f21fd5e95436bf552 diff --git a/media-gfx/fotema/fotema-1.14.2-r1.ebuild b/media-gfx/fotema/fotema-1.14.2-r2.ebuild index 34219ad68ea2..34219ad68ea2 100644 --- a/media-gfx/fotema/fotema-1.14.2-r1.ebuild +++ b/media-gfx/fotema/fotema-1.14.2-r2.ebuild diff --git a/media-gfx/fotema/fotema-1.14.3.ebuild b/media-gfx/fotema/fotema-1.14.3-r1.ebuild index 34219ad68ea2..34219ad68ea2 100644 --- a/media-gfx/fotema/fotema-1.14.3.ebuild +++ b/media-gfx/fotema/fotema-1.14.3-r1.ebuild diff --git a/media-gfx/fotema/fotema-1.14.4.ebuild b/media-gfx/fotema/fotema-1.14.4-r1.ebuild index 34219ad68ea2..34219ad68ea2 100644 --- a/media-gfx/fotema/fotema-1.14.4.ebuild +++ b/media-gfx/fotema/fotema-1.14.4-r1.ebuild diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest index d4e5557be2c3..6cf6463121a2 100644 --- a/media-gfx/graphviz/Manifest +++ b/media-gfx/graphviz/Manifest @@ -2,7 +2,7 @@ DIST graphviz-11.0.0.tar.xz 21306368 BLAKE2B c424b2d81180513f2a03210b5a5febfbf80 DIST graphviz-12.0.0.tar.xz 21279920 BLAKE2B 67d4444dcc31417fd01268b0fdc81538d86e26f961227d106ae57eb3d6d0e4a2e0ba684413a2d1b66f17340e0ad3a244ce5554c180873683e3ad4775f661739d SHA512 b5d4c8e9b565d4268fff28f169e3bfdb9ebf8b809996f7e35887430e5745aeac92c092fe2a9e15b23c9ba3364aa89fe2eeed85ab3fba61acce21634bc9632813 DIST graphviz-12.1.2.tar.xz 20939968 BLAKE2B 4c9ad31f9ce6c68e67a48330b6693c9d6dc9ecebd4ef74e0aa250fd6cb86f02a585c8b6fe16b1322aedfa844004327f72ac4cbcca782848d55202b8e4695371d SHA512 2c31c33bcc0a912b08bf837df318152f910452e3efa5e6c19cf76c49017c64d6dad4cde719d4713bb41343c4484381d94706c2e993233aaa45a334390338cde9 EBUILD graphviz-11.0.0.ebuild 6292 BLAKE2B cd5314ceddbf687cd310eb2e01a1db77e7c970cf27654f768e8c80079c7584ce728a3766e4ccef75eb7ca3e7d2ace353e8991751027a8aeb3c933c79032805e4 SHA512 1602d4934fd21228b046dbe6c14c5b2097d096f17409bf20e0af198e93f5d0c5a84c209af60f8cc8e89d7adde209922bfc58b243aeba7968963cce2d2be806a1 -EBUILD graphviz-12.0.0-r100.ebuild 6493 BLAKE2B 4e790fb4a5dc621871cad67ac04ace6a4c61f862fc3286db95e1f48c7cd0fc99245f3bda34796f4b3a03d88c99a177172b4161f4736318e897ca4c1b70c9f319 SHA512 aee90730315bc72fee082f0dc68660338190dc9d6a2e97b3b9eca3bf9628f11fcd29be09d8903b23285d6fad56eae57f9c568db73c193185fcc12deaba524a95 +EBUILD graphviz-12.0.0-r100.ebuild 6492 BLAKE2B 2c3a8678555889f2888a418d0961a44ec5a2c91a5b69f96ee11a63ad0fe491e25de945932d667d44bc0ca9c1992e0621a363ef41f013a245fa786f79d905e04b SHA512 7420e1fe618f721017cccf53414b54ca112bc16565d6e8ef465b3f8b87ba60a5122202eac086acdb991788acfcd18da9436e81ecc28d9f0a960d1781a2175002 EBUILD graphviz-12.0.0.ebuild 6292 BLAKE2B 20181effb0550326bf269c293e39744c4fe37154a6486edb4396e264f6e189913854956c8b16d7a0c46db152f8b2710714f2e4d275949d1b982898f9fc9053e0 SHA512 b248a23aad79a03fde4594c9b591ebc682134e8fd1cd2c590bce481beddf6fbf5405e64e2279f3599013cba88bc381f35db880898b74deb91ff65648cc6d8250 EBUILD graphviz-12.1.2.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063 MISC metadata.xml 2309 BLAKE2B 261f100c9c78cf3bb50ffd84260594d34fa5af75f0b3789ce5640e0d633494405e64b3e9f7524e35ef87d11164c501e21fcef2cc483f60ad6ad2e350f500e3b2 SHA512 1a29d11154b72af3deeb0202136926f0871797086ce1a5a4d1fc71822e86d0e76ff789c684fabad85fac1abd5f29913a555be0916f42b90f5ce62fa395e1cbba diff --git a/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild index 325b75dae35f..f3c9cc7504a2 100644 --- a/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild +++ b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re LICENSE="CPL-1.0" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X" REQUIRED_USE=" diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 697fca9c36db..e6dd3f868758 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -6,11 +6,12 @@ AUX krita-5.1.5-sip-6.8.patch 770 BLAKE2B b63fb65ffc4ea733e8698b255b5531ff55299e AUX krita-5.2.2-fftw.patch 689 BLAKE2B a0b62a65d8de4c661a571f0f671387d0571982bbc0acdf4dc879c21711093e7a3d6ef17e6a24f04d066ecd1f861b98f8a37e626075d3fdd445f408e77484eb3f SHA512 6db10de30c0f47ea3d65490d82176685144af580a6581d0ff2fc0363e6b65166c154ad3dd05a0dadf967afc39417936275d71911e89fcf79ecfa84b1bb6b94fa AUX krita-5.2.3-tests-optional.patch 2807 BLAKE2B 7d0c0d26ce0cb1bf86f7933e8510bb5ea1e98986b811641874b4db6f622e5a31bf9b9c3b7e12267bf54f2d57d56459211df3e004dbc261e0d519f69d190e2149 SHA512 021d6d8fa1b976091088b317f54cf0be66f73b0dd9031497abc3101e4e43b69a0d4b5302e004b3ec81193bfecc0066cc4563a50b15e2c30109d3a57bafe23ca5 AUX krita-5.2.3-znver4-xsimd.patch 1650 BLAKE2B a534c96c1fdbaf3aeb59499c88079d70574e0ac4eda170637d187fd66338b80c53e3d85fe003f75c59512eb484522403e785b0a9bdb6dca0e6a7bce8d7a0a936 SHA512 2aeb300d6230fa29c97f086aad98df16ed71d1199716739467b7c25014ba7e3a84b368cc9945042e2ce8fca0e42c03579b1e26048304498c194cff01d7d7d7cf +AUX krita-5.2.6-py3.13.patch 4520 BLAKE2B cd190b438952853207f6d5f35fadb28d0044273dc4e6d6bb8aac4c623aadd7111a6c852de302da9c72c4444ef422c64c9b2a46ee74328af8b37d77d56a645fbc SHA512 65b2cff6ddcf2e6b3be9e993be61fbcb60ea89c58ba2aa2119582d5eb80b8c230b6323072dd6fc9b56a60899459cbfe433ec4deea3a3fbdaf796111383dbf206 DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1 DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74 DIST krita-5.2.6.tar.xz 186560016 BLAKE2B 788385983b371626214898391b08b1276a74b2ee3c9f01c1b1ae19d8791bfcf1ea1f59f6304643aeb6b16a2559fd2e45464596c721eb5d53546672d0efe17903 SHA512 8502ebef11ae066b298e999aba06df7858605cca14b889cec167b7ee3953b8ed86459b44ed90508d59bd7a9968cc9957309cefaa140a8d20293344f4dcb7fea7 EBUILD krita-5.1.5.ebuild 3781 BLAKE2B ca13633df6861d9159cae079b667123280d3b4ed73e707e648b710782219999f67e8f7f806471f8eddb8c95c2e3f0a797434157a4fcc5db3cfb2a5430698ba05 SHA512 b12e60d70eb03c76c6a5dbb3df451d6666f37d07060fe90601b8c569d130ac1bb7d71ef95a6d87faa58a627b5a3823dd468eee8d0be7b370960e81957aec3316 EBUILD krita-5.2.3.ebuild 3789 BLAKE2B 6b55cc22a1dfd1766561b37c9b812907e36354021099e1613bc5a0182f19d4653c3db574311fd65cd7d7fbab689d3a80f02b638ee188383b7fb56d381c32c78d SHA512 5e03c9129ddde0c1c595beb8af2772f1056c52f9a55c3e66257b2d94f5c88fa00e8e62f85651426a96a7adce4c3e8931c3a81b6dceda66e3c3c18fd607810af9 -EBUILD krita-5.2.6.ebuild 3738 BLAKE2B e09b053369e25ca24d7814917e5b88b37b56796559435c8a9750bfbc4da6a91745f9e9fe22385679456986f4c13929abfab4c6436c816e5ba359e282ccf1a44e SHA512 404b398e3d6436163d73e39538150aba4c201b9271a92b01ee887d03f865768d6616d67aadfe209acbf492222d8d1b45f378945104d3da89dec9cd8347cf800d +EBUILD krita-5.2.6.ebuild 3811 BLAKE2B 30757cb72b3eb82831a0129ba0aeb8bcc2a1d021fe780c52df8f78e8b83de3ea86dd2e7ca2402caaec73f202c623ea11f71d17ed148c2f1a41ac8a1c35fcfd5f SHA512 996f1bb2d60761e2cc44dafc972c9ad2b6fb40afb109d1f83834c7559a2a167d5b8b1d70dac44ecc429abd77a89e1cfe4f433e7b7dcb184707831a25015f78a5 MISC metadata.xml 832 BLAKE2B 53e632c3407b42c5d0f165bdcf67dfdd3a30bf1ec3c19ea79b90323ccbe5415e7cd34fbc79ebbb0e513359f28f381e3dac5d2534daf9ae7696f83ea77acb8130 SHA512 6cb02292d63602c80451759f6b935f65c9dfc2f01b32ac540d8cd4422ab2a70e04261fabc67b570c60e116f03e34d0165c8db6dcf9595db6cfa10849d8066336 diff --git a/media-gfx/krita/files/krita-5.2.6-py3.13.patch b/media-gfx/krita/files/krita-5.2.6-py3.13.patch new file mode 100644 index 000000000000..6714059895d0 --- /dev/null +++ b/media-gfx/krita/files/krita-5.2.6-py3.13.patch @@ -0,0 +1,120 @@ +From 0f43ec3158225092f6a02422eb90c56421326570 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com> +Date: Tue, 18 Jun 2024 22:05:34 +0200 +Subject: [PATCH] Changes to build pykrita with Python 3.13 + +Python 3.11 deprecated Py_SetPath() in 2022 and Python 3.13 removed it. +Instead one needs to use the new PyConfig API (PEP 587) added to Python +3.8. + +Fix: #488680 +--- + .../extensions/pykrita/plugin/utilities.cpp | 61 +++++++++++++++++-- + plugins/extensions/pykrita/plugin/utilities.h | 4 +- + 2 files changed, 57 insertions(+), 8 deletions(-) + +diff --git a/plugins/extensions/pykrita/plugin/utilities.cpp b/plugins/extensions/pykrita/plugin/utilities.cpp +index 4f58183238..1e497b2681 100644 +--- a/plugins/extensions/pykrita/plugin/utilities.cpp ++++ b/plugins/extensions/pykrita/plugin/utilities.cpp +@@ -19,8 +19,10 @@ + #include <cmath> + #include <Python.h> + ++#include <QDebug> + #include <QDir> + #include <QLibrary> ++#include <QProcessEnvironment> + #include <QString> + #include <QStringList> + #include <QVector> +@@ -412,18 +414,65 @@ bool Python::setPath(const QStringList& scriptPaths) + joinedPaths = joinedPaths + pathSeparator + originalPath; + } + dbgScript << "Setting python paths:" << joinedPaths; ++ + #ifdef Q_OS_WIN +- QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0); +- joinedPaths.toWCharArray(joinedPathsWChars.data()); +- Py_SetPath(joinedPathsWChars.data()); ++ PyStatus status; ++ PyConfig config; ++ PyConfig_InitPythonConfig(&config); ++ ++ for (const QString& path : joinedPaths.split(pathSeparator)) { ++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str()); ++ if (PyStatus_Exception(status)) { ++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg; ++ dbgScript << "Error appending to PyWideStringList"; ++ return false; ++ } ++ } ++ ++ config.module_search_paths_set = true; ++ qDebug() << "Set module_search_paths"; ++ ++ status = Py_InitializeFromConfig(&config); ++ if (PyStatus_Exception(status)) { ++ qDebug() << "Cannot initialize Py_InitializeFromConfig:" << status.err_msg; ++ Py_ExitStatusException(status); ++ PyConfig_Clear(&config); ++ dbgScript << "Cannot initialize Py_InitializeFromConfig config"; ++ return false; ++ } ++ ++ PyConfig_Clear(&config); + #else + if (runningInBundle) { +- QVector<wchar_t> joinedPathsWChars(joinedPaths.size() + 1, 0); +- joinedPaths.toWCharArray(joinedPathsWChars.data()); +- Py_SetPath(joinedPathsWChars.data()); ++ PyStatus status; ++ PyConfig config; ++ PyConfig_InitPythonConfig(&config); ++ ++ for (const QString& path : joinedPaths.split(pathSeparator)) { ++ status = PyWideStringList_Append(&config.module_search_paths, path.toStdWString().c_str()); ++ if (PyStatus_Exception(status)) { ++ qDebug() << "Error appending to PyWideStringList:" << status.err_msg; ++ dbgScript << "Error appending to PyWideStringList"; ++ return false; ++ } ++ } ++ ++ config.module_search_paths_set = true; ++ ++ status = Py_InitializeFromConfig(&config); ++ if (PyStatus_Exception(status)) { ++ Py_ExitStatusException(status); ++ qDebug() << "Cannot initialize Py_InitializeFromConfig 2:" << status.err_msg; ++ PyConfig_Clear(&config); ++ dbgScript << "Cannot initialize Py_InitializeFromConfig config"; ++ return false; ++ } ++ ++ PyConfig_Clear(&config); + } + else { + qputenv("PYTHONPATH", joinedPaths.toLocal8Bit()); ++ qDebug() << "Set PYTHONPATH environment variable"; + } + #endif + isPythonPathSet = true; +diff --git a/plugins/extensions/pykrita/plugin/utilities.h b/plugins/extensions/pykrita/plugin/utilities.h +index fb309bd0b8..aec47da239 100644 +--- a/plugins/extensions/pykrita/plugin/utilities.h ++++ b/plugins/extensions/pykrita/plugin/utilities.h +@@ -81,8 +81,8 @@ public: + static bool libraryLoad(); + + /** +- * Set the Python paths by calling Py_SetPath. This should be called before +- * initialization to ensure the proper libraries get loaded. ++ * Set the Python paths by calling Py_InitializeFromConfig. This should be ++ * called before initialization to ensure the proper libraries get loaded. + */ + static bool setPath(const QStringList& scriptPaths); + +-- +2.45.2 + diff --git a/media-gfx/krita/krita-5.2.6.ebuild b/media-gfx/krita/krita-5.2.6.ebuild index 0a1c86338154..dd17eae36561 100644 --- a/media-gfx/krita/krita-5.2.6.ebuild +++ b/media-gfx/krita/krita-5.2.6.ebuild @@ -4,7 +4,7 @@ EAPI=8 ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) KFMIN=5.115.0 QTMIN=5.15.12 inherit ecm kde.org python-single-r1 @@ -96,6 +96,8 @@ PATCHES=( # downstream "${FILESDIR}"/${PN}-5.2.3-tests-optional.patch "${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518 + # Fedora, non-upstreamed: + "${FILESDIR}"/${P}-py3.13.patch # bug 943149 # git master "${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139 ) diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index cd0172817da8..06c128bef84c 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -40,6 +40,6 @@ DIST zerocopy-0.7.20.crate 121557 BLAKE2B 24e63690b03c5becade47aa7ed16ef7a3d482c DIST zerocopy-derive-0.7.20.crate 528379 BLAKE2B 247ab986cb720903df383429a6785c7dec230f6888246a9a7539a1bc8061601b27cea8baf4db2fab491fb32842901466ac32cc80504b3eaf35c25cd1a27ec9e8 SHA512 3c76100c3c9c1a5aae39750448f8ed37069be8e65cc74d67cc983c7e69988581f98248183955294e7c8d044c7a968b6e6534b8f84d9969693cbe4c5f679d5818 EBUILD libimagequant-2.17.0.ebuild 1379 BLAKE2B 6ca72ee6ec84edd8e950ed5b512561ea3eda0f527686866313c9fd8e60fda898857b69f1bc307ba53256e403c4e94f63b6686286ae30c52285c6e9bacee89d01 SHA512 991ccda370e134a476dba916b36817e11a87a14857985d2973222b872fc6e45928aff7e5fb8dbc90b41f8e5a64942d4eb2d59cd8f3466c4aa9f58f2637b1367b EBUILD libimagequant-2.18.0.ebuild 1379 BLAKE2B 3e3d07bb4e879ee47f7aa92aab771200779a67b9f49bac88004f50038517418d832a4bf5ed7fbc1147207d74a5bdfaa6da0dd04aa84b46abf9118ee72b106d81 SHA512 24ca1bf46a5168a7a2bc45c4cc37fd3580576211e366c6bab3be6eb885e31d3c524dac4f10ac54d099505b8065de8088e3b49cf23227856470616d5437df111d -EBUILD libimagequant-4.2.2.ebuild 1728 BLAKE2B b7178b42b78cbee9ac584671191165fba6c7fc36ab23ff675b0f7ef86fd53c10ee63fece727eaec33a013b06bed6b0ee77da170b9648e637faf0308c2157ed16 SHA512 2e4ce84bced1c3e731d7a369421d286a16f6c9f20efcc58e15c285a701ac3dcf835b0a1eb25739a5c843044302ebcc445054a8349d7a202294c6aca99fe6b393 -EBUILD libimagequant-4.3.0.ebuild 1199 BLAKE2B 902a98544f4a03d9409771e42e9458113720c5d87be1ed7b89864b5745606e3967e0dba40d1d6179ff376c1282ecd8a93d911e3c3eded6d930edd06d190b95b9 SHA512 aa804f297b315ef054ad000600e5bfed8686868a961998087fcc23a6691805c744453e82ec1277f830b1b875fc0acbb88ff119e6b719db8d1188a2b67cf88734 +EBUILD libimagequant-4.2.2-r1.ebuild 1707 BLAKE2B fc08697734a2d80e531043ad16db163a6e96448bb3e1ae48d9ce3dcceac8b496978e5bcfa25262e33a5fc51c92b01a4dd6aeb26f8454298e58b93d8e3f6de011 SHA512 87483cd7763d48c0082d841562d118a0b285bb627e2f9b64c13061030da3f5c4c69003fdcb7fbd0a0c243d548c2e41ebc2dc333af15e5a0711bdc8b72eb05d32 +EBUILD libimagequant-4.3.0-r1.ebuild 1178 BLAKE2B cd13826cb4b107e4242027a760a6721526a1828ab6e796d8cdabf14bc38ccfd8cfe687e50201e85709875a72057351a42a4bd355fd4b482f20cce1359344a133 SHA512 f2a15ac82a7845db560bff9bab3d73911837f5d189acc7c0a0c516adddd5aeb9d5539b7a471a51b29b0dcd4d76c7a2e88e8576da84d610a29bb693ecd10d798b MISC metadata.xml 431 BLAKE2B 19ce5c802fc25f17f74073dba0473b11ea6a5820ec0726d405701c1e6b8f0a64d7019f4fe56ff0e6e43aba6cb52c34a5ac821d4bfcb8d9d6a10d0945bafc8a90 SHA512 4e22cda189c98a07cab44be95311def7b6955025d320869b55006e0e09f98c7370de40f552b556c466013b0c68b04013f36559f4970ebfd79655faf446c1e166 diff --git a/media-gfx/libimagequant/libimagequant-4.2.2.ebuild b/media-gfx/libimagequant/libimagequant-4.2.2-r1.ebuild index 5a96622a9881..33b4d2ef906f 100644 --- a/media-gfx/libimagequant/libimagequant-4.2.2.ebuild +++ b/media-gfx/libimagequant/libimagequant-4.2.2-r1.ebuild @@ -57,7 +57,6 @@ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~s390 sparc" BDEPEND=" >=dev-util/cargo-c-0.9.11 - >=virtual/rust-1.60 " QA_FLAGS_IGNORED="usr/lib.*/libimagequant.so.*" diff --git a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild b/media-gfx/libimagequant/libimagequant-4.3.0-r1.ebuild index 55609484950f..710c7dc0634f 100644 --- a/media-gfx/libimagequant/libimagequant-4.3.0.ebuild +++ b/media-gfx/libimagequant/libimagequant-4.3.0-r1.ebuild @@ -23,7 +23,6 @@ KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~s390 sparc" BDEPEND=" >=dev-util/cargo-c-0.9.14 - >=virtual/rust-1.64 " QA_FLAGS_IGNORED="usr/lib.*/libimagequant.so.*" diff --git a/media-gfx/oxipng/Manifest b/media-gfx/oxipng/Manifest index 98ed2d502faf..190b47bf88ed 100644 --- a/media-gfx/oxipng/Manifest +++ b/media-gfx/oxipng/Manifest @@ -199,7 +199,7 @@ DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a733 DIST wyz-0.5.1.crate 18790 BLAKE2B 07ac1435a812d2f50309348ef8378ea4955c001f01edaf2ffab108f7d524ee731f06b22fd42c043349a4a2271ec47ea203e89562076e8c7c1719112b0214c89a SHA512 15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9 DIST zopfli-0.7.1.crate 44416 BLAKE2B 14c6e7982f34de921bc3ce0048281e76f1de9715c0a108cce58d216af406eed16a06014de0af023d0090f6ae26fca0a62049179401875f6a3a878c366afed2b5 SHA512 caa7f95ab2d5c1611d84b6d73f33a0722ffb459759614cdfcb4a7fadcca679e2387486848d5ebc4f2a2f5aabaaef2cd466dee536c5d9aa3410cd9dfca9755678 DIST zopfli-0.8.0.crate 54234 BLAKE2B a5e0434a4b20840f2bd59d72121849ea23c2f21d0e87bcd6e918c8521f2989c71aedcd98853533a85bde576bbc064e56497be864065e373bba3cfe8b9b9cf94e SHA512 3b788f0ca94a106ce690764d081bf277eddb364b07287c33be3855fdc63bd583b5e8aac95b709833b4ec4a8f153e7e1ea822b09da23d5db777137bc1dd49e17c -EBUILD oxipng-8.0.0.ebuild 2248 BLAKE2B cd63860e6989f30c4a3aa60fc1a482e13737ac37acd71d19e33e3778036dc3d1326c51141c9103efb8a28f639192825a7c9814ff9ccc7f6f315ffc0a5031e3e8 SHA512 fb92eb7d550f430fc944fffcaaea00e04a03a57a3813a7972ac834c4afa6cddaec14d0ba9adbfcff89bb38efd52e4539d7fb185b349330db55d9543c48cf8904 -EBUILD oxipng-9.0.0.ebuild 2279 BLAKE2B ca45c8e5f686ac77bd453a415f696d4224f2e3548cba679e00b57448cc6a030e5f35111614079344932593d51cb33652a31b0d96a65aaf6c061c565cac6443f4 SHA512 cff8457f7b6606a7baa2e49eb43c4d81d155b0b9e21f70f700a37a85d41b64a15884b29622dd0478440ef8f7b68e86af3db8240aef765572dc20a3e9b57a4b4c -EBUILD oxipng-9.1.2.ebuild 2635 BLAKE2B 463b4c63aed640002601468cbbd899d7a148497331c1c86be7180841c2893f8833a285b541eeb5f49193bf74d4686c7f406c715744bb8eabc0833f09a5faca92 SHA512 b458566face09784166827ba28af41205189bff0684959b188e3f4118f800aae59d2ec9e86f408924b335f00d906a2559c338718dea60299b66fb867abe927b1 +EBUILD oxipng-8.0.0-r1.ebuild 2196 BLAKE2B 3fa673c72e60fdadf00a8291823e0dd30e6a8b1105165af0ca32f70ffc003e84c03484802ca72e7dfa7273f552e657eb5849f2d853529831a329c3edd643a1d8 SHA512 a5fa5455878e9ec1aaf03ddf9ff59936799ff3677e1c65ac173dbe930fadb20970b98c3e6124a863946533759c6daf70e551d3b3c583718994b24fb0128c831a +EBUILD oxipng-9.0.0-r1.ebuild 2246 BLAKE2B 8a387c10ff50710d77c45561dd4994ef1c1bfecbf66224b9254a0e4dc65e040069c51eb2664a7f29ae7c97bc6df7bc4d2ab654a95fb64e4aa125da12983510b2 SHA512 261fbe5f71328d823eb5ea9ee192d3e198368b36504c33b82e5bef337709aa2d3d9d1bd03101616043642eeb81efca38d36e7f7527c161c568773c6e4c16ebbf +EBUILD oxipng-9.1.2-r1.ebuild 2625 BLAKE2B 7a738af1ddaa7df09e072b22ea073cfddc60d1b2d21d1c9eab37ff57a49c1976ded03bba4a8d6f5ef65f138af08c2fb7a0094c85926f272ef356ec62b01b3039 SHA512 85491eea2f98185272bd3c6cfab9fe1004a69b35a201ca68ebb0fb1084a26324b873e239fe1acc4ad9e3f1912e6c7d388f930c8b262f4a120af16b982952847d MISC metadata.xml 623 BLAKE2B e494053d292bf36c65237f5cb7c8b488ac60ead764ae88d90e9ff80aefe46f11c4d2c4bfea88258d0fb70eea136f552f5b77cdb16e3de0438e1843c79f5c5c56 SHA512 3a886300372c8cd3d837cd206e4451ba156afad49400b3594e3dff7ce430c2f8612a72d986485cb848b6f9ecf852f739a184f0d8f3015defc716beccee162654 diff --git a/media-gfx/oxipng/oxipng-8.0.0-r1.ebuild b/media-gfx/oxipng/oxipng-8.0.0-r1.ebuild new file mode 100644 index 000000000000..40831163d730 --- /dev/null +++ b/media-gfx/oxipng/oxipng-8.0.0-r1.ebuild @@ -0,0 +1,117 @@ +# Copyright 2022-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Auto-Generated by cargo-ebuild 0.5.3-dev + +EAPI=8 + +CRATES=" + adler@1.0.2 + adler32@1.2.0 + atty@0.2.14 + autocfg@1.1.0 + bitflags@1.3.2 + bitvec@1.0.1 + bytemuck@1.12.3 + byteorder@1.4.3 + cc@1.0.78 + cfg-if@1.0.0 + clap@3.2.23 + clap_lex@0.2.4 + color_quant@1.1.0 + crc@3.0.0 + crc-catalog@2.1.0 + crc32fast@1.3.2 + crossbeam-channel@0.5.6 + crossbeam-deque@0.8.2 + crossbeam-epoch@0.9.13 + crossbeam-utils@0.8.14 + either@1.8.0 + filetime@0.2.19 + flate2@1.0.25 + funty@2.0.0 + glob@0.3.0 + hashbrown@0.12.3 + hermit-abi@0.1.19 + hermit-abi@0.2.6 + image@0.24.5 + indexmap@1.9.2 + iter-read@0.3.1 + itertools@0.10.5 + libc@0.2.139 + libdeflate-sys@0.11.0 + libdeflater@0.11.0 + log@0.4.17 + memoffset@0.7.1 + miniz_oxide@0.6.2 + num-integer@0.1.45 + num-rational@0.4.1 + num-traits@0.2.15 + num_cpus@1.15.0 + once_cell@1.16.0 + os_str_bytes@6.4.1 + png@0.17.7 + radium@0.7.0 + rayon@1.6.1 + rayon-core@1.10.1 + redox_syscall@0.2.16 + rgb@0.8.34 + rustc-hash@1.1.0 + rustc_version@0.4.0 + scopeguard@1.1.0 + semver@1.0.16 + stderrlog@0.5.4 + strsim@0.10.0 + tap@1.0.1 + termcolor@1.1.3 + textwrap@0.16.0 + thread_local@1.1.4 + typed-arena@2.0.1 + wild@2.1.0 + winapi@0.3.9 + winapi-i686-pc-windows-gnu@0.4.0 + winapi-util@0.1.5 + winapi-x86_64-pc-windows-gnu@0.4.0 + windows-sys@0.42.0 + windows_aarch64_gnullvm@0.42.0 + windows_aarch64_msvc@0.42.0 + windows_i686_gnu@0.42.0 + windows_i686_msvc@0.42.0 + windows_x86_64_gnu@0.42.0 + windows_x86_64_gnullvm@0.42.0 + windows_x86_64_msvc@0.42.0 + wyz@0.5.1 + zopfli@0.7.1 +" + +inherit cargo flag-o-matic + +DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust" +HOMEPAGE="https://github.com/shssoichiro/oxipng" +SRC_URI="https://github.com/shssoichiro/oxipng/archive/v${PV}.tar.gz -> ${P}.tar.gz + ${CARGO_CRATE_URIS} +" + +LICENSE=" + || ( 0BSD Apache-2.0 MIT ) + Apache-2.0 + || ( Apache-2.0 MIT ) + || ( Apache-2.0 MIT ZLIB ) + MIT + || ( MIT Unlicense ) + ZLIB +" +SLOT="0" +KEYWORDS="amd64 arm64 ~riscv ~x86" + +QA_FLAGS_IGNORED="usr/bin/oxipng" + +src_configure() { + filter-lto # 860063 file format not recognized with cloudflare-zlib-sys +} + +src_install() { + cargo_src_install + + dodoc CHANGELOG.md README.md +} diff --git a/media-gfx/oxipng/oxipng-8.0.0.ebuild b/media-gfx/oxipng/oxipng-8.0.0.ebuild deleted file mode 100644 index c94033fde23f..000000000000 --- a/media-gfx/oxipng/oxipng-8.0.0.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Auto-Generated by cargo-ebuild 0.5.3-dev - -EAPI=8 - -CRATES=" - adler-1.0.2 - adler32-1.2.0 - atty-0.2.14 - autocfg-1.1.0 - bitflags-1.3.2 - bitvec-1.0.1 - bytemuck-1.12.3 - byteorder-1.4.3 - cc-1.0.78 - cfg-if-1.0.0 - clap-3.2.23 - clap_lex-0.2.4 - color_quant-1.1.0 - crc-3.0.0 - crc-catalog-2.1.0 - crc32fast-1.3.2 - crossbeam-channel-0.5.6 - crossbeam-deque-0.8.2 - crossbeam-epoch-0.9.13 - crossbeam-utils-0.8.14 - either-1.8.0 - filetime-0.2.19 - flate2-1.0.25 - funty-2.0.0 - glob-0.3.0 - hashbrown-0.12.3 - hermit-abi-0.1.19 - hermit-abi-0.2.6 - image-0.24.5 - indexmap-1.9.2 - iter-read-0.3.1 - itertools-0.10.5 - libc-0.2.139 - libdeflate-sys-0.11.0 - libdeflater-0.11.0 - log-0.4.17 - memoffset-0.7.1 - miniz_oxide-0.6.2 - num-integer-0.1.45 - num-rational-0.4.1 - num-traits-0.2.15 - num_cpus-1.15.0 - once_cell-1.16.0 - os_str_bytes-6.4.1 - png-0.17.7 - radium-0.7.0 - rayon-1.6.1 - rayon-core-1.10.1 - redox_syscall-0.2.16 - rgb-0.8.34 - rustc-hash-1.1.0 - rustc_version-0.4.0 - scopeguard-1.1.0 - semver-1.0.16 - stderrlog-0.5.4 - strsim-0.10.0 - tap-1.0.1 - termcolor-1.1.3 - textwrap-0.16.0 - thread_local-1.1.4 - typed-arena-2.0.1 - wild-2.1.0 - winapi-0.3.9 - winapi-i686-pc-windows-gnu-0.4.0 - winapi-util-0.1.5 - winapi-x86_64-pc-windows-gnu-0.4.0 - windows-sys-0.42.0 - windows_aarch64_gnullvm-0.42.0 - windows_aarch64_msvc-0.42.0 - windows_i686_gnu-0.42.0 - windows_i686_msvc-0.42.0 - windows_x86_64_gnu-0.42.0 - windows_x86_64_gnullvm-0.42.0 - windows_x86_64_msvc-0.42.0 - wyz-0.5.1 - zopfli-0.7.1 -" - -inherit cargo flag-o-matic - -DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust" -HOMEPAGE="https://github.com/shssoichiro/oxipng" -SRC_URI="https://github.com/shssoichiro/oxipng/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SRC_URI+=" $(cargo_crate_uris ${CRATES})" - -LICENSE=" - || ( 0BSD Apache-2.0 MIT ) - Apache-2.0 - || ( Apache-2.0 MIT ) - || ( Apache-2.0 MIT ZLIB ) - MIT - || ( MIT Unlicense ) - ZLIB -" -SLOT="0" -KEYWORDS="amd64 arm64 ~riscv ~x86" - -BDEPEND=">=virtual/rust-1.61.0" - -QA_FLAGS_IGNORED="usr/bin/oxipng" - -src_configure() { - filter-lto # 860063 file format not recognized with cloudflare-zlib-sys -} - -src_install() { - cargo_src_install - - dodoc CHANGELOG.md README.md -} diff --git a/media-gfx/oxipng/oxipng-9.0.0.ebuild b/media-gfx/oxipng/oxipng-9.0.0-r1.ebuild index dc57177ddd22..f94d2b560cd1 100644 --- a/media-gfx/oxipng/oxipng-9.0.0.ebuild +++ b/media-gfx/oxipng/oxipng-9.0.0-r1.ebuild @@ -109,8 +109,6 @@ LICENSE=" SLOT="0" KEYWORDS="amd64 ~arm64 ~riscv ~x86" -BDEPEND=">=virtual/rust-1.66.0" - QA_FLAGS_IGNORED="usr/bin/${PN}" src_install() { diff --git a/media-gfx/oxipng/oxipng-9.1.2.ebuild b/media-gfx/oxipng/oxipng-9.1.2-r1.ebuild index 8504fd85f18f..3b199b4f6e39 100644 --- a/media-gfx/oxipng/oxipng-9.1.2.ebuild +++ b/media-gfx/oxipng/oxipng-9.1.2-r1.ebuild @@ -90,6 +90,8 @@ CRATES=" zopfli@0.8.0 " +RUST_MIN_VER="1.74.0" + inherit cargo DESCRIPTION="Multithreaded lossless PNG compression optimizer written in Rust" @@ -106,8 +108,6 @@ LICENSE=" SLOT="0" KEYWORDS="amd64 ~arm64 ~riscv ~x86" -BDEPEND=">=virtual/rust-1.74.0" - # rust does not use *FLAGS from make.conf, silence portage warning # update with proper path to binaries this crate installs, omit leading / QA_FLAGS_IGNORED="usr/bin/${PN}" diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index feda55443bdc..7136b46493bb 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -4,12 +4,15 @@ AUX sane-backends-1.0.24-saned_pidfile_location.patch 345 BLAKE2B dcf7cbd5787c7a AUX sane-backends-1.0.27-disable-usb-tests.patch 336 BLAKE2B 00fd225a4426405d515f5b6641c86e6d9035a588a776aaec26eaa4e10beebf0a9fd97da991646b7964a867c422da2bc1cf93560d1ba326f0086675036338ff00 SHA512 64cce489e87de31e1a865b86d5829ae4914a30f47e27b07fba68629261cefcd617b8eed272c94b7554545e4802283c5bd5b53f79f54403d875726b38378ae74d AUX sane-backends-1.0.30-add_hpaio_epkowa_dll.conf.patch 459 BLAKE2B d127c054b3e4f8aca5de54888e7a37c986515350aac84bb66ca195fca57138cbe3ac3f29b0982e4019b5b599b81984dceacd5523f794a04cfb5d416a051a1e61 SHA512 d9bcce33482db2f15ee094a244359fafdce196984a799509d9b16e24f46feb3aecd419520e65ca9513b40ff4975d793bec05924bfdd69586d9a6f3feb42cccc3 AUX sane-backends-1.1.1-configure-clang16.patch 1537 BLAKE2B 5908f8a11ab78b37b1def559b3e59f7c84fa0d744d81fa130d1816b45ebf058c77caf7fd56ba6b8c97d864a018bcaedddb31525f6c8cd84bac8bb5d7d9a07da1 SHA512 2a1c2addde06841761051f93432da187241f4840568c39f074dc503c3038ab2d5cf57f4f807e728c15d40049c1e06eb8e7939b41daff33c937afd510fc676601 +AUX sane-backends-1.3.1-verfix.patch 896 BLAKE2B 2bce01297d5a5d867c7bfc92f54d98874f3614a4aa604a3b493d4302aed640d2f5c1783ff24a8e2cde6f9dbc44b5156ccef9058eab06c18c958e24edc865e8d6 SHA512 f19f7f41be6a1908398ebf180a0fd613df1f6377e8f6869f9f283d92e3cf2a292cd547769ab8676617fe0b3d72a38a25ed98d042d29af8a97a4072250ce59713 AUX saned 150 BLAKE2B 306d57a0c09856b387c3c50eb27aaafdb194972c2fdb5d1cb7de3118f0c71cf234898ce958f0d6bd17a5e1f2b5bde458e014a7bfdec52403a6204ebf51aee039 SHA512 26f3d66c6b1e75d87d7d430518aa878c77d5ab8d76a45847cef3ff15566341938eedf46c50d0fa8cdeef828df9cddefdd6fdd767c5de30d3aa7d64ed1911d910 AUX saned.confd 76 BLAKE2B cac74b6f117f7f78a71b951433bc6b155f8641e2cf1bd747871165764e97ed368d10551075761c34ff01f51f7cae1b8a9c5692fb9666a300b45134fe255ea3c1 SHA512 8f4a99ef24c19b3a7213b3d25ea16f5bca8623735cf25d21e3a706e9e0135ac8cce5d0b8fb8728845977f41dcefe6bd858076d755515fc91b00e05ee5817d751 AUX saned.initd 294 BLAKE2B 571bd4032b2330c627a31459a18baf2044852ec1b40f0216bd5b5a546d61133522cdc98c7011669feaadc2d030ffeb49a86130075f22a18edab5f4c925780681 SHA512 655200141339f14bf7fc6f4fff3403cf9504809b7f023aa5425aad691c5baa65772100da0a6311669f83ed1dce73b7d65ca20aa31345b13c48dfdb1b30ce5dbd AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3cecdae79111fb1db1cfe3b4933eca15af5f985fc6b89e4d9af3844b6e9cfd542828b6b9e57ed9 SHA512 a23ceeeb02bd9e214702003a3165886858ecbdd93df89cd37ad5f00581745454548ccda0ab656f2dc0acbf2896a8781568c786797e64a07014be003d6140a093 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965 AUX saned_at.service-r1 432 BLAKE2B e6dab788c0bf705087974642ed714b5f41b3e676b80b5197a753227934b977ce6d1175872163e831e916b6aa36d6c5dd86effa44801494cff6fc669e6c24acaf SHA512 2c8725f9981216129f94a7c4cd75efab37bb75c891fdf7dbd4297161d8d4cd3b1c5fa0eebcaabe1f038aab8500f8b5579d776935f180fb2553bd2cb77506c29d +DIST backends-1.3.1.tar.bz2 4409356 BLAKE2B 8cedc3adb21c481f346c20de5363439aecabbf81606e3fb81accf4a7af4433eb83cecb3f25be9f4944990651fc66a97ce5f2796cc80846c8e066e4f611c6f8ff SHA512 20774d7b81bbb6a5905f36a312be519e0f664a3fb90ff521f2196c341d80c1ef12164262f063ae0a7b449690213c1e3b8065ebfd6b1e1804cc1581d863f4b720 DIST sane-backends-1.2.1.tar.gz 7308040 BLAKE2B 8448a66e70548f159cfac63501e52417fb1d0599008ce7bf26bf2e7a25a946e688968f01ae64b72c3d5efce67cfbdc0e8e04d8ab3bc92dae0a7e01bc81bf0140 SHA512 3ffce67e409caa5d32684290a56a46a68fef6991a14858d89cbab5aeb364fbbfd6d7c85bcbc4932c9167073a3a6ba682b4730f11fb320f0c4de53a7e7d3edba1 EBUILD sane-backends-1.2.1.ebuild 8837 BLAKE2B 942f956dd6f7b23c3e43e1b40517120cabd9ba087a42ea90dbb47d9009022b02ee42e3a60c80897363027bf1df3c757d6e2b2f57ad7c37d088510b255ee32a61 SHA512 d5c62ec336711d97c730338546c3fea7123dd27a21ba27504698cd50fe56963a75620e9d22505d0ebbafdf12fd954cb5141f1e41099bff32928772c6c435682c +EBUILD sane-backends-1.3.1.ebuild 9015 BLAKE2B 732ccc1b84e0378caae33b1202b9d4fa805613c26fa831e505d85639287682ffeafab216e8cc839118b9cea9d6565492cc9d576c78207c0dc806352ee0904887 SHA512 fb0fec1f6648e072ecbb163c89164faec5624c102317a26679f0fc820d5b3b39787cea6b2a745d8fae969eaf1c279d7664086cf7ec290bc0bc5b6a794b0ced9c MISC metadata.xml 333 BLAKE2B 7d543cb4daa6542f7facef3e1f57c09144baed3198010d7c39df40398ab82791f56271375bce36e829a1364350d05f81c332a2359e7038b047df31407543d331 SHA512 52ac311d50fcfe020b4ec891bcbc1df2834d5d1e3ade7ab6926c6f85a31712dd5886b834739f6155873e1e09967c8f565b913c807acd7ea47a4d3b94160fff37 diff --git a/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch b/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch new file mode 100644 index 000000000000..32f22f6c181c --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.3.1-verfix.patch @@ -0,0 +1,23 @@ +diff --git a/configure.ac b/configure.ac +index ddb52b9..c3046b9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,13 +16,11 @@ AM_SILENT_RULES + dnl ****************************************************************** + dnl Determine SANE version components and release status + dnl ****************************************************************** +-AS_IF([test x = "x$AWK"],[AC_PROG_AWK]) +-AS_IF([test x = "x`echo $VERSION | sed 's/[[.0-9]]//g'`"], +- [is_release=yes], +- [is_release=no]) +-V_MAJOR=`echo $VERSION | $AWK -F. '{print $1}'` +-V_MINOR=`echo $VERSION | $AWK -F. '{print $2}'` +-V_REV=`echo $VERSION | $AWK -F. '{print $3}' | sed 's/^\([[0-9]]*\).*/\1/'`; ++is_release=yes ++is_release=no ++V_MAJOR=1 ++V_MINOR=3 ++V_REV=1 + + AC_DEFINE_UNQUOTED(SANE_DLL_V_MAJOR, $V_MAJOR, [SANE DLL major number]) + AC_DEFINE_UNQUOTED(SANE_DLL_V_MINOR, $V_MINOR, [SANE DLL minor number]) diff --git a/media-gfx/sane-backends/sane-backends-1.3.1.ebuild b/media-gfx/sane-backends/sane-backends-1.3.1.ebuild new file mode 100644 index 000000000000..573d4ca4c003 --- /dev/null +++ b/media-gfx/sane-backends/sane-backends-1.3.1.ebuild @@ -0,0 +1,362 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) + +# python-any-r1 required for a script in backends/pixma/scripts/ +inherit autotools flag-o-matic multilib-minimal optfeature python-any-r1 systemd toolchain-funcs udev + +MY_PN=backends +MY_P="${MY_PN}-${PV}" +DESCRIPTION="Scanner Access Now Easy - Backends" +HOMEPAGE="http://www.sane-project.org/" +SRC_URI="https://gitlab.com/sane-project/${MY_PN}/-/archive/${PV}/${MY_P}.tar.bz2" + +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2 public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +# gphoto and v4l are handled by their usual USE flags. +# The pint backend was disabled because I could not get it to compile. +IUSE_SANE_BACKENDS=( + abaton + agfafocus + apple + artec + artec_eplus48u + as6e + avision + bh + canon + canon630u + canon_dr + canon_lide70 + canon_pp + cardscan + coolscan + coolscan2 + coolscan3 + dc210 + dc240 + dc25 + dell1600n_net + dmc + epjitsu + epson + epson2 + epsonds + escl + fujitsu + genesys + gt68xx + hp + hp3500 + hp3900 + hp4200 + hp5400 + hp5590 + hpljm1005 + hpsj5s + hs2p + ibm + kodak + kodakaio + kvs1025 + kvs20xx + kvs40xx + leo + lexmark + ma1509 + magicolor + matsushita + microtek + microtek2 + mustek + mustek_pp + mustek_usb + mustek_usb2 + nec + net + niash + p5 + pie + pieusb + pixma + plustek + plustek_pp + pnm + qcam + ricoh + ricoh2 + rts8891 + s9036 + sceptre + sharp + sm3600 + sm3840 + snapscan + sp15c + st400 + stv680 + tamarack + teco1 + teco2 + teco3 + test + u12 + umax + umax1220u + umax_pp + xerox_mfp +) + +IUSE="gphoto2 snmp systemd threads +usb v4l xinetd +zeroconf" + +for GBACKEND in ${IUSE_SANE_BACKENDS[@]}; do + case ${GBACKEND} in + # Disable backends that require parallel ports as no one has those anymore. + canon_pp|hpsj5s|mustek_pp|\ + pnm|mustek_usb2|kvs40xx) + IUSE+=" sane_backends_${GBACKEND}" + ;; + *) + IUSE+=" +sane_backends_${GBACKEND}" + esac +done + +REQUIRED_USE=" + sane_backends_escl? ( zeroconf ) + sane_backends_kvs40xx? ( threads ) + sane_backends_mustek_usb2? ( threads ) +" + +# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build +RDEPEND=" + acct-user/saned + acct-group/scanner + gphoto2? ( + >=media-libs/libgphoto2-2.5.3.1:=[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + ) + sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_dc210? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + sane_backends_dc240? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + sane_backends_dell1600n_net? ( + >=media-libs/tiff-3.9.7-r1:=[${MULTILIB_USEDEP}] + media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] + ) + sane_backends_escl? ( + app-text/poppler[cairo] + || ( + net-dns/avahi[dbus] + net-dns/avahi[gtk] + ) + net-dns/avahi[${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] + ) + sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[${MULTILIB_USEDEP}] ) + sane_backends_pixma? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + snmp? ( net-analyzer/net-snmp:= ) + systemd? ( sys-apps/systemd:= ) + usb? ( >=virtual/libusb-1-r1:1=[${MULTILIB_USEDEP}] ) + v4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + xinetd? ( sys-apps/xinetd ) + zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + dev-libs/libxml2 + v4l? ( sys-kernel/linux-headers ) +" +BDEPEND="${PYTHON_DEPS} + dev-build/autoconf-archive + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.24-saned_pidfile_location.patch + "${FILESDIR}"/${PN}-1.0.27-disable-usb-tests.patch + "${FILESDIR}"/${PN}-1.0.30-add_hpaio_epkowa_dll.conf.patch + "${FILESDIR}/${P}-verfix.patch" +) + +# ./configure checks to see if these are defined in sys/io.h, +# so if they're undefined... that's the point. +QA_CONFIG_IMPL_DECL_SKIP=( inb outb ) + +MULTILIB_CHOST_TOOLS=( + /usr/bin/sane-config +) + +src_prepare() { + default + + eautoreconf + + # Needed for udev rules generation/installation + multilib_copy_sources +} + +src_configure() { + # From Fedora + append-flags -fno-strict-aliasing + multilib-minimal_src_configure +} + +multilib_src_configure() { + # the blank is intended - an empty string would result in building ALL backends. + local lbackends=" " + + use gphoto2 && lbackends="gphoto2" + use v4l && lbackends+=" v4l" + use sane_backends_escl && multilib_is_native_abi && lbackends+=" escl" + local backend + for backend in ${IUSE_SANE_BACKENDS[@]} ; do + if use "sane_backends_${backend}" && [[ "${backend}" != pnm ]] && [[ "${backend}" != escl ]] ; then + lbackends+=" ${backend}" + fi + done + + local myconf=( + $(use_with usb) + $(multilib_native_use_with snmp) + + $(multilib_native_use_with sane_backends_escl poppler-glib) + # you can only enable this backend, not disable it... + $(usex sane_backends_pnm --enable-pnm-backend '') + $(usex sane_backends_mustek_pp --enable-parport-directio '') + ) + + if ! { use sane_backends_canon_pp || use sane_backends_hpsj5s || use sane_backends_mustek_pp ; } ; then + myconf+=( sane_cv_use_libieee1284=no ) + fi + + # relative path must be used for tests to work properly + # All distributions pass --disable-locking because /var/lock/sane/ would be a world-writable directory + # that break in many ways, bug #636202, #668232, #668350 + # People can refer to the "Programmer's Documentation" at http://www.sane-project.org/docs.html + myconf+=( + --enable-ipv6 + --disable-locking + $(use_with gphoto2) + $(multilib_native_use_with systemd) + $(use_with v4l) + $(use_enable threads pthread) + $(use_with zeroconf avahi) + ) + + ECONF_SOURCE="${S}" SANEI_JPEG="sanei_jpeg.o" SANEI_JPEG_LO="sanei_jpeg.lo" \ + BACKENDS="${lbackends}" econf "${myconf[@]}" +} + +multilib_src_compile() { + emake VARTEXFONTS="${T}/fonts" + + if tc-is-cross-compiler ; then + pushd "${BUILD_DIR}"/tools >/dev/null || die + + # The build system sucks and doesn't handle this properly. + # https://alioth.debian.org/tracker/index.php?func=detail&aid=314236&group_id=30186&atid=410366 + tc-export_build_env BUILD_CC + ${BUILD_CC} ${BUILD_CPPFLAGS} ${BUILD_CFLAGS} ${BUILD_LDFLAGS} \ + -I. -I../include -I"${S}"/include \ + "${S}"/sanei/sanei_config.c "${S}"/sanei/sanei_constrain_value.c \ + "${S}"/sanei/sanei_init_debug.c "${S}"/tools/sane-desc.c -o sane-desc || die + local dirs=( hal hotplug hotplug-ng udev ) + local targets=( + hal/libsane.fdi + hotplug/libsane.usermap + hotplug-ng/libsane.db + udev/libsane.rules + ) + mkdir -p "${dirs[@]}" || die + emake "${targets[@]}" + + popd >/dev/null || die + fi + + if use usb ; then + sed -i -e '/^$/d' \ + tools/hotplug/libsane.usermap || die + fi +} + +multilib_src_install() { + emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \ + docdir="${EPREFIX}"/usr/share/doc/${PF} + + if multilib_is_native_abi ; then + if use usb ; then + insinto /etc/hotplug/usb + doins tools/hotplug/libsane.usermap + fi + + insinto "/usr/share/pkgconfig" + doins tools/sane-backends.pc + + # From Fedora and Arch, prevent permission conflicts + # https://github.com/OpenPrinting/cups/issues/314 + # https://gitlab.com/sane-project/backends/-/issues/546 + # + # Generate udev udev+hwdb, not needing scanner group + install -vdm 755 "${ED}/$(get_udevdir)/rules.d/" || die + tools/sane-desc -m udev+hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die + tools/sane-desc -m udev+hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/rules.d/65-${PN}.rules" || die + # generate udev hwdb + install -vdm 755 "${ED}/$(get_udevdir)/hwdb.d/" || die + tools/sane-desc -m hwdb -s doc/descriptions/ > "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" + # NOTE: an empty new line is required between the two .desc collections + printf "\n" >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die + tools/sane-desc -m hwdb -s doc/descriptions-external/ >> "${ED}/$(get_udevdir)/hwdb.d/20-${PN}.hwdb" || die + # udev rule for saned (SANE scanning daemon) to be able to write on usb port + udev_newrules "${FILESDIR}/66-saned.rules-r1" 66-saned.rules + fi +} + +multilib_src_install_all() { + dodir /etc/env.d + + if use systemd ; then + systemd_newunit "${FILESDIR}"/saned_at.service-r1 "saned@.service" + systemd_newunit "${FILESDIR}"/saned.socket saned.socket + fi + + if use usb ; then + exeinto /etc/hotplug/usb + doexe tools/hotplug/libusbscanner + newdoc tools/hotplug/README README.hotplug + fi + + dodoc NEWS AUTHORS PROBLEMS README README.linux + find "${ED}" -name '*.la' -delete || die + + if use xinetd ; then + insinto /etc/xinetd.d + doins "${FILESDIR}"/saned + fi + + newinitd "${FILESDIR}"/saned.initd saned + newconfd "${FILESDIR}"/saned.confd saned +} + +pkg_postrm() { + udev_reload +} + +pkg_postinst() { + udev_reload + + optfeature "Network scanner backend" media-gfx/sane-airscan + optfeature "Epson-specific backend" media-gfx/iscan + optfeature "HP-specific backend" net-print/hplip + + if use xinetd ; then + elog "If you want remote clients to connect, edit" + elog "/etc/sane.d/saned.conf and /etc/hosts.allow" + fi +} |