gentoo resync : 06.08.2019

7 files changed, 19 insertions, 167 deletions

diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index 0554b1344220..3ea64201b2a4 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -1,20 +1,17 @@
-AUX configure-fix-pthread-linking.patch 3142 BLAKE2B 8bf1e9b7845330138684068ea1ba98ef9941e4f9a8d8517598fc48fdae984d051745307ac6e74a1fc37a65fd7e473b7526e6dc25dc3334f5b13e8a1a60e7f776 SHA512 4347570606853c75e43d3d1abe449cd562538e531136658e6742f8e2dddcc1767932b427a063f711b868467ca85ff947f24c4ed3e328319bd0a739bb66093016
 AUX gtest-1.8.0-fix-doublefree.patch 4176 BLAKE2B 8488622dab43418cca28fe65b43ba4e022d06e31517748226a61e18c366f33a7b8fb50ba8f0ca7a175774c580e0b356684414856a75d74363c816c5ab9ba2ef3 SHA512 5dc0b987ea9516c4ef0c8e50c58091431606d3555c0f24b2ea5786e47f8497664ca3fb55bb400e07c502319dfbf2d0a09d5121985defd8e8b5e29062a4a51134
 AUX gtest-1.8.0-fix-gcc6-undefined-behavior.patch 665 BLAKE2B 181253b829413cf41001236c4696fd35171345d9a933f62d0903d463e0bcf80004a0124e4c5b5846f40c8cfe70dfccc7488e1840ccf6418d34a461c482db373a SHA512 fc6f11a06f9aa7b1c31f5abbec208704dd0f461fed36d421802843234bb3d9fe3f2e35482629546c1a8585c84fb0850768dd8b63e0f88cfe0508b00278d800cc
 AUX gtest-1.8.0-increase-clone-stack-size.patch 588 BLAKE2B a05c131193a4fa8e585c23b8c664e1e5065bd1c02424c763df64bd2b83c975b33d8a7e6a52a4a094d2304ff96edc4cc72d5bd0c54579546d7d3512164bc18d4a SHA512 ca1e97c48b1f3340ccda093c1bac9b5ddbb84db6e8dd9f6d9da95a0ef105125c9bea34bba359ee473c0b05d7db6a69c2bdde8f1cbb14aeab9d76f83a4cd4b9a4
 AUX gtest-1.8.0-multilib-strict.patch 1126 BLAKE2B 9b7835108dec3c05025762e7161bbc993e77c0ea433ddec465746cc93cd231cbe654a756822d3a0c368497788bb5642b6a490f917736b763f18ed31b8a629558 SHA512 45bb44e3f0743ec0bd9f440585610ed04cbbd8befed398844300e21710b28f755f1775cc005efcdd0b4f6d2ec2200ad2abe98b2c6764400ffa04242fe7ce06fc
-AUX gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch 743 BLAKE2B 5edde2e35acb559c1e32cb4470aa8b57f884d1b449b7a7a354ad2fce6e5926a84c7d5c8504926b1fd48dc2401da9c57bb5c33acfaf4fe833beb980169962d2e3 SHA512 56ae87e7ce980b244dc3a97d09217e20335372420016c00bc82fcd53113fef64de9f01521db3fac01cf3ffd8fb2b76febcd32c80fd9851876c735a43e811ed72
+AUX gtest-1.9.0_pre20190607-increase-clone-stack-size.patch 565 BLAKE2B 6960b5318aa450f9309811f7cd412a652203404dbfb0cec7a2e308f3dc5ae1cf6a1225caff4a60d9e70468339e19e95abf50b5aa29cabde5960eb4f1f2571714 SHA512 7a9f65e93feca436791541378d1c5b740b3c111724c4075ff1f23ac616ece50aa7beb35f143df39c93184754331666b294fbab39cad189a8da1c3290846933b3
 AUX gtest-9999-fix-gcc6-undefined-behavior.patch 463 BLAKE2B d61c3a735ab5ecc8a44b5b7c294a25be86bdfb8bd589df954862b4ddee60f14f04b0b64e4be80b6ed9e191429d640f8fecf4dac3667e9c9d875feb494bd64bce SHA512 8ee1fe3ab2b9352f4a34ea9e2813344eb507a2c7d519d67d647dc511c280f2a4609eccebc2a122d8431989b4a8e43c6cb9c5650877a257681f2d37672f446227
 AUX gtest-9999-fix-py-tests.patch 820 BLAKE2B a6a860b6935bd5f0bbe720f5af741448dd29878ca16d4187b84a40df4ec3ca216951ab0dfb1a89bebe2da1ad89f975e22ef6cdaced488de72b06953e185fd0d1 SHA512 4a059704303fffe508bd099544caaab5e4c819c978d6c104dce302e82348dd41fd63390459828a5f6161624dfd47aed5dc9cb466d36796904d598e0b10427949
