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.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key A792A613)

4 files changed, 82 insertions, 44 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/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>