gentoo resync : 03.12.2017

7 files changed, 19 insertions, 7 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index c57c98e31d2a..c4b9540210d0 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 650e3107863f..f11633bd7533 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,6 +1,6 @@
-DIST ImageMagick-6.9.9-0.tar.xz 8780640 SHA256 0a8a091dc4f57ec486e03285a1c30dc3f062d58133f848b6274dfc6ae5dbb60b SHA512 ddd2042e5d9fd2ee9ba91f65c7be3f0cf1a8ce340be9cefaaca2517073d2319b43b7190c5302c92e845f8e250d87681e375aec7238ca93401b42dd248776e338 WHIRLPOOL 603965b07098c3963ab5c089ee4a3fa4b1d36eb8fa52d1e5c22d2dd9bdd6b5ffa165713274fb524991faffe447ce7df14df40c8848f1436e7b86c25d901eda45
+DIST ImageMagick-6.9.9-0.tar.xz 8780640 BLAKE2B eaab6af1ed0471b148736d23ad53d334a49deabade72ae32e5729548d2a8d6e799bfab7a8273855ec2a5cc14a1b10fe60ae2db49d7f0b2cc949ed64f65494459 SHA512 ddd2042e5d9fd2ee9ba91f65c7be3f0cf1a8ce340be9cefaaca2517073d2319b43b7190c5302c92e845f8e250d87681e375aec7238ca93401b42dd248776e338
 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-20.tar.xz 8994128 BLAKE2B fb52396956b6e34320e82f34f83273550af3a55f0d23af87a791b3a8ae4002d27d3726e1caae1822bfe2f697de6ec76a975156a305eef5233cdb60006e32314f SHA512 36c241490ee41de5cd72e5bc297ac2353a0d4574337776445798b0c5823f491304c3f3a728d420d03f66b652eafcdb68ec2992347321ac3919c1d72c0afdb849
 DIST ImageMagick-6.9.9-23.tar.xz 8795632 BLAKE2B c3a2ece7897961b191b1090384c0872422af80903d0447a0b67f06d45062d60f12903a30a00d28bedc33a6c0b74f38bfe043a113613f0bfb5b1608b972ce8e2a SHA512 9160e0f6606c6ea011e9e47a11f092735456be60d6d039b9cf73c055c046ce89f05d096bdc3d37f87e2d6e36cd8dc9adf233b42bb9ad7d14aa03f13c7a1b6c03
 DIST ImageMagick-6.9.9-9.tar.xz 8797832 SHA256 59eed394d295d651e49ec0f3cfe3f0bb7aeccc28bd7a32360db9f8fc4bf9f25c SHA512 d024f753e1bf234e38736935f38a9bf82969ca77130059383f9d1871a39f68d7678a546d2786d57d602744e2008909df3f2ab08e1207b4c97c0952e7b03876d8 WHIRLPOOL f56279a778c81b6a1b61b7e47f24de25b4758c6d46fabf1f63c6847dac151297ec6bd76e390b3f21b0521963b254771ad9779ed3b4e62f0d77e94f225ec595ef
 DIST ImageMagick-7.0.6-9.tar.xz 8550004 BLAKE2B 2ca6cb995bdbdb16188c8cfa1fe328cccfe604341331413dc35950bc115f8a76af21f2f07cc3384da460a03d3de97484e1293507d30fea4571ee8f064f536757 SHA512 5756d2605cbfbd876765372e954aeefdcdf60f1ee364ce40c3302f8958c510e6f0ecf47a3ee3c264eaaade1504bdae068118eb2cb96d418237f7f53da94a6c11
@@ -10,10 +10,10 @@ DIST ImageMagick-7.0.7-8.tar.xz 8797060 BLAKE2B a1a4278c375047fed7e59fdb9fa2a952
 EBUILD imagemagick-6.9.9.0.ebuild 5158 BLAKE2B da4cadafcda858bb14d298662fa44abaeb346cc500bfaeaaf11cd0cd89162017af3d308ef240e1370f8320be260b77337077e7ca7ed84c0c007370da2f7a932c SHA512 ddec64d6ede1cf433bce3a4da1fb74c0346349b922cc1dd164acfb6cce99df1c207296a2334a7b59163a34250e91a80b8a7cb4a607fbca1bdb84bb3ee3c9f36c
 EBUILD imagemagick-6.9.9.18.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68
 EBUILD imagemagick-6.9.9.20.ebuild 5120 BLAKE2B b02f1bdfe05aa3a9f96bdc3596b785326753f5249bf5b19ba70a6a76ad1dfddb453acdacef7ee3d1c80bb75017912e73b9650fe5fad688620fdaadb01d87574a SHA512 f7e5492163118e23d46829613a8bd380faee2e2c6e597b1fcde7f7a1684c80a45ad0bab4b39deac083b4136cedc789c128fb6809c824469bef66c3a904738422
