fixup, install missing bin + manpage

5 files changed, 15 insertions, 91 deletions

diff --git a/media-gfx/fbi/fbi-1.11.ebuild b/media-gfx/fbi/fbi-1.11.ebuild
index 86363afd30eb..a4b36b12947b 100644
--- a/media-gfx/fbi/fbi-1.11.ebuild
+++ b/media-gfx/fbi/fbi-1.11.ebuild
@@ -1,38 +1,37 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.11.ebuild,v 1.1 2001/10/17 17:38:11 ryan Exp $
 
-A=fbi_1.11.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="fbi a framebuffer image viewer"
-SRC_URI="http://www.strusel007.de/linux/misc/"${A}
+SRC_URI="http://www.strusel007.de/linux/misc/`echo ${P} |sed -e 's:-:_:'`.tar.gz"
 HOMEPAGE="http://www.strusel007.de/linux/fbi.html"
 
 DEPEND=">=media-libs/jpeg-6b"
 
-src_unpack() {
 
-  unpack ${A}
-  cd ${S}/src
-  cp Makefile Makefile.orig
-  sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-  cd ${S}/libpcd
-  cp Makefile Makefile.orig
-  sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+src_unpack() {
 
+	unpack ${A}
+	
+	cd ${S}/src
+	sed -e "s:-O2:${CFLAGS}:" Makefile |cat >Makefile
+	
+	cd ${S}/libpcd
+	sed -e "s:-O2:${CFLAGS}:" Makefile |cat >Makefile
 }
 
 src_compile() {
 
-	try make CC=gcc
-
+	make CC=gcc || die
 }
 
 src_install() {
 
-	dodoc README
-	dobin src/fbi
-	newman src/fbi.man fbi.1
+	make prefix=${D}/usr						\
+	     mandir=${D}/usr/share/man/man1				\
+	     install || die
+	
+	dodoc COPYING README
 
 }
diff --git a/media-gfx/fbi/fbi-1.7.ebuild b/media-gfx/fbi/fbi-1.7.ebuild
deleted file mode 100644
index 566fa6c65352..000000000000
--- a/media-gfx/fbi/fbi-1.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.7.ebuild,v 1.2 2001/05/29 17:28:19 achim Exp $
-
-A=fbi_1.7.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="fbi a framebuffer image viewer"
-SRC_URI="http://www.strusel007.de/linux/misc/"${A}
-HOMEPAGE="http://www.strusel007.de/linux/fbi.html"
-
-DEPEND=">=media-libs/jpeg-6b"
-
-src_unpack() {
-  unpack ${A}
-  cd ${S}/src
-  cp Makefile Makefile.orig
-  sed -e "s:-O2:$CFLAGS:" Makefile.orig > Makefile
-  cd ${S}/libpcd
-  cp Makefile Makefile.orig
-  sed -e "s:-O2:$CFLAGS:" Makefile.orig > Makefile
-
-}
-
-src_compile() {
-
-	try make
-}
-
-src_install() {
-
-	dodoc README
-	dobin src/fbi
-	newman src/fbi.man fbi.1
-}
diff --git a/media-gfx/fbi/fbi-1.8.ebuild b/media-gfx/fbi/fbi-1.8.ebuild
deleted file mode 100644
index 308445f859c9..000000000000
--- a/media-gfx/fbi/fbi-1.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ryan Tolboom <ryan@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbi/fbi-1.8.ebuild,v 1.1 2001/06/01 18:53:48 ryan Exp $
-
-A=fbi_1.8.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="fbi a framebuffer image viewer"
-SRC_URI="http://www.strusel007.de/linux/misc/"${A}
-HOMEPAGE="http://www.strusel007.de/linux/fbi.html"
-
-DEPEND=">=media-libs/jpeg-6b"
-
-src_unpack() {
-
-  unpack ${A}
-  cd ${S}/src
-  cp Makefile Makefile.orig
-  sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-  cd ${S}/libpcd
-  cp Makefile Makefile.orig
-  sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-
-}
-
-src_compile() {
-
-	try make CC=gcc
-
-}
-
-src_install() {
-
-	dodoc README
-	dobin src/fbi
-	newman src/fbi.man fbi.1
-
-}
diff --git a/media-gfx/fbi/files/digest-fbi-1.7 b/media-gfx/fbi/files/digest-fbi-1.7
deleted file mode 100644
index 0371453a7d2a..000000000000
--- a/media-gfx/fbi/files/digest-fbi-1.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 60bc9651a7d9888c392864c1aa3cb3ad fbi_1.7.tar.gz
diff --git a/media-gfx/fbi/files/digest-fbi-1.8 b/media-gfx/fbi/files/digest-fbi-1.8
deleted file mode 100644
index a98dbe5ab789..000000000000
--- a/media-gfx/fbi/files/digest-fbi-1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c410eadae55eec9b25e6d150a219cd0a fbi_1.8.tar.gz