QA: Cleanup, respect CFLAGS (bug 240794)

(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)

3 files changed, 12 insertions, 47 deletions

diff --git a/media-gfx/fbv/ChangeLog b/media-gfx/fbv/ChangeLog
index d837502473d3..56679120cb48 100644
--- a/media-gfx/fbv/ChangeLog
+++ b/media-gfx/fbv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbv
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.15 2008/05/11 07:36:41 solar Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.16 2009/01/03 13:39:49 angelos Exp $
+
+  03 Jan 2009; Christoph Mende <angelos@gentoo.org> -fbv-0.99.ebuild,
+  fbv-1.0b.ebuild:
+  QA: Cleanup, respect CFLAGS (bug 240794)
 
   11 May 2008; <solar@gentoo.org> fbv-1.0b.ebuild:
   - keyworded for ~arm
diff --git a/media-gfx/fbv/fbv-0.99.ebuild b/media-gfx/fbv/fbv-0.99.ebuild
deleted file mode 100644
index 9f389e0eb8de..000000000000
--- a/media-gfx/fbv/fbv-0.99.ebuild
+++ /dev/null
@@ -1,39 +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/fbv/fbv-0.99.ebuild,v 1.9 2005/07/20 10:00:29 dragonheart Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="simple program to view pictures on a linux framebuffer device"
-HOMEPAGE="http://s-tech.elsat.net.pl/fbv/"
-SRC_URI="http://s-tech.elsat.net.pl/fbv/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc64"
-IUSE="png gif jpeg"
-
-DEPEND="gif? ( media-libs/giflib )
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )"
-
-src_compile() {
-	local myconf
-	sed -e 's/-lungif/-lgif/g' -i Makefile -i configure
-	use png || myconf="${myconf} --without-libpng"
-	use gif || myconf="${myconf} --without-libungif"
-	use jpeg || myconf="${myconf} --without-libjpeg"
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		${myconf} || die "econf failed"
-
-	emake CC="$(tc-getCC) ${CFLAGS}" || die
-}
-
-src_install() {
-	dobin fbv || die
-	doman fbv.1
-	dodoc ChangeLog README TODO VERSION
-}
diff --git a/media-gfx/fbv/fbv-1.0b.ebuild b/media-gfx/fbv/fbv-1.0b.ebuild
index 1d4e279ccf73..d11e7c331b61 100644
--- a/media-gfx/fbv/fbv-1.0b.ebuild
+++ b/media-gfx/fbv/fbv-1.0b.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.11 2008/12/07 12:11:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.12 2009/01/03 13:39:49 angelos Exp $
 
 inherit toolchain-funcs eutils
 
 DESCRIPTION="simple program to view pictures on a linux framebuffer device"
 HOMEPAGE="http://freshmeat.net/projects/fbv/"
-SRC_URI="http://s-tech.elsat.net.pl/fbv/${P}.tar.gz"
+SRC_URI="http://s-tech.elsat.net.pl/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,12 +34,12 @@ src_compile() {
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		${myconf} || die "econf failed"
-	emake CC="$(tc-getCC) ${CFLAGS}" || die
+		${myconf} || die "configure failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dobin fbv || die
+	dobin fbv || die "dobin failed"
 	doman fbv.1
 	dodoc ChangeLog README TODO VERSION
 }