-EBUILD imagemagick-6.9.9.23.ebuild 5126 BLAKE2B ee6a8a6ab2c4f69c19f3679e33eacefb4fcc6e5804d90725ce46ae5092600432d260e747860626e60cca6a2ecb1e444ac38e648dd204873f9a161426ace26262 SHA512 09f9069d63c64f6948994cf5ad82eec35ad1c6b313d33603e0ce7c0984685ffa948300c1db932f476a98851ba3ecffd0e37494aa1c1cae69b2f3a0fc7961a5e1
+EBUILD imagemagick-6.9.9.23.ebuild 5123 BLAKE2B 663398d04bae00442dac8343352d84a478572c79b99b340d87b886950fe6e2bf5ed5733201a1e4580a6afbe584c481346a98dbd686cfd49f4bcfddcfa1fedbeb SHA512 624b8d2852dff9ee93457906feb4331ff8554732d4bf41a900fc4cf8e17efe730248412e5357cfb210fb386dca0387d9daa4d4c61c207eb5f9d5c5329b004f33
 EBUILD imagemagick-6.9.9.9.ebuild 5128 BLAKE2B c5d4f87b3ea909fa94d940f24a7f01f4026955e874868ad0d8124d941f06ddc0b24c3e11e40d6d825c3201d2b58a1d5446ce607a73ac62e13600d609ce1dc777 SHA512 86114b9cd2ffb6aa94808060abb78a03897e7ae0611b3c326ba60fe2ff17506209c413fc863a32ac63ae36d24ae2960cdc931b7b0493a8cb04189fa163990c68
 EBUILD imagemagick-7.0.6.9.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
-EBUILD imagemagick-7.0.7.11.ebuild 5132 BLAKE2B 4e85b964b58823a57f8afea90f551aebdcc3622ff4f2502ca1a9b6c452568f5176e008f8e42028ceb554120f7fe5393f79abdbee4d90ca1a0ad52921d1a50690 SHA512 e2ab69517f5d6ae5be2ad1992cbeb490f48e832f2a6c281cf25fce2b2f8b78653870b63135fc237564831728b7fa2e2ee99c783bc255e6b4f582dd43a83e66c9
+EBUILD imagemagick-7.0.7.11.ebuild 5129 BLAKE2B 7f2c969c548a1e0841df1b2eaaa0ce80479cf71f8499373b3baf03200ee65565a2ae57217db35d5584a2f15a3aee0e7ec65b17f01faed729858751855e146b5d SHA512 6be171ae5dc49a1c3da22491aafa1bfeaac9ef69d649f559de33551a2e253b328a37af5559df234317b9b583a8bc6d82c31f39e2cbb6cf6c0c718f1d06ca65c4
 EBUILD imagemagick-7.0.7.6.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 EBUILD imagemagick-7.0.7.8.ebuild 5134 BLAKE2B 3542aaffdbab0fa1e93eed3c67b923effd7bf418fe3e95b7501d8b1d36b3f6b81a2beb4bbdd8da29ac3bb96842a1f7bf8dbb72da0e2ed5dedeb4fc1a61fce1a5 SHA512 e16e30d01265170f4e39cce0d9d4385246dbff419d021f80bae3c1138b076b14e8cfb58fa8e4adde535c2866c62d3a2c3fac4adf07be5c118e0ea15d3b5c6ae0
 MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7
diff --git a/media-gfx/imagemagick/imagemagick-6.9.9.23.ebuild b/media-gfx/imagemagick/imagemagick-6.9.9.23.ebuild
index 63f47b02281a..08d9ab5629fd 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.9.23.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.9.23.ebuild
@@ -13,7 +13,7 @@ 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"
+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 )"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.7.11.ebuild b/media-gfx/imagemagick/imagemagick-7.0.7.11.ebuild
index 63f0f987d13e..2994e258e25e 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.7.11.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.7.11.ebuild
@@ -13,7 +13,7 @@ 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"
+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 )"
diff --git a/media-gfx/uniconvertor/Manifest b/media-gfx/uniconvertor/Manifest
index 54b5193f5158..9128b6cda76a 100644
--- a/media-gfx/uniconvertor/Manifest
+++ b/media-gfx/uniconvertor/Manifest
@@ -1,8 +1,9 @@
 AUX uniconvertor-2.0_pre379-ImageMagick7.patch 2158 BLAKE2B ca11ef1817fa80f0223e4af5737d24ee76c998104645af629f0731387e8c391b3f081083305b197b89dad37e1eab6e2d804ea58cb7632682292645554407218b SHA512 dcc828944a6458fd479906952afc81830777eb38dc58cd461ab8da560c24ec73016be0d318e2b416b29ca2cb04d2cb61dbb16fec41360a86d4a32224e1645029
