diff options
| -rw-r--r-- | media-gfx/fblogo/ChangeLog | 11 | ||||
| -rw-r--r-- | media-gfx/fblogo/Manifest | 5 | ||||
| -rw-r--r-- | media-gfx/fblogo/fblogo-0.5.2.ebuild | 22 | ||||
| -rw-r--r-- | media-gfx/fblogo/files/fblogo-0.5.2-cross.patch | 36 |
4 files changed, 58 insertions, 16 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/Manifest b/media-gfx/fblogo/Manifest index c7cfc2faa185..cee18b68f81e 100644 --- a/media-gfx/fblogo/Manifest +++ b/media-gfx/fblogo/Manifest @@ -1,4 +1,5 @@ +AUX fblogo-0.5.2-cross.patch 1060 RMD160 5e32da3a212b51b83237fccced3ca3758e6b27bb SHA1 cfd9ceed7acefb5d0f2fb98349547cb985fa75a7 SHA256 cdd1792ff631e44c5aea3b58d5239ce5d27cd7681a38cf421cf0b48c81d0b4c4 DIST fblogo-0.5.2.tar.gz 21874 RMD160 bddd94f48f2ec543e6a18931024c9f23a3a32ef0 SHA1 634333694777cacfa5ce4d06a629701d496fff4a SHA256 409d3aaaaddd6a8d22a661c68cad3283c969ed33fabe357df60fb37ab8bfae1e -EBUILD fblogo-0.5.2.ebuild 842 RMD160 6f9d69884b8c6645520d21576085d04b4927f33b SHA1 0feb24667d5245ba2687775d4c393535e55ac0f9 SHA256 3bdd58d9a64b461f9a7861c7d487d5e97480aee7103b3b5ae55b0848b133a11c -MISC ChangeLog 1491 RMD160 c934797344533093850266c9980fdd85ba45fa76 SHA1 34479cdcd3be37ed4f20af9e90d7998fe4e300a7 SHA256 437c0fc63e8ff7a57aec6e391b773896c6c8225630bcfa73e677b38d32741a8b +EBUILD fblogo-0.5.2.ebuild 762 RMD160 b6e4bc471bc58f7c2ad21ba5214cb855a90cde5a SHA1 a879207120474f88ad62083371e52721ee8eef52 SHA256 11363a400c7b3b8eea947c387b6b928f2d0f53fd12deaef4c960fceede28a56a +MISC ChangeLog 1709 RMD160 783983ded81d1bb2dde17cf83156fdb8e129c84a SHA1 76469cd6d46207adaafd95f7f5489fdfbfe749eb SHA256 e8cd8095994329a58a8a9c53b3e114b8243da23b3e7beb31ff6850702d3841fc MISC metadata.xml 398 RMD160 afbc5091da33f0902f86d1622e63c6a75a988092 SHA1 26e4d50e62d4165df33602ed73a14a526919c48a SHA256 332dd86abf8c01cfdbbf4012d8ccc1f5c4de399a40409b17e14d3e4d38d9f12d 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 |