Version bump.

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

3 files changed, 118 insertions, 5 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index b82d65580438..23e386796c72 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.125 2015/03/30 04:27:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.126 2015/04/04 08:27:59 jer Exp $
+
+*fbida-2.10 (04 Apr 2015)
+
+  04 Apr 2015; Jeroen Roovers <jer@gentoo.org> +fbida-2.10.ebuild:
+  Version bump.
 
   30 Mar 2015; Jeroen Roovers <jer@gentoo.org> -fbida-2.09.ebuild,
   -files/fbida-2.08-posix-make.patch:
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index f28d0b30ee44..8c1db7b25077 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -6,14 +6,16 @@ AUX fbida-2.09-make.patch 994 SHA256 ac11e8f072de7e36e41d42b5760cd99dcea9e19a951
 AUX ida-desktop.patch 384 SHA256 68b73ebe6ebc04dd3c205ee328c61c9d0b523c9ba87dda9301f82eab306b9e57 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 WHIRLPOOL 5ff72a36831f60b2965964e53b105121c0de042e18abfc19d348c35496dada17c466d2e0d1cbeb778238a62380a4a2d7e3998e15565accf3b69dc19f80aa0e32
 DIST fbida-2.09-jpeg-9a.patch.bz2 29392 SHA256 d0979bb7b33b34c2b01f0fe14825812319b0ec08f00f0de6cf9a0533a5f6dba8 SHA512 f644f464231967589a2f1ad0fdc9025d60348a9de20d468fc6abdf3dc0cbf07522e3f71a94930df3c54055fc445df035b4b007efa7e6a3f7acbec90e28dc86c8 WHIRLPOOL 372aa56e698f82ff9dd8adacb5de9347e40849653553d810e4f5c0fca731ca8e863f8a20658db071ca11ed8d6bc8794c36ec5fd8c0a2426d8e500389703f2e95
 DIST fbida-2.09.tar.gz 248086 SHA256 dd40b3572f79c6524480ac652c9b32e3867cb53e6c53db51415ddbb20f5231e6 SHA512 b939ca656fc28e3df652610821b9c11f7ab20ad1bd393c40de74f631fad0af463bfaf4f0520484edc12922b1fc288d08fae7c92789c711ce96b0caf50dde25ba WHIRLPOOL 222538f80fc7e878d142cd4dc44089d12b717ee8ae921e514bb3b85322b972cc96300594ae89d7cc1cb006868a0c75abacaa7ddff15041bc672c27d565a00a4b
+DIST fbida-2.10.tar.gz 283490 SHA256 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6 SHA512 b7371c19d68cc7219faca4bbfa464c85df2eb22c7bd737d4f0a6fb3de481497862ca22832801d29bab57285d5a8d7d0b0009e14426efdce2759d47340f5eca6d WHIRLPOOL 78c5dc34a9f050e560ada960718a9f43e6d8c95fe4c91c052a70c93350de80eebd3e8e9b6c26361ecd8361efe96824e78b2af7a2b2e27430a11e712bb9a02ee0
 DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be
 EBUILD fbida-2.09-r4.ebuild 2652 SHA256 8a2db57df7bcc5ecaa88a3da2bda437629e21b6e47f1f1c7e7dc9bb01da5e47f SHA512 46f456e99119473fcaf431f00dfab66b9ba4dff87e8dc9491d8e41858dea0e8a374e1c97bef030f82615995eaa8c2233453bf9b2deeb2caaffcbf00cb8832426 WHIRLPOOL 9250f3a8501fc2f96cbfbde40f6f73f0ee0d621126c77a70018aa0bcdd68707bc4234fabe872e3571405458886a34280c4bed31cf406513a9e3c99e368f962b3
