gentoo resync : 28.04.2019

4 files changed, 2 insertions, 166 deletions

diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index ac6bb0d53312..7802d0345762 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -3,8 +3,6 @@ AUX zthread-2.3.2-clang.patch 581 BLAKE2B 70c3005548e8380ca69ac698c4894f70815ca8
 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.diff 2010 BLAKE2B 5456735110eaccfb46c3a7e4fefdfcaeb5e3d55ee84afba0ec349be36e95e790365916e9fb284e89e92495057e0bfe658ec80bee0b7052c72ac401ca0e9fbd76 SHA512 95f89cad5f531bb5374ae1e300080977defb69bf304221188204f3cbfbf4e23a1445cbe4174e279453a005ab410925b0111ce56ffac4aaf8656b50483a9f1a8d
 DIST ZThread-2.3.2.tar.gz 412527 BLAKE2B f8b176a35ca2df21460825f4cf9406a0e0fdd0a320eca2ffa323c47f025fa76e087bc30e3f6f2dc061cd79b0346c023f736f5fa2d1b0829eef718197c4e50e67 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b
-EBUILD zthread-2.3.2-r3.ebuild 1461 BLAKE2B 0214ebdb48a5357b85caf9faa9c1a2b2a2abfa0f943164b08d6f71380f3d6e1a3b6686d5b7be6648bc1787d622817103a095fd50845dd84493f3fccbadf1ec4c SHA512 0001e221cf7368c9f6ec9174a6792f53e4bd7174244e4eaaaa6d81cd95a260afaef647a58fccaa60e0be20aa3ccdc2a9d30cfe8483f0e40e6ffd5f7de06378b0
 EBUILD zthread-2.3.2-r4.ebuild 1400 BLAKE2B 187cbe7dc8eeb306ed49ce764867c3fe340d0096f75c7e63213ac69e5336c001fe2ee6bc3260bd284c68ca0e81d4f543d3ea144ad1286c955f0ac485ee1bceda SHA512 dbad90c961fd55ae16a068c0bd433f201ec6eee145e9e8b6c2086cb1f38c35601bd8cc9be4e88aa231a61109f0ee09739c3ac80ea63d28bd3d3721985fa4fde5