-DIST gtest-1.7.0.tar.gz 1001582 BLAKE2B 3d10c1e502c2fac1500d07301031a9328b29027a3f9719137e09d2c47556cf52bbc978a8fb7b37330a94beafa27d24c3bfc247b2f0d51306b53f43e7ae2373b4 SHA512 a9f5c047b39efb2d11b55ee9913662ca402ac6837b3ad2d278ecfbd1caf32ed4546f169e3e92503d57bf3b62ccf89cd062da1c7ea3638aae98e868d2766363c3
 DIST gtest-1.8.0.tar.gz 1281617 BLAKE2B ac052b4d0eb0d8ded03a8c7dff05177818627b8a51f2dbc2c162b2ee2a5d1323539e7d0d02236d9ebb799995e018f0171c2fdaeb4de3bb339548265e50de79e6 SHA512 1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3
-EBUILD gtest-1.7.0-r1.ebuild 1246 BLAKE2B 8d6ae73b7b0e7bd0d407789562d40fba430e546f97244f86d8ae87d0e64a3f6a3353463ca1a6cf17885bc4ed32b51cdc32d98d69a2401d104f84c360c95575dd SHA512 cdd56850b47e5a6f22382b6cd12854acd14b5e6760feb3ff99f7159155978b31e2879939c95c6a88a6025ce6ded3e9be0ee7a3689b1a008000addf7908753204
 EBUILD gtest-1.8.0-r1.ebuild 1670 BLAKE2B bd45cb2ffe973a6a856e858b5087177dc4d6d52c4cd955e93754165cef7d9960ef2d6d9e034f97030ce070cecfd94313c03de66604fc11918242a2567f54c410 SHA512 b7e04a98c1500109a4ecb4e02308d5fbbf360df70013bb4ccd8e1b1f4fc1b2539413dc7d658246593ce02562d17366540304658dd1b13f0e15ee4a7fbe484d6f
 EBUILD gtest-1.8.0.ebuild 1633 BLAKE2B 7d3c582e4b941c9990ba6a3cc56ae3e7305e89ecf86b8ddbecffa901047afd2783ec98db90cec9fc3f2d53349faaa992db4f3699a07529adc8f1f9319a2def68 SHA512 7335e0f5a0783c242468ab0fc8741dff517d72eb3523518aa5276483096fedce221c8f9f0933692410525ed9a24d709545e89ab8a8d6c9d8e55d8478322fd82e
 EBUILD gtest-1.8.1-r1.ebuild 1662 BLAKE2B 824a4ac0704705b3685c6f6b3b334b191537991454c68876443057fea0c2c74ad546f11b6214627994caa3a6c8cc10b2bb1139a559175bd2deb903697eda27be SHA512 ce9bf485877cbfdff5ce449af52e2939807205ec5c7348a0f56938796ae84d1778807c33300ab6d61c1babedea3095954398d12d44233065c853babd733c8bdb
 EBUILD gtest-1.8.1.ebuild 1686 BLAKE2B 7c6053a0f3d8d5f97199dd8a36b14739bc3db47a103ef5476bf46924c984e6e60745c073bd3fdf75d5a45ddcbacb226dafbc9dad2f373d13322a643a2238253b SHA512 edeb30abe53c77ec4797d9a15188b988c1981a2ceba3779c3014685c6c4a03e760f117b92264117562b504694aacfb3a9c42a9c934ae3c6c0f503edeafa7e510
