summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-10-30 15:03:33 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-10-30 15:03:33 +0000
commitc9388864702fdd7b0b56c049eddb41bdb9054dcb (patch)
tree3595822471cd11e6f9f92565ab81ab9c5ee39c3f /media-gfx
parenta41f630aea0b4b71a6c9a088571f1eaaf8413d53 (diff)
gentoo auto-resync : 30:10:2022 - 15:03:33
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/Manifest.gzbin38304 -> 38311 bytes
-rw-r--r--media-gfx/gimp/Manifest2
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild2
-rw-r--r--media-gfx/gscan2pdf/Manifest2
-rw-r--r--media-gfx/gscan2pdf/gscan2pdf-2.13.0.ebuild110
-rw-r--r--media-gfx/openvdb/Manifest13
-rw-r--r--media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch25
-rw-r--r--media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch12
-rw-r--r--media-gfx/openvdb/metadata.xml3
-rw-r--r--media-gfx/openvdb/openvdb-7.0.0-r4.ebuild124
-rw-r--r--media-gfx/openvdb/openvdb-7.1.0-r5.ebuild124
-rw-r--r--media-gfx/openvdb/openvdb-8.0.1-r4.ebuild126
-rw-r--r--media-gfx/openvdb/openvdb-8.1.0.ebuild130
-rw-r--r--media-gfx/openvdb/openvdb-8.2.0-r3.ebuild137
-rw-r--r--media-gfx/xdot/Manifest4
-rw-r--r--media-gfx/xdot/files/backport-2ace1a1-issue-92.patch151
-rw-r--r--media-gfx/xdot/xdot-1.2-r1.ebuild45
-rw-r--r--media-gfx/xdot/xdot-9999.ebuild12
-rw-r--r--media-gfx/yafaray/Manifest5
-rw-r--r--media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch35
-rw-r--r--media-gfx/yafaray/yafaray-3.4.1.ebuild114
-rw-r--r--media-gfx/yafaray/yafaray-3.5.1-r2.ebuild (renamed from media-gfx/yafaray/yafaray-3.5.1-r1.ebuild)11
22 files changed, 331 insertions, 856 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6cf2f832ed27..233ad0f9e11f 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
Binary files differ
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 46c4c3a5774d..48e6123e89f0 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -6,5 +6,5 @@ DIST gimp-2.99.12.tar.xz 24282140 BLAKE2B 2174e1d50941071ea6e96f0e3f315484867aa9
EBUILD gimp-2.10.32-r1.ebuild 5663 BLAKE2B af3ad36266514ec26c3a54e5cee8a9c21e2787155e07c9b0dcdcdba934d80b37f0fa46ad93d40a48a881583a87ce1db2b2dac28314322bae958b39e78257e17f SHA512 7ec1e0135aca81c43e9ccc34fec1f09a620652ca7aff942768c53238124e9e79727392b0ad61a146da253ff33b1aba31695a6222c7596f6aabb0d21becda2773
EBUILD gimp-2.99.10-r2.ebuild 6622 BLAKE2B 009a17b291a8e0ba430c342931cfa7338c0c54671ccfdf299ab08eb5d40f0335627581c4a54caedcffe9d2abf6928af1a5936b73ef30ba40da6f6e3c4d290ad9 SHA512 d88503ada39e5c676616d019a029d9e1d6884207923f05c348f35014791fbcb4a29528086566bd007d2cb1501fd0569a54f9c65ede90a23b35403e7f61d4f845
EBUILD gimp-2.99.12-r1.ebuild 6876 BLAKE2B ee13b540db02b9da3e252d43899f56f2ada50391afcc2cf2c2b59ffca63cfd075e5c3ee28659d826612c02df3f4d46cdaee233df11d7c994b8ac8f61610bf3b4 SHA512 40f3862738b6eaa5df9a2d201493f4041a3f333f9f10c12562321319a2c4593501080d37c9c86e24716bb84fcbd51a928fc0e014afcb06a9cac4af1bdc968d99
-EBUILD gimp-9999.ebuild 6718 BLAKE2B bba54e45595e4b5b2bb454cac590c9d1a7406d0c6f2b037f5b9cc101a24d3a2ce62dde6b528b8312763f8816d6d72a8a1ab078c0eb81de6384c625ed083c55b4 SHA512 c00b83aa4eee416659b22a40adca9a778f1db8e70b7497bd46c501c74ed2ca9221ddf5647fac17293cc34321e679f3a75166e3d0b1f75e9a7eb49e940f548fbb
+EBUILD gimp-9999.ebuild 6689 BLAKE2B b3f5729e320677d7e4d85e8cfbfa6cb36bd92f836861b1ccea958a5bd414a7836b35d306825610a9cb462c22d47f18805766fd9242cf7bf376d2a39269c05ce1 SHA512 51fad83de1e08a05d2b3eda864fcff8b1a728eb91e4914d70c6cb803cdf6f4f1e9e5195f0b77f75e3746fcabd8a5757bce826087edca3a3bcc95ad57b689b0c8
MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 0454db1459c8..ab1bc5eb943f 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -109,7 +109,7 @@ BDEPEND="
virtual/pkgconfig
"
-DOCS=( "AUTHORS" "devel-docs/CODING_STYLE.md" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
+DOCS=( "AUTHORS" "devel-docs/HACKING.md" "NEWS" "README" "README.i18n" )
pkg_setup() {
use lua && lua-single_pkg_setup
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 00355a60a740..78be4b5f62ab 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,5 +1,7 @@
DIST gscan2pdf-2.12.5.tar.xz 502636 BLAKE2B 5fb92a4e5dfdbd985119058ed86ca015a58e97fd73edae4d46279e482351f9b5514045a60bb67ca2bfb58fa1e4315bc03ca67a2f2e3ed0cd2c941d8ae755fdfa SHA512 eeeec0940ef4a40b8cb7e961758e9688c94d980842ab36c4e52384099d1e28773f2967a75eb7c024ab713b880c2538d8395021bfabd68cffa7b334fdd35d773b
DIST gscan2pdf-2.12.8.tar.xz 503940 BLAKE2B 16433addec7306cab60a258b58b0239fb0eeea5b0a98ea24fda0de65d9f1901feca9093ab7a6f7fedfb6740abf4e59a16cdeac2d3d7de5141320c55855be7c79 SHA512 18d4bd12580d20b29e0086d1df541a2c044f03b98d8e7c8a91b87540622160aa5a9c2d13a888d5f557d1d975b5dc7a6ae8fd0f2c9be254e60d8a979c979e6040
+DIST gscan2pdf-2.13.0.tar.xz 503876 BLAKE2B 784b52d9e06fe8a112b2e4d6ce281c037f1e834154e0d19ee9112b4027e2075971d52114f7f6d197bee024aabd84a2263fa98ba08e4cade6129dd0a0a4d2a104 SHA512 81a72d2241cf32dfdf628ab991476e435812e9f04f54c8fe311d0c7ef5e77e6d38091523aa4bf610382d76e1e4f5049cd5ba96c68f6d796298f9e2a584ff0d5d
EBUILD gscan2pdf-2.12.5.ebuild 2995 BLAKE2B 96336de1a27929613f0734fd8013031cd8f6fd239f8c344d6f35fbc5385b1d280266d587e45714d4a5c740e2dc03df7ac28b07593f5b376729c041d4591cac92 SHA512 d5e143d4f92ff01ff47d8d8a7cb4d0147e11ec3dfaf3eb323638670faf5f105b5af222b312bf39f2984be36b51c4dbf809ad498c311ba2a0a1baa54f543cce3b
EBUILD gscan2pdf-2.12.8.ebuild 2997 BLAKE2B b69ceb30a6166a99ec66ac63c43986a0679328a01dc73a8efa9fb1f23d2038804dc59458ab19d54043758d87b14d4c6a7089e92530f62269e4bbd2cf070dea43 SHA512 45d2bc4d693103365a4a59b451c9948cda59c2b77f45ce44d9d670f344e7587c370abe2224994e6b2d3804f04d6b8a5e8a405586ccff408014a3eb45378c30c7
+EBUILD gscan2pdf-2.13.0.ebuild 3013 BLAKE2B 18f7a307ade095948cff2496a0ff23f6cb4ef4c80318b919cda9e7fa85760e09a9b642a57dcb7615acf3408c8285d873721465933d0e2bd1311728b4f98e2e84 SHA512 2786aa6f7d41f0376c0076d8a17dfd769b45418d039a60baca10f7c81c92b9fe79131a6b578a13886f1c88c2daf813c2cf8afdde3ff0b67adfa446e40176b675
MISC metadata.xml 470 BLAKE2B d9a9ad2f443b0bca02e6b8e91c96f22430543ee82fe8a1174739d4ad59225f73b975d31316fecd4dde6f26002ef6ba9fd39bf5d4adfd2bc82540d14e90d623a6 SHA512 ecd2fe9215c3a65760b8c101989772a73a7e9975dc38a1b11b0334cf6e1d001ccebfca1bc6d7631eb3b3e3e03d1736205563b0c836a2aea026fdfe552d72cbe0
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.13.0.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.13.0.ebuild
new file mode 100644
index 000000000000..4bfade7a935f
--- /dev/null
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.13.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_TEST="do"
+
+inherit optfeature perl-module virtualx xdg-utils
+
+DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
+HOMEPAGE="http://gscan2pdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-perl/Config-General
+ dev-perl/Data-UUID
+ dev-perl/Date-Calc
+ dev-perl/Filesys-Df
+ dev-perl/glib-perl
+ dev-perl/GooCanvas2
+ dev-perl/Gtk3
+ >=dev-perl/Gtk3-ImageView-10.0.0
+ dev-perl/Gtk3-SimpleList
+ dev-perl/HTML-Parser
+ dev-perl/Image-Sane
+ dev-perl/List-MoreUtils
+ dev-perl/Locale-Codes
+ dev-perl/Locale-gettext
+ dev-perl/Log-Log4perl
+ >=dev-perl/PDF-Builder-3.23.0
+ dev-perl/Proc-ProcessTable
+ dev-perl/Readonly
+ dev-perl/Set-IntSpan
+ dev-perl/Try-Tiny
+ virtual/perl-Archive-Tar
+ virtual/perl-Carp
+ virtual/perl-Data-Dumper
+ virtual/perl-File-Temp
+ virtual/perl-Getopt-Long
+ virtual/perl-threads
+ virtual/perl-threads-shared
+ media-gfx/imagemagick[png,tiff,perl]
+ media-gfx/sane-backends
+ media-libs/tiff"
+
+BDEPEND="
+ test? (
+ ${RDEPEND}
+ dev-perl/IPC-System-Simple
+ dev-perl/Sub-Override
+ media-libs/fontconfig
+
+ app-text/djvu[jpeg,tiff]
+ app-text/poppler[utils]
+ app-text/tesseract[-opencl,osd(+),png,tiff]
+ app-text/unpaper
+ media-gfx/imagemagick[djvu,jpeg,png,tiff,perl,postscript,truetype]
+ media-gfx/sane-backends[sane_backends_test]
+ media-gfx/sane-frontends
+ )"
+
+PERL_RM_FILES=( t/{90_MANIFEST,91_critic,99_pod,169_import_scan}.t )
+
+mydoc="History"
+
+src_test() {
+ einfo "Using:"
+ einfo " $(best_version app-text/djvu)"
+ einfo " $(best_version app-text/poppler)"
+ einfo " $(best_version app-text/tesseract)"
+ einfo " $(best_version dev-perl/Gtk3-ImageView)"
+ einfo " $(best_version dev-perl/Image-Sane)"
+ einfo " $(best_version dev-perl/PDF-Builder)"
+ einfo " $(best_version media-gfx/imagemagick)"
+ einfo " $(best_version media-gfx/sane-backends)"
+ einfo " $(best_version media-libs/tiff)"
+
+ local confdir="${HOME}/.config/ImageMagick"
+ mkdir -p "${confdir}" || die
+ cat > "${confdir}/policy.xml" <<-EOT || die
+ <policymap>
+ <policy domain="coder" rights="read|write" pattern="PDF" />
+ <policy domain="coder" rights="read" pattern="PS" />
+ </policymap>
+ EOT
+ NO_AT_BRIDGE=1 virtx perl-module_src_test
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+
+ optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
+ optfeature "encrypting PDFs" app-text/pdftk
+ optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
+ optfeature "adding to an existing PDF" app-text/poppler[utils]
+ optfeature "Optical Character Recognition" app-text/tesseract[tiff]
+ optfeature "scan post-processing" app-text/unpaper
+ optfeature "automatic document feeder support" media-gfx/sane-frontends
+ optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 26ed33d8fcb7..688d327ccab4 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,7 +1,5 @@
AUX openvdb-7.1.0-0001-Fix-multilib-header-source.patch 2825 BLAKE2B 089bc79bbb8bd4544889c65d8bf064bf95869990778cb66595a19be402db85b569acb836b5918c902e6f6a10011a1480ef89e03636f951e30e5833eb667478cb SHA512 6968a60737b08bbec96beb8ec3796b7d99a713a798e37d8cd4015eacce7e7197b5befcd6721b310a4cdcfaca1781ab0cd7165958b14b487796a4159e9e214499
-AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da18479266201fd1233d19f3c39b13ee67d11cadca5bba900c470218a7563590f12a400a1f954155bfdfacc00862511ef05f3a61a54679924c57cae SHA512 21d4abf1cae31dfa8e59b6648a7c40f6f5f9572bdb87e6410144b427244ede488e059bf572344efc4e4cea91e7fb59b56364a7df6041f717db759002d09e8ee7
AUX openvdb-8.0.1-add-consistency-for-NumPy-find_package-call.patch 836 BLAKE2B e04fe9f6e3a1a44a7b4274dd328f88c0dffe14493bad68c4e30807f44330a4328776eefe600e2f9b6565ee363f1db4228f36da995e18556e678672925f5f89ec SHA512 0599bc38a4e74ecede3d174ecee0f207dd8edd2a6f99f68fdb46488505ff093e9e1a6842fe58e94e5bee93f7c79a72bd043b3d7ca070b26895919b57a808a784
-AUX openvdb-8.0.1-glfw-libdir.patch 495 BLAKE2B 6a47bd300b3cd2186be8b749abd1e1fcbcb50e24d1965a783d8f2cec07ef8737ee6287018f40fed4ea4520c2c6be20b5936bdf0bd95ab07f277e728b6fccbb07 SHA512 29cd8d4dfd24f262c8e03a4d55502839a99bdac8eae1738b99cd667292034ea5cddec60303daf3a0c0d76a68021b3b4d6fc2f0e5be108d94243f5c11308c194d
AUX openvdb-8.1.0-glfw-libdir.patch 742 BLAKE2B 2ab1de05da49480584e373dba0f4a8504f6116ee22c46247f72802a9d412df43603b79b9620d0be2efe9745c30d962d1404325f3b09cae4ac9fe1e3bc0052d42 SHA512 beebad98890dc05c7c34594155fcdb163353b3a92c1571c7b017481b1fa167735ec54df019ed5d154e7d0973d3c1d9fd779508d2360f3306eefa6e45d3240d0b
AUX openvdb-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch 1351 BLAKE2B 0a63f9c2c3fd44cfe8013e2c73c3f311d92fee2b6828801175969a0f7123401c21ad11325788ba8b38716a6d21ccf9bd0e685e0c3bb51d6c3f0a0bd3fcdb409b SHA512 5443a3204c9f8b6b8ae9e533ee8c18d6e82463cb3c5be1e3664ab2067a7ba2c9d99f17263204d6be940db3dcd1d8721b359ac0de698f760d23ba05a68e03f1e9
AUX openvdb-8.2.0-unconditionally-search-Python-interpreter.patch 1390 BLAKE2B 58e1ed82abe0e2a50ba7861188d65baa48e6c6273bcdbacccf92923de88359d6b08fa52eb6bc8d0b4f144b360680f52a94c696abcfcbb3e1c9045ba830c03646 SHA512 ddedfeae9a68c57c4de14ffdf05f952611fe72fd089320fba5f432d5562a09c661750eca4d0e256be1a3f0ac3e141b26db8d738df5b3a2ddb58a747331c90729
@@ -9,19 +7,10 @@ AUX openvdb-9.0.0-fix-atomic.patch 1548 BLAKE2B 718d9eb0511ea50733d7f11b6720a90f
AUX openvdb-9.0.0-numpy.patch 6113 BLAKE2B 4424e930ddaa3863245fc8f32954b5732aaba84792f930cc25f8598cbe0282c68540eaf7f2721959841ec3f40bbe5ed1f770c5c90425389a3a0646ebe3b75c9d SHA512 23b53db3895f1b44605e002e1b3649fe1101844f1ac864cf6083c19fdb4ab40701ee20177d7095c7a8e683e01a3e4fad1fa5087207580dd64e6f5adf4f14fdbc
AUX openvdb-9.0.0-unconditionally-search-Python-interpreter.patch 1471 BLAKE2B e13ad11bfcb13a763bc73f2a26dbc11d1967098942d6f685cbd9fa2de467ac64c71d093e267db1d2d15e40ac3ab25d9b3995e40cc58d069109ded5abdd8ecb3f SHA512 137f96d8d906f2ea321670823c6fb80256b98179e7d4e044e78e62417d7489eae464f9596f13e80fd2dcafbcd946cf94e192965de48d900e061418f39f16c39c
AUX openvdb-9.1.0-disable-failing-tests.patch 5113 BLAKE2B 0df70f2943368386b41a1d82167c28c4fb16d0a5481a29cfbba93f116ea1eaf99ac2471fbe1645867fcddeca4765cca0d725c9a3c1a84d2f83fdb1b5387822e2 SHA512 765d20bdd961d1a9e41f79b396ede95c2a28a90af2e81b7dfa5e171f8cafc971aac384fa6fe27112fb6dd37173ef5713205cf30e99df833140eaf1ff78ef91ea
-DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
-DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
-DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2
-DIST openvdb-8.1.0.tar.gz 2619432 BLAKE2B ba06e8dc24876da0ed1a2b5560e8793ad1e42b45b2018734c98c9b8f1d43bdb4aa098243a68de90efb18cb0454a9ea2a59c87f411d2c6492c5bce95dc047a6f0 SHA512 081ccedb122ff9bd73e0cd7ff083ad0ff0165e0cf6305187edcbe90ff12f01ec085c91ad5c52c53596035e0c2afd5b8801e6c00374b0fc4b0cc111f5c7f37eb5
DIST openvdb-8.2.0.tar.gz 2656278 BLAKE2B b381459fb770800bb03bc8a6b3122c6684ab508f11be024e0eb3951bfbcef14e626e2d4468e91ea17fd6792f23810eafe8b05e19d46eb0e6200c73ccf296116a SHA512 aed6b5884a9cfd42f72357ad090c5dcf7829b0e5672ab61e31206e889c085ce5a7bcb89476ceac552a837d394011951528e2b3cffc77baadc491a2e7a31d5e86
DIST openvdb-9.0.0.tar.gz 2945040 BLAKE2B c47a8088ba30d3cbecff04dbfd2d48b39a254e54149d8692c3a7157a99a1c555ef9747b77aeab6f8709b61c348d496765f2cfcbb0975e21f533072871f3fa422 SHA512 1410b7b04b03fb09d6775ebe7b95e7c0a484d5f29c84203530ed30ccb7c061470be1abb93189010617342e57f3fecdd66a115c6d222024e68e2384a7fb196194
DIST openvdb-9.1.0.tar.gz 3107285 BLAKE2B a30d000f14358935eadc9cad9a7904637ceb0b2e6cc53129614e3243b55748b973c29eedc09a6cc444fb754777f6ee752af22847690977eca7a84865fdbe445b SHA512 434be61b03efec5d0022594d81064dce5f67595c1e34934d79e13627e573d2819bf947ca5b433fdca134642975b83eda71b46cf802f57e135d1611dbe2e5757e
-EBUILD openvdb-7.0.0-r4.ebuild 2923 BLAKE2B 789ef9fe451697a42848047a72a7dec59ba37959fd92573ff824d92f7768674a231ba4d4e88a81eb3c332deb730fc0fe4c38c383c482f151babb1091752cf062 SHA512 2e268d1892ed9b3c8eaf89d27a7c559327756f26c8f5830d113b404c8c6100536626371b32eb4844da3a7e85c0d9e110cd92dc5dc84957d16c139649fe02f42a
-EBUILD openvdb-7.1.0-r5.ebuild 2936 BLAKE2B 08764ebb2337dc453144526e5beb5c022eb2bfd2a68f752ccfb847057c53795ea3bd157f1527f6612bfbdc6faf927304f6dcd460901d4aff302c77a4613a24a6 SHA512 bc9bfbbb770fbafe7611d2df5d432db2d738c1f2118e922c921967328191954ed631a590411350ab15f50924b0b2f00d1501969e77a7c89e0f147e163e65d76c
-EBUILD openvdb-8.0.1-r4.ebuild 3034 BLAKE2B ef40d732555b406d4e81c7ad4500033073c10f5b8d81a0c7032d0c02369879fcadbfcbbb0fa4f344ca251fee47ceebe938acd47c70c2a3db2bca405da9cd2526 SHA512 5df7e6f71b8306ec28278839e7dee2ff09b8a7d1555f88a0c0f6ca7f9b5be20f1e572a0b0df6689817fb5fb378b5fc2d1a9729247aa6caf51c942e06fef1d0c6
-EBUILD openvdb-8.1.0.ebuild 3209 BLAKE2B 0db931c94e28135dd1819758f4459588c14498c2bc3121b7d61d223ddb6fb32873f22bf269f1b2afb15a3c1a612cb151b515a54eca2d6e73e56e6406b3df635c SHA512 840c7aac5df4a6cd6edde07c79702cdfb49f70e0b09dd023842884ccd62745202f0e956697ced9fe58cdffc345eba1330c0c006e6b248e60020d5b3193992faf
-EBUILD openvdb-8.2.0-r3.ebuild 3303 BLAKE2B 696e71570894dbb83167c0dbf2edd4db5b06f410fb7af254718ff2d3f7f0cbb44ed4b3279e3c486b3d442e13614aab4f80ec0251e8e5653fd9ad3fd0b6e383f9 SHA512 912bb5c4e2a3214d71985440d695a14e333c52fa4828d687dfcbbaf13aa1e5d377081c7f8889a080a17c79096bbc766ecd587bbe58b89489024f08f6d79e6085
EBUILD openvdb-8.2.0-r7.ebuild 3242 BLAKE2B 7c1f9ebebb936493a76380f42a4e2d1dc006e67b2f1c89283a09346e2a4400bd834e03dd6b06ea78a417bc09b537a8dbd62db89ad44aba4fb611446c7c1a2a7b SHA512 cbcb0b469f762ae4126d1bf048adc3126a84d246e9cc236bd2e494ae12064130ab4229770bd589a177d0b4ad1eb298682578cf1ff2ec47d1f4e4966d9e6df0cd
EBUILD openvdb-9.0.0-r4.ebuild 3405 BLAKE2B 8b220e23e015105b665f10bde81d3f2376cece3d541b7241175ad3fdf88946103f8ca5c083056449363f844da9ef0425c410e24d79e7e59a747a3e5d091f227f SHA512 1b74daffb8a015aee84d31d5eb52b957b17d31683230b4f1123c6c3b5d18cf77a5f18c0f2eae506f78691cdb33d8abeec7247097f310b4c08b6c7952cabc1e8c
EBUILD openvdb-9.1.0-r1.ebuild 4175 BLAKE2B 364dd6a18ab24a60815e3d91c405bbfdb7a3adfe2d8c66f39758497d56b375134bf47bea9f7d9b3ab91b6da685bb4ba54cf9aff107eaac9528eb496fc6ab6c42 SHA512 7738a6fc4a56748d522ea3a1dcda17017bfc8c53ee41a36e51b0e15d7ca31287efd94de5e6f1ecb1607259180d8834e3603e32ba41f7a5d1d633b7c525934afd
-MISC metadata.xml 2098 BLAKE2B b0e8c528f40ab7b201da0767713f0813c805c4e33ea59a228c8738286a3d8405939c1ffa9295214f475b86d0a256f9b1b67d15e48fa1d912a7f5bd12c9ba43bd SHA512 fddfb2848681052efe3369c3e26050a49761a74f328f4ddfba199b1667f053db4eb1358d4c76e7a14791e564750546f0f41fcc6233477071b562465c40565d8e
+MISC metadata.xml 1956 BLAKE2B dc4dbf2433e0a45c5e7e07ac503dc5d767df7d89b7e54bea857fcdd7d6f812614f6023cc99772dea9cd06d3c0721dc7cc714478ecb5c15e1a62ba1248140ac20 SHA512 e4fb9ad25e66e3dea41b61bb6246722eff18232bbbfacef99ca034e02c9adf47e59aef4b91d5c50fa1bb8bf4adb620897c7a3c4230c8be39bcbc69b10e44f2a8
diff --git a/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch b/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch
deleted file mode 100644
index 73d4b1ccd422..000000000000
--- a/media-gfx/openvdb/files/openvdb-7.1.0-0002-Fix-doc-install-dir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 66dec67036116243893fdf74060e55b70f65ab17 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 28 Feb 2020 21:51:30 +0100
-Subject: [PATCH] Fix doc install dir
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- doc/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 1cf58ea..a6bd849 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -64,5 +64,5 @@ add_custom_target(doc ALL
- )
-
- # Suppress "Installing..." messages for all but one of the hundreds of generated files.
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION doc/html)
--install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION doc MESSAGE_NEVER)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/html)
-+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/openvdb/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR} MESSAGE_NEVER)
---
-2.25.1
-
diff --git a/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch b/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch
deleted file mode 100644
index 991c5a6a568d..000000000000
--- a/media-gfx/openvdb/files/openvdb-8.0.1-glfw-libdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Custom cmake file used to find GLFW always looks at lib/cmake first
-ignoring alternate libdirs and leads to using wrong libraries.
-https://bugs.gentoo.org/800200
---- a/cmake/OpenVDBGLFW3Setup.cmake
-+++ b/cmake/OpenVDBGLFW3Setup.cmake
-@@ -84,5 +84,5 @@
- list(APPEND _GLFW3_ROOT_SEARCH_DIR ${SYSTEM_LIBRARY_PATHS})
-
--set(_GLFW3_PATH_SUFFIXES "lib/cmake/glfw3" "cmake/glfw3" "glfw3")
-+set(_GLFW3_PATH_SUFFIXES "cmake/glfw3" "glfw3")
-
- # GLFW 3.1 installs CMake modules into glfw instead of glfw3
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index af37d11b4eda..87defec8f82a 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -31,9 +31,6 @@
<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="numpy">
Build pyopenvdb with support for <pkg>dev-python/numpy</pkg>
</flag>
- <flag restrict="&lt;=media-gfx/openvdb-7.1.0" name="abi5-compat">
- Disables newer features to maintain compatibility with ABI5.
- </flag>
<flag restrict="&gt;=media-gfx/openvdb-6.0.0" name="abi6-compat">
Disables newer features to maintain compatibility with ABI6.
</flag>
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild
deleted file mode 100644
index f9b159f4213b..000000000000
--- a/media-gfx/openvdb/openvdb-7.0.0-r4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/7"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi5-compat abi6-compat +abi7-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- numpy? ( python )
- ^^ ( abi5-compat abi6-compat abi7-compat )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Check if newer releases work with newer TBB, bug #820788
-RDEPEND="
- <dev-cpp/tbb-2021.4.0:=
- dev-libs/boost:=
- dev-libs/c-blosc:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- media-libs/glfw
- media-libs/glu
- media-libs/ilmbase:=
- media-libs/openexr:0=
- sys-libs/zlib:=
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
- ')
- )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-util/cmake-3.16.2-r1
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
- "${FILESDIR}/${PN}-7.1.0-0002-Fix-doc-install-dir.patch"
- "${FILESDIR}/${PN}-8.0.1-glfw-libdir.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local version
- if use abi5-compat; then
- version=5
- elif use abi6-compat; then
- version=6
- elif use abi7-compat; then
- version=7
- else
- die "Openvdb abi version is not compatible"
- fi
-
- local mycmakeargs=(
- -DCHOST="${CHOST}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex !utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex !utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex !utils)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_EXR=ON
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild
deleted file mode 100644
index ddf724c720fd..000000000000
--- a/media-gfx/openvdb/openvdb-7.1.0-r5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/7"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat +abi7-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- numpy? ( python )
- ^^ ( abi6-compat abi7-compat )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Check if newer releases work with newer TBB, bug #820788
-RDEPEND="
- <dev-cpp/tbb-2021.4.0:=
- dev-libs/boost:=
- dev-libs/c-blosc:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- media-libs/glfw
- media-libs/glu
- media-libs/ilmbase:=
- media-libs/openexr:0=
- sys-libs/zlib:=
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
- ')
- )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-util/cmake-3.16.2-r1
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-0001-Fix-multilib-header-source.patch"
- "${FILESDIR}/${P}-0002-Fix-doc-install-dir.patch"
- "${FILESDIR}/${PN}-8.0.1-glfw-libdir.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local version
- if use abi6-compat; then
- version=6
- elif use abi7-compat; then
- version=7
- else
- die "Openvdb abi version is not compatible"
- fi
-
- local mycmakeargs=(
- -DCHOST="${CHOST}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_EXR=ON
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- -DPython_LIBRARY="$(python_get_library_path)"
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild b/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild
deleted file mode 100644
index 2e3f87c1aa79..000000000000
--- a/media-gfx/openvdb/openvdb-8.0.1-r4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi6-compat abi7-compat +abi8-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- numpy? ( python )
- ^^ ( abi6-compat abi7-compat abi8-compat )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Check if newer releases work with newer TBB, bug #820788
-RDEPEND="
- <dev-cpp/tbb-2021.4.0:=
- dev-libs/boost:=
- dev-libs/c-blosc:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- media-libs/glfw
- media-libs/glu
- media-libs/ilmbase:=
- media-libs/openexr:0=
- sys-libs/zlib:=
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
- ')
- )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-util/cmake-3.16.2-r1
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( dev-util/cppunit dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
- "${FILESDIR}/${P}-glfw-libdir.patch"
- "${FILESDIR}/${P}-add-consistency-for-NumPy-find_package-call.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local version
- if use abi6-compat; then
- version=6
- elif use abi7-compat; then
- version=7
- elif use abi8-compat; then
- version=8
- else
- die "Openvdb abi version is not compatible"
- fi
-
- local mycmakeargs=(
- -DCHOST="${CHOST}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_EXR=ON
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
- -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-8.1.0.ebuild b/media-gfx/openvdb/openvdb-8.1.0.ebuild
deleted file mode 100644
index 5042d7339314..000000000000
--- a/media-gfx/openvdb/openvdb-8.1.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test utils zlib abi6-compat abi7-compat +abi8-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- numpy? ( python )
- ^^ ( abi6-compat abi7-compat abi8-compat )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-# Check if newer releases work with newer TBB, bug #820788
-RDEPEND="
- <dev-cpp/tbb-2021.4.0:=
- dev-libs/boost:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- media-libs/glfw
- media-libs/glu
- media-libs/ilmbase:=
- media-libs/openexr:0=
- sys-libs/zlib:=
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- blosc? ( dev-libs/c-blosc:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
- ')
- )
- zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-util/cmake-3.16.2-r1
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( dev-util/cppunit dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
- "${FILESDIR}/${PN}-8.0.1-add-consistency-for-NumPy-find_package-call.patch"
- "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local version
- if use abi6-compat; then
- version=6
- elif use abi7-compat; then
- version=7
- elif use abi8-compat; then
- version=8
- else
- die "OpenVDB ABI version is not compatible"
- fi
-
- local mycmakeargs=(
- -DCHOST="${CHOST}"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_BUILD_VDB_LOD=$(usex utils)
- -DOPENVDB_BUILD_VDB_RENDER=$(usex utils)
- -DOPENVDB_BUILD_VDB_VIEW=$(usex utils)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_BLOSC=$(usex blosc)
- -DUSE_ZLIB=$(usex zlib)
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- # Off for now until 9.0.0 for OpenEXR 3 support
- -DUSE_IMATH_HALF=OFF
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DUSE_NUMPY=$(usex numpy)
- -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild b/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
deleted file mode 100644
index c77a66b4a5b2..000000000000
--- a/media-gfx/openvdb/openvdb-8.2.0-r3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 +blosc doc numpy python static-libs test utils zlib abi6-compat abi7-compat +abi8-compat"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- numpy? ( python )
- ^^ ( abi6-compat abi7-compat abi8-compat )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-RDEPEND="
- dev-cpp/tbb:=
- dev-libs/boost:=
- dev-libs/jemalloc:=
- dev-libs/log4cplus:=
- media-libs/glfw
- media-libs/glu
- sys-libs/zlib:=
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXrandr
- blosc? ( dev-libs/c-blosc:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[numpy?,python?,${PYTHON_USEDEP}]
- numpy? ( dev-python/numpy[${PYTHON_USEDEP}] )
- ')
- )
- utils? (
- media-libs/ilmbase:=
- media-libs/openexr:=
- )
- zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
- >=dev-util/cmake-3.16.2-r1
- virtual/pkgconfig
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
- test? ( dev-util/cppunit dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-7.1.0-0001-Fix-multilib-header-source.patch"
- "${FILESDIR}/${PN}-8.0.1-add-consistency-for-NumPy-find_package-call.patch"
- "${FILESDIR}/${PN}-8.1.0-glfw-libdir.patch"
- "${FILESDIR}/${PN}-8.2.0-fix-finding-ilmbase-if-imath-and-ilmbase-are-installed.patch"
- "${FILESDIR}/${PN}-8.2.0-unconditionally-search-Python-interpreter.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local myprefix="${EPREFIX}/usr/"
-
- local version
- if use abi6-compat; then
- version=6
- elif use abi7-compat; then
- version=7
- elif use abi8-compat; then
- version=8
- else
- die "OpenVDB ABI version is not compatible"
- fi
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/"
- -DOPENVDB_ABI_VERSION_NUMBER="${version}"
- -DOPENVDB_BUILD_BINARIES=$(usex utils)
- -DOPENVDB_BUILD_DOCS=$(usex doc)
- -DOPENVDB_BUILD_UNITTESTS=$(usex test)
- -DOPENVDB_CORE_SHARED=ON
- -DOPENVDB_CORE_STATIC=$(usex static-libs)
- -DOPENVDB_ENABLE_RPATH=OFF
- -DUSE_BLOSC=$(usex blosc)
- -DUSE_ZLIB=$(usex zlib)
- -DUSE_CCACHE=OFF
- -DUSE_COLORED_OUTPUT=ON
- -DUSE_IMATH_HALF=OFF
- -DUSE_LOG4CPLUS=ON
- )
-
- if use python; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_PYTHON_MODULE=ON
- -DOPENVDB_BUILD_PYTHON_UNITTESTS=$(usex test)
- -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)"
- -DPython_EXECUTABLE="${PYTHON}"
- -DPython_INCLUDE_DIR="$(python_get_includedir)"
- -DUSE_NUMPY=$(usex numpy)
- )
- fi
-
- if use utils; then
- mycmakeargs+=(
- -DOPENVDB_BUILD_VDB_LOD=ON
- -DOPENVDB_BUILD_VDB_RENDER=ON
- -DOPENVDB_BUILD_VDB_VIEW=ON
- )
- fi
-
- if use cpu_flags_x86_avx; then
- mycmakeargs+=( -DOPENVDB_SIMD=AVX )
- elif use cpu_flags_x86_sse4_2; then
- mycmakeargs+=( -DOPENVDB_SIMD=SSE42 )
- fi
-
- cmake_src_configure
-}
diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest
index af0a6fad65d3..98020f5c4fcc 100644
--- a/media-gfx/xdot/Manifest
+++ b/media-gfx/xdot/Manifest
@@ -1,4 +1,6 @@
+AUX backport-2ace1a1-issue-92.patch 5161 BLAKE2B a2974216dd5bfb64a53033f1a587a8d05181e3b894c3f5bbece7f3ec40014d38ee9185b8fb500dab78668319e1c91a9b8213a326a2df3ba6b347698082ed854f SHA512 58129ae687b0a8d78c0deb189519dbe3dd8b55484b3b9a6455f2bb0f607fcc5c43992ca6c841eadc576af46fac9f9ba5fb42f14b089c8864e60588ee72189ccb
DIST xdot-1.2.tar.gz 136057 BLAKE2B 484a3513ec3d67dbc6e167f171e7f70977ba2472766f25aa7cc088235f99470bfac5fac67368ea53b633320752a928634840ff3dcccc6b96795d3b7c203db922 SHA512 b4d3b15114b982c7c38cc71c0602f6d1ba9874c7315c2b8c4a8a48bf7674e9b38bf19a0d4a2d319acc9a29cf8f177a651d4e213761e88b0b3cb26e95e8a92dda
+EBUILD xdot-1.2-r1.ebuild 1039 BLAKE2B 4015ceadbe0fcedeade4f994e8fc90c5639a49491128686ef0f98cae01529b146cddb37f02d815e54ef4cf95cbe9199a6a2a93f143e8e34add13758a081fc9b3 SHA512 9d21e6230c7894f2404f7f143d6f09e142d241763d78c349e47af2b41bbd2c08272a97738e7f4e840f1835cbde068cbf42b2bf21c3dbed99e953a9ad7ed75530
EBUILD xdot-1.2.ebuild 823 BLAKE2B 60d0ee6a4e0c5777eac2a713f1d2608ba27691fad256a46891223c7c77b90d53466ccc895ec6b6178abc408fdc951e3b662050695d73dc96c9cdec480dfb3a94 SHA512 ab8287df54a6a0ddc140e4ed2234ea151c3ac977440f364c9577f5b5b9c68234a2f61e9a26bd032910b145cdb5cdd0c902bfc2a0136223dea7f7ddfaf8de80e3
-EBUILD xdot-9999.ebuild 809 BLAKE2B b50239dfe4178177e415fcea894956b297c8c6f870f0c420e16bf78657b5f503bee68dcea78be40f790e03bbae2395f4b878cd0aa39b5312fca8afb159e51fff SHA512 ccb5ec7f3e405489fdc63c0ba15e8da1644ec7f73b60a2979d04c2283dd8d6d39fbb76e9f8606102e69bc58bc79b3317d57cb07f7f3ad77ee2fcc5362bee4b3b
+EBUILD xdot-9999.ebuild 966 BLAKE2B d8e39cf4c6e592a7adeaedff68cee76f5b7dc5de846508f7b26f7a8ea1b664c19bf6c1b6455e9013e1205f805db5b6ab61edbd42d3f256430bea01584f5e92d2 SHA512 1424ace30db00a6d1b3bea96305a8754d94ca3f589b9741f0c20c6215220cf666b1e5fcb8fb77a4eeb35e01497d2bba017996ab328d46b99ac0b17f159bdc924
MISC metadata.xml 399 BLAKE2B 06318ca9aa1bb3f53733542916d19d28c03133866e868aefeba88d7e6e1b7594a628488471fe7f6853e02402a14db8501e056f5df9ae1429c4eca66ab7b6a492 SHA512 16caf359c45841ae27bfdeee51c7fdd71d6282548773e6f519cbcbfe43f9fa39c65322a610d2b3d5cb4471129cfa3738e6ee66ff6b6e94b4263d918fd44ff30c
diff --git a/media-gfx/xdot/files/backport-2ace1a1-issue-92.patch b/media-gfx/xdot/files/backport-2ace1a1-issue-92.patch
new file mode 100644
index 000000000000..8cb76a43fe55
--- /dev/null
+++ b/media-gfx/xdot/files/backport-2ace1a1-issue-92.patch
@@ -0,0 +1,151 @@
+https://github.com/jrfonseca/xdot.py/issues/92
+https://bugs.gentoo.org/873490
+
+From 2ace1a12d78423d9e7af20fdb0bca34827010408 Mon Sep 17 00:00:00 2001
+From: Jose Fonseca <jose.r.fonseca@gmail.com>
+Date: Tue, 28 Sep 2021 13:19:49 +0100
+Subject: [PATCH] Handle xdot backslashes correctly.
+
+Irrespectively of graphviz version.
+
+Fixes https://github.com/jrfonseca/xdot.py/issues/92
+---
+ tests/issue_92_a.dot | 3 +++
+ tests/issue_92_b.dot | 3 +++
+ xdot/dot/parser.py | 26 +++++++++++++++++++++-----
+ xdot/ui/window.py | 11 ++++++++++-
+ 4 files changed, 37 insertions(+), 6 deletions(-)
+ create mode 100644 tests/issue_92_a.dot
+ create mode 100644 tests/issue_92_b.dot
+
+diff --git a/tests/issue_92_a.dot b/tests/issue_92_a.dot
+new file mode 100644
+index 0000000..ea486b0
+--- /dev/null
++++ b/tests/issue_92_a.dot
+@@ -0,0 +1,3 @@
++digraph {
++ 1 [label="a\\00"]
++}
+diff --git a/tests/issue_92_b.dot b/tests/issue_92_b.dot
+new file mode 100644
+index 0000000..ba90566
+--- /dev/null
++++ b/tests/issue_92_b.dot
+@@ -0,0 +1,3 @@
++digraph {
++ 1 [label="a\\b"]
++}
+diff --git a/xdot/dot/parser.py b/xdot/dot/parser.py
+index 4244e03..6578c23 100644
+--- a/xdot/dot/parser.py
++++ b/xdot/dot/parser.py
+@@ -14,8 +14,11 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #
+ import colorsys
++import re
+ import sys
+
++from distutils.version import LooseVersion
++
+ from .lexer import ParseError, DotLexer
+
+ from ..ui.colors import lookup_color
+@@ -85,7 +88,14 @@ class XDotAttrParser:
+ - http://www.graphviz.org/doc/info/output.html#d:xdot
+ """
+
+- def __init__(self, parser, buf):
++ def __init__(self, parser, buf, broken_backslashes):
++
++ # `\` should be escaped as `\\`, but older versions of graphviz xdot
++ # output failed to properly escape it. See also
++ # https://github.com/jrfonseca/xdot.py/issues/92
++ if not broken_backslashes:
++ buf = re.sub(br'\\(.)', br'\1', buf)
++
+ self.parser = parser
+ self.buf = buf
+ self.pos = 0
+@@ -427,10 +437,16 @@ class XDotParser(DotParser):
+
+ XDOTVERSION = '1.7'
+
+- def __init__(self, xdotcode):
++ def __init__(self, xdotcode, graphviz_version=None):
+ lexer = DotLexer(buf=xdotcode)
+ DotParser.__init__(self, lexer)
+
++ # https://github.com/jrfonseca/xdot.py/issues/92
++ self.broken_backslashes = False
++ if graphviz_version is not None and \
++ LooseVersion(graphviz_version) < LooseVersion("2.46.0"):
++ self.broken_backslashes = True
++
+ self.nodes = []
+ self.edges = []
+ self.shapes = []
+@@ -480,7 +496,7 @@ def handle_graph(self, attrs):
+
+ for attr in ("_draw_", "_ldraw_", "_hdraw_", "_tdraw_", "_hldraw_", "_tldraw_"):
+ if attr in attrs:
+- parser = XDotAttrParser(self, attrs[attr])
++ parser = XDotAttrParser(self, attrs[attr], self.broken_backslashes)
+ self.shapes.extend(parser.parse())
+
+ def handle_node(self, id, attrs):
+@@ -502,7 +518,7 @@ def handle_node(self, id, attrs):
+ shapes = []
+ for attr in ("_draw_", "_ldraw_"):
+ if attr in attrs:
+- parser = XDotAttrParser(self, attrs[attr])
++ parser = XDotAttrParser(self, attrs[attr], self.broken_backslashes)
+ shapes.extend(parser.parse())
+ try:
+ url = attrs['URL']
+@@ -525,7 +541,7 @@ def handle_edge(self, src_id, dst_id, attrs):
+ shapes = []
+ for attr in ("_draw_", "_ldraw_", "_hdraw_", "_tdraw_", "_hldraw_", "_tldraw_"):
+ if attr in attrs:
+- parser = XDotAttrParser(self, attrs[attr])
++ parser = XDotAttrParser(self, attrs[attr], self.broken_backslashes)
+ shapes.extend(parser.parse())
+ if shapes:
+ src = self.node_by_name[src_id]
+diff --git a/xdot/ui/window.py b/xdot/ui/window.py
+index 893bd1d..e27f000 100644
+--- a/xdot/ui/window.py
++++ b/xdot/ui/window.py
+@@ -56,6 +56,7 @@ class DotWidget(Gtk.DrawingArea):
+ }
+
+ filter = 'dot'
++ graphviz_version = None
+
+ def __init__(self):
+ Gtk.DrawingArea.__init__(self)
+@@ -100,6 +101,7 @@ def error_dialog(self, message):
+
+ def set_filter(self, filter):
+ self.filter = filter
++ self.graphviz_version = None
+
+ def run_filter(self, dotcode):
+ if not self.filter:
+@@ -153,7 +155,14 @@ def set_dotcode(self, dotcode, filename=None, center=True):
+
+ def set_xdotcode(self, xdotcode, center=True):
+ assert isinstance(xdotcode, bytes)
+- parser = XDotParser(xdotcode)
++ if self.graphviz_version is None:
++ stdout = subprocess.check_output([self.filter, '-V'], stderr=subprocess.STDOUT)
++ stdout = stdout.rstrip()
++ mo = re.match(br'^.* - .* version (?P<version>.*) \(.*\)$', stdout)
++ assert mo
++ self.graphviz_version = mo.group('version').decode('ascii')
++
++ parser = XDotParser(xdotcode, graphviz_version=self.graphviz_version)
+ self.graph = parser.parse()
+ self.zoom_image(self.zoom_ratio, center=center)
+
diff --git a/media-gfx/xdot/xdot-1.2-r1.ebuild b/media-gfx/xdot/xdot-1.2-r1.ebuild
new file mode 100644
index 000000000000..579a8e03216a
--- /dev/null
+++ b/media-gfx/xdot/xdot-1.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+MY_PN=xdot.py
+EGIT_REPO_URI="https://github.com/jrfonseca/${MY_PN}"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+ SRC_URI=""
+else
+ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86"
+ MY_P="${MY_PN}-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+inherit ${GIT_ECLASS} distutils-r1 virtualx
+
+DESCRIPTION="Interactive viewer for Graphviz dot files"
+HOMEPAGE="https://github.com/jrfonseca/xdot.py"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+PATCHES=( "${FILESDIR}/backport-2ace1a1-issue-92.patch" )
+
+DEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ media-gfx/graphviz
+ test? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}"
+
+run_test() {
+ cd tests && "${EPYTHON}" ../test.py *.dot graphs/*.gv
+ return "${?}"
+}
+
+python_test() {
+ virtx run_test
+}
diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild
index 646fd464d2bd..b0e3b6d5c63e 100644
--- a/media-gfx/xdot/xdot-9999.ebuild
+++ b/media-gfx/xdot/xdot-9999.ebuild
@@ -17,7 +17,7 @@ else
SRC_URI="https://github.com/jrfonseca/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
-inherit ${GIT_ECLASS} distutils-r1
+inherit ${GIT_ECLASS} distutils-r1 virtualx
DESCRIPTION="Interactive viewer for Graphviz dot files"
HOMEPAGE="https://github.com/jrfonseca/xdot.py"
@@ -30,5 +30,15 @@ DEPEND="
dev-python/pycairo[${PYTHON_USEDEP}]
dev-python/pygobject:3[${PYTHON_USEDEP}]
media-gfx/graphviz
+ test? ( x11-libs/gtk+:3 )
"
RDEPEND="${DEPEND}"
+
+run_test() {
+ cd tests && "${EPYTHON}" ../test.py *.dot graphs/*.gv
+ return "${?}"
+}
+
+python_test() {
+ virtx run_test
+}
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 648214bec78d..3e8833262807 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,8 +1,5 @@
-AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
AUX yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch 1541 BLAKE2B ea13c623fe025440481bfa8a68085d4bd0a46decb5dff9c6ce743ebc0dd30bcd8f3333fc45e041db19e420bc86ce1d1965a084a788882c7d68f1423c884ff8fe SHA512 861683353000e0c25991b64ab70af3839641d6e01f48756798acd5903124890d646fe4f9ef54f6c22c4d857994f2d0adc415dcd83534fb85300e6dbc5128631d
AUX yafaray-3.5.1-add-missing-limits-header.patch 556 BLAKE2B ef63f5deba7c633917030b34ddf2c7a48bbcf412d99f48a1be89761c6dd19a67082560b2d0bb7dc440b7d0e9db73d708068eec7566ebc4038098faaf31aa269f SHA512 89ff060607e69a5ca0d2fb3ef2651e22e4a2ff5adae7351df2195267f2236792e7feae9a761882f3debc04bff4c83760a6704598643fb0a60ba37af698752032
DIST yafaray-3.5.1.tar.gz 1136455 BLAKE2B 6002f3b96f3626b83f57015eaf3ddd53dcb6b6fd863277912f7fec06e4f176ec81dc48b889a068e6259edf17727dd04d4b1bbc51b571bfe6aad5e48148201e2e SHA512 3ead4d8becd2d524aa5bb4bbde4b9d98b56f8a38d872e7aa49ba19081094406336def02e9bf1503e424ca8e6cade0db4b042214cea8f9345bd4fc542c9346dbe
-DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
-EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
-EBUILD yafaray-3.5.1-r1.ebuild 3164 BLAKE2B 3910145cea120b6375363b9f9e03aec7ce50f96f3817a91b0165a956fd23ef2de7eaba3c2c7b93e4abbd7936c1285517527adb02d89699faa78a42da1f0311be SHA512 0c79329142ee3d14ceda69eca5af243ff4f9c5c0d3e9198ef6e7aaa436fa64eac8ce35e1cc79bd370447b73d1d9f12c4d6a02295f768eb39c27c708f4064f681
+EBUILD yafaray-3.5.1-r2.ebuild 3129 BLAKE2B 43d0702023ac71cd60caaa7257756ba91308885ecc62a33550f708427c8b617eaef0eabc39e6bc1366fce5c96c1c66a88fa12b5ba0c916531ed8e4d314a3aae0 SHA512 a0688b31d8110f17fe843ec0d0837600a897aeef46bed71f838fa826f1bf9324b7bfe8b00c4e64cd782d1d23366949b72a8df1c802a194e831f6d312daa6ed38
MISC metadata.xml 1090 BLAKE2B 7ce4d1b50e06300184c5cd969e0ba20c3c4ef63471d81646392411528599c429747a36eb5505a2f718867853c9ecd505a04d870ac0b29456f031dc32713606d3 SHA512 f1e56401173a07a15cd5fbce265d47ad09a8745300abffe77310c3eff8d8e18e3bfe2003750863c238e7f25c3e6009197c2fdf6e788c0767e1c4fffdc74ddea4
diff --git a/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch b/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch
deleted file mode 100644
index 90b2786c3c54..000000000000
--- a/media-gfx/yafaray/files/yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2f77edf05ed02955dc08821f322a529063dbfa28 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sun, 19 Apr 2020 15:39:45 +0200
-Subject: [PATCH] Respect user pre-defined CXXFLAGS
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 047456f..6733b7d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -224,7 +224,7 @@ if(NOT WIN32)
- endif(NOT YAF_BINDINGS_RUBY_DIR)
-
- # build flags
-- set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE)
-
- if(USER_RELEASE_OPTIMIZATION_FLAGS)
- set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
-@@ -263,7 +263,7 @@ else(NOT WIN32)
-
- # build flags
- if(MINGW)
-- set(CMAKE_CXX_FLAGS "-Wall" CACHE STRING "Default compiler flags" FORCE)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" CACHE STRING "Default compiler flags" FORCE)
-
- if(USER_RELEASE_OPTIMIZATION_FLAGS)
- set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
---
-2.26.1
-
diff --git a/media-gfx/yafaray/yafaray-3.4.1.ebuild b/media-gfx/yafaray/yafaray-3.4.1.ebuild
deleted file mode 100644
index 4efd96180ca1..000000000000
--- a/media-gfx/yafaray/yafaray-3.4.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-# doesn't build with ninja when qt5 and python USE flags are both enabled
-CMAKE_MAKEFILE_GENERATOR="emake"
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="A free open-source montecarlo raytracing engine"
-HOMEPAGE="http://www.yafaray.org"
-SRC_URI="https://github.com/YafaRay/Core/archive/v${PV}.tar.gz -> ${PN}-core-${PV}.tar.gz"
-
-S="${WORKDIR}/Core-${PV}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fastmath +fasttrig jpeg opencv openexr png +python qt5 tiff truetype"
-RESTRICT="test"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Note: according to upstream, the blender plugin doesn't work with blender-2.8 (yet).
-RDEPEND="
- dev-libs/boost:=[nls]
- dev-libs/libxml2:2
- sys-libs/zlib
- jpeg? ( virtual/jpeg:0 )
- opencv? ( >=media-libs/opencv-3.1.0:= )
- openexr? ( >=media-libs/openexr-2.2.0:= )
- png? ( media-libs/libpng:0= )
- python? ( ${PYTHON_DEPS} )
- qt5? ( dev-qt/qtwidgets:5 )
- tiff? ( media-libs/tiff:0 )
- truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="python? ( dev-lang/swig )"
-
-PATCHES=(
- "${FILESDIR}/${P}-0001-Respect-user-pre-defined-CXXFLAGS.patch"
-)
-
-DOCS=( AUTHORS CHANGELOG CODING INSTALL README )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- append-flags -pthread
- append-ldflags -pthread
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- # enabling BLENDER_ADDON doesn't build anything, but set's some wierd
- # installation paths, so keep it off and install the files manually.
- -DBLENDER_ADDON=OFF
- -DCMAKE_SKIP_RPATH=ON # NULL DT_RUNPATH security problem
- -DFAST_MATH=$(usex fastmath)
- -DFAST_TRIG=$(usex fasttrig)
- -DWITH_Freetype=$(usex truetype)
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_OpenCV=$(usex opencv)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_PNG=$(usex png)
- -DWITH_QT=$(usex qt5)
- -DWITH_TIFF=$(usex tiff)
- -DWITH_XML_LOADER=ON # internal
- -DWITH_YAF_PY_BINDINGS=$(usex python)
- -DWITH_YAF_RUBY_BINDINGS=OFF
- -DYAF_LIB_DIR=$(get_libdir)
- )
-
- if use python; then
- mycmakeargs+=( -DYAF_PY_VERSION=${EPYTHON#python} )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use python; then
- python_domodule "${BUILD_DIR}/src/bindings/yafaray_v3_interface.py"
- mv "${ED}"/usr/$(get_libdir)/_yafaray_v3_interface.so "${ED}"/$(python_get_sitedir)/ || die
- rm -v "${ED}"/usr/$(get_libdir)/yafaray_v3_interface.py || die
-
- if use qt5; then
- python_domodule "${BUILD_DIR}/src/bindings/yafqt.py"
- mv "${ED}"/usr/$(get_libdir)/_yafqt.so "${ED}"/$(python_get_sitedir)/ || die
- rm -v "${ED}"/usr/$(get_libdir)/yafqt.py || die
- fi
- fi
-
- rm -rv "${ED}"/usr/share/doc/${PN} || die
-}
-
-pkg_postinst() {
- einfo "To confirm your installation is working as expected, run"
- einfo "yafaray-xml with /usr/share/yafaray/tests/test01/test01.xml"
- einfo "as an input file, then compare the result to"
- einfo "'/usr/share/yafaray/tests/test01/test01 - expected render result.png'"
-}
diff --git a/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild b/media-gfx/yafaray/yafaray-3.5.1-r2.ebuild
index 9053e381aba3..1da10dced60a 100644
--- a/media-gfx/yafaray/yafaray-3.5.1-r1.ebuild
+++ b/media-gfx/yafaray/yafaray-3.5.1-r2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
# doesn't build with ninja when qt5 and python USE flags are both enabled
CMAKE_MAKEFILE_GENERATOR="emake"
@@ -19,7 +19,7 @@ S="${WORKDIR}/libYafaRay-${PV}"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+fastmath +fasttrig jpeg opencv openexr png python qt5 tiff truetype"
+IUSE="+fastmath +fasttrig jpeg opencv png python qt5 tiff truetype"
RESTRICT="test"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -28,9 +28,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
dev-libs/libxml2:2
sys-libs/zlib
- jpeg? ( virtual/jpeg )
+ jpeg? ( media-libs/libjpeg-turbo:= )
opencv? ( media-libs/opencv:= )
- openexr? ( <media-libs/openexr-3.0.0:0= )
png? ( media-libs/libpng:= )
python? ( ${PYTHON_DEPS} )
qt5? ( dev-qt/qtwidgets:5 )
@@ -73,7 +72,7 @@ src_configure() {
-DWITH_Freetype=$(usex truetype)
-DWITH_JPEG=$(usex jpeg)
-DWITH_OpenCV=$(usex opencv)
- -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_OpenEXR=OFF # bug #877865
-DWITH_PNG=$(usex png)
-DWITH_QT=$(usex qt5)
-DWITH_TIFF=$(usex tiff)