gentoo resync : 28.04.2019

5 files changed, 30 insertions, 145 deletions

diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index 05bcb564e220..e4165582d364 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -1,9 +1,7 @@
-AUX fim-0.4_rc3-gcc6.patch 2140 BLAKE2B d5b041660e880675d83bd3743c647a12def7058a1731a272399a27999de61c51509df4b6e31f96a715ccdcec22a8506714eff22e28f643660c0b52e71502843b SHA512 288796013b4f3f54cb7893de2a558a5315c00bd09aed770bb3f0b743e06575d35d23addca67e192fcf96378f637d1421d2258785065c081816e9a556a7d930d5
 AUX fim-0.4_rc3-poppler031.patch 706 BLAKE2B b358bc51ccdb6b19533f4ef0571eb2f86e9f1259d4a6ca86d3cddeaf96b6e983a19993ce523a8edb45037eafd12412a56ca641276eb5ba6a915d0cd1bef8b88d SHA512 ddd9d5a9a8fee1269af6daed3edf965f3a2eba33c31c86bfae5af1b1db2e6809e6ad92439b9a438a7ab8a8dc7e30f9c472aad8d13c96b3d5371726b6fac6972c
+AUX fim-0.5_rc3-jpeg-9c.patch 723 BLAKE2B de59fa7a985fb38900ae3089bbbb20e2efeff2dbb7ccba3212155aff59a339af2f7c30488875cfb88691652682c78f56231366448d11e741f865c7c83133281b SHA512 be5692fc3a84a84aadccee3a5e86f0b3a1c4a2b8c2394640a762b98f1896463762a9d67f2ed62fa52d09d73224b2270b785725aac2ed658d5da497d8fdf9c9f8
 AUX fim-0.5_rc3-jpeg.patch 434 BLAKE2B a0de955643df8602a940f42f1727b4d7ae4ed1d65ce62ee32b0bf9882b1143aecf1566bc0328ae2ca7e6fd21d5331b78e43638fb2a295da09a816854e2e22f53 SHA512 e7918287d59a6677f2c0701a3e03871c2913aacb525438e56daf26064192606ff50b82b8334a3f96e1651fce895d7018606e24a06408fe1981a241f8b874dc7c
 AUX fim-0.5_rc3-libsdl.patch 905 BLAKE2B 5ee899dfa13c362ff4b5de243968376bd9c602f1c4d34763c99556fa0aa8ed523480fe4a65043124d5d65ebf67f376768647284db4a8ccfb812b62b33deee858 SHA512 b96dff8e07f44f24aa2324344889c6828f0d913f40a0b9eab8dffc58e3fddecafa36baa18eee08e19cbf5d1ad3996b1cbcda195c3f58f91537ce309a1345150c
-DIST fim-0.4-rc3.tar.bz2 504681 BLAKE2B 6a161e5b278b980a4442300f1c7d90b5ab690f6379cb0f2e72d7b2b3478d1877f1c99f1f46f173f788390ea32d6185f13d570ea128d2f52ff351dff74c779737 SHA512 82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf
 DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306
-EBUILD fim-0.4_rc3-r2.ebuild 2501 BLAKE2B 5f66202def62df300eddfed039655131adbd86a26cbe316c8dc67cb9753e99749893a65af02780ad120db625c87ba4fb652fb363677b8cd0348796e08b1f268b SHA512 b0839bab333a084bdc2d2864e3fd03d084af3522c99d5699c2fe9251ccdf585043f7dce491805a8ebae893906fa2054be034d50435b2d98ad14e634484421e97
-EBUILD fim-0.5_rc3.ebuild 2725 BLAKE2B dadbe6a87a5a3bdbaa02da27e40bbc4dd36568d570ec7dfdf879870a7af7ebf0c91360511f626ce7065bb97ff26cdba44be38c0e24932e69c282baee0883d346 SHA512 a08429dcdec86eca9e50267ab7bef1b04dbf042f9718822b13baa83b06a6e2af57ec4107aaee7b9a9d3ac278c52c0222508003eac2b1e49f25478ee9b6215722
+EBUILD fim-0.5_rc3.ebuild 2714 BLAKE2B 931cad86c682320640e635d81afee47cddf15aa28261c0902c81ddc699cfba0a650ffa5072bf15dde38134f3deadf2a5ae786e7ea81599cc7e18f2babd2e0a38 SHA512 8f0bba1ac27b1a619c046a99a00dcfe043f50a3103855669606459a2f60a6adcfebbbc3eaab404240cb5e89df894e85a45ee5ffe6efadd8695dd8cb0ce2faa69
 MISC metadata.xml 610 BLAKE2B ef1a0623bedf204e2f261325be02fbb452355b2a9266afc320f81298cd1ae6b4bcb15f44713cb8640abcbf00b977294a6ca38f702e40fc5b6ce0c78b98b2b267 SHA512 4fdac65cfd930aac84e304c61addb77f7e19db8436ea477035615c93411449b5f3d314ee8b02864caed85d743d0f97c9d93e14dc4e513c048dd65223f788cef0
