diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2010-09-06 18:42:42 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2010-09-06 18:42:42 +0000 |
| commit | a871746e36500db031b4c3422e06a6f777dd4284 (patch) | |
| tree | b652b217cd4a7ab6d5cdc2d02b254dd3e3467d32 /media-gfx | |
| parent | Revert back to ~arch wrt #330455. (diff) | |
| download | gentoo-2-a871746e36500db031b4c3422e06a6f777dd4284.tar.gz gentoo-2-a871746e36500db031b4c3422e06a6f777dd4284.tar.bz2 gentoo-2-a871746e36500db031b4c3422e06a6f777dd4284.zip | |
Convert to EAPI=2. Fix patch to respect LDFLAGS, fixing #336185.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/pngtoico/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch | 2 | ||||
| -rw-r--r-- | media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild | 32 |
3 files changed, 40 insertions, 2 deletions
diff --git a/media-gfx/pngtoico/ChangeLog b/media-gfx/pngtoico/ChangeLog index 66aad9c46cd7..ba9fb45db276 100644 --- a/media-gfx/pngtoico/ChangeLog +++ b/media-gfx/pngtoico/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/pngtoico # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.12 2010/01/07 22:32:36 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/ChangeLog,v 1.13 2010/09/06 18:42:42 graaff Exp $ + +*pngtoico-1.0.1-r1 (06 Sep 2010) + + 06 Sep 2010; Hans de Graaff <graaff@gentoo.org> +pngtoico-1.0.1-r1.ebuild, + files/pngtoico-1.0.1-Makefile.patch: + Convert to EAPI=2. Fix patch to respect LDFLAGS, fixing #336185. 07 Jan 2010; Christian Faulhammer <fauli@gentoo.org> pngtoico-1.0.1.ebuild: diff --git a/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch b/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch index 4350bb6359e9..77d86dc52446 100644 --- a/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch +++ b/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch @@ -8,7 +8,7 @@ -LDFLAGS = -s -LIBS = -lpng +CFLAGS += -fomit-frame-pointer `libpng-config --cflags` -+LDFLAGS = `libpng-config --ldflags` ++LDFLAGS += `libpng-config --ldflags` +LIBS = `libpng-config --libs` INSTALL = install INSTALL_EXEC = $(INSTALL) -c -m 755 diff --git a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild new file mode 100644 index 000000000000..1d53a2590a10 --- /dev/null +++ b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild,v 1.1 2010/09/06 18:42:42 graaff Exp $ + +EAPI=2 + +inherit eutils toolchain-funcs + +DESCRIPTION="Convert png images to MS ico format" +HOMEPAGE="http://www.kernel.org/pub/software/graphics/pngtoico/" +SRC_URI="mirror://kernel/software/graphics/pngtoico/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="" + +DEPEND="media-libs/libpng" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${P}-Makefile.patch" +} + +src_compile() { + emake CC="$(tc-getCC)" || die +} + +src_install() { + dobin pngtoico + doman pngtoico.1 +} |