From 6c824757d33976273713a20b37094f22e93e2d80 Mon Sep 17 00:00:00 2001
From: Michael Weber <xmw@gentoo.org>
Date: Wed, 4 Mar 2015 15:15:36 +0000
Subject: [PATCH] Version bump for new release candidate, adjust poppler dep
 and drop old.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090
---
 media-gfx/fim/ChangeLog                       | 10 +-
 media-gfx/fim/Manifest                        | 17 ++--
 media-gfx/fim/fim-0.4_pre.ebuild              | 99 -------------------
 media-gfx/fim/fim-0.4_rc1-r1.ebuild           | 14 +--
 ...{fim-0.4_rc1.ebuild => fim-0.4_rc3.ebuild} | 24 ++---
 5 files changed, 31 insertions(+), 133 deletions(-)
 delete mode 100644 media-gfx/fim/fim-0.4_pre.ebuild
 rename media-gfx/fim/{fim-0.4_rc1.ebuild => fim-0.4_rc3.ebuild} (82%)

diff --git a/media-gfx/fim/ChangeLog b/media-gfx/fim/ChangeLog
index 1d327a54a8c2..a1ddf3446cd6 100644
--- a/media-gfx/fim/ChangeLog
+++ b/media-gfx/fim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/fim
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fim/ChangeLog,v 1.5 2014/05/27 11:51:16 xmw Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fim/ChangeLog,v 1.6 2015/03/04 15:15:31 xmw Exp $
+
+*fim-0.4_rc3 (04 Mar 2015)
+
+  04 Mar 2015; Michael Weber <xmw@gentoo.org> +fim-0.4_rc3.ebuild,
+  -fim-0.4_pre.ebuild, -fim-0.4_rc1.ebuild, fim-0.4_rc1-r1.ebuild:
+  Version bump for new release candidate, adjust poppler dep and drop old.
 
 *fim-0.4_rc1-r1 (27 May 2014)
 *fim-0.4_rc1_p1 (27 May 2014)
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
index c37145111628..7a3726c019ae 100644
--- a/media-gfx/fim/Manifest
+++ b/media-gfx/fim/Manifest
@@ -7,16 +7,15 @@ AUX fim-0.4_pre-nosvn.patch 507 SHA256 9882b634b14ec1b241d71a586c5305f8ffc537b88
 AUX fim-0.4_rc1-giflib-4.2.patch 770 SHA256 aed02d65c53ec8da424cedb81d5e9d9ed2a2422e776e3f07cec6c58b719e407c SHA512 d2426c7f915854836072465ea7ca49e0ff693d14626bc979ceca30801564dced35029470b9d7c708ad11d0c2a330974fcac5c747c5756c0e665b60000d181106 WHIRLPOOL 2d8d43eefd179ce28f67fedfec1c74b8ff9af776254ee5f2a8836d3a29bbf1afeb54977f9e552bc583329f8846c26901dc52470596d350a811ede6709324e4d9
 AUX fim-0.4_rc1-nosvn.patch 440 SHA256 608d2e4cee6f6a8cc291a97010cf9d2941f5360fda1b404dca1677b6974e80a8 SHA512 cb28886a8602ee253aefb5f23cab26f3bc0d4e161e53f4f90d2ba367052a07554f5ba4b703a686f0e0f6b0870690ea7c653a9c1521af9431c1b2b7fb73c6b91f WHIRLPOOL ae74d4d340211c3c15a72d00a7993a2c9906cfb49ef6868da6b68c67f3ee24aba3154ebf1499f2d5354b96070887cfcc6b35bc3ca20f182b6016044d718218e4
 DIST fim-0.4-rc1.tar.bz2 517290 SHA256 2928989c71bce77f659e49bddb98def234c53b4ad6556c62dd83969af64fd51b SHA512 11475f563d0ab616c1e842966f125010c5c6b1653e98ce7634a7bea10a5c3a5de6b7ec4b96d84caeebff2de8d9a9cb79953261982c061b6cb2c91ce32aaa6e3f WHIRLPOOL 0cabb2c9cc3823132e0ac64a24fe5cc6e69be7097e39bc3c3bd199ef99114b60cc18e8d73969faa0e7c6309ea688343b974fe66160be10c7b628283a11c85c90
