Added proper support for the 'pdf' USE flag (bug #120250).

Package-Manager: portage-2.1_pre4-r1

4 files changed, 99 insertions, 1 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index b3e0388374a9..18513af4423d 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.11 2006/01/24 16:31:38 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.12 2006/01/29 21:36:56 spock Exp $
+
+*fbida-2.03-r2 (29 Jan 2006)
+
+  29 Jan 2006; Michał Januszewski <spock@gentoo.org> +fbida-2.03-r2.ebuild:
+  Only install fbgs if the 'pdf' flag is enabled (bug #120250). Please note
+  that to be able to use fbgs, fbi has to be compiled with support for TIFF
+  images. Thus, the 'pdf' flag adds a dependency on media-libs/tiff.
 
   24 Jan 2006; Markus Rothe <corsair@gentoo.org> fbida-2.03-r1.ebuild:
   Added ~ppc64; bug #119923
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index e4dd4769c3fd..a16ebb6860de 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 273531b91e6370c77a0e65e336c3aed5 ChangeLog 2009
 RMD160 c7955e2ff371d7693465e5a65787c06b144414d7 ChangeLog 2009
 SHA256 43190260264722594aa45cb78a153acf79eb58dd7b266114397f911448759537 ChangeLog 2009
@@ -22,3 +25,10 @@ SHA256 799f41a2f2b9a0daea8119d9142a1e467ef8b9aa211a44c9d1081ad4b4d4283b files/di
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 metadata.xml 221
 SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e metadata.xml 221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD3TWnchej4aZK9/cRAqHRAJ9lRMT24ZXrjGImZlQZWRrUkjiISwCffCp9
+8jrezsX49Vp7Tbx5cxAXabM=
+=1dw+
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/fbida/fbida-2.03-r2.ebuild b/media-gfx/fbida/fbida-2.03-r2.ebuild
new file mode 100644
index 000000000000..ff0023a1a54a
--- /dev/null
+++ b/media-gfx/fbida/fbida-2.03-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.03-r2.ebuild,v 1.1 2006/01/29 21:36:56 spock Exp $
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
+IUSE="png jpeg gif tiff curl lirc X fbcon pdf"
+
+RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	png? ( media-libs/libpng )
+	gif? ( media-libs/giflib )
+	pdf? ( virtual/ghostscript media-libs/tiff )
+	tiff? ( media-libs/tiff )
+	curl? ( net-misc/curl )
+	lirc? ( app-misc/lirc )
+	X? ( || ( ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
+			virtual/x11 )
+		virtual/motif )
+	!media-gfx/fbi
+	media-libs/libexif
+	>=media-libs/freetype-2.0
+	>=media-libs/fontconfig-2.2"
+
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xextproto x11-proto/xproto )
+			virtual/x11 ) )"
+
+src_unpack() {
+	unpack ${A}
+	sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \
+	    -e 's/-lungif/-lgif/' -i ${S}/GNUmakefile
+}
+
+src_compile() {
+	# 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
+
+	emake || die
+}
+
+src_install() {
+	make \
+		DESTDIR=${D} \
+		prefix=/usr \
+		install || die
+	dodoc README
+
+	if ! use pdf; then
+		rm -f ${D}/usr/bin/fbgs ${D}/usr/share/man/man1/fbgs.1
+	fi
+}
diff --git a/media-gfx/fbida/files/digest-fbida-2.03-r2 b/media-gfx/fbida/files/digest-fbida-2.03-r2
new file mode 100644
index 000000000000..2a165f0ce84e
--- /dev/null
+++ b/media-gfx/fbida/files/digest-fbida-2.03-r2
@@ -0,0 +1 @@
+MD5 8fd76661686a38a7bcd251b7aadc73eb fbida-2.03.tar.gz 205955