diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2008-01-15 15:32:07 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2008-01-15 15:32:07 +0000 |
| commit | 91155b5363690f8c35af13dd97315d440a223c72 (patch) | |
| tree | b257996b0a4fba432cd488cf2c910ced566af1fd /media-gfx | |
| parent | sparc stable (diff) | |
| download | gentoo-2-91155b5363690f8c35af13dd97315d440a223c72.tar.gz gentoo-2-91155b5363690f8c35af13dd97315d440a223c72.tar.bz2 gentoo-2-91155b5363690f8c35af13dd97315d440a223c72.zip | |
Fix bug #205850.
(Portage version: 2.1.4)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/fbida/ChangeLog | 7 | ||||
| -rw-r--r-- | media-gfx/fbida/fbida-2.06.ebuild | 26 |
2 files changed, 18 insertions, 15 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/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 |