-DIST fim-0.4-trunk.tar.bz2 514184 SHA256 a5d4ac8ea5bd84b9c9bd1b91c30c228365f996dc95c11b545e936837ce6d73b5 SHA512 1ea6acd30331fe73126dab19a5610cf041f26a93de08aa751aeb5a260d3bbdc0664b4788545f86f95ee230ac68d5c8d98ebd27ee2e83f8deeba60a5556219c95 WHIRLPOOL 5e2da330d9c409f8d268665a2595ca8924c3bd7f89e417aaadbdff985d871e05e568168784fd165473b7acb79a488481afd44e7d9e7770039cc7a7218426ab84
-EBUILD fim-0.4_pre.ebuild 2740 SHA256 0dd803feab01f212cd3254e11b4cf0f9e407088fc6cd32aa6ffa88c9cb1b49e9 SHA512 f5d4fb9433c4073e43800aee440b61933312ba5d243e92f414eafb75d9f459feb4e444bf970dee5f0c8a467da02619ddccadaacd9d4574b902ce1c131dc4e066 WHIRLPOOL 44a00ac69273caf437b621ed54512d6ca87d980786107fe6289aa4197e1ed3f43b139f802fd6d0531e810eef6066b988ec165fcb57bed742be978b73b701e387
-EBUILD fim-0.4_rc1-r1.ebuild 2740 SHA256 231e8cf77210349c4a1944e038c14f985276ddac88a9549e86005230ff6d16ce SHA512 1b388e9e174d89e40e827175252df79028d41c57e0aa226c3aee58ff5cf41dd3b602a28c802cc39269fb54de079c391033c4b93df4ef62a3e32f92fd6cccd17f WHIRLPOOL 2fee448b29483b28d0ee293bcc2479c09c4a105ec2c8bf7376462c532b01480f9039a5030c6d18d117c4ff82f0d50a2bf2b288cf9a8752e3eb416f24785651f3
-EBUILD fim-0.4_rc1.ebuild 2693 SHA256 598d659dbb59a181b581bad839464294c8e11866b15267d01a6e7b722921a699 SHA512 f726084179880181e3e01df763157a9b57c4a00b8ebbe829faf3e610427de5edce38bf3635a5107d8d4571f7aa2ac74940e01cc1625807ed7d1ed8db1643c797 WHIRLPOOL bd02781cd8fbe88fdc7beccb0e000b2757129f5058349ab65b5fa46eae919cde083c12548977302c13dc1f8bc0cb739054020e3f599485ab18d8127f19a18c06
-MISC ChangeLog 1061 SHA256 810660fa20b0e4eb6addf7c45001d2ff21516d991d5d8a4b26e6b188c9656daa SHA512 2b833486c949cc0003e87f13afd376c4cb4d0ed92aa15875771f737e7fdb239a990d97a69dee06537d5a90765d85a996c44175a0f94a865b8fd96455f25c803f WHIRLPOOL 99d76e0e0dea83b1d5564370101225f80c2873712b3153e9d964dc2ad6db4fb90fc8bacdcaaf5ce6983f0fe3b1a4fd75d950ab9c6f522e0ced9c9c9536721d11
+DIST fim-0.4-rc3.tar.bz2 504681 SHA256 d0bf902f9fcc728f4a2acfad5474e8dd60f84922fea5119265f46e66032ed92a SHA512 82a2b191c0cd26fb77b442df9ed104e51ae15f485390f07cf15a043725e6ee9b860ce903bf8355ad556adbbe076516a8807c0a6d937e89177e46c0068d5acabf WHIRLPOOL bf977a0333ec7d7d087811c88290cddc68f7a2d50f27180aa9000200e32432abf5767a40e4cef2affc3c3b8218da07b23346d06f5af5cace4f11ff1901a6311b
+EBUILD fim-0.4_rc1-r1.ebuild 2754 SHA256 a59f5540db69e3efc8520b51d1a27d3453561eeabce91a4fb8c44a9b756e265c SHA512 a048c41848504fe708898268dc5959eb313960e5907971dee54478bebab7b807bb781ebf65ead7abeb7e74b08e646bc3f4578f89b398eb96947cde198bde147d WHIRLPOOL 64d288ded4ef946bdb23c30082be326268bdf51bb294df3bda768a48fbb61076a1d84ee4a5326da9200eb8f188282d28fa9fccbf2948d1c30e7b6d0055640393
+EBUILD fim-0.4_rc3.ebuild 2534 SHA256 abede5611eea4f9d6acc221f0f5249b1f9f4473e5f29ef362ed5483e6f462d2a SHA512 d44795fbbb40562be26e468aedf17097c243c2c9b4f1fe3ad5b7a971dd6135e34f63310ccd1d1118c8fc2564b8b1c12c5298489809f298acecc32ade031e328b WHIRLPOOL 0fa437a7a5c44827be65092a886518bef81e2538812a1983ff6af09fb52f8a35b0217724b54ce169962ba1f64b84cb1bed168cc18ac291f2968f2f4a7cc80568
+MISC ChangeLog 1299 SHA256 ad087ed823c6a4c8444486eafe2e7488ba3d93e984d287f74f394d35d2822cfc SHA512 6f76cb3b03fd1ec9918690dc44d766a1e6d58c94ab3f79cfeb57db1c4d90d92b3ce258fd5b2c6f66edcff3137864b14baeb6291fafdf4dcbb635512165d146c3 WHIRLPOOL 0b1f669ab00bd7c651f78aa324cb184ef52b3c202c68562d21a822f9ed35a2d8c299765484ccc3a446fbcef9d1bd000d2607f155f6e18a0b959233e8e075338d
 MISC metadata.xml 555 SHA256 1c82a61f2a1bc82c6c86ac02d37909671eb8dbf8743cb461b4555ce3eb55b57f SHA512 95ed21c2732407cd487bc9b4b7be0ba7c7809f80e493ea96f14fb6c5392e2c3c17a02217887d55fe818a33df48e56ce580ccd865f401580ff1d906097e905984 WHIRLPOOL b3e47c13cbfb26c721328fd1d10f061e25489621ecedf5fba232e088800cac078bc092136c3fdcb6e1f69e2e18f39f7125a4cb6e1e026e36c13c9e859f51ae30
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlOEfD0ACgkQknrdDGLu8JDl4gD/XAViwC36JKdC0zO2p6OyblLH
-7197DJ4Fjv0silXW8D0A/iikhfAN86wa5DMs37oXqwM3P90gegnonhBH/UJkb5cU
-=LDeV
+iF4EAREIAAYFAlT3IZgACgkQknrdDGLu8JAmNAD/RvPDfXrA6FzhR+SttUiqgDaK
+fGTjs88WMkvMIldGIxIBAJkqODvfKwBYgZv6Cd35+i8lFrttHSSG7rQZ0bassOu9
+=rtyH
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fim/fim-0.4_pre.ebuild b/media-gfx/fim/fim-0.4_pre.ebuild
deleted file mode 100644
index ff5b839a7251..000000000000
--- a/media-gfx/fim/fim-0.4_pre.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fim/fim-0.4_pre.ebuild,v 1.3 2014/01/11 01:31:35 xmw Exp $
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim"
-HOMEPAGE="http://savannah.nongnu.org/projects/fbi-improved"
-SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_pre/-trunk}.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-4.2 )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	imagemagick? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) )
-	jpeg? ( virtual/jpeg )
-	pdf? ( app-text/poppler )
-	png? ( media-libs/libpng )
-	postscript? ( app-text/libspectre )
-	readline? ( sys-libs/readline )
-	sdl? ( media-libs/libsdl )
-	svg? ( media-gfx/inkscape )
-	tiff? ( media-libs/tiff )
-	xfig? ( media-gfx/xfig )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-S=${WORKDIR}/${P/_pre/-trunk}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automake-1.12.patch \
-		"${FILESDIR}"/${P}-nosvn.patch
-	if use graphicsmagick ; then
-		epatch "${FILESDIR}"/${P}-graphicsmagick.patch
-	fi
-	eautoreconf
-}
-
-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.4_rc1-r1.ebuild b/media-gfx/fim/fim-0.4_rc1-r1.ebuild
index e85da408480b..4c73200390f6 100644
--- a/media-gfx/fim/fim-0.4_rc1-r1.ebuild
+++ b/media-gfx/fim/fim-0.4_rc1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fim/fim-0.4_rc1-r1.ebuild,v 1.1 2014/05/27 11:51:16 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fim/fim-0.4_rc1-r1.ebuild,v 1.2 2015/03/04 15:15:31 xmw Exp $
 
 EAPI=5
 
