gentoo resync : 16.02.1018

5 files changed, 3 insertions, 129 deletions

diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index 5d8884110c2a..a2711802d3bb 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -1,9 +1,4 @@
-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
+EBUILD zopfli-1.0.2.ebuild 917 BLAKE2B e2affd91253682ac8e5b559c1b60efc3d3b34c69de0ca4af9130c1c7c0686535477859353cf17ef9fcc5c9fe8ca98c607a415827edc55379d863bb22d904f063 SHA512 d73f8500e43193a1f4c40d29110cdf093c0681fc47873246de3b4abc184fbdad87eb1efa04307fddd7714bfa977439f2009f992f5c831a1e6c8adeb90c843b05
 MISC metadata.xml 384 BLAKE2B 0ea1ed6757cfd935a4e46b926d33891d99b5c943cd3145e9587b1e3d905d27c3756820f6d530afc329a552777ef19c6f4b4c54ae67798fd813b20363133a75f0 SHA512 f096a21a2f292028e07d029df22a40c252809879acc4b40c31c1bcf157c5ce28da0dc9d7466bfe6a6f13f0e61ac2d0e46e7a082135d7ae5fd945faad4837104a
diff --git a/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch b/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch
deleted file mode 100644
index a4a7dc280912..000000000000
--- a/app-arch/zopfli/files/zopfli-1.0.1-makefile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- zopfli-zopfli-1.0.1/Makefile
-+++ zopfli-zopfli-1.0.1/Makefile
-@@ -1,8 +1,10 @@
--CC = gcc
--CXX = g++
-+CC ?= gcc
-+CXX ?= g++
- 
--CFLAGS = -W -Wall -Wextra -ansi -pedantic -lm -O2
--CXXFLAGS = -W -Wall -Wextra -ansi -pedantic -O2
-+CFLAGS += -W -Wall -Wextra -ansi -pedantic
-+CXXFLAGS += -W -Wall -Wextra -ansi -pedantic
-+LDFLAGS += -L.
-+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 @@
- 
- .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.1
-+	$(CC) $(ZOPFLILIB_OBJ) $(CFLAGS) $(LDFLAGS) $(LIBS) -shared -Wl,-soname,libzopfli.so.1 -o libzopfli.so.1.0.1
-+	@ln -s libzopfli.so.1.0.1 libzopfli.so.1
-+	@ln -s libzopfli.so.1.0.1 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) $(CFLAGS) $(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.0
-+libzopflipng: libzopfli
-+	$(CXX) $(ZOPFLILIB_OBJ) $(LODEPNG_SRC) $(ZOPFLIPNGLIB_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -fPIC --shared -Wl,-soname,libzopflipng.so.1 -o libzopflipng.so.1.0.0
-+	@ln -s libzopflipng.so.1.0.0 libzopflipng.so.1
-+	@ln -s libzopflipng.so.1.0.0 libzopflipng.so
- 
- # Remove all libraries and binaries
- clean:
diff --git a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild b/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
deleted file mode 100644
index 13820f174c00..000000000000
--- a/app-arch/zopfli/zopfli-1.0.0_p20140705.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Very good, but slow, deflate or zlib compression"
-HOMEPAGE="https://github.com/Hello71/zopfli/"
-SRC_URI="https://github.com/Hello71/zopfli/archive/1c07f374419ccb352412fd6403acc2b59ab6cce7.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/1"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-src_prepare() {
-	tc-export CC CXX
-
-	epatch_user
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" install
-	dodoc CONTRIBUTORS README README.${PN}png
-}
diff --git a/app-arch/zopfli/zopfli-1.0.1-r2.ebuild b/app-arch/zopfli/zopfli-1.0.1-r2.ebuild
deleted file mode 100644
index cb39213529a9..000000000000
--- a/app-arch/zopfli/zopfli-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 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/zopfli/zopfli-1.0.2.ebuild b/app-arch/zopfli/zopfli-1.0.2.ebuild
index 9cedbfeb2e43..bd8cc57da2bf 100644
--- a/app-arch/zopfli/zopfli-1.0.2.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )