- make cross compile aware and keyword ~arm

(Portage version: 2.1.4.4)

3 files changed, 55 insertions, 14 deletions

diff --git a/media-gfx/fblogo/ChangeLog b/media-gfx/fblogo/ChangeLog
index c79d884df3e3..3e1e0a05cbf3 100644
--- a/media-gfx/fblogo/ChangeLog
+++ b/media-gfx/fblogo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/fblogo
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fblogo/ChangeLog,v 1.10 2006/09/16 16:53:51 spock Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fblogo/ChangeLog,v 1.11 2008/09/21 06:53:32 solar Exp $
+
+  21 Sep 2008; <solar@gentoo.org> +files/fblogo-0.5.2-cross.patch,
+  fblogo-0.5.2.ebuild:
+  - make cross compile aware and keyword ~arm
+
+  23 May 2008; <solar@gentoo.org> fblogo-0.5.2.ebuild:
+  - keywords ~arm ~amd64
 
   16 Sep 2006; Michał Januszewski <spock@gentoo.org> -fblogo-0.5.0.ebuild,
   -fblogo-0.5.1.ebuild, fblogo-0.5.2.ebuild:
diff --git a/media-gfx/fblogo/fblogo-0.5.2.ebuild b/media-gfx/fblogo/fblogo-0.5.2.ebuild
index 7769457f5e23..0cdde8a25893 100644
--- a/media-gfx/fblogo/fblogo-0.5.2.ebuild
+++ b/media-gfx/fblogo/fblogo-0.5.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 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/fblogo/fblogo-0.5.2.ebuild,v 1.6 2006/09/16 16:53:51 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fblogo/fblogo-0.5.2.ebuild,v 1.7 2008/09/21 06:53:32 solar Exp $
+
+inherit eutils toolchain-funcs
 
 IUSE=""
 
@@ -10,7 +12,7 @@ SRC_URI="http://freakzone.net/gordon/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~sparc x86"
+KEYWORDS="~arm ~ppc ~sparc x86"
 
 DEPEND=">=sys-apps/sed-4
 	media-libs/libpng
@@ -18,20 +20,16 @@ DEPEND=">=sys-apps/sed-4
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "s:/usr/local:/usr:g" \
-		-e "s:^install\:$:install\:\n\
-		mkdir -p \${DESTDIR}\${PREFIX}\n\
-		mkdir -p \${DESTDIR}\${BINDIR}\n\
-		mkdir -p \${DESTDIR}\${MANDIR}/man1:" Makefile
+	cd "${S}"
+	epatch "${FILESDIR}"/fblogo-0.5.2-cross.patch
 }
 
 src_compile() {
-	emake || die
+	tc-export CC
+	emake CC="${CC}" || die
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die
 	dodoc README CHANGES
 }
diff --git a/media-gfx/fblogo/files/fblogo-0.5.2-cross.patch b/media-gfx/fblogo/files/fblogo-0.5.2-cross.patch
new file mode 100644
index 000000000000..dfcb2871a347
--- /dev/null
+++ b/media-gfx/fblogo/files/fblogo-0.5.2-cross.patch
@@ -0,0 +1,36 @@
+--- Makefile	2003-09-28 10:33:24.000000000 +0000
++++ Makefile	2008-05-18 19:05:12.000000000 +0000
+@@ -1,24 +1,28 @@
+-CC     = gcc
++CC     ?= gcc
+ LIBS   = -lpng -lz -lm
+-CFLAGS = -g -O2 -W -Wall -DPNG_SETJMP_NOT_SUPPORTED
+-
++CFLAGS ?= -g -O2 -W -Wall
++CFLAGS += -DPNG_SETJMP_NOT_SUPPORTED
++LDFLAGS =
+ INSTALL = /usr/bin/install
+ INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
+ INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
+ INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
+ 
+ DESTDIR =
+-PREFIX = /usr/local
++PREFIX = /usr
+ BINDIR = ${PREFIX}/bin
+ MANDIR = ${PREFIX}/share/man
+ 
+ fblogo:	fblogo.c
+-	$(CC) -o fblogo $(CFLAGS) $(INCLUDES) $(LIBS) fblogo.c
++	$(CC) -o fblogo $(CFLAGS) $(INCLUDES) $(LDFLAGS) $(LIBS) fblogo.c
+ 
+ clean::
+ 	-rm -f *.o fblogo
+ 
+ install:
++	mkdir -p ${DESTDIR}${PREFIX}
++	mkdir -p ${DESTDIR}${BINDIR}
++	mkdir -p ${DESTDIR}${MANDIR}/man1
+ 	${INSTALL_PROGRAM} fblogo   ${DESTDIR}${BINDIR}
+ 	${INSTALL_SCRIPT} fblogo_patch   ${DESTDIR}${BINDIR}
+ 	${INSTALL_FILE}    fblogo.1 ${DESTDIR}${MANDIR}/man1