gentoo resync : 28.04.2021

4 files changed, 3 insertions, 117 deletions

diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest
index d710a3272f20..fa81d0fd8d5f 100644
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@@ -1,6 +1,3 @@
-AUX zopfli-1.0.2-makefile.patch 2505 BLAKE2B f00e9056738bc9cb64f7aae79c42388d1d8a0e78287ca8c309bc4c464104cb5c5febd2587b05fcd83de45c5ae45df9a7dc9dc7d3e4c77d687c5aec001cf1125c SHA512 354541b72fbc9539b514489ebd9f17c2bcdfe09f7d5ff8a102aa301ae22bc63698e5b20493692b4810dfca287ed315571d13a213d8c8d1a5722ddff1c11afc32
-DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
 DIST zopfli-1.0.3.tar.gz 195227 BLAKE2B fed322e6d0baf8e9008e91fef4c459e8f67f0e7d62942469893d89b8ca39ace6d1ac68cbbc322e938e66a613ea9a36e3ae9f59550b5f4964107bec490a07038a SHA512 362cbeee0b3f04a4c5da512f82671491f874d4ec7b693dca9724ae42123d7ac184cc4d5de1872b4f1fc938c97f79dfdb482f62d1fca4a17cff6d267f6021e8d2
-EBUILD zopfli-1.0.2.ebuild 966 BLAKE2B cab9a7529b3516654f4c9fc84b38ba72d2b3000c70682d61b6ca42eae86655bab2ca3fc6929d481a140324a4669bf496a5b08d645f4c2b39895b677e73b17102 SHA512 401c5e1a4be1ab1dd813335758c04ead724d5029f631f960cc3017e036aca3a3d80043ba93b4064d12c041d1217129cce05aeb92fa6af40a9719babccab4db16
-EBUILD zopfli-1.0.3.ebuild 507 BLAKE2B 27771f307925839a6ed0b115a50a15e51b1c4311e72bd4706761a745b477f25df507e177a6759fecb4d9551747af64e559159fdfc54ad2d4bd260252dfd9980d SHA512 8b3fd3d6addef7bd8fa6f5cc2b9e285d705941a9f19d76742318e5d92c965243a19ec597b94e5bb59b6001deb9db9906369b21f8dc72ef62829af87cc4e4cee0
+EBUILD zopfli-1.0.3.ebuild 508 BLAKE2B 971df5dced1142538cdd2f07e9aa8bcae37310f25c4c122640ae22aec431fdfee471ab1504bd1bfb4cab349e6baf18b9a72423bf5f3769be07e955cc54d318b3 SHA512 baf5268329ae9fb4dbef467dbbc81877be489e363e815d1766c36950fde6fbc046829d835419edd4e8d8e1f036c4ea16150c5634b8d89458c29193b2e96b302e
 MISC metadata.xml 250 BLAKE2B 1c20423b13baa29fbe982337cf7c7f75c02e96e0dc84a35efd58db42561327a91a2d1d8efde9631df1bfaa561dedf0bf3533939eb62fbf00901ea55bd3eb59b8 SHA512 86aa5b6da7a3b70221832eafcdcca8585939f670834cdcc205c7f1674d1ad8b81ebd9135e0c699d4073ea5d496170334dee1000ea83767973cae4e49981377ab
diff --git a/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch b/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch
deleted file mode 100644
index 07a1c121032a..000000000000
--- a/app-arch/zopfli/files/zopfli-1.0.2-makefile.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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
deleted file mode 100644
index b1ceb137f61c..000000000000
--- a/app-arch/zopfli/zopfli-1.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc 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.3.ebuild b/app-arch/zopfli/zopfli-1.0.3.ebuild
index 9fcaf2e720e4..d25c4c0ccc17 100644
--- a/app-arch/zopfli/zopfli-1.0.3.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,6 +13,6 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 DOCS=( CONTRIBUTORS README README.zopflipng )