Explicitly add WebP support. Remove imagemagick support (which never worked to begin with). Make tiff dependency for USE=pdf more explicit. Respect CPP. Set some useful USE defaults.

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

5 files changed, 89 insertions, 50 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 17fc9f28b187..c1b66832205a 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/fbida
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.107 2013/12/31 17:24:55 jer Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.108 2014/02/21 18:58:26 jer Exp $
+
+  21 Feb 2014; Jeroen Roovers <jer@gentoo.org> fbida-2.09-r1.ebuild,
+  +files/fbida-2.09-make.patch, metadata.xml:
+  Explicitly add WebP support. Remove imagemagick support (which never worked
+  to begin with). Make tiff dependency for USE=pdf more explicit. Respect CPP.
+  Set some useful USE defaults.
 
   31 Dec 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Set maintainer.
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index ab6aaa297a43..d5a57272b610 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -3,17 +3,18 @@ Hash: SHA256
 
 AUX fbida-2.08-posix-make.patch 1495 SHA256 7f8b0a7f46205efcb765133f287bfac7023e837f159364f8932ac146b4428c10 SHA512 ee7a6382d15ac90090c8f44e7cf674a0f924960ea1328bf1a783308f6414b1496aa50d0c97b3a5c10f4a2481c3c760e87a10358e92bf0740341eeabfbdce9314 WHIRLPOOL 36c857966aeea8c68822066e0971fa45ad6103daf967c1394d84096d257698002ea6a75d1cadb836dca2cbfa955ecbce93c8276745137bbaa75b16ee637ee1ac
 AUX fbida-2.09-giflib-4.2.patch 752 SHA256 1093ad96cb38b38a2952bbed2475605dff0c06f80681114fd8c8c631e0733c6c SHA512 5fd824664b1afbf9d03a56a6b4f657434f802dde987bce4ef6d0805848f468d603433b3a7227388aaa791483af7211fea9f73dd3ee754203826209d930652aab WHIRLPOOL 05d4f8d08b7fb19de0f067de50d949e3d2f11d3eca8958d03a49d4cbe58609e8137a56b1ec84f73cf9a041c36666291d0a9c9f451128579f5bc255f52ec3be30
+AUX fbida-2.09-make.patch 994 SHA256 ac11e8f072de7e36e41d42b5760cd99dcea9e19a951ed93e13880a2c69868f67 SHA512 e4bd6f16fc9ab51529d32f5c200867cc44ed418d0eb63a2649e3cfc17cdf0fa0cdbbb12d1031e855b86fe021345c1656dd53a6455851baf3d4a986719eb6013d WHIRLPOOL 23e7c8d188e2804f4646b2f783db6c0c94d807aa92de942d90e50b7d02c7eb8e0c481ee6459ddb9524f246074991b839646088e3f99ac90c02c91ececec94136
 AUX ida-desktop.patch 384 SHA256 68b73ebe6ebc04dd3c205ee328c61c9d0b523c9ba87dda9301f82eab306b9e57 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 WHIRLPOOL 5ff72a36831f60b2965964e53b105121c0de042e18abfc19d348c35496dada17c466d2e0d1cbeb778238a62380a4a2d7e3998e15565accf3b69dc19f80aa0e32
 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.09-r1.ebuild 2651 SHA256 80449d34567ca4a4f67b3771a99a4f2d515a726d8c7ad74f0e3172443aeef260 SHA512 4871b42e4aaa16cf635f85555f44ade4681380f91a6ab1706d8b7529881da0cdc492b628afce53fad18432eef9aa40f1e5cb9b3476d50c8bdca29da6f4abcbda WHIRLPOOL 9775768b37f90d57f017a38ec6392ccef00238707c31809a8ba9f84eca3883e46d495c3271392af6bbca098406c5f372bdfc5cec3b5817af066bdfb4269751f9