-EBUILD gtest-1.9.0_pre20190607.ebuild 1753 BLAKE2B 5512cc85a06eaa11835f64dbb1cdccf090626c271e3c85390d425c13afd54d7d5b4fdbfbbc3b435157330f2f1dd57d7ba9f8f85046e364a273f7f01d3bbc18c7 SHA512 e462cfb849e05c8105a8e8b9048d7a2154823238dd9f1bd19d788bd740bedb0ef78b0bce6e670f9608128103fa7c9b4a4bd03ebd73229fa56ed6ab079b3e7186
-EBUILD gtest-9999.ebuild 1699 BLAKE2B 3eaff17f8bbaed2cd99966f2d445ed75faafabbd504bb9bac4c7e7b431d16b721cf1371d8006a373c61fdf29778e867a4f389be2f2155f70c3fc68f224287808 SHA512 de76a42373a1fd0a70c6a3b2d05dec3d681f7c10e03ab979c3e109b51f9a9ba2bbf126835877cf5086d2e078f0515fd25c84ff3e861cfb0f71f7a403d0bc20da
+EBUILD gtest-1.9.0_pre20190607.ebuild 1755 BLAKE2B a6ec7b1a789a332cd2aeb89ad2e5969a9e98eb74951ad8d6dccbcf2f62bc94a9c9b75a00abe08da05c109d3143248b87306ea81bd85957d4e6f896739fd1e266 SHA512 b0307813c7442c8e556785a1d47f23428f56d6ffe726a5d4eb3abf9d2c533ac0e830e74c6a2962e3c61eeeb92de8c58c963a3235994acb190773fe9b9e81c98c
+EBUILD gtest-9999.ebuild 1705 BLAKE2B aa0d763dab6bd0fcfda58b5ba1c267cc2a7d15d0fc33393f80c4edc48e1a3e412cb2004b155f54c2a865817d0eb073ea27b12ee71ec92ed11f5b0e84d319c203 SHA512 1c38c52e955bcac5c967514fda5612b52688b0237ba50d75b462000ab42bebf1f129a870886c26b5722457e2e617410824a4bdedeaeafa665002fd6838aaeedc
 MISC metadata.xml 535 BLAKE2B 892f380ec413ae33de5821d911bf34fc9e3d0e76cdc833a38c66ed85dece1f6efeec56d8f78c655c9a083e7152f1d24c018184d1e679612de43690665d2c0518 SHA512 68daeade4eb4fec4a42ec039ff000a025c48708f2aed23ebf4495b653567611342893ce79d6163d5276638af9e9915abc2cc6c2d6d07db2e86681e4049b77f81