@@ -23,14 +23,14 @@ RDEPEND="media-fonts/terminus-font
 	gif? ( media-libs/giflib )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	imagemagick? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) )
-	jpeg? ( virtual/jpeg )
-	pdf? ( app-text/poppler )
-	png? ( media-libs/libpng )
+	jpeg? ( virtual/jpeg:0 )
+	pdf? ( <app-text/poppler-0.31 )
+	png? ( media-libs/libpng:0 )
 	postscript? ( app-text/libspectre )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:0 )
 	sdl? ( media-libs/libsdl )
 	svg? ( media-gfx/inkscape )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xfig? ( media-gfx/xfig )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
diff --git a/media-gfx/fim/fim-0.4_rc1.ebuild b/media-gfx/fim/fim-0.4_rc3.ebuild
similarity index 82%
rename from media-gfx/fim/fim-0.4_rc1.ebuild
rename to media-gfx/fim/fim-0.4_rc3.ebuild
index 58dc09b734a4..d2779e2469a8 100644
--- a/media-gfx/fim/fim-0.4_rc1.ebuild
+++ b/media-gfx/fim/fim-0.4_rc3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fim/fim-0.4_rc1.ebuild,v 1.1 2014/01/11 02:06:24 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fim/fim-0.4_rc3.ebuild,v 1.1 2015/03/04 15:15:31 xmw Exp $
 
 EAPI=5
 