+EBUILD fbida-2.09-r1.ebuild 2490 SHA256 90d4cac50ab04155443cdc0f603588444c2c33962d87e9e80e2e36ff051ed21d SHA512 f9ed0c3ac343d5166ec34a0f959adaafc3365d3f6ac2f135248fa68574bf70531a2ff211bda9ffbabc604cae71392da83ba75e8370fd18d8b6f45345050e26f7 WHIRLPOOL 1047303c89e8ba52bcfe2ca020ad2d881c3500ce8f88ab20662623e3d470707def71fd5a31cf20eaf475e4cc0004d3734f81ea380b053651feacc977f8736455
 EBUILD fbida-2.09.ebuild 2591 SHA256 6392604bf77d6da568b5203d8dda369cb5cce58c67bf07dc03f65b0e20304f00 SHA512 70645e6de7d1135cfcfb1d894ef518fa83df081c301d73ad56ad0001831ba000edd002a743e6883ca595a3983d2ec94cd36c8ab093d1b41a2eadf58e46b685f5 WHIRLPOOL 01f4cb32ca92ae86aea6e10ff4bb546cef8f1a367ba55cf88f2baf0eb00ae640926772d9bf4e46436d18bd542518c68047c88784f5eceeaa1402a43eb41486aa
-MISC ChangeLog 13222 SHA256 bdd56ef12989cdfd7400aaad007d057b5ee9c7dfac23f4bfb0849ad919cef6fe SHA512 79273ba3df73b1e0ddc662a078f505637ab23a2e902f2c36f68d5cf4ac2981889e7a0ac34aba440dcbeb2a31da88e58e45c0909f1f275974e5c3a1174ce75b45 WHIRLPOOL f0b7623804cce5ac0e59db098a1af1a192429fe4327e1cb3e743305d83e5bf02653f137a31886ac9434ced957c28b6e1c3362e1dd6f4679163a8a12d3fc4664c
-MISC metadata.xml 196 SHA256 599d489eaeda79157559bc9f7ecdabec345da752748886b14ef461d4fd95bf4b SHA512 d09d812ff37949ddbd49ad24e7c10444c4205e4e8466bba88fb04a973065632160988df92dc5b1f4514b3800581c1afee799ce01533eb0dd09902aa592ffe1cb WHIRLPOOL c67c7b4c7b29362abb1195603ede1ffb02875eb10b33670cf48b94f5a8a84fb76865886f0a487496b8765ed5d340d01ea94095617179bb20bd3fb029262b9355
+MISC ChangeLog 13527 SHA256 290db92c8ca5de502716afd6c7de30644466d7c2b4f3e044bf2959d40177a85f SHA512 2562c65fc41d2a44c492372226603559dc4f75f5a8ced96d7620b8e4caa16a79f17f3770fa8f386772a3f125626de9b467f06f1801f1bed47aae9207b97178a9 WHIRLPOOL 4a2bb0617a050cf86c0683ca14458abfc1f010050c7ebdf67de37c30ec39bb9d86b15f15991409ae15eb6ac00462e32b62a344dd81015a6cac80f4c7e075c879
+MISC metadata.xml 409 SHA256 30adb8b77b731331a7981157faa6d76bb71beba7311635639ebfaf0d545af0c0 SHA512 48ddfb184fb23a70a73dcf9e3d5441fb0bf28956afea3eb69cacc1c4bf211a2571afdda83426c6be003b86ac9632acf14b87e9b518d0ed76e89a0b0a037b221e WHIRLPOOL cc8c6349745adb96e88a5e325ee37c170bee9055a3b2628ba2885cc53eb3e97f5dd3ae8b745c9385a0fbf37c219cc179cadb9ba80f3c1849c601b4e783ea8c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLC/egACgkQVWmRsqeSphPEJwCdFsbvLDGpW7ZlH8ZiW0imRilH
-FrYAn3/U9AqOmUILMdyjMGCYaiA4D7VT
-=C8dh
+iEYEAREIAAYFAlMHodMACgkQVWmRsqeSphPybgCfe7bPYlxuQ5MObWYDyOM5VuyR
+n+gAn1Zuk2v/s9ERvpmE2CE8upoGp6PS
+=MKod
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbida/fbida-2.09-r1.ebuild b/media-gfx/fbida/fbida-2.09-r1.ebuild
index fa5cc1b99beb..a7a14233d7b6 100644
--- a/media-gfx/fbida/fbida-2.09-r1.ebuild
+++ b/media-gfx/fbida/fbida-2.09-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r1.ebuild,v 1.1 2013/12/31 17:23:48 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r1.ebuild,v 1.2 2014/02/21 18:58:25 jer Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -12,45 +12,39 @@ SRC_URI="http://www.kraxel.org/releases/${PN}/${P}.tar.gz
 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"
+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-4.2 )
 	lirc? ( app-misc/lirc )
-	pdf? ( app-text/ghostscript-gpl media-libs/tiff )
 	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	imagemagick? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-	)
 	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
 	)
