gentoo resync : 19.05.2018

8 files changed, 116 insertions, 42 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index db116cf1c557..864fdee776ff 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/unadf/Manifest b/app-arch/unadf/Manifest
index 1ba7d8b77a43..94f244259159 100644
--- a/app-arch/unadf/Manifest
+++ b/app-arch/unadf/Manifest
@@ -1,4 +1,3 @@
-AUX no.in_path.patch 1341 BLAKE2B 7ec890361f9c7a30b5b60682773bbdfbf2eed2d6de19ded5ba4ba6d3dff1f08f9f4b79c927fa5bfdc2d8ad2de76f8101259350b011e5ceec8ec00e634b9f0fac SHA512 79e218cb222ac8024a8c6decab688428677298269c11bfca683921a84e70056f9fd58b12f290cf30944017fff1c794a713701cfd0c722fd98180a2c3d521a1c8
 AUX unadf-0.7.12-CVE-2016-1243_CVE-2016-1244.patch 5191 BLAKE2B f888e30e1a4d7caefbb407e1cb0fc76345deb960fce974f5ad80e3cad41d3dfde78e34370bdedc11f5dc2729c6695a339db1eab3d37ed5f0bfae9e104c0d2949 SHA512 d1c9a8efcf026d58eaee61e92ee99304c52672836a63dd69f5e1e0472c9b2278521b5a2597f55449ffd23dd307e2c045324bed9b5bf89d160ab517542706aca3
 DIST adflib-0.7.12.tar.bz2 135412 BLAKE2B 964ef195c0539779c33acb2f3c103f97f7fd7f78bb32a83af9d586157700664f5e531908121aea8234592bb00fb8bff2e8f754e620f989d6d4e52537675c030e SHA512 d63846f0780bd57cae5ff667eb70f98a0ba3659cfd0b12b3ae2f29ac96631e522088f911b1ba6e5ee3b00620a28a802f14d93cdf8462e18a7e3f749915ab5af3
 EBUILD unadf-0.7.12-r1.ebuild 711 BLAKE2B 3f5f4f4ce0b60f1cc8e5f52b12b52ce83159bb12286613eae5360d3b5145324da315fa0eb719289dbb275619c70a1726a3aa152db80a2432eef7a00f6bbe0b44 SHA512 8fdca2e22a57466c677457a56124ffece2f87578b97b70b8d3e2faba0b8062c31a6ab2505a47309e021e83dddc15c3f1fc62335d6d105e1382742c66019fc62a
