gentoo resync : 28.04.2021

4 files changed, 19 insertions, 21 deletions

diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index 2433d5b47f36..0db1a8d739f2 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -1,8 +1,8 @@
 AUX zthread-2.3.2-automake-r2.patch 2383 BLAKE2B 7368559120cd6e3b3a891178eeae15dcb6e3b3705da16ae8cf913aa3d83f01ddc7771e3a4ff416a02bd26006ecb123ce00af6c2d66fe92699c425bdbfee87aec SHA512 dae4fad0d560e8681db8e212888a4976abb67fc8ce85a85cd56d743f7ebcefd2760e91de40a83bd9023173d90f10bdf731b501ad50c09a5e769de6080b9bbad6
-AUX zthread-2.3.2-clang.patch 581 BLAKE2B 70c3005548e8380ca69ac698c4894f70815ca81b8126a206d8fe117cb6288bda1fb6f07797cb6f3f1d19d7e9d84376cb3d937b800f54e03d1281c5a72a55d645 SHA512 caaa4e491563b5a3ce142d242bb5fc7c08ceaffc9fecaf9720b6ffaf9192ef2f8a8ce819fd9f60bc741ffc19b47f0e894017d5f7befd5efb51314a6245938a68
+AUX zthread-2.3.2-clang.patch 454 BLAKE2B 6c3ef1abdcf9c0b71e0eebf733366d46aa6a969fd26f054c024c7a59eb0d8ade0a8116aaa004c770e6dd19873e8227ed791388b5779e9eac91ec2fe3e12128af SHA512 0886849336517b76f524d08462e2604b2cd67203c4b2ded910df01aecf2ab3c451c9433001b655dcf0cdd7256fe88c32a81d1b0050866930121f7bbf2e742c29
 AUX zthread-2.3.2-gcc47.patch 704 BLAKE2B 14031fe0230ba0abff034b894ddfe0e7c4178c65dbef4a2a74f9de164d3ac0d314912210a42a25beedaad098d34d8b03a59a51a7dde4567bf58562fe04743a3a SHA512 2c90bcb07a7063380b1f9f405467cf3d256ae0265d88886483612e7b11ded40a9dc810a9f11a36f2a40e62e30f98c36344b0f002b351980745d0562c1ca81a6b
 AUX zthread-2.3.2-m4-quote.patch 554 BLAKE2B b6c4293796b385d60f8011b3ee1c0436bfec773f40742159dc31eb4c07dd08c5bc0c474664712c6ef5e9a3b5a284dc17866f7f25591c67881f788a6ce7d7d2b4 SHA512 0f1b82ed3955174b16927e36a7dfc549d7cb6243f3a0cd2699a2f3c53fad5cd554140401d59dafd6f5ee4ce4fb689407ccf96ae9d5b9dc4a72a83157583b3381
-AUX zthread-2.3.2-no-fpermissive-r1.diff 2008 BLAKE2B 027c065581a86f6603dd0ff42bfa1446adf3faf514cde7ff5aaa8065fbb8a36779c2d237ffaef74d2af451cef38db5ff7c4520d043feddaeec2e26dc6252b001 SHA512 f5df932dc2a4a20c757ba0781891d53f5c4ad81b904107af0aff84759efd73ff200e9ec890e6e63679a66fc33b74f49ef88937bfb29a2bf666c443c68b6023d9
+AUX zthread-2.3.2-no-fpermissive-r1.diff 1864 BLAKE2B 1975e3e1e5c4202105bec905d5ede43102b347e5c0c17e8922f6be0839ec27f92aa945792c018c6ce86fdf0f8ff6794bf6d7676ad3abdd5d57786be016d91f60 SHA512 f32f76ba5e6063b96b80b4da3bb57dea61cd65c589ede3c93f7d06bbbfcd03c616eef98c9874e91ad85cc89163b9ead3d657aa753e564707204d6ea1a19793b6
 DIST ZThread-2.3.2.tar.gz 412527 BLAKE2B f8b176a35ca2df21460825f4cf9406a0e0fdd0a320eca2ffa323c47f025fa76e087bc30e3f6f2dc061cd79b0346c023f736f5fa2d1b0829eef718197c4e50e67 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b
