gentoo resync : 25.03.2018

5 files changed, 165 insertions, 10 deletions

diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index ff5dc37d6dbc..a558ac9798f3 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -1,5 +1,9 @@
 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.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
-MISC metadata.xml 492 BLAKE2B cd37b0d51b77c8222a5064701f2ede90757dd39938532f7240df6dd05b399478b831b39d6c5a987def61e47a1dc3632575e24bb13801637131419cc93a98c819 SHA512 48b25d06654705efc6b14b9e7d4a5198f3146e281151bfd54b48c181296a45cb2a38f3548257b369ab100b2502a31c15fc2b07e80ae2c2a15b4480321db2e32c
+EBUILD fim-0.5_rc3.ebuild 2725 BLAKE2B dadbe6a87a5a3bdbaa02da27e40bbc4dd36568d570ec7dfdf879870a7af7ebf0c91360511f626ce7065bb97ff26cdba44be38c0e24932e69c282baee0883d346 SHA512 a08429dcdec86eca9e50267ab7bef1b04dbf042f9718822b13baa83b06a6e2af57ec4107aaee7b9a9d3ac278c52c0222508003eac2b1e49f25478ee9b6215722
+MISC metadata.xml 714 BLAKE2B cae2d5ed896e4abac20df176c20df975b38a4c1fb429134c2c829a07af07cb6db86f2081252ba893fc8124385c842227eac5cb44c96595b1c5e798a6f06586d3 SHA512 57b1bbbf3b980fc94b58dfa9f4631e65a49b1b21f62966acaae13a2401cfb0466a0dac068cad51948c9795144a8445595d7d27b1a9b8f0d0f0e3ee4bd28739cc
diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch
new file mode 100644
index 000000000000..1887196f7cbf
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch
@@ -0,0 +1,13 @@
+https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/src/FbiStuffJpeg.cpp?r1=1041&r2=1076
+
+--- trunk/src/FbiStuffJpeg.cpp
++++ trunk/src/FbiStuffJpeg.cpp
+@@ -179,7 +179,7 @@
+ 
+ 	if(nsp)
+ 		/* std::cout << "|" << title << "|\n", */
+-		nsp->setVariable(string("EXIF_") + title,value);
++		nsp->setVariable(string("EXIF_") + string(title),value);
+ }
+ 
+ static void fim_ExifDataForeachContentFunc (ExifContent *content, void * user_data)
diff --git a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch
new file mode 100644
index 000000000000..0f1e6beb6feb
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch
@@ -0,0 +1,27 @@
+https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/configure.ac?r1=1474&r2=1521
+
+--- trunk/configure.ac
++++ trunk/configure.ac
+@@ -1128,15 +1128,17 @@
+ 			fim_handle_sdl='no'
+ 		fi
+         else
+-dnl		if test x$fim_cv_want_static == x1 ; then 
+-			LIBSDL_CONFIG_FLAGS=--static-libs
+-dnl		else
+-dnl			LIBSDL_CONFIG_FLAGS=--libs
+-dnl		fi
+ 		AC_MSG_NOTICE([Activating LIBSDL.])
+ 		fim_handle_sdl='yes'
+                 LIBSDL_CXXFLAGS=`$LIBSDL_CONFIG --cflags`
+                 CXXFLAGS="$CXXFLAGS $LIBSDL_CXXFLAGS"
++		LIBSDL_CONFIG_FLAGS=--static-libs
++		if $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS ; then 
++			LIBSDL_CONFIG_FLAGS=--static-libs
++		else
++			LIBSDL_CONFIG_FLAGS=--libs
++		fi
++		AC_MSG_NOTICE([Invoking $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS.])
+                 LIBS="$LIBS `$LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS`"
+ 		# finish this !
+                 #FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS SDLDevice.o"
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
new file mode 100644
index 000000000000..1fc260ca524d
--- /dev/null
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+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 bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg jpeg2k pcx 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 )
+	jpeg2k? ( media-libs/jasper:= )
+	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}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4_rc3-poppler031.patch"
+	"${FILESDIR}/${PN}-0.5_rc3-jpeg.patch"
+	"${FILESDIR}/${PN}-0.5_rc3-libsdl.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable aalib aa) \
+		$(use_enable bmp) \
+		$(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 jpeg) \
+		$(use_enable jpeg2k jasper) \
+		$(use_enable pcx) \
+		$(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/metadata.xml b/media-gfx/fim/metadata.xml
index 6b3d433fbf24..e69460104901 100644
--- a/media-gfx/fim/metadata.xml
+++ b/media-gfx/fim/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-<use>
-    <flag name="dia">Enable DIA file support via app-office/dia</flag>
-    <flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag>
-    <flag name="xfig">Enable FIG file support via media-gfx/xfig</flag>
-</use>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>graphics@gentoo.org</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
+	<use>
+		<flag name="bmp">Enable BMP file support</flag>
+		<flag name="dia">Enable DIA file support via app-office/dia</flag>
+		<flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag>
+		<flag name="pcx">Enable PCX file support</flag>
+		<flag name="xfig">Enable FIG file support via media-gfx/xfig</flag>
+	</use>
 </pkgmetadata>