diff --git a/app-arch/unadf/files/no.in_path.patch b/app-arch/unadf/files/no.in_path.patch
deleted file mode 100644
index 51de8f989fa1..000000000000
--- a/app-arch/unadf/files/no.in_path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -r -u ../unchanged/Lib/Makefile ./Lib/Makefile
---- ../unchanged/Lib/Makefile	2004-08-26 00:39:58.847605592 +1000
-+++ ./Lib/Makefile	2004-08-26 00:41:12.307438000 +1000
-@@ -41,7 +41,7 @@
- # to define LITT_ENDIAN on little endian machines (intel)
- # checks for sizeof(long)=4, sizeof(short)=2, sizeof(int)=4
- defendian.h: myconf 
--	myconf
-+	./myconf
- 
- adf_nativ.o: ${NATIV_DIR}/adf_nativ.c ${NATIV_DIR}/adf_nativ.h
- 	$(CC) ${CFLAGS} -c ${NATIV_DIR}/adf_nativ.c
-Only in ../unchanged/Lib: Makefile.orig
-Only in ../unchanged/Lib: Makefile.rej
-diff -r -u ../unchanged/Lib/myconf ./Lib/myconf
---- ../unchanged/Lib/myconf	2000-08-19 11:08:08.000000000 +1000
-+++ ./Lib/myconf	2004-08-26 00:41:28.344000072 +1000
-@@ -31,17 +31,17 @@
- gcc myctest.c -o myctest
- rm myctest.c
- 
--if [ `myctest |cut -d' ' -f 1` != 4 ]
-+if [ `./myctest |cut -d' ' -f 1` != 4 ]
-     then echo "Error : sizeof(long)!=4"
- fi
--if [ `myctest |cut -d' ' -f 2` != 2 ]
-+if [ `./myctest |cut -d' ' -f 2` != 2 ]
-     then echo "Error : sizeof(short)!=2"
- fi
--if [ `myctest |cut -d' ' -f 3` != 4 ]
-+if [ `./myctest |cut -d' ' -f 3` != 4 ]
-     then echo "Error  :sizeof(int)!=4"
- fi
- 
--if [ `myctest |cut -d' ' -f 4` = LITTLE ]
-+if [ `./myctest |cut -d' ' -f 4` = LITTLE ]
-     then 
-     echo "#ifndef LITT_ENDIAN" >defendian.h
-     echo "#define LITT_ENDIAN 1" >>defendian.h 
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
+}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 14c083bceda2..b198cfbcdee0 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -3,7 +3,7 @@ DIST zstd-1.3.2.tar.gz 1618939 BLAKE2B 1bb8c9ac0a521230e1507380afd5346e9cbd5b850
 DIST zstd-1.3.3.tar.gz 1857232 BLAKE2B 45b737b8798fa6982b22163553e38fbe77143d5562032a8f5f5593225ea07fee277b27c06c00670196b59030a4919d819d562bf9e1e185aadc755d0563b251bb SHA512 72b63f96f65ca987cdc82c24354f7665c7dc3b2563cb0646f355c34bf8f090d8a0759729f8beaba8317272bdab34749f934055707b25cfd69c98a9fdcfbc59ae
 DIST zstd-1.3.4.tar.gz 2059958 BLAKE2B b1d332a35066fb00e32c6dccebd5ad1065bcc3c7d0dd07d8408e5a2c2641dcdbc388e053ce8d15f9e261255e80f018a172d6e103b5c2f5a2ebb555333ac5f15d SHA512 d3c8c1dfabd251b03205b64eff97898c1e2ca457191b1f6257450e6d2675451a68aa0bc2220b2c65baa69a6997d98490612779d95b3325320c0a3202810ae554
 EBUILD zstd-1.1.3.ebuild 899 BLAKE2B 52b755114cb16adc89afd50fa1fdca48829170815b1ecdb1b26d2adb5e519d4af6e906b29dd282d67e7066792d4addf544a13c23f5c2effbd6d4aafcd08f41a1 SHA512 25065f6b5901c110b149b11b74d9b2249d241d74dd779ec7aff392db4163cf8276ced3c31d9c09afbac08588e5a560f467905b24f7ed1b418d8431938daf80dd
-EBUILD zstd-1.3.2.ebuild 1267 BLAKE2B 276e68d669176dcf8b2d91a9b8de4f44d2999fb2eb1cf33bcaac833030a29f27721655417dc8b36cbf36a2b590fd68c77a3057688ad0b7b2b737ea8caf8e7968 SHA512 90cd3a048afddc490af7e4d26a8c774ddbc6c100b73f7b77003e4688617284e5b86589d8ee7121861fce2e43db592aa99a9e46ea2c269fb380071f7a0a15c124
+EBUILD zstd-1.3.2.ebuild 1266 BLAKE2B 4f9bee393d514c0e5819c25d397cee82be28cb10a4a94acfa7cce444536059b718d429f391827df31b0ba73ce5abb95cd8a8c0fb420740bfc1ec645df7f5177b SHA512 daa96b1901d617f74f550a260170fe0bd593da6dfd7b6cd0371b6c1da6a1f5915b992878d145cce1ef7659788895fa01f4ac630133569c1f1a9f680cb0ce0ef0
 EBUILD zstd-1.3.3.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
 EBUILD zstd-1.3.4.ebuild 1272 BLAKE2B 5a5a930bede273a258d4413768a991fa79e8507883b82d3c55b2272f16e66d7a623a6bf393f64a6893bc87492b899ff9cbec611be525e1c5e1a909782def50bc SHA512 2cff16cc9d1bc77fb51fa216b2d4aff9a686de512e3980627d03900ec3f154fee138045680325edba779e2e0886dfc644c107307a47d6b061ef616afc18f4106
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.3.2.ebuild b/app-arch/zstd/zstd-1.3.2.ebuild
index 5b69032c43fe..138870ce113b 100644
--- a/app-arch/zstd/zstd-1.3.2.ebuild
+++ b/app-arch/zstd/zstd-1.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="app-arch/xz-utils"