-MISC metadata.xml 326 BLAKE2B 3fa1401644229e1eea16291af9d0953263662408b1319b38c4fb10047009b592db544e67c5467cfb8428c33f8a2594fd94f88a1289bd6e9c2b92310ef46d06e8 SHA512 b01487803f5222c80e0bec2b0acf7bc85a30c7314642ae8e178274b4872a17986ca88ef324700a732b1afb573b74eee64c2e1bf95c08e8fddeee5910969f2230
+MISC metadata.xml 244 BLAKE2B b4a4377cc4333cef7ecdd3e448ef2af4ad16f7bb26913b89e4f3d7dfc97df2d7ddeb39bcd532f015e29e8632f0a993d39561a2b256eb0fbf67bd477c7ec5326b SHA512 6c52d0a4a5ec7d266bbb8a74a87c40d4b6c1fd34abc7c6e5e4026c8708160c6527d81e32fc6a395ebab9f2f8f74dbd1518e8ae244e8d0b674614898568718bff
diff --git a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff b/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff
deleted file mode 100644
index 21fad7c52c8e..000000000000
--- a/dev-libs/zthread/files/zthread-2.3.2-no-fpermissive.diff
+++ /dev/null
@@ -1,94 +0,0 @@
---- include/zthread/Guard.h.orig	2008-07-22 14:46:28.000000000 +0200
-+++ include/zthread/Guard.h	2008-07-22 14:51:41.000000000 +0200
-@@ -491,7 +491,7 @@
-     
-   try {
-     
--    if(!isDisabled())
-+    if(!LockHolder<LockType>::isDisabled())
-       LockingPolicy::destroyScope(*this);
-     
-   } catch (...) { /* ignore */ }  
---- src/MutexImpl.h.orig	2008-07-22 14:54:40.000000000 +0200
-+++ src/MutexImpl.h	2008-07-22 15:03:30.000000000 +0200
-@@ -153,7 +153,7 @@
- 
-       _owner = self;
- 
--      ownerAcquired(self);
-+      MutexImpl<List,Behavior>::ownerAcquired(self);
-       
-     }
- 
-@@ -164,7 +164,7 @@
-       _waiters.insert(self);
-       m.acquire();
- 
--      waiterArrived(self);
-+      MutexImpl<List, Behavior>::waiterArrived(self);
- 
-       {        
-       
-@@ -173,7 +173,7 @@
-       
-       }
- 
--      waiterDeparted(self);
-+      MutexImpl<List, Behavior>::waiterDeparted(self);
- 
-       m.release();
-         
-@@ -192,7 +192,7 @@
-           assert(_owner == 0);
-           _owner = self;    
- 
--          ownerAcquired(self);
-+          MutexImpl<List, Behavior>::ownerAcquired(self);
- 
-           break;
-         
-@@ -236,7 +236,7 @@
- 
-       _owner = self;
- 
--      ownerAcquired(self);
-+      MutexImpl<List, Behavior>::ownerAcquired(self);
-       
-     }
- 
-@@ -253,7 +253,7 @@
-       
-         m.acquire();
- 
--        waiterArrived(self);
-+        MutexImpl<List, Behavior>:: waiterArrived(self);
-       
-         {
-         
-@@ -262,7 +262,7 @@
-         
-         }
- 
--        waiterDeparted(self);
-+	MutexImpl<List, Behavior>::waiterDeparted(self);
-       
-         m.release();
-         
-@@ -284,7 +284,7 @@
-           assert(0 == _owner);
-           _owner = self;
- 
--          ownerAcquired(self);
-+	MutexImpl<List, Behavior>::ownerAcquired(self);
-         
-           break;
-         
-@@ -326,7 +326,7 @@
- 
-     _owner = 0;
- 
--    ownerReleased(impl);
-+    MutexImpl<List, Behavior>::ownerReleased(impl);
-   
-     // Try to find a waiter with a backoff & retry scheme
-     for(;;) {
diff --git a/dev-libs/zthread/metadata.xml b/dev-libs/zthread/metadata.xml
index 9512460c6411..3020b4780d3a 100644
--- a/dev-libs/zthread/metadata.xml
+++ b/dev-libs/zthread/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">zthread</remote-id>
 	</upstream>
diff --git a/dev-libs/zthread/zthread-2.3.2-r3.ebuild b/dev-libs/zthread/zthread-2.3.2-r3.ebuild
deleted file mode 100644
index c45773dbced4..000000000000
--- a/dev-libs/zthread/zthread-2.3.2-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils 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"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc sparc x86"
-IUSE="debug doc kernel_linux static-libs"
-
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	rm -f include/zthread/{.Barrier.h.swp,Barrier.h.orig} || die
-	epatch \
-		"${FILESDIR}"/${P}-no-fpermissive.diff \
-		"${FILESDIR}"/${P}-m4-quote.patch \
-		"${FILESDIR}"/${P}-automake-r2.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467778
-
-	AT_M4DIR="share" eautoreconf
-}
-
-src_configure() {
-	local myconf
-	# Autoconf does not support --disable-debug properly.
-	use debug && myconf="--enable-debug"
-
-	econf \
-		$(use_enable kernel_linux atomic-linux) \
-		$(use_enable static-libs static) \
-		${myconf}
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		doxygen doc/zthread.doxygen || die
-		sed -i -e 's|href="html/|href="|' doc/documentation.html || die
-		cp doc/documentation.html doc/html/index.html || die
-		cp doc/{zthread.css,bugs.js} doc/html/ || die
-	fi
-}
-
-src_install() {
-	default
-
-	use doc && dohtml doc/html/*
-
-	prune_libtool_files
-}