Added a fix for #84417. Removed old ebuild.

(Portage version: 2.0.51.19)

4 files changed, 15 insertions, 39 deletions

diff --git a/media-gfx/fbi/ChangeLog b/media-gfx/fbi/ChangeLog
index d7b49cc26086..4e129ca05223 100644
--- a/media-gfx/fbi/ChangeLog
+++ b/media-gfx/fbi/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2005/02/07 22:19:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/ChangeLog,v 1.27 2005/03/08 00:58:54 spock Exp $
+
+  08 Mar 2005; Michael Januszewski <spock@gentoo.org> -fbi-1.25.ebuild,
+  fbi-1.31.ebuild:
+  Removed old ebuild. Added a block on media-gfx/fbida (bug #84417).
 
   07 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> fbi-1.31.ebuild:
   Stable on alpha.
@@ -11,7 +15,7 @@
   22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> fbi-1.31.ebuild:
   Add ~alpha keyword.
 
-  17 Jan 2005; Michal Januszewski <spock@gentoo.org> fbi-1.31.ebuild:
+  17 Jan 2005; Michael 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> :
@@ -26,7 +30,7 @@
   23 Oct 2004; Simon Stelling <blubb@gentoo.org> fbi-1.31.ebuild:
   added ~amd64
 
-  20 Jul 2004; Michal Januszewski <spock@gentoo.org> -fbi-1.21-r1.ebuild,
+  20 Jul 2004; Michael 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.
@@ -37,23 +41,23 @@
   05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> fbi-1.25.ebuild:
   Stable on alpha.
 
-  13 Apr 2004; Michal Januszewski <spock@gentoo.org> fbi-1.21-r1.ebuild,
+  13 Apr 2004; Michael 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; Michal Januszewski <spock@gentoo.org> fbi-1.21-r1.ebuild,
+  27 Mar 2004; Michael 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; Michal Januszewski <spock@gentoo.org> fbi-1.31.ebuild:
+  01 Mar 2004; Michael Januszewski <spock@gentoo.org> fbi-1.31.ebuild:
   Version bump, closes #43380.
 
-  18 Feb 2004; Michal Januszewski <spock@gentoo.org> fbi-1.29.ebuild:
+  18 Feb 2004; Michael Januszewski <spock@gentoo.org> fbi-1.29.ebuild:
   Marked stable on x86.
 
   15 Feb 2004; David Holm <dholm@gentoo.org> fbi-1.29.ebuild:
@@ -61,7 +65,7 @@
 
 *fbi-1.29 (26 Jan 2004)
 
-  26 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org>
+  26 Jan 2004; Michael 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/fbi-1.25.ebuild b/media-gfx/fbi/fbi-1.25.ebuild
deleted file mode 100644
index c41b7678811c..000000000000
--- a/media-gfx/fbi/fbi-1.25.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.25.ebuild,v 1.13 2005/01/17 19:20:28 spock Exp $
-
-DESCRIPTION="fbi a framebuffer image viewer"
-HOMEPAGE="http://bytesex.org/fbi.html"
-SRC_URI="http://bytesex.org/misc/${P/-/_}.tar.gz"
-
-IUSE=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 alpha hppa"
-
-DEPEND=">=media-libs/jpeg-6b"
-
-src_compile() {
-	export CFLAGS="${CFLAGS}"
-	make CC=gcc || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		install || die
-
-	dodoc COPYING README
-}
diff --git a/media-gfx/fbi/fbi-1.31.ebuild b/media-gfx/fbi/fbi-1.31.ebuild
index 188fb3169025..b3d9286b870c 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.15 2005/02/07 22:19:15 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.31.ebuild,v 1.16 2005/03/08 00:58:54 spock Exp $
 
 inherit gcc
 
@@ -19,7 +19,8 @@ DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	tiff? ( media-libs/tiff )
 	curl? ( net-misc/curl )
 	lirc? ( app-misc/lirc )
-	X? ( virtual/x11 )"
+	X? ( virtual/x11 )
+	!media-gfx/fbida"
 
 src_compile() {
 	export CFLAGS="${CFLAGS}"
diff --git a/media-gfx/fbi/files/digest-fbi-1.25 b/media-gfx/fbi/files/digest-fbi-1.25
deleted file mode 100644
index 5c3ed051e963..000000000000
--- a/media-gfx/fbi/files/digest-fbi-1.25
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2e5aa653b778909fdcc05f0d67468991 fbi_1.25.tar.gz 68820