commit: 8fdd365b405e33ffa78ae399fa5da698d3421e43 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Apr 19 19:35:42 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Apr 19 19:40:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fdd365b
app-arch/zopfli: drop 1.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> app-arch/zopfli/Manifest | 1 - app-arch/zopfli/files/zopfli-1.0.2-makefile.patch | 70 ----------------------- app-arch/zopfli/zopfli-1.0.2.ebuild | 41 ------------- 3 files changed, 112 deletions(-) diff --git a/app-arch/zopfli/Manifest b/app-arch/zopfli/Manifest index 4fa484c5845..4e3b97f60b7 100644 --- a/app-arch/zopfli/Manifest +++ b/app-arch/zopfli/Manifest @@ -1,2 +1 @@ -DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e DIST zopfli-1.0.3.tar.gz 195227 BLAKE2B fed322e6d0baf8e9008e91fef4c459e8f67f0e7d62942469893d89b8ca39ace6d1ac68cbbc322e938e66a613ea9a36e3ae9f59550b5f4964107bec490a07038a SHA512 362cbeee0b3f04a4c5da512f82671491f874d4ec7b693dca9724ae42123d7ac184cc4d5de1872b4f1fc938c97f79dfdb482f62d1fca4a17cff6d267f6021e8d2 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 07a1c121032..00000000000 --- 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 <[email protected]> -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 3504bf16d76..00000000000 --- a/app-arch/zopfli/zopfli-1.0.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 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 -}
