dev-libs/zlog: Add v1.2.14

This also drops the necessity of patches.

Fixes: https://goto.google.com/my-cloudtop-admin
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Tobias Klausmann <klausman@gentoo.org>

diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index c01be33d91b572e7627bda7d7fe00d43ad307bd0..0470b228b9f3c02bf5d4143cc32ec6c0ae3a535a 100644 (file)
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1 +1 @@
-DIST zlog-v1.2.12.tar.gz 120048 BLAKE2B e9f48d8ee3e0bfc14674e96426f9343c27e0f666541b017a438800a6707bb158ca79f564e6cb10d953e4bff6dc839d76a3d3fc0f54c128bfb4b00e5fc86dbecf SHA512 4e1d773f33f9202702bb5e80f4dcc6f8ab28480a8515ad8b9562ee68703c065c2f18113124535c7163e240013ad121a6ce311a0fc04ac6c32971509ec33615ec
+DIST zlog-v1.2.14.tar.gz 123729 BLAKE2B 6985898af81ecb3b86c941dea1402dc03c80a773b2791d56228b4627f6e6ea62f27442536e5126169b5f3f77425cba49bd3b50dc0d7ffc5ac3d88f5001afc3e2 SHA512 e16524e8caa8a3c79ce95074387b87a0025e0fd9a7e35a09ddf49a41839e36a3fe42f5ad785ec786573b6c4c633f493845c7d5cbf0b03717affe4659ea1d53ef

diff --git a/dev-libs/zlog/files/zlog-testsuite-flags.patch b/dev-libs/zlog/files/zlog-testsuite-flags.patch
deleted file mode 100644 (file)
index 4ce0a4b..0000000
--- a/dev-libs/zlog/files/zlog-testsuite-flags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- zlog-1.2.12.orig/test/makefile     2013-09-25 04:38:42.000000000 -0700
-+++ zlog-1.2.12/test/makefile  2018-02-13 16:59:33.812131188 -0800
-@@ -1,3 +1,6 @@
-+CFLAGS := -O2 -g
-+CC := gcc
-+
- exe =                 \
-       test_tmp        \
-       test_buf        \
-@@ -24,10 +27,10 @@
- all     :       $(exe)
- 
- $(exe)  :       %:%.o
--      gcc -O2 -g -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
-+      $(CC) $(CFLAGS) -o $@ $^ -L../src -lzlog -lpthread -Wl,-rpath ../src
- 
- .c.o  :
--      gcc -O2 -g -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
-+      $(CC) $(CLFAGS) -Wall -D_GNU_SOURCE -o $@ -c $< -I. -I../src
- 
- clean :
-       rm -f press.log* *.o $(exe)

diff --git a/dev-libs/zlog/files/zlog_no_werr.patch b/dev-libs/zlog/files/zlog_no_werr.patch
deleted file mode 100644 (file)
index b01325d..0000000
--- a/dev-libs/zlog/files/zlog_no_werr.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/makefile     2016-08-11 10:40:49.466873499 +0200
-+++ b/src/makefile     2016-08-11 10:40:59.626762850 +0200
-@@ -32,7 +32,7 @@
- # Fallback to gcc when $CC is not in $PATH.
- CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
- OPTIMIZATION?=-O2
--WARNINGS=-Wall -Werror -Wstrict-prototypes -fwrapv
-+WARNINGS=-Wall -Wstrict-prototypes -fwrapv
- DEBUG?= -g -ggdb
- REAL_CFLAGS=$(OPTIMIZATION) -fPIC -pthread $(CFLAGS) $(WARNINGS) $(DEBUG)
- REAL_LDFLAGS=$(LDFLAGS) -pthread

diff --git a/dev-libs/zlog/zlog-1.2.12.ebuild b/dev-libs/zlog/zlog-1.2.12.ebuild
deleted file mode 100644 (file)
index 6e66212..0000000
--- a/dev-libs/zlog/zlog-1.2.12.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="A reliable, thread safe, clear-model, pure C logging library."
-HOMEPAGE="http://hardysimpson.github.io/zlog/"
-SRC_URI="https://github.com/HardySimpson/${PN}/archive/${PV}.tar.gz -> ${PN}-v${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-       default_src_prepare
-       epatch "${FILESDIR}/zlog_no_werr.patch"
-}
-
-src_test() {
-       emake test
-}
-
-src_install() {
-       emake PREFIX="${D}/usr" install
-}

diff --git a/dev-libs/zlog/zlog-1.2.12-r1.ebuild b/dev-libs/zlog/zlog-1.2.14.ebuild
similarity index 87%
rename from dev-libs/zlog/zlog-1.2.12-r1.ebuild
rename to dev-libs/zlog/zlog-1.2.14.ebuild
index 2dcde049b63d3c36326af6595c1860cd552a0e23..66b2ba8509c20481fb5831b0426b0cb1567aa2fd 100644 (file)
--- a/dev-libs/zlog/zlog-1.2.12-r1.ebuild
+++ b/dev-libs/zlog/zlog-1.2.14.ebuild
@@ -15,11 +15,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-PATCHES=(
-       "${FILESDIR}/zlog_no_werr.patch"
-       "${FILESDIR}/zlog-testsuite-flags.patch"
-)
-
 src_compile() {
        emake CC="$(tc-getCC)"
 }