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>

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 77d86dc524460823ec97f4b05f7cc9e334fbc0bb..22fb79fe7aaa53c6d91c98bd5322708f93199ed8 100644 (file)
--- 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 c81b25ade62733b6c0b07fcb63d803670cb4b01c..616e181e264c8a6546fd77608e86092da3cfc3da 100644 (file)
--- 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 882109dd88e5e4da8863deaa15f7fd63ac6d1f86..ed2c5e757a468b6198f9704e3a4d73721b739d12 100644 (file)
--- 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() {