Added a dependency on libexif. Removed the dep on libungif in 1.31-r1.

Package-Manager: portage-2.0.51.19

5 files changed, 69 insertions, 16 deletions

diff --git a/media-gfx/fbi/ChangeLog b/media-gfx/fbi/ChangeLog
index 4e129ca05223..2ad4cc297371 100644
--- a/media-gfx/fbi/ChangeLog
+++ b/media-gfx/fbi/ChangeLog
@@ -1,8 +1,14 @@
 # ChangeLog for media-gfx/fbi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/ChangeLog,v 1.27 2005/03/08 00:58:54 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/ChangeLog,v 1.28 2005/03/23 14:24:18 spock Exp $
 
-  08 Mar 2005; Michael Januszewski <spock@gentoo.org> -fbi-1.25.ebuild,
+*fbi-1.31-r1 (23 Mar 2005)
+
+  23 Mar 2005; Michał Januszewski <spock@gentoo.org> fbi-1.31.ebuild,
+  +fbi-1.31-r1.ebuild:
+  Added a dependency on libexif. Removed the dep on libungif in 1.31-r1.
+
+  08 Mar 2005; Michał Januszewski <spock@gentoo.org> -fbi-1.25.ebuild,
   fbi-1.31.ebuild:
   Removed old ebuild. Added a block on media-gfx/fbida (bug #84417).
 
@@ -15,7 +21,7 @@
   22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> fbi-1.31.ebuild:
   Add ~alpha keyword.
 
-  17 Jan 2005; Michael Januszewski <spock@gentoo.org> fbi-1.31.ebuild:
+  17 Jan 2005; Michał Januszewski <spock@gentoo.org> fbi-1.31.ebuild:
   Added giflib to the dependencies as a fix for bug #78243.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
@@ -30,7 +36,7 @@
   23 Oct 2004; Simon Stelling <blubb@gentoo.org> fbi-1.31.ebuild:
   added ~amd64
 
-  20 Jul 2004; Michael Januszewski <spock@gentoo.org> -fbi-1.21-r1.ebuild,
+  20 Jul 2004; Michał Januszewski <spock@gentoo.org> -fbi-1.21-r1.ebuild,
   fbi-1.31.ebuild:
   Fixed SRC_URI, HOMEPAGE and DESCRIPTION, removed an old release that is no
   longer available for download.
@@ -41,23 +47,23 @@
   05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> fbi-1.25.ebuild:
   Stable on alpha.
 
-  13 Apr 2004; Michael Januszewski <spock@gentoo.org> fbi-1.21-r1.ebuild,
+  13 Apr 2004; Michał Januszewski <spock@gentoo.org> fbi-1.21-r1.ebuild,
   fbi-1.25.ebuild, fbi-1.31.ebuild:
   Fixed minor IUSE issues in all ebuilds.
 
   03 Apr 2004; Lars Weiler <pylon@gentoo.org> fbi-1.31.ebuild:
   stable on ppc
 
-  27 Mar 2004; Michael Januszewski <spock@gentoo.org> fbi-1.21-r1.ebuild,
+  27 Mar 2004; Michał Januszewski <spock@gentoo.org> fbi-1.21-r1.ebuild,
   fbi-1.21.ebuild, fbi-1.25.ebuild, fbi-1.29.ebuild, fbi-1.31.ebuild:
   Ebuild clean-ups.
 
 *fbi-1.31 (01 Mar 2004)
 
-  01 Mar 2004; Michael Januszewski <spock@gentoo.org> fbi-1.31.ebuild:
+  01 Mar 2004; Michał Januszewski <spock@gentoo.org> fbi-1.31.ebuild:
   Version bump, closes #43380.
 
-  18 Feb 2004; Michael Januszewski <spock@gentoo.org> fbi-1.29.ebuild:
+  18 Feb 2004; Michał Januszewski <spock@gentoo.org> fbi-1.29.ebuild:
   Marked stable on x86.
 
   15 Feb 2004; David Holm <dholm@gentoo.org> fbi-1.29.ebuild:
@@ -65,7 +71,7 @@
 
 *fbi-1.29 (26 Jan 2004)
 
-  26 Jan 2004; Michael Januszewski <spock@gentoo.org>
+  26 Jan 2004; Michał Januszewski <spock@gentoo.org>
   fbi-1.21-r1.ebuild, fbi-1.21.ebuild, fbi-1.25.ebuild, fbi-1.29.ebuild,
   metadata.xml:
   Version bump, added metadata.xml.
diff --git a/media-gfx/fbi/Manifest b/media-gfx/fbi/Manifest
index 3b8f3f42a5e7..902ac5fcb9b1 100644
--- a/media-gfx/fbi/Manifest
+++ b/media-gfx/fbi/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3143e01600f0fd0aac875b9276c92f39 fbi-1.31.ebuild 925
-MD5 5039c998df25e987c8e6cc7894ec6557 ChangeLog 3479
+MD5 3ddf1909805d9831b5f5ca81f953a8b2 fbi-1.31.ebuild 953
+MD5 ecd2d13b1face17d7454b41380817cec fbi-1.31-r1.ebuild 1077
+MD5 e6d512ab6cb71fc0a9ec6515cb474f4f ChangeLog 3675
 MD5 7fc77b947cec0d01897854f31eb34b31 metadata.xml 367
+MD5 9dde96dcd60bc6d7921ce3302e83a343 files/digest-fbi-1.31-r1 59
 MD5 9dde96dcd60bc6d7921ce3302e83a343 files/digest-fbi-1.31 59
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCLPhlchej4aZK9/cRAinYAJ4xhbONEZ99pJGX0aFhv7ZKQdu8WgCfQtlY
-Pg8NzNG+9xB5VBYD4IQfbU4=
-=HPMS
+iD8DBQFCQXw4chej4aZK9/cRAjFmAJ9OUAX0Opr6EWpRpqdczwOitYPL6gCffWs9
+tU9mM4fM30JGQX7xgcU6YlA=
+=QiYl
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/fbi/fbi-1.31-r1.ebuild b/media-gfx/fbi/fbi-1.31-r1.ebuild
new file mode 100644
index 000000000000..163ca3338f87
--- /dev/null
+++ b/media-gfx/fbi/fbi-1.31-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.31-r1.ebuild,v 1.1 2005/03/23 14:24:18 spock Exp $
+
+inherit gcc
+
+DESCRIPTION="A image viewer for the Linux framebuffer console."
+HOMEPAGE="http://linux.bytesex.org/fbida/"
+SRC_URI="http://dl.bytesex.org/releases/fbida/${P/-/_}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~hppa ~amd64 ~sparc ~ppc64 ~alpha"
+IUSE="png jpeg gif tiff curl lirc X"
+
+DEPEND="jpeg? ( >=media-libs/jpeg-6b )
+	png? ( media-libs/libpng )
+	gif? ( media-libs/giflib )
+	tiff? ( media-libs/tiff )
+	curl? ( net-misc/curl )
+	lirc? ( app-misc/lirc )
+	X? ( virtual/x11 )
+	<media-libs/libexif-0.6.10
+	!media-gfx/fbida"
+
+src_unpack() {
+	unpack ${A}
+	sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \
+	    -e 's/-lungif/-lgif/' -i ${S}/GNUmakefile
+}
+
+src_compile() {
+	export CFLAGS="${CFLAGS}"
+	make CC="$(gcc-getCC)" || die
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		mandir=${D}/usr/share/man \
+		install || die
+	dodoc README
+}
diff --git a/media-gfx/fbi/fbi-1.31.ebuild b/media-gfx/fbi/fbi-1.31.ebuild
index b3d9286b870c..d7fb8f0530ae 100644
--- a/media-gfx/fbi/fbi-1.31.ebuild
+++ b/media-gfx/fbi/fbi-1.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.31.ebuild,v 1.16 2005/03/08 00:58:54 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.31.ebuild,v 1.17 2005/03/23 14:24:18 spock Exp $
 
 inherit gcc
 
@@ -20,6 +20,7 @@ DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
 	X? ( virtual/x11 )
+	<media-libs/libexif-0.6.10
 	!media-gfx/fbida"
 
 src_compile() {
diff --git a/media-gfx/fbi/files/digest-fbi-1.31-r1 b/media-gfx/fbi/files/digest-fbi-1.31-r1
new file mode 100644
index 000000000000..d0803f0384ba
--- /dev/null
+++ b/media-gfx/fbi/files/digest-fbi-1.31-r1
@@ -0,0 +1 @@
+MD5 0f6c0423098c6a9b28a464df9fab7f39 fbi_1.31.tar.gz 92194