gentoo resync : 30.05.2020

5 files changed, 2 insertions, 75 deletions

diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index 3ef46b02d4eb..5863c2ed388c 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,6 +1,3 @@
-AUX zlog-testsuite-flags.patch 599 BLAKE2B d94678371fb64eaf64d48c0d6980cde20bc9ccd3f0865a02c8f0374af553ff8db25601c5bd548e8f83bea1be80f8da2444669be621a4546710643c9d70e326ad SHA512 003c62b10274102dcec16c4064ff8cd93767bd34ac8c56e71cc07dec7d24a07e380341324f6d19141f43e6d8bffc3f4678a7b7ac493341e83bc237ab069ff164
-AUX zlog_no_werr.patch 497 BLAKE2B 506c3709043fa5d64475011dac251598d3d153bfdeb61947badc2d0937bbf62342370df3afba8e86a536ceb395376b311c7f5ea4f625ad24c2ef5b5c510492cd SHA512 5f5d343824a4d8ba02ce7e588b5e6a7aaf5465c1e76d1b26aa4f412d34d5a61d33a307d4d0521220267eaf883cb90ac382fb849fe406375f04c2a1ae9050c77f
-DIST zlog-v1.2.12.tar.gz 120048 BLAKE2B e9f48d8ee3e0bfc14674e96426f9343c27e0f666541b017a438800a6707bb158ca79f564e6cb10d953e4bff6dc839d76a3d3fc0f54c128bfb4b00e5fc86dbecf SHA512 4e1d773f33f9202702bb5e80f4dcc6f8ab28480a8515ad8b9562ee68703c065c2f18113124535c7163e240013ad121a6ce311a0fc04ac6c32971509ec33615ec
-EBUILD zlog-1.2.12-r1.ebuild 719 BLAKE2B da0b3b6266786d15f0fef4a873a9391659df3a17707dac82549e9b8014154f03e5c8dc6b3ef1df8de11bff39bba1a527b4b1aa18d74f44c4ba9507127021eb82 SHA512 0be10099b28d0766e66d4ccc368d92d0fa76668b57ddcbe0e6f033e6dde53790c13f12b7a4468e1b6dfbcf64c25b091e3e99b6bb6fca25c7d0f2380a0bf6c95b
-EBUILD zlog-1.2.12.ebuild 625 BLAKE2B 7fdb101df894a485214f5efbdba5d7ed9055bb68872f26aace9a130934b9b4b0c957c0ff91d2cac780b159d61442c73e699132e7df7dea1cb56f21867083adfb SHA512 b04f73ec3974de6f045397c3b79f900cb68bd08b40da2c06e1556cd882d1ae514f966b3672dc60855da09feda1e4ca732ec7598817afdea93797541635b02913
+DIST zlog-v1.2.14.tar.gz 123729 BLAKE2B 6985898af81ecb3b86c941dea1402dc03c80a773b2791d56228b4627f6e6ea62f27442536e5126169b5f3f77425cba49bd3b50dc0d7ffc5ac3d88f5001afc3e2 SHA512 e16524e8caa8a3c79ce95074387b87a0025e0fd9a7e35a09ddf49a41839e36a3fe42f5ad785ec786573b6c4c633f493845c7d5cbf0b03717affe4659ea1d53ef
+EBUILD zlog-1.2.14.ebuild 630 BLAKE2B 9214e1bec48b302cfe4129f31102e903bc6a4da626d2877df0946593d7c02dc1d403b730d28bd1189f875138e036ce11b56834bf0aa153c22ed4cc047590fa86 SHA512 e59cb6eb13a0939e634f2146084b8b169800f412b44cc5baba7e50a5fc8bd6be139ac1de14fbf9adf5363aaf2ee6c030f6df87c17a5ee781711416f1d6d07d13
 MISC metadata.xml 343 BLAKE2B cacb9dd07a85e4fa26b7fa703ea340117be968590c91b6e243d34642a38e6af506cc9d6d39c48250ffd288fa8dce7296cd02d37b7d5620af4d8d1edc74806af9 SHA512 1332dbac3769edb28e8c4241821fe5977619ae93b7fe29c58759ed4305b1a28cd51dd4a4d74b4d7db086bf6383e2f771b0e79804434ccd5ff6353e0d1b8d0f61
diff --git a/dev-libs/zlog/files/zlog-testsuite-flags.patch b/dev-libs/zlog/files/zlog-testsuite-flags.patch
deleted file mode 100644
index 4ce0a4b6d16c..000000000000
--- 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
index b01325db09d0..000000000000
--- 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
index 6e6621253781..000000000000
--- 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
index 2dcde049b63d..66b2ba8509c2 100644
--- 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)"
 }