Fix bug #205850.

Package-Manager: portage-2.1.4

3 files changed, 36 insertions, 23 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index f7b0492c1a28..609a1cf41ac1 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/fbida
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.40 2007/07/22 09:54:09 dberkholz Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.41 2008/01/15 15:32:07 spock Exp $
+
+  15 Jan 2008; Michał Januszewski <spock@gentoo.org> fbida-2.06.ebuild:
+  Fix bug #205850.
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; fbida-2.03-r4.ebuild,
   fbida-2.05.ebuild, fbida-2.06.ebuild:
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 3de69d2cce5f..1a63f563e343 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fbida-2.03-fbgs.patch 371 RMD160 942f4eed3fcde7d98776d289427adc461d43aad2 SHA1 f51e6d1b36ae888f7151919bfd7b829541c00d2a SHA256 d55ce254f37ad104a17c49d3d40d92726b3f9131e5221795e10660edcfe50820
 MD5 77f2d2a9e9fbc765f318ae88e910efe0 files/fbida-2.03-fbgs.patch 371
 RMD160 942f4eed3fcde7d98776d289427adc461d43aad2 files/fbida-2.03-fbgs.patch 371
@@ -17,14 +20,14 @@ EBUILD fbida-2.05.ebuild 2380 RMD160 e0a4bd2f7972298139e2f07bbe4e3c778e7e5e0d SH
 MD5 34a766c86b23583b86edc44aa7474528 fbida-2.05.ebuild 2380
 RMD160 e0a4bd2f7972298139e2f07bbe4e3c778e7e5e0d fbida-2.05.ebuild 2380
 SHA256 cc87b40248b8aee0578dd6feead35e349d831fe32dad361f821e9d7a08e12745 fbida-2.05.ebuild 2380
-EBUILD fbida-2.06.ebuild 2388 RMD160 6c8be7cfadd04dee9c0a8e7d75a2e9878ce3d825 SHA1 bfaf5f302499a45a923431e572564942ef26d78d SHA256 e468108aa6c55c0829070e73e7c0198abb3272c8f70624a5f58fa73ef31f7318
-MD5 81e3724ecfc6342e5ba5839757346e0a fbida-2.06.ebuild 2388
-RMD160 6c8be7cfadd04dee9c0a8e7d75a2e9878ce3d825 fbida-2.06.ebuild 2388
-SHA256 e468108aa6c55c0829070e73e7c0198abb3272c8f70624a5f58fa73ef31f7318 fbida-2.06.ebuild 2388
-MISC ChangeLog 5457 RMD160 94ec961bb172ea4b4d134d65d97436a62653cbff SHA1 c0b16d5c51d4bd2afa4169f61a90a8804071797d SHA256 55e1e9603f23bd6e6a2f768b904c19bf701ef3ef6f8ef78d61bfb9d56df396ee
-MD5 ce813ceb570a4a7274ac75c55b53b07d ChangeLog 5457
-RMD160 94ec961bb172ea4b4d134d65d97436a62653cbff ChangeLog 5457
-SHA256 55e1e9603f23bd6e6a2f768b904c19bf701ef3ef6f8ef78d61bfb9d56df396ee ChangeLog 5457
+EBUILD fbida-2.06.ebuild 2387 RMD160 7976154dd740de458cfaff2e78a6e5281db6f3b2 SHA1 62e6f053da8020463538a46b9e61a01333446c85 SHA256 87b90ecc57da24a19ba6178cd9f41945deb131f15b85bebf2fd26881f6a64a5c
+MD5 c2e77fc071eb139ce9495b72664ea000 fbida-2.06.ebuild 2387
+RMD160 7976154dd740de458cfaff2e78a6e5281db6f3b2 fbida-2.06.ebuild 2387
+SHA256 87b90ecc57da24a19ba6178cd9f41945deb131f15b85bebf2fd26881f6a64a5c fbida-2.06.ebuild 2387
+MISC ChangeLog 5546 RMD160 5d7cbb27c1fc38ece496518799d731507644ba39 SHA1 b86b87c29a1afeaba1f83a1a5f3234145f5338ca SHA256 d017bdc569e6b939d8d6599497655b2a18f454ec0217931a7bc91b4f249e566a
+MD5 872025550a68354dc04af984e55dce25 ChangeLog 5546
+RMD160 5d7cbb27c1fc38ece496518799d731507644ba39 ChangeLog 5546
+SHA256 d017bdc569e6b939d8d6599497655b2a18f454ec0217931a7bc91b4f249e566a ChangeLog 5546
 MISC metadata.xml 221 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 SHA1 f35d1b1858e1223f4dc7b2c03fdf17e50091f1ca SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e
 MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 metadata.xml 221