diff --git a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch b/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
deleted file mode 100644
index 7f5388b63b35..000000000000
--- a/media-gfx/fim/files/fim-0.4_rc3-gcc6.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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/files/fim-0.5_rc3-jpeg-9c.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch
new file mode 100644
index 000000000000..3e0c3067a310
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/670020
+
+--- a/src/FbiStuffJpeg.cpp
++++ b/src/FbiStuffJpeg.cpp
+@@ -115,7 +115,7 @@
+     cinfo->src->bytes_in_buffer = h->tsize;
+ }*/
+ 
+-static int thumbnail_src_fill(struct jpeg_decompress_struct *cinfo)
++static boolean thumbnail_src_fill(struct jpeg_decompress_struct *cinfo)
+ {
+     FIM_FBI_PRINTF("jpeg: panic: no more thumbnail input data\n");
+     exit(1);
+--- a/src/FramebufferDevice.h
++++ b/src/FramebufferDevice.h
+@@ -37,8 +37,8 @@
+ #include "DisplayDevice.h"
+ 
+ /* these are required by FbiStuffJpeg.cpp */
+-#define FIM_FBI_TRUE            1
+-#define FIM_FBI_FALSE           0
++#define FIM_FBI_TRUE            TRUE
++#define FIM_FBI_FALSE           FALSE
+ 
+ #ifndef FIM_WITH_NO_FRAMEBUFFER
+ 
diff --git a/media-gfx/fim/fim-0.4_rc3-r2.ebuild b/media-gfx/fim/fim-0.4_rc3-r2.ebuild
deleted file mode 100644
index 8f78c3df9c25..000000000000
--- a/media-gfx/fim/fim-0.4_rc3-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim"
-HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved"
-SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="aalib dia djvu exif fbcon gif graphicsmagick imagemagick jpeg pdf png postscript readline sdl static svg tiff xfig"
-
-RDEPEND="media-fonts/terminus-font
-	aalib? ( media-libs/aalib[slang] )
-	dia? ( app-office/dia )
-	djvu? ( app-text/djvu )
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	imagemagick? ( virtual/imagemagick-tools )
-	jpeg? ( virtual/jpeg:0 )
-	pdf? ( >=app-text/poppler-0.31 )
-	png? ( media-libs/libpng:0 )
-	postscript? ( app-text/libspectre )
-	readline? ( sys-libs/readline:0 )
-	sdl? ( media-libs/libsdl )
-	svg? ( media-gfx/inkscape )
-	tiff? ( media-libs/tiff:0 )
-	xfig? ( media-gfx/xfig )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-poppler031.patch"
-	epatch "${FILESDIR}/${PN}-0.4_rc3-gcc6.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_enable aalib aa) \
-		$(use_enable dia) \
-		$(use_enable djvu) \
-		$(use_enable exif) \
-		$(use_enable fbcon framebuffer) \
-		$(use_enable gif) \
-		$(use_enable graphicsmagick) \
-		$(use_enable imagemagick convert) \
-		$(use_enable pdf poppler) \
-		$(use_enable png) \
-		$(use_enable postscript ps) \
-		$(use_enable readline) \
-		$(use_enable sdl) \
-		$(use_enable static) \
-		$(use_enable svg inkscape) \
-		$(use_enable tiff) \
-		$(use_enable xfig) \
-		--disable-hardcoded-font \
-		--disable-imlib2 \
-		--disable-matrices-rendering \
-		--disable-xcftopnm \
-		--enable-fimrc \
-		--enable-history \
-		--enable-loader-string-specification \
-		--enable-mark-and-dump \
-		--enable-output-console \
-		--enable-raw-bits-rendering \
-		--enable-read-dirs \
-		--enable-recursive-dirs \
-		--enable-resize-optimizations \
-		--enable-scan-consolefonts \
-		--enable-screen \
-		--enable-scripting \
-		--enable-seek-magic \
-		--enable-stdin-image-reading \
-		--enable-unicode \
-		--enable-warnings \
-		--enable-windows \
-		--with-default-consolefont=/usr/share/consolefonts/ter-114n.psf.gz
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
-}
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
index 1fc260ca524d..3e4bdf97f88a 100644
--- a/media-gfx/fim/fim-0.5_rc3.ebuild
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,6 +42,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.4_rc3-poppler031.patch"
 	"${FILESDIR}/${PN}-0.5_rc3-jpeg.patch"
 	"${FILESDIR}/${PN}-0.5_rc3-libsdl.patch"
+	"${FILESDIR}/${PN}-0.5_rc3-jpeg-9c.patch"
 )
 
 src_prepare() {
@@ -82,8 +83,6 @@ src_configure() {
 		--enable-mark-and-dump \
 		--enable-output-console \
 		--enable-raw-bits-rendering \
-		--enable-read-dirs \
-		--enable-recursive-dirs \
 		--enable-resize-optimizations \
 		--enable-scan-consolefonts \
 		--enable-screen \