diff options
30 files changed, 194 insertions, 583 deletions
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest index dbb3e6432db2..49066ef5fa41 100644 --- a/dev-cpp/gtest/Manifest +++ b/dev-cpp/gtest/Manifest @@ -1,4 +1,2 @@ -DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532 -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.10.0_p20200702.tar.gz 866900 BLAKE2B c162d47868583ba270675abe5df935b8f4b9a9c00dbdc80dd88afa7f2b98266640b32b2ea5e8f9f6d6227196b5d2f79dbfda4e9585106224e814cc1503cf777d SHA512 715d887b59b47d4691c7c90ef0cf0ffc3d1e758e500263c76b50fd506e90a9d1c390af745933cfe3f55e1edac5d72dccedef3cb9a50b71a5b796424471a3017b DIST gtest-1.9.0_pre20190607.tar.gz 958396 BLAKE2B 64ae2c86a320a6ed56d6f99383591f7a0176e3f1291144bddf6dc82733c78177963f95516bbaed494318d3d7451d164aeb0d4a192b415414bcc25b9875cf6e82 SHA512 6c17ba303ec1dc8a989075a6dc0eda9b023345d00f6b43e588676cc2cd291f8c508744e4aba86a6c6b651329ce47419ad04d5765ca5978eda507a1643e8a92c3 diff --git a/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch index 22ac0b6d4a12..3e06777ac9a9 100644 --- a/dev-cpp/gtest/files/gtest-1.8.0-increase-clone-stack-size.patch +++ b/dev-cpp/gtest/files/gtest-1.10.0_p20200702-increase-clone-stack-size.patch @@ -1,5 +1,4 @@ -Bug: https://bugs.gentoo.org/629620 -Upstream PR: https://github.com/google/googletest/pull/1274 +Bug: https://bugs.gentoo.org/692464 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -7,8 +6,8 @@ Upstream PR: https://github.com/google/googletest/pull/1274 if (!use_fork) { static const bool stack_grows_down = StackGrowsDown(); -- const size_t stack_size = getpagesize(); -+ const size_t stack_size = getpagesize() * 10; +- const auto stack_size = static_cast<size_t>(getpagesize() * 2); ++ 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/files/gtest-1.8.0-fix-doublefree.patch b/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch deleted file mode 100644 index 40fa1f6668bc..000000000000 --- a/dev-cpp/gtest/files/gtest-1.8.0-fix-doublefree.patch +++ /dev/null @@ -1,98 +0,0 @@ -Bug: https://bugs.gentoo.org/631698 -Upstream PR: https://github.com/google/googletest/pull/1339 - -From 0663ce9024c9b78ddf6eb3fc1ceb45361ed91767 Mon Sep 17 00:00:00 2001 -From: Romain Geissler <romain.geissler@gmail.com> -Date: Sat, 2 Dec 2017 22:47:20 +0100 -Subject: [PATCH] Fix double free when building Gtest/GMock in shared libraries - and linking a test executable with both. - ---- - googlemock/CMakeLists.txt | 63 ++++++++++++++++++++++++++++++----------------- - 1 file changed, 40 insertions(+), 23 deletions(-) - -diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt -index 724fdd5f0..f7bad8afc 100644 ---- a/googlemock/CMakeLists.txt -+++ b/googlemock/CMakeLists.txt -@@ -86,16 +86,23 @@ endif() - # Google Mock libraries. We build them using more strict warnings than what - # are used for other targets, to ensure that Google Mock can be compiled by - # a user aggressive about warnings. --cxx_library(gmock -- "${cxx_strict}" -- "${gtest_dir}/src/gtest-all.cc" -- src/gmock-all.cc) -- --cxx_library(gmock_main -- "${cxx_strict}" -- "${gtest_dir}/src/gtest-all.cc" -- src/gmock-all.cc -- src/gmock_main.cc) -+if (MSVC) -+ cxx_library(gmock -+ "${cxx_strict}" -+ "${gtest_dir}/src/gtest-all.cc" -+ src/gmock-all.cc) -+ -+ cxx_library(gmock_main -+ "${cxx_strict}" -+ "${gtest_dir}/src/gtest-all.cc" -+ src/gmock-all.cc -+ src/gmock_main.cc) -+else() -+ cxx_library(gmock "${cxx_strict}" src/gmock-all.cc) -+ target_link_libraries(gmock gtest) -+ cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc) -+ target_link_libraries(gmock_main gmock) -+endif() - - # If the CMake version supports it, attach header directory information - # to the targets for when we are part of a parent build (ie being pulled -@@ -175,23 +182,33 @@ if (gmock_build_tests) - ############################################################ - # C++ tests built with non-standard compiler flags. - -- cxx_library(gmock_main_no_exception "${cxx_no_exception}" -- "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) -- -- cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" -- "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) -+ if (MSVC) -+ cxx_library(gmock_main_no_exception "${cxx_no_exception}" -+ "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) - -- if (NOT MSVC OR MSVC_VERSION LESS 1600) # 1600 is Visual Studio 2010. -- # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that -- # conflict with our own definitions. Therefore using our own tuple does not -- # work on those compilers. -- cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" -+ cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" - "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) - -- cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}" -- gmock_main_use_own_tuple test/gmock-spec-builders_test.cc) -+ if (MSVC_VERSION LESS 1600) # 1600 is Visual Studio 2010. -+ # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that -+ # conflict with our own definitions. Therefore using our own tuple does not -+ # work on those compilers. -+ cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" -+ "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) -+ -+ cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}" -+ gmock_main_use_own_tuple test/gmock-spec-builders_test.cc) -+ endif() -+ else() -+ cxx_library(gmock_main_no_exception "${cxx_no_exception}" src/gmock_main.cc) -+ target_link_libraries(gmock_main_no_exception gmock) -+ -+ cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc) -+ target_link_libraries(gmock_main_no_rtti gmock) -+ -+ cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" src/gmock_main.cc) -+ target_link_libraries(gmock_main_use_own_tuple gmock) - endif() -- - cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}" - gmock_main_no_exception test/gmock-more-actions_test.cc) - diff --git a/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch b/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch deleted file mode 100644 index eadfe6197389..000000000000 --- a/dev-cpp/gtest/files/gtest-1.8.0-fix-gcc6-undefined-behavior.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix build with GCC 6 due to lifetime issues. - ---- a/googletest/src/gtest.cc -+++ b/googletest/src/gtest.cc -@@ -2654,10 +2654,12 @@ - test->Run(); - } - -- // Deletes the test object. -- impl->os_stack_trace_getter()->UponLeavingGTest(); -- internal::HandleExceptionsInMethodIfSupported( -- test, &Test::DeleteSelf_, "the test fixture's destructor"); -+ if (test != NULL) { -+ // Deletes the test object. -+ impl->os_stack_trace_getter()->UponLeavingGTest(); -+ internal::HandleExceptionsInMethodIfSupported( -+ test, &Test::DeleteSelf_, "the test fixture's destructor"); -+ } - - result_.set_elapsed_time(internal::GetTimeInMillis() - start); - diff --git a/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch b/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch deleted file mode 100644 index c18b58e16fb6..000000000000 --- a/dev-cpp/gtest/files/gtest-1.8.0-multilib-strict.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/googlemock/CMakeLists.txt -+++ b/googlemock/CMakeLists.txt -@@ -11,6 +11,8 @@ - - option(gmock_build_tests "Build all of Google Mock's own tests." OFF) - -+set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory") -+ - # A directory to find Google Test sources. - if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt") - set(gtest_dir gtest) -@@ -104,7 +106,7 @@ - # - # Install rules - install(TARGETS gmock gmock_main -- DESTINATION lib) -+ DESTINATION ${LIB_INSTALL_DIR}) - install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock - DESTINATION include) - ---- a/googletest/CMakeLists.txt -+++ b/googletest/CMakeLists.txt -@@ -27,6 +27,8 @@ - "Build gtest with internal symbols hidden in shared libraries." - OFF) - -+set(LIB_INSTALL_DIR lib CACHE STRING "Library install directory") -+ - # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build(). - include(cmake/hermetic_build.cmake OPTIONAL) - -@@ -103,7 +105,7 @@ - # - # Install rules - install(TARGETS gtest gtest_main -- DESTINATION lib) -+ DESTINATION ${LIB_INSTALL_DIR}) - install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest - DESTINATION include) - 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 index 38d515a48ddb..38d515a48ddb 100755..100644 --- 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 diff --git a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch b/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch deleted file mode 100644 index 8dfed46d4585..000000000000 --- a/dev-cpp/gtest/files/gtest-9999-fix-gcc6-undefined-behavior.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix build with GCC 6 due to lifetime issues. - ---- a/googletest/src/gtest.cc -+++ b/googletest/src/gtest.cc -@@ -2693,10 +2693,12 @@ - test->Run(); - } - -+ if (test != NULL) { - // Deletes the test object. - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - test, &Test::DeleteSelf_, "the test fixture's destructor"); -+ } - - result_.set_elapsed_time(internal::GetTimeInMillis() - start); - diff --git a/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch b/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch deleted file mode 100644 index ba63c7b3eeb3..000000000000 --- a/dev-cpp/gtest/files/gtest-9999-fix-py-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix python tests that use broken generator expressions - ---- a/googletest/cmake/internal_utils.cmake -+++ b/googletest/cmake/internal_utils.cmake -@@ -247,12 +247,12 @@ - add_test( - NAME ${name} - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py -- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>) -+ --build_dir=${CMAKE_CURRENT_BINARY_DIR}) - else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) - add_test( - ${name} - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/test/${name}.py -- --build_dir=${CMAKE_CURRENT_BINARY_DIR}/\${CTEST_CONFIGURATION_TYPE}) -+ --build_dir=${CMAKE_CURRENT_BINARY_DIR}) - endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.1) - endif() - endfunction() diff --git a/dev-cpp/gtest/gtest-1.10.0.ebuild b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild index 12d496c44be4..560a1e282be2 100644 --- a/dev-cpp/gtest/gtest-1.10.0.ebuild +++ b/dev-cpp/gtest/gtest-1.10.0_p20200702.ebuild @@ -4,11 +4,12 @@ EAPI=7 # Python is required for tests and some build tasks. -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) + CMAKE_ECLASS=cmake inherit cmake-multilib python-any-r1 -MY_PV=1.10.x +GOOGLETEST_COMMIT=aee0f9d9b5b87796ee8a0ab26b7587ec30e8858e if [[ ${PV} == "9999" ]]; then inherit git-r3 @@ -32,11 +33,10 @@ SLOT="0" IUSE="doc examples test" RESTRICT="!test? ( test )" -DEPEND="test? ( ${PYTHON_DEPS} )" -RDEPEND="!dev-cpp/gmock" +BDEPEND="test? ( ${PYTHON_DEPS} )" PATCHES=( - "${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch + "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch ) pkg_setup() { diff --git a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild b/dev-cpp/gtest/gtest-1.8.0-r1.ebuild deleted file mode 100644 index bf4d578fa31f..000000000000 --- a/dev-cpp/gtest/gtest-1.8.0-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Python is required for tests and some build tasks. -PYTHON_COMPAT=( python3_6 ) - -inherit python-any-r1 cmake-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( ${PYTHON_DEPS} )" -RDEPEND="!dev-cpp/gmock" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-fix-py-tests.patch - "${FILESDIR}"/${PN}-1.8.0-fix-gcc6-undefined-behavior.patch - "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch - "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch - "${FILESDIR}"/${PN}-1.8.0-fix-doublefree.patch -) - -S="${WORKDIR}"/googletest-release-${PV} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_GMOCK=ON - -DBUILD_GTEST=ON - -DLIB_INSTALL_DIR=$(get_libdir) - -Dgtest_build_samples=OFF - -Dgtest_disable_pthreads=OFF - -DBUILD_SHARED_LIBS=ON - - # tests - -Dgmock_build_tests=$(usex test) - -Dgtest_build_tests=$(usex test) - -DPYTHON_EXECUTABLE="${PYTHON}" - ) - cmake-utils_src_configure mycmakeargs -} - -multilib_src_install_all() { - einstalldocs - - if use doc; then - docinto googletest - dodoc -r googletest/docs/* - docinto googlemock - dodoc -r googlemock/docs/* - fi - - if use examples; then - docinto examples - dodoc googletest/samples/*.{cc,h} - fi -} diff --git a/dev-cpp/gtest/gtest-1.8.0.ebuild b/dev-cpp/gtest/gtest-1.8.0.ebuild deleted file mode 100644 index 2d1d2af328f7..000000000000 --- a/dev-cpp/gtest/gtest-1.8.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Python is required for tests and some build tasks. -PYTHON_COMPAT=( python3_6 ) - -inherit python-any-r1 cmake-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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( ${PYTHON_DEPS} )" -RDEPEND="!dev-cpp/gmock" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-fix-py-tests.patch - "${FILESDIR}"/${PN}-1.8.0-fix-gcc6-undefined-behavior.patch - "${FILESDIR}"/${PN}-1.8.0-multilib-strict.patch - "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch -) - -S="${WORKDIR}"/googletest-release-${PV} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_GMOCK=ON - -DBUILD_GTEST=ON - -DLIB_INSTALL_DIR=$(get_libdir) - -Dgtest_build_samples=OFF - -Dgtest_disable_pthreads=OFF - -DBUILD_SHARED_LIBS=ON - - # tests - -Dgmock_build_tests=$(usex test) - -Dgtest_build_tests=$(usex test) - -DPYTHON_EXECUTABLE="${PYTHON}" - ) - cmake-utils_src_configure mycmakeargs -} - -multilib_src_install_all() { - einstalldocs - - if use doc; then - docinto googletest - dodoc -r googletest/docs/* - docinto googlemock - dodoc -r googlemock/docs/* - fi - - if use examples; then - docinto examples - dodoc googletest/samples/*.{cc,h} - fi -} diff --git a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild b/dev-cpp/gtest/gtest-1.8.1-r1.ebuild deleted file mode 100644 index 030ed3477e90..000000000000 --- a/dev-cpp/gtest/gtest-1.8.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Python is required for tests and some build tasks. -PYTHON_COMPAT=( python2_7 ) -CMAKE_ECLASS=cmake -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/google/googletest" -else - SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - S="${WORKDIR}"/googletest-release-${PV} -fi - -DESCRIPTION="Google C++ Testing Framework" -HOMEPAGE="https://github.com/google/googletest" - -LICENSE="BSD" -SLOT="0" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( ${PYTHON_DEPS} )" -RDEPEND="!dev-cpp/gmock" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch - "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - sed -i -e '/set(cxx_base_flags /s:-Werror::' \ - googletest/cmake/internal_utils.cmake || die "sed failed!" -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_GMOCK=ON - -DINSTALL_GTEST=ON - - # tests - -Dgmock_build_tests=$(usex test) - -Dgtest_build_tests=$(usex test) - -DPYTHON_EXECUTABLE="${PYTHON}" - ) - cmake_src_configure -} - -multilib_src_install_all() { - einstalldocs - - if use doc; then - docinto googletest - dodoc -r googletest/docs/. - docinto googlemock - dodoc -r googlemock/docs/. - fi - - if use examples; then - docinto examples - dodoc googletest/samples/*.{cc,h} - fi -} diff --git a/dev-cpp/gtest/gtest-1.8.1.ebuild b/dev-cpp/gtest/gtest-1.8.1.ebuild deleted file mode 100644 index 4c66697b04aa..000000000000 --- a/dev-cpp/gtest/gtest-1.8.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -# Python is required for tests and some build tasks. -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-multilib python-any-r1 - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/google/googletest" -else - SRC_URI="https://github.com/google/googletest/archive/release-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - S="${WORKDIR}"/googletest-release-${PV} -fi - -DESCRIPTION="Google C++ Testing Framework" -HOMEPAGE="https://github.com/google/googletest" - -LICENSE="BSD" -SLOT="0" -IUSE="doc examples test" -RESTRICT="!test? ( test )" - -DEPEND="test? ( ${PYTHON_DEPS} )" -RDEPEND="!dev-cpp/gmock" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-fix-gcc6-undefined-behavior.patch - "${FILESDIR}"/${PN}-1.8.0-increase-clone-stack-size.patch -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - sed -i -e '/set(cxx_base_flags /s:-Werror::' \ - googletest/cmake/internal_utils.cmake || die "sed failed!" -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_GMOCK=ON - -DINSTALL_GTEST=ON - -DBUILD_SHARED_LIBS=ON - - # tests - -Dgmock_build_tests=$(usex test) - -Dgtest_build_tests=$(usex test) - -DPYTHON_EXECUTABLE="${PYTHON}" - ) - cmake-utils_src_configure -} - -multilib_src_install_all() { - einstalldocs - - if use doc; then - docinto googletest - dodoc -r googletest/docs/. - docinto googlemock - dodoc -r googlemock/docs/. - fi - - if use examples; then - docinto examples - dodoc googletest/samples/*.{cc,h} - fi -} diff --git a/dev-cpp/gtest/gtest-9999.ebuild b/dev-cpp/gtest/gtest-9999.ebuild index 753803041fce..40af1cfe82d5 100644 --- a/dev-cpp/gtest/gtest-9999.ebuild +++ b/dev-cpp/gtest/gtest-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 # Python is required for tests and some build tasks. -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_{6,7,8,9} ) CMAKE_ECLASS=cmake inherit cmake-multilib python-any-r1 @@ -31,11 +31,10 @@ SLOT="0" IUSE="doc examples test" RESTRICT="!test? ( test )" -DEPEND="test? ( ${PYTHON_DEPS} )" -RDEPEND="!dev-cpp/gmock" +BDEPEND="test? ( ${PYTHON_DEPS} )" PATCHES=( - "${FILESDIR}"/${PN}-1.9.0_pre20190607-increase-clone-stack-size.patch + "${FILESDIR}"/${PN}-1.10.0_p20200702-increase-clone-stack-size.patch ) pkg_setup() { diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest index 1bc5710b0362..c743b666335a 100644 --- a/dev-libs/pigpio/Manifest +++ b/dev-libs/pigpio/Manifest @@ -1 +1,2 @@ DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3 +DIST pigpio-77.tar.gz 2902866 BLAKE2B d03a97a596d5f408d29e61e8c5f727d7bca4caf8aeec63e9914b8d52bdc0d03d3d5b9ef1fdb408a6fcd72cd0b899f30eb79d02426cc83b271d71b543bf346928 SHA512 0533d18bc244d4cf487ffebdd68b9f341139e70df3a3862dc4705afefa2e3e4e2f51792a6c4a440b8ee1f111c9ae3141770b9578601bfa44e166bb438f45b80c diff --git a/dev-libs/pigpio/pigpio-77.ebuild b/dev-libs/pigpio/pigpio-77.ebuild new file mode 100644 index 000000000000..a47a53d9b909 --- /dev/null +++ b/dev-libs/pigpio/pigpio-77.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) + +inherit distutils-r1 systemd toolchain-funcs + +DESCRIPTION="A library for the Raspberry which allows control of the GPIOs" +HOMEPAGE="http://abyz.me.uk/rpi/pigpio/ https://github.com/joan2937/pigpio" +SRC_URI="https://github.com/joan2937/pigpio/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Unlicense" +SLOT="0" +KEYWORDS="~arm" +IUSE="python" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( "${FILESDIR}/${PN}-70-makefile.patch" ) + +src_compile() { + emake CC="$(tc-getCC)" STRIP=: STRIPLIB=: SIZE=: + use python && distutils-r1_src_compile +} + +src_install() { + emake DESTDIR="${D}" LDCONFIG=: PYTHON2=: PYTHON3=: \ + libdir="${EPREFIX}/usr/$(get_libdir)" prefix="${EPREFIX}/usr" \ + mandir="${EPREFIX}/usr/share/man" install + einstalldocs + newinitd "${FILESDIR}"/pigpiod.initd pigpiod + newconfd "${FILESDIR}"/pigpiod.confd pigpiod + systemd_newunit "${S}"/util/pigpiod.service pigpiod.service + use python && distutils-r1_src_install +} diff --git a/dev-python/doit-py/doit-py-0.4.0-r2.ebuild b/dev-python/doit-py/doit-py-0.4.0-r2.ebuild index 78980320bba7..796e18ef3f01 100644 --- a/dev-python/doit-py/doit-py-0.4.0-r2.ebuild +++ b/dev-python/doit-py/doit-py-0.4.0-r2.ebuild @@ -18,7 +18,7 @@ DEPEND=" test? ( dev-python/pyflakes[${PYTHON_USEDEP}] dev-python/coverage[${PYTHON_USEDEP}] - app-text/hunspell + app-text/hunspell[l10n_en] )" RDEPEND=" dev-python/configclass[${PYTHON_USEDEP}]" diff --git a/dev-python/doit-py/doit-py-0.5.0.ebuild b/dev-python/doit-py/doit-py-0.5.0.ebuild index b7b756066e47..fde1bd900733 100644 --- a/dev-python/doit-py/doit-py-0.5.0.ebuild +++ b/dev-python/doit-py/doit-py-0.5.0.ebuild @@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86" DEPEND=" test? ( - app-text/hunspell + app-text/hunspell[l10n_en] dev-python/pyflakes[${PYTHON_USEDEP}] )" RDEPEND=" diff --git a/dev-python/pylatex/Manifest b/dev-python/pylatex/Manifest new file mode 100644 index 000000000000..9a089da0738d --- /dev/null +++ b/dev-python/pylatex/Manifest @@ -0,0 +1 @@ +DIST pylatex-1.3.3.tar.gz 300639 BLAKE2B ac8fad8fa7e6e821cda168f3ae8ffb5acec21d688761b153ef2f9383b6a2f2ac7daea65f04389eb1ba3152fc50176d73cb814a78d2b5250ead2c6647eb96635a SHA512 12f51805996d84840f68844b79384ce4d2c29dde4db06f73b8887fe012abeaa4b9c5cf5e449132e626132b50ba26f014a899d548e3c0def25289671fd92e41a6 diff --git a/dev-python/pylatex/metadata.xml b/dev-python/pylatex/metadata.xml new file mode 100644 index 000000000000..e2160561b195 --- /dev/null +++ b/dev-python/pylatex/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>ddenoncin@gmail.com</email> + <name>David Denoncin</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + PyLaTeX is a Python library for creating and compiling LaTeX + files or snippets. The goal of this library is being an easy, + but extensible interface between Python and LaTeX. + </longdescription> + <upstream> + <remote-id type="github">JelteF/PyLaTeX</remote-id> + <remote-id type="pypi">pylatex</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/pylatex/pylatex-1.3.3.ebuild b/dev-python/pylatex/pylatex-1.3.3.ebuild new file mode 100644 index 000000000000..624ebdd6af61 --- /dev/null +++ b/dev-python/pylatex/pylatex-1.3.3.ebuild @@ -0,0 +1,54 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="PyLaTeX" +MY_P="${MY_PN}-${PV}" + +PYTHON_COMPAT=( python3_{6,7,8,9} ) + +inherit distutils-r1 eutils + +DESCRIPTION="A Python library for creating LaTeX files and snippets" +HOMEPAGE="https://github.com/JelteF/PyLaTeX" +SRC_URI="https://github.com/JelteF/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +RDEPEND=" + dev-python/ordered-set[${PYTHON_USEDEP}] +" + +distutils_enable_tests nose + +BDEPEND+=" + test? ( + dev-python/quantities[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + app-text/texlive + dev-texlive/texlive-latexextra + )" + +S="${WORKDIR}/${MY_P}" + +python_install_all() { + if use examples ; then + dodoc -r examples + docompress -x /usr/share/doc/"${PF}"/examples + fi + + distutils-r1_python_install_all +} + +pkg_postinst() { + elog "Optional dependencies:" + optfeature "compiling generated files" "app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience" + optfeature "matplotlib support" dev-python/matplotlib + optfeature "numpy support" dev-python/numpy + optfeature "quantities support" dev-python/quantities +} diff --git a/dev-python/quantities/Manifest b/dev-python/quantities/Manifest new file mode 100644 index 000000000000..fa90e3a5b653 --- /dev/null +++ b/dev-python/quantities/Manifest @@ -0,0 +1 @@ +DIST python-quantities-0.12.4.tar.gz 104093 BLAKE2B 84587726ef3c2f4c7dce4ea538363aecc42aa88c31d2990f834f2de9540b52d6ca0c437c1876a4c2dd5512b4be3af95cc64a1294ea60555ed1b51819f7f46125 SHA512 b5d181880d0789e6fbd55837c5ce65b677764a718be4550f1f553131e171caa59f8fc84d67e69563a293cda01e7b0678074fb311b3766f0013e658a9fa00471f diff --git a/dev-python/quantities/metadata.xml b/dev-python/quantities/metadata.xml new file mode 100644 index 000000000000..7ffdf7f0ad4e --- /dev/null +++ b/dev-python/quantities/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> + +<pkgmetadata> + <maintainer type="person"> + <email>ddenoncin@gmail.com</email> + <name>David Denoncin</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="github">python-quantities/python-quantities</remote-id> + <remote-id type="pypi">quantities</remote-id> + </upstream> +</pkgmetadata> diff --git a/dev-python/quantities/quantities-0.12.4.ebuild b/dev-python/quantities/quantities-0.12.4.ebuild new file mode 100644 index 000000000000..41a8e27b48b7 --- /dev/null +++ b/dev-python/quantities/quantities-0.12.4.ebuild @@ -0,0 +1,36 @@ +# Copyright 2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN="python-quantities" +MY_PV="$(ver_cut 1-3)" +MY_P="${MY_PN}-${PV}" + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +DISTUTILS_USE_SETUPTOOLS=no + +inherit distutils-r1 + +DESCRIPTION="Support for physical quantities with units, based on numpy" +HOMEPAGE="https://github.com/python-quantities/python-quantities" +SRC_URI="https://github.com/python-quantities/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${MY_PN}-${MY_PV}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + dev-python/numpy[$PYTHON_USEDEP] +" +distutils_enable_tests unittest + +S="${WORKDIR}/${MY_P}" + +python_prepare_all() { + # Unexpected success + sed -i -e 's:test_fix:_&:' \ + quantities/tests/test_umath.py || die + + distutils-r1_python_prepare_all +} diff --git a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild index 4c2b751299bd..adeb389d709b 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.30-r2.ebuild @@ -140,6 +140,11 @@ RDEPEND=" >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) sane_backends_escl? ( + || ( + net-dns/avahi[dbus] + net-dns/avahi[gtk] + net-dns/avahi[gtk2] + ) net-dns/avahi[${MULTILIB_USEDEP}] net-misc/curl[${MULTILIB_USEDEP}] ) diff --git a/media-sound/supercollider/supercollider-3.11.0.ebuild b/media-sound/supercollider/supercollider-3.11.0.ebuild index 3b3865ba3a00..c4f164b9dc16 100644 --- a/media-sound/supercollider/supercollider-3.11.0.ebuild +++ b/media-sound/supercollider/supercollider-3.11.0.ebuild @@ -116,6 +116,11 @@ src_install() { use vim && newdoc editors/scvim/README.md README.vim } +src_test() { + export QT_QPA_PLATFORM=offscreen + cmake_src_test +} + pkg_postinst() { einfo "Notice: SuperCollider is not very intuitive to get up and running." einfo "The best course of action to make sure that the installation was" diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest index 14ed293b4aec..311b4ba4d1c0 100644 --- a/net-analyzer/tcpreplay/Manifest +++ b/net-analyzer/tcpreplay/Manifest @@ -1,2 +1 @@ -DIST tcpreplay-4.3.2.tar.xz 747268 BLAKE2B 27cad902785975f9c7fbfb8abef24ae95fbc8812e0a4fabd3b1ecf74bb9f0a99cdb0c37db72c433296d3cebba89d0bbc90e944195e585bf2d1c2d93ef234c4f6 SHA512 641dd636d9c5c30637d0103f8b21da3ce234f9e3ed7ab4d2b20d004fc4a14301672dcd678b2d5e0eb90d55a97bcb0c4c67f31c790a5aa3c509a92d1142c5b7b9 DIST tcpreplay-4.3.3.tar.xz 748220 BLAKE2B 2de09f75e6bb6035fc25f34f41d9ce2ccbb961d7464a9a6dae16ec417d629e4819593fd781d95075293ffa3a3db7c4a50ae8667c4e7d07c0b425361027c8df06 SHA512 110d7768a176d2126766829466a209cdd983afcf0c988f7e128baa5057b3ac1dc918fcaeb168a2e6654429100a146afcbdafcda8c3d67adf6b17892a48689a02 diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild deleted file mode 100644 index a5ce8388372c..000000000000 --- a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic - -DESCRIPTION="utilities for editing and replaying previously captured network traffic" -HOMEPAGE="http://tcpreplay.appneta.com/ https://github.com/appneta/tcpreplay" -LICENSE="BSD GPL-3" -SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.xz" - -SLOT="0" -KEYWORDS="amd64 ~arm ~sparc x86" -IUSE="debug pcapnav +tcpdump" - -DEPEND=" - >=sys-devel/autogen-5.18.4[libopts] - dev-libs/libdnet - >=net-libs/libpcap-0.9 - tcpdump? ( net-analyzer/tcpdump ) - pcapnav? ( net-libs/libpcapnav ) -" -RDEPEND="${DEPEND}" - -DOCS=( - docs/{CHANGELOG,CREDIT,HACKING,TODO} -) -PATCHES=( - "${FILESDIR}"/${PN}-4.3.0-enable-pcap_findalldevs.patch -) - -S=${WORKDIR}/${P/_/-} - -src_prepare() { - default - - sed -i \ - -e 's|#include <dnet.h>|#include <dnet/eth.h>|g' \ - src/common/sendpacket.c || die - sed -i \ - -e 's|@\([A-Z_]*\)@|$(\1)|g' \ - -e '/tcpliveplay_CFLAGS/s|$| $(LDNETINC)|g' \ - -e '/tcpliveplay_LDADD/s|$| $(LDNETLIB)|g' \ - src/Makefile.am || die - - eautoreconf -} - -src_configure() { - # By default it uses static linking. Avoid that, bug 252940 - econf \ - $(use_enable debug) \ - $(use_with pcapnav pcapnav-config /usr/bin/pcapnav-config) \ - $(use_with tcpdump tcpdump /usr/sbin/tcpdump) \ - --enable-dynamic-link \ - --enable-local-libopts \ - --enable-shared \ - --with-libdnet \ - --with-testnic2=lo \ - --with-testnic=lo -} - -src_test() { - if [[ ! ${EUID} -eq 0 ]]; then - ewarn "Some tests were disabled due to FEATURES=userpriv" - ewarn "To run all tests issue the following command as root:" - ewarn " # make -C ${S}/test" - emake -j1 -C test tcpprep - else - emake -j1 test || { - ewarn "Note that some tests require eth0 iface to be up." ; - die "self test failed - see ${S}/test/test.log" ; } - fi -} diff --git a/sys-apps/ucspi-ssl/metadata.xml b/sys-apps/ucspi-ssl/metadata.xml index 32a4fcc2cbce..40544d04add2 100644 --- a/sys-apps/ucspi-ssl/metadata.xml +++ b/sys-apps/ucspi-ssl/metadata.xml @@ -1,17 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <!-- maintainer-needed --> <upstream> <bugs-to>mailto:feh@fehcom.de</bugs-to> </upstream> - <maintainer type="person"> - <email>powerman-asdf@yandex.ru</email> - <name>Alex Efros</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <longdescription> sslserver, sslclient, and sslhandle are command-line tools for building SSL client-server applications. They conform to the UNIX diff --git a/www-client/netsurf/netsurf-3.10-r2.ebuild b/www-client/netsurf/netsurf-3.10-r2.ebuild index e86cbfbe92fb..9aee997cf053 100644 --- a/www-client/netsurf/netsurf-3.10-r2.ebuild +++ b/www-client/netsurf/netsurf-3.10-r2.ebuild @@ -6,7 +6,7 @@ EAPI=7 inherit toolchain-funcs desktop DESCRIPTION="a free, open source web browser" -HOMEPAGE="http://www.netsurf-browser.org/" +HOMEPAGE="https://www.netsurf-browser.org/" SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source/${P}-src.tar.gz" LICENSE="GPL-2 MIT" |