+AUX uniconvertor-2.0_pre379-abs.patch 215 BLAKE2B 9f898acba90b3f42fda77a32ecc11b4316eb750d514085388c4cf0e4547cafba9cacfefaf48febf0303b4fec3875fc3905e57869941bb35c1f908a04174fa1bf SHA512 4b845caa96367a6da29342dac5d9cc54eb5e43ec8d2205712b9b61275db07db5c72018ab26c4c2770e6537eafb6c35b2b634442dc70f550805c406bdb9f93c37
 AUX uniconvertor-2.0_pre379-import.patch 935 BLAKE2B 5c201dbcac46f297cc2bcb243eecbf6629e54cada8b02b70ecef5a6c82806aba9f4dea090471e03001fc70b6f6c5b52e7721fba4d97d7c9a6505eb6531db81b1 SHA512 a51a182f5fb7694a935553b85174e4f32136046eb45cb7246fc4beb071bf9b953124ffd8d6eeb6d33bda5d53b8733236dca8d5f4a2dd3bad28ec1664976337fc
 AUX uniconvertor-2.0_pre379-libimg.patch 1201 BLAKE2B d25aa6bb28c6328ade007da10207317a6bcfe5c8c38eefa7d440ad6cc473c973fd41e923367d8b125f6d3fbdbac9df54993d398c040942e00b2730dd9c753fc2 SHA512 ff373151caf0c10e9a833ab68cf153d024706293c8000af248cb11a12582216c20f79e0998bdaabce0cc47d3248f786aa55ce9ba8814b1f4bb33e07670dd3136
 AUX uniconvertor-2.0_pre379-test.patch 1544 BLAKE2B 16e8b1ddd6d0ca064a2f1be12ac97bf75dccd3d73fffb252253154779d0175ac292a08f4bb38deeb815a5e6cf624a9ff80654627e46d02655c315fd7b2a640ce SHA512 760ea5ced19040d0d29230f9d6fdafafd7f6fcdd727e18261730b7696d0e9a85037cdceab8e20f202a79bd7b8c84edfa7f21619bfde1320bbdc1e1d0c6d298db
 DIST uniconvertor-2.0_pre379.tar.xz 1844780 BLAKE2B 51698d88941be700dd31e5527a8ffc8b2548d9f1323242e8f31a3ad00f2e4a2c5617be87443b130d664aeceea8b96ff17b72dfe32964854cc8f121351a918ec3 SHA512 3a0dd8e52addb391225ae148a673e3464a04e0d36e5955e496ef78e91597408706e5cbc06113b3e959446c6dd89aefa821f32ef81a5d1837a2a3d405a5a63dea
 EBUILD uniconvertor-2.0_pre379-r1.ebuild 1355 BLAKE2B 4cbebdbb4fabdd2fa45f00e66799e1bc8808c15851907850b515cab530e73821ad2bde90407aebc83b8fd21c1874d4df2ad6b82028b8c4b95d64a20c06f38317 SHA512 c990abe8e8a93c23617e3317a91b935b4f59259fc85e1907ff63da3e8f230c055246ad6f3b1aa421d1e6a5caafc938a589e117a2fea0fcc0e9c9203429b5b4a9
-EBUILD uniconvertor-2.0_pre379-r2.ebuild 1660 BLAKE2B 24345390bc9e9f1fdb253b78c01c0097f4b1892186d59fc6d94c0a7e5f846a04c54d461e06029779375339ff106f938f4ff015d67b863da3d7246be1f7b1d38d SHA512 48efe2a4092847a3f6c98a4017939446b8283b047a713bad7e5e1dd15d94d0fbf1e8bb4b50207e6b67abac2b926ad9d3779da64ff7aa32e7757bc84a880e93ad
+EBUILD uniconvertor-2.0_pre379-r2.ebuild 1690 BLAKE2B 1473aec396c0aaf35275b21a11c400654f7ed1714645c7e8d1d98b3b28ca53aa61638acf812c458b2c67c69b880b755058f940c7eaa18916520c798e416e4bb2 SHA512 49ce9f0f8a9f7b88bc34ac53785ca17fd21608d93fb842a2bc2f2571a5facaff94494b9070d75466eeb4afe8a231d5e138ec8a13c1a20efd8d0159b151786ea2
 MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch
new file mode 100644
index 000000000000..c344f8b1c54d
--- /dev/null
+++ b/media-gfx/uniconvertor/files/uniconvertor-2.0_pre379-abs.patch
@@ -0,0 +1,10 @@
+--- a/src/uc2/formats/sk1/sk1objs/curvelow.c
++++ b/src/uc2/formats/sk1/sk1objs/curvelow.c
+@@ -24,6 +24,7 @@
+ 
+ 
+ #include "math.h"
++#include <stdlib.h> /* abs() */
+ // #include "X11/Xlib.h"
+ #include "curvelow.h"
+ 
diff --git a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
index 81e96a4ade86..a6195fb9358a 100644
--- a/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
+++ b/media-gfx/uniconvertor/uniconvertor-2.0_pre379-r2.ebuild
@@ -29,6 +29,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-import.patch
 	"${FILESDIR}"/${P}-libimg.patch
 	"${FILESDIR}"/${P}-test.patch
+	"${FILESDIR}"/${P}-abs.patch
 	)
 
 python_prepare_all() {