-EBUILD zthread-2.3.2-r4.ebuild 1412 BLAKE2B d2d9a68ac26e934f4272033edc48516817a1e38858730e59db803457e630e291672f25484dc73fa54a59fa7d53144abbe954b4e99344e5cedaace0e3958f36c8 SHA512 89fa622d192f9ade8f99757a0a5766fde73084308e598f5d511cf8c11c502af1808a4e2958e4e8a1ad9affb070bca63871aa418219b43bcf538c66010ffddc4c
+EBUILD zthread-2.3.2-r4.ebuild 1386 BLAKE2B dc9fd65f2841275478e69593033975c03475af07f6c3f7ddd3546a129485944bb53c852f8169657ac2f96e0aeed3b60abd99b5baf70a3b0a931148aaf8cb099d SHA512 e1355f5998c364b90c2c349fd1c698d1189d66de6aba8e457751ac38bc35f61c5b658f8156d495b14a1d6c5bef7335fcad49513949379bb2f3e820f22d01fcd9
 MISC metadata.xml 244 BLAKE2B b4a4377cc4333cef7ecdd3e448ef2af4ad16f7bb26913b89e4f3d7dfc97df2d7ddeb39bcd532f015e29e8632f0a993d39561a2b256eb0fbf67bd477c7ec5326b SHA512 6c52d0a4a5ec7d266bbb8a74a87c40d4b6c1fd34abc7c6e5e4026c8708160c6527d81e32fc6a395ebab9f2f8f74dbd1518e8ae244e8d0b674614898568718bff
diff --git a/dev-libs/zthread/files/zthread-2.3.2-clang.patch b/dev-libs/zthread/files/zthread-2.3.2-clang.patch
index 13dd91ea2ca5..3c0e07b9dc4a 100644
--- a/dev-libs/zthread/files/zthread-2.3.2-clang.patch
+++ b/dev-libs/zthread/files/zthread-2.3.2-clang.patch
@@ -2,9 +2,8 @@ fix compile when using clang as $CC:
 
 Based on patch from https://bugs.launchpad.net/hugin/+bug/1213585 (rebased)
 
-diff -r 2a43e83684d5 src/foreign/zthread/include/zthread/Guard.h
---- a/include/zthread/Guard.h	Sat Aug 10 11:31:46 2013 +0200
-+++ b/include/zthread/Guard.h	Sun Aug 18 09:46:43 2013 +0200
+--- a/include/zthread/Guard.h
++++ b/include/zthread/Guard.h
 @@ -108,7 +108,7 @@
    }
  
diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff
index 94b42eedfbf3..b8f68f59dd2a 100644
--- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff
+++ b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive-r1.diff
@@ -1,5 +1,5 @@
---- a/include/zthread/Guard.h	2008-07-22 14:46:28.000000000 +0200
-+++ b/include/zthread/Guard.h	2008-07-22 14:51:41.000000000 +0200
+--- a/include/zthread/Guard.h
++++ b/include/zthread/Guard.h
 @@ -491,7 +491,7 @@
      
    try {
@@ -9,8 +9,8 @@
        LockingPolicy::destroyScope(*this);
      
    } catch (...) { /* ignore */ }  
---- a/src/MutexImpl.h	2008-07-22 14:54:40.000000000 +0200
-+++ b/src/MutexImpl.h	2008-07-22 15:03:30.000000000 +0200
+--- a/src/MutexImpl.h
++++ b/src/MutexImpl.h
 @@ -153,7 +153,7 @@
  
        _owner = self;
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index 02af2643693a..9d7decd68746 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -1,25 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils ltprune
+inherit autotools
 
 MY_P="ZThread-${PV}"
 
 DESCRIPTION="platform-independent multi-threading and synchronization library for C++"
 HOMEPAGE="http://zthread.sourceforge.net/"
 SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm64 ~hppa ~mips ppc ~sparc x86"
-IUSE="debug doc kernel_linux static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
+IUSE="debug doc kernel_linux"
 
-S="${WORKDIR}/${MY_P}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-no-fpermissive-r1.diff
@@ -34,7 +32,8 @@ src_prepare() {
 
 	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
 
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467778
+	# bug #467778
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
 
 	AT_M4DIR="share" eautoreconf
 }
@@ -43,7 +42,7 @@ src_configure() {
 	econf \
 		$(use_enable debug) \
 		$(use_enable kernel_linux atomic-linux) \
-		$(use_enable static-libs static)
+		--disable-static
 }
 
 src_compile() {
@@ -62,5 +61,5 @@ src_install() {
 
 	use doc && dodoc -r doc/html
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }