gentoo resync : 19.05.2018

3 files changed, 114 insertions, 0 deletions

diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index 7e45da71ba5d..e0544a6d4330 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -1,6 +1,9 @@
 AUX zopfli-1.0.1-makefile.patch 1979 BLAKE2B 7210faf2c8451f42efdd236fc5592fda8bba9010fcfe85112efb79799835382382073021a8695167fe9bb3672f13bb256c3c90cb21ef1e9a13ac652392cc50c6 SHA512 f26b02d88df75d9ce9bf8d86ae5bbf3cdc548be14a81939d26cbfbb2b6b29b74fcf40a62dd4ad20650e7c147d8234f6a0d5d82ff8780c2a1d54ae59825cd43b9
+AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8a0e78287ca8c309bc4c464104cb5c5febd2587b05fcd83de45c5ae45df9a7dc9dc7d3e4c77d687c5aec001cf1125c SHA512 354541b72fbc9539b514489ebd9f17c2bcdfe09f7d5ff8a102aa301ae22bc63698e5b20493692b4810dfca287ed315571d13a213d8c8d1a5722ddff1c11afc32
 DIST zopfli-1.0.0_p20140705.tar.gz 125759 BLAKE2B 5bc052de7f8189605ec4e155c35413e5000ab1fabe7edd2877b9bbc04a0041c5f02fa67fe6a818f68eb4af15251dabf7e599615656956e315b5ece497e2afa1a SHA512 ce5b3eb016b0d734a775dbb45842de4aa4a00bc1490edfdbbf81c4640da94994d08f336b313c45b785e17c61ecf58f370edb2cb6523c963798cad739af2282ca
 DIST zopfli-1.0.1.tar.gz 128178 BLAKE2B dfc410508c0566ba6ec948c2ed17b5ffa45338834c08991b5f2954b06b598f01a9c2cdba6526f324bd477e89e0ddb1ab86d4c2498ffe4cc573ba434b610fec14 SHA512 51d4b2d990e6785e86f0e0104325723c9a7c3b8bf6925ef694b6696f2238eaafff2ca625495a676874ecc1704df7d685e5234b0c601e5804c1c293242e113430
+DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
 EBUILD zopfli-1.0.0_p20140705.ebuild 677 BLAKE2B 9ab00361713213e8f01da29b9ace8e1761d70f08a2b7a35535848d4303f0309571852f54aac7b83193c8a323ec13d5e3fd2211416ac91187c6e62b9fa26c7ee1 SHA512 2ed577374b97e3bae087491a10b88d0967930a5de22663bf489844a0577f743bb6562d08b21c1df05396c82c5af0c16f843fde738a5eff37135cc8b2051b615c
 EBUILD zopfli-1.0.1-r2.ebuild 922 BLAKE2B f0ad60d9dd445277d41ef91cd28f329f6cb3d4297cf5cc42c89f27a0595778ff2e83e6050e3dd545796cbeac46756ffc8e279949b6c5cdc7bc8dd49d0ffda622 SHA512 acabf1c21f7d8f4c02fa5f6569f8bfdc1b4b5303a480bde95b762a84c04e7f67aba16761f358c65d14bfc9735e3157788b1317dc2e2b8b1352acbb92aa4a4d33
+EBUILD zopfli-1.0.2.ebuild 922 BLAKE2B 2d8c0b193c86c8f900810ef8748c730649892aa3031e7a85b5c6fb3a03ba8af759831341e9ca89532ea7033bb7c4cbc9f5b0966f5cb6ad39e4f3fec9b329bc5b SHA512 ae65b7cef4869bdb985374252fd036e14bae31de13c22e754d0a96fc0edd9e74058fd779c3a45feadf5be40dcf8b2be72aae9e5294cccbe4777aa14d3d8a2fac
 MISC metadata.xml 586 BLAKE2B 2545e2cc7e0f4737299f1e11472488e2a26f60c06fbca8ada9945ee4e4abb8a9ea9d4902367ed669ba74b82fac5a2da67b90517a2add19266fb73a634008c835 SHA512 9850711c420050ca6d7ffaff59c492a1a8ee606b541fb422f3e5f6f400540a2e9408a836b625ce645e0f327772c4613c95d9f4cdf20cf6b38eefdfd0b921cc0d