-inherit autotools eutils
+inherit eutils
 
 DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim"
 HOMEPAGE="http://savannah.nongnu.org/projects/fbi-improved"
@@ -23,14 +23,14 @@ RDEPEND="media-fonts/terminus-font
 	gif? ( media-libs/giflib )
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	imagemagick? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) )
-	jpeg? ( virtual/jpeg )
-	pdf? ( app-text/poppler )
-	png? ( media-libs/libpng )
+	jpeg? ( virtual/jpeg:0 )
+	pdf? ( <app-text/poppler-0.31 )
+	png? ( media-libs/libpng:0 )
 	postscript? ( app-text/libspectre )
-	readline? ( sys-libs/readline )
+	readline? ( sys-libs/readline:0 )
 	sdl? ( media-libs/libsdl )
 	svg? ( media-gfx/inkscape )
-	tiff? ( media-libs/tiff )
+	tiff? ( media-libs/tiff:0 )
 	xfig? ( media-gfx/xfig )"
 DEPEND="${RDEPEND}
 	sys-devel/bison
@@ -38,14 +38,6 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P/_rc/-rc}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nosvn.patch
-	if use graphicsmagick ; then
-		epatch "${FILESDIR}"/${PN}-0.4_pre-graphicsmagick.patch
-	fi
-	eautoreconf
-}
-
 src_configure() {
 	econf \
 		$(use_enable aalib aa) \
-- 
2.26.2