Version bump.

Package-Manager: portage-2.2.0_alpha143/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 115 insertions, 17 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 9311f8efc334..7c8ced01b586 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.91 2012/10/24 19:10:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.92 2012/12/02 16:29:49 jer Exp $
+
+*fbida-2.09 (02 Dec 2012)
+
+  02 Dec 2012; Jeroen Roovers <jer@gentoo.org> +fbida-2.09.ebuild:
+  Version bump.
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> fbida-2.08.ebuild:
   Update dependency after package move from x11-libs/openmotif to
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 4a267010c86f..0173569aa13b 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -3,25 +3,17 @@ Hash: SHA256
 
 AUX fbida-2.08-posix-make.patch 1495 SHA256 7f8b0a7f46205efcb765133f287bfac7023e837f159364f8932ac146b4428c10 SHA512 ee7a6382d15ac90090c8f44e7cf674a0f924960ea1328bf1a783308f6414b1496aa50d0c97b3a5c10f4a2481c3c760e87a10358e92bf0740341eeabfbdce9314 WHIRLPOOL 36c857966aeea8c68822066e0971fa45ad6103daf967c1394d84096d257698002ea6a75d1cadb836dca2cbfa955ecbce93c8276745137bbaa75b16ee637ee1ac
 AUX ida-desktop.patch 453 SHA256 51dabac02c6326e7f2d28db304f0b481cbcef7371807eb93618b2b5eb0104907 SHA512 55ffa45449e59f757006461c50fed80489d41623f6efc6514782df2605d1d09f1941a1edba69606466f2585d8e65863607227516d14227d1ef756d5513abc9a4 WHIRLPOOL f9fd604b0220274697586ee939431c0e9d3b488a849067a274042fc5dce2c7dd6f8f00a192a24c303e9853cc0e32f1068e35f5f50b062792d03b5614a00fd5e1
-DIST fbida-2.08.tar.gz 241283 SHA256 298e7f3545e33596a5876f6b9c3da7ef475c2692e5fab0df824fbcd7a489cd80
-DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae
+DIST fbida-2.08.tar.gz 241283 SHA256 298e7f3545e33596a5876f6b9c3da7ef475c2692e5fab0df824fbcd7a489cd80 SHA512 750812304e0bf740c992b781286db83ad6aaf45023e2c950e80622ad4119c3352e51e6d169c53fc45353bb459585ecba10585fd23480f6ea7e4d2a66280b5fa9 WHIRLPOOL c25044fceea1db70fc07f6425d493cf5398c5f5dddd67c7de90cb1b93f19690f7eb507f74a3347774dd44fb309eca23c71466e68cc026352e39949d86aa57ce7
+DIST fbida-2.09.tar.gz 248086 SHA256 dd40b3572f79c6524480ac652c9b32e3867cb53e6c53db51415ddbb20f5231e6 SHA512 b939ca656fc28e3df652610821b9c11f7ab20ad1bd393c40de74f631fad0af463bfaf4f0520484edc12922b1fc288d08fae7c92789c711ce96b0caf50dde25ba WHIRLPOOL 222538f80fc7e878d142cd4dc44089d12b717ee8ae921e514bb3b85322b972cc96300594ae89d7cc1cb006868a0c75abacaa7ddff15041bc672c27d565a00a4b
+DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be
 EBUILD fbida-2.08.ebuild 2485 SHA256 289368391e6bed1a0113ef1912dd56ddc07ba4e504324658e3da3e21fb6e10ee SHA512 c242ddab9346489256cbd08b72d4c160057438f88dfafccdbc3d2958b61fe9a9adc07e196f84bb078bc45c5e2bd781c972e25bfb464a89032cf745eadafa0f6d WHIRLPOOL 7f57fe2f0fea38fdfbf5efa0478ae412e43d582711fbfda68ef3401835691fdb246640ec570054dfebc8f673cc5a2f07a247672a5cdc6255e4e1451d5f4582ef