diff --git a/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch b/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch
new file mode 100644
index 000000000000..07a1c121032a
--- /dev/null
+++ b/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch
@@ -0,0 +1,70 @@
+From 90221a4d79dcbf44239b9b07cb7c3ec7c090a4a3 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Fri, 18 May 2018 20:43:23 +0200
+Subject: [PATCH] Respect env CC/CXX, split LDFLAGS, use libraries
+
+This is a port of files/zopfli-1.0.1-makefile.patch to 1.0.2.
+---
+ Makefile | 32 +++++++++++++++++++-------------
+ 1 file changed, 19 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 30b931e..bf063df 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,10 @@
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ 
+-CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2 -Wno-unused-function
+-CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
++CFLAGS += -W -Wall -Wextra -ansi -pedantic
++CXXFLAGS += -W -Wall -Wextra -ansi -pedantic
++LDFLAGS += -L. -Wno-unused-function
++LIBS = -lm
+ 
+ ZOPFLILIB_SRC = src/zopfli/blocksplitter.c src/zopfli/cache.c\
+                 src/zopfli/deflate.c src/zopfli/gzip_container.c\
+@@ -18,24 +20,28 @@ ZOPFLIPNGBIN_SRC := src/zopflipng/zopflipng_bin.cc
+ 
+ .PHONY: zopfli zopflipng
+ 
++all: zopfli zopflipng
++
+ # Zopfli binary
+-zopfli:
+-	$(CC) $(ZOPFLILIB_SRC) $(ZOPFLIBIN_SRC) $(CFLAGS) -o zopfli
++zopfli: libzopfli
++	$(CC) $(ZOPFLIBIN_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -lzopfli -o zopfli
+ 
+ # Zopfli shared library
+ libzopfli:
+ 	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
+-	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
++	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.2
++	@ln -s libzopfli.so.1.0.2 libzopfli.so.1
++	@ln -s libzopfli.so.1.0.2 libzopfli.so
+ 
+ # ZopfliPNG binary
+-zopflipng:
+-	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -c
+-	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(ZOPFLIPNGBIN_SRC) $(CFLAGS) -o zopflipng
++zopflipng: libzopflipng
++	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGBIN_SRC) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -lzopflipng -o zopflipng
+ 
+ # ZopfliPNG shared library
+-libzopflipng:
+-	$(CC) $(ZOPFLILIB_SRC) $(CFLAGS) -fPIC -c
+-	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2
++libzopflipng: libzopfli
++	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CXXFLAGS) $(LDFLAGS) $(LIBS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.2
++	@ln -s libzopflipng.so.1.0.2 libzopflipng.so.1
++	@ln -s libzopflipng.so.1.0.2 libzopflipng.so
+ 
+ # Remove all libraries and binaries
+ clean:
+-- 
+2.17.0
+
diff --git a/app-arch/zopfli/zopfli-1.0.2.ebuild b/app-arch/zopfli/zopfli-1.0.2.ebuild
new file mode 100644
index 000000000000..9cedbfeb2e43
--- /dev/null
+++ b/app-arch/zopfli/zopfli-1.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Very good, but slow, deflate or zlib compression"
+HOMEPAGE="https://github.com/google/zopfli/"
+SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( CONTRIBUTORS README README.zopflipng )
+
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+
+# zopflipng statically links an exact version of LodePNG (https://github.com/lvandeve/lodepng)
+
+src_prepare() {
+	default
+	tc-export CC CXX
+}
+
+# The Makefile has no install phase
+src_install() {
+	dolib.so libzopfli.so*
+	doheader src/zopfli/zopfli.h
+
+	dobin ${PN}
+
+	# This version was erroneously not bumped to match ${PV}
+	dolib.so libzopflipng.so*
+	doheader src/zopflipng/zopflipng_lib.h
+
+	dobin zopflipng
+}