diff --git a/dev-cpp/gtest/files/configure-fix-pthread-linking.patch b/dev-cpp/gtest/files/configure-fix-pthread-linking.patch
deleted file mode 100644
index 75e5219b7a7c..000000000000
--- a/dev-cpp/gtest/files/configure-fix-pthread-linking.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From fb71154012e634a5e780e93af5434bcdafaf2b24 Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Mon, 15 Oct 2012 17:25:07 -0400
-Subject: [PATCH] configure:  fix pthread linking
-
-- Update the pthread check to make sure that we don't need -lpthread when
-compiling with -nostdlib.
-
-- Make sure that the necessary pthread library is passed to libtool.
-
-Fixes:
-
-$ ldd -r /usr/lib/libgtest.so
-    linux-vdso.so.1 (0x00007fffe7dff000)
-    libstdc++.so.6 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libstdc++.so.6 (0x00007fbe09a9f000)
-    libc.so.6 => /lib64/libc.so.6 (0x00007fbe096f7000)
-    libgcc_s.so.1 => /usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/libgcc_s.so.1 (0x00007fbe094e1000)
-    libm.so.6 => /lib64/libm.so.6 (0x00007fbe091ee000)
-    /lib64/ld-linux-x86-64.so.2 (0x00007fbe0a005000)
-undefined symbol: pthread_key_create    (/usr/lib/libgtest.so)
-undefined symbol: pthread_getspecific   (/usr/lib/libgtest.so)
-undefined symbol: pthread_key_delete    (/usr/lib/libgtest.so)
-undefined symbol: pthread_setspecific   (/usr/lib/libgtest.so)
----
- Makefile.am       |    1 +
- m4/acx_pthread.m4 |   39 ++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 39 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index cb350b7..db2606e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -181,6 +181,7 @@ endif
- lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
- 
- lib_libgtest_la_SOURCES = src/gtest-all.cc
-+lib_libgtest_la_LIBADD = $(AM_LIBS)
- 
- pkginclude_HEADERS = \
-   include/gtest/gtest-death-test.h \
-diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4
-index 2cf20de..7fba4d9 100644
---- a/m4/acx_pthread.m4
-+++ b/m4/acx_pthread.m4
-@@ -339,7 +339,44 @@ if test "x$acx_pthread_ok" = xyes; then
- 	   # so it's not safe to assume that we may use pthreads
- 	   acx_pthread_ok=no
- 	fi
--	
-+   
-+   AC_MSG_CHECKING([whether what we have so far is sufficient with -nostdlib])
-+   CFLAGS="-nostdlib $CFLAGS"
-+   # we need c with nostdlib
-+   LIBS="$LIBS -lc" 
-+   AC_TRY_LINK([#include <pthread.h>],
-+         [pthread_t th; pthread_join(th, 0);
-+         pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+         pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+         [done=yes],[done=no])
-+      
-+   if test "x$done" = xyes; then
-+      AC_MSG_RESULT([yes])
-+   else
-+      AC_MSG_RESULT([no])
-+   fi
-+   
-+   if test x"$done" = xno; then
-+      AC_MSG_CHECKING([whether -lpthread saves the day])
-+      LIBS="-lpthread $LIBS"
-+      AC_TRY_LINK([#include <pthread.h>],
-+         [pthread_t th; pthread_join(th, 0);
-+         pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+         pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
-+         [done=yes],[done=no])
-+
-+      if test "x$done" = xyes; then
-+         AC_MSG_RESULT([yes])
-+         PTHREAD_LIBS="$PTHREAD_LIBS -lpthread"
-+      else
-+         AC_MSG_RESULT([no])
-+         AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries and -nostdlib])
-+      fi
-+    fi
-+
-+    CFLAGS="$save_CFLAGS"
-+    LIBS="$save_LIBS"
-+    CC="$save_CC"	
- 	CFLAGS="$save_CFLAGS"
- 	LIBS="$save_LIBS"
- 	CC="$save_CC"
--- 
-1.7.8.6
-
diff --git a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch
deleted file mode 100644
index 9a840aa58766..000000000000
--- a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-add-mmap-stack-flag.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Bug: https://bugs.gentoo.org/688162
-Upstream PR: https://github.com/google/googletest/pull/2276
-
---- a/googletest/src/gtest-death-test.cc
-+++ b/googletest/src/gtest-death-test.cc
-@@ -1357,6 +1357,9 @@ static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) {
-     const auto stack_size = static_cast<size_t>(getpagesize());
-     // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
-     void* const stack = mmap(nullptr, stack_size, PROT_READ | PROT_WRITE,
-+#    if GTEST_OS_LINUX
-+                             (stack_grows_down ? MAP_GROWSDOWN : 0) | // Needed for stack auto-resizing
-+#    endif
-                              MAP_ANON | MAP_PRIVATE, -1, 0);
-     GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED);
- 
diff --git a/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
new file mode 100755
index 000000000000..38d515a48ddb
--- /dev/null
+++ b/dev-cpp/gtest/files/gtest-1.9.0_pre20190607-increase-clone-stack-size.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/692464
+
+--- a/googletest/src/gtest-death-test.cc
++++ b/googletest/src/gtest-death-test.cc
+@@ -1070,7 +1070,7 @@
+ 
+   if (!use_fork) {
+     static const bool stack_grows_down = StackGrowsDown();
+-    const auto stack_size = static_cast<size_t>(getpagesize());
++    const auto stack_size = static_cast<size_t>(getpagesize()* 10);
+     // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead.
+     void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE,
+                              MAP_ANON | MAP_PRIVATE, -1, 0);
diff --git a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild b/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
deleted file mode 100644
index 360809f62e74..000000000000
--- a/dev-cpp/gtest/gtest-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-# Python is required for tests and some build tasks.
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-any-r1 autotools-multilib
-
-DESCRIPTION="Google C++ Testing Framework"
-HOMEPAGE="https://github.com/google/googletest"
-SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="examples static-libs"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/configure-fix-pthread-linking.patch" #371647
-)
-
-src_prepare() {
-	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die
-	sed -i -r \
-		-e '/^install-(data|exec)-local:/s|^.*$|&\ndisabled-&|' \
-		Makefile.am || die
-	autotools-multilib_src_prepare
-}
-
-multilib_src_install() {
-	default
-	multilib_is_native_abi && dobin scripts/gtest-config
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins samples/*.{cc,h}
-	fi
-}
diff --git a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
index be0b3f49f666..47f236ed8ce0 100644
--- a/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
+++ b/dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
@@ -20,7 +20,7 @@ else
 		MY_PV=${GOOGLETEST_COMMIT}
 	fi
 	SRC_URI="https://github.com/google/googletest/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}"/googletest-${MY_PV}
 fi
 
@@ -35,7 +35,7 @@ DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0_pre20190607-add-mmap-stack-flag.patch
+	"${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
 )
 
 pkg_setup() {
diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild
index bd677dc0bd1d..02ca3c039b1a 100644
--- a/dev-cpp/gtest/gtest-9999.ebuild
+++ b/dev-cpp/gtest/gtest-9999.ebuild
@@ -33,7 +33,7 @@ DEPEND="test? ( ${PYTHON_DEPS} )"
 RDEPEND="!dev-cpp/gmock"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.0_pre20190607-add-mmap-stack-flag.patch
+	"${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch
 )
 
 pkg_setup() {