QA: Cleanup, respect CFLAGS (bug 240794)

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

4 files changed, 17 insertions, 54 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/Manifest b/media-gfx/fbv/Manifest
index 9324fc06f0e9..c5976b73ba19 100644
--- a/media-gfx/fbv/Manifest
+++ b/media-gfx/fbv/Manifest
@@ -2,16 +2,14 @@
 Hash: SHA1
 
 AUX oob-segfault-fbv-1.0b.diff 559 RMD160 95ca87d8166bfdeae812aa3c9a69e7896f5130cf SHA1 3dc28bce9d372a380be76b58e1d44446820ad845 SHA256 ccc655a98fb41485d100178cf724fc7577c71bc571b227f25bf4921ebf601341
-DIST fbv-0.99.tar.gz 14466 RMD160 366cc9a639151774eb9d115038258c84d61fc2fd SHA1 8c3a033bc764d1499f804eeb3525302fc8c2d650 SHA256 15c661d8e9b12c53a4cb5f0f96c974d4c7d5e1389571d6143fe8ca2449e8cb4c
 DIST fbv-1.0b.tar.gz 18989 RMD160 d7b1c9542e8bcd38edf33a47fa87560716ef77d7 SHA1 96eb6d345286b50d32a985b7e447e2f9f7c96bed SHA256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c
-EBUILD fbv-0.99.ebuild 1061 RMD160 365ec2c22aa4df16011e4daa6d3f503d96aead38 SHA1 defd8deb3ab60712cd85fc6577ff96669ecd27c8 SHA256 e3725f82750ab57197fe5cacc1b599efb5cf522f57dfe861964e6c30de53fecc
-EBUILD fbv-1.0b.ebuild 1214 RMD160 b6c45e44a0be16b0fe36b2b68e844dda62629fe5 SHA1 8ad9f475f20d81c5ed6b2e2822adbd561302e261 SHA256 94c20b891b0103be25137554844dda5e92b43f9b29b476ec11f37053c81cccd1
-MISC ChangeLog 2060 RMD160 23529481176d3bbe21b88d62812668c1498d509b SHA1 d23f4dc4dcf64f3750bdf3ecd874aca66629d31e SHA256 20649afe286d4d2725cc9b5678f55470412c50af4244e99222354c866d5eff69
+EBUILD fbv-1.0b.ebuild 1260 RMD160 acc185c5852533ffca055c62fb250cf71d2c4220 SHA1 9e918b46fb232c3edddd8730d61ba1b5e99946d0 SHA256 124c06d8c65c17b24bbf3c457d44c2c2810626da8a191e98aa994a334da5bfd7
+MISC ChangeLog 2195 RMD160 15bc0fe853eaa99a499916d11111c0e31fb1b7cb SHA1 e7465424da96bdf96a8a7e8ce8bff3b3798f7aef SHA256 6e7dee1e571e2ae0b991e8a948f84c320b74ab53117292701dbda7ca00b7407f
 MISC metadata.xml 456 RMD160 98d8002443b6963a352b2038ba8f15d59677f38c SHA1 7df378f62714be2b915c0b1aa94a79b620e6712f SHA256 549ca92a02b621bd14dd7202390b22cbe0f392c539c30220245c00781ac87efe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk7vWkACgkQ67wieSYcaxeYMACgpL57XwnjfIO2qCEEztmo8a42
-LcAAniD/JhXyJz/SHEsqNwIyoC3WNMnu
-=Zzb9
+iEYEARECAAYFAklfaq0ACgkQKhnDs22gwa9zsQCfSkFSaPBRSE48JkuEemvSj0aV
+2usAoPX+yfyoOy2//di89jaNi4sKTgcM
+=HfAy
 -----END PGP SIGNATURE-----
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
 }