summaryrefslogtreecommitdiff
path: root/media-gfx
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/fontforge/Manifest2
-rw-r--r--media-gfx/fontforge/fontforge-20170731.ebuild2
-rw-r--r--media-gfx/freepv/Manifest2
-rw-r--r--media-gfx/freepv/freepv-0.3.0-r5.ebuild2
-rw-r--r--media-gfx/gimp/Manifest17
-rw-r--r--media-gfx/gimp/files/gimp-2.8.6-uclibc.patch45
-rw-r--r--media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch88
-rw-r--r--media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch54
-rw-r--r--media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch50
-rw-r--r--media-gfx/gimp/files/gimp-2.9.2-version.patch28
-rw-r--r--media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch291
-rw-r--r--media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch28
-rw-r--r--media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch36
-rw-r--r--media-gfx/gimp/gimp-2.8.14-r2.ebuild170
-rw-r--r--media-gfx/gimp/gimp-2.8.14-r4.ebuild170
-rw-r--r--media-gfx/gimp/gimp-2.8.20-r1.ebuild169
-rw-r--r--media-gfx/gimp/gimp-2.8.22.ebuild2
-rw-r--r--media-gfx/gimp/gimp-2.9.4-r3.ebuild191
-rw-r--r--media-gfx/gphoto2/Manifest2
-rw-r--r--media-gfx/gphoto2/gphoto2-2.5.14.ebuild2
-rw-r--r--media-gfx/graphicsmagick/Manifest2
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild2
-rw-r--r--media-gfx/imagemagick/Manifest4
-rw-r--r--media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild185
-rw-r--r--media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild185
-rw-r--r--media-gfx/imageworsener/Manifest2
-rw-r--r--media-gfx/imageworsener/imageworsener-1.3.2.ebuild2
-rw-r--r--media-gfx/kcoloredit/Manifest2
-rw-r--r--media-gfx/kcoloredit/kcoloredit-2.0.0-r1.ebuild11
-rw-r--r--media-gfx/librecad/Manifest2
-rw-r--r--media-gfx/librecad/librecad-2.1.3.ebuild4
-rw-r--r--media-gfx/openscad/Manifest6
-rw-r--r--media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch14
-rw-r--r--media-gfx/openscad/openscad-2015.03_p2-r1.ebuild53
-rw-r--r--media-gfx/openscad/openscad-2015.03_p2-r3.ebuild (renamed from media-gfx/openscad/openscad-2015.03_p2-r2.ebuild)38
-rw-r--r--media-gfx/openscad/openscad-9999.ebuild36
-rw-r--r--media-gfx/potrace/Manifest2
-rw-r--r--media-gfx/potrace/potrace-1.15.ebuild2
-rw-r--r--media-gfx/rawtherapee/Manifest2
-rw-r--r--media-gfx/rawtherapee/rawtherapee-5.2.ebuild2
-rw-r--r--media-gfx/sane-backends/Manifest2
-rw-r--r--media-gfx/sane-backends/sane-backends-1.0.27.ebuild2
-rw-r--r--media-gfx/shotwell/Manifest2
-rw-r--r--media-gfx/shotwell/shotwell-0.27.1.ebuild63
-rw-r--r--media-gfx/slic3r/Manifest2
-rw-r--r--media-gfx/slic3r/slic3r-1.1.7.ebuild4
-rw-r--r--media-gfx/sxiv/Manifest4
-rw-r--r--media-gfx/sxiv/sxiv-24.ebuild62
-rw-r--r--media-gfx/sxiv/sxiv-9999.ebuild6
-rw-r--r--media-gfx/valentina/Manifest15
-rw-r--r--media-gfx/valentina/files/disable-tests-compilation.patch35
-rw-r--r--media-gfx/valentina/files/fix-insecure-runpaths.patch56
-rw-r--r--media-gfx/valentina/files/locales.patch48
-rw-r--r--media-gfx/valentina/valentina-0.4.2-r3.ebuild77
-rw-r--r--media-gfx/valentina/valentina-0.4.5.ebuild77
-rw-r--r--media-gfx/valentina/valentina-0.5.0-r2.ebuild (renamed from media-gfx/valentina/valentina-0.5.0.ebuild)22
-rw-r--r--media-gfx/valentina/valentina-9999.ebuild10
57 files changed, 624 insertions, 1770 deletions
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 3579f9add96c..c14a7f2eb06e 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -8,7 +8,7 @@ EBUILD fontforge-20150612-r1.ebuild 2840 SHA256 a4340728a3b639e1b30054add808b06a
EBUILD fontforge-20150824.ebuild 2630 SHA256 470aaf2590cf93e89f2251606b6a3cf3ede42acf3bf2c37ae129ae9165c175fb SHA512 1d89f56716cf8be4d925f576534c42a2bb8c80cc83be0f6aa39bb05fdbd11a66b8ec0164810253304472343211bd2133189cbd34cf06c996af0e5c6f81d3fde8 WHIRLPOOL 916f74e583f7f910a747cbe1b246165d99143e81b40afcbff1b9aec7c0bd2b54b710f76c2439365b4ecb08daef1a2af8836be6c2b11f45f1a07f944951af3ac1
EBUILD fontforge-20160404.ebuild 2594 SHA256 a33fe382c822bd385d32867e12b97c22a496b5fc54d606c47a3be1960b289412 SHA512 7918ccbb74ef4f4df82869663fe9ce44bbaf990cfbef951a017f43f5055b742c88f92b04b6b45b9bd0fda09b298a0ce8f3630a5a27a0ac49f88d476737f8a52c WHIRLPOOL 58e45d9b87bea34cf46660bce95e013adf27e047c420b492069362be75aad81edbc1e8debcf7955fc6cb7ef8596e762a4c808b50672c6be83290c6cbcd44f86a
EBUILD fontforge-20161005.ebuild 2516 SHA256 2d1264deefd6b095a636bfb23efda3927c6fcba67f05fe3d042cc658cc827469 SHA512 f1ad068728e1d88d2469ef4371285e4aec86b3279366085d18427503b5a0e3085f779bff2f0c178c7256c5b1bae29a458567ab124c91aa3403f91bcf97ef9aec WHIRLPOOL 62af3c7f689cec7b6ea55b4e7445b656dbaa98da25b77005567736a1929a5b9bfb75fe5f40c35ac54ee495d30fd5cb6ef44c99493bc15a5fa703bae538f9a7a8
-EBUILD fontforge-20170731.ebuild 2637 SHA256 fc4807db4849c2acf84237799c76ad7b0827a9bbde6ad3d6c5c74f2f2716bcdb SHA512 8cecfa19b39b44699e928a67c4e5a330f8e48e1d45050aa5afc61b54db2453bc8243ff1a04dc06458d7e598e68f6bdf4e014c5b2c3bd8ef519d024e9d59507d2 WHIRLPOOL 75c520d33baa08804417d75788f4405700d4e1a971d7955454819d3b16852a8ca4fde02da879486886865cf67161f505e878646cc66c62c12ce5df9f330b7ff5
+EBUILD fontforge-20170731.ebuild 2631 SHA256 eed638a96ec8769276b1e86e3577b769a5a1de9a664208bf72564536e608c174 SHA512 d6d2a64ac44b1ae6b52b634c380df99b1eb9c7ba7db5275405b7133af55693ac6acbd89a91f6baf5233212d5324866bf0bfd585efb81b2b7c8dad02c7a549180 WHIRLPOOL fc727be3481def972582c729ea66b0fd6fde5515c4fe05eaab68a921d474174d0dacef2c7284b676d5e3e19ba51456ef75bb4e18b5aae598d8aed59fb8570cfe
MISC ChangeLog 8979 SHA256 4ec854f4f1d62708cf5df72f190b68b0706631a58ab69f0512be043a1f43f293 SHA512 83f44989216d08a96fbc6f43be409f0a97da84e362539f1593f53dacf4cc432ec3314b863a5968d5f1808b41c399b968b4cf8c02002e41328cd10a5cd2bc4e7a WHIRLPOOL c886e4ee71fd6929f55f5e8cb2176c5ee424370cbe08c17eb5bf291d330a3cb930fc00ad9f5f6e4bc6a30246fff3b28e387c00b1aea83628332fe07962a55f59
MISC ChangeLog-2015 24226 SHA256 78dcbc30a5f0a0eb19149ec7bef221f54aa3282f4f01c449a14faa257b87bd95 SHA512 695bed04a1e5a2141029dc5e1b41788287cd32408fec2323aba8b27505c956cb5e1f77480a90d27cd544ea619060d2b532010f249052bd232b157e6aece7444c WHIRLPOOL 60dadcd8eac86a0a21a3ec904148d3c06230d8b064106604bfcea4ec1bc8f7677561e3bbf2ca2279da199d8e6ff1fadad6c419d8652d37aa0caa08c8733999e7
MISC metadata.xml 908 SHA256 d442286b554f49b292017b0fafd26be23c0db4b050e1835a5d87a72ebeff4c76 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28 WHIRLPOOL 43245d814f390c7583f50fae1e1f50f8c99e6fad2142d780b2c11159c4b743e961cbb102287cfe24a0d3d752aaa5df9f2c058457a35c1879effd2235c3023a7d
diff --git a/media-gfx/fontforge/fontforge-20170731.ebuild b/media-gfx/fontforge/fontforge-20170731.ebuild
index 4b1011be16f4..a74a62782e48 100644
--- a/media-gfx/fontforge/fontforge-20170731.ebuild
+++ b/media-gfx/fontforge/fontforge-20170731.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
LICENSE="BSD GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X"
RESTRICT="!test? ( test )"
diff --git a/media-gfx/freepv/Manifest b/media-gfx/freepv/Manifest
index 182299fe82ad..0d4e3d9acddd 100644
--- a/media-gfx/freepv/Manifest
+++ b/media-gfx/freepv/Manifest
@@ -6,7 +6,7 @@ AUX freepv-0.3.0-stringh.patch 273 SHA256 de462bebc3460011b4f30af986f417b2836a3c
AUX freepv-0.3.0-unsigned_short.patch 1787 SHA256 59f8ca984d1f184577b265870f5424f28f49f19582ca57ab56d3d18e981d2dec SHA512 aba4a7b0d882ebce73b5ec823e8a51cec2788efdc4d9000c9d48a3c07a77e88dbee1e24ffdb1a57b2a4ae45b9310b25cf0157c15d73f8fffdf0a2582e8b88078 WHIRLPOOL bb73a0a0c6087b2079cc44981959d0ed0628dcae53cd2adc60d4ca9bd95fbae25aa923c806ec936dd5f43cc69a65e1e188152781b9cd12356e38407cfb113f75
DIST freepv-0.3.0.tar.gz 175545 SHA256 a66c58616cbe814b2e23c6fe109c3de906dad83a8faa32ea219c182bf15229f0 SHA512 0b207dc25c51b19fd76637743adb8e395c6098d03611612086d66d3f1aa6e4d0c5700aa0e23210082d6aa7495f19d1c3d8f0f93ad11a5236df86d709d5f71a7d WHIRLPOOL 993378bb9ef25e1a1064f9402c4608d0a54588f035f23fc67024b857705ff978a403f86e5140e9ed88b83a6d9ae7a74aa86bf9c0239eb07348904d1eeb9ef749
EBUILD freepv-0.3.0-r4.ebuild 979 SHA256 e2141c5b9ebc1d8a8cbfd55d6ef71d1f169bf11ea114729fc52146a071afca27 SHA512 7e5243b3abfbcbfbe8a766f581950439e9609bf3ecb899f951df21851acdde5ee955388d89ff9a0ef18e748c30a3d12d41f214d37a01d7955d652837cd4e4f3a WHIRLPOOL 7a1468bf212586dc33d57e9c8aae5384b52730349f34e3b2dc6c4e9cddc29f44adbee0a2408ec8b6e326ccbc7352b4bfaeaf6bfc1f5612434f8d825d05eda840
-EBUILD freepv-0.3.0-r5.ebuild 963 SHA256 6b0a284958d0029abdf9d23b3567f2c8946beb99b427a61b5fbd7e81a346a068 SHA512 162b7095e1fa1f37e3525d75cec993112d4d5aada164fcab1f8354b5522aaaa91087db49709dc810f0ea3c3c86151bf08603c21293c1fb83887d5ccff98af1f0 WHIRLPOOL a2543d1248a6cff166fd5a33bafa0e7901efa04b9c12a3a9087c9548114330e302366d13b624316c9ab9c5b6eca9f09d94b2fe8220944a6f37e67386b7a7a248
+EBUILD freepv-0.3.0-r5.ebuild 962 SHA256 b04eed14c1b0fa7a7e39fbf76038806202576516553e4b33d23f04a12e596584 SHA512 d8334c3e781236335389924050f71d35a91bded5a3e7d14d869ab5f122974ab56a138b9be1086e4b0d577627b73aece6698f5ad9b41263fd43db24c899940a57 WHIRLPOOL 369dc7bf6da8c11cc6e1cc39ad3242480d95039f5fb0162c04e6fe0cc50187eb3dee1aa9051c7cf5fcc202058748f37e29e2ede0f88f98c2d1342af521092653
MISC ChangeLog 2357 SHA256 6c66dcbb837604ebe9e7cd8c2c6d048b459c47c61a11826db44d882c40b3e6a3 SHA512 2418782b8d38aef14f120f4b3b256b3fc10eb8c0cf7a58b3afd584a20df92c67e4863cb0c2389598bffaa43766ba7c6ca723b992d2c16d3c9ab690770b09f815 WHIRLPOOL e2cbcbcd185dacaacfd2e91c97e73cb2149d36dd912501312267f8572ad866804dd0b77d79cc5dbca4571d204b66f455f8cb4c677cc91f0f326a93c4dbf4068e
MISC ChangeLog-2015 3391 SHA256 9452c6aa5b8c5b16013d7c5d943900ee5ae9857bd1db94e7277c0dadd5220a9a SHA512 2e656dbcd16f1c33c2bf336f7bce9bf157316c5ad6638a3d5ff524addc0d40b53dc77ea490681861db0451cf19afffba631782cea5d837f31da43a05ae4f519d WHIRLPOOL dd1ed03ee3402e1879fafadbb105bef47ccc08c1d6d5f9a2a88af77221a958e9e6c2c18d81d289d0397a32c2416fb9f7854c308d86e66f0499aa6c401164b305
MISC metadata.xml 474 SHA256 8892cb002be9ecac033d26cb60b86ceba7d2011b79b541e4cc45229a17ca02cf SHA512 4466402d68177a660716acf3afdb8ddc2074e8ac7ad35f2ad6b31adc9fe938b39cc999dc082fa07f8787be8798a053a6248dac12091a22d32d9fb83a1022b421 WHIRLPOOL d6c4055abefdfc503c1c51319626b573fc5e4ed2924956c5d8ef976958e78bcbb0dea4a42caa8fad2e0d429075e3788e267d18cb47d118e5897738474b68c065
diff --git a/media-gfx/freepv/freepv-0.3.0-r5.ebuild b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
index fb4eeffb23c1..567774b174ee 100644
--- a/media-gfx/freepv/freepv-0.3.0-r5.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0-r5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/freepv/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
DEPEND="dev-libs/libxml2
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index e44064b532e6..e1abaa3f2d67 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,25 +1,10 @@
AUX gimp-2.7.4-no-deprecation.patch 1061 SHA256 fb9532406b62a6fa12f8598b142186fad1dc4e937328c8859cb4e8e76d2b19c7 SHA512 3454f3b1a7579b1da4c36b765ae2a54adab13f0a4ecf02c4c0c3c55a12ff7af57d6d0467f663d2ef3de6cda116095f5f662a29cb3d729e0533edd585731a1dc9 WHIRLPOOL 25b645c7e3f39cabe35155dd24c061a088a1800b0a4c154196ff89f4ccf3fc1950a1028d08eddf879cc482ca334bd99bc4c6cea8288e3bf36c0bed657485d984
AUX gimp-2.8.10-clang.patch 7670 SHA256 a7f057002f7749cdcb07871c3ef69aa73ab28e688ed5782316d5cb1489a0af1e SHA512 772ee0837a214f3ef70e823662fe12e57ee8fd5f800c6508e757b86169b86a5cbd86695870993a66d3726c019d24f79616831bed8baabce3e1d247ecbfe204fc WHIRLPOOL 0baa2a9e7e3370d2b44a180f89c66306aa3f0a6fb4a675ae9fe3413032ce8b6a8a0bd03b33e86453a2a41340e504f641eead1c9b1e4461bb7133ecae713c52fc
AUX gimp-2.8.14-blend-center.patch 999 SHA256 2fb7bdc7e31a833ddaa75c4ff7bd8ce0595b5a638f3cf9d387e2fd6a0f3764c4 SHA512 1d3cbe9d1b02e2d10ba982265f7d89f593aa6973f76d529dd909f36efe1c9d968360ec208943f66c00f6589f5c679368099e0db579ddb3655c15cb6ce8bdf930 WHIRLPOOL a1f3abe22a966a5490979c580e5c8bd591d0c3a12ae85fb86f306d066f18cc18249eeea2ac5459d99466161b09ba8167a52bb232f69839f383d809ec09e0705f
-AUX gimp-2.8.6-uclibc.patch 1317 SHA256 09dcec105a741627c74214ea8dec1696f921be94d3b5492b417f9a68043979c7 SHA512 0e7da897f0d654d2be233880bc80c869f869698122db779bd23f7b995de53840553a3b877b50f0297e56fc8627888b98b3206c08c03a4d22e748feeabe92391a WHIRLPOOL 0e65f6b620c23b2ff2f9b13fd555fe3c070d73b50b3ba93c61446783861f2f0fd7ecdc2102887e9673077d691e9cfcf05bd848242565776931c7f5bff628396b
-AUX gimp-2.9.2-CVE-2016-4994.patch 3118 SHA256 14f8b33b40b8de61a21276b26e6e908ef42cb19e7ea938b9a213661760af72dc SHA512 5268326b037ac174ca89525c0332620addd28348f2901e3725402c1aa9fbd2718245868fcb44405256a9c60b8b74df9c66850b0af5d80ca3c4ae7a76bbd523cb WHIRLPOOL 984d9198b18bfd7019b1b5e1348e1d7b18e2466f6d7b91ee7656feb64d2bbe9b46b376c29b8a589fea27b687ec58dd1c2255e1a99a346043ed92a3d9b5e4b0e4
-AUX gimp-2.9.2-gegl-0.3.8.patch 1810 SHA256 a10374d1992f3ead5b07d4f7b387bbb01309fc890e1c5cabeb77893bc32ef908 SHA512 215e51f12e0672dad81b87ae31cbc37a14176b357b6576057224b82d3f3b392485f1e12301ccb8cae97a9423a4ab177d9213538f0d1612e46250012ea3adeaa6 WHIRLPOOL 11bd3d0038c15b946fa1cb898d0e47b45dab06f0a1b390f627ec2b093cc4ff6ce6d2ec67c04d458525cc7528cc25f81916300f3609026bae33e56c67e2a19cd6
-AUX gimp-2.9.2-no-deprecation.patch 1391 SHA256 7e26743c6f51e942ddd051481d2ec30c59e691737f3b12bc548784243c4007e1 SHA512 69ec37957a22a8a7dfc40b912d6ba840bbaed6b27f41d1dc2447b36766c201c462a69a7b65014e21b4a4b7f87c0e630795cf64d13cf4bf7397e1a80290e71181 WHIRLPOOL 3242b67f6ca9129a0a55db340127c745de096d41d73b2666196ccaf81718b468c2393f14e57ab707856f91e5ce85787a48025f2a9f986b481ad7a158a50b78d2
-AUX gimp-2.9.2-version.patch 775 SHA256 07c83325eddd9af9be562a0878986c080ac7299954f726f5373db3ebb0bad821 SHA512 fe8894d9e89210b4d0a8584c1ad3825bb720964ad9194e0b088b6dea2e8b354a2d2f662748ea4f3c090ebb66b64c27a5922fa3d3cf3d49da9aa07e552ad608d6 WHIRLPOOL ce67beb429dd92ed1fcb6347d88eee0bf4bd7c0f36d987c35ef5edb4b7733478a253f4b00216e40f3a7964852e4094e1bcab6df73d68e8acb65fd1f5cb2964d1
-AUX gimp-2.9.4-CVE-2007-3126.patch 8937 SHA256 92dad0e1effa13636a02dd7b16d0065ca869432cff5b31366464a495a85bff4b SHA512 c3853f38204e8fcb6e492812f6c684601827517f988592526f41e285766c3ea688d404593bcaae75d8c2ba0bd2910c43f7b0ec5147659cfd2cc5429d38754306 WHIRLPOOL 8ed186ab843ecfbc82f73bf6b50938f3e0e4bb753bce8646b748d69de97d75dc6df5059338ce9978bf49f3cd52e974694beb979affcb29d5e389404be7583a73
-AUX gimp-2.9.4-gegl-bin.patch 705 SHA256 2425c117b68d812c7f1fcdac5e4654485fac0894302e5b1d7aaed281e5c0ce78 SHA512 3280cb607ba5539c17dc00816b9d745849db48ced676c0a6de3752a8ad3b7eb1717eb4b6af9a5a5db96aeaddd5992d23f0d06b2a3a967a6929e0092145594fef WHIRLPOOL 30044fb9dede9454b52d813bc445603e530e553159db90df8d84b5e26e6dc75cd0edda96d9a8080ab5cfec89662156a29d7bd498b4183bff023989122788e432
-AUX gimp-2.9.4-mkdir-makefile.patch 1492 SHA256 7bba311b9df6a17c73087bfc15db0ba7e7b215a7c4839f9fcc69aa2c826f2bc2 SHA512 c8fa19e79fcc2e38af002c472bdcf6656e3297826ba9df9e22335d09e062c84b32b5b39e9d43adc1ce8b9b20bc047e9a7ef3a52d9db39a69e03a2956204c6000 WHIRLPOOL f2ba749e8253dca3c37178aaf72a06b19d0de4582022a40613faee3058eaffcf2fde3c65f0ab89ef1bb2b530498983a6c9b7c98ea5d7585d90c6f49b2f95364f
AUX gimp-2.9.6-underlinking.patch 653 SHA256 7a59c57012f68040d0a1df490b543566d1cc9e0530a148cc9dd505c2b66710a7 SHA512 3ed27297af495828d9394d7bdd067d416733ae7a3665784ee37b19273d002a585fcb22f30ec6db93164b0f0c7220af6020984820da4c78a356b2ae71fb9e61c3 WHIRLPOOL bbd0ecfc038fea235febb65f8859a327d37c73d40b0e1117292d7dcb05ca53769d726a8f3408f98202cea549affdc5f9a116b828eaa3346f52c904b571b9a91e
-DIST gimp-2.8.14.tar.bz2 20440077 SHA256 d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d SHA512 533f6b931624d36525cb2f3fbc27fe27565d761bbe26873bb5445c06c01523c044d1814363a8cd76b6e381440db4c6e302b0d3f7a9e5aac7f60072770552f1ba WHIRLPOOL 8fd7b0fd5f8627b2df83481f7956727acd42eafcdc9c9116713d60faf8578005c2fb1e1d729f3b2c836a90e9bab063e477f9da5285e5c43a79f2dbe441a0565b
-DIST gimp-2.8.20.tar.bz2 20853324 SHA256 939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805 SHA512 5cd02854e21098c0d9d929e9131ede628ed520b6c76190eb9f6db38f057cff956e35b0a891d04c3a2e9c9e85c77f82d7ff5e63404187a8df921553763f649fd7 WHIRLPOOL 14b4791e6849629e3794de28d3bab228dc43df844c56c7777b31e36e4db3173e6c5ccda8f8f116b4fbd2dcec31c24de94d9b822f12bdb20ddc372cf035089355
DIST gimp-2.8.22.tar.bz2 20873278 SHA256 9187a35cc52b110d78124d7b27b68a68ade14a794c2721314bac6134d2a5638a SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6 WHIRLPOOL f9d2f2049b3bf91e8abb8a20b1fda93d801d66ca5d58a9710ae618b0289970c5eaf0df8f195de6c41a4f737fc9e666e011ff7061a45356f18cf426cbbedc3b06
-DIST gimp-2.9.4-r1.tar.xz 18510496 SHA256 c3f3cab83f70c1c2c11c6b94157def3a40f1fd335ffda2ef3e191865fc89d97a SHA512 60691506ad021d34a9728a76529fb7ff653f679979f23346ba84f1f9c36606c6bc118b611e92be79af894cba93746c8bdaeeb00012300c23fe995e50c3204025 WHIRLPOOL a042ac4ccbb8172526cc9fa2ff2df7ac35bd9fcd6283778e03f451766176422ddf250229d9a074821b7a991c24bb14058abe49d9739815681d250f6201467a75
DIST gimp-2.9.6.tar.bz2 25472593 SHA256 b46f31d822a33ab416dcb15e33e10b5b98430814fa34f5ea4036230e845dfc9f SHA512 c874daedb00fbfa4156f0e244b217e221b047cb3bd22a81fb190a5d9d774212dc7802ec215151c6dc87136148bf9f84ca23a0a6340681a53c39b5fa71b2ded89 WHIRLPOOL c0166b2f7d3c0592c940030441f1d918463a5759ba8748c0c3ba0467b8dd15fea364041784e36aff4298e2754ae4f62d5cb83eb4e98531bf50bda1b7603b69c7
-EBUILD gimp-2.8.14-r2.ebuild 4872 SHA256 4dc87684397320cff14f83052aa9a617a90c13122ccf70c3dd49bea7fbda238a SHA512 168718d113cb300f08b77a5975ccd821d75139478664ea5d2d70213ce02486800fd0ff83e235361676d017e50d188e3b833e4a89bb0f0c95d48a73a3c1fa4eb7 WHIRLPOOL ad9b28244096cd4c978bc092d56e94845e8da418f4fd5a1696962f203c7b03d4fd7425d46dafa997ac46c4e893d901eebcff8f7d6045038c901adef15afb24d6
-EBUILD gimp-2.8.14-r4.ebuild 4896 SHA256 50233875990867140a44385421ca141f3252a1ab4c096f4e328ec7458e43b4ed SHA512 54a6c1a00c219df899740c2210415aab9d1e96a4439333027e7d07d0794a920e2737490b75d43375b4b2c48f812ceb07abc3c5f221f4d2bf3afd1772c0fe07bf WHIRLPOOL 30021375ad3362238393be92dfdacbc2444ab9b0019e137ada12d4a9187b79836583bedc2e130712cf30f8b9018bb1f6815a6b943c1018f6e201a0764fdabe2b
-EBUILD gimp-2.8.20-r1.ebuild 4836 SHA256 a1a54864560f650c82deec9083c44305fe7497d3badce21942e244788766fc2b SHA512 cf5fa5734366c0f716a3b4994bd0b7f16fb7f5fff5413b833659905936040016d2b966a95797a51550ffddb964bd2ad453e7f08619c1d376aae458a98869ddee WHIRLPOOL 60c0167a124cd1d7ee56dbadedff6562eefe681c8d2357227b548e189a133b8eb3f69793383178a9d8eb117d0edf0f5519dfdb20901c3358ee60a6dad69223b5
-EBUILD gimp-2.8.22.ebuild 4761 SHA256 309ea05cec920ee5c7715d6114ace627075b199f99165d62b225103846cb0f7b SHA512 3c0fb02fd4667a15f91ffc439913ec29cd66edd9eaace5079077bca69271c6901524a7ef35dd4337c4727145bf42a79c86aa65a8deaee3d5d571f593a7182a29 WHIRLPOOL d9ec98bd757339349dc337d285117ca135409c7b9caff49fde166ab6059b822f78cb1d1f7218ceda8f5afeef54ae65efb655229ff0563a7429eb8fa0725935f1
-EBUILD gimp-2.9.4-r3.ebuild 5147 SHA256 4fe9f2b17e0317cae0b70bfdd0522b9be9aee923a05f2c022ff56cf22636abff SHA512 b550dfd27f1649558ae59f7f9b2d05b95349e8c56ddd1494eec573ea92ad498f42779585f0346a1c4cca21ad970b80caf4167b23ba2676ee6aa208e555edce92 WHIRLPOOL 6dd63363a7b7299588f0d6ed5a1ffe7031cce0856ff611b4dcbb93ebbb2dc5a277e14fe00a7f5460dc096e6cb24137e674d2b9e0247a9efdb704a9dd5134bb70
+EBUILD gimp-2.8.22.ebuild 4760 SHA256 2a1876c2f6102092d1386ccf6dd70543d5d261838e3911c37ba386b024613fb0 SHA512 4911218b41c0b0f21af7fb8e0b31f2958d41dce51f8764bd92f8c4604a54b7e79528c819b5c464186af7c3f9890a5afc77d6ac85caaa47820d8010481c23a3e4 WHIRLPOOL bfab9bad431425d837effdfcbe33a8749e13dd810cbbeeaa8eadb7283276028e53cd3ce2c1119af5060920384e6fd9303b0e0c2f4a8f0400c8ceda3a17e3400c
EBUILD gimp-2.9.6.ebuild 5334 SHA256 14d4b7242daaa08b7b66566bd425ebbf40028f057b8f8cf62b536cf2dad013a5 SHA512 bb8602bffe9a22b3ddd24ffcc6d08cb0dcf9f8f64052b77f0d948521c60a06ad87fbf0bdc4c0000d146e19d300fc2e76cf01e425b5a63ad15c9b20cb8c0ae960 WHIRLPOOL 47303bb7a1140d946dc5595d4101d7e614d0e87cd605038daab681416acb77d7de7ab961129cb7049a23cd344c60450a8bdcd5752bf5fd0d285fdb7ccd45ab40
EBUILD gimp-9999.ebuild 5399 SHA256 d080f168060b128c3dfac9757af6232753e701209a61efe1f8d98b004098b7d9 SHA512 a1990254a48dc25e0f47591f500b6605bbbe8abc3d2558a7a72d078ac28698f71f95b0ba4eac28131ea2d3e064d4c64f8741693dc37d5bef517c101092e43616 WHIRLPOOL d337d6b84816e2a65def0852734c759c1875e9e74cf75e99a1fdea6149afa839ec9cc4e2f477ec67a99eb665998c43414b4dca6830eba2fd769cb6502f7286a5
MISC ChangeLog 11158 SHA256 81ff7305864fda3dca3f0f17d5962d0a070135c39bd281dc8d4473bf407613c6 SHA512 10c4790c9bcc3c2d26f02a406591f379ac9af193e26c5d5c7933c3cbd1525fd9a6dc296680dc7c1a24b4385e4e14077b8fd9be55a5f9562f68b2e5165ea5b143 WHIRLPOOL 3f47da1911e4b4c9725f87808415aae1cddc62ccdb74314cd4af35c1c83eecf56cc4b9941623461f7731a44ff91be635eae1c816b347666919d298efd75bedae
diff --git a/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch b/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch
deleted file mode 100644
index 855e9872f4b4..000000000000
--- a/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4fb7a436bca3e11abfda8bc23818af0f09714b9d Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Fri, 02 Aug 2013 14:50:00 +0000
-Subject: Bug 704980 - uclibc - base-utils.c: execinfo.h: No such file or directory
-
-Apply patch from Amadeusz Slawinski that checks for execinfo.h and
-builds the code that needs it conditionally.
----
-diff --git a/app/base/base-utils.c b/app/base/base-utils.c
-index 757f58d..44a9e89 100644
---- a/app/base/base-utils.c
-+++ b/app/base/base-utils.c
-@@ -29,7 +29,7 @@
- #include <process.h>
- #endif
-
--#ifdef G_OS_UNIX
-+#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H)
- /* For get_backtrace() */
- #include <stdlib.h>
- #include <string.h>
-@@ -112,7 +112,7 @@ get_physical_memory_size (void)
- char *
- get_backtrace (void)
- {
--#ifdef G_OS_UNIX
-+#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H)
- void *functions[MAX_FUNC];
- char **function_names;
- int n_functions;
-diff --git a/configure.ac b/configure.ac
-index 0bbcbc7..15c7cc6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -416,7 +416,7 @@ AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
- AC_HEADER_TIME
-
--AC_CHECK_HEADERS(sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h)
-+AC_CHECK_HEADERS(execinfo.h sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h)
-
- AC_TYPE_PID_T
- AC_FUNC_VPRINTF
---
-cgit v0.9.2
diff --git a/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch b/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch
deleted file mode 100644
index 846318b42149..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 6d804bf9ae77bc86a0a97f9b944a129844df9395 Mon Sep 17 00:00:00 2001
-From: Shmuel H <shmuelgimp@gmail.com>
-Date: Mon, 20 Jun 2016 17:14:41 +0300
-Subject: Bug 767873 - (CVE-2016-4994) Multiple Use-After-Free when parsing...
-
-...XCF channel and layer properties
-
-The properties PROP_ACTIVE_LAYER, PROP_FLOATING_SELECTION,
-PROP_ACTIVE_CHANNEL saves the current object pointer the @info
-structure. Others like PROP_SELECTION (for channel) and
-PROP_GROUP_ITEM (for layer) will delete the current object and create
-a new object, leaving the pointers in @info invalid (dangling).
-
-Therefore, if a property from the first type will come before the
-second, the result will be an UaF in the last lines of xcf_load_image
-(when it actually using the pointers from @info).
-
-I wasn't able to exploit this bug because that
-g_object_instance->c_class gets cleared by the last g_object_unref and
-GIMP_IS_{LAYER,CHANNEL} detects that and return FALSE.
----
- app/xcf/xcf-load.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
-diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
-index f48558a..244d5c2 100644
---- a/app/xcf/xcf-load.c
-+++ b/app/xcf/xcf-load.c
-@@ -1141,6 +1141,18 @@ xcf_load_layer_props (XcfInfo *info,
- case PROP_GROUP_ITEM:
- {
- GimpLayer *group;
-+ gboolean is_active_layer;
-+
-+ /* We're going to delete *layer, Don't leave its pointers
-+ * in @info. After that, we'll restore them back with the
-+ * new pointer. See bug #767873.
-+ */
-+ is_active_layer = (*layer == info->active_layer);
-+ if (is_active_layer)
-+ info->active_layer = NULL;
-+
-+ if (*layer == info->floating_sel)
-+ info->floating_sel = NULL;
-
- group = gimp_group_layer_new (image);
-
-@@ -1150,6 +1162,13 @@ xcf_load_layer_props (XcfInfo *info,
- g_object_ref_sink (*layer);
- g_object_unref (*layer);
- *layer = group;
-+
-+ if (is_active_layer)
-+ info->active_layer = *layer;
-+
-+ /* Don't restore info->floating_sel because group layers
-+ * can't be floating selections
-+ */
- }
- break;
-
-@@ -1220,6 +1239,12 @@ xcf_load_channel_props (XcfInfo *info,
- {
- GimpChannel *mask;
-
-+ /* We're going to delete *channel, Don't leave its pointer
-+ * in @info. See bug #767873.
-+ */
-+ if (*channel == info->active_channel)
-+ info->active_channel = NULL;
-+
- mask =
- gimp_selection_new (image,
- gimp_item_get_width (GIMP_ITEM (*channel)),
-@@ -1234,6 +1259,10 @@ xcf_load_channel_props (XcfInfo *info,
- *channel = mask;
- (*channel)->boundary_known = FALSE;
- (*channel)->bounds_known = FALSE;
-+
-+ /* Don't restore info->active_channel because the
-+ * selection can't be the active channel
-+ */
- }
- break;
-
---
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch b/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch
deleted file mode 100644
index a3aa236542bf..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/586828
-
-Backported from:
-https://git.gnome.org/browse/gimp/commit/?id=2e4685013123c584354bc38612527593a815c38b
-
---- gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
-+++ gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
-@@ -66,23 +66,11 @@
- }
- else
- {
--
- copy = g_param_spec_string (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- spec->default_value,
- flags);
--
-- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec))
-- {
-- static GQuark multiline_quark = 0;
--
-- if (! multiline_quark)
-- multiline_quark = g_quark_from_static_string ("multiline");
--
-- g_param_spec_set_qdata (copy, multiline_quark,
-- GINT_TO_POINTER (TRUE));
-- }
- }
- }
- else if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
---- gimp-2.9.2/app/widgets/gimppropgui.c
-+++ gimp-2.9.2/app/widgets/gimppropgui.c
-@@ -227,11 +227,6 @@
- }
- else if (G_IS_PARAM_SPEC_STRING (pspec))
- {
-- static GQuark multiline_quark = 0;
--
-- if (! multiline_quark)
-- multiline_quark = g_quark_from_static_string ("multiline");
--
- if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (pspec))
- {
- widget =
-@@ -239,7 +234,7 @@
- g_param_spec_get_nick (pspec),
- GTK_FILE_CHOOSER_ACTION_OPEN);
- }
-- else if (g_param_spec_get_qdata (pspec, multiline_quark))
-+ else if (HAS_KEY (pspec, "multiline", "true"))
- {
- GtkTextBuffer *buffer;
- GtkWidget *view;
diff --git a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
deleted file mode 100644
index 441298a08fde..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 81d7607e5159275a9b693a170f7767ffcb548a1b Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 5 Dec 2015 01:14:37 +0100
-Subject: [PATCH] Do not disable deprecated APIs
-
----
- configure.ac | 27 ---------------------------
- 1 file changed, 27 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4de6e53..8528e87 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2111,33 +2111,6 @@ MIME_TYPES="$MIME_TYPES;"
- AC_SUBST(MIME_TYPES)
-
-
--#########################
--# Disable deprecated APIs
--#########################
--
--CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
--
--# Make sure not to disable deprecated APIs for unreleased versions.
--# We must build without problems with future releases of libraries
--# and disabling deprecated API risks breaking the build
--
--if test "x$have_glib_2_43" != "xyes"; then
-- CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gtk_2_26" != "xyes"; then
-- CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_gdk_pixbuf_2_31" != "xyes"; then
-- CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
--fi
--
--if test "x$have_pango_1_32" != "xyes"; then
-- CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
--fi
--
--
- ############################
- # Require multihead safe API
- ############################
---
-2.6.3
-
diff --git a/media-gfx/gimp/files/gimp-2.9.2-version.patch b/media-gfx/gimp/files/gimp-2.9.2-version.patch
deleted file mode 100644
index e48614455577..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.2-version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f2f7a29ba5aceaa38a285f15c3fe8b481d05b357 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 5 Dec 2015 01:15:22 +0100
-Subject: [PATCH] Sync version string
-
-.. with
-m4_define([gimp_micro_version], [2])
-above
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 8528e87..21d86a3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ m4_define([gimp_binary_age],
- [m4_eval(100 * gimp_minor_version + gimp_micro_version)])
-
- # For overriding the version string. Comment out if not needed.
--# m4_define([gimp_version], [2.9.1])
-+# m4_define([gimp_version], [2.9.2])
-
- # This is the X.Y used in -lgimp-X.Y
- m4_define([gimp_api_version], [2.0])
---
-2.6.3
-
diff --git a/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch b/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch
deleted file mode 100644
index 6c515173d9cd..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-From 46bcd82800e37b0f5aead76184430ef2fe802748 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch@gimp.org>
-Date: Sun, 6 Nov 2016 21:34:43 +0100
-Subject: Bug 773233 - CVE-2007-3126 - Gimp 2.3.14 allows context-dependent
- attackers...
-
-...to cause a denial of service (crash) via an ICO file with an
-InfoHeader containing a Height of zero
-
-Add some error handling to ico-load.c and bail out on zero width or height
-icons. Also some formatting cleanup.
----
- plug-ins/file-ico/ico-load.c | 103 ++++++++++++++++++++++++++-----------------
- 1 file changed, 62 insertions(+), 41 deletions(-)
-
-diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c
-index c8091d3..8cce94f 100644
---- a/plug-ins/file-ico/ico-load.c
-+++ b/plug-ins/file-ico/ico-load.c
-@@ -124,15 +124,17 @@ static guint32
- ico_read_init (FILE *fp)
- {
- IcoFileHeader header;
-+
- /* read and check file header */
-- if (!ico_read_int16 (fp, &header.reserved, 1)
-- || !ico_read_int16 (fp, &header.resource_type, 1)
-- || !ico_read_int16 (fp, &header.icon_count, 1)
-- || header.reserved != 0
-- || header.resource_type != 1)
-+ if (! ico_read_int16 (fp, &header.reserved, 1) ||
-+ ! ico_read_int16 (fp, &header.resource_type, 1) ||
-+ ! ico_read_int16 (fp, &header.icon_count, 1) ||
-+ header.reserved != 0 ||
-+ header.resource_type != 1)
- {
- return 0;
- }
-+
- return header.icon_count;
- }
-
-@@ -148,22 +150,25 @@ ico_read_size (FILE *fp,
- gint32 color_type;
- guint32 magic;
-
-- if ( fseek (fp, info->offset, SEEK_SET) < 0 )
-+ if (fseek (fp, info->offset, SEEK_SET) < 0)
- return FALSE;
-
- ico_read_int32 (fp, &magic, 1);
-+
- if (magic == ICO_PNG_MAGIC)
- {
- png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL,
- NULL);
-- if (! png_ptr )
-+ if (! png_ptr)
- return FALSE;
-+
- info_ptr = png_create_info_struct (png_ptr);
-- if (! info_ptr )
-+ if (! info_ptr)
- {
- png_destroy_read_struct (&png_ptr, NULL, NULL);
- return FALSE;
- }
-+
- if (setjmp (png_jmpbuf (png_ptr)))
- {
- png_destroy_read_struct (&png_ptr, NULL, NULL);
-@@ -182,8 +187,8 @@ ico_read_size (FILE *fp,
- }
- else if (magic == 40)
- {
-- if (ico_read_int32 (fp, &info->width, 1)
-- && ico_read_int32 (fp, &info->height, 1))
-+ if (ico_read_int32 (fp, &info->width, 1) &&
-+ ico_read_int32 (fp, &info->height, 1))
- {
- info->height /= 2;
- D(("ico_read_size: ICO: %ix%i\n", info->width, info->height));
-@@ -200,8 +205,9 @@ ico_read_size (FILE *fp,
- }
-
- static IcoLoadInfo*
--ico_read_info (FILE *fp,
-- gint icon_count)
-+ico_read_info (FILE *fp,
-+ gint icon_count,
-+ GError **error)
- {
- gint i;
- IcoFileEntry *entries;
-@@ -209,8 +215,11 @@ ico_read_info (FILE *fp,
-
- /* read icon entries */
- entries = g_new (IcoFileEntry, icon_count);
-- if ( fread (entries, sizeof(IcoFileEntry), icon_count, fp) <= 0 )
-+ if (fread (entries, sizeof (IcoFileEntry), icon_count, fp) <= 0)
- {
-+ g_set_error (error, G_FILE_ERROR, 0,
-+ _("Could not read '%lu' bytes"),
-+ sizeof (IcoFileEntry));
- g_free (entries);
- return NULL;
- }
-@@ -218,23 +227,33 @@ ico_read_info (FILE *fp,
- info = g_new (IcoLoadInfo, icon_count);
- for (i = 0; i < icon_count; i++)
- {
-- info[i].width = entries[i].width;
-+ info[i].width = entries[i].width;
- info[i].height = entries[i].height;
-- info[i].bpp = GUINT16_FROM_LE (entries[i].bpp);
-- info[i].size = GUINT32_FROM_LE (entries[i].size);
-+ info[i].bpp = GUINT16_FROM_LE (entries[i].bpp);
-+ info[i].size = GUINT32_FROM_LE (entries[i].size);
- info[i].offset = GUINT32_FROM_LE (entries[i].offset);
-
- if (info[i].width == 0 || info[i].height == 0)
- {
-- ico_read_size (fp, info+i);
-+ ico_read_size (fp, info + i);
- }
-
- D(("ico_read_info: %ix%i (%i bits, size: %i, offset: %i)\n",
- info[i].width, info[i].height, info[i].bpp,
- info[i].size, info[i].offset));
-+
-+ if (info[i].width == 0 || info[i].height == 0)
-+ {
-+ g_set_error (error, G_FILE_ERROR, 0,
-+ _("Icon #%d has zero width or height"), i);
-+ g_free (info);
-+ g_free (entries);
-+ return NULL;
-+ }
- }
-
- g_free (entries);
-+
- return info;
- }
-
-@@ -256,10 +275,10 @@ ico_read_png (FILE *fp,
- gint i;
-
- png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-- if (! png_ptr )
-+ if (! png_ptr)
- return FALSE;
- info = png_create_info_struct (png_ptr);
-- if (! info )
-+ if (! info)
- {
- png_destroy_read_struct (&png_ptr, NULL, NULL);
- return FALSE;
-@@ -287,14 +306,14 @@ ico_read_png (FILE *fp,
- {
- case PNG_COLOR_TYPE_GRAY:
- png_set_expand_gray_1_2_4_to_8 (png_ptr);
-- if ( bit_depth == 16 )
-+ if (bit_depth == 16)
- png_set_strip_16 (png_ptr);
- png_set_gray_to_rgb (png_ptr);
- png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER);
- break;
- case PNG_COLOR_TYPE_GRAY_ALPHA:
- png_set_expand_gray_1_2_4_to_8 (png_ptr);
-- if ( bit_depth == 16 )
-+ if (bit_depth == 16)
- png_set_strip_16 (png_ptr);
- png_set_gray_to_rgb (png_ptr);
- break;
-@@ -427,16 +446,18 @@ ico_read_icon (FILE *fp,
- data.planes, data.image_size, data.bpp,
- data.used_clrs, data.important_clrs));
-
-- if (data.planes != 1
-- || data.compression != 0)
-+ if (data.planes != 1 ||
-+ data.compression != 0)
- {
- D(("skipping image: invalid header\n"));
- return FALSE;
- }
-
-- if (data.bpp != 1 && data.bpp != 4
-- && data.bpp != 8 && data.bpp != 24
-- && data.bpp != 32)
-+ if (data.bpp != 1 &&
-+ data.bpp != 4 &&
-+ data.bpp != 8 &&
-+ data.bpp != 24 &&
-+ data.bpp != 32)
- {
- D(("skipping image: invalid depth: %i\n", data.bpp));
- return FALSE;
-@@ -590,8 +611,8 @@ ico_load_layer (FILE *fp,
- GeglBuffer *buffer;
- gchar name[ICO_MAXBUF];
-
-- if ( fseek (fp, info->offset, SEEK_SET) < 0
-- || !ico_read_int32 (fp, &first_bytes, 1) )
-+ if (fseek (fp, info->offset, SEEK_SET) < 0 ||
-+ ! ico_read_int32 (fp, &first_bytes, 1))
- return -1;
-
- if (first_bytes == ICO_PNG_MAGIC)
-@@ -643,7 +664,7 @@ ico_load_image (const gchar *filename,
- gimp_filename_to_utf8 (filename));
-
- fp = g_fopen (filename, "rb");
-- if (! fp )
-+ if (! fp)
- {
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
- _("Could not open '%s' for reading: %s"),
-@@ -658,8 +679,8 @@ ico_load_image (const gchar *filename,
- return -1;
- }
-
-- info = ico_read_info (fp, icon_count);
-- if (!info)
-+ info = ico_read_info (fp, icon_count, error);
-+ if (! info)
- {
- fclose (fp);
- return -1;
-@@ -670,12 +691,12 @@ ico_load_image (const gchar *filename,
- max_height = 0;
- for (i = 0; i < icon_count; i++)
- {
-- if ( info[i].width > max_width )
-+ if (info[i].width > max_width)
- max_width = info[i].width;
-- if ( info[i].height > max_height )
-+ if (info[i].height > max_height)
- max_height = info[i].height;
- }
-- if ( max_width <= 0 || max_height <= 0 )
-+ if (max_width <= 0 || max_height <= 0)
- {
- g_free (info);
- fclose (fp);
-@@ -721,7 +742,7 @@ ico_load_thumbnail_image (const gchar *filename,
- gimp_filename_to_utf8 (filename));
-
- fp = g_fopen (filename, "rb");
-- if (! fp )
-+ if (! fp)
- {
- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
- _("Could not open '%s' for reading: %s"),
-@@ -730,7 +751,7 @@ ico_load_thumbnail_image (const gchar *filename,
- }
-
- icon_count = ico_read_init (fp);
-- if (! icon_count )
-+ if (! icon_count)
- {
- fclose (fp);
- return -1;
-@@ -739,8 +760,8 @@ ico_load_thumbnail_image (const gchar *filename,
- D(("*** %s: Microsoft icon file, containing %i icon(s)\n",
- filename, icon_count));
-
-- info = ico_read_info (fp, icon_count);
-- if (! info )
-+ info = ico_read_info (fp, icon_count, error);
-+ if (! info)
- {
- fclose (fp);
- return -1;
-@@ -758,9 +779,9 @@ ico_load_thumbnail_image (const gchar *filename,
-
- match = i;
- }
-- else if ( w == info[i].width
-- && h == info[i].height
-- && info[i].bpp > bpp )
-+ else if (w == info[i].width &&
-+ h == info[i].height &&
-+ info[i].bpp > bpp)
- {
- /* better quality */
- bpp = info[i].bpp;
---
-cgit v0.12
-
diff --git a/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch b/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch
deleted file mode 100644
index 31057b5796df..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8d5de5ce62cd0410c9bccaa77725d0cad051faad Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 18 Jul 2016 17:42:45 +0200
-Subject: [PATCH] Fix gegl executable name to check for
-
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 45b31b1..0e5be99 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -674,9 +674,9 @@ else
- fi
- AC_MSG_RESULT($have_glib_2_43)
-
--AC_PATH_PROG(GEGL, gegl, no)
-+AC_PATH_PROG(GEGL, gegl-0.3, no)
- if test "x$GEGL" = xno; then
-- add_deps_error([gegl], [Could not find gegl in your PATH.])
-+ add_deps_error([gegl], [Could not find gegl-0.3 in your PATH.])
- fi
-
-
---
-2.9.2
-
diff --git a/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch b/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch
deleted file mode 100644
index 661ad699f5de..000000000000
--- a/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c081a26345ad1c5bdf6f4ffec27bca517de6d594 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 23 Jul 2016 01:02:10 +0200
-Subject: [PATCH] Fix creation of output directories
-
-https://bugs.gentoo.org/show_bug.cgi?id=589394
----
- icons/Symbolic-Inverted/Makefile.am | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/icons/Symbolic-Inverted/Makefile.am b/icons/Symbolic-Inverted/Makefile.am
-index 2981cfc..f3fe6a5 100644
---- a/icons/Symbolic-Inverted/Makefile.am
-+++ b/icons/Symbolic-Inverted/Makefile.am
-@@ -10,14 +10,14 @@ include $(top_srcdir)/icons/icon-list.mk
- # As exceptions, we do not want to invert some icons.
- # Just use these as-is: gimp-default-colors, gimp-toilet-paper.png.
- 12/gimp-default-colors.png: $(top_srcdir)/icons/Symbolic/12/gimp-default-colors.png
-- mkdir -p `dirname $<` && cp -f $< $@
-+ mkdir -p `dirname $@` && cp -f $< $@
- scalable/gimp-default-colors.svg: ../Symbolic/scalable/gimp-default-colors.svg
-- mkdir -p `dirname $<` && cp -f $< $@
-+ mkdir -p `dirname $@` && cp -f $< $@
-
- %/gimp-toilet-paper.png: $(top_srcdir)/icons/Symbolic/$(@D)/gimp-toilet-paper.png
-- mkdir -p `dirname $<` && cp -f $< $@
-+ mkdir -p `dirname $@` && cp -f $< $@
- scalable/gimp-toilet-paper.svg: ../Symbolic/scalable/gimp-toilet-paper.svg
-- mkdir -p `dirname $<` && cp -f $< $@
-+ mkdir -p `dirname $@` && cp -f $< $@
-
- # Other exceptions: inverted gimp-color-picker-white|black are generated
- # from each other.
---
-2.9.2
-
diff --git a/media-gfx/gimp/gimp-2.8.14-r2.ebuild b/media-gfx/gimp/gimp-2.8.14-r2.ebuild
deleted file mode 100644
index d697e22cff94..000000000000
--- a/media-gfx/gimp/gimp-2.8.14-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev webkit wmf xpm"
-
-for lang in ${LANGS}; do
- IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
- >=dev-libs/atk-2.2.0
- >=x11-libs/gtk+-2.24.10:2
- >=x11-libs/gdk-pixbuf-2.24.1:2
- >=x11-libs/cairo-1.10.2
- >=x11-libs/pango-1.29.4
- xpm? ( x11-libs/libXpm )
- >=media-libs/freetype-2.1.7
- >=media-libs/fontconfig-2.2.0
- sys-libs/zlib
- dev-libs/libxml2
- dev-libs/libxslt
- x11-themes/hicolor-icon-theme
- >=media-libs/babl-0.1.10
- >=media-libs/gegl-0.2.0:0
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- aqua? ( x11-libs/gtk-mac-integration )
- curl? ( net-misc/curl )
- dbus? ( dev-libs/dbus-glib )
- gnome? ( gnome-base/gvfs )
- webkit? ( >=net-libs/webkit-gtk-1.6.1:2 )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
- exif? ( >=media-libs/libexif-0.6.15 )
- lcms? ( >=media-libs/lcms-2.2:2 )
- mng? ( media-libs/libmng )
- pdf? ( >=app-text/poppler-0.12.4[cairo] )
- png? ( >=media-libs/libpng-1.2.37:0 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
- )
- tiff? ( >=media-libs/tiff-3.5.7:0 )
- svg? ( >=gnome-base/librsvg-2.36.0:2 )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- x11-libs/libXcursor
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- postscript? ( app-text/ghostscript-gpl )
- udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
- sys-apps/findutils
- virtual/pkgconfig
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.19
- doc? ( >=dev-util/gtk-doc-1 )
- >=sys-devel/libtool-2.2
- >=sys-devel/automake-1.11
- dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- G2CONF="--enable-default-binary \
- --disable-silent-rules \
- $(use_with !aqua x) \
- $(use_with aalib aa) \
- $(use_with alsa) \
- $(use_enable altivec) \
- $(use_with bzip2) \
- $(use_with curl libcurl) \
- $(use_with dbus) \
- $(use_with gnome gvfs) \
- $(use_with webkit) \
- $(use_with jpeg libjpeg) \
- $(use_with jpeg2k libjasper) \
- $(use_with exif libexif) \
- $(use_with lcms lcms lcms2) \
- $(use_with postscript gs) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_with mng libmng) \
- $(use_with pdf poppler) \
- $(use_with png libpng) \
- $(use_enable python) \
- $(use_enable smp mp) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with udev gudev) \
- $(use_with wmf) \
- --with-xmc \
- $(use_with xpm libxpm) \
- --without-xvfb-run"
-
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-blend-center.patch # bug 558878
- epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16
- epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
- epatch "${FILESDIR}"/${PN}-2.9.2-CVE-2016-4994.patch # bug 586666
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
- gnome2_src_prepare
-}
-
-_clean_up_locales() {
- einfo "Cleaning up locales..."
- for lang in ${LANGS}; do
- use "linguas_${lang}" && {
- einfo "- keeping ${lang}"
- continue
- }
- rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
- done
-}
-
-src_test() {
- Xemake 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
-
- prune_libtool_files --all
-
- # 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
-
- _clean_up_locales
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.14-r4.ebuild b/media-gfx/gimp/gimp-2.8.14-r4.ebuild
deleted file mode 100644
index 0f09309d6927..000000000000
--- a/media-gfx/gimp/gimp-2.8.14-r4.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-for lang in ${LANGS}; do
- IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
- >=dev-libs/atk-2.2.0
- >=x11-libs/gtk+-2.24.10:2
- >=x11-libs/gdk-pixbuf-2.24.1:2
- >=x11-libs/cairo-1.10.2
- >=x11-libs/pango-1.29.4
- xpm? ( x11-libs/libXpm )
- >=media-libs/freetype-2.1.7
- >=media-libs/fontconfig-2.2.0
- sys-libs/zlib
- dev-libs/libxml2
- dev-libs/libxslt
- x11-themes/hicolor-icon-theme
- >=media-libs/babl-0.1.10
- >=media-libs/gegl-0.2.0:0
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- aqua? ( x11-libs/gtk-mac-integration )
- curl? ( net-misc/curl )
- dbus? ( dev-libs/dbus-glib )
- gnome? ( gnome-base/gvfs )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
- exif? ( >=media-libs/libexif-0.6.15 )
- lcms? ( >=media-libs/lcms-2.2:2 )
- mng? ( media-libs/libmng )
- pdf? ( >=app-text/poppler-0.12.4[cairo] )
- png? ( >=media-libs/libpng-1.2.37:0 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
- )
- tiff? ( >=media-libs/tiff-3.5.7:0 )
- svg? ( >=gnome-base/librsvg-2.36.0:2 )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- x11-libs/libXcursor
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- postscript? ( app-text/ghostscript-gpl )
- udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
- sys-apps/findutils
- virtual/pkgconfig
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.19
- doc? ( >=dev-util/gtk-doc-1 )
- >=sys-devel/libtool-2.2
- >=sys-devel/automake-1.11
- dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- G2CONF="--enable-default-binary \
- --disable-silent-rules \
- $(use_with !aqua x) \
- $(use_with aalib aa) \
- $(use_with alsa) \
- $(use_enable altivec) \
- $(use_with bzip2) \
- $(use_with curl libcurl) \
- $(use_with dbus) \
- $(use_with gnome gvfs) \
- --without-webkit \
- $(use_with jpeg libjpeg) \
- $(use_with jpeg2k libjasper) \
- $(use_with exif libexif) \
- $(use_with lcms lcms lcms2) \
- $(use_with postscript gs) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_with mng libmng) \
- $(use_with pdf poppler) \
- $(use_with png libpng) \
- $(use_enable python) \
- $(use_enable smp mp) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with udev gudev) \
- $(use_with wmf) \
- --with-xmc \
- $(use_with xpm libxpm) \
- --without-xvfb-run"
-
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-blend-center.patch # bug 558878
- epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16
- epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
- epatch "${FILESDIR}"/${PN}-2.9.2-CVE-2016-4994.patch # bug 586666
- epatch "${FILESDIR}"/${PN}-2.9.4-CVE-2007-3126.patch # bug 618310
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
- gnome2_src_prepare
-}
-
-_clean_up_locales() {
- einfo "Cleaning up locales..."
- for lang in ${LANGS}; do
- use "linguas_${lang}" && {
- einfo "- keeping ${lang}"
- continue
- }
- rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
- done
-}
-
-src_test() {
- Xemake 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
-
- prune_libtool_files --all
-
- # 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
-
- _clean_up_locales
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.20-r1.ebuild b/media-gfx/gimp/gimp-2.8.20-r1.ebuild
deleted file mode 100644
index 36bb5254dd15..000000000000
--- a/media-gfx/gimp/gimp-2.8.20-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
-
-for lang in ${LANGS}; do
- IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
- >=dev-libs/atk-2.2.0
- >=x11-libs/gtk+-2.24.10:2
- >=x11-libs/gdk-pixbuf-2.24.1:2
- >=x11-libs/cairo-1.10.2
- >=x11-libs/pango-1.29.4
- xpm? ( x11-libs/libXpm )
- >=media-libs/freetype-2.1.7
- >=media-libs/fontconfig-2.2.0
- sys-libs/zlib
- dev-libs/libxml2
- dev-libs/libxslt
- x11-themes/hicolor-icon-theme
- >=media-libs/babl-0.1.10
- >=media-libs/gegl-0.2.0:0
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- aqua? ( x11-libs/gtk-mac-integration )
- curl? ( net-misc/curl )
- dbus? ( dev-libs/dbus-glib )
- gnome? ( gnome-base/gvfs )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
- exif? ( >=media-libs/libexif-0.6.15 )
- lcms? ( >=media-libs/lcms-2.2:2 )
- mng? ( media-libs/libmng )
- pdf? ( >=app-text/poppler-0.12.4[cairo] )
- png? ( >=media-libs/libpng-1.2.37:0 )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
- )
- tiff? ( >=media-libs/tiff-3.5.7:0 )
- svg? ( >=gnome-base/librsvg-2.36.0:2 )
- wmf? ( >=media-libs/libwmf-0.2.8 )
- x11-libs/libXcursor
- sys-libs/zlib
- bzip2? ( app-arch/bzip2 )
- postscript? ( app-text/ghostscript-gpl )
- udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
- sys-apps/findutils
- virtual/pkgconfig
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.19
- doc? ( >=dev-util/gtk-doc-1 )
- >=sys-devel/libtool-2.2
- >=sys-devel/automake-1.11
- dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- G2CONF="--enable-default-binary \
- --disable-silent-rules \
- $(use_with !aqua x) \
- $(use_with aalib aa) \
- $(use_with alsa) \
- $(use_enable altivec) \
- $(use_with bzip2) \
- $(use_with curl libcurl) \
- $(use_with dbus) \
- $(use_with gnome gvfs) \
- --without-webkit \
- $(use_with jpeg libjpeg) \
- $(use_with jpeg2k libjasper) \
- $(use_with exif libexif) \
- $(use_with lcms lcms lcms2) \
- $(use_with postscript gs) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_with mng libmng) \
- $(use_with pdf poppler) \
- $(use_with png libpng) \
- $(use_enable python) \
- $(use_enable smp mp) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with udev gudev) \
- $(use_with wmf) \
- --with-xmc \
- $(use_with xpm libxpm) \
- --without-xvfb-run"
-
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.8.14-blend-center.patch # bug 558878
- epatch "${FILESDIR}"/${PN}-2.7.4-no-deprecation.patch # bug 395695, comment 9 and 16
- epatch "${FILESDIR}"/${PN}-2.8.10-clang.patch # bug 449370 compile with clang
- epatch "${FILESDIR}"/${PN}-2.9.4-CVE-2007-3126.patch # bug 618310
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
- gnome2_src_prepare
-}
-
-_clean_up_locales() {
- einfo "Cleaning up locales..."
- for lang in ${LANGS}; do
- use "linguas_${lang}" && {
- einfo "- keeping ${lang}"
- continue
- }
- rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
- done
-}
-
-src_test() {
- Xemake 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
-
- prune_libtool_files --all
-
- # 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
-
- _clean_up_locales
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.8.22.ebuild b/media-gfx/gimp/gimp-2.8.22.ebuild
index 51de3fe64779..fc037aaa8de1 100644
--- a/media-gfx/gimp/gimp-2.8.22.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/gimp/gimp-2.9.4-r3.ebuild b/media-gfx/gimp/gimp-2.9.4-r3.ebuild
deleted file mode 100644
index 8c75005f2e51..000000000000
--- a/media-gfx/gimp/gimp-2.9.4-r3.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit versionator virtualx autotools eutils gnome2 fdo-mime multilib python-single-r1
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="https://www.hartwork.org/public/${P}-r1.tar.xz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86"
-
-LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons wmf xpm"
-
-for lang in ${LANGS}; do
- IUSE+=" linguas_${lang}"
-done
-
-RDEPEND=">=dev-libs/glib-2.30.2:2
- >=dev-libs/atk-2.2.0
- >=x11-libs/gtk+-2.24.10:2
- dev-util/gtk-update-icon-cache
- >=x11-libs/gdk-pixbuf-2.31:2
- >=x11-libs/cairo-1.12.2
- >=x11-libs/pango-1.29.4
- xpm? ( x11-libs/libXpm )
- >=media-libs/freetype-2.1.7
- >=media-libs/harfbuzz-0.9.19
- >=media-libs/gexiv2-0.6.1
- >=media-libs/libmypaint-1.3.0_beta0[gegl]
- >=media-libs/fontconfig-2.2.0
- sys-libs/zlib
- dev-libs/libxml2
- dev-libs/libxslt
- x11-themes/hicolor-icon-theme
- >=media-libs/babl-0.1.18
- >=media-libs/gegl-0.3.8:0.3[cairo]
- >=dev-libs/glib-2.43
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- aqua? ( x11-libs/gtk-mac-integration )
- gnome? ( gnome-base/gvfs )
- virtual/jpeg:0
- jpeg2k? ( media-libs/jasper:= )
- >=media-libs/lcms-2.2:2
- mng? ( media-libs/libmng )
- openexr? ( >=media-libs/openexr-1.6.1 )
- pdf? ( >=app-text/poppler-0.12.4[cairo] >=app-text/poppler-data-0.4.7 )
- >=media-libs/libpng-1.2.37:0
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}]
- >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}]
- )
- >=media-libs/tiff-3.5.7:0
- >=gnome-base/librsvg-2.36.0:2
- wmf? ( >=media-libs/libwmf-0.2.8 )
- x11-libs/libXcursor
- sys-libs/zlib
- app-arch/bzip2
- >=app-arch/xz-utils-5.0.0
- postscript? ( app-text/ghostscript-gpl )
- udev? ( virtual/libgudev:= )"
-DEPEND="${RDEPEND}
- sys-apps/findutils
- virtual/pkgconfig
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.19
- doc? ( >=dev-util/gtk-doc-1 )
- >=sys-devel/libtool-2.2
- >=sys-devel/automake-1.11
- dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453)
-
-DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
-
-S="${WORKDIR}"/${P}-r1
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- G2CONF="--enable-default-binary \
- --disable-silent-rules \
- $(use_with !aqua x) \
- $(use_with aalib aa) \
- $(use_with alsa) \
- $(use_enable altivec) \
- --without-webkit \
- $(use_with jpeg2k libjasper) \
- $(use_with postscript gs) \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_with mng libmng) \
- $(use_with openexr) \
- $(use_with pdf poppler) \
- $(use_enable python) \
- $(use_enable smp mp) \
- $(use_enable cpu_flags_x86_sse sse) \
- --with-librsvg \
- $(use_with udev gudev) \
- $(use_with wmf) \
- --with-xmc \
- $(use_with xpm libxpm) \
- $(use_enable vector-icons) \
- --without-xvfb-run"
-
- if use python; then
- python-single-r1_pkg_setup
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.9.2-no-deprecation.patch # bug 395695, comment 9 and 16
- epatch "${FILESDIR}"/${PN}-2.9.4-CVE-2007-3126.patch # bug 618310
-
- # Bug 589394
- rm icons/Symbolic-Inverted/Makefile.in || die
- epatch "${FILESDIR}"/${PN}-2.9.4-mkdir-makefile.patch
-
- sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
- eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- GEGL=/usr/bin/gegl-0.3 \
- GDBUS_CODEGEN=/bin/false
-}
-
-src_compile() {
- # 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/ # bug #574038
- addwrite /dev/ati/ # bug 589198
- addwrite /proc/mtrr # bug 589198
-
- export XDG_DATA_DIRS=/usr/share # bug 587004
- gnome2_src_compile
-}
-
-_clean_up_locales() {
- einfo "Cleaning up locales..."
- for lang in ${LANGS}; do
- use "linguas_${lang}" && {
- einfo "- keeping ${lang}"
- continue
- }
- rm -Rf "${ED}"/usr/share/locale/"${lang}" || die
- done
-}
-
-src_test() {
- Xemake 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
-
- prune_libtool_files --all
-
- # 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
-
- _clean_up_locales
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-}
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 3d91b3f78846..367b8f9f2e53 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -3,7 +3,7 @@ DIST gphoto2-2.5.11.tar.bz2 785251 SHA256 392844d6a06512b0d85e7983a5a0c85c8039fe
DIST gphoto2-2.5.14.tar.bz2 784442 SHA256 9302d02fb472d4936988382b7277ccdc4edaf7ede56c490278912ffd0627699c SHA512 47cb0d212673c9c0dbc996e0a67191a307599c844293a67184bd1529d9e3b417e154c6de64f4563f6f7e599a1bd6b127266f85f5baa97bd7d86922405bf45331 WHIRLPOOL 333bc0925b36ff5254a5e1d740536129ed08bdbfde7c57ba337aec7fe8cd2dcf8720ab6e1b13dc469b86cd10918926daa65f378e12cf0f29ebe2ff71a5cf62d4
EBUILD gphoto2-2.5.10.ebuild 1258 SHA256 07cf6cd804166f391501dcef1689ee97c905e56845c3cf5f3ef6b8f1797bee86 SHA512 3566fa93cf6afa51f4673a862c9f26689a8d64e127b9eb8f268d278335171333051ea7bb809efce21d4ad69a4b8936af50db3e2d02b8e22b5298147a3494c341 WHIRLPOOL 7d9468c6ea58253239f22110bf9d31f3be2073e39c23e8fe5613d04fd8aabcfa500ba3135b172573c85f48a5471f6f43d420bb7d3b0b25c20a9d04bc953042bd
EBUILD gphoto2-2.5.11.ebuild 1393 SHA256 7b34c6f5dc94184f5e135fe78cd8f31e9cf673d34da511343fecf9ca010effea SHA512 c467516e247d1c0b6579ea1b5e0b6e706883a52ffc8848ee6a5d8533d69387d675362621b47a45c5b2fc1f4681aa9793d6dd2e1421da7e04f1a8895163bc397a WHIRLPOOL f64749e0a108cbda6cb2dd12d9ae8b15500a3a04c1ccbb446c48fb57221f76faf5aa480e2682a2c86791e9c6b6d87dd5b3f8c0d79d241ff4cfa7df93210f75eb
-EBUILD gphoto2-2.5.14.ebuild 1395 SHA256 57c0931bc658869c369a096e52f016aebd23a067e4ff06e3584ff1a6a30e6235 SHA512 4e1e4f15318b933a1580585630a652c3c481c5ed774d71091951b73c22d52d8000f5bcb804cbf14bfee3166cca21c011569432d1d120599cfb78e4eab5bd389f WHIRLPOOL 8c5cff1ad27d493f0ea924ef718b153b6dda11cd7723764120ad14aa414ce0445285cbd1e0bff7600159915535466415e3dbc9a00d33e5cc9a703ad809b10033
+EBUILD gphoto2-2.5.14.ebuild 1394 SHA256 6ab0f48523a5c5dcdd8b170fe6579a463425a19b8054f5e690caeaa64016b99b SHA512 784091f949aaa895bcc0a4b04f8b9ccb7c7953adce5c512ed9019b72fc321e2951f426fb413cefeddcd572fcf853e9c19173b864aaaeb870341617b85d1970ab WHIRLPOOL c91431f176da9f4635084ca67c85c37fd947d0caddc135e9cba234e674b571e486f68e5ec05d0ed53b12a0942481379b06fe9b71f3a03a63254bbf23d2eeb250
MISC ChangeLog 6553 SHA256 f8ecc7ea4f29c4d7685825c7202177b3f921a5d1aaa3d3b651939d50ddc147ee SHA512 76d83584319485d19314f6432533aeb8adc43a99c8f34151a21ddad065f17286eebfba52a0d1c515dc60dc2b85fe434a1b0c5276529a150830152f63d7975d8d WHIRLPOOL 49228705dce8fa812215b238c99811f41dc91a771b4d3c410cdafa0027179b7b2a5a580c7d05c24895fd894f70735240d4c233aef8cb540797a4b27484cd20dc
MISC ChangeLog-2015 21574 SHA256 08159f5e47c8d762386fda5cfd18b4317a6598d1e4d7ae4489e8afea5ebe1436 SHA512 ff3248b17169cb0c25ab4da00cd589797609a2b73cb65f6930acd42efd91e3244571655209f7fd524984f5fe6bc01c9da699eb2e47e8496b7b57f36e79614692 WHIRLPOOL 5f8936414452b2308b2c108ac4f1d8ffb76bcc01020f96ae788117ba96324227e55176308de07880ec17771b7571de501050030e8ed5fa37f97be42ae494803c
MISC metadata.xml 449 SHA256 9e3d5c2509e7e36290a192a72f04825f111c9cceaf386756aa544c5094226e1a SHA512 f938819a203e0119b1d81aa1dc812717d6ef02c3012f8ed667db452c7712bb7b142cee36d519ec33f4cf65ebcba7a660e2f67f6b66087ec6be832a4987e10c53 WHIRLPOOL d61f1a2cafc04238d88764b8a3202744de7536cd6b29232a96547920bf852220961ff0436757ab4087fbae05d5efea22703a0282d5585043df1d1d1f232a0b84
diff --git a/media-gfx/gphoto2/gphoto2-2.5.14.ebuild b/media-gfx/gphoto2/gphoto2-2.5.14.ebuild
index 9866396a715e..543181c28e42 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.14.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.14.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="alpha ~amd64 hppa ppc ppc64 ~sparc x86"
IUSE="aalib exif ncurses nls readline"
# aalib -> needs libjpeg
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 8ef5963f9ef4..cf20a4c25140 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,7 +3,7 @@ AUX graphicsmagick-1.3.19-perl.patch 491 SHA256 98899a22071a112e332bbe2dfec119e0
DIST GraphicsMagick-1.3.25.tar.xz 5387880 SHA256 d64bfa52d2e0730eff9ce3ed51d4fc78dbb68e2adaa317b2bb3c56e6ee61ac9f SHA512 d62d6aee96d7b8444f1aa206b0c5cbbed9511612cb71d667af072ea52b68dcd11088699debc58faacbb014ad83fb8c2b3e474220f506069f7b5d22f0340f8ef8 WHIRLPOOL 8c2ffccf588495b78e0d84737e83ae396cbe86efa5dfddf6ec440626829d7b83f036771ec8be585dae58c3076eba8190ee809f0c09fc74c744efec96480a634b
DIST GraphicsMagick-1.3.26.tar.xz 5400564 SHA256 fba015f3d5e5d5f17e57db663f1aa9d338e7b62f1d415b85d13ee366927e5f88 SHA512 b33ca0f1c858428693aee27a9089acff9e63d1110f85fa036894cfefe6274e7b2422758ea39852f94fdb4823c9c3f3c44b0d8906627503301f5928096f739f22 WHIRLPOOL 8c8874c34be6c921dfc5623352a04d2cf502f2b28aebad1f8d63c1067d5ffa7af6a22e9b9b7095bd98674ffc5c456434598145721431d1d5f7c7e68ab362e238
EBUILD graphicsmagick-1.3.25.ebuild 3162 SHA256 9772c4d5ffdfbe07e98e4e9597f845925a1b5a29c8890e4c7e64f130bc9d5f8a SHA512 ec889b617290ea3163b25be55260dffc754867db2f730104de45b465e90ad31550fd451c813d52dc611e66f5a2639e5d4923e48e25a5ca49ccd8797183385c32 WHIRLPOOL 617d7a9a3c1ad531e39107a9c1dcf3497e6adee6cb72e4f515afb70e2e273ff9e7f8e320253bed59cb028f913aaa1fc6bec36e96380237cc2583f8a67f8c7bb0
-EBUILD graphicsmagick-1.3.26.ebuild 3278 SHA256 7e0c63e4ab0762183d8a7a5bd3a04734deac5dd81c4ca98f001fcd468c84cfe6 SHA512 1b848435b0c903ed29086213942809ae7befb62a352aced93f20024e97f832b9119a18022a29498fd8dd9f24c60dd23718310346d98c9fc9e331237cc744f345 WHIRLPOOL 4a8753d55d97fca1011d696ef744248facfe554b1e07b5ed91b4e99449b9a88d4d19e2c50ace40fc85f7a41fd39021179982189119f6151d2ade37b725b402c6
+EBUILD graphicsmagick-1.3.26.ebuild 3275 SHA256 c539191152533711c283ea1d192372bf980f4cc8f9fcb5dd1d7359231865c86e SHA512 a28b4b47c1d4c7860be37b8480ecca5055008157969f208878c951068ab901cded604370663154c95f742c011a98554ac67e1f97a8e0b3a052cc01c8cb6a6696 WHIRLPOOL 59d0923c3681b972536afb4c19ff72d06f48f5c0b95ecaacbb0185d771168b8b00f0bc8ad5c7d62c849472e2f25eb11cdeb850580256f41767a1110b32bc6633
EBUILD graphicsmagick-9999.ebuild 3283 SHA256 604914952995e6c0e53f6b86df71007a8e9c3b13a6351546b82060e3a5970817 SHA512 361ebf78cf28c28073a786931e0470e8bbf0da188edd5c9b68e51d1c3cf04916ead74e743b9fd8e5980bb9de37c4d639c5c32fc630665d55e6fc9c4717a15480 WHIRLPOOL dae4588534d0b627051adae32c8ac6d9b10593bb7e9c6a443e2f9979a5fc9ae9e59d2ae501e90989bcd23bd6361617b1c7f3219a4310e3a26dddf0a5e2338e26
MISC ChangeLog 8279 SHA256 942d53bb0df3374e5a890ba0fa3b6410a4570e4f32a6140422760aca294f2729 SHA512 4e57e7d633fa10818e13e5b66cbd914a8d359bd1982d828c11328cb52eb00994b0ae62e1917722085736c16e06677da0e67e76b92eb38cb130f13adaec362e05 WHIRLPOOL 21c6e65a2aa94a1588479e9b42943c774507f49127db5c056c3b9d6652562cec97d32e68817052c5a8e95fdfa4f36e710a22e3c55e08fcf88ab31e32005d3b3e
MISC ChangeLog-2015 14451 SHA256 22b7127860406f4d3c6e56317c76c6765e1fe46a790f238506c83101199c9a92 SHA512 50e9a3c6b90e6ec809048762d154a075f4e3c9468bdfd8d1cebdd4cda067f82a9e58380c7c74565058de80cc4a180558613d9c5c7459bb5b13335b6a84db0cc0 WHIRLPOOL 7820861ab3397fc23dd4a497cc4860beef98393d0e6ed95b82dc35bae54357f8ab4bf2ac6c270fa7bfb6fbcea959f955272cee989b0ae8cc4715226464d6a741
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
index 988d761ed6ae..1c81eee7da7f 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.26.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
else
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+ KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
fi
IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 5b760a0a195f..1a85c9687817 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,13 +1,17 @@
DIST ImageMagick-6.9.9-0.tar.xz 8780640 SHA256 0a8a091dc4f57ec486e03285a1c30dc3f062d58133f848b6274dfc6ae5dbb60b SHA512 ddd2042e5d9fd2ee9ba91f65c7be3f0cf1a8ce340be9cefaaca2517073d2319b43b7190c5302c92e845f8e250d87681e375aec7238ca93401b42dd248776e338 WHIRLPOOL 603965b07098c3963ab5c089ee4a3fa4b1d36eb8fa52d1e5c22d2dd9bdd6b5ffa165713274fb524991faffe447ce7df14df40c8848f1436e7b86c25d901eda45
DIST ImageMagick-6.9.9-18.tar.xz 8797460 SHA256 121dd50d051488e908306d7d1ba624781f5ec9532d30a2281b4a2bf6f26ee0b4 SHA512 b18733e01c3f41a221a691ceb992bb2e7ecabbdd1b4765c5dd46f00c2047db8534acee9659aed55786baa00062946353bd02ac60b0609caf21f87fb34a40d290 WHIRLPOOL 9077ece10f3ab8be3334816589640523bed69eef1a3cb789653cb9b260caef6721ef941010f806b00a65f8bd5a9bafa87578163b2b92888f488cdabc49218408
+DIST ImageMagick-6.9.9-20.tar.xz 8994128 SHA256 72131caaee1c673923709f7353b6731b43a2735b29110deac5121db403b07f0f SHA512 36c241490ee41de5cd72e5bc297ac2353a0d4574337776445798b0c5823f491304c3f3a728d420d03f66b652eafcdb68ec2992347321ac3919c1d72c0afdb849 WHIRLPOOL 757763b393b2ebc41d264c3e49f42bbfab1a5bf1e0bf0507d944346500fde299280ed9e8710b8f02740bf72934a58cd85afd8cba31963a452a6de9bdaca27f94
DIST ImageMagick-6.9.9-9.tar.xz 8797832 SHA256 59eed394d295d651e49ec0f3cfe3f0bb7aeccc28bd7a32360db9f8fc4bf9f25c SHA512 d024f753e1bf234e38736935f38a9bf82969ca77130059383f9d1871a39f68d7678a546d2786d57d602744e2008909df3f2ab08e1207b4c97c0952e7b03876d8 WHIRLPOOL f56279a778c81b6a1b61b7e47f24de25b4758c6d46fabf1f63c6847dac151297ec6bd76e390b3f21b0521963b254771ad9779ed3b4e62f0d77e94f225ec595ef
DIST ImageMagick-7.0.6-9.tar.xz 8550004 SHA256 aa8cb89dad36b555d8ca497f207008a56b315727c9b5d6d7b28f8f9e3ee7ac25 SHA512 5756d2605cbfbd876765372e954aeefdcdf60f1ee364ce40c3302f8958c510e6f0ecf47a3ee3c264eaaade1504bdae068118eb2cb96d418237f7f53da94a6c11 WHIRLPOOL 602c18d89b4f463d1bbd96d2a9e75c3dd2c2b11419ebe8611121f3a8d6c9ec82798cc5b1183d2f8c2cf7e174695faad4b35468540e3ee7a8c58de4a240035dfe
DIST ImageMagick-7.0.7-6.tar.xz 8556160 SHA256 52ae1acad9cfbba871b9d3cf033235067a49a20a510c1d6228a4fb3372d5b50e SHA512 9dff09a29b94f0de8ede82473820860f812edf3fc8edb0d1f8daa21c127d3e7831047f33ab22c407f2803a03561b690a52525672da837bbab1a1255156b4e6ff WHIRLPOOL ca21db0a46d055e7bc3a942e70f785599eafbd44e325dd6a33bf42dd19e655ebb0143a12d26b460d9708600e3925aab97f7ce403fbadb65eb14cb90cb3254313
+DIST ImageMagick-7.0.7-8.tar.xz 8797060 SHA256 547826f95a23ad3a1a6a514c0bff16ae875f6b7211809dff566e5994f65a0313 SHA512 0852df3bc996032a713ce6dc274cc36c3818c1c8304223de391e58bce8230aa12ac9778b4b28278c0ab4e42f2a7b4094052a5e4e6e4208329848948237fb41d2 WHIRLPOOL 13a6baf033b4caa0543fa36e4d91d82dc03b7875582e63a0803f152796041870b798ee8fdb0a923b6da08836fd7f1be5faffe36cf5e3241cb8154c3287ce294d
EBUILD imagemagick-6.9.9.0.ebuild 5158 SHA256 4822fa883719ae3c6bb7d9e0056326f7a4970483c617c1becb7db7fac2068f7d SHA512 ddec64d6ede1cf433bce3a4da1fb74c0346349b922cc1dd164acfb6cce99df1c207296a2334a7b59163a34250e91a80b8a7cb4a607fbca1bdb84bb3ee3c9f36c WHIRLPOOL 6e34e09dffaeaa9da599cc2b3536f16a455c6dd0fc872ff3ac7b8b07040ca77f487bdb7d09d54992356584bfc7203c7124952dbf7467f46f9fff2620bae82abb
EBUILD imagemagick-6.9.9.18.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
+EBUILD imagemagick-6.9.9.20.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
EBUILD imagemagick-6.9.9.9.ebuild 5128 SHA256 69585ea6cefba51c7f455a1ae8b70ad42b55ca1dee9cb4e592daf6817096e65d SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68 WHIRLPOOL 940edc57060600983539f50dfcb635e36e9a642fa5cabe4874f95acc8a1a37b2fe96b2b715b546feb9aa7d30d75f8e5adf5af0f731f3c3b455428e34747c23d3
EBUILD imagemagick-7.0.6.9.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
EBUILD imagemagick-7.0.7.6.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
+EBUILD imagemagick-7.0.7.8.ebuild 5134 SHA256 8af6a6b8deb0b4e8de1796d6d13fd6fafeb732b95fe421a46ea4da39dc662ceb SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0 WHIRLPOOL ccd9a043a143f3da3af17dcf5253ed1cb66fd34d9d343239d4a65bdbb63855a8c5727610ad352c8dce6289316a315e8ae3799947096028c2b5cc10553c4f56a2
MISC ChangeLog 20380 SHA256 10035fab48a5e4cf8e34a2012a5db0ec65d4031b7df442d1a53dc2b7230ef9ee SHA512 b4021c1454a9df5c9bb50090122f997cf0f00664c568cf0def90af7e096dd2bbf30fdf9f7773468ae50c0367563384e98c8dc5cfc279b5b00f02832570c4f6d9 WHIRLPOOL 9bcc31f87c6248716fd48ecc5d2e5d07e0269e887f9dd8ed10a9b24f73d2c0795395c0711abea8767b9b399acf407bad358b0592ddc13a82414e920b82eca638
MISC ChangeLog-2015 87760 SHA256 1834d883d60f41b0d6e6f851379779e4cc99fb52433b977af8c8e9b3782559d4 SHA512 3c1e2ece8d51a1e2aae9688411cff7d4cd5e31fc36e7958cb6ece5733a1feb2329e4c299d64cf894537c94c6dcbe79c097c493ca4438d38d707d0dbaae824a0a WHIRLPOOL 1e98ac43b05ce9b8eb9141476f6f1af383daea23ceb27cf8f12c89048980ebeaf30f147f665ea5eafa7df6363c73c073b8e1c09d5665736e0d67bb73f265308b
MISC metadata.xml 984 SHA256 14ff1c5241377a5857c52b45fb317ac531afa99b6a01b6f55ec21d6e59a09dcf SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7 WHIRLPOOL 4df1670e22b5393b0e64408091f5874839f8c89b2aeb926f13b1967bf3bd65fa18617845788e4a31906fa4ebc76fc68e2d5cd16de07f89ad3944e07f63bb5898
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
new file mode 100644
index 000000000000..d91b5ff35eef
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.20.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri 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="perl? ( userpriv )"
+
+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 )
+ 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-gfx/ufraw )
+ svg? ( gnome-base/librsvg )
+ 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-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ local mesa_cards ati_cards nvidia_cards render_cards
+ default
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ 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; }
+
+ [[ ${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 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 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() {
+ LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+ emake check
+}
+
+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:=.*:='':" {} +
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild
new file mode 100644
index 000000000000..fc7b7060e362
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.8.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic libtool multilib toolchain-funcs versionator
+
+MY_P=ImageMagick-$(replace_version_separator 3 '-')
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.imagemagick.org/"
+SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri 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="perl? ( userpriv )"
+
+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 )
+ 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-gfx/ufraw )
+ svg? ( gnome-base/librsvg )
+ 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-proto/xextproto )"
+
+REQUIRED_USE="corefonts? ( truetype )
+ test? ( corefonts )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ local ati_cards mesa_cards nvidia_cards render_cards
+ default
+
+ elibtoolize # for Darwin modules
+
+ # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+ 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; }
+
+ [[ ${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 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 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() {
+ LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \
+ emake check
+}
+
+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:=.*:='':" {} +
+
+ if use opencl; then
+ cat <<-EOF > "${T}"/99${PN}
+ SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128"
+ EOF
+
+ insinto /etc/sandbox.d
+ doins "${T}"/99${PN} #472766
+ fi
+
+ insinto /usr/share/${PN}
+ doins config/*icm
+}
diff --git a/media-gfx/imageworsener/Manifest b/media-gfx/imageworsener/Manifest
index e037cc10b962..0b75bc4ef82f 100644
--- a/media-gfx/imageworsener/Manifest
+++ b/media-gfx/imageworsener/Manifest
@@ -1,7 +1,7 @@
DIST imageworsener-1.3.1.tar.gz 661055 SHA256 beb0c988c02b1d461dccdb3d6c4fc229316a692ea38689874013ba349dff66d1 SHA512 a44589e720bc91662e286096f744347e3ec3669c33791f81c3f2aeb9d0514ed909dc73615db1d7631139df72aba9ccfbada61b7dcf82f6ffac622ab64a186b49 WHIRLPOOL a7d995a63f9e637ce4ab5da4967ef8e1b8a9108b4ace256e6ddf2b33c9a5445cd85caf74f83f51635789971676124c5b175c16df2cccf85f93e6544cd59ba096
DIST imageworsener-1.3.2.tar.gz 661710 SHA256 0946f8e82eaf4c51b7f3f2624eef89bfdf73b7c5b04d23aae8d3fbe01cca3ea2 SHA512 99b30ac838f437a85985eb830d0557f22c69bc40ef2dafe3493f145b70a89b72699e134f061719fa0dcc8b585ed2b418a6afc0c2f7ce67e2e9383d48a7b7b668 WHIRLPOOL 439e38478334fb66455a77fe674a58c9392f009420f9465e533f0101824e18d9c537910af6d5eaa1f0f32f8ee22b710ec2963f9003e6e39bc92e44115f6b7abe
EBUILD imageworsener-1.3.1.ebuild 1007 SHA256 5d7b952adb0fc2442a0b804c99edb4a74b83541e911f105ebcd20e01b6ef98ec SHA512 bfe07f2ebb359e3b53cf2f86a7bb766084633b6a5f14a0aba8d8997797f5a36da8e81a30ba62715d73461bdbdf56dea887951663d8891a1514b1dc8c31f398e7 WHIRLPOOL 32c7c389eb8ae64b07158a36b8839ffab1bf8fcae3df97840da48894a684a31716939b0db499439d2fcecf11b1f11017f3da2fae76375be2294d3cafab77c93f
-EBUILD imageworsener-1.3.2.ebuild 1009 SHA256 93f9ca4629e67ff17afa9fed917db52088de588997a5c009ae3c41b6e698d91a SHA512 2807e1a69dd14048d592a1aa7a3ed8aae752d1bdcfe41ccf79c37acf05c2f1b16ceb10e3cf96d7ed7690282839ecc10ad519ffe7efaa90c089b54127b2fcffb3 WHIRLPOOL d951478d68048140971610e723a7206d80dda451f8c9c951837f057f2f9e89ba4b5c687437a083f7320d56a60d098000378605176bcfc0291072cf932ef66a44
+EBUILD imageworsener-1.3.2.ebuild 1008 SHA256 a5f5c46ed34fa4ec084a1951f5ab2f7e946faa854f42dc2386c7d1d4eb373b60 SHA512 72c50b8541e541e664b0c8277b590a77225365e569db65d78db4eabd5fd1970d411c8e770a83ca9605597a6d22eea3469c52726cd93150ceddb0776cbc3fc784 WHIRLPOOL 432615515138d26b7f3398d81f1ac898d98b7c78e53e9326543349366bf61bb83f51dd02dca35e52c04abef89303e0f4da95616a3d6cd3ebfe149283fdeebf3e
MISC ChangeLog 2880 SHA256 4b8517955d6e569a2e82cb4c3b8dc899f72be4221acd2b1c195b1c0ac4b7f7ba SHA512 9efddf99bb2f5951768f06d750390b977b005345bf0480ea4fcb0910dd05dc127e70ef79fb982eb5d5a0a7a5b4803c694c213b1ed97c8a0f785fe5d24d585fa3 WHIRLPOOL 5eca88843ec7e23725a166d40494b1904ccfe8a53c01e4f5056e4fd00c5020b5d74a0a25cc4a7478c5aeec7878e6a701f4b625363bb12c3f024f30795706f83f
MISC ChangeLog-2015 4803 SHA256 de31e91ac68d5ce7c33e999f39d72dbd91db0dd49e232a11f819faa9645a217b SHA512 1fb53a2cd82449db3ed3c853f93a4fa73e079052dcdf0e650e049a4a433481ee39685ba01005522bd8df76960cffbb87825c94b6f98b0fbdbb9840a6a2fd15c7 WHIRLPOOL a2ef88194d3b0255b0dc8dbe46ddfcb6fbce30e6ddb0e30a5bdb51d41c4d2a5a14b53bdbddda9f6818ea320b00cb9b21b1fb7cfe3a58d5c41bb44e91eb9a0049
MISC metadata.xml 317 SHA256 5d10bd548020dee0cd77c547cb2cf7da3c2e0325320bf519e2c82b53711d6640 SHA512 128c5649fb194a4fef505f3445de2e4f114a966ddde1af3ac3ca5af23b260e0c038b743a7f95f7cc5e3268aeebbdfa9afeca7d152b5cb7a297d69c1ad4ef4e6a WHIRLPOOL babda29d7160676bdc4920a0f5a2f83c84f6978188cc04227c6b02df5f5f6de01956a55ce7e6fe1acbde094fe4a015d20453414ab550d80cae187bc1af9bc9f7
diff --git a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
index c03573408ae1..c13007166677 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
LICENSE="MIT-with-advertising"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="jpeg png static-libs test webp zlib"
DEPEND="png? ( media-libs/libpng:0 )
diff --git a/media-gfx/kcoloredit/Manifest b/media-gfx/kcoloredit/Manifest
index 7b484216d0d9..c8cf906816af 100644
--- a/media-gfx/kcoloredit/Manifest
+++ b/media-gfx/kcoloredit/Manifest
@@ -1,6 +1,6 @@
AUX kcoloredit-2.0.0-underlinking.patch 554 SHA256 bc92a15ca63dbfc2ef1289df4aa653c2c5532adb8bb3b6fe56d1036a94339d90 SHA512 6a3640bd91e659f6971a651ffc5872ce7e7d8949f0e68a52e8ae8e65888cc2f322882fe7dc5305d727919855c3a73ec059e28e9ad536f53b88064ba79510143d WHIRLPOOL be0b4a21fa9897a63ae2804fe81bab7ed1944c075f6238519b075e61bdb4b0a555a9e33f18ef660e93e0a29f6a89febe0d897266e871b81369ae446d4b412868
DIST kcoloredit-2.0.0-kde4.4.0.tar.bz2 156462 SHA256 37712000c5c6990deb3a43e55b463704dc736a06450df9dafa1a030afcf79e6e SHA512 93a418e475bb8f494a90c409c60573d3d7936921b7dac5b1dd669d0934123b234df013c0b1a594f211c33200b62d3b8edef80a826f6f75da110ec8a1af99a140 WHIRLPOOL b812867b5c02eae2ef4fbbd2eb29f1dd83ae08c135faf96998e56b56192b632d2dc8992f5ced922d93ba0ad36e8d21b4eeec6239433f96fb69453fbb1777d0a8
-EBUILD kcoloredit-2.0.0-r1.ebuild 772 SHA256 43b45d7caf80460b15b911ac2e8c7f1500e9f19b6cc77bc7bbe7a26d90cc3da9 SHA512 d46d7068072057bbfeeffcc696c694b56b6323c45f0cd3dd1709d189ff5ab28654a16f230f9cbfeea0ac8403df5d0cd3f7f216fa64cef2cae8459f816e65a18a WHIRLPOOL 29cace3c739b820821a701fddc4698d4da95832f1e38aafcf825c7773b6c6e37e2a27e96bf0ffc92e38d5fa021e0b8ad69aebf7982c66ef8b59b588d5d164d67
+EBUILD kcoloredit-2.0.0-r1.ebuild 751 SHA256 a47bf2dae1f5c5b4f7b0b2d5be5f1dbf298f97c86195440feb29acca4b6337e0 SHA512 8e18ad1808c200a9c74977449c88e0c4128f1d072150d8e395ee913408a8e191ae055367bb3c297c1fafde4c2765bc37afbe2f8d533d5a016b411ba3ad286fba WHIRLPOOL 66dbe465634eaa27ddd4fc230c05d4a8863399055e9f3c41ffc87065816d58ec782fe897fbd56e94c2802825f312d34c5db52c20120c63004a71cf22d0e9b5b7
MISC ChangeLog 2665 SHA256 1fc336ebb0826561d0240594d6438edbe4f0dd34a1e8b79c56632bfcdff0621c SHA512 b4e6242cf2300a574356a98475c93625ce98fba2059f7108d87dd0bc460eae8d6ed1c406cbd10e3303bf9563889dd7a7c4b3b9f828bcea9375e420790bd26acf WHIRLPOOL 39a6f7ca0a260e3f8347a88ac281a9734f7fc322e07507ae3b12e1e80ed50be615b4001713b1f22ec7878eb32518d67ef3439a8c7066346112f3d25b5f122524
MISC ChangeLog-2015 1319 SHA256 72a024cd8763a418666207dedfc03e6466ff2b6cca4b4241c585896b09670fee SHA512 d99a9af7d9a4e854bb601495adb3f7b1659f6cf67267fa3e3c598c8c9aef3d7927901f22a2121662043538bc4d3a9004dfba5c34fda65cdd7954ca1a938f3d72 WHIRLPOOL 63b5f9f0056a270bce6800e387645edbb12ee4a967eb22cd6d9852390b97d2abaf1daff0c9526498f63474f087dae26827fa71a0bd4cb3a1b9314b01caeff641
MISC metadata.xml 245 SHA256 ae3610b0005f668b7174e8c49c0170e7642e895c8e13e7e2fedcfefee6940e1a SHA512 90bcfe500baf163912aaffc9958c9724c4a97cfca294cae6c2eea938f4ca7668c84b132b6dce55767efa47a28b9e87bb75e79634b59079ab8ef3eff3ea95968e WHIRLPOOL 7abb1ad699d5aa3a0a0ebb0e8704df297ad9a662698cb59d1b48700aeb787e6208540e1e84f583a46bdd9975e27a75f04f7463585790b4e7865d0edfdb1e13ae
diff --git a/media-gfx/kcoloredit/kcoloredit-2.0.0-r1.ebuild b/media-gfx/kcoloredit/kcoloredit-2.0.0-r1.ebuild
index e18480d2ce24..6c7fd97bbb03 100644
--- a/media-gfx/kcoloredit/kcoloredit-2.0.0-r1.ebuild
+++ b/media-gfx/kcoloredit/kcoloredit-2.0.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
KDE_LINGUAS="af ar be bg br ca ca@valencia cs cy da de el en_GB eo es et eu fa
fi fr ga gl he hi hne hr hu is it ja km ku lt lv mai mk ms nb nds ne nl nn oc
@@ -10,12 +10,11 @@ KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
KDE_HANDBOOK="optional"
inherit kde4-base
-KDE_VERSION=4.4.0
-MY_P=${P}-kde${KDE_VERSION}
+MY_P=${P}-kde4.4.0
DESCRIPTION="Tool for editing color palettes"
-HOMEPAGE="https://www.kde.org/"
-SRC_URI="mirror://kde/stable/${KDE_VERSION}/src/extragear/${MY_P}.tar.bz2"
+HOMEPAGE="https://userbase.kde.org/KColorEdit"
+SRC_URI="mirror://kde/stable/4.4.0/src/extragear/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="4"
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 04befe227469..3a83e6ef59fc 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -6,7 +6,7 @@ DIST librecad-2.1.3.zip 26086377 SHA256 f05af030c71192109c1472c6fd24696fcb564b2e
EBUILD librecad-2.0.3.ebuild 787 SHA256 a087564ddc87dfbba192a6dc0ba64c82377b2f1297e99b6b96426c529c7150c5 SHA512 5d34f9e791018f75a990d378f41c077458411d96ed40729a1b34afe527849e7fc3d245a02941dc95ce1582e3ffb935aec50efc926b57b98d3e5f48e7378b7325 WHIRLPOOL b6126b602a1b4cc6ff70716f6c9f55a2abd47bd8ded819c0d972067ee3a8ed2fe5cf866f870f3e7cccb273c03d35887585ed16a4208dc667beebec87c0e34d01
EBUILD librecad-2.0.9-r1.ebuild 1374 SHA256 1600c97892b529ba6351b100a154900f48decb9760b2d0a69b497ac72b7e0b7c SHA512 c41f56a05b3f98f10947ec5c648796ad138fd9ae013e7b64045cc3a66ac74e075c962c02cbef5ee5e40f1597927a903fd5a177ebb3c84cd74efd7e4a8e97c2c5 WHIRLPOOL 1804543552d695fc241ecc801ace60ecbceae14949bda17d3acc8acc121fa3faffb085536921b5ef0e6eb2a10f8f3e53c2660b81dfcfdd79c46dcd9ebe92ad7e
EBUILD librecad-2.1.1.ebuild 1418 SHA256 9429b50129a99a5e3dfa3cb260b6a6ae18506d93ae394297b3c191932efa2f33 SHA512 2080a1913324c030b6f7f3a2e21c96b894ec72ca335dc04c5594061d0a06637e9b40e7fae20920832012a5317baca4987971fe4e7cc86dea6c9cd40e4e2d9ded WHIRLPOOL 9427494ed2a759213afe6cdd7f9292b05832e86a7d724c43e71d13d42c670b65e4945edbaeb585cdcd245a2eeb39802099d07963d07f88acf2e5d5b84e1f7a79
-EBUILD librecad-2.1.3.ebuild 1420 SHA256 fe4eca56dab477f0f3095af4ca3e4227b969341d04dce2dccf05e3aaadf55a80 SHA512 27921a4c2358950008d22d970a5e5bc2362986fe84fa238f2bd550b29c1710793ef18e09d1bcee4e7440362dfcd2a817604f1a4a1836607de5428d820a9dfa70 WHIRLPOOL aade99001dc41e9258d8d652a29f2f56e29449db44e2d0596db27e0f2bfd6ffac4ac1191780e095ce6851cfa4b565c50b1b2c01a92ce5bc8630c75b8c086f135
+EBUILD librecad-2.1.3.ebuild 1419 SHA256 289e541c7af243e2a43177e7389707e789aa4a29fe575e3bbbd81b78eef611cf SHA512 6688a703ae6c0fdfeeb86bc1e3a8eb5b3a029542801d9632072409547e6932420ffb8f847b0b493379bd27449e0a3338f7fc9fb8c5ec719a4032a36b9b69c2d2 WHIRLPOOL 84988028ebe4a6e31e845efe4f430cd1027980c8cc618e65fee39ef60d2f09650616f95a032038799c75889bc90406746be12adf81d7dfb9cafcab82b59ad22e
EBUILD librecad-9999.ebuild 1344 SHA256 9aad45475d3b78580db74de6c15b73b9d2e6266f687f4f19d1de769f3efa5a3b SHA512 722322ffaab726f066da0497261ba9d9f4eedab1f885e1d19b587bfbae5745cfde7399c24767f303a9c76a7d456d7564b3cc9d872b875be2a4cab8c499e6589d WHIRLPOOL 1d501cad46064352011e023664893101b5ec1b2209e154910f28d4fe539f46cfd6d2f28543185491901c7a62d1098426e8d1ab04d465001ac2b23d036b5cfbde
MISC ChangeLog 4238 SHA256 cc0a3f5a63cb6a1d89c51b51c59c5aa9f87e66c3962de8799b51e9ed4256a045 SHA512 b00eeeb651418d48bef394da12b7d03ce690a4b48dc9af347a9548f093c784be0e9876ad2868442861ba939f3e881f3fcd4ade4ce1a1c66f73950c85975c8ead WHIRLPOOL f1d972276c6dd18bc67720ad2097d90cecd1b26fc3bb4388c3904ed33343bca20a425a2bc634a38c265a9c7ef64af31aec5e5e7a23590a9658f1cbfe6dfeb4cc
MISC ChangeLog-2015 1255 SHA256 8defefb92b3ae4ff96ed33f893b761807d847860e604cf29f18eb181d83cb8fa SHA512 c33d1fe55743ad6bdca17ea9fc0bcead93f737f94271a05c7cd8b61ce2b099b12b9c1d8b9451f75a7139ad6735f09c8f34461f96855ef4078a3e14312617f2e6 WHIRLPOOL 2d0c89179f9d2ecafb0cd231bdc8f1a7dff078360cccb4497f7286d267aa1ac17bf3bf4ca82f344a1b44de03de9135ae5586ee1ec6340e8cd261fdd30d659132
diff --git a/media-gfx/librecad/librecad-2.1.3.ebuild b/media-gfx/librecad/librecad-2.1.3.ebuild
index 5a20c3bc2c43..b2e66a3c306d 100644
--- a/media-gfx/librecad/librecad-2.1.3.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
IUSE="3d debug doc tools qt4 +qt5"
REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index f82de386c787..71d62c67bcd2 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,8 +1,8 @@
AUX 50openscad-gentoo.el 167 SHA256 45ed16a3c90a663d3ad95cef44dfd5c653deb5a3e60d978c03d63c2875c6141b SHA512 ce669eba45ab90e9dbcd770a7470ca9ed7088b1acabbc876fe4d31dc7a6edd36076063e4bd417d348c3e073113e3ad2bc2dd0ac89e02d3d8aeca7627ad7d2a1e WHIRLPOOL 0840035c763c131962132c894ba0b32102e815eb0810ee98c8541fef5e09d673313f491399d3196eb3dd089079ab3fd2154c4703c7bb1cf0c4247e80fc16e0e5
+AUX openscad-2015.03_p2_uic_tr_fix.patch 345 SHA256 c1efe3fae4ce1e2ab23d2b5072f6c19adea8ae295c6ae14913f70a76ad1bca48 SHA512 9f4bd1deb85a52e1ab8fd35b384552f902b03d1f06b58144013e722d906604b96c17abf4e4074042487c945419c51432e639120ddecda143a6cb9a2b902548e2 WHIRLPOOL e187c01aa30577f41eac30b2744133eb7f346d9dde96c8b2bc0f8fad1c388c5e8b64fa74da2fe1cb9d2c4b123baae21b5a4cd7d0bd965a58cc99f672805a451a
DIST openscad-2015.03-2.src.tar.gz 13307974 SHA256 a2535bb9e27d96e10e1e19268a596155164c7129d410a0c7f96edc2d09400083 SHA512 66e93715987a5211ce15c10ea39a9fec3296b606ace0aba1cda019635d5b26021457c8e49f389daa90a0da02e41007eab662e1ed6608cb51c24de00253b9783f WHIRLPOOL 1454a22464f5dcf9726d5bb4fa5f7c080e419e44a3877a5ac43590e2b0552ecb169a9d2a9e15868c8020ffcfb894fc84f0269460f032f516ec9286f27155ca73
-EBUILD openscad-2015.03_p2-r1.ebuild 1066 SHA256 9465089bcc969fe54a16dd7009beec94c7b7b81d82c342f2b448e8479c7f655f SHA512 483d549608f9d1627922023c45ce185b653cbdaf812c63a8da01108c2148dbc7e716e74d7e0c1df061c6ccb9b4d99f1eb177ea09ce733f329b765ff1b288dbb4 WHIRLPOOL 7abd4385079ed046f54f01f06cee57e9ab012508d3f4ec9fed6941fd57cfcbdee31650e3af21985b6cc669499f4074bd5a784b080164ad52d4e97182baf15a6d
-EBUILD openscad-2015.03_p2-r2.ebuild 1328 SHA256 11602631d73cb370e2a5ae3072f62d7a542d437dc3904e316d25f2a3669b9070 SHA512 dd31cc128432763c3f02678363e5bba28798831aa589e0e613fccbd4cb3113947ca4b28a231dd9ab1c01730403829b4cc0dfd6f40b59c476a8b22f45129bc521 WHIRLPOOL 7efee2e250170c8a7ee157ecf497a0666063ea115047a309ecc020b6931b1e68d0109632083f65ec15c460dc58f0a163d783d5399965c57fbd23d2e7db4d60c0
-EBUILD openscad-9999.ebuild 1157 SHA256 defcb6541bec05738a084677760d6711963f5b0430e5caed96c541caa6a10176 SHA512 f581512ac8edb8086f77296886ce32e23352cc36a5e8102cd96e915d0b964a5b564e16dc367da94857b1928248607bda447970745b46c2c61d0507b8d043b8ae WHIRLPOOL d5cdcf56f667dde69c640e21919ee95250d445d1fdc535a73b4b476252a6b4662f24b62750b3f23bde2a7f9d793f5c5d92f15f2ff417c260be784faf56470e45
+EBUILD openscad-2015.03_p2-r3.ebuild 1533 SHA256 c52b438c5e50cdfdebba0be90b04e6831c814088cbb59c52cc5d987f4bd7835b SHA512 9f567f997e1f6b0f3dbe58e24678b0d3d271d4da224fe180189a3b73dce5dff5f837834d8f88981f1278d09d0e6a48f269460a6299651f244fe2836e66e8340d WHIRLPOOL 2d2d323199899700127ec43181edc0f1e297d3a0e5d428969daf866a5644e7819332a417970de365dfc6ca43a6385810162bddbe69a336883b5534f44e1b622d
+EBUILD openscad-9999.ebuild 1317 SHA256 ea3c6836b5c70f1104bfaf3e59baec2842012ed00ad4809c56c831ad38bd14c2 SHA512 e3e8711944d81ed93be206e2fcd15883b3716411854986232ff0a0acdd1d4bb75b7f9634df1578649584a2c9bced88c40fb3af840aec4a12838c3407ee01c209 WHIRLPOOL 3ac23511a49428bbe5ada40cc36c28f24f45288a9e6aa51d8ba69bdb760f42d15b67a776799518c5b34354552c9a032b0418f5107f7c985eeb03e5f0d7ae656e
MISC ChangeLog 3209 SHA256 9d2fba0d7e98e0171fc2dad0642b3f0ac0e2422d8d6beb490c466daecbe51c81 SHA512 450299105f20f6c7eeb51dabdc6b7ba99f72d533ee0b02a82f924fbd8b57869578d9ecf723caf11d9db3fd26ffb268bb71243d9937345a41cf1f6740b824c235 WHIRLPOOL bc009a72a50a52f93bb5e1ced3bffe36bae908a46887f74848f2406c7d57446a59e019e5c4ed7d3481f4781a7ed921acc87b77740e3b134b829fa1cf9f48c304
MISC ChangeLog-2015 1547 SHA256 b428dfdef4d7fba0346aaab3071a34b669793adcdc3ff47fdbcfb9c641718d9d SHA512 2cdd2755244984c643f4ac3681bfb9c6f2c3b17732863cf619f7514a200a6535c8b276e3aacda6a2d5464be954b8e07a13a90ba2b746904711ad18342ad1197f WHIRLPOOL e81a768275199a46ccf27af4f69b8d175b319d3167c893b710a7cf768d037accfb2bc0e217f76391281ef83881a0fe4eaca867ac9641c23d83dd143316d4d931
MISC metadata.xml 830 SHA256 486a5b64ebd3b6b0fbb0be8b3cfde01f73e8735020f7ad90fec6754abd63cf08 SHA512 8c12064c65b8ffca0ad8ec585d3de5ed4ac17bec6e4c7340aba2980d2ddb047d1f7b0c5405cdb4b72869749f6ebaddf29bd6fa03eec8e71c8fa2ea3910767617 WHIRLPOOL 1d8b8520425bf31857948e1d80c8f29c1d2bedd36f05638262fa7db8caf1b980ae396be5def4ed9dcfee12e0879a4442166125bd33a9c51bb54ba9a997500bf2
diff --git a/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
new file mode 100644
index 000000000000..ef0bcc421eb7
--- /dev/null
+++ b/media-gfx/openscad/files/openscad-2015.03_p2_uic_tr_fix.patch
@@ -0,0 +1,14 @@
+--- a/src/qtgettext.h 2017-03-22 00:17:29.808058905 -0400
++++ b/src/qtgettext.h 2017-03-22 00:18:55.251184835 -0400
+@@ -22,5 +22,10 @@
+ return QString::fromUtf8( _( msgid ) );
+ }
+
+-#endif
++inline QString _( const char *msgid, const char *disambiguation )
++{
++ Q_UNUSED( disambiguation );
++ return QString::fromUtf8( _( msgid ) );
++}
+
++#endif
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
deleted file mode 100644
index 1b882516d55d..000000000000
--- a/media-gfx/openscad/openscad-2015.03_p2-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-MY_PV="2015.03-2"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="http://www.openscad.org/"
-SRC_URI="http://files.openscad.org/${PN}-${MY_PV}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="media-gfx/opencsg
- sci-mathematics/cgal
- dev-qt/qtcore:4
- dev-qt/qtgui:4[-egl]
- dev-qt/qtopengl:4[-egl]
- dev-cpp/eigen:3
- dev-libs/glib:2
- dev-libs/gmp:0=
- dev-libs/mpfr:0=
- dev-libs/boost:=
- media-libs/fontconfig:1.0
- media-libs/freetype:2
- media-libs/glew:*
- media-libs/harfbuzz
- x11-libs/qscintilla:=[qt4(-)]"
-DEPEND="${CDEPEND}"
-RDEPEND="${CDEPEND}"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
- #Use our CFLAGS (specifically don't force x86)
- sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro || die
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
- eapply_user
-}
-
-src_configure() {
- eqmake4 "${PN}.pro"
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
- einstalldocs
-}
diff --git a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
index 67206bfa9e1f..095f06b83030 100644
--- a/media-gfx/openscad/openscad-2015.03_p2-r2.ebuild
+++ b/media-gfx/openscad/openscad-2015.03_p2-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit elisp-common eutils qmake-utils
+inherit elisp-common qmake-utils xdg-utils
MY_PV="2015.03-2"
SITEFILE="50${PN}-gentoo.el"
@@ -17,36 +17,40 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="emacs"
-DEPEND="media-gfx/opencsg
- sci-mathematics/cgal
- dev-qt/qtcore:4
- dev-qt/qtgui:4[-egl]
- dev-qt/qtopengl:4[-egl]
+DEPEND="
dev-cpp/eigen:3
+ dev-libs/boost:=
dev-libs/glib:2
dev-libs/gmp:0=
dev-libs/mpfr:0=
- dev-libs/boost:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ media-gfx/opencsg
media-libs/fontconfig:1.0
media-libs/freetype:2
media-libs/glew:*
media-libs/harfbuzz
- x11-libs/qscintilla:=[qt4(-)]
- emacs? ( virtual/emacs )"
+ sci-mathematics/cgal:=
+ >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+ emacs? ( virtual/emacs )
+"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}_uic_tr_fix.patch" )
+
S="${WORKDIR}/${PN}-${MY_PV}"
src_prepare() {
+ default
+
#Use our CFLAGS (specifically don't force x86)
sed -i "s/QMAKE_CXXFLAGS_RELEASE = .*//g" ${PN}.pro || die
sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
- eapply_user
}
src_configure() {
- eqmake4 "${PN}.pro"
+ eqmake5 "${PN}.pro"
}
src_compile() {
@@ -67,3 +71,13 @@ src_install() {
einstalldocs
}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild
index 95b2d2430823..60c555369540 100644
--- a/media-gfx/openscad/openscad-9999.ebuild
+++ b/media-gfx/openscad/openscad-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit elisp-common eutils git-r3 qmake-utils
+inherit elisp-common git-r3 qmake-utils xdg-utils
SITEFILE="50${PN}-gentoo.el"
@@ -16,32 +16,34 @@ SLOT="0"
KEYWORDS=""
IUSE="emacs"
-DEPEND="media-gfx/opencsg
- sci-mathematics/cgal
- dev-qt/qtcore:4
- dev-qt/qtgui:4[-egl]
- dev-qt/qtopengl:4[-egl]
+DEPEND="
dev-cpp/eigen:3
+ dev-libs/boost:=
dev-libs/glib:2
dev-libs/gmp:0=
dev-libs/mpfr:0=
- dev-libs/boost:=
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ media-gfx/opencsg
media-libs/fontconfig:1.0
media-libs/freetype:2
media-libs/glew:*
media-libs/harfbuzz
- x11-libs/qscintilla:=[qt4(-)]
- emacs? ( virtual/emacs )"
+ sci-mathematics/cgal:=
+ >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
+ emacs? ( virtual/emacs )
+"
RDEPEND="${DEPEND}"
src_prepare() {
- sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
default
+
+ sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
}
src_configure() {
- eqmake4 "${PN}.pro"
+ eqmake5 "${PN}.pro"
}
src_compile() {
@@ -62,3 +64,13 @@ src_install() {
einstalldocs
}
+
+pkg_postinst() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/media-gfx/potrace/Manifest b/media-gfx/potrace/Manifest
index d1c3b379f0ea..66b93a9e9806 100644
--- a/media-gfx/potrace/Manifest
+++ b/media-gfx/potrace/Manifest
@@ -3,7 +3,7 @@ DIST potrace-1.14.tar.gz 649685 SHA256 db72b65311cfdcb63880b317f610d84485f086e15
DIST potrace-1.15.tar.gz 650840 SHA256 a9b33904ace328340c850a01458199e0064e03ccaaa731bc869a842b1b8d529d SHA512 c9a8edd4f3339da587b9b32e12c83c8f7b993c7c23f551fa267545d9411679bc024924e23596ed1c83985693fc894b65dfa9f860275de395d9e0a88da37a4f02 WHIRLPOOL 6b5718dea33fb5597a56d8a8893198a342f6cf1c612ed4ea7b94417b9aabf31b3ecfec69a2dfcedb48430cfa09fdf987ab083a4b1298e73c4d163de93d48c8ee
EBUILD potrace-1.13.ebuild 830 SHA256 38039d47f32b3a609d55ec3172bf468149ef3c9a5da63c4cff09e09da8858768 SHA512 50d4a9ae0d69dd85cbc22aed2a862e649b2bc17883e1bd782e9d4976d97807dbb7e69b67c073c800bd14bd92eb024af2f42b58e58c57f1d156e1ec72403fc268 WHIRLPOOL 26df7fed083ea4b31bc12d43dec22b47fe96c5d3e69344db19a709f49bd37b4b9b5c9722d28b99d4dd5a820d9a95fba706abba6fe1cfcbd435b921898447c7b9
EBUILD potrace-1.14.ebuild 837 SHA256 72f311d037a3543576f28bdd7172a71988635440e8f76def597508dfb948e431 SHA512 93cecd52cab437f70eed160a7b8f12789aaf98e3c9d9adf4615b64924806dfa16a80747678d97d9343eefdeaae30e6c1d951f562f6911a0ea45f28a571132c08 WHIRLPOOL 9f8aebe38abef0c0586a3fdc4036669cbbfe08aca0301d5e3324c491febd821484f0401f5b145b2b7b942ca253e265819b11e89f17ee81163853650e679c68a6
-EBUILD potrace-1.15.ebuild 828 SHA256 6d9e54f67a8d726285084206abe0aa3f61a79b10005424d102d05d1c3426df24 SHA512 d5423004423922585dddb4719b19bedcb1e0eea48d80f0fdc03ab18db8786ebc9f8aa2544d29da135a65d7e82b3565cec89af28d7f64d4d6da74d14f0ee2947a WHIRLPOOL deee6b471493c61687eb40e9343b6fcbdb8cdec0cfa9b0c508335fd8d6dd43dd6e45106a83d3bf2a19e402d6185a26925e7095b0b19214df30ef49b9cff2ab06
+EBUILD potrace-1.15.ebuild 825 SHA256 6493d7b99381963b94f36e7da712225488c23f813c919fe1108b3eaeb807c5a8 SHA512 3d4f1486e07d00ed5f1624617a7c3632cf4d64fdeb38e5d10fd6cb554148128eef2e02091e4b1387f5f619b8b4e27061fe21bc5ec3e3e8f1590b29b2a9f3929c WHIRLPOOL f6a9b9a36bca2d55df3b368c75c63e1af70a3cfea3241d1482f96febe122e5c96d83c0a02f210a9e96aba0da56dbaf52cc9c1995996ea16122c918a464624c1a
MISC ChangeLog 5086 SHA256 64488097ac31f9a46d377e30ea525b4aee1be34dd0379f5f085e07cf50048497 SHA512 cbefb651a0d1ae719eac60f5c3f99ba687afae36fc78ca65bd639bd4cdc0b8ff79b70e7438024ac07b4927e3e34aa92381b3086e231119a798a9b55b21d99c01 WHIRLPOOL 4670fdeaed00a769216a5d2a62500b49389c72acbbcd4416539f4373e2ddd092dee1651a05212306f6482bf3cba181cc1d0205a0064c5aa484b8eae9bfb6ef37
MISC ChangeLog-2015 7442 SHA256 94d6987bdff3012328e7b4a6990d5af3401780651106d75e8261f08920216984 SHA512 d125d31f06c6466804296fd42d445a97908bb1074c04cd478ce5080dedddaa5a462b908be002351e84d88aaef3895c587cf389fd8d1501b46bf074e77f84be4a WHIRLPOOL 20bd35440fc87380d77e3ffc581f50ea215a85173b3f7f2603aaa776b68a660e37abfe4d5587550d6fc7fac091ffab5009b225b9ae98320a93cb6266af208785
MISC metadata.xml 534 SHA256 7c0c57bc2be2d8b0466ec1c0f2fb3b3636990b35914fab0d6921d16e510817b5 SHA512 00f7a8a90caa7e7d9920929733f084d41baf72c45dc998255c54964eb50f6ec70d6af8666463fdefca27f95156834f1c4e9676f115bbb86538e979967a73b6c3 WHIRLPOOL 0d2ab5e46df97eb4af4d7b94e9c54746e72dc73307eeea103385eaa55f1c1e6a2bf3b4cd092813913bfcb46068a2df4ea8d6b8759b0b768f88f63f92891fae16
diff --git a/media-gfx/potrace/potrace-1.15.ebuild b/media-gfx/potrace/potrace-1.15.ebuild
index a9207deeaad6..d10f4eb289c0 100644
--- a/media-gfx/potrace/potrace-1.15.ebuild
+++ b/media-gfx/potrace/potrace-1.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="metric static-libs"
RDEPEND="sys-libs/zlib"
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index 9494c27aec86..b52148f37855 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -2,7 +2,7 @@ DIST rawtherapee-5.1.tar.xz 10785516 SHA256 fb742065a6b2e1b89df67c70395e52ee1ebd
DIST rawtherapee-5.2.tar.xz 10819936 SHA256 5c32679bfb77eca36c26288483be75696086459b7a59bd4437e371ea1bf827b6 SHA512 ed2ff2e96ad4f0c50ebbc8a232d85b8c5b118bc956bc26aa72beb4741f464c46900aa668127fe7bdc963fabb5c2e2931c50cf784d1fc4fbc4dce3090412a1b5d WHIRLPOOL 02c71705b76df25e86b6ba5bf6439a3a2966e84dfa968b0a82c1dbe0c6297af826d2ffff6e973a56db21f5821d0a4eead6c05422bc6cb36269ed18b829bad1df
DIST rawtherapee-5.3.tar.xz 11042548 SHA256 97959c946b7cc346affce53efc4bf6eca4125873343f96d1fbe43a5c717f3ef8 SHA512 8a9a7fe98ba0c8e03e964c809afc90afcc03a31b8b88e0f9e2ab4ecdc1fbe4712231f692d0585d95d638cae7171393e01860296149fc9dfbd86ecb35c3709284 WHIRLPOOL 4ad4824ec499a3c10ca20fae5d95e36bc5503a5c878219d4fae12116b96d99c8f02a4017932e753284a93d6d01302cb64363fb953af600fb223b11758ae286ff
EBUILD rawtherapee-5.1.ebuild 1607 SHA256 c434abbd2b014b317900772263dfd4edd5415fe990e6daa6a6e25509378fca20 SHA512 77658a33529b11d2369505aae9de5d56cc49069121087fefeec75aada1e87f2b211649b449633d6f00f709ff08ec409628ebfe55c6ab244a8cc524585e05b7c8 WHIRLPOOL fc72ba619e420c4f8e934c97a026581cb8e5afd24210d16863911c2e90dfcd52f827985edbd967e8c8cb510c563303b080365484ed348ca37eda90b034414612
-EBUILD rawtherapee-5.2.ebuild 1647 SHA256 e3200a30d06546236d73fc61b8af9b635e658b9f354c9bd9a044d44b421bc215 SHA512 b11dacb8626aa54171b5edc252b8cd8411f7e9a4e2e9691cf4ac7cf2eafd704777e772e24acba8d2193cabb5f7db1be6aa4490ec5799c28f149108575077a7b7 WHIRLPOOL 872d63ae77b567cac0399027016ad46784bea3ce9a9ddd64a6c8004d447cb0aaef61061478bcb584a4552fb4e7f42d23f59b2d6bf12e6bcc07a57f84847aefa9
+EBUILD rawtherapee-5.2.ebuild 1646 SHA256 c8bb59565b01ee05db90fbbd4fb099a603b428dcbce985a4f877c244f10402a9 SHA512 32fe6f2cda16427c083dd42a1f0a8e4977bca4bd37e1b19cc9f513cbff062b4a0273c9c6ab153c4fea044535125aef9c5a837318fc206a656d9861bc42ac06bd WHIRLPOOL 7c67e257db7dff66d65c48bdffe4069166adb4382e6b0d1c6823d7642286824330cf13e6acba948f1aa5e5a51047c92a7d1875c6328e721041bf14cb33bfd4c4
EBUILD rawtherapee-5.3.ebuild 1667 SHA256 3c368a540611ca4134479ca6513ffc3eae47f0c79d20f958522476cd731e25ba SHA512 d1f0044b321b3063504d17ac9944d9173237f80401c543c99fc8f40d5b182e3f6f0d1f6070687069ebd2a1cba3f89d1fec649f3e927bdaf6f8e55c5e37a9ac4a WHIRLPOOL 5114886ecbed5867eabaa781ea27cbe829047ba76c7618b4ac1c623bb9f27dd56f135ed750d34b1560a8f121d2235ca6bb30200eb401c905d8c97833a9c319c0
MISC ChangeLog 4079 SHA256 b09230451fbe05e2b78eb65414e13f2d891cbbe252a05f90f89c2f3dd8a0170f SHA512 4e60d418b89c6d702a30bdccbf483bd2742c851a8b89af6a72d6e35969f6f99df5fccf41c2b3e27ddc7eb600d5145e584f342a726f838acdfc814ea1141b22aa WHIRLPOOL 0233cc875277cb17e70ac29ca511d3605e69c9ed98315be59779c7e870ff2e5e31516010d633eb2f50af0a2ce12b1d0d06cabb0d0e05a3bba2ed2b689ac90196
MISC ChangeLog-2015 2958 SHA256 43fcd2365c6cff209cfafc99ccc550d5bca515913871cdd68c9c8f675e7d55a4 SHA512 f46eb64555da7fd7688d2ff156d9bd978933573143ca0bc5c777d876fc29fe6a97d396f5d8574e8d135ac2ecb75558f787de9fa9747dba61d025ab6d1b2cb5c0 WHIRLPOOL 88ef16a5e46a351920c0b0e25ccdb1d993d072ebda44e09174e991c525759a1cbd30163148abbcb3164966571fffc4a693810619e19375983975f9a3256a7918
diff --git a/media-gfx/rawtherapee/rawtherapee-5.2.ebuild b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
index 38848a678a86..02b87f290394 100644
--- a/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
+++ b/media-gfx/rawtherapee/rawtherapee-5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://rawtherapee.com/shared/source/${MY_P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="openmp"
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index dcedbbbc7819..7b803236eb27 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -9,7 +9,7 @@ AUX saned_at.service 434 SHA256 4892a381f3bc05679c4b20307046cf37c22bc2a17b141cb7
DIST sane-backends-1.0.25.tar.gz 5955016 SHA256 a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c SHA512 b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df WHIRLPOOL 557a3ac8785c0dd7f98aa55d5edaf76fb5b2b3c86a2431bb40b5b132ac05de3abcb250a8bcf8ed188868c4f124ce0a323a92a5a83c7b44a20908fe40ca323711
DIST sane-backends-1.0.27.tar.gz 6430188 SHA256 293747bf37275c424ebb2c833f8588601a60b2f9653945d5a3194875355e36c9 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5 WHIRLPOOL 62ac1f4d4601bb2189212f021c23a48067ebdb5d900c2259ae4acdb6f94292c20689d9889bb11861b78be5ea7c3f76e815154e032f4bda76efcf901a97895cdd
EBUILD sane-backends-1.0.25-r1.ebuild 7883 SHA256 31a194a93efa46cbcfd597e3f4ec28298230b5bdfc69c6942698a4ab63ba3b78 SHA512 2f201d80d12b5138f979b23932101eee82b9379b3110265b02dc8cb2664b9ce803ea774f4278aa52f65a3cb8c3261dcae50183ddf1e2c64be5a79e5209d154f3 WHIRLPOOL ead801902f9f94b9717be3aa45e50727fa8a0823257fadae3fa8e54c586cb7d47689e26a380cba0f800cf7ff558e1c2f3972df7ab6965fe1d0cff9829e18231c
-EBUILD sane-backends-1.0.27.ebuild 7922 SHA256 01d5e5d3c6cb7a971885d76a7f8ac77446dbb9904fd15e01c6b32c257667a7f3 SHA512 8aa67a03e2e552a62bb5b3a7062079bad280c64e2cbebedb2f1dc5f9d3d54f2209246dbfb4842479717454423bd4c61f28fa5551567691e9c6852eab44e7e7e8 WHIRLPOOL f3f2ef3c80363f9471f7bce7b9164117c785fb2f4a7ca6188d9a0c3b847495ae189eaefdb6feafe6b9e4f28198c3899014e254579f30a1675fdf233d5783d3eb
+EBUILD sane-backends-1.0.27.ebuild 7916 SHA256 efa7ba10a5ea4020248edb721abfbc80afaea2cab9f8f44f3abb3cbd3a115ef1 SHA512 184dc4eeaab197fc255b664d4ca0b67c9ea45d5989857f8e2829058790d236e5b9017c1039329d3d07be00a093bb5f65959b927d18c2cd4a354fa5433e025d28 WHIRLPOOL 9f19f66d4346f6379042a90359af3a202b9c79e013f85410816cd55b113ac9b66deb1c802504391f9b016b8a4f70824276bc647d2bb68d7f9a1e67d08336a084
MISC ChangeLog 5821 SHA256 fa6f96e052c8dfd3e34b0a775e9a2604c9f4b45bb3b2200c40f151e65a467773 SHA512 c8085e7371914acdca025efe83cf25226c32dc58213362b5292cfb54a36a7a8a3e91b196dbffacb5f7d3e886ac006da977a44cd697174dc747abdc8a4b6893ea WHIRLPOOL ebbe0fe42598e339f80cff820d7480be897f0311a5724d8aa7851c1f2b3e24191f35b10faf94d072b57016cb0d558353527202db56629fba288a0deb364ce38d
MISC ChangeLog-2015 47640 SHA256 c6257e3d197ffa048e4c1e7f01ba4a2516965237fb15dcee476cc914573d3114 SHA512 fbc5f5ca0c8e3c0ad1f2ec241c13dbd5a17d42bd8fd38541f1fccd2effa6e858a996fb4758dbe9a8afefb7586df42094d78de936f22986d5138fbf20241a9e37 WHIRLPOOL ad673ba6b449c6cf6f93cf536fb8fdc8230a24d61048430f9c65bfb1a0b61ecc09543f846b0a838734034a383fd3f190af580175a507802c3fac067f6c88ec20
MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild b/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
index b74b5565a8e7..44e4255d32b9 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.27.ebuild
@@ -137,7 +137,7 @@ esac
LICENSE="GPL-2 public-domain"
SLOT="0"
if [[ ${PV} != "9999" ]] ; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
fi
RDEPEND="
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index ed59dc1a4a0b..b401b43c1e3a 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -5,6 +5,7 @@ DIST shotwell-0.26.1.tar.xz 5593092 SHA256 0a60cc8a132fd962ed8c73f82b3f8ad7cbf10
DIST shotwell-0.26.2.tar.xz 5575388 SHA256 4f65283d54772ef6344b8e8acb242f06b7f5b3f8e42ccb292b02c06a8dc2323b SHA512 a38681cb1b192372381d67abdc6c088c80fcc1db0d8d328330ee8f1ab78608c742de5e33030ccb1b941f1583a2b7028caadf61ce10ba7f2a93863bd2c3019813 WHIRLPOOL 1b8ba18aa63b033c00d55f1cdc2e95d8232f32c8d1e438cbba90b7e2e8cfb3fe454934686363d81cdda56beb19e1494f8ed69c7edc29398b54ff23216516225d
DIST shotwell-0.26.3.tar.xz 5581204 SHA256 fb83e4b0b3d2fde62f3870e01294269fa099a94cfbcfcc614ab6b09387690ee5 SHA512 8d54ffec947b81517840f4f9d223edb6673e6ef66c6cc4333c2353b7c197c0630c10fbf7ae5d3ff5963322f19e5b7adfd6aac5e391262c6edb3b22a01de9a18f WHIRLPOOL d5f6a4ecba5417ce66bf30479e5db7810c7887f044769de7d28c2effcd5da8e093dd4d485c9e433c73451b829385e99b7bf9e48616935aea60263aef635eb332
DIST shotwell-0.27.0.tar.xz 5574988 SHA256 42851935652986f000d96b4c6ac4180c96942fd63e437dee3179b249c2b87c0f SHA512 e7b5fe153fff96e04507588b4b8a1e71c121787cb6d28b7e14bb31824f1a09ca1948edc4bccfa069b2ffebe1ac753580257c1af4b7aec0ed49af74944ee91fbb WHIRLPOOL bf188b53f841c65acc0d3589fce5ca39b1e6c0f7b867f88b7018104f211c5677f6f0906b037ab54aafdfc3bec87d29076f97ce3d286f50c852690862b8e919ea
+DIST shotwell-0.27.1.tar.xz 5619824 SHA256 095d9f9784cb34889110cdde8110e67a592c6141318b7edae666070d363e5bc9 SHA512 b26c25b45af305903cf0698e65d5230820dda447b70175c92a66e25148e47d620847b3fa2b3bdb8d70656186d5b30d98edf3eee4138f07db9f8260e81a95a7d6 WHIRLPOOL 4bd4ad2f5628cd1b2b46bf6bb87924452f1d4650fdce6c0d2be7b7fc9f9f958252dc88d131d7ee6066657676ae5895f99803b008d6c89d7b2b7937d3376cf2e9
EBUILD shotwell-0.24.6.ebuild 1444 SHA256 cc93d5222c7737d1e6d30a2743ae427ada01d47ef56d71592b2116619db15d6c SHA512 559e06d8bed36ab72880dfb409d4151d9ddc040201f4bd144b67202cd103db09c1b3a428b94c5875ac50159da0e22beb7e3242e515cb8dea259dfae75f383dd9 WHIRLPOOL 87b587000f690d01e496ba6f4002407479b22c3585944ba9c6a87e8521713e5194ea37aca26e93415339e57d334916ec50a47b02e14a66b851eeeea918e1892c
EBUILD shotwell-0.25.0.1.ebuild 1471 SHA256 57474445740c569581f9d436af8cf18ac9ff801b53817b8043db746ef57005e8 SHA512 ff395918298ad2b4e7725149177ebcf19b30f517e3e78ec4e62aa421e4cc61ccdc41be2c4234301f10df1ec5d8e8a188f17f69048dc0decd3b77e0a2bb52d67e WHIRLPOOL 5d19ce22ee8d4a59f0d1560f3d364fa4171567b5a5085e4568d2d0fd1b72d62316b046d9e251c5e81e2385076661ed9a7e329a1883ba12b32b84125362fa7233
EBUILD shotwell-0.26.0.ebuild 1471 SHA256 f32d9a02c4ff2ffd66640295dd863b81c5b0419efe0a148225539b274cf27e12 SHA512 7738e3cf9e6e545005071c01500ce091b1908b651162187bb91ee88bd954371ce9ed0962f76d4a688783f6a27374835d6c517a7c9b2c477cbca0f4b1ecbfa521 WHIRLPOOL b5fec5a1179affb17f740722c65c44bc641e519cbefb6b7daf67bf3f4934240a632dfa0724b2978c1dd3861409beea5aecb6491c41312d06668660b02347cc6d
@@ -12,6 +13,7 @@ EBUILD shotwell-0.26.1.ebuild 1471 SHA256 f32d9a02c4ff2ffd66640295dd863b81c5b041
EBUILD shotwell-0.26.2.ebuild 1490 SHA256 2e92e974cadac82566552e6e78f87f3ad9d3281ef59c4c66121480aa16e2dbaf SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 WHIRLPOOL 6ca3cab60f3e496e607a526b8ec94d58ec38fee1bbd9c027818c4fbee984c84f2ff7b34fa70502498e5ceb7810601f28e7a204973edee6037edc50e2488ad47d
EBUILD shotwell-0.26.3.ebuild 1490 SHA256 2e92e974cadac82566552e6e78f87f3ad9d3281ef59c4c66121480aa16e2dbaf SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 WHIRLPOOL 6ca3cab60f3e496e607a526b8ec94d58ec38fee1bbd9c027818c4fbee984c84f2ff7b34fa70502498e5ceb7810601f28e7a204973edee6037edc50e2488ad47d
EBUILD shotwell-0.27.0.ebuild 1490 SHA256 2e92e974cadac82566552e6e78f87f3ad9d3281ef59c4c66121480aa16e2dbaf SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 WHIRLPOOL 6ca3cab60f3e496e607a526b8ec94d58ec38fee1bbd9c027818c4fbee984c84f2ff7b34fa70502498e5ceb7810601f28e7a204973edee6037edc50e2488ad47d
+EBUILD shotwell-0.27.1.ebuild 1490 SHA256 2e92e974cadac82566552e6e78f87f3ad9d3281ef59c4c66121480aa16e2dbaf SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 WHIRLPOOL 6ca3cab60f3e496e607a526b8ec94d58ec38fee1bbd9c027818c4fbee984c84f2ff7b34fa70502498e5ceb7810601f28e7a204973edee6037edc50e2488ad47d
MISC ChangeLog 7190 SHA256 773b9627fea502e816fd8f0d6fa87aecea876df1ede05553674b965d5b6d31b0 SHA512 5f8f1609f2004dd16e2fb363e86e7645aac7f3a41df4aa5a4959c994dbcbf62cf04b3d81529c57c8f5ba566d64fbd2b924daf01e5041f98424f75cda231f08bd WHIRLPOOL 0015e57b0dfe756c550c518238594d65660320dcd50c1080f73b7268276488aaa2fa22315841073aaff2186f4e168c4cb405cd40868d0de09a5de76036091c9e
MISC ChangeLog-2015 13149 SHA256 0b668b615c618f17e7eb199ce770c1fcbcb48b6aab0a083be255d95574ed978f SHA512 fef2294c2b0339c44f9e5e54c7e9ca0003f11922d7693a9b1f783cf563419e09b93bfdcab2ea6d9da4cdfcbd83c0ad6c9100798657608b2f5586da9e576e4d83 WHIRLPOOL 7af1af49b2749c05649539f210beb19984b509c6306c47b6ce5115e15df7b6a1da94a0aed9dc6b1a99eb2b970791e1af9b3a2157d76939906ce6b3d80aa27bd6
MISC metadata.xml 900 SHA256 7d9af9a94d03e3160b11dbe853ecb557d69d821997e726e9993162b27b6ac094 SHA512 aab4bb7556cb7fc926b59e68d16a2425af57cab5ae80c68ce2dd650bf49b9e3872771fee51552aa0aba9c50167a33b1976700f65bbc1531de44ac638cdd4a0be WHIRLPOOL 59272edc66c987a57f49452d2799174c9c2234e8c0bf613dc2abd2fb01b6ea23b343da308148316ad829a916a4d579df7f8592f63f64dfec281bba574c5c235b
diff --git a/media-gfx/shotwell/shotwell-0.27.1.ebuild b/media-gfx/shotwell/shotwell-0.27.1.ebuild
new file mode 100644
index 000000000000..0cafa2080fcf
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.27.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.28"
+
+inherit gnome2 multilib toolchain-funcs vala versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+ >=app-crypt/gcr-3[gtk]
+ >=dev-db/sqlite-3.5.9:3
+ >=dev-libs/glib-2.40.0:2
+ >=dev-libs/json-glib-0.7.6
+ >=dev-libs/libgee-0.8.5:0.8
+ >=dev-libs/libxml2-2.6.32:2
+ gnome-base/dconf
+ >=media-libs/gexiv2-0.10.4
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ media-libs/gstreamer:1.0
+ media-libs/lcms:2
+ >=media-libs/libexif-0.6.16:=
+ >=media-libs/libgphoto2-2.5:=
+ >=media-libs/libraw-0.13.2:=
+ media-plugins/gst-plugins-gdkpixbuf:1.0
+ >=net-libs/libsoup-2.42.0:2.4
+ net-libs/webkit-gtk:4
+ virtual/libgudev:=[introspection]
+ >=x11-libs/gtk+-3.14.0:3[X]
+ dev-libs/libgdata
+
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ dev-util/itstool
+ >=sys-devel/gettext-0.19.7
+ >=sys-devel/m4-1.4.13
+ virtual/pkgconfig
+"
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+src_prepare() {
+ vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --disable-static
+}
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 7b1b6fde00de..f39e42895578 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -4,7 +4,7 @@ AUX slic3r-1.2.9-c++11.patch 1102 SHA256 4b32b987d1e46cbda9f791dc46c76fa73b65178
AUX slic3r-9999-no-locallib.patch 15462 SHA256 c2114dd607da51416facadceaae1ba459ac3b63c2ccb01195a447c93da31218f SHA512 cdf791f721ab3a2356631ee9c74c796c48626c8313dd31dab59e880ab181734e892fa341bbb1a648d35303f4fb4a8e3c4615d360c317438876f67de1ef9f9187 WHIRLPOOL 4d571798c249d4e36cd06a72ed1a9d5267c02358fe2c5cc5237cfbf706ef98e7666c4516e957e3f1a109f459f1ec4f059aeb43c0eecd8bca409a77e476a9dc45
DIST slic3r-1.1.7.tar.gz 2079200 SHA256 8e1f68a71d78686cf6957ee7665757a4e7d14646bdee262cef76cba47b3f0d50 SHA512 0c3a12890f57f422084b20152ede3467a8624db4ba8be774258df0af963c1f6f41fda7d96967f6355bd95727539e6aad51c30cf45284a7ee3fff294839acc650 WHIRLPOOL 18c95a59acff51891251852d59d4bf33b9c1ad8721f581e3c9f55b56bb62e087d030ecb701d16b07cca4567f142ea3b0693c0ab436f1c25b28d02b4a1ce351cd
DIST slic3r-1.2.9.tar.gz 2165322 SHA256 f1c231ae56039ccd4ecf624e288c1362cab49b0f751a4663857b916b7fa51f2f SHA512 c0284f40de43c54e775baccdb2a67813a6ca4b69db78a788f2023b3f34127e780e6d0160144b9df1e17a2992b3255ef9a372b61a594f503b21efad7334387a51 WHIRLPOOL fc3bee0188ab7bd54ac19f3d874acb20dd8614594b79a8539001fd9a682f10c3436ef477d60458c49c7028c8b4bb7bf8585b4b53e73ac3a411d1a18720820eb0
-EBUILD slic3r-1.1.7.ebuild 2911 SHA256 2c743cd075b7593ac26b6e955dfd0a9f15cad1ab9105c0facfd131462d866436 SHA512 2fee10cde9c132cd7b6d142ea6b5550a294a2d366ca5eb88599567d0d13d1d5a837d63018836e7cd677a3e558180e4297bf6e4fceae51f2f9b48c9809cc44014 WHIRLPOOL a339035714f59b52f320945b1f174fb693a6deca39f835bfcde4d8aafe0f25844775b052dcdb629364151ca05dd12f159777d0bdda3cb5338ba19d4d22ed080a
+EBUILD slic3r-1.1.7.ebuild 2910 SHA256 845f7d8b9ba7b90854eef3f9b223b13b2383e10dcbab09eed309600d9fc66b5b SHA512 2467d4dbbc63d49b891dd24b68b6682c0d0ef2c0dd2f7576eb7a7d161f9c07da5b78b3bf0064ff7cb3ddfaa2dd6634699c85310c8a64fdc90974d8df5e669fa9 WHIRLPOOL 5cb3ded56c96e813e08778d232c556a5c5bf13ff1b387cad45a2c0039e94c1e804e1761eed937a41b204fa5fa3cd1b686042c7a8ebec952b80cf4a89e4d0e190
EBUILD slic3r-1.2.9-r2.ebuild 2472 SHA256 ac4365ff678d841529fcb852175ade6e046866360fa71c028ed07d77ce0781a3 SHA512 9937794276d490f75476fa39208f7726d0ad83534acb84ab5818cd1849c580cf3ce2c9f01b9eeaaee9ed9d4f49cc24bb9c4b95c4b45bbd70fd304678e0246795 WHIRLPOOL 7def4a7a52cfc9ecac2cf8266c4b216d763a7d33a59e0e50ac379811eb8b92bef9d7721e04a616aa05c420bd5c792ca03e456e5f7db2c1eb97fc74719634cc02
EBUILD slic3r-9999.ebuild 2621 SHA256 c343bc2bdac0ec1e67253fb21aa9487fbcd6a80eec433b5990ac92e8d28e06a4 SHA512 bfff6a690433fdd85398d841c738578e44569eb58df43b602502c062419a77b3786288944414b3114538cbc278ccb029fa074ce44e4f2fc919209052888dacdc WHIRLPOOL 32d0d5369d4b4996258f2f448a520d4d97e5d11110fcb07b91367a93377e5a8ab5fa0442407841cd7421cc15c0d9467a844f561d353542e5f1e9c51e2f4b6663
MISC ChangeLog 2206 SHA256 ef4b15eee040ebed9c2b0bea2d05a3512704677666eec33ba9d92221b8fbcb57 SHA512 acc6da2b31a88912904a884e29a364d77c9be66f3c904effc49575d554daa4882582acbbae779fc72793f66dd86a2bf526c8e02c761cc2ca946b86faa581ce7d WHIRLPOOL 25f2f8ce2376f1619443dfcd058fffd061490ce8c9d620987b6331c6c03de6f691dfaec474c6516989e953a6886d27c8ff3419e1da4810fde19b68e6edb8971b
diff --git a/media-gfx/slic3r/slic3r-1.1.7.ebuild b/media-gfx/slic3r/slic3r-1.1.7.ebuild
index cc961a803fea..a4f86fd3ff82 100644
--- a/media-gfx/slic3r/slic3r-1.1.7.ebuild
+++ b/media-gfx/slic3r/slic3r-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="AGPL-3 CC-BY-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="+gui test"
# check Build.PL for dependencies
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index ae2918d75a83..286703f5b9b1 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1,6 +1,8 @@
DIST sxiv-1.3.2.tar.gz 46560 SHA256 9f5368de8f0f57e78ebe02cb531a31107a993f2769cec51bcc8d70f5c668b653 SHA512 3bcf67a778a3e40cb6ae6b6fcc685cd57e303265df34c8a56d6ebb8ad0237e7136e738c44fee5c5504c73e4722d017f1e746691fac482568b2a960931f1ecdd5 WHIRLPOOL 8b02d693cbe8be31f81de8a0d69f218fbf2919f937fadc93657db4837bcb41e05c7b41ecbb24bfc559a1edda2d8b9f0ad14cb2118264ae52d14ac883e82dc56a
+DIST sxiv-24.tar.gz 47148 SHA256 511dc45d12962af9c31c3068ce6bca4b832a6263946b27befea49a48cf019110 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b WHIRLPOOL c953f72732ec98a3cb140925f9974163682632787674c5145e400fc831fe558747a3ebc3a4dee3d199b5f0130620b93f7154dad9ed7d12b410b41562174fff88
EBUILD sxiv-1.3.2-r2.ebuild 1459 SHA256 83330a2ca3fcaa9414af8ca1891275fdb1502b74de7cccb9fc69d2084cb02163 SHA512 51a5493a1e8c5d31b31348f4c7ee30490f4b518e31713c48cae031cd3ecf4f280381ffd548c753450a6f27b092e87314ecf41c5f5f5998a032fdf1a7bcf8f612 WHIRLPOOL 36e55570496ac62bc79c10c45046aef535d1527ada69294084452949883f198e49b4a94314678b2fa9212b05f14e4f7653572cae5793074985ad89c57f94aa2e
-EBUILD sxiv-9999.ebuild 1258 SHA256 d6734ae3b51148e01829cf6fdc7898900c95ac220f1e144620216153ec860d2c SHA512 b7cbf84906936199ffbef5b4c8521422eeba10e56184628292139c9a7e52a068eb7b6e662bf768dd657931f4b853c76a33b1ef0f0a88f81aacbb2bd6db7db641 WHIRLPOOL 4320b4b89406a4b2d26a66392e3dc153077a73a800016d3995c018a477681458b12f9d4a625a9a66fe45ce5d17abaf46b839ec7969438bd22fef44459e4fd837
+EBUILD sxiv-24.ebuild 1221 SHA256 7b361fa43e84ddb7c23fe4242eadd54924819c69347fad9130a35198208c2480 SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20 WHIRLPOOL cba17d81f8acb26a6e06b6288c05bdeda6687b73a603b3e0bf38b2df442941e8f3bda2646f57230e39214970aceda86efa76d1efbd2edf76d1501cd0499db7a6
+EBUILD sxiv-9999.ebuild 1221 SHA256 7b361fa43e84ddb7c23fe4242eadd54924819c69347fad9130a35198208c2480 SHA512 50b2442c860d83a39f666913ed497958a01142ec6e685affe8d39dda0246d7e3960a2cc52672e3a9eb8e92974442c4353f07c05d0cef5eebc3dd143873ccbf20 WHIRLPOOL cba17d81f8acb26a6e06b6288c05bdeda6687b73a603b3e0bf38b2df442941e8f3bda2646f57230e39214970aceda86efa76d1efbd2edf76d1501cd0499db7a6
MISC ChangeLog 3248 SHA256 2474ca34b0819b4dcc9643ccccf9779c1bba67a7045c1d572802aa36c31c2ec2 SHA512 7b8ee0459d914f72fad32b836d7c1ab751c1724c6badce5a5a5beb1bc2eaafa175c99aded8d1d6afea55c0dbbdee799f09e5e784397405f6452642eb5fbf82d8 WHIRLPOOL eaad3123a61ec6f3bf02665e0da71e3a5bac1b739dcd9230e842e90942a783996f455b79b0eb3c84308f2115a451bdb3403045d8a60052253414ed0a981ddff6
MISC ChangeLog-2015 3032 SHA256 d32d7e3e8804e3161fc06781661b9ce6e1e76db7b3c3e7e266b0bb8bf57c659e SHA512 c2afbb46e5598e39a5d143552fc5179722f356fcac5971f08ac3a10c731c0ea0d1529db9d870427ad167a86f425f26edb59630ef76e20ed48c2586e4fca8e72c WHIRLPOOL ab4f842af814b346d47054277e58411b954a470c31919a19a84983b0cd6e651b350cdf09046cd4cccb5defa3478d519c209a9e664bb07b6e574c3e71e0067221
MISC metadata.xml 347 SHA256 0e9bedb2007085ad5f1280eae4c796d35b76d5e36ef8bdbd1a7021924d6d439c SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515 WHIRLPOOL f78ac0c0a3e24f0fc15d5f5ecf18c0a3012bc50265584f519c125ed2a0f9bbd07248766a30485f6cf42fc9030c8ff88e6aa670e29b435980df38bf03fff34473
diff --git a/media-gfx/sxiv/sxiv-24.ebuild b/media-gfx/sxiv/sxiv-24.ebuild
new file mode 100644
index 000000000000..778e21dde204
--- /dev/null
+++ b/media-gfx/sxiv/sxiv-24.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils xdg-utils gnome2-utils savedconfig toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simple (or small or suckless) X Image Viewer"
+HOMEPAGE="https://github.com/muennich/sxiv/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="exif gif"
+
+RDEPEND="
+ exif? ( media-libs/libexif )
+ gif? ( media-libs/giflib:0= )
+ media-libs/imlib2[X,gif?]
+ x11-libs/libX11
+ x11-libs/libXft
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ restore_config config.h
+ default
+}
+
+src_compile() {
+ emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
+}
+
+src_install() {
+ emake DESTDIR="${ED}" PREFIX=/usr install
+ emake -C icon DESTDIR="${ED}" PREFIX=/usr install
+ dodoc README.md
+ domenu sxiv.desktop
+
+ save_config config.h
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 97e80c6e0ef6..778e21dde204 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -30,16 +30,12 @@ RDEPEND="
DEPEND="${RDEPEND}"
src_prepare() {
- sed -i '/^LDFLAGS/d' Makefile || die
-
- tc-export CC
-
restore_config config.h
default
}
src_compile() {
- emake V=1 HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
+ emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
}
src_install() {
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index c4510c67c101..bffab05ef06a 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,12 +1,7 @@
-AUX disable-tests-compilation.patch 638 SHA256 e0470715543dc081a633a4dfa2d656fe225f2e547d2f8c922c440a4867db7a09 SHA512 865c32420acd1d406e1e1a896d520d399960bcc834ad467cb93fd66d6a9f25559e52a06e780050214601a78e630ebd0c236f66b3cdce6db4f5f511f217898bc2 WHIRLPOOL baa2ef5cb5cb301c6b71799ec6d6e1b0d560385bd3cd9233abe513b0c4c91537ca59e0beeb8225853bed4ddd981d9da014354ea40c87253042247739370fe71e
-AUX fix-insecure-runpaths.patch 2338 SHA256 8577b422ca3e2003799fc9d7589101ed6bdc36ea0c470cddff62db83936fdb38 SHA512 2f175c1b787cff5e565b896de1c23199230c87dc84eb0b5837b1fed4166b84d4d3430b953fc6dd04c0276593fcf4db9190b2346fa8d62b9b2f0443f435e786fb WHIRLPOOL 6828629adf6de488e981ec17545dfba186bd9e02f40eb20c7ccf17c805c53481ffedddac7663fa7ece1e8a37fedadebf8190119c592953ce07bfd355413d4fcc
-AUX locales.patch 962 SHA256 e9c938a3e1958f4a1697dc1a434c38352a1be4728553ecd23697484c164275f4 SHA512 5d5d10d9cfd13738126ef3bff9083ebd6c63f5c9c6902ded0d664214451739eae0da43e5f7059cebf672342e400d5cf71d2b9fd104ac4d2e118bd1a2f20d6bd7 WHIRLPOOL 49f75bcaec9ad57cccc88356831b2d8e73cde503b0d64f9feddf2c9e5640d36313db823b5bc9a69285811c4aea00384510951123dd3adc8e078647d40ece4c8e
-DIST valentina-0.4.2.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
-DIST valentina-0.4.5.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
-DIST valentina-0.5.0.zip 21431337 SHA256 7d80d7cf49250cc48f7ae791e1ee3a8de2216f818fe100b883302099d984de05 SHA512 e04615fe0d79e8d0adebaea1808ee123d979babcd9f9320e897921aeda811ece37aff20575fb4bc033f21a91b498f409dbf1a4b8999e8b3c841c2f842ce41263 WHIRLPOOL 59714a19dee39cadc86f5542e52b4424fd7724bbbf5c9e3f6f33ebc48c313bc2b7c5f3f11f82b660f9a2619d05e76bc91f65201c95ae1473efaa540e132020d9
-EBUILD valentina-0.4.2-r3.ebuild 1680 SHA256 694ed67737d623eadc5106ef05d995fd04b99b44431ea7fbcb8780111eec7591 SHA512 7c052a184d6908c43e04550b21f15ad6599ebd600ab814aa5ea55e3fd07823452310e473d4c5f940ef05b125bfe0e714ee345e6adf739c4ec109990fd8c93ffc WHIRLPOOL 6989393484bbf8065537b3e27cb70dcd02c638af3765bd1ba18c13ff1b5665f20f1373761cec3489db516651320b3e63ace4d527f7601de9f196e11d8cfe3878
-EBUILD valentina-0.4.5.ebuild 1680 SHA256 694ed67737d623eadc5106ef05d995fd04b99b44431ea7fbcb8780111eec7591 SHA512 7c052a184d6908c43e04550b21f15ad6599ebd600ab814aa5ea55e3fd07823452310e473d4c5f940ef05b125bfe0e714ee345e6adf739c4ec109990fd8c93ffc WHIRLPOOL 6989393484bbf8065537b3e27cb70dcd02c638af3765bd1ba18c13ff1b5665f20f1373761cec3489db516651320b3e63ace4d527f7601de9f196e11d8cfe3878
-EBUILD valentina-0.5.0.ebuild 1691 SHA256 e00a88d4684586cc421da43acde0f003a73ee0932a25787942e621fbe6f12ff2 SHA512 1e3b91959f0c1cbd51d5db5e301ee57472697ebaa62d26fa5319f59c8d94ed48c870b01acff835200b1a35834eab8ac725d89ecfa012229a08a678832eb1e5fd WHIRLPOOL c4f9c9c076159ec7d10979c8b428b1a24a8203c00fbae24de1940431e6608f1d2de6cfb5db5180fbb0ef9b4d7bfa23f66bfdab6ab3b36b4aff18cac9187e5571
-EBUILD valentina-9999.ebuild 1495 SHA256 f25593ebdc9dbf28a86de5d9a10724b333f06005755a2bff39357b3a38b36012 SHA512 bf83b96f858211faefd67240eda8718467d456edca4e0ef8524fb4603a33057f9eacad0b4e2b584e36d385ba29c52f5c2f8dd157a9816ec6fd94f7356a5eaf44 WHIRLPOOL 68d8c42a7b0c99d80b586e893769d45a81727f584762c6425a420673016f659056c3bd553a02a5a14c0c9a21aa424aa28f586fbf191af6a844d54a9251e23871
+DIST valentina-0.5.0.zip 37175844 SHA256 f750027814e765b169c41934927f205350525b947f50559fd9bfcba016e095cb SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf WHIRLPOOL 271b471f25a59f356cca5b2c00e1a200e504c5184d2001e93c954ce0c921a56585811029e79e424f91c8550d44ea498d501f0f05c8aff62981cfc8be339ae673
+DIST valentina-4798.patch 25302 SHA256 3ff7b9555933fb361aad3b96b8486b2d5e4988fb0ee34f3fc98609d0673e3baf SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4 WHIRLPOOL 245496681adb86b6662b29426bfac11d7db6e9d7b2ab48e89d6508c5211fdc520bac450d1af051c066e00e914608fdc412cbae38dc0230dfc0090c0af6c4f979
+DIST valentina-4802.patch 6733 SHA256 abee2e871f9f741cdf26ac151dca24a0cfc9d3f22bbe2abfdb88ad7c42768c96 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4 WHIRLPOOL bb4f89a44eb5204192b680ba29226d04439b2326b37992e7a8623e713a94f20ec3043f31a059037f90a24feb2d283773f21c06f1777e4f61bf5f7a8d5f7d54af
+EBUILD valentina-0.5.0-r2.ebuild 1895 SHA256 c7afe5e5e9490a4a1a270ff8b71d1315d1ddc7372ae2e52791562b0d0f2d2c42 SHA512 a099c0f97f93dbfda53db352babb77ca7c3edb9f12b2cbc1a0ea19d388d817aa5eb41cd65a0c9e8f9e417cca223128e40f119322a892c51a51ddb7fb01e78cb0 WHIRLPOOL 0fd35cd298f8cc3e4c221a813d0e922f1209c8af880c45c52cc169a0bbf40886b388ebd3a29274508652c2e5cfbe259624a42ec4c4ec68933c952ddfba8fd364
+EBUILD valentina-9999.ebuild 1506 SHA256 dde5197354956241392c968ccc9ad054a7c9192a47b7d286498a58e1550b7efd SHA512 579149341dc7c3003a7d8ff3758df7247f50d8cfeba02f0882a9fa0ee37451d7fa4dc6cf0a1f3fb61582c4a73e8c37028558d12787f8a68bdce54a68b6cd9ba7 WHIRLPOOL e17a7bce22735140a0b50286df1b241b102087a2ba8eb0b999cef2fafb02ccb33497b8ed9e52b78073523fe97c21f3bb9ec14e7c2d2238f3eba3c4f5ecae373c
MISC ChangeLog 1824 SHA256 c9cd62e8638f7b0a07eaffd1480f4beb5aa1db6a91e3d1508c4c375376acf2a8 SHA512 6b38eca5b440d9447012a9df4c07c37a55a3dd080ee5574ee0206887699aed67bff99c62b030f34af0b70a781c5500b20b52478682d5cab8fec58aa0ffe550c1 WHIRLPOOL 9c5ece1064115966c6d77ea73b33431ccfc6eb0235327de98aa400ea5e0f8125a85a5c60f4063f42824c779476b7011ca5628cf940d37199a021f10d55a675a5
MISC metadata.xml 334 SHA256 2dc8bd9c92e9635eb050e38cf27a44747254780fee228c02851d6bf81cb9107c SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03 WHIRLPOOL 8f46171b3aa2ba25836342ea2cd509b1e08fdf6f3126747931b9392ba3fef549f47cb33f68fd4bfb633b04cb884e4d494ba86d2c37a287cce57d0ad8172426a9
diff --git a/media-gfx/valentina/files/disable-tests-compilation.patch b/media-gfx/valentina/files/disable-tests-compilation.patch
deleted file mode 100644
index a819a02a336b..000000000000
--- a/media-gfx/valentina/files/disable-tests-compilation.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-# HG changeset patch
-# User Roman Telezhynskyi <kroluku@gmail.com>
-# Date 1455906661 -7200
-# Branch develop
-# Node ID 8edb1b0f161a5f472a0e6a8a8b5b8a1ae7cf33c5
-# Parent 42a73e7a17757ce9d12e16f616a41f52efdf4b91
-CONFIG key to disable building tests.
-
-diff --git a/src/src.pro b/src/src.pro
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -1,8 +1,17 @@
- TEMPLATE = subdirs
--SUBDIRS = \
-- libs \
-- app \
-- test
-
--app.depends = libs
--test.depends = libs
-+noTests{ # For enable run qmake with CONFIG+=noTests
-+ SUBDIRS = \
-+ libs \
-+ app
-+
-+} else {
-+ SUBDIRS = \
-+ libs \
-+ app \
-+ test
-+
-+ test.depends = libs
-+}
-+
-+app.depends = libs
diff --git a/media-gfx/valentina/files/fix-insecure-runpaths.patch b/media-gfx/valentina/files/fix-insecure-runpaths.patch
deleted file mode 100644
index a98a069dfb5a..000000000000
--- a/media-gfx/valentina/files/fix-insecure-runpaths.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# HG changeset patch
-# User Roman Telezhynskyi <kroluku@gmail.com>
-# Date 1455895311 -7200
-# Branch develop
-# Node ID ebb8c53b8fdc09d2542ec6b8a63585be63c02725
-# Parent a29fbab1f3ac59fda0e81bf1e99d153b5f47bd7c
-CONFIG key to disable setting custom rpath option.
-
-diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro
---- a/src/app/tape/tape.pro
-+++ b/src/app/tape/tape.pro
-@@ -348,10 +348,16 @@
- # Path to recource file.
- win32:RC_FILE = share/resources/tape.rc
-
--unix:!macx{
-- # suppress the default RPATH
-- QMAKE_LFLAGS_RPATH =
-- QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+noRunPath{ # For enable run qmake with CONFIG+=noRunPath
-+ # do nothing
-+} else {
-+ unix:!macx{
-+ # suppress the default RPATH
-+ # helps to run the program without Qt Creator
-+ # see problem with path to libqmuparser and libpropertybrowser
-+ QMAKE_LFLAGS_RPATH =
-+ QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+ }
- }
-
- # When the GNU linker sees a library, it discards all symbols that it doesn't need.
-diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
---- a/src/app/valentina/valentina.pro
-+++ b/src/app/valentina/valentina.pro
-@@ -476,10 +476,16 @@
- copyToDestdir($$pdftops_path, $$shell_path($${OUT_PWD}/$$DESTDIR))
- }
-
--unix:!macx{
-- # suppress the default RPATH
-- QMAKE_LFLAGS_RPATH =
-- QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+noRunPath{ # For enable run qmake with CONFIG+=noRunPath
-+ # do nothing
-+} else {
-+ unix:!macx{
-+ # suppress the default RPATH
-+ # helps to run the program without Qt Creator
-+ # see problem with path to libqmuparser and libpropertybrowser
-+ QMAKE_LFLAGS_RPATH =
-+ QMAKE_LFLAGS += "-Wl,-rpath,\'\$$ORIGIN\' -Wl,-rpath,$${OUT_PWD}/../../libs/qmuparser/$${DESTDIR} -Wl,-rpath,$${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}"
-+ }
- }
-
- # When the GNU linker sees a library, it discards all symbols that it doesn't need.
diff --git a/media-gfx/valentina/files/locales.patch b/media-gfx/valentina/files/locales.patch
deleted file mode 100644
index a9084627df57..000000000000
--- a/media-gfx/valentina/files/locales.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/app/translations.pri b/src/app/translations.pri
-index b2dd2c4..87c55f7 100755
---- a/src/app/translations.pri
-+++ b/src/app/translations.pri
-@@ -9,22 +9,27 @@ PMSYSTEMS += \
- p0 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 p18 p19 p20 p21 p22 p23 p24 p25 p26 p27 p28 p29 p30 \
- p31 p32 p33 p34 p35 p36 p37 p38 p39 p40 p41 p42 p43 p44 p45 p46 p47 p48 p49 p50 p51 p52 p53 p54 p998
-
--LANGUAGES += \
-- ru_RU \
-- uk_UA \
-- de_DE \
-- cs_CZ \
-- he_IL \
-- fr_FR \
-- it_IT \
-- nl_NL \
-- id_ID \
-- es_ES \
-- fi_FI \
-- en_US \
-- en_CA \
-- en_IN \
-- ro_RO
-+isEmpty(LOCALES){
-+ LANGUAGES += \
-+ ru_RU \
-+ uk_UA \
-+ de_DE \
-+ cs_CZ \
-+ he_IL \
-+ fr_FR \
-+ it_IT \
-+ nl_NL \
-+ id_ID \
-+ es_ES \
-+ fi_FI \
-+ en_US \
-+ en_CA \
-+ en_IN \
-+ ro_RO \
-+ zh_CN
-+ } else {
-+ LANGUAGES = $${LOCALES}
-+ }
-
- for(lang, LANGUAGES) {
- INSTALL_TRANSLATIONS += $${TRANSLATIONS_PATH}/valentina_$${lang}.qm
diff --git a/media-gfx/valentina/valentina-0.4.2-r3.ebuild b/media-gfx/valentina/valentina-0.4.2-r3.ebuild
deleted file mode 100644
index d64507ced9aa..000000000000
--- a/media-gfx/valentina/valentina-0.4.2-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils gnome2-utils fdo-mime
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
-
-for LANG in ${LANGS}; do
- IUSE="${IUSE} linguas_${LANG}"
-done
-
-CDEPEND="
- app-text/poppler
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}/dismine-${PN}-44d43351cb59
-
-src_prepare() {
- epatch "${FILESDIR}/locales.patch" \
- "${FILESDIR}/fix-insecure-runpaths.patch" \
- "${FILESDIR}/disable-tests-compilation.patch"
-}
-
-src_configure() {
- local locales=""
-
- for LANG in ${LANGS}; do
- if use linguas_${LANG}; then
- locales="${locales} ${LANG}"
- fi
- done
-
- eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-
- dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
-
- doman dist/debian/${PN}.1
- doman dist/debian/tape.1
-
- cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
- insinto /usr/share/mime/packages
- doins dist/debian/${PN}.xml
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- if use gnome ; then
- gnome2_icon_cache_update
- fi
-}
diff --git a/media-gfx/valentina/valentina-0.4.5.ebuild b/media-gfx/valentina/valentina-0.4.5.ebuild
deleted file mode 100644
index d64507ced9aa..000000000000
--- a/media-gfx/valentina/valentina-0.4.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qmake-utils gnome2-utils fdo-mime
-
-DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA zh_CN"
-
-for LANG in ${LANGS}; do
- IUSE="${IUSE} linguas_${LANG}"
-done
-
-CDEPEND="
- app-text/poppler
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}/dismine-${PN}-44d43351cb59
-
-src_prepare() {
- epatch "${FILESDIR}/locales.patch" \
- "${FILESDIR}/fix-insecure-runpaths.patch" \
- "${FILESDIR}/disable-tests-compilation.patch"
-}
-
-src_configure() {
- local locales=""
-
- for LANG in ${LANGS}; do
- if use linguas_${LANG}; then
- locales="${locales} ${LANG}"
- fi
- done
-
- eqmake5 LOCALES="${locales}" "CONFIG+=noStripDebugSymbols no_ccache noRunPath noTests" Valentina.pro -r
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-
- dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
-
- doman dist/debian/${PN}.1
- doman dist/debian/tape.1
-
- cp dist/debian/valentina.sharedmimeinfo dist/debian/${PN}.xml || die
- insinto /usr/share/mime/packages
- doins dist/debian/${PN}.xml
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-
- if use gnome ; then
- gnome2_icon_cache_update
- fi
-}
diff --git a/media-gfx/valentina/valentina-0.5.0.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
index 172cf895fa38..3ba76fa3cd6b 100644
--- a/media-gfx/valentina/valentina-0.5.0.ebuild
+++ b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
@@ -3,11 +3,13 @@
EAPI=6
-inherit epatch qmake-utils gnome2-utils fdo-mime
+inherit qmake-utils gnome2-utils xdg-utils epatch
DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI="https://bitbucket.org/dismine/valentina/get/v0.4.2.zip -> ${P}.zip"
+HOMEPAGE="https://valentinaproject.bitbucket.io/"
+SRC_URI="https://bitbucket.org/dismine/${PN}/get/v${PV}.zip -> ${P}.zip
+ https://bitbucket.org/dismine/${PN}/commits/d78ca13c4891ccf3542b0704a7d66af0f9b02938/raw -> valentina-4798.patch
+ https://bitbucket.org/dismine/${PN}/commits/98e869c4146204ef31822087fa826cfa1cd7e0f4/raw -> valentina-4802.patch"
LICENSE="GPL-3"
SLOT="0"
@@ -15,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="gnome"
# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL ro_RO ru_RU uk_UA"
+LANGS="cs_CZ de_DE el_GR en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL pt_BR ro_RO ru_RU uk_UA zh_CN"
for LANG in ${LANGS}; do
IUSE="${IUSE} linguas_${LANG}"
@@ -35,12 +37,11 @@ RDEPEND="${CDEPEND}"
DEPEND="${CDEPEND}
app-arch/unzip"
-S=${WORKDIR}/dismine-${PN}-44d43351cb59
+S=${WORKDIR}/dismine-${PN}-31c95eadca8b
src_prepare() {
- epatch "${FILESDIR}/locales.patch" \
- "${FILESDIR}/fix-insecure-runpaths.patch" \
- "${FILESDIR}/disable-tests-compilation.patch"
+ epatch "${DISTDIR}/${PN}-4798.patch" \
+ "${DISTDIR}/${PN}-4802.patch"
default
}
@@ -60,7 +61,7 @@ src_configure() {
src_install() {
emake install INSTALL_ROOT="${D}"
- dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
+ dodoc AUTHORS.txt ChangeLog.txt README.txt
doman dist/debian/${PN}.1
doman dist/debian/tape.1
@@ -71,7 +72,8 @@ src_install() {
}
pkg_postinst() {
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
if use gnome ; then
gnome2_icon_cache_update
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 26d48b1311b8..3c119be7617c 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.ebuild
@@ -3,11 +3,10 @@
EAPI=6
-inherit mercurial qmake-utils gnome2-utils fdo-mime
+inherit mercurial qmake-utils gnome2-utils xdg-utils
DESCRIPTION="Cloth patternmaking software"
-HOMEPAGE="http://valentinaproject.bitbucket.org/"
-SRC_URI=""
+HOMEPAGE="https://valentinaproject.bitbucket.io/"
EHG_REPO_URI="https://bitbucket.org/dismine/valentina"
EHG_REVISION="develop"
@@ -51,7 +50,7 @@ src_configure() {
src_install() {
emake install INSTALL_ROOT="${D}"
- dodoc LICENSE_GPL.txt ChangeLog.txt README.txt
+ dodoc AUTHORS.txt ChangeLog.txt README.txt
doman dist/debian/${PN}.1
doman dist/debian/tape.1
@@ -62,7 +61,8 @@ src_install() {
}
pkg_postinst() {
- fdo-mime_desktop_database_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
if use gnome ; then
gnome2_icon_cache_update