gentoo resync : 09.03.2018

3 files changed, 2 insertions, 21 deletions

diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 11b7d8a2c622..388230b80379 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -8,7 +8,6 @@ AUX xfig-3.2.5b-urwfonts.patch 4925 BLAKE2B 975a7558f162daeadec40d922d69b2d0724a
 AUX xfig-3.2.5c-XAW3D1_5E_notlocal.patch 1590 BLAKE2B 6474442a25bc2b13b3c2a3783047ea5bea3afe0233c34497940f879e2b9dce7e17b8a28736f3d650944d6ba4a8a5dcab64b36fcfb0e2854de4914b7a64f05d67 SHA512 493b34b167ed0807c6f417f6d468d73170d3246576320582e9e9c8a7bbb55a7a14820eb756f7f05a3d53d942b8b4ef63689744d77c4c554d6e35f9e2be64a482
 AUX xfig-3.2.5c-crash-on-exit.patch 526 BLAKE2B 8aefa2c4b7d4f4b7a4b89cf27fb7507dba837617912a57da86d8292c615526c589804b28336d66c6ae6a02f24c0dd19f6253254edd2ddb0ef70a2ba6ad0ca6e5 SHA512 e3e7baebab9b8efcb621971a873185ccf7202a98ba26ca505aeae1831e0f78ce87fb17f5c62ee646e5b21668922555f47817cf179796a02a53534e4648f0650e
 AUX xfig-3.2.5c-darwin.patch 812 BLAKE2B 1b6de6896f99592855f14c60505c40fa3f5008ff54cb47cb73ba915917f85e971537a11b909e8b3e672974be4210f57bf0b9ada3388ba2d6b9ee15ecda74bbf0 SHA512 2aa3d845e8fa646cd8a4c0a6892d505c64c6750268b238e7327fb4fd4677401c1dbe976ae4abc5ebb1bb7b8f38e5b8f875b7051dd557eb33ea221489639d40de
-AUX xfig-3.2.5c-png16.patch 635 BLAKE2B 39fa474594444a1ccac53da5c2efed9812c985401f20a67c2c86d18d5faca1c3507d46ee8d465f9169876c56925f13a33543ae7edf200dd58fb0af9b2ec251de SHA512 fab4b4ae381500221f2f1f4cf9eb486eb94f3d9bc8ff93b9bca8758430233b2031ed8917cfe67ead1f741612935640f31135c38ea7b19e3b215fd2bf4fa50892
 AUX xfig-3.2.5c-spelling.patch 545 BLAKE2B 8a3e82f4cab421f8ec7802654eefa65bace2b075b557421137048af114b61d2d7ee3bc38726556318c863a1d8378315db09775f92eecd7d212d85755fcb57d9a SHA512 3e33470459b249acd65dec1f467e2527f05a625d5ec8d539d943144aedf784d231ed8750441b073e752dfaedda2aedb60bc64cb97b8ddafff72fca0f3f0325ab
 AUX xfig-3.2.6a-app-defaults.patch 502 BLAKE2B e7277af104c8fd9ed652e2ec6b175376157583f60659564f846348dbb5a205669989f7fd31e8069548af32a424be87548b6b3033d004bcd24e1a44d262a53c38 SHA512 4c5b523f17cacc85839eeb287a82192c9c3d8c704cca34c8de87d38aa05fb502afdadb9169a396573fb977e650ca7a1fabbdab067fb128be024dea724cb791be
 AUX xfig-3.2.6a-solaris.patch 523 BLAKE2B eeae0cc11ae6e3fd6e8c157648d8663131d0d11b020f5e64ec1a324f05ee5bd08be8c111c1ebe34065256d64d103619f61ff3f5524aa7636eb8f76e9aa64a714 SHA512 b2eb546b8fdd0d18bab3d9a2c183149fdb4fb278d5e2d8234f040c4fef727bec7461f861391027dea32028b822aa2e540824cb18af09769f32c7a1fb7bf48319
@@ -17,5 +16,5 @@ DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a4
 DIST xfig.3.2.5c.full.tar.gz 6078933 BLAKE2B 44ccad26fa3d7a57b0e8798d6ebfe6682baf15046d9e360d7a7569cac54c403c0068671e27a5289dbb4f70dafd12c1653a61709749a8298874bc49528783973b SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525
 EBUILD xfig-3.2.5c.ebuild 3303 BLAKE2B ca99f5134de4c15df3ae3f656684b3f6bea7f6e7a20e2bae0899e684025475f46bfa2c41792b507db3982637c985e67522261abaa78fda4f399e4ae134cd9139 SHA512 538cee1a1626c417a967f4c4810a0b8924169f61c153b67e8479243dab39041d05cda40e98e5bbc8c2fe5e571fb85acbe0425072c56906d08c53e4bce8be8c1b
 EBUILD xfig-3.2.6a-r1.ebuild 1195 BLAKE2B 417a2288dc0c2ffef4e410ef928c263c16ce2bbc007223cb63056482a81db14dbc20e2ef83db1b41afe155efa39d3c1bf87f43846a0f4a905d78f2ec6b40a580 SHA512 3ac4318244774a3a73fcf1ccb958a7bef931c0165927e293d8557f181554c6aff41e4e2e7365750d5d9bdd7fee5c08c892d80720d001f1f3894bfed294ccecc1
-EBUILD xfig-3.2.6a.ebuild 1207 BLAKE2B bea38ebc749e077fed56f3d6f4a97a25ae7aa40bdf81e6f9bbed9b78462ad41930957efa3af37c82eec653905a59da5af48253ee4496720896286ddb76a361bf SHA512 22b7b0f96d4459081e8978cc6219c7bcef30861df54b0211bd8ce334a32f61b9199be8ed0c78008bd2b4ee699f8276ab30dc5865849b918e5c16928335e3a958
+EBUILD xfig-3.2.6a.ebuild 1205 BLAKE2B 9ad9fb464ceb7819bd0eb81860b742b9071ff31b248643bba4859f53384d330948b4061231bda20c4e33589aae71b51a7c2a011ab110a2cb0b6b70b697ceed8b SHA512 883f0e7fb6a90f3d5f288e340fce9ab25b09a9209edafb44dffef945cd96f04619dabcff06d8526114017ab926a5d091aefbd97d7e1fbc423949c9a0fc9ea1c5
 MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-png16.patch b/media-gfx/xfig/files/xfig-3.2.5c-png16.patch
deleted file mode 100644
index f7a426295d3c..000000000000
--- a/media-gfx/xfig/files/xfig-3.2.5c-png16.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Source: https://bugzilla.redhat.com/show_bug.cgi?id=1150330
-
-From: David Kaufmann <astra@ionic.at>
-Subject: Fix PNG reading
-
---- a/f_readpng.c	2014-09-15 13:25:26.290813563 +0200
-+++ a/f_readpng.c	2014-09-15 14:04:10.241297027 +0200
-@@ -90,8 +90,8 @@
-     png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type,
- 	&interlace_type, &compression_type, &filter_type);
- 
--    png_fixed_point gamma = 0.45;
--    png_get_gAMA_fixed(png_ptr,info_ptr,&gamma);
-+    double gamma = 0.45455;
-+    png_get_gAMA(png_ptr,info_ptr,&gamma);
-     png_set_gamma(png_ptr, 2.2, gamma);
- 
-     if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) {
diff --git a/media-gfx/xfig/xfig-3.2.6a.ebuild b/media-gfx/xfig/xfig-3.2.6a.ebuild
index fbbb1770fb4e..a65925ef8b06 100644
--- a/media-gfx/xfig/xfig-3.2.6a.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="