From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- media-gfx/Manifest.gz | Bin 38661 -> 38649 bytes media-gfx/album/Manifest | 2 +- media-gfx/album/album-4.15-r1.ebuild | 4 +- media-gfx/alembic/Manifest | 2 +- media-gfx/alembic/alembic-1.7.16.ebuild | 2 +- media-gfx/asymptote/Manifest | 17 +- media-gfx/asymptote/asymptote-2.65.ebuild | 211 ------------- media-gfx/asymptote/asymptote-2.67.ebuild | 217 ------------- media-gfx/asymptote/asymptote-2.68.ebuild | 2 +- media-gfx/asymptote/asymptote-2.69.ebuild | 205 +++++++++++++ media-gfx/asymptote/files/asy-ftd.vim | 2 - .../asymptote/files/asymptote-2.65-info.patch | 13 - .../asymptote/files/asymptote-2.65-xdg-utils.patch | 22 -- .../asymptote/files/asymptote-2.67-info.patch | 13 - .../asymptote/files/asymptote-2.67-xdg-utils.patch | 23 -- .../asymptote/files/asymptote-2.69-info.patch | 13 + .../asymptote/files/asymptote-2.69-xdg-utils.patch | 23 ++ media-gfx/asymptote/metadata.xml | 2 + media-gfx/autopano-sift-C/Manifest | 3 +- .../autopano-sift-C/autopano-sift-C-2.5.1.ebuild | 11 +- .../autopano-sift-C-2.5.1-include-order.patch | 24 ++ media-gfx/blender/Manifest | 8 +- media-gfx/blender/blender-2.83.12.ebuild | 328 ++++++++++++++++++++ media-gfx/blender/blender-2.91.0.ebuild | 4 +- media-gfx/blender/blender-2.91.2.ebuild | 334 +++++++++++++++++++++ media-gfx/blender/metadata.xml | 3 - media-gfx/converseen/Manifest | 8 +- media-gfx/converseen/converseen-0.9.6.2.ebuild | 33 -- media-gfx/converseen/converseen-0.9.9.0.ebuild | 38 +++ .../files/converseen-0.9.6.2-gnuinstalldirs.patch | 64 ---- .../files/converseen-0.9.9.0-appdata-path.patch | 17 ++ .../files/converseen-0.9.9.0-gnuinstalldirs.patch | 68 +++++ .../files/converseen-0.9.9.0-no-update.patch | 20 ++ media-gfx/gif2png/Manifest | 2 +- media-gfx/gif2png/gif2png-2.5.14.ebuild | 8 +- media-gfx/gimp/Manifest | 8 +- media-gfx/gimp/gimp-2.10.20-r3.ebuild | 214 ------------- media-gfx/gimp/gimp-2.10.22-r1.ebuild | 212 ------------- media-gfx/gimp/gimp-2.10.22-r2.ebuild | 2 +- media-gfx/gimp/gimp-2.99.2-r100.ebuild | 258 ---------------- media-gfx/gimp/gimp-2.99.2.ebuild | 250 --------------- media-gfx/gnofract4d/Manifest | 2 +- .../gnofract4d/gnofract4d-4.3_p20201029.ebuild | 4 +- media-gfx/gthumb/Manifest | 4 +- media-gfx/gthumb/gthumb-3.10.0.ebuild | 89 ------ media-gfx/gthumb/gthumb-3.10.2.ebuild | 2 +- media-gfx/hugin/Manifest | 4 +- media-gfx/hugin/hugin-2019.2.0.ebuild | 105 ------- media-gfx/hugin/hugin-2020.0.0-r1.ebuild | 2 +- media-gfx/imagemagick/Manifest | 6 + media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild | 254 ++++++++++++++++ media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild | 268 +++++++++++++++++ media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild | 268 +++++++++++++++++ media-gfx/krita/Manifest | 5 +- media-gfx/krita/files/krita-4.4.2-quazip1.patch | 36 +++ media-gfx/krita/krita-4.4.1.ebuild | 127 -------- media-gfx/krita/krita-4.4.2.ebuild | 5 +- media-gfx/libimagequant/Manifest | 2 +- .../libimagequant/libimagequant-2.12.3.ebuild | 4 +- media-gfx/nomacs/Manifest | 3 +- .../nomacs/files/nomacs-3.16.224-quazip1.patch | 127 ++++++++ media-gfx/nomacs/nomacs-3.16.224-r1.ebuild | 84 ------ media-gfx/nomacs/nomacs-3.16.224-r2.ebuild | 86 ++++++ media-gfx/openscad/Manifest | 3 +- media-gfx/openscad/openscad-2019.05-r3.ebuild | 108 ------- media-gfx/openscad/openscad-2019.05-r4.ebuild | 2 +- media-gfx/openvdb/Manifest | 2 +- media-gfx/openvdb/openvdb-7.0.0-r1.ebuild | 4 +- media-gfx/pngcheck/Manifest | 2 - media-gfx/pngcheck/pngcheck-2.3.0.ebuild | 30 -- media-gfx/transfig/Manifest | 2 +- media-gfx/transfig/transfig-3.2.5e-r1.ebuild | 2 +- media-gfx/xdot/Manifest | 4 +- media-gfx/xdot/xdot-1.2.ebuild | 1 + media-gfx/xdot/xdot-9999.ebuild | 3 +- media-gfx/zbar/Manifest | 6 +- media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch | 120 ++++++++ .../files/zbar-0.23.1_musl_include_locale_h.patch | 23 ++ media-gfx/zbar/zbar-0.23-r1.ebuild | 1 + media-gfx/zbar/zbar-0.23.1.ebuild | 7 +- 80 files changed, 2341 insertions(+), 2156 deletions(-) delete mode 100644 media-gfx/asymptote/asymptote-2.65.ebuild delete mode 100644 media-gfx/asymptote/asymptote-2.67.ebuild create mode 100644 media-gfx/asymptote/asymptote-2.69.ebuild delete mode 100644 media-gfx/asymptote/files/asy-ftd.vim delete mode 100644 media-gfx/asymptote/files/asymptote-2.65-info.patch delete mode 100644 media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch delete mode 100644 media-gfx/asymptote/files/asymptote-2.67-info.patch delete mode 100644 media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch create mode 100644 media-gfx/asymptote/files/asymptote-2.69-info.patch create mode 100644 media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch create mode 100644 media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch create mode 100644 media-gfx/blender/blender-2.83.12.ebuild create mode 100644 media-gfx/blender/blender-2.91.2.ebuild delete mode 100644 media-gfx/converseen/converseen-0.9.6.2.ebuild create mode 100644 media-gfx/converseen/converseen-0.9.9.0.ebuild delete mode 100644 media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch create mode 100644 media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch create mode 100644 media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch create mode 100644 media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch delete mode 100644 media-gfx/gimp/gimp-2.10.20-r3.ebuild delete mode 100644 media-gfx/gimp/gimp-2.10.22-r1.ebuild delete mode 100644 media-gfx/gimp/gimp-2.99.2-r100.ebuild delete mode 100644 media-gfx/gimp/gimp-2.99.2.ebuild delete mode 100644 media-gfx/gthumb/gthumb-3.10.0.ebuild delete mode 100644 media-gfx/hugin/hugin-2019.2.0.ebuild create mode 100644 media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild create mode 100644 media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild create mode 100644 media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild create mode 100644 media-gfx/krita/files/krita-4.4.2-quazip1.patch delete mode 100644 media-gfx/krita/krita-4.4.1.ebuild create mode 100644 media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch delete mode 100644 media-gfx/nomacs/nomacs-3.16.224-r1.ebuild create mode 100644 media-gfx/nomacs/nomacs-3.16.224-r2.ebuild delete mode 100644 media-gfx/openscad/openscad-2019.05-r3.ebuild delete mode 100644 media-gfx/pngcheck/pngcheck-2.3.0.ebuild create mode 100644 media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch create mode 100644 media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 904a3c0c62db..df476ecd77c2 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/album/Manifest b/media-gfx/album/Manifest index e6e15d4265e9..380e636eb624 100644 --- a/media-gfx/album/Manifest +++ b/media-gfx/album/Manifest @@ -2,5 +2,5 @@ DIST album-4.13.tar.gz 667760 BLAKE2B fa4bd75147d708c18f183787fb62d55a068956204d DIST album-4.15.tar.gz 651380 BLAKE2B da6728f65586b242297bb7c8d8ae676de636177539e5c1337e05cdb3f60e39b4135294c5709a92ae670821b1e5cb39f22567e2188c18671681db52f667789c6d SHA512 3e075efd81c829817f42fbe2163269581aa6ac972ec8f14e04237598e08722cdda78cc702e8628a6f77e6c2181ab7bc438f56975f5ed883f5ed9c53ca13edf9a DIST data-4.05.tar.gz 6468036 BLAKE2B 3e11911dabcf024934653f5fb5c3c3b65bd2ad5e6607c67ee1dade392540bb0b7c90de521effa5d72d2f40dc6c02016e23d373f714a3b62c15af53ebb4d438d3 SHA512 a7c577df6d10dc2db53fa6d469d2cf9c5115de99df47e79f31ecc0b009bd12e654e4ca7b9e6e78abe90a8a87d5f52ca9946a2d632e3f219d9bcb5ab7838ce42e EBUILD album-4.13-r2.ebuild 903 BLAKE2B 22e870b231280d06e24bc6912df99a6d752b55f787d7f15e7574a8a2714057a8ba024f4babc7ffd854e6e8585080964599e3e7907980ca421a7ccef383c108aa SHA512 d98825eb26e99da51b43405a9886595c71aa1a6f2ff9701782a931b75ab914127aa2736a17e61d0206b1f3ab9c06154a54fc2eee6b2556d7f6e6482ad13c9e02 -EBUILD album-4.15-r1.ebuild 946 BLAKE2B ef25e0ec0a61d44d3b28a4831bbf45d9dac260020468dabfed2ae24395ea8dac570d4203c9abab48a2145069a4d3e22ee06a7d0b3020c630fd3a3d0317696ea7 SHA512 4975be05ca1d2ca7bda75acd05a4150910eeb8c99f8499019a5fe0e24c4f30dfb1d9a67c1a9e6ca1dd9e2820f4463a0d5efb1eab3122a3c2d356a2041d43d8c0 +EBUILD album-4.15-r1.ebuild 944 BLAKE2B 753a055d94e402574b46fcd854ca31035041268e18ed51dd1db6d51c88f33dab97e05cc78e3c968f7ea198e42fba5a0553564cfd59360ec622727fa0f1932ab2 SHA512 7f002d8755a262be08180c07a659b0898f261fbada65fd75ed04fec575d66d57332745cd8d2434b8a215ebab50690644a26086302bb77105e596d03d525ca266 MISC metadata.xml 336 BLAKE2B 837ab4247c02a88070c8bedd8b3a17666672f15d58c0859571c8d5287dd139c87a00c9cb8443961403a70d41456fbc6bbc6f8c4ed519e8ea7a27528337626377 SHA512 57056eb7f228138441d468ebf9ae672dee62f258c33fde97dd6cafea4b9deadb418a011d4222bf75ff8d6953d070a5096a0981c0476c5302566ccd6e643bea0a diff --git a/media-gfx/album/album-4.15-r1.ebuild b/media-gfx/album/album-4.15-r1.ebuild index 283dda684e5f..c62b27853d48 100644 --- a/media-gfx/album/album-4.15-r1.ebuild +++ b/media-gfx/album/album-4.15-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -10,7 +10,7 @@ SRC_URI="https://marginalhacks.com/bin/album.versions/${P}.tar.gz LICENSE="marginalhacks" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc ~ppc64 x86" IUSE="doc ffmpeg plugins themes" DEPEND="" diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest index f82731c1f2d5..962a61746d12 100644 --- a/media-gfx/alembic/Manifest +++ b/media-gfx/alembic/Manifest @@ -1,4 +1,4 @@ AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2 DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1 -EBUILD alembic-1.7.16.ebuild 1240 BLAKE2B 5179e8f1e56d2bc788684e50adf4d8229246cd9a30684a841f913c69ab966edf6a5a8603678c8aa6492101e4c4a548b7178937fbd12224ca0fdbd54756ad740a SHA512 c6778b410482a1b3c789d5ab4f55b240c0f3c07d42da568488ba341f3564e37549616c05f6ce49aef8b9cf6f377ba6b884c84e33c4652adb929c3787f05c863e +EBUILD alembic-1.7.16.ebuild 1245 BLAKE2B dec813d4d26e5081808847f46ddbe4a3d3081b61022132830cf58e9571e50df2390ac39b252da76cda9c55d8040e5a006d012c643d3b5cc1d3728fc06ea3400a SHA512 b41804f85516492347321bc4cb5ac1b885cb9c2acda074bafb43e3b5a24b42414e3cdf3850cf3e3723ddbdbe0e228ea5f4ae03ced0a31cbe37af14ee0137a760 MISC metadata.xml 865 BLAKE2B a70a3ad887cc4a8247ac1c275c6a3dfd8db13371473c7f5548d629983ac521b53df0fb0fccebeb6505ef424f5c6080682552bbf825b8b2457731e91ad223b5ed SHA512 be0126102a7a6321349b5a680ba600dbef3f8bd757fcf35518672c39525633c3862bf4d795dddbf5d2ffbbc4ae639e20162656a482e916a808ff5af970e7aaaa diff --git a/media-gfx/alembic/alembic-1.7.16.ebuild b/media-gfx/alembic/alembic-1.7.16.ebuild index 1fde48d28344..ed542a1b220c 100644 --- a/media-gfx/alembic/alembic-1.7.16.ebuild +++ b/media-gfx/alembic/alembic-1.7.16.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~arm ~x86" IUSE="hdf5 test zlib" RESTRICT="!test? ( test )" diff --git a/media-gfx/asymptote/Manifest b/media-gfx/asymptote/Manifest index 04caba11bc68..444ebb8a561b 100644 --- a/media-gfx/asymptote/Manifest +++ b/media-gfx/asymptote/Manifest @@ -1,15 +1,10 @@ AUX 64asymptote-gentoo.el 337 BLAKE2B 56b028184573dd8db6babd90ae45838b9788671134d625df5960744b71b377db3cacf1dd4fc78d9800ffdf4e83a2413b7e87680ab0fcf45c31ecad9dc538388a SHA512 c8c74d5464f500e9bc3ca2fd89065e4f68a834c1b82a444820efd70abf9d2bd7c52ecbecd7ea5fad916259512acf4aedf8aed803a707733121211e59ef300c86 -AUX asy-ftd.vim 60 BLAKE2B 2ef690e6c1906378872aff97ed956b0c8fd1cf2e492787edd3bbd928d50724eec7b5b65f2b1b70c83e520b849c1cfe1539dcc7aabb0f8ba38b448ef58f36b802 SHA512 f4b62341f1482386d3e402f9d70a0f6b4c103a412a63dd8947aa45a5d43f12970902615b6c13e8cd8123f1cd44bf72e4204118d3bcfa7969fce078924bf150fd -AUX asymptote-2.65-info.patch 436 BLAKE2B 0ddf2454a1ad2370c153d74d8fe4b8f36c2f702d6f732608097865885cb71681e1564e2a25b107bb0d3ff5bc0db746a86f58be49179d6b825459fce02b51b88e SHA512 77e47570629ba0370e43f0e872feb58739958ba939d29edb8411681cf638a00866a892a3dcb9a41de82f463c8e4e21fa1a7e76003075f7d78d938ab38ca636e9 -AUX asymptote-2.65-xdg-utils.patch 754 BLAKE2B 6697eabd3cded5ac11c4802805e1c55a05d41ad35fa46d57ea0534d85a2d34d6fabf1b119d94b83ad8387e9de4537d933f25c24fbe2e376eba4bc02925f2a2fc SHA512 85d85f15d8ebeb3d272d1e619ec7a97cac71b673c03a9811c1e051ef6c49ba41399409eb26b24523145eb758c353233dc50d8b105979723d903c9da3bcbc4d52 -AUX asymptote-2.67-info.patch 436 BLAKE2B 2ec0525ed1695f55bb25d6d5fdbdbf8d77eb85385ab13e5c292b6937fe1e60c51976101b5e1aa0c4036504a7a7b9133aab294220c92f7412fea9e62838c6d0a2 SHA512 d4ea5c8d914b09434ef92bc66e4847c40b82bd8c58581f7d5b305ae759e6e01082dcc31a615081bf77a09e630b5a27f245c2b60b056467000c1237c73939a207 -AUX asymptote-2.67-xdg-utils.patch 791 BLAKE2B 90e37b056462ef70ee34e8d1503ebd194c16f80e62987de776cc40bb0e6efda5a6c8d5e53f85842aa2554f4814423a3ac0bcebf4767996c004cdffa652bc1ecc SHA512 9cb5b2eaf19d3805167bba763333b1ac804d1ef426a59e41a19aa6213a35c5c2088d27fd9f22caf2b36cd6405bb84516e6d1a4de5d6fc5afb57337625e15b010 AUX asymptote-2.68-info.patch 436 BLAKE2B 2ec0525ed1695f55bb25d6d5fdbdbf8d77eb85385ab13e5c292b6937fe1e60c51976101b5e1aa0c4036504a7a7b9133aab294220c92f7412fea9e62838c6d0a2 SHA512 d4ea5c8d914b09434ef92bc66e4847c40b82bd8c58581f7d5b305ae759e6e01082dcc31a615081bf77a09e630b5a27f245c2b60b056467000c1237c73939a207 AUX asymptote-2.68-xdg-utils.patch 791 BLAKE2B 90e37b056462ef70ee34e8d1503ebd194c16f80e62987de776cc40bb0e6efda5a6c8d5e53f85842aa2554f4814423a3ac0bcebf4767996c004cdffa652bc1ecc SHA512 9cb5b2eaf19d3805167bba763333b1ac804d1ef426a59e41a19aa6213a35c5c2088d27fd9f22caf2b36cd6405bb84516e6d1a4de5d6fc5afb57337625e15b010 -DIST asymptote-2.65.src.tgz 4640419 BLAKE2B a508532b9697a0744d48f8109d5b04ca71eb1ee7a08f15eccd2b95d63c16c980621ef03d01a03917a767c774f14a239a13f8fe50ad98b154b092f710917af1ad SHA512 c6879689192c1646a318b389de222accc55c8d5e9df17fab3c88c37f627d2cff8133cdefe9e6dec2784cf72edf261e557ad83f7fac6e67fd49c483e9d8971026 -DIST asymptote-2.67.src.tgz 4668696 BLAKE2B 30be754a0e5869caad4d605f162dffe688d2dc09a0163a8c37d15fd9d6dd05652b7b0b2710ab31edaa8f4b36484df256d032f8826f3547e755eb90e5dbb179ec SHA512 5854ce51bc7a3d330eeb0887376645c3d292a368b06d01ec84c15ee5beee90ae429abfee1bff5025bdfb51edfa7f66e535c1187f66440df0c6626c79e3de6210 +AUX asymptote-2.69-info.patch 436 BLAKE2B cf8510e1f0135eb1e16e0e3913572418761a6eec863efff59c29d84a0f5f1b863febdb965120e1661bca743cf5d0d6e752a929cbe197ec7ae8fca162eb47ade1 SHA512 5a7c19d64609ed8c287a598b57331a318fbc47aac8770d0a9e1451b3b4f4f715a4fc30b8dc7238fd3498ca10ab4fcf2bf6373cc2e576c11d5d8eeaeadf9324c5 +AUX asymptote-2.69-xdg-utils.patch 791 BLAKE2B 126fbc6a5b253e536c6daf479d5b422b52e51d874504f2b586df647ecf940f730b6564cab8c5bf5e2fbff1e5eee8b84dd882f312e2492afa0ae6490d401ee7fd SHA512 003dd1867fb4d44d9e9dd414e908adda6f3802d44a614732e28df415c6591aaa4cb053dd7848c857c7b9cc3ae253cf3cc51699242e3d5629395070d29da226da DIST asymptote-2.68.src.tgz 4672007 BLAKE2B 96c1a99815cf04180ea2fe01528615390faf8d1e5853d4e2e5f4fcdf48f0ec7e774ab0facdb86ad427e6ac11f5ce684902997f7d1e4855460ad450f6d6c64cfd SHA512 20aa3ae5116b93f266020a1d45178d7120cf39980634108b86a0bc8a4202e28b2cf0a1ac6fa5e921506db150e9077a1e3d7b8ad04869bc9bd22bae447f45fd46 -EBUILD asymptote-2.65.ebuild 4616 BLAKE2B 95ce8fb34a5ced69cdb7a09d5004af719d1e66834ce5d31d3325dd1f6920412f06a97cae1f9d5f0db47463b86bed191113e7714838f0e83e67a4baa8b69257e6 SHA512 207859b703e8d8e502569fb2d2313856318c2cbe36f6c620422c62a6aa26b08c4f95c303badc3a48b9b5f908f71a8eff35ca55de1e9ce41b42be0c072ed55e60 -EBUILD asymptote-2.67.ebuild 4803 BLAKE2B 016a17d8b58e82abea8a2b30361ac52f93ae616c3ece05bf7dbd6e515359971b815541a21ab47a2e1a353c0eb0bc4d25a35875f420d69585b37af767145f88b1 SHA512 8b839811bab4de65e4ce38e7abbffbf486c88f413450fd4e330829f2ef2277747b4eebf23859299210a780a6a63e0ca7fde7b3dd8ade0f3788b0e82e4d024e75 -EBUILD asymptote-2.68.ebuild 4801 BLAKE2B 72a1f8005346596dd00abddd695717db6427b32cb29bff559acd3604037794960561267fb2407199dbf9f8c876898d05884f0a3a9ba2d08429510ca36e5a2852 SHA512 f968f587726a7a7abcab51789e00cac8f556eeb62c1294156d53ece38c587bf41e7b7845dbec03ac30be379346c6189c56a62c9475f4d0ec2b7c80b439ebcf15 -MISC metadata.xml 1105 BLAKE2B 4b7d588a861ed68910f0d5a7b7f5691b3e97b6cf4514c3544c8610c77340797354575b49b70980320e55ecf5ea8188bbe8f6cc8fce55d18dc466f1d0fd83ade3 SHA512 f115ea831900270542ffe545260eda1ed51d321eca5aa7772f336bcc0e0c6471be3cbde2991c3e48ea5b3fbf51b8541b13de850406af15e42c992da0f2ed08ee +DIST asymptote-2.69.src.tgz 4673601 BLAKE2B 9734ffec10c9c0b8053598402a4eb81a3ed8a48f8ce8e58d1720442be26e25fe7778d6d47cd2d29dae61183d15aaa456bca430ab98e951844c8210484226e67f SHA512 a1b746600b4e6880350e57adeb3a3228d10b1b0c1db11ee0e750545cf8023716eec92253c0cd0980747f72c16fd0097f25ee688657168f24a0def106260e0791 +EBUILD asymptote-2.68.ebuild 4806 BLAKE2B d024e46c7c697e624c27f938f96afc1f65403d36995d62050bc3ec8313d2b81aeb2516ae1c5c7442db4345863fca106e7182da4f22d7d601f766366d816f4e2d SHA512 3bb36ddf4578fafba5644e29b98e743ae71c1484e2d7dc7845d8f96fc8315fd9f8e28b7368f5893de217e87cad60960a99cde5e33a39265cc5b17281b6873c5d +EBUILD asymptote-2.69.ebuild 4573 BLAKE2B b47fb58c4182a71e30b40761284fb9c1c5b0dc42ab68c4be13e1dccdf96627b92fe094ae678eee077f8cd856abd4ffeb5fe56aa62d770ce6014517d56b5d2ee3 SHA512 c800a7fc586711e62b6f5b187078086a877df89215d1a39124a4d1a698e65958cb370a9fe4840bca003dcd80ba2cfd3923b96517649bb9dfa8277cd1f7d9fd6f +MISC metadata.xml 1257 BLAKE2B 93f3f42b625d44d9340a224ad8bb4c605044b008b56bca48e3b6e0ed7e8be58b2b50fc8a0899731373251490d62c0e6b3d56129786a27a57d8fe9b5d903b60fd SHA512 b74ba76e922f253bf9a2e44d50152a700e9725a4a899392c7ab0074a3716ab4bd6330d3acb87b09eb59fd48f904684a2339a87d4db965c74bc833487011dbb56 diff --git a/media-gfx/asymptote/asymptote-2.65.ebuild b/media-gfx/asymptote/asymptote-2.65.ebuild deleted file mode 100644 index 4b84f9b7f507..000000000000 --- a/media-gfx/asymptote/asymptote-2.65.ebuild +++ /dev/null @@ -1,211 +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} ) - -inherit autotools elisp-common latex-package python-r1 - -DESCRIPTION="A vector graphics language that provides a framework for technical drawing" -HOMEPAGE="https://asymptote.sourceforge.io/" -SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - offscreen? ( opengl ) - doc? ( boehm-gc )" - -RDEPEND=" - >=sys-libs/ncurses-5.4-r5:0= - >=sys-libs/readline-4.3-r5:0= - imagemagick? ( media-gfx/imagemagick[png] ) - opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) - offscreen? ( media-libs/mesa[osmesa] ) - svg? ( app-text/dvisvgm ) - sigsegv? ( dev-libs/libsigsegv ) - boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) - fftw? ( >=sci-libs/fftw-3.0.1 ) - gsl? ( sci-libs/gsl ) - python? ( ${PYTHON_DEPS} ) - X? ( - ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] - dev-python/numpy - dev-python/pycson - >=gnome-base/librsvg-2.40 - ) - latex? ( - virtual/latex-base - >=dev-texlive/texlive-latexextra-2013 - ) - emacs? ( >=app-editors/emacs-23.1:* ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" -DEPEND="${RDEPEND} - doc? ( - dev-lang/perl - media-gfx/imagemagick[png] - virtual/texi2dvi - virtual/latex-base - app-text/ghostscript-gpl ) - test? ( app-text/ghostscript-gpl )" - -TEXMF=/usr/share/texmf-site - -PATCHES=( - # Changing pdf, ps, image viewers to xdg-open - "${FILESDIR}/${P}-xdg-utils.patch" - - # Bug #322473 - "${FILESDIR}/${P}-info.patch" -) - -src_prepare() { - sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ - -i configure.ac \ - || die "sed configure.ac failed" - - default - eautoreconf -} - -src_configure() { - # for the CPPFLAGS see - # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 - econf \ - CPPFLAGS=-DHAVE_SYS_TYPES_H \ - CFLAGS="${CXXFLAGS}" \ - --disable-gc-debug \ - $(use_enable boehm-gc gc system) \ - $(use_enable fftw) \ - $(use_enable gsl) \ - $(use_enable opengl gl) \ - $(use_enable offscreen) \ - $(use_enable sigsegv) -} - -src_compile() { - default - - cd doc || die - emake asy.1 - if use doc; then - # info - einfo "Making info" - emake ${PN}.info - cd FAQ || die - emake - cd .. || die - # pdf - einfo "Making pdf docs" - export VARTEXFONTS="${T}"/fonts - # see bug #260606 - emake -j1 asymptote.pdf - emake CAD.pdf - fi - cd .. || die - - if use emacs; then - einfo "Compiling emacs lisp files" - elisp-compile base/*.el - fi -} - -src_install() { - # the program - dobin asy - - # .asy files - insinto /usr/share/${PN} - doins base/*.asy - - # documentation - dodoc BUGS ChangeLog README ReleaseNotes TODO - doman doc/asy.1 - - # X GUI - if use X; then - insinto /usr/share/${PN} - doins -r GUI - chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py - dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy - doman doc/xasy.1x - fi - - # examples - if use examples; then - insinto /usr/share/${PN}/examples - doins \ - examples/*.asy \ - doc/*.asy \ - doc/*.csv \ - doc/*.dat \ - doc/extra/*.asy - insinto /usr/share/${PN}/examples/animations - doins examples/animations/*.asy - fi - - # LaTeX style - if use latex; then - cd doc || die - insinto "${TEXMF}"/tex/latex/${PN} - doins ${PN}.sty asycolors.sty - if use examples; then - insinto /usr/share/${PN}/examples - doins latexusage.tex - insinto /usr/share/${PN}/examples/animations - doins ../examples/animations/*.tex - fi - cd .. || die - fi - - # asymptote.py - if use python; then - python_foreach_impl python_domodule base/${PN}.py - fi - - # emacs mode - if use emacs; then - elisp-install ${PN} base/*.el base/*.elc - elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el - fi - - # vim syntax - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins base/asy.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}"/asy-ftd.vim - fi - - # extra documentation - if use doc; then - cd doc || die - doinfo ${PN}.info* - dodoc ${PN}.pdf CAD.pdf - cd FAQ || die - dodoc asy-faq.ascii - doinfo asy-faq.info - docinto html/FAQ - dodoc asy-faq.html/* - fi -} - -pkg_postinst() { - use latex && latex-package_rehash - use emacs && elisp-site-regen - - elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' - elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' -} - -pkg_postrm() { - use latex && latex-package_rehash - use emacs && elisp-site-regen -} diff --git a/media-gfx/asymptote/asymptote-2.67.ebuild b/media-gfx/asymptote/asymptote-2.67.ebuild deleted file mode 100644 index b8b295315831..000000000000 --- a/media-gfx/asymptote/asymptote-2.67.ebuild +++ /dev/null @@ -1,217 +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} ) - -inherit autotools elisp-common latex-package python-r1 - -DESCRIPTION="A vector graphics language that provides a framework for technical drawing" -HOMEPAGE="https://asymptote.sourceforge.io/" -SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - offscreen? ( opengl ) - doc? ( boehm-gc )" - -RDEPEND=" - >=sys-libs/ncurses-5.4-r5:0= - >=sys-libs/readline-4.3-r5:0= - imagemagick? ( media-gfx/imagemagick[png] ) - opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm ) - offscreen? ( media-libs/mesa[osmesa] ) - svg? ( app-text/dvisvgm ) - sigsegv? ( dev-libs/libsigsegv ) - boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) - fftw? ( >=sci-libs/fftw-3.0.1 ) - gsl? ( sci-libs/gsl ) - python? ( ${PYTHON_DEPS} ) - X? ( - ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] - dev-python/numpy - dev-python/pycson - >=gnome-base/librsvg-2.40 - ) - latex? ( - virtual/latex-base - >=dev-texlive/texlive-latexextra-2013 - ) - emacs? ( >=app-editors/emacs-23.1:* ) - vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" -DEPEND="${RDEPEND} - doc? ( - dev-lang/perl - media-gfx/imagemagick[png] - virtual/texi2dvi - virtual/latex-base - app-text/ghostscript-gpl ) - test? ( app-text/ghostscript-gpl )" - -TEXMF=/usr/share/texmf-site - -PATCHES=( - # Changing pdf, ps, image viewers to xdg-open - "${FILESDIR}/${P}-xdg-utils.patch" - - # Bug #322473 - "${FILESDIR}/${P}-info.patch" -) - -src_prepare() { - sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ - -i configure.ac \ - || die "sed configure.ac failed" - - default - eautoreconf -} - -src_configure() { - # for the CPPFLAGS see - # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 - econf \ - CPPFLAGS=-DHAVE_SYS_TYPES_H \ - CFLAGS="${CXXFLAGS}" \ - --disable-gc-debug \ - $(use_enable boehm-gc gc system) \ - $(use_enable fftw) \ - $(use_enable gsl) \ - $(use_enable opengl gl) \ - $(use_enable offscreen) \ - $(use_enable sigsegv) -} - -src_compile() { - default - - cd doc || die - emake asy.1 - if use doc; then - # info - einfo "Making info" - emake ${PN}.info - cd FAQ || die - emake - cd .. || die - # pdf - einfo "Making pdf docs" - export VARTEXFONTS="${T}"/fonts - # see bug #260606 - emake -j1 asymptote.pdf - emake CAD.pdf - fi - cd .. || die - - if use emacs; then - einfo "Compiling emacs lisp files" - elisp-compile base/*.el - fi -} - -src_install() { - # the program - dobin asy - - # .asy files - insinto /usr/share/${PN} - doins -r base/*.asy base/shaders base/webgl - - # documentation - dodoc BUGS ChangeLog README ReleaseNotes TODO - doman doc/asy.1 - - # X GUI - if use X; then - insinto /usr/share/${PN} - doins -r GUI - chmod +x "${D}"/usr/share/${PN}/GUI/xasy.py - dosym ../share/${PN}/GUI/xasy.py /usr/bin/xasy - doman doc/xasy.1x - fi - - # examples - if use examples; then - insinto /usr/share/${PN}/examples - doins \ - examples/*.asy \ - examples/*.views \ - examples/*.dat \ - examples/*.bib \ - examples/piicon.png \ - examples/100d.pdb1 \ - doc/*.asy \ - doc/*.csv \ - doc/*.dat \ - doc/pixel.pdf \ - doc/extra/*.asy - insinto /usr/share/${PN}/examples/animations - doins examples/animations/*.asy - fi - - # LaTeX style - if use latex; then - cd doc || die - insinto "${TEXMF}"/tex/latex/${PN} - doins ${PN}.sty asycolors.sty - if use examples; then - insinto /usr/share/${PN}/examples - doins latexusage.tex externalprc.tex - insinto /usr/share/${PN}/examples/animations - doins ../examples/animations/*.tex - fi - cd .. || die - fi - - # asymptote.py - if use python; then - python_foreach_impl python_domodule base/${PN}.py - fi - - # emacs mode - if use emacs; then - elisp-install ${PN} base/*.el base/*.elc asy-keywords.el - elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el - fi - - # vim syntax - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/syntax - doins base/asy.vim - insinto /usr/share/vim/vimfiles/ftdetect - doins base/asy_filetype.vim - fi - - # extra documentation - if use doc; then - cd doc || die - doinfo ${PN}.info* - dodoc ${PN}.pdf CAD.pdf - cd FAQ || die - dodoc asy-faq.ascii - doinfo asy-faq.info - docinto html/FAQ - dodoc asy-faq.html/* - fi -} - -pkg_postinst() { - use latex && latex-package_rehash - use emacs && elisp-site-regen - - elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' - elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' -} - -pkg_postrm() { - use latex && latex-package_rehash - use emacs && elisp-site-regen -} diff --git a/media-gfx/asymptote/asymptote-2.68.ebuild b/media-gfx/asymptote/asymptote-2.68.ebuild index dbca9e562e8a..55f17d507ae8 100644 --- a/media-gfx/asymptote/asymptote-2.68.ebuild +++ b/media-gfx/asymptote/asymptote-2.68.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X" RESTRICT="!test? ( test )" diff --git a/media-gfx/asymptote/asymptote-2.69.ebuild b/media-gfx/asymptote/asymptote-2.69.ebuild new file mode 100644 index 000000000000..b7b0b25d2885 --- /dev/null +++ b/media-gfx/asymptote/asymptote-2.69.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) + +inherit autotools elisp-common latex-package python-r1 + +DESCRIPTION="A vector graphics language that provides a framework for technical drawing" +HOMEPAGE="https://asymptote.sourceforge.io/" +SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="+boehm-gc curl doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax" +# FIXME: xasy is currently broken +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + offscreen? ( opengl ) + doc? ( boehm-gc )" + +RDEPEND=" + >=sys-libs/ncurses-5.4-r5:0= + >=sys-libs/readline-4.3-r5:0= + net-libs/libtirpc + imagemagick? ( media-gfx/imagemagick[png] ) + opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm ) + offscreen? ( media-libs/mesa[osmesa] ) + svg? ( app-text/dvisvgm ) + sigsegv? ( dev-libs/libsigsegv ) + boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) + fftw? ( >=sci-libs/fftw-3.0.1 ) + gsl? ( sci-libs/gsl ) + python? ( ${PYTHON_DEPS} ) + curl? ( net-misc/curl ) + latex? ( + virtual/latex-base + >=dev-texlive/texlive-latexextra-2013 + ) + emacs? ( >=app-editors/emacs-23.1:* ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )" +DEPEND="${RDEPEND} + doc? ( + dev-lang/perl + media-gfx/imagemagick[png] + virtual/texi2dvi + virtual/latex-base + app-text/ghostscript-gpl ) + test? ( app-text/ghostscript-gpl )" + +TEXMF=/usr/share/texmf-site + +PATCHES=( + # Changing pdf, ps, image viewers to xdg-open + "${FILESDIR}/${P}-xdg-utils.patch" + + # Bug #322473 + "${FILESDIR}/${P}-info.patch" +) + +src_prepare() { + sed -e "s:Datadir/doc/asymptote:Datadir/doc/${PF}:" \ + -i configure.ac \ + || die "sed configure.ac failed" + + default + eautoreconf +} + +src_configure() { + # for the CPPFLAGS see + # https://sourceforge.net/forum/forum.php?thread_id=1683277&forum_id=409349 + econf \ + CPPFLAGS=-DHAVE_SYS_TYPES_H \ + CFLAGS="${CXXFLAGS}" \ + --disable-gc-debug \ + $(use_enable boehm-gc gc system) \ + $(use_enable curl) \ + $(use_enable fftw) \ + $(use_enable gsl) \ + $(use_enable opengl gl) \ + $(use_enable offscreen) \ + $(use_enable sigsegv) +} + +src_compile() { + default + + cd doc || die + emake asy.1 + if use doc; then + # info + einfo "Making info" + emake ${PN}.info + cd FAQ || die + emake + cd .. || die + # pdf + einfo "Making pdf docs" + export VARTEXFONTS="${T}"/fonts + # see bug #260606 + emake -j1 asymptote.pdf + emake CAD.pdf + fi + cd .. || die + + if use emacs; then + einfo "Compiling emacs lisp files" + elisp-compile base/*.el + fi +} + +src_install() { + # the program + dobin asy + + # .asy files + insinto /usr/share/${PN} + doins -r base/*.asy base/shaders base/webgl + + # documentation + dodoc BUGS ChangeLog README ReleaseNotes TODO + doman doc/asy.1 + + # examples + if use examples; then + insinto /usr/share/${PN}/examples + doins \ + examples/*.asy \ + examples/*.views \ + examples/*.dat \ + examples/*.bib \ + examples/piicon.png \ + examples/100d.pdb1 \ + doc/*.asy \ + doc/*.csv \ + doc/*.dat \ + doc/pixel.pdf \ + doc/extra/*.asy + insinto /usr/share/${PN}/examples/animations + doins examples/animations/*.asy + fi + + # LaTeX style + if use latex; then + cd doc || die + insinto "${TEXMF}"/tex/latex/${PN} + doins ${PN}.sty asycolors.sty + if use examples; then + insinto /usr/share/${PN}/examples + doins latexusage.tex externalprc.tex + insinto /usr/share/${PN}/examples/animations + doins ../examples/animations/*.tex + fi + cd .. || die + fi + + # asymptote.py + if use python; then + python_foreach_impl python_domodule base/${PN}.py + fi + + # emacs mode + if use emacs; then + elisp-install ${PN} base/*.el base/*.elc asy-keywords.el + elisp-site-file-install "${FILESDIR}"/64${PN}-gentoo.el + fi + + # vim syntax + if use vim-syntax; then + insinto /usr/share/vim/vimfiles/syntax + doins base/asy.vim + insinto /usr/share/vim/vimfiles/ftdetect + doins base/asy_filetype.vim + fi + + # extra documentation + if use doc; then + cd doc || die + doinfo ${PN}.info* + dodoc ${PN}.pdf CAD.pdf + cd FAQ || die + dodoc asy-faq.ascii + doinfo asy-faq.info + docinto html/FAQ + dodoc asy-faq.html/* + fi +} + +pkg_postinst() { + use latex && latex-package_rehash + use emacs && elisp-site-regen + + elog 'Use the variable ASYMPTOTE_PSVIEWER to set the postscript viewer' + elog 'Use the variable ASYMPTOTE_PDFVIEWER to set the PDF viewer' +} + +pkg_postrm() { + use latex && latex-package_rehash + use emacs && elisp-site-regen +} diff --git a/media-gfx/asymptote/files/asy-ftd.vim b/media-gfx/asymptote/files/asy-ftd.vim deleted file mode 100644 index 0f5e3957900a..000000000000 --- a/media-gfx/asymptote/files/asy-ftd.vim +++ /dev/null @@ -1,2 +0,0 @@ -au BufNewFile,BufRead *.asy setf asy -filetype plugin on diff --git a/media-gfx/asymptote/files/asymptote-2.65-info.patch b/media-gfx/asymptote/files/asymptote-2.65-info.patch deleted file mode 100644 index 27d0e5ce868d..000000000000 --- a/media-gfx/asymptote/files/asymptote-2.65-info.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: asymptote-2.65/doc/asymptote.texi -=================================================================== ---- asymptote-2.65.orig/doc/asymptote.texi -+++ asymptote-2.65/doc/asymptote.texi -@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir - - @dircategory Languages - @direntry --* asymptote: (asymptote/asymptote). Vector graphics language. -+* asymptote: (asymptote). Vector graphics language. - @end direntry - - @titlepage diff --git a/media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch deleted file mode 100644 index 6f4fb6cbcf4f..000000000000 --- a/media-gfx/asymptote/files/asymptote-2.65-xdg-utils.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: asymptote-2.65/settings.cc -=================================================================== ---- asymptote-2.65.orig/settings.cc -+++ asymptote-2.65/settings.cc -@@ -100,13 +100,13 @@ string defaultPSViewer="open"; - string defaultPDFViewer="open"; - string defaultHTMLViewer="open"; - #else --string defaultPSViewer="gv"; --string defaultPDFViewer="acroread"; --string defaultHTMLViewer="google-chrome"; -+string defaultPSViewer="xdg-open"; -+string defaultPDFViewer="xdg-open"; -+string defaultHTMLViewer="xdg-open"; - #endif - string defaultGhostscript="gs"; - string defaultGhostscriptLibrary=""; --string defaultDisplay="display"; -+string defaultDisplay="xdg-open"; - string defaultAnimate="animate"; - void queryRegistry() {} - const string dirsep="/"; diff --git a/media-gfx/asymptote/files/asymptote-2.67-info.patch b/media-gfx/asymptote/files/asymptote-2.67-info.patch deleted file mode 100644 index c0812477115f..000000000000 --- a/media-gfx/asymptote/files/asymptote-2.67-info.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: asymptote-2.67/doc/asymptote.texi -=================================================================== ---- asymptote-2.67.orig/doc/asymptote.texi -+++ asymptote-2.67/doc/asymptote.texi -@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir - - @dircategory Languages - @direntry --* asymptote: (asymptote/asymptote). Vector graphics language. -+* asymptote: (asymptote). Vector graphics language. - @end direntry - - @titlepage diff --git a/media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch deleted file mode 100644 index a6a2c7daba0c..000000000000 --- a/media-gfx/asymptote/files/asymptote-2.67-xdg-utils.patch +++ /dev/null @@ -1,23 +0,0 @@ -Только в asymptote-2.67.orig: .pc -Index: asymptote-2.67/settings.cc -=================================================================== ---- asymptote-2.67.orig/settings.cc -+++ asymptote-2.67/settings.cc -@@ -100,13 +100,13 @@ string defaultPSViewer="open"; - string defaultPDFViewer="open"; - string defaultHTMLViewer="open"; - #else --string defaultPSViewer="gv"; --string defaultPDFViewer="acroread"; --string defaultHTMLViewer="google-chrome"; -+string defaultPSViewer="xdg-open"; -+string defaultPDFViewer="xdg-open"; -+string defaultHTMLViewer="xdg-open"; - #endif - string defaultGhostscript="gs"; - string defaultGhostscriptLibrary=""; --string defaultDisplay="display"; -+string defaultDisplay="xdg-open"; - string defaultAnimate="animate"; - void queryRegistry() {} - const string dirsep="/"; diff --git a/media-gfx/asymptote/files/asymptote-2.69-info.patch b/media-gfx/asymptote/files/asymptote-2.69-info.patch new file mode 100644 index 000000000000..63f2dc281762 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.69-info.patch @@ -0,0 +1,13 @@ +Index: asymptote-2.69/doc/asymptote.texi +=================================================================== +--- asymptote-2.69.orig/doc/asymptote.texi ++++ asymptote-2.69/doc/asymptote.texi +@@ -23,7 +23,7 @@ file LICENSE in the top-level source dir + + @dircategory Languages + @direntry +-* asymptote: (asymptote/asymptote). Vector graphics language. ++* asymptote: (asymptote). Vector graphics language. + @end direntry + + @titlepage diff --git a/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch b/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch new file mode 100644 index 000000000000..f07d23ac6183 --- /dev/null +++ b/media-gfx/asymptote/files/asymptote-2.69-xdg-utils.patch @@ -0,0 +1,23 @@ +Только в asymptote-2.67.orig: .pc +Index: asymptote-2.69/settings.cc +=================================================================== +--- asymptote-2.69.orig/settings.cc ++++ asymptote-2.69/settings.cc +@@ -101,13 +101,13 @@ string defaultPSViewer="open"; + string defaultPDFViewer="open"; + string defaultHTMLViewer="open"; + #else +-string defaultPSViewer="gv"; +-string defaultPDFViewer="acroread"; +-string defaultHTMLViewer="google-chrome"; ++string defaultPSViewer="xdg-open"; ++string defaultPDFViewer="xdg-open"; ++string defaultHTMLViewer="xdg-open"; + #endif + string defaultGhostscript="gs"; + string defaultGhostscriptLibrary=""; +-string defaultDisplay="display"; ++string defaultDisplay="xdg-open"; + string defaultAnimate="animate"; + void queryRegistry() {} + const string dirsep="/"; diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml index fee8887be49c..0f12983bc2ff 100644 --- a/media-gfx/asymptote/metadata.xml +++ b/media-gfx/asymptote/metadata.xml @@ -20,10 +20,12 @@ Enables using the Boehm-Demers-Weiser conservative garbage collector + Enables running remote programs via net-misc/curl Enables using dev-libs/libsigsegv Enables off-screen rendering asymptote + vectorgraphics/asymptote diff --git a/media-gfx/autopano-sift-C/Manifest b/media-gfx/autopano-sift-C/Manifest index 99cecd4bd1ce..7c4d57b5b259 100644 --- a/media-gfx/autopano-sift-C/Manifest +++ b/media-gfx/autopano-sift-C/Manifest @@ -1,4 +1,5 @@ +AUX autopano-sift-C-2.5.1-include-order.patch 604 BLAKE2B ad43f26a0a7d4e8952e1db74bda617047e033cc89720e72e556b775948bc47d3b780cbff9bf95deb526bd4dc78f6548aca908b8f27a3845488068748eb63d0de SHA512 1d6e4e7759e9e865c8645fb612e306d2f7838d4f9356bb78f74b16fcdeec43979e416b8e183f4d7785432b65ff5603ad26f1a81505ffc068d49795d9c5f5b180 AUX autopano-sift-C-2.5.1-lm.patch 516 BLAKE2B 79fd443c4c2f321aa93982fb08ee7d8c6c9b588286e5f73d55c89ab014d53f569cd1de93f5846543ec33c2f9616dca65e932ce21cae47eec1c28b9a3c5ef56f8 SHA512 6198eaa686ab22a7707f840cc81c2fc68c9b02ce9d7831d28d255543bd0898b318b5d00b4f7bae487a6e4c70f4d0af75bfd61aeb07825cc70475e2988bb39002 DIST autopano-sift-C-2.5.1.tar.gz 192267 BLAKE2B 552fe33230d322b5b33c31a6298058d30a8dd63110f15b1af25fa53aa762a5d9924a712523b626ba2381692c643c0bec44534bd5d2cc69b00faaf5b7fbd51d91 SHA512 4f3c9e8738c7bc29ff6284033b7b813de61ef440c3d544755be8c4ad715a6e4175801ee4c02642df5e05bac82929c5554d85a5c488a2c27da1e5e81d3cd72931 -EBUILD autopano-sift-C-2.5.1.ebuild 618 BLAKE2B e2a58d968de9493c676b4f04051c0b9fc46631ab9cf074fa9f40a802f6dfa120c06f112fb1c59c6d895793ac04d6c6489b2a40db989f25c07e6925b295b75bdd SHA512 895c0f448253cdb8ace54fc0c6d9374ea50a76c79b9b468daf95d3b03681a8e9ae8eb01b57c3c6e06a2b11825a62c348afe6bc8200d1b3e70bedfa5bb43cbb56 +EBUILD autopano-sift-C-2.5.1.ebuild 666 BLAKE2B 43cd2e2ef5fcdbab227e0cdbb7fe9aaae3931fd182cdae2cf621a1c98dd4a114e23294f7dde58ee9873a0d870bff2bb0269dbef3aaf913001074e2d290b40d9b SHA512 9b87bcf4863f290f0c4abcfe7d099f9572667f40786fc5cafddea9cfc6fc106a672f2898aba219b4ed5ff5767473db02fc6ffae16fdaddc2d4d57fa7b9ed9ae1 MISC metadata.xml 242 BLAKE2B 5b14580839e0095bbf38a5ef4012ad45d44dd9923d9b1c04ce68b7a7c0ee746965553854933280c8384653cc0a67a69844a00cb7167c2fb22c1d2fb044ed016c SHA512 20b5112a69b93703ba404eeb80fbf522445c0aa1c9513ab89507f62646b4fe8bf524d558ff1299b88f5fff9d149fa03c7f35e299ad8e292b3a31944f20dceeb3 diff --git a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild index b9fffc443b2a..aa6387758510 100644 --- a/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild +++ b/media-gfx/autopano-sift-C/autopano-sift-C-2.5.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit cmake-utils +inherit cmake DESCRIPTION="SIFT algorithm for automatic panorama creation in C" HOMEPAGE="http://hugin.sourceforge.net/ http://user.cs.tu-berlin.de/~nowozin/autopano-sift/" @@ -25,4 +25,7 @@ RDEPEND="${DEPEND} !media-gfx/autopano-sift " -PATCHES=( "${FILESDIR}"/${P}-lm.patch ) +PATCHES=( + "${FILESDIR}"/${P}-lm.patch + "${FILESDIR}"/${P}-include-order.patch # bug 759514 +) diff --git a/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch new file mode 100644 index 000000000000..becab6d4aeb1 --- /dev/null +++ b/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-include-order.patch @@ -0,0 +1,24 @@ +Subject: [PATCH] adjust to include order deoendency + +--- + autopano-sift-C-2.5.1/KeypointXML.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/autopano-sift-C-2.5.1/KeypointXML.c b/autopano-sift-C-2.5.1/KeypointXML.c +index 9da70a8..30c35e1 100644 +--- a/KeypointXML.c ++++ b/KeypointXML.c +@@ -13,10 +13,9 @@ + * (C) Copyright 2004 -- Sebastian Nowozin (nowozin@cs.tu-berlin.de) + */ + +-#include "AutoPanoSift.h" +- + #include + #include ++#include "AutoPanoSift.h" + + KeypointXMLList* KeypointXMLReader_ReadComplete (char* filename) + { +-- +2.26.2 diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 3aee6f5ff9be..4ea5e554fa69 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,9 +1,13 @@ DIST blender-2.83.10.tar.xz 38624904 BLAKE2B e52597b3acce875943dff75575c42c8c1fdeb19cb74b4f3609e56730e8fb6d5bbc94a6215a1e9da52b46e45c48c9a46dc4f3ed0d22e16186d9e7434b27eef70f SHA512 96b252176d867b3cac76a99cbee95313b60935a34edc44f27c67a1f75f20b353f0894288df2696718e95a03a07a1630797a431b752ffb4dd14692739d714a589 +DIST blender-2.83.12.tar.xz 39132904 BLAKE2B 175e8c5ab9324421f23357bc367b2e70ee8c391130d376d6d53eefbf90529d09921395cd11e7b1709aaa4d24ec6f8df64050869e41bbe211229126db08f22089 SHA512 f313c92e311e852742e74934504fcd3ccd296bcea2499f605cef568e3c615ececd9d70dec5025e4d4ff19f03803c148a8b03a4b68b7ca978554f5b1122c9890b DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d SHA512 061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5 DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34 SHA512 e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992 DIST blender-2.91.0.tar.xz 41528920 BLAKE2B f28bce92b0b63e380c7ce2c9dae0ae4235792ae7c7dff52c2c9c0c5baa81b4d540f853f49d7622f6feca8c7f403b254b55f200758a64e4d95bd43709e5509c1d SHA512 a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa +DIST blender-2.91.2.tar.xz 42057100 BLAKE2B f10f838ad6d56135fddf9e9171473e1e589f511a38112845d650436a1eb4da94ea0777571dffc6446f4217dce647b087cf5a18841d7dde2086d187bb8f7d3654 SHA512 9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e EBUILD blender-2.83.10.ebuild 8591 BLAKE2B 6bc59e2d14777961500476e70b09bb4cd32387157409cc5e15970c0291a9e9acaeffadd4e515aad745ff7968f0be36c0d254dd91588ac89b43b3d5a860100a19 SHA512 ca8c18a4a23f2fde3cf057734b56e5d1258b7cf584c7fb5372db836bdad79458564a1131f4fc3c9ae8dc56e1f8b5534dc7ee6d8da5ae2a06862ca546974cede1 +EBUILD blender-2.83.12.ebuild 8904 BLAKE2B 0522ea1f695ce84a6f9c56f47d4e4df524a2f318d427fc1e8194092f7e30d79d7e0b523fe4668fad15591ca95006d66d836debcba9b2231779e369a2db748909 SHA512 3098d3793fa4e058b34b66a6e43768e09596667b54b2abd7c8b2b08983fecf6166d79d6ad23290964eaad87c2addfc86699268d087ed61203e5e8e43928dba64 EBUILD blender-2.83.4-r1.ebuild 8590 BLAKE2B d1f5765922114878d629e653248491878f1ae7003f0ad8dad49713e083d28b5133b2e1a0b1ba6b9a2600a7f9512c9a98aa0a551e9e368aa2cfe46346ed5c7914 SHA512 36f33f65151a8c98a42a2f014209d2bf0552779c8b5e52513fc8063c5202ba77c1cf3c744e3e818387ada59a3ec88805f35f96bcefcc3c000da331b73a756780 EBUILD blender-2.90.1-r1.ebuild 8628 BLAKE2B 6f432315a7bf13dc3635ab915e9c72668aef526358f74b324067ebe4d5a34c5fa6daa207fdb753adaa756be9d53617896ec5545071755459ed0799a56618d18b SHA512 1b4bc3de4447577cd062283fde8ef091c0800968a0129a833b4d3c9acf8992e143a204bbc32b887254cdf4977ea083cb262e47242b5b2f1d581cf183339374a7 -EBUILD blender-2.91.0.ebuild 9051 BLAKE2B da48e82f25971c9322553734d18a7d8a60f51d728ebe965a1b2d3b49478b42fb89f2bb7db820e925c79ff66db26a03ca40ce5de7324633b37673a24ded423a27 SHA512 6c6544ea48980a3f4e3a8173f611daeee94ee9d6f5dcccf358a890a0d8321f797737c498afa88a401ac1f6bc155ed03448415c585103b9a9d178cf83d435ae48 -MISC metadata.xml 2795 BLAKE2B 6a3b2ec4f6c57286f41e4304bd394dd2d9c23830678e2a29fd7657eb9aae760c5061f5a5fcf43e65993ccbdf4c3e42bbd933857e22355ef4069f870ec7d180bb SHA512 20ba570f24a0daaa50a07991d0b6ec6620b080ad3a253af2dff7008c504fea3ac2fc11301e1947d81f38b0398d878de0c299700fd99880b021e5e8e5f41afc95 +EBUILD blender-2.91.0.ebuild 9056 BLAKE2B 8d797eebeba043fe2b1d8d74b6d5aa7ef8483efc9b9ea748766d95ddb89e805daa129b2c0515945b4ee89648119812bd2b7dec4a86398c905d2f085ddcbed8f8 SHA512 84ff05f097fdeaa37c795ac11aaf01ecca1063f126b08ada97063a15f5de1f14e9823dc6431c94a4497e09eab7b2932fcdbf661f0a1866fac2fafd24a8a0bd83 +EBUILD blender-2.91.2.ebuild 9055 BLAKE2B fe430c906eed6ef6863b53c81f604738ae1090711da802246c453fa5d4c31cc2918e50b821062ca6db4d61ef5e5ae878e3eac186de061f368b71a45250c3e4e5 SHA512 ca61dfb6e868aa259ae039008357cd4ff43c2a3010b74891a2f21d626e9f5ace0607c75adea0d7cc8cfb0a997658254f0edd36746c0c9795eeae9f98bf83a5d5 +MISC metadata.xml 2733 BLAKE2B bd7234217670288e926c4c71dac113fe478dbaf3f13a5e75ba1147a72b636baa8a7f6ccaaac6cc40e5710342dba4d49e35af8e0ebc439528cf3335cbf7f2560a SHA512 c955e7ffacb639e9bc5d5582bce129bc282f3838a113a5ead9ee2db13448b608b38e77c112036bcb57932302da15a537e2d1f9f82a8393444113340fdb7c8e51 diff --git a/media-gfx/blender/blender-2.83.12.ebuild b/media-gfx/blender/blender-2.83.12.ebuild new file mode 100644 index 000000000000..7eb344fbf595 --- /dev/null +++ b/media-gfx/blender/blender-2.83.12.ebuild @@ -0,0 +1,328 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \ + toolchain-funcs xdg-utils + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" +SRC_URI="https://download.blender.org/source/${P}.tar.xz" + +# Blender can have letters in the version string, +# so strip off the letter if it exists. +MY_PV="$(ver_cut 1-2)" + +SLOT="0" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="~amd64 ~x86" +IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \ + abi6-compat abi7-compat alembic collada color-management cuda cycles \ + debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \ + man ndof nls openal opencl openimageio openmp opensubdiv \ + openvdb osl sdl sndfile standalone test tiff valgrind" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + elbeem? ( tbb ) + opencl? ( cycles ) + openvdb? ( + ^^ ( abi6-compat abi7-compat ) + tbb + ) + osl? ( cycles llvm ) + standalone? ( cycles )" + +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:=[nls?,threads(+)] + dev-libs/lzo:2= + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + media-libs/freetype:= + media-libs/glew:* + media-libs/libpng:= + media-libs/libsamplerate + sys-libs/zlib:= + virtual/glu + virtual/jpeg + virtual/libintl + virtual/opengl + alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) + collada? ( >=media-libs/opencollada-1.6.68 ) + color-management? ( media-libs/opencolorio ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) + fftw? ( sci-libs/fftw:3.0= ) + !headless? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + llvm? ( sys-devel/llvm:= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + opencl? ( virtual/opencl ) + openimageio? ( media-libs/openimageio:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) + openvdb? ( + ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] + dev-libs/c-blosc:= + ) + osl? ( media-libs/osl:= ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tbb? ( dev-cpp/tbb ) + tiff? ( media-libs/tiff ) + valgrind? ( dev-util/valgrind ) +" + +DEPEND="${RDEPEND} + dev-cpp/eigen:= +" + +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + dev-python/sphinx[latex] + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + nls? ( sys-devel/gettext ) +" + +CMAKE_BUILD_TYPE="Release" + +blender_check_requirements() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # we don't want static glew, but it's scattered across + # multiple files that differ from version to version + # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! + local file + while IFS="" read -d $'\0' -r file ; do + sed -i -e '/-DGLEW_STATIC/d' "${file}" || die + done < <(find . -type f -name "CMakeLists.txt") + + # Disable MS Windows help generation. The variable doesn't do what it + # it sounds like. + sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ + -i doc/doxygen/Doxyfile || die +} + +src_configure() { + # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu + # shadows, see bug #276338 for reference + append-flags -funsigned-char + append-lfs-flags + + if use openvdb; then + local version + if use abi6-compat; then + version=6; + elif use abi7-compat; then + version=7; + else + die "Openvdb abi version not compatible" + fi + append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} + fi + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_VERSION="${EPYTHON/python/}" + -DWITH_ALEMBIC=$(usex alembic) + -DWITH_ASSERT_ABORT=$(usex debug) + -DWITH_BOOST=ON + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CXX_GUARDEDALLOC=$(usex debug) + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) + -DWITH_CYCLES_STANDALONE=$(usex standalone) + -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_FFTW3=$(usex fftw) + -DWITH_GTESTS=$(usex test) + -DWITH_HEADLESS=$(usex headless) + -DWITH_INSTALL_PORTABLE=OFF + -DWITH_IMAGE_DDS=$(usex dds) + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_TIFF=$(usex tiff) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_LLVM=$(usex llvm) + -DWITH_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + -DWITH_MOD_FLUID=$(usex elbeem) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENCOLORIO=$(usex color-management) + -DWITH_OPENIMAGEIO=$(usex openimageio) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) + -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) + -DWITH_SDL=$(usex sdl) + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_EIGEN3=ON + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_LZO=ON + -DWITH_TBB=$(usex tbb) + -DWITH_X11=$(usex !headless) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + fi +} + +src_test() { + if use test; then + einfo "Running Blender Unit Tests ..." + cd "${BUILD_DIR}"/bin/tests || die + local f + for f in *_test; do + ./"${f}" || die + done + fi +} + +src_install() { + # Pax mark blender for hardened support. + pax-mark m "${BUILD_DIR}"/bin/blender + + if use standalone; then + dobin "${BUILD_DIR}"/bin/cycles + fi + + if use doc; then + docinto "html/API/python" + dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. + + docinto "html/API/blender" + dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. + fi + + cmake_src_install + + # fix doc installdir + docinto "html" + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -r "${ED}"/usr/share/doc/blender || die + + python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py" + python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts" +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherent risks with running unknown python scripts." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "dragging the main menu down do display all paths." + elog + ewarn + ewarn "This ebuild does not unbundle the massive amount of 3rd party" + ewarn "libraries which are shipped with blender. Note that" + ewarn "these have caused security issues in the past." + ewarn "If you are concerned about security, file a bug upstream:" + ewarn " https://developer.blender.org/" + ewarn + + if use python_single_target_python3_8; then + elog "You've enabled python-3.8 support for blender, which is still experimental." + elog "If you experience breakages with e.g. plugins, please switch to" + elog "python_single_target_python3_7 instead." + elog "Bug: https://bugs.gentoo.org/737388" + elog + fi + + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update + + ewarn "" + ewarn "You may want to remove the following directory." + ewarn "~/.config/${PN}/${MY_PV}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/blender-2.91.0.ebuild b/media-gfx/blender/blender-2.91.0.ebuild index d3373af60b12..bedb7cf42832 100644 --- a/media-gfx/blender/blender-2.91.0.ebuild +++ b/media-gfx/blender/blender-2.91.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,7 +19,7 @@ MY_PV="$(ver_cut 1-2)" SLOT="0" LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm ~x86" IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \ abi6-compat abi7-compat alembic collada color-management cuda cycles \ debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \ diff --git a/media-gfx/blender/blender-2.91.2.ebuild b/media-gfx/blender/blender-2.91.2.ebuild new file mode 100644 index 000000000000..652671fd7a04 --- /dev/null +++ b/media-gfx/blender/blender-2.91.2.ebuild @@ -0,0 +1,334 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) + +inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \ + toolchain-funcs xdg-utils + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" +SRC_URI="https://download.blender.org/source/${P}.tar.xz" + +# Blender can have letters in the version string, +# so strip off the letter if it exists. +MY_PV="$(ver_cut 1-2)" + +SLOT="0" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \ + abi6-compat abi7-compat alembic collada color-management cuda cycles \ + debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \ + man ndof nls openal opencl openimageio openmp opensubdiv \ + openvdb osl sdl sndfile standalone test tiff valgrind" +RESTRICT="!test? ( test )" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + alembic? ( openexr ) + cuda? ( cycles ) + cycles? ( openexr tbb tiff openimageio ) + elbeem? ( tbb ) + opencl? ( cycles ) + openvdb? ( + ^^ ( abi6-compat abi7-compat ) + tbb + ) + osl? ( cycles llvm ) + standalone? ( cycles )" + +RDEPEND="${PYTHON_DEPS} + dev-libs/boost:=[nls?,threads(+)] + dev-libs/gmp + dev-libs/pugixml + dev-libs/lzo:2= + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + ') + media-gfx/potrace + media-libs/fontconfig:= + media-libs/freetype:= + media-libs/glew:* + media-libs/libpng:= + media-libs/libsamplerate + sys-libs/zlib:= + virtual/glu + virtual/jpeg + virtual/libintl + virtual/opengl + alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] ) + collada? ( >=media-libs/opencollada-1.6.68 ) + color-management? ( media-libs/opencolorio ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + cycles? ( media-libs/freeglut ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) + fftw? ( sci-libs/fftw:3.0= ) + !headless? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:2= ) + llvm? ( sys-devel/llvm:= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + opencl? ( virtual/opencl ) + openimageio? ( media-libs/openimageio:= ) + openexr? ( + media-libs/ilmbase:= + media-libs/openexr:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) + openvdb? ( + ~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?] + dev-libs/c-blosc:= + ) + osl? ( media-libs/osl:= ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tbb? ( dev-cpp/tbb ) + tiff? ( media-libs/tiff ) + valgrind? ( dev-util/valgrind ) +" + +DEPEND="${RDEPEND} + dev-cpp/eigen:= +" + +BDEPEND=" + virtual/pkgconfig + doc? ( + app-doc/doxygen[dot] + dev-python/sphinx[latex] + dev-texlive/texlive-bibtexextra + dev-texlive/texlive-fontsextra + dev-texlive/texlive-fontutils + dev-texlive/texlive-latex + dev-texlive/texlive-latexextra + ) + nls? ( sys-devel/gettext ) +" + +CMAKE_BUILD_TYPE="Release" + +blender_check_requirements() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # we don't want static glew, but it's scattered across + # multiple files that differ from version to version + # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! + local file + while IFS="" read -d $'\0' -r file ; do + sed -i -e '/-DGLEW_STATIC/d' "${file}" || die + done < <(find . -type f -name "CMakeLists.txt") + + # Disable MS Windows help generation. The variable doesn't do what it + # it sounds like. + sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ + -i doc/doxygen/Doxyfile || die +} + +src_configure() { + # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu + # shadows, see bug #276338 for reference + append-flags -funsigned-char + append-lfs-flags + + if use openvdb; then + local version + if use abi6-compat; then + version=6; + elif use abi7-compat; then + version=7; + else + die "Openvdb abi version not compatible" + fi + append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version} + fi + + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_VERSION="${EPYTHON/python/}" + -DWITH_ALEMBIC=$(usex alembic) + -DWITH_ASSERT_ABORT=$(usex debug) + -DWITH_BOOST=ON + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CXX_GUARDEDALLOC=$(usex debug) + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl) + -DWITH_CYCLES_EMBREE=OFF + -DWITH_CYCLES_STANDALONE=$(usex standalone) + -DWITH_CYCLES_STANDALONE_GUI=$(usex standalone) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_FFTW3=$(usex fftw) + -DWITH_GHOST_X11=$(usex !headless) + -DWITH_GTESTS=$(usex test) + -DWITH_HEADLESS=$(usex headless) + -DWITH_INSTALL_PORTABLE=OFF + -DWITH_IMAGE_DDS=$(usex dds) + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_TIFF=$(usex tiff) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_LLVM=$(usex llvm) + -DWITH_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + -DWITH_MOD_FLUID=$(usex elbeem) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENCOLORIO=$(usex color-management) + -DWITH_OPENIMAGEIO=$(usex openimageio) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_PYTHON_INSTALL=$(usex system-python OFF ON) + -DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON) + -DWITH_SDL=$(usex sdl) + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_EIGEN3=ON + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_LZO=ON + -DWITH_TBB=$(usex tbb) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc; then + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + fi +} + +src_test() { + if use test; then + einfo "Running Blender Unit Tests ..." + cd "${BUILD_DIR}"/bin/tests || die + local f + for f in *_test; do + ./"${f}" || die + done + fi +} + +src_install() { + # Pax mark blender for hardened support. + pax-mark m "${BUILD_DIR}"/bin/blender + + if use standalone; then + dobin "${BUILD_DIR}"/bin/cycles + fi + + if use doc; then + docinto "html/API/python" + dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. + + docinto "html/API/blender" + dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. + fi + + cmake_src_install + + # fix doc installdir + docinto "html" + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -r "${ED}"/usr/share/doc/blender || die + + python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py" + python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts" +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherent risks with running unknown python scripts." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "dragging the main menu down do display all paths." + elog + ewarn + ewarn "This ebuild does not unbundle the massive amount of 3rd party" + ewarn "libraries which are shipped with blender. Note that" + ewarn "these have caused security issues in the past." + ewarn "If you are concerned about security, file a bug upstream:" + ewarn " https://developer.blender.org/" + ewarn + + if use python_single_target_python3_8; then + elog "You've enabled python-3.8 support for blender, which is still experimental." + elog "If you experience breakages with e.g. plugins, please switch to" + elog "python_single_target_python3_7 instead." + elog "Bug: https://bugs.gentoo.org/737388" + elog + fi + + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update + + ewarn "" + ewarn "You may want to remove the following directory." + ewarn "~/.config/${PN}/${MY_PV}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index 56a4c98b6a4c..18a7b03a8de1 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -51,9 +51,6 @@ Enable features depending on llvm. - - Build and install man pages. - Enable NDOF input devices (SpaceNavigator and friends). diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest index 9b47235980b8..30b21cd42267 100644 --- a/media-gfx/converseen/Manifest +++ b/media-gfx/converseen/Manifest @@ -1,4 +1,6 @@ -AUX converseen-0.9.6.2-gnuinstalldirs.patch 4784 BLAKE2B 245c5ddeff91bf4e1c74471cd8a9f3c93bf786e5c44c48b62560cdc34913aeb97b5392355421ba19e42074547a81f0a471899e19dab7294434b37b9f6ab8e0df SHA512 9e5abc254e1a1d1b2a92d5ba04f24640b90ea49f79222ed81c83fedb0f007adcffb371952db6074c18b3d1d853f81de21f45a3803df2b7fc4b18dc93ee7ab5e8 -DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c -EBUILD converseen-0.9.6.2.ebuild 839 BLAKE2B f04a7d944709ae6bfc9ae32db9ac80ea94fbc84502f97d385ea10280ddb6c272c750b0b466425c25d65f3404b3485b6184181b214027daddd029e86f9ac0cb6b SHA512 761bf3c502adda2c29f4164da59fd95066be9c4cc1a8ce531bf403ff6dc8b8625fb5cb31ad0d9c55c54e637fa89f8ecb3c2ceb081e189546440e6631b0509101 +AUX converseen-0.9.9.0-appdata-path.patch 604 BLAKE2B ca524ae4a52f74b687e0e0246d758178d4287b3e866651293233c7055a38cdf6330fd2c2dfb0728c0b07f37b631dbd1c59159039b56be35fbc349d183dfd0dbd SHA512 411696d39dcca09a33119537600efd80bcf675714ea72548500f9c2a1112e61d53edc6d891cef770aac3cdd2cb881e169b4ab833521ae152859609871807066e +AUX converseen-0.9.9.0-gnuinstalldirs.patch 5272 BLAKE2B b2f0faa57923c5d452e3a2ef2b397a743cc84c65d8ebee4ac415301669045190b1b3fb075ed51726e63bc016da7b32432f4b887b50dab823bab3a10bdc96fcc3 SHA512 97109e00cfdb9d1288bd04466e455a514cc7f8e3f5f40caaa819d0f886df71c259e18f66ef921ef60f7301c2ac745fb33869b1af486fd1acc2e2e7b034a2afa7 +AUX converseen-0.9.9.0-no-update.patch 540 BLAKE2B b8a7bcf561a4be48fdf9137a40c1f5b1451915a6cf4b2043f9adaf8dd1aa853b331ee1499bb34d05ae9e7da2d9f3f0515c62dca8146d4957126054557ebfcceb SHA512 b5ed008bd7a01cb99ec97faa6c9bd412009f1d438c420e201d2605c713ff57c346391d5389ed019c0538a263154d1ed36c4a581d0582d2c2eadf8dc77a67b97b +DIST converseen-0.9.9.0.tar.gz 280547 BLAKE2B 978df93748cd5585b99f371f9538f9ae0a6fa683c9a452a8fb3eceb0c6a7b972423dbd396f8702a4db839852d39bb7c3b654603a08a5dc61481ed74c6aa3aa0b SHA512 8ec01de40fc32bc83c97b3e1d1d0400b9ae5c8c5f374dfae452a75f1bec648d6db26ea036103e15c84e4360ed83f27ce5d35a64592289de083e9701e6153ca63 +EBUILD converseen-0.9.9.0.ebuild 920 BLAKE2B 7073b3949153d19105683f128d80b5436e60ca1bf6fd1feeda01139c90393edfb5bb9fb5d619418b5150a9cc475e3e6e9fc87292ca5ae812b2a7f95e063c840e SHA512 f3653c59362910ede54693e14ca1d6d3ecbc0cca687e2dead3872bd30e25fe7196b277df2bed2998ad2aa1fe6dcd20c922bd854b0161d25e6cd4f46a57c75c7a MISC metadata.xml 252 BLAKE2B 85d312e9856476325a3b52f7e18559dc488db547c2a07da42e5e35921c22d893dd5b665fe34d18a391fc74ace49af2be8b60f59df208b83ae25a8ee1b36647dc SHA512 155ed9dbb0dd8e884779b634a9661de44f25cca743fd1b4e81164a1fa7bccf95b122f7492475a6648ac34230e1a4933d9d873204440f9d9ebce162aa0a707caa diff --git a/media-gfx/converseen/converseen-0.9.6.2.ebuild b/media-gfx/converseen/converseen-0.9.6.2.ebuild deleted file mode 100644 index 4432577b94d1..000000000000 --- a/media-gfx/converseen/converseen-0.9.6.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Batch image converter and resizer based on ImageMagick" -HOMEPAGE="https://converseen.fasterland.net/ - https://github.com/Faster3ck/Converseen/" -SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -# FIXME: graphicsmagick dependency does not work properly, failures when compiling -# || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] ) -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - media-gfx/imagemagick:=[cxx] -" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 -" - -S="${WORKDIR}/${P^}" - -PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" ) diff --git a/media-gfx/converseen/converseen-0.9.9.0.ebuild b/media-gfx/converseen/converseen-0.9.9.0.ebuild new file mode 100644 index 000000000000..06de610772d2 --- /dev/null +++ b/media-gfx/converseen/converseen-0.9.9.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Batch image converter and resizer based on ImageMagick" +HOMEPAGE="https://converseen.fasterland.net/ + https://github.com/Faster3ck/Converseen/" +SRC_URI="https://github.com/Faster3ck/Converseen/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +# FIXME: graphicsmagick dependency does not work properly, failures when compiling +# || ( media-gfx/imagemagick[cxx] media-gfx/graphicsmagick[cxx,imagemagick] ) +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + media-gfx/imagemagick:=[cxx] +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/linguist-tools:5 +" + +S="${WORKDIR}/${P^}" + +PATCHES=( + "${FILESDIR}/${P}-gnuinstalldirs.patch" + "${FILESDIR}/${P}-appdata-path.patch" + "${FILESDIR}/${P}-no-update.patch" +) diff --git a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch deleted file mode 100644 index 3b53d056948c..000000000000 --- a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch +++ /dev/null @@ -1,64 +0,0 @@ -From ba62e29b7739c96ad073a7c14d4fdb5883dbe94c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Tue, 9 Jan 2018 02:06:09 +0100 -Subject: [PATCH] Use GNUInstalldirs - -No need to reinvent the wheel, make use of standards provided by cmake. ---- - CMakeLists.txt | 36 +++++++++++++++++++----------------- - 1 file changed, 19 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a944102..de5e556 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6) - SET(GUI "converseen") - SET(QT_USE_QTNETWORK TRUE) - -+include(GNUInstallDirs) -+ - ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} ) - - SET(converseen_UIS -@@ -129,20 +131,20 @@ ADD_EXECUTABLE(${GUI} - - TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY}) - --install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) --install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) --install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) --install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus) --install(FILES converseen.appdata.xml DESTINATION /usr/share/appdata/) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) -+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) -+install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps) -+install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus) -+install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) --- -2.15.1 - diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch new file mode 100644 index 000000000000..127fc7ad926c --- /dev/null +++ b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch @@ -0,0 +1,17 @@ +Description: install appdata to package directory + The CMAKE_INSTALL_PREFIX was not set to install path and set its correct + location. +Author: Laszlo Boszormenyi (GCS) +Last-Update: 2018-08-21 + +--- a/converseen.pro ++++ b/converseen.pro +@@ -122,7 +122,7 @@ loc/converseen_uk_UA.qm + desktopFile.files = res/converseen.desktop + kdeservicemenu.path = $${SHARE_DIR}/kservices5/ServiceMenus + kdeservicemenu.files = res/converseen_import.desktop +- appdata.path = /usr/share/appdata/ ++ appdata.path = /usr/share/metainfo/ + appdata.files = converseen.appdata.xml + + isEmpty(QMAKE_LRELEASE) { diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch new file mode 100644 index 000000000000..50ad7a01e8db --- /dev/null +++ b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch @@ -0,0 +1,68 @@ +From 6dbded67fdbe977719ded2a6ffdcdc87165dd541 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 9 Jan 2018 02:06:09 +0100 +Subject: [PATCH] Use GNUInstalldirs + +No need to reinvent the wheel, make use of standards provided by cmake. +--- + CMakeLists.txt | 40 +++++++++++++++++++++------------------- + 1 file changed, 21 insertions(+), 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f135b66..4bd8764 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6) + SET(GUI "converseen") + SET(QT_USE_QTNETWORK TRUE) + ++include(GNUInstallDirs) ++ + ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} ) + + SET(converseen_UIS +@@ -131,22 +133,22 @@ ADD_EXECUTABLE(${GUI} + + TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY}) + +-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) +-install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications) +-install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps) +-install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus) +-install(FILES converseen.appdata.xml DESTINATION /usr/share/metainfo/) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) +-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc) ++install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR}) ++install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) ++install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps) ++install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus) ++install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_fr_FR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_hu_HU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_it_IT.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pt_BR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_tr_TR.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ru_RU.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) ++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc) +-- +2.30.1 + diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch new file mode 100644 index 000000000000..f4dad00586ab --- /dev/null +++ b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch @@ -0,0 +1,20 @@ +Description: Don't check upstream versions + Don't check new versions page due to privacy concerns. +Forwarded: no +Last-Update: 2018-08-21 +Author: Laszlo Boszormenyi (GCS) +Bug-Debian: https://bugs.debian.org/761944 + +--- + +--- a/src/mainwindowimpl.cpp ++++ b/src/mainwindowimpl.cpp +@@ -1012,7 +1012,7 @@ void MainWindowImpl::openFlattrLink() + void MainWindowImpl::checkForUpdates() + { + UpdateChecker *up = new UpdateChecker(); +- up->checkForUpdates(); ++// up->checkForUpdates(); + } + + void MainWindowImpl::bugReport() diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest index 1382260654d9..283f22dc0c16 100644 --- a/media-gfx/gif2png/Manifest +++ b/media-gfx/gif2png/Manifest @@ -3,6 +3,6 @@ DIST gif2png-2.5.12.tar.gz 31613 BLAKE2B 8614d3e0435bab334465d3f43d8676a80f1041e DIST gif2png-2.5.14.tar.gz 221609 BLAKE2B de1e66a0880579a2d4d3681ec8cbbe3ef37da1cd05e40336b398266f386d629645f9d45738098c9e3f9528cb5dbdd5c37ed00f5d5c8bcd85e0a31fd375f38a76 SHA512 a1ea3b64da64274a3363089beee748605eb24d3e05bcace29d26618a9ab3580f5ac85da893af16975c91d571866625e0883f0a4b375e82c468754f84f8982f03 DIST gif2png-2.5.9.tar.gz 137750 BLAKE2B a5fb0570f6263c1911a4cad52f1b974f8010a02cf882f2e1e40ed7dbbce4be8b75290e4b0a78b5dde74cc244c9a848dd429a937e696746d3d39b8cec9dd469fd SHA512 0632f1b4b96a1e4b5567101fbac36db55e658503977c8c875d75d9c1db5b374deba5afbda5507585b6b79242781fd70afc477e686458cc124adb8e1b29860c1e EBUILD gif2png-2.5.12.ebuild 824 BLAKE2B 9102092ff19c7f7c8e2628a1d93699c628202e50f0d587a2c05bf0c6dbe7cbb51f524403435552ca08b3c98a6666822eda153e363514a73a01f99bfdf9702a6e SHA512 22fd274b541e4779a990009a3365a830f85b26835385c1ece11a3cf266474b90bdab477bd73e15a91e32c5c947565c7519bfc3dba00d1fe87639a06f1e740ca1 -EBUILD gif2png-2.5.14.ebuild 581 BLAKE2B 0df0aa0a58cd5d1121c69601672bc54b7c075bb47f284a09241b18c7d562b0f402a7cfcfcd93ec1b46e867d4f89d62b335d60141329fe10d340b763383d14a66 SHA512 238c5a5e2ddf9268b0788a1335f17b59e12ea3847a399a295a4dbfe61b6dd535c4b71b424602816ffade5dab36f4b0f13fdfa39bf36ffc96c267137f9e923940 +EBUILD gif2png-2.5.14.ebuild 673 BLAKE2B 65922e19b9adce9ce07c5f3ecb44806a3093e8b011d08a7dc41ccd6524d41a876f35650a423e5c9205cc178708724e7fb78f9e9a95c453c7e17fbf6f5ef3f5f1 SHA512 ed26ce8204e28aa0b824bd2463aebf7af3269d53be9fadc6fe0636c9932114a9436e7d87b76d23cb0077b8eb248ebae7b1bcc29e4eb6291489fbb43e5893e0d2 EBUILD gif2png-2.5.9.ebuild 472 BLAKE2B 7e87e3e7bcc682a9d0642882312fce3c9cd70a47a427be947989cad1fe66f49fbb82404b417c8388c60cc4bd313a4ca6a94062a430ee465403f1ad0031e31734 SHA512 e3fed27af7cd3ccfbe2ee618a547fc3a7a5729cef1fa48798a9f8001de6b08a23ce67a239cf33b96ff8a41a49e2941c1f68e93271de626a7a605813ac6745d8e MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-gfx/gif2png/gif2png-2.5.14.ebuild b/media-gfx/gif2png/gif2png-2.5.14.ebuild index 41f89555dbb3..3e81c042cda4 100644 --- a/media-gfx/gif2png/gif2png-2.5.14.ebuild +++ b/media-gfx/gif2png/gif2png-2.5.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,12 +11,16 @@ SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz" LICENSE="ZLIB" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=">=media-libs/libpng-1.2:0= sys-libs/zlib:=" DEPEND="${RDEPEND}" +# Tests are known to fail, #688702 +# EOL; Upstream has rewritten gif2png in Go +RESTRICT=test + src_prepare() { default diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest index 89242d449b9a..3baa790257ed 100644 --- a/media-gfx/gimp/Manifest +++ b/media-gfx/gimp/Manifest @@ -1,14 +1,8 @@ AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067 AUX gimp-2.99.2_fix_autoconf-2.70.patch 1913 BLAKE2B 779ce5a54150ee2a89507420931f255c09602af36ab8176f7ae9f18a7c1feb12451e817d2a89251d0366af6db90f602a107108227c98ac99b73e16ddb7b1fd05 SHA512 efa8882896335d3ac4ae7fb8874b5bd568472ccdcaeaf1d771f6c6b815b138186016f39f5f2f30fa01c1018ad583649fcf564cc5a8bcece741092f7dbc22f5fa -DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6 DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0 -DIST gimp-2.99.2.tar.bz2 32375596 BLAKE2B 3dc5af7935e3503106cf2020798974d68fe86e5034792b09683519502474022e3a7832f418dfcdb4a022e6ebe878bb567bfbbbe51a96f0ae76375adc0dfdd6e5 SHA512 0a773ab01427abfb1b7690e855a041dc4883630fc827ce9d83169ccc5b4f925ecb9a0a16928a9c0ed0592c2c351ced5832e212d3115475c0f7a6092822adc194 DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00beda2745904c62f4b56f1f1605378358f29ab427f7df6c68251ce367e00d79a1b9b7b3d0fde22526895eb5ce27 SHA512 1abb6851f4c6af440d75d09c55dcb6bf6485739de1960fb536035935729331221265beef589386da685ad8ffbe83e0f0699cf2db55589953deae4d82aa99154b -EBUILD gimp-2.10.20-r3.ebuild 5681 BLAKE2B b23d61ef44ec157981c4656bc9a8ee3fc0cbe34e208f27793f9295c952d1df329da2544718c8a1440e7e685339697c7e4110e292a3b2f1222b6ede6c0400c593 SHA512 7469fabcfa82c7fc513fe361ea03514ce142c3252123d5c9905c9d9aeb61099d47dc7dbb833d3fe7b3a2479261d6026121d43e100fdec21ffda8266c6e9153ef -EBUILD gimp-2.10.22-r1.ebuild 5616 BLAKE2B d470f34e37338e55343ce471e51603c4ef779b04c47bc10fd364c4ff8a8f91d57421707ac87f22f8ac486b595b7a76fd5d7acb760d05542b8f3c3b3668cccc4e SHA512 9ba67887ea7b9fb6af3a382015c3c8cce5ea2cf84f04e52e8e39e3b840792a229cfd4679ab22cb70d12e7e8d4a825c0a2f532d3ae52812554c542325acfd7a8a -EBUILD gimp-2.10.22-r2.ebuild 5640 BLAKE2B dc9ee64aa55e230e1aaee8f874ed9f2bbcbffdebaf1804831131107212be1f1ca094a6f480dc7f8309d88ed7c0dadb3c6da8ab96753ca229d3c78a1de4cd2926 SHA512 287e5789074d54415a6efafcaee1ef32eefa0decf9dbd10c9429ae1c99a0949b32136b909d63304a3c0a3ba330cd46d2c7678aedfdef087a81758054cebb7e2e -EBUILD gimp-2.99.2-r100.ebuild 6732 BLAKE2B 2db2f478db9bfe4589b089aaed409edc1c0a7810140c134806ebc8f919628ce923aa81bfcc2ff6a0298532712e646228ceb0b19ee96066312ef53480aa31a549 SHA512 2df2a1dff3588d350022cd2f2a2dc3762eb2ef0216e5ea9120872252344bce17e54ec55f48cc4f8b687b2fcb4ed48d1a48bdd3f00bff2c3bdbefe5b783706046 -EBUILD gimp-2.99.2.ebuild 6512 BLAKE2B 1d78dc22084db4b9fb17ed35267a60de4f7df5a9afc3b91300832d7b29c92b0a06855528b6bc4de6f7f91e0955a371cd5885eb71749344e59589c62c6302d79a SHA512 234048d94887abb7a295ec54a93692d0815ac5a0475fc41cfad6413f254bf90be7a66be11ccba53f48c9d82a675755f11808494e37a970e5d9cce0e19e3e45af +EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be EBUILD gimp-2.99.4.ebuild 6553 BLAKE2B d57881c19a9f742024773bf6ce2ace5612fada66e047abb4f121cd14326af8314fb3d9ca19ef47317e6908bb567a8207aabb6916208621a1e13870e2e4b2136e SHA512 f4f03298670b734e1ff69d6ee2c57e9f01f79a57236fd6b9518b67cc7f4672c0486b3e63182913826f08fc0c5e0e5d86ee844e435f5c598c86d24e0af6c15aa6 EBUILD gimp-9999.ebuild 6990 BLAKE2B a24f11b76b68054be80cb854083aac1894049fd7a0d63b22ac0159032423c6f31295e767030a4bb48c5a63073d8a50dcde1ca43f345323c538e46a1c2344265c SHA512 f645dcdd4118822cc7149f36fd0c2e51dd40620375c72de9dbc0b6abf49916bc9fca907793ee5a97197bac7ce87561809e12364b42dd2c4ea9bd7683674c34cb MISC metadata.xml 546 BLAKE2B 2d5b9a68c47a72325199586a142f1d8344bef770d24738169c80958f3def3a0f1ad0b4d23774d3c458d80f17a394033813e01fc5e24b8b62146d2c55b5f8c9b0 SHA512 f654d93c738c942605ae61fe0d76972a1b81bffaf4edc23a1f55bb65e71022df7f14e769a71c41e5c5c7307eef9618a667ae418dc9bc77d5ac1299bbe0c58834 diff --git a/media-gfx/gimp/gimp-2.10.20-r3.ebuild b/media-gfx/gimp/gimp-2.10.20-r3.ebuild deleted file mode 100644 index c97aa67e769a..000000000000 --- a/media-gfx/gimp/gimp-2.10.20-r3.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF=yes -WANT_AUTOMAKE= - -inherit autotools gnome2 toolchain-funcs virtualx - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="0/2" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86" - -IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=app-text/poppler-0.50[cairo] - >=app-text/poppler-data-0.4.7 - >=dev-libs/atk-2.2.0 - >=dev-libs/glib-2.56.2:2 - >=dev-libs/json-glib-1.2.6 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.6:2 - >=media-gfx/mypaint-brushes-1.3.0:= - >=media-libs/babl-0.1.78 - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.1.7 - >=media-libs/gegl-0.4.24:0.4[cairo] - =media-libs/gexiv2-0.10.6 - >=media-libs/harfbuzz-0.9.19 - >=media-libs/lcms-2.8:2 - >=media-libs/libmypaint-1.3.0:= - >=media-libs/libpng-1.6.25:0= - >=media-libs/tiff-3.5.7:0 - net-libs/glib-networking[ssl] - sys-libs/zlib - virtual/jpeg - >=x11-libs/cairo-1.12.2 - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/gtk+-2.24.32:2 - x11-libs/libXcursor - >=x11-libs/pango-1.29.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.3.2:= ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - postscript? ( app-text/ghostscript-gpl ) - udev? ( dev-libs/libgudev:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -DEPEND=" - ${COMMON_DEPEND} - >=dev-lang/perl-5.10.0 - dev-libs/appstream-glib - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.40.1 - sys-apps/findutils - >=sys-devel/gettext-0.19 - >=sys-devel/libtool-2.2 - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) - -# Bugs 685210 (and duplicate 691070) -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" -) - -src_prepare() { - if has_version "media-gfx/mypaint-brushes:2.0" ; then - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 - fi - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 - - gnome2_src_prepare # calls eautoreconf - - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test - - export CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - - --enable-default-binary - - --disable-check-update - --disable-python - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with jpeg2k jpeg2000) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- - ( - cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || exit 1 - mv {,${prepend}}${plugin} || exit 1 - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - # Remove gimp devel-docs html files if user doesn't need it - if ! use doc; then - rm -r "${ED%/}"/usr/share/gtk-doc || die - fi - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.10.22-r1.ebuild b/media-gfx/gimp/gimp-2.10.22-r1.ebuild deleted file mode 100644 index d0bc4bc4388f..000000000000 --- a/media-gfx/gimp/gimp-2.10.22-r1.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF=yes -WANT_AUTOMAKE= - -inherit autotools gnome2 toolchain-funcs virtualx - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" - -IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" - -RESTRICT="!test? ( test )" - -COMMON_DEPEND=" - >=app-text/poppler-0.50[cairo] - >=app-text/poppler-data-0.4.7 - >=dev-libs/atk-2.2.0 - >=dev-libs/glib-2.56.2:2 - >=dev-libs/json-glib-1.2.6 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.6:2 - >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.78 - >=media-libs/fontconfig-2.12.4 - >=media-libs/freetype-2.1.7 - >=media-libs/gegl-0.4.26:0.4[cairo] - =media-libs/gexiv2-0.10.6 - >=media-libs/harfbuzz-0.9.19 - >=media-libs/lcms-2.8:2 - >=media-libs/libmypaint-1.3.0:= - >=media-libs/libpng-1.6.25:0= - >=media-libs/tiff-3.5.7:0 - net-libs/glib-networking[ssl] - sys-libs/zlib - virtual/jpeg - >=x11-libs/cairo-1.12.2 - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/gtk+-2.24.32:2 - x11-libs/libXcursor - >=x11-libs/pango-1.29.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.3.2:= ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-1.6.1:= ) - postscript? ( app-text/ghostscript-gpl ) - udev? ( dev-libs/libgudev:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -DEPEND=" - ${COMMON_DEPEND} - >=dev-lang/perl-5.10.0 - dev-libs/appstream-glib - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.40.1 - sys-apps/findutils - >=sys-devel/gettext-0.19 - >=sys-devel/libtool-2.2 - virtual/pkgconfig -" - -DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" ) - -# Bugs 685210 (and duplicate 691070) -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" -) - -src_prepare() { - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 - - gnome2_src_prepare # calls eautoreconf - - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test - - export CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/bin/false - - --enable-default-binary - - --disable-check-update - --disable-python - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with jpeg2k jpeg2000) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- - ( - cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || die - mv {,${prepend}}${plugin} || die - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - # Remove gimp devel-docs html files if user doesn't need it - if ! use doc; then - rm -r "${ED%/}"/usr/share/gtk-doc || die - fi - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.10.22-r2.ebuild b/media-gfx/gimp/gimp-2.10.22-r2.ebuild index 786ca884d747..7da8cd3f7e7c 100644 --- a/media-gfx/gimp/gimp-2.10.22-r2.ebuild +++ b/media-gfx/gimp/gimp-2.10.22-r2.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/" SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="0/2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86" IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" diff --git a/media-gfx/gimp/gimp-2.99.2-r100.ebuild b/media-gfx/gimp/gimp-2.99.2-r100.ebuild deleted file mode 100644 index 8bbabf615be5..000000000000 --- a/media-gfx/gimp/gimp-2.99.2-r100.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{7,8,9} ) -GNOME2_EAUTORECONF=yes -VALA_MIN_API_VERSION="0.40" -VALA_USE_DEPEND=vapigen - -inherit autotools gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="0/3" -#KEYWORDS="~amd64" - -IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -# media-libs/{babl,gegl} are required to be built with USE="introspection" -# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir} -COMMON_DEPEND=" - >=app-text/poppler-0.90.1[cairo] - >=app-text/poppler-data-0.4.9 - >=dev-libs/atk-2.34.1 - >=dev-libs/glib-2.62.6:2 - >=dev-libs/json-glib-1.4.4 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.21:2 - >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.78[introspection,lcms,vala?] - >=media-libs/fontconfig-2.12.6 - >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala?] - =media-libs/gexiv2-0.10.10 - >=media-libs/harfbuzz-2.6.5 - >=media-libs/lcms-2.9:2 - >=media-libs/libmypaint-1.6.1:= - >=media-libs/libpng-1.6.37:0= - >=media-libs/tiff-4.1.0:0 - net-libs/glib-networking[ssl] - sys-libs/zlib - virtual/jpeg - >=x11-libs/cairo-1.16.0 - >=x11-libs/gdk-pixbuf-2.40.0:2 - >=x11-libs/gtk+-3.24.16:3 - x11-libs/libXcursor - >=x11-libs/pango-1.42.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.7.0:= ) - javascript? ( dev-libs/gjs ) - jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) - lua? ( - ${LUA_DEPS} - $(lua_gen_cond_dep ' - dev-lua/lgi[${LUA_USEDEP}] - ') - ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-2.3.0:= ) - postscript? ( app-text/ghostscript-gpl ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}] - ') - ) - udev? ( >=dev-libs/libgudev-167:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -DEPEND=" - ${COMMON_DEPEND} - >=dev-lang/perl-5.30.3 - >=dev-libs/appstream-glib-0.7.16 - dev-util/gdbus-codegen - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.51.0 - sys-apps/findutils - >=sys-devel/autoconf-2.54 - >=sys-devel/automake-1.11 - >=sys-devel/gettext-0.21 - >=sys-devel/libtool-2.4.6 - doc? ( - >=dev-util/gtk-doc-1.32 - dev-util/gtk-doc-am - ) - vala? ( $(vala_depend) ) -" - -# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now -BDEPEND="virtual/pkgconfig" - -DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" ) - -# Bugs 685210 (and duplicate 691070) -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" - "${FILESDIR}/${P}_fix_autoconf-2.70.patch" -) - -pkg_setup() { - use lua && lua-single_pkg_setup - - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - sed -i -e 's/\[gegl_micro_version\], \[27\]/\[gegl_micro_version\], \[26\]/' configure.ac || die - - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 - - gnome2_src_prepare # calls eautoreconf - - use vala && vala_src_prepare - - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test - - export CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen - - --enable-default-binary - - --disable-check-update - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable doc gtk_doc) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with javascript) - $(use_with jpeg2k jpeg2000) - $(use_with lua) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with python) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with vala) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- - ( - cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || exit 1 - mv {,${prepend}}${plugin} || exit 1 - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - if use python; then - python_optimize - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/gimp-2.99.2.ebuild b/media-gfx/gimp/gimp-2.99.2.ebuild deleted file mode 100644 index 11f59c30f1f3..000000000000 --- a/media-gfx/gimp/gimp-2.99.2.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{7,8,9} ) -GNOME2_EAUTORECONF=yes -VALA_MIN_API_VERSION="0.40" -VALA_USE_DEPEND=vapigen - -inherit autotools gnome2 python-single-r1 toolchain-funcs vala virtualx - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="0/3" -#KEYWORDS="~amd64" - -IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="!test? ( test )" - -# media-libs/{babl,gegl} are required to be built with USE="introspection" -# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir} -COMMON_DEPEND=" - >=app-text/poppler-0.90.1[cairo] - >=app-text/poppler-data-0.4.9 - >=dev-libs/atk-2.34.1 - >=dev-libs/glib-2.62.6:2 - >=dev-libs/json-glib-1.4.4 - dev-libs/libxml2:2 - dev-libs/libxslt - >=gnome-base/librsvg-2.40.21:2 - >=media-gfx/mypaint-brushes-2.0.2:= - >=media-libs/babl-0.1.78[introspection,lcms,vala?] - >=media-libs/fontconfig-2.12.6 - >=media-libs/freetype-2.10.2 - >=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala?] - =media-libs/gexiv2-0.10.10 - >=media-libs/harfbuzz-2.6.5 - >=media-libs/lcms-2.9:2 - >=media-libs/libmypaint-1.6.1:= - >=media-libs/libpng-1.6.37:0= - >=media-libs/tiff-4.1.0:0 - net-libs/glib-networking[ssl] - sys-libs/zlib - virtual/jpeg - >=x11-libs/cairo-1.16.0 - >=x11-libs/gdk-pixbuf-2.40.0:2 - >=x11-libs/gtk+-3.24.16:3 - x11-libs/libXcursor - >=x11-libs/pango-1.42.4 - aalib? ( media-libs/aalib ) - alsa? ( >=media-libs/alsa-lib-1.0.0 ) - aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) - heif? ( >=media-libs/libheif-1.7.0:= ) - javascript? ( dev-libs/gjs ) - jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= ) - lua? ( - dev-lang/luajit - dev-lua/lgi - ) - mng? ( media-libs/libmng:= ) - openexr? ( >=media-libs/openexr-2.3.0:= ) - postscript? ( app-text/ghostscript-gpl ) - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}] - ') - ) - udev? ( >=dev-libs/libgudev-167:= ) - unwind? ( >=sys-libs/libunwind-1.1.0:= ) - webp? ( >=media-libs/libwebp-0.6.0:= ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - xpm? ( x11-libs/libXpm ) -" - -RDEPEND=" - ${COMMON_DEPEND} - x11-themes/hicolor-icon-theme - gnome? ( gnome-base/gvfs ) -" - -DEPEND=" - ${COMMON_DEPEND} - >=dev-lang/perl-5.30.3 - >=dev-libs/appstream-glib-0.7.16 - dev-util/gdbus-codegen - dev-util/gtk-update-icon-cache - >=dev-util/intltool-0.51.0 - sys-apps/findutils - >=sys-devel/autoconf-2.54 - >=sys-devel/automake-1.11 - >=sys-devel/gettext-0.21 - >=sys-devel/libtool-2.4.6 - virtual/pkgconfig - doc? ( - >=dev-util/gtk-doc-1.32 - dev-util/gtk-doc-am - ) - vala? ( $(vala_depend) ) -" - -DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" ) - -# Bugs 685210 (and duplicate 691070) -PATCHES=( - "${FILESDIR}/${PN}-2.10_fix_test-appdata.patch" - "${FILESDIR}/${P}_fix_autoconf-2.70.patch" -) - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - sed -i -e 's/\[gegl_micro_version\], \[27\]/\[gegl_micro_version\], \[26\]/' configure.ac || die - - sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794 - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 - - gnome2_src_prepare # calls eautoreconf - - use vala && vala_src_prepare - - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test - - export CC_FOR_BUILD="$(tc-getBUILD_CC)" -} - -_adjust_sandbox() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - - addwrite /dev/dri/ # bugs #574038 and #684886 - addwrite /dev/ati/ # bug #589198 - addwrite /proc/mtrr # bug #589198 -} - -src_configure() { - _adjust_sandbox - - local myconf=( - GEGL="${EPREFIX}"/usr/bin/gegl-0.4 - GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen - - --enable-default-binary - - --disable-check-update - --enable-mp - --with-appdata-test - --with-bug-report-url=https://bugs.gentoo.org/ - --with-xmc - --without-libbacktrace - --without-webkit - --without-xvfb-run - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable doc gtk_doc) - $(use_enable vector-icons) - $(use_with aalib aa) - $(use_with alsa) - $(use_with !aqua x) - $(use_with heif libheif) - $(use_with javascript) - $(use_with jpeg2k jpeg2000) - $(use_with lua) - $(use_with mng libmng) - $(use_with openexr) - $(use_with postscript gs) - $(use_with python) - $(use_with udev gudev) - $(use_with unwind libunwind) - $(use_with vala) - $(use_with webp) - $(use_with wmf) - $(use_with xpm libxpm) - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - export XDG_DATA_DIRS="${EPREFIX}"/usr/share # bug 587004 - gnome2_src_compile -} - -# for https://bugs.gentoo.org/664938 -_rename_plugins() { - einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...' - local prepend=gimp-org- - ( - cd "${ED%/}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1 - for plugin_slash in $(ls -d1 */); do - plugin=${plugin_slash%/} - if [[ -f ${plugin}/${plugin} ]]; then - # NOTE: Folder and file name need to match for Gimp to load that plug-in - # so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg" - mv ${plugin}/{,${prepend}}${plugin} || exit 1 - mv {,${prepend}}${plugin} || exit 1 - fi - done - ) -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - if use python; then - python_optimize - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die - - find "${D}" -name '*.la' -type f -delete || die - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die - - _rename_plugins || die -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest index 98eb1906a9ef..e2731758d2f2 100644 --- a/media-gfx/gnofract4d/Manifest +++ b/media-gfx/gnofract4d/Manifest @@ -1,5 +1,5 @@ DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5 DIST gnofract4d-4.3_p20201029.tar.gz 18270417 BLAKE2B 82d9f9528c33cf73478fa48d8692617237029944e68d9626d0c39e088b1b6aebc02a8c32a1a0e14c8d115cf3f0434940ec8a8c3d915fc9967b22f7e51353dd6b SHA512 f5844a88c41941429379efe99d1e0593a994a42d600e6e05f722c01c4ced48ceff730bf6bc797e083bd558931d39a31ffe86021eac0f0c6ec0f3047569962e3f EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1692 BLAKE2B 3d0166786e13eec846261a767964d0d33c51fdce2f14d38e8a53bfd674cf4c8bb9fb5a782c2cfee72beb8dc95802f153ce991204f771f02b8aee8777e11efefb SHA512 54816af22aca7b54eb212f16fd208eca5dd8ef1ac2f66a811127395bcef896d344589f22112f9e74878568e58dca9b49cd5cac85768159542eb8c846d9a372cb -EBUILD gnofract4d-4.3_p20201029.ebuild 1477 BLAKE2B b1e5dd2e1f819159802f947a17309b041ea2b6800fc262cc04caddd02968d9dc7b87a14d12868b46204b82772685ef129cb03af678d32477e934ef8935db0d9e SHA512 ec708a9b638461e48a6f89281b20f32a46585e9a1577d9453926c075d4d492b955f3cb4d59d0088e343175d311709764d59ea92685a7644a37ecb36e02bd028b +EBUILD gnofract4d-4.3_p20201029.ebuild 1475 BLAKE2B f15026f582a54433bdee4b1f3dd30088b7b21b1760b905d8b20e205bc5301cd33aea19eb32d24e65787cd438cece03936abfe9618bf8d77dd15e8a7a9643250d SHA512 df41fc77faec92e3ad3e4ec4323b561471ee7affbf463851a46decec2f3a46e7a963481e1c5721942f9ffca62788d29c6e5edcc9e91af7656e5e0ad4f2e81031 MISC metadata.xml 504 BLAKE2B b5087f6e8de7658fdb35b694f16dff28b7ecd6c600c787299df812174613a71ef605595531cb97df0e098bfcb10664c40e9e091b76a62078626d944387b2cadd SHA512 03e3638abe60e3a4350eb1770d5fdeb287e3eb83418d266b65ef839031e6eb6d82d5fb2546611038819c1fb302a69a047c9283b922bdb055110722cb4fb2f20f diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild index 18603a79dacf..414a07e0ba72 100644 --- a/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild +++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}. LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=" media-libs/libpng:0= diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest index 538f2b4207f4..bd8beb7a0b67 100644 --- a/media-gfx/gthumb/Manifest +++ b/media-gfx/gthumb/Manifest @@ -1,5 +1,3 @@ -DIST gthumb-3.10.0.tar.xz 7550040 BLAKE2B 183ffa4c567728375c34a3f84c72d44f266a893fa8d4be7b8270faa2a120bf2e6c61d5e35494aa5e4d4e14366017adbb020f7a3dc8c51b6f012e8f18cee1a72f SHA512 d7bcac6b260bf7d5816af69ea89953517cbc43ea289227ccceebd0700b753a7d97349e6a30ec6bbb42690c56abff5b69dc3fc073f1ee2831ae1aa7d220722efd DIST gthumb-3.10.2.tar.xz 7582448 BLAKE2B 29c6e74706e0f78c4a641841861f9e4d996c5baa7e9a26e12352e6c124402bad24af1ee45871f413de4935abe53109ffad484ed8d853c131cfa438714e4226b5 SHA512 3b4d23a744e0663a0358d41697b1b01ec2faa3f12fc29853c82de8109dec5ef66c3827ed6e0efb97147e34ab9643b42daedc3ee7babe03f486ba589323604b74 -EBUILD gthumb-3.10.0.ebuild 2245 BLAKE2B ab309d292e1cecd8afb910fe6963e0452a21117dcfb6394205251eba8298f3814adc0e5cfb6a39e56a1e45ec30e437d6794c736f1cf1ad4d631e8501e8fe4e2b SHA512 2013a04786f36a73583fe61864e117ab3e34e6c86a4b85d7eed019e820d6cc2a661a52e9a5044115a93970e1110f872ab4f2400719130a6c620cdb4e277401b3 -EBUILD gthumb-3.10.2.ebuild 2247 BLAKE2B dc4242733fa9fc7b549adce4b108a45e73386a6c192b2c8f3f49cf2067c8395ff4b0f3158b33947938fddb92e0d8b6fdddb0264d6ae2b048a948eb77c2e0b36e SHA512 152c07ca4316b016770a6a1acec0d2fde4fd835625a156406aee9e7b790ebde16bdc0262510f3aa4f907c4e6dc237df541b452f3539f49885aa7b6b43837863e +EBUILD gthumb-3.10.2.ebuild 2245 BLAKE2B 28314db4585b015cb840a5518fe88029b3bd5367c4001cad2b30456903bb3c55165e3e2de162159c5a93a7983c534b15a93b70a9155048888d67107db3bc7905 SHA512 794bc6f1e88a4a0d9c3deda091d0dda93ed5cf85c8f21c2d9ee6de0c98846b8002522fac9a6132e857abcf7746b04c7b7a7c3781a7b5b1d120f96402dd787bdf MISC metadata.xml 420 BLAKE2B d43a138708de7341b7b449d8bc7cbd6dedc471844ee9edac0b4cfa075ba582d5079d6eeacef69031cbfe9ef78493e50cc8f6810f3b80991cb552ffb3a2ca2757 SHA512 856096108784110fbbeeb1c3c5072697f7555edd733f31cfa4820f57e24a1e384f4ab609c77c3ce3a0d8e873c0193e493ea90085509b77686ab46e3f9ff3fc2d diff --git a/media-gfx/gthumb/gthumb-3.10.0.ebuild b/media-gfx/gthumb/gthumb-3.10.0.ebuild deleted file mode 100644 index a7ddac9f803c..000000000000 --- a/media-gfx/gthumb/gthumb-3.10.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit gnome.org gnome2-utils meson xdg - -DESCRIPTION="Image viewer and browser for Gnome" -HOMEPAGE="https://wiki.gnome.org/Apps/gthumb" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp" - -RDEPEND=" - >=dev-libs/glib-2.54.0:2 - >=x11-libs/gtk+-3.16.0:3 - exif? ( >=media-gfx/exiv2-0.21:= ) - slideshow? ( - >=media-libs/clutter-1.12.0:1.0 - >=media-libs/clutter-gtk-1:1.0 ) - gstreamer? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - media-plugins/gst-plugins-gtk:1.0 ) - raw? ( >=media-libs/libraw-0.14:= ) - http? ( >=net-libs/libsoup-2.42.0:2.4 - >=dev-libs/json-glib-0.15.0 - >=net-libs/webkit-gtk-1.10.0:4 ) - gnome-keyring? ( >=app-crypt/libsecret-0.11 ) - cdr? ( >=app-cdr/brasero-3.2.0 ) - svg? ( >=gnome-base/librsvg-2.34:2 ) - webp? ( >=media-libs/libwebp-0.2.0:= ) - lcms? ( >=media-libs/lcms-2.6:2 ) - colord? ( >=x11-misc/colord-1.3 - >=media-libs/lcms-2.6:2 ) - - sys-libs/zlib - virtual/jpeg:0= - tiff? ( media-libs/tiff:= ) - media-libs/libpng:0= - >=gnome-base/gsettings-desktop-schemas-0.1.4 -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/itstool - sys-devel/bison - sys-devel/flex - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig -" - -src_configure() { - local emesonargs=( - -Drun-in-place=false - $(meson_use exif exiv2) - $(meson_use slideshow clutter) - $(meson_use gstreamer) - -Dlibchamplain=false # Upstream still doesn't seem to consider this ready - $(meson_use colord) - $(meson_use tiff libtiff) - $(meson_use webp libwebp) - $(meson_use raw libraw) - $(meson_use svg librsvg) - $(meson_use gnome-keyring libsecret) - $(meson_use http webservices) - $(meson_use cdr libbrasero) - ) - - # colord pulls in lcms2 anyway, so enable lcms with USE="colord -lcms"; some of upstream HAVE_COLORD code depends on HAVE_LCMS2 - if use lcms || use colord; then - emesonargs+=( -Dlcms2=true ) - else - emesonargs+=( -Dlcms2=false ) - fi - meson_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-gfx/gthumb/gthumb-3.10.2.ebuild b/media-gfx/gthumb/gthumb-3.10.2.ebuild index 208e1f2dcd15..aae8425356f4 100644 --- a/media-gfx/gthumb/gthumb-3.10.2.ebuild +++ b/media-gfx/gthumb/gthumb-3.10.2.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp" RDEPEND=" diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 3a8cd19cdef8..fe338f100a4b 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,6 +1,4 @@ -DIST hugin-2019.2.0.tar.bz2 10335030 BLAKE2B 4fbcb974eea01dbd8d722f64b5cadfd1b3fe101e5e7849d069c531e55e1ea71c226bcb1550b59374bbe8adf111b7c0bc5e48c14f45bdb685486cbeccde5add70 SHA512 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1 DIST hugin-2020.0.0.tar.bz2 10371301 BLAKE2B f5092dfe3c61344f8b03e14dd85903ae6f5170989b6824578bd3350408d7a11be2c2f9cd83d030a3967b81e4125cf97af075d79136a93e06de3fac8901859c6d SHA512 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e -EBUILD hugin-2019.2.0.ebuild 2335 BLAKE2B 34378c7149aa8b9f35956e4f068c50a0ca08803c834beaface0a4ad3ab2b75e744f81ddbd604603a6c890056e0c56abe6d5453feb6d8675120ada61a8307750d SHA512 193b61f6102aa4c6f47370db64255294cd9cf63ecfd4a7f8d0ffa98daeb071ca131ac2550229ff332bf25bec1298651943b91b1b21d41cd5ebf8a2c7eea08824 -EBUILD hugin-2020.0.0-r1.ebuild 2120 BLAKE2B f50e2d96fa5efac4a39e6f2a86dc1ddb4ffeddf3b79fa21ba096db4893053d14f074c03d46e4c5044c16e7be2db8811fbda2f24ecf86d16d49f6c1568d4ecd1d SHA512 53e5a9a7f45b0158fcfdf55e54fba08c99f4d058016349ba6abcbc1e47c1fab352f652e799fe5031a87308eaebe601f8b0d9807d91b86fa08f23ae0fe1c16b6c +EBUILD hugin-2020.0.0-r1.ebuild 2118 BLAKE2B 85617fbf8640f4bef73589f6c93d5f20de441bf4016c0db1358d4616669e453bffbb16ff433b8922f56eb282890e677acf489f47816324aea810fb0cdebfae04 SHA512 179466d5fd0784d1156e23bcc2d8f54fd11b37de5e036301747159101baca9f6108598f5a9e319eb818ab012089615c6c3c416d9425f93d3bb792c307d3c3f21 EBUILD hugin-9999.ebuild 2061 BLAKE2B 02d3b47b6a75b0cb1618a04f6267535bdf2e085eb01f24b50e943f1b2d1fe524224fb9d30a971ad901db6c4e2d4856c102b13aae6cc094b52265dd2dcbabe6ca SHA512 d15b5933ceb4e15a16a4cb437a0f09cb0655311daab2f21645a8700ec4d808174975e70b6966a796bb30f0255f1a0e2e7492d6e88ec813a9007b2a3e1eb029c3 MISC metadata.xml 546 BLAKE2B efad9c27562890b23594411333a0ef827b7e54acde132ffdec4f664eae37fb3ab270950ef650e6caaea4bd3b69a7bed469e794dce51d59850cd06ff844e08836 SHA512 0d096754e2f6ef1468e6bdf7464e6f5cc1de06f20136b68be7aaf199cd78a10e4213678d875ff61d829f692dbd5b0728d50bb35eefb1de6af4e5e0fd7d91d350 diff --git a/media-gfx/hugin/hugin-2019.2.0.ebuild b/media-gfx/hugin/hugin-2019.2.0.ebuild deleted file mode 100644 index af53b07ac8a8..000000000000 --- a/media-gfx/hugin/hugin-2019.2.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -WX_GTK_VER="3.0" -PYTHON_COMPAT=( python3_{7,8} ) - -inherit python-single-r1 wxwidgets cmake-utils eapi7-ver xdg - -MY_PV="${PV/_/-}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="GUI for the creation & processing of panoramic images" -HOMEPAGE="http://hugin.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" -SLOT="0" -KEYWORDS="amd64 arm64 x86" - -LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" -IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" - -CDEPEND=" - !!dev-util/cocom - dev-db/sqlite:3 - dev-libs/boost:= - dev-libs/zthread - >=media-gfx/enblend-4.0 - media-gfx/exiv2:= - media-libs/freeglut - media-libs/glew:= - >=media-libs/libpano13-2.9.19_beta1:0= - media-libs/libpng:0= - media-libs/openexr:= - media-libs/tiff:0 - >=media-libs/vigra-1.11.0[openexr] - sci-libs/fftw:3.0= - sci-libs/flann - sys-libs/zlib - virtual/glu - virtual/jpeg:0 - virtual/opengl - x11-libs/wxGTK:3.0=[X,opengl] - lapack? ( virtual/blas virtual/lapack ) - python? ( ${PYTHON_DEPS} ) - sift? ( media-gfx/autopano-sift-C )" -RDEPEND="${CDEPEND} - media-libs/exiftool - raw? ( media-gfx/dcraw )" -DEPEND="${CDEPEND} - dev-cpp/tclap - sys-devel/gettext - virtual/pkgconfig - python? ( >=dev-lang/swig-2.0.4 )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DOCS=( authors.txt README TODO ) - -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 - -pkg_setup() { - use python && python-single-r1_pkg_setup - setup-wxwidgets -} - -src_prepare() { - sed -i \ - -e "/COMMAND.*GZIP/d" \ - -e "s/\.gz//g" \ - "${S}"/doc/CMakeLists.txt || die - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DBUILD_HSI=$(usex python) - -DENABLE_LAPACK=$(usex lapack) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - use python && python_optimize - - mkdir -p "${ED}"/usr/share/metainfo || die - mv "${ED}"/usr/share/appdata/* "${ED}"/usr/share/metainfo/ || die - rmdir "${ED}"/usr/share/appdata || die - - local lang - for lang in ${LANGS} ; do - case ${lang} in - ca) dir=ca_ES;; - ca-valencia) dir=ca_ES@valencia;; - cs) dir=cs_CZ;; - *) dir=${lang/-/_};; - esac - if ! use l10n_${lang} ; then - rm -r "${ED%/}"/usr/share/locale/${dir} || die - fi - done -} diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild index e90610cc03a1..8a8381d740e3 100644 --- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild +++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" SLOT="0" -KEYWORDS="~amd64 arm64 ~x86" +KEYWORDS="amd64 arm64 x86" LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW" IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})" diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index f3e1bec06c78..ecdcd117baeb 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -2,11 +2,17 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 DIST ImageMagick-6.9.11-61.tar.xz 9171260 BLAKE2B 89047378e414a7455baa28d413f49dfce3eb54e462211ba5e61f786111c569b26166217ca7e9f5e12c0602bde64c8e9726a67ee3c6be4366d692c2b6232dbbbf SHA512 742fb0b3ff4da98ff05a7fd48b1c5db038bf276975575c4e549f30d61001384c6b508cff526f621467d38a29a9cf015f0cc8c42801720f1b47d6737afb4bac78 DIST ImageMagick-6.9.11-62.tar.xz 9172472 BLAKE2B 4be79ca6024f6d8e12fe492e6a541dfc4c6b70bf33dcfa8b3d2bb4d9a774a39bb974683e7444c47ee82349ae21e05fba458bcc45b71656f55084c9354ef7ddf6 SHA512 92987953b01c8ecdc3be0b78ee7bdc9e50e0a581f9682f283fcc2345a66ab2b75d678e2b989f90bcaf6eba95581b6234cb86ae33ee44faf6090760e72f838232 +DIST ImageMagick-6.9.12-2.tar.xz 9168640 BLAKE2B b0ce3b8ac5ff27f6d6fd0995d0f214f791fdce6c881e6b58579aaa22a7e87ca8d441185f69ba9d50a9aea501f28f06564ac76f7d1d5b1760206eeaf17560a8a7 SHA512 105d11d23457050c9f94223d524230ab62cdf457fe17630179c92f53a6bb60b8c04fa0f60f388303a90e2106aea6e0f1863a9a49a8fdfefd5d15d13eca58a770 DIST ImageMagick-7.0.10-61.tar.xz 10143308 BLAKE2B bc343b72567d326f30825637366e5d5614e8d53e5222fce357acf0acc9aceae84fe99d67bc7ff2d593e754b990d1e8449785a04724437b61a35e9282f9af799b SHA512 f90d8847fed7f1a5ca3fa247eb1ea115d6afe6fe379fb48733c539456663ca89426336f7ef8be087c1caa0eeafc7d63285f3c35c400fa94b30459796650421c3 DIST ImageMagick-7.0.11-0.tar.xz 10147348 BLAKE2B 7237808a9352fd1e5988b3b91245335202e78576beb1ed07362adee4320e27ad2253dc4e2f0afe5a5510a17210488a60d2a6920634475908c75823986ca9ed03 SHA512 484a1f53c0d49359fc41d681ddb3fe5bcd0fa8a9b89db1f6f19df5cba0596ab1d8c035d6e7e8d000370ebdd040c6a50ca3d867cf6e50ac29c03471bc34bb4e0e +DIST ImageMagick-7.0.11-1.tar.xz 10145440 BLAKE2B 24d4e455825b631db2d8e5c1dac8a4fe3ea2e5432db649cbc71b1486c497a6041e639bb185a4bff5393cecb762de42074fbe480e29b75d52e2fd143b27360cdd SHA512 046d6008f93506b98c064c87b81fee3e1b7bfd02f5aceb84eb01419b3e13ef8d75be9cdbbf2511247c9382f709a93c4ede53befd7a5c4f6e86d4a307cb838cc4 +DIST ImageMagick-7.0.11-2.tar.xz 10145568 BLAKE2B 2edc25dfeda99fee1d4fec4a90fcd48b350c93317082239b243874b0394cefe154ca7553fb1d688971c5352d896ff6327f31ca708a2000427601c53d0ce5c7ea SHA512 29ddf675bde3165d86f786eebfe8443cb4205d6218cb3cfa78be26d18fb30ad13913db32124377030c283156f4aa81cc28acef5cd7c1a873a66d5f563e5152ac EBUILD imagemagick-6.9.11.61-r1.ebuild 7059 BLAKE2B 15ee8b4d1965bbae05ff93a7ccbbf2e40aa70f8111984895c85e1e78941f8b8403f94c423ed439e2ff3593f48964a481aa02f96e436f0f4bbc93e197018f3c45 SHA512 a868f2837298bd861abf52e88d1ead03c533a5f68a080ed2367748a409bb90ceb68415f9837be68f8f03d859e31aef34347594a22ba4250196e259a64be82126 EBUILD imagemagick-6.9.11.62.ebuild 7066 BLAKE2B 1a8c103b4b74ec48f1d1a985e35315043f5e9306ca54183c457935279ad2e54038e65d20ac92b5d0ce3ad94d6a636179fb9b59eae087d1ea351ac12adf68e28b SHA512 443cc02aa96ba19fc040add6f56a099d2deedb72c1c2c074031dde18322c866e764d232de4d73dbf0189dc0a6777970ea5c2471d5b4e25f9bdae827f53431903 +EBUILD imagemagick-6.9.12.2.ebuild 7066 BLAKE2B 1a8c103b4b74ec48f1d1a985e35315043f5e9306ca54183c457935279ad2e54038e65d20ac92b5d0ce3ad94d6a636179fb9b59eae087d1ea351ac12adf68e28b SHA512 443cc02aa96ba19fc040add6f56a099d2deedb72c1c2c074031dde18322c866e764d232de4d73dbf0189dc0a6777970ea5c2471d5b4e25f9bdae827f53431903 EBUILD imagemagick-7.0.10.61-r1.ebuild 7368 BLAKE2B 399ea3aa93222b7639b2eebae045bb5ba3b6d98d6725c8a5daf6de62c98c8f8ef5a9841c74a29b48c84a61be2b747fa59c4be3c190e3755649254544682f7c29 SHA512 e6b19106e96f8e7350c828d45678a18c352b3097828987bb924842878628404573ac530490c108ee7be2643033de06beff5da0f6e93ce2d71d2f2df93ebc3546 EBUILD imagemagick-7.0.11.0.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08 +EBUILD imagemagick-7.0.11.1.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08 +EBUILD imagemagick-7.0.11.2.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08 EBUILD imagemagick-9999.ebuild 7375 BLAKE2B 7654a1366679222fc571f074f0c7b5369e5cc9e0f5b10d29283c9ad2bbc43587aeddbad38a83961bff1fe64c69b295f2611324cfea4c09a66bbe45acd0d0366f SHA512 c082496c8c8e08f3d6d4e02cca1b8936ef0573a962f49449967dfd68d3b038405488887cf004627e3748478aa5f7ccfde44d2c93e1defd840baac931ee172c08 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild new file mode 100644 index 000000000000..7ff90f249dff --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.12.2.ebuild @@ -0,0 +1,254 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib + +MY_PV="$(ver_rs 3 '-')" +MY_P="ImageMagick-${MY_PV}" + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" +SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + +LICENSE="imagemagick" +SLOT="0/6.9.11-60" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +REQUIRED_USE="corefonts? ( truetype ) + test? ( corefonts )" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/libltdl:0 + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:= ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:0= ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/ghostscript-gpl ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:0= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:0= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2:= ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= )" +DEPEND="${RDEPEND} + !media-gfx/graphicsmagick[imagemagick] + virtual/pkgconfig + X? ( x11-base/xorg-proto )" + +S="${WORKDIR}/${MY_P}" +#S="${WORKDIR}/ImageMagick6-${MY_PV}" + +src_prepare() { + default + + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + elibtoolize # for Darwin modules + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local mesa_cards ati_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + local openmp=disable + use openmp && { tc-has-openmp && openmp=enable; } + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --${openmp}-openmp + --with-gcc-arch=no-automagic + ) + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt ChangeLog + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild new file mode 100644 index 000000000000..5256a3f29d2f --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild @@ -0,0 +1,268 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic libtool perl-functions toolchain-funcs multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" + +LICENSE="imagemagick" +SLOT="0/7.0.11-0" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" +RESTRICT="!test? ( test )" + +REQUIRED_USE="corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts )" + +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + dev-libs/libltdl:0 + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:= ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:0= ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/ghostscript-gpl ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:0= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:0= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2:= ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= )" + +DEPEND="${RDEPEND} + !media-gfx/graphicsmagick[imagemagick] + X? ( x11-base/xorg-proto )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + elibtoolize # for Darwin modules + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + local openmp=disable + use openmp && { tc-has-openmp && openmp=enable; } + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + --without-jxl + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --${openmp}-openmp + --with-gcc-arch=no-automagic + ) + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + if [[ ${PV} == "9999" ]] ; then + IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild + else + IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + fi + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt ChangeLog + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "7.0.8.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild new file mode 100644 index 000000000000..5256a3f29d2f --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.0.11.2.ebuild @@ -0,0 +1,268 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit flag-o-matic libtool perl-functions toolchain-funcs multilib + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_PV="$(ver_rs 3 '-')" + MY_P="ImageMagick-${MY_PV}" + SRC_URI="mirror://imagemagick/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" + +LICENSE="imagemagick" +SLOT="0/7.0.11-0" +IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" +RESTRICT="!test? ( test )" + +REQUIRED_USE="corefonts? ( truetype ) + svg? ( xml ) + test? ( corefonts )" + +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig" + +RDEPEND=" + dev-libs/libltdl:0 + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + heif? ( media-libs/libheif:= ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:0= ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/ghostscript-gpl ) + raw? ( media-libs/libraw:= ) + svg? ( + gnome-base/librsvg + media-gfx/potrace + ) + tiff? ( media-libs/tiff:0= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:0= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2:= ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= )" + +DEPEND="${RDEPEND} + !media-gfx/graphicsmagick[imagemagick] + X? ( x11-base/xorg-proto )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + elibtoolize # for Darwin modules + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + local openmp=disable + use openmp && { tc-has-openmp && openmp=enable; } + + use perl && perl_check_env + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with heif heic) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + --without-jxl + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --${openmp}-openmp + --with-gcc-arch=no-automagic + ) + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" +} + +src_test() { + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + local im_command= IM_COMMANDS=() + if [[ ${PV} == "9999" ]] ; then + IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild + else + IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built + fi + IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used + IM_COMMANDS+=( "emake check" ) # Run tests + + for im_command in "${IM_COMMANDS[@]}"; do + eval "${S}"/magick.sh \ + ${im_command} || \ + die "Failed to run \"${im_command}\"" + done +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt ChangeLog + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # .la files in parent are not needed, keep plugin .la files + find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "7.0.8.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 4a444f688213..7adfbf4bddbe 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,7 +1,6 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc34064c659a3cf48d12a539c3029dd70f17b0b48a7398b68de6a937adff3af0c2d4a47d0f84fdc7746ec612fb05272d963f SHA512 f16885a72cd5f8f250b03903062c70190367ed409c2582d579bfb1e6ab09514df7f96214ce236e33bb8eec2f3872d887f9c3152f4e524b1719250a9064bf719c +AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59 -DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660 SHA512 a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef -EBUILD krita-4.4.1.ebuild 3385 BLAKE2B 63a617f770915621fb9550298de444c0973ecf7acfa65c2b15e0e974ef8781c250499ca7fbae02a19987cf03c3d90638f0289e9ab3029e127dac01a3d55cea21 SHA512 3c29c5e00b87e0c4f256c8d26407e42832d72643ff287799667df673bf6dc6936415e1146f65341e28c00e939635654aef53d97d1199bda0e414377cc2c6eab9 -EBUILD krita-4.4.2.ebuild 3386 BLAKE2B 83911adce657ba9679f25f811d2383651cff66e02c1b00b844622ed8d2c763d841662f18c9af58722a2bb59e90c0fdb878872f44e32a1b21c130deb7b4014279 SHA512 9adcebbc9b7abae5418b1a9711cd4a8ef984b924af27fe3747e1367ec513c54a48e3a495465c47a1faa8c533b581c5ace5b9f314e4e1a3bd8da3db01329b0de1 +EBUILD krita-4.4.2.ebuild 3422 BLAKE2B 24bccfde1e16491f69fe31dc97f73274784d61ef6d99d5b9e8ecc94fd9138dfed8a63c070bbe598f3eb10c2243c4ae3ec9e090bf8c3843fda22f6e245e8b8354 SHA512 feb195f53e9fbf9a9a29e79811b327091d3fc6aa5e5071b0ffcd1c86bee8dbeb0848e0d03d9db89359fab55309f6e4fd9a95454b2895a6ca335b14a240bdba93 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch new file mode 100644 index 000000000000..6a49bd3ba2e7 --- /dev/null +++ b/media-gfx/krita/files/krita-4.4.2-quazip1.patch @@ -0,0 +1,36 @@ +From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001 +From: Antonio Rojas +Date: Mon, 5 Oct 2020 20:11:26 +0200 +Subject: [PATCH] Support quazip 1.0 + +Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig +--- + cmake/modules/FindQuaZip.cmake | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake +index 7e628fcd4b..345c7909ab 100644 +--- a/cmake/modules/FindQuaZip.cmake ++++ b/cmake/modules/FindQuaZip.cmake +@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) + ELSE(WIN32) + FIND_PACKAGE(PkgConfig) + # pkg_check_modules(PC_QCA2 QUIET qca2) +- pkg_check_modules(PC_QUAZIP quazip) ++ pkg_check_modules(PC_QUAZIP quazip quazip1-qt5) + FIND_LIBRARY(QUAZIP_LIBRARIES + WIN32_DEBUG_POSTFIX d +- NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} ++ NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5 + HINTS /usr/lib /usr/lib64 + ) + FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h + HINTS /usr/include /usr/local/include +- PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} ++ PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip + ) + FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) + ENDIF (WIN32) +-- +GitLab + diff --git a/media-gfx/krita/krita-4.4.1.ebuild b/media-gfx/krita/krita-4.4.1.ebuild deleted file mode 100644 index 14f14250e7c1..000000000000 --- a/media-gfx/krita/krita-4.4.1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{7,8,9} ) -KFMIN=5.74.0 -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org python-single-r1 - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" -fi - -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" -HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/" - -LICENSE="GPL-3" -SLOT="5" -IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-cpp/eigen:3 - dev-lang/perl - sys-devel/gettext -" -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - dev-libs/quazip - $(python_gen_cond_dep ' - dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] - dev-python/sip[${PYTHON_MULTI_USEDEP}] - ') - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/lcms - media-libs/libpng:0= - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXi - color-management? ( media-libs/opencolorio ) - fftw? ( sci-libs/fftw:3.0= ) - gif? ( media-libs/giflib ) - gsl? ( sci-libs/gsl:= ) - jpeg? ( virtual/jpeg:0 ) - heif? ( media-libs/libheif:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr - ) - pdf? ( app-text/poppler[qt5] ) - qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) - raw? ( media-libs/libraw:= ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${RDEPEND} - vc? ( >=dev-libs/vc-1.1.0 ) -" - -# bug 630508 -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch - "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch -) - -pkg_setup() { - python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_prepare() { - ecm_src_prepare - sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die -} - -src_configure() { - # Prevent sandbox violation from FindPyQt5.py module - # See Gentoo-bug 655918 - addpredict /dev/dri - - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged - $(cmake_use_find_package color-management OCIO) - $(cmake_use_find_package fftw FFTW3) - $(cmake_use_find_package gif GIF) - $(cmake_use_find_package gsl GSL) - $(cmake_use_find_package heif HEIF) - $(cmake_use_find_package jpeg JPEG) - $(cmake_use_find_package openexr OpenEXR) - $(cmake_use_find_package pdf Poppler) - $(cmake_use_find_package qtmedia Qt5Multimedia) - $(cmake_use_find_package raw LibRaw) - $(cmake_use_find_package tiff TIFF) - $(cmake_use_find_package vc Vc) - ) - - ecm_src_configure -} diff --git a/media-gfx/krita/krita-4.4.2.ebuild b/media-gfx/krita/krita-4.4.2.ebuild index 3a09834e46d1..f6d505b99712 100644 --- a/media-gfx/krita/krita-4.4.2.ebuild +++ b/media-gfx/krita/krita-4.4.2.ebuild @@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1 if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" fi DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" @@ -31,7 +31,7 @@ BDEPEND=" " RDEPEND="${PYTHON_DEPS} dev-libs/boost:= - dev-libs/quazip + dev-libs/quazip:0= $(python_gen_cond_dep ' dev-python/PyQt5[${PYTHON_MULTI_USEDEP}] dev-python/sip[${PYTHON_MULTI_USEDEP}] @@ -90,6 +90,7 @@ RESTRICT+=" test" PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch + "${FILESDIR}"/${P}-quazip1.patch ) pkg_setup() { diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index 3575b5df79cb..101075428227 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -5,6 +5,6 @@ DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257 DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4 EBUILD libimagequant-2.12.2.ebuild 1403 BLAKE2B 40d79a5387b2091818a33cf3c5620558fa9543f9e75a76a7ed310ac751bd2a8b5f592340f591a831f68604873365b6141c7d388552d31162e1b259df8e7bfa57 SHA512 268b848f7d11fe9568b13a2b90b57e5f6369cad1f8043d47ef06c8ddd05909e9da83844b2ef6367125bf2c7e86a158fd82ab99ec257b5a290e90fbb9bdf5fb58 -EBUILD libimagequant-2.12.3.ebuild 1410 BLAKE2B 5e7c09cc1ea3218fc56e25d053409bf99112c567efe1ab9046b817f20703f06d3b7bfd8112be02b07882e3f32e9b660adcd57400fc0b3aaa555a1661eb5e10ea SHA512 06156624711397f8e90faf24040bdb9c877495d939e5a9b157152e5b827b00175a7d1dfcbe6bffc307c720a3b84229bcca8a037720d1f609e55f6c8402e6cec0 +EBUILD libimagequant-2.12.3.ebuild 1409 BLAKE2B 6a922a5bf768f0736c5aa8b22ae53255e6ea54ff577f66503e954ed2601cb26576f125200c922d940663a69dbc6335f6a4c5d372f0deda449e181a50311eb497 SHA512 2c5fa9f2d558d640adb39f3569a4f3b230210d5e18c0cada7a2bfdd56a3d98680b8d2d286c0aa17c06eb2dbf3c648281d13f887a9174de96a287f76da7907d77 EBUILD libimagequant-2.14.0.ebuild 1247 BLAKE2B 92006ddcdecbd884658c8c95014efb3e0213762c6af664dcaf3785dda29637f1515e68bbbc9398aba926ecb17460ec4eff80e82c3d32cee6c66c4cd162f91abe SHA512 630037675eada9f300fc5db6fac53e626ee92f3374e507298c195d0c887af8321ba4b68debc35e4c21bd8cd07ab34ffd5e452d002a95c44b50cc71792f42d940 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild index b434e3e4b783..a0eab3ab6c3b 100644 --- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 debug openmp static-libs" DEPEND="" diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest index e032ea4d5a91..c1369af9ec23 100644 --- a/media-gfx/nomacs/Manifest +++ b/media-gfx/nomacs/Manifest @@ -1,4 +1,5 @@ +AUX nomacs-3.16.224-quazip1.patch 3844 BLAKE2B 5d92aa57971f137e5009db945f739eaff57bbf2a5ea6ce842dafd51f0107f6c6dfb349da719e935e732cb7736d9a97d96806ee48fdd97ff953863ba920aff2ab SHA512 888c8125edcbbbc3034b132f776bf59e53e6259e66c55f4df4e9c7fa8a874928a2ea766b52c6ef8dcc0d493f81982ca4cb6ac737f677e3948dcedb9052603e9f DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747 -EBUILD nomacs-3.16.224-r1.ebuild 1859 BLAKE2B 3ace96921a28506b8a143c320e36bf6d558339f06e5b185cb2d60948d6215cfd68cc6aab54a6b7dbbe0311fce78671b17638ac557df40891a568c3b5c50addec SHA512 a8476b8ed5ebe3fa8feb5c151245327650f3c63f652129aa407d70658a2ad41195992c64d2ab1ad24fbb4e6cee7d5e63a935668adb909f190bf0189d5a6e706e +EBUILD nomacs-3.16.224-r2.ebuild 1906 BLAKE2B 9832da7bd304ba68983a470c0a190cb25b9960ff168a2ef57e4859c24b0220834714788d3c122875504b4fa203a3c811582b2571541c97c100c0f7b39fd12740 SHA512 00271ea0a48a50396038dcca7f08442ebcb63676eaf8fbd5a5c54412a8b238d3f2d1bf4f2e11561f35576b25fe487a979004738aa5ad04edd97429f34d820fa2 MISC metadata.xml 594 BLAKE2B 3e4f800e489a388987f8942f433fad19e378644cb2aecd66d7eacbca167fa12597967bc4bef21260d266aa5553c1b103cc4df8167fbba8655a346e25100e66a6 SHA512 2f3ee7d525fff3d6ca2793d96555dcfba34df5b15cd2879e640aa51b5ccd34e2f466c2a5cceab90050af8c3d668c2d57fd88c136d830343da7313c8eaea247c9 diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch new file mode 100644 index 000000000000..06f6b8c2fb81 --- /dev/null +++ b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch @@ -0,0 +1,127 @@ +From b4a1e98a83598072ea6d720ae4d56d380bee5a75 Mon Sep 17 00:00:00 2001 +From: Petr Vanek +Date: Sun, 15 Nov 2020 19:15:59 +0100 +Subject: [PATCH] fixed #569 Build fails with quazip 1.0 (#576) + +--- + cmake/Unix.cmake | 28 +++++++++++++++------ + src/DkCore/DkBasicLoader.cpp | 4 +++ + src/DkCore/DkImageContainer.cpp | 4 +++ + src/DkCore/DkImageLoader.cpp | 6 ++++- + src/DkGui/DkDialog.cpp | 4 +++ + 5 files changed, 37 insertions(+), 9 deletions(-) + +diff --git a/cmake/Unix.cmake b/cmake/Unix.cmake +index 5567084b..c90ba320 100644 +--- a/cmake/Unix.cmake ++++ b/cmake/Unix.cmake +@@ -102,14 +102,26 @@ unset(QT_ROOT CACHE) + + if(ENABLE_QUAZIP) + if(USE_SYSTEM_QUAZIP) +- SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +- +- find_package(QuaZip5 QUIET) +- if(NOT QUAZIP_FOUND) +- message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP") +- else() +- add_definitions(-DWITH_QUAZIP) +- endif() ++ # Let's try QuaZip1 first (it's the bright future) ++ find_package(QuaZip-Qt5 QUIET) ++ if (QuaZip-Qt5_FOUND) ++ message(STATUS "QUAZIP: QuaZip-1 for Qt5 found") ++ set(QUAZIP_LIBRARIES QuaZip::QuaZip) ++ add_definitions(-DWITH_QUAZIP1) ++ else () ++ message(WARNING "QUAZIP: 1.x not found. Trying to find 0.x") ++ # QuaZip < 1.0. This leg can be removed (including cmake/FindQuaZip5.cmake) ++ # ater the final migration to 1.x in Linux distros ++ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) ++ ++ find_package(QuaZip5 QUIET) ++ if(NOT QUAZIP_FOUND) ++ message(FATAL_ERROR "QUAZIP: even 0.x not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP") ++ endif() ++ ++ endif (QuaZip-Qt5_FOUND) ++ # we have any QuaZip after all ++ add_definitions(-DWITH_QUAZIP) + else() + find_package(ZLIB REQUIRED) + set(QUAZIP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/quazip ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/) +diff --git a/src/DkCore/DkBasicLoader.cpp b/src/DkCore/DkBasicLoader.cpp +index 7f9e889c..b7edfd43 100644 +--- a/src/DkCore/DkBasicLoader.cpp ++++ b/src/DkCore/DkBasicLoader.cpp +@@ -54,8 +54,12 @@ + + // quazip + #ifdef WITH_QUAZIP ++#ifdef WITH_QUAZIP1 ++#include ++#else + #include + #endif ++#endif + + // opencv + #ifdef WITH_OPENCV +diff --git a/src/DkCore/DkImageContainer.cpp b/src/DkCore/DkImageContainer.cpp +index 810994d3..150da9c2 100644 +--- a/src/DkCore/DkImageContainer.cpp ++++ b/src/DkCore/DkImageContainer.cpp +@@ -41,8 +41,12 @@ + + // quazip + #ifdef WITH_QUAZIP ++#ifdef WITH_QUAZIP1 ++#include ++#else + #include + #endif ++#endif + #pragma warning(pop) // no warnings from includes - end + + #pragma warning(disable: 4251) // TODO: remove +diff --git a/src/DkCore/DkImageLoader.cpp b/src/DkCore/DkImageLoader.cpp +index 09d25d23..e4186f2b 100644 +--- a/src/DkCore/DkImageLoader.cpp ++++ b/src/DkCore/DkImageLoader.cpp +@@ -79,8 +79,12 @@ + + // quazip + #ifdef WITH_QUAZIP ++#ifdef WITH_QUAZIP1 ++#include ++#else + #include + #endif ++#endif + + // opencv + #ifdef WITH_OPENCV +@@ -2212,4 +2216,4 @@ QString DkImageLoader::fileName() const { + return mCurrentImage->fileName(); + } + +-} +\ No newline at end of file ++} +diff --git a/src/DkGui/DkDialog.cpp b/src/DkGui/DkDialog.cpp +index 008c9a3b..85842eca 100644 +--- a/src/DkGui/DkDialog.cpp ++++ b/src/DkGui/DkDialog.cpp +@@ -97,8 +97,12 @@ + + // quazip + #ifdef WITH_QUAZIP ++#ifdef WITH_QUAZIP1 ++#include ++#else + #include + #endif ++#endif + + #pragma warning(pop) // no warnings from includes - end + diff --git a/media-gfx/nomacs/nomacs-3.16.224-r1.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r1.ebuild deleted file mode 100644 index efac4a65c05b..000000000000 --- a/media-gfx/nomacs/nomacs-3.16.224-r1.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)" -inherit cmake xdg-utils - -DESCRIPTION="Qt-based image viewer" -HOMEPAGE="https://nomacs.org/" -SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz -plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux" -IUSE="+jpeg +opencv plugins raw +tiff zip" - -REQUIRED_USE=" - raw? ( opencv ) - tiff? ( opencv ) -" - -RDEPEND=" - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5[jpeg?] - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-gfx/exiv2:= - opencv? ( >=media-libs/opencv-3.4:= ) - raw? ( media-libs/libraw:= ) - tiff? ( - dev-qt/qtimageformats:5 - media-libs/tiff - ) - zip? ( dev-libs/quazip:0 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig -" - -S="${WORKDIR}/${P}/ImageLounge" - -DOCS=( src/changelog.txt ) - -src_prepare() { - if use plugins ; then - rmdir plugins || die - mv -v ../../${PLUGIN_PKG} plugins || die - # Fix nomacs-plugins installation and search library directory - sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \ - -i plugins/cmake/Utils.cmake || die - sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \ - -i src/DkCore/DkPluginManager.cpp || die - fi - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DENABLE_CODE_COV=OFF - -DUSE_SYSTEM_QUAZIP=ON - -DENABLE_TRANSLATIONS=ON - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_PLUGINS=$(usex plugins) - -DENABLE_RAW=$(usex raw) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_QUAZIP=$(usex zip) - ) - cmake_src_configure -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild new file mode 100644 index 000000000000..9c6f50df1606 --- /dev/null +++ b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PLUGIN_PKG="${PN}-plugins-$(ver_cut 1-2)" +inherit cmake xdg-utils + +DESCRIPTION="Qt-based image viewer" +HOMEPAGE="https://nomacs.org/" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz +plugins? ( https://github.com/${PN}/${PN}-plugins/archive/$(ver_cut 1-2).tar.gz -> ${PLUGIN_PKG}.tar.gz )" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 ~arm64 x86 ~amd64-linux" +IUSE="+jpeg +opencv plugins raw +tiff zip" + +REQUIRED_USE=" + raw? ( opencv ) + tiff? ( opencv ) +" + +RDEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5[jpeg?] + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + media-gfx/exiv2:= + opencv? ( >=media-libs/opencv-3.4:= ) + raw? ( media-libs/libraw:= ) + tiff? ( + dev-qt/qtimageformats:5 + media-libs/tiff + ) + zip? ( dev-libs/quazip:0= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +S="${WORKDIR}/${P}/ImageLounge" + +DOCS=( src/changelog.txt ) + +PATCHES=( "${FILESDIR}"/${P}-quazip1.patch ) + +src_prepare() { + if use plugins ; then + rmdir plugins || die + mv -v ../../${PLUGIN_PKG} plugins || die + # Fix nomacs-plugins installation and search library directory + sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \ + -i plugins/cmake/Utils.cmake || die + sed -e "s:lib/nomacs-plugins:$(get_libdir)/nomacs-plugins:" \ + -i src/DkCore/DkPluginManager.cpp || die + fi + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_CODE_COV=OFF + -DUSE_SYSTEM_QUAZIP=ON + -DENABLE_TRANSLATIONS=ON + -DENABLE_OPENCV=$(usex opencv) + -DENABLE_PLUGINS=$(usex plugins) + -DENABLE_RAW=$(usex raw) + -DENABLE_TIFF=$(usex tiff) + -DENABLE_QUAZIP=$(usex zip) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_desktop_database_update +} diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 255c336abb8c..3312307491a8 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -5,7 +5,6 @@ AUX openscad-2019.05-0003-change-C-standard-to-c-14.patch 1961 BLAKE2B faa9a935b AUX openscad-2019.05_fix-boost-1.72.0-build.patch 689 BLAKE2B b8aea0ab3793b3f3202f7d4154c1aaca235de2450321958819531dd9dd70c1e375c28c9004a9fb348d5116815e99e4190efd2443057991b2e97873c80f52cc80 SHA512 20bc2baf50f23e6b5ccce0d8c22eb3a5004198a0c97c8c955b15a681a64102537be35a12a37692418159de6664a36689a4c3b65b3a520d51ab086aa091a1e48c AUX openscad-9999-0002-Gentoo-specific-Disable-ccache-building.patch 822 BLAKE2B ae4c7dc441e5a7391ecd2e704c644877fa7d73f8900fbe6082e070a3d9ecce74f368ead39be3f0321fb47095becf60057fafdee2a5e961106402dffff73687be SHA512 7bae2af4c627cc2f465e75890284bcca8e738dcbe5accf0511fcca2ee845ce9ef5602b752d61ecab7afd92f3a45975287db4e42379ede7875123a8c0a721f2c3 DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13 -EBUILD openscad-2019.05-r3.ebuild 2069 BLAKE2B 04ea91d2e612adf7ed8b4d94c30c769713a99893da2120eb8675081c862a2804c0aabf21da51dfa78a10240d01b71144c1586d7859b69f4a639e22a5e090138c SHA512 0663545e9fb542b534bd7fcc98ca8e131de799a8f8ceac29a8aad31e5a1283fff22efa1a5a4677f991b8319ff824643e088e124d5b07d0fe7105f649e45e04d3 -EBUILD openscad-2019.05-r4.ebuild 2368 BLAKE2B 83ced6412ce7a206dc767bf8c56109394524bbf525b15621f1891f4cf3ecea489c9447e18c0ce9e6ca4271c2cffcccbe3c767d406564b1503990740e9b98fa70 SHA512 8ed91ac665aa58c8ebaf6bbd4eeb7b4efbc4819c12e0a643f9bb92fcaca2491f7a84169b8cc0291fcfc9024ddcca6b9ef7e434ca4131d1149bb2c5f3da25987f +EBUILD openscad-2019.05-r4.ebuild 2367 BLAKE2B 4a9b006bc60734400c5a36eecf6442abbfe7e9c2cc350288512c076e1ae6df57221e6dc276ddc42e09f482760f7f33b8f07c369e42c83c6dfe2aa33579d522a6 SHA512 147a412cf8b13459737d9f296a55d7c59d5ad92075fb5a747b7a05a5914d200a9ab7ff69888ec464b1797871ef0ba63b069f58b980556170624f6d04479c3f57 EBUILD openscad-9999.ebuild 1900 BLAKE2B b7da0c8a17bcc88faa4c9367b4a664a8f58aafe8177d984001fd23ab0ea39f00f40349963691d4aa667d994761c7f60ee7bf0104c023ab43d85e51bde4349b4d SHA512 6378969e22ca27c2ef80928559b2f122e4b86df35a3858ae70537782b1f9209951fa34c55bd791f10cc23a9f0572a6305ba854f3270e4ea11eb045058e9c5b77 MISC metadata.xml 1131 BLAKE2B 5ac140803c4f9b522ccb4649a1247323a10d397885c0ae780379483832dc85a6c4d50ee3cf6c85dced42aa0debcaa559039f7c911eda7630cbd11a13c3440c96 SHA512 1f5a48746b34e61dd451ec8bd6fb9b3678ce9901e4ca8784dac19eeaea5e7e1bc636b6d9c528bf06af1aed1fb37a5d1e6b190b465b6170cd713f494874e8a807 diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild deleted file mode 100644 index 42738f600c39..000000000000 --- a/media-gfx/openscad/openscad-2019.05-r3.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit elisp-common qmake-utils xdg - -SITEFILE="50${PN}-gentoo.el" - -DESCRIPTION="The Programmers Solid 3D CAD Modeller" -HOMEPAGE="https://www.openscad.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="ccache emacs" -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${P}_fix-boost-1.72.0-build.patch" - "${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch" -) - -RDEPEND=" - dev-cpp/eigen:3 - dev-libs/boost:= - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/gmp:0= - dev-libs/hidapi - dev-libs/libspnav - dev-libs/libzip:= - dev-libs/mpfr:0= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - media-gfx/opencsg - media-libs/fontconfig - media-libs/freetype - >=media-libs/glew-2.0.0:0= - media-libs/harfbuzz:= - media-libs/lib3mf - =x11-libs/qscintilla-2.10.3:= - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/itstool - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - ccache? ( dev-util/ccache ) -" - -src_prepare() { - default - - # fix path prefix - sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die - - # disable ccache - if ! use ccache; then - eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch" - fi -} - -src_configure() { - eqmake5 "${PN}.pro" -} - -src_compile() { - default - - if use emacs ; then - elisp-compile contrib/*.el - fi -} - -src_install() { - emake install INSTALL_ROOT="${D}" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - elisp-install ${PN} contrib/*.el contrib/*.elc - fi - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - use emacs && elisp-site-regen - xdg_desktop_database_update - xdg_mimeinfo_database_update -} diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r4.ebuild index 0d287ea36a25..32ad22bf16f5 100644 --- a/media-gfx/openscad/openscad-2019.05-r4.ebuild +++ b/media-gfx/openscad/openscad-2019.05-r4.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz - LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 x86" +KEYWORDS="amd64 ~arm64 x86" IUSE="ccache emacs" RESTRICT="test" diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index d2f7f190320a..d92748d2f34d 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -16,6 +16,6 @@ DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de EBUILD openvdb-4.0.2-r4.ebuild 2619 BLAKE2B 33f31d97f1597c29d1186193ed501c07ed265770d191226abc6d2670fae8878ff8d4314b2b33788b9e638dc6a495aeb25304da2775179981a7916b03df68db47 SHA512 5af992b65fff0ecd20b38f1858b26252bf24c7595236cd9dd0434cc50af6994a88250d103c2708d80422a9a2b5435552a8a1d73c73a3772d2d4b94a058d844ca EBUILD openvdb-5.2.0-r2.ebuild 2417 BLAKE2B eeaa6be3d881283150098057b3f994b5380b64a51f99ed1aecde37c7e3c159e55089dce55eaad0eee735a29ca2206f1888977d4db667141311261ee0e1e5920d SHA512 0b7496c770dc053750d720e18cab541dca4f01171adbd4a6d47877645ea26195ac8cfca9816cede88c2c1187010541648a0333def582c31d4654ed5101834745 EBUILD openvdb-6.2.1-r1.ebuild 2293 BLAKE2B 80218e96b43e30642a1cd47f11663ffb81d4383532a84f81c642ea5a6573bae1fce38d3a018c17d8b9a832dc0697e2d63ee1352e7030f09232149aa159b8c49c SHA512 40dc6ed45e3801eea4324da01828b7ea119e4e27888e5376cc249727a7fb07c03e1db90aeeca23964cfb39f47b098ac4b39941a1be20774dcde521e8d7d97ef3 -EBUILD openvdb-7.0.0-r1.ebuild 2793 BLAKE2B 19dcd926fbaa0b3cf9f31bf43e65e2b6f0c83d455a1a85265c563c031a1f653d216c17f720cc185c8c1fa86b8e41650570726ae9c1251c946671726ab04c6e55 SHA512 531be8072182fce10c601ff506b11399c106e0f21d7f10782aed558fe200f295a58f14d8726ad997e86ebf4d3af38fa4de13d01c45fe0b349d5eca413c6acc22 +EBUILD openvdb-7.0.0-r1.ebuild 2798 BLAKE2B a4b1e250d372b316c290c6d43f28a71818f359aee6032aef9490a67734696e1b95ed536121959c8e168407a2a070996985887cc80a4e0b576c7830316c3979dd SHA512 f7afc00343187dbd734cfd06a8ebc1fd094dbb81ef07593b49e4215adc3ea4c9ea51cf8b74254a418c6bf841c32b006ffa109119bc701f63bf61f62fe5165743 EBUILD openvdb-7.1.0-r1.ebuild 2735 BLAKE2B 0e9347c59b0f1404db23e63635a4c3fdda3be0d34bda329de8b65507a3037692206a3d0573984bee7a9f937d5c9f425decd94b00214001e8792317af45f39b1b SHA512 2ce5ea094c66437efdd17279a3a2740cfab364775cede0986e9a65e35871cf90cb443c354b6590f82153b2d4acaadb0bfb44f8b2a72b632be64640e5094d7a15 MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild index 44d1b2608474..4fd0ea08306b 100644 --- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild +++ b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g LICENSE="MPL-2.0" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 ~arm ~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 )" diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest index 664251ddc6eb..97c2cffa3900 100644 --- a/media-gfx/pngcheck/Manifest +++ b/media-gfx/pngcheck/Manifest @@ -1,5 +1,3 @@ -DIST pngcheck-2.3.0.tar.gz 59864 BLAKE2B 3c635555f76d22d6949309707b7054608f5e093d3a557eb88eb9fc48aef76326f8e6b0dbcdf8e30213a042416f0e6f798e41411763e7604b12495b6b2748cddc SHA512 d099a360d41fc553e9ea02e56ae9812a4a72f3b7f1cd73c021fdb0b9233bb247e100b95fe8e297a2dcdd1bb996128a365794cb8f5702e5c93618af03f18140ad DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5 -EBUILD pngcheck-2.3.0.ebuild 643 BLAKE2B 3ddd07326f91f14c7efc71c9a0b442d050ab3095ed52336f99edee0e34b325def2d14f18e96ce4c1cd726071b1610fdbf629c898f22a26c500e41954d0055f71 SHA512 cfcc71d19d8869482b92d390b9b4a65e81aa1ac9865af2b914a10e57afdc0b71f2df5738e7283c310604b550ebcd6b99edd7a8f7d3a15539bf72d39bb88e9eb8 EBUILD pngcheck-3.0.2.ebuild 690 BLAKE2B 1e51643aa788db7736a3ef873eb897550636bda3acd514cdfaaa20920c20dec4cbd1e6752dd8910cf3d74c6949f1ce9c637974001de85ac5f4822433681f4ee0 SHA512 97b469bafb99f807b7d62089ccbed09ae0f6f5f2fbf6b47f672ba1122e12d75691295b557acc6628951eace4022a2c12892bdfd45e759d60ce3ebddc74f3cd1b MISC metadata.xml 244 BLAKE2B 5498c23eb35a869f92ff882d6931f50645f2a10ea31c9e22f892e9c5e11b54cbe7063decd5750b2cca2e8737ca7e5e5e7fa154401ddf8a2baadf7037be981241 SHA512 c6d20cd9c770b2ffa18b02ad2495493b61d681c2f1d54716aaf5a22a63db01219db3f4d3f743ec8abd24cba27bf5e3c0da3b80158a1b06b933965d8481349417 diff --git a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild b/media-gfx/pngcheck/pngcheck-2.3.0.ebuild deleted file mode 100644 index 4358988b8ba1..000000000000 --- a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Verifies the integrity of PNG, JNG and MNG files with internal checksums" -HOMEPAGE="http://www.libpng.org/pub/png/apps/pngcheck.html" -SRC_URI="mirror://sourceforge/png-mng/${P}.tar.gz" - -LICENSE="HPND GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND}" - -src_compile() { - emake -f Makefile.unx \ - CC="$(tc-getCC)" \ - CFLAGS="${LDFLAGS} ${CFLAGS} -DUSE_ZLIB" \ - ZLIB="-lz" -} - -src_install() { - dobin png{check,split,-fix-IDAT-windowsize} - einstalldocs -} diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest index 7e9ef392804e..1c3acf0b12ba 100644 --- a/media-gfx/transfig/Manifest +++ b/media-gfx/transfig/Manifest @@ -3,5 +3,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e -EBUILD transfig-3.2.5e-r1.ebuild 3353 BLAKE2B f6cbc32b25fef70f17effa760c26205a61c376580a9333efc78f50e569740aa8a09c0f98b34fe452f58341ff74075b8c7d1562beaa0d9487da0457289e69ef88 SHA512 5e08237bd34806b11e57fa52946568143a687e885c0c9a865e4eac64250b8bb5b8e8dd3fe5d90229487bd10b127f10d6244be64b62e4e726118f66d50b3a462e +EBUILD transfig-3.2.5e-r1.ebuild 3358 BLAKE2B fd6d18e9000d426e58da37561484cbb2a5dc781364c917891e72ef6e900c770a51deb08fffed7fcc4b35990f772ab6b3566cf39df1ef92e096b32e763c9098f3 SHA512 bd6595d88cc5cde424117e4be140332118803020f6ca64b2e3c911d5c52800418cf72c3e5631a182817341a6671bb69377d1e14ab1bc40bf82a660537cfc0f7d MISC metadata.xml 238 BLAKE2B 60ff9cbe893ace8f33a3d44ee85a5c73c9bd5553478173bf92c4aa93398ae1140ba28673eb6c7373ac48ede6679546b57ea08b8e676ce5c7a47792a2ba8b3148 SHA512 65918555949ddfef068a9a197dffda69aee483ac55c1b52dcf19376aecf1cb53d8a3fc0931d4ebdbe64ba3341e2a2567d56c2830eb31e6746735449c53a1203c diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild index 53498c3546b2..5c2d730704e1 100644 --- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris" RDEPEND="x11-libs/libXpm virtual/jpeg diff --git a/media-gfx/xdot/Manifest b/media-gfx/xdot/Manifest index 714abc273771..300e50c91118 100644 --- a/media-gfx/xdot/Manifest +++ b/media-gfx/xdot/Manifest @@ -1,6 +1,6 @@ DIST xdot-1.1.tar.gz 134215 BLAKE2B e241a4fb1ec69a8613f7813dc159761e6bffb82ea9f58876287d01946f4c93e66e5eef66e6844abb7738979412c2c7d2d26f76bc0563ad0c3c8550d9e8023b47 SHA512 d67c45c8c071013551f79d671a21ce546b680fac5997ba9631a882ffa3c44c15a69949643ed5e8211417006152575a1d99450ccfb6062427521d1e2bc0814f55 DIST xdot-1.2.tar.gz 136057 BLAKE2B 484a3513ec3d67dbc6e167f171e7f70977ba2472766f25aa7cc088235f99470bfac5fac67368ea53b633320752a928634840ff3dcccc6b96795d3b7c203db922 SHA512 b4d3b15114b982c7c38cc71c0602f6d1ba9874c7315c2b8c4a8a48bf7674e9b38bf19a0d4a2d319acc9a29cf8f177a651d4e213761e88b0b3cb26e95e8a92dda EBUILD xdot-1.1.ebuild 1129 BLAKE2B 821d0ed786233301466b3ea5bb824a066700bd4c157a95abc68e1f9bcf6faad7ed2845ad2625694378f61783a22fc9c1b1c99017cf525eaaae638e2d669e5a43 SHA512 c3b57551658137ba292db06250680d78db2406d09ab6fad63532c2a66f3a683e5f4a8a77d25c79b7a0ed34dc8c0f051eb8193f65af5a8e833d3d0e27bff6d9dc -EBUILD xdot-1.2.ebuild 801 BLAKE2B 8e01fb7f0fcdc178991c68560d4cda4899ac939044d7dd21a287b55daf57706537dff151c5b629f8d3c3f5084b87af021543ddf717c2cefa80212ef5793a3610 SHA512 ab907b855c56c5e6db026bbf0bff5033f357d054b90b81609b027af2c26ea9ee9c34e99da5e792366de3db25089020bf99107b463051122b96dbfb92427b94c0 -EBUILD xdot-9999.ebuild 806 BLAKE2B bf04837d41c791a9de84d69d9f4d350e261decc7d8137735b1912e5403b70d5dafbc9f345b7b04a79b49d769fb4078418be748fde3db3c431e43780e2f71d517 SHA512 7141e26246eca4f3ea1f9999d7f9cb2de5512b4269ba8b1886e5bd15a14130cd5953d931c0fc8c42ebfd56f30d0523db43099e005c3d7ce2ecaa571fa96e407b +EBUILD xdot-1.2.ebuild 837 BLAKE2B c0f7422340f793e2b523740c03db3f664bfc8c64d92b86e9512747a36c5b12df1b4cd20288394fdbb919840e0cac1c18a29ac8de1708c8989cce4e166b9c779c SHA512 862afd6dab66622a834d841d6a16cf41a1341277ada9cd2227a63b19e85e33fb38e09eedaf8e48ad756255375b13918fb30202eb67878dd56dfd2121f9043a14 +EBUILD xdot-9999.ebuild 842 BLAKE2B baf7f994b3dc0f3b858c60bec848f8dd34c4d2a48c81e240cadaa47dd08456e4a68e2520735785deae0a6eae955bea065087845834a7aa3c5b7cc4a27a402fc3 SHA512 68d5c597cae55589a792637187cb0395eeeead7ca987194ba7aa06be4eba262e0a9e2896737906996ed35f19418754b4392868151ce2ae66bc31c282c3a237c6 MISC metadata.xml 398 BLAKE2B 4cfe399944032b70bb0092f9bd2f47b7e1f45cccfa75e2c8eea9dc41ae8456ffb450d5777a77218c22b8f97d57e0bd63956b63c345dba7167b1cfa8cfe3182aa SHA512 7afd30baf3ee9ec5c492659df23168d22c5a07381ed5972c8a02394a57dd332b86b59393b1bd16d2d365d61aa46839aafa78ff0386a92a26563139e31ed01a76 diff --git a/media-gfx/xdot/xdot-1.2.ebuild b/media-gfx/xdot/xdot-1.2.ebuild index 6755532596fb..36fc37fe145c 100644 --- a/media-gfx/xdot/xdot-1.2.ebuild +++ b/media-gfx/xdot/xdot-1.2.ebuild @@ -27,6 +27,7 @@ LICENSE="LGPL-2+" SLOT="0" DEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] media-gfx/graphviz diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild index 55d43b4b1a66..1f4cdb063a5a 100644 --- a/media-gfx/xdot/xdot-9999.ebuild +++ b/media-gfx/xdot/xdot-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -27,6 +27,7 @@ LICENSE="LGPL-2+" SLOT="0" DEPEND=" + dev-python/numpy[${PYTHON_USEDEP}] dev-python/pycairo[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] media-gfx/graphviz diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index b5289cb84f46..8cdf1f30b56f 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,6 +1,8 @@ AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1 +AUX zbar-0.23-r1-nonbash.patch 5528 BLAKE2B f4679013abb66143a5203d861367f51ee8b791addff66347d81622549f954e1bcd54a19695fa4ce8bacbf5aa2fe0a195ec75068ff6b93fa2df0c4f82af9e3d65 SHA512 7705ae4281b92086eda749fb334a59cdc33e79bec0bb9820c78344fcac235b9b3f4314899e8eeeaa44a372adda71f14ec553f3c1c147f57bfe1cba298d3cd0ab AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122 AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120 +AUX zbar-0.23.1_musl_include_locale_h.patch 512 BLAKE2B 9f675b24aecd0a65ef3a2d41731594c10b1086abbfac649b6eeca1ba873c1b54d8287bebb48b2119aa0638d60228f25714f7a1811f7645930bc003395489ca3e SHA512 6addf046928db5743cc58ec67aad891c199f9d839198181cfbf57912cc0780f53fdac9fa15b25e1ffd17cf0aaf74318094f3283facdff2fa259285a5bc2bb957 AUX zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch 2109 BLAKE2B 8e32a3d0115fe7dc31a8208021659827f959bebbd1a56972765a379e03c7aca704c394d7eecb928f3547b9b42afff6cdaa1e564875bb6a94ac0cdb9a55422fe1 SHA512 dfbbe1caf384dc769d97ecebaf544b81c1fa266c78ca4fa8087673724b3408fe2e77535b60aefe904aa42dd1ed1182676623f98aed565910566c511908b8ecee AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf81a0a9b6aefa284576789ba6533af03cb1af59a2c531f22e09adcc8e2b9b6418f861f8b96a1bf602502d0e863ae9785ac2d336c7 SHA512 ee40586c64ded170e314ee2961588518234e22d9cee9e9a55f994231cd50b120e82225c551c5a2e85988de1c14a5c0baf6303fffea0663e2e4808df3a0c8421a AUX zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch 1122 BLAKE2B e4330ca4ce75a4659466faa618a99280ad7868aa21d1fe30db837917460cb9fc3594421cb2cb70457813611764c7e976e5ba9acc414be5fa95808f91d995eb0b SHA512 c6d6b3bf93f59f87687e03294742ec7a4803308d7395869d8cccefdb186c69ad429c631f2f4d0c4de0a2dd495f3b99342622d01acb1e823ceb9250380549ca20 @@ -8,6 +10,6 @@ AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a65571 AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b -EBUILD zbar-0.23-r1.ebuild 5028 BLAKE2B 3d91370efb024d92f46e2f173c21e09bd1c5ef0213090f8ce4343b3d86e23b07a81b96443587546df536a15339310ab953dd99b58fbae75fa1e69cf1378e3006 SHA512 8cb2e88fd6795c64ccad9d65cf85a1f7e1482524ccb122ce531f713bbe2fcf53fafe52f0202a48044c1a0331db941b32fc32374b4111ad438f74e83a580e3a1e -EBUILD zbar-0.23.1.ebuild 5239 BLAKE2B 295eef94a50f38f22351d50bcaa5dc58276b32766874c7540efa15ba5fa7d0b8c10b9f09f0dd7db95bd01e83be8767682923e18561ee63d2270f11131a9d3e9f SHA512 7fb1c2d8eef777054107020606a0e3c3106e6864522a29c87a248848220d93cbb7de95f02aee060166cfa032e7106a6108d3ccdd4828ca941ab7705556efbc6c +EBUILD zbar-0.23-r1.ebuild 5071 BLAKE2B 92487f7fd2c94a6bee21827729c0ed4bbbde6c1b552e5da271a96a277d2d1c4d20b0b8baf80b769e89bb65bc9fe0ca0db483342bcbcf0daf466edc82f399dbe3 SHA512 f4d5affd6ea81be0b0aaacd168a0a45c854a49b7aeda4d042aa26eef4e0492ece016c21c7887aad1c1644c0095f04eb94277ba12276b0e1c8e5c4d98f977b4b4 +EBUILD zbar-0.23.1.ebuild 5286 BLAKE2B 8134b9a4418963c437be927b68a087b8d18fd533195dc05892b091038f500d62a86f23540ae81659dffa973abbfd8603a62c3839924f14f17405c48b8c60ff52 SHA512 34b395448f86e886460be4687f144c961779acf1ddbdd4e9c460fd4848543285d8084e1303c6d422263e143877f98b75b4a556899d98236feaaca4791a7f9081 MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19 diff --git a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch new file mode 100644 index 000000000000..1206a209d458 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch @@ -0,0 +1,120 @@ +https://bugs.gentoo.org/769716 + +From 4bd586181dde6196cb60602f228c4deb07818989 Mon Sep 17 00:00:00 2001 +From: Klaus Ethgen +Date: Sun, 7 Feb 2021 14:22:52 +0100 +Subject: [PATCH] =?iso8859-1?q?Configure-Patch=20f=FCr=20nicht-bash?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=iso8859-1 +Content-Transfer-Encoding: 8bit + +--- + configure.ac | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c2b7819..f6224a1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -489,7 +489,7 @@ AC_ARG_WITH([gtk], + AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal]) + AC_ARG_VAR([GTK_VERSION_MAJOR]) + +-AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"], ++AS_IF([test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"], + [PKG_CHECK_MODULES([GTK3], [gtk+-3.0], + [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` + GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion` +@@ -501,7 +501,7 @@ AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"], + ]) + ]) + +-AS_IF([test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"], ++AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"], + [PKG_CHECK_MODULES([GTK2], [gtk+-2.0], + [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` + GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion` +@@ -550,11 +550,11 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)]) + AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)]) + + AS_IF([test -z "$PYTHON"], +- [AS_IF([test "x$with_python" == "xauto"], ++ [AS_IF([test "x$with_python" = "xauto"], + [AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])], +- [AS_IF([test "x$with_python" == "xpython3"], ++ [AS_IF([test "x$with_python" = "xpython3"], + [AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])], +- [AS_IF([test "x$with_python" == "xpython2"], ++ [AS_IF([test "x$with_python" = "xpython2"], + [AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])], + [with_python="no"]) + ]) +@@ -608,7 +608,7 @@ AM_CONDITIONAL([HAVE_PYGTK2], [test "x$with_pygtk2" != "xno"]) + + dnl GObject Introspection (GIR) + +-AS_IF([test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"], ++AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"], + [m4_ifdef([GOBJECT_INTROSPECTION_CHECK], + [GOBJECT_INTROSPECTION_CHECK([0.6.7]) + AS_IF([test "x$found_introspection" = "xyes"], +@@ -696,7 +696,7 @@ AC_ARG_WITH([java], + [], + [with_java="check"]) + +-JAVAC=${JAVAC/ecj/ecj -1.5} ++JAVAC="$(echo $JAVAC | sed 's/ecj/ecj -1.5/')" + + # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to + # look strictly at the $JAVA_HOME in order to avoid mixing different versions +@@ -707,13 +707,13 @@ AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"]) + + AC_ARG_VAR([JAR], [location of Java archive tool]) + AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH]) +-AS_IF([test "x$JAR" == "x:"], [have_java="no"]) ++AS_IF([test "x$JAR" = "x:"], [have_java="no"]) + + AC_ARG_VAR([JAVA], [location of Java application launcher]) + AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH]) + + AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)]) +-AS_IF([test "x$CLASSPATH" == "x"], [CLASSPATH="."]) ++AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."]) + + dnl Search for Java unit test library + AS_IF([test -z "$JUNIT_HOME"], +@@ -850,7 +850,7 @@ echo "GTK --with-gtk=$with_gtk Gtk${GTK_VERSION}" + echo "GObject introspection --with-gir=$with_gir" + echo "Qt --with-qt=$with_qt Qt${QT_VERSION}" + echo "Java --with-java=$with_java" +-AS_IF([test "x$win32" == "xno"], ++AS_IF([test "x$win32" = "xno"], + [echo "Dbus --with-dbus=$with_dbus"]) + AS_IF([test "x$have_GM" = "xyes"], + [echo "GraphicsMagick --with-graphicsmagick=yes"], +@@ -873,13 +873,13 @@ AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"], + [echo " => the zbarimg file scanner will *NOT* be built"]) + AS_IF([test "x$have_GM" = "xyes"], + [echo " => ImageMagick is preferred, as GraphicsMagick doesn't support https"]) +-AS_IF([test "x$with_gtk" == "xno"], ++AS_IF([test "x$with_gtk" = "xno"], + [echo " => GTK support will *NOT* be built"]) + AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"], + [echo " => the Python 2 GTK widget wrapper will *NOT* be built"]) + AS_IF([test "x$with_qt" != "xyes"], + [echo " => the Qt widget will *NOT* be built"]) +-AS_IF([test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ], ++AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ], + [echo " => Building a static Qt library"]) + AS_IF([test "x$with_java" != "xyes"], + [echo " => the Java interface will *NOT* be built"]) +@@ -888,5 +888,5 @@ AS_IF([test "x$with_java_unit" != "xyes"], + #echo "NPAPI Plugin --with-npapi=$with_npapi" + #AS_IF([test "x$with_mozilla" != "xyes"], + # [echo " => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"]) +-AS_IF([test "x$enable_pdf417" == "xyes"], ++AS_IF([test "x$enable_pdf417" = "xyes"], + [echo " => the pdf417 code support is incomplete!"]) +-- +2.30.0 + diff --git a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch new file mode 100644 index 000000000000..916dee61d431 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch @@ -0,0 +1,23 @@ +https://github.com/mchehab/zbar/pull/115 +--- a/zbarcam/zbarcam.c ++++ b/zbarcam/zbarcam.c +@@ -37,6 +37,7 @@ + #ifdef ENABLE_NLS + #include "../zbar/gettext.h" + # include ++# include + # define _(string) gettext(string) + #else + # define _(string) string +--- a/zbarimg/zbarimg.c ++++ b/zbarimg/zbarimg.c +@@ -42,6 +42,7 @@ + #ifdef ENABLE_NLS + #include "../zbar/gettext.h" + # include ++# include + # define _(string) gettext(string) + #else + # define _(string) string +-- +2.26.2 diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild index 6330b914ce1a..d51457a9e1d8 100644 --- a/media-gfx/zbar/zbar-0.23-r1.ebuild +++ b/media-gfx/zbar/zbar-0.23-r1.ebuild @@ -78,6 +78,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.10-errors.patch" + "${FILESDIR}/${PN}-0.23-r1-nonbash.patch" "${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch" "${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch" "${FILESDIR}/${P}_fix_python_detect.patch" diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild index 6c1c8269865e..2f529efbe041 100644 --- a/media-gfx/zbar/zbar-0.23.1.ebuild +++ b/media-gfx/zbar/zbar-0.23.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx @@ -13,7 +13,7 @@ SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv" REQUIRED_USE=" @@ -83,6 +83,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch" "${FILESDIR}/${P}_fix_unittest.patch" + "${FILESDIR}/${P}_musl_include_locale_h.patch" "${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch" "${FILESDIR}/zbar-0.23_fix_python_detect.patch" ) -- cgit v1.2.3