gentoo resync : 10.11.2017

3 files changed, 47 insertions, 1 deletions

diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index 7ce3c2da4c3a..7dc6913295ab 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -1,6 +1,7 @@
+AUX fim-0.4_rc3-gcc6.patch 2140 SHA256 b825606a4d06c34c9b26ce13fbd391f9a87fc93bae52ffe82d1dacba5d814d1b SHA512 288796013b4f3f54cb7893de2a558a5315c00bd09aed770bb3f0b743e06575d35d23addca67e192fcf96378f637d1421d2258785065c081816e9a556a7d930d5 WHIRLPOOL 1c1b04b12eedaad587cb8a7ab1745ba35a0c64648a606606d991f18f5cdd4f675fc6b94969346abe928d1ef7808fe4d36893ed473b47b63464246062063a2852
 AUX fim-0.4_rc3-poppler031.patch 706 SHA256 486ea7d2e9c5186ece27ffdccfd025619b0455bf7d28d4bfff526ba0ef6efca4 SHA512 ddd9d5a9a8fee1269af6daed3edf965f3a2eba33c31c86bfae5af1b1db2e6809e6ad92439b9a438a7ab8a8dc7e30f9c472aad8d13c96b3d5371726b6fac6972c WHIRLPOOL 493dc57b7090cd506f15f3892e2ac1be52696b3deadf23554c1e76a5b3aad0e885eff9d89909f9e977da48b11f78c9313143f22cd16831852cc81d00f0f99745
 DIST fim-0.4-rc3.tar.bz2 504681 SHA256 d0bf902f9fcc728f4a2acfad5474e8dd60f84922fea5119265f46e66032ed92a SHA512 82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf WHIRLPOOL bf977a0333ec7d7d087811c88290cddc68f7a2d50f27180aa9000200e32432abf5767a40e4cef2affc3c3b8218da07b23346d06f5af5cace4f11ff1901a6311b
-EBUILD fim-0.4_rc3-r2.ebuild 2454 SHA256 604e8c8e968fc633202eb1b8de784e6f9923a43184f159355d75fe321b0e2545 SHA512 f7120fe028a06b267c6d0445415e1be39e3cfa8b767ab73750115b859492665ebfef19dcd539a56bdf160428930b26687807ff4406f48f45f1ec31c78328a6f6 WHIRLPOOL b7b65f7e23e3773013b987b2f0cf8c8013055ec943cc7d78206e701444669ca119d98b40d6422474712a28e7fc1916856a86eb6e582e2c6c6aaf5895aed60830
+EBUILD fim-0.4_rc3-r2.ebuild 2501 SHA256 b4ee2322c03ceaf3b0040a63d264b0e818abf3d310c612a1c7f2833ab92a334a SHA512 b0839bab333a084bdc2d2864e3fd03d084af3522c99d5699c2fe9251ccdf585043f7dce491805a8ebae893906fa2054be034d50435b2d98ad14e634484421e97 WHIRLPOOL 9c3e34eb1cff900063751a7e5ec58db85fda14cb545c8f178e1694e6be83ca3c9d9442cbce3e3a46564e3b8c78e9f1508ab528da87bb132c1ba8f3dbdf85e675
 MISC ChangeLog 2507 SHA256 372be30987b10a3744dba6bdb25589607767f4c5767a43edba4f7cc41bba0588 SHA512 20fb7a956bd21675f2e259d47722f06bd1eb378784e8c09d0661ce7c1d3bc574fc04ea3fdbb47a309e5a696e1b8e63d2029050beee92c12527953100ec60f3e8 WHIRLPOOL a8ac36fe0a437c52bd4e04d38553ea417266207ca600938cf5039fa1fbc0c3955f5db27d6bd222685229c41d0610c14f3ee1bbb04c223f87a1c5be6312de8e24
 MISC ChangeLog-2015 1544 SHA256 39ac6a32e014527e31c437c4bc291a91aefe5b3add29111b80c55eed9efda5b2 SHA512 9d6598dd064d462e2707e64bc8375b6d0484d61722581a8b94e1afdd35a6c6fe20b701abf3ddf17aa1254611a51612bf1b6286887bd8a2822746d46a3a9963f2 WHIRLPOOL f6ad99fc9dd68143119caf30c808ee0d9a08d628bcb4bf9d18a72cee8a5b3d0bc5fe4903007b3d7f1af5f5eb2e33cdc4cdbdc9c994f84769983c0bfcba14454b
 MISC metadata.xml 492 SHA256 6e2a7855c26e45793663884569cfc46b0caacd0a9b5f17f5f90b76b9cec17741 SHA512 48b25d06654705efc6b14b9e7d4a5198f3146e281151bfd54b48c181296a45cb2a38f3548257b369ab100b2502a31c15fc2b07e80ae2c2a15b4480321db2e32c WHIRLPOOL 357c104a336c9d94a0829903d13a72be2ac230ed77e0fae203610b1b4e333e751747a469c2d78b8d27d688022a8cda7eebe203b56ddb2e94316460db7b0cc2ae