-MISC ChangeLog 11489 SHA256 42bd2204fe51b4a909b30e9301eea58867eb2fc21b05f540071cfd747ee67870 SHA512 ab90d72bd8d83730b1858585fa401fb5143738bf3538ae017bc9d9097986ab3110f56a76da5e510154277a74ca6ffa1e5e9a5d87a703352ea059ac4925189c73 WHIRLPOOL 7842f847afd8e4d74fd8dbe94da27ac1f186a584a551b108d624cb9ef3bb30c217b502493a9eca9e331e22994b61f1e7f53defab1b774925a294cd4e570db356
+EBUILD fbida-2.09.ebuild 2493 SHA256 f57f1278ca191ba4832057637168f9b31b1fbbcfa430cd1f48a075dfa78971ea SHA512 87187d3a9a23fcebae872f215261e3986a0b4a78922ea72b4908f6cdbebfafcb7342b7958d68f40679894c357990213fde1d280cd900f640098594415a8f3d72 WHIRLPOOL 0d70c4cb424cabef7e6cb05885aa998c306bc8b4385ac421d1199f55bc9162ccd75133a4850101889e0275f98b4e743ad9d12f1a6cde7f6b27d6ec4f7beb9433
+MISC ChangeLog 11600 SHA256 7bd9e6647d36a38becd57144e3a9e5651600c60cd461f9ab7e7555db71725ef4 SHA512 6c771d2ce58a98328c373ef862b7466aaf274057a246989e5690682c051f405d838f77f581bfc14916bee21d1fafe42f14935510600356cd7b209f5714743f5c WHIRLPOOL 42df51f5270c82caa9d08dd4c41ad5f906d34102676a260652f8eb3ce494fcd211a1e3925fc84911d010565e21ee757040fc0e257f0de26ddb05d5db33cef59f
 MISC metadata.xml 200 SHA256 72d3475829cceaf086595829ee596f6bdfba2192aaab3b8bd2565c694cd0fb37 SHA512 9db195eeaa4e0c2dc1334e1f816930f9aa1689336ea0f25df34bf6b78f577dd7cb7c8aaf1bae9e6f807ab6b1477b8f0029e24580386e884ded491a1c21f8bb0f WHIRLPOOL 175ef4f037241f16c38cfa74c43731993208a43cb6dc7a7396bdf4213da37006344b14a28581ec1a2bec1b0e0b3da8f25f6268fbdbf0d3d69662e90418c97ccc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiD0yAAoJEDxpGckxwJCBDoUP/ivdqs2VOAVodWK/8MmhNR0y
