gentoo resync : 15.12.2019

4 files changed, 31 insertions, 24 deletions

diff --git a/media-gfx/pngtoico/Manifest b/media-gfx/pngtoico/Manifest
index 1b0ead29b9b9..8fd6c72eb58e 100644
--- a/media-gfx/pngtoico/Manifest
+++ b/media-gfx/pngtoico/Manifest
@@ -1,5 +1,5 @@
-AUX pngtoico-1.0.1-Makefile.patch 467 BLAKE2B 7f8e68c8f2469b86da5396da2bffbb9bbe23419660b0ba05df6b2eb6892ed4559fa3a976f2071753074ef7c1197119767e4ea450b8831f11ca0c2784cc796b2b SHA512 e8658146be6b61046a4154a4282897df0bf9336ca5c536a383ca5d80487a849ef972fb02dc003f0228c59bf8f1c17783f72e3191055d0cb3b4582ce98af087ed
-AUX pngtoico-1.0.1-libpng15.patch 231 BLAKE2B e2c360809f356e50bc1319210b55a2aa9adabcb4edb84ab9a871286f065dae81525b67738e1ee12f44265f079cf5e415c4a8ee33cce1410e93a560729ebd830c SHA512 a32a89b248d712b776384d30ff76b9e4b119acf292f62b5e82b36387e1a4113e8926209543859509cfcd00b85ad4a8f95223a66fa1fbd4771b5a7779ed66caf1
+AUX pngtoico-1.0.1-Makefile.patch 677 BLAKE2B 97d77dca4f085bf827affd68141a315be3ad67dff27f6f42890a8cc4770f747a094dc4756cb6cc29d79bb5c160b8a0d71528b6c8f3faf78bc7bf2040db7a41c8 SHA512 fe39f9d3db272d0bd0b208e2ddfa9f40e60336f0f8474605c3cdae025e80cb11bf3ba9ff8d1ac484d38b0682f54f823524177b718c73b9c34c9d7b7911810dc2
+AUX pngtoico-1.0.1-libpng15.patch 235 BLAKE2B a41aaf9a8574f04c317a251861f3e1b8b8346a4038c353ca844c589422abf48dae33026c1c33cf11ee3d3da4a689e67190cf338f75c0bec7b526b1c5e104f6fe SHA512 0ad131b4ccbd3e92386bc6e67e0efc3c19296510f1d7299d9f438d40d15a5042256b7ff76e01ee3ba41db7765c20c0d601a98bcc1386e0d1f97025cbae030a5e
 DIST pngtoico-1.0.1.tar.bz2 4355 BLAKE2B 47f35525b261e0c9261e2da5d16eb5068f151dfd6e36da6595884946836e1051312c610aacd5760ecc1c7b49f8df6b507b799f80a08b014b4cf136d9ab366668 SHA512 240d387b6d83cf9243d003d3233b642d1ae3f29f12ba5c97a4e0aa17f6a0d48ea035fb3f7cd4d44dd3d1056e713c6f5a3a4ae9b9bee8e191a564ed162bdebf7d
-EBUILD pngtoico-1.0.1-r1.ebuild 690 BLAKE2B f464cf5611b85131619fba99f28e29f3aed848f13e7f9ba5c98ed53d65806fa5e55ddf383cd8f9e2566080e6bf0ee0f0ae920c07299969af7b23aedd4cd3f5d5 SHA512 10a16c3bc36874abc8ceafaf08fef2c5d2b96f3ac6675cd1c621f12157bd82e21698d8d9e4c3d65b0c4051b4923ddf4890822f28b0f9651386a5201de2ad5d7c
+EBUILD pngtoico-1.0.1-r1.ebuild 634 BLAKE2B 6087be501849bbebbf859f0e4989e72707a9ce87694fdcfa3c1cbdf1694da514dbff17c8ec986c0f48a923cc80ea74a877d3f13545c310a7c265e60c1b24c576 SHA512 7a910cbf6985c4100435749b2cd5b58e2a89e11b3ee68dee4dc6a1405842c15e522113dfcff1b9b39fbf6d0ae272d04fcd0e1c948b7224d9588ecabd00307493
 MISC metadata.xml 241 BLAKE2B d11260008412b27ed0c22e21420a082065b8ce13021a7800ef00ade71a7746d834686a3685dad6250e10ab8b6eee8747a3b0bff3d6f488cc05fd9c769194f8a9 SHA512 3e1af4796a9c6a176936843173357f35ff94281769b8f35e0678fa403a294a0bb0eb98f371d129cd19b74e1cc8e84cfa8db71e9ecebfb67394a51d55e6d90642
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 2c6647ac4bd3..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)" || die
+src_configure() {
+	tc-export CC
 }
 
 src_install() {