media-gfx/apngdis: version bump to 2.9

diff --git a/media-gfx/apngdis/Manifest b/media-gfx/apngdis/Manifest
index 59ac5b789bf2fb3f2e2600fa155c0db1ef896aab..d2486e571538b8e3f3787554b5fb054bb8237d34 100644 (file)
--- a/media-gfx/apngdis/Manifest
+++ b/media-gfx/apngdis/Manifest
@@ -1,2 +1,3 @@
 DIST apngdis-2.7-src.zip 450869 SHA256 cce7470d1ec0c518655d63133931e16d01050033405b67220e94ca7b2b97920d SHA512 016c9f0fe1ed7a26f9982414ea797b7a1f1b854ea9d13d089f0fbf9886520b637dc3dd0a7968137db4055f039afb1a5015fa2d1611b48ebb2e98af1b8e3c56fb WHIRLPOOL f9b7360da201de55a86f45decb265d9b71227c4ce6441d8faeb2d6d9211dca8d3da7f76f5e6dd66e8f3f61ddd9d58cb66afddac451dad7a1ec9fbec2080687ed
 DIST apngdis-2.8-src.zip 460138 SHA256 58f5082025f3e97d9072dfe3fbd3abc43252ee118a7463209b65d05b8fd71741 SHA512 f434bb10510254ac5aa581521abe45fd2437671451a5eccba65e71c2ea3f867591aa2986f865239c2495491ee37fcc0eb43e119457dba70dc27f2087082b38e8 WHIRLPOOL 19b75a02b1a2326562dd97f139013473cbb762d5e26aff32fbd410df0f04050d8d8823c434aead695fc68d7cf7398eb6a8b445f3c9a8f33382eee55afc0093f5
+DIST apngdis-2.9-src.zip 470989 SHA256 9d20082e770ab94b28ff5b989c5d8b7e723a23e32bc804e1638953bf5ba943f2 SHA512 4bcce5066c37ea5e4db0bfaf2f6a81e4d3ba7f5b6c952f598facff27f84cc1a3af778f4db096119cb9f4aa57c0193c90acf7bed28f283b6930f5b3121dd9cf32 WHIRLPOOL 717aab043e5c750fc1011d9ab73430157aef2dd1e0aa6cb0a464c70f57e951052304fa0161325d0207a137e4df9c18bcc34b3190d7302cce898d7bdf07565a73

diff --git a/media-gfx/apngdis/apngdis-2.9.ebuild b/media-gfx/apngdis/apngdis-2.9.ebuild
new file mode 100644 (file)
index 0000000..dd459b1
--- /dev/null
+++ b/media-gfx/apngdis/apngdis-2.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="extract PNG frames from an APNG"
+HOMEPAGE="https://sourceforge.net/projects/apngdis/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}
+       app-arch/unzip"
+
+S=${WORKDIR}
+
+PATCHES=(
+       "${FILESDIR}"/${P}-makefile.patch
+       "${FILESDIR}"/${P}-zlib.patch
+)
+
+src_prepare() {
+       default
+
+       # remove bundled libs
+       rm -r libpng zlib || die
+
+       tc-export CC
+}
+
+src_install() {
+       dobin ${PN}
+       dodoc readme.txt
+}

diff --git a/media-gfx/apngdis/files/apngdis-2.9-makefile.patch b/media-gfx/apngdis/files/apngdis-2.9-makefile.patch
new file mode 100644 (file)
index 0000000..08e6b02
--- /dev/null
+++ b/media-gfx/apngdis/files/apngdis-2.9-makefile.patch
@@ -0,0 +1,18 @@
+--- apngdis-2.9-src/Makefile
++++ apngdis-2.9-src/Makefile
+@@ -1,11 +1,10 @@
+ PACKAGE    = apngdis
+-CC         = gcc
+-CFLAGS     = -Wall -pedantic
+-CFLAGS_OPT = -O2
+-LIBS       = -lstdc++ -lm -lpng -lz
++CC         ?= gcc
++CFLAGS     += -Wall -pedantic
++LIBS       = -lstdc++ -lm -lpng
+ 
+ all :
+-      $(CC) $(CFLAGS) $(CFLAGS_OPT) -o $(PACKAGE) $(PACKAGE).cpp -s $(LIBS)
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $(PACKAGE) $(PACKAGE).cpp $(LIBS)
+ 
+ .PHONY : clean
+ 

diff --git a/media-gfx/apngdis/files/apngdis-2.9-zlib.patch b/media-gfx/apngdis/files/apngdis-2.9-zlib.patch
new file mode 100644 (file)
index 0000000..d9ce010
--- /dev/null
+++ b/media-gfx/apngdis/files/apngdis-2.9-zlib.patch
@@ -0,0 +1,12 @@
+Drop unused zlib header.
+
+--- apngdis-2.9-src/apngdis.cpp
++++ apngdis-2.9-src/apngdis.cpp
+@@ -32,7 +32,6 @@
+ #include <string.h>\r
+ #include <vector>\r
+ #include "png.h"     /* original (unpatched) libpng is ok */\r
+-#include "zlib.h"\r
+ \r
+ #define notabc(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))\r
+ \r