diff --git a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch b/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
new file mode 100644
index 000000000000..7f5388b63b35
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
@@ -0,0 +1,44 @@
+Bug: https://bugs.gentoo.org/595832
+Commit: http://svn.savannah.gnu.org/viewvc/fbi-improved?view=revision&revision=735
+
+--- a/src/fim.cpp
++++ b/src/fim.cpp
+@@ -114,7 +114,7 @@
+     {"device",     required_argument, NULL, 'd',"specify a {framebuffer device}","{framebuffer device}",
+ "Framebuffer device to use. Default is the one your vc is mapped to (as in fbi)."
+     },
+-    {"dump-reference-help",      optional_argument /*no_argument*/,       NULL, 0xd15cbab3,"dump reference info","[=man]",
++    {"dump-reference-help",      optional_argument /*no_argument*/,       NULL, 0x6472690a,"dump reference info","[=man]",
+ "Will dump to stdout the language reference help."
+     },
+     {"dump-default-fimrc",      no_argument,       NULL, 'D',"dump on standard output the default configuration",NULL,
+@@ -182,7 +182,7 @@
+ /* FIXME: shall document this */
+ #endif /* FIM_WITH_LIBIMLIB2 */
+     },
+-    {"offset",      required_argument,       NULL,  0xFFD8FFE0,"will open the first image file at the specified offset","{bytes-offset}",
++    {"offset",      required_argument,       NULL,  0x6f66660a, "will open the first image file at the specified offset","{bytes-offset}",
+ "Will use the specified \\fBoffset\\fP (in bytes) for opening the specified files (useful for viewing images on damaged file systems; however, since the internal variables representation is sizeof(int) bytes based, you have a limited offset range: using already chopped image files may be a workaround to this limitation)."
+     },/* NEW */
+     {"text-reading",      no_argument,       NULL, 'P',"proceed scrolling as reading through a text document",NULL,
+@@ -979,9 +979,8 @@
+ 		    cc.pre_autocmd_add(FIM_VID_SCALE_STYLE"='1';" "autocmd \"" FIM_ACM_POSTSCALE "\" \"\" \"" FIM_FLT_DISPLAY "'resize';\";");
+ 	#endif /* FIM_AUTOCMDS */
+ 		    break;
+-		case 0xFFD8FFE0:
+-		    //fbi's
+-	 	    // NEW
++		case 0x6f66660a:
++		    //fim's
+ 	#ifdef FIM_AUTOCMDS
+ 		{
+ 			int ipeppe_offset;
+@@ -1191,7 +1190,7 @@
+ 			}
+ #endif /* FIM_WANT_OUTPUT_DEVICE_STRING_CASE_INSENSITIVE */
+ 		    break;
+-		case 0xd15cbab3:
++		case 0x6472690a:
+ 		    //fim's
+ 		{
+ 			args_t args;
\ No newline at end of file
diff --git a/media-gfx/fim/fim-0.4_rc3-r2.ebuild b/media-gfx/fim/fim-0.4_rc3-r2.ebuild
index 9559c4739fac..8f78c3df9c25 100644
--- a/media-gfx/fim/fim-0.4_rc3-r2.ebuild
+++ b/media-gfx/fim/fim-0.4_rc3-r2.ebuild
@@ -39,6 +39,7 @@ S=${WORKDIR}/${P/_rc/-rc}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-poppler031.patch"
+	epatch "${FILESDIR}/${PN}-0.4_rc3-gcc6.patch"
 }
 
 src_configure() {