-MISC ChangeLog 15667 SHA256 c6867bc8f348b4a14de198fd9166c6b8485e2870a1f61edcd4a65b36c13104f0 SHA512 941b8661cfce9c1934064ba2cca3c325c07cc9a58f23887ac4123ef28ae12f3d2b66bf4326b93da95af082678afdebd1f745b3a0f817d11a7cec60c3f137d97e WHIRLPOOL fd8fb030c616fa794c0feb5d0124aeafa8b26fc30e488a3f55741f8eddbff85732bd46530707d985a0e867b32710dd2c3c1a639f078f91dbb031d67d19efa67c
+EBUILD fbida-2.10.ebuild 2216 SHA256 05c01e300cfdd6c7b3613812fcee2d31aaf7e4ad7df2c5b381d3f22aa2d273d3 SHA512 de485263b97e59d874adf8b99be568ce90708c41d5666ae436d05c212cbeb8245fd64d57771956e377e99627408719c22b54fe6c7b5e96c7ef3ec4b2972faadd WHIRLPOOL 9d1e775e3050ca328b3a15f2ec1d22138bc2641ce25f79655551339390f503283e486da916ee3768026b90ee379ec7b49b65446714f170667a9905ba60291898
+MISC ChangeLog 15778 SHA256 28304ec521aeca0ab26a037f444aa2e38fe30d53c317895c2b35f406001ef874 SHA512 35da238cc7aab0a81b7347929e62aa9b477286d7cf85a049be3389ec86d3b9683eb0e7d6cc7f742cd6177359ff3077788af4e50c56f145ebce437847864c5798 WHIRLPOOL 782c8f42a5dc7c3a5d665ab2681f2e04b7554424a55d14bed9e228033e5ce0c086b9340d2a95ece6b7b38c6a63408ed5223e871909ad1daf7d9599d21e78f515
 MISC metadata.xml 409 SHA256 30adb8b77b731331a7981157faa6d76bb71beba7311635639ebfaf0d545af0c0 SHA512 48ddfb184fb23a70a73dcf9e3d5441fb0bf28956afea3eb69cacc1c4bf211a2571afdda83426c6be003b86ac9632acf14b87e9b518d0ed76e89a0b0a037b221e WHIRLPOOL cc8c6349745adb96e88a5e325ee37c170bee9055a3b2628ba2885cc53eb3e97f5dd3ae8b745c9385a0fbf37c219cc179cadb9ba80f3c1849c601b4e783ea8c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUY0MwACgkQVWmRsqeSphMc1QCeO98tPwNsVNENa/JbCYA+SXpP
-sqIAn0tjVwv+3P9JB1UZebYEpwqOpBKC
-=KrW5
+iEYEAREIAAYFAlUfoJAACgkQVWmRsqeSphMpRwCdGzdTic5HsuS6KVKeZl8kjVxz
+/hkAmgNkdSlOpIOedZUc5cgLVL5Ap0Wy
+=DJ5r
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbida/fbida-2.10.ebuild b/media-gfx/fbida/fbida-2.10.ebuild
new file mode 100644
index 000000000000..48789ffb4b49
--- /dev/null
+++ b/media-gfx/fbida/fbida-2.10.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.10.ebuild,v 1.1 2015/04/04 08:27:59 jer Exp $
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
+HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+SRC_URI="
+	http://www.kraxel.org/releases/${PN}/${P}.tar.gz
+	mirror://gentoo/ida.png.bz2
+"
+LICENSE="GPL-2 IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
+REQUIRED_USE="
+	pdf? ( tiff )
+"
+
+RDEPEND="
+	!media-gfx/fbi
+	>=media-libs/fontconfig-2.2
+	>=media-libs/freetype-2.0
+	media-libs/libexif
+	curl? ( net-misc/curl )
+	gif? ( media-libs/giflib:= )
+	lirc? ( app-misc/lirc )
+	png? ( media-libs/libpng:* )
+	scanner? ( media-gfx/sane-backends )
+	tiff? ( media-libs/tiff:* )
+	virtual/jpeg:*
+	virtual/ttf-fonts
+	webp? ( media-libs/libwebp )
+	X? (
+		>=x11-libs/motif-2.3:0
+		x11-libs/libX11
+		x11-libs/libXpm
+		x11-libs/libXt
+	)
+"
+
+DEPEND="
+	${RDEPEND}
+	X? ( x11-proto/xextproto x11-proto/xproto )
+	pdf? ( app-text/ghostscript-gpl )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/ida-desktop.patch
+
+	tc-export CC CPP
+}
+
+src_configure() {
+	# Let autoconf do its job and then fix things to build fbida
+	# according to our specifications
+	emake Make.config
+
+	gentoo_fbida() {
+		local useflag=${1}
+		local config=${2}
+
+		local option="no"
+		use ${useflag} && option="yes"
+
+		sed -i \
+			-e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
+			"${S}/Make.config" || die
+	}
+
+	gentoo_fbida X MOTIF
+	gentoo_fbida curl LIBCURL
+	gentoo_fbida fbcon LINUX_FB_H
+	gentoo_fbida gif LIBUNGIF
+	gentoo_fbida lirc LIBLIRC
+	gentoo_fbida pdf LIBTIFF
+	gentoo_fbida png LIBPNG
+	gentoo_fbida scanner LIBSANE
+	gentoo_fbida tiff LIBTIFF
+	gentoo_fbida webp LIBWEBP
+}
+
+src_compile() {
+	emake verbose=yes
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		STRIP="" \
+		prefix=/usr \
+		install
+
+	dodoc README
+
+	if use fbcon && ! use pdf; then
+		rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die
+	fi
+
+	if use X ; then
+		doicon "${WORKDIR}"/ida.png
+		domenu desktop/ida.desktop
+	fi
+}