-	!media-gfx/fbi
-	>=media-libs/fontconfig-2.2
-	>=media-libs/freetype-2.0
-	media-libs/libexif
-	virtual/jpeg
-	virtual/ttf-fonts
 "
 
 DEPEND="
 	${RDEPEND}
 	X? ( x11-proto/xextproto x11-proto/xproto )
+	pdf? ( app-text/ghostscript-gpl )
 "
 
-pkg_setup() {
-	tc-export CC
-}
-
 src_prepare() {
 	sed -e 's:DGifOpenFileName,ungif:DGifOpenFileName,gif:' \
 		-e 's:-lungif:-lgif:' -i "${S}/GNUmakefile"
@@ -60,8 +54,10 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}"/ida-desktop.patch
-	epatch "${FILESDIR}"/${PN}-2.08-posix-make.patch
+	epatch "${FILESDIR}"/${PN}-2.09-make.patch
 	epatch "${FILESDIR}"/${P}-giflib-4.2.patch
+
+	tc-export CC CPP
 }
 
 src_configure() {
@@ -69,32 +65,28 @@ src_configure() {
 	# according to our specifications
 	emake Make.config
 
-	set_feat() {
+	gentoo_fbida() {
 		local useflag=${1}
 		local config=${2}
 
-		local option="yes"
-		if ! use ${useflag}; then
-			option="no"
-		fi
+		local option="no"
+		use ${useflag} && option="yes"
 
 		sed -i \
-			-e "s|${config}.*|${config} := ${option}|" \
+			-e "s|${config}.*|${config} := HAVE_${option}|" \
 			"${S}/Make.config" || die
 	}
 
-	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
+	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() {
@@ -110,9 +102,8 @@ src_install() {
 
 	dodoc README
 
-	if ! use pdf; then
+	use pdf || \
 		rm -f "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1
-	fi
 
 	if use X ; then
 		doicon "${WORKDIR}"/ida.png
diff --git a/media-gfx/fbida/files/fbida-2.09-make.patch b/media-gfx/fbida/files/fbida-2.09-make.patch
new file mode 100644
index 000000000000..61c19a3cfc72
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.09-make.patch
@@ -0,0 +1,36 @@
+--- a/GNUmakefile
++++ b/GNUmakefile
+@@ -30,8 +30,8 @@
+ 
+ ac_jpeg_ver = $(shell \
+ 	$(call ac_init,for libjpeg version);\
+-	$(call ac_s_cmd,echo -e '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
+-		| cpp | tail -n 1);\
++	$(call ac_s_cmd,printf '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
++		| $(CPP) | tail -n 1);\
+ 	$(call ac_fini))
+ 
+ define make-config
+--- a/mk/Autoconf.mk
++++ b/mk/Autoconf.mk
+@@ -24,7 +24,7 @@ ifneq ($(verbose),no)
+   ac_fini	= echo "... result is $${rc}" >&2; echo >&2; echo "$${rc}"
+ else
+   # normal
+-  ac_init	= echo -n "checking $(1) ... " >&2; rc=no
++  ac_init	= printf '%s' "checking $(1) ... " >&2; rc=no
+   ac_b_cmd	= $(1) >/dev/null 2>&1 && rc=yes
+   ac_s_cmd	= rc=`$(1) 2>/dev/null`
+   ac_fini	= echo "$${rc}" >&2; echo "$${rc}"
+@@ -162,7 +162,7 @@ config: Make.config
+ 	@true
+ 
+ Make.config: $(srcdir)/GNUmakefile
+-	@echo -e "$(make-config-q)" > $@
++	@printf '%b' "$(make-config-q)" > $@
+ 	@echo
+ 	@echo "Make.config written, edit if needed"
+ 	@echo
+-- 
+1.7.5.3
+
diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml
index 3fcf9a077c2a..99f7a4d11ad7 100644
--- a/media-gfx/fbida/metadata.xml
+++ b/media-gfx/fbida/metadata.xml
@@ -4,4 +4,9 @@
 <maintainer>
 <email>jer@gentoo.org</email>
 </maintainer>
+<use>
+<flag name='fbcon'>Install the framebuffer image viewer "fbi"</flag>
+<flag name='X'>Install the Motif based image viewer "ida"</flag>
+<flag name='webp'>Enable support for the WebP image format</flag>
+</use>
 </pkgmetadata>