diff options
| author |   David Seifert <soap@gentoo.org> | 2019-12-13 16:07:16 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2019-12-13 16:07:16 +0100 |
| commit | 995a80b921540c0bf2816113c67a71ba22706134 (patch) | |
| tree | f1490cc4326a2735348d6c99ba0ccc1573e00aa1 | |
| parent | media-gfx/tif22pnm: Port to EAPI 7 (diff) | |
| download | gentoo-995a80b921540c0bf2816113c67a71ba22706134.tar.gz gentoo-995a80b921540c0bf2816113c67a71ba22706134.tar.bz2 gentoo-995a80b921540c0bf2816113c67a71ba22706134.zip | |
media-gfx/pngtoico: Port to EAPI 7
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap@gentoo.org>
| -rw-r--r-- | media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch | 22 | ||||
| -rw-r--r-- | media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch | 4 | ||||
| -rw-r--r-- | media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild | 23 |
3 files changed, 28 insertions, 21 deletions
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 77d86dc52446..22fb79fe7aaa 100644 --- a/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch +++ b/media-gfx/pngtoico/files/pngtoico-1.0.1-Makefile.patch @@ -1,15 +1,23 @@ ---- Makefile 2002-01-01 22:46:46.000000000 +0000 -+++ Makefile.new 2002-11-11 01:11:12.000000000 +0000 -@@ -21,9 +21,9 @@ +--- a/Makefile ++++ b/Makefile +@@ -20,10 +20,9 @@ + mandir = $(prefix)/man man1dir = $(mandir)/man1 - CC = gcc -W -Wall +-CC = gcc -W -Wall -CFLAGS = -O2 -fomit-frame-pointer -LDFLAGS = -s -LIBS = -lpng -+CFLAGS += -fomit-frame-pointer `libpng-config --cflags` -+LDFLAGS += `libpng-config --ldflags` -+LIBS = `libpng-config --libs` ++CFLAGS += `libpng-config --cflags` -Wall ++LDFLAGS += `libpng-config --ldflags` ++LDLIBS += `libpng-config --libs` INSTALL = install INSTALL_EXEC = $(INSTALL) -c -m 755 INSTALL_DATA = $(INSTALL) -c -m 644 +@@ -40,6 +39,3 @@ + mkdir -p $(INSTALLROOT)$(bindir) $(INSTALLROOT)$(man1dir) + $(INSTALL_EXEC) pngtoico $(INSTALLROOT)$(bindir) + $(INSTALL_DATA) pngtoico.1 $(INSTALLROOT)$(man1dir) +- +-pngtoico: pngtoico.c +- $(CC) $(CFLAGS) $(LDFLAGS) -o pngtoico pngtoico.c $(LIBS) diff --git a/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch b/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch index c81b25ade627..616e181e264c 100644 --- a/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch +++ b/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch @@ -1,5 +1,5 @@ ---- pngtoico.c -+++ pngtoico.c +--- a/pngtoico.c ++++ b/pngtoico.c @@ -188,7 +188,7 @@ goto perrexit; } diff --git a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild index 882109dd88e5..ed2c5e757a46 100644 --- a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild +++ b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="Convert png images to MS ico format" HOMEPAGE="https://www.kernel.org/pub/software/graphics/pngtoico/" @@ -11,19 +12,17 @@ SRC_URI="https://www.kernel.org/pub/software/graphics/pngtoico/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" -RDEPEND=">=media-libs/libpng-1.4" +RDEPEND="media-libs/libpng:=" DEPEND="${RDEPEND}" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-Makefile.patch \ - "${FILESDIR}"/${P}-libpng15.patch -} +PATCHES=( + "${FILESDIR}"/${P}-Makefile.patch + "${FILESDIR}"/${P}-libpng15.patch +) -src_compile() { - emake CC="$(tc-getCC)" +src_configure() { + tc-export CC } src_install() { |