-Rc5VBTTqfXOaLSG5UFvteTRtfHXMDH0T4iRIwA8seZO+KiMacgs0KHE6hrYXR4ed
-omMN5lWL63V6ZXvTOVsJQIqsj3nHNnVgQMOkOtydTRg2kpDBGcIwM2bqO8H0qbv/
-U+okXo1Ri3IFVdE2Ps/VfkWSvSzMeJhLXUWbFnrl+uDjbgMLQXW1PA/YelPGlNcg
-DPOSIvNTwP2dMejdTY1xjTNRY2gL09ZM4+/ruvEpukXn8u2MmibN5za/l1xAErIt
-JKRLQrYeG2Z4zz/YXxEs42fOvjdGiwBa9wjcssFkzBeDcE4vT3sTjQj/z5/riHyd
-6LQoZrzo8BzD8OyHoOqHe3sAdEvLWUUjSM4DcAQMakBOAdw97aS/dkbc5MMubsaO
-w6cSp1VhOyZYPf44hHO5cmSOq9xJQLv9jwII1ITMmQ24tHlI0PwrWJ62fJTYRCNA
-G/t368SwuwAnL2F+1o0fY1o6xquvG3jFyuVIPYqrtpCwxIUpG50ojo1O8WYhGd8Y
-X8bihZsufCt1G12Q1ZcxyVgyVbw7lvMOsScbijPwILC+PQRkNwZe8GCp9s9NbMag
-vgELozRvAv26F0OvSzJ/8GFl7Npoig1naRHbwZJB3xpL171rA1ExfKfYvsecramq
-iqwAkEd4HqqgFbQdQvwh
-=nBCd
+iEYEAREIAAYFAlC7gf8ACgkQVWmRsqeSphMwBACdEQJm8zwRKDhtPS0xJgMOh0XR
+vRIAn2ZdrOtvDOreu71HFIOBXF1eFaQ6
+=flqR
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbida/fbida-2.09.ebuild b/media-gfx/fbida/fbida-2.09.ebuild
new file mode 100644
index 000000000000..327404e7e5f8
--- /dev/null
+++ b/media-gfx/fbida/fbida-2.09.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09.ebuild,v 1.1 2012/12/02 16:29:49 jer Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)."
+HOMEPAGE="http://linux.bytesex.org/fbida/"
+SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz
+	mirror://gentoo/ida.png.bz2" #370901
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="curl fbcon gif imagemagick lirc pdf png scanner tiff X"
+
+RDEPEND="png? ( media-libs/libpng )
+	gif? ( media-libs/giflib )
+	pdf? ( app-text/ghostscript-gpl media-libs/tiff )
+	tiff? ( media-libs/tiff )
+	curl? ( net-misc/curl )
+	lirc? ( app-misc/lirc )
+	imagemagick? ( || ( media-gfx/imagemagick
+		media-gfx/graphicsmagick[imagemagick] ) )
+	scanner? ( media-gfx/sane-backends )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXpm
+		>=x11-libs/motif-2.3:0
+	)
+	!media-gfx/fbi
+	virtual/jpeg
+	media-libs/libexif
+	>=media-libs/freetype-2.0
+	>=media-libs/fontconfig-2.2
+	virtual/ttf-fonts"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto x11-proto/xproto )"
+
+src_prepare() {
+	sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \
+		-e 's/-lungif/-lgif/' -i "${S}/GNUmakefile"
+
+	if [[ `gcc-major-version` -lt 4 ]]; then
+		sed	-e 's/-Wno-pointer-sign//' -i "${S}/GNUmakefile"
+	fi
+
+	epatch "${FILESDIR}"/ida-desktop.patch
+	epatch "${FILESDIR}"/fbida-2.08-posix-make.patch
+}
+
+src_configure() {
+	# Let autoconf do its job and then fix things to build fbida
+	# according to our specifications
+	emake Make.config || die
+
+	set_feat() {
+		local useflag=${1}
+		local config=${2}
+
+		local option="yes"
+		if ! use ${useflag}; then
+			option="no"
+		fi
+
+		sed -e "s/${config}.*/${config} := ${option}/" -i "${S}/Make.config"
+	}
+
+	set_feat fbcon 	HAVE_LINUX_FB_H
+	set_feat X 		HAVE_MOTIF
+	set_feat tiff 	HAVE_LIBTIFF
+
+	# The 'pdf' flag forces the use of libtiff.
+	set_feat pdf	HAVE_LIBTIFF
+	set_feat png 	HAVE_LIBPNG
+	set_feat gif 	HAVE_LIBUNGIF
+	set_feat lirc 	HAVE_LIBLIRC
+	set_feat curl 	HAVE_LIBCURL
+	set_feat scanner HAVE_LIBSANE
+	set_feat imagemagick HAVE_LIBMAGICK
+}
+
+src_install() {
+	make \
+		DESTDIR="${D}" \
+		STRIP="" \
+		prefix=/usr \
+		install || die
+	dodoc README
+
+	if ! use pdf; then
+		rm -f "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1
+	fi
+
+	if use X ; then
+		doicon "${WORKDIR}"/ida.png
+		domenu desktop/ida.desktop
+	fi
+}