@@ -38,3 +41,10 @@ SHA256 690425ca41453cb44146960b094ccae704ede6d74b73379fae6e17f230437991 files/di
 MD5 d3269cc21720cc568b4cb3b53e0619d4 files/digest-fbida-2.06 232
 RMD160 7ea9cce56e1866751a71f165385372c05c6d4704 files/digest-fbida-2.06 232
 SHA256 8f2ab2ab711038a08ed528a657d42ca24e38001c4da17cdb5e589c21088857f0 files/digest-fbida-2.06 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHjNIBchej4aZK9/cRApg7AJ9EjDrAg4Szw8B+0MnqGSaIZKaf7wCeNRMS
+BlzdR7AN6BCXgHXpxmrbRNU=
+=9M+/
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/fbida/fbida-2.06.ebuild b/media-gfx/fbida/fbida-2.06.ebuild
index 18f719b7f8aa..c5a7305f9b95 100644
--- a/media-gfx/fbida/fbida-2.06.ebuild
+++ b/media-gfx/fbida/fbida-2.06.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.06.ebuild,v 1.3 2007/07/22 09:54:09 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.06.ebuild,v 1.4 2008/01/15 15:32:07 spock Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,10 +11,9 @@ SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="png jpeg gif tiff curl lirc X fbcon pdf"
+IUSE="png gif tiff curl lirc X fbcon pdf"
 
-RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
-	png? ( media-libs/libpng )
+RDEPEND="png? ( media-libs/libpng )
 	gif? ( media-libs/giflib )
 	pdf? ( virtual/ghostscript media-libs/tiff )
 	tiff? ( media-libs/tiff )
@@ -26,6 +25,7 @@ RDEPEND="jpeg? ( >=media-libs/jpeg-6b )
 		virtual/motif
 	)
 	!media-gfx/fbi
+	>=media-libs/jpeg-6b
 	media-libs/libexif
 	>=media-libs/freetype-2.0
 	>=media-libs/fontconfig-2.2
@@ -36,18 +36,18 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \
-	    -e 's/-lungif/-lgif/' -i ${S}/GNUmakefile
+	    -e 's/-lungif/-lgif/' -i "${S}/GNUmakefile"
 
 	if [[ `gcc-major-version` -lt 4 ]]; then
-		sed	-e 's/-Wno-pointer-sign//' -i ${S}/GNUmakefile
+		sed	-e 's/-Wno-pointer-sign//' -i "${S}/GNUmakefile"
 	fi
 
 	# We don't want the binaries to be stripped automatically.
-	sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' ${S}/mk/Variables.mk
+	sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' "${S}/mk/Variables.mk"
 
-	epatch ${FILESDIR}/fbida-2.05-asmpage-fix.patch
+	epatch "${FILESDIR}/fbida-2.05-asmpage-fix.patch"
 }
 
 src_compile() {
@@ -64,7 +64,7 @@ src_compile() {
 			option="no"
 		fi
 
-		sed -e "s/${config}.*/${config} := ${option}/" -i ${S}/Make.config
+		sed -e "s/${config}.*/${config} := ${option}/" -i "${S}/Make.config"
 	}
 
 	set_feat fbcon 	HAVE_LINUX_FB_H
@@ -83,13 +83,13 @@ src_compile() {
 
 src_install() {
 	make \
-		DESTDIR=${D} \
+		DESTDIR="${D}" \
 		prefix=/usr \
 		install || die
 	dodoc README
 
 	if ! use pdf; then
-		rm -f ${D}/usr/bin/fbgs ${D}/usr/share/man/man1/fbgs.1
+		rm -f "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1
 	fi
 
 	if use X ; then